diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000000000000000000000000000000000000..559431e2f9421f4cf1bfe64f1e2e9ee66b7bead5
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,28 @@
+version: 1.0.{build}
+os: Visual Studio 2015
+environment:
+  matrix:
+    - ARCH: amd64
+
+clone_folder: c:\dev\TDengine
+clone_depth: 1
+
+init:
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
+
+before_build:
+  - cd c:\dev\TDengine
+  - md build
+
+build_script:
+  - cd build
+  - cmake -G "NMake Makefiles" ..
+  - nmake install
+
+notifications:
+- provider: Email
+  to:
+  - sangshuduo@gmail.com
+  on_build_success: true
+  on_build_failure: true
+  on_build_status_changed: true
diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c3ba81f9e2e9635e06fddd967f8d5bf364b14f0a
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,12 @@
+coverage:
+  precision: 2
+  notify:
+    email:
+      default:
+        to:
+          - sdsang@taosdata.com
+          - &author
+        only_pulls: false
+        layout: reach, diff, flags, files
+        flags: null
+        paths: null
diff --git a/.gitignore b/.gitignore
index dfc138d13f281ec7a0cba4173f32b8bc7aa13089..e6e327327c2a72bc2262d9b2923314c950c78cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,16 +11,15 @@ debs/
 rpms/
 mac/
 *.pyc
+.mypy_cache
 *.tmp
+*.swp
 src/connector/nodejs/node_modules/
 src/connector/nodejs/out/
 tests/test/
 tests/taoshebei/
 tests/taoscsv/
 tests/taosdalipu/
-tests/sim/
-tests/script/
-tests/pytest/
 tests/jenkins/
 tests/hdfs/
 *.iml
@@ -33,4 +32,50 @@ taoshebei/
 taosdalipu/
 Target/
 *.failed
-*.sql
\ No newline at end of file
+*.sql
+sim/
+psim/
+pysim/
+*.out
+*DS_Store
+
+# Doxygen Generated files
+html/
+/.vs
+/CMakeFiles/3.10.2
+/CMakeCache.txt
+/Makefile
+/*.cmake
+/src/cq/test/CMakeFiles/cqtest.dir/*.cmake
+*.cmake
+/src/cq/test/CMakeFiles/cqtest.dir/*.make
+*.make
+link.txt
+*.internal
+*.includecache
+*.marks
+Makefile
+CMakeError.log
+*.log
+/CMakeFiles/CMakeRuleHashes.txt
+/CMakeFiles/Makefile2
+/CMakeFiles/TargetDirectories.txt
+/CMakeFiles/cmake.check_cache
+/out/isenseconfig/WSL-Clang-Debug
+/out/isenseconfig/WSL-GCC-Debug
+/test/cfg
+/src/.vs
+*.o
+version.c
+taos.rc
+src/connector/jdbc/.settings/
+tests/comparisonTest/cassandra/cassandratest/.classpath
+tests/comparisonTest/cassandra/cassandratest/.project
+tests/comparisonTest/cassandra/cassandratest/.settings/
+tests/comparisonTest/opentsdb/opentsdbtest/.classpath
+tests/comparisonTest/opentsdb/opentsdbtest/.factorypath
+tests/comparisonTest/opentsdb/opentsdbtest/.project
+tests/comparisonTest/opentsdb/opentsdbtest/.settings/
+tests/examples/JDBC/JDBCDemo/.classpath
+tests/examples/JDBC/JDBCDemo/.project
+tests/examples/JDBC/JDBCDemo/.settings/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..7c84eac8a4ee7529005855bc836387561c49ae2d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/connector/go"]
+	path = src/connector/go
+	url = https://github.com/taosdata/driver-go
+[submodule "src/connector/grafanaplugin"]
+	path = src/connector/grafanaplugin
+	url = https://github.com/taosdata/grafanaplugin
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6e49709c85e9d26d89cd7d7ab8ec8fa78297ef96
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,270 @@
+#
+# Configuration
+#
+#
+# Build Matrix
+#
+branches:
+  only:
+    - master
+    - develop
+    - coverity_scan
+    - /^.*ci-.*$/
+
+matrix:
+  - os: linux
+    dist: focal
+    language: c
+
+    git:
+      - depth: 1
+
+    compiler: gcc
+    env: DESC="linux/gcc build and test"
+
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+          - net-tools
+          - python3-pip
+          - python3-setuptools
+          - valgrind
+          - psmisc
+
+    before_script:
+      - export TZ=Asia/Harbin
+      - date
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+
+    script:
+      - cmake .. > /dev/null
+      - make > /dev/null
+
+    after_success:
+      - travis_wait 20
+      - |-
+        case $TRAVIS_OS_NAME in
+          linux)
+          cd ${TRAVIS_BUILD_DIR}/debug
+          make install > /dev/null || travis_terminate $?
+
+          py3ver=`python3 --version|awk '{print $2}'|cut -d "." -f 1,2` && apt install python$py3ver-dev
+          pip3 install psutil
+          pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/
+
+          cd ${TRAVIS_BUILD_DIR}/tests
+          ./test-all.sh smoke || travis_terminate $?
+          sleep 1
+
+          cd ${TRAVIS_BUILD_DIR}/tests/pytest
+          pkill -TERM -x taosd
+          fuser -k -n tcp 6030
+          sleep 1
+          ./crash_gen.sh -a -p -t 4 -s 2000|| travis_terminate $?
+          sleep 1
+
+          cd ${TRAVIS_BUILD_DIR}/tests/pytest
+          ./valgrind-test.sh 2>&1 > mem-error-out.log
+          sleep 1
+
+          # Color setting
+          RED='\033[0;31m'
+          GREEN='\033[1;32m'
+          GREEN_DARK='\033[0;32m'
+          GREEN_UNDERLINE='\033[4;32m'
+          NC='\033[0m'
+
+          grep 'start to execute\|ERROR SUMMARY' mem-error-out.log|grep -v 'grep'|uniq|tee uniq-mem-error-out.log
+
+          for memError in `grep 'ERROR SUMMARY' uniq-mem-error-out.log | awk '{print $4}'`
+          do
+            if [ -n "$memError" ]; then
+              if [ "$memError" -gt 12 ]; then
+                echo -e "${RED} ## Memory errors number valgrind reports is $memError.\
+                         More than our threshold! ## ${NC}"
+                travis_terminate $memError
+              fi
+            fi
+          done
+
+          grep 'start to execute\|definitely lost:' mem-error-out.log|grep -v 'grep'|uniq|tee uniq-definitely-lost-out.log
+          for defiMemError in `grep 'definitely lost:' uniq-definitely-lost-out.log | awk '{print $7}'`
+          do
+            if [ -n "$defiMemError" ]; then
+              if [ "$defiMemError" -gt 13 ]; then
+                echo -e "${RED} ## Memory errors number valgrind reports \
+                         Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
+                travis_terminate $defiMemError
+              fi
+            fi
+          done
+
+          ;;
+        esac
+
+  - os: linux
+    dist: bionic
+    language: c
+    compiler: gcc
+    env: COVERITY_SCAN=true
+    git:
+      - depth: 1
+
+    script:
+      - echo "this job is for coverity scan"
+
+    addons:
+      coverity_scan:
+        # GitHub project metadata
+        # ** specific to your project **
+        project:
+          name: TDengine
+          version: 2.x
+          description: TDengine
+
+        # Where email notification of build analysis results will be sent
+        notification_email: sdsang@taosdata.com, slguan@taosdata.com
+
+        # Commands to prepare for build_command
+        # ** likely specific to your build **
+        build_command_prepend: cmake . > /dev/null
+
+        # The command that will be added as an argument to "cov-build" to compile your project for analysis,
+        # ** likely specific to your build **
+        build_command: make
+
+        # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'.
+        # Take care in resource usage, and consider the build frequency allowances per
+        #   https://scan.coverity.com/faq#frequency
+        branch_pattern: coverity_scan
+
+  - os: linux
+    dist: trusty
+    language: c
+    git:
+      - depth: 1
+
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+    env: 
+      - DESC="trusty/gcc-4.8 build"
+
+    before_script:
+      - export TZ=Asia/Harbin
+      - date
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+
+    script:
+      - cmake .. > /dev/null
+      - make
+
+  - os: linux
+    dist: bionic
+    language: c
+    compiler: clang
+    env: DESC="linux/clang build"
+    git:
+      - depth: 1
+
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+
+    before_script:
+      - export TZ=Asia/Harbin
+      - date
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+
+    script:
+      - cmake .. > /dev/null
+      - make  > /dev/null
+
+  - os: linux
+    arch: arm64
+    dist: bionic
+    language: c
+    compiler: clang
+    env: DESC="linux/clang build"
+    git:
+      - depth: 1
+
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+
+    before_script:
+      - export TZ=Asia/Harbin
+      - date
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+
+    script:
+      - if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
+         cmake .. -DCPUTYPE=aarch64 > /dev/null;
+        else
+         cmake .. > /dev/null;
+        fi
+      - make > /dev/null
+
+  - os: linux
+    arch: arm64
+    dist: trusty
+    language: c
+    git:
+      - depth: 1
+
+    addons:
+      apt:
+        packages:
+          - build-essential
+          - cmake
+    env:
+      - DESC="trusty/gcc-4.8 build"
+
+    before_script:
+      - export TZ=Asia/Harbin
+      - date
+      - cd ${TRAVIS_BUILD_DIR}
+      - mkdir debug
+      - cd debug
+
+    script:
+      - if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
+         cmake .. -DCPUTYPE=aarch64 > /dev/null;
+        else
+         cmake .. > /dev/null;
+        fi
+      - make > /dev/null
+
+#  - os: osx
+#    language: c
+#    compiler: clang
+#    env: DESC="mac/clang build"
+#    git:
+#      - depth: 1
+#    addons:
+#      homebrew:
+#        - cmake
+#
+#    script:
+#      - cd ${TRAVIS_BUILD_DIR}
+#      - mkdir debug
+#      - cd debug
+#      - cmake .. > /dev/null
+#      - make > /dev/null
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b572d7bd16c4fb2725a13324c2fe0b697e9a02a2..588526c28614f753f6ff70e898f13f3fd65318db 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,294 +1,42 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-SET(CMAKE_C_STANDARD 11)
-SET(CMAKE_VERBOSE_MAKEFILE ON)
-
-#
-# If need to set debug options
-#   1.Generate debug version:
-#     mkdir debug; cd debug;
-#     cmake -DCMAKE_BUILD_TYPE=Debug ..
-#   2.Generate release version:
-#     mkdir release; cd 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
-#     mkdir build; cd build;
-#     cmake -A x64 ..
-#     open the file named TDengine.sln
-#
-
-SET(TD_GODLL FALSE)
-IF (${DLLTYPE} MATCHES "go")
-  ADD_DEFINITIONS(-D_TD_GO_DLL_)
-  MESSAGE(STATUS "input dll type: " ${DLLTYPE})
-  SET(TD_GODLL TRUE)
+IF (CMAKE_VERSION VERSION_LESS 3.0)
+  PROJECT(TDengine CXX)
+  SET(PROJECT_VERSION_MAJOR "${LIB_MAJOR_VERSION}")
+  SET(PROJECT_VERSION_MINOR "${LIB_MINOR_VERSION}")
+  SET(PROJECT_VERSION_PATCH"${LIB_PATCH_VERSION}")
+  SET(PROJECT_VERSION "${LIB_VERSION_STRING}")
+ELSE ()
+  CMAKE_POLICY(SET CMP0048 NEW)
+  PROJECT(TDengine VERSION "${LIB_VERSION_STRING}" LANGUAGES CXX)
 ENDIF ()
 
-IF (NOT DEFINED TD_CLUSTER)
-  MESSAGE(STATUS "Build the Lite Version")
-  SET(TD_CLUSTER FALSE)
-  SET(TD_LITE TRUE)
-
-  SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
-  MESSAGE(STATUS "Community directory: " ${TD_COMMUNITY_DIR})
-
-
-  # Set macro definitions according to os platform
-  SET(TD_LINUX_64 FALSE)
-  SET(TD_LINUX_32 FALSE)
-  SET(TD_ARM FALSE)
-  SET(TD_ARM_64 FALSE)
-  SET(TD_ARM_32 FALSE)
-  SET(TD_MIPS FALSE)
-  SET(TD_MIPS_64 FALSE)
-  SET(TD_MIPS_32 FALSE)
-  SET(TD_DARWIN_64 FALSE)
-  SET(TD_WINDOWS_64 FALSE)
-
-  # if generate ARM version:
-  #   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
-  IF (${CPUTYPE} MATCHES "aarch32")
-    SET(TD_ARM TRUE)
-    SET(TD_ARM_32 TRUE)
-    ADD_DEFINITIONS(-D_TD_ARM_)
-    ADD_DEFINITIONS(-D_TD_ARM_32_)
-  ELSEIF (${CPUTYPE} MATCHES "aarch64")
-    SET(TD_ARM TRUE)
-    SET(TD_ARM_64 TRUE)
-    ADD_DEFINITIONS(-D_TD_ARM_)
-    ADD_DEFINITIONS(-D_TD_ARM_64_)
-  ELSEIF (${CPUTYPE} MATCHES "mips64")
-    SET(TD_MIPS TRUE)
-    SET(TD_MIPS_64 TRUE)
-    ADD_DEFINITIONS(-D_TD_MIPS_)
-    ADD_DEFINITIONS(-D_TD_MIPS_64_)
-  ELSEIF (${CPUTYPE} MATCHES "x64")
-    MESSAGE(STATUS "input cpuType: " ${CPUTYPE})
-  ELSEIF (${CPUTYPE} MATCHES "x86")
-    MESSAGE(STATUS "input cpuType: " ${CPUTYPE})
-  ELSE ()
-    MESSAGE(STATUS "input cpuType: " ${CPUTYPE})
-  ENDIF ()
+SET(TD_ACCOUNT FALSE)
+SET(TD_ADMIN FALSE)
+SET(TD_GRANT FALSE)
+SET(TD_SYNC TRUE)
+SET(TD_MQTT TRUE)
+SET(TD_TSDB_PLUGINS FALSE)
 
-  #
-  # Get OS information and store in variable TD_OS_INFO.
-  #
-  execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh)
-  execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
-  MESSAGE(STATUS "The current os is " ${TD_OS_INFO})
+SET(TD_COVER FALSE)
+SET(TD_MEM_CHECK FALSE)
 
-  IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
-      SET(TD_LINUX_64 TRUE)
-      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
-      ADD_DEFINITIONS(-D_M_X64)
-      MESSAGE(STATUS "The current platform is Linux 64-bit")
-    ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
-      IF (TD_ARM)
-        SET(TD_LINUX_32 TRUE)
-        SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/linux)
-        #ADD_DEFINITIONS(-D_M_IX86)
-        MESSAGE(STATUS "The current platform is Linux 32-bit")
-      ELSE ()
-        MESSAGE(FATAL_ERROR "The current platform is Linux 32-bit, but no ARM not supported yet")
-        EXIT ()
-      ENDIF ()
-    ELSE ()
-      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 ()
-
-  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 ()
-
-  #
-  # 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 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-      ELSE ()
-        SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -malign-double -g -malign-stringops -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-      ENDIF ()
-    ELSE ()
-      SET(COMMON_FLAGS "-std=gnu99 -Wall -fPIC -g -fsigned-char -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)
-    IF (${TD_OS_INFO} MATCHES "Alpine")
-      MESSAGE(STATUS "The current OS is Alpine, append extra flags")
-      SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
-      link_libraries(/usr/lib/libargp.a)
-      ADD_DEFINITIONS(-D_ALPINE)
-    ENDIF ()
-  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 -fsigned-char -munaligned-access -fpack-struct=8 -latomic -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)
-    IF (${TD_OS_INFO} MATCHES "Alpine")
-      MESSAGE(STATUS "The current OS is Alpine, add extra flags")
-      SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
-      link_library(/usr/lib/libargp.a)
-      ADD_DEFINITIONS(-D_ALPINE)
-    ENDIF ()
-  ELSEIF (TD_WINDOWS_64)
-    SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
-    IF (NOT TD_GODLL)
-      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")
-    ENDIF ()
-    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 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-    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 ()
-
-  # Set compiler options
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
-  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")
-
-  # Set c++ compiler options
-  # SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
-  # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} ${DEBUG_FLAGS}")
-  # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} ${RELEASE_FLAGS}")
-
-  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_64)
-      SET(CMAKE_BUILD_TYPE "Release")
-      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)
+SET(TD_PAGMODE_LITE FALSE)
+SET(TD_SOMODE_STATIC FALSE)
+SET(TD_POWER FALSE)
+SET(TD_GODLL FALSE)
 
-  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})
+SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
+MESSAGE(STATUS "Community directory: " ${TD_COMMUNITY_DIR})
 
-  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)
-    IF (NOT TD_GODLL)
-      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 ()
-    ELSE ()
-      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libtaos.dll DESTINATION driver)
-      INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libtaos.dll.a DESTINATION driver)
-    ENDIF ()
-  ELSEIF (TD_DARWIN_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} Darwin)")
-  ENDIF ()
-ENDIF ()
+INCLUDE(cmake/input.inc)
+INCLUDE(cmake/platform.inc)
+INCLUDE(cmake/define.inc)
+INCLUDE(cmake/env.inc)
+INCLUDE(cmake/version.inc)
+INCLUDE(cmake/install.inc)
 
 ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(tests)
 
 INCLUDE(CPack)
diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3f2c27bf6ecb5bb433e468c34577408c7ba6603
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,25 @@
+{
+  "configurations": [
+    {
+      "name": "WSL-GCC-Debug",
+      "generator": "Unix Makefiles",
+      "configurationType": "Debug",
+      "buildRoot": "${projectDir}\\build\\",
+      "installRoot": "${projectDir}\\build\\",
+      "cmakeExecutable": "/usr/bin/cmake",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "linux_x64" ],
+      "wslPath": "${defaultWSLPath}",
+      "addressSanitizerRuntimeFlags": "detect_leaks=0",
+      "variables": [
+        {
+          "name": "CMAKE_INSTALL_PREFIX",
+          "value": "/mnt/d/TDengine/TDengine/build",
+          "type": "PATH"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 6efa0ff8ef026c51a859123bf37c71d570d3758d..522fc0ebc1277684b77589c5c62d061f7b33ce32 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+[![Build Status](https://travis-ci.org/taosdata/TDengine.svg?branch=master)](https://travis-ci.org/taosdata/TDengine)
+[![Build status](https://ci.appveyor.com/api/projects/status/kf3pwh2or5afsgl9/branch/master?svg=true)](https://ci.appveyor.com/project/sangshuduo/tdengine-2n8ge/branch/master)
+[![Coverage Status](https://coveralls.io/repos/github/taosdata/TDengine/badge.svg?branch=develop)](https://coveralls.io/github/taosdata/TDengine?branch=develop)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4201/badge)](https://bestpractices.coreinfrastructure.org/projects/4201)
+[![tdengine](https://snapcraft.io//tdengine/badge.svg)](https://snapcraft.io/tdengine)
+
 [![TDengine](TDenginelogo.png)](https://www.taosdata.com)
 
 # What is TDengine？
@@ -17,46 +23,121 @@ TDengine is an open-sourced big data platform under [GNU AGPL v3.0](http://www.g
 - **Zero Management, No Learning Curve**: It takes only seconds to download, install, and run it successfully; there are no other dependencies. Automatic partitioning on tables or DBs. Standard SQL is used, with C/C++, Python, JDBC, Go and RESTful connectors.
 
 # Documentation
-For user manual, system design and architecture, engineering blogs, refer to [TDengine Documentation](https://www.taosdata.com/en/documentation/)
+For user manual, system design and architecture, engineering blogs, refer to [TDengine Documentation](https://www.taosdata.com/en/documentation/)(中文版请点击[这里](https://www.taosdata.com/cn/documentation20/))
  for details. The documentation from our website can also be downloaded locally from *documentation/tdenginedocs-en* or *documentation/tdenginedocs-cn*.
 
 # Building
 At the moment, TDengine only supports building and running on Linux systems. You can choose to [install from packages](https://www.taosdata.com/en/getting-started/#Install-from-Package) or from the source code. This quick guide is for installation from the source only.
 
-To build TDengine, use [CMake](https://cmake.org/) 2.8 or higher versions in the project directory. Install CMake for example on Ubuntu:
-```
-sudo apt-get install -y cmake build-essential
+To build TDengine, use [CMake](https://cmake.org/) 3.5 or higher versions in the project directory. 
+
+## Install tools
+
+### Ubuntu & Debian:
+```bash
+sudo apt-get install -y gcc cmake build-essential git
 ```
 
 To compile and package the JDBC driver source code, you should have a Java jdk-8 or higher and Apache Maven 2.7 or higher installed. 
-To install openjdk-8 on Ubuntu:
+To install openjdk-8:
+```bash
+sudo apt-get install -y openjdk-8-jdk
+```
+
+To install Apache Maven:
+```bash
+sudo apt-get install -y  maven
+```
+
+### Centos 7:
+```bash
+sudo yum install -y gcc gcc-c++ make cmake3 epel-release git
+sudo yum remove -y cmake
+sudo ln -s /usr/bin/cmake3 /usr/bin/cmake
+```
+
+To install openjdk-8:
+```bash
+sudo yum install -y java-1.8.0-openjdk
 ```
-sudo apt-get install openjdk-8-jdk
+
+To install Apache Maven:
+```bash
+sudo yum install -y maven
 ```
-To install Apache Maven on Ubuntu:
+
+### Centos 8 & Fedora:
+```bash
+sudo dnf install -y gcc gcc-c++ make cmake epel-release git
 ```
-sudo apt-get install maven
+
+To install openjdk-8:
+```bash
+sudo dnf install -y java-1.8.0-openjdk
 ```
 
-Build TDengine:
+To install Apache Maven:
+```bash
+sudo dnf install -y maven
+```
 
+## Get the source codes
+
+- github:
+```bash
+git clone https://github.com/taosdata/TDengine.git
+cd TDengine
 ```
-mkdir build && cd build
+
+## Build TDengine
+
+### On Linux platform
+
+```bash
+mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
 
 To compile on an ARM processor (aarch64 or aarch32), please add option CPUTYPE as below:
 
 aarch64:
-```cmd
+```bash
 cmake .. -DCPUTYPE=aarch64 && cmake --build .
 ```
 
 aarch32:
-```cmd
+```bash
 cmake .. -DCPUTYPE=aarch32 && cmake --build .
 ```
 
+### On Windows platform
+
+If you use the Visual Studio 2013, please open a command window by executing "cmd.exe".
+Please specify "x86_amd64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
+```
+mkdir debug && cd debug
+"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" < x86_amd64 | x86 >
+cmake .. -G "NMake Makefiles"
+nmake
+```
+
+If you use the Visual Studio 2019, please open a command window by executing "cmd.exe".
+Please specify "x64" for 64 bits Windows or specify "x86" is for 32 bits Windows when you execute vcvarsall.bat.
+```
+mkdir debug && cd debug
+"c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" < x64 | x86 >
+cmake .. -G "NMake Makefiles"
+nmake
+```
+
+Or, you can open a command window by clicking Visual Studio 2019 menu "Tools -> Command Line -> Developer Command Prompt" or "Tools -> Command Line -> Developer PowerShell" then execute commands as follows:
+```
+mkdir debug && cd debug
+cmake .. -G "NMake Makefiles"
+nmake
+```
+
+# Quick Run
 # Quick Run
 To quickly start a TDengine server after building, run the command below in terminal:
 ```cmd
@@ -118,6 +199,11 @@ The TDengine community has also kindly built some of their own connectors! Follo
 
 - [Rust Connector](https://github.com/taosdata/TDengine/tree/master/tests/examples/rust)
 - [.Net Core Connector](https://github.com/maikebing/Maikebing.EntityFrameworkCore.Taos)
+- [Lua Connector](https://github.com/taosdata/TDengine/tree/develop/tests/examples/lua)
+
+# How to run the test cases and how to add a new test case?
+  TDengine's test framework and all test cases are fully open source.
+  Please refer to [this document](tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md) for how to run test and develop new test case.
 
 # TDengine Roadmap
 - Support event-driven stream computing
@@ -130,3 +216,8 @@ The TDengine community has also kindly built some of their own connectors! Follo
 # Contribute to TDengine
 
 Please follow the [contribution guidelines](CONTRIBUTING.md) to contribute to the project.
+
+# Join TDengine WeChat Group
+
+Add WeChat “tdengine” to join the group，you can communicate with other users.
+
diff --git a/alert/.gitignore b/alert/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..332fefb3ae376fb47d21c8e5d44c2d1d61f96e5a
--- /dev/null
+++ b/alert/.gitignore
@@ -0,0 +1,21 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+vendor/
+
+# Project specific files
+cmd/alert/alert
+cmd/alert/alert.log
+*.db
+*.gz
\ No newline at end of file
diff --git a/alert/README.md b/alert/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..23179669349ebf94f3774c6101c06c2e375ef059
--- /dev/null
+++ b/alert/README.md
@@ -0,0 +1,184 @@
+# Alert
+
+The Alert application reads data from [TDEngine](https://www.taosdata.com/), calculating according to predefined rules to generate alerts, and pushes alerts to downstream applications like [AlertManager](https://github.com/prometheus/alertmanager).
+
+## Install
+
+### From Binary
+
+Precompiled binaries is available at [taosdata website](https://www.taosdata.com/en/getting-started/), please download and unpack it by below shell command.
+
+```
+$ tar -xzf tdengine-alert-$version-$OS-$ARCH.tar.gz 
+```
+
+If you have no TDengine server or client installed, please execute below command to install the required driver library:
+
+```
+$ ./install_driver.sh
+```
+
+### From Source Code
+
+Two prerequisites are required to install from source.
+
+1. TDEngine server or client must be installed.
+2. Latest [Go](https://golang.org) language must be installed.
+
+When these two prerequisites are ready, please follow steps below to build the application:
+
+```
+$ mkdir taosdata
+$ cd taosdata
+$ git clone https://github.com/taosdata/tdengine.git
+$ cd tdengine/alert/cmd/alert
+$ go build
+```
+
+If `go build` fails because some of the dependency packages cannot be downloaded, please follow steps in [goproxy.io](https://goproxy.io) to configure `GOPROXY` and try `go build` again.
+
+## Configure
+
+The configuration file format of Alert application is standard `json`, below is its default content, please revise according to actual scenario.
+
+```json
+{
+  "port": 8100,
+  "database": "file:alert.db",
+  "tdengine": "root:taosdata@/tcp(127.0.0.1:0)/",
+  "log": {
+    "level": "production",
+    "path": "alert.log"
+  },
+  "receivers": {
+    "alertManager": "http://127.0.0.1:9093/api/v1/alerts",
+    "console": true
+  }
+}
+```
+
+The use of each configuration item is:
+
+* **port**: This is the `http` service port which enables other application to manage rules by `restful API`.
+* **database**: rules are stored in a `sqlite` database, this is the path of the database file (if the file does not exist, the alert application creates it automatically).
+* **tdengine**: connection string of `TDEngine` server, note in most cases the database information should be put in a rule, thus it should NOT be included here.
+* **log > level**: log level, could be `production` or `debug`.
+* **log > path**: log output file path.
+* **receivers > alertManager**: the alert application pushes alerts to `AlertManager` at this URL.
+* **receivers > console**: print out alerts to console (stdout) or not.
+
+When the configruation file is ready, the alert application can be started with below command (`alert.cfg` is the path of the configuration file):
+
+```
+$ ./alert -cfg alert.cfg
+```
+
+## Prepare an alert rule
+
+From technical aspect, an alert could be defined as: query and filter recent data from `TDEngine`, and calculating out a boolean value from these data according to a formula, and trigger an alert if the boolean value last for a certain duration.
+
+This is a rule example in `json` format:
+
+```json
+{
+  "name": "rule1",
+  "sql": "select sum(col1) as sumCol1 from test.meters where ts > now - 1h group by areaid",
+  "expr": "sumCol1 > 10",
+  "for": "10m",
+  "period": "1m",
+  "labels": {
+    "ruleName": "rule1"
+  },
+  "annotations": {
+    "summary": "sum of rule {{$labels.ruleName}} of area {{$values.areaid}} is {{$values.sumCol1}}"
+  }
+}
+```
+
+The fields of the rule is explained below:
+
+* **name**: the name of the rule, must be unique.
+* **sql**: this is the `sql` statement used to query data from `TDEngine`, columns of the query result are used in later processing, so please give the column an alias if aggregation functions are used.
+* **expr**: an expression whose result is a boolean value, arithmatic and logical calculations can be included in the expression, and builtin functions (see below) are also supported. Alerts are only triggered when the expression evaluates to `true`.
+* **for**: this item is a duration which default value is zero second. when `expr` evaluates to `true` and last at least this duration, an alert is triggered.
+* **period**: the interval for the alert application to check the rule, default is 1 minute.
+* **labels**: a label list, labels are used to generate alert information. note if the `sql` statement includes a `group by` clause, the `group by` columns are inserted into this list automatically.
+* **annotations**: the template of alert information which is in [go template](https://golang.org/pkg/text/template) syntax, labels can be referenced by `$labels.<label name>` and columns of the query result can be referenced by `$values.<column name>`.
+
+### Operators
+
+Operators which can be used in the `expr` field of a rule are list below, `()` can be to change precedence if default does not meet requirement.
+
+<table>
+<thead>
+<tr> <td>Operator</td><td>Unary/Binary</td><td>Precedence</td><td>Effect</td> </tr>
+</thead>
+<tbody>
+<tr> <td>~</td><td>Unary</td><td>6</td><td>Bitwise Not</td> </tr>
+<tr> <td>!</td><td>Unary</td><td>6</td><td>Logical Not</td> </tr>
+<tr> <td>+</td><td>Unary</td><td>6</td><td>Positive Sign</td> </tr>
+<tr> <td>-</td><td>Unary</td><td>6</td><td>Negative Sign</td> </tr>
+<tr> <td>*</td><td>Binary</td><td>5</td><td>Multiplication</td> </tr>
+<tr> <td>/</td><td>Binary</td><td>5</td><td>Division</td> </tr>
+<tr> <td>%</td><td>Binary</td><td>5</td><td>Modulus</td> </tr>
+<tr> <td><<</td><td>Binary</td><td>5</td><td>Bitwise Left Shift</td> </tr>
+<tr> <td>>></td><td>Binary</td><td>5</td><td>Bitwise Right Shift</td> </tr>
+<tr> <td>&</td><td>Binary</td><td>5</td><td>Bitwise And</td> </tr>
+<tr> <td>+</td><td>Binary</td><td>4</td><td>Addition</td> </tr>
+<tr> <td>-</td><td>Binary</td><td>4</td><td>Subtraction</td> </tr>
+<tr> <td>|</td><td>Binary</td><td>4</td><td>Bitwise Or</td> </tr>
+<tr> <td>^</td><td>Binary</td><td>4</td><td>Bitwise Xor</td> </tr>
+<tr> <td>==</td><td>Binary</td><td>3</td><td>Equal</td> </tr>
+<tr> <td>!=</td><td>Binary</td><td>3</td><td>Not Equal</td> </tr>
+<tr> <td><</td><td>Binary</td><td>3</td><td>Less Than</td> </tr>
+<tr> <td><=</td><td>Binary</td><td>3</td><td>Less Than or Equal</td> </tr>
+<tr> <td>></td><td>Binary</td><td>3</td><td>Great Than</td> </tr>
+<tr> <td>>=</td><td>Binary</td><td>3</td><td>Great Than or Equal</td> </tr>
+<tr> <td>&&</td><td>Binary</td><td>2</td><td>Logical And</td> </tr>
+<tr> <td>||</td><td>Binary</td><td>1</td><td>Logical Or</td> </tr>
+</tbody>
+</table>
+
+### Built-in Functions
+
+Built-in function can be used in the `expr` field of a rule.
+
+* **min**: returns the minimum one of its arguments, for example: `min(1, 2, 3)` returns `1`.
+* **max**: returns the maximum one of its arguments, for example: `max(1, 2, 3)` returns `3`.
+* **sum**: returns the sum of its arguments, for example: `sum(1, 2, 3)` returns `6`.
+* **avg**: returns the average of its arguments, for example: `avg(1, 2, 3)` returns `2`.
+* **sqrt**: returns the square root of its argument, for example: `sqrt(9)` returns `3`.
+* **ceil**: returns the minimum integer which greater or equal to its argument, for example: `ceil(9.1)` returns `10`.
+* **floor**: returns the maximum integer which lesser or equal to its argument, for example: `floor(9.9)` returns `9`.
+* **round**: round its argument to nearest integer, for examples: `round(9.9)` returns `10` and `round(9.1)` returns `9`.
+* **log**: returns the natural logarithm of its argument, for example: `log(10)` returns `2.302585`. 
+* **log10**: returns base 10 logarithm of its argument, for example: `log10(10)` return `1`.
+* **abs**: returns the absolute value of its argument, for example: `abs(-1)` returns `1`.
+* **if**: if the first argument is `true` returns its second argument, and returns its third argument otherwise, for examples: `if(true, 10, 100)` returns `10` and `if(false, 10, 100)` returns `100`.
+
+## Rule Management
+
+* Add / Update
+
+    * API address: http://\<server\>:\<port\>/api/update-rule
+    * Method: POST
+    * Body: the rule
+    * Example：curl -d '@rule.json' http://localhost:8100/api/update-rule
+
+* Delete
+
+    * API address: http://\<server\>:\<port\>/api/delete-rule?name=\<rule name\>
+    * Method：DELETE
+    * Example：curl -X DELETE http://localhost:8100/api/delete-rule?name=rule1
+
+* Enable / Disable
+
+    * API address: http://\<server\>:\<port\>/api/enable-rule?name=\<rule name\>&enable=[true | false]
+    * Method POST
+    * Example：curl -X POST http://localhost:8100/api/enable-rule?name=rule1&enable=true
+
+* Retrieve rule list
+
+    * API address: http://\<server\>:\<port\>/api/list-rule
+    * Method: GET
+    * Example：curl http://localhost:8100/api/list-rule
diff --git a/alert/README_cn.md b/alert/README_cn.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec6e4566c8eb9fa2142c37b2b3e1b1a04f783a9a
--- /dev/null
+++ b/alert/README_cn.md
@@ -0,0 +1,181 @@
+# Alert
+
+报警监测程序，从 [TDEngine](https://www.taosdata.com/) 读取数据后，根据预定义的规则计算和生成报警，并将它们推送到 [AlertManager](https://github.com/prometheus/alertmanager) 或其它下游应用。
+
+## 安装
+
+### 使用编译好的二进制文件
+
+您可以从 [涛思数据](https://www.taosdata.com/cn/getting-started/) 官网下载最新的安装包。下载完成后，使用以下命令解压：
+
+```
+$ tar -xzf tdengine-alert-$version-$OS-$ARCH.tar.gz 
+```
+
+如果您之前没有安装过 TDengine 的服务端或客户端，您需要使用下面的命令安装 TDengine 的动态库：
+
+```
+$ ./install_driver.sh
+```
+
+### 从源码安装
+
+从源码安装需要在您用于编译的计算机上提前安装好 TDEngine 的服务端或客户端，如果您还没有安装，可以参考 TDEngine 的文档。
+
+报警监测程序使用 [Go语言](https://golang.org) 开发，请安装最新版的 Go 语言编译环境。
+
+```
+$ mkdir taosdata
+$ cd taosdata
+$ git clone https://github.com/taosdata/tdengine.git
+$ cd tdengine/alert/cmd/alert
+$ go build
+```
+
+如果由于部分包无法下载导致 `go build` 失败，请根据 [goproxy.io](https://goproxy.io) 上的说明配置好 `GOPROXY` 再重新执行 `go build`。
+
+## 配置
+
+报警监测程序的配置文件采用标准`json`格式，下面是默认的文件内容，请根据实际情况修改。
+
+```json
+{
+  "port": 8100,
+  "database": "file:alert.db",
+  "tdengine": "root:taosdata@/tcp(127.0.0.1:0)/",
+  "log": {
+    "level": "production",
+    "path": "alert.log"
+  },
+  "receivers": {
+    "alertManager": "http://127.0.0.1:9093/api/v1/alerts",
+    "console": true
+  }
+}
+```
+
+其中：
+
+* **port**：报警监测程序支持使用 `restful API` 对规则进行管理，这个参数用于配置 `http` 服务的侦听端口。
+* **database**：报警监测程序将规则保存到了一个 `sqlite` 数据库中，这个参数用于指定数据库文件的路径（不需要提前创建这个文件，如果它不存在，程序会自动创建它）。
+* **tdengine**：`TDEngine` 的连接信息，一般来说，数据库信息应该在报警规则中指定，所以这里 **不** 应包含这一部分信息。
+* **log > level**：日志的记录级别，可选 `production` 或 `debug`。
+* **log > path**：日志文件的路径。
+* **receivers > alertManager**：报警监测程序会将报警推送到 `AlertManager`，在这里指定 `AlertManager` 的接收地址。
+* **receivers > console**：是否输出到控制台 (stdout)。
+
+准备好配置文件后，可使用下面的命令启动报警监测程序（ `alert.cfg` 是配置文件的路径）：
+
+```
+$ ./alert -cfg alert.cfg
+```
+
+## 编写报警规则
+
+从技术角度，可以将报警描述为：从 `TDEngine` 中查询最近一段时间、符合一定过滤条件的数据，并基于这些数据根据定义好的计算方法得出一个结果，当结果符合某个条件且持续一定时间后，触发报警。
+
+根据上面的描述，可以很容易的知道报警规则中需要包含的大部分信息。 以下是一个完整的报警规则，采用标准 `json` 格式：
+
+```json
+{
+  "name": "rule1",
+  "sql": "select sum(col1) as sumCol1 from test.meters where ts > now - 1h group by areaid",
+  "expr": "sumCol1 > 10",
+  "for": "10m",
+  "period": "1m",
+  "labels": {
+    "ruleName": "rule1"
+  },
+  "annotations": {
+    "summary": "sum of rule {{$labels.ruleName}} of area {{$values.areaid}} is {{$values.sumCol1}}"
+  }
+}
+```
+
+其中：
+
+* **name**：用于为规则指定一个唯一的名字。
+* **sql**：从 `TDEngine` 中查询数据时使用的 `sql` 语句，查询结果中的列将被后续计算使用，所以，如果使用了聚合函数，请为这一列指定一个别名。
+* **expr**：一个计算结果为布尔型的表达式，支持算数运算、逻辑运算，并且内置了部分函数，也可以引用查询结果中的列。 当表达式计算结果为 `true` 时，进入报警状态。
+* **for**：当表达式计算结果为 `true` 的连续时长超过这个选项时，触发报警，否则报警处于“待定”状态。默认为0，表示一旦计算结果为 `true`，立即触发报警。
+* **period**：规则的检查周期，默认1分钟。
+* **labels**：人为指定的标签列表，标签可以在生成报警信息引用。如果 `sql` 中包含 `group by` 子句，则所有用于分组的字段会被自动加入这个标签列表中。
+* **annotations**：用于定义报警信息，使用 [go template](https://golang.org/pkg/text/template) 语法，其中，可以通过 `$labels.<label name>` 引用标签，也可以通过 `$values.<column name>` 引用查询结果中的列。
+
+### 运算符
+
+以下是 `expr` 字段中支持的运算符，您可以使用 `()` 改变运算的优先级。
+
+<table>
+<thead>
+<tr> <td>运算符</td><td>单目/双目</td><td>优先级</td><td>作用</td> </tr>
+</thead>
+<tbody>
+<tr> <td>~</td><td>单目</td><td>6</td><td>按位取反</td> </tr>
+<tr> <td>!</td><td>单目</td><td>6</td><td>逻辑非</td> </tr>
+<tr> <td>+</td><td>单目</td><td>6</td><td>正号</td> </tr>
+<tr> <td>-</td><td>单目</td><td>6</td><td>负号</td> </tr>
+<tr> <td>*</td><td>双目</td><td>5</td><td>乘法</td> </tr>
+<tr> <td>/</td><td>双目</td><td>5</td><td>除法</td> </tr>
+<tr> <td>%</td><td>双目</td><td>5</td><td>取模（余数）</td> </tr>
+<tr> <td><<</td><td>双目</td><td>5</td><td>按位左移</td> </tr>
+<tr> <td>>></td><td>双目</td><td>5</td><td>按位右移</td> </tr>
+<tr> <td>&</td><td>双目</td><td>5</td><td>按位与</td> </tr>
+<tr> <td>+</td><td>双目</td><td>4</td><td>加法</td> </tr>
+<tr> <td>-</td><td>双目</td><td>4</td><td>减法</td> </tr>
+<tr> <td>|</td><td>双目</td><td>4</td><td>按位或</td> </tr>
+<tr> <td>^</td><td>双目</td><td>4</td><td>按位异或</td> </tr>
+<tr> <td>==</td><td>双目</td><td>3</td><td>等于</td> </tr>
+<tr> <td>!=</td><td>双目</td><td>3</td><td>不等于</td> </tr>
+<tr> <td><</td><td>双目</td><td>3</td><td>小于</td> </tr>
+<tr> <td><=</td><td>双目</td><td>3</td><td>小于或等于</td> </tr>
+<tr> <td>></td><td>双目</td><td>3</td><td>大于</td> </tr>
+<tr> <td>>=</td><td>双目</td><td>3</td><td>大于或等于</td> </tr>
+<tr> <td>&&</td><td>双目</td><td>2</td><td>逻辑与</td> </tr>
+<tr> <td>||</td><td>双目</td><td>1</td><td>逻辑或</td> </tr>
+</tbody>
+</table>
+
+### 内置函数
+
+目前支持以下内置函数，可以在报警规则的 `expr` 字段中使用这些函数：
+
+* **min**：取多个值中的最小值，例如 `min(1, 2, 3)` 返回 `1`。
+* **max**：取多个值中的最大值，例如 `max(1, 2, 3)` 返回 `3`。
+* **sum**：求和，例如 `sum(1, 2, 3)` 返回 `6`。
+* **avg**：求算术平均值，例如 `avg(1, 2, 3)` 返回 `2`。
+* **sqrt**：计算平方根，例如 `sqrt(9)` 返回 `3`。
+* **ceil**：上取整，例如 `ceil(9.1)` 返回 `10`。
+* **floor**：下取整，例如 `floor(9.9)` 返回 `9`。
+* **round**：四舍五入，例如 `round(9.9)` 返回 `10`， `round(9.1)` 返回 `9`。
+* **log**：计算自然对数，例如 `log(10)` 返回 `2.302585`。
+* **log10**：计算以10为底的对数，例如 `log10(10)` 返回 `1`。
+* **abs**：计算绝对值，例如 `abs(-1)` 返回 `1`。
+* **if**：如果第一个参数为 `true`，返回第二个参数，否则返回第三个参数，例如 `if(true, 10, 100)` 返回 `10`， `if(false, 10, 100)` 返回 `100`。
+
+## 规则管理
+
+* 添加或修改
+
+    * API地址：http://\<server\>:\<port\>/api/update-rule
+    * Method：POST
+    * Body：规则定义
+    * 示例：curl -d '@rule.json' http://localhost:8100/api/update-rule
+
+* 删除
+
+    * API地址：http://\<server\>:\<port\>/api/delete-rule?name=\<rule name\>
+    * Method：DELETE
+    * 示例：curl -X DELETE http://localhost:8100/api/delete-rule?name=rule1
+
+* 挂起或恢复
+
+    * API地址：http://\<server\>:\<port\>/api/enable-rule?name=\<rule name\>&enable=[true | false]
+    * Method：POST
+    * 示例：curl -X POST http://localhost:8100/api/enable-rule?name=rule1&enable=true
+
+* 获取列表
+
+    * API地址：http://\<server\>:\<port\>/api/list-rule
+    * Method：GET
+    * 示例：curl http://localhost:8100/api/list-rule
diff --git a/alert/app/app.go b/alert/app/app.go
new file mode 100644
index 0000000000000000000000000000000000000000..760f93d839e217cd552bcf06e230675b16b80463
--- /dev/null
+++ b/alert/app/app.go
@@ -0,0 +1,175 @@
+package app
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/taosdata/alert/models"
+	"github.com/taosdata/alert/utils"
+	"github.com/taosdata/alert/utils/log"
+)
+
+func Init() error {
+	if e := initRule(); e != nil {
+		return e
+	}
+
+	http.HandleFunc("/api/list-rule", onListRule)
+	http.HandleFunc("/api/list-alert", onListAlert)
+	http.HandleFunc("/api/update-rule", onUpdateRule)
+	http.HandleFunc("/api/enable-rule", onEnableRule)
+	http.HandleFunc("/api/delete-rule", onDeleteRule)
+
+	return nil
+}
+
+func Uninit() error {
+	uninitRule()
+	return nil
+}
+
+func onListRule(w http.ResponseWriter, r *http.Request) {
+	var res []*Rule
+	rules.Range(func(k, v interface{}) bool {
+		res = append(res, v.(*Rule))
+		return true
+	})
+
+	w.Header().Add("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(res)
+}
+
+func onListAlert(w http.ResponseWriter, r *http.Request) {
+	var alerts []*Alert
+	rn := r.URL.Query().Get("rule")
+	rules.Range(func(k, v interface{}) bool {
+		if len(rn) > 0 && rn != k.(string) {
+			return true
+		}
+
+		rule := v.(*Rule)
+		rule.Alerts.Range(func(k, v interface{}) bool {
+			alert := v.(*Alert)
+			// TODO: not go-routine safe
+			if alert.State != AlertStateWaiting {
+				alerts = append(alerts, v.(*Alert))
+			}
+			return true
+		})
+		return true
+	})
+	w.Header().Add("Content-Type", "application/json; charset=utf-8")
+	json.NewEncoder(w).Encode(alerts)
+}
+
+func onUpdateRule(w http.ResponseWriter, r *http.Request) {
+	data, e := ioutil.ReadAll(r.Body)
+	if e != nil {
+		log.Error("failed to read request body: ", e.Error())
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	rule, e := newRule(string(data))
+	if e != nil {
+		log.Error("failed to parse rule: ", e.Error())
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	if e = doUpdateRule(rule, string(data)); e != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+}
+
+func doUpdateRule(rule *Rule, ruleStr string) error {
+	if _, ok := rules.Load(rule.Name); ok {
+		if len(utils.Cfg.Database) > 0 {
+			e := models.UpdateRule(rule.Name, ruleStr)
+			if e != nil {
+				log.Errorf("[%s]: update failed: %s", rule.Name, e.Error())
+				return e
+			}
+		}
+		log.Infof("[%s]: update succeeded.", rule.Name)
+	} else {
+		if len(utils.Cfg.Database) > 0 {
+			e := models.AddRule(&models.Rule{
+				Name:    rule.Name,
+				Content: ruleStr,
+			})
+			if e != nil {
+				log.Errorf("[%s]: add failed: %s", rule.Name, e.Error())
+				return e
+			}
+		}
+		log.Infof("[%s]: add succeeded.", rule.Name)
+	}
+
+	rules.Store(rule.Name, rule)
+	return nil
+}
+
+func onEnableRule(w http.ResponseWriter, r *http.Request) {
+	var rule *Rule
+	name := r.URL.Query().Get("name")
+	enable := strings.ToLower(r.URL.Query().Get("enable")) == "true"
+
+	if x, ok := rules.Load(name); ok {
+		rule = x.(*Rule)
+	} else {
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	if rule.isEnabled() == enable {
+		return
+	}
+
+	if len(utils.Cfg.Database) > 0 {
+		if e := models.EnableRule(name, enable); e != nil {
+			if enable {
+				log.Errorf("[%s]: enable failed: ", name, e.Error())
+			} else {
+				log.Errorf("[%s]: disable failed: ", name, e.Error())
+			}
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+	}
+
+	if enable {
+		rule = rule.clone()
+		rule.setNextRunTime(time.Now())
+		rules.Store(rule.Name, rule)
+		log.Infof("[%s]: enable succeeded.", name)
+	} else {
+		rule.setState(RuleStateDisabled)
+		log.Infof("[%s]: disable succeeded.", name)
+	}
+}
+
+func onDeleteRule(w http.ResponseWriter, r *http.Request) {
+	name := r.URL.Query().Get("name")
+	if len(name) == 0 {
+		return
+	}
+	if e := doDeleteRule(name); e != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+}
+
+func doDeleteRule(name string) error {
+	if len(utils.Cfg.Database) > 0 {
+		if e := models.DeleteRule(name); e != nil {
+			log.Errorf("[%s]: delete failed: %s", name, e.Error())
+			return e
+		}
+	}
+	rules.Delete(name)
+	log.Infof("[%s]: delete succeeded.", name)
+	return nil
+}
diff --git a/alert/app/expr/expr.go b/alert/app/expr/expr.go
new file mode 100644
index 0000000000000000000000000000000000000000..42cb506f0e4f66d238cb3d37eeac3752d68b1989
--- /dev/null
+++ b/alert/app/expr/expr.go
@@ -0,0 +1,792 @@
+package expr
+
+import (
+	"errors"
+	"io"
+	"math"
+	"strconv"
+	"strings"
+	"text/scanner"
+)
+
+var (
+	// compile errors
+	ErrorExpressionSyntax     = errors.New("expression syntax error")
+	ErrorUnrecognizedFunction = errors.New("unrecognized function")
+	ErrorArgumentCount        = errors.New("too many/few arguments")
+	ErrorInvalidFloat         = errors.New("invalid float")
+	ErrorInvalidInteger       = errors.New("invalid integer")
+
+	// eval errors
+	ErrorUnsupportedDataType     = errors.New("unsupported data type")
+	ErrorInvalidOperationFloat   = errors.New("invalid operation for float")
+	ErrorInvalidOperationInteger = errors.New("invalid operation for integer")
+	ErrorInvalidOperationBoolean = errors.New("invalid operation for boolean")
+	ErrorOnlyIntegerAllowed      = errors.New("only integers is allowed")
+	ErrorDataTypeMismatch        = errors.New("data type mismatch")
+)
+
+// binary operator precedence
+//    5             *   /   %  <<  >>  &
+//    4             +   -   |  ^
+//    3             ==  !=  <  <=  >   >=
+//    2             &&
+//    1             ||
+const (
+	opOr         = -(iota + 1000) // ||
+	opAnd                         // &&
+	opEqual                       // ==
+	opNotEqual                    // !=
+	opGTE                         // >=
+	opLTE                         // <=
+	opLeftShift                   // <<
+	opRightShift                  // >>
+)
+
+type lexer struct {
+	scan scanner.Scanner
+	tok  rune
+}
+
+func (l *lexer) init(src io.Reader) {
+	l.scan.Error = func(s *scanner.Scanner, msg string) {
+		panic(errors.New(msg))
+	}
+	l.scan.Mode = scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings
+	l.scan.Init(src)
+	l.tok = l.next()
+}
+
+func (l *lexer) next() rune {
+	l.tok = l.scan.Scan()
+
+	switch l.tok {
+	case '|':
+		if l.scan.Peek() == '|' {
+			l.tok = opOr
+			l.scan.Scan()
+		}
+
+	case '&':
+		if l.scan.Peek() == '&' {
+			l.tok = opAnd
+			l.scan.Scan()
+		}
+
+	case '=':
+		if l.scan.Peek() == '=' {
+			l.tok = opEqual
+			l.scan.Scan()
+		} else {
+			// TODO: error
+		}
+
+	case '!':
+		if l.scan.Peek() == '=' {
+			l.tok = opNotEqual
+			l.scan.Scan()
+		} else {
+			// TODO: error
+		}
+
+	case '<':
+		if tok := l.scan.Peek(); tok == '<' {
+			l.tok = opLeftShift
+			l.scan.Scan()
+		} else if tok == '=' {
+			l.tok = opLTE
+			l.scan.Scan()
+		}
+
+	case '>':
+		if tok := l.scan.Peek(); tok == '>' {
+			l.tok = opRightShift
+			l.scan.Scan()
+		} else if tok == '=' {
+			l.tok = opGTE
+			l.scan.Scan()
+		}
+	}
+	return l.tok
+}
+
+func (l *lexer) token() rune {
+	return l.tok
+}
+
+func (l *lexer) text() string {
+	switch l.tok {
+	case opOr:
+		return "||"
+	case opAnd:
+		return "&&"
+	case opEqual:
+		return "=="
+	case opNotEqual:
+		return "!="
+	case opLeftShift:
+		return "<<"
+	case opLTE:
+		return "<="
+	case opRightShift:
+		return ">>"
+	case opGTE:
+		return ">="
+	default:
+		return l.scan.TokenText()
+	}
+}
+
+type Expr interface {
+	Eval(env func(string) interface{}) interface{}
+}
+
+type unaryExpr struct {
+	op      rune
+	subExpr Expr
+}
+
+func (ue *unaryExpr) Eval(env func(string) interface{}) interface{} {
+	val := ue.subExpr.Eval(env)
+	switch v := val.(type) {
+	case float64:
+		if ue.op != '-' {
+			panic(ErrorInvalidOperationFloat)
+		}
+		return -v
+	case int64:
+		switch ue.op {
+		case '-':
+			return -v
+		case '~':
+			return ^v
+		default:
+			panic(ErrorInvalidOperationInteger)
+		}
+	case bool:
+		if ue.op != '!' {
+			panic(ErrorInvalidOperationBoolean)
+		}
+		return !v
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+type binaryExpr struct {
+	op  rune
+	lhs Expr
+	rhs Expr
+}
+
+func (be *binaryExpr) Eval(env func(string) interface{}) interface{} {
+	lval := be.lhs.Eval(env)
+	rval := be.rhs.Eval(env)
+
+	switch be.op {
+	case '*':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv * rv
+			case int64:
+				return lv * float64(rv)
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) * rv
+			case int64:
+				return lv * rv
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case '/':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				if rv == 0 {
+					return math.Inf(int(lv))
+				} else {
+					return lv / rv
+				}
+			case int64:
+				if rv == 0 {
+					return math.Inf(int(lv))
+				} else {
+					return lv / float64(rv)
+				}
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				if rv == 0 {
+					return math.Inf(int(lv))
+				} else {
+					return float64(lv) / rv
+				}
+			case int64:
+				if rv == 0 {
+					return math.Inf(int(lv))
+				} else {
+					return lv / rv
+				}
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case '%':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return math.Mod(lv, rv)
+			case int64:
+				return math.Mod(lv, float64(rv))
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return math.Mod(float64(lv), rv)
+			case int64:
+				if rv == 0 {
+					return math.Inf(int(lv))
+				} else {
+					return lv % rv
+				}
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case opLeftShift:
+		switch lv := lval.(type) {
+		case int64:
+			switch rv := rval.(type) {
+			case int64:
+				return lv << rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case opRightShift:
+		switch lv := lval.(type) {
+		case int64:
+			switch rv := rval.(type) {
+			case int64:
+				return lv >> rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case '&':
+		switch lv := lval.(type) {
+		case int64:
+			switch rv := rval.(type) {
+			case int64:
+				return lv & rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case '+':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv + rv
+			case int64:
+				return lv + float64(rv)
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) + rv
+			case int64:
+				return lv + rv
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case '-':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv - rv
+			case int64:
+				return lv - float64(rv)
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) - rv
+			case int64:
+				return lv - rv
+			case bool:
+				panic(ErrorInvalidOperationBoolean)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case '|':
+		switch lv := lval.(type) {
+		case int64:
+			switch rv := rval.(type) {
+			case int64:
+				return lv | rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case '^':
+		switch lv := lval.(type) {
+		case int64:
+			switch rv := rval.(type) {
+			case int64:
+				return lv ^ rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case opEqual:
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv == rv
+			case int64:
+				return lv == float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) == rv
+			case int64:
+				return lv == rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			switch rv := rval.(type) {
+			case float64:
+			case int64:
+			case bool:
+				return lv == rv
+			}
+		}
+
+	case opNotEqual:
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv != rv
+			case int64:
+				return lv != float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) != rv
+			case int64:
+				return lv != rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			switch rv := rval.(type) {
+			case float64:
+			case int64:
+			case bool:
+				return lv != rv
+			}
+		}
+
+	case '<':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv < rv
+			case int64:
+				return lv < float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) < rv
+			case int64:
+				return lv < rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case opLTE:
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv <= rv
+			case int64:
+				return lv <= float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) <= rv
+			case int64:
+				return lv <= rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case '>':
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv > rv
+			case int64:
+				return lv > float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) > rv
+			case int64:
+				return lv > rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case opGTE:
+		switch lv := lval.(type) {
+		case float64:
+			switch rv := rval.(type) {
+			case float64:
+				return lv >= rv
+			case int64:
+				return lv >= float64(rv)
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case int64:
+			switch rv := rval.(type) {
+			case float64:
+				return float64(lv) >= rv
+			case int64:
+				return lv >= rv
+			case bool:
+				panic(ErrorDataTypeMismatch)
+			}
+		case bool:
+			panic(ErrorInvalidOperationBoolean)
+		}
+
+	case opAnd:
+		switch lv := lval.(type) {
+		case bool:
+			switch rv := rval.(type) {
+			case bool:
+				return lv && rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+
+	case opOr:
+		switch lv := lval.(type) {
+		case bool:
+			switch rv := rval.(type) {
+			case bool:
+				return lv || rv
+			default:
+				panic(ErrorOnlyIntegerAllowed)
+			}
+		default:
+			panic(ErrorOnlyIntegerAllowed)
+		}
+	}
+
+	return nil
+}
+
+type funcExpr struct {
+	name string
+	args []Expr
+}
+
+func (fe *funcExpr) Eval(env func(string) interface{}) interface{} {
+	argv := make([]interface{}, 0, len(fe.args))
+	for _, arg := range fe.args {
+		argv = append(argv, arg.Eval(env))
+	}
+	return funcs[fe.name].call(argv)
+}
+
+type floatExpr struct {
+	val float64
+}
+
+func (fe *floatExpr) Eval(env func(string) interface{}) interface{} {
+	return fe.val
+}
+
+type intExpr struct {
+	val int64
+}
+
+func (ie *intExpr) Eval(env func(string) interface{}) interface{} {
+	return ie.val
+}
+
+type boolExpr struct {
+	val bool
+}
+
+func (be *boolExpr) Eval(env func(string) interface{}) interface{} {
+	return be.val
+}
+
+type stringExpr struct {
+	val string
+}
+
+func (se *stringExpr) Eval(env func(string) interface{}) interface{} {
+	return se.val
+}
+
+type varExpr struct {
+	name string
+}
+
+func (ve *varExpr) Eval(env func(string) interface{}) interface{} {
+	return env(ve.name)
+}
+
+func Compile(src string) (expr Expr, err error) {
+	defer func() {
+		switch x := recover().(type) {
+		case nil:
+		case error:
+			err = x
+		default:
+		}
+	}()
+
+	lexer := lexer{}
+	lexer.init(strings.NewReader(src))
+	expr = parseBinary(&lexer, 0)
+	if lexer.token() != scanner.EOF {
+		panic(ErrorExpressionSyntax)
+	}
+	return expr, nil
+}
+
+func precedence(op rune) int {
+	switch op {
+	case opOr:
+		return 1
+	case opAnd:
+		return 2
+	case opEqual, opNotEqual, '<', '>', opGTE, opLTE:
+		return 3
+	case '+', '-', '|', '^':
+		return 4
+	case '*', '/', '%', opLeftShift, opRightShift, '&':
+		return 5
+	}
+	return 0
+}
+
+// binary = unary ('+' binary)*
+func parseBinary(lexer *lexer, lastPrec int) Expr {
+	lhs := parseUnary(lexer)
+
+	for {
+		op := lexer.token()
+		prec := precedence(op)
+		if prec <= lastPrec {
+			break
+		}
+		lexer.next() // consume operator
+		rhs := parseBinary(lexer, prec)
+		lhs = &binaryExpr{op: op, lhs: lhs, rhs: rhs}
+	}
+
+	return lhs
+}
+
+// unary = '+|-' expr | primary
+func parseUnary(lexer *lexer) Expr {
+	flag := false
+	for tok := lexer.token(); ; tok = lexer.next() {
+		if tok == '-' {
+			flag = !flag
+		} else if tok != '+' {
+			break
+		}
+	}
+	if flag {
+		return &unaryExpr{op: '-', subExpr: parsePrimary(lexer)}
+	}
+
+	flag = false
+	for tok := lexer.token(); tok == '!'; tok = lexer.next() {
+		flag = !flag
+	}
+	if flag {
+		return &unaryExpr{op: '!', subExpr: parsePrimary(lexer)}
+	}
+
+	flag = false
+	for tok := lexer.token(); tok == '~'; tok = lexer.next() {
+		flag = !flag
+	}
+	if flag {
+		return &unaryExpr{op: '~', subExpr: parsePrimary(lexer)}
+	}
+
+	return parsePrimary(lexer)
+}
+
+// primary = id
+//         | id '(' expr ',' ... ',' expr ')'
+//         | num
+//         | '(' expr ')'
+func parsePrimary(lexer *lexer) Expr {
+	switch lexer.token() {
+	case '+', '-', '!', '~':
+		return parseUnary(lexer)
+
+	case '(':
+		lexer.next() // consume '('
+		node := parseBinary(lexer, 0)
+		if lexer.token() != ')' {
+			panic(ErrorExpressionSyntax)
+		}
+		lexer.next() // consume ')'
+		return node
+
+	case scanner.Ident:
+		id := strings.ToLower(lexer.text())
+		if lexer.next() != '(' {
+			if id == "true" {
+				return &boolExpr{val: true}
+			} else if id == "false" {
+				return &boolExpr{val: false}
+			} else {
+				return &varExpr{name: id}
+			}
+		}
+		node := funcExpr{name: id}
+		for lexer.next() != ')' {
+			arg := parseBinary(lexer, 0)
+			node.args = append(node.args, arg)
+			if lexer.token() != ',' {
+				break
+			}
+		}
+		if lexer.token() != ')' {
+			panic(ErrorExpressionSyntax)
+		}
+
+		if fn, ok := funcs[id]; !ok {
+			panic(ErrorUnrecognizedFunction)
+		} else if fn.minArgs >= 0 && len(node.args) < fn.minArgs {
+			panic(ErrorArgumentCount)
+		} else if fn.maxArgs >= 0 && len(node.args) > fn.maxArgs {
+			panic(ErrorArgumentCount)
+		}
+
+		lexer.next() // consume it
+		return &node
+
+	case scanner.Int:
+		val, e := strconv.ParseInt(lexer.text(), 0, 64)
+		if e != nil {
+			panic(ErrorInvalidFloat)
+		}
+		lexer.next()
+		return &intExpr{val: val}
+
+	case scanner.Float:
+		val, e := strconv.ParseFloat(lexer.text(), 0)
+		if e != nil {
+			panic(ErrorInvalidInteger)
+		}
+		lexer.next()
+		return &floatExpr{val: val}
+
+	case scanner.String:
+		panic(errors.New("strings are not allowed in expression at present"))
+		val := lexer.text()
+		lexer.next()
+		return &stringExpr{val: val}
+
+	default:
+		panic(ErrorExpressionSyntax)
+	}
+}
diff --git a/alert/app/expr/expr_test.go b/alert/app/expr/expr_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..0228268771a681dc5c71ad0b74d994d1f9f5338a
--- /dev/null
+++ b/alert/app/expr/expr_test.go
@@ -0,0 +1,198 @@
+package expr
+
+import "testing"
+
+func TestIntArithmetic(t *testing.T) {
+	cases := []struct {
+		expr     string
+		expected int64
+	}{
+		{"+10", 10},
+		{"-10", -10},
+		{"3 + 4 + 5 + 6 * 7 + 8", 62},
+		{"3 + 4 + (5 + 6) * 7 + 8", 92},
+		{"3 + 4 + (5 + 6) * 7 / 11 + 8", 22},
+		{"3 + 4 + -5 * 6 / 7 % 8", 3},
+		{"10 - 5", 5},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(nil); res.(int64) != c.expected {
+			t.Errorf("result for expression '%s' is %v, but expected is %v", c.expr, res, c.expected)
+		}
+	}
+}
+
+func TestFloatArithmetic(t *testing.T) {
+	cases := []struct {
+		expr     string
+		expected float64
+	}{
+		{"+10.5", 10.5},
+		{"-10.5", -10.5},
+		{"3.1 + 4.2 + 5 + 6 * 7 + 8", 62.3},
+		{"3.1 + 4.2 + (5 + 6) * 7 + 8.3", 92.6},
+		{"3.1 + 4.2 + (5.1 + 5.9) * 7 / 11 + 8", 22.3},
+		{"3.3 + 4.2 - 4.0 * 7.5 / 3", -2.5},
+		{"3.3 + 4.2 - 4 * 7.0 / 2", -6.5},
+		{"3.5/2.0", 1.75},
+		{"3.5/2", 1.75},
+		{"7 / 3.5", 2},
+		{"3.5 % 2.0", 1.5},
+		{"3.5 % 2", 1.5},
+		{"7 % 2.5", 2},
+		{"7.3 - 2", 5.3},
+		{"7 - 2.3", 4.7},
+		{"1 + 1.5", 2.5},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(nil); res.(float64) != c.expected {
+			t.Errorf("result for expression '%s' is %v, but expected is %v", c.expr, res, c.expected)
+		}
+	}
+}
+
+func TestVariable(t *testing.T) {
+	variables := map[string]interface{}{
+		"a": int64(6),
+		"b": int64(7),
+	}
+	env := func(key string) interface{} {
+		return variables[key]
+	}
+
+	cases := []struct {
+		expr     string
+		expected int64
+	}{
+		{"3 + 4 + (+5) + a * b + 8", 62},
+		{"3 + 4 + (5 + a) * b + 8", 92},
+		{"3 + 4 + (5 + a) * b / 11 + 8", 22},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(env); res.(int64) != c.expected {
+			t.Errorf("result for expression '%s' is %v, but expected is %v", c.expr, res, c.expected)
+		}
+	}
+}
+
+func TestFunction(t *testing.T) {
+	variables := map[string]interface{}{
+		"a": int64(6),
+		"b": 7.0,
+	}
+
+	env := func(key string) interface{} {
+		return variables[key]
+	}
+
+	cases := []struct {
+		expr     string
+		expected float64
+	}{
+		{"sum(3, 4,  5, a * b, 8)", 62},
+		{"sum(3, 4, (5 + a) * b, 8)", 92},
+		{"sum(3, 4, (5 + a) * b / 11, 8)", 22},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(env); res.(float64) != c.expected {
+			t.Errorf("result for expression '%s' is %v, but expected is %v", c.expr, res, c.expected)
+		}
+	}
+}
+
+func TestLogical(t *testing.T) {
+	cases := []struct {
+		expr     string
+		expected bool
+	}{
+		{"true", true},
+		{"false", false},
+		{"true == true", true},
+		{"true == false", false},
+		{"true != true", false},
+		{"true != false", true},
+		{"5 > 3", true},
+		{"5 < 3", false},
+		{"5.2 > 3", true},
+		{"5.2 < 3", false},
+		{"5 > 3.1", true},
+		{"5 < 3.1", false},
+		{"5.1 > 3.3", true},
+		{"5.1 < 3.3", false},
+		{"5 >= 3", true},
+		{"5 <= 3", false},
+		{"5.2 >= 3", true},
+		{"5.2 <= 3", false},
+		{"5 >= 3.1", true},
+		{"5 <= 3.1", false},
+		{"5.1 >= 3.3", true},
+		{"5.1 <= 3.3", false},
+		{"5 != 3", true},
+		{"5.2 != 3.2", true},
+		{"5.2 != 3", true},
+		{"5 != 3.2", true},
+		{"5 == 3", false},
+		{"5.2 == 3.2", false},
+		{"5.2 == 3", false},
+		{"5 == 3.2", false},
+		{"!(5 > 3)", false},
+		{"5>3 && 3>1", true},
+		{"5<3 || 3<1", false},
+		{"4<=4 || 3<1", true},
+		{"4<4 || 3>=1", true},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(nil); res.(bool) != c.expected {
+			t.Errorf("result for expression '%s' is %v, but expected is %v", c.expr, res, c.expected)
+		}
+	}
+}
+
+func TestBitwise(t *testing.T) {
+	cases := []struct {
+		expr     string
+		expected int64
+	}{
+		{"0x0C & 0x04", 0x04},
+		{"0x08 | 0x04", 0x0C},
+		{"0x0C ^ 0x04", 0x08},
+		{"0x01 << 2", 0x04},
+		{"0x04 >> 2", 0x01},
+		{"~0x04", ^0x04},
+	}
+
+	for _, c := range cases {
+		expr, e := Compile(c.expr)
+		if e != nil {
+			t.Errorf("failed to compile expression '%s': %s", c.expr, e.Error())
+		}
+		if res := expr.Eval(nil); res.(int64) != c.expected {
+			t.Errorf("result for expression '%s' is 0x%X, but expected is 0x%X", c.expr, res, c.expected)
+		}
+	}
+}
diff --git a/alert/app/expr/funcs.go b/alert/app/expr/funcs.go
new file mode 100644
index 0000000000000000000000000000000000000000..97ed0e1c647666dbc1cb4c3b6445bdfae8a034c6
--- /dev/null
+++ b/alert/app/expr/funcs.go
@@ -0,0 +1,198 @@
+package expr
+
+import (
+	"math"
+)
+
+type builtInFunc struct {
+	minArgs, maxArgs int
+	call             func([]interface{}) interface{}
+}
+
+func fnMin(args []interface{}) interface{} {
+	res := args[0]
+	for _, arg := range args[1:] {
+		switch v1 := res.(type) {
+		case int64:
+			switch v2 := arg.(type) {
+			case int64:
+				if v2 < v1 {
+					res = v2
+				}
+			case float64:
+				res = math.Min(float64(v1), v2)
+			default:
+				panic(ErrorUnsupportedDataType)
+			}
+		case float64:
+			switch v2 := arg.(type) {
+			case int64:
+				res = math.Min(v1, float64(v2))
+			case float64:
+				res = math.Min(v1, v2)
+			default:
+				panic(ErrorUnsupportedDataType)
+			}
+		default:
+			panic(ErrorUnsupportedDataType)
+		}
+	}
+	return res
+}
+
+func fnMax(args []interface{}) interface{} {
+	res := args[0]
+	for _, arg := range args[1:] {
+		switch v1 := res.(type) {
+		case int64:
+			switch v2 := arg.(type) {
+			case int64:
+				if v2 > v1 {
+					res = v2
+				}
+			case float64:
+				res = math.Max(float64(v1), v2)
+			default:
+				panic(ErrorUnsupportedDataType)
+			}
+		case float64:
+			switch v2 := arg.(type) {
+			case int64:
+				res = math.Max(v1, float64(v2))
+			case float64:
+				res = math.Max(v1, v2)
+			default:
+				panic(ErrorUnsupportedDataType)
+			}
+		default:
+			panic(ErrorUnsupportedDataType)
+		}
+	}
+	return res
+}
+
+func fnSum(args []interface{}) interface{} {
+	res := float64(0)
+	for _, arg := range args {
+		switch v := arg.(type) {
+		case int64:
+			res += float64(v)
+		case float64:
+			res += v
+		default:
+			panic(ErrorUnsupportedDataType)
+		}
+	}
+	return res
+}
+
+func fnAvg(args []interface{}) interface{} {
+	return fnSum(args).(float64) / float64(len(args))
+}
+
+func fnSqrt(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return math.Sqrt(float64(v))
+	case float64:
+		return math.Sqrt(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnFloor(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return v
+	case float64:
+		return math.Floor(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnCeil(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return v
+	case float64:
+		return math.Ceil(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnRound(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return v
+	case float64:
+		return math.Round(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnLog(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return math.Log(float64(v))
+	case float64:
+		return math.Log(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnLog10(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		return math.Log10(float64(v))
+	case float64:
+		return math.Log10(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnAbs(args []interface{}) interface{} {
+	switch v := args[0].(type) {
+	case int64:
+		if v < 0 {
+			return -v
+		}
+		return v
+	case float64:
+		return math.Abs(v)
+	default:
+		panic(ErrorUnsupportedDataType)
+	}
+}
+
+func fnIf(args []interface{}) interface{} {
+	v, ok := args[0].(bool)
+	if !ok {
+		panic(ErrorUnsupportedDataType)
+	}
+	if v {
+		return args[1]
+	} else {
+		return args[2]
+	}
+}
+
+var funcs = map[string]builtInFunc{
+	"min":   builtInFunc{minArgs: 1, maxArgs: -1, call: fnMin},
+	"max":   builtInFunc{minArgs: 1, maxArgs: -1, call: fnMax},
+	"sum":   builtInFunc{minArgs: 1, maxArgs: -1, call: fnSum},
+	"avg":   builtInFunc{minArgs: 1, maxArgs: -1, call: fnAvg},
+	"sqrt":  builtInFunc{minArgs: 1, maxArgs: 1, call: fnSqrt},
+	"ceil":  builtInFunc{minArgs: 1, maxArgs: 1, call: fnCeil},
+	"floor": builtInFunc{minArgs: 1, maxArgs: 1, call: fnFloor},
+	"round": builtInFunc{minArgs: 1, maxArgs: 1, call: fnRound},
+	"log":   builtInFunc{minArgs: 1, maxArgs: 1, call: fnLog},
+	"log10": builtInFunc{minArgs: 1, maxArgs: 1, call: fnLog10},
+	"abs":   builtInFunc{minArgs: 1, maxArgs: 1, call: fnAbs},
+	"if":    builtInFunc{minArgs: 3, maxArgs: 3, call: fnIf},
+}
diff --git a/alert/app/expr/funcs_test.go b/alert/app/expr/funcs_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..b960888b25f609e5c43fbf6cdd90e9b29ada319c
--- /dev/null
+++ b/alert/app/expr/funcs_test.go
@@ -0,0 +1,329 @@
+package expr
+
+import (
+	"math"
+	"testing"
+)
+
+func TestMax(t *testing.T) {
+	cases := []struct {
+		args     []interface{}
+		expected float64
+	}{
+		{[]interface{}{int64(1), int64(2), int64(3), int64(4), int64(5)}, 5},
+		{[]interface{}{int64(1), int64(2), float64(3), int64(4), float64(5)}, 5},
+		{[]interface{}{int64(-1), int64(-2), float64(-3), int64(-4), float64(-5)}, -1},
+		{[]interface{}{int64(-1), int64(-1), float64(-1), int64(-1), float64(-1)}, -1},
+		{[]interface{}{int64(-1), int64(0), float64(-1), int64(-1), float64(-1)}, 0},
+	}
+
+	for _, c := range cases {
+		r := fnMax(c.args)
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("max(%v) = %v, want %v", c.args, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("max(%v) = %v, want %v", c.args, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type max(%v)", c.args)
+		}
+	}
+}
+
+func TestMin(t *testing.T) {
+	cases := []struct {
+		args     []interface{}
+		expected float64
+	}{
+		{[]interface{}{int64(1), int64(2), int64(3), int64(4), int64(5)}, 1},
+		{[]interface{}{int64(5), int64(4), float64(3), int64(2), float64(1)}, 1},
+		{[]interface{}{int64(-1), int64(-2), float64(-3), int64(-4), float64(-5)}, -5},
+		{[]interface{}{int64(-1), int64(-1), float64(-1), int64(-1), float64(-1)}, -1},
+		{[]interface{}{int64(1), int64(0), float64(1), int64(1), float64(1)}, 0},
+	}
+
+	for _, c := range cases {
+		r := fnMin(c.args)
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("min(%v) = %v, want %v", c.args, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("min(%v) = %v, want %v", c.args, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type min(%v)", c.args)
+		}
+	}
+}
+
+func TestSumAvg(t *testing.T) {
+	cases := []struct {
+		args     []interface{}
+		expected float64
+	}{
+		{[]interface{}{int64(1)}, 1},
+		{[]interface{}{int64(1), int64(2), int64(3), int64(4), int64(5)}, 15},
+		{[]interface{}{int64(5), int64(4), float64(3), int64(2), float64(1)}, 15},
+		{[]interface{}{int64(-1), int64(-2), float64(-3), int64(-4), float64(-5)}, -15},
+		{[]interface{}{int64(-1), int64(-1), float64(-1), int64(-1), float64(-1)}, -5},
+		{[]interface{}{int64(1), int64(0), float64(1), int64(1), float64(1)}, 4},
+	}
+
+	for _, c := range cases {
+		r := fnSum(c.args)
+		switch v := r.(type) {
+		case float64:
+			if v != c.expected {
+				t.Errorf("sum(%v) = %v, want %v", c.args, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type sum(%v)", c.args)
+		}
+	}
+
+	for _, c := range cases {
+		r := fnAvg(c.args)
+		expected := c.expected / float64(len(c.args))
+		switch v := r.(type) {
+		case float64:
+			if v != expected {
+				t.Errorf("avg(%v) = %v, want %v", c.args, v, expected)
+			}
+		default:
+			t.Errorf("unknown result type avg(%v)", c.args)
+		}
+	}
+}
+
+func TestSqrt(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(0), 0},
+		{int64(1), 1},
+		{int64(256), 16},
+		{10.0, math.Sqrt(10)},
+		{10000.0, math.Sqrt(10000)},
+	}
+
+	for _, c := range cases {
+		r := fnSqrt([]interface{}{c.arg})
+		switch v := r.(type) {
+		case float64:
+			if v != c.expected {
+				t.Errorf("sqrt(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type sqrt(%v)", c.arg)
+		}
+	}
+}
+
+func TestFloor(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(0), 0},
+		{int64(1), 1},
+		{int64(-1), -1},
+		{10.4, 10},
+		{-10.4, -11},
+		{10.8, 10},
+		{-10.8, -11},
+	}
+
+	for _, c := range cases {
+		r := fnFloor([]interface{}{c.arg})
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("floor(%v) = %v, want %v", c.arg, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("floor(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type floor(%v)", c.arg)
+		}
+	}
+}
+
+func TestCeil(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(0), 0},
+		{int64(1), 1},
+		{int64(-1), -1},
+		{10.4, 11},
+		{-10.4, -10},
+		{10.8, 11},
+		{-10.8, -10},
+	}
+
+	for _, c := range cases {
+		r := fnCeil([]interface{}{c.arg})
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("ceil(%v) = %v, want %v", c.arg, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("ceil(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type ceil(%v)", c.arg)
+		}
+	}
+}
+
+func TestRound(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(0), 0},
+		{int64(1), 1},
+		{int64(-1), -1},
+		{10.4, 10},
+		{-10.4, -10},
+		{10.8, 11},
+		{-10.8, -11},
+	}
+
+	for _, c := range cases {
+		r := fnRound([]interface{}{c.arg})
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("round(%v) = %v, want %v", c.arg, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("round(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type round(%v)", c.arg)
+		}
+	}
+}
+
+func TestLog(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(1), math.Log(1)},
+		{0.1, math.Log(0.1)},
+		{10.4, math.Log(10.4)},
+		{10.8, math.Log(10.8)},
+	}
+
+	for _, c := range cases {
+		r := fnLog([]interface{}{c.arg})
+		switch v := r.(type) {
+		case float64:
+			if v != c.expected {
+				t.Errorf("log(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type log(%v)", c.arg)
+		}
+	}
+}
+
+func TestLog10(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(1), math.Log10(1)},
+		{0.1, math.Log10(0.1)},
+		{10.4, math.Log10(10.4)},
+		{10.8, math.Log10(10.8)},
+		{int64(100), math.Log10(100)},
+	}
+
+	for _, c := range cases {
+		r := fnLog10([]interface{}{c.arg})
+		switch v := r.(type) {
+		case float64:
+			if v != c.expected {
+				t.Errorf("log10(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type log10(%v)", c.arg)
+		}
+	}
+}
+
+func TestAbs(t *testing.T) {
+	cases := []struct {
+		arg      interface{}
+		expected float64
+	}{
+		{int64(1), 1},
+		{int64(0), 0},
+		{int64(-1), 1},
+		{10.4, 10.4},
+		{-10.4, 10.4},
+	}
+
+	for _, c := range cases {
+		r := fnAbs([]interface{}{c.arg})
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("abs(%v) = %v, want %v", c.arg, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("abs(%v) = %v, want %v", c.arg, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type abs(%v)", c.arg)
+		}
+	}
+}
+
+func TestIf(t *testing.T) {
+	cases := []struct {
+		args     []interface{}
+		expected float64
+	}{
+		{[]interface{}{true, int64(10), int64(20)}, 10},
+		{[]interface{}{false, int64(10), int64(20)}, 20},
+		{[]interface{}{true, 10.3, 20.6}, 10.3},
+		{[]interface{}{false, 10.3, 20.6}, 20.6},
+		{[]interface{}{true, int64(10), 20.6}, 10},
+		{[]interface{}{false, int64(10), 20.6}, 20.6},
+	}
+
+	for _, c := range cases {
+		r := fnIf(c.args)
+		switch v := r.(type) {
+		case int64:
+			if v != int64(c.expected) {
+				t.Errorf("if(%v) = %v, want %v", c.args, v, int64(c.expected))
+			}
+		case float64:
+			if v != c.expected {
+				t.Errorf("if(%v) = %v, want %v", c.args, v, c.expected)
+			}
+		default:
+			t.Errorf("unknown result type if(%v)", c.args)
+		}
+	}
+}
diff --git a/alert/app/route.go b/alert/app/route.go
new file mode 100644
index 0000000000000000000000000000000000000000..0fec3bab3406bcdc7922ec58987f4c1131f39c57
--- /dev/null
+++ b/alert/app/route.go
@@ -0,0 +1,44 @@
+package app
+
+import (
+	"regexp"
+	"strings"
+)
+
+type RouteMatchCriteria struct {
+	Tag   string         `yaml:"tag"`
+	Value string         `yaml:"match"`
+	Re    *regexp.Regexp `yaml:"-"`
+}
+
+func (c *RouteMatchCriteria) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var v map[string]string
+	if e := unmarshal(&v); e != nil {
+		return e
+	}
+
+	for k, a := range v {
+		c.Tag = k
+		c.Value = a
+		if strings.HasPrefix(a, "re:") {
+			re, e := regexp.Compile(a[3:])
+			if e != nil {
+				return e
+			}
+			c.Re = re
+		}
+	}
+
+	return nil
+}
+
+type Route struct {
+	Continue       bool                 `yaml:"continue"`
+	Receiver       string               `yaml:"receiver"`
+	GroupWait      Duration             `yaml:"group_wait"`
+	GroupInterval  Duration             `yaml:"group_interval"`
+	RepeatInterval Duration             `yaml:"repeat_interval"`
+	GroupBy        []string             `yaml:"group_by"`
+	Match          []RouteMatchCriteria `yaml:"match"`
+	Routes         []*Route             `yaml:"routes"`
+}
diff --git a/alert/app/rule.go b/alert/app/rule.go
new file mode 100644
index 0000000000000000000000000000000000000000..44596ca26d7da0ddec55dfabc2930c7166dc3547
--- /dev/null
+++ b/alert/app/rule.go
@@ -0,0 +1,641 @@
+package app
+
+import (
+	"bytes"
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"os"
+	"regexp"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"text/scanner"
+	"text/template"
+	"time"
+
+	"github.com/taosdata/alert/app/expr"
+	"github.com/taosdata/alert/models"
+	"github.com/taosdata/alert/utils"
+	"github.com/taosdata/alert/utils/log"
+)
+
+type Duration struct{ time.Duration }
+
+func (d Duration) MarshalJSON() ([]byte, error) {
+	return json.Marshal(d.String())
+}
+
+func (d *Duration) doUnmarshal(v interface{}) error {
+	switch value := v.(type) {
+	case float64:
+		*d = Duration{time.Duration(value)}
+		return nil
+	case string:
+		if duration, e := time.ParseDuration(value); e != nil {
+			return e
+		} else {
+			*d = Duration{duration}
+		}
+		return nil
+	default:
+		return errors.New("invalid duration")
+	}
+}
+
+func (d *Duration) UnmarshalJSON(b []byte) error {
+	var v interface{}
+	if e := json.Unmarshal(b, &v); e != nil {
+		return e
+	}
+	return d.doUnmarshal(v)
+}
+
+const (
+	AlertStateWaiting = iota
+	AlertStatePending
+	AlertStateFiring
+)
+
+type Alert struct {
+	State         uint8                  `json:"-"`
+	LastRefreshAt time.Time              `json:"-"`
+	StartsAt      time.Time              `json:"startsAt,omitempty"`
+	EndsAt        time.Time              `json:"endsAt,omitempty"`
+	Values        map[string]interface{} `json:"values"`
+	Labels        map[string]string      `json:"labels"`
+	Annotations   map[string]string      `json:"annotations"`
+}
+
+func (alert *Alert) doRefresh(firing bool, rule *Rule) bool {
+	switch {
+	case (!firing) && (alert.State == AlertStateWaiting):
+		return false
+
+	case (!firing) && (alert.State == AlertStatePending):
+		alert.State = AlertStateWaiting
+		return false
+
+	case (!firing) && (alert.State == AlertStateFiring):
+		alert.State = AlertStateWaiting
+		alert.EndsAt = time.Now()
+
+	case firing && (alert.State == AlertStateWaiting):
+		alert.StartsAt = time.Now()
+		if rule.For.Nanoseconds() > 0 {
+			alert.State = AlertStatePending
+			return false
+		}
+		alert.State = AlertStateFiring
+
+	case firing && (alert.State == AlertStatePending):
+		if time.Now().Sub(alert.StartsAt) < rule.For.Duration {
+			return false
+		}
+		alert.StartsAt = alert.StartsAt.Add(rule.For.Duration)
+		alert.State = AlertStateFiring
+
+	case firing && (alert.State == AlertStateFiring):
+	}
+
+	return true
+}
+
+func (alert *Alert) refresh(rule *Rule, values map[string]interface{}) {
+	alert.LastRefreshAt = time.Now()
+
+	defer func() {
+		switch x := recover().(type) {
+		case nil:
+		case error:
+			rule.setState(RuleStateError)
+			log.Errorf("[%s]: failed to evaluate: %s", rule.Name, x.Error())
+		default:
+			rule.setState(RuleStateError)
+			log.Errorf("[%s]: failed to evaluate: unknown error", rule.Name)
+		}
+	}()
+
+	alert.Values = values
+	res := rule.Expr.Eval(func(key string) interface{} {
+		// ToLower is required as column name in result is in lower case
+		i := alert.Values[strings.ToLower(key)]
+		switch v := i.(type) {
+		case int8:
+			return int64(v)
+		case int16:
+			return int64(v)
+		case int:
+			return int64(v)
+		case int32:
+			return int64(v)
+		case float32:
+			return float64(v)
+		default:
+			return v
+		}
+	})
+
+	val, ok := res.(bool)
+	if !ok {
+		rule.setState(RuleStateError)
+		log.Errorf("[%s]: result type is not bool", rule.Name)
+		return
+	}
+
+	if !alert.doRefresh(val, rule) {
+		return
+	}
+
+	buf := bytes.Buffer{}
+	alert.Annotations = map[string]string{}
+	for k, v := range rule.Annotations {
+		if e := v.Execute(&buf, alert); e != nil {
+			log.Errorf("[%s]: failed to generate annotation '%s': %s", rule.Name, k, e.Error())
+		} else {
+			alert.Annotations[k] = buf.String()
+		}
+		buf.Reset()
+	}
+
+	buf.Reset()
+	if e := json.NewEncoder(&buf).Encode(alert); e != nil {
+		log.Errorf("[%s]: failed to serialize alert to JSON: %s", rule.Name, e.Error())
+	} else {
+		chAlert <- buf.String()
+	}
+}
+
+const (
+	RuleStateNormal = iota
+	RuleStateError
+	RuleStateDisabled
+	RuleStateRunning = 0x04
+)
+
+type Rule struct {
+	Name           string                        `json:"name"`
+	State          uint32                        `json:"state"`
+	SQL            string                        `json:"sql"`
+	GroupByCols    []string                      `json:"-"`
+	For            Duration                      `json:"for"`
+	Period         Duration                      `json:"period"`
+	NextRunTime    time.Time                     `json:"-"`
+	RawExpr        string                        `json:"expr"`
+	Expr           expr.Expr                     `json:"-"`
+	Labels         map[string]string             `json:"labels"`
+	RawAnnotations map[string]string             `json:"annotations"`
+	Annotations    map[string]*template.Template `json:"-"`
+	Alerts         sync.Map                      `json:"-"`
+}
+
+func (rule *Rule) clone() *Rule {
+	return &Rule{
+		Name:           rule.Name,
+		State:          RuleStateNormal,
+		SQL:            rule.SQL,
+		GroupByCols:    rule.GroupByCols,
+		For:            rule.For,
+		Period:         rule.Period,
+		NextRunTime:    time.Time{},
+		RawExpr:        rule.RawExpr,
+		Expr:           rule.Expr,
+		Labels:         rule.Labels,
+		RawAnnotations: rule.RawAnnotations,
+		Annotations:    rule.Annotations,
+		// don't copy alerts
+	}
+}
+
+func (rule *Rule) setState(s uint32) {
+	for {
+		old := atomic.LoadUint32(&rule.State)
+		new := old&0xffffffc0 | s
+		if atomic.CompareAndSwapUint32(&rule.State, old, new) {
+			break
+		}
+	}
+}
+
+func (rule *Rule) state() uint32 {
+	return atomic.LoadUint32(&rule.State) & 0xffffffc0
+}
+
+func (rule *Rule) isEnabled() bool {
+	state := atomic.LoadUint32(&rule.State)
+	return state&RuleStateDisabled == 0
+}
+
+func (rule *Rule) setNextRunTime(tm time.Time) {
+	rule.NextRunTime = tm.Round(rule.Period.Duration)
+	if rule.NextRunTime.Before(tm) {
+		rule.NextRunTime = rule.NextRunTime.Add(rule.Period.Duration)
+	}
+}
+
+func parseGroupBy(sql string) (cols []string, err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			err = e.(error)
+		}
+	}()
+
+	s := scanner.Scanner{
+		Error: func(s *scanner.Scanner, msg string) {
+			panic(errors.New(msg))
+		},
+		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats,
+	}
+
+	s.Init(strings.NewReader(sql))
+	if s.Scan() != scanner.Ident || strings.ToLower(s.TokenText()) != "select" {
+		err = errors.New("only select statement is allowed.")
+		return
+	}
+
+	hasGroupBy := false
+	for t := s.Scan(); t != scanner.EOF; t = s.Scan() {
+		if t != scanner.Ident {
+			continue
+		}
+		if strings.ToLower(s.TokenText()) != "group" {
+			continue
+		}
+		if s.Scan() != scanner.Ident {
+			continue
+		}
+		if strings.ToLower(s.TokenText()) == "by" {
+			hasGroupBy = true
+			break
+		}
+	}
+
+	if !hasGroupBy {
+		return
+	}
+
+	for {
+		if s.Scan() != scanner.Ident {
+			err = errors.New("SQL statement syntax error.")
+			return
+		}
+		col := strings.ToLower(s.TokenText())
+		cols = append(cols, col)
+		if s.Scan() != ',' {
+			break
+		}
+	}
+
+	return
+}
+
+func (rule *Rule) parseGroupBy() (err error) {
+	cols, e := parseGroupBy(rule.SQL)
+	if e == nil {
+		rule.GroupByCols = cols
+	}
+	return nil
+}
+
+func (rule *Rule) getAlert(values map[string]interface{}) *Alert {
+	sb := strings.Builder{}
+	for _, name := range rule.GroupByCols {
+		value := values[name]
+		if value == nil {
+		} else {
+			sb.WriteString(fmt.Sprint(value))
+		}
+		sb.WriteByte('_')
+	}
+
+	var alert *Alert
+	key := sb.String()
+
+	if v, ok := rule.Alerts.Load(key); ok {
+		alert = v.(*Alert)
+	}
+	if alert == nil {
+		alert = &Alert{Labels: map[string]string{}}
+		for k, v := range rule.Labels {
+			alert.Labels[k] = v
+		}
+		for _, name := range rule.GroupByCols {
+			value := values[name]
+			if value == nil {
+				alert.Labels[name] = ""
+			} else {
+				alert.Labels[name] = fmt.Sprint(value)
+			}
+		}
+		rule.Alerts.Store(key, alert)
+	}
+
+	return alert
+}
+
+func (rule *Rule) preRun(tm time.Time) bool {
+	if tm.Before(rule.NextRunTime) {
+		return false
+	}
+	rule.setNextRunTime(tm)
+
+	for {
+		state := atomic.LoadUint32(&rule.State)
+		if state != RuleStateNormal {
+			return false
+		}
+		if atomic.CompareAndSwapUint32(&rule.State, state, RuleStateRunning) {
+			break
+		}
+	}
+	return true
+}
+
+func (rule *Rule) run(db *sql.DB) {
+	rows, e := db.Query(rule.SQL)
+	if e != nil {
+		log.Errorf("[%s]: failed to query TDengine: %s", rule.Name, e.Error())
+		return
+	}
+
+	cols, e := rows.ColumnTypes()
+	if e != nil {
+		log.Errorf("[%s]: unable to get column information: %s", rule.Name, e.Error())
+		return
+	}
+
+	for rows.Next() {
+		values := make([]interface{}, 0, len(cols))
+		for range cols {
+			var v interface{}
+			values = append(values, &v)
+		}
+		rows.Scan(values...)
+
+		m := make(map[string]interface{})
+		for i, col := range cols {
+			name := strings.ToLower(col.Name())
+			m[name] = *(values[i].(*interface{}))
+		}
+
+		alert := rule.getAlert(m)
+		alert.refresh(rule, m)
+	}
+
+	now := time.Now()
+	rule.Alerts.Range(func(k, v interface{}) bool {
+		alert := v.(*Alert)
+		if now.Sub(alert.LastRefreshAt) > rule.Period.Duration*10 {
+			rule.Alerts.Delete(k)
+		}
+		return true
+	})
+}
+
+func (rule *Rule) postRun() {
+	for {
+		old := atomic.LoadUint32(&rule.State)
+		new := old & ^uint32(RuleStateRunning)
+		if atomic.CompareAndSwapUint32(&rule.State, old, new) {
+			break
+		}
+	}
+}
+
+func newRule(str string) (*Rule, error) {
+	rule := Rule{}
+
+	e := json.NewDecoder(strings.NewReader(str)).Decode(&rule)
+	if e != nil {
+		return nil, e
+	}
+
+	if rule.Period.Nanoseconds() <= 0 {
+		rule.Period = Duration{time.Minute}
+	}
+	rule.setNextRunTime(time.Now())
+
+	if rule.For.Nanoseconds() < 0 {
+		rule.For = Duration{0}
+	}
+
+	if e = rule.parseGroupBy(); e != nil {
+		return nil, e
+	}
+
+	if expr, e := expr.Compile(rule.RawExpr); e != nil {
+		return nil, e
+	} else {
+		rule.Expr = expr
+	}
+
+	rule.Annotations = map[string]*template.Template{}
+	for k, v := range rule.RawAnnotations {
+		v = reValue.ReplaceAllStringFunc(v, func(s string) string {
+			// as column name in query result is always in lower case,
+			// we need to convert value reference in annotations to
+			// lower case
+			return strings.ToLower(s)
+		})
+		text := "{{$labels := .Labels}}{{$values := .Values}}" + v
+		tmpl, e := template.New(k).Parse(text)
+		if e != nil {
+			return nil, e
+		}
+		rule.Annotations[k] = tmpl
+	}
+
+	return &rule, nil
+}
+
+const (
+	batchSize = 1024
+)
+
+var (
+	rules   sync.Map
+	wg      sync.WaitGroup
+	chStop  = make(chan struct{})
+	chAlert = make(chan string, batchSize)
+	reValue = regexp.MustCompile(`\$values\.[_a-zA-Z0-9]+`)
+)
+
+func runRules() {
+	defer wg.Done()
+
+	db, e := sql.Open("taosSql", utils.Cfg.TDengine)
+	if e != nil {
+		log.Fatal("failed to connect to TDengine: ", e.Error())
+	}
+	defer db.Close()
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+
+LOOP:
+	for {
+		var tm time.Time
+		select {
+		case <-chStop:
+			close(chAlert)
+			break LOOP
+		case tm = <-ticker.C:
+		}
+
+		rules.Range(func(k, v interface{}) bool {
+			rule := v.(*Rule)
+			if !rule.preRun(tm) {
+				return true
+			}
+
+			wg.Add(1)
+			go func(rule *Rule) {
+				defer wg.Done()
+				defer rule.postRun()
+				rule.run(db)
+			}(rule)
+
+			return true
+		})
+	}
+}
+
+func doPushAlerts(alerts []string) {
+	defer wg.Done()
+
+	if len(utils.Cfg.Receivers.AlertManager) == 0 {
+		return
+	}
+
+	buf := bytes.Buffer{}
+	buf.WriteByte('[')
+	for i, alert := range alerts {
+		if i > 0 {
+			buf.WriteByte(',')
+		}
+		buf.WriteString(alert)
+	}
+	buf.WriteByte(']')
+
+	log.Debug(buf.String())
+
+	resp, e := http.DefaultClient.Post(utils.Cfg.Receivers.AlertManager, "application/json", &buf)
+	if e != nil {
+		log.Errorf("failed to push alerts to downstream: %s", e.Error())
+		return
+	}
+	resp.Body.Close()
+}
+
+func pushAlerts() {
+	defer wg.Done()
+
+	ticker := time.NewTicker(time.Millisecond * 100)
+	defer ticker.Stop()
+
+	alerts := make([]string, 0, batchSize)
+
+LOOP:
+	for {
+		select {
+		case alert := <-chAlert:
+			if utils.Cfg.Receivers.Console {
+				fmt.Print(alert)
+			}
+			if len(alert) == 0 {
+				if len(alerts) > 0 {
+					wg.Add(1)
+					doPushAlerts(alerts)
+				}
+				break LOOP
+			}
+			if len(alerts) == batchSize {
+				wg.Add(1)
+				go doPushAlerts(alerts)
+				alerts = make([]string, 0, batchSize)
+			}
+			alerts = append(alerts, alert)
+
+		case <-ticker.C:
+			if len(alerts) > 0 {
+				wg.Add(1)
+				go doPushAlerts(alerts)
+				alerts = make([]string, 0, batchSize)
+			}
+		}
+	}
+}
+
+func loadRuleFromDatabase() error {
+	allRules, e := models.LoadAllRule()
+	if e != nil {
+		log.Error("failed to load rules from database:", e.Error())
+		return e
+	}
+
+	count := 0
+	for _, r := range allRules {
+		rule, e := newRule(r.Content)
+		if e != nil {
+			log.Errorf("[%s]: parse failed: %s", r.Name, e.Error())
+			continue
+		}
+		if !r.Enabled {
+			rule.setState(RuleStateDisabled)
+		}
+		rules.Store(rule.Name, rule)
+		count++
+	}
+	log.Infof("total %d rules loaded", count)
+	return nil
+}
+
+func loadRuleFromFile() error {
+	f, e := os.Open(utils.Cfg.RuleFile)
+	if e != nil {
+		log.Error("failed to load rules from file:", e.Error())
+		return e
+	}
+	defer f.Close()
+
+	var allRules []Rule
+	e = json.NewDecoder(f).Decode(&allRules)
+	if e != nil {
+		log.Error("failed to parse rule file:", e.Error())
+		return e
+	}
+
+	for i := 0; i < len(allRules); i++ {
+		rule := &allRules[i]
+		rules.Store(rule.Name, rule)
+	}
+	log.Infof("total %d rules loaded", len(allRules))
+
+	return nil
+}
+
+func initRule() error {
+	if len(utils.Cfg.Database) > 0 {
+		if e := loadRuleFromDatabase(); e != nil {
+			return e
+		}
+	} else {
+		if e := loadRuleFromFile(); e != nil {
+			return e
+		}
+	}
+
+	wg.Add(2)
+	go runRules()
+	go pushAlerts()
+
+	return nil
+}
+
+func uninitRule() error {
+	close(chStop)
+	wg.Wait()
+	return nil
+}
diff --git a/alert/app/rule_test.go b/alert/app/rule_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..0adf100e9cda5358c34f7406f699ea486202e0f7
--- /dev/null
+++ b/alert/app/rule_test.go
@@ -0,0 +1,81 @@
+package app
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/taosdata/alert/utils/log"
+)
+
+func TestParseGroupBy(t *testing.T) {
+	cases := []struct {
+		sql  string
+		cols []string
+	}{
+		{
+			sql:  "select * from a",
+			cols: []string{},
+		},
+		{
+			sql:  "select * from a group by abc",
+			cols: []string{"abc"},
+		},
+		{
+			sql:  "select * from a group by abc, def",
+			cols: []string{"abc", "def"},
+		},
+		{
+			sql:  "select * from a Group by abc, def order by abc",
+			cols: []string{"abc", "def"},
+		},
+	}
+
+	for _, c := range cases {
+		cols, e := parseGroupBy(c.sql)
+		if e != nil {
+			t.Errorf("failed to parse sql '%s': %s", c.sql, e.Error())
+		}
+		for i := range cols {
+			if i >= len(c.cols) {
+				t.Errorf("count of group by columns of '%s' is wrong", c.sql)
+			}
+			if c.cols[i] != cols[i] {
+				t.Errorf("wrong group by columns for '%s'", c.sql)
+			}
+		}
+	}
+}
+
+func TestManagement(t *testing.T) {
+	const format = `{"name":"rule%d", "sql":"select count(*) as count from meters", "expr":"count>2"}`
+
+	log.Init()
+
+	for i := 0; i < 5; i++ {
+		s := fmt.Sprintf(format, i)
+		rule, e := newRule(s)
+		if e != nil {
+			t.Errorf("failed to create rule: %s", e.Error())
+		}
+		e = doUpdateRule(rule, s)
+		if e != nil {
+			t.Errorf("failed to add or update rule: %s", e.Error())
+		}
+	}
+
+	for i := 0; i < 5; i++ {
+		name := fmt.Sprintf("rule%d", i)
+		if _, ok := rules.Load(name); !ok {
+			t.Errorf("rule '%s' does not exist", name)
+		}
+	}
+
+	name := "rule1"
+	if e := doDeleteRule(name); e != nil {
+		t.Errorf("failed to delete rule: %s", e.Error())
+	}
+
+	if _, ok := rules.Load(name); ok {
+		t.Errorf("rule '%s' should not exist any more", name)
+	}
+}
diff --git a/alert/cmd/alert/alert.cfg b/alert/cmd/alert/alert.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..036f288fc6750f31e11fd8bab4b8d3c43197c772
--- /dev/null
+++ b/alert/cmd/alert/alert.cfg
@@ -0,0 +1,13 @@
+{
+	"port": 8100,
+	"database": "file:alert.db",
+	"tdengine": "root:taosdata@/tcp(127.0.0.1:0)/",
+	"log": {
+		"level": "debug",
+		"path": ""
+	},
+	"receivers": {
+		"alertManager": "http://127.0.0.1:9093/api/v1/alerts",
+		"console": true
+	}
+}
diff --git a/alert/cmd/alert/install_driver.sh b/alert/cmd/alert/install_driver.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c7d44786ecbe05e9838130d957a913ee19f55dfc
--- /dev/null
+++ b/alert/cmd/alert/install_driver.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+# This file is used to install TDengine client library on linux systems.
+
+set -e
+#set -x
+
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+# Dynamic directory
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+
+# 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
+
+function install_driver() {
+    echo
+    if [[ -d ${lib_link_dir} && ! -e ${lib_link_dir}/libtaos.so ]]; then
+      echo -e "${GREEN}Start to install TDengine client driver ...${NC}"
+      ${csudo} ln -s ${script_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1       || :
+      ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so           || :
+      
+      if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
+        ${csudo} ln -s ${script_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1     || :
+        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so       || :
+      fi
+
+      echo
+      echo -e "${GREEN}TDengine client driver is successfully installed!${NC}"
+    else
+      echo -e "${GREEN}TDengine client driver already exists, Please confirm whether the alert version matches the client driver version!${NC}"
+    fi
+}
+
+install_driver
diff --git a/alert/cmd/alert/main.go b/alert/cmd/alert/main.go
new file mode 100644
index 0000000000000000000000000000000000000000..1bd185b580aa3dda1206986cc47ae1151ed41c29
--- /dev/null
+++ b/alert/cmd/alert/main.go
@@ -0,0 +1,183 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"time"
+
+	"github.com/taosdata/alert/app"
+	"github.com/taosdata/alert/models"
+	"github.com/taosdata/alert/utils"
+	"github.com/taosdata/alert/utils/log"
+
+	_ "github.com/mattn/go-sqlite3"
+	_ "github.com/taosdata/driver-go/taosSql"
+)
+
+type httpHandler struct {
+}
+
+func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	start := time.Now()
+	path := r.URL.Path
+	http.DefaultServeMux.ServeHTTP(w, r)
+	duration := time.Now().Sub(start)
+	log.Debugf("[%s]\t%s\t%s", r.Method, path, duration)
+}
+
+func serveWeb() *http.Server {
+	log.Info("Listening at port: ", utils.Cfg.Port)
+
+	srv := &http.Server{
+		Addr:    ":" + strconv.Itoa(int(utils.Cfg.Port)),
+		Handler: &httpHandler{},
+	}
+	go func() {
+		if e := srv.ListenAndServe(); e != nil {
+			log.Error(e.Error())
+		}
+	}()
+
+	return srv
+}
+
+func copyFile(dst, src string) error {
+	if dst == src {
+		return nil
+	}
+
+	in, e := os.Open(src)
+	if e != nil {
+		return e
+	}
+	defer in.Close()
+
+	out, e := os.Create(dst)
+	if e != nil {
+		return e
+	}
+	defer out.Close()
+
+	_, e = io.Copy(out, in)
+	return e
+}
+
+func doSetup(cfgPath string) error {
+	exePath, e := os.Executable()
+	if e != nil {
+		fmt.Fprintf(os.Stderr, "failed to get executable path: %s\n", e.Error())
+		return e
+	}
+
+	if !filepath.IsAbs(cfgPath) {
+		dir := filepath.Dir(exePath)
+		cfgPath = filepath.Join(dir, cfgPath)
+	}
+
+	e = copyFile("/etc/taos/alert.cfg", cfgPath)
+	if e != nil {
+		fmt.Fprintf(os.Stderr, "failed copy configuration file: %s\n", e.Error())
+		return e
+	}
+
+	f, e := os.Create("/etc/systemd/system/alert.service")
+	if e != nil {
+		fmt.Printf("failed to create alert service: %s\n", e.Error())
+		return e
+	}
+	defer f.Close()
+
+	const content = `[Unit]
+Description=Alert (TDengine Alert Service)
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+WorkingDirectory=/var/lib/taos/
+ExecStart=%s -cfg /etc/taos/alert.cfg
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+`
+	_, e = fmt.Fprintf(f, content, exePath)
+	if e != nil {
+		fmt.Printf("failed to create alert.service: %s\n", e.Error())
+		return e
+	}
+
+	return nil
+}
+
+var version = "2.0.0.1s"
+
+func main() {
+	var (
+		cfgPath     string
+		setup       bool
+		showVersion bool
+	)
+	flag.StringVar(&cfgPath, "cfg", "alert.cfg", "path of configuration file")
+	flag.BoolVar(&setup, "setup", false, "setup the service as a daemon")
+	flag.BoolVar(&showVersion, "version", false, "show version information")
+	flag.Parse()
+
+	if showVersion {
+		fmt.Println("TDengine alert v" + version)
+		return
+	}
+
+	if setup {
+		if runtime.GOOS == "linux" {
+			doSetup(cfgPath)
+		} else {
+			fmt.Fprintln(os.Stderr, "can only run as a daemon mode in linux.")
+		}
+		return
+	}
+
+	if e := utils.LoadConfig(cfgPath); e != nil {
+		fmt.Fprintln(os.Stderr, "failed to load configuration")
+		return
+	}
+
+	if e := log.Init(); e != nil {
+		fmt.Fprintln(os.Stderr, "failed to initialize logger:", e.Error())
+		return
+	}
+	defer log.Sync()
+
+	if e := models.Init(); e != nil {
+		log.Fatal("failed to initialize database:", e.Error())
+	}
+
+	if e := app.Init(); e != nil {
+		log.Fatal("failed to initialize application:", e.Error())
+	}
+	// start web server
+	srv := serveWeb()
+
+	// wait `Ctrl-C` or `Kill` to exit, `Kill` does not work on Windows
+	interrupt := make(chan os.Signal)
+	signal.Notify(interrupt, os.Interrupt)
+	signal.Notify(interrupt, os.Kill)
+	<-interrupt
+	fmt.Println("'Ctrl + C' received, exiting...")
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	srv.Shutdown(ctx)
+	cancel()
+
+	app.Uninit()
+	models.Uninit()
+}
diff --git a/alert/cmd/alert/rule.json b/alert/cmd/alert/rule.json
new file mode 100644
index 0000000000000000000000000000000000000000..2859ff9c90d225f0c73674c5338125d952350f9c
--- /dev/null
+++ b/alert/cmd/alert/rule.json
@@ -0,0 +1,13 @@
+{
+    "name": "CarTooFast",
+    "period": "10s",
+    "sql": "select avg(speed) as avgspeed from test.cars where ts > now - 5m group by id",
+    "expr": "avgSpeed > 100",
+    "for": "0s",
+    "labels": {
+        "ruleName": "CarTooFast"
+    },
+    "annotations": {
+        "summary": "car {{$values.id}} is too fast, its average speed is {{$values.avgSpeed}}km/h"
+    }
+}
\ No newline at end of file
diff --git a/alert/go.mod b/alert/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..01c557d5646714869ad263a9c8fe2fa262fe9a43
--- /dev/null
+++ b/alert/go.mod
@@ -0,0 +1,12 @@
+module github.com/taosdata/alert
+
+go 1.14
+
+require (
+	github.com/jmoiron/sqlx v1.2.0
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible
+	github.com/taosdata/driver-go v0.0.0-20200727182616-1a3b1941c206
+	go.uber.org/zap v1.14.1
+	google.golang.org/appengine v1.6.5 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+)
diff --git a/alert/models/models.go b/alert/models/models.go
new file mode 100644
index 0000000000000000000000000000000000000000..5d6de5572cc0ebb14ae4bca9f97ea1f64f34c00d
--- /dev/null
+++ b/alert/models/models.go
@@ -0,0 +1,131 @@
+package models
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/taosdata/alert/utils"
+	"github.com/taosdata/alert/utils/log"
+)
+
+var db *sqlx.DB
+
+func Init() error {
+	xdb, e := sqlx.Connect("sqlite3", utils.Cfg.Database)
+	if e == nil {
+		db = xdb
+	}
+	return upgrade()
+}
+
+func Uninit() error {
+	db.Close()
+	return nil
+}
+
+func getStringOption(tx *sqlx.Tx, name string) (string, error) {
+	const qs = "SELECT * FROM `option` WHERE `name`=?"
+
+	var (
+		e error
+		o struct {
+			Name  string `db:"name"`
+			Value string `db:"value"`
+		}
+	)
+
+	if tx != nil {
+		e = tx.Get(&o, qs, name)
+	} else {
+		e = db.Get(&o, qs, name)
+	}
+
+	if e != nil {
+		return "", e
+	}
+
+	return o.Value, nil
+}
+
+func getIntOption(tx *sqlx.Tx, name string) (int, error) {
+	s, e := getStringOption(tx, name)
+	if e != nil {
+		return 0, e
+	}
+	v, e := strconv.ParseInt(s, 10, 64)
+	return int(v), e
+}
+
+func setOption(tx *sqlx.Tx, name string, value interface{}) error {
+	const qs = "REPLACE INTO `option`(`name`, `value`) VALUES(?, ?);"
+
+	var (
+		e  error
+		sv string
+	)
+
+	switch v := value.(type) {
+	case time.Time:
+		sv = v.Format(time.RFC3339)
+	default:
+		sv = fmt.Sprint(value)
+	}
+
+	if tx != nil {
+		_, e = tx.Exec(qs, name, sv)
+	} else {
+		_, e = db.Exec(qs, name, sv)
+	}
+
+	return e
+}
+
+var upgradeScripts = []struct {
+	ver   int
+	stmts []string
+}{
+	{
+		ver: 0,
+		stmts: []string{
+			"CREATE TABLE `option`( `name` VARCHAR(63) PRIMARY KEY, `value` VARCHAR(255) NOT NULL) WITHOUT ROWID;",
+			"CREATE TABLE `rule`( `name` VARCHAR(63) PRIMARY KEY, `enabled` TINYINT(1) NOT NULL, `created_at` DATETIME NOT NULL, `updated_at` DATETIME NOT NULL, `content` TEXT(65535) NOT NULL);",
+		},
+	},
+}
+
+func upgrade() error {
+	const dbVersion = "database version"
+
+	ver, e := getIntOption(nil, dbVersion)
+	if e != nil { // regards all errors as schema not created
+		ver = -1 // set ver to -1 to execute all statements
+	}
+
+	tx, e := db.Beginx()
+	if e != nil {
+		return e
+	}
+
+	for _, us := range upgradeScripts {
+		if us.ver <= ver {
+			continue
+		}
+		log.Info("upgrading database to version: ", us.ver)
+		for _, s := range us.stmts {
+			if _, e = tx.Exec(s); e != nil {
+				tx.Rollback()
+				return e
+			}
+		}
+		ver = us.ver
+	}
+
+	if e = setOption(tx, dbVersion, ver); e != nil {
+		tx.Rollback()
+		return e
+	}
+
+	return tx.Commit()
+}
diff --git a/alert/models/rule.go b/alert/models/rule.go
new file mode 100644
index 0000000000000000000000000000000000000000..53d45f45dafae3db5d871219a51214963c0c2747
--- /dev/null
+++ b/alert/models/rule.go
@@ -0,0 +1,75 @@
+package models
+
+import "time"
+
+const (
+	sqlSelectAllRule = "SELECT * FROM `rule`;"
+	sqlSelectRule    = "SELECT * FROM `rule` WHERE `name` = ?;"
+	sqlInsertRule    = "INSERT INTO `rule`(`name`, `enabled`, `created_at`, `updated_at`, `content`) VALUES(:name, :enabled, :created_at, :updated_at, :content);"
+	sqlUpdateRule    = "UPDATE `rule` SET `content` = :content, `updated_at` = :updated_at WHERE `name` = :name;"
+	sqlEnableRule    = "UPDATE `rule` SET `enabled` = :enabled, `updated_at` = :updated_at WHERE `name` = :name;"
+	sqlDeleteRule    = "DELETE FROM `rule` WHERE `name` = ?;"
+)
+
+type Rule struct {
+	Name      string    `db:"name"`
+	Enabled   bool      `db:"enabled"`
+	CreatedAt time.Time `db:"created_at"`
+	UpdatedAt time.Time `db:"updated_at"`
+	Content   string    `db:"content"`
+}
+
+func AddRule(r *Rule) error {
+	r.CreatedAt = time.Now()
+	r.Enabled = true
+	r.UpdatedAt = r.CreatedAt
+	_, e := db.NamedExec(sqlInsertRule, r)
+	return e
+}
+
+func UpdateRule(name string, content string) error {
+	r := Rule{
+		Name:      name,
+		UpdatedAt: time.Now(),
+		Content:   content,
+	}
+	_, e := db.NamedExec(sqlUpdateRule, &r)
+	return e
+}
+
+func EnableRule(name string, enabled bool) error {
+	r := Rule{
+		Name:      name,
+		Enabled:   enabled,
+		UpdatedAt: time.Now(),
+	}
+
+	if res, e := db.NamedExec(sqlEnableRule, &r); e != nil {
+		return e
+	} else if n, e := res.RowsAffected(); n != 1 {
+		return e
+	}
+
+	return nil
+}
+
+func DeleteRule(name string) error {
+	_, e := db.Exec(sqlDeleteRule, name)
+	return e
+}
+
+func GetRuleByName(name string) (*Rule, error) {
+	r := Rule{}
+	if e := db.Get(&r, sqlSelectRule, name); e != nil {
+		return nil, e
+	}
+	return &r, nil
+}
+
+func LoadAllRule() ([]Rule, error) {
+	var rules []Rule
+	if e := db.Select(&rules, sqlSelectAllRule); e != nil {
+		return nil, e
+	}
+	return rules, nil
+}
diff --git a/alert/release.sh b/alert/release.sh
new file mode 100755
index 0000000000000000000000000000000000000000..35eb4d677f2a6f07699c2668ea67d44c5af44c92
--- /dev/null
+++ b/alert/release.sh
@@ -0,0 +1,60 @@
+set -e
+
+# releash.sh  -c [armv6l | arm64 | amd64 | 386] 
+#             -o [linux | darwin | windows]  
+
+# set parameters by default value
+cpuType=amd64    # [armv6l | arm64 | amd64 | 386]
+osType=linux   # [linux | darwin | windows]
+version=""
+declare -A archMap=(["armv6l"]="arm" ["arm64"]="arm64" ["amd64"]="x64" ["386"]="x86")
+while getopts "h:c:o:n:" arg
+do
+  case $arg in
+    c)
+      #echo "cpuType=$OPTARG"
+      cpuType=$(echo $OPTARG)
+      ;;
+    o)
+      #echo "osType=$OPTARG"
+      osType=$(echo $OPTARG)
+      ;;
+    n)
+      #echo "version=$OPTARG"
+      version=$(echo $OPTARG)
+      ;;
+    h)
+      echo "Usage: `basename $0` -c [armv6l | arm64 | amd64 | 386] -o [linux | darwin | windows]"
+      exit 0
+      ;;
+    ?) #unknown option 
+      echo "unknown argument"
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$version" == "" ]; then 
+  echo "Please input the correct version!"
+  exit 1
+fi
+
+startdir=$(pwd)
+scriptdir=$(dirname $(readlink -f $0))
+cd ${scriptdir}/cmd/alert
+
+echo "cpuType=${cpuType}"
+echo "osType=${osType}"
+echo "version=${version}"
+
+GOOS=${osType} GOARCH=${cpuType} go build -ldflags '-X main.version='${version}
+
+mkdir -p TDengine-alert/driver
+
+cp alert alert.cfg install_driver.sh ./TDengine-alert/.
+cp ../../../debug/build/lib/libtaos.so.${version} ./TDengine-alert/driver/.
+chmod 777 ./TDengine-alert/install_driver.sh
+
+tar -I 'gzip -9' -cf ${startdir}/TDengine-alert-${version}-${osType^}-${archMap[${cpuType}]}.tar.gz TDengine-alert/
+rm -rf ./TDengine-alert
+
diff --git a/alert/test/prepare.sim b/alert/test/prepare.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2b786e8a080784e7bfffd63d41d0abf1d52637b4
--- /dev/null
+++ b/alert/test/prepare.sim
@@ -0,0 +1,17 @@
+sql connect
+sleep 100
+
+sql drop database if exists test
+sql create database test
+sql use test
+
+print ====== create super table
+sql create table cars (ts timestamp, speed int) tags(id int)
+
+print ====== create tables
+$i = 0
+while $i < 5
+    $tb = car . $i
+    sql create table $tb using cars tags( $i )
+    $i = $i + 1
+endw
diff --git a/alert/test/rule.json b/alert/test/rule.json
new file mode 100644
index 0000000000000000000000000000000000000000..8394b26593ee2fd432014be6b8537b4edec73b99
--- /dev/null
+++ b/alert/test/rule.json
@@ -0,0 +1,13 @@
+{
+    "name": "test1",
+    "period": "10s",
+    "sql": "select avg(speed) as avgspeed from test.cars group by id",
+    "expr": "avgSpeed >= 3",
+    "for": "0s",
+    "labels": {
+        "ruleName": "test1"
+    },
+    "annotations": {
+        "summary": "speed of car(id = {{$labels.id}}) is too high: {{$values.avgSpeed}}"
+    }
+}
\ No newline at end of file
diff --git a/alert/test/step1.sim b/alert/test/step1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f8c3d3bdd533ebc4d4c5efdd1e4e813f212ebcca
--- /dev/null
+++ b/alert/test/step1.sim
@@ -0,0 +1,10 @@
+sql connect
+sleep 100
+
+print ====== insert 10 records to table 0
+$i = 10
+while $i > 0
+    $ms = $i . s
+    sql insert into test.car0 values(now - $ms , 1)
+    $i = $i - 1
+endw
diff --git a/alert/test/step2.sim b/alert/test/step2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..911d8290ba07c68440b725e7a570f90f9b5d7e74
--- /dev/null
+++ b/alert/test/step2.sim
@@ -0,0 +1,5 @@
+sql connect
+sleep 100
+
+print ====== insert another records table 0
+sql insert into test.car0 values(now , 100)
diff --git a/alert/test/step3.sim b/alert/test/step3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d88a171905f85a7a2754033605e701b327ff947a
--- /dev/null
+++ b/alert/test/step3.sim
@@ -0,0 +1,12 @@
+sql connect
+sleep 100
+
+print ====== insert 10 records to table 0, 1, 2
+$i = 10
+while $i > 0
+    $ms = $i . s
+    sql insert into test.car0 values(now - $ms , 1)
+    sql insert into test.car1 values(now - $ms , $i )
+    sql insert into test.car2 values(now - $ms , 10)
+    $i = $i - 1
+endw
diff --git a/alert/test/test.sh b/alert/test/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d6cc10e6e7b645fe13867767497c1a0f2881cdcb
--- /dev/null
+++ b/alert/test/test.sh
@@ -0,0 +1,91 @@
+# wait until $1 alerts are generates, and at most wait $2 seconds
+# return 0 if wait succeeded, 1 if wait timeout
+function waitAlert() {
+  local i=0
+
+  while [ $i -lt $2 ]; do
+    local c=$(wc -l alert.out | awk '{print $1}')
+
+    if [ $c -ge $1 ]; then
+      return 0
+    fi
+
+    let "i=$i+1"
+    sleep 1s
+  done
+
+  return 1
+}
+
+# prepare environment
+kill -INT `ps aux | grep 'alert -cfg' | grep -v grep | awk '{print $2}'`
+
+rm -f alert.db
+rm -f alert.out
+../cmd/alert/alert -cfg ../cmd/alert/alert.cfg > alert.out &
+
+../../td/debug/build/bin/tsim -c /etc/taos -f ./prepare.sim
+
+# add a rule to alert application
+curl -d '@rule.json' http://localhost:8100/api/update-rule
+
+# step 1: add some data but not trigger an alert
+../../td/debug/build/bin/tsim -c /etc/taos -f ./step1.sim
+
+# wait 20 seconds, should not get an alert
+waitAlert 1 20
+res=$?
+if [ $res -eq 0 ]; then
+  echo 'should not have alerts here'
+  exit 1
+fi
+
+# step 2: trigger an alert
+../../td/debug/build/bin/tsim -c /etc/taos -f ./step2.sim
+
+# wait 30 seconds for the alert
+waitAlert 1 30 
+res=$?
+if [ $res -eq 1 ]; then
+  echo 'there should be an alert now'
+  exit 1
+fi
+
+# compare whether the generate alert meet expectation
+diff <(uniq alert.out | sed -n 1p | jq -cS 'del(.startsAt, .endsAt)') <(jq -cSn '{"values":{"avgspeed":10,"id":0},"labels":{"id":"0","ruleName":"test1"},"annotations":{"summary":"speed of car(id = 0) is too high: 10"}}')
+if [ $? -ne 0 ]; then
+  echo 'the generated alert does not meet expectation'
+  exit 1
+fi
+
+# step 3: add more data, trigger another 3 alerts
+../../td/debug/build/bin/tsim -c /etc/taos -f ./step3.sim
+
+# wait 30 seconds for the alerts
+waitAlert 4 30 
+res=$?
+if [ $res -eq 1 ]; then
+  echo 'there should be 4 alerts now'
+  exit 1
+fi
+
+# compare whether the generate alert meet expectation
+diff <(uniq alert.out | sed -n 2p | jq -cS 'del(.startsAt, .endsAt)') <(jq -cSn '{"annotations":{"summary":"speed of car(id = 0) is too high: 5.714285714285714"},"labels":{"id":"0","ruleName":"test1"},"values":{"avgspeed":5.714285714285714,"id":0}}')
+if [ $? -ne 0 ]; then
+  echo 'the generated alert does not meet expectation'
+  exit 1
+fi
+
+diff <(uniq alert.out | sed -n 3p | jq -cS 'del(.startsAt, .endsAt)') <(jq -cSn '{"annotations":{"summary":"speed of car(id = 1) is too high: 5.5"},"labels":{"id":"1","ruleName":"test1"},"values":{"avgspeed":5.5,"id":1}}')
+if [ $? -ne 0 ]; then
+  echo 'the generated alert does not meet expectation'
+  exit 1
+fi
+
+diff <(uniq alert.out | sed -n 4p | jq -cS 'del(.startsAt, .endsAt)') <(jq -cSn '{"annotations":{"summary":"speed of car(id = 2) is too high: 10"},"labels":{"id":"2","ruleName":"test1"},"values":{"avgspeed":10,"id":2}}')
+if [ $? -ne 0 ]; then
+  echo 'the generated alert does not meet expectation'
+  exit 1
+fi
+
+kill -INT `ps aux | grep 'alert -cfg' | grep -v grep | awk '{print $2}'`
diff --git a/alert/utils/config.go b/alert/utils/config.go
new file mode 100644
index 0000000000000000000000000000000000000000..71b9dd16e1f22784dbb01247485772aef4b49374
--- /dev/null
+++ b/alert/utils/config.go
@@ -0,0 +1,41 @@
+package utils
+
+import (
+	"encoding/json"
+	"os"
+
+	"gopkg.in/yaml.v3"
+)
+
+type Config struct {
+	Port     uint16 `json:"port,omitempty" yaml:"port,omitempty"`
+	Database string `json:"database,omitempty" yaml:"database,omitempty"`
+	RuleFile string `json:"ruleFile,omitempty" yaml:"ruleFile,omitempty"`
+	Log      struct {
+		Level string `json:"level,omitempty" yaml:"level,omitempty"`
+		Path  string `json:"path,omitempty" yaml:"path,omitempty"`
+	} `json:"log" yaml:"log"`
+	TDengine  string `json:"tdengine,omitempty" yaml:"tdengine,omitempty"`
+	Receivers struct {
+		AlertManager string `json:"alertManager,omitempty" yaml:"alertManager,omitempty"`
+		Console      bool   `json:"console"`
+	} `json:"receivers" yaml:"receivers"`
+}
+
+var Cfg Config
+
+func LoadConfig(path string) error {
+	f, e := os.Open(path)
+	if e != nil {
+		return e
+	}
+	defer f.Close()
+
+	e = yaml.NewDecoder(f).Decode(&Cfg)
+	if e != nil {
+		f.Seek(0, 0)
+		e = json.NewDecoder(f).Decode(&Cfg)
+	}
+
+	return e
+}
diff --git a/alert/utils/log/log.go b/alert/utils/log/log.go
new file mode 100644
index 0000000000000000000000000000000000000000..5f49c213ae90cd9cf1e2d20a03fa4442f8b22782
--- /dev/null
+++ b/alert/utils/log/log.go
@@ -0,0 +1,94 @@
+package log
+
+import (
+	"github.com/taosdata/alert/utils"
+	"go.uber.org/zap"
+)
+
+var logger *zap.SugaredLogger
+
+func Init() error {
+	var cfg zap.Config
+
+	if utils.Cfg.Log.Level == "debug" {
+		cfg = zap.NewDevelopmentConfig()
+	} else {
+		cfg = zap.NewProductionConfig()
+	}
+
+	if len(utils.Cfg.Log.Path) > 0 {
+		cfg.OutputPaths = []string{utils.Cfg.Log.Path}
+	}
+
+	l, e := cfg.Build()
+	if e != nil {
+		return e
+	}
+
+	logger = l.Sugar()
+	return nil
+}
+
+// Debug package logger
+func Debug(args ...interface{}) {
+	logger.Debug(args...)
+}
+
+// Debugf package logger
+func Debugf(template string, args ...interface{}) {
+	logger.Debugf(template, args...)
+}
+
+// Info package logger
+func Info(args ...interface{}) {
+	logger.Info(args...)
+}
+
+// Infof package logger
+func Infof(template string, args ...interface{}) {
+	logger.Infof(template, args...)
+}
+
+// Warn package logger
+func Warn(args ...interface{}) {
+	logger.Warn(args...)
+}
+
+// Warnf package logger
+func Warnf(template string, args ...interface{}) {
+	logger.Warnf(template, args...)
+}
+
+// Error package logger
+func Error(args ...interface{}) {
+	logger.Error(args...)
+}
+
+// Errorf package logger
+func Errorf(template string, args ...interface{}) {
+	logger.Errorf(template, args...)
+}
+
+// Fatal package logger
+func Fatal(args ...interface{}) {
+	logger.Fatal(args...)
+}
+
+// Fatalf package logger
+func Fatalf(template string, args ...interface{}) {
+	logger.Fatalf(template, args...)
+}
+
+// Panic package logger
+func Panic(args ...interface{}) {
+	logger.Panic(args...)
+}
+
+// Panicf package logger
+func Panicf(template string, args ...interface{}) {
+	logger.Panicf(template, args...)
+}
+
+func Sync() error {
+	return logger.Sync()
+}
diff --git a/cmake/define.inc b/cmake/define.inc
new file mode 100755
index 0000000000000000000000000000000000000000..84df6f54055cff0b6fe7f1820d46958787ca3c46
--- /dev/null
+++ b/cmake/define.inc
@@ -0,0 +1,162 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_ACCOUNT)
+  ADD_DEFINITIONS(-D_ACCT)
+ENDIF ()
+
+IF (TD_ADMIN)
+  ADD_DEFINITIONS(-D_ADMIN)
+ENDIF ()
+
+IF (TD_GRANT)
+  ADD_DEFINITIONS(-D_GRANT)
+ENDIF ()
+
+IF (TD_SYNC)
+  ADD_DEFINITIONS(-D_SYNC)
+ENDIF ()
+
+IF (TD_MQTT)
+  ADD_DEFINITIONS(-D_MQTT)
+ENDIF ()
+
+IF (TD_TSDB_PLUGINS)
+  ADD_DEFINITIONS(-D_TSDB_PLUGINS)
+ENDIF ()
+
+IF (TD_GODLL)
+  ADD_DEFINITIONS(-D_TD_GO_DLL_)
+ENDIF ()
+
+IF (TD_POWER)
+  ADD_DEFINITIONS(-D_TD_POWER_)
+ENDIF ()
+
+IF (TD_MEM_CHECK)
+  ADD_DEFINITIONS(-DTAOS_MEM_CHECK)
+ENDIF ()
+
+IF (TD_RANDOM_FILE_FAIL)
+  ADD_DEFINITIONS(-DTAOS_RANDOM_FILE_FAIL)
+ENDIF ()
+
+IF (TD_RANDOM_NETWORK_FAIL)
+  ADD_DEFINITIONS(-DTAOS_RANDOM_NETWORK_FAIL)
+ENDIF ()
+
+IF (TD_LINUX_64)
+  ADD_DEFINITIONS(-D_M_X64)
+  ADD_DEFINITIONS(-D_TD_LINUX_64)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+ENDIF ()
+
+IF (TD_LINUX_32)
+  ADD_DEFINITIONS(-D_TD_LINUX_32)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -munaligned-access -fpack-struct=8 -latomic -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
+IF (TD_ARM_64)
+  ADD_DEFINITIONS(-D_M_X64)
+  ADD_DEFINITIONS(-D_TD_ARM_64_)
+  ADD_DEFINITIONS(-D_TD_ARM_)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
+IF (TD_ARM_32)
+  ADD_DEFINITIONS(-D_TD_ARM_32_)
+  ADD_DEFINITIONS(-D_TD_ARM_)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
+IF (TD_MIPS_64)
+  ADD_DEFINITIONS(-D_TD_MIPS_64_)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
+IF (TD_MIPS_32)
+  ADD_DEFINITIONS(-D_TD_MIPS_32_)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
+IF (TD_APLHINE)
+  SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
+  link_libraries(/usr/lib/libargp.a)
+  ADD_DEFINITIONS(-D_ALPINE)
+ENDIF ()
+
+IF (TD_LINUX)
+  ADD_DEFINITIONS(-DLINUX)
+  ADD_DEFINITIONS(-D_LINUX)
+  ADD_DEFINITIONS(-D_TD_LINUX)
+  ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+
+  IF (TD_NINGSI_60)
+    ADD_DEFINITIONS(-D_TD_NINGSI_60_)
+    MESSAGE(STATUS "set ningsi macro to true")
+  ENDIF ()
+  
+  SET(DEBUG_FLAGS "-O0 -DDEBUG")
+  SET(RELEASE_FLAGS "-O0 -Wno-unused-variable -Wunused-but-set-variable")
+  
+  IF (${COVER} MATCHES "true")
+    MESSAGE(STATUS "Test coverage mode, add extra flags")
+    SET(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
+    SET(GCC_COVERAGE_LINK_FLAGS    "-lgcov --coverage")
+    SET(COMMON_FLAGS "${COMMON_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
+  ENDIF ()
+
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc)
+ENDIF ()
+
+IF (TD_DARWIN_64)
+  ADD_DEFINITIONS(-D_TD_DARWIN_64)
+  ADD_DEFINITIONS(-DDARWIN)
+  ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -Wno-missing-braces -fPIC -g -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  SET(DEBUG_FLAGS "-O0 -DDEBUG")
+  SET(RELEASE_FLAGS "-O0")
+ENDIF ()
+
+IF (TD_WINDOWS)
+  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)
+  SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
+  IF (NOT TD_GODLL)
+    SET(COMMON_FLAGS "/nologo /WX /wd4018 /wd2220 /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")
+  ENDIF ()
+
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/wepoll/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MsvcLibX/include)
+ENDIF () 
+
+IF (TD_WINDOWS_64)
+  ADD_DEFINITIONS(-D_M_X64)
+  ADD_DEFINITIONS(-D_TD_WINDOWS_64)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+ENDIF ()
+
+IF (TD_WINDOWS_32)
+  ADD_DEFINITIONS(-D_TD_WINDOWS_32)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+ENDIF ()
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
+
+MESSAGE(STATUS "CMAKE_CXX_COMPILER_ID: " ${CMAKE_CXX_COMPILER_ID})
diff --git a/cmake/env.inc b/cmake/env.inc
new file mode 100755
index 0000000000000000000000000000000000000000..67b934119d0e2de95c2ec60741cc4b78b7dbb267
--- /dev/null
+++ b/cmake/env.inc
@@ -0,0 +1,55 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+SET(CMAKE_C_STANDARD 11)
+SET(CMAKE_VERBOSE_MAKEFILE ON)
+
+#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 "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})
+
+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 ()
+
+#
+# If need to set debug options
+#   1.Generate debug version:
+#     mkdir debug; cd debug;
+#     cmake -DCMAKE_BUILD_TYPE=Debug ..
+#   2.Generate release version:
+#     mkdir release; cd release;
+#     cmake -DCMAKE_BUILD_TYPE=Release ..
+#
+
+# Set compiler options
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_FLAGS} ${DEBUG_FLAGS}")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_FLAGS} ${RELEASE_FLAGS}")
+
+# Set c++ compiler options
+# SET(COMMON_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
+# SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS} ${DEBUG_FLAGS}")
+# SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${COMMON_CXX_FLAGS} ${RELEASE_FLAGS}")
+
+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_64)
+    SET(CMAKE_BUILD_TYPE "Release")
+    MESSAGE(STATUS "Build Release Version in Windows as default")
+  ELSE ()
+    SET(CMAKE_BUILD_TYPE "Debug")
+    MESSAGE(STATUS "Build Debug Version as default")
+  ENDIF()
+ENDIF ()
\ No newline at end of file
diff --git a/cmake/input.inc b/cmake/input.inc
new file mode 100755
index 0000000000000000000000000000000000000000..1ef2045f57e5c9df94b6fe8284930711e8624a8a
--- /dev/null
+++ b/cmake/input.inc
@@ -0,0 +1,63 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (${ACCOUNT} MATCHES "true")
+  SET(TD_ACCOUNT TRUE)
+  MESSAGE(STATUS "Build with account plugins")
+ELSEIF (${ACCOUNT} MATCHES "false")
+  SET(TD_ACCOUNT FALSE)
+  MESSAGE(STATUS "Build without account plugins")
+ENDIF ()
+
+IF (${COVER} MATCHES "true")
+  SET(TD_COVER TRUE)
+  MESSAGE(STATUS "Build with test coverage")
+ELSEIF (${COVER} MATCHES "false")
+  SET(TD_COVER FALSE)
+  MESSAGE(STATUS "Build without test coverage")
+ENDIF ()
+
+IF (${PAGMODE} MATCHES "lite")
+  SET(TD_PAGMODE_LITE TRUE)
+  MESSAGE(STATUS "Build with pagmode lite")
+ENDIF ()
+
+IF (${SOMODE} MATCHES "static")
+  SET(TD_SOMODE_STATIC TRUE)
+  MESSAGE(STATUS "Link so using static mode")
+ENDIF ()
+
+IF (${DBNAME} MATCHES "power")
+  SET(TD_POWER TRUE)
+  MESSAGE(STATUS "power is true")
+ENDIF ()
+
+IF (${DLLTYPE} MATCHES "go")
+  SET(TD_GODLL TRUE)
+  MESSAGE(STATUS "input dll type: " ${DLLTYPE})
+ENDIF ()
+
+IF (${MEM_CHECK} MATCHES "true")
+  SET(TD_MEM_CHECK TRUE)
+  MESSAGE(STATUS "build with memory check")
+ENDIF ()
+
+IF (${MQTT} MATCHES "false")
+  SET(TD_MQTT FALSE)
+  MESSAGE(STATUS "build without mqtt module")
+ENDIF ()
+
+IF (${SYNC} MATCHES "false")
+  SET(TD_SYNC FALSE)
+  MESSAGE(STATUS "build without sync module")
+ENDIF ()
+
+IF (${RANDOM_FILE_FAIL} MATCHES "true")
+  SET(TD_RANDOM_FILE_FAIL TRUE)
+  MESSAGE(STATUS "build with random-file-fail enabled")
+ENDIF ()
+
+IF (${RANDOM_NETWORK_FAIL} MATCHES "true")
+  SET(TD_RANDOM_NETWORK_FAIL TRUE)
+  MESSAGE(STATUS "build with random-network-fail enabled")
+ENDIF ()
diff --git a/cmake/install.inc b/cmake/install.inc
new file mode 100755
index 0000000000000000000000000000000000000000..f5e01e2f1d79f1c2e7fa32552cbe93677de6338d
--- /dev/null
+++ b/cmake/install.inc
@@ -0,0 +1,40 @@
+IF (TD_LINUX)
+  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} Linux ${TD_VER_NUMBER})")
+ELSEIF (TD_WINDOWS)
+  IF (TD_POWER)
+    SET(CMAKE_INSTALL_PREFIX C:/PowerDB)
+  ELSE ()
+    SET(CMAKE_INSTALL_PREFIX C:/TDengine)
+  ENDIF ()
+  
+  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go     DESTINATION connector)
+  INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/nodejs 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) 
+   
+  IF (TD_POWER)
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/power.exe DESTINATION .)
+  ELSE ()   
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taos.exe DESTINATION .)   
+    INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/taosdemo.exe DESTINATION .)
+  ENDIF ()
+
+  #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
+  #INSTALL(TARGETS shell RUNTIME DESTINATION .)
+  IF (TD_MVN_INSTALLED)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.0-dist.jar DESTINATION connector/jdbc)
+  ENDIF ()
+ELSEIF (TD_DARWIN)
+  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} Darwin ${TD_VER_NUMBER})")
+ENDIF ()
diff --git a/cmake/platform.inc b/cmake/platform.inc
new file mode 100755
index 0000000000000000000000000000000000000000..889f6c73cf2be982df7f1db207114e58d6af3e92
--- /dev/null
+++ b/cmake/platform.inc
@@ -0,0 +1,122 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+#
+# 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
+#     mkdir build; cd build;
+#     cmake -A x64 ..
+#     open the file named TDengine.sln
+#
+
+# Set macro definitions according to os platform
+SET(TD_LINUX FALSE)
+  SET(TD_LINUX_64 FALSE)
+  SET(TD_LINUX_32 FALSE)
+  SET(TD_ARM_64 FALSE)
+  SET(TD_ARM_32 FALSE)
+  SET(TD_MIPS_64 FALSE)
+  SET(TD_MIPS_32 FALSE)
+  SET(TD_APLHINE FALSE)
+  SET(TD_NINGSI FALSE)
+  SET(TD_NINGSI_60 FALSE)
+  SET(TD_NINGSI_80 FALSE)
+SET(TD_WINDOWS FALSE)
+  SET(TD_WINDOWS_64 FALSE)
+  SET(TD_WINDOWS_32 FALSE)
+SET(TD_DARWIN FALSE)
+  SET(TD_DARWIN_64 FALSE)
+
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  #
+  # Get OS information and store in variable TD_OS_INFO.
+  #
+  execute_process(COMMAND chmod 777 ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh)
+  execute_process(COMMAND ${TD_COMMUNITY_DIR}/packaging/tools/get_os.sh "" OUTPUT_VARIABLE TD_OS_INFO)
+  MESSAGE(STATUS "The current os is " ${TD_OS_INFO})
+
+  SET(TD_LINUX TRUE)
+  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+    SET(TD_LINUX_64 TRUE)
+    MESSAGE(STATUS "The current platform is Linux 64-bit")
+  ELSEIF (${CMAKE_SIZEOF_VOID_P} MATCHES 4)
+    SET(TD_LINUX_32 TRUE)
+    MESSAGE(STATUS "The current platform is Linux 32-bit")
+  ELSE ()
+    MESSAGE(FATAL_ERROR "The current platform is Linux neither 32-bit nor 64-bit, not supported yet")
+    EXIT ()
+  ENDIF ()
+
+  IF (${TD_OS_INFO} MATCHES "Alpine")
+    SET(TD_APLHINE TRUE)
+    MESSAGE(STATUS "The current OS is Alpine, append extra flags")
+  ENDIF()
+ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  SET(TD_DARWIN TRUE)
+  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+    SET(TD_DARWIN_64 TRUE)
+    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")
+  SET(TD_WINDOWS TRUE)
+  IF (${CMAKE_SIZEOF_VOID_P} MATCHES 8)
+    SET(TD_WINDOWS_64 TRUE)
+    MESSAGE(STATUS "The current platform is Windows 64-bit")
+  ELSE ()
+    SET(TD_WINDOWS_32 TRUE)
+    MESSAGE(STATUS "The current platform is Windows 32-bit")
+  ENDIF ()
+ELSE()
+  MESSAGE(FATAL_ERROR "The current platform is not Linux/Darwin/Windows, stop compile")
+  EXIT ()
+ENDIF ()
+
+# if generate ARM version:
+#   cmake -DCPUTYPE=aarch32 .. or cmake -DCPUTYPE=aarch64
+IF (${CPUTYPE} MATCHES "aarch32")
+  SET(TD_LINUX TRUE)
+  SET(TD_LINUX_32 FALSE)
+  SET(TD_ARM_32 TRUE)
+  MESSAGE(STATUS "input cpuType: aarch32")
+ELSEIF (${CPUTYPE} MATCHES "aarch64")
+  SET(TD_LINUX TRUE)
+  SET(TD_LINUX_64 FALSE)
+  SET(TD_ARM_64 TRUE)
+  MESSAGE(STATUS "input cpuType: aarch64")
+ELSEIF (${CPUTYPE} MATCHES "mips64")
+  SET(TD_LINUX TRUE)
+  SET(TD_LINUX_64 FALSE)
+  SET(TD_MIPS_64 TRUE)
+  MESSAGE(STATUS "input cpuType: mips64")
+ELSEIF (${CPUTYPE} MATCHES "x64")
+  MESSAGE(STATUS "input cpuType: x64")
+ELSEIF (${CPUTYPE} MATCHES "x86")
+  MESSAGE(STATUS "input cpuType: x86")
+ELSE ()
+  MESSAGE(STATUS "input cpuType unknown " ${CPUTYPE})
+ENDIF ()
+
+#   cmake -DOSTYPE=Ningsi
+IF (${OSTYPE} MATCHES "Ningsi60")
+  SET(TD_NINGSI TRUE)
+  SET(TD_NINGSI_60 TRUE)
+  MESSAGE(STATUS "input osType: Ningsi60")
+ELSEIF (${OSTYPE} MATCHES "Ningsi80")
+  SET(TD_NINGSI TRUE)
+  SET(TD_NINGSI_80 TRUE)
+  MESSAGE(STATUS "input osType: Ningsi80")
+ELSEIF (${OSTYPE} MATCHES "Linux")
+  MESSAGE(STATUS "input osType: Linux")
+ELSEIF (${OSTYPE} MATCHES "Alpine")
+  MESSAGE(STATUS "input osType: Alpine")
+  SET(TD_APLHINE TRUE)
+ELSE ()
+  MESSAGE(STATUS "input osType unknown: " ${OSTYPE})
+ENDIF ()
diff --git a/cmake/version.inc b/cmake/version.inc
new file mode 100644
index 0000000000000000000000000000000000000000..aa8a4b6463c072b59d54245da4206a6f3b1f351c
--- /dev/null
+++ b/cmake/version.inc
@@ -0,0 +1,69 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (DEFINED VERNUMBER)
+  SET(TD_VER_NUMBER ${VERNUMBER})
+ELSE ()
+  SET(TD_VER_NUMBER "2.0.4.0")
+ENDIF ()
+
+IF (DEFINED VERCOMPATIBLE)
+  SET(TD_VER_COMPATIBLE ${VERCOMPATIBLE})
+ELSE ()
+  SET(TD_VER_COMPATIBLE "2.0.0.0")
+ENDIF ()
+
+IF (DEFINED GITINFO)
+  SET(TD_VER_GIT ${GITINFO})
+ELSE ()
+  SET(TD_VER_GIT "community")
+ENDIF ()
+
+IF (DEFINED GITINFOI)
+  SET(TD_VER_GIT_INTERNAL ${GITINFOI})
+ELSE ()
+  SET(TD_VER_GIT_INTERNAL "internal")
+ENDIF ()
+
+IF (DEFINED VERDATE)
+  SET(TD_VER_DATE ${VERDATE})
+ELSE ()
+  STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S") 
+ENDIF ()
+
+IF (DEFINED VERTYPE)
+  SET(TD_VER_VERTYPE ${VERTYPE})
+ELSE ()
+  SET(TD_VER_VERTYPE "stable")
+ENDIF ()
+
+IF (DEFINED CPUTYPE)
+  SET(TD_VER_CPUTYPE ${CPUTYPE})
+ELSE ()
+  IF (TD_WINDOWS_32)
+    SET(TD_VER_CPUTYPE "x86")
+  ELSE ()
+    SET(TD_VER_CPUTYPE "x64")
+  ENDIF ()
+ENDIF ()
+
+IF (DEFINED OSTYPE)
+  SET(TD_VER_OSTYPE ${OSTYPE})
+ELSE ()
+  SET(TD_VER_OSTYPE "Linux")
+ENDIF ()
+
+MESSAGE(STATUS "============= compile version parameter information start ============= ")
+MESSAGE(STATUS "ver number:" ${TD_VER_NUMBER})
+MESSAGE(STATUS "compatible ver number:" ${TD_VER_COMPATIBLE})
+MESSAGE(STATUS "communit commit id:" ${TD_VER_GIT})
+MESSAGE(STATUS "internal commit id:" ${TD_VER_GIT_INTERNAL})
+MESSAGE(STATUS "build date:" ${TD_VER_DATE})
+MESSAGE(STATUS "ver type:" ${TD_VER_VERTYPE})
+MESSAGE(STATUS "ver cpu:" ${TD_VER_CPUTYPE})
+MESSAGE(STATUS "os type:" ${TD_VER_OSTYPE})
+MESSAGE(STATUS "============= compile version parameter information end  ============= ")
+
+STRING(REPLACE "." "_" TD_LIB_VER_NUMBER ${TD_VER_NUMBER})
+
+CONFIGURE_FILE("${TD_COMMUNITY_DIR}/src/util/src/version.c.in" "${TD_COMMUNITY_DIR}/src/util/src/version.c")
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index bc5bd8c03763dd25f202662e4fa85fa7877a99ff..8c6c73c4400da973726109aa66a50c97e3a2a6f6 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -5,3 +5,11 @@ ADD_SUBDIRECTORY(zlib-1.2.11)
 ADD_SUBDIRECTORY(pthread)
 ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(iconv)
+ADD_SUBDIRECTORY(lz4)
+ADD_SUBDIRECTORY(cJson)
+ADD_SUBDIRECTORY(wepoll)
+ADD_SUBDIRECTORY(MsvcLibX)
+
+IF (TD_LINUX AND TD_MQTT)
+  ADD_SUBDIRECTORY(MQTT-C)
+ENDIF ()
\ No newline at end of file
diff --git a/deps/MQTT-C/CMakeLists.txt b/deps/MQTT-C/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..15b35525210ec90e6e2efbdcd0e6128cb4d34f91
--- /dev/null
+++ b/deps/MQTT-C/CMakeLists.txt
@@ -0,0 +1,80 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+# MQTT-C build options
+option(MQTT_C_OpenSSL_SUPPORT "Build MQTT-C with OpenSSL support?" OFF)
+option(MQTT_C_MbedTLS_SUPPORT "Build MQTT-C with mbed TLS support?" OFF)
+option(MQTT_C_EXAMPLES "Build MQTT-C examples?" ON)
+option(MQTT_C_TESTS "Build MQTT-C tests?" OFF)
+
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# MQTT-C library
+ADD_LIBRARY(mqttc STATIC 
+    src/mqtt_pal.c
+    src/mqtt.c
+)
+TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC include)
+target_link_libraries(mqttc PUBLIC 
+    $<$<C_COMPILER_ID:MSVS>:ws2_32>
+)
+
+
+# Configure with OpenSSL support
+if(MQTT_C_OpenSSL_SUPPORT)
+    find_package(OpenSSL REQUIRED)
+    target_link_libraries(mqttc INTERFACE OpenSSL::SSL)
+    target_compile_definitions(mqttc PUBLIC MQTT_USE_BIO)
+endif()
+
+# Configure with mbed TLS support
+if(MQTT_C_MbedTLS_SUPPORT)
+    find_package(MbedTLS REQUIRED)
+    TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC ${MBEDTLS_INCLUDE_DIRS})
+    target_link_libraries(mqttc INTERFACE ${MBEDTLS_LIBRARY})
+    target_compile_definitions(mqttc PUBLIC MQTT_USE_MBEDTLS)
+endif()
+
+# Build examples
+if(MQTT_C_EXAMPLES)
+    find_package(Threads REQUIRED)
+
+    if(MQTT_C_OpenSSL_SUPPORT)
+        add_executable(bio_publisher examples/bio_publisher.c)
+        target_link_libraries(bio_publisher Threads::Threads mqttc)
+
+        add_executable(openssl_publisher examples/openssl_publisher.c)
+        target_link_libraries(openssl_publisher Threads::Threads mqttc)
+    elseif(MQTT_C_MbedTLS_SUPPORT)
+        add_executable(mbedtls_publisher examples/mbedtls_publisher.c)
+        target_link_libraries(mbedtls_publisher Threads::Threads mqttc ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+    else()
+        add_executable(simple_publisher examples/simple_publisher.c)
+        target_link_libraries(simple_publisher Threads::Threads mqttc)
+
+        add_executable(simple_subscriber examples/simple_subscriber.c)
+        target_link_libraries(simple_subscriber Threads::Threads mqttc)
+
+        add_executable(reconnect_subscriber examples/reconnect_subscriber.c)
+        target_link_libraries(reconnect_subscriber Threads::Threads mqttc)
+    endif()
+endif()
+
+# Build tests
+if(MQTT_C_TESTS)    
+    find_path(CMOCKA_INCLUDE_DIR cmocka.h)
+    find_library(CMOCKA_LIBRARY cmocka)
+    if((NOT CMOCKA_INCLUDE_DIR) OR (NOT CMOCKA_LIBRARY))
+        message(FATAL_ERROR "Failed to find cmocka! Add cmocka's install prefix to CMAKE_PREFIX_PATH to resolve this error.")
+    endif()
+
+    add_executable(tests tests.c)
+    target_link_libraries(tests ${CMOCKA_LIBRARY} mqttc)
+    TARGET_INCLUDE_DIRECTORIES(tests PRIVATE ${CMOCKA_INCLUDE_DIR})
+endif()
+
+# Install includes and library
+# install(TARGETS mqttc 
+#     DESTINATION lib
+# )
+# install(DIRECTORY include/
+#    DESTINATION include)
diff --git a/deps/MQTT-C/Doxyfile b/deps/MQTT-C/Doxyfile
new file mode 100644
index 0000000000000000000000000000000000000000..6c39ec320619da582a818a77597f4b75ec0d4858
--- /dev/null
+++ b/deps/MQTT-C/Doxyfile
@@ -0,0 +1,2427 @@
+# Doxyfile 1.8.11
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "MQTT-C"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = docs/
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = README.md include src
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
+# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = examples
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = README.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = .
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = NO
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/deps/MQTT-C/LICENSE b/deps/MQTT-C/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..0bbb845571c70cf4b0acd545d232bf24b8ecef31
--- /dev/null
+++ b/deps/MQTT-C/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Liam Bindle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/MQTT-C/README.md b/deps/MQTT-C/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..976763de710f3e765cb43bf9c5cd8a199bdd21de
--- /dev/null
+++ b/deps/MQTT-C/README.md
@@ -0,0 +1,108 @@
+<p align="right">
+    <a href="https://github.com/LiamBindle/MQTT-C/stargazers"><img src="https://img.shields.io/github/stars/LiamBindle/MQTT-C.svg?style=social&label=Star" style="margin-left:5em"></a>
+    <a href="https://github.com/LiamBindle/MQTT-C/network/members"><img src="https://img.shields.io/github/forks/LiamBindle/MQTT-C.svg?style=social&label=Fork"></a>
+</p>
+
+<p align="center">
+    <img width="70%" src="docs/mqtt-c-logo.png"><br>
+    <a href="https://liambindle.ca/MQTT-C"><img src="https://img.shields.io/badge/docs-passing-brightgreen.svg"></a>
+    <a href="https://github.com/LiamBindle/MQTT-C/issues"><img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg"></a>
+    <a href="https://GitHub.com/LiamBindle/MQTT-C/issues/"><img src="https://img.shields.io/github/issues/LiamBindle/MQTT-C.svg"></a>
+    <a href="https://github.com/LiamBindle/MQTT-C/issues"><img src="https://img.shields.io/github/issues-closed/LiamBindle/MQTT-C.svg"></a>
+    <a href="https://github.com/LiamBindle/MQTT-C/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
+</p>
+
+# 
+
+MQTT-C is an [MQTT v3.1.1](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html) 
+client written in C. MQTT is a lightweight publisher-subscriber-based messaging protocol that is
+commonly used in IoT and networking applications where high-latency and low data-rate links 
+are expected. The purpose of MQTT-C is to provide a **portable** MQTT client, **written in C**, 
+for embedded systems and PC's alike. MQTT-C does this by providing a transparent Platform 
+Abstraction Layer (PAL) which makes porting to new platforms easy. MQTT-C is completely 
+thread-safe but can also run perfectly fine on single-threaded systems making MQTT-C 
+well-suited for embedded systems and microcontrollers. Finally, MQTT-C is small; there are only 
+two source files totalling less than 2000 lines.
+
+#### A note from the author
+It's been great to hear about all the places MQTT-C is being used! Please don't hesitate
+to get in touch with me or submit issues on GitHub!
+
+## Getting Started
+To use MQTT-C you first instantiate a `struct mqtt_client` and initialize it by calling
+@ref mqtt_init.
+```c
+    struct mqtt_client client; /* instantiate the client */
+    mqtt_init(&client, ...);   /* initialize the client */
+```
+Once your client is initialized you need to connect to an MQTT broker.
+```c
+    mqtt_connect(&client, ...); /* send a connection request to the broker. */
+```
+At this point the client is ready to use! For example, we can subscribe to a topic like so:
+```c
+    /* subscribe to "toaster/temperature" with a max QoS level of 0 */
+    mqtt_subscribe(&client, "toaster/temperature", 0);
+```
+And we can publish to a topic like so:
+```c
+    /* publish coffee temperature with a QoS level of 1 */
+    int temperature = 67;
+    mqtt_publish(&client, "coffee/temperature", &temperature, sizeof(int), MQTT_PUBLISH_QOS_1);
+```
+Those are the basics! From here the [examples](https://github.com/LiamBindle/MQTT-C/tree/master/examples) and [API documentation](https://liambindle.ca/MQTT-C/group__api.html) are good places to get started.
+
+## Building
+There are **only two source files** that need to be built, `mqtt.c` and `mqtt_pal.c`.
+These files are ANSI C (C89) compatible, and should compile with any C compiler.
+
+Then, simply <code>\#include <mqtt.h></code>.
+
+Alternatively, you can build MQTT-C with CMake or the provided Makefile. These are provided for convenience.
+
+## Documentation
+Pre-built documentation can be found here: [https://liambindle.ca/MQTT-C](https://liambindle.ca/MQTT-C). Be sure to check out the [examples](https://github.com/LiamBindle/MQTT-C/tree/master/examples) too.
+
+The @ref api documentation contains all the documentation application programmers should need. 
+The @ref pal documentation contains everything you should need to port MQTT-C to a new platform,
+and the other modules contain documentation for MQTT-C developers.
+
+## Testing and Building the Tests
+The MQTT-C unit tests use the [cmocka unit testing framework](https://cmocka.org/). 
+Therefore, [cmocka](https://cmocka.org/) *must* be installed on your machine to build and run 
+the unit tests. For convenience, a simple `"makefile"` is included to build the unit tests and 
+examples on UNIX-like machines. The unit tests and examples can be built as follows:
+```bash
+    $ make all
+``` 
+The unit tests and examples will be built in the `"bin/"` directory. The unit tests can be run 
+like so:
+```bash
+    $ ./bin/tests [address [port]]
+```
+Note that the \c address and \c port arguments are both optional to specify the location of the
+MQTT broker that is to be used for the tests. If no \c address is given then the 
+[Mosquitto MQTT Test Server](https://test.mosquitto.org/) will be used. If no \c port is given, 
+port 1883 will be used.
+
+## Portability
+MQTT-C provides a transparent platform abstraction layer (PAL) in `mqtt_pal.h` and `mqtt_pal.c`.
+These files declare and implement the types and calls that MQTT-C requires. Refer to 
+@ref pal for the complete documentation of the PAL.
+
+## Contributing
+Please feel free to submit issues and pull-requests [here](https://github.com/LiamBindle/MQTT-C).
+When submitting a pull-request please ensure you have *fully documented* your changes and 
+added the appropriate unit tests.
+
+
+## License
+This project is licensed under the [MIT License](https://opensource.org/licenses/MIT). See the 
+`"LICENSE"` file for more details.
+
+## Authors
+MQTT-C was initially developed as a CMPT 434 (Winter Term, 2018) final project at the University of 
+Saskatchewan by:
+- **Liam Bindle**
+- **Demilade Adeoye**
+
diff --git a/deps/MQTT-C/examples/bio_publisher.c b/deps/MQTT-C/examples/bio_publisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c92b5495e8bc3c1b9fe2245c76f3a03e6d13df1
--- /dev/null
+++ b/deps/MQTT-C/examples/bio_publisher.c
@@ -0,0 +1,156 @@
+
+/**
+ * @file
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/bio_sockets.h"
+
+
+/**
+ * @brief The function that would be called whenever a PUBLISH is received.
+ * 
+ * @note This function is not used in this example. 
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, BIO* sockfd, pthread_t *client_daemon);
+
+/**
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+
+    /* Load OpenSSL */
+    SSL_load_error_strings();
+    ERR_load_BIO_strings();
+    OpenSSL_add_all_algorithms();
+
+    /* get address (argv[1] if present) */
+    if (argc > 1) {
+        addr = argv[1];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[2] if present) */
+    if (argc > 2) {
+        port = argv[2];
+    } else {
+        port = "1883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 3) {
+        topic = argv[3];
+    } else {
+        topic = "datetime";
+    }
+
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    BIO* sockfd = open_nb_socket(addr, port);
+
+    if (sockfd == NULL) {
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* setup a client */
+    struct mqtt_client client;
+    uint8_t sendbuf[2048]; /* sendbuf should be large enough to hold multiple whole mqtt messages */
+    uint8_t recvbuf[1024]; /* recvbuf should be large enough any whole mqtt message expected to be received */
+    mqtt_init(&client, sockfd, sendbuf, sizeof(sendbuf), recvbuf, sizeof(recvbuf), publish_callback);
+    mqtt_connect(&client, "publishing_client", NULL, NULL, 0, NULL, NULL, 0, 400);
+
+    /* check that we don't have any errors */
+    if (client.error != MQTT_OK) {
+        fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+
+    }
+
+    /* start publishing the time */
+    printf("%s is ready to begin publishing the time.\n", argv[0]);
+    printf("Press ENTER to publish the current time.\n");
+    printf("Press CTRL-D (or any other key) to exit.\n\n");
+    while(fgetc(stdin) == '\n') {
+        /* get the current time */
+        time_t timer;
+        time(&timer);
+        struct tm* tm_info = localtime(&timer);
+        char timebuf[26];
+        strftime(timebuf, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+
+        /* print a message */
+        char application_message[256];
+        snprintf(application_message, sizeof(application_message), "The time is %s", timebuf);
+        printf("%s published : \"%s\"", argv[0], application_message);
+
+        /* publish the time */
+        mqtt_publish(&client, topic, application_message, strlen(application_message) + 1, MQTT_PUBLISH_QOS_2);
+
+        /* check for errors */
+        if (client.error != MQTT_OK) {
+            fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+            exit_example(EXIT_FAILURE, sockfd, &client_daemon);
+        }
+    }   
+
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, sockfd, &client_daemon);
+}
+
+void exit_example(int status, BIO* sockfd, pthread_t *client_daemon)
+{
+    if (sockfd != NULL) BIO_free_all(sockfd);
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    exit(status);
+}
+
+
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* not used in this example */
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/mbedtls_publisher.c b/deps/MQTT-C/examples/mbedtls_publisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..00443f8d80e8e03279c24de2398734f392ce21c5
--- /dev/null
+++ b/deps/MQTT-C/examples/mbedtls_publisher.c
@@ -0,0 +1,163 @@
+
+/**
+ * @file
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/mbedtls_sockets.h"
+
+
+/**
+ * @brief The function that would be called whenever a PUBLISH is received.
+ * 
+ * @note This function is not used in this example. 
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, mqtt_pal_socket_handle sockfd, pthread_t *client_daemon);
+
+/**
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+    const char* ca_file;
+
+    struct mbedtls_context ctx;
+    mqtt_pal_socket_handle sockfd;
+
+    if (argc > 1) {
+        ca_file = argv[1];
+    } else {
+        printf("error: path to the CA certificate to use\n");
+        exit(1);
+    }
+
+    /* get address (argv[2] if present) */
+    if (argc > 2) {
+        addr = argv[2];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[3] if present) */
+    if (argc > 3) {
+        port = argv[3];
+    } else {
+        port = "8883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 4) {
+        topic = argv[4];
+    } else {
+        topic = "datetime";
+    }
+
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    open_nb_socket(&ctx, addr, port, ca_file);
+    sockfd = &ctx.ssl_ctx;
+
+    if (sockfd == NULL) {
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* setup a client */
+    struct mqtt_client client;
+    uint8_t sendbuf[2048]; /* sendbuf should be large enough to hold multiple whole mqtt messages */
+    uint8_t recvbuf[1024]; /* recvbuf should be large enough any whole mqtt message expected to be received */
+    mqtt_init(&client, sockfd, sendbuf, sizeof(sendbuf), recvbuf, sizeof(recvbuf), publish_callback);
+    mqtt_connect(&client, "publishing_client", NULL, NULL, 0, NULL, NULL, 0, 400);
+
+    /* check that we don't have any errors */
+    if (client.error != MQTT_OK) {
+        fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+
+    }
+
+    /* start publishing the time */
+    printf("%s is ready to begin publishing the time.\n", argv[0]);
+    printf("Press ENTER to publish the current time.\n");
+    printf("Press CTRL-D (or any other key) to exit.\n\n");
+    while(fgetc(stdin) == '\n') {
+        /* get the current time */
+        time_t timer;
+        time(&timer);
+        struct tm* tm_info = localtime(&timer);
+        char timebuf[26];
+        strftime(timebuf, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+
+        /* print a message */
+        char application_message[256];
+        snprintf(application_message, sizeof(application_message), "The time is %s", timebuf);
+        printf("%s published : \"%s\"", argv[0], application_message);
+
+        /* publish the time */
+        mqtt_publish(&client, topic, application_message, strlen(application_message) + 1, MQTT_PUBLISH_QOS_2);
+
+        /* check for errors */
+        if (client.error != MQTT_OK) {
+            fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+            exit_example(EXIT_FAILURE, sockfd, &client_daemon);
+        }
+    }   
+
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, sockfd, &client_daemon);
+}
+
+void exit_example(int status, mqtt_pal_socket_handle sockfd, pthread_t *client_daemon)
+{
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    mbedtls_ssl_free(sockfd);
+    /* XXX free the rest of contexts */
+    exit(status);
+}
+
+
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* not used in this example */
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
diff --git a/deps/MQTT-C/examples/openssl_publisher.c b/deps/MQTT-C/examples/openssl_publisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..a09fbbe8b136b7717801ab0bfc4e13cf76c112ba
--- /dev/null
+++ b/deps/MQTT-C/examples/openssl_publisher.c
@@ -0,0 +1,167 @@
+
+/**
+ * @file
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/openssl_sockets.h"
+
+
+/**
+ * @brief The function that would be called whenever a PUBLISH is received.
+ * 
+ * @note This function is not used in this example. 
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, BIO* sockfd, pthread_t *client_daemon);
+
+/**
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+    const char* ca_file;
+
+    /* Load OpenSSL */
+    SSL_load_error_strings();
+    ERR_load_BIO_strings();
+    OpenSSL_add_all_algorithms();
+    SSL_library_init();
+
+    SSL_CTX* ssl_ctx;
+    BIO* sockfd;
+
+    if (argc > 1) {
+        ca_file = argv[1];
+    } else {
+        printf("error: path to the CA certificate to use\n");
+        exit(1);
+    }
+
+    /* get address (argv[2] if present) */
+    if (argc > 2) {
+        addr = argv[2];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[3] if present) */
+    if (argc > 3) {
+        port = argv[3];
+    } else {
+        port = "8883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 4) {
+        topic = argv[4];
+    } else {
+        topic = "datetime";
+    }
+
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    open_nb_socket(&sockfd, &ssl_ctx, addr, port, ca_file, NULL);
+
+    if (sockfd == NULL) {
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* setup a client */
+    struct mqtt_client client;
+    uint8_t sendbuf[2048]; /* sendbuf should be large enough to hold multiple whole mqtt messages */
+    uint8_t recvbuf[1024]; /* recvbuf should be large enough any whole mqtt message expected to be received */
+    mqtt_init(&client, sockfd, sendbuf, sizeof(sendbuf), recvbuf, sizeof(recvbuf), publish_callback);
+    mqtt_connect(&client, "publishing_client", NULL, NULL, 0, NULL, NULL, 0, 400);
+
+    /* check that we don't have any errors */
+    if (client.error != MQTT_OK) {
+        fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+
+    }
+
+    /* start publishing the time */
+    printf("%s is ready to begin publishing the time.\n", argv[0]);
+    printf("Press ENTER to publish the current time.\n");
+    printf("Press CTRL-D (or any other key) to exit.\n\n");
+    while(fgetc(stdin) == '\n') {
+        /* get the current time */
+        time_t timer;
+        time(&timer);
+        struct tm* tm_info = localtime(&timer);
+        char timebuf[26];
+        strftime(timebuf, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+
+        /* print a message */
+        char application_message[256];
+        snprintf(application_message, sizeof(application_message), "The time is %s", timebuf);
+        printf("%s published : \"%s\"", argv[0], application_message);
+
+        /* publish the time */
+        mqtt_publish(&client, topic, application_message, strlen(application_message) + 1, MQTT_PUBLISH_QOS_2);
+
+        /* check for errors */
+        if (client.error != MQTT_OK) {
+            fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+            exit_example(EXIT_FAILURE, sockfd, &client_daemon);
+        }
+    }   
+
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, sockfd, &client_daemon);
+}
+
+void exit_example(int status, BIO* sockfd, pthread_t *client_daemon)
+{
+    if (sockfd != NULL) BIO_free_all(sockfd);
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    exit(status);
+}
+
+
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* not used in this example */
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/reconnect_subscriber.c b/deps/MQTT-C/examples/reconnect_subscriber.c
new file mode 100644
index 0000000000000000000000000000000000000000..05c00584bdd5a6441eada5bbde8a26b549d216f9
--- /dev/null
+++ b/deps/MQTT-C/examples/reconnect_subscriber.c
@@ -0,0 +1,199 @@
+
+/**
+ * @file
+ * A simple subscriber program that performs automatic reconnections.
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/posix_sockets.h"
+
+/**
+ * @brief A structure that I will use to keep track of some data needed 
+ *        to setup the connection to the broker.
+ * 
+ * An instance of this struct will be created in my \c main(). Then, whenever
+ * \ref reconnect_client is called, this instance will be passed. 
+ */
+struct reconnect_state_t {
+    const char* hostname;
+    const char* port;
+    const char* topic;
+    uint8_t* sendbuf;
+    size_t sendbufsz;
+    uint8_t* recvbuf;
+    size_t recvbufsz;
+};
+
+
+/**
+ * @brief My reconnect callback. It will reestablish the connection whenever 
+ *        an error occurs. 
+ */
+void reconnect_client(struct mqtt_client* client, void **reconnect_state_vptr);
+
+/**
+ * @brief The function will be called whenever a PUBLISH message is received.
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, int sockfd, pthread_t *client_daemon);
+
+
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+
+    /* get address (argv[1] if present) */
+    if (argc > 1) {
+        addr = argv[1];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[2] if present) */
+    if (argc > 2) {
+        port = argv[2];
+    } else {
+        port = "1883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 3) {
+        topic = argv[3];
+    } else {
+        topic = "datetime";
+    }
+
+    /* build the reconnect_state structure which will be passed to reconnect */
+    struct reconnect_state_t reconnect_state;
+    reconnect_state.hostname = addr;
+    reconnect_state.port = port;
+    reconnect_state.topic = topic;
+    uint8_t sendbuf[2048];
+    uint8_t recvbuf[1024];
+    reconnect_state.sendbuf = sendbuf;
+    reconnect_state.sendbufsz = sizeof(sendbuf);
+    reconnect_state.recvbuf = recvbuf;
+    reconnect_state.recvbufsz = sizeof(recvbuf);
+
+    /* setup a client */
+    struct mqtt_client client;
+
+    mqtt_init_reconnect(&client, 
+                        reconnect_client, &reconnect_state, 
+                        publish_callback
+    );
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, -1, NULL);
+
+    }
+
+    /* start publishing the time */
+    printf("%s listening for '%s' messages.\n", argv[0], topic);
+    printf("Press ENTER to inject an error.\n");
+    printf("Press CTRL-D to exit.\n\n");
+    
+    /* block */
+    while(fgetc(stdin) != EOF) {
+        printf("Injecting error: \"MQTT_ERROR_SOCKET_ERROR\"\n");
+        client.error = MQTT_ERROR_SOCKET_ERROR;
+    } 
+    
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, client.socketfd, &client_daemon);
+}
+
+void reconnect_client(struct mqtt_client* client, void **reconnect_state_vptr)
+{
+    struct reconnect_state_t *reconnect_state = *((struct reconnect_state_t**) reconnect_state_vptr);
+
+    /* Close the clients socket if this isn't the initial reconnect call */
+    if (client->error != MQTT_ERROR_INITIAL_RECONNECT) {
+        close(client->socketfd);
+    }
+
+    /* Perform error handling here. */
+    if (client->error != MQTT_ERROR_INITIAL_RECONNECT) {
+        printf("reconnect_client: called while client was in error state \"%s\"\n", 
+               mqtt_error_str(client->error)
+        );
+    }
+
+    /* Open a new socket. */
+    int sockfd = open_nb_socket(reconnect_state->hostname, reconnect_state->port);
+    if (sockfd == -1) {
+        perror("Failed to open socket: ");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* Reinitialize the client. */
+    mqtt_reinit(client, sockfd, 
+                reconnect_state->sendbuf, reconnect_state->sendbufsz,
+                reconnect_state->recvbuf, reconnect_state->recvbufsz
+    );
+
+    /* Create an anonymous session */
+    const char* client_id = NULL;
+    /* Ensure we have a clean session */
+    uint8_t connect_flags = MQTT_CONNECT_CLEAN_SESSION;
+    /* Send connection request to the broker. */
+    mqtt_connect(client, client_id, NULL, NULL, 0, NULL, NULL, connect_flags, 400);
+
+    /* Subscribe to the topic. */
+    mqtt_subscribe(client, reconnect_state->topic, 0);
+}
+
+void exit_example(int status, int sockfd, pthread_t *client_daemon)
+{
+    if (sockfd != -1) close(sockfd);
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    exit(status);
+}
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* note that published->topic_name is NOT null-terminated (here we'll change it to a c-string) */
+    char* topic_name = (char*) malloc(published->topic_name_size + 1);
+    memcpy(topic_name, published->topic_name, published->topic_name_size);
+    topic_name[published->topic_name_size] = '\0';
+
+    printf("Received publish('%s'): %s\n", topic_name, (const char*) published->application_message);
+
+    free(topic_name);
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/simple_publisher.c b/deps/MQTT-C/examples/simple_publisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..84f758d09949f406cc0195c77b5e87aecf408607
--- /dev/null
+++ b/deps/MQTT-C/examples/simple_publisher.c
@@ -0,0 +1,157 @@
+
+/**
+ * @file
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/posix_sockets.h"
+
+
+/**
+ * @brief The function that would be called whenever a PUBLISH is received.
+ * 
+ * @note This function is not used in this example. 
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, int sockfd, pthread_t *client_daemon);
+
+/**
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ */
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+
+    /* get address (argv[1] if present) */
+    if (argc > 1) {
+        addr = argv[1];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[2] if present) */
+    if (argc > 2) {
+        port = argv[2];
+    } else {
+        port = "1883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 3) {
+        topic = argv[3];
+    } else {
+        topic = "datetime";
+    }
+
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    int sockfd = open_nb_socket(addr, port);
+
+    if (sockfd == -1) {
+        perror("Failed to open socket: ");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* setup a client */
+    struct mqtt_client client;
+    uint8_t sendbuf[2048]; /* sendbuf should be large enough to hold multiple whole mqtt messages */
+    uint8_t recvbuf[1024]; /* recvbuf should be large enough any whole mqtt message expected to be received */
+    mqtt_init(&client, sockfd, sendbuf, sizeof(sendbuf), recvbuf, sizeof(recvbuf), publish_callback);
+    /* Create an anonymous session */
+    const char* client_id = NULL;
+    /* Ensure we have a clean session */
+    uint8_t connect_flags = MQTT_CONNECT_CLEAN_SESSION;
+    /* Send connection request to the broker. */
+    mqtt_connect(&client, client_id, NULL, NULL, 0, NULL, NULL, connect_flags, 400);
+
+    /* check that we don't have any errors */
+    if (client.error != MQTT_OK) {
+        fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+
+    }
+
+    /* start publishing the time */
+    printf("%s is ready to begin publishing the time.\n", argv[0]);
+    printf("Press ENTER to publish the current time.\n");
+    printf("Press CTRL-D (or any other key) to exit.\n\n");
+    while(fgetc(stdin) == '\n') {
+        /* get the current time */
+        time_t timer;
+        time(&timer);
+        struct tm* tm_info = localtime(&timer);
+        char timebuf[26];
+        strftime(timebuf, 26, "%Y-%m-%d %H:%M:%S", tm_info);
+
+        /* print a message */
+        char application_message[256];
+        snprintf(application_message, sizeof(application_message), "The time is %s", timebuf);
+        printf("%s published : \"%s\"", argv[0], application_message);
+
+        /* publish the time */
+        mqtt_publish(&client, topic, application_message, strlen(application_message) + 1, MQTT_PUBLISH_QOS_0);
+
+        /* check for errors */
+        if (client.error != MQTT_OK) {
+            fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+            exit_example(EXIT_FAILURE, sockfd, &client_daemon);
+        }
+    }   
+
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, sockfd, &client_daemon);
+}
+
+void exit_example(int status, int sockfd, pthread_t *client_daemon)
+{
+    if (sockfd != -1) close(sockfd);
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    exit(status);
+}
+
+
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* not used in this example */
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/simple_subscriber.c b/deps/MQTT-C/examples/simple_subscriber.c
new file mode 100644
index 0000000000000000000000000000000000000000..efb7070a7e1c16a36dde0a397ca340a6c0f7b80e
--- /dev/null
+++ b/deps/MQTT-C/examples/simple_subscriber.c
@@ -0,0 +1,142 @@
+
+/**
+ * @file
+ * A simple program that subscribes to a topic.
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <mqtt.h>
+#include "templates/posix_sockets.h"
+
+
+/**
+ * @brief The function will be called whenever a PUBLISH message is received.
+ */
+void publish_callback(void** unused, struct mqtt_response_publish *published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to 
+ *        handle ingress/egress traffic to the broker.
+ * 
+ * @note All this function needs to do is call \ref __mqtt_recv and 
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that 
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* client_refresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit. 
+ */
+void exit_example(int status, int sockfd, pthread_t *client_daemon);
+
+int main(int argc, const char *argv[]) 
+{
+    const char* addr;
+    const char* port;
+    const char* topic;
+
+    /* get address (argv[1] if present) */
+    if (argc > 1) {
+        addr = argv[1];
+    } else {
+        addr = "test.mosquitto.org";
+    }
+
+    /* get port number (argv[2] if present) */
+    if (argc > 2) {
+        port = argv[2];
+    } else {
+        port = "1883";
+    }
+
+    /* get the topic name to publish */
+    if (argc > 3) {
+        topic = argv[3];
+    } else {
+        topic = "datetime";
+    }
+
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    int sockfd = open_nb_socket(addr, port);
+
+    if (sockfd == -1) {
+        perror("Failed to open socket: ");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* setup a client */
+    struct mqtt_client client;
+    uint8_t sendbuf[2048]; /* sendbuf should be large enough to hold multiple whole mqtt messages */
+    uint8_t recvbuf[1024]; /* recvbuf should be large enough any whole mqtt message expected to be received */
+    mqtt_init(&client, sockfd, sendbuf, sizeof(sendbuf), recvbuf, sizeof(recvbuf), publish_callback);
+    /* Create an anonymous session */
+    const char* client_id = NULL;
+    /* Ensure we have a clean session */
+    uint8_t connect_flags = MQTT_CONNECT_CLEAN_SESSION;
+    /* Send connection request to the broker. */
+    mqtt_connect(&client, client_id, NULL, NULL, 0, NULL, NULL, connect_flags, 400);
+
+    /* check that we don't have any errors */
+    if (client.error != MQTT_OK) {
+        fprintf(stderr, "error: %s\n", mqtt_error_str(client.error));
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+    }
+
+    /* start a thread to refresh the client (handle egress and ingree client traffic) */
+    pthread_t client_daemon;
+    if(pthread_create(&client_daemon, NULL, client_refresher, &client)) {
+        fprintf(stderr, "Failed to start client daemon.\n");
+        exit_example(EXIT_FAILURE, sockfd, NULL);
+
+    }
+
+    /* subscribe */
+    mqtt_subscribe(&client, topic, 0);
+
+    /* start publishing the time */
+    printf("%s listening for '%s' messages.\n", argv[0], topic);
+    printf("Press CTRL-D to exit.\n\n");
+    
+    /* block */
+    while(fgetc(stdin) != EOF); 
+    
+    /* disconnect */
+    printf("\n%s disconnecting from %s\n", argv[0], addr);
+    sleep(1);
+
+    /* exit */ 
+    exit_example(EXIT_SUCCESS, sockfd, &client_daemon);
+}
+
+void exit_example(int status, int sockfd, pthread_t *client_daemon)
+{
+    if (sockfd != -1) close(sockfd);
+    if (client_daemon != NULL) pthread_cancel(*client_daemon);
+    exit(status);
+}
+
+
+
+void publish_callback(void** unused, struct mqtt_response_publish *published) 
+{
+    /* note that published->topic_name is NOT null-terminated (here we'll change it to a c-string) */
+    char* topic_name = (char*) malloc(published->topic_name_size + 1);
+    memcpy(topic_name, published->topic_name, published->topic_name_size);
+    topic_name[published->topic_name_size] = '\0';
+
+    printf("Received publish('%s'): %s\n", topic_name, (const char*) published->application_message);
+
+    free(topic_name);
+}
+
+void* client_refresher(void* client)
+{
+    while(1) 
+    {
+        mqtt_sync((struct mqtt_client*) client);
+        usleep(100000U);
+    }
+    return NULL;
+}
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/templates/bio_sockets.h b/deps/MQTT-C/examples/templates/bio_sockets.h
new file mode 100644
index 0000000000000000000000000000000000000000..78acd606edaaf6b260950136f7b18b3b240fb2d7
--- /dev/null
+++ b/deps/MQTT-C/examples/templates/bio_sockets.h
@@ -0,0 +1,28 @@
+#ifndef __BIO_SOCKET_TEMPLATE_H__
+#define __BIO_SOCKET_TEMPLATE_H__
+
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+/*
+    A template for opening a non-blocking BIO socket.
+*/
+BIO* open_nb_socket(const char* addr, const char* port) {
+    BIO* bio = BIO_new_connect(addr);
+    BIO_set_nbio(bio, 1);
+    BIO_set_conn_port(bio, port);
+
+    /* timeout after 10 seconds */
+    int start_time = time(NULL);
+    while(BIO_do_connect(bio) == 0 && (int)time(NULL) - start_time < 10);
+
+    if (BIO_do_connect(bio) <= 0) {
+        fprintf(stderr, "Failed to open socket: BIO_do_connect returned <= 0\n");
+        return NULL;
+    }
+
+    return bio; 
+}
+
+#endif
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/templates/mbedtls_sockets.h b/deps/MQTT-C/examples/templates/mbedtls_sockets.h
new file mode 100644
index 0000000000000000000000000000000000000000..f14ffef8758ce101e9925eb972633ca08af5762b
--- /dev/null
+++ b/deps/MQTT-C/examples/templates/mbedtls_sockets.h
@@ -0,0 +1,145 @@
+#ifndef __MBEDTLS_SOCKET_TEMPLATE_H__
+#define __MBEDTLS_SOCKET_TEMPLATE_H__
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <mbedtls/error.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/net_sockets.h>
+#include <mbedtls/ssl.h>
+
+#if !defined(MBEDTLS_NET_POLL_READ)
+/* compat for older mbedtls */
+#define	MBEDTLS_NET_POLL_READ	1
+#define	MBEDTLS_NET_POLL_WRITE	1
+
+int
+mbedtls_net_poll(mbedtls_net_context * ctx, uint32_t rw, uint32_t timeout)
+{
+	/* XXX this is not ideal but good enough for an example */
+	usleep(300);
+	return 1;
+}
+#endif
+
+struct mbedtls_context {
+    mbedtls_net_context net_ctx;
+    mbedtls_ssl_context ssl_ctx;
+    mbedtls_ssl_config ssl_conf;
+    mbedtls_x509_crt ca_crt;
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+};
+
+void failed(const char *fn, int rv) {
+    char buf[100];
+    mbedtls_strerror(rv, buf, sizeof(buf));
+    printf("%s failed with %x (%s)\n", fn, -rv, buf);
+    exit(1);
+}
+
+void cert_verify_failed(uint32_t rv) {
+    char buf[512];
+    mbedtls_x509_crt_verify_info(buf, sizeof(buf), "\t", rv);
+    printf("Certificate verification failed (%0" PRIx32 ")\n%s\n", rv, buf);
+    exit(1);
+}
+
+/*
+    A template for opening a non-blocking mbed TLS connection.
+*/
+void open_nb_socket(struct mbedtls_context *ctx,
+                    const char *hostname,
+                    const char *port,
+                    const char *ca_file) {
+    const unsigned char *additional = (const unsigned char *)"MQTT-C";
+    size_t additional_len = 6;
+    int rv;
+
+    mbedtls_net_context *net_ctx = &ctx->net_ctx;
+    mbedtls_ssl_context *ssl_ctx = &ctx->ssl_ctx;
+    mbedtls_ssl_config *ssl_conf = &ctx->ssl_conf;
+    mbedtls_x509_crt *ca_crt = &ctx->ca_crt;
+    mbedtls_entropy_context *entropy = &ctx->entropy;
+    mbedtls_ctr_drbg_context *ctr_drbg = &ctx->ctr_drbg;
+
+    mbedtls_entropy_init(entropy);
+    mbedtls_ctr_drbg_init(ctr_drbg);
+    rv = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy,
+                               additional, additional_len);
+    if (rv != 0) {
+        failed("mbedtls_ctr_drbg_seed", rv);
+    }
+
+    mbedtls_x509_crt_init(ca_crt);
+    rv = mbedtls_x509_crt_parse_file(ca_crt, ca_file);
+    if (rv != 0) {
+        failed("mbedtls_x509_crt_parse_file", rv);
+    }
+
+    mbedtls_ssl_config_init(ssl_conf);
+    rv = mbedtls_ssl_config_defaults(ssl_conf,  MBEDTLS_SSL_IS_CLIENT,
+                                     MBEDTLS_SSL_TRANSPORT_STREAM,
+                                     MBEDTLS_SSL_PRESET_DEFAULT);
+    if (rv != 0) {
+        failed("mbedtls_ssl_config_defaults", rv);
+    }
+    mbedtls_ssl_conf_ca_chain(ssl_conf, ca_crt, NULL);
+    mbedtls_ssl_conf_authmode(ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
+    mbedtls_ssl_conf_rng(ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
+
+    mbedtls_net_init(net_ctx);
+    rv = mbedtls_net_connect(net_ctx, hostname, port, MBEDTLS_NET_PROTO_TCP);
+    if (rv != 0) {
+        failed("mbedtls_net_connect", rv);
+    }
+    rv = mbedtls_net_set_nonblock(net_ctx);
+    if (rv != 0) {
+        failed("mbedtls_net_set_nonblock", rv);
+    }
+
+    mbedtls_ssl_init(ssl_ctx);
+    rv = mbedtls_ssl_setup(ssl_ctx, ssl_conf);
+    if (rv != 0) {
+        failed("mbedtls_ssl_setup", rv);
+    }
+    rv = mbedtls_ssl_set_hostname(ssl_ctx, hostname);
+    if (rv != 0) {
+        failed("mbedtls_ssl_set_hostname", rv);
+    }
+    mbedtls_ssl_set_bio(ssl_ctx, net_ctx,
+                        mbedtls_net_send, mbedtls_net_recv, NULL);
+
+    for (;;) {
+        rv = mbedtls_ssl_handshake(ssl_ctx);
+        uint32_t want = 0;
+        if (rv == MBEDTLS_ERR_SSL_WANT_READ) {
+            want |= MBEDTLS_NET_POLL_READ;
+        } else if (rv == MBEDTLS_ERR_SSL_WANT_WRITE) {
+            want |= MBEDTLS_NET_POLL_WRITE;
+        } else {
+            break;
+        }
+        rv = mbedtls_net_poll(net_ctx, want, -1);
+        if (rv < 0) {
+            failed("mbedtls_net_poll", rv);
+        }
+    }
+    if (rv != 0) {
+        failed("mbedtls_ssl_handshake", rv);
+    }
+    uint32_t result = mbedtls_ssl_get_verify_result(ssl_ctx);
+    if (result != 0) {
+        if (result == (uint32_t)-1) {
+            failed("mbedtls_ssl_get_verify_result", result);
+        } else {
+            cert_verify_failed(result);
+        }
+    }
+}
+
+#endif
diff --git a/deps/MQTT-C/examples/templates/openssl_sockets.h b/deps/MQTT-C/examples/templates/openssl_sockets.h
new file mode 100644
index 0000000000000000000000000000000000000000..c82603612ed5447b2ec30e0014513cb764c7bbba
--- /dev/null
+++ b/deps/MQTT-C/examples/templates/openssl_sockets.h
@@ -0,0 +1,52 @@
+#ifndef __OPENSSL_SOCKET_TEMPLATE_H__
+#define __OPENSSL_SOCKET_TEMPLATE_H__
+
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+/*
+    A template for opening a non-blocking OpenSSL connection.
+*/
+void open_nb_socket(BIO** bio, SSL_CTX** ssl_ctx, const char* addr, const char* port, const char* ca_file, const char* ca_path) {
+    *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+    SSL* ssl;
+
+    /* load certificate */
+    if (!SSL_CTX_load_verify_locations(*ssl_ctx, ca_file, ca_path)) {
+        printf("error: failed to load certificate\n");
+        exit(1);
+    }
+
+    /* open BIO socket */
+    *bio = BIO_new_ssl_connect(*ssl_ctx);
+    BIO_get_ssl(*bio, &ssl);
+    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
+    BIO_set_conn_hostname(*bio, addr);
+    BIO_set_nbio(*bio, 1);
+    BIO_set_conn_port(*bio, port);
+
+    /* wait for connect with 10 second timeout */
+    int start_time = time(NULL);
+    int do_connect_rv = BIO_do_connect(*bio);
+    while(do_connect_rv <= 0 && BIO_should_retry(*bio) && (int)time(NULL) - start_time < 10) {
+        do_connect_rv = BIO_do_connect(*bio);
+    }
+    if (do_connect_rv <= 0) {
+        printf("error: %s\n", ERR_reason_error_string(ERR_get_error()));
+        BIO_free_all(*bio);
+        SSL_CTX_free(*ssl_ctx);
+        *bio = NULL;
+        *ssl_ctx=NULL;
+        return;
+    }
+
+    /* verify certificate */
+    if (SSL_get_verify_result(ssl) != X509_V_OK) {
+        /* Handle the failed verification */
+        printf("error: x509 certificate verification failed\n");
+        exit(1);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/deps/MQTT-C/examples/templates/posix_sockets.h b/deps/MQTT-C/examples/templates/posix_sockets.h
new file mode 100644
index 0000000000000000000000000000000000000000..6f78e97978c5de8a59cfea5cc1441638638c9eee
--- /dev/null
+++ b/deps/MQTT-C/examples/templates/posix_sockets.h
@@ -0,0 +1,59 @@
+#ifndef __POSIX_SOCKET_TEMPLATE_H__
+#define __POSIX_SOCKET_TEMPLATE_H__
+
+#include <stdio.h>
+#include <sys/types.h>
+#if !defined(WIN32)
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+#include <fcntl.h>
+
+/*
+    A template for opening a non-blocking POSIX socket.
+*/
+int open_nb_socket(const char* addr, const char* port) {
+    struct addrinfo hints = {0};
+
+    hints.ai_family = AF_UNSPEC; /* IPv4 or IPv6 */
+    hints.ai_socktype = SOCK_STREAM; /* Must be TCP */
+    int sockfd = -1;
+    int rv;
+    struct addrinfo *p, *servinfo;
+
+    /* get address information */
+    rv = getaddrinfo(addr, port, &hints, &servinfo);
+    if(rv != 0) {
+        fprintf(stderr, "Failed to open socket (getaddrinfo): %s\n", gai_strerror(rv));
+        return -1;
+    }
+
+    /* open the first possible socket */
+    for(p = servinfo; p != NULL; p = p->ai_next) {
+        sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+        if (sockfd == -1) continue;
+
+        /* connect to server */
+        rv = connect(sockfd, servinfo->ai_addr, servinfo->ai_addrlen);
+        if(rv == -1) continue;
+        break;
+    }  
+
+    /* free servinfo */
+    freeaddrinfo(servinfo);
+
+    /* make non-blocking */
+#if !defined(WIN32)
+    if (sockfd != -1) fcntl(sockfd, F_SETFL, fcntl(sockfd, F_GETFL) | O_NONBLOCK);
+#else
+    if (sockfd != INVALID_SOCKET) {
+        int iMode = 1;
+        ioctlsocket(sockfd, FIONBIO, &iMode);
+    }
+#endif
+
+    /* return the new socket fd */
+    return sockfd;
+}
+
+#endif
\ No newline at end of file
diff --git a/deps/MQTT-C/include/mqtt.h b/deps/MQTT-C/include/mqtt.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b2993ff0e5dcc285912247eef0621b3e7f3e144
--- /dev/null
+++ b/deps/MQTT-C/include/mqtt.h
@@ -0,0 +1,1568 @@
+#ifndef __MQTT_H__
+#define __MQTT_H__
+
+/*
+MIT License
+
+Copyright(c) 2018 Liam Bindle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <mqtt_pal.h>
+
+/**
+ * @file
+ * @brief Declares all the MQTT-C functions and datastructures.
+ * 
+ * @note You should <code>\#include <mqtt.h></code>.
+ * 
+ * @example simple_publisher.c
+ * A simple program to that publishes the current time whenever ENTER is pressed. 
+ * 
+ * Usage:
+ * \code{.sh}
+ * ./bin/simple_publisher [address [port [topic]]]
+ * \endcode     
+ * 
+ * Where \c address is the address of the MQTT broker, \c port is the port number the 
+ * MQTT broker is running on, and \c topic is the name of the topic to publish with. Note
+ * that all these arguments are optional and the defaults are \c address = \c "test.mosquitto.org",
+ * \c port = \c "1883", and \c topic = "datetime".
+ * 
+ * @example simple_subscriber.c
+ * A simple program that subscribes to a single topic and prints all updates that are received.
+ * 
+ * Usage:
+ * \code{.sh}
+ * ./bin/simple_subscriber [address [port [topic]]]
+ * \endcode   
+ * 
+ * Where \c address is the address of the MQTT broker, \c port is the port number the 
+ * MQTT broker is running on, and \c topic is the name of the topic subscribe to. Note
+ * that all these arguments are optional and the defaults are \c address = \c "test.mosquitto.org",
+ * \c port = \c "1883", and \c topic = "datetime".  
+ * 
+ * @example reconnect_subscriber.c
+ * Same program as \ref simple_subscriber.c, but using the automatic reconnect functionality. 
+ * 
+ * @example bio_publisher.c
+ * Same program as \ref simple_publisher.c, but uses a unencrypted BIO socket.
+ *
+ * @example openssl_publisher.c
+ * Same program as \ref simple_publisher.c, but over an encrypted connection using OpenSSL.
+ * 
+ * Usage:
+ * \code{.sh}
+ * ./bin/openssl_publisher ca_file [address [port [topic]]]
+ * \endcode   
+ * 
+ * 
+ * @defgroup api API
+ * @brief Documentation of everything you need to know to use the MQTT-C client.
+ * 
+ * This module contains everything you need to know to use MQTT-C in your application.
+ * For usage examples see:
+ *     - @ref simple_publisher.c
+ *     - @ref simple_subscriber.c
+ *     - @ref reconnect_subscriber.c
+ *     - @ref bio_publisher.c
+ *     - @ref openssl_publisher.c
+ * 
+ * @note MQTT-C can be used in both single-threaded and multi-threaded applications. All 
+ *       the functions in \ref api are thread-safe.
+ * 
+ * @defgroup packers Control Packet Serialization
+ * @brief Developer documentation of the functions and datastructures used for serializing MQTT 
+ *        control packets.
+ * 
+ * @defgroup unpackers Control Packet Deserialization
+ * @brief Developer documentation of the functions and datastructures used for deserializing MQTT 
+ *        control packets.
+ * 
+ * @defgroup details Utilities
+ * @brief Developer documentation for the utilities used to implement the MQTT-C client.
+ *
+ * @note To deserialize a packet from a buffer use \ref mqtt_unpack_response (it's the only 
+ *       function you need).
+ */
+
+
+ /**
+  * @brief An enumeration of the MQTT control packet types. 
+  * @ingroup unpackers
+  *
+  * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718021">
+  * MQTT v3.1.1: MQTT Control Packet Types
+  * </a>
+  */
+  enum MQTTControlPacketType {
+    MQTT_CONTROL_CONNECT=1u,
+    MQTT_CONTROL_CONNACK=2u,
+    MQTT_CONTROL_PUBLISH=3u,
+    MQTT_CONTROL_PUBACK=4u,
+    MQTT_CONTROL_PUBREC=5u,
+    MQTT_CONTROL_PUBREL=6u,
+    MQTT_CONTROL_PUBCOMP=7u,
+    MQTT_CONTROL_SUBSCRIBE=8u,
+    MQTT_CONTROL_SUBACK=9u,
+    MQTT_CONTROL_UNSUBSCRIBE=10u,
+    MQTT_CONTROL_UNSUBACK=11u,
+    MQTT_CONTROL_PINGREQ=12u,
+    MQTT_CONTROL_PINGRESP=13u,
+    MQTT_CONTROL_DISCONNECT=14u
+};
+
+/**
+ * @brief The fixed header of an MQTT control packet.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718020">
+ * MQTT v3.1.1: Fixed Header
+ * </a>
+ */
+struct mqtt_fixed_header {
+    /** The type of packet. */
+    enum MQTTControlPacketType control_type;
+
+    /** The packets control flags.*/
+    uint32_t  control_flags: 4;
+
+    /** The remaining size of the packet in bytes (i.e. the size of variable header and payload).*/
+    uint32_t remaining_length;
+};
+
+/**
+ * @brief The protocol identifier for MQTT v3.1.1.
+ * @ingroup packers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718030">
+ * MQTT v3.1.1: CONNECT Variable Header.
+ * </a>  
+ */
+#define MQTT_PROTOCOL_LEVEL 0x04
+
+/** 
+ * @brief A macro used to declare the enum MQTTErrors and associated 
+ *        error messages (the members of the num) at the same time.
+ */
+#define __ALL_MQTT_ERRORS(MQTT_ERROR)                    \
+    MQTT_ERROR(MQTT_ERROR_NULLPTR)                       \
+    MQTT_ERROR(MQTT_ERROR_CONTROL_FORBIDDEN_TYPE)        \
+    MQTT_ERROR(MQTT_ERROR_CONTROL_INVALID_FLAGS)         \
+    MQTT_ERROR(MQTT_ERROR_CONTROL_WRONG_TYPE)            \
+    MQTT_ERROR(MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED)     \
+    MQTT_ERROR(MQTT_ERROR_CONNECT_NULL_WILL_MESSAGE)     \
+    MQTT_ERROR(MQTT_ERROR_CONNECT_FORBIDDEN_WILL_QOS)    \
+    MQTT_ERROR(MQTT_ERROR_CONNACK_FORBIDDEN_FLAGS)       \
+    MQTT_ERROR(MQTT_ERROR_CONNACK_FORBIDDEN_CODE)        \
+    MQTT_ERROR(MQTT_ERROR_PUBLISH_FORBIDDEN_QOS)         \
+    MQTT_ERROR(MQTT_ERROR_SUBSCRIBE_TOO_MANY_TOPICS)     \
+    MQTT_ERROR(MQTT_ERROR_MALFORMED_RESPONSE)            \
+    MQTT_ERROR(MQTT_ERROR_UNSUBSCRIBE_TOO_MANY_TOPICS)   \
+    MQTT_ERROR(MQTT_ERROR_RESPONSE_INVALID_CONTROL_TYPE) \
+    MQTT_ERROR(MQTT_ERROR_CONNECT_NOT_CALLED)          \
+    MQTT_ERROR(MQTT_ERROR_SEND_BUFFER_IS_FULL)           \
+    MQTT_ERROR(MQTT_ERROR_SOCKET_ERROR)                  \
+    MQTT_ERROR(MQTT_ERROR_MALFORMED_REQUEST)             \
+    MQTT_ERROR(MQTT_ERROR_RECV_BUFFER_TOO_SMALL)         \
+    MQTT_ERROR(MQTT_ERROR_ACK_OF_UNKNOWN)                \
+    MQTT_ERROR(MQTT_ERROR_NOT_IMPLEMENTED)               \
+    MQTT_ERROR(MQTT_ERROR_CONNECTION_REFUSED)            \
+    MQTT_ERROR(MQTT_ERROR_SUBSCRIBE_FAILED)              \
+    MQTT_ERROR(MQTT_ERROR_CONNECTION_CLOSED)             \
+    MQTT_ERROR(MQTT_ERROR_INITIAL_RECONNECT)             \
+    MQTT_ERROR(MQTT_ERROR_INVALID_REMAINING_LENGTH)      \
+    MQTT_ERROR(MQTT_ERROR_CLEAN_SESSION_IS_REQUIRED)
+
+/* todo: add more connection refused errors */
+
+/** 
+ * @brief A macro used to generate the enum MQTTErrors from 
+ *        \ref __ALL_MQTT_ERRORS
+ * @see __ALL_MQTT_ERRORS
+*/
+#define GENERATE_ENUM(ENUM) ENUM,
+
+/** 
+ * @brief A macro used to generate the error messages associated with 
+ *        MQTTErrors from \ref __ALL_MQTT_ERRORS
+ * @see __ALL_MQTT_ERRORS
+*/
+#define GENERATE_STRING(STRING) #STRING,
+
+
+/** 
+ * @brief An enumeration of error codes. Error messages can be retrieved by calling \ref mqtt_error_str.
+ * @ingroup api
+ * 
+ * @see mqtt_error_str
+ */
+enum MQTTErrors {
+    MQTT_ERROR_UNKNOWN=INT_MIN,
+    __ALL_MQTT_ERRORS(GENERATE_ENUM)
+    MQTT_OK = 1
+};
+
+/** 
+ * @brief Returns an error message for error code, \p error.
+ * @ingroup api
+ * 
+ * @param[in] error the error code.
+ * 
+ * @returns The associated error message.
+ */
+const char* mqtt_error_str(enum MQTTErrors error);
+
+/**
+ * @brief Pack a MQTT 16 bit integer, given a native 16 bit integer .
+ * 
+ * @param[out] buf the buffer that the MQTT integer will be written to.
+ * @param[in] integer the native integer to be written to \p buf.
+ * 
+ * @warning This function provides no error checking.
+ * 
+ * @returns 2
+*/
+ssize_t __mqtt_pack_uint16(uint8_t *buf, uint16_t integer);
+
+/**
+ * @brief Unpack a MQTT 16 bit integer to a native 16 bit integer.
+ * 
+ * @param[in] buf the buffer that the MQTT integer will be read from.
+ * 
+ * @warning This function provides no error checking and does not modify \p buf.
+ * 
+ * @returns The native integer
+*/
+uint16_t __mqtt_unpack_uint16(const uint8_t *buf);
+
+/**
+ * @brief Pack a MQTT string, given a c-string \p str.
+ * 
+ * @param[out] buf the buffer that the MQTT string will be written to.
+ * @param[in] str the c-string to be written to \p buf.
+ * 
+ * @warning This function provides no error checking.
+ * 
+ * @returns strlen(str) + 2
+*/
+ssize_t __mqtt_pack_str(uint8_t *buf, const char* str);
+
+/** @brief A macro to get the MQTT string length from a c-string. */
+#define __mqtt_packed_cstrlen(x) (2 + strlen(x))
+
+/* RESPONSES */
+
+/**
+ * @brief An enumeration of the return codes returned in a CONNACK packet.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Table_3.1_-">
+ * MQTT v3.1.1: CONNACK return codes.
+ * </a> 
+ */
+enum MQTTConnackReturnCode {
+    MQTT_CONNACK_ACCEPTED = 0u,
+    MQTT_CONNACK_REFUSED_PROTOCOL_VERSION = 1u,
+    MQTT_CONNACK_REFUSED_IDENTIFIER_REJECTED = 2u,
+    MQTT_CONNACK_REFUSED_SERVER_UNAVAILABLE = 3u,
+    MQTT_CONNACK_REFUSED_BAD_USER_NAME_OR_PASSWORD = 4u,
+    MQTT_CONNACK_REFUSED_NOT_AUTHORIZED = 5u
+};
+
+/**
+ * @brief A connection response datastructure.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718033">
+ * MQTT v3.1.1: CONNACK - Acknowledgement connection response.
+ * </a>
+ */
+struct mqtt_response_connack {
+    /** 
+     * @brief Allows client and broker to check if they have a consistent view about whether there is
+     * already a stored session state.
+    */
+    uint8_t session_present_flag;
+
+    /** 
+     * @brief The return code of the connection request. 
+     * 
+     * @see MQTTConnackReturnCode
+     */
+    enum MQTTConnackReturnCode return_code;
+};
+
+ /**
+  * @brief A publish packet received from the broker.
+  * @ingroup unpackers
+  * 
+  * A publish packet is received from the broker when a client publishes to a topic that the 
+  * \em {local client} is subscribed to.
+  *
+  * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037"> 
+  * MQTT v3.1.1: PUBLISH - Publish Message.
+  * </a> 
+  */
+struct mqtt_response_publish {
+    /** 
+     * @brief The DUP flag. DUP flag is 0 if its the first attempt to send this publish packet. A DUP flag
+     * of 1 means that this might be a re-delivery of the packet.
+     */
+    uint8_t dup_flag;
+
+    /** 
+     * @brief The quality of service level.
+     * 
+     * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Table_3.11_-">
+     * MQTT v3.1.1: QoS Definitions
+     * </a>
+     */
+    uint8_t qos_level;
+
+    /** @brief The retain flag of this publish message. */
+    uint8_t retain_flag;
+
+    /** @brief Size of the topic name (number of characters). */
+    uint16_t topic_name_size;
+
+    /** 
+     * @brief The topic name. 
+     * @note topic_name is not null terminated. Therefore topic_name_size must be used to get the 
+     *       string length.
+     */
+    const void* topic_name;
+
+    /** @brief The publish message's packet ID. */
+    uint16_t packet_id;
+
+    /** @brief The publish message's application message.*/
+    const void* application_message;
+
+    /** @brief The size of the application message in bytes. */
+    size_t application_message_size;
+};
+
+/**
+ * @brief A publish acknowledgement for messages that were published with QoS level 1.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718043">
+ * MQTT v3.1.1: PUBACK - Publish Acknowledgement.
+ * </a> 
+ *
+ */
+struct mqtt_response_puback {
+    /** @brief The published messages packet ID. */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief The response packet to a PUBLISH packet with QoS level 2.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718048">
+ * MQTT v3.1.1: PUBREC - Publish Received.
+ * </a> 
+ *
+ */
+struct mqtt_response_pubrec {
+    /** @brief The published messages packet ID. */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief The response to a PUBREC packet.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718053">
+ * MQTT v3.1.1: PUBREL - Publish Release.
+ * </a> 
+ *
+ */
+struct mqtt_response_pubrel {
+    /** @brief The published messages packet ID. */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief The response to a PUBREL packet.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718058">
+ * MQTT v3.1.1: PUBCOMP - Publish Complete.
+ * </a> 
+ *
+ */
+struct mqtt_response_pubcomp {
+    /** T@brief he published messages packet ID. */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief An enumeration of subscription acknowledgement return codes.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Figure_3.26_-">
+ * MQTT v3.1.1: SUBACK Return Codes.
+ * </a> 
+ */
+enum MQTTSubackReturnCodes {
+    MQTT_SUBACK_SUCCESS_MAX_QOS_0 = 0u,
+    MQTT_SUBACK_SUCCESS_MAX_QOS_1 = 1u,
+    MQTT_SUBACK_SUCCESS_MAX_QOS_2 = 2u,
+    MQTT_SUBACK_FAILURE           = 128u
+};
+
+/**
+ * @brief The response to a subscription request.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718068">
+ * MQTT v3.1.1: SUBACK - Subscription Acknowledgement.
+ * </a> 
+ */
+struct mqtt_response_suback {
+    /** @brief The published messages packet ID. */
+    uint16_t packet_id;
+
+    /** 
+     * Array of return codes corresponding to the requested subscribe topics.
+     * 
+     * @see MQTTSubackReturnCodes
+     */
+    const uint8_t *return_codes;
+
+    /** The number of return codes. */
+    size_t num_return_codes;
+};
+
+/**
+ * @brief The brokers response to a UNSUBSCRIBE request.
+ * @ingroup unpackers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718077">
+ * MQTT v3.1.1: UNSUBACK - Unsubscribe Acknowledgement.
+ * </a> 
+ */
+struct mqtt_response_unsuback {
+    /** @brief The published messages packet ID. */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief The response to a ping request.
+ * @ingroup unpackers
+ * 
+ * @note This response contains no members.
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718086">
+ * MQTT v3.1.1: PINGRESP - Ping Response.
+ * </a> 
+ */
+struct mqtt_response_pingresp {
+  int dummy;
+};
+
+/**
+ * @brief A struct used to deserialize/interpret an incoming packet from the broker.
+ * @ingroup unpackers
+ */
+struct mqtt_response {
+    /** @brief The mqtt_fixed_header of the deserialized packet. */
+    struct mqtt_fixed_header fixed_header;
+
+    /**
+     * @brief A union of the possible responses from the broker.
+     * 
+     * @note The fixed_header contains the control type. This control type corresponds to the
+     *       member of this union that should be accessed. For example if 
+     *       fixed_header#control_type == \c MQTT_CONTROL_PUBLISH then 
+     *       decoded#publish should be accessed.
+     */
+    union {
+        struct mqtt_response_connack  connack;
+        struct mqtt_response_publish  publish;
+        struct mqtt_response_puback   puback;
+        struct mqtt_response_pubrec   pubrec;
+        struct mqtt_response_pubrel   pubrel;
+        struct mqtt_response_pubcomp  pubcomp;
+        struct mqtt_response_suback   suback;
+        struct mqtt_response_unsuback unsuback;
+        struct mqtt_response_pingresp pingresp;
+    } decoded;
+};
+
+/**
+ * @brief Deserialize the contents of \p buf into an mqtt_fixed_header object.
+ * @ingroup unpackers
+ * 
+ * @note This function performs complete error checking and a positive return value
+ *       means the entire mqtt_response can be deserialized from \p buf.
+ * 
+ * @param[out] response the response who's \ref mqtt_response.fixed_header will be initialized.
+ * @param[in] buf the buffer.
+ * @param[in] bufsz the total number of bytes in the buffer.
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_unpack_fixed_header(struct mqtt_response *response, const uint8_t *buf, size_t bufsz);
+
+/**
+ * @brief Deserialize a CONNACK response from \p buf.
+ * @ingroup unpackers
+ * 
+ * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the control packet type
+ *      must be \c MQTT_CONTROL_CONNACK.
+ * 
+ * @param[out] mqtt_response the mqtt_response that will be initialized.
+ * @param[in] buf the buffer that contains the variable header and payload of the packet. The 
+ *                first byte of \p buf should be the first byte of the variable header.
+ * 
+ * @relates mqtt_response_connack 
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_unpack_connack_response (struct mqtt_response *mqtt_response, const uint8_t *buf);
+
+/**
+ * @brief Deserialize a publish response from \p buf.
+ * @ingroup unpackers
+ * 
+ * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
+ *      have a control type of \c MQTT_CONTROL_PUBLISH.
+ * 
+ * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
+ * @param[in] buf the buffer with the incoming data.
+ * 
+ * @relates mqtt_response_publish 
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_unpack_publish_response (struct mqtt_response *mqtt_response, const uint8_t *buf);
+
+/**
+ * @brief Deserialize a PUBACK/PUBREC/PUBREL/PUBCOMP packet from \p buf.
+ * @ingroup unpackers
+ * 
+ * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
+ *      have a control type of \c MQTT_CONTROL_PUBACK, \c MQTT_CONTROL_PUBREC, \c MQTT_CONTROL_PUBREL
+ *      or \c MQTT_CONTROL_PUBCOMP.
+ * 
+ * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
+ * @param[in] buf the buffer with the incoming data.
+ *
+ * @relates mqtt_response_puback mqtt_response_pubrec mqtt_response_pubrel mqtt_response_pubcomp
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_unpack_pubxxx_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
+
+/**
+ * @brief Deserialize a SUBACK packet from \p buf.
+ * @ingroup unpacker
+ *  
+ * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
+ *      have a control type of \c MQTT_CONTROL_SUBACK.
+ * 
+ * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
+ * @param[in] buf the buffer with the incoming data.
+ *
+ * @relates mqtt_response_suback
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_unpack_suback_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
+
+/**
+ * @brief Deserialize an UNSUBACK packet from \p buf.
+ * @ingroup unpacker
+ *  
+ * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
+ *      have a control type of \c MQTT_CONTROL_UNSUBACK.
+ * 
+ * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
+ * @param[in] buf the buffer with the incoming data.
+ *
+ * @relates mqtt_response_unsuback
+ * 
+ * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough 
+ *          bytes to parse the packet, or a negative value if there was a protocol violation.
+ */  
+ssize_t mqtt_unpack_unsuback_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
+
+/**
+ * @brief Deserialize a packet from the broker.
+ * @ingroup unpackers
+ * 
+ * @param[out] response the mqtt_response that will be initialize from \p buf.
+ * @param[in] buf the incoming data buffer.
+ * @param[in] bufsz the number of bytes available in the buffer.
+ * 
+ * @relates mqtt_response
+ * 
+ * @returns The number of bytes consumed on success, zero \p buf does not contain enough bytes
+ *          to deserialize the packet, a negative value if a protocol violation was encountered.  
+ */
+ssize_t mqtt_unpack_response(struct mqtt_response* response, const uint8_t *buf, size_t bufsz);
+
+/* REQUESTS */
+
+ /**
+ * @brief Serialize an mqtt_fixed_header and write it to \p buf.
+ * @ingroup packers
+ * 
+ * @note This function performs complete error checking and a positive return value
+ *       guarantees the entire packet will fit into the given buffer.
+ * 
+ * @param[out] buf the buffer to write to.
+ * @param[in] bufsz the maximum number of bytes that can be put in to \p buf.
+ * @param[in] fixed_header the fixed header that will be serialized.
+ * 
+ * @returns The number of bytes written to \p buf, or 0 if \p buf is too small, or a 
+ *          negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_fixed_header(uint8_t *buf, size_t bufsz, const struct mqtt_fixed_header *fixed_header);
+
+/**
+ * @brief An enumeration of CONNECT packet flags.
+ * @ingroup packers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718030">
+ * MQTT v3.1.1: CONNECT Variable Header.
+ * </a> 
+ */
+enum MQTTConnectFlags {
+    MQTT_CONNECT_RESERVED = 1u,
+    MQTT_CONNECT_CLEAN_SESSION = 2u,
+    MQTT_CONNECT_WILL_FLAG = 4u,
+    MQTT_CONNECT_WILL_QOS_0 = (0u & 0x03) << 3,
+    MQTT_CONNECT_WILL_QOS_1 = (1u & 0x03) << 3,
+    MQTT_CONNECT_WILL_QOS_2 = (2u & 0x03) << 3,
+    MQTT_CONNECT_WILL_RETAIN = 32u,
+    MQTT_CONNECT_PASSWORD = 64u,
+    MQTT_CONNECT_USER_NAME = 128u
+};
+
+/**
+ * @brief Serialize a connection request into a buffer. 
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to pack the connection request packet into.
+ * @param[in] bufsz the number of bytes left in \p buf.
+ * @param[in] client_id the ID that identifies the local client. \p client_id can be NULL or an empty
+ *                      string for Anonymous clients.
+ * @param[in] will_topic the topic under which the local client's will message will be published.
+ *                       Set to \c NULL for no will message. If \p will_topic is not \c NULL a
+ *                       \p will_message must also be provided.
+ * @param[in] will_message the will message to be published upon a unsuccessful disconnection of
+ *                         the local client. Set to \c NULL if \p will_topic is \c NULL. 
+ *                         \p will_message must \em not be \c NULL if \p will_topic is not 
+ *                         \c NULL.
+ * @param[in] will_message_size The size of \p will_message in bytes.
+ * @param[in] user_name the username to be used to connect to the broker with. Set to \c NULL if 
+ *                      no username is required.
+ * @param[in] password the password to be used to connect to the broker with. Set to \c NULL if
+ *                     no password is required.
+ * @param[in] connect_flags additional MQTTConnectFlags to be set. The only flags that need to be
+ *                          set manually are \c MQTT_CONNECT_CLEAN_SESSION,
+ *                          \c MQTT_CONNECT_WILL_QOS_X (for \c X &isin; {0, 1, 2}), and 
+ *                          \c MQTT_CONNECT_WILL_RETAIN. Set to 0 if no additional flags are 
+ *                          required.
+ * @param[in] keep_alive the keep alive time in seconds. It is the responsibility of the clinet 
+ *                       to ensure packets are sent to the server \em {at least} this frequently.
+ * 
+ * @note If there is a \p will_topic and no additional \p connect_flags are given, then by 
+ *       default \p will_message will be published at QoS level 0.
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028">
+ * MQTT v3.1.1: CONNECT - Client Requests a Connection to a Server.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the CONNECT 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz, 
+                                     const char* client_id,
+                                     const char* will_topic,
+                                     const void* will_message,
+                                     size_t will_message_size,
+                                     const char* user_name,
+                                     const char* password,
+                                     uint8_t connect_flags,
+                                     uint16_t keep_alive);
+
+/**
+ * @brief An enumeration of the PUBLISH flags.
+ * @ingroup packers
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037">
+ * MQTT v3.1.1: PUBLISH - Publish Message.
+ * </a>
+ */
+enum MQTTPublishFlags {
+    MQTT_PUBLISH_DUP = 8u,
+    MQTT_PUBLISH_QOS_0 = ((0u << 1) & 0x06),
+    MQTT_PUBLISH_QOS_1 = ((1u << 1) & 0x06),
+    MQTT_PUBLISH_QOS_2 = ((2u << 1) & 0x06),
+    MQTT_PUBLISH_QOS_MASK = ((3u << 1) & 0x06),
+    MQTT_PUBLISH_RETAIN = 0x01
+};
+
+/**
+ * @brief Serialize a PUBLISH request and put it in \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the PUBLISH packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * @param[in] topic_name the topic to publish \p application_message under.
+ * @param[in] packet_id this packets packet ID.
+ * @param[in] application_message the application message to be published.
+ * @param[in] application_message_size the size of \p application_message in bytes.
+ * @param[in] publish_flags The flags to publish \p application_message with. These include
+ *                          the \c MQTT_PUBLISH_DUP flag, \c MQTT_PUBLISH_QOS_X (\c X &isin; 
+ *                          {0, 1, 2}), and \c MQTT_PUBLISH_RETAIN flag.
+ * 
+ * @note The default QoS is level 0.
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037">
+ * MQTT v3.1.1: PUBLISH - Publish Message.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PUBLISH 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_publish_request(uint8_t *buf, size_t bufsz,
+                                  const char* topic_name,
+                                  uint16_t packet_id,
+                                  void* application_message,
+                                  size_t application_message_size,
+                                  uint8_t publish_flags);
+
+/**
+ * @brief Serialize a PUBACK, PUBREC, PUBREL, or PUBCOMP packet and put it in \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the PUBXXX packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * @param[in] control_type the type of packet. Must be one of: \c MQTT_CONTROL_PUBACK, 
+ *                         \c MQTT_CONTROL_PUBREC, \c MQTT_CONTROL_PUBREL, 
+ *                         or \c MQTT_CONTROL_PUBCOMP.
+ * @param[in] packet_id the packet ID of the packet being acknowledged.
+ * 
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718043">
+ * MQTT v3.1.1: PUBACK - Publish Acknowledgement.
+ * </a>
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718048">
+ * MQTT v3.1.1: PUBREC - Publish Received.
+ * </a>
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718053">
+ * MQTT v3.1.1: PUBREL - Publish Released.
+ * </a>
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718058">
+ * MQTT v3.1.1: PUBCOMP - Publish Complete.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PUBXXX 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_pubxxx_request(uint8_t *buf, size_t bufsz, 
+                                 enum MQTTControlPacketType control_type,
+                                 uint16_t packet_id);
+
+/** 
+ * @brief The maximum number topics that can be subscribed to in a single call to 
+ *         mqtt_pack_subscribe_request.
+ * @ingroup packers
+ * 
+ * @see mqtt_pack_subscribe_request
+ */
+#define MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS 8
+
+/** 
+ * @brief Serialize a SUBSCRIBE packet and put it in \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the SUBSCRIBE packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * @param[in] packet_id the packet ID to be used.
+ * @param[in] ... \c NULL terminated list of (\c {const char *topic_name}, \c {int max_qos_level})
+ *                pairs.
+ * 
+ * @note The variadic arguments, \p ..., \em must be followed by a \c NULL. For example:
+ * @code
+ * ssize_t n = mqtt_pack_subscribe_request(buf, bufsz, 1234, "topic_1", 0, "topic_2", 2, NULL);
+ * @endcode
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718063">
+ * MQTT v3.1.1: SUBSCRIBE - Subscribe to Topics.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the SUBSCRIBE 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_subscribe_request(uint8_t *buf, size_t bufsz, 
+                                    unsigned int packet_id, 
+                                    ...); /* null terminated */
+
+/** 
+ * @brief The maximum number topics that can be subscribed to in a single call to 
+ *         mqtt_pack_unsubscribe_request.
+ * @ingroup packers
+ * 
+ * @see mqtt_pack_unsubscribe_request
+ */
+#define MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS 8
+
+/** 
+ * @brief Serialize a UNSUBSCRIBE packet and put it in \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the UNSUBSCRIBE packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * @param[in] packet_id the packet ID to be used.
+ * @param[in] ... \c NULL terminated list of \c {const char *topic_name}'s to unsubscribe from.
+ * 
+ * @note The variadic arguments, \p ..., \em must be followed by a \c NULL. For example:
+ * @code
+ * ssize_t n = mqtt_pack_unsubscribe_request(buf, bufsz, 4321, "topic_1", "topic_2", NULL);
+ * @endcode
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718072">
+ * MQTT v3.1.1: UNSUBSCRIBE - Unsubscribe from Topics.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the UNSUBSCRIBE 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_unsubscribe_request(uint8_t *buf, size_t bufsz, 
+                                      unsigned int packet_id, 
+                                      ...); /* null terminated */
+
+/**
+ * @brief Serialize a PINGREQ and put it into \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the PINGREQ packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718081">
+ * MQTT v3.1.1: PINGREQ - Ping Request.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PINGREQ
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_ping_request(uint8_t *buf, size_t bufsz);
+
+/**
+ * @brief Serialize a DISCONNECT and put it into \p buf.
+ * @ingroup packers
+ * 
+ * @param[out] buf the buffer to put the DISCONNECT packet in.
+ * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
+ * 
+ * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718090">
+ * MQTT v3.1.1: DISCONNECT - Disconnect Notification.
+ * </a>
+ * 
+ * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the DISCONNECT 
+ *          packet, a negative value if there was a protocol violation.
+ */
+ssize_t mqtt_pack_disconnect(uint8_t *buf, size_t bufsz);
+
+
+/**
+ * @brief An enumeration of queued message states. 
+ * @ingroup details
+ */
+enum MQTTQueuedMessageState {
+    MQTT_QUEUED_UNSENT,
+    MQTT_QUEUED_AWAITING_ACK,
+    MQTT_QUEUED_COMPLETE
+};
+
+/**
+ * @brief A message in a mqtt_message_queue.
+ * @ingroup details
+ */
+struct mqtt_queued_message {
+    /** @brief A pointer to the start of the message. */
+    uint8_t *start;
+
+    /** @brief The number of bytes in the message. */
+    size_t size;
+
+
+    /** @brief The state of the message. */
+    enum MQTTQueuedMessageState state;
+
+    /** 
+     * @brief The time at which the message was sent..
+     * 
+     * @note A timeout will only occur if the message is in
+     *       the MQTT_QUEUED_AWAITING_ACK \c state.
+     */
+    mqtt_pal_time_t time_sent;
+
+    /**
+     * @brief The control type of the message.
+     */
+    enum MQTTControlPacketType control_type;
+
+    /** 
+     * @brief The packet id of the message.
+     * 
+     * @note This field is only used if the associate \c control_type has a 
+     *       \c packet_id field.
+     */
+    uint16_t packet_id;
+};
+
+/**
+ * @brief A message queue.
+ * @ingroup details
+ * 
+ * @note This struct is used internally to manage sending messages.
+ * @note The only members the user should use are \c curr and \c curr_sz. 
+ */
+struct mqtt_message_queue {
+    /** 
+     * @brief The start of the message queue's memory block. 
+     * 
+     * @warning This member should \em not be manually changed.
+     */
+    void *mem_start;
+
+    /** @brief The end of the message queue's memory block. */
+    void *mem_end;
+
+    /**
+     * @brief A pointer to the position in the buffer you can pack bytes at.
+     * 
+     * @note Immediately after packing bytes at \c curr you \em must call
+     *       mqtt_mq_register.
+     */
+    uint8_t *curr;
+
+    /**
+     * @brief The number of bytes that can be written to \c curr.
+     * 
+     * @note curr_sz will decrease by more than the number of bytes you write to 
+     *       \c curr. This is because the mqtt_queued_message structs share the 
+     *       same memory (and thus, a mqtt_queued_message must be allocated in 
+     *       the message queue's memory whenever a new message is registered).  
+     */
+    size_t curr_sz;
+    
+    /**
+     * @brief The tail of the array of mqtt_queued_messages's.
+     * 
+     * @note This member should not be used manually.
+     */
+    struct mqtt_queued_message *queue_tail;
+};
+
+/**
+ * @brief Initialize a message queue.
+ * @ingroup details
+ * 
+ * @param[out] mq The message queue to initialize.
+ * @param[in] buf The buffer for this message queue.
+ * @param[in] bufsz The number of bytes in the buffer. 
+ * 
+ * @relates mqtt_message_queue
+ */
+void mqtt_mq_init(struct mqtt_message_queue *mq, void *buf, size_t bufsz);
+
+/**
+ * @brief Clear as many messages from the front of the queue as possible.
+ * @ingroup details
+ * 
+ * @note Calls to this function are the \em only way to remove messages from the queue.
+ * 
+ * @param mq The message queue.
+ * 
+ * @relates mqtt_message_queue
+ */
+void mqtt_mq_clean(struct mqtt_message_queue *mq);
+
+/**
+ * @brief Register a message that was just added to the buffer.
+ * @ingroup details
+ * 
+ * @note This function should be called immediately following a call to a packer function
+ *       that returned a positive value. The positive value (number of bytes packed) should
+ *       be passed to this function.
+ * 
+ * @param mq The message queue.
+ * @param[in] nbytes The number of bytes that were just packed.
+ * 
+ * @note This function will step mqtt_message_queue::curr and update mqtt_message_queue::curr_sz.
+ * @relates mqtt_message_queue
+ * 
+ * @returns The newly added struct mqtt_queued_message.
+ */
+struct mqtt_queued_message* mqtt_mq_register(struct mqtt_message_queue *mq, size_t nbytes);
+
+/**
+ * @brief Find a message in the message queue.
+ * @ingroup details
+ * 
+ * @param mq The message queue.
+ * @param[in] control_type The control type of the message you want to find.
+ * @param[in] packet_id The packet ID of the message you want to find. Set to \c NULL if you 
+ *            don't want to specify a packet ID.
+ * 
+ * @relates mqtt_message_queue
+ * @returns The found message. \c NULL if the message was not found.
+ */
+struct mqtt_queued_message* mqtt_mq_find(struct mqtt_message_queue *mq, enum MQTTControlPacketType control_type, uint16_t *packet_id);
+
+/**
+ * @brief Returns the mqtt_queued_message at \p index.
+ * @ingroup details
+ * 
+ * @param mq_ptr A pointer to the message queue.
+ * @param index The index of the message. 
+ *
+ * @returns The mqtt_queued_message at \p index.
+ */
+#define mqtt_mq_get(mq_ptr, index) (((struct mqtt_queued_message*) ((mq_ptr)->mem_end)) - 1 - index)
+
+/**
+ * @brief Returns the number of messages in the message queue, \p mq_ptr.
+ * @ingroup details
+ */
+#define mqtt_mq_length(mq_ptr) (((struct mqtt_queued_message*) ((mq_ptr)->mem_end)) - (mq_ptr)->queue_tail)
+
+/**
+ * @brief Used internally to recalculate the \c curr_sz.
+ * @ingroup details
+ */
+#define mqtt_mq_currsz(mq_ptr) (mq_ptr->curr >= (uint8_t*) ((mq_ptr)->queue_tail - 1)) ? 0 : ((uint8_t*) ((mq_ptr)->queue_tail - 1)) - (mq_ptr)->curr
+
+/* CLIENT */
+
+/**
+ * @brief An MQTT client. 
+ * @ingroup details
+ * 
+ * @note All members can be manipulated via the related functions.
+ */
+struct mqtt_client {
+    /** @brief The socket connecting to the MQTT broker. */
+    mqtt_pal_socket_handle socketfd;
+
+    /** @brief The LFSR state used to generate packet ID's. */
+    uint16_t pid_lfsr;
+
+    /** @brief The keep-alive time in seconds. */
+    uint16_t keep_alive;
+
+    /** 
+     * @brief A counter counting pings that have been sent to keep the connection alive. 
+     * @see keep_alive
+     */
+    int number_of_keep_alives;
+
+    /**
+     * @brief The current sent offset.
+     *
+     * This is used to allow partial send commands.
+     */
+    size_t send_offset;
+
+    /** 
+     * @brief The timestamp of the last message sent to the buffer.
+     * 
+     * This is used to detect the need for keep-alive pings.
+     * 
+     * @see keep_alive
+    */
+    mqtt_pal_time_t time_of_last_send;
+
+    /** 
+     * @brief The error state of the client. 
+     * 
+     * error should be MQTT_OK for the entirety of the connection.
+     * 
+     * @note The error state will be MQTT_ERROR_CONNECT_NOT_CALLED until
+     *       you call mqtt_connect.
+     */
+    enum MQTTErrors error;
+
+    /** 
+     * @brief The timeout period in seconds.
+     * 
+     * If the broker doesn't return an ACK within response_timeout seconds a timeout
+     * will occur and the message will be retransmitted. 
+     * 
+     * @note The default value is 30 [seconds] but you can change it at any time.
+     */
+    int response_timeout;
+
+    /** @brief A counter counting the number of timeouts that have occurred. */
+    int number_of_timeouts;
+
+    /**
+     * @brief Approximately much time it has typically taken to receive responses from the 
+     *        broker.
+     * 
+     * @note This is tracked using a exponential-averaging.
+     */
+    double typical_response_time;
+
+    /**
+     * @brief The callback that is called whenever a publish is received from the broker.
+     * 
+     * Any topics that you have subscribed to will be returned from the broker as 
+     * mqtt_response_publish messages. All the publishes received from the broker will 
+     * be passed to this function.
+     * 
+     * @note A pointer to publish_response_callback_state is always passed to the callback.
+     *       Use publish_response_callback_state to keep track of any state information you 
+     *       need.
+     */
+    void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish);
+
+    /**
+     * @brief A pointer to any publish_response_callback state information you need.
+     * 
+     * @note A pointer to this pointer will always be publish_response_callback upon 
+     *       receiving a publish message from the broker.
+     */
+    void* publish_response_callback_state;
+
+    /**
+     * @brief A user-specified callback, triggered on each \ref mqtt_sync, allowing
+     *        the user to perform state inspections (and custom socket error detection)
+     *        on the client.
+     * 
+     * This callback is triggered on each call to \ref mqtt_sync. If it returns MQTT_OK
+     * then \ref mqtt_sync will continue normally (performing reads and writes). If it
+     * returns an error then \ref mqtt_sync will not call reads and writes.
+     * 
+     * This callback can be used to perform custom error detection, namely platform
+     * specific socket error detection, and force the client into an error state.
+     * 
+     * This member is always initialized to NULL but it can be manually set at any 
+     * time.
+     */
+    enum MQTTErrors (*inspector_callback)(struct mqtt_client*);
+
+    /**
+     * @brief A callback that is called whenever the client is in an error state.
+     * 
+     * This callback is responsible for: application level error handling, closing
+     * previous sockets, and reestabilishing the connection to the broker and 
+     * session configurations (i.e. subscriptions).  
+     */
+    void (*reconnect_callback)(struct mqtt_client*, void**);
+
+    /**
+     * @brief A pointer to some state. A pointer to this member is passed to 
+     *        \ref mqtt_client.reconnect_callback.
+     */
+    void* reconnect_state;
+
+    /**
+     * @brief The buffer where ingress data is temporarily stored.
+     */
+    struct {
+        /** @brief The start of the receive buffer's memory. */
+        uint8_t *mem_start;
+
+        /** @brief The size of the receive buffer's memory. */
+        size_t mem_size;
+
+        /** @brief A pointer to the next writtable location in the receive buffer. */
+        uint8_t *curr;
+
+        /** @brief The number of bytes that are still writable at curr. */
+        size_t curr_sz;
+    } recv_buffer;
+
+    /** 
+     * @brief A variable passed to support thread-safety.
+     * 
+     * A pointer to this variable is passed to \c MQTT_PAL_MUTEX_LOCK, and
+     * \c MQTT_PAL_MUTEX_UNLOCK.
+     */
+    mqtt_pal_mutex_t mutex;
+
+    /** @brief The sending message queue. */
+    struct mqtt_message_queue mq;
+};
+
+/**
+ * @brief Generate a new next packet ID.
+ * @ingroup details
+ * 
+ * Packet ID's are generated using a max-length LFSR.
+ * 
+ * @param client The MQTT client.
+ * 
+ * @returns The new packet ID that should be used.
+ */
+uint16_t __mqtt_next_pid(struct mqtt_client *client);
+
+/**
+ * @brief Handles egress client traffic.
+ * @ingroup details
+ * 
+ * @param client The MQTT client.
+ * 
+ * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_send(struct mqtt_client *client);
+
+/**
+ * @brief Handles ingress client traffic.
+ * @ingroup details
+ * 
+ * @param client The MQTT client.
+ * 
+ * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_recv(struct mqtt_client *client);
+
+/**
+ * @brief Function that does the actual sending and receiving of 
+ *        traffic from the network.
+ * @ingroup api
+ * 
+ * All the other functions in the @ref api simply stage messages for
+ * being sent to the broker. This function does the actual sending of
+ * those messages. Additionally this function receives traffic (responses and 
+ * acknowledgements) from the broker and responds to that traffic accordingly.
+ * Lastly this function also calls the \c publish_response_callback when
+ * any \c MQTT_CONTROL_PUBLISH messages are received.
+ * 
+ * @pre mqtt_init must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * 
+ * @attention It is the responsibility of the application programmer to 
+ *            call this function periodically. All functions in the @ref api are
+ *            thread-safe so it is perfectly reasonable to have a thread dedicated
+ *            to calling this function every 200 ms or so. MQTT-C can be used in single
+ *            threaded application though by simply calling this functino periodically 
+ *            inside your main thread. See @ref simple_publisher.c and @ref simple_subscriber.c
+ *            for examples (specifically the \c client_refresher functions).
+ * 
+ * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+enum MQTTErrors mqtt_sync(struct mqtt_client *client);
+
+/**
+ * @brief Initializes an MQTT client.
+ * @ingroup api
+ * 
+ * This function \em must be called before any other API function calls.
+ * 
+ * @pre None.
+ * 
+ * @param[out] client The MQTT client.
+ * @param[in] sockfd The socket file descriptor (or equivalent socket handle, e.g. BIO pointer 
+ *            for OpenSSL sockets) connected to the MQTT broker.
+ * @param[in] sendbuf A buffer that will be used for sending messages to the broker.
+ * @param[in] sendbufsz The size of \p sendbuf in bytes.
+ * @param[in] recvbuf A buffer that will be used for receiving messages from the broker.
+ * @param[in] recvbufsz The size of \p recvbuf in bytes.
+ * @param[in] publish_response_callback The callback to call whenever application messages
+ *            are received from the broker. 
+ * 
+ * @post mqtt_connect must be called.
+ * 
+ * @note \p sockfd is a non-blocking TCP connection.
+ * @note If \p sendbuf fills up completely during runtime a \c MQTT_ERROR_SEND_BUFFER_IS_FULL
+ *       error will be set. Similarly if \p recvbuf is ever to small to receive a message from
+ *       the broker an MQTT_ERROR_RECV_BUFFER_TOO_SMALL error will be set.
+ * @note A pointer to \ref mqtt_client.publish_response_callback_state is always passed as the 
+ *       \c state argument to \p publish_response_callback. Note that the second argument is 
+ *       the mqtt_response_publish that was received from the broker.
+ * 
+ * @attention Only initialize an MQTT client once (i.e. don't call \ref mqtt_init or 
+ *            \ref mqtt_init_reconnect more than once per client).
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
+ */
+enum MQTTErrors mqtt_init(struct mqtt_client *client,
+                          mqtt_pal_socket_handle sockfd,
+                          uint8_t *sendbuf, size_t sendbufsz,
+                          uint8_t *recvbuf, size_t recvbufsz,
+                          void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish));
+
+/**
+ * @brief Initializes an MQTT client and enables automatic reconnections.
+ * @ingroup api
+ * 
+ * An alternative to \ref mqtt_init that allows the client to automatically reconnect to the 
+ * broker after an error occurs (e.g. socket error or internal buffer overflows).
+ * 
+ * This is accomplished by calling the \p reconnect_callback whenever the client enters an error 
+ * state. The job of the \p reconnect_callback is to: (1) perform error handling/logging, 
+ * (2) clean up the old connection (i.e. close client->socketfd), (3) \ref mqtt_reinit the 
+ * client, and (4) reconfigure the MQTT session by calling \ref mqtt_connect followed by other 
+ * API calls such as \ref mqtt_subscribe.
+ * 
+ * The first argument to the \p reconnect_callback is the client (which will be in an error 
+ * state) and the second argument is a pointer to a void pointer where you can store some state
+ * information. Internally, MQTT-C calls the reconnect callback like so: 
+ * 
+ * \code 
+ *     client->reconnect_callback(client, &client->reconnect_state)
+ * \endcode
+ * 
+ * Note that the \p reconnect_callback is also called to setup the initial session. After
+ * calling \ref mqtt_init_reconnect the client will be in the error state 
+ * \c MQTT_ERROR_INITIAL_RECONNECT.
+ * 
+ * @pre None.
+ * 
+ * @param[in,out] client The MQTT client that will be initialized.
+ * @param[in] reconnect_callback The callback that will be called to connect/reconnect the 
+ *            client to the broker and perform application level error handling. 
+ * @param[in] reconnect_state A pointer to some state data for your \p reconnect_callback.
+ *            If your \p reconnect_callback does not require any state information set this
+ *            to NULL. A pointer to the memory address where the client stores a copy of this
+ *            pointer is passed as the second argumnet to \p reconnect_callback. 
+ * @param[in] publish_response_callback The callback to call whenever application messages
+ *            are received from the broker. 
+ * 
+ * @post Call \p reconnect_callback yourself, or call \ref mqtt_sync 
+ *       (which will trigger the call to \p reconnect_callback).
+ * 
+ * @attention Only initialize an MQTT client once (i.e. don't call \ref mqtt_init or 
+ *            \ref mqtt_init_reconnect more than once per client).
+ *
+ */
+void mqtt_init_reconnect(struct mqtt_client *client,
+                         void (*reconnect_callback)(struct mqtt_client *client, void** state),
+                         void *reconnect_state,
+                         void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish));
+
+/**
+ * @brief Safely assign/reassign a socket and buffers to an new/existing client.
+ * @ingroup api
+ * 
+ * This function also clears the \p client error state. Upon exiting this function
+ * \c client->error will be \c MQTT_ERROR_CONNECT_NOT_CALLED (which will be cleared)
+ * as soon as \ref mqtt_connect is called.
+ * 
+ * @pre This function must be called BEFORE \ref mqtt_connect. 
+ * 
+ * @param[in,out] client The MQTT client.
+ * @param[in] socketfd The new socket connected to the broker. 
+ * @param[in] sendbuf The buffer that will be used to buffer egress traffic to the broker.
+ * @param[in] sendbufsz The size of \p sendbuf in bytes.
+ * @param[in] recvbuf The buffer that will be used to buffer ingress traffic from the broker.
+ * @param[in] recvbufsz The size of \p recvbuf in bytes.
+ * 
+ * @post Call \ref mqtt_connect.
+ * 
+ * @attention This function should be used in conjunction with clients that have been 
+ *            initialzed with \ref mqtt_init_reconnect.  
+ */
+void mqtt_reinit(struct mqtt_client* client,
+                 mqtt_pal_socket_handle socketfd,
+                 uint8_t *sendbuf, size_t sendbufsz,
+                 uint8_t *recvbuf, size_t recvbufsz);
+
+/**
+ * @brief Establishes a session with the MQTT broker.
+ * @ingroup api
+ * 
+ * @pre mqtt_init must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * @param[in] client_id The unique name identifying the client. (or NULL)
+ * @param[in] will_topic The topic name of client's \p will_message. If no will message is 
+ *            desired set to \c NULL.
+ * @param[in] will_message The application message (data) to be published in the event the 
+ *            client ungracefully disconnects. Set to \c NULL if \p will_topic is \c NULL.
+ * @param[in] will_message_size The size of \p will_message in bytes.
+ * @param[in] user_name The username to use when establishing the session with the MQTT broker.
+ *            Set to \c NULL if a username is not required.
+ * @param[in] password The password to use when establishing the session with the MQTT broker.
+ *            Set to \c NULL if a password is not required.
+ * @param[in] connect_flags Additional \ref MQTTConnectFlags to use when establishing the connection. 
+ *            These flags are for forcing the session to start clean, 
+ *            \c MQTT_CONNECT_CLEAN_SESSION, the QOS level to publish the \p will_message with 
+ *            (provided \c will_message != \c NULL), MQTT_CONNECT_WILL_QOS_[0,1,2], and whether 
+ *            or not the broker should retain the \c will_message, MQTT_CONNECT_WILL_RETAIN.
+ * @param[in] keep_alive The keep-alive time in seconds. A reasonable value for this is 400 [seconds]. 
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
+ */
+enum MQTTErrors mqtt_connect(struct mqtt_client *client,
+                             const char* client_id,
+                             const char* will_topic,
+                             const void* will_message,
+                             size_t will_message_size,
+                             const char* user_name,
+                             const char* password,
+                             uint8_t connect_flags,
+                             uint16_t keep_alive);
+
+/* 
+    todo: will_message should be a void*
+*/
+
+/**
+ * @brief Publish an application message.
+ * @ingroup api
+ * 
+ * Publishes an application message to the MQTT broker.
+ * 
+ * @pre mqtt_connect must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * @param[in] topic_name The name of the topic.
+ * @param[in] application_message The data to be published.
+ * @param[in] application_message_size The size of \p application_message in bytes.
+ * @param[in] publish_flags \ref MQTTPublishFlags to be used, namely the QOS level to 
+ *            publish at (MQTT_PUBLISH_QOS_[0,1,2]) or whether or not the broker should 
+ *            retain the publish (MQTT_PUBLISH_RETAIN).
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
+ */
+enum MQTTErrors mqtt_publish(struct mqtt_client *client,
+                             const char* topic_name,
+                             void* application_message,
+                             size_t application_message_size,
+                             uint8_t publish_flags);
+
+/**
+ * @brief Acknowledge an ingree publish with QOS==1.
+ * @ingroup details
+ *
+ * @param[in,out] client The MQTT client.
+ * @param[in] packet_id The packet ID of the ingress publish being acknowledged.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_puback(struct mqtt_client *client, uint16_t packet_id);
+
+/**
+ * @brief Acknowledge an ingree publish with QOS==2.
+ * @ingroup details
+ *
+ * @param[in,out] client The MQTT client.
+ * @param[in] packet_id The packet ID of the ingress publish being acknowledged.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_pubrec(struct mqtt_client *client, uint16_t packet_id);
+
+/**
+ * @brief Acknowledge an ingree PUBREC packet.
+ * @ingroup details
+ *
+ * @param[in,out] client The MQTT client.
+ * @param[in] packet_id The packet ID of the ingress PUBREC being acknowledged.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_pubrel(struct mqtt_client *client, uint16_t packet_id);
+
+/**
+ * @brief Acknowledge an ingree PUBREL packet.
+ * @ingroup details
+ *
+ * @param[in,out] client The MQTT client.
+ * @param[in] packet_id The packet ID of the ingress PUBREL being acknowledged.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+ssize_t __mqtt_pubcomp(struct mqtt_client *client, uint16_t packet_id);
+
+
+/**
+ * @brief Subscribe to a topic.
+ * @ingroup api
+ * 
+ * @pre mqtt_connect must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * @param[in] topic_name The name of the topic to subscribe to.
+ * @param[in] max_qos_level The maximum QOS level with which the broker can send application
+ *            messages for this topic.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+enum MQTTErrors mqtt_subscribe(struct mqtt_client *client,
+                               const char* topic_name,
+                               int max_qos_level);
+
+/**
+ * @brief Unsubscribe from a topic.
+ * @ingroup api
+ * 
+ * @pre mqtt_connect must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * @param[in] topic_name The name of the topic to unsubscribe from.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise. 
+ */
+enum MQTTErrors mqtt_unsubscribe(struct mqtt_client *client,
+                                 const char* topic_name);
+
+/**
+ * @brief Ping the broker. 
+ * @ingroup api
+ * 
+ * @pre mqtt_connect must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
+ */
+enum MQTTErrors mqtt_ping(struct mqtt_client *client);
+
+/**
+ * @brief Ping the broker without locking/unlocking the mutex. 
+ * @see mqtt_ping
+ */
+enum MQTTErrors __mqtt_ping(struct mqtt_client *client);
+
+/**
+ * @brief Terminate the session with the MQTT broker. 
+ * @ingroup api
+ * 
+ * @pre mqtt_connect must have been called.
+ * 
+ * @param[in,out] client The MQTT client.
+ * 
+ * @note To re-establish the session, mqtt_connect must be called.
+ * 
+ * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
+ */
+enum MQTTErrors mqtt_disconnect(struct mqtt_client *client);
+
+#endif
diff --git a/deps/MQTT-C/include/mqtt_pal.h b/deps/MQTT-C/include/mqtt_pal.h
new file mode 100644
index 0000000000000000000000000000000000000000..cbe1839d641b3f0b485720568b546ae769d6edcc
--- /dev/null
+++ b/deps/MQTT-C/include/mqtt_pal.h
@@ -0,0 +1,157 @@
+#ifndef __MQTT_PAL_H__
+#define __MQTT_PAL_H__
+
+/*
+MIT License
+
+Copyright(c) 2018 Liam Bindle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/**
+ * @file
+ * @brief Includes/supports the types/calls required by the MQTT-C client.
+ * 
+ * @note This is the \em only file included in mqtt.h, and mqtt.c. It is therefore 
+ *       responsible for including/supporting all the required types and calls. 
+ * 
+ * @defgroup pal Platform abstraction layer
+ * @brief Documentation of the types and calls required to port MQTT-C to a new platform.
+ * 
+ * mqtt_pal.h is the \em only header file included in mqtt.c. Therefore, to port MQTT-C to a 
+ * new platform the following types, functions, constants, and macros must be defined in 
+ * mqtt_pal.h:
+ *  - Types:
+ *      - \c size_t, \c ssize_t
+ *      - \c uint8_t, \c uint16_t, \c uint32_t
+ *      - \c va_list
+ *      - \c mqtt_pal_time_t : return type of \c MQTT_PAL_TIME() 
+ *      - \c mqtt_pal_mutex_t : type of the argument that is passed to \c MQTT_PAL_MUTEX_LOCK and 
+ *        \c MQTT_PAL_MUTEX_RELEASE
+ *  - Functions:
+ *      - \c memcpy, \c strlen
+ *      - \c va_start, \c va_arg, \c va_end
+ *  - Constants:
+ *      - \c INT_MIN
+ * 
+ * Additionally, three macro's are required:
+ *  - \c MQTT_PAL_HTONS(s) : host-to-network endian conversion for uint16_t.
+ *  - \c MQTT_PAL_NTOHS(s) : network-to-host endian conversion for uint16_t.
+ *  - \c MQTT_PAL_TIME()   : returns [type: \c mqtt_pal_time_t] current time in seconds. 
+ *  - \c MQTT_PAL_MUTEX_LOCK(mtx_pointer) : macro that locks the mutex pointed to by \c mtx_pointer.
+ *  - \c MQTT_PAL_MUTEX_RELEASE(mtx_pointer) : macro that unlocks the mutex pointed to by 
+ *    \c mtx_pointer.
+ * 
+ * Lastly, \ref mqtt_pal_sendall and \ref mqtt_pal_recvall, must be implemented in mqtt_pal.c 
+ * for sending and receiving data using the platforms socket calls.
+ */
+
+
+/* UNIX-like platform support */
+#if defined(__unix__) || defined(__APPLE__)
+    #include <limits.h>
+    #include <string.h>
+    #include <stdarg.h>
+    #include <time.h>
+    #include <arpa/inet.h>
+    #include <pthread.h>
+
+    #define MQTT_PAL_HTONS(s) htons(s)
+    #define MQTT_PAL_NTOHS(s) ntohs(s)
+
+    #define MQTT_PAL_TIME() time(NULL)
+
+    typedef time_t mqtt_pal_time_t;
+    typedef pthread_mutex_t mqtt_pal_mutex_t;
+
+    #define MQTT_PAL_MUTEX_INIT(mtx_ptr) pthread_mutex_init(mtx_ptr, NULL)
+    #define MQTT_PAL_MUTEX_LOCK(mtx_ptr) pthread_mutex_lock(mtx_ptr)
+    #define MQTT_PAL_MUTEX_UNLOCK(mtx_ptr) pthread_mutex_unlock(mtx_ptr)
+
+    #ifndef MQTT_USE_CUSTOM_SOCKET_HANDLE
+        #ifdef MQTT_USE_MBEDTLS
+            struct mbedtls_ssl_context;
+            typedef struct mbedtls_ssl_context *mqtt_pal_socket_handle;
+        #elif defined(MQTT_USE_BIO)
+            #include <openssl/bio.h>
+            typedef BIO* mqtt_pal_socket_handle;
+        #else
+            typedef int mqtt_pal_socket_handle;
+        #endif
+    #endif
+#elif defined(_MSC_VER)
+    #include <limits.h>
+    #include <windows.h>
+    #include <time.h>
+    #include <stdint.h>
+    #include <winsock2.h>
+
+    typedef SSIZE_T ssize_t;
+    #define MQTT_PAL_HTONS(s) htons(s)
+    #define MQTT_PAL_NTOHS(s) ntohs(s)
+
+    #define MQTT_PAL_TIME() time(NULL)
+
+    typedef time_t mqtt_pal_time_t;
+    typedef CRITICAL_SECTION mqtt_pal_mutex_t;
+
+    #define MQTT_PAL_MUTEX_INIT(mtx_ptr) InitializeCriticalSection(mtx_ptr)
+    #define MQTT_PAL_MUTEX_LOCK(mtx_ptr) EnterCriticalSection(mtx_ptr)
+    #define MQTT_PAL_MUTEX_UNLOCK(mtx_ptr) LeaveCriticalSection(mtx_ptr)
+
+
+    #ifndef MQTT_USE_CUSTOM_SOCKET_HANDLE
+        #ifdef MQTT_USE_BIO
+            #include <openssl/bio.h>
+            typedef BIO* mqtt_pal_socket_handle;
+        #else
+            typedef SOCKET mqtt_pal_socket_handle;
+        #endif
+    #endif
+
+#endif
+
+/**
+ * @brief Sends all the bytes in a buffer.
+ * @ingroup pal
+ * 
+ * @param[in] fd The file-descriptor (or handle) of the socket.
+ * @param[in] buf A pointer to the first byte in the buffer to send.
+ * @param[in] len The number of bytes to send (starting at \p buf).
+ * @param[in] flags Flags which are passed to the underlying socket.
+ * 
+ * @returns The number of bytes sent if successful, an \ref MQTTErrors otherwise.
+ */
+ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags);
+
+/**
+ * @brief Non-blocking receive all the byte available.
+ * @ingroup pal
+ * 
+ * @param[in] fd The file-descriptor (or handle) of the socket.
+ * @param[in] buf A pointer to the receive buffer.
+ * @param[in] bufsz The max number of bytes that can be put into \p buf.
+ * @param[in] flags Flags which are passed to the underlying socket.
+ * 
+ * @returns The number of bytes received if successful, an \ref MQTTErrors otherwise.
+ */
+ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags);
+
+#endif
diff --git a/deps/MQTT-C/src/mqtt.c b/deps/MQTT-C/src/mqtt.c
new file mode 100644
index 0000000000000000000000000000000000000000..833a48f6e23a9a69c6628f4fb441a651d70b90fa
--- /dev/null
+++ b/deps/MQTT-C/src/mqtt.c
@@ -0,0 +1,1756 @@
+/*
+MIT License
+
+Copyright(c) 2018 Liam Bindle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <mqtt.h>
+
+/** 
+ * @file 
+ * @brief Implements the functionality of MQTT-C.
+ * @note The only files that are included are mqtt.h and mqtt_pal.h.
+ * 
+ * @cond Doxygen_Suppress
+ */
+
+enum MQTTErrors mqtt_sync(struct mqtt_client *client) {
+    /* Recover from any errors */
+    enum MQTTErrors err;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+    if (client->error != MQTT_OK && client->reconnect_callback != NULL) {
+        client->reconnect_callback(client, &client->reconnect_state);
+        /* unlocked during CONNECT */
+    } else {
+        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    }
+
+    /* Call inspector callback if necessary */
+    
+    if (client->inspector_callback != NULL) {
+        MQTT_PAL_MUTEX_LOCK(&client->mutex);
+        err = client->inspector_callback(client);
+        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+        if (err != MQTT_OK) return err;
+    }
+
+    /* Call receive */
+    err = __mqtt_recv(client);
+    if (err != MQTT_OK) return err;
+
+    /* Call send */
+    err = __mqtt_send(client);
+    return err;
+}
+
+uint16_t __mqtt_next_pid(struct mqtt_client *client) {
+    int pid_exists = 0;
+    if (client->pid_lfsr == 0) {
+        client->pid_lfsr = 163u;
+    }
+    /* LFSR taps taken from: https://en.wikipedia.org/wiki/Linear-feedback_shift_register */
+    
+    do {
+        struct mqtt_queued_message *curr;
+        unsigned lsb = client->pid_lfsr & 1;
+        (client->pid_lfsr) >>= 1;
+        if (lsb) {
+            client->pid_lfsr ^= 0xB400u;
+        }
+
+        /* check that the PID is unique */
+        pid_exists = 0;
+        for(curr = mqtt_mq_get(&(client->mq), 0); curr >= client->mq.queue_tail; --curr) {
+            if (curr->packet_id == client->pid_lfsr) {
+                pid_exists = 1;
+                break;
+            }
+        }
+
+    } while(pid_exists);
+    return client->pid_lfsr;
+}
+
+enum MQTTErrors mqtt_init(struct mqtt_client *client,
+               mqtt_pal_socket_handle sockfd,
+               uint8_t *sendbuf, size_t sendbufsz,
+               uint8_t *recvbuf, size_t recvbufsz,
+               void (*publish_response_callback)(void** state,struct mqtt_response_publish *publish))
+{
+    if (client == NULL || sendbuf == NULL || recvbuf == NULL) {
+        return MQTT_ERROR_NULLPTR;
+    }
+
+    /* initialize mutex */
+    MQTT_PAL_MUTEX_INIT(&client->mutex);
+    MQTT_PAL_MUTEX_LOCK(&client->mutex); /* unlocked during CONNECT */
+
+    client->socketfd = sockfd;
+
+    mqtt_mq_init(&client->mq, sendbuf, sendbufsz);
+
+    client->recv_buffer.mem_start = recvbuf;
+    client->recv_buffer.mem_size = recvbufsz;
+    client->recv_buffer.curr = client->recv_buffer.mem_start;
+    client->recv_buffer.curr_sz = client->recv_buffer.mem_size;
+
+    client->error = MQTT_ERROR_CONNECT_NOT_CALLED;
+    client->response_timeout = 30;
+    client->number_of_timeouts = 0;
+    client->number_of_keep_alives = 0;
+    client->typical_response_time = -1.0;
+    client->publish_response_callback = publish_response_callback;
+    client->pid_lfsr = 0;
+    client->send_offset = 0;
+
+    client->inspector_callback = NULL;
+    client->reconnect_callback = NULL;
+    client->reconnect_state = NULL;
+
+    return MQTT_OK;
+}
+
+void mqtt_init_reconnect(struct mqtt_client *client,
+                         void (*reconnect)(struct mqtt_client *, void**),
+                         void *reconnect_state,
+                         void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish))
+{
+    /* initialize mutex */
+    MQTT_PAL_MUTEX_INIT(&client->mutex);
+
+    client->socketfd = (mqtt_pal_socket_handle) -1;
+
+    mqtt_mq_init(&client->mq, NULL, 0);
+
+    client->recv_buffer.mem_start = NULL;
+    client->recv_buffer.mem_size = 0;
+    client->recv_buffer.curr = NULL;
+    client->recv_buffer.curr_sz = 0;
+
+    client->error = MQTT_ERROR_INITIAL_RECONNECT;
+    client->response_timeout = 30;
+    client->number_of_timeouts = 0;
+    client->number_of_keep_alives = 0;
+    client->typical_response_time = -1.0;
+    client->publish_response_callback = publish_response_callback;
+    client->send_offset = 0;
+
+    client->inspector_callback = NULL;
+    client->reconnect_callback = reconnect;
+    client->reconnect_state = reconnect_state;
+}
+
+void mqtt_reinit(struct mqtt_client* client,
+                 mqtt_pal_socket_handle socketfd,
+                 uint8_t *sendbuf, size_t sendbufsz,
+                 uint8_t *recvbuf, size_t recvbufsz)
+{
+    client->error = MQTT_ERROR_CONNECT_NOT_CALLED;
+    client->socketfd = socketfd;
+
+    mqtt_mq_init(&client->mq, sendbuf, sendbufsz);
+
+    client->recv_buffer.mem_start = recvbuf;
+    client->recv_buffer.mem_size = recvbufsz;
+    client->recv_buffer.curr = client->recv_buffer.mem_start;
+    client->recv_buffer.curr_sz = client->recv_buffer.mem_size;
+}
+
+/** 
+ * A macro function that:
+ *      1) Checks that the client isn't in an error state.
+ *      2) Attempts to pack to client's message queue.
+ *          a) handles errors
+ *          b) if mq buffer is too small, cleans it and tries again
+ *      3) Upon successful pack, registers the new message.
+ */
+#define MQTT_CLIENT_TRY_PACK(tmp, msg, client, pack_call, release)  \
+    if (client->error < 0) {                                        \
+        if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);         \
+        return client->error;                                       \
+    }                                                               \
+    tmp = pack_call;                                                \
+    if (tmp < 0) {                                                  \
+        client->error = tmp;                                        \
+        if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);         \
+        return tmp;                                                 \
+    } else if (tmp == 0) {                                          \
+        mqtt_mq_clean(&client->mq);                                 \
+        tmp = pack_call;                                            \
+        if (tmp < 0) {                                              \
+            client->error = tmp;                                    \
+            if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);     \
+            return tmp;                                             \
+        } else if(tmp == 0) {                                       \
+            client->error = MQTT_ERROR_SEND_BUFFER_IS_FULL;         \
+            if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);     \
+            return MQTT_ERROR_SEND_BUFFER_IS_FULL;                  \
+        }                                                           \
+    }                                                               \
+    msg = mqtt_mq_register(&client->mq, tmp);                       \
+
+
+enum MQTTErrors mqtt_connect(struct mqtt_client *client,
+                     const char* client_id,
+                     const char* will_topic,
+                     const void* will_message,
+                     size_t will_message_size,
+                     const char* user_name,
+                     const char* password,
+                     uint8_t connect_flags,
+                     uint16_t keep_alive)
+{
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* Note: Current thread already has mutex locked. */
+
+    /* update the client's state */
+    client->keep_alive = keep_alive;
+    if (client->error == MQTT_ERROR_CONNECT_NOT_CALLED) {
+        client->error = MQTT_OK;
+    }
+    
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(rv, msg, client, 
+        mqtt_pack_connection_request(
+            client->mq.curr, client->mq.curr_sz,
+            client_id, will_topic, will_message, 
+            will_message_size,user_name, password, 
+            connect_flags, keep_alive
+        ), 
+        1
+    );
+    /* save the control type of the message */
+    msg->control_type = MQTT_CONTROL_CONNECT;
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+enum MQTTErrors mqtt_publish(struct mqtt_client *client,
+                     const char* topic_name,
+                     void* application_message,
+                     size_t application_message_size,
+                     uint8_t publish_flags)
+{
+    struct mqtt_queued_message *msg;
+    ssize_t rv;
+    uint16_t packet_id;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+    packet_id = __mqtt_next_pid(client);
+
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_publish_request(
+            client->mq.curr, client->mq.curr_sz,
+            topic_name,
+            packet_id,
+            application_message,
+            application_message_size,
+            publish_flags
+        ), 
+        1
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PUBLISH;
+    msg->packet_id = packet_id;
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_puback(struct mqtt_client *client, uint16_t packet_id) {
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_pubxxx_request(
+            client->mq.curr, client->mq.curr_sz,
+            MQTT_CONTROL_PUBACK,
+            packet_id
+        ),
+        0
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PUBACK;
+    msg->packet_id = packet_id;
+
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_pubrec(struct mqtt_client *client, uint16_t packet_id) {
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_pubxxx_request(
+            client->mq.curr, client->mq.curr_sz,
+            MQTT_CONTROL_PUBREC,
+            packet_id
+        ),
+        0
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PUBREC;
+    msg->packet_id = packet_id;
+
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_pubrel(struct mqtt_client *client, uint16_t packet_id) {
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_pubxxx_request(
+            client->mq.curr, client->mq.curr_sz,
+            MQTT_CONTROL_PUBREL,
+            packet_id
+        ),
+        0
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PUBREL;
+    msg->packet_id = packet_id;
+
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_pubcomp(struct mqtt_client *client, uint16_t packet_id) {
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_pubxxx_request(
+            client->mq.curr, client->mq.curr_sz,
+            MQTT_CONTROL_PUBCOMP,
+            packet_id
+        ),
+        0
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PUBCOMP;
+    msg->packet_id = packet_id;
+
+    return MQTT_OK;
+}
+
+enum MQTTErrors mqtt_subscribe(struct mqtt_client *client,
+                       const char* topic_name,
+                       int max_qos_level)
+{
+    ssize_t rv;
+    uint16_t packet_id;
+    struct mqtt_queued_message *msg;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+    packet_id = __mqtt_next_pid(client);
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_subscribe_request(
+            client->mq.curr, client->mq.curr_sz,
+            packet_id,
+            topic_name,
+            max_qos_level,
+            (const char*)NULL
+        ), 
+        1
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_SUBSCRIBE;
+    msg->packet_id = packet_id;
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+enum MQTTErrors mqtt_unsubscribe(struct mqtt_client *client,
+                         const char* topic_name)
+{
+    uint16_t packet_id = __mqtt_next_pid(client);
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_unsubscribe_request(
+            client->mq.curr, client->mq.curr_sz,
+            packet_id,
+            topic_name,
+            (const char*)NULL
+        ), 
+        1
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_UNSUBSCRIBE;
+    msg->packet_id = packet_id;
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+enum MQTTErrors mqtt_ping(struct mqtt_client *client) {
+    enum MQTTErrors rv;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+    rv = __mqtt_ping(client);
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return rv;
+}
+
+enum MQTTErrors __mqtt_ping(struct mqtt_client *client) 
+{
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_ping_request(
+            client->mq.curr, client->mq.curr_sz
+        ),
+        0
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_PINGREQ;
+
+    
+    return MQTT_OK;
+}
+
+enum MQTTErrors mqtt_disconnect(struct mqtt_client *client) 
+{
+    ssize_t rv;
+    struct mqtt_queued_message *msg;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+
+    /* try to pack the message */
+    MQTT_CLIENT_TRY_PACK(
+        rv, msg, client, 
+        mqtt_pack_disconnect(
+            client->mq.curr, client->mq.curr_sz
+        ), 
+        1
+    );
+    /* save the control type and packet id of the message */
+    msg->control_type = MQTT_CONTROL_DISCONNECT;
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_send(struct mqtt_client *client) 
+{
+    uint8_t inspected;
+    ssize_t len;
+    int inflight_qos2 = 0;
+    int i = 0;
+    
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+    
+    if (client->error < 0 && client->error != MQTT_ERROR_SEND_BUFFER_IS_FULL) {
+        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+        return client->error;
+    }
+
+    /* loop through all messages in the queue */
+    len = mqtt_mq_length(&client->mq);
+    for(; i < len; ++i) {
+        struct mqtt_queued_message *msg = mqtt_mq_get(&client->mq, i);
+        int resend = 0;
+        if (msg->state == MQTT_QUEUED_UNSENT) {
+            /* message has not been sent to lets send it */
+            resend = 1;
+        } else if (msg->state == MQTT_QUEUED_AWAITING_ACK) {
+            /* check for timeout */
+            if (MQTT_PAL_TIME() > msg->time_sent + client->response_timeout) {
+                resend = 1;
+                client->number_of_timeouts += 1;
+                client->send_offset = 0;
+            }
+        }
+
+        /* only send QoS 2 message if there are no inflight QoS 2 PUBLISH messages */
+        if (msg->control_type == MQTT_CONTROL_PUBLISH
+            && (msg->state == MQTT_QUEUED_UNSENT || msg->state == MQTT_QUEUED_AWAITING_ACK)) 
+        {
+            inspected = 0x03 & ((msg->start[0]) >> 1); /* qos */
+            if (inspected == 2) {
+                if (inflight_qos2) {
+                    resend = 0;
+                }
+                inflight_qos2 = 1;
+            }
+        }
+
+        /* goto next message if we don't need to send */
+        if (!resend) {
+            continue;
+        }
+
+        /* we're sending the message */
+        {
+          ssize_t tmp = mqtt_pal_sendall(client->socketfd, msg->start + client->send_offset, msg->size - client->send_offset, 0);
+          if (tmp < 0) {
+            client->error = tmp;
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return tmp;
+          } else {
+            client->send_offset += tmp;
+            if(client->send_offset < msg->size) {
+              /* partial sent. Await additional calls */
+              break;
+            } else {
+              /* whole message has been sent */
+              client->send_offset = 0;
+            }
+
+          }
+
+        }
+
+        /* update timeout watcher */
+        client->time_of_last_send = MQTT_PAL_TIME();
+        msg->time_sent = client->time_of_last_send;
+
+        /* 
+        Determine the state to put the message in.
+        Control Types:
+        MQTT_CONTROL_CONNECT     -> awaiting
+        MQTT_CONTROL_CONNACK     -> n/a
+        MQTT_CONTROL_PUBLISH     -> qos == 0 ? complete : awaiting
+        MQTT_CONTROL_PUBACK      -> complete
+        MQTT_CONTROL_PUBREC      -> awaiting
+        MQTT_CONTROL_PUBREL      -> awaiting
+        MQTT_CONTROL_PUBCOMP     -> complete
+        MQTT_CONTROL_SUBSCRIBE   -> awaiting
+        MQTT_CONTROL_SUBACK      -> n/a
+        MQTT_CONTROL_UNSUBSCRIBE -> awaiting
+        MQTT_CONTROL_UNSUBACK    -> n/a
+        MQTT_CONTROL_PINGREQ     -> awaiting
+        MQTT_CONTROL_PINGRESP    -> n/a
+        MQTT_CONTROL_DISCONNECT  -> complete
+        */
+        switch (msg->control_type) {
+        case MQTT_CONTROL_PUBACK:
+        case MQTT_CONTROL_PUBCOMP:
+        case MQTT_CONTROL_DISCONNECT:
+            msg->state = MQTT_QUEUED_COMPLETE;
+            break;
+        case MQTT_CONTROL_PUBLISH:
+            inspected = ( MQTT_PUBLISH_QOS_MASK & (msg->start[0]) ) >> 1; /* qos */
+            if (inspected == 0) {
+                msg->state = MQTT_QUEUED_COMPLETE;
+            } else if (inspected == 1) {
+                msg->state = MQTT_QUEUED_AWAITING_ACK;
+                /*set DUP flag for subsequent sends [Spec MQTT-3.3.1-1] */ 
+                msg->start[0] |= MQTT_PUBLISH_DUP;
+            } else {
+                msg->state = MQTT_QUEUED_AWAITING_ACK;
+            }
+            break;
+        case MQTT_CONTROL_CONNECT:
+        case MQTT_CONTROL_PUBREC:
+        case MQTT_CONTROL_PUBREL:
+        case MQTT_CONTROL_SUBSCRIBE:
+        case MQTT_CONTROL_UNSUBSCRIBE:
+        case MQTT_CONTROL_PINGREQ:
+            msg->state = MQTT_QUEUED_AWAITING_ACK;
+            break;
+        default:
+            client->error = MQTT_ERROR_MALFORMED_REQUEST;
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return MQTT_ERROR_MALFORMED_REQUEST;
+        }
+    }
+
+    /* check for keep-alive */
+    {
+        mqtt_pal_time_t keep_alive_timeout = client->time_of_last_send + (mqtt_pal_time_t)((float)(client->keep_alive) * 0.75);
+        if (MQTT_PAL_TIME() > keep_alive_timeout) {
+          ssize_t rv = __mqtt_ping(client);
+          if (rv != MQTT_OK) {
+            client->error = rv;
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return rv;
+          }
+        }
+    }
+
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return MQTT_OK;
+}
+
+ssize_t __mqtt_recv(struct mqtt_client *client)
+{
+    struct mqtt_response response;
+    ssize_t mqtt_recv_ret = MQTT_OK;
+    MQTT_PAL_MUTEX_LOCK(&client->mutex);
+
+    /* read until there is nothing left to read, or there was an error */
+    while(mqtt_recv_ret == MQTT_OK) {
+        /* read in as many bytes as possible */
+        ssize_t rv, consumed;
+        struct mqtt_queued_message *msg = NULL;
+
+        rv = mqtt_pal_recvall(client->socketfd, client->recv_buffer.curr, client->recv_buffer.curr_sz, 0);
+        if (rv < 0) {
+            /* an error occurred */
+            client->error = rv;
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return rv;
+        } else {
+            client->recv_buffer.curr += rv;
+            client->recv_buffer.curr_sz -= rv;
+        }
+
+        /* attempt to parse */
+        consumed = mqtt_unpack_response(&response, client->recv_buffer.mem_start, client->recv_buffer.curr - client->recv_buffer.mem_start);
+
+        if (consumed < 0) {
+            client->error = consumed;
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return consumed;
+        } else if (consumed == 0) {
+            /* if curr_sz is 0 then the buffer is too small to ever fit the message */
+            if (client->recv_buffer.curr_sz == 0) {
+                client->error = MQTT_ERROR_RECV_BUFFER_TOO_SMALL;
+                MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+                return MQTT_ERROR_RECV_BUFFER_TOO_SMALL;
+            }
+
+            /* just need to wait for the rest of the data */
+            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+            return MQTT_OK;
+        }
+
+        /* response was unpacked successfully */
+
+        /*
+        The switch statement below manages how the client responds to messages from the broker.
+
+        Control Types (that we expect to receive from the broker):
+        MQTT_CONTROL_CONNACK:
+            -> release associated CONNECT
+            -> handle response
+        MQTT_CONTROL_PUBLISH:
+            -> stage response, none if qos==0, PUBACK if qos==1, PUBREC if qos==2
+            -> call publish callback
+        MQTT_CONTROL_PUBACK:
+            -> release associated PUBLISH
+        MQTT_CONTROL_PUBREC:
+            -> release PUBLISH
+            -> stage PUBREL
+        MQTT_CONTROL_PUBREL:
+            -> release associated PUBREC
+            -> stage PUBCOMP
+        MQTT_CONTROL_PUBCOMP:
+            -> release PUBREL
+        MQTT_CONTROL_SUBACK:
+            -> release SUBSCRIBE
+            -> handle response
+        MQTT_CONTROL_UNSUBACK:
+            -> release UNSUBSCRIBE
+        MQTT_CONTROL_PINGRESP:
+            -> release PINGREQ
+        */
+        switch (response.fixed_header.control_type) {
+            case MQTT_CONTROL_CONNACK:
+                /* release associated CONNECT */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_CONNECT, NULL);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* initialize typical response time */
+                client->typical_response_time = (double) (MQTT_PAL_TIME() - msg->time_sent);
+                /* check that connection was successful */
+                if (response.decoded.connack.return_code != MQTT_CONNACK_ACCEPTED) {
+                    if (response.decoded.connack.return_code == MQTT_CONNACK_REFUSED_IDENTIFIER_REJECTED) {
+                        client->error = MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED;
+                        mqtt_recv_ret = MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED;
+                    } else {
+                        client->error = MQTT_ERROR_CONNECTION_REFUSED;
+                        mqtt_recv_ret = MQTT_ERROR_CONNECTION_REFUSED;
+                    }
+                    break;
+                }
+                break;
+            case MQTT_CONTROL_PUBLISH:
+                /* stage response, none if qos==0, PUBACK if qos==1, PUBREC if qos==2 */
+                if (response.decoded.publish.qos_level == 1) {
+                    rv = __mqtt_puback(client, response.decoded.publish.packet_id);
+                    if (rv != MQTT_OK) {
+                        client->error = rv;
+                        mqtt_recv_ret = rv;
+                        break;
+                    }
+                } else if (response.decoded.publish.qos_level == 2) {
+                    /* check if this is a duplicate */
+                    if (mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREC, &response.decoded.publish.packet_id) != NULL) {
+                        break;
+                    }
+
+                    rv = __mqtt_pubrec(client, response.decoded.publish.packet_id);
+                    if (rv != MQTT_OK) {
+                        client->error = rv;
+                        mqtt_recv_ret = rv;
+                        break;
+                    }
+                }
+                /* call publish callback */
+                client->publish_response_callback(&client->publish_response_callback_state, &response.decoded.publish);
+                break;
+            case MQTT_CONTROL_PUBACK:
+                /* release associated PUBLISH */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBLISH, &response.decoded.puback.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                break;
+            case MQTT_CONTROL_PUBREC:
+                /* check if this is a duplicate */
+                if (mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREL, &response.decoded.pubrec.packet_id) != NULL) {
+                    break;
+                }
+                /* release associated PUBLISH */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBLISH, &response.decoded.pubrec.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                /* stage PUBREL */
+                rv = __mqtt_pubrel(client, response.decoded.pubrec.packet_id);
+                if (rv != MQTT_OK) {
+                    client->error = rv;
+                    mqtt_recv_ret = rv;
+                    break;
+                }
+                break;
+            case MQTT_CONTROL_PUBREL:
+                /* release associated PUBREC */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREC, &response.decoded.pubrel.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                /* stage PUBCOMP */
+                rv = __mqtt_pubcomp(client, response.decoded.pubrec.packet_id);
+                if (rv != MQTT_OK) {
+                    client->error = rv;
+                    mqtt_recv_ret = rv;
+                    break;
+                }
+                break;
+            case MQTT_CONTROL_PUBCOMP:
+                /* release associated PUBREL */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREL, &response.decoded.pubcomp.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                break;
+            case MQTT_CONTROL_SUBACK:
+                /* release associated SUBSCRIBE */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_SUBSCRIBE, &response.decoded.suback.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                /* check that subscription was successful (not currently only one subscribe at a time) */
+                if (response.decoded.suback.return_codes[0] == MQTT_SUBACK_FAILURE) {
+                    client->error = MQTT_ERROR_SUBSCRIBE_FAILED;
+                    mqtt_recv_ret = MQTT_ERROR_SUBSCRIBE_FAILED;
+                    break;
+                }
+                break;
+            case MQTT_CONTROL_UNSUBACK:
+                /* release associated UNSUBSCRIBE */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_UNSUBSCRIBE, &response.decoded.unsuback.packet_id);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                break;
+            case MQTT_CONTROL_PINGRESP:
+                /* release associated PINGREQ */
+                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PINGREQ, NULL);
+                if (msg == NULL) {
+                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
+                    break;
+                }
+                msg->state = MQTT_QUEUED_COMPLETE;
+                /* update response time */
+                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
+                break;
+            default:
+                client->error = MQTT_ERROR_MALFORMED_RESPONSE;
+                mqtt_recv_ret = MQTT_ERROR_MALFORMED_RESPONSE;
+                break;
+        }
+        {
+          /* we've handled the response, now clean the buffer */
+          void* dest = (unsigned char*)client->recv_buffer.mem_start;
+          void* src  = (unsigned char*)client->recv_buffer.mem_start + consumed;
+          size_t n = client->recv_buffer.curr - client->recv_buffer.mem_start - consumed;
+          memmove(dest, src, n);
+          client->recv_buffer.curr -= consumed;
+          client->recv_buffer.curr_sz += consumed;
+        }
+    }
+
+    /* In case there was some error handling the (well formed) message, we end up here */
+    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
+    return mqtt_recv_ret;
+}
+
+/* FIXED HEADER */
+
+#define MQTT_BITFIELD_RULE_VIOLOATION(bitfield, rule_value, rule_mask) ((bitfield ^ rule_value) & rule_mask)
+
+struct {
+    const uint8_t control_type_is_valid[16];
+    const uint8_t required_flags[16];
+    const uint8_t mask_required_flags[16];
+} mqtt_fixed_header_rules = {
+    {   /* boolean value, true if type is valid */
+        0x00, /* MQTT_CONTROL_RESERVED */
+        0x01, /* MQTT_CONTROL_CONNECT */
+        0x01, /* MQTT_CONTROL_CONNACK */
+        0x01, /* MQTT_CONTROL_PUBLISH */
+        0x01, /* MQTT_CONTROL_PUBACK */
+        0x01, /* MQTT_CONTROL_PUBREC */
+        0x01, /* MQTT_CONTROL_PUBREL */
+        0x01, /* MQTT_CONTROL_PUBCOMP */
+        0x01, /* MQTT_CONTROL_SUBSCRIBE */
+        0x01, /* MQTT_CONTROL_SUBACK */
+        0x01, /* MQTT_CONTROL_UNSUBSCRIBE */
+        0x01, /* MQTT_CONTROL_UNSUBACK */
+        0x01, /* MQTT_CONTROL_PINGREQ */
+        0x01, /* MQTT_CONTROL_PINGRESP */
+        0x01, /* MQTT_CONTROL_DISCONNECT */
+        0x00  /* MQTT_CONTROL_RESERVED */
+    },
+    {   /* flags that must be set for the associated control type */
+        0x00, /* MQTT_CONTROL_RESERVED */
+        0x00, /* MQTT_CONTROL_CONNECT */
+        0x00, /* MQTT_CONTROL_CONNACK */
+        0x00, /* MQTT_CONTROL_PUBLISH */
+        0x00, /* MQTT_CONTROL_PUBACK */
+        0x00, /* MQTT_CONTROL_PUBREC */
+        0x02, /* MQTT_CONTROL_PUBREL */
+        0x00, /* MQTT_CONTROL_PUBCOMP */
+        0x02, /* MQTT_CONTROL_SUBSCRIBE */
+        0x00, /* MQTT_CONTROL_SUBACK */
+        0x02, /* MQTT_CONTROL_UNSUBSCRIBE */
+        0x00, /* MQTT_CONTROL_UNSUBACK */
+        0x00, /* MQTT_CONTROL_PINGREQ */
+        0x00, /* MQTT_CONTROL_PINGRESP */
+        0x00, /* MQTT_CONTROL_DISCONNECT */
+        0x00  /* MQTT_CONTROL_RESERVED */
+    },
+    {   /* mask of flags that must be specific values for the associated control type*/
+        0x00, /* MQTT_CONTROL_RESERVED */
+        0x0F, /* MQTT_CONTROL_CONNECT */
+        0x0F, /* MQTT_CONTROL_CONNACK */
+        0x00, /* MQTT_CONTROL_PUBLISH */
+        0x0F, /* MQTT_CONTROL_PUBACK */
+        0x0F, /* MQTT_CONTROL_PUBREC */
+        0x0F, /* MQTT_CONTROL_PUBREL */
+        0x0F, /* MQTT_CONTROL_PUBCOMP */
+        0x0F, /* MQTT_CONTROL_SUBSCRIBE */
+        0x0F, /* MQTT_CONTROL_SUBACK */
+        0x0F, /* MQTT_CONTROL_UNSUBSCRIBE */
+        0x0F, /* MQTT_CONTROL_UNSUBACK */
+        0x0F, /* MQTT_CONTROL_PINGREQ */
+        0x0F, /* MQTT_CONTROL_PINGRESP */
+        0x0F, /* MQTT_CONTROL_DISCONNECT */
+        0x00  /* MQTT_CONTROL_RESERVED */
+    }
+};
+
+static ssize_t mqtt_fixed_header_rule_violation(const struct mqtt_fixed_header *fixed_header) {
+    uint8_t control_type;
+    uint8_t control_flags;
+    uint8_t required_flags;
+    uint8_t mask_required_flags;
+
+    /* get value and rules */
+    control_type = fixed_header->control_type;
+    control_flags = fixed_header->control_flags;
+    required_flags = mqtt_fixed_header_rules.required_flags[control_type];
+    mask_required_flags = mqtt_fixed_header_rules.mask_required_flags[control_type];
+
+    /* check for valid type */
+    if (!mqtt_fixed_header_rules.control_type_is_valid[control_type]) {
+        return MQTT_ERROR_CONTROL_FORBIDDEN_TYPE;
+    }
+    
+    /* check that flags are appropriate */
+    if(MQTT_BITFIELD_RULE_VIOLOATION(control_flags, required_flags, mask_required_flags)) {
+        return MQTT_ERROR_CONTROL_INVALID_FLAGS;
+    }
+
+    return 0;
+}
+
+ssize_t mqtt_unpack_fixed_header(struct mqtt_response *response, const uint8_t *buf, size_t bufsz) {
+    struct mqtt_fixed_header *fixed_header;
+    const uint8_t *start = buf;
+    int lshift;
+    ssize_t errcode;
+    
+    /* check for null pointers or empty buffer */
+    if (response == NULL || buf == NULL) {
+        return MQTT_ERROR_NULLPTR;
+    }
+    fixed_header = &(response->fixed_header);
+
+    /* check that bufsz is not zero */
+    if (bufsz == 0) return 0;
+
+    /* parse control type and flags */
+    fixed_header->control_type  = *buf >> 4;
+    fixed_header->control_flags = *buf & 0x0F;
+
+    /* parse remaining size */
+    fixed_header->remaining_length = 0;
+
+    lshift = 0;
+    do {
+
+        /* MQTT spec (2.2.3) says the maximum length is 28 bits */
+        if(lshift == 28)
+            return MQTT_ERROR_INVALID_REMAINING_LENGTH;
+
+        /* consume byte and assert at least 1 byte left */
+        --bufsz;
+        ++buf;
+        if (bufsz == 0) return 0;
+
+        /* parse next byte*/
+        fixed_header->remaining_length += (*buf & 0x7F) << lshift;
+        lshift += 7;
+    } while(*buf & 0x80); /* while continue bit is set */ 
+
+    /* consume last byte */
+    --bufsz;
+    ++buf;
+
+    /* check that the fixed header is valid */
+    errcode = mqtt_fixed_header_rule_violation(fixed_header);
+    if (errcode) {
+        return errcode;
+    }
+
+    /* check that the buffer size if GT remaining length */
+    if (bufsz < fixed_header->remaining_length) {
+        return 0;
+    }
+
+    /* return how many bytes were consumed */
+    return buf - start;
+}
+
+ssize_t mqtt_pack_fixed_header(uint8_t *buf, size_t bufsz, const struct mqtt_fixed_header *fixed_header) {
+    const uint8_t *start = buf;
+    ssize_t errcode;
+    uint32_t remaining_length;
+    
+    /* check for null pointers or empty buffer */
+    if (fixed_header == NULL || buf == NULL) {
+        return MQTT_ERROR_NULLPTR;
+    }
+
+    /* check that the fixed header is valid */
+    errcode = mqtt_fixed_header_rule_violation(fixed_header);
+    if (errcode) {
+        return errcode;
+    }
+
+    /* check that bufsz is not zero */
+    if (bufsz == 0) return 0;
+
+    /* pack control type and flags */
+    *buf =  (((uint8_t) fixed_header->control_type) << 4) & 0xF0;
+    *buf |= ((uint8_t) fixed_header->control_flags)       & 0x0F;
+
+    remaining_length = fixed_header->remaining_length;
+
+    /* MQTT spec (2.2.3) says maximum remaining length is 2^28-1 */
+    if(remaining_length >= 256*1024*1024)
+        return MQTT_ERROR_INVALID_REMAINING_LENGTH;
+
+    do {
+        /* consume byte and assert at least 1 byte left */
+        --bufsz;
+        ++buf;
+        if (bufsz == 0) return 0;
+        
+        /* pack next byte */
+        *buf  = remaining_length & 0x7F;
+        if(remaining_length > 127) *buf |= 0x80;
+        remaining_length = remaining_length >> 7;
+    } while(*buf & 0x80);
+    
+    /* consume last byte */
+    --bufsz;
+    ++buf;
+
+    /* check that there's still enough space in buffer for packet */
+    if (bufsz < fixed_header->remaining_length) {
+        return 0;
+    }
+
+    /* return how many bytes were consumed */
+    return buf - start;
+}
+
+/* CONNECT */
+ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
+                                     const char* client_id,
+                                     const char* will_topic,
+                                     const void* will_message,
+                                     size_t will_message_size,
+                                     const char* user_name,
+                                     const char* password,
+                                     uint8_t connect_flags,
+                                     uint16_t keep_alive)
+{ 
+    struct mqtt_fixed_header fixed_header;
+    size_t remaining_length;
+    const uint8_t *const start = buf;
+    ssize_t rv;
+
+    /* pack the fixed headr */
+    fixed_header.control_type = MQTT_CONTROL_CONNECT;
+    fixed_header.control_flags = 0x00;
+
+    /* calculate remaining length and build connect_flags at the same time */
+    connect_flags = connect_flags & ~MQTT_CONNECT_RESERVED;
+    remaining_length = 10; /* size of variable header */
+
+    if (client_id == NULL) {
+        client_id = "";
+    }
+    /* For an empty client_id, a clean session is required */
+    if (client_id[0] == '\0' && !(connect_flags & MQTT_CONNECT_CLEAN_SESSION)) {
+        return MQTT_ERROR_CLEAN_SESSION_IS_REQUIRED;
+    }
+    /* mqtt_string length is strlen + 2 */
+    remaining_length += __mqtt_packed_cstrlen(client_id);
+
+    if (will_topic != NULL) {
+        uint8_t temp;
+        /* there is a will */
+        connect_flags |= MQTT_CONNECT_WILL_FLAG;
+        remaining_length += __mqtt_packed_cstrlen(will_topic);
+        
+        if (will_message == NULL) {
+            /* if there's a will there MUST be a will message */
+            return MQTT_ERROR_CONNECT_NULL_WILL_MESSAGE;
+        }
+        remaining_length += 2 + will_message_size; /* size of will_message */
+
+        /* assert that the will QOS is valid (i.e. not 3) */
+        temp = connect_flags & 0x18; /* mask to QOS */   
+        if (temp == 0x18) {
+            /* bitwise equality with QoS 3 (invalid)*/
+            return MQTT_ERROR_CONNECT_FORBIDDEN_WILL_QOS;
+        }
+    } else {
+        /* there is no will so set all will flags to zero */
+        connect_flags &= ~MQTT_CONNECT_WILL_FLAG;
+        connect_flags &= ~0x18;
+        connect_flags &= ~MQTT_CONNECT_WILL_RETAIN;
+    }
+
+    if (user_name != NULL) {
+        /* a user name is present */
+        connect_flags |= MQTT_CONNECT_USER_NAME;
+        remaining_length += __mqtt_packed_cstrlen(user_name);
+    } else {
+        connect_flags &= ~MQTT_CONNECT_USER_NAME;
+    }
+
+    if (password != NULL) {
+        /* a password is present */
+        connect_flags |= MQTT_CONNECT_PASSWORD;
+        remaining_length += __mqtt_packed_cstrlen(password);
+    } else {
+        connect_flags &= ~MQTT_CONNECT_PASSWORD;
+    }
+
+    /* fixed header length is now calculated*/
+    fixed_header.remaining_length = remaining_length;
+
+    /* pack fixed header and perform error checks */
+    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+    if (rv <= 0) {
+        /* something went wrong */
+        return rv;
+    }
+    buf += rv;
+    bufsz -= rv;
+
+    /* check that the buffer has enough space to fit the remaining length */
+    if (bufsz < fixed_header.remaining_length) {
+        return 0;
+    }
+
+    /* pack the variable header */
+    *buf++ = 0x00;
+    *buf++ = 0x04;
+    *buf++ = (uint8_t) 'M';
+    *buf++ = (uint8_t) 'Q';
+    *buf++ = (uint8_t) 'T';
+    *buf++ = (uint8_t) 'T';
+    *buf++ = MQTT_PROTOCOL_LEVEL;
+    *buf++ = connect_flags;
+    buf += __mqtt_pack_uint16(buf, keep_alive);
+
+    /* pack the payload */
+    buf += __mqtt_pack_str(buf, client_id);
+    if (connect_flags & MQTT_CONNECT_WILL_FLAG) {
+        buf += __mqtt_pack_str(buf, will_topic);
+        buf += __mqtt_pack_uint16(buf, (uint16_t)will_message_size);
+        memcpy(buf, will_message, will_message_size);
+        buf += will_message_size;
+    }
+    if (connect_flags & MQTT_CONNECT_USER_NAME) {
+        buf += __mqtt_pack_str(buf, user_name);
+    }
+    if (connect_flags & MQTT_CONNECT_PASSWORD) {
+        buf += __mqtt_pack_str(buf, password);
+    }
+
+    /* return the number of bytes that were consumed */
+    return buf - start;
+}
+
+/* CONNACK */
+ssize_t mqtt_unpack_connack_response(struct mqtt_response *mqtt_response, const uint8_t *buf) {
+    const uint8_t *const start = buf;
+    struct mqtt_response_connack *response;
+
+    /* check that remaining length is 2 */
+    if (mqtt_response->fixed_header.remaining_length != 2) {
+        return MQTT_ERROR_MALFORMED_RESPONSE;
+    }
+    
+    response = &(mqtt_response->decoded.connack);
+    /* unpack */
+    if (*buf & 0xFE) {
+        /* only bit 1 can be set */
+        return MQTT_ERROR_CONNACK_FORBIDDEN_FLAGS;
+    } else {
+        response->session_present_flag = *buf++;
+    }
+
+    if (*buf > 5u) {
+        /* only bit 1 can be set */
+        return MQTT_ERROR_CONNACK_FORBIDDEN_CODE;
+    } else {
+        response->return_code = (enum MQTTConnackReturnCode) *buf++;
+    }
+    return buf - start;
+}
+
+/* DISCONNECT */
+ssize_t mqtt_pack_disconnect(uint8_t *buf, size_t bufsz) {
+    struct mqtt_fixed_header fixed_header;
+    fixed_header.control_type = MQTT_CONTROL_DISCONNECT;
+    fixed_header.control_flags = 0;
+    fixed_header.remaining_length = 0;
+    return mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+}
+
+/* PING */
+ssize_t mqtt_pack_ping_request(uint8_t *buf, size_t bufsz) {
+    struct mqtt_fixed_header fixed_header;
+    fixed_header.control_type = MQTT_CONTROL_PINGREQ;
+    fixed_header.control_flags = 0;
+    fixed_header.remaining_length = 0;
+    return mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+}
+
+/* PUBLISH */
+ssize_t mqtt_pack_publish_request(uint8_t *buf, size_t bufsz,
+                                  const char* topic_name,
+                                  uint16_t packet_id,
+                                  void* application_message,
+                                  size_t application_message_size,
+                                  uint8_t publish_flags)
+{
+    const uint8_t *const start = buf;
+    ssize_t rv;
+    struct mqtt_fixed_header fixed_header;
+    uint32_t remaining_length;
+    uint8_t inspected_qos;
+
+    /* check for null pointers */
+    if(buf == NULL || topic_name == NULL) {
+        return MQTT_ERROR_NULLPTR;
+    }
+
+    /* inspect QoS level */
+    inspected_qos = (publish_flags & MQTT_PUBLISH_QOS_MASK) >> 1; /* mask */
+
+    /* build the fixed header */
+    fixed_header.control_type = MQTT_CONTROL_PUBLISH;
+
+    /* calculate remaining length */
+    remaining_length = (uint16_t)__mqtt_packed_cstrlen(topic_name);
+    if (inspected_qos > 0) {
+        remaining_length += 2;
+    }
+    remaining_length += (uint16_t)application_message_size;
+    fixed_header.remaining_length = remaining_length;
+
+    /* force dup to 0 if qos is 0 [Spec MQTT-3.3.1-2] */
+    if (inspected_qos == 0) {
+        publish_flags &= ~MQTT_PUBLISH_DUP;
+    }
+
+    /* make sure that qos is not 3 [Spec MQTT-3.3.1-4] */
+    if (inspected_qos == 3) {
+        return MQTT_ERROR_PUBLISH_FORBIDDEN_QOS;
+    }
+    fixed_header.control_flags = publish_flags;
+
+    /* pack fixed header */
+    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+    if (rv <= 0) {
+        /* something went wrong */
+        return rv;
+    }
+    buf += rv;
+    bufsz -= rv;
+
+    /* check that buffer is big enough */
+    if (bufsz < remaining_length) {
+        return 0;
+    }
+
+    /* pack variable header */
+    buf += __mqtt_pack_str(buf, topic_name);
+    if (inspected_qos > 0) {
+        buf += __mqtt_pack_uint16(buf, packet_id);
+    }
+
+    /* pack payload */
+    memcpy(buf, application_message, application_message_size);
+    buf += application_message_size;
+
+    return buf - start;
+}
+
+ssize_t mqtt_unpack_publish_response(struct mqtt_response *mqtt_response, const uint8_t *buf)
+{    
+    const uint8_t *const start = buf;
+    struct mqtt_fixed_header *fixed_header;
+    struct mqtt_response_publish *response;
+    
+    fixed_header = &(mqtt_response->fixed_header);
+    response = &(mqtt_response->decoded.publish);
+
+    /* get flags */
+    response->dup_flag = (fixed_header->control_flags & MQTT_PUBLISH_DUP) >> 3;
+    response->qos_level = (fixed_header->control_flags & MQTT_PUBLISH_QOS_MASK) >> 1;
+    response->retain_flag = fixed_header->control_flags & MQTT_PUBLISH_RETAIN;
+
+    /* make sure that remaining length is valid */
+    if (mqtt_response->fixed_header.remaining_length < 4) {
+        return MQTT_ERROR_MALFORMED_RESPONSE;
+    }
+
+    /* parse variable header */
+    response->topic_name_size = __mqtt_unpack_uint16(buf);
+    buf += 2;
+    response->topic_name = buf;
+    buf += response->topic_name_size;
+
+    if (response->qos_level > 0) {
+        response->packet_id = __mqtt_unpack_uint16(buf);
+        buf += 2;
+    }
+
+    /* get payload */
+    response->application_message = buf;
+    if (response->qos_level == 0) {
+        response->application_message_size = fixed_header->remaining_length - response->topic_name_size - 2;
+    } else {
+        response->application_message_size = fixed_header->remaining_length - response->topic_name_size - 4;
+    }
+    buf += response->application_message_size;
+    
+    /* return number of bytes consumed */
+    return buf - start;
+}
+
+/* PUBXXX */
+ssize_t mqtt_pack_pubxxx_request(uint8_t *buf, size_t bufsz, 
+                                 enum MQTTControlPacketType control_type,
+                                 uint16_t packet_id) 
+{
+    const uint8_t *const start = buf;
+    struct mqtt_fixed_header fixed_header;
+    ssize_t rv;
+    if (buf == NULL) {
+        return MQTT_ERROR_NULLPTR;
+    }
+
+    /* pack fixed header */
+    fixed_header.control_type = control_type;
+    if (control_type == MQTT_CONTROL_PUBREL) {
+        fixed_header.control_flags = 0x02;
+    } else {
+        fixed_header.control_flags = 0;
+    }
+    fixed_header.remaining_length = 2;
+    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+    if (rv <= 0) {
+        return rv;
+    }
+    buf += rv;
+    bufsz -= rv;
+
+    if (bufsz < fixed_header.remaining_length) {
+        return 0;
+    }
+    
+    buf += __mqtt_pack_uint16(buf, packet_id);
+
+    return buf - start;
+}
+
+ssize_t mqtt_unpack_pubxxx_response(struct mqtt_response *mqtt_response, const uint8_t *buf) 
+{
+    const uint8_t *const start = buf;
+    uint16_t packet_id;
+
+    /* assert remaining length is correct */
+    if (mqtt_response->fixed_header.remaining_length != 2) {
+        return MQTT_ERROR_MALFORMED_RESPONSE;
+    }
+
+    /* parse packet_id */
+    packet_id = __mqtt_unpack_uint16(buf);
+    buf += 2;
+
+    if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBACK) {
+        mqtt_response->decoded.puback.packet_id = packet_id;
+    } else if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBREC) {
+        mqtt_response->decoded.pubrec.packet_id = packet_id;
+    } else if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBREL) {
+        mqtt_response->decoded.pubrel.packet_id = packet_id;
+    } else {
+        mqtt_response->decoded.pubcomp.packet_id = packet_id;
+    }
+
+    return buf - start;
+}
+
+/* SUBACK */
+ssize_t mqtt_unpack_suback_response (struct mqtt_response *mqtt_response, const uint8_t *buf) {
+    const uint8_t *const start = buf;
+    uint32_t remaining_length = mqtt_response->fixed_header.remaining_length;
+    
+    /* assert remaining length is at least 3 (for packet id and at least 1 topic) */
+    if (remaining_length < 3) {
+        return MQTT_ERROR_MALFORMED_RESPONSE;
+    }
+
+    /* unpack packet_id */
+    mqtt_response->decoded.suback.packet_id = __mqtt_unpack_uint16(buf);
+    buf += 2;
+    remaining_length -= 2;
+
+    /* unpack return codes */
+    mqtt_response->decoded.suback.num_return_codes = (size_t) remaining_length;
+    mqtt_response->decoded.suback.return_codes = buf;
+    buf += remaining_length;
+
+    return buf - start;
+}
+
+/* SUBSCRIBE */
+ssize_t mqtt_pack_subscribe_request(uint8_t *buf, size_t bufsz, unsigned int packet_id, ...) {
+    va_list args;
+    const uint8_t *const start = buf;
+    ssize_t rv;
+    struct mqtt_fixed_header fixed_header;
+    unsigned int num_subs = 0;
+    unsigned int i;
+    const char *topic[MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
+    uint8_t max_qos[MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
+
+    /* parse all subscriptions */
+    va_start(args, packet_id);
+    while(1) {
+        topic[num_subs] = va_arg(args, const char*);
+        if (topic[num_subs] == NULL) {
+            /* end of list */
+            break;
+        }
+
+        max_qos[num_subs] = (uint8_t) va_arg(args, unsigned int);
+
+        ++num_subs;
+        if (num_subs >= MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS) {
+            return MQTT_ERROR_SUBSCRIBE_TOO_MANY_TOPICS;
+        }
+    }
+    va_end(args);
+
+    /* build the fixed header */
+    fixed_header.control_type = MQTT_CONTROL_SUBSCRIBE;
+    fixed_header.control_flags = 2u;
+    fixed_header.remaining_length = 2u; /* size of variable header */
+    for(i = 0; i < num_subs; ++i) {
+        /* payload is topic name + max qos (1 byte) */
+        fixed_header.remaining_length += __mqtt_packed_cstrlen(topic[i]) + 1;
+    }
+
+    /* pack the fixed header */
+    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+    if (rv <= 0) {
+        return rv;
+    }
+    buf += rv;
+    bufsz -= rv;
+
+    /* check that the buffer has enough space */
+    if (bufsz < fixed_header.remaining_length) {
+        return 0;
+    }
+    
+    
+    /* pack variable header */
+    buf += __mqtt_pack_uint16(buf, packet_id);
+
+
+    /* pack payload */
+    for(i = 0; i < num_subs; ++i) {
+        buf += __mqtt_pack_str(buf, topic[i]);
+        *buf++ = max_qos[i];
+    }
+
+    return buf - start;
+}
+
+/* UNSUBACK */
+ssize_t mqtt_unpack_unsuback_response(struct mqtt_response *mqtt_response, const uint8_t *buf) 
+{
+    const uint8_t *const start = buf;
+
+    if (mqtt_response->fixed_header.remaining_length != 2) {
+        return MQTT_ERROR_MALFORMED_RESPONSE;
+    }
+
+    /* parse packet_id */
+    mqtt_response->decoded.unsuback.packet_id = __mqtt_unpack_uint16(buf);
+    buf += 2;
+
+    return buf - start;
+}
+
+/* UNSUBSCRIBE */
+ssize_t mqtt_pack_unsubscribe_request(uint8_t *buf, size_t bufsz, unsigned int packet_id, ...) {
+    va_list args;
+    const uint8_t *const start = buf;
+    ssize_t rv;
+    struct mqtt_fixed_header fixed_header;
+    unsigned int num_subs = 0;
+    unsigned int i;
+    const char *topic[MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
+
+    /* parse all subscriptions */
+    va_start(args, packet_id);
+    while(1) {
+        topic[num_subs] = va_arg(args, const char*);
+        if (topic[num_subs] == NULL) {
+            /* end of list */
+            break;
+        }
+
+        ++num_subs;
+        if (num_subs >= MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS) {
+            return MQTT_ERROR_UNSUBSCRIBE_TOO_MANY_TOPICS;
+        }
+    }
+    va_end(args);
+
+    /* build the fixed header */
+    fixed_header.control_type = MQTT_CONTROL_UNSUBSCRIBE;
+    fixed_header.control_flags = 2u;
+    fixed_header.remaining_length = 2u; /* size of variable header */
+    for(i = 0; i < num_subs; ++i) {
+        /* payload is topic name */
+        fixed_header.remaining_length += __mqtt_packed_cstrlen(topic[i]);
+    }
+
+    /* pack the fixed header */
+    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
+    if (rv <= 0) {
+        return rv;
+    }
+    buf += rv;
+    bufsz -= rv;
+
+    /* check that the buffer has enough space */
+    if (bufsz < fixed_header.remaining_length) {
+        return 0;
+    }
+
+    /* pack variable header */
+    buf += __mqtt_pack_uint16(buf, packet_id);
+
+
+    /* pack payload */
+    for(i = 0; i < num_subs; ++i) {
+        buf += __mqtt_pack_str(buf, topic[i]);
+    }
+
+    return buf - start;
+}
+
+/* MESSAGE QUEUE */
+void mqtt_mq_init(struct mqtt_message_queue *mq, void *buf, size_t bufsz) 
+{  
+    if(buf != NULL)
+    {
+        mq->mem_start = buf;
+        mq->mem_end = (unsigned char*)buf + bufsz;
+        mq->curr = buf;
+        mq->queue_tail = mq->mem_end;
+        mq->curr_sz = mqtt_mq_currsz(mq);
+    }
+}
+
+struct mqtt_queued_message* mqtt_mq_register(struct mqtt_message_queue *mq, size_t nbytes)
+{
+    /* make queued message header */
+    --(mq->queue_tail);
+    mq->queue_tail->start = mq->curr;
+    mq->queue_tail->size = nbytes;
+    mq->queue_tail->state = MQTT_QUEUED_UNSENT;
+
+    /* move curr and recalculate curr_sz */
+    mq->curr += nbytes;
+    mq->curr_sz = mqtt_mq_currsz(mq);
+
+    return mq->queue_tail;
+}
+
+void mqtt_mq_clean(struct mqtt_message_queue *mq) {
+    struct mqtt_queued_message *new_head;
+
+    for(new_head = mqtt_mq_get(mq, 0); new_head >= mq->queue_tail; --new_head) {
+        if (new_head->state != MQTT_QUEUED_COMPLETE) break;
+    }
+    
+    /* check if everything can be removed */
+    if (new_head < mq->queue_tail) {
+        mq->curr = mq->mem_start;
+        mq->queue_tail = mq->mem_end;
+        mq->curr_sz = mqtt_mq_currsz(mq);
+        return;
+    } else if (new_head == mqtt_mq_get(mq, 0)) {
+        /* do nothing */
+        return;
+    }
+
+    /* move buffered data */
+    {
+        size_t n = mq->curr - new_head->start;
+        size_t removing = new_head->start - (uint8_t*) mq->mem_start;
+        memmove(mq->mem_start, new_head->start, n);
+        mq->curr = (unsigned char*)mq->mem_start + n;
+      
+
+        /* move queue */
+        {
+            ssize_t new_tail_idx = new_head - mq->queue_tail;
+            memmove(mqtt_mq_get(mq, new_tail_idx), mq->queue_tail, sizeof(struct mqtt_queued_message) * (new_tail_idx + 1));
+            mq->queue_tail = mqtt_mq_get(mq, new_tail_idx);
+          
+            {
+                /* bump back start's */
+                ssize_t i = 0;
+                for(; i < new_tail_idx + 1; ++i) {
+                    mqtt_mq_get(mq, i)->start -= removing;
+                }
+            }
+        }
+    }
+
+    /* get curr_sz */
+    mq->curr_sz = mqtt_mq_currsz(mq);
+}
+
+struct mqtt_queued_message* mqtt_mq_find(struct mqtt_message_queue *mq, enum MQTTControlPacketType control_type, uint16_t *packet_id)
+{
+    struct mqtt_queued_message *curr;
+    for(curr = mqtt_mq_get(mq, 0); curr >= mq->queue_tail; --curr) {
+        if (curr->control_type == control_type) {
+            if ((packet_id == NULL && curr->state != MQTT_QUEUED_COMPLETE) ||
+                (packet_id != NULL && *packet_id == curr->packet_id)) {
+                return curr;
+            }
+        }
+    }
+    return NULL;
+}
+
+
+/* RESPONSE UNPACKING */
+ssize_t mqtt_unpack_response(struct mqtt_response* response, const uint8_t *buf, size_t bufsz) {
+    const uint8_t *const start = buf;
+    ssize_t rv = mqtt_unpack_fixed_header(response, buf, bufsz);
+    if (rv <= 0) return rv;
+    else buf += rv;
+    switch(response->fixed_header.control_type) {
+        case MQTT_CONTROL_CONNACK:
+            rv = mqtt_unpack_connack_response(response, buf);
+            break;
+        case MQTT_CONTROL_PUBLISH:
+            rv = mqtt_unpack_publish_response(response, buf);
+            break;
+        case MQTT_CONTROL_PUBACK:
+            rv = mqtt_unpack_pubxxx_response(response, buf);
+            break;
+        case MQTT_CONTROL_PUBREC:
+            rv = mqtt_unpack_pubxxx_response(response, buf);
+            break;
+        case MQTT_CONTROL_PUBREL:
+            rv = mqtt_unpack_pubxxx_response(response, buf);
+            break;
+        case MQTT_CONTROL_PUBCOMP:
+            rv = mqtt_unpack_pubxxx_response(response, buf);
+            break;
+        case MQTT_CONTROL_SUBACK:
+            rv = mqtt_unpack_suback_response(response, buf);
+            break;
+        case MQTT_CONTROL_UNSUBACK:
+            rv = mqtt_unpack_unsuback_response(response, buf);
+            break;
+        case MQTT_CONTROL_PINGRESP:
+            return rv;
+        default:
+            return MQTT_ERROR_RESPONSE_INVALID_CONTROL_TYPE;
+    }
+
+    if (rv < 0) return rv;
+    buf += rv;
+    return buf - start;
+}
+
+/* EXTRA DETAILS */
+ssize_t __mqtt_pack_uint16(uint8_t *buf, uint16_t integer)
+{
+  uint16_t integer_htons = MQTT_PAL_HTONS(integer);
+  memcpy(buf, &integer_htons, 2);
+  return 2;
+}
+
+uint16_t __mqtt_unpack_uint16(const uint8_t *buf)
+{
+  uint16_t integer_htons;
+  memcpy(&integer_htons, buf, 2);
+  return MQTT_PAL_NTOHS(integer_htons);
+}
+
+ssize_t __mqtt_pack_str(uint8_t *buf, const char* str) {
+    uint16_t length = (uint16_t)strlen(str);
+    int i = 0;
+     /* pack string length */
+    buf += __mqtt_pack_uint16(buf, length);
+
+    /* pack string */
+    for(; i < length; ++i) {
+        *(buf++) = str[i];
+    }
+    
+    /* return number of bytes consumed */
+    return length + 2;
+}
+
+static const char *MQTT_ERRORS_STR[] = {
+    "MQTT_UNKNOWN_ERROR",
+    __ALL_MQTT_ERRORS(GENERATE_STRING)
+};
+
+const char* mqtt_error_str(enum MQTTErrors error) {
+    int offset = error - MQTT_ERROR_UNKNOWN;
+    if (offset >= 0) {
+        return MQTT_ERRORS_STR[offset];
+    } else if (error == 0) {
+        return "MQTT_ERROR: Buffer too small.";
+    } else if (error > 0) {
+        return "MQTT_OK";
+    } else {
+        return MQTT_ERRORS_STR[0];
+    }
+}
+
+/** @endcond*/
diff --git a/deps/MQTT-C/src/mqtt_pal.c b/deps/MQTT-C/src/mqtt_pal.c
new file mode 100644
index 0000000000000000000000000000000000000000..5cd37e40e50c82adfd24df339d8fef3cee540815
--- /dev/null
+++ b/deps/MQTT-C/src/mqtt_pal.c
@@ -0,0 +1,203 @@
+/*
+MIT License
+
+Copyright(c) 2018 Liam Bindle
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <mqtt.h>
+
+/** 
+ * @file 
+ * @brief Implements @ref mqtt_pal_sendall and @ref mqtt_pal_recvall and 
+ *        any platform-specific helpers you'd like.
+ * @cond Doxygen_Suppress
+ */
+
+
+#ifdef MQTT_USE_MBEDTLS
+#include <mbedtls/ssl.h>
+
+ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags) {
+    size_t sent = 0;
+    while(sent < len) {
+        int rv = mbedtls_ssl_write(fd, buf + sent, len - sent);
+        if (rv < 0) {
+            if (rv == MBEDTLS_ERR_SSL_WANT_READ ||
+                rv == MBEDTLS_ERR_SSL_WANT_WRITE
+#if defined(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS)
+                || rv == MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS
+#endif
+#if defined(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS)
+                || rv == MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS
+#endif
+                ) {
+                /* should call mbedtls_ssl_writer later again */
+                break;
+            }
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+        sent += (size_t) rv;
+    }
+    return sent;
+}
+
+ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags) {
+    const void *const start = buf;
+    int rv;
+    do {
+        rv = mbedtls_ssl_read(fd, buf, bufsz);
+        if (rv < 0) {
+            if (rv == MBEDTLS_ERR_SSL_WANT_READ ||
+                rv == MBEDTLS_ERR_SSL_WANT_WRITE
+#if defined(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS)
+                || rv == MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS
+#endif
+#if defined(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS)
+                || rv == MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS
+#endif
+                ) {
+                /* should call mbedtls_ssl_read later again */
+                break;
+            }
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+        buf = (char*)buf + rv;
+        bufsz -= rv;
+    } while (rv > 0);
+
+    return buf - start;
+}
+
+#elif defined(MQTT_USE_BIO)
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags) {
+    size_t sent = 0;
+    while(sent < len) {
+        int tmp = BIO_write(fd, buf + sent, len - sent);
+        if (tmp > 0) {
+            sent += (size_t) tmp;
+        } else if (tmp <= 0 && !BIO_should_retry(fd)) {
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+    }
+    
+    return sent;
+}
+
+ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags) {
+    const void *const start = buf;
+    int rv;
+    do {
+        rv = BIO_read(fd, buf, bufsz);
+        if (rv > 0) {
+            /* successfully read bytes from the socket */
+            buf += rv;
+            bufsz -= rv;
+        } else if (!BIO_should_retry(fd)) {
+            /* an error occurred that wasn't "nothing to read". */
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+    } while (!BIO_should_read(fd));
+
+    return (ssize_t)(buf - start);
+}
+
+#elif defined(__unix__) || defined(__APPLE__)
+
+#include <errno.h>
+
+ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags) {
+    size_t sent = 0;
+    while(sent < len) {
+        ssize_t tmp = send(fd, buf + sent, len - sent, flags);
+        if (tmp < 1) {
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+        sent += (size_t) tmp;
+    }
+    return sent;
+}
+
+ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags) {
+    const void *const start = buf;
+    ssize_t rv;
+    do {
+        rv = recv(fd, buf, bufsz, flags);
+        if (rv > 0) {
+            /* successfully read bytes from the socket */
+            buf += rv;
+            bufsz -= rv;
+        } else if (rv < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
+            /* an error occurred that wasn't "nothing to read". */
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+    } while (rv > 0);
+
+    return buf - start;
+}
+
+#elif defined(_MSC_VER)
+
+#include <errno.h>
+
+ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags) {
+    size_t sent = 0;
+    while(sent < len) {
+        ssize_t tmp = send(fd, (char*)buf + sent, len - sent, flags);
+        if (tmp < 1) {
+            return MQTT_ERROR_SOCKET_ERROR;
+        }
+        sent += (size_t) tmp;
+    }
+    return sent;
+}
+
+ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags) {
+    const char *const start = buf;
+    ssize_t rv;
+    do {
+        rv = recv(fd, buf, bufsz, flags);
+        if (rv > 0) {
+            /* successfully read bytes from the socket */
+            buf = (char*)buf + rv;
+            bufsz -= rv;
+        } else if (rv < 0) {
+            int err = WSAGetLastError();
+            if (err != WSAEWOULDBLOCK) {
+                /* an error occurred that wasn't "nothing to read". */
+                return MQTT_ERROR_SOCKET_ERROR;
+            }
+        }
+    } while (rv > 0);
+
+    return (ssize_t)((char*)buf - start);
+}
+
+#else
+
+#error No PAL!
+
+#endif
+
+/** @endcond */
diff --git a/deps/MQTT-C/tests.c b/deps/MQTT-C/tests.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b1377124dc2c0a44916e2be613f97125586e9f8
--- /dev/null
+++ b/deps/MQTT-C/tests.c
@@ -0,0 +1,1031 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <time.h>
+
+#if !defined(WIN32)
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <sys/wait.h>
+#else
+#include <ws2tcpip.h>
+
+/* Some shortcuts to call winapi in a posix-like way */
+#define close(sock)         closesocket(sock)
+#define usleep(usec)        Sleep((usec) / 1000)
+#endif
+
+
+#include <mqtt.h>
+#include "examples/templates/posix_sockets.h"
+
+void make_socket_blocking(int socket)
+{
+#if !defined(WIN32)
+    fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
+#else
+    int iMode = 0;
+    ioctlsocket(socket, FIONBIO, &iMode);
+#endif
+}
+
+
+
+const char* addr = "test.mosquitto.org";
+const char* port = "1883";
+
+static void TEST__framing__fixed_header(void** state) {
+    static uint32_t remaining_lengths[] = { 0, 127, 128, 16383, 16384, 2097151, 2097152, 268435455, 268435456 };
+    static ssize_t  actual_lengths[] = { 2, 2, 3, 3, 4, 4, 5, 5, MQTT_ERROR_INVALID_REMAINING_LENGTH };
+    uint8_t correct_buf[1024];
+    uint8_t buf[1024];
+    struct mqtt_response response;
+    struct mqtt_fixed_header *fixed_header = &response.fixed_header;
+    ssize_t rv;
+    size_t k;
+
+    /*
+     * remaining length tests on pack and unpack
+     */
+    for(k = 0; k < sizeof(remaining_lengths)/sizeof(remaining_lengths[0]); ++k) {
+        fixed_header->control_type = MQTT_CONTROL_CONNECT;
+        fixed_header->control_flags = 0;
+        fixed_header->remaining_length = remaining_lengths[k];
+
+        /* the length is a necessary lie */
+        rv = mqtt_pack_fixed_header(buf, sizeof(buf) + remaining_lengths[k], fixed_header);
+        assert_true(rv == actual_lengths[k]);
+
+        if(k == 8)
+            buf[4] = 0x86;
+
+        /* another unavoidable lie */
+    rv = mqtt_unpack_fixed_header(&response, buf, sizeof(buf) + remaining_lengths[k]);
+    assert_true(rv == actual_lengths[k]);
+
+        if(k != 8)
+            assert_true(remaining_lengths[k] == response.fixed_header.remaining_length);
+    }
+
+    /* sanity check with valid fixed_header */
+    correct_buf[0] = (MQTT_CONTROL_CONNECT << 4) | 0;
+    correct_buf[1] = 193u;
+    correct_buf[2] = 2u;
+
+    /* check that unpack is correct */
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 3);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_CONNECT);
+    assert_true(fixed_header->control_flags == 0);
+    assert_true(fixed_header->remaining_length == 321);
+
+    /* check that unpack is correct */
+    rv = mqtt_pack_fixed_header(buf, sizeof(buf), fixed_header);
+    assert_true(rv == 3);
+    assert_true(memcmp(correct_buf, buf, 3) == 0);
+
+
+    /* check that invalid flags are caught */
+    correct_buf[0] = (MQTT_CONTROL_CONNECT << 4) | 1;
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == MQTT_ERROR_CONTROL_INVALID_FLAGS);
+
+    /* check that valid flags are ok when there is a required bit */
+    correct_buf[0] = (MQTT_CONTROL_PUBREL << 4) | 2;
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 3);
+
+    /* check that invalid flags are ok when there is a required bit */
+    correct_buf[0] = (MQTT_CONTROL_PUBREL << 4) | 3;
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == MQTT_ERROR_CONTROL_INVALID_FLAGS);
+
+    /* check that valid flags are ok when there are optional flags */
+    correct_buf[0] = (MQTT_CONTROL_PUBLISH << 4) | 0xF;
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 3);
+    
+    correct_buf[0] = (MQTT_CONTROL_PUBLISH << 4) | 3;
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 3);
+
+
+    /* check that remaining length is packed/unpacked correctly */
+    correct_buf[0] = (MQTT_CONTROL_CONNECT << 4) | 0;
+    correct_buf[1] = 64;
+
+    /* check that unpack is correct */
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 2);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_CONNECT);
+    assert_true(fixed_header->control_flags == 0);
+    assert_true(fixed_header->remaining_length == 64);
+
+    /* check that unpack is correct */
+    rv = mqtt_pack_fixed_header(buf, sizeof(buf), fixed_header);
+    assert_true(rv == 2);
+    assert_true(memcmp(correct_buf, buf, 2) == 0);
+
+
+    /* check that remaining length is packed/unpacked correctly */
+    correct_buf[0] = (MQTT_CONTROL_CONNECT << 4) | 0;
+    correct_buf[1] = 127;
+
+    /* check that unpack is correct */
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 2);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_CONNECT);
+    assert_true(fixed_header->control_flags == 0);
+    assert_true(fixed_header->remaining_length == 127);
+
+    /* check that unpack is correct */
+    rv = mqtt_pack_fixed_header(buf, sizeof(buf), fixed_header);
+    assert_true(rv == 2);
+    assert_true(memcmp(correct_buf, buf, 2) == 0);
+
+
+    /* check that remaining length is packed/unpacked correctly */
+    correct_buf[0] = (MQTT_CONTROL_CONNECT << 4) | 0;
+    correct_buf[1] = 128;
+    correct_buf[2] = 1;
+
+    /* check that unpack is correct */
+    rv = mqtt_unpack_fixed_header(&response, correct_buf, sizeof(correct_buf));
+    assert_true(rv == 3);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_CONNECT);
+    assert_true(fixed_header->control_flags == 0);
+    assert_true(fixed_header->remaining_length == 128);
+
+    /* check that unpack is correct */
+    rv = mqtt_pack_fixed_header(buf, sizeof(buf), fixed_header);
+    assert_true(rv == 3);
+    assert_true(memcmp(correct_buf, buf, 3) == 0);
+
+    /* check bad inputs */
+    assert_true( mqtt_pack_fixed_header(NULL, 5, fixed_header) == MQTT_ERROR_NULLPTR );
+    assert_true( mqtt_pack_fixed_header(buf, 5, NULL) == MQTT_ERROR_NULLPTR );
+    assert_true( mqtt_pack_fixed_header(buf, 2, fixed_header) == 0 );
+
+    assert_true( mqtt_unpack_fixed_header(NULL, buf, 5) == MQTT_ERROR_NULLPTR );
+    assert_true( mqtt_unpack_fixed_header(&response, NULL, 5) == MQTT_ERROR_NULLPTR );
+    assert_true( mqtt_unpack_fixed_header(&response, buf, 2) == 0 );
+}
+
+static void TEST__framing__connect(void** state) {
+    uint8_t buf[256];
+    ssize_t rv;
+    const uint8_t correct_bytes[] = {
+        (MQTT_CONTROL_CONNECT << 4) | 0, 16,
+        0, 4, 'M', 'Q', 'T', 'T', MQTT_PROTOCOL_LEVEL, 0, 0, 120u, 
+        0, 4, 'l', 'i', 'a', 'm'
+    };
+    const uint8_t correct_bytes2[] = {
+        (MQTT_CONTROL_CONNECT << 4) | 0, 51,
+        0, 4, 'M', 'Q', 'T', 'T', MQTT_PROTOCOL_LEVEL, 
+        MQTT_CONNECT_WILL_FLAG | MQTT_CONNECT_USER_NAME | MQTT_CONNECT_PASSWORD, 
+        0, 120u, 
+        0, 4, 'l', 'i', 'a', 'm',
+        0, 9, 'w', 'i', 'l', 'l', 't', 'o', 'p', 'i', 'c',
+        0, 2, 'h', 'i',
+        0, 8, 'u', 's', 'e', 'r', 'n', 'a', 'm', 'e',
+        0, 8, 'p', 'a', 's', 's', 'w', 'o', 'r', 'd'
+    };
+    const uint8_t correct_bytes_empty_client_id[] = {
+        (MQTT_CONTROL_CONNECT << 4) | 0, 12,
+        0, 4, 'M', 'Q', 'T', 'T', MQTT_PROTOCOL_LEVEL, MQTT_CONNECT_CLEAN_SESSION,
+        0, 120u, 0, 0
+    };
+
+    struct mqtt_response response;
+    struct mqtt_fixed_header *fixed_header = &response.fixed_header;
+
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), "liam", NULL, NULL, 0, NULL, NULL, 0, 120u);
+    assert_true(rv == sizeof(correct_bytes));
+
+    /* check that fixed header is correct */
+    rv = mqtt_unpack_fixed_header(&response, buf, rv);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_CONNECT);
+    assert_true(fixed_header->remaining_length == 16);
+
+    /* check that memory is correct */
+    assert_true(memcmp(correct_bytes, buf, sizeof(correct_bytes)) == 0);
+
+    /* check that will flags are okay and user name and password */
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), "liam", "willtopic", "hi", 2, "username", "password", 0, 120u);
+    assert_true(rv == sizeof(correct_bytes2));
+
+    /* check that memory is correct */
+    assert_true(memcmp(correct_bytes2, buf, sizeof(correct_bytes2)) == 0);
+
+    /* check that the empty client_id is packed correctly */
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), NULL, NULL, NULL, 0, NULL, NULL, MQTT_CONNECT_CLEAN_SESSION, 120u);
+    assert_true(rv == sizeof(correct_bytes_empty_client_id));
+
+    /* check that memory is correct */
+    assert_true(memcmp(correct_bytes_empty_client_id, buf, sizeof(correct_bytes_empty_client_id)) == 0);
+
+    /* Check that empty client_id is rejected without MQTT_CONNECT_CLEAN_SESSION */
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), NULL, NULL, NULL, 0, NULL, NULL, 0, 120u);
+    assert_int_equal(rv, MQTT_ERROR_CLEAN_SESSION_IS_REQUIRED);
+}
+
+static void TEST__framing__publish(void** state) {
+    uint8_t buf[256];
+    ssize_t rv;
+    const uint8_t correct_bytes[] = {
+        (MQTT_CONTROL_PUBLISH << 4) | MQTT_PUBLISH_RETAIN, 18,
+        0, 6, 't', 'o', 'p', 'i', 'c', '1',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+    };
+    struct mqtt_response mqtt_response;
+    struct mqtt_response_publish *response;
+    response = &(mqtt_response.decoded.publish);
+    
+    
+    rv = mqtt_pack_publish_request(buf, 256, "topic1", 23, "0123456789", 10, MQTT_PUBLISH_RETAIN);
+    assert_true(rv == 20);
+    assert_true(memcmp(buf, correct_bytes, 20) == 0);
+
+    rv = mqtt_unpack_fixed_header(&mqtt_response, buf, 20);
+    assert_true(rv == 2);
+    rv = mqtt_unpack_publish_response(&mqtt_response, buf + 2);
+    assert_true(response->qos_level == 0);
+    assert_true(response->retain_flag == 1);
+    assert_true(response->dup_flag == 0);
+    assert_true(response->topic_name_size == 6);
+    assert_true(memcmp(response->topic_name, "topic1", 6) == 0);
+    assert_true(response->application_message_size == 10);
+    assert_true(memcmp(response->application_message, "0123456789", 10) == 0);
+}
+
+static void TEST__utility__connect_disconnect(void** state) {
+    uint8_t buf[256];
+    struct mqtt_client client;
+    ssize_t rv;
+    struct mqtt_response mqtt_response;
+
+    client.socketfd = open_nb_socket(addr, port);
+    make_socket_blocking(client.socketfd);
+    assert_true(client.socketfd != -1);
+
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), "liam-123456", NULL, NULL, 0, NULL, NULL, 0, 30);
+    assert_true(rv > 0);
+    assert_true(send(client.socketfd, buf, rv, 0) != -1);
+
+    /* receive connack */
+    assert_true(recv(client.socketfd, buf, sizeof(buf), 0) != -1);
+    rv = mqtt_unpack_fixed_header(&mqtt_response, buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(mqtt_unpack_connack_response(&mqtt_response, buf + rv) > 0);
+    assert_true(mqtt_response.decoded.connack.return_code == MQTT_CONNACK_ACCEPTED);
+
+    /* disconnect */
+    rv = mqtt_pack_disconnect(buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(send(client.socketfd, buf, rv, 0) != -1);
+
+    /*close the socket */
+    close(client.socketfd);
+}
+
+static void TEST__framing__connack(void** state) {
+    uint8_t buf[] = {
+        (MQTT_CONTROL_CONNACK << 4) | 0, 2,        
+        0, MQTT_CONNACK_ACCEPTED
+    };
+    struct mqtt_response mqtt_response;
+    ssize_t rv = mqtt_unpack_fixed_header(&mqtt_response, buf, sizeof(buf));
+    assert_true(rv == 2);
+    assert_true(mqtt_response.fixed_header.control_type == MQTT_CONTROL_CONNACK);
+
+    /* unpack response */
+    rv = mqtt_unpack_connack_response(&mqtt_response, buf+2);
+    assert_true(rv == 2);
+    assert_true(mqtt_response.decoded.connack.session_present_flag == 0);
+    assert_true(mqtt_response.decoded.connack.return_code == MQTT_CONNACK_ACCEPTED);
+}
+
+static void TEST__framing__pubxxx(void** state) {
+    uint8_t buf[256];
+    ssize_t rv;
+    struct mqtt_response response;
+    uint8_t puback_correct_bytes[] = {
+        MQTT_CONTROL_PUBACK << 4, 2,
+        0, 213u
+    };
+    uint8_t pubrec_correct_bytes[] = {
+        MQTT_CONTROL_PUBREC << 4, 2,
+        0, 213u
+    };
+    uint8_t pubrel_correct_bytes[] = {
+        MQTT_CONTROL_PUBREL << 4 | 2u, 2,
+        0, 213u
+    };
+    uint8_t pubcomp_correct_bytes[] = {
+        MQTT_CONTROL_PUBCOMP << 4, 2,
+        0, 213u
+    };
+
+    /* puback */
+    rv = mqtt_pack_pubxxx_request(buf, 256, MQTT_CONTROL_PUBACK, 213u);
+    assert_true(rv == 4);
+    assert_true(memcmp(puback_correct_bytes, buf, 4) == 0);
+
+    rv = mqtt_unpack_fixed_header(&response, buf, 256);
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_PUBACK);
+    rv = mqtt_unpack_pubxxx_response(&response, buf + 2);
+    assert_true(rv == 2);
+    assert_true(response.decoded.puback.packet_id == 213u);
+
+    /* pubrec */
+    rv = mqtt_pack_pubxxx_request(buf, 256, MQTT_CONTROL_PUBREC, 213u);
+    assert_true(rv == 4);
+    assert_true(memcmp(pubrec_correct_bytes, buf, 4) == 0);
+
+    rv = mqtt_unpack_fixed_header(&response, buf, 256);
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_PUBREC);
+    rv = mqtt_unpack_pubxxx_response(&response, buf + 2);
+    assert_true(rv == 2);
+    assert_true(response.decoded.pubrec.packet_id == 213u);
+
+    /* pubrel */
+    rv = mqtt_pack_pubxxx_request(buf, 256, MQTT_CONTROL_PUBREL, 213u);
+    assert_true(rv == 4);
+    assert_true(memcmp(pubrel_correct_bytes, buf, 4) == 0);
+
+    rv = mqtt_unpack_fixed_header(&response, buf, 256);
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_PUBREL);
+    rv = mqtt_unpack_pubxxx_response(&response, buf + 2);
+    assert_true(rv == 2);
+    assert_true(response.decoded.pubrel.packet_id == 213u);
+
+    /* pubcomp */
+    rv = mqtt_pack_pubxxx_request(buf, 256, MQTT_CONTROL_PUBCOMP, 213u);
+    assert_true(rv == 4);
+    assert_true(memcmp(pubcomp_correct_bytes, buf, 4) == 0);
+
+    rv = mqtt_unpack_fixed_header(&response, buf, 256);
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_PUBCOMP);
+    rv = mqtt_unpack_pubxxx_response(&response, buf + 2);
+    assert_true(rv == 2);
+    assert_true(response.decoded.pubcomp.packet_id == 213u);
+}
+
+static void TEST__framing__subscribe(void** state) {
+    uint8_t buf[256];
+    ssize_t rv;
+    const uint8_t correct[] = {
+        MQTT_CONTROL_SUBSCRIBE << 4 | 2u, 23,
+        0, 132u,
+        0, 3, 'a', '/', 'b', 0u,
+        0, 5, 'b', 'b', 'b', '/', 'x', 1u,
+        0, 4, 'c', '/', 'd', 'd', 0u,
+    };
+
+    rv = mqtt_pack_subscribe_request(buf, 256, 132, "a/b", 0, "bbb/x", 1, "c/dd", 0, NULL);
+    assert_true(rv == 25);
+    assert_true(memcmp(buf, correct, 25) == 0);
+}
+
+static void TEST__framing__suback(void** state) {
+    ssize_t rv;
+    struct mqtt_response response;
+    const uint8_t buf[] = {
+        MQTT_CONTROL_SUBACK << 4, 5,
+        0, 132u,
+        MQTT_SUBACK_SUCCESS_MAX_QOS_0,
+        MQTT_SUBACK_SUCCESS_MAX_QOS_1,
+        MQTT_SUBACK_FAILURE
+    };
+    rv = mqtt_unpack_fixed_header(&response, buf, sizeof(buf));
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_SUBACK);
+    rv = mqtt_unpack_suback_response(&response, buf + 2);
+    assert_true(rv == 5);
+    assert_true(response.decoded.suback.packet_id == 132u);
+    assert_true(response.decoded.suback.num_return_codes == 3);
+    assert_true(response.decoded.suback.return_codes[0] == MQTT_SUBACK_SUCCESS_MAX_QOS_0);
+    assert_true(response.decoded.suback.return_codes[1] == MQTT_SUBACK_SUCCESS_MAX_QOS_1);
+    assert_true(response.decoded.suback.return_codes[2] == MQTT_SUBACK_FAILURE);
+}
+
+static void TEST__framing__unsubscribe(void** state) {
+    uint8_t buf[256];
+    ssize_t rv;
+    const uint8_t correct[] = {
+        MQTT_CONTROL_UNSUBSCRIBE << 4 | 2u, 20,
+        0, 132u,
+        0, 3, 'a', '/', 'b',
+        0, 5, 'b', 'b', 'b', '/', 'x',
+        0, 4, 'c', '/', 'd', 'd',
+    };
+
+    rv = mqtt_pack_unsubscribe_request(buf, 256, 132, "a/b", "bbb/x", "c/dd", NULL);
+    assert_true(rv == 22);
+    assert_true(memcmp(buf, correct, sizeof(correct)) == 0);
+}
+
+static void TEST__framing__unsuback(void** state) {
+    uint8_t buf[] = {
+        MQTT_CONTROL_UNSUBACK << 4, 2,
+        0, 213u
+    };
+    ssize_t rv;
+    struct mqtt_response response;
+
+    rv = mqtt_unpack_fixed_header(&response, buf, 4);
+    assert_true(rv == 2);
+    assert_true(response.fixed_header.control_type == MQTT_CONTROL_UNSUBACK);
+    rv = mqtt_unpack_unsuback_response(&response, buf + 2);
+    assert_true(rv == 2);
+    assert_true(response.decoded.unsuback.packet_id == 213u);
+}
+
+static void TEST__framing__disconnect(void** state) {
+    uint8_t buf[2];
+    assert_true(mqtt_pack_disconnect(buf, 2) == 2);   
+}
+
+static void TEST__framing__ping(void** state) {
+    uint8_t buf[2];
+    struct mqtt_response response;
+    struct mqtt_fixed_header *fixed_header = &response.fixed_header;
+    assert_true(mqtt_pack_ping_request(buf, 2) == 2);   
+    assert_true(mqtt_unpack_fixed_header(&response, buf, 2) == 2);
+    assert_true(fixed_header->control_type == MQTT_CONTROL_PINGREQ);
+    assert_true(fixed_header->remaining_length == 0);
+}
+
+static void TEST__utility__ping(void** state) {
+    uint8_t buf[256];
+    struct mqtt_client client;
+    ssize_t rv;
+    struct mqtt_response mqtt_response;
+
+    client.socketfd = open_nb_socket(addr, port);
+    make_socket_blocking(client.socketfd);
+    assert_true(client.socketfd != -1);
+
+    rv = mqtt_pack_connection_request(buf, sizeof(buf), "this-is-me", NULL, NULL, 0, NULL, NULL, 0, 30);
+    assert_true(rv > 0);
+    assert_true(send(client.socketfd, buf, rv, 0) != -1);
+
+    /* receive connack */
+    assert_true(recv(client.socketfd, buf, sizeof(buf), 0) != -1);
+    rv = mqtt_unpack_fixed_header(&mqtt_response, buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(mqtt_unpack_connack_response(&mqtt_response, buf + rv) > 0);
+    assert_true(mqtt_response.decoded.connack.return_code == MQTT_CONNACK_ACCEPTED);
+
+    /* send ping request */
+    rv = mqtt_pack_ping_request(buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(send(client.socketfd, buf, rv, 0) != -1);
+
+    /* receive ping response */
+    assert_true(recv(client.socketfd, buf, sizeof(buf), 0) != -1);
+    rv = mqtt_unpack_fixed_header(&mqtt_response, buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(mqtt_response.fixed_header.control_type == MQTT_CONTROL_PINGRESP);
+
+    /* disconnect */
+    rv = mqtt_pack_disconnect(buf, sizeof(buf));
+    assert_true(rv > 0);
+    assert_true(send(client.socketfd, buf, rv, 0) != -1);
+
+    /*close the socket */
+    close(client.socketfd);
+}
+
+#define QM_SZ (int) sizeof(struct mqtt_queued_message)
+static void TEST__utility__message_queue(void **unused) {
+    uint8_t mem[32 + 4*QM_SZ];
+    struct mqtt_message_queue mq;
+    struct mqtt_queued_message *tail;
+    mqtt_mq_init(&mq, mem, sizeof(mem));
+
+    /* check that it fills up correctly */
+    assert_true(mqtt_mq_length(&mq) == 0);
+    assert_true(mq.curr_sz == 32 + 3*QM_SZ);
+    memset(mq.curr, 0, 8);
+    tail = mqtt_mq_register(&mq, 8);
+    tail->control_type = 2;
+    tail->packet_id = 111;
+    assert_true(mqtt_mq_length(&mq) == 1);
+    assert_true(mq.curr_sz == 24 + 2*QM_SZ);
+    memset(mq.curr, 1, 8);
+    tail = mqtt_mq_register(&mq, 8);
+    tail->control_type = 3;
+    tail->packet_id = 222;
+    assert_true(mqtt_mq_length(&mq) == 2);
+    assert_true(mq.curr_sz == 16 + 1*QM_SZ);
+    memset(mq.curr, 2, 8);
+    tail = mqtt_mq_register(&mq, 8);
+    tail->control_type = 4;
+    tail->packet_id = 333;
+    assert_true(mqtt_mq_length(&mq) == 3);
+    assert_true(mq.curr_sz == 8);
+    memset(mq.curr, 3, 8);
+    tail = mqtt_mq_register(&mq, 8);
+    tail->control_type = 5;
+    tail->packet_id = 444;
+    assert_true(mqtt_mq_length(&mq) == 4);
+    assert_true(mq.curr_sz == 0);
+    assert_true(mq.curr == (uint8_t*) mq.queue_tail);
+
+    /* check that start's are correct */
+    for(unsigned int i = 0; i < 4; ++i) {
+        assert_true(mqtt_mq_get(&mq, i)->start == (uint8_t*) mq.mem_start + 8*i);
+        for(int j = 0; j < 8; ++j) {
+            assert_true(mqtt_mq_get(&mq, i)->start[j] == i);
+        }
+
+        assert_true(mqtt_mq_get(&mq, i)->control_type == i + 2);
+        assert_true(mqtt_mq_get(&mq, i)->packet_id == 111 * (i + 1));
+    }
+
+    /* check that it cleans correctly */
+    mqtt_mq_clean(&mq);   /* should do nothing */
+    assert_true(mqtt_mq_length(&mq) == 4);
+    assert_true(mq.curr_sz == 0);
+    assert_true(mq.curr == (uint8_t*) mq.queue_tail);
+
+    /* try clearing middle (should do nothing) */
+    mqtt_mq_get(&mq, 1)->state = MQTT_QUEUED_COMPLETE;
+    mqtt_mq_get(&mq, 0)->state = MQTT_QUEUED_AWAITING_ACK;
+    mqtt_mq_clean(&mq);
+    assert_true(mqtt_mq_length(&mq) == 4);
+    assert_true(mq.curr_sz == 0);
+    assert_true(mq.curr == (uint8_t*) mq.queue_tail);
+
+    /* complete first then clean (should clear 2) */
+    mqtt_mq_get(&mq, 0)->state = MQTT_QUEUED_COMPLETE;
+    mqtt_mq_clean(&mq);
+    assert_true(mqtt_mq_length(&mq) == 2);
+    assert_true(mq.curr_sz == 16 + 1*QM_SZ);
+    assert_true(mq.curr == mem + 16);
+
+    /* check that start's are correct */
+    for(unsigned int i = 0; i < 2; ++i) {
+        assert_true(mqtt_mq_get(&mq, i)->start == (uint8_t*) mq.mem_start + 8*i);
+        for(int j = 0; j < 8; ++j) {
+            assert_true(mqtt_mq_get(&mq, i)->start[j] == i+2); /* check value */
+        }
+        assert_true(mqtt_mq_get(&mq, i)->control_type == i + 4);
+        assert_true(mqtt_mq_get(&mq, i)->packet_id == 111 * (i + 3));
+    }
+
+    /* remove the last two */
+    mqtt_mq_get(&mq, 0)->state = MQTT_QUEUED_COMPLETE;
+    mqtt_mq_get(&mq, 1)->state = MQTT_QUEUED_COMPLETE;
+    mqtt_mq_clean(&mq); 
+    assert_true(mqtt_mq_length(&mq) == 0);
+    assert_true(mq.curr_sz == 32 + 3*QM_SZ);
+    assert_true((void*) mq.queue_tail == mq.mem_end);
+}
+
+static void TEST__utility__pid_lfsr(void **unused) {
+    struct mqtt_client client;
+    uint8_t send[256], recv[256];
+    mqtt_init(&client, -1, send, 256, recv, 256, NULL);
+    client.pid_lfsr = 163u;
+    uint32_t period = 0;
+    do {
+        __mqtt_next_pid(&client);
+        period++;
+    } while(client.pid_lfsr != 163u && client.pid_lfsr !=0);
+    assert_true(period == 65535u);
+}
+
+void publish_callback(void** state, struct mqtt_response_publish *publish) {
+    /*char *name = (char*) malloc(publish->topic_name_size + 1);
+    memcpy(name, publish->topic_name, publish->topic_name_size);
+    name[publish->topic_name_size] = '\0';
+    printf("Received a PUBLISH(topic=%s, DUP=%d, QOS=%d, RETAIN=%d, pid=%d) from the broker. Data='%s'\n", 
+           name, publish->dup_flag, publish->qos_level, publish->retain_flag, publish->packet_id,
+           (const char*) (publish->application_message)
+    );
+    free(name);*/
+    **(int**)state += 1;
+}
+
+static void TEST__api__connect_ping_disconnect(void **unused) {
+    uint8_t sendmem[2048];
+    uint8_t recvmem[1024];
+    ssize_t rv;
+    struct mqtt_client client;
+
+    int sockfd = open_nb_socket(addr, port);
+
+    /* initialize */
+    mqtt_init(&client, sockfd, sendmem, sizeof(sendmem), recvmem, sizeof(recvmem), publish_callback);
+
+    /* connect */
+    assert_true(mqtt_connect(&client, "liam-123", NULL, NULL, 0, NULL, NULL, 0, 30) > 0);
+    assert_true(__mqtt_send(&client) > 0);
+    while(mqtt_mq_length(&client.mq) > 0) {
+        assert_true(__mqtt_recv(&client) > 0);
+        mqtt_mq_clean(&client.mq);
+        usleep(10000);
+    }
+
+    /* ping */
+    assert_true(mqtt_ping(&client) > 0);
+    while(mqtt_mq_length(&client.mq) > 0) {
+        rv = __mqtt_send(&client);
+        if (rv <= 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        rv = __mqtt_recv(&client);
+        if (rv <= 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        mqtt_mq_clean(&client.mq);
+        usleep(10000);
+    }
+
+    /* disconnect */
+    assert_true(client.error == MQTT_OK);
+    assert_true(mqtt_disconnect(&client) > 0);
+    assert_true(__mqtt_send(&client) > 0);
+}
+
+static void TEST__api__publish_subscribe__single(void **unused) {
+    uint8_t sendmem1[2048], sendmem2[2048];
+    uint8_t recvmem1[1024], recvmem2[1024];
+    struct mqtt_client sender, receiver;
+
+    int state = 0;
+
+    int sockfd = open_nb_socket(addr, port);
+    mqtt_init(&sender, sockfd, sendmem1, sizeof(sendmem1), recvmem1, sizeof(recvmem1), publish_callback);
+
+    sockfd = open_nb_socket(addr, port);
+    mqtt_init(&receiver, sockfd, sendmem2, sizeof(sendmem2), recvmem2, sizeof(recvmem2), publish_callback);
+    receiver.publish_response_callback_state = &state;
+
+    /* connect both */
+    assert_true(mqtt_connect(&sender, "liam-123", NULL, NULL, 0, NULL, NULL, 0, 30) > 0);
+    assert_true(mqtt_connect(&receiver, "liam-234", NULL, NULL, 0, NULL, NULL, 0, 30) > 0);
+    assert_true(__mqtt_send(&sender) > 0);
+    assert_true(__mqtt_send(&receiver) > 0);
+    while(mqtt_mq_length(&sender.mq) > 0 || mqtt_mq_length(&receiver.mq) > 0) {
+        assert_true(__mqtt_recv(&sender) > 0);
+        mqtt_mq_clean(&sender.mq);
+        assert_true(__mqtt_recv(&receiver) > 0);
+        mqtt_mq_clean(&receiver.mq);
+        usleep(10000);
+    }
+
+    /* subscribe receiver*/
+    assert_true(mqtt_subscribe(&receiver, "liam-test-topic", 2) > 0);
+    assert_true(__mqtt_send(&receiver) > 0);
+    while(mqtt_mq_length(&receiver.mq) > 0) {
+        assert_true(__mqtt_recv(&receiver) > 0);
+        mqtt_mq_clean(&receiver.mq);
+        usleep(10000);
+    }
+
+    /* publish from sender */
+    assert_true(mqtt_publish(&sender, "liam-test-topic", "data", 5, MQTT_PUBLISH_QOS_0) > 0);
+    assert_true(__mqtt_send(&sender) > 0);
+
+    time_t start = time(NULL);
+    while(state == 0 && time(NULL) < start + 10) {
+        assert_true(__mqtt_recv(&receiver) > 0);        
+        usleep(10000);
+    }
+
+    assert_true(state == 1);
+
+    /* disconnect */
+    assert_true(sender.error == MQTT_OK);
+    assert_true(receiver.error == MQTT_OK);
+    assert_true(mqtt_disconnect(&sender) > 0);
+    assert_true(mqtt_disconnect(&receiver) > 0);
+    assert_true(__mqtt_send(&sender) > 0);
+    assert_true(__mqtt_send(&receiver) > 0);
+}
+
+
+#define TEST_PACKET_SIZE (149)
+#define TEST_DATA_SIZE (128)
+static void TEST__api__publish_subscribe__multiple(void **unused) {
+    uint8_t sendmem1[TEST_PACKET_SIZE*4 + sizeof(struct mqtt_queued_message)*4], 
+            sendmem2[TEST_PACKET_SIZE*4 + sizeof(struct mqtt_queued_message)*4];
+    uint8_t recvmem1[TEST_PACKET_SIZE], recvmem2[TEST_PACKET_SIZE];
+    struct mqtt_client sender, receiver;
+    ssize_t rv;
+
+    int state = 0;
+
+    /* initialize sender */
+    int sockfd = open_nb_socket(addr, port);
+    mqtt_init(&sender, sockfd, sendmem1, sizeof(sendmem1), recvmem1, sizeof(recvmem1), publish_callback);
+
+    sockfd = open_nb_socket(addr, port);
+    mqtt_init(&receiver, sockfd, sendmem2, sizeof(sendmem2), recvmem2, sizeof(recvmem2), publish_callback);
+    receiver.publish_response_callback_state = &state;
+
+    /* connect both */
+    if ((rv = mqtt_connect(&sender, "liam-123", NULL, NULL, 0, NULL, NULL, MQTT_CONNECT_CLEAN_SESSION, 30)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_connect(&receiver, "liam-234", NULL, NULL, 0, NULL, NULL, MQTT_CONNECT_CLEAN_SESSION, 30)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&sender)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&receiver)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    while(mqtt_mq_length(&sender.mq) > 0 || mqtt_mq_length(&receiver.mq) > 0) {
+        if ((rv = __mqtt_recv(&sender)) <= 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(rv  > 0);
+        }
+        mqtt_mq_clean(&sender.mq);
+        if ((rv = __mqtt_recv(&receiver)) <= 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(rv  > 0);
+        }
+        mqtt_mq_clean(&receiver.mq);
+        usleep(10000);
+    }
+
+    state = 0;
+
+    /* publish with retain */
+    if ((rv = mqtt_publish(&sender, "liam-test-ret1", "this was initial retain with qos 1", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_1 | MQTT_PUBLISH_RETAIN)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&sender)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+
+    /* subscribe receiver*/
+    if ((rv = mqtt_subscribe(&receiver, "liam-test-qos0", 0)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_subscribe(&receiver, "liam-test-qos1", 1)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_subscribe(&receiver, "liam-test-qos2", 2)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_subscribe(&receiver, "liam-test-ret1", 2)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&receiver)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+
+    /* wait for retained publish and receiver and sender have 0 length mq's */
+    time_t start = time(NULL);
+    while(start + 10 > time(NULL)  && (state < 1 || mqtt_mq_length(&receiver.mq) > 0 || mqtt_mq_length(&sender.mq) > 0)) {
+        if ((rv = mqtt_sync(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        mqtt_mq_clean(&receiver.mq);
+        if ((rv = mqtt_sync(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        mqtt_mq_clean(&sender.mq);
+        usleep(10000);
+    }
+
+    /* make sure that we publish was called */
+    assert_true(mqtt_mq_length(&receiver.mq) == 0);
+    assert_true(mqtt_mq_length(&sender.mq) == 0);
+    assert_true(state == 1);
+
+    /* now publish 4 perfect sized messages */
+    if ((rv = mqtt_publish(&sender, "liam-test-ret1", "retain with qos1", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_1)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_publish(&sender, "liam-test-qos0", "test with qos 0", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_0)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_publish(&sender, "liam-test-qos1", "test with qos 1", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_1)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_publish(&sender, "liam-test-qos2", "test with qos 2", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_2)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&sender)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    assert_true(sender.error == MQTT_OK);
+    assert_true(sender.mq.curr_sz == 0);
+
+    /* give 2 seconds for sending and receiving (also don't manually clean) */
+    start = time(NULL);
+    while(time(NULL) < start + 8) {
+        if ((rv = __mqtt_recv(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_recv(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        usleep(10000);
+    }
+
+    if (state != 5) {
+        printf("error: state == %d\n", state);
+        assert_true(state == 5);
+    }
+
+    /* test unsubscribe */
+    if ((rv = mqtt_unsubscribe(&receiver, "liam-test-qos1")) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+
+    /*sleep for 2 seconds while unsubscribe is sending */ 
+    start = time(NULL);
+    while(time(NULL) < start + 2) {
+        if ((rv = __mqtt_recv(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_recv(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        usleep(10000);
+    }
+    /* publish qos1 (should be received by receiver) */
+    if ((rv = mqtt_publish(&sender, "liam-test-qos1", "test with qos 1", TEST_DATA_SIZE, MQTT_PUBLISH_QOS_1)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    /*sleep for 2 seconds to give the publish a chance  */ 
+    start = time(NULL);
+    while(time(NULL) < start + 2) {
+        if ((rv = __mqtt_recv(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_recv(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&receiver)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        if ((rv = __mqtt_send(&sender)) < 0) {
+            printf("error: %s\n", mqtt_error_str(rv));
+            assert_true(0);
+        }
+        usleep(10000);
+    }
+
+    /* check that the callback wasn't called */
+    if (state != 5) {
+        printf("error: state == %d\n", state);
+        assert_true(state == 5);
+    }
+
+    /* disconnect */
+    assert_true(sender.error == MQTT_OK);
+    assert_true(receiver.error == MQTT_OK);
+    if ((rv = mqtt_disconnect(&sender)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = mqtt_disconnect(&receiver)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&sender)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+    if ((rv = __mqtt_send(&receiver)) <= 0) {
+        printf("error: %s\n", mqtt_error_str(rv));
+        assert_true(rv  > 0);
+    }
+}
+
+int main(int argc, const char *argv[]) {
+    int rv = 0;
+
+    /* get address (argv[1] if present) */
+    if (argc > 1) {
+        addr = argv[1];
+    }
+
+    /* get port number (argv[2] if present) */
+    if (argc > 2) {
+        port = argv[2];
+    }
+
+    printf("Staring MQTT-C unit-tests.\n");
+    printf("Using broker: \"%s:%s\"\n\n", addr, port);
+
+#if defined(WIN32)
+    WSADATA wsaData;
+    int iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+    if (iResult != NO_ERROR) {
+        fprintf(stderr, "Failed to init sockets: %i\n", iResult);
+        return iResult;
+    }
+#endif
+
+    printf("[MQTT Packet Serialization/Deserialization Tests]\n");
+    const struct CMUnitTest framing_tests[] = {
+        cmocka_unit_test(TEST__framing__fixed_header),
+        cmocka_unit_test(TEST__framing__connect),
+        cmocka_unit_test(TEST__framing__connack),
+        cmocka_unit_test(TEST__framing__publish),
+        cmocka_unit_test(TEST__framing__pubxxx),
+        cmocka_unit_test(TEST__framing__subscribe),
+        cmocka_unit_test(TEST__framing__suback),
+        cmocka_unit_test(TEST__framing__unsubscribe),
+        cmocka_unit_test(TEST__framing__unsuback),
+        cmocka_unit_test(TEST__framing__ping),
+        cmocka_unit_test(TEST__framing__disconnect),
+    };
+
+    rv |= cmocka_run_group_tests(framing_tests, NULL, NULL);
+
+    printf("\n[MQTT-C Utilities Tests]\n");
+    const struct CMUnitTest util_tests[] = {
+        cmocka_unit_test(TEST__utility__message_queue),
+        cmocka_unit_test(TEST__utility__pid_lfsr),
+        cmocka_unit_test(TEST__utility__connect_disconnect),
+        cmocka_unit_test(TEST__utility__ping),
+    };
+
+    rv |= cmocka_run_group_tests(util_tests, NULL, NULL);
+
+    printf("\n[MQTT-C API Tests]\n");
+    const struct CMUnitTest api_tests[] = {
+        cmocka_unit_test(TEST__api__connect_ping_disconnect),
+        cmocka_unit_test(TEST__api__publish_subscribe__single),
+        cmocka_unit_test(TEST__api__publish_subscribe__multiple),
+    };
+
+    rv |= cmocka_run_group_tests(api_tests, NULL, NULL);
+
+#if defined(WIN32)
+    WSACleanup();
+#endif
+
+    return rv;
+}
diff --git a/deps/MsvcLibX/CMakeLists.txt b/deps/MsvcLibX/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4428579e1c098425c9d72d7d58a5fda15cd34c93
--- /dev/null
+++ b/deps/MsvcLibX/CMakeLists.txt
@@ -0,0 +1,8 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_WINDOWS)
+  INCLUDE_DIRECTORIES(include)
+  AUX_SOURCE_DIRECTORY(src SRC)
+  ADD_LIBRARY(MsvcLibXw ${SRC})
+ENDIF ()
diff --git a/deps/MsvcLibX/include/msvcDebugm.h b/deps/MsvcLibX/include/msvcDebugm.h
new file mode 100644
index 0000000000000000000000000000000000000000..5b3c38f45be3168b6d3b52a9600fd98e0e524c15
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcDebugm.h
@@ -0,0 +1,206 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    debugm.h						      *
+*                                                                             *
+*   Description:    Debug macros					      *
+*                                                                             *
+*   Notes:	    Macros inspired by my Tcl/Bash/Batch debugging libraries. *
+*		    The idea is to output the function call stack, indenting  *
+*		    subroutines proportionally to the call depth.             *
+*                   To ease reading the output, it must look like real C code.*
+*                                                                             *
+*    DEBUG_GLOBALS              Define global variables used by macros below: *
+*    int iDebug = FALSE;        Global variable enabling debug output if TRUE.*
+*    int iIndent = 0;           Global variable controlling debug indentation.*
+*                                                                             *
+*    DEBUG_PRINTF((format, ...))	Print a debug string if debug is on.  *
+*                                       The double parenthesis are necessary  *
+*                                       because C90 does not support macros   *
+*                                       with variable list of arguments.      *
+*    DEBUG_ENTER((format, ...))		Print a function name and arguments.  *
+*                                       Increase indentation of further calls.*
+*                                       It's the caller's responsibility to   *
+*                                       format the routine name and arguments.*
+*    DEBUG_LEAVE((format, ...))		Print a function return value.        *
+*                                       Decrease indentation of further calls.*
+*                                       It's the caller's responsibility to   *
+*                                       format the return instruction & value.*
+*                                                                             *
+*                   Any call to DEBUG_ENTER MUST be matched by one call to    *
+*                   DEBUG_LEAVE or RETURN_... when the function returns.      *                                                                             *
+*                                                                             *
+*   History:								      *
+*    2012-01-16 JFL jf.larvoire@hp.com created this file.                     *
+*    2012-02-03 JFL Renamed DEBUG_IF_IS_ON DEBUG_CODE_IF_ON.                  *
+*		    Renamed file from debug.h to debugm.h because of a file   *
+*		    name collision with another library on my PC.	      *
+*    2014-02-10 JFL Added macros for an extra debug mode.		      *
+*    2014-07-02 JFL renamed macro RETURN() as RETURN_CONST(), and defined     *
+*		    new macro RETURN() to return nothing.		      *
+*		    Idem for RETURN_COMMENT() as RETURN_CONST_COMMENT().      *
+*    2016-09-09 JFL Flush every DEBUG_PRINTF output, to make sure to see      *
+*		    every debug string printed before a program crash.	      *
+*    2016-09-13 JFL Added macros DEBUG_WSTR2NEWUTF8() and DEBUG_FREEUTF8().   *
+*    2016-10-04 JFL Added macros DEBUG_OFF(), DEBUG_MORE(), DEBUG_LESS().     *
+*		    Allow using DEBUG_ON()/MORE()/LESS()/OFF() in release mode.
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_DEBUGM_H
+#define	_DEBUGM_H	1
+
+#include <stdio.h>	/* Macros use printf */
+
+#ifdef _MSC_VER
+#pragma warning(disable:4127) /* Avoid warnings on while(0) below */
+#endif
+
+#define DEBUG_DO(code) do {code} while (0)
+#define DEBUG_DO_NOTHING() do {} while (0)
+
+/* Conditional compilation based on Microsoft's standard _DEBUG definition */
+#if defined(_DEBUG)
+
+#define DEBUG_VERSION " Debug"
+
+#define DEBUG_GLOBALS \
+int iDebug = 0;		/* Global variable enabling debug output if TRUE. */ \
+int iIndent = 0;	/* Global variable controlling debug indentation. */
+
+extern int iDebug;	/* Global variable enabling of disabling debug messages */
+#define DEBUG_ON() iDebug = 1		/* Turn debug mode on */
+#define DEBUG_MORE() iDebug += 1	/* Increase the debug level */
+#define DEBUG_LESS() iDebug -= 1	/* Decrease the debug level */
+#define DEBUG_OFF() iDebug = 0		/* Turn debug mode off */
+#define DEBUG_IS_ON() (iDebug > 0)	/* Check if the debug mode is enabled */
+#define XDEBUG_ON() iDebug = 2		/* Turn extra debug mode on. Same as calling DEBUG_MORE() twice. */
+#define XDEBUG_IS_ON() (iDebug > 1)	/* Check if the extra debug mode is enabled */
+
+#define DEBUG_CODE(code) code	/* Code included in the _DEBUG version only */
+#define DEBUG_CODE_IF_ON(code) DEBUG_CODE(if (DEBUG_IS_ON()) {code}) /*
+				   Debug code executed if debug mode is on */
+#define XDEBUG_CODE_IF_ON(code) DEBUG_CODE(if (XDEBUG_IS_ON()) {code}) /*
+				   Debug code executed if extra debug mode is on */
+
+extern int iIndent;		/* Debug messages indentation */
+#define DEBUG_INDENT_STEP 2	/* How many spaces to add for each indentation level */
+#define DEBUG_PRINT_INDENT() printf("%*s", iIndent, "")
+
+/* Debug code, conditionally printing a string based on global variable 'debug' */
+/* The enter and leave variants print, then respectively increase or decrease indentation,
+   to make recursive calls easier to review. */
+#define DEBUG_FPRINTF(args) DEBUG_DO(if (DEBUG_IS_ON()) {DEBUG_PRINT_INDENT(); fprintf args;})
+#define DEBUG_PRINTF(args) DEBUG_DO(if (DEBUG_IS_ON()) {DEBUG_PRINT_INDENT(); printf args; fflush(stdout);})
+#define XDEBUG_PRINTF(args) DEBUG_DO(if (XDEBUG_IS_ON()) {DEBUG_PRINT_INDENT(); printf args; fflush(stdout);})
+#define DEBUG_ENTER(args)  DEBUG_DO(DEBUG_PRINTF(args); iIndent += DEBUG_INDENT_STEP;)
+#define DEBUG_LEAVE(args)  DEBUG_DO(DEBUG_PRINTF(args); iIndent -= DEBUG_INDENT_STEP;)
+
+#define DEBUG_RETURN_INT(i, comment) DEBUG_DO(int DEBUG_i = (i); \
+  DEBUG_LEAVE(("return %d; // " comment "\n", DEBUG_i)); return DEBUG_i;)
+
+/* print return instruction and decrease indent */
+#define RETURN() DEBUG_DO(DEBUG_LEAVE(("return;\n")); return;)
+#define RETURN_CONST(value) DEBUG_DO(DEBUG_LEAVE(("return %s;\n", #value)); return value;)
+#define RETURN_INT(i) DEBUG_DO(int DEBUG_i = (i); \
+  DEBUG_LEAVE(("return %d;\n", DEBUG_i)); return DEBUG_i;)
+#define RETURN_STRING(s) DEBUG_DO(char *DEBUG_s = (s); \
+  DEBUG_LEAVE(("return \"%s\";\n", DEBUG_s)); return DEBUG_s;)
+#define RETURN_CHAR(c) DEBUG_DO(char DEBUG_c = (c); \
+  DEBUG_LEAVE(("return '%c';\n", DEBUG_c)); return DEBUG_c;)
+#define RETURN_BOOL(b) DEBUG_DO(int DEBUG_b = (b); \
+  DEBUG_LEAVE(("return %s;\n", DEBUG_b ? "TRUE" : "FALSE")); return DEBUG_b;)
+
+#define RETURN_COMMENT(args) DEBUG_DO(DEBUG_LEAVE(("return; // ")); \
+  if (DEBUG_IS_ON()) printf args; return;)
+#define RETURN_CONST_COMMENT(value, args) DEBUG_DO(DEBUG_LEAVE(("return %s; // ", #value)); \
+  if (DEBUG_IS_ON()) printf args; return value;)
+#define RETURN_INT_COMMENT(i, args) DEBUG_DO(int DEBUG_i = (i); \
+  DEBUG_LEAVE(("return %d; // ", DEBUG_i)); if (DEBUG_IS_ON()) printf args; return DEBUG_i;)
+#define RETURN_BOOL_COMMENT(b, args) DEBUG_DO(int DEBUG_b = (b); \
+  DEBUG_LEAVE(("return %s; // ", DEBUG_b ? "TRUE" : "FALSE")); if (DEBUG_IS_ON()) printf args; return DEBUG_b;)
+
+#else /* !defined(_DEBUG) */
+
+#define DEBUG_VERSION ""	/* Non debug version: Simply don't say it */
+
+#define DEBUG_GLOBALS
+
+#define DEBUG_ON() (void)0
+#define DEBUG_MORE() (void)0
+#define DEBUG_LESS() (void)0
+#define DEBUG_OFF() (void)0
+#define DEBUG_IS_ON() 0
+#define XDEBUG_IS_ON() 0
+#define DEBUG_CODE(code) 	/* Code included in _DEBUG version only */
+#define DEBUG_CODE_IF_ON(code)	/* Code included in _DEBUG version only */
+#define XDEBUG_CODE_IF_ON(code)	/* Code included in _DEBUG version only */
+
+#define DEBUG_PRINT_INDENT() DEBUG_DO_NOTHING() /* Print call-depth spaces */
+
+#define DEBUG_FPRINTF(args) DEBUG_DO_NOTHING()  /* Print a debug string to a stream */
+#define DEBUG_PRINTF(args) DEBUG_DO_NOTHING()   /* Print a debug string to stdout */
+#define XDEBUG_PRINTF(args) DEBUG_DO_NOTHING()  /* Print an extra debug string to stdout */
+#define DEBUG_ENTER(args)  DEBUG_DO_NOTHING()   /* Print and increase indent */
+#define DEBUG_LEAVE(args)  DEBUG_DO_NOTHING()   /* Print and decrease indent */
+
+#define DEBUG_RETURN_INT(i, comment) return(i)
+
+/* print return instruction and decrease indent */
+#define RETURN() return
+#define RETURN_CONST(value) return(value)
+#define RETURN_INT(i) return(i)
+#define RETURN_STRING(s) return(s)
+#define RETURN_CHAR(c) return(c)
+#define RETURN_BOOL(b) return(b)
+
+#define RETURN_COMMENT(args) return
+#define RETURN_CONST_COMMENT(value, args) return(value)
+#define RETURN_INT_COMMENT(i, args) return(i)
+#define RETURN_BOOL_COMMENT(b, args) return(b)
+
+#endif /* defined(_DEBUG) */
+
+#define STRINGIZE(s) #s            /* Convert a macro name to a string */
+#define VALUEIZE(s) STRINGIZE(s)   /* Convert a macro value to a string */
+#define MACRODEF(s) "#define " #s " " STRINGIZE(s)
+
+/* Display a macro name and value. */
+#define DEBUG_PRINT_MACRO(name) DEBUG_DO( \
+  const char *pszName = #name; /* Don't use STRINGIZE because we're already inside a macro */ \
+  const char *pszValue = STRINGIZE(name); /* Don't use VALUEIZE because we're already inside a macro */ \
+  DEBUG_PRINT_INDENT(); \
+  if (strcmp(pszName, pszValue)) { \
+    printf("#define %s %s\n", pszName, pszValue); \
+  } else { /* Not 100% certain, but most likely. */ \
+    printf("#undef %s\n", pszName); \
+  } \
+)
+
+#ifdef _WIN32
+
+/* Helper macros for displaying Unicode strings */
+#define DEBUG_WSTR2UTF8(from, to, toSize) DEBUG_CODE( \
+  WideCharToMultiByte(CP_UTF8, 0, from, lstrlenW(from)+1, to, toSize, NULL, NULL); \
+)
+
+/* Dynamically allocate a new buffer, then convert a Unicode string to UTF-8 */
+/* The dynamic allocation is useful in modules using lots of UTF-16 pathnames.
+   This avoids having many local buffers of length UTF8_PATH_MAX, which may
+   make the stack grow too large and overflow. */
+#define DEBUG_WSTR2NEWUTF8(pwStr, pUtf8)	\
+  DEBUG_CODE(					\
+    do {					\
+      int nUtf8 = (int)lstrlenW(pwStr) * 2 + 1;	\
+      pUtf8 = malloc(nUtf8);			\
+      DEBUG_WSTR2UTF8(pwStr, pUtf8, nUtf8);	\
+    } while (0);				\
+  ) /* DEBUG_FREE(pUtf8) MUST be used to free the UTF-8 string after use, else there will be a memory leak */
+
+#define DEBUG_FREEUTF8(pUtf8) DEBUG_CODE(free(pUtf8))
+
+#endif /* defined(_WIN32) */
+
+#endif /* !defined(_DEBUGM_H) */
+
diff --git a/deps/MsvcLibX/include/msvcDirect.h b/deps/MsvcLibX/include/msvcDirect.h
new file mode 100644
index 0000000000000000000000000000000000000000..31017ce50cfc36457176d148f9188bc3c15cb067
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcDirect.h
@@ -0,0 +1,27 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    direct.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to direct.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-03-24 JFL Created this file, with content moved from unistd.h.      *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_DIRECT_H
+#define	_MSVCLIBX_DIRECT_H	1
+
+#include "msvclibx.h"
+
+#include <direct.h> /* Include MSVC's own <direct.h> file */
+
+#undef mkdir /* This MSVC macro is incompatible with mkdir() function in unistd.h */
+
+#endif /* defined(_MSVCLIBX_DIRECT_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcDirent.h b/deps/MsvcLibX/include/msvcDirent.h
new file mode 100644
index 0000000000000000000000000000000000000000..db146a599811d52c0f94ddf937dc74c961598d74
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcDirent.h
@@ -0,0 +1,282 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    dirent.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's dirent.h.	      *
+*                                                                             *
+*   Notes:	    There are also remains of an OS/2 implementation here.    *
+*                   This code did work c. 1990, in an OS/2 1.3 port of dirc.c.*
+*		    It's not maintained anymore, and unlikely to still work.  *
+*		    Left in as a historic reference, in the very unlikely     *
+*		    case somebody wants to revive it.			      *
+*									      *
+*   History:								      *
+*    2012-01-09 JFL Created this file, based on dirc and other programs.      *
+*    2013-03-09 JFL Rewrote the stat/fstat/lstat and fseeko/ftello definitions*
+*                   based on _FILE_OFFSET_BITS, _LARGEFILE_SOURCE, and        *
+*		    _LARGEFILE_SOURCE64 definitions.			      *
+*    2014-02-06 JFL Moved stat extensions to statx.h.			      *
+*    2014-02-27 JFL Use a WIN32_FIND_DATAW in Windows, to support UTF-8 names.*
+*    2014-03-20 JFL Restructured Windows opendir and readdir functions into   *
+*		    Wide and MultiByte versions, and changed the Unicode and  *
+*		    Ansi versions to macros.				      *
+*    2014-06-06 JFL Fixed macro _D_EXACT_NAMLEN().			      *
+*    2015-12-07 JFL Added the conditional definition of symlink constants, so *
+*		    that our code builds even in XP and older Windows SDKs.   *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_DIRENT_H
+#define	_DIRENT_H	1
+
+#include "msvclibx.h"
+
+#define _DIRENT_FOR_DOS_WINDOWS	/* Uniquely identify this module */
+
+#include <inttypes.h>
+#include <time.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <errno.h>
+
+#ifndef ENAMETOOLONG /* Not defined in DOS' errno.h */
+#define ENAMETOOLONG 38
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Macros to extract size information from a struct dirent */
+#define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) /* Name length, not including NUL */
+
+#define _DIRENT_HAVE_D_TYPE	/* We commit to providing this field */
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+#include <dos.h>
+
+#define NAME_MAX 12
+
+#pragma pack(1)
+struct _fileinfo { /* MS-DOS structure returning file search results */
+  uint8_t  fiReserved[21];
+  uint8_t  fiAttribute;		/* Attributes of file found */
+  uint16_t fiFileTime;		/* Time of last write */
+  uint16_t fiFileDate;		/* Time of last write */
+  uint32_t fiSize;		/* File Size */
+  char     fiFileName[13];	/* File name and extension */
+};
+#pragma pack()
+typedef struct _fileinfo fileinfo;
+
+#pragma pack(1)
+struct dirent { /* Standard C library structure returning directory entries. */
+  /* Standard fields */
+  _ino_t d_ino;		/* We don't need it, but it's required by the spec */
+  unsigned char d_type;	/* File type. Values defined in macros DT_xxxx */
+  /* unsigned char d_namlen; /* File name length, not including NUL */
+  /* OS-specific extensions (allowed by the Posix specification) */
+  /* Matches exactly the struc _fileinfo above, to avoid doing any copying */
+  uint8_t  d_reserved[21];
+  uint8_t  d_attribs;		/* Attribute of file found */
+  uint16_t d_time;		/* Time of last write */
+  uint16_t d_date;		/* Time of last write */
+  uint32_t d_filesize;		/* File Size */
+  /* Standard field: The file name, which must be last in the dirent structure */
+  char d_name[NAME_MAX+1];	/* Null-terminated file name. Must be last */
+};
+#pragma pack()
+
+#pragma pack(1)
+struct _dirhandle { /* Private structure, not for use by users */
+  struct dirent sDirent;
+  /* char dta_buf[128];		/* Protection area, in case MS-DOS uses the whole DTA, and not just the struct _fileinfo ahead of it. */
+  char wildcards[4];		/* Leave room for the "\*.*" that we append initially. This field MUST follow sDirent. */
+  char first;			/* Tracks if this is the first search call */
+};
+#pragma pack()
+
+/* Macros to extract size information from a struct dirent */
+#define _D_ALLOC_NAMLEN(d) 13 /* Upper bound of the block size to alloc for a name */
+
+/* MS-DOS compatible functions for searching with a specific attribute */
+int srch1st(char *pszFile, uint16_t wAttr, fileinfo *pFI); /* Search first matching file */
+int srchnext(fileinfo *pFI);     /* Search next matching file */
+#define DOS_SEARCH_FUNCTIONS_DEFINED 1
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#ifndef WINVER
+#define WINVER 0x0400
+#endif
+
+#include <dos.h>
+#include <windows.h>
+
+/* Add symlink definitions, that may be missing in XP and older Windows SDKs */
+#ifndef IO_REPARSE_TAG_SYMLINK
+#define IO_REPARSE_TAG_SYMLINK 0xA000000CL
+#endif
+#ifndef SYMBOLIC_LINK_FLAG_DIRECTORY
+#define SYMBOLIC_LINK_FLAG_DIRECTORY 1
+#endif
+#ifndef FSCTL_SET_REPARSE_POINT
+#define FSCTL_SET_REPARSE_POINT     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) 
+#endif
+#ifndef FSCTL_GET_REPARSE_POINT
+#define FSCTL_GET_REPARSE_POINT     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) 
+#endif
+#ifndef FSCTL_DELETE_REPARSE_POINT
+#define FSCTL_DELETE_REPARSE_POINT  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) 
+#endif
+
+#define NAME_MAX (4 * FILENAME_MAX) /* Worst case using UTF-8 encoding: 4 bytes/WCHAR */
+
+struct dirent { /* Structure used to return information about directory entries. */
+  /* OS-specific extensions */
+  uint32_t d_attribs;
+  uint32_t d_ReparseTag;
+  FILETIME d_CreationTime;
+  FILETIME d_LastAccessTime;
+  FILETIME d_LastWriteTime;
+  uint64_t d_filesize;
+  char     d_shortname[14*sizeof(WCHAR)];
+  /* Standard fields */
+  _ino_t d_ino;		/* We don't need it, but it's required by the spec */
+  unsigned char d_type;	/* File type. Values defined in macros DT_xxxx */
+  /* unsigned char d_namlen; /* File name length, not including NUL */
+  char d_name[(NAME_MAX+1)*sizeof(WCHAR)]; /* Null-terminated file name */
+};
+
+struct _dirhandle { /* Private structure, not for use by users */
+  struct dirent sDirent;
+  WCHAR wszDirName[MAX_PATH+1];	/* Null-terminated directory name */
+  HANDLE hFindFile;		/* Search handle */
+  WIN32_FIND_DATAW wfd;		/* Where Win32 will store the file information */
+};
+
+/* Macros to extract size information from a struct dirent */
+#define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN(d)+1) /* Upper bound of the block size to alloc for a name */
+
+#endif /* defined(_WIN32) */
+
+/************************* OS/2-specific definitions *************************/
+
+#ifdef _OS2	/* Automatically defined when targeting an OS/2 application? */
+
+#include <dos.h>
+
+#define INCL_DOSFILEMGR
+#define INCL_DOSMISC
+#define INCL_VIO
+#include "os2.h"
+
+#define NAME_MAX CCHMAXPATHCOMP
+
+struct dirent { /* Structure used to return information about directory entries. */
+  _ino_t d_ino;		/* We don't need it, but it's required by the spec */
+  /* Non standard extensions, to ease adapting old DOS/WIN32 apps */
+  uintmax_t d_filesize;	/* File size */
+  uint16_t time;	/* MS-DOS time */
+  uint16_t date;	/* MS-DOS date */
+  uint8_t attribs;	/* Attributes, the MS-DOS way */
+  /* Standard fields */
+  unsigned char d_type;	/* File type. Values defined in macros DT_xxxx */
+  /* unsigned char d_namlen; /* File name length, not including NUL */
+  char d_name[NAME_MAX+1];	/* Null-terminated file name. Must be last */
+};
+
+struct _dirhandle { /* Private structure, not for use by users */
+  struct dirent sDirent;
+  short hDir; 			/* Directory handle */
+  FILEFINDBUF buf;		/* Where OS/2 will store the file information */
+};
+
+/* Macros to extract size information from a struct dirent */
+#define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN(d)+1) /* Upper bound of the block size to alloc for a name */
+
+#endif /* defined(_OS2) */
+
+/********************** End of OS-specific definitions ***********************/
+
+typedef struct _dirhandle DIR; /* Directory enumerator handle */
+typedef struct dirent _dirent; /* Directory entry */
+
+#define MAXNAMELEN NAME_MAX /* Alias used by some Unix versions */
+
+/* File types for struct dirent d_type. Must match the S_IFMT field in sys/stat.h. */
+#define DT_UNKNOWN	 0
+#define DT_FIFO		 1	/* Fifo (not used in DOS/Windows dirs) */
+#define DT_CHR		 2	/* Character device (not used in DOS/Windows) */
+#define DT_DIR		 4	/* Directory */
+#define DT_BLK		 6	/* Block device (not used in DOS/Windows) */
+#define DT_REG		 8	/* Normal file */
+#define DT_LNK		10	/* Symbolic link */
+#define DT_SOCK		12	/* Socket (not used in DOS/Windows dirs) */
+#define DT_VOLID	15	/* Volume ID (non-standard extension for MS-DOS FAT) */
+
+/* Functions operating on directories */
+#if defined(_MSDOS)
+
+extern DIR *opendir(const char *name);	    /* Open a directory */
+extern int closedir(DIR *pDir);		    /* Close the directory. Return 0 if successful, -1 if not. */
+extern _dirent *readdir(DIR *pDir);	    /* Read a directory entry. Return pDirEnt, or NULL for EOF or error. */
+
+#elif defined(_WIN32)
+
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define opendir opendirU
+#define readdir readdirU
+#define scandir scandirU
+#else /* _ANSI_SOURCE */
+#define opendir opendirA
+#define readdir readdirA
+#define scandir scandirA
+#endif
+extern DIR *opendirW(const WCHAR *name);	    /* Open a directory - Wide char version */
+extern DIR *opendirM(const char *name, UINT cp);    /* Open a directory - MultiByte char version */
+#define opendirA(name) opendirM(name, CP_ACP)	    /* Open a directory - ANSI version */
+#define opendirU(name) opendirM(name, CP_UTF8)	    /* Open a directory - UTF-8 version */
+extern int closedir(DIR *pDir);			    /* Close the directory. Return 0 if successful, -1 if not. */
+extern _dirent *readdirW(DIR *pDir);		    /* Read a directory entry. Return pDirEnt, or NULL for EOF or error. */
+extern _dirent *readdirM(DIR *pDir, UINT cp);	    /* Read a directory entry. Return pDirEnt, or NULL for EOF or error. */
+#define readdirA(pDir) readdirM(pDir, CP_ACP)	    /* Read a directory entry. Return pDirEnt, or NULL for EOF or error. */
+#define readdirU(pDir) readdirM(pDir, CP_UTF8)	    /* Read a directory entry. Return pDirEnt, or NULL for EOF or error. */
+
+#endif /* defined(_WIN32) */
+
+/* extern int readdir_r(DIR *pDir, _dirent *__entry, _dirent **__result); /* Reentrant readdir */
+/* extern void rewinddir(DIR *pDir); /* Rewind DIRP to the beginning of the directory. */
+/* extern void seekdir(DIR *pDir, long lPos); /* Seek to position POS on DIRP. */
+/* extern long telldir(DIR *pDir); /* Return the current position of DIRP. */
+/* extern int dirfd(DIR *pDir); /* Return the file descriptor used by DIRP. */
+
+/* Scan the directory dir, calling cbSelect() on each directory entry.
+   Entries for which cbSelect() returns nonzero are individually malloc'd,
+   sorted using qsort with cbCompare(), and collected in a malloc'd array in
+   *namelist.  Returns the number of entries selected, or -1 on error. */
+extern int scandir(const char *dir,
+		   _dirent ***namelist,
+		   int (*cbSelect) (const _dirent *),
+		   int (__cdecl *cbCompare) (const _dirent **,
+					     const _dirent **));
+
+/* Function to compare two `struct dirent's alphabetically.  */
+extern int __cdecl alphasort (const _dirent **ppDE1, const _dirent **ppDEe2);
+/* extern int versionsort (const _dirent **ppDE1, const _dirent **ppDEe2); */
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* defined(_DIRENT_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcError.h b/deps/MsvcLibX/include/msvcError.h
new file mode 100644
index 0000000000000000000000000000000000000000..9a0a790a9af3caeb761abc6aa06cc152b6fb889a
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcError.h
@@ -0,0 +1,25 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    error.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of the GNU CoreUtils library error funct.  *
+*                                                                             *
+*   Notes:	    Gotcha: 						      *
+*		    The Windows SDK also contains a file called error.h	      *
+*		    See C:\Program Files\Microsoft SDKs\Windows\v7.0\INCLUDE  *
+*									      *
+*   History:								      *
+*    2012-10-21 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _ERROR_H_
+#define _ERROR_H_
+
+#include "msvclibx.h"
+
+extern void error(int status, int errnum, const char *format, ...);
+
+#endif
diff --git a/deps/MsvcLibX/include/msvcFadvise.h b/deps/MsvcLibX/include/msvcFadvise.h
new file mode 100644
index 0000000000000000000000000000000000000000..89600ebd058cd59b52278ef1bdcfdc191a08eaff
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcFadvise.h
@@ -0,0 +1,30 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    fadvise.h						      *
+*                                                                             *
+*   Description:    WIN32 makeshift version of Coreutils' fadvise.h.          *
+*                                                                             *
+*   Notes:	    Gives hints to the kernel about future uses of a file.    *
+*                   Define constants, and replace functions by void macros.   *
+*									      *
+*   History:								      *
+*    2012-10-17 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+enum fadvice_t { 
+  FADVISE_NORMAL,
+  FADVISE_SEQUENTIAL,
+  FADVISE_NOREUSE,
+  FADVISE_DONTNEED, 
+  FADVISE_WILLNEED,
+  FADVISE_RANDOM 
+};
+ 
+/* void	fdadvise(int fd, off_t offset, off_t len, fadvice_t advice) */
+#define fdadvise(fd, offset, len, advice)
+
+/* void fadvise(FILE *fp, fadvice_t advice) */
+#define fadvise(fp, advice)
diff --git a/deps/MsvcLibX/include/msvcFcntl.h b/deps/MsvcLibX/include/msvcFcntl.h
new file mode 100644
index 0000000000000000000000000000000000000000..fc981b5fc9304e1d5f8f8656aadd3f8b36e9bef5
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcFcntl.h
@@ -0,0 +1,40 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    fcntl.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to fcntl.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2017-02-16 JFL Created this file.                                        *
+*									      *
+*         Copyright 2017 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_FCNTL_H
+#define	_MSVCLIBX_FCNTL_H	1
+
+#include "msvclibx.h"
+
+#include <fcntl.h> /* Include MSVC's own <fcntl.h> file */
+
+/* Microsoft defines _open() in io.h */
+#include <io.h>
+
+#if defined(_MSDOS)
+#define open _open
+#endif
+
+#if defined(_WIN32)
+extern int openA(const char *, int, ...); /* MsvcLibX ANSI version of open */
+extern int openU(const char *, int, ...); /* MsvcLibX UTF-8 version of open */
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define open openU
+#else /* _ANSI_SOURCE */
+#define open openA
+#endif /* defined(_UTF8_SOURCE) */
+#endif /* defined(_WIN32) */
+
+#endif /* defined(_MSVCLIBX_FCNTL_H)  */
diff --git a/deps/MsvcLibX/include/msvcFnmatch.h b/deps/MsvcLibX/include/msvcFnmatch.h
new file mode 100644
index 0000000000000000000000000000000000000000..4b7d15b2e8c9e12abab7a3d5b21726ffb99c694e
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcFnmatch.h
@@ -0,0 +1,50 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    fnmatch.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's fnmatch.h.	      *
+*                                                                             *
+*   Notes:	    Reference for fnmatch and glob:			      *
+*    http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_9.html *
+*                                                                             *
+*   History:								      *
+*    2012-01-17 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _FNMATCH_H
+#define _FNMATCH_H      1
+
+#include "msvclibx.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Bits set in the FLAGS argument to fnmatch() */
+#define FNM_PATHNAME	0x01	/* Wildcards don't match '/' or '\\' */
+#define FNM_FILE_NAME FNM_PATHNAME /* Equivalent GNU name */
+#define FNM_NOESCAPE	0x02	/* Backslashes don't quote special chars (Irrelevant in DOS/Windows) */
+#define FNM_PERIOD	0x04	/* Wildcards don't match leading dots */
+#define FNM_LEADING_DIR	0x08	/* Match up to the first '/' or '\\' */
+#define FNM_CASEFOLD	0x10	/* Case-insentitive comparison */
+
+/* Values returned by fnmatch() */
+#define FNM_MATCH	0	/* Non standard, but makes fnmatch.c more readable */ 
+#define FNM_NOMATCH	1
+
+/* Value returned by fnmatch() if unsupported */
+#define FNM_NOSYS      (-1)
+
+/* Match NAME against the filename pattern PATTERN,
+   returning zero if it matches, FNM_NOMATCH if not.  */
+extern int fnmatch(const char *pszPattern, const char *pszName, int iFlags);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* !defined(_FNMATCH_H) */
+
diff --git a/deps/MsvcLibX/include/msvcGetopt.h b/deps/MsvcLibX/include/msvcGetopt.h
new file mode 100644
index 0000000000000000000000000000000000000000..fa0d75b3ff6a95ab7054fefb691c97f44ba6b429
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcGetopt.h
@@ -0,0 +1,74 @@
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $
+ */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+/*
+ * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
+ */
+#define no_argument        0
+#define required_argument  1
+#define optional_argument  2
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct option {
+        /* name of long option */
+        const char *name;
+        /*
+         * one of no_argument, required_argument, and optional_argument:
+         * whether option takes an argument
+         */
+        int has_arg;
+        /* if not NULL, set *flag to val when option found */
+        int *flag;
+        /* if flag not NULL, value to set *flag to; else return value */
+        int val;
+};
+
+int getopt_long(int, char * const *, const char *,
+    const struct option *, int *);
+
+extern int optreset;
+extern char *optarg;
+extern int opterr;
+extern int optind;
+extern int optopt;
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* !_GETOPT_H_ */
+
diff --git a/deps/MsvcLibX/include/msvcIconv.h b/deps/MsvcLibX/include/msvcIconv.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ad5e2f67f47941ed5f08d4d7549c8a74118912a
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcIconv.h
@@ -0,0 +1,45 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    iconv.h						      *
+*									      *
+*   Description:    WIN32 port of standard C library's iconv()		      *
+*                                                                             *
+*   Notes:	    Define here a number of routines, that will eventually    *
+*		    be used by iconv().					      *
+*		    							      *
+*   History:								      *
+*    2014-02-27 JFL Created this file.					      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_ICONV_H
+#define	_ICONV_H	1
+
+#include "msvclibx.h"
+
+#include <stdlib.h>
+
+#if defined(_MSDOS)
+
+/* Count the number of characters (not bytes!) in a string */
+/* For now, assume the # of characters is the same as the # of bytes */
+/* TO DO: Add support for DOS code pages! */
+#define CountCharacters(string, cp) (int)strlen(string)
+
+#endif /* defined(_MSDOS) */
+
+
+#if defined(_WIN32)
+
+#include <windows.h>
+
+int ConvertString(char *buf, size_t nBytes, UINT cpFrom, UINT cpTo, LPCSTR lpDefaultChar);
+int CountCharacters(const char *string, UINT cp);
+char *DupAndConvert(const char *string, UINT cpFrom, UINT cpTo, LPCSTR lpDefaultChar);
+
+#endif /* defined(_WIN32) */
+
+#endif /* !defined(_ICONV_H) */
+
diff --git a/deps/MsvcLibX/include/msvcInttypes.h b/deps/MsvcLibX/include/msvcInttypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..addc380ed0e0e65ab9209454589639da2dce49de
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcInttypes.h
@@ -0,0 +1,314 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename        inttypes.h                                                *
+*                                                                             *
+*   Description     ISO C9x compliant inttypes.h for Microsoft Visual Studio  *
+*                                                                             *
+*   Notes           TO DO: Move imaxdiv to its own C file.                    *
+*                                                                             *
+*   History                                                                   *
+*    2014-02-07 JFL Added definitions for PRIdMAX and PRIiMAX.                *
+*    2016-01-07 JFL Restructured and improved support for MS-DOS.             *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _MSC_VER
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif
+
+#ifndef _MSC_INTTYPES_H_
+#define _MSC_INTTYPES_H_
+
+#include <stdint.h>
+
+/*  7.8 Format conversion of integer types */
+
+typedef struct {
+  intmax_t quot;
+  intmax_t rem;
+} imaxdiv_t;
+
+/*  7.8.1 Macros for format specifiers */
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) /*  [   See footnote 185 at page 198 */
+
+#if defined(_WIN64)
+#define __I64_PREFIX "I64"
+#define __I32_PREFIX "I32"
+#define __PTR_PREFIX "I64"
+#define __MAX_PREFIX "I64"
+#elif defined(_WIN32)
+#define __I64_PREFIX "I64"
+#define __I32_PREFIX "I32"
+#define __PTR_PREFIX "I32"
+#define __MAX_PREFIX "I64"
+#elif defined(_MSDOS)
+#define __I64_PREFIX "ll" /* MSVC 1.5 actually ignores the second l */
+#define __I32_PREFIX "l"
+#if defined(_M_I86CM) || defined(_M_I86LM) || defined(_M_I86HM) /* Long pointer memory models */
+#define __PTR_PREFIX "l"
+#else	/* Short pointer memory models */
+#define __PTR_PREFIX ""
+#endif
+#define __MAX_PREFIX "l"
+#endif
+
+/* printf macros for integers */
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+
+#define PRIdLEAST16  PRId16
+#define PRIiLEAST16  PRIi16
+#define PRIoLEAST16  PRIo16
+#define PRIuLEAST16  PRIu16
+#define PRIxLEAST16  PRIx16
+#define PRIXLEAST16  PRIX16
+
+#define PRIdFAST16   PRId16
+#define PRIiFAST16   PRIi16
+#define PRIoFAST16   PRIo16
+#define PRIuFAST16   PRIu16
+#define PRIxFAST16   PRIx16
+#define PRIXFAST16   PRIX16
+
+#define PRId32       __I32_PREFIX "d"
+#define PRIi32       __I32_PREFIX "i"
+#define PRIo32       __I32_PREFIX "o"
+#define PRIu32       __I32_PREFIX "u"
+#define PRIx32       __I32_PREFIX "x"
+#define PRIX32       __I32_PREFIX "X"
+
+#define PRIdLEAST32  PRId32
+#define PRIiLEAST32  PRIi32
+#define PRIoLEAST32  PRIo32
+#define PRIuLEAST32  PRIu32
+#define PRIxLEAST32  PRIx32
+#define PRIXLEAST32  PRIX32
+
+#define PRIdFAST32   PRId32
+#define PRIiFAST32   PRIi32
+#define PRIoFAST32   PRIo32
+#define PRIuFAST32   PRIu32
+#define PRIxFAST32   PRIx32
+#define PRIXFAST32   PRIX32
+
+#define PRId64       __I64_PREFIX "d"
+#define PRIi64       __I64_PREFIX "i"
+#define PRIo64       __I64_PREFIX "o"
+#define PRIu64       __I64_PREFIX "u"
+#define PRIx64       __I64_PREFIX "x"
+#define PRIX64       __I64_PREFIX "X"
+
+#define PRIdLEAST64  PRId64
+#define PRIiLEAST64  PRIi64
+#define PRIoLEAST64  PRIo64
+#define PRIuLEAST64  PRIu64
+#define PRIxLEAST64  PRIx64
+#define PRIXLEAST64  PRIX64
+
+#define PRIdFAST64   PRId64
+#define PRIiFAST64   PRIi64
+#define PRIoFAST64   PRIo64
+#define PRIuFAST64   PRIu64
+#define PRIxFAST64   PRIx64
+#define PRIXFAST64   PRIX64
+
+#define PRIdMAX     __MAX_PREFIX "d"
+#define PRIiMAX     __MAX_PREFIX "i"
+#define PRIoMAX     __MAX_PREFIX "o"
+#define PRIuMAX     __MAX_PREFIX "u"
+#define PRIxMAX     __MAX_PREFIX "x"
+#define PRIXMAX     __MAX_PREFIX "X"
+
+#define PRIdPTR     __PTR_PREFIX "d"
+#define PRIiPTR     __PTR_PREFIX "i"
+#define PRIoPTR     __PTR_PREFIX "o"
+#define PRIuPTR     __PTR_PREFIX "u"
+#define PRIxPTR     __PTR_PREFIX "x"
+#define PRIXPTR     __PTR_PREFIX "X"
+
+/* scanf macros for integers */
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+
+#define SCNdLEAST8  SCNd8
+#define SCNiLEAST8  SCNi8
+#define SCNoLEAST8  SCNo8
+#define SCNuLEAST8  SCNu8
+#define SCNxLEAST8  SCNx8
+#define SCNXLEAST8  SCNX8
+
+#define SCNdFAST8   SCNd8
+#define SCNiFAST8   SCNi8
+#define SCNoFAST8   SCNo8
+#define SCNuFAST8   SCNu8
+#define SCNxFAST8   SCNx8
+#define SCNXFAST8   SCNX8
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+
+#define SCNdLEAST16  SCNd16
+#define SCNiLEAST16  SCNi16
+#define SCNoLEAST16  SCNo16
+#define SCNuLEAST16  SCNu16
+#define SCNxLEAST16  SCNx16
+#define SCNXLEAST16  SCNX16
+
+#define SCNdFAST16   SCNd16
+#define SCNiFAST16   SCNi16
+#define SCNoFAST16   SCNo16
+#define SCNuFAST16   SCNu16
+#define SCNxFAST16   SCNx16
+#define SCNXFAST16   SCNX16
+
+#define SCNd32       __I32_PREFIX "d"
+#define SCNi32       __I32_PREFIX "i"
+#define SCNo32       __I32_PREFIX "o"
+#define SCNu32       __I32_PREFIX "u"
+#define SCNx32       __I32_PREFIX "x"
+#define SCNX32       __I32_PREFIX "X"
+
+#define SCNdLEAST32  SCNd32
+#define SCNiLEAST32  SCNi32
+#define SCNoLEAST32  SCNo32
+#define SCNuLEAST32  SCNu32
+#define SCNxLEAST32  SCNx32
+#define SCNXLEAST32  SCNX32
+
+#define SCNdFAST32   SCNd32
+#define SCNiFAST32   SCNi32
+#define SCNoFAST32   SCNo32
+#define SCNuFAST32   SCNu32
+#define SCNxFAST32   SCNx32
+#define SCNXFAST32   SCNX32
+
+#define SCNd64       __I64_PREFIX "d"
+#define SCNi64       __I64_PREFIX "i"
+#define SCNo64       __I64_PREFIX "o"
+#define SCNu64       __I64_PREFIX "u"
+#define SCNx64       __I64_PREFIX "x"
+#define SCNX64       __I64_PREFIX "X"
+
+#define SCNdLEAST64  SCNd64
+#define SCNiLEAST64  SCNi64
+#define SCNoLEAST64  SCNo64
+#define SCNuLEAST64  SCNu64
+#define SCNxLEAST64  SCNx64
+#define SCNXLEAST64  SCNX64
+
+#define SCNdFAST64   SCNd64
+#define SCNiFAST64   SCNi64
+#define SCNoFAST64   SCNo64
+#define SCNuFAST64   SCNu64
+#define SCNxFAST64   SCNx64
+#define SCNXFAST64   SCNX64
+
+#define SCNdMAX     __MAX_PREFIX "d"
+#define SCNiMAX     __MAX_PREFIX "i"
+#define SCNoMAX     __MAX_PREFIX "o"
+#define SCNuMAX     __MAX_PREFIX "u"
+#define SCNxMAX     __MAX_PREFIX "x"
+#define SCNXMAX     __MAX_PREFIX "X"
+
+#define SCNdPTR     __PTR_PREFIX "d"
+#define SCNiPTR     __PTR_PREFIX "i"
+#define SCNoPTR     __PTR_PREFIX "o"
+#define SCNuPTR     __PTR_PREFIX "u"
+#define SCNxPTR     __PTR_PREFIX "x"
+#define SCNXPTR     __PTR_PREFIX "X"
+
+#endif /*  __STDC_FORMAT_MACROS ] */
+
+/*  7.8.2 Functions for greatest-width integer types */
+
+/*  7.8.2.1 imaxabs() */
+#if defined(_WIN32)
+#define imaxabs _abs64
+#elif defined(_MSDOS)
+#define imaxabs abs
+#endif
+
+/*  7.8.2.2 imaxdiv() */
+
+/*  This is modified version of div() function from Microsoft's div.c found */
+/*  in %MSVC.NET%\crt\src\div.c */
+#if defined(_MSDOS) && !defined(STATIC_IMAXDIV) && !defined(__cplusplus)
+/* MSVC 1.52 compiler for MS-DOS does not support inline for C */
+extern imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom);
+#else
+#ifdef STATIC_IMAXDIV /*  [ */
+static
+#else /*  STATIC_IMAXDIV ][ */
+_inline
+#endif /*  STATIC_IMAXDIV ] */
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) {
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      /*  did division wrong; must fix up */
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+#endif /* defined(_MSDOS) && !defined(STATIC_IMAXDIV) && !defined(__cplusplus) */
+
+/*  7.8.2.3 strtoimax() and strtoumax() */
+#if defined(_WIN32)
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+#elif defined(_MSDOS)
+#define strtoimax strtol
+#define strtoumax strtoul
+#endif
+
+/*  7.8.2.4 wcstoimax() and wcstoumax() */
+#if defined(_WIN32)
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+#elif defined(_MSDOS)
+#define wcstoimax wcstol
+#define wcstoumax wcstoul
+#endif
+
+#endif /* _MSC_INTTYPES_H_ */
diff --git a/deps/MsvcLibX/include/msvcLibgen.h b/deps/MsvcLibX/include/msvcLibgen.h
new file mode 100644
index 0000000000000000000000000000000000000000..c3051a2fb2c828fe3215e1ef0b42812cf5fc5625
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcLibgen.h
@@ -0,0 +1,22 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    libgen.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's libgen.h.	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-08 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _LIBGEN_H
+#define _LIBGEN_H
+
+char *basename(char *pszPathname);	/* Modifies pathname; Not thread-safe */
+char *dirname(char *pszPathname);	/* Modifies pathname; Not thread-safe */
+
+#endif /* !defined(_LIBGEN_H) */
diff --git a/deps/MsvcLibX/include/msvcLimits.h b/deps/MsvcLibX/include/msvcLimits.h
new file mode 100644
index 0000000000000000000000000000000000000000..496fe9f24c6250cf29cce0c0878c853a5ca48a19
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcLimits.h
@@ -0,0 +1,54 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    limits.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to limits.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-30 JFL Created this file.					      *
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_LIMITS_H
+#define	_MSVCLIBX_LIMITS_H	1
+
+#include "msvclibx.h"
+
+#include <limits.h> /* Include MSVC's own <limits.h> file */
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+#define PATH_MAX 255	/* Many APIs actually limit it to 128 bytes, but longer paths paths are legal. */
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#undef PATH_MAX
+
+#define ANSI_PATH_MAX      260	/* Number of ANSI characters, including final NUL ( = Windef.h MAX_PATH) */
+#define UNICODE_PATH_MAX 32768	/* Number of Unicode characters, including final NUL */
+#define UTF8_PATH_MAX (4 * UNICODE_PATH_MAX) /* Worst UTF-8 case is 4 bytes / Unicode char */
+
+#define PATH_MAX UNICODE_PATH_MAX /* MsvcLibX uses Unicode internally for file management */
+
+#endif /* defined(_WIN32) */
+
+/************************* OS/2-specific definitions *************************/
+
+#ifdef _OS2	/* Automatically defined when targeting an OS/2 application? */
+
+#endif /* defined(_OS2) */
+
+/********************** End of OS-specific definitions ***********************/
+
+#endif /* defined(_MSVCLIBX_LIMITS_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcNetdb.h b/deps/MsvcLibX/include/msvcNetdb.h
new file mode 100644
index 0000000000000000000000000000000000000000..cc874580e1eb894349db36502a3c547bb71e9945
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcNetdb.h
@@ -0,0 +1,26 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    netdb.h						      *
+*                                                                             *
+*   Description:    Network definitions					      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2012-01-24 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _NETDB_H
+#define _NETDB_H        1
+
+/* Absolute file name for network data base files.  */
+#define _PATH_HOSTS             "C:/Windows/System32/drivers/etc/hosts"
+#define _PATH_NETWORKS          "C:/Windows/System32/drivers/etc/networks"
+#define _PATH_PROTOCOLS         "C:/Windows/System32/drivers/etc/protocols"
+#define _PATH_SERVICES          "C:/Windows/System32/drivers/etc/services"
+
+#endif /* _NETDB_H */
+
diff --git a/deps/MsvcLibX/include/msvcProcess.h b/deps/MsvcLibX/include/msvcProcess.h
new file mode 100644
index 0000000000000000000000000000000000000000..66cf94de144045c0b0124d44ea13ae297d71c43c
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcProcess.h
@@ -0,0 +1,34 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    process.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to process.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-03-27 JFL Created this file.                                        *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_PROCESS_H
+#define	_MSVCLIBX_PROCESS_H	1
+
+#include "msvclibx.h"
+
+#include <process.h> /* Include MSVC's own <process.h> file */
+
+#if defined(_WIN32)
+extern intptr_t _spawnvpU(int iMode, const char *pszCommand, char *const *argv);
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define _spawnvp _spawnvpU
+#else /* _ANSI_SOURCE */
+#define _spawnvp _spawnvp
+#endif /* defined(_UTF8_SOURCE) */
+#endif /* defined(_WIN32) */
+
+#endif /* defined(_MSVCLIBX_PROCESS_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcRegex.h b/deps/MsvcLibX/include/msvcRegex.h
new file mode 100644
index 0000000000000000000000000000000000000000..66dd78fbc350f38564497d27aa964bbaab181155
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcRegex.h
@@ -0,0 +1,89 @@
+#ifndef _HSREGEX_H_
+#define _HSREGEX_H_
+#ifndef _HSREGEX_H
+#define	_HSREGEX_H	/* never again */
+
+#include <sys/types.h> /* JFL 2012-01-24 Added definition of types used below */
+#pragma comment( lib, "regex.lib" )
+
+/* ========= begin header generated by ././mkh ========= */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* === regex2.h === */
+#ifdef WIN32
+#define API_EXPORT(type)    __declspec(dllexport) type __stdcall
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#define API_EXPORT(type)    __attribute__ ((visibility("default"))) type
+#else
+#define API_EXPORT(type)    type
+#endif
+
+typedef off_t regoff_t;
+typedef struct {
+	int re_magic;
+	size_t re_nsub;		/* number of parenthesized subexpressions */
+	const char *re_endp;	/* end pointer for REG_PEND */
+	struct re_guts *re_g;	/* none of your business :-) */
+} regex_t;
+typedef struct {
+	regoff_t rm_so;		/* start of match */
+	regoff_t rm_eo;		/* end of match */
+} regmatch_t;
+
+
+/* === regcomp.c === */
+API_EXPORT(int) regcomp(regex_t *, const char *, int);
+#define	REG_BASIC	0000
+#define	REG_EXTENDED	0001
+#define	REG_ICASE	0002
+#define	REG_NOSUB	0004
+#define	REG_NEWLINE	0010
+#define	REG_NOSPEC	0020
+#define	REG_PEND	0040
+#define	REG_DUMP	0200
+
+
+/* === regerror.c === */
+#define	REG_OKAY	 0
+#define	REG_NOMATCH	 1
+#define	REG_BADPAT	 2
+#define	REG_ECOLLATE	 3
+#define	REG_ECTYPE	 4
+#define	REG_EESCAPE	 5
+#define	REG_ESUBREG	 6
+#define	REG_EBRACK	 7
+#define	REG_EPAREN	 8
+#define	REG_EBRACE	 9
+#define	REG_BADBR	10
+#define	REG_ERANGE	11
+#define	REG_ESPACE	12
+#define	REG_BADRPT	13
+#define	REG_EMPTY	14
+#define	REG_ASSERT	15
+#define	REG_INVARG	16
+#define	REG_ATOI	255	/* convert name to number (!) */
+#define	REG_ITOA	0400	/* convert number to name (!) */
+API_EXPORT(size_t) regerror(int, const regex_t *, char *, size_t);
+
+
+/* === regexec.c === */
+API_EXPORT(int) regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
+#define	REG_NOTBOL	00001
+#define	REG_NOTEOL	00002
+#define	REG_STARTEND	00004
+#define	REG_TRACE	00400	/* tracing of execution */
+#define	REG_LARGE	01000	/* force large representation */
+#define	REG_BACKR	02000	/* force use of backref code */
+
+
+/* === regfree.c === */
+API_EXPORT(void) regfree(regex_t *);
+
+#ifdef __cplusplus
+}
+#endif
+/* ========= end header generated by ././mkh ========= */
+#endif
+#endif
diff --git a/deps/MsvcLibX/include/msvcReparsept.h b/deps/MsvcLibX/include/msvcReparsept.h
new file mode 100644
index 0000000000000000000000000000000000000000..04ba02f9a2010e4e3ebe5db820bd26f91d050bad
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcReparsept.h
@@ -0,0 +1,125 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    reparsept.h						      *
+*                                                                             *
+*   Description:    Definitions for WIN32 reparse points.		      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-28 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* Reparse point iocontrol data buffer */
+/* See http://msdn.microsoft.com/en-us/library/cc232006.aspx */
+/* and http://msdn.microsoft.com/en-us/library/cc232007.aspx */
+
+#include <windows.h>
+
+/* NTFS reparse point definitions */
+
+/* Constants from http://msdn.microsoft.com/en-us/library/dd541667.aspx */
+/* Some, but not all, of them also defined in recent versions of winnt.h. */
+/* Since the list varies a lot, redefine them one by one as needed */
+
+#ifndef IO_REPARSE_TAG_RESERVED_ZERO
+#define IO_REPARSE_TAG_RESERVED_ZERO	0x00000000	/* Reserved reparse tag value */
+#endif
+#ifndef IO_REPARSE_TAG_RESERVED_ONE
+#define IO_REPARSE_TAG_RESERVED_ONE	0x00000001	/* Reserved reparse tag value */
+#endif
+#ifndef IO_REPARSE_TAG_MOUNT_POINT
+#define IO_REPARSE_TAG_MOUNT_POINT	0xA0000003	/* Used for mount point support */
+#endif
+#ifndef IO_REPARSE_TAG_HSM
+#define IO_REPARSE_TAG_HSM		0xC0000004	/* Obsolete. Used by legacy Hierarchical Storage Manager Product */
+#endif
+#ifndef IO_REPARSE_TAG_DRIVER_EXTENDER
+#define IO_REPARSE_TAG_DRIVER_EXTENDER	0x80000005	/* Home server drive extender */
+#endif
+#ifndef IO_REPARSE_TAG_HSM2
+#define IO_REPARSE_TAG_HSM2		0x80000006	/* Obsolete. Used by legacy Hierarchical Storage Manager Product */
+#endif
+#ifndef IO_REPARSE_TAG_SIS
+#define IO_REPARSE_TAG_SIS		0x80000007	/* Used by single-instance storage (SIS) filter driver. Server-side interpretation only, not meaningful over the wire */
+#endif
+#ifndef IO_REPARSE_TAG_WIM
+#define IO_REPARSE_TAG_WIM              0x80000008      /* Mounted Windows boot Image File? */
+#endif
+#ifndef IO_REPARSE_TAG_CSV
+#define IO_REPARSE_TAG_CSV              0x80000009      /* Cluster Shared Volume? */
+#endif
+#ifndef IO_REPARSE_TAG_DFS
+#define IO_REPARSE_TAG_DFS		0x8000000A	/* Used by the DFS filter. The DFS is described in the Distributed File System (DFS): Referral Protocol Specification [MS-DFSC]. Server-side interpretation only, not meaningful over the wire */
+#endif
+#ifndef IO_REPARSE_TAG_FILTER_MANAGER
+#define IO_REPARSE_TAG_FILTER_MANAGER	0x8000000B	/* Used by filter manager test harness */
+#endif
+#ifndef IO_REPARSE_TAG_SYMLINK
+#define IO_REPARSE_TAG_SYMLINK		0xA000000C	/* Used for symbolic link support */
+#endif
+#ifndef IO_REPARSE_TAG_DFSR
+#define IO_REPARSE_TAG_DFSR		0x80000012	/* Used by the DFS filter. The DFS is described in [MS-DFSC]. Server-side interpretation only, not meaningful over the wire */
+#endif
+#ifndef IO_REPARSE_TAG_DEDUP
+#define IO_REPARSE_TAG_DEDUP		0x80000013	/* Mounted deduplicated volume? */
+#endif
+#ifndef IO_REPARSE_TAG_NFS
+#define IO_REPARSE_TAG_NFS		0x80000014	/* Mounted NFS share? */
+#endif
+
+#if 0
+#define IO_REPARSE_TAG_DRIVER_EXTENDER	0x80000005	/* Home server drive extender */
+#define IO_REPARSE_TAG_FILTER_MANAGER	0x8000000B	/* Used by filter manager test harness */
+#endif
+
+#pragma pack(1)
+typedef struct _REPARSE_READ_BUFFER {
+  DWORD  ReparseTag;
+  WORD   ReparseDataLength;
+  WORD   Reserved;
+  UCHAR  DataBuffer[1];
+} REPARSE_READ_BUFFER, *PREPARSE_READ_BUFFER;
+#define REPARSE_READ_BUFFER_HEADER_SIZE (sizeof(REPARSE_READ_BUFFER) - sizeof(UCHAR))
+
+typedef struct _REPARSE_SYMLINK_READ_BUFFER {
+  DWORD  ReparseTag;
+  WORD   ReparseDataLength;
+  WORD   Reserved;
+  WORD   SubstituteNameOffset;
+  WORD   SubstituteNameLength;
+  WORD   PrintNameOffset;
+  WORD   PrintNameLength;
+  ULONG  Flags;
+  WCHAR  PathBuffer[1];
+} SYMLINK_READ_BUFFER, *PSYMLINK_READ_BUFFER;
+#define SYMLINK_READ_BUFFER_HEADER_SIZE (sizeof(SYMLINK_READ_BUFFER) - sizeof(WCHAR))
+
+typedef struct _REPARSE_MOUNTPOINT_READ_BUFFER {
+  DWORD  ReparseTag;
+  WORD   ReparseDataLength;
+  WORD   Reserved;
+  WORD   SubstituteNameOffset;
+  WORD   SubstituteNameLength;
+  WORD   PrintNameOffset;
+  WORD   PrintNameLength;
+  WCHAR  PathBuffer[1];
+} MOUNTPOINT_READ_BUFFER, *PMOUNTPOINT_READ_BUFFER;
+#define MOUNTPOINT_READ_BUFFER_HEADER_SIZE (sizeof(MOUNTPOINT_READ_BUFFER) - sizeof(WCHAR))
+
+typedef struct _REPARSE_MOUNTPOINT_WRITE_BUFFER {
+  DWORD  ReparseTag;
+  DWORD  ReparseDataLength;
+  WORD   Reserved;
+  WORD   ReparseTargetLength;
+  WORD   ReparseTargetMaximumLength;
+  WORD   Reserved1;
+  WCHAR  ReparseTarget[1];
+} MOUNTPOINT_WRITE_BUFFER, *PMOUNTPOINT_WRITE_BUFFER;
+#define MOUNTPOINT_WRITE_BUFFER_HEADER_SIZE (sizeof(MOUNTPOINT_WRITE_BUFFER) - sizeof(WCHAR))
+#pragma pack()
+
+
diff --git a/deps/MsvcLibX/include/msvcStdbool.h b/deps/MsvcLibX/include/msvcStdbool.h
new file mode 100644
index 0000000000000000000000000000000000000000..85b42c6585de680810816c6cbe5375ac2e8d09e3
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcStdbool.h
@@ -0,0 +1,25 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    stdbool.h						      *
+*                                                                             *
+*   Description:    Standard boolean definitions			      *
+*                                                                             *
+*   Notes:	    Set standard values. May need to be adapted for C++?      *
+*                                                                             *
+*   History:								      *
+*    2012-10-17 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _STDBOOL_H
+#define _STDBOOL_H
+
+/* #define bool int /* Spec says _Bool */
+typedef int bool;
+#define true 1
+#define false 0
+#define __bool_true_false_are_defined 1
+
+#endif
diff --git a/deps/MsvcLibX/include/msvcStdint.h b/deps/MsvcLibX/include/msvcStdint.h
new file mode 100644
index 0000000000000000000000000000000000000000..55b75fe46f2592f0d6a99912749e587bcd8e87a3
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcStdint.h
@@ -0,0 +1,322 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename        stdint.h                                                  *
+*                                                                             *
+*   Description     ISO C9x  compliant stdint.h for Microsoft Visual Studio   *
+*                                                                             *
+*   Notes                                                                     *
+*                                                                             *
+* ISO C9x  compliant stdint.h for Microsoft Visual Studio                     *
+* Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124          *
+*                                                                             *
+*  Copyright (c) 2006-2008 Alexander Chemeris                                 *
+*                                                                             *
+* Redistribution and use in source and binary forms, with or without          *
+* modification, are permitted provided that the following conditions are met: *
+*                                                                             *
+*   1. Redistributions of source code must retain the above copyright notice, *
+*      this list of conditions and the following disclaimer.                  *
+*                                                                             *
+*   2. Redistributions in binary form must reproduce the above copyright      *
+*      notice, this list of conditions and the following disclaimer in the    *
+*      documentation and/or other materials provided with the distribution.   *
+*                                                                             *
+*   3. The name of the author may be used to endorse or promote products      *
+*      derived from this software without specific prior written permission.  *
+*                                                                             *
+* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED*
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        *
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO  *
+* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,      *
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,*
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; *
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,    *
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR     *
+* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF      *
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                  *
+*                                                                             *
+*   History                                                                   *
+*    2008-07-17 AC  Initial implementation by Alexander Chemeris.             *
+*    2011-05-23 JFL Added support for 16-bits compilers for MS-DOS.           *
+*    2011-05-28 JFL Added support for 16-bits compilers for MS-DOS.           *
+*    2012-01-18 JFL Added error messages if target is not DOS or Windows.     *
+*    2015-12-04 JFL Define _UINTPTR_T_DEFINED to tell MSVC99 it's done already*
+*                                                                             *
+\*****************************************************************************/
+
+#ifndef _MSC_VER
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif /* _MSC_VER */
+
+#ifndef _MSC_STDINT_H_
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+/*
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+*/
+/* 2015-12-04 JFL Bug fix: With VS14/VC19, MSVC's wchar.h includes inttypes.h,
+                  which in turn includes this stdint.h, causing loop issues */
+#if (_MSC_VER < 1900) && defined(_WIN32) /* Both WIN32 and WIN64 */
+#  if (_MSC_VER < 1300) && defined(__cplusplus)
+     extern "C++" {
+#  endif 
+#    include <wchar.h>
+#  if (_MSC_VER < 1300) && defined(__cplusplus)
+     }
+#  endif
+#endif
+
+/* Define _W64 macros to mark types changing their size, like intptr_t. */
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+/* 7.18.1 Integer types */
+
+#ifndef _INTEGRAL_MAX_BITS
+#define _INTEGRAL_MAX_BITS 32
+#endif
+
+/* 7.18.1.1 Exact-width integer types */
+#if defined(_WIN32)	/* Both WIN32 and WIN64 */
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+#elif defined(_MSDOS)	/* MS-DOS */
+typedef char              int8_t;
+typedef short             int16_t;
+typedef long              int32_t;
+typedef unsigned char     uint8_t;
+typedef unsigned short    uint16_t;
+typedef unsigned long     uint32_t;
+#else
+#error "I don't know what the integer types are in this case!"
+#endif
+
+/* 7.18.1.2 Minimum-width integer types */
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+#ifdef LLONG_MAX
+typedef int64_t   int_least64_t;
+#endif
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+#ifdef LLONG_MAX
+typedef uint64_t  uint_least64_t;
+#endif
+
+/* 7.18.1.3 Fastest minimum-width integer types */
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+#ifdef LLONG_MAX
+typedef int64_t   int_fast64_t;
+#endif
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+#ifdef LLONG_MAX
+typedef uint64_t  uint_fast64_t;
+#endif
+
+/* 7.18.1.4 Integer types capable of holding object pointers */
+#if defined(_WIN64)	/* _WIN64 */
+#  define _POINTER_BITS          64
+   typedef __int64           intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#elif defined(_WIN32)	/* _WIN32 */
+#  define _POINTER_BITS          32
+   typedef _W64 int               intptr_t;
+   typedef _W64 unsigned int      uintptr_t;
+#elif defined(_MSDOS)	/* _MSDOS */
+#  if defined(_M_I86TM) || defined(_M_I86SM) /* Tiny or short memory models */
+#  define _POINTER_BITS          16
+   typedef int               intptr_t;
+   typedef unsigned int      uintptr_t;
+#  else /* Compact, medium, large or huge memory models */
+#  define _POINTER_BITS          32
+   typedef long              intptr_t;
+   typedef unsigned long     uintptr_t;
+#  endif
+#else
+#error "I don't know what the pointer types are in this case!"
+#endif /* _WIN64 */
+#define _INTPTR_T_DEFINED
+#define _UINTPTR_T_DEFINED	/* Prevent MSVC99 from redefining it */
+
+/* 7.18.1.5 Greatest-width integer types */
+#ifdef LLONG_MAX
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+#else
+typedef int32_t   intmax_t;
+typedef uint32_t  uintmax_t;
+#endif
+
+
+/* 7.18.2 Limits of specified-width integer types */
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) /* See footnote 220 at page 257 and footnote 221 at page 259 */
+
+#ifdef _MSDOS
+#define _I8_MIN       SCHAR_MIN     /* minimum signed 8 bit value */
+#define _I8_MAX       SCHAR_MAX     /* maximum signed 8 bit value */
+#define _UI8_MAX      UCHAR_MAX     /* maximum unsigned 8 bit value */
+
+#define _I16_MIN      SHRT_MIN      /* minimum signed 16 bit value */
+#define _I16_MAX      SHRT_MAX      /* maximum signed 16 bit value */
+#define _UI16_MAX     USHRT_MAX     /* maximum unsigned 16 bit value */
+
+#define _I32_MIN      LONG_MIN      /* minimum signed 32 bit value */
+#define _I32_MAX      LONG_MAX      /* maximum signed 32 bit value */
+#define _UI32_MAX     ULONG_MAX     /* maximum unsigned 32 bit value */
+#endif
+
+/* 7.18.2.1 Limits of exact-width integer types */
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#ifdef LLONG_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#endif
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#ifdef LLONG_MAX
+#define UINT64_MAX   _UI64_MAX
+#endif
+
+/* 7.18.2.2 Limits of minimum-width integer types */
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#ifdef LLONG_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#endif
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#ifdef LLONG_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.3 Limits of fastest minimum-width integer types */
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#ifdef LLONG_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#endif
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#ifdef LLONG_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+#endif
+
+/* 7.18.2.4 Limits of integer types capable of holding object pointers */
+#define INTPTR_MIN   INT##_POINTER_BITS##MIN
+#define INTPTR_MAX   INT##_POINTER_BITS##_MAX
+#define UINTPTR_MAX  UINT##_POINTER_BITS##_MAX
+
+/* 7.18.2.5 Limits of greatest-width integer types */
+#ifdef LLONG_MAX
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+#else
+#define INTMAX_MIN   INT32_MIN
+#define INTMAX_MAX   INT32_MAX
+#define UINTMAX_MAX  UINT32_MAX
+#endif
+
+/* 7.18.3 Limits of other integer types */
+#define PTRDIFF_MIN  _I##_POINTER_BITS##_MIN
+#define PTRDIFF_MAX  _I##_POINTER_BITS##_MAX
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX
+#  define SIZE_MAX  _UI##_POINTER_BITS##_MAX
+#endif
+
+/* WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h> */
+#ifndef WCHAR_MIN
+#  define WCHAR_MIN  0
+#endif
+#ifndef WCHAR_MAX
+#  define WCHAR_MAX  _UI16_MAX
+#endif
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif /* __STDC_LIMIT_MACROS */
+
+
+/* 7.18.4 Limits of other integer types */
+ 
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) /* See footnote 224 at page 260 */
+
+/* 7.18.4.1 Macros for minimum-width integer constants */
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#ifdef LLONG_MAX
+#define INT64_C(val) val##i64
+#endif
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#ifdef LLONG_MAX
+#define UINT64_C(val) val##ui64
+#endif
+
+/* 7.18.4.2 Macros for greatest-width integer constants */
+#ifdef LLONG_MAX
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+#else
+#define INTMAX_C   INT32_C
+#define UINTMAX_C  UINT32_C
+#endif
+
+#endif /* __STDC_CONSTANT_MACROS */
+
+
+#endif /* _MSC_STDINT_H_ */
diff --git a/deps/MsvcLibX/include/msvcStdio.h b/deps/MsvcLibX/include/msvcStdio.h
new file mode 100644
index 0000000000000000000000000000000000000000..65af04340d2f7036b0ad5d3702710f30fb1f7cae
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcStdio.h
@@ -0,0 +1,125 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    stdio.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to stdio.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-03 JFL Created this file.					      *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*    2015-12-09 JFL Alias fputs to fputsU, and vfprintf to vfprintfU.	      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_stdio_H
+#define	_MSVCLIBX_stdio_H	1
+
+#include "msvclibx.h"
+
+#include <stdio.h> /* Include MSVC's own <stdio.h> file */
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define snprintf _snprintf	/* This one _is_ standard */
+#define popen _popen		/* This one _is_ standard */
+#define pclose _pclose		/* This one _is_ standard */
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+/* Define functions fseeko and ftello */
+#if defined(_LARGEFILE_SOURCE)
+  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  /* TO DO: Windows 95 has extended functions for handling 64-bits files sizes */
+  #else
+  #endif
+  /* For now, use the MSVC 32-bits functions in all cases */
+  #define fseeko fseek
+  #define ftello ftell
+#endif
+
+/* Define standard 64-bits functions */
+#if defined(_LARGEFILE_SOURCE64)
+  #define fseeko64 _fseek
+  #define ftello64 _ftell
+#endif
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define vfprintf vfprintfU	/* For outputing UTF-8 strings */
+#define fprintf fprintfU	/* For outputing UTF-8 strings */
+#define printf printfU		/* For outputing UTF-8 strings */
+#define fputs fputsU		/* For outputing UTF-8 strings */
+/* The UTF-8 output routines are defined in iconv.c */
+extern int vfprintfU(FILE *f, const char *pszFormat, va_list vl);
+extern int fprintfU(FILE *f, const char *pszFormat, ...);
+extern int printfU(const char *pszFormat, ...);
+extern int fputsU(const char *buf, FILE *f);
+extern UINT codePage;
+#endif
+
+/* Define functions fseeko and ftello */
+#if defined(_LARGEFILE_SOURCE)
+  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+    #define fseeko _fseeki64	/* _CONCAT(_fseeki64,_NS_SUFFIX) */
+    #define ftello _ftelli64	/* _CONCAT(_ftelli64,_NS_SUFFIX) */
+  #else
+    #define fseeko fseek
+    #define ftello ftell
+  #endif
+#endif
+
+/* Define standard 64-bits functions */
+#if defined(_LARGEFILE_SOURCE64)
+  #define fseeko64 _fseeki64	/* _CONCAT(_fseeki64,_NS_SUFFIX) */
+  #define ftello64 _ftelli64	/* _CONCAT(_ftelli64,_NS_SUFFIX) */
+#endif
+
+#define fileno _fileno	/* Avoid a warning about the deprecated name */
+
+#endif /* defined(_WIN32) */
+
+/************************* OS/2-specific definitions *************************/
+
+#ifdef _OS2	/* Automatically defined when targeting an OS/2 application? */
+
+/* Define functions fseeko and ftello */
+#if defined(_LARGEFILE_SOURCE)
+  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  #else
+  #endif
+  #define fseeko fseek
+  #define ftello ftell
+#endif
+
+/* Define standard 64-bits functions */
+#if defined(_LARGEFILE_SOURCE64)
+  /* For now, hide the fact that DOS does not support 64-bits lengths */
+  #define fseeko64 _fseek
+  #define ftello64 _ftell
+#endif
+
+#endif /* defined(_OS2) */
+
+/********************** End of OS-specific definitions ***********************/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* defined(_MSVCLIBX_stdio_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcStdlib.h b/deps/MsvcLibX/include/msvcStdlib.h
new file mode 100644
index 0000000000000000000000000000000000000000..b9bcc83f2dd9c46ba6ad4f1c3f931bdbd012ccd0
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcStdlib.h
@@ -0,0 +1,52 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    stdlib.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to stdlib.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-13 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_stdlib_H
+#define	_MSVCLIBX_stdlib_H	1
+
+#include "msvclibx.h"
+
+#include <stdlib.h> /* Include MSVC's own <stdlib.h> file */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+extern char *_fullpathU(char *absPath, const char *relPath, size_t maxLength);
+
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define _fullpath _fullpathU		/* For processing UTF-8 pathnames */
+#endif
+
+#endif /* defined(_WIN32) */
+
+/********************** End of OS-specific definitions ***********************/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* defined(_MSVCLIBX_stdlib_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcSystem.h b/deps/MsvcLibX/include/msvcSystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..59c875b11467822bfc6cb79af0e2448b4332303d
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcSystem.h
@@ -0,0 +1,2 @@
+/* CoreUtils global system configuration definitions */
+
diff --git a/deps/MsvcLibX/include/msvcTime.h b/deps/MsvcLibX/include/msvcTime.h
new file mode 100644
index 0000000000000000000000000000000000000000..1897da58570cf503b05502d0a15c899f1f126015
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcTime.h
@@ -0,0 +1,47 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    time.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to time.h.			      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-04 JFL Created this file.                                        *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_TIME_H
+#define	_MSVCLIBX_TIME_H	1
+
+#include "msvclibx.h"
+
+#include <winsock2.h>
+#include <time.h> /* Include MSVC's own <time.h> file */
+
+
+#ifdef _MSDOS
+
+/* Check for the definition of _STRUCT_TIMESPEC before using clock_gettime().
+   If it's not defined, use time() instead, which is supported by all OSs. */
+
+#endif /* defined(_MSDOS) */
+
+
+#ifdef _WIN32
+
+#include "sys\msvcTime.h" /* for struct timespec */
+
+typedef int clockid_t;
+/* Supported values for clockid_t */
+#define CLOCK_REALTIME 0
+
+int clock_gettime(clockid_t clock_id, struct timespec *tp);
+
+#endif /* defined(_WIN32) */
+
+#endif /* defined(_MSVCLIBX_TIME_H)  */
+
diff --git a/deps/MsvcLibX/include/msvcUnistd.h b/deps/MsvcLibX/include/msvcUnistd.h
new file mode 100644
index 0000000000000000000000000000000000000000..9ad60625e07be8e9b749d1951375a3a501832366
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcUnistd.h
@@ -0,0 +1,182 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    unistd.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's unistd.h.	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2012-01-18 JFL Created this file.                                        *
+*    2012-10-17 JFL Added standard functions getcwd, chdir, getpid, access.   *
+*                   Added Microsoft-specific functions getdrive, chdrive.     *
+*    2013-03-27 JFL Updated getpid() and added getppid().                     *
+*    2014-02-03 JFL Added readlink().                                         *
+*    2014-03-20 JFL Restructured Windows link management functions into Wide  *
+*		    and MultiByte versions, and changed the Unicode and Ansi  *
+*		    versions to macros.					      *
+*    2014-06-30 JFL Moved PATH_MAX definition to limits.h.		      *
+*    2016-08-25 JFL Implemented ResolveLinksA().			      *
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _UNISTD_H
+#define _UNISTD_H
+
+#ifndef _MSC_VER
+#error This include file is designed for use with the Microsoft C tools only.
+#endif
+
+#include "msvclibx.h"	/* Generate a library search record to load MsvcLibX.lib. */
+#include "sys/msvcTypes.h"	/* Define pid_t and getppid(). */
+#include "msvcDirent.h"	/* Define pid_t and getppid(). */
+#include <direct.h>	/* For functions like _chdir() and _getcwd() */
+#include <process.h>	/* For _getpid() */
+
+/* Microsoft tools think these are non standard, but they are standard! */
+/* #define getcwd	 _getcwd */
+/* #define chdir	 _chdir */
+/* Actually use the improved versions in MsvcLibX */
+#undef getcwd /* MSVC _does_ define a getcwd macro, in addition to the getcwd function! */
+#if defined(_MSDOS)
+#define getcwd(path, size) _getcwd(path, (int)(size)) /* Use MSVC LIB's own, changing argument 2 type */
+#elif defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define getcwd getcwdU
+#define _getdcwd _getdcwdU
+#define chdir chdirU
+#else /* _ANSI_SOURCE */
+#define getcwd getcwdA
+#define _getdcwd _getdcwdA
+#define chdir chdirA
+#endif
+char *getcwdA(char *buf, size_t bufSize); /* Can't use the getcwd name, as MSVC has an incompatible prototype for it */
+char *_getdcwdA(int iDrive, char *buf, int iBuflen);
+char *getcwdU(char *buf, size_t bufSize); /* Can't use the getcwd name, as MSVC has an incompatible prototype for it */
+char *_getdcwdU(int iDrive, char *buf, int iBuflen);
+#endif /* defined(_MSDOS) */
+int chdir(const char *path);
+
+/* These are non standard indeed, but the leading _ is annoying */ 
+#define getdrive _getdrive
+#define chdrive	 _chdrive
+
+#include <io.h>		/* For low level I/O functions like read() & write() */
+
+/* Microsoft tools think access is non standard, but it is standard! */
+#if defined(_MSDOS)
+#define access _access
+#elif defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define access _accessU
+int _accessU(const char *pszFilename, int iAccessMode);
+#else /* _ANSI_SOURCE */
+#define access _access
+#endif
+#endif
+#define F_OK 0	/* test for the existence of the file */
+#define X_OK 1	/* test for execute permission */
+#define R_OK 2	/* test for read permission */
+#define W_OK 4	/* test for read permission */
+
+/* getpid() and getppid() */
+#define getpid() ((pid_t)(_getpid()))
+pid_t getppid(void);	/* Get parent PID */
+/* Contrary to in Unix, the above functions can fail in Windows. In this case they return INVALID_PID. */ 
+#define INVALID_PID ((pid_t)-1L)
+
+/* Path management */
+#if defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define realpath realpathU
+#define CompactPath CompactPathU
+#else /* _ANSI_SOURCE */
+#define realpath realpathA
+#define CompactPath CompactPathA
+#endif
+#endif /* defined(_WIN32) */
+char *realpath(const char *path, char *buf); /* Posix routine, normally defined in stdlib.h. Output buf must contain PATH_MAX bytes */
+int CompactPath(const char *path, char *outbuf, size_t bufsize); /* A proprietary subroutine, that cleans up . and .. parts. */
+
+/* Signed size type */
+#ifndef _SSIZE_T_DEFINED
+#if defined(_MSDOS)
+typedef int ssize_t;
+#elif defined(_WIN32)
+#include <stdint.h>
+#ifdef  _WIN64
+typedef __int64 ssize_t;
+#else
+typedef _W64 int ssize_t;
+#endif /* defined(_WIN64) */
+#endif /* defined(_WIN32) */
+#define _SSIZE_T_DEFINED
+#endif /* !_SSIZE_T_DEFINED */
+
+/* Link management functions */
+#if defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define readlink readlinkU
+#define symlink symlinkU
+#define symlinkd symlinkdU
+#define junction junctionU
+#define GetReparseTag GetReparseTagU
+#define ResolveLinks ResolveLinksU
+#else /* _ANSI_SOURCE */
+#define readlink readlinkA
+#define symlink symlinkA
+#define symlinkd symlinkdA
+#define junction junctionA
+#define GetReparseTag GetReparseTagA
+#define ResolveLinks ResolveLinksA
+#endif
+ssize_t readlinkW(const WCHAR *path, WCHAR *buf, size_t bufsiz);	    /* Posix routine readlink - Wide char version */
+ssize_t readlinkM(const char *path, char *buf, size_t bufsiz, UINT cp);     /* Posix routine readlink - Multibyte char version */
+#define readlinkA(path, buf, bufsiz) readlinkM(path, buf, bufsiz, CP_ACP)   /* Posix routine readlink - ANSI version */
+#define readlinkU(path, buf, bufsiz) readlinkM(path, buf, bufsiz, CP_UTF8)  /* Posix routine readlink - UTF-8 version */
+int symlinkW(const WCHAR *targetname, const WCHAR *newlinkname);	    /* Posix routine symlink - Wide char version */
+int symlinkM(const char *targetname, const char *newlinkname, UINT cp);	    /* Posix routine symlink - Multibyte char version */
+#define symlinkA(target, newlink) symlinkM(target, newlink, CP_ACP)	    /* Posix routine symlink - ANSI version */
+#define symlinkU(target, newlink) symlinkM(target, newlink, CP_UTF8)	    /* Posix routine symlink - UTF-8 version */
+int symlinkdW(const WCHAR *targetname, const WCHAR *newlinkname);	    /* MsvcLibX Create an NTFS symlinkd - Wide char version */
+int symlinkdM(const char *targetname, const char *newlinkname, UINT cp);    /* MsvcLibX Create an NTFS symlinkd - Multibyte char version */
+#define symlinkdA(target, newlink) symlinkdM(target, newlink, CP_ACP)	    /* MsvcLibX Create an NTFS symlinkd - ANSI version */
+#define symlinkdU(target, newlink) symlinkdM(target, newlink, CP_UTF8)	    /* MsvcLibX Create an NTFS symlinkd - UTF-8 version */
+int junctionW(const WCHAR *targetname, const WCHAR *junctionName);	    /* MsvcLibX Create an NTFS junction - Wide char version */
+int junctionM(const char *targetname, const char *junctionName, UINT cp);   /* MsvcLibX Create an NTFS junction - Multibyte char version */
+#define junctionA(target, newjunc) junctionM(target, newjunc, CP_ACP)	    /* MsvcLibX Create an NTFS junction - ANSI version */
+#define junctionU(target, newjunc) junctionM(target, newjunc, CP_UTF8)	    /* MsvcLibX Create an NTFS junction - UTF-8 version */
+DWORD GetReparseTagW(const WCHAR *path);				    /* MsvcLibX Get a Repase Point tag - Wide char version */
+DWORD GetReparseTagM(const char *path, UINT cp);			    /* MsvcLibX Get a Repase Point tag - MultiByte char version */
+#define GetReparseTagA(path) GetReparseTagM(path, CP_ACP)		    /* MsvcLibX Get a Repase Point tag - ANSI version */
+#define GetReparseTagU(path) GetReparseTagM(path, CP_UTF8)		    /* MsvcLibX Get a Repase Point tag - ANSI version */
+int ResolveLinksA(const char *path, char *buf, size_t bufsize);	/* Resolve pathnames with symlinks, symlinkds, and junctions */
+int ResolveLinksU(const char *path, char *buf, size_t bufsize);	/* Resolve pathnames with symlinks, symlinkds, and junctions */
+#ifndef ELOOP
+/*
+// Unix defines ELOOP as errno 40.
+// MS Visual C++ 1.52 for DOS is standard up to errno 34, then diverges up to errno 36.
+//  Many errnos within the list are actually unused, and for them _sys_errlist[] = "".
+// MS Visual C++ 9 for Windows is standard up to errno 34, then diverges up to errno 43.
+//  Also MSVC9 does not define errno:
+//   15      // The posix standard ENOTBLK "Block device required"
+//   26      // The posix standard ETXTBSY "Text file busy"
+//   35      // Positioned between standard ERANGE and EDEADLK
+//   37      // Positioned between standard EDEADLK and ENAMETOOLONG
+//   43      // Positioned last, after standard ENOTEMPTY
+// The _sys_errlist[] pointer for all the above points to a single string "Unknown error".
+*/
+#define ELOOP  35  /* Using the first available slot */  /* Update _sys_errlist[ELOOP] accordingly in any routine that generates ELOOP! */
+#endif /* !defined(ELOOP) */
+#define SYMLOOP_MAX 31 /* Maximum depth of symbolic name resolution, to avoid stack overflows. Windows is documented to allow 31: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365460(v=vs.85).aspx */
+#endif /* defined(_WIN32) */
+
+/* Standard file descriptor numbers, for low level I/O functions */
+#define STDIN_FILENO    0       /* Standard input file number */
+#define STDOUT_FILENO   1       /* Standard output file number */
+#define STDERR_FILENO   2       /* Standard error file number */
+
+#endif /* _UNISTD_H */
+
diff --git a/deps/MsvcLibX/include/msvcUtime.h b/deps/MsvcLibX/include/msvcUtime.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec846871675fc619fc5da690b5690168996e5bec
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcUtime.h
@@ -0,0 +1,86 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    utime.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 adaptation of standard C library's utime.h.     *
+*                                                                             *
+*   Notes:	    The Unix standard now standardizes utime.h location in    *
+*		    the include directory itself.			      *
+*                   Microsoft put it in the include/sys subdirectory.         *
+*                                                                             *
+*   History:								      *
+*    2014-12-13 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _MSVXLIBX_UTIME_H
+#define _MSVXLIBX_UTIME_H
+
+/* In MS-DOS, simply use MSVC's sys/utime.h. */
+
+#ifdef _MSDOS
+
+#include <sys/utime.h>
+
+#define lutime utime /* There are no links in MS-DOS, so lutime() is the same as utime() */
+
+#endif /* _MSDOS */
+
+
+/* In Windows, we use MSVC's sys/utime.h, but redefine the utime*() functions. */
+
+#ifdef _WIN32
+
+#include "msvclibx.h" /* Generate a library search record to load MsvcLibX.lib. */
+
+/* Save the initial definition and value of __STDC__ */
+#ifdef __STDC__
+#define _UTIME__STDC__WAS_DEFINED 1
+#pragma push_macro("__STDC__")
+#undef __STDC__
+#else
+#define _UTIME__STDC__WAS_DEFINED 0
+#endif
+
+#define __STDC__ 1 /* Prevents <sys/utime.h> from defining structures and functions without _ */
+
+#include <sys/utime.h>
+
+#ifdef _USE_32BIT_TIME_T
+#define utimbuf __utimbuf32
+#define utime   _utime32x
+#error "32-bits time_t not supported in MsvcLibX' utime."
+#else
+#define utimbuf __utimbuf64
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define utime utimeU
+#define lutime lutimeU
+#else /* _ANSI_SOURCE */
+#define utime utimeA
+#define lutime lutimeA
+#endif
+#endif
+
+/* Our redefinition in utime.c */
+int utimeA(const char * pszFilename, const struct utimbuf * pUtimbuf);
+int lutimeA(const char * pszFilename, const struct utimbuf * pUtimbuf);
+int utimeU(const char * pszFilename, const struct utimbuf * pUtimbuf);
+int lutimeU(const char * pszFilename, const struct utimbuf * pUtimbuf);
+int utimeW(const WCHAR * pszFilename, const struct utimbuf * pUtimbuf);
+int lutimeW(const WCHAR * pszFilename, const struct utimbuf * pUtimbuf);
+int futime(int fd, const struct utimbuf * pUtimbuf);
+
+#undef __STDC__
+
+/* Restore the initial definition and value of __STDC__ */
+#if _UTIME__STDC__WAS_DEFINED
+#pragma pop_macro("__STDC__")
+#endif
+#undef _UTIME__STDC__WAS_DEFINED
+
+#endif /* _WIN32 */
+
+#endif /* _MSVXLIBX_UTIME_H */
+
diff --git a/deps/MsvcLibX/include/msvcWindows.h b/deps/MsvcLibX/include/msvcWindows.h
new file mode 100644
index 0000000000000000000000000000000000000000..1c2d72554b25289113ed37aa1ce3a350889289aa
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcWindows.h
@@ -0,0 +1,60 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    windows.h						      *
+*                                                                             *
+*   Description:    Define MsvcLibX' extensions to the WIN32 API functions    *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-12 JFL Created this file.					      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_WINDOWS_H
+#define	_MSVCLIBX_WINDOWS_H	1
+
+#include "msvclibx.h"
+
+#ifdef _WIN32
+
+#include <windows.h> /* Include Windows SDK's own windows.h */
+
+/****************** Define UTF-8 versions of WIN32 routines ******************/
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+DWORD WINAPI GetFileAttributesU(LPCTSTR lpFileName);
+BOOL  WINAPI GetFileAttributesExU(LPCTSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation);
+DWORD WINAPI GetFullPathNameU(LPCTSTR lpName, DWORD nBufferLength, LPTSTR lpBuf, LPTSTR *lpFilePart);
+DWORD WINAPI GetLongPathNameU(LPCTSTR lpShortName, LPTSTR lpBuf, DWORD nBufferLength);
+
+#ifdef  __cplusplus
+}
+#endif
+
+/********** Redefine the legacy names to point to the UTF-8 version **********/
+
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+
+#undef GetFileAttributes
+#define GetFileAttributes GetFileAttributesU
+
+#undef GetFileAttributesEx
+#define GetFileAttributesEx GetFileAttributesExU
+
+#undef GetFullPathName
+#define GetFullPathName GetFullPathNameU
+
+#undef GetLongPathName
+#define GetLongPathName GetLongPathNameU
+
+#endif /* defined(_UTF8_SOURCE) ... */
+
+#endif /* defined(_WIN32) */
+
+#endif /* defined(_MSVCLIBX_WINDOWS_H) */
diff --git a/deps/MsvcLibX/include/msvcXfreopen.h b/deps/MsvcLibX/include/msvcXfreopen.h
new file mode 100644
index 0000000000000000000000000000000000000000..89fb5425640709419e882d1a67516b4ee342718b
--- /dev/null
+++ b/deps/MsvcLibX/include/msvcXfreopen.h
@@ -0,0 +1,19 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    error.h						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of the GNU CoreUtils library xfreopen func.*
+*                                                                             *
+*   Notes:	    msvclibx: Implement using freopen or _setmode.	      *
+*									      *
+*   History:								      *
+*    2014-02-10 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvclibx.h" /* Generate a library search record to load MsvcLibX.lib. */
+
+extern FILE *xfreopen(const char *filename, const char *mode, FILE *stream);
+
diff --git a/deps/MsvcLibX/include/msvclibx.h b/deps/MsvcLibX/include/msvclibx.h
new file mode 100644
index 0000000000000000000000000000000000000000..00953f13d0a8c192f77190d0dd024b52f6a74bb1
--- /dev/null
+++ b/deps/MsvcLibX/include/msvclibx.h
@@ -0,0 +1,117 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    MsvcLibX.h						      *
+*                                                                             *
+*   Description     MsvcLibX-specific definitions			      *
+*                                                                             *
+*   Notes	    Generates a library search record to load MsvcLibX.lib.   *
+*                                                                             *
+*   History:								      *
+*    2013       JFL Created this file.                                        *
+*    2014-05-30 JFL Added macros to work around the lack of a #include_next.  *
+*    2015-11-15 JFL Added macro UCRT_INCLUDE_FILE for Visual Studio 2015.     *
+*    2016-09-15 JFL Added macro WINSDK_INCLUDE_FILE for Windows SDK.	      *
+*    2016-09-20 JFL Added workaround preventing warnings in WIN95 builds.     *
+*    2016-09-28 JFL Can also be included by MS' Resource Compiler.            *
+*    2017-02-05 JFL Changed the UTF-8 programs initialization method.         *
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* Generate a library search record to load MsvcLibX.lib */
+
+#ifndef _MSVCLIBX_H_
+#define _MSVCLIBX_H_
+
+#if !(defined(_MSC_VER) || defined(RC_INVOKED)) 
+#error The msvclibx library is designed for use with the Microsoft Visual C/C++ tools only.
+#endif
+
+/* Compute the OS-specific suffix */
+#if defined(_WIN64)
+#  define _MSVCLIBX_LIB_OS_SUFFIX "w64"
+#elif defined(_WIN95)
+#  define _MSVCLIBX_LIB_OS_SUFFIX "w95"
+#elif defined(_WIN32)
+#  define _MSVCLIBX_LIB_OS_SUFFIX "w32"
+#elif defined(_MSDOS)
+#  if defined(_M_I86TM)
+#    define _MSVCLIBX_LIB_OS_SUFFIX "dt"
+#  elif defined(_M_I86SM)
+#    define _MSVCLIBX_LIB_OS_SUFFIX "ds"
+#  elif defined(_M_I86LM)
+#    define _MSVCLIBX_LIB_OS_SUFFIX "dl"
+#  else
+#    error No msvclibx.lib version yet for this DOS memory model.
+#  endif
+#else
+#  error No msvclibx.lib version for this target OS.
+#endif
+
+/* Compute the debug-mode-specific suffix */
+#if defined(_DEBUG)
+#  define _MSVCLIBX_LIB_DBG_SUFFIX "d"
+#else
+#  define _MSVCLIBX_LIB_DBG_SUFFIX ""
+#endif
+
+/* Generate the OS-and-debug-mode-specific library name */
+#define _MSVCLIBX_LIB "MsvcLibX" _MSVCLIBX_LIB_OS_SUFFIX _MSVCLIBX_LIB_DBG_SUFFIX ".lib"
+//#pragma message("Adding pragma comment(lib, \"" _MSVCLIBX_LIB "\")")
+//#pragma comment(lib, _MSVCLIBX_LIB)
+
+/* Library-specific routine used internally by many standard routines */
+#if defined(_WIN32)
+extern int Win32ErrorToErrno(); /* Converts the last WIN32 error to a Posix error code */
+#ifndef ELOOP	/* Defined in VS10's errno.h, but not in VS9 */
+#define ELOOP           114
+#endif
+/* Convert an ANSI or UTF-8 or OEM pathname to a Unicode string. Defined in mb2wpath.c. */
+typedef unsigned int UINT;  /* Defined in windef.h */
+typedef const char* LPCSTR; /* Defined in winnt.h */
+#ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t; /* Defined in crtdefs.h */
+#define _WCHAR_T_DEFINED
+#endif
+typedef wchar_t* LPWSTR;    /* Defined in winnt.h */
+extern int MultiByteToWidePath(UINT nCodePage, LPCSTR pszName, LPWSTR pwszName, int nWideBufSize);
+#endif
+/* Count the number of elements in an array */
+#define COUNTOF(array) (sizeof(array)/sizeof(array[0]))
+
+/* Workaround for missing __pragma() directive in old versions of Visual Studio */
+#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER <= 1400) /* For Visual C++ versions up to Visual Studio 2005 */
+#define __pragma(x)
+#endif /* (_MSC_VER <= 1400) */
+
+/* Macros for working around the lack of a #include_next directive */
+#define MSVCLIBX_CONCAT1(a,b) a##b /* Concatenate the raw arguments */
+#define MSVCLIBX_CONCAT(a,b) MSVCLIBX_CONCAT1(a,b) /* Substitute the arguments, then concatenate the values */
+#define MSVCLIBX_STRINGIZE1(x) #x /* Convert the raw argument to a string */
+#define MSVCLIBX_STRINGIZE(x) MSVCLIBX_STRINGIZE1(x) /* Substitute the argument, then convert its value to a string */
+/* Up to VS2013, both kinds of include files were in the same directory. Then in VS2015, they were split in two dirs. */
+#define MSVC_INCLUDE_FILE(relpath) MSVCLIBX_STRINGIZE(MSVCLIBX_CONCAT(MSVCINCLUDE,MSVCLIBX_CONCAT(/,relpath))) /* C compiler include files */
+#define UCRT_INCLUDE_FILE(relpath) MSVCLIBX_STRINGIZE(MSVCLIBX_CONCAT(UCRTINCLUDE,MSVCLIBX_CONCAT(/,relpath))) /* C runtime library include files */
+#define WINSDK_INCLUDE_FILE(relpath) MSVCLIBX_STRINGIZE(MSVCLIBX_CONCAT(WSDKINCLUDE,MSVCLIBX_CONCAT(/,relpath))) /* Windows SDK include files */
+
+/* Support for external linker symbols */
+#if defined(_WIN64)
+#define PUBLIC_SYMBOL_NAME(s) s
+#else /* _MSDOS or _WIN32 */
+#define PUBLIC_SYMBOL_NAME(s) _##s
+#endif
+
+/* Support for UTF-8 command lines */
+#if defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+/* Force linking in MsvcLibX' UTF-8 initialization module */
+#pragma comment(linker, "/include:" MSVCLIBX_STRINGIZE(PUBLIC_SYMBOL_NAME(_initU)))
+#endif /* defined(_UTF8_SOURCE) ... */
+#endif /* defined(_WIN32) */
+
+/* Prevent an incompatibility with <winsock.h>. See MsvcLibX' "sys/time.h" for explanations. */
+#define _WINSOCKAPI_   /* Prevent the inclusion of winsock.h in windows.h */
+
+#endif /*  _MSVCLIBX_H_ */
+
diff --git a/deps/MsvcLibX/include/sys/msvcParam.h b/deps/MsvcLibX/include/sys/msvcParam.h
new file mode 100644
index 0000000000000000000000000000000000000000..096af578cd86c4ca7b0c2c6eb3acf1876dac526c
--- /dev/null
+++ b/deps/MsvcLibX/include/sys/msvcParam.h
@@ -0,0 +1,36 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    sys/param.h						      *
+*                                                                             *
+*   Description     DOS/WIN32 port of standard C library's sys/param.h.	      *
+*                                                                             *
+*   Notes	                                                              *
+*                                                                             *
+*   History								      *
+*    2014-06-10 JFL Created this file.                                        *
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef _SYS_PARAM_H
+#define _SYS_PARAM_H
+
+
+#ifdef _MSDOS
+
+#define _POSIX_ARG_MAX 127	/* Maximum command line size */
+
+#endif
+
+
+#ifdef _WIN32
+
+/* #include MSVC_INCLUDE_FILE(sys\param.h) /* Include MSVC's own <sys/param.h> file */
+
+#define _POSIX_ARG_MAX 8191
+
+#endif /* defined(_WIN32) */
+
+#endif /* !defined(_SYS_PARAM_H) */
+
diff --git a/deps/MsvcLibX/include/sys/msvcStat.h b/deps/MsvcLibX/include/sys/msvcStat.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2b82d0be8fc68f0d2e2391a2d494bc25e6b9607
--- /dev/null
+++ b/deps/MsvcLibX/include/sys/msvcStat.h
@@ -0,0 +1,422 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    stat.h						      *
+*                                                                             *
+*   Description:    MsvcLibX extensions to sys/stat.h.                        *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-06 JFL Moved stat extensions from dirent.h.		      *
+*    2014-02-26 JFL Added proprietary routines for managing file times.       *
+*    2014-03-24 JFL Added a mechanism to also include MSVC's own sys/stat.h.  *
+*                   Renamed this file from statx.h to sys/stat.h.             *
+*    2014-05-27 JFL Added dummy definitions for S_TYPEISSHM() & S_TYPEISTMO().*
+*    2014-06-03 JFL Moved struct timespec definition to sys/time.h.           *
+*    2014-06-06 JFL Moved mode_t & off*_t definition to sys/types.h.	      *
+*		    Moved fseeko* & ftello* functions definitions to stdio.h. *
+*    2014-06-24 JFL Added fstat and fstat64 external references.	      *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*    2016-09-15 JFL Fixed a warning in Visual Studio 2015.		      *
+*									      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_STAT_H
+#define	_MSVCLIBX_STAT_H	1
+
+#include "msvclibx.h"
+
+#include "sys/msvcTypes.h"
+#include <sys/stat.h> /* Include MSVC's own <sys/stat.h> file */
+#include "msvcDirent.h" /* For dirent2stat() arguments definitions */
+#include "msvcTime.h" /* for time_t definition */
+#include "sys/msvcTime.h" /* for timespec definition */
+/* Include MsvcLibX's <direct.h> override, to avoid conflict with the standard mkdir defined here,
+   should <direct.h> be manually included later on in the C source */
+#include <direct.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+/* Define stat and fstat to use 32 or 64 file lengths, as defined by _FILE_OFFSET_BITS */
+/* #undef  stat		/* Not normally defined by MSVC */
+/* #undef  fstat	/* Not normally defined by MSVC */
+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  /* TO DO: Windows 95 has extended functions for handling 64-bits files sizes */
+#else
+#endif
+/* For now, use the MSVC 32-bits functions in all cases */
+#define stat _stat
+#define fstat _fstat
+#define lstat stat
+
+/* Define standard 64-bits structures and functions */
+#if defined(_LARGEFILE_SOURCE64)
+  /* For now, hide the fact that DOS does not support 64-bits lengths */
+  #define off64_t _off_t
+  #define stat64 _stat
+  #define fstat64 _fstat
+  #define lstat64 stat64
+#endif
+
+/* Proprietary function for recovering available infos without calling stat */
+extern int dirent2stat(struct dirent *pDE, struct _stat *pStat);
+#define dirent2stat64 dirent2stat /* The current versions are the same */
+#define _DIRENT2STAT_DEFINED 1
+
+/* MS-DOS always reports local file times. MsvcLibX DOS version generates a
+   pseudo GMT time for files using mktime(), which can then be undone by localtime(). */
+#define LocalFileTime localtime
+
+/* Proprietary function for converting a DOS date/time to a Posix time_t */
+extern time_t Filetime2Timet(uint16_t date, uint16_t time);
+/* Proprietary function for generating a string with the local file time, in the ISO 8601 date/time format */
+extern char *Filetime2String(uint16_t date, uint16_t time, char *pBuf, size_t nBufSize);
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+/* Visual C++ sys/stat.h defines a series of _statXY functions and structures:
+    XY = 32	st_*time is 32-bits __time32_t	&  st_size is 32-bits _off_t
+    XY = 32i64	st_*time is 32-bits __time32_t	&  st_size is 64-bits __int64
+    XY = 64i32	st_*time is 64-bits __time64_t	&  st_size is 32-bits _off_t
+    XY = 64	st_*time is 64-bits __time64_t	&  st_size is 64-bits __int64
+   Then it defines additional _statZ macros generating _statXY, based on:
+    XY = 32	if _USE_32BIT_TIME_T defined	&  Z is ""
+    XY = 32i64	if _USE_32BIT_TIME_T defined	&  Z is i64
+    XY = 64i32	if _USE_32BIT_TIME_T undefined	&  Z is ""
+    XY = 64	if _USE_32BIT_TIME_T undefined	&  Z is i64
+   Special case: In 64-bits windows, _USE_32BIT_TIME_T defined is ignored and #undef(ined)
+*/
+
+/* Define stat and fstat to use 32 or 64 file lengths, as defined by _FILE_OFFSET_BITS */
+/* #undef  stat		/* Not normally defined by MSVC */
+/* #undef  fstat	/* Not normally defined by MSVC */
+
+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  #define _STAT_FILE_SIZE 64
+  #define _STAT_SUFFIX i64
+#else
+  #define _STAT_FILE_SIZE 32
+  #define _STAT_SUFFIX 
+#endif
+
+#define _USE_EXTENDED_STAT_STRUCT 1
+
+#define _VALUEOF(a) a				/* Get the token value */
+#define _CONCAT2T(a,b) a##b			/* Concatenate two tokens (does not expand their values) */
+#define _CONCAT3T(a,b,c) a##b##c		/* Concatenate three tokens (does not expand their values) */
+#define _CONCAT4T(a,b,c,d) a##b##c##d		/* Concatenate four tokens (does not expand their values) */
+#define _CONCAT(a,b) _CONCAT2T(a,b)		/* Concatenate two tokens values */
+#define _CONCAT3(a,b,c) _CONCAT3T(a,b,c)	/* Concatenate three tokens values */
+#define _CONCAT4(a,b,c,d) _CONCAT4T(a,b,c,d)	/* Concatenate four tokens values */
+#define _CON_STAT_CAT1(pre,post) pre##stat##post
+#define _CON_STAT_CAT(pre,post) _CON_STAT_CAT1(pre,post)
+
+/* Define what stat, fstat, lstat, stat64 macros would be,
+   if we were to use MSVC's own stat structures and routines */
+/* Avoid concatenating tokens _stat and _fstat, as these are already macros
+   that would be expanded, and we do not want this as this stage. */ 
+#define _MSVC_stat    _CON_STAT_CAT(_ , _STAT_SUFFIX)
+#define _MSVC_fstat   _CON_STAT_CAT(_f, _STAT_SUFFIX)
+#define _MSVC_lstat   _CON_STAT_CAT(_l, _STAT_SUFFIX)
+#define _MSVC_stat64  _CON_STAT_CAT(_ , i64)
+#define _MSVC_lstat64 _CON_STAT_CAT(_l, i64)
+
+#ifdef _USE_32BIT_TIME_T
+#define _lstat       _lstat32
+#define _lstati64    _lstat32i64
+#define _lstat_ns    _lstat32_ns
+#define _lstati64_ns _lstat32i64_ns
+#else
+#define _lstat       _lstat64i32
+#define _lstati64    _lstat64
+#define _lstat_ns    _lstat64i32_ns
+#define _lstati64_ns _lstat64_ns
+#endif
+
+#if !_USE_EXTENDED_STAT_STRUCT
+  #define _NS_SUFFIX
+#else /* _USE_EXTENDED_STAT_STRUCT */
+  #define _MSVCLIBX_STAT_DEFINED 1
+  #define _NS_SUFFIX _ns
+  /* Define what stat, fstat, lstat, stat64 macros and structures would be,
+     if we were to use MsvcLibX extended stat structures and routines */
+  #define _LIBX_stat   _CONCAT(_MSVC_stat,_ns)
+  #define _LIBX_stat64 _CONCAT(_MSVC_stat64,_ns)
+#include "msvcDebugm.h"
+#pragma message("Defining type struct " VALUEIZE(_LIBX_stat))
+  struct _LIBX_stat {
+    /* MSVC standard stat structure fields */
+    _dev_t          st_dev;
+    _ino_t          st_ino;
+    unsigned short  st_mode;
+    short           st_nlink;
+    short           st_uid;
+    short           st_gid;
+    _dev_t          st_rdev;
+    off_t           st_size;
+    /* End of MSVC standard stat structure fields */
+    struct timespec st_ctim;		/* File creation date/time,  w. ns resolution */
+    struct timespec st_mtim;		/* File modification date/time,  w. ns resolution */
+    struct timespec st_atim;		/* File access date/time,  w. ns resolution */
+    unsigned int    st_Win32Attrs;	/* Win32 file attributes */
+    unsigned int    st_ReparseTag;	/* Reparse point tag */
+  };
+  /* Compatibility with old Unix fields */
+  #define st_ctime st_ctim.tv_sec
+  #define st_mtime st_mtim.tv_sec
+  #define st_atime st_atim.tv_sec
+  /* Compatibility with intermediate Unix fields */
+  #define st_ctimensec st_ctim.tv_nsec	/* Nanosecond part of the file creation time */
+  #define st_mtimensec st_mtim.tv_nsec	/* Nanosecond part of the file modification time */
+  #define st_atimensec st_atim.tv_nsec	/* Nanosecond part of the file access time */
+
+  #if (_STAT_FILE_SIZE != 64) /* Else it's the same as struct stat */
+#pragma message("Defining type struct " VALUEIZE(_LIBX_stat64))
+    struct _LIBX_stat64 {
+      /* MSVC standard stat structure fields */
+      _dev_t          st_dev;
+      _ino_t          st_ino;
+      unsigned short  st_mode;
+      short           st_nlink;
+      short           st_uid;
+      short           st_gid;
+      _dev_t          st_rdev;
+      off64_t         st_size;
+      /* End of MSVC standard stat structure fields */
+      struct timespec st_ctim;		/* File creation date/time,  w. ns resolution */
+      struct timespec st_mtim;		/* File modification date/time,  w. ns resolution */
+      struct timespec st_atim;		/* File access date/time,  w. ns resolution */
+      unsigned int    st_Win32Attrs;	/* Win32 file attributes */
+      unsigned int    st_ReparseTag;	/* Reparse point tag */
+    };
+  #endif
+#endif /* !_USE_EXTENDED_STAT_STRUCT */
+
+/* Define standard stat, fstat, lstat macros */
+#define stat    _CONCAT(_MSVC_stat,_NS_SUFFIX)
+#define fstat   _CONCAT(_MSVC_fstat,_NS_SUFFIX)
+#define lstat   _CONCAT(_MSVC_lstat,_NS_SUFFIX)
+
+/* Reference standard stat, fstat, lstat functions that we redefine */
+#if _USE_EXTENDED_STAT_STRUCT /* Else we'll use MSVC's version */
+extern int stat(const char *path, struct stat *buf);
+extern int fstat(int nFile, struct stat *buf);
+#endif
+extern int lstat(const char *path, struct stat *buf);
+
+/* Define standard 64-bits macros and functions */
+#if defined(_LARGEFILE_SOURCE64)
+  #define stat64 _CONCAT(_stati64,_NS_SUFFIX)
+  #define fstat64 _CONCAT(_fstati64,_NS_SUFFIX)
+  #define lstat64 _CONCAT(_lstati64,_NS_SUFFIX)
+
+  #if (_STAT_FILE_SIZE != 64) /* Else they're the same as functions stat & lstat */
+    #if _USE_EXTENDED_STAT_STRUCT /* Else we'll use MSVC's version */
+      extern int stat64(const char *path, struct stat64 *buf);
+      extern int fstat64(int nFile, struct stat *buf);
+    #endif
+    extern int lstat64(const char *path, struct stat64 *buf);
+  #endif
+#endif
+
+/* Proprietary function for recovering dirent infos without calling stat */
+/* Note: MSDOS has a single stat version, and its dirent2stat implementation is in dirent.c */
+#ifdef _USE_32BIT_TIME_T
+#if (_STAT_FILE_SIZE != 64) /* Else if _STAT_FILE_SIZE=64, then struct _stat32_ns isn't defined */
+extern int _CONCAT(_dirent2_stat32,_NS_SUFFIX)(struct dirent *pDE, struct _CONCAT(_stat32,_NS_SUFFIX) *pStat);
+#endif
+extern int _CONCAT(_dirent2_stat32i64,_NS_SUFFIX)(struct dirent *pDE, struct _CONCAT(_stat32i64,_NS_SUFFIX) *pStat);
+#else
+#if (_STAT_FILE_SIZE != 64) /* Else if _STAT_FILE_SIZE=64, then struct _stat64i32_ns isn't defined */
+extern int _CONCAT(_dirent2_stat64i32,_NS_SUFFIX)(struct dirent *pDE, struct _CONCAT(_stat64i32,_NS_SUFFIX) *pStat);
+#endif
+extern int _CONCAT(_dirent2_stat64,_NS_SUFFIX)(struct dirent *pDE, struct _CONCAT(_stat64,_NS_SUFFIX) *pStat);
+#endif
+#define dirent2stat _CONCAT(_dirent2,stat)
+#define _DIRENT2STAT_DEFINED 1
+
+#define unlink _CONCAT(_unlink_, stat)
+#define rmdir _CONCAT(_rmdir_, stat)
+extern int unlink(const char *path);
+extern int rmdir(const char *path);
+
+/* Proprietary function for generating a printable local file time,
+   using Windows' specific algorithm, to match cmd.exe dir output. */
+extern struct tm *LocalFileTime(const time_t *pt);
+
+/* Proprietary function for converting a Win32 FILETIME to a Posix time_t */
+extern time_t Filetime2Timet(const FILETIME *pFT);
+/* Proprietary function for converting a Posix time_t to a Win32 FILETIME */
+extern void Timet2Filetime(time_t s, FILETIME *pFT);
+
+/* Proprietary function for converting a Win32 FILETIME to a Posix {time_t,nanosecond} */
+extern void Filetime2Timespec(const FILETIME *pFT, struct timespec *pTS);
+/* Proprietary function for converting a Posix {time_t,nanosecond} to a Win32 FILETIME */
+extern void Timespec2Filetime(const struct timespec *pTS, FILETIME *pFT);
+
+/* Proprietary function for generating a string with the local file time, in the ISO 8601 date/time format */
+extern char *Filetime2String(const FILETIME *pFT, char *pBuf, size_t nBufSize);
+
+#endif /* defined(_WIN32) */
+
+/************************* OS/2-specific definitions *************************/
+
+#ifdef _OS2	/* Automatically defined when targeting an OS/2 application? */
+
+/* Define stat and fstat to use 32 or 64 file lengths, as defined by _FILE_OFFSET_BITS */
+/* #undef  stat		/* Not normally defined by MSVC */
+/* #undef  fstat	/* Not normally defined by MSVC */
+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  /* TO DO: Windows 95 has extended functions for handling 64-bits files sizes */
+#else
+#endif
+/* For now, use the MSVC 32-bits functions in all cases */
+#define off_t _off_t
+#define stat _stat
+#define fstat _fstat
+#define lstat stat
+
+/* Define standard 64-bits functions */
+#if defined(_LARGEFILE_SOURCE64)
+  /* For now, hide the fact that DOS does not support 64-bits lengths */
+  #define off64_t _off_t
+  #define stat64 _stat
+  #define fstat64 _fstat
+  #define lstat64 stat64
+#endif
+
+/* Proprietary function for recovering available infos without calling stat */
+/* extern int dirent2stat(struct dirent *pDE, struct _stat *pStat); */
+/* #define dirent2stat64 dirent2stat /* The current versions are the same */
+/* #define _DIRENT2STAT_DEFINED 1 */
+
+/* To do: Check if OS/2 uses local or GMT times, and implement LocalFileTime() if needed. */
+#define LocalFileTime localtime
+
+#endif /* defined(_OS2) */
+
+/********************** End of OS-specific definitions ***********************/
+
+#define lchmod chmod /* MSVC is buggy and chmod() applies to the link itself */
+
+/* Structure stat standard st_mode values not defined in DOS/Windows' sys/stat.h */
+/* Must match the d_type field types in dirent.h. */
+/* #define S_IFMT  0xF000   /* Mask for the 4-bit file type                    */
+#define S_IFIFO    0x1000   /* FIFO                                            */
+/* #define S_IFCHR 0x2000   /* Character device                                */
+/* #define S_IFDIR 0x4000   /* Directory                                       */
+#define S_IFBLK    0x6000   /* Block device                                    */
+/* #define S_IFREG 0x8000   /* Regular file                                    */
+#define S_IFLNK    0xA000   /* Symbolic link                                   */
+#define S_IFSOCK   0xC000   /* Socket                                          */
+
+/* Structure stat standard st_mode type test macros */
+/* The existence of these macros can be used to test for the OS support of the feature */
+#define S_ISTYPE(m, TYPE) ((m & S_IFMT) == TYPE)
+/* Both DOS and Windows support these file types */
+#define S_ISCHR(m)  S_ISTYPE(m, S_IFCHR)  /* Test for a character device */
+#define S_ISDIR(m)  S_ISTYPE(m, S_IFDIR)  /* Test for a directory */
+#define S_ISREG(m)  S_ISTYPE(m, S_IFREG)  /* Test for a regular file */
+#ifdef _WIN32	/* Only Windows supports these */
+#define S_ISLNK(m)  S_ISTYPE(m, S_IFLNK)  /* Test for a symbolic link */
+#endif
+#if 0		/* Only Unix supports these? At least MsvcLibX does not support them now. */
+#define S_ISBLK(m)  S_ISTYPE(m, S_IFBLK)  /* Test for a block device */
+#define S_ISFIFO(m) S_ISTYPE(m, S_IFIFO)  /* Test for a pipe or FIFO */
+#define S_ISSOCK(m) S_ISTYPE(m, S_IFSOCK) /* Test for a socket */
+#endif
+
+#define S_ISBLK(m)  0	/* Test for a block device */
+#define S_ISCTG(m)  0	/* Test for a high performance ("contiguous data") file */
+#define S_ISDOOR(m) 0	/* Test for a door */
+#define S_ISFIFO(m) 0	/* Test for a pipe or FIFO */
+#define S_ISMPB(m)  0	/* Test for a multiplexed block device */
+#define S_ISMPC(m)  0	/* Test for a multiplexed character device */
+#define S_ISNWK(m)  0	/* Test for a network special file (HP-UX) */
+#define S_ISPORT(m) 0	/* Test for a port */
+#define S_ISSOCK(m) 0	/* Test for a socket */
+#define S_ISWHT(m)  0	/* Test for a whiteout (4.4BSD) */
+
+
+/* Other optional file types that some operating systems support */ 
+#define S_TYPEISMQ(pStat) 0	/* Test for a message queue */
+#define S_TYPEISSEM(pStat) 0	/* Test for a semaphore */
+#define S_TYPEISSHM(pStat) 0	/* Test for a shared memory object */
+#define S_TYPEISTMO(pStat) 0	/* Test for a typed memory object */
+
+/* Structure stat standard st_mode flags */
+#define S_ISUID    04000    /* Set UID bit                                     */
+#define S_ISGID    02000    /* Set-group-ID bit                                */
+#define S_ISVTX    01000    /* Sticky bit                                      */
+
+#define S_IRWXU    0700     /* Mask for file owner permissions                 */
+#define S_IRUSR    0400     /* Owner has read permission.    Alias S_IREAD     */
+#define S_IWUSR    0200     /* Owner has write permission.   Alias S_IWRITE    */
+#define S_IXUSR    0100     /* Owner has execute permission. Alias S_IEXEC     */
+
+#define S_IRWXG    070      /* Mask for group permissions                      */
+#define S_IRGRP    040      /* Group has read permission                       */
+#define S_IWGRP    020      /* Group has write permission                      */
+#define S_IXGRP    010      /* Group has execute permission                    */
+
+#define S_IRWXO    07       /* Mask for permissions for others (not in group)  */
+#define S_IROTH    04       /* Others have read permission                     */
+#define S_IWOTH    02       /* Others have write permission                    */
+#define S_IXOTH    01       /* Others have execute permission                  */
+
+#define S_IRWXUGO  00777    /* S_IRWXU|S_IRWXG|S_IRWXO */
+#define S_IALLUGO  07777    /* S_ISUID|S_ISGID|S_ISVTX|S_IRWXUGO */
+#define S_IRUGO    00444    /* S_IRUSR|S_IRGRP|S_IROTH */
+#define S_IWUGO    00222    /* S_IWUSR|S_IWGRP|S_IWOTH */
+#define S_IXUGO    00111    /* S_IXUSR|S_IXGRP|S_IXOTH */
+
+/* Structure stat extensions for DOS/Windows file attributes */
+#define S_IFVOLID  0xF000   /* Volume ID pseudo-file, defined in FAT root dir */
+#define S_ISVOLID(m) S_ISTYPE(m, S_IFVOLID) /* Test for a FAT volume ID */
+#define S_HIDDEN		01	/* Reuse permissions bit not used in DOS/Windows */
+#define S_ARCHIVE		02	/* Reuse permissions bit not used in DOS/Windows */
+#define S_SYSTEM		04	/* Reuse permissions bit not used in DOS/Windows */
+#define S_COMPRESSED		010	/* Reuse permissions bit not used in DOS/Windows */
+#define S_ENCRYPTED		020	/* Reuse permissions bit not used in DOS/Windows */
+#define S_NOT_CONTENT_INDEXED	040	/* Reuse permissions bit not used in DOS/Windows */
+#define S_OFFLINE		01000	/* Reuse sticky bit, not used in DOS/Windows */
+#define S_SPARSE_FILE		02000	/* Reuse GID bit, not used in DOS/Windows */
+#define S_MOUNT_POINT		04000	/* Reuse UID bit, not used in DOS/Windows */
+/* #define S_TEMPORARY			/* Reuse UID bit, not used in DOS/Windows */
+/* #define S_VIRTUAL			/* No bit left for this one */
+
+#if defined(_MSDOS)
+#define _mkdirx(path, mode) _mkdir(path)
+#elif defined(_WIN32)
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define _mkdirx(path, mode) mkdirU(path, mode)
+#else /* _ANSI_SOURCE */
+#define _mkdirx(path, mode) mkdirA(path, mode)
+#endif /* defined(_UTF8_SOURCE) */
+extern int mkdirU(const char *path, mode_t mode);
+extern int mkdirA(const char *path, mode_t mode);
+#endif /* defined(_MSDOS) */
+#define mkdir(path, mode) _mkdirx(path, mode)
+
+/* Special values for futimens() and utimensat(). Must not be in [0...((10^9)-1)] */
+#define UTIME_NOW  1000000001
+#define UTIME_OMIT 1000000002
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* defined(_MSVCLIBX_STAT_H)  */
+
diff --git a/deps/MsvcLibX/include/sys/msvcTime.h b/deps/MsvcLibX/include/sys/msvcTime.h
new file mode 100644
index 0000000000000000000000000000000000000000..d538f6aa7646864cda3482fd2dcd2acfba8dda3e
--- /dev/null
+++ b/deps/MsvcLibX/include/sys/msvcTime.h
@@ -0,0 +1,114 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    sys/time.h						      *
+*                                                                             *
+*   Description     DOS/WIN32 port of standard C library's sys/time.h.	      *
+*                                                                             *
+*   Notes	    MUST be included before any direct or indirect inclusion  *
+*		    of <windows.h>, as this sys/time.h file has a definition  *
+*		    of struct timeval conflicting with that in <winsock.h>,   *
+*		    and as a workaround it defines _WINSOCKAPI_ to prevent    *
+*		    <windows.h> from loading <winsock.h>.		      *
+*                                                                             *
+*		    The same conflict exists with <winsock2.h>, but this one  *
+*		    is not loaded automatically, and hence should not be      *
+*		    visible to Unix apps built with the MsvcLibX library.     *
+*                                                                             *
+*   History								      *
+*    2014-02-11 JFL Created this file.                                        *
+*    2014-05-30 JFL Added the workaround for the conflict with <winsock.h>.   *
+*    2014-06-03 JFL Moved struct timespec definition from sys/stat.h.         *
+*		    Added macros TIMEVAL_TO_TIMESPEC & TIMESPEC_TO_TIMEVAL.   *
+*    2016-07-06 JFL Avoid error if winsocks2.h has been previously included.  *
+*		    							      *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include <time.h> /* for time_t definition */
+
+#ifndef _SYS_TIME_H
+#define _SYS_TIME_H
+
+#ifdef _MSDOS
+/* MS-DOS only has a 2-second resolution on file times.
+   Use the existence of macro _STRUCT_TIMEVAL to test if it's possible
+   to use utimes(), else use utime(), which is supported by all OSs */
+#endif
+
+#ifdef _WIN32
+
+/* There's a conflict with the timeval definition in winsock.h, which uses
+   a long instead of a time_t for tv_sec. See:
+   C:\Pgm64\Microsoft SDKs\Windows\v7.0\INCLUDE\winsock.h
+*/
+#define _WINSOCKAPI_   /* Prevent the inclusion of winsock.h in windows.h */
+/* Could also #define WIN32_LEAN_AND_MEAN /* Avoid including many optional Windows features, including winsock.h  */
+
+#include <windows.h>	/* For WCHAR */
+
+#ifndef _STRUCT_TIMEVAL
+#define _STRUCT_TIMEVAL       1
+
+#ifndef _WINSOCK2API_	/* Prevent compilation errors if winsocks2.h has been previously included */
+/* A time value with microsecond precision */
+struct timeval {
+  time_t tv_sec;	/* Seconds */
+  int tv_usec;		/* Signed count of microseconds */
+};
+#endif /* _WINSOCK2API */
+
+#endif /* !defined(_STRUCT_TIMEVAL) */
+
+/* 2015-12-04 JFL Bug fix: With VS14/VC19, the UCRT defines timespec, with a long tv_nsec */
+#ifndef _UCRT
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+
+/* A time value with nanosecond precision */
+struct timespec {
+  time_t tv_sec;	/* Seconds */
+  int tv_nsec;		/* Signed count of nanoseconds */
+};
+#define _TIMESPEC_DEFINED /* Some packages test this before redefining it */
+
+#endif /* !defined(_STRUCT_TIMESPEC) */
+#endif /* !defined(_UCRT) */
+
+#define	TIMEVAL_TO_TIMESPEC(ptv, pts) {					\
+	(pts)->tv_sec = (ptv)->tv_sec;					\
+	(pts)->tv_nsec = (ptv)->tv_usec * 1000;				\
+}
+#define	TIMESPEC_TO_TIMEVAL(ptv, pts) {					\
+	(ptv)->tv_sec = (pts)->tv_sec;					\
+	(ptv)->tv_usec = (pts)->tv_nsec / 1000;				\
+}
+
+/* Change the file access time to tvp[0] and its modification time to tvp[1]. */
+int utimesA(const char *file, const struct timeval tvp[2]);
+int utimesU(const char *file, const struct timeval tvp[2]);
+int utimesW(const WCHAR *file, const struct timeval tvp[2]);
+
+/* Same as 'utimes', but does not follow symbolic links. */
+int lutimesA(const char *path, const struct timeval tvp[2]);
+int lutimesU(const char *path, const struct timeval tvp[2]);
+int lutimesW(const WCHAR *path, const struct timeval tvp[2]);
+
+/* Same as 'utimes', but takes an open file descriptor instead of a name. */
+int futimes(int fd, const struct timeval tvp[2]);
+
+#if defined(_UTF8_SOURCE) || defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
+#define utimes utimesU
+#define lutimes lutimesU
+#else /* _ANSI_SOURCE */
+#define utimes utimesA
+#define lutimes lutimesA
+#endif
+
+/* Get the current date and time into a struct timeval */
+int gettimeofday(struct timeval *ptv, void *pTimeZone);
+
+#endif /* defined(_WIN32) */
+
+#endif /* !defined(_SYS_TIME_H) */
+
diff --git a/deps/MsvcLibX/include/sys/msvcTsname.h b/deps/MsvcLibX/include/sys/msvcTsname.h
new file mode 100644
index 0000000000000000000000000000000000000000..41d97a3719e9f615024f5f20f703a6d7082b1184
--- /dev/null
+++ b/deps/MsvcLibX/include/sys/msvcTsname.h
@@ -0,0 +1,31 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    sys/utsname.h					      *
+*                                                                             *
+*   Description:    Defines structure utsname and function uname().           *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-05-30 JFL Created this file.                    		      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_SYS_UTSNAME_H
+#define	_SYS_UTSNAME_H	1
+
+#include "msvclibx.h"
+
+struct utsname {
+  char *sysname;  /* Name of this implementation of the operating system */
+  char *nodename; /* Name of this node on the network */
+  char *release;  /* Current release level of this implementation */
+  char *version;  /* Current version level of this release */
+  char *machine;  /* Name of the hardware type on which the system is running */
+};
+
+int uname(struct utsname *);
+
+#endif /* _SYS_UTSNAME_H */
diff --git a/deps/MsvcLibX/include/sys/msvcTypes.h b/deps/MsvcLibX/include/sys/msvcTypes.h
new file mode 100644
index 0000000000000000000000000000000000000000..bde2ac9a8a168465bbea940c0505c4a9654c4d51
--- /dev/null
+++ b/deps/MsvcLibX/include/sys/msvcTypes.h
@@ -0,0 +1,99 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    sys/types.h						      *
+*                                                                             *
+*   Description:    Add missing definitions in MSVC's sys/types.h.	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-05-26 JFL Created this file.                                        *
+*    2014-06-06 JFL Moved mode_t & off*_t definitions here, from sys\stat.h.  *
+*    2015-11-15 JFL Visual Studio 2015 moved this file to the Windows Kit UCRT.
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef	_MSVCLIBX_SYS_TYPES_H
+#define	_MSVCLIBX_SYS_TYPES_H 1
+
+#include "msvclibx.h"
+
+#include <sys\types.h> /* Include MSVC's own <sys/types.h> file */
+
+/************************ MS-DOS-specific definitions ************************/
+
+#ifdef _MSDOS	/* Automatically defined when targeting an MS-DOS application */
+
+
+
+/* File offset type */
+/* For now, use the MSVC 32-bits functions in all cases */
+#define off_t _off_t
+
+typedef int pid_t;  /* The pid is the PSP segment. MSVC's process.h defines it as int. */
+
+#endif /* defined(_MSDOS) */
+
+/************************ Win32-specific definitions *************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+/* File offset types */
+#define off64_t __int64 /* Don't use a typedef because MSVC's _fseeki64 doesn't like it */
+
+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+  #define off_t off64_t
+#else
+  #define off_t _off_t
+#endif
+
+typedef unsigned long DWORD; /* Don't include <windows.h> to get DWORD definition, as this draws too much,
+				including things we want to override in other parts of MsvcLibX */
+
+typedef DWORD pid_t;        /* Windows defines it as a DWORD */
+
+#endif /* defined(_WIN32) */
+
+/************************* OS/2-specific definitions *************************/
+
+#ifdef _OS2	/* Automatically defined when targeting an OS/2 application? */
+
+/* File offset type */
+/* For now, use the MSVC 32-bits functions in all cases */
+#define off_t _off_t
+
+
+#endif /* defined(_OS2) */
+
+/********************** End of OS-specific definitions ***********************/
+
+/* Signed size type */
+#ifndef _SSIZE_T_DEFINED
+#if defined(_MSDOS)
+typedef int ssize_t;
+#elif defined(_WIN32)
+#include <stdint.h>
+#ifdef  _WIN64
+typedef __int64 ssize_t;
+#else
+typedef _W64 int ssize_t;
+#endif /* defined(_WIN64) */
+#endif /* defined(_WIN32) */
+#define _SSIZE_T_DEFINED
+#endif /* !_SSIZE_T_DEFINED */
+
+/* MsvcLibX handles uid_t and gid_t in pwd.c and grp.c */
+typedef int gid_t;
+typedef int uid_t;
+
+/* MsvcLibX uses mode_t in sys/stat.h */
+typedef int mode_t;
+#define HAVE_MODE_T
+
+/* File link counts type (not used by MsvcLibX so far) */
+typedef int nlink_t; /* Is short in some Unix versions */
+
+#endif /* !defined(_MSVCLIBX_SYS_TYPES_H) */
+
diff --git a/deps/MsvcLibX/src/GetFileAttributes.c b/deps/MsvcLibX/src/GetFileAttributes.c
new file mode 100644
index 0000000000000000000000000000000000000000..386114ed70d1fd7ab50b5b027b7f469f8a6b33cd
--- /dev/null
+++ b/deps/MsvcLibX/src/GetFileAttributes.c
@@ -0,0 +1,67 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    GetFileAttributes.c					      *
+*									      *
+*   Description:    UTF-8 version of WIN32's GetFileAttributes()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-12 JFL Created this file.					      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#include <windows.h>	/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+#include "msvcLimits.h"
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    GetFileAttributesU					      |
+|                                                                             |
+|   Description:    Get atributes for a UTF-8 path.			      |
+|                                                                             |
+|   Parameters:     See WIN32's GetFileAttributes()			      |
+|                                                                             |
+|   Return value:   The file attributes flags				      |
+|                                                                             |
+|   Notes:								      |
+|                                                                             |
+|   History:								      |
+|    2014-07-02 JFL Created this routine                                      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+DWORD WINAPI GetFileAttributesU(LPCTSTR lpFileName) {
+  WCHAR *pwszName;
+  DWORD dwAttrs;
+  int n;
+
+  /* Allocate a buffer large enough for any Unicode pathname */
+  pwszName = (void *)LocalAlloc(LMEM_FIXED, UNICODE_PATH_MAX * sizeof(WCHAR));
+  if (!pwszName) return 0;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  lpFileName,		/* lpMultiByteStr, */
+			  pwszName,		/* lpWideCharStr, */
+			  UNICODE_PATH_MAX	/* cchWideChar, */
+			  );
+  if (!n) {
+    LocalFree((HLOCAL)pwszName);
+    return 0;
+  }
+
+  /* Get the file attributes, using the Unicode version of the function */
+  dwAttrs = GetFileAttributesW(pwszName);
+
+  /* Cleanup and return */
+  LocalFree((HLOCAL)pwszName);
+  return dwAttrs;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/GetFileAttributesEx.c b/deps/MsvcLibX/src/GetFileAttributesEx.c
new file mode 100644
index 0000000000000000000000000000000000000000..caf3c27342eab0b09e9b2e00eb0b22dd80d5ea37
--- /dev/null
+++ b/deps/MsvcLibX/src/GetFileAttributesEx.c
@@ -0,0 +1,72 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    GetFileAttributesEx.c				      *
+*									      *
+*   Description:    UTF-8 version of WIN32's GetFileAttributesEx()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-12 JFL Created this file.					      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#include <windows.h>	/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+#include "msvcLimits.h"
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    GetFileAttributesExU				      |
+|                                                                             |
+|   Description:    Get file information for a UTF-8 pathname.		      |
+|                                                                             |
+|   Parameters:     See WIN32's GetFileAttributesEx()			      |
+|                                                                             |
+|   Return value:   1 = done, or 0 if error				      |
+|                                                                             |
+|   Notes:	    Sets the file length, dates, attributes, etc.	      |
+|                                                                             |
+|   History:								      |
+|    2016-09-12 JFL Created this routine.				      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+BOOL WINAPI GetFileAttributesExU(
+  LPCTSTR                lpFileName,
+  GET_FILEEX_INFO_LEVELS fInfoLevelId,
+  LPVOID                 lpFileInformation
+) {
+  WIN32_FILE_ATTRIBUTE_DATA *lpFileData = lpFileInformation;
+  WCHAR *pwszName;
+  BOOL bDone;
+  int n;
+
+  /* Allocate a buffer large enough for any Unicode pathname */
+  pwszName = (void *)LocalAlloc(LMEM_FIXED, UNICODE_PATH_MAX * sizeof(WCHAR));
+  if (!pwszName) return 0;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  lpFileName,		/* lpMultiByteStr, */
+			  pwszName,		/* lpWideCharStr, */
+			  UNICODE_PATH_MAX	/* cchWideChar, */
+			  );
+  if (!n) {
+    LocalFree((HLOCAL)pwszName);
+    return 0;
+  }
+
+  /* Get the file information, using the Unicode version of the function */
+  bDone = GetFileAttributesExW(pwszName, fInfoLevelId, lpFileData);
+
+  /* Cleanup and return */
+  LocalFree((HLOCAL)pwszName);
+  return bDone;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/GetFullPathName.c b/deps/MsvcLibX/src/GetFullPathName.c
new file mode 100644
index 0000000000000000000000000000000000000000..4e9afeec3e9f197d66bdc587bddeeff98b24da8d
--- /dev/null
+++ b/deps/MsvcLibX/src/GetFullPathName.c
@@ -0,0 +1,96 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    GetFullPathName.c					      *
+*									      *
+*   Description:    UTF-8 version of WIN32's GetFullPathName()		      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-12 JFL Created this file, from the routine in truename.c.	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#include <windows.h>	/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+#include "msvcLimits.h"
+#include "msvcDebugm.h"	/* MsvcLibX debugging macros */
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    GetFullPathNameU					      |
+|                                                                             |
+|   Description:    Get the absolute pathname for a relative UTF-8 path.      |
+|                                                                             |
+|   Parameters:     See WIN32's GetFullPathName()			      |
+|                                                                             |
+|   Return value:   The length of the full pathname, or 0 if error	      |
+|                                                                             |
+|   Notes:	    Warning: Windows' GetFullPathname trims trailing dots and |
+|		    spaces from the path.				      |
+|		    This derived function reproduces the bug.		      |
+|                   The caller MUST add trailing dots & spaces back if needed.|
+|                                                                             |
+|   History:								      |
+|    2014-02-07 JFL Created this routine.				      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+DWORD WINAPI GetFullPathNameU(LPCTSTR lpName, DWORD nBufferLength, LPTSTR lpBuf, LPTSTR *lpFilePart) {
+  WCHAR wszName[MAX_PATH];
+  WCHAR wszBuf[MAX_PATH];
+  char szName[MAX_PATH*4]; /* Worst case for UTF-8 is 4 bytes/Unicode character */
+  int n;
+  DWORD dwResult;
+  WCHAR *wlpFilePart;
+
+  DEBUG_ENTER(("GetFullPathNameU(\"%s\", %d, %p, %p);\n", lpName, nBufferLength, lpBuf, lpFilePart));
+
+  n = MultiByteToWideChar(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  lpName,		/* lpMultiByteStr, */
+			  lstrlen(lpName)+1,	/* cbMultiByte, */
+			  wszName,		/* lpWideCharStr, */
+			  MAX_PATH		/* cchWideChar, */
+			  );
+  if (!n) RETURN_INT_COMMENT(0, ("Failed to convert the name to Unicode\n"));
+
+  dwResult = GetFullPathNameW(wszName, MAX_PATH, wszBuf, &wlpFilePart);
+  if (!dwResult) RETURN_INT_COMMENT(0, ("GetFullPathNameW() failed\n"));
+
+  /* nRead = UnicodeToBytes(pwStr, len, buf, bufsize); */
+  n = WideCharToMultiByte(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  wszBuf,		/* lpWideCharStr, */
+			  (int)dwResult + 1,	/* cchWideChar, */
+			  lpBuf,		/* lpMultiByteStr, */
+			  (int)nBufferLength,	/* cbMultiByte, */
+			  NULL,			/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) RETURN_INT_COMMENT(0, ("Failed to convert the full name from Unicode\n"));
+
+  if (lpFilePart) { /* Convert the file part, and get the length of the converted string */
+    int m;	/* Length of the converted string */
+    m = WideCharToMultiByte(CP_UTF8,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			    0,				/* dwFlags, */
+			    wlpFilePart,		/* lpWideCharStr, */
+			    lstrlenW(wlpFilePart),	/* cchWideChar, */
+			    szName,			/* lpMultiByteStr, */
+			    sizeof(szName),		/* cbMultiByte, */
+			    NULL,			/* lpDefaultChar, */
+			    NULL			/* lpUsedDefaultChar */
+			    );
+    /* (n-1) is the length of the full UTF-8 pathname */
+    /* So ((n-1) - m) is the offset of the file part in the full UTF-8 pathname */
+    *lpFilePart = lpBuf + (n - 1) - m;
+  }
+
+  RETURN_INT_COMMENT(n-1, ("\"%s\" \"%s\"\n", lpBuf, lpFilePart?*lpFilePart:"(NULL)"));
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/GetLongPathName.c b/deps/MsvcLibX/src/GetLongPathName.c
new file mode 100644
index 0000000000000000000000000000000000000000..b0bbc245d94ebe0aa5f50ba37b394daa0d97f3e8
--- /dev/null
+++ b/deps/MsvcLibX/src/GetLongPathName.c
@@ -0,0 +1,75 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    GetLongPathName.c					      *
+*									      *
+*   Description:    UTF-8 version of WIN32's GetLongPathName()		      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2016-09-12 JFL Created this file, from the routine in truename.c.	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#include <windows.h>	/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+#include "msvcLimits.h"
+#include "msvcDebugm.h"	/* MsvcLibX debugging macros */
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    GetLongPathNameU					      |
+|                                                                             |
+|   Description:    Get the long pathname for a short UTF-8 path.	      |
+|                                                                             |
+|   Parameters:     See WIN32's GetLongPathName()			      |
+|                                                                             |
+|   Return value:   The length of the full pathname, or 0 if error	      |
+|                                                                             |
+|   Notes:								      |
+|                                                                             |
+|   History:								      |
+|    2015-12-18 JFL Created this routine.				      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+DWORD WINAPI GetLongPathNameU(LPCTSTR lpShortName, LPTSTR lpBuf, DWORD nBufferLength) {
+  WCHAR wszShortName[MAX_PATH];
+  WCHAR wszBuf[MAX_PATH];
+  int n;
+  DWORD dwResult;
+
+  DEBUG_ENTER(("GetLongPathNameU(\"%s\", %p, %d);\n", lpShortName, lpBuf, nBufferLength));
+
+  n = MultiByteToWideChar(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  lpShortName,		/* lpMultiByteStr, */
+			  lstrlen(lpShortName)+1,  /* cbMultiByte, */
+			  wszShortName,		/* lpWideCharStr, */
+			  MAX_PATH		/* cchWideChar, */
+			  );
+  if (!n) RETURN_INT_COMMENT(0, ("Failed to convert the short name to Unicode\n"));
+
+  dwResult = GetLongPathNameW(wszShortName, wszBuf, MAX_PATH);
+  if (!dwResult) RETURN_INT_COMMENT(0, ("GetLongPathNameW() failed\n"));
+
+  /* nRead = UnicodeToBytes(pwStr, len, buf, bufsize); */
+  n = WideCharToMultiByte(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  wszBuf,		/* lpWideCharStr, */
+			  (int)dwResult + 1,	/* cchWideChar, */
+			  lpBuf,		/* lpMultiByteStr, */
+			  (int)nBufferLength,	/* cbMultiByte, */
+			  NULL,			/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) RETURN_INT_COMMENT(0, ("Failed to convert the Long name from Unicode\n"));
+
+  RETURN_INT_COMMENT(n-1, ("\"%s\"\n", lpBuf));
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/access.c b/deps/MsvcLibX/src/access.c
new file mode 100644
index 0000000000000000000000000000000000000000..77f0b8341066c0a8a1e34c87f5eeffa8c174bd81
--- /dev/null
+++ b/deps/MsvcLibX/src/access.c
@@ -0,0 +1,68 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    access.c						      *
+*									      *
+*   Description:    WIN32 UTF-8 version of access			      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-03-24 JFL Created this module.				      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <errno.h>
+#include <io.h>
+#include "msvcStdio.h"
+#include "msvclibx.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        access	                                              |
+|                                                                             |
+|   Description     UTF-8 version of access				      |
+|                                                                             |
+|   Parameters      char *pszName	File name			      |
+|                   int iMode		Access mode to test		      |
+|                                                                             |
+|   Returns         File handle						      |
+|                                                                             |
+|   Notes                                                                     |
+|                                                                             |
+|   History								      |
+|    2014-03-24 JFL Created this routine.                      		      |
+|    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+int _accessU(const char *pszName, int iMode) {
+  WCHAR wszName[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszName,		/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  COUNTOF(wszName)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+
+  return _waccess(wszName, iMode);
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/basename.c b/deps/MsvcLibX/src/basename.c
new file mode 100644
index 0000000000000000000000000000000000000000..c442a40626e61c441bb38c44ff61d09ce495370f
--- /dev/null
+++ b/deps/MsvcLibX/src/basename.c
@@ -0,0 +1,59 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    basename.c						      *
+*                                                                             *
+*   Description     Get the file name part of a file pathname		      *
+*                                                                             *
+*   Notes	    Uses a static buffer in some cases. Not thread safe!      *
+*                   Posix spec authorizes this, and also authorizes to modify *
+*		    the input string, which we do. => Always do an strdup()   *
+*		    before calling basename(), and call basename(copy).	      *
+*                                                                             *
+*   History								      *
+*    2016-09-08 JFL Created this file.                                        *
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvclibx.h"
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ 2005 security warnings */
+
+#include <malloc.h>
+#include <string.h>
+#include "msvcStdlib.h"
+#include "msvcLibgen.h"
+#include "msvcLimits.h"
+
+#define TRUE 1
+#define FALSE 0
+
+char *basename(char *pszPathname) {
+  char *pszPath = pszPathname;
+  size_t len;
+  char *pc;
+  char *pc2;
+
+  /* A NULL pathname is assumed to refer to the current directory */
+  if (!pszPathname) return ".";
+  /* Skip the drive if present */
+  len = strlen(pszPathname);
+  if ((len >= 2) && (pszPathname[1] == ':')) {
+    pszPath += 2;
+    len -= 2;
+  }
+  if (!len) return ".";
+  /* Remove trailing path separators */
+  while ((len > 1) && ((pszPath[len-1] == '\\') || (pszPath[len-1] == '/'))) {
+    pszPath[--len] = '\0';
+  }
+  /* Find the beginning of the file name */
+  pc = strrchr(pszPath, '\\');
+  pc2 = strrchr(pszPath, '/');
+  if (pc2 > pc) pc = pc2;
+  if (pc) pc += 1; else pc = pszPath;
+  if (!*pc) return pszPath; /* No file name left. This is the root directory */
+  /* Done */
+  return pc;
+}
diff --git a/deps/MsvcLibX/src/chdir.c b/deps/MsvcLibX/src/chdir.c
new file mode 100644
index 0000000000000000000000000000000000000000..8d562f885f6ac5071e554916dba49671e5c65260
--- /dev/null
+++ b/deps/MsvcLibX/src/chdir.c
@@ -0,0 +1,149 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    chdir.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's chdir()		      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-28 JFL Created this module.				      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <string.h>
+/* MsvcLibX library extensions */
+#include "msvcStdio.h"
+#include "msvcUnistd.h"
+#include "msvcIconv.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+#include "sys/msvcTypes.h"
+
+#if defined(_MSDOS)
+
+/*---------------------------------------------------------------------------*\
+|									      *
+|   Function:	    chdir						      |
+|									      |
+|   Description:    Change directory, overcoming the 64-character DOS limit   |
+|									      |
+|   Parameters:     char *pszDir	Target directory pathname	      |
+|									      |
+|   Returns:	    0=Done; Else OS error code.		 		      |
+|									      |
+|   Notes:	    Unfortunately this works only in a DOS box within Win9X.  |
+|									      |
+|   History:								      |
+|     2000-12-04 JFL Initial implementation.				      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int chdir(const char *pszDir)
+    {
+    char szBuf[64];
+    char *pszBuf = szBuf;
+    char *pc;
+    int iDirLen;
+    int iStrLen;
+    int iErr = 0;
+    
+    iDirLen = strlen(pszDir);
+    /* Copy the drive letter if specified, and leave it ahead of the buffer. */
+    if ((iDirLen>2) && (pszDir[1]==':'))
+	{
+	szBuf[0] = pszDir[0];
+	szBuf[1] = ':';
+	pszDir += 2;
+	pszBuf += 2;
+	}
+    /* Repeat relative moves down the directory tree */
+    while (iDirLen > 60)
+	{
+	pc = strchr(pszDir+45, '\\');		/* There has to be one in segment [45:60]. */
+	iStrLen = pc-pszDir;			/* Segment length */
+	strncpy(pszBuf, pszDir, iStrLen);       /* Copy until the \ found */
+	pszBuf[iStrLen] = '\0';
+	iErr = chdir(szBuf);
+	if (iErr) return iErr;
+	pszDir += iStrLen+1;
+	iDirLen -= iStrLen+1;
+	} ;
+
+    if (iDirLen) 
+        {
+        strcpy(pszBuf, pszDir);
+        iErr = chdir(szBuf);
+        }
+        
+    return iErr;
+    }
+
+#endif /* defined(_MSDOS) */
+
+
+#if defined(_WIN32)
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    chdir						      |
+|									      |
+|   Description:    Set the current directory, encoded in UTF-8               |
+|									      |
+|   Parameters:     const char *pszDir	   Target directory pathname	      |
+|									      |
+|   Returns:	    0=Done; Else OS error code.		 		      |
+|									      |
+|   History:								      |
+|    2014-02-28 JFL Created this routine                               	      |
+|    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int chdirA(const char *pszDir) {
+  WCHAR wszDir[PATH_MAX];
+  BOOL bDone;
+  int n;
+  DEBUG_PRINTF(("chdir(\"%s\");\n", pszDir));
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_ACP,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszDir,		/* lpMultiByteStr, */
+			  wszDir,		/* lpWideCharStr, */
+			  COUNTOF(wszDir)	/* cchWideChar, */
+			  );
+  bDone = SetCurrentDirectoryW(wszDir);
+  if (!bDone) {
+    errno = Win32ErrorToErrno();
+  }
+  return bDone ? 0 : -1;
+}
+
+int chdirU(const char *pszDir) {
+  WCHAR wszDir[PATH_MAX];
+  BOOL bDone;
+  int n;
+  DEBUG_PRINTF(("chdir(\"%s\");\n", pszDir));
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszDir,		/* lpMultiByteStr, */
+			  wszDir,		/* lpWideCharStr, */
+			  COUNTOF(wszDir)	/* cchWideChar, */
+			  );
+  bDone = SetCurrentDirectoryW(wszDir);
+  if (!bDone) {
+    errno = Win32ErrorToErrno();
+  }
+  return bDone ? 0 : -1;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/clock_gettime.c b/deps/MsvcLibX/src/clock_gettime.c
new file mode 100644
index 0000000000000000000000000000000000000000..fee7532e2e552ec08b615e61e3f4d79276ea6cfc
--- /dev/null
+++ b/deps/MsvcLibX/src/clock_gettime.c
@@ -0,0 +1,48 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    clock_gettime.c					      *
+*                                                                             *
+*   Description:    WIN32 port of standard C library's clock_gettime().	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-04 JFL Created this file.                                        *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvclibx.h"
+
+#include <time.h>
+#include <errno.h>
+
+
+#ifdef _MSDOS
+
+/* Check for the definition of _STRUCT_TIMESPEC before using clock_gettime().
+   If it's not defined, use time() instead, which is supported by all OSs. */
+
+#endif /* defined(_MSDOS) */
+
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN /* Avoid lots of unnecessary inclusions */
+#include <windows.h>
+#include "msvcTime.h"
+#include "sys/msvcStat.h" /* For MsvcLibX's Filetime2Timespec */
+
+int clock_gettime(clockid_t clock_id, struct timespec *pTS) {
+  FILETIME ft;
+  if (clock_id != CLOCK_REALTIME) {
+    errno = EINVAL;
+    return -1;
+  }
+  GetSystemTimeAsFileTime(&ft);
+  Filetime2Timespec(&ft, pTS);
+  return 0;
+}
+
+#endif /* defined(_WIN32) */
diff --git a/deps/MsvcLibX/src/debugv.c b/deps/MsvcLibX/src/debugv.c
new file mode 100644
index 0000000000000000000000000000000000000000..5d410c1309f8e1f99d133865b0d0272958e766ce
--- /dev/null
+++ b/deps/MsvcLibX/src/debugv.c
@@ -0,0 +1,23 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    debugv.c						      *
+*                                                                             *
+*   Description:    Define debug variables used by MsvcLibX.lib in debug mode *
+*                                                                             *
+*   Notes:	                                                              *
+*                                                                             *
+*   History:								      *
+*    2013-03-27 JFL jf.larvoire@hp.com created this file.                     *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvcDebugm.h"
+
+#if defined(_DEBUG)
+
+DEBUG_GLOBALS
+
+#endif /* !defined(_DEBUG) */
+
diff --git a/deps/MsvcLibX/src/dirent.c b/deps/MsvcLibX/src/dirent.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ab2e9c002d67f4c0c703f8294e997d9e4b5b641
--- /dev/null
+++ b/deps/MsvcLibX/src/dirent.c
@@ -0,0 +1,709 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    dirent.c						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's dirent.h functions *
+*                                                                             *
+*   Notes:	    TO DO: Make Wide & MultiByte versions of scandir 4 Windows*
+*                                                                             *
+*		    There are also remains of an OS/2 implementation here.    *
+*		    It's not maintained anymore. Left in as a historic        *
+*		    reference, in the unlikely case somebody needs it.        *
+*									      *
+*   History:								      *
+*    2012-01-09 JFL Created this file, based on dirc and other programs.      *
+*    2012-01-19 JFL Added standard errno management.                          *
+*    2012-05-22 JFL Fixed a bug in the DOS version, which failed if the       *
+*		    directory name was longer than 12 bytes.                  *
+*    2012-05-23 JFL Fixed opendir to return errors as per the C lib spec.     *
+*    2013-02-12 JFL Added code to filter reparse points, and keep only        *
+*		    real junctions and symlinks.                              *
+*    2013-02-13 JFL Moved dirent2stat() to lstat.c, as there must actually    *
+*		    be 4 WIN32 versions, for the four versions of struct stat.*
+*    2013-02-26 JFL Moved the proprietary file time management routines to    *
+*		    the new filetime.c module.				      *
+*    2014-02-27 JFL Changed the WIN32 output name encoding to UTF-8.	      *
+*    2014-03-20 JFL Restructured Windows opendir and readdir functions into   *
+*		    Wide and MultiByte versions, and changed the Unicode and  *
+*		    Ansi versions to macros.				      *
+*    2014-03-24 JFL Renamed "statx.h" as the standard <sys/stat.h>.	      *
+*    2015-12-14 JFL Bug fix: WIN32 readdirW always read the root on "D:".     *
+*		    Bug fix: DOS opendir failed on root dirs, like "D:\".     *
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of WIN32 printf & scandir */
+
+#include "msvcDirent.h" /* Include our associated .h, in the same dir as this .c. Do not use <>. */
+#ifndef _DIRENT_FOR_DOS_WINDOWS
+#error "This requires MsvcLibX own version of dirent.h for DOS/Windows"
+#endif
+/* Microsoft C libraries include files */
+#include <io.h>
+#include <stdlib.h>
+#include <string.h>
+#include <memory.h>
+#include <errno.h>
+/* MsvcLibX library extensions */
+#include "msvcUnistd.h" /* For readlink() */
+#include "sys/msvcStat.h"  /* For Filetime2String() */
+#include "msvcDebugm.h" /* Use our house debugging framework */
+#include "msvcLimits.h" /* Use our house debugging framework */
+
+/*****************************************************************************\
+*                                                                             *
+*                               MS_DOS Version                                *
+*                                                                             *
+\*****************************************************************************/
+
+#ifdef _MSDOS
+
+#define OFFSET_OF(pointer) ((uint16_t)(uint32_t)(void far *)pointer)
+#define SEGMENT_OF(pointer) ((uint16_t)(((uint32_t)(void far *)pointer) >> 16))
+
+void put_dta(char *p_dta) {	/* Set the MS-DOS Disk Transfer Address */
+  union REGS inreg;
+  union REGS outreg;
+  struct SREGS sregs;
+
+  inreg.h.ah = 0x1a;
+  inreg.x.dx = OFFSET_OF(p_dta);
+  sregs.ds = SEGMENT_OF(p_dta);
+
+  intdosx(&inreg, &outreg, &sregs);
+}
+
+#define CF 0x0001            /* Carry flag bit mask */
+
+int get_file_attributes(const char *name, unsigned *pAttr) {	/* Get File Attributes */
+  union REGS inreg;
+  union REGS outreg;
+  struct SREGS sregs;
+
+  inreg.x.ax = 0x4300;
+  inreg.x.dx = OFFSET_OF(name);
+  sregs.ds = SEGMENT_OF(name);
+
+  intdosx(&inreg, &outreg, &sregs);
+
+  if (CF & outreg.x.cflag) {
+    errno = outreg.x.ax;
+    return errno;
+  }
+
+  *pAttr = outreg.x.cx;
+  return 0;
+}
+
+/* Workaround for a VMWare player shared folders bug:
+   DOS function 4e (search next) sometimes returns several times the same entry. */
+static fileinfo previousFI;
+#ifdef _DEBUG
+static int report_workaround(char *s) {
+  DEBUG_PRINTF((s));
+  return 1;
+}
+#define REPORT_WORKAROUND(args) report_workaround args
+#else
+#define REPORT_WORKAROUND(args) 1
+#endif
+
+int srch1st(char *pszFile, uint16_t wAttr, fileinfo *pInfo) { /* Search first matching file */
+  union REGS inreg;
+  union REGS outreg;
+  struct SREGS sregs;
+
+  DEBUG_ENTER(("srch1st(\"%s\", 0x%04X, 0x%p);\n", pszFile, wAttr, pInfo));
+
+  /* Make sure the DTA is assigned before calling DOS functions 4E and 4F */
+  put_dta((char *)pInfo);
+
+  inreg.h.ah = 0x4e;
+  inreg.x.cx = wAttr;
+  inreg.x.dx = OFFSET_OF(pszFile);
+  sregs.ds = SEGMENT_OF(pszFile);
+
+  intdosx(&inreg, &outreg, &sregs);
+
+  if (CF & outreg.x.cflag) {
+    DEBUG_LEAVE(("return %d; // DOS error code\n", outreg.x.ax));
+    return (int)(outreg.x.ax);
+  }
+
+  previousFI = *pInfo; /* Save it for the workaround for the VMWare player bug */
+
+  DEBUG_LEAVE(("return 0;  // Success\n"));
+  return 0;
+}
+
+int srchnext(fileinfo *pInfo) { /* Search next matching file */
+  union REGS inreg;
+  union REGS outreg;
+
+  DEBUG_ENTER(("srchnext(0x%p);\n", pInfo));
+
+  /* Make sure the DTA is assigned before calling DOS functions 4E and 4F */
+  put_dta((char *)pInfo);
+
+  inreg.h.ah = 0x4f;
+
+  do {
+    intdos(&inreg, &outreg);
+
+    if (CF & outreg.x.cflag) {
+      DEBUG_LEAVE(("return %d; // DOS error code\n", outreg.x.ax));
+      return(outreg.x.ax);
+    }
+  } while ((!strncmp(previousFI.fiFileName, pInfo->fiFileName, sizeof(previousFI)))
+           && REPORT_WORKAROUND(("// Skipped one duplicate entry\n")));
+
+  previousFI = *pInfo; /* Save it for the workaround for the VMWare player bug */
+
+  DEBUG_LEAVE(("return 0;  // Success\n"));
+  return 0;
+}
+
+DIR *opendir(const char *name) { /* Open a directory */
+  DIR *pDir = NULL;
+  size_t lName;
+  unsigned attr;
+  char *pszWildCards = "\\*.*";
+  char *pszCopy;
+  DEBUG_ENTER(("opendir(\"%s\");\n", name));
+  lName = strlen(name);
+  if (lName == 0) {
+opendir_noent:
+    errno = ENOENT;
+opendir_failed:
+    if (!_sys_errlist[ENOTDIR][0]) _sys_errlist[ENOTDIR] = "Not a directory"; /* Workaround for the missing entry in MSVC list */
+    if (pDir) free(pDir);
+    DEBUG_LEAVE(("return NULL; // errno=%d - %s\n", errno, strerror(errno)));
+    return NULL;
+  }
+  pDir = (DIR *)malloc(sizeof(DIR) + lName + 5); /* + 5 for wildcards suffix */
+  if (!pDir) goto opendir_failed;
+  /* Work on a copy of the directory name */
+  pszCopy = (char *)(pDir + 1);
+  strcpy(pszCopy, name);
+  /* First change: Except for the root, Remove the trailing \s, which confuses get_file_attributes() */
+  while ((lName > 1) && (name[lName-1] == '\\') && (name[lName-2] != ':')) pszCopy[--lName] = '\0';
+  if (get_file_attributes(pszCopy, &attr)) goto opendir_noent;
+  if (!(attr & _A_SUBDIR)) {
+    errno = ENOTDIR;
+    goto opendir_failed;
+  }
+  if (name[lName-1] == '\\') pszWildCards += 1; /* Avoid duplicating the \ */
+  strcpy(pszCopy+lName, pszWildCards);
+  pDir->first = 1;
+  DEBUG_LEAVE(("return 0x%p;\n", pDir));
+  return pDir;
+}
+
+int closedir(DIR *pDir) { /* Close the directory. Return 0 if successful, -1 if not. */
+  DEBUG_PRINTF(("closedir(0x%p);\n", pDir));
+  if (pDir) free(pDir);
+  return 0;
+}
+
+_dirent *readdir(DIR *pDir) { /* Read a directory entry. Return pDir, or NULL for EOF or error. */
+  int iErr;
+  _dirent *pDirent = &pDir->sDirent;
+  fileinfo *pFI = (fileinfo *)(pDirent->d_reserved); /* Address of the fileinfo structure embedded there */
+#ifdef _DEBUG
+  char szTime[40];
+#endif
+
+  DEBUG_ENTER(("readdir(0x%p);\n", pDir));
+  if (pDir->first) { /* First search */
+    iErr = srch1st((char *)(pDir+1), 0x3F, pFI);
+    pDir->first = 0;
+  } else {
+    iErr = srchnext(pFI);
+  }
+  if (!iErr) {
+    pDirent->d_type = DT_REG;			/* A normal file by default */
+    if (pDirent->d_attribs & _A_SUBDIR) pDirent->d_type = DT_DIR;  /* Subdirectory */
+    if (pDirent->d_attribs & _A_VOLID) pDirent->d_type = DT_VOLID; /* Volume ID file */
+    DEBUG_LEAVE(("return 0x%p; // %s %02X %10ld %s\n",
+		  pDirent,
+		  Filetime2String(pDirent->d_date, pDirent->d_time, szTime, sizeof(szTime)),
+		  pDirent->d_attribs,
+		  pDirent->d_filesize,
+		  pDirent->d_name));
+    return &pDir->sDirent;
+  }
+  switch (iErr) { /* Correct a few errors that do not map well to C library errors */
+    case ESRCH: iErr = ENOTDIR; break;
+    case EXDEV: iErr = 0; break;	/* End of files is NOT an error */
+  }
+  if (iErr) {
+    errno = iErr; /* MS-DOS' errno.h maps C-library errnos to DOS' errors */
+    DEBUG_LEAVE(("return NULL; // errno=%d - %s\n", errno, strerror(errno)));
+  } else {
+    DEBUG_LEAVE(("return NULL; // End of directory\n"));
+  }
+  return NULL;
+}
+
+#endif /* defined(_MSDOS) */
+
+/*****************************************************************************\
+*                                                                             *
+*                               WIN32 Version                                 *
+*                                                                             *
+\*****************************************************************************/
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/* Requires including windows.h and especially the kernel section */
+
+DIR *opendirW(const WCHAR *wszName) { /* Open a directory - Wide char version */
+  DIR *pDir;
+  int err;
+  DWORD dw;
+  DEBUG_CODE(
+  char szUtf8[UTF8_PATH_MAX];
+  )
+
+  DEBUG_WSTR2UTF8(wszName, szUtf8, sizeof(szUtf8));
+  DEBUG_ENTER(("opendir(\"%s\");\n", szUtf8));
+
+  dw = GetFileAttributesW(wszName);
+  err = 0;
+  if (dw == INVALID_FILE_ATTRIBUTES) {
+    err = errno = Win32ErrorToErrno();
+  } else {
+    if (!(dw & _A_SUBDIR)) {
+      err = errno = ENOTDIR;
+    }
+  }
+  if (err) {
+    RETURN_CONST_COMMENT(NULL, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  if (lstrlenW(wszName) >= sizeof(pDir->wszDirName)) {
+    errno = ENAMETOOLONG;
+    RETURN_CONST_COMMENT(NULL, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  pDir = malloc(sizeof(DIR));
+  if (!pDir) {
+    errno = ENOMEM;
+    RETURN_CONST_COMMENT(NULL, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  pDir->hFindFile = INVALID_HANDLE_VALUE;
+  lstrcpyW(pDir->wszDirName, wszName);
+  DEBUG_LEAVE(("return 0x%p; // Success\n", pDir));
+  return pDir;
+}
+
+DIR *opendirM(const char *name, UINT cp) { /* Open a directory - MultiByte char version */
+  WCHAR wszName[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  name,			/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  COUNTOF(wszName)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("opendirM(\"%s\"); // Can't convert name to Unicode: errno=%d - %s\n", name, errno, strerror(errno)));
+    return NULL;
+  }
+
+  return opendirW(wszName);
+}
+
+int closedir(DIR *pDir) { /* Close the directory. Return 0 if successful, -1 if not. */
+  DEBUG_PRINTF(("closedir(0x%p);\n", pDir));
+  if (pDir) {
+    if (pDir->hFindFile != INVALID_HANDLE_VALUE) FindClose(pDir->hFindFile);
+    pDir->hFindFile = INVALID_HANDLE_VALUE;
+    free(pDir);
+  }
+  return 0;
+}
+
+/* Read a directory entry. Return pDir, or NULL for EOF or error. Wide char version. */
+_dirent *readdirW(DIR *pDir) {
+  int iErr = 0;
+  _dirent *pDirent = &pDir->sDirent;
+  int bIsJunction = FALSE;
+  int bIsMountPoint = FALSE;
+  DWORD dwTag = 0; /* Reparse points tag */
+  DWORD dwAttr;
+  int n;
+  DEBUG_CODE(
+  char szTime[40];
+  char szUtf8[UTF8_PATH_MAX];
+  )
+
+  DEBUG_ENTER(("readdir(0x%p);\n", pDir));
+
+  if (pDir->hFindFile == INVALID_HANDLE_VALUE) {
+    WCHAR wszPattern[MAX_PATH+5];
+    lstrcpyW(wszPattern, pDir->wszDirName);
+    n = lstrlenW(wszPattern);
+    if (n && (wszPattern[n-1] != L'\\') && (wszPattern[n-1] != L':')) wszPattern[n++] = L'\\';
+    lstrcpyW(wszPattern+n, L"*.*");
+    pDir->hFindFile = FindFirstFileW(wszPattern, &pDir->wfd);
+    if (pDir->hFindFile == INVALID_HANDLE_VALUE) {
+      iErr = Win32ErrorToErrno();
+      if (!iErr) iErr = ENOENT;
+    }
+  } else {
+    iErr = !FindNextFileW(pDir->hFindFile, &pDir->wfd);
+    if (iErr) {
+      iErr = Win32ErrorToErrno();
+      if (!iErr) iErr = ENOENT;
+    }
+  }
+  if (iErr) {
+    switch (iErr) { /* Correct a few errors that do not map well to C library errors */
+      case ESRCH: iErr = ENOTDIR; break;
+      case EXDEV: iErr = 0; break;	/* End of files is NOT an error */
+    }
+    if (iErr) {
+      errno = iErr; /* Windows' errno.h maps C-library errnos to Windows' errors */
+      DEBUG_LEAVE(("return NULL; // errno=%d - %s\n", errno, strerror(errno)));
+    } else {
+      DEBUG_LEAVE(("return NULL; // End of directory\n"));
+    }
+    return NULL;
+  }
+
+  /* Set the standard fields */
+  lstrcpyW((WCHAR *)(pDirent->d_name), pDir->wfd.cFileName);
+  dwAttr = pDir->wfd.dwFileAttributes;
+check_attr_again:
+  if (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT) {
+    /* JUNCTIONs and SYMLINKDs both have the FILE_ATTRIBUTE_DIRECTORY flag also set.
+    // Test the FILE_ATTRIBUTE_REPARSE_POINT flag first, to make sure they're seen as symbolic links.
+    //
+    // All symlinks are reparse points, but not all reparse points are symlinks. */
+    dwTag = pDir->wfd.dwReserved0;	/* No need to call GetReparseTag(), we got it already. */
+    switch (dwTag) {
+      case IO_REPARSE_TAG_MOUNT_POINT:	/* NTFS junction or mount point */
+	{ /* We must read the link to distinguish junctions from mount points. */
+	WCHAR wszPath[PATH_MAX];
+	WCHAR wszBuf[PATH_MAX];
+	ssize_t n = lstrlenW(pDir->wszDirName);
+	if ((n + 1 + lstrlenW(pDir->wfd.cFileName)) >= PATH_MAX) {
+	  errno = ENAMETOOLONG; /* DIRNAME\LINKNAME won't fit in wszPath[] */
+	  DEBUG_LEAVE(("return NULL; // errno=%d - %s\n", errno, strerror(errno)));
+	}
+	bIsMountPoint = TRUE;
+	lstrcpyW(wszPath, pDir->wszDirName);
+	if (n && (wszPath[n-1] != L'\\')) wszPath[n++] = L'\\';
+	lstrcpyW(wszPath+n, pDir->wfd.cFileName);
+	n = readlinkW(wszPath, wszBuf, COUNTOF(wszBuf));
+	/* Junction targets are absolute pathnames, starting with a drive letter. Ex: C: */
+	/* readlink() fails if the reparse point does not target a valid pathname */
+	if (n < 0) goto this_is_not_a_symlink; /* This is not a junction. */
+	bIsJunction = TRUE; /* Else this is a junction. Fall through to the symlink case. */
+	} 	      
+      case IO_REPARSE_TAG_SYMLINK:		/* NTFS symbolic link */
+	pDirent->d_type = DT_LNK;		/* Symbolic link */
+	break;
+      default:	/* Anything else is definitely not like a Unix symlink */
+this_is_not_a_symlink:
+	dwAttr &= ~FILE_ATTRIBUTE_REPARSE_POINT;
+	goto check_attr_again;
+    }
+  } else if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
+    pDirent->d_type = DT_DIR;		/* Subdirectory */
+  else if (dwAttr & FILE_ATTRIBUTE_DEVICE)
+    pDirent->d_type = DT_CHR;		/* Device (we don't know if character or block) */
+  else
+    pDirent->d_type = DT_REG;		/* A normal file by default */
+
+  /* Set the OS-specific extensions */
+  lstrcpyW((WCHAR *)(pDirent->d_shortname), pDir->wfd.cAlternateFileName);
+  pDirent->d_attribs = dwAttr;
+  pDirent->d_ReparseTag = dwTag;
+  pDirent->d_CreationTime = pDir->wfd.ftCreationTime;
+  pDirent->d_LastAccessTime = pDir->wfd.ftLastAccessTime;
+  pDirent->d_LastWriteTime = pDir->wfd.ftLastWriteTime;
+  (*(ULARGE_INTEGER *)&(pDirent->d_filesize)).LowPart = pDir->wfd.nFileSizeLow;
+  (*(ULARGE_INTEGER *)&(pDirent->d_filesize)).HighPart = pDir->wfd.nFileSizeHigh;
+
+  DEBUG_WSTR2UTF8((WCHAR *)(pDirent->d_name), szUtf8, sizeof(szUtf8));
+  DEBUG_LEAVE(("return 0x%p; // %s 0x%05X %10lld %s\n",
+		pDirent,
+		Filetime2String(&pDirent->d_LastWriteTime, szTime, sizeof(szTime)),
+		(int)(pDirent->d_attribs),
+		pDirent->d_filesize,
+		szUtf8));
+  return &(pDir->sDirent);
+}
+
+/* Read a directory entry. Return pDir, or NULL for EOF or error. MultiByte char version. */
+_dirent *readdirM(DIR *pDir, UINT cp) {
+  _dirent *pDirent;
+  int n;
+  char *pszDefaultChar;
+
+  pDirent = readdirW(pDir);
+  if (!pDirent) return NULL;
+
+  /* Convert the name field back to MultiByte encoding */
+  pszDefaultChar = (cp == CP_UTF8) ? NULL : "?";
+  n = WideCharToMultiByte(cp,					/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,					/* dwFlags, */
+			  pDir->wfd.cFileName,			/* lpWideCharStr, */
+			  lstrlenW(pDir->wfd.cFileName)+1,	/* cchWideChar, */
+			  pDirent->d_name,			/* lpMultiByteStr, */
+			  sizeof(pDirent->d_name),		/* cbMultiByte, */
+			  pszDefaultChar,			/* lpDefaultChar, */
+			  NULL					/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("readdirM(0x%p); // Error converting name back from Unicode. errno=%d - %s\n", pDir, errno, strerror(errno)));
+    return NULL;
+  }
+
+  /* Convert the short name field back to MultiByte encoding */
+  n = WideCharToMultiByte(cp,						/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,						/* dwFlags, */
+			  pDir->wfd.cAlternateFileName,			/* lpWideCharStr, */
+			  lstrlenW(pDir->wfd.cAlternateFileName)+1,	/* cchWideChar, */
+			  pDirent->d_shortname,				/* lpMultiByteStr, */
+			  sizeof(pDirent->d_shortname),			/* cbMultiByte, */
+			  pszDefaultChar,				/* lpDefaultChar, */
+			  NULL						/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("readdirM(0x%p); // Error converting short name back from Unicode. errno=%d - %s\n", pDir, errno, strerror(errno)));
+    return NULL;
+  }
+
+  return pDirent;
+}
+
+#endif
+
+/*****************************************************************************\
+*                                                                             *
+*			      OS/2 1.x Version				      *
+*                                                                             *
+\*****************************************************************************/
+
+#ifdef _OS2
+
+/* Requires including os2.h at the beginning of this file, and before that
+   defining the INCL_DOSFILEMGR constant to enable the necessary section */
+
+int SetDirent(DIR *pDir) {	    /* Convert the FILEFINDBUF to a dirent structure */
+  char *pc;
+  _dirent *pDirent = &pDir->sDirent;
+  FILEFINDBUF *pbuf = &pDir->buf;
+
+  pbuf->achName[pbuf->cchName] = '\0';
+  pc = strrchr(pbuf->achName, '\\'); /* Directory separator character */
+  if (!pc)
+    pc = &pbuf->achName[0];
+  else
+    pc += 1;    /* Skip the \ */
+
+  pDirent->d_name = malloc(strlen(pc)+1);
+  if (!pDirent->d_name) return ENOMEM;
+  strcpy(pDirent->d_name, pc);
+  pDirent->attribs = pbuf->attrFile;
+  pDirent->d_type = Atype2Dtype(pDirent->attribs);
+  pDirent->time = *(uint16_t *)&pbuf->ftimeLastWrite;
+  pDirent->date = *(uint16_t *)&pbuf->fdateLastWrite;
+  pDirent->filesize = pbuf->cbFile;
+
+  return 0;
+}
+
+int srch1st(char *pszFile, uint8_t bAttrReq, uint8_t bAttrCmp, DIR *pDir) { /* Search first matching file */
+  int n;
+  int err;
+
+  pDir->hDir = -1;
+
+  n = 1;  /* Get one file */
+  err = DosFindFirst2(pszFile, &pDir->hDir, bAttrReq & 0x7F, &pDir->buf,
+		      sizeof(FILEFINDBUF), &n, FIL_STANDARD, 0L);
+  if (err || !n) return 1;
+
+  return SetDirent(pDir);
+}
+
+int srchnext(DIR *pDir) {   /* Search next matching file */
+  int n;
+  int err;
+
+  n = 1;  /* Get one file */
+  err = DosFindNext(pDir->hDir, &pDir->buf, sizeof(FILEFINDBUF), &n);
+  if (err || !n) return 1;
+
+  return SetDirent(&buf);
+}
+
+int srchdone(DIR *pDir) {
+  int err;
+
+  err = DosFindClose(pDir->hDir);
+  pDir->hDir = -1;
+
+  return err;
+}
+
+DIR *opendir(const char *name) { /* Open a directory */
+  DIR *pDir;
+  DEBUG_ENTER(("opendir(\"%s\");\n", name));
+  err = _access(name, 0);
+  /* To do: Get the file attributes, and check that it's a directory */
+  if (err) {
+    DEBUG_LEAVE(("return NULL; // errno=%d - %s\n", errno, strerror(errno)));
+    return NULL;
+  }
+  pDir = malloc(sizeof(DIR));
+  if (pDir) {
+    pDir->hDir = -1;
+    pDir->bAttrReq = _A_HIDDEN | _A_SYSTEM | _A_SUBDIR;
+    pDir->bAttrCmp = 0;
+    strcpy(pDir->sDirent.d_name, name);
+  }
+  DEBUG_LEAVE(("return 0x%p;\n", pDir));
+  return pDir;
+}
+
+int closedir(DIR *pDir) { /* Close the directory. Return 0 if successful, -1 if not. */
+  DEBUG_PRINTF(("closedir(0x%p);\n", pDir));
+  if (pDir) {
+    srchdone(pDir);
+    free(pDir);
+  }
+  return 0;
+}
+
+_dirent *readdir(DIR *pDir) { /* Read a directory entry. Return pDir, or NULL for EOF or error. */
+  int iErr;
+  DEBUG_ENTER(("readdir(0x%p);\n", pDir));
+  if (pDir->hDir == -1) {
+    iErr = srch1st(pDir->sDirent.d_name, pDir->bAttrReq, pDir->bAttrCmp, pDir);
+  } else {
+    iErr = srchnext(pDir);
+  }
+  if (iErr) {
+    DEBUG_LEAVE(("return NULL; // OS/2 found nothing\n",
+    return NULL;
+  }
+
+  DEBUG_LEAVE(("return 0x%p; // OS/2 found: %04X %04X %02X %10lld %s\n",
+		&pDir->sDirent
+		(int)(pDirent->time),
+		(int)(pDirent->date),
+		(int)(pDirent->attribs),
+		pDirent->filesize,
+		pDirent->d_name));
+
+
+  return &pDir->sDirent;
+}
+
+#endif
+
+/*****************************************************************************\
+*                                                                             *
+*            End of OS-specific opendir/readdir/closedir versions             *
+*                                                                             *
+\*****************************************************************************/
+
+/*****************************************************************************\
+*                                                                             *
+*   Function:	    scandir		 				      *
+*									      *
+*   Description:    Select entries in a directory			      *
+*									      *
+*   Arguments:	    const char *name	Directory name            	      *
+*		    _dirent ***namelist where to store the result array       *
+*		    int (*cbSelect)()   Selection callback function           *
+*		    int (*cbCompare)()  Comparison function for sorting it    *
+*									      *
+*   Return value:   # of entries in the array, or -1 if error.		      *
+*									      *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2012-01-11 JFL Initial implementation				      *
+*                                                                             *
+\*****************************************************************************/
+
+#pragma warning(disable:4706) /* Ignore the "assignment within conditional expression" warning */
+int scandir(const char *pszName,
+	    _dirent ***resultList,
+	    int (*cbSelect) (const _dirent *),
+	    int (__cdecl *cbCompare) (const _dirent **,
+				      const _dirent **)) {
+  int n = 0;
+  DIR *pDir;
+  _dirent *pDirent;
+  _dirent *pDirent2;
+  _dirent **pList = NULL;
+  _dirent **pList2;
+
+  DEBUG_ENTER(("scandir(\"%s\", 0x%p, 0x%p, 0x%p);\n", pszName, resultList, cbSelect, cbCompare));
+
+  pDir = opendir(pszName);
+  if (!pDir) {
+    DEBUG_LEAVE(("return -1; // errno=%d\n", errno));
+    return -1;
+  }
+
+  while (pDirent = readdir(pDir)) {
+    if (cbSelect && !cbSelect(pDirent)) continue; /* We don't want this one. Continue search. */
+    /* OK, we've selected this one. So append a copy of this _dirent to the list. */
+    n += 1;
+    pList2 = (_dirent **)realloc(pList, n * sizeof(_dirent *));
+    pDirent2 = malloc(sizeof(_dirent));
+    if (!pList2 || !pDirent2) {
+      if (pDirent2) free(pDirent2);
+      for (n-=1; n>0; ) free(pList[--n]);
+      /* errno = ENOMEM; /* Out of memory. Should already be set by malloc failure */
+      DEBUG_LEAVE(("return -1; // errno=%d\n", errno));
+      return -1;
+    }
+    *pDirent2 = *pDirent;
+    pList = pList2;
+    pList[n-1] = pDirent2;
+  }
+
+  closedir(pDir);
+
+/* 2016-09-23 JFL I don't understand why this warning still fires, so leaving it enabled for now */
+#ifdef M_I86TM /* This warning appears only when compiling for the DOS tiny memory model ?!? */
+/* #pragma warning(disable:4220) /* Ignore the "varargs matches remaining parameters" warning */
+#endif
+  if (cbCompare) qsort(pList, n, sizeof(_dirent *), cbCompare);
+#ifdef M_I86TM
+#pragma warning(default:4220) /* Ignore the "varargs matches remaining parameters" warning */
+#endif
+  *resultList = pList;
+  DEBUG_LEAVE(("return %d;\n", n));
+  return n;
+}
+#pragma warning(default:4706)
+
+int __cdecl alphasort(const _dirent **ppDE1, const _dirent **ppDE2) {
+  int ret;
+  /* Sort names a-la Windows, that is case insensitive */
+  ret = _strnicmp((*ppDE1)->d_name, (*ppDE2)->d_name, NAME_MAX);
+  if (ret) return ret;
+  /* For the remote chance that we're accessing a Unix share */
+  ret = _strnicmp((*ppDE1)->d_name, (*ppDE2)->d_name, NAME_MAX);
+  if (ret) return ret;
+  return 0;
+}
+
diff --git a/deps/MsvcLibX/src/dirname.c b/deps/MsvcLibX/src/dirname.c
new file mode 100644
index 0000000000000000000000000000000000000000..1bdc9d9ba3e42f7afffc20cf3f7a988ae791450c
--- /dev/null
+++ b/deps/MsvcLibX/src/dirname.c
@@ -0,0 +1,74 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    dirname.c						      *
+*                                                                             *
+*   Description     Get the parent directory name of a file pathname	      *
+*                                                                             *
+*   Notes	    Uses a static buffer in some cases. Not thread safe!      *
+*                   Posix spec authorizes this, and also authorizes to modify *
+*		    the input string, which we do. => Always do an strdup()   *
+*		    before calling dirname(), and call dirname(copy).	      *
+*                                                                             *
+*   History								      *
+*    2016-09-08 JFL Created this file.                                        *
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvclibx.h"
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ 2005 security warnings */
+
+#include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
+#include "msvcLibgen.h"
+#include "msvcLimits.h"
+
+#define TRUE 1
+#define FALSE 0
+
+char szLastDriveDirName[4] = "C:.";
+
+char *dirname(char *pszPathname) {
+  char *pszPath = pszPathname;
+  size_t len;
+  char *pc;
+  char *pc2;
+
+  /* A NULL pathname is assumed to refer to the current directory */
+  if (!pszPathname) return szLastDriveDirName + 2;	/* "." */
+  /* Skip the drive if present */
+  len = strlen(pszPathname);
+  if (!len) return szLastDriveDirName + 2;		/* "." */
+  if ((len >= 2) && (pszPathname[1] == ':')) {
+    pszPath += 2;
+    len -= 2;
+    if (!len) {
+      szLastDriveDirName[0] = pszPathname[0]; /* Warning: Not thread safe! */
+      return szLastDriveDirName;			/* "D:." */
+    }
+  }
+  /* Remove trailing path separators */
+  while ((len > 1) && ((pszPath[len-1] == '\\') || (pszPath[len-1] == '/'))) {
+    pszPath[--len] = '\0';
+  }
+  /* Remove the file name */
+  pc = strrchr(pszPath, '\\');
+  pc2 = strrchr(pszPath, '/');
+  if (pc2 > pc) pc = pc2;
+  if (pc) pc += 1; else pc = pszPath;
+  *pc = '\0';
+  len = pc - pszPath;
+  if (!len) {
+    strcpy(pc, "."); /* Yes, the spec says that the dirname of .. is . */
+    len = 1;
+  }
+  /* Remove trailing path separators */
+  while ((len > 1) && ((pszPath[len-1] == '\\') || (pszPath[len-1] == '/'))) {
+    pszPath[--len] = '\0';
+  }
+  /* Done */
+  return pszPathname;
+}
diff --git a/deps/MsvcLibX/src/err2errno.c b/deps/MsvcLibX/src/err2errno.c
new file mode 100644
index 0000000000000000000000000000000000000000..306160f66432a5c8e2e5ddcdaaa3809f773db737
--- /dev/null
+++ b/deps/MsvcLibX/src/err2errno.c
@@ -0,0 +1,120 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    err2errno.c						      *
+*									      *
+*   Description:    Convert a WIN32 error to a Unix errno		      *
+*                                                                             *
+*   Notes:	                                                              *
+*		    							      *
+*   History:								      *
+*    2014-02-17 JFL Created this module.				      *
+*    2016-10-05 JFL Fixed compatibility with Visual Studio 2003 and older.    *
+*                   Removed a few useless special cases, and added EZERO case.*
+*                   Make sure the global errno is _not_ changed by this funct.*
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <stdio.h>
+/* MsvcLibX library extensions */
+#include "msvcDebugm.h"
+
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    Win32ErrorToErrno					      |
+|									      |
+|   Description:    Convert a Win32 system error code to a Posix errno        |
+|									      |
+|   Parameters:     DWORD dwError		The Win32 error code          |
+|									      |
+|   Returns:	    The corresponding Posix errno			      |
+|									      |
+|   Notes:	    There's no 1-to-1 correspondance between Windows and      |
+|		    Posix errors. This routine attempts to convert codes for  |
+|		    the most likely errors for MsvcLibX.		      |
+|		    Please add those you encounter, that end up in the	      |
+|		    default category, and incorrectly return EIO by default.  |
+|		    							      |
+|		    Does not change errno. (Contrary to _dosmaperr, etc)      |
+|		    You must set errno thereafter if desired.		      |
+|		    							      |
+|   History:								      |
+|    2014-02-05 JFL Created this routine                                      |
+|    2014-03-05 JFL Added the default call to _get_errno_from_oserr().        |
+|    2015-12-07 JFL Use the new error conversion routine name in the UCRT.    |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+#if defined(_UCRT) /* Visual Studio 14 and later */
+#define _get_errno_from_oserr __acrt_errno_from_os_error /* The name changed in the UCRT */
+#endif
+
+#if (_MSC_VER < 1400) /* Anything older than Visual Studio 8 (= VS 2003 and older) */
+#pragma message("Defining our own _get_errno_from_oserr()")
+extern void __cdecl _dosmaperr(unsigned long);
+int _get_errno_from_oserr(unsigned long dwErr) {
+  _dosmaperr(dwErr); /* Sets errno from WIN32 error */
+  return errno;
+}
+#else
+/* Equivalent function in MSVC library. Does not know about symlink errors. */
+extern int __cdecl _get_errno_from_oserr(unsigned long oserrno);
+#endif
+
+int Win32ErrorToErrno() {
+  DWORD dwError = GetLastError();
+
+  DEBUG_CODE({
+    LPVOID lpMsgBuf;
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+		  NULL, dwError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		  (LPTSTR)&lpMsgBuf, 0, NULL);
+    DEBUG_PRINTF(("// Win32 error %d (0x%X): %s", dwError, dwError, lpMsgBuf ? lpMsgBuf : "Unknown\n"));
+    LocalFree( lpMsgBuf );
+  });
+
+  switch (dwError) {
+    case ERROR_SUCCESS:
+      return 0;
+    case ERROR_PRIVILEGE_NOT_HELD: /* Not running with the SE_CREATE_SYMBOLIC_LINK_NAME privilege */
+    case ERROR_REPARSE_ATTRIBUTE_CONFLICT:
+      return EACCES;
+    case ERROR_INSUFFICIENT_BUFFER:
+      return E2BIG;
+    case ERROR_FILE_EXISTS:
+    case ERROR_ALREADY_EXISTS:
+      return EEXIST;
+    case ERROR_WRITE_PROTECT:
+      return EROFS;
+    case ERROR_HANDLE_DISK_FULL:
+      return ENOSPC;
+    case ERROR_NOT_A_REPARSE_POINT:
+    case ERROR_REPARSE_TAG_MISMATCH:
+    case ERROR_INVALID_FLAGS:
+    case ERROR_INVALID_PARAMETER:
+      return EINVAL;
+    case ERROR_INVALID_REPARSE_DATA:
+    case ERROR_REPARSE_TAG_INVALID:
+      return EBADF; /* Not supposed to happen in Posix OSs, but may happen when experimenting with junction() IOCTLs. */
+    case ERROR_NO_UNICODE_TRANSLATION:
+      return EILSEQ;
+    default: {
+      int errno0, errno1;
+      errno0 = errno; /* Preserve the initial errno */
+      errno1 = _get_errno_from_oserr(dwError); /* Let MSVC library decide. May change errno. */
+      errno = errno0; /* Restore the initial errno */
+      return errno1;
+    }
+  }
+}
+
+#endif /* _WIN32 */
+
diff --git a/deps/MsvcLibX/src/filetime.c b/deps/MsvcLibX/src/filetime.c
new file mode 100644
index 0000000000000000000000000000000000000000..084b5eef671c0cc17135746bd7d7e7fb6ed68156
--- /dev/null
+++ b/deps/MsvcLibX/src/filetime.c
@@ -0,0 +1,261 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    filetime.c						      *
+*									      *
+*   Description:    MsvcLibX internal routines for managing file times	      *
+*                                                                             *
+*   Notes:	                                                              *
+*		    							      *
+*   History:								      *
+*    2014-02-26 JFL Created this module.				      *
+*    2014-03-24 JFL Renamed "statx.h" as the standard <sys/stat.h>.	      *
+*    2014-07-03 JFL Filetime2String: Output time with �s precision if possib. *
+*    2016-09-13 JFL Fixed a warning.					      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include "msvcTime.h"	/* Define time_t */
+#include "sys/msvcStat.h"
+
+#ifdef _MSDOS
+
+/* 
+   Convert a DOS date/time to a Unix time_t
+   DOS dates start from January 1, 1980. DOS times have a 2-second resolution.
+   A Unix time_t is the number of 1-second intervals since January 1, 1970.
+   time_ts are expressed in the GMT time zone. DOS times in the current local time.
+*/
+time_t Filetime2Timet(uint16_t date, uint16_t time) {
+  unsigned int year, month, day, hour, minute, second;
+  struct tm stm;
+
+  /* Decode fields */
+  year = 1980 + ((date & 0xFE00) >> 9);
+  month = (date & 0x1E0) >> 5;
+  day = date & 0x1F;
+  hour = (time & 0xF800) >> 11;
+  minute = (time & 0x7E0) >> 5;
+  second = 2 * (time & 0x1F);
+
+  stm.tm_year = (int)year - 1900;
+  stm.tm_mon  = (int)month - 1;
+  stm.tm_mday = (int)day;
+  stm.tm_hour = (int)hour;
+  stm.tm_min  = (int)minute;
+  stm.tm_sec  = (int)second;
+  stm.tm_isdst = -1; /* Let mktime decide if DST is in effect or not */
+
+  return mktime(&stm);
+}
+
+#if 0
+/* Older version of the same, trying to generate the time_t manually.
+   Did not handle DST well */
+time_t Filetime2Timet(uint16_t date, uint16_t time) {
+  unsigned int year, month, day, hour, minute, second;
+  unsigned int olympiads; /* 4-year periods */
+  unsigned long t = 0;
+
+  /* Decode fields */
+  year = 1980 + ((date & 0xFE00) >> 9);
+  month = (date & 0x1E0) >> 5;
+  day = date & 0x1F;
+  hour = (time & 0xF800) >> 11;
+  minute = (time & 0x7E0) >> 5;
+  second = 2 * (time & 0x1F);
+
+  /* Count days */
+  year -= 1970; /* Start of Unix time_t epoch */
+  olympiads = year / 4;
+  year = year % 4;
+  t = olympiads * (365 + 365 + 366 + 365);
+  switch (year) {
+    case 3: t += 366;
+    case 2: t += 365;
+    case 1: t += 365;
+  }
+  switch (month) {
+    case 12: t += 30;
+    case 11: t += 31;
+    case 10: t += 30;
+    case 9: t += 31;
+    case 8: t += 31;
+    case 7: t += 30;
+    case 6: t += 31;
+    case 5: t += 30;
+    case 4: t += 31;
+    case 3: t += (year == 2) ? 29 : 28;
+    case 2: t += 31;
+  }
+  t += day-1;
+
+  /* Count seconds */
+  t *= 24;
+  t += hour;
+  t *= 60;
+  t += minute;
+  t *= 60;
+  t += second;
+
+  /* Correct for the timezone (As DOS returns local times, but time_t is UTC-based) */
+  t += timezone;
+  
+  /* Still need correction for DST */
+
+  return (time_t)t;
+}
+#endif
+
+/* Generate a string with the local file time, in the ISO 8601 date/time format */
+char *Filetime2String(uint16_t date, uint16_t time, char *pBuf, size_t nBufSize) {
+  unsigned int year, month, day, hour, minute, second;
+
+  /* Decode fields */
+  year = 1980 + ((date & 0xFE00) >> 9);
+  month = (date & 0x1E0) >> 5;
+  day = date & 0x1F;
+  hour = (time & 0xF800) >> 11;
+  minute = (time & 0x7E0) >> 5;
+  second = 2 * (time & 0x1F);
+
+  if (nBufSize >= 20) {
+    sprintf(pBuf, "%04d-%02d-%02d %02d:%02d:%02d", year, month, day, hour, minute, second);
+  } else {
+    return "Buffer too small";
+  }
+  return pBuf;
+}
+
+#endif /* defined(_MSDOS) */
+
+/*****************************************************************************/
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    LocalFileTime					      |
+|									      |
+|   Description:    Convert a file GMT time to the local struct tm to display |
+|									      |
+|   Parameters:     const time_t *t		The file GMT time_t	      |
+|									      |
+|   Returns:	    struct tm *						      |
+|									      |
+|   Notes:	    This routine is a replacement for Posix' localtime(),     |
+|		    using Windows' specific algorithm for generating local    |
+|		    file times.						      |
+|		    							      |
+|		    Windows displays file times based on the current	      |
+|		    difference between the local time and GMT.		      |
+|		    Linux displays file times as the local time when the      |
+|		    the file was created.				      |
+|		    The two times shown may be different if DST was different |
+|		    then and now. (Ex: Displaying in winter the date/time of  |
+|		    a file created the previous summer.)		      |
+|		    The advantage of Windows' method is that apparent	      |
+|		    relative times will always be correct, even for files     |
+|		    created around the winter/summer time transitions.	      |
+|		    The advantage of Linux method is that the time displayed  |
+|		    for a file never changes. The drawback is that files      |
+|		    created 1 hour apart around the Winter/summer time 	      |
+|		    transition may be shown with the exact same time.	      |
+|		    							      |
+|   History:								      |
+|    2014-02-26 JFL Created this routine                               	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* 
+   Convert a Windows FILETIME to a Unix time_t.
+   A FILETIME is the number of 100-nanosecond intervals since January 1, 1601.
+   A time_t is the number of 1-second intervals since January 1, 1970.
+   Both Windows and Linux file times are expressed in the GMT time zone.
+*/
+time_t Filetime2Timet(const FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  ull.LowPart = pFT->dwLowDateTime;
+  ull.HighPart = pFT->dwHighDateTime;
+  return ull.QuadPart / 10000000ULL - 11644473600ULL;
+}
+
+/* Convert a Unix time_t to a Windows FILETIME */
+void Timet2Filetime(time_t t, FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  ull.QuadPart = (t * 10000000ULL) + 116444736000000000ULL;
+  pFT->dwLowDateTime = ull.LowPart;
+  pFT->dwHighDateTime = ull.HighPart;
+  return;
+}
+
+/* 
+   Convert a Windows FILETIME to a Unix struct timespec.
+   A FILETIME is the number of 100-nanosecond intervals since January 1, 1601.
+   A struct timespec contains a time_t and a number of nanoseconds.
+   Both Windows and Linux file times are expressed in the GMT time zone.
+*/
+void Filetime2Timespec(const FILETIME *pFT, struct timespec *pTS) {
+  ULARGE_INTEGER ull;
+  ull.LowPart = pFT->dwLowDateTime;
+  ull.HighPart = pFT->dwHighDateTime;
+  pTS->tv_sec = (time_t)(ull.QuadPart / 10000000ULL - 11644473600ULL);
+  pTS->tv_nsec = (int)(ull.QuadPart % 10000000ULL) * 100;
+  return;
+}
+
+/* Convert a Unix time_t to a Windows FILETIME */
+void Timespec2Filetime(const struct timespec *pTS, FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  ull.QuadPart = (pTS->tv_sec * 10000000ULL) + 116444736000000000ULL + (pTS->tv_nsec / 100);
+  pFT->dwLowDateTime = ull.LowPart;
+  pFT->dwHighDateTime = ull.HighPart;
+  return;
+}
+
+/* Convert a file GMT time to a struct tm with the local time to display */
+struct tm *LocalFileTime(const time_t *pt) {
+  FILETIME ft, lft;
+  time_t lt;
+
+  Timet2Filetime(*pt, &ft);
+  FileTimeToLocalFileTime(&ft, &lft);
+  lt = Filetime2Timet(&lft);
+  return gmtime(&lt);
+}  
+
+/* Generate a string with the local file time, in the ISO 8601 date/time format */
+/* 2014-07-03 Output time with �s precision if possible */
+char *Filetime2String(const FILETIME *pFT, char *pBuf, size_t nBufSize) {
+  FILETIME lft;
+  SYSTEMTIME sTime;
+
+  FileTimeToLocalFileTime(pFT, &lft);
+  FileTimeToSystemTime(&lft, &sTime);
+  if (nBufSize >= 20) {
+    wsprintf(pBuf, "%04d-%02d-%02d %02d:%02d:%02d", sTime.wYear, sTime.wMonth, sTime.wDay,
+                   sTime.wHour, sTime.wMinute, sTime.wSecond);
+    if (nBufSize >= 27) {
+      ULARGE_INTEGER uli;
+      int iFraction; /* Fraction of a second */
+      uli.LowPart = lft.dwLowDateTime;
+      uli.HighPart = lft.dwHighDateTime;
+      iFraction = (int)(uli.QuadPart % 10000000); /* FILETIME has 100ns resolution */
+      iFraction /= 10; /* Convert 100ns resolution to 1�s resolution */
+      wsprintf(pBuf+19, ".%06d", iFraction);
+    } else if (nBufSize >= 24) {
+      wsprintf(pBuf+19, ".%03d", sTime.wMilliseconds);
+    }
+  } else {
+    return NULL; /* Buffer too small */
+  }
+  return pBuf;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/fnmatch.c b/deps/MsvcLibX/src/fnmatch.c
new file mode 100644
index 0000000000000000000000000000000000000000..d6f640f4c0529122b46b2826c0ded6e3d933e63e
--- /dev/null
+++ b/deps/MsvcLibX/src/fnmatch.c
@@ -0,0 +1,124 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    fnmatch.c						      *
+*                                                                             *
+*   Description:    DOS/WIN32 port of standard C library's fnmatch()	      *
+*                                                                             *
+*   Notes:	    TO DO: Manage FNM_PATHNAME, FNM_PERIOD, FNM_LEADING_DIR.  *
+*                                                                             *
+*   History:								      *
+*    2012-01-17 JFL Created this file.					      *
+*    2013-03-10 JFL In DOS/Windows, the pattern "*.*" actually means "*".     *
+*    2014-02-13 JFL Removed warnings.                                         *
+*    2014-02-14 JFL In DOS/Windows, the pattern "*." means no extension.      *
+*    2014-02-17 JFL Wildcards match the empty string.                         *
+*    2014-02-20 JFL Fixed "*." pattern matching.                              *
+*    2014-02-28 JFL Added support for UTF-8 pathnames.                 	      *
+*    2014-03-05 JFL In debug mode, hide recursive calls.               	      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+#include <ctype.h>
+#include <string.h>
+#include <malloc.h>
+
+#include "msvcFnmatch.h" /* Include our associated .h, in the same dir as this .c. Do not use <>. */
+#include "msvcDebugm.h"
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#pragma warning(disable:4706) /* Ignore the "assignment within conditional expression" warning */
+int fnmatch(const char *pszPattern, const char *pszName, int iFlags) {
+  char cp, cn;
+  size_t l;
+  const char *pc;
+  int iErr;
+  DEBUG_CODE(
+  int iHideRecursions = FALSE;
+  )
+
+  DEBUG_ENTER(("fnmatch(\"%s\", \"%s\", 0x%x);\n", pszPattern, pszName, iFlags));
+
+  DEBUG_CODE(if(DEBUG_IS_ON() && !XDEBUG_IS_ON()) iHideRecursions = TRUE;)
+
+  /* Special case in DOS/Windows: "*.*" will actually match any name, even without a dot */
+  if (!strcmp(pszPattern, "*.*")) pszPattern = "*";
+
+  /* Special case in DOS/Windows: "anything." means anything without extension */
+  l = strlen(pszPattern);
+  if (l && (pszPattern[l-1] == '.')) {
+    int i;
+    int lName = (int)strlen(pszName);
+    /* First eliminate the case of forbidden extensions <==> A '.' anywhere before the last character */
+    for (i=0; i<(lName-1); i++) { /* Search for a '.' in the name */
+      if (pszName[i] == '.') RETURN_CONST_COMMENT(FNM_NOMATCH, ("Forbidden extension found\n"));
+    }
+    /* If the name doesn't end with a dot, Remove the pattern's trailing '.' */
+    if (lName && (pszName[lName-1] != '.')) {
+      char *pszPattern2;
+      pszPattern2 = _strdup(pszPattern);
+      pszPattern2[--l] = '\0';
+      /* Recursively do the pattern matching with the new pattern */
+      DEBUG_CODE(if (iHideRecursions) iDebug -= 1;)
+      iErr = fnmatch(pszPattern2, pszName, iFlags);
+      DEBUG_CODE(if (iHideRecursions) iDebug += 1;)
+      free(pszPattern2);
+      RETURN_INT(iErr);
+    }
+  }
+
+  for ( ; (cp = *pszPattern) && (cn = *pszName); pszPattern++, pszName++) {
+    XDEBUG_PRINTF(("// cp='%c' cn='%c'\n", cp, cn));
+    switch (cp) {
+    case '?':
+      if (cn == '.') RETURN_CONST_COMMENT(FNM_NOMATCH, ("? does not match a .\n"));
+      break;	/* Anything else matches. Continue analysing the pattern. */
+    case '*':
+      cp = *(++pszPattern);
+      if (!cp) RETURN_CONST_COMMENT(FNM_MATCH, ("'*' matches whatever remains in the string\n"));
+      for ( ; cn = *pszName; pszName++) {
+	DEBUG_CODE(if (iHideRecursions) iDebug -= 1;)
+	iErr = fnmatch(pszPattern, pszName, iFlags);
+	DEBUG_CODE(if (iHideRecursions) iDebug += 1;)
+      	if (iErr == FNM_MATCH) RETURN_CONST(FNM_MATCH);
+      }
+      RETURN_CONST_COMMENT(FNM_NOMATCH, ("No tail string matches the remainder of the pattern\n"));
+    default:
+      if (iFlags & FNM_CASEFOLD) {
+      	cp = (char)toupper(cp);
+      	cn = (char)toupper(cn);
+      }
+      if (cp != cn) RETURN_CONST_COMMENT(FNM_NOMATCH, ("Character mismatch\n"));
+      break;	/* The character matches. Continue analysing the pattern. */
+    }
+  }
+  /* '*' and '?' match the empty string */
+  if (*pszPattern && !*pszName) {
+    int bOnlyWildCards = TRUE;
+    for (pc=pszPattern; cp=*pc; pc++) {
+      if ((cp != '*') && (cp != '?')) {
+	bOnlyWildCards = FALSE;
+	break;
+      }
+    }
+    if (bOnlyWildCards) {
+      RETURN_CONST_COMMENT(FNM_MATCH, ("WildCards match the empty string\n"));
+    }
+  }
+
+  /* Special case in DOS/Windows: trailing dot allowed in pattern */
+  if ((*pszPattern == '.') && (!*(pszPattern+1)) && (!*pszName)) RETURN_CONST_COMMENT(FNM_MATCH, ("trailing dot matches empty string\n"));
+
+  if (*pszPattern || *pszName) RETURN_CONST_COMMENT(FNM_NOMATCH, ("Something remains that did not match\n"));
+
+  RETURN_CONST_COMMENT(FNM_MATCH, ("Complete match\n"));
+}
+#pragma warning(default:4706)
+
diff --git a/deps/MsvcLibX/src/fstat.c b/deps/MsvcLibX/src/fstat.c
new file mode 100644
index 0000000000000000000000000000000000000000..124eda81195c777f19cff89a08018cca13eb006e
--- /dev/null
+++ b/deps/MsvcLibX/src/fstat.c
@@ -0,0 +1,118 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    fstat.c						      *
+*									      *
+*   Description:    Redefinitions of standard C library's fstat()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-24 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+/* MsvcLibX library extensions */
+#include "sys/msvcStat.h"
+#include "msvcDebugm.h"
+
+
+#if defined(_MSDOS)
+
+/* Nothing needs to be redefined */
+
+#endif /* defined(_MSDOS) */
+
+
+#if defined(_WIN32)
+
+/* ------------ Display the *stat* macro values at compile time ------------ */
+
+#pragma message(MACRODEF(_MSVC_stat))
+#pragma message(MACRODEF(_MSVC_fstat))
+#pragma message(MACRODEF(_MSVC_lstat))
+#pragma message(MACRODEF(_MSVC_stat64))
+
+#if _MSVCLIBX_STAT_DEFINED
+  #pragma message(MACRODEF(_LIBX_stat))
+  #pragma message(MACRODEF(_LIBX_stat64))
+#endif
+
+#pragma message(MACRODEF(stat))
+#pragma message(MACRODEF(fstat))
+#pragma message(MACRODEF(lstat))
+
+#if defined(_LARGEFILE_SOURCE64)
+  #pragma message(MACRODEF(stat64))
+  #pragma message(MACRODEF(fstat64))
+  #pragma message(MACRODEF(lstat64))
+#endif
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    fstat						      |
+|									      |
+|   Description:    Redefine the standard _fstatXY() functions                |
+|									      |
+|   Parameters:     int nFile			The file handle		      |
+|		    struct stat *buf		Output buffer		      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    See sys/stat.h for a description of how the stat and fstat|
+|		    macros work.					      |
+|									      |
+|   History:								      |
+|    2014-06-24 JFL Created this routine                               	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int fstat(int nFile, struct stat *pStat) {
+  int iErr;
+  struct _MSVC_stat msStat;
+  DEBUG_CODE(
+  struct tm *pTime;
+  char szTime[100];
+  )
+
+  DEBUG_ENTER((STRINGIZE(fstat) "(%d, 0x%p);\n", nFile, pStat));
+
+  iErr = _MSVC_fstat(nFile, &msStat);
+  if (!iErr) {
+    ZeroMemory(pStat, sizeof(struct stat));
+    pStat->st_mode = msStat.st_mode;
+    pStat->st_size = msStat.st_size;
+    pStat->st_ctime = 
+#undef st_ctime
+    			msStat.st_ctime;
+    pStat->st_mtime = 
+#undef st_mtime
+    			msStat.st_mtime;
+    pStat->st_atime = 
+#undef st_atime
+    			msStat.st_atime;
+    DEBUG_CODE(
+      pTime = LocalFileTime(&(msStat.st_mtime));
+      strftime(szTime, sizeof(szTime), "%Y-%m-%d %H:%M:%S", pTime);
+    )
+    RETURN_INT_COMMENT(0, ("%s  mode = 0x%04X  size = %I64d bytes\n", szTime, pStat->st_mode, (__int64)(pStat->st_size)));
+  }
+  /* TO DO: Get the nanosecond time resolution using Windows functions */
+
+  RETURN_INT_COMMENT(iErr, ("%s\n", strerror(errno)));
+}
+
+#endif /* _WIN32 */
+
diff --git a/deps/MsvcLibX/src/fstat64.c b/deps/MsvcLibX/src/fstat64.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a54962c8833f24aa64e9b41038d2c91851f8da4
--- /dev/null
+++ b/deps/MsvcLibX/src/fstat64.c
@@ -0,0 +1,21 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    fstat64.c						      *
+*									      *
+*   Description:    Redefinitions of standard C library's fstat64()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-24 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* st_*time is 64-bits __time64_t  &  st_size is 64-bits __off64_t */
+
+#undef _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 64
+
+#include "fstat.c"
diff --git a/deps/MsvcLibX/src/fstat64i32.c b/deps/MsvcLibX/src/fstat64i32.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb1dfd445dde9faeb69c6fda2b119d71579c487d
--- /dev/null
+++ b/deps/MsvcLibX/src/fstat64i32.c
@@ -0,0 +1,21 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    fstat64i32.c					      *
+*									      *
+*   Description:    Redefinitions of standard C library's fstat64i32()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-06-24 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* st_*time is 64-bits __time64_t  &  st_size is 32-bits __off32_t */
+
+#undef _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 32
+
+#include "fstat.c"
diff --git a/deps/MsvcLibX/src/fullpath.c b/deps/MsvcLibX/src/fullpath.c
new file mode 100644
index 0000000000000000000000000000000000000000..1cc2bf42712c65912298168ddd39094e5bef4363
--- /dev/null
+++ b/deps/MsvcLibX/src/fullpath.c
@@ -0,0 +1,68 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    fullpath.c						      *
+*									      *
+*   Description     Get the absolute pathname for a relative UTF-8 path       *
+*                                                                             *
+*   Notes	                                                              *
+*                                                                             *
+*   History								      *
+*    2016-09-13 JFL Created this module with routine from truename.c.         *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+#include <stdlib.h>
+#include <malloc.h>
+#include "msvcLimits.h"
+
+#ifdef _WIN32	/* Automatically defined when targeting a Win32 application */
+
+#include "msvcWindows.h"		/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    _fullpathU						      |
+|                                                                             |
+|   Description:    Get the absolute pathname for a relative UTF-8 path       |
+|                                                                             |
+|   Parameters:     See MSVC's _fullpath() in stdlib.h			      |
+|                                                                             |
+|   Return value:   Pointer to the full pathname, or NULL if error	      |
+|                                                                             |
+|   Notes:	    Warning: Windows' GetFullPathname and MSVC's _fullpath    |
+|		    trim trailing dots and spaces from the path.	      |
+|		    This derived function reproduces the bug.		      |
+|                   The caller MUST add trailing dots & spaces back if needed.|
+|                                                                             |
+|   History:								      |
+|    2014-03-25 JFL Created this routine.				      |
+|    2017-01-30 JFL Fixed bug when the output buffer is allocated here.	      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+char *_fullpathU(char *absPath, const char *relPath, size_t maxLength) {
+  char *absPath0 = absPath;
+  DWORD n;
+  if (!absPath) { /* Then allocate a buffer for the output string */
+    maxLength = UTF8_PATH_MAX;
+    absPath = malloc(maxLength); /* Worst case for UTF-8 is 4 bytes/Unicode character */
+    if (!absPath) return NULL;
+  }
+  n = GetFullPathNameU(relPath, (DWORD)maxLength, absPath, NULL);
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    if (!absPath0) free(absPath);
+    return NULL;
+  }
+  if (!absPath0) absPath = realloc(absPath, strlen(absPath) + 1);
+  return absPath;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/getcwd.c b/deps/MsvcLibX/src/getcwd.c
new file mode 100644
index 0000000000000000000000000000000000000000..314c59504a4ff9e299a02ecf8ce0880925803ff5
--- /dev/null
+++ b/deps/MsvcLibX/src/getcwd.c
@@ -0,0 +1,153 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    getcwd.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's getcwd()		      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-28 JFL Created this module.				      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <stdio.h>
+/* MsvcLibX library extensions */
+#include "msvcUnistd.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#if defined(_MSDOS)
+
+/* DOS own getcwd() is OK. */
+
+#endif /* defined(_MSDOS) */
+
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    getcwd						      |
+|									      |
+|   Description:    Get the current directory, encoded in UTF-8               |
+|									      |
+|   Parameters:     char *buf	    Buffer for the output                     |
+|		    size_t bufSize  Buffer size				      |
+|		    							      |
+|   Returns:	    The converted string size. -1=error, and errno set.	      |
+|		    							      |
+|   Notes:	    We can't use the getcwd name, as MSVC has an incompatible |
+|		    prototype for it. So a getcwd macro calls this routine.   |
+|		    							      |
+|   History:								      |
+|    2014-02-28 JFL Created this routine                               	      |
+|    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+char *getcwdA(char *buf, size_t bufSize) {
+  int n;
+  WCHAR wbuf[PATH_MAX];
+  DWORD dwSize;
+
+  dwSize = GetCurrentDirectoryW(COUNTOF(wbuf), wbuf);
+  if (!dwSize) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("getcwd(0x%p, %d); // Error: GetCurrentDirectoryW() Failed\n", buf, bufSize));
+    return NULL;
+  }
+
+  n = WideCharToMultiByte(CP_ACP,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  wbuf,			/* lpWideCharStr, */
+			  dwSize+1,		/* cchWideChar, */
+			  buf,			/* lpMultiByteStr, */
+			  (int)bufSize,		/* cbMultiByte, */
+			  NULL,			/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("getcwd(0x%p, %d); // Error: WideCharToMultiByte() Failed\n", buf, bufSize));
+    return NULL;
+  }
+
+  DEBUG_PRINTF(("getcwd(0x%p, %d); // \"%s\"\n", buf, bufSize, buf));
+  return buf;
+}
+
+char *getcwdU(char *buf, size_t bufSize) {
+  int n;
+  WCHAR wbuf[PATH_MAX];
+  DWORD dwSize;
+
+  dwSize = GetCurrentDirectoryW(COUNTOF(wbuf), wbuf);
+  if (!dwSize) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("getcwd(0x%p, %d); // Error: GetCurrentDirectoryW() Failed\n", buf, bufSize));
+    return NULL;
+  }
+
+  n = WideCharToMultiByte(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  wbuf,			/* lpWideCharStr, */
+			  dwSize+1,		/* cchWideChar, */
+			  buf,			/* lpMultiByteStr, */
+			  (int)bufSize,		/* cbMultiByte, */
+			  NULL,			/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("getcwd(0x%p, %d); // Error: WideCharToMultiByte() Failed\n", buf, bufSize));
+    return NULL;
+  }
+
+  DEBUG_PRINTF(("getcwd(0x%p, %d); // \"%s\"\n", buf, bufSize, buf));
+  return buf;
+}
+
+char *_getdcwdA(int iDrive, char *buf, int iBuflen) {
+  char *pBuf;
+  int iDrive0 = _getdrive();
+  if (iDrive && (iDrive != iDrive0)) _chdrive(iDrive);
+  pBuf = getcwdA(buf, iBuflen);
+  if (iDrive && (iDrive != iDrive0)) _chdrive(iDrive0);
+  DEBUG_CODE(
+    if (pBuf) {
+      DEBUG_PRINTF(("_getdcwd(%d, 0x%p, %d); // \"%s\"\n", iDrive, buf, iBuflen, pBuf));
+    } else {
+      DEBUG_PRINTF(("_getdcwd(%d, 0x%p, %d); // Failed\n", iDrive, buf, iBuflen, pBuf));
+    }
+  )
+  return pBuf;
+}
+
+char *_getdcwdU(int iDrive, char *buf, int iBuflen) {
+  char *pBuf;
+  int iDrive0 = _getdrive();
+  if (iDrive && (iDrive != iDrive0)) _chdrive(iDrive);
+  pBuf = getcwdU(buf, iBuflen);
+  if (iDrive && (iDrive != iDrive0)) _chdrive(iDrive0);
+  DEBUG_CODE(
+    if (pBuf) {
+      DEBUG_PRINTF(("_getdcwd(%d, 0x%p, %d); // \"%s\"\n", iDrive, buf, iBuflen, pBuf));
+    } else {
+      DEBUG_PRINTF(("_getdcwd(%d, 0x%p, %d); // Failed\n", iDrive, buf, iBuflen, pBuf));
+    }
+  )
+  return pBuf;
+}
+
+#endif /* _WIN32 */
+
diff --git a/deps/MsvcLibX/src/getopt.c b/deps/MsvcLibX/src/getopt.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba0b2ccb33eed34944fcb503c4ae5a763ed09fc2
--- /dev/null
+++ b/deps/MsvcLibX/src/getopt.c
@@ -0,0 +1,500 @@
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ *	$NetBSD: getopt_long.c,v 1.11 2009/04/14 17:34:41 joerg Exp $
+ *	2016-09-15 JFL Adapted v 1.11 for use in the MsvcLibX library
+ */
+
+/* 2016-09-15 JFL Begin changes */
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "msvcGetopt.h"
+
+#ifndef _DIAGASSERT
+#ifdef NDEBUG
+#define _DIAGASSERT(test)
+#else
+#define _DIAGASSERT(test) assert(test)
+#endif
+#endif
+
+#undef __UNCONST
+#define __UNCONST(a) ((void *)/*(size_t)*/(const void *)(a))
+
+static const char *progname;
+
+/* Replacement for warnx(3) for systems without it. */
+static void warnx(const char *fmt, ...) {
+        va_list ap;
+
+        va_start(ap, fmt);
+        if (progname)
+                (void) fprintf(stderr, "%s: ", progname);
+        if (fmt)
+                (void) vfprintf(stderr, fmt, ap);
+        (void) fprintf(stderr, "\n");
+        va_end(ap);
+}
+
+#define REPLACE_GETOPT
+
+/* 2016-09-15 JFL End of changes */
+
+#ifdef REPLACE_GETOPT
+#ifdef __weak_alias
+__weak_alias(getopt,_getopt)
+#endif
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+int	optopt = '?';		/* character checked for validity */
+char    *optarg;		/* argument associated with option */
+#endif
+#if !HAVE_DECL_OPTRESET
+int	optreset;		/* reset getopt */
+#endif
+
+#if 0
+#ifdef __weak_alias
+__weak_alias(getopt_long,_getopt_long)
+#endif
+#endif
+
+#define IGNORE_FIRST	(*options == '-' || *options == '+')
+#define PRINT_ERROR	((opterr) && ((*options != ':') \
+				      || (IGNORE_FIRST && options[1] != ':')))
+#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL)
+#define PERMUTE         (!IS_POSIXLY_CORRECT && !IGNORE_FIRST)
+/* XXX: GNU ignores PC if *options == '-' */
+#define IN_ORDER        (!IS_POSIXLY_CORRECT && *options == '-')
+
+/* return values */
+#define	BADCH	(int)'?'
+#define	BADARG		((IGNORE_FIRST && options[1] == ':') \
+			 || (*options == ':') ? (int)':' : (int)'?')
+#define INORDER (int)1
+
+#define	EMSG	""
+
+static int getopt_internal(int, char **, const char *);
+static int gcd(int, int);
+static void permute_args(int, int, int, char **);
+
+static const char *place = EMSG; /* option letter processing */
+
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+
+
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+	int c;
+
+	c = a % b;
+	while (c != 0) {
+		a = b;
+		b = c;
+		c = a % b;
+	}
+	   
+	return b;
+}
+
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end, char **nargv)
+{
+	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+	char *swap;
+
+	_DIAGASSERT(nargv != NULL);
+
+	/*
+	 * compute lengths of blocks and number and size of cycles
+	 */
+	nnonopts = panonopt_end - panonopt_start;
+	nopts = opt_end - panonopt_end;
+	ncycle = gcd(nnonopts, nopts);
+	cyclelen = (opt_end - panonopt_start) / ncycle;
+
+	for (i = 0; i < ncycle; i++) {
+		cstart = panonopt_end+i;
+		pos = cstart;
+		for (j = 0; j < cyclelen; j++) {
+			if (pos >= panonopt_end)
+				pos -= nnonopts;
+			else
+				pos += nopts;
+			swap = nargv[pos];
+			nargv[pos] = nargv[cstart];
+			nargv[cstart] = swap;
+		}
+	}
+}
+
+/*
+ * getopt_internal --
+ *	Parse argc/argv argument vector.  Called by user level routines.
+ *  Returns -2 if -- is found (can be long option or end of options marker).
+ */
+static int
+getopt_internal(int nargc, char **nargv, const char *options)
+{
+	char *oli;				/* option letter list index */
+	int optchar;
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(options != NULL);
+
+	optarg = NULL;
+
+	/*
+	 * XXX Some programs (like rsyncd) expect to be able to
+	 * XXX re-initialize optind to 0 and have getopt_long(3)
+	 * XXX properly function again.  Work around this braindamage.
+	 */
+	if (optind == 0)
+		optind = 1;
+
+	if (optreset)
+		nonopt_start = nonopt_end = -1;
+start:
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc) {          /* end of argument vector */
+			place = EMSG;
+			if (nonopt_end != -1) {
+				/* do permutation, if we have to */
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				optind -= nonopt_end - nonopt_start;
+			}
+			else if (nonopt_start != -1) {
+				/*
+				 * If we skipped non-options, set optind
+				 * to the first of them.
+				 */
+				optind = nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return -1;
+		}
+		if ((*(place = nargv[optind]) != '-')
+		    || (place[1] == '\0')) {    /* found non-option */
+			place = EMSG;
+			if (IN_ORDER) {
+				/*
+				 * GNU extension: 
+				 * return non-option as argument to option 1
+				 */
+				optarg = nargv[optind++];
+				return INORDER;
+			}
+			if (!PERMUTE) {
+				/*
+				 * if no permutation wanted, stop parsing
+				 * at first non-option
+				 */
+				return -1;
+			}
+			/* do permutation */
+			if (nonopt_start == -1)
+				nonopt_start = optind;
+			else if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, nargv);
+				nonopt_start = optind -
+				    (nonopt_end - nonopt_start);
+				nonopt_end = -1;
+			}
+			optind++;
+			/* process next argument */
+			goto start;
+		}
+		if (nonopt_start != -1 && nonopt_end == -1)
+			nonopt_end = optind;
+		if (place[1] && *++place == '-') {	/* found "--" */
+			place++;
+			return -2;
+		}
+	}
+	if ((optchar = (int)*place++) == (int)':' ||
+	    (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
+		/* option letter unknown or ':' */
+		if (!*place)
+			++optind;
+		if (PRINT_ERROR)
+			warnx(illoptchar, optchar);
+		optopt = optchar;
+		return BADCH;
+	}
+	if (optchar == 'W' && oli[1] == ';') {		/* -W long-option */
+		/* XXX: what if no long options provided (called by getopt)? */
+		if (*place) 
+			return -2;
+
+		if (++optind >= nargc) {	/* no arg */
+			place = EMSG;
+			if (PRINT_ERROR)
+				warnx(recargchar, optchar);
+			optopt = optchar;
+			return BADARG;
+		} else				/* white space */
+			place = nargv[optind];
+		/*
+		 * Handle -W arg the same as --arg (which causes getopt to
+		 * stop parsing).
+		 */
+		return -2;
+	}
+	if (*++oli != ':') {			/* doesn't take argument */
+		if (!*place)
+			++optind;
+	} else {				/* takes (optional) argument */
+		optarg = NULL;
+		if (*place)			/* no white space */
+			optarg = __UNCONST(place);
+		/* XXX: disable test for :: if PC? (GNU doesn't) */
+		else if (oli[1] != ':') {	/* arg not optional */
+			if (++optind >= nargc) {	/* no arg */
+				place = EMSG;
+				if (PRINT_ERROR)
+					warnx(recargchar, optchar);
+				optopt = optchar;
+				return BADARG;
+			} else
+				optarg = nargv[optind];
+		}
+		place = EMSG;
+		++optind;
+	}
+	/* dump back option letter */
+	return optchar;
+}
+
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the real getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+	int retval;
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(options != NULL);
+
+	retval = getopt_internal(nargc, __UNCONST(nargv), options);
+	if (retval == -2) {
+		++optind;
+		/*
+		 * We found an option (--), so if we skipped non-options,
+		 * we have to permute.
+		 */
+		if (nonopt_end != -1) {
+			permute_args(nonopt_start, nonopt_end, optind,
+				       (char **)nargv);
+			optind -= nonopt_end - nonopt_start;
+		}
+		nonopt_start = nonopt_end = -1;
+		retval = -1;
+	}
+	return retval;
+}
+#endif
+
+/*
+ * getopt_long --
+ *	Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+	int retval;
+
+#define IDENTICAL_INTERPRETATION(_x, _y)				\
+	(long_options[(_x)].has_arg == long_options[(_y)].has_arg &&	\
+	 long_options[(_x)].flag == long_options[(_y)].flag &&		\
+	 long_options[(_x)].val == long_options[(_y)].val)
+
+	_DIAGASSERT(nargv != NULL);
+	_DIAGASSERT(options != NULL);
+	_DIAGASSERT(long_options != NULL);
+	/* idx may be NULL */
+
+	retval = getopt_internal(nargc, __UNCONST(nargv), options);
+	if (retval == -2) {
+		char *current_argv, *has_equal;
+		size_t current_argv_len;
+		int i, ambiguous, match;
+
+		current_argv = __UNCONST(place);
+		match = -1;
+		ambiguous = 0;
+
+		optind++;
+		place = EMSG;
+
+		if (*current_argv == '\0') {		/* found "--" */
+			/*
+			 * We found an option (--), so if we skipped
+			 * non-options, we have to permute.
+			 */
+			if (nonopt_end != -1) {
+				permute_args(nonopt_start, nonopt_end,
+				    optind, __UNCONST(nargv));
+				optind -= nonopt_end - nonopt_start;
+			}
+			nonopt_start = nonopt_end = -1;
+			return -1;
+		}
+		if ((has_equal = strchr(current_argv, '=')) != NULL) {
+			/* argument found (--option=arg) */
+			current_argv_len = has_equal - current_argv;
+			has_equal++;
+		} else
+			current_argv_len = strlen(current_argv);
+	    
+		for (i = 0; long_options[i].name; i++) {
+			/* find matching long option */
+			if (strncmp(current_argv, long_options[i].name,
+			    current_argv_len))
+				continue;
+
+			if (strlen(long_options[i].name) ==
+			    (unsigned)current_argv_len) {
+				/* exact match */
+				match = i;
+				ambiguous = 0;
+				break;
+			}
+			if (match == -1)		/* partial match */
+				match = i;
+			else if (!IDENTICAL_INTERPRETATION(i, match))
+				ambiguous = 1;
+		}
+		if (ambiguous) {
+			/* ambiguous abbreviation */
+			if (PRINT_ERROR)
+				warnx(ambig, (int)current_argv_len,
+				     current_argv);
+			optopt = 0;
+			return BADCH;
+		}
+		if (match != -1) {			/* option found */
+		        if (long_options[match].has_arg == no_argument
+			    && has_equal) {
+				if (PRINT_ERROR)
+					warnx(noarg, (int)current_argv_len,
+					     current_argv);
+				/*
+				 * XXX: GNU sets optopt to val regardless of
+				 * flag
+				 */
+				if (long_options[match].flag == NULL)
+					optopt = long_options[match].val;
+				else
+					optopt = 0;
+				return BADARG;
+			}
+			if (long_options[match].has_arg == required_argument ||
+			    long_options[match].has_arg == optional_argument) {
+				if (has_equal)
+					optarg = has_equal;
+				else if (long_options[match].has_arg ==
+				    required_argument) {
+					/*
+					 * optional argument doesn't use
+					 * next nargv
+					 */
+					optarg = nargv[optind++];
+				}
+			}
+			if ((long_options[match].has_arg == required_argument)
+			    && (optarg == NULL)) {
+				/*
+				 * Missing argument; leading ':'
+				 * indicates no error should be generated
+				 */
+				if (PRINT_ERROR)
+					warnx(recargstring, current_argv);
+				/*
+				 * XXX: GNU sets optopt to val regardless
+				 * of flag
+				 */
+				if (long_options[match].flag == NULL)
+					optopt = long_options[match].val;
+				else
+					optopt = 0;
+				--optind;
+				return BADARG;
+			}
+		} else {			/* unknown option */
+			if (PRINT_ERROR)
+				warnx(illoptstring, current_argv);
+			optopt = 0;
+			return BADCH;
+		}
+		if (long_options[match].flag) {
+			*long_options[match].flag = long_options[match].val;
+			retval = 0;
+		} else 
+			retval = long_options[match].val;
+		if (idx)
+			*idx = match;
+	}
+	return retval;
+#undef IDENTICAL_INTERPRETATION
+}
diff --git a/deps/MsvcLibX/src/getppid.c b/deps/MsvcLibX/src/getppid.c
new file mode 100644
index 0000000000000000000000000000000000000000..062beff3b040a1138767df727c1124a8b1db11cb
--- /dev/null
+++ b/deps/MsvcLibX/src/getppid.c
@@ -0,0 +1,66 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    getppid.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's getppid()	      *
+*                                                                             *
+*   Notes:	    TO DO: Add a DOS version, using the PSP for the pid.      *
+*                                                                             *
+*		    During the development of this routine, I found a bug     *
+*		    in Windows SDK's tlhelp32.h include file in WIN64:        *
+*		    If packcking has been changed somewhere before including  *
+*		    tlhelp32.h, either due to a #pragma pack directive, or to *
+*		    a compiler /Zp option, it will generate a PROCESSENTRY32  *
+*		    structure with the wrong size. Then anything can happen,  *
+*		    including Process32First failures, or even crashes.	      *
+*		    							      *
+*   History:								      *
+*    2013-03-27 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvcUnistd.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+#pragma pack(push,8) /* Work around a bug in tlhelp32.h in WIN64, which generates the wrong structure if packing has been changed */
+#include <tlhelp32.h>
+#pragma pack(pop)
+
+/*
+pid_t getpid(void) {
+  return (pid_t)GetCurrentProcessId();
+}
+*/
+
+pid_t getppid(void) {
+  pid_t ppid = INVALID_PID;
+  pid_t pid = getpid();
+  HANDLE h;
+  BOOL bFound;
+  PROCESSENTRY32 pe = {0};
+
+  h = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+  if (h == INVALID_HANDLE_VALUE) {
+    return ppid;
+  }
+
+  pe.dwSize = sizeof(PROCESSENTRY32);
+  for (bFound=Process32First(h, &pe); bFound; bFound=Process32Next(h, &pe)) {
+    if ((pid_t)(pe.th32ProcessID) == pid) {
+      ppid = pe.th32ParentProcessID;
+      break;
+    }
+  }
+
+  CloseHandle(h);
+
+  return ppid;
+}
+
+#endif
+
+
diff --git a/deps/MsvcLibX/src/gettimeofday.c b/deps/MsvcLibX/src/gettimeofday.c
new file mode 100644
index 0000000000000000000000000000000000000000..b485edeb9ea805c06f119c7ce2dfa6d47850db29
--- /dev/null
+++ b/deps/MsvcLibX/src/gettimeofday.c
@@ -0,0 +1,40 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    gettimeofday.c					      *
+*                                                                             *
+*   Description     DOS/WIN32 port of standard C library's gettimeofday().    *
+*                                                                             *
+*   Notes	                                                              *
+*                                                                             *
+*   History								      *
+*    2014-06-04 JFL Created this file.                                        *
+*		    							      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "msvclibx.h"
+
+#include "msvcTime.h"
+#include "sys/msvcTime.h"
+
+#ifdef _MSDOS
+/* MS-DOS only has a 1-second resolution on system time.
+   Use the existence of macro _STRUCT_TIMEVAL to test if it's possible
+   to use gettimeofday(), else use time(), which is supported by all OSs */
+#endif
+
+#if 0
+
+/* Get the current date and time into a struct timeval */
+int gettimeofday(struct timeval *ptv, void *pTimeZone) {
+  struct timespec ts;
+  int iErr;
+  if (pTimeZone) pTimeZone = _timezone; /* Ignore it, and prevent compilation warning */
+  iErr = clock_gettime(CLOCK_REALTIME, &ts);
+  if (iErr) return iErr;
+  TIMESPEC_TO_TIMEVAL(ptv, &ts);
+  return 0;
+}
+
+#endif /* defined(_WIN32) */
diff --git a/deps/MsvcLibX/src/iconv.c b/deps/MsvcLibX/src/iconv.c
new file mode 100644
index 0000000000000000000000000000000000000000..40b6e6462d9d0a6dc53509e8645cfba50b446256
--- /dev/null
+++ b/deps/MsvcLibX/src/iconv.c
@@ -0,0 +1,229 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    iconv.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's iconv()		      *
+*                                                                             *
+*   Notes:	    Define here a number of routines, that will eventually    *
+*		    be used by iconv().					      *
+*		    							      *
+*   History:								      *
+*    2014-02-27 JFL Created this module.				      *
+*    2015-12-09 JFL Added routines fputsU and vfprintfU.		      *
+*    2016-09-13 JFL Fixed warnings in fputsU. Do not change the input buffer. *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+/* MsvcLibX library extensions */
+#include "msvcIconv.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#if defined(_MSDOS)
+
+/* TO DO: Add support for DOS code pages! */
+
+#endif /* defined(_MSDOS) */
+
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    ConvertString					      |
+|									      |
+|   Description:    Convert a string from one MBCS encoding to another        |
+|									      |
+|   Parameters:     char *buf	    Buffer containg a NUL-terminated string   |
+|		    size_t nBytes   Buffer size				      |
+|		    UINT cpFrom	    Initial Windows code page identifier      |
+|		    UINT cpTo	    Final Windows code page identifier	      |
+|		    LPCSTR lpDfltC  Pointer to the Default Character to use   |
+|		    			(NULL = Use the default default!)     |
+|		    							      |
+|   Returns:	    The converted string size. -1=error, and errno set.	      |
+|		    							      |
+|   Notes:	    See the list of Windows code page identifiers there:      |
+|    http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756(v=vs.85).aspx
+|		    							      |
+|   History:								      |
+|    2014-02-27 JFL Created this routine                               	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int ConvertString(char *buf, size_t nBytes, UINT cpFrom, UINT cpTo, LPCSTR lpDefaultChar) {
+  int n = (int)lstrlen(buf);
+  if (cpFrom != cpTo) {
+    WCHAR *pWBuf = (WCHAR *)malloc(sizeof(WCHAR)*nBytes);
+    if (!pWBuf) {
+      errno = ENOMEM;
+      return -1;
+    }
+    n = MultiByteToWideChar(cpFrom,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			    0,			/* dwFlags, */
+			    buf,		/* lpMultiByteStr, */
+			    n+1,		/* cbMultiByte, +1 to copy the final NUL */
+			    pWBuf,		/* lpWideCharStr, */
+			    (int)nBytes		/* cchWideChar, */
+			    );
+    n = WideCharToMultiByte(cpTo,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			    0,			/* dwFlags, */
+			    pWBuf,		/* lpWideCharStr, */
+			    n,			/* cchWideChar, */
+			    buf,		/* lpMultiByteStr, */
+			    (int)nBytes,	/* cbMultiByte, */
+			    lpDefaultChar,	/* lpDefaultChar, */
+			    NULL		/* lpUsedDefaultChar */
+			    );
+    free(pWBuf);
+    if (!n) {
+      errno = Win32ErrorToErrno();
+      return -1;
+    }
+    n -= 1;	/* Output string size, not counting the final NUL */
+  }
+  return n;
+}
+
+char *DupAndConvert(const char *string, UINT cpFrom, UINT cpTo, LPCSTR lpDefaultChar) {
+  int nBytes;
+  char *pBuf;
+  nBytes = 4 * ((int)lstrlen(string) + 1); /* Worst case for the size needed */
+  pBuf = (char *)malloc(nBytes);
+  if (!pBuf) {
+    errno = ENOMEM;
+    return NULL;
+  }
+  lstrcpy(pBuf, string);
+  nBytes = ConvertString(pBuf, nBytes, cpFrom, cpTo, lpDefaultChar);
+  if (nBytes == -1) {
+    free(pBuf);
+    return NULL;
+  }
+  pBuf = realloc(pBuf, nBytes+1);
+  return pBuf;
+}
+
+int CountCharacters(const char *string, UINT cp) {
+  int n;
+  WCHAR *pWBuf;
+
+  n = (int)lstrlen(string);
+  if (!n) return 0;
+
+  pWBuf = (WCHAR *)malloc(sizeof(WCHAR)*n);
+  if (!pWBuf) {
+    errno = ENOMEM;
+    return -1;
+  }
+
+  n = MultiByteToWideChar(cp,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,		/* dwFlags, */
+			  string,	/* lpMultiByteStr, */
+			  n,		/* cbMultiByte, */
+			  pWBuf,	/* lpWideCharStr, */
+			  n		/* cchWideChar, */
+			  );
+  free(pWBuf);
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return n;
+}
+
+UINT codePage = 0;
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Functions:	    fputsU, vfprintfU, fprintfU, printfU		      |
+|									      |
+|   Description:    Output UTF-8 strings				      |
+|									      |
+|   Parameters:     Same as fputs, vfprintf, fprintf, printf		      |
+|		    							      |
+|   Returns:	    Same as fputs, vfprintf, fprintf, printf		      |
+|		    							      |
+|   Notes:	    Converts the string to the output code page if needed.    |
+|		    							      |
+|   History:								      |
+|    2014-02-27 JFL Created fprintfU and printfU.                	      |
+|    2015-12-09 JFL Restructured them over vfprintfU, itself over fputsU.     |
+|    2016-09-13 JFL Fixed warnings.					      |
+|		    Do not change the input buffer.                           |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* Make sure we're calling Microsoft routines, not our aliases */
+#undef printf
+#undef fprintf
+#undef vfprintf
+#undef fputs
+
+int fputsU(const char *buf, FILE *f) { /* fputs a UTF-8 string */
+  int iRet;
+  char *pBuf = NULL;
+
+  if (!codePage) codePage = GetConsoleOutputCP();
+  if (codePage != CP_UTF8) {
+    pBuf = DupAndConvert(buf, CP_UTF8, codePage, NULL);
+  } else {
+    pBuf = (char *)buf;
+  }
+  if (pBuf) { /* If no error, and something to output */
+    iRet = fputs(pBuf, f);
+    if ((iRet >= 0) && DEBUG_IS_ON()) fflush(f); /* Slower, but ensures we get everything before crashes! */
+    if (pBuf != buf) free(pBuf);
+  } else {
+    iRet = -1; /* Could not convert the string to output */
+  }
+  return iRet; /* Return the error (n<0) or success (n>=0) */
+}
+
+int vfprintfU(FILE *f, const char *pszFormat, va_list vl) { /* vfprintf UTF-8 strings */
+  int n;
+  char buf[UNICODE_PATH_MAX + 4096];
+
+  n = _vsnprintf(buf, sizeof(buf), pszFormat, vl);
+  if (n > 0) { /* If no error (n>=0), and something to output (n>0), do output */
+    int iErr = fputsU(buf, f);
+    if (iErr < 0) n = iErr;
+  }
+
+  return n;
+}
+
+int fprintfU(FILE *f, const char *pszFormat, ...) { /* fprintf UTF-8 strings */
+  va_list vl;
+  int n;
+
+  va_start(vl, pszFormat);
+  n = vfprintfU(f, pszFormat, vl);
+  va_end(vl);
+
+  return n;
+}
+
+int printfU(const char *pszFormat, ...) { /* printf UTF-8 strings */
+  va_list vl;
+  int n;
+
+  va_start(vl, pszFormat);
+  n = vfprintfU(stdout, pszFormat, vl);
+  va_end(vl);
+
+  return n;
+}
+
+#endif /* _WIN32 */
+
diff --git a/deps/MsvcLibX/src/lstat.c b/deps/MsvcLibX/src/lstat.c
new file mode 100644
index 0000000000000000000000000000000000000000..e107fd87063a85b87d4ddc57d3b72f0c0ec880e6
--- /dev/null
+++ b/deps/MsvcLibX/src/lstat.c
@@ -0,0 +1,432 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    lstat.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's lstat()		      *
+*                   Also contains unlink() and rmdir(), which do use lstat.   *
+*                                                                             *
+*   Notes:	    TO DO: Make 3 versions for Windows: ANSI, WSTR, UTF8      *
+*		    							      *
+*   History:								      *
+*    2014-02-06 JFL Created this module.				      *
+*    2014-02-12 JFL Added code to filter reparse points, and keep only        *
+*		    real junctions and symlinks.                              *
+*    2014-02-13 JFL Moved dirent2stat() from dirent.c, as there must actually *
+*		    be 4 WIN32 versions, for the four versions of struct stat.*
+*    2014-02-28 JFL Added support for UTF-8 pathnames.                 	      *
+*    2014-03-24 JFL Renamed "statx.h" as the standard <sys/stat.h>.	      *
+*    2014-06-30 JFL Added support for 32K Unicode paths.           	      *
+*                                                                             *
+*        Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+/* Microsoft C libraries include files */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+/* MsvcLibX library extensions */
+#include "msvclibx.h"
+#include <sys/msvcStat.h>
+#include "msvcDirent.h"
+#include "msvcUnistd.h" /* For ResolveLinks() definition */
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#if defined(_MSDOS)
+/* Make sure it's only defined it in one of the lstatxxx versions */
+#if !defined(_USE_32BIT_TIME_T) && (_FILE_OFFSET_BITS == 32)
+
+int dirent2stat(_dirent *pDirent, struct _stat *pStat) {
+  memset(pStat, 0, sizeof(struct stat));
+
+  /* Set times */
+  pStat->st_mtime = Filetime2Timet(pDirent->d_date, pDirent->d_time);
+  /* Size */
+  pStat->st_size = pDirent->d_filesize;
+  /* Standard attributes */
+  pStat->st_mode |= (pDirent->d_type << 12); /* Set the 4-bit type field */
+  pStat->st_mode |= _S_IREAD | _S_IWRITE | _S_IEXEC; /* Assume it's fully accessible */
+  if (pDirent->d_attribs & _A_RDONLY) pStat->st_mode &= ~_S_IWRITE;
+  /* DOS-specific attributes */
+  if (pDirent->d_attribs & _A_HIDDEN) pStat->st_mode |= S_HIDDEN;
+  if (pDirent->d_attribs & _A_ARCH) pStat->st_mode |= S_ARCHIVE;
+  if (pDirent->d_attribs & _A_SYSTEM) pStat->st_mode |= S_SYSTEM;
+
+  return 0;
+}
+
+#endif /* defined(_USE_32BIT_TIME_T) && (_FILE_OFFSET_BITS == 32) */
+#endif /* defined(_MSDOS) */
+
+
+#ifdef _WIN32
+
+/* ------------ Display the *stat* macro values at compile time ------------ */
+
+#pragma message(MACRODEF(_MSVC_stat))
+#pragma message(MACRODEF(_MSVC_fstat))
+#pragma message(MACRODEF(_MSVC_lstat))
+#pragma message(MACRODEF(_MSVC_stat64))
+
+#if _MSVCLIBX_STAT_DEFINED
+  #pragma message(MACRODEF(_LIBX_stat))
+  #pragma message(MACRODEF(_LIBX_stat64))
+#endif
+
+#pragma message(MACRODEF(stat))
+#pragma message(MACRODEF(fstat))
+#pragma message(MACRODEF(lstat))
+
+#if 0
+#pragma message(MACRODEF(_lstat))
+#pragma message(MACRODEF(_lstati64))
+#if _MSVCLIBX_STAT_DEFINED
+  #pragma message(MACRODEF(_lstat_ns))
+  #pragma message(MACRODEF(_lstati64_ns))
+#endif
+#endif
+
+#if defined(_LARGEFILE_SOURCE64)
+  #pragma message(MACRODEF(stat64))
+  #pragma message(MACRODEF(fstat64))
+  #pragma message(MACRODEF(lstat64))
+#endif
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    lstat						      |
+|									      |
+|   Description:    Common definition of all _lstatXY() functions             |
+|									      |
+|   Parameters:     const char *path		The symlink name	      |
+|		    struct stat *buf		Output buffer		      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    See statx.h for a description of how the stat and lstat   |
+|		    macros work.					      |
+|									      |
+|   History:								      |
+|    2014-02-06 JFL Created this routine                               	      |
+|    2014-02-28 JFL Added support for UTF-8 pathnames.                 	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int lstat(const char *path, struct stat *pStat) {
+  BOOL bDone;
+  DWORD dwAttr;
+  WIN32_FILE_ATTRIBUTE_DATA fileData;
+  unsigned __int64 qwSize;
+  int bIsJunction = FALSE;
+  int bIsMountPoint = FALSE;
+  DWORD dwTag = 0;
+  DEBUG_CODE(
+  char szTime[100];
+  )
+  WCHAR wszName[UNICODE_PATH_MAX];
+  int n;
+
+  DEBUG_ENTER((STRINGIZE(lstat) "(\"%s\", 0x%p);\n", path, pStat));
+
+#if USE_MSVC_STAT
+  dwAttr = GetFileAttributes(path);
+  DEBUG_PRINTF(("GetFileAttributes() = 0x%lX\n", dwAttr));
+  if (dwAttr == INVALID_FILE_ATTRIBUTES) {
+    errno = ENOENT;
+    RETURN_INT_COMMENT(-1, ("File does not exist\n"));
+  }
+
+  if (!(dwAttr & FILE_ATTRIBUTE_REPARSE_POINT)) {
+    int iErr = stat(path, pStat);
+    RETURN_INT(iErr);
+  }
+#endif
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  UNICODE_PATH_MAX	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+
+  bDone = GetFileAttributesExW(wszName, GetFileExInfoStandard, &fileData);
+  if (!bDone) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("GetFileAttributesEx(); // Failed\n"));
+  }
+  XDEBUG_PRINTF(("GetFileAttributesEx(); // Success\n"));
+  dwAttr = fileData.dwFileAttributes;
+  XDEBUG_PRINTF(("dwFileAttributes = 0x%lX\n", dwAttr));
+  DEBUG_CODE_IF_ON(Filetime2String(&fileData.ftLastWriteTime, szTime, sizeof(szTime)););
+  XDEBUG_PRINTF(("ftLastWriteTime = %s\n", szTime));
+  qwSize = ((unsigned __int64)fileData.nFileSizeHigh << 32) | fileData.nFileSizeLow;
+  XDEBUG_PRINTF(("nFileSize = %I64d\n", qwSize));
+
+  ZeroMemory(pStat, sizeof(struct stat));
+  /* Set times */
+#if _MSVCLIBX_STAT_DEFINED
+  Filetime2Timespec(&fileData.ftCreationTime, &(pStat->st_ctim));  /* Windows = Create time; Unix = Permissions change time */
+  Filetime2Timespec(&fileData.ftLastWriteTime, &(pStat->st_mtim));
+  Filetime2Timespec(&fileData.ftLastAccessTime, &(pStat->st_atim));
+#else
+  Filetime2Timet(&fileData.ftCreationTime, &(pStat->st_ctime));  /* Windows = Create time; Unix = Permissions change time */
+  Filetime2Timet(&fileData.ftLastWriteTime, &(pStat->st_mtime));
+  Filetime2Timet(&fileData.ftLastAccessTime, &(pStat->st_atime));
+#endif
+  /* Size */
+  /* NOTE: There is loss of data here if the file size is > 2GB, and off_t is 32-bits */
+  pStat->st_size = (off_t)qwSize;
+#if (_STAT_FILE_SIZE < 64)
+#define _MAX_FILE_SIZE 0x7FFFFFFFL
+  if (qwSize > _MAX_FILE_SIZE) pStat->st_size = (off_t)_MAX_FILE_SIZE;
+#endif
+  /* Standard attributes */
+  /* File type */
+check_attr_again:
+  if (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT) {
+    /* JUNCTIONs and SYMLINKDs both have the FILE_ATTRIBUTE_DIRECTORY flag also set.
+    // Test the FILE_ATTRIBUTE_REPARSE_POINT flag first, to make sure they're seen as symbolic links.
+    //
+    // All symlinks are reparse points, but not all reparse points are symlinks. */
+    dwTag = GetReparseTagU(path);
+    switch (dwTag) {
+      case IO_REPARSE_TAG_MOUNT_POINT:	/* NTFS junction or mount point */
+	{ /* We must read the link to distinguish junctions from mount points. */
+	WCHAR wbuf[UNICODE_PATH_MAX];
+	ssize_t n;
+	bIsMountPoint = TRUE;
+	n = readlinkW(wszName, wbuf, UNICODE_PATH_MAX);
+	/* Junction targets are absolute pathnames, starting with a drive letter. Ex: C: */
+	/* readlink() fails if the reparse point does not target a valid pathname */
+	if (n < 0) goto this_is_not_a_symlink; /* This is not a junction. */
+	bIsJunction = TRUE; /* Else this is a junction. Fall through to the symlink case. */
+	} 	      
+      case IO_REPARSE_TAG_SYMLINK:		/* NTFS symbolic link */
+	pStat->st_mode |= S_IFLNK;		/* Symbolic link */
+	break;
+      default:	/* Anything else is definitely not like a Unix symlink */
+this_is_not_a_symlink:
+	dwAttr &= ~FILE_ATTRIBUTE_REPARSE_POINT;
+	goto check_attr_again;
+    }
+  } else if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
+    pStat->st_mode |= S_IFDIR;		/* Subdirectory */
+  else if (dwAttr & FILE_ATTRIBUTE_DEVICE)
+    pStat->st_mode |= S_IFCHR;		/* Device (we don't know if character or block) */
+  else
+    pStat->st_mode |= S_IFREG;		/* A normal file by default */
+  /* pStat->st_mode |= (pDirent->d_type << 12); /* Set the 4-bit type field */
+  pStat->st_mode |= _S_IREAD | _S_IWRITE | _S_IEXEC; /* Assume it's fully accessible */
+  if (dwAttr & FILE_ATTRIBUTE_READONLY) pStat->st_mode &= ~_S_IWRITE;
+  /* DOS-specific attributes */
+  if (dwAttr & FILE_ATTRIBUTE_HIDDEN) pStat->st_mode |= S_HIDDEN;
+  if (dwAttr & FILE_ATTRIBUTE_ARCHIVE) pStat->st_mode |= S_ARCHIVE;
+  if (dwAttr & FILE_ATTRIBUTE_SYSTEM) pStat->st_mode |= S_SYSTEM;
+  /* Windows-specific attributes */
+  if (dwAttr & FILE_ATTRIBUTE_COMPRESSED) pStat->st_mode |= S_COMPRESSED;
+  if (dwAttr & FILE_ATTRIBUTE_ENCRYPTED) pStat->st_mode |= S_ENCRYPTED;
+  if (dwAttr & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) pStat->st_mode |= S_NOT_CONTENT_INDEXED;
+  if (dwAttr & FILE_ATTRIBUTE_OFFLINE) pStat->st_mode |= S_OFFLINE;
+  if (dwAttr & FILE_ATTRIBUTE_SPARSE_FILE) pStat->st_mode |= S_SPARSE_FILE;
+  if (bIsMountPoint) pStat->st_mode |= S_MOUNT_POINT; /* Will allow to distinguish junctions from mount points */
+  /* if (dwAttr & FILE_ATTRIBUTE_TEMPORARY) pStat->st_mode |= S_TEMPORARY; */
+  /* if (dwAttr & FILE_ATTRIBUTE_VIRTUAL) pStat->st_mode |= S_VIRTUAL; */
+#if _MSVCLIBX_STAT_DEFINED
+  pStat->st_Win32Attrs = dwAttr;
+  pStat->st_ReparseTag = dwTag;
+#endif
+
+  RETURN_INT_COMMENT(0, ("%s  mode = 0x%04X  size = %I64d bytes\n", szTime, pStat->st_mode, qwSize));
+}
+
+#if !USE_MSVC_STAT
+int stat(const char *path, struct stat *pStat) {
+  char buf[UTF8_PATH_MAX];
+  int iErr;
+
+  DEBUG_ENTER((STRINGIZE(stat) "(\"%s\", 0x%p);\n", path, pStat));
+
+  iErr = ResolveLinksU(path, buf, sizeof(buf));
+  if (!iErr) lstat(buf, pStat);
+
+  RETURN_INT(iErr);
+}
+#endif /* !USE_MSVC_STAT */
+
+int dirent2stat(_dirent *pDirent, struct stat *pStat) {
+  memset(pStat, 0, sizeof(struct stat));
+
+  /* Set times */
+#if _MSVCLIBX_STAT_DEFINED
+  Filetime2Timespec(&pDirent->d_CreationTime, &(pStat->st_ctim));  /* Windows = Create time; Unix = Permissions change time */
+  Filetime2Timespec(&pDirent->d_LastWriteTime, &(pStat->st_mtim));
+  Filetime2Timespec(&pDirent->d_LastAccessTime, &(pStat->st_atim));
+#else
+  Filetime2Timet(&pDirent->d_CreationTime, &(pStat->st_ctime));  /* Windows = Create time; Unix = Permissions change time */
+  Filetime2Timet(&pDirent->d_LastWriteTime, &(pStat->st_mtime));
+  Filetime2Timet(&pDirent->d_LastAccessTime, &(pStat->st_atime));
+#endif
+  /* Size */
+  /* NOTE: There is loss of data here if the file size is > 2GB, and off_t is 32-bits */
+  pStat->st_size = (off_t)(pDirent->d_filesize);
+#if (_STAT_FILE_SIZE < 64)
+#define _MAX_FILE_SIZE 0x7FFFFFFFL
+  if (pDirent->d_filesize > _MAX_FILE_SIZE) pStat->st_size = (off_t)_MAX_FILE_SIZE;
+#endif
+  /* Standard attributes */
+  pStat->st_mode |= (pDirent->d_type << 12); /* Set the 4-bit type field */
+  pStat->st_mode |= _S_IREAD | _S_IWRITE | _S_IEXEC; /* Assume it's fully accessible */
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_READONLY) pStat->st_mode &= ~_S_IWRITE;
+  /* DOS-specific attributes */
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_HIDDEN) pStat->st_mode |= S_HIDDEN;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_ARCHIVE) pStat->st_mode |= S_ARCHIVE;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_SYSTEM) pStat->st_mode |= S_SYSTEM;
+  /* Windows-specific attributes */
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_COMPRESSED) pStat->st_mode |= S_COMPRESSED;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_ENCRYPTED) pStat->st_mode |= S_ENCRYPTED;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) pStat->st_mode |= S_NOT_CONTENT_INDEXED;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_OFFLINE) pStat->st_mode |= S_OFFLINE;
+  if (pDirent->d_attribs & FILE_ATTRIBUTE_SPARSE_FILE) pStat->st_mode |= S_SPARSE_FILE;
+  /* Special case of junction and mount points */
+  if (pDirent->d_ReparseTag) pStat->st_mode |= S_MOUNT_POINT;
+  /* if (pDirent->d_attribs & FILE_ATTRIBUTE_TEMPORARY) pStat->st_mode |= S_TEMPORARY; */
+  /* if (pDirent->d_attribs & FILE_ATTRIBUTE_VIRTUAL) pStat->st_mode |= S_VIRTUAL; */
+#if _MSVCLIBX_STAT_DEFINED
+  pStat->st_Win32Attrs = pDirent->d_attribs;
+  pStat->st_ReparseTag = pDirent->d_ReparseTag;
+#endif
+
+  return 0;
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    unlink						      |
+|									      |
+|   Description:    Remove a file or a symbolic link		              |
+|									      |
+|   Parameters:     const char *path		The file or symlink name      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    							      |
+|									      |
+|   History:								      |
+|    2014-02-17 JFL Created this routine                               	      |
+|    2014-02-28 JFL Added support for UTF-8 pathnames.                 	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int unlink(const char *path) {
+  int iErr;
+  BOOL bDone;
+  struct stat st;
+  WCHAR wszName[UNICODE_PATH_MAX];
+  int n;
+
+  DEBUG_ENTER(("unlink(\"%s\");\n", path));
+
+  iErr = lstat(path, &st);
+  if (iErr) RETURN_INT(iErr);
+
+  if ((!S_ISREG(st.st_mode)) && (!S_ISLNK(st.st_mode))) {
+    errno = ENOENT;
+    RETURN_INT_COMMENT(-1, ("Pathname exists, but is not a file or a link\n"));
+  }
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  UNICODE_PATH_MAX	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+
+#if _MSVCLIBX_STAT_DEFINED
+  if (S_ISLNK(st.st_mode) && (st.st_Win32Attrs & FILE_ATTRIBUTE_DIRECTORY)) {
+    /* This link is a junction or a symlinkd */
+    bDone = RemoveDirectoryW(wszName);
+  } else
+#endif
+  bDone = DeleteFileW(wszName);
+
+  if (bDone) {
+    RETURN_INT_COMMENT(0, ("Success\n"));
+  } else {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("Failed\n"));
+  }
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    rmdir						      |
+|									      |
+|   Description:    Remove a directory				              |
+|									      |
+|   Parameters:     const char *path		The directory name	      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    							      |
+|									      |
+|   History:								      |
+|    2014-03-05 JFL Created this routine with support for UTF-8 pathnames.    |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int rmdir(const char *path) {
+  int iErr;
+  BOOL bDone;
+  struct stat st;
+  WCHAR wszName[UNICODE_PATH_MAX];
+  int n;
+
+  DEBUG_ENTER(("rmdir(\"%s\");\n", path));
+
+  iErr = lstat(path, &st);
+  if (iErr) RETURN_INT(iErr);
+
+  if (!S_ISDIR(st.st_mode)) {
+    errno = ENOTDIR;
+    RETURN_INT_COMMENT(-1, ("Pathname exists, but is not a directory\n"));
+  }
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  UNICODE_PATH_MAX	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+
+  bDone = RemoveDirectoryW(wszName);
+
+  if (bDone) {
+    RETURN_INT_COMMENT(0, ("Success\n"));
+  } else {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("Failed\n"));
+  }
+}
+
+#endif /* _WIN32 */
+
diff --git a/deps/MsvcLibX/src/lstat32.c b/deps/MsvcLibX/src/lstat32.c
new file mode 100644
index 0000000000000000000000000000000000000000..67023ea2bd2ddf1fe3accd8086168ffee99d3944
--- /dev/null
+++ b/deps/MsvcLibX/src/lstat32.c
@@ -0,0 +1,24 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    lstat32.c						      *
+*									      *
+*   Description:    Redefinitions of standard C library's lstat32()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-14 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef  _WIN64 /* WIN64 does not support 32-bits time_t */
+
+/* st_*time is 32-bits __time32_t  &  st_size is 32-bits __off32_t */
+
+#define _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 32
+
+#include "lstat.c"
+#endif
diff --git a/deps/MsvcLibX/src/lstat32i64.c b/deps/MsvcLibX/src/lstat32i64.c
new file mode 100644
index 0000000000000000000000000000000000000000..483ff471a2253f333ecca71fc42302d8fec1e83a
--- /dev/null
+++ b/deps/MsvcLibX/src/lstat32i64.c
@@ -0,0 +1,24 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    lstat32i64.c					      *
+*									      *
+*   Description:    Redefinitions of standard C library's lstat32i64()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-14 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#ifndef  _WIN64 /* WIN64 does not support 32-bits time_t */
+
+/* st_*time is 32-bits __time32_t  &  st_size is 64-bits __off64_t */
+
+#define _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 64
+
+#include "lstat.c"
+#endif
diff --git a/deps/MsvcLibX/src/lstat64.c b/deps/MsvcLibX/src/lstat64.c
new file mode 100644
index 0000000000000000000000000000000000000000..56cd0e91a9b143b647b46fac5219ea7099e5bced
--- /dev/null
+++ b/deps/MsvcLibX/src/lstat64.c
@@ -0,0 +1,21 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    lstat.c						      *
+*									      *
+*   Description:    Redefinitions of standard C library's lstat()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-14 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* st_*time is 64-bits __time64_t  &  st_size is 64-bits __off64_t */
+
+#undef _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 64
+
+#include "lstat.c"
diff --git a/deps/MsvcLibX/src/lstat64i32.c b/deps/MsvcLibX/src/lstat64i32.c
new file mode 100644
index 0000000000000000000000000000000000000000..6c86979191aa96f6234635e2252bd443b338b090
--- /dev/null
+++ b/deps/MsvcLibX/src/lstat64i32.c
@@ -0,0 +1,21 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    lstat64i32.c					      *
+*									      *
+*   Description:    Redefinitions of standard C library's lstat64i32()	      *
+*                                                                             *
+*   Notes:	    							      *
+*                                                                             *
+*   History:								      *
+*    2014-02-14 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+/* st_*time is 64-bits __time64_t  &  st_size is 32-bits __off32_t */
+
+#undef _USE_32BIT_TIME_T
+#define _FILE_OFFSET_BITS 32
+
+#include "lstat.c"
diff --git a/deps/MsvcLibX/src/main.c b/deps/MsvcLibX/src/main.c
new file mode 100644
index 0000000000000000000000000000000000000000..f366b081ad688e15dc62dd0c8a7ccf9bb409afe0
--- /dev/null
+++ b/deps/MsvcLibX/src/main.c
@@ -0,0 +1,225 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    main.c						      *
+*									      *
+*   Description:    Main routine for WIN32 UTF-8 programs		      *
+*                                                                             *
+*   Notes:	    TO DO: Also set the environment with _setenvp() ?	      *
+*		    							      *
+*   History:								      *
+*    2014-03-03 JFL Created this module.				      *
+*    2016-09-20 JFL Bug fix: Empty arguments "" did not get recorded.	      *
+*    2017-02-05 JFL Redesigned to override libc's _setargv(). This avoids     *
+*                   having to encapsulate the main() routine with one here.   *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE
+#define _CRT_SECURE_NO_WARNINGS /* Avoid depreciation warnings */
+
+#include "msvclibx.h"
+#include "msvcStdio.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include "msvcIconv.h"	/* For MsvcLibX' codePage global variable */
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        BreakArgLine                                              |
+|                                                                             |
+|   Description     Break the Windows command line into standard C arguments  |
+|                                                                             |
+|   Parameters      LPSTR pszCmdLine    NUL-terminated argument line          |
+|                   char *pszArg[]      Array of arguments pointers           |
+|                                                                             |
+|   Returns         int argc            Number of arguments found. -1 = Error |
+|                                                                             |
+|   Notes           MSVC library startup \" parsing rule is:                  |
+|                   2N backslashes + " ==> N backslashes and begin/end quote  |
+|                   2N+1 backslashes + " ==> N backslashes + literal "	      |
+|                   N backslashes ==> N backslashes                           |
+|                                                                             |
+|   History 								      |
+|    1993-10-05 JFL Initial implementation within devmain().		      |
+|    1994-04-14 JFL Extracted from devmain, and created this routine.	      |
+|    1995-04-07 JFL Extracted from llkinit.c.				      |
+|    1996-09-26 JFL Adapted to Win32 programs.				      |
+|    1996-12-11 JFL Use Windows string routines.			      |
+|    2001-09-18 JFL Set argv[0] with actual module file name.		      |
+|                   Manage quoted strings as a single argument.               |
+|    2001-09-25 JFL Only process \x inside strings.                           |
+|    2014-03-04 JFL Removed the C-style \-quoting of characters, which was    |
+|                   convenient, but incompatible with MSVC argument parsing.  |
+|                   Removed the limitation on the # of arguments.             |
+|                   Made the code compatible with ANSI and UTF-8 encodings.   |
+|    2017-02-05 JFL Check memory allocation errors, and if so return -1.      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+int BreakArgLine(LPSTR pszCmdLine, char ***pppszArg) {
+  int i, j;
+  int argc = 0;
+  char c, c0;
+  char *pszCopy;
+  int iString = FALSE;	/* TRUE = string mode; FALSE = non-string mode */
+  int nBackslash = 0;
+  char **ppszArg;
+  int iArg = FALSE;	/* TRUE = inside an argument; FALSE = between arguments */
+
+  ppszArg = (char **)malloc((argc+1)*sizeof(char *));
+  if (!ppszArg) return -1;
+
+  /* Make a local copy of the argument line */
+  /* Break down the local copy into standard C arguments */
+
+  pszCopy = malloc(lstrlen(pszCmdLine) + 1);
+  if (!pszCopy) return -1;
+  /* Copy the string, managing quoted characters */
+  for (i=0, j=0, c0='\0'; ; i++) {
+    c = pszCmdLine[i];
+    if (!c) {		    /* End of argument line */
+      for ( ; nBackslash; nBackslash--) pszCopy[j++] = '\\'; /* Output pending \s */
+      pszCopy[j++] = c;
+      break;
+    }
+    if ((!iArg) && (c != ' ') && (c != '\t')) { /* Beginning of a new argument */
+      iArg = TRUE;
+      ppszArg[argc++] = pszCopy+j;
+      ppszArg = (char **)realloc(ppszArg, (argc+1)*sizeof(char *));
+      if (!ppszArg) return -1;
+      pszCopy[j] = c0 = '\0';
+    }
+    if (c == '\\') {	    /* Escaped character in string (maybe) */
+      nBackslash += 1; 
+      continue;
+    }
+    if (c == '"') {
+      if (nBackslash & 1) { /* Output N/2 \ and a literal " */
+      	for (nBackslash >>= 1; nBackslash; nBackslash--) pszCopy[j++] = '\\';
+	pszCopy[j++] = c0 = c;
+	continue;
+      }
+      if (nBackslash) {	    /* Output N/2 \ and switch string mode */
+      	for (nBackslash >>= 1; nBackslash; nBackslash--) pszCopy[j++] = '\\';
+      }
+      iString = !iString;
+      continue;
+    }
+    for ( ; nBackslash; nBackslash--) pszCopy[j++] = '\\'; /* Output pending \s */
+    if ((!iString) && ((c == ' ') || (c == '\t'))) { /* End of an argument */
+      iArg = FALSE;
+      c = '\0';
+    }
+    pszCopy[j++] = c0 = c;
+  }
+
+  ppszArg[argc] = NULL;
+  *pppszArg = ppszArg;
+
+  return argc;
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function	    _setargv						      |
+|									      |
+|   Description	    Msft standard CRT routine for parsing the command line.   |
+|									      |
+|   Parameters	    char *_acmdln	Command line parameters.	      |
+|									      |
+|   Returns	    __argc = Number of arguments. -1 = Error.		      |
+|		    __argv = Array of arguments				      |
+|		    _pgmptr = The program pathname			      |
+|									      |
+|   Notes	    When linked in, replaces the default routine from the CRT.|
+|		    							      |
+|   History								      |
+|    2001-09-25 JFL Created this routine				      |
+|    2016-12-31 JFL Changed the return type from void to int, else the WIN64  |
+|                   version fails with message:				      |
+|		    runtime error R6008 - not enough space for arguments      |
+|    2017-02-05 JFL Adapted for UTF-8 arguments initialization.		      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* Global CRT variables defined in stdlib.h */
+/* Do not include stdlib.h here, to avoid getting unwanted macros hiding these */
+_CRTIMP extern int __argc;
+_CRTIMP extern char **__argv;
+_CRTIMP extern char *_acmdln;
+_CRTIMP extern char *_pgmptr;
+
+int _initU(void); /* Forward reference */
+
+int _setargv(void) {
+  int err = _initU();
+  if (err) return err;
+  __argc = BreakArgLine(_acmdln, &__argv);
+  _pgmptr = __argv[0];
+  return __argc;
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function	    _initU						      |
+|									      |
+|   Description	    UTF-8 program initializations			      |
+|									      |
+|   Parameters	    None						      |
+|									      |
+|   Returns	    0=Success. -1 = Error.				      |
+|		    _acmdln = UTF-8 command line			      |
+|		    codePage = Console Code Page			      |
+|		    							      |
+|   Notes	    Forcibly linked in C programs that define _UTF8_SOURCE,   |
+|		    etc, which drags in _setargv() above with it.	      |
+|		    							      |
+|   History								      |
+|    2017-02-05 JFL Adapted from the abandonned _mainU0 routine.	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int _initU(void) {
+  LPWSTR lpwCommandLine;
+  int n;
+  WCHAR wc;
+
+  /* Get the Unicode command line */  
+  lpwCommandLine = GetCommandLineW();
+  /* Trim tail spaces */
+  n = lstrlenW(lpwCommandLine);
+  while (n && ((wc = lpwCommandLine[n-1]) != L'\0') && ((wc == L' ') || (wc == L'\t'))) lpwCommandLine[--n] = L'\0';
+  /* Allocate space for the UTF8 copy */
+  n += 1;	/* Count the final NUL */
+  _acmdln = malloc(4 * n); /* Worst case */
+  if (!_acmdln) return -1; /* Memory allocation failed */
+  /* Convert the Unicode command line to UTF-8 */
+  n = WideCharToMultiByte(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  lpwCommandLine,	/* lpWideCharStr, */
+			  n,			/* cchWideChar, */
+			  _acmdln,		/* lpMultiByteStr, */
+			  (4 * n),		/* cbMultiByte, */
+			  NULL,			/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+#undef fprintf /* Use the real fprintf, to avoid further conversion errors! */
+    fprintf(stderr, "Warning: Can't convert the argument line to UTF-8\n");
+    _acmdln[0] = '\0';
+  }
+  realloc(_acmdln, n+1); /* Resize the memory block to fit the UTF-8 line */
+  /* Should not fail since we make it smaller */
+
+  /* Record the console code page, to allow converting the output accordingly */
+  codePage = GetConsoleOutputCP();
+
+  return 0;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/mb2wpath.c b/deps/MsvcLibX/src/mb2wpath.c
new file mode 100644
index 0000000000000000000000000000000000000000..097d3e736717dd54b9e9558f18fca51707bef1d3
--- /dev/null
+++ b/deps/MsvcLibX/src/mb2wpath.c
@@ -0,0 +1,86 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    mb2wpath.c						      *
+*									      *
+*   Description:    WIN32 utility routine MultiByteToWidePath()		      *
+*                                                                             *
+*   Notes:	    Used to overcome the 260-byte limitation of many Windows  *
+*		    file management APIs.				      *
+*		    							      *
+*   History:								      *
+*    2014-07-01 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of printf routines */
+
+#include "msvclibx.h"
+#include "msvcDebugm.h"
+
+#if defined(_WIN32)
+
+#include <windows.h>
+#include <direct.h>  /* For _getdrive() */
+
+int MultiByteToWidePath(
+  UINT nCodePage,
+  LPCSTR pszName,
+  LPWSTR pwszName,
+  int nWideBufSize
+) {
+  int n;
+  int iNameLength = lstrlen(pszName);
+  DEBUG_CODE(
+    LPWSTR pwszName0 = pwszName;
+  );
+
+  if (iNameLength >= MAX_PATH) { /* Then processing this pathname requires prepending a special prefix */
+    /* See http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx */
+    if (!strncmp(pszName, "\\\\?\\", 4)) {		/* The name is in the Win32 file namespace */
+      /* Do nothing, the "\\?\" extended-length prefix is already there */
+    } else if (!strncmp(pszName, "\\\\.\\", 4)) {	/* The name is in the Win32 device namespace */
+      /* Do nothing, devices names should not be changed */
+    } else if (!strncmp(pszName, "\\\\", 2)) {		/* The name is a UNC path */
+      /* Then prepend it with "\\?\UNC\" to get 32K Unicode paths instead of 260-byte ANSI paths */
+      lstrcpyW(pwszName, L"\\\\?\\UNC\\");
+      pwszName += 8;
+      nWideBufSize -= 8;
+      pszName += 2; /* Skip the initial \\ in the UNC name */
+      iNameLength -= 2;
+    } else if (pszName[0] == '\\') {	/* The name is an absolute path with no drive */
+      /* Then prepend it with "\\?\" to get 32K Unicode paths instead of 260-byte ANSI paths */
+      lstrcpyW(pwszName, L"\\\\?\\");
+      /* And also add the drive, as it's required in the Win32 file namespace */
+      pwszName[4] = L'@' + (wchar_t)_getdrive(); /* _getdrive() returns 1 for drive A, 2 for B, etc */
+      pwszName[5] = L':';
+      pwszName += 6;
+      nWideBufSize -= 6;
+    } else if (pszName[0] && (pszName[1] == ':') && (pszName[2] == '\\')) {	/* The name is an absolute path */
+      /* Then prepend it with "\\?\" to get 32K Unicode paths instead of 260-byte ANSI paths */
+      lstrcpyW(pwszName, L"\\\\?\\");
+      pwszName += 4;
+      nWideBufSize -= 4;
+    } /* Else this is a relative pathname. Extended-length is not supported for them. */
+  }
+
+  n = MultiByteToWideChar(nCodePage,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  pszName,		/* lpMultiByteStr, */
+			  iNameLength+1,	/* cbMultiByte, */ /* +1 to include the final NUL */
+			  pwszName,		/* lpWideCharStr, */
+			  nWideBufSize		/* cchWideChar, */
+			  );
+  DEBUG_CODE(
+    if (pwszName != pwszName0) {
+      char szUtf8[UTF8_PATH_MAX];
+      DEBUG_WSTR2UTF8(pwszName0, szUtf8, sizeof(szUtf8));
+      DEBUG_PRINTF(("MultiByteToWidePath(); // Long name changed to \"%s\"\n", szUtf8));
+    }
+  );
+  return n;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/mkdir.c b/deps/MsvcLibX/src/mkdir.c
new file mode 100644
index 0000000000000000000000000000000000000000..24e98a52ba806374b584d79730e2449295bd4380
--- /dev/null
+++ b/deps/MsvcLibX/src/mkdir.c
@@ -0,0 +1,103 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    mkdir.c						      *
+*									      *
+*   Description:    WIN32 UTF-8 version of mkdir			      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-03-04 JFL Created this module.				      *
+*    2014-03-24 JFL Renamed "statx.h" as the standard <sys/stat.h>.	      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+/* Microsoft C libraries include files */
+#include <stdio.h>
+#include <direct.h>	/* For _mkdir() */
+#include <errno.h>
+/* MsvcLibX library extensions */
+#include <sys/msvcStat.h>
+#include "msvclibx.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        mkdir	                                              |
+|                                                                             |
+|   Description     UTF-8 version of mkdir				      |
+|                                                                             |
+|   Parameters      char *pszName	File name			      |
+|                   mode_t iMode	File permission bits		      |
+|                                                                             |
+|   Returns         0 = Success; -1 = Error and errno set.		      |
+|                                                                             |
+|   Notes                                                                     |
+|                                                                             |
+|   History								      |
+|    2014-03-04 JFL Created this routine.                      		      |
+|    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+#pragma warning(disable:4100) /* Ignore the "unreferenced formal parameter" warning */
+
+int mkdirU(const char *pszName, mode_t iMode) {
+  WCHAR wszName[PATH_MAX];
+  int n;
+  BOOL bDone;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszName,		/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  COUNTOF(wszName)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+
+  bDone = CreateDirectoryW(wszName, NULL);
+  if (!bDone) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return 0;
+}
+
+int mkdirA(const char *pszName, mode_t iMode) {
+  WCHAR wszName[PATH_MAX];
+  int n;
+  BOOL bDone;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_ACP,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszName,		/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  COUNTOF(wszName)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+
+  bDone = CreateDirectoryW(wszName, NULL);
+  if (!bDone) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return 0;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/mkdtemp.c b/deps/MsvcLibX/src/mkdtemp.c
new file mode 100644
index 0000000000000000000000000000000000000000..86bfbf25cfb2a825f1d2d90aeb8d54ba9506088d
--- /dev/null
+++ b/deps/MsvcLibX/src/mkdtemp.c
@@ -0,0 +1,50 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    mkdtemp.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's mkdtemp()	      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-13 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
+#include "msvcUnistd.h"
+
+char *mkdtemp(char *pszName) {
+  char *pszXXX, *pc;
+  int iErr = 0;
+  char *base32 = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+  int i;
+
+  /* Find the XXX placeholder at the end of the string */
+  for (pszXXX=pszName; pszXXX && *pszXXX; pszXXX++) ;
+  while ((pszXXX > pszName) && (*(pszXXX-1) == 'X')) pszXXX--;
+  if (!pszXXX || (*pszXXX != 'X')) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  /* Seed the random number generator */
+  srand((unsigned)getpid() + ((unsigned)time(NULL) << 10));
+
+  /* Try random file names until one file gets successfully created */
+  for (i=0; i<10; i++) {
+    for (pc = pszXXX; *pc; pc++) {
+      *pc = base32[rand() % 32];
+    }
+    iErr = _mkdir(pszName);
+    if (!iErr) break;
+  }
+
+  return iErr ? NULL : pszName;
+}
+
diff --git a/deps/MsvcLibX/src/mkstemp.c b/deps/MsvcLibX/src/mkstemp.c
new file mode 100644
index 0000000000000000000000000000000000000000..f587cff48d35a631dd2e963468f5e32cd32a8396
--- /dev/null
+++ b/deps/MsvcLibX/src/mkstemp.c
@@ -0,0 +1,53 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    mkstemp.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's mkstemp()	      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-03-03 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include "msvcUnistd.h"
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <time.h>
+#include <io.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+int mkstemp(char *pszName) {
+  char *pszXXX, *pc;
+  int hFile = -1;
+  char *base32 = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+
+  /* Find the XXX placeholder at the end of the string */
+  for (pszXXX=pszName; pszXXX && *pszXXX; pszXXX++) ;
+  while ((pszXXX > pszName) && (*(pszXXX-1) == 'X')) pszXXX--;
+  if (!pszXXX || (*pszXXX != 'X')) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  /* Seed the random number generator */
+  srand((unsigned)getpid() + ((unsigned)time(NULL) << 10));
+
+  /* Try random file names until one file gets successfully created */
+  while (hFile == -1) {
+    for (pc = pszXXX; *pc; pc++) {
+      *pc = base32[rand() % 32];
+    }
+    hFile = _open(pszName, O_CREAT|O_EXCL|O_RDWR, S_IREAD|S_IWRITE);
+  }
+
+  return hFile;
+}
+
diff --git a/deps/MsvcLibX/src/open.c b/deps/MsvcLibX/src/open.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd70409410f6db9b03f2496e12831364139bad3a
--- /dev/null
+++ b/deps/MsvcLibX/src/open.c
@@ -0,0 +1,84 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    open.c						      *
+*									      *
+*   Description:    WIN32 UTF-8 version of open				      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2017-02-16 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2017 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of printf routines */
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <errno.h>
+#include "msvclibx.h"
+#include "msvcFcntl.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        open	                                              |
+|                                                                             |
+|   Description     UTF-8 or ANSI file name open(), with long path support    |
+|                                                                             |
+|   Parameters      char *pszName	File name			      |
+|                   int iFlags		Opening mode			      |
+|                   int iPerm		Permission mode for file creation     |
+|                                                                             |
+|   Returns         File number						      |
+|                                                                             |
+|   Notes           Prefixes long names with "\\?\" to enable long path suppt.|
+|                                                                             |
+|   History								      |
+|    2017-02-16 JFL Created this routine.                      		      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+int openM(UINT cp, const char *pszName, int iFlags, int iPerm) {
+  WCHAR wszName[UNICODE_PATH_MAX];
+  int n;
+  int iFile;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszName,		/* lpMultiByteStr, */
+			  wszName,		/* lpWideCharStr, */
+			  COUNTOF(wszName)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+
+/*  return _wopen(wszName, iFlags, iPerm); */
+  DEBUG_PRINTF(("_wopen(\"%s\", 0x%X, 0x%X);\n", pszName, iFlags, iPerm));
+  iFile = _wopen(wszName, iFlags, iPerm);
+  DEBUG_PRINTF(("  return %d;\n", iFile));
+  return iFile;
+}
+
+#pragma warning(disable:4212) /* Ignore the "nonstandard extension used : function declaration used ellipsis" warning */
+
+int openA(const char *pszName, int iFlags, int iPerm) {
+  return openM(CP_ACP, pszName, iFlags, iPerm);
+}
+
+int openU(const char *pszName, int iFlags, int iPerm) {
+  return openM(CP_UTF8, pszName, iFlags, iPerm);
+}
+
+#pragma warning(default:4212) /* Restore the "nonstandard extension used : function declaration used ellipsis" warning */
+
+#endif /* defined(_WIN32) */
diff --git a/deps/MsvcLibX/src/readlink.c b/deps/MsvcLibX/src/readlink.c
new file mode 100644
index 0000000000000000000000000000000000000000..4abc91e8e22acef502236c530423b54683652913
--- /dev/null
+++ b/deps/MsvcLibX/src/readlink.c
@@ -0,0 +1,509 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    readlink.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's readlink()	      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-03 JFL Created this module.				      *
+*    2014-02-27 JFL Changed the output name encoding to UTF-8.		      *
+*    2014-03-02 JFL Split the functions into a WSTR and an UTF-8 version.     *
+*    2014-03-11 JFL Bug fix in junctions targets relativization.	      *
+*    2014-03-13 JFL Allow reading junctions targets in first level shares.    *
+*    2014-03-19 JFL Split routine ReadReparsePointW() from readlinkW().       *
+*    2014-03-20 JFL Restructured Windows readlink function into Wide and      *
+*		    MultiByte versions, and changed the Unicode and Ansi      *
+*		    versions to macros.					      *
+*    2014-07-03 JFL Added support for pathnames >= 260 characters. 	      *
+*    2016-09-09 JFL Fixed a crash in debug mode, due to stack overflows.      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+#include "msvcUnistd.h"
+#pragma comment(lib, "Mpr.lib")
+
+#include <errno.h>
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include "msvcReparsept.h"
+
+/* Get the Reparse Point Tag for a mount point - Wide char version */
+/* See http://msdn.microsoft.com/en-us/library/windows/desktop/aa365511(v=vs.85).aspx */
+DWORD GetReparseTagW(const WCHAR *pwszPath) {
+  HANDLE hFind;
+  WIN32_FIND_DATAW findFileData;
+  DWORD dwTag = 0;
+
+  hFind = FindFirstFileW(pwszPath, &findFileData);
+  if (hFind == INVALID_HANDLE_VALUE ) return 0;
+  CloseHandle(hFind);
+  if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+    dwTag = findFileData.dwReserved0;
+  }
+  return dwTag;
+}
+
+/* Get the Reparse Point Tag for a mount point - MultiByte char version */
+DWORD GetReparseTagM(const char *path, UINT cp) {
+  WCHAR wszPath[PATH_MAX];
+  int n;
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("GetReparseTagM(\"%s\", %d); // Conversion to Unicode failed. errno=%d - %s\n", path, cp, errno, strerror(errno)));
+    return 0;
+  }
+  return GetReparseTagW(wszPath);
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    readlink						      |
+|									      |
+|   Description:    WIN32 port of standard C library's readlink()	      |
+|									      |
+|   Parameters:     const TCHAR *path		The link name		      |
+|		    TCHAR *buf			Buffer for the link target    |
+|		    size_t bufsize		Number of TCHAR in buf        |
+|		    							      |
+|   Returns:	    >0 = Link target size in TCHARS, Success, -1 = Failure    |
+|									      |
+|   Notes:	    Supports NTFS link types: symlink, symlinkd, junction.    |
+|		    							      |
+|		    Converts junction targets to relative links if possible.  |
+|		    							      |
+|		    On network drives, junctions that cannot be resolved on   |
+|		    the client side are returned unchanged: readlink()        |
+|		    returns the link name as its own target. This allows      |
+|		    resolving pathnames with such junctions successfully,     |
+|		    and still accessing files behind these junctions.	      |
+|		    Note that this is incompatible with Unix, which fails     |
+|		    with errno = ELOOP if a link points to itself.	      |
+|		    Windows-aware applications supporting this can detect     |
+|		    this case by comparing linkName and targetName when       |
+|		    readlink() succeeds.				      |
+|		    Function ResolveLinks() in resolvelinks.c relies on this. |
+|		    							      |
+|		    Using XDEBUG macros to debug readlink() itself,	      |
+|		    and DEBUG macros to display information useful for	      |
+|		    debugging applications using readlink().		      |
+|		    							      |
+|   History:								      |
+|    2014-02-04 JFL Created this routine                                      |
+|    2014-02-18 JFL Fix junctions targets on network drives.                  |
+|		    Convert junction targets to relative paths, if they're    |
+|		    on the same drive as the junction itself.		      |
+|    2014-03-11 JFL Bug fix in junctions targets relativization: Use a case-  |
+|		    insensitive path comparison.			      |
+|    2014-03-13 JFL Allow reading junctions targets in \\server\Public shares.|
+|    2014-03-19 JFL Split routine ReadReparsePointW() from readlinkW().       |
+|		    Fail in case a junction target is on another server drive.|
+|		    							      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+#pragma warning(disable:4706) /* Ignore the "assignment within conditional expression" warning */
+
+/* Get the reparse point target, and return the tag. 0=failure */
+DWORD ReadReparsePointW(const WCHAR *path, WCHAR *buf, size_t bufsize) {
+  DWORD dwAttr;
+  HANDLE hLink;
+  BOOL done;
+  DWORD dwRead;
+  char iobuf[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
+  DWORD dwFlagsAndAttributes;
+  DWORD dwTag;
+  WCHAR *pwStr;
+  PREPARSE_READ_BUFFER pIoctlBuf;
+  PMOUNTPOINT_READ_BUFFER pMountpointBuf;
+  PSYMLINK_READ_BUFFER pSymlinkBuf;
+  unsigned short offset, len = 0;
+  DEBUG_CODE(
+  char *pszUtf8;
+  )
+
+  DEBUG_WSTR2NEWUTF8(path, pszUtf8);
+  DEBUG_ENTER(("ReadReparsePointW(\"%s\", 0x%p, %d);\n", pszUtf8, buf, bufsize));
+  DEBUG_FREEUTF8(pszUtf8);
+
+  dwAttr = GetFileAttributesW(path);
+  XDEBUG_PRINTF(("GetFileAttributes() = 0x%lX\n", dwAttr));
+  if (dwAttr == INVALID_FILE_ATTRIBUTES) {
+    errno = ENOENT;
+    RETURN_INT_COMMENT(0, ("File does not exist\n"));
+  }
+
+  if (!(dwAttr & FILE_ATTRIBUTE_REPARSE_POINT)) {
+    errno = EINVAL;
+    RETURN_INT_COMMENT(0, ("File is not a link\n"));
+  }
+
+  dwFlagsAndAttributes = FILE_FLAG_OPEN_REPARSE_POINT;
+  if (dwAttr & FILE_ATTRIBUTE_DIRECTORY) dwFlagsAndAttributes |= FILE_FLAG_BACKUP_SEMANTICS;
+  hLink = CreateFileW(path,					/* lpFileName, */
+		      0,					/* dwDesiredAccess, */
+		      FILE_SHARE_READ | FILE_SHARE_WRITE,	/* dwShareMode, */
+		      NULL,					/* lpSecurityAttributes, */
+		      OPEN_EXISTING,                    	/* dwCreationDisposition, */
+		      dwFlagsAndAttributes,             	/* dwFlagsAndAttributes, */
+		      NULL                              	/* hTemplateFile */
+		     );
+  XDEBUG_PRINTF(("CreateFile() = 0x%lX\n", hLink));
+  if (hLink == INVALID_HANDLE_VALUE) {
+    errno = EPERM;
+    RETURN_INT_COMMENT(0, ("Cannot open the link\n"));
+  }
+
+  done = DeviceIoControl(hLink,				/* hDevice, */
+    			 FSCTL_GET_REPARSE_POINT,       /* dwIoControlCode, */
+    			 NULL,				/* lpInBuffer, */
+    			 0,				/* nInBufferSize, */
+    			 iobuf,				/* lpOutBuffer, */
+    			 sizeof(iobuf),			/* nOutBufferSize, */
+    			 &dwRead,			/* lpBytesReturned, */
+    			 NULL				/* lpOverlapped */
+    			);
+  CloseHandle(hLink);
+
+  if (!done) {
+    errno = EPERM;
+    RETURN_INT_COMMENT(0, ("DeviceIoControl() failed\n"));
+  }
+
+  XDEBUG_PRINTF(("DeviceIoControl() returned %d bytes\n", dwRead));
+
+  /* Make sur the header tag & length fields are valid */
+  if (dwRead < 8) {
+    errno = EBADF;
+    RETURN_INT_COMMENT(0, ("Invalid reparse data buffer\n"));
+  }
+  pIoctlBuf = (PREPARSE_READ_BUFFER)iobuf;
+  dwTag = pIoctlBuf->ReparseTag;
+  DEBUG_CODE_IF_ON(
+    char *pType = "";
+    switch (dwTag) {
+    case IO_REPARSE_TAG_RESERVED_ZERO:	pType = "Reserved"; break;	
+    case IO_REPARSE_TAG_RESERVED_ONE:		pType = "Reserved"; break;
+    case IO_REPARSE_TAG_MOUNT_POINT:		pType = "Mount point or junction"; break;
+    case IO_REPARSE_TAG_HSM:			pType = "Hierarchical Storage Manager"; break;
+    case IO_REPARSE_TAG_DRIVER_EXTENDER:	pType = "Home server drive extender"; break;
+    case IO_REPARSE_TAG_HSM2:			pType = "Hierarchical Storage Manager Product #2"; break;
+    case IO_REPARSE_TAG_SIS:			pType = "Single-instance storage filter driver"; break;
+    case IO_REPARSE_TAG_WIM:			pType = "Windows boot Image File"; break;
+    case IO_REPARSE_TAG_CSV:			pType = "Cluster Shared Volume"; break;
+    case IO_REPARSE_TAG_DFS:			pType = "Distributed File System"; break;
+    case IO_REPARSE_TAG_FILTER_MANAGER:	pType = "Filter manager test harness"; break;
+    case IO_REPARSE_TAG_SYMLINK:		pType = "Symbolic link"; break;
+    case IO_REPARSE_TAG_DFSR:			pType = "Distributed File System R filter"; break;
+    case IO_REPARSE_TAG_DEDUP:		pType = "Deduplicated volume"; break;
+    case IO_REPARSE_TAG_NFS:			pType = "NFS share"; break;
+    default:					pType = "Unknown type! Please report its value and update readlink.c."; break;
+    }
+    DEBUG_PRINT_INDENT();
+    printf("ReparseTag = 0x%04X; // %s\n", (unsigned)(dwTag), pType);
+  )
+  XDEBUG_PRINTF(("ReparseDataLength = 0x%04X\n", (unsigned)(pIoctlBuf->ReparseDataLength)));
+
+  /* Process the supported tag types */
+  switch (dwTag) {
+    case IO_REPARSE_TAG_SYMLINK:
+      pSymlinkBuf = (PSYMLINK_READ_BUFFER)iobuf;
+      XDEBUG_PRINTF(("SubstituteNameOffset = 0x%04X\n", (unsigned)(pSymlinkBuf->SubstituteNameOffset)));
+      XDEBUG_PRINTF(("SubstituteNameLength = 0x%04X\n", (unsigned)(pSymlinkBuf->SubstituteNameLength)));
+      XDEBUG_PRINTF(("PrintNameOffset = 0x%04X\n", (unsigned)(pSymlinkBuf->PrintNameOffset)));
+      XDEBUG_PRINTF(("PrintNameLength = 0x%04X\n", (unsigned)(pSymlinkBuf->PrintNameLength)));
+      XDEBUG_PRINTF(("Flags = 0x%04X\n", (unsigned)(pSymlinkBuf->Flags)));
+
+      pwStr = pSymlinkBuf->PathBuffer;
+      offset = pSymlinkBuf->SubstituteNameOffset / 2; /* Convert byte offset to wide characters offset */
+      len = pSymlinkBuf->SubstituteNameLength / 2; /* Convert bytes to wide characters count */
+      break;
+
+    case IO_REPARSE_TAG_MOUNT_POINT: /* aka. junctions */
+      pMountpointBuf = (PMOUNTPOINT_READ_BUFFER)iobuf;
+      XDEBUG_PRINTF(("SubstituteNameOffset = 0x%04X\n", (unsigned)(pMountpointBuf->SubstituteNameOffset)));
+      XDEBUG_PRINTF(("SubstituteNameLength = 0x%04X\n", (unsigned)(pMountpointBuf->SubstituteNameLength)));
+      XDEBUG_PRINTF(("PrintNameOffset = 0x%04X\n", (unsigned)(pMountpointBuf->PrintNameOffset)));
+      XDEBUG_PRINTF(("PrintNameLength = 0x%04X\n", (unsigned)(pMountpointBuf->PrintNameLength)));
+
+      pwStr = pMountpointBuf->PathBuffer;
+      offset = pMountpointBuf->SubstituteNameOffset / 2; /* Convert byte offset to wide characters offset */
+      len = pMountpointBuf->SubstituteNameLength / 2; /* Convert bytes to wide characters count */
+      break;
+
+    default:
+      errno = EINVAL;
+      RETURN_INT_COMMENT(0, ("Unsupported reparse point type\n"));
+  }
+  if (len) {
+    if (len >= bufsize) {
+      errno = ENAMETOOLONG;
+      RETURN_INT_COMMENT(0, ("The output buffer is too small. The link size is %d bytes.\n", len));
+    }
+    CopyMemory(buf, pwStr+offset, len*sizeof(WCHAR));
+  }
+  buf[len] = L'\0';
+
+  DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+  DEBUG_LEAVE(("return 0x%X; // \"%s\"\n", dwTag, pszUtf8));
+  DEBUG_FREEUTF8(pszUtf8);
+  return dwTag;
+}
+
+/* Posix routine readlink - Wide char version */
+ssize_t readlinkW(const WCHAR *path, WCHAR *buf, size_t bufsize) {
+  ssize_t nRead;
+  UINT drvType;
+  DWORD dwTag;
+  DEBUG_CODE(
+  char *pszUtf8;
+  )
+
+  DEBUG_WSTR2NEWUTF8(path, pszUtf8);
+  DEBUG_ENTER(("readlink(\"%s\", 0x%p, %d);\n", pszUtf8, buf, bufsize));
+  DEBUG_FREEUTF8(pszUtf8);
+
+  dwTag = ReadReparsePointW(path, buf, bufsize);
+  if (!dwTag) {
+    RETURN_INT_COMMENT(-1, ("ReadReparsePointW() failed.\n"));
+  }
+
+  /* Special case for junctions to other local directories: Remove their '\??\' header.
+  // Note: Also seen once on a symlink. I don't know why in most cases symlinks don't have it.
+  // Note: These junctions begin with '\??\C:\' (or another drive letter).
+  // Other types of junctions/mount points do not continue with a drive letter.
+  // For example: '\??\Volume{5e58015c-ba64-4048-928d-06aa03c983f9}\' */
+  nRead = lstrlenW(buf);
+#define strncmpW(s1, s2, l) (CompareStringW(LOCALE_INVARIANT, 0, s1, l, s2, l)-2)
+  if ((nRead >= 7) && (!strncmpW(buf, L"\\??\\", 4))) {
+    if (!strncmpW(buf+5, L":\\", 2)) {
+      nRead -= 4;
+      CopyMemory(buf, buf+4, (nRead+1)*sizeof(WCHAR));
+      DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+      XDEBUG_PRINTF(("buf = \"%s\"; // Removed '\\\\?\\': \n", pszUtf8));
+      DEBUG_FREEUTF8(pszUtf8);
+    } else { /* Return an error for other types, as Posix SW cannot handle them successfully. */
+      errno = EINVAL;
+      DEBUG_WSTR2NEWUTF8(buf+4, pszUtf8);
+      DEBUG_LEAVE(("return -1; // Unsupported mount point type: %s\n", pszUtf8));
+      DEBUG_FREEUTF8(pszUtf8);
+      return -1;
+    }
+  }
+
+  /* Fix junctions targets */
+  /* Windows resolves junctions on the server side,
+     but symlinks and symlinkds on the client side. */
+  if (dwTag == IO_REPARSE_TAG_MOUNT_POINT) {
+    char szRootDir[4] = "C:\\";
+    WCHAR wszAbsPath[PATH_MAX];
+    WCHAR wszAbsPath2[PATH_MAX];
+    WCHAR *p1;
+    WCHAR *p2;
+    WCHAR *pc1 = L"A";
+    WCHAR *pc2 = L"a";
+
+    DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+    XDEBUG_PRINTF(("rawJunctionTarget = \"%s\"\n", pszUtf8));
+    DEBUG_FREEUTF8(pszUtf8);
+
+    GetFullPathNameW(path, PATH_MAX, wszAbsPath, NULL); /* Get the drive letter in the full path */
+    szRootDir[0] = (char)(wszAbsPath[0]); /* Copy the drive letter */
+    drvType = GetDriveType(szRootDir);
+    XDEBUG_PRINTF(("GetDriveType(\"%s\") = %d // %s drive\n", szRootDir, drvType, (drvType == DRIVE_REMOTE) ? "Network" : "Local"));
+
+    /* 1) On network drives, the target should reference the network drive itself,
+          not a local drive on the remote machine */
+    if (drvType == DRIVE_REMOTE) {
+      /* Then check if the junction target is relative to the same network drive. (Not always true!) */
+      int iTargetFound = FALSE;
+      if (buf[0] && (buf[1] == L':')) {
+	WCHAR  wszLocalName[] = L"X:";
+	WCHAR wszRemoteName[PATH_MAX];
+	DWORD dwErr;
+	DWORD dwLength = PATH_MAX;
+	wszLocalName[0] = wszAbsPath[0];
+	dwErr = WNetGetConnectionW(wszLocalName, wszRemoteName, &dwLength);
+	if (dwErr == NO_ERROR) {
+	  WCHAR *pwsz;
+	  DEBUG_WSTR2NEWUTF8(wszRemoteName, pszUtf8);
+	  XDEBUG_PRINTF(("net use %c: %s\n", (char)(wszLocalName[0]), pszUtf8));
+	  DEBUG_FREEUTF8(pszUtf8);
+	  if ((wszRemoteName[0] == L'\\') && (wszRemoteName[1] == L'\\')) {
+	    pwsz = wcschr(wszRemoteName+2, L'\\');
+	    if (pwsz) {
+	      if ((pwsz[2] == L'$') && !pwsz[3]) { /* This is the root of a shared drive. Ex: \\server\D$ -> D: */
+		char c1, c2;
+		XDEBUG_PRINTF(("// Checking if it's the root of an X$ shared drive\n"));
+		c1 = (char)toupper((char)pwsz[1]);	/* The server-side drive letter of the network share */
+		c2 = (char)toupper((char)buf[0]);	/* The server-side drive letter of the junction target */
+		if (c1 == c2) { /* OK, the target is in the same share drive */
+		  buf[0] = wszLocalName[0];	/* Make the target accessible locally */
+		  iTargetFound = TRUE;
+		  XDEBUG_PRINTF(("// Confirmed it's the root of the shared drive\n"));
+		} /* Else the target is not accessible locally via its target name */
+	      } else { /* Heuristic: Assume the share name is an alias to the root on the network drive. Ex: \\server\DROOT -> D:\ */
+		DWORD dwAttr;
+		XDEBUG_PRINTF(("// Checking if it's an alias of the root of the shared drive\n"));
+		buf[0] = wszAbsPath[0];
+		dwAttr = GetFileAttributesW(buf);
+		DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+		XDEBUG_PRINTF(("GetFileAttributes(\"%s\") = 0x%lX\n", pszUtf8, dwAttr));
+		DEBUG_FREEUTF8(pszUtf8);
+		if (dwAttr != INVALID_FILE_ATTRIBUTES) {
+		  iTargetFound = TRUE;
+		  XDEBUG_PRINTF(("// Confirmed it's an alias of the root of the shared drive\n"));
+		} else { /* Heuristic: Assume the share name is a subdirectory name on the network drive. Ex: \\server\Public -> C:\Public */
+		  WCHAR *pwsz2;
+		  XDEBUG_PRINTF(("// Checking if it's first level shared directory\n"));
+		  pwsz2 = wcschr(buf+3, L'\\');
+		  if (pwsz2) {
+		    CopyMemory(buf+2, pwsz2, (lstrlenW(pwsz2)+1)*sizeof(WCHAR));
+		    dwAttr = GetFileAttributesW(buf);
+		    DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+		    XDEBUG_PRINTF(("GetFileAttributes(\"%s\") = 0x%lX\n", pszUtf8, dwAttr));
+		    DEBUG_FREEUTF8(pszUtf8);
+		    if (dwAttr != INVALID_FILE_ATTRIBUTES) {
+		      iTargetFound = TRUE;
+		      XDEBUG_PRINTF(("// Confirmed it's a first level shared directory\n"));
+		    }
+		  }
+		}
+	      }
+	      /* To do:
+		 The above code works for network drives shared at the root level and one level below.
+		 Ex: N: is \\server\C$
+		     junction target C:\Public\Temp\target.txt on N:
+		     Resolves to     N:\Public\Temp\target.txt
+		 Ex: If N: is \\server\Public, which is shared directory C:\Public,
+		     junction target C:\Public\Temp\target.txt on N:
+		     Should resolve to N:\Temp\target.txt
+		 Actually this could be extended by checking every possible parent path,
+		 to support cases where the junction is on a shared level2 or below subdirectory.
+		 Note that the share name is not always the same as the subdirectory
+		 name, nor is it even in the server's root. 
+	      */
+	    }
+	  }
+	}
+      }
+      if (!iTargetFound) {
+#if 0	/* Initial implementation, which would have cause problems */
+	lstrcpynW(buf, path, (int)bufsize); /* Report the target as identical to the source, to allow resolving it on the server side */
+	buf[bufsize-1] = L'\0';
+	nRead = lstrlenW(path);
+	RETURN_INT_COMMENT((int)nRead, ("Cannot get to the real target, which is on another server drive.\n"));
+#else
+	errno = EINVAL;
+	RETURN_INT_COMMENT(-1, ("Inaccessible junction target, on another server drive.\n"));
+#endif
+      }
+    }
+
+    /* 2) Convert absolute junction targets to relative links, if possible.
+          This is useful because junctions are often used as substitutes
+          for symlinkds. But Windows always records absolute target paths,
+          even when relative paths were used for creating them. */
+    GetFullPathNameW(buf, PATH_MAX, wszAbsPath2, NULL);
+    DEBUG_WSTR2NEWUTF8(wszAbsPath, pszUtf8);
+    XDEBUG_PRINTF(("szAbsPath = \"%s\"\n", pszUtf8));
+    DEBUG_FREEUTF8(pszUtf8);
+    DEBUG_WSTR2NEWUTF8(wszAbsPath2, pszUtf8);
+    XDEBUG_PRINTF(("szAbsPath2 = \"%s\"\n", pszUtf8));
+    DEBUG_FREEUTF8(pszUtf8);
+    /* Find the first (case insensitive) difference */
+    for (p1=wszAbsPath, p2=wszAbsPath2; (*pc1 = *p1) && (*pc2 = *p2); p1++, p2++) {
+      CharLowerW(pc1);
+      CharLowerW(pc2);
+      if (*pc1 != *pc2) break;
+    }
+    if (p1 != wszAbsPath) { /* Both are on the same drive. Can be made relative. */
+      WCHAR *pc;
+      /* Backtrack to the last \ */
+      for ( ; *(p1-1) != L'\\'; p1--, p2--) ;
+      DEBUG_WSTR2NEWUTF8(p1, pszUtf8);
+      XDEBUG_PRINTF(("szRelPath1 = \"%s\"\n", pszUtf8));
+      DEBUG_FREEUTF8(pszUtf8);
+      DEBUG_WSTR2NEWUTF8(p2, pszUtf8);
+      XDEBUG_PRINTF(("szRelPath2 = \"%s\"\n", pszUtf8));
+      DEBUG_FREEUTF8(pszUtf8);
+      buf[0] = '\0';
+      /* Count the # of parent directories that remain in path 1 */
+      for (pc=p1; *pc; pc++) if (*pc == L'\\') lstrcatW(buf, L"..\\");
+      /* Append what remains in path 2 */
+      lstrcatW(buf, p2);
+      /* That's the relative link */
+      nRead = lstrlenW(buf);
+    } /* Else the drives differ. Paths cannot be relative. Don't change buf. */
+  }
+
+  DEBUG_WSTR2NEWUTF8(buf, pszUtf8);
+  DEBUG_LEAVE(("return %d; // \"%s\"\n", (int)nRead, pszUtf8));
+  DEBUG_FREEUTF8(pszUtf8);
+  return (int)nRead;
+}
+
+#pragma warning(default:4706)
+
+/* Posix routine readlink - MultiByte char version */
+ssize_t readlinkM(const char *path, char *buf, size_t bufsize, UINT cp) {
+  WCHAR wszPath[PATH_MAX];
+  WCHAR wszTarget[PATH_MAX];
+  int n;
+  ssize_t nResult;
+  char *pszDefaultChar;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("readlinkM(\"%s\", ...); // Conversion to Unicode failed. errno=%d - %s\n", path, errno, strerror(errno)));
+    return -1;
+  }
+
+  nResult = readlinkW(wszPath, wszTarget, PATH_MAX);
+  if (nResult <= 0) return nResult;
+
+  pszDefaultChar = (cp == CP_UTF8) ? NULL : "?";
+  n = WideCharToMultiByte(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			  0,			/* dwFlags, */
+			  wszTarget,		/* lpWideCharStr, */
+			  (int)nResult + 1,	/* cchWideChar, */
+			  buf,			/* lpMultiByteStr, */
+			  (int)bufsize,		/* cbMultiByte, */
+			  pszDefaultChar,	/* lpDefaultChar, */
+			  NULL			/* lpUsedDefaultChar */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_PRINTF(("readlinkM(\"%s\", ...); // Conversion back from Unicode failed. errno=%d - %s\n", path, errno, strerror(errno)));
+    return -1;
+  }
+
+  return n;
+}
+
+#endif
+
+
diff --git a/deps/MsvcLibX/src/realpath.c b/deps/MsvcLibX/src/realpath.c
new file mode 100644
index 0000000000000000000000000000000000000000..5fbcf773a24d0950ac8099cd9274fcbb3157a954
--- /dev/null
+++ b/deps/MsvcLibX/src/realpath.c
@@ -0,0 +1,600 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    realpath.c						      *
+*									      *
+*   Description     Resolve links and remove . and .. parts in pathnames      *
+*                                                                             *
+*   Notes	    TO DO: Make Wide & MultiByte versions for Windows	      *
+*                                                                             *
+*                   TO DO: Microsoft provides a convenient routine, for which *
+*                   we could provide a MultiByte version: (in MSVC's stdlib.h)*
+*    char *_fullpath(char *absPath, const char *relPath, size_t maxLength);   *
+*                                                                             *
+*   History								      *
+*    2014-02-10 JFL Created this module with routine ResolveLinks() for Win32.*
+*    2014-02-19 JFL Added OS-independant CompactPath() subroutine. 	      *
+*    2014-02-20 JFL Implemented realpath() for both DOS and Windows.	      *
+*    2014-03-06 JFL Check for buffer overflows, and return ENAMETOOLONG.      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*    2016-08-25 JFL Added routine ResolveLinksA().			      *
+*    2016-09-12 JFL Moved GetFileAttributesU() to its own module.	      *
+*                   Bug fix: Add the drive letter if it's not specified.      *
+*                   Bug fix: Detect and report output buffer overflows.       *
+*                   Convert short WIN32 paths to long paths.                  *
+*    2016-09-13 JFL Resize output buffers, to avoid wasting lots of memory.   *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <direct.h>	/* For _getdcwd() */
+#include <ctype.h>	/* For toupper() */
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+#include "msvcUnistd.h"
+#include "msvcWindows.h"
+
+#define TRUE 1
+#define FALSE 0
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function	    CompactPath						      |
+|									      |
+|   Description	    Remove all ., .., and extra / or \ separators in a path   |
+|									      |
+|   Parameters	    const char *path	    Pathname to cleanup 	      |
+|		    char *buf		    Output buffer    		      |
+|		    size_t bufsize	    Size of the output buffer         |
+|									      |
+|   Notes	    Allows having path = outbuf, ie. in-place compacting.     |
+|		    Supports both relative and absolute paths.		      |
+|									      |
+|   Returns	    0 = success, or -1 = error, with errno set		      |
+|									      |
+|   History								      |
+|    2014-02-19 JFL Created this routine                                      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+int CompactPath(const char *path, char *outbuf, size_t bufsize) {
+  const char *pcIn;
+  char *pcOut;
+  int i, j, inSize, outSize;
+  char c = '\0';
+  char lastc = '\0';
+#define MAX_SUBDIRS (PATH_MAX / 2) /* Worst case is: \1\1\1\1\1\1... */
+  const char *pParts[MAX_SUBDIRS];
+  int lParts[MAX_SUBDIRS];
+  int lPart = 0;
+  int nParts = 0;
+  int isAbsolute = FALSE;
+  int nDotDotParts = 0;
+
+  pcIn = path;
+  inSize = (int)strlen(path) + 1;
+  pcOut = outbuf;
+  outSize = (int)bufsize;
+
+  if (*pcIn && (pcIn[1] == ':')) { /* There's a drive letter */
+    *(pcOut++) = *(pcIn++);		/* Copy it */
+    *(pcOut++) = *(pcIn++);
+    inSize -= 2;
+    outSize -= 2;
+  }
+
+  /* Scan the input pathname, recording pointers to every part of the pathname */
+  for (i=0; i<inSize; i++) {
+    c = pcIn[i];
+    if (c == '/') c = '\\';
+    if ((c == '\\') && (lastc == '\\')) continue; /* Condense multiple \ into one */
+    if ((c == '\\') && (lastc == '\0')) { /* This is an absolute pathname */
+      isAbsolute = TRUE;
+      lastc = c;
+      continue;
+    }
+    if ((c != '\\') && ((lastc == '\\') || (lastc == '\0'))) { /* Beginning of a new node */
+      if (nParts == MAX_SUBDIRS) {
+	errno = ENAMETOOLONG;
+	return -1;
+      }
+      pParts[nParts] = pcIn + i;
+      lPart = 0;
+    }
+    if (c && (c != '\\')) {
+      lPart += 1;
+    } else { /* End of a node */
+      lParts[nParts++] = lPart;
+      XDEBUG_PRINTF(("pParts[%d] = \"%.*s\"\n", nParts-1, lPart, pParts[nParts-1]));
+    }
+    lastc = c;
+    if (c == '\0') break;
+  }
+
+  /* Eliminate . and .. parts */
+  for (i=0; i<nParts; i++) {
+    XDEBUG_PRINTF(("for pParts[%d] = \"%.*s\"\n", i, lParts[i], pParts[i]));
+    if ((pParts[i][0] == '.') && (lParts[i] == 1)) { /* It's a . part */
+its_a_dot_part:
+      XDEBUG_PRINTF(("It's a '.'. Removing part #%d\n", i));
+      nParts -= 1;
+      for (j=i; j<nParts; j++) {
+      	pParts[j] = pParts[j+1];
+      	lParts[j] = lParts[j+1];
+      }
+      i -= 1;
+      continue;
+    }
+    if ((pParts[i][0] == '.') && (pParts[i][1] == '.') && (lParts[i] == 2)) { /* It's a .. part */
+      if (i == nDotDotParts) {
+	XDEBUG_PRINTF(("It's a '..', but it's at the root.\n"));
+      	if (isAbsolute) goto its_a_dot_part; /* .. in root is like . */
+      	nDotDotParts += 1; /* Else for relative paths, keep this .. */
+      	continue;
+      }
+      XDEBUG_PRINTF(("It's a '..'. Removing parts #%d and #%d\n", i-1, i));
+      nParts -= 2;
+      for (j=i-1; j<nParts; j++) {
+      	pParts[j] = pParts[j+2];
+      	lParts[j] = lParts[j+2];
+      }
+      i -= 2;
+      continue;
+    }
+  }
+
+  /* Join all remaining parts into a single path */
+  if (!outSize) {
+not_compact_enough:
+    errno = ENAMETOOLONG;
+    return -1;
+  }
+  outSize -= 1;	/* Leave room for the final NUL */
+  if (isAbsolute) {
+    if (!outSize) goto not_compact_enough;
+    *(pcOut++) = '\\';
+    outSize -= 1;
+  }
+  if (nParts) {
+    /* Copy part 0 if it's not already at the right place */
+    if (lParts[0] > outSize) goto not_compact_enough;
+    if (pcOut != pParts[0]) strncpy(pcOut, pParts[0], lParts[0]);
+    pcOut += lParts[0];
+    outSize -= lParts[0];
+  } else {
+    if (pcOut == outbuf) {
+      if (!outSize) goto not_compact_enough;
+      *(pcOut++) = '.'; /* Special case for "subdir\..", which is "." and not "" */
+      outSize -= 1;
+    }
+  }
+  for (i=1; i<nParts; i++) {
+    if (!outSize) goto not_compact_enough;
+    *(pcOut++) = '\\';
+    outSize -= 1;
+    if (lParts[i] > outSize) goto not_compact_enough;
+    if (pcOut != pParts[i]) strncpy(pcOut, pParts[i], lParts[i]);
+    pcOut += lParts[i];
+    outSize -= lParts[i];
+  }
+  *pcOut = '\0';
+
+  return (int)(pcOut - outbuf);
+}
+
+
+#ifdef _MSDOS
+
+/* Standard C library routine realpath() */
+/* Normally defined in stdlib.h. Output buf must contain PATH_MAX bytes */
+char *realpath(const char *path, char *outbuf) {
+  char *pOutbuf = outbuf;
+  int iErr;
+  const char *pc;
+
+  if (!pOutbuf) pOutbuf = malloc(PATH_MAX);
+  if (!pOutbuf) {
+    errno = ENOMEM;
+    return NULL;
+  }
+
+  /* Convert relative paths to absolute paths */
+  pc = path;
+  if (pc[0] && (pc[1] == ':')) pc += 2; /* Skip the drive letter, if any */
+  if ((*pc != '/') && (*pc != '\\')) { /* This is a relative path */
+    int iDrive = 0;
+    if (pc != path) { /* A drive was specified */
+      iDrive = _toupper(path[0]) - '@'; /* A=1, B=2, ... */
+    }
+    _getdcwd(iDrive, pOutbuf, PATH_MAX);
+    if ((strlen(pOutbuf) + strlen(pc) + 2) > PATH_MAX) {
+realpath_failed:
+      errno = ENAMETOOLONG;
+      if (!outbuf) free(pOutbuf);
+      return NULL;
+    }
+    strcat(pOutbuf, "\\");
+    strcat(pOutbuf, pc);
+    path = pOutbuf;
+  } else if (pc == path) { /* This is an absolute path without a drive letter */
+    pOutbuf[0] = (char)(_getdrive() + 0x40);
+    pOutbuf[1] = ':';
+    if ((strlen(path) + 3) > PATH_MAX) goto realpath_failed;
+    strcpy(pOutbuf+2, path);
+    path = pOutbuf;
+  }
+
+  /* TO DO: Resolve substituted drives */  
+
+  /* TO DO: Convert short paths to long paths, and correct the name case */  
+
+  /* Remove useless parts in the absolute path */
+  iErr = CompactPath(path, pOutbuf, PATH_MAX);
+  if (iErr == -1) { /* CompactPath() sets errno */
+    if (!outbuf) free(pOutbuf);
+    return NULL;
+  }
+
+  if (!outbuf) pOutbuf = realloc(pOutbuf, strlen(pOutbuf) + 1);
+  return pOutbuf;
+}
+
+#endif
+
+
+#ifdef _WIN32
+
+#include <windows.h>	/* Also includes MsvcLibX' WIN32 UTF-8 extensions */
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function	    ResolveLinks					      |
+|									      |
+|   Description	    Resolve all link names within a pathname		      |
+|									      |
+|   Parameters	    const char *path	    Pathname to resolve 	      |
+|		    char *buf		    Output buffer    		      |
+|		    size_t bufsize	    Size of the output buffer         |
+|									      |
+|   Notes	    Description of the official path resolution process:      |
+|		    http://man7.org/linux/man-pages/man7/path_resolution.7.html
+|									      |
+|		    This function always returns a valid string in the output |
+|		    buffer, even when it fails. This allows displaying a clue |
+|		    about at which stage of the resolution things went wrong. |
+|									      |
+|   Returns	    0 = success, or -1 = error, with errno set		      |
+|									      |
+|   History								      |
+|    2014-02-07 JFL Created this routine                                      |
+|    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* Linked list of previous pathnames */
+typedef struct _NAMELIST {
+  struct _NAMELIST *prev;
+  char *path;
+} NAMELIST;
+
+/* Get the canonic name of a file, after resolving all links in its pathname */
+int ResolveLinksU1(const char *path, char *buf, size_t bufsize, NAMELIST *prev, int iDepth) {
+  char target[UTF8_PATH_MAX];
+  int i;
+  int iErr = 0;
+  DWORD dwAttr;
+  char c = '\0';
+  int iPath = 0;
+  int bFirst = 1;
+  ssize_t nRead;
+  int iBuf = 0;
+  NAMELIST list;
+  NAMELIST *pList;
+
+  DEBUG_ENTER(("ResolveLinks1(\"%s\", 0x%p, %ld, 0x%p, %d);\n", path, buf, bufsize, prev, iDepth));
+
+  while (path[iPath]) {
+    /* int iPath0 = iPath; */
+    /* int iBuf0 = iBuf; */
+    int iBuf1;
+    /* Append the first name section to the output buffer */
+    if (bFirst) {
+      bFirst = 0;
+      /* Special case of absolute pathnames */
+      if (path[0] == '\\') {
+	if ((iBuf+1U) >= bufsize) {
+resolves_too_long:
+	  errno = ENAMETOOLONG;
+	  RETURN_INT_COMMENT(-1, ("Name too long\n"));
+	}
+	c = buf[iBuf++] = path[iPath++]; /* Copy the root \ . */
+	/* DEBUG_PRINTF(("buf[%d] = %c\n", iBuf-1, c)); */
+      } else if (path[0] && (path[1] == ':')) {
+	if ((iBuf+1U) >= bufsize) goto resolves_too_long;
+	c = buf[iBuf++] = path[iPath++]; /* Copy the drive letter */
+	/* DEBUG_PRINTF(("buf[%d] = %c\n", iBuf-1, c)); */
+	if ((iBuf+1U) >= bufsize) goto resolves_too_long;
+	c = buf[iBuf++] = path[iPath++]; /*      and the : */
+	/* DEBUG_PRINTF(("buf[%d] = %c\n", iBuf-1, c)); */
+	if (path[iPath] == '\\') {
+	  if ((iBuf+1U) >= bufsize) goto resolves_too_long;
+	  c = buf[iBuf++] = path[iPath++];
+	  /* DEBUG_PRINTF(("buf[%d] = %c\n", iBuf-1, c)); */
+	}
+      } /* Else it's a relative pathname, handled in the common code below */
+    } else { /* It's a continuation section in the path */
+      if ((iBuf+1U) >= bufsize) goto resolves_too_long;
+      buf[iBuf++] = '\\';
+    }
+    iBuf1 = iBuf; /* Index of the beginning of the node name we're about to add */
+    for (i=0; (size_t)(iBuf+i) < (bufsize-1) ;i++) {
+      c = path[iPath+i];
+      if (!c) break;
+      /* if (c == '/') break; */
+      if (c == '\\') break;
+      /* DEBUG_PRINTF(("buf[%d] = %c\n", iBuf+i, c)); */
+      buf[iBuf+i] = c;
+    }
+    iBuf += i;
+    buf[iBuf] = '\0';
+    while (c && (/* (c == '/') || */ (c == '\\'))) c=path[iPath + ++i]; /* Skip extra /, if any */
+    iPath += i;
+    /* DEBUG_PRINTF(("// Removed %d characters from path\n", iPath - iPath0)); */
+    /* Get the file type */
+    dwAttr = GetFileAttributesU(buf);
+    DEBUG_PRINTF(("// \"%s\" is %s\n", buf, (dwAttr == INVALID_FILE_ATTRIBUTES)?"not found":(
+					    (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT)?"a reparse point":(
+      					    (dwAttr & FILE_ATTRIBUTE_DIRECTORY)?"a directory":"a file"))));
+    if (dwAttr == INVALID_FILE_ATTRIBUTES) {
+      errno = ENOENT;
+      if (path[iPath]) { /* Append the remainder of the input path, even though we know it's invalid */
+      	if ((iBuf+1U+lstrlen(path+iPath)) < bufsize) {
+	  buf[iBuf++] = '\\';
+	  lstrcpy(buf+iBuf, path+iPath);
+	}
+      }
+      RETURN_INT_COMMENT(-1, ("No such file: \"%s\"\n", buf));
+    }
+    if (dwAttr & FILE_ATTRIBUTE_REPARSE_POINT) {
+      nRead = readlinkU(buf, target, sizeof(target));
+      if (nRead == -1) {
+	if (errno == EINVAL) { /* This is a reparse point, but not a symlink or a junction */
+	  goto file_or_directory;
+	}
+	/* Anything else is a real error, and resolution cannot be done. */
+	if (path[iPath]) { /* Append the remainder of the input path, even though we know it's invalid */
+	  if ((iBuf+1U+lstrlen(path+iPath)) < bufsize) {
+	    buf[iBuf++] = '\\';
+	    lstrcpy(buf+iBuf, path+iPath);
+	  }
+	}
+        RETURN_INT_COMMENT(-1, ("Dangling link: \"%s\"\n", buf));
+      }
+      if ((dwAttr & FILE_ATTRIBUTE_DIRECTORY) && !lstrcmp(buf, target)) {
+      	/* This is probably a junction pointing to an otherwise inaccessible area.
+      	   (See readlink() header in readlink.c for details about this case.)
+      	   Handle this junction like if it were a real directory, instead of a symlink. */
+	goto file_or_directory;
+      }
+      if (   ((target[0] == '\\') /* || (target[0] == '/') */ )
+	  || (target[1] == ':')) { /* This is an absolute pathname */
+	DEBUG_PRINTF(("// Absolute link to \"%s\"\n", target));
+	iBuf = (int)lstrlen(target); /* Anticipate the new position after copying */
+	if ((size_t)iBuf >= bufsize) goto resolves_too_long;
+	lstrcpy(buf, target);
+      } else { /* This is a relative pathname */
+	DEBUG_PRINTF(("// Relative link to \"%s\"\n", target));
+	/* So it'll replace the tail name in the output path */
+	iBuf = iBuf1; /* The index right after the last path separator */
+	DEBUG_PRINTF(("AppendPath(\"%.*s\", \"%s\"); // Target tail\n", iBuf, buf, target));
+	if (((size_t)iBuf+lstrlen(target)) >= bufsize) goto resolves_too_long;
+	lstrcpy(buf+iBuf, target);
+	iBuf = CompactPath(buf, buf, bufsize);
+      }
+      /* Append the remainder of the input path, if any */
+      DEBUG_PRINTF(("AppendPath(\"%s\", \"%s\"); // Path tail\n", buf, path+iPath));
+      if (path[iPath]) {
+	if (iBuf && (buf[iBuf-1] != '\\')) {
+	  if ((iBuf+1U) >= bufsize) goto resolves_too_long;
+	  buf[iBuf++] = '\\';
+	}
+	if (((size_t)iBuf+lstrlen(path+iPath)) >= bufsize) goto resolves_too_long;
+	lstrcpy(buf+iBuf, path+iPath);
+	iBuf = CompactPath(buf, buf, bufsize);
+      }
+      /* Check for max depth */
+      if (iDepth == SYMLOOP_MAX) {
+	errno = ELOOP;
+	RETURN_INT_COMMENT(-1, ("Max symlink depth reached: \"%s\"\n", buf));
+      }
+      /* Check for loops */
+      for (pList = prev ; pList; pList = pList->prev) {
+      	if (!lstrcmpi(buf, pList->path)) {
+      	  errno = ELOOP;
+	  RETURN_INT_COMMENT(-1, ("Loop found: \"%s\"\n", buf));
+	}
+      }
+      /* OK, no loop, so repeat the process for that new path */
+      lstrcpy(target, buf); /* Keep that as a reference in the linked list, in case there are further links */
+      list.prev = prev;
+      list.path = target;
+      iErr = ResolveLinksU1(target, buf, bufsize, &list, iDepth+1);
+      RETURN_INT_COMMENT(iErr, ("\"%s\"\n", buf));
+    } else { /* It's a normal file or directory */
+file_or_directory:
+      if ((path[iPath]) && !(dwAttr & FILE_ATTRIBUTE_DIRECTORY)) {
+      	errno = ENOTDIR;
+	if ((iBuf+1U+lstrlen(path+iPath)) < bufsize) {
+	  buf[iBuf++] = '\\';
+	  lstrcpy(buf+iBuf, path+iPath);
+	}
+	RETURN_INT_COMMENT(-1, ("File where dir expected: \"%s\"\n", buf));
+      }
+    }
+  }
+
+  RETURN_INT_COMMENT(0, ("Success: \"%s\"\n", buf));
+}
+
+int ResolveLinksU(const char *path, char *buf, size_t bufsize) {
+  char path1[UTF8_PATH_MAX];
+  int nSize;
+  NAMELIST root;
+  int iErr;
+
+  DEBUG_ENTER(("ResolveLinks(\"%s\", 0x%p, %ld);\n", path, buf, bufsize));
+
+  buf[0] = '\0'; /* Always output a valid string */
+
+  if (!*path) { /* Spec says an empty pathname is invalid */
+    errno = ENOENT;
+    RETURN_INT_COMMENT(-1, ("Empty pathname\n"));
+  }
+
+  /* Normalize the input path, using a single \ as path separator */
+  nSize = CompactPath(path, path1, sizeof(path1));
+  if (nSize == -1) { /* CompactPath() already sets errno = ENAMETOOLONG */
+    RETURN_INT_COMMENT(-1, ("Path too long\n"));
+  }
+  if (path1[nSize-1] == '\\') { /* Spec says resolution must implicitly add a trailing dot, */
+    if (nSize == sizeof(path1)) {    /*  to ensure that the last component is a directory. */
+      errno = ENAMETOOLONG;
+      RETURN_INT_COMMENT(-1, ("Path too long after adding .\n"));
+    }
+    path1[nSize++] = '.'; /* So add it explicitely */
+    path1[nSize] = '\0';
+  }
+  root.path = path1;
+  root.prev = NULL;
+  iErr = ResolveLinksU1(path1, buf, bufsize, &root, 0);
+  nSize = lstrlen(buf);
+  /* Remove the final dot added above, if needed. */
+  if ((nSize >= 2) && (buf[nSize-2] == '\\') && (buf[nSize-1] == '.')) buf[--nSize] = '\0';
+  RETURN_INT_COMMENT(iErr, ("\"%s\"\n", buf));
+}
+
+/* ANSI version of the same, built upon the UTF-8 version */
+int ResolveLinksA(const char *path, char *buf, size_t bufsize) {
+  char pathU[UTF8_PATH_MAX];
+  char pathU2[UTF8_PATH_MAX];
+  WCHAR wszPath[PATH_MAX];
+  int n;
+  int iErr;
+
+  /* Convert the pathname to a unicode string */
+  n = MultiByteToWideChar(CP_ACP, 0, path, (int)strlen(path) + 1, wszPath, PATH_MAX);
+  /* Convert it back to UTF-8 characters */
+  if (n) n = WideCharToMultiByte(CP_UTF8, 0, wszPath, n, pathU, UTF8_PATH_MAX, NULL, NULL);
+  /* Check (unlikely) conversion errors */
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+
+  /* Resolve the links */
+  iErr = ResolveLinksU(pathU, pathU2, UTF8_PATH_MAX);
+
+  /* Convert the result back to ANSI */
+  if (!iErr) {
+    n = MultiByteToWideChar(CP_UTF8, 0, pathU2, (int)strlen(pathU2) + 1, wszPath, PATH_MAX);
+    if (n) n = WideCharToMultiByte(CP_ACP, 0, wszPath, n, buf, (int)bufsize, NULL, NULL);
+    if (!n) {
+      errno = Win32ErrorToErrno();
+      RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+    }
+  }
+
+  return iErr;
+}
+
+/* Normally defined in stdlib.h. Output buf must contain PATH_MAX bytes */
+char *realpathU(const char *path, char *outbuf) {
+  char *pOutbuf = outbuf;
+  char *pPath1 = NULL;
+  char *pPath2 = NULL;
+  int iErr;
+  const char *pc;
+  size_t nSize;
+  DEBUG_CODE(
+  char *pszCause = "Out of memory";
+  )
+  int n;
+
+  DEBUG_ENTER(("realpath(\"%s\", 0x%p);\n", path, outbuf));
+
+  if (!pOutbuf) pOutbuf = malloc(UTF8_PATH_MAX);
+  if (!pOutbuf) {
+realpathU_failed:
+    if (!outbuf) free(pOutbuf);
+    free(pPath1);
+    free(pPath2);
+    errno = ENOMEM;
+    RETURN_CONST_COMMENT(NULL, ("%s\n", pszCause));
+  }
+
+  pPath1 = malloc(UTF8_PATH_MAX);
+  if (!pPath1) goto realpathU_failed;
+
+  pPath2 = malloc(UTF8_PATH_MAX);
+  if (!pPath2) goto realpathU_failed;
+
+  /* Convert relative paths to absolute paths */
+  pc = path;
+  if (pc[0] && (pc[1] == ':')) pc += 2; /* Skip the drive letter, if any */
+  if ((*pc != '/') && (*pc != '\\')) { /* This is a relative path */
+    int iDrive = 0;
+    if (pc != path) { /* A drive was specified */
+      iDrive = toupper(path[0]) - '@'; /* A=1, B=2, ... */
+    }
+    _getdcwdU(iDrive, pPath1, UTF8_PATH_MAX);
+    nSize = UTF8_PATH_MAX - lstrlen(pPath1);
+    if ((lstrlen(pc) + 2U) > nSize) {
+      errno = ENAMETOOLONG;
+      DEBUG_CODE(pszCause = "Path too long after concatenating current dir");
+      goto realpathU_failed; 
+    }
+    strcat(pPath1, "\\");
+    strcat(pPath1, pc);
+    path = pPath1;
+  } else if (pc == path) { /* This is an absolute path without a drive letter */
+    pPath1[0] = (char)(_getdrive() + 0x40);
+    pPath1[1] = ':';
+    if (strlen(path) > (UTF8_PATH_MAX-3)) {
+      errno = ENAMETOOLONG;
+      DEBUG_CODE(pszCause = "Path too long after adding drive");
+      goto realpathU_failed;
+    }
+    strcpy(pPath1+2, path);
+    path = pPath1;
+  }    
+
+  /* Resolve links in the absolute path */
+  iErr = ResolveLinksU(path, pPath2, UTF8_PATH_MAX);
+  if (iErr == -1) {
+    DEBUG_CODE(pszCause = "Resolution failed");
+    goto realpathU_failed;
+  }
+
+  /* Change short names to long names, and correct the name case */
+  n = GetLongPathNameU(pPath2, pOutbuf, UTF8_PATH_MAX); /* This will NOT correct long names case */
+  if (!n) {
+    DEBUG_CODE(pszCause = "Can't get long pathnames";)
+    goto realpathU_failed;
+  }
+
+  DEBUG_LEAVE(("return 0x%p; // \"%s\"\n", pOutbuf, pOutbuf));
+  if (!outbuf) pOutbuf = realloc(pOutbuf, strlen(pOutbuf) + 1);
+  free(pPath1);
+  free(pPath2);
+  return pOutbuf;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/spawn.c b/deps/MsvcLibX/src/spawn.c
new file mode 100644
index 0000000000000000000000000000000000000000..1dede9b712c7f12597ff9a61238ba9c4ea461089
--- /dev/null
+++ b/deps/MsvcLibX/src/spawn.c
@@ -0,0 +1,118 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    spawn.c						      *
+*									      *
+*   Description:    WIN32 UTF-8 version of spawn			      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-03-27 JFL Created this module.				      *
+*    2014-07-03 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+/* Microsoft C libraries include files */
+#include <stdio.h>
+/* MsvcLibX library extensions */
+#include "msvcDebugm.h"
+#include "msvclibx.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include <process.h>
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        _spawnvpU	                                              |
+|                                                                             |
+|   Description     UTF-8 version of Microsoft's _spawnvp		      |
+|                                                                             |
+|   Parameters:     int iMode		Spawning mode. P_WAIT or P_NOWAIT     |
+|		    char *pszCommand	Program to start		      |
+|		    char **argv		List of arguments, terminated by NULL |
+|									      |
+|   Returns:	    The exit code (if P_WAIT) or the process ID (if P_NOWAIT) |
+|                                                                             |
+|   Notes                                                                     |
+|                                                                             |
+|   History								      |
+|    2014-03-04 JFL Created this routine.                      		      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+intptr_t _spawnvpU(int iMode, const char *pszCommand, char *const *argv) {
+  WCHAR wszCommand[PATH_MAX];
+  WCHAR **wszArgv;
+  int n;
+  int nArgs;
+  int iArg;
+  intptr_t iRet;
+
+  DEBUG_CODE({
+    int i;
+    DEBUG_PRINTF(("_spawnvpU(%d, \"%s\", {", iMode, pszCommand));
+    if (DEBUG_IS_ON()) {
+      for (i=0; argv[i]; i++) {
+      	if (i) printf(", ");
+      	printf("\"%s\"", argv[i]);
+      }
+      printf("});\n");
+    }
+  })
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  pszCommand,		/* lpMultiByteStr, */
+			  wszCommand,		/* lpWideCharStr, */
+			  COUNTOF(wszCommand)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+
+  for (nArgs=0; argv[nArgs]; nArgs++) ;	/* Count the number of arguments */
+  wszArgv = (WCHAR **)malloc((nArgs+1) * sizeof(WCHAR *));
+  if (!wszArgv) return -1;    /* errno already set by malloc */
+
+  for (iArg=0; argv[iArg]; iArg++) {	/* Convert every argument */
+    int iArgBufSize = lstrlen(argv[iArg]) + 1;
+    wszArgv[iArg] = malloc(sizeof(WCHAR)*iArgBufSize);
+    if (!wszArgv[iArg]) {
+      while (iArg) free(wszArgv[--iArg]);	/* Free the partial arg list */
+      free(wszArgv);
+      return -1;      /* errno already set by malloc */
+    }
+    /* Convert the argument to a unicode string. This is not a pathname, so just do a plain conversion */
+    n = MultiByteToWideChar(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+			    0,			/* dwFlags, */
+			    argv[iArg],		/* lpMultiByteStr, */
+			    iArgBufSize,	/* cbMultiByte, */
+			    wszArgv[iArg],	/* lpWideCharStr, */
+			    iArgBufSize		/* cchWideChar, */
+			    );
+    if (!n) {
+      errno = Win32ErrorToErrno();
+      while (iArg >= 0) free(wszArgv[iArg--]);	/* Free the partial arg list */
+      free(wszArgv);
+      return -1;
+    }
+  }
+  wszArgv[nArgs] = NULL;
+
+  iRet = _wspawnvp(iMode, wszCommand, wszArgv);
+
+  while (nArgs) free(wszArgv[--nArgs]);	/* Free the full arg list */
+  free(wszArgv);
+  return iRet;
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/strerror.c b/deps/MsvcLibX/src/strerror.c
new file mode 100644
index 0000000000000000000000000000000000000000..a10fc45753bae73043e051cedc434204eeb832b8
--- /dev/null
+++ b/deps/MsvcLibX/src/strerror.c
@@ -0,0 +1,54 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    strerror.c						      *
+*									      *
+*   Description:    WIN32 update of strerror				      *
+*                                                                             *
+*   Notes:	    MSVC defines error messages only up to errno 42 EILSEQ    *
+*		    							      *
+*   History:								      *
+*    2014-03-06 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <stdlib.h>
+#include <errno.h>
+#include "msvclibx.h"
+
+#ifdef _WIN32
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function        strerror	                                              |
+|                                                                             |
+|   Description     UTF-8 version of strerror				      |
+|                                                                             |
+|   Parameters      int errnum		Error number			      |
+|                                                                             |
+|   Returns         Pointer to the corresponding error message.		      |
+|                                                                             |
+|   Notes                                                                     |
+|                                                                             |
+|   History								      |
+|    2014-03-06 JFL Created this routine.                      		      |
+*                                                                             *
+\*---------------------------------------------------------------------------*/
+
+#pragma warning(disable:4100) /* Ignore the "unreferenced formal parameter" warning */
+
+char *strerror(int errnum) {
+  switch (errnum) {
+    case ELOOP:
+      return "Symbolic links loop found"; /* Workaround for the missing entry in MSVC list */
+    default:
+      if (errnum > _sys_nerr) errnum = _sys_nerr;
+      return _sys_errlist[errnum];
+  }
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/strndup.c b/deps/MsvcLibX/src/strndup.c
new file mode 100644
index 0000000000000000000000000000000000000000..2c75cb9ed58b946620dd43875d2f72245d810145
--- /dev/null
+++ b/deps/MsvcLibX/src/strndup.c
@@ -0,0 +1,34 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    strndup.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's strndup()	      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-13 JFL Created this module.				      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <string.h>
+#include <stdlib.h>
+
+/* Duplicate a string, up to at most size characters */
+char *strndup(const char *s, size_t size) {
+  size_t l;
+  char *s2;
+  l = strlen(s);
+  if (l > size) l=size;
+  s2 = malloc(l+1);
+  if (s2) {
+    strncpy(s2, s, l);
+    s2[l] = '\0';
+  }
+  return s2;
+}
+
diff --git a/deps/MsvcLibX/src/strptime.c b/deps/MsvcLibX/src/strptime.c
new file mode 100644
index 0000000000000000000000000000000000000000..716b573a345884b76b73e4b6c006846bcce371cf
--- /dev/null
+++ b/deps/MsvcLibX/src/strptime.c
@@ -0,0 +1,396 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    strptime.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's strptime()	      *
+*                                                                             *
+*   Notes:	    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-17 JFL Created this module.				      *
+*                                                                             *
+\*****************************************************************************/
+
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+ 
+/*
+ * We do not implement alternate representations. However, we always
+ * check whether a given modifier is allowed for a certain conversion.
+ */
+#define ALT_E          0x01
+#define ALT_O          0x02
+/* #define LEGAL_ALT(x)       { if (alt_format & ~(x)) return (0); } */
+#define LEGAL_ALT(x)       { ; }
+#define TM_YEAR_BASE   (1970)
+ 
+static   int conv_num(const char **, int *, int, int);
+static int strncasecmp(char *s1, char *s2, size_t n);
+ 
+static const char *day[7] = {
+     "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+     "Friday", "Saturday"
+};
+static const char *abday[7] = {
+     "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
+};
+static const char *mon[12] = {
+     "January", "February", "March", "April", "May", "June", "July",
+     "August", "September", "October", "November", "December"
+};
+static const char *abmon[12] = {
+     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+static const char *am_pm[2] = {
+     "AM", "PM"
+};
+ 
+ 
+#pragma warning(disable:4706) /* Ignore the "assignment within conditional expression" warning */
+char * strptime(const char *buf, const char *fmt, struct tm *tm)
+{
+    char c;
+    const char *bp;
+    size_t len = 0;
+    int alt_format, i, split_year = 0;
+ 
+    bp = buf;
+
+    while ((c = *fmt) != '\0') 
+    {
+        /* Clear `alternate' modifier prior to new conversion. */
+        alt_format = 0;
+     
+        /* Eat up white-space. */
+        if (isspace(c)) 
+        {
+            while (isspace(*bp))
+                bp++;
+ 
+            fmt++;
+            continue;
+        }
+                  
+             if ((c = *fmt++) != '%')
+                  goto literal;
+ 
+ 
+again:        switch (c = *fmt++) 
+        {
+            case '%': /* "%%" is converted to "%". */
+                literal:
+                    if (c != *bp++)
+                        return (0);
+                    break;
+ 
+                /* 
+                 * "Alternative" modifiers. Just set the appropriate flag
+                  * and start over again.
+                   */
+            case 'E': /* "%E?" alternative conversion modifier. */
+                LEGAL_ALT(0);
+                alt_format |= ALT_E;
+                goto again;
+ 
+            case 'O': /* "%O?" alternative conversion modifier. */
+                LEGAL_ALT(0);
+                alt_format |= ALT_O;
+                goto again;
+             
+            /*
+             * "Complex" conversion rules, implemented through recursion.
+             */
+            case 'c': /* Date and time, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                if (!(bp = strptime(bp, "%x %X", tm)))
+                    return (0);
+                break;
+ 
+            case 'D': /* The date as "%m/%d/%y". */
+                LEGAL_ALT(0);
+                if (!(bp = strptime(bp, "%m/%d/%y", tm)))
+                    return (0);
+                break;
+ 
+            case 'R': /* The time as "%H:%M". */
+                LEGAL_ALT(0);
+                if (!(bp = strptime(bp, "%H:%M", tm)))
+                    return (0);
+                break;
+         
+            case 'r': /* The time in 12-hour clock representation. */
+                LEGAL_ALT(0);
+                if (!(bp = strptime(bp, "%I:%M:%S %p", tm)))
+                    return (0);
+                break;
+ 
+            case 'T': /* The time as "%H:%M:%S". */
+                LEGAL_ALT(0);
+                if (!(bp = strptime(bp, "%H:%M:%S", tm)))
+                    return (0);
+                break;
+ 
+            case 'X': /* The time, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                if (!(bp = strptime(bp, "%H:%M:%S", tm)))
+                    return (0);
+                break;
+ 
+            case 'x': /* The date, using the locale's format. */
+                LEGAL_ALT(ALT_E);
+                if (!(bp = strptime(bp, "%m/%d/%y", tm)))
+                    return (0);
+                break;
+ 
+            /*
+             * "Elementary" conversion rules.
+             */
+            case 'A': /* The day of week, using the locale's form. */
+            case 'a':
+                LEGAL_ALT(0);
+                for (i = 0; i < 7; i++) 
+                {
+                    /* Full name. */
+                    len = strlen(day[i]);
+                    if (strncasecmp((char *)(day[i]), (char *)bp, len) == 0)
+                        break;
+         
+                    /* Abbreviated name. */
+                    len = strlen(abday[i]);
+                    if (strncasecmp((char *)(abday[i]), (char *)bp, len) == 0)
+                        break;
+                }
+ 
+                /* Nothing matched. */
+                if (i == 7)
+                    return (0);
+ 
+                tm->tm_wday = i;
+                bp += len;
+                break;
+ 
+            case 'B': /* The month, using the locale's form. */
+            case 'b':
+            case 'h':
+                LEGAL_ALT(0);
+                for (i = 0; i < 12; i++) 
+                {
+                     /* Full name. */
+
+                    len = strlen(mon[i]);
+                    if (strncasecmp((char *)(mon[i]), (char *)bp, len) == 0)
+                        break;
+ 
+                    /* Abbreviated name. */
+                    len = strlen(abmon[i]);
+                    if (strncasecmp((char *)(abmon[i]),(char *) bp, len) == 0)
+                        break;
+                }
+ 
+                /* Nothing matched. */
+                if (i == 12)
+                    return (0);
+ 
+                tm->tm_mon = i;
+                bp += len;
+                break;
+ 
+            case 'C': /* The century number. */
+                LEGAL_ALT(ALT_E);
+                if (!(conv_num(&bp, &i, 0, 99)))
+                    return (0);
+ 
+                if (split_year)
+                {
+                    tm->tm_year = (tm->tm_year % 100) + (i * 100);
+                } else {
+                    tm->tm_year = i * 100;
+                    split_year = 1;
+                }
+                break;
+ 
+            case 'd': /* The day of month. */
+            case 'e':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_mday, 1, 31)))
+                    return (0);
+                break;
+ 
+            case 'k': /* The hour (24-hour clock representation). */
+                LEGAL_ALT(0);
+                /* FALLTHROUGH */
+            case 'H':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_hour, 0, 23)))
+                    return (0);
+                break;
+ 
+            case 'l': /* The hour (12-hour clock representation). */
+                LEGAL_ALT(0);
+                /* FALLTHROUGH */
+            case 'I':
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_hour, 1, 12)))
+                    return (0);
+                if (tm->tm_hour == 12)
+                    tm->tm_hour = 0;
+                break;
+         
+            case 'j': /* The day of year. */
+                LEGAL_ALT(0);
+                if (!(conv_num(&bp, &i, 1, 366)))
+                    return (0);
+                tm->tm_yday = i - 1;
+                break;
+         
+            case 'M': /* The minute. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_min, 0, 59)))
+                    return (0);
+                break;
+         
+            case 'm': /* The month. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &i, 1, 12)))
+                    return (0);
+                tm->tm_mon = i - 1;
+                break;
+/*
+//            case 'p': /* The locale's equivalent of AM/PM. */
+/*                LEGAL_ALT(0);
+//                /* AM? */
+/*                if (strcasecmp(am_pm[0], bp) == 0) 
+//                {
+//                    if (tm->tm_hour > 11)
+//                        return (0);
+//
+//                    bp += strlen(am_pm[0]);
+//                    break;
+//                }
+//                /* PM? */
+/*                else if (strcasecmp(am_pm[1], bp) == 0) 
+//                {
+//                    if (tm->tm_hour > 11)
+//                        return (0);
+//
+//                    tm->tm_hour += 12;
+//                    bp += strlen(am_pm[1]);
+//                    break;
+//                }
+//
+//                /* Nothing matched. */
+/*                return (0);
+*/
+            case 'S': /* The seconds. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_sec, 0, 61)))
+                    return (0);
+                break;
+         
+            case 'U': /* The week of year, beginning on sunday. */
+            case 'W': /* The week of year, beginning on monday. */
+                LEGAL_ALT(ALT_O);
+                /*
+                 * XXX This is bogus, as we can not assume any valid
+                 * information present in the tm structure at this
+                 * point to calculate a real value, so just check the
+                 * range for now.
+                 */
+                if (!(conv_num(&bp, &i, 0, 53)))
+                    return (0);
+                break;
+ 
+            case 'w': /* The day of week, beginning on sunday. */
+                LEGAL_ALT(ALT_O);
+                if (!(conv_num(&bp, &tm->tm_wday, 0, 6)))
+                    return (0);
+                break;
+ 
+            case 'Y': /* The year. */
+                LEGAL_ALT(ALT_E);
+                if (!(conv_num(&bp, &i, 0, 9999)))
+                    return (0);
+ 
+                tm->tm_year = i - TM_YEAR_BASE;
+                break;
+         
+            case 'y': /* The year within 100 years of the epoch. */
+                LEGAL_ALT(ALT_E | ALT_O);
+                if (!(conv_num(&bp, &i, 0, 99)))
+                    return (0);
+ 
+                if (split_year) 
+                {
+                    tm->tm_year = ((tm->tm_year / 100) * 100) + i;
+                    break;
+                }
+                split_year = 1;
+                if (i <= 68)
+                    tm->tm_year = i + 2000 - TM_YEAR_BASE;
+                else
+                    tm->tm_year = i + 1900 - TM_YEAR_BASE;
+                break;
+ 
+                /*
+                  * Miscellaneous conversions.
+                  */
+            case 'n': /* Any kind of white-space. */
+            case 't':
+                LEGAL_ALT(0);
+                while (isspace(*bp))
+                    bp++;
+                break;
+ 
+ 
+            default: /* Unknown/unsupported conversion. */
+                return (0);
+        }
+ 
+    }
+ 
+    /* LINTED functional specification */
+    return ((char *)bp);
+}
+#pragma warning(default:4706)
+ 
+ 
+static int conv_num(const char **buf, int *dest, int llim, int ulim)
+{
+    int result = 0;
+ 
+    /* The limit also determines the number of valid digits. */
+    int rulim = ulim;
+ 
+    if (**buf < '0' || **buf > '9')
+        return (0);
+ 
+    do {
+        result *= 10;
+        result += *(*buf)++ - '0';
+        rulim /= 10;
+    } while ((result * 10 <= ulim) && rulim && **buf >= '0' && **buf <= '9');
+ 
+    if (result < llim || result > ulim)
+        return (0);
+ 
+    *dest = result;
+    return (1);
+}
+ 
+int strncasecmp(char *s1, char *s2, size_t n)
+{
+    if (n == 0)
+        return 0;
+ 
+    while (n-- != 0 && tolower(*s1) == tolower(*s2))
+    {
+        if (n == 0 || *s1 == '\0' || *s2 == '\0')
+            break;
+        s1++;
+        s2++;
+    }
+ 
+    return tolower(*(unsigned char *) s1) - tolower(*(unsigned char *) s2);
+}
diff --git a/deps/MsvcLibX/src/symlink.c b/deps/MsvcLibX/src/symlink.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce2bbe58a26deb1a61936b9d0ef5a26d24cf7731
--- /dev/null
+++ b/deps/MsvcLibX/src/symlink.c
@@ -0,0 +1,455 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    symlink.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's symlink()	      *
+*                                                                             *
+*   Notes:	    Requires SE_CREATE_SYMBOLIC_LINK_NAME privilege.          *
+*		    							      *
+*		    							      *
+*   History:								      *
+*    2014-02-05 JFL Created this module.				      *
+*    2014-03-02 JFL Split the functions into a WSTR and an UTF-8 version.     *
+*    2014-03-20 JFL Restructured Windows link management functions into Wide  *
+*		    and MultiByte versions, and changed the Unicode and Ansi  *
+*		    versions to macros.					      *
+*    2014-07-03 JFL Added support for pathnames >= 260 characters. 	      *
+*    2015-12-14 JFL Added a workaround allowing to link support for symlinks  *
+*                   in all apps, even when targeting XP or older systems that *
+*                   do not support symlinks.                                  *
+*    2016-08-25 JFL Fixed two warnings.                                       *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of routines */
+
+#include "msvcUnistd.h"
+#pragma comment(lib, "Mpr.lib")
+
+#include <errno.h>
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+#include "msvcReparsept.h"
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    junction						      |
+|									      |
+|   Description:    Create an NTFS junction                                   |
+|									      |
+|   Parameters:     const char *targetName	The junction target name      |
+|		    const char *junctionName	The junction name	      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    Uses the undocumented FSCTL_SET_REPARSE_POINT structure   |
+|		    Win2K uses for mount points and junctions.                |
+|									      |
+|   History:								      |
+|    2014-02-05 JFL Adapted from Mark Russinovitch CreateJuction sample	      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* MsvcLibX-specific routine to create an NTFS junction - Wide char version */
+int junctionW(const WCHAR *targetName, const WCHAR *junctionName) {
+  WCHAR  wszReparseBuffer[PATH_MAX*3];
+  WCHAR  wszVolumeName[] = L"X:\\";
+  WCHAR  wszJunctionFullName[PATH_MAX];
+  WCHAR  wszFileSystem[PATH_MAX] = L"";
+  WCHAR  wszTargetTempName[PATH_MAX];
+  WCHAR  wszTargetFullName[PATH_MAX];
+  WCHAR  wszTargetNativeName[PATH_MAX];
+  WCHAR *pwszFilePart;
+  size_t lNativeName;
+  HANDLE hFile;
+  DWORD  dwReturnedLength;
+  PMOUNTPOINT_WRITE_BUFFER reparseInfo = (PMOUNTPOINT_WRITE_BUFFER)wszReparseBuffer;
+  DEBUG_CODE(
+  char szJunction8[UTF8_PATH_MAX];
+  char szTarget8[UTF8_PATH_MAX];
+  char szTemp8[UTF8_PATH_MAX];
+  )
+  UINT uiDriveType;
+  DWORD dwFileSystemFlags;
+
+  DEBUG_WSTR2UTF8(junctionName, szJunction8, sizeof(szJunction8));
+  DEBUG_WSTR2UTF8(targetName, szTarget8, sizeof(szTarget8));
+  DEBUG_ENTER(("junction(\"%s\", \"%s\");\n", szTarget8, szJunction8));
+
+  /* Get the full path of the junction */
+  if (!GetFullPathNameW(junctionName, PATH_MAX, wszJunctionFullName, &pwszFilePart)) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("%s is an invalid junction name\n", junctionName));
+  }
+
+  /* Convert relative paths to absolute paths relative to the junction. */
+  /* Note: I tested creating relative targets: They can be created, but Windows can't follow them. */
+  if ((targetName[0] != '\\') && (targetName[1] != ':')) {
+    size_t lTempName = PATH_MAX;
+    lstrcpyW(wszTargetTempName, wszJunctionFullName);
+    lTempName -= lstrlenW(wszJunctionFullName);
+    if (lTempName < (size_t)(lstrlenW(targetName) + 5)) {
+      errno = ENAMETOOLONG;
+      RETURN_INT_COMMENT(-1, ("Intermediate target name too long\n"));
+    }
+    lstrcatW(wszTargetTempName, L"\\..\\");
+    lstrcatW(wszTargetTempName, targetName);
+    if (!GetFullPathNameW(wszTargetTempName, PATH_MAX, wszTargetFullName, &pwszFilePart)) {
+      errno = Win32ErrorToErrno();
+      RETURN_INT_COMMENT(-1, ("%s is an invalid target directory name\n", szTarget8));
+    }
+    DEBUG_WSTR2UTF8(wszTargetFullName, szTemp8, sizeof(szTemp8));
+    XDEBUG_PRINTF(("wszTargetFullName = \"%s\"; // After absolutization relative to the junction\n", szTemp8));
+  } else { /* Already an absolute name. Just make sure it's canonic. (Without . or ..) */
+    if (!GetFullPathNameW(targetName, PATH_MAX, wszTargetFullName, &pwszFilePart)) {
+      errno = Win32ErrorToErrno();
+      RETURN_INT_COMMENT(-1, ("%s is an invalid target directory name\n", szTarget8));
+    }
+    DEBUG_WSTR2UTF8(wszTargetFullName, szTemp8, sizeof(szTemp8));
+    XDEBUG_PRINTF(("wszTargetFullName = \"%s\"; // After direct reabsolutization\n", szTemp8));
+  }
+  /* Make sure the target drive letter is upper case */
+#pragma warning(disable:4305) /* truncation from 'LPSTR' to 'WCHAR' */
+#pragma warning(disable:4306) /* conversion from 'WCHAR' to 'WCHAR *' of greater size */
+  wszTargetFullName[0] = (WCHAR)CharUpperW((WCHAR *)(wszTargetFullName[0]));
+#pragma warning(default:4706)
+#pragma warning(default:4705)
+
+  /* Make sure that the junction is on a file system that supports reparse points (Ex: NTFS) */
+  wszVolumeName[0] = wszJunctionFullName[0];
+  GetVolumeInformationW(wszVolumeName, NULL, 0, NULL, NULL, &dwFileSystemFlags, wszFileSystem, sizeof(wszFileSystem)/sizeof(WCHAR));
+  if (!(dwFileSystemFlags & FILE_SUPPORTS_REPARSE_POINTS)) {
+    errno = EDOM;
+    DEBUG_WSTR2UTF8(wszFileSystem, szTemp8, sizeof(szTemp8));
+    RETURN_INT_COMMENT(-1, ("Junctions are not supported on %s volumes\n", szTemp8));
+  }
+
+  /* On network drives, make sure the target refers to the local drive on the server */
+  /* Note: The local path on the server can be inferred in simple cases, but not in the general case */
+  uiDriveType = GetDriveTypeW(wszVolumeName);
+  DEBUG_WSTR2UTF8(wszVolumeName, szTemp8, sizeof(szTemp8));
+  XDEBUG_PRINTF(("GetDriveType(\"%s\") = %d // %s drive\n", szTemp8, uiDriveType, (uiDriveType == DRIVE_REMOTE) ? "Network" : "Local"));
+  if (uiDriveType == DRIVE_REMOTE) {
+    WCHAR  wszLocalName[] = L"X:";
+    WCHAR wszRemoteName[PATH_MAX];
+    DWORD dwErr;
+    DWORD dwLength = PATH_MAX;
+    wszLocalName[0] = wszJunctionFullName[0];
+    dwErr = WNetGetConnectionW(wszLocalName, wszRemoteName, &dwLength);
+    if (dwErr == NO_ERROR) {
+      WCHAR *pwsz;
+      DEBUG_CODE(
+      char szRemote8[UTF8_PATH_MAX];
+      )
+      DEBUG_WSTR2UTF8(wszRemoteName, szRemote8, sizeof(szRemote8));
+      XDEBUG_PRINTF(("net use %c: %s\n", (char)(wszLocalName[0]), szRemote8));
+      if ((wszRemoteName[0] == L'\\') && (wszRemoteName[1] == L'\\')) {
+	pwsz = wcschr(wszRemoteName+2, L'\\');
+	if (pwsz) {
+	  if ((pwsz[2] == L'$') && !pwsz[3]) { /* This is the root of a shared drive. Ex: \\server\D$ -> D: */
+	    wszTargetFullName[0] = pwsz[1];	/* Local drive name on the server */
+	  } else { /* Heuristic: Assume the share name is a subdirectory name on the C: drive. Ex: \\server\Public -> C:\Public */
+	    int lTempName = PATH_MAX;
+	    wszTargetTempName[0] = L'C';	/* Local drive name on the server */
+	    wszTargetTempName[1] = L':';
+	    lstrcpyW(wszTargetTempName+2, pwsz);
+	    lTempName -= lstrlenW(wszTargetTempName);
+	    if (lTempName > lstrlenW(wszTargetFullName+2)) {
+	      lstrcatW(wszTargetTempName, wszTargetFullName+2);
+	      lstrcpyW(wszTargetFullName, wszTargetTempName);
+	    }
+	  }
+	}
+      }
+    } else {
+      XDEBUG_PRINTF(("WNetGetConnection(\"%s\") failed: Error %d\n", szTemp8, dwErr));
+    }
+  }
+
+  /* Make the native target name */
+  lNativeName = wsprintfW(wszTargetNativeName, L"\\??\\%s", wszTargetFullName );
+  if ( (wszTargetNativeName[lNativeName-1] == L'\\') &&
+       (wszTargetNativeName[lNativeName-2] != L':')) {
+    wszTargetNativeName[lNativeName-1] = L'\0';
+    lNativeName -= 1;
+  }
+
+  /* Create the link - ignore errors since it might already exist */
+  DEBUG_WSTR2UTF8(wszJunctionFullName, szJunction8, sizeof(szJunction8));
+  DEBUG_WSTR2UTF8(wszTargetNativeName, szTarget8, sizeof(szTarget8));
+  DEBUG_PRINTF(("// Creating junction \"%s\" -> \"%s\"\n", szJunction8, szTarget8));
+  CreateDirectoryW(junctionName, NULL);
+  hFile = CreateFileW(junctionName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
+		      FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL );
+  if (hFile == INVALID_HANDLE_VALUE) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("Error creating %s:\n", szJunction8));
+  }
+
+  /* Build the reparse info */
+  ZeroMemory(reparseInfo, sizeof( *reparseInfo ));
+  reparseInfo->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
+  reparseInfo->ReparseTargetLength = (WORD)(lNativeName * sizeof(WCHAR));
+  reparseInfo->ReparseTargetMaximumLength = reparseInfo->ReparseTargetLength + sizeof(WCHAR);
+  reparseInfo->ReparseDataLength          = reparseInfo->ReparseTargetLength + MOUNTPOINT_WRITE_BUFFER_HEADER_SIZE - 4;
+  lstrcpynW(reparseInfo->ReparseTarget, wszTargetNativeName, PATH_MAX);
+
+  /* Set the link */
+  if (!DeviceIoControl(hFile, FSCTL_SET_REPARSE_POINT, reparseInfo,
+		       /* reparseInfo->ReparseDataLength + 4, */
+		       reparseInfo->ReparseDataLength + 8,
+		       NULL, 0, &dwReturnedLength, NULL )) {
+    errno = Win32ErrorToErrno();
+    CloseHandle(hFile);
+    RemoveDirectoryW(junctionName);
+    RETURN_INT_COMMENT(-1, ("Error setting junction for %s:\n", szJunction8));
+  }
+
+  CloseHandle(hFile);
+  RETURN_INT_COMMENT(0, ("Created \"%s\" -> \"%s\"\n", szJunction8, szTarget8));
+}
+
+/* MsvcLibX-specific routine to create an NTFS junction - MultiByte char version */
+int junctionM(const char *targetName, const char *junctionName, UINT cp) {
+  WCHAR wszJunction[PATH_MAX];
+  WCHAR wszTarget[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  junctionName,		/* lpMultiByteStr, */
+			  wszJunction,		/* lpWideCharStr, */
+			  COUNTOF(wszJunction)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  targetName,		/* lpMultiByteStr, */
+			  wszTarget,		/* lpWideCharStr, */
+			  COUNTOF(wszTarget)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return junctionW(wszTarget, wszJunction);
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    symlink						      |
+|									      |
+|   Description:    Create an NTFS symbolic link                              |
+|									      |
+|   Parameters:     const TCHAR *targetName	The symlink target name       |
+|		    const TCHAR *linkName	The symlink name	      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    							      |
+|									      |
+|   History:								      |
+|    2014-02-04 JFL Created this routine                                      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* Symbolic links first appeared in Vista WINVER 0x600.
+   Add support for both old and new versions, by using Windows' CreateSymbolicLink
+   function if it exists, or else a short stub that fails every time if not. */
+#if WINVER < 0x600 /* This mechanism is only necessary when targeting older versions of Windows */
+
+typedef BOOLEAN (WINAPI *LPCREATESYMBOLICLINK)(LPCWSTR lpSymlinkName, LPCWSTR lpTargetName, DWORD dwFlags);
+
+/* Default routine to use if Windows does not have CreateSymbolicLinkW */
+#pragma warning(disable:4100) /* 'dwFlags' : unreferenced formal parameter */
+BOOLEAN WINAPI DefaultCreateSymbolicLinkW(LPCWSTR lpSymlinkName, LPCWSTR lpTargetName, DWORD dwFlags) {
+  DWORD dwAttr = GetFileAttributesW(lpTargetName);
+  if (dwAttr != INVALID_FILE_ATTRIBUTES) { /* If the target exists */
+    if (dwAttr & FILE_ATTRIBUTE_DIRECTORY) { /* And if the target is a directory */
+      /* Try creating a junction as a workaround */
+      int iRet = junctionW(lpTargetName, lpSymlinkName);	/* 0=Success, -1=Failure */
+      return (BOOLEAN)(iRet + 1);				/* 1=Success,  0=Failure */
+    }
+  }
+  /* Else fail, as symlinks to files aren't supported by this Windows version */
+  SetLastError(ERROR_NOT_SUPPORTED);
+  return FALSE;
+}
+#pragma warning(default:4105)
+
+/* Initialization routine. Tries using Windows' CreateSymbolicLinkW if present, else uses our default above */
+BOOLEAN WINAPI InitCreateSymbolicLink(LPCWSTR lpSymlinkName, LPCWSTR lpTargetName, DWORD dwFlags) {
+  extern LPCREATESYMBOLICLINK lpCreateSymbolicLinkW;
+  lpCreateSymbolicLinkW = (LPCREATESYMBOLICLINK) GetProcAddress(
+    GetModuleHandle(TEXT("kernel32.dll")), "CreateSymbolicLinkW");
+  if (!lpCreateSymbolicLinkW) { /* This is XP or older, not supporting symlinks */
+    lpCreateSymbolicLinkW = DefaultCreateSymbolicLinkW;
+  }
+  return (*lpCreateSymbolicLinkW)(lpSymlinkName, lpTargetName, dwFlags);
+}
+
+LPCREATESYMBOLICLINK lpCreateSymbolicLinkW = InitCreateSymbolicLink;
+
+/* Make sure all uses of CreateSymbolicLinkW below go through our static pointer above */
+#undef CreateSymbolicLinkW
+#define CreateSymbolicLinkW (*lpCreateSymbolicLinkW)
+
+#endif /* WINVER < 0x600 */
+
+/* Posix routine symlink - Wide char version */
+int symlinkW(const WCHAR *targetName, const WCHAR *linkName) {
+  DWORD dwAttr;
+  BOOL done;
+  DWORD dwFlags;
+  int err;
+  DEBUG_CODE(
+  char szLink8[UTF8_PATH_MAX];
+  char szTarget8[UTF8_PATH_MAX];
+  )
+
+  DEBUG_WSTR2UTF8(linkName, szLink8, sizeof(szLink8));
+  DEBUG_WSTR2UTF8(targetName, szTarget8, sizeof(szTarget8));
+  DEBUG_ENTER(("symlink(\"%s\", \"%s\");\n", szTarget8, szLink8));
+
+  /* Work around an incompatibility between Unix and Windows:
+  // Windows needs to know if the target is a file or a directory;
+  // But Unix allows creating dangling links, in which case we cannot guess what type it'll be. */
+  dwAttr = GetFileAttributesW(targetName);
+  DEBUG_PRINTF(("GetFileAttributes() = 0x%lX\n", dwAttr));
+  dwFlags = 0;
+  if (dwAttr != INVALID_FILE_ATTRIBUTES) {	/* File exists */
+    if (dwAttr & FILE_ATTRIBUTE_DIRECTORY) dwFlags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
+  } else { /* Target does not exst. Use a heuristic: Names with trailing / or \ are directories */
+    size_t len = lstrlenW(targetName);
+    if (len) {
+      WCHAR c = targetName[len-1];
+      if ((c == L'/') || (c == L'\\')) dwFlags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
+    }
+  }
+
+  done = CreateSymbolicLinkW(linkName, targetName, dwFlags);
+
+  if (done) {
+    err = 0;
+  } else {
+    errno = Win32ErrorToErrno();
+    err = -1;
+  }
+  RETURN_INT_COMMENT(err, ("%s\n", err?"Failed to create link":"Created link successfully"));
+}
+
+/* Posix routine symlink - MultiByte char version */
+int symlinkM(const char *targetName, const char *linkName, UINT cp) {
+  WCHAR wszLink[PATH_MAX];
+  WCHAR wszTarget[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  linkName,		/* lpMultiByteStr, */
+			  wszLink,		/* lpWideCharStr, */
+			  COUNTOF(wszLink)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  targetName,		/* lpMultiByteStr, */
+			  wszTarget,		/* lpWideCharStr, */
+			  COUNTOF(wszTarget)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return symlinkW(wszTarget, wszLink);
+}
+
+/*---------------------------------------------------------------------------*\
+*                                                                             *
+|   Function:	    symlinkd						      |
+|									      |
+|   Description:    Create an NTFS symbolic directory link                    |
+|									      |
+|   Parameters:     const TCHAR *targetName	The symlink target name       |
+|		    const TCHAR *linkName	The symlink name	      |
+|									      |
+|   Returns:	    0 = Success, -1 = Failure				      |
+|									      |
+|   Notes:	    							      |
+|									      |
+|   History:								      |
+|    2014-03-04 JFL Created this routine                                      |
+*									      *
+\*---------------------------------------------------------------------------*/
+
+/* MsvcLibX-specific routine to create an NTFS symlinkd - Wide char version */
+int symlinkdW(const WCHAR *targetName, const WCHAR *linkName) {
+  BOOL done;
+  int err;
+  DEBUG_CODE(
+  char szLink8[UTF8_PATH_MAX];
+  char szTarget8[UTF8_PATH_MAX];
+  )
+
+  DEBUG_WSTR2UTF8(linkName, szLink8, sizeof(szLink8));
+  DEBUG_WSTR2UTF8(targetName, szTarget8, sizeof(szTarget8));
+  DEBUG_ENTER(("symlinkd(\"%s\", \"%s\");\n", szTarget8, szLink8));
+
+  done = CreateSymbolicLinkW(linkName, targetName, SYMBOLIC_LINK_FLAG_DIRECTORY);
+
+  if (done) {
+    err = 0;
+  } else {
+    errno = Win32ErrorToErrno();
+    err = -1;
+  }
+  RETURN_INT_COMMENT(err, ("%s\n", err?"Failed to create link":"Created link successfully"));
+}
+
+/* MsvcLibX-specific routine to create an NTFS symlinkd - MultiByte char version */
+int symlinkdM(const char *targetName, const char *linkName, UINT cp) {
+  WCHAR wszLink[PATH_MAX];
+  WCHAR wszTarget[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  linkName,		/* lpMultiByteStr, */
+			  wszLink,		/* lpWideCharStr, */
+			  COUNTOF(wszLink)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(cp,			/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  targetName,		/* lpMultiByteStr, */
+			  wszTarget,		/* lpWideCharStr, */
+			  COUNTOF(wszTarget)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return symlinkdW(wszTarget, wszLink);
+}
+
+#endif
+
+
diff --git a/deps/MsvcLibX/src/uname.c b/deps/MsvcLibX/src/uname.c
new file mode 100644
index 0000000000000000000000000000000000000000..afa2ef0d5e0b25e4ba7c04f71f2fe3b8c2a10cf3
--- /dev/null
+++ b/deps/MsvcLibX/src/uname.c
@@ -0,0 +1,79 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename:	    uname.c						      *
+*                                                                             *
+*   Description:    Get the name of the current system.			      *
+*                                                                             *
+*   Notes:	    TO DO: Fix the Win32 windows version for Windows >= 8.1,  *
+*                          as explained in MSDN's GetVersion function page.   *
+*                                                                             *
+*                   TO DO: Do not rely on PROCESSOR_ARCHITECTURE to get the   *
+*                          processor architecture, because the WIN32 version  *
+*			   always sees "x86", even on "AMD64" systems.        *
+*                                                                             *
+*                   TO DO: Implement sysinfo.c, moving some of the code from  *
+*			   here to there, and use it.                         *
+*                                                                             *
+*   History:								      *
+*    2014-05-30 JFL Created this file.                    		      *
+*									      *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#include "sys/msvcTsname.h"
+#include <stdlib.h>	/* For itoa() */
+
+static char major[4] = {0};
+static char minor[4] = {0};
+
+#ifdef _MSDOS
+
+#include <dos.h>
+
+static char name[16] = {0};
+
+int uname(struct utsname *pun) {
+  unsigned int wVersion = _bdos(0x30, 0, 0); /* int 21H ah=30H Get DOS version */
+
+  _itoa((int)(wVersion & 0x0F), major, 10);
+  _itoa((int)((wVersion >> 8) & 0x0F), minor, 10);
+
+  /* Use _bdos instead of _intdosx, because even in large memory mode, static variables will be allocated in the default data segment */ 
+  _bdos(0x5E, (unsigned short)(unsigned long)(char far *)name, 0); /* int 21H ax=5E00H ds:dx=&buf Get Machine Name */
+
+  pun->sysname = "MS-DOS"; /* Name of this operating system */
+  pun->nodename = name; /* Name of this node on the network */ /* TO DO: Get it from LAN Manager */
+  pun->release = major;  /* Current release level of this implementation */
+  pun->version = minor;  /* Current version level of this release */
+  pun->machine = "x86"; /* Name of the hardware type on which the system is running */
+
+  return 0;
+}
+
+#endif /* defined(_MSDOS) */
+
+/*---------------------------------------------------------------------------*/
+
+#ifdef _WIN32
+
+#include <windows.h>
+
+#pragma warning(disable:4996) /* Ignore the "This function or variable may be unsafe" warning for itoa() and getenv() */
+
+int uname(struct utsname *pun) {
+  DWORD dwVersion = GetVersion();
+
+  _itoa((int)(dwVersion & 0x0F), major, 10);
+  _itoa((int)((dwVersion >> 8) & 0x0F), minor, 10);
+
+  pun->sysname = getenv("OS"); /* Name of this operating system */
+  pun->nodename = getenv("COMPUTERNAME"); /* Name of this node on the network */
+  pun->release = major;  /* Current release level of this implementation */
+  pun->version = minor;  /* Current version level of this release */
+  pun->machine = getenv("PROCESSOR_ARCHITECTURE"); /* Name of the hardware type on which the system is running */
+
+  return 0;
+}
+
+#endif /* defined(_WIN32) */
diff --git a/deps/MsvcLibX/src/utime.c b/deps/MsvcLibX/src/utime.c
new file mode 100644
index 0000000000000000000000000000000000000000..cbddfecb01f9dd858a9ef03d9da7107c7116de15
--- /dev/null
+++ b/deps/MsvcLibX/src/utime.c
@@ -0,0 +1,216 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    utime.c						      *
+*									      *
+*   Description	    Updated utime() and port of standard C library's lutime() *
+*                                                                             *
+*   Notes	    TO DO: Create W, A, U versions of ResolveLinks(), then    *
+*		    	   create W, A, U versions of utime().		      *
+*		    							      *
+*   History								      *
+*    2014-02-12 JFL Created this module.				      *
+*    2014-06-04 JFL Fixed minors issues in debugging code.		      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*    2016-08-25 JFL Added missing routine utimeA().                	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of Windows print routines */
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <errno.h>
+#include "sys/msvcTime.h" /* Must be included before any direct or indirect <windows.h> inclusion */
+#include "msvcUtime.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#if defined(_DEBUG)
+#include <stdio.h>
+#endif /* defined(_DEBUG) */
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include <io.h> /* For  MSVC's _get_osfhandle() */
+#include "msvcUnistd.h" /* For MsvcLibX's ResolveLinks() */
+
+/* Convert a Windows FILETIME to a Unix time_t.
+   A FILETIME is the number of 100-nanosecond intervals since January 1, 1601.
+   A time_t is the number of 1-second intervals since January 1, 1970. */
+
+time_t Filetime2Time_t(FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  ull.LowPart = pFT->dwLowDateTime;
+  ull.HighPart = pFT->dwHighDateTime;
+  return (time_t)(ull.QuadPart / 10000000ULL - 11644473600ULL);
+}
+
+void Time_t2Filetime(time_t ft, FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  ull.QuadPart = ft + 11644473600ULL;
+  ull.QuadPart *= 10000000UL;
+  pFT->dwLowDateTime = ull.LowPart;
+  pFT->dwHighDateTime = ull.HighPart;
+}
+
+DEBUG_CODE(
+  int Utimbuf2String(char *buf, size_t bufsize, const struct utimbuf *times) {
+    struct tm *pTime;
+    int n;
+    if (!times) {
+      return _snprintf(buf, bufsize, "NULL");
+    }
+    pTime = localtime(&(times->modtime)); /* Time of last data modification */
+    n = _snprintf(buf, bufsize, "{%4d-%02d-%02d %02d:%02d:%02d, ...}",
+	         pTime->tm_year + 1900, pTime->tm_mon + 1, pTime->tm_mday,
+	         pTime->tm_hour, pTime->tm_min, pTime->tm_sec);
+    return n;
+  }
+);
+
+/* Low level subroutine used by all the other routines below. */
+int hutime(HANDLE hFile, const struct utimbuf *times) {
+  FILETIME ftLastAccess;  /* last access time */
+  FILETIME ftLastWrite;   /* last write time */
+  int iErr;
+  struct utimbuf now;
+
+  if (!times) {
+    now.actime = now.modtime = time(NULL);
+    times = &now;
+  }
+
+  Time_t2Filetime(times->actime, &ftLastAccess);
+  Time_t2Filetime(times->modtime, &ftLastWrite);
+  iErr = !SetFileTime(hFile, NULL, &ftLastAccess, &ftLastWrite);
+  if (iErr) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return 0;
+}
+
+/* Same as 'utime', but does not follow symbolic links. */
+int lutimeW(const WCHAR *path, const struct utimbuf *times) {
+  DWORD dwAttr;
+  DWORD dwFlagsAndAttributes;
+  int iErr;
+  HANDLE hLink;
+
+  DEBUG_CODE({
+    char buf[100];
+    char szUtf8[UTF8_PATH_MAX];
+    Utimbuf2String(buf, sizeof(buf), times);
+    DEBUG_WSTR2UTF8(path, szUtf8, sizeof(szUtf8));
+    DEBUG_ENTER(("lutime(\"%s\", %s);\n", szUtf8, buf));
+  });
+
+  dwAttr = GetFileAttributesW(path);
+  if (dwAttr == INVALID_FILE_ATTRIBUTES) {
+    errno = ENOENT;
+    RETURN_INT_COMMENT(-1, ("File does not exist\n"));
+  }
+
+  dwFlagsAndAttributes = FILE_FLAG_OPEN_REPARSE_POINT;
+  if (dwAttr & FILE_ATTRIBUTE_DIRECTORY) dwFlagsAndAttributes |= FILE_FLAG_BACKUP_SEMANTICS;
+  hLink = CreateFileW(path,					/* lpFileName, */
+		      FILE_WRITE_ATTRIBUTES,			/* dwDesiredAccess, */
+		      FILE_SHARE_READ | FILE_SHARE_WRITE,	/* dwShareMode, */
+		      NULL,					/* lpSecurityAttributes, */
+		      OPEN_EXISTING,                     	/* dwCreationDisposition, */
+		      dwFlagsAndAttributes,              	/* dwFlagsAndAttributes, */
+		      NULL                               	/* hTemplateFile */
+		    );
+  XDEBUG_PRINTF(("CreateFile() = 0x%p\n", hLink));
+  if (hLink == INVALID_HANDLE_VALUE) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("Cannot open the pathname\n"));
+  }
+
+  iErr = hutime(hLink, times);
+  CloseHandle(hLink);
+  RETURN_INT_COMMENT(iErr, ("errno = %d\n", iErr ? errno : 0));
+}
+
+int lutimeA(const char *path, const struct utimbuf *times) {
+  WCHAR wszPath[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_ACP,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_ENTER(("lutimeA(\"%s\", %p);\n", path, times));
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  return lutimeW(wszPath, times);
+}
+
+int lutimeU(const char *path, const struct utimbuf *times) {
+  WCHAR wszPath[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_ENTER(("lutimeU(\"%s\", %p);\n", path, times));
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  return lutimeW(wszPath, times);
+}
+
+/* Same as 'utime', but takes an open file descriptor instead of a name. */
+int futime(int fd, const struct utimbuf *times) {
+  return hutime((HANDLE)_get_osfhandle(fd), times);
+}
+
+/* Change the file access time to times->actime and its modification time to times->modtime. */
+int utimeA(const char *file, const struct utimbuf *times) {
+  char buf[PATH_MAX];
+  int iErr;
+
+  DEBUG_CODE({
+    char buf[100];
+    Utimbuf2String(buf, sizeof(buf), times);
+    DEBUG_ENTER(("utime(\"%s\", %s);\n", file, buf));
+  });
+
+  iErr = ResolveLinksA(file, buf, sizeof(buf));
+  if (iErr) RETURN_INT_COMMENT(iErr, ("Cannot resolve the link\n"));
+
+  iErr = lutimeA(buf, times);
+  RETURN_INT_COMMENT(iErr, ("errno = %d\n", iErr ? errno : 0));
+}
+
+/* Change the file access time to times->actime and its modification time to times->modtime. */
+int utimeU(const char *file, const struct utimbuf *times) {
+  char buf[UTF8_PATH_MAX];
+  int iErr;
+
+  DEBUG_CODE({
+    char buf[100];
+    Utimbuf2String(buf, sizeof(buf), times);
+    DEBUG_ENTER(("utime(\"%s\", %s);\n", file, buf));
+  });
+
+  iErr = ResolveLinksU(file, buf, sizeof(buf));
+  if (iErr) RETURN_INT_COMMENT(iErr, ("Cannot resolve the link\n"));
+
+  iErr = lutimeU(buf, times);
+  RETURN_INT_COMMENT(iErr, ("errno = %d\n", iErr ? errno : 0));
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/utimes.c b/deps/MsvcLibX/src/utimes.c
new file mode 100644
index 0000000000000000000000000000000000000000..9326bb5f74283abb59389a44300f621f2b79ff52
--- /dev/null
+++ b/deps/MsvcLibX/src/utimes.c
@@ -0,0 +1,219 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    utimes.c						      *
+*									      *
+*   Description:    WIN32 port of standard C library's *utimes()	      *
+*                                                                             *
+*   Notes:	    TO DO: Create W, A, U versions of ResolveLinks(), then    *
+*		    	   create W, A, U versions of utimes().		      *
+*		    							      *
+*   History:								      *
+*    2014-02-07 JFL Created this module.				      *
+*    2014-03-24 JFL Renamed "statx.h" as the standard <sys/stat.h>.	      *
+*    2014-06-03 JFL Added support for WIDE, ANSI and UTF8 versions.	      *
+*    2014-06-04 JFL Added handling of UTIME_NOW and UTIME_OMIT.		      *
+*    2014-07-02 JFL Added support for pathnames >= 260 characters. 	      *
+*                                                                             *
+*         Copyright 2016 Hewlett Packard Enterprise Development LP          *
+* Licensed under the Apache 2.0 license - www.apache.org/licenses/LICENSE-2.0 *
+\*****************************************************************************/
+
+#define _UTF8_SOURCE /* Generate the UTF-8 version of Windows print routines */
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <errno.h>
+#include "sys/msvcTime.h" /* Must be included before any direct or indirect <windows.h> inclusion */
+#include "sys/msvcStat.h"
+#include "msvcDebugm.h"
+#include "msvcLimits.h"
+
+#if defined(_DEBUG)
+#include <stdio.h>
+#endif /* defined(_DEBUG) */
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include <io.h> /* For MSVC's _get_osfhandle() */
+#include "msvcUnistd.h" /* For MsvcLibX's ResolveLinks() */
+
+DEBUG_CODE(
+  int Timeval2String(char *buf, size_t bufsize, const struct timeval *tvp) {
+    struct tm *pTime;
+    int n;
+    if (tvp->tv_usec == UTIME_NOW) {
+      return _snprintf(buf, bufsize, "UTIME_NOW");
+    }
+    if (tvp->tv_usec == UTIME_OMIT) {
+      return _snprintf(buf, bufsize, "UTIME_OMIT");
+    }
+    pTime = localtime(&(tvp->tv_sec)); /* Time of last data modification */
+    n = _snprintf(buf, bufsize, "{%4d-%02d-%02d %02d:%02d:%02d.%06d, ...}",
+	         pTime->tm_year + 1900, pTime->tm_mon + 1, pTime->tm_mday,
+	         pTime->tm_hour, pTime->tm_min, pTime->tm_sec, tvp->tv_usec);
+    return n;
+  }
+);
+
+/* Convert a Windows FILETIME to a Unix timeval
+   A FILETIME is the number of 100-nanosecond intervals since January 1, 1601.
+   A time_t is the number of 1-second intervals since January 1, 1970. */
+
+void Filetime2Timeval(const FILETIME *pFT, struct timeval *ptv) {
+  ULARGE_INTEGER ull;
+  ull.LowPart = pFT->dwLowDateTime;
+  ull.HighPart = pFT->dwHighDateTime;
+  ptv->tv_sec = (long)(ull.QuadPart / 10000000ULL - 11644473600ULL);
+  ptv->tv_usec = (int32_t)((ull.QuadPart % 10000000ULL)/10);
+}
+
+void Timeval2Filetime(const struct timeval *ptv, FILETIME *pFT) {
+  ULARGE_INTEGER ull;
+  struct timeval now;
+  if (ptv->tv_usec == UTIME_NOW) {
+    gettimeofday(&now, NULL); /* Get the current time into a struct timeval */
+    DEBUG_CODE({
+      char buf[100];
+      Timeval2String(buf, sizeof(buf), &now);
+      DEBUG_PRINTF(("// UTIME_NOW -> %s\n", buf));
+    });
+    ptv = &now;
+  }
+  ull.QuadPart = ptv->tv_sec + 11644473600ULL;
+  ull.QuadPart *= 1000000UL;
+  ull.QuadPart += ptv->tv_usec;
+  ull.QuadPart *= 10UL;
+  pFT->dwLowDateTime = ull.LowPart;
+  pFT->dwHighDateTime = ull.HighPart;
+}
+
+/* Low level subroutine used by all the other routines below. */
+int hutimes(HANDLE hFile, const struct timeval tvp[2]) {
+  FILETIME ftLastAccess;  /* last access time */
+  FILETIME ftLastWrite;   /* last write time */
+  FILETIME *pftLastAccess = &ftLastAccess;
+  FILETIME *pftLastWrite = &ftLastWrite;
+  int iErr;
+
+  if (tvp[0].tv_usec != UTIME_OMIT) {
+    Timeval2Filetime(tvp+0, pftLastAccess);
+  } else {
+    pftLastAccess = NULL;	/* Do not set this value */
+  }
+  if (tvp[1].tv_usec != UTIME_OMIT) {
+    Timeval2Filetime(tvp+1, pftLastWrite);
+  } else {
+    pftLastWrite = NULL;	/* Do not set this value */
+  }
+  iErr = !SetFileTime(hFile, NULL, pftLastAccess, pftLastWrite);
+  if (iErr) {
+    errno = Win32ErrorToErrno();
+    return -1;
+  }
+  return 0;
+}
+
+/* Same as 'utimes', but does not follow symbolic links. */
+int lutimesW(const WCHAR *path, const struct timeval tvp[2]) {
+  DWORD dwAttr;
+  DWORD dwFlagsAndAttributes;
+  int iErr;
+  HANDLE hLink;
+
+  DEBUG_CODE({
+    char buf[100];
+    char szUtf8[UTF8_PATH_MAX];
+    Timeval2String(buf, sizeof(buf), tvp+1);
+    DEBUG_WSTR2UTF8(path, szUtf8, sizeof(szUtf8));
+    DEBUG_ENTER(("lutimes(\"%s\", %s);\n", szUtf8, buf));
+  });
+
+  dwAttr = GetFileAttributesW(path);
+  if (dwAttr == INVALID_FILE_ATTRIBUTES) {
+    errno = ENOENT;
+    RETURN_INT_COMMENT(-1, ("File does not exist\n"));
+  }
+
+  dwFlagsAndAttributes = FILE_FLAG_OPEN_REPARSE_POINT;
+  if (dwAttr & FILE_ATTRIBUTE_DIRECTORY) dwFlagsAndAttributes |= FILE_FLAG_BACKUP_SEMANTICS;
+  hLink = CreateFileW(path,					/* lpFileName,		  */
+		      FILE_WRITE_ATTRIBUTES,			/* dwDesiredAccess, */
+		      FILE_SHARE_READ | FILE_SHARE_WRITE,	/* dwShareMode,           */
+		      NULL,					/* lpSecurityAttributes,  */
+		      OPEN_EXISTING,                    	/* dwCreationDisposition, */
+		      dwFlagsAndAttributes,             	/* dwFlagsAndAttributes,  */
+		      NULL                              	/* hTemplateFile          */
+		     );
+  XDEBUG_PRINTF(("CreateFile() = 0x%p\n", hLink));
+  if (hLink == INVALID_HANDLE_VALUE) {
+    errno = Win32ErrorToErrno();
+    RETURN_INT_COMMENT(-1, ("Cannot open the pathname\n"));
+  }
+
+  iErr = hutimes(hLink, tvp);
+  CloseHandle(hLink);
+  RETURN_INT_COMMENT(iErr, ("errno = %d\n", iErr ? errno : 0));
+}
+
+int lutimesA(const char *path, const struct timeval tvp[2]) {
+  WCHAR wszPath[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_ACP,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_ENTER(("lutimesA(\"%s\", %p);\n", path, tvp));
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  return lutimesW(wszPath, tvp);
+}
+
+int lutimesU(const char *path, const struct timeval tvp[2]) {
+  WCHAR wszPath[PATH_MAX];
+  int n;
+
+  /* Convert the pathname to a unicode string, with the proper extension prefixes if it's longer than 260 bytes */
+  n = MultiByteToWidePath(CP_UTF8,		/* CodePage, (CP_ACP, CP_OEMCP, CP_UTF8, ...) */
+    			  path,			/* lpMultiByteStr, */
+			  wszPath,		/* lpWideCharStr, */
+			  COUNTOF(wszPath)	/* cchWideChar, */
+			  );
+  if (!n) {
+    errno = Win32ErrorToErrno();
+    DEBUG_ENTER(("lutimesU(\"%s\", %p);\n", path, tvp));
+    RETURN_INT_COMMENT(-1, ("errno=%d - %s\n", errno, strerror(errno)));
+  }
+  return lutimesW(wszPath, tvp);
+}
+
+/* Same as 'utimes', but takes an open file descriptor instead of a name. */
+int futimes(int fd, const struct timeval tvp[2]) {
+  return hutimes((HANDLE)_get_osfhandle(fd), tvp);
+}
+
+/* Change the file access time to tvp[0] and its modification time to tvp[1]. */
+int utimes(const char *file, const struct timeval tvp[2]) {
+  char buf[UTF8_PATH_MAX];
+  int iErr;
+
+  DEBUG_CODE({
+    char buf[100];
+    Timeval2String(buf, sizeof(buf), tvp+1);
+    DEBUG_ENTER(("utimes(\"%s\", %s);\n", file, buf));
+  });
+
+  iErr = ResolveLinksU(file, buf, sizeof(buf));
+  if (iErr) RETURN_INT_COMMENT(iErr, ("Cannot resolve the link\n"));
+
+  iErr = lutimesU(buf, tvp);
+  RETURN_INT_COMMENT(iErr, ("errno = %d\n", iErr ? errno : 0));
+}
+
+#endif /* defined(_WIN32) */
+
diff --git a/deps/MsvcLibX/src/xfreopen.c b/deps/MsvcLibX/src/xfreopen.c
new file mode 100644
index 0000000000000000000000000000000000000000..80311bbac6d1e1900785bb2fde3fc570e3808fbd
--- /dev/null
+++ b/deps/MsvcLibX/src/xfreopen.c
@@ -0,0 +1,47 @@
+/*****************************************************************************\
+*                                                                             *
+*   Filename	    xfreopen.c						      *
+*									      *
+*   Description:    WIN32 port of GNU CoreUtils library's xfreopen()	      *
+*                                                                             *
+*   Notes:	    The GNU CoreUtils library extends the freopen function.   *
+*		    msvclibx: Use the standard freopen, or _setmode.	      *
+*		    							      *
+*   History:								      *
+*    2014-03-03 JFL Created this module.				      *
+*                                                                             *
+\*****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS 1 /* Avoid Visual C++ security warnings */
+
+#include <stdio.h>
+#include <io.h>
+#include <fcntl.h>
+#include <string.h>
+#include "msvcXfreopen.h"
+
+FILE *xfreopen(const char *filename, const char *mode, FILE *stream) {
+  int iMode = 0;
+  if (filename) return freopen(filename, mode, stream);
+  if (strstr(mode, "r+")) {
+    iMode = _O_RDWR;
+  } else if (strstr(mode, "w+")) {
+    iMode = _O_WRONLY | _O_CREAT | _O_TRUNC;
+  } else if (strstr(mode, "a+")) {
+    iMode = _O_RDWR | _O_CREAT | _O_APPEND;
+  } else if (strchr(mode, 'r')) {
+    iMode = _O_RDONLY;
+  } else if (strchr(mode, 'w')) {
+    iMode = _O_WRONLY | _O_CREAT;
+  } else if (strchr(mode, 'a')) {
+    iMode = _O_WRONLY | _O_CREAT | _O_APPEND;
+  }
+  if (strchr(mode, 'b')) {
+    iMode = _O_BINARY;
+  } else if (strchr(mode, 't')) {
+    iMode = _O_TEXT;
+  }
+  _setmode(_fileno(stream), iMode);
+  return stream;
+}
+
diff --git a/deps/cJson/CMakeLists.txt b/deps/cJson/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2fe197506581bbfd526ae08969211c20e4faff3d
--- /dev/null
+++ b/deps/cJson/CMakeLists.txt
@@ -0,0 +1,4 @@
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+
+ADD_LIBRARY(cJson ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(cJson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
diff --git a/deps/cJson/inc/cJSON.h b/deps/cJson/inc/cJSON.h
new file mode 100644
index 0000000000000000000000000000000000000000..cdd5faa52399e83dd2c07174a025eae52a3c1b61
--- /dev/null
+++ b/deps/cJson/inc/cJSON.h
@@ -0,0 +1,267 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 5
+#define CJSON_VERSION_PATCH 9
+
+#include <stddef.h>
+#include <stdint.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int64_t valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+
+    //Keep the original string of number
+    char numberstring[13];
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      void *(*malloc_fn)(size_t sz);
+      void (*free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 2 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type __stdcall
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type __stdcall
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type __stdcall
+#endif
+#else /* !WIN32 */
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* These utilities create an Array of count items. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detatch items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+need to be released. With recurse!=0, it will duplicate any children connected to the item.
+The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Macros for creating things quickly. */
+#define cJSON_AddNullToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateNull())
+#define cJSON_AddTrueToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
+#define cJSON_AddFalseToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
+#define cJSON_AddBoolToObject(object,name,b) cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
+#define cJSON_AddNumberToObject(object,name,n) cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
+#define cJSON_AddStringToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
+#define cJSON_AddRawToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateRaw(s))
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/deps/cJson/src/cJSON.c b/deps/cJson/src/cJSON.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0ef9f6fe1715336ed8d24d4998df5a8ba51b3af
--- /dev/null
+++ b/deps/cJson/src/cJSON.c
@@ -0,0 +1,2702 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+/* cJSON */
+/* JSON parser in C. */
+
+#ifdef __GNUC__
+#pragma GCC visibility push(default)
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <float.h>
+#include <limits.h>
+#include <ctype.h>
+#include <locale.h>
+
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+#include "cJSON.h"
+
+/* define our own boolean type */
+#define true ((cJSON_bool)1)
+#define false ((cJSON_bool)0)
+
+typedef struct {
+    const unsigned char *json;
+    size_t position;
+} error;
+static error global_error = { NULL, 0 };
+
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
+{
+    return (const char*) (global_error.json + global_error.position);
+}
+
+/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 9)
+    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
+#endif
+
+CJSON_PUBLIC(const char*) cJSON_Version(void)
+{
+    static char version[15];
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+
+    return version;
+}
+
+/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
+static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
+{
+    if ((string1 == NULL) || (string2 == NULL))
+    {
+        return 1;
+    }
+
+    if (string1 == string2)
+    {
+        return 0;
+    }
+
+    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
+    {
+        if (*string1 == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return tolower(*string1) - tolower(*string2);
+}
+
+typedef struct internal_hooks
+{
+    void *(*allocate)(size_t size);
+    void (*deallocate)(void *pointer);
+    void *(*reallocate)(void *pointer, size_t size);
+} internal_hooks;
+
+static internal_hooks global_hooks = { malloc, free, realloc };
+
+static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
+{
+    size_t length = 0;
+    unsigned char *copy = NULL;
+
+    if (string == NULL)
+    {
+        return NULL;
+    }
+
+    length = strlen((const char*)string) + sizeof("");
+    if (!(copy = (unsigned char*)hooks->allocate(length)))
+    {
+        return NULL;
+    }
+    memcpy(copy, string, length);
+
+    return copy;
+}
+
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
+{
+    if (hooks == NULL)
+    {
+        /* Reset hooks */
+        global_hooks.allocate = malloc;
+        global_hooks.deallocate = free;
+        global_hooks.reallocate = realloc;
+        return;
+    }
+
+    global_hooks.allocate = malloc;
+    if (hooks->malloc_fn != NULL)
+    {
+        global_hooks.allocate = hooks->malloc_fn;
+    }
+
+    global_hooks.deallocate = free;
+    if (hooks->free_fn != NULL)
+    {
+        global_hooks.deallocate = hooks->free_fn;
+    }
+
+    /* use realloc only if both free and malloc are used */
+    global_hooks.reallocate = NULL;
+    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
+    {
+        global_hooks.reallocate = realloc;
+    }
+}
+
+/* Internal constructor. */
+static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
+{
+    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
+    if (node)
+    {
+        memset(node, '\0', sizeof(cJSON));
+    }
+
+    return node;
+}
+
+/* Delete a cJSON structure. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
+{
+    cJSON *next = NULL;
+    while (item != NULL)
+    {
+        next = item->next;
+        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
+        {
+            cJSON_Delete(item->child);
+        }
+        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
+        {
+            global_hooks.deallocate(item->valuestring);
+        }
+        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+        {
+            global_hooks.deallocate(item->string);
+        }
+        global_hooks.deallocate(item);
+        item = next;
+    }
+}
+
+/* get the decimal point character of the current locale */
+static unsigned char get_decimal_point(void)
+{
+    struct lconv *lconv = localeconv();
+    return (unsigned char) lconv->decimal_point[0];
+}
+
+typedef struct
+{
+    const unsigned char *content;
+    size_t length;
+    size_t offset;
+    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
+    internal_hooks hooks;
+} parse_buffer;
+
+/* check if the given size is left to read in a given parse buffer (starting with 1) */
+#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+#define cannot_read(buffer, size) (!can_read(buffer, size))
+/* check if the buffer can be accessed at the given index (starting with 0) */
+#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
+#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+/* get a pointer to the buffer at the position */
+#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+
+/* Parse the input text to generate a number, and populate the result into item. */
+static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
+{
+    double number = 0;
+    unsigned char *after_end = NULL;
+    unsigned char number_c_string[64];
+    unsigned char decimal_point = get_decimal_point();
+    size_t i = 0;
+
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false;
+    }
+
+    /* copy the number into a temporary buffer and replace '.' with the decimal point
+     * of the current locale (for strtod)
+     * This also takes care of '\0' not necessarily being available for marking the end of the input */
+    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
+    {
+        switch (buffer_at_offset(input_buffer)[i])
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case '+':
+            case '-':
+            case 'e':
+            case 'E':
+                number_c_string[i] = buffer_at_offset(input_buffer)[i];
+                break;
+
+            case '.':
+                number_c_string[i] = decimal_point;
+                break;
+
+            default:
+                goto loop_end;
+        }
+    }
+loop_end:
+    number_c_string[i] = '\0';
+
+    number = strtod((const char*)number_c_string, (char**)&after_end);
+    if (number_c_string == after_end)
+    {
+        return false; /* parse_error */
+    }
+
+    item->valuedouble = number;
+
+    /* use saturation in case of overflow */
+    if (number >= LLONG_MAX)
+    {
+        item->valueint = LLONG_MAX;
+    }
+    else if (number <= LLONG_MIN)
+    {
+        item->valueint = LLONG_MIN;
+    }
+    else
+    {
+        item->valueint = (int64_t)number;
+    }
+
+    item->type = cJSON_Number;
+
+    input_buffer->offset += (size_t)(after_end - number_c_string);
+
+    strncpy(item->numberstring, (const char *)number_c_string, 12);
+
+    return true;
+}
+
+/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
+{
+    if (number >= LLONG_MAX)
+    {
+        object->valueint = LLONG_MAX;
+    }
+    else if (number <= LLONG_MIN)
+    {
+        object->valueint = LLONG_MIN;
+    }
+    else
+    {
+        object->valueint = (int64_t)number;
+    }
+
+    return object->valuedouble = number;
+}
+
+typedef struct
+{
+    unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    size_t depth; /* current nesting depth (for formatted printing) */
+    cJSON_bool noalloc;
+    cJSON_bool format; /* is this print a formatted print */
+    internal_hooks hooks;
+} printbuffer;
+
+/* realloc printbuffer if necessary to have at least "needed" bytes more */
+static unsigned char* ensure(printbuffer * const p, size_t needed)
+{
+    unsigned char *newbuffer = NULL;
+    size_t newsize = 0;
+
+    if ((p == NULL) || (p->buffer == NULL))
+    {
+        return NULL;
+    }
+
+    if ((p->length > 0) && (p->offset >= p->length))
+    {
+        /* make sure that offset is valid */
+        return NULL;
+    }
+
+    if (needed > LLONG_MAX)
+    {
+        /* sizes bigger than LLONG_MAX are currently not supported */
+        return NULL;
+    }
+
+    needed += p->offset + 1;
+    if (needed <= p->length)
+    {
+        return p->buffer + p->offset;
+    }
+
+    if (p->noalloc) {
+        return NULL;
+    }
+
+    /* calculate new buffer size */
+    if (needed > (LONG_MAX / 2))
+    {
+        /* overflow of int, use LLONG_MAX if possible */
+        if (needed <= LONG_MAX)
+        {
+            newsize = LONG_MAX;
+        }
+        else
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        newsize = needed * 2;
+    }
+
+    if (p->hooks.reallocate != NULL)
+    {
+        /* reallocate with realloc if available */
+        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+    }
+    else
+    {
+        /* otherwise reallocate manually */
+        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
+        if (!newbuffer)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+        if (newbuffer)
+        {
+            memcpy(newbuffer, p->buffer, p->offset + 1);
+        }
+        p->hooks.deallocate(p->buffer);
+    }
+    p->length = newsize;
+    p->buffer = newbuffer;
+
+    return newbuffer + p->offset;
+}
+
+/* calculate the new length of the string in a printbuffer and update the offset */
+static void update_offset(printbuffer * const buffer)
+{
+    const unsigned char *buffer_pointer = NULL;
+    if ((buffer == NULL) || (buffer->buffer == NULL))
+    {
+        return;
+    }
+    buffer_pointer = buffer->buffer + buffer->offset;
+
+    buffer->offset += strlen((const char*)buffer_pointer);
+}
+
+/* Render the number nicely from the given item into a string. */
+static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    double d = item->valuedouble;
+    int length = 0;
+    size_t i = 0;
+    unsigned char number_buffer[26]; /* temporary buffer to print the number into */
+    unsigned char decimal_point = get_decimal_point();
+    double test;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* This checks for NaN and Infinity */
+    if ((d * 0) != 0)
+    {
+        length = sprintf((char*)number_buffer, "null");
+    }
+    else
+    {
+        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
+        length = sprintf((char*)number_buffer, "%1.15g", d);
+
+        /* Check whether the original double can be recovered */
+        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d))
+        {
+            /* If not, print with 17 decimal places of precision */
+            length = sprintf((char*)number_buffer, "%1.17g", d);
+        }
+    }
+
+    /* sprintf failed or buffer overrun occured */
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    {
+        return false;
+    }
+
+    /* reserve appropriate space in the output */
+    output_pointer = ensure(output_buffer, (size_t)length);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    /* copy the printed number to the output and replace locale
+     * dependent decimal point with '.' */
+    for (i = 0; i < ((size_t)length); i++)
+    {
+        if (number_buffer[i] == decimal_point)
+        {
+            output_pointer[i] = '.';
+            continue;
+        }
+
+        output_pointer[i] = number_buffer[i];
+    }
+    output_pointer[i] = '\0';
+
+    output_buffer->offset += (size_t)length;
+
+    return true;
+}
+
+/* parse 4 digit hexadecimal number */
+static unsigned parse_hex4(const unsigned char * const input)
+{
+    unsigned int h = 0;
+    size_t i = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        /* parse digit */
+        if ((input[i] >= '0') && (input[i] <= '9'))
+        {
+            h += (unsigned int) input[i] - '0';
+        }
+        else if ((input[i] >= 'A') && (input[i] <= 'F'))
+        {
+            h += (unsigned int) 10 + input[i] - 'A';
+        }
+        else if ((input[i] >= 'a') && (input[i] <= 'f'))
+        {
+            h += (unsigned int) 10 + input[i] - 'a';
+        }
+        else /* invalid */
+        {
+            return 0;
+        }
+
+        if (i < 3)
+        {
+            /* shift left to make place for the next nibble */
+            h = h << 4;
+        }
+    }
+
+    return h;
+}
+
+/* converts a UTF-16 literal to UTF-8
+ * A literal can be one or two sequences of the form \uXXXX */
+static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
+{
+    uint64_t codepoint = 0;
+    unsigned int first_code = 0;
+    const unsigned char *first_sequence = input_pointer;
+    unsigned char utf8_length = 0;
+    unsigned char utf8_position = 0;
+    unsigned char sequence_length = 0;
+    unsigned char first_byte_mark = 0;
+
+    if ((input_end - first_sequence) < 6)
+    {
+        /* input ends unexpectedly */
+        goto fail;
+    }
+
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
+    /* check that the code is valid */
+    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
+    {
+        goto fail;
+    }
+
+    /* UTF16 surrogate pair */
+    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
+    {
+        const unsigned char *second_sequence = first_sequence + 6;
+        unsigned int second_code = 0;
+        sequence_length = 12; /* \uXXXX\uXXXX */
+
+        if ((input_end - second_sequence) < 6)
+        {
+            /* input ends unexpectedly */
+            goto fail;
+        }
+
+        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
+        {
+            /* missing second half of the surrogate pair */
+            goto fail;
+        }
+
+        /* get the second utf16 sequence */
+        second_code = parse_hex4(second_sequence + 2);
+        /* check that the code is valid */
+        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
+        {
+            /* invalid second half of the surrogate pair */
+            goto fail;
+        }
+
+
+        /* calculate the unicode codepoint from the surrogate pair */
+        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
+    }
+    else
+    {
+        sequence_length = 6; /* \uXXXX */
+        codepoint = first_code;
+    }
+
+    /* encode as UTF-8
+     * takes at maximum 4 bytes to encode:
+     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (codepoint < 0x80)
+    {
+        /* normal ascii, encoding 0xxxxxxx */
+        utf8_length = 1;
+    }
+    else if (codepoint < 0x800)
+    {
+        /* two bytes, encoding 110xxxxx 10xxxxxx */
+        utf8_length = 2;
+        first_byte_mark = 0xC0; /* 11000000 */
+    }
+    else if (codepoint < 0x10000)
+    {
+        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 3;
+        first_byte_mark = 0xE0; /* 11100000 */
+    }
+    else if (codepoint <= 0x10FFFF)
+    {
+        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 4;
+        first_byte_mark = 0xF0; /* 11110000 */
+    }
+    else
+    {
+        /* invalid unicode codepoint */
+        goto fail;
+    }
+
+    /* encode as utf8 */
+    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
+    {
+        /* 10xxxxxx */
+        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
+        codepoint >>= 6;
+    }
+    /* encode first byte */
+    if (utf8_length > 1)
+    {
+        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
+    }
+    else
+    {
+        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
+    }
+
+    *output_pointer += utf8_length;
+
+    return sequence_length;
+
+fail:
+    return 0;
+}
+
+/* Parse the input text into an unescaped cinput, and populate item. */
+static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
+{
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    unsigned char *output_pointer = NULL;
+    unsigned char *output = NULL;
+
+    /* not a string */
+    if (buffer_at_offset(input_buffer)[0] != '\"')
+    {
+        goto fail;
+    }
+
+    {
+        /* calculate approximate size of the output (overestimate) */
+        size_t allocation_length = 0;
+        size_t skipped_bytes = 0;
+        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
+        {
+            /* is escape sequence */
+            if (input_end[0] == '\\')
+            {
+                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                {
+                    /* prevent buffer overflow when last input character is a backslash */
+                    goto fail;
+                }
+                skipped_bytes++;
+                input_end++;
+            }
+            input_end++;
+        }
+        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
+        {
+            goto fail; /* string ended unexpectedly */
+        }
+
+        /* This is at most how much we need for the output */
+        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
+        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
+        if (output == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+    }
+
+    output_pointer = output;
+    /* loop through the string literal */
+    while (input_pointer < input_end)
+    {
+        if (*input_pointer != '\\')
+        {
+            *output_pointer++ = *input_pointer++;
+        }
+        /* escape sequence */
+        else
+        {
+            unsigned char sequence_length = 2;
+            if ((input_end - input_pointer) < 1)
+            {
+                goto fail;
+            }
+
+            switch (input_pointer[1])
+            {
+                case 'b':
+                    *output_pointer++ = '\b';
+                    break;
+                case 'f':
+                    *output_pointer++ = '\f';
+                    break;
+                case 'n':
+                    *output_pointer++ = '\n';
+                    break;
+                case 'r':
+                    *output_pointer++ = '\r';
+                    break;
+                case 't':
+                    *output_pointer++ = '\t';
+                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *output_pointer++ = input_pointer[1];
+                    break;
+
+                /* UTF-16 literal */
+                case 'u':
+                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
+                    if (sequence_length == 0)
+                    {
+                        /* failed to convert UTF16-literal to UTF-8 */
+                        goto fail;
+                    }
+                    break;
+
+                default:
+                    goto fail;
+            }
+            input_pointer += sequence_length;
+        }
+    }
+
+    /* zero terminate the output */
+    *output_pointer = '\0';
+
+    item->type = cJSON_String;
+    item->valuestring = (char*)output;
+
+    input_buffer->offset = (size_t) (input_end - input_buffer->content);
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (output != NULL)
+    {
+        input_buffer->hooks.deallocate(output);
+    }
+
+    if (input_pointer != NULL)
+    {
+        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
+    }
+
+    return false;
+}
+
+/* Render the cstring provided to an escaped version that can be printed. */
+static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
+{
+    const unsigned char *input_pointer = NULL;
+    unsigned char *output = NULL;
+    unsigned char *output_pointer = NULL;
+    size_t output_length = 0;
+    /* numbers of additional characters needed for escaping */
+    size_t escape_characters = 0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* empty string */
+    if (input == NULL)
+    {
+        output = ensure(output_buffer, sizeof("\"\""));
+        if (output == NULL)
+        {
+            return false;
+        }
+        strcpy((char*)output, "\"\"");
+
+        return true;
+    }
+
+    /* set "flag" to 1 if something needs to be escaped */
+    for (input_pointer = input; *input_pointer; input_pointer++)
+    {
+        switch (*input_pointer)
+        {
+            case '\"':
+            case '\\':
+            case '\b':
+            case '\f':
+            case '\n':
+            case '\r':
+            case '\t':
+                /* one character escape sequence */
+                escape_characters++;
+                break;
+            default:
+                if (*input_pointer < 32)
+                {
+                    /* UTF-16 escape sequence uXXXX */
+                    escape_characters += 5;
+                }
+                break;
+        }
+    }
+    output_length = (size_t)(input_pointer - input) + escape_characters;
+
+    output = ensure(output_buffer, output_length + sizeof("\"\""));
+    if (output == NULL)
+    {
+        return false;
+    }
+
+    /* no characters have to be escaped */
+    if (escape_characters == 0)
+    {
+        output[0] = '\"';
+        memcpy(output + 1, input, output_length);
+        output[output_length + 1] = '\"';
+        output[output_length + 2] = '\0';
+
+        return true;
+    }
+
+    output[0] = '\"';
+    output_pointer = output + 1;
+    /* copy the string */
+    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
+    {
+        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        {
+            /* normal character, copy */
+            *output_pointer = *input_pointer;
+        }
+        else
+        {
+            /* character needs to be escaped */
+            *output_pointer++ = '\\';
+            switch (*input_pointer)
+            {
+                case '\\':
+                    *output_pointer = '\\';
+                    break;
+                case '\"':
+                    *output_pointer = '\"';
+                    break;
+                case '\b':
+                    *output_pointer = 'b';
+                    break;
+                case '\f':
+                    *output_pointer = 'f';
+                    break;
+                case '\n':
+                    *output_pointer = 'n';
+                    break;
+                case '\r':
+                    *output_pointer = 'r';
+                    break;
+                case '\t':
+                    *output_pointer = 't';
+                    break;
+                default:
+                    /* escape and print as unicode codepoint */
+                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
+                    output_pointer += 4;
+                    break;
+            }
+        }
+    }
+    output[output_length + 1] = '\"';
+    output[output_length + 2] = '\0';
+
+    return true;
+}
+
+/* Invoke print_string_ptr (which is useful) on an item. */
+static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
+{
+    return print_string_ptr((unsigned char*)item->valuestring, p);
+}
+
+/* Predeclare these prototypes. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
+
+/* Utility to jump whitespace and cr/lf */
+static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL))
+    {
+        return NULL;
+    }
+
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    {
+       buffer->offset++;
+    }
+
+    if (buffer->offset == buffer->length)
+    {
+        buffer->offset--;
+    }
+
+    return buffer;
+}
+
+/* Parse an object - create a new root, and populate. */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    cJSON *item = NULL;
+
+    /* reset error position */
+    global_error.json = NULL;
+    global_error.position = 0;
+
+    if (value == NULL)
+    {
+        goto fail;
+    }
+
+    buffer.content = (const unsigned char*)value;
+    buffer.length = strlen((const char*)value) + sizeof("");
+    buffer.offset = 0;
+    buffer.hooks = global_hooks;
+
+    item = cJSON_New_Item(&global_hooks);
+    if (item == NULL) /* memory fail */
+    {
+        goto fail;
+    }
+
+    if (!parse_value(item, buffer_skip_whitespace(&buffer)))
+    {
+        /* parse failure. ep is set. */
+        goto fail;
+    }
+
+    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
+    if (require_null_terminated)
+    {
+        buffer_skip_whitespace(&buffer);
+        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
+        {
+            goto fail;
+        }
+    }
+    if (return_parse_end)
+    {
+        *return_parse_end = (const char*)buffer_at_offset(&buffer);
+    }
+
+    return item;
+
+fail:
+    if (item != NULL)
+    {
+        cJSON_Delete(item);
+    }
+
+    if (value != NULL)
+    {
+        error local_error;
+        local_error.json = (const unsigned char*)value;
+        local_error.position = 0;
+
+        if (buffer.offset < buffer.length)
+        {
+            local_error.position = buffer.offset;
+        }
+        else if (buffer.length > 0)
+        {
+            local_error.position = buffer.length - 1;
+        }
+
+        if (return_parse_end != NULL)
+        {
+            *return_parse_end = (const char*)local_error.json + local_error.position;
+        }
+ 
+        global_error = local_error;
+    }
+
+    return NULL;
+}
+
+/* Default options for cJSON_Parse */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
+{
+    return cJSON_ParseWithOpts(value, 0, 0);
+}
+
+#define cjson_min(a, b) ((a < b) ? a : b)
+
+static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
+{
+    printbuffer buffer[1];
+    unsigned char *printed = NULL;
+
+    memset(buffer, 0, sizeof(buffer));
+
+    /* create buffer */
+    buffer->buffer = (unsigned char*) hooks->allocate(256);
+    buffer->format = format;
+    buffer->hooks = *hooks;
+    if (buffer->buffer == NULL)
+    {
+        goto fail;
+    }
+
+    /* print the value */
+    if (!print_value(item, buffer))
+    {
+        goto fail;
+    }
+    update_offset(buffer);
+
+    /* check if reallocate is available */
+    if (hooks->reallocate != NULL)
+    {
+        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->length);
+        buffer->buffer = NULL;
+        if (printed == NULL) {
+            goto fail;
+        }
+    }
+    else /* otherwise copy the JSON over to a new buffer */
+    {
+        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
+        if (printed == NULL)
+        {
+            goto fail;
+        }
+        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
+        printed[buffer->offset] = '\0'; /* just to be sure */
+
+        /* free the buffer */
+        hooks->deallocate(buffer->buffer);
+    }
+
+    return printed;
+
+fail:
+    if (buffer->buffer != NULL)
+    {
+        hooks->deallocate(buffer->buffer);
+    }
+
+    if (printed != NULL)
+    {
+        hooks->deallocate(printed);
+    }
+
+    return NULL;
+}
+
+/* Render a cJSON item/entity/structure to text. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
+{
+    return (char*)print(item, true, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
+{
+    return (char*)print(item, false, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if (prebuffer < 0)
+    {
+        return NULL;
+    }
+
+    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
+    if (!p.buffer)
+    {
+        return NULL;
+    }
+
+    p.length = (size_t)prebuffer;
+    p.offset = 0;
+    p.noalloc = false;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    if (!print_value(item, &p))
+    {
+        global_hooks.deallocate(p.buffer);
+        return NULL;
+    }
+
+    return (char*)p.buffer;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if ((len < 0) || (buf == NULL))
+    {
+        return false;
+    }
+
+    p.buffer = (unsigned char*)buf;
+    p.length = (size_t)len;
+    p.offset = 0;
+    p.noalloc = true;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    return print_value(item, &p);
+}
+
+/* Parser core - when encountering text, process appropriately. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
+{
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false; /* no input */
+    }
+
+    /* parse the different types of values */
+    /* null */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    {
+        item->type = cJSON_NULL;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* false */
+    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    {
+        item->type = cJSON_False;
+        input_buffer->offset += 5;
+        return true;
+    }
+    /* true */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    {
+        item->type = cJSON_True;
+        item->valueint = 1;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* string */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
+    {
+        return parse_string(item, input_buffer);
+    }
+    /* number */
+    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
+    {
+        return parse_number(item, input_buffer);
+    }
+    /* array */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
+    {
+        return parse_array(item, input_buffer);
+    }
+    /* object */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
+    {
+        return parse_object(item, input_buffer);
+    }
+
+
+    return false;
+}
+
+/* Render a value to text. */
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output = NULL;
+
+    if ((item == NULL) || (output_buffer == NULL))
+    {
+        return false;
+    }
+
+    switch ((item->type) & 0xFF)
+    {
+        case cJSON_NULL:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "null");
+            return true;
+
+        case cJSON_False:
+            output = ensure(output_buffer, 6);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "false");
+            return true;
+
+        case cJSON_True:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "true");
+            return true;
+
+        case cJSON_Number:
+            return print_number(item, output_buffer);
+
+        case cJSON_Raw:
+        {
+            size_t raw_length = 0;
+            if (item->valuestring == NULL)
+            {
+                if (!output_buffer->noalloc)
+                {
+                    output_buffer->hooks.deallocate(output_buffer->buffer);
+                }
+                return false;
+            }
+
+            raw_length = strlen(item->valuestring) + sizeof("");
+            output = ensure(output_buffer, raw_length);
+            if (output == NULL)
+            {
+                return false;
+            }
+            memcpy(output, item->valuestring, raw_length);
+            return true;
+        }
+
+        case cJSON_String:
+            return print_string(item, output_buffer);
+
+        case cJSON_Array:
+            return print_array(item, output_buffer);
+
+        case cJSON_Object:
+            return print_object(item, output_buffer);
+
+        default:
+            return false;
+    }
+}
+
+/* Build an array from input text. */
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* head of the linked list */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (buffer_at_offset(input_buffer)[0] != '[')
+    {
+        /* not an array */
+        goto fail;
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
+    {
+        /* empty array */
+        goto success;
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse next value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
+    {
+        goto fail; /* expected end of array */
+    }
+
+success:
+    input_buffer->depth--;
+
+    item->type = cJSON_Array;
+    item->child = head;
+
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an array to text */
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_element = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output array. */
+    /* opening square bracket */
+    output_pointer = ensure(output_buffer, 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer = '[';
+    output_buffer->offset++;
+    output_buffer->depth++;
+
+    while (current_element != NULL)
+    {
+        if (!print_value(current_element, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+        if (current_element->next)
+        {
+            length = (size_t) (output_buffer->format ? 2 : 1);
+            output_pointer = ensure(output_buffer, length + 1);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            *output_pointer++ = ',';
+            if(output_buffer->format)
+            {
+                *output_pointer++ = ' ';
+            }
+            *output_pointer = '\0';
+            output_buffer->offset += length;
+        }
+        current_element = current_element->next;
+    }
+
+    output_pointer = ensure(output_buffer, 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    *output_pointer++ = ']';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Build an object from the text. */
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* linked list head */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
+    {
+        goto fail; /* not an object */
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
+    {
+        goto success; /* empty object */
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse the name of the child */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_string(current_item, input_buffer))
+        {
+            goto fail; /* faile to parse name */
+        }
+        buffer_skip_whitespace(input_buffer);
+
+        /* swap valuestring and string, because we parsed the name */
+        current_item->string = current_item->valuestring;
+        current_item->valuestring = NULL;
+
+        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
+        {
+            goto fail; /* invalid object */
+        }
+
+        /* parse the value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
+    {
+        goto fail; /* expected end of object */
+    }
+
+success:
+    input_buffer->depth--;
+
+    item->type = cJSON_Object;
+    item->child = head;
+
+    input_buffer->offset++;
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an object to text. */
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_item = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output: */
+    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
+    output_pointer = ensure(output_buffer, length + 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer++ = '{';
+    output_buffer->depth++;
+    if (output_buffer->format)
+    {
+        *output_pointer++ = '\n';
+    }
+    output_buffer->offset += length;
+
+    while (current_item)
+    {
+        if (output_buffer->format)
+        {
+            size_t i;
+            output_pointer = ensure(output_buffer, output_buffer->depth);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            for (i = 0; i < output_buffer->depth; i++)
+            {
+                *output_pointer++ = '\t';
+            }
+            output_buffer->offset += output_buffer->depth;
+        }
+
+        /* print key */
+        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        length = (size_t) (output_buffer->format ? 2 : 1);
+        output_pointer = ensure(output_buffer, length);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        *output_pointer++ = ':';
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\t';
+        }
+        output_buffer->offset += length;
+
+        /* print value */
+        if (!print_value(current_item, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        /* print comma if not last */
+        length = (size_t) ((output_buffer->format ? 1 : 0) + (current_item->next ? 1 : 0));
+        output_pointer = ensure(output_buffer, length + 1);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        if (current_item->next)
+        {
+            *output_pointer++ = ',';
+        }
+
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\n';
+        }
+        *output_pointer = '\0';
+        output_buffer->offset += length;
+
+        current_item = current_item->next;
+    }
+
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    if (output_buffer->format)
+    {
+        size_t i;
+        for (i = 0; i < (output_buffer->depth - 1); i++)
+        {
+            *output_pointer++ = '\t';
+        }
+    }
+    *output_pointer++ = '}';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Get Array size/item / object item. */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
+{
+    cJSON *child = NULL;
+    size_t size = 0;
+
+    if (array == NULL)
+    {
+        return 0;
+    }
+
+    child = array->child;
+
+    while(child != NULL)
+    {
+        size++;
+        child = child->next;
+    }
+
+    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
+
+    return (int)size;
+}
+
+static cJSON* get_array_item(const cJSON *array, size_t index)
+{
+    cJSON *current_child = NULL;
+
+    if (array == NULL)
+    {
+        return NULL;
+    }
+
+    current_child = array->child;
+    while ((current_child != NULL) && (index > 0))
+    {
+        index--;
+        current_child = current_child->next;
+    }
+
+    return current_child;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+{
+    if (index < 0)
+    {
+        return NULL;
+    }
+
+    return get_array_item(array, (size_t)index);
+}
+
+static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
+{
+    cJSON *current_element = NULL;
+
+    if ((object == NULL) || (name == NULL))
+    {
+        return NULL;
+    }
+
+    current_element = object->child;
+    if (case_sensitive)
+    {
+        while ((current_element != NULL) && (strcmp(name, current_element->string) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+    else
+    {
+        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+
+    return current_element;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, false);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
+{
+    return cJSON_GetObjectItem(object, string) ? 1 : 0;
+}
+
+/* Utility for array list handling. */
+static void suffix_object(cJSON *prev, cJSON *item)
+{
+    prev->next = item;
+    item->prev = prev;
+}
+
+/* Utility for handling references. */
+static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
+{
+    cJSON *reference = NULL;
+    if (item == NULL)
+    {
+        return NULL;
+    }
+
+    reference = cJSON_New_Item(hooks);
+    if (reference == NULL)
+    {
+        return NULL;
+    }
+
+    memcpy(reference, item, sizeof(cJSON));
+    reference->string = NULL;
+    reference->type |= cJSON_IsReference;
+    reference->next = reference->prev = NULL;
+    return reference;
+}
+
+/* Add item to array/object. */
+CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item)
+{
+    cJSON *child = NULL;
+
+    if ((item == NULL) || (array == NULL))
+    {
+        return;
+    }
+
+    child = array->child;
+
+    if (child == NULL)
+    {
+        /* list is empty, start new one */
+        array->child = item;
+    }
+    else
+    {
+        /* append to the end */
+        while (child->next)
+        {
+            child = child->next;
+        }
+        suffix_object(child, item);
+    }
+}
+
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if (item == NULL)
+    {
+        return;
+    }
+
+    /* call cJSON_AddItemToObjectCS for code reuse */
+    cJSON_AddItemToObjectCS(object, (char*)cJSON_strdup((const unsigned char*)string, &global_hooks), item);
+    /* remove cJSON_StringIsConst flag */
+    item->type &= ~cJSON_StringIsConst;
+}
+
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic push
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+
+/* Add an item to an object with constant string as key */
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
+{
+    if ((item == NULL) || (string == NULL))
+    {
+        return;
+    }
+    if (!(item->type & cJSON_StringIsConst) && item->string)
+    {
+        global_hooks.deallocate(item->string);
+    }
+    item->string = (char*)string;
+    item->type |= cJSON_StringIsConst;
+    cJSON_AddItemToArray(object, item);
+}
+#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic pop
+#endif
+
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
+{
+    if (array == NULL)
+    {
+        return;
+    }
+
+    cJSON_AddItemToArray(array, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if ((object == NULL) || (string == NULL))
+    {
+        return;
+    }
+
+    cJSON_AddItemToObject(object, string, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
+{
+    if ((parent == NULL) || (item == NULL))
+    {
+        return NULL;
+    }
+
+    if (item->prev != NULL)
+    {
+        /* not the first element */
+        item->prev->next = item->next;
+    }
+    if (item->next != NULL)
+    {
+        /* not the last element */
+        item->next->prev = item->prev;
+    }
+
+    if (item == parent->child)
+    {
+        /* first element */
+        parent->child = item->next;
+    }
+    /* make sure the detached item doesn't point anywhere anymore */
+    item->prev = NULL;
+    item->next = NULL;
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
+{
+    if (which < 0)
+    {
+        return NULL;
+    }
+
+    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
+{
+    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItem(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
+}
+
+/* Replace array/object items with new ones. */
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    cJSON *after_inserted = NULL;
+
+    if (which < 0)
+    {
+        return;
+    }
+
+    after_inserted = get_array_item(array, (size_t)which);
+    if (after_inserted == NULL)
+    {
+        cJSON_AddItemToArray(array, newitem);
+        return;
+    }
+
+    newitem->next = after_inserted;
+    newitem->prev = after_inserted->prev;
+    after_inserted->prev = newitem;
+    if (after_inserted == array->child)
+    {
+        array->child = newitem;
+    }
+    else
+    {
+        newitem->prev->next = newitem;
+    }
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
+{
+    if ((parent == NULL) || (replacement == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (replacement == item)
+    {
+        return true;
+    }
+
+    replacement->next = item->next;
+    replacement->prev = item->prev;
+
+    if (replacement->next != NULL)
+    {
+        replacement->next->prev = replacement;
+    }
+    if (replacement->prev != NULL)
+    {
+        replacement->prev->next = replacement;
+    }
+    if (parent->child == item)
+    {
+        parent->child = replacement;
+    }
+
+    item->next = NULL;
+    item->prev = NULL;
+    cJSON_Delete(item);
+
+    return true;
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    if (which < 0)
+    {
+        return;
+    }
+
+    cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
+}
+
+static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
+{
+    if ((replacement == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    /* replace the name in the replacement */
+    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
+    {
+        cJSON_free(replacement->string);
+    }
+    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+    replacement->type &= ~cJSON_StringIsConst;
+
+    cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
+
+    return true;
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
+{
+    replace_item_in_object(object, string, newitem, false);
+}
+
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
+{
+    replace_item_in_object(object, string, newitem, true);
+}
+
+/* Create basic types: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_NULL;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_True;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool b)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = b ? cJSON_True : cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Number;
+        item->valuedouble = num;
+
+        /* use saturation in case of overflow */
+        if (num >= LLONG_MAX)
+        {
+            item->valueint = LLONG_MAX;
+        }
+        else if (num <= LLONG_MIN)
+        {
+            item->valueint = LLONG_MIN;
+        }
+        else
+        {
+            item->valueint = (int64_t)num;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_String;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Raw;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type=cJSON_Array;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item)
+    {
+        item->type = cJSON_Object;
+    }
+
+    return item;
+}
+
+/* Create Arrays: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if (!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber((double)numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0;a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (strings == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for (i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateString(strings[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p,n);
+        }
+        p = n;
+    }
+
+    return a;
+}
+
+/* Duplication */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
+{
+    cJSON *newitem = NULL;
+    cJSON *child = NULL;
+    cJSON *next = NULL;
+    cJSON *newchild = NULL;
+
+    /* Bail on bad ptr */
+    if (!item)
+    {
+        goto fail;
+    }
+    /* Create new item */
+    newitem = cJSON_New_Item(&global_hooks);
+    if (!newitem)
+    {
+        goto fail;
+    }
+    /* Copy over all vars */
+    newitem->type = item->type & (~cJSON_IsReference);
+    newitem->valueint = item->valueint;
+    newitem->valuedouble = item->valuedouble;
+    if (item->valuestring)
+    {
+        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
+        if (!newitem->valuestring)
+        {
+            goto fail;
+        }
+    }
+    if (item->string)
+    {
+        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
+        if (!newitem->string)
+        {
+            goto fail;
+        }
+    }
+    /* If non-recursive, then we're done! */
+    if (!recurse)
+    {
+        return newitem;
+    }
+    /* Walk the ->next chain for the child. */
+    child = item->child;
+    while (child != NULL)
+    {
+        newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */
+        if (!newchild)
+        {
+            goto fail;
+        }
+        if (next != NULL)
+        {
+            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
+            next->next = newchild;
+            newchild->prev = next;
+            next = newchild;
+        }
+        else
+        {
+            /* Set newitem->child and move to it */
+            newitem->child = newchild;
+            next = newchild;
+        }
+        child = child->next;
+    }
+
+    return newitem;
+
+fail:
+    if (newitem != NULL)
+    {
+        cJSON_Delete(newitem);
+    }
+
+    return NULL;
+}
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json)
+{
+    unsigned char *into = (unsigned char*)json;
+
+    if (json == NULL)
+    {
+        return;
+    }
+
+    while (*json)
+    {
+        if (*json == ' ')
+        {
+            json++;
+        }
+        else if (*json == '\t')
+        {
+            /* Whitespace characters. */
+            json++;
+        }
+        else if (*json == '\r')
+        {
+            json++;
+        }
+        else if (*json=='\n')
+        {
+            json++;
+        }
+        else if ((*json == '/') && (json[1] == '/'))
+        {
+            /* double-slash comments, to end of line. */
+            while (*json && (*json != '\n'))
+            {
+                json++;
+            }
+        }
+        else if ((*json == '/') && (json[1] == '*'))
+        {
+            /* multiline comments. */
+            while (*json && !((*json == '*') && (json[1] == '/')))
+            {
+                json++;
+            }
+            json += 2;
+        }
+        else if (*json == '\"')
+        {
+            /* string literals, which are \" sensitive. */
+            *into++ = (unsigned char)*json++;
+            while (*json && (*json != '\"'))
+            {
+                if (*json == '\\')
+                {
+                    *into++ = (unsigned char)*json++;
+                }
+                *into++ = (unsigned char)*json++;
+            }
+            *into++ = (unsigned char)*json++;
+        }
+        else
+        {
+            /* All other characters. */
+            *into++ = (unsigned char)*json++;
+        }
+    }
+
+    /* and null-terminate. */
+    *into = '\0';
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Invalid;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_False;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xff) == cJSON_True;
+}
+
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & (cJSON_True | cJSON_False)) != 0;
+}
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_NULL;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Number;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_String;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Array;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Object;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Raw;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
+{
+    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)) || cJSON_IsInvalid(a))
+    {
+        return false;
+    }
+
+    /* check if type is valid */
+    switch (a->type & 0xFF)
+    {
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+        case cJSON_Number:
+        case cJSON_String:
+        case cJSON_Raw:
+        case cJSON_Array:
+        case cJSON_Object:
+            break;
+
+        default:
+            return false;
+    }
+
+    /* identical objects are equal */
+    if (a == b)
+    {
+        return true;
+    }
+
+    switch (a->type & 0xFF)
+    {
+        /* in these cases and equal type is enough */
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+            return true;
+
+        case cJSON_Number:
+            if (a->valuedouble == b->valuedouble)
+            {
+                return true;
+            }
+            return false;
+
+        case cJSON_String:
+        case cJSON_Raw:
+            if ((a->valuestring == NULL) || (b->valuestring == NULL))
+            {
+                return false;
+            }
+            if (strcmp(a->valuestring, b->valuestring) == 0)
+            {
+                return true;
+            }
+
+            return false;
+
+        case cJSON_Array:
+        {
+            cJSON *a_element = a->child;
+            cJSON *b_element = b->child;
+
+            for (; (a_element != NULL) && (b_element != NULL);)
+            {
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+
+                a_element = a_element->next;
+                b_element = b_element->next;
+            }
+
+            /* one of the arrays is longer than the other */
+            if (a_element != b_element) {
+                return false;
+            }
+
+            return true;
+        }
+
+        case cJSON_Object:
+        {
+            cJSON *a_element = NULL;
+            cJSON *b_element = NULL;
+            cJSON_ArrayForEach(a_element, a)
+            {
+                /* TODO This has O(n^2) runtime, which is horrible! */
+                b_element = get_object_item(b, a_element->string, case_sensitive);
+                if (b_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            /* doing this twice, once on a and b to prevent true comparison if a subset of b
+             * TODO: Do this the proper way, this is just a fix for now */
+            cJSON_ArrayForEach(b_element, b)
+            {
+                a_element = get_object_item(a, b_element->string, case_sensitive);
+                if (a_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(b_element, a_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
+{
+    return global_hooks.allocate(size);
+}
+
+CJSON_PUBLIC(void) cJSON_free(void *object)
+{
+    global_hooks.deallocate(object);
+}
diff --git a/deps/iconv/CMakeLists.txt b/deps/iconv/CMakeLists.txt
index 944cb400e0c80a92f27aed159a4886ed25d9af6d..286070fa9071f8fcd1949850cec87c1ced3245d7 100644
--- a/deps/iconv/CMakeLists.txt
+++ b/deps/iconv/CMakeLists.txt
@@ -1,9 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   LIST(APPEND SRC iconv.c)
   LIST(APPEND SRC localcharset.c)
   INCLUDE_DIRECTORIES(.)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
   ADD_LIBRARY(iconv ${SRC})
 ENDIF ()
\ No newline at end of file
diff --git a/deps/iconv/iconv.h b/deps/iconv/iconv.h
index 83358ce987d582666569fe57a6379de4d3aa5f74..a461cef544317bfcaf0e8056025a0b997c8e63fd 100644
--- a/deps/iconv/iconv.h
+++ b/deps/iconv/iconv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.
 
    The GNU LIBICONV Library is free software; you can redistribute it
diff --git a/deps/iconv/relocatable.c b/deps/iconv/relocatable.c
index 79906a399c7af9a1e078c4a3e53bd52d0efe8537..5676eb703faac0e2b9511586df3f0f772c0fce6e 100644
--- a/deps/iconv/relocatable.c
+++ b/deps/iconv/relocatable.c
@@ -360,7 +360,7 @@ find_shared_library_fullname ()
 
 		  ungetc (c, fp);
 		  shared_library_fullname = NULL; size = 0;
-		  len = getline (&shared_library_fullname, &size, fp);
+		  len = getline(&shared_library_fullname, &size, fp);
 		  if (len >= 0)
 		    {
 		      /* Success: filled shared_library_fullname.  */
diff --git a/deps/lz4/CMakeLists.txt b/deps/lz4/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c3762ffe730bd9ec8c752e4e0415d0c41306dc77
--- /dev/null
+++ b/deps/lz4/CMakeLists.txt
@@ -0,0 +1,9 @@
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+
+IF (TD_WINDOWS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
+ENDIF()
+
+ADD_LIBRARY(lz4 ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(lz4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
diff --git a/src/inc/lz4.h b/deps/lz4/inc/lz4.h
similarity index 100%
rename from src/inc/lz4.h
rename to deps/lz4/inc/lz4.h
diff --git a/src/util/src/lz4.c b/deps/lz4/src/lz4.c
similarity index 100%
rename from src/util/src/lz4.c
rename to deps/lz4/src/lz4.c
diff --git a/deps/pthread/CMakeLists.txt b/deps/pthread/CMakeLists.txt
index a218d05bab036685b5a3e2e86a75cc5af26eaee5..04e5be7472a9b8cbdb384348697b919bf2dd0ece 100644
--- a/deps/pthread/CMakeLists.txt
+++ b/deps/pthread/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(.)
   LIST(APPEND SRC pthread.c)
   ADD_LIBRARY(pthread ${SRC})
diff --git a/deps/pthread/config.h b/deps/pthread/config.h
index 7331e0775f094fe45add4ba7363c36ec936ad51c..057ecfa04a44dc1dc40d79c3da88e6222228964d 100644
--- a/deps/pthread/config.h
+++ b/deps/pthread/config.h
@@ -8,6 +8,7 @@
  *********************************************************************/
 
 /* We're building the pthreads-win32 library */
+#undef PTW32_BUILD
 #define PTW32_BUILD
 
 /* Do we know about the C type sigset_t? */
diff --git a/deps/pthread/pthread.h b/deps/pthread/pthread.h
index e08bf22abcdfc003505e1a3055c84b0d8fd5cd58..87673398d029fd7804f40746308288720a490ba6 100644
--- a/deps/pthread/pthread.h
+++ b/deps/pthread/pthread.h
@@ -228,6 +228,8 @@ typedef unsigned long ULONG_PTR;
 #include "config.h"
 #endif /* HAVE_PTW32_CONFIG_H */
 
+#include "msvcTime.h"
+
 #if !defined(NEED_FTIME)
 #include <time.h>
 #else /* NEED_FTIME */
diff --git a/deps/pthread/pthread_mutex_consistent.c b/deps/pthread/pthread_mutex_consistent.c
index 3e05635007e2d42106e65ebff8b6c8cd425e53ac..2d68213ce1bd6e1e119c94dbab99dd1a5af4fc51 100644
--- a/deps/pthread/pthread_mutex_consistent.c
+++ b/deps/pthread/pthread_mutex_consistent.c
@@ -1,4 +1,4 @@
-/*
+/*
  * pthread_mutex_consistent.c
  *
  * Description:
diff --git a/deps/pthread/sched.h b/deps/pthread/sched.h
index 8c1096d887a0ddb35bb5adea0e557075f0a95bf7..d9bcc2d27f02080434365e0619cc5e54f7fe8b78 100644
--- a/deps/pthread/sched.h
+++ b/deps/pthread/sched.h
@@ -100,18 +100,19 @@
 #endif
 #endif /* PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX */
 
-#if (defined(__MINGW64__) || defined(__MINGW32__)) || defined(_UWIN)
-# if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX
-/* For pid_t */
-#  include <sys/types.h>
-/* Required by Unix 98 */
-#  include <time.h>
-# else
-   typedef int pid_t;
-# endif
-#else
- typedef int pid_t;
-#endif
+// #if (defined(__MINGW64__) || defined(__MINGW32__)) || defined(_UWIN)
+// # if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX
+// /* For pid_t */
+// #  include <sys/types.h>
+// /* Required by Unix 98 */
+// #  include <time.h>
+// # else
+//    typedef int pid_t;
+// # endif
+// #else
+//  typedef int pid_t;
+// #endif
+#include <sys/msvcTypes.h>
 
 /* Thread scheduling policies */
 
diff --git a/deps/pthread/semaphore.h b/deps/pthread/semaphore.h
index ecc29fc33d289c6c1caff0e57dbd33b321ada563..9714365b613badd1371a1731c0d421f43f633b24 100644
--- a/deps/pthread/semaphore.h
+++ b/deps/pthread/semaphore.h
@@ -99,6 +99,8 @@
 #endif
 #endif /* PTW32_SEMAPHORE_LEVEL >= PTW32_SEMAPHORE_LEVEL_MAX */
 
+#include "sys/msvcTypes.h"
+
 #define _POSIX_SEMAPHORES
 
 #if defined(__cplusplus)
diff --git a/deps/regex/CMakeLists.txt b/deps/regex/CMakeLists.txt
index 8f8396caa45f56ff5759b1f2cc55ae28086be6ab..054b093d07c386d7ff9b0ffc4c05909d79b33129 100644
--- a/deps/regex/CMakeLists.txt
+++ b/deps/regex/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(inc .)
   LIST(APPEND SRC regex.c)
   ADD_LIBRARY(regex ${SRC})
diff --git a/deps/wepoll/CMakeLists.txt b/deps/wepoll/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a81fd782bbc4b05a1158273a7fcc6701bc4d980d
--- /dev/null
+++ b/deps/wepoll/CMakeLists.txt
@@ -0,0 +1,9 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_WINDOWS)
+  INCLUDE_DIRECTORIES(inc)
+  INCLUDE_DIRECTORIES(inc/sys)
+  AUX_SOURCE_DIRECTORY(src SRC)
+  ADD_LIBRARY(wepoll ${SRC})
+ENDIF ()
diff --git a/deps/wepoll/inc/wepoll.h b/deps/wepoll/inc/wepoll.h
new file mode 100644
index 0000000000000000000000000000000000000000..afe2e14a6d17696548d91dd4c1e0fbd633314347
--- /dev/null
+++ b/deps/wepoll/inc/wepoll.h
@@ -0,0 +1,111 @@
+/*
+ * wepoll - epoll for Windows
+ * https://github.com/piscisaureus/wepoll
+ *
+ * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEPOLL_H_
+#define WEPOLL_H_
+
+#define WEPOLL_EXPORT
+
+#include <stdint.h>
+
+enum EPOLL_EVENTS {
+  EPOLLIN      = (int) (1U <<  0),
+  EPOLLPRI     = (int) (1U <<  1),
+  EPOLLOUT     = (int) (1U <<  2),
+  EPOLLERR     = (int) (1U <<  3),
+  EPOLLHUP     = (int) (1U <<  4),
+  EPOLLRDNORM  = (int) (1U <<  6),
+  EPOLLRDBAND  = (int) (1U <<  7),
+  EPOLLWRNORM  = (int) (1U <<  8),
+  EPOLLWRBAND  = (int) (1U <<  9),
+  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
+  EPOLLRDHUP   = (int) (1U << 13),
+  EPOLLONESHOT = (int) (1U << 31)
+};
+
+#define EPOLLIN      (1U <<  0)
+#define EPOLLPRI     (1U <<  1)
+#define EPOLLOUT     (1U <<  2)
+#define EPOLLERR     (1U <<  3)
+#define EPOLLHUP     (1U <<  4)
+#define EPOLLRDNORM  (1U <<  6)
+#define EPOLLRDBAND  (1U <<  7)
+#define EPOLLWRNORM  (1U <<  8)
+#define EPOLLWRBAND  (1U <<  9)
+#define EPOLLMSG     (1U << 10)
+#define EPOLLRDHUP   (1U << 13)
+#define EPOLLONESHOT (1U << 31)
+
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_MOD 2
+#define EPOLL_CTL_DEL 3
+
+typedef void* HANDLE;
+//typedef uintptr_t SOCKET;
+
+typedef union epoll_data {
+  void* ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+  SOCKET sock; /* Windows specific */
+  HANDLE hnd;  /* Windows specific */
+} epoll_data_t;
+
+struct epoll_event {
+  uint32_t events;   /* Epoll events and flags */
+  epoll_data_t data; /* User data variable */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WEPOLL_EXPORT HANDLE epoll_create(int size);
+WEPOLL_EXPORT HANDLE epoll_create1(int flags);
+
+WEPOLL_EXPORT int epoll_close(SOCKET ephnd);
+
+WEPOLL_EXPORT int epoll_ctl(SOCKET ephnd,
+                            int op,
+                            SOCKET sock,
+                            struct epoll_event* event);
+
+WEPOLL_EXPORT int epoll_wait(SOCKET ephnd,
+                             struct epoll_event* events,
+                             int maxevents,
+                             int timeout);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* WEPOLL_H_ */
diff --git a/deps/wepoll/src/wepoll.c b/deps/wepoll/src/wepoll.c
new file mode 100644
index 0000000000000000000000000000000000000000..efe68624e2ef30fa5bb15124f6f877d1ba162d17
--- /dev/null
+++ b/deps/wepoll/src/wepoll.c
@@ -0,0 +1,2258 @@
+/*
+ * wepoll - epoll for Windows
+ * https://github.com/piscisaureus/wepoll
+ *
+ * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define WEPOLL_EXPORT
+
+#include <stdint.h>
+
+enum EPOLL_EVENTS {
+  EPOLLIN      = (int) (1U <<  0),
+  EPOLLPRI     = (int) (1U <<  1),
+  EPOLLOUT     = (int) (1U <<  2),
+  EPOLLERR     = (int) (1U <<  3),
+  EPOLLHUP     = (int) (1U <<  4),
+  EPOLLRDNORM  = (int) (1U <<  6),
+  EPOLLRDBAND  = (int) (1U <<  7),
+  EPOLLWRNORM  = (int) (1U <<  8),
+  EPOLLWRBAND  = (int) (1U <<  9),
+  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
+  EPOLLRDHUP   = (int) (1U << 13),
+  EPOLLONESHOT = (int) (1U << 31)
+};
+
+#define EPOLLIN      (1U <<  0)
+#define EPOLLPRI     (1U <<  1)
+#define EPOLLOUT     (1U <<  2)
+#define EPOLLERR     (1U <<  3)
+#define EPOLLHUP     (1U <<  4)
+#define EPOLLRDNORM  (1U <<  6)
+#define EPOLLRDBAND  (1U <<  7)
+#define EPOLLWRNORM  (1U <<  8)
+#define EPOLLWRBAND  (1U <<  9)
+#define EPOLLMSG     (1U << 10)
+#define EPOLLRDHUP   (1U << 13)
+#define EPOLLONESHOT (1U << 31)
+
+#define EPOLL_CTL_ADD 1
+#define EPOLL_CTL_MOD 2
+#define EPOLL_CTL_DEL 3
+
+typedef void* HANDLE;
+typedef uintptr_t SOCKET;
+
+typedef union epoll_data {
+  void* ptr;
+  int fd;
+  uint32_t u32;
+  uint64_t u64;
+  SOCKET sock; /* Windows specific */
+  HANDLE hnd;  /* Windows specific */
+} epoll_data_t;
+
+struct epoll_event {
+  uint32_t events;   /* Epoll events and flags */
+  epoll_data_t data; /* User data variable */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WEPOLL_EXPORT HANDLE epoll_create(int size);
+WEPOLL_EXPORT HANDLE epoll_create1(int flags);
+
+WEPOLL_EXPORT int epoll_close(SOCKET ephnd);
+
+WEPOLL_EXPORT int epoll_ctl(SOCKET ephnd,
+                            int op,
+                            SOCKET sock,
+                            struct epoll_event* event);
+
+WEPOLL_EXPORT int epoll_wait(SOCKET ephnd,
+                             struct epoll_event* events,
+                             int maxevents,
+                             int timeout);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include <assert.h>
+
+#include <stdlib.h>
+
+#define WEPOLL_INTERNAL static
+#define WEPOLL_INTERNAL_VAR static
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#endif
+
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+
+#define _WIN32_WINNT 0x0600
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#ifndef __GNUC__
+#pragma warning(push, 1)
+#endif
+
+#include <WS2tcpip.h>
+#include <WinSock2.h>
+#include <Windows.h>
+
+#ifndef __GNUC__
+#pragma warning(pop)
+#endif
+
+WEPOLL_INTERNAL int nt_global_init(void);
+
+typedef LONG NTSTATUS;
+typedef NTSTATUS* PNTSTATUS;
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0)
+#endif
+
+#ifndef STATUS_SUCCESS
+#define STATUS_SUCCESS ((NTSTATUS) 0x00000000L)
+#endif
+
+#ifndef STATUS_PENDING
+#define STATUS_PENDING ((NTSTATUS) 0x00000103L)
+#endif
+
+#ifndef STATUS_CANCELLED
+#define STATUS_CANCELLED ((NTSTATUS) 0xC0000120L)
+#endif
+
+#ifndef STATUS_NOT_FOUND
+#define STATUS_NOT_FOUND ((NTSTATUS) 0xC0000225L)
+#endif
+
+typedef struct _IO_STATUS_BLOCK {
+  NTSTATUS Status;
+  ULONG_PTR Information;
+} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
+
+typedef VOID(NTAPI* PIO_APC_ROUTINE)(PVOID ApcContext,
+                                     PIO_STATUS_BLOCK IoStatusBlock,
+                                     ULONG Reserved);
+
+typedef struct _UNICODE_STRING {
+  USHORT Length;
+  USHORT MaximumLength;
+  PWSTR Buffer;
+} UNICODE_STRING, *PUNICODE_STRING;
+
+#define RTL_CONSTANT_STRING(s) \
+  { sizeof(s) - sizeof((s)[0]), sizeof(s), s }
+
+typedef struct _OBJECT_ATTRIBUTES {
+  ULONG Length;
+  HANDLE RootDirectory;
+  PUNICODE_STRING ObjectName;
+  ULONG Attributes;
+  PVOID SecurityDescriptor;
+  PVOID SecurityQualityOfService;
+} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
+
+#define RTL_CONSTANT_OBJECT_ATTRIBUTES(ObjectName, Attributes) \
+  { sizeof(OBJECT_ATTRIBUTES), NULL, ObjectName, Attributes, NULL, NULL }
+
+#ifndef FILE_OPEN
+#define FILE_OPEN 0x00000001UL
+#endif
+
+#define KEYEDEVENT_WAIT 0x00000001UL
+#define KEYEDEVENT_WAKE 0x00000002UL
+#define KEYEDEVENT_ALL_ACCESS \
+  (STANDARD_RIGHTS_REQUIRED | KEYEDEVENT_WAIT | KEYEDEVENT_WAKE)
+
+#define NT_NTDLL_IMPORT_LIST(X)           \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCancelIoFileEx,                     \
+    (HANDLE FileHandle,                   \
+     PIO_STATUS_BLOCK IoRequestToCancel,  \
+     PIO_STATUS_BLOCK IoStatusBlock))     \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCreateFile,                         \
+    (PHANDLE FileHandle,                  \
+     ACCESS_MASK DesiredAccess,           \
+     POBJECT_ATTRIBUTES ObjectAttributes, \
+     PIO_STATUS_BLOCK IoStatusBlock,      \
+     PLARGE_INTEGER AllocationSize,       \
+     ULONG FileAttributes,                \
+     ULONG ShareAccess,                   \
+     ULONG CreateDisposition,             \
+     ULONG CreateOptions,                 \
+     PVOID EaBuffer,                      \
+     ULONG EaLength))                     \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtCreateKeyedEvent,                   \
+    (PHANDLE KeyedEventHandle,            \
+     ACCESS_MASK DesiredAccess,           \
+     POBJECT_ATTRIBUTES ObjectAttributes, \
+     ULONG Flags))                        \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtDeviceIoControlFile,                \
+    (HANDLE FileHandle,                   \
+     HANDLE Event,                        \
+     PIO_APC_ROUTINE ApcRoutine,          \
+     PVOID ApcContext,                    \
+     PIO_STATUS_BLOCK IoStatusBlock,      \
+     ULONG IoControlCode,                 \
+     PVOID InputBuffer,                   \
+     ULONG InputBufferLength,             \
+     PVOID OutputBuffer,                  \
+     ULONG OutputBufferLength))           \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtReleaseKeyedEvent,                  \
+    (HANDLE KeyedEventHandle,             \
+     PVOID KeyValue,                      \
+     BOOLEAN Alertable,                   \
+     PLARGE_INTEGER Timeout))             \
+                                          \
+  X(NTSTATUS,                             \
+    NTAPI,                                \
+    NtWaitForKeyedEvent,                  \
+    (HANDLE KeyedEventHandle,             \
+     PVOID KeyValue,                      \
+     BOOLEAN Alertable,                   \
+     PLARGE_INTEGER Timeout))             \
+                                          \
+  X(ULONG, WINAPI, RtlNtStatusToDosError, (NTSTATUS Status))
+
+#define X(return_type, attributes, name, parameters) \
+  WEPOLL_INTERNAL_VAR return_type(attributes* name) parameters;
+NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+#define AFD_POLL_RECEIVE           0x0001
+#define AFD_POLL_RECEIVE_EXPEDITED 0x0002
+#define AFD_POLL_SEND              0x0004
+#define AFD_POLL_DISCONNECT        0x0008
+#define AFD_POLL_ABORT             0x0010
+#define AFD_POLL_LOCAL_CLOSE       0x0020
+#define AFD_POLL_ACCEPT            0x0080
+#define AFD_POLL_CONNECT_FAIL      0x0100
+
+typedef struct _AFD_POLL_HANDLE_INFO {
+  HANDLE Handle;
+  ULONG Events;
+  NTSTATUS Status;
+} AFD_POLL_HANDLE_INFO, *PAFD_POLL_HANDLE_INFO;
+
+typedef struct _AFD_POLL_INFO {
+  LARGE_INTEGER Timeout;
+  ULONG NumberOfHandles;
+  ULONG Exclusive;
+  AFD_POLL_HANDLE_INFO Handles[1];
+} AFD_POLL_INFO, *PAFD_POLL_INFO;
+
+WEPOLL_INTERNAL int afd_create_helper_handle(HANDLE iocp_handle,
+                                             HANDLE* afd_helper_handle_out);
+
+WEPOLL_INTERNAL int afd_poll(HANDLE afd_helper_handle,
+                             AFD_POLL_INFO* poll_info,
+                             IO_STATUS_BLOCK* io_status_block);
+WEPOLL_INTERNAL int afd_cancel_poll(HANDLE afd_helper_handle,
+                                    IO_STATUS_BLOCK* io_status_block);
+
+#define return_map_error(value) \
+  do {                          \
+    err_map_win_error();        \
+    return (value);             \
+  } while (0)
+
+#define return_set_error(value, error) \
+  do {                                 \
+    err_set_win_error(error);          \
+    return (value);                    \
+  } while (0)
+
+WEPOLL_INTERNAL void err_map_win_error(void);
+WEPOLL_INTERNAL void err_set_win_error(DWORD error);
+WEPOLL_INTERNAL int err_check_handle(HANDLE handle);
+
+#define IOCTL_AFD_POLL 0x00012024
+
+static UNICODE_STRING afd__helper_name =
+    RTL_CONSTANT_STRING(L"\\Device\\Afd\\Wepoll");
+
+static OBJECT_ATTRIBUTES afd__helper_attributes =
+    RTL_CONSTANT_OBJECT_ATTRIBUTES(&afd__helper_name, 0);
+
+int afd_create_helper_handle(HANDLE iocp_handle,
+                             HANDLE* afd_helper_handle_out) {
+  HANDLE afd_helper_handle;
+  IO_STATUS_BLOCK iosb;
+  NTSTATUS status;
+
+  /* By opening \Device\Afd without specifying any extended attributes, we'll
+   * get a handle that lets us talk to the AFD driver, but that doesn't have an
+   * associated endpoint (so it's not a socket). */
+  status = NtCreateFile(&afd_helper_handle,
+                        SYNCHRONIZE,
+                        &afd__helper_attributes,
+                        &iosb,
+                        NULL,
+                        0,
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                        FILE_OPEN,
+                        0,
+                        NULL,
+                        0);
+  if (status != STATUS_SUCCESS)
+    return_set_error(-1, RtlNtStatusToDosError(status));
+
+  if (CreateIoCompletionPort(afd_helper_handle, iocp_handle, 0, 0) == NULL)
+    goto error;
+
+  if (!SetFileCompletionNotificationModes(afd_helper_handle,
+                                          FILE_SKIP_SET_EVENT_ON_HANDLE))
+    goto error;
+
+  *afd_helper_handle_out = afd_helper_handle;
+  return 0;
+
+error:
+  CloseHandle(afd_helper_handle);
+  return_map_error(-1);
+}
+
+int afd_poll(HANDLE afd_helper_handle,
+             AFD_POLL_INFO* poll_info,
+             IO_STATUS_BLOCK* io_status_block) {
+  NTSTATUS status;
+
+  /* Blocking operation is not supported. */
+  assert(io_status_block != NULL);
+
+  io_status_block->Status = STATUS_PENDING;
+  status = NtDeviceIoControlFile(afd_helper_handle,
+                                 NULL,
+                                 NULL,
+                                 io_status_block,
+                                 io_status_block,
+                                 IOCTL_AFD_POLL,
+                                 poll_info,
+                                 sizeof *poll_info,
+                                 poll_info,
+                                 sizeof *poll_info);
+
+  if (status == STATUS_SUCCESS)
+    return 0;
+  else if (status == STATUS_PENDING)
+    return_set_error(-1, ERROR_IO_PENDING);
+  else
+    return_set_error(-1, RtlNtStatusToDosError(status));
+}
+
+int afd_cancel_poll(HANDLE afd_helper_handle,
+                    IO_STATUS_BLOCK* io_status_block) {
+  NTSTATUS cancel_status;
+  IO_STATUS_BLOCK cancel_iosb;
+
+  /* If the poll operation has already completed or has been cancelled earlier,
+   * there's nothing left for us to do. */
+  if (io_status_block->Status != STATUS_PENDING)
+    return 0;
+
+  cancel_status =
+      NtCancelIoFileEx(afd_helper_handle, io_status_block, &cancel_iosb);
+
+  /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed
+   * just before calling NtCancelIoFileEx(). This is not an error. */
+  if (cancel_status == STATUS_SUCCESS || cancel_status == STATUS_NOT_FOUND)
+    return 0;
+  else
+    return_set_error(-1, RtlNtStatusToDosError(cancel_status));
+}
+
+WEPOLL_INTERNAL int epoll_global_init(void);
+
+WEPOLL_INTERNAL int init(void);
+
+typedef struct port_state port_state_t;
+typedef struct queue queue_t;
+typedef struct sock_state sock_state_t;
+typedef struct ts_tree_node ts_tree_node_t;
+
+WEPOLL_INTERNAL port_state_t* port_new(HANDLE* iocp_handle_out);
+WEPOLL_INTERNAL int port_close(port_state_t* port_state);
+WEPOLL_INTERNAL int port_delete(port_state_t* port_state);
+
+WEPOLL_INTERNAL int port_wait(port_state_t* port_state,
+                              struct epoll_event* events,
+                              int maxevents,
+                              int timeout);
+
+WEPOLL_INTERNAL int port_ctl(port_state_t* port_state,
+                             int op,
+                             SOCKET sock,
+                             struct epoll_event* ev);
+
+WEPOLL_INTERNAL int port_register_socket(port_state_t* port_state,
+                                         sock_state_t* sock_state,
+                                         SOCKET socket);
+WEPOLL_INTERNAL void port_unregister_socket(port_state_t* port_state,
+                                            sock_state_t* sock_state);
+WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
+                                               SOCKET socket);
+
+WEPOLL_INTERNAL void port_request_socket_update(port_state_t* port_state,
+                                                sock_state_t* sock_state);
+WEPOLL_INTERNAL void port_cancel_socket_update(port_state_t* port_state,
+                                               sock_state_t* sock_state);
+
+WEPOLL_INTERNAL void port_add_deleted_socket(port_state_t* port_state,
+                                             sock_state_t* sock_state);
+WEPOLL_INTERNAL void port_remove_deleted_socket(port_state_t* port_state,
+                                                sock_state_t* sock_state);
+
+WEPOLL_INTERNAL HANDLE port_get_iocp_handle(port_state_t* port_state);
+WEPOLL_INTERNAL queue_t* port_get_poll_group_queue(port_state_t* port_state);
+
+WEPOLL_INTERNAL port_state_t* port_state_from_handle_tree_node(
+    ts_tree_node_t* tree_node);
+WEPOLL_INTERNAL ts_tree_node_t* port_state_to_handle_tree_node(
+    port_state_t* port_state);
+
+/* The reflock is a special kind of lock that normally prevents a chunk of
+ * memory from being freed, but does allow the chunk of memory to eventually be
+ * released in a coordinated fashion.
+ *
+ * Under normal operation, threads increase and decrease the reference count,
+ * which are wait-free operations.
+ *
+ * Exactly once during the reflock's lifecycle, a thread holding a reference to
+ * the lock may "destroy" the lock; this operation blocks until all other
+ * threads holding a reference to the lock have dereferenced it. After
+ * "destroy" returns, the calling thread may assume that no other threads have
+ * a reference to the lock.
+ *
+ * Attemmpting to lock or destroy a lock after reflock_unref_and_destroy() has
+ * been called is invalid and results in undefined behavior. Therefore the user
+ * should use another lock to guarantee that this can't happen.
+ */
+
+typedef struct reflock {
+  volatile long state; /* 32-bit Interlocked APIs operate on `long` values. */
+} reflock_t;
+
+WEPOLL_INTERNAL int reflock_global_init(void);
+
+WEPOLL_INTERNAL void reflock_init(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_ref(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_unref(reflock_t* reflock);
+WEPOLL_INTERNAL void reflock_unref_and_destroy(reflock_t* reflock);
+
+#include <stdbool.h>
+
+/* N.b.: the tree functions do not set errno or LastError when they fail. Each
+ * of the API functions has at most one failure mode. It is up to the caller to
+ * set an appropriate error code when necessary. */
+
+typedef struct tree tree_t;
+typedef struct tree_node tree_node_t;
+
+typedef struct tree {
+  tree_node_t* root;
+} tree_t;
+
+typedef struct tree_node {
+  tree_node_t* left;
+  tree_node_t* right;
+  tree_node_t* parent;
+  uintptr_t key;
+  bool red;
+} tree_node_t;
+
+WEPOLL_INTERNAL void tree_init(tree_t* tree);
+WEPOLL_INTERNAL void tree_node_init(tree_node_t* node);
+
+WEPOLL_INTERNAL int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key);
+WEPOLL_INTERNAL void tree_del(tree_t* tree, tree_node_t* node);
+
+WEPOLL_INTERNAL tree_node_t* tree_find(const tree_t* tree, uintptr_t key);
+WEPOLL_INTERNAL tree_node_t* tree_root(const tree_t* tree);
+
+typedef struct ts_tree {
+  tree_t tree;
+  SRWLOCK lock;
+} ts_tree_t;
+
+typedef struct ts_tree_node {
+  tree_node_t tree_node;
+  reflock_t reflock;
+} ts_tree_node_t;
+
+WEPOLL_INTERNAL void ts_tree_init(ts_tree_t* rtl);
+WEPOLL_INTERNAL void ts_tree_node_init(ts_tree_node_t* node);
+
+WEPOLL_INTERNAL int ts_tree_add(ts_tree_t* ts_tree,
+                                ts_tree_node_t* node,
+                                uintptr_t key);
+
+WEPOLL_INTERNAL ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree,
+                                                    uintptr_t key);
+WEPOLL_INTERNAL ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree,
+                                                     uintptr_t key);
+
+WEPOLL_INTERNAL void ts_tree_node_unref(ts_tree_node_t* node);
+WEPOLL_INTERNAL void ts_tree_node_unref_and_destroy(ts_tree_node_t* node);
+
+static ts_tree_t epoll__handle_tree;
+
+int epoll_global_init(void) {
+  ts_tree_init(&epoll__handle_tree);
+  return 0;
+}
+
+static HANDLE epoll__create(void) {
+  port_state_t* port_state;
+  HANDLE ephnd;
+  ts_tree_node_t* tree_node;
+
+  if (init() < 0)
+    return NULL;
+
+  port_state = port_new(&ephnd);
+  if (port_state == NULL)
+    return NULL;
+
+  tree_node = port_state_to_handle_tree_node(port_state);
+  if (ts_tree_add(&epoll__handle_tree, tree_node, (uintptr_t) ephnd) < 0) {
+    /* This should never happen. */
+    port_delete(port_state);
+    return_set_error(NULL, ERROR_ALREADY_EXISTS);
+  }
+
+  return ephnd;
+}
+
+HANDLE epoll_create(int size) {
+  if (size <= 0)
+    return_set_error(NULL, ERROR_INVALID_PARAMETER);
+
+  return epoll__create();
+}
+
+HANDLE epoll_create1(int flags) {
+  if (flags != 0)
+    return_set_error(NULL, ERROR_INVALID_PARAMETER);
+
+  return epoll__create();
+}
+
+int epoll_close(SOCKET ephnd) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_del_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  port_close(port_state);
+
+  ts_tree_node_unref_and_destroy(tree_node);
+
+  return port_delete(port_state);
+
+err:
+  err_check_handle((HANDLE)ephnd);
+  return -1;
+}
+
+int epoll_ctl(SOCKET ephnd, int op, SOCKET sock, struct epoll_event* ev) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+  int r;
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  r = port_ctl(port_state, op, sock, ev);
+
+  ts_tree_node_unref(tree_node);
+
+  if (r < 0)
+    goto err;
+
+  return 0;
+
+err:
+  /* On Linux, in the case of epoll_ctl(), EBADF takes priority over other
+   * errors. Wepoll mimics this behavior. */
+  err_check_handle((HANDLE) ephnd);
+  err_check_handle((HANDLE) sock);
+  return -1;
+}
+
+int epoll_wait(SOCKET ephnd,
+               struct epoll_event* events,
+               int maxevents,
+               int timeout) {
+  ts_tree_node_t* tree_node;
+  port_state_t* port_state;
+  int num_events;
+
+  if (maxevents <= 0)
+    return_set_error(-1, ERROR_INVALID_PARAMETER);
+
+  if (init() < 0)
+    return -1;
+
+  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
+  if (tree_node == NULL) {
+    err_set_win_error(ERROR_INVALID_PARAMETER);
+    goto err;
+  }
+
+  port_state = port_state_from_handle_tree_node(tree_node);
+  num_events = port_wait(port_state, events, maxevents, timeout);
+
+  ts_tree_node_unref(tree_node);
+
+  if (num_events < 0)
+    goto err;
+
+  return num_events;
+
+err:
+  err_check_handle((HANDLE) ephnd);
+  return -1;
+}
+
+#include <errno.h>
+
+#define ERR__ERRNO_MAPPINGS(X)               \
+  X(ERROR_ACCESS_DENIED, EACCES)             \
+  X(ERROR_ALREADY_EXISTS, EEXIST)            \
+  X(ERROR_BAD_COMMAND, EACCES)               \
+  X(ERROR_BAD_EXE_FORMAT, ENOEXEC)           \
+  X(ERROR_BAD_LENGTH, EACCES)                \
+  X(ERROR_BAD_NETPATH, ENOENT)               \
+  X(ERROR_BAD_NET_NAME, ENOENT)              \
+  X(ERROR_BAD_NET_RESP, ENETDOWN)            \
+  X(ERROR_BAD_PATHNAME, ENOENT)              \
+  X(ERROR_BROKEN_PIPE, EPIPE)                \
+  X(ERROR_CANNOT_MAKE, EACCES)               \
+  X(ERROR_COMMITMENT_LIMIT, ENOMEM)          \
+  X(ERROR_CONNECTION_ABORTED, ECONNABORTED)  \
+  X(ERROR_CONNECTION_ACTIVE, EISCONN)        \
+  X(ERROR_CONNECTION_REFUSED, ECONNREFUSED)  \
+  X(ERROR_CRC, EACCES)                       \
+  X(ERROR_DIR_NOT_EMPTY, ENOTEMPTY)          \
+  X(ERROR_DISK_FULL, ENOSPC)                 \
+  X(ERROR_DUP_NAME, EADDRINUSE)              \
+  X(ERROR_FILENAME_EXCED_RANGE, ENOENT)      \
+  X(ERROR_FILE_NOT_FOUND, ENOENT)            \
+  X(ERROR_GEN_FAILURE, EACCES)               \
+  X(ERROR_GRACEFUL_DISCONNECT, EPIPE)        \
+  X(ERROR_HOST_DOWN, EHOSTUNREACH)           \
+  X(ERROR_HOST_UNREACHABLE, EHOSTUNREACH)    \
+  X(ERROR_INSUFFICIENT_BUFFER, EFAULT)       \
+  X(ERROR_INVALID_ADDRESS, EADDRNOTAVAIL)    \
+  X(ERROR_INVALID_FUNCTION, EINVAL)          \
+  X(ERROR_INVALID_HANDLE, EBADF)             \
+  X(ERROR_INVALID_NETNAME, EADDRNOTAVAIL)    \
+  X(ERROR_INVALID_PARAMETER, EINVAL)         \
+  X(ERROR_INVALID_USER_BUFFER, EMSGSIZE)     \
+  X(ERROR_IO_PENDING, EINPROGRESS)           \
+  X(ERROR_LOCK_VIOLATION, EACCES)            \
+  X(ERROR_MORE_DATA, EMSGSIZE)               \
+  X(ERROR_NETNAME_DELETED, ECONNABORTED)     \
+  X(ERROR_NETWORK_ACCESS_DENIED, EACCES)     \
+  X(ERROR_NETWORK_BUSY, ENETDOWN)            \
+  X(ERROR_NETWORK_UNREACHABLE, ENETUNREACH)  \
+  X(ERROR_NOACCESS, EFAULT)                  \
+  X(ERROR_NONPAGED_SYSTEM_RESOURCES, ENOMEM) \
+  X(ERROR_NOT_ENOUGH_MEMORY, ENOMEM)         \
+  X(ERROR_NOT_ENOUGH_QUOTA, ENOMEM)          \
+  X(ERROR_NOT_FOUND, ENOENT)                 \
+  X(ERROR_NOT_LOCKED, EACCES)                \
+  X(ERROR_NOT_READY, EACCES)                 \
+  X(ERROR_NOT_SAME_DEVICE, EXDEV)            \
+  X(ERROR_NOT_SUPPORTED, ENOTSUP)            \
+  X(ERROR_NO_MORE_FILES, ENOENT)             \
+  X(ERROR_NO_SYSTEM_RESOURCES, ENOMEM)       \
+  X(ERROR_OPERATION_ABORTED, EINTR)          \
+  X(ERROR_OUT_OF_PAPER, EACCES)              \
+  X(ERROR_PAGED_SYSTEM_RESOURCES, ENOMEM)    \
+  X(ERROR_PAGEFILE_QUOTA, ENOMEM)            \
+  X(ERROR_PATH_NOT_FOUND, ENOENT)            \
+  X(ERROR_PIPE_NOT_CONNECTED, EPIPE)         \
+  X(ERROR_PORT_UNREACHABLE, ECONNRESET)      \
+  X(ERROR_PROTOCOL_UNREACHABLE, ENETUNREACH) \
+  X(ERROR_REM_NOT_LIST, ECONNREFUSED)        \
+  X(ERROR_REQUEST_ABORTED, EINTR)            \
+  X(ERROR_REQ_NOT_ACCEP, EWOULDBLOCK)        \
+  X(ERROR_SECTOR_NOT_FOUND, EACCES)          \
+  X(ERROR_SEM_TIMEOUT, ETIMEDOUT)            \
+  X(ERROR_SHARING_VIOLATION, EACCES)         \
+  X(ERROR_TOO_MANY_NAMES, ENOMEM)            \
+  X(ERROR_TOO_MANY_OPEN_FILES, EMFILE)       \
+  X(ERROR_UNEXP_NET_ERR, ECONNABORTED)       \
+  X(ERROR_WAIT_NO_CHILDREN, ECHILD)          \
+  X(ERROR_WORKING_SET_QUOTA, ENOMEM)         \
+  X(ERROR_WRITE_PROTECT, EACCES)             \
+  X(ERROR_WRONG_DISK, EACCES)                \
+  X(WSAEACCES, EACCES)                       \
+  X(WSAEADDRINUSE, EADDRINUSE)               \
+  X(WSAEADDRNOTAVAIL, EADDRNOTAVAIL)         \
+  X(WSAEAFNOSUPPORT, EAFNOSUPPORT)           \
+  X(WSAECONNABORTED, ECONNABORTED)           \
+  X(WSAECONNREFUSED, ECONNREFUSED)           \
+  X(WSAECONNRESET, ECONNRESET)               \
+  X(WSAEDISCON, EPIPE)                       \
+  X(WSAEFAULT, EFAULT)                       \
+  X(WSAEHOSTDOWN, EHOSTUNREACH)              \
+  X(WSAEHOSTUNREACH, EHOSTUNREACH)           \
+  X(WSAEINPROGRESS, EBUSY)                   \
+  X(WSAEINTR, EINTR)                         \
+  X(WSAEINVAL, EINVAL)                       \
+  X(WSAEISCONN, EISCONN)                     \
+  X(WSAEMSGSIZE, EMSGSIZE)                   \
+  X(WSAENETDOWN, ENETDOWN)                   \
+  X(WSAENETRESET, EHOSTUNREACH)              \
+  X(WSAENETUNREACH, ENETUNREACH)             \
+  X(WSAENOBUFS, ENOMEM)                      \
+  X(WSAENOTCONN, ENOTCONN)                   \
+  X(WSAENOTSOCK, ENOTSOCK)                   \
+  X(WSAEOPNOTSUPP, EOPNOTSUPP)               \
+  X(WSAEPROCLIM, ENOMEM)                     \
+  X(WSAESHUTDOWN, EPIPE)                     \
+  X(WSAETIMEDOUT, ETIMEDOUT)                 \
+  X(WSAEWOULDBLOCK, EWOULDBLOCK)             \
+  X(WSANOTINITIALISED, ENETDOWN)             \
+  X(WSASYSNOTREADY, ENETDOWN)                \
+  X(WSAVERNOTSUPPORTED, ENOSYS)
+
+static errno_t err__map_win_error_to_errno(DWORD error) {
+  switch (error) {
+#define X(error_sym, errno_sym) \
+  case error_sym:               \
+    return errno_sym;
+    ERR__ERRNO_MAPPINGS(X)
+#undef X
+  }
+  return EINVAL;
+}
+
+void err_map_win_error(void) {
+  errno = err__map_win_error_to_errno(GetLastError());
+}
+
+void err_set_win_error(DWORD error) {
+  SetLastError(error);
+  errno = err__map_win_error_to_errno(error);
+}
+
+int err_check_handle(HANDLE handle) {
+  DWORD flags;
+
+  /* GetHandleInformation() succeeds when passed INVALID_HANDLE_VALUE, so check
+   * for this condition explicitly. */
+  if (handle == INVALID_HANDLE_VALUE)
+    return_set_error(-1, ERROR_INVALID_HANDLE);
+
+  if (!GetHandleInformation(handle, &flags))
+    return_map_error(-1);
+
+  return 0;
+}
+
+#include <stddef.h>
+
+#define array_count(a) (sizeof(a) / (sizeof((a)[0])))
+
+#define container_of(ptr, type, member) \
+  ((type*) ((uintptr_t) (ptr) - offsetof(type, member)))
+
+#define unused_var(v) ((void) (v))
+
+/* Polyfill `inline` for older versions of msvc (up to Visual Studio 2013) */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define inline __inline
+#endif
+
+WEPOLL_INTERNAL int ws_global_init(void);
+WEPOLL_INTERNAL SOCKET ws_get_base_socket(SOCKET socket);
+
+static bool init__done = false;
+static INIT_ONCE init__once = INIT_ONCE_STATIC_INIT;
+
+static BOOL CALLBACK init__once_callback(INIT_ONCE* once,
+                                         void* parameter,
+                                         void** context) {
+  unused_var(once);
+  unused_var(parameter);
+  unused_var(context);
+
+  /* N.b. that initialization order matters here. */
+  if (ws_global_init() < 0 || nt_global_init() < 0 ||
+      reflock_global_init() < 0 || epoll_global_init() < 0)
+    return FALSE;
+
+  init__done = true;
+  return TRUE;
+}
+
+int init(void) {
+  if (!init__done &&
+      !InitOnceExecuteOnce(&init__once, init__once_callback, NULL, NULL))
+    /* `InitOnceExecuteOnce()` itself is infallible, and it doesn't set any
+     * error code when the once-callback returns FALSE. We return -1 here to
+     * indicate that global initialization failed; the failing init function is
+     * resposible for setting `errno` and calling `SetLastError()`. */
+    return -1;
+
+  return 0;
+}
+
+/* Set up a workaround for the following problem:
+ *   FARPROC addr = GetProcAddress(...);
+ *   MY_FUNC func = (MY_FUNC) addr;          <-- GCC 8 warning/error.
+ *   MY_FUNC func = (MY_FUNC) (void*) addr;  <-- MSVC  warning/error.
+ * To compile cleanly with either compiler, do casts with this "bridge" type:
+ *   MY_FUNC func = (MY_FUNC) (nt__fn_ptr_cast_t) addr; */
+#ifdef __GNUC__
+typedef void* nt__fn_ptr_cast_t;
+#else
+typedef FARPROC nt__fn_ptr_cast_t;
+#endif
+
+#define X(return_type, attributes, name, parameters) \
+  WEPOLL_INTERNAL return_type(attributes* name) parameters = NULL;
+NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+int nt_global_init(void) {
+  HMODULE ntdll;
+  FARPROC fn_ptr;
+
+  ntdll = GetModuleHandleW(L"ntdll.dll");
+  if (ntdll == NULL)
+    return -1;
+
+#define X(return_type, attributes, name, parameters) \
+  fn_ptr = GetProcAddress(ntdll, #name);             \
+  if (fn_ptr == NULL)                                \
+    return -1;                                       \
+  name = (return_type(attributes*) parameters)(nt__fn_ptr_cast_t) fn_ptr;
+  NT_NTDLL_IMPORT_LIST(X)
+#undef X
+
+  return 0;
+}
+
+#include <string.h>
+
+typedef struct poll_group poll_group_t;
+
+typedef struct queue_node queue_node_t;
+
+WEPOLL_INTERNAL poll_group_t* poll_group_acquire(port_state_t* port);
+WEPOLL_INTERNAL void poll_group_release(poll_group_t* poll_group);
+
+WEPOLL_INTERNAL void poll_group_delete(poll_group_t* poll_group);
+
+WEPOLL_INTERNAL poll_group_t* poll_group_from_queue_node(
+    queue_node_t* queue_node);
+WEPOLL_INTERNAL HANDLE
+    poll_group_get_afd_helper_handle(poll_group_t* poll_group);
+
+typedef struct queue_node {
+  queue_node_t* prev;
+  queue_node_t* next;
+} queue_node_t;
+
+typedef struct queue {
+  queue_node_t head;
+} queue_t;
+
+WEPOLL_INTERNAL void queue_init(queue_t* queue);
+WEPOLL_INTERNAL void queue_node_init(queue_node_t* node);
+
+WEPOLL_INTERNAL queue_node_t* queue_first(const queue_t* queue);
+WEPOLL_INTERNAL queue_node_t* queue_last(const queue_t* queue);
+
+WEPOLL_INTERNAL void queue_prepend(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_append(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_start(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_end(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_remove(queue_node_t* node);
+
+WEPOLL_INTERNAL bool queue_is_empty(const queue_t* queue);
+WEPOLL_INTERNAL bool queue_is_enqueued(const queue_node_t* node);
+
+static const size_t POLL_GROUP__MAX_GROUP_SIZE = 32;
+
+typedef struct poll_group {
+  port_state_t* port_state;
+  queue_node_t queue_node;
+  HANDLE afd_helper_handle;
+  size_t group_size;
+} poll_group_t;
+
+static poll_group_t* poll_group__new(port_state_t* port_state) {
+  HANDLE iocp_handle = port_get_iocp_handle(port_state);
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+
+  poll_group_t* poll_group = malloc(sizeof *poll_group);
+  if (poll_group == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+
+  memset(poll_group, 0, sizeof *poll_group);
+
+  queue_node_init(&poll_group->queue_node);
+  poll_group->port_state = port_state;
+
+  if (afd_create_helper_handle(iocp_handle, &poll_group->afd_helper_handle) <
+      0) {
+    free(poll_group);
+    return NULL;
+  }
+
+  queue_append(poll_group_queue, &poll_group->queue_node);
+
+  return poll_group;
+}
+
+void poll_group_delete(poll_group_t* poll_group) {
+  assert(poll_group->group_size == 0);
+  CloseHandle(poll_group->afd_helper_handle);
+  queue_remove(&poll_group->queue_node);
+  free(poll_group);
+}
+
+poll_group_t* poll_group_from_queue_node(queue_node_t* queue_node) {
+  return container_of(queue_node, poll_group_t, queue_node);
+}
+
+HANDLE poll_group_get_afd_helper_handle(poll_group_t* poll_group) {
+  return poll_group->afd_helper_handle;
+}
+
+poll_group_t* poll_group_acquire(port_state_t* port_state) {
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+  poll_group_t* poll_group =
+      !queue_is_empty(poll_group_queue)
+          ? container_of(
+                queue_last(poll_group_queue), poll_group_t, queue_node)
+          : NULL;
+
+  if (poll_group == NULL ||
+      poll_group->group_size >= POLL_GROUP__MAX_GROUP_SIZE)
+    poll_group = poll_group__new(port_state);
+  if (poll_group == NULL)
+    return NULL;
+
+  if (++poll_group->group_size == POLL_GROUP__MAX_GROUP_SIZE)
+    queue_move_to_start(poll_group_queue, &poll_group->queue_node);
+
+  return poll_group;
+}
+
+void poll_group_release(poll_group_t* poll_group) {
+  port_state_t* port_state = poll_group->port_state;
+  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
+
+  poll_group->group_size--;
+  assert(poll_group->group_size < POLL_GROUP__MAX_GROUP_SIZE);
+
+  queue_move_to_end(poll_group_queue, &poll_group->queue_node);
+
+  /* Poll groups are currently only freed when the epoll port is closed. */
+}
+
+WEPOLL_INTERNAL sock_state_t* sock_new(port_state_t* port_state,
+                                       SOCKET socket);
+WEPOLL_INTERNAL void sock_delete(port_state_t* port_state,
+                                 sock_state_t* sock_state);
+WEPOLL_INTERNAL void sock_force_delete(port_state_t* port_state,
+                                       sock_state_t* sock_state);
+
+WEPOLL_INTERNAL int sock_set_event(port_state_t* port_state,
+                                   sock_state_t* sock_state,
+                                   const struct epoll_event* ev);
+
+WEPOLL_INTERNAL int sock_update(port_state_t* port_state,
+                                sock_state_t* sock_state);
+WEPOLL_INTERNAL int sock_feed_event(port_state_t* port_state,
+                                    IO_STATUS_BLOCK* io_status_block,
+                                    struct epoll_event* ev);
+
+WEPOLL_INTERNAL sock_state_t* sock_state_from_queue_node(
+    queue_node_t* queue_node);
+WEPOLL_INTERNAL queue_node_t* sock_state_to_queue_node(
+    sock_state_t* sock_state);
+WEPOLL_INTERNAL sock_state_t* sock_state_from_tree_node(
+    tree_node_t* tree_node);
+WEPOLL_INTERNAL tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state);
+
+#define PORT__MAX_ON_STACK_COMPLETIONS 256
+
+typedef struct port_state {
+  HANDLE iocp_handle;
+  tree_t sock_tree;
+  queue_t sock_update_queue;
+  queue_t sock_deleted_queue;
+  queue_t poll_group_queue;
+  ts_tree_node_t handle_tree_node;
+  CRITICAL_SECTION lock;
+  size_t active_poll_count;
+} port_state_t;
+
+static port_state_t* port__alloc(void) {
+  port_state_t* port_state = malloc(sizeof *port_state);
+  if (port_state == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+
+  return port_state;
+}
+
+static void port__free(port_state_t* port) {
+  assert(port != NULL);
+  free(port);
+}
+
+static HANDLE port__create_iocp(void) {
+  HANDLE iocp_handle =
+      CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
+  if (iocp_handle == NULL)
+    return_map_error(NULL);
+
+  return iocp_handle;
+}
+
+port_state_t* port_new(HANDLE* iocp_handle_out) {
+  port_state_t* port_state;
+  HANDLE iocp_handle;
+
+  port_state = port__alloc();
+  if (port_state == NULL)
+    goto err1;
+
+  iocp_handle = port__create_iocp();
+  if (iocp_handle == NULL)
+    goto err2;
+
+  memset(port_state, 0, sizeof *port_state);
+
+  port_state->iocp_handle = iocp_handle;
+  tree_init(&port_state->sock_tree);
+  queue_init(&port_state->sock_update_queue);
+  queue_init(&port_state->sock_deleted_queue);
+  queue_init(&port_state->poll_group_queue);
+  ts_tree_node_init(&port_state->handle_tree_node);
+  InitializeCriticalSection(&port_state->lock);
+
+  *iocp_handle_out = iocp_handle;
+  return port_state;
+
+err2:
+  port__free(port_state);
+err1:
+  return NULL;
+}
+
+static int port__close_iocp(port_state_t* port_state) {
+  HANDLE iocp_handle = port_state->iocp_handle;
+  port_state->iocp_handle = NULL;
+
+  if (!CloseHandle(iocp_handle))
+    return_map_error(-1);
+
+  return 0;
+}
+
+int port_close(port_state_t* port_state) {
+  int result;
+
+  EnterCriticalSection(&port_state->lock);
+  result = port__close_iocp(port_state);
+  LeaveCriticalSection(&port_state->lock);
+
+  return result;
+}
+
+int port_delete(port_state_t* port_state) {
+  tree_node_t* tree_node;
+  queue_node_t* queue_node;
+
+  /* At this point the IOCP port should have been closed. */
+  assert(port_state->iocp_handle == NULL);
+
+  while ((tree_node = tree_root(&port_state->sock_tree)) != NULL) {
+    sock_state_t* sock_state = sock_state_from_tree_node(tree_node);
+    sock_force_delete(port_state, sock_state);
+  }
+
+  while ((queue_node = queue_first(&port_state->sock_deleted_queue)) != NULL) {
+    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
+    sock_force_delete(port_state, sock_state);
+  }
+
+  while ((queue_node = queue_first(&port_state->poll_group_queue)) != NULL) {
+    poll_group_t* poll_group = poll_group_from_queue_node(queue_node);
+    poll_group_delete(poll_group);
+  }
+
+  assert(queue_is_empty(&port_state->sock_update_queue));
+
+  DeleteCriticalSection(&port_state->lock);
+
+  port__free(port_state);
+
+  return 0;
+}
+
+static int port__update_events(port_state_t* port_state) {
+  queue_t* sock_update_queue = &port_state->sock_update_queue;
+
+  /* Walk the queue, submitting new poll requests for every socket that needs
+   * it. */
+  while (!queue_is_empty(sock_update_queue)) {
+    queue_node_t* queue_node = queue_first(sock_update_queue);
+    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
+
+    if (sock_update(port_state, sock_state) < 0)
+      return -1;
+
+    /* sock_update() removes the socket from the update queue. */
+  }
+
+  return 0;
+}
+
+static void port__update_events_if_polling(port_state_t* port_state) {
+  if (port_state->active_poll_count > 0)
+    port__update_events(port_state);
+}
+
+static int port__feed_events(port_state_t* port_state,
+                             struct epoll_event* epoll_events,
+                             OVERLAPPED_ENTRY* iocp_events,
+                             DWORD iocp_event_count) {
+  int epoll_event_count = 0;
+  DWORD i;
+
+  for (i = 0; i < iocp_event_count; i++) {
+    IO_STATUS_BLOCK* io_status_block =
+        (IO_STATUS_BLOCK*) iocp_events[i].lpOverlapped;
+    struct epoll_event* ev = &epoll_events[epoll_event_count];
+
+    epoll_event_count += sock_feed_event(port_state, io_status_block, ev);
+  }
+
+  return epoll_event_count;
+}
+
+static int port__poll(port_state_t* port_state,
+                      struct epoll_event* epoll_events,
+                      OVERLAPPED_ENTRY* iocp_events,
+                      DWORD maxevents,
+                      DWORD timeout) {
+  DWORD completion_count;
+
+  if (port__update_events(port_state) < 0)
+    return -1;
+
+  port_state->active_poll_count++;
+
+  LeaveCriticalSection(&port_state->lock);
+
+  BOOL r = GetQueuedCompletionStatusEx(port_state->iocp_handle,
+                                       iocp_events,
+                                       maxevents,
+                                       &completion_count,
+                                       timeout,
+                                       FALSE);
+
+  EnterCriticalSection(&port_state->lock);
+
+  port_state->active_poll_count--;
+
+  if (!r)
+    return_map_error(-1);
+
+  return port__feed_events(
+      port_state, epoll_events, iocp_events, completion_count);
+}
+
+int port_wait(port_state_t* port_state,
+              struct epoll_event* events,
+              int maxevents,
+              int timeout) {
+  OVERLAPPED_ENTRY stack_iocp_events[PORT__MAX_ON_STACK_COMPLETIONS];
+  OVERLAPPED_ENTRY* iocp_events;
+  uint64_t due = 0;
+  DWORD gqcs_timeout;
+  int result;
+
+  /* Check whether `maxevents` is in range. */
+  if (maxevents <= 0)
+    return_set_error(-1, ERROR_INVALID_PARAMETER);
+
+  /* Decide whether the IOCP completion list can live on the stack, or allocate
+   * memory for it on the heap. */
+  if ((size_t) maxevents <= array_count(stack_iocp_events)) {
+    iocp_events = stack_iocp_events;
+  } else if ((iocp_events =
+                  malloc((size_t) maxevents * sizeof *iocp_events)) == NULL) {
+    iocp_events = stack_iocp_events;
+    maxevents = array_count(stack_iocp_events);
+  }
+
+  /* Compute the timeout for GetQueuedCompletionStatus, and the wait end
+   * time, if the user specified a timeout other than zero or infinite. */
+  if (timeout > 0) {
+    due = GetTickCount64() + (uint64_t) timeout;
+    gqcs_timeout = (DWORD) timeout;
+  } else if (timeout == 0) {
+    gqcs_timeout = 0;
+  } else {
+    gqcs_timeout = INFINITE;
+  }
+
+  EnterCriticalSection(&port_state->lock);
+
+  /* Dequeue completion packets until either at least one interesting event
+   * has been discovered, or the timeout is reached. */
+  for (;;) {
+    uint64_t now;
+
+    result = port__poll(
+        port_state, events, iocp_events, (DWORD) maxevents, gqcs_timeout);
+    if (result < 0 || result > 0)
+      break; /* Result, error, or time-out. */
+
+    if (timeout < 0)
+      continue; /* When timeout is negative, never time out. */
+
+    /* Update time. */
+    now = GetTickCount64();
+
+    /* Do not allow the due time to be in the past. */
+    if (now >= due) {
+      SetLastError(WAIT_TIMEOUT);
+      break;
+    }
+
+    /* Recompute time-out argument for GetQueuedCompletionStatus. */
+    gqcs_timeout = (DWORD)(due - now);
+  }
+
+  port__update_events_if_polling(port_state);
+
+  LeaveCriticalSection(&port_state->lock);
+
+  if (iocp_events != stack_iocp_events)
+    free(iocp_events);
+
+  if (result >= 0)
+    return result;
+  else if (GetLastError() == WAIT_TIMEOUT)
+    return 0;
+  else
+    return -1;
+}
+
+static int port__ctl_add(port_state_t* port_state,
+                         SOCKET sock,
+                         struct epoll_event* ev) {
+  sock_state_t* sock_state = sock_new(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  if (sock_set_event(port_state, sock_state, ev) < 0) {
+    sock_delete(port_state, sock_state);
+    return -1;
+  }
+
+  port__update_events_if_polling(port_state);
+
+  return 0;
+}
+
+static int port__ctl_mod(port_state_t* port_state,
+                         SOCKET sock,
+                         struct epoll_event* ev) {
+  sock_state_t* sock_state = port_find_socket(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  if (sock_set_event(port_state, sock_state, ev) < 0)
+    return -1;
+
+  port__update_events_if_polling(port_state);
+
+  return 0;
+}
+
+static int port__ctl_del(port_state_t* port_state, SOCKET sock) {
+  sock_state_t* sock_state = port_find_socket(port_state, sock);
+  if (sock_state == NULL)
+    return -1;
+
+  sock_delete(port_state, sock_state);
+
+  return 0;
+}
+
+static int port__ctl_op(port_state_t* port_state,
+                        int op,
+                        SOCKET sock,
+                        struct epoll_event* ev) {
+  switch (op) {
+    case EPOLL_CTL_ADD:
+      return port__ctl_add(port_state, sock, ev);
+    case EPOLL_CTL_MOD:
+      return port__ctl_mod(port_state, sock, ev);
+    case EPOLL_CTL_DEL:
+      return port__ctl_del(port_state, sock);
+    default:
+      return_set_error(-1, ERROR_INVALID_PARAMETER);
+  }
+}
+
+int port_ctl(port_state_t* port_state,
+             int op,
+             SOCKET sock,
+             struct epoll_event* ev) {
+  int result;
+
+  EnterCriticalSection(&port_state->lock);
+  result = port__ctl_op(port_state, op, sock, ev);
+  LeaveCriticalSection(&port_state->lock);
+
+  return result;
+}
+
+int port_register_socket(port_state_t* port_state,
+                         sock_state_t* sock_state,
+                         SOCKET socket) {
+  if (tree_add(&port_state->sock_tree,
+               sock_state_to_tree_node(sock_state),
+               socket) < 0)
+    return_set_error(-1, ERROR_ALREADY_EXISTS);
+  return 0;
+}
+
+void port_unregister_socket(port_state_t* port_state,
+                            sock_state_t* sock_state) {
+  tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
+}
+
+sock_state_t* port_find_socket(port_state_t* port_state, SOCKET socket) {
+  tree_node_t* tree_node = tree_find(&port_state->sock_tree, socket);
+  if (tree_node == NULL)
+    return_set_error(NULL, ERROR_NOT_FOUND);
+  return sock_state_from_tree_node(tree_node);
+}
+
+void port_request_socket_update(port_state_t* port_state,
+                                sock_state_t* sock_state) {
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_append(&port_state->sock_update_queue,
+               sock_state_to_queue_node(sock_state));
+}
+
+void port_cancel_socket_update(port_state_t* port_state,
+                               sock_state_t* sock_state) {
+  unused_var(port_state);
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_remove(sock_state_to_queue_node(sock_state));
+}
+
+void port_add_deleted_socket(port_state_t* port_state,
+                             sock_state_t* sock_state) {
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_append(&port_state->sock_deleted_queue,
+               sock_state_to_queue_node(sock_state));
+}
+
+void port_remove_deleted_socket(port_state_t* port_state,
+                                sock_state_t* sock_state) {
+  unused_var(port_state);
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
+    return;
+  queue_remove(sock_state_to_queue_node(sock_state));
+}
+
+HANDLE port_get_iocp_handle(port_state_t* port_state) {
+  assert(port_state->iocp_handle != NULL);
+  return port_state->iocp_handle;
+}
+
+queue_t* port_get_poll_group_queue(port_state_t* port_state) {
+  return &port_state->poll_group_queue;
+}
+
+port_state_t* port_state_from_handle_tree_node(ts_tree_node_t* tree_node) {
+  return container_of(tree_node, port_state_t, handle_tree_node);
+}
+
+ts_tree_node_t* port_state_to_handle_tree_node(port_state_t* port_state) {
+  return &port_state->handle_tree_node;
+}
+
+void queue_init(queue_t* queue) {
+  queue_node_init(&queue->head);
+}
+
+void queue_node_init(queue_node_t* node) {
+  node->prev = node;
+  node->next = node;
+}
+
+static inline void queue__detach_node(queue_node_t* node) {
+  node->prev->next = node->next;
+  node->next->prev = node->prev;
+}
+
+queue_node_t* queue_first(const queue_t* queue) {
+  return !queue_is_empty(queue) ? queue->head.next : NULL;
+}
+
+queue_node_t* queue_last(const queue_t* queue) {
+  return !queue_is_empty(queue) ? queue->head.prev : NULL;
+}
+
+void queue_prepend(queue_t* queue, queue_node_t* node) {
+  node->next = queue->head.next;
+  node->prev = &queue->head;
+  node->next->prev = node;
+  queue->head.next = node;
+}
+
+void queue_append(queue_t* queue, queue_node_t* node) {
+  node->next = &queue->head;
+  node->prev = queue->head.prev;
+  node->prev->next = node;
+  queue->head.prev = node;
+}
+
+void queue_move_to_start(queue_t* queue, queue_node_t* node) {
+  queue__detach_node(node);
+  queue_prepend(queue, node);
+}
+
+void queue_move_to_end(queue_t* queue, queue_node_t* node) {
+  queue__detach_node(node);
+  queue_append(queue, node);
+}
+
+void queue_remove(queue_node_t* node) {
+  queue__detach_node(node);
+  queue_node_init(node);
+}
+
+bool queue_is_empty(const queue_t* queue) {
+  return !queue_is_enqueued(&queue->head);
+}
+
+bool queue_is_enqueued(const queue_node_t* node) {
+  return node->prev != node;
+}
+
+static const long REFLOCK__REF          = (long) 0x00000001;
+static const long REFLOCK__REF_MASK     = (long) 0x0fffffff;
+static const long REFLOCK__DESTROY      = (long) 0x10000000;
+static const long REFLOCK__DESTROY_MASK = (long) 0xf0000000;
+static const long REFLOCK__POISON       = (long) 0x300dead0;
+
+static HANDLE reflock__keyed_event = NULL;
+
+int reflock_global_init(void) {
+  NTSTATUS status = NtCreateKeyedEvent(
+      &reflock__keyed_event, KEYEDEVENT_ALL_ACCESS, NULL, 0);
+  if (status != STATUS_SUCCESS)
+    return_set_error(-1, RtlNtStatusToDosError(status));
+  return 0;
+}
+
+void reflock_init(reflock_t* reflock) {
+  reflock->state = 0;
+}
+
+static void reflock__signal_event(void* address) {
+  NTSTATUS status =
+      NtReleaseKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
+  if (status != STATUS_SUCCESS)
+    abort();
+}
+
+static void reflock__await_event(void* address) {
+  NTSTATUS status =
+      NtWaitForKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
+  if (status != STATUS_SUCCESS)
+    abort();
+}
+
+void reflock_ref(reflock_t* reflock) {
+  long state = InterlockedAdd(&reflock->state, REFLOCK__REF);
+
+  /* Verify that the counter didn't overflow and the lock isn't destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK) == 0);
+  unused_var(state);
+}
+
+void reflock_unref(reflock_t* reflock) {
+  long state = InterlockedAdd(&reflock->state, -REFLOCK__REF);
+
+  /* Verify that the lock was referenced and not already destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK & ~REFLOCK__DESTROY) == 0);
+
+  if (state == REFLOCK__DESTROY)
+    reflock__signal_event(reflock);
+}
+
+void reflock_unref_and_destroy(reflock_t* reflock) {
+  long state =
+      InterlockedAdd(&reflock->state, REFLOCK__DESTROY - REFLOCK__REF);
+  long ref_count = state & REFLOCK__REF_MASK;
+
+  /* Verify that the lock was referenced and not already destroyed. */
+  assert((state & REFLOCK__DESTROY_MASK) == REFLOCK__DESTROY);
+
+  if (ref_count != 0)
+    reflock__await_event(reflock);
+
+  state = InterlockedExchange(&reflock->state, REFLOCK__POISON);
+  assert(state == REFLOCK__DESTROY);
+}
+
+static const uint32_t SOCK__KNOWN_EPOLL_EVENTS =
+    EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM |
+    EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP;
+
+typedef enum sock__poll_status {
+  SOCK__POLL_IDLE = 0,
+  SOCK__POLL_PENDING,
+  SOCK__POLL_CANCELLED
+} sock__poll_status_t;
+
+typedef struct sock_state {
+  IO_STATUS_BLOCK io_status_block;
+  AFD_POLL_INFO poll_info;
+  queue_node_t queue_node;
+  tree_node_t tree_node;
+  poll_group_t* poll_group;
+  SOCKET base_socket;
+  epoll_data_t user_data;
+  uint32_t user_events;
+  uint32_t pending_events;
+  sock__poll_status_t poll_status;
+  bool delete_pending;
+} sock_state_t;
+
+static inline sock_state_t* sock__alloc(void) {
+  sock_state_t* sock_state = malloc(sizeof *sock_state);
+  if (sock_state == NULL)
+    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
+  return sock_state;
+}
+
+static inline void sock__free(sock_state_t* sock_state) {
+  free(sock_state);
+}
+
+static int sock__cancel_poll(sock_state_t* sock_state) {
+  assert(sock_state->poll_status == SOCK__POLL_PENDING);
+
+  if (afd_cancel_poll(poll_group_get_afd_helper_handle(sock_state->poll_group),
+                      &sock_state->io_status_block) < 0)
+    return -1;
+
+  sock_state->poll_status = SOCK__POLL_CANCELLED;
+  sock_state->pending_events = 0;
+  return 0;
+}
+
+sock_state_t* sock_new(port_state_t* port_state, SOCKET socket) {
+  SOCKET base_socket;
+  poll_group_t* poll_group;
+  sock_state_t* sock_state;
+
+  if (socket == 0 || socket == INVALID_SOCKET)
+    return_set_error(NULL, ERROR_INVALID_HANDLE);
+
+  base_socket = ws_get_base_socket(socket);
+  if (base_socket == INVALID_SOCKET)
+    return NULL;
+
+  poll_group = poll_group_acquire(port_state);
+  if (poll_group == NULL)
+    return NULL;
+
+  sock_state = sock__alloc();
+  if (sock_state == NULL)
+    goto err1;
+
+  memset(sock_state, 0, sizeof *sock_state);
+
+  sock_state->base_socket = base_socket;
+  sock_state->poll_group = poll_group;
+
+  tree_node_init(&sock_state->tree_node);
+  queue_node_init(&sock_state->queue_node);
+
+  if (port_register_socket(port_state, sock_state, socket) < 0)
+    goto err2;
+
+  return sock_state;
+
+err2:
+  sock__free(sock_state);
+err1:
+  poll_group_release(poll_group);
+
+  return NULL;
+}
+
+static int sock__delete(port_state_t* port_state,
+                        sock_state_t* sock_state,
+                        bool force) {
+  if (!sock_state->delete_pending) {
+    if (sock_state->poll_status == SOCK__POLL_PENDING)
+      sock__cancel_poll(sock_state);
+
+    port_cancel_socket_update(port_state, sock_state);
+    port_unregister_socket(port_state, sock_state);
+
+    sock_state->delete_pending = true;
+  }
+
+  /* If the poll request still needs to complete, the sock_state object can't
+   * be free()d yet. `sock_feed_event()` or `port_close()` will take care
+   * of this later. */
+  if (force || sock_state->poll_status == SOCK__POLL_IDLE) {
+    /* Free the sock_state now. */
+    port_remove_deleted_socket(port_state, sock_state);
+    poll_group_release(sock_state->poll_group);
+    sock__free(sock_state);
+  } else {
+    /* Free the socket later. */
+    port_add_deleted_socket(port_state, sock_state);
+  }
+
+  return 0;
+}
+
+void sock_delete(port_state_t* port_state, sock_state_t* sock_state) {
+  sock__delete(port_state, sock_state, false);
+}
+
+void sock_force_delete(port_state_t* port_state, sock_state_t* sock_state) {
+  sock__delete(port_state, sock_state, true);
+}
+
+int sock_set_event(port_state_t* port_state,
+                   sock_state_t* sock_state,
+                   const struct epoll_event* ev) {
+  /* EPOLLERR and EPOLLHUP are always reported, even when not requested by the
+   * caller. However they are disabled after a event has been reported for a
+   * socket for which the EPOLLONESHOT flag as set. */
+  uint32_t events = ev->events | EPOLLERR | EPOLLHUP;
+
+  sock_state->user_events = events;
+  sock_state->user_data = ev->data;
+
+  if ((events & SOCK__KNOWN_EPOLL_EVENTS & ~sock_state->pending_events) != 0)
+    port_request_socket_update(port_state, sock_state);
+
+  return 0;
+}
+
+static inline DWORD sock__epoll_events_to_afd_events(uint32_t epoll_events) {
+  /* Always monitor for AFD_POLL_LOCAL_CLOSE, which is triggered when the
+   * socket is closed with closesocket() or CloseHandle(). */
+  DWORD afd_events = AFD_POLL_LOCAL_CLOSE;
+
+  if (epoll_events & (EPOLLIN | EPOLLRDNORM))
+    afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT;
+  if (epoll_events & (EPOLLPRI | EPOLLRDBAND))
+    afd_events |= AFD_POLL_RECEIVE_EXPEDITED;
+  if (epoll_events & (EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND))
+    afd_events |= AFD_POLL_SEND;
+  if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP))
+    afd_events |= AFD_POLL_DISCONNECT;
+  if (epoll_events & EPOLLHUP)
+    afd_events |= AFD_POLL_ABORT;
+  if (epoll_events & EPOLLERR)
+    afd_events |= AFD_POLL_CONNECT_FAIL;
+
+  return afd_events;
+}
+
+static inline uint32_t sock__afd_events_to_epoll_events(DWORD afd_events) {
+  uint32_t epoll_events = 0;
+
+  if (afd_events & (AFD_POLL_RECEIVE | AFD_POLL_ACCEPT))
+    epoll_events |= EPOLLIN | EPOLLRDNORM;
+  if (afd_events & AFD_POLL_RECEIVE_EXPEDITED)
+    epoll_events |= EPOLLPRI | EPOLLRDBAND;
+  if (afd_events & AFD_POLL_SEND)
+    epoll_events |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
+  if (afd_events & AFD_POLL_DISCONNECT)
+    epoll_events |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
+  if (afd_events & AFD_POLL_ABORT)
+    epoll_events |= EPOLLHUP;
+  if (afd_events & AFD_POLL_CONNECT_FAIL)
+    /* Linux reports all these events after connect() has failed. */
+    epoll_events |=
+        EPOLLIN | EPOLLOUT | EPOLLERR | EPOLLRDNORM | EPOLLWRNORM | EPOLLRDHUP;
+
+  return epoll_events;
+}
+
+int sock_update(port_state_t* port_state, sock_state_t* sock_state) {
+  assert(!sock_state->delete_pending);
+
+  if ((sock_state->poll_status == SOCK__POLL_PENDING) &&
+      (sock_state->user_events & SOCK__KNOWN_EPOLL_EVENTS &
+       ~sock_state->pending_events) == 0) {
+    /* All the events the user is interested in are already being monitored by
+     * the pending poll operation. It might spuriously complete because of an
+     * event that we're no longer interested in; when that happens we'll submit
+     * a new poll operation with the updated event mask. */
+
+  } else if (sock_state->poll_status == SOCK__POLL_PENDING) {
+    /* A poll operation is already pending, but it's not monitoring for all the
+     * events that the user is interested in. Therefore, cancel the pending
+     * poll operation; when we receive it's completion package, a new poll
+     * operation will be submitted with the correct event mask. */
+    if (sock__cancel_poll(sock_state) < 0)
+      return -1;
+
+  } else if (sock_state->poll_status == SOCK__POLL_CANCELLED) {
+    /* The poll operation has already been cancelled, we're still waiting for
+     * it to return. For now, there's nothing that needs to be done. */
+
+  } else if (sock_state->poll_status == SOCK__POLL_IDLE) {
+    /* No poll operation is pending; start one. */
+    sock_state->poll_info.Exclusive = FALSE;
+    sock_state->poll_info.NumberOfHandles = 1;
+    sock_state->poll_info.Timeout.QuadPart = INT64_MAX;
+    sock_state->poll_info.Handles[0].Handle = (HANDLE) sock_state->base_socket;
+    sock_state->poll_info.Handles[0].Status = 0;
+    sock_state->poll_info.Handles[0].Events =
+        sock__epoll_events_to_afd_events(sock_state->user_events);
+
+    if (afd_poll(poll_group_get_afd_helper_handle(sock_state->poll_group),
+                 &sock_state->poll_info,
+                 &sock_state->io_status_block) < 0) {
+      switch (GetLastError()) {
+        case ERROR_IO_PENDING:
+          /* Overlapped poll operation in progress; this is expected. */
+          break;
+        case ERROR_INVALID_HANDLE:
+          /* Socket closed; it'll be dropped from the epoll set. */
+          return sock__delete(port_state, sock_state, false);
+        default:
+          /* Other errors are propagated to the caller. */
+          return_map_error(-1);
+      }
+    }
+
+    /* The poll request was successfully submitted. */
+    sock_state->poll_status = SOCK__POLL_PENDING;
+    sock_state->pending_events = sock_state->user_events;
+
+  } else {
+    /* Unreachable. */
+    assert(false);
+  }
+
+  port_cancel_socket_update(port_state, sock_state);
+  return 0;
+}
+
+int sock_feed_event(port_state_t* port_state,
+                    IO_STATUS_BLOCK* io_status_block,
+                    struct epoll_event* ev) {
+  sock_state_t* sock_state =
+      container_of(io_status_block, sock_state_t, io_status_block);
+  AFD_POLL_INFO* poll_info = &sock_state->poll_info;
+  uint32_t epoll_events = 0;
+
+  sock_state->poll_status = SOCK__POLL_IDLE;
+  sock_state->pending_events = 0;
+
+  if (sock_state->delete_pending) {
+    /* Socket has been deleted earlier and can now be freed. */
+    return sock__delete(port_state, sock_state, false);
+
+  } else if (io_status_block->Status == STATUS_CANCELLED) {
+    /* The poll request was cancelled by CancelIoEx. */
+
+  } else if (!NT_SUCCESS(io_status_block->Status)) {
+    /* The overlapped request itself failed in an unexpected way. */
+    epoll_events = EPOLLERR;
+
+  } else if (poll_info->NumberOfHandles < 1) {
+    /* This poll operation succeeded but didn't report any socket events. */
+
+  } else if (poll_info->Handles[0].Events & AFD_POLL_LOCAL_CLOSE) {
+    /* The poll operation reported that the socket was closed. */
+    return sock__delete(port_state, sock_state, false);
+
+  } else {
+    /* Events related to our socket were reported. */
+    epoll_events =
+        sock__afd_events_to_epoll_events(poll_info->Handles[0].Events);
+  }
+
+  /* Requeue the socket so a new poll request will be submitted. */
+  port_request_socket_update(port_state, sock_state);
+
+  /* Filter out events that the user didn't ask for. */
+  epoll_events &= sock_state->user_events;
+
+  /* Return if there are no epoll events to report. */
+  if (epoll_events == 0)
+    return 0;
+
+  /* If the the socket has the EPOLLONESHOT flag set, unmonitor all events,
+   * even EPOLLERR and EPOLLHUP. But always keep looking for closed sockets. */
+  if (sock_state->user_events & EPOLLONESHOT)
+    sock_state->user_events = 0;
+
+  ev->data = sock_state->user_data;
+  ev->events = epoll_events;
+  return 1;
+}
+
+sock_state_t* sock_state_from_queue_node(queue_node_t* queue_node) {
+  return container_of(queue_node, sock_state_t, queue_node);
+}
+
+queue_node_t* sock_state_to_queue_node(sock_state_t* sock_state) {
+  return &sock_state->queue_node;
+}
+
+sock_state_t* sock_state_from_tree_node(tree_node_t* tree_node) {
+  return container_of(tree_node, sock_state_t, tree_node);
+}
+
+tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state) {
+  return &sock_state->tree_node;
+}
+
+void ts_tree_init(ts_tree_t* ts_tree) {
+  tree_init(&ts_tree->tree);
+  InitializeSRWLock(&ts_tree->lock);
+}
+
+void ts_tree_node_init(ts_tree_node_t* node) {
+  tree_node_init(&node->tree_node);
+  reflock_init(&node->reflock);
+}
+
+int ts_tree_add(ts_tree_t* ts_tree, ts_tree_node_t* node, uintptr_t key) {
+  int r;
+
+  AcquireSRWLockExclusive(&ts_tree->lock);
+  r = tree_add(&ts_tree->tree, &node->tree_node, key);
+  ReleaseSRWLockExclusive(&ts_tree->lock);
+
+  return r;
+}
+
+static inline ts_tree_node_t* ts_tree__find_node(ts_tree_t* ts_tree,
+                                                 uintptr_t key) {
+  tree_node_t* tree_node = tree_find(&ts_tree->tree, key);
+  if (tree_node == NULL)
+    return NULL;
+
+  return container_of(tree_node, ts_tree_node_t, tree_node);
+}
+
+ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
+  ts_tree_node_t* ts_tree_node;
+
+  AcquireSRWLockExclusive(&ts_tree->lock);
+
+  ts_tree_node = ts_tree__find_node(ts_tree, key);
+  if (ts_tree_node != NULL) {
+    tree_del(&ts_tree->tree, &ts_tree_node->tree_node);
+    reflock_ref(&ts_tree_node->reflock);
+  }
+
+  ReleaseSRWLockExclusive(&ts_tree->lock);
+
+  return ts_tree_node;
+}
+
+ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
+  ts_tree_node_t* ts_tree_node;
+
+  AcquireSRWLockShared(&ts_tree->lock);
+
+  ts_tree_node = ts_tree__find_node(ts_tree, key);
+  if (ts_tree_node != NULL)
+    reflock_ref(&ts_tree_node->reflock);
+
+  ReleaseSRWLockShared(&ts_tree->lock);
+
+  return ts_tree_node;
+}
+
+void ts_tree_node_unref(ts_tree_node_t* node) {
+  reflock_unref(&node->reflock);
+}
+
+void ts_tree_node_unref_and_destroy(ts_tree_node_t* node) {
+  reflock_unref_and_destroy(&node->reflock);
+}
+
+void tree_init(tree_t* tree) {
+  memset(tree, 0, sizeof *tree);
+}
+
+void tree_node_init(tree_node_t* node) {
+  memset(node, 0, sizeof *node);
+}
+
+#define TREE__ROTATE(cis, trans)   \
+  tree_node_t* p = node;           \
+  tree_node_t* q = node->trans;    \
+  tree_node_t* parent = p->parent; \
+                                   \
+  if (parent) {                    \
+    if (parent->left == p)         \
+      parent->left = q;            \
+    else                           \
+      parent->right = q;           \
+  } else {                         \
+    tree->root = q;                \
+  }                                \
+                                   \
+  q->parent = parent;              \
+  p->parent = q;                   \
+  p->trans = q->cis;               \
+  if (p->trans)                    \
+    p->trans->parent = p;          \
+  q->cis = p;
+
+static inline void tree__rotate_left(tree_t* tree, tree_node_t* node) {
+  TREE__ROTATE(left, right)
+}
+
+static inline void tree__rotate_right(tree_t* tree, tree_node_t* node) {
+  TREE__ROTATE(right, left)
+}
+
+#define TREE__INSERT_OR_DESCEND(side) \
+  if (parent->side) {                 \
+    parent = parent->side;            \
+  } else {                            \
+    parent->side = node;              \
+    break;                            \
+  }
+
+#define TREE__REBALANCE_AFTER_INSERT(cis, trans) \
+  tree_node_t* grandparent = parent->parent;     \
+  tree_node_t* uncle = grandparent->trans;       \
+                                                 \
+  if (uncle && uncle->red) {                     \
+    parent->red = uncle->red = false;            \
+    grandparent->red = true;                     \
+    node = grandparent;                          \
+  } else {                                       \
+    if (node == parent->trans) {                 \
+      tree__rotate_##cis(tree, parent);          \
+      node = parent;                             \
+      parent = node->parent;                     \
+    }                                            \
+    parent->red = false;                         \
+    grandparent->red = true;                     \
+    tree__rotate_##trans(tree, grandparent);     \
+  }
+
+int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key) {
+  tree_node_t* parent;
+
+  parent = tree->root;
+  if (parent) {
+    for (;;) {
+      if (key < parent->key) {
+        TREE__INSERT_OR_DESCEND(left)
+      } else if (key > parent->key) {
+        TREE__INSERT_OR_DESCEND(right)
+      } else {
+        return -1;
+      }
+    }
+  } else {
+    tree->root = node;
+  }
+
+  node->key = key;
+  node->left = node->right = NULL;
+  node->parent = parent;
+  node->red = true;
+
+  for (; parent && parent->red; parent = node->parent) {
+    if (parent == parent->parent->left) {
+      TREE__REBALANCE_AFTER_INSERT(left, right)
+    } else {
+      TREE__REBALANCE_AFTER_INSERT(right, left)
+    }
+  }
+  tree->root->red = false;
+
+  return 0;
+}
+
+#define TREE__REBALANCE_AFTER_REMOVE(cis, trans)   \
+  tree_node_t* sibling = parent->trans;            \
+                                                   \
+  if (sibling->red) {                              \
+    sibling->red = false;                          \
+    parent->red = true;                            \
+    tree__rotate_##cis(tree, parent);              \
+    sibling = parent->trans;                       \
+  }                                                \
+  if ((sibling->left && sibling->left->red) ||     \
+      (sibling->right && sibling->right->red)) {   \
+    if (!sibling->trans || !sibling->trans->red) { \
+      sibling->cis->red = false;                   \
+      sibling->red = true;                         \
+      tree__rotate_##trans(tree, sibling);         \
+      sibling = parent->trans;                     \
+    }                                              \
+    sibling->red = parent->red;                    \
+    parent->red = sibling->trans->red = false;     \
+    tree__rotate_##cis(tree, parent);              \
+    node = tree->root;                             \
+    break;                                         \
+  }                                                \
+  sibling->red = true;
+
+void tree_del(tree_t* tree, tree_node_t* node) {
+  tree_node_t* parent = node->parent;
+  tree_node_t* left = node->left;
+  tree_node_t* right = node->right;
+  tree_node_t* next;
+  bool red;
+
+  if (!left) {
+    next = right;
+  } else if (!right) {
+    next = left;
+  } else {
+    next = right;
+    while (next->left)
+      next = next->left;
+  }
+
+  if (parent) {
+    if (parent->left == node)
+      parent->left = next;
+    else
+      parent->right = next;
+  } else {
+    tree->root = next;
+  }
+
+  if (left && right) {
+    red = next->red;
+    next->red = node->red;
+    next->left = left;
+    left->parent = next;
+    if (next != right) {
+      parent = next->parent;
+      next->parent = node->parent;
+      node = next->right;
+      parent->left = node;
+      next->right = right;
+      right->parent = next;
+    } else {
+      next->parent = parent;
+      parent = next;
+      node = next->right;
+    }
+  } else {
+    red = node->red;
+    node = next;
+  }
+
+  if (node)
+    node->parent = parent;
+  if (red)
+    return;
+  if (node && node->red) {
+    node->red = false;
+    return;
+  }
+
+  do {
+    if (node == tree->root)
+      break;
+    if (node == parent->left) {
+      TREE__REBALANCE_AFTER_REMOVE(left, right)
+    } else {
+      TREE__REBALANCE_AFTER_REMOVE(right, left)
+    }
+    node = parent;
+    parent = parent->parent;
+  } while (!node->red);
+
+  if (node)
+    node->red = false;
+}
+
+tree_node_t* tree_find(const tree_t* tree, uintptr_t key) {
+  tree_node_t* node = tree->root;
+  while (node) {
+    if (key < node->key)
+      node = node->left;
+    else if (key > node->key)
+      node = node->right;
+    else
+      return node;
+  }
+  return NULL;
+}
+
+tree_node_t* tree_root(const tree_t* tree) {
+  return tree->root;
+}
+
+#ifndef SIO_BSP_HANDLE_POLL
+#define SIO_BSP_HANDLE_POLL 0x4800001D
+#endif
+
+#ifndef SIO_BASE_HANDLE
+#define SIO_BASE_HANDLE 0x48000022
+#endif
+
+int ws_global_init(void) {
+  int r;
+  WSADATA wsa_data;
+
+  r = WSAStartup(MAKEWORD(2, 2), &wsa_data);
+  if (r != 0)
+    return_set_error(-1, (DWORD) r);
+
+  return 0;
+}
+
+static inline SOCKET ws__ioctl_get_bsp_socket(SOCKET socket, DWORD ioctl) {
+  SOCKET bsp_socket;
+  DWORD bytes;
+
+  if (WSAIoctl(socket,
+               ioctl,
+               NULL,
+               0,
+               &bsp_socket,
+               sizeof bsp_socket,
+               &bytes,
+               NULL,
+               NULL) != SOCKET_ERROR)
+    return bsp_socket;
+  else
+    return INVALID_SOCKET;
+}
+
+SOCKET ws_get_base_socket(SOCKET socket) {
+  SOCKET base_socket;
+  DWORD error;
+
+  for (;;) {
+    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BASE_HANDLE);
+    if (base_socket != INVALID_SOCKET)
+      return base_socket;
+
+    error = GetLastError();
+    if (error == WSAENOTSOCK)
+      return_set_error(INVALID_SOCKET, error);
+
+    /* Even though Microsoft documentation clearly states that LSPs should
+     * never intercept the `SIO_BASE_HANDLE` ioctl [1], Komodia based LSPs do
+     * so anyway, breaking it, with the apparent intention of preventing LSP
+     * bypass [2]. Fortunately they don't handle `SIO_BSP_HANDLE_POLL`, which
+     * we can use to obtain the socket associated with the next protocol chain
+     * entry. If this succeeds, loop around and call `SIO_BASE_HANDLE` again
+     * with the retrieved BSP socket to be sure that we actually got all the
+     * way to the base.
+     *  [1] https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls
+     *  [2] https://www.komodia.com/newwiki/index.php?title=Komodia%27s_Redirector_bug_fixes#Version_2.2.2.6
+     */
+
+    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BSP_HANDLE_POLL);
+    if (base_socket != INVALID_SOCKET && base_socket != socket)
+      socket = base_socket;
+    else
+      return_set_error(INVALID_SOCKET, error);
+  }
+}
diff --git a/deps/zlib-1.2.11/CMakeLists.txt b/deps/zlib-1.2.11/CMakeLists.txt
index c69e54a1b0ed9d7f5ed449f92d760ef3c197e73e..f83aa70085491fb6575c0a6bf93252192cddd040 100644
--- a/deps/zlib-1.2.11/CMakeLists.txt
+++ b/deps/zlib-1.2.11/CMakeLists.txt
@@ -1,8 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(z ${SRC})
-ENDIF ()
+IF (TD_WINDOWS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
+ENDIF()
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_LIBRARY(z ${SRC})
diff --git a/deps/zlib-1.2.11/inc/zconf.h b/deps/zlib-1.2.11/inc/zconf.h
index 97b1e279ef33ff1414be4fb7657006d9b829ec9c..9b83d3a898662f8802154e4bd600cc2dde545756 100644
--- a/deps/zlib-1.2.11/inc/zconf.h
+++ b/deps/zlib-1.2.11/inc/zconf.h
@@ -14,177 +14,177 @@
  * Even better than compiling with -DZ_PREFIX would be to use configure to set
  * this permanently in zconf.h using "./configure --zprefix".
  */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+#define Z_PREFIX_SET
 
 /* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
+#define _dist_code z__dist_code
+#define _length_code z__length_code
+#define _tr_align z__tr_align
+#define _tr_flush_bits z__tr_flush_bits
+#define _tr_flush_block z__tr_flush_block
+#define _tr_init z__tr_init
+#define _tr_stored_block z__tr_stored_block
+#define _tr_tally z__tr_tally
+#define adler32 z_adler32
+#define adler32_combine z_adler32_combine
+#define adler32_combine64 z_adler32_combine64
+#define adler32_z z_adler32_z
+#ifndef Z_SOLO
+#define compress z_compress
+#define compress2 z_compress2
+#define compressBound z_compressBound
+#endif
+#define crc32 z_crc32
+#define crc32_combine z_crc32_combine
+#define crc32_combine64 z_crc32_combine64
+#define crc32_z z_crc32_z
+#define deflate z_deflate
+#define deflateBound z_deflateBound
+#define deflateCopy z_deflateCopy
+#define deflateEnd z_deflateEnd
+#define deflateGetDictionary z_deflateGetDictionary
+#define deflateInit z_deflateInit
+#define deflateInit2 z_deflateInit2
+#define deflateInit2_ z_deflateInit2_
+#define deflateInit_ z_deflateInit_
+#define deflateParams z_deflateParams
+#define deflatePending z_deflatePending
+#define deflatePrime z_deflatePrime
+#define deflateReset z_deflateReset
+#define deflateResetKeep z_deflateResetKeep
+#define deflateSetDictionary z_deflateSetDictionary
+#define deflateSetHeader z_deflateSetHeader
+#define deflateTune z_deflateTune
+#define deflate_copyright z_deflate_copyright
+#define get_crc_table z_get_crc_table
+#ifndef Z_SOLO
+#define gz_error z_gz_error
+#define gz_intmax z_gz_intmax
+#define gz_strwinerror z_gz_strwinerror
+#define gzbuffer z_gzbuffer
+#define gzclearerr z_gzclearerr
+#define gzclose z_gzclose
+#define gzclose_r z_gzclose_r
+#define gzclose_w z_gzclose_w
+#define gzdirect z_gzdirect
+#define gzdopen z_gzdopen
+#define gzeof z_gzeof
+#define gzerror z_gzerror
+#define gzflush z_gzflush
+#define gzfread z_gzfread
+#define gzfwrite z_gzfwrite
+#define gzgetc z_gzgetc
+#define gzgetc_ z_gzgetc_
+#define gzgets z_gzgets
+#define gzoffset z_gzoffset
+#define gzoffset64 z_gzoffset64
+#define gzopen z_gzopen
+#define gzopen64 z_gzopen64
+#ifdef _WIN32
+#define gzopen_w z_gzopen_w
+#endif
+#define gzprintf z_gzprintf
+#define gzputc z_gzputc
+#define gzputs z_gzputs
+#define gzread z_gzread
+#define gzrewind z_gzrewind
+#define gzseek z_gzseek
+#define gzseek64 z_gzseek64
+#define gzsetparams z_gzsetparams
+#define gztell z_gztell
+#define gztell64 z_gztell64
+#define gzungetc z_gzungetc
+#define gzvprintf z_gzvprintf
+#define gzwrite z_gzwrite
+#endif
+#define inflate z_inflate
+#define inflateBack z_inflateBack
+#define inflateBackEnd z_inflateBackEnd
+#define inflateBackInit z_inflateBackInit
+#define inflateBackInit_ z_inflateBackInit_
+#define inflateCodesUsed z_inflateCodesUsed
+#define inflateCopy z_inflateCopy
+#define inflateEnd z_inflateEnd
+#define inflateGetDictionary z_inflateGetDictionary
+#define inflateGetHeader z_inflateGetHeader
+#define inflateInit z_inflateInit
+#define inflateInit2 z_inflateInit2
+#define inflateInit2_ z_inflateInit2_
+#define inflateInit_ z_inflateInit_
+#define inflateMark z_inflateMark
+#define inflatePrime z_inflatePrime
+#define inflateReset z_inflateReset
+#define inflateReset2 z_inflateReset2
+#define inflateResetKeep z_inflateResetKeep
+#define inflateSetDictionary z_inflateSetDictionary
+#define inflateSync z_inflateSync
+#define inflateSyncPoint z_inflateSyncPoint
+#define inflateUndermine z_inflateUndermine
+#define inflateValidate z_inflateValidate
+#define inflate_copyright z_inflate_copyright
+#define inflate_fast z_inflate_fast
+#define inflate_table z_inflate_table
+#ifndef Z_SOLO
+#define uncompress z_uncompress
+#define uncompress2 z_uncompress2
+#endif
+#define zError z_zError
+#ifndef Z_SOLO
+#define zcalloc z_zcalloc
+#define zcfree z_zcfree
+#endif
+#define zlibCompileFlags z_zlibCompileFlags
+#define zlibVersion z_zlibVersion
 
 /* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
+#define Byte z_Byte
+#define Bytef z_Bytef
+#define alloc_func z_alloc_func
+#define charf z_charf
+#define free_func z_free_func
+#ifndef Z_SOLO
+#define gzFile z_gzFile
+#endif
+#define gz_header z_gz_header
+#define gz_headerp z_gz_headerp
+#define in_func z_in_func
+#define intf z_intf
+#define out_func z_out_func
+#define uInt z_uInt
+#define uIntf z_uIntf
+#define uLong z_uLong
+#define uLongf z_uLongf
+#define voidp z_voidp
+#define voidpc z_voidpc
+#define voidpf z_voidpf
 
 /* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
+#define gz_header_s z_gz_header_s
+#define internal_state z_internal_state
 
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
+#define MSDOS
 #endif
 #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
+#define OS2
 #endif
 #if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
+#define WINDOWS
 #endif
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
+#ifndef WIN32
+#define WIN32
+#endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
+#if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#ifndef SYS16BIT
+#define SYS16BIT
+#endif
+#endif
 #endif
 
 /*
@@ -192,73 +192,73 @@
  * than 64k bytes at a time (needed on systems with 16-bit int).
  */
 #ifdef SYS16BIT
-#  define MAXSEG_64K
+#define MAXSEG_64K
 #endif
 #ifdef MSDOS
-#  define UNALIGNED_OK
+#define UNALIGNED_OK
 #endif
 
 #ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
+#ifndef STDC
+#define STDC
+#endif
+#if __STDC_VERSION__ >= 199901L
+#ifndef STDC99
+#define STDC99
+#endif
+#endif
 #endif
 #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
+#define STDC
 #endif
 #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
+#define STDC
 #endif
 
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+#define STDC
 #endif
 
 #ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
+#ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#define const /* note: need a more gentle solution here */
+#endif
 #endif
 
 #if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
+#define z_const const
 #else
-#  define z_const
+#define z_const
 #endif
 
 #ifdef Z_SOLO
-   typedef uint64_t z_size_t;
+typedef uint64_t z_size_t;
+#else
+#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
-#  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 uint64_t z_size_t;
-#  endif
-#  undef z_longlong
+typedef uint64_t z_size_t;
+#endif
+#undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
+#ifdef MAXSEG_64K
+#define MAX_MEM_LEVEL 8
+#else
+#define MAX_MEM_LEVEL 9
+#endif
 #endif
 
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.
@@ -267,7 +267,7 @@
  * gzip.)
  */
 #ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
+#define MAX_WBITS 15 /* 32K LZ77 window */
 #endif
 
 /* The memory requirements for deflate are (in bytes):
@@ -283,22 +283,22 @@
  for small objects.
 */
 
-                        /* Type declarations */
+/* Type declarations */
 
 #ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
+#ifdef STDC
+#define OF(args) args
+#else
+#define OF(args) ()
+#endif
 #endif
 
 #ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#define Z_ARG(args) args
+#else
+#define Z_ARG(args) ()
+#endif
 #endif
 
 /* The following definitions for FAR are needed only for MSDOS mixed
@@ -308,153 +308,153 @@
  * just define FAR to be empty.
  */
 #ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
+#if defined(M_I86SM) || defined(M_I86MM)
+/* MSC small or medium model */
+#define SMALL_MEDIUM
+#ifdef _MSC_VER
+#define FAR _far
+#else
+#define FAR far
+#endif
+#endif
+#if (defined(__SMALL__) || defined(__MEDIUM__))
+/* Turbo C small or medium model */
+#define SMALL_MEDIUM
+#ifdef __BORLANDC__
+#define FAR _far
+#else
+#define FAR far
+#endif
+#endif
 #endif
 
 #if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
+/* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+#ifdef ZLIB_DLL
+#if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#ifdef ZLIB_INTERNAL
+#define ZEXTERN extern __declspec(dllexport)
+#else
+#define ZEXTERN extern __declspec(dllimport)
+#endif
+#endif
+#endif /* ZLIB_DLL */
+       /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+        * define ZLIB_WINAPI.
+        * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+        */
+#ifdef ZLIB_WINAPI
+#ifdef FAR
+#undef FAR
+#endif
+#include <windows.h>
+/* No need for _export, use ZLIB.DEF instead. */
+/* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#define ZEXPORT WINAPI
+#ifdef WIN32
+#define ZEXPORTVA WINAPIV
+#else
+#define ZEXPORTVA FAR CDECL
+#endif
+#endif
+#endif
+
+#if defined(__BEOS__)
+#ifdef ZLIB_DLL
+#ifdef ZLIB_INTERNAL
+#define ZEXPORT __declspec(dllexport)
+#define ZEXPORTVA __declspec(dllexport)
+#else
+#define ZEXPORT __declspec(dllimport)
+#define ZEXPORTVA __declspec(dllimport)
+#endif
+#endif
 #endif
 
 #ifndef ZEXTERN
-#  define ZEXTERN extern
+#define ZEXTERN extern
 #endif
 #ifndef ZEXPORT
-#  define ZEXPORT
+#define ZEXPORT
 #endif
 #ifndef ZEXPORTVA
-#  define ZEXPORTVA
+#define ZEXPORTVA
 #endif
 
 #ifndef FAR
-#  define FAR
+#define FAR
 #endif
 
 #if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
+typedef unsigned char Byte; /* 8 bits */
 #endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef uint64_t  uLong; /* 32 bits or more */
+typedef unsigned int uInt;  /* 16 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 */
-#  define Bytef Byte FAR
+/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#define Bytef Byte FAR
 #else
-   typedef Byte  FAR Bytef;
+typedef Byte FAR    Bytef;
 #endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
 typedef uLong FAR uLongf;
 
 #ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
+typedef void const *voidpc;
+typedef void FAR *voidpf;
+typedef void *    voidp;
 #else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
+typedef Byte const *voidpc;
+typedef Byte FAR *voidpf;
+typedef Byte *    voidp;
 #endif
 
 #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 uint64_t
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
+#include <limits.h>
+#if (UINT_MAX == 0xffffffffUL)
+#define Z_U4 unsigned
+#elif (ULONG_MAX == 0xffffffffUL)
+#define Z_U4 uint64_t
+#elif (USHRT_MAX == 0xffffffffUL)
+#define Z_U4 unsigned short
+#endif
 #endif
 
 #ifdef Z_U4
-   typedef Z_U4 z_crc_t;
+typedef Z_U4 z_crc_t;
 #else
-   typedef uint64_t z_crc_t;
+typedef uint64_t  z_crc_t;
 #endif
 
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
+#if 1 /* was set to #if 1 by ./configure */
+#define Z_HAVE_UNISTD_H
 #endif
 
-#if 1    /* was set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
+#if 1 /* was set to #if 1 by ./configure */
+#define Z_HAVE_STDARG_H
 #endif
 
 #ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
+#ifndef Z_SOLO
+#include <sys/types.h> /* for off_t */
+#endif
 #endif
 
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
+#ifndef Z_SOLO
+#include <stdarg.h> /* for va_list */
+#endif
 #endif
 
 #ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
+#ifndef Z_SOLO
+#include <stddef.h> /* for wchar_t */
+#endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -464,71 +464,76 @@ typedef uLong FAR uLongf;
  * equivalently requesting no 64-bit operations
  */
 #if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
+#undef _LARGEFILE64_SOURCE
 #endif
 
 #if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
+#define Z_HAVE_UNISTD_H
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#if (_WIN64)
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#endif
+#ifdef VMS
+#include <unixio.h> /* for off_t */
+#endif
+#ifndef z_off_t
+#define z_off_t off_t
+#endif
+#endif
 #endif
 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE - 0
+#define Z_LFS64
 #endif
 
 #if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
+#define Z_LARGE64
 #endif
 
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS - 0 == 64 && defined(Z_LFS64)
+#define Z_WANT64
 #endif
 
 #if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#define SEEK_SET 0 /* Seek from beginning of file.  */
+#define SEEK_CUR 1 /* Seek from current position.  */
+#define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
 #endif
 
 #ifndef z_off_t
-#  define z_off_t int64_t
+#define z_off_t int64_t
 #endif
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
+#define z_off64_t off64_t
+#else
+#if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#define z_off64_t __int64
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
+#define z_off64_t z_off_t
+#endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
+#pragma map(deflateInit_, "DEIN")
+#pragma map(deflateInit2_, "DEIN2")
+#pragma map(deflateEnd, "DEEND")
+#pragma map(deflateBound, "DEBND")
+#pragma map(inflateInit_, "ININ")
+#pragma map(inflateInit2_, "ININ2")
+#pragma map(inflateEnd, "INEND")
+#pragma map(inflateSync, "INSY")
+#pragma map(inflateSetDictionary, "INSEDI")
+#pragma map(compressBound, "CMBND")
+#pragma map(inflate_table, "INTABL")
+#pragma map(inflate_fast, "INFA")
+#pragma map(inflate_copyright, "INCOPY")
 #endif
 
 #endif /* ZCONF_H */
diff --git a/deps/zlib-1.2.11/src/zconf.h b/deps/zlib-1.2.11/src/zconf.h
index d71de993e1230fb6c6c1cf3c9e60c9d7f9e4ba7c..361c098281905400d304372852df52989d51f463 100644
--- a/deps/zlib-1.2.11/src/zconf.h
+++ b/deps/zlib-1.2.11/src/zconf.h
@@ -472,7 +472,12 @@ typedef uLong FAR uLongf;
 #endif
 #ifndef Z_SOLO
 #  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#if (_WIN64)
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#endif
 #    ifdef VMS
 #      include <unixio.h>       /* for off_t */
 #    endif
diff --git a/documentation/tdenginedocs-cn/administrator/index.html b/documentation/tdenginedocs-cn/administrator/index.html
index 553313505ffd94a423c690c0b7cc929d9a333737..eaaf04ff95fa69cb3bae47d0e574c4f1931e7719 100644
--- a/documentation/tdenginedocs-cn/administrator/index.html
+++ b/documentation/tdenginedocs-cn/administrator/index.html
@@ -55,7 +55,7 @@
 <li>enableMonitor: 系统监测标志位，0：关闭，1：打开</li>
 <li>logDir: 日志文件目录，缺省是/var/log/taos</li>
 <li>numOfLogLines：日志文件的最大行数</li>
-<li>debugFlag: 系统debug日志开关，131：仅错误和报警信息，135：所有</li>
+<li>debugFlag: 系统debug日志开关，131：仅错误和报警信息，135：调试信息，143：非常详细的调试信息</li>
 </ul>
 <p>不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：</p>
 <ul>
diff --git a/documentation/tdenginedocs-cn/super-table/index.html b/documentation/tdenginedocs-cn/super-table/index.html
index 828a69bb0ceaaefcc526e95042319d565e841d2d..42d54ce7e260a7955f746002091919043dc318ff 100644
--- a/documentation/tdenginedocs-cn/super-table/index.html
+++ b/documentation/tdenginedocs-cn/super-table/index.html
@@ -32,7 +32,7 @@ tags (location binary(20), type int)</code></pre>
 <p>查看数据库内全部STable，及其相关信息，包括STable的名称、创建时间、列数量、标签（TAG）数量、通过该STable建表的数量。 </p></li>
 <li><p>删除超级表</p>
 <pre><code class="mysql language-mysql">DROP TABLE &lt;stable_name&gt;</code></pre>
-<p>Note: 删除STable不会级联删除通过STable创建的表；相反删除STable时要求通过该STable创建的表都已经被删除。</p></li>
+<p>Note: 删除STable时，所有通过该STable创建的表都将被删除。</p></li>
 <li><p>查看属于某STable并满足查询条件的表</p>
 <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>查看属于某STable并满足查询条件的表。说明：TBNAME为关键词，显示通过STable建立的子表表名，查询过程中可以使用针对标签的条件。</p>
diff --git a/documentation/tdenginedocs-en/super-table/index.html b/documentation/tdenginedocs-en/super-table/index.html
index 21e7669a19118fd0bfd9b15693ae38bc66edbb0b..0e47a7bb9b4a170c70f9b484096f3af625865961 100644
--- a/documentation/tdenginedocs-en/super-table/index.html
+++ b/documentation/tdenginedocs-en/super-table/index.html
@@ -73,7 +73,7 @@ INTERVAL(10M)</code></pre>
 <p>It lists the STable's schema and tags</p>
 <a class='anchor' id='Drop-a-STable'></a><h3>Drop a STable</h3>
 <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>
+<p>To delete a STable, all the tables created via this STable will be deleted.</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>
 <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>
diff --git a/documentation/webdocs/markdowndocs/Connector.md b/documentation/webdocs/markdowndocs/Connector.md
index a0433d1f09d7c5f2ec1205f89d2efe638703dc7d..fcd6976cb0ee9dcfe44926db7bb327f09e82e39f 100644
--- a/documentation/webdocs/markdowndocs/Connector.md
+++ b/documentation/webdocs/markdowndocs/Connector.md
@@ -2,6 +2,8 @@
 
 TDengine provides many connectors for development, including C/C++, JAVA, Python, RESTful, Go, Node.JS, etc.
 
+NOTE: All APIs which require a SQL string as parameter, including but not limit to `taos_query`, `taos_query_a`, `taos_subscribe` in the C/C++ Connector and their counterparts in other connectors, can ONLY process one SQL statement at a time. If more than one SQL statements are provided, their behaviors are undefined.
+
 ## C/C++ API
 
 C/C++ APIs are similar to the MySQL APIs. Applications should include TDengine head file _taos.h_ to use C/C++ APIs by adding the following line in code:
@@ -284,7 +286,7 @@ Connection conn = DriverManager.getConnection(jdbcUrl);
 > `6030` is the default port and `log` is the default database for system monitor.
 
 A normal JDBC URL looks as follows:
-`jdbc:TSDB://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
+`jdbc:TAOS://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
 
 values in `{}` are necessary while values in `[]` are optional。Each option in the above URL denotes:
 
diff --git a/documentation/webdocs/markdowndocs/Super Table-ch.md b/documentation/webdocs/markdowndocs/Super Table-ch.md
index e75a8d46c38e3501b2c17b4a05b68c0e8fa4a707..f45f2f91b1ae6cf7e5ab3c8270de5c3c6bca6c97 100644
--- a/documentation/webdocs/markdowndocs/Super Table-ch.md	
+++ b/documentation/webdocs/markdowndocs/Super Table-ch.md	
@@ -1,22 +1,22 @@
 # 超级表STable：多表聚合
 
-TDengine要求每个数据采集点单独建表，这样能极大提高数据的插入/查询性能，但是导致系统中表的数量猛增，让应用对表的维护以及聚合、统计操作难度加大。为降低应用的开发难度，TDengine引入了超级表STable (Super Table)的概念。
+TDengine要求每个数据采集点单独建表。独立建表的模式能够避免写入过程中的同步加锁，因此能够极大地提升数据的插入/查询性能。但是独立建表意味着系统中表的数量与采集点的数量在同一个量级。如果采集点众多，将导致系统中表的数量也非常庞大，让应用对表的维护以及聚合、统计操作难度加大。为降低应用的开发难度，TDengine引入了超级表(Super Table, 简称为STable)的概念。
 
 ## 什么是超级表
 
-STable是同一类型数据采集点的抽象，是同类型采集实例的集合，包含多张数据结构一样的子表。每个STable为其子表定义了表结构和一组标签：表结构即表中记录的数据列及其数据类型；标签名和数据类型由STable定义，标签值记录着每个子表的静态信息，用以对子表进行分组过滤。子表本质上就是普通的表，由一个时间戳主键和若干个数据列组成，每行记录着具体的数据，数据查询操作与普通表完全相同；但子表与普通表的区别在于每个子表从属于一张超级表，并带有一组由STable定义的标签值。每种类型的采集设备可以定义一个STable。数据模型定义表的每列数据的类型，如温度、压力、电压、电流、GPS实时位置等，而标签信息属于Meta Data，如采集设备的序列号、型号、位置等，是静态的，是表的元数据。用户在创建表（数据采集点）时指定STable(采集类型)外，还可以指定标签的值，也可事后增加或修改。
+超级表是同一类型数据采集点的抽象，是同类型采集实例的集合，包含多张数据结构一样的子表。每个STable为其子表定义了表结构和一组标签：表结构即表中记录的数据列及其数据类型；标签名和数据类型由STable定义，标签值记录着每个子表的静态信息，用以对子表进行分组过滤。子表本质上就是普通的表，由一个时间戳主键和若干个数据列组成，每行记录着具体的数据，数据查询操作与普通表完全相同；但子表与普通表的区别在于每个子表从属于一张超级表，并带有一组由STable定义的标签值。每种类型的采集设备可以定义一个STable。数据模型定义表的每列数据的类型，如温度、压力、电压、电流、GPS实时位置等，而标签信息属于Meta Data，如采集设备的序列号、型号、位置等，是静态的，是表的元数据。用户在创建表（数据采集点）时指定STable(采集类型)外，还可以指定标签的值，也可事后增加或修改。
 
 TDengine扩展标准SQL语法用于定义STable，使用关键词tags指定标签信息。语法如下：
 
 ```mysql
-CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…)   TAGS(tag_name tag_type, …) 
+CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …) 
 ```
 
-其中tag_name是标签名，tag_type是标签的数据类型。标签可以使用时间戳之外的其他TDengine支持的数据类型，标签的个数最多为6个，名字不能与系统关键词相同，也不能与其他列名相同。如：
+其中tag_name是标签名，tag_type是标签的数据类型。标签可以使用时间戳之外的其他TDengine支持的数据类型，标签的个数最多为32个，名字不能与系统关键词相同，也不能与其他列名相同。如：
 
 ```mysql
-create table thermometer (ts timestamp, degree float) 
-tags (location binary(20), type int)
+CREATE TABLE thermometer (ts timestamp, degree float) 
+TAGS (location binary(20), type int)
 ```
 
 上述SQL创建了一个名为thermometer的STable，带有标签location和标签type。
@@ -30,7 +30,7 @@ CREATE TABLE <tb_name> USING <stb_name> TAGS (tag_value1,...)
 沿用上面温度计的例子，使用超级表thermometer建立单个温度计数据表的语句如下：
 
 ```mysql
-create table t1 using thermometer tags ('beijing', 10)
+CREATE TABLE t1 USING thermometer TAGS ('beijing', 10)
 ```
 
 上述SQL以thermometer为模板，创建了名为t1的表，这张表的Schema就是thermometer的Schema，但标签location值为'beijing'，标签type值为10。
@@ -53,10 +53,11 @@ STable从属于库，一个STable只属于一个库，但一个库可以有一
 
     说明：
 
-    1. TAGS列总长度不能超过512 bytes；
+    1. TAGS列总长度不能超过16k bytes；
     2. TAGS列的数据类型不能是timestamp；
     3. TAGS列名不能与其他列名相同;
     4. TAGS列名不能为预留关键字. 
+    5. TAGS总数的上限是128.
 
 - 显示已创建的超级表
 
@@ -72,7 +73,7 @@ STable从属于库，一个STable只属于一个库，但一个库可以有一
     DROP TABLE <stable_name>
     ```
 
-    Note: 删除STable不会级联删除通过STable创建的表；相反删除STable时要求通过该STable创建的表都已经被删除。
+    Note: 删除STable时，所有通过该STable创建的表都将被删除。
 
 - 查看属于某STable并满足查询条件的表
 
@@ -114,7 +115,7 @@ INSERT INTO <tb1_name> USING <stb1_name> TAGS (<tag1_value1>, ...) VALUES (<fiel
     ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
     ```
 
-    为STable增加一个新的标签，并指定新标签的类型。标签总数不能超过6个。
+    为STable增加一个新的标签，并指定新标签的类型。标签总数不能超过128个。
 
 - 删除标签
 
@@ -202,7 +203,7 @@ INSERT INTO therm4 VALUES ('2018-01-01 00:00:00.000', 23);
 
 ###3:按标签聚合查询
 
-查询位于北京(beijing)和天津(tianjing)两个地区的温度传感器采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)、最低温度min(degree)，并将结果按所处地域(location)和传感器类型(type)进行聚合。
+查询位于北京(beijing)和天津(tianjin)两个地区的温度传感器采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)、最低温度min(degree)，并将结果按所处地域(location)和传感器类型(type)进行聚合。
 
 ```mysql
 SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
diff --git a/documentation/webdocs/markdowndocs/Super Table.md b/documentation/webdocs/markdowndocs/Super Table.md
index 609dd11bd278da3398330fa33f857fac65ffb3d5..2c1093a3fafd143ada150dc1d743ed49cd665d8c 100644
--- a/documentation/webdocs/markdowndocs/Super Table.md	
+++ b/documentation/webdocs/markdowndocs/Super Table.md	
@@ -22,11 +22,11 @@ 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 
+1. The bytes of all tags together shall be less than 16k 
 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 
+5. Maximum number of tags is 128 
 
 For example:
 
@@ -142,7 +142,7 @@ It lists the STable's schema and tags
 DROP TABLE <stable_name>
 ```
 
-To delete a STable, all the tables created via this STable shall be deleted first, otherwise, it will fail.
+To delete a STable, all the tables created via this STable will be deleted first.
 
 ### List the Associated Tables of a STable
 
@@ -168,7 +168,7 @@ You can add, delete and change the tags for a STable, and you can change the tag
 ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
 ```
 
-It adds a new tag to the STable with a data type. The maximum number of tags is 6. 
+It adds a new tag to the STable with a data type. The maximum number of tags is 128. 
 
 ### Drop a Tag
 
diff --git a/documentation/webdocs/markdowndocs/TAOS SQL-ch.md b/documentation/webdocs/markdowndocs/TAOS SQL-ch.md
index 1e9383c40c22bf645413405b88b72bf78f9e4d4b..e494a1be45a49a0dc83d32c9d5be8d2316c7970b 100644
--- a/documentation/webdocs/markdowndocs/TAOS SQL-ch.md	
+++ b/documentation/webdocs/markdowndocs/TAOS SQL-ch.md	
@@ -63,11 +63,11 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
 | 3    |  BIGINT   | 8      | 长整型，范围 [-2^63+1,   2^63-1], -2^63用于NULL                                 |
 | 4    |   FLOAT   | 4      | 浮点型，有效位数6-7，范围 [-3.4E38, 3.4E38]                  |
 | 5    |  DOUBLE   | 8      | 双精度浮点型，有效位数15-16，范围 [-1.7E308,   1.7E308]      |
-| 6    |  BINARY   | 自定义 | 用于记录字符串，最长不能超过504 bytes。binary仅支持字符串输入，字符串两端使用单引号引用，否则英文全部自动转化为小写。使用时须指定大小，如binary(20)定义了最长为20个字符的字符串，每个字符占1byte的存储空间。如果用户字符串超出20字节，将被自动截断。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示， 即 **\’**。 |
+| 6    |  BINARY   | 自定义 | 用于记录字符串，理论上，最长可以有16374字节，但由于每行数据最多16K字节，实际上限一般小于理论值。 binary仅支持字符串输入，字符串两端使用单引号引用，否则英文全部自动转化为小写。使用时须指定大小，如binary(20)定义了最长为20个字符的字符串，每个字符占1byte的存储空间。如果用户字符串超出20字节将会报错。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示， 即 **\’**。 |
 | 7    | SMALLINT  | 2      | 短整型， 范围 [-32767, 32767], -32768用于NULL                                |
 | 8    |  TINYINT  | 1      | 单字节整型，范围 [-127, 127], -128用于NULL                                |
 | 9    |   BOOL    | 1      | 布尔型，{true,   false}                                      |
-| 10   |   NCHAR   | 自定义 | 用于记录非ASCII字符串，如中文字符。每个nchar字符占用4bytes的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 **\’**。nchar使用时须指定字符串大小，类型为nchar(10)的列表示此列的字符串最多存储10个nchar字符，会固定占用40bytes的空间。如用户字符串长度超出声明长度，则将被自动截断。 |
+| 10   |   NCHAR   | 自定义 | 用于记录非ASCII字符串，如中文字符。每个nchar字符占用4bytes的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 **\’**。nchar使用时须指定字符串大小，类型为nchar(10)的列表示此列的字符串最多存储10个nchar字符，会固定占用40bytes的空间。如用户字符串长度超出声明长度，则将会报错。 |
 
 **Tips**: TDengine对SQL语句中的英文字符不区分大小写，自动转化为小写执行。因此用户大小写敏感的字符串及密码，需要使用单引号将字符串引起来。
 
@@ -106,7 +106,7 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
     ```mysql
     CREATE TABLE [IF NOT EXISTS] tb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...])
     ```
-    说明：1）表的第一个字段必须是TIMESTAMP，并且系统自动将其设为主键；2）表的每行长度不能超过4096字节；3）使用数据类型binary或nchar，需指定其最长的字节数，如binary(20)，表示20字节。
+    说明：1）表的第一个字段必须是TIMESTAMP，并且系统自动将其设为主键；2）表的每行长度不能超过16K字节；3）使用数据类型binary或nchar，需指定其最长的字节数，如binary(20)，表示20字节。
 
 
 - **删除数据表**
@@ -191,9 +191,10 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
     ```
     同时向表tb1_name和tb2_name中按列分别插入多条记录 
 
-注意：对同一张表，插入的新记录的时间戳必须递增，否则会跳过插入该条记录。如果时间戳为0，系统将自动使用服务器当前时间作为该记录的时间戳。
+注意：1、对同一张表，插入的新记录的时间戳必须递增，否则会跳过插入该条记录。如果时间戳为0，系统将自动使用服务器当前时间作为该记录的时间戳。
+      2、允许插入的最老记录的时间戳，是相对于当前服务器时间，减去配置的keep值（数据保留的天数），允许插入的最新记录的时间戳，是相对于当前服务器时间，加上配置的days值（数据文件存储数据的时间跨度，单位为天）。keep和days都是可以在创建数据库时指定的，缺省值分别是3650天和10天。
 
-**IMPORT**：如果需要将时间戳小于最后一条记录时间的记录写入到数据库中，可使用IMPORT替代INSERT命令，IMPORT的语法与INSERT完全一样。如果同时IMPORT多条记录，需要保证一批记录是按时间戳排序好的。
+**IMPORT**：如果需要将时间戳小于最后一条记录时间的记录写入到数据库中，可使用IMPORT替代INSERT命令，IMPORT的语法与INSERT完全一样。
 
 ## 数据查询
 
@@ -401,7 +402,7 @@ count(tbname) |
     SELECT * FROM tb1 WHERE ts >= NOW - 1h
     ```
 
-- 查询表tb1从2018-06-01 08:00:00.000 到2018-06-02 08:00:00.000时间范围，并且clo3的字符串是'nny'结尾的记录，结果按照时间戳降序
+- 查询表tb1从2018-06-01 08:00:00.000 到2018-06-02 08:00:00.000时间范围，并且col3的字符串是'nny'结尾的记录，结果按照时间戳降序
 
     ```mysql
     SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC
@@ -479,9 +480,9 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
 
 - **LEASTSQUARES**
     ```mysql
-    SELECT LEASTSQUARES(field_name) FROM tb_name [WHERE clause]
+    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause]
     ```
-    功能说明：统计表中某列的值是主键（时间戳）的拟合直线方程。  
+    功能说明：统计表中某列的值是主键（时间戳）的拟合直线方程。start_val是自变量初始值，step_val是自变量的步长值。  
     返回结果数据类型：字符串表达式（斜率, 截距）。  
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
     说明：自变量是时间戳，因变量是该列的值。  
@@ -555,7 +556,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     功能说明：统计表中某列的值百分比分位数。  
     返回结果数据类型： 双精度浮点数Double。  
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
-    说明：*k*值取值范围0≤*k*≤100，为0的时候等同于MIN，为100的时候等同于MAX。
+    说明：*k*值取值范围0≤*P*≤100，为0的时候等同于MIN，为100的时候等同于MAX。
 
 - **APERCENTILE**
     ```mysql
@@ -564,7 +565,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     功能说明：统计表中某列的值百分比分位数，与PERCENTILE函数相似，但是返回近似结果。  
     返回结果数据类型： 双精度浮点数Double。  
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
-    说明：*k*值取值范围0≤*k*≤100，为0的时候等同于MIN，为100的时候等同于MAX。推荐使用```APERCENTILE```函数，该函数性能远胜于```PERCENTILE```函数
+    说明：*k*值取值范围0≤*P*≤100，为0的时候等同于MIN，为100的时候等同于MAX。推荐使用```APERCENTILE```函数，该函数性能远胜于```PERCENTILE```函数
     
 - **LAST_ROW**
     ```mysql
diff --git a/documentation/webdocs/markdowndocs/TAOS SQL.md b/documentation/webdocs/markdowndocs/TAOS SQL.md
index 870529417fbb4dd9dd1e73bb253962e9293e94f4..f94047fb6ac6a7d5a0cc25cb4789d9e686ed1baf 100644
--- a/documentation/webdocs/markdowndocs/TAOS SQL.md	
+++ b/documentation/webdocs/markdowndocs/TAOS SQL.md	
@@ -39,8 +39,8 @@ The full list of data types is listed below.  For string types of data, we will
 | 6    |   DOUBLE    |    8    | A standard nullable double float type with 15-16 significant digits and a range of [-1.7E308, 1.7E308]​ |
 | 7    |    BOOL     |    1    | A nullable boolean type, [**`true`**, **`false`**]           |
 | 8    |  TIMESTAMP  |    8    | A nullable timestamp type with the same usage as the primary column timestamp |
-| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, any exceeded chars will be automatically truncated. This type of string only supports ASCii encoded chars. |
-| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, any exceeded chars will be truncated. The **`NCHAR`** type supports Unicode encoded chars. |
+| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, error should be threw with exceeded chars, the maximum length of *M* is 16374, but as maximum row size is 16K bytes, the actual upper limit will generally less than 16374. This type of string only supports ASCii encoded chars. |
+| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, error should be threw with exceeded chars. The **`NCHAR`** type supports Unicode encoded chars. |
 
 All the keywords in a SQL statement are case-insensitive, but strings values are case-sensitive and must be quoted by a pair of `'` or `"`. To quote a `'` or a `"` , you can use the escape character `\`.
 
@@ -86,7 +86,7 @@ All the keywords in a SQL statement are case-insensitive, but strings values are
     
     1) The first column must be a `timestamp`, and the system will set it as the primary key.
     
-    2) The record size is limited to 4096 bytes
+    2) The record size is limited to 16k bytes
     
     3) For `binary` or `nchar` data types, the length must be specified. For example, binary(20) means a binary data type with 20 bytes.
 
@@ -181,9 +181,10 @@ All the keywords in a SQL statement are case-insensitive, but strings values are
                 tb2_name (tb2_field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
     ```
 
-Note: For a table, the new record must have a timestamp bigger than the last data record, otherwise, it will be discarded and not inserted. If the timestamp is 0, the time stamp will be set to the system time on the server.
-
-**IMPORT**: If you do want to insert a historical data record into a table, use IMPORT command instead of INSERT. IMPORT has the same syntax as INSERT. If you want to import a batch of historical records, the records must be ordered by the timestamp, otherwise, TDengine won't handle it in the right way.
+Note: 1. For a table, the new record must have a timestamp bigger than the last data record, otherwise, it will be discarded and not inserted. If the timestamp is 0, the time stamp will be set to the system time on the server.
+      2.The timestamp of the oldest record allowed to be inserted is relative to the current server time, minus the configured keep value (the number of days the data is retained), and the timestamp of the latest record allowed to be inserted is relative to the current server time, plus the configured days value (the time span in which the data file stores data, in days). Both keep and days can be specified when creating the database. The default values are 3650 days and 10 days, respectively.
+ 
+**IMPORT**: If you do want to insert a historical data record into a table, use IMPORT command instead of INSERT. IMPORT has the same syntax as INSERT. 
 
 ## Data Query
 
@@ -288,10 +289,10 @@ TDengine supports aggregations over numerical values, they are listed below:
     Applied to: table/STable. 
 
 
-- **WAVG**
+- **TWA**
   
     ```mysql
-    SELECT WAVG(field_name) FROM tb_name WHERE clause
+    SELECT TWA(field_name) FROM tb_name WHERE clause
     ```
     Function: return the time-weighted average value of a specific column  
     Return Data Type: `double`  
@@ -323,7 +324,7 @@ TDengine supports aggregations over numerical values, they are listed below:
 
 - **LEASTSQUARES**
     ```mysql
-    SELECT LEASTSQUARES(field_name) FROM tb_name [WHERE clause]
+    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause]
     ```
     Function: performs a linear fit to the primary timestamp and the specified column. 
     Return Data Type: return a string of the coefficient and the interception of the fitted line.  
@@ -411,11 +412,20 @@ TDengine supports aggregations over numerical values, they are listed below:
     SELECT PERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
     ```
     Function: the value of the specified column below which `P` percent of the data points fall.  
-    Return Data Type: the same data type.  
+    Return Data Type: double.  
     Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
     Applied to: table/STable.  
     Note: The range of `P` is `[0, 100]`. When `P=0` , `PERCENTILE` returns the equal value as `MIN`; when `P=100`, `PERCENTILE` returns the equal value as `MAX`. 
 
+- **APERCENTILE**
+    ```mysql
+    SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: the value of the specified column below which `P` percent of the data points fall, it returns approximate value of percentile.
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
+    Applied to: table/STable.  
+    Note: The range of `P` is `[0, 100]`. When `P=0` , `APERCENTILE` returns the equal value as `MIN`; when `P=100`, `APERCENTILE` returns the equal value as `MAX`. `APERCENTILE` has a much better performance than `PERCENTILE`.
 
 - **LAST_ROW**
     ```mysql
@@ -445,7 +455,7 @@ TDengine supports aggregations over numerical values, they are listed below:
     SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause]
     ```
     Function: return the difference between the maximum and the mimimum value.  
-    Return Data Type: the same data type.  
+    Return Data Type: double.  
     Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
     Applied to: table/STable.  
     Note: spread gives the range of data variation in a table/supertable; it is equivalent to `MAX()` - `MIN()`
diff --git a/documentation/webdocs/markdowndocs/administrator-ch.md b/documentation/webdocs/markdowndocs/administrator-ch.md
index 35beb610f2789ea9d521eaa0314160a4ddff4025..44b3ad46712019870be6fefb5234611f55f6e03e 100644
--- a/documentation/webdocs/markdowndocs/administrator-ch.md
+++ b/documentation/webdocs/markdowndocs/administrator-ch.md
@@ -1,329 +1,245 @@
-#系统管理
+# TDengine的运营与维护
 
-## 文件目录结构
-
-安装TDengine的过程中，安装程序将在操作系统中创建以下目录或文件：
+## 容量规划
 
-| 目录/文件               | 说明                                              |
-| ---------------------- | :------------------------------------------------|
-| /etc/taos/taos.cfg     | 默认[配置文件]                            |
-| /usr/local/taos/driver | 动态链接库目录                            |
-| /var/lib/taos          | 默认数据文件目录,可通过[配置文件]修改位置.    |
-| /var/log/taos          | 默认日志文件目录,可通过[配置文件]修改位置     |
-| /usr/local/taos/bin    | 可执行文件目录                            |
+使用TDengine来搭建一个物联网大数据平台，计算资源、存储资源需要根据业务场景进行规划。下面分别讨论系统运行所需要的内存、CPU以及硬盘空间。
 
-### 可执行文件
+### 内存需求
 
-TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下。其中包括：
-
-- _taosd_：TDengine服务端可执行文件
-- _taos_： TDengine Shell可执行文件
-- _taosdump_：数据导出工具
-- *rmtaos*： 卸载TDengine的脚本, 该脚本会删除全部的程序和数据文件。请务必谨慎执行，如非必须不建议使用。
-
-您可以通过修改系统配置文件taos.cfg来配置不同的数据目录和日志目录
-
-## 服务端配置
+每个DB可以创建固定数目的vnode，默认与CPU核数相同，可通过maxVgroupsPerDb配置；每个vnode会占用固定大小的内存（大小与数据库的配置参数blocks和cache有关)；每个Table会占用与标签总长度有关的内存；此外，系统会有一些固定的内存开销。因此，每个DB需要的系统内存可通过如下公式计算：
 
-TDengine系统后台服务程序是`taosd`，其启动时候读取的配置文件缺省目录是`/etc/taos`。可以通过命令行执行参数-c指定配置文件目录，比如
 ```
-taosd -c /home/user
+Memory Size = maxVgroupsPerDb * (blocks * cache + 10Mb) + numOfTables * (tagSizePerTable + 0.5Kb)
 ```
-指定`taosd`启动的时候读取`/home/user`目录下的配置文件taos.cfg。
 
-下面仅仅列出一些重要的配置参数，更多的参数请看配置文件里的说明。各个参数的详细介绍及作用请看前述章节。**注意：配置修改后，需要重启*taosd*服务才能生效。**
+示例：假设是4核机器，cache是缺省大小16M, blocks是缺省值6，假设有10万张表，标签总长度是256字节，则总的内存需求为：4\*(16\*6+10) + 100000*(0.25+0.5)/1000 = 499M。 
 
-**privateIp**
-- 默认值：物理节点IP地址列表中的第一个IP地址
+实际运行的系统往往会根据数据特点的不同，将数据存放在不同的DB里。因此做规划时，也需要考虑。
 
-对外提供服务的IP地址。
+如果内存充裕，可以加大Blocks的配置，这样更多数据将保存在内存里，提高查询速度。
 
-**publicIp**
-- 默认值：与privateIp相同
+### CPU需求
 
-对于阿里等云平台，此为公网IP地址，publicIp在内部映射为对应的privateIP地址，仅对企业版有效。
+CPU的需求取决于如下两方面：
 
-**masterIp**
-- 默认值：与privateIp相同
+* __数据插入__ TDengine单核每秒能至少处理一万个插入请求。每个插入请求可以带多条记录，一次插入一条记录与插入10条记录，消耗的计算资源差别很小。因此每次插入，条数越大，插入效率越高。如果一个插入请求带200条以上记录，单核就能达到每秒插入100万条记录的速度。但对前端数据采集的要求越高，因为需要缓存记录，然后一批插入。
+* __查询需求__ TDengine提供高效的查询，但是每个场景的查询差异很大，查询频次变化也很大，难以给出客观数字。需要用户针对自己的场景，写一些查询语句，才能确定。
 
-集群内第一个物理节点的privateIp地址，仅对企业版有效。
+因此仅对数据插入而言，CPU是可以估算出来的，但查询所耗的计算资源无法估算。在实际运营过程中，不建议CPU使用率超过50%，超过后，需要增加新的节点，以获得更多计算资源。
 
-**secondIp**
-- 默认值：与privateIp相同
+### 存储需求
 
-集群内第二个物理节点的privateIp地址，仅对企业版有效。
+TDengine相对于通用数据库，有超高的压缩比，在绝大多数场景下，TDengine的压缩比不会低于5倍，有的场合，压缩比可达到10倍以上，取决于实际场景的数据特征。压缩前的原始数据大小可通过如下方式计算：
 
-**mgmtShellPort**
-- 默认值： _6030_
-
-数据库服务中管理节点与客户端通信使用的TCP/UDP端口号。
-> 端口范围 _6030_ - _6034_ 均用于UDP通讯。此外，还使用端口 _6030_ 用于TCP通讯。
-
-**vnodeShellPort**
-- 默认值： _6035_
-
-数据节点与客户端通信使用的TCP/UDP端口号。
-> 端口范围 _6035_ - _6039_ 的5个端口用于UDP通信。此外，还使用端口 _6035_ 用于TCP通讯。
-
-**mgmtVnodePort**
-- 默认值： _6040_
-
-管理节点与数据节点通信使用的TCP/UDP端口号，仅对企业版有效。
-> 端口范围 _6040_ - _6044_ 的5个端口用于UDP通信。此外，还使用端口 _6040_ 用于TCP通讯。
+```
+Raw DataSize = numOfTables * rowSizePerTable * rowsPerTable
+```
 
-**vnodeVnodePort**
-- 默认值： _6045_
+示例：1000万台智能电表，每台电表每15分钟采集一次数据，每次采集的数据128字节，那么一年的原始数据量是：10000000\*128\*24\*60/15*365 = 44851T。TDengine大概需要消耗44851/5=8970T, 8.9P空间。 
 
-数据节点与数据节点通信使用的TCP/UDP端口号，仅对企业版有效。
-> 端口范围 _6045_ - _6049_ 的5个端口用于UDP通信。此外，还使用端口 _6045_ 用于TCP通讯。
+用户可以通过参数keep，设置数据在磁盘中的最大保存时长。为进一步减少存储成本，TDengine还提供多级存储，最冷的数据可以存放在最廉价的存储介质上，应用的访问不用做任何调整，只是读取速度降低了。
 
-**mgmtMgmtPort**
-- 默认值： _6050_
+为提高速度，可以配置多快硬盘，这样可以并发写入或读取数据。需要提醒的是，TDengine采取多副本的方式提供数据的高可靠，因此不再需要采用昂贵的磁盘阵列。
 
-管理节点与管理节点通信使用的UDP端口号，仅对企业版有效。
+### 物理机或虚拟机台数
 
-**mgmtSyncPort**
-- 默认值： _6050_
+根据上面的内存、CPU、存储的预估，就可以知道整个系统需要多少核、多少内存、多少存储空间。如果数据副本数不为1，总需求量需要再乘以副本数。
 
-管理节点与管理节点同步使用的TCP端口号，仅对企业版有效。
+因为TDengine具有很好的水平扩展能力，根据总量，再根据单个物理机或虚拟机的资源，就可以轻松决定需要购置多少台物理机或虚拟机了。
 
-**httpPort**
-- 默认值： _6020_
+## 容错和灾备
 
-RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接口发起查询/写入请求。
+### 容错
 
-**dataDir**
-- 默认值：/var/lib/taos
+TDengine支持**WAL**（Write Ahead Log）机制，实现数据的容错能力，保证数据的高可用。
 
-数据文件目录，所有的数据文件都将写入该目录。
+TDengine接收到应用的请求数据包时，先将请求的原始数据包写入数据库日志文件，等数据成功写入数据库数据文件后，再删除相应的WAL。这样保证了TDengine能够在断电等因素导致的服务重启时从数据库日志文件中恢复数据，避免数据的丢失。
 
-**logDir**
-- 默认值：/var/log/taos
+涉及的系统配置参数有两个：
 
-日志文件目录，客户端和服务器的运行日志将写入该目录。
+- walLevel：WAL级别，0：不写wal; 1：写wal, 但不执行fsync; 2：写wal, 而且执行fsync。
+- fsync：当walLevel设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。
 
-**maxUsers**
-- 默认值：10,000
+如果要100%的保证数据不丢失，需要将walLevel设置为2，fsync设置为0。这时写入速度将会下降。但如果应用侧启动的写数据的线程数达到一定的数量(超过50)，那么写入数据的性能也会很不错，只会比fsync设置为3000毫秒下降30%左右。
 
-系统允许创建用户数量的上限
+### 灾备
 
-**maxDbs**
-- 默认值：1,000
+TDengine的集群通过多个副本的机制，来提供系统的高可用性，实现灾备能力。
 
-系统允许的创建数据库的上限
+TDengine集群是由mnode负责管理的，为保证mnode的高可靠，可以配置多个mnode副本，副本数由系统配置参数numOfMnodes决定，为了支持高可靠，需要设置大于1。为保证元数据的强一致性，mnode副本之间通过同步方式进行数据复制，保证了元数据的强一致性。
 
-**maxTables**
-- 默认值：650,000
+TDengine集群中的时序数据的副本数是与数据库关联的，一个集群里可以有多个数据库，每个数据库可以配置不同的副本数。创建数据库时，通过参数replica 指定副本数。为了支持高可靠，需要设置副本数大于1。
 
-系统允许创建数据表的上限。
->系统能够创建的表受到多种因素的限制，单纯地增大该参数并不能直接增加系统能够创建的表数量。例如，由于每个表创建均需要消耗一定量的缓存空间，系统可用内存一定的情况下，创建表的总数的上限是一个固定的值。
+TDengine集群的节点数必须大于等于副本数，否则创建表时将报错。
 
-**monitor**
-- 默认值：1（激活状态）
+当TDengine集群中的节点部署在不同的物理机上，并设置多个副本数时，就实现了系统的高可靠性，无需再使用其他软件或工具。TDengine企业版还可以将副本部署在不同机房，从而实现异地容灾。
 
-服务器内部的系统监控开关。监控主要负责收集物理节点的负载状况，包括CPU、内存、硬盘、网络带宽、HTTP请求量的监控记录，记录信息存储在`LOG`库中。0表示关闭监控服务，1表示激活监控服务。
+## 服务端配置
 
-**numOfLogLines**
-- 默认值：10,000,000
+TDengine系统后台服务由taosd提供，可以在配置文件taos.cfg里修改配置参数，以满足不同场景的需求。配置文件的缺省位置在/etc/taos目录，可以通过taosd命令行执行参数-c指定配置文件目录。比如taosd -c /home/user来指定配置文件位于/home/user这个目录。
 
-单个日志文件允许的最大行数（10,000,000行）。
+下面仅仅列出一些重要的配置参数，更多的参数请看配置文件里的说明。各个参数的详细介绍及作用请看前述章节，而且这些参数的缺省配置都是工作的，一般无需设置。**注意：配置修改后，需要重启*taosd*服务才能生效。**
 
-**debugFlag**
-- 默认值：131（仅输出错误和警告信息）
+- firstEp: taosd启动时，主动连接的集群中第一个dnode的end point, 缺省值为 localhost:6030。
+- secondEp: taosd启动时，如果first连接不上，尝试连接集群中第二个dnode的end point, 缺省值为空。
+- fqdn：数据节点的FQDN。如果为空，将自动获取操作系统配置的第一个, 缺省值为空。
+- serverPort：taosd启动后，对外服务的端口号，默认值为6030。
+- httpPort: RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接口发起查询/写入请求。
+- dataDir: 数据文件目录，所有的数据文件都将写入该目录。默认值：/var/lib/taos。
+- logDir：日志文件目录，客户端和服务器的运行日志文件将写入该目录。默认值：/var/log/taos。
+- arbitrator：系统中裁决器的end point, 缺省值为空。
+- role：dnode的可选角色。0-any; 既可作为mnode，也可分配vnode；1-mgmt;只能作为mnode，不能分配vnode；2-dnode;不能作为mnode，只能分配vnode
+- debugFlag：运行日志开关。131（输出错误和警告日志），135（ 输出错误、警告和调试日志），143（ 输出错误、警告、调试和跟踪日志）。默认值：131或135（不同模块有不同的默认值）。
+- numOfLogLines：单个日志文件允许的最大行数。默认值：10,000,000行。
+- maxSQLLength：单条SQL语句允许最长限制。默认值：65380字节。
+- maxBinaryDisplayWidth：Shell中binary 和 nchar字段的显示宽度上限，超过此限制的部分将被隐藏。默认值：30。可在 shell 中通过命令 set max_binary_display_width nn动态修改此选项。
 
-系统（服务端和客户端）运行日志开关：
-- 131 仅输出错误和警告信息
-- 135 输入错误（ERROR）、警告（WARN）、信息（Info）
+**注意：**对于端口，TDengine会使用从serverPort起11个连续的TCP和UDP端口号，请务必在防火墙打开。因此如果是缺省配置，需要打开从6030都6040共11个端口，而且必须TCP和UDP都打开。
 
 不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：
 
-- days：数据文件存储数据的时间跨度，单位为天
-- keep：数据保留的天数
-- rows: 文件块中记录条数
-- comp: 文件压缩标志位，0：关闭，1:一阶段压缩，2:两阶段压缩
-- ctime：数据从写入内存到写入硬盘的最长时间间隔，单位为秒
-- clog：数据提交日志(WAL)的标志位，0为关闭，1为打开
-- tables：每个vnode允许创建表的最大数目
-- cache: 内存块的大小（字节数）
-- tblocks: 每张表最大的内存块数
-- ablocks: 每张表平均的内存块数
-- precision：时间戳为微秒的标志位，ms表示毫秒，us表示微秒
+- days：一个数据文件存储数据的时间跨度，单位为天，默认值：10。
+- keep：数据库中数据保留的天数，单位为天，默认值：3650。
+- minRows: 文件块中记录的最小条数，单位为条，默认值：100。
+- maxRows: 文件块中记录的最大条数，单位为条，默认值：4096。
+- comp: 文件压缩标志位，0：关闭，1:一阶段压缩，2:两阶段压缩。默认值：2。
+- walLevel：WAL级别。1：写wal, 但不执行fsync; 2：写wal, 而且执行fsync。默认值：1。
+- fsync：当wal设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。单位为毫秒，默认值：3000。
+- cache: 内存块的大小，单位为兆字节（MB），默认值：16。
+- blocks: 每个VNODE（TSDB）中有多少cache大小的内存块。因此一个VNODE的用的内存大小粗略为（cache * blocks）。单位为块，默认值：4。
+- replica：副本个数，取值范围：1-3。单位为个，默认值：1
+- precision：时间戳精度标识，ms表示毫秒，us表示微秒。默认值：ms
 
-对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine容许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL： 
+对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine允许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL： 
 
 ```
- create database demo days 10 cache 16000 ablocks 4
+ create database demo days 10 cache 32 blocks 8 replica 3;
 ```
 
-该SQL创建了一个库demo, 每个数据文件保留10天数据，内存块为16000字节，每个表平均占用4个内存块，而其他参数与系统配置完全一致。
+该SQL创建了一个库demo, 每个数据文件存储10天数据，内存块为32兆字节，每个VNODE占用8个内存块，副本数为3，而其他参数与系统配置完全一致。
 
-## 客户端配置 
+TDengine集群中加入一个新的dnode时，涉及集群相关的一些参数必须与已有集群的配置相同，否则不能成功加入到集群中。会进行校验的参数如下：
 
-TDengine系统的前台交互客户端应用程序为taos（Windows平台上为taos.exe）。与服务端程序一样，也可以通过设置taos.cfg来配置`taos`启动和运行的配置项。启动的时候如果不指定taos加载配置文件路径，默认读取`/etc/taos/`路径下的`taos.cfg`文件。指定配置文件来启动`taos`的命令如下：
+- numOfMnodes：系统中管理节点个数。默认值：3。
+- balance：是否启动负载均衡。0：否，1：是。默认值：1。
+- mnodeEqualVnodeNum: 一个mnode等同于vnode消耗的个数。默认值：4。
+- offlineThreshold: dnode离线阈值，超过该时间将导致该dnode从集群中删除。单位为秒，默认值：86400*10（即10天）。
+- statusInterval: dnode向mnode报告状态时长。单位为秒，默认值：1。
+- maxTablesPerVnode: 每个vnode中能够创建的最大表个数。默认值：1000000。
+- maxVgroupsPerDb: 每个数据库中能够使用的最大vnode个数。
+- arbitrator: 系统中裁决器的end point，缺省为空
+- timezone、locale、charset 的配置见客户端配置。
 
-```
-taos -c /home/cfg/
-```
-**注意：启动设置的是配置文件所在目录，而不是配置文件本身**
+## 客户端配置 
 
-如果`/home/cfg/`目录下没有配置文件，程序会继续启动并打印如下告警信息：
-```plaintext
-Welcome to the TDengine shell from linux, client version:1.6.4.0
-option file:/home/cfg/taos.cfg not found, all options are set to system default
-```
-更多taos的使用方法请见[Shell命令行程序](#_TDengine_Shell命令行程序)。本节主要讲解taos客户端应用在配置文件taos.cfg文件中使用到的参数。
+TDengine系统的前台交互客户端应用程序为taos，它与taosd共享同一个配置文件taos.cfg。运行taos时，使用参数-c指定配置文件目录，如taos -c /home/cfg，表示使用/home/cfg/目录下的taos.cfg配置文件中的参数，缺省目录是/etc/taos。本节主要说明 taos 客户端应用在配置文件 taos.cfg 文件中使用到的参数。
 
-客户端配置参数说明
+客户端配置参数列表及解释
 
-**masterIP**
-- 默认值：127.0.0.1
+- firstEp: taos启动时，主动连接的集群中第一个taosd实例的end point, 缺省值为 localhost:6030。
+- secondEp: taos启动时，如果first连接不上，尝试连接集群中第二个taosd实例的end point, 缺省值为空。
 
-客户端连接的TDengine服务器IP地址，如果不设置默认连接127.0.0.1的节点。以下两个命令等效：
-```
-taos
-taos -h 127.0.0.1
-```
-其中的IP地址是从配置文件中读取的masterIP的值。
+- locale
+
+    > 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
 
-**locale**
-- 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
+TDengine为存储中文、日文、韩文等非ASCII编码的宽字符，提供一种专门的字段类型nchar。写入nchar字段的数据将统一采用UCS4-LE格式进行编码并发送到服务器。需要注意的是，编码正确性是客户端来保证。因此，如果用户想要正常使用nchar字段来存储诸如中文、日文、韩文等非ASCII字符，需要正确设置客户端的编码格式。
 
-TDengine为存储中文、日文、韩文等非ASCII编码的宽字符，提供一种专门的字段类型`nchar`。写入`nchar`字段的数据将统一采用`UCS4-LE`格式进行编码并发送到服务器。需要注意的是，**编码正确性**是客户端来保证。因此，如果用户想要正常使用`nchar`字段来存储诸如中文、日文、韩文等非ASCII字符，需要正确设置客户端的编码格式。
+客户端的输入的字符均采用操作系统当前默认的编码格式，在Linux系统上多为UTF-8，部分中文系统编码则可能是GB18030或GBK等。在docker环境中默认的编码是POSIX。在中文版Windows系统中，编码则是CP936。客户端需要确保正确设置自己所使用的字符集，即客户端运行的操作系统当前编码字符集，才能保证nchar中的数据正确转换为UCS4-LE编码格式。
 
-客户端的输入的字符均采用操作系统当前默认的编码格式，在Linux系统上多为`UTF-8`，部分中文系统编码则可能是`GB18030`或`GBK`等。在docker环境中默认的编码是`POSIX`。在中文版Windows系统中，编码则是`CP936`。客户端需要确保正确设置自己所使用的字符集，即客户端运行的操作系统当前编码字符集，才能保证`nchar`中的数据正确转换为`UCS4-LE`编码格式。
+在 Linux 中 locale 的命名规则为: <语言>_<地区>.<字符集编码> 如：zh_CN.UTF-8，zh代表中文，CN代表大陆地区，UTF-8表示字符集。字符集编码为客户端正确解析本地字符串提供编码转换的说明。Linux系统与 Mac OSX 系统可以通过设置locale来确定系统的字符编码，由于Windows使用的locale中不是POSIX标准的locale格式，因此在Windows下需要采用另一个配置参数charset来指定字符编码。在Linux 系统中也可以使用charset来指定字符编码。
 
-在 Linux 中 locale 的命名规则为：
-`<语言>_<地区>.<字符集编码>`
-如：`zh_CN.UTF-8`，zh代表中文，CN代表大陆地区，UTF-8表示字符集。字符集编码为客户端正确解析本地字符串提供编码转换的说明。Linux系统与Mac OSX系统可以通过设置locale来确定系统的字符编码，由于Windows使用的locale中不是POSIX标准的locale格式，因此在Windows下需要采用另一个配置参数`charset`来指定字符编码。在Linux系统中也可以使用charset来指定字符编码。
+- charset
 
-**charset**
-- 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
+    > 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
 
-如果配置文件中不设置`charset`，在Linux系统中，taos在启动时候，自动读取系统当前的locale信息，并从locale信息中解析提取charset编码格式。如果自动读取locale信息失败，则尝试读取charset配置，如果读取charset配置也失败，**则中断启动过程**。
+如果配置文件中不设置charset，在Linux系统中，taos在启动时候，自动读取系统当前的locale信息，并从locale信息中解析提取charset编码格式。如果自动读取locale信息失败，则尝试读取charset配置，如果读取charset配置也失败，则中断启动过程。
 
 在Linux系统中，locale信息包含了字符编码信息，因此正确设置了Linux系统locale以后可以不用再单独设置charset。例如：
 ```
-locale zh_CN.UTF-8
+    locale zh_CN.UTF-8
 ```
-在Windows系统中，无法从locale获取系统当前编码。如果无法从配置文件中读取字符串编码信息，`taos`默认设置为字符编码为`CP936`。其等效在配置文件中添加如下配置：
+在Windows系统中，无法从locale获取系统当前编码。如果无法从配置文件中读取字符串编码信息，taos默认设置为字符编码为CP936。其等效在配置文件中添加如下配置：
 ```
-charset CP936
+    charset CP936
 ```
 如果需要调整字符编码，请查阅当前操作系统使用的编码，并在配置文件中正确设置。
 
 在Linux系统中，如果用户同时设置了locale和字符集编码charset，并且locale和charset的不一致，后设置的值将覆盖前面设置的值。
 ```
-locale zh_CN.UTF-8
-charset GBK
+    locale zh_CN.UTF-8
+    charset GBK
 ```
-则`charset`的有效值是`GBK`。
+则charset的有效值是GBK。
 ```
-charset GBK
-locale zh_CN.UTF-8
+    charset GBK
+    locale zh_CN.UTF-8
 ```
-`charset`的有效值是`UTF-8`。
+charset的有效值是UTF-8。
 
-**sockettype**
-- 默认值：UDP
+日志的配置参数，与server 的配置参数完全一样。
 
-客户端连接服务端的套接字的方式，可以使用`UDP`和`TCP`两种配置。
-在客户端和服务端之间的通讯需要经过恶劣的网络环境下（如公共网络、互联网）、客户端与数据库服务端连接不稳定（由于MTU的问题导致UDP丢包）的情况下，可以将连接的套接字类型调整为`TCP`
+- timezone
 
->注意：客户端套接字的类型需要和服务端的套接字类型相同，否则无法连接数据库。
+    默认值：从系统中动态获取当前的时区设置
 
-**compressMsgSize**
-- 默认值：-1（不压缩）
-
-客户端与服务器之间进行消息通讯过程中，对通讯的消息进行压缩的阈值，默认值为-1（不压缩）。如果要压缩消息，建议设置为64330字节，即大于64330字节的消息体才进行压缩。在配置文件中增加如下配置项即可：
-```
-compressMsgSize 64330
-```
-如果配置项设置为0，`compressMsgSize 0`表示对所有的消息均进行压缩。
-
-**timezone**
-- 默认值：从系统中动态获取当前的时区设置
-
-客户端运行系统所在的时区。为应对多时区的数据写入和查询问题，TDengine采用Unix时间戳([Unix Timestamp](https://en.wikipedia.org/wiki/Unix_time))来记录和存储时间戳。Unix时间戳的特点决定了任一时刻不论在任何时区，产生的时间戳均一致。需要注意的是，Unix时间戳是在客户端完成转换和记录。为了确保客户端其他形式的时间转换为正确的Unix时间戳，需要设置正确的时区。
+客户端运行系统所在的时区。为应对多时区的数据写入和查询问题，TDengine 采用 Unix 时间戳(Unix Timestamp)来记录和存储时间戳。Unix 时间戳的特点决定了任一时刻不论在任何时区，产生的时间戳均一致。需要注意的是，Unix时间戳是在客户端完成转换和记录。为了确保客户端其他形式的时间转换为正确的 Unix 时间戳，需要设置正确的时区。
 
 在Linux系统中，客户端会自动读取系统设置的时区信息。用户也可以采用多种方式在配置文件设置时区。例如：
 ```
-timezone UTC-8
-timezone GMT-8
-timezone Asia/Shanghai
+    timezone UTC-8
+    timezone GMT-8
+    timezone Asia/Shanghai
 ```
 均是合法的设置东八区时区的格式。
 
-
-时区的设置对于查询和写入SQL语句中非Unix时间戳的内容（时间戳字符串、关键词`now`的解析）产生影响。例如：
+时区的设置对于查询和写入SQL语句中非Unix时间戳的内容（时间戳字符串、关键词now的解析）产生影响。例如：
 ```
-SELECT count(*) FROM table_name WHERE TS<'2019-04-11 12:01:08';
+    SELECT count(*) FROM table_name WHERE TS<'2019-04-11 12:01:08';
 ```
 在东八区，SQL语句等效于
 ```
-SELECT count(*) FROM table_name WHERE TS<1554955268000;
+    SELECT count(*) FROM table_name WHERE TS<1554955268000;
 ```
 在UTC时区，SQL语句等效于
 ```
-SELECT count(*) FROM table_name WHERE TS<1554984068000;
-```
-为了避免使用字符串时间格式带来的不确定性，也可以直接使用Unix时间戳。此外，还可以在SQL语句中使用带有时区的时间戳字符串，例如：RFC3339格式的时间戳字符串，`2013-04-12T15:52:01.123+08:00`或者ISO-8601格式时间戳字符串`2013-04-12T15:52:01.123+0800`。上述两个字符串转化为Unix时间戳不受系统所在时区的影响。
-
-**defaultUser**
-- 默认值：root
-
-登录用户名，客户端登录的时候，如果不指定用户名，则自动使用该用户名登录。默认情况下，以下的两个命令等效
-```
-taos
-taos -u root
+    SELECT count(*) FROM table_name WHERE TS<1554984068000;
 ```
-用户名为从配置中读取的`defaultUser`配置项。如果更改`defaultUser abc`，则以下两个命令等效：
-```
-taos
-taos -u abc
-```
-
-**defaultPass**
-- 默认值：taosdata
-
-登录用户名，客户端登录的时候，如果不指定密码，则自动使用该密码登录。默认情况下，以下的两个命令等效
-```
-taos
-taos -ptaosdata
-```
-
-TCP/UDP端口，以及日志的配置参数，与server的配置参数完全一样。使用命令`taos -?` 可查看`taos`允许的可选项。
+为了避免使用字符串时间格式带来的不确定性，也可以直接使用Unix时间戳。此外，还可以在SQL语句中使用带有时区的时间戳字符串，例如：RFC3339格式的时间戳字符串，2013-04-12T15:52:01.123+08:00或者ISO-8601格式时间戳字符串2013-04-12T15:52:01.123+0800。上述两个字符串转化为Unix时间戳不受系统所在时区的影响。
 
 ## 用户管理
 
 系统管理员可以在CLI界面里添加、删除用户，也可以修改密码。CLI里SQL语法如下：
 
 ```
-CREATE USER user_name PASS ‘password’
+CREATE USER <user_name> PASS <‘password’>;
 ```
 
-创建用户，并制定用户名和密码，密码需要用单引号引起来
+创建用户，并指定用户名和密码，密码需要用单引号引起来
 
 ```
-DROP USER user_name
+DROP USER <user_name>;
 ```
 
 删除用户，限root用户使用
 
 ```
-ALTER USER user_name PASS ‘password’  
+ALTER USER <user_name> PASS <‘password’>;
 ```
 
 修改用户密码, 为避免被转换为小写，密码需要用单引号引用
 
 ```
-SHOW USERS
+SHOW USERS;
 ```
 
 显示所有用户
 
+**注意：**SQL 语法中，< >表示需要用户输入的部分，但请不要输入< >本身
+
 ## 数据导入
 
-TDengine提供两种方便的数据导入功能，一种按脚本文件导入，一种按数据文件导入。
+TDengine提供多种方便的数据导入功能，一种按脚本文件导入，一种按数据文件导入，一种是taosdump工具导入本身导出的文件。
 
 **按脚本文件导入**
 
@@ -331,14 +247,50 @@ TDengine的shell支持source filename命令，用于批量运行文件中的SQL
 
 **按数据文件导入**
 
-TDengine也支持在shell对已存在的表从CSV文件中进行数据导入。每个CSV文件只属于一张表且CSV文件中的数据格式需与要导入表的结构相同。其语法如下
+TDengine也支持在shell对已存在的表从CSV文件中进行数据导入。CSV文件只属于一张表且CSV文件中的数据格式需与要导入表的结构相同, 在导入的时候，其语法如下
+
+```mysql
+INSERT INTO <tb_name> FILE <'path/data.csv'>;
+```
+注意：如果CSV文件首行存在描述信息，请手动删除后再导入
+
+例如，现在存在一个子表d1001, 其表结构如下：
 
 ```mysql
-insert into tb1 file a.csv b.csv tb2 c.csv …
-import into tb1 file a.csv b.csv tb2 c.csv …
+taos> DESCRIBE d1001
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+要导入的data.csv的格式如下：
+
+```csv
+'2018-10-04 06:38:05.000',10.30000,219,0.31000
+'2018-10-05 06:38:15.000',12.60000,218,0.33000
+'2018-10-06 06:38:16.800',13.30000,221,0.32000
+'2018-10-07 06:38:05.000',13.30000,219,0.33000
+'2018-10-08 06:38:05.000',14.30000,219,0.34000
+'2018-10-09 06:38:05.000',15.30000,219,0.35000
+'2018-10-10 06:38:05.000',16.30000,219,0.31000
+'2018-10-11 06:38:05.000',17.30000,219,0.32000
+'2018-10-12 06:38:05.000',18.30000,219,0.31000
 ```
-> 注意：导入的CSV文件不能够带表头, 且表的列与CSV文件的列需要严格对应。
-> 同样还可以使用[样例数据导入工具][1]对数据进行横向和纵向扩展导入。
+那么可以用如下命令导入数据
+
+```
+taos> insert into d1001 file '~/data.csv';
+Query OK, 9 row(s) affected (0.004763s)
+```
+
+
+**taosdump工具导入**
+
+TDengine提供了方便的数据库导入导出工具taosdump。用户可以将taosdump从一个系统导出的数据，导入到其他系统中。具体使用方法，请参见博客：<a href='https://www.taosdata.com/blog/2020/03/09/1334.html'>TDengine DUMP工具使用指南</a>
 
 ## 数据导出
 
@@ -349,66 +301,88 @@ import into tb1 file a.csv b.csv tb2 c.csv …
 如果用户需要导出一个表或一个STable中的数据，可在shell中运行
 
 ```
-select * from <tb_name> >> a.csv
+SELECT * FROM <tb_name> >> <data.csv>;
 ```
 
-这样，表tb中的数据就会按照CSV格式导出到文件a.csv中。
+这样，表tb_name中的数据就会按照CSV格式导出到文件data.csv中。
 
 **用taosdump导出数据**
 
-TDengine提供了方便的数据库导出工具taosdump。用户可以根据需要选择导出所有数据库、一个数据库或者数据库中的一张表,所有数据或一时间段的数据，甚至仅仅表的定义。其用法如下：
-
-- 导出数据库中的一张或多张表：taosdump [OPTION…] dbname tbname …
-- 导出一个或多个数据库：      taosdump [OPTION…] --databases dbname…
-- 导出所有数据库（不含监控数据库）：taosdump [OPTION…] --all-databases
-
-用户可通过运行taosdump --help获得更详细的用法说明
+TDengine提供了方便的数据库导出工具taosdump。用户可以根据需要选择导出所有数据库、一个数据库或者数据库中的一张表,所有数据或一时间段的数据，甚至仅仅表的定义。具体使用方法，请参见博客：<a href='https://www.taosdata.com/blog/2020/03/09/1334.html'>TDengine DUMP工具使用指南</a>
 
 ## 系统连接、任务查询管理
 
 系统管理员可以从CLI查询系统的连接、正在进行的查询、流式计算，并且可以关闭连接、停止正在进行的查询和流式计算。CLI里SQL语法如下：
 
 ```
-SHOW CONNECTIONS
+SHOW CONNECTIONS;
 ```
 
 显示数据库的连接，其中一列显示ip:port, 为连接的IP地址和端口号。
 
 ```
-KILL CONNECTION <connection-id>
+KILL CONNECTION <connection-id>;
 ```
 
-强制关闭数据库连接，其中的connection-id是SHOW CONNECTIONS中显示的 ip:port字串，如“192.168.0.1:42198”，拷贝粘贴即可。
+强制关闭数据库连接，其中的connection-id是SHOW CONNECTIONS中显示的第一列的数字。
 
 ```
-SHOW QUERIES
+SHOW QUERIES;
 ```
 
-显示数据查询，其中一列显示ip:port:id, 为发起该query应用的IP地址，端口号，以及系统分配的ID。
+显示数据查询，其中第一列显示的以冒号隔开的两个数字为query-id，为发起该query应用连接的connection-id和查询次数。
 
 ```
-KILL QUERY <query-id>
+KILL QUERY <query-id>;
 ```
 
-强制关闭数据查询，其中query-id是SHOW QUERIES中显示的ip:port:id字串，如“192.168.0.1:42198:11”，拷贝粘贴即可。
+强制关闭数据查询，其中query-id是SHOW QUERIES中显示的 connection-id:query-no字串，如“105:2”，拷贝粘贴即可。
 
 ```
-SHOW STREAMS
+SHOW STREAMS;
 ```
 
-显示流式计算，其中一列显示ip:port:id, 为启动该stream的IP地址、端口和系统分配的ID。
+显示流式计算，其中第一列显示的以冒号隔开的两个数字为stream-id, 为启动该stream应用连接的connection-id和发起stream的次数。
 
 ```
-KILL STREAM <stream-id>
+KILL STREAM <stream-id>;
 ```
 
-强制关闭流式计算，其中的中stream-id是SHOW STREAMS中显示的ip:port:id字串，如“192.168.0.1:42198:18”，拷贝粘贴即可。
+强制关闭流式计算，其中的中stream-id是SHOW STREAMS中显示的connection-id:stream-no字串，如103:2，拷贝粘贴即可。
+
+注意：SQL语法中，< >表示需要用户输入的部分，但请不要输入< >本身
 
 ## 系统监控
 
-TDengine启动后，会自动创建一个监测数据库`LOG`，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在`LOG`库里。系统管理员可以通过客户端程序查看记录库中的运行负载信息，（在企业版中）还可以通过浏览器查看数据的图标可视化结果。
+TDengine启动后，会自动创建一个监测数据库SYS，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在SYS库里。系统管理员可以从CLI直接查看这个数据库，也可以在WEB通过图形化界面查看这些监测信息。
+
+这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
+
+## 文件目录结构
+
+安装TDengine后，默认会在操作系统中生成下列目录或文件：
+
+| 目录/文件                 | 说明                                                         |
+| ------------------------- | :----------------------------------------------------------- |
+| /usr/local/taos/bin       | TDengine可执行文件目录。其中的执行文件都会软链接到/usr/bin目录下。 |
+| /usr/local/taos/connector | TDengine各种连接器目录。                                     |
+| /usr/local/taos/driver    | TDengine动态链接库目录。会软链接到/usr/lib目录下。           |
+| /usr/local/taos/examples  | TDengine各种语言应用示例目录。                               |
+| /usr/local/taos/include   | TDengine对外提供的C语言接口的头文件。                        |
+| /etc/taos/taos.cfg        | TDengine默认[配置文件]                                       |
+| /var/lib/taos             | TDengine默认数据文件目录,可通过[配置文件]修改位置.           |
+| /var/log/taos             | TDengine默认日志文件目录,可通过[配置文件]修改位置            |
+
+**可执行文件**
+
+TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下。其中包括：
+
+- _taosd_：TDengine服务端可执行文件
+- _taos_： TDengine Shell可执行文件
+- _taosdump_：数据导入导出工具
+- remove.sh：卸载TDengine的脚本, 请谨慎执行，链接到/usr/bin目录下的rmtaos命令。会删除TDengine的安装目录/usr/local/taos，但会保留/etc/taos、/var/lib/taos、/var/log/taos。
+
+您可以通过修改系统配置文件taos.cfg来配置不同的数据目录和日志目录。
 
-这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项`monitor`将其关闭或打开。
 
 
-[1]: https://github.com/taosdata/TDengine/tree/develop/importSampleData
\ No newline at end of file
diff --git a/documentation/webdocs/markdowndocs/advanced features-ch.md b/documentation/webdocs/markdowndocs/advanced features-ch.md
index 4d01eaf364cfe17b4cb4658dc8596fbb52a65ae2..9dc289a8d5765d7ffc5dc9bab5267b61559f0d02 100644
--- a/documentation/webdocs/markdowndocs/advanced features-ch.md	
+++ b/documentation/webdocs/markdowndocs/advanced features-ch.md	
@@ -67,7 +67,7 @@ TDengine内嵌支持轻量级的消息订阅与推送服务。使用系统提供
 
 TDengine的订阅与推送服务的状态是客户端维持，TDengine服务器并不维持。因此如果应用重启，从哪个时间点开始获取最新数据，由应用决定。
 
-订阅相关API请见 [连接器](https://www.taosdata.com/cn/documentation/connector/)。
+订阅相关API文档请见 [C/C++ 数据订阅接口](https://www.taosdata.com/cn/documentation/connector/#C/C++-%E6%95%B0%E6%8D%AE%E8%AE%A2%E9%98%85%E6%8E%A5%E5%8F%A3)，《[TDEngine中订阅的用途和用法](https://www.taosdata.com/blog/2020/02/12/1277.html)》则以一个示例详细介绍了这些ＡＰＩ的用法。
 
 ## 缓存 (Cache)
 TDengine采用时间驱动缓存管理策略（First-In-First-Out，FIFO），又称为写驱动的缓存管理机制。这种策略有别于读驱动的数据缓存模式（Least-Recent-Use，LRU），直接将最近写入的数据保存在系统的缓存中。当缓存达到临界值的时候，将最早的数据批量写入磁盘。一般意义上来说，对于物联网数据的使用，用户最为关心最近产生的数据，即当前状态。TDengine充分利用了这一特性，将最近到达的（当前状态）数据保存在缓存中。
@@ -76,7 +76,7 @@ TDengine通过查询函数向用户提供毫秒级的数据获取能力。直接
 
 TDengine分配固定大小的内存空间作为缓存空间，缓存空间可根据应用的需求和硬件资源配置。通过适当的设置缓存空间，TDengine可以提供极高性能的写入和查询的支持。TDengine中每个虚拟节点（virtual node）创建时分配独立的缓存池。每个虚拟节点管理自己的缓存池，不同虚拟节点间不共享缓存池。每个虚拟节点内部所属的全部表共享该虚拟节点的缓存池。
 
-TDengine将内存池按块划分进行管理，数据在内存块里按照列式存储。一个vnode的内存池是在vnode创建时按块分配好的，而且每个内存块按照先进先出的原则进行管理。一张表所需要的内存块是从vnode的内存池中进行分配的，块的大小由系统配置参数cache决定。每张表最大内存块的数目由配置参数tblocks决定，每张表平均的内存块的个数由配置参数ablocks决定。因此对于一个vnode, 总的内存大小为: cache*ablocks*tables。内存块参数cache不宜过小，一个cache block需要能存储至少几十条以上记录，才会有效率。参数ablocks最小为2，保证每张表平均至少能分配两个内存块。
+TDengine将内存池按块划分进行管理，数据在内存块里按照列式存储。一个vnode的内存池是在vnode创建时按块分配好的，而且每个内存块按照先进先出的原则进行管理。一张表所需要的内存块是从vnode的内存池中进行分配的，块的大小由系统配置参数cache决定。每张表最大内存块的数目由配置参数tblocks决定，每张表平均的内存块的个数由配置参数ablocks决定。因此对于一个vnode, 总的内存大小为: `cache * ablocks * tables`。内存块参数cache不宜过小，一个cache block需要能存储至少几十条以上记录，才会有效率。参数ablocks最小为2，保证每张表平均至少能分配两个内存块。
 
 你可以通过函数last_row快速获取一张表或一张超级表的最后一条记录，这样很便于在大屏显示各设备的实时状态或采集值。例如：
 
diff --git a/documentation/webdocs/markdowndocs/advanced features.md b/documentation/webdocs/markdowndocs/advanced features.md
index e841a5a6a531c94908b0f027d2d3e808d40ecac5..3eae454da59eec4aa7ea73741dcde2e882cb0821 100644
--- a/documentation/webdocs/markdowndocs/advanced features.md	
+++ b/documentation/webdocs/markdowndocs/advanced features.md	
@@ -62,7 +62,7 @@ Time series data is a sequence of data points over time. Inside a table, the dat
 
 To reduce the development complexity and improve data consistency, TDengine provides the pub/sub functionality. To publish a message, you simply insert a record into a table. Compared with popular messaging tool Kafka, you subscribe to a table or a SQL query statement, instead of a topic. Once new data points arrive, TDengine will notify the application. The process is just like Kafka.  
 
-The detailed API will be introduced in the [connectors](https://www.taosdata.com/en/documentation/connector/) section. 
+The API documentation is at [C/C++ subscription API](https://www.taosdata.com/en/documentation/connector/#C/C++-subscription-API) section, and you can find more information from blog article (only Chinese version at present) [The usage of subscription](https://www.taosdata.com/blog/2020/02/12/1277.html).
 
 ##Caching
 TDengine allocates a fixed-size buffer in memory, the newly arrived data will be written into the buffer first. Every device or table gets one or more memory blocks. For typical IoT scenarios, the hot data shall always be newly arrived data, they are more important for timely analysis. Based on this observation, TDengine manages the cache blocks in First-In-First-Out strategy. If no enough space in the buffer, the oldest data will be saved into hard disk first, then be overwritten by newly arrived data. TDengine also guarantees every device can keep at least one block of data in the buffer. 
diff --git a/documentation/webdocs/markdowndocs/connector-ch.md b/documentation/webdocs/markdowndocs/connector-ch.md
index b5d8fb5afb12ede82f2cdcd9ea29e20e8a82d6b8..79e7e918b318d31bbc80803ed72384414588b1ff 100644
--- a/documentation/webdocs/markdowndocs/connector-ch.md
+++ b/documentation/webdocs/markdowndocs/connector-ch.md
@@ -2,6 +2,8 @@
 
 TDengine提供了丰富的应用程序开发接口，其中包括C/C++、JAVA、Python、RESTful、Go等，便于用户快速开发应用。
 
+注意：所有执行 SQL 语句的 API，例如 C/C++ Connector 中的 `tao_query`、`taos_query_a`、`taos_subscribe` 等，以及其它语言中与它们对应的API，每次都只能执行一条 SQL 语句，如果实际参数中包含了多条语句，它们的行为是未定义的。
+
 ## C/C++ Connector
 
 C/C++的API类似于MySQL的C API。应用程序使用时，需要包含TDengine头文件 _taos.h_（安装后，位于 _/usr/local/taos/include_）：
@@ -279,7 +281,7 @@ Connection conn = DriverManager.getConnection(jdbcUrl);
 > 端口 6030 为默认连接端口，JDBC URL 中的 log 为系统本身的监控数据库。
 
 TDengine 的 JDBC URL 规范格式为：
-`jdbc:TSDB://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
+`jdbc:TAOS://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
 
 其中，`{}` 中的内容必须，`[]` 中为可选。配置参数说明如下：
 
@@ -915,15 +917,16 @@ TDengine 同时也提供了node.js 的连接器。用户可以通过[npm](https:
 首先，通过[npm](https://www.npmjs.com/)安装node.js 连接器.
 
 ```cmd
-npm install td-connector
+npm install td2.0-connector
 ```
 我们建议用户使用npm 安装node.js连接器。如果您没有安装npm, 可以将*src/connector/nodejs/*拷贝到您的nodejs 项目目录下
 
 我们使用[node-gyp](https://github.com/nodejs/node-gyp)和TDengine服务端进行交互。安装node.js 连接器之前，还需安装以下软件：
 
-### Unix
+### Linux
 
 - `python` (建议`v2.7` , `v3.x.x` 目前还不支持)
+- `node`  必须采用v8.x版本，之后的版本存在兼容性的问题。
 - `make`
 - c语言编译器比如[GCC](https://gcc.gnu.org)
 
@@ -978,10 +981,10 @@ npm install td-connector
 
 #### 连接
 
-使用node.js连接器时，必须先<em>require</em> ```td-connector```，然后使用 ```taos.connect``` 函数。```taos.connect``` 函数必须提供的参数是```host```，其它参数在没有提供的情况下会使用如下的默认值。最后需要初始化```cursor``` 来和TDengine服务端通信 
+使用node.js连接器时，必须先<em>require</em> ```td2.0-connector```，然后使用 ```taos.connect``` 函数。```taos.connect``` 函数必须提供的参数是```host```，其它参数在没有提供的情况下会使用如下的默认值。最后需要初始化```cursor``` 来和TDengine服务端通信 
 
 ```javascript
-const taos = require('td-connector');
+const taos = require('td2.0-connector');
 var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
 var cursor = conn.cursor(); // Initializing a new cursor
 ```
@@ -1207,11 +1210,49 @@ TDengine在Window系统上提供的API与Linux系统是相同的， 应用程序
 其中，最常用的文件列出如下：
 
 + Client可执行文件: /usr/local/taos/bin/taos 软连接到 /usr/local/bin/taos
+
 + 配置文件: /usr/local/taos/cfg/taos.cfg 软连接到 /etc/taos/taos.cfg
+
 + 驱动程序目录: /usr/local/taos/driver/libtaos.1.6.5.1.dylib 软连接到 /usr/local/lib/libtaos.dylib
+
 + 驱动程序头文件: /usr/local/taos/include/taos.h 软连接到 /usr/local/include/taos.h
+
 + 日志目录（第一次运行程序时生成）：~/TDengineLog
 
+  
+
+
+## MQTT客户端
+
+MQTT客户端实现了订阅MQTT Broker的特定Topic将Json数据进行转换入库的功能，任何终端只要将数据发给特定的Topic 即可,不用再编写转换器或者数据解析程序。如果终端量大，需要 Mqtt Broker 群集，这里不再详述。
+
+#### 如何配置？
+
+首先需要在 taos.cfg 中打开配置项 mqtt 用来启用， 再通过修改 mqttBrokerAddress  的值来配置连接，格式为: 
+
+> mqtt://username:password@hostname:port/path/
+
+ 例如:
+
+> mqtt://127.0.0.1:1883/taos/  mqtt://root@kissme@127.0.0.1:1883/taos/
+
+
+#### Topic 格式说明
+
+ Mqtt 的topic格式为
+
+> /<path>/<token>/<db name>/<table name>/
+
+因此TDengine的Mqtt客户端会订阅:
+
+> /taos/+/+/+/+/  
+
+例如: 
+
+>  /taos/token/db/t/  
+
+注意: 测试时如果需要使用到Mqtt Broker 推荐使用 [mosquitto](http://mosquitto.org/) ，客户端可以使用  [MQTT.fx ](http://www.jensd.de/)
+
 
 
 [1]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
diff --git a/documentation20/webdocs/assets/EcoSystem.png b/documentation20/webdocs/assets/EcoSystem.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf8bf8f1e0a2311fc12202d712a8a2f9b8ce419b
Binary files /dev/null and b/documentation20/webdocs/assets/EcoSystem.png differ
diff --git a/documentation20/webdocs/assets/Picture2.png b/documentation20/webdocs/assets/Picture2.png
new file mode 100644
index 0000000000000000000000000000000000000000..715a8bd37ee9fe7e96eacce4e7ff563fedeefbee
Binary files /dev/null and b/documentation20/webdocs/assets/Picture2.png differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474914.png b/documentation20/webdocs/assets/clip_image001-2474914.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb369b1567c860b772e1bfdad64ff17aaac2534d
Binary files /dev/null and b/documentation20/webdocs/assets/clip_image001-2474914.png differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474939.png b/documentation20/webdocs/assets/clip_image001-2474939.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f00deea3a484986a5681ec9d00d8ae02e88fec
Binary files /dev/null and b/documentation20/webdocs/assets/clip_image001-2474939.png differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474961.png b/documentation20/webdocs/assets/clip_image001-2474961.png
new file mode 100644
index 0000000000000000000000000000000000000000..20ae8d6f7724a4bddcf8c7eb3809d468aa4223ed
Binary files /dev/null and b/documentation20/webdocs/assets/clip_image001-2474961.png differ
diff --git a/documentation20/webdocs/assets/clip_image001-2474987.png b/documentation20/webdocs/assets/clip_image001-2474987.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d09f7fc28e7a1fb7e3bb2b9b2bc7c20895e8bb4
Binary files /dev/null and b/documentation20/webdocs/assets/clip_image001-2474987.png differ
diff --git a/documentation20/webdocs/assets/clip_image001.png b/documentation20/webdocs/assets/clip_image001.png
new file mode 100644
index 0000000000000000000000000000000000000000..78b6d06a9562b802e80f0ed5fdb8963b5e525589
Binary files /dev/null and b/documentation20/webdocs/assets/clip_image001.png differ
diff --git a/documentation20/webdocs/assets/dnode.png b/documentation20/webdocs/assets/dnode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cea87dcccba5d2761996e5dde998022d86487eb9
Binary files /dev/null and b/documentation20/webdocs/assets/dnode.png differ
diff --git a/documentation20/webdocs/assets/fig1.png b/documentation20/webdocs/assets/fig1.png
new file mode 100644
index 0000000000000000000000000000000000000000..af9b74e0d1a872b8d93f71842dc0063bc8a86092
Binary files /dev/null and b/documentation20/webdocs/assets/fig1.png differ
diff --git a/documentation20/webdocs/assets/fig2.png b/documentation20/webdocs/assets/fig2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bae70ba86964c3c341b72ea1d3af04201f7c6c1
Binary files /dev/null and b/documentation20/webdocs/assets/fig2.png differ
diff --git a/documentation20/webdocs/assets/image-20190707124650780.png b/documentation20/webdocs/assets/image-20190707124650780.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ebcac863e862d8b240c86dec29be1ebe7aa50f0
Binary files /dev/null and b/documentation20/webdocs/assets/image-20190707124650780.png differ
diff --git a/documentation20/webdocs/assets/image-20190707124818590.png b/documentation20/webdocs/assets/image-20190707124818590.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1cb6325b2d4cd6f05c88b75b4d17ef85caa67f
Binary files /dev/null and b/documentation20/webdocs/assets/image-20190707124818590.png differ
diff --git a/documentation20/webdocs/assets/message.png b/documentation20/webdocs/assets/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..715a8bd37ee9fe7e96eacce4e7ff563fedeefbee
Binary files /dev/null and b/documentation20/webdocs/assets/message.png differ
diff --git a/documentation20/webdocs/assets/modules.png b/documentation20/webdocs/assets/modules.png
new file mode 100644
index 0000000000000000000000000000000000000000..10ae4703a6cbbf66afea325ce4c0f919f7769a07
Binary files /dev/null and b/documentation20/webdocs/assets/modules.png differ
diff --git a/documentation20/webdocs/assets/replica-forward.jpg b/documentation20/webdocs/assets/replica-forward.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..00b8c357b9ca2f067127c7dfae37b386b268f8dd
Binary files /dev/null and b/documentation20/webdocs/assets/replica-forward.jpg differ
diff --git a/documentation20/webdocs/assets/replica-master.png b/documentation20/webdocs/assets/replica-master.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb33f1ce98661563693215d8fc73b003235c7668
Binary files /dev/null and b/documentation20/webdocs/assets/replica-master.png differ
diff --git a/documentation20/webdocs/assets/replica-restore.jpg b/documentation20/webdocs/assets/replica-restore.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6da1bed4cc90b8a119b2fddf5f66ef3ab1b0a2fd
Binary files /dev/null and b/documentation20/webdocs/assets/replica-restore.jpg differ
diff --git a/documentation20/webdocs/assets/stable.png b/documentation20/webdocs/assets/stable.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cefaab6a9a4cdd671c671f7c6186dea41415ff0
Binary files /dev/null and b/documentation20/webdocs/assets/stable.png differ
diff --git a/documentation20/webdocs/assets/structure.png b/documentation20/webdocs/assets/structure.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fc8f47ab0a30d95b85ba1d85105726ed981e56e
Binary files /dev/null and b/documentation20/webdocs/assets/structure.png differ
diff --git a/documentation20/webdocs/assets/vnode.png b/documentation20/webdocs/assets/vnode.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6148d4907cf9a18bc52251f712d5c685651b7f5
Binary files /dev/null and b/documentation20/webdocs/assets/vnode.png differ
diff --git a/documentation20/webdocs/assets/write_master.png b/documentation20/webdocs/assets/write_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2dfc20bfc2ecf956a2aab1a8965a7bbcae4387
Binary files /dev/null and b/documentation20/webdocs/assets/write_master.png differ
diff --git a/documentation20/webdocs/assets/write_slave.png b/documentation20/webdocs/assets/write_slave.png
new file mode 100644
index 0000000000000000000000000000000000000000..cacb2cb6bcc4f4d934e979862387e1345bbac078
Binary files /dev/null and b/documentation20/webdocs/assets/write_slave.png differ
diff --git a/documentation20/webdocs/markdowndocs/Connections with other Tools-ch.md b/documentation20/webdocs/markdowndocs/Connections with other Tools-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..4e55f3c5e8f12f3277898b1f825dca5e22b2e6d1
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Connections with other Tools-ch.md	
@@ -0,0 +1,149 @@
+# 与其他工具的连接
+
+
+## Grafana
+
+TDengine能够与开源数据可视化系统[Grafana](https://www.grafana.com/)快速集成搭建数据监测报警系统，整个过程无需任何代码开发，TDengine中数据表中内容可以在仪表盘(DashBoard)上进行可视化展现。
+
+### 安装Grafana
+
+目前TDengine支持Grafana 5.2.4以上的版本。用户可以根据当前的操作系统，到Grafana官网下载安装包，并执行安装。下载地址如下：https://grafana.com/grafana/download。
+
+### 配置Grafana
+
+TDengine的Grafana插件在安装包的/usr/local/taos/connector/grafanaplugin目录下。
+
+以CentOS 7.2操作系统为例，将tdengine目录拷贝到/var/lib/grafana/plugins目录下，重新启动grafana即可。
+
+### 使用 Grafana
+
+#### 配置数据源
+
+用户可以直接通过 localhost:3000 的网址，登录 Grafana 服务器(用户名/密码:admin/admin)，通过左侧 `Configuration -> Data Sources` 可以添加数据源，如下图所示：
+
+![img](../assets/add_datasource1.jpg)
+
+点击 `Add data source` 可进入新增数据源页面，在查询框中输入 TDengine 可选择添加，如下图所示：
+
+![img](../assets/add_datasource2.jpg)
+
+进入数据源配置页面，按照默认提示修改相应配置即可：
+
+![img](../assets/add_datasource3.jpg)
+
+* Host： TDengine 集群的中任意一台服务器的 IP 地址与 TDengine RESTful 接口的端口号(6041)，默认 http://localhost:6041
+* User：TDengine 用户名。
+* Password：TDengine 用户密码。
+
+点击 `Save & Test` 进行测试，成功会有如下提示：
+
+![img](../assets/add_datasource4.jpg)
+
+#### 创建 Dashboard
+
+回到主界面创建 Dashboard，点击 Add Query 进入面板查询页面：
+
+![img](../assets/create_dashboard1.jpg)
+
+如上图所示，在 Query 中选中 `TDengine` 数据源，在下方查询框可输入相应 sql 进行查询，具体说明如下：
+
+* INPUT SQL：输入要查询的语句（该 SQL 语句的结果集应为两列多行），例如：`select avg(mem_system) from log.dn where  ts >= $from and ts < $to interval($interval)` ，其中，from、to 和 interval 为 TDengine插件的内置变量，表示从Grafana插件面板获取的查询范围和时间间隔。除了内置变量外，`也支持可以使用自定义模板变量`。
+* ALIAS BY：可设置当前查询别名。 
+* GENERATE SQL： 点击该按钮会自动替换相应变量，并生成最终执行的语句。
+  
+
+按照默认提示查询当前 TDengine 部署所在服务器指定间隔系统内存平均使用量如下：
+
+![img](../assets/create_dashboard2.jpg)
+
+> 关于如何使用Grafana创建相应的监测界面以及更多有关使用Grafana的信息，请参考Grafana官方的[文档](https://grafana.com/docs/)。
+
+#### 导入 Dashboard
+
+在 Grafana 插件目录 /usr/local/taos/connector/grafana/tdengine/dashboard/ 下提供了一个 `tdengine-grafana.json` 可导入的 dashboard。
+
+点击左侧 `Import` 按钮，并上传 `tdengine-grafana.json` 文件：
+
+![img](../assets/import_dashboard1.jpg)
+
+导入完成之后可看到如下效果：
+
+![img](../assets/import_dashboard2.jpg)
+
+
+## Matlab
+
+MatLab可以通过安装包内提供的JDBC Driver直接连接到TDengine获取数据到本地工作空间。
+
+### MatLab的JDBC接口适配
+
+MatLab的适配有下面几个步骤，下面以Windows10上适配MatLab2017a为例：
+
+- 将TDengine安装包内的驱动程序JDBCDriver-1.0.0-dist.jar拷贝到${matlab_root}\MATLAB\R2017a\java\jar\toolbox
+- 将TDengine安装包内的taos.lib文件拷贝至${matlab_ root _dir}\MATLAB\R2017a\lib\win64
+- 将新添加的驱动jar包加入MatLab的classpath。在${matlab_ root _dir}\MATLAB\R2017a\toolbox\local\classpath.txt文件中添加下面一行
+
+​          `$matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar`
+
+- 在${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a\下添加一个文件javalibrarypath.txt, 并在该文件中添加taos.dll的路径，比如您的taos.dll是在安装时拷贝到了C:\Windows\System32下，那么就应该在javalibrarypath.txt中添加如下一行：
+
+​          `C:\Windows\System32`
+
+### 在MatLab中连接TDengine获取数据
+
+在成功进行了上述配置后，打开MatLab。
+
+- 创建一个连接：
+
+  `conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’)`
+
+- 执行一次查询：
+
+  `sql0 = [‘select * from tb’]`
+
+  `data = select(conn, sql0);`
+
+- 插入一条记录:
+
+  `sql1 = [‘insert into tb values (now, 1)’]`
+
+  `exec(conn, sql1)`
+
+更多例子细节请参考安装包内examples\Matlab\TDengineDemo.m文件。
+
+## R 
+
+R语言支持通过JDBC接口来连接TDengine数据库。首先需要安装R语言的JDBC包。启动R语言环境，然后执行以下命令安装R语言的JDBC支持库：
+
+```R
+install.packages('RJDBC', repos='http://cran.us.r-project.org')
+```
+
+安装完成以后，通过执行`library('RJDBC')`命令加载 _RJDBC_ 包：
+
+然后加载TDengine的JDBC驱动：
+
+```R
+drv<-JDBC("com.taosdata.jdbc.TSDBDriver","JDBCDriver-2.0.0-dist.jar", identifier.quote="\"")
+```
+如果执行成功，不会出现任何错误信息。之后通过以下命令尝试连接数据库：
+
+```R
+conn<-dbConnect(drv,"jdbc:TSDB://192.168.0.1:0/?user=root&password=taosdata","root","taosdata")
+```
+
+注意将上述命令中的IP地址替换成正确的IP地址。如果没有任务错误的信息，则连接数据库成功，否则需要根据错误提示调整连接的命令。TDengine支持以下的 _RJDBC_ 包中函数：
+
+
+-	dbWriteTable(conn, "test", iris, overwrite=FALSE, append=TRUE)：将数据框iris写入表test中，overwrite必须设置为false，append必须设为TRUE,且数据框iris要与表test的结构一致。
+-	dbGetQuery(conn, "select count(*) from test")：查询语句
+-	dbSendUpdate(conn, "use db")：执行任何非查询sql语句。例如dbSendUpdate(conn, "use db")， 写入数据dbSendUpdate(conn, "insert into t1 values(now, 99)")等。
+-	dbReadTable(conn, "test")：读取表test中数据
+-	dbDisconnect(conn)：关闭连接
+-	dbRemoveTable(conn, "test")：删除表test
+
+TDengine客户端暂不支持如下函数：
+- dbExistsTable(conn, "test")：是否存在表test
+- dbListTables(conn)：显示连接中的所有表
+
+
diff --git a/documentation20/webdocs/markdowndocs/Connections with other Tools.md b/documentation20/webdocs/markdowndocs/Connections with other Tools.md
new file mode 100644
index 0000000000000000000000000000000000000000..8be05698497184aee2c41a60e32f39b636e2070e
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Connections with other Tools.md	
@@ -0,0 +1,167 @@
+# Connect with other tools
+
+## Telegraf
+
+TDengine is easy to integrate with [Telegraf](https://www.influxdata.com/time-series-platform/telegraf/), an open-source server agent for collecting and sending metrics and events, without more development.
+
+### Install Telegraf
+
+At present, TDengine supports Telegraf newer than version 1.7.4. Users can go to the [download link] and choose the proper package to install on your system.
+
+### Configure Telegraf
+
+Telegraf is configured by changing items in the configuration file */etc/telegraf/telegraf.conf*.
+
+
+In **output plugins** section，add _[[outputs.http]]_ iterm： 
+
+- _url_: http://ip:6020/telegraf/udb, in which _ip_ is the IP address of any node in TDengine cluster. Port 6020 is the RESTful APT port used by TDengine. _udb_ is the name of the database to save data, which needs to create beforehand.
+- _method_: "POST" 
+- _username_: username to login TDengine
+- _password_: password to login TDengine 
+- _data_format_: "json"
+- _json_timestamp_units_: "1ms"
+
+In **agent** part：
+
+- hostname: used to distinguish different machines. Need to be unique.
+- metric_batch_size: 30，the maximum number of records allowed to write in Telegraf. The larger the value is, the less frequent requests are sent. For TDengine, the value should be less than 50.
+
+Please refer to the [Telegraf docs](https://docs.influxdata.com/telegraf/v1.11/) for more information.
+
+## Grafana
+
+[Grafana] is an open-source system for time-series data display. It is easy to integrate TDengine and Grafana to build a monitor system. Data saved in TDengine can be fetched and shown on the Grafana dashboard.
+
+### Install Grafana
+
+For now, TDengine only supports Grafana newer than version 5.2.4. Users can go to the [Grafana download page] for the proper package to download.
+
+### Configure Grafana
+
+TDengine Grafana plugin is in the _/usr/local/taos/connector/grafana_ directory.
+Taking Centos 7.2 as an example, just copy TDengine directory to _/var/lib/grafana/plugins_ directory and restart Grafana.
+
+### Use Grafana
+
+Users can log in the Grafana server (username/password:admin/admin) through localhost:3000 to configure TDengine as the data source. As is shown in the picture below, TDengine as a data source option is shown in the box:
+
+
+![img](../assets/clip_image001.png)
+
+When choosing TDengine as the data source, the Host in HTTP configuration should be configured as the IP address of any node of a TDengine cluster. The port should be set as 6020. For example, when TDengine and Grafana are on the same machine, it should be configured as _http://localhost:6020. 
+
+
+Besides, users also should set the username and password used to log into TDengine. Then click _Save&Test_ button to save.
+
+![img](../assets/clip_image001-2474914.png)
+
+Then, TDengine as a data source should show in the Grafana data source list.
+
+![img](../assets/clip_image001-2474939.png)
+
+
+Then, users can create Dashboards in Grafana using TDengine as the data source:
+
+
+![img](../assets/clip_image001-2474961.png)
+
+ 
+
+Click _Add Query_ button to add a query and input the SQL command you want to run in the _INPUT SQL_ text box. The SQL command should expect a two-row, multi-column result, such as _SELECT count(*) FROM sys.cpu WHERE ts>=from and ts<​to interval(interval)_, in which, _from_, _to_ and _inteval_ are TDengine inner variables representing query time range and time interval.
+
+
+_ALIAS BY_ field is to set the query alias. Click _GENERATE SQL_ to send the command to TDengine:
+
+![img](../assets/clip_image001-2474987.png)
+
+Please refer to the [Grafana official document] for more information about Grafana.
+
+
+## Matlab
+
+Matlab can connect to and retrieve data from TDengine by TDengine JDBC Driver.
+
+### MatLab and TDengine JDBC adaptation
+
+Several steps are required to adapt Matlab to TDengine. Taking adapting Matlab2017a on Windows10 as an example:
+
+1. Copy the file _JDBCDriver-1.0.0-dist.jar_ in TDengine package to the directory _${matlab_root}\MATLAB\R2017a\java\jar\toolbox_
+2. Copy the file _taos.lib_ in TDengine package to _${matlab_ root _dir}\MATLAB\R2017a\lib\win64_
+3. Add the .jar package just copied to the Matlab classpath. Append the line below as the end of the file of _${matlab_ root _dir}\MATLAB\R2017a\toolbox\local\classpath.txt_
+
+​          `$matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar`
+
+4. Create a file called _javalibrarypath.txt_ in directory _${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a\_, and add the _taos.dll_ path in the file. For example, if the file _taos.dll_ is in the directory of _C:\Windows\System32_，then add the following line in file *javalibrarypath.txt*:
+
+​          `C:\Windows\System32`
+
+### TDengine operations in Matlab
+
+After correct configuration, open Matlab:
+
+- build a connection：
+
+  `conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’)`
+
+- Query：
+
+  `sql0 = [‘select * from tb’]`
+
+  `data = select(conn, sql0);`
+
+- Insert a record:
+
+  `sql1 = [‘insert into tb values (now, 1)’]`
+
+  `exec(conn, sql1)`
+
+Please refer to the file _examples\Matlab\TDengineDemo.m_ for more information.
+
+## R 
+
+Users can use R language to access the TDengine server with the JDBC interface. At first, install JDBC package in R:
+
+```R
+install.packages('rJDBC', repos='http://cran.us.r-project.org')
+```
+
+Then use _library_ function to load the package:
+
+```R
+library('RJDBC')
+```
+
+Then load the TDengine JDBC driver:
+
+```R
+drv<-JDBC("com.taosdata.jdbc.TSDBDriver","JDBCDriver-1.0.0-dist.jar", identifier.quote="\"")
+```
+If succeed, no error message will display. Then use the following command to try a database connection:
+
+```R
+conn<-dbConnect(drv,"jdbc:TSDB://192.168.0.1:0/?user=root&password=taosdata","root","taosdata")
+```
+
+Please replace the IP address in the command above to the correct one. If no error message is shown, then the connection is established successfully. TDengine supports below functions in _RJDBC_ package:
+
+
+-	_dbWriteTable(conn, "test", iris, overwrite=FALSE, append=TRUE)_: write the data in a data frame _iris_ to the table _test_ in the TDengine server. Parameter _overwrite_ must be _false_. _append_ must be _TRUE_ and the schema of the data frame _iris_ should be the same as the table _test_.
+-	_dbGetQuery(conn, "select count(*) from test")_: run a query command
+-	_dbSendUpdate(conn, "use db")_: run any non-query command.
+-	_dbReadTable(conn, "test"_): read all the data in table _test_
+-	_dbDisconnect(conn)_: close a connection
+-	_dbRemoveTable(conn, "test")_: remove table _test_
+
+Below functions are **not supported** currently:
+- _dbExistsTable(conn, "test")_: if talbe _test_ exists
+- _dbListTables(conn)_: list all tables in the connection
+
+
+[Telegraf]: www.taosdata.com
+[download link]: https://portal.influxdata.com/downloads
+[Telegraf document]: www.taosdata.com
+[Grafana]: https://grafana.com
+[Grafana download page]: https://grafana.com/grafana/download
+[Grafana official document]: https://grafana.com/docs/
+
diff --git a/documentation20/webdocs/markdowndocs/Connector.md b/documentation20/webdocs/markdowndocs/Connector.md
new file mode 100644
index 0000000000000000000000000000000000000000..e5ba6d518542fa60f71708482a9e9b65c12d09ad
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Connector.md
@@ -0,0 +1,896 @@
+# TDengine connectors
+
+TDengine provides many connectors for development, including C/C++, JAVA, Python, RESTful, Go, Node.JS, etc.
+
+NOTE: All APIs which require a SQL string as parameter, including but not limit to `taos_query`, `taos_query_a`, `taos_subscribe` in the C/C++ Connector and their counterparts in other connectors, can ONLY process one SQL statement at a time. If more than one SQL statements are provided, their behaviors are undefined.
+
+## C/C++ API
+
+C/C++ APIs are similar to the MySQL APIs. Applications should include TDengine head file _taos.h_ to use C/C++ APIs by adding the following line in code:
+```C
+#include <taos.h>
+```
+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.
+
+
+### Fundamental API
+
+Fundamentatal APIs prepare runtime environment for other APIs, for example, create a database connection.
+
+- `void taos_init()`
+
+  Initialize the runtime environment for TDengine client. The API is not necessary since it is called int _taos_connect_ by default.
+
+
+- `void taos_cleanup()`
+
+  Cleanup runtime environment, client should call this API before exit.
+
+
+- `int taos_options(TSDB_OPTION option, const void * arg, ...)`
+
+   Set client options. The parameter _option_ supports values of _TSDB_OPTION_CONFIGDIR_ (configuration directory), _TSDB_OPTION_SHELL_ACTIVITY_TIMER_, _TSDB_OPTION_LOCALE_ (client locale) and _TSDB_OPTION_TIMEZONE_ (client timezone).
+
+
+- `char* taos_get_client_info()`
+
+  Retrieve version information of client.
+
+
+- `TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, int port)`
+
+  Open a connection to a TDengine server. The parameters are:
+  
+  * ip: IP address of the server
+  * user: username
+  * pass: password
+  * db: database to use, **NULL** for no database to use after connection. Otherwise, the database should exist before connection or a connection error is reported.
+  * port: port number to connect
+
+  The handle returned by this API should be kept for future use.
+
+
+- `char *taos_get_server_info(TAOS *taos)`
+
+  Retrieve version information of server.
+
+
+- `int taos_select_db(TAOS *taos, const char *db)`
+
+  Set default database to `db`.
+
+
+- `void taos_close(TAOS *taos)`
+
+  Close a connection to a TDengine server by the handle returned by _taos_connect_`
+
+
+### C/C++ sync API
+
+Sync APIs are those APIs waiting for responses from the server after sending a request. TDengine has the following sync APIs:
+
+- `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
+
+  The API used to run a SQL command. The command can be DQL, DML or DDL. The parameter _taos_ is the handle returned by _taos_connect_. Return value _NULL_ means failure.
+
+
+- `int taos_result_precision(TAOS_RES *res)`
+
+  Get the timestamp precision of the result set, return value _0_ means milli-second, _1_ mean micro-second and _2_ means nano-second.
+
+
+- `TAOS_ROW taos_fetch_row(TAOS_RES *res)`
+
+  Fetch a row of return results through _res_.
+
+
+- `int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)`
+
+  Fetch multiple rows from the result set, return value is row count.
+
+
+- `int taos_num_fields(TAOS_RES *res)` and `int taos_field_count(TAOS_RES* res)`
+
+  These two APIs are identical, both return the number of fields in the return result.
+
+
+- `int* taos_fetch_lengths(TAOS_RES *res)`
+
+  Get the field lengths of the result set, return value is an array whose length is the field count.
+
+
+- `int taos_affected_rows(TAOS_RES *res)`
+
+  Get affected row count of the executed statement.
+
+
+- `TAOS_FIELD *taos_fetch_fields(TAOS_RES *res)`
+
+  Fetch the description of each field. The description includes the property of data type, field name, and bytes. The API should be used with _taos_num_fields_ to fetch a row of data. The structure of `TAOS_FIELD` is:
+
+  ```c
+  typedef struct taosField {
+    char     name[65];  // field name
+    uint8_t  type;      // data type
+    int16_t  bytes;     // length of the field in bytes
+  } TAOS_FIELD;
+  ```
+
+
+- `void taos_stop_query(TAOS_RES *res)`
+
+  Stop the execution of a query.
+
+
+- `void taos_free_result(TAOS_RES *res)`
+
+  Free the resources used by a result set. Make sure to call this API after fetching results or memory leak would happen.
+
+
+- `char *taos_errstr(TAOS_RES *res)`
+
+  Return the reason of the last API call failure. The return value is a string.
+
+
+- `int *taos_errno(TAOS_RES *res)`
+
+  Return the error code of the last API call failure. The return value is an integer.
+
+
+**Note**: The connection to a TDengine server is not multi-thread safe. So a connection can only be used by one thread.
+
+
+### 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.
+
+All async APIs require callback functions. The callback functions have the format:
+```C
+void fp(void *param, TAOS_RES * res, TYPE param3)
+```
+The first two parameters of the callback function are the same for all async APIs. The third parameter is different for different APIs. Generally, the first parameter is the handle provided to the API for action. The second parameter is a result handle.
+
+- `void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);`
+
+  The async version of _taos_query_.
+  
+  * taos: the handle returned by _taos_connect_.
+  * sql: the SQL command to run.
+  * fp: user defined callback function. The third parameter of the callback function _code_ is _0_ (for success) or a negative number (for failure, call taos_errstr to get the error as a string).  Applications mainly handle the second parameter, the returned result set.
+  * param: user provided parameter which is required by the callback function. 
+
+
+- `void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);`
+
+  The async API to fetch a batch of rows, which should only be used with a _taos_query_a_ call.
+  
+  * res: result handle returned by _taos_query_a_.
+  * fp: the callback function. _param_ is a user-defined structure to pass to _fp_. The parameter _numOfRows_ is the number of result rows in the current fetch cycle. In the callback function, applications should call _taos_fetch_row_ to get records from the result handle. After getting a batch of results, applications should continue to call _taos_fetch_rows_a_ API to handle the next batch, until the _numOfRows_ is _0_ (for no more data to fetch) or _-1_ (for failure).
+
+
+- `void taos_fetch_row_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), void *param);`
+
+  The async API to fetch a result row.
+
+  * res: result handle.
+  * fp: the callback function. _param_ is a user-defined structure to pass to _fp_. The third parameter of the callback function is a single result row, which is different from that of _taos_fetch_rows_a_ API. With this API, it is not necessary to call _taos_fetch_row_ to retrieve each result row, which is handier than _taos_fetch_rows_a_ but less efficient.
+
+
+Applications may apply operations on multiple tables. However, **it is important to make sure the operations on the same table are serialized**. That means after sending an insert request in a table to the server, no operations on the table are allowed before a response is received.
+
+
+### 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++ continuous query interface
+
+TDengine provides APIs for continuous query driven by time, which run queries periodically in the background. There are only two APIs:
+
+
+- `TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *param, TAOS_RES * res, TAOS_ROW row), int64_t stime, void *param, void (*callback)(void *));`
+
+  The API is used to create a continuous query.
+  * _taos_: the connection handle returned by _taos_connect_.
+  * _sqlstr_: the SQL string to run. Only query commands are allowed.
+  * _fp_: the callback function to run after a query. TDengine passes query result `row`, query state `res` and user provided parameter `param` to this function. In this callback, `taos_num_fields` and `taos_fetch_fields` could be used to fetch field information.
+  * _param_: a parameter passed to _fp_
+  * _stime_: the time of the stream starts in the form of epoch milliseconds. If _0_ is given, the start time is set as the current time.
+  * _callback_: a callback function to run when the continuous query stops automatically.
+
+  The API is expected to return a handle for success. Otherwise, a NULL pointer is returned.
+
+
+- `void taos_close_stream (TAOS_STREAM *tstr)`
+
+  Close the continuous query by the handle returned by _taos_open_stream_. Make sure to call this API when the continuous query is not needed anymore.
+  
+
+### C/C++ subscription API
+
+For the time being, TDengine supports subscription on one or multiple tables. It is implemented through periodic pulling from a TDengine server. 
+
+* `TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)`
+
+  The API is used to start a subscription session, it returns the subscription object on success and `NULL` in case of failure, the parameters are:
+  * **taos**: The database connnection, which must be established already.
+  * **restart**: `Zero` to continue a subscription if it already exits, other value to start from the beginning.
+  * **topic**: The unique identifier of a subscription.
+  * **sql**: A sql statement for data query, it can only be a `select` statement, can only query for raw data, and can only query data in ascending order of the timestamp field.
+  * **fp**: A callback function to receive query result, only used in asynchronization mode and should be `NULL` in synchronization mode, please refer below for its prototype.
+  * **param**: User provided additional parameter for the callback function.
+  * **interval**: Pulling interval in millisecond. Under asynchronization mode, API will call the callback function `fp` in this interval, system performance will be impacted if this interval is too short. Under synchronization mode, if the duration between two call to `taos_consume` is less than this interval, the second call blocks until the duration exceed this interval.
+
+* `typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code)`
+
+  Prototype of the callback function, the parameters are:
+  * tsub: The subscription object.
+  * res: The query result.
+  * param: User provided additional parameter when calling `taos_subscribe`.
+  * code: Error code in case of failures.
+
+* `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
+
+  The API used to get the new data from a TDengine server. It should be put in an loop. The parameter `tsub` is the handle returned by `taos_subscribe`. This API should only be called in synchronization mode. If the duration between two call to `taos_consume` is less than pulling interval, the second call blocks until the duration exceed the interval. The API returns the new rows if new data arrives, or empty rowset otherwise, and if there's an error, it returns `NULL`.
+  
+* `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
+
+  Stop a subscription session by the handle returned by `taos_subscribe`. If `keepProgress` is **not** zero, the subscription progress information is kept and can be reused in later call to `taos_subscribe`, the information is removed otherwise.
+
+
+##  Java Connector
+
+To Java delevopers, TDengine provides `taos-jdbcdriver` according to the JDBC(3.0) API. Users can find and download it through [Sonatype Repository][1].
+
+Since the native language of TDengine is C, the necessary TDengine library should be checked before using the taos-jdbcdriver:
+
+* libtaos.so (Linux)
+    After TDengine is installed successfully, the library `libtaos.so` will be automatically copied to the `/usr/lib/`, which is the system's default search path. 
+    
+* taos.dll (Windows)
+    After TDengine client is installed, the library `taos.dll` will be automatically copied to the `C:/Windows/System32`, which is the system's default search path. 
+    
+> Note: Please make sure that [TDengine Windows client][14] has been installed if developing on Windows. Now although TDengine client would be defaultly installed together with TDengine server, it can also be installed [alone][15].
+
+Since TDengine is time-series database, there are still some differences compared with traditional databases in using TDengine JDBC driver: 
+* TDengine doesn't allow to delete/modify a single record, and thus JDBC driver also has no such method. 
+* No support for transaction
+* No support for union between tables
+* No support for nested query，`There is at most one open ResultSet for each Connection. Thus, TSDB JDBC Driver will close current ResultSet if it is not closed and a new query begins`.
+
+## Version list of TAOS-JDBCDriver and required TDengine and JDK 
+
+| taos-jdbcdriver | TDengine  | JDK  | 
+| --- | --- | --- |
+| 2.0.2 | 2.0.0.x or higher | 1.8.x | 
+| 1.0.3 | 1.6.1.x or higher | 1.8.x |
+| 1.0.2 | 1.6.1.x or higher | 1.8.x |  
+| 1.0.1 | 1.6.1.x or higher | 1.8.x |
+
+## DataType in TDengine and Java
+
+The datatypes in TDengine include timestamp, number, string and boolean, which are converted as follows in Java:
+
+| TDengine | Java | 
+| --- | --- | 
+| TIMESTAMP | java.sql.Timestamp | 
+| INT | java.lang.Integer | 
+| BIGINT | java.lang.Long |  
+| FLOAT | java.lang.Float |  
+| DOUBLE | java.lang.Double | 
+| SMALLINT, TINYINT |java.lang.Short  |
+| BOOL | java.lang.Boolean | 
+| BINARY, NCHAR | java.lang.String | 
+
+## How to get TAOS-JDBC Driver
+
+### maven repository
+
+taos-jdbcdriver has been published to [Sonatype Repository][1]:
+* [sonatype][8]
+* [mvnrepository][9]
+* [maven.aliyun][10]
+
+Using the following pom.xml for maven projects
+
+```xml
+<dependencies>
+    <dependency>
+        <groupId>com.taosdata.jdbc</groupId>
+        <artifactId>taos-jdbcdriver</artifactId>
+        <version>2.0.2</version>
+    </dependency>
+</dependencies>
+```
+
+### JAR file from the source code
+
+After downloading the [TDengine][3] source code, execute `mvn clean package` in the directory `src/connector/jdbc` and then the corresponding jar file is generated.
+
+## Usage 
+
+### get the connection
+
+```java
+Class.forName("com.taosdata.jdbc.TSDBDriver");
+String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/log?user=root&password=taosdata";
+Connection conn = DriverManager.getConnection(jdbcUrl);
+```
+> `6030` is the default port and `log` is the default database for system monitor.
+
+A normal JDBC URL looks as follows:
+`jdbc:TAOS://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
+
+values in `{}` are necessary while values in `[]` are optional。Each option in the above URL denotes:
+
+* user：user name for login, defaultly root。
+* password：password for login，defaultly taosdata。
+* charset：charset for client，defaultly system charset
+* cfgdir：log directory for client, defaultly _/etc/taos/_ on Linux and _C:/TDengine/cfg_ on Windows。
+* locale：language for client，defaultly system locale。
+* timezone：timezone for client，defaultly system timezone。
+
+The options above can be configures (`ordered by priority`):
+1. JDBC URL 
+
+    As explained above.
+2. java.sql.DriverManager.getConnection(String jdbcUrl, Properties connProps)
+```java
+public Connection getConn() throws Exception{
+  Class.forName("com.taosdata.jdbc.TSDBDriver");
+  String jdbcUrl = "jdbc:TAOS://127.0.0.1:0/log?user=root&password=taosdata";
+  Properties connProps = new Properties();
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_USER, "root");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD, "taosdata");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR, "/etc/taos");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+  Connection conn = DriverManager.getConnection(jdbcUrl, connProps);
+  return conn;
+}
+```
+
+3. Configuration file (taos.cfg)
+
+    Default configuration file is _/var/lib/taos/taos.cfg_ On Linux and _C:\TDengine\cfg\taos.cfg_ on Windows
+```properties
+# client default username
+# defaultUser           root
+
+# client default password
+# defaultPass           taosdata
+
+# default system charset
+# charset               UTF-8
+
+# system locale
+# locale                en_US.UTF-8
+```
+> More options can refer to [client configuration][13]
+
+### Create databases and tables
+
+```java
+Statement stmt = conn.createStatement();
+
+// create database
+stmt.executeUpdate("create database if not exists db");
+
+// use database
+stmt.executeUpdate("use db");
+
+// create table
+stmt.executeUpdate("create table if not exists tb (ts timestamp, temperature int, humidity float)");
+```
+> Note: if no step like `use db`, the name of database must be added as prefix like _db.tb_ when operating on tables 
+
+### Insert data
+
+```java
+// insert data
+int affectedRows = stmt.executeUpdate("insert into tb values(now, 23, 10.3) (now + 1s, 20, 9.3)");
+
+System.out.println("insert " + affectedRows + " rows.");
+```
+> _now_ is the server time.
+> _now+1s_ is 1 second later than current server time. The time unit includes: _a_(millisecond), _s_(second), _m_(minute), _h_(hour), _d_(day), _w_(week), _n_(month), _y_(year).
+
+### Query database
+
+```java
+// query data
+ResultSet resultSet = stmt.executeQuery("select * from tb");
+
+Timestamp ts = null;
+int temperature = 0;
+float humidity = 0;
+while(resultSet.next()){
+
+    ts = resultSet.getTimestamp(1);
+    temperature = resultSet.getInt(2);
+    humidity = resultSet.getFloat("humidity");
+
+    System.out.printf("%s, %d, %s\n", ts, temperature, humidity);
+}
+```
+> query is consistent with relational database. The subscript start with 1 when retrieving return results. It is recommended to use the column name to retrieve results.
+
+### Close all
+
+```java
+resultSet.close();
+stmt.close();
+conn.close();
+```
+> `please make sure the connection is closed to avoid the error like connection leakage`
+
+## Using connection pool
+
+**HikariCP**
+
+* dependence in pom.xml：
+```xml
+<dependency>
+    <groupId>com.zaxxer</groupId>
+    <artifactId>HikariCP</artifactId>
+    <version>3.4.1</version>
+</dependency>
+```
+
+* Examples：
+```java
+ public static void main(String[] args) throws SQLException {
+    HikariConfig config = new HikariConfig();
+    config.setJdbcUrl("jdbc:TAOS://127.0.0.1:6030/log");
+    config.setUsername("root");
+    config.setPassword("taosdata");
+
+    config.setMinimumIdle(3);           //minimum number of idle connection
+    config.setMaximumPoolSize(10);      //maximum number of connection in the pool
+    config.setConnectionTimeout(10000); //maximum wait milliseconds for get connection from pool
+    config.setIdleTimeout(60000);       // max idle time for recycle idle connection 
+    config.setConnectionTestQuery("describe log.dn"); //validation query
+    config.setValidationTimeout(3000);   //validation query timeout
+
+    HikariDataSource ds = new HikariDataSource(config); //create datasource
+    
+    Connection  connection = ds.getConnection(); // get connection
+    Statement statement = connection.createStatement(); // get statement
+    
+    //query or insert 
+    // ...
+    
+    connection.close(); // put back to conneciton pool
+}
+```
+> The close() method will not close the connection from HikariDataSource.getConnection(). Instead, the connection is put back to the connection pool. 
+> More instructions can refer to [User Guide][5]
+
+**Druid**
+
+* dependency in pom.xml：
+
+```xml
+<dependency>
+    <groupId>com.alibaba</groupId>
+    <artifactId>druid</artifactId>
+    <version>1.1.20</version>
+</dependency>
+```
+
+* Examples：
+```java
+public static void main(String[] args) throws Exception {
+    Properties properties = new Properties();
+    properties.put("driverClassName","com.taosdata.jdbc.TSDBDriver");
+    properties.put("url","jdbc:TAOS://127.0.0.1:6030/log");
+    properties.put("username","root");
+    properties.put("password","taosdata");
+
+    properties.put("maxActive","10"); //maximum number of connection in the pool
+    properties.put("initialSize","3");//initial number of connection
+    properties.put("maxWait","10000");//maximum wait milliseconds for get connection from pool
+    properties.put("minIdle","3");//minimum number of connection in the pool
+
+    properties.put("timeBetweenEvictionRunsMillis","3000");// the interval milliseconds to test connection
+
+    properties.put("minEvictableIdleTimeMillis","60000");//the minimum milliseconds to keep idle
+    properties.put("maxEvictableIdleTimeMillis","90000");//the maximum milliseconds to keep idle
+
+    properties.put("validationQuery","describe log.dn"); //validation query
+    properties.put("testWhileIdle","true"); // test connection while idle
+    properties.put("testOnBorrow","false"); // don't need while testWhileIdle is true
+    properties.put("testOnReturn","false"); // don't need while testWhileIdle is true
+    
+    //create druid datasource
+    DataSource ds = DruidDataSourceFactory.createDataSource(properties);
+    Connection  connection = ds.getConnection(); // get connection
+    Statement statement = connection.createStatement(); // get statement
+
+    //query or insert 
+    // ...
+
+    connection.close(); // put back to conneciton pool
+}
+```
+> More instructions can refer to [User Guide][6]
+
+**Notice**
+* TDengine `v1.6.4.1` provides a function `select server_status()` to check heartbeat. It is highly recommended to use this function for `Validation Query`.
+
+As follows，`1` will be returned if `select server_status()` is successfully executed。
+```shell
+taos> select server_status();
+server_status()|
+================
+1              |
+Query OK, 1 row(s) in set (0.000141s)
+```
+
+## Python Connector
+
+### Install TDengine Python client
+
+Users can find python client packages in our source code directory _src/connector/python_. There are two directories corresponding two python versions. Please choose the correct package to install. Users can use _pip_ command to install:
+
+```cmd
+pip install src/connector/python/python2/
+```
+
+or
+
+```
+pip install src/connector/python/python3/
+```
+
+If _pip_ command is not installed on the system, users can choose to install pip or just copy the _taos_ directory in the python client directory to the application directory to use.
+
+### Python client interfaces
+
+To use TDengine Python client, import TDengine module at first:
+
+```python
+import taos 
+```
+
+Users can get module information from Python help interface or refer to our [python code example](). We list the main classes and methods below:
+
+- _TDengineConnection_ class
+
+  Run `help(taos.TDengineConnection)` in python terminal for details.
+
+- _TDengineCursor_ class
+
+  Run `help(taos.TDengineCursor)` in python terminal for details.
+
+- connect method
+
+  Open a connection. Run `help(taos.connect)` in python terminal for details.
+
+## RESTful Connector
+
+TDengine also provides RESTful API to satisfy developing on different platforms. Unlike other databases, TDengine RESTful API applies operations to the database through the SQL command in the body of HTTP POST request. What users are required to provide is just a URL.
+
+
+For the time being, TDengine RESTful API uses a _\<TOKEN\>_ generated from username and password for identification. Safer identification methods will be provided in the future.
+
+
+### HTTP URL encoding 
+
+To use TDengine RESTful API, the URL should have the following encoding format:
+```
+http://<ip>:<PORT>/rest/sql
+```
+- _ip_: IP address of any node in a TDengine cluster
+- _PORT_: TDengine HTTP service port. It is 6020 by default.
+
+For example, the URL encoding _http://192.168.0.1:6020/rest/sql_ used to send HTTP request to a TDengine server with IP address as 192.168.0.1.
+
+It is required to add a token in an HTTP request header for identification.
+
+```
+Authorization: Basic <TOKEN>
+```
+
+The HTTP request body contains the SQL command to run. If the SQL command contains a table name, it should also provide the database name it belongs to in the form of `<db_name>.<tb_name>`. Otherwise, an error code is returned.
+
+For example, use _curl_ command to send a HTTP request:
+
+```
+curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+or use
+
+```
+curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+where `TOKEN` is the encryted string of `{username}:{password}` using the Base64 algorithm, e.g. `root:taosdata` will be encoded as `cm9vdDp0YW9zZGF0YQ==`
+
+### HTTP response
+
+The HTTP resonse is in JSON format as below:
+
+```
+{
+    "status": "succ",
+    "head": ["column1","column2", …],
+    "data": [
+        ["2017-12-12 23:44:25.730", 1],
+        ["2017-12-12 22:44:25.728", 4]
+    ],
+    "rows": 2
+} 
+```
+Specifically,
+- _status_: the result of the operation, success or failure
+- _head_: description of returned result columns
+- _data_: the returned data array. If no data is returned, only an _affected_rows_ field is listed
+- _rows_: the number of rows returned
+
+### Example
+
+- Use _curl_ command to query all the data in table _t1_ of database _demo_:
+
+  `curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6020/rest/sql`
+
+The return value is like:
+
+```
+{
+    "status": "succ",
+    "head": ["column1","column2","column3"],
+    "data": [
+        ["2017-12-12 23:44:25.730", 1, 2.3],
+        ["2017-12-12 22:44:25.728", 4, 5.6]
+    ],
+    "rows": 2
+}
+```
+
+- Use HTTP to create a database：
+
+  `curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6020/rest/sql`
+
+    The return value should be:
+
+```
+{
+    "status": "succ",
+    "head": ["affected_rows"],
+    "data": [[1]],
+    "rows": 1,
+}
+```
+
+## Go Connector
+
+TDengine provides a GO client package `taosSql`. `taosSql` implements a kind of  interface of GO `database/sql/driver`. User can access TDengine by importing the package in their program with the following instructions, detailed usage please refer to `https://github.com/taosdata/driver-go/blob/develop/taosSql/driver_test.go`
+
+```Go
+import (
+    "database/sql"
+    _ github.com/taosdata/driver-go/taoSql“
+)
+```
+### API
+
+* `sql.Open(DRIVER_NAME string, dataSourceName string) *DB`
+
+   Open DB, generally DRIVER_NAME will be used as a constant with default value `taosSql`, dataSourceName is a combined String with format `user:password@/tcp(host:port)/dbname`. If user wants to access TDengine with multiple goroutine concurrently, the better way is to create an sql.Open object in each goroutine to access TDengine.
+
+  **Note**:	When calling this api, only a few initial work are done, instead the validity check happened during executing `Query` or `Exec`, at this time the connection will be created, and system will check if `user、password、host、port` is valid. Additionaly the most of features are implemented in the taosSql dependency lib `libtaos`, from this view, sql.Open is lightweight.
+
+*  `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
+
+  Execute non-Query related SQLs, the execution result is stored with type of Result.
+
+
+*  `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
+
+  Execute Query related SQLs, the execution result is *Raw, the detailed usage can refer GO interface `database/sql/driver`
+
+## Node.js Connector
+
+TDengine also provides a node.js connector package that is installable through [npm](https://www.npmjs.com/). The package is also in our source code at *src/connector/nodejs/*. The following instructions are also available [here](https://github.com/taosdata/tdengine/tree/master/src/connector/nodejs)
+
+To get started, just type in the following to install the connector through [npm](https://www.npmjs.com/).
+
+```cmd
+npm install td-connector
+```
+
+It is highly suggested you use npm. If you don't have it installed, you can also just copy the nodejs folder from *src/connector/nodejs/* into your node project folder.
+
+To interact with TDengine, we make use of the [node-gyp](https://github.com/nodejs/node-gyp) library. To install, you will need to install the following depending on platform (the following instructions are quoted from node-gyp)
+
+### On Unix
+
+- `python` (`v2.7` recommended, `v3.x.x` is **not** supported)
+- `make`
+- A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
+
+### On macOS
+
+- `python` (`v2.7` recommended, `v3.x.x` is **not** supported) (already installed on macOS)
+
+- Xcode
+
+  - You also need to install the 
+
+    ```
+    Command Line Tools
+    ```
+
+     via Xcode. You can find this under the menu 
+
+    ```
+    Xcode -> Preferences -> Locations
+    ```
+
+     (or by running 
+
+    ```
+    xcode-select --install
+    ```
+
+     in your Terminal) 
+
+    - This step will install `gcc` and the related toolchain containing `make`
+
+### On Windows
+
+#### Option 1
+
+Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) using `npm install --global --production windows-build-tools` from an elevated PowerShell or CMD.exe (run as Administrator).
+
+#### Option 2
+
+Install tools and configuration manually:
+
+- Install Visual C++ Build Environment: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) (using "Visual C++ build tools" workload) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community) (using the "Desktop development with C++" workload)
+- Install [Python 2.7](https://www.python.org/downloads/) (`v3.x.x` is not supported), and run `npm config set python python2.7` (or see below for further instructions on specifying the proper Python version and path.)
+- Launch cmd, `npm config set msvs_version 2017`
+
+If the above steps didn't work for you, please visit [Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules) for additional tips.
+
+To target native ARM64 Node.js on Windows 10 on ARM, add the  components "Visual C++ compilers and libraries for ARM64" and "Visual  C++ ATL for ARM64".
+
+### Usage
+
+The following is a short summary of the basic usage of the connector, the  full api and documentation can be found [here](http://docs.taosdata.com/node)
+
+#### Connection
+
+To use the connector, first require the library ```td-connector```. Running the function ```taos.connect``` with the connection options passed in as an object will return a TDengine connection object. The required connection option is ```host```, other options if not set, will be the default values as shown below.
+
+A cursor also needs to be initialized in order to interact with TDengine from Node.js.
+
+```javascript
+const taos = require('td-connector');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
+var cursor = conn.cursor(); // Initializing a new cursor
+```
+
+To close a connection, run
+
+```javascript
+conn.close();
+```
+
+#### Queries
+
+We can now start executing simple queries through the ```cursor.query``` function, which returns a TaosQuery object.
+
+```javascript
+var query = cursor.query('show databases;')
+```
+
+We can get the results of the queries through the ```query.execute()``` function, which returns a promise that resolves with a TaosResult object, which contains the raw data and additional functionalities such as pretty printing the results.
+
+```javascript
+var promise = query.execute();
+promise.then(function(result) {
+  result.pretty(); //logs the results to the console as if you were in the taos shell
+});
+```
+
+You can also query by binding parameters to a query by filling in the question marks in a string as so. The query will automatically parse what was binded and convert it to the proper format for use with TDengine
+
+```javascript
+var query = cursor.query('select * from meterinfo.meters where ts <= ? and areaid = ?;').bind(new Date(), 5);
+query.execute().then(function(result) {
+  result.pretty();
+})
+```
+
+The TaosQuery object can also be immediately executed upon creation by passing true as the second argument, returning a promise instead of a TaosQuery.
+
+```javascript
+var promise = cursor.query('select * from meterinfo.meters where v1 = 30;', true)
+promise.then(function(result) {
+  result.pretty();
+})
+```
+#### Async functionality
+
+Async queries can be performed using the same functions such as `cursor.execute`, `cursor.query`, but now with `_a` appended to them.
+
+Say you want to execute an two async query on two seperate tables, using `cursor.query_a`, you can do that and get a TaosQuery object, which upon executing with the `execute_a` function, returns a promise that resolves with a TaosResult object.
+
+```javascript
+var promise1 = cursor.query_a('select count(*), avg(v1), avg(v2) from meter1;').execute_a()
+var promise2 = cursor.query_a('select count(*), avg(v1), avg(v2) from meter2;').execute_a();
+promise1.then(function(result) {
+  result.pretty();
+})
+promise2.then(function(result) {
+  result.pretty();
+})
+```
+
+
+### Example
+
+An example of using the NodeJS connector to create a table with weather data and create and execute queries can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example.js) (The preferred method for using the connector)
+
+An example of using the NodeJS connector to achieve the same things but without all the object wrappers that wrap around the data returned to achieve higher functionality can be found [here](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js)
+
+[1]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[2]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[3]: https://github.com/taosdata/TDengine
+[4]: https://www.taosdata.com/blog/2019/12/03/jdbcdriver%e6%89%be%e4%b8%8d%e5%88%b0%e5%8a%a8%e6%80%81%e9%93%be%e6%8e%a5%e5%ba%93/
+[5]: https://github.com/brettwooldridge/HikariCP
+[6]: https://github.com/alibaba/druid
+[7]: https://github.com/taosdata/TDengine/issues
+[8]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[9]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[10]: https://maven.aliyun.com/mvn/search
+[11]:  https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/SpringJdbcTemplate
+[12]: https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/springbootdemo
+[13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE
+[14]: https://www.taosdata.com/cn/documentation20/connector/#Windows
+[15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md b/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md
new file mode 100644
index 0000000000000000000000000000000000000000..8c158da4c5958384064b9993de6643be86b94fee
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Contributor_License_Agreement.md
@@ -0,0 +1,35 @@
+# TaosData Contributor License Agreement
+
+This TaosData Contributor License Agreement (CLA) applies to any contribution you make to any TaosData projects. If you are representing your employing organization to sign this agreement, please warrant that you have the authority to grant the agreement.
+
+## Terms
+
+**"TaosData"**, **"we"**, **"our"** and **"us"** means TaosData, inc.
+
+**"You"** and **"your"** means you or the organization you are on behalf of to sign this agreement.
+
+**"Contribution"** means any original work you, or the organization you represent submit to TaosData for any project in any manner.
+
+## Copyright License
+
+All rights of your Contribution submitted to TaosData in any manner are granted to TaosData and recipients of software distributed by TaosData. You waive any rights that my affect our ownership of the copyright and grant to us a perpetual, worldwide, transferable, non-exclusive, no-charge, royalty-free, irrevocable, and sublicensable license to use, reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Contributions and any derivative work created based on a Contribution.
+
+## Patent License
+
+With respect to any patents you own or that you can license without payment to any third party, you grant to us and to any recipient of software distributed by us, a perpetual, worldwide, transferable, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have make, use, sell, offer to sell, import, and otherwise transfer the Contribution in whole or in part, alone or included in any product under any patent you own, or license from a third party, that is necessarily infringed by the Contribution or by combination of the Contribution with any Work.
+
+## Your Representations and Warranties
+
+You represent and warrant that:
+
+- the Contribution you submit is an original work that you can legally grant the rights set out in this agreement.
+
+- the Contribution you submit and licenses you granted does not and will not, infringe the rights of any third party.
+
+- you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions. You also warrant to notify TaosData immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges.
+
+## Support
+
+You are not obligated to support your Contribution except you volunteer to provide support. If you want, you can provide for a fee.
+
+**I agree and accept on behalf of myself and behalf of my organization:**
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Documentation-ch.md b/documentation20/webdocs/markdowndocs/Documentation-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..077a0431383da8067b6bd33c4b7218627b7adbd0
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Documentation-ch.md
@@ -0,0 +1,130 @@
+# TDengine文档
+
+TDengine是一个高效的存储、查询、分析时序大数据的平台，专为物联网、车联网、工业互联网、运维监测等优化而设计。您可以像使用关系型数据库MySQL一样来使用它，但建议您在使用前仔细阅读一遍下面的文档，特别是[数据模型](https://www.taosdata.com/cn/documentation20/data-model-and-architecture)与[数据建模](https://www.taosdata.com/cn/documentation20/model)一节。除本文档之外，欢迎[下载产品白皮书](https://www.taosdata.com/downloads/TDengine White Paper.pdf)。如需查阅TDengine 1.6 文档，请点击[这里](https://www.taosdata.com/cn/documentation16/)访问。
+
+## TDengine介绍
+
+- TDengine 简介及特色
+- TDengine 适用场景
+
+## [立即开始](https://www.taosdata.com/cn/getting-started)
+
+- [快捷安装](https://www.taosdata.com/cn/documentation20/getting-started/#快捷安装)：可通过源码、安装包或docker安装，三秒钟搞定
+- [轻松启动](https://www.taosdata.com/cn/documentation20/getting-started/#轻松启动)：使用systemctl 启停TDengine
+- [命令行程序TAOS](https://www.taosdata.com/cn/documentation20/getting-started/#TDengine命令行程序)：访问TDengine的简便方式
+- [极速体验](https://www.taosdata.com/cn/documentation20/getting-started/#TDengine-极速体验)：运行示例程序，快速体验高效的数据插入、查询
+
+## [数据模型和整体架构](https://www.taosdata.com/cn/documentation20/architecture)
+
+- [数据模型](https://www.taosdata.com/cn/documentation20/architecture/#数据模型)：关系型数据库模型，但要求每个采集点单独建表
+- [集群与基本逻辑单元](https://www.taosdata.com/cn/documentation20/architecture/#集群与基本逻辑单元)：吸取NoSQL优点，支持水平扩展，支持高可靠
+- [存储模型与数据分区、分片](https://www.taosdata.com/cn/documentation20/architecture/#存储模型与数据分区、分片)：标签数据与时序数据完全分离，按vnode和时间两个维度对数据切分
+- [数据写入与复制流程](https://www.taosdata.com/cn/documentation20/architecture/#数据写入与复制流程)：先写入WAL、之后写入缓存，再给应用确认，支持多副本
+- [缓存与持久化](https://www.taosdata.com/cn/documentation20/architecture/#缓存与持久化)：最新数据缓存在内存中，但落盘时采用列式存储、超高压缩比
+- [数据查询](https://www.taosdata.com/cn/documentation20/architecture/#数据查询)：支持各种函数、时间轴聚合、插值、多表聚合
+
+## [数据建模](https://www.taosdata.com/cn/documentation20/model)
+
+- [创建库](https://www.taosdata.com/cn/documentation20/model/#创建库)：为具有相似数据特征的数据采集点创建一个库
+- [创建超级表](https://www.taosdata.com/cn/documentation20/model/#创建超级表)：为同一类型的数据采集点创建一个超级表
+- [创建表](https://www.taosdata.com/cn/documentation20/model/#创建表)：使用超级表做模板，为每一个具体的数据采集点单独建表
+
+## [高效写入数据](https://www.taosdata.com/cn/documentation20/insert)
+
+- [SQL写入](https://www.taosdata.com/cn/documentation20/insert/#SQL写入)：使用SQL insert命令向一张或多张表写入单条或多条记录
+- [Telegraf写入](https://www.taosdata.com/cn/documentation20/insert/#Telegraf直接写入)：配置Telegraf, 不用任何代码，将采集数据直接写入
+- [Prometheus写入](https://www.taosdata.com/cn/documentation20/insert/#Prometheus直接写入)：配置Prometheus, 不用任何代码，将数据直接写入
+- [EMQ X Broker](https://www.taosdata.com/cn/documentation20/insert/#EMQ-X-Broker直接写入)：配置EMQ X，不用任何代码，就可将MQTT数据直接写入
+
+## [高效查询数据](https://www.taosdata.com/cn/documentation20/queries)
+
+- [主要查询功能](https://www.taosdata.com/cn/documentation20/queries/#主要查询功能)：支持各种标准函数，设置过滤条件，时间段查询
+- [多表聚合查询](https://www.taosdata.com/cn/documentation20/queries/#多表聚合查询)：使用超级表，设置标签过滤条件，进行高效聚合查询
+- [降采样查询值](https://www.taosdata.com/cn/documentation20/queries/#降采样查询、插值)：按时间段分段聚合，支持插值
+
+## [高级功能](https://www.taosdata.com/cn/documentation20/advanced-features)
+
+- [连续查询(Continuous Query)](https://www.taosdata.com/cn/documentation20/advanced-features/#连续查询(Continuous-Query))：基于滑动窗口，定时自动的对数据流进行查询计算
+- [数据订阅(Publisher/Subscriber)](https://www.taosdata.com/cn/documentation20/advanced-features/#数据订阅(Publisher/Subscriber))：象典型的消息队列，应用可订阅接收到的最新数据
+- [缓存(Cache)](https://www.taosdata.com/cn/documentation20/advanced-features/#缓存(Cache))：每个设备最新的数据都会缓存在内存中，可快速获取
+- [报警监测](https://www.taosdata.com/cn/documentation20/advanced-features/#报警监测(Alert))：根据配置规则，自动监测超限行为数据，并主动推送
+
+## [连接器](https://www.taosdata.com/cn/documentation20/connector)
+
+- [C/C++ Connector](https://www.taosdata.com/cn/documentation20/connector/#C/C++-Connector)：通过libtaos客户端的库，连接TDengine服务器的主要方法
+- [Java Connector(JDBC)](https://www.taosdata.com/cn/documentation20/connector-java)：通过标准的JDBC API，给Java应用提供到TDengine的连接
+- [Python Connector](https://www.taosdata.com/cn/documentation20/connector/#Python-Connector)：给Python应用提供一个连接TDengine服务器的驱动
+- [RESTful Connector](https://www.taosdata.com/cn/documentation20/connector/#RESTful-Connector)：提供一最简单的连接TDengine服务器的方式
+- [Go Connector](https://www.taosdata.com/cn/documentation20/connector/#Go-Connector)：给Go应用提供一个连接TDengine服务器的驱动
+- [Node.js Connector](https://www.taosdata.com/cn/documentation20/connector/#Node.js-Connector)：给node应用提供一个链接TDengine服务器的驱动
+
+## [与其他工具的连接](https://www.taosdata.com/cn/documentation20/connections-with-other-tools)
+
+- [Grafana](https://www.taosdata.com/cn/documentation20/connections-with-other-tools/#Grafana)：获取并可视化保存在TDengine的数据
+- [Matlab](https://www.taosdata.com/cn/documentation20/connections-with-other-tools/#Matlab)：通过配置Matlab的JDBC数据源访问保存在TDengine的数据
+- [R](https://www.taosdata.com/cn/documentation20/connections-with-other-tools/#R)：通过配置R的JDBC数据源访问保存在TDengine的数据
+
+## [TDengine集群的安装、管理](https://www.taosdata.com/cn/documentation20/cluster)
+
+- [安装](https://www.taosdata.com/cn/documentation20/cluster/#创建第一个节点)：与单节点的安装一样，但要设好配置文件里的参数first
+- [节点管理](https://www.taosdata.com/cn/documentation20/cluster/#节点管理)：增加、删除、查看集群的节点
+- [mnode的管理](https://www.taosdata.com/cn/documentation20/cluster/#Mnode的高可用)：系统自动创建、无需任何人工干预
+- [负载均衡](https://www.taosdata.com/cn/documentation20/cluster/#负载均衡)：一旦节点个数或负载有变化，自动进行
+- [节点离线处理](https://www.taosdata.com/cn/documentation20/cluster/#节点离线处理)：节点离线超过一定时长，将从集群中剔除
+- [Arbitrator](https://www.taosdata.com/cn/documentation20/cluster/#Arbitrator的使用)：对于偶数个副本的情形，使用它可以防止split brain
+
+## [TDengine的运营和维护](https://www.taosdata.com/cn/documentation20/administrator)
+
+- [容量规划](https://www.taosdata.com/cn/documentation20/administrator/#容量规划)：根据场景，估算硬件资源
+- [容错和灾备](https://www.taosdata.com/cn/documentation20/administrator/#容错和灾备)：设置正确的WAL和数据副本数
+- [系统配置](https://www.taosdata.com/cn/documentation20/administrator/#服务端配置)：端口，缓存大小，文件块大小和其他系统配置
+- [用户管理](https://www.taosdata.com/cn/documentation20/administrator/#用户管理)：添加、删除TDengine用户，修改用户密码
+- [数据导入](https://www.taosdata.com/cn/documentation20/administrator/#数据导入)：可按脚本文件导入，也可按数据文件导入
+- [数据导出](https://www.taosdata.com/cn/documentation20/administrator/#数据导出)：从shell按表导出，也可用taosdump工具做各种导出
+- [系统监控](https://www.taosdata.com/cn/documentation20/administrator/#系统监控)：检查系统现有的连接、查询、流式计算，日志和事件等
+- [文件目录结构](https://www.taosdata.com/cn/documentation20/administrator/#文件目录结构)：TDengine数据文件、配置文件等所在目录
+
+## [TAOS SQL](https://www.taosdata.com/cn/documentation20/taos-sql)
+
+- [支持的数据类型](https://www.taosdata.com/cn/documentation20/taos-sql/#支持的数据类型)：支持时间戳、整型、浮点型、布尔型、字符型等多种数据类型
+- [数据库管理](https://www.taosdata.com/cn/documentation20/taos-sql/#数据库管理)：添加、删除、查看数据库
+- [表管理](https://www.taosdata.com/cn/documentation20/taos-sql/#表管理)：添加、删除、查看、修改表
+- [超级表管理](https://www.taosdata.com/cn/documentation20/taos-sql/#超级表STable管理)：添加、删除、查看、修改超级表
+- [标签管理](https://www.taosdata.com/cn/documentation20/taos-sql/#超级表-STable-中-TAG-管理)：增加、删除、修改标签
+- [数据写入](https://www.taosdata.com/cn/documentation20/taos-sql/#数据写入)：支持单表单条、多条、多表多条写入，支持历史数据写入
+- [数据查询](https://www.taosdata.com/cn/documentation20/taos-sql/#数据查询)：支持时间段、值过滤、排序、查询结果手动分页等
+- [SQL函数](https://www.taosdata.com/cn/documentation20/taos-sql/#SQL函数)：支持各种聚合函数、选择函数、计算函数，如avg, min, diff等
+- [时间维度聚合](https://www.taosdata.com/cn/documentation20/taos-sql/#时间维度聚合)：将表中数据按照时间段进行切割后聚合，降维处理
+- [边界线制](https://www.taosdata.com/cn/documentation20/taos-sql/#TAOS-SQL-边界限制)：TAOS SQL的边界限制
+- [错误码](https://www.taosdata.com/cn/documentation20/Taos-Error-Code)：TDengine 2.0 错误码以及对应的十进制码
+
+## TDengine的技术设计
+
+- 系统模块：taosd的功能和模块划分
+- 数据复制：支持实时同步、异步复制，保证系统的High Availibility
+- [技术博客](https://www.taosdata.com/cn/blog/?categories=3)：更多的技术分析和架构设计文章
+
+## 常用工具
+
+- [TDengine样例导入工具](https://www.taosdata.com/blog/2020/01/18/1166.html)
+- [TDengine性能对比测试工具](https://www.taosdata.com/blog/2020/01/18/1166.html)
+
+## TDengine与其他数据库的对比测试
+
+- [用InfluxDB开源的性能测试工具对比InfluxDB和TDengine](https://www.taosdata.com/blog/2020/01/13/1105.html)
+- [TDengine与OpenTSDB对比测试](https://www.taosdata.com/blog/2019/08/21/621.html)
+- [TDengine与Cassandra对比测试](https://www.taosdata.com/blog/2019/08/14/573.html)
+- [TDengine与InfluxDB对比测试](https://www.taosdata.com/blog/2019/07/19/419.html)
+- [TDengine与InfluxDB、OpenTSDB、Cassandra、MySQL、ClickHouse等数据库的对比测试报告](https://www.taosdata.com/downloads/TDengine_Testing_Report_cn.pdf)
+
+##物联网大数据
+
+- [物联网、工业互联网大数据的特点](https://www.taosdata.com/blog/2019/07/09/105.html)
+- [物联网大数据平台应具备的功能和特点](https://www.taosdata.com/blog/2019/07/29/542.html)
+- [通用大数据架构为什么不适合处理物联网数据？](https://www.taosdata.com/blog/2019/07/09/107.html)
+- [物联网、车联网、工业互联网大数据平台，为什么推荐使用TDengine？](https://www.taosdata.com/blog/2019/07/09/109.html)
+
+## [培训和FAQ](https://www.taosdata.com/cn/faq)
+
+- [FAQ](https://www.taosdata.com/cn/documentation20/faq)：常见问题与答案
+- [应用案列](https://www.taosdata.com/cn/blog/?categories=4)：一些使用实例来解释如何使用TDengine
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Documentation.md b/documentation20/webdocs/markdowndocs/Documentation.md
new file mode 100644
index 0000000000000000000000000000000000000000..bdafd40f7c76425a4f9734a2561b2b9a945c757f
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Documentation.md
@@ -0,0 +1,87 @@
+#Documentation 
+
+TDengine is a highly efficient platform to store, query, and analyze time-series data. It works like a relational database, but you are strongly suggested to read through the following documentation before you experience it.
+
+##Getting Started
+
+- Quick Start: download, install and experience TDengine in a few seconds
+- TDengine Shell: command-line interface to access TDengine server
+- Major Features: insert/query, aggregation, cache,  pub/sub, continuous query   
+
+## Data Model and Architecture
+
+- Data Model: relational database model, but one table for one device with static tags
+- Architecture: Management Module, Data Module, Client Module
+- Writing Process: records recieved are written to WAL, cache, then ack is sent back to client
+- Data Storage: records are sharded in the time range, and stored column by column 
+
+##TAOS SQL 
+
+- Data Types: support timestamp, int, float, double, binary, nchar, bool, and other types
+- Database Management: add, drop, check databases
+- Table Management: add, drop, check, alter tables
+- Inserting Records: insert one or more records into tables, historical records can be imported
+- Data Query: query data with time range and filter conditions, support limit/offset
+- SQL Functions: support aggregation, selector, transformation functions
+- Downsampling: aggregate data in successive time windows, support interpolation
+
+##STable: Super Table
+
+- What is a Super Table: an innovated way to aggregate tables
+- Create a STable: it is like creating a standard table, but with tags defined
+- Create a Table via STable: use STable as the template, with tags specified
+- Aggregate Tables via STable: group tables together by specifying the tags filter condition
+- Create Table Automatically: create tables automatically with a STable as a template
+- Management of STables: create/delete/alter super table just like standard tables
+- Management of Tags: add/delete/alter tags on super tables or tables  
+
+##Advanced Features
+
+- Continuous Query: query executed by TDengine periodically with a sliding window
+- Publisher/Subscriber: subscribe to the newly arrived data like a typical messaging system 
+- Caching: the newly arrived data of each device/table will always be cached
+
+##Connector
+
+- C/C++ Connector: primary method to connect to the server through libtaos client library
+- Java Connector: driver for connecting to the server from Java applications using the JDBC API
+- Python Connector: driver for connecting to the server from Python applications 
+- RESTful Connector: a simple way to interact with TDengine via HTTP
+- Go Connector: driver for connecting to the server from Go applications
+- Node.js Connector: driver for connecting to the server from node applications
+
+##Connections with Other Tools
+
+- Telegraf: pass the collected DevOps metrics to TDengine 
+- Grafana: query the data saved in TDengine and visualize them 
+- Matlab: access TDengine server from Matlab via JDBC
+- R: access TDengine server from R via JDBC 
+
+##Administrator
+
+- Directory and Files: files and directories related with TDengine
+- Configuration on Server: customize IP port, cache size, file block size and other settings
+- Configuration on Client: customize locale, default user and others   
+- User Management: add/delete users, change passwords
+- Import Data: import data into TDengine from either script or CSV file
+- Export Data: export data either from TDengine shell or from tool taosdump
+- Management of Connections, Streams, Queries: check or kill the connections, queries
+- System Monitor: collect the system metric, and log important operations
+
+##More on System Architecture
+
+- Storage Design: column-based storage with optimization on time-series data 
+- Query Design: an efficient way to query time-series data
+- Technical blogs to delve into the inside of TDengine
+
+## More on IoT Big Data
+
+- [Characteristics of IoT Big Data](https://www.taosdata.com/blog/2019/07/09/characteristics-of-iot-big-data/)
+- [Why don’t General Big Data Platforms Fit IoT Scenarios?](https://www.taosdata.com/blog/2019/07/09/why-does-the-general-big-data-platform-not-fit-iot-data-processing/)
+- [Why TDengine is the Best Choice for IoT Big Data Processing?](https://www.taosdata.com/blog/2019/07/09/why-tdengine-is-the-best-choice-for-iot-big-data-processing/)
+
+##Tutorials & FAQ
+
+- <a href='https://www.taosdata.com/en/faq'>FAQ</a>: a list of frequently asked questions and answers 
+- <a href='https://www.taosdata.com/en/blog/?categories=4'>Use cases</a>: a few typical cases to explain how to use TDengine in IoT platform
+
diff --git a/documentation20/webdocs/markdowndocs/Evaluation-ch.md b/documentation20/webdocs/markdowndocs/Evaluation-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..7d09d0dd33a332d4b74dd16bd64cb4e9503fd07d
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Evaluation-ch.md
@@ -0,0 +1,63 @@
+# TDengine 介绍
+
+## TDengine 简介
+
+TDengine是涛思数据面对高速增长的物联网大数据市场和技术挑战推出的创新性的大数据处理产品，它不依赖任何第三方软件，也不是优化或包装了一个开源的数据库或流式计算产品，而是在吸取众多传统关系型数据库、NoSQL数据库、流式计算引擎、消息队列等软件的优点之后自主开发的产品，在时序空间大数据处理上，有着自己独到的优势。
+
+TDengine的模块之一是时序数据库。但除此之外，为减少研发的复杂度、系统维护的难度，TDengine还提供缓存、消息队列、订阅、流式计算等功能，为物联网、工业互联网大数据的处理提供全栈的技术方案，是一个高效易用的物联网大数据平台。与Hadoop等典型的大数据平台相比，它具有如下鲜明的特点：
+
+* __10倍以上的性能提升__：定义了创新的数据存储结构，单核每秒能处理至少2万次请求，插入数百万个数据点，读出一千万以上数据点，比现有通用数据库快十倍以上。
+* __硬件或云服务成本降至1/5__：由于超强性能，计算资源不到通用大数据方案的1/5；通过列式存储和先进的压缩算法，存储空间不到通用数据库的1/10。
+* __全栈时序数据处理引擎__：将数据库、消息队列、缓存、流式计算等功能融为一体，应用无需再集成Kafka/Redis/HBase/Spark/HDFS等软件，大幅降低应用开发和维护的复杂度成本。 
+* __强大的分析功能__：无论是十年前还是一秒钟前的数据，指定时间范围即可查询。数据可在时间轴上或多个设备上进行聚合。即席查询可通过Shell, Python, R, Matlab随时进行。
+* __与第三方工具无缝连接__：不用一行代码，即可与Telegraf, Grafana, EMQ, Prometheus, Matlab, R等集成。后续将支持OPC, Hadoop, Spark等, BI工具也将无缝连接。
+* __零运维成本、零学习成本__：安装、集群一秒搞定，无需分库分表，实时备份。标准SQL，支持JDBC, RESTful, 支持Python/Java/C/C++/Go, 与MySQL相似，零学习成本。
+
+采用TDengine，可将典型的物联网、车联网、工业互联网大数据平台的总拥有成本大幅降低。但需要指出的是，因充分利用了物联网时序数据的特点，它无法用来处理网络爬虫、微博、微信、电商、ERP、CRM等通用型数据。
+
+<center> <img src="../assets/EcoSystem.png"> </center>
+<center>图 1. TDengine技术生态图</center>
+
+## TDengine 总体适用场景
+
+作为一个IOT大数据平台，TDengine的典型适用场景是在IOT范畴，而且用户有一定的数据量。本文后续的介绍主要针对这个范畴里面的系统。范畴之外的系统，比如CRM，ERP等，不在本文讨论范围内。
+
+
+### 数据源特点和需求
+从数据源角度，设计人员可以从下面几个角度分析TDengine在目标应用系统里面的适用性。
+
+|数据源特点和需求|不适用|可能适用|非常适用|简单说明|
+|---|---|---|---|---|
+|总体数据量巨大|  |  | √ |TDengine在容量方面提供出色的水平扩展功能，并且具备匹配高压缩的存储结构，达到业界最优的存储效率。|
+|数据输入速度偶尔或者持续巨大|   |   | √ | TDengine的性能大大超过同类产品，可以在同样的硬件环境下持续处理大量的输入数据，并且提供很容易在用户环境里面运行的性能评估工具。|
+|数据源数目巨大|   |   | √ |TDengine设计中包含专门针对大量数据源的优化，包括数据的写入和查询，尤其适合高效处理海量（千万或者更多量级）的数据源。|
+
+### 系统架构要求
+|系统架构要求|不适用|可能适用|非常适用|简单说明|
+|---|---|---|---|---|
+|要求简单可靠的系统架构|  |  | √ |TDengine的系统架构非常简单可靠，自带消息队列，缓存，流式计算，监控等功能，无需集成额外的第三方产品。|
+|要求容错和高可靠|  |  | √ |TDengine的集群功能，自动提供容错灾备等高可靠功能。|
+|标准化规范|  |  | √ |TDengine使用标准的SQL语言提供主要功能，遵守标准化规范。|
+
+### 系统功能需求
+|系统功能需求|不适用|可能适用|非常适用|简单说明|
+|---|---|---|---|---|
+|要求完整的内置数据处理算法|  | √ |  |TDengine的实现了通用的数据处理算法，但是还没有做到妥善处理各行各业的所有要求，因此特殊类型的处理还需要应用层面处理。|
+|需要大量的交叉查询处理|  | √ |  |这种类型的处理更多应该用关系型数据系统处理，或者应该考虑TDengine和关系型数据系统配合实现系统功能。|
+
+### 系统性能需求
+|系统性能需求|不适用|可能适用|非常适用|简单说明|
+|---|---|---|---|---|
+|要求较大的总体处理能力|  |  | √ |TDengine的集群功能可以轻松地让多服务器配合达成处理能力的提升。|
+|要求高速处理数据  | | | √ |TDengine的专门为IOT优化的存储和数据处理的设计，一般可以让系统得到超出同类产品多倍数的处理速度提升。|
+|要求快速处理小粒度数据|  |  | √ |这方面TDengine性能可以完全对标关系型和NoSQL型数据处理系统。|
+
+### 系统维护需求
+|系统维护需求|不适用|可能适用|非常适用|简单说明|
+|---|---|---|---|---|
+|要求系统可靠运行|  |  | √ |TDengine的系统架构非常稳定可靠，日常维护也简单便捷，对维护人员的要求简洁明了，最大程度上杜绝人为错误和事故。|
+|要求运维学习成本可控|  |  | √ |同上。|
+|要求市场有大量人才储备| √ |  |  |TDengine作为新一代产品，目前人才市场里面有经验的人员还有限。但是学习成本低，我们作为厂家也提供运维的培训和辅助服务。|
+
+## TDengine 性能指标介绍和验证方法
+
diff --git a/documentation20/webdocs/markdowndocs/Getting Started-ch.md b/documentation20/webdocs/markdowndocs/Getting Started-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..210f0921bab40990ddb7b18e3a60586c028b58d2
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Getting Started-ch.md	
@@ -0,0 +1,172 @@
+# 立即开始
+
+## 快捷安装
+
+TDengine软件分为服务器、客户端和报警模块三部分，目前2.0版仅能在Linux系统上安装和运行，后续会支持Windows、MAC OS等系统。如果应用需要在Windows或Mac上运行，目前只能使用TDengine的RESTful接口连接服务器。硬件支持X64，后续会支持ARM、龙芯等CPU系统。用户可根据需求选择通过[源码](https://www.taosdata.com/cn/getting-started/#通过源码安装)或者[安装包](https://www.taosdata.com/cn/getting-started/#通过安装包安装)来安装。
+
+### 通过源码安装
+
+请参考我们的[TDengine github主页](https://github.com/taosdata/TDengine)下载源码并安装.
+
+### 通过Docker容器运行
+
+请参考[TDengine官方Docker镜像的发布、下载和使用](https://www.taosdata.com/blog/2020/05/13/1509.html)
+
+### 通过安装包安装
+
+服务器部分，我们提供三种安装包，您可以根据需要选择。TDengine的安装非常简单，从下载到安装成功仅仅只要几秒钟。
+
+<ul id='packageList'>
+<li><a id='tdengine-rpm' style='color:var(--b2)'>TDengine-server-2.0.0.0-Linux-x64.rpm (5.3M)</a></li>
+<li><a id='tdengine-deb' style='color:var(--b2)'>TDengine-server-2.0.0.0-Linux-x64.deb (2.5M)</a></li>
+<li><a id='tdengine-tar' style='color:var(--b2)'>TDengine-server-2.0.0.0-Linux-x64.tar.gz (5.3M)</a></li>
+</ul>
+
+客户端部分，Linux安装包如下：
+
+- TDengine-client-2.0.0.0-Linux-x64.tar.gz (3.4M)
+
+报警模块的Linux安装包如下（请参考[报警模块的使用方法](https://github.com/taosdata/TDengine/blob/master/alert/README_cn.md)）：
+
+- TDengine-alert-2.0.0-Linux-x64.tar.gz (8.1M)
+
+目前，TDengine只支持在使用[`systemd`](https://en.wikipedia.org/wiki/Systemd)做进程服务管理的linux系统上安装。其他linux系统的支持正在开发中。用`which`命令来检测系统中是否存在`systemd`:
+
+```cmd
+which systemd
+```
+
+如果系统中不存在`systemd`命令，请考虑[通过源码安装](#通过源码安装)TDengine。
+
+具体的安装过程，请参见<a href="https://www.taosdata.com/blog/2019/08/09/566.html">TDengine多种安装包的安装和卸载</a>。
+
+## 轻松启动
+
+安装成功后，用户可使用`systemctl`命令来启动TDengine的服务进程。
+
+```cmd
+systemctl start taosd
+```
+
+检查服务是否正常工作。
+```cmd
+systemctl status taosd
+```
+
+如果TDengine服务正常工作，那么您可以通过TDengine的命令行程序`taos`来访问并体验TDengine。  
+  
+**注意：**  
+  
+- systemctl命令需要 _root_ 权限来运行，如果您非 _root_ 用户，请在命令前添加 sudo
+- 为更好的获得产品反馈，改善产品，TDengine会采集基本的使用信息，但您可以修改系统配置文件taos.cfg里的配置参数telemetryReporting, 将其设为0，就可将其关闭。
+
+## TDengine命令行程序
+
+执行TDengine命令行程序，您只要在Linux终端执行`taos`即可。
+
+```cmd
+taos
+```
+
+如果TDengine终端链接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印错误消息出来（请参考[FAQ](https://www.taosdata.com/cn/faq/)来解决终端链接服务端失败的问题）。TDengine终端的提示符号如下：
+
+```cmd
+taos>
+```
+
+在TDengine终端中，用户可以通过SQL命令来创建/删除数据库、表等，并进行插入查询操作。在终端中运行的SQL语句需要以分号结束来运行。示例：
+
+```mysql
+create database demo;
+use demo;
+create table t (ts timestamp, speed int);
+insert into t values ('2019-07-15 00:00:00', 10);
+insert into t values ('2019-07-15 01:00:00', 20);
+select * from t;
+          ts          |   speed   |
+===================================
+ 19-07-15 00:00:00.000|         10|
+ 19-07-15 01:00:00.000|         20|
+Query OK, 2 row(s) in set (0.001700s)
+```
+
+除执行SQL语句外，系统管理员还可以从TDengine终端检查系统运行状态，添加删除用户账号等。
+
+### 命令行参数
+
+您可通过配置命令行参数来改变TDengine终端的行为。以下为常用的几个命令行参数：
+
+- -c, --config-dir: 指定配置文件目录，默认为_/etc/taos_
+- -h, --host: 指定服务的IP地址，默认为本地服务
+- -s, --commands: 在不进入终端的情况下运行TDengine命令
+- -u, -- user:  链接TDengine服务器的用户名，缺省为root
+- -p, --password: 链接TDengine服务器的密码，缺省为taosdata
+- -?, --help: 打印出所有命令行参数
+
+示例：
+
+```cmd
+taos -h 192.168.0.1 -s "use db; show tables;"
+```
+
+### 运行SQL命令脚本
+
+TDengine终端可以通过`source`命令来运行SQL命令脚本.
+
+```
+taos> source <filename>;
+```
+
+### Shell小技巧
+
+- 可以使用上下光标键查看已经历史输入的命令
+- 修改用户密码。在shell中使用alter user命令
+- ctrl+c 中止正在进行中的查询
+- 执行`RESET QUERY CACHE`清空本地缓存的表的schema
+
+## TDengine 极速体验
+
+启动TDengine的服务，在Linux终端执行taosdemo
+
+```
+> taosdemo
+```
+
+该命令将在数据库test下面自动创建一张超级表meters，该超级表下有1万张表，表名为"t0" 到"t9999"，每张表有10万条记录，每条记录有 （f1, f2， f3）三个字段，时间戳从"2017-07-14 10:40:00 000" 到"2017-07-14 10:41:39 999"，每张表带有标签areaid和loc, areaid被设置为1到10, loc被设置为"beijing"或者“shanghai"。
+
+执行这条命令大概需要10分钟，最后共插入10亿条记录。
+
+在TDengine客户端输入查询命令，体验查询速度。
+
+- 查询超级表下记录总条数：
+
+```
+taos>select count(*) from test.meters;
+```
+
+- 查询10亿条记录的平均值、最大值、最小值等：
+
+```
+taos>select avg(f1), max(f2), min(f3) from test.meters;
+```
+
+- 查询loc="beijing"的记录总条数：
+
+```
+taos>select count(*) from test.meters where loc="beijing";
+```
+
+- 查询areaid=10的所有记录的平均值、最大值、最小值等：
+
+```
+taos>select avg(f1), max(f2), min(f3) from test.meters where areaid=10;
+```
+
+- 对表t10按10s进行平均值、最大值和最小值聚合统计：
+
+```
+taos>select avg(f1), max(f2), min(f3) from test.t10 interval(10s);
+```
+
+**Note:** taosdemo命令本身带有很多选项，配置表的数目、记录条数等等，请执行 `taosdemo --help`详细列出。您可以设置不同参数进行体验。
+
diff --git a/documentation20/webdocs/markdowndocs/Getting Started.md b/documentation20/webdocs/markdowndocs/Getting Started.md
new file mode 100644
index 0000000000000000000000000000000000000000..00d97d3d9cd3d2ce8317938eb9e46ae74b48dab1
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Getting Started.md	
@@ -0,0 +1,151 @@
+#Getting Started
+
+## Quick Start
+
+At the moment, TDengine only runs on Linux. You can set up and install it either from the  <a href='#Install-from-Source'>source code</a> or the <a href='#Install-from-Package'>packages</a>. It takes only a few seconds from download to run it successfully. 
+
+### Install from Source
+
+Please visit our [github page](https://github.com/taosdata/TDengine) for instructions on installation from the source code.
+
+### Install from Package
+
+Three different packages are provided, please pick up the one you like. 
+<ul id='packageList'>
+<li><a id='tdengine-rpm' style='color:var(--b2)'>TDengine RPM package (1.5M)</a></li>
+<li><a id='tdengine-deb' style='color:var(--b2)'>TDengine DEB package (1.7M)</a></li>
+<li><a id='tdengine-tar' style='color:var(--b2)'>TDengine Tarball (3.0M)</a></li>
+</ul>
+For the time being, TDengine only supports installation on Linux systems using [`systemd`](https://en.wikipedia.org/wiki/Systemd) as the service manager. To check if your system has *systemd*, use the _which_ command.
+
+```cmd
+which systemd
+```
+
+If the `systemd` command is not found, please [install from source code](#Install-from-Source). 
+
+### Running TDengine
+
+After installation, start the TDengine service by the `systemctl` command.
+
+```cmd
+systemctl start taosd
+```
+
+Then check if the server is working now.
+```cmd
+systemctl status taosd
+```
+
+If the service is running successfully, you can play around through TDengine shell `taos`, the command line interface tool located in directory /usr/local/bin/taos 
+
+**Note: The _systemctl_ command needs the root privilege. Use _sudo_ if you are not the _root_ user.**
+
+##TDengine Shell
+To launch TDengine shell, the command line interface, in a Linux terminal, type:
+
+```cmd
+taos
+```
+
+The welcome message is printed if the shell connects to TDengine server successfully, otherwise, an error message will be printed (refer to our [FAQ](../faq) page for troubleshooting the connection error). The TDengine shell prompt is: 
+
+```cmd
+taos>
+```
+
+In the TDengine shell, you can create databases, create tables and insert/query data with SQL. Each query command ends with a semicolon. It works like MySQL, for example:
+
+```mysql
+create database db;
+use db;
+create table t (ts timestamp, cdata int);
+insert into t values ('2019-07-15 10:00:00', 10);
+insert into t values ('2019-07-15 10:01:05', 20);
+select * from t;
+          ts          |   speed   |
+===================================
+ 19-07-15 10:00:00.000|         10|
+ 19-07-15 10:01:05.000|         20|
+Query OK, 2 row(s) in set (0.001700s)
+```
+
+Besides the SQL commands, the system administrator can check system status, add or delete accounts, and manage the servers.
+
+###Shell Command Line Parameters
+
+You can run `taos` command with command line options to fit your needs. Some frequently used options are listed below:
+
+- -c, --config-dir: set the configuration directory. It is _/etc/taos_ by default
+- -h, --host: set the IP address of the server it will connect to, Default is localhost
+- -s, --commands: set the command to run without entering the shell
+- -u, -- user:  user name to connect to server. Default is root
+- -p, --password: password. Default is 'taosdata'
+- -?, --help: get a full list of supported options 
+
+Examples:
+
+```cmd
+taos -h 192.168.0.1 -s "use db; show tables;"
+```
+
+###Run Batch Commands
+
+Inside TDengine shell, you can run batch commands in a file with *source* command.
+
+```
+taos> source <filename>;
+```
+
+### Tips
+
+- Use up/down arrow key to check the command history
+- To change the default password, use "`alter user`" command 
+- ctrl+c to interrupt any queries 
+- To clean the cached schema of tables or STables, execute command `RESET QUERY CACHE` 
+
+## Major Features
+
+The core functionality of TDengine is the time-series database. To reduce the development and management complexity, and to improve the system efficiency further, TDengine also provides caching, pub/sub messaging system, and stream computing functionalities. It provides a full stack for IoT big data platform. The detailed features are listed below:
+
+- SQL like query language used to insert or explore data
+
+- C/C++, Java(JDBC), Python, Go, RESTful, and Node.JS interfaces for development
+
+- Ad hoc queries/analysis via Python/R/Matlab or TDengine shell
+
+- Continuous queries to support sliding-window based stream computing
+
+- Super table to aggregate multiple time-streams efficiently with flexibility  
+
+- Aggregation over a time window on one or multiple time-streams
+
+- Built-in messaging system to support publisher/subscriber model
+
+- Built-in cache for each time stream to make latest data available as fast as light speed
+
+- Transparent handling of historical data and real-time data 
+
+- Integrating with Telegraf, Grafana and other tools seamlessly  
+
+- A set of tools or configuration to manage TDengine 
+
+
+For enterprise edition, TDengine provides more advanced features below:
+
+- Linear scalability to deliver higher capacity/throughput 
+
+- High availability to guarantee the carrier-grade service  
+
+- Built-in replication between nodes which may span multiple geographical sites 
+
+- Multi-tier storage to make historical data management simpler and cost-effective
+
+- Web-based management tools and other tools to make maintenance simpler
+
+TDengine is specially designed and optimized for time-series data processing in IoT, connected cars, Industrial IoT, IT infrastructure and application monitoring, and other scenarios. Compared with other solutions, it is 10x faster on insert/query speed. With a single-core machine, over 20K requestes can be processed, millions data points can be ingested, and over 10 million data points can be retrieved in a second. Via column-based storage and tuned compression algorithm for different data types, less than 1/10 storage space is required. 
+
+## Explore More on TDengine
+
+Please read through the whole <a href='../documentation'>documentation</a> to learn more about TDengine.
+
diff --git a/documentation20/webdocs/markdowndocs/Model-ch.md b/documentation20/webdocs/markdowndocs/Model-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..bf04ce8388145d5b66d9658897744a9a93cdfaf0
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Model-ch.md
@@ -0,0 +1,59 @@
+
+
+# 数据建模
+
+TDengine采用关系型数据模型，需要建库、建表。因此对于一个具体的应用场景，需要考虑库的设计，超级表和普通表的设计。本节不讨论细致的语法规则，只介绍概念。
+
+## 创建库
+
+不同类型的数据采集点往往具有不同的数据特征，包括数据采集频率的高低，数据保留时间的长短，副本的数目，数据块的大小等等。为让各种场景下TDengine都能最大效率的工作，TDengine建议将不同数据特征的表创建在不同的库里，因为每个库可以配置不同的存储策略。创建一个库时，除SQL标准的选项外，应用还可以指定保留时长、副本数、内存块个数、时间精度、文件块里最大最小记录条数、是否压缩、一个数据文件覆盖的天数等多种参数。比如：
+
+```cmd
+CREATE DATABASE power KEEP 365 DAYS 10 BLOCKS 4;
+```
+上述语句将创建一个名为power的库，这个库的数据将保留365天（超过365天将被自动删除），每10天一个数据文件，内存块数为4。详细的语法及参数请见<a href="https://www.taosdata.com/cn/documentation20/taos-sql/">TAOS SQL</a>  
+  
+创建库之后，需要使用SQL命令USE将当前库切换过来，例如：
+
+```cmd
+USE power;	
+```
+
+就当前链接里操作的库换为power，否则对具体表操作前，需要使用“库名.表名”来指定库的名字。  
+  
+**注意：**
+
+- 任何一张表或超级表是属于一个库的，在创建表之前，必须先创建库。
+- 处于两个不同库的表是不能进行JOIN操作的。
+
+## 创建超级表
+一个物联网系统，往往存在多种类型的设备，比如对于电网，存在智能电表、变压器、母线、开关等等。为便于多表之间的聚合，使用TDengine, 需要对每个类型的数据采集点创建一超级表。以表一中的智能电表为例，可以使用如下的SQL命令创建超级表：
+```cmd
+CREATE TABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupdId int);
+```
+与创建普通表一样，创建表时，需要提供表名（示例中为meters），表结构Schema，即数据列的定义。第一列必须为时间戳（示例中为ts)，其他列为采集的物理量（示例中为current, voltage, phase)，数据类型可以为整型、浮点型、字符串等。除此之外，还需要提供标签的schema (示例中为location, groupId)，标签的数据类型可以为整型、浮点型、字符串等。采集点的静态属性往往可以作为标签，比如采集点的地理位置、设备型号、设备组ID、管理员ID等等。标签的schema可以事后增加、删除、修改。具体定义以及细节请见 <a href="https://www.taosdata.com/cn/documentation20/taos-sql/">TAOS SQL </a>一节。
+
+每一种类型的数据采集点需要建立一个超级表，因此一个物联网系统，往往会有多个超级表。对于电网，我们就需要对智能电表、变压器、母线、开关等都建立一个超级表。在物联网中，一个设备就可能有多个数据采集点（比如一台风力发电的风机，有的采集点采集电流、电压等电参数，有的采集点采集温度、湿度、风向等环境参数），这个时候，对这一类型的设备，需要建立多张超级表。一张超级表里包含的采集物理量必须是同时采集的（时间戳是一致的）。
+
+一张超级表最多容许1024列，如果一个采集点采集的物理量个数超过1024，需要建多张超级表来处理。一个系统可以有多个DB，一个DB里可以有一到多个超级表。
+
+## 创建表
+TDengine对每个数据采集点需要独立建表。与标准的关系型数据一样，一张表有表名，Schema，但除此之外，还可以带有一到多个标签。创建时，需要使用超级表做模板，同时指定标签的具体值。以表一中的智能电表为例，可以使用如下的SQL命令建表：
+```cmd
+CREATE TABLE d1001 USING meters TAGS ("Beijing.Chaoyang", 2);
+```
+其中d1001是表名，meters是超级表的表名，后面紧跟标签Location的具体标签值”Beijing.Chaoyang"，标签groupId的具体标签值2。虽然在创建表时，需要指定标签值，但可以事后修改。详细细则请见 TAOS SQL。
+
+TDengine建议将数据采集点的全局唯一ID作为表名(比如设备序列号）。但对于有的场景，并没有唯一的ID，可以将多个ID组合成一个唯一的ID。不建议将具有唯一性的ID作为标签值。  
+  
+**自动建表**：在某些特殊场景中，用户在写数据时并不确定某个数据采集点的表是否存在，此时可在写入数据时使用自动建表语法来创建不存在的表，若该表已存在则不会建立新表。比如：
+
+```cmd
+INSERT INTO d1001 USING METERS TAGS ("Beijng.Chaoyang", 2) VALUES (now, 10.2, 219, 0.32);
+```
+上述SQL语句将记录(now, 10.2, 219, 0.32) 插入进表d1001。如果表d1001还未创建，则使用超级表meters做模板自动创建，同时打上标签值“Beijing.Chaoyang", 2。  
+  
+## 多列模型 vs 单列模型
+TDengine支持多列模型，只要物理量是一个数据采集点同时采集的（时间戳一致），这些量就可以作为不同列放在一张超级表里。但还有一种极限的设计，单列模型，每个采集的物理量都单独建表，因此每种类型的物理量都单独建立一超级表。比如电流、电压、相位，就建三张超级表。
+
+TDengine建议尽可能采用多列模型，因为插入效率以及存储效率更高。但对于有些场景，一个采集点的采集量的种类经常变化，这个时候，如果采用多列模型，就需要频繁修改超级表的结构定义，让应用变的复杂，这个时候，采用单列模型会显得简单。
diff --git a/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md b/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..8e5eeee1c5a6c96ddda1281110766a12a56b8d12
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/More on System Architecture-ch.md	
@@ -0,0 +1,248 @@
+# TDengine的技术设计
+
+## 存储设计
+
+TDengine的数据存储主要包含**元数据的存储**和**写入数据的存储**。以下章节详细介绍了TDengine各种数据的存储结构。
+
+### 元数据的存储
+
+TDengine中的元数据信息包括TDengine中的数据库，表，超级表等信息。元数据信息默认存放在 _/var/lib/taos/mgmt/_ 文件夹下。该文件夹的目录结构如下所示：
+```
+/var/lib/taos/
+      +--mgmt/
+          +--db.db
+          +--meters.db
+          +--user.db
+          +--vgroups.db
+```
+元数据在文件中按顺序排列。文件中的每条记录代表TDengine中的一个元数据机构（数据库、表等）。元数据文件只进行追加操作，即便是元数据的删除，也只是在数据文件中追加一条删除的记录。
+
+### 写入数据的存储
+
+TDengine中写入的数据在硬盘上是按时间维度进行分片的。同一个vnode中的表在同一时间范围内的数据都存放在同一文件组中，如下图中的v0f1804*文件。这一数据分片方式可以大大简化数据在时间维度的查询，提高查询速度。在默认配置下，硬盘上的每个文件存放10天数据。用户可根据需要调整数据库的 _daysPerFile_ 配置项进行配置。 数据在文件中是按块存储的。每个数据块只包含一张表的数据，且数据是按照时间主键递增排列的。数据在数据块中按列存储，这样使得同类型的数据存放在一起，可以大大提高压缩的比例，节省存储空间。TDengine对不同类型的数据采用了不同的压缩算法进行压缩，以达到最优的压缩结果。TDengine使用的压缩算法包括simple8B、delta-of-delta、RLE以及LZ4等。
+
+TDengine的数据文件默认存放在 */var/lib/taos/data/* 下。而 */var/lib/taos/tsdb/* 文件夹下存放了vnode的信息、vnode中表的信息以及数据文件的链接等。其完整目录结构如下所示：
+```
+/var/lib/taos/
+      +--tsdb/
+      |   +--vnode0
+      |        +--meterObj.v0
+      |        +--db/
+      |            +--v0f1804.head->/var/lib/taos/data/vnode0/v0f1804.head1
+      |            +--v0f1804.data->/var/lib/taos/data/vnode0/v0f1804.data
+      |            +--v0f1804.last->/var/lib/taos/data/vnode0/v0f1804.last1
+      |            +--v0f1805.head->/var/lib/taos/data/vnode0/v0f1805.head1
+      |            +--v0f1805.data->/var/lib/taos/data/vnode0/v0f1805.data
+      |            +--v0f1805.last->/var/lib/taos/data/vnode0/v0f1805.last1
+      |                   :
+      +--data/
+          +--vnode0/
+                +--v0f1804.head1
+                +--v0f1804.data
+                +--v0f1804.last1
+                +--v0f1805.head1
+                +--v0f1805.data
+                +--v0f1805.last1
+                        :
+```
+
+#### meterObj文件
+每个vnode中只存在一个 _meterObj_ 文件。该文件中存储了vnode的基本信息（创建时间，配置信息，vnode的统计信息等）以及该vnode中表的信息。其结构如下所示：
+```
+<文件开始>
+[文件头]
+[表记录1偏移量和长度]
+[表记录2偏移量和长度]
+...
+[表记录N偏移量和长度]
+[表记录1]
+[表记录2]
+...
+[表记录N]
+[表记录]
+<文件结尾>
+```
+其中，文件头大小为512字节，主要存放vnode的基本信息。每条表记录代表属于该vnode中的一张表在硬盘上的表示。
+
+#### head文件
+head文件中存放了其对应的data文件中数据块的索引信息。该文件组织形式如下：
+```
+<文件开始>
+[文件头]
+[表1偏移量]
+[表2偏移量]
+...
+[表N偏移量]
+[表1数据索引]
+[表2数据索引]
+...
+[表N数据索引]
+<文件结尾>
+```
+文件开头的偏移量列表表示对应表的数据索引块的开始位置在文件中的偏移量。每张表的数据索引信息在head文件中都是连续存放的。这也使得TDengine在读取单表数据时，可以将该表所有的数据块索引一次性读入内存，大大提高读取速度。表的数据索引块组织如下：
+```
+[索引块信息]
+[数据块1索引]
+[数据块2索引]
+...
+[数据块N索引]
+```
+其中，索引块信息中记录了数据块的个数等描述信息。每个数据块索引对应一个在data文件或last文件中的一个单独的数据块。索引信息中记录了数据块存放的文件、数据块起始位置的偏移量、数据块中数据时间主键的范围等。索引块中的数据块索引是按照时间范围顺序排放的，这也就是说，索引块M对应的数据块中的数据时间范围都大于索引块M-1的。这种预先排序的存储方式使得在TDengine在进行按照时间戳进行查询时可以使用折半查找算法，大大提高查询速度。
+
+#### data文件
+data文件中存放了真实的数据块。该文件只进行追加操作。其文件组织形式如下：
+```
+<文件开始>
+[文件头]
+[数据块1]
+[数据块2]
+...
+[数据块N]
+<文件结尾>
+```
+每个数据块只属于vnode中的一张表，且数据块中的数据按照时间主键排列。数据块中的数据按列组织排放，使得同一类型的数据排放在一起，方便压缩和读取。每个数据块的组织形式如下所示：
+```
+[列1信息]
+[列2信息]
+...
+[列N信息]
+[列1数据]
+[列2数据]
+...
+[列N数据]
+```
+列信息中包含该列的类型，列的压缩算法，列数据在文件中的偏移量以及长度等。除此之外，列信息中也包含该内存块中该列数据的预计算结果，从而在过滤查询时根据预计算结果判定是否读取数据块，大大提高读取速度。
+
+#### last文件
+为了防止数据块的碎片化，提高查询速度和压缩率，TDengine引入了last文件。当要落盘的数据块中的数据条数低于某个阈值时，TDengine会先将该数据块写入到last文件中进行暂时存储。当有新的数据需要落盘时，last文件中的数据会被读取出来与新数据组成新的数据块写入到data文件中。last文件的组织形式与data文件类似。
+
+### TDengine数据存储小结
+TDengine通过其创新的架构和存储结构设计，有效提高了计算机资源的使用率。一方面，TDengine的虚拟化使得TDengine的水平扩展及备份非常容易。另一方面，TDengine将表中数据按时间主键排序存储且其列式存储的组织形式都使TDengine在写入、查询以及压缩方面拥有非常大的优势。
+
+
+## 查询处理
+
+### 概述
+
+TDengine提供了多种多样针对表和超级表的查询处理功能，除了常规的聚合查询之外，还提供针对时序数据的窗口查询、统计聚合等功能。TDengine的查询处理需要客户端、管理节点、数据节点协同完成。 各组件包含的与查询处理相关的功能和模块如下：
+
+客户端（Client App）。客户端包含TAOS SQL的解析（SQL Parser）和查询请求执行器（Query Executor），第二阶段聚合器（Result Merger），连续查询管理器（Continuous Query Manager）等主要功能模块构成。SQL解析器负责对SQL语句进行解析校验，并转化为抽象语法树，查询执行器负责将抽象语法树转化查询执行逻辑，并根据SQL语句查询条件，将其转换为针对管理节点元数据查询和针对数据节点的数据查询两级查询处理。由于TAOS SQL当前不提供复杂的嵌套查询和pipeline查询处理机制，所以不再需要查询计划优化、逻辑查询计划到物理查询计划转换等过程。第二阶段聚合器负责将各数据节点查询返回的独立结果进行二阶段聚合生成最后的结果。连续查询管理器则负责针对用户建立的连续查询进行管理，负责定时拉起查询请求并按需将结果写回TDengine或返回给客户应用。此外，客户端还负责查询失败后重试、取消查询请求、以及维持连接心跳、向管理节点上报查询状态等工作。
+
+管理节点（Management Node）。管理节点保存了整个集群系统的全部数据的元数据信息，向客户端节点提供查询所需的数据的元数据，并根据集群的负载情况切分查询请求。通过超级表包含了通过该超级表创建的所有表的信息，因此查询处理器（Query Executor）负责针对标签（TAG）的查询处理，并将满足标签查询请求的表信息返回给客户端。此外，管理节点还维护集群的查询状态（Query Status Manager）维护，查询状态管理中在内存中临时保存有当前正在执行的全部查询，当客户端使用 *show queries* 命令的时候，将当前系统正在运行的查询信息返回客户端。
+
+数据节点（Data Node）。数据节点保存了数据库中全部数据内容，并通过查询执行器、查询处理调度器、查询任务队列（Query Task Queue）进行查询处理的调度执行，从客户端接收到的查询处理请求都统一放置到处理队列中，查询执行器从队列中获得查询请求，并负责执行。通过查询优化器（Query Optimizer）对于查询进行基本的优化处理，以及通过数据节点的查询执行器（Query Executor）扫描符合条件的数据单元并返回计算结果。等接收客户端发出的查询请求，执行查询处理，并将结果返回。同时数据节点还需要响应来自管理节点的管理信息和命令，例如 *kill query* 命令以后，需要即刻停止执行的查询任务。
+
+<center> <img src="../assets/fig1.png"> </center>
+<center>图 1. 系统查询处理架构图(只包含查询相关组件)</center>
+
+### 普通查询处理
+
+客户端、管理节点、数据节点协同完成TDengine的查询处理全流程。我们以一个具体的SQL查询为例，说明TDengine的查询处理流程。SQL语句向超级表*FOO_SUPER_TABLE*查询获取时间范围在2019年1月12日整天，标签TAG_LOC是'beijing'的表所包含的所有记录总数，SQL语句如下：
+
+```sql
+SELECT COUNT(*) 
+FROM FOO_SUPER_TABLE
+WHERE TAG_LOC = 'beijing' AND TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'
+```
+
+首先，客户端调用TAOS SQL解析器对SQL语句进行解析及合法性检查，然后生成语法树，并从中提取查询的对象 — 超级表 *FOO_SUPER_TABLE* ，然后解析器向管理节点（Management Node）请求其相应的元数据信息，并将过滤信息（TAG_LOC='beijing'）同时发送到管理节点。
+
+管理节点接收元数据获取的请求，首先找到超级表 *FOO_SUPER_TABLE* 基础信息，然后应用查询条件来过滤通过该超级表创建的全部表，最后满足查询条件（TAG_LOC='beijing'），即 *TAG_LOC* 标签列是 'beijing' 的的通过其查询执行器将满足查询要求的对象（表或超级表）的元数据信息返回给客户端。
+
+客户端获得了 *FOO_SUPER_TABLE* 的元数据信息后，查询执行器根据元数据中的数据分布，分别向保存有相应数据的节点发起查询请求，此时时间戳范围过滤条件（TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'）需要同时发送给全部的数据节点。
+
+数据节点接收到发自客户端的查询，转化为内部结构并进行优化以后将其放入任务执行队列，等待查询执行器执行。当查询结果获得以后，将查询结果返回客户端。数据节点执行查询的过程均相互独立，完全只依赖于自身的数据和内容进行计算。
+
+当所有查询涉及的数据节点返回结果后，客户端将每个数据节点查询的结果集再次进行聚合（针对本案例，即将所有结果再次进行累加），累加的结果即为最后的查询结果。第二阶段聚合并不是所有的查询都需要。例如，针对数据的列选取操作，实际上是不需要第二阶段聚合。
+
+### REST查询处理
+
+在 C/C++ 、Python接口、 JDBC 接口之外，TDengine 还提供基于 HTTP 协议的 REST 接口。不同于使用应用客户端开发程序进行的开发。当用户使用 REST 接口的时候，所有的查询处理过程都是在服务器端来完成，用户的应用服务不会参与数据库的计算过程，查询处理完成后结果通过 HTTP的 JSON 格式返回给用户。
+
+<center> <img src="../assets/fig2.png"> </center>
+<center>图 2.  REST查询架构</center>
+
+当用户使用基于HTTP的REST查询接口，HTTP的请求首先与位于数据节点的HTTP连接器（ Connector），建立连接，然后通过REST的签名机制，使用Token来确保请求的可靠性。对于数据节点，HTTP连接器接收到请求后，调用内嵌的客户端程序发起查询请求，内嵌客户端将解析通过HTTP连接器传递过来的SQL语句，解析该SQL语句并按需向管理节点请求元数据信息，然后向本机或集群中其他节点发送查询请求，最后按需聚合计算结果。HTTP连接器接收到请求SQL以后，后续的流程处理与采用应用客户端方式的查询处理完全一致。最后，还需要将查询的结果转换为JSON格式字符串，并通过HTTP 响应返回给客户端。
+
+可以看到，在处理HTTP流程的整个过程中，用户应用不再参与到查询处理的过程中，只负责通过HTTP协议发送SQL请求并接收JSON格式的结果。同时还需要注意的是，每个数据节点均内嵌了一个HTTP连接器和客户端程序，因此请求集群中任何一个数据节点，该数据节点均能够通过HTTP协议返回用户的查询结果。
+
+### 技术特征
+
+由于TDengine采用数据和标签分离存储的模式，能够极大地降低标签数据存储的冗余度。标签数据直接关联到每个表，并采用全内存的结构进行管理和维护标签数据,全内存的结构提供快速的查询处理，千万级别规模的标签数据查询可以在毫秒级别返回。首先针对标签数据的过滤可以有效地降低第二阶段的查询涉及的数据规模。为有效地提升查询处理的性能，针对物联网数据的不可更改的特点，TDengine采用在每个保存的数据块上，都记录下该数据块中数据的最大值、最小值、和等统计数据。如果查询处理涉及整个数据块的全部数据，则直接使用预计算结果，不再读取数据块的内容。由于预计算模块的大小远小于磁盘上存储的具体数据的大小，对于磁盘IO为瓶颈的查询处理，使用预计算结果可以极大地减小读取IO，并加速查询处理的流程。
+
+由于TDengine采用按列存储数据。当从磁盘中读取数据块进行计算的时候，按照查询列信息读取该列数据，并不需要读取其他不相关的数据，可以最小化读取数据。此外，由于采用列存储结构，数据节点针对数据的扫描采用该列数据块进行，可以充分利用CPU L2高速缓存，极大地加速数据扫描的速度。此外，对于某些查询，并不会等全部查询结果生成后再返回结果。例如，列选取查询，当第一批查询结果获得以后，数据节点直接将其返回客户端。同时，在查询处理过程中，系统在数据节点接收到查询请求以后马上返回客户端查询确认信息，并同时拉起查询处理过程，并等待查询执行完成后才返回给用户查询有响应。
+
+## TDengine集群设计
+
+### 1：集群与主要逻辑单元
+
+TDengine是基于硬件、软件系统不可靠、一定会有故障的假设进行设计的，是基于任何单台计算机都无足够能力处理海量数据的假设进行设计的。因此TDengine从研发的第一天起，就按照分布式高可靠架构进行设计，是完全去中心化的，是水平扩展的，这样任何单台或多台服务器宕机或软件错误都不影响系统的服务。通过节点虚拟化并辅以自动化负载均衡技术，TDengine能最大限度地利用异构集群中的计算和存储资源。而且只要数据副本数大于一，无论是硬软件的升级、还是IDC的迁移等都无需停止集群的服务，极大地保证系统的正常运行，并且降低了系统管理员和运维人员的工作量。
+
+下面的示例图上有八个物理节点，每个物理节点被逻辑的划分为多个虚拟节点。下面对系统的基本概念进行介绍。 
+
+
+
+![assets/nodes.png](../assets/nodes.png)
+
+**物理节点(dnode)**：集群中的一物理服务器或云平台上的一虚拟机。为安全以及通讯效率，一个物理节点可配置两张网卡，或两个IP地址。其中一张网卡用于集群内部通讯，其IP地址为**privateIp**, 另外一张网卡用于与集群外部应用的通讯，其IP地址为**publicIp**。在一些云平台（如阿里云），对外的IP地址是映射过来的，因此publicIp还有一个对应的内部IP地址**internalIp**(与privateIp不同)。对于只有一个IP地址的物理节点，publicIp, privateIp以及internalIp都是同一个地址，没有任何区别。一个dnode上有而且只有一个taosd实例运行。 
+
+**虚拟数据节点(vnode)**：在物理节点之上的可独立运行的基础逻辑单元，时序数据写入、存储、查询等操作逻辑都在虚拟节点中进行(图中V)，采集的时序数据就存储在vnode上。一个vnode包含固定数量的表。当创建一张新表时，系统会检查是否需要创建新的vnode。一个物理节点上能创建的vnode的数量取决于物理节点的硬件资源。一个vnode只属于一个DB，但一个DB可以有多个vnode。
+
+**虚拟数据节点组(vgroup)**: 位于不同物理节点的vnode可以组成一个虚拟数据节点组vnode group(如上图dnode0中的V0, dnode1中的V1, dnode6中的V2属于同一个虚拟节点组)。归属于同一个vgroup的虚拟节点采取master/slave的方式进行管理。写只能在master上进行，但采用asynchronous的方式将数据同步到slave，这样确保了一份数据在多个物理节点上有拷贝。如果master节点宕机，其他节点监测到后，将重新选举vgroup里的master, 新的master能继续处理数据请求，从而保证系统运行的可靠性。一个vgroup里虚拟节点个数就是数据的副本数。如果一个DB的副本数为N，系统必须有至少N个物理节点。副本数在创建DB时通过参数replica可以指定，缺省为1。使用TDengine, 数据的安全依靠多副本解决，因此不再需要昂贵的磁盘阵列等存储设备。
+
+**虚拟管理节点(mnode)**：负责所有节点运行状态的监控和维护，以及节点之间的负载均衡（图中M）。同时，虚拟管理节点也负责元数据(包括用户、数据库、表、静态标签等)的存储和管理，因此也称为Meta Node。TDengine集群中可配置多个(最多不超过5个) mnode，它们自动构建成为一个管理节点集群(图中M0, M1, M2)。mnode间采用master/slave的机制进行管理，而且采取强一致方式进行数据同步。mnode集群的创建由系统自动完成，无需人工干预。每个dnode上至多有一个mnode，而且每个dnode都知道整个集群中所有mnode的IP地址。 
+
+**taosc**：一个软件模块，是TDengine给应用提供的驱动程序（driver）,内嵌于JDBC、ODBC driver中，或者C语言连接库里。应用都是通过taosc而不是直接来与整个集群进行交互的。这个模块负责获取并缓存元数据；将插入、查询等请求转发到正确的虚拟节点；在把结果返回给应用时，还需要负责最后一级的聚合、排序、过滤等操作。对于JDBC, ODBC, C/C++接口而言，这个模块是在应用所处的计算机上运行，但消耗的资源很小。为支持全分布式的REST接口，taosc在TDengine集群的每个dnode上都有一运行实例。 
+
+**对外服务地址**：TDengine集群可以容纳单台、多台甚至几千台物理节点。应用只需要向集群中任何一个物理节点的publicIp发起连接即可。启动CLI应用taos时，选项-h需要提供的就是publicIp。
+
+**master/secondIp**：每一个dnode都需要配置一个masterIp。dnode启动后，将对配置的masterIp发起加入集群的连接请求。masterIp是已经创建的集群中的任何一个节点的privateIp，对于集群中的第一个节点，就是它自己的privateIp。为保证连接成功，每个dnode还可配置secondIp, 该IP地址也是已创建的集群中的任何一个节点的privateIp。如果一个节点连接masterIp失败,它将试图链接secondIp。
+
+dnode启动后，会获知集群的mnode IP列表，并且定时向mnode发送状态信息。
+
+vnode与mnode只是逻辑上的划分，都是执行程序taosd里的不同线程而已，无需安装不同的软件，做任何特殊的配置。最小的系统配置就是一个物理节点,vnode,mnode和taosc都存在而且都正常运行，但单一节点无法保证系统的高可靠。 
+
+### 2：一典型的操作流程
+
+为解释vnode, mnode, taosc和应用之间的关系以及各自扮演的角色，下面对写入数据这个典型操作的流程进行剖析。
+
+ 
+
+![Picture1](../assets/Picture2.png)
+
+ 
+
+1. 应用通过JDBC、ODBC或其他API接口发起插入数据的请求。
+2. taosc会检查缓存，看是有保存有该表的meta data。如果有，直接到第4步。如果没有，taosc将向mnode发出get meta-data请求。
+3. mnode将该表的meta-data返回给taosc。Meta-data包含有该表的schema, 而且还有该表所属的vgroup信息（vnode ID以及所在的dnode的IP地址，如果副本数为N，就有N组vnodeID/IP)。如果taosc迟迟得不到mnode回应，而且存在多个mnode,taosc将向下一个mnode发出请求。
+4. taosc向master vnode发起插入请求。
+5. vnode插入数据后，给taosc一个应答，表示插入成功。如果taosc迟迟得不到vnode的回应，taosc会认为该节点已经离线。这种情况下，如果被插入的数据库有多个副本，taosc将向vgroup里下一个vnode发出插入请求。
+6. taosc通知APP，写入成功。 
+
+对于第二和第三步，taosc启动时，并不知道mnode的IP地址，因此会直接向配置的集群对外服务的IP地址发起请求。如果接收到该请求的dnode并没有配置mnode，该dnode会在回复的消息中告知mnode的IP地址列表（如果有多个dnodes，mnode的IP地址可以有多个），这样taosc会重新向新的mnode的IP地址发出获取meta-data的请求。
+
+对于第四和第五步，没有缓存的情况下，taosc无法知道虚拟节点组里谁是master，就假设第一个vnodeID/IP就是master,向它发出请求。如果接收到请求的vnode并不是master,它会在回复中告知谁是master，这样taosc就向建议的master vnode发出请求。一旦得到插入成功的回复，taosc会缓存住master节点的信息。
+
+上述是插入数据的流程，查询、计算的流程也完全一致。taosc把这些复杂的流程全部封装屏蔽了，因此应用无需处理重定向、获取meta data等细节，完全是透明的。
+
+通过taosc缓存机制，只有在第一次对一张表操作时，才需要访问mnode, 因此mnode不会成为系统瓶颈。但因为schema有可能变化，而且vgroup有可能发生改变（比如负载均衡发生），因此taosc需要定时自动刷新缓存。
+
+### 3：数据分区
+
+vnode(虚拟数据节点)保存采集的时序数据，而且查询、计算都在这些节点上进行。为便于负载均衡、数据恢复、支持异构环境，TDengine将一个物理节点根据其计算和存储资源切分为多个vnode。这些vnode的管理是TDengine自动完成的，对应用完全透明。 
+
+对于单独一个数据采集点，无论其数据量多大，一个vnode（或vnode group, 如果副本数大于1）有足够的计算资源和存储资源来处理（如果每秒生成一条16字节的记录，一年产生的原始数据不到0.5G），因此TDengine将一张表的所有数据都存放在一个vnode里，而不会让同一个采集点的数据分布到两个或多个dnode上。而且一个vnode可存储多张表的数据，一个vnode可容纳的表的数目由配置参数tables指定，缺省为2000。设计上，一个vnode里所有的表都属于同一个DB。因此一个数据库DB需要的vnode或vgroup的个数等于：数据库表的数目/tables。 
+
+创建DB时，系统并不会马上分配资源。但当创建一张表时，系统将看是否有已经分配的vnode, 而且是否有空位，如果有，立即在该有空位的vnode创建表。如果没有，系统将从集群中，根据当前的负载情况，在一个dnode上创建一新的vnode, 然后创建表。如果DB有多个副本，系统不是只创建一个vnode，而是一个vgroup(虚拟数据节点组)。系统对vnode的数目没有任何限制，仅仅受限于物理节点本身的计算和存储资源。
+
+参数tables的设置需要考虑具体场景，创建DB时，可以个性化指定该参数。该参数不宜过大，也不宜过小。过小，极端情况，就是每个数据采集点一个vnode, 这样导致系统数据文件过多。过大，虚拟化带来的优势就会丧失。给定集群计算资源的情况下，整个系统vnode的个数应该是CPU核的数目的两倍以上。
+
+### 4：负载均衡
+
+每个dnode(物理节点)都定时向 mnode(虚拟管理节点)报告其状态（包括硬盘空间、内存大小、CPU、网络、虚拟节点个数等），因此mnode了解整个集群的状态。基于整体状态，当mnode发现某个dnode负载过重，它会将dnode上的一个或多个vnode挪到其他dnode。在挪动过程中，对外服务继续进行，数据插入、查询和计算操作都不受影响。负载均衡操作结束后，应用也无需重启，将自动连接新的vnode。 
+
+如果mnode一段时间没有收到dnode的状态报告，mnode会认为这个dnode已经离线。如果离线时间超过一定时长（时长由配置参数offlineThreshold决定），该dnode将被mnode强制剔除出集群。该dnode上的vnodes如果副本数大于一，系统将自动在其他dnode上创建新的副本，以保证数据的副本数。
+
+
+
+**Note：**目前集群功能仅仅限于企业版
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/More on System Architecture.md b/documentation20/webdocs/markdowndocs/More on System Architecture.md
new file mode 100644
index 0000000000000000000000000000000000000000..d7a38b99a3ae5a630509f3ef0f0ffdc97d3aaaf1
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/More on System Architecture.md	
@@ -0,0 +1,176 @@
+# TDengine System Architecture 
+
+## Storage Design
+
+TDengine data mainly include **metadata** and **data** that we will introduce in the following sections.
+
+### Metadata Storage
+
+Metadata include the information of databases, tables, etc. Metadata files are saved in _/var/lib/taos/mgmt/_ directory by default. The directory tree is as below:
+```
+/var/lib/taos/
+      +--mgmt/
+          +--db.db
+          +--meters.db
+          +--user.db
+          +--vgroups.db
+```
+
+A metadata structure (database, table, etc.) is saved as a record in a metadata file. All metadata files are appended only, and even a drop operation adds a deletion record at the end of the file.
+
+### Data storage
+
+Data in TDengine are sharded according to the time range. Data of tables in the same vnode in a certain time range are saved in the same filegroup, such as files v0f1804*. This sharding strategy can effectively improve data searching speed. By default, a group of files contains data in 10 days, which can be configured by *daysPerFile* in the configuration file or by *DAYS* keyword in *CREATE DATABASE* clause. Data in files are blockwised. A data block only contains one table's data. Records in the same data block are sorted according to the primary timestamp, which helps to improve the compression rate and save storage. The compression algorithms used in TDengine include simple8B, delta-of-delta, RLE, LZ4, etc.
+
+By default, TDengine data are saved in */var/lib/taos/data/* directory. _/var/lib/taos/tsdb/_ directory contains vnode informations and data file linkes.
+
+```
+/var/lib/taos/
+      +--tsdb/
+      |   +--vnode0
+      |        +--meterObj.v0
+      |        +--db/
+      |            +--v0f1804.head->/var/lib/taos/data/vnode0/v0f1804.head1
+      |            +--v0f1804.data->/var/lib/taos/data/vnode0/v0f1804.data
+      |            +--v0f1804.last->/var/lib/taos/data/vnode0/v0f1804.last1
+      |            +--v0f1805.head->/var/lib/taos/data/vnode0/v0f1805.head1
+      |            +--v0f1805.data->/var/lib/taos/data/vnode0/v0f1805.data
+      |            +--v0f1805.last->/var/lib/taos/data/vnode0/v0f1805.last1
+      |                   :
+      +--data/
+          +--vnode0/
+                +--v0f1804.head1
+                +--v0f1804.data
+                +--v0f1804.last1
+                +--v0f1805.head1
+                +--v0f1805.data
+                +--v0f1805.last1
+                        :
+```
+
+#### meterObj file
+There are only one meterObj file in a vnode. Informations bout the vnode, such as created time, configuration information, vnode statistic informations are saved in this file. It has the structure like below:
+
+```
+<start_of_file>
+[file_header]
+[table_record1_offset&length]
+[table_record2_offset&length]
+...
+[table_recordN_offset&length]
+[table_record1]
+[table_record2]
+...
+[table_recordN]
+<end_of_file>
+```
+The file header takes 512 bytes, which mainly contains informations about the vnode. Each table record is the representation of a table on disk.
+
+#### head file
+The _head_ files contain the index of data blocks in the _data_ file. The inner organization is as below:
+```
+<start_of_file>
+[file_header]
+[table1_offset]
+[table2_offset]
+...
+[tableN_offset]
+[table1_index_block]
+[table2_index_block]
+...
+[tableN_index_block]
+<end_of_file>
+```
+The table offset array in the _head_ file saves the information about the offsets of each table index block. Indices on data blocks in the same table are saved continuously. This also makes it efficient to load data indices on the same table. The data index block has a structure like:
+
+```
+[index_block_info]
+[block1_index]
+[block2_index]
+...
+[blockN_index]
+```
+The index block info part contains the information about the index block such as the number of index blocks, etc. Each block index corresponds to a real data block in the _data_ file or _last_ file. Information about the location of the real data block, the primary timestamp range of the data block, etc. are all saved in the block index part. The block indices are sorted in ascending order according to the primary timestamp. So we can apply algorithms such as the binary search on the data to efficiently search blocks according to time.
+
+#### data file
+The _data_ files store the real data block. They are append-only. The organization is as:
+```
+<start_of_file>
+[file_header]
+[block1]
+[block2]
+...
+[blockN]
+<end_of_file>
+```
+A data block in _data_ files only belongs to a table in the vnode and the records in a data block are sorted in ascending order according to the primary timestamp key. Data blocks are column-oriented. Data in the same column are stored contiguously, which improves reading speed and compression rate because of their similarity. A data block has the following organization:
+
+```
+[column1_info]
+[column2_info]
+...
+[columnN_info]
+[column1_data]
+[column2_data]
+...
+[columnN_data]
+```
+The column info part includes information about column types, column compression algorithm, column data offset and length in the _data_ file, etc. Besides, pre-calculated results of the column data in the block are also in the column info part, which helps to improve reading speed by avoiding loading data block necessarily.
+
+#### last file
+To avoid storage fragment and to import query speed and compression rate, TDengine introduces an extra file, the _last_ file. When the number of records in a data block is lower than a threshold, TDengine will flush the block to the _last_ file for temporary storage. When new data comes, the data in the _last_ file will be merged with the new data and form a larger data block and written to the _data_ file. The organization of the _last_ file is similar to the _data_ file.
+
+### Summary
+The innovation in architecture and storage design of TDengine improves resource usage. On the one hand, the virtualization makes it easy to distribute resources between different vnodes and for future scaling. On the other hand, sorted and column-oriented storage makes TDengine have a great advantage in writing, querying and compression.
+
+## Query Design
+
+#### Introduction
+
+TDengine provides a variety of query functions for both tables and super tables. In addition to regular aggregate queries, it also provides time window based query and statistical aggregation for time series data. TDengine's query processing requires the client app, management node, and data node to work together. The functions and modules involved in query processing included in each component are as follows:
+
+Client (Client App). The client development kit, embed in a client application, consists of TAOS SQL parser and query executor, the second-stage aggregator (Result Merger), continuous query manager and other major functional modules. The SQL parser is responsible for parsing and verifying the SQL statement and converting it into an abstract syntax tree. The query executor is responsible for transforming the abstract syntax tree into the query execution logic and creates the metadata query according to the query condition of the SQL statement. Since TAOS SQL does not currently include complex nested queries and pipeline query processing mechanism, there is no longer need for query plan optimization and physical query plan conversions. The second-stage aggregator is responsible for performing the aggregation of the independent results returned by query involved data nodes at the client side to generate final results. The continuous query manager is dedicated to managing the continuous queries created by users, including issuing fixed-interval query requests and writing the results back to TDengine or returning to the client application as needed. Also, the client is also responsible for retrying after the query fails, canceling the query request, and maintaining the connection heartbeat and reporting the query status to the management node.
+
+Management Node. The management node keeps the metadata of all the data of the entire cluster system, provides the metadata of the data required for the query from the client node, and divides the query request according to the load condition of the cluster. The super table contains information about all the tables created according to the super table, so the query processor (Query Executor) of the management node is responsible for the query processing of the tags of tables and returns the table information satisfying the tag query. Besides, the management node maintains the query status of the cluster in the Query Status Manager component, in which the metadata of all queries that are currently executing are temporarily stored in-memory buffer. When the client issues *show queries* command to management node, current running queries information is returned to the client.
+
+Data Node. The data node, responsible for storing all data of the database, consists of query executor, query processing scheduler, query task queue, and other related components. Once the query requests from the client received, they are put into query task queue and waiting to be processed by query executor. The query executor extracts the query request from the query task queue and invokes the query optimizer to perform the basic optimization for the query execution plan. And then query executor scans the qualified data blocks in both cache and disk to obtain qualified data and return the calculated results. Besides, the data node also needs to respond to management information and commands from the management node. For example, after the *kill query* received from the management node, the query task needs to be stopped immediately.
+
+<center> <img src="../assets/fig1.png"> </center>
+<center>Fig 1. System query processing architecture diagram (only query related components)</center>
+
+#### Query Process Design
+
+The client, the management node, and the data node cooperate to complete the entire query processing of TDengine. Let's take a concrete SQL query as an example to illustrate the whole query processing flow. The SQL statement is to query on super table *FOO_SUPER_TABLE* to get the total number of records generated on January 12, 2019, from the table, of which TAG_LOC equals to 'beijing'.  The SQL statement is as follows:
+
+```sql
+SELECT COUNT(*) 
+FROM FOO_SUPER_TABLE
+WHERE TAG_LOC = 'beijing' AND TS >= '2019-01-12 00:00:00' AND TS < '2019-01-13 00:00:00'
+```
+
+First, the client invokes the TAOS SQL parser to parse and validate the SQL statement, then generates a syntax tree, and extracts the object of the query - the super table *FOO_SUPER_TABLE*, and then the parser sends requests with filtering information (TAG_LOC='beijing') to management node to get the corresponding metadata about *FOO_SUPER_TABLE*.
+
+Once the management node receives the request for metadata acquisition, first finds the super table *FOO_SUPER_TABLE* basic information, and then applies the query condition (TAG_LOC='beijing') to filter all the related tables created according to it. And finally, the query executor returns the metadata information that satisfies the query request to the client.
+
+After the client obtains the metadata information of *FOO_SUPER_TABLE*, the query executor initiates a query request with timestamp range filtering condition (TS >= '2019- 01-12 00:00:00' AND TS < '2019-01-13 00:00:00') to all nodes that hold the corresponding data according to the information about data distribution in metadata.
+
+The data node receives the query sent from the client, converts it into an internal structure and puts it into the query task queue to be executed by query executor after optimizing the execution plan. When the query result is obtained, the query result is returned to the client. It should be noted that the data nodes perform the query process independently of each other, and rely solely on their data and content for processing.
+
+When all data nodes involved in the query return results, the client aggregates the result sets from each data node. In this case, all results are accumulated to generate the final query result. The second stage of aggregation is not always required for all queries. For example, a column selection query does not require a second-stage aggregation at all.
+
+#### REST Query Process
+
+In addition to C/C++, Python, and JDBC interface, TDengine also provides a REST interface based on the HTTP protocol, which is different from using the client application programming interface. When the user uses the REST interface, all the query processing is completed on the server-side, and the user's application is not involved in query processing anymore. After the query processing is completed, the result is returned to the client through the HTTP JSON string.
+
+<center> <img src="../assets/fig2.png"> </center>
+<center>Fig. 2 REST query architecture</center>
+
+When a client uses an HTTP-based REST query interface, the client first establishes a connection with the HTTP connector at the data node and then uses the token to ensure the reliability of the request through the REST signature mechanism. For the data node, after receiving the request, the HTTP connector invokes the embedded client program to initiate a query processing, and then the embedded client parses the SQL statement from the HTTP connector and requests the management node to get metadata as needed. After that, the embedded client sends query requests to the same data node or other nodes in the cluster and aggregates the calculation results on demand. Finally, you also need to convert the result of the query into a JSON format string and return it to the client via an HTTP response. After the HTTP connector receives the request SQL, the subsequent process processing is completely consistent with the query processing using the client application development kit.
+
+It should be noted that during the entire processing, the client application is no longer involved in, and is only responsible for sending SQL requests through the HTTP protocol and receiving the results in JSON format. Besides, each data node is embedded with an HTTP connector and a client, so any data node in the cluster received requests from a client, the data node can initiate the query and return the result to the client through the HTTP protocol, with transfer the request to other data nodes.
+
+#### Technology
+
+Because TDengine stores data and tags value separately, the tag value is kept in the management node and directly associated with each table instead of records, resulting in a great reduction of the data storage. Therefore, the tag value can be managed by a fully in-memory structure. First, the filtering of the tag data can drastically reduce the data size involved in the second phase of the query. The query processing for the data is performed at the data node. TDengine takes advantage of the immutable characteristics of IoT data by calculating the maximum, minimum, and other statistics of the data in one data block on each saved data block, to effectively improve the performance of query processing. If the query process involves all the data of the entire data block, the pre-computed result is used directly, and the content of the data block is no longer needed. Since the size of disk space required to store the pre-computation result is much smaller than the size of the specific data, the pre-computation result can greatly reduce the disk IO and speed up the query processing.
+
+TDengine employs column-oriented data storage techniques. When the data block is involved to be loaded from the disk for calculation, only the required column is read according to the query condition, and the read overhead can be minimized. The data of one column is stored in a contiguous memory block and therefore can make full use of the CPU L2 cache to greatly speed up the data scanning. Besides, TDengine utilizes the eagerly responding mechanism and returns a partial result before the complete result is acquired. For example, when the first batch of results is obtained, the data node immediately returns it directly to the client in case of a column select query. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Queries-ch.md b/documentation20/webdocs/markdowndocs/Queries-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..1394338f5420d9b2e2dbc2206879ac36a5c52cf8
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Queries-ch.md
@@ -0,0 +1,97 @@
+
+
+
+
+# 高效查询数据
+
+## 主要查询功能
+
+TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, Go, Python 连接器发送 SQL 语句，用户可以通过 TDengine 提供的命令行（Command Line Interface, CLI）工具 TAOS Shell 手动执行 SQL 即席查询（Ad-Hoc Query）。TDengine 支持如下查询功能：
+
+- 单列、多列数据查询
+- 标签和数值的多种过滤条件：\>, \<,  =, \<>, like 等
+- 聚合结果的分组（Group by）、排序（Order by）、约束输出（Limit/Offset）
+- 数值列及聚合结果的四则运算
+- 时间戳对齐的连接查询（Join Query: 隐式连接）操作
+- 多种聚合/计算函数: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff等
+
+例如：在TAOS Shell中，从表d1001中查询出vlotage > 215的记录，按时间降序排列，仅仅输出2条。
+```mysql
+taos> select * from d1001 where voltage > 215 order by ts desc limit 2;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 |
+Query OK, 2 row(s) in set (0.001100s)
+```
+为满足物联网场景的需求，TDengine支持几个特殊的函数，比如twa(时间加权平均)，spread (最大值与最小值的差)，last_row(最后一条记录)等，更多与物联网场景相关的函数将添加进来。TDengine还支持连续查询。
+
+具体的查询语法请看<a href="https://www.taosdata.com/cn/documentation20/taos-sql/">TAOS SQL </a>。
+
+## 多表聚合查询
+
+TDengine对每个数据采集点单独建表，但在实际应用中经常需要对不同的采集点数据进行聚合。为高效的进行聚合操作，TDengine引入超级表（STable）的概念。超级表用来代表一特定类型的数据采集点，它是包含多张表的表集合，集合里每张表的模式（schema）完全一致，但每张表都带有自己的静态标签，标签可以多个，可以随时增加、删除和修改。
+
+应用可通过指定标签的过滤条件，对一个STable下的全部或部分表进行聚合或统计操作，这样大大简化应用的开发。其具体流程如下图所示：
+
+<center> <img src="../assets/stable.png"> </center>
+
+<center> 多表聚合查询原理图  </center>
+
+1：应用将一个查询条件发往系统；2: taosc将超级表的名字发往 Meta Node（管理节点)；3：管理节点将超级表所拥有的 vnode 列表发回 taosc；4：taosc将计算的请求连同标签过滤条件发往这些vnode对应的多个数据节点；5：每个vnode先在内存里查找出自己节点里符合标签过滤条件的表的集合，然后扫描存储的时序数据，完成相应的聚合计算，将结果返回给taosc；6：taosc将多个数据节点返回的结果做最后的聚合，将其返回给应用。
+
+由于TDengine在vnode内将标签数据与时序数据分离存储，通过先在内存里过滤标签数据，将需要扫描的数据集大幅减少，大幅提升聚合计算速度。同时，由于数据分布在多个vnode/dnode，聚合计算操作在多个vnode里并发进行，又进一步提升了聚合的速度。
+
+对普通表的聚合函数以及绝大部分操作都适用于超级表，语法完全一样，细节请看 TAOS SQL。
+
+比如：在TAOS Shell，查找所有智能电表采集的电压平均值，并按照location分组
+
+```mysql
+taos> SELECT AVG(voltage) FROM meters GROUP BY location;
+       avg(voltage)        |            location            |
+=============================================================
+             222.000000000 | Beijing.Haidian                |
+             219.200000000 | Beijing.Chaoyang               |
+Query OK, 2 row(s) in set (0.002136s)
+```
+
+## 降采样查询、插值
+
+物联网场景里，经常需要通过降采样（down sampling）将采集的数据按时间段进行聚合。TDengine 提供了一个简便的关键词 interval 让按照时间窗口的查询操作变得极为简单。比如，将智能电表 d1001 采集的电流值每10秒钟求和
+```mysql
+taos> SELECT sum(current) FROM d1001 INTERVAL(10s);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:00.000 |              10.300000191 |
+ 2018-10-03 14:38:10.000 |              24.900000572 |
+Query OK, 2 row(s) in set (0.000883s)
+```
+降采样操作也适用于超级表，比如：将所有智能电表采集的电流值每秒钟求和
+```mysql
+taos> SELECT SUM(current) FROM meters INTERVAL(1s);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:04.000 |              10.199999809 |
+ 2018-10-03 14:38:05.000 |              32.900000572 |
+ 2018-10-03 14:38:06.000 |              11.500000000 |
+ 2018-10-03 14:38:15.000 |              12.600000381 |
+ 2018-10-03 14:38:16.000 |              36.000000000 |
+Query OK, 5 row(s) in set (0.001538s)
+```
+降采样操作也支持时间偏移，比如：将所有智能电表采集的电流值每秒钟求和，但要求每个时间窗口从 500 毫秒开始
+```mysql
+taos> SELECT SUM(current) FROM meters INTERVAL(1s, 500a);
+           ts            |       sum(current)        |
+======================================================
+ 2018-10-03 14:38:04.500 |              11.189999809 |
+ 2018-10-03 14:38:05.500 |              31.900000572 |
+ 2018-10-03 14:38:06.500 |              11.600000000 |
+ 2018-10-03 14:38:15.500 |              12.300000381 |
+ 2018-10-03 14:38:16.500 |              35.000000000 |
+Query OK, 5 row(s) in set (0.001521s)
+```
+
+物联网场景里，每个数据采集点采集数据的时间是难同步的，但很多分析算法(比如FFT)需要把采集的数据严格按照时间等间隔的对齐，在很多系统里，需要应用自己写程序来处理，但使用TDengine的降采样操作就轻松解决。如果一个时间间隔里，没有采集的数据，TDengine还提供插值计算的功能。
+
+语法规则细节请见<a href="https://www.taosdata.com/cn/documentation20/taos-sql/">TAOS SQL </a>。
+
diff --git a/documentation20/webdocs/markdowndocs/Super Table-ch.md b/documentation20/webdocs/markdowndocs/Super Table-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..96e7104ab7fe78a0015b596dd31bec6a849f2f6a
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Super Table-ch.md	
@@ -0,0 +1,224 @@
+# 超级表STable：多表聚合
+
+TDengine要求每个数据采集点单独建表，这样能极大提高数据的插入/查询性能，但是导致系统中表的数量猛增，让应用对表的维护以及聚合、统计操作难度加大。为降低应用的开发难度，TDengine引入了超级表STable (Super Table)的概念。
+
+## 什么是超级表
+
+STable是同一类型数据采集点的抽象，是同类型采集实例的集合，包含多张数据结构一样的子表。每个STable为其子表定义了表结构和一组标签：表结构即表中记录的数据列及其数据类型；标签名和数据类型由STable定义，标签值记录着每个子表的静态信息，用以对子表进行分组过滤。子表本质上就是普通的表，由一个时间戳主键和若干个数据列组成，每行记录着具体的数据，数据查询操作与普通表完全相同；但子表与普通表的区别在于每个子表从属于一张超级表，并带有一组由STable定义的标签值。每种类型的采集设备可以定义一个STable。数据模型定义表的每列数据的类型，如温度、压力、电压、电流、GPS实时位置等，而标签信息属于Meta Data，如采集设备的序列号、型号、位置等，是静态的，是表的元数据。用户在创建表（数据采集点）时指定STable(采集类型)外，还可以指定标签的值，也可事后增加或修改。
+
+TDengine扩展标准SQL语法用于定义STable，使用关键词tags指定标签信息。语法如下：
+
+```mysql
+CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…)   TAGS(tag_name tag_type, …) 
+```
+
+其中tag_name是标签名，tag_type是标签的数据类型。标签可以使用时间戳之外的其他TDengine支持的数据类型，标签的个数最多为6个，名字不能与系统关键词相同，也不能与其他列名相同。如：
+
+```mysql
+create table thermometer (ts timestamp, degree float) 
+tags (location binary(20), type int)
+```
+
+上述SQL创建了一个名为thermometer的STable，带有标签location和标签type。
+
+为某个采集点创建表时，可以指定其所属的STable以及标签的值，语法如下：
+
+```mysql
+CREATE TABLE <tb_name> USING <stb_name> TAGS (tag_value1,...)
+```
+
+沿用上面温度计的例子，使用超级表thermometer建立单个温度计数据表的语句如下：
+
+```mysql
+create table t1 using thermometer tags (‘beijing’, 10)
+```
+
+上述SQL以thermometer为模板，创建了名为t1的表，这张表的Schema就是thermometer的Schema，但标签location值为‘beijing’，标签type值为10。
+
+用户可以使用一个STable创建数量无上限的具有不同标签的表，从这个意义上理解，STable就是若干具有相同数据模型，不同标签的表的集合。与普通表一样，用户可以创建、删除、查看超级表STable，大部分适用于普通表的查询操作都可运用到STable上，包括各种聚合和投影选择函数。除此之外，可以设置标签的过滤条件，仅对STbale中部分表进行聚合查询，大大简化应用的开发。
+
+TDengine对表的主键（时间戳）建立索引，暂时不提供针对数据模型中其他采集量（比如温度、压力值）的索引。每个数据采集点会采集若干数据记录，但每个采集点的标签仅仅是一条记录，因此数据标签在存储上没有冗余，且整体数据规模有限。TDengine将标签数据与采集的动态数据完全分离存储，而且针对STable的标签建立了高性能内存索引结构，为标签提供全方位的快速操作支持。用户可按照需求对其进行增删改查（Create，Retrieve，Update，Delete，CRUD）操作。
+
+STable从属于库，一个STable只属于一个库，但一个库可以有一到多个STable, 一个STable可有多个子表。
+
+## 超级表管理
+
+- 创建超级表
+
+    ```mysql
+    CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …)
+    ```
+
+    与创建表的SQL语法相似。但需指定TAGS字段的名称和类型。 
+
+    说明：
+
+    1. TAGS列总长度不能超过512 bytes；
+    2. TAGS列的数据类型不能是timestamp和nchar类型；
+    3. TAGS列名不能与其他列名相同;
+    4. TAGS列名不能为预留关键字. 
+
+- 显示已创建的超级表
+
+    ```mysql
+    show stables;
+    ```
+
+    查看数据库内全部STable，及其相关信息，包括STable的名称、创建时间、列数量、标签（TAG）数量、通过该STable建表的数量。 
+
+- 删除超级表
+
+    ```mysql
+    DROP TABLE <stable_name>
+    ```
+
+    Note: 删除STable不会级联删除通过STable创建的表；相反删除STable时要求通过该STable创建的表都已经被删除。
+
+- 查看属于某STable并满足查询条件的表
+
+    ```mysql
+    SELECT TBNAME,[TAG_NAME,…] FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
+    ```
+
+    查看属于某STable并满足查询条件的表。说明：TBNAME为关键词，显示通过STable建立的子表表名，查询过程中可以使用针对标签的条件。
+
+    ```mysql
+    SELECT COUNT(TBNAME) FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
+    ```
+
+    统计属于某个STable并满足查询条件的子表的数量
+
+## 写数据时自动建子表
+
+在某些特殊场景中，用户在写数据时并不确定某个设备的表是否存在，此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表，若该表已存在则不会建立新表。注意：自动建表语句只能自动建立子表而不能建立超级表，这就要求超级表已经被事先定义好。自动建表语法跟insert/import语法非常相似，唯一区别是语句中增加了超级表和标签信息。具体语法如下：
+
+```mysql
+INSERT INTO <tb_name> USING <stb_name> TAGS (<tag1_value>, ...) VALUES (field_value, ...) (field_value, ...) ...;
+```
+
+向表tb_name中插入一条或多条记录，如果tb_name这张表不存在，则会用超级表stb_name定义的表结构以及用户指定的标签值(即tag1_value…)来创建名为tb_name新表，并将用户指定的值写入表中。如果tb_name已经存在，则建表过程会被忽略，系统也不会检查tb_name的标签是否与用户指定的标签值一致，也即不会更新已存在表的标签。
+
+```mysql
+INSERT INTO <tb1_name> USING <stb1_name> TAGS (<tag1_value1>, ...) VALUES (<field1_value1>, ...) (<field1_value2>, ...) ... <tb_name2> USING <stb_name2> TAGS(<tag1_value2>, ...) VALUES (<field1_value1>, ...) ...;
+```
+
+向多张表tb1_name，tb2_name等插入一条或多条记录，并分别指定各自的超级表进行自动建表。
+
+## STable中TAG管理
+
+除了更新标签的值的操作是针对子表进行，其他所有的标签操作（添加标签、删除标签等）均只能作用于STable，不能对单个子表操作。对STable添加标签以后，依托于该STable建立的所有表将自动增加了一个标签，对于数值型的标签，新增加的标签的默认值是0.
+
+- 添加新的标签
+
+    ```mysql
+    ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
+    ```
+
+    为STable增加一个新的标签，并指定新标签的类型。标签总数不能超过6个。
+
+- 删除标签
+
+    ```mysql
+    ALTER TABLE <stable_name> DROP TAG <tag_name>
+    ```
+
+    删除超级表的一个标签，从超级表删除某个标签后，该超级表下的所有子表也会自动删除该标签。
+
+    	说明：第一列标签不能删除，至少需要为STable保留一个标签。
+
+- 修改标签名
+
+    ```mysql
+    ALTER TABLE <stable_name> CHANGE TAG <old_tag_name> <new_tag_name>
+    ```
+
+    	修改超级表的标签名，从超级表修改某个标签名后，该超级表下的所有子表也会自动更新该标签名。
+
+- 修改子表的标签值
+
+    ```mysql
+    ALTER TABLE <table_name> SET TAG <tag_name>=<new_tag_value>
+    ```
+
+## STable多表聚合
+
+针对所有的通过STable创建的子表进行多表聚合查询，支持按照全部的TAG值进行条件过滤，并可将结果按照TAGS中的值进行聚合，暂不支持针对binary类型的模糊匹配过滤。语法如下：
+
+```mysql
+SELECT function<field_name>,… 
+ FROM <stable_name> 
+ WHERE <tag_name> <[=|<=|>=|<>] values..> ([AND|OR] …)
+ INTERVAL (<interval> [, offset])
+ GROUP BY <tag_name>, <tag_name>…
+ ORDER BY <tag_name> <asc|desc>
+ SLIMIT <group_limit>
+ SOFFSET <group_offset>
+ LIMIT <record_limit>
+ OFFSET <record_offset>
+```
+
+**说明**：
+
+超级表聚合查询，TDengine目前支持以下聚合\选择函数：sum、count、avg、first、last、min、max、top、bottom，以及针对全部或部分列的投影操作，使用方式与单表查询的计算过程相同。暂不支持其他类型的聚合计算和四则运算。当前所有的函数及计算过程均不支持嵌套的方式进行执行。
+
+ 不使用GROUP BY的查询将会对超级表下所有满足筛选条件的表按时间进行聚合，结果输出默认是按照时间戳单调递增输出，用户可以使用ORDER BY _c0 ASC|DESC选择查询结果时间戳的升降排序；使用GROUP BY <tag_name> 的聚合查询会按照tags进行分组，并对每个组内的数据分别进行聚合，输出结果为各个组的聚合结果，组间的排序可以由ORDER BY <tag_name> 语句指定，每个分组内部，时间序列是单调递增的。 
+
+使用SLIMIT/SOFFSET语句指定组间分页，即指定结果集中输出的最大组数以及对组起始的位置。使用LIMIT/OFFSET语句指定组内分页，即指定结果集中每个组内最多输出多少条记录以及记录起始的位置。
+
+## STable使用示例
+
+以温度传感器采集时序数据作为例，示范STable的使用。 在这个例子中，对每个温度计都会建立一张表，表名为温度计的ID，温度计读数的时刻记为ts，采集的值记为degree。通过tags给每个采集器打上不同的标签，其中记录温度计的地区和类型，以方便我们后面的查询。所有温度计的采集量都一样，因此我们用STable来定义表结构。
+
+###定义STable表结构并使用它创建子表
+
+创建STable语句如下：
+
+```mysql
+CREATE TABLE thermometer (ts timestamp, degree double) 
+TAGS(location binary(20), type int)
+```
+
+假设有北京，天津和上海三个地区的采集器共4个，温度采集器有3种类型，我们就可以对每个采集器建表如下： 
+
+```mysql
+CREATE TABLE therm1 USING thermometer TAGS (’beijing’, 1);
+CREATE TABLE therm2 USING thermometer TAGS (’beijing’, 2);
+CREATE TABLE therm3 USING thermometer TAGS (’tianjin’, 1);
+CREATE TABLE therm4 USING thermometer TAGS (’shanghai’, 3);
+```
+
+其中therm1，therm2，therm3，therm4是超级表thermometer四个具体的子表，也即普通的Table。以therm1为例，它表示采集器therm1的数据，表结构完全由thermometer定义，标签location=”beijing”, type=1表示therm1的地区是北京，类型是第1类的温度计。
+
+###写入数据
+
+注意，写入数据时不能直接对STable操作，而是要对每张子表进行操作。我们分别向四张表therm1，therm2， therm3， therm4写入一条数据，写入语句如下：
+
+```mysql
+INSERT INTO therm1 VALUES (’2018-01-01 00:00:00.000’, 20);
+INSERT INTO therm2 VALUES (’2018-01-01 00:00:00.000’, 21);
+INSERT INTO therm3 VALUES (’2018-01-01 00:00:00.000’, 24);
+INSERT INTO therm4 VALUES (’2018-01-01 00:00:00.000’, 23);
+```
+
+###按标签聚合查询
+
+查询位于北京(beijing)和天津(tianjing)两个地区的温度传感器采样值的数量count(*)、平均温度avg(degree)、最高温度max(degree)、最低温度min(degree)，并将结果按所处地域(location)和传感器类型(type)进行聚合。
+
+```mysql
+SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
+FROM thermometer
+WHERE location=’beijing’ or location=’tianjing’
+GROUP BY location, type 
+```
+
+###按时间周期聚合查询
+
+查询仅位于北京以外地区的温度传感器最近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
+INTERVAL(10M)
+GROUP BY location, type
+```
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/Super Table.md b/documentation20/webdocs/markdowndocs/Super Table.md
new file mode 100644
index 0000000000000000000000000000000000000000..a213567f6d67ed351fac67b821f4db1929fa3a22
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Super Table.md	
@@ -0,0 +1,195 @@
+# STable: Super Table
+
+"One Table for One Device" design can improve the insert/query performance significantly for a single device. But it has a side effect, the aggregation of multiple tables becomes hard. To reduce the complexity and improve the efficiency, TDengine introduced a new concept: STable (Super Table).  
+
+## What is a Super Table
+
+STable is an abstract and a template for a type of device. A STable contains a set of devices (tables) that have the same schema or data structure. Besides the shared schema, a STable has a set of tags, like the model, serial number and so on. Tags are used to record the static attributes for the devices and are used to group a set of devices (tables) for aggregation. Tags are metadata of a table and can be added, deleted or changed.   
+
+TDengine does not save tags as a part of the data points collected. Instead, tags are saved as metadata. Each table has a set of tags. To improve query performance, tags are all cached and indexed. One table can only belong to one STable, but one STable may contain many tables. 
+
+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.
+
+##Create a STable
+
+Similiar to creating a standard table, syntax is: 
+
+```mysql
+CREATE TABLE <stable_name> (<field_name> TIMESTAMP, field_name1 field_type,…) TAGS(tag_name tag_type, …)
+```
+
+New keyword "tags" is introduced, where tag_name is the tag name, and tag_type is the associated data type. 
+
+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
+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 
+
+For example:
+
+```mysql
+create table thermometer (ts timestamp, degree float) 
+tags (location binary(20), type int)
+```
+
+The above statement creates a STable thermometer with two tag "location" and "type"
+
+##Create a Table via STable
+
+To create a table for a device, you can use a STable as its template and assign the tag values. The syntax is:
+
+```mysql
+CREATE TABLE <tb_name> USING <stb_name> TAGS (tag_value1,...)
+```
+
+You can create any number of tables via a STable, and each table may have different tag values. For example, you create five tables via STable thermometer below:
+
+```mysql
+ create table t1 using thermometer tags (‘beijing’, 10);
+ create table t2 using thermometer tags (‘beijing’, 20);
+ create table t3 using thermometer tags (‘shanghai’, 10);
+ create table t4 using thermometer tags (‘shanghai’, 20);
+ create table t5 using thermometer tags (‘new york’, 10);
+```
+
+## Aggregate Tables via STable
+
+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：
+
+```mysql
+SELECT function<field_name>,… 
+ FROM <stable_name> 
+ WHERE <tag_name> <[=|<=|>=|<>] values..> ([AND|OR] …)
+ INTERVAL (<time range>)
+ GROUP BY <tag_name>, <tag_name>…
+ ORDER BY <tag_name> <asc|desc>
+ SLIMIT <group_limit>
+ SOFFSET <group_offset>
+ LIMIT <record_limit>
+ OFFSET <record_offset>
+```
+
+For the time being, STable supports only the following aggregation/selection functions: *sum, count, avg, first, last, min, max, top, bottom*, and the projection operations, the same syntax as a standard table.  Arithmetic operations are not supported, embedded queries not either. 
+
+*INTERVAL* is used for the aggregation over a time range.
+
+If *GROUP BY* is not used, the aggregation is applied to all the selected tables, and the result set is output in ascending order of the timestamp, but you can use "*ORDER BY _c0 ASC|DESC*" to specify the order you like. 
+
+If *GROUP BY <tag_name>* is used, the aggregation is applied to groups based on tags. Each group is aggregated independently. Result set is a group of aggregation results. The group order is decided by *ORDER BY <tag_name>*. Inside each group, the result set is in the ascending order of the time stamp. 
+
+*SLIMIT/SOFFSET* are used to limit the number of groups and starting group number.
+
+*LIMIT/OFFSET* are used to limit the number of records in a group and the starting rows.
+
+###Example 1:
+
+Check the average, maximum, and minimum temperatures of Beijing and Shanghai, and group the result set by location and type. The SQL statement shall be:
+
+```mysql
+SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
+FROM thermometer
+WHERE location=’beijing’ or location=’tianjing’
+GROUP BY location, type 
+```
+
+### Example 2:
+
+List the number of records, average, maximum, and minimum temperature every 10 minutes for the past 24 hours for all the thermometers located in Beijing with type 10. The SQL statement shall be:
+
+```mysql
+SELECT COUNT(*), AVG(degree), MAX(degree), MIN(degree)
+FROM thermometer
+WHERE name=’beijing’ and type=10 and ts>=now-1d
+INTERVAL(10M)
+```
+
+## Create Table Automatically
+
+Insert operation will fail if the table is not created yet. But for STable, TDengine can create the table automatically if the application provides the STable name, table name and tags' value when inserting data points. The syntax is:
+
+```mysql
+INSERT INTO <tb_name> USING <stb_name> TAGS (<tag1_value>, ...) VALUES (field_value, ...) (field_value, ...) ... <tb_name2> USING <stb_name2> TAGS(<tag1_value2>, ...) VALUES (<field1_value1>, ...) ...;
+```
+
+When inserting data points into table tb_name, the system will check if table tb_name is created or not. If it is already created, the data points will be inserted as usual. But if the table is not created yet, the system will create the table tb_bame using STable stb_name as the template with the tags. Multiple tables can be specified in the SQL statement. 
+
+## Management of STables
+
+After you can create a STable, you can describe, delete, change STables. This section lists all the supported operations.
+
+### Show STables in current DB
+
+```mysql
+show stables;
+```
+
+It lists all STables in current DB, including the name, created time, number of fileds, number of tags, and number of tables which are created via this STable. 
+
+### Describe a STable
+
+```mysql
+DESCRIBE <stable_name>
+```
+
+It lists the STable's schema and tags
+
+### Drop a STable
+
+```mysql
+DROP TABLE <stable_name>
+```
+
+To delete a STable, all the tables created via this STable shall be deleted first, otherwise, it will fail.
+
+### List the Associated Tables of a STable
+
+```mysql
+SELECT TBNAME,[TAG_NAME,…] FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
+```
+
+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. 
+
+```mysql
+SELECT COUNT(TBNAME) FROM <stable_name> WHERE <tag_name> <[=|=<|>=|<>] values..> ([AND|OR] …)
+```
+
+The above SQL statement will list the number of tables in a STable, which satisfy the filter condition.
+
+## Management of Tags
+
+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.  
+
+###Add a Tag
+
+```mysql
+ALTER TABLE <stable_name> ADD TAG <new_tag_name> <TYPE>
+```
+
+It adds a new tag to the STable with a data type. The maximum number of tags is 6. 
+
+###Drop a Tag
+
+```mysql
+ALTER TABLE <stable_name> DROP TAG <tag_name>
+```
+
+It drops a tag from a STable. The first tag could not be deleted, and there must be at least one tag.
+
+###Change a Tag's Name
+
+```mysql
+ALTER TABLE <stable_name> CHANGE TAG <old_tag_name> <new_tag_name>
+```
+
+It changes the name of a tag from old to new. 
+
+###Change the Tag's Value
+
+```mysql
+ALTER TABLE <table_name> SET TAG <tag_name>=<new_tag_value>
+```
+
+It changes a table's tag value to a new one. 
diff --git a/documentation20/webdocs/markdowndocs/TAOS SQL-ch.md b/documentation20/webdocs/markdowndocs/TAOS SQL-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..66d17c6aa686a7ed07ff1b865000f7b4a43f3834
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/TAOS SQL-ch.md	
@@ -0,0 +1,1023 @@
+# TAOS SQL
+
+本文档说明TAOS SQL支持的语法规则、主要查询功能、支持的SQL查询函数，以及常用技巧等内容。阅读本文档需要读者具有基本的SQL语言的基础。
+
+TAOS SQL是用户对TDengine进行数据写入和查询的主要工具。TAOS SQL为了便于用户快速上手，在一定程度上提供类似于标准SQL类似的风格和模式。严格意义上，TAOS SQL并不是也不试图提供SQL标准的语法。此外，由于TDengine针对的时序性结构化数据不提供修改和更新功能，因此在TAO SQL中不提供数据更新和数据删除的相关功能。
+
+本章节SQL语法遵循如下约定：
+
+- < > 里的内容是用户需要输入的，但不要输入<>本身
+- [ ]表示内容为可选项，但不能输入[]本身
+- | 表示多选一，选择其中一个即可，但不能输入|本身
+- … 表示前面的项可重复多个
+
+为更好地说明SQL语法的规则及其特点，本文假设存在一个数据集。以智能电表(meters)为例，假设每个智能电表采集电流、电压、相位三个量。其建模如下：
+```mysql
+taos> DESCRIBE meters;
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+数据集包含4个智能电表的数据，按照TDengine的建模规则，对应4个子表，其名称分别是 d1001, d1002, d1003, d1004。
+
+## 支持的数据类型
+
+使用TDengine，最重要的是时间戳。创建并插入记录、查询历史记录的时候，均需要指定时间戳。时间戳有如下规则：
+
+- 时间格式为```YYYY-MM-DD HH:mm:ss.MS```, 默认时间分辨率为毫秒。比如：```2017-08-12 18:25:58.128```
+- 内部函数now是服务器的当前时间
+- 插入记录时，如果时间戳为now，插入数据时使用服务器当前时间
+- Epoch Time: 时间戳也可以是一个长整数，表示从1970-01-01 08:00:00.000开始的毫秒数
+- 时间可以加减，比如 now-2h，表明查询时刻向前推2个小时(最近2小时)。 数字后面的时间单位可以是 a(毫秒)、s(秒)、 m(分)、h(小时)、d(天)、w(周)。 比如select * from t1 where ts > now-2w and ts <= now-1w, 表示查询两周前整整一周的数据。 在指定降频操作(down sampling)的时间窗口(interval)时，时间单位还可以使用 n(自然月) 和 y(自然年)。
+
+TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMicrosecond就可支持微秒。
+
+在TDengine中，普通表的数据模型中可使用以下10种数据类型。 
+
+|      |   类型    | Bytes  | 说明                                                         |
+| ---- | :-------: | ------ | ------------------------------------------------------------ |
+| 1    | TIMESTAMP | 8      | 时间戳。缺省精度毫秒，可支持微秒。从格林威治时间 1970-01-01 00:00:00.000 (UTC/GMT) 开始，计时不能早于该时间。 |
+| 2    |    INT    | 4      | 整型，范围 [-2^31+1,   2^31-1], -2^31用作Null           |
+| 3    |  BIGINT   | 8      | 长整型，范围 [-2^63+1,   2^63-1], -2^63用于NULL                                 |
+| 4    |   FLOAT   | 4      | 浮点型，有效位数6-7，范围 [-3.4E38, 3.4E38]                  |
+| 5    |  DOUBLE   | 8      | 双精度浮点型，有效位数15-16，范围 [-1.7E308,   1.7E308]      |
+| 6    |  BINARY   | 自定义 | 用于记录字符串，理论上，最长可以有16374字节，但由于每行数据最多16K字节，实际上限一般小于理论值。 binary仅支持字符串输入，字符串两端使用单引号引用，否则英文全部自动转化为小写。使用时须指定大小，如binary(20)定义了最长为20个字符的字符串，每个字符占1byte的存储空间。如果用户字符串超出20字节将会报错。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示， 即 **\’**。 |
+| 7    | SMALLINT  | 2      | 短整型， 范围 [-32767, 32767], -32768用于NULL                                |
+| 8    |  TINYINT  | 1      | 单字节整型，范围 [-127, 127], -128用于NULL                                |
+| 9    |   BOOL    | 1      | 布尔型，{true,   false}                                      |
+| 10   |   NCHAR   | 自定义 | 用于记录非ASCII字符串，如中文字符。每个nchar字符占用4bytes的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 **\’**。nchar使用时须指定字符串大小，类型为nchar(10)的列表示此列的字符串最多存储10个nchar字符，会固定占用40bytes的空间。如用户字符串长度超出声明长度，则将会报错。 |
+
+**Tips**: TDengine对SQL语句中的英文字符不区分大小写，自动转化为小写执行。因此用户大小写敏感的字符串及密码，需要使用单引号将字符串引起来。
+
+## 数据库管理
+
+- **创建数据库**  
+    ```mysql
+    CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep];
+    ```
+    说明：
+    
+    1) `KEEP`是该数据库的数据保留多长天数，缺省是3650天(10年)，数据库会自动删除超过时限的数据；
+    2) 数据库名最大长度为33；
+    3) 一条SQL 语句的最大长度为65480个字符；
+    4) 数据库还有更多与存储相关的配置参数，请参见[系统管理](../administrator/#服务端配置)。
+
+
+- **使用数据库**
+    ```mysql
+    USE db_name;
+    ```
+    使用/切换数据库
+
+
+- **删除数据库**
+    ```mysql
+    DROP DATABASE [IF EXISTS] db_name;
+    ```
+    删除数据库。所包含的全部数据表将被删除，谨慎使用
+
+- **修改数据库参数**
+    ```mysql
+    ALTER DATABASE db_name COMP 2;
+    ```
+    COMP参数是指修改数据库文件压缩标志位，取值范围为[0, 2]. 0表示不压缩，1表示一阶段压缩，2表示两阶段压缩。
+
+    ```mysql
+    ALTER DATABASE db_name REPLICA 2;
+    ```
+    REPLICA参数是指修改数据库副本数，取值范围[1, 3]。在集群中使用，副本数必须小于dnode的数目。
+
+    ```mysql
+    ALTER DATABASE db_name KEEP 365;
+    ```
+    KEEP参数是指修改数据文件保存的天数，缺省值为3650，取值范围[days, 365000]，必须大于或等于days参数值。
+
+    ```mysql
+    ALTER DATABASE db_name QUORUM 2;
+    ```
+    QUORUM参数是指数据写入成功所需要的确认数。取值范围[1, 3]。对于异步复制，quorum设为1，具有master角色的虚拟节点自己确认即可。对于同步复制，需要至少大于等于2。原则上，Quorum >=1 并且 Quorum <= replica(副本数)，这个参数在启动一个同步模块实例时需要提供。
+
+    ```mysql
+    ALTER DATABASE db_name BLOCKS 100;
+    ```
+    BLOCKS参数是每个VNODE (TSDB) 中有多少cache大小的内存块，因此一个VNODE的用的内存大小粗略为（cache * blocks）。取值范围[3, 1000]。
+
+    **Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。
+
+
+- **显示系统所有数据库**
+    ```mysql
+    SHOW DATABASES;
+    ```
+
+## 表管理
+- **创建数据表**
+  
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] tb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]);
+    ```
+    说明：
+    1) 表的第一个字段必须是TIMESTAMP，并且系统自动将其设为主键；
+    2) 表名最大长度为193；
+    3) 表的每行长度不能超过16k个字符;     
+    5) 使用数据类型binary或nchar，需指定其最长的字节数，如binary(20)，表示20字节；
+
+- **删除数据表**
+
+    ```mysql
+    DROP TABLE [IF EXISTS] tb_name;
+    ```
+
+- **显示当前数据库下的所有数据表信息**
+
+    ```mysql
+    SHOW TABLES [LIKE tb_name_wildcar];
+    ```
+
+    显示当前数据库下的所有数据表信息。说明：可在like中使用通配符进行名称的匹配。 通配符匹配：1）’%’ (百分号)匹配0到任意个字符；2）’_’下划线匹配一个字符。
+
+
+- **获取表的结构信息**
+
+    ```mysql
+    DESCRIBE tb_name;
+    ```
+
+- **表增加列**
+
+    ```mysql
+    ALTER TABLE tb_name ADD COLUMN field_name data_type;
+    ```
+    说明：
+    1) 列的最大个数为1024，最小个数为2；
+    2) 列名最大长度为65；
+
+- **表删除列**
+
+    ```mysql
+    ALTER TABLE tb_name DROP COLUMN field_name; 
+    ```
+    如果表是通过[超级表](../super-table/)创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构
+
+## 超级表STable管理
+- **创建超级表**
+  
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] stb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]) TAGS (tag1_name tag_type1, tag2_name tag_type2 [, tag3_name tag_type3]);
+    ```
+    创建STable, 与创建表的SQL语法相似，但需指定TAGS字段的名称和类型
+    
+    说明：
+    1) TAGS 列的数据类型不能是timestamp类型；
+    2) TAGS 列名不能与其他列名相同；
+    3) TAGS 列名不能为预留关键字；
+    4) TAGS 最多允许128个，可以0个，总长度不超过16k个字符
+  
+- **删除超级表**
+
+    ```mysql
+    DROP TABLE [IF EXISTS] stb_name;
+    ```
+    删除STable会自动删除通过STable创建的子表。
+
+- **显示当前数据库下的所有超级表信息**
+
+    ```mysql
+    SHOW STABLES [LIKE tb_name_wildcar];
+    ```
+    查看数据库内全部STable，及其相关信息，包括STable的名称、创建时间、列数量、标签（TAG）数量、通过该STable建表的数量。
+
+- **获取超级表的结构信息**
+
+    ```mysql
+    DESCRIBE stb_name;
+    ```
+    
+- **超级表增加列**
+
+    ```mysql
+    ALTER TABLE stb_name ADD COLUMN field_name data_type;
+    ```
+
+- **超级表删除列**
+
+    ```mysql
+    ALTER TABLE stb_name DROP COLUMN field_name; 
+    ```
+
+## 超级表 STable 中 TAG 管理
+- **添加标签**
+  
+    ```mysql
+    ALTER TABLE stb_name ADD TAG new_tag_name tag_type;
+    ```
+    为STable增加一个新的标签，并指定新标签的类型。标签总数不能超过128个，总长度不超过16k个字符.
+
+- **删除标签**
+
+    ```mysql
+    ALTER TABLE stb_name DROP TAG tag_name;
+    ```
+    删除超级表的一个标签，从超级表删除某个标签后，该超级表下的所有子表也会自动删除该标签。
+
+- **修改标签名**
+
+    ```mysql
+    ALTER TABLE stb_name CHANGE TAG old_tag_name new_tag_name;
+    ```
+    修改超级表的标签名，从超级表修改某个标签名后，该超级表下的所有子表也会自动更新该标签名。
+
+- **修改子表标签值**
+
+    ```mysql
+    ALTER TABLE tb_name SET TAG tag_name=new_tag_value;
+    ```
+    说明：除了更新标签的值的操作是针对子表进行，其他所有的标签操作（添加标签、删除标签等）均只能作用于STable，不能对单个子表操作。对STable添加标签以后，依托于该STable建立的所有表将自动增加了一个标签，所有新增标签的默认值都是NULL。
+
+## 数据写入
+
+- **插入一条记录**
+    ```mysql
+    INSERT INTO tb_name VALUES (field_value, ...);
+    ```
+    向表tb_name中插入一条记录
+
+
+- **插入一条记录，数据对应到指定的列**
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value, ...)
+    ```
+    向表tb_name中插入一条记录，数据对应到指定的列。SQL语句中没有出现的列，数据库将自动填充为NULL。主键（时间戳）不能为NULL。
+
+
+- **插入多条记录**
+    ```mysql
+    INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...)...;
+    ```
+    向表tb_name中插入多条记录
+
+
+- **按指定的列插入多条记录**
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
+    ```
+    向表tb_name中按指定的列插入多条记录
+
+
+- **向多个表插入多条记录**
+    ```mysql
+    INSERT INTO tb1_name VALUES (field1_value1, ...)(field1_value2, ...)... 
+                tb2_name VALUES (field1_value1, ...)(field1_value2, ...)...;
+    ```
+    同时向表tb1_name和tb2_name中分别插入多条记录
+
+
+- **同时向多个表按列插入多条记录**
+    ```mysql
+    INSERT INTO tb1_name (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...)
+                tb2_name (tb2_field1_name, ...) VALUES (field1_value1, ...) (field1_value2, ...);
+    ```
+    同时向表tb1_name和tb2_name中按列分别插入多条记录 
+
+    注意：
+    1) 如果时间戳为0，系统将自动使用服务器当前时间作为该记录的时间戳；
+    2) 允许插入的最老记录的时间戳，是相对于当前服务器时间，减去配置的keep值（数据保留的天数），允许插入的最新记录的时间戳，是相对于当前服务器时间，加上配置的days值（数据文件存储数据的时间跨度，单位为天）。keep和days都是可以在创建数据库时指定的，缺省值分别是3650天和10天。
+
+**历史记录写入**：可使用IMPORT或者INSERT命令，IMPORT的语法，功能与INSERT完全一样。
+
+## 数据查询
+
+### 查询语法：
+
+```mysql
+SELECT select_expr [, select_expr ...]
+    FROM {tb_name_list}
+    [WHERE where_condition]
+    [INTERVAL (interval_val [, interval_offset])]
+    [FILL fill_val]
+    [SLIDING fill_val]
+    [GROUP BY col_list]
+    [ORDER BY col_list { DESC | ASC }]    
+    [SLIMIT limit_val [, SOFFSET offset_val]]
+    [LIMIT limit_val [, OFFSET offset_val]]
+    [>> export_file]
+```
+说明：针对 insert 类型的 SQL 语句，我们采用的流式解析策略，在发现后面的错误之前，前面正确的部分SQL仍会执行。下面的sql中，insert语句是无效的，但是d1001仍会被创建。
+```mysql
+taos> create table meters(ts timestamp, current float, voltage int, phase float) tags(location binary(30), groupId int);
+Query OK, 0 row(s) affected (0.008245s)
+
+taos> show stables;
+              name              |      created_time       | columns |  tags  |   tables    |
+============================================================================================
+ meters                         | 2020-08-06 17:50:27.831 |       4 |      2 |           0 |
+Query OK, 1 row(s) in set (0.001029s)
+
+taos> show tables;
+Query OK, 0 row(s) in set (0.000946s)
+
+taos> insert into d1001 using meters tags('Beijing.Chaoyang', 2);
+
+DB error: invalid SQL: keyword VALUES or FILE required
+
+taos> show tables;
+           table_name           |      created_time       | columns |          stable_name           |
+======================================================================================================
+ d1001                          | 2020-08-06 17:52:02.097 |       4 | meters                         |
+Query OK, 1 row(s) in set (0.001091s)
+```
+
+#### SELECT子句
+一个选择子句可以是联合查询（UNION）和另一个查询的子查询（SUBQUERY）。
+
+##### 通配符
+通配符 * 可以用于代指全部列。对于普通表，结果中只有普通列。
+```mysql
+taos> SELECT * FROM d1001;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 |
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 |
+Query OK, 3 row(s) in set (0.001165s)
+```
+
+在针对超级表，通配符包含 _标签列_ 。
+```mysql
+taos> SELECT * FROM meters;
+           ts            |       current        |   voltage   |        phase         |            location            |   groupid   |
+=====================================================================================================================================
+ 2018-10-03 14:38:05.500 |             11.80000 |         221 |              0.28000 | Beijing.Haidian                |           2 |
+ 2018-10-03 14:38:16.600 |             13.40000 |         223 |              0.29000 | Beijing.Haidian                |           2 |
+ 2018-10-03 14:38:05.000 |             10.80000 |         223 |              0.29000 | Beijing.Haidian                |           3 |
+ 2018-10-03 14:38:06.500 |             11.50000 |         221 |              0.35000 | Beijing.Haidian                |           3 |
+ 2018-10-03 14:38:04.000 |             10.20000 |         220 |              0.23000 | Beijing.Chaoyang               |           3 |
+ 2018-10-03 14:38:16.650 |             10.30000 |         218 |              0.25000 | Beijing.Chaoyang               |           3 |
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 | Beijing.Chaoyang               |           2 |
+ 2018-10-03 14:38:15.000 |             12.60000 |         218 |              0.33000 | Beijing.Chaoyang               |           2 |
+ 2018-10-03 14:38:16.800 |             12.30000 |         221 |              0.31000 | Beijing.Chaoyang               |           2 |
+Query OK, 9 row(s) in set (0.002022s)
+```
+
+
+通配符支持表名前缀，以下两个SQL语句均为返回全部的列：
+```mysql
+SELECT * FROM d1001;
+SELECT d1001.* FROM d1001;
+```
+在Join查询中，带前缀的\*和不带前缀\*返回的结果有差别， \*返回全部表的所有列数据（不包含标签），带前缀的通配符，则只返回该表的列数据。
+```mysql
+taos> SELECT * FROM d1001, d1003 WHERE d1001.ts=d1003.ts;
+           ts            | current |   voltage   |    phase     |           ts            | current |   voltage   |    phase     |
+==================================================================================================================================
+ 2018-10-03 14:38:05.000 | 10.30000|         219 |      0.31000 | 2018-10-03 14:38:05.000 | 10.80000|         223 |      0.29000 |
+Query OK, 1 row(s) in set (0.017385s)
+```
+```mysql
+taos> SELECT d1001.* FROM d1001,d1003 WHERE d1001.ts = d1003.ts;
+           ts            |       current        |   voltage   |        phase         |
+======================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |         219 |              0.31000 |
+Query OK, 1 row(s) in set (0.020443s)
+```
+
+在使用SQL函数来进行查询过程中，部分SQL函数支持通配符操作。其中的区别在于：
+```count(\*)```函数只返回一列。```first```、```last```、```last_row```函数则是返回全部列。
+
+```
+taos> select count(*) from d1001;
+       count(*)        |
+========================
+                     3 |
+Query OK, 1 row(s) in set (0.001035s)
+```
+
+```
+taos> select first(*) from d1001;
+        first(ts)        |    first(current)    | first(voltage) |     first(phase)     |
+=========================================================================================
+ 2018-10-03 14:38:05.000 |             10.30000 |            219 |              0.31000 |
+Query OK, 1 row(s) in set (0.000849s)
+```
+
+#### 结果集列名
+
+```SELECT```子句中，如果不指定返回结果集合的列名，结果集列名称默认使用```SELECT```子句中的表达式名称作为列名称。此外，用户可使用```AS```来重命名返回结果集合中列的名称。例如：
+```
+taos> select ts, ts as primary_key_ts from d1001;
+           ts            |     primary_key_ts      |
+====================================================
+ 2018-10-03 14:38:05.000 | 2018-10-03 14:38:05.000 |
+ 2018-10-03 14:38:15.000 | 2018-10-03 14:38:15.000 |
+ 2018-10-03 14:38:16.800 | 2018-10-03 14:38:16.800 |
+Query OK, 3 row(s) in set (0.001191s)
+```
+但是针对```first(*)```、```last(*)```、```last_row(*)```不支持针对单列的重命名。
+
+#### 隐式结果列
+```Select_exprs```可以是表所属列的列名，也可以是基于列的函数表达式或计算式，数量的上限256个。当用户使用了```interval```或```group by tags```的子句以后，在最后返回结果中会强制返回时间戳列（第一列）和group by子句中的标签列。后续的版本中可以支持关闭group by子句中隐式列的输出，列输出完全由select子句控制。
+
+#### 表（超级表）列表
+
+FROM关键字后面可以是若干个表（超级表）列表，也可以是子查询的结果。
+如果没有指定用户的当前数据库，可以在表名称之前使用数据库的名称来指定表所属的数据库。例如：```power.d1001``` 方式来跨库使用表。
+```
+SELECT * FROM power.d1001;
+------------------------------
+use power;
+SELECT * FROM d1001;
+```
+
+#### 特殊功能
+部分特殊的查询功能可以不使用FROM子句执行。获取当前所在的数据库 database() 
+```
+taos> SELECT database();
+           database()           |
+=================================
+ power                          |
+Query OK, 1 row(s) in set (0.000079s)
+```
+如果登录的时候没有指定默认数据库，且没有使用```use```命令切换数据，则返回NULL。
+```
+taos> SELECT database();
+           database()           |
+=================================
+ NULL                           |
+Query OK, 1 row(s) in set (0.000184s)
+```
+获取服务器和客户端版本号:
+```
+taos> SELECT client_version();
+ client_version() |
+===================
+ 2.0.0.0          |
+Query OK, 1 row(s) in set (0.000070s)
+
+taos> SELECT server_version();
+ server_version() |
+===================
+ 2.0.0.0          |
+Query OK, 1 row(s) in set (0.000077s)
+```
+服务器状态检测语句。如果服务器正常，返回一个数字（例如 1）。如果服务器异常，返回error code。该SQL语法能兼容连接池对于TDengine状态的检查及第三方工具对于数据库服务器状态的检查。并可以避免出现使用了错误的心跳检测SQL语句导致的连接池连接丢失的问题。
+```
+taos> SELECT server_status();
+ server_status() |
+==================
+               1 |
+Query OK, 1 row(s) in set (0.000074s)
+
+taos> SELECT server_status() as status;
+   status    |
+==============
+           1 |
+Query OK, 1 row(s) in set (0.000081s)
+```
+#### TAOS SQL中特殊关键词
+
+ >   TBNAME： 在超级表查询中可视为一个特殊的标签，代表查询涉及的子表名<br>
+    \_c0: 表示表（超级表）的第一列
+
+#### 小技巧
+获取一个超级表所有的子表名及相关的标签信息：
+```
+SELECT TBNAME, location FROM meters;
+```
+统计超级表下辖子表数量：
+```
+SELECT COUNT(TBNAME) FROM meters;
+```
+以上两个查询均只支持在Where条件子句中添加针对标签（TAGS）的过滤条件。例如：
+```
+taos> SELECT TBNAME, location FROM meters;
+             tbname             |            location            |
+==================================================================
+ d1004                          | Beijing.Haidian                |
+ d1003                          | Beijing.Haidian                |
+ d1002                          | Beijing.Chaoyang               |
+ d1001                          | Beijing.Chaoyang               |
+Query OK, 4 row(s) in set (0.000881s)
+
+taos> SELECT count(tbname) FROM meters WHERE groupId > 2;
+     count(tbname)     |
+========================
+                     2 |
+Query OK, 1 row(s) in set (0.001091s)
+```
+
+- 可以使用* 返回所有列，或指定列名。可以对数字列进行四则运算，可以给输出的列取列名
+- where语句可以使用各种逻辑判断来过滤数字值，或使用通配符来过滤字符串
+- 输出结果缺省按首列时间戳升序排序，但可以指定按降序排序(_c0指首列时间戳)。使用ORDER BY对其他字段进行排序为非法操作。
+- 参数LIMIT控制输出条数，OFFSET指定从第几条开始输出。LIMIT/OFFSET对结果集的执行顺序在ORDER BY之后。
+- 通过”>>"输出结果可以导出到指定文件
+
+### 支持的条件过滤操作
+
+| Operation | Note                          | Applicable Data Types                 |
+| --------- | ----------------------------- | ------------------------------------- |
+| >         | larger than                   | **`timestamp`** and all numeric types |
+| <         | smaller than                  | **`timestamp`** and all numeric types |
+| >=        | larger than or equal to       | **`timestamp`** and all numeric types |
+| <=        | smaller than or equal to      | **`timestamp`** and all numeric types |
+| =         | equal to                      | all types                             |
+| <>        | not equal to                  | all types                             |
+| %         | match with any char sequences | **`binary`** **`nchar`**              |
+| _         | match with a single char      | **`binary`** **`nchar`**              |
+
+1. 同时进行多个字段的范围过滤需要使用关键词AND进行连接不同的查询条件，暂不支持OR连接的不同列之间的查询过滤条件。
+2. 针对某一字段的过滤只支持单一时间区间过滤条件。但是针对其他的（普通）列或标签列，可以使用``` OR``` 条件进行组合条件的查询过滤。例如：((value > 20 and value < 30)  OR (value < 12)) 。
+
+### SQL 示例 
+
+- 对于下面的例子，表tb1用以下语句创建
+
+    ```mysql
+    CREATE TABLE tb1 (ts timestamp, col1 int, col2 float, col3 binary(50));
+    ```
+
+- 查询tb1刚过去的一个小时的所有记录
+
+    ```mysql
+    SELECT * FROM tb1 WHERE ts >= NOW - 1h;
+    ```
+
+- 查询表tb1从2018-06-01 08:00:00.000 到2018-06-02 08:00:00.000时间范围，并且col3的字符串是'nny'结尾的记录，结果按照时间戳降序
+
+    ```mysql
+    SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC;
+    ```
+
+- 查询col1与col2的和，并取名complex, 时间大于2018-06-01 08:00:00.000, col2大于1.2，结果输出仅仅10条记录，从第5条开始
+
+    ```mysql
+    SELECT (col1 + col2) AS 'complex' FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' and col2 > 1.2 LIMIT 10 OFFSET 5;
+    ```
+
+- 查询过去10分钟的记录，col2的值大于3.14，并且将结果输出到文件 `/home/testoutpu.csv`.
+
+    ```mysql
+    SELECT COUNT(*) FROM tb1 WHERE ts >= NOW - 10m AND col2 > 3.14 >> /home/testoutpu.csv;
+    ```
+
+## SQL 函数
+
+### 聚合函数
+
+TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数如下：
+
+- **COUNT**
+    ```mysql
+    SELECT COUNT([*|field_name]) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表/超级表中记录行数或某列的非空值个数。  
+    返回结果数据类型：长整型INT64。  
+    应用字段：应用全部字段。  
+    适用于：表、超级表。  
+    说明：1）可以使用星号*来替代具体的字段，使用星号(*)返回全部记录数量。2）针对同一表的（不包含NULL值）字段查询结果均相同。3）如果统计对象是具体的列，则返回该列中非NULL值的记录数量。 
+
+    示例：
+    ```mysql
+    taos> SELECT COUNT(*), COUNT(VOLTAGE) FROM meters;
+        count(*)        |    count(voltage)     |
+    ================================================
+                        9 |                     9 |
+    Query OK, 1 row(s) in set (0.004475s)
+
+    taos> SELECT COUNT(*), COUNT(VOLTAGE) FROM d1001;
+        count(*)        |    count(voltage)     |
+    ================================================
+                        3 |                     3 |
+    Query OK, 1 row(s) in set (0.001075s)
+    ```
+
+
+- **AVG**
+    ```mysql
+    SELECT AVG(field_name) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的平均值。  
+    返回结果数据类型：双精度浮点数Double。  
+    应用字段：不能应用在timestamp、binary、nchar、bool字段。  
+    适用于：表、超级表。  
+    
+    示例：
+    ```mysql
+    taos> SELECT AVG(current), AVG(voltage), AVG(phase) FROM meters;
+        avg(current)        |       avg(voltage)        |        avg(phase)         |
+    ====================================================================================
+                11.466666751 |             220.444444444 |               0.293333333 |
+    Query OK, 1 row(s) in set (0.004135s)
+
+    taos> SELECT AVG(current), AVG(voltage), AVG(phase) from d1001;
+        avg(current)        |       avg(voltage)        |        avg(phase)         |
+    ====================================================================================
+                11.733333588 |             219.333333333 |               0.316666673 |
+    Query OK, 1 row(s) in set (0.000943s)
+    ```
+
+- **TWA**
+    ```mysql
+    SELECT TWA(field_name) FROM tb_name WHERE clause;
+    ```
+    功能说明：时间加权平均函数。统计表/超级表中某列在一段时间内的时间加权平均。  
+    返回结果数据类型：双精度浮点数Double。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
+    说明：时间加权平均(time weighted average, TWA）查询需要指定查询时间段的 _开始时间_ 和 _结束时间_ 。
+    适用于：表、超级表。
+
+- **SUM**
+    ```mysql
+    SELECT SUM(field_name) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的和。  
+    返回结果数据类型：双精度浮点数Double和长整型INT64。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    适用于：表、超级表。    
+
+    示例：
+    ```mysql
+    taos> SELECT SUM(current), SUM(voltage), SUM(phase) from meters;
+        sum(current)        |     sum(voltage)      |        sum(phase)         |
+    ================================================================================
+                103.200000763 |                  1984 |               2.640000001 |
+    Query OK, 1 row(s) in set (0.001702s)
+
+    taos> SELECT SUM(current), SUM(voltage), SUM(phase) from d1001;
+        sum(current)        |     sum(voltage)      |        sum(phase)         |
+    ================================================================================
+                35.200000763 |                   658 |               0.950000018 |
+    Query OK, 1 row(s) in set (0.000980s)
+    ```
+
+- **STDDEV**
+    ```mysql
+    SELECT STDDEV(field_name) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表中某列的均方差。  
+    返回结果数据类型：双精度浮点数Double。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    适用于：表。
+
+    示例：
+    ```mysql
+    taos> SELECT STDDEV(current) FROM d1001;
+        stddev(current)      |
+    ============================
+                1.020892909 |
+    Query OK, 1 row(s) in set (0.000915s)
+    ```
+
+- **LEASTSQUARES**
+    ```mysql
+    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表中某列的值是主键（时间戳）的拟合直线方程。start_val是自变量初始值，step_val是自变量的步长值。  
+    返回结果数据类型：字符串表达式（斜率, 截距）。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：自变量是时间戳，因变量是该列的值。  
+    适用于：表。
+
+    示例：
+    ```mysql
+    taos> SELECT LEASTSQUARES(current, 1, 1) FROM d1001;
+                leastsquares(current, 1, 1)             |
+    =====================================================
+    {slop:1.000000, intercept:9.733334}                 |
+    Query OK, 1 row(s) in set (0.000921s)
+    ```
+
+### 选择函数
+
+- **MIN**
+    ```mysql
+    SELECT MIN(field_name) FROM {tb_name | stb_name} [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的值最小值。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
+
+    示例：
+    ```mysql
+    taos> SELECT MIN(current), MIN(voltage) FROM meters;
+        min(current)     | min(voltage) |
+    ======================================
+                10.20000 |          218 |
+    Query OK, 1 row(s) in set (0.001765s)
+
+    taos> SELECT MIN(current), MIN(voltage) FROM d1001;
+        min(current)     | min(voltage) |
+    ======================================
+                10.30000 |          218 |
+    Query OK, 1 row(s) in set (0.000950s)
+    ```
+
+- **MAX**
+    ```mysql
+    SELECT MAX(field_name) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的值最大值。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
+
+    示例：
+    ```mysql
+    taos> SELECT MAX(current), MAX(voltage) FROM meters;
+        max(current)     | max(voltage) |
+    ======================================
+                13.40000 |          223 |
+    Query OK, 1 row(s) in set (0.001123s)
+
+    taos> SELECT MAX(current), MAX(voltage) FROM d1001;
+        max(current)     | max(voltage) |
+    ======================================
+                12.60000 |          221 |
+    Query OK, 1 row(s) in set (0.000987s)
+    ```
+
+
+- **FIRST**
+    ```mysql
+    SELECT FIRST(field_name) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的值最先写入的非NULL值。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：所有字段。  
+    说明：1）如果要返回各个列的首个（时间戳最小）非NULL值，可以使用FIRST(*)；2) 如果结果集中的某列全部为NULL值，则该列的返回结果也是NULL；3) 如果结果集中所有列全部为NULL值，则不返回结果。
+
+    示例：
+    ```mysql
+    taos> SELECT FIRST(*) FROM meters;
+            first(ts)        |    first(current)    | first(voltage) |     first(phase)     |
+    =========================================================================================
+    2018-10-03 14:38:04.000 |             10.20000 |            220 |              0.23000 |
+    Query OK, 1 row(s) in set (0.004767s)
+
+    taos> SELECT FIRST(current) FROM d1002;
+        first(current)    |
+    =======================
+                10.20000 |
+    Query OK, 1 row(s) in set (0.001023s)
+    ```
+
+- **LAST**
+    ```mysql
+    SELECT LAST(field_name) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的值最后写入的非NULL值。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：所有字段。  
+    说明：1）如果要返回各个列的最后（时间戳最大）一个非NULL值，可以使用LAST(*)；2）如果结果集中的某列全部为NULL值，则该列的返回结果也是NULL；如果结果集中所有列全部为NULL值，则不返回结果。
+
+    示例：
+    ```mysql
+    taos> SELECT LAST(*) FROM meters;
+            last(ts)         |    last(current)     | last(voltage) |     last(phase)      |
+    ========================================================================================
+    2018-10-03 14:38:16.800 |             12.30000 |           221 |              0.31000 |
+    Query OK, 1 row(s) in set (0.001452s)
+
+    taos> SELECT LAST(current) FROM d1002;
+        last(current)     |
+    =======================
+                10.30000 |
+    Query OK, 1 row(s) in set (0.000843s)
+    ```
+
+- **TOP**
+    ```mysql
+    SELECT TOP(field_name, K) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明： 统计表/超级表中某列的值最大*k*个非NULL值。若多于k个列值并列最大，则返回时间戳小的。     
+    返回结果数据类型：同应用的字段。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：1）*k*值取值范围1≤*k*≤100；2）系统同时返回该记录关联的时间戳列。 
+
+    示例：
+    ```mysql
+    taos> SELECT TOP(current, 3) FROM meters;
+            ts            |   top(current, 3)    |
+    =================================================
+    2018-10-03 14:38:15.000 |             12.60000 |
+    2018-10-03 14:38:16.600 |             13.40000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 3 row(s) in set (0.001548s)
+
+    taos> SELECT TOP(current, 2) FROM d1001;
+            ts            |   top(current, 2)    |
+    =================================================
+    2018-10-03 14:38:15.000 |             12.60000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 2 row(s) in set (0.000810s)
+    ```
+
+- **BOTTOM**
+    ```mysql
+    SELECT BOTTOM(field_name, K) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的值最小*k*个非NULL值。若多于k个列值并列最小，则返回时间戳小的。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：1）*k*值取值范围1≤*k*≤100；2）系统同时返回该记录关联的时间戳列。
+
+    示例：
+    ```mysql
+    taos> SELECT BOTTOM(voltage, 2) FROM meters;
+            ts            | bottom(voltage, 2) |
+    ===============================================
+    2018-10-03 14:38:15.000 |                218 |
+    2018-10-03 14:38:16.650 |                218 |
+    Query OK, 2 row(s) in set (0.001332s)
+
+    taos> SELECT BOTTOM(current, 2) FROM d1001;
+            ts            |  bottom(current, 2)  |
+    =================================================
+    2018-10-03 14:38:05.000 |             10.30000 |
+    2018-10-03 14:38:16.800 |             12.30000 |
+    Query OK, 2 row(s) in set (0.000793s)
+    ```
+
+- **PERCENTILE**
+    ```mysql
+    SELECT PERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表中某列的值百分比分位数。  
+    返回结果数据类型： 双精度浮点数Double。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：*P*值取值范围0≤*P*≤100，为0的时候等同于MIN，为100的时候等同于MAX。
+
+    示例：
+    ```mysql
+    taos> SELECT PERCENTILE(current, 20) FROM d1001;
+    percentile(current, 20)  |
+    ============================
+                11.100000191 |
+    Query OK, 1 row(s) in set (0.000787s)
+    ```
+
+- **APERCENTILE**
+    ```mysql
+    SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表中某列的值百分比分位数，与PERCENTILE函数相似，但是返回近似结果。  
+    返回结果数据类型： 双精度浮点数Double。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：*P*值取值范围0≤*P*≤100，为0的时候等同于MIN，为100的时候等同于MAX。推荐使用```APERCENTILE```函数，该函数性能远胜于```PERCENTILE```函数
+    ```mysql
+    taos> SELECT APERCENTILE(current, 20) FROM d1001;
+    apercentile(current, 20)  |
+    ============================
+                10.300000191 |
+    Query OK, 1 row(s) in set (0.000645s)
+    ```
+    
+- **LAST_ROW**
+    ```mysql
+    SELECT LAST_ROW(field_name) FROM { tb_name | stb_name };
+    ```
+    功能说明：返回表（超级表）的最后一条记录。  
+    返回结果数据类型：同应用的字段。  
+    应用字段：所有字段。  
+    说明：与last函数不同，last_row不支持时间范围限制，强制返回最后一条记录。
+
+    示例：
+    ```mysql
+    taos> SELECT LAST_ROW(current) FROM meters;
+    last_row(current)   |
+    =======================
+                12.30000 |
+    Query OK, 1 row(s) in set (0.001238s)
+
+    taos> SELECT LAST_ROW(current) FROM d1002;
+    last_row(current)   |
+    =======================
+                10.30000 |
+    Query OK, 1 row(s) in set (0.001042s)
+    ```
+
+### 计算函数
+- **DIFF**
+    ```mysql
+    SELECT DIFF(field_name) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表中某列的值与前一行对应值的差。  
+    返回结果数据类型： 同应用字段。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：输出结果行数是范围内总行数减一，第一行没有结果输出。
+    
+    示例：
+    ```mysql
+    taos> SELECT DIFF(current) FROM d1001;
+            ts            |    diff(current)     |
+    =================================================
+    2018-10-03 14:38:15.000 |              2.30000 |
+    2018-10-03 14:38:16.800 |             -0.30000 |
+    Query OK, 2 row(s) in set (0.001162s)
+    ```
+
+
+- **SPREAD**
+    ```mysql
+    SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列的最大值和最小值之差。  
+    返回结果数据类型： 双精度浮点数。  
+    应用字段：不能应用在binary、nchar、bool类型字段。  
+    说明：可用于TIMESTAMP字段，此时表示记录的时间覆盖范围。
+
+    示例：
+    ```mysql
+    taos> SELECT SPREAD(voltage) FROM meters;
+        spread(voltage)      |
+    ============================
+                5.000000000 |
+    Query OK, 1 row(s) in set (0.001792s)
+
+    taos> SELECT SPREAD(voltage) FROM d1001;
+        spread(voltage)      |
+    ============================
+                3.000000000 |
+    Query OK, 1 row(s) in set (0.000836s)
+    ```
+
+
+- **四则运算**
+
+    ```mysql
+    SELECT field_name [+|-|*|/|%][Value|field_name] FROM { tb_name | stb_name }  [WHERE clause];
+    ```
+    功能说明：统计表/超级表中某列或多列间的值加、减、乘、除、取余计算结果。  
+    返回结果数据类型：双精度浮点数。  
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。  
+    说明：1）支持两列或多列之间进行计算，可使用括号控制计算优先级;2）NULL字段不参与计算，如果参与计算的某行中包含NULL，该行的计算结果为NULL。
+
+    ```mysql
+    taos> SELECT current + voltage * phase FROM d1001;
+    (current+(voltage*phase)) |
+    ============================
+                78.190000713 |
+                84.540003240 |
+                80.810000718 |
+    Query OK, 3 row(s) in set (0.001046s)
+    ```
+
+## 时间维度聚合
+TDengine支持按时间段进行聚合，可以将表中数据按照时间段进行切割后聚合生成结果，比如温度传感器每秒采集一次数据，但需查询每隔10分钟的温度平均值。这个聚合适合于降维(down sample)操作, 语法如下：
+
+```mysql
+SELECT function_list FROM tb_name 
+  [WHERE where_condition]
+  INTERVAL (interval [, offset])
+  [FILL ({NONE | VALUE | PREV | NULL | LINEAR})]
+
+SELECT function_list FROM stb_name 
+  [WHERE where_condition]
+  INTERVAL (interval [, offset])
+  [FILL ({ VALUE | PREV | NULL | LINEAR})]
+  [GROUP BY tags]
+```
+
+- 聚合时间段的长度由关键词INTERVAL指定，最短时间间隔10毫秒（10a），并且支持偏移（偏移必须小于间隔）。聚合查询中，能够同时执行的聚合和选择函数仅限于单个输出的函数：count、avg、sum 、stddev、leastsquares、percentile、min、max、first、last，不能使用具有多行输出结果的函数（例如：top、bottom、diff以及四则运算）。
+- WHERE语句可以指定查询的起止时间和其他过滤条件 
+- FILL语句指定某一时间区间数据缺失的情况下的填充模式。填充模式包括以下几种：
+  1. 不进行填充：NONE(默认填充模式)。
+  
+  2. VALUE填充：固定值填充，此时需要指定填充的数值。例如：fill(value, 1.23)。
+  
+  3. NULL填充：使用NULL填充数据。例如：fill(null)。
+  
+  4. PREV填充：使用前一个非NULL值填充数据。例如：fill(prev)。 
+  
+
+说明：  
+  1. 使用FILL语句的时候可能生成大量的填充输出，务必指定查询的时间区间。针对每次查询，系统可返回不超过1千万条具有插值的结果。
+  2. 在时间维度聚合中，返回的结果中时间序列严格单调递增。
+  3. 如果查询对象是超级表，则聚合函数会作用于该超级表下满足值过滤条件的所有表的数据。如果查询中没有使用group by语句，则返回的结果按照时间序列严格单调递增；如果查询中使用了group by语句分组，则返回结果中每个group内不按照时间序列严格单调递增。
+
+**示例:** 智能电表的建表语句如下：
+
+```mysql
+CREATE TABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);
+```
+
+针对智能电表采集的数据，以10分钟为一个阶段，计算过去24小时的电流数据的平均值、最大值、电流的中位数、以及随着时间变化的电流走势拟合直线。如果没有计算值，用前一个非NULL值填充。
+使用的查询语句如下：
+
+```mysql
+SELECT AVG(current),MAX(current),LEASTSQUARES(current, start_val, step_val), PERCENTILE(current, 50) FROM meters
+  WHERE TS>=NOW-1d
+  INTERVAL(10m)
+  FILL(PREV);
+```
+
+## TAOS SQL 边界限制
+- 数据库名最大长度为33
+- 表名最大长度为193，每行数据最大长度16k个字符
+- 列名最大长度为65，最多允许1024列，最少需要2列，第一列必须是时间戳
+- 标签最多允许128个，可以0个，标签总长度不超过16k个字符
+- SQL语句最大长度65480个字符，但可通过系统配置参数maxSQLLength修改，最长可配置为1M
+- 库的数目，超级表的数目、表的数目，系统不做限制，仅受系统资源限制
diff --git a/documentation20/webdocs/markdowndocs/TAOS SQL.md b/documentation20/webdocs/markdowndocs/TAOS SQL.md
new file mode 100644
index 0000000000000000000000000000000000000000..ae2d9d34a203de41d0deed523d16095c8830b452
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/TAOS SQL.md	
@@ -0,0 +1,636 @@
+# TAOS SQL
+
+TDengine provides a SQL like query language to insert or query data. You can execute the SQL statements through the TDengine Shell, or through C/C++, Java(JDBC), Python, Restful, Go, and Node.js APIs to interact with the `taosd` service.
+
+Before reading through, please have a look at the conventions used for syntax descriptions here in this documentation.
+
+* Squared brackets ("[]") indicate optional arguments or clauses
+* Curly braces ("{}") indicate that one member from a set of choices in the braces must be chosen
+* A single verticle line ("|") works a separator for multiple optional args or clauses
+* Dots ("…") means repeating for as many times
+
+## Data Types
+
+### Timestamp
+
+The timestamp is the most important data type in TDengine. The first column of each table must be  **`TIMESTAMP`** type, but other columns can also be  **`TIMESTAMP`** type. The following rules for timestamp: 
+
+* String Format: `'YYYY-MM-DD HH:mm:ss.MS'`, which represents the year, month, day, hour, minute and second and milliseconds. For example,`'2017-08-12 18:52:58.128'` is a valid timestamp string. Note: timestamp string must be quoted by either single quote or double quote. 
+
+* Epoch Time:  a timestamp value can also be a long integer representing milliseconds since the epoch. For example, the values in the above example can be represented as an epoch `1502535178128` in milliseconds. Please note the epoch time doesn't need any quotes.
+
+* Internal Function **`NOW`** : this is the current time of the server
+* If timestamp is 0 when inserting a record, timestamp will be set to the current time of the server
+* Arithmetic operations can be applied to timestamp. For example: `now-2h` represents a timestamp which is 2 hours ago from the current server time. Units include `a` (milliseconds),  `s` (seconds),  `m` (minutes),  `h` (hours),  `d` (days),  `w` (weeks), `n` (months), `y` (years). **`NOW`** can be used in either insertions or queries. 
+
+Default time precision is millisecond, you can change it to microseocnd by setting parameter enableMicrosecond in [system configuration](../administrator/#Configuration-on-Server). For epoch time, the long integer shall be microseconds since the epoch. For the above string format, MS shall be six digits. 
+
+### Data Types
+
+The full list of data types is listed below.  For string types of data, we will use ***M*** to indicate the maximum length of that type.
+
+|      |  Data Type  |  Bytes  | Note                                                         |
+| ---- | :---------: | :-----: | ------------------------------------------------------------ |
+| 1    |   TINYINT   |    1    | A nullable integer type with a range of [-127, 127]​          |
+| 2    |  SMALLINT   |    2    | A nullable integer type with a range of [-32767, 32767]​      |
+| 3    |     INT     |    4    | A nullable integer type with a range of [-2^31+1, 2^31-1 ]   |
+| 4    |   BIGINT    |    8    | A nullable integer type with a range of [-2^59, 2^59 ]​       |
+| 5    |    FLOAT    |    4    | A standard nullable float type with 6 -7 significant digits and a range of [-3.4E38, 3.4E38] |
+| 6    |   DOUBLE    |    8    | A standard nullable double float type with 15-16 significant digits and a range of [-1.7E308, 1.7E308]​ |
+| 7    |    BOOL     |    1    | A nullable boolean type, [**`true`**, **`false`**]           |
+| 8    |  TIMESTAMP  |    8    | A nullable timestamp type with the same usage as the primary column timestamp |
+| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, error should be threw with exceeded chars, the maximum length of *M* is 16374, but as maximum row size is 16K bytes, the actual upper limit will generally less than 16374. This type of string only supports ASCii encoded chars. |
+| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, error should be threw with exceeded chars. The **`NCHAR`** type supports Unicode encoded chars. |
+
+All the keywords in a SQL statement are case-insensitive, but strings values are case-sensitive and must be quoted by a pair of `'` or `"`. To quote a `'` or a `"` , you can use the escape character `\`.
+
+## Database Management
+
+- **Create a Database**
+    ```mysql
+    CREATE DATABASE [IF NOT EXISTS] db_name [KEEP keep]
+    ```
+    Option: `KEEP` is used for data retention policy. The data records will be removed once keep-days are passed. There are more parameters related to DB storage, please check [system configuration](../administrator/#Configuration-on-Server).
+
+
+- **Use a Database**
+  
+    ```mysql
+    USE db_name
+    ```
+    Use or switch the current database.
+
+
+- **Drop a Database**
+    ```mysql
+    DROP DATABASE [IF EXISTS] db_name
+    ```
+    Remove a database, all the tables inside the DB will be removed too, be careful.
+
+
+- **List all Databases**
+  
+    ```mysql
+    SHOW DATABASES
+    ```
+
+
+## Table Management
+
+- **Create a Table**
+  
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] tb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...])
+    ```
+    Note: 
+    
+    1) The first column must be a `timestamp`, and the system will set it as the primary key. 
+    2) The maximum number of columns is 1024, the minimum number of columns is 2.
+    3) The maximum length: database name is 33, table nume is 193, column name is 65.    
+    4) The record size is limited to 16k bytes.
+    5) The total tag length is limited 16k bytes, the maximum number of tags is 128.
+    6) For `binary` or `nchar` data types, the length must be specified. For example, binary(20) means a binary data type with 20 bytes.
+
+
+- **Drop a Table**
+
+    ```mysql
+    DROP TABLE [IF EXISTS] tb_name
+    ```
+
+
+- **List all Tables **
+    ```mysql
+    SHOW TABLES [LIKE tb_name_wildcar]
+    ```
+    It shows all tables in the current DB. 
+    
+    Note: Wildcard characters can be used in the table name to filter tables. 
+    Wildcard characters: 
+    1) ’%’ means 0 to any number of characters. 
+    2）’_’ underscore means exactly one character.
+
+
+- **Print Table Schema**
+
+    ```mysql
+    DESCRIBE tb_name
+    ```
+
+
+- **Add a Column**
+
+    ```mysql
+    ALTER TABLE tb_name ADD COLUMN field_name data_type
+    ```
+
+
+- **Drop a Column**
+
+    ```mysql
+    ALTER TABLE tb_name DROP COLUMN field_name 
+    ```
+    If the table is created via [Super Table](), the schema can only be changed via STable. But for tables not created from STable, you can change their schema directly.
+
+**Tips**: You can apply an operation on a table not in the current DB by concatenating DB name with the character '.', then with the table name. For example, 'demo.tb1' means the operation is applied to table `tb1` in DB `demo` even though `demo` is not the currently selected DB.   
+
+## STable Management
+
+- **Create a STable**
+  
+    ```mysql
+    CREATE TABLE [IF NOT EXISTS] stb_name (timestamp_field_name TIMESTAMP, field1_name data_type1 [, field2_name data_type2 ...]) TAGS (tag1_name tag_type1, tag2_name tag_type2 [, tag3_name tag_type3])
+    ```
+    Create a STable is the same as you create a table, but the tag name and type shoudl be specified
+    Note: 
+    
+    1) The total tag length should not be exceeded 512 bytes
+    2) The type of tag cannot be timestamp
+    3) Tag name should not be the same as other column name or tag name
+    4) Tag name should not be any of Taos key words.
+
+
+- **Drop a STable**
+
+    ```mysql
+    DROP TABLE [IF EXISTS] tb_name
+    ```
+    Delete a STable will also delete all the tables created using the STable.
+
+
+- **List all STables**
+  
+    ```mysql
+    SHOW STABLES [LIKE tb_name_wildcar]
+    ```
+    It shows all STables in the current DB. 
+    
+    Note: Wildcard characters can be used in the table name to filter tables. 
+    Wildcard characters: 
+    1) ’%’ means 0 to any number of characters. 
+    2）’_’ underscore means exactly one character.
+
+
+- **Print STable Schema**
+
+    ```mysql
+    DESCRIBE stb_name
+    ```
+
+- **Add a Column**
+
+    ```mysql
+    ALTER TABLE stb_name ADD COLUMN field_name data_type
+    ```
+
+- **Drop a Column**
+
+    ```mysql
+    ALTER TABLE stb_name DROP COLUMN field_name 
+    ```
+    If the table is created via [Super Table](), the schema can only be changed via STable. But for tables not created from STable, you can change their schema directly.
+
+**Tips**: You can apply an operation on a table not in the current DB by concatenating DB name with the character '.', then with the table name. For example, 'demo.tb1' means the operation is applied to table `tb1` in DB `demo` even though `demo` is not the currently selected DB.
+
+## STable Tag Management
+
+- **Add a tag**
+  
+    ```mysql
+    ALTER TABLE stb_name ADD TAG new_tag_name tag_type
+    ```
+    Add a tag and specify tag type for STable. The total number of tags should be no more than 128.
+
+- **Drop a tag**
+
+    ```mysql
+    ALTER TABLE stb_name DROP TAG tag_name
+    ```
+    Delete a tag from STable, it will also delete the tag for the tables created using STable.
+
+
+- **Modify tag name**
+  
+    ```mysql
+    ALTER TABLE stb_name CHANGE TAG old_tag_name new_tag_name
+    ```
+    Modify a tag name for a STable, it will also modify the tag name for the tables created using STable.
+
+
+- **Change tag value**
+
+    ```mysql
+    ALTER TABLE tb_name SET TAG tag_name=new_tag_value
+    ```
+**Note**: 'Add a tag', 'Drop a tag', 'Modify tag name' used for STable, 'Change tag value' used for table. 
+
+
+## Inserting Records
+
+- **Insert a Record**
+    ```mysql
+    INSERT INTO tb_name VALUES (field_value, ...);
+    ```
+    Insert a data record into table tb_name
+
+
+- **Insert a Record with Selected Columns**
+  
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value, ...)
+    ```
+    Insert a data record into table tb_name, with data in selected columns. If a column is not selected, the system will put NULL there. First column (time stamp ) cant not be null, it must be inserted.
+
+
+- **Insert a Batch of Records**
+  
+    ```mysql
+    INSERT INTO tb_name VALUES (field1_value1, ...) (field1_value2, ...)...;
+    ```
+    Insert multiple data records into the table
+
+
+- **Insert a Batch of Records with Selected Columns**
+  
+    ```mysql
+    INSERT INTO tb_name (field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
+    ```
+
+
+- **Insert Records into Multiple Tables**
+  
+    ```mysql
+    INSERT INTO tb1_name VALUES (field1_value1, ...)(field1_value2, ...)... 
+                tb2_name VALUES (field1_value1, ...)(field1_value2, ...)...;
+    ```
+    Insert data records into table tb1_name and tb2_name
+
+
+- **Insert Records into Multiple Tables with Selected Columns**
+  
+    ```mysql
+    INSERT INTO tb1_name (tb1_field1_name, ...) VALUES (field1_value1, ...) (field1_value1, ...)
+                tb2_name (tb2_field1_name, ...) VALUES(field1_value1, ...) (field1_value2, ...)
+    ```
+
+Note: 1. If the timestamp is 0, the time stamp will be set to the system time on the server.
+      2. The timestamp of the oldest record allowed to be inserted is relative to the current server time, minus the configured keep value (the number of days the data is retained), and the timestamp of the latest record allowed to be inserted is relative to the current server time, plus the configured days value (the time span in which the data file stores data, in days). Both keep and days can be specified when creating the database. The default values are 3650 days and 10 days, respectively.
+ 
+**IMPORT**: If you do want to insert a historical data record into a table, use IMPORT command instead of INSERT. IMPORT has the same syntax as INSERT. 
+
+## Data Query
+
+###Query Syntax:
+
+```mysql
+SELECT select_expr [, select_expr ...]
+    FROM {tb_name_list}
+    [WHERE where_condition]
+    [INTERVAL [interval_offset,] interval_val]
+    [FILL fill_val]
+    [SLIDING fill_val]
+    [GROUP BY col_list]
+    [ORDER BY col_list { DESC | ASC }]
+    [HAVING expr_list]
+    [SLIMIT limit_val [, SOFFSET offset_val]]
+    [LIMIT limit_val [, OFFSET offset_val]]
+    [>> export_file]
+    
+SELECT function_list FROM tb_name
+    [WHERE where_condition]
+    [LIMIT limit [, OFFSET offset]]
+    [>> export_file]
+```
+
+- To query a table, use `*` to select all data from a table; or a specified list of expressions `expr_list` of columns. The SQL expression can contain alias and arithmetic operations between numeric typed columns.
+- For the `WHERE` conditions, use logical operations to filter the timestamp column and all numeric columns, and wild cards to filter the two string typed columns. 
+- Sort the result set by the first column timestamp `_c0` (or directly use the timestamp column name) in either descending or ascending order (by default). "Order by" could not be applied to other columns.
+- Use `LIMIT` and `OFFSET` to control the number of rows returned and the starting position of the retrieved rows. LIMIT/OFFSET is applied after "order by" operations.
+- Export the retrieved result set into a CSV file using `>>`. The target file's full path should be explicitly specified in the statement.
+
+###Supported Operations of Data Filtering:
+
+| Operation | Note                          | Applicable Data Types                 |
+| --------- | ----------------------------- | ------------------------------------- |
+| >         | larger than                   | **`timestamp`** and all numeric types |
+| <         | smaller than                  | **`timestamp`** and all numeric types |
+| >=        | larger than or equal to       | **`timestamp`** and all numeric types |
+| <=        | smaller than or equal to      | **`timestamp`** and all numeric types |
+| =         | equal to                      | all types                             |
+| <>        | not equal to                  | all types                             |
+| %         | match with any char sequences | **`binary`** **`nchar`**              |
+| _         | match with a single char      | **`binary`** **`nchar`**              |
+
+1. For two or more conditions, only AND is supported, OR is not supported yet.
+2. For filtering, only a single range is supported. For example, `value>20 and value<30` is a valid condition, but `value<20 AND value<>5` is an invalid condition
+
+### Some Examples 
+
+- For the examples below, table tb1 is created via the following statements
+
+    ```mysql
+    CREATE TABLE tb1 (ts timestamp, col1 int, col2 float, col3 binary(50))
+    ```
+
+- Query all the records in tb1 in the last hour:
+    ```mysql
+    SELECT * FROM tb1 WHERE ts >= NOW - 1h
+    ```
+
+
+- Query all the records in tb1 between 2018-06-01 08:00:00.000 and 2018-06-02 08:00:00.000, and filter out only the records whose col3 value ends with 'nny', and sort the records by their timestamp in a descending order:
+    ```mysql
+    SELECT * FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' AND ts <= '2018-06-02 08:00:00.000' AND col3 LIKE '%nny' ORDER BY ts DESC
+    ```
+
+
+- Query the sum of col1 and col2 as alias 'complex_metric', and filter on the timestamp and col2 values. Limit the number of returned rows to 10, and offset the result by 5.
+    ```mysql
+    SELECT (col1 + col2) AS 'complex_metric' FROM tb1 WHERE ts > '2018-06-01 08:00:00.000' and col2 > 1.2 LIMIT 10 OFFSET 5
+    ```
+
+
+- Query the number of records in tb1 in the last 10 minutes, whose col2 value is larger than 3.14, and export the result to file `/home/testoutpu.csv`.
+    ```mysql
+    SELECT COUNT(*) FROM tb1 WHERE ts >= NOW - 10m AND col2 > 3.14 >> /home/testoutpu.csv
+    ```
+
+## SQL Functions
+
+### Aggregation Functions
+
+TDengine supports aggregations over numerical values, they are listed below:
+
+- **COUNT**
+
+    ```mysql
+    SELECT COUNT([*|field_name]) FROM tb_name [WHERE clause]
+    ```
+    Function: return the number of rows.  
+    Return Data Type: `integer`.  
+    Applicable Data Types: all.  
+    Applied to: table/STable.  
+    Note: 
+    
+    1) `*` can be used for all columns, as long as a column has non-NULL values, it will be counted.
+    
+    2) If it is on a specific column, only rows with non-NULL values will be counted 
+
+
+- **AVG**
+  
+    ```mysql
+    SELECT AVG(field_name) FROM tb_name [WHERE clause]
+    ```
+    Function: return the average value of a specific column.  
+    Return Data Type: `double`.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table/STable. 
+
+
+- **TWA**
+  
+    ```mysql
+    SELECT TWA(field_name) FROM tb_name WHERE clause
+    ```
+    Function: return the time-weighted average value of a specific column  
+    Return Data Type: `double`  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`  
+    Applied to: table/STable
+
+
+- **SUM**
+  
+    ```mysql
+    SELECT SUM(field_name) FROM tb_name [WHERE clause]
+    ```
+    Function: return the sum of a specific column.  
+    Return Data Type: `long integer` or `double`.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table/STable. 
+
+
+- **STDDEV**
+  
+    ```mysql
+    SELECT STDDEV(field_name) FROM tb_name [WHERE clause]
+    ```
+    Function: returns the standard deviation of a specific column.  
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table. 
+
+
+- **LEASTSQUARES**
+    ```mysql
+    SELECT LEASTSQUARES(field_name, start_val, step_val) FROM tb_name [WHERE clause]
+    ```
+    Function: performs a linear fit to the primary timestamp and the specified column. 
+    Return Data Type: return a string of the coefficient and the interception of the fitted line.  
+    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
+    Applied to: table.  
+    Note: The timestmap is taken as the independent variable while the specified column value is taken as the dependent variables.
+
+
+### Selector Functions
+
+- **MIN**
+  
+    ```mysql
+    SELECT MIN(field_name) FROM {tb_name | stb_name} [WHERE clause]
+    ```
+    Function: return the minimum value of a specific column.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
+    Applied to: table/STable.  
+
+
+- **MAX**
+    ```mysql
+    SELECT MAX(field_name) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the maximum value of a specific column.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types except timestamp, binary, nchar, bool.  
+    Applied to: table/STable.    
+
+
+- **FIRST**
+  
+    ```mysql
+    SELECT FIRST(field_name) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the first non-NULL value.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types.  
+    Applied to: table/STable.  
+    Note: To return all columns, use first(*). 
+
+
+- **LAST**
+    ```mysql
+    SELECT LAST(field_name) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the last non-NULL value.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types.  
+    Applied to: table/STable.  
+    Note: To return all columns, use last(*). 
+
+
+- **TOP**
+  
+    ```mysql
+    SELECT TOP(field_name, K) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the `k` largest values.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table/STable.  
+    Note: 
+    1) Valid range of `k`: 1≤*k*≤100
+    2) The associated `timestamp` will be returned too.  
+
+
+- **BOTTOM**
+  
+    ```mysql
+    SELECT BOTTOM(field_name, K) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the `k` smallest values.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table/STable.  
+    Note: 
+    1) valid range of `k`: 1≤*k*≤100; 
+    2) The associated `timestamp` will be returned too. 
+
+
+- **PERCENTILE**
+    ```mysql
+    SELECT PERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: the value of the specified column below which `P` percent of the data points fall.  
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
+    Applied to: table/STable.  
+    Note: The range of `P` is `[0, 100]`. When `P=0` , `PERCENTILE` returns the equal value as `MIN`; when `P=100`, `PERCENTILE` returns the equal value as `MAX`. 
+
+- **APERCENTILE**
+    ```mysql
+    SELECT APERCENTILE(field_name, P) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: the value of the specified column below which `P` percent of the data points fall, it returns approximate value of percentile.
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`. 
+    Applied to: table/STable.  
+    Note: The range of `P` is `[0, 100]`. When `P=0` , `APERCENTILE` returns the equal value as `MIN`; when `P=100`, `APERCENTILE` returns the equal value as `MAX`. `APERCENTILE` has a much better performance than `PERCENTILE`.
+
+- **LAST_ROW**
+    ```mysql
+    SELECT LAST_ROW(field_name) FROM { tb_name | stb_name } 
+    ```
+    Function: return the last row.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types.  
+    Applied to: table/STable.  
+    Note: different from last, last_row returns the last row even if it has NULL values. 
+
+
+### Transformation Functions
+
+- **DIFF**
+    ```mysql
+    SELECT DIFF(field_name) FROM tb_name [WHERE clause]
+    ```
+    Function: return the difference between successive values of the specified column.  
+    Return Data Type: the same data type.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table. 
+
+
+- **SPREAD**
+    ```mysql
+    SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause]
+    ```
+    Function: return the difference between the maximum and the mimimum value.  
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.  
+    Applied to: table/STable.  
+    Note: spread gives the range of data variation in a table/supertable; it is equivalent to `MAX()` - `MIN()`
+
+
+- **Arithmetic Operations**
+    ```mysql
+    SELECT field_name [+|-|*|/|%][Value|field_name] FROM { tb_name | stb_name }  [WHERE clause]
+    ```
+    Function: arithmetic operations on the selected columns.  
+    Return Data Type: double.  
+    Applicable Data Types: all types except `timestamp`, `binary`, `nchar`, `bool`.
+    Applied to: table/STable.  
+    Note: 1) bracket can be used for operation priority; 2) If a column has NULL value, the result is NULL. 
+
+
+## Downsampling
+
+Time-series data are usually sampled by sensors at a very high frequency, but more often we are only interested in the downsampled, aggregated data of each timeline. TDengine provides a convenient way to downsample the highly frequently sampled data points as well as filling the missing data with a variety of interpolation choices.
+
+```mysql
+SELECT function_list FROM tb_name 
+  [WHERE where_condition]
+  INTERVAL (interval)
+  [FILL ({NONE | VALUE | PREV | NULL | LINEAR})]
+
+SELECT function_list FROM stb_name 
+  [WHERE where_condition]
+  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`. 
+
+For the time being, only function count, avg, sum, stddev, leastsquares, percentile, min, max, first, last are supported. Functions that may return multiple rows are not supported. 
+
+You can also use `FILL` to interpolate the intervals that don't contain any data.`FILL` currently supports four different interpolation strategies which are listed below:
+
+| Interpolation                     | Usage                                                        |
+| --------------------------------- | ------------------------------------------------------------ |
+| `FILL(VALUE, val1 [, val2, ...])` | Interpolate with specified constants                         |
+| `FILL(PREV)`                      | Interpolate with the value at the previous timestamp         |
+| `FILL(LINEAR)`                    | Linear interpolation with the non-null values at the previous timestamp and at the next timestamp |
+| `FILL(NULL)`                      | Interpolate with **`NULL`** value                            |
+
+ A few downsampling examples:
+
+- Find the number of data points, the maximum value of `col1` and minimum value of `col2` in a tb1 for every 10 minutes in the last 5 hours:
+    ```mysql
+    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL (10m)
+    ```
+
+
+- Fill the above downsampling results using constant-value interpolation:
+    ```mysql
+    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(VALUE, 0, 1, -1)
+    ```
+    Note that the number of constant values in `FILL()` should be equal or fewer than the number of functions in the `SELECT` clause. Exceeding fill constants will be ignored.
+
+
+- Fill the above downsampling results using `PREV` interpolation:
+    ```mysql
+    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(PREV)
+    ```
+    This will interpolate missing data points with the value at the previous timestamp.
+
+
+- Fill the above downsampling results using `NULL` interpolation:
+    ```mysql
+    SELECT COUNT(*), MAX(col1), MIN(col2) FROM tb1 WHERE ts > NOW - 5h INTERVAL(10m) FILL(NULL)
+    ```
+    Fill **`NULL`** to the interpolated data points.
+
+Notes:
+1. `FILL` can generate tons of interpolated data points if the interval is small and the queried time range is large. So always remember to specify a time range when using interpolation. For each query with interpolation, the result set can not exceed 10,000,000 records.
+2. The result set will always be sorted by time in ascending order.
+3. If the query object is a supertable, then all the functions will be applied to all the tables that qualify the `WHERE` conditions. If the `GROUP BY` clause is also applied, the result set will be sorted ascendingly by time in each single group, otherwise, the result set will be sorted ascendingly by time as a whole.
+
diff --git a/documentation20/webdocs/markdowndocs/Taos Error Code-ch.md b/documentation20/webdocs/markdowndocs/Taos Error Code-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..a9a3dee432c57b0078948d15799ac29df0167ae2
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/Taos Error Code-ch.md	
@@ -0,0 +1,173 @@
+# TDengine 2.0 错误码以及对应的十进制码
+
+
+| 状态码                 |  模  |   错误码（十六进制） |  错误描述                  | 错误码（十进制）   |
+|-----------------------| :---: | :---------:  | :------------------------ | ---------------- |
+|TSDB_CODE_RPC_ACTION_IN_PROGRESS|	0	| 0x0001|	 "Action in progress"|	-2147483647|
+|TSDB_CODE_RPC_AUTH_REQUIRED|	0	| 0x0002	| "Authentication required"|	-2147483646|
+|TSDB_CODE_RPC_AUTH_FAILURE|	0|	 0x0003	| "Authentication failure"|	-2147483645|
+|TSDB_CODE_RPC_REDIRECT	|0	| 0x0004|	 "Redirect"|	-2147483644|
+|TSDB_CODE_RPC_NOT_READY|	0	| 0x0005	| "System not ready"|	-2147483643|
+|TSDB_CODE_RPC_ALREADY_PROCESSED|	0	| 0x0006	 |"Message already processed"|	-2147483642|
+|TSDB_CODE_RPC_LAST_SESSION_NOT_FINISHED|	0	 |0x0007|	 "Last session not finished"|	-2147483641|
+|TSDB_CODE_RPC_MISMATCHED_LINK_ID|	0|	 0x0008	| "Mismatched meter id"|	-2147483640|
+|TSDB_CODE_RPC_TOO_SLOW|	0	| 0x0009	| "Processing of request timed out"|	-2147483639|
+|TSDB_CODE_RPC_MAX_SESSIONS|	0	| 0x000A	| "Number of sessions reached limit"|	-2147483638|
+|TSDB_CODE_RPC_NETWORK_UNAVAIL|	0	 |0x000B	| "Unable to establish connection"	|-2147483637|
+|TSDB_CODE_RPC_APP_ERROR|	0|	 0x000C	| "Unexpected generic error in RPC"|	-2147483636|
+|TSDB_CODE_RPC_UNEXPECTED_RESPONSE|	0	 |0x000D	| "Unexpected response"|	-2147483635|
+|TSDB_CODE_RPC_INVALID_VALUE|	0	| 0x000E	| "Invalid value"|	-2147483634|
+|TSDB_CODE_RPC_INVALID_TRAN_ID|	0	| 0x000F	| "Invalid transaction id"|	-2147483633|
+|TSDB_CODE_RPC_INVALID_SESSION_ID|	0|	 0x0010	| "Invalid session id"|	-2147483632|
+|TSDB_CODE_RPC_INVALID_MSG_TYPE|	0|	 0x0011|	 "Invalid message type"|	-2147483631|
+|TSDB_CODE_RPC_INVALID_RESPONSE_TYPE|	0	| 0x0012|	 "Invalid response type"|	-2147483630|
+|TSDB_CODE_RPC_INVALID_TIME_STAMP|	0|	 0x0013|	 "Invalid timestamp"|	-2147483629|
+|TSDB_CODE_COM_OPS_NOT_SUPPORT|	0	| 0x0100|	 "Operation not supported"|	-2147483392|
+|TSDB_CODE_COM_MEMORY_CORRUPTED	|0|	 0x0101	| "Memory corrupted"|	-2147483391|
+|TSDB_CODE_COM_OUT_OF_MEMORY|	0|	 0x0102|	 "Out of memory"|	-2147483390|
+|TSDB_CODE_COM_INVALID_CFG_MSG|	0	| 0x0103|	 "Invalid config message"|	-2147483389|
+|TSDB_CODE_COM_FILE_CORRUPTED|	0|	 0x0104|	 "Data file corrupted"	|-2147483388|
+|TSDB_CODE_TSC_INVALID_SQL|	0|	 0x0200	| "Invalid SQL statement"|	-2147483136|
+|TSDB_CODE_TSC_INVALID_QHANDLE|	0	| 0x0201	| "Invalid qhandle"|	-2147483135|
+|TSDB_CODE_TSC_INVALID_TIME_STAMP|	0	| 0x0202	| "Invalid combination of client/service time"|	-2147483134|
+|TSDB_CODE_TSC_INVALID_VALUE|	0	| 0x0203|	 "Invalid value in client"|	-2147483133|
+|TSDB_CODE_TSC_INVALID_VERSION|	0	| 0x0204	| "Invalid client version"	|-2147483132|
+|TSDB_CODE_TSC_INVALID_IE|	0	| 0x0205	| "Invalid client ie"	|-2147483131|
+|TSDB_CODE_TSC_INVALID_FQDN|	0	| 0x0206|	 "Invalid host name"|	-2147483130|
+|TSDB_CODE_TSC_INVALID_USER_LENGTH|	0	| 0x0207|	 "Invalid user name"|	-2147483129|
+|TSDB_CODE_TSC_INVALID_PASS_LENGTH|	0	| 0x0208	| "Invalid password"|	-2147483128|
+|TSDB_CODE_TSC_INVALID_DB_LENGTH|	0	| 0x0209|	 "Database name too long"|	-2147483127|
+|TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH|	0	| 0x020A	| "Table name too long"|	-2147483126|
+|TSDB_CODE_TSC_INVALID_CONNECTION|	0	| 0x020B|	 "Invalid connection"|	-2147483125|
+|TSDB_CODE_TSC_OUT_OF_MEMORY|	0	| 0x020C	| "System out of memory"	|-2147483124|
+|TSDB_CODE_TSC_NO_DISKSPACE|	0	| 0x020D	| "System out of disk space"|	-2147483123|
+|TSDB_CODE_TSC_QUERY_CACHE_ERASED|	0	| 0x020E|	 "Query cache erased"|	-2147483122|
+|TSDB_CODE_TSC_QUERY_CANCELLED|	0	| 0x020F	 |"Query terminated"|	-2147483121|
+|TSDB_CODE_TSC_SORTED_RES_TOO_MANY|	0	 |0x0210	| "Result set too large to be sorted"|	-2147483120|
+|TSDB_CODE_TSC_APP_ERROR|	0	| 0x0211	| "Application error"|	-2147483119|
+|TSDB_CODE_TSC_ACTION_IN_PROGRESS|	0	 |0x0212	| "Action in progress"|	-2147483118|
+|TSDB_CODE_TSC_DISCONNECTED|	0	| 0x0213	 |"Disconnected from service"	|-2147483117|
+|TSDB_CODE_TSC_NO_WRITE_AUTH|	0	| 0x0214	| "No write permission"	|-2147483116|
+|TSDB_CODE_MND_MSG_NOT_PROCESSED|	0|	 0x0300|	 "Message not processed"|	-2147482880|
+|TSDB_CODE_MND_ACTION_IN_PROGRESS|	0	| 0x0301	 |"Message is progressing"|	-2147482879|
+|TSDB_CODE_MND_ACTION_NEED_REPROCESSED|	0	| 0x0302	 |"Messag need to be reprocessed"|	-2147482878|
+|TSDB_CODE_MND_NO_RIGHTS|	0	| 0x0303|	 "Insufficient privilege for operation"|	-2147482877|
+|TSDB_CODE_MND_APP_ERROR|	0	| 0x0304	| "Unexpected generic error in mnode"|	-2147482876|
+|TSDB_CODE_MND_INVALID_CONNECTION|	0	| 0x0305	| "Invalid message connection"|	-2147482875|
+|TSDB_CODE_MND_INVALID_MSG_VERSION|	0	| 0x0306	| "Incompatible protocol version"|	-2147482874|
+|TSDB_CODE_MND_INVALID_MSG_LEN|	0|	 0x0307	| "Invalid message length"|	-2147482873|
+|TSDB_CODE_MND_INVALID_MSG_TYPE|	0	| 0x0308	| "Invalid message type"	|-2147482872|
+|TSDB_CODE_MND_TOO_MANY_SHELL_CONNS|	0	 |0x0309	| "Too many connections"|	-2147482871|
+|TSDB_CODE_MND_OUT_OF_MEMORY|	0	 |0x030A	| "Out of memory in mnode"|	-2147482870|
+|TSDB_CODE_MND_INVALID_SHOWOBJ|	0	| 0x030B	 |"Data expired"|	-2147482869|
+|TSDB_CODE_MND_INVALID_QUERY_ID	|0	| 0x030C	 |"Invalid query id"	|-2147482868|
+|TSDB_CODE_MND_INVALID_STREAM_ID|	0	 |0x030D	| "Invalid stream id"|	-2147482867|
+|TSDB_CODE_MND_INVALID_CONN_ID|	0|	 0x030E	| "Invalid connection id"	|-2147482866|
+|TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE|	0	| 0x0320|	 "Object already there"|	-2147482848|
+|TSDB_CODE_MND_SDB_ERROR|	0	 |0x0321	| "Unexpected generic error in sdb"	|-2147482847|
+|TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE|	0	| 0x0322|	 "Invalid table type"	|-2147482846|
+|TSDB_CODE_MND_SDB_OBJ_NOT_THERE|	0	| 0x0323	 |"Object not there"	|-2147482845|
+|TSDB_CODE_MND_SDB_INVAID_META_ROW|	0	| 0x0324|	 "Invalid meta row"	|-2147482844|
+|TSDB_CODE_MND_SDB_INVAID_KEY_TYPE|	0	| 0x0325	 |"Invalid key type"	|-2147482843|
+|TSDB_CODE_MND_DNODE_ALREADY_EXIST|	0	| 0x0330	| "DNode already exists"|	-2147482832|
+|TSDB_CODE_MND_DNODE_NOT_EXIST|	0	| 0x0331|	 "DNode does not exist"	|-2147482831|
+|TSDB_CODE_MND_VGROUP_NOT_EXIST|	0	| 0x0332	 |"VGroup does not exist"|	-2147482830|
+|TSDB_CODE_MND_NO_REMOVE_MASTER	|0	| 0x0333	| "Master DNode cannot be removed"|	-2147482829|
+|TSDB_CODE_MND_NO_ENOUGH_DNODES	|0	| 0x0334|	 "Out of DNodes"|	-2147482828|
+|TSDB_CODE_MND_CLUSTER_CFG_INCONSISTENT	|0	| 0x0335	| "Cluster cfg inconsistent"|	-2147482827|
+|TSDB_CODE_MND_INVALID_DNODE_CFG_OPTION|	0	| 0x0336	| "Invalid dnode cfg option"|	-2147482826|
+|TSDB_CODE_MND_BALANCE_ENABLED|	0	| 0x0337	| "Balance already enabled"	|-2147482825|
+|TSDB_CODE_MND_VGROUP_NOT_IN_DNODE|	0	 |0x0338	| "Vgroup not in dnode"|	-2147482824|
+|TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE|	0	| 0x0339	| "Vgroup already in dnode"|	-2147482823|
+|TSDB_CODE_MND_DNODE_NOT_FREE	|0	| 0x033A	 |"Dnode not avaliable"|	-2147482822|
+|TSDB_CODE_MND_INVALID_CLUSTER_ID	|0	 |0x033B	| "Cluster id not match"|	-2147482821|
+|TSDB_CODE_MND_NOT_READY|	0	| 0x033C	 |"Cluster not ready"|	-2147482820|
+|TSDB_CODE_MND_ACCT_ALREADY_EXIST|	0	| 0x0340	| "Account already exists"	|-2147482816|
+|TSDB_CODE_MND_INVALID_ACCT|	0	| 0x0341|	 "Invalid account"|	-2147482815|
+|TSDB_CODE_MND_INVALID_ACCT_OPTION|	0	| 0x0342	| "Invalid account options"|	-2147482814|
+|TSDB_CODE_MND_USER_ALREADY_EXIST|	0	| 0x0350	| "User already exists"|	-2147482800|
+|TSDB_CODE_MND_INVALID_USER	|0	| 0x0351	| "Invalid user"	|-2147482799|
+|TSDB_CODE_MND_INVALID_USER_FORMAT| 0	 |0x0352	 |"Invalid user format"	|-2147482798|
+|TSDB_CODE_MND_INVALID_PASS_FORMAT|	0|	 0x0353	| "Invalid password format"|	-2147482797|
+|TSDB_CODE_MND_NO_USER_FROM_CONN|	0	| 0x0354	| "Can not get user from conn"|	-2147482796|
+|TSDB_CODE_MND_TOO_MANY_USERS|	0	| 0x0355|	 "Too many users"|	-2147482795|
+|TSDB_CODE_MND_TABLE_ALREADY_EXIST|	0|	0x0360|	 "Table already exists"|	-2147482784|
+|TSDB_CODE_MND_INVALID_TABLE_ID|	0|	 0x0361|	 "Table name too long"|	-2147482783|
+|TSDB_CODE_MND_INVALID_TABLE_NAME|	0|	 0x0362	| "Table does not exist"|	-2147482782|
+|TSDB_CODE_MND_INVALID_TABLE_TYPE|	0|	 0x0363	| "Invalid table type in tsdb"|	-2147482781|
+|TSDB_CODE_MND_TOO_MANY_TAGS|	0	| 0x0364|	 "Too many tags"|	-2147482780|
+|TSDB_CODE_MND_TOO_MANY_TIMESERIES|	0|	 0x0366|	 "Too many time series"|	-2147482778|
+|TSDB_CODE_MND_NOT_SUPER_TABLE|	0	 |0x0367|	 "Not super table"| 	-2147482777|
+|TSDB_CODE_MND_COL_NAME_TOO_LONG|	0|	 0x0368|	 "Tag name too long"|	-2147482776|
+|TSDB_CODE_MND_TAG_ALREAY_EXIST|	0|	 0x0369|	 "Tag already exists"|	-2147482775|
+|TSDB_CODE_MND_TAG_NOT_EXIST|	0	 |0x036A	| "Tag does not exist"	|-2147482774|
+|TSDB_CODE_MND_FIELD_ALREAY_EXIST|	0	| 0x036B|	 "Field already exists"|	-2147482773|
+|TSDB_CODE_MND_FIELD_NOT_EXIST|	0	| 0x036C	| "Field does not exist"|	-2147482772|
+|TSDB_CODE_MND_INVALID_STABLE_NAME	|0	| 0x036D	 |"Super table does not exist"	|-2147482771|
+|TSDB_CODE_MND_DB_NOT_SELECTED|	0	| 0x0380	| "Database not specified or available"|	-2147482752|
+|TSDB_CODE_MND_DB_ALREADY_EXIST|	0	| 0x0381	| "Database already exists"|	-2147482751|
+|TSDB_CODE_MND_INVALID_DB_OPTION|	0	| 0x0382	| "Invalid database options"|	-2147482750|
+|TSDB_CODE_MND_INVALID_DB|	0	| 0x0383	| "Invalid database name"|	-2147482749|
+|TSDB_CODE_MND_MONITOR_DB_FORBIDDEN|	0	| 0x0384	| "Cannot delete monitor database"|	-2147482748|
+|TSDB_CODE_MND_TOO_MANY_DATABASES|	0|	 0x0385	| "Too many databases for account"|	-2147482747|
+|TSDB_CODE_MND_DB_IN_DROPPING|	0	| 0x0386|	 "Database not available"	|-2147482746|
+|TSDB_CODE_DND_MSG_NOT_PROCESSED|	0|	 0x0400	| "Message not processed"|	-2147482624|
+|TSDB_CODE_DND_OUT_OF_MEMORY	|0	| 0x0401	| "Dnode out of memory"|	-2147482623|
+|TSDB_CODE_DND_NO_WRITE_ACCESS|	0	| 0x0402	| "No permission for disk files in dnode"|	-2147482622|
+|TSDB_CODE_DND_INVALID_MSG_LEN|	0	| 0x0403	| "Invalid message length"|	-2147482621|
+|TSDB_CODE_VND_ACTION_IN_PROGRESS	|0	 |0x0500|	 "Action in progress"	|-2147482368|
+|TSDB_CODE_VND_MSG_NOT_PROCESSED|	0	 |0x0501	| "Message not processed"	|-2147482367|
+|TSDB_CODE_VND_ACTION_NEED_REPROCESSED	|0	 |0x0502|	 "Action need to be reprocessed"|	-2147482366|
+|TSDB_CODE_VND_INVALID_VGROUP_ID	|0	| 0x0503|	 "Invalid Vgroup ID"|	-2147482365|
+|TSDB_CODE_VND_INIT_FAILED|	0	| 0x0504	| "Vnode initialization failed"|	-2147482364|
+|TSDB_CODE_VND_NO_DISKSPACE|	0	 |0x0505|	 "System out of disk space"	|-2147482363|
+|TSDB_CODE_VND_NO_DISK_PERMISSIONS|	0	| 0x0506|	 "No write permission for disk files"	|-2147482362|
+|TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR|	0	| 0x0507	| "Missing data file"|	-2147482361|
+|TSDB_CODE_VND_OUT_OF_MEMORY	|0|	 0x0508	| "Out of memory"|	-2147482360|
+|TSDB_CODE_VND_APP_ERROR|	0|	 0x0509	| "Unexpected generic error in vnode"|	-2147482359|
+|TSDB_CODE_VND_INVALID_STATUS	|0|	 0x0510	| "Database not ready"|	-2147482352|
+|TSDB_CODE_VND_NOT_SYNCED|	0	| 0x0511	| "Database suspended"|	-2147482351|
+|TSDB_CODE_VND_NO_WRITE_AUTH|	0	| 0x0512|	 "Write operation denied"	|-2147482350|
+|TSDB_CODE_TDB_INVALID_TABLE_ID	|0	| 0x0600	| "Invalid table ID"|	-2147482112|
+|TSDB_CODE_TDB_INVALID_TABLE_TYPE|	0|	 0x0601	 |"Invalid table type"|	-2147482111|
+|TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION|	0|	 0x0602|	 "Invalid table schema version"|	-2147482110|
+|TSDB_CODE_TDB_TABLE_ALREADY_EXIST|	0	| 0x0603|	 "Table already exists"|	-2147482109|
+|TSDB_CODE_TDB_INVALID_CONFIG|	0	| 0x0604|	 "Invalid configuration"|	-2147482108|
+|TSDB_CODE_TDB_INIT_FAILED|	0	| 0x0605|	 "Tsdb init failed"|	-2147482107|
+|TSDB_CODE_TDB_NO_DISKSPACE|	0	| 0x0606|	 "No diskspace for tsdb"|	-2147482106|
+|TSDB_CODE_TDB_NO_DISK_PERMISSIONS|	0	| 0x0607|	 "No permission for disk files"|	-2147482105|
+|TSDB_CODE_TDB_FILE_CORRUPTED|	0	| 0x0608|	 "Data file(s) corrupted"|	-2147482104|
+|TSDB_CODE_TDB_OUT_OF_MEMORY|	0	| 0x0609|	 "Out of memory"|	-2147482103|
+|TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE|	0	| 0x060A|	 "Tag too old"|	-2147482102|
+|TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE	|0|	 0x060B	| "Timestamp data out of range"|	-2147482101|
+|TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP|	0|	 0x060C|	 "Submit message is messed up"|	-2147482100|
+|TSDB_CODE_TDB_INVALID_ACTION|	0	| 0x060D	| "Invalid operation"|	-2147482099|
+|TSDB_CODE_TDB_INVALID_CREATE_TB_MSG|	0	| 0x060E|	 "Invalid creation of table"|	-2147482098|
+|TSDB_CODE_TDB_NO_TABLE_DATA_IN_MEM|	0	| 0x060F|	 "No table data in memory skiplist"	|-2147482097|
+|TSDB_CODE_TDB_FILE_ALREADY_EXISTS|	0	| 0x0610|	 "File already exists"|	-2147482096|
+|TSDB_CODE_TDB_TABLE_RECONFIGURE|	0	| 0x0611|	 "Need to reconfigure table"|	-2147482095|
+|TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO|	0	| 0x0612|	 "Invalid information to create table"|	-2147482094|
+|TSDB_CODE_QRY_INVALID_QHANDLE|	0	| 0x0700|	 "Invalid handle"|	-2147481856|
+|TSDB_CODE_QRY_INVALID_MSG|	0	| 0x0701|	 "Invalid message"|  	-2147481855|
+|TSDB_CODE_QRY_NO_DISKSPACE|	0	| 0x0702	| "No diskspace for query"|	-2147481854|
+|TSDB_CODE_QRY_OUT_OF_MEMORY|	0	| 0x0703	| "System out of memory"|	-2147481853|
+|TSDB_CODE_QRY_APP_ERROR|	0	| 0x0704	| "Unexpected generic error in query"|	-2147481852|
+|TSDB_CODE_QRY_DUP_JOIN_KEY|	0	| 0x0705|	 "Duplicated join key"|	-2147481851|
+|TSDB_CODE_QRY_EXCEED_TAGS_LIMIT|	0	| 0x0706	| "Tag conditon too many"|	-2147481850|
+|TSDB_CODE_QRY_NOT_READY	|0|	 0x0707	| "Query not ready"	|-2147481849|
+|TSDB_CODE_QRY_HAS_RSP|	0	| 0x0708|	 "Query should response"|	-2147481848|
+|TSDB_CODE_GRANT_EXPIRED|	0	| 0x0800|	 "License expired"|	-2147481600|
+|TSDB_CODE_GRANT_DNODE_LIMITED|	0	| 0x0801	| "DNode creation limited by licence"|	-2147481599|
+|TSDB_CODE_GRANT_ACCT_LIMITED	|0|	 0x0802	 |"Account creation limited by license"|	-2147481598|
+|TSDB_CODE_GRANT_TIMESERIES_LIMITED|	0	| 0x0803	| "Table creation limited by license"|	-2147481597|
+|TSDB_CODE_GRANT_DB_LIMITED|	0	| 0x0804	| "DB creation limited by license"|	-2147481596|
+|TSDB_CODE_GRANT_USER_LIMITED|	0	| 0x0805	| "User creation limited by license"|	-2147481595|
+|TSDB_CODE_GRANT_CONN_LIMITED|	0|	 0x0806	| "Conn creation limited by license"	|-2147481594|
+|TSDB_CODE_GRANT_STREAM_LIMITED|	0	| 0x0807	| "Stream creation limited by license"|	-2147481593|
+|TSDB_CODE_GRANT_SPEED_LIMITED|	0	| 0x0808	| "Write speed limited by license"	|-2147481592|
+|TSDB_CODE_GRANT_STORAGE_LIMITED|	0	 |0x0809	| "Storage capacity limited by license"|	-2147481591|
+|TSDB_CODE_GRANT_QUERYTIME_LIMITED|	0	| 0x080A	| "Query time limited by license"	|-2147481590|
+|TSDB_CODE_GRANT_CPU_LIMITED|	0	 |0x080B	 |"CPU cores limited by license"|	-2147481589|
+|TSDB_CODE_SYN_INVALID_CONFIG|	0	| 0x0900|	 "Invalid Sync Configuration"|	-2147481344|
+|TSDB_CODE_SYN_NOT_ENABLED|	0	| 0x0901	| "Sync module not enabled"	|-2147481343|
+|TSDB_CODE_WAL_APP_ERROR|	0|	 0x1000	| "Unexpected generic error in wal"	|-2147479552|
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/administrator-ch.md b/documentation20/webdocs/markdowndocs/administrator-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..50b388650b361fcfc0a5faca852f08f54fb0d26b
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/administrator-ch.md
@@ -0,0 +1,390 @@
+# TDengine的运营与维护
+
+## 容量规划
+
+使用TDengine来搭建一个物联网大数据平台，计算资源、存储资源需要根据业务场景进行规划。下面分别讨论系统运行所需要的内存、CPU以及硬盘空间。
+
+### 内存需求
+
+每个DB可以创建固定数目的vnode，默认与CPU核数相同，可通过maxVgroupsPerDb配置；每个vnode会占用固定大小的内存（大小与数据库的配置参数blocks和cache有关)；每个Table会占用与标签总长度有关的内存；此外，系统会有一些固定的内存开销。因此，每个DB需要的系统内存可通过如下公式计算：
+
+```
+Memory Size = maxVgroupsPerDb * (blocks * cache + 10Mb) + numOfTables * (tagSizePerTable + 0.5Kb)
+```
+
+示例：假设是4核机器，cache是缺省大小16M, blocks是缺省值6，假设有10万张表，标签总长度是256字节，则总的内存需求为：4\*(16\*6+10) + 100000*(0.25+0.5)/1000 = 499M。 
+
+实际运行的系统往往会根据数据特点的不同，将数据存放在不同的DB里。因此做规划时，也需要考虑。
+
+如果内存充裕，可以加大Blocks的配置，这样更多数据将保存在内存里，提高查询速度。
+
+### CPU需求
+
+CPU的需求取决于如下两方面：
+
+* __数据插入__ TDengine单核每秒能至少处理一万个插入请求。每个插入请求可以带多条记录，一次插入一条记录与插入10条记录，消耗的计算资源差别很小。因此每次插入，条数越大，插入效率越高。如果一个插入请求带200条以上记录，单核就能达到每秒插入100万条记录的速度。但对前端数据采集的要求越高，因为需要缓存记录，然后一批插入。
+* __查询需求__ TDengine提供高效的查询，但是每个场景的查询差异很大，查询频次变化也很大，难以给出客观数字。需要用户针对自己的场景，写一些查询语句，才能确定。
+
+因此仅对数据插入而言，CPU是可以估算出来的，但查询所耗的计算资源无法估算。在实际运营过程中，不建议CPU使用率超过50%，超过后，需要增加新的节点，以获得更多计算资源。
+
+### 存储需求
+
+TDengine相对于通用数据库，有超高的压缩比，在绝大多数场景下，TDengine的压缩比不会低于5倍，有的场合，压缩比可达到10倍以上，取决于实际场景的数据特征。压缩前的原始数据大小可通过如下方式计算：
+
+```
+Raw DataSize = numOfTables * rowSizePerTable * rowsPerTable
+```
+
+示例：1000万台智能电表，每台电表每15分钟采集一次数据，每次采集的数据128字节，那么一年的原始数据量是：10000000\*128\*24\*60/15*365 = 44851T。TDengine大概需要消耗44851/5=8970T, 8.9P空间。 
+
+用户可以通过参数keep，设置数据在磁盘中的最大保存时长。为进一步减少存储成本，TDengine还提供多级存储，最冷的数据可以存放在最廉价的存储介质上，应用的访问不用做任何调整，只是读取速度降低了。
+
+为提高速度，可以配置多块硬盘，这样可以并发写入或读取数据。需要提醒的是，TDengine采取多副本的方式提供数据的高可靠，因此不再需要采用昂贵的磁盘阵列。
+
+### 物理机或虚拟机台数
+
+根据上面的内存、CPU、存储的预估，就可以知道整个系统需要多少核、多少内存、多少存储空间。如果数据副本数不为1，总需求量需要再乘以副本数。
+
+因为TDengine具有很好的水平扩展能力，根据总量，再根据单个物理机或虚拟机的资源，就可以轻松决定需要购置多少台物理机或虚拟机了。
+
+**立即计算CPU、内存、存储，请参见：<a href='https://www.taosdata.com/config/config.html'>资源估算方法</a>**
+
+## 容错和灾备
+
+### 容错
+
+TDengine支持**WAL**（Write Ahead Log）机制，实现数据的容错能力，保证数据的高可用。
+
+TDengine接收到应用的请求数据包时，先将请求的原始数据包写入数据库日志文件，等数据成功写入数据库数据文件后，再删除相应的WAL。这样保证了TDengine能够在断电等因素导致的服务重启时从数据库日志文件中恢复数据，避免数据的丢失。
+
+涉及的系统配置参数有两个：
+
+- walLevel：WAL级别，0：不写wal; 1：写wal, 但不执行fsync; 2：写wal, 而且执行fsync。
+- fsync：当walLevel设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。
+
+如果要100%的保证数据不丢失，需要将walLevel设置为2，fsync设置为0。这时写入速度将会下降。但如果应用侧启动的写数据的线程数达到一定的数量(超过50)，那么写入数据的性能也会很不错，只会比fsync设置为3000毫秒下降30%左右。
+
+### 灾备
+
+TDengine的集群通过多个副本的机制，来提供系统的高可用性，实现灾备能力。
+
+TDengine集群是由mnode负责管理的，为保证mnode的高可靠，可以配置多个mnode副本，副本数由系统配置参数numOfMnodes决定，为了支持高可靠，需要设置大于1。为保证元数据的强一致性，mnode副本之间通过同步方式进行数据复制，保证了元数据的强一致性。
+
+TDengine集群中的时序数据的副本数是与数据库关联的，一个集群里可以有多个数据库，每个数据库可以配置不同的副本数。创建数据库时，通过参数replica 指定副本数。为了支持高可靠，需要设置副本数大于1。
+
+TDengine集群的节点数必须大于等于副本数，否则创建表时将报错。
+
+当TDengine集群中的节点部署在不同的物理机上，并设置多个副本数时，就实现了系统的高可靠性，无需再使用其他软件或工具。TDengine企业版还可以将副本部署在不同机房，从而实现异地容灾。
+
+## 服务端配置
+
+TDengine系统后台服务由taosd提供，可以在配置文件taos.cfg里修改配置参数，以满足不同场景的需求。配置文件的缺省位置在/etc/taos目录，可以通过taosd命令行执行参数-c指定配置文件目录。比如taosd -c /home/user来指定配置文件位于/home/user这个目录。
+
+下面仅仅列出一些重要的配置参数，更多的参数请看配置文件里的说明。各个参数的详细介绍及作用请看前述章节，而且这些参数的缺省配置都是工作的，一般无需设置。**注意：配置修改后，需要重启*taosd*服务才能生效。**
+
+- firstEp: taosd启动时，主动连接的集群中第一个dnode的end point, 默认值为localhost:6030。
+- secondEp: taosd启动时，如果first连接不上，尝试连接集群中第二个dnode的end point, 默认值为空。
+- fqdn：数据节点的FQDN，缺省为操作系统配置的第一个hostname。如果习惯IP地址访问，可设置为该节点的IP地址。
+- serverPort：taosd启动后，对外服务的端口号，默认值为6030。
+- httpPort: RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接口发起查询/写入请求, 默认值为6041。
+- dataDir: 数据文件目录，所有的数据文件都将写入该目录。默认值：/var/lib/taos。
+- logDir：日志文件目录，客户端和服务器的运行日志文件将写入该目录。默认值：/var/log/taos。
+- arbitrator：系统中裁决器的end point, 缺省值为空。
+- role：dnode的可选角色。0-any; 既可作为mnode，也可分配vnode；1-mgmt;只能作为mnode，不能分配vnode；2-dnode;不能作为mnode，只能分配vnode
+- debugFlag：运行日志开关。131（输出错误和警告日志），135（ 输出错误、警告和调试日志），143（ 输出错误、警告、调试和跟踪日志）。默认值：131或135（不同模块有不同的默认值）。
+- numOfLogLines：单个日志文件允许的最大行数。默认值：10,000,000行。
+- logKeepDays：日志文件的最长保存时间。大于0时，日志文件会被重命名为taosdlog.xxx，其中xxx为日志文件最后修改的时间戳，单位为秒。默认值：0天。
+- maxSQLLength：单条SQL语句允许最长限制。默认值：65380字节。
+- telemetryReporting: 是否允许 TDengine 采集和上报基本使用信息，0表示不允许，1表示允许。 默认值：1。
+
+**注意：**对于端口，TDengine会使用从serverPort起13个连续的TCP和UDP端口号，请务必在防火墙打开。因此如果是缺省配置，需要打开从6030都6042共13个端口，而且必须TCP和UDP都打开。
+
+不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：
+
+- days：一个数据文件存储数据的时间跨度，单位为天，默认值：10。
+- keep：数据库中数据保留的天数，单位为天，默认值：3650。
+- minRows: 文件块中记录的最小条数，单位为条，默认值：100。
+- maxRows: 文件块中记录的最大条数，单位为条，默认值：4096。
+- comp: 文件压缩标志位，0：关闭，1:一阶段压缩，2:两阶段压缩。默认值：2。
+- walLevel：WAL级别。1：写wal, 但不执行fsync; 2：写wal, 而且执行fsync。默认值：1。
+- fsync：当wal设置为2时，执行fsync的周期。设置为0，表示每次写入，立即执行fsync。单位为毫秒，默认值：3000。
+- cache: 内存块的大小，单位为兆字节（MB），默认值：16。
+- blocks: 每个VNODE（TSDB）中有多少cache大小的内存块。因此一个VNODE的用的内存大小粗略为（cache * blocks）。单位为块，默认值：4。
+- replica：副本个数，取值范围：1-3。单位为个，默认值：1
+- precision：时间戳精度标识，ms表示毫秒，us表示微秒。默认值：ms
+
+对于一个应用场景，可能有多种数据特征的数据并存，最佳的设计是将具有相同数据特征的表放在一个库里，这样一个应用有多个库，而每个库可以配置不同的存储参数，从而保证系统有最优的性能。TDengine允许应用在创建库时指定上述存储参数，如果指定，该参数就将覆盖对应的系统配置参数。举例，有下述SQL： 
+
+```
+ create database demo days 10 cache 32 blocks 8 replica 3;
+```
+
+该SQL创建了一个库demo, 每个数据文件存储10天数据，内存块为32兆字节，每个VNODE占用8个内存块，副本数为3，而其他参数与系统配置完全一致。
+
+TDengine集群中加入一个新的dnode时，涉及集群相关的一些参数必须与已有集群的配置相同，否则不能成功加入到集群中。会进行校验的参数如下：
+
+- numOfMnodes：系统中管理节点个数。默认值：3。
+- balance：是否启动负载均衡。0：否，1：是。默认值：1。
+- mnodeEqualVnodeNum: 一个mnode等同于vnode消耗的个数。默认值：4。
+- offlineThreshold: dnode离线阈值，超过该时间将导致该dnode从集群中删除。单位为秒，默认值：86400*10（即10天）。
+- statusInterval: dnode向mnode报告状态时长。单位为秒，默认值：1。
+- maxTablesPerVnode: 每个vnode中能够创建的最大表个数。默认值：1000000。
+- maxVgroupsPerDb: 每个数据库中能够使用的最大vnode个数。
+- arbitrator: 系统中裁决器的end point，缺省为空
+- timezone、locale、charset 的配置见客户端配置。
+
+## 客户端配置 
+
+TDengine系统的前台交互客户端应用程序为taos，它与taosd共享同一个配置文件taos.cfg。运行taos时，使用参数-c指定配置文件目录，如taos -c /home/cfg，表示使用/home/cfg/目录下的taos.cfg配置文件中的参数，缺省目录是/etc/taos。本节主要说明 taos 客户端应用在配置文件 taos.cfg 文件中使用到的参数。
+
+客户端配置参数
+
+- firstEp: taos启动时，主动连接的集群中第一个taosd实例的end point, 缺省值为 localhost:6030。
+- secondEp: taos启动时，如果first连接不上，尝试连接集群中第二个taosd实例的end point, 缺省值为空。
+- locale
+
+    > 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
+    
+TDengine为存储中文、日文、韩文等非ASCII编码的宽字符，提供一种专门的字段类型nchar。写入nchar字段的数据将统一采用UCS4-LE格式进行编码并发送到服务器。需要注意的是，编码正确性是客户端来保证。因此，如果用户想要正常使用nchar字段来存储诸如中文、日文、韩文等非ASCII字符，需要正确设置客户端的编码格式。
+
+客户端的输入的字符均采用操作系统当前默认的编码格式，在Linux系统上多为UTF-8，部分中文系统编码则可能是GB18030或GBK等。在docker环境中默认的编码是POSIX。在中文版Windows系统中，编码则是CP936。客户端需要确保正确设置自己所使用的字符集，即客户端运行的操作系统当前编码字符集，才能保证nchar中的数据正确转换为UCS4-LE编码格式。
+
+在 Linux 中 locale 的命名规则为: <语言>_<地区>.<字符集编码> 如：zh_CN.UTF-8，zh代表中文，CN代表大陆地区，UTF-8表示字符集。字符集编码为客户端正确解析本地字符串提供编码转换的说明。Linux系统与 Mac OSX 系统可以通过设置locale来确定系统的字符编码，由于Windows使用的locale中不是POSIX标准的locale格式，因此在Windows下需要采用另一个配置参数charset来指定字符编码。在Linux 系统中也可以使用charset来指定字符编码。
+
+- charset
+
+    > 默认值：系统中动态获取，如果自动获取失败，需要用户在配置文件设置或通过API设置
+    
+如果配置文件中不设置charset，在Linux系统中，taos在启动时候，自动读取系统当前的locale信息，并从locale信息中解析提取charset编码格式。如果自动读取locale信息失败，则尝试读取charset配置，如果读取charset配置也失败，则中断启动过程。
+
+在Linux系统中，locale信息包含了字符编码信息，因此正确设置了Linux系统locale以后可以不用再单独设置charset。例如：
+```
+    locale zh_CN.UTF-8
+```
+在Windows系统中，无法从locale获取系统当前编码。如果无法从配置文件中读取字符串编码信息，taos默认设置为字符编码为CP936。其等效在配置文件中添加如下配置：
+```
+    charset CP936
+```
+如果需要调整字符编码，请查阅当前操作系统使用的编码，并在配置文件中正确设置。
+
+在Linux系统中，如果用户同时设置了locale和字符集编码charset，并且locale和charset的不一致，后设置的值将覆盖前面设置的值。
+```
+    locale zh_CN.UTF-8
+    charset GBK
+```
+则charset的有效值是GBK。
+```
+    charset GBK
+    locale zh_CN.UTF-8
+```
+charset的有效值是UTF-8。
+
+日志的配置参数，与server 的配置参数完全一样。
+
+- timezone
+
+    默认值：从系统中动态获取当前的时区设置
+
+客户端运行系统所在的时区。为应对多时区的数据写入和查询问题，TDengine 采用 Unix 时间戳(Unix Timestamp)来记录和存储时间戳。Unix 时间戳的特点决定了任一时刻不论在任何时区，产生的时间戳均一致。需要注意的是，Unix时间戳是在客户端完成转换和记录。为了确保客户端其他形式的时间转换为正确的 Unix 时间戳，需要设置正确的时区。
+
+在Linux系统中，客户端会自动读取系统设置的时区信息。用户也可以采用多种方式在配置文件设置时区。例如：
+```
+    timezone UTC-8
+    timezone GMT-8
+    timezone Asia/Shanghai
+```
+均是合法的设置东八区时区的格式。
+
+时区的设置对于查询和写入SQL语句中非Unix时间戳的内容（时间戳字符串、关键词now的解析）产生影响。例如：
+```
+    SELECT count(*) FROM table_name WHERE TS<'2019-04-11 12:01:08';
+```
+在东八区，SQL语句等效于
+```
+    SELECT count(*) FROM table_name WHERE TS<1554955268000;
+```
+在UTC时区，SQL语句等效于
+```
+    SELECT count(*) FROM table_name WHERE TS<1554984068000;
+```
+为了避免使用字符串时间格式带来的不确定性，也可以直接使用Unix时间戳。此外，还可以在SQL语句中使用带有时区的时间戳字符串，例如：RFC3339格式的时间戳字符串，2013-04-12T15:52:01.123+08:00或者ISO-8601格式时间戳字符串2013-04-12T15:52:01.123+0800。上述两个字符串转化为Unix时间戳不受系统所在时区的影响。
+
+启动taos时，也可以从命令行指定一个taosd实例的end point，否则就从taos.cfg读取。
+
+## 用户管理
+
+系统管理员可以在CLI界面里添加、删除用户，也可以修改密码。CLI里SQL语法如下：
+
+```
+CREATE USER <user_name> PASS <'password'>;
+```
+
+创建用户，并指定用户名和密码，密码需要用单引号引起来,单引号为英文半角
+
+```
+DROP USER <user_name>;
+```
+
+删除用户，限root用户使用
+
+```
+ALTER USER <user_name> PASS <'password'>;
+```
+
+修改用户密码, 为避免被转换为小写，密码需要用单引号引用,单引号为英文半角
+
+```
+SHOW USERS;
+```
+
+显示所有用户  
+  
+**注意：**SQL 语法中，< >表示需要用户输入的部分，但请不要输入< >本身
+
+## 数据导入
+
+TDengine提供多种方便的数据导入功能，一种按脚本文件导入，一种按数据文件导入，一种是taosdump工具导入本身导出的文件。
+
+**按脚本文件导入**
+
+TDengine的shell支持source filename命令，用于批量运行文件中的SQL语句。用户可将建库、建表、写数据等SQL命令写在同一个文件中，每条命令单独一行，在shell中运行source命令，即可按顺序批量运行文件中的SQL语句。以‘#’开头的SQL语句被认为是注释，shell将自动忽略。
+
+**按数据文件导入**
+
+TDengine也支持在shell对已存在的表从CSV文件中进行数据导入。CSV文件只属于一张表且CSV文件中的数据格式需与要导入表的结构相同, 在导入的时候，其语法如下
+
+```mysql
+insert into tb1 file 'path/data.csv';
+```
+注意：如果CSV文件首行存在描述信息，请手动删除后再导入
+
+例如，现在存在一个子表d1001, 其表结构如下：
+
+```mysql
+taos> DESCRIBE d1001
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+要导入的data.csv的格式如下：
+
+```csv
+'2018-10-04 06:38:05.000',10.30000,219,0.31000
+'2018-10-05 06:38:15.000',12.60000,218,0.33000
+'2018-10-06 06:38:16.800',13.30000,221,0.32000
+'2018-10-07 06:38:05.000',13.30000,219,0.33000
+'2018-10-08 06:38:05.000',14.30000,219,0.34000
+'2018-10-09 06:38:05.000',15.30000,219,0.35000
+'2018-10-10 06:38:05.000',16.30000,219,0.31000
+'2018-10-11 06:38:05.000',17.30000,219,0.32000
+'2018-10-12 06:38:05.000',18.30000,219,0.31000
+```
+那么可以用如下命令导入数据
+
+```
+taos> insert into d1001 file '~/data.csv';
+Query OK, 9 row(s) affected (0.004763s)
+```
+
+
+**taosdump工具导入**
+
+TDengine提供了方便的数据库导入导出工具taosdump。用户可以将taosdump从一个系统导出的数据，导入到其他系统中。具体使用方法，请参见博客：<a href='https://www.taosdata.com/blog/2020/03/09/1334.html'>TDengine DUMP工具使用指南</a>
+
+## 数据导出
+
+为方便数据导出，TDengine提供了两种导出方式，分别是按表导出和用taosdump导出。
+
+**按表导出CSV文件**
+
+如果用户需要导出一个表或一个STable中的数据，可在shell中运行
+
+```
+select * from <tb_name> >> data.csv;
+```
+
+这样，表tb_name中的数据就会按照CSV格式导出到文件data.csv中。
+
+**用taosdump导出数据**
+
+TDengine提供了方便的数据库导出工具taosdump。用户可以根据需要选择导出所有数据库、一个数据库或者数据库中的一张表,所有数据或一时间段的数据，甚至仅仅表的定义。具体使用方法，请参见博客：<a href='https://www.taosdata.com/blog/2020/03/09/1334.html'>TDengine DUMP工具使用指南</a>
+
+## 系统连接、任务查询管理
+
+系统管理员可以从CLI查询系统的连接、正在进行的查询、流式计算，并且可以关闭连接、停止正在进行的查询和流式计算。CLI里SQL语法如下：
+
+```
+SHOW CONNECTIONS;
+```
+
+显示数据库的连接，其中一列显示ip:port, 为连接的IP地址和端口号。
+
+```
+KILL CONNECTION <connection-id>;
+```
+
+强制关闭数据库连接，其中的connection-id是SHOW CONNECTIONS中显示的第一列的数字。
+
+```
+SHOW QUERIES;
+```
+
+显示数据查询，其中第一列显示的以冒号隔开的两个数字为query-id，为发起该query应用连接的connection-id和查询次数。
+
+```
+KILL QUERY <query-id>;
+```
+
+强制关闭数据查询，其中query-id是SHOW QUERIES中显示的 connection-id:query-no字串，如“105:2”，拷贝粘贴即可。
+
+```
+SHOW STREAMS;
+```
+
+显示流式计算，其中第一列显示的以冒号隔开的两个数字为stream-id, 为启动该stream应用连接的connection-id和发起stream的次数。
+
+```
+KILL STREAM <stream-id>;
+```
+
+强制关闭流式计算，其中的中stream-id是SHOW STREAMS中显示的connection-id:stream-no字串，如103:2，拷贝粘贴即可。
+
+## 系统监控
+
+TDengine启动后，会自动创建一个监测数据库SYS，并自动将服务器的CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入该数据库。TDengine还将重要的系统操作（比如登录、创建、删除数据库等）日志以及各种错误报警信息记录下来存放在SYS库里。系统管理员可以从CLI直接查看这个数据库，也可以在WEB通过图形化界面查看这些监测信息。
+
+这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
+
+## 文件目录结构
+
+安装TDengine后，默认会在操作系统中生成下列目录或文件：
+
+| 目录/文件                 | 说明                                                         |
+| ------------------------- | :----------------------------------------------------------- |
+| /usr/local/taos/bin       | TDengine可执行文件目录。其中的执行文件都会软链接到/usr/bin目录下。 |
+| /usr/local/taos/connector | TDengine各种连接器目录。                                     |
+| /usr/local/taos/driver    | TDengine动态链接库目录。会软链接到/usr/lib目录下。           |
+| /usr/local/taos/examples  | TDengine各种语言应用示例目录。                               |
+| /usr/local/taos/include   | TDengine对外提供的C语言接口的头文件。                        |
+| /etc/taos/taos.cfg        | TDengine默认[配置文件]                                       |
+| /var/lib/taos             | TDengine默认数据文件目录,可通过[配置文件]修改位置.           |
+| /var/log/taos             | TDengine默认日志文件目录,可通过[配置文件]修改位置            |
+
+**可执行文件**
+
+TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下。其中包括：
+
+- _taosd_：TDengine服务端可执行文件
+- _taos_： TDengine Shell可执行文件
+- _taosdump_：数据导入导出工具
+- remove.sh：卸载TDengine的脚本, 请谨慎执行，链接到/usr/bin目录下的rmtaos命令。会删除TDengine的安装目录/usr/local/taos，但会保留/etc/taos、/var/lib/taos、/var/log/taos。
+
+您可以通过修改系统配置文件taos.cfg来配置不同的数据目录和日志目录。
+
+
+
diff --git a/documentation20/webdocs/markdowndocs/administrator.md b/documentation20/webdocs/markdowndocs/administrator.md
new file mode 100644
index 0000000000000000000000000000000000000000..e118be525d117f0dc85f91c9fc3b66bf676ef30a
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/administrator.md
@@ -0,0 +1,231 @@
+#Administrator
+
+## Directory and Files
+
+After TDengine is installed, by default, the following directories will be created:
+
+| Directory/File         | Description                     |
+| ---------------------- | :------------------------------ |
+| /etc/taos/taos.cfg     | TDengine configuration file     |
+| /usr/local/taos/driver | TDengine dynamic link library   |
+| /var/lib/taos          | TDengine default data directory |
+| /var/log/taos          | TDengine default log directory  |
+| /usr/local/taos/bin.   | TDengine executables            |
+
+### Executables
+
+All TDengine executables are located at _/usr/local/taos/bin_ , including:
+
+- `taosd`：TDengine server 
+- `taos`： TDengine Shell, the command line interface.
+- `taosdump`：TDengine data export tool
+- `rmtaos`： a script to uninstall TDengine
+
+You can change the data directory and log directory setting through the system configuration file
+
+## Configuration on Server
+
+`taosd` is running on the server side, you can change the system configuration file taos.cfg to customize its behavior. By default, taos.cfg is located at /etc/taos, but you can specify the path to configuration file via the command line parameter -c. For example: `taosd -c /home/user` means the configuration file will be read from directory /home/user.
+
+This section lists only the most important configuration parameters. Please check taos.cfg to find all the configurable parameters. **Note: to make your new configurations work, you have to restart taosd after you change taos.cfg**.
+
+- mgmtShellPort: TCP and UDP port between client and TDengine mgmt (default: 6030). Note: 5 successive UDP ports (6030-6034) starting from this number will be used.
+- vnodeShellPort: TCP and UDP port between client and TDengine vnode (default: 6035). Note: 5 successive UDP ports (6035-6039) starting from this number will be used.
+- httpPort: TCP port for RESTful service (default: 6020)
+- dataDir: data directory, default is /var/lib/taos
+- maxUsers: maximum number of users allowed
+- maxDbs: maximum number of databases allowed
+- maxTables: maximum number of tables allowed
+- enableMonitor: turn on/off system monitoring, 0: off, 1: on
+- logDir: log directory, default is /var/log/taos
+- numOfLogLines: maximum number of lines in the log file
+- debugFlag: log level, 131: only error and warnings, 135: all
+
+In different scenarios, data characteristics are different. For example, the retention policy, data sampling period, record size, the number of devices, and data compression may be different. To gain the best performance, you can change the following configurations related to storage:  
+
+- days: number of days to cover for a data file
+- keep: number of days to keep the data
+- rows: number of rows of records in a block in data file.
+- comp: compression algorithm, 0: off, 1: standard; 2: maximum compression
+- ctime: period (seconds) to flush data to disk
+- clog: flag to turn on/off Write Ahead Log, 0: off, 1: on 
+- tables: maximum number of tables allowed in a vnode
+- cache: cache block size (bytes)
+- tblocks: maximum number of cache blocks for a table
+- abloks: average number of cache blocks for a table 
+- precision: timestamp precision, us: microsecond ms: millisecond, default is ms
+
+For an application, there may be multiple data scenarios. The best design is to put all data with the same characteristics into one database. One application may have multiple databases, and every database has its own configuration to maximize the system performance. You can specify the above configurations related to storage when you create a database. For example:  
+
+```mysql
+CREATE DATABASE demo DAYS 10 CACHE 16000 ROWS 2000 
+```
+
+The above SQL statement will create a database demo, with 10 days for each data file, 16000 bytes for a cache block, and 2000 rows in a file block.
+
+The configuration provided when creating a database will overwrite the configuration in taos.cfg. 
+
+## Configuration on Client 
+
+*taos* is the TDengine shell and is a client that connects to taosd. TDengine uses the same configuration file taos.cfg for the client, with default location at /etc/taos. You can change it by specifying command line parameter -c when you run taos. For example, *taos -c /home/user*, it will read the configuration file taos.cfg from directory /home/user.
+
+The parameters related to client configuration are listed below: 
+
+- masterIP: IP address of TDengine server
+- charset: character set, default is the system . For data type nchar, TDengine uses unicode to store the data. Thus, the client needs to tell its character set.
+- locale: system language setting
+- defaultUser: default login user, default is root
+- defaultPass: default password, default is taosdata
+
+For TCP/UDP port, and system debug/log configuration, it is the same as the server side.
+
+For server IP, user name, password, you can always specify them in the command line when you run taos. If they are not specified, they will be read from the taos.cfg
+
+## User Management
+
+System administrator (user root) can add, remove a user, or change the password from the TDengine shell. Commands are listed below:
+
+Create a user, password shall be quoted with the single quote.
+
+```mysql
+CREATE USER user_name PASS ‘password’
+```
+
+Remove a user
+
+```mysql
+DROP USER user_name
+```
+
+Change the password for a user
+
+```mysql
+ALTER USER user_name PASS ‘password’  
+```
+
+List all users
+
+```mysql
+SHOW USERS
+```
+
+## Import Data
+
+Inside the TDengine shell, you can import data into TDengine from either a script or CSV file
+
+**Import from Script**
+
+```
+source <filename>
+```
+
+Inside the file, you can put all SQL statements there. Each SQL statement has a line. If a line starts with "#", it means comments, it will be skipped. The system will execute the SQL statements line by line automatically until the ends 
+
+**Import from CSV**
+
+```mysql
+insert into tb1 file 'path/data.csv'
+```
+
+CSV file contains records for only one table, and the data structure shall be the same as the defined schema for the table. The header of CSV file shall be removed. 
+
+For example, the following is a sub-table d1001:
+
+```mysql
+taos> DESCRIBE d1001
+             Field              |        Type        |   Length    |    Note    |
+=================================================================================
+ ts                             | TIMESTAMP          |           8 |            |
+ current                        | FLOAT              |           4 |            |
+ voltage                        | INT                |           4 |            |
+ phase                          | FLOAT              |           4 |            |
+ location                       | BINARY             |          64 | TAG        |
+ groupid                        | INT                |           4 | TAG        |
+```
+The data format in data.csv like this：
+
+```csv
+'2018-10-04 06:38:05.000',10.30000,219,0.31000
+'2018-10-05 06:38:15.000',12.60000,218,0.33000
+'2018-10-06 06:38:16.800',13.30000,221,0.32000
+'2018-10-07 06:38:05.000',13.30000,219,0.33000
+'2018-10-08 06:38:05.000',14.30000,219,0.34000
+'2018-10-09 06:38:05.000',15.30000,219,0.35000
+'2018-10-10 06:38:05.000',16.30000,219,0.31000
+'2018-10-11 06:38:05.000',17.30000,219,0.32000
+'2018-10-12 06:38:05.000',18.30000,219,0.31000
+```
+then data can be imported into database by this cmd:
+
+```
+taos> insert into d1001 file '~/data.csv';
+Query OK, 9 row(s) affected (0.004763s)
+```
+## Export Data
+
+You can export data either from TDengine shell or from tool taosdump.
+
+**Export from TDengine Shell**
+
+```mysql
+select * from <tb_name> >> data.csv
+```
+
+The above SQL statement will dump the query result set into data.csv file.  
+
+**Export Using taosdump**
+
+TDengine provides a data dumping tool taosdump. You can choose to dump a database, a table, all data or data only a time range, even only the metadata. For example:
+
+- Export one or more tables in a DB: taosdump [OPTION…] dbname tbname …
+- Export one or more DBs: taosdump [OPTION…] --databases dbname…
+- Export all DBs (excluding system DB): taosdump [OPTION…] --all-databases
+
+run *taosdump —help* to get a full list of the options
+
+## Management of Connections, Streams, Queries 
+
+The system administrator can check, kill the ongoing connections, streams, or queries. 
+
+```
+SHOW CONNECTIONS
+```
+
+It lists all connections. The first column shows connection-id from the client. 
+
+```
+KILL CONNECTION <connection-id>
+```
+
+It kills the connection, where connection-id is the number of the first column showed by "SHOW CONNECTIONS".
+
+```
+SHOW QUERIES
+```
+
+It shows the ongoing queries. The first column shows the connection-id:query-no, where connection-id is the connection from the client, and id assigned by the system
+
+```
+KILL QUERY <query-id>
+```
+
+It kills the query, where query-id is the connection-id:query-no showed by "SHOW QUERIES". You can copy and paste it.
+
+```
+SHOW STREAMS
+```
+
+It shows the continuous queries. The first column shows the connection-id:stream-no, where connection-id is the connection from the client, and id assigned by the system.
+
+```
+KILL STREAM <stream-id>
+```
+
+It kills the continuous query, where stream-id is the connection-id:stream-no showed by "SHOW STREAMS". You can copy and paste it.
+
+## System Monitor
+
+TDengine runs a system monitor in the background. Once it is started, it will create a database sys automatically. System monitor collects the metric like CPU, memory, network, disk, number of requests periodically, and writes them into database sys. Also, TDengine will log all important actions, like login, logout, create database, drop database and so on, and write them into database sys. 
+
+You can check all the saved monitor information from database sys. By default, system monitor is turned on. But you can turn it off by changing the parameter in the configuration file.
+
diff --git a/documentation20/webdocs/markdowndocs/advanced features-ch.md b/documentation20/webdocs/markdowndocs/advanced features-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..ed02af25f2cd78372f20a2dc074bb0aa30b4e301
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/advanced features-ch.md	
@@ -0,0 +1,433 @@
+# 高级功能
+
+## 连续查询(Continuous Query)
+
+连续查询是TDengine定期自动执行的查询，采用滑动窗口的方式进行计算，是一种简化的时间驱动的流式计算。
+针对库中的表或超级表，TDengine可提供定期自动执行的连续查询，
+用户可让TDengine推送查询的结果，也可以将结果再写回到TDengine中。
+每次执行的查询是一个时间窗口，时间窗口随着时间流动向前滑动。
+在定义连续查询的时候需要指定时间窗口（time window, 参数interval）大小和每次前向增量时间（forward sliding times, 参数sliding）。
+
+TDengine的连续查询采用时间驱动模式，可以直接使用TAOS SQL进行定义，不需要额外的操作。
+使用连续查询，可以方便快捷地按照时间窗口生成结果，从而对原始采集数据进行降采样（down sampling）。
+用户通过TAOS SQL定义连续查询以后，TDengine自动在最后的一个完整的时间周期末端拉起查询，
+并将计算获得的结果推送给用户或者写回TDengine。
+
+TDengine提供的连续查询与普通流计算中的时间窗口计算具有以下区别：
+
+- 不同于流计算的实时反馈计算结果，连续查询只在时间窗口关闭以后才开始计算。
+例如时间周期是1天，那么当天的结果只会在23:59:59以后才会生成。
+
+- 如果有历史记录写入到已经计算完成的时间区间，连续查询并不会重新进行计算，
+也不会重新将结果推送给用户。对于写回TDengine的模式，也不会更新已经存在的计算结果。
+
+- 使用连续查询推送结果的模式，服务端并不缓存客户端计算状态，也不提供Exactly-Once的语意保证。
+如果用户的应用端崩溃，再次拉起的连续查询将只会从再次拉起的时间开始重新计算最近的一个完整的时间窗口。
+如果使用写回模式，TDengine可确保数据写回的有效性和连续性。
+
+### 使用连续查询
+
+下面以智能电表场景为例介绍连续查询的具体使用方法。假设我们通过下列SQL语句创建了超级表和子表：
+
+```sql
+create table meters (ts timestamp, current float, voltage int, phase float) tags (location binary(64), groupdId int);
+create table D1001 using meters tags ("Beijing.Chaoyang", 2);
+create table D1002 using meters tags ("Beijing.Haidian", 2);
+...
+```
+
+我们已经知道，可以通过下面这条SQL语句以一分钟为时间窗口、30秒为前向增量统计这些电表的平均电压。
+
+```sql
+select avg(voltage) from meters interval(1m) sliding(30s);
+```
+
+每次执行这条语句，都会重新计算所有数据。 
+如果需要每隔30秒执行一次来增量计算最近一分钟的数据，
+可以把上面的语句改进成下面的样子，每次使用不同的 `startTime` 并定期执行：
+
+```sql
+select avg(voltage) from meters where ts > {startTime} interval(1m) sliding(30s);
+```
+
+这样做没有问题，但TDengine提供了更简单的方法，
+只要在最初的查询语句前面加上 `create table {tableName} as ` 就可以了, 例如：
+
+```sql
+create table avg_vol as select avg(voltage) from meters interval(1m) sliding(30s);
+```
+
+会自动创建一个名为 `avg_vol` 的新表，然后每隔30秒，TDengine会增量执行 `as` 后面的 SQL 语句，
+并将查询结果写入这个表中，用户程序后续只要从 `avg_vol` 中查询数据即可。 例如：
+
+```shell
+taos> select * from avg_vol;
+            ts           |        avg_voltage_    |
+===================================================
+ 2020-07-29 13:37:30.000 |            222.0000000 |
+ 2020-07-29 13:38:00.000 |            221.3500000 |
+ 2020-07-29 13:38:30.000 |            220.1700000 |
+ 2020-07-29 13:39:00.000 |            223.0800000 |
+```
+
+需要注意，查询时间窗口的最小值是10毫秒，没有时间窗口范围的上限。
+
+
+此外，TDengine还支持用户指定连续查询的起止时间。
+如果不输入开始时间，连续查询将从第一条原始数据所在的时间窗口开始；
+如果没有输入结束时间，连续查询将永久运行；
+如果用户指定了结束时间，连续查询在系统时间达到指定的时间以后停止运行。
+比如使用下面的SQL创建的连续查询将运行一小时，之后会自动停止。
+
+```sql
+create table avg_vol as select avg(voltage) from meters where ts > now and ts <= now + 1h interval(1m) sliding(30s);
+```
+
+需要说明的是，上面例子中的 `now` 是指创建连续查询的时间，而不是查询执行的时间，否则，查询就无法自动停止了。 
+另外，为了尽量避免原始数据延迟写入导致的问题，TDengine中连续查询的计算有一定的延迟。
+也就是说，一个时间窗口过去后，TDengine并不会立即计算这个窗口的数据，
+所以要稍等一会（一般不会超过1分钟）才能查到计算结果。
+
+
+### 管理连续查询
+
+用户可在控制台中通过 `show streams` 命令来查看系统中全部运行的连续查询，
+并可以通过 `kill stream` 命令杀掉对应的连续查询。
+后续版本会提供更细粒度和便捷的连续查询管理命令。
+
+
+## 数据订阅(Publisher/Subscriber)
+
+基于数据天然的时间序列特性，TDengine的数据写入（insert）与消息系统的数据发布（pub）逻辑上一致，
+均可视为系统中插入一条带时间戳的新记录。
+同时，TDengine在内部严格按照数据时间序列单调递增的方式保存数据。
+本质上来说，TDengine中里每一张表均可视为一个标准的消息队列。
+
+TDengine内嵌支持轻量级的消息订阅与推送服务。
+使用系统提供的API，用户可使用普通查询语句订阅数据库中的一张或多张表。
+订阅的逻辑和操作状态的维护均是由客户端完成，客户端定时轮询服务器是否有新的记录到达，
+有新的记录到达就会将结果反馈到客户。
+
+TDengine的订阅与推送服务的状态是客户端维持，TDengine服务器并不维持。
+因此如果应用重启，从哪个时间点开始获取最新数据，由应用决定。
+
+TDengine的API中，与订阅相关的主要有以下三个：
+
+```c
+taos_subscribe
+taos_consume
+taos_unsubscribe
+```
+
+这些API的文档请见 [C/C++ Connector](https://www.taosdata.com/cn/documentation20/connector/)，
+下面仍以智能电表场景为例介绍一下它们的具体用法（超级表和子表结构请参考上一节“连续查询”），
+完整的示例代码可以在 [这里](https://github.com/taosdata/TDengine/blob/master/tests/examples/c/subscribe.c) 找到。
+
+如果我们希望当某个电表的电流超过一定限制（比如10A）后能得到通知并进行一些处理， 有两种方法：
+一是分别对每张子表进行查询，每次查询后记录最后一条数据的时间戳，后续只查询这个时间戳之后的数据：
+
+```sql
+select * from D1001 where ts > {last_timestamp1} and current > 10;
+select * from D1002 where ts > {last_timestamp2} and current > 10;
+...
+```
+
+这确实可行，但随着电表数量的增加，查询数量也会增加，客户端和服务端的性能都会受到影响，
+当电表数增长到一定的程度，系统就无法承受了。
+
+另一种方法是对超级表进行查询。这样，无论有多少电表，都只需一次查询：
+
+```sql
+select * from meters where ts > {last_timestamp} and current > 10;
+```
+
+但是，如何选择 `last_timestamp` 就成了一个新的问题。
+因为，一方面数据的产生时间（也就是数据时间戳）和数据入库的时间一般并不相同，有时偏差还很大；
+另一方面，不同电表的数据到达TDengine的时间也会有差异。
+所以，如果我们在查询中使用最慢的那台电表的数据的时间戳作为 `last_timestamp`，
+就可能重复读入其它电表的数据；
+如果使用最快的电表的时间戳，其它电表的数据就可能被漏掉。
+
+TDengine的订阅功能为上面这个问题提供了一个彻底的解决方案。
+
+首先是使用`taos_subscribe`创建订阅：
+
+```c
+TAOS_SUB* tsub = NULL;
+if (async) {
+　　// create an asynchronized subscription, the callback function will be called every 1s
+　　tsub = taos_subscribe(taos, restart, topic, sql, subscribe_callback, &blockFetch, 1000);
+} else {
+　　// create an synchronized subscription, need to call 'taos_consume' manually
+　　tsub = taos_subscribe(taos, restart, topic, sql, NULL, NULL, 0);
+}
+```
+
+TDengine中的订阅既可以是同步的，也可以是异步的，
+上面的代码会根据从命令行获取的参数`async`的值来决定使用哪种方式。
+这里，同步的意思是用户程序要直接调用`taos_consume`来拉取数据，
+而异步则由API在内部的另一个线程中调用`taos_consume`，
+然后把拉取到的数据交给回调函数`subscribe_callback`去处理。
+
+参数`taos`是一个已经建立好的数据库连接，在同步模式下无特殊要求。
+但在异步模式下，需要注意它不会被其它线程使用，否则可能导致不可预计的错误，
+因为回调函数在API的内部线程中被调用，而TDengine的部分API不是线程安全的。
+
+参数`sql`是查询语句，可以在其中使用where子句指定过滤条件。
+在我们的例子中，如果只想订阅电流超过10A时的数据，可以这样写：
+
+```sql
+select * from meters where current > 10;
+```
+
+注意，这里没有指定起始时间，所以会读到所有时间的数据。
+如果只想从一天前的数据开始订阅，而不需要更早的历史数据，可以再加上一个时间条件：
+
+```sql
+select * from meters where ts > now - 1d and current > 10;
+```
+
+订阅的`topic`实际上是它的名字，因为订阅功能是在客户端API中实现的，
+所以没必要保证它全局唯一，但需要它在一台客户端机器上唯一。
+
+如果名`topic`的订阅不存在，参数`restart`没有意义；
+但如果用户程序创建这个订阅后退出，当它再次启动并重新使用这个`topic`时，
+`restart`就会被用于决定是从头开始读取数据，还是接续上次的位置进行读取。
+本例中，如果`restart`是 **true**（非零值），用户程序肯定会读到所有数据。
+但如果这个订阅之前就存在了，并且已经读取了一部分数据，
+且`restart`是 **false**（**0**），用户程序就不会读到之前已经读取的数据了。
+
+`taos_subscribe`的最后一个参数是以毫秒为单位的轮询周期。
+在同步模式下，如过前后两次调用`taos_consume`的时间间隔小于此时间，
+`taos_consume`会阻塞，直到间隔超过此时间。
+异步模式下，这个时间是两次调用回调函数的最小时间间隔。
+
+`taos_subscribe`的倒数第二个参数用于用户程序向回调函数传递附加参数，
+订阅API不对其做任何处理，只原样传递给回调函数。此参数在同步模式下无意义。
+
+订阅创建以后，就可以消费其数据了，同步模式下，示例代码是下面的 else 部分：
+
+```c
+if (async) {
+　　getchar();
+} else while(1) {
+　　TAOS_RES* res = taos_consume(tsub);
+　　if (res == NULL) {
+　　　　printf("failed to consume data.");
+　　　　break;
+　　} else {
+　　　　print_result(res, blockFetch);
+　　　　getchar();
+　　}
+}
+```
+
+这里是一个 **while** 循环，用户每按一次回车键就调用一次`taos_consume`，
+而`taos_consume`的返回值是查询到的结果集，与`taos_use_result`完全相同，
+例子中使用这个结果集的代码是函数`print_result`：
+
+```c
+void print_result(TAOS_RES* res, int blockFetch) {
+　　TAOS_ROW row = NULL;
+　　int num_fields = taos_num_fields(res);
+　　TAOS_FIELD* fields = taos_fetch_fields(res);
+　　int nRows = 0;
+　　if (blockFetch) {
+　　　　nRows = taos_fetch_block(res, &row);
+　　　　for (int i = 0; i < nRows; i++) {
+　　　　　　char temp[256];
+　　　　　　taos_print_row(temp, row + i, fields, num_fields);
+　　　　　　puts(temp);
+　　　　}
+　　} else {
+　　　　while ((row = taos_fetch_row(res))) {
+　　　　　　char temp[256];
+　　　　　　taos_print_row(temp, row, fields, num_fields);puts(temp);
+　　　　　　nRows++;
+　　　　}
+　　}
+　　printf("%d rows consumed.\n", nRows);
+}
+```
+
+其中的 `taos_print_row` 用于处理订阅到数据，在我们的例子中，它会打印出所有符合条件的记录。
+而异步模式下，消费订阅到的数据则显得更为简单：
+
+```c
+void subscribe_callback(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code) {
+　　print_result(res, *(int*)param);
+}
+```
+
+当要结束一次数据订阅时，需要调用`taos_unsubscribe`：
+
+```c
+taos_unsubscribe(tsub, keep);
+```
+
+其第二个参数，用于决定是否在客户端保留订阅的进度信息。
+如果这个参数是**false**（**0**），那无论下次调用`taos_subscribe`的时的`restart`参数是什么，
+订阅都只能重新开始。
+另外，进度信息的保存位置是 *{DataDir}/subscribe/* 这个目录下，
+每个订阅有一个与其`topic`同名的文件，删掉某个文件，同样会导致下次创建其对应的订阅时只能重新开始。
+
+代码介绍完毕，我们来看一下实际的运行效果。假设：
+
+* 示例代码已经下载到本地
+* TDengine 也已经在同一台机器上安装好
+* 示例所需的数据库、超级表、子表已经全部创建好
+
+则可以在示例代码所在目录执行以下命令来编译并启动示例程序：
+
+```shell
+$ make
+$ ./subscribe -sql='select * from meters where current > 10;'
+```
+
+示例程序启动后，打开另一个终端窗口，启动 TDengine 的 shell 向 **D1001** 插入一条电流为 12A 的数据：
+
+```shell
+$ taos
+> use test;
+> insert into D1001 values(now, 12, 220, 1);
+```
+
+这时，因为电流超过了10A，您应该可以看到示例程序将它输出到了屏幕上。
+您可以继续插入一些数据观察示例程序的输出。
+
+### Java 使用数据订阅功能
+
+订阅功能也提供了 Java 开发接口，相关说明请见 [Java Connector](https://www.taosdata.com/cn/documentation20/connector/)。需要注意的是，目前 Java 接口没有提供异步订阅模式，但用户程序可以通过创建 `TimerTask` 等方式达到同样的效果。
+
+下面以一个示例程序介绍其具体使用方法。它所完成的功能与前面介绍的 C 语言示例基本相同，也是订阅数据库中所有电流超过 10A 的记录。 
+
+#### 准备数据
+
+```sql
+# 创建 power 库
+taos> create database power;
+# 切换库
+taos> use power;
+# 创建超级表
+taos> create table meters(ts timestamp, current float, voltage int, phase int) tags(location binary(64), groupId int);
+# 创建表
+taos> create table d1001 using meters tags ("Beijing.Chaoyang", 2);
+taos> create table d1002 using meters tags ("Beijing.Haidian", 2);
+# 插入测试数据
+taos> insert into d1001 values("2020-08-15 12:00:00.000", 12, 220, 1),("2020-08-15 12:10:00.000", 12.3, 220, 2),("2020-08-15 12:20:00.000", 12.2, 220, 1);
+taos> insert into d1002 values("2020-08-15 12:00:00.000", 9.9, 220, 1),("2020-08-15 12:10:00.000", 10.3, 220, 1),("2020-08-15 12:20:00.000", 11.2, 220, 1);
+# 从超级表 meters 查询电流大于 10A 的记录
+taos> select * from meters where current > 10;
+           ts            |    current   |    voltage   |  phase |         location          |   groupid   |
+===========================================================================================================
+ 2020-08-15 12:10:00.000 |    10.30000  |     220      |      1 |      Beijing.Haidian      |           2 |
+ 2020-08-15 12:20:00.000 |    11.20000  |     220      |      1 |      Beijing.Haidian      |           2 |
+ 2020-08-15 12:00:00.000 |    12.00000  |     220      |      1 |      Beijing.Chaoyang     |           2 |
+ 2020-08-15 12:10:00.000 |    12.30000  |     220      |      2 |      Beijing.Chaoyang     |           2 |
+ 2020-08-15 12:20:00.000 |    12.20000  |     220      |      1 |      Beijing.Chaoyang     |           2 |
+Query OK, 5 row(s) in set (0.004896s)
+```
+
+#### 示例程序
+
+```java
+public class SubscribeDemo {
+    private static final String topic = "topic-meter-current-bg-10";
+    private static final String sql = "select * from meters where current > 10";
+
+    public static void main(String[] args) {
+        Connection connection = null;
+        TSDBSubscribe subscribe = null;
+
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/power?user=root&password=taosdata";
+            connection = DriverManager.getConnection(jdbcUrl, properties);
+            subscribe = ((TSDBConnection) connection).subscribe(topic, sql, true); // 创建订阅
+            int count = 0;
+            while (count < 10) {
+                TimeUnit.SECONDS.sleep(1); // 等待1秒，避免频繁调用 consume，给服务端造成压力
+                TSDBResultSet resultSet = subscribe.consume(); // 消费数据
+                if (resultSet == null) {
+                    continue;
+                }
+                ResultSetMetaData metaData = resultSet.getMetaData();
+                while (resultSet.next()) {
+                    int columnCount = metaData.getColumnCount();
+                    for (int i = 1; i <= columnCount; i++) {
+                        System.out.print(metaData.getColumnLabel(i) + ": " + resultSet.getString(i) + "\t");
+                    }
+                    System.out.println();
+                    count++;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != subscribe)
+                    subscribe.close(true); // 关闭订阅
+                if (connection != null) 
+                    connection.close(); 
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }
+    }
+}
+```
+
+运行示例程序，首先，它会消费符合查询条件的所有历史数据：
+
+```shell
+# java -jar subscribe.jar 
+
+ts: 1597464000000	current: 12.0	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid : 2
+ts: 1597464600000	current: 12.3	voltage: 220	phase: 2	location: Beijing.Chaoyang	groupid : 2
+ts: 1597465200000	current: 12.2	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid : 2
+ts: 1597464600000	current: 10.3	voltage: 220	phase: 1	location: Beijing.Haidian	groupid : 2
+ts: 1597465200000	current: 11.2	voltage: 220	phase: 1	location: Beijing.Haidian	groupid : 2
+```
+
+接着，使用 taos 客户端向表中新增一条数据：
+
+```sql
+# taos
+taos> use power;
+taos> insert into d1001 values("2020-08-15 12:40:00.000", 12.4, 220, 1);
+```
+
+因为这条数据的电流大于10A，示例程序会将其消费：
+
+```shell
+ts: 1597466400000	current: 12.4	voltage: 220	phase: 1	location: Beijing.Chaoyang	groupid: 2
+```
+
+
+## 缓存(Cache)
+
+TDengine采用时间驱动缓存管理策略（First-In-First-Out，FIFO），又称为写驱动的缓存管理机制。这种策略有别于读驱动的数据缓存模式（Least-Recent-Use，LRU），直接将最近写入的数据保存在系统的缓存中。当缓存达到临界值的时候，将最早的数据批量写入磁盘。一般意义上来说，对于物联网数据的使用，用户最为关心最近产生的数据，即当前状态。TDengine充分利用了这一特性，将最近到达的（当前状态）数据保存在缓存中。
+
+TDengine通过查询函数向用户提供毫秒级的数据获取能力。直接将最近到达的数据保存在缓存中，可以更加快速地响应用户针对最近一条或一批数据的查询分析，整体上提供更快的数据库查询响应能力。从这个意义上来说，可通过设置合适的配置参数将TDengine作为数据缓存来使用，而不需要再部署额外的缓存系统，可有效地简化系统架构，降低运维的成本。需要注意的是，TDengine重启以后系统的缓存将被清空，之前缓存的数据均会被批量写入磁盘，缓存的数据将不会像专门的Key-value缓存系统再将之前缓存的数据重新加载到缓存中。
+
+TDengine分配固定大小的内存空间作为缓存空间，缓存空间可根据应用的需求和硬件资源配置。通过适当的设置缓存空间，TDengine可以提供极高性能的写入和查询的支持。TDengine中每个虚拟节点（virtual node）创建时分配独立的缓存池。每个虚拟节点管理自己的缓存池，不同虚拟节点间不共享缓存池。每个虚拟节点内部所属的全部表共享该虚拟节点的缓存池。
+
+TDengine将内存池按块划分进行管理，数据在内存块里按照列式存储。一个vnode的内存池是在vnode创建时按块分配好的，而且每个内存块按照先进先出的原则进行管理。一张表所需要的内存块是从vnode的内存池中进行分配的，块的大小由系统配置参数cache决定。每张表最大内存块的数目由配置参数tblocks决定，每张表平均的内存块的个数由配置参数ablocks决定。因此对于一个vnode, 总的内存大小为: `cache * ablocks * tables`。内存块参数cache不宜过小，一个cache block需要能存储至少几十条以上记录，才会有效率。参数ablocks最小为2，保证每张表平均至少能分配两个内存块。
+
+你可以通过函数last_row快速获取一张表或一张超级表的最后一条记录，这样很便于在大屏显示各设备的实时状态或采集值。例如：
+
+```mysql
+select last_row(voltage) from meters where location='Beijing.Chaoyang';
+```
+
+该SQL语句将获取所有位于北京朝阳区的电表最后记录的电压值。
+
+
+## 报警监测(Alert)
+
+在 TDengine 的应用场景中，报警监测是一个常见需求，从概念上说，它要求程序从最近一段时间的数据中筛选出符合一定条件的数据，并基于这些数据根据定义好的公式计算出一个结果，当这个结果符合某个条件且持续一定时间后，以某种形式通知用户。
+
+为了满足用户对报警监测的需求，TDengine 以独立模块的形式提供了这一功能，有关它的安装使用方法，请参考博客 [使用 TDengine 进行报警监测](https://www.taosdata.com/blog/2020/04/14/1438.html) 。
diff --git a/documentation20/webdocs/markdowndocs/advanced features.md b/documentation20/webdocs/markdowndocs/advanced features.md
new file mode 100644
index 0000000000000000000000000000000000000000..05f6da5ed9e94684e7d39f086d850805eb966b85
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/advanced features.md	
@@ -0,0 +1,80 @@
+#Advanced Features
+
+##Continuous Query
+Continuous Query is a query executed by TDengine periodically with a sliding window, it is a simplified stream computing driven by timers, not by events. Continuous query can be applied to a table or a STable, and the result set can be passed to the application directly via call back function, or written into a new table in TDengine. The query is always executed on a specified time window (window size is specified by parameter interval), and this window slides forward while time flows (the sliding period is specified by parameter sliding).    
+
+Continuous query is defined by TAOS SQL, there is nothing special. One of the best applications is downsampling. Once it is defined, at the end of each cycle, the system will execute the query, pass the result to the application or write it to a database. 
+
+If historical data pints are inserted into the stream, the query won't be re-executed, and the result set won't be updated. If the result set is passed to the application, the application needs to keep the status of continuous query, the server won't maintain it. If application re-starts, it needs to decide the time where the stream computing shall be started.
+
+####How to use continuous query
+
+ 
+
+  - Pass result set to application
+
+    Application shall use API taos_stream (details in connector section) to start the stream computing. Inside the API, the SQL syntax is:
+  
+    ```sql
+    SELECT aggregation FROM [table_name | stable_name] 
+    INTERVAL(window_size) SLIDING(period)
+    ```
+  
+    where the new keyword INTERVAL specifies the window size, and SLIDING specifies the sliding period. If parameter sliding is not specified, the sliding period will be the same as window size. The minimum window size is 10ms. The sliding period shall not be larger than the window size. If you set a value larger than the window size, the system will adjust it to window size automatically.
+  
+    For example:
+  
+    ```sql
+    SELECT COUNT(*) FROM FOO_TABLE 
+    INTERVAL(1M) SLIDING(30S)
+    ```
+  
+    The above SQL statement will count the number of records for the past 1-minute window every 30 seconds.
+  
+  - Save the result into a database
+  
+    If you want to save the result set of stream computing into a new table, the SQL shall be: 
+  
+    ```sql
+    CREATE TABLE table_name AS 
+    SELECT aggregation from [table_name | stable_name]  
+    INTERVAL(window_size) SLIDING(period)
+    ```
+  
+    Also, you can set the time range to execute the continuous query. If no range is specified, the continuous query will be executed forever. For example, the following continuous query will be executed from now and will stop in one hour.
+  
+    ```sql
+    CREATE TABLE QUERY_RES AS 
+    SELECT COUNT(*) FROM FOO_TABLE 
+    WHERE TS > NOW AND TS <= NOW + 1H 
+    INTERVAL(1M) SLIDING(30S) 
+    ```
+
+###Manage the Continuous Query
+
+Inside TDengine shell, you can use the command "show streams" to list the ongoing continuous queries, the command "kill stream" to kill a specific continuous query. 
+
+If you drop a table generated by the continuous query, the query will be removed too.
+
+##Publisher/Subscriber
+
+Time series data is a sequence of data points over time. Inside a table, the data points are stored in order of timestamp. Also, there is a data retention policy, the data points will be removed once their lifetime is passed. From another view, a table in DTengine is just a standard message queue. 
+
+To reduce the development complexity and improve data consistency, TDengine provides the pub/sub functionality. To publish a message, you simply insert a record into a table. Compared with popular messaging tool Kafka, you subscribe to a table or a SQL query statement, instead of a topic. Once new data points arrive, TDengine will notify the application. The process is just like Kafka.  
+
+The detailed API will be introduced in the [connectors](https://www.taosdata.com/en/documentation/advanced-features/) section. 
+
+##Caching
+TDengine allocates a fixed-size buffer in memory, the newly arrived data will be written into the buffer first. Every device or table gets one or more memory blocks. For typical IoT scenarios, the hot data shall always be newly arrived data, they are more important for timely analysis. Based on this observation, TDengine manages the cache blocks in First-In-First-Out strategy. If no enough space in the buffer, the oldest data will be saved into hard disk first, then be overwritten by newly arrived data. TDengine also guarantees every device can keep at least one block of data in the buffer. 
+
+By this design, the application can retrieve the latest data from each device super-fast, since they are all available in memory. You can use last or last_row function to return the last data record. If the super table is used, it can be used to return the last data records of all or a subset of devices. For example, to retrieve the latest temperature from thermometers in located Beijing, execute the following SQL  
+
+```mysql
+select last(*) from thermometers where location=’beijing’
+```
+
+By this design, caching tool, like Redis, is not needed in the system. It will reduce the complexity of the system. 
+
+TDengine creates one or more virtual nodes(vnode) in each data node. Each vnode contains data for multiple tables and has its own buffer. The buffer of a vnode is fully separated from the buffer of another vnode, not shared. But the tables in a vnode share the same buffer.  
+
+System configuration parameter cacheBlockSize configures the cache block size in bytes, and another parameter cacheNumOfBlocks configures the number of cache blocks. The total memory for the buffer of a vnode is $cacheBlockSize \times cacheNumOfBlocks$. Another system parameter numOfBlocksPerMeter configures the maximum number of cache blocks a table can use. When you create a database, you can specify these parameters. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/architecture-ch.md b/documentation20/webdocs/markdowndocs/architecture-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..7dfff1f21faed52487f442ecb79ec5b14b6a569f
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/architecture-ch.md
@@ -0,0 +1,299 @@
+#数据模型和整体架构 
+
+## 数据模型
+### 物联网典型场景
+在典型的物联网、车联网、运维监测场景中，往往有多种不同类型的数据采集设备，采集一个到多个不同的物理量。而同一种采集设备类型，往往又有多个具体的采集设备分布在不同的地点。大数据处理系统就是要将各种采集的数据汇总，然后进行计算和分析。对于同一类设备，其采集的数据都是很规则的。以智能电表为例，假设每个智能电表采集电流、电压、相位三个量，其采集的数据类似如下的表格：
+
+| Device ID |  Time Stamp   | current | voltage | phase |     location     | groupId |
+| :-------: | :-----------: | :-----: | :-----: | :---: | :--------------: | :-----: |
+|   d1001   | 1538548685000 |  10.3   |   219   | 0.31  | Beijing.Chaoyang |    2    |
+|   d1002   | 1538548684000 |  10.2   |   220   | 0.23  | Beijing.Chaoyang |    3    |
+|   d1003   | 1538548686500 |  11.5   |   221   | 0.35  | Beijing.Haidian  |    3    |
+|   d1004   | 1538548685500 |  13.4   |   223   | 0.29  | Beijing.Haidian  |    2    |
+|   d1001   | 1538548695000 |  12.6   |   218   | 0.33  | Beijing.Chaoyang |    2    |
+|   d1004   | 1538548696600 |  11.8   |   221   | 0.28  | Beijing.Haidian  |    2    |
+|   d1002   | 1538548696650 |  10.3   |   218   | 0.25  | Beijing.Chaoyang |    3    |
+|   d1001   | 1538548696800 |  12.3   |   221   | 0.31  | Beijing.Chaoyang |    2    |
+
+<center> 表1：智能电表数据示例</center>
+
+每一条记录都有设备ID，时间戳，采集的物理量(如上图中的电流、电压、相位），还有与每个设备相关的静态标签（如上述表一中的位置Location和分组groupId）。每个设备是受外界的触发，或按照设定的周期采集数据。采集的数据点是时序的，是一个数据流。
+
+### 数据特征 
+除时序特征外，仔细研究发现，物联网、车联网、运维监测类数据还具有很多其他明显的特征：
+
+1. 数据高度结构化；
+2. 数据极少有更新或删除操作；
+3. 无需传统数据库的事务处理；
+4. 相对互联网应用，写多读少；
+5. 流量平稳，根据设备数量和采集频次，可以预测出来；
+6. 用户关注的是一段时间的趋势，而不是某一特定时间点的值；
+7. 数据有保留期限；
+8. 数据的查询分析一定是基于时间段和空间区域；
+9. 除存储、查询操作外，还需要各种统计和实时计算操作；
+10. 数据量巨大，一天可能采集的数据就可以超过100亿条。
+
+充分利用上述特征，TDengine 采取了经特殊优化的存储和计算设计来处理时序数据，它将系统处理能力显著提高，同时大幅降低了系统运维的复杂度。
+
+### 关系型数据库模型
+因为采集的数据一般是结构化数据，同时为降低学习门槛，TDengine采用传统的关系型数据库模型管理数据。因此用户需要先创建库，然后创建表，之后才能插入或查询数据。TDengine采用的是结构化存储，而不是NoSQL的key-value存储。
+
+### 一个数据采集点一张表 
+为充分利用其数据的时序性和其他数据特点，TDengine要求**对每个数据采集点单独建表**（比如有一千万个智能电表，就需创建一千万张表，上述表格中的d1001, d1002, d1003, d1004都需单独建表），用来存储这个采集点所采集的时序数据。这种设计有几大优点：
+
+1. 能保证一个采集点的数据在存储介质上是以块为单位连续存储的。如果读取一个时间段的数据，它能大幅减少随机读取操作，成数量级的提升读取和查询速度。
+2. 由于不同采集设备产生数据的过程完全独立，每个设备的数据源是唯一的，一张表也就只有一个写入者，这样就可采用无锁方式来写，写入速度就能大幅提升。
+3. 对于一个数据采集点而言，其产生的数据是时序的，因此写的操作可用追加的方式实现，进一步大幅提高数据写入速度。
+
+如果采用传统的方式，将多个设备的数据写入一张表，由于网络延时不可控，不同设备的数据到达服务器的时序是无法保证的，写入操作是要有锁保护的，而且一个设备的数据是难以保证连续存储在一起的。**采用一个数据采集点一张表的方式，能最大程度的保证单个数据采集点的插入和查询的性能是最优的。**
+
+TDengine 建议用数据采集点的名字(如上表中的D1001)来做表名。每个数据采集点可能同时采集多个物理量(如上表中的curent, voltage, phase)，每个物理量对应一张表中的一列，数据类型可以是整型、浮点型、字符串等。除此之外，表的第一列必须是时间戳，即数据类型为 timestamp。对采集的数据，TDengine将自动按照时间戳建立索引，但对采集的物理量不建任何索引。数据用列式存储方式保存。
+
+### 超级表：同一类型数据采集点的集合
+由于一个数据采集点一张表，导致表的数量巨增，难以管理，而且应用经常需要做采集点之间的聚合操作，聚合的操作也变得复杂起来。为解决这个问题，TDengine引入超级表(Super Table，简称为STable)的概念。
+
+超级表是指某一特定类型的数据采集点的集合。同一类型的数据采集点，其表的结构是完全一样的，但每个表（数据采集点）的静态属性（标签）是不一样的。描述一个超级表（某一特定类型的数据采集点的结合），除需要定义采集量的表结构之外，还需要定义其标签的schema，标签的数据类型可以是整数、浮点数、字符串，标签可以有多个，可以事后增加、删除或修改。 如果整个系统有N个不同类型的数据采集点，就需要建立N个超级表。
+
+在TDengine的设计里，**表用来代表一个具体的数据采集点，超级表用来代表一组相同类型的数据采集点集合**。当为某个具体数据采集点创建表时，用户使用超级表的定义做模板，同时指定该具体采集点（表）的标签值。与传统的关系型数据库相比，表（一个数据采集点）是带有静态标签的，而且这些标签可以事后增加、删除、修改。**一张超级表包含有多张表，这些表具有相同的时序数据schema，但带有不同的标签值**。
+
+当对多个具有相同数据类型的数据采集点进行聚合操作时，TDengine将先把满足标签过滤条件的表从超级表的中查找出来，然后再扫描这些表的时序数据，进行聚合操作，这样能将需要扫描的数据集大幅减少，从而大幅提高聚合计算的性能。
+
+## 集群与基本逻辑单元
+TDengine 的设计是基于单个硬件、软件系统不可靠，基于任何单台计算机都无法提供足够计算能力和存储能力处理海量数据的假设进行设计的。因此 TDengine 从研发的第一天起，就按照分布式高可靠架构进行设计，是支持水平扩展的，这样任何单台或多台服务器发生硬件故障或软件错误都不影响系统的可用性和可靠性。同时，通过节点虚拟化并辅以自动化负载均衡技术，TDengine 能最高效率地利用异构集群中的计算和存储资源降低硬件投资。
+
+### 主要逻辑单元
+TDengine 分布式架构的逻辑结构图如下：
+<center> <img src="../assets/structure.png"> </center>
+<center> 图 1 TDengine架构示意图  </center>
+一个完整的 TDengine 系统是运行在一到多个物理节点上的，逻辑上，它包含数据节点(dnode)、TDengine客户端(taosc)以及应用(app)。系统中存在一到多个数据节点，这些数据节点组成一个集群(cluster)。应用通过taosc的API与TDengine集群进行互动。下面对每个逻辑单元进行简要介绍。
+
+**物理节点(pnode):** pnode是一独立运行、拥有自己的计算、存储和网络能力的计算机，可以是安装有OS的物理机、虚拟机或容器。物理节点由其配置的 FQDN(Fully Qualified Domain Name)来标识。TDengine完全依赖FQDN来进行网络通讯，如果不了解FQDN，请看博文《[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)》。
+
+**数据节点(dnode):** dnode 是 TDengine 服务器侧执行代码 taosd 在物理节点上的一个运行实例，一个工作的系统必须有至少一个数据节点。dnode包含零到多个逻辑的虚拟节点(VNODE)，零或者至多一个逻辑的管理节点(mnode)。dnode在系统中的唯一标识由实例的End Point (EP )决定。EP是dnode所在物理节点的FQDN (Fully Qualified Domain Name)和系统所配置的网络端口号(Port)的组合。通过配置不同的端口，一个物理节点(一台物理机、虚拟机或容器）可以运行多个实例，或有多个数据节点。
+
+**虚拟节点(vnode)**: 为更好的支持数据分片、负载均衡，防止数据过热或倾斜，数据节点被虚拟化成多个虚拟节点(vnode，图中V2, V3, V4等)。每个 vnode 都是一个相对独立的工作单元，是时序数据存储的基本单元，具有独立的运行线程、内存空间与持久化存储的路径。一个 vnode 包含一定数量的表（数据采集点）。当创建一张新表时，系统会检查是否需要创建新的 vnode。一个数据节点上能创建的 vnode 的数量取决于该数据节点所在物理节点的硬件资源。一个 vnode 只属于一个DB，但一个DB可以有多个 vnode。一个 vnode 除存储的时序数据外，也保存有所包含的表的SCHEMA、标签值等。一个虚拟节点由所属的数据节点的EP，以及所属的VGroup ID在系统内唯一标识，由管理节点创建并管理。
+
+**管理节点(mnode):** 一个虚拟的逻辑单元，负责所有数据节点运行状态的监控和维护，以及节点之间的负载均衡(图中M)。同时，管理节点也负责元数据(包括用户、数据库、表、静态标签等)的存储和管理，因此也称为 Meta Node。TDengine 集群中可配置多个(最多不超过5个) mnode，它们自动构建成为一个虚拟管理节点组(图中M0, M1, M2)。mnode 间采用 master/slave 的机制进行管理，而且采取强一致方式进行数据同步, 任何数据更新操作只能在 Master 上进行。mnode 集群的创建由系统自动完成，无需人工干预。每个dnode上至多有一个mnode，由所属的数据节点的EP来唯一标识。每个dnode通过内部消息交互自动获取整个集群中所有 mnode 所在的 dnode 的EP。
+
+**虚拟节点组(VGroup):** 不同数据节点上的 vnode 可以组成一个虚拟节点组(vnode group)来保证系统的高可靠。虚拟节点组内采取master/slave的方式进行管理。写操作只能在 master vnode 上进行，系统采用异步复制的方式将数据同步到 slave vnode，这样确保了一份数据在多个物理节点上有拷贝。一个 vgroup 里虚拟节点个数就是数据的副本数。如果一个DB的副本数为N，系统必须有至少N个数据节点。副本数在创建DB时通过参数 replica 可以指定，缺省为1。使用 TDengine 的多副本特性，可以不再需要昂贵的磁盘阵列等存储设备，就可以获得同样的数据高可靠性。虚拟节点组由管理节点创建、管理，并且由管理节点分配一个系统唯一的ID，VGroup ID。如果两个虚拟节点的vnode group ID相同，说明他们属于同一个组，数据互为备份。虚拟节点组里虚拟节点的个数是可以动态改变的，容许只有一个，也就是没有数据复制。VGroup ID是永远不变的，即使一个虚拟节点组被删除，它的ID也不会被收回重复利用。
+
+**TAOSC:** taosc是TDengine给应用提供的驱动程序(driver)，负责处理应用与集群的接口交互，内嵌于JDBC、ODBC driver中，或者C、Python、Go语言连接库里。应用都是通过taosc而不是直接连接集群中的数据节点与整个集群进行交互的。这个模块负责获取并缓存元数据；将插入、查询等请求转发到正确的数据节点；在把结果返回给应用时，还需要负责最后一级的聚合、排序、过滤等操作。对于JDBC, ODBC, C/C++接口而言，这个模块是在应用所处的物理节点上运行，但消耗的资源很小。同时，为支持全分布式的RESTful接口，taosc在TDengine集群的每个dnode上都有一运行实例。
+
+### 节点之间的通讯
+**通讯方式：**TDengine系统的各个节点之间的通讯是通过TCP/UDP进行的。因为考虑到物联网场景，数据写入的包一般不大，因此TDengine 除采用TCP做传输之外，还采用UDP方式，因为UDP 更加高效，而且不受连接数的限制。TDengine实现了自己的超时、重传、确认等机制，以确保UDP的可靠传输。对于数据量不到15K的数据包，采取UDP的方式进行传输，超过15K的，或者是查询类的操作，自动采取TCP的方式进行传输。同时，TDengine根据配置和数据包，会自动对数据进行压缩/解压缩，数字签名/认证等处理。对于数据节点之间的数据复制，只采用TCP方式进行数据传输。
+
+**FQDN配置**：一个数据节点有一个或多个FQDN，可以在系统配置文件taos.cfg通过参数“fqdn"进行指定，如果没有指定，系统将自动获取FQDN。如果节点没有配置FQDN，可以直接将该节点的配置参数fqdn设置为它的IP地址。但不建议使用IP，因为IP地址可变，一旦变化，将让集群无法正常工作。一个数据节点的EP(End Point)由FQDN + Port组成。采用FQDN，需要保证DNS服务正常工作，或者在节点以及应用所在的节点配置好hosts文件。
+
+**端口配置：**一个数据节点对外的端口由TDengine的系统配置参数serverPort决定，对集群内部通讯的端口是serverPort+5。集群内数据节点之间的数据复制操作还占有一个TCP端口，是serverPort+10. 为支持多线程高效的处理UDP数据，每个对内和对外的UDP链接，都需要占用5个连续的端口。因此一个数据节点总的端口范围为serverPort到serverPort + 10，总共11个TCP/UDP端口。使用时，需要确保防火墙将这些端口打开。每个数据节点可以配置不同的serverPort。
+
+**集群对外链接:** TDengine集群可以容纳单个、多个甚至几千个数据节点。应用只需要向集群中任何一个数据节点发起连接即可，链接需要提供的网络参数是一数据节点的End Point(FQDN加配置的端口号）。通过命令行CLI启动应用taos时，可以通过选项-h来指定数据节点的FQDN, -P来指定其配置的端口号，如果端口不配置，将采用TDengine的系统配置参数serverPort。
+
+**集群内部通讯**: 各个数据节点之间通过TCP/UDP进行链接。一个数据节点启动时，将获取mnode所在的dnode的EP信息，然后与系统中的mnode建立起链接，交换信息。获取mnode的EP信息有三步，1：检查mnodeEpList文件是否存在，如果不存在或不能正常打开获得mnode EP信息，进入第二步；2：检查系统配置文件taos.cfg, 获取mnode EP配置参数first, second，如果不存在或者taos.cfg里没有这两个配置参数，或无效，进入第三步；3：将自己的EP设为mnode EP, 并独立运行起来。获取mnode EP列表后，数据节点发起链接，如果链接成功，则成功加入进工作的集群，如果不成功，则尝试mnode EP列表中的下一个。如果都尝试了，但链接都仍然失败，则休眠几秒后，再进行尝试。
+
+**MNODE的选择:** TDengine逻辑上有管理节点，但没有单独的执行代码，服务器侧只有一套执行代码taosd。那么哪个数据节点会是管理节点呢？这是系统自动决定的，无需任何人工干预。原则如下：一个数据节点启动时，会检查自己的End Point, 并与获取的mnode EP List进行比对，如果在其中，该数据节点认为自己应该启动mnode模块，成为mnode。如果自己的EP不在mnode EP List里，则不启动mnode模块。在系统的运行过程中，由于负载均衡、宕机等原因，mnode有可能迁移至新的dnode，但一切都是透明的，无需人工干预，配置参数的修改，是mnode自己根据资源做出的决定。
+
+**新数据节点的加入**：系统有了一个数据节点后，就已经成为一个工作的系统。添加新的节点进集群时，有两个步骤，第一步：使用TDengine CLI链接到现有工作的数据节点，然后用命令”create dnode"将新的数据节点的End Point添加进去; 第二步：在新的数据节点的系统配置参数文件taos.cfg里，将first, second参数设置为现有集群中任意两个数据节点的EP即可。具体添加的详细步骤请见详细的用户手册。这样就把集群一步一步的建立起来。
+
+**重定向**：无论是dnode还是taosc，最先都是要发起与mnode的链接，但mnode是系统自动创建并维护的，因此对于用户来说，并不知道哪个dnode在运行mnode。TDengine只要求向系统中任何一个工作的dnode发起链接即可。因为任何一个正在运行的dnode，都维护有目前运行的mnode EP List。当收到一个来自新启动的dnode或taosc的链接请求，如果自己不是mnode，则将mnode EP List回复给对方，taosc或新启动的dnode收到这个list, 就重新尝试建立链接。当mnode EP List发生改变，通过节点之间的消息交互，各个数据节点就很快获取最新列表，并通知taosc。
+
+### 一个典型的消息流程
+为解释vnode, mnode, taosc和应用之间的关系以及各自扮演的角色，下面对写入数据这个典型操作的流程进行剖析。
+<center> <img src="../assets/message.png"> </center>
+<center> 图 2 TDengine典型的操作流程 </center>
+1. 应用通过JDBC、ODBC或其他API接口发起插入数据的请求。
+2. taosc会检查缓存，看是否保存有该表的meta data。如果有，直接到第4步。如果没有，taosc将向mnode发出get meta-data请求。
+3. mnode将该表的meta-data返回给taosc。Meta-data包含有该表的schema, 而且还有该表所属的vgroup信息（vnode ID以及所在的dnode的End Point，如果副本数为N，就有N组End Point)。如果taosc迟迟得不到mnode回应，而且存在多个mnode, taosc将向下一个mnode发出请求。
+4. taosc向master vnode发起插入请求。
+5. vnode插入数据后，给taosc一个应答，表示插入成功。如果taosc迟迟得不到vnode的回应，taosc会认为该节点已经离线。这种情况下，如果被插入的数据库有多个副本，taosc将向vgroup里下一个vnode发出插入请求。
+6. taosc通知APP，写入成功。
+
+对于第二和第三步，taosc启动时，并不知道mnode的End Point，因此会直接向配置的集群对外服务的End Point发起请求。如果接收到该请求的dnode并没有配置mnode，该dnode会在回复的消息中告知mnode EP列表，这样taosc会重新向新的mnode的EP发出获取meta-data的请求。
+
+对于第四和第五步，没有缓存的情况下，taosc无法知道虚拟节点组里谁是master，就假设第一个vnodeID就是master,向它发出请求。如果接收到请求的vnode并不是master,它会在回复中告知谁是master，这样taosc就向建议的master vnode发出请求。一旦得到插入成功的回复，taosc会缓存master节点的信息。
+
+上述是插入数据的流程，查询、计算的流程也完全一致。taosc把这些复杂的流程全部封装屏蔽了，对于应用来说无感知也无需任何特别处理。
+
+通过taosc缓存机制，只有在第一次对一张表操作时，才需要访问mnode,因此mnode不会成为系统瓶颈。但因为schema有可能变化，而且vgroup有可能发生改变（比如负载均衡发生），因此taosc会定时和mnode交互，自动更新缓存。
+
+## 存储模型与数据分区、分片
+
+### 存储模型
+TDengine存储的数据包括采集的时序数据以及库、表相关的元数据、标签数据等，这些数据具体分为三部分：
+
+- 时序数据：存放于vnode里，由data、head和last三个文件组成，数据量大，查询量取决于应用场景。容许乱序写入，但暂时不支持删除和更新操作。通过采用一个采集点一张表的模型，一个时间段的数据是连续存储，对单张表的写入是简单的追加操作，一次读，可以读到多条记录，这样保证对单个采集点的插入和查询操作，性能达到最优。
+- 标签数据：存放于vnode里的meta文件，支持增删改查四个标准操作。数据量不大，有N张表，就有N条记录，因此可以全内存存储。如果标签过滤操作很多，查询将十分频繁，因此TDengine支持多核多线程并发查询。只要计算资源足够，即使有数千万张表，过滤结果能毫秒级返回。
+- 其他元数据：存放于mnode里，包含系统节点、用户、DB、Table Schema等等，支持增删改查四个标准操作。这部分数据的量不大，可以全内存保存，而且由于客户端有缓存，查询量也不大。因此目前的设计虽是集中式存储管理，但不会构成性能瓶颈。
+
+与典型的NoSQL存储模型相比，TDengine将标签数据与时序数据完全分离存储，它具有两大优势：
+
+- 能够极大地降低标签数据存储的冗余度：一般的NoSQL数据库或时序数据库，采用的K-V存储，其中的Key包含时间戳、设备ID、各种标签。每条记录都带有这些重复的内容，浪费存储空间。而且如果应用要在历史数据上增加、修改或删除标签，需要遍历数据，重写一遍，操作成本极其昂贵。
+- 能够实现极为高效的多表之间的聚合查询：做多表之间聚合查询时，先把符合标签过滤条件的表查找出来，然后再查找这些表相应的数据块，这样大幅减少要扫描的数据集，从而大幅提高查询效率。而且标签数据采用全内存的结构进行管理和维护，千万级别规模的标签数据查询可以在毫秒级别返回。
+
+### 数据分片
+对于海量的数据管理，为实现水平扩展，一般都需要采取分片(Sharding)分区(Partitioning)策略。TDengine是通过vnode来实现数据分片的，通过一个时间段一个数据文件来实现时序数据分区的。
+
+vnode(虚拟数据节点)负责为采集的时序数据提供写入、查询和计算功能。为便于负载均衡、数据恢复、支持异构环境，TDengine将一个数据节点根据其计算和存储资源切分为多个vnode。这些vnode的管理是TDengine自动完成的，对应用完全透明。
+
+对于单独一个数据采集点，无论其数据量多大，一个vnode（或vnode group, 如果副本数大于1）有足够的计算资源和存储资源来处理（如果每秒生成一条16字节的记录，一年产生的原始数据不到0.5G），因此TDengine将一张表（一个数据采集点）的所有数据都存放在一个vnode里，而不会让同一个采集点的数据分布到两个或多个dnode上。而且一个vnode可存储多个数据采集点(表）的数据，一个vnode可容纳的表的数目的上限为一百万。设计上，一个vnode里所有的表都属于同一个DB。一个数据节点上，除非特殊配置，一个DB拥有的vnode数目不会超过系统核的数目。
+
+创建DB时，系统并不会马上分配资源。但当创建一张表时，系统将看是否有已经分配的vnode, 且该vnode是否有空余的表空间，如果有，立即在该有空位的vnode创建表。如果没有，系统将从集群中，根据当前的负载情况，在一个dnode上创建一新的vnode, 然后创建表。如果DB有多个副本，系统不是只创建一个vnode，而是一个vgroup(虚拟数据节点组)。系统对vnode的数目没有任何限制，仅仅受限于物理节点本身的计算和存储资源。
+
+每张表的meda data（包含schema, 标签等）也存放于vnode里，而不是集中存放于mnode，实际上这是对Meta数据的分片，这样便于高效并行的进行标签过滤操作。
+
+### 数据分区
+TDengine除vnode分片之外，还对时序数据按照时间段进行分区。每个数据文件只包含一个时间段的时序数据，时间段的长度由DB的配置参数days决定。这种按时间段分区的方法还便于高效实现数据的保留策略，只要数据文件超过规定的天数（系统配置参数keep)，将被自动删除。而且不同的时间段可以存放于不同的路径和存储介质，以便于大数据的冷热管理，实现多级存储。
+
+总的来说，**TDengine是通过vnode以及时间两个维度，对大数据进行切分**，便于并行高效的管理，实现水平扩展。
+
+### 负载均衡
+每个dnode都定时向 mnode(虚拟管理节点)报告其状态（包括硬盘空间、内存大小、CPU、网络、虚拟节点个数等），因此mnode了解整个集群的状态。基于整体状态，当mnode发现某个dnode负载过重，它会将dnode上的一个或多个vnode挪到其他dnode。在挪动过程中，对外服务继续进行，数据插入、查询和计算操作都不受影响。
+
+如果mnode一段时间没有收到dnode的状态报告，mnode会认为这个dnode已经离线。如果离线时间超过一定时长（时长由配置参数offlineThreshold决定），该dnode将被mnode强制剔除出集群。该dnode上的vnodes如果副本数大于一，系统将自动在其他dnode上创建新的副本，以保证数据的副本数。如果该dnode上还有mnode, 而且mnode的副本数大于一，系统也将自动在其他dnode上创建新的mnode, 以保证mnode的副本数。
+
+当新的数据节点被添加进集群，因为新的计算和存储被添加进来，系统也将自动启动负载均衡流程。
+
+负载均衡过程无需任何人工干预，应用也无需重启，将自动连接新的节点，完全透明。
+
+## 数据写入与复制流程
+如果一个数据库有N个副本，那一个虚拟节点组就有N个虚拟节点，但是只有一个是Master，其他都是slave。当应用将新的记录写入系统时，只有Master vnode能接受写的请求。如果slave vnode收到写的请求，系统将通知taosc需要重新定向。
+### Master vnode写入流程
+Master Vnode遵循下面的写入流程：
+<center> <img src="../assets/write_master.png">  </center>
+
+<center> 图 3 TDengine Master写入流程  </center>
+1. Master vnode收到应用的数据插入请求，验证OK，进入下一步；
+2. 如果系统配置参数walLevel大于0，vnode将把该请求的原始数据包写入数据库日志文件WAL。如果walLevel设置为2，而且fsync设置为0，TDengine还将WAL数据立即落盘，以保证即使宕机，也能从数据库日志文件中恢复数据，避免数据的丢失；
+3. 如果有多个副本，vnode将把数据包转发给同一虚拟节点组内slave vnodes, 该转发包带有数据的版本号(version)；
+4. 写入内存，并加记录加入到skip list；
+5. Master vnode返回确认信息给应用，表示写入成功。
+6. 如果第2，3，4步中任何一步失败，将直接返回错误给应用。
+
+### Slave vnode写入流程
+对于slave vnode, 写入流程是：
+<center> <img src="../assets/write_slave.png">  </center>
+
+<center> 图 4 TDengine Slave写入流程  </center>
+1. Slave vnode收到Master vnode转发了的数据插入请求。
+2. 如果系统配置参数walLevel大于0，vnode将把该请求的原始数据包写入数据库日志文件WAL。如果walLevel设置为2，而且fsync设置为0，TDengine还将WAL数据立即落盘，以保证即使宕机，也能从数据库日志文件中恢复数据，避免数据的丢失；
+3. 写入内存，更新内存中的skip list。
+
+与Master vnode相比，slave vnode不存在转发环节，也不存在回复确认环节，少了两步。但写内存与WAL是完全一样的。
+
+### 异地容灾、IDC迁移
+从上述Master和Slave流程可以看出，TDengine采用的是异步复制的方式进行数据同步。这种方式能够大幅提高写入性能，网络延时对写入速度不会有大的影响。通过配置每个物理节点的IDC和机架号，可以保证对于一个虚拟节点组，虚拟节点由来自不同IDC、不同机架的物理节点组成，从而实现异地容灾。因此TDengine原生支持异地容灾，无需再使用其他工具。
+
+另外一方面，TDengine支持动态修改副本数，一旦副本数增加，新加入的虚拟节点将立即进入数据同步流程，同步结束后，新加入的虚拟节点即可提供服务。而在同步过程中，master以及其他已经同步的虚拟节点都可以对外提供服务。利用这一特性，TDengine可以实现无服务中断的IDC机房迁移。只需要将新IDC的物理节点加入现有集群，等数据同步完成后，再将老的IDC的物理节点从集群中剔除即可。
+
+但是，这种异步复制的方式，存在极小的时间窗口，丢失写入的数据。具体场景如下：
+
+1. Master vnode完成了它的5步操作，已经给APP确认写入成功，然后宕机；
+2. Slave vnode收到写入请求后，在第2步写入日志之前，处理失败
+3. Slave vnode将成为新的master, 从而丢失了一条记录
+
+理论上，只要是异步复制，就无法保证100%不丢失。但是这个窗口极小，mater与slave要同时发生故障，而且发生在刚给应用确认写入成功之后。
+
+注：异地容灾、IDC无中断迁移，仅仅企业版支持
+
+### 主从选择
+Vnode会保持一个数据版本号(Version)，对内存数据进行持久化存储时，对该版本号也进行持久化存储。每个数据更新操作，无论是采集的时序数据还是元数据，这个版本号将增一。
+
+一个vnode启动时，角色(master、slave) 是不定的，数据是处于未同步状态，它需要与虚拟节点组内其他节点建立TCP链接，并互相交换status，其中包括version和自己的角色。通过status的交换，系统进入选主流程，规则如下：
+
+1. 如果只有一个副本，该副本永远就是master
+2. 所有副本都在线时，版本最高的被选为master
+3. 在线的虚拟节点数过半，而且有虚拟节点是slave的话，该虚拟节点自动成为master
+4. 对于2和3，如果多个虚拟节点满足成为master的要求，那么虚拟节点组的节点列表里，最前面的选为master
+
+更多的关于数据复制的流程，请见<a href="https://www.taosdata.com/cn/documentation20/replica/">TDengine 2.0数据复制模块设计</a>。
+
+### 同步复制
+对于数据一致性要求更高的场景，异步数据复制无法满足要求，因为有极小的概率丢失数据，因此TDengine提供同步复制的机制供用户选择。在创建数据库时，除指定副本数replica之外，用户还需要指定新的参数quorum。如果quorum大于一，它表示每次Master转发给副本时，需要等待quorum-1个回复确认，才能通知应用，数据在slave已经写入成功。如果在一定的时间内，得不到quorum-1个回复确认，master vnode将返回错误给应用。
+
+采用同步复制，系统的性能会有所下降，而且latency会增加。因为元数据要强一致，mnode之间的数据同步缺省就是采用的同步复制。
+
+注：vnode之间的同步复制仅仅企业版支持
+
+## 缓存与持久化
+### 缓存
+TDengine采用时间驱动缓存管理策略（First-In-First-Out，FIFO），又称为写驱动的缓存管理机制。这种策略有别于读驱动的数据缓存模式（Least-Recent-Used，LRU），直接将最近写入的数据保存在系统的缓存中。当缓存达到临界值的时候，将最早的数据批量写入磁盘。一般意义上来说，对于物联网数据的使用，用户最为关心的是刚产生的数据，即当前状态。TDengine充分利用这一特性，将最近到达的（当前状态）数据保存在缓存中。
+
+TDengine通过查询函数向用户提供毫秒级的数据获取能力。直接将最近到达的数据保存在缓存中，可以更加快速地响应用户针对最近一条或一批数据的查询分析，整体上提供更快的数据库查询响应能力。从这个意义上来说，**可通过设置合适的配置参数将TDengine作为数据缓存来使用，而不需要再部署Redis或其他额外的缓存系统**，可有效地简化系统架构，降低运维的成本。需要注意的是，TDengine重启以后系统的缓存将被清空，之前缓存的数据均会被批量写入磁盘，缓存的数据将不会像专门的Key-value缓存系统再将之前缓存的数据重新加载到缓存中。
+
+每个vnode有自己独立的内存，而且由多个固定大小的内存块组成，不同vnode之间完全隔离。数据写入时，类似于日志的写法，数据被顺序追加写入内存，但每个vnode维护有自己的skip list，便于迅速查找。当一半以上的内存块写满时，启动落盘操作，而且后续写的操作在新的内存块进行。这样，一个vnode里有一半内存块是保留有最近的数据的，以达到缓存、快速查找的目的。一个vnode的内存块的个数由配置参数blocks决定，内存块的大小由配置参数cache决定。
+
+### 持久化存储
+TDengine采用数据驱动的方式让缓存中的数据写入硬盘进行持久化存储。当vnode中缓存的数据达到一定规模时，为了不阻塞后续数据的写入，TDengine也会拉起落盘线程将缓存的数据写入持久化存储。TDengine在数据落盘时会打开新的数据库日志文件，在落盘成功后则会删除老的数据库日志文件，避免日志文件无限制的增长。
+
+为充分利用时序数据特点，TDengine将一个vnode保存在持久化存储的数据切分成多个文件，每个文件只保存固定天数的数据，这个天数由系统配置参数days决定。切分成多个文件后，给定查询的起止日期，无需任何索引，就可以立即定位需要打开哪些数据文件，大大加快读取速度。
+
+对于采集的数据，一般有保留时长，这个时长由系统配置参数keep决定。超过这个设置天数的数据文件，将被系统将自动删除，释放存储空间。
+
+给定days与keep两个参数，一个vnode总的数据文件数为：keep/days。总的数据文件个数不宜过大，也不宜过小。10到100以内合适。基于这个原则，可以设置合理的days。 目前的版本，参数keep可以修改，但对于参数days，一但设置后，不可修改。
+
+在每个数据文件里，一张表的数据是一块一块存储的。一张表可以有一到多个数据文件块。在一个文件块里，数据是列式存储的，占用的是一片连续的存储空间，这样大大提高读取速度。文件块的大小由系统参数maxRows（每块最大记录条数）决定，缺省值为4096。这个值不宜过大，也不宜过小。过大，定位具体时间段的数据的搜索时间会变长，影响读取速度；过小，数据块的索引太大，压缩效率偏低，也影响读取速度。
+
+每个数据文件(.data结尾)都有一个对应的索引文件（.head结尾），该索引文件对每张表都有一数据块的摘要信息，记录了每个数据块在数据文件中的偏移量，数据的起止时间等信息，以帮助系统迅速定位需要查找的数据。每个数据文件还有一对应的last文件(.last结尾)，该文件是为防止落盘时数据块碎片化而设计的。如果一张表落盘的记录条数没有达到系统配置参数minRows（每块最小记录条数），将被先存储到last文件，等下次落盘时，新落盘的记录将与last文件的记录进行合并，再写入数据文件。
+
+数据写入磁盘时，根据系统配置参数comp决定是否压缩数据。TDengine提供了三种压缩选项：无压缩、一阶段压缩和两阶段压缩，分别对应comp值为0、1和2的情况。一阶段压缩根据数据的类型进行了相应的压缩，压缩算法包括delta-delta编码、simple 8B方法、zig-zag编码、LZ4等算法。二阶段压缩在一阶段压缩的基础上又用通用压缩算法进行了压缩，压缩率更高。
+
+### 多级存储
+在默认配置下，TDengine会将所有数据保存在/var/lib/taos目录下，而且每个vnode的数据文件保存在该目录下的不同目录。为扩大存储空间，尽量减少文件读取的瓶颈，提高数据吞吐率 TDengine可通过配置系统参数dataDir让多个挂载的硬盘被系统同时使用。除此之外，TDengine也提供了数据分级存储的功能，即根据数据文件的新老程度存储在不同的存储介质上。比如最新的数据存储在SSD上，超过一周的数据存储在本地硬盘上，超过4周的数据存储在网络存储设备上，这样来降低存储成本，而又保证高效的访问数据。数据在不同存储介质上的移动是由系统自动完成的，对应用是完全透明的。数据的分级存储也是通过系统参数dataDir来配置。
+
+dataDir的配置格式如下：
+```
+dataDir data_path [tier_level]
+```
+其中data_path为挂载点的文件夹路径，tier_level为介质存储等级。介质存储等级越高，盛放数据文件越老。同一存储等级可挂载多个硬盘，同一存储等级上的数据文件分布在该存储等级的所有硬盘上。TDengine最多支持3级存储，所以tier_level的取值为0、1和2。在配置dataDir时，必须存在且只有一个挂载路径不指定tier_level，称之为特殊挂载盘（路径）。该挂载路径默认为0级存储介质，且包含特殊文件链接，不可被移除，否则会对写入的数据产生毁灭性影响。
+
+假设一物理节点有六个可挂载的硬盘/mnt/disk1、/mnt/disk2、…、/mnt/disk6，其中disk1和disk2需要被指定为0级存储介质，disk3和disk4为1级存储介质， disk5和disk6为2级存储介质。disk1为特殊挂载盘，则可在/etc/taos/taos.cfg中做如下配置：
+
+```
+dataDir /mnt/disk1/taos
+dataDir /mnt/disk2/taos 0
+dataDir /mnt/disk3/taos 1
+dataDir /mnt/disk4/taos 1
+dataDir /mnt/disk5/taos 2
+dataDir /mnt/disk6/taos 2
+```
+
+挂载的盘也可以是非本地的网络盘，只要系统能访问即可。
+
+注：多级存储功能仅企业版支持
+
+## 数据查询
+TDengine提供了多种多样针对表和超级表的查询处理功能，除了常规的聚合查询之外，还提供针对时序数据的窗口查询、统计聚合等功能。TDengine的查询处理需要客户端、vnode, mnode节点协同完成。
+
+### 单表查询
+SQL语句的解析和校验工作在客户端完成。解析SQL语句并生成抽象语法树(Abstract Syntax Tree, AST)，然后对其进行校验和检查。以及向管理节点(mnode)请求查询中指定表的元数据信息(table metadata)。
+
+根据元数据信息中的End Point信息，将查询请求序列化后发送到该表所在的数据节点（dnode）。dnode接收到查询请求后，识别出该查询请求指向的虚拟节点（vnode），将消息转发到vnode的查询执行队列。vnode的查询执行线程建立基础的查询执行环境，并立即返回该查询请求，同时开始执行该查询。
+
+客户端在获取查询结果的时候，dnode的查询执行队列中的工作线程会等待vnode执行线程执行完成，才能将查询结果返回到请求的客户端。
+
+### 按时间轴聚合、降采样、插值 
+
+时序数据有别于普通数据的显著特征是每条记录均具有时间戳，因此针对具有时间戳数据在时间轴上进行聚合是不同于普通数据库的重要功能。从这点上来看，与流计算引擎的窗口查询有相似的地方。
+
+在TDengine中引入关键词interval来进行时间轴上固定长度时间窗口的切分，并按照时间窗口对数据进行聚合，对窗口范围内的数据按需进行聚合。例如：
+```mysql
+select count(*) from d1001 interval(1h);
+```
+
+针对d1001设备采集的数据，按照1小时的时间窗口返回每小时存储的记录数量。
+
+在需要连续获得查询结果的应用场景下，如果给定的时间区间存在数据缺失，会导致该区间数据结果也丢失。TDengine提供策略针对时间轴聚合计算的结果进行插值，通过使用关键词Fill就能够对时间轴聚合结果进行插值。例如：
+```mysql
+select count(*) from d1001 interval(1h) fill(prev);
+```
+
+针对d1001设备采集数据统计每小时记录数，如果某一个小时不存在数据，这返回之前一个小时的统计数据。TDengine提供前向插值(prev)、线性插值(linear)、NULL值填充(NULL)、特定值填充(value)。
+
+### 多表聚合查询
+多表聚合查询与单表查询的整体流程相同，但是存在如下的差异：
+
+- 由于多表可能分布在不同的节点(dnode)，因此多表的聚合查询需要首先获得表所在的全部数据节点的信息，并且同时向相关的dnode发出查询请求。
+- 每个vnode的计算获得的中间结果(partial results)需要进行第二阶段的聚合才能形成最终结果，第二阶段的聚合过程在客户端完成。
+- 由于表标签信息存储在vnode中，因此针对标签信息的查询也需要vnode完成。客户端将标签的过滤表达式封装在查询请求结构体中发送给vnode，由vnode的查询执行线程从中抽取出标签查询条件，然后执行查询。标签查询与过滤是在针对表的查询之前完成。标签查询完成以后，将符合条件的表纳入到接下来的查询处理流程中。
+
+### 预计算
+为有效提升查询处理的性能，针对物联网数据的不可更改的特点，在数据块头部记录该数据块中存储数据的统计信息：包括最大值、最小值、和。我们称之为预计算单元。如果查询处理涉及整个数据块的全部数据，直接使用预计算结果，完全不需要读取数据块的内容。由于预计算数据量远小于磁盘上存储的数据块数据的大小，对于磁盘IO为瓶颈的查询处理，使用预计算结果可以极大地减小读取IO压力，加速查询处理的流程。预计算机制与Postgre SQL的索引BRIN（block range index）有异曲同工之妙。
diff --git a/documentation20/webdocs/markdowndocs/architecture.md b/documentation20/webdocs/markdowndocs/architecture.md
new file mode 100644
index 0000000000000000000000000000000000000000..3a91f1e8dc24314f66acf906e69d3dcd0df8e370
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/architecture.md
@@ -0,0 +1,101 @@
+# Data Model and Architecture
+## Data Model
+
+### A Typical IoT Scenario 
+
+In a typical IoT scenario, there are many types of devices. Each device is collecting one or multiple metrics. For a specific type of device, the collected data looks like the table below: 
+
+| Device ID |  Time Stamp   | Value 1 | Value 2 | Value 3 | Tag 1 | Tag 2 |
+| :-------: | :-----------: | :-----: | :-----: | :-----: | :---: | :---: |
+|   D1001   | 1538548685000 |  10.3   |   219   |  0.31   |  Red  | Tesla |
+|   D1002   | 1538548684000 |  10.2   |   220   |  0.23   | Blue  |  BMW  |
+|   D1003   | 1538548686500 |  11.5   |   221   |  0.35   | Black | Honda |
+|   D1004   | 1538548685500 |  13.4   |   223   |  0.29   |  Red  | Volvo |
+|   D1001   | 1538548695000 |  12.6   |   218   |  0.33   |  Red  | Tesla |
+|   D1004   | 1538548696600 |  11.8   |   221   |  0.28   | Black | Honda |
+
+Each data record has device ID, timestamp, the collected metrics, and static tags associated with the device. Each device generates a data record in a pre-defined timer or triggered by an event. It is a sequence of data points, like a stream. 
+
+### Data Characteristics
+
+Being a series of data points over time, data points generated by devices, sensors, servers, or applications have strong common characteristics. 
+
+1. metric is always structured data; 
+2. there are rarely delete/update operations on collected data; 
+3. there is only one single data source for one device or sensor; 
+4. ratio of read/write is much lower than typical Internet application; 
+5. the user pays attention to the trend of data, not the specific value at a specific time; 
+6. there is always a data retention policy; 
+7. the data query is always executed in a given time range and a subset of devices; 
+8. real-time aggregation or analytics is mandatory; 
+9. traffic is predictable based on the number of devices and sampling frequency; 
+10. data volume is huge, a system may generate 10 billion data points in a day.    
+
+By utilizing the above characteristics, TDengine designs the storage and computing engine in a special and optimized way for time-series data. The system efficiency is improved significantly.    
+
+### Relational Database Model 
+
+Since time-series data is more likely to be structured data, TDengine adopts the traditional relational database model to process them. You need to create a database, create tables with schema definition, then insert data points and execute queries to explore the data. Standard SQL is used, there is no learning curve. 
+
+### One Table for One Device
+
+Due to different network latency, the data points from different devices may arrive at the server out of order. But for the same device, data points will arrive at the server in order if system is designed well. To utilize this special feature, TDengine requires the user to create a table for each device (time-stream). For example, if there are over 10,000 smart meters, 10,000 tables shall be created. For the table above, 4 tables shall be created for device D1001, D1002, D1003 and D1004, to store the data collected. 
+
+This strong requirement can guarantee the data points from a device can be saved in a continuous memory/hard disk space block by block. If queries are applied only on one device in a time range, this design will reduce the read latency significantly since a whole block is owned by one single device. Also, write latency can be significantly reduced too, since the data points generated by the same device will arrive in order, the new data point will be simply appended to a block. Cache block size and the rows of records in a file block can be configured to fit the scenarios.
+
+### Best Practices
+
+**Table**: TDengine suggests to use device ID as the table name (like D1001 in the above diagram). Each device may collect one or more metrics (like value1, valu2, valu3 in the diagram). Each metric has a column in the table, the metric name can be used as the column name. The data type for a column can be int, float, double, tinyint, bigint, bool or binary. Sometimes, a device may have multiple metric group, each group have different sampling period, you shall create a table for each group for each device. The first column in the table must be time stamp. TDengine uses time stamp as the index, and won’t build the index on any metrics stored.
+
+**Tags:** to support aggregation over multiple tables efficiently, [STable(Super Table)](../super-table) concept is introduced by TDengine. A STable is used to represent the same type of device. The schema is used to define the collected metrics(like value1, value2, value3 in the diagram), and tags are used to define the static attributes for each table or device(like tag1, tag2 in the diagram). A table is created via STable with a specific tag value. All or a subset of tables in a STable can be aggregated by filtering tag values.  
+
+**Database:** different types of devices may generate data points in different patterns and shall be processed differently. For example, sampling frequency, data retention policy, replication number, cache size, record size, the compression algorithm may be different. To make the system more efficient, TDengine suggests creating a different database with unique configurations for different scenarios 
+
+**Schemaless vs Schema:** compared with NoSQL database, since a table with schema definition shall be created before the data points can be inserted, flexibilities are not that good, especially when the schema is changed. But in most IoT scenarios, the schema is well defined and is rarely changed, the loss of flexibilities won’t be a big pain to developers or the administrator. TDengine allows the application to change the schema in a second even there is a huge amount of historical data when schema has to be changed. 
+
+TDengine does not impose a limitation on the number of tables, [STables](../super-table), or databases. You can create any number of STable or databases to fit the scenarios.   
+
+## Architecture
+
+There are two main modules in TDengine server as shown in Picture 1: **Management Module (MGMT)** and **Data Module(DNODE)**. The whole TDengine architecture also includes a **TDengine Client Module**.
+
+<center> <img src="../assets/structure.png"> </center>
+<center> Picture 1 TDengine Architecture  </center>
+### MGMT Module
+The MGMT module deals with the storage and querying on metadata, which includes information about users, databases, and tables. Applications will connect to the MGMT module at first when connecting the TDengine server. When creating/dropping databases/tables, The request is sent to the MGMT module at first to create/delete metadata. Then the MGMT module will send requests to the data module to allocate/free resources required. In the case of writing or querying, applications still need to visit MGMT module to get meta data, according to which, then access the DNODE module.
+
+### DNODE Module
+The DNODE module is responsible for storing and querying data. For the sake of future scaling and high-efficient resource usage, TDengine applies virtualization on resources it uses. TDengine introduces the concept of virtual node (vnode), which is the unit of storage, resource allocation and data replication (enterprise edition). As is shown in Picture 2, TDengine treats each data node as an aggregation of vnodes. 
+
+When a DB is created, the system will allocate a vnode. Each vnode contains multiple tables, but a table belongs to only one vnode. Each DB has one or mode vnodes, but one vnode belongs to only one DB. Each vnode contains all the data in a set of tables. Vnodes have their own cache, directory to store data. Resources between different vnodes are exclusive with each other, no matter cache or file directory. However, resources in the same vnode are shared between all the tables in it. By virtualization, TDengine can distribute resources reasonably to each vnode and improve resource usage and concurrency. The number of vnodes on a dnode is configurable according to its hardware resources.
+
+<center> <img src="../assets/vnode.png">  </center>
+<center> Picture 2 TDengine Virtualization  </center> 
+
+### Client Module
+TDengine client module accepts requests (mainly in SQL form) from applications and converts the requests to internal representations and sends to the server side. TDengine supports multiple interfaces, which are all built on top of TDengine client module. 
+
+For the communication between client and MGMT module, TCP/UDP is used, the port is set by the parameter mgmtShellPort in system configuration file taos.cfg, default is 6030. For the communication between client and DNODE module, TCP/UDP is used, the port is set by the parameter vnodeShellPort in the system configuration file, default is 6035. 
+
+## Writing Process
+Picture 3 shows the full writing process of TDengine. TDengine uses [Writing Ahead Log] (WAL) strategy to assure data security and integrity. Data received from the client is written to the commit log at first. When TDengine recovers from crashes caused by power lose or other situations, the commit log is used to recover data. After writting to commit log, data will be wrtten to the corresponding vnode cache, then an acknowledgment is sent to the application. There are two mechanisms that can flush data in cache to disk for persistent storage:
+
+1. **Flush driven by timer**: There is a backend timer which flushes data in cache periodically to disks. The period is configurable via parameter commitTime in system configuration file taos.cfg.
+2. **Flush driven by data**: Data in the cache is also flushed to disks when the left buffer size is below a threshold. Flush driven by data can reset the timer of flush driven by the timer.
+
+<center> <img src="../assets/write_process.png">  </center>
+<center> Picture 3 TDengine Writting Process  </center>
+
+New commit log file will be opened when the committing process begins. When the committing process finishes, the old commit file will be removed.
+
+## Data Storage
+
+TDengine data are saved in _/var/lib/taos_ directory by default. It can be changed to other directories by setting the parameter dataDir in system configuration file taos.cfg.
+
+TDengine's metadata includes the database, table, user, super table and tag information. To reduce the latency, metadata are all buffered in the cache.
+
+Data records saved in tables are sharded according to the time range. Data of tables in the same vnode in a certain time range are saved in the same file group. This sharding strategy can effectively improve data searching speed. By default, one group of files contain data in 10 days, which can be configured by *daysPerFile* in the configuration file or by *DAYS* keyword in *CREATE DATABASE* clause. 
+
+Data records are removed automatically once their lifetime is passed. The lifetime is configurable via parameter daysToKeep in the system configuration file. The default value is 3650 days. 
+
+Data in files are blockwise. A data block only contains one table's data. Records in the same data block are sorted according to the primary timestamp. To improve the compression ratio, records are stored column by column, and the different compression algorithm is applied based on each column's data type. 
\ No newline at end of file
diff --git a/documentation20/webdocs/markdowndocs/cluster-ch.md b/documentation20/webdocs/markdowndocs/cluster-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..13b773b3e302185009a07d4aa20db620ef702631
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/cluster-ch.md
@@ -0,0 +1,218 @@
+# TDengine 集群安装、管理
+
+多个TDengine服务器，也就是多个taosd的运行实例可以组成一个集群，以保证TDengine的高可靠运行，并提供水平扩展能力。要了解TDengine 2.0的集群管理，需要对集群的基本概念有所了解，请看TDengine 2.0整体架构一章。而且在安装集群之前，先请按照[《立即开始》](https://www.taosdata.com/cn/getting-started20/)一章安装并体验单节点功能。
+
+集群的每个数据节点是由End Point来唯一标识的，End Point是由FQDN(Fully Qualified Domain Name)外加Port组成，比如 h1.taosdata.com:6030。一般FQDN就是服务器的hostname，可通过Linux命令`hostname -f`获取（如何配置FQDN，请参考：[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)）。端口是这个数据节点对外服务的端口号，缺省是6030，但可以通过taos.cfg里配置参数serverPort进行修改。一个物理节点可能配置了多个hostname, TDengine会自动获取第一个，但也可以通过taos.cfg里配置参数fqdn进行指定。如果习惯IP地址直接访问，可以将参数fqdn设置为本节点的IP地址。
+
+TDengine的集群管理极其简单，除添加和删除节点需要人工干预之外，其他全部是自动完成，最大程度的降低了运维的工作量。本章对集群管理的操作做详细的描述。
+
+## 准备工作
+
+**第零步**：如果没有部署DNS服务，请规划集群所有物理节点的FQDN，然后按照《[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)》里的步骤，将所有集群物理节点的IP与FQDN的对应关系添加好。
+
+**第一步**：如果搭建集群的物理节点中，存有之前的测试数据、装过1.X的版本，或者装过其他版本的TDengine，请先将其删除，并清空所有数据，具体步骤请参考博客[《TDengine多种安装包的安装和卸载》](https://www.taosdata.com/blog/2019/08/09/566.html ) 
+**注意1：**因为FQDN的信息会写进文件，如果之前没有配置或者更改FQDN，且启动了TDengine。请一定在确保数据无用或者备份的前提下，清理一下之前的数据（rm -rf /var/lib/taos/）；
+**注意2：**客户端也需要配置，确保它可以正确解析每个节点的FQDN配置，不管是通过DNS服务，还是 Host 文件。
+
+**第二步**：建议关闭所有物理节点的防火墙，至少保证端口：6030 - 6042的TCP和UDP端口都是开放的。**强烈建议**先关闭防火墙，集群搭建完毕之后，再来配置端口；
+
+**第三步**：在所有节点安装TDengine，且版本必须是一致的，**但不要启动taosd**。安装时，提示输入是否要加入一个已经存在的TDengine集群时，第一个物理节点直接回车创建新集群，后续物理节点则输入该集群任何一个在线的物理节点的FQDN:端口号(默认6030)；
+
+**第四步**：检查所有数据节点，以及应用所在物理节点的网络设置：
+
+1. 每个物理节点上执行命令`hostname -f`，查看和确认所有节点的hostname是不相同的(应用驱动所在节点无需做此项检查)；
+2. 每个物理节点上执行`ping host`, 其中host是其他物理节点的hostname, 看能否ping通其它物理节点; 如果不能ping通，需要检查网络设置, 或/etc/hosts文件(Windows系统默认路径为C:\Windows\system32\drivers\etc\hosts)，或DNS的配置。如果无法ping通，是无法组成集群的；
+3. 从应用运行的物理节点，ping taosd运行的数据节点，如果无法ping通，应用是无法连接taosd的，请检查应用所在物理节点的DNS设置或hosts文件；
+4. 每个数据节点的End Point就是输出的hostname外加端口号，比如h1.taosdata.com:6030
+
+**第五步**：修改TDengine的配置文件（所有节点的文件/etc/taos/taos.cfg都需要修改）。假设准备启动的第一个数据节点End Point为 h1.taosdata.com:6030, 其与集群配置相关参数如下：
+
+```
+// firstEp 是每个数据节点首次启动后连接的第一个数据节点
+firstEp               h1.taosdata.com:6030
+
+// 必须配置为本数据节点的FQDN，如果本机只有一个hostname, 可注释掉本配置
+fqdn                  h1.taosdata.com  
+
+// 配置本数据节点的端口号，缺省是6030
+serverPort            6030
+
+// 服务端节点数为偶数的时候，需要配置，请参考《Arbitrator的使用》的部分
+arbitrator            ha.taosdata.com:6042
+```
+
+一定要修改的参数是firstEp和fqdn。在每个数据节点，firstEp需全部配置成一样，**但fqdn一定要配置成其所在数据节点的值**。其他参数可不做任何修改，除非你很清楚为什么要修改。
+
+**加入到集群中的数据节点dnode，涉及集群相关的下表11项参数必须完全相同，否则不能成功加入到集群中。**
+
+| **#** | **配置参数名称**   | **含义**                                 |
+| ----- | ------------------ | ---------------------------------------- |
+| 1     | numOfMnodes        | 系统中管理节点个数                       |
+| 2     | mnodeEqualVnodeNum | 一个mnode等同于vnode消耗的个数           |
+| 3     | offlineThreshold   | dnode离线阈值，超过该时间将导致Dnode离线 |
+| 4     | statusInterval     | dnode向mnode报告状态时长                 |
+| 5     | arbitrator         | 系统中裁决器的end point                  |
+| 6     | timezone           | 时区                                     |
+| 7     | locale             | 系统区位信息及编码格式                   |
+| 8     | charset            | 字符集编码                               |
+| 9     | balance            | 是否启动负载均衡                         |
+| 10    | maxTablesPerVnode  | 每个vnode中能够创建的最大表个数          |
+| 11    | maxVgroupsPerDb    | 每个DB中 能够使用的最大vnode个数         |
+
+ 
+
+## 启动第一个数据节点
+
+按照[《立即开始》](https://www.taosdata.com/cn/getting-started20/)里的指示，启动第一个数据节点，例如h1.taosdata.com，然后执行taos, 启动taos shell，从shell里执行命令"show dnodes;"，如下所示：
+
+   ```
+Welcome to the TDengine shell from Linux, Client Version:2.0.0.0
+Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.
+
+taos> show dnodes;
+ id |       end_point    | vnodes | cores | status | role |      create_time        |
+=====================================================================================
+  1 |  h1.taos.com:6030  |      0 |     2 |  ready |  any | 2020-07-31 03:49:29.202 |
+Query OK, 1 row(s) in set (0.006385s)
+
+taos>
+   ```
+
+上述命令里，可以看到这个刚启动的这个数据节点的End Point是：h1.taos.com:6030，就是这个新集群的firstEP。
+
+## 启动后续数据节点
+
+将后续的数据节点添加到现有集群，具体有以下几步：
+
+1. 按照["立即开始“](https://www.taosdata.com/cn/getting-started/)一章的方法在每个物理节点启动taosd；
+
+2. 在第一个数据节点，使用CLI程序taos, 登录进TDengine系统, 执行命令:
+
+   ```
+   CREATE DNODE "h2.taos.com:6030"; 
+   ```
+
+   将新数据节点的End Point (准备工作中第四步获知的) 添加进集群的EP列表。**"fqdn:port"需要用双引号引起来**，否则出错。请注意将示例的“h2.taos.com:6030" 替换为这个新数据节点的End Point。
+
+3. 然后执行命令
+
+   ```
+   SHOW DNODES;
+   ```
+
+   查看新节点是否被成功加入。如果该被加入的数据节点处于离线状态，请做两个检查
+
+   - 查看该数据节点的taosd是否正常工作，如果没有正常运行，需要先检查为什么
+   - 查看该数据节点taosd日志文件taosdlog.0里前面几行日志(一般在/var/log/taos目录)，看日志里输出的该数据节点fqdn以及端口号是否为刚添加的End Point。如果不一致，需要将正确的End Point添加进去。
+
+按照上述步骤可以源源不断的将新的数据节点加入到集群。
+
+**提示：**
+
+- 任何已经加入集群在线的数据节点，都可以作为后续待加入节点的firstEP。
+- firstEp这个参数仅仅在该数据节点首次加入集群时有作用，加入集群后，该数据节点会保存最新的mnode的End Point列表，不再依赖这个参数。
+- 两个没有配置firstEp参数的数据节点dnode启动后，会独立运行起来。这个时候，无法将其中一个数据节点加入到另外一个数据节点，形成集群。**无法将两个独立的集群合并成为新的集群**。
+
+## 数据节点管理
+
+上面已经介绍如何从零开始搭建集群。集群组建完后，还可以随时添加新的数据节点进行扩容，或删除数据节点，并检查集群当前状态。
+
+### 添加数据节点
+
+执行CLI程序taos, 使用root账号登录进系统, 执行:
+
+```
+CREATE DNODE "fqdn:port"; 
+```
+
+将新数据节点的End Point添加进集群的EP列表。**"fqdn:port"需要用双引号引起来**，否则出错。一个数据节点对外服务的fqdn和port可以通过配置文件taos.cfg进行配置，缺省是自动获取。【强烈不建议用自动获取方式来配置FQDN，可能导致生成的数据节点的End Point不是所期望的】
+
+### 删除数据节点
+
+执行CLI程序taos, 使用root账号登录进TDengine系统，执行：
+
+```
+DROP DNODE "fqdn:port";
+```
+
+其中fqdn是被删除的节点的FQDN，port是其对外服务器的端口号
+
+### 查看数据节点
+
+执行CLI程序taos,使用root账号登录进TDengine系统，执行：
+
+```
+SHOW DNODES;
+```
+
+它将列出集群中所有的dnode,每个dnode的fqdn:port, 状态(ready, offline等），vnode数目，还未使用的vnode数目等信息。在添加或删除一个数据节点后，可以使用该命令查看。
+
+### 查看虚拟节点组
+
+为充分利用多核技术，并提供scalability，数据需要分片处理。因此TDengine会将一个DB的数据切分成多份，存放在多个vnode里。这些vnode可能分布在多个数据节点dnode里，这样就实现了水平扩展。一个vnode仅仅属于一个DB，但一个DB可以有多个vnode。vnode的是mnode根据当前系统资源的情况，自动进行分配的，无需任何人工干预。
+
+执行CLI程序taos,使用root账号登录进TDengine系统，执行：
+
+```
+SHOW VGROUPS;
+```
+
+## vnode的高可用性
+
+TDengine通过多副本的机制来提供系统的高可用性，包括vnode和mnode的高可用性。
+
+vnode的副本数是与DB关联的，一个集群里可以有多个DB，根据运营的需求，每个DB可以配置不同的副本数。创建数据库时，通过参数replica 指定副本数（缺省为1）。如果副本数为1，系统的可靠性无法保证，只要数据所在的节点宕机，就将无法提供服务。集群的节点数必须大于等于副本数，否则创建表时将返回错误“more dnodes are needed"。比如下面的命令将创建副本数为3的数据库demo：
+
+```
+CREATE DATABASE demo replica 3;
+```
+
+一个DB里的数据会被切片分到多个vnode group，vnode group里的vnode数目就是DB的副本数，同一个vnode group里各vnode的数据是完全一致的。为保证高可用性，vnode group里的vnode一定要分布在不同的数据节点dnode里（实际部署时，需要在不同的物理机上），只要一个vgroup里超过半数的vnode处于工作状态，这个vgroup就能正常的对外服务。
+
+一个数据节点dnode里可能有多个DB的数据，因此一个dnode离线时，可能会影响到多个DB。如果一个vnode group里的一半或一半以上的vnode不工作，那么该vnode group就无法对外服务，无法插入或读取数据，这样会影响到它所属的DB的一部分表的读写操作。
+
+因为vnode的引入，无法简单的给出结论：“集群中过半数据节点dnode工作，集群就应该工作”。但是对于简单的情形，很好下结论。比如副本数为3，只有三个dnode，那如果仅有一个节点不工作，整个集群还是可以正常工作的，但如果有两个数据节点不工作，那整个集群就无法正常工作了。
+
+## Mnode的高可用性
+
+TDengine集群是由mnode (taosd的一个模块，管理节点) 负责管理的，为保证mnode的高可用，可以配置多个mnode副本，副本数由系统配置参数numOfMnodes决定，有效范围为1-3。为保证元数据的强一致性，mnode副本之间是通过同步的方式进行数据复制的。
+
+一个集群有多个数据节点dnode, 但一个dnode至多运行一个mnode实例。多个dnode情况下，哪个dnode可以作为mnode呢？这是完全由系统根据整个系统资源情况，自动指定的。用户可通过CLI程序taos，在TDengine的console里，执行如下命令：
+
+```
+SHOW MNODES;
+```
+
+来查看mnode列表，该列表将列出mnode所处的dnode的End Point和角色(master, slave, unsynced 或offline)。
+当集群中第一个数据节点启动时，该数据节点一定会运行一个mnode实例，否则该数据节点dnode无法正常工作，因为一个系统是必须有至少一个mnode的。如果numOfMnodes配置为2，启动第二个dnode时，该dnode也将运行一个mnode实例。
+
+为保证mnode服务的高可用性，numOfMnodes必须设置为2或更大。因为mnode保存的元数据必须是强一致的，如果numOfMnodes大于2，复制参数quorum自动设为2，也就是说，至少要保证有两个副本写入数据成功，才通知客户端应用写入成功。
+
+**注意：**一个TDengine高可用系统，无论是vnode还是mnode, 都必须配置多个副本。
+
+## 负载均衡
+
+有三种情况，将触发负载均衡，而且都无需人工干预。
+
+- 当一个新数据节点添加进集群时，系统将自动触发负载均衡，一些节点上的数据将被自动转移到新数据节点上，无需任何人工干预。
+- 当一个数据节点从集群中移除时，系统将自动把该数据节点上的数据转移到其他数据节点，无需任何人工干预。
+- 如果一个数据节点过热（数据量过大），系统将自动进行负载均衡，将该数据节点的一些vnode自动挪到其他节点。
+
+当上述三种情况发生时，系统将启动一各个数据节点的负载计算，从而决定如何挪动。
+
+**【提示】负载均衡由参数balance控制，它决定是否启动自动负载均衡。**
+
+## 数据节点离线处理
+
+如果一个数据节点离线，TDengine集群将自动检测到。有如下两种情况：
+
+- 该数据节点离线超过一定时间（taos.cfg里配置参数offlineThreshold控制时长)，系统将自动把该数据节点删除，产生系统报警信息，触发负载均衡流程。如果该被删除的数据节点重现上线时，它将无法加入集群，需要系统管理员重新将其添加进集群才会开始工作。
+- 离线后，在offlineThreshold的时长内重新上线，系统将自动启动数据恢复流程，等数据完全恢复后，该节点将开始正常工作。
+
+**注意：**如果一个虚拟节点组（包括mnode组）里所归属的每个数据节点都处于离线或unsynced状态，必须等该虚拟节点组里的所有数据节点都上线、都能交换状态信息后，才能选出Master，该虚拟节点组才能对外提供服务。比如整个集群有3个数据节点，副本数为3，如果3个数据节点都宕机，然后2个数据节点重启，是无法工作的，只有等3个数据节点都重启成功，才能对外服务。
+
+## Arbitrator的使用
+
+如果副本数为偶数，当一个vnode group里一半或超过一半的vnode不工作时，是无法从中选出master的。同理，一半或超过一半的mnode不工作时，是无法选出mnode的master的，因为存在“split brain”问题。为解决这个问题，TDengine引入了arbitrator的概念。Arbitrator模拟一个vnode或mnode在工作，但只简单的负责网络连接，不处理任何数据插入或访问。只要包含arbitrator在内，超过半数的vnode或mnode工作，那么该vnode group或mnode组就可以正常的提供数据插入或查询服务。比如对于副本数为2的情形，如果一个节点A离线，但另外一个节点B正常，而且能连接到arbitrator, 那么节点B就能正常工作。
+
+TDengine安装包里带有一个执行程序tarbitrator, 找任何一台Linux服务器运行它即可。该程序对系统资源几乎没有要求，只需要保证有网络连接即可。该应用的命令行参数`-p`可以指定其对外服务的端口号，缺省是6042。配置每个taosd实例时，可以在配置文件taos.cfg里将参数arbitrator设置为arbitrator的End Point。如果该参数配置了，当副本数为偶数数，系统将自动连接配置的arbitrator。
diff --git a/documentation20/webdocs/markdowndocs/cluster.md b/documentation20/webdocs/markdowndocs/cluster.md
new file mode 100644
index 0000000000000000000000000000000000000000..f5fa6af48c9bb0a4062c9de74ee3555561ac26ba
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/cluster.md
@@ -0,0 +1,142 @@
+#集群安装、管理
+
+多个taosd的运行实例可以组成一个集群，以保证TDengine的高可靠运行，并提供水平扩展能力。要了解TDengine 2.0的集群管理，需要对集群的基本概念有所了解，请看TDengine 2.0整体架构一章。
+
+集群的每个节点是由End Point来唯一标识的，End Point是由FQDN(Fully Qualified Domain Name)外加Port组成，比如 h1.taosdata.com:6030。一般FQDN就是服务器的hostname，可通过Linux命令“hostname"获取。端口是这个节点对外服务的端口号，缺省是6030，但可以通过taos.cfg里配置参数serverPort进行修改。
+
+TDengine的集群管理极其简单，除添加和删除节点需要人工干预之外，其他全部是自动完成，最大程度的降低了运维的工作量。本章对集群管理的操作做详细的描述。
+
+##安装、创建第一个节点
+
+集群是由一个一个dnode组成的，是从一个dnode的创建开始的。创建第一个节点很简单，就按照["立即开始“](https://www.taosdata.com/cn/getting-started/)一章的方法进行安装、启动即可。
+
+启动后，请执行taos, 启动taos shell，从shell里执行命令"show dnodes;"，如下所示：
+   ```
+Welcome to the TDengine shell from Linux, Client Version:2.0.0.0
+Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.
+
+taos> show dnodes;
+ id |       end_point    | vnodes | cores | status | role |      create_time        |
+=====================================================================================
+  1 |  h1.taos.com:6030  |      0 |     2 |  ready |  any | 2020-07-31 03:49:29.202 |
+Query OK, 1 row(s) in set (0.006385s)
+
+taos>
+   ```
+上述命令里，可以看到这个刚启动的这个节点的End Point是：h1.taos.com:6030
+
+## 安装、创建后续节点
+
+将新的节点添加到现有集群，具体有以下几步：
+
+1. 按照["立即开始“](https://www.taosdata.com/cn/getting-started/)一章的方法进行安装，但不要启动taosd
+
+2. 如果是使用涛思数据的官方安装包进行安装，在安装结束时，会询问集群的End Port, 输入第一个节点的End Point即可。如果是源码安装，请编辑配置文件taos.cfg(缺省是在/etc/taos/目录)，增加一行：
+
+   ```
+   firstEp  h1.taos.com:6030
+   ```
+
+   请注意将示例的“h1.taos.com:6030" 替换为你自己第一个节点的End Point
+   
+3. 按照["立即开始“](https://www.taosdata.com/cn/getting-started/)一章的方法启动taosd
+
+4. 在Linux shell里执行命令"hostname"找出本机的FQDN, 假设为h2.taos.com。如果无法找到，可以查看taosd日志文件taosdlog.0里前面几行日志(一般在/var/log/taos目录)，fqdn以及port都会打印出来。
+
+5. 在第一个节点，使用CLI程序taos, 登录进TDengine系统, 使用命令:
+
+   ```
+   CREATE DNODE "h2.taos.com:6030"; 
+   ```
+
+   将新节点的End Point添加进集群的EP列表。**"fqdn:port"需要用双引号引起来**，否则出错。请注意将示例的“h2.taos.com:6030" 替换为你自己第一个节点的End Point
+
+6. 使用命令
+
+   ```
+   SHOW DNODES;
+   ```
+
+   查看新节点是否被成功加入。
+
+按照上述步骤可以源源不断的将新的节点加入到集群。
+
+**提示：**
+
+- firstEp, secondEp这两个参数仅仅在该节点第一次加入集群时有作用，加入集群后，该节点会保存最新的mnode的End Point列表，不再依赖这两个参数。
+- 两个没有配置first, second参数的dnode启动后，会独立运行起来。这个时候，无法将其中一个节点加入到另外一个节点，形成集群。**无法将两个独立的集群合并成为新的集群**。
+
+##节点管理
+
+###添加节点
+执行CLI程序taos, 使用root账号登录进系统, 执行:
+```
+CREATE DNODE "fqdn:port"; 
+```
+将新节点的End Point添加进集群的EP列表。**"fqdn:port"需要用双引号引起来**，否则出错。一个节点对外服务的fqdn和port可以通过配置文件taos.cfg进行配置，缺省是自动获取。
+
+###删除节点
+执行CLI程序taos, 使用root账号登录进TDengine系统，执行：
+```
+DROP DNODE "fqdn:port";
+```
+其中fqdn是被删除的节点的FQDN，port是其对外服务器的端口号
+
+###查看节点
+执行CLI程序taos,使用root账号登录进TDengine系统，执行：
+```
+SHOW DNODES;
+```
+它将列出集群中所有的dnode,每个dnode的fqdn:port, 状态(ready, offline等），vnode数目，还未使用的vnode数目等信息。在添加或删除一个节点后，可以使用该命令查看。
+
+###查看虚拟节点组
+
+为充分利用多核技术，并提供scalability，数据需要分片处理。因此TDengine会将一个DB的数据切分成多份，存放在多个vnode里。这些vnode可能分布在多个dnode里，这样就实现了水平扩展。一个vnode仅仅属于一个DB，但一个DB可以有多个vnode。vnode的是mnode根据当前系统资源的情况，自动进行分配的，无需任何人工干预。
+
+执行CLI程序taos,使用root账号登录进TDengine系统，执行：
+```
+SHOW VGROUPS;
+```
+##高可用性
+TDengine通过多副本的机制来提供系统的高可用性。副本数是与DB关联的，一个集群里可以有多个DB，根据运营的需求，每个DB可以配置不同的副本数。创建数据库时，通过参数replica 指定副本数（缺省为1）。如果副本数为1，系统的可靠性无法保证，只要数据所在的节点宕机，就将无法提供服务。集群的节点数必须大于等于副本数，否则创建表时将返回错误“more dnodes are needed"。比如下面的命令将创建副本数为3的数据库demo：
+```
+CREATE DATABASE demo replica 3;
+```
+一个DB里的数据会被切片分到多个vnode group，vnode group里的vnode数目就是DB的副本数，同一个vnode group里各vnode的数据是完全一致的。为保证高可用性，vnode group里的vnode一定要分布在不同的dnode里（实际部署时，需要在不同的物理机上），只要一个vgroup里超过半数的vnode处于工作状态，这个vgroup就能正常的对外服务。
+
+一个dnode里可能有多个DB的数据，因此一个dnode离线时，可能会影响到多个DB。如果一个vnode group里的一半或一半以上的vnode不工作，那么该vnode group就无法对外服务，无法插入或读取数据，这样会影响到它所属的DB的一部分表的d读写操作。
+
+因为vnode的引入，无法简单的给出结论：“集群中过半dnode工作，集群就应该工作”。但是对于简单的情形，很好下结论。比如副本数为3，只有三个dnode，那如果仅有一个节点不工作，整个集群还是可以正常工作的，但如果有两个节点不工作，那整个集群就无法正常工作了。
+
+##Mnode的高可用
+TDengine集群是由mnode (taosd的一个模块，逻辑节点) 负责管理的，为保证mnode的高可用，可以配置多个mnode副本，副本数由系统配置参数numOfMnodes决定，有效范围为1-3。为保证元数据的强一致性，mnode副本之间是通过同步的方式进行数据复制的。
+
+一个集群有多个dnode, 但一个dnode至多运行一个mnode实例。多个dnode情况下，哪个dnode可以作为mnode呢？这是完全由系统根据整个系统资源情况，自动指定的。用户可通过CLI程序taos，在TDengine的console里，执行如下命令：
+```
+SHOW MNODES;
+```
+来查看mnode列表，该列表将列出mnode所处的dnode的End Point和角色(master, slave, unsynced 或offline)。
+当集群中第一个节点启动时，该节点一定会运行一个mnode实例，否则该dnode无法正常工作，因为一个系统是必须有至少一个mnode的。如果numOfMnodes配置为2，启动第二个dnode时，该dnode也将运行一个mnode实例。
+
+为保证mnode服务的高可用性，numOfMnodes必须设置为2或更大。因为mnode保存的元数据必须是强一致的，如果numOfMnodes大于2，复制参数quorum自动设为2，也就是说，至少要保证有两个副本写入数据成功，才通知客户端应用写入成功。
+
+##负载均衡
+
+有三种情况，将触发负载均衡，而且都无需人工干预。
+
+- 当一个新节点添加进集群时，系统将自动触发负载均衡，一些节点上的数据将被自动转移到新节点上，无需任何人工干预。
+- 当一个节点从集群中移除时，系统将自动把该节点上的数据转移到其他节点，无需任何人工干预。
+- 如果一个节点过热（数据量过大），系统将自动进行负载均衡，将该节点的一些vnode自动挪到其他节点。
+
+当上述三种情况发生时，系统将启动一各个节点的负载计算，从而决定如何挪动。
+
+##节点离线处理
+如果一个节点离线，TDengine集群将自动检测到。有如下两种情况：
+- 改节点离线超过一定时间（taos.cfg里配置参数offlineThreshold控制时长)，系统将自动把该节点删除，产生系统报警信息，触发负载均衡流程。如果该被删除的节点重现上线时，它将无法加入集群，需要系统管理员重新将其添加进集群才会开始工作。
+- 离线后，在offlineThreshold的时长内重新上线，系统将自动启动数据恢复流程，等数据完全恢复后，该节点将开始正常工作。
+
+##Arbitrator的使用
+
+如果副本数为偶数，当一个vnode group里一半vnode不工作时，是无法从中选出master的。同理，一半mnode不工作时，是无法选出mnode的master的，因为存在“split brain”问题。为解决这个问题，TDengine引入了arbitrator的概念。Arbitrator模拟一个vnode或mnode在工作，但只简单的负责网络连接，不处理任何数据插入或访问。只要包含arbitrator在内，超过半数的vnode或mnode工作，那么该vnode group或mnode组就可以正常的提供数据插入或查询服务。比如对于副本数为2的情形，如果一个节点A离线，但另外一个节点B正常，而且能连接到arbitrator, 那么节点B就能正常工作。
+
+TDengine安装包里带有一个执行程序tarbitrator, 找任何一台Linux服务器运行它即可。该程序对系统资源几乎没有要求，只需要保证有网络连接即可。该应用的命令行参数`-p`可以指定其对外服务的端口号，缺省是6030。配置每个taosd实例时，可以在配置文件taos.cfg里将参数arbitrator设置为arbitrator的End Point。如果该参数配置了，当副本数为偶数数，系统将自动连接配置的arbitrator。
diff --git a/documentation20/webdocs/markdowndocs/connector-ch.md b/documentation20/webdocs/markdowndocs/connector-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..7b6afb75a7ad75d6b94b519cc1e1b438ecbf3b6f
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/connector-ch.md
@@ -0,0 +1,786 @@
+# 连接器
+
+TDengine提供了丰富的应用程序开发接口，其中包括C/C++、JAVA、Python、RESTful、Go等，便于用户快速开发应用。
+
+注意：所有执行 SQL 语句的 API，例如 C/C++ Connector 中的 `tao_query`、`taos_query_a`、`taos_subscribe` 等，以及其它语言中与它们对应的API，每次都只能执行一条 SQL 语句，如果实际参数中包含了多条语句，它们的行为是未定义的。
+
+## C/C++ Connector
+
+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的返回值是整数时，_0_ 代表成功，其它是代表失败原因的错误码，当返回值是指针时， _NULL_ 表示失败。
+
+
+### 基础API
+
+基础API用于完成创建数据库连接等工作，为其它API的执行提供运行时环境。
+
+- `void taos_init()`
+
+  初始化运行环境。如果应用没有主动调用该API，那么应用在调用`taos_connect`时将自动调用，故应用程序一般无需手动调用该API。 
+
+
+- `void taos_cleanup()`
+
+  清理运行环境，应用退出前应调用此API。
+
+
+- `int taos_options(TSDB_OPTION option, const void * arg, ...)`
+
+   设置客户端选项，目前只支持时区设置（_TSDB_OPTION_TIMEZONE_）和编码设置（_TSDB_OPTION_LOCALE_）。时区和编码默认为操作系统当前设置。 
+
+
+- `char *taos_get_client_info()`
+
+  获取客户端版本信息。
+
+
+- `TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, int port)`
+
+  创建数据库连接，初始化连接上下文。其中需要用户提供的参数包含：
+
+    - ip：TDengine管理主节点的IP地址
+    - user：用户名
+    - pass：密码
+    - db：数据库名字，如果用户没有提供，也可以正常连接，用户可以通过该连接创建新的数据库，如果用户提供了数据库名字，则说明该数据库用户已经创建好，缺省使用该数据库
+    - port：端口号
+  
+  返回值为空表示失败。应用程序需要保存返回的参数，以便后续API调用。
+
+
+- `char *taos_get_server_info(TAOS *taos)`
+
+  获取服务端版本信息。
+
+
+- `int taos_select_db(TAOS *taos, const char *db)`
+
+  将当前的缺省数据库设置为`db`。
+
+
+- `void taos_close(TAOS *taos)`
+
+  关闭连接, 其中`taos`是`taos_connect`函数返回的指针。
+
+
+
+### 同步查询API
+
+传统的数据库操作API，都属于同步操作。应用调用API后，一直处于阻塞状态，直到服务器返回结果。TDengine支持如下API：
+
+- `TAOS_RES* taos_query(TAOS *taos, const char *sql)`
+
+  该API用来执行SQL语句，可以是DQL、DML或DDL语句。 其中的`taos`参数是通过`taos_connect`获得的指针。返回值 NULL 表示失败。
+
+
+- `int taos_result_precision(TAOS_RES *res)`
+
+  返回结果集时间戳字段的精度，`0` 代表毫秒，`1` 代表微秒，`2` 代表纳秒。
+
+
+- `TAOS_ROW taos_fetch_row(TAOS_RES *res)`
+
+  按行获取查询结果集中的数据。
+
+
+- `int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)`
+
+  批量获取查询结果集中的数据，返回值为获取到的数据的行数。
+
+
+- `int taos_num_fields(TAOS_RES *res)` 和 `int taos_field_count(TAOS_RES *res)`
+
+  这两个API等价，用于获取查询结果集中的列数。
+
+
+- `int* taos_fetch_lengths(TAOS_RES *res)`
+
+  获取结果集中每个字段的长度。 返回值是一个数组，其长度为结果集的列数。
+
+
+- `int taos_affected_rows(TAOS_RES *res)`
+
+  获取被所执行的 SQL 语句影响的行数。
+
+
+- `TAOS_FIELD *taos_fetch_fields(TAOS_RES *res)`
+
+  获取查询结果集每列数据的属性（数据类型、名字、字节数），与taos_num_fileds配合使用，可用来解析`taos_fetch_row`返回的一个元组(一行)的数据。 `TAOS_FIELD` 的结构如下：
+
+  ```c
+  typedef struct taosField {
+    char     name[65];  // 列名
+    uint8_t  type;      // 数据类型
+    int16_t  bytes;     // 字节数
+  } TAOS_FIELD;
+  ```
+
+
+- `void taos_stop_query(TAOS_RES *res)`
+
+  停止一个查询的执行。
+
+
+- `void taos_free_result(TAOS_RES *res)`
+
+  释放查询结果集以及相关的资源。查询完成后，务必调用该API释放资源，否则可能导致应用内存泄露。
+
+
+- `char *taos_errstr(TAOS_RES *res)`
+
+  获取最近一次API调用失败的原因,返回值为字符串。
+
+
+- `char *taos_errno(TAOS_RES *res)`
+
+  获取最近一次API调用失败的原因，返回值为错误代码。
+
+
+**注意**：对于单个数据库连接，在同一时刻只能有一个线程使用该链接调用API，否则会有未定义的行为出现并可能导致客户端crash。客户端应用可以通过建立多个连接进行多线程的数据写入或查询处理。
+
+
+### 异步查询API
+
+同步API之外，TDengine还提供性能更高的异步调用API处理数据插入、查询操作。在软硬件环境相同的情况下，异步API处理数据插入的速度比同步API快2~4倍。异步API采用非阻塞式的调用方式，在系统真正完成某个具体数据库操作前，立即返回。调用的线程可以去处理其他工作，从而可以提升整个应用的性能。异步API在网络延迟严重的情况下，优点尤为突出。
+
+异步API都需要应用提供相应的回调函数，回调函数参数设置如下：前两个参数都是一致的，第三个参数依不同的API而定。第一个参数param是应用调用异步API时提供给系统的，用于回调时，应用能够找回具体操作的上下文，依具体实现而定。第二个参数是SQL操作的结果集，如果为空，比如insert操作，表示没有记录返回，如果不为空，比如select操作，表示有记录返回。
+
+异步API对于使用者的要求相对较高，用户可根据具体应用场景选择性使用。下面是三个重要的异步API： 
+
+- `void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);`
+
+  异步执行SQL语句。
+  
+    * taos：调用taos_connect返回的数据库连接
+    * sql：需要执行的SQL语句
+    * fp：用户定义的回调函数，其第三个参数`code`用于指示操作是否成功，`0`表示成功，负数表示失败(调用`taos_errstr`获取失败原因)。应用在定义回调函数的时候，主要处理第二个参数`TAOS_RES *`，该参数是查询返回的结果集
+    * param：应用提供一个用于回调的参数
+
+- `void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);`
+
+  批量获取异步查询的结果集，只能与`taos_query_a`配合使用。其中：
+  
+    * res：`taos_query_a`回调时返回的结果集
+    * fp：回调函数。其参数`param`是用户可定义的传递给回调函数的参数结构体；`numOfRows`是获取到的数据的行数（不是整个查询结果集的函数）。 在回调函数中，应用可以通过调用`taos_fetch_row`前向迭代获取批量记录中每一行记录。读完一块内的所有记录后，应用需要在回调函数中继续调用`taos_fetch_rows_a`获取下一批记录进行处理，直到返回的记录数（numOfRows）为零（结果返回完成）或记录数为负值（查询出错）。
+
+
+- `void taos_fetch_row_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), void *param);`
+
+  异步获取一条记录。其中：
+
+    * res：`taos_query_a`回调时返回的结果集
+    * fp：回调函数。其参数`param`是应用提供的一个用于回调的参数。回调时，第三个参数`row`指向一行记录。不同于`taos_fetch_rows_a`，应用无需调用`taos_fetch_row`来获取一行数据，更加简单，但数据提取性能不及批量获取的API。
+
+TDengine的异步API均采用非阻塞调用模式。应用程序可以用多线程同时打开多张表，并可以同时对每张打开的表进行查询或者插入操作。需要指出的是，**客户端应用必须确保对同一张表的操作完全串行化**，即对同一个表的插入或查询操作未完成时（未返回时），不能够执行第二个插入或查询操作。
+
+
+### 参数绑定API
+
+除了直接调用 `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)`
+
+  执行完毕，释放所有资源。
+
+
+### 连续查询接口
+
+TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时间段，对一张或多张数据库的表(数据流)进行各种实时聚合计算操作。操作简单，仅有打开、关闭流的API。具体如下： 
+
+- `TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row), int64_t stime, void *param, void (*callback)(void *))`
+
+  该API用来创建数据流，其中：
+    * taos：已经建立好的数据库连接
+    * sql：SQL查询语句（仅能使用查询语句）
+    * fp：用户定义的回调函数指针，每次流式计算完成后，TDengine将查询的结果（TAOS_ROW）、查询状态（TAOS_RES）、用户定义参数（PARAM）传递给回调函数，在回调函数内，用户可以使用taos_num_fields获取结果集列数，taos_fetch_fields获取结果集每列数据的类型。
+    * stime：是流式计算开始的时间，如果是0，表示从现在开始，如果不为零，表示从指定的时间开始计算（UTC时间从1970/1/1算起的毫秒数）
+    * param：是应用提供的用于回调的一个参数，回调时，提供给应用
+    * callback: 第二个回调函数，会在连续查询自动停止时被调用。
+  
+  返回值为NULL，表示创建成功，返回值不为空，表示成功。
+
+
+- `void taos_close_stream (TAOS_STREAM *tstr)`
+
+  关闭数据流，其中提供的参数是taos_open_stream的返回值。用户停止流式计算的时候，务必关闭该数据流。
+  
+
+### 数据订阅接口
+
+订阅API目前支持订阅一张或多张表，并通过定期轮询的方式不断获取写入表中的最新数据。 
+
+* `TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)`
+
+  该函数负责启动订阅服务，成功时返回订阅对象，失败时返回 `NULL`，其参数为：
+    * taos：已经建立好的数据库连接
+    * restart：如果订阅已经存在，是重新开始，还是继续之前的订阅
+    * topic：订阅的主题（即名称），此参数是订阅的唯一标识
+    * sql：订阅的查询语句，此语句只能是 `select` 语句，只应查询原始数据，只能按时间正序查询数据
+    * fp：收到查询结果时的回调函数（稍后介绍函数原型），只在异步调用时使用，同步调用时此参数应该传 `NULL`
+    * param：调用回调函数时的附加参数，系统API将其原样传递到回调函数，不进行任何处理
+    * interval：轮询周期，单位为毫秒。异步调用时，将根据此参数周期性的调用回调函数，为避免对系统性能造成影响，不建议将此参数设置的过小；同步调用时，如两次调用`taos_consume`的间隔小于此周期，API将会阻塞，直到时间间隔超过此周期。
+
+* `typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code)`
+
+  异步模式下，回调函数的原型，其参数为：
+    * tsub：订阅对象
+    * res：查询结果集，注意结果集中可能没有记录
+    * param：调用 `taos_subscribe`时客户程序提供的附加参数
+    * code：错误码
+
+
+* `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
+
+  同步模式下，该函数用来获取订阅的结果。 用户应用程序将其置于一个循环之中。 如两次调用`taos_consume`的间隔小于订阅的轮询周期，API将会阻塞，直到时间间隔超过此周期。 如果数据库有新记录到达，该API将返回该最新的记录，否则返回一个没有记录的空结果集。 如果返回值为 `NULL`，说明系统出错。 异步模式下，用户程序不应调用此API。
+
+* `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
+
+  取消订阅。 如参数 `keepProgress` 不为0，API会保留订阅的进度信息，后续调用 `taos_subscribe` 时可以基于此进度继续；否则将删除进度信息，后续只能重新开始读取数据。
+
+
+## Python Connector
+
+### 安装准备
+* 已安装TDengine, 如果客户端在Windows上，需要安装Windows 版本的TDengine客户端 [（Windows TDengine 客户端安装）][4]
+* 已安装python 2.7 or >= 3.4
+* 已安装pip
+
+### Python客户端安装
+
+#### Linux
+
+用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到python2和python3的connector安装包。用户可以通过pip命令安装： 
+
+​		`pip install src/connector/python/linux/python2/`
+
+或
+
+​		`pip install src/connector/python/linux/python3/`
+
+#### Windows
+在已安装Windows TDengine 客户端的情况下， 将文件"C:\TDengine\driver\taos.dll" 拷贝到 "C:\windows\system32" 目录下, 然后进入Windwos <em>cmd</em> 命令行界面
+```cmd
+cd C:\TDengine\connector\python\windows
+pip install python2\
+```
+或
+```cmd
+cd C:\TDengine\connector\python\windows
+pip install python3\
+```
+
+*如果机器上没有pip命令，用户可将src/connector/python/python3或src/connector/python/python2下的taos文件夹拷贝到应用程序的目录使用。
+对于windows 客户端，安装TDengine windows 客户端后，将C:\TDengine\driver\taos.dll拷贝到C:\windows\system32目录下即可。
+
+### 使用
+
+#### 代码示例
+
+* 导入TDengine客户端模块
+
+```python
+import taos 
+```
+* 获取连接并获取游标对象
+```python
+conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
+c1 = conn.cursor()
+```
+*<em>host</em> 是TDengine 服务端所有IP, <em>config</em> 为客户端配置文件所在目录
+
+* 写入数据
+```python
+import datetime
+ 
+# 创建数据库
+c1.execute('create database db')
+c1.execute('use db')
+# 建表
+c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
+# 插入数据
+start_time = datetime.datetime(2019, 11, 1)
+affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
+# 批量插入数据
+time_interval = datetime.timedelta(seconds=60)
+sqlcmd = ['insert into tb values']
+for irow in range(1,11):
+  start_time += time_interval
+  sqlcmd.append('(\'%s\', %d, %f)' %(start_time, irow, irow*1.2))
+affected_rows = c1.execute(' '.join(sqlcmd))
+```
+
+* 查询数据
+```python
+c1.execute('select * from tb')
+# 拉取查询结果
+data = c1.fetchall()
+# 返回的结果是一个列表，每一行构成列表的一个元素
+numOfRows = c1.rowcount
+numOfCols = len(c1.description)
+for irow in range(numOfRows):
+  print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1],data[irow][2]))
+  
+# 直接使用cursor 循环拉取查询结果
+c1.execute('select * from tb')
+for data in c1:
+  print("ts=%s, temperature=%d, humidity=%f" %(data[0], data[1],data[2]))
+```
+
+* 创建订阅
+```python
+# 创建一个主题为 'test' 消费周期为1000毫秒的订阅
+# 第一个参数为 True 表示重新开始订阅，如为 False 且之前创建过主题为 'test' 的订阅，则表示继续消费此订阅的数据，而不是重新开始消费所有数据
+sub = conn.subscribe(True, "test", "select * from tb;", 1000)
+```
+
+* 消费订阅的数据
+```python
+data = sub.consume()
+for d in data:
+    print(d)
+```
+
+* 取消订阅
+```python
+sub.close()
+```
+
+
+* 关闭连接
+```python
+c1.close()
+conn.close()
+```
+#### 帮助信息
+
+用户可通过python的帮助信息直接查看模块的使用信息，或者参考tests/examples/python中的示例程序。以下为部分常用类和方法：
+
+- _TDengineConnection_类
+
+  参考python中help(taos.TDengineConnection)。
+  这个类对应客户端和TDengine建立的一个连接。在客户端多线程的场景下，这个连接实例可以是每个线程申请一个，也可以多线程共享一个连接。
+
+- _TDengineCursor_类
+
+  参考python中help(taos.TDengineCursor)。
+  这个类对应客户端进行的写入、查询操作。在客户端多线程的场景下，这个游标实例必须保持线程独享，不能夸线程共享使用，否则会导致返回结果出现错误。
+
+- _connect_方法
+
+  用于生成taos.TDengineConnection的实例。
+
+
+### Python客户端使用示例代码
+在tests/examples/python中，我们提供了一个示例Python程序read_example.py，可以参考这个程序来设计用户自己的写入、查询程序。在安装了对应的客户端后，通过import taos引入taos类。主要步骤如下
+
+- 通过taos.connect获取TDengineConnection对象，这个对象可以一个程序只申请一个，在多线程中共享。
+- 通过TDengineConnection对象的 .cursor()方法获取一个新的游标对象，这个游标对象必须保证每个线程独享。
+- 通过游标对象的execute()方法，执行写入或查询的SQL语句
+- 如果执行的是写入语句，execute返回的是成功写入的行数信息affected rows
+- 如果执行的是查询语句，则execute执行成功后，需要通过fetchall方法去拉取结果集。
+具体方法可以参考示例代码。
+
+## RESTful Connector
+
+为支持各种不同类型平台的开发，TDengine提供符合REST设计标准的API，即RESTful API。为最大程度降低学习成本，不同于其他数据库RESTful API的设计方法，TDengine直接通过HTTP POST 请求BODY中包含的SQL语句来操作数据库，仅需要一个URL。 
+
+### HTTP请求格式 
+
+```
+http://<ip>:<PORT>/rest/sql
+```
+
+参数说明：
+
+- IP: 集群中的任一台主机
+- PORT: 配置文件中httpPort配置项，缺省为6041
+
+例如：http://192.168.0.1:6041/rest/sql 是指向IP地址为192.168.0.1的URL. 
+
+HTTP请求的Header里需带有身份认证信息，TDengine支持Basic认证与自定义认证两种机制，后续版本将提供标准安全的数字签名机制来做身份验证。
+
+- 自定义身份认证信息如下所示（<token>稍后介绍）
+
+```
+Authorization: Taosd <TOKEN>
+```
+
+- Basic身份认证信息如下所示
+
+```
+Authorization: Basic <TOKEN>
+```
+
+HTTP请求的BODY里就是一个完整的SQL语句，SQL语句中的数据表应提供数据库前缀，例如\<db-name>.\<tb-name>。如果表名不带数据库前缀，系统会返回错误。因为HTTP模块只是一个简单的转发，没有当前DB的概念。 
+
+使用curl通过自定义身份认证方式来发起一个HTTP Request，语法如下：
+
+```
+curl -H 'Authorization: Basic <TOKEN>' -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+或者
+
+```
+curl -u username:password -d '<SQL>' <ip>:<PORT>/rest/sql
+```
+
+其中，`TOKEN`为`{username}:{password}`经过Base64编码之后的字符串，例如`root:taosdata`编码后为`cm9vdDp0YW9zZGF0YQ==`
+
+### HTTP返回格式
+
+返回值为JSON格式，如下:
+
+```
+{
+    "status": "succ",
+    "head": ["Time Stamp","current", …],
+    "data": [
+        ["2018-10-03 14:38:05.000", 10.3, …],
+        ["2018-10-03 14:38:15.000", 12.6, …]
+    ],
+    "rows": 2
+} 
+```
+
+说明：
+
+- status: 告知操作结果是成功还是失败
+- head: 表的定义，如果不返回结果集，仅有一列“affected_rows”
+- data: 具体返回的数据，一排一排的呈现，如果不返回结果集，仅[[affected_rows]]
+- rows: 表明总共多少行数据
+
+### 自定义授权码
+
+HTTP请求中需要带有授权码`<TOKEN>`，用于身份识别。授权码通常由管理员提供，可简单的通过发送`HTTP GET`请求来获取授权码，操作如下：
+
+```
+curl http://<ip>:6041/rest/login/<username>/<password>
+```
+
+其中，`ip`是TDengine数据库的IP地址，`username`为数据库用户名，`password`为数据库密码，返回值为`JSON`格式，各字段含义如下：
+
+- status：请求结果的标志位
+
+- code：返回值代码
+
+- desc: 授权码
+
+获取授权码示例：
+
+```
+curl http://192.168.0.1:6041/rest/login/root/taosdata
+```
+
+返回值：
+
+```
+{
+  "status": "succ",
+  "code": 0,
+  "desc": "/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"
+}
+```
+
+### 使用示例
+
+- 在demo库里查询表d1001的所有记录： 
+
+```
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sql
+```
+返回值：
+
+```
+{
+    "status": "succ",
+    "head": ["Time Stamp","current","voltage","phase"],
+    "data": [
+        ["2018-10-03 14:38:05.000",10.3,219,0.31],
+        ["2018-10-03 14:38:15.000",12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+- 创建库demo：
+
+```
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'create database demo' 192.168.0.1:6041/rest/sql
+```
+
+返回值：
+```
+{
+    "status": "succ",
+    "head": ["affected_rows"],
+    "data": [[1]],
+    "rows": 1,
+}
+```
+
+### 其他用法
+
+#### 结果集采用Unix时间戳
+
+HTTP请求URL采用`sqlt`时，返回结果集的时间戳将采用Unix时间戳格式表示，例如
+
+```
+curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.d1001' 192.168.0.1:6041/rest/sqlt
+```
+
+返回值：
+
+```
+{
+    "status": "succ",
+    "head": ["column1","column2","column3"],
+    "data": [
+        [1538548685000,10.3,219,0.31],
+        [1538548695000,12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+#### 结果集采用UTC时间字符串
+
+HTTP请求URL采用`sqlutc`时，返回结果集的时间戳将采用UTC时间字符串表示，例如
+```
+  curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from demo.t1' 192.168.0.1:6041/rest/sqlutc
+```
+
+返回值：
+
+```
+{
+    "status": "succ",
+    "head": ["column1","column2","column3"],
+    "data": [
+        ["2018-10-03T14:38:05.000+0800",10.3,219,0.31],
+        ["2018-10-03T14:38:15.000+0800",12.6,218,0.33]
+    ],
+    "rows": 2
+}
+```
+
+### 重要配置项
+
+下面仅列出一些与RESTFul接口有关的配置参数，其他系统参数请看配置文件里的说明。注意：配置修改后，需要重启taosd服务才能生效
+
+- httpPort: 对外提供RESTFul服务的端口号，默认绑定到6041
+- httpMaxThreads: 启动的线程数量，默认为2
+- restfulRowLimit: 返回结果集（JSON格式）的最大条数，默认值为10240
+- httpEnableCompress: 是否支持压缩，默认不支持，目前TDengine仅支持gzip压缩格式
+- httpDebugFlag: 日志开关，131：仅错误和报警信息，135：调试信息，143：非常详细的调试信息，默认131
+
+
+## Go Connector
+
+TDengine提供了GO驱动程序`taosSql`. `taosSql`实现了GO语言的内置接口`database/sql/driver`。用户只需按如下方式引入包就可以在应用程序中访问TDengine, 详见`https://github.com/taosdata/driver-go/blob/develop/taosSql/driver_test.go`
+
+```Go
+import (
+    "database/sql"
+    _ "github.com/taosdata/driver-go/taosSql"
+)
+```
+### 常用API
+* `sql.Open(DRIVER_NAME string, dataSourceName string) *DB` 
+	
+	该API用来打开DB，返回一个类型为*DB的对象，一般情况下，DRIVER_NAME设置为字符串`taosSql`, dataSourceName设置为字符串`user:password@/tcp(host:port)/dbname`，如果客户想要用多个goroutine并发访问TDengine, 那么需要在各个goroutine中分别创建一个sql.Open对象并用之访问TDengine
+	
+   **注意**： 该API成功创建的时候，并没有做权限等检查，只有在真正执行Query或者Exec的时候才能真正的去创建连接，并同时检查user/password/host/port是不是合法。 另外，由于整个驱动程序大部分实现都下沉到taosSql所依赖的libtaos中。所以，sql.Open本身特别轻量。 
+	 
+*  `func (db *DB) Exec(query string, args ...interface{}) (Result, error)`
+
+  sql.Open内置的方法，用来执行非查询相关SQL
+  
+  
+*  `func (db *DB) Query(query string, args ...interface{}) (*Rows, error)`
+  
+  sql.Open内置的方法，用来执行查询语句
+  
+		
+## Node.js Connector
+
+TDengine 同时也提供了node.js 的连接器。用户可以通过[npm](https://www.npmjs.com/)来进行安装，也可以通过源代码*src/connector/nodejs/* 来进行安装。[具体安装步骤如下](https://github.com/taosdata/tdengine/tree/master/src/connector/nodejs)：
+
+首先，通过[npm](https://www.npmjs.com/)安装node.js 连接器.
+
+```cmd
+npm install td2.0-connector
+```
+我们建议用户使用npm 安装node.js连接器。如果您没有安装npm, 可以将*src/connector/nodejs/*拷贝到您的nodejs 项目目录下
+
+我们使用[node-gyp](https://github.com/nodejs/node-gyp)和TDengine服务端进行交互。安装node.js 连接器之前，还需安装以下软件：
+
+### Linux
+
+- `python` (建议`v2.7` , `v3.x.x` 目前还不支持)
+- `node`  必须采用v10.x版本，其他版本存在包兼容性的问题。
+- `make`
+- c语言编译器比如[GCC](https://gcc.gnu.org)
+
+### macOS
+
+- `python` (建议`v2.7` , `v3.x.x` 目前还不支持)
+
+- Xcode
+
+    - 然后通过Xcode安装
+
+    ```
+    Command Line Tools
+    ```
+
+    在
+    ```
+    Xcode -> Preferences -> Locations
+    ```
+
+    目录下可以找到这个工具。或者在终端里执行
+
+    ```
+    xcode-select --install
+    ```
+
+
+    - 该步执行后 `gcc` 和 `make`就被安装上了
+
+### Windows
+
+#### 安装方法1
+
+使用微软的[windows-build-tools](https://github.com/felixrieseberg/windows-build-tools)在`cmd` 命令行界面执行`npm install --global --production windows-build-tools` 即可安装所有的必备工具
+
+#### 安装方法2
+
+手动安装以下工具:
+
+- 安装Visual Studio相关：[Visual Studio Build 工具](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) 或者 [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community) 
+- 安装 [Python 2.7](https://www.python.org/downloads/) (`v3.x.x` 暂不支持) 并执行 `npm config set python python2.7` 
+- 进入`cmd`命令行界面, `npm config set msvs_version 2017`
+
+如果以上步骤不能成功执行, 可以参考微软的node.js用户手册[Microsoft's Node.js Guidelines for Windows](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules)
+
+如果在Windows 10 ARM 上使用ARM64 Node.js, 还需添加 "Visual C++ compilers and libraries for ARM64" 和 "Visual  C++ ATL for ARM64".
+
+### 使用方法
+
+(http://docs.taosdata.com/node)
+以下是node.js 连接器的一些基本使用方法，详细的使用方法可参考[该文档](http://docs.taosdata.com/node)
+
+#### 连接
+
+使用node.js连接器时，必须先<em>require</em> ```td2.0-connector```，然后使用 ```taos.connect``` 函数。```taos.connect``` 函数必须提供的参数是```host```，其它参数在没有提供的情况下会使用如下的默认值。最后需要初始化```cursor``` 来和TDengine服务端通信 
+
+```javascript
+const taos = require('td2.0-connector');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
+var cursor = conn.cursor(); // Initializing a new cursor
+```
+
+关闭连接可执行
+
+```javascript
+conn.close();
+```
+
+#### 查询
+
+可通过 ```cursor.query``` 函数来查询数据库。
+
+```javascript
+var query = cursor.query('show databases;')
+```
+
+查询的结果可以通过 ```query.execute()``` 函数获取并打印出来
+
+```javascript
+var promise = query.execute();
+promise.then(function(result) {
+  result.pretty(); 
+});
+```
+格式化查询语句还可以使用```query```的```bind```方法。如下面的示例：```query```会自动将提供的数值填入查询语句的```?```里。
+
+```javascript
+var query = cursor.query('select * from meterinfo.meters where ts <= ? and areaid = ?;').bind(new Date(), 5);
+query.execute().then(function(result) {
+  result.pretty();
+})
+```
+如果在```query```语句里提供第二个参数并设为```true```也可以立即获取查询结果。如下：
+
+
+```javascript
+var promise = cursor.query('select * from meterinfo.meters where v1 = 30;', true)
+promise.then(function(result) {
+  result.pretty();
+})
+```
+#### 异步函数
+异步查询数据库的操作和上面类似，只需要在`cursor.execute`, `TaosQuery.execute`等函数后面加上`_a`。
+```javascript
+var promise1 = cursor.query('select count(*), avg(v1), avg(v2) from meter1;').execute_a()
+var promise2 = cursor.query('select count(*), avg(v1), avg(v2) from meter2;').execute_a();
+promise1.then(function(result) {
+  result.pretty();
+})
+promise2.then(function(result) {
+  result.pretty();
+})
+```
+
+
+### 示例
+[这里](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example.js)提供了一个使用NodeJS 连接器建表，插入天气数据并查询插入的数据的代码示例
+
+[这里](https://github.com/taosdata/TDengine/tree/master/tests/examples/nodejs/node-example-raw.js)同样是一个使用NodeJS 连接器建表，插入天气数据并查询插入的数据的代码示例，但和上面不同的是，该示例只使用`cursor`.
+
+
+[4]: https://www.taosdata.com/cn/all-downloads/#TDengine-Windows-Client
+
diff --git a/documentation20/webdocs/markdowndocs/connector-java-ch.md b/documentation20/webdocs/markdowndocs/connector-java-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..f6da7ff4033c6da1679961404247bce9ab69ed86
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/connector-java-ch.md
@@ -0,0 +1,371 @@
+#  Java Connector
+
+TDengine 为了方便 Java 应用使用，提供了遵循 JDBC 标准(3.0)API 规范的 `taos-jdbcdriver` 实现。目前可以通过 [Sonatype Repository][1] 搜索并下载。
+
+由于 TDengine 是使用 c 语言开发的，使用 taos-jdbcdriver 驱动包时需要依赖系统对应的本地函数库。
+
+* libtaos.so 
+    在 linux 系统中成功安装 TDengine 后，依赖的本地函数库 libtaos.so 文件会被自动拷贝至 /usr/lib/libtaos.so，该目录包含在 Linux 自动扫描路径上，无需单独指定。
+    
+* taos.dll
+    在 windows 系统中安装完客户端之后，驱动包依赖的 taos.dll 文件会自动拷贝到系统默认搜索路径 C:/Windows/System32 下，同样无需要单独指定。
+    
+> 注意：在 windows 环境开发时需要安装 TDengine 对应的 [windows 客户端][14]，Linux 服务器安装完 TDengine 之后默认已安装 client，也可以单独安装 [Linux 客户端][15] 连接远程 TDengine Server。
+
+TDengine 的 JDBC 驱动实现尽可能的与关系型数据库驱动保持一致，但时序空间数据库与关系对象型数据库服务的对象和技术特征的差异导致 taos-jdbcdriver 并未完全实现 JDBC 标准规范。在使用时需要注意以下几点：
+
+* TDengine 不提供针对单条数据记录的删除和修改的操作，驱动中也没有支持相关方法。
+* 由于不支持删除和修改，所以也不支持事务操作。
+* 目前不支持表间的 union 操作。
+* 目前不支持嵌套查询(nested query)，对每个 Connection 的实例，至多只能有一个打开的 ResultSet 实例；如果在 ResultSet还没关闭的情况下执行了新的查询，TSDBJDBCDriver 则会自动关闭上一个 ResultSet。
+
+
+## TAOS-JDBCDriver 版本以及支持的 TDengine 版本和 JDK 版本
+
+| taos-jdbcdriver 版本 | TDengine 版本 | JDK 版本 |
+| --- | --- | --- |
+| 2.0.4 | 2.0.0.x 及以上 | 1.8.x |
+| 1.0.3 | 1.6.1.x 及以上 | 1.8.x |
+| 1.0.2 | 1.6.1.x 及以上 | 1.8.x |
+| 1.0.1 | 1.6.1.x 及以上 | 1.8.x |
+
+## TDengine DataType 和 Java DataType
+
+TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对应类型转换如下：
+
+| TDengine DataType | Java DataType |
+| --- | --- |
+| TIMESTAMP | java.sql.Timestamp |
+| INT | java.lang.Integer |
+| BIGINT | java.lang.Long |
+| FLOAT | java.lang.Float |
+| DOUBLE | java.lang.Double |
+| SMALLINT, TINYINT |java.lang.Short  |
+| BOOL | java.lang.Boolean |
+| BINARY, NCHAR | java.lang.String |
+
+## 如何获取 TAOS-JDBCDriver
+
+### maven 仓库
+
+目前 taos-jdbcdriver 已经发布到 [Sonatype Repository][1] 仓库，且各大仓库都已同步。
+* [sonatype][8]
+* [mvnrepository][9]
+* [maven.aliyun][10]
+
+maven 项目中使用如下 pom.xml 配置即可：
+
+```xml
+<dependency>
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.4</version>
+</dependency>
+```
+
+### 源码编译打包
+
+下载 [TDengine][3] 源码之后，进入 taos-jdbcdriver 源码目录 `src/connector/jdbc` 执行 `mvn clean package` 即可生成相应 jar 包。
+
+
+## 使用说明
+
+### 获取连接
+
+如下所示配置即可获取 TDengine Connection：
+```java
+Class.forName("com.taosdata.jdbc.TSDBDriver");
+String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/log?user=root&password=taosdata";
+Connection conn = DriverManager.getConnection(jdbcUrl);
+```
+> 端口 6030 为默认连接端口，JDBC URL 中的 log 为系统本身的监控数据库。
+
+TDengine 的 JDBC URL 规范格式为：
+`jdbc:TAOS://{host_ip}:{port}/[database_name]?[user={user}|&password={password}|&charset={charset}|&cfgdir={config_dir}|&locale={locale}|&timezone={timezone}]`
+
+其中，`{}` 中的内容必须，`[]` 中为可选。配置参数说明如下：
+
+* user：登录 TDengine 用户名，默认值 root。
+* password：用户登录密码，默认值 taosdata。
+* charset：客户端使用的字符集，默认值为系统字符集。
+* cfgdir：客户端配置文件目录路径，Linux OS 上默认值 /etc/taos ，Windows OS 上默认值 C:/TDengine/cfg。
+* locale：客户端语言环境，默认值系统当前 locale。
+* timezone：客户端使用的时区，默认值为系统当前时区。
+
+以上参数可以在 3 处配置，`优先级由高到低`分别如下：
+1. JDBC URL 参数
+    如上所述，可以在 JDBC URL 的参数中指定。
+2. java.sql.DriverManager.getConnection(String jdbcUrl, Properties connProps)
+```java
+public Connection getConn() throws Exception{
+  Class.forName("com.taosdata.jdbc.TSDBDriver");
+  String jdbcUrl = "jdbc:TAOS://127.0.0.1:0/log?user=root&password=taosdata";
+  Properties connProps = new Properties();
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_USER, "root");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD, "taosdata");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR, "/etc/taos");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+  connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+  Connection conn = DriverManager.getConnection(jdbcUrl, connProps);
+  return conn;
+}
+```
+
+3. 客户端配置文件 taos.cfg
+
+    linux 系统默认配置文件为 /var/lib/taos/taos.cfg，windows 系统默认配置文件路径为 C:\TDengine\cfg\taos.cfg。
+```properties
+# client default username
+# defaultUser           root
+
+# client default password
+# defaultPass           taosdata
+
+# default system charset
+# charset               UTF-8
+
+# system locale
+# locale                en_US.UTF-8
+```
+> 更多详细配置请参考[客户端配置][13]
+
+### 创建数据库和表
+
+```java
+Statement stmt = conn.createStatement();
+
+// create database
+stmt.executeUpdate("create database if not exists db");
+
+// use database
+stmt.executeUpdate("use db");
+
+// create table
+stmt.executeUpdate("create table if not exists tb (ts timestamp, temperature int, humidity float)");
+```
+> 注意：如果不使用 `use db` 指定数据库，则后续对表的操作都需要增加数据库名称作为前缀，如 db.tb。
+
+### 插入数据
+
+```java
+// insert data
+int affectedRows = stmt.executeUpdate("insert into tb values(now, 23, 10.3) (now + 1s, 20, 9.3)");
+
+System.out.println("insert " + affectedRows + " rows.");
+```
+> now 为系统内部函数，默认为服务器当前时间。
+> `now + 1s` 代表服务器当前时间往后加 1 秒，数字后面代表时间单位：a(毫秒), s(秒), m(分), h(小时), d(天)，w(周), n(月), y(年)。
+
+### 查询数据
+
+```java
+// query data
+ResultSet resultSet = stmt.executeQuery("select * from tb");
+
+Timestamp ts = null;
+int temperature = 0;
+float humidity = 0;
+while(resultSet.next()){
+
+    ts = resultSet.getTimestamp(1);
+    temperature = resultSet.getInt(2);
+    humidity = resultSet.getFloat("humidity");
+
+    System.out.printf("%s, %d, %s\n", ts, temperature, humidity);
+}
+```
+> 查询和操作关系型数据库一致，使用下标获取返回字段内容时从 1 开始，建议使用字段名称获取。
+
+
+### 订阅
+
+#### 创建
+
+```java
+TSDBSubscribe sub = ((TSDBConnection)conn).subscribe("topic", "select * from meters", false);
+```
+
+`subscribe` 方法的三个参数含义如下：
+
+* topic：订阅的主题（即名称），此参数是订阅的唯一标识
+* sql：订阅的查询语句，此语句只能是 `select` 语句，只应查询原始数据，只能按时间正序查询数据
+* restart：如果订阅已经存在，是重新开始，还是继续之前的订阅
+
+如上面的例子将使用 SQL 语句 `select * from meters` 创建一个名为 `topic' 的订阅，如果这个订阅已经存在，将继续之前的查询进度，而不是从头开始消费所有的数据。
+
+#### 消费数据
+
+```java
+int total = 0;
+while(true) {
+    TSDBResultSet rs = sub.consume();
+    int count = 0;
+    while(rs.next()) {
+        count++;
+    }
+    total += count;
+    System.out.printf("%d rows consumed, total %d\n", count, total);
+    Thread.sleep(1000);
+}
+```
+
+`consume` 方法返回一个结果集，其中包含从上次 `consume` 到目前为止的所有新数据。请务必按需选择合理的调用 `consume` 的频率（如例子中的`Thread.sleep(1000)`），否则会给服务端造成不必要的压力。
+
+#### 关闭订阅
+
+```java
+sub.close(true);
+```
+
+`close` 方法关闭一个订阅。如果其参数为 `true` 表示保留订阅进度信息，后续可以创建同名订阅继续消费数据；如为 `false` 则不保留订阅进度。
+
+
+### 关闭资源
+
+```java
+resultSet.close();
+stmt.close();
+conn.close();
+```
+> `注意务必要将 connection 进行关闭`，否则会出现连接泄露。  
+
+## 与连接池使用
+
+**HikariCP**
+
+* 引入相应 HikariCP maven 依赖：
+```xml
+<dependency>
+    <groupId>com.zaxxer</groupId>
+    <artifactId>HikariCP</artifactId>
+    <version>3.4.1</version>
+</dependency>
+```
+
+* 使用示例如下：
+```java
+ public static void main(String[] args) throws SQLException {
+    HikariConfig config = new HikariConfig();
+    config.setJdbcUrl("jdbc:TAOS://127.0.0.1:6030/log");
+    config.setUsername("root");
+    config.setPassword("taosdata");
+
+    config.setMinimumIdle(3);           //minimum number of idle connection
+    config.setMaximumPoolSize(10);      //maximum number of connection in the pool
+    config.setConnectionTimeout(10000); //maximum wait milliseconds for get connection from pool
+    config.setIdleTimeout(60000);       // max idle time for recycle idle connection 
+    config.setConnectionTestQuery("describe log.dn"); //validation query
+    config.setValidationTimeout(3000);   //validation query timeout
+
+    HikariDataSource ds = new HikariDataSource(config); //create datasource
+    
+    Connection  connection = ds.getConnection(); // get connection
+    Statement statement = connection.createStatement(); // get statement
+    
+    //query or insert 
+    // ...
+    
+    connection.close(); // put back to conneciton pool
+}
+```
+> 通过 HikariDataSource.getConnection() 获取连接后，使用完成后需要调用 close() 方法，实际上它并不会关闭连接，只是放回连接池中。
+> 更多 HikariCP 使用问题请查看[官方说明][5]
+
+**Druid**
+
+* 引入相应 Druid maven 依赖：
+
+```xml
+<dependency>
+    <groupId>com.alibaba</groupId>
+    <artifactId>druid</artifactId>
+    <version>1.1.20</version>
+</dependency>
+```
+
+* 使用示例如下：
+```java
+public static void main(String[] args) throws Exception {
+    Properties properties = new Properties();
+    properties.put("driverClassName","com.taosdata.jdbc.TSDBDriver");
+    properties.put("url","jdbc:TAOS://127.0.0.1:6030/log");
+    properties.put("username","root");
+    properties.put("password","taosdata");
+
+    properties.put("maxActive","10"); //maximum number of connection in the pool
+    properties.put("initialSize","3");//initial number of connection
+    properties.put("maxWait","10000");//maximum wait milliseconds for get connection from pool
+    properties.put("minIdle","3");//minimum number of connection in the pool
+
+    properties.put("timeBetweenEvictionRunsMillis","3000");// the interval milliseconds to test connection
+
+    properties.put("minEvictableIdleTimeMillis","60000");//the minimum milliseconds to keep idle
+    properties.put("maxEvictableIdleTimeMillis","90000");//the maximum milliseconds to keep idle
+
+    properties.put("validationQuery","describe log.dn"); //validation query
+    properties.put("testWhileIdle","true"); // test connection while idle
+    properties.put("testOnBorrow","false"); // don't need while testWhileIdle is true
+    properties.put("testOnReturn","false"); // don't need while testWhileIdle is true
+    
+    //create druid datasource
+    DataSource ds = DruidDataSourceFactory.createDataSource(properties);
+    Connection  connection = ds.getConnection(); // get connection
+    Statement statement = connection.createStatement(); // get statement
+
+    //query or insert 
+    // ...
+
+    connection.close(); // put back to conneciton pool
+}
+```
+> 更多 druid 使用问题请查看[官方说明][6]
+
+**注意事项**
+* TDengine `v1.6.4.1` 版本开始提供了一个专门用于心跳检测的函数 `select server_status()`，所以在使用连接池时推荐使用 `select server_status()` 进行 Validation Query。
+
+如下所示，`select server_status()` 执行成功会返回 `1`。
+```shell
+taos> select server_status();
+server_status()|
+================
+1              |
+Query OK, 1 row(s) in set (0.000141s)
+```
+
+## 与框架使用
+
+* Spring JdbcTemplate 中使用 taos-jdbcdriver，可参考 [SpringJdbcTemplate][11]
+* Springboot + Mybatis 中使用，可参考 [springbootdemo][12]
+
+## 常见问题
+
+* java.lang.UnsatisfiedLinkError: no taos in java.library.path
+  
+  **原因**：程序没有找到依赖的本地函数库 taos。
+  
+  **解决方法**：windows 下可以将 C:\TDengine\driver\taos.dll 拷贝到 C:\Windows\System32\ 目录下，linux 下将建立如下软链 ` ln -s /usr/local/taos/driver/libtaos.so.x.x.x.x /usr/lib/libtaos.so` 即可。
+  
+* java.lang.UnsatisfiedLinkError: taos.dll Can't load AMD 64 bit on a IA 32-bit platform
+  
+  **原因**：目前 TDengine 只支持 64 位 JDK。
+  
+  **解决方法**：重新安装 64 位 JDK。
+
+* 其它问题请参考 [Issues][7]
+
+[1]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[2]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[3]: https://github.com/taosdata/TDengine
+[4]: https://www.taosdata.com/blog/2019/12/03/jdbcdriver%e6%89%be%e4%b8%8d%e5%88%b0%e5%8a%a8%e6%80%81%e9%93%be%e6%8e%a5%e5%ba%93/
+[5]: https://github.com/brettwooldridge/HikariCP
+[6]: https://github.com/alibaba/druid
+[7]: https://github.com/taosdata/TDengine/issues
+[8]: https://search.maven.org/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[9]: https://mvnrepository.com/artifact/com.taosdata.jdbc/taos-jdbcdriver
+[10]: https://maven.aliyun.com/mvn/search
+[11]:  https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/SpringJdbcTemplate
+[12]: https://github.com/taosdata/TDengine/tree/develop/tests/examples/JDBC/springbootdemo
+[13]: https://www.taosdata.com/cn/documentation20/administrator/#%E5%AE%A2%E6%88%B7%E7%AB%AF%E9%85%8D%E7%BD%AE
+[14]: https://www.taosdata.com/cn/all-downloads/#TDengine-Windows-Client
+[15]: https://www.taosdata.com/cn/getting-started/#%E5%BF%AB%E9%80%9F%E4%B8%8A%E6%89%8B
diff --git a/documentation20/webdocs/markdowndocs/faq-ch.md b/documentation20/webdocs/markdowndocs/faq-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..7bbf7531c805eed1b3711cbe67a6dcfbc7fae3a1
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/faq-ch.md
@@ -0,0 +1,111 @@
+# 常见问题
+
+## 1. TDengine2.0之前的版本升级到2.0及以上的版本应该注意什么？☆☆☆
+
+2.0版本在之前版本的基础上，进行了完全的重构，配置文件和数据文件是不兼容的。在升级之前务必进行如下操作：
+
+1. 删除配置文件，执行 <code> sudo rm -rf /etc/taos/taos.cfg </code>
+2. 删除日志文件，执行 <code> sudo rm -rf /var/log/taos/ </code>
+3. 确保数据已经不再需要的前提下，删除数据文件，执行 <code> sudo rm -rf /var/lib/taos/ </code>
+4. 安装最新稳定版本的TDengine
+5. 如果数据需要迁移数据或者数据文件损坏，请联系涛思数据官方技术支持团队，进行协助解决
+
+## 2. Windows平台下JDBCDriver找不到动态链接库，怎么办？
+请看为此问题撰写的<a href='blog/2019/12/03/jdbcdriver找不到动态链接库/'>技术博客 </a>
+
+## 3. 创建数据表时提示more dnodes are needed
+请看为此问题撰写的<a href='blog/2019/12/03/创建数据表时提示more-dnodes-are-needed/'>技术博客</a>
+
+## 4. 如何让TDengine crash时生成core文件？
+请看为此问题撰写的<a href='blog/2019/12/06/tdengine-crash时生成core文件的方法/'>技术博客</a>
+
+## 5. 遇到错误"Unable to establish connection", 我怎么办？
+
+客户端遇到链接故障，请按照下面的步骤进行检查：
+
+1. 检查网络环境
+    * 云服务器：检查云服务器的安全组是否打开TCP/UDP 端口6030-6042的访问权限
+    * 本地虚拟机：检查网络能否ping通，尽量避免使用`localhost` 作为hostname
+    * 公司服务器：如果为NAT网络环境，请务必检查服务器能否将消息返回值客户端
+    
+2. 确保客户端与服务端版本号是完全一致的，开源社区版和企业版也不能混用
+
+3. 在服务器，执行 `systemctl status taosd` 检查*taosd*运行状态。如果没有运行，启动*taosd*
+
+4. 确认客户端连接时指定了正确的服务器FQDN (Fully Qualified Domain Name(可在服务器上执行Linux命令hostname -f获得)）,FQDN配置参考：[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)。
+
+5. ping服务器FQDN，如果没有反应，请检查你的网络，DNS设置，或客户端所在计算机的系统hosts文件
+
+6. 检查防火墙设置，确认TCP/UDP 端口6030-6042 是打开的
+
+7. 对于Linux上的JDBC（ODBC, Python, Go等接口类似）连接, 确保*libtaos.so*在目录*/usr/local/lib/taos*里, 并且*/usr/local/lib/taos*在系统库函数搜索路径*LD_LIBRARY_PATH*里 
+
+8. 对于windows上的JDBC, ODBC, Python, Go等连接，确保*driver/c/taos.dll*在你的系统搜索目录里 (建议*taos.dll*放在目录 *C:\Windows\System32*)
+
+9. 如果仍不能排除连接故障，请使用命令行工具nc来分别判断指定端口的TCP和UDP连接是否通畅
+   检查UDP端口连接是否工作：`nc -vuz {hostIP} {port} `
+   检查服务器侧TCP端口连接是否工作：`nc -l {port}`
+   检查客户端侧TCP端口链接是否工作：`nc {hostIP} {port}`
+   
+10. 也可以使用taos程序内嵌的网络连通检测功能，来验证服务器和客户端之间指定的端口连接是否通畅（包括TCP和UDP）：[TDengine 内嵌网络检测工具使用指南](https://www.taosdata.com/blog/2020/09/08/1816.html)。
+
+
+
+## 6. 遇到错误“Unexpected generic error in RPC”或者"TDengine Error: Unable to resolve FQDN"， 我怎么办？
+产生这个错误，是由于客户端或数据节点无法解析FQDN(Fully Qualified Domain Name)导致。对于TAOS Shell或客户端应用，请做如下检查：
+
+1. 请检查连接的服务器的FQDN是否正确,FQDN配置参考：[一篇文章说清楚TDengine的FQDN](https://www.taosdata.com/blog/2020/09/11/1824.html)。
+2. 如果网络配置有DNS server, 请检查是否正常工作
+3. 如果网络没有配置DNS server, 请检查客户端所在机器的hosts文件，查看该FQDN是否配置，并是否有正确的IP地址。
+4. 如果网络配置OK，从客户端所在机器，你需要能Ping该连接的FQDN，否则客户端是无法链接服务器的
+
+
+## 7. 虽然语法正确，为什么我还是得到 "Invalid SQL" 错误
+
+如果你确认语法正确，2.0之前版本，请检查SQL语句长度是否超过64K。如果超过，也会返回这个错误。
+
+## 8. 是否支持validation queries?
+
+TDengine还没有一组专用的validation queries。然而建议你使用系统监测的数据库”log"来做。
+
+## 9. 我可以删除或更新一条记录吗？
+
+不能。因为TDengine是为联网设备采集的数据设计的，不容许修改。但TDengine提供数据保留策略，只要数据记录超过保留时长，就会被自动删除。
+
+## 10. 我怎么创建超过1024列的表？
+
+使用2.0及其以上版本，默认支持1024列；2.0之前的版本，TDengine最大允许创建250列的表。但是如果确实超过限值，建议按照数据特性，逻辑地将这个宽表分解成几个小表。
+
+## 10. 最有效的写入数据的方法是什么？
+
+批量插入。每条写入语句可以一张表同时插入多条记录，也可以同时插入多张表的多条记录。
+
+## 11. 最有效的写入数据的方法是什么？windows系统下插入的nchar类数据中的汉字被解析成了乱码如何解决？
+
+windows下插入nchar类的数据中如果有中文，请先确认系统的地区设置成了中国（在Control Panel里可以设置），这时cmd中的`taos`客户端应该已经可以正常工作了；如果是在IDE里开发Java应用，比如Eclipse， Intellij，请确认IDE里的文件编码为GBK（这是Java默认的编码类型），然后在生成Connection时，初始化客户端的配置，具体语句如下：
+```JAVA
+Class.forName("com.taosdata.jdbc.TSDBDriver");
+Properties properties = new Properties();
+properties.setProperty(TSDBDriver.LOCALE_KEY, "UTF-8");
+Connection = DriverManager.getConnection(url, properties);
+```
+## 12.TDengine GO windows驱动的如何编译？
+请看为此问题撰写的<a href='blog/2020/01/06/tdengine-go-windows驱动的编译/'>技术博客 
+
+## 13.JDBC报错： the excuted SQL is not a DML or a DDL？
+请更新至最新的JDBC驱动
+```JAVA
+<dependency>
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.4</version>
+</dependency>
+```
+## 14. 怎么报告问题？
+如果 FAQ 中的信息不能够帮到您，需要 TDengine 技术团队的技术支持与协助，请将以下两个目录中内容打包:
+1. /var/log/taos
+2. /etc/taos 
+
+附上必要的问题描述，以及发生该问题的执行操作，出现问题的表征及大概的时间，在<a href='https://github.com/taosdata/TDengine'> GitHub</a>提交Issue。
+
+为了保证有足够的debug信息，如果问题能够重复，请修改/etc/taos/taos.cfg文件，最后面添加一行“debugFlag 135"(不带引号本身），然后重启taosd, 重复问题，然后再递交。但系统正常运行时，请一定将debugFlag设置为131，否则会产生大量的日志信息，降低系统效率。
diff --git a/documentation20/webdocs/markdowndocs/faq.md b/documentation20/webdocs/markdowndocs/faq.md
new file mode 100644
index 0000000000000000000000000000000000000000..ce7d2ebf5e390d616d47835af5f958af1223ea59
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/faq.md
@@ -0,0 +1,46 @@
+#FAQ
+
+#### 1. How to upgrade TDengine from 1.X versions to 2.X and above versions?
+
+Version 2.X is a complete refactoring of the previous version, and configuration files and data files are incompatible. Be sure to do the following before upgrading:
+
+1. Delete the configuration file, and execute <code>sudo rm -rf /etc/taos/taos</code>
+2. Delete the log file, and execute <code>sudo rm -rf /var/log/taos </code>
+3. ENSURE THAT YOUR DATAS ARE NO LONGER NEEDED! Delete the data file, and execute <code>sudo rm -rf /var/lib/taos </code>
+4. Enjoy the latest stable version of TDengine
+5. If the data needs to be migrated or the data file is corrupted, please contact the official technical support team for assistance
+
+#### 2. When encoutered with the error "Unable to establish connection", what can I do?
+
+The client may encounter connection errors. Please follow the steps below for troubleshooting:
+
+1. Make sure that the client and server version Numbers are exactly the same, and that the open source community and Enterprise versions are not mixed.
+2. On the server side, execute `systemctl status taosd` to check the status of *taosd* service. If *taosd* is not running, start it and retry connecting.
+3. Make sure you have used the correct server IP address to connect to.
+4. Ping the server. If no response is received, check your network connection.
+5. Check the firewall setting, make sure the TCP/UDP ports from 6030-6039 are enabled.
+6. For JDBC, ODBC, Python, Go connections on Linux, make sure the native library *libtaos.so* are located at /usr/local/lib/taos, and /usr/local/lib/taos is in the *LD_LIBRARY_PATH*. 
+7. For JDBC, ODBC, Python, Go connections on Windows, make sure *driver/c/taos.dll* is in the system search path (or you can copy taos.dll into *C:\Windows\System32*)
+8. If the above steps can not help, try the network diagnostic tool *nc* to check if TCP/UDP port works
+      check UDP port：`nc -vuz {hostIP} {port} `
+      check TCP port on server:  `nc -l {port}`
+      check TCP port on client: ` nc {hostIP} {port}`
+
+#### 3. Why I get "Invalid SQL" error when a query is syntactically correct?
+
+If you are sure your query has correct syntax, please check the length of the SQL string. Before version 2.0, it shall be less than 64KB. 
+
+#### 4. Does TDengine support validation queries?
+
+For the time being, TDengine does not have a specific set of validation queries. However, TDengine comes with a system monitoring database named 'sys', which can usually be used as a validation query object. 
+
+#### 5. Can I delete or update a record that has been written into TDengine?
+
+The answer is NO. The design of TDengine is based on the assumption that records are generated by the connected devices, you won't be allowed to change it. But TDengine provides a retention policy, the data records will be removed once their lifetime is passed.
+
+#### 6. What is the most efficient way to write data to TDengine?
+
+TDengine supports several different writing regimes. The most efficient way to write data to TDengine is to use batch inserting. For details on batch insertion syntax, please refer to [Taos SQL](../documentation/taos-sql)
+
+
+
diff --git a/documentation20/webdocs/markdowndocs/insert-ch.md b/documentation20/webdocs/markdowndocs/insert-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..a84b577622b450089b22a961d6e5fe71627930c6
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/insert-ch.md
@@ -0,0 +1,224 @@
+# 高效写入数据
+
+TDengine支持多种接口写入数据，包括SQL, Prometheus, Telegraf, EMQ MQTT Broker, CSV文件等，后续还将提供Kafka, OPC等接口。数据可以单条插入，也可以批量插入，可以插入一个数据采集点的数据，也可以同时插入多个数据采集点的数据。支持多线程插入，支持时间乱序数据插入，也支持历史数据插入。
+
+## SQL写入
+
+应用通过C/C++, JDBC, GO, 或Python Connector 执行SQL insert语句来插入数据，用户还可以通过TAOS Shell，手动输入SQL insert语句插入数据。比如下面这条insert 就将一条记录写入到表d1001中：
+```mysql
+INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31);
+```
+TDengine支持一次写入多条记录，比如下面这条命令就将两条记录写入到表d1001中：
+```mysql
+INSERT INTO d1001 VALUES (1538548684000, 10.2, 220, 0.23) (1538548696650, 10.3, 218, 0.25);
+```
+
+TDengine也支持一次向多个表写入数据，比如下面这条命令就向d1001写入两条记录，向d1002写入一条记录：
+```mysql
+INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6, 218, 0.33) d1002 VALUES (1538548696800, 12.3, 221, 0.31);
+```
+
+详细的SQL INSERT语法规则请见<a href="https://www.taosdata.com/cn/documentation20/taos-sql/">TAOS SQL </a>
+
+**Tips:** 
+
+- 要提高写入效率，需要批量写入。一批写入的记录条数越多，插入效率就越高。但一条记录不能超过16K，一条SQL语句总长度不能超过64K（可通过参数maxSQLLength配置，最大可配置为8M）。
+- TDengine支持多线程同时写入，要进一步提高写入速度，一个客户端需要打开20个以上的线程同时写。但线程数达到一定数量后，无法再提高，甚至还会下降，因为线程切频繁切换，带来额外开销。
+- 对同一张表，如果新插入记录的时间戳已经存在，新记录将被直接抛弃，也就是说，在一张表里，时间戳必须是唯一的。如果应用自动生成记录，很有可能生成的时间戳是一样的，这样，成功插入的记录条数会小于应用插入的记录条数。
+- 写入的数据的时间戳必须大于当前时间减去配置参数keep的时间。如果keep配置为3650天，那么无法写入比3650天还老的数据。写入数据的时间戳也不能大于当前时间加配置参数days。如果days配置为2，那么无法写入比当前时间还晚2天的数据。
+
+## Prometheus直接写入
+[Prometheus](https://www.prometheus.io/)作为Cloud Native Computing Fundation毕业的项目，在性能监控以及K8S性能监控领域有着非常广泛的应用。TDengine提供一个小工具[Bailongma](https://github.com/taosdata/Bailongma)，只需在Prometheus做简单配置，无需任何代码，就可将Prometheus采集的数据直接写入TDengine，并按规则在TDengine自动创建库和相关表项。博文[用Docker容器快速搭建一个Devops监控Demo](https://www.taosdata.com/blog/2020/02/03/1189.html)即是采用bailongma将Prometheus和Telegraf的数据写入TDengine中的示例，可以参考。
+
+### 从源代码编译blm_prometheus
+用户需要从github下载[Bailongma](https://github.com/taosdata/Bailongma)的源码，使用Golang语言编译器编译生成可执行文件。在开始编译前，需要准备好以下条件：
+- Linux操作系统的服务器
+- 安装好Golang, 1.10版本以上
+- 对应的TDengine版本。因为用到了TDengine的客户端动态链接库，因此需要安装好和服务端相同版本的TDengine程序；比如服务端版本是TDengine 2.0.0, 则在bailongma所在的linux服务器（可以与TDengine在同一台服务器，或者不同服务器）
+
+Bailongma项目中有一个文件夹blm_prometheus，存放了prometheus的写入API程序。编译过程如下：
+```
+cd blm_prometheus
+go build
+```
+
+一切正常的情况下，就会在对应的目录下生成一个blm_prometheus的可执行程序。
+
+### 安装Prometheus
+通过Prometheus的官网下载安装。[下载地址](https://prometheus.io/download/)
+
+### 配置Prometheus
+参考Prometheus的[配置文档](https://prometheus.io/docs/prometheus/latest/configuration/configuration/),在Prometheus的配置文件中的<remote_write>部分，增加以下配置
+
+- url: bailongma API服务提供的URL, 参考下面的blm_prometheus启动示例章节
+
+启动Prometheus后，可以通过taos客户端查询确认数据是否成功写入。
+
+### 启动blm_prometheus程序
+blm_prometheus程序有以下选项，在启动blm_prometheus程序时可以通过设定这些选项来设定blm_prometheus的配置。
+```sh
+--tdengine-name
+如果TDengine安装在一台具备域名的服务器上，也可以通过配置TDengine的域名来访问TDengine。在K8S环境下，可以配置成TDengine所运行的service name
+
+--batch-size 
+blm_prometheus会将收到的prometheus的数据拼装成TDengine的写入请求，这个参数控制一次发给TDengine的写入请求中携带的数据条数。
+
+--dbname
+设置在TDengine中创建的数据库名称，blm_prometheus会自动在TDengine中创建一个以dbname为名称的数据库，缺省值是prometheus。
+
+--dbuser
+设置访问TDengine的用户名，缺省值是'root'
+
+--dbpassword
+设置访问TDengine的密码，缺省值是'taosdata'
+
+--port
+blm_prometheus对prometheus提供服务的端口号。
+```
+
+### 启动示例
+
+通过以下命令启动一个blm_prometheus的API服务
+```
+./blm_prometheus -port 8088
+```
+假设blm_prometheus所在服务器的IP地址为"10.1.2.3"，则在prometheus的配置文件中<remote_write>部分增加url为
+```yaml
+remote_write:
+  - url: "http://10.1.2.3:8088/receive"
+```
+
+### 查询prometheus写入数据
+prometheus产生的数据格式如下：
+```json
+{
+  Timestamp: 1576466279341,
+  Value: 37.000000, 
+  apiserver_request_latencies_bucket {
+    component="apiserver", 
+    instance="192.168.99.116:8443", 
+    job="kubernetes-apiservers", 
+    le="125000", 
+    resource="persistentvolumes", s
+    cope="cluster",
+    verb="LIST", 
+    version=“v1" 
+  }
+}
+```
+其中，apiserver_request_latencies_bucket为prometheus采集的时序数据的名称，后面{}中的为该时序数据的标签。blm_prometheus会以时序数据的名称在TDengine中自动创建一个超级表，并将{}中的标签转换成TDengine的tag值，Timestamp作为时间戳，value作为该时序数据的值。因此在TDengine的客户端中，可以通过以下指令查到这个数据是否成功写入。
+```
+use prometheus;
+select * from apiserver_request_latencies_bucket;
+```
+
+## Telegraf直接写入
+[Telegraf](https://www.influxdata.com/time-series-platform/telegraf/)是一流行的IT运维数据采集开源工具，TDengine提供一个小工具[Bailongma](https://github.com/taosdata/Bailongma)，只需在Telegraf做简单配置，无需任何代码，就可将Telegraf采集的数据直接写入TDengine，并按规则在TDengine自动创建库和相关表项。博文[用Docker容器快速搭建一个Devops监控Demo](https://www.taosdata.com/blog/2020/02/03/1189.html)即是采用bailongma将Prometheus和Telegraf的数据写入TDengine中的示例，可以参考。
+
+### 从源代码编译blm_telegraf
+用户需要从github下载[Bailongma](https://github.com/taosdata/Bailongma)的源码，使用Golang语言编译器编译生成可执行文件。在开始编译前，需要准备好以下条件：
+
+- Linux操作系统的服务器
+- 安装好Golang, 1.10版本以上
+- 对应的TDengine版本。因为用到了TDengine的客户端动态链接库，因此需要安装好和服务端相同版本的TDengine程序；比如服务端版本是TDengine 2.0.0, 则在bailongma所在的linux服务器（可以与TDengine在同一台服务器，或者不同服务器）
+
+Bailongma项目中有一个文件夹blm_telegraf，存放了Telegraf的写入API程序。编译过程如下：
+
+```
+cd blm_telegraf
+go build
+```
+
+一切正常的情况下，就会在对应的目录下生成一个blm_telegraf的可执行程序。
+
+### 安装Telegraf
+目前TDengine支持Telegraf 1.7.4以上的版本。用户可以根据当前的操作系统，到Telegraf官网下载安装包，并执行安装。下载地址如下：<a href='https://portal.influxdata.com/downloads'>https://portal.influxdata.com/downloads</a>
+
+### 配置Telegraf
+修改Telegraf配置文件/etc/telegraf/telegraf.conf中与TDengine有关的配置项。 
+
+在output plugins部分，增加[[outputs.http]]配置项： 
+
+- url： bailongma API服务提供的URL, 参考下面的启动示例章节
+- data_format: "json"
+- json_timestamp_units:      "1ms"
+
+在agent部分：
+
+- hostname: 区分不同采集设备的机器名称，需确保其唯一性
+- metric_batch_size: 100，允许Telegraf每批次写入记录最大数量，增大其数量可以降低Telegraf的请求发送频率。
+
+关于如何使用Telegraf采集数据以及更多有关使用Telegraf的信息，请参考Telegraf官方的[文档](https://docs.influxdata.com/telegraf/v1.11/)。
+
+### 启动blm_telegraf程序
+blm_telegraf程序有以下选项，在启动blm_telegraf程序时可以通过设定这些选项来设定blm_telegraf的配置。
+
+```sh
+--host 
+TDengine服务端的IP地址，缺省值为空
+
+--batch-size 
+blm_telegraf会将收到的telegraf的数据拼装成TDengine的写入请求，这个参数控制一次发给TDengine的写入请求中携带的数据条数。
+
+--dbname
+设置在TDengine中创建的数据库名称，blm_telegraf会自动在TDengine中创建一个以dbname为名称的数据库，缺省值是prometheus。
+
+--dbuser
+设置访问TDengine的用户名，缺省值是'root'
+
+--dbpassword
+设置访问TDengine的密码，缺省值是'taosdata'
+
+--port
+blm_telegraf对telegraf提供服务的端口号。
+```
+
+### 启动示例
+通过以下命令启动一个blm_telegraf的API服务
+```
+./blm_telegraf -host 127.0.0.1 -port 8089
+```
+
+假设blm_telegraf所在服务器的IP地址为"10.1.2.3"，则在telegraf的配置文件中, 在output plugins部分，增加[[outputs.http]]配置项： 
+
+```yaml
+url = "http://10.1.2.3:8089/telegraf"
+```
+
+### 查询telegraf写入数据
+telegraf产生的数据格式如下：
+```json
+{
+  "fields": {
+    "usage_guest": 0, 
+    "usage_guest_nice": 0,
+    "usage_idle": 89.7897897897898, 
+    "usage_iowait": 0,
+    "usage_irq": 0,
+    "usage_nice": 0,
+    "usage_softirq": 0,
+    "usage_steal": 0,
+    "usage_system": 5.405405405405405, 
+    "usage_user": 4.804804804804805
+  },
+  
+  "name": "cpu", 
+  "tags": {
+    "cpu": "cpu2",
+    "host": "bogon" 
+  },
+  "timestamp": 1576464360 
+}
+```
+
+其中，name字段为telegraf采集的时序数据的名称，tags字段为该时序数据的标签。blm_telegraf会以时序数据的名称在TDengine中自动创建一个超级表，并将tags字段中的标签转换成TDengine的tag值，Timestamp作为时间戳，fields字段中的值作为该时序数据的值。因此在TDengine的客户端中，可以通过以下指令查到这个数据是否成功写入。
+
+```
+use telegraf;
+select * from cpu;
+```
+
+## EMQ X Broker直接写入
+
+MQTT是一流行的物联网数据传输协议，[EMQ](https://github.com/emqx/emqx)是一开源的MQTT Broker软件，无需任何代码，只需要在EMQ Dashboard里使用“规则”做简单配置，即可将MQTT的数据直接写入TDengine。EMQ X 支持通过 发送到 Web 服务 的方式保存数据到 TDEngine，也在企业版上提供原生的 TDEngine 驱动实现直接保存。详细使用方法请参考 [EMQ 官方文档](https://docs.emqx.io/broker/latest/cn/rule/rule-example.html#%E4%BF%9D%E5%AD%98%E6%95%B0%E6%8D%AE%E5%88%B0-tdengine)。
+
diff --git a/documentation20/webdocs/markdowndocs/replica-ch.md b/documentation20/webdocs/markdowndocs/replica-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..c32928b42d806c66b3e8bfe66943d4b199c34acc
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/replica-ch.md
@@ -0,0 +1,253 @@
+# TDengine 2.0 数据复制模块设计
+
+## 数据复制概述
+
+数据复制(Replication)是指同一份数据在多个物理地点保存。它的目的是防止数据丢失，提高系统的高可用性(High Availability)，而且通过应用访问多个副本，提升数据查询性能。
+
+在高可靠的大数据系统里，数据复制是必不可少的一大功能。数据复制又分为实时复制与非实时复制。实时复制是指任何数据的更新(包括数据的增加、删除、修改）操作，会被实时的复制到所有副本，这样任何一台机器宕机或网络出现故障，整个系统还能提供最新的数据，保证系统的正常工作。而非实时复制，是指传统的数据备份操作，按照固定的时间周期，将一份数据全量或增量复制到其他地方。如果主节点宕机，副本是很大可能没有最新数据，因此在有些场景是无法满足要求的。
+
+TDengine面向的是物联网场景，需要支持数据的实时复制，来最大程度保证系统的可靠性。实时复制有两种方式，一种是异步复制，一种是同步复制。异步复制(Asynchronous Replication)是指数据由Master转发给Slave后，Master并不需要等待Slave回复确认，这种方式效率高，但有极小的概率会丢失数据。同步复制是指Master将数据转发给Slave后，需要等待Slave的回复确认，才会通知应用写入成功，这种方式效率偏低，但能保证数据绝不丢失。
+
+数据复制是与数据存储（写入、读取）密切相关的，但两者又是相对独立，可以完全脱耦的。在TDengine系统中，有两种不同类型的数据，一种是时序数据，由TSDB模块负责；一种是元数据(Meta Data), 由MNODE负责。这两种性质不同的数据都需要同步功能。数据复制模块通过不同的实例启动配置参数，为这两种类型数据都提供同步功能。
+
+在阅读本文之前，请先阅读《<a href="../architecture/ ">TDengine 2.0 整体架构</a >》，了解TDengine的集群设计和基本概念
+
+特别注明：本文中提到数据更新操作包括数据的增加、删除与修改。
+
+## 基本概念和定义
+
+TDengine里存在vnode, mnode, vnode用来存储时序数据，mnode用来存储元数据。但从同步数据复制的模块来看，两者没有本质的区别，因此本文里的虚拟节点不仅包括vnode, 也包括mnode, vgoup也指mnode group, 除非特别注明。
+
+**版本(version)**：
+
+一个虚拟节点组里多个虚拟节点互为备份，来保证数据的有效与可靠，是依靠虚拟节点组的数据版本号来维持的。TDengine2.0设计里，对于版本的定义如下：客户端发起增加、删除、修改的流程，无论是一条记录还是多条，只要是在一个请求里，这个数据更新请求被TDengine的一个虚拟节点收到后，经过合法性检查后，可以被写入系统时，就会被分配一个版本号。这个版本号在一个虚拟节点里从1开始，是单调连续递增的。无论这条记录是采集的时序数据还是meta data, 一样处理。当Master转发一个写入请求到slave时，必须带上版本号。一个虚拟节点将一数据更新请求写入WAL时，需要带上版本号。
+
+不同虚拟节点组的数据版本号是完全独立的，互不相干的。版本号本质上是数据更新记录的transaction ID，但用来标识数据集的版本。
+
+**角色(role)：**
+
+一个虚拟节点可以是master, slave, unsynced或offline状态。
+
+- master： 具有最新的数据，容许客户端往里写入数据，一个虚拟节点组，至多一个master.
+- slave：与master是同步的，但不容许客户端往里写入数据，根据配置，可以容许客户端对其进行查询。
+- unsynced: 节点处于非同步状态，比如虚拟节点刚启动、或与其他虚拟节点的连接出现故障等。处于该状态时，该虚拟节点既不能提供写入，也不能提供查询服务
+- offline: 由于宕机或网络原因，无法访问到某虚拟节点时，其他虚拟节点将该虚拟节点标为离线。但请注意，该虚拟节点本身的状态可能是unsynced或其他，但不会是离线。
+
+**Quorum:**
+
+指数据写入成功所需要的确认数。对于异步复制，quorum设为1，具有master角色的虚拟节点自己确认即可。对于同步复制，需要至少大于等于2。原则上，Quorum >=1 并且 Quorum <= replication(副本数）。这个参数在启动一个同步模块实例时需要提供。
+
+**WAL：**
+
+TDengine的WAL(Write Ahead Log)与cassandra的commit log, mySQL的bin log, Postgres的WAL没本质区别。没有写入数据库文件，还保存在内存的数据都会先存在WAL。当数据已经成功写入数据库数据文件，相应的WAL会被删除。但需要特别指明的是，在TDengine系统里，有几点：
+
+- 每个虚拟节点有自己独立的wal
+- WAL里包含而且仅仅包含来自客户端的数据更新操作，每个更新操作都会被打上一个版本号
+
+**复制实例：**
+
+复制模块只是一可执行的代码，复制实例是指正在运行的复制模块的一个实例，一个节点里，可以存在多个实例。原则上，一个节点有多少虚拟节点，就可以启动多少实例。对于副本数为1的场景，应用可以决定是否需要启动同步实例。应用启动一个同步模块的实例时，需要提供的就是虚拟节点组的配置信息，包括：
+
+- 虚拟节点个数，即replication number
+- 各虚拟节点所在节点的信息，包括node的end point
+- quorum, 需要的数据写入成功的确认数
+- 虚拟节点的初始版本号
+
+## 数据复制模块的基本工作原理
+
+TDengine采取的是Master-Slave模式进行同步，与流行的RAFT一致性算法比较一致。总结下来，有几点：
+
+1. 一个vgroup里有一到多个虚拟节点，每个虚拟节点都有自己的角色
+2. 客户端只能向角色是master的虚拟节点发起数据更新操作，因为master具有最新版本的数据，如果向非Master发起数据更新操作，会直接收到错误
+3. 客户端可以向master, 也可以向角色是Slave的虚拟节点发起查询操作，但不能对unsynced的虚拟节点发起任何操作
+4. 如果master不存在，这个vgroup是不能对外提供数据更新和查询服务的
+5. master收到客户端的数据更新操作时，会将其转发给slave节点
+6. 一个虚拟节点的版本号比master低的时候，会发起数据恢复流程，成功后，才会成为slave
+
+数据实时复制有三个主要流程：选主、数据转发、数据恢复。后续做详细讨论。
+
+## 虚拟节点之间的网络链接
+
+虚拟节点之间通过TCP进行链接，节点之间的状态交换、数据包的转发都是通过这个TCP链接(peerFd)进行。为避免竞争，两个虚拟节点之间的TCP链接，总是由IP地址(UINT32)小的节点作为TCP客户端发起。一旦TCP链接被中断，虚拟节点能通过TCP socket自动检测到，将对方标为offline。如果监测到任何错误（比如数据恢复流程），虚拟节点将主动重置该链接。
+
+一旦作为客户端的节点链接不成或中断，它将周期性的每隔一秒钟去试图去链接一次。因为TCP本身有心跳机制，虚拟节点之间不再另行提供心跳。
+
+如果一个unsynced节点要发起数据恢复流程，它与Master将建立起专有的TCP链接(syncFd)。数据恢复完成后，该链接会被关闭。而且为限制资源的使用，系统只容许一定数量(配置参数tsMaxSyncNum)的数据恢复的socket存在。如果超过这个数字，系统会将新的数据恢复请求延后处理。
+
+任意一个节点，无论有多少虚拟节点，都会启动而且只会启动一个TCP server, 来接受来自其他虚拟节点的上述两类TCP的链接请求。当TCP socket建立起来，客户端侧发送的消息体里会带有vgId（全局唯一的vgroup ID), TCP 服务器侧会检查该vgId是否已经在该节点启动运行。如果已经启动运行，就接受其请求。如果不存在，就直接将链接请求关闭。在TDengine代码里，mnode group的vgId设置为1。 
+
+## 选主流程
+
+当同一组的两个虚拟节点之间(vnode A, vnode B)建立连接后，他们互换status消息。status消息里包含本地存储的同一虚拟节点组内所有虚拟节点的role和version。
+
+如果一个虚拟节点(vnode A)检测到与同一虚拟节点组内另外一虚拟节点（vnode B）的链接中断，vnode A将立即把vnode B的role设置为offline。无论是接收到另外一虚拟节点发来的status消息，还是检测与另外一虚拟节点的链接中断，该虚拟节点都将进入状态处理流程。状态处理流程的规则如下：
+
+1. 如果检测到在线的节点数没有超过一半，则将自己的状态设置为unsynced.
+2. 如果在线的虚拟节点数超过一半，会检查master节点是否存在，如果存在，则会决定是否将自己状态改为slave或启动数据恢复流程
+3. 如果master不存在，则会检查自己保存的各虚拟节点的状态信息与从另一节点接收到的是否一致，如果一致，说明节点组里状态已经稳定一致，则会触发选举流程。如果不一致，说明状态还没趋于一致，即使master不存在，也不进行选主。由于要求状态信息一致才进行选举，每个虚拟节点根据同样的信息，会选出同一个虚拟节点做master，无需投票表决。
+4. 自己的状态是根据规则自己决定并修改的，并不需要其他节点同意，包括成为master。一个节点无权修改其他节点的状态。
+5. 如果一个虚拟节点检测到自己或其他虚拟节点的role发生改变，该节点会广播它自己保存的各个虚拟节点的状态信息（role和version).
+
+具体的流程图如下：
+
+<center> <img src="../assets/replica-master.png"> </center>
+
+选择Master的具体规则如下：
+
+1. 如果只有一个副本，该副本永远就是master
+2. 所有副本都在线时，版本最高的被选为master
+3. 在线的虚拟节点数过半，而且有虚拟节点是slave的话，该虚拟节点自动成为master
+4. 对于2和3，如果多个虚拟节点满足成为master的要求，那么虚拟节点组的节点列表里，最前面的选为master
+
+按照上面的规则，如果所有虚拟节点都是unsynced(比如全部重启），只有所有虚拟节点上线，才能选出master，该虚拟节点组才能开始对外提供服务。当一个虚拟节点的role发生改变时，sync模块回通过回调函数notifyRole通知应用。
+
+## 数据转发流程
+
+如果vnode A是master, vnode B是slave, vnode A能接受客户端的写请求，而vnode B不能。当vnode A收到写的请求后，遵循下面的流程：
+
+<center> <img src="../assets/replica-forward.png"> </center>
+
+1. 应用对写请求做基本的合法性检查，通过，则给改请求包打上一个版本号(version, 单调递增）
+2. 应用将打上版本号的写请求封装一个WAL Head, 写入WAL(Write Ahead Log)
+3. 应用调用API syncForwardToPeer，如多vnode B是slave状态，sync模块将包含WAL Head的数据包通过Forward消息发送给vnode B，否则就不转发。
+4. vnode B收到Forward消息后，调用回调函数writeToCache, 交给应用处理
+5. vnode B应用在写入成功后，都需要调用syncAckForward通知sync模块已经写入成功。
+6. 如果quorum大于1，vnode B需要等待应用的回复确认，收到确认后，vnode B发送Forward Response消息给node A。
+7. 如果quorum大于1，vnode A需要等待vnode B或其他副本对Forward消息的确认。
+8. 如果quorum大于1，vnode A收到quorum-1条确认消息后，调用回调函数confirmForward，通知应用写入成功。
+9. 如果quorum为1，上述6，7，8步不会发生。
+10. 如果要等待slave的确认，master会启动2秒的定时器（可配置），如果超时，则认为失败。
+
+对于回复确认，sync模块提供的是异步回调函数，因此APP在调用syncForwardToPeer之后，无需等待，可以处理下一个操作。在Master与Slave的TCP链接管道里，可能有多个Forward消息，这些消息是严格按照应用提供的顺序排好的。对于Forward Response也是一样，TCP管道里存在多个，但都是排序好的。这个顺序，SYNC模块并没有做特别的事情，是由APP单线程顺序写来保证的(TDengine里每个vnode的写数据，都是单线程）。
+
+## 数据恢复流程
+
+如果一虚拟节点(vnode B) 处于unsynced状态，master存在（vnode A)，而且其版本号比master的低，它将立即启动数据恢复流程。在理解恢复流程时，需要澄清几个关于文件的概念和处理规则。
+
+1. 每个文件（无论是archived data的file还是wal)都有一个index, 这需要应用来维护(vnode里，该index就是fileId*3 + 0/1/2, 对应data, head与last三个文件）。如果index为0，表示系统里最老的数据文件。对于mnode里的文件，数量是固定的，对应于acct, user, db, table等文件。
+2. 任何一个数据文件(file)有名字、大小，还有一个magic number。只有文件名、大小与magic number一致时，两个文件才判断是一样的，无需同步。Magic number可以是checksum, 也可以是简单的文件大小。怎么计算magic，换句话说，如何检测数据文件是否有效，完全由应用决定。
+3. 文件名的处理有点复杂，因为每台服务器的路径可能不一致。比如node A的TDengine的数据文件存放在 /etc/taos目录下，而node B的数据存放在 /home/jhtao目录下。因此同步模块需要应用在启动一个同步实例时提供一个path，这样两台服务器的绝对路径可以不一样，但仍然可以做对比，做同步。
+4. 当sync模块调用回调函数getFileInfo获得数据文件信息时，有如下的规则
+   1. index 为0，表示获取最老的文件，同时修改index返回给sync模块。如果index不为0，表示获取指定位置的文件。
+   2. 如果name为空，表示sync想获取位于index位置的文件信息，包括magic, size。Master节点会这么调用
+   3. 如果name不为空，表示sync想获取指定文件名和index的信息，slave节点会这么调用
+   4. 如果某个index的文件不存在，magic返回0，表示文件已经是最后一个。因此整个系统里，文件的index必须是连续的一段整数。
+5. 当sync模块调用回调函数getWalInfo获得wal信息时，有如下规则
+   1. index为0，表示获得最老的WAL文件, 返回时，index更新为具体的数字
+   2. 如果返回0，表示这是最新的一个WAL文件，如果返回值是1，表示后面还有更新的WAL文件
+   3. 返回的文件名为空，那表示没有WAL文件
+6. 无论是getFileInfo, 还是getWalInfo, 只要获取出错（不是文件不存在），返回-1即可，系统会报错，停止同步
+
+整个数据恢复流程分为两大步骤，第一步，先恢复archived data(file), 然后恢复wal。具体流程如下：
+
+<center> <img src="../assets/replica-restore.png"> </center>
+
+1. 通过已经建立的TCP链接，发送sync req给master节点
+2. master收到sync req后，以client的身份，向vnode B主动建立一新的专用于同步的TCP链接（syncFd)
+3. 新的TCP链接建立成功后，master将开始retrieve流程，对应的，vnode B将同步启动restore流程
+4. Retrieve/Restore流程里，先处理所有archived data (vnode里的data, head, last文件），后处理WAL data。
+5. 对于archived data，master将通过回调函数getFileInfo获取数据文件的基本信息，包括文件名、magic以及文件大小。
+6. master 将获得的文件名、magic以及文件大小发给vnode B
+7. vnode B将回调函数getFile获得magic和文件大小，如果两者一致，就认为无需同步，如果两者不一致 ，就认为需要同步。vnode B将结果通过消息FileAck发回master
+8. 如果文件需要同步，master就调用sendfile把整个文件发往vnode B
+9. 如果文件不需要同步，master(vnode A)就重复5，6，7，8，直到所有文件被处理完
+
+对于WAL同步，流程如下：
+
+1. master节点调用回调函数getWalInfo，获取WAL的文件名。
+2. 如果getWalInfo返回值大于0，表示该文件还不是最后一个WAL，因此master调用sendfile一下把该文件发送给vnode B
+3. 如果getWalInfo返回时为0，表示该文件是最后一个WAL，因为文件可能还处于写的状态中，sync模块要根据WAL Head的定义逐条读出记录，然后发往vnode B。
+4. vnode A读取TCP链接传来的数据，按照WAL Head，逐条读取，如果版本号比现有的大，调用回调函数writeToCache，交给应用处理。如果小，直接扔掉。
+5. 上述流程循环，直到所有WAL文件都被处理完。处理完后，master就会将新来的数据包通过Forward消息转发给slave。
+
+从同步文件启动起，sync模块会通过inotify监控所有处理过的file以及wal。一旦发现被处理过的文件有更新变化，同步流程将中止，会重新启动。因为有可能落盘操作正在进行（比如历史数据导入，内存数据落盘），把已经处理过的文件进行了修改，需要重新同步才行。
+
+对于最后一个WAL (LastWal)的处理逻辑有点复杂，因为这个文件往往是打开写的状态，有很多场景需要考虑，比如：
+
+- LastWal文件size在增长，需要重新读；
+- LastWal文件虽然已经打开写，但内容为空；
+- LastWal文件已经被关闭，应用生成了新的Last WAL文件;
+- LastWal文件没有被关闭，但数据落盘的原因，没有读到完整的一条记录;
+- LastWal文件没有被关闭，但数据落盘的原因，还有部分记录暂时读取不到；
+
+sync模块通过inotify监控LastWal文件的更新和关闭操作。而且在确认已经尽可能读完LastWal的数据后，会将对方同步状态设置为SYNC_CACHE。该状态下，master节点会将新的记录转发给vnode B，而此时vnode B并没有完成同步，需要把这些转发包先存在recv buffer里，等WAL处理完后，vnode A再把recv buffer里的数据包通过回调writeToCache交给应用处理。
+
+等vnode B把这些buffered forwards处理完，同步流程才算结束，vnode B正式变为slave。
+
+## Master分布均匀性问题
+
+因为Master负责写、转发，消耗的资源会更多，因此Master在整个集群里分布均匀比较理想。
+
+但在TDengine的设计里，如果多个虚拟节点都符合master条件，TDengine选在列表中最前面的做Master, 这样是否导致在集群里，Master数量的分布不均匀问题呢？这取决于应用的设计。
+
+给一个具体例子，系统里仅仅有三个节点，IP地址分别为IP1, IP2, IP3. 在各个节点上，TDengine创建了多个虚拟节点组，每个虚拟节点组都有三个副本。如果三个副本的顺序在所有虚拟节点组里都是IP1, IP2, IP3, 那毫无疑问，master将集中在IP1这个节点，这是我们不想看到的。
+
+但是，如果在创建虚拟节点组时，增加随机性，这个问题就不存在了。比如在vgroup 1, 顺序是IP1, IP2, IP3, 在vgroup 2里，顺序是IP2, IP3, IP1, 在vgroup 3里，顺序是IP3, IP1, IP2。最后master的分布会是均匀的。
+
+因此在创建一个虚拟节点组时，应用需要保证节点的顺序是round robin或完全随机。
+
+## 少数虚拟节点写入成功的问题
+
+在某种情况下，写入成功的确认数大于0，但小于配置的Quorum, 虽然有虚拟节点数据更新成功，master仍然会认为数据更新失败，并通知客户端写入失败。
+
+这个时候，系统存在数据不一致的问题，因为有的虚拟节点已经写入成功，而有的写入失败。一个处理方式是，Master重置(reset)与其他虚拟节点的连接，该虚拟节点组将自动进入选举流程。按照规则，已经成功写入数据的虚拟节点将成为新的master，组内的其他虚拟节点将从master那里恢复数据。
+
+因为写入失败，客户端会重新写入数据。但对于TDengine而言，是OK的。因为时序数据都是有时间戳的，时间戳相同的数据更新操作，第一次会执行，但第二次会自动扔掉。对于Meta Data(增加、删除库、表等等）的操作，也是OK的。一张表、库已经被创建或删除，再创建或删除，不会被执行的。
+
+在TDengine的设计里，虚拟节点与虚拟节点之间，是一个TCP链接，是一个pipeline，数据块一个接一个按顺序在这个pipeline里等待处理。一旦某个数据块的处理失败，这个链接会被重置，后续的数据块的处理都会失败。因此不会存在Pipeline里一个数据块更新失败，但下一个数据块成功的可能。
+
+## Split Brain的问题
+
+选举流程中，有个强制要求，那就是一定有超过半数的虚拟节点在线。但是如果replication正好是偶数，这个时候，完全可能存在splt brain问题。
+
+为解决这个问题，TDengine提供Arbitrator的解决方法。Arbitrator是一个节点，它的任务就是接受任何虚拟节点的链接请求，并保持它。
+
+在启动复制模块实例时，在配置参数中，应用可以提供Arbitrator的IP地址。如果是奇数个副本，复制模块不会与这个arbitrator去建立链接，但如果是偶数个副本，就会主动去建立链接。
+
+Arbitrator的程序tarbitrator.c在复制模块的同一目录, 编译整个系统时，会在bin目录生成。命令行参数“-？”查看可以配置的参数，比如绑定的IP地址，监听的端口号。
+
+## 与RAFT相比的异同
+
+数据一致性协议流行的有两种，Paxos与Raft. 本设计的实现与Raft有很多类同之处，下面做一些比较
+
+相同之处：
+
+- 三大流程一致：Raft里有Leader election, replication, safety，完全对应TDengine的选举、数据转发、数据恢复三个流程
+- 节点状态定义一致：Raft里每个节点有Leader, Follower, Candidate三个状态，TDengine里是Master, Slave, Unsynced, Offline。多了一个offlince, 但本质上是一样的，因为offline是外界看一个节点的状态，但该节点本身是处于master, slave 或unsynced的
+- 数据转发流程完全一样，Master(leader)需要等待回复确认。
+- 数据恢复流程几乎一样，Raft没有涉及历史数据同步问题，只考虑了WAL数据同步
+
+不同之处：
+
+- 选举流程不一样：Raft里任何一个节点是candidate时，主动向其他节点发出vote request, 如果超过半数回答Yes, 这个candidate就成为Leader,开始一个新的term. 而TDengine的实现里，节点上线、离线或角色改变都会触发状态消息在节点组类传播，等节点组里状态稳定一致之后才触发选举流程，因为状态稳定一致，基于同样的状态信息，每个节点做出的决定会是一致的，一旦某个节点符合成为master的条件，无需其他节点认可，它会自动将自己设为master。TDengine里，任何一个节点检测到其他节点或自己的角色发生改变，就会给节点组内其他节点进行广播的。Raft里不存在这样的机制，因此需要投票来解决。
+- 对WAL的一条记录，Raft用term + index来做唯一标识。但TDengine只用version（类似index)，在TDengine实现里，仅仅用version是完全可行的, 因为TDengine的选举机制，没有term的概念。
+
+如果整个虚拟节点组全部宕机，重启，但不是所有虚拟节点都上线，这个时候TDengine是不会选出master的，因为未上线的节点有可能有最高version的数据。而RAFT协议，只要超过半数上线，就会选出Leader。
+
+## Meta Data的数据复制
+
+TDengine里存在时序数据，也存在Meta Data。Meta Data对数据的可靠性要求更高，那么TDengine设计能否满足要求呢？下面做个仔细分析
+
+TDengine里Meta Data包括以下：
+
+- account 信息
+- 一个account下面，可以有多个user, 多个DB
+- 一个DB下面有多个vgroup
+- 一个DB下面有多个stable
+- 一个vgroup下面有多个table
+- 整个系统有多个mnode, dnode
+- 一个dnode可以有多个vnode
+
+上述的account, user, DB, vgroup, table, stable, mnode, dnode都有自己的属性，这些属性是TDengine自己定义的，不会开放给用户进行修改。这些Meta Data的查询都比较简单，都可以采用key-value模型进行存储。这些Meta Data还具有几个特点：
+
+1. 上述的Meta Data之间有一定的层级关系，比如必须先创建DB，才能创建table, stable。只有先创建dnode，才可能创建vnode, 才可能创建vgroup。因此他们创建的顺序是绝对不能错的。
+2. 在客户端应用的数据更新操作得到TDengine服务器侧确认后，所执行的数据更新操作绝对不能丢失。否则会造成客户端应用与服务器的数据不一致。
+3. 上述的Meta Data是容许重复操作的。比如插入新记录后，再插入一次，删除一次后，再删除一次，更新一次后，再更新一次，不会对系统产生任何影响，不会改变系统任何状态。
+
+对于特点1，本设计里，数据的写入是单线程的，按照到达的先后顺序，给每个数据更新操作打上版本号，版本号大的记录一定是晚于版本号小的写入系统，数据写入顺序是100%保证的，绝对不会让版本号大的记录先写入。复制过程中，数据块的转发也是严格按照顺序进行的，因此TDengine的数据复制设计是能保证Meta Data的创建顺序的。
+
+对于特点2，只要Quorum数设置等于replica，那么一定能保证回复确认过的数据更新操作不会在服务器侧丢失。即使某节点永不起来，只要超过一半的节点还是online, 查询服务不会受到任何影响。这时，如果某个节点离线超过一定时长，系统可以自动补充新的节点，以保证在线的节点数在绝大部分时间是100%的。
+
+对于特点3，完全可能发生，服务器确实持久化存储了某一数据更新操作，但客户端应用出了问题，认为操作不成功，它会重新发起操作。但对于Meta Data而言，没有关系，客户端可以再次发起同样的操作，不会有任何影响。
+
+总结来看，只要quorum设置大于一，本数据复制的设计是能满足Meta Data的需求的。目前，还没有发现漏洞。
diff --git a/documentation20/webdocs/markdowndocs/taosd-ch.md b/documentation20/webdocs/markdowndocs/taosd-ch.md
new file mode 100644
index 0000000000000000000000000000000000000000..8143137c795ece91eace923d8c4945bc36c27e9b
--- /dev/null
+++ b/documentation20/webdocs/markdowndocs/taosd-ch.md
@@ -0,0 +1,107 @@
+#  TDengine 2.0 执行代码taosd的设计
+
+逻辑上，TDengine系统包含dnode, taosc和App，dnode是服务器侧执行代码taosd的一个运行实例，因此taosd是TDengine的核心，本文对taosd的设计做一简单的介绍，模块内的实现细节请见其他文档。
+
+## 系统模块图
+taosd包含rpc, dnode, vnode, tsdb, query, cq, sync, wal, mnode, http, monitor等模块，具体如下图：
+
+<center> <img src="../assets/modules.png"> </center>
+
+taosd的启动入口是dnode模块，dnode然后启动其他模块，包括可选配置的http, monitor模块。taosc或dnode之间交互的消息都是通过rpc模块进行，dnode模块根据接收到的消息类型，将消息分发到vnode或mnode的消息队列，或由dnode模块自己消费。dnode的工作线程(worker)消费消息队列里的消息，交给mnode或vnode进行处理。下面对各个模块做简要说明。
+
+## RPC模块
+
+该模块负责taosd与taosc, 以及其他数据节点之间的通讯。TDengine没有采取标准的HTTP或gRPC等第三方工具，而是实现了自己的通讯模块RPC。
+
+考虑到物联网场景下，数据写入的包一般不大，因此除支持TCP链接之外，RPC还支持UDP链接。当数据包小于15K时，RPC将采用UDP方式进行链接，否则将采用TCP链接。对于查询类的消息，RPC不管包的大小，总是采取TCP链接。对于UDP链接，RPC实现了自己的超时、重传、顺序检查等机制，以保证数据可靠传输。
+
+RPC模块还提供数据压缩功能，如果数据包的字节数超过系统配置参数compressMsgSize, RPC在传输中将自动压缩数据，以节省带宽。
+
+为保证数据的安全和数据的integrity, RPC模块采用MD5做数字签名，对数据的真实性和完整性进行认证。
+
+## DNODE模块
+
+该模块是整个taosd的入口，它具体负责如下任务：
+
+- 系统的初始化，包括
+  - 从文件taos.cfg读取系统配置参数，从文件dnodeCfg.json读取数据节点的配置参数；
+  - 启动RPC模块，并建立起与taosc通讯的server链接，与其他数据节点通讯的server链接；
+  - 启动并初始化dnode的内部管理, 该模块将扫描该数据节点已有的vnode，并打开它们；
+  - 初始化可配置的模块，如mnode, http, monitor等。
+- 数据节点的管理，包括
+  - 定时的向mnode发送status消息，报告自己的状态；
+  - 根据mnode的指示，创建、改变、删除vnode；
+  - 根据mnode的指示，修改自己的配置参数；
+- 消息的分发、消费，包括
+  - 为每一个vnode和mnode的创建并维护一个读队列、一个写队列；
+  - 将从taosc或其他数据节点来的消息，根据消息类型，将其直接分发到不同的消息队列，或由自己的管理模块直接消费；
+  - 维护一个读的线程池，消费读队列的消息，交给vnode或mnode处理。为支持高并发，一个读线程(Worker)可以消费多个队列的消息，一个读队列可以由多个worker消费；
+  - 维护一个写的线程池，消费写队列的消息，交给vnode或mnode处理。为保证写操作的序列化，一个写队列只能由一个写线程负责，但一个写线程可以负责多个写队列。
+
+taosd的消息消费由dnode通过读写线程池进行控制，是系统的中枢。该模块内的结构体图如下：
+
+<center> <img src="../assets/dnode.png"> </center>
+
+## VNODE模块
+
+vnode是一独立的数据存储查询逻辑单元，但因为一个vnode只能容许一个DB，因此vnode内部没有account, DB, user等概念。为实现更好的模块化、封装以及未来的扩展，它有很多子模块，包括负责存储的TSDB，负责查询的Query, 负责数据复制的sync，负责数据库日志的的wal, 负责连续查询的cq(continuous query), 负责事件触发的流计算的event等模块，这些子模块只与vnode模块发生关系，与其他模块没有任何调用关系。模块图如下：
+
+<center> <img src="../assets/vnode.png"> </center>
+vnode模块向下，与dnodeVRead，dnodeVWrite发生互动，向上，与子模块发生互动。它主要的功能有：
+
+- 协调各个子模块的互动。各个子模块之间都不直接调用，都需要通过vnode模块进行；
+- 对于来自taosc或mnode的写操作，vnode模块将其分解为写日志(wal), 转发(sync), 本地存储(tsdb)子模块的操作；
+- 对于查询操作，分发到query模块进行。
+
+一个数据节点里有多个vnode, 因此vnode模块是有多个运行实例的。每个运行实例是完全独立的。
+
+vnode与其子模块是通过API直接调用，而不是通过消息队列传递。而且各个子模块只与vnode模块有交互，不与dnode, rpc等模块发生任何直接关联。
+
+## MNODE模块
+
+mnode是整个系统的大脑，负责整个系统的资源调度，负责meta data的管理与存储。
+
+一个运行的系统里，只有一个mnode，但它有多个副本（由系统配置参数numOfMpeers控制）。这些副本分布在不同的dnode里，目的是保证系统的高可靠运行。副本之间的数据复制是采用同步而非异步的方式，以确保数据的一致性，确保数据不会丢失。这些副本会自动选举一个Master，其他副本是slave。所有数据更新类的操作，都只能在master上进行，而查询类的可以在slave节点上进行。代码实现上，同步模块与vnode共享，但mnode被分配一个特殊的vgroup ID: 1，而且quorum大于1。整个集群系统是由多个dnode组成的，运行的mnode的副本数不可能超过dnode的个数，但不会超过配置的副本数。如果某个mnode副本宕机一段时间，只要超过半数的mnode副本仍在运行，运行的mnode会自动根据整个系统的资源情况，在其他dnode里再启动一个mnode, 以保证运行的副本数。
+
+各个dnode通过信息交换，保存有mnode各个副本的End Point列表，并向其中的master节点定时（间隔由系统配置参数statusInterval控制）发送status消息，消息体里包含该dnode的CPU、内存、剩余存储空间、vnode个数，以及各个vnode的状态(存储空间、原始数据大小、记录条数、角色等）。这样mnode就了解整个系统的资源情况，如果用户创建新的表，就可以决定需要在哪个dnode创建；如果增加或删除dnode, 或者监测到某dnode数据过热、或离线太长，就可以决定需要挪动那些vnode，以实现负载均衡。
+
+mnode里还负责account, user, DB, stable, table, vgroup, dnode的创建、删除与更新。mnode不仅把这些entity的meta data保存在内存，还做持久化存储。但为节省内存，各个表的标签值不保存在mnode（保存在vnode)，而且子表不维护自己的schema, 而是与stable共享。为减小mnode的查询压力，taosc会缓存table、stable的schema。对于查询类的操作，各个slave mnode也可以提供，以减轻master压力。
+
+## TSDB模块
+TSDB模块是VNODE中的负责快速高并发地存储和读取属于该VNODE的表的元数据及采集的时序数据的引擎。除此之外，TSDB还提供了表结构的修改、表标签值的修改等功能。TSDB提供API供VNODE和Query等模块调用。TSDB中存储了两类数据，1：元数据信息；2：时序数据
+
+### 元数据信息
+TSDB中存储的元数据包含属于其所在的VNODE中表的类型，schema的定义等。对于超级表和超级表下的子表而言，又包含了tag的schema定义以及子表的tag值等。对于元数据信息而言，TSDB就相当于一个全内存的KV型数据库，属于该VNODE的表对象全部在内存中，方便快速查询表的信息。除此之外，TSDB还对其中的子表，按照tag的第一列取值做了全内存的索引，大大加快了对于标签的过滤查询。TSDB中的元数据的最新状态在落盘时，会以追加（append-only）的形式，写入到meta文件中。meta文件只进行追加操作，即便是元数据的删除，也会以一条记录的形式写入到文件末尾。TSDB也提供了对于元数据的修改操作，如表schema的修改，tag schema的修改以及tag值的修改等。
+
+### 时序数据
+每个TSDB在创建时，都会事先分配一定量的内存缓冲区，且内存缓冲区的大小可配可修改。表采集的时序数据，在写入TSDB时，首先以追加的方式写入到分配的内存缓冲区中，同时建立基于时间戳的内存索引，方便快速查询。当内存缓冲区的数据积累到一定的程度时（达到内存缓冲区总大小的1/3），则会触发落盘操作，将缓冲区中的数据持久化到硬盘文件上。时序数据在内存缓冲区中是以行（row）的形式存储的。
+
+而时序数据在写入到TSDB的数据文件时，是以列（column）的形式存储的。TSDB中的数据文件包含多个数据文件组，每个数据文件组中又包含.head、.data和.last三个文件，如（v2f1801.head、v2f1801.data、v2f1801.last）数据文件组。TSDB中的数据文件组是按照时间跨度进行分片的，默认是10天一个文件组，且可通过配置文件及建库选项进行配置。分片的数据文件组又按照编号递增排列，方便快速定位某一时间段的时序数据，高效定位数据文件组。时序数据在TSDB的数据文件中是以块的形式进行列式存储的，每个块中只包含一张表的数据，且数据在一个块中是按照时间顺序递增排列的。在一个数据文件组中，.head文件负责存储数据块的索引及统计信息，如每个块的位置，压缩算法，时间戳范围等。存储在.head文件中一张表的索引信息是按照数据块中存储的数据的时间递增排列的，方便进行折半查找等工作。.head和.last文件是存储真实数据块的文件，若数据块中的数据累计到一定程度，则会写入.data文件中，否则，会写入.last文件中，等待下次落盘时合并数据写入.data文件中，从而大大减少文件中块的个数，避免数据的过度碎片化。
+
+## Query模块
+该模块负责整体系统的查询处理。客户端调用该该模块进行SQL语法解析，并将查询或写入请求发送到vnode，同时负责针对超级表的查询进行二阶段的聚合操作。在Vnode端，该模块调用TSDB模块读取系统中存储的数据进行查询处理。Query模块还定义了系统能够支持的全部查询函数，查询函数的实现机制与查询框架无耦合，可以在不修改查询流程的情况下动态增加查询函数。详细的设计请参见《TDengine 2.0查询模块设计》。
+
+## SYNC模块
+该模块实现数据的多副本复制，包括vnode与mnode的数据复制，支持异步和同步两种复制方式，以满足meta data与时序数据不同复制的需求。因为它为mnode与vnode共享，系统为mnode副本预留了一个特殊的vgroup ID:1。因此vnode group的ID是从2开始的。
+
+每个vnode/mnode模块实例会有一对应的sync模块实例，他们是一一对应的。详细设计请见<a href="https://www.taosdata.com/cn/documentation20/replica/">TDengine 2.0 数据复制模块设计</a>
+
+## WAL模块
+该模块负责将新插入的数据写入write ahead log(WAL), 为vnode, mnode共享。以保证服务器crash或其他故障，能从WAL中恢复数据。
+
+每个vnode/mnode模块实例会有一对应的wal模块实例，是完全一一对应的。WAL的落盘操作由两个参数walLevel, fsync控制。看具体场景，如果要100%保证数据不会丢失，需要将walLevel配置为2，fsync设置为0，每条数据插入请求，都会实时落盘后，才会给应用确认
+
+## HTTP模块
+该模块负责处理系统对外的RESTful接口，可以通过配置，由dnode启动或停止。
+
+该模块将接收到的RESTful请求，做了各种合法性检查后，将其变成标准的SQL语句，通过taosc的异步接口，将请求发往整个系统中的任一dnode。收到处理后的结果后，再翻译成HTTP协议，返回给应用。
+
+如果HTTP模块启动，就意味着启动了一个taosc的实例。任一一个dnode都可以启动该模块，以实现对RESTful请求的分布式处理。
+
+## Monitor模块
+该模块负责检测一个dnode的运行状态，可以通过配置，由dnode启动或停止。原则上，每个dnode都应该启动一个monitor实例。
+
+Monitor采集TDengine里的关键操作，比如创建、删除、更新账号、表、库等，而且周期性的收集CPU、内存、网络等资源的使用情况（采集周期由系统配置参数monitorInterval控制）。获得这些数据后，monitor模块将采集的数据写入系统的日志库(DB名字由系统配置参数monitorDbName控制）。
+
+Monitor模块使用taosc来将采集的数据写入系统，因此每个monitor实例，都有一个taosc运行实例。
+
diff --git a/importSampleData/app/main.go b/importSampleData/app/main.go
index aef413320710012fec79e56677e16864a881ca8f..61de6e740c1f0cf71c8c94e384dcd68fc58fbc60 100644
--- a/importSampleData/app/main.go
+++ b/importSampleData/app/main.go
@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/taosdata/TDengine/importSampleData/import"
 	"hash/crc32"
 	"io"
 	"log"
@@ -18,88 +17,89 @@ import (
 	"sync"
 	"time"
 
-	_ "github.com/taosdata/TDengine/src/connector/go/src/taosSql"
+	dataimport "github.com/taosdata/TDengine/importSampleData/import"
+
+	_ "github.com/taosdata/driver-go/taosSql"
 )
 
 const (
-	TIMESTAMP  = "timestamp"
-	DATETIME  = "datetime"
-	MILLISECOND  = "millisecond"
-	DEFAULT_STARTTIME int64 = -1
-	DEFAULT_INTERVAL int64 = 1*1000
-	DEFAULT_DELAY int64 = -1
-	DEFAULT_STATISTIC_TABLE = "statistic"
-
-	JSON_FORMAT = "json"
-	CSV_FORMAT = "csv"
+	TIMESTAMP                     = "timestamp"
+	DATETIME                      = "datetime"
+	MILLISECOND                   = "millisecond"
+	DEFAULT_STARTTIME       int64 = -1
+	DEFAULT_INTERVAL        int64 = 1 * 1000
+	DEFAULT_DELAY           int64 = -1
+	DEFAULT_STATISTIC_TABLE       = "statistic"
+
+	JSON_FORMAT       = "json"
+	CSV_FORMAT        = "csv"
 	SUPERTABLE_PREFIX = "s_"
-	SUBTABLE_PREFIX = "t_"
+	SUBTABLE_PREFIX   = "t_"
 
-	DRIVER_NAME = "taosSql"
+	DRIVER_NAME      = "taosSql"
 	STARTTIME_LAYOUT = "2006-01-02 15:04:05.000"
-	INSERT_PREFIX = "insert into "
+	INSERT_PREFIX    = "insert into "
 )
 
 var (
-
-	cfg string
-	cases   string
-	hnum    int
-	vnum  int
-	thread  int
-	batch  int
-	auto		int
-	starttimestr  string
-	interval	int64
-	host       string
-	port       int
-	user       string
-	password   string
-	dropdb   int
-	db         string
-	dbparam		string
+	cfg          string
+	cases        string
+	hnum         int
+	vnum         int
+	thread       int
+	batch        int
+	auto         int
+	starttimestr string
+	interval     int64
+	host         string
+	port         int
+	user         string
+	password     string
+	dropdb       int
+	db           string
+	dbparam      string
 
 	dataSourceName string
-	startTime  int64
+	startTime      int64
 
-	superTableConfigMap  = make(map[string]*superTableConfig)
-	subTableMap	= make(map[string]*dataRows)
-	scaleTableNames []string
+	superTableConfigMap = make(map[string]*superTableConfig)
+	subTableMap         = make(map[string]*dataRows)
+	scaleTableNames     []string
 
 	scaleTableMap = make(map[string]*scaleTableInfo)
 
-	successRows []int64
+	successRows    []int64
 	lastStaticTime time.Time
-	lastTotalRows int64
-	timeTicker *time.Ticker
-	delay int64  // default 10 milliseconds
-	tick int64
-	save int
-	saveTable string
+	lastTotalRows  int64
+	timeTicker     *time.Ticker
+	delay          int64 // default 10 milliseconds
+	tick           int64
+	save           int
+	saveTable      string
 )
 
 type superTableConfig struct {
-	startTime int64
-	endTime int64
-	cycleTime int64
+	startTime   int64
+	endTime     int64
+	cycleTime   int64
 	avgInterval int64
-	config dataimport.CaseConfig
+	config      dataimport.CaseConfig
 }
 
 type scaleTableInfo struct {
 	scaleTableName string
-	subTableName string
-	insertRows int64
+	subTableName   string
+	insertRows     int64
 }
 
 type tableRows struct {
-	tableName string  // tableName
-	value string      // values(...)
+	tableName string // tableName
+	value     string // values(...)
 }
 
 type dataRows struct {
-	rows         []map[string]interface{}
-	config       dataimport.CaseConfig
+	rows   []map[string]interface{}
+	config dataimport.CaseConfig
 }
 
 func (rows dataRows) Len() int {
@@ -127,10 +127,10 @@ func init() {
 
 	if db == "" {
 		//db = "go"
-		db = fmt.Sprintf("test_%s",time.Now().Format("20060102"))
+		db = fmt.Sprintf("test_%s", time.Now().Format("20060102"))
 	}
 
-	if auto == 1 && len(starttimestr) == 0  {
+	if auto == 1 && len(starttimestr) == 0 {
 		log.Fatalf("startTime must be set when auto is 1, the format is \"yyyy-MM-dd HH:mm:ss.SSS\" ")
 	}
 
@@ -141,7 +141,7 @@ func init() {
 		}
 
 		startTime = t.UnixNano() / 1e6 // as millisecond
-	}else{
+	} else {
 		startTime = DEFAULT_STARTTIME
 	}
 
@@ -179,7 +179,7 @@ func main() {
 
 		_, exists := superTableConfigMap[caseConfig.Stname]
 		if !exists {
-			superTableConfigMap[caseConfig.Stname] = &superTableConfig{config:caseConfig}
+			superTableConfigMap[caseConfig.Stname] = &superTableConfig{config: caseConfig}
 		} else {
 			log.Fatalf("the stname of case %s already exist.\n", caseConfig.Stname)
 		}
@@ -201,9 +201,9 @@ func main() {
 
 	if DEFAULT_DELAY == delay {
 		// default delay
-		delay =  caseMinumInterval / 2
+		delay = caseMinumInterval / 2
 		if delay < 1 {
-				delay = 1
+			delay = 1
 		}
 		log.Printf("actual delay is %d ms.", delay)
 	}
@@ -232,7 +232,7 @@ func main() {
 	filePerThread := subTableNum / thread
 	leftFileNum := subTableNum % thread
 
-	var wg  sync.WaitGroup
+	var wg sync.WaitGroup
 
 	start = time.Now()
 
@@ -255,31 +255,31 @@ func main() {
 	go staticSpeed()
 	wg.Wait()
 
-	usedTime :=  time.Since(start)
+	usedTime := time.Since(start)
 
 	total := getTotalRows(successRows)
 
-	log.Printf("finished insert %d rows, used %d ms, speed %d rows/s", total, usedTime/1e6, total * 1e9 / int64(usedTime))
+	log.Printf("finished insert %d rows, used %d ms, speed %d rows/s", total, usedTime/1e6, total*1e3/usedTime.Milliseconds())
 
 	if vnum == 0 {
 		// continue waiting for insert data
-		wait :=  make(chan string)
-		v := <- wait
+		wait := make(chan string)
+		v := <-wait
 		log.Printf("program receive %s, exited.\n", v)
-	}else{
+	} else {
 		timeTicker.Stop()
 	}
 
 }
 
-func staticSpeed(){
+func staticSpeed() {
 
 	connection := getConnection()
 	defer connection.Close()
 
 	if save == 1 {
 		connection.Exec("use " + db)
-		_, err := connection.Exec("create table if not exists " + saveTable +"(ts timestamp, speed int)")
+		_, err := connection.Exec("create table if not exists " + saveTable + "(ts timestamp, speed int)")
 		if err != nil {
 			log.Fatalf("create %s Table error: %s\n", saveTable, err)
 		}
@@ -287,13 +287,13 @@ func staticSpeed(){
 
 	for {
 		<-timeTicker.C
-		
+
 		currentTime := time.Now()
 		usedTime := currentTime.UnixNano() - lastStaticTime.UnixNano()
-	
+
 		total := getTotalRows(successRows)
 		currentSuccessRows := total - lastTotalRows
-		
+
 		speed := currentSuccessRows * 1e9 / int64(usedTime)
 		log.Printf("insert %d rows, used %d ms, speed %d rows/s", currentSuccessRows, usedTime/1e6, speed)
 
@@ -301,14 +301,14 @@ func staticSpeed(){
 			insertSql := fmt.Sprintf("insert into %s values(%d, %d)", saveTable, currentTime.UnixNano()/1e6, speed)
 			connection.Exec(insertSql)
 		}
-		
+
 		lastStaticTime = currentTime
 		lastTotalRows = total
 	}
 
 }
 
-func getTotalRows(successRows []int64) int64{
+func getTotalRows(successRows []int64) int64 {
 	var total int64 = 0
 	for j := 0; j < len(successRows); j++ {
 		total += successRows[j]
@@ -316,18 +316,18 @@ func getTotalRows(successRows []int64) int64{
 	return total
 }
 
-func getSuperTableTimeConfig(fileRows dataRows) (start, cycleTime, avgInterval int64){
+func getSuperTableTimeConfig(fileRows dataRows) (start, cycleTime, avgInterval int64) {
 	if auto == 1 {
 		// use auto generate data time
 		start = startTime
 		avgInterval = interval
 		maxTableRows := normalizationDataWithSameInterval(fileRows, avgInterval)
-		cycleTime = maxTableRows * avgInterval + avgInterval
+		cycleTime = maxTableRows*avgInterval + avgInterval
 
 	} else {
 
 		// use the sample data primary timestamp
-		sort.Sort(fileRows)// sort the file data by the primarykey
+		sort.Sort(fileRows) // sort the file data by the primarykey
 		minTime := getPrimaryKey(fileRows.rows[0][fileRows.config.Timestamp])
 		maxTime := getPrimaryKey(fileRows.rows[len(fileRows.rows)-1][fileRows.config.Timestamp])
 
@@ -340,21 +340,21 @@ func getSuperTableTimeConfig(fileRows dataRows) (start, cycleTime, avgInterval i
 
 		if minTime == maxTime {
 			avgInterval = interval
-			cycleTime = tableNum * avgInterval + avgInterval
-		}else{
+			cycleTime = tableNum*avgInterval + avgInterval
+		} else {
 			avgInterval = (maxTime - minTime) / int64(len(fileRows.rows)) * tableNum
 			cycleTime = maxTime - minTime + avgInterval
 		}
-	
+
 	}
 	return
 }
 
-func createStatisticTable(){
+func createStatisticTable() {
 	connection := getConnection()
 	defer connection.Close()
 
-	_, err := connection.Exec("create table if not exist " + db + "."+ saveTable +"(ts timestamp, speed int)")
+	_, err := connection.Exec("create table if not exist " + db + "." + saveTable + "(ts timestamp, speed int)")
 	if err != nil {
 		log.Fatalf("createStatisticTable error: %s\n", err)
 	}
@@ -379,8 +379,8 @@ func createSubTable(subTableMaps map[string]*dataRows) {
 			tableName := getScaleSubTableName(subTableName, i)
 
 			scaleTableMap[tableName] = &scaleTableInfo{
-				subTableName:   subTableName,
-				insertRows: 0,
+				subTableName: subTableName,
+				insertRows:   0,
 			}
 			scaleTableNames = append(scaleTableNames, tableName)
 
@@ -389,12 +389,12 @@ func createSubTable(subTableMaps map[string]*dataRows) {
 			buffers.WriteString(" using ")
 			buffers.WriteString(superTableName)
 			buffers.WriteString(" tags(")
-			for _, tag := range subTableMaps[subTableName].config.Tags{
+			for _, tag := range subTableMaps[subTableName].config.Tags {
 				tagValue := fmt.Sprintf("%v", tagValues[strings.ToLower(tag.Name)])
 				buffers.WriteString("'" + tagValue + "'")
 				buffers.WriteString(",")
 			}
-			buffers.Truncate(buffers.Len()-1)
+			buffers.Truncate(buffers.Len() - 1)
 			buffers.WriteString(")")
 
 			createTableSql := buffers.String()
@@ -451,14 +451,14 @@ func createSuperTable(superTableConfigMap map[string]*superTableConfig) {
 			buffer.WriteString(field.Name + " " + field.Type + ",")
 		}
 
-		buffer.Truncate(buffer.Len()-1)
+		buffer.Truncate(buffer.Len() - 1)
 		buffer.WriteString(") tags( ")
 
 		for _, tag := range superTableConf.config.Tags {
 			buffer.WriteString(tag.Name + " " + tag.Type + ",")
 		}
 
-		buffer.Truncate(buffer.Len()-1)
+		buffer.Truncate(buffer.Len() - 1)
 		buffer.WriteString(")")
 
 		createSql := buffer.String()
@@ -475,16 +475,15 @@ func createSuperTable(superTableConfigMap map[string]*superTableConfig) {
 
 func getScaleSubTableName(subTableName string, hnum int) string {
 	if hnum == 0 {
-		 return subTableName
+		return subTableName
 	}
-	return fmt.Sprintf(  "%s_%d", subTableName, hnum)
+	return fmt.Sprintf("%s_%d", subTableName, hnum)
 }
 
 func getSuperTableName(stname string) string {
 	return SUPERTABLE_PREFIX + stname
 }
 
-
 /**
 * normalizationData , and return the num of subTables
  */
@@ -505,12 +504,12 @@ func normalizationData(fileRows dataRows, minTime int64) int64 {
 		value, ok := subTableMap[subTableName]
 		if !ok {
 			subTableMap[subTableName] = &dataRows{
-				rows:         []map[string]interface{}{row},
-				config:       fileRows.config,
+				rows:   []map[string]interface{}{row},
+				config: fileRows.config,
 			}
 
 			tableNum++
-		}else{
+		} else {
 			value.rows = append(value.rows, row)
 		}
 	}
@@ -518,9 +517,9 @@ func normalizationData(fileRows dataRows, minTime int64) int64 {
 }
 
 // return the maximum table rows
-func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int64{
+func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int64 {
 	// subTableMap
-	currSubTableMap	:= make(map[string]*dataRows)
+	currSubTableMap := make(map[string]*dataRows)
 	for _, row := range fileRows.rows {
 		// get subTableName
 		tableValue := getSubTableNameValue(row[fileRows.config.SubTableName])
@@ -534,10 +533,10 @@ func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int
 		if !ok {
 			row[fileRows.config.Timestamp] = 0
 			currSubTableMap[subTableName] = &dataRows{
-				rows:         []map[string]interface{}{row},
-				config:       fileRows.config,
+				rows:   []map[string]interface{}{row},
+				config: fileRows.config,
 			}
-		}else{
+		} else {
 			row[fileRows.config.Timestamp] = int64(len(value.rows)) * avgInterval
 			value.rows = append(value.rows, row)
 		}
@@ -545,7 +544,7 @@ func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int
 	}
 
 	var maxRows, tableRows int = 0, 0
-	for tableName := range currSubTableMap{
+	for tableName := range currSubTableMap {
 		tableRows = len(currSubTableMap[tableName].rows)
 		subTableMap[tableName] = currSubTableMap[tableName] // add to global subTableMap
 		if tableRows > maxRows {
@@ -556,13 +555,11 @@ func normalizationDataWithSameInterval(fileRows dataRows, avgInterval int64) int
 	return int64(maxRows)
 }
 
-
-func getSubTableName(subTableValue string, superTableName string)  string {
+func getSubTableName(subTableValue string, superTableName string) string {
 	return SUBTABLE_PREFIX + subTableValue + "_" + superTableName
 }
 
-
-func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []int64) {
+func insertData(threadIndex, start, end int, wg *sync.WaitGroup, successRows []int64) {
 	connection := getConnection()
 	defer connection.Close()
 	defer wg.Done()
@@ -591,9 +588,9 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 			var tableEndTime int64
 			if vnum == 0 {
 				// need continue generate data
-				tableEndTime = time.Now().UnixNano()/1e6
-			}else {	
-				tableEndTime = tableStartTime + superTableConf.cycleTime * int64(vnum) - superTableConf.avgInterval
+				tableEndTime = time.Now().UnixNano() / 1e6
+			} else {
+				tableEndTime = tableStartTime + superTableConf.cycleTime*int64(vnum) - superTableConf.avgInterval
 			}
 
 			insertRows := scaleTableMap[tableName].insertRows
@@ -603,10 +600,10 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 				rowIndex := insertRows % subTableRows
 				currentRow := subTableInfo.rows[rowIndex]
 
-				currentTime := getPrimaryKey(currentRow[subTableInfo.config.Timestamp]) + loopNum * superTableConf.cycleTime + tableStartTime
+				currentTime := getPrimaryKey(currentRow[subTableInfo.config.Timestamp]) + loopNum*superTableConf.cycleTime + tableStartTime
 				if currentTime <= tableEndTime {
 					// append
-					
+
 					if lastTableName != tableName {
 						buffers.WriteString(tableName)
 						buffers.WriteString(" values")
@@ -616,24 +613,25 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 					buffers.WriteString("(")
 					buffers.WriteString(fmt.Sprintf("%v", currentTime))
 					buffers.WriteString(",")
-					
+
 					// fieldNum := len(subTableInfo.config.Fields)
-					for _,field := range subTableInfo.config.Fields {
+					for _, field := range subTableInfo.config.Fields {
 						buffers.WriteString(getFieldValue(currentRow[strings.ToLower(field.Name)]))
 						buffers.WriteString(",")
 						// if( i != fieldNum -1){
-							
+
 						// }
 					}
 
-					buffers.Truncate(buffers.Len()-1)
+					buffers.Truncate(buffers.Len() - 1)
 					buffers.WriteString(") ")
 
 					appendRows++
 					insertRows++
-					if  appendRows == batch {
+					if appendRows == batch {
 						// executebatch
 						insertSql := buffers.String()
+						connection.Exec("use " + db)
 						affectedRows := executeBatchInsert(insertSql, connection)
 
 						successRows[threadIndex] += affectedRows
@@ -644,7 +642,7 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 						lastTableName = ""
 						appendRows = 0
 					}
-				}else {
+				} else {
 					// finished insert current table
 					break
 				}
@@ -653,13 +651,14 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 			scaleTableMap[tableName].insertRows = insertRows
 
 		}
-		
+
 		// left := len(rows)
-		if  appendRows > 0 {
+		if appendRows > 0 {
 			// executebatch
 			insertSql := buffers.String()
+			connection.Exec("use " + db)
 			affectedRows := executeBatchInsert(insertSql, connection)
-			
+
 			successRows[threadIndex] += affectedRows
 			currSuccessRows += affectedRows
 
@@ -674,7 +673,7 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 			break
 		}
 
-		if(num == 0){
+		if num == 0 {
 			wg.Done() //finished insert history data
 			num++
 		}
@@ -689,7 +688,7 @@ func insertData(threadIndex, start, end int, wg  *sync.WaitGroup, successRows []
 
 }
 
-func buildSql(rows []tableRows) string{
+func buildSql(rows []tableRows) string {
 
 	var lastTableName string
 
@@ -707,7 +706,7 @@ func buildSql(rows []tableRows) string{
 
 		if lastTableName == row.tableName {
 			buffers.WriteString(row.value)
-		}else {
+		} else {
 			buffers.WriteString(" ")
 			buffers.WriteString(row.tableName)
 			buffers.WriteString(" values")
@@ -720,7 +719,7 @@ func buildSql(rows []tableRows) string{
 	return inserSql
 }
 
-func buildRow(tableName string, currentTime int64, subTableInfo *dataRows, currentRow map[string]interface{}) tableRows{
+func buildRow(tableName string, currentTime int64, subTableInfo *dataRows, currentRow map[string]interface{}) tableRows {
 
 	tableRows := tableRows{tableName: tableName}
 
@@ -730,12 +729,12 @@ func buildRow(tableName string, currentTime int64, subTableInfo *dataRows, curre
 	buffers.WriteString(fmt.Sprintf("%v", currentTime))
 	buffers.WriteString(",")
 
-	for _,field := range subTableInfo.config.Fields {
+	for _, field := range subTableInfo.config.Fields {
 		buffers.WriteString(getFieldValue(currentRow[strings.ToLower(field.Name)]))
 		buffers.WriteString(",")
 	}
 
-	buffers.Truncate(buffers.Len()-1)
+	buffers.Truncate(buffers.Len() - 1)
 	buffers.WriteString(")")
 
 	insertSql := buffers.String()
@@ -762,7 +761,7 @@ func getFieldValue(fieldValue interface{}) string {
 	return fmt.Sprintf("'%v'", fieldValue)
 }
 
-func getConnection() *sql.DB{
+func getConnection() *sql.DB {
 	db, err := sql.Open(DRIVER_NAME, dataSourceName)
 	if err != nil {
 		panic(err)
@@ -770,7 +769,6 @@ func getConnection() *sql.DB{
 	return db
 }
 
-
 func getSubTableNameValue(suffix interface{}) string {
 	return fmt.Sprintf("%v", suffix)
 }
@@ -948,7 +946,7 @@ func parseMillisecond(str interface{}, layout string) int64 {
 		log.Println(err)
 		return -1
 	}
-	return  t.UnixNano()/1e6
+	return t.UnixNano() / 1e6
 }
 
 // lowerMapKey transfer all the map key to lowercase
@@ -1007,7 +1005,7 @@ func checkUserCaseConfig(caseName string, caseConfig *dataimport.CaseConfig) {
 			if i < len(caseConfig.Fields)-1 {
 				// delete middle item,  a = a[:i+copy(a[i:], a[i+1:])]
 				caseConfig.Fields = caseConfig.Fields[:i+copy(caseConfig.Fields[i:], caseConfig.Fields[i+1:])]
-			}else {
+			} else {
 				// delete the last item
 				caseConfig.Fields = caseConfig.Fields[:len(caseConfig.Fields)-1]
 			}
@@ -1055,7 +1053,7 @@ func parseArg() {
 	flag.Parse()
 }
 
-func printArg()  {
+func printArg() {
 	fmt.Println("used param: ")
 	fmt.Println("-cfg: ", cfg)
 	fmt.Println("-cases:", cases)
diff --git a/importSampleData/bin/taosimport b/importSampleData/bin/taosimport
deleted file mode 100755
index b042549341bced364e0fd77909b115d1b5b6dc04..0000000000000000000000000000000000000000
Binary files a/importSampleData/bin/taosimport and /dev/null differ
diff --git a/minidevops/README.MD b/minidevops/README.MD
index f9ec4a8f190071d98d4b17de5b0bf3671bd38d6a..9937ad04ad91a4aacdf41f75294052af5024e4cb 100644
--- a/minidevops/README.MD
+++ b/minidevops/README.MD
@@ -7,8 +7,10 @@
 - grafana/grafana                                         Grafana的镜像，一个广泛应用的开源可视化监控软件
 - telegraf:latest                                            一个广泛应用的开源数据采集程序
 - prom/prometheus:latest                           一个广泛应用的k8s领域的开源数据采集程序
+
 ## 说明
 本文中的图片链接在Github上显示不出来，建议将MD文件下载后用vscode或其他md文件浏览工具进行查看
+
 ## 前提条件
 1. 一台linux服务器或运行linux操作系统的虚拟机或者运行MacOS的计算机
 2. 安装了Docker软件。Docker软件的安装方法请参考linux下安装Docker
@@ -216,4 +218,8 @@ use telegraf；
 使用telegraf这个数据库。然后执行show tables，describe table等命令详细查询下telegraf这个库里保存了些什么数据。
 具体TDengine的查询语句可以参考[TDengine官方文档](https://www.taosdata.com/cn/documentation/taos-sql/)
 ## 接入多个监控对象
+<<<<<<< HEAD
+就像前面原理介绍的，这个miniDevops的小系统，已经提供了一个时序数据库和可视化系统，对于多台机器的监控，只需要将每台机器的telegraf或prometheus配置按上面所述修改，就可以完成监控数据采集和可视化呈现了。
+=======
 就像前面原理介绍的，这个miniDevops的小系统，已经提供了一个时序数据库和可视化系统，对于多台机器的监控，只需要将每台机器的telegraf或prometheus配置按上面所述修改，就可以完成监控数据采集和可视化呈现了。
+>>>>>>> 740f82af58c4ecc2deecfa36fb1de4ef5ee55efc
diff --git a/minidevops/grafana/tdengine/partials/config.html b/minidevops/grafana/tdengine/partials/config.html
index 801a75327188e95fa437ee1aabe06e6d04101f0a..f12eb86354df195612d495d07ad8eae2be145c63 100644
--- a/minidevops/grafana/tdengine/partials/config.html
+++ b/minidevops/grafana/tdengine/partials/config.html
@@ -3,7 +3,7 @@
 <div class="gf-form-group">
 	<div class="gf-form max-width-30">
 		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6041" bs-typeahead="{{['http://localhost:6041']}}" required></input>
 	</div>
 
 	<div class="gf-form-inline">
diff --git a/minidevops/run.sh b/minidevops/run.sh
index 15e74d0e5a0c23a60e434cf818fe92101b58fbb5..8e03d6e8889ff0265781d4d2415931832c8b76cb 100755
--- a/minidevops/run.sh
+++ b/minidevops/run.sh
@@ -1,35 +1,28 @@
 #!/bin/bash
 
 #set -x
-LP=`pwd`
-#echo $LP
 
 docker rm -f `docker ps -a -q`
 docker network rm minidevops
 docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 minidevops 
 
-#docker run -d   --net="host"   --pid="host"   -v "/:/host:ro"   quay.io/prometheus/node-exporter   --path.rootfs=/host
 
-docker run -d --net minidevops --ip 172.15.1.11 -v $LP/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
-#docker run -d --net minidevops --ip 172.15.1.11 -v /Users/tom/Documents/minidevops/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
+docker run -d --net minidevops --ip 172.15.1.11 -v $(pwd)/grafana:/var/lib/grafana/plugins -p 3000:3000 grafana/grafana
 
-TDENGINE=`docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 tdengine/tdengine:1.6.4.5` 
-docker cp /etc/localtime $TDENGINE:/etc/localtime
+docker run -d --net minidevops --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 -p 6040:6040 -p 6041:6041 -h '172.15.1.6' tdengine/tdengine:2.0.0.0
 
-BLMPROMETHEUS=`docker run -d --net minidevops --ip 172.15.1.7 -p 10203:10203 tdengine/blm_prometheus 172.15.1.6`
+docker run -d --net minidevops --ip 172.15.1.7 -v $(pwd)/taos:/etc/taos -p 10203:10203 tdengine/blm_prometheus:2.0.0.0 -tdengine-name 172.15.1.6 -tdengine-api-port 6041
 
 
-BLMPTELEGRAF=`docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf 172.15.1.6`
+docker run -d --net minidevops --ip 172.15.1.8 -p 10202:10202 tdengine/blm_telegraf:2.0.0.0 -host 172.15.1.6
 
-docker run -d  --net minidevops --ip 172.15.1.9 -v $LP/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
-#docker run -d  --net minidevops --ip 172.15.1.9 -v /Users/tom/Documents/minidevops/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
+docker run -d  --net minidevops --ip 172.15.1.9 -v $(pwd)/prometheus:/etc/prometheus -p 9090:9090 prom/prometheus
 
-docker run -d --net minidevops --ip 172.15.1.10 -v $LP/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
-#docker run -d --net minidevops --ip 172.15.1.10 -v /Users/tom/Documents/minidevops/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
+docker run -d --net minidevops --ip 172.15.1.10 -v $(pwd)/telegraf:/etc/telegraf -p 8092:8092 -p 8094:8094 -p 8125:8125 telegraf
 
 
 sleep 10
-curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6020","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'
+curl -X POST http://localhost:3000/api/datasources --header "Content-Type:application/json" -u admin:admin -d '{"Name": "TDengine","Type": "tdengine","TypeLogoUrl": "public/plugins/tdengine/img/taosdata_logo.png","Access": "proxy","Url": "http://172.15.1.6:6041","BasicAuth": false,"isDefault": true,"jsonData": {},"readOnly": false}'
 
 curl -X POST http://localhost:3000/api/dashboards/db --header "Content-Type:application/json" -u admin:admin -d '{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":"-- Grafana --","enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"gnetId":null,"graphTooltip":0,"id":1,"links":[],"panels":[{"datasource":null,"gridPos":{"h":8,"w":6,"x":0,"y":0},"id":6,"options":{"fieldOptions":{"calcs":["mean"],"defaults":{"color":{"mode":"thresholds"},"links":[{"title":"","url":""}],"mappings":[],"max":100,"min":0,"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null},{"color":"red","value":80}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showThresholdLabels":false,"showThresholdMarkers":true},"pluginVersion":"6.6.0","targets":[{"refId":"A","sql":"select last_row(value) from telegraf.mem where field=\"used_percent\""}],"timeFrom":null,"timeShift":null,"title":"Memory used percent","type":"gauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":null,"fill":1,"fillGradient":0,"gridPos":{"h":8,"w":12,"x":6,"y":0},"hiddenSeries":false,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"MEMUSED-PERCENT","refId":"A","sql":"select avg(value) from telegraf.mem where field=\"used_percent\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"MEM","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}},{"datasource":null,"gridPos":{"h":3,"w":18,"x":0,"y":8},"id":10,"options":{"displayMode":"lcd","fieldOptions":{"calcs":["mean"],"defaults":{"mappings":[],"thresholds":{"mode":"absolute","steps":[{"color":"green","value":null}]},"unit":"percent"},"overrides":[],"values":false},"orientation":"auto","showUnfilled":true},"pluginVersion":"6.6.0","targets":[{"alias":"CPU-SYS","refId":"A","sql":"select last_row(value) from telegraf.cpu where field=\"usage_system\""},{"alias":"CPU-IDLE","refId":"B","sql":"select last_row(value) from telegraf.cpu where field=\"usage_idle\""},{"alias":"CPU-USER","refId":"C","sql":"select last_row(value) from telegraf.cpu where field=\"usage_user\""}],"timeFrom":null,"timeShift":null,"title":"CPU-USED","type":"bargauge"},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"TDengine","description":"General CPU monitor","fill":1,"fillGradient":0,"gridPos":{"h":9,"w":18,"x":0,"y":11},"hiddenSeries":false,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"nullPointMode":"null","options":{"dataLinks":[]},"percentage":false,"pointradius":2,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"stack":false,"steppedLine":false,"targets":[{"alias":"CPU-USER","refId":"A","sql":"select avg(value) from telegraf.cpu where field=\"usage_user\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-SYS","refId":"B","sql":"select avg(value) from telegraf.cpu where field=\"usage_system\" and cpu=\"cpu-total\" interval(1m)"},{"alias":"CPU-IDLE","refId":"C","sql":"select avg(value) from telegraf.cpu where field=\"usage_idle\" and cpu=\"cpu-total\" interval(1m)"}],"thresholds":[],"timeFrom":null,"timeRegions":[],"timeShift":null,"title":"CPU","tooltip":{"shared":true,"sort":0,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":true}],"yaxis":{"align":false,"alignLevel":null}}],"refresh":"10s","schemaVersion":22,"style":"dark","tags":["demo"],"templating":{"list":[]},"time":{"from":"now-3h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"]},"timezone":"","title":"TDengineDashboardDemo","id":null,"uid":null,"version":0}}'
 
diff --git a/minidevops/taos/taos.cfg b/minidevops/taos/taos.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..b20ce9d755ce50f16548ab84b820e554ead23358
--- /dev/null
+++ b/minidevops/taos/taos.cfg
@@ -0,0 +1 @@
+debugFlag 135
diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index 588f0650bd8b67033504d5f0b9c3f77cca24c54a..fdb846670656b189d12368c519348367ec4d2974 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -5,157 +5,98 @@
 #                                                      #
 ########################################################
 
-# master IP for TDengine system
-# masterIp              127.0.0.1
-
-# second IP for TDengine system, for cluster version only 
-# secondIp              127.0.0.1
-
-# IP address of the server
-# privateIp             127.0.0.1
-
-# public IP of server, on which the tdengine are deployed
-# this IP is assigned by cloud service provider, for cluster version only 
-# publicIp              127.0.0.1   
-
-# network is bound to 0.0.0.0
-# anyIp                 1
-
-# set socket type ("udp" and "tcp")
-# the server and client should have the same socket type. Otherwise, connect will fail
-# sockettype            udp
-
-# client local IP
-# localIp               127.0.0.1
-
-# for the cluster version, data file's directory is configured this way 
-# option                mount_path           tier_level
-# dataDir               /mnt/disk1/taos      0
-# dataDir               /mnt/disk2/taos      0
-# dataDir               /mnt/disk3/taos      0
-# dataDir               /mnt/disk4/taos      0
-# dataDir               /mnt/disk5/taos      0
-# dataDir               /mnt/disk6/taos      1
-# dataDir               /mnt/disk7/taos      1
-# for the stand-alone version, data file's directory is configured this way 
-# dataDir               /var/lib/taos
-
-# log file's directory
-# logDir                /var/log/taos
-
-# http service port, default tcp[6020]
-# httpPort              6020
+# first fully qualified domain name (FQDN) for TDengine system
+# firstEp               hostname1:6030
 
-# port for MNode connect to Client, default udp[6030-6034] tcp[6030]
-# mgmtShellPort         6030
+# second fully qualified domain name (FQDN) for TDengine system, for cluster only
+# secondEp              cluster_hostname2:6030
 
-# port for DNode connect to Client, default udp[6035-6039] tcp[6035]
-# vnodeShellPort        6035
+# local fully qualified domain name (FQDN)
+# fqdn                  hostname
 
-# port for MNode connect to VNode, default udp[6040-6044] tcp[6040], for cluster version only 
-# mgmtVnodePort         6040
+# first port number for the connection (12 continuous UDP/TCP port number are used) 
+# serverPort            6030
 
-# port for DNode connect to DNode, default tcp[6045], for cluster version only 
-# vnodeVnodePort        6045
+# log file's directory
+# logDir                /var/log/taos
 
-# port for MNode connect to MNode, default udp[6050], for cluster version only 
-# mgmtMgmtPort          6050
+# data file's directory
+# dataDir               /var/lib/taos
 
-# port sync file MNode and MNode, default tcp[6050], for cluster version only 
-# mgmtSyncPort          6050
+# the arbitrator's fully qualified domain name (FQDN) for TDengine system, for cluster only   
+# arbitrator            arbitrator_hostname:6042     
 
 # number of threads per CPU core
-# numOfThreadsPerCore   1
-
-# number of vnodes per core in DNode
-# numOfVnodesPerCore    8
-
-# number of total vnodes in DNode
-# numOfTotalVnodes      0
+# numOfThreadsPerCore   1.0
 
-# max number of sessions per vnode
-# tables                1024
+# number of management nodes in the system
+# numOfMnodes           3
 
-# cache block size
-# cache                 16384
+# enable/disable backuping vnode directory when removing dnode
+# vnodeBak              1
 
-# row in file block
-# rows                  4096
+# enable/disable load balancing
+# balance               1
 
-# average cache blocks per meter
-# ablocks               4
+# role for dnode. 0 - any, 1 - mnode, 2 - dnode
+# role                  0
 
-# max number of cache blocks per Meter
-# tblocks               512
+# max timer control blocks
+# maxTmrCtrl            512
 
-# interval of system monitor 
-# monitorInterval       60
+# time interval of system monitor, seconds 
+# monitorInterval       30
 
-# 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
+# number of seconds allowed for a dnode to be offline, for cluster only 
+# offlineThreshold      8640000
 
 # RPC re-try timer, millisecond
 # rpcTimer              300
 
-# RPC maximum time for ack, seconds
+# RPC maximum time for ack, seconds. 
 # rpcMaxTime            600
 
-# commit interval，unit is second
-# ctime                 3600
-
-# interval of DNode report status to MNode, unit is Second, for cluster version only 
+# time interval of dnode status reporting to mnode, seconds, for cluster only 
 # statusInterval        1
 
-# interval of Shell send HB to MNode, unit is Second
+# time interval of heart beat from shell to dnode, seconds
 # shellActivityTimer    3
 
-# interval of DNode send HB to DNode, unit is Second, for cluster version only 
-# vnodePeerHBTimer      1
+# time of keeping table meta data in cache, seconds
+# tableMetaKeepTimer    7200
 
-# interval of MNode send HB to MNode, unit is Second, for cluster version only 
-# mgmtPeerHBTimer       1
+# minimum sliding window time, milli-second
+# minSlidingTime        10
 
-# time to keep MeterMeta in Cache, seconds
-# meterMetaKeepTimer    7200
+# minimum time window, milli-second
+# minIntervalTime       10
 
-# time to keep MetricMeta in Cache, seconds
-# metricMetaKeepTimer   600 
+# maximum delay before launching a stream compution, milli-second
+# maxStreamCompDelay    20000
 
-# max number of users
-# maxUsers              1000
+# maximum delay before launching a stream computation for the first time, milli-second
+# maxFirstStreamCompDelay   10000
 
-# max number of databases
-# maxDbs                1000
+# retry delay when a stream computation fails, milli-second
+# retryStreamCompDelay      10
 
-# max number of tables
-# maxTables             650000
+# the delayed time for launching a stream computation, from 0.1(default, 10% of whole computing time window) to 0.9
+# streamCompDelayRatio      0.1
 
-# max number of Dnodes, for cluster version only 
-# maxDnodes             1000
+# max number of vgroups per db, 0 means configured automatically
+# maxVgroupsPerDb           0
 
-# Max number of VGroups, for cluster version only 
-# maxVGroups            1000
+# max number of tables per vnode
+# maxTablesPerVnode         1000000
 
-# system locale
-# locale                en_US.UTF-8
+# step size of increasing table number in a vnode
+# tableIncStepPerVnode      1000
 
-# default system charset
-# charset               UTF-8
+# cache block size (Mbyte)
+# cache                     16
 
-# system time zone
-# timezone              Asia/Shanghai (CST, +0800)
-
-# enable/disable commit log
-# clog                  1
-
-# enable/disable async log
-# asyncLog              1
-
-# enable/disable compression
-# comp                  1
+# number of cache blocks per vnode
+# blocks                    6
 
 # number of days per DB file
 # days                  10
@@ -163,116 +104,163 @@
 # number of days to keep DB file
 # keep                  3650
 
-# number of replications, for cluster version only 
-# replications          1
+# minimum rows of records in file block
+# minRows               100
 
-# client default database(database should be created)
-# defaultDB
+# maximum rows of records in file block
+# maxRows               4096
 
-# client default username
-# defaultUser           root
+# enable/disable compression
+# comp                  2
 
-# client default password
-# defaultPass           taosdata
+# write ahead log (WAL) level, 0: no wal; 1: write wal, but no fysnc; 2: write wal, and call fsync
+# walLevel              1
 
-# max number of connections from client for mgmt node
-# maxShellConns         2000
+# if walLevel is set to 2, the cycle of fsync being executed, if set to 0, fsync is called right away
+# fsync                 3000
 
-# max numerber of meter Connections
-# maxMeterConnections   10000
+# number of replications, for cluster only 
+# replica               1
 
-# max connection to management node
-# maxMgmtConnections    2000
+# mqtt hostname  
+# mqttHostName          test.mosquitto.org
 
-# max connection to Vnode
-# maxVnodeConnections   10000
+# mqtt port  
+# mqttPort              1883
 
-# mnode take into account while balance, for cluster version only 
-# mgmtEqualVnodeNum     4
+# mqtt topic
+# mqttTopic             /test
 
-# number of seconds allowed for a dnode to be offline, for cluster version only 
-# offlineThreshold      864000
+# 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
+
+# max length of an SQL
+# maxSQLLength          65480
+
+# the maximum number of records allowed for super table time sorting
+# maxNumOfOrderedRes    100000
+
+# system time zone
+# timezone              Asia/Shanghai (CST, +0800)
 
-# start http service
+# system locale
+# locale                en_US.UTF-8
+
+# default system charset
+# charset               UTF-8
+
+# max number of connections allowed in dnode
+# maxShellConns         5000
+
+# max numerber of connections allowed in client 
+# maxConnections        5000
+
+# stop writing logs when the disk size of the log folder is less than this value
+# minimalLogDirGB       0.1
+
+# stop writing temporary files when the disk size of the log folder is less than this value
+# minimalTmpDirGB       0.1
+
+# stop writing data when the disk size of the log folder is less than this value
+# minimalDataDirGB      0.1
+
+# enbale/disable http service
 # http                  1
 
-# start system monitor module
+# enable/disable muqq service
+# mqtt                  0
+
+# enable/disable system monitor 
 # monitor               1
 
-# maximum number of rows returned by the restful interface
-# restfulRowLimit       10240
+# enable/disable recording the SQL statements via restful interface
+# httpEnableRecordSql   0
 
 # number of threads used to process http requests
 # httpMaxThreads        2
 
-# pre-allocated number of http sessions
-# httpCacheSessions     100
-
-# whether to enable HTTP compression transmission
-# httpEnableCompress    0
-
-# the delayed time for launching each continuous query. 10% of the whole computing time window by default.
-# streamCompDelayRatio  0.1
-
-# the max allowed delayed time for launching continuous query. 20ms by default
-# tsMaxStreamComputDelay  20000
-
-# whether the telegraf table name contains the number of tags and the number of fields
-# telegrafUseFieldNum   0
-
-# enable table names generated by telegraf can be configured
-# use /etc/taos/taos.telegraf.cfg as the configuration file, such as
-# {
-#  "metrics": [
-#    {
-#      "name" : "system",
-#      "tbname" : "system_uptime",
-#      "fields": [
-#        "uptime"
-#      ]
-#    },
-#    {
-#      "name": "system",
-#      "tbname" : "system_uptime_format",
-#      "fields": [
-#        "uptime_format"
-#      ]
-#    }
-#    ]
-#  }
+# maximum number of rows returned by the restful interface
+# restfulRowLimit       10240
 
 # The following parameter is used to limit the maximum number of lines in log files.
 # max number of rows per log filters
 # numOfLogLines         10000000
 
+# time of keeping log files, days
+# logKeepDays           0
+
+# enable/disable async log
+# asyncLog              1
+
 # The following parameters are used for debug purpose only.
 # debugFlag 8 bits mask: FILE-SCREEN-UNUSED-HeartBeat-DUMP-TRACE_WARN-ERROR
-# 131: output warning and error，135: output info, warning and error to log.
-# 199: output debug, info, warning and error to both screen and file
+# 131: output warning and error, 135: output debug, warning and error, 143 : output trace, debug, warning and error to log.
+# 199: output debug, warning and error to both screen and file
+# 207: output trace, debug, warning and error to both screen and file
+
+# debug flag for all log type, take effect when non-zero value
+# debugFlag             0
 
 # debug flag for meta management messages
 # mDebugFlag            135
 
 # debug flag for dnode messages
-# dDebugFlag            131
+# dDebugFlag            135
+
+# debug flag for sync module
+# sDebugFlag            135
 
-# debug flag for TDengine SDB
+# debug flag for WAL
+# wDebugFlag            135
+
+# debug flag for SDB
 # sdbDebugFlag          135
 
 # debug flag for RPC 
 # rpcDebugFlag          131
 
-# debug flag for basic utils
-# debugFlag             131
+# debug flag for TAOS TIMER
+# tmrDebugFlag          131
 
 # debug flag for TDengine client 
 # cDebugFlag            131
 
+# debug flag for JNI
+# jniDebugflag          131
+
+# debug flag for ODBC
+# odbcDebugflag         131
+
+# debug flag for storage
+# uDebugflag            131
+
 # debug flag for http server
 # httpDebugFlag         131
 
-# debug flag for system monitor 
+# debug flag for mqtt
+# mqttDebugFlag         131
+
+# debug flag for monitor
 # monitorDebugFlag      131
 
-# debug flag for TAOS TIMER
-# tmrDebugFlag          131
+# debug flag for query
+# qDebugflag            131
+
+# debug flag for vnode
+# vDebugflag            131
+
+# debug flag for http server
+# tsdbDebugFlag         131
+
+# enable/disable recording the SQL in taos client
+# tscEnableRecordSql    0
+
+# generate core file when service crash
+# enableCoreFile        1
+
+# maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
+# maxBinaryDisplayWidth 30
+
diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index faa29aeac8d484fc1858afca73eda2a248169a46..450c6a8f551fe7dd8dff5e53f5dad639aec4656e 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -47,7 +47,6 @@ cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
 cp ${compile_dir}/../packaging/tools/post.sh        ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_path}/script
-cp ${compile_dir}/build/bin/taosdump                ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosdemo                ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
@@ -55,9 +54,10 @@ cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_pat
 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/grafanaplugin        ${pkg_dir}${install_home_path}/connector
 cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
 cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector
+cp -r ${top_dir}/src/connector/nodejs               ${pkg_dir}${install_home_path}/connector
 cp ${compile_dir}/build/lib/taos-jdbcdriver*dist.*  ${pkg_dir}${install_home_path}/connector
 
 cp -r ${compile_dir}/../packaging/deb/DEBIAN        ${pkg_dir}/
@@ -72,10 +72,10 @@ sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
 
 if [ "$verMode" == "cluster" ]; then
   debname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   debname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
diff --git a/packaging/deb/powerd b/packaging/deb/powerd
new file mode 100644
index 0000000000000000000000000000000000000000..bb77aab1660545c62e5db27b8a37d5d5937f623f
--- /dev/null
+++ b/packaging/deb/powerd
@@ -0,0 +1,88 @@
+#!/bin/bash 
+#
+# Modified from original source: Elastic Search
+# https://github.com/elasticsearch/elasticsearch
+# Thank you to the Elastic Search authors
+#
+# chkconfig: 2345 99 01
+#
+### BEGIN INIT INFO
+# Provides:          PowerDB
+# Required-Start:    $local_fs $network $syslog
+# Required-Stop:     $local_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts PowerDB powerd
+# Description:       Starts PowerDB powerd, a time-series database engine
+### END INIT INFO
+
+set -e
+
+PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+NAME="PowerDB"
+USER="root"
+GROUP="root"
+DAEMON="/usr/local/power/bin/powerd"
+DAEMON_OPTS=""
+PID_FILE="/var/run/$NAME.pid"
+APPARGS=""
+
+# Maximum number of open files
+MAX_OPEN_FILES=65535
+
+. /lib/lsb/init-functions
+
+case "$1" in
+    start)
+
+        log_action_begin_msg "Starting PowerDB..."
+        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
+
+            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
+
+            if [ -n "$MAX_OPEN_FILES" ]; then
+                ulimit -n $MAX_OPEN_FILES
+            fi
+
+            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
+
+            log_end_msg $?
+        fi
+        ;;
+
+    stop)
+        log_action_begin_msg "Stopping PowerDB..."
+        set +e
+        if [ -f "$PID_FILE" ]; then
+            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
+            if [ $? -eq 1 ]; then
+                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
+            elif [ $? -eq 3 ]; then
+                PID="`cat $PID_FILE`"
+                log_failure_msg "Failed to stop PowerDB (pid $PID)"
+                exit 1
+            fi
+            rm -f "$PID_FILE"
+        else
+            log_action_cont_msg "PowerDB was not running"
+        fi
+        log_action_end_msg 0
+        set -e
+        ;;
+
+    restart|force-reload)
+        if [ -f "$PID_FILE" ]; then
+            $0 stop
+            sleep 1
+        fi
+        $0 start
+        ;;
+    status)
+        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
+        ;;
+    *)
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/packaging/deb/tarbitratord b/packaging/deb/tarbitratord
new file mode 100644
index 0000000000000000000000000000000000000000..3f97c3c0c2143817ad4ecbb13fabd8c09fb44c69
--- /dev/null
+++ b/packaging/deb/tarbitratord
@@ -0,0 +1,88 @@
+#!/bin/bash 
+#
+# Modified from original source: Elastic Search
+# https://github.com/elasticsearch/elasticsearch
+# Thank you to the Elastic Search authors
+#
+# chkconfig: 2345 99 01
+#
+### BEGIN INIT INFO
+# Provides:          taoscluster
+# Required-Start:    $local_fs $network $syslog
+# Required-Stop:     $local_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts taoscluster tarbitrator
+# Description:       Starts taoscluster tarbitrator, a arbitrator
+### END INIT INFO
+
+set -e
+
+PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+NAME="taoscluster"
+USER="root"
+GROUP="root"
+DAEMON="/usr/local/taos/bin/tarbitrator"
+DAEMON_OPTS=""
+PID_FILE="/var/run/$NAME.pid"
+APPARGS=""
+
+# Maximum number of open files
+MAX_OPEN_FILES=65535
+
+. /lib/lsb/init-functions
+
+case "$1" in
+    start)
+
+        log_action_begin_msg "Starting tarbitrator..."
+        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
+
+            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
+
+            if [ -n "$MAX_OPEN_FILES" ]; then
+                ulimit -n $MAX_OPEN_FILES
+            fi
+
+            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
+
+            log_end_msg $?
+        fi
+        ;;
+
+    stop)
+        log_action_begin_msg "Stopping tarbitrator..."
+        set +e
+        if [ -f "$PID_FILE" ]; then
+            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
+            if [ $? -eq 1 ]; then
+                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
+            elif [ $? -eq 3 ]; then
+                PID="`cat $PID_FILE`"
+                log_failure_msg "Failed to stop tarbitrator (pid $PID)"
+                exit 1
+            fi
+            rm -f "$PID_FILE"
+        else
+            log_action_cont_msg "tarbitrator was not running"
+        fi
+        log_action_end_msg 0
+        set -e
+        ;;
+
+    restart|force-reload)
+        if [ -f "$PID_FILE" ]; then
+            $0 stop
+            sleep 1
+        fi
+        $0 start
+        ;;
+    status)
+        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
+        ;;
+    *)
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index b01f375db0bc49e07ddb6b9d5e3c1692455857a7..668d5a49eb53aebe6185d1dc75a22afab4da3367 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -4,15 +4,14 @@ WORKDIR /root
 
 COPY tdengine.tar.gz /root/
 RUN tar -zxf tdengine.tar.gz
-WORKDIR /root/tdengine/
-RUN sh install.sh
+WORKDIR /root/TDengine-server/
+RUN sh install.sh -e no
 
 
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib"
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
-EXPOSE 6020 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
-EXPOSE 6043 6044 6045 6046 6047 6048 6049 6050
+EXPOSE 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos","/etc/taos/" ]
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index 280c27d7aa10248a73874518c30639b83203590b..7532832c07800d9f55a0043dd3564d5d58e81488 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -1,12 +1,5 @@
 #!/bin/bash
 set -x
-$1
-tar -zxf $1
-DIR=`echo $1|awk -F . '{print($1"."$2"."$3"."$4)}'`
-mv $DIR tdengine
-tar -czf tdengine.tar.gz tdengine
-TMP=`echo $1|awk -F . '{print($2"."$3"."$4)}'`
-TAG="1."$TMP
-docker build --rm -f "Dockerfile" -t tdengine/tdengine:$TAG "."
-docker login -u tdengine -p ********  #replace the docker registry username and password
-docker push tdengine/tdengine:$TAG
\ No newline at end of file
+docker build --rm -f "Dockerfile" -t tdengine/tdengine:$1 "."
+docker login -u tdengine -p $2  #replace the docker registry username and password
+docker push tdengine/tdengine:$1
diff --git a/packaging/release.sh b/packaging/release.sh
index 378a7fe203d3c4997b7fe6b1800abdb32b95ff7a..7542a5b4cafb69d5cee16bddfc9a5651eb717b92 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -5,15 +5,28 @@
 set -e
 #set -x
 
-# releash.sh -v [cluster | lite]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta]
+# releash.sh  -v [cluster | edge]  
+#             -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] 
+#             -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
+#             -V [stable | beta]
+#             -l [full | lite]
+#             -s [static | dynamic]
+#             -d [taos | power]
+#             -n [2.0.0.3]
+#             -m [2.0.0.0]
 
 # set parameters by default value
-verMode=lite     # [cluster, lite]
+verMode=edge     # [cluster, edge]
 verType=stable   # [stable, beta]
 cpuType=x64      # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
-osType=Linux     # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
-
-while getopts "hv:V:c:o:" arg
+osType=Linux     # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...]
+pagMode=full     # [full | lite]
+soMode=dynamic   # [static | dynamic]
+dbName=taos      # [taos | power]
+verNumber=""
+verNumberComp="2.0.0.0"
+
+while getopts "hv:V:c:o:l:s:d:n:m:" arg
 do
   case $arg in
     v)
@@ -28,12 +41,40 @@ do
       #echo "cpuType=$OPTARG"
       cpuType=$(echo $OPTARG)
       ;;
+    l)
+      #echo "pagMode=$OPTARG"
+      pagMode=$(echo $OPTARG)
+      ;;
+    s)
+      #echo "soMode=$OPTARG"
+      soMode=$(echo $OPTARG)
+      ;;
+    d)
+      #echo "dbName=$OPTARG"
+      dbName=$(echo $OPTARG)
+      ;;
+    n)
+      #echo "verNumber=$OPTARG"
+      verNumber=$(echo $OPTARG)
+      ;;
+    m)
+      #echo "verNumberComp=$OPTARG"
+      verNumberComp=$(echo $OPTARG)
+      ;;
     o)
       #echo "osType=$OPTARG"
       osType=$(echo $OPTARG)
       ;;
     h)
-      echo "Usage: `basename $0` -v [cluster | lite]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta]"
+      echo "Usage: `basename $0` -v [cluster | edge] "
+      echo "                  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] "
+      echo "                  -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | Ningsi60 | Ningsi80 |...] "
+      echo "                  -V [stable | beta] "
+      echo "                  -l [full | lite] "
+      echo "                  -s [static | dynamic] "
+      echo "                  -d [taos | power] "
+      echo "                  -n [version number] "
+      echo "                  -m [compatible version number] "
       exit 0
       ;;
     ?) #unknow option 
@@ -43,205 +84,148 @@ do
   esac
 done
 
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} soMode=${soMode} dbName=${dbName} verNumber=${verNumber} verNumberComp=${verNumberComp}"
 
 curr_dir=$(pwd)
 
 if [ "$osType" != "Darwin" ]; then
-    script_dir="$(dirname $(readlink -f $0))"
-    top_dir="$(readlink -f ${script_dir}/..)"
+  script_dir="$(dirname $(readlink -f $0))"
+  top_dir="$(readlink -f ${script_dir}/..)"
 else
-    script_dir=`dirname $0`
-    cd ${script_dir}
-    script_dir="$(pwd)"
-    top_dir=${script_dir}/..
+  script_dir=`dirname $0`
+  cd ${script_dir}
+  script_dir="$(pwd)"
+  top_dir=${script_dir}/..
 fi
 
-versioninfo="${top_dir}/src/util/src/version.c"
-
 csudo=""
-if command -v sudo > /dev/null; then
-    csudo="sudo"
-fi
+#if command -v sudo > /dev/null; then
+#  csudo="sudo"
+#fi
 
 function is_valid_version() {
-    [ -z $1 ] && return 1 || :
-
-    rx='^([0-9]+\.){3}(\*|[0-9]+)$'
-    if [[ $1 =~ $rx ]]; then
-        return 0
-    fi
+  [ -z $1 ] && return 1 || :
 
-    return 1
+  rx='^([0-9]+\.){3}(\*|[0-9]+)$'
+  if [[ $1 =~ $rx ]]; then
+    return 0
+  fi
+  return 1
 }
 
 function vercomp () {
-    if [[ $1 == $2 ]]; then
-        echo 0
-        exit 0
-    fi
-    local IFS=.
-    local i ver1=($1) ver2=($2)
-    # fill empty fields in ver1 with zeros
-    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
-        ver1[i]=0
-    done
-
-    for ((i=0; i<${#ver1[@]}; i++)); do
-        if [[ -z ${ver2[i]} ]]
-        then
-            # fill empty fields in ver2 with zeros
-            ver2[i]=0
-        fi
-        if ((10#${ver1[i]} > 10#${ver2[i]}))
-        then
-            echo 1
-            exit 0
-        fi
-        if ((10#${ver1[i]} < 10#${ver2[i]}))
-        then
-            echo 2
-            exit 0
-        fi
-    done
+  if [[ $1 == $2 ]]; then
     echo 0
+    exit 0
+  fi
+  
+  local IFS=.
+  local i ver1=($1) ver2=($2)
+
+  # fill empty fields in ver1 with zeros
+  for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
+    ver1[i]=0
+  done
+
+  for ((i=0; i<${#ver1[@]}; i++)); do
+    if [[ -z ${ver2[i]} ]]; then
+      # fill empty fields in ver2 with zeros
+      ver2[i]=0
+    fi
+    if ((10#${ver1[i]} > 10#${ver2[i]})); then
+      echo 1
+      exit 0
+    fi
+    if ((10#${ver1[i]} < 10#${ver2[i]})); then
+      echo 2
+      exit 0
+    fi
+  done
+  echo 0
 }
 
-# 1. Read version information
-version=$(cat ${versioninfo} | grep " version" | cut -d '"' -f2)
-compatible_version=$(cat ${versioninfo} | grep " compatible_version" | cut -d '"' -f2)
-
-while true; do
-  read -p "Do you want to release a new version? [y/N]: " is_version_change
-
-  if [[ ( "${is_version_change}" == "y") || ( "${is_version_change}" == "Y") ]]; then
-      read -p "Please enter the new version: " tversion
-      while true; do
-          if (! is_valid_version $tversion) || [ "$(vercomp $tversion $version)" = '2' ]; then
-              read -p "Please enter a correct version: " tversion
-              continue
-          fi
-          version=${tversion}
-          break
-      done
-
-      echo
-
-      read -p "Enter the oldest compatible version: " tversion
-      while true; do
-
-          if [ -z $tversion ]; then
-              break
-          fi
-
-          if (! is_valid_version $tversion) || [ "$(vercomp $version $tversion)" = '2' ]; then
-              read -p "enter correct compatible version: " tversion
-          else
-              compatible_version=$tversion
-              break
-          fi
-      done
-
-      break
-  elif [[ ( "${is_version_change}" == "n") || ( "${is_version_change}" == "N") ]]; then
-      echo "Use old version: ${version} compatible version: ${compatible_version}."
-      break
-  else
-      continue
-  fi
-done
+# 1. check version information
+if (( ! is_valid_version $verNumber ) || ( ! is_valid_version $verNumberComp ) || [[ "$(vercomp $verNumber $verNumberComp)" == '2' ]]); then
+  echo "please enter correct version"
+  exit 0
+fi
+
+echo "=======================new version number: ${verNumber}, compatible version: ${verNumberComp}======================================"
 
-# output the version info to the buildinfo file.
 build_time=$(date +"%F %R")
-echo "char version[64] = \"${version}\";"                             > ${versioninfo}
-echo "char compatible_version[64] = \"${compatible_version}\";"      >> ${versioninfo}
-echo "char gitinfo[128] = \"$(git rev-parse --verify HEAD)\";"       >> ${versioninfo}
-if [ "$verMode" != "cluster" ]; then
-  echo "char gitinfoOfInternal[128] = \"\";"                         >> ${versioninfo}
-else
-  enterprise_dir="${top_dir}/../enterprise"
-  cd ${enterprise_dir}
-  echo "char gitinfoOfInternal[128] = \"$(git rev-parse --verify HEAD)\";"  >> ${versioninfo}
-  cd ${curr_dir}
-fi
-echo "char buildinfo[512] = \"Built by ${USER} at ${build_time}\";"  >> ${versioninfo}
-echo ""                                                              >> ${versioninfo}
-tmp_version=$(echo $version | tr -s "." "_")
-if [ "$verMode" == "cluster" ]; then
-  libtaos_info=${tmp_version}_${osType}_${cpuType}
-else
-  libtaos_info=edge_${tmp_version}_${osType}_${cpuType}
-fi
-if [ "$verType" == "beta" ]; then
-  libtaos_info=${libtaos_info}_${verType}
-fi
-echo "void libtaos_${libtaos_info}() {};"        >> ${versioninfo}
+
+# get commint id from git
+gitinfo=$(git rev-parse --verify HEAD)
+enterprise_dir="${top_dir}/../enterprise"
+cd ${enterprise_dir}
+gitinfoOfInternal=$(git rev-parse --verify HEAD)
+cd ${curr_dir}
 
 # 2. cmake executable file
 compile_dir="${top_dir}/debug"
 if [ -d ${compile_dir} ]; then
-    ${csudo} rm -rf ${compile_dir}
+  ${csudo} rm -rf ${compile_dir}
 fi
 
 if [ "$osType" != "Darwin" ]; then
-    ${csudo} mkdir -p ${compile_dir}
+  ${csudo} mkdir -p ${compile_dir}
 else
-    mkdir -p ${compile_dir}
+  mkdir -p ${compile_dir}
 fi
 cd ${compile_dir}
 
 # check support cpu type
 if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" == "aarch32" ]] || [[ "$cpuType" == "mips64" ]] ; then
-    if [ "$verMode" != "cluster" ]; then
-        cmake ../ -DCPUTYPE=${cpuType}
-    else
-	    cmake ../../ -DCPUTYPE=${cpuType}
-    fi
+  if [ "$verMode" != "cluster" ]; then
+    cmake ../    -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp} -DPAGMODE=${pagMode}
+  else
+    cmake ../../ -DCPUTYPE=${cpuType} -DOSTYPE=${osType} -DSOMODE=${soMode} -DDBNAME=${dbName} -DVERTYPE=${verType} -DVERDATE="${build_time}" -DGITINFO=${gitinfo} -DGITINFOI=${gitinfoOfInternal} -DVERNUMBER=${verNumber} -DVERCOMPATIBLE=${verNumberComp}
+  fi
 else
-    echo "input cpuType=${cpuType} error!!!"
-    exit 1
+  echo "input cpuType=${cpuType} error!!!"
+  exit 1
 fi
 
 make
 
 cd ${curr_dir}
 
-# 3. judge the operating system type, then Call the corresponding script for packaging
-#osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
-#osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)
-#echo "osinfo: ${osinfo}"
-
+# 3. Call the corresponding script for packaging
 if [ "$osType" != "Darwin" ]; then
-    if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]]; then
-        echo "====do deb package for the ubuntu system===="
-        output_dir="${top_dir}/debs"
-        if [ -d ${output_dir} ]; then
-            ${csudo} rm -rf ${output_dir}
-        fi
-        ${csudo} mkdir -p ${output_dir}
-        cd ${script_dir}/deb
-        ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${version} ${cpuType} ${osType} ${verMode} ${verType}
-
-        echo "====do rpm package for the centos system===="
-        output_dir="${top_dir}/rpms"
-        if [ -d ${output_dir} ]; then
-            ${csudo} rm -rf ${output_dir}
-        fi
-        ${csudo} mkdir -p ${output_dir}
-        cd ${script_dir}/rpm
-        ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version} ${cpuType} ${osType} ${verMode} ${verType}
+  if [[ "$verMode" != "cluster" ]] && [[ "$cpuType" == "x64" ]] && [[ "$dbName" == "taos" ]]; then
+    echo "====do deb package for the ubuntu system===="
+    output_dir="${top_dir}/debs"
+    if [ -d ${output_dir} ]; then
+      ${csudo} rm -rf ${output_dir}
     fi
+    ${csudo} mkdir -p ${output_dir}
+    cd ${script_dir}/deb
+    ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
+
+    echo "====do rpm package for the centos system===="
+    output_dir="${top_dir}/rpms"
+    if [ -d ${output_dir} ]; then
+      ${csudo} rm -rf ${output_dir}
+    fi
+    ${csudo} mkdir -p ${output_dir}
+    cd ${script_dir}/rpm
+    ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
+  fi
 	
-    echo "====do tar.gz package for all systems===="
-    cd ${script_dir}/tools
-    
-	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
-	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
+  echo "====do tar.gz package for all systems===="
+  cd ${script_dir}/tools
+  
+  if [[ "$dbName" == "taos" ]]; then  
+    ${csudo} ./makepkg.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo} ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo} ./makearbi.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+  else
+    ${csudo} ./makepkg_power.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo} ./makeclient_power.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo} ./makearbi_power.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+  fi
 else
-    cd ${script_dir}/tools
-    ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
+  cd ${script_dir}/tools
+  ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${dbName}
 fi
 
-# 4. Clean up temporary compile directories
-#${csudo} rm -rf ${compile_dir}
- 
diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh
index cc31a6b8d4103a9b03da71cb1cc041348e89f6ac..678e75c500937330c5e7364b580d3146d7974d78 100755
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
@@ -65,10 +65,10 @@ cp_rpm_package ${pkg_dir}/RPMS
 
 if [ "$verMode" == "cluster" ]; then
   rpmname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   rpmname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
diff --git a/packaging/rpm/powerd b/packaging/rpm/powerd
new file mode 100644
index 0000000000000000000000000000000000000000..bf7f19aea2d0e82e6ff46667a421fece44d149bf
--- /dev/null
+++ b/packaging/rpm/powerd
@@ -0,0 +1,145 @@
+#!/bin/bash
+#
+# power      This shell script takes care of starting and stopping PowerDB.
+#
+# chkconfig: 2345 99 01
+# description: PowerDB is a districuted, scalable, high-performance Time Series Database
+#              (TSDB). More than just a pure database, PowerDB also provides the ability
+#              to do stream computing, aggregation etc.
+#
+#
+### BEGIN INIT INFO
+# Provides: powerd
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Short-Description: start and stop powerd
+# Description: PowerDB is a districuted, scalable, high-performance Time Series Database
+#              (TSDB). More than just a pure database, PowerDB also provides the ability
+#              to do stream computing, aggregation etc.
+### END INIT INFO
+
+# Source init functions
+. /etc/init.d/functions
+
+# Maximum number of open files
+MAX_OPEN_FILES=65535
+
+# Default program options
+NAME=powerd
+PROG=/usr/local/power/bin/powerd
+USER=root
+GROUP=root
+
+# Default directories
+LOCK_DIR=/var/lock/subsys
+PID_DIR=/var/run/$NAME
+
+# Set file names
+LOCK_FILE=$LOCK_DIR/$NAME
+PID_FILE=$PID_DIR/$NAME.pid
+
+[ -e $PID_DIR ] || mkdir -p $PID_DIR
+
+PROG_OPTS=""
+
+start() {
+    echo -n "Starting ${NAME}: "
+    # check identity
+    curid="`id -u -n`"
+    if [ "$curid" != root ] && [ "$curid" != "$USER" ] ; then
+        echo "Must be run as root or $USER, but was run as $curid"
+        return 1
+    fi
+    # Sets the maximum number of open file descriptors allowed.
+    ulimit -n $MAX_OPEN_FILES
+    curulimit="`ulimit -n`"
+    if [ "$curulimit" -lt $MAX_OPEN_FILES ] ; then
+        echo "'ulimit -n' must be greater than or equal to $MAX_OPEN_FILES, is $curulimit"
+        return 1
+    fi
+
+    if [ "`id -u -n`" == root ] ; then
+        # Changes the owner of the lock, and the pid files to allow
+        # non-root OpenTSDB daemons to run /usr/share/opentsdb/bin/opentsdb_restart.py.
+        touch $LOCK_FILE && chown $USER:$GROUP $LOCK_FILE
+        touch $PID_FILE && chown $USER:$GROUP $PID_FILE
+        daemon --user $USER --pidfile $PID_FILE "$PROG $PROG_OPTS &> /dev/null &"
+    else
+        # Don't have to change user.
+        daemon --pidfile $PID_FILE "$PROG $PROG_OPTS &> /dev/null &"
+    fi
+    retval=$?
+    sleep 2
+    echo
+    [ $retval -eq 0 ] && (findproc > $PID_FILE && touch $LOCK_FILE)
+    return $retval
+}
+
+stop() {
+    echo -n "Stopping ${NAME}: "
+    killproc -p $PID_FILE $NAME
+    retval=$?
+    echo
+    # Non-root users don't have enough permission to remove pid and lock files.
+    # So, the opentsdb_restart.py cannot get rid of the files, and the command
+    # "service opentsdb status" will complain about the existing pid file.
+    # Makes the pid file empty.
+    echo > $PID_FILE
+    [ $retval -eq 0 ] && (rm -f $PID_FILE && rm -f $LOCK_FILE)
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $PID_FILE -l $LOCK_FILE $NAME
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+
+exit $?
diff --git a/packaging/rpm/tarbitratord b/packaging/rpm/tarbitratord
new file mode 100644
index 0000000000000000000000000000000000000000..68138f5c1d5d4491b5fda52b08cfd51a039ffc64
--- /dev/null
+++ b/packaging/rpm/tarbitratord
@@ -0,0 +1,141 @@
+#!/bin/bash
+#
+# tarbitratord      This shell script takes care of starting and stopping tarbitrator.
+#
+# chkconfig: 2345 99 01
+# description: tarbitrator is a arbitrator used in TDengine cluster.
+#
+#
+### BEGIN INIT INFO
+# Provides: taoscluster
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Short-Description: start and stop tarbitrator
+# Description: tarbitrator is a arbitrator used in TDengine cluster.
+### END INIT INFO
+
+# Source init functions
+. /etc/init.d/functions
+
+# Maximum number of open files
+MAX_OPEN_FILES=65535
+
+# Default program options
+NAME=tarbitrator
+PROG=/usr/local/taos/bin/tarbitrator
+USER=root
+GROUP=root
+
+# Default directories
+LOCK_DIR=/var/lock/subsys
+PID_DIR=/var/run/$NAME
+
+# Set file names
+LOCK_FILE=$LOCK_DIR/$NAME
+PID_FILE=$PID_DIR/$NAME.pid
+
+[ -e $PID_DIR ] || mkdir -p $PID_DIR
+
+PROG_OPTS=""
+
+start() {
+    echo -n "Starting ${NAME}: "
+    # check identity
+    curid="`id -u -n`"
+    if [ "$curid" != root ] && [ "$curid" != "$USER" ] ; then
+        echo "Must be run as root or $USER, but was run as $curid"
+        return 1
+    fi
+    # Sets the maximum number of open file descriptors allowed.
+    ulimit -n $MAX_OPEN_FILES
+    curulimit="`ulimit -n`"
+    if [ "$curulimit" -lt $MAX_OPEN_FILES ] ; then
+        echo "'ulimit -n' must be greater than or equal to $MAX_OPEN_FILES, is $curulimit"
+        return 1
+    fi
+
+    if [ "`id -u -n`" == root ] ; then
+        # Changes the owner of the lock, and the pid files to allow
+        # non-root OpenTSDB daemons to run /usr/share/opentsdb/bin/opentsdb_restart.py.
+        touch $LOCK_FILE && chown $USER:$GROUP $LOCK_FILE
+        touch $PID_FILE && chown $USER:$GROUP $PID_FILE
+        daemon --user $USER --pidfile $PID_FILE "$PROG $PROG_OPTS &> /dev/null &"
+    else
+        # Don't have to change user.
+        daemon --pidfile $PID_FILE "$PROG $PROG_OPTS &> /dev/null &"
+    fi
+    retval=$?
+    sleep 2
+    echo
+    [ $retval -eq 0 ] && (findproc > $PID_FILE && touch $LOCK_FILE)
+    return $retval
+}
+
+stop() {
+    echo -n "Stopping ${NAME}: "
+    killproc -p $PID_FILE $NAME
+    retval=$?
+    echo
+    # Non-root users don't have enough permission to remove pid and lock files.
+    # So, the opentsdb_restart.py cannot get rid of the files, and the command
+    # "service opentsdb status" will complain about the existing pid file.
+    # Makes the pid file empty.
+    echo > $PID_FILE
+    [ $retval -eq 0 ] && (rm -f $PID_FILE && rm -f $LOCK_FILE)
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $PID_FILE -l $LOCK_FILE $NAME
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+
+exit $?
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index ef02fb90fca722571271207cd21b22f0080f73bb..4e40263dc4ebaf6b566d20890ecd97f64e160340 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -58,13 +58,13 @@ cp %{_compiledir}/../packaging/tools/preun.sh       %{buildroot}%{homepath}/scri
 cp %{_compiledir}/build/bin/taos                    %{buildroot}%{homepath}/bin
 cp %{_compiledir}/build/bin/taosd                   %{buildroot}%{homepath}/bin
 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/grafanaplugin %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
+cp -r %{_compiledir}/../src/connector/nodejs        %{buildroot}%{homepath}/connector
 cp %{_compiledir}/build/lib/taos-jdbcdriver*dist.*  %{buildroot}%{homepath}/connector
 cp -r %{_compiledir}/../tests/examples/*            %{buildroot}%{homepath}/examples
 
@@ -134,7 +134,6 @@ if [ $1 -eq 0 ];then
     ${csudo} rm -f ${bin_link_dir}/taos       || :
     ${csudo} rm -f ${bin_link_dir}/taosd      || :
     ${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     || :
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
old mode 100644
new mode 100755
index beca20e68de22ff6d53c17ec78ce2f6c0df761a3..1cbb3ead9cee61c44f4b311f730f8f23458e72af
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -6,7 +6,8 @@
 set -e
 #set -x
 
-verMode=lite
+verMode=edge
+pagMode=full
 
 # -----------------------Variables definition---------------------
 script_dir=$(dirname $(readlink -f "$0"))
@@ -21,6 +22,7 @@ cfg_install_dir="/etc/taos"
 
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 
 #install main path
@@ -30,7 +32,7 @@ install_main_dir="/usr/local/taos"
 bin_dir="/usr/local/taos/bin"
 
 # v1.5 jar dir
-v15_java_app_dir="/usr/local/lib/taos"
+#v15_java_app_dir="/usr/local/lib/taos"
 
 service_config_dir="/etc/systemd/system"
 nginx_port=6060
@@ -74,30 +76,74 @@ 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)
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)   ||:
+else
+  osinfo=""
+fi
 #echo "osinfo: ${osinfo}"
 os_type=0
 if echo $osinfo | grep -qwi "ubuntu" ; then
-  echo "This is ubuntu system"
+#  echo "This is ubuntu system"
   os_type=1
 elif echo $osinfo | grep -qwi "debian" ; then
-  echo "This is debian system"
+#  echo "This is debian system"
   os_type=1
 elif echo $osinfo | grep -qwi "Kylin" ; then
-  echo "This is Kylin system"
+#  echo "This is Kylin system"
   os_type=1
 elif  echo $osinfo | grep -qwi "centos" ; then
-  echo "This is centos system"
+#  echo "This is centos system"
   os_type=2
 elif echo $osinfo | grep -qwi "fedora" ; then
-  echo "This is fedora system"
+#  echo "This is fedora system"
   os_type=2
 else
-  echo "${osinfo}: This is an officially unverified linux system, If there are any problems with the installation and operation, "
-  echo "please feel free to contact taosdata.com for support."
+  echo " osinfo: ${osinfo}"
+  echo " This is an officially unverified linux system," 
+  echo " if there are any problems with the installation and operation, "
+  echo " please feel free to contact taosdata.com for support."
   os_type=1
 fi
 
+
+# =============================  get input parameters =================================================
+
+# install.sh -v [server | client]  -e [yes | no] -i [systemd | service | ...]
+
+# set parameters by default value
+interactiveFqdn=yes   # [yes | no]
+verType=server        # [server | client]
+initType=systemd      # [systemd | service | ...]
+
+while getopts "hv:e:i:" arg
+do
+  case $arg in
+    e)
+      #echo "interactiveFqdn=$OPTARG"
+      interactiveFqdn=$( echo $OPTARG )
+      ;;
+    v)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;
+    i)
+      #echo "initType=$OPTARG"
+      initType=$(echo $OPTARG)
+      ;;
+    h)
+      echo "Usage: `basename $0` -v [server | client]  -e [yes | no]"
+      exit 0
+      ;;
+    ?) #unknow option 
+      echo "unkonw argument"
+      exit 1
+      ;;
+  esac
+done
+
+#echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
+
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
@@ -126,17 +172,19 @@ function install_bin() {
     ${csudo} rm -f ${bin_link_dir}/taos     || :
     ${csudo} rm -f ${bin_link_dir}/taosd    || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
+    ${csudo} rm -f ${bin_link_dir}/set_core   || :
 
     ${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/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 || :
+    [ -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/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          || :
+    [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core    || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 
     if [ "$verMode" == "cluster" ]; then
         ${csudo} cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo} chmod 0555 ${nginx_dir}/*
@@ -148,19 +196,26 @@ function install_bin() {
 function install_lib() {
     # Remove links
     ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -rf ${v15_java_app_dir}              || :
-
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo} rm -rf ${v15_java_app_dir}              || :
     ${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
     
-	if [ "$verMode" == "cluster" ]; then
-        # Compatible with version 1.5
-        ${csudo} mkdir -p ${v15_java_app_dir}
-        ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
-        ${csudo} chmod 777 ${v15_java_app_dir} || :
+    if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
+      ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+      ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
     fi
+        
+	  #if [ "$verMode" == "cluster" ]; then
+    #    # Compatible with version 1.5
+    #    ${csudo} mkdir -p ${v15_java_app_dir}
+    #    ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
+    #    ${csudo} chmod 777 ${v15_java_app_dir} || :
+    #fi
+    
+    ${csudo} ldconfig
 }
 
 function install_header() {
@@ -182,56 +237,41 @@ function install_config() {
     ${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
 
-    if [ "$verMode" == "cluster" ]; then
-        [ ! -z $1 ] && return 0 || : # only install client
+    [ ! -z $1 ] && return 0 || : # only install client
     
-        if ((${update_flag}==1)); then
-            return 0
-        fi
-
-        IP_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
-        IP_PATTERN="\b$IP_FORMAT\.$IP_FORMAT\.$IP_FORMAT\.$IP_FORMAT\b"
-
-        echo
-        echo -e -n "${GREEN}Enter the IP address of an existing TDengine cluster node to join${NC} OR ${GREEN}leave it blank to build one${NC} :"
-        read masterIp
-        while true; do
-            if [ ! -z "$masterIp" ]; then
-                # check the format of the masterIp
-                if [[ $masterIp =~ $IP_PATTERN ]]; then
-                    # Write the first IP to configuration file
-                    sudo sed -i -r "s/#*\s*(masterIp\s*).*/\1$masterIp/" ${cfg_dir}/taos.cfg
-
-                    # Get the second IP address
-
-                    echo
-                    echo -e -n "${GREEN}Enter the IP address of another node in cluster${NC} OR ${GREEN}leave it blank to skip${NC}: "
-                    read secondIp
-                    while true; do
-
-                        if [ ! -z "$secondIp" ]; then
-                            if [[ $secondIp =~ $IP_PATTERN ]]; then
-                                # Write the second IP to configuration file
-                                sudo sed -i -r "s/#*\s*(secondIp\s*).*/\1$secondIp/" ${cfg_dir}/taos.cfg
-                                break
-                            else
-                                read -p "Please enter the correct IP address: " secondIp
-                            fi
-                        else
-                            break
-                        fi
-                    done
+    if ((${update_flag}==1)); then
+        return 0
+    fi
     
-                    break
-                else
-                    read -p "Please enter the correct IP address: " masterIp
-                fi
-            else
+    if [ "$interactiveFqdn" == "no" ]; then
+        return 0
+    fi
+
+    #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+    #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
+    #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
+    #FQDN_PATTERN=":[0-9]{1,5}$"
+
+    # first full-qualified domain name (FQDN) for TDengine cluster system
+    echo
+    echo -e -n "${GREEN}Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join${NC}"
+    echo
+    echo -e -n "${GREEN}OR leave it blank to build one${NC}:"
+    read firstEp
+    while true; do
+        if [ ! -z "$firstEp" ]; then
+            # check the format of the firstEp
+            #if [[ $firstEp == $FQDN_PATTERN ]]; then
+                # Write the first FQDN to configuration file                    
+                ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg    
                 break
-            fi
-        done
-	
-	fi
+            #else
+            #    read -p "Please enter the correct FQDN:port: " firstEp
+            #fi
+        else
+            break
+        fi
+    done	
 }
 
 
@@ -265,16 +305,37 @@ function clean_service_on_sysvinit() {
     if pidof taosd &> /dev/null; then
         ${csudo} service taosd stop || :
     fi
+    
+    if pidof tarbitrator &> /dev/null; then
+        ${csudo} service tarbitratord stop || :
+    fi
 
     if ((${initd_mod}==1)); then
+      if [ -e ${service_config_dir}/taosd ]; then 
         ${csudo} chkconfig --del taosd || :
+      fi
+
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
     elif ((${initd_mod}==2)); then
+      if [ -e ${service_config_dir}/taosd ]; then 
         ${csudo} insserv -r taosd || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} insserv -r tarbitratord || :
+      fi
     elif ((${initd_mod}==3)); then
+      if [ -e ${service_config_dir}/taosd ]; then
         ${csudo} update-rc.d -f taosd remove || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
     fi
     
     ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
     
     if $(which init &> /dev/null); then
         ${csudo} init q || :
@@ -283,7 +344,6 @@ function clean_service_on_sysvinit() {
 
 function install_service_on_sysvinit() {
     clean_service_on_sysvinit
-
     sleep 1
 
     # Install taosd service
@@ -291,9 +351,13 @@ function install_service_on_sysvinit() {
     if ((${os_type}==1)); then
         ${csudo} cp -f ${script_dir}/init.d/taosd.deb ${install_main_dir}/init.d/taosd
         ${csudo} cp    ${script_dir}/init.d/taosd.deb ${service_config_dir}/taosd && ${csudo} chmod a+x ${service_config_dir}/taosd
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
     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
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
     fi
     
     #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
@@ -302,36 +366,45 @@ function install_service_on_sysvinit() {
     if ((${initd_mod}==1)); then
         ${csudo} chkconfig --add taosd || :
         ${csudo} chkconfig --level 2345 taosd on || :
+        ${csudo} chkconfig --add tarbitratord || :
+        ${csudo} chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
         ${csudo} insserv taosd || :
         ${csudo} insserv -d taosd || :
+        ${csudo} insserv tarbitratord || :
+        ${csudo} insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
         ${csudo} update-rc.d taosd defaults || :
+        ${csudo} update-rc.d tarbitratord defaults || :
     fi
 }
 
 function clean_service_on_systemd() {
     taosd_service_config="${service_config_dir}/taosd.service"
-
     if systemctl is-active --quiet taosd; then
         echo "TDengine is running, stopping it..."
         ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null
     fi
     ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
-
     ${csudo} rm -f ${taosd_service_config}
-
+    
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+    if systemctl is-active --quiet tarbitratord; then
+        echo "tarbitrator is running, stopping it..."
+        ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${tarbitratord_service_config}
+        
     if [ "$verMode" == "cluster" ]; then
         nginx_service_config="${service_config_dir}/nginxd.service"
-	
         if systemctl is-active --quiet nginxd; then
             echo "Nginx for TDengine is running, stopping it..."
             ${csudo} systemctl stop nginxd &> /dev/null || echo &> /dev/null
         fi
         ${csudo} systemctl disable nginxd &> /dev/null || echo &> /dev/null
-	
-        ${csudo} rm -f ${nginx_service_config}
-	fi
+        ${csudo} rm -f ${nginx_service_config}              
+	  fi
 }
 
 # taos:2345:respawn:/etc/init.d/taosd start
@@ -340,7 +413,6 @@ function install_service_on_systemd() {
     clean_service_on_systemd
 
     taosd_service_config="${service_config_dir}/taosd.service"
-
     ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'After=network-online.target'        >> ${taosd_service_config}"
@@ -361,30 +433,52 @@ function install_service_on_systemd() {
     ${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
     ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
     ${csudo} systemctl enable taosd
-
+    
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    #${csudo} systemctl enable tarbitratord  
+        
     if [ "$verMode" == "cluster" ]; then		
         nginx_service_config="${service_config_dir}/nginxd.service"
-        ${csudo} bash -c "echo '[Unit]'                             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Description=Nginx For TDengine Service' >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'After=network-online.target'        >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Wants=network-online.target'        >> ${nginx_service_config}"
-        ${csudo} bash -c "echo                                      >> ${nginx_service_config}"
-        ${csudo} bash -c "echo '[Service]'                          >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Type=forking'                       >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'        >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'          >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'   >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StandardOutput=null'                >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'Restart=always'                     >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${nginx_service_config}"
-        ${csudo} bash -c "echo                                      >> ${nginx_service_config}"
-        ${csudo} bash -c "echo '[Install]'                          >> ${nginx_service_config}"
-        ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${nginx_service_config}"
+        ${csudo} bash -c "echo '[Unit]'                                             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Description=Nginx For TDengine Service'             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'After=network-online.target'                        >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Wants=network-online.target'                        >> ${nginx_service_config}"
+        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo '[Service]'                                          >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Type=forking'                                       >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'TimeoutStartSec=0'                                  >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StandardOutput=null'                                >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Restart=always'                                     >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StartLimitBurst=3'                                  >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StartLimitInterval=60s'                             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo '[Install]'                                          >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'WantedBy=multi-user.target'                         >> ${nginx_service_config}"
         if ! ${csudo} systemctl enable nginxd &> /dev/null; then
             ${csudo} systemctl daemon-reexec
             ${csudo} systemctl enable nginxd
@@ -479,17 +573,18 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     if [ -z $1 ]; then
         install_bin
         install_service
-        install_config
+        install_config		
 		
-		if [ "$verMode" == "cluster" ]; then    
+        openresty_work=false
+		    if [ "$verMode" == "cluster" ]; then    
             # Check if openresty is installed
-            openresty_work=false
-
             # Check if nginx is installed successfully
             if type curl &> /dev/null; then
                 if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
@@ -499,10 +594,10 @@ function update_TDengine() {
                     echo -e "\033[44;31;5mNginx for TDengine does not work! Please try again!\033[0m"
                 fi
             fi
-		fi 
+		    fi 
 
-        echo
-        echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
+        #echo
+        #echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
         echo
         echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
         if ((${service_mod}==0)); then
@@ -513,15 +608,12 @@ function update_TDengine() {
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
         fi
 
-        if [ "$verMode" == "cluster" ]; then  
-            if [ ${openresty_work} = 'true' ]; then
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
-            else
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-            fi
+        if [ ${openresty_work} = 'true' ]; then
+            echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
         else
-		    echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+            echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
         fi
+                
         echo
         echo -e "\033[44;32;1mTDengine is updated successfully!${NC}"
     else
@@ -554,7 +646,9 @@ function install_TDengine() {
     install_log 
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
 
     if [ -z $1 ]; then # install service and client
@@ -562,8 +656,8 @@ function install_TDengine() {
         install_bin
         install_service
 
-        if [ "$verMode" == "cluster" ]; then  
-            openresty_work=false
+        openresty_work=false
+        if [ "$verMode" == "cluster" ]; then
             # Check if nginx is installed successfully
             if type curl &> /dev/null; then
                 if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
@@ -578,8 +672,8 @@ function install_TDengine() {
         install_config	
 
         # Ask if to start the service
-        echo
-        echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+        #echo
+        #echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
         echo
         echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
         if ((${service_mod}==0)); then
@@ -588,20 +682,22 @@ function install_TDengine() {
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} service taosd start${NC}"
         else
             echo -e "${GREEN_DARK}To start TDengine     ${NC}: taosd${NC}"
+        fi		
+
+        if [ ${openresty_work} = 'true' ]; then
+             echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+        else
+             echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
         fi
 		
-        if [ "$verMode" == "cluster" ]; then  
-           if [ ${openresty_work} = 'true' ]; then
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
-           else
-                echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-            fi
-		else
-            echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
+        if [ ! -z "$firstEp" ]; then
+	    echo		    
+	    echo -e "${GREEN_DARK}Please run${NC}: taos -h $firstEp${GREEN_DARK} to login into cluster, then${NC}"
+	    echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
+            echo
         fi
-		
-        echo
         echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+        echo       
     else # Only install client
         install_bin
         install_config
@@ -609,13 +705,14 @@ function install_TDengine() {
         echo
         echo -e "\033[44;32;1mTDengine client is installed successfully!${NC}"
     fi
+    touch ~/.taos_history
 
     rm -rf $(tar -tf taos.tar.gz)
 }
 
 
 ## ==============================Main program starts from here============================
-if [ -z $1 ]; then
+if [ "$verType" == "server" ]; then
     # Install server and client
     if [ -x ${bin_dir}/taosd ]; then
         update_flag=1
@@ -623,7 +720,8 @@ if [ -z $1 ]; then
     else
         install_TDengine
     fi
-else
+elif [ "$verType" == "client" ]; then
+    interactiveFqdn=no
     # Only install client
     if [ -x ${bin_dir}/taos ]; then
         update_flag=1
@@ -631,4 +729,6 @@ else
     else
         install_TDengine client
     fi
+else 
+    echo  "please input correct verType"   
 fi
diff --git a/packaging/tools/install_arbi.sh b/packaging/tools/install_arbi.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a89d2257dc96234c646f593c5bc45a4998575d5c
--- /dev/null
+++ b/packaging/tools/install_arbi.sh
@@ -0,0 +1,297 @@
+#!/bin/bash
+#
+# 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
+#set -x
+
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+
+bin_link_dir="/usr/bin"
+#inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+
+# old bin dir
+bin_dir="/usr/local/tarbitrator/bin"
+
+service_config_dir="/etc/systemd/system"
+
+# 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
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+    service_mod=0
+elif $(which service &> /dev/null); then    
+    service_mod=1
+    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)
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)   ||:
+else
+  osinfo=""
+fi
+#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 " osinfo: ${osinfo}"
+  echo " This is an officially unverified linux system," 
+  echo " if there are any problems with the installation and operation, "
+  echo " please feel free to contact taosdata.com for support."
+  os_type=1
+fi
+
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | 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}/bin  
+    #${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo} mkdir -p ${install_main_dir}/init.d
+}
+
+function install_bin() {
+    # Remove links
+    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+    #Make link
+    [ -x ${install_main_dir}/bin/remove_arbi.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+}
+
+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 clean_service_on_sysvinit() {
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+       
+    if pidof tarbitrator &> /dev/null; then
+        ${csudo} service tarbitratord stop || :
+    fi
+
+    if ((${initd_mod}==1)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi    
+
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function install_service_on_sysvinit() {
+    clean_service_on_sysvinit
+    sleep 1
+
+    # Install taosd service
+
+    if ((${os_type}==1)); then
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    elif ((${os_type}==2)); then
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    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 tarbitratord || :
+        ${csudo} chkconfig --level 2345 tarbitratord on || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv tarbitratord || :
+        ${csudo} insserv -d tarbitratord || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d tarbitratord defaults || :
+    fi
+}
+
+function clean_service_on_systemd() {
+  tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+  if systemctl is-active --quiet tarbitratord; then
+      echo "tarbitrator is running, stopping it..."
+      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+  fi
+  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+
+  ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+# taos:2345:respawn:/etc/init.d/tarbitratord start
+
+function install_service_on_systemd() {
+    clean_service_on_systemd
+
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+
+    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo} systemctl enable tarbitratord
+}
+
+function install_service() {
+    if ((${service_mod}==0)); then
+        install_service_on_systemd
+    elif ((${service_mod}==1)); then
+        install_service_on_sysvinit
+    else
+        # must manual stop taosd
+        kill_tarbitrator
+    fi
+}
+
+function update_TDengine() {
+    # Start to update
+    echo -e "${GREEN}Start to update TDengine's arbitrator ...${NC}"
+    # Stop the service if running
+    if pidof tarbitrator &> /dev/null; then
+        if ((${service_mod}==0)); then
+            ${csudo} systemctl stop tarbitratord || :
+        elif ((${service_mod}==1)); then
+            ${csudo} service tarbitratord stop || :
+        else
+            kill_tarbitrator
+        fi
+        sleep 1
+    fi
+    
+    install_main_path
+    #install_header
+    install_bin
+    install_service
+		
+    echo
+    #echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
+    if ((${service_mod}==0)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+    elif ((${service_mod}==1)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+    else
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
+    fi                
+    echo
+    echo -e "\033[44;32;1mTDengine's arbitrator is updated successfully!${NC}"
+}
+
+function install_TDengine() {
+    # Start to install
+    echo -e "${GREEN}Start to install TDengine's arbitrator ...${NC}"
+    
+    install_main_path	   
+    #install_header
+    install_bin
+    install_service
+    echo
+    #echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
+    if ((${service_mod}==0)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+    elif ((${service_mod}==1)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+    else
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
+    fi
+
+    echo -e "\033[44;32;1mTDengine's arbitrator is installed successfully!${NC}"
+    echo
+}
+
+
+## ==============================Main program starts from here============================
+# Install server and client
+if [ -x ${bin_dir}/tarbitrator ]; then
+    update_flag=1
+    update_TDengine
+else
+    install_TDengine
+fi
+
diff --git a/packaging/tools/install_arbi_power.sh b/packaging/tools/install_arbi_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4b12913760e013049f44ec1ba9f7275322c436bd
--- /dev/null
+++ b/packaging/tools/install_arbi_power.sh
@@ -0,0 +1,297 @@
+#!/bin/bash
+#
+# 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
+#set -x
+
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+
+bin_link_dir="/usr/bin"
+#inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+
+# old bin dir
+bin_dir="/usr/local/tarbitrator/bin"
+
+service_config_dir="/etc/systemd/system"
+
+# 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
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+    service_mod=0
+elif $(which service &> /dev/null); then    
+    service_mod=1
+    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)
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)   ||:
+else
+  osinfo=""
+fi
+#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 " osinfo: ${osinfo}"
+  echo " This is an officially unverified linux system," 
+  echo " if there are any problems with the installation and operation, "
+  echo " please feel free to contact taosdata.com for support."
+  os_type=1
+fi
+
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | 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}/bin  
+    #${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo} mkdir -p ${install_main_dir}/init.d
+}
+
+function install_bin() {
+    # Remove links
+    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+    #Make link
+    [ -x ${install_main_dir}/bin/remove_arbi_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_power.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+}
+
+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 clean_service_on_sysvinit() {
+    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+       
+    if pidof tarbitrator &> /dev/null; then
+        ${csudo} service tarbitratord stop || :
+    fi
+
+    if ((${initd_mod}==1)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi    
+
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function install_service_on_sysvinit() {
+    clean_service_on_sysvinit
+    sleep 1
+
+    # Install powerd service
+
+    if ((${os_type}==1)); then
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    elif ((${os_type}==2)); then
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    fi
+    
+    #restart_config_str="power:2345:respawn:${service_config_dir}/powerd 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 tarbitratord || :
+        ${csudo} chkconfig --level 2345 tarbitratord on || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv tarbitratord || :
+        ${csudo} insserv -d tarbitratord || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d tarbitratord defaults || :
+    fi
+}
+
+function clean_service_on_systemd() {
+  tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+  if systemctl is-active --quiet tarbitratord; then
+      echo "tarbitrator is running, stopping it..."
+      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+  fi
+  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+
+  ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+# power:2345:respawn:/etc/init.d/tarbitratord start
+
+function install_service_on_systemd() {
+    clean_service_on_systemd
+
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+
+    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Description=PowerDB arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo} systemctl enable tarbitratord
+}
+
+function install_service() {
+    if ((${service_mod}==0)); then
+        install_service_on_systemd
+    elif ((${service_mod}==1)); then
+        install_service_on_sysvinit
+    else
+        # must manual stop taosd
+        kill_tarbitrator
+    fi
+}
+
+function update_PowerDB() {
+    # Start to update
+    echo -e "${GREEN}Start to update PowerDB's arbitrator ...${NC}"
+    # Stop the service if running
+    if pidof tarbitrator &> /dev/null; then
+        if ((${service_mod}==0)); then
+            ${csudo} systemctl stop tarbitratord || :
+        elif ((${service_mod}==1)); then
+            ${csudo} service tarbitratord stop || :
+        else
+            kill_tarbitrator
+        fi
+        sleep 1
+    fi
+    
+    install_main_path
+    #install_header
+    install_bin
+    install_service
+		
+    echo
+    #echo -e "${GREEN_DARK}To configure PowerDB ${NC}: edit /etc/taos/taos.cfg"
+    if ((${service_mod}==0)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+    elif ((${service_mod}==1)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+    else
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
+    fi                
+    echo
+    echo -e "\033[44;32;1mPowerDB's arbitrator is updated successfully!${NC}"
+}
+
+function install_PowerDB() {
+    # Start to install
+    echo -e "${GREEN}Start to install PowerDB's arbitrator ...${NC}"
+    
+    install_main_path	   
+    #install_header
+    install_bin
+    install_service
+    echo
+    #echo -e "${GREEN_DARK}To configure PowerDB ${NC}: edit /etc/taos/taos.cfg"
+    if ((${service_mod}==0)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+    elif ((${service_mod}==1)); then
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+    else
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
+    fi
+
+    echo -e "\033[44;32;1mPowerDB's arbitrator is installed successfully!${NC}"
+    echo
+}
+
+
+## ==============================Main program starts from here============================
+# Install server and client
+if [ -x ${bin_dir}/tarbitrator ]; then
+    update_flag=1
+    update_PowerDB
+else
+    install_PowerDB
+fi
+
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index c5ecf5e5b943bc54e4602d873a1d374768e35387..24586d3390fe5c4f38b6292442fed2936d5ea7a6 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -9,6 +9,7 @@ set -e
 # -----------------------Variables definition---------------------
 
 osType=Linux
+pagMode=full
 
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
@@ -30,6 +31,7 @@ cfg_install_dir="/etc/taos"
 if [ "$osType" != "Darwin" ]; then
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 else
     bin_link_dir="/usr/local/bin"
@@ -44,7 +46,7 @@ install_main_dir="/usr/local/taos"
 bin_dir="/usr/local/taos/bin"
 
 # v1.5 jar dir
-v15_java_app_dir="/usr/local/lib/taos"
+#v15_java_app_dir="/usr/local/lib/taos"
 
 # Color setting
 RED='\033[0;31m'
@@ -83,18 +85,20 @@ function install_bin() {
   # Remove links
   ${csudo} rm -f ${bin_link_dir}/taos         || :
   if [ "$osType" == "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/taosdump || :
+      ${csudo} rm -f ${bin_link_dir}/taosdemo || :
   fi
   ${csudo} rm -f ${bin_link_dir}/rmtaos       || :
+  ${csudo} rm -f ${bin_link_dir}/set_core     || :
 
   ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
 
-    #Make link
+  #Make link
   [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                 || :
   if [ "$osType" == "Darwin" ]; then
-      [ -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 || :
   fi
   [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -105,17 +109,25 @@ function clean_lib() {
 function install_lib() {
     # Remove links
     ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -rf ${v15_java_app_dir}                         || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo} rm -rf ${v15_java_app_dir}              || :
 
     ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
         ${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
+        
+        if [ -d "${lib64_link_dir}" ]; then
+	        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+	        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+	      fi
     else
         ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
         ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
+    
+    ${csudo} ldconfig
 }
 
 function install_header() {
@@ -180,7 +192,9 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     install_bin
     install_config
@@ -205,7 +219,9 @@ function install_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
     install_examples
     install_bin
     install_config
diff --git a/packaging/tools/install_client_power.sh b/packaging/tools/install_client_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0108d1d44a186043aa5f83e01f44fb1540f6e0fd
--- /dev/null
+++ b/packaging/tools/install_client_power.sh
@@ -0,0 +1,249 @@
+#!/bin/bash
+#
+# This file is used to install PowerDB client on linux systems. The operating system
+# is required to use systemd to manage services at boot
+
+set -e
+#set -x
+
+# -----------------------Variables definition---------------------
+
+osType=Linux
+pagMode=full
+
+if [ "$osType" != "Darwin" ]; then
+    script_dir=$(dirname $(readlink -f "$0"))
+    # Dynamic directory
+    data_dir="/var/lib/power"
+    log_dir="/var/log/power"
+else
+    script_dir=`dirname $0`
+    cd ${script_dir}
+    script_dir="$(pwd)"
+    data_dir="/var/lib/power"
+    log_dir="~/PowerDBLog"
+fi
+
+log_link_dir="/usr/local/power/log"
+
+cfg_install_dir="/etc/power"
+
+if [ "$osType" != "Darwin" ]; then
+    bin_link_dir="/usr/bin"
+    lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
+    inc_link_dir="/usr/include"
+else
+    bin_link_dir="/usr/local/bin"
+    lib_link_dir="/usr/local/lib"
+    inc_link_dir="/usr/local/include"
+fi
+
+#install main path
+install_main_dir="/usr/local/power"
+
+# old bin dir
+bin_dir="/usr/local/power/bin"
+
+# v1.5 jar dir
+#v15_java_app_dir="/usr/local/lib/power"
+
+# 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 "power" | 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}/power         || :
+  if [ "$osType" == "Darwin" ]; then
+      ${csudo} rm -f ${bin_link_dir}/powerdemo || :
+  fi
+  ${csudo} rm -f ${bin_link_dir}/rmpower       || :
+  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+
+  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+  #Make link
+  [ -x ${install_main_dir}/bin/power ] && ${csudo} ln -s ${install_main_dir}/bin/power ${bin_link_dir}/power                 || :
+  if [ "$osType" == "Darwin" ]; then
+      [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo} ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo || :
+  fi
+  [ -x ${install_main_dir}/bin/remove_client_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_power.sh ${bin_link_dir}/rmpower || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+}
+
+function clean_lib() {
+    sudo rm -f /usr/lib/libtaos.* || :
+    sudo rm -rf ${lib_dir} || :
+}
+
+function install_lib() {
+    # Remove links
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo} rm -rf ${v15_java_app_dir}              || :
+
+    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+
+    if [ "$osType" != "Darwin" ]; then
+        ${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
+        
+        if [ -d "${lib64_link_dir}" ]; then
+	        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+	        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+	      fi
+    else
+        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+    fi
+    
+    ${csudo} ldconfig
+}
+
+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}  || :
+
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+    else
+        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+    fi
+    ${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_PowerDB() {
+    # Start to update
+    if [ ! -e power.tar.gz ]; then
+        echo "File power.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf power.tar.gz
+
+    echo -e "${GREEN}Start to update PowerDB client...${NC}"
+    # Stop the client shell if running
+    if pidof power &> /dev/null; then
+        kill_client
+        sleep 1
+    fi
+
+    install_main_path
+
+    install_log
+    install_header
+    install_lib
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
+    install_examples
+    install_bin
+    install_config
+
+    echo
+    echo -e "\033[44;32;1mPowerDB client is updated successfully!${NC}"
+
+    rm -rf $(tar -tf power.tar.gz)
+}
+
+function install_PowerDB() {
+    # Start to install
+    if [ ! -e power.tar.gz ]; then
+        echo "File power.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf power.tar.gz
+
+    echo -e "${GREEN}Start to install PowerDB client...${NC}"
+
+	install_main_path
+    install_log
+    install_header
+    install_lib
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
+    install_examples
+    install_bin
+    install_config
+
+    echo
+    echo -e "\033[44;32;1mPowerDB client is installed successfully!${NC}"
+
+    rm -rf $(tar -tf power.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}/powerd ]; then
+      echo -e "\033[44;32;1mThere are already installed PowerDB server, so don't need install client!${NC}"
+      exit 0
+  fi
+
+  if [ -x ${bin_dir}/power ]; then
+      update_flag=1
+      update_PowerDB
+  else
+      install_PowerDB
+  fi
diff --git a/packaging/tools/install_power.sh b/packaging/tools/install_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..df6291f4ae54f6706f1a74e9a33f5b1bb361edcd
--- /dev/null
+++ b/packaging/tools/install_power.sh
@@ -0,0 +1,733 @@
+#!/bin/bash
+#
+# 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
+#set -x
+
+verMode=edge
+pagMode=full
+
+# -----------------------Variables definition---------------------
+script_dir=$(dirname $(readlink -f "$0"))
+# Dynamic directory
+data_dir="/var/lib/power"
+log_dir="/var/log/power"
+
+data_link_dir="/usr/local/power/data"
+log_link_dir="/usr/local/power/log"
+
+cfg_install_dir="/etc/power"
+
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+
+#install main path
+install_main_dir="/usr/local/power"
+
+# old bin dir
+bin_dir="/usr/local/power/bin"
+
+# v1.5 jar dir
+#v15_java_app_dir="/usr/local/lib/power"
+
+service_config_dir="/etc/systemd/system"
+nginx_port=6060
+nginx_dir="/usr/local/nginxd"
+
+# 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
+
+initd_mod=0
+service_mod=2
+if pidof systemd &> /dev/null; then
+    service_mod=0
+elif $(which service &> /dev/null); then    
+    service_mod=1
+    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)
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(cat /etc/os-release | grep "NAME" | cut -d '"' -f2)   ||:
+else
+  osinfo=""
+fi
+#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 " osinfo: ${osinfo}"
+  echo " This is an officially unverified linux system," 
+  echo " if there are any problems with the installation and operation, "
+  echo " please feel free to contact taosdata.com for support."
+  os_type=1
+fi
+
+
+# =============================  get input parameters =================================================
+
+# install.sh -v [server | client]  -e [yes | no] -i [systemd | service | ...]
+
+# set parameters by default value
+interactiveFqdn=yes   # [yes | no]
+verType=server        # [server | client]
+initType=systemd      # [systemd | service | ...]
+
+while getopts "hv:e:i:" arg
+do
+  case $arg in
+    e)
+      #echo "interactiveFqdn=$OPTARG"
+      interactiveFqdn=$( echo $OPTARG )
+      ;;
+    v)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;
+    i)
+      #echo "initType=$OPTARG"
+      initType=$(echo $OPTARG)
+      ;;
+    h)
+      echo "Usage: `basename $0` -v [server | client]  -e [yes | no]"
+      exit 0
+      ;;
+    ?) #unknow option 
+      echo "unkonw argument"
+      exit 1
+      ;;
+  esac
+done
+
+#echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
+
+function kill_powerd() {
+  pid=$(ps -ef | grep "powerd" | 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
+    ${csudo} mkdir -p ${install_main_dir}/init.d
+    if [ "$verMode" == "cluster" ]; then
+        ${csudo} mkdir -p ${nginx_dir}
+    fi
+}
+
+function install_bin() {
+    # Remove links
+    ${csudo} rm -f ${bin_link_dir}/power     || :
+    ${csudo} rm -f ${bin_link_dir}/powerd    || :
+    ${csudo} rm -f ${bin_link_dir}/powerdemo || :
+    ${csudo} rm -f ${bin_link_dir}/rmpower   || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator   || :
+    ${csudo} rm -f ${bin_link_dir}/set_core   || :
+
+    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+
+    #Make link
+    [ -x ${install_main_dir}/bin/power ] && ${csudo} ln -s ${install_main_dir}/bin/power ${bin_link_dir}/power                        || :
+    [ -x ${install_main_dir}/bin/powerd ] && ${csudo} ln -s ${install_main_dir}/bin/powerd ${bin_link_dir}/powerd                     || :
+    [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo} ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo            || :
+    [ -x ${install_main_dir}/bin/remove_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_power.sh ${bin_link_dir}/rmpower  || :
+    [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core         || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator      || :
+
+    if [ "$verMode" == "cluster" ]; then
+        ${csudo} cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo} chmod 0555 ${nginx_dir}/*
+        ${csudo} mkdir -p ${nginx_dir}/logs
+        ${csudo} chmod 777 ${nginx_dir}/sbin/nginx
+    fi
+}
+
+function install_lib() {
+    # Remove links
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo} rm -rf ${v15_java_app_dir}              || :
+    ${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
+    
+    if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
+      ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+      ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+    fi
+        
+	  #if [ "$verMode" == "cluster" ]; then
+    #    # Compatible with version 1.5
+    #    ${csudo} mkdir -p ${v15_java_app_dir}
+    #    ${csudo} ln -s ${install_main_dir}/connector/taos-jdbcdriver-1.0.2-dist.jar ${v15_java_app_dir}/JDBCDriver-1.0.2-dist.jar
+    #    ${csudo} chmod 777 ${v15_java_app_dir} || :
+    #fi
+    
+    ${csudo} ldconfig
+}
+
+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
+
+    [ ! -z $1 ] && return 0 || : # only install client
+    
+    if ((${update_flag}==1)); then
+        return 0
+    fi
+    
+    if [ "$interactiveFqdn" == "no" ]; then
+        return 0
+    fi
+
+    #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+    #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
+    #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
+    #FQDN_PATTERN=":[0-9]{1,5}$"
+
+    # first full-qualified domain name (FQDN) for PowerDB cluster system
+    echo
+    echo -e -n "${GREEN}Enter FQDN:port (like h1.powerdata.com:6030) of an existing PowerDB cluster node to join${NC}"
+    echo
+    echo -e -n "${GREEN}OR leave it blank to build one${NC}:"
+    read firstEp
+    while true; do
+        if [ ! -z "$firstEp" ]; then
+            # check the format of the firstEp
+            #if [[ $firstEp == $FQDN_PATTERN ]]; then
+                # Write the first FQDN to configuration file                    
+                ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg    
+                break
+            #else
+            #    read -p "Please enter the correct FQDN:port: " firstEp
+            #fi
+        else
+            break
+        fi
+    done	
+}
+
+
+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_data() {
+    ${csudo} mkdir -p ${data_dir}
+    
+    ${csudo} ln -s ${data_dir} ${install_main_dir}/data    
+}
+
+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 clean_service_on_sysvinit() {
+    #restart_config_str="power:2345:respawn:${service_config_dir}/powerd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
+    if pidof powerd &> /dev/null; then
+        ${csudo} service powerd stop || :
+    fi
+    
+    if pidof tarbitrator &> /dev/null; then
+        ${csudo} service tarbitratord stop || :
+    fi
+
+    if ((${initd_mod}==1)); then
+      if [ -e ${service_config_dir}/powerd ]; then 
+        ${csudo} chkconfig --del powerd || :
+      fi
+
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then
+      if [ -e ${service_config_dir}/powerd ]; then 
+        ${csudo} insserv -r powerd || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then
+      if [ -e ${service_config_dir}/powerd ]; then
+        ${csudo} update-rc.d -f powerd remove || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi
+    
+    ${csudo} rm -f ${service_config_dir}/powerd || :
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function install_service_on_sysvinit() {
+    clean_service_on_sysvinit
+    sleep 1
+
+    # Install powerd service
+
+    if ((${os_type}==1)); then
+        ${csudo} cp -f ${script_dir}/init.d/powerd.deb ${install_main_dir}/init.d/powerd
+        ${csudo} cp    ${script_dir}/init.d/powerd.deb ${service_config_dir}/powerd && ${csudo} chmod a+x ${service_config_dir}/powerd
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    elif ((${os_type}==2)); then
+        ${csudo} cp -f ${script_dir}/init.d/powerd.rpm ${install_main_dir}/init.d/powerd
+        ${csudo} cp    ${script_dir}/init.d/powerd.rpm ${service_config_dir}/powerd && ${csudo} chmod a+x ${service_config_dir}/powerd
+        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+    fi
+    
+    #restart_config_str="power:2345:respawn:${service_config_dir}/powerd 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 powerd || :
+        ${csudo} chkconfig --level 2345 powerd on || :
+        ${csudo} chkconfig --add tarbitratord || :
+        ${csudo} chkconfig --level 2345 tarbitratord on || :
+    elif ((${initd_mod}==2)); then
+        ${csudo} insserv powerd || :
+        ${csudo} insserv -d powerd || :
+        ${csudo} insserv tarbitratord || :
+        ${csudo} insserv -d tarbitratord || :
+    elif ((${initd_mod}==3)); then
+        ${csudo} update-rc.d powerd defaults || :
+        ${csudo} update-rc.d tarbitratord defaults || :
+    fi
+}
+
+function clean_service_on_systemd() {
+    powerd_service_config="${service_config_dir}/powerd.service"
+    if systemctl is-active --quiet powerd; then
+        echo "PowerDB is running, stopping it..."
+        ${csudo} systemctl stop powerd &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable powerd &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${powerd_service_config}
+    
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+    if systemctl is-active --quiet tarbitratord; then
+        echo "tarbitrator is running, stopping it..."
+        ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${tarbitratord_service_config}
+        
+    if [ "$verMode" == "cluster" ]; then
+      nginx_service_config="${service_config_dir}/nginxd.service"
+      if systemctl is-active --quiet nginxd; then
+        echo "Nginx for TDengine is running, stopping it..."
+        ${csudo} systemctl stop nginxd &> /dev/null || echo &> /dev/null
+      fi
+      ${csudo} systemctl disable nginxd &> /dev/null || echo &> /dev/null
+      ${csudo} rm -f ${nginx_service_config}              
+	  fi
+}
+
+# power:2345:respawn:/etc/init.d/powerd start
+
+function install_service_on_systemd() {
+    clean_service_on_systemd
+
+    powerd_service_config="${service_config_dir}/powerd.service"
+    ${csudo} bash -c "echo '[Unit]'                              >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'Description=PowerDB server service'  >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'         >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'         >> ${powerd_service_config}"
+    ${csudo} bash -c "echo                                       >> ${powerd_service_config}"
+    ${csudo} bash -c "echo '[Service]'                           >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                         >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/powerd'           >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                 >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                  >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                   >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                 >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                      >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                   >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'              >> ${powerd_service_config}"
+    ${csudo} bash -c "echo                                       >> ${powerd_service_config}"
+    ${csudo} bash -c "echo '[Install]'                           >> ${powerd_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'          >> ${powerd_service_config}"
+    ${csudo} systemctl enable powerd
+    
+    tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
+    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    #${csudo} systemctl enable tarbitratord  
+        
+    if [ "$verMode" == "cluster" ]; then		
+        nginx_service_config="${service_config_dir}/nginxd.service"
+        ${csudo} bash -c "echo '[Unit]'                                             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Description=Nginx For PowrDB Service'               >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'After=network-online.target'                        >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Wants=network-online.target'                        >> ${nginx_service_config}"
+        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo '[Service]'                                          >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Type=forking'                                       >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'PIDFile=/usr/local/nginxd/logs/nginx.pid'           >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'ExecStart=/usr/local/nginxd/sbin/nginx'             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'ExecStop=/usr/local/nginxd/sbin/nginx -s stop'      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitNOFILE=infinity'                               >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitNPROC=infinity'                                >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'LimitCORE=infinity'                                 >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'TimeoutStartSec=0'                                  >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StandardOutput=null'                                >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'Restart=always'                                     >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StartLimitBurst=3'                                  >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'StartLimitInterval=60s'                             >> ${nginx_service_config}"
+        ${csudo} bash -c "echo                                                      >> ${nginx_service_config}"
+        ${csudo} bash -c "echo '[Install]'                                          >> ${nginx_service_config}"
+        ${csudo} bash -c "echo 'WantedBy=multi-user.target'                         >> ${nginx_service_config}"
+        if ! ${csudo} systemctl enable nginxd &> /dev/null; then
+            ${csudo} systemctl daemon-reexec
+            ${csudo} systemctl enable nginxd
+        fi
+        ${csudo} systemctl start nginxd
+	fi
+}
+
+function install_service() {
+    if ((${service_mod}==0)); then
+        install_service_on_systemd
+    elif ((${service_mod}==1)); then
+        install_service_on_sysvinit
+    else
+        # must manual stop powerd
+        kill_powerd
+    fi
+}
+
+vercomp () {
+    if [[ $1 == $2 ]]; then
+        return 0
+    fi
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
+        ver1[i]=0
+    done
+
+    for ((i=0; i<${#ver1[@]}; i++)); do
+        if [[ -z ${ver2[i]} ]]
+        then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]}))
+        then
+            return 1
+        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]}))
+        then
+            return 2
+        fi
+    done
+    return 0
+}
+
+function is_version_compatible() {
+
+    curr_version=$(${bin_dir}/powerd -V | head -1 | cut -d ' ' -f 3)
+
+    min_compatible_version=$(${script_dir}/bin/powerd -V | head -1 | cut -d ' ' -f 5)
+
+    vercomp $curr_version $min_compatible_version
+    case $? in
+        0) return 0;;
+        1) return 0;;
+        2) return 1;;
+    esac
+}
+
+function update_PowerDB() {
+    # Start to update
+    if [ ! -e power.tar.gz ]; then
+        echo "File power.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf power.tar.gz
+
+    # Check if version compatible
+    if ! is_version_compatible; then
+        echo -e "${RED}Version incompatible${NC}"
+        return 1
+    fi
+
+    echo -e "${GREEN}Start to update PowerDB...${NC}"
+    # Stop the service if running
+    if pidof powerd &> /dev/null; then
+        if ((${service_mod}==0)); then
+            ${csudo} systemctl stop powerd || :
+        elif ((${service_mod}==1)); then
+            ${csudo} service powerd stop || :
+        else
+            kill_powerd
+        fi
+        sleep 1
+    fi
+    
+    install_main_path
+
+    install_log
+    install_header
+    install_lib
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
+    install_examples
+    if [ -z $1 ]; then
+        install_bin
+        install_service
+        install_config		
+		
+        openresty_work=false
+		    if [ "$verMode" == "cluster" ]; then    
+            # Check if openresty is installed
+            # Check if nginx is installed successfully
+            if type curl &> /dev/null; then
+                if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
+                    echo -e "\033[44;32;1mNginx for PowerDB is updated successfully!${NC}"
+                    openresty_work=true
+                else
+                    echo -e "\033[44;31;5mNginx for PowerDB does not work! Please try again!\033[0m"
+                fi
+            fi
+		    fi 
+
+        #echo
+        #echo -e "\033[44;32;1mPowerDB is updated successfully!${NC}"
+        echo
+        echo -e "${GREEN_DARK}To configure PowerDB ${NC}: edit /etc/power/taos.cfg"
+        if ((${service_mod}==0)); then
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: ${csudo} systemctl start powerd${NC}"
+        elif ((${service_mod}==1)); then
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: ${csudo} service powerd start${NC}"
+        else
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: ./powerd${NC}"
+        fi
+
+        if [ ${openresty_work} = 'true' ]; then
+            echo -e "${GREEN_DARK}To access PowerDB    ${NC}: use ${GREEN_UNDERLINE}power${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+        else
+            echo -e "${GREEN_DARK}To access PowerDB    ${NC}: use ${GREEN_UNDERLINE}power${NC} in shell${NC}"
+        fi
+                
+        echo
+        echo -e "\033[44;32;1mPowerDB is updated successfully!${NC}"
+    else
+        install_bin
+        install_config
+
+        echo
+        echo -e "\033[44;32;1mPowerDB client is updated successfully!${NC}"
+    fi
+
+    rm -rf $(tar -tf power.tar.gz)
+}
+
+function install_PowerDB() {
+    # Start to install
+    if [ ! -e power.tar.gz ]; then
+        echo "File power.tar.gz does not exist"
+        exit 1
+    fi
+    tar -zxf power.tar.gz
+
+    echo -e "${GREEN}Start to install PowerDB...${NC}"
+    
+	  install_main_path
+	   
+    if [ -z $1 ]; then
+        install_data
+    fi 
+    
+    install_log 
+    install_header
+    install_lib
+    if [ "$pagMode" != "lite" ]; then
+      install_connector
+    fi
+    install_examples
+
+    if [ -z $1 ]; then # install service and client
+        # For installing new
+        install_bin
+        install_service
+
+        openresty_work=false
+        if [ "$verMode" == "cluster" ]; then
+            # Check if nginx is installed successfully
+            if type curl &> /dev/null; then
+                if curl -sSf http://127.0.0.1:${nginx_port} &> /dev/null; then
+                    echo -e "\033[44;32;1mNginx for PowerDB is installed successfully!${NC}"
+                    openresty_work=true
+                else
+                    echo -e "\033[44;31;5mNginx for PowerDB does not work! Please try again!\033[0m"
+                fi
+            fi
+        fi
+		
+        install_config	
+
+        # Ask if to start the service
+        #echo
+        #echo -e "\033[44;32;1mPowerDB is installed successfully!${NC}"
+        echo
+        echo -e "${GREEN_DARK}To configure PowerDB ${NC}: edit /etc/power/taos.cfg"
+        if ((${service_mod}==0)); then
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: ${csudo} systemctl start powerd${NC}"
+        elif ((${service_mod}==1)); then
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: ${csudo} service powerd start${NC}"
+        else
+            echo -e "${GREEN_DARK}To start PowerDB     ${NC}: powerd${NC}"
+        fi		
+
+        if [ ${openresty_work} = 'true' ]; then
+             echo -e "${GREEN_DARK}To access PowerDB    ${NC}: use ${GREEN_UNDERLINE}power${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+        else
+             echo -e "${GREEN_DARK}To access PowerDB    ${NC}: use ${GREEN_UNDERLINE}power${NC} in shell${NC}"
+        fi
+		
+        if [ ! -z "$firstEp" ]; then
+	        echo		    
+	        echo -e "${GREEN_DARK}Please run${NC}: power -h $firstEp${GREEN_DARK} to login into cluster, then${NC}"
+	        echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
+          echo
+        fi
+        echo -e "\033[44;32;1mPowerDB is installed successfully!${NC}"
+        echo       
+    else # Only install client
+        install_bin
+        install_config
+
+        echo
+        echo -e "\033[44;32;1mPowerDB client is installed successfully!${NC}"
+    fi
+
+    rm -rf $(tar -tf power.tar.gz)
+}
+
+
+## ==============================Main program starts from here============================
+if [ "$verType" == "server" ]; then
+    # Install server and client
+    if [ -x ${bin_dir}/powerd ]; then
+        update_flag=1
+        update_PowerDB
+    else
+        install_PowerDB
+    fi
+elif [ "$verType" == "client" ]; then
+    interactiveFqdn=no
+    # Only install client
+    if [ -x ${bin_dir}/power ]; then
+        update_flag=1
+        update_PowerDB client
+    else
+        install_PowerDB client
+    fi
+else 
+    echo  "please input correct verType"   
+fi
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 2200c7f13d20ecd19b75c8fe39185a3c69558f22..eff70d8035af0291f6dc7040ec13632fec4fa3be 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -10,6 +10,7 @@ set -e
 source_dir=$1
 binary_dir=$2
 osType=$3
+verNumber=$4
 
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
@@ -34,6 +35,7 @@ cfg_install_dir="/etc/taos"
 if [ "$osType" != "Darwin" ]; then
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
+    lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
 else
     bin_link_dir="/usr/local/bin"
@@ -141,6 +143,7 @@ function install_bin() {
         ${csudo} rm -f ${bin_link_dir}/taosd    || :
         ${csudo} rm -f ${bin_link_dir}/taosdemo || :
         ${csudo} rm -f ${bin_link_dir}/taosdump || :
+        ${csudo} rm -f ${bin_link_dir}/set_core || :
     fi
 
     ${csudo} rm -f ${bin_link_dir}/rmtaos       || :
@@ -149,6 +152,7 @@ function install_bin() {
 
     if [ "$osType" != "Darwin" ]; then
         ${csudo} cp -r ${script_dir}/remove.sh   ${install_main_dir}/bin
+        ${csudo} cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
     else
         ${csudo} cp -r ${script_dir}/remove_client.sh   ${install_main_dir}/bin
     fi
@@ -161,6 +165,7 @@ function install_bin() {
         [ -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}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
     fi
 
     if [ "$osType" != "Darwin" ]; then
@@ -173,17 +178,24 @@ function install_bin() {
 function install_lib() {
     # Remove links
     ${csudo} rm -f ${lib_link_dir}/libtaos.*     || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*   || :
     
-    versioninfo=$(${script_dir}/get_version.sh ${source_dir}/src/util/src/version.c)
     if [ "$osType" != "Darwin" ]; then
-        ${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} cp ${binary_dir}/build/lib/libtaos.so.${verNumber} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
         ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        
+        if [ -d "${lib64_link_dir}" ]; then
+          ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1
+          ${csudo} ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so
+        fi
     else
-        ${csudo} cp ${binary_dir}/build/lib/libtaos.${versioninfo}.dylib ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.${versioninfo}.dylib ${lib_link_dir}/libtaos.1.dylib
+        ${csudo} cp ${binary_dir}/build/lib/libtaos.* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
         ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
+    
+    ${csudo} ldconfig
 }
 
 function install_header() {
@@ -225,7 +237,7 @@ function install_data() {
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${source_dir}/src/connector/grafana ${install_main_dir}/connector
+    ${csudo} cp -rf ${source_dir}/src/connector/grafanaplugin ${install_main_dir}/connector
     ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
     ${csudo} cp -rf ${source_dir}/src/connector/go ${install_main_dir}/connector
         
diff --git a/packaging/tools/makearbi.sh b/packaging/tools/makearbi.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bc6179eff2de84086144ef20aae5b5dde00b6470
--- /dev/null
+++ b/packaging/tools/makearbi.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Generate arbitrator's tar.gz setup package for all os system
+
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -f ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+if [ "$verMode" == "cluster" ]; then
+    install_dir="${release_dir}/TDengine-enterprise-arbitrator"
+else
+    install_dir="${release_dir}/TDengine-arbitrator"
+fi
+
+# Directories and files.
+bin_files="${build_dir}/bin/tarbitrator ${script_dir}/remove_arbi.sh"
+install_files="${script_dir}/install_arbi.sh"
+
+#header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
+init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
+
+# make directories.
+mkdir -p ${install_dir} && cp ${install_files} ${install_dir} && chmod a+x ${install_dir}/install_arbi.sh || :
+#mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc || :
+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_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
+
+cd ${release_dir} 
+
+if [ "$verMode" == "cluster" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+else
+  echo "unknow verMode, nor cluster or edge"
+  exit 1
+fi
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then 
+  pkg_name=${pkg_name} 
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar ${pkg_name}.tar.gz error !!!"
+    exit $exitcode
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/makearbi_power.sh b/packaging/tools/makearbi_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5296cc8e3f334c0ed0f8e5ca30137e367b021929
--- /dev/null
+++ b/packaging/tools/makearbi_power.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# Generate arbitrator's tar.gz setup package for all os system
+
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -f ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+if [ "$verMode" == "cluster" ]; then
+    install_dir="${release_dir}/PowerDB-enterprise-arbitrator"
+else
+    install_dir="${release_dir}/PowerDB-arbitrator"
+fi
+
+# Directories and files.
+bin_files="${build_dir}/bin/tarbitrator ${script_dir}/remove_arbi_power.sh"
+install_files="${script_dir}/install_arbi_power.sh"
+
+#header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
+init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
+
+# make directories.
+mkdir -p ${install_dir} && cp ${install_files} ${install_dir} && chmod a+x ${install_dir}/install_arbi_power.sh || :
+#mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc || :
+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_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
+
+cd ${release_dir} 
+
+if [ "$verMode" == "cluster" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+else
+  echo "unknow verMode, nor cluster or edge"
+  exit 1
+fi
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then 
+  pkg_name=${pkg_name} 
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar ${pkg_name}.tar.gz error !!!"
+    exit $exitcode
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 58ce6183c104f4042c106be092ac07242d22ac08..d69a8e6007cb3b7c57214a2cbab555059c757526 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -12,6 +12,7 @@ cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
+pagMode=$8
 
 if [ "$osType" != "Darwin" ]; then
     script_dir="$(dirname $(readlink -f $0))"
@@ -39,11 +40,17 @@ fi
 # Directories and files.
 
 if [ "$osType" != "Darwin" ]; then
-    bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${script_dir}/remove_client.sh"
-    lib_files="${build_dir}/lib/libtaos.so.${version}"
-else
+  if [ "$pagMode" == "lite" ]; then
+    #strip ${build_dir}/bin/taosd 
+    strip ${build_dir}/bin/taos
     bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
-    lib_files="${build_dir}/lib/libtaos.${version}.dylib"
+  else  
+    bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${script_dir}/remove_client.sh ${script_dir}/set_core.sh"
+  fi
+  lib_files="${build_dir}/lib/libtaos.so.${version}"
+else
+  bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+  lib_files="${build_dir}/lib/libtaos.${version}.dylib"
 fi
 
 header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
@@ -74,18 +81,25 @@ if [ "$osType" == "Darwin" ]; then
     sed 's/osType=Linux/osType=Darwin/g' ${install_dir}/install_client.sh >> install_client_temp.sh
     mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >> install_client_temp.sh
+    mv install_client_temp.sh ${install_dir}/install_client.sh
+fi
 chmod a+x ${install_dir}/install_client.sh
 
 # Copy example code
 mkdir -p ${install_dir}/examples
 examples_dir="${top_dir}/tests/examples"
 cp -r ${examples_dir}/c      ${install_dir}/examples
-cp -r ${examples_dir}/JDBC   ${install_dir}/examples
-cp -r ${examples_dir}/matlab ${install_dir}/examples
-cp -r ${examples_dir}/python ${install_dir}/examples
-cp -r ${examples_dir}/R      ${install_dir}/examples
-cp -r ${examples_dir}/go     ${install_dir}/examples
-
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  cp -r ${examples_dir}/python ${install_dir}/examples
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  cp -r ${examples_dir}/go     ${install_dir}/examples
+  cp -r ${examples_dir}/nodejs ${install_dir}/examples
+  cp -r ${examples_dir}/C#     ${install_dir}/examples
+fi
 # Copy driver
 mkdir -p ${install_dir}/driver 
 cp ${lib_files} ${install_dir}/driver
@@ -94,13 +108,15 @@ cp ${lib_files} ${install_dir}/driver
 connector_dir="${code_dir}/connector"
 mkdir -p ${install_dir}/connector
 
-if [ "$osType" != "Darwin" ]; then
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  if [ "$osType" != "Darwin" ]; then
     cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  fi
+  cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
+  cp -r ${connector_dir}/python        ${install_dir}/connector/
+  cp -r ${connector_dir}/go            ${install_dir}/connector
+  cp -r ${connector_dir}/nodejs        ${install_dir}/connector
 fi
-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}
 
@@ -110,13 +126,17 @@ cd ${release_dir}
 
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
 if [ "$verType" == "beta" ]; then
   pkg_name=${pkg_name}-${verType}
 elif [ "$verType" == "stable" ]; then  
diff --git a/packaging/tools/makeclient_power.sh b/packaging/tools/makeclient_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d4be52f67911ee22f6d914cdc6bc6de9c7b0fb06
--- /dev/null
+++ b/packaging/tools/makeclient_power.sh
@@ -0,0 +1,197 @@
+#!/bin/bash
+#
+# Generate tar.gz package for linux client in all os system
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+if [ "$osType" != "Darwin" ]; then
+    script_dir="$(dirname $(readlink -f $0))"
+    top_dir="$(readlink -f ${script_dir}/../..)"
+else
+    script_dir=`dirname $0`
+    cd ${script_dir}
+    script_dir="$(pwd)"
+    top_dir=${script_dir}/../..
+fi
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+
+if [ "$verMode" == "cluster" ]; then
+    install_dir="${release_dir}/PowerDB-enterprise-client"
+else
+    install_dir="${release_dir}/PowerDB-client"
+fi
+
+# Directories and files.
+
+if [ "$osType" != "Darwin" ]; then
+#  if [ "$pagMode" == "lite" ]; then
+#    strip ${build_dir}/bin/powerd 
+#    strip ${build_dir}/bin/power
+#    bin_files="${build_dir}/bin/power ${script_dir}/remove_client_power.sh"
+#  else  
+#    bin_files="${build_dir}/bin/power ${build_dir}/bin/powerdemo ${script_dir}/remove_client_power.sh ${script_dir}/set_core.sh"
+#  fi
+  lib_files="${build_dir}/lib/libtaos.so.${version}"
+else
+  bin_files="${build_dir}/bin/power ${script_dir}/remove_client_power.sh"
+  lib_files="${build_dir}/lib/libtaos.${version}.dylib"
+fi
+
+header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+cfg_dir="${top_dir}/packaging/cfg"
+
+install_files="${script_dir}/install_client_power.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
+
+sed -i '/dataDir/ {s/taos/power/g}'  ${install_dir}/cfg/taos.cfg
+sed -i '/logDir/  {s/taos/power/g}'  ${install_dir}/cfg/taos.cfg
+sed -i "s/TDengine/PowerDB/g"        ${install_dir}/cfg/taos.cfg
+
+mkdir -p ${install_dir}/bin
+if [ "$osType" != "Darwin" ]; then
+  if [ "$pagMode" == "lite" ]; then
+    strip ${build_dir}/bin/taos
+    cp ${build_dir}/bin/taos          ${install_dir}/bin/power
+    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+  else 
+    cp ${build_dir}/bin/taos          ${install_dir}/bin/power
+    cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+    cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo   
+    cp ${script_dir}/set_core.sh      ${install_dir}/bin
+  fi
+else
+  cp ${bin_files} ${install_dir}/bin
+fi
+chmod a+x ${install_dir}/bin/* || :
+
+cd ${install_dir}
+
+if [ "$osType" != "Darwin" ]; then
+    tar -zcv -f power.tar.gz * --remove-files || :
+else
+    tar -zcv -f power.tar.gz * || :
+    mv power.tar.gz ..
+    rm -rf ./*
+    mv ../power.tar.gz .
+fi
+
+cd ${curr_dir}
+cp ${install_files} ${install_dir}
+if [ "$osType" == "Darwin" ]; then
+    sed 's/osType=Linux/osType=Darwin/g' ${install_dir}/install_client_power.sh >> install_client_power_temp.sh
+    mv install_client_power_temp.sh ${install_dir}/install_client_power.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client_power.sh >> install_client_power_temp.sh
+    mv install_client_power_temp.sh ${install_dir}/install_client_power.sh
+fi
+chmod a+x ${install_dir}/install_client_power.sh
+
+# Copy example code
+mkdir -p ${install_dir}/examples
+examples_dir="${top_dir}/tests/examples"
+cp -r ${examples_dir}/c      ${install_dir}/examples
+sed -i '/passwd/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/c/*.c
+sed -i '/root/   {s/taosdata/powerdb/g}'  ${install_dir}/examples/c/*.c
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/matlab/TDengineDemo.m
+  cp -r ${examples_dir}/python ${install_dir}/examples  
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/python/read_example.py
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/R/command.txt
+  cp -r ${examples_dir}/go     ${install_dir}/examples  
+  sed -i '/root/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/go/src/taosapp/taosapp.go
+fi
+# Copy driver
+mkdir -p ${install_dir}/driver 
+cp ${lib_files} ${install_dir}/driver
+
+# Copy connector
+connector_dir="${code_dir}/connector"
+mkdir -p ${install_dir}/connector
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  if [ "$osType" != "Darwin" ]; then
+    cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  fi
+  cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
+  cp -r ${connector_dir}/python  ${install_dir}/connector/
+  cp -r ${connector_dir}/go      ${install_dir}/connector 
+  
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py 
+fi
+# Copy release note
+# cp ${script_dir}/release_note ${install_dir}
+
+# exit 1
+
+cd ${release_dir} 
+
+if [ "$verMode" == "cluster" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+else
+  echo "unknow verMode, nor cluster or edge"
+  exit 1
+fi
+
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then  
+  pkg_name=${pkg_name} 
+else
+  echo "unknow verType, nor stable or beta"
+  exit 1
+fi
+
+if [ "$osType" != "Darwin" ]; then
+    tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+else
+    tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) || :
+    mv "$(basename ${pkg_name}).tar.gz" ..
+    rm -rf ./*
+    mv ../"$(basename ${pkg_name}).tar.gz" .
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 1b095a4c76693182acf2d71e2610e06a34a2e15c..3958cff53b414d7f1b045d9e73bcfd373d09dbe3 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -13,6 +13,7 @@ cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
+pagMode=$8
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
@@ -30,12 +31,19 @@ else
 fi
 
 # 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"
+if [ "$pagMode" == "lite" ]; then
+  strip ${build_dir}/bin/taosd 
+  strip ${build_dir}/bin/taos
+  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${script_dir}/remove.sh"
+else 
+  bin_files="${build_dir}/bin/taosd ${build_dir}/bin/taos ${build_dir}/bin/taosdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove.sh ${script_dir}/set_core.sh"
+fi
+
 lib_files="${build_dir}/lib/libtaos.so.${version}"
 header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
 cfg_dir="${top_dir}/packaging/cfg"
 install_files="${script_dir}/install.sh"
-nginx_dir="${code_dir}/../../enterprise/src/modules/web"
+nginx_dir="${code_dir}/../../enterprise/src/plugins/web"
 
 # Init file
 #init_dir=${script_dir}/deb
@@ -46,16 +54,23 @@ nginx_dir="${code_dir}/../../enterprise/src/modules/web"
 # temp use rpm's taosd. TODO: later modify according to os type
 init_file_deb=${script_dir}/../deb/taosd
 init_file_rpm=${script_dir}/../rpm/taosd
+init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
+init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
 
 # 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/*
+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_file_deb} ${install_dir}/init.d/taosd.deb
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taosd.rpm
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
 
 if [ "$verMode" == "cluster" ]; then
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >> remove_temp.sh
+    mv remove_temp.sh ${install_dir}/bin/remove.sh
+    
     mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
     cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
     rm -rf ${install_dir}/nginxd/png
@@ -70,25 +85,37 @@ fi
 
 cd ${install_dir}
 tar -zcv -f taos.tar.gz * --remove-files  || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar taos.tar.gz error !!!"
+    exit $exitcode
+fi
 
 cd ${curr_dir}
 cp ${install_files} ${install_dir}
 if [ "$verMode" == "cluster" ]; then
-    sed 's/verMode=lite/verMode=cluster/g' ${install_dir}/install.sh >> install_temp.sh
-	mv install_temp.sh ${install_dir}/install.sh
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install.sh >> install_temp.sh
+    mv install_temp.sh ${install_dir}/install.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_temp.sh
+    mv install_temp.sh ${install_dir}/install.sh
 fi
 chmod a+x ${install_dir}/install.sh
 
 # Copy example code
 mkdir -p ${install_dir}/examples
 examples_dir="${top_dir}/tests/examples"
-cp -r ${examples_dir}/c      ${install_dir}/examples
-cp -r ${examples_dir}/JDBC   ${install_dir}/examples
-cp -r ${examples_dir}/matlab ${install_dir}/examples
-cp -r ${examples_dir}/python ${install_dir}/examples
-cp -r ${examples_dir}/R      ${install_dir}/examples
-cp -r ${examples_dir}/go     ${install_dir}/examples
-
+  cp -r ${examples_dir}/c      ${install_dir}/examples
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  cp -r ${examples_dir}/python ${install_dir}/examples
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  cp -r ${examples_dir}/go     ${install_dir}/examples
+  cp -r ${examples_dir}/nodejs ${install_dir}/examples
+  cp -r ${examples_dir}/C#     ${install_dir}/examples
+fi
 # Copy driver
 mkdir -p ${install_dir}/driver 
 cp ${lib_files} ${install_dir}/driver
@@ -96,11 +123,13 @@ 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
-
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp ${build_dir}/lib/*.jar            ${install_dir}/connector
+  cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
+  cp -r ${connector_dir}/python        ${install_dir}/connector/
+  cp -r ${connector_dir}/go            ${install_dir}/connector
+  cp -r ${connector_dir}/nodejs        ${install_dir}/connector
+fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
 
@@ -110,13 +139,17 @@ cd ${release_dir}
 
 if [ "$verMode" == "cluster" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
-elif [ "$verMode" == "lite" ]; then
+elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
-  echo "unknow verMode, nor cluster or lite"
+  echo "unknow verMode, nor cluster or edge"
   exit 1
 fi
 
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
 if [ "$verType" == "beta" ]; then
   pkg_name=${pkg_name}-${verType}
 elif [ "$verType" == "stable" ]; then 
@@ -127,5 +160,10 @@ else
 fi
 
 tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar ${pkg_name}.tar.gz error !!!"
+    exit $exitcode
+fi
 
 cd ${curr_dir}
diff --git a/packaging/tools/makepkg_power.sh b/packaging/tools/makepkg_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..744f78e514611125bd0ecce1d53e5534656924c9
--- /dev/null
+++ b/packaging/tools/makepkg_power.sh
@@ -0,0 +1,215 @@
+#!/bin/bash
+#
+# Generate tar.gz package for all os system
+
+set -e
+#set -x
+
+curr_dir=$(pwd)
+compile_dir=$1
+version=$2
+build_time=$3
+cpuType=$4
+osType=$5
+verMode=$6
+verType=$7
+pagMode=$8
+
+script_dir="$(dirname $(readlink -f $0))"
+top_dir="$(readlink -f ${script_dir}/../..)"
+
+# create compressed install file.
+build_dir="${compile_dir}/build"
+code_dir="${top_dir}/src"
+release_dir="${top_dir}/release"
+
+#package_name='linux'
+if [ "$verMode" == "cluster" ]; then
+    install_dir="${release_dir}/PowerDB-enterprise-server"
+else
+    install_dir="${release_dir}/PowerDB-server"
+fi
+
+# Directories and files.
+#if [ "$pagMode" == "lite" ]; then
+#  strip ${build_dir}/bin/taosd 
+#  strip ${build_dir}/bin/taos
+#  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${script_dir}/remove_power.sh"
+#else 
+#  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${build_dir}/bin/powerdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove_power.sh ${script_dir}/set_core.sh"
+#fi
+
+lib_files="${build_dir}/lib/libtaos.so.${version}"
+header_files="${code_dir}/inc/taos.h ${code_dir}/inc/taoserror.h"
+cfg_dir="${top_dir}/packaging/cfg"
+install_files="${script_dir}/install_power.sh"
+nginx_dir="${code_dir}/../../enterprise/src/plugins/web"
+
+# Init file
+#init_dir=${script_dir}/deb
+#if [ $package_type = "centos" ]; then
+#    init_dir=${script_dir}/rpm
+#fi
+#init_files=${init_dir}/powerd
+# temp use rpm's powerd. TODO: later modify according to os type
+init_file_deb=${script_dir}/../deb/powerd
+init_file_rpm=${script_dir}/../rpm/powerd
+init_file_tarbitrator_deb=${script_dir}/../deb/tarbitratord
+init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
+
+# 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/* || :
+mkdir -p ${install_dir}/bin
+if [ "$pagMode" == "lite" ]; then
+  strip ${build_dir}/bin/taosd 
+  strip ${build_dir}/bin/taos
+#  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${script_dir}/remove_power.sh"
+  cp ${build_dir}/bin/taos          ${install_dir}/bin/power
+  cp ${build_dir}/bin/taosd         ${install_dir}/bin/powerd
+  cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+else 
+#  bin_files="${build_dir}/bin/powerd ${build_dir}/bin/power ${build_dir}/bin/powerdemo ${build_dir}/bin/tarbitrator ${script_dir}/remove_power.sh ${script_dir}/set_core.sh"
+  cp ${build_dir}/bin/taos          ${install_dir}/bin/power
+  cp ${build_dir}/bin/taosd         ${install_dir}/bin/powerd
+  cp ${script_dir}/remove_power.sh  ${install_dir}/bin
+  cp ${build_dir}/bin/taosdemo      ${install_dir}/bin/powerdemo   
+  cp ${build_dir}/bin/tarbitrator   ${install_dir}/bin
+  cp ${script_dir}/set_core.sh      ${install_dir}/bin
+fi
+chmod a+x ${install_dir}/bin/* || :
+
+mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/powerd.deb
+mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/powerd.rpm
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
+mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
+
+if [ "$verMode" == "cluster" ]; then
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove_power.sh >> remove_power_temp.sh
+    mv remove_power_temp.sh ${install_dir}/bin/remove_power.sh
+    
+    mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
+    cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
+    rm -rf ${install_dir}/nginxd/png
+
+    sed -i "s/TDengine/PowerDB/g"   ${install_dir}/nginxd/admin/*.html 
+    sed -i "s/TDengine/PowerDB/g"   ${install_dir}/nginxd/admin/js/*.js
+    
+    sed -i '/dataDir/ {s/taos/power/g}'  ${install_dir}/cfg/taos.cfg
+    sed -i '/logDir/  {s/taos/power/g}'  ${install_dir}/cfg/taos.cfg
+    sed -i "s/TDengine/PowerDB/g"        ${install_dir}/cfg/taos.cfg
+
+    if [ "$cpuType" == "aarch64" ]; then
+        cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
+    elif [ "$cpuType" == "aarch32" ]; then
+        cp -f ${install_dir}/nginxd/sbin/arm/32bit/nginx ${install_dir}/nginxd/sbin/
+    fi
+    rm -rf ${install_dir}/nginxd/sbin/arm
+fi
+
+cd ${install_dir}
+tar -zcv -f power.tar.gz * --remove-files  || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar power.tar.gz error !!!"
+    exit $exitcode
+fi
+
+cd ${curr_dir}
+cp ${install_files} ${install_dir}
+if [ "$verMode" == "cluster" ]; then
+    sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_power.sh >> install_power_temp.sh
+    mv install_power_temp.sh ${install_dir}/install_power.sh
+fi
+if [ "$pagMode" == "lite" ]; then
+    sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install.sh >> install_power_temp.sh
+    mv install_power_temp.sh ${install_dir}/install_power.sh
+fi
+chmod a+x ${install_dir}/install_power.sh
+
+# Copy example code
+mkdir -p ${install_dir}/examples
+examples_dir="${top_dir}/tests/examples"
+cp -r ${examples_dir}/c      ${install_dir}/examples
+sed -i '/passwd/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/c/*.c
+sed -i '/root/   {s/taosdata/powerdb/g}'  ${install_dir}/examples/c/*.c
+
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp -r ${examples_dir}/JDBC   ${install_dir}/examples
+  cp -r ${examples_dir}/matlab ${install_dir}/examples
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/matlab/TDengineDemo.m  
+  cp -r ${examples_dir}/python ${install_dir}/examples
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/python/read_example.py  
+  cp -r ${examples_dir}/R      ${install_dir}/examples
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/R/command.txt  
+  cp -r ${examples_dir}/go     ${install_dir}/examples  
+  sed -i '/root/ {s/taosdata/powerdb/g}'  ${install_dir}/examples/go/src/taosapp/taosapp.go
+fi
+# Copy driver
+mkdir -p ${install_dir}/driver 
+cp ${lib_files} ${install_dir}/driver
+
+# Copy connector
+connector_dir="${code_dir}/connector"
+mkdir -p ${install_dir}/connector
+if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+  cp ${build_dir}/lib/*.jar      ${install_dir}/connector
+  cp -r ${connector_dir}/grafanaplugin ${install_dir}/connector/
+  cp -r ${connector_dir}/python  ${install_dir}/connector/
+  cp -r ${connector_dir}/go      ${install_dir}/connector
+  
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/cinterface.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/cinterface.py
+  
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/subscription.py
+  sed -i '/password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/subscription.py
+  
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python2/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/linux/python3/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python2/taos/connection.py
+  sed -i '/self._password/ {s/taosdata/powerdb/g}'  ${install_dir}/connector/python/windows/python3/taos/connection.py
+fi
+# Copy release note
+# cp ${script_dir}/release_note ${install_dir}
+
+# exit 1
+
+cd ${release_dir} 
+
+if [ "$verMode" == "cluster" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+elif [ "$verMode" == "edge" ]; then
+  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+else
+  echo "unknow verMode, nor cluster or edge"
+  exit 1
+fi
+
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=${pkg_name}-${verType}
+elif [ "$verType" == "stable" ]; then 
+  pkg_name=${pkg_name} 
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
+exitcode=$?
+if [ "$exitcode" != "0" ]; then
+    echo "tar ${pkg_name}.tar.gz error !!!"
+    exit $exitcode
+fi
+
+cd ${curr_dir}
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index eea36f4484707e8ae1a0a18b5296f7aa1d899ee0..0feb64c795159b67920c8a39b53b0125dfb565bf 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -21,6 +21,7 @@ inc_dir="/usr/local/taos/include"
 cfg_install_dir="/etc/taos"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 
 service_config_dir="/etc/systemd/system"
@@ -74,27 +75,30 @@ function install_include() {
 
 function install_lib() {
     ${csudo} rm -f ${lib_link_dir}/libtaos* || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos* || :
     
     ${csudo} ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1
     ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    
+    ${csudo} ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
+    ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
 }
 
 function install_bin() {
     # Remove links
     ${csudo} rm -f ${bin_link_dir}/taos     || :
     ${csudo} rm -f ${bin_link_dir}/taosd    || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump || :
     ${csudo} rm -f ${bin_link_dir}/taosdemo || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
+    ${csudo} rm -f ${bin_link_dir}/set_core || :
 
     ${csudo} chmod 0555 ${bin_dir}/*
 
     #Make link
     [ -x ${bin_dir}/taos ] && ${csudo} ln -s ${bin_dir}/taos ${bin_link_dir}/taos             || :
     [ -x ${bin_dir}/taosd ] && ${csudo} ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd          || :
-    [ -x ${bin_dir}/taosdump ] && ${csudo} ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
     [ -x ${bin_dir}/taosdemo ] && ${csudo} ln -s ${bin_dir}/taosdemo ${bin_link_dir}/taosdemo || :
-#   [ -x ${bin_dir}/remove.sh ] && ${csudo} ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || :
+    [ -x ${bin_dir}/set_core.sh ] && ${csudo} ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function install_config() {
@@ -106,6 +110,31 @@ function install_config() {
 
     ${csudo} mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.org
     ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir}
+    #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+    #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
+    #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
+    #FQDN_PATTERN=":[0-9]{1,5}$"
+
+    # first full-qualified domain name (FQDN) for TDengine cluster system
+    echo
+    echo -e -n "${GREEN}Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join${NC}"
+    echo
+    echo -e -n "${GREEN}OR leave it blank to build one${NC}:"
+    read firstEp
+    while true; do
+        if [ ! -z "$firstEp" ]; then
+            # check the format of the firstEp
+            #if [[ $firstEp == $FQDN_PATTERN ]]; then
+                # Write the first FQDN to configuration file                    
+                ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg    
+                break
+            #else
+            #    read -p "Please enter the correct FQDN:port: " firstEp
+            #fi
+        else
+            break
+        fi
+    done	
 }
 
 function clean_service_on_sysvinit() {
@@ -227,8 +256,8 @@ function install_TDengine() {
     install_config	
 
     # Ask if to start the service
-    echo
-    echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
+    #echo
+    #echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
     echo
     echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
     if ((${service_mod}==0)); then
@@ -241,7 +270,13 @@ function install_TDengine() {
     fi
 
     echo -e "${GREEN_DARK}To access TDengine    ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}"
-
+    
+    if [ ! -z "$firstEp" ]; then
+        echo		    
+	echo -e "${GREEN_DARK}Please run${NC}: taos -h $firstEp${GREEN_DARK} to login into cluster, then${NC}"
+	echo -e "${GREEN_DARK}execute ${NC}: create dnode 'newDnodeFQDN:port'; ${GREEN_DARK}to add this new node${NC}"
+        echo
+    fi
     echo
     echo -e "\033[44;32;1mTDengine is installed successfully!${NC}"
 }
diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh
index 0533410802c09e0aee2e60766d5c621dd53c4272..07b43c0e49d56fd136747399c3c71fdb1885bea3 100755
--- a/packaging/tools/preun.sh
+++ b/packaging/tools/preun.sh
@@ -8,6 +8,7 @@ NC='\033[0m'
 
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 
 data_link_dir="/usr/local/taos/data"
@@ -104,10 +105,12 @@ ${csudo} rm -f ${bin_link_dir}/taos       || :
 ${csudo} rm -f ${bin_link_dir}/taosd      || :
 ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
 ${csudo} rm -f ${bin_link_dir}/taosdump   || :
+${csudo} rm -f ${bin_link_dir}/set_core   || :
 ${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 ${inc_link_dir}/taoserror.h || :
+${csudo} rm -f ${lib_link_dir}/libtaos.*   || :
+${csudo} rm -f ${lib64_link_dir}/libtaos.* || :
 
 ${csudo} rm -f ${log_link_dir}            || :
 ${csudo} rm -f ${data_link_dir}           || :
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 81507e1aa969ff11e92de6c9f1307c32197c9b2c..e9a4f48cf78469ac3b5d3a46cc058430d6da4d56 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -5,7 +5,7 @@
 set -e
 #set -x
 
-verMode=lite
+verMode=edge
 
 RED='\033[0;31m'
 GREEN='\033[1;32m'
@@ -18,14 +18,16 @@ log_link_dir="/usr/local/taos/log"
 cfg_link_dir="/usr/local/taos/cfg"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 install_nginxd_dir="/usr/local/nginxd"
 
 # v1.5 jar dir
-v15_java_app_dir="/usr/local/lib/taos"
+#v15_java_app_dir="/usr/local/lib/taos"
 
 service_config_dir="/etc/systemd/system"
 taos_service_name="taosd"
+tarbitrator_service_name="tarbitratord"
 nginx_service_name="nginxd"
 csudo=""
 if command -v sudo > /dev/null; then
@@ -59,25 +61,33 @@ function kill_taosd() {
   fi
 }
 
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
 function clean_bin() {
     # Remove link
-    ${csudo} rm -f ${bin_link_dir}/taos      || :
-    ${csudo} rm -f ${bin_link_dir}/taosd     || :
-    ${csudo} rm -f ${bin_link_dir}/taosdemo  || :
-    ${csudo} rm -f ${bin_link_dir}/taosdump  || :
-    ${csudo} rm -f ${bin_link_dir}/rmtaos    || :
+    ${csudo} rm -f ${bin_link_dir}/taos        || :
+    ${csudo} rm -f ${bin_link_dir}/taosd       || :
+    ${csudo} rm -f ${bin_link_dir}/taosdemo    || :
+    ${csudo} rm -f ${bin_link_dir}/rmtaos      || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator || :
+    ${csudo} rm -f ${bin_link_dir}/set_core    || :
 }
 
 function clean_lib() {
     # Remove link
     ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo} rm -rf ${v15_java_app_dir}                      || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*    || :
+    #${csudo} rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
     # Remove link
     ${csudo} rm -f ${inc_link_dir}/taos.h       || :
-    ${csudo} rm -f ${inc_link_dir}/taoserror.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h  || :
 }
 
 function clean_config() {
@@ -92,27 +102,31 @@ function clean_log() {
 
 function clean_service_on_systemd() {
     taosd_service_config="${service_config_dir}/${taos_service_name}.service"
-
     if systemctl is-active --quiet ${taos_service_name}; then
         echo "TDengine taosd is running, stopping it..."
         ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
     fi
     ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
-
     ${csudo} rm -f ${taosd_service_config}
-
+    
+    tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+    if systemctl is-active --quiet ${tarbitrator_service_name}; then
+        echo "TDengine tarbitrator is running, stopping it..."
+        ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${tarbitratord_service_config}
+  
     if [ "$verMode" == "cluster" ]; then
-		nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
-	
+		  nginx_service_config="${service_config_dir}/${nginx_service_name}.service"	
    	 	if [ -d ${bin_dir}/web ]; then
-   	        if systemctl is-active --quiet ${nginx_service_name}; then
-   	            echo "Nginx for TDengine is running, stopping it..."
-   	            ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
-   	        fi
-   	        ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
-        
-   	        ${csudo} rm -f ${nginx_service_config}
+   	    if systemctl is-active --quiet ${nginx_service_name}; then
+   	      echo "Nginx for TDengine is running, stopping it..."
+   	      ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
    	    fi
+   	    ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
+   	    ${csudo} rm -f ${nginx_service_config}
+   	  fi
     fi 
 }
 
@@ -124,16 +138,37 @@ function clean_service_on_sysvinit() {
         echo "TDengine taosd is running, stopping it..."
         ${csudo} service taosd stop || :
     fi
-
-    if ((${initd_mod}==1)); then
+    
+    if pidof tarbitrator &> /dev/null; then
+        echo "TDengine tarbitrator is running, stopping it..."
+        ${csudo} service tarbitratord stop || :
+    fi
+    
+    if ((${initd_mod}==1)); then    
+      if [ -e ${service_config_dir}/taosd ]; then 
         ${csudo} chkconfig --del taosd || :
-    elif ((${initd_mod}==2)); then
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then   
+      if [ -e ${service_config_dir}/taosd ]; then 
         ${csudo} insserv -r taosd || :
-    elif ((${initd_mod}==3)); then
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then  
+      if [ -e ${service_config_dir}/taosd ]; then 
         ${csudo} update-rc.d -f taosd remove || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
     fi
     
     ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
    
     if $(which init &> /dev/null); then
         ${csudo} init q || :
@@ -148,6 +183,7 @@ function clean_service() {
     else
         # must manual stop taosd
         kill_taosd
+        kill_tarbitrator
     fi
 }
 
@@ -168,14 +204,22 @@ ${csudo} rm -rf ${data_link_dir}    || :
 
 ${csudo} rm -rf ${install_main_dir}
 ${csudo} rm -rf ${install_nginxd_dir}
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+else
+  osinfo=""
+fi
 
-osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 if echo $osinfo | grep -qwi "ubuntu" ; then
 #  echo "this is ubuntu system"
    ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
+elif echo $osinfo | grep -qwi "debian" ; then
+#  echo "this is debian system"
+   ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
 elif  echo $osinfo | grep -qwi "centos" ; then
-  echo "this is centos system"
+#  echo "this is centos system"
   ${csudo} rpm -e --noscripts tdengine || :
 fi
 
 echo -e "${GREEN}TDengine is removed successfully!${NC}"
+echo 
\ No newline at end of file
diff --git a/packaging/tools/remove_arbi.sh b/packaging/tools/remove_arbi.sh
new file mode 100755
index 0000000000000000000000000000000000000000..68fd9275fb922d3eb0ab82bc010262c6c61b2962
--- /dev/null
+++ b/packaging/tools/remove_arbi.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+#
+# Script to stop the service and uninstall TDengine's arbitrator
+
+set -e
+#set -x
+
+verMode=edge
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+bin_link_dir="/usr/bin"
+#inc_link_dir="/usr/include"
+
+service_config_dir="/etc/systemd/system"
+tarbitrator_service_name="tarbitratord"
+csudo=""
+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 service &> /dev/null); then    
+    service_mod=1
+    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
+
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+function clean_bin() {
+    # Remove link
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator      || :
+}
+
+function clean_header() {
+    # Remove link
+    ${csudo} rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h  || :
+}
+
+function clean_log() {
+    # Remove link
+    ${csudo} rm -rf /arbitrator.log    || :
+}
+
+function clean_service_on_systemd() {
+  tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+
+  if systemctl is-active --quiet ${tarbitrator_service_name}; then
+      echo "TDengine tarbitrator is running, stopping it..."
+      ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+  fi
+  ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+
+  ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+function clean_service_on_sysvinit() {
+    if pidof tarbitrator &> /dev/null; then
+        echo "TDengine's tarbitrator is running, stopping it..."
+        ${csudo} service tarbitratord stop || :
+    fi
+    
+    if ((${initd_mod}==1)); then    
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then   
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then  
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi
+
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+   
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function clean_service() {
+    if ((${service_mod}==0)); then
+        clean_service_on_systemd
+    elif ((${service_mod}==1)); then
+        clean_service_on_sysvinit
+    else
+        # must manual stop  
+        kill_tarbitrator
+    fi
+}
+
+# Stop service and disable booting start.
+clean_service
+# Remove binary file and links
+clean_bin
+# Remove header file.
+##clean_header
+# Remove log file
+clean_log
+
+${csudo} rm -rf ${install_main_dir}
+
+echo -e "${GREEN}TDengine's arbitrator is removed successfully!${NC}"
diff --git a/packaging/tools/remove_arbi_power.sh b/packaging/tools/remove_arbi_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..077b19ec7d4208c604c2042c2aa1eacab2033c5b
--- /dev/null
+++ b/packaging/tools/remove_arbi_power.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
+# Script to stop the service and uninstall PowerDB's arbitrator
+
+set -e
+#set -x
+
+verMode=edge
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/tarbitrator"
+bin_link_dir="/usr/bin"
+#inc_link_dir="/usr/include"
+
+service_config_dir="/etc/systemd/system"
+tarbitrator_service_name="tarbitratord"
+csudo=""
+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 service &> /dev/null); then    
+    service_mod=1
+    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
+
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+function clean_bin() {
+    # Remove link
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator      || :
+}
+
+function clean_header() {
+    # Remove link
+    ${csudo} rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo} rm -f ${inc_link_dir}/taoserror.h  || :
+}
+
+function clean_log() {
+    # Remove link
+    ${csudo} rm -rf /arbitrator.log    || :
+}
+
+function clean_service_on_systemd() {
+  tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+
+  if systemctl is-active --quiet ${tarbitrator_service_name}; then
+      echo "PowerDB tarbitrator is running, stopping it..."
+      ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+  fi
+  ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+
+  ${csudo} rm -f ${tarbitratord_service_config}
+}
+
+function clean_service_on_sysvinit() {
+    if pidof tarbitrator &> /dev/null; then
+        echo "PowerDB's tarbitrator is running, stopping it..."
+        ${csudo} service tarbitratord stop || :
+    fi
+    
+    if ((${initd_mod}==1)); then    
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then   
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then  
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi
+
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+   
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function clean_service() {
+    if ((${service_mod}==0)); then
+        clean_service_on_systemd
+    elif ((${service_mod}==1)); then
+        clean_service_on_sysvinit
+    else
+        # must manual stop  
+        kill_tarbitrator
+    fi
+}
+
+# Stop service and disable booting start.
+clean_service
+# Remove binary file and links
+clean_bin
+# Remove header file.
+##clean_header
+# Remove log file
+clean_log
+
+${csudo} rm -rf ${install_main_dir}
+
+echo -e "${GREEN}PowerDB's arbitrator is removed successfully!${NC}"
+echo 
\ No newline at end of file
diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index 9210546a9f407fd821a176cadfcf88ae8023dc2f..2c28b7b6bf41b3798d533b8835a5ff311eecfdb4 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -15,11 +15,12 @@ log_link_dir="/usr/local/taos/log"
 cfg_link_dir="/usr/local/taos/cfg"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 
 
 # v1.5 jar dir
-v15_java_app_dir="/usr/local/lib/taos"
+#v15_java_app_dir="/usr/local/lib/taos"
 
 csudo=""
 if command -v sudo > /dev/null; then
@@ -36,14 +37,16 @@ function kill_client() {
 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}/taosdemo  || :
     ${csudo} rm -f ${bin_link_dir}/rmtaos    || :
+    ${csudo} rm -f ${bin_link_dir}/set_core  || :
 }
 
 function clean_lib() {
     # Remove link
     ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo} rm -rf ${v15_java_app_dir}                      || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*    || :
+    #${csudo} rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
@@ -78,3 +81,4 @@ clean_config
 ${csudo} rm -rf ${install_main_dir}
 
 echo -e "${GREEN}TDengine client is removed successfully!${NC}"
+echo 
diff --git a/packaging/tools/remove_client_power.sh b/packaging/tools/remove_client_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7a3c99e100c7b0e363bdf15bf19b8b523124c45b
--- /dev/null
+++ b/packaging/tools/remove_client_power.sh
@@ -0,0 +1,84 @@
+#!/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/power"
+
+log_link_dir="/usr/local/power/log"
+cfg_link_dir="/usr/local/power/cfg"
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+
+
+# v1.5 jar dir
+#v15_java_app_dir="/usr/local/lib/power"
+
+csudo=""
+if command -v sudo > /dev/null; then
+    csudo="sudo"
+fi
+
+function kill_client() {
+  #pid=$(ps -ef | grep "power" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$(pidof power)" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+
+function clean_bin() {
+    # Remove link
+    ${csudo} rm -f ${bin_link_dir}/power      || :
+    ${csudo} rm -f ${bin_link_dir}/powerdemo  || :
+    ${csudo} rm -f ${bin_link_dir}/rmpower    || :
+    ${csudo} rm -f ${bin_link_dir}/set_core   || :
+}
+
+function clean_lib() {
+    # Remove link
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*    || :
+    #${csudo} rm -rf ${v15_java_app_dir}           || :
+}
+
+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}PowerDB client is removed successfully!${NC}"
+echo 
diff --git a/packaging/tools/remove_power.sh b/packaging/tools/remove_power.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d6d6c5dd7c7744363add2cafb23ea0178533ab8d
--- /dev/null
+++ b/packaging/tools/remove_power.sh
@@ -0,0 +1,226 @@
+#!/bin/bash
+#
+# Script to stop the service and uninstall TDengine, but retain the config, data and log files.
+
+set -e
+#set -x
+
+verMode=edge
+
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+NC='\033[0m'
+
+#install main path
+install_main_dir="/usr/local/power"
+data_link_dir="/usr/local/power/data"
+log_link_dir="/usr/local/power/log"
+cfg_link_dir="/usr/local/power/cfg"
+bin_link_dir="/usr/bin"
+lib_link_dir="/usr/lib"
+lib64_link_dir="/usr/lib64"
+inc_link_dir="/usr/include"
+install_nginxd_dir="/usr/local/nginxd"
+
+# v1.5 jar dir
+#v15_java_app_dir="/usr/local/lib/power"
+
+service_config_dir="/etc/systemd/system"
+power_service_name="powerd"
+tarbitrator_service_name="tarbitratord"
+nginx_service_name="nginxd"
+csudo=""
+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 service &> /dev/null); then    
+    service_mod=1
+    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
+
+function kill_powerd() {
+  pid=$(ps -ef | grep "powerd" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+
+function kill_tarbitrator() {
+  pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
+  if [ -n "$pid" ]; then
+    ${csudo} kill -9 $pid   || :
+  fi
+}
+function clean_bin() {
+    # Remove link
+    ${csudo} rm -f ${bin_link_dir}/power        || :
+    ${csudo} rm -f ${bin_link_dir}/powerd       || :
+    ${csudo} rm -f ${bin_link_dir}/powerdemo    || :
+    ${csudo} rm -f ${bin_link_dir}/rmpower      || :
+    ${csudo} rm -f ${bin_link_dir}/tarbitrator  || :
+    ${csudo} rm -f ${bin_link_dir}/set_core     || :
+}
+
+function clean_lib() {
+    # Remove link
+    ${csudo} rm -f ${lib_link_dir}/libtaos.*      || :
+    ${csudo} rm -f ${lib64_link_dir}/libtaos.*    || :
+    #${csudo} rm -rf ${v15_java_app_dir}           || :
+}
+
+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}    || :
+}
+
+function clean_service_on_systemd() {
+    power_service_config="${service_config_dir}/${power_service_name}.service"
+    if systemctl is-active --quiet ${power_service_name}; then
+        echo "PowerDB powerd is running, stopping it..."
+        ${csudo} systemctl stop ${power_service_name} &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable ${power_service_name} &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${power_service_config}
+    
+    tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+    if systemctl is-active --quiet ${tarbitrator_service_name}; then
+        echo "TDengine tarbitrator is running, stopping it..."
+        ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+    fi
+    ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+    ${csudo} rm -f ${tarbitratord_service_config}
+    
+    if [ "$verMode" == "cluster" ]; then
+		  nginx_service_config="${service_config_dir}/${nginx_service_name}.service"	
+   	 	if [ -d ${bin_dir}/web ]; then
+   	    if systemctl is-active --quiet ${nginx_service_name}; then
+   	        echo "Nginx for TDengine is running, stopping it..."
+   	        ${csudo} systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
+   	    fi
+   	    ${csudo} systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
+      
+   	    ${csudo} rm -f ${nginx_service_config}
+   	  fi
+    fi 
+}
+
+function clean_service_on_sysvinit() {
+    #restart_config_str="power:2345:respawn:${service_config_dir}/powerd start"
+    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :    
+    
+    if pidof powerd &> /dev/null; then
+        echo "PowerDB powerd is running, stopping it..."
+        ${csudo} service powerd stop || :
+    fi
+    
+    if pidof tarbitrator &> /dev/null; then
+        echo "PowerDB tarbitrator is running, stopping it..."
+        ${csudo} service tarbitratord stop || :
+    fi
+    
+    if ((${initd_mod}==1)); then    
+      if [ -e ${service_config_dir}/powerd ]; then 
+        ${csudo} chkconfig --del powerd || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} chkconfig --del tarbitratord || :
+      fi
+    elif ((${initd_mod}==2)); then   
+      if [ -e ${service_config_dir}/powerd ]; then 
+        ${csudo} insserv -r powerd || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} insserv -r tarbitratord || :
+      fi
+    elif ((${initd_mod}==3)); then  
+      if [ -e ${service_config_dir}/powerd ]; then 
+        ${csudo} update-rc.d -f powerd remove || :
+      fi
+      if [ -e ${service_config_dir}/tarbitratord ]; then 
+        ${csudo} update-rc.d -f tarbitratord remove || :
+      fi
+    fi
+    
+    ${csudo} rm -f ${service_config_dir}/powerd || :
+    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+   
+    if $(which init &> /dev/null); then
+        ${csudo} init q || :
+    fi
+}
+
+function clean_service() {
+    if ((${service_mod}==0)); then
+        clean_service_on_systemd
+    elif ((${service_mod}==1)); then
+        clean_service_on_sysvinit
+    else
+        # must manual stop taosd
+        kill_powerd
+        kill_tarbitrator
+    fi
+}
+
+# Stop service and disable booting start.
+clean_service
+# 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
+# Remove data link directory
+${csudo} rm -rf ${data_link_dir}    || : 
+
+${csudo} rm -rf ${install_main_dir}
+${csudo} rm -rf ${install_nginxd_dir}
+if [[ -e /etc/os-release ]]; then
+  osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+else
+  osinfo=""
+fi
+
+#if echo $osinfo | grep -qwi "ubuntu" ; then
+##  echo "this is ubuntu system"
+#   ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
+#elif echo $osinfo | grep -qwi "debian" ; then
+##  echo "this is debian system"
+#   ${csudo} rm -f /var/lib/dpkg/info/tdengine* || :
+#elif  echo $osinfo | grep -qwi "centos" ; then
+##  echo "this is centos system"
+#  ${csudo} rpm -e --noscripts tdengine || :
+#fi
+
+echo -e "${GREEN}PowerDB is removed successfully!${NC}"
+echo 
\ No newline at end of file
diff --git a/packaging/tools/set_core.sh b/packaging/tools/set_core.sh
new file mode 100755
index 0000000000000000000000000000000000000000..083b0516dbb03daafe8c19548b7fac494af7d24a
--- /dev/null
+++ b/packaging/tools/set_core.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# This file is used to set config for core when taosd crash
+
+set -e
+# set -x
+
+csudo=""
+if command -v sudo > /dev/null; then
+  csudo="sudo"
+fi
+
+#ulimit -c unlimited
+${csudo} sed -i '/ulimit -c unlimited/d' /etc/profile ||:
+${csudo} sed -i '$a\ulimit -c unlimited' /etc/profile ||:
+source /etc/profile
+
+${csudo} mkdir -p /coredump  ||:
+${csudo} sysctl -w kernel.core_pattern='/coredump/core-%e-%p'  ||:
+${csudo} echo '/coredump/core-%e-%p' | ${csudo} tee /proc/sys/kernel/core_pattern  ||:
diff --git a/snap/gui/t-dengine.svg b/snap/gui/t-dengine.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e5f29a860bb4eea273dbc47a9ad277ba89dd17bf
--- /dev/null
+++ b/snap/gui/t-dengine.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="-5.86 -5.86 304.72 93.47"><title>TDengine logo</title><g data-name="图层 2"><path fill="#718cc7" fill-rule="evenodd" d="M288.45 43.86q0 2.49-3 4.52-1.49 1-4.18 2.76A7.12 7.12 0 0 1 278 52h-20c-.72 0-1.28-.48-1.69-1.42a3.61 3.61 0 0 1-.13-1.35 5.64 5.64 0 0 1 .1-1.31A2.17 2.17 0 0 1 257 47a1.7 1.7 0 0 1 1-.54h16.77a5 5 0 0 0 3.2-1.55 6 6 0 0 0 2-3.16c.05-.36.07-1.37.07-3s0-2.76-.07-3a6.31 6.31 0 0 0-2.09-3.2 4.9 4.9 0 0 0-3.16-1.52h-8.02a8.39 8.39 0 0 1-4.18-1.35q-.4-.27-4.31-3a6 6 0 0 1-1.08-1.07 4.2 4.2 0 0 1-.94-2.63v-9q0-2.49 3.1-4.51c1.07-.76 2.47-1.68 4.17-2.76a7.43 7.43 0 0 1 3.37-.81h19.67a2.07 2.07 0 0 1 1.88 1.42 6.38 6.38 0 0 1 .07 1.34 5.63 5.63 0 0 1-.1 1.28 2.22 2.22 0 0 1-.67 1 1.64 1.64 0 0 1-1.05.54h-16.7a5.08 5.08 0 0 0-3.3 1.58 5.3 5.3 0 0 0-1.95 2.94 18.73 18.73 0 0 0-.14 3 16 16 0 0 0 .2 3.37 6.84 6.84 0 0 0 2.12 2.93 4.89 4.89 0 0 0 3.07 1.45H278a8.15 8.15 0 0 1 4.18 1.41q.4.2 4.24 3a4 4 0 0 1 1.68 2.06 6.18 6.18 0 0 1 .34 1.65v9zM42.62 0A5.58 5.58 0 1 1 37 5.58 5.59 5.59 0 0 1 42.62 0zm-37 26.81A5.58 5.58 0 1 1 0 32.39a5.58 5.58 0 0 1 5.58-5.58zm14.5 43.62A5.58 5.58 0 1 1 14.5 76a5.6 5.6 0 0 1 5.58-5.58zm45.09 0A5.58 5.58 0 1 1 59.59 76a5.59 5.59 0 0 1 5.58-5.58zM50.8 33.23H34.44l-5 15.56 13.19 9.61 13.21-9.6-5-15.57zM34.87 31.9l5.73-17.64a7.4 7.4 0 0 1-1.26-.4l-5.86 18h-19v1.33h18.57L28.26 48 13.19 37a8.31 8.31 0 0 1-.77 1.07l12.81 9.33 2.6 1.89-.83 2.48-5 15.53a7.76 7.76 0 0 1 1.27.38L29 50.1l12.5 9.12L26.66 70a10.12 10.12 0 0 1 .82 1l15.15-11 15.14 11a8.15 8.15 0 0 1 .82-1L43.75 59.22l12.52-9.1.54 1.67L62 67.67a8.85 8.85 0 0 1 1.27-.37l-5.85-18L60 47.42l12.83-9.32a10 10 0 0 1-.77-1.1l-12.47 9-.35.26L57 48l-4.82-14.77h18.61a8.06 8.06 0 0 1 0-.85v-.47h-19l-5.85-18a7.4 7.4 0 0 1-1.26.4l5.73 17.65zm-22.28-5l22.59-16.43a8.16 8.16 0 0 0 .81 1L13.33 28a8.46 8.46 0 0 0-.74-1.1zm4.07 40.88L8 41a8.72 8.72 0 0 0 1.24-.45l8.72 26.83a10.9 10.9 0 0 0-1.26.41zm39.6 8.6H29v-.36a7.89 7.89 0 0 0-.06-1H56.3V76.38zM77.29 41l-8.71 26.8a8.74 8.74 0 0 0-1.25-.42L76 40.53a8.84 8.84 0 0 0 1.25.45zM50.07 10.47l22.59 16.42a9.08 9.08 0 0 0-.74 1.11L49.26 11.52a10.46 10.46 0 0 0 .81-1zm29.6 16.34a5.58 5.58 0 1 1-5.58 5.58 5.58 5.58 0 0 1 5.58-5.58zM290.07 45V33.69a5.15 5.15 0 0 0-.37-1.48 3.06 3.06 0 0 0-.64-1.21c-1.4-1.08-2.81-2.16-4.25-3.23-2.47-1.75-4.37-2.63-5.72-2.63h-8.76a4.11 4.11 0 0 1-1.08-.24 5 5 0 0 1-1.85-1.41 3.29 3.29 0 0 1-1.11-1.92c-.09-1.57-.13-2.43-.13-2.56a14.37 14.37 0 0 1 .13-2.56 4.42 4.42 0 0 1 1.55-2.36 3.94 3.94 0 0 1 2.49-1.21h17.51a1.86 1.86 0 0 0 2-1.41 12.22 12.22 0 0 0 .21-3c0-2.15-.18-3.42-.54-3.8a2.43 2.43 0 0 0-1.82-.57h-22c-1.48 0-3.34.8-5.59 2.42-1.16.81-2.6 1.86-4.31 3.17a3.73 3.73 0 0 0-1.21 3V24a3.78 3.78 0 0 0 .94 2.7 43.57 43.57 0 0 0 3.64 2.76q4.3 3.11 6.33 3.1h8.82q2 0 3.91 3a2.31 2.31 0 0 1 .13.54 17.07 17.07 0 0 1 .14 2.56 18.92 18.92 0 0 1-.14 2.52 4.44 4.44 0 0 1-1.34 2.26 4.06 4.06 0 0 1-2.7 1.35h-17.52a1.91 1.91 0 0 0-1.68.6 9.3 9.3 0 0 0-.47 3.77 9 9 0 0 0 .44 3.71 1.89 1.89 0 0 0 1.71.67h22.3q2.09 0 6-2.76l3.76-2.78a3.75 3.75 0 0 0 1.22-3zm1.93 1V32.75a4.26 4.26 0 0 0-1.41-3.17c-1.8-1.48-3.19-2.55-4.18-3.23-2.83-2.06-4.94-3.1-6.33-3.1h-8.82a3.25 3.25 0 0 1-1.92-.77 2.69 2.69 0 0 1-1.18-1.85c-.05-.54-.07-1.08-.07-1.62a15.09 15.09 0 0 1 .07-1.62 2.81 2.81 0 0 1 1.28-1.88 2.94 2.94 0 0 1 1.82-.68h17.51a3 3 0 0 0 2.22-1 3.09 3.09 0 0 0 1-2.12V5.34a2.77 2.77 0 0 0-1.08-2.19 3.48 3.48 0 0 0-2.29-.91h-23.88a6.16 6.16 0 0 0-3.1.81c-2.15 1.39-3.72 2.45-4.71 3.16-2.83 1.93-4.24 3.78-4.24 5.53v13.2a4.24 4.24 0 0 0 1.41 3.16q3.11 2.56 4.72 3.64c2.46 1.8 4.4 2.69 5.79 2.69h8.82a3.21 3.21 0 0 1 1.95.78A2.57 2.57 0 0 1 276.5 37c.06.69.1 1.24.1 1.65a9.73 9.73 0 0 1-.14 1.61 2.58 2.58 0 0 1-1.14 1.86 3.38 3.38 0 0 1-1.89.7h-17.58a3 3 0 0 0-2.19 1 3.16 3.16 0 0 0-1 2.23v6.19a3.34 3.34 0 0 0 3.16 3.17h24.28a9 9 0 0 0 1.55-.2 11 11 0 0 0 3.16-1.62c1-.72 2-1.44 2.9-2.16Q292 48.65 292 46zm-64.91-6.2V17.93a3 3 0 0 0-.78-1.88 3.1 3.1 0 0 0-1.85-1.15c-.4 0-.94-.07-1.62-.07s-1.19 0-1.68.07a2.94 2.94 0 0 0-1.82 1.18 3.21 3.21 0 0 0-.74 1.92v21.69a3.15 3.15 0 0 0 .74 2 3 3 0 0 0 1.82 1.15q.54.06 1.68.06a16 16 0 0 0 1.62-.06 3.16 3.16 0 0 0 2-1.28 3.36 3.36 0 0 0 .61-1.76zm1.95 1a3.91 3.91 0 0 1-1.28 2.46 4.76 4.76 0 0 1-2.29 1.58c-.49 0-1.37.07-2.63.07-1 0-1.86 0-2.62-.07a3.76 3.76 0 0 1-1.89-1.11 5.13 5.13 0 0 1-1.41-1.79 3.6 3.6 0 0 1-.27-1.14V17a3.93 3.93 0 0 1 1.35-2.5 3.92 3.92 0 0 1 2.24-1.5c.94-.09 1.82-.14 2.62-.14a12.54 12.54 0 0 1 2.63.14 5.71 5.71 0 0 1 2.42 1.61 3.52 3.52 0 0 1 1.15 2.39v23.7zm1.55.4a5.11 5.11 0 0 1-1.79 3.37c-1.19 1.21-2.14 1.82-2.86 1.82l-1.65.06-1.45.07a19 19 0 0 1-3.43-.2 6.46 6.46 0 0 1-3-2.22 4.59 4.59 0 0 1-1.35-2.9V16.65a4.92 4.92 0 0 1 1.75-3.36 5.23 5.23 0 0 1 3-1.89 22 22 0 0 1 3.09-.13 17.61 17.61 0 0 1 3.44.2 5.91 5.91 0 0 1 2.83 2 5 5 0 0 1 1.48 3.07V41.1zm8.41 2.66q0 2.49-3 4.52-1.49 1-4.18 2.76a7.12 7.12 0 0 1-3.23.81h-12.66q-3.7 0-8-4.85a4.43 4.43 0 0 1-1.21-3.17V13.82q0-2.49 3.1-4.51c1.07-.76 2.47-1.68 4.17-2.76a7.43 7.43 0 0 1 3.37-.81h11A9 9 0 0 1 233 7.29a42.19 42.19 0 0 1 4.72 3.5 3.73 3.73 0 0 1 1.21 3v30zm1.58 1.14a3.75 3.75 0 0 1-1.22 3l-3.77 2.83q-3.9 2.76-6 2.76h-14.81a7 7 0 0 1-3.84-1.48q-.87-.6-4-3.3a4.7 4.7 0 0 1-.74-.81 5 5 0 0 1-1-2.89V12.68a3.73 3.73 0 0 1 1.21-3c1.71-1.31 3.15-2.36 4.31-3.17 2.25-1.62 4.11-2.42 5.59-2.42h13.2a9.52 9.52 0 0 1 5.12 2c.32.22 1.91 1.44 4.78 3.64a3.46 3.46 0 0 1 .78 1.31 4.71 4.71 0 0 1 .44 1.65V45zm1.95.94q0 2.7-4.31 5.52c-.94.72-1.91 1.44-2.9 2.16a11 11 0 0 1-3.16 1.62 9 9 0 0 1-1.55.2h-16.77q-3.84 0-9.57-6.47a4.33 4.33 0 0 1-1.07-3V11.74c0-1.75 1.41-3.6 4.24-5.53 1-.71 2.56-1.77 4.71-3.16a6.16 6.16 0 0 1 3.1-.81h15.16q2.49 0 6.13 2.76a42.2 42.2 0 0 1 4.71 3.71 4.81 4.81 0 0 1 1.28 3V46zM177.62 19c0-2.78-1.42-4.18-4.25-4.18s-4.24 1.4-4.24 4.18 1.41 4.24 4.24 4.24 4.25-1.41 4.25-4.24zm1.95 0a10 10 0 0 1-.3 3.17 7 7 0 0 1-1.42 1.75 3.47 3.47 0 0 1-1.85 1.15c-.81.05-1.68.07-2.63.07a14 14 0 0 1-3-.2 5.18 5.18 0 0 1-1.89-1.42 3.33 3.33 0 0 1-1.18-1.95c-.09-1.35-.13-2.2-.13-2.56a13.39 13.39 0 0 1 .2-3 4.75 4.75 0 0 1 1.41-1.89 3.36 3.36 0 0 1 2-1.14c1.39-.09 2.26-.14 2.62-.14a14.25 14.25 0 0 1 3 .2 5 5 0 0 1 1.88 1.38 3.72 3.72 0 0 1 1.22 2 24.55 24.55 0 0 1 .13 2.56zm1.55 0a14.45 14.45 0 0 1-.34 3.91 7 7 0 0 1-3.5 3.5 12.62 12.62 0 0 1-3.91.34 14.83 14.83 0 0 1-3.43-.21 6.39 6.39 0 0 1-2.7-1.81A5.33 5.33 0 0 1 165.7 22a19.12 19.12 0 0 1-.14-3 17.27 17.27 0 0 1 .2-3.37 6.07 6.07 0 0 1 1.85-2.63 4.82 4.82 0 0 1 2.66-1.58c1-.09 2-.13 3.1-.13a17.61 17.61 0 0 1 3.44.2 6.35 6.35 0 0 1 2.66 1.82 4.92 4.92 0 0 1 1.58 2.69c0 .58.07 1.59.07 3zm8.35 31.12a1.76 1.76 0 0 1-1.35 1.75c-.22 0-1.16.07-2.83.07-1.48 0-2.36 0-2.66-.07a1.81 1.81 0 0 1-1-.71 1.84 1.84 0 0 1-.54-1V36.25a5 5 0 0 0-1.52-3.2 5.5 5.5 0 0 0-3.13-2 19.89 19.89 0 0 0-3.1-.14c-1.39 0-2.42 0-3.1.1a4.09 4.09 0 0 0-2.22 1.25q-2.49 2.22-2.49 4v13.87a1.93 1.93 0 0 1-.44 1 1.53 1.53 0 0 1-.91.74 19.92 19.92 0 0 1-2.83.11c-1.48 0-2.36 0-2.66-.07a1.81 1.81 0 0 1-1-.71 1.84 1.84 0 0 1-.54-1V16.38q0-2.35 2.42-5 1.89-1.89 3.78-3.7c.09-.09.44-.36 1.07-.81a5.84 5.84 0 0 1 3.57-1.15h10.64a7 7 0 0 1 4.58 2c.54.44 2.09 2 4.65 4.71a5.69 5.69 0 0 1 1.55 4v33.7zm1.62 1.21a2.81 2.81 0 0 1-.44 1.55 2 2 0 0 1-1.79.67h-7.13a2.47 2.47 0 0 1-1.55-.47 2.09 2.09 0 0 1-.61-1.75V36.66a3.8 3.8 0 0 0-1.38-2.66 4.19 4.19 0 0 0-2.26-1.41c-.94 0-1.79-.07-2.56-.07a16 16 0 0 0-3 .2 4.23 4.23 0 0 0-1.65 1.14 5.52 5.52 0 0 0-1.31 1.69 3.11 3.11 0 0 0-.27 1.08v14.71a2.81 2.81 0 0 1-.44 1.55 2 2 0 0 1-1.79.67h-7.14a2.46 2.46 0 0 1-1.54-.47 2.09 2.09 0 0 1-.61-1.75v-36.1a5.21 5.21 0 0 1 .81-2.7 8.46 8.46 0 0 1 .81-1.07Q159.64 9 162 6.55c1.8-1.62 3.44-2.42 4.92-2.42h12.93a6.79 6.79 0 0 1 4.38 2l4.58 4.58 1.14 1.34a4.89 4.89 0 0 1 1.15 3.17v36.1zm1.95 1a3 3 0 0 1-1 2.09 3.09 3.09 0 0 1-2.22 1h-9a3.07 3.07 0 0 1-2.15-1 3 3 0 0 1-1-2.19V37.67a3.21 3.21 0 0 0-.74-1.92 3 3 0 0 0-1.93-1.18 7.65 7.65 0 0 0-1.62-.14 14.71 14.71 0 0 0-1.68.14 2.64 2.64 0 0 0-1.82 1.11 3.21 3.21 0 0 0-.74 1.92v14.75a3 3 0 0 1-1 2.09 3.09 3.09 0 0 1-2.22 1h-9a3.34 3.34 0 0 1-3.16-3.17v-38a5.21 5.21 0 0 1 .81-2.7c.17-.27.44-.65.8-1.14 1.75-1.75 3.51-3.53 5.26-5.32q3-2.89 5.38-2.9h14.82a5.42 5.42 0 0 1 4 1.62l5.11 5Q193 12.28 193 14.3v38.05zM141.8 8.5a5.63 5.63 0 0 1-.1 1.28 2.17 2.17 0 0 1-.68 1 1.62 1.62 0 0 1-1 .54h-5.39a5.15 5.15 0 0 0-3.53 1.88 5.25 5.25 0 0 0-1.86 3.44v33.49a2 2 0 0 1-.43 1 1.61 1.61 0 0 1-.88.74 12.82 12.82 0 0 1-2.19.11 19.35 19.35 0 0 1-2.09-.07 1.86 1.86 0 0 1-.94-.68 1.72 1.72 0 0 1-.54-1.07V16.65a5.19 5.19 0 0 0-1.88-3.53 5.25 5.25 0 0 0-3.44-1.85h-5.45c-.72 0-1.28-.45-1.69-1.35a4.32 4.32 0 0 1-.13-1.42 3.58 3.58 0 0 1 .13-1.34 2.17 2.17 0 0 1 1.89-1.42h28.29a2.08 2.08 0 0 1 1.88 1.42 6.38 6.38 0 0 1 .07 1.34zm1.62 0c0-2.15-.18-3.42-.54-3.8a2.43 2.43 0 0 0-1.82-.57h-30.71a2.09 2.09 0 0 0-2.23 1.41 18.24 18.24 0 0 0-.13 3c0 2 .14 3.26.44 3.71a1.89 1.89 0 0 0 1.71.67h6.27a2.73 2.73 0 0 1 1.61.47q2.57 1.89 2.56 3.64v34.31a2.12 2.12 0 0 0 .61 1.75 2.47 2.47 0 0 0 1.55.47h5.86a2 2 0 0 0 1.78-.67 2.81 2.81 0 0 0 .44-1.55V17a4.19 4.19 0 0 1 1.38-2.63 3.93 3.93 0 0 1 2.8-1.48h6.19a1.87 1.87 0 0 0 2-1.41 12.22 12.22 0 0 0 .21-3zM287.72 76l-2.93-5.6a.52.52 0 0 0-.5-.3.54.54 0 0 0-.51.3l-3 5.6a.58.58 0 0 0 0 .62.62.62 0 0 0 .55.31h5.83a.62.62 0 0 0 .54-.31.56.56 0 0 0 0-.62zm5.46 6h-2.26c-.11-.19-.54-1-1.3-2.45a1.35 1.35 0 0 0-1.27-.79h-8.15a1.36 1.36 0 0 0-1.29.79L277.66 82h-2.28l7.49-14.15h2.81q.26.45 7.5 14.15zM240 69.7h-6.1a.94.94 0 0 0-1 .93V82h-1.82V70.63a.94.94 0 0 0-.93-.93h-6.08v-1.84H240v1.84zM183.28 76l-2.93-5.6a.52.52 0 0 0-.5-.3.54.54 0 0 0-.51.3l-3 5.6a.58.58 0 0 0 0 .62.61.61 0 0 0 .55.31h5.83a.62.62 0 0 0 .54-.31.58.58 0 0 0 0-.62zm5.46 6h-2.26c-.11-.19-.54-1-1.3-2.45a1.35 1.35 0 0 0-1.27-.79h-8.15a1.36 1.36 0 0 0-1.29.79L173.22 82h-2.28l7.49-14.15h2.81l7.5 14.15zm-55-7a5 5 0 0 0-1.56-3.85 5.61 5.61 0 0 0-4-1.45h-6.38a.91.91 0 0 0-.66.28 1 1 0 0 0-.27.67v8.63a.94.94 0 0 0 .27.68.9.9 0 0 0 .66.27h6.89a5 5 0 0 0 3.66-1.44 5.14 5.14 0 0 0 1.43-3.79zm1.8.06a6.46 6.46 0 0 1-2.29 5.09A7.66 7.66 0 0 1 128 82h-9V67.88h8.51a8.41 8.41 0 0 1 5.85 2 6.71 6.71 0 0 1 2.15 5.2zm9.79-63.37V5.34a2.77 2.77 0 0 0-1.08-2.19 3.48 3.48 0 0 0-2.25-.91h-32.6a3.44 3.44 0 0 0-2.32.91 2.87 2.87 0 0 0-1 2.26v6.19a3.12 3.12 0 0 0 1 2.22 3 3 0 0 0 2.19 1h6.26a3.12 3.12 0 0 1 2.16.95 3 3 0 0 1 1 2.22v34.29a3 3 0 0 0 1 2.19 3.15 3.15 0 0 0 2.13 1h7.74a3.09 3.09 0 0 0 2.22-1 3 3 0 0 0 1-2.09V17.93a3.31 3.31 0 0 1 3.17-3.1h6.2a3 3 0 0 0 2.22-1 3.09 3.09 0 0 0 1-2.16z" data-name="图层 1"/></g></svg>
\ No newline at end of file
diff --git a/snap/hooks/install b/snap/hooks/install
new file mode 100755
index 0000000000000000000000000000000000000000..542be0b8340893b652f38be6fec5711ef7c09fb9
--- /dev/null
+++ b/snap/hooks/install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ ! -d /var/lib/taos ]; then
+  mkdir -p /var/lib/taos
+fi
+
+if [ ! -d /var/log/taos ]; then
+  mkdir -p --mode=777 /var/log/taos
+else
+  chmod 777 /var/log/taos
+fi
+
+if [ ! -d /etc/taos ]; then
+  mkdir -p /etc/taos
+fi
+
+if [ ! -f /etc/taos/taos.cfg ]; then
+  if [ ! -d /etc/taos ]; then
+    mkdir -p /etc/taos
+  fi
+  cp $SNAP/etc/taos/taos.cfg /etc/taos/taos.cfg
+fi
diff --git a/snap/local/launcher.sh b/snap/local/launcher.sh
new file mode 100755
index 0000000000000000000000000000000000000000..29a7a63779097e0d807d1e4bbbfa46afcf92dc97
--- /dev/null
+++ b/snap/local/launcher.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Wrapper to check for custom config in $SNAP_USER_COMMON or $SNAP_COMMON and
+# use it otherwise fall back to the included basic config which will at least
+# allow mosquitto to run and do something.
+# This script will also copy the full example config in to SNAP_USER_COMMON or
+# SNAP_COMMON so that people can refer to it.
+#
+# The decision about whether to use SNAP_USER_COMMON or SNAP_COMMON is taken
+# based on the user that runs the command. If the user is root, it is assumed
+# that mosquitto is being run as a system daemon, and SNAP_COMMON will be used.
+# If a non-root user runs the command, then SNAP_USER_COMMON will be used.
+
+case "$SNAP_USER_COMMON" in
+	*/root/snap/tdengine/common*) COMMON=$SNAP_COMMON ;;
+	*)                             COMMON=$SNAP_USER_COMMON ;;
+esac
+
+if [ ! -f $SNAP_DATA/etc/taos/taos.cfg ]; then
+  if [ ! -d $SNAP_DATA/etc/taos ]; then
+    mkdir -p $SNAP_DATA/etc/taos
+  fi
+  cp $SNAP/etc/taos/taos.cfg $SNAP_DATA/etc/taos
+fi
+
+# Launch the snap
+$SNAP/usr/bin/taosd -c /etc/taos $@
diff --git a/snap/local/taoswrapper.sh b/snap/local/taoswrapper.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c7e5c1b856d1208ad3d7454dc0b8a5bac726a456
--- /dev/null
+++ b/snap/local/taoswrapper.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Wrapper to check for custom config in $SNAP_USER_COMMON or $SNAP_COMMON and
+# use it otherwise fall back to the included basic config which will at least
+# allow mosquitto to run and do something.
+# This script will also copy the full example config in to SNAP_USER_COMMON or
+# SNAP_COMMON so that people can refer to it.
+#
+# The decision about whether to use SNAP_USER_COMMON or SNAP_COMMON is taken
+# based on the user that runs the command. If the user is root, it is assumed
+# that mosquitto is being run as a system daemon, and SNAP_COMMON will be used.
+# If a non-root user runs the command, then SNAP_USER_COMMON will be used.
+
+case "$SNAP_USER_COMMON" in
+	*/root/snap/tdengine/common*) COMMON=$SNAP_COMMON ;;
+	*)                             COMMON=$SNAP_USER_COMMON ;;
+esac
+
+if [ -d /etc/taos ]; then
+    CONFIG_FILE="/etc/taos"
+else
+    CONFIG_FILE="$SNAP/etc/taos"
+fi
+
+# Launch the snap
+$SNAP/usr/bin/taos -c $CONFIG_FILE $@
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d55be5b8c0e08bb5b0f6745b41328f07d37a7e90
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,94 @@
+name: tdengine
+base: core18
+version: 'RELEASE_VERSION'
+icon: snap/gui/t-dengine.svg
+summary: an open-source big data platform designed and optimized for IoT. 
+description: |
+  TDengine is an open-source big data platform designed and optimized for Internet of Things (IoT), Connected Vehicles, and Industrial IoT. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and costs of development and operations.
+
+grade: stable
+confinement: strict
+
+apps:
+  tdengine:
+    command: launcher.sh
+    daemon: simple
+    restart-condition: always
+    plugs:
+      - network
+      - network-bind
+      - system-observe
+
+  taos:
+    command: taoswrapper.sh
+    plugs:
+      - network
+      - system-observe
+
+  taosdemo:
+    command: usr/bin/taosdemo
+    plugs:
+      - network
+
+parts:
+  script:
+    plugin: dump
+    source: snap/local/
+    prime:
+      - launcher.sh
+      - taoswrapper.sh
+
+  tdengine:
+    source: .
+    source-type: local
+    plugin: cmake
+    build-packages:
+      - gcc
+      - g++
+      - make
+      - cmake
+    override-build: |
+      snapcraftctl build
+      if [ ! -d $SNAPCRAFT_STAGE/usr ]; then
+        mkdir $SNAPCRAFT_STAGE/usr
+      fi
+
+      if [ ! -d $SNAPCRAFT_STAGE/etc/taos ]; then
+        mkdir -p $SNAPCRAFT_STAGE/etc/taos
+      fi
+
+      cp $SNAPCRAFT_PART_BUILD/build/* -rf $SNAPCRAFT_STAGE/usr/
+      cp $SNAPCRAFT_PART_SRC/packaging/cfg/taos.cfg -rf $SNAPCRAFT_STAGE/etc/taos/
+
+      if [ ! -d $SNAPCRAFT_STAGE/var/lib/taos ]; then
+        mkdir -p $SNAPCRAFT_STAGE/var/lib/taos
+      fi
+      if [ ! -d $SNAPCRAFT_STAGE/var/log/taos ]; then
+        mkdir -p --mode=777 $SNAPCRAFT_STAGE/var/log/taos
+      fi
+
+    prime:
+      - etc/taos/taos.cfg
+      - usr/bin/taosd
+      - usr/bin/taos
+      - usr/bin/taosdemo
+      - usr/lib/libtaos.so.RELEASE_VERSION
+      - usr/lib/libtaos.so.1
+      - usr/lib/libtaos.so
+
+    override-prime: |
+      snapcraftctl prime
+      if [ ! -d $SNAPCRAFT_PRIME/var/lib/taos ]; then
+        cp -rf $SNAPCRAFT_STAGE/var/lib/taos $SNAPCRAFT_PRIME
+      fi
+      if [ ! -d $SNAPCRAFT_PRIME/var/log/taos ]; then
+        cp -rf  $SNAPCRAFT_STAGE/var/log/taos $SNAPCRAFT_PRIME
+      fi
+
+layout:
+  /var/lib/taos:
+    bind: $SNAP_DATA/var/lib/taos
+  /var/log/taos:
+    bind: $SNAP_DATA/var/log/taos
+  /etc/taos:
+    bind: $SNAP_DATA/etc/taos
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5219477700ea4adcc456f21d4bf62828a454bee..898b7cb032846cb85e4cc8767ed6090b35f41e1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,23 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
+# Base compile
 ADD_SUBDIRECTORY(os)
+ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(rpc)
 ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(query)
 ADD_SUBDIRECTORY(kit)
-ADD_SUBDIRECTORY(sdb)
-ADD_SUBDIRECTORY(modules)
-ADD_SUBDIRECTORY(system)
+ADD_SUBDIRECTORY(plugins)
+IF (TD_SYNC)
+  ADD_SUBDIRECTORY(sync)
+ENDIF ()
+ADD_SUBDIRECTORY(balance)
+ADD_SUBDIRECTORY(mnode)
+ADD_SUBDIRECTORY(vnode)
+ADD_SUBDIRECTORY(tsdb)
+ADD_SUBDIRECTORY(wal)
+ADD_SUBDIRECTORY(cq)
+ADD_SUBDIRECTORY(dnode)
 ADD_SUBDIRECTORY(connector/jdbc)
diff --git a/src/balance/CMakeLists.txt b/src/balance/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6c26e50b873d30b95c67a7988e83140106f609eb
--- /dev/null
+++ b/src/balance/CMakeLists.txt
@@ -0,0 +1,13 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
+INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(balance ${SRC})
+ENDIF ()
diff --git a/src/balance/src/balance.c b/src/balance/src/balance.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b9af741c39d9f5dcae6031f6f120ba56df9c972
--- /dev/null
+++ b/src/balance/src/balance.c
@@ -0,0 +1,1020 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tutil.h"
+#include "tbalance.h"
+#include "tsync.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "tdataformat.h"
+#include "dnode.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeDnode.h"
+#include "mnodeDb.h"
+#include "mnodeMnode.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+
+/*
+ * once sdb work as mater, then tsAccessSquence reset to zero
+ * increase tsAccessSquence every balance interval
+ */
+extern void *       tsMnodeTmr;
+static void *       tsBalanceTimer = NULL;
+static int32_t      tsBalanceDnodeListSize = 0;
+static SDnodeObj ** tsBalanceDnodeList = NULL;
+static int32_t      tsBalanceDnodeListMallocSize = 16;
+static pthread_mutex_t tsBalanceMutex;
+
+static void  balanceStartTimer(int64_t mseconds);
+static void  balanceInitDnodeList();
+static void  balanceCleanupDnodeList();
+static void  balanceAccquireDnodeList();
+static void  balanceReleaseDnodeList();
+static void  balanceMonitorDnodeModule();
+static float balanceTryCalcDnodeScore(SDnodeObj *pDnode, int32_t extraVnode);
+static int32_t balanceGetScoresMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t balanceRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+
+static void balanceLock() {
+  pthread_mutex_lock(&tsBalanceMutex);
+}
+
+static void balanceUnLock() {
+  pthread_mutex_unlock(&tsBalanceMutex);
+}
+
+static bool balanceCheckFree(SDnodeObj *pDnode) {
+  if (pDnode->status == TAOS_DN_STATUS_DROPPING || pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+    mError("dnode:%d, status:%s not available", pDnode->dnodeId, mnodeGetDnodeStatusStr(pDnode->status));
+    return false;
+  }
+  
+  if (pDnode->openVnodes >= TSDB_MAX_VNODES) {
+    mError("dnode:%d, openVnodes:%d maxVnodes:%d not available", pDnode->dnodeId, pDnode->openVnodes, TSDB_MAX_VNODES);
+    return false;
+  }
+
+  if (pDnode->diskAvailable <= tsMinimalDataDirGB) {
+    mError("dnode:%d, disk space:%fGB, not available", pDnode->dnodeId, pDnode->diskAvailable);
+    return false;
+  }
+
+  if (pDnode->alternativeRole == TAOS_DN_ALTERNATIVE_ROLE_MNODE) {
+    mDebug("dnode:%d, alternative role is master, can't alloc vnodes in this dnode", pDnode->dnodeId);
+    return false;
+  }
+
+  return true;
+}
+
+static void balanceDiscardVnode(SVgObj *pVgroup, SVnodeGid *pVnodeGid) {
+  mDebug("vgId:%d, dnode:%d is dropping", pVgroup->vgId, pVnodeGid->dnodeId);
+
+  SDnodeObj *pDnode = mnodeGetDnode(pVnodeGid->dnodeId);
+  if (pDnode != NULL) {
+    atomic_sub_fetch_32(&pDnode->openVnodes, 1);
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  SVnodeGid vnodeGid[TSDB_MAX_REPLICA]; memset(vnodeGid, 0, sizeof(vnodeGid)); /* = {0}; */
+  int32_t   numOfVnodes = 0;
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SVnodeGid *pTmpVodeGid = pVgroup->vnodeGid + i;
+    if (pTmpVodeGid == pVnodeGid) {
+      continue;
+    }
+    vnodeGid[numOfVnodes] = *pTmpVodeGid;
+    ++numOfVnodes;
+  }
+  memcpy(pVgroup->vnodeGid, vnodeGid, TSDB_MAX_REPLICA * sizeof(SVnodeGid));
+  pVgroup->numOfVnodes = numOfVnodes;
+
+  mnodeUpdateVgroup(pVgroup);
+}
+
+static void balanceSwapVnodeGid(SVnodeGid *pVnodeGid1, SVnodeGid *pVnodeGid2) {
+  // SVnodeGid tmp = *pVnodeGid1;
+  // *pVnodeGid1 = *pVnodeGid2;
+  // *pVnodeGid2 = tmp;
+}
+
+int32_t balanceAllocVnodes(SVgObj *pVgroup) {
+  static int32_t randIndex = 0;
+  int32_t dnode = 0;
+  int32_t vnodes = 0;
+
+  balanceLock();
+
+  balanceAccquireDnodeList();
+
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    for (; dnode < tsBalanceDnodeListSize; ++dnode) {
+      SDnodeObj *pDnode = tsBalanceDnodeList[dnode];
+      if (balanceCheckFree(pDnode)) {
+        SVnodeGid *pVnodeGid = pVgroup->vnodeGid + i;
+        pVnodeGid->dnodeId = pDnode->dnodeId;
+        pVnodeGid->pDnode = pDnode;
+        dnode++;
+        vnodes++;
+        break;
+      }
+    }
+  }
+
+  if (vnodes != pVgroup->numOfVnodes) {
+    mDebug("vgId:%d, db:%s need vnodes:%d, but alloc:%d, free them", pVgroup->vgId, pVgroup->dbName,
+           pVgroup->numOfVnodes, vnodes);
+    balanceReleaseDnodeList();
+    balanceUnLock();
+
+    if (mnodeGetOnlineDnodesNum() == 0) {
+      return TSDB_CODE_MND_NOT_READY;
+    } else {
+      return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+    }
+  }
+
+  /*
+   * make the choice more random.
+   * replica 1: no choice
+   * replica 2: there are 2 combinations
+   * replica 3 or larger: there are 6 combinations
+   */
+  if (pVgroup->numOfVnodes == 1) {
+  } else if (pVgroup->numOfVnodes == 2) {
+    if (randIndex++ % 2 == 0) {
+      balanceSwapVnodeGid(pVgroup->vnodeGid, pVgroup->vnodeGid + 1);
+    }
+  } else {
+    int32_t randVal = randIndex++ % 6;
+    if (randVal == 1) {  // 1, 0, 2
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 0, pVgroup->vnodeGid + 1);
+    } else if (randVal == 2) {  // 1, 2, 0
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 0, pVgroup->vnodeGid + 1);
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 1, pVgroup->vnodeGid + 2);
+    } else if (randVal == 3) {  // 2, 1, 0
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 0, pVgroup->vnodeGid + 2);
+    } else if (randVal == 4) {  // 2, 0, 1
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 0, pVgroup->vnodeGid + 2);
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 1, pVgroup->vnodeGid + 2);
+    }
+    if (randVal == 5) {  // 0, 2, 1
+      balanceSwapVnodeGid(pVgroup->vnodeGid + 1, pVgroup->vnodeGid + 2);
+    } else {
+    }  // 0, 1, 2
+  }
+
+  balanceReleaseDnodeList();
+  balanceUnLock();
+  return TSDB_CODE_SUCCESS;
+}
+
+static bool balanceCheckVgroupReady(SVgObj *pVgroup, SVnodeGid *pRmVnode) {
+  if (pVgroup->lbTime + 5 * tsStatusInterval > tsAccessSquence) {
+    return false;
+  }
+
+  bool isReady = false;
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SVnodeGid *pVnode = pVgroup->vnodeGid + i;
+    if (pVnode == pRmVnode) continue;
+
+    mTrace("vgId:%d, change vgroup status, dnode:%d status:%d", pVgroup->vgId, pVnode->pDnode->dnodeId,
+           pVnode->pDnode->status);
+    if (pVnode->pDnode->status == TAOS_DN_STATUS_DROPPING) continue;
+    if (pVnode->pDnode->status == TAOS_DN_STATUS_OFFLINE) continue;
+
+    if (pVnode->role == TAOS_SYNC_ROLE_SLAVE || pVnode->role == TAOS_SYNC_ROLE_MASTER) {
+      isReady = true;
+    }
+  }
+
+  return isReady;
+}
+
+/**
+ * desc: remove one vnode from vgroup
+ * all vnodes in vgroup should in ready state, except the balancing one
+ **/
+static int32_t balanceRemoveVnode(SVgObj *pVgroup) {
+  if (pVgroup->numOfVnodes <= 1) return -1;
+
+  SVnodeGid *pRmVnode = NULL;
+  SVnodeGid *pSelVnode = NULL;
+  int32_t    maxScore = 0;
+
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SVnodeGid *pVnode = &(pVgroup->vnodeGid[i]);
+    SDnodeObj *pDnode = mnodeGetDnode(pVnode->dnodeId);
+
+    if (pDnode == NULL) {
+      mError("vgId:%d, dnode:%d not exist, remove it", pVgroup->vgId, pVnode->dnodeId);
+      pRmVnode = pVnode;
+      break;
+    }
+
+    if (pDnode->status == TAOS_DN_STATUS_DROPPING) {
+      mDebug("vgId:%d, dnode:%d in dropping state", pVgroup->vgId, pVnode->dnodeId);
+      pRmVnode = pVnode;
+    } else if (pVnode->dnodeId == pVgroup->lbDnodeId) {
+      mDebug("vgId:%d, dnode:%d in updating state", pVgroup->vgId, pVnode->dnodeId);
+      pRmVnode = pVnode;
+    } else {
+      if (pSelVnode == NULL) {
+        pSelVnode = pVnode;
+        maxScore = pDnode->score;
+      } else {
+        if (maxScore < pDnode->score) {
+          pSelVnode = pVnode;
+          maxScore = pDnode->score;
+        }
+      }
+    }
+
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  if (pRmVnode != NULL) {
+    pSelVnode = pRmVnode;
+  }
+
+  if (!balanceCheckVgroupReady(pVgroup, pSelVnode)) {
+    mDebug("vgId:%d, is not ready", pVgroup->vgId);
+    return -1;
+  } else {
+    mDebug("vgId:%d, is ready, discard dnode:%d", pVgroup->vgId, pSelVnode->dnodeId);
+    balanceDiscardVnode(pVgroup, pSelVnode);
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static bool balanceCheckDnodeInVgroup(SDnodeObj *pDnode, SVgObj *pVgroup) {
+ for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SVnodeGid *pGid = &pVgroup->vnodeGid[i];
+    if (pGid->dnodeId == 0) break;
+    if (pGid->dnodeId == pDnode->dnodeId) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * desc: add vnode to vgroup, find a new one if dest dnode is null
+ **/
+static int32_t balanceAddVnode(SVgObj *pVgroup, SDnodeObj *pSrcDnode, SDnodeObj *pDestDnode) {
+  if (pDestDnode == NULL) {
+    for (int32_t i = 0; i < tsBalanceDnodeListSize; ++i) {
+      SDnodeObj *pDnode = tsBalanceDnodeList[i];
+      if (pDnode == pSrcDnode) continue;
+      if (balanceCheckDnodeInVgroup(pDnode, pVgroup)) continue;
+      if (!balanceCheckFree(pDnode)) continue;
+      
+      pDestDnode = pDnode;
+      mDebug("vgId:%d, add vnode to dnode:%d", pVgroup->vgId, pDnode->dnodeId);
+      break;
+    }
+  }
+
+  if (pDestDnode == NULL) {
+    return TSDB_CODE_MND_DNODE_NOT_EXIST;
+  }
+
+  SVnodeGid *pVnodeGid = pVgroup->vnodeGid + pVgroup->numOfVnodes;
+  pVnodeGid->dnodeId = pDestDnode->dnodeId;
+  pVnodeGid->pDnode = pDestDnode;
+  pVgroup->numOfVnodes++;
+
+  if (pSrcDnode != NULL) {
+    pVgroup->lbDnodeId = pSrcDnode->dnodeId;
+  }
+
+  atomic_add_fetch_32(&pDestDnode->openVnodes, 1);
+
+  mnodeUpdateVgroup(pVgroup);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static bool balanceMonitorBalance() {
+  if (tsBalanceDnodeListSize < 2) return false;
+
+  for (int32_t src = tsBalanceDnodeListSize - 1; src >= 0; --src) {
+    SDnodeObj *pDnode = tsBalanceDnodeList[src];
+    mDebug("%d-dnode:%d, state:%s, score:%.1f, numOfCores:%d, openVnodes:%d", tsBalanceDnodeListSize - src - 1,
+           pDnode->dnodeId, mnodeGetDnodeStatusStr(pDnode->status), pDnode->score, pDnode->numOfCores,
+           pDnode->openVnodes);
+  }
+
+  float scoresDiff = tsBalanceDnodeList[tsBalanceDnodeListSize - 1]->score - tsBalanceDnodeList[0]->score;
+  if (scoresDiff < 0.01) {
+    mDebug("all dnodes:%d is already balanced, scoresDiff:%f", tsBalanceDnodeListSize, scoresDiff);
+    return false;
+  }
+
+  for (int32_t src = tsBalanceDnodeListSize - 1; src > 0; --src) {
+    SDnodeObj *pSrcDnode = tsBalanceDnodeList[src];
+    float srcScore = balanceTryCalcDnodeScore(pSrcDnode, -1);
+    if (tsEnableBalance == 0 && pSrcDnode->status != TAOS_DN_STATUS_DROPPING) {
+      continue;
+    }
+
+    void *pIter = NULL;
+    while (1) {
+      SVgObj *pVgroup;
+      pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+      if (pVgroup == NULL) break;
+
+      if (balanceCheckDnodeInVgroup(pSrcDnode, pVgroup)) {
+        for (int32_t dest = 0; dest < src; dest++) {
+          SDnodeObj *pDestDnode = tsBalanceDnodeList[dest];
+          if (balanceCheckDnodeInVgroup(pDestDnode, pVgroup)) continue;
+
+          float destScore = balanceTryCalcDnodeScore(pDestDnode, 1);
+          if (srcScore + 0.0001 < destScore) continue;
+          if (!balanceCheckFree(pDestDnode)) continue;
+          
+          mDebug("vgId:%d, balance from dnode:%d to dnode:%d, srcScore:%.1f:%.1f, destScore:%.1f:%.1f",
+                 pVgroup->vgId, pSrcDnode->dnodeId, pDestDnode->dnodeId, pSrcDnode->score,
+                 srcScore, pDestDnode->score, destScore);
+          balanceAddVnode(pVgroup, pSrcDnode, pDestDnode);
+          mnodeDecVgroupRef(pVgroup);
+          sdbFreeIter(pIter);
+          return true;
+        }
+      }
+
+      mnodeDecVgroupRef(pVgroup);
+    }
+
+    sdbFreeIter(pIter);
+  }
+
+  return false;
+}
+
+// if mgmt changed to master
+// 1. reset balanceAccessSquence to zero
+// 2. reset state of dnodes to offline
+// 3. reset lastAccess of dnodes to zero
+void balanceReset() {
+  void *     pIter = NULL;
+  SDnodeObj *pDnode = NULL;
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+
+    // while master change, should reset dnode to offline
+    mInfo("dnode:%d set access:%d to 0", pDnode->dnodeId, pDnode->lastAccess);
+    pDnode->lastAccess = 0;
+    if (pDnode->status != TAOS_DN_STATUS_DROPPING) {
+      pDnode->status = TAOS_DN_STATUS_OFFLINE;
+      pDnode->offlineReason = TAOS_DN_OFF_STATUS_NOT_RECEIVED;
+    }
+
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  tsAccessSquence = 0;
+}
+
+static int32_t balanceMonitorVgroups() {
+  void *  pIter = NULL;
+  SVgObj *pVgroup = NULL;
+  bool    hasUpdatingVgroup = false;
+
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    int32_t dbReplica = pVgroup->pDb->cfg.replications;
+    int32_t vgReplica = pVgroup->numOfVnodes;
+    int32_t code = -1;
+    
+    if (vgReplica > dbReplica) {
+      mInfo("vgId:%d, replica:%d numOfVnodes:%d, try remove one vnode", pVgroup->vgId, dbReplica, vgReplica);
+      hasUpdatingVgroup = true;
+      code = balanceRemoveVnode(pVgroup);
+    } else if (vgReplica < dbReplica) {
+      mInfo("vgId:%d, replica:%d numOfVnodes:%d, try add one vnode", pVgroup->vgId, dbReplica, vgReplica);
+      hasUpdatingVgroup = true;
+      code = balanceAddVnode(pVgroup, NULL, NULL);
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+    if (code == TSDB_CODE_SUCCESS) {
+      break;
+    }
+  }
+
+  sdbFreeIter(pIter);
+
+  return hasUpdatingVgroup;
+}
+
+static bool balanceMonitorDnodeDropping(SDnodeObj *pDnode) {
+  mDebug("dnode:%d, in dropping state", pDnode->dnodeId);
+
+  void *  pIter = NULL;
+  bool    hasThisDnode = false;
+  while (1) {
+    SVgObj *pVgroup = NULL;
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    hasThisDnode = balanceCheckDnodeInVgroup(pDnode, pVgroup);
+    mnodeDecVgroupRef(pVgroup);
+
+    if (hasThisDnode) break;
+  }
+
+  sdbFreeIter(pIter);
+
+  if (!hasThisDnode) {
+    mInfo("dnode:%d, dropped for all vnodes are moving to other dnodes", pDnode->dnodeId);
+    mnodeDropDnode(pDnode, NULL);
+    return true;
+  }
+
+  return false;
+}
+
+static bool balanceMontiorDropping() {
+  void *pIter = NULL;
+  SDnodeObj *pDnode = NULL;
+
+  while (1) {
+    mnodeDecDnodeRef(pDnode);
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+
+    if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+      if (pDnode->lastAccess + tsOfflineThreshold > tsAccessSquence) continue;
+      if (strcmp(pDnode->dnodeEp, dnodeGetMnodeMasterEp()) == 0) continue; 
+      if (mnodeGetDnodesNum() <= 1) continue;
+
+      mLInfo("dnode:%d, set to removing state for it offline:%d seconds", pDnode->dnodeId,
+              tsAccessSquence - pDnode->lastAccess);
+
+      pDnode->status = TAOS_DN_STATUS_DROPPING;
+      mnodeUpdateDnode(pDnode);
+      mnodeDecDnodeRef(pDnode);
+      sdbFreeIter(pIter);
+      return true;
+    }
+
+    if (pDnode->status == TAOS_DN_STATUS_DROPPING) {
+      bool ret = balanceMonitorDnodeDropping(pDnode);
+      mnodeDecDnodeRef(pDnode);
+      sdbFreeIter(pIter);
+      return ret;
+    }
+  }
+
+  sdbFreeIter(pIter);
+
+  return false;
+}
+
+static bool balanceStart() {
+  if (!sdbIsMaster()) return false;
+
+  balanceLock();
+
+  balanceAccquireDnodeList();
+
+  balanceMonitorDnodeModule();
+
+  bool updateSoon = balanceMontiorDropping();
+
+  if (!updateSoon) {
+    updateSoon = balanceMonitorVgroups();
+  }
+
+  if (!updateSoon) {
+    updateSoon = balanceMonitorBalance();
+  }
+ 
+  balanceReleaseDnodeList();
+
+  balanceUnLock();
+
+  return updateSoon;
+}
+
+static void balanceSetVgroupOffline(SDnodeObj* pDnode) {
+  void *pIter = NULL;
+  while (1) {
+    SVgObj *pVgroup;
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+      if (pVgroup->vnodeGid[i].pDnode == pDnode) {
+        pVgroup->vnodeGid[i].role = TAOS_SYNC_ROLE_OFFLINE;
+      }
+    }
+    mnodeDecVgroupRef(pVgroup);
+  }
+
+  sdbFreeIter(pIter);
+}
+
+static void balanceCheckDnodeAccess() {
+  void *     pIter = NULL;
+  SDnodeObj *pDnode = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (tsAccessSquence - pDnode->lastAccess > 3) {
+      if (pDnode->status != TAOS_DN_STATUS_DROPPING && pDnode->status != TAOS_DN_STATUS_OFFLINE) {
+        pDnode->status = TAOS_DN_STATUS_OFFLINE;
+        pDnode->offlineReason = TAOS_DN_OFF_STATUS_MSG_TIMEOUT;
+        mInfo("dnode:%d, set to offline state", pDnode->dnodeId);
+        balanceSetVgroupOffline(pDnode);
+      }
+    }
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+}
+
+static void balanceProcessBalanceTimer(void *handle, void *tmrId) {
+  if (!sdbIsMaster()) return;
+
+  tsBalanceTimer = NULL;
+  tsAccessSquence ++;
+
+  balanceCheckDnodeAccess();  
+  bool updateSoon = false;
+
+  if (handle == NULL) {
+    if (tsAccessSquence % tsBalanceInterval == 0) {
+      mDebug("balance function is scheduled by timer");
+      updateSoon = balanceStart();
+    }
+  } else {
+    int64_t mseconds = (int64_t)handle;
+    mDebug("balance function is scheduled by event for %" PRId64 " mseconds arrived", mseconds);
+    updateSoon = balanceStart();
+  }
+
+  if (updateSoon) {
+    balanceStartTimer(1000);
+  } else {
+    taosTmrReset(balanceProcessBalanceTimer, tsStatusInterval * 1000, NULL, tsMnodeTmr, &tsBalanceTimer);
+  }
+}
+
+static void balanceStartTimer(int64_t mseconds) {
+  taosTmrReset(balanceProcessBalanceTimer, mseconds, (void *)mseconds, tsMnodeTmr, &tsBalanceTimer);
+}
+
+void balanceSyncNotify() {
+  if (sdbIsMaster()) {
+    balanceLock();
+    balanceAccquireDnodeList();
+    balanceMonitorDnodeModule();
+    balanceReleaseDnodeList();
+    balanceUnLock();
+  }
+}
+
+void balanceAsyncNotify() {
+  balanceStartTimer(500); 
+}
+
+int32_t balanceInit() {
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_SCORES, balanceGetScoresMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_SCORES, balanceRetrieveScores);
+  
+  pthread_mutex_init(&tsBalanceMutex, NULL);
+  balanceInitDnodeList();
+  balanceStartTimer(2000);
+  mDebug("balance start fp:%p initialized", balanceProcessBalanceTimer);
+
+  balanceReset();
+  
+  return 0;
+}
+
+void balanceCleanUp() {
+  if (tsBalanceTimer != NULL) {
+    taosTmrStopA(&tsBalanceTimer);
+    pthread_mutex_destroy(&tsBalanceMutex);
+    tsBalanceTimer = NULL;
+    mDebug("stop balance timer");
+  }
+  balanceCleanupDnodeList();
+}
+
+int32_t balanceDropDnode(SDnodeObj *pDnode) {
+  int32_t    totalFreeVnodes = 0;
+  void *     pIter = NULL;
+  SDnodeObj *pTempDnode = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pTempDnode);
+    if (pTempDnode == NULL) break;
+
+    if (pTempDnode != pDnode && balanceCheckFree(pTempDnode)) {
+      totalFreeVnodes += (TSDB_MAX_VNODES - pTempDnode->openVnodes);
+    }
+
+    mnodeDecDnodeRef(pTempDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  if (pDnode->openVnodes > totalFreeVnodes) {
+    mError("dnode:%d, openVnodes:%d totalFreeVnodes:%d no enough dnodes", pDnode->dnodeId, pDnode->openVnodes, totalFreeVnodes);
+    return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+  }
+
+  pDnode->status = TAOS_DN_STATUS_DROPPING;
+  mnodeUpdateDnode(pDnode);
+  
+  balanceStartTimer(1100);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t balanceCalcCpuScore(SDnodeObj *pDnode) {
+  if (pDnode->cpuAvgUsage < 80)
+    return 0;
+  else if (pDnode->cpuAvgUsage < 90)
+    return 10;
+  else
+    return 50;
+}
+
+static int32_t balanceCalcMemoryScore(SDnodeObj *pDnode) {
+  if (pDnode->memoryAvgUsage < 80)
+    return 0;
+  else if (pDnode->memoryAvgUsage < 90)
+    return 10;
+  else
+    return 50;
+}
+
+static int32_t balanceCalcDiskScore(SDnodeObj *pDnode) {
+  if (pDnode->diskAvgUsage < 80)
+    return 0;
+  else if (pDnode->diskAvgUsage < 90)
+    return 10;
+  else
+    return 50;
+}
+
+static int32_t balanceCalcBandwidthScore(SDnodeObj *pDnode) {
+  if (pDnode->bandwidthUsage < 30)
+    return 0;
+  else if (pDnode->bandwidthUsage < 80)
+    return 10;
+  else
+    return 50;
+}
+
+static float balanceCalcModuleScore(SDnodeObj *pDnode) {
+  if (pDnode->numOfCores <= 0) return 0;
+  if (pDnode->isMgmt) {
+     return (float)tsMnodeEqualVnodeNum / pDnode->numOfCores;
+  }
+  return 0;
+}
+
+static float balanceCalcVnodeScore(SDnodeObj *pDnode, int32_t extra) {
+  if (pDnode->status == TAOS_DN_STATUS_DROPPING || pDnode->status == TAOS_DN_STATUS_OFFLINE) return 100000000;
+  if (pDnode->numOfCores <= 0) return 0;
+  return (float)(pDnode->openVnodes + extra) / pDnode->numOfCores;
+}
+
+/**
+ * calc singe score, such as cpu/memory/disk/bandwitdh/vnode
+ * 1. get the score config
+ * 2. if the value is out of range, use border data
+ * 3. otherwise use interpolation method
+ **/
+void balanceCalcDnodeScore(SDnodeObj *pDnode) {
+  pDnode->score = balanceCalcCpuScore(pDnode) + balanceCalcMemoryScore(pDnode) + balanceCalcDiskScore(pDnode) +
+                  balanceCalcBandwidthScore(pDnode) + balanceCalcModuleScore(pDnode) +
+                  balanceCalcVnodeScore(pDnode, 0) + pDnode->customScore;
+}
+
+float balanceTryCalcDnodeScore(SDnodeObj *pDnode, int32_t extra) {
+  int32_t systemScore = balanceCalcCpuScore(pDnode) + balanceCalcMemoryScore(pDnode) + balanceCalcDiskScore(pDnode) +
+                        balanceCalcBandwidthScore(pDnode);
+  float moduleScore = balanceCalcModuleScore(pDnode);
+  float vnodeScore = balanceCalcVnodeScore(pDnode, extra);
+
+  float score = systemScore + moduleScore + vnodeScore +  pDnode->customScore;
+  return score;
+}
+
+static void balanceInitDnodeList() {
+  tsBalanceDnodeList = calloc(tsBalanceDnodeListMallocSize, sizeof(SDnodeObj *));
+}
+
+static void balanceCleanupDnodeList() {
+  if (tsBalanceDnodeList != NULL) {
+    free(tsBalanceDnodeList);
+    tsBalanceDnodeList = NULL;
+  }
+}
+
+static void balanceCheckDnodeListSize(int32_t dnodesNum) {
+  if (tsBalanceDnodeListMallocSize <= dnodesNum) {
+    tsBalanceDnodeListMallocSize = dnodesNum * 2;
+    tsBalanceDnodeList = realloc(tsBalanceDnodeList, tsBalanceDnodeListMallocSize * sizeof(SDnodeObj *));
+  }
+}
+
+void balanceAccquireDnodeList() {
+  int32_t dnodesNum = mnodeGetDnodesNum();
+  balanceCheckDnodeListSize(dnodesNum);
+
+  void *     pIter = NULL;
+  SDnodeObj *pDnode = NULL;
+  int32_t    dnodeIndex = 0;
+
+  while (1) {  
+    if (dnodeIndex >= dnodesNum) break;
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+      mnodeDecDnodeRef(pDnode);
+      continue;
+    }
+
+    balanceCalcDnodeScore(pDnode);
+    
+    int32_t orderIndex = dnodeIndex;
+    for (; orderIndex > 0; --orderIndex) {
+      if (pDnode->score > tsBalanceDnodeList[orderIndex - 1]->score) {
+        break;
+      }
+      tsBalanceDnodeList[orderIndex] = tsBalanceDnodeList[orderIndex - 1];
+    }
+    tsBalanceDnodeList[orderIndex] = pDnode;
+    dnodeIndex++;
+  }
+
+  sdbFreeIter(pIter);
+
+  tsBalanceDnodeListSize = dnodeIndex;
+}
+
+void balanceReleaseDnodeList() {
+  for (int32_t i = 0; i < tsBalanceDnodeListSize; ++i) {
+    SDnodeObj *pDnode = tsBalanceDnodeList[i];
+    if (pDnode != NULL) {
+      mnodeDecDnodeRef(pDnode);
+    }
+  }
+}
+
+static int32_t balanceGetScoresMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  if (strcmp(pUser->pAcct->user, "root") != 0)  {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
+  strcpy(pSchema[cols].name, "system scores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
+  strcpy(pSchema[cols].name, "custom scores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
+  strcpy(pSchema[cols].name, "module scores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
+  strcpy(pSchema[cols].name, "vnode scores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
+  strcpy(pSchema[cols].name, "total scores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "open vnodes");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "cpu cores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 18 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "balance state");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = mnodeGetDnodesNum();
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = NULL;
+
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+static int32_t balanceRetrieveScores(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t    numOfRows = 0;
+  SDnodeObj *pDnode = NULL;
+  char *     pWrite;
+  int32_t    cols = 0;
+  
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextDnode(pShow->pIter, &pDnode);
+    if (pDnode == NULL) break;
+
+    int32_t systemScore = balanceCalcCpuScore(pDnode) + balanceCalcMemoryScore(pDnode) + balanceCalcDiskScore(pDnode) +
+                      balanceCalcBandwidthScore(pDnode);
+    float moduleScore = balanceCalcModuleScore(pDnode);
+    float vnodeScore = balanceCalcVnodeScore(pDnode, 0);
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pDnode->dnodeId;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(float *)pWrite = systemScore;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(float *)pWrite = pDnode->customScore;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(float *)pWrite = (int32_t)moduleScore;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(float *)pWrite = (int32_t)vnodeScore;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(float *)pWrite = (int32_t)(vnodeScore + moduleScore + pDnode->customScore + systemScore);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = pDnode->openVnodes;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = pDnode->numOfCores;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_TO_VARSTR(pWrite, mnodeGetDnodeStatusStr(pDnode->status));
+    cols++;
+
+    numOfRows++;
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+static void balanceMonitorDnodeModule() {
+  int32_t numOfMnodes = mnodeGetMnodesNum();
+  if (numOfMnodes >= tsNumOfMnodes) return;
+
+  for (int32_t i = 0; i < tsBalanceDnodeListSize; ++i) {
+    SDnodeObj *pDnode = tsBalanceDnodeList[i];
+    if (pDnode == NULL) break;
+
+    if (pDnode->isMgmt || pDnode->status == TAOS_DN_STATUS_DROPPING || pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+      continue;
+    }
+
+    if (pDnode->alternativeRole == TAOS_DN_ALTERNATIVE_ROLE_VNODE) {
+      continue;
+    }
+
+    mLInfo("dnode:%d, numOfMnodes:%d expect:%d, add mnode in this dnode", pDnode->dnodeId, numOfMnodes, tsNumOfMnodes);
+    mnodeAddMnode(pDnode->dnodeId);
+    
+    numOfMnodes = mnodeGetMnodesNum();
+    if (numOfMnodes >= tsNumOfMnodes) return;
+  }
+}
+
+int32_t balanceAlterDnode(struct SDnodeObj *pSrcDnode, int32_t vnodeId, int32_t dnodeId) {
+  if (!sdbIsMaster()) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, for self not master", pSrcDnode->dnodeId, vnodeId, dnodeId);
+    return TSDB_CODE_MND_DNODE_NOT_EXIST;
+  }
+
+  if (tsEnableBalance != 0) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, for balance enabled", pSrcDnode->dnodeId, vnodeId, dnodeId);
+    return TSDB_CODE_MND_BALANCE_ENABLED;
+  }
+
+  SVgObj *pVgroup = mnodeGetVgroup(vnodeId);
+  if (pVgroup == NULL) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, for vgroup not exist", pSrcDnode->dnodeId, vnodeId, dnodeId);
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  SDnodeObj *pDestDnode = mnodeGetDnode(dnodeId);
+  if (pDestDnode == NULL) {
+    mnodeDecVgroupRef(pVgroup);
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, for dnode not exist", pSrcDnode->dnodeId, vnodeId, dnodeId);
+    return TSDB_CODE_MND_DNODE_NOT_EXIST;
+  }
+
+  balanceLock();
+  balanceAccquireDnodeList();
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  if (!balanceCheckDnodeInVgroup(pSrcDnode, pVgroup)) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, vgroup not in dnode:%d", pSrcDnode->dnodeId, vnodeId,
+           dnodeId, pSrcDnode->dnodeId);
+    code = TSDB_CODE_MND_VGROUP_NOT_IN_DNODE;
+  } else if (balanceCheckDnodeInVgroup(pDestDnode, pVgroup)) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, vgroup already in dnode:%d", pSrcDnode->dnodeId, vnodeId,
+           dnodeId, dnodeId);
+    code = TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE;
+  } else if (!balanceCheckFree(pDestDnode)) {
+    mError("dnode:%d, failed to alter vgId:%d to dnode:%d, for dnode:%d not free", pSrcDnode->dnodeId, vnodeId, dnodeId,
+           dnodeId);
+    code = TSDB_CODE_MND_DNODE_NOT_FREE;
+  } else {
+    code = balanceAddVnode(pVgroup, pSrcDnode, pDestDnode);
+    mInfo("dnode:%d, alter vgId:%d to dnode:%d, result:%s", pSrcDnode->dnodeId, vnodeId, dnodeId, tstrerror(code));
+  }
+
+  balanceReleaseDnodeList();
+  balanceUnLock();
+
+  mnodeDecVgroupRef(pVgroup);
+  mnodeDecDnodeRef(pDestDnode);
+
+  return code;
+}
\ No newline at end of file
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 92d6b61eb2473c790c967a4a0091e233de84b8fa..daf7c5e5349f42730721b3f2b6baad5d0485361e 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -3,50 +3,48 @@ 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(${TD_COMMUNITY_DIR}/src/query/inc)
+AUX_SOURCE_DIRECTORY(src SRC)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+IF (TD_LINUX)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
 
   # set the static lib name
   ADD_LIBRARY(taos_static STATIC ${SRC})
-  TARGET_LINK_LIBRARIES(taos_static trpc tutil pthread m rt)
+  TARGET_LINK_LIBRARIES(taos_static common query trpc tutil pthread m rt)
   SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
   SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
   # generate dynamic library (*.so)
   ADD_LIBRARY(taos SHARED ${SRC})
-  TARGET_LINK_LIBRARIES(taos trpc tutil pthread m rt)
+  TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m rt)
   SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
   #set version of .so
   #VERSION    so version
   #SOVERSION  api version
-  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 version ${VERSION_INFO}")
-  SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${VERSION_INFO} SOVERSION 1)
-  
-ELSEIF (TD_WINDOWS_64)
+  #MESSAGE(STATUS "build version ${TD_VER_NUMBER}")
+  SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${TD_VER_NUMBER} SOVERSION 1)
+
+  ADD_SUBDIRECTORY(tests)
+
+ELSEIF (TD_WINDOWS)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  
+
+  CONFIGURE_FILE("${TD_COMMUNITY_DIR}/src/client/src/taos.rc.in" "${TD_COMMUNITY_DIR}/src/client/src/taos.rc")
+
   ADD_LIBRARY(taos_static STATIC ${SRC})
-  TARGET_LINK_LIBRARIES(taos_static trpc tutil)
+  TARGET_LINK_LIBRARIES(taos_static trpc tutil query)
 
   # generate dynamic library (*.dll)
-  ADD_LIBRARY(taos SHARED ${SRC})
+  ADD_LIBRARY(taos SHARED ${SRC} ${TD_COMMUNITY_DIR}/src/client/src/taos.rc)
   IF (NOT TD_GODLL)
     SET_TARGET_PROPERTIES(taos PROPERTIES LINK_FLAGS /DEF:${TD_COMMUNITY_DIR}/src/client/src/taos.def)
   ENDIF ()
-  TARGET_LINK_LIBRARIES(taos trpc)
+  TARGET_LINK_LIBRARIES(taos trpc tutil query)
 
-ELSEIF (TD_DARWIN_64)
+ELSEIF (TD_DARWIN)
   SET(CMAKE_MACOSX_RPATH 1)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/linux)
 
@@ -63,11 +61,7 @@ ELSEIF (TD_DARWIN_64)
   #set version of .so
   #VERSION    so version
   #SOVERSION  api version
-  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 version ${VERSION_INFO}")
-  SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${VERSION_INFO} SOVERSION 1)
+  #MESSAGE(STATUS "build version ${TD_VER_NUMBER}")
+  SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${TD_VER_NUMBER} SOVERSION 1)
 ENDIF ()
 
diff --git a/src/client/inc/tscCache.h b/src/client/inc/tscCache.h
deleted file mode 100644
index 4c6acec096c01db64b09c4f0d18f404b8825f7b6..0000000000000000000000000000000000000000
--- a/src/client/inc/tscCache.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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_TSCCACHE_H
-#define TDENGINE_TSCCACHE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *taosOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl, int64_t keepTimer);
-
-void taosCloseConnCache(void *handle);
-
-void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, char *user);
-
-void *taosGetConnFromCache(void *handle, uint32_t ip, uint16_t port, char *user);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSCACHE_H
diff --git a/src/client/inc/tscJoinProcess.h b/src/client/inc/tscJoinProcess.h
deleted file mode 100644
index 34764e4db62469af14592a026015c88b53a03fa5..0000000000000000000000000000000000000000
--- a/src/client/inc/tscJoinProcess.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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 tscLaunchSecondPhaseSubqueries(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
diff --git a/src/client/inc/tscLocalMerge.h b/src/client/inc/tscLocalMerge.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e579b0729431b0fc00d69431a304c4546f02fb0
--- /dev/null
+++ b/src/client/inc/tscLocalMerge.h
@@ -0,0 +1,117 @@
+/*
+ * 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_TSCLOCALMERGE_H
+#define TDENGINE_TSCLOCALMERGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "qExtbuffer.h"
+#include "qFill.h"
+#include "taosmsg.h"
+#include "tlosertree.h"
+#include "tsclient.h"
+
+#define MAX_NUM_OF_SUBQUERY_RETRY 3
+  
+struct SQLFunctionCtx;
+
+typedef struct SLocalDataSource {
+  tExtMemBuffer *pMemBuffer;
+  int32_t        flushoutIdx;
+  int32_t        pageId;
+  int32_t        rowIdx;
+  tFilePage      filePage;
+} SLocalDataSource;
+
+enum {
+  TSC_LOCALREDUCE_READY = 0x0,
+  TSC_LOCALREDUCE_IN_PROGRESS = 0x1,
+  TSC_LOCALREDUCE_TOBE_FREED = 0x2,
+};
+
+typedef struct SLocalReducer {
+  SLocalDataSource **    pLocalDataSrc;
+  int32_t                numOfBuffer;
+  int32_t                numOfCompleted;
+  int32_t                numOfVnode;
+  SLoserTreeInfo *       pLoserTree;
+  char *                 prevRowOfInput;
+  tFilePage *            pResultBuf;
+  int32_t                nResultBufSize;
+  tFilePage *            pTempBuffer;
+  struct SQLFunctionCtx *pCtx;
+  int32_t                rowSize;      // size of each intermediate result.
+  int32_t                finalRowSize; // final result row size
+  int32_t                status;       // denote it is in reduce process, in reduce process, it
+  bool                   hasPrevRow;   // cannot be released
+  bool                   hasUnprocessedRow;
+  tOrderDescriptor *     pDesc;
+  SColumnModel *         resColModel;
+  tExtMemBuffer **       pExtMemBuffer;      // disk-based buffer
+  SFillInfo*             pFillInfo;          // interpolation support structure
+  char *                 pFinalRes;          // result data after interpo
+  tFilePage *            discardData;
+  SResultInfo *          pResInfo;
+  bool                   discard;
+  int32_t                offset;             // limit offset value
+  bool                   orderPrjOnSTable;   // projection query on stable
+} SLocalReducer;
+
+typedef struct SSubqueryState {
+  int32_t  numOfRemain;         // the number of remain unfinished subquery
+  int32_t  numOfTotal;          // the number of total sub-queries
+  uint64_t numOfRetrievedRows;  // total number of points in this query
+} SSubqueryState;
+
+typedef struct SRetrieveSupport {
+  tExtMemBuffer **  pExtMemBuffer;     // for build loser tree
+  tOrderDescriptor *pOrderDescriptor;
+  SColumnModel *    pFinalColModel;    // colModel for final result
+  SSubqueryState *  pState;
+  int32_t           subqueryIndex;     // index of current vnode in vnode list
+  SSqlObj *         pParentSql;
+  tFilePage *       localBuffer;       // temp buffer, there is a buffer for each vnode to
+  uint32_t          numOfRetry;        // record the number of retry times
+} SRetrieveSupport;
+
+int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pDesc,
+                                 SColumnModel **pFinalModel, uint32_t nBufferSize);
+
+void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, SColumnModel *pFinalModel,
+                               int32_t numOfVnodes);
+
+int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
+                     int32_t numOfRows, int32_t orderType);
+
+int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, int32_t orderType);
+
+/*
+ * create local reducer to launch the second-stage reduce process at client site
+ */
+void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+                           SColumnModel *finalModel, SSqlObj* pSql);
+
+void tscDestroyLocalReducer(SSqlObj *pSql);
+
+int32_t tscDoLocalMerge(SSqlObj *pSql);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCLOCALMERGE_H
diff --git a/src/client/inc/tscLog.h b/src/client/inc/tscLog.h
new file mode 100644
index 0000000000000000000000000000000000000000..9d01edae3680c2b6aa3c075229ef077eebbe230b
--- /dev/null
+++ b/src/client/inc/tscLog.h
@@ -0,0 +1,40 @@
+/*
+ * 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_TSC_LOG_H
+#define TDENGINE_TSC_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+
+extern int32_t cDebugFlag;
+extern int32_t tscEmbedded;
+
+#define tscFatal(...) { if (cDebugFlag & DEBUG_FATAL) { taosPrintLog("TSC FATAL ", tscEmbedded ? 255 : cDebugFlag, __VA_ARGS__); }}
+#define tscError(...) { if (cDebugFlag & DEBUG_ERROR) { taosPrintLog("TSC ERROR ", tscEmbedded ? 255 : cDebugFlag, __VA_ARGS__); }}
+#define tscWarn(...)  { if (cDebugFlag & DEBUG_WARN)  { taosPrintLog("TSC WARN ", tscEmbedded ? 255 : cDebugFlag, __VA_ARGS__); }}
+#define tscInfo(...)  { if (cDebugFlag & DEBUG_INFO)  { taosPrintLog("TSC ", tscEmbedded ? 255 : cDebugFlag, __VA_ARGS__); }}
+#define tscDebug(...) { if (cDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }}
+#define tscTrace(...) { if (cDebugFlag & DEBUG_TRACE) { taosPrintLog("TSC ", cDebugFlag, __VA_ARGS__); }}
+#define tscDebugL(...){ if (cDebugFlag & DEBUG_DEBUG) { taosPrintLongString("TSC ", cDebugFlag, __VA_ARGS__); }}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/client/inc/tscProfile.h b/src/client/inc/tscProfile.h
index 16b9efac38aaf7b03f21b13ba9316518c66e775d..193fac0fb00eaa20c883215e5708eea8f07f1bc9 100644
--- a/src/client/inc/tscProfile.h
+++ b/src/client/inc/tscProfile.h
@@ -26,7 +26,7 @@ void tscAddIntoSqlList(SSqlObj *pSql);
 void tscRemoveFromSqlList(SSqlObj *pSql);
 void tscAddIntoStreamList(SSqlStream *pStream);
 void tscRemoveFromStreamList(SSqlStream *pStream, SSqlObj *pSqlObj);
-char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj);
+int  tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj);
 void tscKillQuery(STscObj *pObj, uint32_t killId);
 void tscKillStream(STscObj *pObj, uint32_t killId);
 void tscKillConnection(STscObj *pObj);
diff --git a/src/client/inc/tscSQLParser.h b/src/client/inc/tscSQLParser.h
deleted file mode 100644
index dd579d08c3c6b1465ce6b34e29f453c7b00827ec..0000000000000000000000000000000000000000
--- a/src/client/inc/tscSQLParser.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * 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_TSQL_H
-#define TDENGINE_TSQL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "taos.h"
-#include "taosmsg.h"
-#include "tsqldef.h"
-#include "ttypes.h"
-
-enum _sql_cmd {
-  TSDB_SQL_SELECT = 1,
-  TSDB_SQL_FETCH,
-  TSDB_SQL_INSERT,
-  
-  TSDB_SQL_MGMT,  // the SQL below is for mgmt node
-  TSDB_SQL_CREATE_DB,
-  TSDB_SQL_CREATE_TABLE,
-  TSDB_SQL_DROP_DB,
-  TSDB_SQL_DROP_TABLE,
-  TSDB_SQL_CREATE_ACCT,
-  TSDB_SQL_CREATE_USER,  //10
-  TSDB_SQL_DROP_ACCT,
-  TSDB_SQL_DROP_USER,
-  TSDB_SQL_ALTER_USER,
-  TSDB_SQL_ALTER_ACCT,
-  TSDB_SQL_ALTER_TABLE,
-  TSDB_SQL_ALTER_DB,
-  TSDB_SQL_CREATE_MNODE,
-  TSDB_SQL_DROP_MNODE,
-  TSDB_SQL_CREATE_DNODE,
-  TSDB_SQL_DROP_DNODE,  // 20
-  TSDB_SQL_CFG_DNODE,
-  TSDB_SQL_CFG_MNODE,
-  TSDB_SQL_SHOW,
-  TSDB_SQL_RETRIEVE,
-  TSDB_SQL_KILL_QUERY,
-  TSDB_SQL_KILL_STREAM,
-  TSDB_SQL_KILL_CONNECTION,
-  
-  TSDB_SQL_READ,  // SQL below is for read operation
-  TSDB_SQL_CONNECT,
-  TSDB_SQL_USE_DB,    // 30
-  TSDB_SQL_META,
-  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,
-  
-  /*
-   * build empty result instead of accessing dnode to fetch result
-   * reset the client cache
-   */
-  TSDB_SQL_RETRIEVE_EMPTY_RESULT,  //40
-  
-  TSDB_SQL_RESET_CACHE,
-  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   //48
-};
-
-#define MAX_TOKEN_LEN 30
-
-// token type
-enum {
-  TSQL_NODE_TYPE_EXPR = 0x1,
-  TSQL_NODE_TYPE_ID = 0x2,
-  TSQL_NODE_TYPE_VALUE = 0x4,
-};
-
-extern char tTokenTypeSwitcher[13];
-
-#define toTSDBType(x)                          \
-  do {                                         \
-    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
-      (x) = TSDB_DATA_TYPE_BINARY;             \
-    } else {                                   \
-      (x) = tTokenTypeSwitcher[(x)];           \
-    }                                          \
-  } while (0)
-
-typedef struct SLimitVal {
-  int64_t limit;
-  int64_t offset;
-} SLimitVal;
-
-typedef struct SOrderVal {
-  int32_t order;
-  int32_t orderColId;
-} SOrderVal;
-
-typedef struct tVariantListItem {
-  tVariant pVar;
-  uint8_t  sortOrder;
-} tVariantListItem;
-
-typedef struct tVariantList {
-  int32_t           nExpr;  /* Number of expressions on the list */
-  int32_t           nAlloc; /* Number of entries allocated below */
-  tVariantListItem *a;      /* One entry for each expression */
-} tVariantList;
-
-typedef struct tFieldList {
-  int32_t     nField;
-  int32_t     nAlloc;
-  TAOS_FIELD *p;
-} tFieldList;
-
-// create table operation type
-enum TSQL_TYPE {
-  TSQL_CREATE_TABLE = 0x1,
-  TSQL_CREATE_STABLE = 0x2,
-  TSQL_CREATE_TABLE_FROM_STABLE = 0x3,
-  TSQL_CREATE_STREAM = 0x4,
-};
-
-typedef struct SQuerySQL {
-  struct tSQLExprList *pSelection;   // select 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            slimit;       // group limit offset [optional]
-  tVariantList *       fillType;     // fill type[optional]
-  SSQLToken            selectToken;  // sql string
-} SQuerySQL;
-
-typedef struct SCreateTableSQL {
-  struct SSQLToken name;  // meter name, create table [meterName] xxx
-  bool             existCheck;
-  
-  int8_t           type; // create normal table/from super table/ stream
-  struct {
-    tFieldList *pTagColumns;  // for normal table, pTagColumns = NULL;
-    tFieldList *pColumns;
-  } colInfo;
-
-  struct {
-    SSQLToken     stableName;  // super table name, for using clause
-    tVariantList *pTagVals;    // create by using metric, tag value
-    STagData      tagdata;
-  } usingInfo;
-
-  SQuerySQL *pSelect;
-} SCreateTableSQL;
-
-typedef struct SAlterTableSQL {
-  SSQLToken     name;
-  int16_t       type;
-  STagData      tagData;
-  
-  tFieldList *  pAddColumns;
-  tVariantList *varList;  // set t=val or: change src dst
-} SAlterTableSQL;
-
-typedef struct SCreateDBInfo {
-  SSQLToken dbname;
-  int32_t   replica;
-  int32_t   cacheBlockSize;
-  int32_t   tablesPerVnode;
-  int32_t   daysPerFile;
-  int32_t   rowPerFileBlock;
-
-  float   numOfAvgCacheBlocks;
-  int32_t numOfBlocksPerTable;
-
-  int64_t   commitTime;
-  int32_t   commitLog;
-  int32_t   compressionLevel;
-  SSQLToken precision;
-
-  tVariantList *keep;
-} SCreateDBInfo;
-
-typedef struct SCreateAcctSQL {
-  int32_t   maxUsers;
-  int32_t   maxDbs;
-  int32_t   maxTimeSeries;
-  int32_t   maxStreams;
-  int32_t   maxPointsPerSecond;
-  int64_t   maxStorage;
-  int64_t   maxQueryTime;
-  int32_t   maxConnections;
-  SSQLToken stat;
-} SCreateAcctSQL;
-
-typedef struct SShowInfo {
-  uint8_t showType;
-  SSQLToken prefix;
-  SSQLToken pattern;
-} SShowInfo;
-
-typedef struct SUserInfo {
-  SSQLToken user;
-  SSQLToken passwd;
-//  bool      hasPasswd;
-  
-  SSQLToken privilege;
-//  bool      hasPrivilege;
-  
-  int16_t   type;
-} SUserInfo;
-
-typedef struct tDCLSQL {
-  int32_t    nTokens; /* Number of expressions on the list */
-  int32_t    nAlloc;  /* Number of entries allocated below */
-  SSQLToken *a;       /* one entry for element */
-  bool  existsCheck;
-
-  union {
-    SCreateDBInfo  dbOpt;
-    SCreateAcctSQL acctOpt;
-    SShowInfo      showOpt;
-    SSQLToken ip;
-  };
-  
-  SUserInfo user;
-  
-} tDCLSQL;
-
-typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
-  SQuerySQL **pClause;
-  int32_t     numOfClause;
-} SSubclauseInfo;
-
-typedef struct SSqlInfo {
-  int32_t type;
-  bool    valid;
-
-  union {
-    SCreateTableSQL *pCreateTableInfo;
-    SAlterTableSQL * pAlterInfo;
-    tDCLSQL *        pDCLInfo;
-  };
-
-  SSubclauseInfo subclauseInfo;
-  char           pzErrMsg[256];
-} SSqlInfo;
-
-typedef struct tSQLExpr {
-  /*
-   * for single operand:
-   * TK_ALL
-   * TK_ID
-   * TK_SUM
-   * TK_AVG
-   * TK_MIN
-   * TK_MAX
-   * TK_FIRST
-   * TK_LAST
-   * TK_BOTTOM
-   * TK_TOP
-   * TK_STDDEV
-   * TK_PERCENTILE
-   *
-   * for binary operand:
-   * TK_LESS
-   * TK_LARGE
-   * TK_EQUAL etc...
-   */
-  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, since the function name is kept in nSQLOptr already
-  SSQLToken            operand;
-  struct tSQLExprList *pParam;  // function parameters
-
-  SSQLToken colInfo;  // field id
-  tVariant  val;      // value only for string, float, int
-
-  struct tSQLExpr *pLeft;   // left child
-  struct tSQLExpr *pRight;  // right child
-} tSQLExpr;
-
-// used in select clause. select <tSQLExprList> from xxx
-typedef struct tSQLExprItem {
-  tSQLExpr *pNode;      // The list of expressions
-  char *    aliasName;  // alias name, null-terminated string
-} tSQLExprItem;
-
-typedef struct tSQLExprList {
-  int32_t       nExpr;  /* Number of expressions on the list */
-  int32_t       nAlloc; /* Number of entries allocated below */
-  tSQLExprItem *a;      /* One entry for each expression */
-} tSQLExprList;
-
-typedef struct tSQLExprListList {
-  int32_t        nList;  /* Number of expressions on the list */
-  int32_t        nAlloc; /* Number of entries allocated below */
-  tSQLExprList **a;      /* one entry for each row */
-} tSQLExprListList;
-
-#define ParseTOKENTYPE SSQLToken
-
-void *ParseAlloc(void *(*mallocProc)(size_t));
-
-/**
- *
- * @param yyp      The parser
- * @param yymajor  The major token code number
- * @param yyminor  The value for the token
- */
-void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
-
-/**
- *
- * @param p         The parser to be deleted
- * @param freeProc  Function used to reclaim memory
- */
-void ParseFree(void *p, void (*freeProc)(void *));
-
-tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder);
-
-tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
-
-tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder);
-void          tVariantListDestroy(tVariantList *pList);
-
-tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField);
-
-void tFieldListDestroy(tFieldList *pList);
-
-tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optType);
-
-void tSQLExprDestroy(tSQLExpr *);
-
-tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SSQLToken *pToken);
-
-void tSQLExprListDestroy(tSQLExprList *pList);
-
-SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, tVariantList *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      tSQLExprNodeDestroy(tSQLExpr *pExpr);
-tSQLExpr *tSQLExprNodeClone(tSQLExpr *pExpr);
-
-SAlterTableSQL *tAlterTableSQLElems(SSQLToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type);
-
-tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList);
-
-void destroyAllSelectClause(SSubclauseInfo *pSql);
-void doDestroyQuerySql(SQuerySQL *pSql);
-
-SSqlInfo *      setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SSQLToken *pMeterName, int32_t type);
-SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
-
-SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
-
-void setCreatedMeterName(SSqlInfo *pInfo, SSQLToken *pMeterName, SSQLToken *pIfNotExists);
-
-void SQLInfoDestroy(SSqlInfo *pInfo);
-
-void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
-void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SSQLToken* pToken, SSQLToken* existsCheck);
-void setShowOptions(SSqlInfo *pInfo, int32_t type, SSQLToken* prefix, SSQLToken* pPatterns);
-
-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 setCreateUserSQL(SSqlInfo *pInfo, SSQLToken *pName, SSQLToken *pPasswd);
-void setKillSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *ip);
-void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken* pPwd, SSQLToken *pPrivilege);
-
-void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
-
-// prefix show db.tables;
-void setDBName(SSQLToken *pCpxName, SSQLToken *pDB);
-
-tSQLExpr *tSQLExprIdValueCreate(SSQLToken *pToken, int32_t optType);
-
-tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SSQLToken *pFuncToken, SSQLToken *endToken, int32_t optType);
-
-void tSQLSetColumnInfo(TAOS_FIELD *pField, SSQLToken *pName, TAOS_FIELD *pType);
-
-void tSQLSetColumnType(TAOS_FIELD *pField, SSQLToken *pToken);
-
-int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pSql);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/client/inc/tscSecondaryMerge.h b/src/client/inc/tscSecondaryMerge.h
deleted file mode 100644
index bcfe14fcb79e79b6d3965dfd5970421819f27b23..0000000000000000000000000000000000000000
--- a/src/client/inc/tscSecondaryMerge.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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_TSCSECONARYMERGE_H
-#define TDENGINE_TSCSECONARYMERGE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "tinterpolation.h"
-#include "tlosertree.h"
-#include "tsclient.h"
-
-#define MAX_NUM_OF_SUBQUERY_RETRY 3
-
-/*
- * @version 0.1
- * @date   2018/01/05
- * @author liaohj
- * management of client-side reducer for metric query
- */
-
-struct SQLFunctionCtx;
-
-typedef struct SLocalDataSource {
-  tExtMemBuffer *pMemBuffer;
-  int32_t        flushoutIdx;
-  int32_t        pageId;
-  int32_t        rowIdx;
-  tFilePage      filePage;
-} SLocalDataSource;
-
-enum {
-  TSC_LOCALREDUCE_READY = 0x0,
-  TSC_LOCALREDUCE_IN_PROGRESS = 0x1,
-  TSC_LOCALREDUCE_TOBE_FREED = 0x2,
-};
-
-typedef struct SLocalReducer {
-  SLocalDataSource **    pLocalDataSrc;
-  int32_t                numOfBuffer;
-  int32_t                numOfCompleted;
-  int32_t                numOfVnode;
-  SLoserTreeInfo *       pLoserTree;
-  char *                 prevRowOfInput;
-  tFilePage *            pResultBuf;
-  int32_t                nResultBufSize;
-  char *                 pBufForInterpo;  // intermediate buffer for interpolation
-  tFilePage *            pTempBuffer;
-  struct SQLFunctionCtx *pCtx;
-  int32_t                rowSize;     // size of each intermediate result.
-  int32_t                status;      // denote it is in reduce process, in reduce process, it
-  bool                   hasPrevRow;  // cannot be released
-  bool                   hasUnprocessedRow;
-  tOrderDescriptor *     pDesc;
-  tColModel *            resColModel;
-  tExtMemBuffer **       pExtMemBuffer;      // disk-based buffer
-  SInterpolationInfo     interpolationInfo;  // interpolation support structure
-  char *                 pFinalRes;          // result data after interpo
-  tFilePage *            discardData;
-  SResultInfo *          pResInfo;
-  bool                   discard;
-  int32_t                offset;             // limit offset value
-} 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
-  tOrderDescriptor *pOrderDescriptor;
-  tColModel *       pFinalColModel;   // colModel for final result
-  SSubqueryState *  pState;
-  int32_t           subqueryIndex;     // index of current vnode in vnode list
-  SSqlObj *         pParentSqlObj;
-  tFilePage *       localBuffer;  // temp buffer, there is a buffer for each vnode to
-  uint32_t          numOfRetry;   // record the number of retry times
-  pthread_mutex_t   queryMutex;
-} SRetrieveSupport;
-
-int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pDesc,
-                                 tColModel **pFinalModel, uint32_t nBufferSize);
-
-void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, tColModel *pFinalModel,
-                               int32_t numOfVnodes);
-
-int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
-                     int32_t numOfRows, int32_t orderType);
-
-int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, int32_t orderType);
-
-/*
- * create local reducer to launch the second-stage reduce process at client site
- */
-void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
-                           tColModel *finalModel, SSqlCmd *pSqlCmd, SSqlRes *pRes);
-
-void tscDestroyLocalReducer(SSqlObj *pSql);
-
-int32_t tscDoLocalreduce(SSqlObj *pSql);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSCSECONARYMERGE_H
diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
new file mode 100644
index 0000000000000000000000000000000000000000..07e05803979c93f00312e17da0fbd6822b2a522b
--- /dev/null
+++ b/src/client/inc/tscSubquery.h
@@ -0,0 +1,48 @@
+/*
+ * 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 tscSetupOutputColumnIndex(SSqlObj* pSql);
+void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code);
+
+SJoinSupporter* tscCreateJoinSupporter(SSqlObj* pSql, SSubqueryState* pState, int32_t index);
+
+void tscHandleMasterJoinQuery(SSqlObj* pSql);
+
+int32_t tscHandleMasterSTableQuery(SSqlObj *pSql);
+
+int32_t tscHandleMultivnodeInsert(SSqlObj *pSql);
+
+int32_t tscHandleInsertRetry(SSqlObj* pSql);
+
+void tscBuildResFromSubqueries(SSqlObj *pSql);
+void **doSetResultRowData(SSqlObj *pSql, bool finalResult);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCJOINPROCESS_H
diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index 9868f703c37f10c1c15df576899d7f2724bdb196..0323434a992ae25b9f3fe54fb596b56e865bdf55 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -23,23 +23,26 @@ extern "C" {
 /*
  * @date   2018/09/30
  */
+#include "exception.h"
 #include "os.h"
-#include "textbuffer.h"
-#include "tscSecondaryMerge.h"
+#include "qExtbuffer.h"
+#include "taosdef.h"
+#include "tbuffer.h"
+#include "tscLocalMerge.h"
 #include "tsclient.h"
-#include "tsdb.h"
 
-#define UTIL_METER_IS_SUPERTABLE(metaInfo) \
-  (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->meterType == TSDB_METER_METRIC))
-#define UTIL_METER_IS_NOMRAL_METER(metaInfo) (!(UTIL_METER_IS_SUPERTABLE(metaInfo)))
-#define UTIL_METER_IS_CREATE_FROM_METRIC(metaInfo) \
-  (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->meterType == TSDB_METER_MTABLE))
+#define UTIL_TABLE_IS_SUPER_TABLE(metaInfo)  \
+  (((metaInfo)->pTableMeta != NULL) && ((metaInfo)->pTableMeta->tableType == TSDB_SUPER_TABLE))
+#define UTIL_TABLE_IS_CHILD_TABLE(metaInfo) \
+  (((metaInfo)->pTableMeta != NULL) && ((metaInfo)->pTableMeta->tableType == TSDB_CHILD_TABLE))
+  
+#define UTIL_TABLE_IS_NORMAL_TABLE(metaInfo)\
+  (!(UTIL_TABLE_IS_SUPER_TABLE(metaInfo) || UTIL_TABLE_IS_CHILD_TABLE(metaInfo)))
 
-#define TSDB_COL_IS_TAG(f) (((f)&TSDB_COL_TAG) != 0)
 
 typedef struct SParsedColElem {
   int16_t colIndex;
-  int16_t offset;
+  uint16_t offset;
 } SParsedColElem;
 
 typedef struct SParsedDataColInfo {
@@ -49,46 +52,71 @@ typedef struct SParsedDataColInfo {
   bool           hasVal[TSDB_MAX_COLUMNS];
 } SParsedDataColInfo;
 
-typedef struct SJoinSubquerySupporter {
+#pragma pack(push,1)
+// this struct is transfered as binary, padding two bytes to avoid
+// an 'uid' whose low bytes is 0xff being recoginized as NULL,
+// and set 'pack' to 1 to avoid break existing code.
+typedef struct STidTags {
+  int16_t  padding;
+  int64_t  uid;
+  int32_t  tid;
+  int32_t  vgId;
+  char     tag[];
+} STidTags;
+#pragma pack(pop)
+
+typedef struct SJoinSupporter {
   SSubqueryState* pState;
   SSqlObj*        pObj;           // parent SqlObj
   int32_t         subqueryIndex;  // index of sub query
-  int64_t         interval;       // interval time
+  SInterval       interval;
   SLimitVal       limit;          // limit info
-  uint64_t        uid;            // query meter uid
-  SColumnBaseInfo colList;        // previous query information
-  SSqlExprInfo    exprsInfo;
+  uint64_t        uid;            // query table uid
+  SArray*         colList;        // previous query information, no need to use this attribute, and the corresponding attribution
+  SArray*         exprList;
   SFieldInfo      fieldsInfo;
   STagCond        tagCond;
-  SSqlGroupbyExpr groupbyExpr;
   struct STSBuf*  pTSBuf;          // the TSBuf struct that holds the compressed timestamp array
   FILE*           f;               // temporary file in order to create TSBuf
-  char            path[PATH_MAX];  // temporary file path
-} SJoinSubquerySupporter;
+  char            path[PATH_MAX];  // temporary file path, todo dynamic allocate memory
+  int32_t         tagSize;         // the length of each in the first filter stage
+  char*           pIdTagList;      // result of first stage tags
+  int32_t         totalLen;
+  int32_t         num;
+} SJoinSupporter;
+
+typedef struct SVgroupTableInfo {
+  SCMVgroupInfo vgInfo;
+  SArray*       itemList;   //SArray<STableIdInfo>
+} SVgroupTableInfo;
+
+static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex) {
+  assert(pCmd != NULL && subClauseIndex >= 0 && subClauseIndex < TSDB_MAX_UNION_CLAUSE);
+
+  if (pCmd->pQueryInfo == NULL || subClauseIndex >= pCmd->numOfClause) {
+    return NULL;
+  }
+
+  return pCmd->pQueryInfo[subClauseIndex];
+}
 
 int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, const char* name,
-                           SMeterMeta* pMeterMeta, STableDataBlocks** dataBlocks);
-void    tscAppendDataBlock(SDataBlockList* pList, STableDataBlocks* pBlocks);
-void    tscDestroyDataBlock(STableDataBlocks* pDataBlock);
+                           STableMeta* pTableMeta, STableDataBlocks** dataBlocks);
+void tscDestroyDataBlock(STableDataBlocks* pDataBlock);
+void tscSortRemoveDataBlockDupRows(STableDataBlocks* dataBuf);
 
-SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, short bytes,
+SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes,
                                    uint32_t offset);
 
-SDataBlockList* tscCreateBlockArrayList();
-
-void*   tscDestroyBlockArrayList(SDataBlockList* pList);
+void*   tscDestroyBlockArrayList(SArray* pDataBlockList);
 int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock);
-void    tscFreeUnusedDataBlocks(SDataBlockList* pList);
-int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pDataList);
-int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList, int64_t id, int32_t size,
-                                int32_t startOffset, int32_t rowSize, const char* tableId, SMeterMeta* pMeterMeta,
+void    tscFreeUnusedDataBlocks(SArray* pDataBlockList);
+int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SArray* pDataList);
+int32_t tscGetDataBlockFromList(void* pHashList, SArray* pDataBlockList, int64_t id, int32_t size,
+                                int32_t startOffset, int32_t rowSize, const char* tableId, STableMeta* pTableMeta,
                                 STableDataBlocks** dataBlocks);
 
-SVnodeSidList*    tscGetVnodeSidList(SMetricMeta* pMetricmeta, int32_t vnodeIdx);
-SMeterSidExtInfo* tscGetMeterSidInfo(SVnodeSidList* pSidList, int32_t idx);
-
 /**
- *
  * for the projection query on metric or point interpolation query on metric,
  * we iterate all the meters, instead of invoke query on all qualified meters simultaneously.
  *
@@ -102,111 +130,109 @@ bool tscNonOrderedProjectionQueryOnSTable(SQueryInfo *pQueryInfo, int32_t tableI
 bool tscOrderedProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex);
 bool tscIsProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex);
 
-bool tscProjectionQueryOnTable(SQueryInfo* pQueryInfo);
-
-bool tscIsTwoStageMergeMetricQuery(SQueryInfo* pQueryInfo, int32_t tableIndex);
-bool tscQueryOnMetric(SSqlCmd* pCmd);
-bool tscQueryMetricTags(SQueryInfo* pQueryInfo);
-bool tscIsSelectivityWithTagQuery(SSqlCmd* pCmd);
+bool tscIsProjectionQuery(SQueryInfo* pQueryInfo);
 
-void tscAddSpecialColumnForSelect(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId, SColumnIndex* pIndex,
-                                  SSchema* pColSchema, int16_t isTag);
+bool tscIsTwoStageSTableQuery(SQueryInfo* pQueryInfo, int32_t tableIndex);
+bool tscQueryTags(SQueryInfo* pQueryInfo);
 
-void addRequiredTagColumn(SQueryInfo* pQueryInfo, int32_t tagColIndex, int32_t tableIndex);
+SSqlExpr* tscAddSpecialColumnForSelect(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
+                                       SColumnIndex* pIndex, SSchema* pColSchema, int16_t colType);
 
-int32_t setMeterID(SMeterMetaInfo* pMeterMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql);
+int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pzTableName, SSqlObj* pSql);
 void    tscClearInterpInfo(SQueryInfo* pQueryInfo);
 
-bool tscIsInsertOrImportData(char* sqlstr);
+bool tscIsInsertData(char* sqlstr);
 
 /* use for keep current db info temporarily, for handle table with db prefix */
-void tscGetDBInfoFromMeterId(char* meterId, char* db);
+// todo remove it
+void tscGetDBInfoFromTableFullName(char* tableId, char* db);
 
 int tscAllocPayload(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, const char* name, int16_t bytes);
-void tscFieldInfoUpdateVisible(SFieldInfo* pFieldInfo, int32_t index, bool visible);
+TAOS_FIELD tscCreateField(int8_t type, const char* name, int16_t bytes);
+
+SFieldSupInfo* tscFieldInfoAppend(SFieldInfo* pFieldInfo, TAOS_FIELD* pField);
+SFieldSupInfo* tscFieldInfoInsert(SFieldInfo* pFieldInfo, int32_t index, TAOS_FIELD* field);
 
-void tscFieldInfoCalOffset(SQueryInfo* pQueryInfo);
+SFieldSupInfo* tscFieldInfoGetSupp(SFieldInfo* pFieldInfo, int32_t index);
+TAOS_FIELD* tscFieldInfoGetField(SFieldInfo* pFieldInfo, int32_t index);
+
+void tscFieldInfoUpdateOffset(SQueryInfo* pQueryInfo);
+void tscFieldInfoCopy(SFieldInfo* dst, const SFieldInfo* src);
 void tscFieldInfoUpdateOffsetForInterResult(SQueryInfo* pQueryInfo);
-void tscFieldInfoCopy(SFieldInfo* src, SFieldInfo* dst, const int32_t* indexList, int32_t size);
-void tscFieldInfoCopyAll(SFieldInfo* dst, SFieldInfo* src);
 
-TAOS_FIELD* tscFieldInfoGetField(SQueryInfo* pQueryInfo, int32_t index);
-int16_t     tscFieldInfoGetOffset(SQueryInfo* pQueryInfo, int32_t index);
-int32_t     tscGetResRowLength(SQueryInfo* pQueryInfo);
-void        tscClearFieldInfo(SFieldInfo* pFieldInfo);
-int32_t tscNumOfFields(SQueryInfo* pQueryInfo);
-int32_t tscFieldInfoCompare(SFieldInfo* pFieldInfo1, SFieldInfo* pFieldInfo2);
+int16_t tscFieldInfoGetOffset(SQueryInfo* pQueryInfo, int32_t index);
+void    tscFieldInfoClear(SFieldInfo* pFieldInfo);
+
+static FORCE_INLINE int32_t tscNumOfFields(SQueryInfo* pQueryInfo) { return pQueryInfo->fieldsInfo.numOfOutput; }
+
+int32_t tscFieldInfoCompare(const SFieldInfo* pFieldInfo1, const SFieldInfo* pFieldInfo2);
 
 void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes, int16_t tableIndex);
 
+int32_t   tscGetResRowLength(SArray* pExprList);
+
 SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
-                           int16_t size, int16_t interSize);
-SSqlExpr* tscSqlExprInsertEmpty(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId);
+    int16_t size, int16_t interSize, bool isTagCol);
+
+SSqlExpr* tscSqlExprAppend(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+                           int16_t size, int16_t interSize, bool isTagCol);
 
 SSqlExpr* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, int16_t srcColumnIndex, int16_t type,
                            int16_t size);
+size_t   tscSqlExprNumOfExprs(SQueryInfo* pQueryInfo);
 
 SSqlExpr* tscSqlExprGet(SQueryInfo* pQueryInfo, int32_t index);
-void      tscSqlExprCopy(SSqlExprInfo* dst, const SSqlExprInfo* src, uint64_t uid);
-void*     tscSqlExprDestroy(SSqlExpr* pExpr);
-void      tscSqlExprInfoDestroy(SSqlExprInfo* pExprInfo);
+int32_t   tscSqlExprCopy(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy);
+void      tscSqlExprInfoDestroy(SArray* pExprInfo);
 
-SColumnBase* tscColumnBaseInfoInsert(SQueryInfo* pQueryInfo, SColumnIndex* colIndex);
-void         tscColumnFilterInfoCopy(SColumnFilterInfo* dst, const SColumnFilterInfo* src);
-void         tscColumnBaseCopy(SColumnBase* dst, const SColumnBase* src);
+SColumn* tscColumnClone(const SColumn* src);
+SColumn* tscColumnListInsert(SArray* pColList, SColumnIndex* colIndex);
+SArray* tscColumnListClone(const SArray* src, int16_t tableIndex);
+void tscColumnListDestroy(SArray* pColList);
 
-void         tscColumnBaseInfoCopy(SColumnBaseInfo* dst, const SColumnBaseInfo* src, int16_t tableIndex);
-SColumnBase* tscColumnBaseInfoGet(SColumnBaseInfo* pColumnBaseInfo, int32_t index);
-void         tscColumnBaseInfoUpdateTableIndex(SColumnBaseInfo* pColList, int16_t tableIndex);
-
-void tscColumnBaseInfoReserve(SColumnBaseInfo* pColumnBaseInfo, int32_t size);
-void tscColumnBaseInfoDestroy(SColumnBaseInfo* pColumnBaseInfo);
-
-int32_t tscValidateName(SSQLToken* pToken);
+void tscDequoteAndTrimToken(SStrToken* pToken);
+int32_t tscValidateName(SStrToken* pToken);
 
 void tscIncStreamExecutionCount(void* pStream);
 
-bool tscValidateColumnId(SMeterMetaInfo* pMeterMetaInfo, int32_t colId);
+bool tscValidateColumnId(STableMetaInfo* pTableMetaInfo, int32_t colId, int32_t numOfParams);
 
 // get starter position of metric query condition (query on tags) in SSqlCmd.payload
-SCond* tsGetMetricQueryCondPos(STagCond* pCond, uint64_t tableIndex);
-void   tsSetMetricQueryCond(STagCond* pTagCond, uint64_t uid, const char* str);
+SCond* tsGetSTableQueryCond(STagCond* pCond, uint64_t uid);
+void   tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, SBufferWriter* bw);
 
-void tscTagCondCopy(STagCond* dest, const STagCond* src);
+int32_t tscTagCondCopy(STagCond* dest, const STagCond* src);
 void tscTagCondRelease(STagCond* pCond);
 
 void tscGetSrcColumnInfo(SSrcColumnInfo* pColInfo, SQueryInfo* pQueryInfo);
 
 void tscSetFreeHeatBeat(STscObj* pObj);
-bool tscShouldFreeHeatBeat(SSqlObj* pHb);
-void tscCleanSqlCmd(SSqlCmd* pCmd);
-bool tscShouldFreeAsyncSqlObj(SSqlObj* pSql);
+bool tscShouldFreeHeartBeat(SSqlObj* pHb);
+bool tscShouldBeFreed(SSqlObj* pSql);
 
-void            tscRemoveAllMeterMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool removeFromCache);
-SMeterMetaInfo* tscGetMeterMetaInfo(SSqlCmd *pCmd, int32_t subClauseIndex, int32_t tableIndex);
-SMeterMetaInfo* tscGetMeterMetaInfoFromQueryInfo(SQueryInfo *pQueryInfo, int32_t tableIndex);
+STableMetaInfo* tscGetTableMetaInfoFromCmd(SSqlCmd *pCmd, int32_t subClauseIndex, int32_t tableIndex);
+STableMetaInfo* tscGetMetaInfo(SQueryInfo *pQueryInfo, int32_t tableIndex);
 
 SQueryInfo *tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex);
-int32_t tscGetQueryInfoDetailSafely(SSqlCmd *pCmd, int32_t subClauseIndex, SQueryInfo** pQueryInfo);
+SQueryInfo *tscGetQueryInfoDetailSafely(SSqlCmd *pCmd, int32_t subClauseIndex);
+
+void tscClearTableMetaInfo(STableMetaInfo* pTableMetaInfo, bool removeFromCache);
 
-SMeterMetaInfo* tscGetMeterMetaInfoByUid(SQueryInfo* pQueryInfo, uint64_t uid, int32_t* index);
-void            tscClearMeterMetaInfo(SMeterMetaInfo* pMeterMetaInfo, bool removeFromCache);
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
+    SVgroupsInfo* vgroupList, SArray* pTagCols);
 
-SMeterMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, SMeterMeta* pMeterMeta, SMetricMeta* pMetricMeta,
-                                    int16_t numOfTags, int16_t* tags);
-SMeterMetaInfo* tscAddEmptyMeterMetaInfo(SQueryInfo *pQueryInfo);
+STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo *pQueryInfo);
 int32_t tscAddSubqueryInfo(SSqlCmd *pCmd);
-void tscFreeSubqueryInfo(SSqlCmd* pCmd);
+
+void tscInitQueryInfo(SQueryInfo* pQueryInfo);
+
 void tscClearSubqueryInfo(SSqlCmd* pCmd);
+void tscFreeVgroupTableInfo(SArray* pVgroupTables);
 
-void tscGetMetricMetaCacheKey(SQueryInfo* pQueryInfo, char* keyStr, uint64_t uid);
-int  tscGetMetricMeta(SSqlObj* pSql, int32_t clauseIndex);
-int  tscGetMeterMeta(SSqlObj* pSql, SMeterMetaInfo* pMeterMetaInfo);
-int  tscGetMeterMetaEx(SSqlObj* pSql, SMeterMetaInfo* pMeterMetaInfo, bool createIfNotExists);
+int  tscGetSTableVgroupInfo(SSqlObj* pSql, int32_t clauseIndex);
+int  tscGetTableMeta(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo);
+int  tscGetMeterMetaEx(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, bool createIfNotExists);
 
 void tscResetForNextRetrieve(SSqlRes* pRes);
 
@@ -230,25 +256,33 @@ void tscDoQuery(SSqlObj* pSql);
  * @param pPrevSql
  * @return
  */
-SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void* param, SSqlObj* pPrevSql);
-void     addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t subClauseIndex, int32_t tableIndex);
+SSqlObj* createSimpleSubObj(SSqlObj* pSql, void (*fp)(), void* param, int32_t cmd);
 
-void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex);
+void registerSqlObj(SSqlObj* pSql);
 
-int16_t tscGetJoinTagColIndexByUid(STagCond* pTagCond, uint64_t uid);
+SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void* param, int32_t cmd, SSqlObj* pPrevSql);
+void     addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t subClauseIndex, int32_t tableIndex);
 
-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 doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex);
 
-void sortRemoveDuplicates(STableDataBlocks* dataBuf);
+int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid);
 
 void tscPrintSelectClause(SSqlObj* pSql, int32_t subClauseIndex);
 
 bool hasMoreVnodesToTry(SSqlObj *pSql);
+bool hasMoreClauseToTry(SSqlObj* pSql);
+
 void tscTryQueryNextVnode(SSqlObj *pSql, __async_cb_func_t fp);
 void tscAsyncQuerySingleRowForNextVnode(void *param, TAOS_RES *tres, int numOfRows);
-void tscTryQueryNextClause(SSqlObj* pSql, void (*queryFp)());
+void tscTryQueryNextClause(SSqlObj* pSql, __async_cb_func_t fp);
+int  tscSetMgmtEpSetFromCfg(const char *first, const char *second);
+
+bool tscSetSqlOwner(SSqlObj* pSql);
+void tscClearSqlOwner(SSqlObj* pSql);
 
+void* malloc_throw(size_t size);
+void* calloc_throw(size_t nmemb, size_t size);
+char* strdup_throw(const char* str);
 
 #ifdef __cplusplus
 }
diff --git a/src/client/inc/tschemautil.h b/src/client/inc/tschemautil.h
new file mode 100644
index 0000000000000000000000000000000000000000..67942ad42a0942756efe18e44eff711df59ba1d9
--- /dev/null
+++ b/src/client/inc/tschemautil.h
@@ -0,0 +1,117 @@
+/*
+ * 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_TSCHEMAUTIL_H
+#define TDENGINE_TSCHEMAUTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taosmsg.h"
+#include "tstoken.h"
+#include "tsclient.h"
+
+#define VALIDNUMOFCOLS(x) ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS)
+
+//struct SSchema;
+
+/**
+ * get the number of tags of this table
+ * @param pTableMeta
+ * @return
+ */
+int32_t tscGetNumOfTags(const STableMeta* pTableMeta);
+
+/**
+ * get the number of columns of this table
+ * @param pTableMeta
+ * @return
+ */
+int32_t tscGetNumOfColumns(const STableMeta* pTableMeta);
+
+/**
+ * get the basic info of this table
+ * @param pTableMeta
+ * @return
+ */
+STableComInfo tscGetTableInfo(const STableMeta* pTableMeta);
+
+/**
+ * get the schema
+ * @param pTableMeta
+ * @return
+ */
+SSchema* tscGetTableSchema(const STableMeta* pTableMeta);
+
+/**
+ * get the tag schema
+ * @param pMeta
+ * @return
+ */
+SSchema *tscGetTableTagSchema(const STableMeta *pMeta);
+
+/**
+ * get the column schema according to the column index
+ * @param pMeta
+ * @param colIndex
+ * @return
+ */
+SSchema *tscGetTableColumnSchema(const STableMeta *pMeta, int32_t colIndex);
+
+/**
+ * get the column schema according to the column id
+ * @param pTableMeta
+ * @param colId
+ * @return
+ */
+SSchema* tscGetTableColumnSchemaById(STableMeta* pTableMeta, int16_t colId);
+
+/**
+ * check if the schema is valid or not, including following aspects:
+ * 1. number of columns
+ * 2. column types
+ * 3. column length
+ * 4. column names
+ * 5. total length
+ *
+ * @param pSchema
+ * @param numOfCols
+ * @return
+ */
+bool isValidSchema(struct SSchema *pSchema, int32_t numOfCols);
+
+/**
+ * get the schema for the "tbname" column. it is a built column
+ * @return
+ */
+SSchema tscGetTbnameColumnSchema();
+
+/**
+ * create the table meta from the msg
+ * @param pTableMetaMsg
+ * @param size size of the table meta
+ * @return
+ */
+STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg, size_t* size);
+
+//todo tags value as well as the table id structure needs refactor
+char *tsGetTagsValue(STableMeta *pMeta);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCHEMAUTIL_H
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index fcbd3dac1f27a2bfadc470fcbab7075c1fab6246..14fb32d7ab9058d565faf8de166e534d895be501 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -21,107 +21,153 @@ extern "C" {
 #endif
 
 #include "os.h"
+
 #include "taos.h"
+#include "taosdef.h"
 #include "taosmsg.h"
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tscCache.h"
-#include "tscSQLParser.h"
-#include "tsdb.h"
+#include "tarray.h"
+#include "tglobal.h"
 #include "tsqlfunction.h"
 #include "tutil.h"
+#include "tcache.h"
+
+#include "qExecutor.h"
+#include "qSqlparser.h"
+#include "qTsbuf.h"
+#include "tcmdtype.h"
+
+#if 0
+static UNUSED_FUNC void *u_malloc (size_t __size) {
+  uint32_t v = rand();
+
+  if (v % 5000 <= 0) {
+    return NULL;
+  } else {
+    return malloc(__size);
+  }
+}
+
+static UNUSED_FUNC void* u_calloc(size_t num, size_t __size) {
+  uint32_t v = rand();
+  if (v % 5000 <= 0) {
+    return NULL;
+  } else {
+    return calloc(num, __size);
+  }
+}
+
+static UNUSED_FUNC void* u_realloc(void* p, size_t __size) {
+  uint32_t v = rand();
+  if (v % 5000 <= 0) {
+    return NULL;
+  } else {
+    return realloc(p, __size);
+  }
+}
+
+#define calloc  u_calloc
+#define malloc  u_malloc
+#define realloc u_realloc
+#endif
 
-#define TSC_GET_RESPTR_BASE(res, _queryinfo, col, ord)                     \
-  (res->data + tscFieldInfoGetOffset(_queryinfo, col) * res->numOfRows)
-  
 // forward declaration
 struct SSqlInfo;
+struct SLocalReducer;
 
-typedef struct SSqlGroupbyExpr {
-  int16_t     tableIndex;
-  int16_t     numOfGroupCols;
-  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
+// data source from sql string or from file
+enum {
+  DATA_FROM_SQL_STRING = 1,
+  DATA_FROM_DATA_FILE = 2,
+};
 
+typedef struct STableComInfo {
+  uint8_t numOfTags;
+  uint8_t precision;
+  int16_t numOfColumns;
+  int32_t rowSize;
+} STableComInfo;
+
+typedef struct SCMCorVgroupInfo {
+  int32_t version;
+  int8_t  inUse;
+  int8_t  numOfEps;
+  SEpAddr epAddr[TSDB_MAX_REPLICA];
+} SCMCorVgroupInfo;
+
+typedef struct STableMeta {
+  STableComInfo  tableInfo;
+  uint8_t        tableType;
+  int16_t        sversion;
+  int16_t        tversion;
+  char           sTableId[TSDB_TABLE_FNAME_LEN];
+  SCMVgroupInfo  vgroupInfo;
+  SCMCorVgroupInfo  corVgroupInfo;
+  STableId       id;
+  SSchema        schema[];  // if the table is TSDB_CHILD_TABLE, schema is acquired by super table meta info
+} STableMeta;
+
+typedef struct STableMetaInfo {
+  STableMeta   *pTableMeta;      // table meta, cached in client side and acquired by name
+  SVgroupsInfo *vgroupList;
+  SArray       *pVgroupTables;   // SArray<SVgroupTableInfo>
+  
   /*
-   * 1. keep the vnode index during the multi-vnode super table projection query
-   * 2. keep the vnode index for multi-vnode insertion
+   * 1. keep the vgroup index during the multi-vnode super table projection query
+   * 2. keep the vgroup index for multi-vnode insertion
    */
-  int32_t vnodeIndex;
-  char    name[TSDB_METER_ID_LEN + 1];    // table(super table) name
-  int16_t numOfTags;                      // total required tags in query, including groupby tags
-  int16_t tagColumnIndex[TSDB_MAX_TAGS];  // clause + tag projection
-} SMeterMetaInfo;
+  int32_t vgroupIndex;
+  char    name[TSDB_TABLE_FNAME_LEN];        // (super) table name
+  char    aliasName[TSDB_TABLE_NAME_LEN];    // alias name of table specified in query sql
+  SArray* tagColList;                        // SArray<SColumn*>, involved tag columns
+} STableMetaInfo;
 
 /* the structure for sql function in select clause */
 typedef struct SSqlExpr {
-  char        aliasName[TSDB_COL_NAME_LEN + 1];  // as aliasName
-  SColIndexEx colInfo;
-  int64_t     uid;            // refactor use the pointer
-  int16_t     functionId;     // function id in aAgg array
-  int16_t     resType;        // return value type
-  int16_t     resBytes;       // length of return value
-  int16_t     interResBytes;  // inter result buffer size
-  int16_t     numOfParams;    // argument value of each function
-  tVariant    param[3];       // parameters are not more than 3
+  char      aliasName[TSDB_COL_NAME_LEN];  // as aliasName
+  SColIndex colInfo;
+  int64_t   uid;            // refactor use the pointer
+  int16_t   functionId;     // function id in aAgg array
+  int16_t   resType;        // return value type
+  int16_t   resBytes;       // length of return value
+  int32_t   interBytes;     // inter result buffer size
+  int16_t   numOfParams;    // argument value of each function
+  tVariant  param[3];       // parameters are not more than 3
+  int32_t   offset;         // sub result column value of arithmetic expression.
 } SSqlExpr;
 
-typedef struct SFieldInfo {
-  int16_t     numOfOutputCols;  // number of column in result
-  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 {
-  int16_t   numOfAlloc;
-  int16_t   numOfExprs;
-  SSqlExpr *pExprs;
-} SSqlExprInfo;
-
 typedef struct SColumnIndex {
   int16_t tableIndex;
   int16_t columnIndex;
 } SColumnIndex;
 
-typedef struct SColumnBase {
+typedef struct SFieldSupInfo {
+  bool            visible;
+  SExprInfo      *pArithExprInfo;
+  SSqlExpr       *pSqlExpr;
+} SFieldSupInfo;
+
+typedef struct SFieldInfo {
+  int16_t numOfOutput;   // number of column in result
+  SArray *pFields;       // SArray<TAOS_FIELD>
+  SArray *pSupportInfo;  // SArray<SFieldSupInfo>
+} SFieldInfo;
+
+typedef struct SColumn {
   SColumnIndex       colIndex;
   int32_t            numOfFilters;
   SColumnFilterInfo *filterInfo;
-} SColumnBase;
-
-typedef struct SColumnBaseInfo {
-  int16_t      numOfAlloc;
-  int16_t      numOfCols;
-  SColumnBase *pColList;
-} SColumnBaseInfo;
-
-struct SLocalReducer;
+} SColumn;
 
 typedef struct SCond {
   uint64_t uid;
+  int32_t  len;  // length of tag query condition data
   char *   cond;
 } SCond;
 
 typedef struct SJoinNode {
-  char     meterId[TSDB_METER_ID_LEN];
+  char     tableId[TSDB_TABLE_FNAME_LEN];
   uint64_t uid;
-  int16_t  tagCol;
+  int16_t  tagColId;
 } SJoinNode;
 
 typedef struct SJoinInfo {
@@ -141,41 +187,35 @@ typedef struct STagCond {
   SJoinInfo joinInfo;
 
   // for different table, the query condition must be seperated
-  SCond   cond[TSDB_MAX_JOIN_TABLE_NUM];
-  int16_t numOfTagCond;
+  SArray *pCond;
 } STagCond;
 
 typedef struct SParamInfo {
   int32_t  idx;
   char     type;
   uint8_t  timePrec;
-  short    bytes;
+  int16_t  bytes;
   uint32_t offset;
 } SParamInfo;
 
 typedef struct STableDataBlocks {
-  char    meterId[TSDB_METER_ID_LEN];
-  int8_t  tsSource;     // where does the UNIX timestamp come from, server or client
-  bool    ordered;      // if current rows are ordered or not
-  int64_t vgid;         // virtual group id
-  int64_t prevTS;       // previous timestamp, recorded to decide if the records array is ts ascending
-  int32_t numOfMeters;  // number of tables in current submit block
-
-  int32_t  rowSize;  // row size for current table
+  char     tableId[TSDB_TABLE_FNAME_LEN];
+  int8_t   tsSource;     // where does the UNIX timestamp come from, server or client
+  bool     ordered;      // if current rows are ordered or not
+  int64_t  vgId;         // virtual group id
+  int64_t  prevTS;       // previous timestamp, recorded to decide if the records array is ts ascending
+  int32_t  numOfTables;  // number of tables in current submit block
+  int32_t  rowSize;      // row size for current table
   uint32_t nAllocSize;
-  uint32_t headerSize;    // header for metadata (submit metadata)
+  uint32_t headerSize;   // header for table info (uid, tid, submit metadata)
   uint32_t size;
 
   /*
-   * the metermeta for current table, the metermeta will be used during submit stage, keep a ref
+   * the table meta of table, the table meta will be used during submit, keep a ref
    * to avoid it to be removed from cache
    */
-  SMeterMeta *pMeterMeta;
-
-  union {
-    char *filename;
-    char *pData;
-  };
+  STableMeta *pTableMeta;
+  char       *pData;
 
   // for parameter ('?') binding
   uint32_t    numOfAllocedParams;
@@ -183,82 +223,63 @@ typedef struct STableDataBlocks {
   SParamInfo *params;
 } STableDataBlocks;
 
-typedef struct SDataBlockList {
-  int32_t            idx;
-  uint32_t           nSize;
-  uint32_t           nAlloc;
-  char *             userParam; /* user assigned parameters for async query */
-  void *             udfp;      /* user defined function pointer, used in async model */
-  STableDataBlocks **pData;
-} SDataBlockList;
-
 typedef struct SQueryInfo {
-  int16_t  command;  // the command may be different for each subclause, so keep it seperately.
-  uint16_t type;     // query/insert/import type
-  char     intervalTimeUnit;
-
-  int64_t         etime, stime;
-  int64_t         nAggTimeInterval;  // aggregation time interval
-  int64_t         nSlidingTime;      // sliding window in mseconds
-  SSqlGroupbyExpr groupbyExpr;       // group by tags info
-
-  SColumnBaseInfo  colList;
+  int16_t          command;       // the command may be different for each subclause, so keep it seperately.
+  uint32_t         type;          // query/insert type
+  // TODO refactor
+  STimeWindow      window;        // query time window
+  SInterval        interval;
+  int32_t          tz;            // query client timezone
+
+  SSqlGroupbyExpr  groupbyExpr;   // group by tags info
+  SArray *         colList;       // SArray<SColumn*>
   SFieldInfo       fieldsInfo;
-  SSqlExprInfo     exprsInfo;
+  SArray *         exprList;      // SArray<SSqlExpr*>
   SLimitVal        limit;
   SLimitVal        slimit;
   STagCond         tagCond;
   SOrderVal        order;
-  int16_t          interpoType;  // interpolate type
+  int16_t          fillType;      // final result fill type
   int16_t          numOfTables;
-  SMeterMetaInfo **pMeterInfo;
+  STableMetaInfo **pTableMetaInfo;
   struct STSBuf *  tsBuf;
-  int64_t *        defaultVal;   // default value for interpolation
-  char *           msg;          // pointer to the pCmd->payload to keep error message temporarily
-  int64_t          clauseLimit;  // limit for current sub clause
-  
-  // offset value in the original sql expression, NOT sent to virtual node, only applied at client side
-  int64_t          prjOffset;
+  int64_t *        fillVal;       // default value for fill
+  char *           msg;           // pointer to the pCmd->payload to keep error message temporarily
+  int64_t          clauseLimit;   // limit for current sub clause
+  int64_t          prjOffset;     // offset value in the original sql expression, only applied at client side
+  int32_t          udColumnId;    // current user-defined constant output field column id, monotonically decreases from TSDB_UD_COLUMN_INDEX
 } SQueryInfo;
 
-// data source from sql string or from file
-enum {
-  DATA_FROM_SQL_STRING = 1,
-  DATA_FROM_DATA_FILE = 2,
-};
-
 typedef struct {
   int     command;
   uint8_t msgType;
-
-  union {
-    bool   existsCheck;     // check if the table exists or not
-    bool   inStream;        // denote if current sql is executed in stream or not
-    bool   createOnDemand;  // if the table is missing, on-the-fly create it. during getmeterMeta
-    int8_t dataSourceType;  // load data from file or not
-  };
+  bool    autoCreated;        // create table if it is not existed during retrieve table meta in mnode
 
   union {
     int32_t count;
     int32_t numOfTablesInSubmit;
   };
 
-  int32_t  clauseIndex;  // index of multiple subclause query
-  int8_t   isParseFinish;
-  short    numOfCols;
-  uint32_t allocSize;
-  char *   payload;
-  int      payloadLen;
+  int32_t      insertType;
+  int32_t      clauseIndex;  // index of multiple subclause query
 
+  char *       curSql;       // current sql, resume position of sql after parsing paused
+  int8_t       parseFinished;
+
+  int16_t      numOfCols;
+  uint32_t     allocSize;
+  char *       payload;
+  int32_t      payloadLen;
   SQueryInfo **pQueryInfo;
   int32_t      numOfClause;
-
-  // submit data blocks branched according to vnode
-  SDataBlockList *pDataBlocks;
-
-  // for parameter ('?') binding and batch processing
-  int32_t batchSize;
-  int32_t numOfParams;
+  int32_t      batchSize;    // for parameter ('?') binding and batch processing
+  int32_t      numOfParams;
+
+  int8_t       dataSourceType;     // load data from file or not
+  int8_t       submitSchema; // submit block is built with table schema
+  STagData     tagData;
+  SHashObj    *pTableList;   // referred table involved in sql
+  SArray      *pDataBlocks;  // SArray<STableDataBlocks*> submit data blocks after parsing sql
 } SSqlCmd;
 
 typedef struct SResRec {
@@ -266,87 +287,88 @@ typedef struct SResRec {
   int numOfTotal;
 } SResRec;
 
-struct STSBuf;
-
 typedef struct {
-  uint8_t               code;
-  int64_t               numOfRows;   // num of results in current retrieved
-  int64_t               numOfTotal;  // num of total results
-  int64_t               numOfTotalInCurrentClause;  // num of total result in current subclause
-  
+  int64_t               numOfRows;                  // num of results in current retrieved
+  int64_t               numOfRowsGroup;             // num of results of current group
+  int64_t               numOfTotal;                 // num of total results
+  int64_t               numOfClauseTotal;           // num of total result in current subclause
   char *                pRsp;
-  int                   rspType;
-  int                   rspLen;
+  int32_t               rspType;
+  int32_t               rspLen;
   uint64_t              qhandle;
   int64_t               uid;
   int64_t               useconds;
   int64_t               offset;  // offset value from vnode during projection query of stable
-  int                   row;
-  int16_t               numOfnchar;
+  int32_t               row;
+  int16_t               numOfCols;
   int16_t               precision;
+  bool                  completed;
+  int32_t               code;
   int32_t               numOfGroups;
   SResRec *             pGroupRec;
   char *                data;
-  short *               bytes;
   void **               tsrow;
+  int32_t*              length;  // length for each field for current row
   char **               buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
-  struct SLocalReducer *pLocalReducer;
   SColumnIndex *        pColumnIndex;
+  SArithmeticSupport*   pArithSup;   // support the arithmetic expression calculation on agg functions
+  
+  struct SLocalReducer *pLocalReducer;
 } SSqlRes;
 
-typedef struct _tsc_obj {
-  void *           signature;
-  void *           pTimer;
-  char             mgmtIp[TSDB_USER_LEN];
-  uint16_t         mgmtPort;
-  char             user[TSDB_USER_LEN];
-  char             pass[TSDB_KEY_LEN];
-  char             acctId[TSDB_DB_NAME_LEN];
-  char             db[TSDB_METER_ID_LEN];
-  char             sversion[TSDB_VERSION_LEN];
-  char             writeAuth : 1;
-  char             superAuth : 1;
-  struct _sql_obj *pSql;
-  struct _sql_obj *pHb;
-  struct _sql_obj *sqlList;
-  struct _sstream *streamList;
-  pthread_mutex_t  mutex;
+typedef struct STscObj {
+  void *             signature;
+  void *             pTimer;
+  char               user[TSDB_USER_LEN];
+  char               pass[TSDB_KEY_LEN];
+  char               acctId[TSDB_ACCT_LEN];
+  char               db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  char               sversion[TSDB_VERSION_LEN];
+  char               writeAuth : 1;
+  char               superAuth : 1;
+  uint32_t           connId;
+  struct SSqlObj *   pHb;
+  struct SSqlObj *   sqlList;
+  struct SSqlStream *streamList;
+  void*              pDnodeConn;
+  pthread_mutex_t    mutex;
+  T_REF_DECLARE()
 } STscObj;
 
-typedef struct _sql_obj {
-  void *   signature;
-  STscObj *pTscObj;
-  void (*fp)();
-  void (*fetchFp)();
-  void *            param;
-  uint32_t          ip;
-  short             vnode;
-  int64_t           stime;
-  uint32_t          queryId;
-  void *            thandle;
-  void *            pStream;
-  void *            pSubscription;
-  char *            sqlstr;
-  char              retry;
-  char              maxRetry;
-  uint8_t           index;
-  char              freed : 4;
-  char              listed : 4;
-  tsem_t            rspSem;
-  tsem_t            emptyRspSem;
-  SSqlCmd           cmd;
-  SSqlRes           res;
-  uint8_t           numOfSubs;
-  char *            asyncTblPos;
-  void *            pTableHashList;
-  struct _sql_obj **pSubs;
-  struct _sql_obj * prev, *next;
+typedef struct SSqlObj {
+  void            *signature;
+  pthread_t        owner;        // owner of sql object, by which it is executed
+  STscObj         *pTscObj;
+  void            *pRpcCtx;
+  void            (*fp)();
+  void            (*fetchFp)();
+  void            *param;
+  int64_t          stime;
+  uint32_t         queryId;
+  void *           pStream;
+  void *           pSubscription;
+  char *           sqlstr;
+  char             parseRetry;
+  char             retry;
+  char             maxRetry;
+  SRpcEpSet        epSet;
+  char             listed;
+  tsem_t           rspSem;
+  SSqlCmd          cmd;
+  SSqlRes          res;
+  uint16_t         numOfSubs;
+  struct SSqlObj **pSubs;
+  struct SSqlObj * prev, *next;
+
+  struct SSqlObj **self;
 } SSqlObj;
 
-typedef struct _sstream {
+typedef struct SSqlStream {
   SSqlObj *pSql;
   uint32_t streamId;
   char     listed;
+  bool     isProject;
+  int16_t  precision;
   int64_t  num;  // number of computing count
 
   /*
@@ -359,112 +381,141 @@ typedef struct _sstream {
   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 stream will be closed
-  int64_t interval;
-  int64_t slidingTime;
-  int16_t precision;
+  SInterval interval;
   void *  pTimer;
 
   void (*fp)();
   void *param;
 
   void (*callback)(void *);  // Callback function when stream is stopped from client level
-  struct _sstream *prev, *next;
+  struct SSqlStream *prev, *next;
 } SSqlStream;
 
-typedef struct {
-  char     numOfIps;
-  uint32_t ip[TSDB_MAX_MGMT_IPS];
-  char     ipstr[TSDB_MAX_MGMT_IPS][TSDB_IPv4ADDR_LEN];
-} SIpStrList;
-
-// tscSql API
-int tsParseSql(SSqlObj *pSql, bool multiVnodeInsertion);
-
-void tscInitMsgs();
-extern int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo);
+int32_t tscInitRpc(const char *user, const char *secret, void** pDnodeConn);
+void    tscInitMsgsFp();
 
-void *tscProcessMsgFromServer(char *msg, void *ahandle, void *thandle);
-int   tscProcessSql(SSqlObj *pSql);
+int tsParseSql(SSqlObj *pSql, bool initial);
 
-void tscAsyncInsertMultiVnodesProxy(void *param, TAOS_RES *tres, int numOfRows);
+void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet);
+int  tscProcessSql(SSqlObj *pSql);
 
-int  tscRenewMeterMeta(SSqlObj *pSql, char *meterId);
+int  tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex);
 void tscQueueAsyncRes(SSqlObj *pSql);
 
-void tscQueueAsyncError(void(*fp), void *param);
+void tscQueueAsyncError(void(*fp), void *param, int32_t code);
 
 int tscProcessLocalCmd(SSqlObj *pSql);
 int tscCfgDynamicOptions(char *msg);
 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
- */
-int32_t tscTansformSQLFunctionForSTableQuery(SQueryInfo *pQueryInfo);
-void    tscRestoreSQLFunctionForMetricQuery(SQueryInfo *pQueryInfo);
-
-void tscClearSqlMetaInfoForce(SSqlCmd *pCmd);
+int32_t tscTansformSQLFuncForSTableQuery(SQueryInfo *pQueryInfo);
+void    tscRestoreSQLFuncForSTableQuery(SQueryInfo *pQueryInfo);
 
 int32_t tscCreateResPointerInfo(SSqlRes *pRes, SQueryInfo *pQueryInfo);
-void    tscDestroyResPointerInfo(SSqlRes *pRes);
 
-void tscFreeSqlCmdData(SSqlCmd *pCmd);
-void tscFreeResData(SSqlObj* pSql);
+void tscResetSqlCmdObj(SSqlCmd *pCmd, bool removeFromCache);
 
 /**
  * free query result of the sql object
  * @param pObj
  */
-void tscFreeSqlResult(SSqlObj* pSql);
+void tscFreeSqlResult(SSqlObj *pSql);
 
 /**
  * only free part of resources allocated during query.
+ * TODO remove it later
  * Note: this function is multi-thread safe.
  * @param pObj
  */
-void tscFreeSqlObjPartial(SSqlObj *pObj);
+void tscPartiallyFreeSqlObj(SSqlObj *pSql);
 
 /**
  * free sql object, release allocated resource
- * @param pObj  Free metric/meta information, dynamically allocated payload, and
- * response buffer, object itself
+ * @param pObj
  */
-void tscFreeSqlObj(SSqlObj *pObj);
+void tscFreeSqlObj(SSqlObj *pSql);
+
+void tscFreeSqlObjInCache(void *pSql);
 
 void tscCloseTscObj(STscObj *pObj);
 
-void tscProcessMultiVnodesInsert(SSqlObj *pSql);
-void tscProcessMultiVnodesInsertFromFile(SSqlObj *pSql);
-void tscKillMetricQuery(SSqlObj *pSql);
+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 waitForQueryRsp(void *param, TAOS_RES *tres, int code) ;
+
+void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, void (*fp)(), void *param, const char *sqlstr, size_t sqlLen);
+
+void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql);
+void tscKillSTableQuery(SSqlObj *pSql);
 void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
-bool tscIsUpdateQuery(STscObj *pObj);
+bool tscIsUpdateQuery(SSqlObj* pSql);
 bool tscHasReachLimitation(SQueryInfo *pQueryInfo, SSqlRes *pRes);
 
 char *tscGetErrorMsgPayload(SSqlCmd *pCmd);
 
 int32_t tscInvalidSQLErrMsg(char *msg, const char *additionalInfo, const char *sql);
+int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo,  const char* sql);
 
-// transfer SSqlInfo to SqlCmd struct
 int32_t tscToSQLCmd(SSqlObj *pSql, struct SSqlInfo *pInfo);
 
-void tscQueueAsyncFreeResult(SSqlObj *pSql);
-
-extern void *     pVnodeConn;
-extern void *     pTscMgmtConn;
-extern void *     tscCacheHandle;
-extern uint8_t    globalCode;
-extern int        slaveIndex;
-extern void *     tscTmr;
-extern void *     tscConnCache;
-extern void *     tscQhandle;
-extern int        tscKeepConn[];
-extern int        tsInsertHeadSize;
-extern int        tscNumOfThreads;
-extern SIpStrList tscMgmtIpList;
+static FORCE_INLINE void tscGetResultColumnChr(SSqlRes* pRes, SFieldInfo* pFieldInfo, int32_t columnIndex) {
+  SFieldSupInfo* pInfo = (SFieldSupInfo*) TARRAY_GET_ELEM(pFieldInfo->pSupportInfo, columnIndex);
+  assert(pInfo->pSqlExpr != NULL);
+
+  int32_t type = pInfo->pSqlExpr->resType;
+  int32_t bytes = pInfo->pSqlExpr->resBytes;
+
+  char* pData = pRes->data + (int32_t)(pInfo->pSqlExpr->offset * pRes->numOfRows + bytes * pRes->row);
+
+  // user defined constant value output columns
+  if (TSDB_COL_IS_UD_COL(pInfo->pSqlExpr->colInfo.flag)) {
+    if (type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_BINARY) {
+      pData = pInfo->pSqlExpr->param[1].pz;
+      pRes->length[columnIndex] = pInfo->pSqlExpr->param[1].nLen;
+      pRes->tsrow[columnIndex] = (pInfo->pSqlExpr->param[1].nType == TSDB_DATA_TYPE_NULL) ? NULL : pData;
+    } else {
+      assert(bytes == tDataTypeDesc[type].nSize);
+
+      pRes->tsrow[columnIndex] = isNull(pData, type) ? NULL : &pInfo->pSqlExpr->param[1].i64Key;
+      pRes->length[columnIndex] = bytes;
+    }
+  } else {
+    if (type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_BINARY) {
+      int32_t realLen = varDataLen(pData);
+      assert(realLen <= bytes - VARSTR_HEADER_SIZE);
+
+      pRes->tsrow[columnIndex] = (isNull(pData, type)) ? NULL : ((tstr *)pData)->data;
+      if (realLen < pInfo->pSqlExpr->resBytes - VARSTR_HEADER_SIZE) {  // todo refactor
+        *(pData + realLen + VARSTR_HEADER_SIZE) = 0;
+      }
+
+      pRes->length[columnIndex] = realLen;
+    } else {
+      assert(bytes == tDataTypeDesc[type].nSize);
+
+      pRes->tsrow[columnIndex] = isNull(pData, type) ? NULL : pData;
+      pRes->length[columnIndex] = bytes;
+    }
+  }
+}
+
+extern SCacheObj*    tscMetaCache;
+extern SCacheObj*    tscObjCache;
+extern void *    tscTmr;
+extern void *    tscQhandle;
+extern int       tscKeepConn[];
+extern int       tsInsertHeadSize;
+extern int       tscNumOfThreads;
+  
+extern SRpcCorEpSet tscMgmtEpSet;
+
+extern int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo);
 
 typedef void (*__async_cb_func_t)(void *param, TAOS_RES *tres, int numOfRows);
 
+int32_t tscCompareTidTags(const void* p1, const void* p2);
+void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArray* tables);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
index 8dbe63d75a73dd18a15bc1da8f99c7b8db774eea..eaea91d1bfb0197a36fe67d78a09ab190e7e3aeb 100644
--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -62,7 +62,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp
  * Method:    executeQueryImp
  * Signature: ([BJ)I
  */
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
   (JNIEnv *, jobject, jbyteArray, jlong);
 
 /*
@@ -71,7 +71,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *, jobject, jlong, jlong);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
@@ -87,7 +87,15 @@ JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *env, jobject jobj, jlong con, jlong tres);
+
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    isUpdateQueryImp
+ * Signature: (J)J
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp
+  (JNIEnv *env, jobject jobj, jlong con, jlong tres);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
@@ -103,7 +111,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *env, jobject jobj, jlong con, jlong res);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
@@ -142,8 +150,8 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_subscribeImp
  * Method:    consumeImp
  * Signature: (J)Lcom/taosdata/jdbc/TSDBResultSetRowData;
  */
-JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp
-  (JNIEnv *, jobject, jlong, jint);
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp
+  (JNIEnv *, jobject, jlong);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 228403c79d318d922f5571a9663b3c97bbffbbc8..bd980b75a340dac3e76240e62743a8370b39404c 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -14,13 +14,19 @@
  */
 
 #include "os.h"
-#include "com_taosdata_jdbc_TSDBJNIConnector.h"
 #include "taos.h"
 #include "tlog.h"
-#include "tscJoinProcess.h"
-#include "tsclient.h"
 #include "tscUtil.h"
-#include "ttime.h"
+#include "tsclient.h"
+
+#include "com_taosdata_jdbc_TSDBJNIConnector.h"
+
+#define jniFatal(...) { if (jniDebugFlag & DEBUG_FATAL) { taosPrintLog("JNI FATAL ", tscEmbedded ? 255 : jniDebugFlag, __VA_ARGS__); }}
+#define jniError(...) { if (jniDebugFlag & DEBUG_ERROR) { taosPrintLog("JNI ERROR ", tscEmbedded ? 255 : jniDebugFlag, __VA_ARGS__); }}
+#define jniWarn(...)  { if (jniDebugFlag & DEBUG_WARN)  { taosPrintLog("JNI WARN ", tscEmbedded ? 255 : jniDebugFlag, __VA_ARGS__); }}
+#define jniInfo(...)  { if (jniDebugFlag & DEBUG_INFO)  { taosPrintLog("JNI ", tscEmbedded ? 255 : jniDebugFlag, __VA_ARGS__); }}
+#define jniDebug(...) { if (jniDebugFlag & DEBUG_DEBUG) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }}
+#define jniTrace(...) { if (jniDebugFlag & DEBUG_TRACE) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }}
 
 int __init = 0;
 
@@ -109,10 +115,11 @@ void jniGetGlobalMethod(JNIEnv *env) {
   (*env)->DeleteLocalRef(env, rowdataClass);
 
   atomic_store_32(&__init, 2);
-  jniTrace("native method register finished");
+  jniDebug("native method register finished");
 }
 
-JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp(JNIEnv *env, jobject jobj, jint jMode, jstring jPath, jboolean jAutoDump) {
+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);
@@ -129,20 +136,20 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_dumpMemoryLeakImp
 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);
-    if (confDir && strlen(configDir) != 0) {
-      strcpy(configDir, confDir);
+    if (confDir && strlen(confDir) != 0) {
+      tstrncpy(configDir, confDir, TSDB_FILENAME_LEN);
     }
     (*env)->ReleaseStringUTFChars(env, jconfigDir, confDir);
   }
 
   jniGetGlobalMethod(env);
-  jniTrace("jni initialized successfully, config directory: %s", configDir);
+  jniDebug("jni initialized successfully, config directory: %s", configDir);
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions(JNIEnv *env, jobject jobj, jint optionIndex,
                                                                           jstring optionValue) {
   if (optionValue == NULL) {
-    jniTrace("option index:%d value is null", optionIndex);
+    jniDebug("option index:%d value is null", optionIndex);
     return 0;
   }
 
@@ -152,29 +159,29 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions(JNIEnv
     const char *locale = (*env)->GetStringUTFChars(env, optionValue, NULL);
     if (locale && strlen(locale) != 0) {
       res = taos_options(TSDB_OPTION_LOCALE, locale);
-      jniTrace("set locale to %s, result:%d", locale, res);
+      jniDebug("set locale to %s, result:%d", locale, res);
     } else {
-      jniTrace("input locale is empty");
+      jniDebug("input locale is empty");
     }
     (*env)->ReleaseStringUTFChars(env, optionValue, locale);
   } else if (optionIndex == TSDB_OPTION_CHARSET) {
     const char *charset = (*env)->GetStringUTFChars(env, optionValue, NULL);
     if (charset && strlen(charset) != 0) {
       res = taos_options(TSDB_OPTION_CHARSET, charset);
-      jniTrace("set character encoding to %s, result:%d", charset, res);
+      jniDebug("set character encoding to %s, result:%d", charset, res);
     } else {
-      jniTrace("input character encoding is empty");
+      jniDebug("input character encoding is empty");
     }
     (*env)->ReleaseStringUTFChars(env, optionValue, charset);
   } else if (optionIndex == TSDB_OPTION_TIMEZONE) {
-    const char *timezone = (*env)->GetStringUTFChars(env, optionValue, NULL);
-    if (timezone && strlen(timezone) != 0) {
-      res = taos_options(TSDB_OPTION_TIMEZONE, timezone);
-      jniTrace("set timezone to %s, result:%d", timezone, res);
+    const char *tz1 = (*env)->GetStringUTFChars(env, optionValue, NULL);
+    if (tz1 && strlen(tz1) != 0) {
+      res = taos_options(TSDB_OPTION_TIMEZONE, tz1);
+      jniDebug("set timezone to %s, result:%d", tz1, res);
     } else {
-      jniTrace("input timezone is empty");
+      jniDebug("input timezone is empty");
     }
-    (*env)->ReleaseStringUTFChars(env, optionValue, timezone);
+    (*env)->ReleaseStringUTFChars(env, optionValue, tz1);
   } else {
     jniError("option index:%d is not found", optionIndex);
   }
@@ -205,39 +212,37 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
   }
 
   if (user == NULL) {
-    jniTrace("jobj:%p, user is null, use tsDefaultUser", jobj);
-    user = tsDefaultUser;
+    jniDebug("jobj:%p, user is null, use default user %s", jobj, TSDB_DEFAULT_USER);
   }
   if (pass == NULL) {
-    jniTrace("jobj:%p, pass is null, use tsDefaultPass", jobj);
-    pass = tsDefaultPass;
+    jniDebug("jobj:%p, pass is null, use default password", jobj);
   }
 
   /*
-  * set numOfThreadsPerCore = 0
-  * means only one thread for client side scheduler
-  */
+   * set numOfThreadsPerCore = 0
+   * means only one thread for client side scheduler
+   */
   tsNumOfThreadsPerCore = 0.0;
 
-  ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, jport);
+  ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, (uint16_t)jport);
   if (ret == 0) {
     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, conn:%p, connect to database succeed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
+    jniDebug("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);
   }
 
   if (host != NULL) (*env)->ReleaseStringUTFChars(env, jhost, host);
   if (dbname != NULL) (*env)->ReleaseStringUTFChars(env, jdbName, dbname);
-  if (user != NULL && user != tsDefaultUser) (*env)->ReleaseStringUTFChars(env, juser, user);
-  if (pass != NULL && pass != tsDefaultPass) (*env)->ReleaseStringUTFChars(env, jpass, pass);
+  if (user != NULL) (*env)->ReleaseStringUTFChars(env, juser, user);
+  if (pass != NULL) (*env)->ReleaseStringUTFChars(env, jpass, pass);
 
   return ret;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(JNIEnv *env, jobject jobj,
-                                                                               jbyteArray jsql, jlong con) {
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(JNIEnv *env, jobject jobj,
+                                                                                jbyteArray jsql, jlong con) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is already closed", jobj);
@@ -259,65 +264,93 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
 
   (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
   if ((*env)->ExceptionCheck(env)) {
-    //todo handle error
+    // todo handle error
   }
 
-  jniTrace("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
+  jniDebug("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
 
-  int code = taos_query(tscon, dst);
-  if (code != 0) {
-    jniError("jobj:%p, conn:%p, code:%d, msg:%s", jobj, tscon, code, taos_errstr(tscon));
-    free(dst);
-    return JNI_TDENGINE_ERROR;
-  } else {
-    int32_t  affectRows = 0;
-    SSqlObj *pSql = ((STscObj *)tscon)->pSql;
+  SSqlObj *pSql = taos_query(tscon, dst);
+  int32_t  code = taos_errno(pSql);
 
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(code), taos_errstr(pSql));
+  } else {
+    int32_t affectRows = 0;
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
-      affectRows = taos_affected_rows(tscon);
-      jniTrace("jobj:%p, conn:%p, code:%d, affect rows:%d", jobj, tscon, code, affectRows);
+      affectRows = taos_affected_rows(pSql);
+      jniDebug("jobj:%p, conn:%p, code:%s, affect rows:%d", jobj, tscon, tstrerror(code), affectRows);
     } else {
-      jniTrace("jobj:%p, conn:%p, code:%d", jobj, tscon, code);
+      jniDebug("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
     }
-
-    free(dst);
-    return affectRows;
   }
+
+  free(dst);
+  return (jlong)pSql;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con) {
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con, jlong tres) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
-    return (jint)-TSDB_CODE_INVALID_CONNECTION;
+    return (jint)TSDB_CODE_TSC_INVALID_CONNECTION;
+  }
+
+  if ((void *)tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
   }
 
-  return (jint)-taos_errno(tscon);
+  TAOS_RES *pSql = (TAOS_RES *)tres;
+
+  return (jint)taos_errno(pSql);
 }
 
-JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong con) {
-  TAOS *tscon = (TAOS *)con;
-  return (*env)->NewStringUTF(env, (const char *)taos_errstr(tscon));
+JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong tres) {
+  TAOS_RES *pSql = (TAOS_RES *)tres;
+  return (*env)->NewStringUTF(env, (const char *)taos_errstr(pSql));
 }
 
-JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con) {
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                jlong tres) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
 
-  jlong ret = 0;
+  if ((void *)tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+
+  SSqlObj *pSql = (TAOS_RES *)tres;
+  STscObj *pObj = pSql->pTscObj;
 
-  if (tscIsUpdateQuery(tscon)) {
-    ret = 0;  // for update query, no result pointer
-    jniTrace("jobj:%p, conn:%p, no resultset", jobj, tscon);
+  if (tscIsUpdateQuery(pSql)) {
+    jniDebug("jobj:%p, conn:%p, update query, no resultset, %p", jobj, pObj, (void *)tres);
   } else {
-    ret = (jlong) taos_use_result(tscon);
-    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, tscon, (void *) ret);
+    jniDebug("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *)tres);
   }
 
-  return ret;
+  return tres;
+}
+
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                jlong tres) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
+    jniError("jobj:%p, connection is closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+
+  if ((void *)tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+
+  SSqlObj *pSql = (TAOS_RES *)tres;
+
+  return (tscIsUpdateQuery(pSql)? 1:0);
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
@@ -334,21 +367,25 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(
   }
 
   taos_free_result((void *)res);
-  jniTrace("jobj:%p, conn:%p, free resultset:%p", jobj, tscon, (void *)res);
+  jniDebug("jobj:%p, conn:%p, free resultset:%p", jobj, tscon, (void *)res);
   return JNI_SUCCESS;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj,
-                                                                                  jlong con) {
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                  jlong res) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
 
-  jint ret = taos_affected_rows(tscon);
+  if ((void *)res == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
 
-  jniTrace("jobj:%p, conn:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
+  jint ret = taos_affected_rows((SSqlObj *)res);
+  jniDebug("jobj:%p, conn:%p, sql:%p, res: %p, affect rows:%d", jobj, tscon, (void *)con, (void *)res, ret);
 
   return ret;
 }
@@ -374,10 +411,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, conn:%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, (void *)res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   } else {
-    jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, (void *)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);
@@ -400,13 +437,8 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
  * @return
  */
 jstring jniFromNCharToByteArray(JNIEnv *env, char *nchar, int32_t maxBytes) {
-  int        len = (int)strlen(nchar);
-  if (len > maxBytes) {  // no terminated symbol exists '\0'
-    len = maxBytes;
-  }
-
-  jbyteArray bytes = (*env)->NewByteArray(env, len);
-  (*env)->SetByteArrayRegion(env, bytes, 0, len, (jbyte *)nchar);
+  jbyteArray bytes = (*env)->NewByteArray(env, maxBytes);
+  (*env)->SetByteArrayRegion(env, bytes, 0, maxBytes, (jbyte *)nchar);
   return bytes;
 }
 
@@ -428,22 +460,24 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   int         num_fields = taos_num_fields(result);
 
   if (num_fields == 0) {
-    jniError("jobj:%p, conn:%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, (void*)res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   }
 
   TAOS_ROW row = taos_fetch_row(result);
   if (row == NULL) {
-    int tserrno = taos_errno(tscon);
+    int tserrno = taos_errno(result);
     if (tserrno == 0) {
-      jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
+      jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, (void*)res, num_fields);
       return JNI_FETCH_END;
     } else {
-      jniTrace("jobj:%p, conn:%p, interruptted query", jobj, tscon);
+      jniDebug("jobj:%p, conn:%p, interruptted query", jobj, tscon);
       return JNI_RESULT_SET_NULL;
     }
   }
 
+  int32_t* length = taos_fetch_lengths(result);
+
   char tmp[TSDB_MAX_BYTES_PER_ROW] = {0};
 
   for (int i = 0; i < num_fields; i++) {
@@ -471,24 +505,22 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
         float fv = 0;
         fv = GET_FLOAT_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetFloatFp, i, (jfloat)fv);
-      }
-        break;
+      } break;
       case TSDB_DATA_TYPE_DOUBLE: {
         double dv = 0;
         dv = GET_DOUBLE_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetDoubleFp, i, (jdouble)dv);
-      }
-        break;
+      } break;
       case TSDB_DATA_TYPE_BINARY: {
-        strncpy(tmp, row[i], (size_t) fields[i].bytes);  // handle the case that terminated does not exist
+        memcpy(tmp, row[i], length[i]);  // handle the case that terminated does not exist
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetStringFp, i, (*env)->NewStringUTF(env, tmp));
 
-        memset(tmp, 0, (size_t) fields[i].bytes);
+        memset(tmp, 0, length[i]);
         break;
       }
       case TSDB_DATA_TYPE_NCHAR: {
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteArrayFp, i,
-                               jniFromNCharToByteArray(env, (char*)row[i], fields[i].bytes));
+                               jniFromNCharToByteArray(env, (char *)row[i], length[i]));
         break;
       }
       case TSDB_DATA_TYPE_TIMESTAMP:
@@ -509,7 +541,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeConnectionIm
     jniError("jobj:%p, connection is already closed", jobj);
     return JNI_CONNECTION_NULL;
   } else {
-    jniTrace("jobj:%p, conn:%p, close connection success", jobj, tscon);
+    jniDebug("jobj:%p, conn:%p, close connection success", jobj, tscon);
     taos_close(tscon);
     return JNI_SUCCESS;
   }
@@ -523,7 +555,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_subscribeImp(JNI
   char *sql = NULL;
 
   jniGetGlobalMethod(env);
-  jniTrace("jobj:%p, in TSDBJNIConnector_subscribeImp", jobj);
+  jniDebug("jobj:%p, in TSDBJNIConnector_subscribeImp", jobj);
 
   if (jtopic != NULL) {
     topic = (char *)(*env)->GetStringUTFChars(env, jtopic, NULL);
@@ -532,125 +564,44 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_subscribeImp(JNI
     sql = (char *)(*env)->GetStringUTFChars(env, jsql, NULL);
   }
 
+  if (topic == NULL || sql == NULL) {
+    jniDebug("jobj:%p, invalid argument: topic or sql is NULL", jobj);
+    return sub;
+  }
+
   TAOS_SUB *tsub = taos_subscribe(taos, (int)restart, topic, sql, NULL, NULL, jinterval);
   sub = (jlong)tsub;
 
   if (sub == 0) {
-    jniTrace("jobj:%p, failed to subscribe: topic:%s", jobj, jtopic);
+    jniDebug("jobj:%p, failed to subscribe: topic:%s", jobj, topic);
   } else {
-    jniTrace("jobj:%p, successfully subscribe: topic: %s", jobj, jtopic);
+    jniDebug("jobj:%p, successfully subscribe: topic: %s", jobj, topic);
   }
 
-  if (topic != NULL) (*env)->ReleaseStringUTFChars(env, jtopic, topic);
-  if (sql != NULL) (*env)->ReleaseStringUTFChars(env, jsql, sql);
+  (*env)->ReleaseStringUTFChars(env, jtopic, topic);
+  (*env)->ReleaseStringUTFChars(env, jsql, sql);
 
   return sub;
 }
 
-static jobject convert_one_row(JNIEnv *env, TAOS_ROW row, TAOS_FIELD* fields, int num_fields) {
-  jobject rowobj = (*env)->NewObject(env, g_rowdataClass, g_rowdataConstructor, num_fields);
-  jniTrace("created a rowdata object, rowobj:%p", rowobj);
-
-  for (int i = 0; i < num_fields; i++) {
-    if (row[i] == NULL) {
-      continue;
-    }
-
-    switch (fields[i].type) {
-      case TSDB_DATA_TYPE_BOOL:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetBooleanFp, i, (jboolean)(*((char *)row[i]) == 1));
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteFp, i, (jbyte) * ((char *)row[i]));
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetShortFp, i, (jshort) * ((short *)row[i]));
-        break;
-      case TSDB_DATA_TYPE_INT:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetIntFp, i, (jint) * (int *)row[i]);
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetLongFp, i, (jlong) * ((int64_t *)row[i]));
-        break;
-      case TSDB_DATA_TYPE_FLOAT: {
-        float fv = 0;
-        fv = GET_FLOAT_VAL(row[i]);
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetFloatFp, i, (jfloat)fv);
-      }
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:{
-        double dv = 0;
-        dv = GET_DOUBLE_VAL(row[i]);
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetDoubleFp, i, (jdouble)dv);
-      }
-        break;
-      case TSDB_DATA_TYPE_BINARY: {
-        char tmp[TSDB_MAX_BYTES_PER_ROW] = {0};
-        strncpy(tmp, row[i], (size_t) fields[i].bytes);  // handle the case that terminated does not exist
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetStringFp, i, (*env)->NewStringUTF(env, tmp));
-
-        memset(tmp, 0, (size_t) fields[i].bytes);
-        break;
-      }
-      case TSDB_DATA_TYPE_NCHAR:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteArrayFp, i,
-                              jniFromNCharToByteArray(env, (char*)row[i], fields[i].bytes));
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-        (*env)->CallVoidMethod(env, rowobj, g_rowdataSetTimestampFp, i, (jlong) * ((int64_t *)row[i]));
-        break;
-      default:
-        break;
-    }
-  }
-  return rowobj;
-}
-
-JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNIEnv *env, jobject jobj, jlong sub, jint timeout) {
-  jniTrace("jobj:%p, in TSDBJNIConnector_consumeImp, sub:%ld", jobj, sub);
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNIEnv *env, jobject jobj, jlong sub) {
+  jniDebug("jobj:%p, in TSDBJNIConnector_consumeImp, sub:%lld", jobj, sub);
   jniGetGlobalMethod(env);
 
   TAOS_SUB *tsub = (TAOS_SUB *)sub;
-  jobject   rows = (*env)->NewObject(env, g_arrayListClass, g_arrayListConstructFp);
-
-  int64_t start = taosGetTimestampMs();
-  int count = 0;
-
-  while (true) {
-    TAOS_RES *  res = taos_consume(tsub);
-    if (res == NULL) {
-      jniError("jobj:%p, tsub:%p, taos_consume returns NULL", jobj, tsub);
-      return NULL;
-    }
 
-    TAOS_FIELD *fields = taos_fetch_fields(res);
-    int         num_fields = taos_num_fields(res);
-    while (true) {
-      TAOS_ROW row = taos_fetch_row(res);
-      if (row == NULL) {
-        break;
-      }
-      jobject rowobj = convert_one_row(env, row, fields, num_fields);
-      (*env)->CallBooleanMethod(env, rows, g_arrayListAddFp, rowobj);
-      count++;
-    }
+  TAOS_RES *res = taos_consume(tsub);
 
-    if (count > 0) {
-      break;
-    }
-    if (timeout == -1) {
-      continue;
-    }
-    if (((int)(taosGetTimestampMs() - start)) >= timeout) {
-      jniTrace("jobj:%p, sub:%ld, timeout", jobj, sub);
-      break;
-    }
+  if (res == NULL) {
+    jniError("jobj:%p, tsub:%p, taos_consume returns NULL", jobj, tsub);
+    return 0l;
   }
 
-  return rows;
+  return (jlong)res;
 }
 
-JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_unsubscribeImp(JNIEnv *env, jobject jobj, jlong sub, jboolean keepProgress) {
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_unsubscribeImp(JNIEnv *env, jobject jobj, jlong sub,
+                                                                              jboolean keepProgress) {
   TAOS_SUB *tsub = (TAOS_SUB *)sub;
   taos_unsubscribe(tsub, keepProgress);
 }
@@ -673,11 +624,11 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
   char *dst = (char *)calloc(1, sizeof(char) * (len + 1));
   (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
   if ((*env)->ExceptionCheck(env)) {
-    //todo handle error
+    // todo handle error
   }
 
   int code = taos_validate_sql(tscon, dst);
-  jniTrace("jobj:%p, conn:%p, code is %d", jobj, tscon, code);
+  jniDebug("jobj:%p, conn:%p, code is %d", jobj, tscon, code);
 
   free(dst);
   return code;
diff --git a/src/client/src/sql.c b/src/client/src/sql.c
deleted file mode 100644
index 54df3e36696359b429aa97ad5f06c6d93b8e67bf..0000000000000000000000000000000000000000
--- a/src/client/src/sql.c
+++ /dev/null
@@ -1,3012 +0,0 @@
-/*
-** 2000-05-29
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** Driver template for the LEMON parser generator.
-**
-** The "lemon" program processes an LALR(1) input grammar file, then uses
-** this template to construct a parser.  The "lemon" program inserts text
-** at each "%%" line.  Also, any "P-a-r-s-e" identifer prefix (without the
-** interstitial "-" characters) contained in this template is changed into
-** the value of the %name directive from the grammar.  Otherwise, the content
-** of this template is copied straight through into the generate parser
-** source file.
-**
-** The following is the concatenation of all %include directives from the
-** input grammar file:
-*/
-#include <stdio.h>
-/************ Begin %include sections from the grammar ************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
-#include "tscSQLParser.h"
-#include "tutil.h"
-/**************** End of %include directives **********************************/
-/* These constants specify the various numeric values for terminal symbols
-** in a format understandable to "makeheaders".  This section is blank unless
-** "lemon" is run with the "-m" command-line option.
-***************** Begin makeheaders token definitions *************************/
-/**************** End makeheaders token definitions ***************************/
-
-/* The next sections is a series of control #defines.
-** various aspects of the generated parser.
-**    YYCODETYPE         is the data type used to store the integer codes
-**                       that represent terminal and non-terminal symbols.
-**                       "unsigned char" is used if there are fewer than
-**                       256 symbols.  Larger types otherwise.
-**    YYNOCODE           is a number of type YYCODETYPE that is not used for
-**                       any terminal or nonterminal symbol.
-**    YYFALLBACK         If defined, this indicates that one or more tokens
-**                       (also known as: "terminal symbols") have fall-back
-**                       values which should be used if the original symbol
-**                       would not parse.  This permits keywords to sometimes
-**                       be used as identifiers, for example.
-**    YYACTIONTYPE       is the data type used for "action codes" - numbers
-**                       that indicate what to do in response to the next
-**                       token.
-**    ParseTOKENTYPE     is the data type used for minor type for terminal
-**                       symbols.  Background: A "minor type" is a semantic
-**                       value associated with a terminal or non-terminal
-**                       symbols.  For example, for an "ID" terminal symbol,
-**                       the minor type might be the name of the identifier.
-**                       Each non-terminal can have a different minor type.
-**                       Terminal symbols all have the same minor type, though.
-**                       This macros defines the minor type for terminal 
-**                       symbols.
-**    YYMINORTYPE        is the data type used for all minor types.
-**                       This is typically a union of many types, one of
-**                       which is ParseTOKENTYPE.  The entry in the union
-**                       for terminal symbols is called "yy0".
-**    YYSTACKDEPTH       is the maximum depth of the parser's stack.  If
-**                       zero the stack is dynamically sized using realloc()
-**    ParseARG_SDECL     A static variable declaration for the %extra_argument
-**    ParseARG_PDECL     A parameter declaration for the %extra_argument
-**    ParseARG_STORE     Code to store %extra_argument into yypParser
-**    ParseARG_FETCH     Code to extract %extra_argument from yypParser
-**    YYERRORSYMBOL      is the code number of the error symbol.  If not
-**                       defined, then do no error processing.
-**    YYNSTATE           the combined number of states.
-**    YYNRULE            the number of rules in the grammar
-**    YYNTOKEN           Number of terminal symbols
-**    YY_MAX_SHIFT       Maximum value for shift actions
-**    YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions
-**    YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions
-**    YY_ERROR_ACTION    The yy_action[] code for syntax error
-**    YY_ACCEPT_ACTION   The yy_action[] code for accept
-**    YY_NO_ACTION       The yy_action[] code for no-op
-**    YY_MIN_REDUCE      Minimum value for reduce actions
-**    YY_MAX_REDUCE      Maximum value for reduce actions
-*/
-#ifndef INTERFACE
-# define INTERFACE 1
-#endif
-/************* Begin control #defines *****************************************/
-#define YYCODETYPE unsigned short int
-#define YYNOCODE 268
-#define YYACTIONTYPE unsigned short int
-#define ParseTOKENTYPE SSQLToken
-typedef union {
-  int yyinit;
-  ParseTOKENTYPE yy0;
-  tVariantList* yy30;
-  SLimitVal yy150;
-  SCreateTableSQL* yy212;
-  SCreateAcctSQL yy239;
-  int yy250;
-  SSubclauseInfo* yy309;
-  tFieldList* yy325;
-  tVariant yy380;
-  tSQLExpr* yy388;
-  SQuerySQL* yy444;
-  int64_t yy489;
-  TAOS_FIELD yy505;
-  tSQLExprList* yy506;
-  SCreateDBInfo yy532;
-} YYMINORTYPE;
-#ifndef YYSTACKDEPTH
-#define YYSTACKDEPTH 100
-#endif
-#define ParseARG_SDECL SSqlInfo* pInfo;
-#define ParseARG_PDECL ,SSqlInfo* pInfo
-#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
-#define ParseARG_STORE yypParser->pInfo = pInfo
-#define YYFALLBACK 1
-#define YYNSTATE             247
-#define YYNRULE              216
-#define YYNTOKEN             203
-#define YY_MAX_SHIFT         246
-#define YY_MIN_SHIFTREDUCE   399
-#define YY_MAX_SHIFTREDUCE   614
-#define YY_ERROR_ACTION      615
-#define YY_ACCEPT_ACTION     616
-#define YY_NO_ACTION         617
-#define YY_MIN_REDUCE        618
-#define YY_MAX_REDUCE        833
-/************* End control #defines *******************************************/
-
-/* Define the yytestcase() macro to be a no-op if is not already defined
-** otherwise.
-**
-** Applications can choose to define yytestcase() in the %include section
-** to a macro that can assist in verifying code coverage.  For production
-** code the yytestcase() macro should be turned off.  But it is useful
-** for testing.
-*/
-#ifndef yytestcase
-# define yytestcase(X)
-#endif
-
-
-/* Next are the tables used to determine what action to take based on the
-** current state and lookahead token.  These tables are used to implement
-** functions that take a state number and lookahead value and return an
-** action integer.  
-**
-** Suppose the action integer is N.  Then the action is determined as
-** follows
-**
-**   0 <= N <= YY_MAX_SHIFT             Shift N.  That is, push the lookahead
-**                                      token onto the stack and goto state N.
-**
-**   N between YY_MIN_SHIFTREDUCE       Shift to an arbitrary state then
-**     and YY_MAX_SHIFTREDUCE           reduce by rule N-YY_MIN_SHIFTREDUCE.
-**
-**   N == YY_ERROR_ACTION               A syntax error has occurred.
-**
-**   N == YY_ACCEPT_ACTION              The parser accepts its input.
-**
-**   N == YY_NO_ACTION                  No such action.  Denotes unused
-**                                      slots in the yy_action[] table.
-**
-**   N between YY_MIN_REDUCE            Reduce by rule N-YY_MIN_REDUCE
-**     and YY_MAX_REDUCE
-**
-** The action table is constructed as a single large table named yy_action[].
-** Given state S and lookahead X, the action is computed as either:
-**
-**    (A)   N = yy_action[ yy_shift_ofst[S] + X ]
-**    (B)   N = yy_default[S]
-**
-** The (A) formula is preferred.  The B formula is used instead if
-** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X.
-**
-** The formulas above are for computing the action when the lookahead is
-** a terminal symbol.  If the lookahead is a non-terminal (as occurs after
-** a reduce action) then the yy_reduce_ofst[] array is used in place of
-** the yy_shift_ofst[] array.
-**
-** The following are the tables generated in this section:
-**
-**  yy_action[]        A single table containing all actions.
-**  yy_lookahead[]     A table containing the lookahead for each entry in
-**                     yy_action.  Used to detect hash collisions.
-**  yy_shift_ofst[]    For each state, the offset into yy_action for
-**                     shifting terminals.
-**  yy_reduce_ofst[]   For each state, the offset into yy_action for
-**                     shifting non-terminals after a reduce.
-**  yy_default[]       Default action for each state.
-**
-*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (529)
-static const YYACTIONTYPE yy_action[] = {
- /*     0 */   752,  440,  132,  150,  244,   10,  616,  246,  132,  441,
- /*    10 */   132,  155,  821,   41,   43,   20,   35,   36,  820,  154,
- /*    20 */   821,   29,  741,  440,  200,   39,   37,   40,   38,  131,
- /*    30 */   499,  441,   96,   34,   33,  100,  151,   32,   31,   30,
- /*    40 */    41,   43,  741,   35,   36,  152,  136,  163,   29,  727,
- /*    50 */   749,  200,   39,   37,   40,   38,  185,  100,  225,  224,
- /*    60 */    34,   33,  162,  730,   32,   31,   30,  400,  401,  402,
- /*    70 */   403,  404,  405,  406,  407,  408,  409,  410,  411,  245,
- /*    80 */   730,   41,   43,  188,   35,   36,  215,  236,  197,   29,
- /*    90 */    58,   20,  200,   39,   37,   40,   38,   32,   31,   30,
- /*   100 */    56,   34,   33,   75,  730,   32,   31,   30,   43,  236,
- /*   110 */    35,   36,  776,  817,  195,   29,   20,   20,  200,   39,
- /*   120 */    37,   40,   38,  164,  570,  727,  227,   34,   33,  440,
- /*   130 */   167,   32,   31,   30,  238,   35,   36,  441,    7,  816,
- /*   140 */    29,   61,  110,  200,   39,   37,   40,   38,  223,  228,
- /*   150 */   727,  727,   34,   33,   50,  728,   32,   31,   30,   15,
- /*   160 */   214,  237,  213,  212,  211,  210,  209,  208,  207,  206,
- /*   170 */   712,   51,  701,  702,  703,  704,  705,  706,  707,  708,
- /*   180 */   709,  710,  711,  159,  583,   11,  815,  574,  100,  577,
- /*   190 */   100,  580,  168,  159,  583,  222,  221,  574,   16,  577,
- /*   200 */    20,  580,   34,   33,  145,   26,   32,   31,   30,  238,
- /*   210 */    86,   85,  139,  174,  657,  156,  157,  123,  144,  199,
- /*   220 */   182,  715,  179,  714,  148,  156,  157,  159,  583,  531,
- /*   230 */    60,  574,  149,  577,  726,  580,  237,   16,   39,   37,
- /*   240 */    40,   38,   27,  775,   26,   59,   34,   33,  551,  552,
- /*   250 */    32,   31,   30,  137,  113,  114,  219,   64,   67,  156,
- /*   260 */   157,   95,  515,  666,  184,  512,  123,  513,   26,  514,
- /*   270 */   523,  147,  127,  125,  240,   88,   87,  187,   42,  158,
- /*   280 */    73,   77,  239,   84,   76,  572,  528,  729,   42,  582,
- /*   290 */    79,   17,  658,  165,  166,  123,  243,  242,   92,  582,
- /*   300 */    47,  542,  543,  600,  581,   45,   13,   12,  584,  576,
- /*   310 */   138,  579,   12,  575,  581,  578,    2,   72,   71,   48,
- /*   320 */   505,  573,   42,  743,   45,  504,  204,    9,    8,   21,
- /*   330 */    21,  140,  519,  582,  520,  517,  141,  518,   83,   82,
- /*   340 */   142,  143,  134,  130,  135,  830,  133,  786,  581,  785,
- /*   350 */   160,  782,  781,  161,  751,  721,  768,  226,   97,  767,
- /*   360 */   111,  112,  516,  668,  205,  109,  128,   24,  218,  220,
- /*   370 */   829,   69,   26,  828,  826,  115,  186,  686,   25,   22,
- /*   380 */    90,  129,  655,   78,  653,   80,  651,  650,  169,  538,
- /*   390 */   124,  648,  189,  647,  646,  644,  636,  193,   52,  740,
- /*   400 */   126,  642,  640,  638,   49,  755,  756,  101,  769,   44,
- /*   410 */   198,  196,  194,   28,  192,  190,  217,   74,  229,  230,
- /*   420 */   202,  232,  231,  614,  233,  234,   53,  235,  241,  170,
- /*   430 */   146,   62,  171,   65,  173,  172,  613,  176,  175,  178,
- /*   440 */   649,  177,  612,   89,   91,  117,  687,  118,  116,  119,
- /*   450 */   120,  643,  104,  102,  122,  725,  106,  103,  105,  121,
- /*   460 */   107,    1,  108,   23,  180,  181,  605,  183,  187,  525,
- /*   470 */    55,  539,  153,   98,   57,  191,   18,   63,    4,  544,
- /*   480 */    99,    5,  585,    3,   19,   14,  201,    6,  203,  480,
- /*   490 */   479,  478,  477,  476,  475,  474,  473,  471,   45,  444,
- /*   500 */    66,  446,   21,  501,  216,   68,  500,  498,   54,  465,
- /*   510 */    46,  463,  455,   70,  461,  457,  459,  453,  451,  472,
- /*   520 */   470,   81,  426,  442,   93,  415,   94,  413,  618,
-};
-static const YYCODETYPE yy_lookahead[] = {
- /*     0 */   207,    1,  256,  206,  207,  256,  204,  205,  256,    9,
- /*    10 */   256,  265,  266,   13,   14,  207,   16,   17,  266,  265,
- /*    20 */   266,   21,  240,    1,   24,   25,   26,   27,   28,  256,
- /*    30 */     5,    9,  207,   33,   34,  207,  254,   37,   38,   39,
- /*    40 */    13,   14,  240,   16,   17,  224,  256,  239,   21,  241,
- /*    50 */   257,   24,   25,   26,   27,   28,  254,  207,   33,   34,
- /*    60 */    33,   34,  224,  242,   37,   38,   39,   45,   46,   47,
- /*    70 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
- /*    80 */   242,   13,   14,  258,   16,   17,  224,   78,  260,   21,
- /*    90 */   262,  207,   24,   25,   26,   27,   28,   37,   38,   39,
- /*   100 */   100,   33,   34,   72,  242,   37,   38,   39,   14,   78,
- /*   110 */    16,   17,  262,  256,  264,   21,  207,  207,   24,   25,
- /*   120 */    26,   27,   28,  239,   97,  241,  207,   33,   34,    1,
- /*   130 */    63,   37,   38,   39,   60,   16,   17,    9,   96,  256,
- /*   140 */    21,   99,  100,   24,   25,   26,   27,   28,  239,  239,
- /*   150 */   241,  241,   33,   34,  101,  236,   37,   38,   39,   85,
- /*   160 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   95,
- /*   170 */   223,  118,  225,  226,  227,  228,  229,  230,  231,  232,
- /*   180 */   233,  234,  235,    1,    2,   44,  256,    5,  207,    7,
- /*   190 */   207,    9,  125,    1,    2,  128,  129,    5,   96,    7,
- /*   200 */   207,    9,   33,   34,   63,  103,   37,   38,   39,   60,
- /*   210 */    69,   70,   71,  124,  211,   33,   34,  214,   77,   37,
- /*   220 */   131,  225,  133,  227,  256,   33,   34,    1,    2,   37,
- /*   230 */   243,    5,  256,    7,  241,    9,   87,   96,   25,   26,
- /*   240 */    27,   28,  255,  262,  103,  262,   33,   34,  113,  114,
- /*   250 */    37,   38,   39,  256,   64,   65,   66,   67,   68,   33,
- /*   260 */    34,   96,    2,  211,  123,    5,  214,    7,  103,    9,
- /*   270 */    97,  130,   64,   65,   66,   67,   68,  104,   96,   59,
- /*   280 */    64,   65,   66,   67,   68,    1,  101,  242,   96,  107,
- /*   290 */    74,  106,  211,   33,   34,  214,   60,   61,   62,  107,
- /*   300 */   101,   97,   97,   97,  122,  101,  101,  101,   97,    5,
- /*   310 */   256,    7,  101,    5,  122,    7,   96,  126,  127,  120,
- /*   320 */    97,   37,   96,  240,  101,   97,   97,  126,  127,  101,
- /*   330 */   101,  256,    5,  107,    7,    5,  256,    7,   72,   73,
- /*   340 */   256,  256,  256,  256,  256,  242,  256,  237,  122,  237,
- /*   350 */   237,  237,  237,  237,  207,  238,  263,  237,  207,  263,
- /*   360 */   207,  207,  102,  207,  207,  244,  207,  207,  207,  207,
- /*   370 */   207,  207,  103,  207,  207,  207,  240,  207,  207,  207,
- /*   380 */    59,  207,  207,  207,  207,  207,  207,  207,  207,  107,
- /*   390 */   207,  207,  259,  207,  207,  207,  207,  259,  117,  253,
- /*   400 */   207,  207,  207,  207,  119,  208,  208,  252,  208,  116,
- /*   410 */   111,  115,  110,  121,  109,  108,   75,   84,   83,   49,
- /*   420 */   208,   82,   80,    5,   53,   81,  208,   79,   75,  132,
- /*   430 */   208,  212,    5,  212,   58,  132,    5,    5,  132,   58,
- /*   440 */   208,  132,    5,  209,  209,  220,  222,  216,  221,  219,
- /*   450 */   217,  208,  249,  251,  215,  240,  247,  250,  248,  218,
- /*   460 */   246,  213,  245,  210,  132,   58,   86,  124,  104,   97,
- /*   470 */   105,   97,    1,   96,  101,   96,  101,   72,  112,   97,
- /*   480 */    96,  112,   97,   96,  101,   96,   98,   96,   98,    9,
- /*   490 */     5,    5,    5,    5,    1,    5,    5,    5,  101,   76,
- /*   500 */    72,   58,  101,    5,   15,  127,    5,   97,   96,    5,
- /*   510 */    16,    5,    5,  127,    5,    5,    5,    5,    5,    5,
- /*   520 */     5,   58,   58,   76,   21,   59,   21,   58,    0,  267,
- /*   530 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   540 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   550 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   560 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   570 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   580 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   590 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   600 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   610 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   620 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   630 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   640 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   650 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   660 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   670 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   680 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   690 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   700 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   710 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   720 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   730 */   267,  267,
-};
-#define YY_SHIFT_COUNT    (246)
-#define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (528)
-static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   141,   74,  182,  226,  128,  128,  128,  128,  128,  128,
- /*    10 */     0,   22,  226,  260,  260,  260,  102,  128,  128,  128,
- /*    20 */   128,  128,   31,  149,    9,    9,  529,  192,  226,  226,
- /*    30 */   226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
- /*    40 */   226,  226,  226,  226,  226,  260,  260,   25,   25,   25,
- /*    50 */    25,   25,   25,   42,   25,  165,  128,  128,  135,  135,
- /*    60 */   185,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    70 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    80 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    90 */   128,  128,  128,  128,  128,  269,  321,  321,  282,  282,
- /*   100 */   321,  281,  285,  293,  299,  296,  302,  305,  307,  292,
- /*   110 */   269,  321,  321,  341,  341,  321,  333,  335,  370,  342,
- /*   120 */   339,  371,  344,  348,  321,  353,  321,  353,  529,  529,
- /*   130 */    27,   68,   68,   68,   94,  119,  213,  213,  213,  216,
- /*   140 */   169,  169,  169,  169,  190,  208,   67,   89,   60,   60,
- /*   150 */   236,  173,  204,  205,  206,  211,  304,  308,  284,  220,
- /*   160 */   199,   53,  223,  228,  229,  327,  330,  191,  201,  266,
- /*   170 */   418,  297,  427,  303,  376,  431,  306,  432,  309,  381,
- /*   180 */   437,  332,  407,  380,  343,  364,  372,  365,  373,  374,
- /*   190 */   377,  471,  379,  382,  384,  375,  366,  383,  369,  385,
- /*   200 */   387,  389,  388,  391,  390,  405,  480,  485,  486,  487,
- /*   210 */   488,  493,  490,  491,  492,  397,  423,  489,  428,  443,
- /*   220 */   494,  378,  386,  401,  498,  501,  410,  412,  401,  504,
- /*   230 */   506,  507,  509,  510,  511,  512,  513,  514,  515,  463,
- /*   240 */   464,  447,  503,  505,  466,  469,  528,
-};
-#define YY_REDUCE_COUNT (129)
-#define YY_REDUCE_MIN   (-254)
-#define YY_REDUCE_MAX   (253)
-static const short yy_reduce_ofst[] = {
- /*     0 */  -198,  -53, -254, -246, -150, -172, -192, -116,  -91,  -90,
- /*    10 */  -207, -203, -248, -179, -162, -138, -218, -175,  -19,  -17,
- /*    20 */   -81,   -7,    3,   -4,   52,   81,  -13, -251, -227, -210,
- /*    30 */  -143, -117,  -70,  -32,  -24,   -3,   54,   75,   80,   84,
- /*    40 */    85,   86,   87,   88,   90,   45,  103,  110,  112,  113,
- /*    50 */   114,  115,  116,  117,  120,   83,  147,  151,   93,   96,
- /*    60 */   121,  153,  154,  156,  157,  159,  160,  161,  162,  163,
- /*    70 */   164,  166,  167,  168,  170,  171,  172,  174,  175,  176,
- /*    80 */   177,  178,  179,  180,  181,  183,  184,  186,  187,  188,
- /*    90 */   189,  193,  194,  195,  196,  136,  197,  198,  133,  138,
- /*   100 */   200,  146,  155,  202,  207,  203,  210,  209,  214,  217,
- /*   110 */   215,  212,  218,  219,  221,  222,  224,  227,  225,  231,
- /*   120 */   230,  233,  241,  239,  232,  234,  243,  235,  248,  253,
-};
-static const YYACTIONTYPE yy_default[] = {
- /*     0 */   615,  667,  823,  823,  615,  615,  615,  615,  615,  615,
- /*    10 */   753,  633,  823,  615,  615,  615,  615,  615,  615,  615,
- /*    20 */   615,  615,  669,  656,  669,  669,  748,  615,  615,  615,
- /*    30 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    40 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    50 */   615,  615,  615,  615,  615,  615,  615,  615,  772,  772,
- /*    60 */   746,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    70 */   615,  615,  615,  615,  615,  615,  615,  615,  654,  615,
- /*    80 */   652,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    90 */   615,  615,  641,  615,  615,  615,  635,  635,  615,  615,
- /*   100 */   635,  779,  783,  777,  765,  773,  764,  760,  759,  787,
- /*   110 */   615,  635,  635,  664,  664,  635,  685,  683,  681,  673,
- /*   120 */   679,  675,  677,  671,  635,  662,  635,  662,  700,  713,
- /*   130 */   615,  788,  822,  778,  806,  805,  818,  812,  811,  615,
- /*   140 */   810,  809,  808,  807,  615,  615,  615,  615,  814,  813,
- /*   150 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  790,
- /*   160 */   784,  780,  615,  615,  615,  615,  615,  615,  615,  615,
- /*   170 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*   180 */   615,  615,  615,  615,  615,  745,  615,  615,  754,  615,
- /*   190 */   615,  615,  615,  615,  615,  774,  615,  766,  615,  615,
- /*   200 */   615,  615,  615,  615,  722,  615,  615,  615,  615,  615,
- /*   210 */   615,  615,  615,  615,  615,  688,  615,  615,  615,  615,
- /*   220 */   615,  615,  615,  827,  615,  615,  615,  716,  825,  615,
- /*   230 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*   240 */   615,  615,  639,  637,  615,  631,  615,
-};
-/********** End of lemon-generated parsing tables *****************************/
-
-/* The next table maps tokens (terminal symbols) into fallback tokens.  
-** If a construct like the following:
-** 
-**      %fallback ID X Y Z.
-**
-** appears in the grammar, then ID becomes a fallback token for X, Y,
-** and Z.  Whenever one of the tokens X, Y, or Z is input to the parser
-** but it does not parse, the type of the token is changed to ID and
-** the parse is retried before an error is thrown.
-**
-** This feature can be used, for example, to cause some keywords in a language
-** to revert to identifiers if they keyword does not apply in the context where
-** it appears.
-*/
-#ifdef YYFALLBACK
-static const YYCODETYPE yyFallback[] = {
-    0,  /*          $ => nothing */
-    0,  /*         ID => nothing */
-    1,  /*       BOOL => ID */
-    1,  /*    TINYINT => ID */
-    1,  /*   SMALLINT => ID */
-    1,  /*    INTEGER => ID */
-    1,  /*     BIGINT => ID */
-    1,  /*      FLOAT => ID */
-    1,  /*     DOUBLE => ID */
-    1,  /*     STRING => ID */
-    1,  /*  TIMESTAMP => ID */
-    1,  /*     BINARY => ID */
-    1,  /*      NCHAR => ID */
-    0,  /*         OR => nothing */
-    0,  /*        AND => nothing */
-    0,  /*        NOT => nothing */
-    0,  /*         EQ => nothing */
-    0,  /*         NE => nothing */
-    0,  /*     ISNULL => nothing */
-    0,  /*    NOTNULL => nothing */
-    0,  /*         IS => nothing */
-    1,  /*       LIKE => ID */
-    1,  /*       GLOB => ID */
-    0,  /*    BETWEEN => nothing */
-    0,  /*         IN => nothing */
-    0,  /*         GT => nothing */
-    0,  /*         GE => nothing */
-    0,  /*         LT => nothing */
-    0,  /*         LE => nothing */
-    0,  /*     BITAND => nothing */
-    0,  /*      BITOR => nothing */
-    0,  /*     LSHIFT => nothing */
-    0,  /*     RSHIFT => nothing */
-    0,  /*       PLUS => nothing */
-    0,  /*      MINUS => nothing */
-    0,  /*     DIVIDE => nothing */
-    0,  /*      TIMES => nothing */
-    0,  /*       STAR => nothing */
-    0,  /*      SLASH => nothing */
-    0,  /*        REM => nothing */
-    0,  /*     CONCAT => nothing */
-    0,  /*     UMINUS => nothing */
-    0,  /*      UPLUS => nothing */
-    0,  /*     BITNOT => nothing */
-    0,  /*       SHOW => nothing */
-    0,  /*  DATABASES => nothing */
-    0,  /*     MNODES => nothing */
-    0,  /*     DNODES => nothing */
-    0,  /*   ACCOUNTS => nothing */
-    0,  /*      USERS => nothing */
-    0,  /*    MODULES => nothing */
-    0,  /*    QUERIES => nothing */
-    0,  /* CONNECTIONS => nothing */
-    0,  /*    STREAMS => nothing */
-    0,  /*    CONFIGS => nothing */
-    0,  /*     SCORES => nothing */
-    0,  /*     GRANTS => nothing */
-    0,  /*     VNODES => nothing */
-    1,  /*    IPTOKEN => ID */
-    0,  /*        DOT => nothing */
-    0,  /*     TABLES => nothing */
-    0,  /*    STABLES => nothing */
-    0,  /*    VGROUPS => nothing */
-    0,  /*       DROP => nothing */
-    0,  /*      TABLE => nothing */
-    1,  /*   DATABASE => ID */
-    0,  /*      DNODE => nothing */
-    0,  /*       USER => nothing */
-    0,  /*    ACCOUNT => nothing */
-    0,  /*        USE => nothing */
-    0,  /*   DESCRIBE => nothing */
-    0,  /*      ALTER => nothing */
-    0,  /*       PASS => nothing */
-    0,  /*  PRIVILEGE => nothing */
-    0,  /*      LOCAL => nothing */
-    0,  /*         IF => nothing */
-    0,  /*     EXISTS => nothing */
-    0,  /*     CREATE => nothing */
-    0,  /*        PPS => nothing */
-    0,  /*    TSERIES => nothing */
-    0,  /*        DBS => nothing */
-    0,  /*    STORAGE => nothing */
-    0,  /*      QTIME => nothing */
-    0,  /*      CONNS => nothing */
-    0,  /*      STATE => nothing */
-    0,  /*       KEEP => nothing */
-    0,  /*      CACHE => nothing */
-    0,  /*    REPLICA => nothing */
-    0,  /*       DAYS => nothing */
-    0,  /*       ROWS => nothing */
-    0,  /*    ABLOCKS => nothing */
-    0,  /*    TBLOCKS => nothing */
-    0,  /*      CTIME => nothing */
-    0,  /*       CLOG => nothing */
-    0,  /*       COMP => nothing */
-    0,  /*  PRECISION => nothing */
-    0,  /*         LP => nothing */
-    0,  /*         RP => nothing */
-    0,  /*       TAGS => nothing */
-    0,  /*      USING => nothing */
-    0,  /*         AS => nothing */
-    0,  /*      COMMA => nothing */
-    1,  /*       NULL => ID */
-    0,  /*     SELECT => nothing */
-    0,  /*      UNION => nothing */
-    1,  /*        ALL => ID */
-    0,  /*       FROM => nothing */
-    0,  /*   VARIABLE => nothing */
-    0,  /*   INTERVAL => nothing */
-    0,  /*       FILL => nothing */
-    0,  /*    SLIDING => nothing */
-    0,  /*      ORDER => nothing */
-    0,  /*         BY => nothing */
-    1,  /*        ASC => ID */
-    1,  /*       DESC => ID */
-    0,  /*      GROUP => nothing */
-    0,  /*     HAVING => nothing */
-    0,  /*      LIMIT => nothing */
-    1,  /*     OFFSET => ID */
-    0,  /*     SLIMIT => nothing */
-    0,  /*    SOFFSET => nothing */
-    0,  /*      WHERE => nothing */
-    1,  /*        NOW => ID */
-    0,  /*      RESET => nothing */
-    0,  /*      QUERY => nothing */
-    0,  /*        ADD => nothing */
-    0,  /*     COLUMN => nothing */
-    0,  /*        TAG => nothing */
-    0,  /*     CHANGE => nothing */
-    0,  /*        SET => nothing */
-    0,  /*       KILL => nothing */
-    0,  /* CONNECTION => nothing */
-    0,  /*      COLON => nothing */
-    0,  /*     STREAM => nothing */
-    1,  /*      ABORT => ID */
-    1,  /*      AFTER => ID */
-    1,  /*     ATTACH => ID */
-    1,  /*     BEFORE => ID */
-    1,  /*      BEGIN => ID */
-    1,  /*    CASCADE => ID */
-    1,  /*    CLUSTER => ID */
-    1,  /*   CONFLICT => ID */
-    1,  /*       COPY => ID */
-    1,  /*   DEFERRED => ID */
-    1,  /* DELIMITERS => ID */
-    1,  /*     DETACH => ID */
-    1,  /*       EACH => ID */
-    1,  /*        END => ID */
-    1,  /*    EXPLAIN => ID */
-    1,  /*       FAIL => ID */
-    1,  /*        FOR => ID */
-    1,  /*     IGNORE => ID */
-    1,  /*  IMMEDIATE => ID */
-    1,  /*  INITIALLY => ID */
-    1,  /*    INSTEAD => ID */
-    1,  /*      MATCH => ID */
-    1,  /*        KEY => ID */
-    1,  /*         OF => ID */
-    1,  /*      RAISE => ID */
-    1,  /*    REPLACE => ID */
-    1,  /*   RESTRICT => ID */
-    1,  /*        ROW => ID */
-    1,  /*  STATEMENT => ID */
-    1,  /*    TRIGGER => ID */
-    1,  /*       VIEW => ID */
-    1,  /*      COUNT => ID */
-    1,  /*        SUM => ID */
-    1,  /*        AVG => ID */
-    1,  /*        MIN => ID */
-    1,  /*        MAX => ID */
-    1,  /*      FIRST => ID */
-    1,  /*       LAST => ID */
-    1,  /*        TOP => ID */
-    1,  /*     BOTTOM => ID */
-    1,  /*     STDDEV => ID */
-    1,  /* PERCENTILE => ID */
-    1,  /* APERCENTILE => ID */
-    1,  /* LEASTSQUARES => ID */
-    1,  /*  HISTOGRAM => ID */
-    1,  /*       DIFF => ID */
-    1,  /*     SPREAD => ID */
-    1,  /*        TWA => ID */
-    1,  /*     INTERP => ID */
-    1,  /*   LAST_ROW => ID */
-    1,  /*       RATE => ID */
-    1,  /*      IRATE => ID */
-    1,  /*   SUM_RATE => ID */
-    1,  /*  SUM_IRATE => ID */
-    1,  /*   AVG_RATE => ID */
-    1,  /*  AVG_IRATE => ID */
-    1,  /*       SEMI => ID */
-    1,  /*       NONE => ID */
-    1,  /*       PREV => ID */
-    1,  /*     LINEAR => ID */
-    1,  /*     IMPORT => ID */
-    1,  /*     METRIC => ID */
-    1,  /*     TBNAME => ID */
-    1,  /*       JOIN => ID */
-    1,  /*    METRICS => ID */
-    1,  /*     STABLE => ID */
-    1,  /*     INSERT => ID */
-    1,  /*       INTO => ID */
-    1,  /*     VALUES => ID */
-};
-#endif /* YYFALLBACK */
-
-/* The following structure represents a single element of the
-** parser's stack.  Information stored includes:
-**
-**   +  The state number for the parser at this level of the stack.
-**
-**   +  The value of the token stored at this level of the stack.
-**      (In other words, the "major" token.)
-**
-**   +  The semantic value stored at this level of the stack.  This is
-**      the information used by the action routines in the grammar.
-**      It is sometimes called the "minor" token.
-**
-** After the "shift" half of a SHIFTREDUCE action, the stateno field
-** actually contains the reduce action for the second half of the
-** SHIFTREDUCE.
-*/
-struct yyStackEntry {
-  YYACTIONTYPE stateno;  /* The state-number, or reduce action in SHIFTREDUCE */
-  YYCODETYPE major;      /* The major token value.  This is the code
-                         ** number for the token at this stack level */
-  YYMINORTYPE minor;     /* The user-supplied minor token value.  This
-                         ** is the value of the token  */
-};
-typedef struct yyStackEntry yyStackEntry;
-
-/* The state of the parser is completely contained in an instance of
-** the following structure */
-struct yyParser {
-  yyStackEntry *yytos;          /* Pointer to top element of the stack */
-#ifdef YYTRACKMAXSTACKDEPTH
-  int yyhwm;                    /* High-water mark of the stack */
-#endif
-#ifndef YYNOERRORRECOVERY
-  int yyerrcnt;                 /* Shifts left before out of the error */
-#endif
-  ParseARG_SDECL                /* A place to hold %extra_argument */
-#if YYSTACKDEPTH<=0
-  int yystksz;                  /* Current side of the stack */
-  yyStackEntry *yystack;        /* The parser's stack */
-  yyStackEntry yystk0;          /* First stack entry */
-#else
-  yyStackEntry yystack[YYSTACKDEPTH];  /* The parser's stack */
-  yyStackEntry *yystackEnd;            /* Last entry in the stack */
-#endif
-};
-typedef struct yyParser yyParser;
-
-#ifndef NDEBUG
-#include <stdio.h>
-static FILE *yyTraceFILE = 0;
-static char *yyTracePrompt = 0;
-#endif /* NDEBUG */
-
-#ifndef NDEBUG
-/* 
-** Turn parser tracing on by giving a stream to which to write the trace
-** and a prompt to preface each trace message.  Tracing is turned off
-** by making either argument NULL 
-**
-** Inputs:
-** <ul>
-** <li> A FILE* to which trace output should be written.
-**      If NULL, then tracing is turned off.
-** <li> A prefix string written at the beginning of every
-**      line of trace output.  If NULL, then tracing is
-**      turned off.
-** </ul>
-**
-** Outputs:
-** None.
-*/
-void ParseTrace(FILE *TraceFILE, char *zTracePrompt){
-  yyTraceFILE = TraceFILE;
-  yyTracePrompt = zTracePrompt;
-  if( yyTraceFILE==0 ) yyTracePrompt = 0;
-  else if( yyTracePrompt==0 ) yyTraceFILE = 0;
-}
-#endif /* NDEBUG */
-
-#if defined(YYCOVERAGE) || !defined(NDEBUG)
-/* For tracing shifts, the names of all terminals and nonterminals
-** are required.  The following table supplies these names */
-static const char *const yyTokenName[] = { 
-  /*    0 */ "$",
-  /*    1 */ "ID",
-  /*    2 */ "BOOL",
-  /*    3 */ "TINYINT",
-  /*    4 */ "SMALLINT",
-  /*    5 */ "INTEGER",
-  /*    6 */ "BIGINT",
-  /*    7 */ "FLOAT",
-  /*    8 */ "DOUBLE",
-  /*    9 */ "STRING",
-  /*   10 */ "TIMESTAMP",
-  /*   11 */ "BINARY",
-  /*   12 */ "NCHAR",
-  /*   13 */ "OR",
-  /*   14 */ "AND",
-  /*   15 */ "NOT",
-  /*   16 */ "EQ",
-  /*   17 */ "NE",
-  /*   18 */ "ISNULL",
-  /*   19 */ "NOTNULL",
-  /*   20 */ "IS",
-  /*   21 */ "LIKE",
-  /*   22 */ "GLOB",
-  /*   23 */ "BETWEEN",
-  /*   24 */ "IN",
-  /*   25 */ "GT",
-  /*   26 */ "GE",
-  /*   27 */ "LT",
-  /*   28 */ "LE",
-  /*   29 */ "BITAND",
-  /*   30 */ "BITOR",
-  /*   31 */ "LSHIFT",
-  /*   32 */ "RSHIFT",
-  /*   33 */ "PLUS",
-  /*   34 */ "MINUS",
-  /*   35 */ "DIVIDE",
-  /*   36 */ "TIMES",
-  /*   37 */ "STAR",
-  /*   38 */ "SLASH",
-  /*   39 */ "REM",
-  /*   40 */ "CONCAT",
-  /*   41 */ "UMINUS",
-  /*   42 */ "UPLUS",
-  /*   43 */ "BITNOT",
-  /*   44 */ "SHOW",
-  /*   45 */ "DATABASES",
-  /*   46 */ "MNODES",
-  /*   47 */ "DNODES",
-  /*   48 */ "ACCOUNTS",
-  /*   49 */ "USERS",
-  /*   50 */ "MODULES",
-  /*   51 */ "QUERIES",
-  /*   52 */ "CONNECTIONS",
-  /*   53 */ "STREAMS",
-  /*   54 */ "CONFIGS",
-  /*   55 */ "SCORES",
-  /*   56 */ "GRANTS",
-  /*   57 */ "VNODES",
-  /*   58 */ "IPTOKEN",
-  /*   59 */ "DOT",
-  /*   60 */ "TABLES",
-  /*   61 */ "STABLES",
-  /*   62 */ "VGROUPS",
-  /*   63 */ "DROP",
-  /*   64 */ "TABLE",
-  /*   65 */ "DATABASE",
-  /*   66 */ "DNODE",
-  /*   67 */ "USER",
-  /*   68 */ "ACCOUNT",
-  /*   69 */ "USE",
-  /*   70 */ "DESCRIBE",
-  /*   71 */ "ALTER",
-  /*   72 */ "PASS",
-  /*   73 */ "PRIVILEGE",
-  /*   74 */ "LOCAL",
-  /*   75 */ "IF",
-  /*   76 */ "EXISTS",
-  /*   77 */ "CREATE",
-  /*   78 */ "PPS",
-  /*   79 */ "TSERIES",
-  /*   80 */ "DBS",
-  /*   81 */ "STORAGE",
-  /*   82 */ "QTIME",
-  /*   83 */ "CONNS",
-  /*   84 */ "STATE",
-  /*   85 */ "KEEP",
-  /*   86 */ "CACHE",
-  /*   87 */ "REPLICA",
-  /*   88 */ "DAYS",
-  /*   89 */ "ROWS",
-  /*   90 */ "ABLOCKS",
-  /*   91 */ "TBLOCKS",
-  /*   92 */ "CTIME",
-  /*   93 */ "CLOG",
-  /*   94 */ "COMP",
-  /*   95 */ "PRECISION",
-  /*   96 */ "LP",
-  /*   97 */ "RP",
-  /*   98 */ "TAGS",
-  /*   99 */ "USING",
-  /*  100 */ "AS",
-  /*  101 */ "COMMA",
-  /*  102 */ "NULL",
-  /*  103 */ "SELECT",
-  /*  104 */ "UNION",
-  /*  105 */ "ALL",
-  /*  106 */ "FROM",
-  /*  107 */ "VARIABLE",
-  /*  108 */ "INTERVAL",
-  /*  109 */ "FILL",
-  /*  110 */ "SLIDING",
-  /*  111 */ "ORDER",
-  /*  112 */ "BY",
-  /*  113 */ "ASC",
-  /*  114 */ "DESC",
-  /*  115 */ "GROUP",
-  /*  116 */ "HAVING",
-  /*  117 */ "LIMIT",
-  /*  118 */ "OFFSET",
-  /*  119 */ "SLIMIT",
-  /*  120 */ "SOFFSET",
-  /*  121 */ "WHERE",
-  /*  122 */ "NOW",
-  /*  123 */ "RESET",
-  /*  124 */ "QUERY",
-  /*  125 */ "ADD",
-  /*  126 */ "COLUMN",
-  /*  127 */ "TAG",
-  /*  128 */ "CHANGE",
-  /*  129 */ "SET",
-  /*  130 */ "KILL",
-  /*  131 */ "CONNECTION",
-  /*  132 */ "COLON",
-  /*  133 */ "STREAM",
-  /*  134 */ "ABORT",
-  /*  135 */ "AFTER",
-  /*  136 */ "ATTACH",
-  /*  137 */ "BEFORE",
-  /*  138 */ "BEGIN",
-  /*  139 */ "CASCADE",
-  /*  140 */ "CLUSTER",
-  /*  141 */ "CONFLICT",
-  /*  142 */ "COPY",
-  /*  143 */ "DEFERRED",
-  /*  144 */ "DELIMITERS",
-  /*  145 */ "DETACH",
-  /*  146 */ "EACH",
-  /*  147 */ "END",
-  /*  148 */ "EXPLAIN",
-  /*  149 */ "FAIL",
-  /*  150 */ "FOR",
-  /*  151 */ "IGNORE",
-  /*  152 */ "IMMEDIATE",
-  /*  153 */ "INITIALLY",
-  /*  154 */ "INSTEAD",
-  /*  155 */ "MATCH",
-  /*  156 */ "KEY",
-  /*  157 */ "OF",
-  /*  158 */ "RAISE",
-  /*  159 */ "REPLACE",
-  /*  160 */ "RESTRICT",
-  /*  161 */ "ROW",
-  /*  162 */ "STATEMENT",
-  /*  163 */ "TRIGGER",
-  /*  164 */ "VIEW",
-  /*  165 */ "COUNT",
-  /*  166 */ "SUM",
-  /*  167 */ "AVG",
-  /*  168 */ "MIN",
-  /*  169 */ "MAX",
-  /*  170 */ "FIRST",
-  /*  171 */ "LAST",
-  /*  172 */ "TOP",
-  /*  173 */ "BOTTOM",
-  /*  174 */ "STDDEV",
-  /*  175 */ "PERCENTILE",
-  /*  176 */ "APERCENTILE",
-  /*  177 */ "LEASTSQUARES",
-  /*  178 */ "HISTOGRAM",
-  /*  179 */ "DIFF",
-  /*  180 */ "SPREAD",
-  /*  181 */ "TWA",
-  /*  182 */ "INTERP",
-  /*  183 */ "LAST_ROW",
-  /*  184 */ "RATE",
-  /*  185 */ "IRATE",
-  /*  186 */ "SUM_RATE",
-  /*  187 */ "SUM_IRATE",
-  /*  188 */ "AVG_RATE",
-  /*  189 */ "AVG_IRATE",
-  /*  190 */ "SEMI",
-  /*  191 */ "NONE",
-  /*  192 */ "PREV",
-  /*  193 */ "LINEAR",
-  /*  194 */ "IMPORT",
-  /*  195 */ "METRIC",
-  /*  196 */ "TBNAME",
-  /*  197 */ "JOIN",
-  /*  198 */ "METRICS",
-  /*  199 */ "STABLE",
-  /*  200 */ "INSERT",
-  /*  201 */ "INTO",
-  /*  202 */ "VALUES",
-  /*  203 */ "error",
-  /*  204 */ "program",
-  /*  205 */ "cmd",
-  /*  206 */ "dbPrefix",
-  /*  207 */ "ids",
-  /*  208 */ "cpxName",
-  /*  209 */ "ifexists",
-  /*  210 */ "alter_db_optr",
-  /*  211 */ "acct_optr",
-  /*  212 */ "ifnotexists",
-  /*  213 */ "db_optr",
-  /*  214 */ "pps",
-  /*  215 */ "tseries",
-  /*  216 */ "dbs",
-  /*  217 */ "streams",
-  /*  218 */ "storage",
-  /*  219 */ "qtime",
-  /*  220 */ "users",
-  /*  221 */ "conns",
-  /*  222 */ "state",
-  /*  223 */ "keep",
-  /*  224 */ "tagitemlist",
-  /*  225 */ "tables",
-  /*  226 */ "cache",
-  /*  227 */ "replica",
-  /*  228 */ "days",
-  /*  229 */ "rows",
-  /*  230 */ "ablocks",
-  /*  231 */ "tblocks",
-  /*  232 */ "ctime",
-  /*  233 */ "clog",
-  /*  234 */ "comp",
-  /*  235 */ "prec",
-  /*  236 */ "typename",
-  /*  237 */ "signed",
-  /*  238 */ "create_table_args",
-  /*  239 */ "columnlist",
-  /*  240 */ "select",
-  /*  241 */ "column",
-  /*  242 */ "tagitem",
-  /*  243 */ "selcollist",
-  /*  244 */ "from",
-  /*  245 */ "where_opt",
-  /*  246 */ "interval_opt",
-  /*  247 */ "fill_opt",
-  /*  248 */ "sliding_opt",
-  /*  249 */ "groupby_opt",
-  /*  250 */ "orderby_opt",
-  /*  251 */ "having_opt",
-  /*  252 */ "slimit_opt",
-  /*  253 */ "limit_opt",
-  /*  254 */ "union",
-  /*  255 */ "sclp",
-  /*  256 */ "expr",
-  /*  257 */ "as",
-  /*  258 */ "tablelist",
-  /*  259 */ "tmvar",
-  /*  260 */ "sortlist",
-  /*  261 */ "sortitem",
-  /*  262 */ "item",
-  /*  263 */ "sortorder",
-  /*  264 */ "grouplist",
-  /*  265 */ "exprlist",
-  /*  266 */ "expritem",
-};
-#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
-
-#ifndef NDEBUG
-/* For tracing reduce actions, the names of all rules are required.
-*/
-static const char *const yyRuleName[] = {
- /*   0 */ "program ::= cmd",
- /*   1 */ "cmd ::= SHOW DATABASES",
- /*   2 */ "cmd ::= SHOW MNODES",
- /*   3 */ "cmd ::= SHOW DNODES",
- /*   4 */ "cmd ::= SHOW ACCOUNTS",
- /*   5 */ "cmd ::= SHOW USERS",
- /*   6 */ "cmd ::= SHOW MODULES",
- /*   7 */ "cmd ::= SHOW QUERIES",
- /*   8 */ "cmd ::= SHOW CONNECTIONS",
- /*   9 */ "cmd ::= SHOW STREAMS",
- /*  10 */ "cmd ::= SHOW CONFIGS",
- /*  11 */ "cmd ::= SHOW SCORES",
- /*  12 */ "cmd ::= SHOW GRANTS",
- /*  13 */ "cmd ::= SHOW VNODES",
- /*  14 */ "cmd ::= SHOW VNODES IPTOKEN",
- /*  15 */ "dbPrefix ::=",
- /*  16 */ "dbPrefix ::= ids DOT",
- /*  17 */ "cpxName ::=",
- /*  18 */ "cpxName ::= DOT ids",
- /*  19 */ "cmd ::= SHOW dbPrefix TABLES",
- /*  20 */ "cmd ::= SHOW dbPrefix TABLES LIKE ids",
- /*  21 */ "cmd ::= SHOW dbPrefix STABLES",
- /*  22 */ "cmd ::= SHOW dbPrefix STABLES LIKE ids",
- /*  23 */ "cmd ::= SHOW dbPrefix VGROUPS",
- /*  24 */ "cmd ::= SHOW dbPrefix VGROUPS ids",
- /*  25 */ "cmd ::= DROP TABLE ifexists ids cpxName",
- /*  26 */ "cmd ::= DROP DATABASE ifexists ids",
- /*  27 */ "cmd ::= DROP DNODE IPTOKEN",
- /*  28 */ "cmd ::= DROP USER ids",
- /*  29 */ "cmd ::= DROP ACCOUNT ids",
- /*  30 */ "cmd ::= USE ids",
- /*  31 */ "cmd ::= DESCRIBE ids cpxName",
- /*  32 */ "cmd ::= ALTER USER ids PASS ids",
- /*  33 */ "cmd ::= ALTER USER ids PRIVILEGE ids",
- /*  34 */ "cmd ::= ALTER DNODE IPTOKEN ids",
- /*  35 */ "cmd ::= ALTER DNODE IPTOKEN ids ids",
- /*  36 */ "cmd ::= ALTER LOCAL ids",
- /*  37 */ "cmd ::= ALTER LOCAL ids ids",
- /*  38 */ "cmd ::= ALTER DATABASE ids alter_db_optr",
- /*  39 */ "cmd ::= ALTER ACCOUNT ids acct_optr",
- /*  40 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr",
- /*  41 */ "ids ::= ID",
- /*  42 */ "ids ::= STRING",
- /*  43 */ "ifexists ::= IF EXISTS",
- /*  44 */ "ifexists ::=",
- /*  45 */ "ifnotexists ::= IF NOT EXISTS",
- /*  46 */ "ifnotexists ::=",
- /*  47 */ "cmd ::= CREATE DNODE IPTOKEN",
- /*  48 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr",
- /*  49 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr",
- /*  50 */ "cmd ::= CREATE USER ids PASS ids",
- /*  51 */ "pps ::=",
- /*  52 */ "pps ::= PPS INTEGER",
- /*  53 */ "tseries ::=",
- /*  54 */ "tseries ::= TSERIES INTEGER",
- /*  55 */ "dbs ::=",
- /*  56 */ "dbs ::= DBS INTEGER",
- /*  57 */ "streams ::=",
- /*  58 */ "streams ::= STREAMS INTEGER",
- /*  59 */ "storage ::=",
- /*  60 */ "storage ::= STORAGE INTEGER",
- /*  61 */ "qtime ::=",
- /*  62 */ "qtime ::= QTIME INTEGER",
- /*  63 */ "users ::=",
- /*  64 */ "users ::= USERS INTEGER",
- /*  65 */ "conns ::=",
- /*  66 */ "conns ::= CONNS INTEGER",
- /*  67 */ "state ::=",
- /*  68 */ "state ::= STATE ids",
- /*  69 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state",
- /*  70 */ "keep ::= KEEP tagitemlist",
- /*  71 */ "tables ::= TABLES INTEGER",
- /*  72 */ "cache ::= CACHE INTEGER",
- /*  73 */ "replica ::= REPLICA INTEGER",
- /*  74 */ "days ::= DAYS INTEGER",
- /*  75 */ "rows ::= ROWS INTEGER",
- /*  76 */ "ablocks ::= ABLOCKS ID",
- /*  77 */ "tblocks ::= TBLOCKS INTEGER",
- /*  78 */ "ctime ::= CTIME INTEGER",
- /*  79 */ "clog ::= CLOG INTEGER",
- /*  80 */ "comp ::= COMP INTEGER",
- /*  81 */ "prec ::= PRECISION STRING",
- /*  82 */ "db_optr ::=",
- /*  83 */ "db_optr ::= db_optr tables",
- /*  84 */ "db_optr ::= db_optr cache",
- /*  85 */ "db_optr ::= db_optr replica",
- /*  86 */ "db_optr ::= db_optr days",
- /*  87 */ "db_optr ::= db_optr rows",
- /*  88 */ "db_optr ::= db_optr ablocks",
- /*  89 */ "db_optr ::= db_optr tblocks",
- /*  90 */ "db_optr ::= db_optr ctime",
- /*  91 */ "db_optr ::= db_optr clog",
- /*  92 */ "db_optr ::= db_optr comp",
- /*  93 */ "db_optr ::= db_optr prec",
- /*  94 */ "db_optr ::= db_optr keep",
- /*  95 */ "alter_db_optr ::=",
- /*  96 */ "alter_db_optr ::= alter_db_optr replica",
- /*  97 */ "alter_db_optr ::= alter_db_optr tables",
- /*  98 */ "typename ::= ids",
- /*  99 */ "typename ::= ids LP signed RP",
- /* 100 */ "signed ::= INTEGER",
- /* 101 */ "signed ::= PLUS INTEGER",
- /* 102 */ "signed ::= MINUS INTEGER",
- /* 103 */ "cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args",
- /* 104 */ "create_table_args ::= LP columnlist RP",
- /* 105 */ "create_table_args ::= LP columnlist RP TAGS LP columnlist RP",
- /* 106 */ "create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP",
- /* 107 */ "create_table_args ::= AS select",
- /* 108 */ "columnlist ::= columnlist COMMA column",
- /* 109 */ "columnlist ::= column",
- /* 110 */ "column ::= ids typename",
- /* 111 */ "tagitemlist ::= tagitemlist COMMA tagitem",
- /* 112 */ "tagitemlist ::= tagitem",
- /* 113 */ "tagitem ::= INTEGER",
- /* 114 */ "tagitem ::= FLOAT",
- /* 115 */ "tagitem ::= STRING",
- /* 116 */ "tagitem ::= BOOL",
- /* 117 */ "tagitem ::= NULL",
- /* 118 */ "tagitem ::= MINUS INTEGER",
- /* 119 */ "tagitem ::= MINUS FLOAT",
- /* 120 */ "tagitem ::= PLUS INTEGER",
- /* 121 */ "tagitem ::= PLUS FLOAT",
- /* 122 */ "select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
- /* 123 */ "union ::= select",
- /* 124 */ "union ::= LP union RP",
- /* 125 */ "union ::= union UNION ALL select",
- /* 126 */ "union ::= union UNION ALL LP select RP",
- /* 127 */ "cmd ::= union",
- /* 128 */ "select ::= SELECT selcollist",
- /* 129 */ "sclp ::= selcollist COMMA",
- /* 130 */ "sclp ::=",
- /* 131 */ "selcollist ::= sclp expr as",
- /* 132 */ "selcollist ::= sclp STAR",
- /* 133 */ "as ::= AS ids",
- /* 134 */ "as ::= ids",
- /* 135 */ "as ::=",
- /* 136 */ "from ::= FROM tablelist",
- /* 137 */ "tablelist ::= ids cpxName",
- /* 138 */ "tablelist ::= tablelist COMMA ids cpxName",
- /* 139 */ "tmvar ::= VARIABLE",
- /* 140 */ "interval_opt ::= INTERVAL LP tmvar RP",
- /* 141 */ "interval_opt ::=",
- /* 142 */ "fill_opt ::=",
- /* 143 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
- /* 144 */ "fill_opt ::= FILL LP ID RP",
- /* 145 */ "sliding_opt ::= SLIDING LP tmvar RP",
- /* 146 */ "sliding_opt ::=",
- /* 147 */ "orderby_opt ::=",
- /* 148 */ "orderby_opt ::= ORDER BY sortlist",
- /* 149 */ "sortlist ::= sortlist COMMA item sortorder",
- /* 150 */ "sortlist ::= item sortorder",
- /* 151 */ "item ::= ids cpxName",
- /* 152 */ "sortorder ::= ASC",
- /* 153 */ "sortorder ::= DESC",
- /* 154 */ "sortorder ::=",
- /* 155 */ "groupby_opt ::=",
- /* 156 */ "groupby_opt ::= GROUP BY grouplist",
- /* 157 */ "grouplist ::= grouplist COMMA item",
- /* 158 */ "grouplist ::= item",
- /* 159 */ "having_opt ::=",
- /* 160 */ "having_opt ::= HAVING expr",
- /* 161 */ "limit_opt ::=",
- /* 162 */ "limit_opt ::= LIMIT signed",
- /* 163 */ "limit_opt ::= LIMIT signed OFFSET signed",
- /* 164 */ "limit_opt ::= LIMIT signed COMMA signed",
- /* 165 */ "slimit_opt ::=",
- /* 166 */ "slimit_opt ::= SLIMIT signed",
- /* 167 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
- /* 168 */ "slimit_opt ::= SLIMIT signed COMMA signed",
- /* 169 */ "where_opt ::=",
- /* 170 */ "where_opt ::= WHERE expr",
- /* 171 */ "expr ::= LP expr RP",
- /* 172 */ "expr ::= ID",
- /* 173 */ "expr ::= ID DOT ID",
- /* 174 */ "expr ::= ID DOT STAR",
- /* 175 */ "expr ::= INTEGER",
- /* 176 */ "expr ::= MINUS INTEGER",
- /* 177 */ "expr ::= PLUS INTEGER",
- /* 178 */ "expr ::= FLOAT",
- /* 179 */ "expr ::= MINUS FLOAT",
- /* 180 */ "expr ::= PLUS FLOAT",
- /* 181 */ "expr ::= STRING",
- /* 182 */ "expr ::= NOW",
- /* 183 */ "expr ::= VARIABLE",
- /* 184 */ "expr ::= BOOL",
- /* 185 */ "expr ::= ID LP exprlist RP",
- /* 186 */ "expr ::= ID LP STAR RP",
- /* 187 */ "expr ::= expr AND expr",
- /* 188 */ "expr ::= expr OR expr",
- /* 189 */ "expr ::= expr LT expr",
- /* 190 */ "expr ::= expr GT expr",
- /* 191 */ "expr ::= expr LE expr",
- /* 192 */ "expr ::= expr GE expr",
- /* 193 */ "expr ::= expr NE expr",
- /* 194 */ "expr ::= expr EQ expr",
- /* 195 */ "expr ::= expr PLUS expr",
- /* 196 */ "expr ::= expr MINUS expr",
- /* 197 */ "expr ::= expr STAR expr",
- /* 198 */ "expr ::= expr SLASH expr",
- /* 199 */ "expr ::= expr REM expr",
- /* 200 */ "expr ::= expr LIKE expr",
- /* 201 */ "expr ::= expr IN LP exprlist RP",
- /* 202 */ "exprlist ::= exprlist COMMA expritem",
- /* 203 */ "exprlist ::= expritem",
- /* 204 */ "expritem ::= expr",
- /* 205 */ "expritem ::=",
- /* 206 */ "cmd ::= RESET QUERY CACHE",
- /* 207 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
- /* 208 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
- /* 209 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
- /* 210 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
- /* 211 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
- /* 212 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
- /* 213 */ "cmd ::= KILL CONNECTION IPTOKEN COLON INTEGER",
- /* 214 */ "cmd ::= KILL STREAM IPTOKEN COLON INTEGER COLON INTEGER",
- /* 215 */ "cmd ::= KILL QUERY IPTOKEN COLON INTEGER COLON INTEGER",
-};
-#endif /* NDEBUG */
-
-
-#if YYSTACKDEPTH<=0
-/*
-** Try to increase the size of the parser stack.  Return the number
-** of errors.  Return 0 on success.
-*/
-static int yyGrowStack(yyParser *p){
-  int newSize;
-  int idx;
-  yyStackEntry *pNew;
-
-  newSize = p->yystksz*2 + 100;
-  idx = p->yytos ? (int)(p->yytos - p->yystack) : 0;
-  if( p->yystack==&p->yystk0 ){
-    pNew = malloc(newSize*sizeof(pNew[0]));
-    if( pNew ) pNew[0] = p->yystk0;
-  }else{
-    pNew = realloc(p->yystack, newSize*sizeof(pNew[0]));
-  }
-  if( pNew ){
-    p->yystack = pNew;
-    p->yytos = &p->yystack[idx];
-#ifndef NDEBUG
-    if( yyTraceFILE ){
-      fprintf(yyTraceFILE,"%sStack grows from %d to %d entries.\n",
-              yyTracePrompt, p->yystksz, newSize);
-    }
-#endif
-    p->yystksz = newSize;
-  }
-  return pNew==0; 
-}
-#endif
-
-/* Datatype of the argument to the memory allocated passed as the
-** second argument to ParseAlloc() below.  This can be changed by
-** putting an appropriate #define in the %include section of the input
-** grammar.
-*/
-#ifndef YYMALLOCARGTYPE
-# define YYMALLOCARGTYPE size_t
-#endif
-
-/* Initialize a new parser that has already been allocated.
-*/
-void ParseInit(void *yypParser){
-  yyParser *pParser = (yyParser*)yypParser;
-#ifdef YYTRACKMAXSTACKDEPTH
-  pParser->yyhwm = 0;
-#endif
-#if YYSTACKDEPTH<=0
-  pParser->yytos = NULL;
-  pParser->yystack = NULL;
-  pParser->yystksz = 0;
-  if( yyGrowStack(pParser) ){
-    pParser->yystack = &pParser->yystk0;
-    pParser->yystksz = 1;
-  }
-#endif
-#ifndef YYNOERRORRECOVERY
-  pParser->yyerrcnt = -1;
-#endif
-  pParser->yytos = pParser->yystack;
-  pParser->yystack[0].stateno = 0;
-  pParser->yystack[0].major = 0;
-#if YYSTACKDEPTH>0
-  pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1];
-#endif
-}
-
-#ifndef Parse_ENGINEALWAYSONSTACK
-/* 
-** This function allocates a new parser.
-** The only argument is a pointer to a function which works like
-** malloc.
-**
-** Inputs:
-** A pointer to the function used to allocate memory.
-**
-** Outputs:
-** A pointer to a parser.  This pointer is used in subsequent calls
-** to Parse and ParseFree.
-*/
-void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){
-  yyParser *pParser;
-  pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) );
-  if( pParser ) ParseInit(pParser);
-  return pParser;
-}
-#endif /* Parse_ENGINEALWAYSONSTACK */
-
-
-/* The following function deletes the "minor type" or semantic value
-** associated with a symbol.  The symbol can be either a terminal
-** or nonterminal. "yymajor" is the symbol code, and "yypminor" is
-** a pointer to the value to be deleted.  The code used to do the 
-** deletions is derived from the %destructor and/or %token_destructor
-** directives of the input grammar.
-*/
-static void yy_destructor(
-  yyParser *yypParser,    /* The parser */
-  YYCODETYPE yymajor,     /* Type code for object to destroy */
-  YYMINORTYPE *yypminor   /* The object to be destroyed */
-){
-  ParseARG_FETCH;
-  switch( yymajor ){
-    /* Here is inserted the actions which take place when a
-    ** terminal or non-terminal is destroyed.  This can happen
-    ** when the symbol is popped from the stack during a
-    ** reduce or during error processing or when a parser is 
-    ** being destroyed before it is finished parsing.
-    **
-    ** Note: during a reduce, the only symbols destroyed are those
-    ** which appear on the RHS of the rule, but which are *not* used
-    ** inside the C code.
-    */
-/********* Begin destructor definitions ***************************************/
-    case 223: /* keep */
-    case 224: /* tagitemlist */
-    case 247: /* fill_opt */
-    case 249: /* groupby_opt */
-    case 250: /* orderby_opt */
-    case 260: /* sortlist */
-    case 264: /* grouplist */
-{
-tVariantListDestroy((yypminor->yy30));
-}
-      break;
-    case 239: /* columnlist */
-{
-tFieldListDestroy((yypminor->yy325));
-}
-      break;
-    case 240: /* select */
-{
-doDestroyQuerySql((yypminor->yy444));
-}
-      break;
-    case 243: /* selcollist */
-    case 255: /* sclp */
-    case 265: /* exprlist */
-{
-tSQLExprListDestroy((yypminor->yy506));
-}
-      break;
-    case 245: /* where_opt */
-    case 251: /* having_opt */
-    case 256: /* expr */
-    case 266: /* expritem */
-{
-tSQLExprDestroy((yypminor->yy388));
-}
-      break;
-    case 254: /* union */
-{
-destroyAllSelectClause((yypminor->yy309));
-}
-      break;
-    case 261: /* sortitem */
-{
-tVariantDestroy(&(yypminor->yy380));
-}
-      break;
-/********* End destructor definitions *****************************************/
-    default:  break;   /* If no destructor action specified: do nothing */
-  }
-}
-
-/*
-** Pop the parser's stack once.
-**
-** If there is a destructor routine associated with the token which
-** is popped from the stack, then call it.
-*/
-static void yy_pop_parser_stack(yyParser *pParser){
-  yyStackEntry *yytos;
-  assert( pParser->yytos!=0 );
-  assert( pParser->yytos > pParser->yystack );
-  yytos = pParser->yytos--;
-#ifndef NDEBUG
-  if( yyTraceFILE ){
-    fprintf(yyTraceFILE,"%sPopping %s\n",
-      yyTracePrompt,
-      yyTokenName[yytos->major]);
-  }
-#endif
-  yy_destructor(pParser, yytos->major, &yytos->minor);
-}
-
-/*
-** Clear all secondary memory allocations from the parser
-*/
-void ParseFinalize(void *p){
-  yyParser *pParser = (yyParser*)p;
-  while( pParser->yytos>pParser->yystack ) yy_pop_parser_stack(pParser);
-#if YYSTACKDEPTH<=0
-  if( pParser->yystack!=&pParser->yystk0 ) free(pParser->yystack);
-#endif
-}
-
-#ifndef Parse_ENGINEALWAYSONSTACK
-/* 
-** Deallocate and destroy a parser.  Destructors are called for
-** all stack elements before shutting the parser down.
-**
-** If the YYPARSEFREENEVERNULL macro exists (for example because it
-** is defined in a %include section of the input grammar) then it is
-** assumed that the input pointer is never NULL.
-*/
-void ParseFree(
-  void *p,                    /* The parser to be deleted */
-  void (*freeProc)(void*)     /* Function used to reclaim memory */
-){
-#ifndef YYPARSEFREENEVERNULL
-  if( p==0 ) return;
-#endif
-  ParseFinalize(p);
-  (*freeProc)(p);
-}
-#endif /* Parse_ENGINEALWAYSONSTACK */
-
-/*
-** Return the peak depth of the stack for a parser.
-*/
-#ifdef YYTRACKMAXSTACKDEPTH
-int ParseStackPeak(void *p){
-  yyParser *pParser = (yyParser*)p;
-  return pParser->yyhwm;
-}
-#endif
-
-/* This array of booleans keeps track of the parser statement
-** coverage.  The element yycoverage[X][Y] is set when the parser
-** is in state X and has a lookahead token Y.  In a well-tested
-** systems, every element of this matrix should end up being set.
-*/
-#if defined(YYCOVERAGE)
-static unsigned char yycoverage[YYNSTATE][YYNTOKEN];
-#endif
-
-/*
-** Write into out a description of every state/lookahead combination that
-**
-**   (1)  has not been used by the parser, and
-**   (2)  is not a syntax error.
-**
-** Return the number of missed state/lookahead combinations.
-*/
-#if defined(YYCOVERAGE)
-int ParseCoverage(FILE *out){
-  int stateno, iLookAhead, i;
-  int nMissed = 0;
-  for(stateno=0; stateno<YYNSTATE; stateno++){
-    i = yy_shift_ofst[stateno];
-    for(iLookAhead=0; iLookAhead<YYNTOKEN; iLookAhead++){
-      if( yy_lookahead[i+iLookAhead]!=iLookAhead ) continue;
-      if( yycoverage[stateno][iLookAhead]==0 ) nMissed++;
-      if( out ){
-        fprintf(out,"State %d lookahead %s %s\n", stateno,
-                yyTokenName[iLookAhead],
-                yycoverage[stateno][iLookAhead] ? "ok" : "missed");
-      }
-    }
-  }
-  return nMissed;
-}
-#endif
-
-/*
-** Find the appropriate action for a parser given the terminal
-** look-ahead token iLookAhead.
-*/
-static unsigned int yy_find_shift_action(
-  yyParser *pParser,        /* The parser */
-  YYCODETYPE iLookAhead     /* The look-ahead token */
-){
-  int i;
-  int stateno = pParser->yytos->stateno;
- 
-  if( stateno>YY_MAX_SHIFT ) return stateno;
-  assert( stateno <= YY_SHIFT_COUNT );
-#if defined(YYCOVERAGE)
-  yycoverage[stateno][iLookAhead] = 1;
-#endif
-  do{
-    i = yy_shift_ofst[stateno];
-    assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) );
-    assert( iLookAhead!=YYNOCODE );
-    assert( iLookAhead < YYNTOKEN );
-    i += iLookAhead;
-    if( yy_lookahead[i]!=iLookAhead ){
-#ifdef YYFALLBACK
-      YYCODETYPE iFallback;            /* Fallback token */
-      if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
-             && (iFallback = yyFallback[iLookAhead])!=0 ){
-#ifndef NDEBUG
-        if( yyTraceFILE ){
-          fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
-             yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]);
-        }
-#endif
-        assert( yyFallback[iFallback]==0 ); /* Fallback loop must terminate */
-        iLookAhead = iFallback;
-        continue;
-      }
-#endif
-#ifdef YYWILDCARD
-      {
-        int j = i - iLookAhead + YYWILDCARD;
-        if( 
-#if YY_SHIFT_MIN+YYWILDCARD<0
-          j>=0 &&
-#endif
-#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
-          j<YY_ACTTAB_COUNT &&
-#endif
-          yy_lookahead[j]==YYWILDCARD && iLookAhead>0
-        ){
-#ifndef NDEBUG
-          if( yyTraceFILE ){
-            fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
-               yyTracePrompt, yyTokenName[iLookAhead],
-               yyTokenName[YYWILDCARD]);
-          }
-#endif /* NDEBUG */
-          return yy_action[j];
-        }
-      }
-#endif /* YYWILDCARD */
-      return yy_default[stateno];
-    }else{
-      return yy_action[i];
-    }
-  }while(1);
-}
-
-/*
-** Find the appropriate action for a parser given the non-terminal
-** look-ahead token iLookAhead.
-*/
-static int yy_find_reduce_action(
-  int stateno,              /* Current state number */
-  YYCODETYPE iLookAhead     /* The look-ahead token */
-){
-  int i;
-#ifdef YYERRORSYMBOL
-  if( stateno>YY_REDUCE_COUNT ){
-    return yy_default[stateno];
-  }
-#else
-  assert( stateno<=YY_REDUCE_COUNT );
-#endif
-  i = yy_reduce_ofst[stateno];
-  assert( iLookAhead!=YYNOCODE );
-  i += iLookAhead;
-#ifdef YYERRORSYMBOL
-  if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
-    return yy_default[stateno];
-  }
-#else
-  assert( i>=0 && i<YY_ACTTAB_COUNT );
-  assert( yy_lookahead[i]==iLookAhead );
-#endif
-  return yy_action[i];
-}
-
-/*
-** The following routine is called if the stack overflows.
-*/
-static void yyStackOverflow(yyParser *yypParser){
-   ParseARG_FETCH;
-#ifndef NDEBUG
-   if( yyTraceFILE ){
-     fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt);
-   }
-#endif
-   while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
-   /* Here code is inserted which will execute if the parser
-   ** stack every overflows */
-/******** Begin %stack_overflow code ******************************************/
-/******** End %stack_overflow code ********************************************/
-   ParseARG_STORE; /* Suppress warning about unused %extra_argument var */
-}
-
-/*
-** Print tracing information for a SHIFT action
-*/
-#ifndef NDEBUG
-static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){
-  if( yyTraceFILE ){
-    if( yyNewState<YYNSTATE ){
-      fprintf(yyTraceFILE,"%s%s '%s', go to state %d\n",
-         yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major],
-         yyNewState);
-    }else{
-      fprintf(yyTraceFILE,"%s%s '%s', pending reduce %d\n",
-         yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major],
-         yyNewState - YY_MIN_REDUCE);
-    }
-  }
-}
-#else
-# define yyTraceShift(X,Y,Z)
-#endif
-
-/*
-** Perform a shift action.
-*/
-static void yy_shift(
-  yyParser *yypParser,          /* The parser to be shifted */
-  int yyNewState,               /* The new state to shift in */
-  int yyMajor,                  /* The major token to shift in */
-  ParseTOKENTYPE yyMinor        /* The minor token to shift in */
-){
-  yyStackEntry *yytos;
-  yypParser->yytos++;
-#ifdef YYTRACKMAXSTACKDEPTH
-  if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){
-    yypParser->yyhwm++;
-    assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack) );
-  }
-#endif
-#if YYSTACKDEPTH>0 
-  if( yypParser->yytos>yypParser->yystackEnd ){
-    yypParser->yytos--;
-    yyStackOverflow(yypParser);
-    return;
-  }
-#else
-  if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){
-    if( yyGrowStack(yypParser) ){
-      yypParser->yytos--;
-      yyStackOverflow(yypParser);
-      return;
-    }
-  }
-#endif
-  if( yyNewState > YY_MAX_SHIFT ){
-    yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE;
-  }
-  yytos = yypParser->yytos;
-  yytos->stateno = (YYACTIONTYPE)yyNewState;
-  yytos->major = (YYCODETYPE)yyMajor;
-  yytos->minor.yy0 = yyMinor;
-  yyTraceShift(yypParser, yyNewState, "Shift");
-}
-
-/* The following table contains information about every rule that
-** is used during the reduce.
-*/
-static const struct {
-  YYCODETYPE lhs;       /* Symbol on the left-hand side of the rule */
-  signed char nrhs;     /* Negative of the number of RHS symbols in the rule */
-} yyRuleInfo[] = {
-  {  204,   -1 }, /* (0) program ::= cmd */
-  {  205,   -2 }, /* (1) cmd ::= SHOW DATABASES */
-  {  205,   -2 }, /* (2) cmd ::= SHOW MNODES */
-  {  205,   -2 }, /* (3) cmd ::= SHOW DNODES */
-  {  205,   -2 }, /* (4) cmd ::= SHOW ACCOUNTS */
-  {  205,   -2 }, /* (5) cmd ::= SHOW USERS */
-  {  205,   -2 }, /* (6) cmd ::= SHOW MODULES */
-  {  205,   -2 }, /* (7) cmd ::= SHOW QUERIES */
-  {  205,   -2 }, /* (8) cmd ::= SHOW CONNECTIONS */
-  {  205,   -2 }, /* (9) cmd ::= SHOW STREAMS */
-  {  205,   -2 }, /* (10) cmd ::= SHOW CONFIGS */
-  {  205,   -2 }, /* (11) cmd ::= SHOW SCORES */
-  {  205,   -2 }, /* (12) cmd ::= SHOW GRANTS */
-  {  205,   -2 }, /* (13) cmd ::= SHOW VNODES */
-  {  205,   -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */
-  {  206,    0 }, /* (15) dbPrefix ::= */
-  {  206,   -2 }, /* (16) dbPrefix ::= ids DOT */
-  {  208,    0 }, /* (17) cpxName ::= */
-  {  208,   -2 }, /* (18) cpxName ::= DOT ids */
-  {  205,   -3 }, /* (19) cmd ::= SHOW dbPrefix TABLES */
-  {  205,   -5 }, /* (20) cmd ::= SHOW dbPrefix TABLES LIKE ids */
-  {  205,   -3 }, /* (21) cmd ::= SHOW dbPrefix STABLES */
-  {  205,   -5 }, /* (22) cmd ::= SHOW dbPrefix STABLES LIKE ids */
-  {  205,   -3 }, /* (23) cmd ::= SHOW dbPrefix VGROUPS */
-  {  205,   -4 }, /* (24) cmd ::= SHOW dbPrefix VGROUPS ids */
-  {  205,   -5 }, /* (25) cmd ::= DROP TABLE ifexists ids cpxName */
-  {  205,   -4 }, /* (26) cmd ::= DROP DATABASE ifexists ids */
-  {  205,   -3 }, /* (27) cmd ::= DROP DNODE IPTOKEN */
-  {  205,   -3 }, /* (28) cmd ::= DROP USER ids */
-  {  205,   -3 }, /* (29) cmd ::= DROP ACCOUNT ids */
-  {  205,   -2 }, /* (30) cmd ::= USE ids */
-  {  205,   -3 }, /* (31) cmd ::= DESCRIBE ids cpxName */
-  {  205,   -5 }, /* (32) cmd ::= ALTER USER ids PASS ids */
-  {  205,   -5 }, /* (33) cmd ::= ALTER USER ids PRIVILEGE ids */
-  {  205,   -4 }, /* (34) cmd ::= ALTER DNODE IPTOKEN ids */
-  {  205,   -5 }, /* (35) cmd ::= ALTER DNODE IPTOKEN ids ids */
-  {  205,   -3 }, /* (36) cmd ::= ALTER LOCAL ids */
-  {  205,   -4 }, /* (37) cmd ::= ALTER LOCAL ids ids */
-  {  205,   -4 }, /* (38) cmd ::= ALTER DATABASE ids alter_db_optr */
-  {  205,   -4 }, /* (39) cmd ::= ALTER ACCOUNT ids acct_optr */
-  {  205,   -6 }, /* (40) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
-  {  207,   -1 }, /* (41) ids ::= ID */
-  {  207,   -1 }, /* (42) ids ::= STRING */
-  {  209,   -2 }, /* (43) ifexists ::= IF EXISTS */
-  {  209,    0 }, /* (44) ifexists ::= */
-  {  212,   -3 }, /* (45) ifnotexists ::= IF NOT EXISTS */
-  {  212,    0 }, /* (46) ifnotexists ::= */
-  {  205,   -3 }, /* (47) cmd ::= CREATE DNODE IPTOKEN */
-  {  205,   -6 }, /* (48) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
-  {  205,   -5 }, /* (49) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
-  {  205,   -5 }, /* (50) cmd ::= CREATE USER ids PASS ids */
-  {  214,    0 }, /* (51) pps ::= */
-  {  214,   -2 }, /* (52) pps ::= PPS INTEGER */
-  {  215,    0 }, /* (53) tseries ::= */
-  {  215,   -2 }, /* (54) tseries ::= TSERIES INTEGER */
-  {  216,    0 }, /* (55) dbs ::= */
-  {  216,   -2 }, /* (56) dbs ::= DBS INTEGER */
-  {  217,    0 }, /* (57) streams ::= */
-  {  217,   -2 }, /* (58) streams ::= STREAMS INTEGER */
-  {  218,    0 }, /* (59) storage ::= */
-  {  218,   -2 }, /* (60) storage ::= STORAGE INTEGER */
-  {  219,    0 }, /* (61) qtime ::= */
-  {  219,   -2 }, /* (62) qtime ::= QTIME INTEGER */
-  {  220,    0 }, /* (63) users ::= */
-  {  220,   -2 }, /* (64) users ::= USERS INTEGER */
-  {  221,    0 }, /* (65) conns ::= */
-  {  221,   -2 }, /* (66) conns ::= CONNS INTEGER */
-  {  222,    0 }, /* (67) state ::= */
-  {  222,   -2 }, /* (68) state ::= STATE ids */
-  {  211,   -9 }, /* (69) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
-  {  223,   -2 }, /* (70) keep ::= KEEP tagitemlist */
-  {  225,   -2 }, /* (71) tables ::= TABLES INTEGER */
-  {  226,   -2 }, /* (72) cache ::= CACHE INTEGER */
-  {  227,   -2 }, /* (73) replica ::= REPLICA INTEGER */
-  {  228,   -2 }, /* (74) days ::= DAYS INTEGER */
-  {  229,   -2 }, /* (75) rows ::= ROWS INTEGER */
-  {  230,   -2 }, /* (76) ablocks ::= ABLOCKS ID */
-  {  231,   -2 }, /* (77) tblocks ::= TBLOCKS INTEGER */
-  {  232,   -2 }, /* (78) ctime ::= CTIME INTEGER */
-  {  233,   -2 }, /* (79) clog ::= CLOG INTEGER */
-  {  234,   -2 }, /* (80) comp ::= COMP INTEGER */
-  {  235,   -2 }, /* (81) prec ::= PRECISION STRING */
-  {  213,    0 }, /* (82) db_optr ::= */
-  {  213,   -2 }, /* (83) db_optr ::= db_optr tables */
-  {  213,   -2 }, /* (84) db_optr ::= db_optr cache */
-  {  213,   -2 }, /* (85) db_optr ::= db_optr replica */
-  {  213,   -2 }, /* (86) db_optr ::= db_optr days */
-  {  213,   -2 }, /* (87) db_optr ::= db_optr rows */
-  {  213,   -2 }, /* (88) db_optr ::= db_optr ablocks */
-  {  213,   -2 }, /* (89) db_optr ::= db_optr tblocks */
-  {  213,   -2 }, /* (90) db_optr ::= db_optr ctime */
-  {  213,   -2 }, /* (91) db_optr ::= db_optr clog */
-  {  213,   -2 }, /* (92) db_optr ::= db_optr comp */
-  {  213,   -2 }, /* (93) db_optr ::= db_optr prec */
-  {  213,   -2 }, /* (94) db_optr ::= db_optr keep */
-  {  210,    0 }, /* (95) alter_db_optr ::= */
-  {  210,   -2 }, /* (96) alter_db_optr ::= alter_db_optr replica */
-  {  210,   -2 }, /* (97) alter_db_optr ::= alter_db_optr tables */
-  {  236,   -1 }, /* (98) typename ::= ids */
-  {  236,   -4 }, /* (99) typename ::= ids LP signed RP */
-  {  237,   -1 }, /* (100) signed ::= INTEGER */
-  {  237,   -2 }, /* (101) signed ::= PLUS INTEGER */
-  {  237,   -2 }, /* (102) signed ::= MINUS INTEGER */
-  {  205,   -6 }, /* (103) cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
-  {  238,   -3 }, /* (104) create_table_args ::= LP columnlist RP */
-  {  238,   -7 }, /* (105) create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
-  {  238,   -7 }, /* (106) create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
-  {  238,   -2 }, /* (107) create_table_args ::= AS select */
-  {  239,   -3 }, /* (108) columnlist ::= columnlist COMMA column */
-  {  239,   -1 }, /* (109) columnlist ::= column */
-  {  241,   -2 }, /* (110) column ::= ids typename */
-  {  224,   -3 }, /* (111) tagitemlist ::= tagitemlist COMMA tagitem */
-  {  224,   -1 }, /* (112) tagitemlist ::= tagitem */
-  {  242,   -1 }, /* (113) tagitem ::= INTEGER */
-  {  242,   -1 }, /* (114) tagitem ::= FLOAT */
-  {  242,   -1 }, /* (115) tagitem ::= STRING */
-  {  242,   -1 }, /* (116) tagitem ::= BOOL */
-  {  242,   -1 }, /* (117) tagitem ::= NULL */
-  {  242,   -2 }, /* (118) tagitem ::= MINUS INTEGER */
-  {  242,   -2 }, /* (119) tagitem ::= MINUS FLOAT */
-  {  242,   -2 }, /* (120) tagitem ::= PLUS INTEGER */
-  {  242,   -2 }, /* (121) tagitem ::= PLUS FLOAT */
-  {  240,  -12 }, /* (122) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
-  {  254,   -1 }, /* (123) union ::= select */
-  {  254,   -3 }, /* (124) union ::= LP union RP */
-  {  254,   -4 }, /* (125) union ::= union UNION ALL select */
-  {  254,   -6 }, /* (126) union ::= union UNION ALL LP select RP */
-  {  205,   -1 }, /* (127) cmd ::= union */
-  {  240,   -2 }, /* (128) select ::= SELECT selcollist */
-  {  255,   -2 }, /* (129) sclp ::= selcollist COMMA */
-  {  255,    0 }, /* (130) sclp ::= */
-  {  243,   -3 }, /* (131) selcollist ::= sclp expr as */
-  {  243,   -2 }, /* (132) selcollist ::= sclp STAR */
-  {  257,   -2 }, /* (133) as ::= AS ids */
-  {  257,   -1 }, /* (134) as ::= ids */
-  {  257,    0 }, /* (135) as ::= */
-  {  244,   -2 }, /* (136) from ::= FROM tablelist */
-  {  258,   -2 }, /* (137) tablelist ::= ids cpxName */
-  {  258,   -4 }, /* (138) tablelist ::= tablelist COMMA ids cpxName */
-  {  259,   -1 }, /* (139) tmvar ::= VARIABLE */
-  {  246,   -4 }, /* (140) interval_opt ::= INTERVAL LP tmvar RP */
-  {  246,    0 }, /* (141) interval_opt ::= */
-  {  247,    0 }, /* (142) fill_opt ::= */
-  {  247,   -6 }, /* (143) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
-  {  247,   -4 }, /* (144) fill_opt ::= FILL LP ID RP */
-  {  248,   -4 }, /* (145) sliding_opt ::= SLIDING LP tmvar RP */
-  {  248,    0 }, /* (146) sliding_opt ::= */
-  {  250,    0 }, /* (147) orderby_opt ::= */
-  {  250,   -3 }, /* (148) orderby_opt ::= ORDER BY sortlist */
-  {  260,   -4 }, /* (149) sortlist ::= sortlist COMMA item sortorder */
-  {  260,   -2 }, /* (150) sortlist ::= item sortorder */
-  {  262,   -2 }, /* (151) item ::= ids cpxName */
-  {  263,   -1 }, /* (152) sortorder ::= ASC */
-  {  263,   -1 }, /* (153) sortorder ::= DESC */
-  {  263,    0 }, /* (154) sortorder ::= */
-  {  249,    0 }, /* (155) groupby_opt ::= */
-  {  249,   -3 }, /* (156) groupby_opt ::= GROUP BY grouplist */
-  {  264,   -3 }, /* (157) grouplist ::= grouplist COMMA item */
-  {  264,   -1 }, /* (158) grouplist ::= item */
-  {  251,    0 }, /* (159) having_opt ::= */
-  {  251,   -2 }, /* (160) having_opt ::= HAVING expr */
-  {  253,    0 }, /* (161) limit_opt ::= */
-  {  253,   -2 }, /* (162) limit_opt ::= LIMIT signed */
-  {  253,   -4 }, /* (163) limit_opt ::= LIMIT signed OFFSET signed */
-  {  253,   -4 }, /* (164) limit_opt ::= LIMIT signed COMMA signed */
-  {  252,    0 }, /* (165) slimit_opt ::= */
-  {  252,   -2 }, /* (166) slimit_opt ::= SLIMIT signed */
-  {  252,   -4 }, /* (167) slimit_opt ::= SLIMIT signed SOFFSET signed */
-  {  252,   -4 }, /* (168) slimit_opt ::= SLIMIT signed COMMA signed */
-  {  245,    0 }, /* (169) where_opt ::= */
-  {  245,   -2 }, /* (170) where_opt ::= WHERE expr */
-  {  256,   -3 }, /* (171) expr ::= LP expr RP */
-  {  256,   -1 }, /* (172) expr ::= ID */
-  {  256,   -3 }, /* (173) expr ::= ID DOT ID */
-  {  256,   -3 }, /* (174) expr ::= ID DOT STAR */
-  {  256,   -1 }, /* (175) expr ::= INTEGER */
-  {  256,   -2 }, /* (176) expr ::= MINUS INTEGER */
-  {  256,   -2 }, /* (177) expr ::= PLUS INTEGER */
-  {  256,   -1 }, /* (178) expr ::= FLOAT */
-  {  256,   -2 }, /* (179) expr ::= MINUS FLOAT */
-  {  256,   -2 }, /* (180) expr ::= PLUS FLOAT */
-  {  256,   -1 }, /* (181) expr ::= STRING */
-  {  256,   -1 }, /* (182) expr ::= NOW */
-  {  256,   -1 }, /* (183) expr ::= VARIABLE */
-  {  256,   -1 }, /* (184) expr ::= BOOL */
-  {  256,   -4 }, /* (185) expr ::= ID LP exprlist RP */
-  {  256,   -4 }, /* (186) expr ::= ID LP STAR RP */
-  {  256,   -3 }, /* (187) expr ::= expr AND expr */
-  {  256,   -3 }, /* (188) expr ::= expr OR expr */
-  {  256,   -3 }, /* (189) expr ::= expr LT expr */
-  {  256,   -3 }, /* (190) expr ::= expr GT expr */
-  {  256,   -3 }, /* (191) expr ::= expr LE expr */
-  {  256,   -3 }, /* (192) expr ::= expr GE expr */
-  {  256,   -3 }, /* (193) expr ::= expr NE expr */
-  {  256,   -3 }, /* (194) expr ::= expr EQ expr */
-  {  256,   -3 }, /* (195) expr ::= expr PLUS expr */
-  {  256,   -3 }, /* (196) expr ::= expr MINUS expr */
-  {  256,   -3 }, /* (197) expr ::= expr STAR expr */
-  {  256,   -3 }, /* (198) expr ::= expr SLASH expr */
-  {  256,   -3 }, /* (199) expr ::= expr REM expr */
-  {  256,   -3 }, /* (200) expr ::= expr LIKE expr */
-  {  256,   -5 }, /* (201) expr ::= expr IN LP exprlist RP */
-  {  265,   -3 }, /* (202) exprlist ::= exprlist COMMA expritem */
-  {  265,   -1 }, /* (203) exprlist ::= expritem */
-  {  266,   -1 }, /* (204) expritem ::= expr */
-  {  266,    0 }, /* (205) expritem ::= */
-  {  205,   -3 }, /* (206) cmd ::= RESET QUERY CACHE */
-  {  205,   -7 }, /* (207) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
-  {  205,   -7 }, /* (208) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
-  {  205,   -7 }, /* (209) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
-  {  205,   -7 }, /* (210) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
-  {  205,   -8 }, /* (211) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
-  {  205,   -9 }, /* (212) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
-  {  205,   -5 }, /* (213) cmd ::= KILL CONNECTION IPTOKEN COLON INTEGER */
-  {  205,   -7 }, /* (214) cmd ::= KILL STREAM IPTOKEN COLON INTEGER COLON INTEGER */
-  {  205,   -7 }, /* (215) cmd ::= KILL QUERY IPTOKEN COLON INTEGER COLON INTEGER */
-};
-
-static void yy_accept(yyParser*);  /* Forward Declaration */
-
-/*
-** Perform a reduce action and the shift that must immediately
-** follow the reduce.
-**
-** The yyLookahead and yyLookaheadToken parameters provide reduce actions
-** access to the lookahead token (if any).  The yyLookahead will be YYNOCODE
-** if the lookahead token has already been consumed.  As this procedure is
-** only called from one place, optimizing compilers will in-line it, which
-** means that the extra parameters have no performance impact.
-*/
-static void yy_reduce(
-  yyParser *yypParser,         /* The parser */
-  unsigned int yyruleno,       /* Number of the rule by which to reduce */
-  int yyLookahead,             /* Lookahead token, or YYNOCODE if none */
-  ParseTOKENTYPE yyLookaheadToken  /* Value of the lookahead token */
-){
-  int yygoto;                     /* The next state */
-  int yyact;                      /* The next action */
-  yyStackEntry *yymsp;            /* The top of the parser's stack */
-  int yysize;                     /* Amount to pop the stack */
-  ParseARG_FETCH;
-  (void)yyLookahead;
-  (void)yyLookaheadToken;
-  yymsp = yypParser->yytos;
-#ifndef NDEBUG
-  if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
-    yysize = yyRuleInfo[yyruleno].nrhs;
-    if( yysize ){
-      fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n",
-        yyTracePrompt,
-        yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno);
-    }else{
-      fprintf(yyTraceFILE, "%sReduce %d [%s].\n",
-        yyTracePrompt, yyruleno, yyRuleName[yyruleno]);
-    }
-  }
-#endif /* NDEBUG */
-
-  /* Check that the stack is large enough to grow by a single entry
-  ** if the RHS of the rule is empty.  This ensures that there is room
-  ** enough on the stack to push the LHS value */
-  if( yyRuleInfo[yyruleno].nrhs==0 ){
-#ifdef YYTRACKMAXSTACKDEPTH
-    if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){
-      yypParser->yyhwm++;
-      assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack));
-    }
-#endif
-#if YYSTACKDEPTH>0 
-    if( yypParser->yytos>=yypParser->yystackEnd ){
-      yyStackOverflow(yypParser);
-      return;
-    }
-#else
-    if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){
-      if( yyGrowStack(yypParser) ){
-        yyStackOverflow(yypParser);
-        return;
-      }
-      yymsp = yypParser->yytos;
-    }
-#endif
-  }
-
-  switch( yyruleno ){
-  /* Beginning here are the reduction cases.  A typical example
-  ** follows:
-  **   case 0:
-  **  #line <lineno> <grammarfile>
-  **     { ... }           // User supplied code
-  **  #line <lineno> <thisfile>
-  **     break;
-  */
-/********** Begin reduce actions **********************************************/
-        YYMINORTYPE yylhsminor;
-      case 0: /* program ::= cmd */
-{}
-        break;
-      case 1: /* cmd ::= SHOW DATABASES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);}
-        break;
-      case 2: /* cmd ::= SHOW MNODES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);}
-        break;
-      case 3: /* cmd ::= SHOW DNODES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);}
-        break;
-      case 4: /* cmd ::= SHOW ACCOUNTS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);}
-        break;
-      case 5: /* cmd ::= SHOW USERS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);}
-        break;
-      case 6: /* cmd ::= SHOW MODULES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0);  }
-        break;
-      case 7: /* cmd ::= SHOW QUERIES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0);  }
-        break;
-      case 8: /* cmd ::= SHOW CONNECTIONS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);}
-        break;
-      case 9: /* cmd ::= SHOW STREAMS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0);  }
-        break;
-      case 10: /* cmd ::= SHOW CONFIGS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONFIGS, 0, 0);  }
-        break;
-      case 11: /* cmd ::= SHOW SCORES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0);   }
-        break;
-      case 12: /* cmd ::= SHOW GRANTS */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0);   }
-        break;
-      case 13: /* cmd ::= SHOW VNODES */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); }
-        break;
-      case 14: /* cmd ::= SHOW VNODES IPTOKEN */
-{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); }
-        break;
-      case 15: /* dbPrefix ::= */
-{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;}
-        break;
-      case 16: /* dbPrefix ::= ids DOT */
-{yylhsminor.yy0 = yymsp[-1].minor.yy0;  }
-  yymsp[-1].minor.yy0 = yylhsminor.yy0;
-        break;
-      case 17: /* cpxName ::= */
-{yymsp[1].minor.yy0.n = 0;  }
-        break;
-      case 18: /* cpxName ::= DOT ids */
-{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1;    }
-        break;
-      case 19: /* cmd ::= SHOW dbPrefix TABLES */
-{
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0);
-}
-        break;
-      case 20: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */
-{
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
-}
-        break;
-      case 21: /* cmd ::= SHOW dbPrefix STABLES */
-{
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0);
-}
-        break;
-      case 22: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */
-{
-    SSQLToken token;
-    setDBName(&token, &yymsp[-3].minor.yy0);
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &yymsp[0].minor.yy0);
-}
-        break;
-      case 23: /* cmd ::= SHOW dbPrefix VGROUPS */
-{
-    SSQLToken token;
-    setDBName(&token, &yymsp[-1].minor.yy0);
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
-}
-        break;
-      case 24: /* cmd ::= SHOW dbPrefix VGROUPS ids */
-{
-    SSQLToken token;
-    setDBName(&token, &yymsp[-2].minor.yy0);    
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &yymsp[0].minor.yy0);
-}
-        break;
-      case 25: /* cmd ::= DROP TABLE ifexists ids cpxName */
-{
-    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-    setDropDBTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0);
-}
-        break;
-      case 26: /* cmd ::= DROP DATABASE ifexists ids */
-{ setDropDBTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0); }
-        break;
-      case 27: /* cmd ::= DROP DNODE IPTOKEN */
-{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0);    }
-        break;
-      case 28: /* cmd ::= DROP USER ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0);     }
-        break;
-      case 29: /* cmd ::= DROP ACCOUNT ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0);  }
-        break;
-      case 30: /* cmd ::= USE ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);}
-        break;
-      case 31: /* cmd ::= DESCRIBE ids cpxName */
-{
-    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-    setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0);
-}
-        break;
-      case 32: /* cmd ::= ALTER USER ids PASS ids */
-{ setAlterUserSQL(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL);    }
-        break;
-      case 33: /* cmd ::= ALTER USER ids PRIVILEGE ids */
-{ setAlterUserSQL(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);}
-        break;
-      case 34: /* cmd ::= ALTER DNODE IPTOKEN ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);          }
-        break;
-      case 35: /* cmd ::= ALTER DNODE IPTOKEN ids ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);      }
-        break;
-      case 36: /* cmd ::= ALTER LOCAL ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0);              }
-        break;
-      case 37: /* cmd ::= ALTER LOCAL ids ids */
-{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);          }
-        break;
-      case 38: /* cmd ::= ALTER DATABASE ids alter_db_optr */
-{ SSQLToken t = {0};  setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy532, &t);}
-        break;
-      case 39: /* cmd ::= ALTER ACCOUNT ids acct_optr */
-{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy239);}
-        break;
-      case 40: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy239);}
-        break;
-      case 41: /* ids ::= ID */
-      case 42: /* ids ::= STRING */ yytestcase(yyruleno==42);
-{yylhsminor.yy0 = yymsp[0].minor.yy0; }
-  yymsp[0].minor.yy0 = yylhsminor.yy0;
-        break;
-      case 43: /* ifexists ::= IF EXISTS */
-{yymsp[-1].minor.yy0.n = 1;}
-        break;
-      case 44: /* ifexists ::= */
-      case 46: /* ifnotexists ::= */ yytestcase(yyruleno==46);
-{yymsp[1].minor.yy0.n = 0;}
-        break;
-      case 45: /* ifnotexists ::= IF NOT EXISTS */
-{yymsp[-2].minor.yy0.n = 1;}
-        break;
-      case 47: /* cmd ::= CREATE DNODE IPTOKEN */
-{ setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
-        break;
-      case 48: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
-{ setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy239);}
-        break;
-      case 49: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
-{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy532, &yymsp[-2].minor.yy0);}
-        break;
-      case 50: /* cmd ::= CREATE USER ids PASS ids */
-{ setCreateUserSQL(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
-        break;
-      case 51: /* pps ::= */
-      case 53: /* tseries ::= */ yytestcase(yyruleno==53);
-      case 55: /* dbs ::= */ yytestcase(yyruleno==55);
-      case 57: /* streams ::= */ yytestcase(yyruleno==57);
-      case 59: /* storage ::= */ yytestcase(yyruleno==59);
-      case 61: /* qtime ::= */ yytestcase(yyruleno==61);
-      case 63: /* users ::= */ yytestcase(yyruleno==63);
-      case 65: /* conns ::= */ yytestcase(yyruleno==65);
-      case 67: /* state ::= */ yytestcase(yyruleno==67);
-{yymsp[1].minor.yy0.n = 0;   }
-        break;
-      case 52: /* pps ::= PPS INTEGER */
-      case 54: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==54);
-      case 56: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==56);
-      case 58: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==58);
-      case 60: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==60);
-      case 62: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==62);
-      case 64: /* users ::= USERS INTEGER */ yytestcase(yyruleno==64);
-      case 66: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==66);
-      case 68: /* state ::= STATE ids */ yytestcase(yyruleno==68);
-{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;     }
-        break;
-      case 69: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
-{
-    yylhsminor.yy239.maxUsers   = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
-    yylhsminor.yy239.maxDbs     = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
-    yylhsminor.yy239.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
-    yylhsminor.yy239.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
-    yylhsminor.yy239.maxPointsPerSecond     = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
-    yylhsminor.yy239.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
-    yylhsminor.yy239.maxQueryTime   = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
-    yylhsminor.yy239.maxConnections   = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
-    yylhsminor.yy239.stat    = yymsp[0].minor.yy0;
-}
-  yymsp[-8].minor.yy239 = yylhsminor.yy239;
-        break;
-      case 70: /* keep ::= KEEP tagitemlist */
-{ yymsp[-1].minor.yy30 = yymsp[0].minor.yy30; }
-        break;
-      case 71: /* tables ::= TABLES INTEGER */
-      case 72: /* cache ::= CACHE INTEGER */ yytestcase(yyruleno==72);
-      case 73: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==73);
-      case 74: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==74);
-      case 75: /* rows ::= ROWS INTEGER */ yytestcase(yyruleno==75);
-      case 76: /* ablocks ::= ABLOCKS ID */ yytestcase(yyruleno==76);
-      case 77: /* tblocks ::= TBLOCKS INTEGER */ yytestcase(yyruleno==77);
-      case 78: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==78);
-      case 79: /* clog ::= CLOG INTEGER */ yytestcase(yyruleno==79);
-      case 80: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==80);
-      case 81: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==81);
-{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
-        break;
-      case 82: /* db_optr ::= */
-{setDefaultCreateDbOption(&yymsp[1].minor.yy532);}
-        break;
-      case 83: /* db_optr ::= db_optr tables */
-      case 97: /* alter_db_optr ::= alter_db_optr tables */ yytestcase(yyruleno==97);
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.tablesPerVnode = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 84: /* db_optr ::= db_optr cache */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 85: /* db_optr ::= db_optr replica */
-      case 96: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==96);
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 86: /* db_optr ::= db_optr days */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 87: /* db_optr ::= db_optr rows */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.rowPerFileBlock = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 88: /* db_optr ::= db_optr ablocks */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.numOfAvgCacheBlocks = strtod(yymsp[0].minor.yy0.z, NULL); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 89: /* db_optr ::= db_optr tblocks */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.numOfBlocksPerTable = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 90: /* db_optr ::= db_optr ctime */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 91: /* db_optr ::= db_optr clog */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.commitLog = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 92: /* db_optr ::= db_optr comp */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 93: /* db_optr ::= db_optr prec */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.precision = yymsp[0].minor.yy0; }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 94: /* db_optr ::= db_optr keep */
-{ yylhsminor.yy532 = yymsp[-1].minor.yy532; yylhsminor.yy532.keep = yymsp[0].minor.yy30; }
-  yymsp[-1].minor.yy532 = yylhsminor.yy532;
-        break;
-      case 95: /* alter_db_optr ::= */
-{ setDefaultCreateDbOption(&yymsp[1].minor.yy532);}
-        break;
-      case 98: /* typename ::= ids */
-{ tSQLSetColumnType (&yylhsminor.yy505, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy505 = yylhsminor.yy505;
-        break;
-      case 99: /* typename ::= ids LP signed RP */
-{
-    yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy489;          // negative value of name length
-    tSQLSetColumnType(&yylhsminor.yy505, &yymsp[-3].minor.yy0);
-}
-  yymsp[-3].minor.yy505 = yylhsminor.yy505;
-        break;
-      case 100: /* signed ::= INTEGER */
-{ yylhsminor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-  yymsp[0].minor.yy489 = yylhsminor.yy489;
-        break;
-      case 101: /* signed ::= PLUS INTEGER */
-{ yymsp[-1].minor.yy489 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
-        break;
-      case 102: /* signed ::= MINUS INTEGER */
-{ yymsp[-1].minor.yy489 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
-        break;
-      case 103: /* cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
-{
-    yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
-    setCreatedMeterName(pInfo, &yymsp[-2].minor.yy0, &yymsp[-3].minor.yy0);
-}
-        break;
-      case 104: /* create_table_args ::= LP columnlist RP */
-{
-    yymsp[-2].minor.yy212 = tSetCreateSQLElems(yymsp[-1].minor.yy325, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE);
-    setSQLInfo(pInfo, yymsp[-2].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
-}
-        break;
-      case 105: /* create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
-{
-    yymsp[-6].minor.yy212 = tSetCreateSQLElems(yymsp[-5].minor.yy325, yymsp[-1].minor.yy325, NULL, NULL, NULL, TSQL_CREATE_STABLE);
-    setSQLInfo(pInfo, yymsp[-6].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
-}
-        break;
-      case 106: /* create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
-{
-    yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
-    yymsp[-6].minor.yy212 = tSetCreateSQLElems(NULL, NULL, &yymsp[-5].minor.yy0, yymsp[-1].minor.yy30, NULL, TSQL_CREATE_TABLE_FROM_STABLE);
-    setSQLInfo(pInfo, yymsp[-6].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
-}
-        break;
-      case 107: /* create_table_args ::= AS select */
-{
-    yymsp[-1].minor.yy212 = tSetCreateSQLElems(NULL, NULL, NULL, NULL, yymsp[0].minor.yy444, TSQL_CREATE_STREAM);
-    setSQLInfo(pInfo, yymsp[-1].minor.yy212, NULL, TSDB_SQL_CREATE_TABLE);
-}
-        break;
-      case 108: /* columnlist ::= columnlist COMMA column */
-{yylhsminor.yy325 = tFieldListAppend(yymsp[-2].minor.yy325, &yymsp[0].minor.yy505);   }
-  yymsp[-2].minor.yy325 = yylhsminor.yy325;
-        break;
-      case 109: /* columnlist ::= column */
-{yylhsminor.yy325 = tFieldListAppend(NULL, &yymsp[0].minor.yy505);}
-  yymsp[0].minor.yy325 = yylhsminor.yy325;
-        break;
-      case 110: /* column ::= ids typename */
-{
-    tSQLSetColumnInfo(&yylhsminor.yy505, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy505);
-}
-  yymsp[-1].minor.yy505 = yylhsminor.yy505;
-        break;
-      case 111: /* tagitemlist ::= tagitemlist COMMA tagitem */
-{ yylhsminor.yy30 = tVariantListAppend(yymsp[-2].minor.yy30, &yymsp[0].minor.yy380, -1);    }
-  yymsp[-2].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 112: /* tagitemlist ::= tagitem */
-{ yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1); }
-  yymsp[0].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 113: /* tagitem ::= INTEGER */
-      case 114: /* tagitem ::= FLOAT */ yytestcase(yyruleno==114);
-      case 115: /* tagitem ::= STRING */ yytestcase(yyruleno==115);
-      case 116: /* tagitem ::= BOOL */ yytestcase(yyruleno==116);
-{toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy380 = yylhsminor.yy380;
-        break;
-      case 117: /* tagitem ::= NULL */
-{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy380, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy380 = yylhsminor.yy380;
-        break;
-      case 118: /* tagitem ::= MINUS INTEGER */
-      case 119: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==119);
-      case 120: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==120);
-      case 121: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==121);
-{
-    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-    yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
-    toTSDBType(yymsp[-1].minor.yy0.type);
-    tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
-}
-  yymsp[-1].minor.yy380 = yylhsminor.yy380;
-        break;
-      case 122: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
-{
-  yylhsminor.yy444 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy506, yymsp[-9].minor.yy30, yymsp[-8].minor.yy388, yymsp[-4].minor.yy30, yymsp[-3].minor.yy30, &yymsp[-7].minor.yy0, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy30, &yymsp[0].minor.yy150, &yymsp[-1].minor.yy150);
-}
-  yymsp[-11].minor.yy444 = yylhsminor.yy444;
-        break;
-      case 123: /* union ::= select */
-{ yylhsminor.yy309 = setSubclause(NULL, yymsp[0].minor.yy444); }
-  yymsp[0].minor.yy309 = yylhsminor.yy309;
-        break;
-      case 124: /* union ::= LP union RP */
-{ yymsp[-2].minor.yy309 = yymsp[-1].minor.yy309; }
-        break;
-      case 125: /* union ::= union UNION ALL select */
-{ yylhsminor.yy309 = appendSelectClause(yymsp[-3].minor.yy309, yymsp[0].minor.yy444); }
-  yymsp[-3].minor.yy309 = yylhsminor.yy309;
-        break;
-      case 126: /* union ::= union UNION ALL LP select RP */
-{ yylhsminor.yy309 = appendSelectClause(yymsp[-5].minor.yy309, yymsp[-1].minor.yy444); }
-  yymsp[-5].minor.yy309 = yylhsminor.yy309;
-        break;
-      case 127: /* cmd ::= union */
-{ setSQLInfo(pInfo, yymsp[0].minor.yy309, NULL, TSDB_SQL_SELECT); }
-        break;
-      case 128: /* select ::= SELECT selcollist */
-{
-  yylhsminor.yy444 = tSetQuerySQLElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy506, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-}
-  yymsp[-1].minor.yy444 = yylhsminor.yy444;
-        break;
-      case 129: /* sclp ::= selcollist COMMA */
-{yylhsminor.yy506 = yymsp[-1].minor.yy506;}
-  yymsp[-1].minor.yy506 = yylhsminor.yy506;
-        break;
-      case 130: /* sclp ::= */
-{yymsp[1].minor.yy506 = 0;}
-        break;
-      case 131: /* selcollist ::= sclp expr as */
-{
-   yylhsminor.yy506 = tSQLExprListAppend(yymsp[-2].minor.yy506, yymsp[-1].minor.yy388, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
-}
-  yymsp[-2].minor.yy506 = yylhsminor.yy506;
-        break;
-      case 132: /* selcollist ::= sclp STAR */
-{
-   tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL);
-   yylhsminor.yy506 = tSQLExprListAppend(yymsp[-1].minor.yy506, pNode, 0);
-}
-  yymsp[-1].minor.yy506 = yylhsminor.yy506;
-        break;
-      case 133: /* as ::= AS ids */
-{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;    }
-        break;
-      case 134: /* as ::= ids */
-{ yylhsminor.yy0 = yymsp[0].minor.yy0;    }
-  yymsp[0].minor.yy0 = yylhsminor.yy0;
-        break;
-      case 135: /* as ::= */
-{ yymsp[1].minor.yy0.n = 0;  }
-        break;
-      case 136: /* from ::= FROM tablelist */
-{yymsp[-1].minor.yy30 = yymsp[0].minor.yy30;}
-        break;
-      case 137: /* tablelist ::= ids cpxName */
-{ toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy30 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);}
-  yymsp[-1].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 138: /* tablelist ::= tablelist COMMA ids cpxName */
-{ toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy30 = tVariantListAppendToken(yymsp[-3].minor.yy30, &yymsp[-1].minor.yy0, -1);   }
-  yymsp[-3].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 139: /* tmvar ::= VARIABLE */
-{yylhsminor.yy0 = yymsp[0].minor.yy0;}
-  yymsp[0].minor.yy0 = yylhsminor.yy0;
-        break;
-      case 140: /* interval_opt ::= INTERVAL LP tmvar RP */
-      case 145: /* sliding_opt ::= SLIDING LP tmvar RP */ yytestcase(yyruleno==145);
-{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0;     }
-        break;
-      case 141: /* interval_opt ::= */
-      case 146: /* sliding_opt ::= */ yytestcase(yyruleno==146);
-{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0;   }
-        break;
-      case 142: /* fill_opt ::= */
-{yymsp[1].minor.yy30 = 0;     }
-        break;
-      case 143: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
-{
-    tVariant A = {0};
-    toTSDBType(yymsp[-3].minor.yy0.type);
-    tVariantCreate(&A, &yymsp[-3].minor.yy0);
-
-    tVariantListInsert(yymsp[-1].minor.yy30, &A, -1, 0);
-    yymsp[-5].minor.yy30 = yymsp[-1].minor.yy30;
-}
-        break;
-      case 144: /* fill_opt ::= FILL LP ID RP */
-{
-    toTSDBType(yymsp[-1].minor.yy0.type);
-    yymsp[-3].minor.yy30 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
-}
-        break;
-      case 147: /* orderby_opt ::= */
-      case 155: /* groupby_opt ::= */ yytestcase(yyruleno==155);
-{yymsp[1].minor.yy30 = 0;}
-        break;
-      case 148: /* orderby_opt ::= ORDER BY sortlist */
-      case 156: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==156);
-{yymsp[-2].minor.yy30 = yymsp[0].minor.yy30;}
-        break;
-      case 149: /* sortlist ::= sortlist COMMA item sortorder */
-{
-    yylhsminor.yy30 = tVariantListAppend(yymsp[-3].minor.yy30, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
-}
-  yymsp[-3].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 150: /* sortlist ::= item sortorder */
-{
-  yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[-1].minor.yy380, yymsp[0].minor.yy250);
-}
-  yymsp[-1].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 151: /* item ::= ids cpxName */
-{
-  toTSDBType(yymsp[-1].minor.yy0.type);
-  yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
-
-  tVariantCreate(&yylhsminor.yy380, &yymsp[-1].minor.yy0);
-}
-  yymsp[-1].minor.yy380 = yylhsminor.yy380;
-        break;
-      case 152: /* sortorder ::= ASC */
-{yymsp[0].minor.yy250 = TSQL_SO_ASC; }
-        break;
-      case 153: /* sortorder ::= DESC */
-{yymsp[0].minor.yy250 = TSQL_SO_DESC;}
-        break;
-      case 154: /* sortorder ::= */
-{yymsp[1].minor.yy250 = TSQL_SO_ASC;}
-        break;
-      case 157: /* grouplist ::= grouplist COMMA item */
-{
-  yylhsminor.yy30 = tVariantListAppend(yymsp[-2].minor.yy30, &yymsp[0].minor.yy380, -1);
-}
-  yymsp[-2].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 158: /* grouplist ::= item */
-{
-  yylhsminor.yy30 = tVariantListAppend(NULL, &yymsp[0].minor.yy380, -1);
-}
-  yymsp[0].minor.yy30 = yylhsminor.yy30;
-        break;
-      case 159: /* having_opt ::= */
-      case 169: /* where_opt ::= */ yytestcase(yyruleno==169);
-      case 205: /* expritem ::= */ yytestcase(yyruleno==205);
-{yymsp[1].minor.yy388 = 0;}
-        break;
-      case 160: /* having_opt ::= HAVING expr */
-      case 170: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==170);
-{yymsp[-1].minor.yy388 = yymsp[0].minor.yy388;}
-        break;
-      case 161: /* limit_opt ::= */
-      case 165: /* slimit_opt ::= */ yytestcase(yyruleno==165);
-{yymsp[1].minor.yy150.limit = -1; yymsp[1].minor.yy150.offset = 0;}
-        break;
-      case 162: /* limit_opt ::= LIMIT signed */
-      case 166: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==166);
-{yymsp[-1].minor.yy150.limit = yymsp[0].minor.yy489;  yymsp[-1].minor.yy150.offset = 0;}
-        break;
-      case 163: /* limit_opt ::= LIMIT signed OFFSET signed */
-      case 167: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==167);
-{yymsp[-3].minor.yy150.limit = yymsp[-2].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[0].minor.yy489;}
-        break;
-      case 164: /* limit_opt ::= LIMIT signed COMMA signed */
-      case 168: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==168);
-{yymsp[-3].minor.yy150.limit = yymsp[0].minor.yy489;  yymsp[-3].minor.yy150.offset = yymsp[-2].minor.yy489;}
-        break;
-      case 171: /* expr ::= LP expr RP */
-{yymsp[-2].minor.yy388 = yymsp[-1].minor.yy388; }
-        break;
-      case 172: /* expr ::= ID */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 173: /* expr ::= ID DOT ID */
-{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 174: /* expr ::= ID DOT STAR */
-{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 175: /* expr ::= INTEGER */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 176: /* expr ::= MINUS INTEGER */
-      case 177: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==177);
-{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);}
-  yymsp[-1].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 178: /* expr ::= FLOAT */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 179: /* expr ::= MINUS FLOAT */
-      case 180: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==180);
-{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);}
-  yymsp[-1].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 181: /* expr ::= STRING */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 182: /* expr ::= NOW */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); }
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 183: /* expr ::= VARIABLE */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 184: /* expr ::= BOOL */
-{yylhsminor.yy388 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 185: /* expr ::= ID LP exprlist RP */
-{
-  yylhsminor.yy388 = tSQLExprCreateFunction(yymsp[-1].minor.yy506, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type);
-}
-  yymsp[-3].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 186: /* expr ::= ID LP STAR RP */
-{
-  yylhsminor.yy388 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type);
-}
-  yymsp[-3].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 187: /* expr ::= expr AND expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_AND);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 188: /* expr ::= expr OR expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_OR); }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 189: /* expr ::= expr LT expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LT);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 190: /* expr ::= expr GT expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_GT);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 191: /* expr ::= expr LE expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LE);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 192: /* expr ::= expr GE expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_GE);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 193: /* expr ::= expr NE expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_NE);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 194: /* expr ::= expr EQ expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_EQ);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 195: /* expr ::= expr PLUS expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_PLUS);  }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 196: /* expr ::= expr MINUS expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_MINUS); }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 197: /* expr ::= expr STAR expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_STAR);  }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 198: /* expr ::= expr SLASH expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_DIVIDE);}
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 199: /* expr ::= expr REM expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_REM);   }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 200: /* expr ::= expr LIKE expr */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-2].minor.yy388, yymsp[0].minor.yy388, TK_LIKE);  }
-  yymsp[-2].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 201: /* expr ::= expr IN LP exprlist RP */
-{yylhsminor.yy388 = tSQLExprCreate(yymsp[-4].minor.yy388, (tSQLExpr*)yymsp[-1].minor.yy506, TK_IN); }
-  yymsp[-4].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 202: /* exprlist ::= exprlist COMMA expritem */
-{yylhsminor.yy506 = tSQLExprListAppend(yymsp[-2].minor.yy506,yymsp[0].minor.yy388,0);}
-  yymsp[-2].minor.yy506 = yylhsminor.yy506;
-        break;
-      case 203: /* exprlist ::= expritem */
-{yylhsminor.yy506 = tSQLExprListAppend(0,yymsp[0].minor.yy388,0);}
-  yymsp[0].minor.yy506 = yylhsminor.yy506;
-        break;
-      case 204: /* expritem ::= expr */
-{yylhsminor.yy388 = yymsp[0].minor.yy388;}
-  yymsp[0].minor.yy388 = yylhsminor.yy388;
-        break;
-      case 206: /* cmd ::= RESET QUERY CACHE */
-{ setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
-        break;
-      case 207: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
-{
-    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy325, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 208: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
-{
-    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-
-    toTSDBType(yymsp[0].minor.yy0.type);
-    tVariantList* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 209: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
-{
-    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy325, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 210: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
-{
-    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
-
-    toTSDBType(yymsp[0].minor.yy0.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 211: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
-{
-    yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
-
-    toTSDBType(yymsp[-1].minor.yy0.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
-
-    toTSDBType(yymsp[0].minor.yy0.type);
-    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 212: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
-{
-    yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
-
-    toTSDBType(yymsp[-2].minor.yy0.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
-    A = tVariantListAppend(A, &yymsp[0].minor.yy380, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-        break;
-      case 213: /* cmd ::= KILL CONNECTION IPTOKEN COLON INTEGER */
-{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[-2].minor.yy0);}
-        break;
-      case 214: /* cmd ::= KILL STREAM IPTOKEN COLON INTEGER COLON INTEGER */
-{yymsp[-4].minor.yy0.n += (yymsp[-3].minor.yy0.n + yymsp[-2].minor.yy0.n + yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-4].minor.yy0);}
-        break;
-      case 215: /* cmd ::= KILL QUERY IPTOKEN COLON INTEGER COLON INTEGER */
-{yymsp[-4].minor.yy0.n += (yymsp[-3].minor.yy0.n + yymsp[-2].minor.yy0.n + yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-4].minor.yy0);}
-        break;
-      default:
-        break;
-/********** End reduce actions ************************************************/
-  };
-  assert( yyruleno<sizeof(yyRuleInfo)/sizeof(yyRuleInfo[0]) );
-  yygoto = yyRuleInfo[yyruleno].lhs;
-  yysize = yyRuleInfo[yyruleno].nrhs;
-  yyact = yy_find_reduce_action(yymsp[yysize].stateno,(YYCODETYPE)yygoto);
-
-  /* There are no SHIFTREDUCE actions on nonterminals because the table
-  ** generator has simplified them to pure REDUCE actions. */
-  assert( !(yyact>YY_MAX_SHIFT && yyact<=YY_MAX_SHIFTREDUCE) );
-
-  /* It is not possible for a REDUCE to be followed by an error */
-  assert( yyact!=YY_ERROR_ACTION );
-
-  yymsp += yysize+1;
-  yypParser->yytos = yymsp;
-  yymsp->stateno = (YYACTIONTYPE)yyact;
-  yymsp->major = (YYCODETYPE)yygoto;
-  yyTraceShift(yypParser, yyact, "... then shift");
-}
-
-/*
-** The following code executes when the parse fails
-*/
-#ifndef YYNOERRORRECOVERY
-static void yy_parse_failed(
-  yyParser *yypParser           /* The parser */
-){
-  ParseARG_FETCH;
-#ifndef NDEBUG
-  if( yyTraceFILE ){
-    fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
-  }
-#endif
-  while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
-  /* Here code is inserted which will be executed whenever the
-  ** parser fails */
-/************ Begin %parse_failure code ***************************************/
-/************ End %parse_failure code *****************************************/
-  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
-}
-#endif /* YYNOERRORRECOVERY */
-
-/*
-** The following code executes when a syntax error first occurs.
-*/
-static void yy_syntax_error(
-  yyParser *yypParser,           /* The parser */
-  int yymajor,                   /* The major type of the error token */
-  ParseTOKENTYPE yyminor         /* The minor type of the error token */
-){
-  ParseARG_FETCH;
-#define TOKEN yyminor
-/************ Begin %syntax_error code ****************************************/
-
-  pInfo->valid = false;
-  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
-  int32_t len = 0;
-
-  if(TOKEN.z) {
-    char msg[] = "syntax error near \"%s\"";
-    int32_t sqlLen = strlen(&TOKEN.z[0]);
-
-    if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
-        char tmpstr[128] = {0};
-        memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
-        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
-    } else {
-        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
-    }
-
-  } else {
-    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
-  }
-
-  assert(len <= outputBufLen);
-/************ End %syntax_error code ******************************************/
-  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
-}
-
-/*
-** The following is executed when the parser accepts
-*/
-static void yy_accept(
-  yyParser *yypParser           /* The parser */
-){
-  ParseARG_FETCH;
-#ifndef NDEBUG
-  if( yyTraceFILE ){
-    fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
-  }
-#endif
-#ifndef YYNOERRORRECOVERY
-  yypParser->yyerrcnt = -1;
-#endif
-  assert( yypParser->yytos==yypParser->yystack );
-  /* Here code is inserted which will be executed whenever the
-  ** parser accepts */
-/*********** Begin %parse_accept code *****************************************/
-
-/*********** End %parse_accept code *******************************************/
-  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
-}
-
-/* The main parser program.
-** The first argument is a pointer to a structure obtained from
-** "ParseAlloc" which describes the current state of the parser.
-** The second argument is the major token number.  The third is
-** the minor token.  The fourth optional argument is whatever the
-** user wants (and specified in the grammar) and is available for
-** use by the action routines.
-**
-** Inputs:
-** <ul>
-** <li> A pointer to the parser (an opaque structure.)
-** <li> The major token number.
-** <li> The minor token number.
-** <li> An option argument of a grammar-specified type.
-** </ul>
-**
-** Outputs:
-** None.
-*/
-void Parse(
-  void *yyp,                   /* The parser */
-  int yymajor,                 /* The major token code number */
-  ParseTOKENTYPE yyminor       /* The value for the token */
-  ParseARG_PDECL               /* Optional %extra_argument parameter */
-){
-  YYMINORTYPE yyminorunion;
-  unsigned int yyact;   /* The parser action. */
-#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
-  int yyendofinput;     /* True if we are at the end of input */
-#endif
-#ifdef YYERRORSYMBOL
-  int yyerrorhit = 0;   /* True if yymajor has invoked an error */
-#endif
-  yyParser *yypParser;  /* The parser */
-
-  yypParser = (yyParser*)yyp;
-  assert( yypParser->yytos!=0 );
-#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
-  yyendofinput = (yymajor==0);
-#endif
-  ParseARG_STORE;
-
-#ifndef NDEBUG
-  if( yyTraceFILE ){
-    int stateno = yypParser->yytos->stateno;
-    if( stateno < YY_MIN_REDUCE ){
-      fprintf(yyTraceFILE,"%sInput '%s' in state %d\n",
-              yyTracePrompt,yyTokenName[yymajor],stateno);
-    }else{
-      fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n",
-              yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE);
-    }
-  }
-#endif
-
-  do{
-    yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor);
-    if( yyact >= YY_MIN_REDUCE ){
-      yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor);
-    }else if( yyact <= YY_MAX_SHIFTREDUCE ){
-      yy_shift(yypParser,yyact,yymajor,yyminor);
-#ifndef YYNOERRORRECOVERY
-      yypParser->yyerrcnt--;
-#endif
-      yymajor = YYNOCODE;
-    }else if( yyact==YY_ACCEPT_ACTION ){
-      yypParser->yytos--;
-      yy_accept(yypParser);
-      return;
-    }else{
-      assert( yyact == YY_ERROR_ACTION );
-      yyminorunion.yy0 = yyminor;
-#ifdef YYERRORSYMBOL
-      int yymx;
-#endif
-#ifndef NDEBUG
-      if( yyTraceFILE ){
-        fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt);
-      }
-#endif
-#ifdef YYERRORSYMBOL
-      /* A syntax error has occurred.
-      ** The response to an error depends upon whether or not the
-      ** grammar defines an error token "ERROR".  
-      **
-      ** This is what we do if the grammar does define ERROR:
-      **
-      **  * Call the %syntax_error function.
-      **
-      **  * Begin popping the stack until we enter a state where
-      **    it is legal to shift the error symbol, then shift
-      **    the error symbol.
-      **
-      **  * Set the error count to three.
-      **
-      **  * Begin accepting and shifting new tokens.  No new error
-      **    processing will occur until three tokens have been
-      **    shifted successfully.
-      **
-      */
-      if( yypParser->yyerrcnt<0 ){
-        yy_syntax_error(yypParser,yymajor,yyminor);
-      }
-      yymx = yypParser->yytos->major;
-      if( yymx==YYERRORSYMBOL || yyerrorhit ){
-#ifndef NDEBUG
-        if( yyTraceFILE ){
-          fprintf(yyTraceFILE,"%sDiscard input token %s\n",
-             yyTracePrompt,yyTokenName[yymajor]);
-        }
-#endif
-        yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion);
-        yymajor = YYNOCODE;
-      }else{
-        while( yypParser->yytos >= yypParser->yystack
-            && yymx != YYERRORSYMBOL
-            && (yyact = yy_find_reduce_action(
-                        yypParser->yytos->stateno,
-                        YYERRORSYMBOL)) >= YY_MIN_REDUCE
-        ){
-          yy_pop_parser_stack(yypParser);
-        }
-        if( yypParser->yytos < yypParser->yystack || yymajor==0 ){
-          yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
-          yy_parse_failed(yypParser);
-#ifndef YYNOERRORRECOVERY
-          yypParser->yyerrcnt = -1;
-#endif
-          yymajor = YYNOCODE;
-        }else if( yymx!=YYERRORSYMBOL ){
-          yy_shift(yypParser,yyact,YYERRORSYMBOL,yyminor);
-        }
-      }
-      yypParser->yyerrcnt = 3;
-      yyerrorhit = 1;
-#elif defined(YYNOERRORRECOVERY)
-      /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to
-      ** do any kind of error recovery.  Instead, simply invoke the syntax
-      ** error routine and continue going as if nothing had happened.
-      **
-      ** Applications can set this macro (for example inside %include) if
-      ** they intend to abandon the parse upon the first syntax error seen.
-      */
-      yy_syntax_error(yypParser,yymajor, yyminor);
-      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
-      yymajor = YYNOCODE;
-      
-#else  /* YYERRORSYMBOL is not defined */
-      /* This is what we do if the grammar does not define ERROR:
-      **
-      **  * Report an error message, and throw away the input token.
-      **
-      **  * If the input token is $, then fail the parse.
-      **
-      ** As before, subsequent error messages are suppressed until
-      ** three input tokens have been successfully shifted.
-      */
-      if( yypParser->yyerrcnt<=0 ){
-        yy_syntax_error(yypParser,yymajor, yyminor);
-      }
-      yypParser->yyerrcnt = 3;
-      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
-      if( yyendofinput ){
-        yy_parse_failed(yypParser);
-#ifndef YYNOERRORRECOVERY
-        yypParser->yyerrcnt = -1;
-#endif
-      }
-      yymajor = YYNOCODE;
-#endif
-    }
-  }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack );
-#ifndef NDEBUG
-  if( yyTraceFILE ){
-    yyStackEntry *i;
-    char cDiv = '[';
-    fprintf(yyTraceFILE,"%sReturn. Stack=",yyTracePrompt);
-    for(i=&yypParser->yystack[1]; i<=yypParser->yytos; i++){
-      fprintf(yyTraceFILE,"%c%s", cDiv, yyTokenName[i->major]);
-      cDiv = ' ';
-    }
-    fprintf(yyTraceFILE,"]\n");
-  }
-#endif
-  return;
-}
diff --git a/src/client/src/taos.def b/src/client/src/taos.def
index 39906c7486dc242513f31028c367607fa0197dc9..49d7290ce7bbb9cf64bd71c8d263ad3913576a71 100644
--- a/src/client/src/taos.def
+++ b/src/client/src/taos.def
@@ -1,11 +1,20 @@
 EXPORTS
 taos_init
+taos_cleanup
 taos_options
 taos_connect
+taos_connect_auth
 taos_close
+taos_stmt_init
+taos_stmt_prepare
+taos_stmt_bind_param
+taos_stmt_add_batch
+taos_stmt_execute
+taos_stmt_use_result
+taos_stmt_close
 taos_query
-taos_use_result
 taos_fetch_row
+taos_result_precision
 taos_free_result
 taos_field_count
 taos_num_fields
@@ -14,6 +23,9 @@ taos_fetch_fields
 taos_select_db
 taos_print_row
 taos_stop_query
+taos_fetch_block
+taos_validate_sql
+taos_fetch_lengths
 taos_get_server_info
 taos_get_client_info
 taos_errstr
@@ -27,5 +39,5 @@ taos_unsubscribe
 taos_open_stream
 taos_close_stream
 taos_fetch_block
-taos_result_precision
+taos_load_table_info
 
diff --git a/src/client/src/taos.rc.in b/src/client/src/taos.rc.in
new file mode 100644
index 0000000000000000000000000000000000000000..751be85fd01ebf36546a05453df4f29f1937135f
--- /dev/null
+++ b/src/client/src/taos.rc.in
@@ -0,0 +1,31 @@
+1 VERSIONINFO
+ FILEVERSION ${TD_VER_NUMBER}
+ PRODUCTVERSION ${TD_VER_NUMBER}
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Native C Driver for TDengine"
+            VALUE "FileVersion", "${TD_VER_NUMBER}"
+            VALUE "InternalName", "taos.dll(${TD_VER_CPUTYPE})"
+            VALUE "LegalCopyright", "Copyright (C) 2020 TAOS Data"
+            VALUE "OriginalFilename", ""
+            VALUE "ProductName", "taos.dll(${TD_VER_CPUTYPE})"
+            VALUE "ProductVersion", "${TD_VER_NUMBER}"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
\ No newline at end of file
diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c
deleted file mode 100644
index cf0873b5b620ddc118863e3c2cae86080f1d481f..0000000000000000000000000000000000000000
--- a/src/client/src/tscAst.c
+++ /dev/null
@@ -1,940 +0,0 @@
-/*
- * 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 "os.h"
-#include "taosmsg.h"
-#include "tast.h"
-#include "tlog.h"
-#include "tscSQLParser.h"
-#include "tscSyntaxtreefunction.h"
-#include "tschemautil.h"
-#include "tsdb.h"
-#include "tskiplist.h"
-#include "tsqldef.h"
-#include "tsqlfunction.h"
-#include "tstoken.h"
-#include "ttypes.h"
-#include "tutil.h"
-
-/*
- *
- * @date 2018-2-15
- * @version 0.2  operation for column filter
- * @author liaohj
- *
- * @Description parse tag query expression to build ast
- * ver 0.2, filter the result on first column with high priority to limit the candidate set
- * ver 0.3, pipeline filter in the form of: (a+2)/9 > 14
- *
- */
-
-static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols, SSQLToken *pToken);
-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 uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tSQLSyntaxNode *pLeft,
-                                   const tSQLSyntaxNode *pRight);
-
-/*
- * Check the filter value type on the right hand side based on the column id on the left hand side,
- * the filter value type must be identical to field type for relational operation
- * As for binary arithmetic operation, it is not necessary to do so.
- */
-static void reviseBinaryExprIfNecessary(tSQLSyntaxNode **pLeft, tSQLSyntaxNode **pRight, uint8_t *optr) {
-  if (*optr >= TSDB_RELATION_LESS && *optr <= TSDB_RELATION_LIKE) {
-    // make sure that the type of data on both sides of relational comparision are identical
-    if ((*pLeft)->nodeType == TSQL_NODE_VALUE) {
-      tVariantTypeSetType((*pLeft)->pVal, (*pRight)->pSchema->type);
-    } else if ((*pRight)->nodeType == TSQL_NODE_VALUE) {
-      tVariantTypeSetType((*pRight)->pVal, (*pLeft)->pSchema->type);
-    }
-
-  } else if (*optr >= TSDB_BINARY_OP_ADD && *optr <= TSDB_BINARY_OP_REMAINDER) {
-    if ((*pLeft)->nodeType == TSQL_NODE_VALUE) {
-      /* convert to int/bigint may cause the precision loss */
-      tVariantTypeSetType((*pLeft)->pVal, TSDB_DATA_TYPE_DOUBLE);
-    } else if ((*pRight)->nodeType == TSQL_NODE_VALUE) {
-      /* convert to int/bigint may cause the precision loss */
-      tVariantTypeSetType((*pRight)->pVal, TSDB_DATA_TYPE_DOUBLE);
-    }
-  }
-
-  /*
-   * 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) {
-    if (*optr >= TSDB_RELATION_LARGE && *optr <= TSDB_RELATION_LARGE_EQUAL && *optr != TSDB_RELATION_EQUAL) {
-      SWAP(*pLeft, *pRight, tSQLSyntaxNode *);
-    }
-
-    switch (*optr) {
-      case TSDB_RELATION_LARGE:
-        (*optr) = TSDB_RELATION_LESS;
-        break;
-      case TSDB_RELATION_LESS:
-        (*optr) = TSDB_RELATION_LARGE;
-        break;
-      case TSDB_RELATION_LARGE_EQUAL:
-        (*optr) = TSDB_RELATION_LESS_EQUAL;
-        break;
-      case TSDB_RELATION_LESS_EQUAL:
-        (*optr) = TSDB_RELATION_LARGE_EQUAL;
-        break;
-      default:;
-        // for other type of operations, do nothing
-    }
-  }
-}
-
-static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols, SSQLToken *pToken) {
-  /* if the token is not a value, return false */
-  if (pToken->type == TK_RP || (pToken->type != TK_INTEGER && pToken->type != TK_FLOAT && pToken->type != TK_ID &&
-                                pToken->type != TK_TBNAME && pToken->type != TK_STRING && pToken->type != TK_BOOL)) {
-    return NULL;
-  }
-
-  size_t          nodeSize = sizeof(tSQLSyntaxNode);
-  tSQLSyntaxNode *pNode = NULL;
-
-  if (pToken->type == TK_ID || pToken->type == TK_TBNAME) {
-    int32_t i = 0;
-    if (pToken->type == TK_ID) {
-      do {
-        SSQLToken tableToken = {0};
-        extractTableNameFromToken(pToken, &tableToken);
-
-        size_t len = strlen(pSchema[i].name);
-        if (strncmp(pToken->z, pSchema[i].name, pToken->n) == 0 && pToken->n == len) break;
-      } while (++i < numOfCols);
-
-      if (i == numOfCols) {  // column name is not valid, parse the expression failed
-        return NULL;
-      }
-    }
-
-    nodeSize += sizeof(SSchema);
-
-    pNode = calloc(1, nodeSize);
-    pNode->pSchema = (struct SSchema *)((char *)pNode + sizeof(tSQLSyntaxNode));
-    pNode->nodeType = TSQL_NODE_COL;
-
-    if (pToken->type == TK_ID) {
-      pNode->colId = (int16_t)pSchema[i].colId;
-      memcpy(pNode->pSchema, &pSchema[i], sizeof(SSchema));
-    } else {
-      pNode->colId = -1;
-      pNode->pSchema->type = TSDB_DATA_TYPE_BINARY;
-      pNode->pSchema->bytes = TSDB_METER_NAME_LEN;
-      strcpy(pNode->pSchema->name, TSQL_TBNAME_L);
-      pNode->pSchema->colId = -1;
-    }
-
-  } else {
-    nodeSize += sizeof(tVariant);
-    pNode = calloc(1, nodeSize);
-    pNode->pVal = (tVariant *)((char *)pNode + sizeof(tSQLSyntaxNode));
-
-    toTSDBType(pToken->type);
-    tVariantCreate(pNode->pVal, pToken);
-    pNode->nodeType = TSQL_NODE_VALUE;
-    pNode->colId = -1;
-  }
-
-  return pNode;
-}
-
-static uint8_t getBinaryExprOptr(SSQLToken *pToken) {
-  switch (pToken->type) {
-    case TK_LT:
-      return TSDB_RELATION_LESS;
-    case TK_LE:
-      return TSDB_RELATION_LESS_EQUAL;
-    case TK_GT:
-      return TSDB_RELATION_LARGE;
-    case TK_GE:
-      return TSDB_RELATION_LARGE_EQUAL;
-    case TK_NE:
-      return TSDB_RELATION_NOT_EQUAL;
-    case TK_AND:
-      return TSDB_RELATION_AND;
-    case TK_OR:
-      return TSDB_RELATION_OR;
-    case TK_EQ:
-      return TSDB_RELATION_EQUAL;
-    case TK_PLUS:
-      return TSDB_BINARY_OP_ADD;
-    case TK_MINUS:
-      return TSDB_BINARY_OP_SUBTRACT;
-    case TK_STAR:
-      return TSDB_BINARY_OP_MULTIPLY;
-    case TK_SLASH:
-      return TSDB_BINARY_OP_DIVIDE;
-    case TK_REM:
-      return TSDB_BINARY_OP_REMAINDER;
-    case TK_LIKE:
-      return TSDB_RELATION_LIKE;
-    default: { return 0; }
-  }
-}
-
-// previous generated expr is reduced as the left child
-static tSQLSyntaxNode *parseRemainStr(char *pstr, tSQLBinaryExpr *pExpr, SSchema *pSchema, int32_t optr,
-                                      int32_t numOfCols, int32_t *i) {
-  // set the previous generated node as the left child of new root
-  tSQLSyntaxNode *pLeft = malloc(sizeof(tSQLSyntaxNode));
-  pLeft->nodeType = TSQL_NODE_EXPR;
-  pLeft->pExpr = pExpr;
-
-  // remain is the right child
-  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, NULL);
-    tSQLSyntaxNodeDestroy(pRight, NULL);
-    return NULL;
-  }
-
-  tSQLBinaryExpr *pNewExpr = (tSQLBinaryExpr *)calloc(1, sizeof(tSQLBinaryExpr));
-  uint8_t         k = optr;
-  reviseBinaryExprIfNecessary(&pLeft, &pRight, &k);
-  pNewExpr->pLeft = pLeft;
-  pNewExpr->pRight = pRight;
-  pNewExpr->nSQLBinaryOptr = k;
-
-  pNewExpr->filterOnPrimaryKey = isQueryOnPrimaryKey(pSchema[0].name, pLeft, pRight);
-
-  tSQLSyntaxNode *pn = malloc(sizeof(tSQLSyntaxNode));
-  pn->nodeType = TSQL_NODE_EXPR;
-  pn->pExpr = pNewExpr;
-
-  return pn;
-}
-
-uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tSQLSyntaxNode *pLeft, const tSQLSyntaxNode *pRight) {
-  if (pLeft->nodeType == TSQL_NODE_COL) {
-    // 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 this value
-    return ((pLeft->nodeType == TSQL_NODE_EXPR && pLeft->pExpr->filterOnPrimaryKey == 1) ||
-            (pRight->nodeType == TSQL_NODE_EXPR && pRight->pExpr->filterOnPrimaryKey == 1)) == true
-               ? 1
-               : 0;
-  }
-}
-
-static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *str, int32_t *i) {
-  SSQLToken t0;
-
-  t0 = tStrGetToken(str, i, false, 0, NULL);
-  if (t0.n == 0) {
-    return NULL;
-  }
-
-  tSQLSyntaxNode *pLeft = NULL;
-  if (t0.type == TK_LP) {  // start new left child branch
-    pLeft = createSyntaxTree(pSchema, numOfCols, str, i);
-  } else {
-    if (t0.type == TK_RP) {
-      return NULL;
-    }
-    pLeft = tSQLSyntaxNodeCreate(pSchema, numOfCols, &t0);
-  }
-
-  if (pLeft == NULL) {
-    return NULL;
-  }
-
-  t0 = tStrGetToken(str, i, false, 0, NULL);
-  if (t0.n == 0 || t0.type == TK_RP) {
-    if (pLeft->nodeType != TSQL_NODE_EXPR) {  // if left is not the expr, it is not a legal expr
-      tSQLSyntaxNodeDestroy(pLeft, NULL);
-      return NULL;
-    }
-
-    return pLeft;
-  }
-
-  // get the operator of expr
-  uint8_t optr = getBinaryExprOptr(&t0);
-  if (optr == 0) {
-    pError("not support binary operator:%d", t0.type);
-    tSQLSyntaxNodeDestroy(pLeft, NULL);
-    return NULL;
-  }
-
-  assert(pLeft != NULL);
-  tSQLSyntaxNode *pRight = NULL;
-
-  if (t0.type == TK_AND || t0.type == TK_OR || t0.type == TK_LP) {
-    pRight = createSyntaxTree(pSchema, numOfCols, str, i);
-  } else {
-    /*
-     * In case that pLeft is a field identification,
-     * we parse the value in expression according to queried field type,
-     * 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.
-     */
-    t0 = tStrGetToken(str, i, true, 0, NULL);
-    if (t0.n == 0) {
-      tSQLSyntaxNodeDestroy(pLeft, NULL);  // illegal expression
-      return NULL;
-    }
-
-    if (t0.type == TK_LP) {
-      pRight = createSyntaxTree(pSchema, numOfCols, str, i);
-    } else {
-      pRight = tSQLSyntaxNodeCreate(pSchema, numOfCols, &t0);
-    }
-  }
-
-  if (pRight == NULL) {
-    tSQLSyntaxNodeDestroy(pLeft, NULL);
-    return NULL;
-  }
-
-  /* create binary expr as the child of new parent node */
-  tSQLBinaryExpr *pBinExpr = (tSQLBinaryExpr *)calloc(1, sizeof(tSQLBinaryExpr));
-  reviseBinaryExprIfNecessary(&pLeft, &pRight, &optr);
-
-  pBinExpr->filterOnPrimaryKey = isQueryOnPrimaryKey(pSchema[0].name, pLeft, pRight);
-  pBinExpr->pLeft = pLeft;
-  pBinExpr->pRight = pRight;
-  pBinExpr->nSQLBinaryOptr = optr;
-
-  t0 = tStrGetToken(str, i, true, 0, NULL);
-
-  if (t0.n == 0 || t0.type == TK_RP) {
-    tSQLSyntaxNode *pn = malloc(sizeof(tSQLSyntaxNode));
-    pn->nodeType = TSQL_NODE_EXPR;
-    pn->pExpr = pBinExpr;
-    pn->colId = -1;
-    return pn;
-  } else {
-    uint8_t localOptr = getBinaryExprOptr(&t0);
-    if (localOptr == 0) {
-      pError("not support binary operator:%d", t0.type);
-      free(pBinExpr);
-      return NULL;
-    }
-
-    return parseRemainStr(str, pBinExpr, pSchema, localOptr, numOfCols, i);
-  }
-}
-
-void tSQLBinaryExprFromString(tSQLBinaryExpr **pExpr, SSchema *pSchema, int32_t numOfCols, char *src, int32_t len) {
-  *pExpr = NULL;
-  if (len <= 0 || src == NULL || pSchema == NULL || numOfCols <= 0) {
-    return;
-  }
-
-  int32_t         pos = 0;
-  tSQLSyntaxNode *pStxNode = createSyntaxTree(pSchema, numOfCols, src, &pos);
-  if (pStxNode != NULL) {
-    assert(pStxNode->nodeType == TSQL_NODE_EXPR);
-    *pExpr = pStxNode->pExpr;
-    free(pStxNode);
-  }
-}
-
-int32_t tSQLBinaryExprToStringImpl(tSQLSyntaxNode *pNode, char *dst, uint8_t type) {
-  int32_t len = 0;
-  if (type == TSQL_NODE_EXPR) {
-    *dst = '(';
-    tSQLBinaryExprToString(pNode->pExpr, dst + 1, &len);
-    len += 2;
-    *(dst + len - 1) = ')';
-  } else if (type == TSQL_NODE_COL) {
-    len = sprintf(dst, "%s", pNode->pSchema->name);
-  } else {
-    len = tVariantToString(pNode->pVal, dst);
-  }
-  return len;
-}
-
-// TODO REFACTOR WITH SQL PARSER
-static char *tSQLOptrToString(uint8_t optr, char *dst) {
-  switch (optr) {
-    case TSDB_RELATION_LESS: {
-      *dst = '<';
-      dst += 1;
-      break;
-    }
-    case TSDB_RELATION_LESS_EQUAL: {
-      *dst = '<';
-      *(dst + 1) = '=';
-      dst += 2;
-      break;
-    }
-    case TSDB_RELATION_EQUAL: {
-      *dst = '=';
-      dst += 1;
-      break;
-    }
-    case TSDB_RELATION_LARGE: {
-      *dst = '>';
-      dst += 1;
-      break;
-    }
-    case TSDB_RELATION_LARGE_EQUAL: {
-      *dst = '>';
-      *(dst + 1) = '=';
-      dst += 2;
-      break;
-    }
-    case TSDB_RELATION_NOT_EQUAL: {
-      *dst = '<';
-      *(dst + 1) = '>';
-      dst += 2;
-      break;
-    }
-    case TSDB_RELATION_OR: {
-      memcpy(dst, "or", 2);
-      dst += 2;
-      break;
-    }
-    case TSDB_RELATION_AND: {
-      memcpy(dst, "and", 3);
-      dst += 3;
-      break;
-    }
-    default:;
-  }
-  return dst;
-}
-
-void tSQLBinaryExprToString(tSQLBinaryExpr *pExpr, char *dst, int32_t *len) {
-  if (pExpr == NULL) {
-    *dst = 0;
-    *len = 0;
-    return;
-  }
-
-  int32_t lhs = tSQLBinaryExprToStringImpl(pExpr->pLeft, dst, pExpr->pLeft->nodeType);
-  dst += lhs;
-  *len = lhs;
-
-  char *start = tSQLOptrToString(pExpr->nSQLBinaryOptr, dst);
-  *len += (start - dst);
-
-  *len += tSQLBinaryExprToStringImpl(pExpr->pRight, start, pExpr->pRight->nodeType);
-}
-
-static void UNUSED_FUNC destroySyntaxTree(tSQLSyntaxNode *pNode) { tSQLSyntaxNodeDestroy(pNode, NULL); }
-
-static void tSQLSyntaxNodeDestroy(tSQLSyntaxNode *pNode, void (*fp)(void *)) {
-  if (pNode == NULL) {
-    return;
-  }
-
-  if (pNode->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprDestroy(&pNode->pExpr, fp);
-  } else if (pNode->nodeType == TSQL_NODE_VALUE) {
-    tVariantDestroy(pNode->pVal);
-  }
-
-  free(pNode);
-}
-
-void tSQLBinaryExprDestroy(tSQLBinaryExpr **pExpr, void (*fp)(void *)) {
-  if (*pExpr == NULL) {
-    return;
-  }
-
-  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) {
-  q->lowerBndRelOptr = TSDB_RELATION_LARGE;
-  q->upperBndRelOptr = TSDB_RELATION_LESS;
-
-  switch (type) {
-    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: {
-      q->upperBnd.nType = TSDB_DATA_TYPE_BIGINT;
-      q->lowerBnd.nType = TSDB_DATA_TYPE_BIGINT;
-
-      q->upperBnd.i64Key = INT64_MAX;
-      q->lowerBnd.i64Key = INT64_MIN;
-      break;
-    };
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE: {
-      q->upperBnd.nType = TSDB_DATA_TYPE_DOUBLE;
-      q->lowerBnd.nType = TSDB_DATA_TYPE_DOUBLE;
-      q->upperBnd.dKey = DBL_MAX;
-      q->lowerBnd.dKey = -DBL_MIN;
-      break;
-    };
-    case TSDB_DATA_TYPE_NCHAR:
-    case TSDB_DATA_TYPE_BINARY: {
-      q->upperBnd.nType = type;
-      q->upperBnd.pz = NULL;
-      q->upperBnd.nLen = -1;
-
-      q->lowerBnd.nType = type;
-      q->lowerBnd.pz = NULL;
-      q->lowerBnd.nLen = -1;
-    }
-  }
-}
-
-static void tSQLDoFilterInitialResult(tSkipList *pSkipList, bool (*fp)(), tQueryInfo *queryColInfo,
-                                      tQueryResultset *result) {
-  // primary key filter, search according to skiplist
-  if (queryColInfo->colIdx == 0 && queryColInfo->optr != TSDB_RELATION_LIKE) {
-    tSKipListQueryCond q;
-    setInitialValueForRangeQueryCondition(&q, queryColInfo->q.nType);
-
-    switch (queryColInfo->optr) {
-      case TSDB_RELATION_EQUAL: {
-        result->num =
-            tSkipListPointQuery(pSkipList, &queryColInfo->q, 1, INCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      case TSDB_RELATION_NOT_EQUAL: {
-        result->num =
-            tSkipListPointQuery(pSkipList, &queryColInfo->q, 1, EXCLUDE_POINT_QUERY, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      case TSDB_RELATION_LESS_EQUAL: {
-        tVariantAssign(&q.upperBnd, &queryColInfo->q);
-        q.upperBndRelOptr = queryColInfo->optr;
-        result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      case TSDB_RELATION_LESS: {
-        tVariantAssign(&q.upperBnd, &queryColInfo->q);
-        result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      case TSDB_RELATION_LARGE: {
-        tVariantAssign(&q.lowerBnd, &queryColInfo->q);
-        result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      case TSDB_RELATION_LARGE_EQUAL: {
-        tVariantAssign(&q.lowerBnd, &queryColInfo->q);
-        q.lowerBndRelOptr = queryColInfo->optr;
-        result->num = tSkipListQuery(pSkipList, &q, (tSkipListNode ***)&result->pRes);
-        break;
-      }
-      default:
-        pTrace("skiplist:%p, unsupport query operator:%d", pSkipList, queryColInfo->optr);
-    }
-
-    tSkipListDestroyKey(&q.upperBnd);
-    tSkipListDestroyKey(&q.lowerBnd);
-  } else {
-    /*
-     * 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);
-  }
-}
-
-/*
- * qsort comparator
- * sort the result to ensure meters with the same gid is grouped together
- */
-static int32_t compareByAddr(const void *pLeft, const void *pRight) {
-  int64_t p1 = (int64_t) * ((tSkipListNode **)pLeft);
-  int64_t p2 = (int64_t) * ((tSkipListNode **)pRight);
-
-  DEFAULT_COMP(p1, p2);
-}
-
-int32_t merge(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *pFinalRes) {
-  assert(pFinalRes->pRes == 0);
-
-  pFinalRes->pRes = calloc((size_t)(pLeft->num + pRight->num), POINTER_BYTES);
-  pFinalRes->num = 0;
-
-  // sort according to address
-  tSkipListNode **pLeftNodes = (tSkipListNode **)pLeft->pRes;
-  qsort(pLeftNodes, pLeft->num, sizeof(pLeft->pRes[0]), compareByAddr);
-
-  tSkipListNode **pRightNodes = (tSkipListNode **)pRight->pRes;
-  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];
-
-    if (ret < 0) {
-      pFinalRes->pRes[pFinalRes->num++] = pLeftNodes[i++];
-    } else if (ret > 0) {
-      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
-    } else {  // pNode->key > pkey[i]
-      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
-      i++;
-    }
-  }
-
-  while (i < pLeft->num) {
-    pFinalRes->pRes[pFinalRes->num++] = pLeftNodes[i++];
-  }
-
-  while (j < pRight->num) {
-    pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
-  }
-
-  return pFinalRes->num;
-}
-
-int32_t intersect(tQueryResultset *pLeft, tQueryResultset *pRight, tQueryResultset *pFinalRes) {
-  int64_t num = MIN(pLeft->num, pRight->num);
-
-  assert(pFinalRes->pRes == 0);
-
-  pFinalRes->pRes = calloc(num, POINTER_BYTES);
-  pFinalRes->num = 0;
-
-  // sort according to address
-  tSkipListNode **pLeftNodes = (tSkipListNode **)pLeft->pRes;
-  qsort(pLeftNodes, pLeft->num, sizeof(pLeft->pRes[0]), compareByAddr);
-
-  tSkipListNode **pRightNodes = (tSkipListNode **)pRight->pRes;
-  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];
-
-    if (ret < 0) {
-      i++;
-    } else if (ret > 0) {
-      j++;
-    } else {  // pNode->key > pkey[i]
-      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j];
-      i++;
-      j++;
-    }
-  }
-
-  return pFinalRes->num;
-}
-
-/*
- * traverse the result and apply the function to each item to check if the item is qualified or not
- */
-static void tSQLListTraverseOnResult(struct tSQLBinaryExpr *pExpr, __result_filter_fn_t fp, tQueryResultset *pResult) {
-  assert(pExpr->pLeft->nodeType == TSQL_NODE_COL && pExpr->pRight->nodeType == TSQL_NODE_VALUE);
-
-  // brutal force scan the result list and check for each item in the list
-  int64_t num = pResult->num;
-  for (int32_t i = 0, j = 0; i < pResult->num; ++i) {
-    if (fp == NULL || (fp(pResult->pRes[i], pExpr->info) == true)) {
-      pResult->pRes[j++] = pResult->pRes[i];
-    } else {
-      num--;
-    }
-  }
-
-  pResult->num = num;
-}
-
-static bool filterItem(tSQLBinaryExpr *pExpr, const void *pItem, SBinaryFilterSupp *param) {
-  tSQLSyntaxNode *pLeft = pExpr->pLeft;
-  tSQLSyntaxNode *pRight = pExpr->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) {
-      /**
-       * Perform the filter operation based on the initial filter result, which is obtained from filtering from index.
-       * Since no index presented, the filter operation is done by scan all elements in the result set.
-       *
-       * 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, &rLeft, param);
-      tSQLBinaryExprTraverse(pRight->pExpr, pSkipList, &rRight, param);
-
-      if (pExpr->nSQLBinaryOptr == TSDB_RELATION_AND) {  // CROSS
-        intersect(&rLeft, &rRight, result);
-      } else if (pExpr->nSQLBinaryOptr == TSDB_RELATION_OR) {  // or
-        merge(&rLeft, &rRight, result);
-      } else {
-        assert(false);
-      }
-
-      free(rLeft.pRes);
-      free(rRight.pRes);
-    } else {
-      /*
-       * (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.
-       */
-      assert(pExpr->nSQLBinaryOptr == TSDB_RELATION_AND);
-
-      tSQLBinaryExpr *pFirst = NULL;
-      tSQLBinaryExpr *pSecond = NULL;
-      if (pLeft->pExpr->filterOnPrimaryKey == 1) {
-        pFirst = pLeft->pExpr;
-        pSecond = pRight->pExpr;
-      } else {
-        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);
-
-    param->setupInfoFn(pExpr, param->pExtInfo);
-    if (pSkipList == NULL) {
-      tSQLListTraverseOnResult(pExpr, param->fp, result);
-    } else {
-      assert(result->num == 0);
-      tSQLDoFilterInitialResult(pSkipList, param->fp, pExpr->info, result);
-    }
-  }
-}
-
-void tSQLBinaryExprCalcTraverse(tSQLBinaryExpr *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,
-                                char *(*getSourceDataBlock)(void *, char *, int32_t)) {
-  if (pExprs == NULL) {
-    return;
-  }
-
-  tSQLSyntaxNode *pLeft = pExprs->pLeft;
-  tSQLSyntaxNode *pRight = pExprs->pRight;
-
-  /* the left output has result from the left child syntax tree */
-  char *pLeftOutput = (char*)malloc(sizeof(int64_t) * numOfRows);
-  if (pLeft->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprCalcTraverse(pLeft->pExpr, numOfRows, pLeftOutput, param, order, getSourceDataBlock);
-  }
-
-  /* the right output has result from the right child syntax tree */
-  char *pRightOutput = malloc(sizeof(int64_t) * numOfRows);
-  if (pRight->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprCalcTraverse(pRight->pExpr, numOfRows, pRightOutput, param, order, getSourceDataBlock);
-  }
-
-  if (pLeft->nodeType == TSQL_NODE_EXPR) {
-    if (pRight->nodeType == TSQL_NODE_EXPR) {
-      /*
-       * 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);
-
-    } else if (pRight->nodeType == TSQL_NODE_COL) {  // exprLeft + columnRight
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(TSDB_DATA_TYPE_DOUBLE, pRight->pSchema->type, pExprs->nSQLBinaryOptr);
-      // set input buffer
-      char *pInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->colId);
-      fp(pLeftOutput, pInputData, numOfRows, numOfRows, pOutput, order);
-
-    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // exprLeft + 12
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(TSDB_DATA_TYPE_DOUBLE, pRight->pVal->nType, pExprs->nSQLBinaryOptr);
-      fp(pLeftOutput, &pRight->pVal->i64Key, numOfRows, 1, pOutput, order);
-    }
-  } else if (pLeft->nodeType == TSQL_NODE_COL) {
-    // column data specified on left-hand-side
-    char *pLeftInputData = getSourceDataBlock(param, pLeft->pSchema->name, pLeft->colId);
-    if (pRight->nodeType == TSQL_NODE_EXPR) {  // columnLeft + expr2
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, TSDB_DATA_TYPE_DOUBLE, pExprs->nSQLBinaryOptr);
-      fp(pLeftInputData, pRightOutput, numOfRows, numOfRows, pOutput, order);
-
-    } else if (pRight->nodeType == TSQL_NODE_COL) {  // columnLeft + columnRight
-      // column data specified on right-hand-side
-      char *pRightInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->colId);
-
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pSchema->type, pExprs->nSQLBinaryOptr);
-      fp(pLeftInputData, pRightInputData, numOfRows, numOfRows, pOutput, order);
-
-    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // columnLeft + 12
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pVal->nType, pExprs->nSQLBinaryOptr);
-      fp(pLeftInputData, &pRight->pVal->i64Key, numOfRows, 1, pOutput, order);
-    }
-  } else {
-    // column data specified on left-hand-side
-    if (pRight->nodeType == TSQL_NODE_EXPR) {  // 12 + expr2
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, TSDB_DATA_TYPE_DOUBLE, pExprs->nSQLBinaryOptr);
-      fp(&pLeft->pVal->i64Key, pRightOutput, 1, numOfRows, pOutput, order);
-
-    } 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);
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, pRight->pSchema->type, pExprs->nSQLBinaryOptr);
-      fp(&pLeft->pVal->i64Key, pRightInputData, 1, numOfRows, pOutput, order);
-
-    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // 12 + 12
-      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, pRight->pVal->nType, pExprs->nSQLBinaryOptr);
-      fp(&pLeft->pVal->i64Key, &pRight->pVal->i64Key, 1, 1, pOutput, order);
-    }
-  }
-
-  free(pLeftOutput);
-  free(pRightOutput);
-}
-
-void tSQLBinaryExprTrv(tSQLBinaryExpr *pExprs, int32_t *val, int16_t *ids) {
-  if (pExprs == NULL) {
-    return;
-  }
-
-  tSQLSyntaxNode *pLeft = pExprs->pLeft;
-  tSQLSyntaxNode *pRight = pExprs->pRight;
-
-  // recursive traverse left child branch
-  if (pLeft->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprTrv(pLeft->pExpr, val, ids);
-  } else if (pLeft->nodeType == TSQL_NODE_COL) {
-    ids[*val] = pLeft->pSchema->colId;
-    (*val) += 1;
-  }
-
-  if (pRight->nodeType == TSQL_NODE_EXPR) {
-    tSQLBinaryExprTrv(pRight->pExpr, val, ids);
-  } else if (pRight->nodeType == TSQL_NODE_COL) {
-    ids[*val] = pRight->pSchema->colId;
-    (*val) += 1;
-  }
-}
-
-void tQueryResultClean(tQueryResultset *pRes) {
-  if (pRes == NULL) {
-    return;
-  }
-
-  tfree(pRes->pRes);
-  pRes->num = 0;
-}
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 94ebaefd369975c6873e6dce7ff36c3b513ad91e..c5d622e2452d42e6863a294ce83fb850d21c5818 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -14,17 +14,18 @@
  */
 
 #include "os.h"
+#include "tutil.h"
 
-#include "tlog.h"
+#include "tnote.h"
 #include "trpc.h"
-#include "tscProfile.h"
-#include "tscSecondaryMerge.h"
+#include "tcache.h"
+#include "tscLog.h"
+#include "tscSubquery.h"
+#include "tscLocalMerge.h"
 #include "tscUtil.h"
+#include "tsched.h"
+#include "tschemautil.h"
 #include "tsclient.h"
-#include "tsocket.h"
-#include "tscSQLParser.h"
-#include "tutil.h"
-#include "tnote.h"
 
 static void tscProcessFetchRow(SSchedMsg *pMsg);
 static void tscAsyncQueryRowsForNextVnode(void *param, TAOS_RES *tres, int numOfRows);
@@ -39,67 +40,37 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo
 static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows);
 static void tscAsyncFetchSingleRowProxy(void *param, TAOS_RES *tres, int numOfRows);
 
-// 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);
-    globalCode = TSDB_CODE_DISCONNECTED;
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
-  int32_t sqlLen = strlen(sqlstr);
-  if (sqlLen > tsMaxSQLStringLen) {
-    tscError("sql string too long");
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
-  taosNotePrintTsc(sqlstr);
-
-  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
-  if (pSql == NULL) {
-    tscError("failed to malloc sqlObj");
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
+void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const char* sqlstr, size_t sqlLen) {
+  SSqlCmd* pCmd = &pSql->cmd;
 
   pSql->signature = pSql;
-  pSql->pTscObj = pObj;
-  pSql->fp = fp;
-  pSql->param = param;
+  pSql->param     = param;
+  pSql->pTscObj   = pObj;
+  pSql->parseRetry= 0;
+  pSql->maxRetry  = TSDB_MAX_REPLICA;
+  pSql->fp        = fp;
+  pSql->fetchFp   = fp;
 
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
-    tscError("failed to malloc payload");
-    tfree(pSql);
-    tscQueueAsyncError(fp, param);
-    return;
-  }
+  registerSqlObj(pSql);
 
-  pSql->sqlstr = malloc(sqlLen + 1);
+  pSql->sqlstr = calloc(1, sqlLen + 1);
   if (pSql->sqlstr == NULL) {
     tscError("%p failed to malloc sql string buffer", pSql);
-    tscQueueAsyncError(fp, param);
-    free(pCmd->payload);
-    free(pSql);
+    pSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscQueueAsyncRes(pSql);
     return;
   }
 
-  pRes->qhandle = 0;
-  pRes->numOfRows = 1;
+  strntolower(pSql->sqlstr, sqlstr, (int32_t)sqlLen);
 
-  strtolower(pSql->sqlstr, sqlstr);
-  tscDump("%p pObj:%p, Async SQL: %s", pSql, pObj, pSql->sqlstr);
+  tscDebugL("%p SQL: %s", pSql, pSql->sqlstr);
+  pCmd->curSql = pSql->sqlstr;
 
   int32_t code = tsParseSql(pSql, true);
-  if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
-
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) return;
+  
   if (code != TSDB_CODE_SUCCESS) {
-    pSql->res.code = (uint8_t)code;
+    pSql->res.code = code;
     tscQueueAsyncRes(pSql);
     return;
   }
@@ -107,6 +78,36 @@ void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *,
   tscDoQuery(pSql);
 }
 
+// TODO return the correct error code to client in tscQueueAsyncError
+void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *param) {
+  STscObj *pObj = (STscObj *)taos;
+  if (pObj == NULL || pObj->signature != pObj) {
+    tscError("bug!!! pObj:%p", pObj);
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    tscQueueAsyncError(fp, param, TSDB_CODE_TSC_DISCONNECTED);
+    return;
+  }
+  
+  int32_t sqlLen = (int32_t)strlen(sqlstr);
+  if (sqlLen > tsMaxSQLStringLen) {
+    tscError("sql string exceeds max length:%d", tsMaxSQLStringLen);
+    terrno = TSDB_CODE_TSC_INVALID_SQL;
+    tscQueueAsyncError(fp, param, TSDB_CODE_TSC_INVALID_SQL);
+    return;
+  }
+  
+  taosNotePrintTsc(sqlstr);
+  
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    tscError("failed to malloc sqlObj");
+    tscQueueAsyncError(fp, param, TSDB_CODE_TSC_OUT_OF_MEMORY);
+    return;
+  }
+  
+  doAsyncQuery(pObj, pSql, fp, param, sqlstr, sqlLen);
+}
+
 static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows) {
   if (tres == NULL) {
     return;
@@ -139,9 +140,9 @@ static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows) {
     return;
   }
   
-  // local reducer has handle this situation during super table non-projection query.
-  if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC) {
-    pRes->numOfTotalInCurrentClause += pRes->numOfRows;
+  // local merge has handle this situation during super table non-projection query.
+  if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE) {
+    pRes->numOfClauseTotal += pRes->numOfRows;
   }
 
   (*pSql->fetchFp)(param, tres, numOfRows);
@@ -159,21 +160,26 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo
   SSqlRes *pRes = &pSql->res;
 
   if ((pRes->qhandle == 0 || numOfRows != 0) && pCmd->command < TSDB_SQL_LOCAL) {
-    if (pRes->qhandle == 0) {
+    if (pRes->qhandle == 0 && numOfRows != 0) {
       tscError("qhandle is NULL");
     } else {
       pRes->code = numOfRows;
     }
 
-    tscQueueAsyncError(pSql->fetchFp, param);
+    tscQueueAsyncRes(pSql);
     return;
   }
 
   pSql->fp = fp;
-  if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC && pCmd->command < TSDB_SQL_LOCAL) {
+  if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE && pCmd->command < TSDB_SQL_LOCAL) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
   }
-  tscProcessSql(pSql);
+
+  if (pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE) {
+    tscFetchDatablockFromSubquery(pSql);
+  } else {
+    tscProcessSql(pSql);
+  }
 }
 
 /*
@@ -191,44 +197,78 @@ void tscAsyncQuerySingleRowForNextVnode(void *param, TAOS_RES *tres, int numOfRo
   tscProcessAsyncRetrieveImpl(param, tres, numOfRows, tscAsyncFetchSingleRowProxy);
 }
 
-void taos_fetch_rows_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, int), void *param) {
+void taos_fetch_rows_a(TAOS_RES *taosa, __async_cb_func_t fp, void *param) {
   SSqlObj *pSql = (SSqlObj *)taosa;
   if (pSql == NULL || pSql->signature != pSql) {
     tscError("sql object is NULL");
-    globalCode = TSDB_CODE_DISCONNECTED;
-    tscQueueAsyncError(fp, param);
+    tscQueueAsyncError(fp, param, TSDB_CODE_TSC_DISCONNECTED);
     return;
   }
 
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
 
+  // user-defined callback function is stored in fetchFp
+  pSql->fetchFp = fp;
+  pSql->fp = tscAsyncFetchRowsProxy;
+
   if (pRes->qhandle == 0) {
     tscError("qhandle is NULL");
-    tscQueueAsyncError(fp, param);
+    pRes->code = TSDB_CODE_TSC_INVALID_QHANDLE;
+    pSql->param = param;
+
+    tscQueueAsyncRes(pSql);
     return;
   }
 
-  // user-defined callback function is stored in fetchFp
-  pSql->fetchFp = fp;
-  pSql->fp = tscAsyncFetchRowsProxy;
-
   pSql->param = param;
   tscResetForNextRetrieve(pRes);
+  
+  // handle the sub queries of join query
+  if (pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE) {
+    tscFetchDatablockFromSubquery(pSql);
+  } else if (pRes->completed) {
+    if(pCmd->command == TSDB_SQL_FETCH || (pCmd->command >= TSDB_SQL_SERV_STATUS && pCmd->command <= TSDB_SQL_CURRENT_USER)) {
+      if (hasMoreVnodesToTry(pSql)) {  // sequentially retrieve data from remain vnodes.
+        tscTryQueryNextVnode(pSql, tscAsyncQueryRowsForNextVnode);
+      } else {
+        /*
+         * all available virtual nodes in current clause has been checked already, now try the
+         * next one in the following union subclause
+         */
+        if (pCmd->clauseIndex < pCmd->numOfClause - 1) {
+          tscTryQueryNextClause(pSql, tscAsyncQueryRowsForNextVnode);
+          return;
+        }
 
-  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;
-  }
+        /*
+         * 1. has reach the limitation
+         * 2. no remain virtual nodes to be retrieved anymore
+         */
+        (*pSql->fetchFp)(param, pSql, 0);
+      }
 
-  tscProcessSql(pSql);
+      return;
+    } else if (pCmd->command == TSDB_SQL_RETRIEVE || pCmd->command == TSDB_SQL_RETRIEVE_LOCALMERGE) {
+      // in case of show command, return no data
+      (*pSql->fetchFp)(param, pSql, 0);
+    } else {
+      assert(0);
+    }
+  } else { // current query is not completed, continue retrieve from node
+    if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE && pCmd->command < TSDB_SQL_LOCAL) {
+      pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
+    }
+  
+    tscProcessSql(pSql);
+  }
 }
 
 void taos_fetch_row_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, TAOS_ROW), void *param) {
   SSqlObj *pSql = (SSqlObj *)taosa;
   if (pSql == NULL || pSql->signature != pSql) {
     tscError("sql object is NULL");
-    globalCode = TSDB_CODE_DISCONNECTED;
-    tscQueueAsyncError(fp, param);
+    tscQueueAsyncError(fp, param, TSDB_CODE_TSC_DISCONNECTED);
     return;
   }
 
@@ -237,7 +277,10 @@ void taos_fetch_row_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, TAOS_ROW),
 
   if (pRes->qhandle == 0) {
     tscError("qhandle is NULL");
-    tscQueueAsyncError(fp, param);
+    pSql->param = param;
+    pRes->code = TSDB_CODE_TSC_INVALID_QHANDLE;
+
+    tscQueueAsyncRes(pSql);
     return;
   }
 
@@ -248,13 +291,13 @@ void taos_fetch_row_a(TAOS_RES *taosa, void (*fp)(void *, TAOS_RES *, TAOS_ROW),
     tscResetForNextRetrieve(pRes);
     pSql->fp = tscAsyncFetchSingleRowProxy;
     
-    if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC && pCmd->command < TSDB_SQL_LOCAL) {
+    if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE && pCmd->command < TSDB_SQL_LOCAL) {
       pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
     }
     
     tscProcessSql(pSql);
   } else {
-    SSchedMsg schedMsg;
+    SSchedMsg schedMsg = { 0 };
     schedMsg.fp = tscProcessFetchRow;
     schedMsg.ahandle = pSql;
     schedMsg.thandle = pRes->tsrow;
@@ -283,8 +326,15 @@ void tscAsyncFetchSingleRowProxy(void *param, TAOS_RES *tres, int numOfRows) {
     return;
   }
   
-  for (int i = 0; i < pCmd->numOfCols; ++i)
-    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i, pQueryInfo->order) + pRes->bytes[i] * pRes->row;
+  for (int i = 0; i < pCmd->numOfCols; ++i){
+    SFieldSupInfo* pSup = taosArrayGet(pQueryInfo->fieldsInfo.pSupportInfo, i);
+    if (pSup->pSqlExpr != NULL) {
+//      pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i) + pSup->pSqlExpr->resBytes * pRes->row;
+    } else {
+      //todo add
+    }
+  }
+  
   pRes->row++;
 
   (*pSql->fetchFp)(pSql->param, pSql, pSql->res.tsrow);
@@ -298,7 +348,13 @@ void tscProcessFetchRow(SSchedMsg *pMsg) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   for (int i = 0; i < pCmd->numOfCols; ++i) {
-    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i, pQueryInfo->order) + pRes->bytes[i] * pRes->row;
+    SFieldSupInfo* pSup = taosArrayGet(pQueryInfo->fieldsInfo.pSupportInfo, i);
+
+    if (pSup->pSqlExpr != NULL) {
+      tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i);
+    } else {
+//      todo add
+    }
   }
   
   pRes->row++;
@@ -307,63 +363,41 @@ void tscProcessFetchRow(SSchedMsg *pMsg) {
 
 void tscProcessAsyncRes(SSchedMsg *pMsg) {
   SSqlObj *pSql = (SSqlObj *)pMsg->ahandle;
-  STscObj *pTscObj = pSql->pTscObj;
-  SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
+  assert(pSql->fp != NULL && pSql->fetchFp != NULL);
 
-  void *taosres = pSql;
-
-  // pCmd may be released, so cache pCmd->command
-  int cmd = pCmd->command;
-  int code = pRes->code ? -pRes->code : pRes->numOfRows;
-
-  if ((tscKeepConn[cmd] == 0 || (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_ACTION_IN_PROGRESS)) &&
-      pSql->pStream == NULL) {
-    if (pSql->thandle) taosAddConnIntoCache(tscConnCache, pSql->thandle, pSql->ip, pSql->vnode, pTscObj->user);
-
-    pSql->thandle = NULL;
-  }
-
-  // in case of async insert, restore the user specified callback function
-  bool shouldFree = tscShouldFreeAsyncSqlObj(pSql);
-
-  if (cmd == TSDB_SQL_INSERT) {
-    assert(pSql->fp != NULL);
-    pSql->fp = pSql->fetchFp;
-  }
-
-  (*pSql->fp)(pSql->param, taosres, code);
-
-  if (shouldFree) {
-    tscFreeSqlObj(pSql);
-    tscTrace("%p Async sql is automatically freed in async res", pSql);
-  }
+  pSql->fp = pSql->fetchFp;
+  (*pSql->fp)(pSql->param, pSql, pRes->code);
 }
 
-void tscProcessAsyncError(SSchedMsg *pMsg) {
+// this function will be executed by queue task threads, so the terrno is not valid
+static void tscProcessAsyncError(SSchedMsg *pMsg) {
   void (*fp)() = pMsg->ahandle;
-
-  (*fp)(pMsg->thandle, NULL, -1);
+  terrno = *(int32_t*) pMsg->msg;
+  (*fp)(pMsg->thandle, NULL, *(int32_t*)pMsg->msg);
 }
 
-void tscQueueAsyncError(void(*fp), void *param) {
-  SSchedMsg schedMsg;
+void tscQueueAsyncError(void(*fp), void *param, int32_t code) {
+  int32_t* c = malloc(sizeof(int32_t));
+  *c = code;
+  
+  SSchedMsg schedMsg = { 0 };
   schedMsg.fp = tscProcessAsyncError;
   schedMsg.ahandle = fp;
   schedMsg.thandle = param;
-  schedMsg.msg = NULL;
+  schedMsg.msg = c;
   taosScheduleTask(tscQhandle, &schedMsg);
 }
 
 void tscQueueAsyncRes(SSqlObj *pSql) {
   if (pSql == NULL || pSql->signature != pSql) {
-    tscTrace("%p SqlObj is freed, not add into queue async res", pSql);
+    tscDebug("%p SqlObj is freed, not add into queue async res", pSql);
     return;
   } else {
-    tscError("%p add into queued async res, code:%d", pSql, pSql->res.code);
+    tscError("%p add into queued async res, code:%s", pSql, tstrerror(pSql->res.code));
   }
 
-  SSchedMsg schedMsg;
+  SSchedMsg schedMsg = { 0 };
   schedMsg.fp = tscProcessAsyncRes;
   schedMsg.ahandle = pSql;
   schedMsg.thandle = (void *)1;
@@ -373,187 +407,159 @@ void tscQueueAsyncRes(SSqlObj *pSql) {
 
 void tscProcessAsyncFree(SSchedMsg *pMsg) {
   SSqlObj *pSql = (SSqlObj *)pMsg->ahandle;
-  tscTrace("%p sql is freed", pSql);
+  tscDebug("%p sql is freed", pSql);
   taos_free_result(pSql);
 }
 
-void tscQueueAsyncFreeResult(SSqlObj *pSql) {
-  tscTrace("%p sqlObj put in queue to async free", pSql);
-
-  SSchedMsg schedMsg;
-  schedMsg.fp = tscProcessAsyncFree;
-  schedMsg.ahandle = pSql;
-  schedMsg.thandle = (void *)1;
-  schedMsg.msg = NULL;
-  taosScheduleTask(tscQhandle, &schedMsg);
-}
-
-void tscAsyncInsertMultiVnodesProxy(void *param, TAOS_RES *tres, int numOfRows) {
-  SSqlObj *pSql = (SSqlObj *)param;
-  SSqlCmd *pCmd = &pSql->cmd;
-  int32_t  code = TSDB_CODE_SUCCESS;
-
-  assert(pCmd->dataSourceType != 0 && pSql->signature == pSql);
-  
-  int32_t index = 0;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, index);
-  
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  assert(pQueryInfo->numOfTables == 1 || pQueryInfo->numOfTables == 2);
-  
-  SDataBlockList *pDataBlocks = pCmd->pDataBlocks;
-  if (pDataBlocks == NULL || pMeterMetaInfo->vnodeIndex >= pDataBlocks->nSize) {
-    // restore user defined fp
-    pSql->fp = pSql->fetchFp;
-    tscTrace("%p Async insertion completed, destroy data block list", pSql);
-
-    // release data block data
-    pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-
-    // all data has been sent to vnode, call user function
-    (*pSql->fp)(pSql->param, tres, numOfRows);
-  } else {
-    do {
-      code = tscCopyDataBlockToPayload(pSql, pDataBlocks->pData[pMeterMetaInfo->vnodeIndex++]);
-      if (code != TSDB_CODE_SUCCESS) {
-        tscTrace("%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%d, code:%d",
-                 pSql, pMeterMetaInfo->vnodeIndex - 1, pDataBlocks->nSize, code);
-      }
-
-    } while (code != TSDB_CODE_SUCCESS && pMeterMetaInfo->vnodeIndex < pDataBlocks->nSize);
-
-    // build submit msg may fail
-    if (code == TSDB_CODE_SUCCESS) {
-      tscTrace("%p async insertion, vnodeIdx:%d, total:%d", pSql, pMeterMetaInfo->vnodeIndex - 1, pDataBlocks->nSize);
-      tscProcessSql(pSql);
-    }
-  }
-}
-
 int tscSendMsgToServer(SSqlObj *pSql);
 
-void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code) {
+void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
   SSqlObj *pSql = (SSqlObj *)param;
   if (pSql == NULL || pSql->signature != pSql) return;
 
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
+  pRes->code = code;
 
-  if (pSql->fp == NULL) {
-    tscError("%p callBack is NULL!!!", pSql);
-    return;
-  }
-
-  if (pSql->fp == (void *)1) {
-    pSql->fp = NULL;
-
-    if (code != 0) {
-      code = abs(code);
-      pRes->code = code;
-      tscTrace("%p failed to renew meterMeta", pSql);
-      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);
-  
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
-      assert(pMeterMetaInfo->pMeterMeta == NULL);
-      
-      tscGetMeterMeta(pSql, pMeterMetaInfo);
-      code = tscSendMsgToServer(pSql);
-      if (code != 0) {
-        pRes->code = code;
-        tsem_post(&pSql->rspSem);
-      }
-    }
-
-    return;
-  }
-
-  if (code != 0) {
-    pRes->code = (uint8_t)abs(code);
-    tscQueueAsyncRes(pSql);
-    return;
+  if (code != TSDB_CODE_SUCCESS) {
+    tscError("%p get tableMeta failed, code:%s", pSql, tstrerror(code));
+    goto _error;
+  } else {
+    const char* msg = (pCmd->command == TSDB_SQL_STABLEVGROUP)? "vgroup-list":"table-meta";
+    tscDebug("%p get %s successfully", pSql, msg);
   }
 
   if (pSql->pStream == NULL) {
-    // check if it is a sub-query of super table query first, if true, enter another routine
     SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-    if ((pQueryInfo->type & TSDB_QUERY_TYPE_STABLE_SUBQUERY) == TSDB_QUERY_TYPE_STABLE_SUBQUERY) {
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-      assert(pMeterMetaInfo->pMeterMeta->numOfTags != 0 && pMeterMetaInfo->vnodeIndex >= 0 && pSql->param != NULL);
+
+    // check if it is a sub-query of super table query first, if true, enter another routine
+    if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_STABLE_SUBQUERY)) {
+      tscDebug("%p update table meta in local cache, continue to process sql and send corresponding subquery", pSql);
+
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+      code = tscGetTableMeta(pSql, pTableMetaInfo);
+      if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+        return;
+      } else {
+        assert(code == TSDB_CODE_SUCCESS);      
+      }
+     
+      assert((tscGetNumOfTags(pTableMetaInfo->pTableMeta) != 0) && pSql->param != NULL);
 
       SRetrieveSupport *trs = (SRetrieveSupport *)pSql->param;
-      SSqlObj *         pParObj = trs->pParentSqlObj;
+      SSqlObj *         pParObj = trs->pParentSql;
       
-      assert(pParObj->signature == pParObj && trs->subqueryIndex == pMeterMetaInfo->vnodeIndex &&
-          pMeterMetaInfo->pMeterMeta->numOfTags != 0);
+      // NOTE: the vgroupInfo for the queried super table must be existed here.
+      assert(pParObj->signature == pParObj && trs->subqueryIndex == pTableMetaInfo->vgroupIndex &&
+          pTableMetaInfo->vgroupIndex >= 0 && pTableMetaInfo->vgroupList != NULL);
 
-      tscTrace("%p get metricMeta during super table query successfully", pSql);
-      
-      code = tscGetMeterMeta(pSql, pMeterMetaInfo);
-      pRes->code = code;
-
-      if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
-
-      code = tscGetMetricMeta(pSql, 0);
-      pRes->code = code;
-
-      if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
-    } else {  // normal async query continues
-      if (pCmd->isParseFinish) {
-        tscTrace("%p resend data to vnode in metermeta callback since sql has been parsed completed", pSql);
-        
-        SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-        code = tscGetMeterMeta(pSql, pMeterMetaInfo);
-        assert(code == TSDB_CODE_SUCCESS);
-      
-        if (pMeterMetaInfo->pMeterMeta) {
-          code = tscSendMsgToServer(pSql);
-          if (code == TSDB_CODE_SUCCESS) return;
+      // tscProcessSql can add error into async res
+      tscProcessSql(pSql);
+      return;
+    } else {  // continue to process normal async query
+      if (pCmd->parseFinished) {
+        tscDebug("%p update table meta in local cache, continue to process sql and send corresponding query", pSql);
+
+        STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+        code = tscGetTableMeta(pSql, pTableMetaInfo);
+        if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+          return;
+        } else {
+          assert(code == TSDB_CODE_SUCCESS);      
         }
+
+        // in case of insert, redo parsing the sql string and build new submit data block for two reasons:
+        // 1. the table Id(tid & uid) may have been update, the submit block needs to be updated accordingly.
+        // 2. vnode may need the schema information along with submit block to update its local table schema.
+        if (pCmd->command == TSDB_SQL_INSERT || pCmd->command == TSDB_SQL_SELECT) {
+          tscDebug("%p redo parse sql string and proceed", pSql);
+          pCmd->parseFinished = false;
+          tscResetSqlCmdObj(pCmd, false);
+
+          code = tsParseSql(pSql, true);
+
+          if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+            return;
+          } else if (code != TSDB_CODE_SUCCESS) {
+            goto _error;
+          }
+
+          if (pCmd->command == TSDB_SQL_INSERT) {
+            /*
+             * Discard previous built submit blocks, and then parse the sql string again and build up all submit blocks,
+             * and send the required submit block according to index value in supporter to server.
+             */
+            pSql->fp = pSql->fetchFp;  // restore the fp
+            tscHandleInsertRetry(pSql);
+          } else if (pCmd->command == TSDB_SQL_SELECT) {  // in case of other query type, continue
+            tscProcessSql(pSql);
+          }
+        }else {  // in all other cases, simple retry
+          tscProcessSql(pSql);
+        }
+
+        return;
       } else {
+        tscDebug("%p continue parse sql after get table meta", pSql);
+
         code = tsParseSql(pSql, false);
-        if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
+        if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+          return;
+        } else if (code != TSDB_CODE_SUCCESS) {
+          goto _error;
+        }
+
+        if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_STMT_INSERT)) {
+          STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+          code = tscGetTableMeta(pSql, pTableMetaInfo);
+          if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+            return;
+          } else {
+            assert(code == TSDB_CODE_SUCCESS);      
+          }
+
+          (*pSql->fp)(pSql->param, pSql, code);
+          return;
+        }
+
+        // proceed to invoke the tscDoQuery();
       }
     }
 
   } else {  // stream computing
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-    code = tscGetMeterMeta(pSql, pMeterMetaInfo);
-    pRes->code = code;
+    STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
 
-    if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
+    code = tscGetTableMeta(pSql, pTableMetaInfo);
+    if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+      return;
+    } else if (code != TSDB_CODE_SUCCESS) {
+      goto _error;
+    }
 
-    if (code == TSDB_CODE_SUCCESS && UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-      code = tscGetMetricMeta(pSql, pCmd->clauseIndex);
-      pRes->code = code;
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+      code = tscGetSTableVgroupInfo(pSql, pCmd->clauseIndex);
+      if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+        return;
+      } else if (code != TSDB_CODE_SUCCESS) {
+        goto _error;
+      }
+    }
 
-      if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
+    tscDebug("%p stream:%p meta is updated, start new query, command:%d", pSql, pSql->pStream, pSql->cmd.command);
+    if (!pSql->cmd.parseFinished) {
+      tsParseSql(pSql, false);
     }
+    (*pSql->fp)(pSql->param, pSql, code);
+
+    return;
   }
 
+  tscDoQuery(pSql);
+  return;
+
+  _error:
   if (code != TSDB_CODE_SUCCESS) {
     pSql->res.code = code;
     tscQueueAsyncRes(pSql);
-    return;
   }
-
-  if (pSql->pStream) {
-    tscTrace("%p stream:%p meta is updated, start new query, command:%d", pSql, pSql->pStream, pSql->cmd.command);
-    /*
-     * NOTE:
-     * transfer the sql function for super table query before get meter/metric meta,
-     * since in callback functions, only tscProcessSql(pStream->pSql) is executed!
-     */
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-    
-    tscTansformSQLFunctionForSTableQuery(pQueryInfo);
-    tscIncStreamExecutionCount(pSql->pStream);
-  } else {
-    tscTrace("%p get meterMeta/metricMeta successfully", pSql);
-  }
-
-  tscDoQuery(pSql);
 }
diff --git a/src/client/src/tscCache.c b/src/client/src/tscCache.c
deleted file mode 100644
index 666d069a58c936e9028b46f9e6244923ac4be993..0000000000000000000000000000000000000000
--- a/src/client/src/tscCache.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * 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 "os.h"
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tmempool.h"
-#include "tsclient.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tutil.h"
-
-typedef struct _c_hash_t {
-  uint32_t          ip;
-  uint16_t          port;
-  struct _c_hash_t *prev;
-  struct _c_hash_t *next;
-  void *            data;
-  uint64_t          time;
-} SConnHash;
-
-typedef struct {
-  SConnHash **    connHashList;
-  mpool_h         connHashMemPool;
-  int             maxSessions;
-  int             total;
-  int *           count;
-  int64_t         keepTimer;
-  pthread_mutex_t mutex;
-  void (*cleanFp)(void *);
-  void *tmrCtrl;
-  void *pTimer;
-} SConnCache;
-
-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 += port;
-  while (*user != '\0') {
-    hash += *user;
-    user++;
-  }
-
-  hash = hash % pObj->maxSessions;
-
-  return hash;
-}
-
-void taosRemoveExpiredNodes(SConnCache *pObj, SConnHash *pNode, int hash, uint64_t time) {
-  if (pNode == NULL) return;
-  if (time < pObj->keepTimer + pNode->time) return;
-
-  SConnHash *pPrev = pNode->prev, *pNext;
-
-  while (pNode) {
-    (*pObj->cleanFp)(pNode->data);
-    pNext = pNode->next;
-    pObj->total--;
-    pObj->count[hash]--;
-    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;
-  }
-
-  if (pPrev)
-    pPrev->next = NULL;
-  else
-    pObj->connHashList[hash] = NULL;
-}
-
-void *taosAddConnIntoCache(void *handle, void *data, uint32_t ip, uint16_t port, char *user) {
-  int         hash;
-  SConnHash * pNode;
-  SConnCache *pObj;
-
-  uint64_t time = taosGetTimestampMs();
-
-  pObj = (SConnCache *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  if (data == NULL) {
-    tscTrace("data:%p ip:%p:%d not valid, not added in cache", data, ip, port);
-    return NULL;
-  }
-
-  hash = taosHashConn(pObj, ip, port, user);
-  pNode = (SConnHash *)taosMemPoolMalloc(pObj->connHashMemPool);
-  pNode->ip = ip;
-  pNode->port = port;
-  pNode->data = data;
-  pNode->prev = NULL;
-  pNode->time = time;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode->next = pObj->connHashList[hash];
-  if (pObj->connHashList[hash] != NULL) (pObj->connHashList[hash])->prev = pNode;
-  pObj->connHashList[hash] = pNode;
-
-  pObj->total++;
-  pObj->count[hash]++;
-  taosRemoveExpiredNodes(pObj, pNode->next, hash, time);
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  tscTrace("%p ip:0x%x:%hu:%d:%p added, connections in cache:%d", data, ip, port, hash, pNode, pObj->count[hash]);
-
-  return pObj;
-}
-
-void taosCleanConnCache(void *handle, void *tmrId) {
-  int         hash;
-  SConnHash * pNode;
-  SConnCache *pObj;
-
-  pObj = (SConnCache *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-  if (pObj->pTimer != tmrId) return;
-
-  uint64_t time = taosGetTimestampMs();
-
-  for (hash = 0; hash < pObj->maxSessions; ++hash) {
-    pthread_mutex_lock(&pObj->mutex);
-    pNode = pObj->connHashList[hash];
-    taosRemoveExpiredNodes(pObj, pNode, hash, time);
-    pthread_mutex_unlock(&pObj->mutex);
-  }
-
-  // tscTrace("timer, total connections in cache:%d", pObj->total);
-  taosTmrReset(taosCleanConnCache, pObj->keepTimer * 2, pObj, pObj->tmrCtrl, &pObj->pTimer);
-}
-
-void *taosGetConnFromCache(void *handle, uint32_t ip, uint16_t port, char *user) {
-  int         hash;
-  SConnHash * pNode;
-  SConnCache *pObj;
-  void *      pData = NULL;
-
-  pObj = (SConnCache *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  uint64_t time = taosGetTimestampMs();
-
-  hash = taosHashConn(pObj, ip, port, user);
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->connHashList[hash];
-  while (pNode) {
-    if (time >= pObj->keepTimer + pNode->time) {
-      taosRemoveExpiredNodes(pObj, pNode, hash, time);
-      pNode = NULL;
-      break;
-    }
-
-    if (pNode->ip == ip && pNode->port == port) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    taosRemoveExpiredNodes(pObj, pNode->next, hash, time);
-
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->connHashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    pData = pNode->data;
-    taosMemPoolFree(pObj->connHashMemPool, (char *)pNode);
-    pObj->total--;
-    pObj->count[hash]--;
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  if (pData) {
-    tscTrace("%p ip:0x%x:%hu:%d:%p retrieved, connections in cache:%d", pData, ip, port, hash, pNode, pObj->count[hash]);
-  }
-
-  return pData;
-}
-
-void *taosOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl, int64_t keepTimer) {
-  SConnHash **connHashList;
-  mpool_h     connHashMemPool;
-  SConnCache *pObj;
-
-  connHashMemPool = taosMemPoolInit(maxSessions, sizeof(SConnHash));
-  if (connHashMemPool == 0) return NULL;
-
-  connHashList = calloc(sizeof(SConnHash *), maxSessions);
-  if (connHashList == 0) {
-    taosMemPoolCleanUp(connHashMemPool);
-    return NULL;
-  }
-
-  pObj = malloc(sizeof(SConnCache));
-  if (pObj == NULL) {
-    taosMemPoolCleanUp(connHashMemPool);
-    free(connHashList);
-    return NULL;
-  }
-  memset(pObj, 0, sizeof(SConnCache));
-
-  pObj->count = calloc(sizeof(int), maxSessions);
-  pObj->total = 0;
-  pObj->keepTimer = keepTimer;
-  pObj->maxSessions = maxSessions;
-  pObj->connHashMemPool = connHashMemPool;
-  pObj->connHashList = connHashList;
-  pObj->cleanFp = cleanFp;
-  pObj->tmrCtrl = tmrCtrl;
-  taosTmrReset(taosCleanConnCache, pObj->keepTimer * 2, pObj, pObj->tmrCtrl, &pObj->pTimer);
-
-  pthread_mutex_init(&pObj->mutex, NULL);
-
-  return pObj;
-}
-
-void taosCloseConnCache(void *handle) {
-  SConnCache *pObj;
-
-  pObj = (SConnCache *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  taosTmrStopA(&(pObj->pTimer));
-
-  if (pObj->connHashMemPool) taosMemPoolCleanUp(pObj->connHashMemPool);
-
-  tfree(pObj->connHashList);
-  tfree(pObj->count)
-
-      pthread_mutex_unlock(&pObj->mutex);
-
-  pthread_mutex_destroy(&pObj->mutex);
-
-  memset(pObj, 0, sizeof(SConnCache));
-  free(pObj);
-}
diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c
index 248b197d5240e2ee0c680e46f4c542ccce21446e..be38a7af71ed8b97f9deb001b7bbc4fef80104e6 100644
--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -14,18 +14,19 @@
  */
 
 #include "os.h"
+#include "qAst.h"
+#include "qExtbuffer.h"
+#include "qFill.h"
+#include "qHistogram.h"
+#include "qPercentile.h"
+#include "qSyntaxtreefunction.h"
+#include "qTsbuf.h"
+#include "taosdef.h"
 #include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
-#include "thistogram.h"
-#include "tinterpolation.h"
-#include "tlog.h"
-#include "tscJoinProcess.h"
-#include "tscSyntaxtreefunction.h"
+#include "tscLog.h"
+#include "tscSubquery.h"
 #include "tscompression.h"
 #include "tsqlfunction.h"
-#include "ttime.h"
-#include "ttypes.h"
 #include "tutil.h"
 
 #define GET_INPUT_CHAR(x) (((char *)((x)->aInputElemBuf)) + ((x)->startOffset) * ((x)->inputBytes))
@@ -55,7 +56,8 @@
     for (int32_t i = 0; i < (ctx)->tagInfo.numOfTagCols; ++i) {                  \
       SQLFunctionCtx *__ctx = (ctx)->tagInfo.pTagCtxList[i];                     \
       if (__ctx->functionId == TSDB_FUNC_TS_DUMMY) {                             \
-        __ctx->tag = (tVariant){.i64Key = (ts), .nType = TSDB_DATA_TYPE_BIGINT}; \
+        __ctx->tag.i64Key = (ts); \
+        __ctx->tag.nType = TSDB_DATA_TYPE_BIGINT; \
       }                                                                          \
       aAggs[TSDB_FUNC_TAG].xFunction(__ctx);                                     \
     }                                                                            \
@@ -72,7 +74,7 @@ for (int32_t i = 0; i < (ctx)->tagInfo.numOfTagCols; ++i) {                  \
 void noop1(SQLFunctionCtx *UNUSED_PARAM(pCtx)) {}
 void noop2(SQLFunctionCtx *UNUSED_PARAM(pCtx), int32_t UNUSED_PARAM(index)) {}
 
-void doFinalizer(SQLFunctionCtx *pCtx) { resetResultInfo(GET_RES_INFO(pCtx)); }
+void doFinalizer(SQLFunctionCtx *pCtx) { RESET_RESULT_INFO(GET_RES_INFO(pCtx)); }
 
 typedef struct tValuePair {
   tVariant v;
@@ -115,6 +117,10 @@ typedef struct SFirstLastInfo {
 typedef struct SFirstLastInfo SLastrowInfo;
 typedef struct SPercentileInfo {
   tMemBucket *pMemBucket;
+  int32_t     stage;
+  double      minval;
+  double      maxval;
+  int64_t     numOfElems;
 } SPercentileInfo;
 
 typedef struct STopBotInfo {
@@ -137,192 +143,203 @@ typedef struct STSCompInfo {
   STSBuf *pTSBuf;
 } STSCompInfo;
 
+typedef struct SRateInfo {
+  int64_t CorrectionValue;
+  int64_t firstValue;
+  TSKEY   firstKey;
+  int64_t lastValue;
+  TSKEY   lastKey;
+  int8_t  hasResult;  // flag to denote has value
+  bool    isIRate;    // true for IRate functions, false for Rate functions
+  int64_t num;        // for sum/avg
+  double  sum;        // for sum/avg
+} SRateInfo;
+
 int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, int16_t *type,
-                          int16_t *bytes, int16_t *intermediateResBytes, int16_t extLength, bool isSuperTable) {
-  if (!isValidDataType(dataType, dataBytes)) {
-    pError("Illegal data type %d or data type length %d", dataType, dataBytes);
-    return TSDB_CODE_INVALID_SQL;
+                          int16_t *bytes, int32_t *interBytes, int16_t extLength, bool isSuperTable) {
+  if (!isValidDataType(dataType)) {
+    tscError("Illegal data type %d or data type length %d", dataType, dataBytes);
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
-
+  
   if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG_DUMMY ||
       functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TAGPRJ ||
       functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_INTERP) {
     *type = (int16_t)dataType;
     *bytes = (int16_t)dataBytes;
-    *intermediateResBytes = *bytes + sizeof(SResultInfo);
+    *interBytes = *bytes + sizeof(SResultInfo);
     return TSDB_CODE_SUCCESS;
   }
-
+  
+  // (uid, tid) + VGID + TAGSIZE + VARSTR_HEADER_SIZE
+  if (functionId == TSDB_FUNC_TID_TAG) { // todo use struct
+    *type = TSDB_DATA_TYPE_BINARY;
+    *bytes = (int16_t)(dataBytes + sizeof(int16_t) + sizeof(int64_t) + sizeof(int32_t) + sizeof(int32_t) + VARSTR_HEADER_SIZE);
+    *interBytes = *bytes;
+    return TSDB_CODE_SUCCESS;
+  }
+  
   if (functionId == TSDB_FUNC_COUNT) {
     *type = TSDB_DATA_TYPE_BIGINT;
     *bytes = sizeof(int64_t);
-    *intermediateResBytes = *bytes;
+    *interBytes = *bytes;
     return TSDB_CODE_SUCCESS;
   }
-
+  
   if (functionId == TSDB_FUNC_ARITHM) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes = *bytes;
+    *interBytes = *bytes;
     return TSDB_CODE_SUCCESS;
   }
-
+  
   if (functionId == TSDB_FUNC_TS_COMP) {
     *type = TSDB_DATA_TYPE_BINARY;
     *bytes = sizeof(int32_t);  // this results is compressed ts data
-    *intermediateResBytes = POINTER_BYTES;
+    *interBytes = POINTER_BYTES;
     return TSDB_CODE_SUCCESS;
   }
-
+  
   if (isSuperTable) {
     if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) {
       *type = TSDB_DATA_TYPE_BINARY;
-      *bytes = dataBytes + DATA_SET_FLAG_SIZE;
-      *intermediateResBytes = *bytes;
-
+      *bytes = (int16_t)(dataBytes + DATA_SET_FLAG_SIZE);
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_SUM) {
       *type = TSDB_DATA_TYPE_BINARY;
       *bytes = sizeof(SSumInfo);
-      *intermediateResBytes = *bytes;
-
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_AVG) {
       *type = TSDB_DATA_TYPE_BINARY;
       *bytes = sizeof(SAvgInfo);
-      *intermediateResBytes = *bytes;
-
+      *interBytes = *bytes;
+      return TSDB_CODE_SUCCESS;
+      
+    } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE) {
+      *type = TSDB_DATA_TYPE_DOUBLE;
+      *bytes = sizeof(SRateInfo);
+      *interBytes = sizeof(SRateInfo);
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
       *type = TSDB_DATA_TYPE_BINARY;
-      *bytes = sizeof(STopBotInfo) + (sizeof(tValuePair) + POINTER_BYTES + extLength) * param;
-      *intermediateResBytes = *bytes;
-
+      *bytes = (int16_t)(sizeof(STopBotInfo) + (sizeof(tValuePair) + POINTER_BYTES + extLength) * param);
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_SPREAD) {
       *type = TSDB_DATA_TYPE_BINARY;
       *bytes = sizeof(SSpreadInfo);
-      *intermediateResBytes = *bytes;
-
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_APERCT) {
       *type = TSDB_DATA_TYPE_BINARY;
       *bytes = sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1) + sizeof(SHistogramInfo) + sizeof(SAPercentileInfo);
-      *intermediateResBytes = *bytes;
-
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_LAST_ROW) {
       *type = TSDB_DATA_TYPE_BINARY;
-      *bytes = sizeof(SLastrowInfo) + dataBytes;
-      *intermediateResBytes = *bytes;
-
+      *bytes = (int16_t)(sizeof(SLastrowInfo) + dataBytes);
+      *interBytes = *bytes;
+      
       return TSDB_CODE_SUCCESS;
     } else if (functionId == TSDB_FUNC_TWA) {
       *type = TSDB_DATA_TYPE_DOUBLE;
       *bytes = sizeof(STwaInfo);
-      *intermediateResBytes = sizeof(STwaInfo);
+      *interBytes = *bytes;
       return TSDB_CODE_SUCCESS;
     }
   }
-
+  
   if (functionId == TSDB_FUNC_SUM) {
     if (dataType >= TSDB_DATA_TYPE_TINYINT && dataType <= TSDB_DATA_TYPE_BIGINT) {
       *type = TSDB_DATA_TYPE_BIGINT;
     } else {
       *type = TSDB_DATA_TYPE_DOUBLE;
     }
-
+    
     *bytes = sizeof(int64_t);
-    *intermediateResBytes = sizeof(SSumInfo);
+    *interBytes = sizeof(SSumInfo);
     return TSDB_CODE_SUCCESS;
   } else if (functionId == TSDB_FUNC_APERCT) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes =
+    *interBytes =
         sizeof(SAPercentileInfo) + sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1);
     return TSDB_CODE_SUCCESS;
   } else if (functionId == TSDB_FUNC_TWA) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes = sizeof(STwaInfo);
+    *interBytes = sizeof(STwaInfo);
     return TSDB_CODE_SUCCESS;
   }
-
+  
   if (functionId == TSDB_FUNC_AVG) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes = sizeof(SAvgInfo);
+    *interBytes = sizeof(SAvgInfo);
+  } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE) {
+    *type = TSDB_DATA_TYPE_DOUBLE;
+    *bytes = sizeof(double);
+    *interBytes = sizeof(SRateInfo);
   } else if (functionId == TSDB_FUNC_STDDEV) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes = sizeof(SStddevInfo);
+    *interBytes = sizeof(SStddevInfo);
   } else if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) {
     *type = (int16_t)dataType;
     *bytes = (int16_t)dataBytes;
-    *intermediateResBytes = dataBytes + DATA_SET_FLAG_SIZE;
+    *interBytes = dataBytes + DATA_SET_FLAG_SIZE;
   } else if (functionId == TSDB_FUNC_FIRST || functionId == TSDB_FUNC_LAST) {
     *type = (int16_t)dataType;
     *bytes = (int16_t)dataBytes;
-    *intermediateResBytes = dataBytes + sizeof(SResultInfo);
+    *interBytes = dataBytes + sizeof(SResultInfo);
   } else if (functionId == TSDB_FUNC_SPREAD) {
     *type = (int16_t)TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
-    *intermediateResBytes = sizeof(SSpreadInfo);
+    *interBytes = sizeof(SSpreadInfo);
   } else if (functionId == TSDB_FUNC_PERCT) {
     *type = (int16_t)TSDB_DATA_TYPE_DOUBLE;
     *bytes = (int16_t)sizeof(double);
-    //*intermediateResBytes = POINTER_BYTES;
-    *intermediateResBytes = (int16_t)sizeof(double);
+    *interBytes = (int16_t)sizeof(SPercentileInfo);
   } else if (functionId == TSDB_FUNC_LEASTSQR) {
     *type = TSDB_DATA_TYPE_BINARY;
     *bytes = TSDB_AVG_FUNCTION_INTER_BUFFER_SIZE;  // string
-    *intermediateResBytes = *bytes + sizeof(SResultInfo);
+    *interBytes = *bytes + sizeof(SResultInfo);
   } else if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) {
     *type = TSDB_DATA_TYPE_BINARY;
-    *bytes = dataBytes + sizeof(SFirstLastInfo);
-    *intermediateResBytes = *bytes;
+    *bytes = (int16_t)(dataBytes + sizeof(SFirstLastInfo));
+    *interBytes = *bytes;
   } else if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
     *type = (int16_t)dataType;
     *bytes = (int16_t)dataBytes;
-
+    
     size_t size = sizeof(STopBotInfo) + (sizeof(tValuePair) + POINTER_BYTES + extLength) * param;
-
+    
     // the output column may be larger than sizeof(STopBotInfo)
-    *intermediateResBytes = size;
+    *interBytes = (int32_t)size;
   } else if (functionId == TSDB_FUNC_LAST_ROW) {
     *type = (int16_t)dataType;
     *bytes = (int16_t)dataBytes;
-    *intermediateResBytes = dataBytes + sizeof(SLastrowInfo);
+    *interBytes = dataBytes;
   } else {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
-
+  
   return TSDB_CODE_SUCCESS;
 }
 
-/**
- * the numOfRes should be kept, since it may be used later
- * and allow the ResultInfo to be re initialized
- */
-void resetResultInfo(SResultInfo *pResInfo) { pResInfo->initialized = false; }
-
-void initResultInfo(SResultInfo *pResInfo) {
-  pResInfo->initialized = true;  // the this struct has been initialized flag
-
-  pResInfo->complete = false;
-  pResInfo->hasResult = false;
-  pResInfo->numOfRes = 0;
-
-  memset(pResInfo->interResultBuf, 0, (size_t)pResInfo->bufLen);
-}
-
-void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable) {
+void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable, char* buf) {
   assert(pResInfo->interResultBuf == NULL);
-
+  
   pResInfo->bufLen = size;
   pResInfo->superTableQ = superTable;
-
-  pResInfo->interResultBuf = calloc(1, (size_t)size);
+  pResInfo->interResultBuf = buf;
 }
 
 // set the query flag to denote that query is completed
@@ -336,9 +353,8 @@ static bool function_setup(SQLFunctionCtx *pCtx) {
   if (pResInfo->initialized) {
     return false;
   }
-
+  
   memset(pCtx->aOutputBuf, 0, (size_t)pCtx->outputBytes);
-
   initResultInfo(pResInfo);
   return true;
 }
@@ -352,10 +368,12 @@ static bool function_setup(SQLFunctionCtx *pCtx) {
  */
 static void function_finalizer(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
   if (pResInfo->hasResult != DATA_SET_FLAG) {
-    pTrace("no result generated, result is set to NULL");
-    setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
+    if (pCtx->outputType == TSDB_DATA_TYPE_BINARY || pCtx->outputType == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(pCtx->aOutputBuf, pCtx->outputType);
+    } else {
+      setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
+    }
   }
   
   doFinalizer(pCtx);
@@ -367,44 +385,37 @@ static void function_finalizer(SQLFunctionCtx *pCtx) {
  */
 static void count_function(SQLFunctionCtx *pCtx) {
   int32_t numOfElem = 0;
-
-  if (IS_DATA_BLOCK_LOADED(pCtx->blockStatus)) {
-    /*
-     * In following cases, the data block is loaded:
-     * 1. A first/last file block for a query
-     * 2. Required to handle other queries, such as apercentile/twa/stddev etc.
-     * 3. A cache block
-     */
+  
+  /*
+   * 1. column data missing (schema modified) causes pCtx->hasNull == true. pCtx->preAggVals.isSet == true;
+   * 2. for general non-primary key columns, pCtx->hasNull may be true or false, pCtx->preAggVals.isSet == true;
+   * 3. for primary key column, pCtx->hasNull always be false, pCtx->preAggVals.isSet == false;
+   */
+  if (pCtx->preAggVals.isSet) {
+    numOfElem = pCtx->size - pCtx->preAggVals.statis.numOfNull;
+  } else {
     if (pCtx->hasNull) {
       for (int32_t i = 0; i < pCtx->size; ++i) {
         char *val = GET_INPUT_CHAR_INDEX(pCtx, i);
         if (isNull(val, pCtx->inputType)) {
           continue;
         }
-
+        
         numOfElem += 1;
       }
     } else {
-      numOfElem = pCtx->size;
-    }
-  } else {
-    /*
-     * 1. column data missing (schema modified) causes pCtx->hasNull == true. pCtx->preAggVals.isSet == true;
-     * 2. for general non-primary key columns, pCtx->hasNull may be true or false, pCtx->preAggVals.isSet == true;
-     * 3. for primary key column, pCtx->hasNull always be false, pCtx->preAggVals.isSet == false;
-     */
-    if (pCtx->preAggVals.isSet) {
-      numOfElem = pCtx->size - pCtx->preAggVals.numOfNull;
-    } else {
-      assert(pCtx->hasNull == false);
+      /*
+       * when counting on the primary time stamp column and no statistics data is provided,
+       * simple use the size value
+       */
       numOfElem = pCtx->size;
     }
   }
-
+  
   if (numOfElem > 0) {
     GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
   }
-
+  
   *((int64_t *)pCtx->aOutputBuf) += numOfElem;
   SET_VAL(pCtx, numOfElem, 1);
 }
@@ -414,11 +425,11 @@ static void count_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
-
+  
   *((int64_t *)pCtx->aOutputBuf) += 1;
-
+  
   // do not need it actually
   SResultInfo *pInfo = GET_RES_INFO(pCtx);
   pInfo->hasResult = DATA_SET_FLAG;
@@ -429,7 +440,7 @@ static void count_func_merge(SQLFunctionCtx *pCtx) {
   for (int32_t i = 0; i < pCtx->size; ++i) {
     *((int64_t *)pCtx->aOutputBuf) += pData[i];
   }
-
+  
   SET_VAL(pCtx, pCtx->size, 1);
 }
 
@@ -442,15 +453,15 @@ static void count_func_merge(SQLFunctionCtx *pCtx) {
  * @param filterCols
  * @return
  */
-int32_t count_load_data_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
+int32_t count_load_data_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
   if (colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
     return BLK_DATA_NO_NEEDED;
   } else {
-    return BLK_DATA_FILEDS_NEEDED;
+    return BLK_DATA_STATIS_NEEDED;
   }
 }
 
-int32_t no_data_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
+int32_t no_data_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
   return BLK_DATA_NO_NEEDED;
 }
 
@@ -503,26 +514,26 @@ do {                                              \
 
 static void do_sum(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   // Only the pre-computing information loaded and actual data does not loaded
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) && pCtx->preAggVals.isSet) {
-    notNullElems = pCtx->size - pCtx->preAggVals.numOfNull;
-    assert(pCtx->size >= pCtx->preAggVals.numOfNull);
-
+  if (pCtx->preAggVals.isSet) {
+    notNullElems = pCtx->size - pCtx->preAggVals.statis.numOfNull;
+    assert(pCtx->size >= pCtx->preAggVals.statis.numOfNull);
+    
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
       int64_t *retVal = (int64_t*) pCtx->aOutputBuf;
-      *retVal += pCtx->preAggVals.sum;
+      *retVal += pCtx->preAggVals.statis.sum;
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
       double *retVal = (double*) pCtx->aOutputBuf;
-      *retVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.sum));
+      *retVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.sum));
     }
   } else {  // computing based on the true data block
     void *pData = GET_INPUT_CHAR(pCtx);
     notNullElems = 0;
-
+    
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
       int64_t *retVal = (int64_t*) pCtx->aOutputBuf;
-
+      
       if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
         LIST_ADD_N(*retVal, pCtx, pData, int8_t, notNullElems, pCtx->inputType);
       } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
@@ -540,10 +551,10 @@ static void do_sum(SQLFunctionCtx *pCtx) {
       LIST_ADD_N(*retVal, pCtx, pData, float, notNullElems, pCtx->inputType);
     }
   }
-
+  
   // data in the check operation are all null, not output
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
   }
@@ -554,10 +565,10 @@ static void do_sum_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   int64_t *res = (int64_t*) pCtx->aOutputBuf;
-
+  
   if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
     *res += GET_INT8_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
@@ -573,13 +584,13 @@ static void do_sum_f(SQLFunctionCtx *pCtx, int32_t index) {
     double *retVal = (double*) pCtx->aOutputBuf;
     *retVal += GET_FLOAT_VAL(pData);
   }
-
+  
   GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
 }
 
 static void sum_function(SQLFunctionCtx *pCtx) {
   do_sum(pCtx);
-
+  
   // keep the result data in output buffer, not in the intermediate buffer
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   if (pResInfo->hasResult == DATA_SET_FLAG && pResInfo->superTableQ) {
@@ -591,7 +602,7 @@ static void sum_function(SQLFunctionCtx *pCtx) {
 
 static void sum_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   do_sum_f(pCtx, index);
-
+  
   // keep the result data in output buffer, not in the intermediate buffer
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   if (pResInfo->hasResult == DATA_SET_FLAG && pResInfo->superTableQ) {
@@ -602,20 +613,20 @@ static void sum_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 
 static int32_t sum_merge_impl(const SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   GET_TRUE_DATA_TYPE();
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *    input = GET_INPUT_CHAR_INDEX(pCtx, i);
     SSumInfo *pInput = (SSumInfo *)input;
     if (pInput->hasResult != DATA_SET_FLAG) {
       continue;
     }
-
+    
     notNullElems++;
-
+    
     switch (type) {
       case TSDB_DATA_TYPE_TINYINT:
       case TSDB_DATA_TYPE_SMALLINT:
@@ -630,16 +641,16 @@ static int32_t sum_merge_impl(const SQLFunctionCtx *pCtx) {
       }
     }
   }
-
+  
   return notNullElems;
 }
 
 static void sum_func_merge(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = sum_merge_impl(pCtx);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
   SSumInfo *pSumInfo = (SSumInfo *)pCtx->aOutputBuf;
-
+  
   if (notNullElems > 0) {
     //    pCtx->numOfIteratedElems += notNullElems;
     pSumInfo->hasResult = DATA_SET_FLAG;
@@ -648,29 +659,29 @@ static void sum_func_merge(SQLFunctionCtx *pCtx) {
 
 static void sum_func_second_merge(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = sum_merge_impl(pCtx);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   if (notNullElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
 }
 
-static int32_t precal_req_load_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
-  return BLK_DATA_FILEDS_NEEDED;
+static int32_t statisRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
+  return BLK_DATA_STATIS_NEEDED;
 }
 
-static int32_t data_req_load_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
+static int32_t dataBlockRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
   return BLK_DATA_ALL_NEEDED;
 }
 
 // todo: if  column in current data block are null, opt for this case
-static int32_t first_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
-  if (pCtx->order == TSQL_SO_DESC) {
+static int32_t firstFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
     return BLK_DATA_NO_NEEDED;
   }
-
+  
   // no result for first query, data block is required
   if (GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
@@ -679,11 +690,11 @@ static int32_t first_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end,
   }
 }
 
-static int32_t last_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus) {
-  if (pCtx->order == TSQL_SO_ASC) {
+static int32_t lastFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
+  if (pCtx->order != pCtx->param[0].i64Key) {
     return BLK_DATA_NO_NEEDED;
   }
-
+  
   if (GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
   } else {
@@ -691,32 +702,47 @@ static int32_t last_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end,
   }
 }
 
-static int32_t first_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId,
-                                        int32_t blockStatus) {
-  if (pCtx->order == TSQL_SO_DESC) {
+static int32_t firstDistFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
     return BLK_DATA_NO_NEEDED;
   }
 
-  SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->aOutputBuf + pCtx->inputBytes);
-  if (pInfo->hasResult != DATA_SET_FLAG) {
+  // not initialized yet, it is the first block, load it.
+  if (pCtx->aOutputBuf == NULL) {
     return BLK_DATA_ALL_NEEDED;
-  } else {  // data in current block is not earlier than current result
-    return (pInfo->ts <= start) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
   }
-}
 
-static int32_t last_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId,
-                                       int32_t blockStatus) {
-  if (pCtx->order == TSQL_SO_ASC) {
+  return BLK_DATA_ALL_NEEDED;
+  // TODO pCtx->aOutputBuf is the previous windowRes output buffer, not current unloaded block. so the following filter
+  // is invalid
+//  SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->aOutputBuf + pCtx->inputBytes);
+//  if (pInfo->hasResult != DATA_SET_FLAG) {
+//    return BLK_DATA_ALL_NEEDED;
+//  } else {  // data in current block is not earlier than current result
+//    return (pInfo->ts <= start) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
+//  }
+}
+
+static int32_t lastDistFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
+  if (pCtx->order != pCtx->param[0].i64Key) {
     return BLK_DATA_NO_NEEDED;
   }
 
-  SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->aOutputBuf + pCtx->inputBytes);
-  if (pInfo->hasResult != DATA_SET_FLAG) {
+  // not initialized yet, it is the first block, load it.
+  if (pCtx->aOutputBuf == NULL) {
     return BLK_DATA_ALL_NEEDED;
-  } else {
-    return (pInfo->ts > end) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
   }
+
+  return BLK_DATA_ALL_NEEDED;
+  // TODO pCtx->aOutputBuf is the previous windowRes output buffer, not current unloaded block. so the following filter
+  // is invalid
+
+//  SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->aOutputBuf + pCtx->inputBytes);
+//  if (pInfo->hasResult != DATA_SET_FLAG) {
+//    return BLK_DATA_ALL_NEEDED;
+//  } else {
+//    return (pInfo->ts > end) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
+//  }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////
@@ -727,26 +753,26 @@ static int32_t last_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY
  */
 static void avg_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   // NOTE: keep the intermediate result into the interResultBuf
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   SAvgInfo *pAvgInfo = (SAvgInfo *)pResInfo->interResultBuf;
   double *  pVal = &pAvgInfo->sum;
-
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) && pCtx->preAggVals.isSet) {
+  
+  if (pCtx->preAggVals.isSet) {
     // Pre-aggregation
-    notNullElems = pCtx->size - pCtx->preAggVals.numOfNull;
+    notNullElems = pCtx->size - pCtx->preAggVals.statis.numOfNull;
     assert(notNullElems >= 0);
-
+    
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
-      *pVal += pCtx->preAggVals.sum;
+      *pVal += pCtx->preAggVals.statis.sum;
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
-      *pVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.sum));
+      *pVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.sum));
     }
   } else {
     void *pData = GET_INPUT_CHAR(pCtx);
-
+    
     if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
       LIST_ADD_N(*pVal, pCtx, pData, int8_t, notNullElems, pCtx->inputType);
     } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
@@ -761,18 +787,18 @@ static void avg_function(SQLFunctionCtx *pCtx) {
       LIST_ADD_N(*pVal, pCtx, pData, float, notNullElems, pCtx->inputType);
     }
   }
-
+  
   if (!pCtx->hasNull) {
     assert(notNullElems == pCtx->size);
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
   pAvgInfo->num += notNullElems;
-
+  
   if (notNullElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
-
+  
   // keep the data into the final output buffer for super table query since this execution may be the last one
   if (pResInfo->superTableQ) {
     memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SAvgInfo));
@@ -784,14 +810,14 @@ static void avg_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
-
+  
   // NOTE: keep the intermediate result into the interResultBuf
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   SAvgInfo *pAvgInfo = (SAvgInfo *)pResInfo->interResultBuf;
-
+  
   if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
     pAvgInfo->sum += GET_INT8_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
@@ -805,13 +831,13 @@ static void avg_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
     pAvgInfo->sum += GET_FLOAT_VAL(pData);
   }
-
+  
   // restore sum and count of elements
   pAvgInfo->num += 1;
-
+  
   // set has result flag
   pResInfo->hasResult = DATA_SET_FLAG;
-
+  
   // keep the data into the final output buffer for super table query since this execution may be the last one
   if (pResInfo->superTableQ) {
     memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SAvgInfo));
@@ -821,20 +847,20 @@ static void avg_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 static void avg_func_merge(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   SAvgInfo *pAvgInfo = (SAvgInfo *)pResInfo->interResultBuf;
   char *    input = GET_INPUT_CHAR(pCtx);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i, input += pCtx->inputBytes) {
     SAvgInfo *pInput = (SAvgInfo *)input;
     if (pInput->num == 0) {  // current buffer is null
       continue;
     }
-
+    
     pAvgInfo->sum += pInput->sum;
     pAvgInfo->num += pInput->num;
   }
-
+  
   // if the data set hasResult is not set, the result is null
   if (pAvgInfo->num > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -844,18 +870,18 @@ static void avg_func_merge(SQLFunctionCtx *pCtx) {
 
 static void avg_func_second_merge(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   double *sum = (double*) pCtx->aOutputBuf;
   char *  input = GET_INPUT_CHAR(pCtx);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i, input += pCtx->inputBytes) {
     SAvgInfo *pInput = (SAvgInfo *)input;
     if (pInput->num == 0) {  // current input is null
       continue;
     }
-
+    
     *sum += pInput->sum;
-
+    
     // keep the number of data into the temp buffer
     *(int64_t *)pResInfo->interResultBuf += pInput->num;
   }
@@ -866,29 +892,29 @@ static void avg_func_second_merge(SQLFunctionCtx *pCtx) {
  */
 static void avg_finalizer(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   if (pCtx->currentStage == SECONDARY_STAGE_MERGE) {
     assert(pCtx->inputType == TSDB_DATA_TYPE_BINARY);
-
+    
     if (GET_INT64_VAL(pResInfo->interResultBuf) <= 0) {
       setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
       return;  // empty table
     }
-
+    
     *(double *)pCtx->aOutputBuf = (*(double *)pCtx->aOutputBuf) / *(int64_t *)pResInfo->interResultBuf;
   } else {  // this is the secondary merge, only in the secondary merge, the input type is TSDB_DATA_TYPE_BINARY
     assert(pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_DOUBLE);
-
+    
     SAvgInfo *pAvgInfo = (SAvgInfo *)pResInfo->interResultBuf;
-
+    
     if (pAvgInfo->num == 0) {  // all data are NULL or empty table
       setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
       return;
     }
-
+    
     *(double *)pCtx->aOutputBuf = pAvgInfo->sum / pAvgInfo->num;
   }
-
+  
   // cannot set the numOfIteratedElems again since it is set during previous iteration
   GET_RES_INFO(pCtx)->numOfRes = 1;
   doFinalizer(pCtx);
@@ -897,58 +923,62 @@ static void avg_finalizer(SQLFunctionCtx *pCtx) {
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 static void minMax_function(SQLFunctionCtx *pCtx, char *pOutput, int32_t isMin, int32_t *notNullElems) {
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) && pCtx->preAggVals.isSet) {
-    // data in current data block are qualified to the query
-    *notNullElems = pCtx->size - pCtx->preAggVals.numOfNull;
+  // data in current data block are qualified to the query
+  if (pCtx->preAggVals.isSet) {
+    *notNullElems = pCtx->size - pCtx->preAggVals.statis.numOfNull;
     assert(*notNullElems >= 0);
-
+    
     void *  tval = NULL;
     int16_t index = 0;
-
+    
     if (isMin) {
-      tval = &pCtx->preAggVals.min;
-      index = pCtx->preAggVals.minIndex;
+      tval = &pCtx->preAggVals.statis.min;
+      index = pCtx->preAggVals.statis.minIndex;
     } else {
-      tval = &pCtx->preAggVals.max;
-      index = pCtx->preAggVals.maxIndex;
+      tval = &pCtx->preAggVals.statis.max;
+      index = pCtx->preAggVals.statis.maxIndex;
     }
-  
-    /**
-     * NOTE: work around the bug caused by invalid pre-calculated function.
-     * Here the selectivity + ts will not return correct value.
-     *
-     * The following codes of 3 lines will be removed later.
-     */
-    if (index < 0 || index >= pCtx->size + pCtx->startOffset) {
-      index = 0;
+    
+    TSKEY key = TSKEY_INITIAL_VAL;
+    if (pCtx->ptsList != NULL) {
+      /**
+       * NOTE: work around the bug caused by invalid pre-calculated function.
+       * Here the selectivity + ts will not return correct value.
+       *
+       * The following codes of 3 lines will be removed later.
+       */
+      if (index < 0 || index >= pCtx->size + pCtx->startOffset) {
+        index = 0;
+      }
+      
+      key = pCtx->ptsList[index];
     }
     
-    TSKEY key = pCtx->ptsList[index];
-
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
       int64_t val = GET_INT64_VAL(tval);
       if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
         int8_t *data = (int8_t *)pOutput;
-
-        UPDATE_DATA(pCtx, *data, val, notNullElems, isMin, key);
+        
+        UPDATE_DATA(pCtx, *data, (int8_t)val, notNullElems, isMin, key);
       } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
         int16_t *data = (int16_t *)pOutput;
-
-        UPDATE_DATA(pCtx, *data, val, notNullElems, isMin, key);
+        
+        UPDATE_DATA(pCtx, *data, (int16_t)val, notNullElems, isMin, key);
       } else if (pCtx->inputType == TSDB_DATA_TYPE_INT) {
         int32_t *data = (int32_t *)pOutput;
 #if defined(_DEBUG_VIEW)
-        pTrace("max value updated according to pre-cal:%d", *data);
+        tscDebug("max value updated according to pre-cal:%d", *data);
 #endif
-
+        
         if ((*data < val) ^ isMin) {
-          *data = val;
+          *data = (int32_t)val;
           for (int32_t i = 0; i < (pCtx)->tagInfo.numOfTagCols; ++i) {
             SQLFunctionCtx *__ctx = pCtx->tagInfo.pTagCtxList[i];
             if (__ctx->functionId == TSDB_FUNC_TS_DUMMY) {
-              __ctx->tag = (tVariant){.i64Key = key, .nType = TSDB_DATA_TYPE_BIGINT};
+              __ctx->tag.i64Key = key;
+              __ctx->tag.nType = TSDB_DATA_TYPE_BIGINT;
             }
-
+            
             aAggs[TSDB_FUNC_TAG].xFunction(__ctx);
           }
         }
@@ -959,21 +989,21 @@ static void minMax_function(SQLFunctionCtx *pCtx, char *pOutput, int32_t isMin,
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
       double *data = (double *)pOutput;
       double  val = GET_DOUBLE_VAL(tval);
-
+      
       UPDATE_DATA(pCtx, *data, val, notNullElems, isMin, key);
     } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
       float *data = (float *)pOutput;
       double val = GET_DOUBLE_VAL(tval);
-
-      UPDATE_DATA(pCtx, *data, val, notNullElems, isMin, key);
+      
+      UPDATE_DATA(pCtx, *data, (float)val, notNullElems, isMin, key);
     }
-
+    
     return;
   }
-
+  
   void *p = GET_INPUT_CHAR(pCtx);
   *notNullElems = 0;
-
+  
   if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
     if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
       TYPED_LOOPCHECK_N(int8_t, pOutput, p, pCtx, pCtx->inputType, isMin, *notNullElems);
@@ -982,23 +1012,23 @@ static void minMax_function(SQLFunctionCtx *pCtx, char *pOutput, int32_t isMin,
     } else if (pCtx->inputType == TSDB_DATA_TYPE_INT) {
       int32_t *pData = p;
       int32_t *retVal = (int32_t*) pOutput;
-
+      
       for (int32_t i = 0; i < pCtx->size; ++i) {
         if (pCtx->hasNull && isNull((const char*)&pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if ((*retVal < pData[i]) ^ isMin) {
           *retVal = pData[i];
           TSKEY k = pCtx->ptsList[i];
-
+          
           DO_UPDATE_TAG_COLUMNS(pCtx, k);
         }
-
+        
         *notNullElems += 1;
       }
 #if defined(_DEBUG_VIEW)
-      pTrace("max value updated:%d", *retVal);
+      tscDebug("max value updated:%d", *retVal);
 #endif
     } else if (pCtx->inputType == TSDB_DATA_TYPE_BIGINT) {
       TYPED_LOOPCHECK_N(int64_t, pOutput, p, pCtx, pCtx->inputType, isMin, *notNullElems);
@@ -1014,9 +1044,9 @@ static bool min_func_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;  // not initialized since it has been initialized
   }
-
+  
   GET_TRUE_DATA_TYPE();
-
+  
   switch (type) {
     case TSDB_DATA_TYPE_INT:
       *((int32_t *)pCtx->aOutputBuf) = INT32_MAX;
@@ -1037,9 +1067,9 @@ static bool min_func_setup(SQLFunctionCtx *pCtx) {
       *((int8_t *)pCtx->aOutputBuf) = INT8_MAX;
       break;
     default:
-      pError("illegal data type:%d in min/max query", pCtx->inputType);
+      tscError("illegal data type:%d in min/max query", pCtx->inputType);
   }
-
+  
   return true;
 }
 
@@ -1047,9 +1077,9 @@ static bool max_func_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;  // not initialized since it has been initialized
   }
-
+  
   GET_TRUE_DATA_TYPE();
-
+  
   switch (type) {
     case TSDB_DATA_TYPE_INT:
       *((int32_t *)pCtx->aOutputBuf) = INT32_MIN;
@@ -1070,9 +1100,9 @@ static bool max_func_setup(SQLFunctionCtx *pCtx) {
       *((int8_t *)pCtx->aOutputBuf) = INT8_MIN;
       break;
     default:
-      pError("illegal data type:%d in min/max query", pCtx->inputType);
+      tscError("illegal data type:%d in min/max query", pCtx->inputType);
   }
-
+  
   return true;
 }
 
@@ -1082,13 +1112,13 @@ static bool max_func_setup(SQLFunctionCtx *pCtx) {
 static void min_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
   minMax_function(pCtx, pCtx->aOutputBuf, 1, &notNullElems);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
-
+    
     // set the flag for super table query
     if (pResInfo->superTableQ) {
       *(pCtx->aOutputBuf + pCtx->inputBytes) = DATA_SET_FLAG;
@@ -1099,13 +1129,13 @@ static void min_function(SQLFunctionCtx *pCtx) {
 static void max_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
   minMax_function(pCtx, pCtx->aOutputBuf, 0, &notNullElems);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
-
+    
     // set the flag for super table query
     if (pResInfo->superTableQ) {
       *(pCtx->aOutputBuf + pCtx->inputBytes) = DATA_SET_FLAG;
@@ -1115,18 +1145,18 @@ static void max_function(SQLFunctionCtx *pCtx) {
 
 static int32_t minmax_merge_impl(SQLFunctionCtx *pCtx, int32_t bytes, char *output, bool isMin) {
   int32_t notNullElems = 0;
-
+  
   GET_TRUE_DATA_TYPE();
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *input = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (input[bytes] != DATA_SET_FLAG) {
       continue;
     }
-
+    
     switch (type) {
       case TSDB_DATA_TYPE_TINYINT: {
         int8_t v = GET_INT8_VAL(input);
@@ -1142,12 +1172,12 @@ static int32_t minmax_merge_impl(SQLFunctionCtx *pCtx, int32_t bytes, char *outp
         int32_t v = GET_INT32_VAL(input);
         if ((*(int32_t *)output < v) ^ isMin) {
           *(int32_t *)output = v;
-
+          
           for (int32_t i = 0; i < pCtx->tagInfo.numOfTagCols; ++i) {
             SQLFunctionCtx *__ctx = pCtx->tagInfo.pTagCtxList[i];
             aAggs[TSDB_FUNC_TAG].xFunction(__ctx);
           }
-
+          
           notNullElems++;
         }
         break;
@@ -1171,15 +1201,15 @@ static int32_t minmax_merge_impl(SQLFunctionCtx *pCtx, int32_t bytes, char *outp
         break;
     }
   }
-
+  
   return notNullElems;
 }
 
 static void min_func_merge(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = minmax_merge_impl(pCtx, pCtx->inputBytes, pCtx->aOutputBuf, 1);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {  // for super table query, SResultInfo is not used
     char *flag = pCtx->aOutputBuf + pCtx->inputBytes;
     *flag = DATA_SET_FLAG;
@@ -1188,9 +1218,9 @@ static void min_func_merge(SQLFunctionCtx *pCtx) {
 
 static void min_func_second_merge(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = minmax_merge_impl(pCtx, pCtx->outputBytes, pCtx->aOutputBuf, 1);
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   if (notNullElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -1199,7 +1229,7 @@ static void min_func_second_merge(SQLFunctionCtx *pCtx) {
 
 static void max_func_merge(SQLFunctionCtx *pCtx) {
   int32_t numOfElems = minmax_merge_impl(pCtx, pCtx->inputBytes, pCtx->aOutputBuf, 0);
-
+  
   SET_VAL(pCtx, numOfElems, 1);
   if (numOfElems > 0) {
     char *flag = pCtx->aOutputBuf + pCtx->inputBytes;
@@ -1209,9 +1239,9 @@ static void max_func_merge(SQLFunctionCtx *pCtx) {
 
 static void max_func_second_merge(SQLFunctionCtx *pCtx) {
   int32_t numOfElem = minmax_merge_impl(pCtx, pCtx->outputBytes, pCtx->aOutputBuf, 0);
-
+  
   SET_VAL(pCtx, numOfElem, 1);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   if (numOfElem > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -1221,40 +1251,40 @@ static void max_func_second_merge(SQLFunctionCtx *pCtx) {
 static void minMax_function_f(SQLFunctionCtx *pCtx, int32_t index, int32_t isMin) {
   char *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   TSKEY key = pCtx->ptsList[index];
-
+  
   int32_t num = 0;
   if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
     int8_t *output = (int8_t *)pCtx->aOutputBuf;
     int8_t  i = GET_INT8_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
     int16_t *output = (int16_t*) pCtx->aOutputBuf;
     int16_t  i = GET_INT16_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_INT) {
     int32_t *output = (int32_t*) pCtx->aOutputBuf;
     int32_t  i = GET_INT32_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_BIGINT) {
     int64_t *output = (int64_t*) pCtx->aOutputBuf;
     int64_t  i = GET_INT64_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
     float *output = (float*) pCtx->aOutputBuf;
     float  i = GET_FLOAT_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
     double *output = (double*) pCtx->aOutputBuf;
     double  i = GET_DOUBLE_VAL(pData);
-
+    
     UPDATE_DATA(pCtx, *output, i, num, isMin, key);
   }
-
+  
   GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
 }
 
@@ -1263,12 +1293,12 @@ static void max_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   minMax_function_f(pCtx, index, 0);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-  if (pResInfo->hasResult == DATA_SET_FLAG) {
+  if (pResInfo->hasResult == DATA_SET_FLAG && pResInfo->superTableQ) {
     char *flag = pCtx->aOutputBuf + pCtx->inputBytes;
     *flag = DATA_SET_FLAG;
   }
@@ -1279,12 +1309,12 @@ static void min_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   minMax_function_f(pCtx, index, 1);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-  if (pResInfo->hasResult == DATA_SET_FLAG) {
+  if (pResInfo->hasResult == DATA_SET_FLAG && pResInfo->superTableQ) {
     char *flag = pCtx->aOutputBuf + pCtx->inputBytes;
     *flag = DATA_SET_FLAG;
   }
@@ -1301,15 +1331,15 @@ static void min_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 static void stddev_function(SQLFunctionCtx *pCtx) {
   // the second stage to calculate standard deviation
   SStddevInfo *pStd = GET_RES_INFO(pCtx)->interResultBuf;
-
+  
   if (pStd->stage == 0) {  // the first stage is to calculate average value
     avg_function(pCtx);
   } else {
     double *retVal = &pStd->res;
     double  avg = pStd->avg;
-
+    
     void *pData = GET_INPUT_CHAR(pCtx);
-
+    
     switch (pCtx->inputType) {
       case TSDB_DATA_TYPE_INT: {
         for (int32_t i = 0; i < pCtx->size; ++i) {
@@ -1341,9 +1371,9 @@ static void stddev_function(SQLFunctionCtx *pCtx) {
         break;
       }
       default:
-        pError("stddev function not support data type:%d", pCtx->inputType);
+        tscError("stddev function not support data type:%d", pCtx->inputType);
     }
-
+    
     // TODO get the correct data
     SET_VAL(pCtx, 1, 1);
   }
@@ -1353,18 +1383,18 @@ static void stddev_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   // the second stage to calculate standard deviation
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   SStddevInfo *pStd = pResInfo->interResultBuf;
-
+  
   /* the first stage is to calculate average value */
   if (pStd->stage == 0) {
     avg_function_f(pCtx, index);
   } else {
     double avg = pStd->avg;
     void * pData = GET_INPUT_CHAR_INDEX(pCtx, index);
-
+    
     if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
       return;
     }
-
+    
     switch (pCtx->inputType) {
       case TSDB_DATA_TYPE_INT: {
         pStd->res += POW2(GET_INT32_VAL(pData) - avg);
@@ -1391,9 +1421,9 @@ static void stddev_function_f(SQLFunctionCtx *pCtx, int32_t index) {
         break;
       }
       default:
-        pError("stddev function not support data type:%d", pCtx->inputType);
+        tscError("stddev function not support data type:%d", pCtx->inputType);
     }
-
+    
     SET_VAL(pCtx, 1, 1);
   }
 }
@@ -1405,7 +1435,7 @@ static void stddev_next_step(SQLFunctionCtx *pCtx) {
    */
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   SStddevInfo *pStd = pResInfo->interResultBuf;
-
+  
   if (pStd->stage == 0) {
     /*
      * stddev is calculated in two stage:
@@ -1415,10 +1445,12 @@ static void stddev_next_step(SQLFunctionCtx *pCtx) {
      */
     pStd->stage++;
     avg_finalizer(pCtx);
-
+    
+    pResInfo->initialized = true; // set it initialized to avoid re-initialization
+    
     // save average value into tmpBuf, for second stage scan
     SAvgInfo *pAvg = pResInfo->interResultBuf;
-
+    
     pStd->avg = GET_DOUBLE_VAL(pCtx->aOutputBuf);
     assert((isnan(pAvg->sum) && pAvg->num == 0) || (pStd->num == pAvg->num && pStd->avg == pAvg->sum));
   } else {
@@ -1428,7 +1460,7 @@ static void stddev_next_step(SQLFunctionCtx *pCtx) {
 
 static void stddev_finalizer(SQLFunctionCtx *pCtx) {
   SStddevInfo *pStd = (SStddevInfo *)GET_RES_INFO(pCtx)->interResultBuf;
-
+  
   if (pStd->num <= 0) {
     setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
   } else {
@@ -1445,61 +1477,61 @@ static bool first_last_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   // used to keep the timestamp for comparison
   pCtx->param[1].nType = 0;
   pCtx->param[1].i64Key = 0;
-
+  
   return true;
 }
 
 // todo opt for null block
 static void first_function(SQLFunctionCtx *pCtx) {
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) || pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC || pCtx->preAggVals.dataBlockLoaded == false) {
     return;
   }
-
+  
   int32_t notNullElems = 0;
-
+  
   // handle the null value
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     memcpy(pCtx->aOutputBuf, data, pCtx->inputBytes);
-  
+    
     TSKEY k = pCtx->ptsList[i];
     DO_UPDATE_TAG_COLUMNS(pCtx, k);
-
+    
     SResultInfo *pInfo = GET_RES_INFO(pCtx);
     pInfo->hasResult = DATA_SET_FLAG;
     pInfo->complete = true;
-
+    
     notNullElems++;
     break;
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
 }
 
 static void first_function_f(SQLFunctionCtx *pCtx, int32_t index) {
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
     return;
   }
-
+  
   void *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes);
   
   TSKEY ts = pCtx->ptsList[index];
   DO_UPDATE_TAG_COLUMNS(pCtx, ts);
-
+  
   SResultInfo *pInfo = GET_RES_INFO(pCtx);
   pInfo->hasResult = DATA_SET_FLAG;
   pInfo->complete = true;  // get the first not-null data, completed
@@ -1507,14 +1539,14 @@ static void first_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 
 static void first_data_assign_impl(SQLFunctionCtx *pCtx, char *pData, int32_t index) {
   int64_t *timestamp = pCtx->ptsList;
-
+  
   SFirstLastInfo *pInfo = (SFirstLastInfo *)(pCtx->aOutputBuf + pCtx->inputBytes);
-
+  
   if (pInfo->hasResult != DATA_SET_FLAG || timestamp[index] < pInfo->ts) {
     memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes);
     pInfo->hasResult = DATA_SET_FLAG;
     pInfo->ts = timestamp[index];
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInfo->ts);
   }
 }
@@ -1524,19 +1556,15 @@ static void first_data_assign_impl(SQLFunctionCtx *pCtx, char *pData, int32_t in
  * to decide if the value is earlier than current intermediate result
  */
 static void first_dist_function(SQLFunctionCtx *pCtx) {
-  if (pCtx->size == 0) {
-    return;
-  }
-
   /*
    * do not to check data in the following cases:
    * 1. data block that are not loaded
    * 2. scan data files in desc order
    */
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) || pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC || pCtx->preAggVals.dataBlockLoaded == false) {
     return;
   }
-
+  
   int32_t notNullElems = 0;
 
   // find the first not null value
@@ -1545,49 +1573,45 @@ static void first_dist_function(SQLFunctionCtx *pCtx) {
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     first_data_assign_impl(pCtx, data, i);
-
+    
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
-
+    
     notNullElems++;
     break;
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
 }
 
 static void first_dist_function_f(SQLFunctionCtx *pCtx, int32_t index) {
-  if (pCtx->size == 0) {
-    return;
-  }
-
   char *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
 
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
     return;
   }
-
+  
   first_data_assign_impl(pCtx, pData, index);
-
+  
   SET_VAL(pCtx, 1, 1);
 }
 
 static void first_dist_func_merge(SQLFunctionCtx *pCtx) {
   char *pData = GET_INPUT_CHAR(pCtx);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pCtx->size == 1 && pResInfo->superTableQ);
-
+  
   SFirstLastInfo *pInput = (SFirstLastInfo *)(pData + pCtx->inputBytes);
   if (pInput->hasResult != DATA_SET_FLAG) {
     return;
   }
-
+  
   SFirstLastInfo *pOutput = (SFirstLastInfo *)(pCtx->aOutputBuf + pCtx->inputBytes);
   if (pOutput->hasResult != DATA_SET_FLAG || pInput->ts < pOutput->ts) {
     memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes + sizeof(SFirstLastInfo));
@@ -1597,22 +1621,22 @@ static void first_dist_func_merge(SQLFunctionCtx *pCtx) {
 
 static void first_dist_func_second_merge(SQLFunctionCtx *pCtx) {
   assert(pCtx->resultInfo->superTableQ);
-
+  
   char *          pData = GET_INPUT_CHAR(pCtx);
   SFirstLastInfo *pInput = (SFirstLastInfo*) (pData + pCtx->outputBytes);
   if (pInput->hasResult != DATA_SET_FLAG) {
     return;
   }
-
+  
   // The param[1] is used to keep the initial value of max ts value
   if (pCtx->param[1].nType != pCtx->outputType || pCtx->param[1].i64Key > pInput->ts) {
     memcpy(pCtx->aOutputBuf, pData, pCtx->outputBytes);
     pCtx->param[1].i64Key = pInput->ts;
     pCtx->param[1].nType = pCtx->outputType;
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInput->ts);
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
 }
@@ -1626,50 +1650,47 @@ static void first_dist_func_second_merge(SQLFunctionCtx *pCtx) {
  *    least one data in this block that is not null.(TODO opt for this case)
  */
 static void last_function(SQLFunctionCtx *pCtx) {
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) || pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order != pCtx->param[0].i64Key || pCtx->preAggVals.dataBlockLoaded == false) {
     return;
   }
-
+  
   int32_t notNullElems = 0;
-
+  
   for (int32_t i = pCtx->size - 1; i >= 0; --i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
-      continue;
+      if (!pCtx->requireNull) {
+        continue; 
+      }
     }
-
     memcpy(pCtx->aOutputBuf, data, pCtx->inputBytes);
-  
+    
     TSKEY ts = pCtx->ptsList[i];
     DO_UPDATE_TAG_COLUMNS(pCtx, ts);
-
+    
     SResultInfo *pInfo = GET_RES_INFO(pCtx);
     pInfo->hasResult = DATA_SET_FLAG;
-
+    
     pInfo->complete = true;  // set query completed on this column
     notNullElems++;
     break;
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
 }
 
 static void last_function_f(SQLFunctionCtx *pCtx, int32_t index) {
-  if (pCtx->order == TSQL_SO_ASC) {
-    return;
-  }
-
   void *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes);
   
   TSKEY ts = pCtx->ptsList[index];
   DO_UPDATE_TAG_COLUMNS(pCtx, ts);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   pResInfo->hasResult = DATA_SET_FLAG;
   pResInfo->complete = true;  // set query completed
@@ -1677,52 +1698,55 @@ static void last_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 
 static void last_data_assign_impl(SQLFunctionCtx *pCtx, char *pData, int32_t index) {
   int64_t *timestamp = pCtx->ptsList;
-
+  
   SFirstLastInfo *pInfo = (SFirstLastInfo *)(pCtx->aOutputBuf + pCtx->inputBytes);
-
+  
   if (pInfo->hasResult != DATA_SET_FLAG || pInfo->ts < timestamp[index]) {
 #if defined(_DEBUG_VIEW)
-    pTrace("assign index:%d, ts:%" PRId64 ", val:%d, ", index, timestamp[index], *(int32_t *)pData);
+    tscDebug("assign index:%d, ts:%" PRId64 ", val:%d, ", index, timestamp[index], *(int32_t *)pData);
 #endif
-
+    
     memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes);
     pInfo->hasResult = DATA_SET_FLAG;
     pInfo->ts = timestamp[index];
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInfo->ts);
   }
 }
 
 static void last_dist_function(SQLFunctionCtx *pCtx) {
-  if (pCtx->size == 0) {
-    return;
-  }
-
   /*
    * 1. for scan data in asc order, no need to check data
    * 2. for data blocks that are not loaded, no need to check data
    */
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus) || pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order != pCtx->param[0].i64Key) {
     return;
   }
 
-  int32_t notNullElems = 0;
+  // data block is discard, not loaded, do not need to check it
+  if (!pCtx->preAggVals.dataBlockLoaded) {
+    return;
+  }
 
+  int32_t notNullElems = 0;
+  
   for (int32_t i = pCtx->size - 1; i >= 0; --i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
-      continue;
+      if (!pCtx->requireNull) {
+        continue; 
+      }
     }
-
+    
     last_data_assign_impl(pCtx, data, i);
-
+    
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
-
+    
     notNullElems++;
     break;
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
 }
 
@@ -1730,41 +1754,41 @@ static void last_dist_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->size == 0) {
     return;
   }
-
+  
   char *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   /*
    * 1. for scan data in asc order, no need to check data
    * 2. for data blocks that are not loaded, no need to check data
    */
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order != pCtx->param[0].i64Key) {
     return;
   }
-
+  
   last_data_assign_impl(pCtx, pData, index);
-
+  
   SET_VAL(pCtx, 1, 1);
 }
 
 static void last_dist_func_merge(SQLFunctionCtx *pCtx) {
   char *pData = GET_INPUT_CHAR(pCtx);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pCtx->size == 1 && pResInfo->superTableQ);
-
+  
   // the input data is null
   SFirstLastInfo *pInput = (SFirstLastInfo *)(pData + pCtx->inputBytes);
   if (pInput->hasResult != DATA_SET_FLAG) {
     return;
   }
-
+  
   SFirstLastInfo *pOutput = (SFirstLastInfo *)(pCtx->aOutputBuf + pCtx->inputBytes);
   if (pOutput->hasResult != DATA_SET_FLAG || pOutput->ts < pInput->ts) {
     memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes + sizeof(SFirstLastInfo));
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInput->ts);
   }
 }
@@ -1776,12 +1800,12 @@ static void last_dist_func_merge(SQLFunctionCtx *pCtx) {
  */
 static void last_dist_func_second_merge(SQLFunctionCtx *pCtx) {
   char *pData = GET_INPUT_CHAR(pCtx);
-
+  
   SFirstLastInfo *pInput = (SFirstLastInfo*) (pData + pCtx->outputBytes);
   if (pInput->hasResult != DATA_SET_FLAG) {
     return;
   }
-
+  
   /*
    * param[1] used to keep the corresponding timestamp to decide if current result is
    * the true last result
@@ -1790,10 +1814,10 @@ static void last_dist_func_second_merge(SQLFunctionCtx *pCtx) {
     memcpy(pCtx->aOutputBuf, pData, pCtx->outputBytes);
     pCtx->param[1].i64Key = pInput->ts;
     pCtx->param[1].nType = pCtx->outputType;
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInput->ts);
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
 }
@@ -1803,24 +1827,24 @@ static void last_dist_func_second_merge(SQLFunctionCtx *pCtx) {
  * NOTE: last_row does not use the interResultBuf to keep the result
  */
 static void last_row_function(SQLFunctionCtx *pCtx) {
-  assert(pCtx->size == 1);
-
+  assert(pCtx->size >= 1);
   char *pData = GET_INPUT_CHAR(pCtx);
-  assignVal(pCtx->aOutputBuf, pData, pCtx->inputBytes, pCtx->inputType);
 
+  // assign the last element in current data block
+  assignVal(pCtx->aOutputBuf, pData + (pCtx->size - 1) * pCtx->inputBytes, pCtx->inputBytes, pCtx->inputType);
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
-  SLastrowInfo *pInfo = (SLastrowInfo *)pResInfo->interResultBuf;
-  pInfo->ts = pCtx->param[0].i64Key;
-  pInfo->hasResult = DATA_SET_FLAG;
-
-  // set the result to final result buffer
+  pResInfo->hasResult = DATA_SET_FLAG;
+  
+  // set the result to final result buffer in case of super table query
   if (pResInfo->superTableQ) {
     SLastrowInfo *pInfo1 = (SLastrowInfo *)(pCtx->aOutputBuf + pCtx->inputBytes);
-    pInfo1->ts = pCtx->param[0].i64Key;
+    pInfo1->ts = pCtx->ptsList[pCtx->size - 1];
     pInfo1->hasResult = DATA_SET_FLAG;
-
+    
     DO_UPDATE_TAG_COLUMNS(pCtx, pInfo1->ts);
+  } else {
+    DO_UPDATE_TAG_COLUMNS(pCtx, pCtx->ptsList[pCtx->size - 1]);
   }
 
   SET_VAL(pCtx, pCtx->size, 1);
@@ -1828,16 +1852,17 @@ static void last_row_function(SQLFunctionCtx *pCtx) {
 
 static void last_row_finalizer(SQLFunctionCtx *pCtx) {
   // do nothing at the first stage
-  if (pCtx->currentStage == SECONDARY_STAGE_MERGE) {
-    SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-    if (pResInfo->hasResult != DATA_SET_FLAG) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  if (pResInfo->hasResult != DATA_SET_FLAG) {
+    if (pCtx->outputType == TSDB_DATA_TYPE_BINARY || pCtx->outputType == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(pCtx->aOutputBuf, pCtx->outputType);
+    } else {
       setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
-      return;
     }
-  } else {
-    // do nothing
+    
+    return;
   }
-
+  
   GET_RES_INFO(pCtx)->numOfRes = 1;
   doFinalizer(pCtx);
 }
@@ -1848,18 +1873,19 @@ static void valuePairAssign(tValuePair *dst, int16_t type, const char *val, int6
   dst->v.nType = type;
   dst->v.i64Key = *(int64_t *)val;
   dst->timestamp = tsKey;
-
+  
   int32_t size = 0;
   if (stage == SECONDARY_STAGE_MERGE || stage == FIRST_STAGE_MERGE) {
     memcpy(dst->pTags, pTags, (size_t)pTagInfo->tagsLen);
   } else {  // the tags are dumped from the ctx tag fields
     for (int32_t i = 0; i < pTagInfo->numOfTagCols; ++i) {
-      SQLFunctionCtx* __ctx = pTagInfo->pTagCtxList[i];
-      if (__ctx->functionId == TSDB_FUNC_TS_DUMMY) {
-        __ctx->tag = (tVariant) {.nType = TSDB_DATA_TYPE_BIGINT, .i64Key = tsKey};
+      SQLFunctionCtx* ctx = pTagInfo->pTagCtxList[i];
+      if (ctx->functionId == TSDB_FUNC_TS_DUMMY) {
+        ctx->tag.nType = TSDB_DATA_TYPE_BIGINT;
+        ctx->tag.i64Key = tsKey;
       }
       
-      tVariantDump(&pTagInfo->pTagCtxList[i]->tag, dst->pTags + size, pTagInfo->pTagCtxList[i]->tag.nType);
+      tVariantDump(&ctx->tag, dst->pTags + size, ctx->tag.nType, true);
       size += pTagInfo->pTagCtxList[i]->outputBytes;
     }
   }
@@ -1876,19 +1902,20 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
                                 SExtTagsInfo *pTagInfo, char *pTags, int16_t stage) {
   tVariant val = {0};
   tVariantCreateFromBinary(&val, pData, tDataTypeDesc[type].nSize, type);
-
+  
   tValuePair **pList = pInfo->res;
-
+  assert(pList != NULL);
+  
   if (pInfo->num < maxLen) {
     if (pInfo->num == 0 ||
         ((type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) &&
-         val.i64Key >= pList[pInfo->num - 1]->v.i64Key) ||
+            val.i64Key >= pList[pInfo->num - 1]->v.i64Key) ||
         ((type >= TSDB_DATA_TYPE_FLOAT && type <= TSDB_DATA_TYPE_DOUBLE) &&
-         val.dKey >= pList[pInfo->num - 1]->v.dKey)) {
+            val.dKey >= pList[pInfo->num - 1]->v.dKey)) {
       valuePairAssign(pList[pInfo->num], type, (const char*)&val.i64Key, ts, pTags, pTagInfo, stage);
     } else {
       int32_t i = pInfo->num - 1;
-
+      
       if (type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) {
         while (i >= 0 && pList[i]->v.i64Key > val.i64Key) {
           VALUEPAIRASSIGN(pList[i + 1], pList[i], pTagInfo->tagsLen);
@@ -1900,14 +1927,14 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
           i -= 1;
         }
       }
-
+      
       valuePairAssign(pList[i + 1], type, (const char*) &val.i64Key, ts, pTags, pTagInfo, stage);
     }
-
+    
     pInfo->num++;
   } else {
     int32_t i = 0;
-
+    
     if (((type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) && val.i64Key > pList[0]->v.i64Key) ||
         ((type >= TSDB_DATA_TYPE_FLOAT && type <= TSDB_DATA_TYPE_DOUBLE) && val.dKey > pList[0]->v.dKey)) {
       // find the appropriate the slot position
@@ -1922,7 +1949,7 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
           i += 1;
         }
       }
-
+      
       valuePairAssign(pList[i], type, (const char*) &val.i64Key, ts, pTags, pTagInfo, stage);
     }
   }
@@ -1930,17 +1957,18 @@ static void do_top_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData,
 
 static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pData, int64_t ts, uint16_t type,
                                    SExtTagsInfo *pTagInfo, char *pTags, int16_t stage) {
-  tValuePair **pList = pInfo->res;
-
   tVariant val = {0};
   tVariantCreateFromBinary(&val, pData, tDataTypeDesc[type].nSize, type);
 
+  tValuePair **pList = pInfo->res;
+  assert(pList != NULL);
+
   if (pInfo->num < maxLen) {
     if (pInfo->num == 0) {
       valuePairAssign(pList[pInfo->num], type, (const char*) &val.i64Key, ts, pTags, pTagInfo, stage);
     } else {
       int32_t i = pInfo->num - 1;
-
+      
       if (type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) {
         while (i >= 0 && pList[i]->v.i64Key < val.i64Key) {
           VALUEPAIRASSIGN(pList[i + 1], pList[i], pTagInfo->tagsLen);
@@ -1952,14 +1980,14 @@ static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pDa
           i -= 1;
         }
       }
-
+      
       valuePairAssign(pList[i + 1], type, (const char*)&val.i64Key, ts, pTags, pTagInfo, stage);
     }
-
+    
     pInfo->num++;
   } else {
     int32_t i = 0;
-
+    
     if (((type >= TSDB_DATA_TYPE_TINYINT && type <= TSDB_DATA_TYPE_BIGINT) && val.i64Key < pList[0]->v.i64Key) ||
         ((type >= TSDB_DATA_TYPE_FLOAT && type <= TSDB_DATA_TYPE_DOUBLE) && val.dKey < pList[0]->v.dKey)) {
       // find the appropriate the slot position
@@ -1974,7 +2002,7 @@ static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pDa
           i += 1;
         }
       }
-
+      
       valuePairAssign(pList[i], type, (const char*)&val.i64Key, ts, pTags, pTagInfo, stage);
     }
   }
@@ -1983,7 +2011,7 @@ static void do_bottom_function_add(STopBotInfo *pInfo, int32_t maxLen, void *pDa
 static int32_t resAscComparFn(const void *pLeft, const void *pRight) {
   tValuePair *pLeftElem = *(tValuePair **)pLeft;
   tValuePair *pRightElem = *(tValuePair **)pRight;
-
+  
   if (pLeftElem->timestamp == pRightElem->timestamp) {
     return 0;
   } else {
@@ -1996,7 +2024,7 @@ static int32_t resDescComparFn(const void *pLeft, const void *pRight) { return -
 static int32_t resDataAscComparFn(const void *pLeft, const void *pRight) {
   tValuePair *pLeftElem = *(tValuePair **)pLeft;
   tValuePair *pRightElem = *(tValuePair **)pRight;
-
+  
   int32_t type = pLeftElem->v.nType;
   if (type == TSDB_DATA_TYPE_FLOAT || type == TSDB_DATA_TYPE_DOUBLE) {
     if (pLeftElem->v.dKey == pRightElem->v.dKey) {
@@ -2018,17 +2046,17 @@ static int32_t resDataDescComparFn(const void *pLeft, const void *pRight) { retu
 static void copyTopBotRes(SQLFunctionCtx *pCtx, int32_t type) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   STopBotInfo *pRes = pResInfo->interResultBuf;
-
+  
   tValuePair **tvp = pRes->res;
   
   int32_t step = QUERY_ASC_FORWARD_STEP;
-  int32_t len = GET_RES_INFO(pCtx)->numOfRes;
-
+  int32_t len = (int32_t)(GET_RES_INFO(pCtx)->numOfRes);
+  
   switch (type) {
     case TSDB_DATA_TYPE_INT: {
       int32_t *output = (int32_t *)pCtx->aOutputBuf;
       for (int32_t i = 0; i < len; ++i, output += step) {
-        *output = tvp[i]->v.i64Key;
+        *output = (int32_t)tvp[i]->v.i64Key;
       }
       break;
     }
@@ -2049,43 +2077,43 @@ static void copyTopBotRes(SQLFunctionCtx *pCtx, int32_t type) {
     case TSDB_DATA_TYPE_FLOAT: {
       float *output = (float *)pCtx->aOutputBuf;
       for (int32_t i = 0; i < len; ++i, output += step) {
-        *output = tvp[i]->v.dKey;
+        *output = (float)tvp[i]->v.dKey;
       }
       break;
     }
     case TSDB_DATA_TYPE_SMALLINT: {
       int16_t *output = (int16_t *)pCtx->aOutputBuf;
       for (int32_t i = 0; i < len; ++i, output += step) {
-        *output = tvp[i]->v.i64Key;
+        *output = (int16_t)tvp[i]->v.i64Key;
       }
       break;
     }
     case TSDB_DATA_TYPE_TINYINT: {
       int8_t *output = (int8_t *)pCtx->aOutputBuf;
       for (int32_t i = 0; i < len; ++i, output += step) {
-        *output = tvp[i]->v.i64Key;
+        *output = (int8_t)tvp[i]->v.i64Key;
       }
       break;
     }
     default: {
-      pError("top/bottom function not support data type:%d", pCtx->inputType);
+      tscError("top/bottom function not support data type:%d", pCtx->inputType);
       return;
     }
   }
-
+  
   // set the output timestamp of each record.
   TSKEY *output = pCtx->ptsOutputBuf;
   for (int32_t i = 0; i < len; ++i, output += step) {
     *output = tvp[i]->timestamp;
   }
-
+  
   // set the corresponding tag data for each record
   // todo check malloc failure
   char **pData = calloc(pCtx->tagInfo.numOfTagCols, POINTER_BYTES);
   for (int32_t i = 0; i < pCtx->tagInfo.numOfTagCols; ++i) {
     pData[i] = pCtx->tagInfo.pTagCtxList[i]->aOutputBuf;
   }
-
+  
   for (int32_t i = 0; i < len; ++i, output += step) {
     int16_t offset = 0;
     for (int32_t j = 0; j < pCtx->tagInfo.numOfTagCols; ++j) {
@@ -2094,78 +2122,81 @@ static void copyTopBotRes(SQLFunctionCtx *pCtx, int32_t type) {
       pData[j] += pCtx->tagInfo.pTagCtxList[j]->outputBytes;
     }
   }
-
-  tfree(pData);
+  
+  taosTFree(pData);
 }
 
-bool top_bot_datablock_filter(SQLFunctionCtx *pCtx, int32_t functionId, char *minval, char *maxval) {
-  STopBotInfo *pTopBotInfo = (STopBotInfo *)GET_RES_INFO(pCtx)->interResultBuf;
+/*
+ * Parameters values:
+ * 1. param[0]: maximum allowable results
+ * 2. param[1]: order by type (time or value)
+ * 3. param[2]: asc/desc order
+ *
+ * top/bottom use the intermediate result buffer to keep the intermediate result
+ */
+static STopBotInfo *getTopBotOutputInfo(SQLFunctionCtx *pCtx) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+
+  // only the first_stage_merge is directly written data into final output buffer
+  if (pResInfo->superTableQ && pCtx->currentStage != SECONDARY_STAGE_MERGE) {
+    return (STopBotInfo*) pCtx->aOutputBuf;
+  } else { // during normal table query and super table at the secondary_stage, result is written to intermediate buffer
+    return pResInfo->interResultBuf;
+  }
+}
 
-  int32_t numOfExistsRes = pTopBotInfo->num;
+bool topbot_datablock_filter(SQLFunctionCtx *pCtx, int32_t functionId, const char *minval, const char *maxval) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  if (pResInfo == NULL) {
+    return true;
+  }
 
+  STopBotInfo *pTopBotInfo = getTopBotOutputInfo(pCtx);
+  
   // required number of results are not reached, continue load data block
-  if (numOfExistsRes < pCtx->param[0].i64Key) {
+  if (pTopBotInfo->num < pCtx->param[0].i64Key) {
     return true;
   }
-
-  tValuePair *pRes = (tValuePair*) pTopBotInfo->res;
-
+  
+  tValuePair **pRes = (tValuePair**) pTopBotInfo->res;
+  
   if (functionId == TSDB_FUNC_TOP) {
     switch (pCtx->inputType) {
       case TSDB_DATA_TYPE_TINYINT:
-        return GET_INT8_VAL(maxval) > pRes[0].v.i64Key;
+        return GET_INT8_VAL(maxval) > pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_SMALLINT:
-        return GET_INT16_VAL(maxval) > pRes[0].v.i64Key;
+        return GET_INT16_VAL(maxval) > pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_INT:
-        return GET_INT32_VAL(maxval) > pRes[0].v.i64Key;
+        return GET_INT32_VAL(maxval) > pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_BIGINT:
-        return GET_INT64_VAL(maxval) > pRes[0].v.i64Key;
+        return GET_INT64_VAL(maxval) > pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_FLOAT:
-        return GET_FLOAT_VAL(maxval) > pRes[0].v.dKey;
+        return GET_FLOAT_VAL(maxval) > pRes[0]->v.dKey;
       case TSDB_DATA_TYPE_DOUBLE:
-        return GET_DOUBLE_VAL(maxval) > pRes[0].v.dKey;
+        return GET_DOUBLE_VAL(maxval) > pRes[0]->v.dKey;
       default:
         return true;
     }
   } else {
     switch (pCtx->inputType) {
       case TSDB_DATA_TYPE_TINYINT:
-        return GET_INT8_VAL(minval) < pRes[0].v.i64Key;
+        return GET_INT8_VAL(minval) < pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_SMALLINT:
-        return GET_INT16_VAL(minval) < pRes[0].v.i64Key;
+        return GET_INT16_VAL(minval) < pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_INT:
-        return GET_INT32_VAL(minval) < pRes[0].v.i64Key;
+        return GET_INT32_VAL(minval) < pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_BIGINT:
-        return GET_INT64_VAL(minval) < pRes[0].v.i64Key;
+        return GET_INT64_VAL(minval) < pRes[0]->v.i64Key;
       case TSDB_DATA_TYPE_FLOAT:
-        return GET_FLOAT_VAL(minval) < pRes[0].v.dKey;
+        return GET_FLOAT_VAL(minval) < pRes[0]->v.dKey;
       case TSDB_DATA_TYPE_DOUBLE:
-        return GET_DOUBLE_VAL(minval) < pRes[0].v.dKey;
+        return GET_DOUBLE_VAL(minval) < pRes[0]->v.dKey;
       default:
         return true;
     }
   }
 }
 
-/*
- * Parameters values:
- * 1. param[0]: maximum allowable results
- * 2. param[1]: order by type (time or value)
- * 3. param[2]: asc/desc order
- *
- * top/bottom use the intermediate result buffer to keep the intermediate result
- */
-static STopBotInfo *getTopBotOutputInfo(SQLFunctionCtx *pCtx) {
-  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
-  // only the first_stage_merge is directly written data into final output buffer
-  if (pResInfo->superTableQ && pCtx->currentStage != SECONDARY_STAGE_MERGE) {
-    return (STopBotInfo*) pCtx->aOutputBuf;
-  } else {  // for normal table query and super table at the secondary_stage, result is written to intermediate buffer
-    return pResInfo->interResultBuf;
-  }
-}
-
 /*
  * keep the intermediate results during scan data blocks in the format of:
  * +-----------------------------------+-------------one value pair-----------+------------next value pair-----------+
@@ -2175,11 +2206,10 @@ static STopBotInfo *getTopBotOutputInfo(SQLFunctionCtx *pCtx) {
 static void buildTopBotStruct(STopBotInfo *pTopBotInfo, SQLFunctionCtx *pCtx) {
   char *tmp = (char *)pTopBotInfo + sizeof(STopBotInfo);
   pTopBotInfo->res = (tValuePair**) tmp;
-
   tmp += POINTER_BYTES * pCtx->param[0].i64Key;
-
+  
   size_t size = sizeof(tValuePair) + pCtx->tagInfo.tagsLen;
-
+  
   for (int32_t i = 0; i < pCtx->param[0].i64Key; ++i) {
     pTopBotInfo->res[i] = (tValuePair*) tmp;
     pTopBotInfo->res[i]->pTags = tmp + sizeof(tValuePair);
@@ -2191,36 +2221,36 @@ static bool top_bottom_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   STopBotInfo *pInfo = getTopBotOutputInfo(pCtx);
   buildTopBotStruct(pInfo, pCtx);
-
+  
   return true;
 }
 
 static void top_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   STopBotInfo *pRes = getTopBotOutputInfo(pCtx);
   assert(pRes->num >= 0);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     notNullElems++;
-    do_top_function_add(pRes, pCtx->param[0].i64Key, data, pCtx->ptsList[i], pCtx->inputType, &pCtx->tagInfo, NULL, 0);
+    do_top_function_add(pRes, (int32_t)pCtx->param[0].i64Key, data, pCtx->ptsList[i], pCtx->inputType, &pCtx->tagInfo, NULL, 0);
   }
-
+  
   if (!pCtx->hasNull) {
     assert(pCtx->size == notNullElems);
   }
-
+  
   // treat the result as only one result
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -2232,56 +2262,57 @@ static void top_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   STopBotInfo *pRes = getTopBotOutputInfo(pCtx);
   assert(pRes->num >= 0);
-
+  
   SET_VAL(pCtx, 1, 1);
-  do_top_function_add(pRes, pCtx->param[0].i64Key, pData, pCtx->ptsList[index], pCtx->inputType, &pCtx->tagInfo, NULL,
+  do_top_function_add(pRes, (int32_t)pCtx->param[0].i64Key, pData, pCtx->ptsList[index], pCtx->inputType, &pCtx->tagInfo, NULL,
                       0);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
 static void top_func_merge(SQLFunctionCtx *pCtx) {
   char *input = GET_INPUT_CHAR(pCtx);
-
+  
   STopBotInfo *pInput = (STopBotInfo *)input;
   if (pInput->num <= 0) {
     return;
   }
-
+  
   // remmap the input buffer may cause the struct pointer invalid, so rebuild the STopBotInfo is necessary
   buildTopBotStruct(pInput, pCtx);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ && pCtx->outputType == TSDB_DATA_TYPE_BINARY && pCtx->size == 1);
-
+  
   STopBotInfo *pOutput = getTopBotOutputInfo(pCtx);
-
+  
   for (int32_t i = 0; i < pInput->num; ++i) {
-    do_top_function_add(pOutput, pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
+    do_top_function_add(pOutput, (int32_t)pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
                         pCtx->inputType, &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
   }
 }
 
 static void top_func_second_merge(SQLFunctionCtx *pCtx) {
   STopBotInfo *pInput = (STopBotInfo *)GET_INPUT_CHAR(pCtx);
-
+  
   // construct the input data struct from binary data
   buildTopBotStruct(pInput, pCtx);
-
+  
   STopBotInfo *pOutput = getTopBotOutputInfo(pCtx);
-
+  
   // the intermediate result is binary, we only use the output data type
   for (int32_t i = 0; i < pInput->num; ++i) {
-    do_top_function_add(pOutput, pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
-                        pCtx->outputType, &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
+    int16_t type = (pCtx->outputType == TSDB_DATA_TYPE_FLOAT)? TSDB_DATA_TYPE_DOUBLE:pCtx->outputType;
+    do_top_function_add(pOutput, (int32_t)pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
+                        type, &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
   }
-
+  
   SET_VAL(pCtx, pInput->num, pOutput->num);
-
+  
   if (pOutput->num > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -2290,27 +2321,27 @@ static void top_func_second_merge(SQLFunctionCtx *pCtx) {
 
 static void bottom_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   STopBotInfo *pRes = getTopBotOutputInfo(pCtx);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     notNullElems++;
-    do_bottom_function_add(pRes, pCtx->param[0].i64Key, data, pCtx->ptsList[i], pCtx->inputType, &pCtx->tagInfo, NULL,
+    do_bottom_function_add(pRes, (int32_t)pCtx->param[0].i64Key, data, pCtx->ptsList[i], pCtx->inputType, &pCtx->tagInfo, NULL,
                            0);
   }
-
+  
   if (!pCtx->hasNull) {
     assert(pCtx->size == notNullElems);
   }
-
+  
   // treat the result as only one result
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -2322,54 +2353,55 @@ static void bottom_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   STopBotInfo *pRes = getTopBotOutputInfo(pCtx);
   SET_VAL(pCtx, 1, 1);
-  do_bottom_function_add(pRes, pCtx->param[0].i64Key, pData, pCtx->ptsList[index], pCtx->inputType, &pCtx->tagInfo,
+  do_bottom_function_add(pRes, (int32_t)pCtx->param[0].i64Key, pData, pCtx->ptsList[index], pCtx->inputType, &pCtx->tagInfo,
                          NULL, 0);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
 static void bottom_func_merge(SQLFunctionCtx *pCtx) {
   char *input = GET_INPUT_CHAR(pCtx);
-
+  
   STopBotInfo *pInput = (STopBotInfo *)input;
   if (pInput->num <= 0) {
     return;
   }
-
+  
   // remmap the input buffer may cause the struct pointer invalid, so rebuild the STopBotInfo is necessary
   buildTopBotStruct(pInput, pCtx);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ && pCtx->outputType == TSDB_DATA_TYPE_BINARY && pCtx->size == 1);
-
+  
   STopBotInfo *pOutput = getTopBotOutputInfo(pCtx);
-
+  
   for (int32_t i = 0; i < pInput->num; ++i) {
-    do_bottom_function_add(pOutput, pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
+    do_bottom_function_add(pOutput, (int32_t)pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
                            pCtx->inputType, &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
   }
 }
 
 static void bottom_func_second_merge(SQLFunctionCtx *pCtx) {
   STopBotInfo *pInput = (STopBotInfo *)GET_INPUT_CHAR(pCtx);
-
+  
   // construct the input data struct from binary data
   buildTopBotStruct(pInput, pCtx);
-
+  
   STopBotInfo *pOutput = getTopBotOutputInfo(pCtx);
-
+  
   // the intermediate result is binary, we only use the output data type
   for (int32_t i = 0; i < pInput->num; ++i) {
-    do_bottom_function_add(pOutput, pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp,
-                           pCtx->outputType, &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
+    int16_t type = (pCtx->outputType == TSDB_DATA_TYPE_FLOAT) ? TSDB_DATA_TYPE_DOUBLE : pCtx->outputType;
+    do_bottom_function_add(pOutput, (int32_t)pCtx->param[0].i64Key, &pInput->res[i]->v.i64Key, pInput->res[i]->timestamp, type,
+                           &pCtx->tagInfo, pInput->res[i]->pTags, pCtx->currentStage);
   }
 
   SET_VAL(pCtx, pInput->num, pOutput->num);
-
+  
   if (pOutput->num > 0) {
     SResultInfo *pResInfo = GET_RES_INFO(pCtx);
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -2378,26 +2410,26 @@ static void bottom_func_second_merge(SQLFunctionCtx *pCtx) {
 
 static void top_bottom_func_finalizer(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   // data in temporary list is less than the required number of results, not enough qualified number of results
   STopBotInfo *pRes = pResInfo->interResultBuf;
   if (pRes->num == 0) {  // no result
     assert(pResInfo->hasResult != DATA_SET_FLAG);
     // TODO:
   }
-
+  
   GET_RES_INFO(pCtx)->numOfRes = pRes->num;
   tValuePair **tvp = pRes->res;
-
+  
   // user specify the order of output by sort the result according to timestamp
   if (pCtx->param[1].i64Key == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSQL_SO_ASC) ? resAscComparFn : resDescComparFn;
-    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
+    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resAscComparFn : resDescComparFn;
+    qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
   } else if (pCtx->param[1].i64Key > PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSQL_SO_ASC) ? resDataAscComparFn : resDataDescComparFn;
-    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
+    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resDataAscComparFn : resDataDescComparFn;
+    qsort(tvp, (size_t)pResInfo->numOfRes, POINTER_BYTES, comparator);
   }
-
+  
   GET_TRUE_DATA_TYPE();
   copyTopBotRes(pCtx, type);
   
@@ -2406,44 +2438,94 @@ static void top_bottom_func_finalizer(SQLFunctionCtx *pCtx) {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 static bool percentile_function_setup(SQLFunctionCtx *pCtx) {
-  const int32_t MAX_AVAILABLE_BUFFER_SIZE = 1 << 20;  // 1MB
-  const int32_t NUMOFCOLS = 1;
-
   if (!function_setup(pCtx)) {
     return false;
   }
 
+  // in the first round, get the min-max value of all involved data
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-  SSchema      field[1] = {{pCtx->inputType, "dummyCol", 0, pCtx->inputBytes}};
-
-  tColModel *pModel = tColModelCreate(field, 1, 1000);
-  int32_t    orderIdx = 0;
-
-  // tOrderDesc object
-  tOrderDescriptor *pDesc = tOrderDesCreate(&orderIdx, NUMOFCOLS, pModel, TSQL_SO_DESC);
-
-  ((SPercentileInfo *)(pResInfo->interResultBuf))->pMemBucket =
-      tMemBucketCreate(1024, MAX_AVAILABLE_BUFFER_SIZE, pCtx->inputBytes, pCtx->inputType, pDesc);
+  SPercentileInfo *pInfo = pResInfo->interResultBuf;
+  pInfo->minval = DBL_MAX;
+  pInfo->maxval = -DBL_MAX;
+  pInfo->numOfElems = 0;
 
   return true;
 }
 
 static void percentile_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   SResultInfo *    pResInfo = GET_RES_INFO(pCtx);
   SPercentileInfo *pInfo = pResInfo->interResultBuf;
 
+  // the first stage, only acquire the min/max value
+  if (pInfo->stage == 0) {
+    if (pCtx->preAggVals.isSet) {
+      if (pInfo->minval > pCtx->preAggVals.statis.min) {
+        pInfo->minval = (double)pCtx->preAggVals.statis.min;
+      }
+
+      if (pInfo->maxval < pCtx->preAggVals.statis.max) {
+        pInfo->maxval = (double)pCtx->preAggVals.statis.max;
+      }
+
+      pInfo->numOfElems += (pCtx->size - pCtx->preAggVals.statis.numOfNull);
+    } else {
+      for (int32_t i = 0; i < pCtx->size; ++i) {
+        char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
+        if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
+          continue;
+        }
+
+        // TODO extract functions
+        double v = 0;
+        switch (pCtx->inputType) {
+          case TSDB_DATA_TYPE_TINYINT:
+            v = GET_INT8_VAL(data);
+            break;
+          case TSDB_DATA_TYPE_SMALLINT:
+            v = GET_INT16_VAL(data);
+            break;
+          case TSDB_DATA_TYPE_BIGINT:
+            v = (double)(GET_INT64_VAL(data));
+            break;
+          case TSDB_DATA_TYPE_FLOAT:
+            v = GET_FLOAT_VAL(data);
+            break;
+          case TSDB_DATA_TYPE_DOUBLE:
+            v = GET_DOUBLE_VAL(data);
+            break;
+          default:
+            v = GET_INT32_VAL(data);
+            break;
+        }
+
+        if (v < pInfo->minval) {
+          pInfo->minval = v;
+        }
+
+        if (v > pInfo->maxval) {
+          pInfo->maxval = v;
+        }
+
+        pInfo->numOfElems += 1;
+      }
+    }
+
+    return;
+  }
+
+  // the second stage, calculate the true percentile value
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     notNullElems += 1;
     tMemBucketPut(pInfo->pMemBucket, data, 1);
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
@@ -2457,34 +2539,86 @@ static void percentile_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
 
   SPercentileInfo *pInfo = (SPercentileInfo *)pResInfo->interResultBuf;
-  tMemBucketPut(pInfo->pMemBucket, pData, 1);
 
+  if (pInfo->stage == 0) {
+    // TODO extract functions
+    double v = 0;
+    switch (pCtx->inputType) {
+      case TSDB_DATA_TYPE_TINYINT:
+        v = GET_INT8_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        v = GET_INT16_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_BIGINT:
+        v = (double)(GET_INT64_VAL(pData));
+        break;
+      case TSDB_DATA_TYPE_FLOAT:
+        v = GET_FLOAT_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_DOUBLE:
+        v = GET_DOUBLE_VAL(pData);
+        break;
+      default:
+        v = GET_INT32_VAL(pData);
+        break;
+    }
+
+    if (v < pInfo->minval) {
+      pInfo->minval = v;
+    }
+
+    if (v > pInfo->maxval) {
+      pInfo->maxval = v;
+    }
+
+    pInfo->numOfElems += 1;
+    return;
+  }
+  
+  tMemBucketPut(pInfo->pMemBucket, pData, 1);
+  
   SET_VAL(pCtx, 1, 1);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
 static void percentile_finalizer(SQLFunctionCtx *pCtx) {
   double v = pCtx->param[0].nType == TSDB_DATA_TYPE_INT ? pCtx->param[0].i64Key : pCtx->param[0].dKey;
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   tMemBucket * pMemBucket = ((SPercentileInfo *)pResInfo->interResultBuf)->pMemBucket;
-
-  if (pMemBucket->numOfElems > 0) {  // check for null
+  
+  if (pMemBucket->total > 0) {  // check for null
     *(double *)pCtx->aOutputBuf = getPercentile(pMemBucket, v);
   } else {
     setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
   }
-
-  tOrderDescDestroy(pMemBucket->pOrderDesc);
-  tMemBucketDestroy(pMemBucket);
   
+  tMemBucketDestroy(pMemBucket);
   doFinalizer(pCtx);
 }
 
+static void percentile_next_step(SQLFunctionCtx *pCtx) {
+  SResultInfo *    pResInfo = GET_RES_INFO(pCtx);
+  SPercentileInfo *pInfo = pResInfo->interResultBuf;
+
+  if (pInfo->stage == 0) {
+    // all data are null, set it completed
+    if (pInfo->numOfElems == 0) {
+      pResInfo->complete = true;
+    }
+
+    pInfo->stage += 1;
+    pInfo->pMemBucket = tMemBucketCreate(pCtx->inputBytes, pCtx->inputType, pInfo->minval, pInfo->maxval);
+  } else {
+    pResInfo->complete = true;
+  }
+}
+
 //////////////////////////////////////////////////////////////////////////////////
 static SAPercentileInfo *getAPerctInfo(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   if (pResInfo->superTableQ && pCtx->currentStage != SECONDARY_STAGE_MERGE) {
     return (SAPercentileInfo*) pCtx->aOutputBuf;
   } else {
@@ -2496,9 +2630,9 @@ static bool apercentile_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   SAPercentileInfo *pInfo = getAPerctInfo(pCtx);
-
+  
   char *tmp = (char *)pInfo + sizeof(SAPercentileInfo);
   pInfo->pHisto = tHistogramCreateFrom(tmp, MAX_HISTOGRAM_BIN);
   return true;
@@ -2506,19 +2640,19 @@ static bool apercentile_function_setup(SQLFunctionCtx *pCtx) {
 
 static void apercentile_function(SQLFunctionCtx *pCtx) {
   int32_t notNullElems = 0;
-
+  
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SAPercentileInfo *pInfo = getAPerctInfo(pCtx);
-
+  
   for (int32_t i = 0; i < pCtx->size; ++i) {
     char *data = GET_INPUT_CHAR_INDEX(pCtx, i);
     if (pCtx->hasNull && isNull(data, pCtx->inputType)) {
       continue;
     }
-
+    
     notNullElems += 1;
     double v = 0;
-
+    
     switch (pCtx->inputType) {
       case TSDB_DATA_TYPE_TINYINT:
         v = GET_INT8_VAL(data);
@@ -2527,7 +2661,7 @@ static void apercentile_function(SQLFunctionCtx *pCtx) {
         v = GET_INT16_VAL(data);
         break;
       case TSDB_DATA_TYPE_BIGINT:
-        v = GET_INT64_VAL(data);
+        v = (double)(GET_INT64_VAL(data));
         break;
       case TSDB_DATA_TYPE_FLOAT:
         v = GET_FLOAT_VAL(data);
@@ -2539,16 +2673,16 @@ static void apercentile_function(SQLFunctionCtx *pCtx) {
         v = GET_INT32_VAL(data);
         break;
     }
-
+    
     tHistogramAdd(&pInfo->pHisto, v);
   }
-
+  
   if (!pCtx->hasNull) {
     assert(pCtx->size == notNullElems);
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
@@ -2559,10 +2693,10 @@ static void apercentile_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SAPercentileInfo *pInfo = getAPerctInfo(pCtx);  // pResInfo->interResultBuf;
-
+  
   double v = 0;
   switch (pCtx->inputType) {
     case TSDB_DATA_TYPE_TINYINT:
@@ -2572,7 +2706,7 @@ static void apercentile_function_f(SQLFunctionCtx *pCtx, int32_t index) {
       v = GET_INT16_VAL(pData);
       break;
     case TSDB_DATA_TYPE_BIGINT:
-      v = GET_INT64_VAL(pData);
+      v = (double)(GET_INT64_VAL(pData));
       break;
     case TSDB_DATA_TYPE_FLOAT:
       v = GET_FLOAT_VAL(pData);
@@ -2584,9 +2718,9 @@ static void apercentile_function_f(SQLFunctionCtx *pCtx, int32_t index) {
       v = GET_INT32_VAL(pData);
       break;
   }
-
+  
   tHistogramAdd(&pInfo->pHisto, v);
-
+  
   SET_VAL(pCtx, 1, 1);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
@@ -2594,62 +2728,62 @@ static void apercentile_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 static void apercentile_func_merge(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   SAPercentileInfo *pInput = (SAPercentileInfo *)GET_INPUT_CHAR(pCtx);
-
+  
   pInput->pHisto = (SHistogramInfo*) ((char *)pInput + sizeof(SAPercentileInfo));
   pInput->pHisto->elems = (SHistBin*) ((char *)pInput->pHisto + sizeof(SHistogramInfo));
-
+  
   if (pInput->pHisto->numOfElems <= 0) {
     return;
   }
-
+  
   size_t size = sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1);
-
+  
   SAPercentileInfo *pOutput = getAPerctInfo(pCtx);  //(SAPercentileInfo *)pCtx->aOutputBuf;
   SHistogramInfo *  pHisto = pOutput->pHisto;
-
+  
   if (pHisto->numOfElems <= 0) {
     memcpy(pHisto, pInput->pHisto, size);
     pHisto->elems = (SHistBin*) ((char *)pHisto + sizeof(SHistogramInfo));
   } else {
     pHisto->elems = (SHistBin*) ((char *)pHisto + sizeof(SHistogramInfo));
-
+    
     SHistogramInfo *pRes = tHistogramMerge(pHisto, pInput->pHisto, MAX_HISTOGRAM_BIN);
     memcpy(pHisto, pRes, sizeof(SHistogramInfo) + sizeof(SHistBin) * MAX_HISTOGRAM_BIN);
     pHisto->elems = (SHistBin*) ((char *)pHisto + sizeof(SHistogramInfo));
-
+    
     tHistogramDestroy(&pRes);
   }
-
+  
   SET_VAL(pCtx, 1, 1);
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
 static void apercentile_func_second_merge(SQLFunctionCtx *pCtx) {
   SAPercentileInfo *pInput = (SAPercentileInfo *)GET_INPUT_CHAR(pCtx);
-
+  
   pInput->pHisto = (SHistogramInfo*) ((char *)pInput + sizeof(SAPercentileInfo));
   pInput->pHisto->elems = (SHistBin*) ((char *)pInput->pHisto + sizeof(SHistogramInfo));
-
+  
   if (pInput->pHisto->numOfElems <= 0) {
     return;
   }
-
+  
   SAPercentileInfo *pOutput = getAPerctInfo(pCtx);
   SHistogramInfo *  pHisto = pOutput->pHisto;
-
+  
   if (pHisto->numOfElems <= 0) {
     memcpy(pHisto, pInput->pHisto, sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1));
     pHisto->elems = (SHistBin*) ((char *)pHisto + sizeof(SHistogramInfo));
   } else {
     pHisto->elems = (SHistBin*) ((char *)pHisto + sizeof(SHistogramInfo));
-
+    
     SHistogramInfo *pRes = tHistogramMerge(pHisto, pInput->pHisto, MAX_HISTOGRAM_BIN);
     tHistogramDestroy(&pOutput->pHisto);
     pOutput->pHisto = pRes;
   }
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   pResInfo->hasResult = DATA_SET_FLAG;
   SET_VAL(pCtx, 1, 1);
@@ -2657,17 +2791,17 @@ static void apercentile_func_second_merge(SQLFunctionCtx *pCtx) {
 
 static void apercentile_finalizer(SQLFunctionCtx *pCtx) {
   double v = (pCtx->param[0].nType == TSDB_DATA_TYPE_INT) ? pCtx->param[0].i64Key : pCtx->param[0].dKey;
-
+  
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SAPercentileInfo *pOutput = pResInfo->interResultBuf;
-
+  
   if (pCtx->currentStage == SECONDARY_STAGE_MERGE) {
     if (pResInfo->hasResult == DATA_SET_FLAG) {  // check for null
       assert(pOutput->pHisto->numOfElems > 0);
-
+      
       double  ratio[] = {v};
       double *res = tHistogramUniform(pOutput->pHisto, ratio, 1);
-
+      
       memcpy(pCtx->aOutputBuf, res, sizeof(double));
       free(res);
     } else {
@@ -2677,7 +2811,7 @@ static void apercentile_finalizer(SQLFunctionCtx *pCtx) {
   } else {
     if (pOutput->pHisto->numOfElems > 0) {
       double ratio[] = {v};
-
+      
       double *res = tHistogramUniform(pOutput->pHisto, ratio, 1);
       memcpy(pCtx->aOutputBuf, res, sizeof(double));
       free(res);
@@ -2695,10 +2829,10 @@ static bool leastsquares_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SLeastsquareInfo *pInfo = pResInfo->interResultBuf;
-
+  
   // 2*3 matrix
   pInfo->startVal = pCtx->param[0].dKey;
   return true;
@@ -2725,12 +2859,12 @@ static bool leastsquares_function_setup(SQLFunctionCtx *pCtx) {
 static void leastsquares_function(SQLFunctionCtx *pCtx) {
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SLeastsquareInfo *pInfo = pResInfo->interResultBuf;
-
+  
   double(*param)[3] = pInfo->mat;
   double x = pInfo->startVal;
-
+  
   void *pData = GET_INPUT_CHAR(pCtx);
-
+  
   int32_t numOfElem = 0;
   switch (pCtx->inputType) {
     case TSDB_DATA_TYPE_INT: {
@@ -2740,12 +2874,12 @@ static void leastsquares_function(SQLFunctionCtx *pCtx) {
         if (pCtx->hasNull && isNull((const char*) p, pCtx->inputType)) {
           continue;
         }
-
+        
         param[0][0] += x * x;
         param[0][1] += x;
         param[0][2] += x * p[i];
         param[1][2] += p[i];
-
+        
         x += pCtx->param[1].dKey;
         numOfElem++;
       }
@@ -2777,14 +2911,14 @@ static void leastsquares_function(SQLFunctionCtx *pCtx) {
       break;
     };
   }
-
+  
   pInfo->startVal = x;
   pInfo->num += numOfElem;
-
+  
   if (pInfo->num > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
-
+  
   SET_VAL(pCtx, numOfElem, 1);
 }
 
@@ -2793,12 +2927,12 @@ static void leastsquares_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SLeastsquareInfo *pInfo = pResInfo->interResultBuf;
-
+  
   double(*param)[3] = pInfo->mat;
-
+  
   switch (pCtx->inputType) {
     case TSDB_DATA_TYPE_INT: {
       int32_t *p = pData;
@@ -2831,12 +2965,12 @@ static void leastsquares_function_f(SQLFunctionCtx *pCtx, int32_t index) {
       break;
     }
     default:
-      pError("error data type in leastsquare function:%d", pCtx->inputType);
+      tscError("error data type in leastsquare function:%d", pCtx->inputType);
   };
-
+  
   SET_VAL(pCtx, 1, 1);
   pInfo->num += 1;
-
+  
   if (pInfo->num > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
@@ -2846,35 +2980,40 @@ static void leastsquares_finalizer(SQLFunctionCtx *pCtx) {
   // no data in query
   SResultInfo *     pResInfo = GET_RES_INFO(pCtx);
   SLeastsquareInfo *pInfo = pResInfo->interResultBuf;
-
+  
   if (pInfo->num == 0) {
-    setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
+    if (pCtx->outputType == TSDB_DATA_TYPE_BINARY || pCtx->outputType == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(pCtx->aOutputBuf, pCtx->outputType);
+    } else {
+      setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
+    }
+    
     return;
   }
-
+  
   double(*param)[3] = pInfo->mat;
-
-  param[1][1] = pInfo->num;
+  
+  param[1][1] = (double)pInfo->num;
   param[1][0] = param[0][1];
-
+  
   param[0][0] -= param[1][0] * (param[0][1] / param[1][1]);
   param[0][2] -= param[1][2] * (param[0][1] / param[1][1]);
   param[0][1] = 0;
   param[1][2] -= param[0][2] * (param[1][0] / param[0][0]);
   param[1][0] = 0;
   param[0][2] /= param[0][0];
-
+  
   param[1][2] /= param[1][1];
-
-  sprintf(pCtx->aOutputBuf, "(%lf, %lf)", param[0][2], param[1][2]);
+  
+  int32_t maxOutputSize = TSDB_AVG_FUNCTION_INTER_BUFFER_SIZE - VARSTR_HEADER_SIZE;
+  size_t n = snprintf(varDataVal(pCtx->aOutputBuf), maxOutputSize, "{slop:%.6lf, intercept:%.6lf}",
+      param[0][2], param[1][2]);
+  
+  varDataSetLen(pCtx->aOutputBuf, n);
   doFinalizer(pCtx);
 }
 
 static void date_col_output_function(SQLFunctionCtx *pCtx) {
-  if (pCtx->scanFlag == SUPPLEMENTARY_SCAN) {
-    return;
-  }
-
   SET_VAL(pCtx, pCtx->size, 1);
   *(int64_t *)(pCtx->aOutputBuf) = pCtx->nStartQueryTimestamp;
 }
@@ -2884,15 +3023,20 @@ static FORCE_INLINE void date_col_output_function_f(SQLFunctionCtx *pCtx, int32_
 }
 
 static void col_project_function(SQLFunctionCtx *pCtx) {
+  // the number of output rows should not affect the final number of rows, so set it to be 0
+  if (pCtx->numOfParams == 2) {
+    return;
+  }
+
   INC_INIT_VAL(pCtx, pCtx->size);
 
   char *pData = GET_INPUT_CHAR(pCtx);
-  if (pCtx->order == TSQL_SO_ASC) {
-    memcpy(pCtx->aOutputBuf, pData, (size_t)pCtx->size * pCtx->inputBytes);
+  if (pCtx->order == TSDB_ORDER_ASC) {
+    memcpy(pCtx->aOutputBuf, pData, (size_t) pCtx->size * pCtx->inputBytes);
   } else {
     for(int32_t i = 0; i < pCtx->size; ++i) {
       memcpy(pCtx->aOutputBuf + (pCtx->size - 1 - i) * pCtx->inputBytes, pData + i * pCtx->inputBytes,
-          pCtx->inputBytes);
+             pCtx->inputBytes);
     }
   }
 
@@ -2901,6 +3045,9 @@ static void col_project_function(SQLFunctionCtx *pCtx) {
 
 static void col_project_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  if (pCtx->numOfParams == 2) {  // the number of output rows should not affect the final number of rows, so set it to be 0
+    return;
+  }
 
   // only one output
   if (pCtx->param[0].i64Key == 1 && pResInfo->numOfRes >= 1) {
@@ -2911,7 +3058,7 @@ static void col_project_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   char *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
   memcpy(pCtx->aOutputBuf, pData, pCtx->inputBytes);
 
-  pCtx->aOutputBuf += pCtx->inputBytes/* * GET_FORWARD_DIRECTION_FACTOR(pCtx->order)*/;
+  pCtx->aOutputBuf += pCtx->inputBytes;
 }
 
 /**
@@ -2921,18 +3068,24 @@ static void col_project_function_f(SQLFunctionCtx *pCtx, int32_t index) {
  */
 static void tag_project_function(SQLFunctionCtx *pCtx) {
   INC_INIT_VAL(pCtx, pCtx->size);
-
+  
   assert(pCtx->inputBytes == pCtx->outputBytes);
 
-  for (int32_t i = 0; i < pCtx->size; ++i) {
-    tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->outputType);
+  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->outputType, true);
+  char* data = pCtx->aOutputBuf;
+  pCtx->aOutputBuf += pCtx->outputBytes;
+
+  // directly copy from the first one
+  for (int32_t i = 1; i < pCtx->size; ++i) {
+    memmove(pCtx->aOutputBuf, data, pCtx->outputBytes);
     pCtx->aOutputBuf += pCtx->outputBytes;
   }
 }
 
 static void tag_project_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   INC_INIT_VAL(pCtx, 1);
-  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->tag.nType);
+  
+  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->tag.nType, true);
   pCtx->aOutputBuf += pCtx->outputBytes;
 }
 
@@ -2945,17 +3098,17 @@ static void tag_project_function_f(SQLFunctionCtx *pCtx, int32_t index) {
  */
 static void tag_function(SQLFunctionCtx *pCtx) {
   SET_VAL(pCtx, 1, 1);
-  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->tag.nType);
+  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->outputType, true);
 }
 
 static void tag_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   SET_VAL(pCtx, 1, 1);
-  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->tag.nType);
+  tVariantDump(&pCtx->tag, pCtx->aOutputBuf, pCtx->outputType, true);
 }
 
 static void copy_function(SQLFunctionCtx *pCtx) {
   SET_VAL(pCtx, pCtx->size, 1);
-
+  
   char *pData = GET_INPUT_CHAR(pCtx);
   assignVal(pCtx->aOutputBuf, pData, pCtx->inputBytes, pCtx->inputType);
 }
@@ -2968,7 +3121,7 @@ static bool diff_function_setup(SQLFunctionCtx *pCtx) {
   if (function_setup(pCtx)) {
     return false;
   }
-
+  
   // diff function require the value is set to -1
   pCtx->param[1].nType = INITIAL_VALUE_NOT_ASSIGNED;
   return false;
@@ -2978,41 +3131,41 @@ static bool diff_function_setup(SQLFunctionCtx *pCtx) {
 static void diff_function(SQLFunctionCtx *pCtx) {
   void *data = GET_INPUT_CHAR(pCtx);
   bool  isFirstBlock = (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED);
-
+  
   int32_t notNullElems = 0;
-
+  
   int32_t step = GET_FORWARD_DIRECTION_FACTOR(pCtx->order);
-  int32_t i = (pCtx->order == TSQL_SO_ASC) ? 0 : pCtx->size - 1;
+  int32_t i = (pCtx->order == TSDB_ORDER_ASC) ? 0 : pCtx->size - 1;
   
   TSKEY * pTimestamp = pCtx->ptsOutputBuf;
-
+  
   switch (pCtx->inputType) {
     case TSDB_DATA_TYPE_INT: {
       int32_t *pData = (int32_t *)data;
       int32_t *pOutput = (int32_t *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].i64Key = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
-          *pOutput = pData[i] - pCtx->param[1].i64Key;
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
+          *pOutput = (int32_t)(pData[i] - pCtx->param[1].i64Key);
           *pTimestamp = pCtx->ptsList[i];
-
+          
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = (int32_t)(pData[i] - pCtx->param[1].i64Key);  // direct previous may be null
           *pTimestamp = pCtx->ptsList[i];
-
+          
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         pCtx->param[1].i64Key = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
         notNullElems++;
@@ -3022,29 +3175,29 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     case TSDB_DATA_TYPE_BIGINT: {
       int64_t *pData = (int64_t *)data;
       int64_t *pOutput = (int64_t *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].i64Key = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
           *pOutput = pData[i] - pCtx->param[1].i64Key;
           *pTimestamp = pCtx->ptsList[i];
-
+          
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = pData[i] - pCtx->param[1].i64Key;
           *pTimestamp = pCtx->ptsList[i];
-
+          
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         pCtx->param[1].i64Key = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
         notNullElems++;
@@ -3054,27 +3207,27 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     case TSDB_DATA_TYPE_DOUBLE: {
       double *pData = (double *)data;
       double *pOutput = (double *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].dKey = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
           *pOutput = pData[i] - pCtx->param[1].dKey;
           *pTimestamp = pCtx->ptsList[i];
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = pData[i] - pCtx->param[1].dKey;
           *pTimestamp = pCtx->ptsList[i];
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         pCtx->param[1].dKey = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
         notNullElems++;
@@ -3084,29 +3237,29 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     case TSDB_DATA_TYPE_FLOAT: {
       float *pData = (float *)data;
       float *pOutput = (float *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].dKey = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
-          *pOutput = pData[i] - pCtx->param[1].dKey;
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
+          *pOutput = (float)(pData[i] - pCtx->param[1].dKey);
           *pTimestamp = pCtx->ptsList[i];
           
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = (float)(pData[i] - pCtx->param[1].dKey);
           *pTimestamp = pCtx->ptsList[i];
           
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         // keep the last value, the remain may be all null
         pCtx->param[1].dKey = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
@@ -3117,28 +3270,28 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     case TSDB_DATA_TYPE_SMALLINT: {
       int16_t *pData = (int16_t *)data;
       int16_t *pOutput = (int16_t *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((const char*) &pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].i64Key = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
-          *pOutput = pData[i] - pCtx->param[1].i64Key;
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
+          *pOutput = (int16_t)(pData[i] - pCtx->param[1].i64Key);
           *pTimestamp = pCtx->ptsList[i];
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = (int16_t)(pData[i] - pCtx->param[1].i64Key);
           *pTimestamp = pCtx->ptsList[i];
           
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         pCtx->param[1].i64Key = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
         notNullElems++;
@@ -3148,29 +3301,29 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     case TSDB_DATA_TYPE_TINYINT: {
       int8_t *pData = (int8_t *)data;
       int8_t *pOutput = (int8_t *)pCtx->aOutputBuf;
-
+      
       for (; i < pCtx->size && i >= 0; i += step) {
         if (pCtx->hasNull && isNull((char *)&pData[i], pCtx->inputType)) {
           continue;
         }
-
+        
         if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
           pCtx->param[1].i64Key = pData[i];
           pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
-          *pOutput = pData[i] - pCtx->param[1].i64Key;
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
+          *pOutput = (int8_t)(pData[i] - pCtx->param[1].i64Key);
           *pTimestamp = pCtx->ptsList[i];
           
           pOutput += 1;
           pTimestamp += 1;
         } else {
-          *pOutput = pData[i] - pData[i - step];
+          *pOutput = (int8_t)(pData[i] - pCtx->param[1].i64Key);
           *pTimestamp = pCtx->ptsList[i];
           
           pOutput += 1;
           pTimestamp += 1;
         }
-
+        
         pCtx->param[1].i64Key = pData[i];
         pCtx->param[1].nType = pCtx->inputType;
         notNullElems++;
@@ -3178,9 +3331,9 @@ static void diff_function(SQLFunctionCtx *pCtx) {
       break;
     };
     default:
-      pError("error input type");
+      tscError("error input type");
   }
-
+  
   // initial value is not set yet
   if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED || notNullElems <= 0) {
     /*
@@ -3190,9 +3343,9 @@ static void diff_function(SQLFunctionCtx *pCtx) {
     assert(pCtx->hasNull);
   } else {
     int32_t forwardStep = (isFirstBlock) ? notNullElems - 1 : notNullElems;
-
+    
     GET_RES_INFO(pCtx)->numOfRes += forwardStep;
-
+    
     pCtx->aOutputBuf += forwardStep * pCtx->outputBytes;
     pCtx->ptsOutputBuf = (char*)pCtx->ptsOutputBuf + forwardStep * TSDB_KEYSIZE;
   }
@@ -3215,21 +3368,21 @@ static void diff_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   // the output start from the second source element
   if (pCtx->param[1].nType != INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is set
     GET_RES_INFO(pCtx)->numOfRes += 1;
   }
-
+  
   int32_t step = 1/*GET_FORWARD_DIRECTION_FACTOR(pCtx->order)*/;
-
+  
   switch (pCtx->inputType) {
     case TSDB_DATA_TYPE_INT: {
       if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
         pCtx->param[1].nType = pCtx->inputType;
         pCtx->param[1].i64Key = *(int32_t *)pData;
       } else {
-        *(int32_t *)pCtx->aOutputBuf = *(int32_t *)pData - pCtx->param[1].i64Key;
+        *(int32_t *)pCtx->aOutputBuf = *(int32_t *)pData - (int32_t)pCtx->param[1].i64Key;
         pCtx->param[1].i64Key = *(int32_t *)pData;
         *(int64_t *)pCtx->ptsOutputBuf = pCtx->ptsList[index];
       }
@@ -3256,52 +3409,48 @@ static void diff_function_f(SQLFunctionCtx *pCtx, int32_t index) {
       break;
     };
     default:
-      pError("error input type");
+      tscError("error input type");
   }
-
+  
   if (GET_RES_INFO(pCtx)->numOfRes > 0) {
     pCtx->aOutputBuf += pCtx->outputBytes * step;
     pCtx->ptsOutputBuf = (char *)pCtx->ptsOutputBuf + TSDB_KEYSIZE * step;
   }
 }
 
-char *arithmetic_callback_function(void *param, char *name, int32_t colId) {
+char *getArithColumnData(void *param, const char* name, int32_t colId) {
   SArithmeticSupport *pSupport = (SArithmeticSupport *)param;
-
-  SSqlFunctionExpr *pExpr = pSupport->pExpr;
-  int32_t           colIndexInBuf = -1;
-
-  for (int32_t i = 0; i < pExpr->pBinExprInfo.numOfCols; ++i) {
-    if (colId == pExpr->pBinExprInfo.pReqColumns[i].colId) {
-      colIndexInBuf = pExpr->pBinExprInfo.pReqColumns[i].colIdxInBuf;
+  
+  int32_t index = -1;
+  for (int32_t i = 0; i < pSupport->numOfCols; ++i) {
+    if (colId == pSupport->colList[i].colId) {
+      index = i;
       break;
     }
   }
-
-  assert(colIndexInBuf >= 0 && colId >= 0);
-  return pSupport->data[colIndexInBuf] + pSupport->offset * pSupport->elemSize[colIndexInBuf];
+  
+  assert(index >= 0 && colId >= 0);
+  return pSupport->data[index] + pSupport->offset * pSupport->colList[index].bytes;
 }
 
 static void arithmetic_function(SQLFunctionCtx *pCtx) {
   GET_RES_INFO(pCtx)->numOfRes += pCtx->size;
   SArithmeticSupport *sas = (SArithmeticSupport *)pCtx->param[1].pz;
-
-  tSQLBinaryExprCalcTraverse(sas->pExpr->pBinExprInfo.pBinExpr, pCtx->size, pCtx->aOutputBuf, sas, pCtx->order,
-                             arithmetic_callback_function);
-
-  pCtx->aOutputBuf += pCtx->outputBytes * pCtx->size/* * GET_FORWARD_DIRECTION_FACTOR(pCtx->order)*/;
+  
+  tExprTreeCalcTraverse(sas->pArithExpr->pExpr, pCtx->size, pCtx->aOutputBuf, sas, pCtx->order, getArithColumnData);
+  
+  pCtx->aOutputBuf += pCtx->outputBytes * pCtx->size;
   pCtx->param[1].pz = NULL;
 }
 
 static void arithmetic_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   INC_INIT_VAL(pCtx, 1);
   SArithmeticSupport *sas = (SArithmeticSupport *)pCtx->param[1].pz;
-
+  
   sas->offset = index;
-  tSQLBinaryExprCalcTraverse(sas->pExpr->pBinExprInfo.pBinExpr, 1, pCtx->aOutputBuf, sas, pCtx->order,
-                             arithmetic_callback_function);
-
-  pCtx->aOutputBuf += pCtx->outputBytes/* * GET_FORWARD_DIRECTION_FACTOR(pCtx->order)*/;
+  tExprTreeCalcTraverse(sas->pArithExpr->pExpr, 1, pCtx->aOutputBuf, sas, pCtx->order, getArithColumnData);
+  
+  pCtx->aOutputBuf += pCtx->outputBytes;
 }
 
 #define LIST_MINMAX_N(ctx, minOutput, maxOutput, elemCnt, data, type, tsdbType, numOfNotNullElem) \
@@ -3312,10 +3461,10 @@ static void arithmetic_function_f(SQLFunctionCtx *pCtx, int32_t index) {
         continue;                                                                                 \
       }                                                                                           \
       if (inputData[i] < minOutput) {                                                             \
-        minOutput = inputData[i];                                                                 \
+        minOutput = (double)inputData[i];                                                                 \
       }                                                                                           \
       if (inputData[i] > maxOutput) {                                                             \
-        maxOutput = inputData[i];                                                                 \
+        maxOutput = (double)inputData[i];                                                                 \
       }                                                                                           \
       numOfNotNullElem++;                                                                         \
     }                                                                                             \
@@ -3326,9 +3475,9 @@ static bool spread_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   SSpreadInfo *pInfo = GET_RES_INFO(pCtx)->interResultBuf;
-
+  
   // this is the server-side setup function in client-side, the secondary merge do not need this procedure
   if (pCtx->currentStage == SECONDARY_STAGE_MERGE) {
     pCtx->param[0].dKey = DBL_MAX;
@@ -3337,60 +3486,51 @@ static bool spread_function_setup(SQLFunctionCtx *pCtx) {
     pInfo->min = DBL_MAX;
     pInfo->max = -DBL_MAX;
   }
-
+  
   return true;
 }
 
 static void spread_function(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   SSpreadInfo *pInfo = pResInfo->interResultBuf;
-
-  int32_t numOfElems = pCtx->size;
-
+  
+  int32_t numOfElems = 0;
+  
+  // todo : opt with pre-calculated result
   // column missing cause the hasNull to be true
-  if (!IS_DATA_BLOCK_LOADED(pCtx->blockStatus)) {
-    if (pCtx->preAggVals.isSet) {
-      numOfElems = pCtx->size - pCtx->preAggVals.numOfNull;
-
-      // all data are null in current data block, ignore current data block
-      if (numOfElems == 0) {
-        goto _spread_over;
+  if (pCtx->preAggVals.isSet) {
+    numOfElems = pCtx->size - pCtx->preAggVals.statis.numOfNull;
+    
+    // all data are null in current data block, ignore current data block
+    if (numOfElems == 0) {
+      goto _spread_over;
+    }
+    
+    if ((pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) ||
+        (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP)) {
+      if (pInfo->min > pCtx->preAggVals.statis.min) {
+        pInfo->min = (double)pCtx->preAggVals.statis.min;
       }
-
-      if ((pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) ||
-          (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP)) {
-        if (pInfo->min > pCtx->preAggVals.min) {
-          pInfo->min = pCtx->preAggVals.min;
-        }
-
-        if (pInfo->max < pCtx->preAggVals.max) {
-          pInfo->max = pCtx->preAggVals.max;
-        }
-      } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
-        if (pInfo->min > GET_DOUBLE_VAL(&(pCtx->preAggVals.min))) {
-          pInfo->min = GET_DOUBLE_VAL(&(pCtx->preAggVals.min));
-        }
-
-        if (pInfo->max < GET_DOUBLE_VAL(&(pCtx->preAggVals.max))) {
-          pInfo->max = GET_DOUBLE_VAL(&(pCtx->preAggVals.max));
-        }
+      
+      if (pInfo->max < pCtx->preAggVals.statis.max) {
+        pInfo->max = (double)pCtx->preAggVals.statis.max;
       }
-    } else {
-      if (pInfo->min > pCtx->param[1].dKey) {
-        pInfo->min = pCtx->param[1].dKey;
+    } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
+      if (pInfo->min > GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.min))) {
+        pInfo->min = GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.min));
       }
-
-      if (pInfo->max < pCtx->param[2].dKey) {
-        pInfo->max = pCtx->param[2].dKey;
+      
+      if (pInfo->max < GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.max))) {
+        pInfo->max = GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.max));
       }
     }
-
+    
     goto _spread_over;
   }
-
+  
   void *pData = GET_INPUT_CHAR(pCtx);
   numOfElems = 0;
-
+  
   if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
     LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, int8_t, pCtx->inputType, numOfElems);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_SMALLINT) {
@@ -3404,19 +3544,19 @@ static void spread_function(SQLFunctionCtx *pCtx) {
   } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
     LIST_MINMAX_N(pCtx, pInfo->min, pInfo->max, pCtx->size, pData, float, pCtx->inputType, numOfElems);
   }
-
+  
   if (!pCtx->hasNull) {
     assert(pCtx->size == numOfElems);
   }
-
-_spread_over:
+  
+  _spread_over:
   SET_VAL(pCtx, numOfElems, 1);
-
+  
   if (numOfElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
     pInfo->hasResult = DATA_SET_FLAG;
   }
-
+  
   // keep the data into the final output buffer for super table query since this execution may be the last one
   if (pResInfo->superTableQ) {
     memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SSpreadInfo));
@@ -3428,12 +3568,12 @@ static void spread_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SET_VAL(pCtx, 1, 1);
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   SSpreadInfo *pInfo = pResInfo->interResultBuf;
-
+  
   double val = 0.0;
   if (pCtx->inputType == TSDB_DATA_TYPE_TINYINT) {
     val = GET_INT8_VAL(pData);
@@ -3442,25 +3582,25 @@ static void spread_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   } else if (pCtx->inputType == TSDB_DATA_TYPE_INT) {
     val = GET_INT32_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_BIGINT || pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP) {
-    val = GET_INT64_VAL(pData);
+    val = (double)(GET_INT64_VAL(pData));
   } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
     val = GET_DOUBLE_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
     val = GET_FLOAT_VAL(pData);
   }
-
+  
   // keep the result data in output buffer, not in the intermediate buffer
   if (val > pInfo->max) {
     pInfo->max = val;
   }
-
+  
   if (val < pInfo->min) {
     pInfo->min = val;
   }
-
+  
   pResInfo->hasResult = DATA_SET_FLAG;
   pInfo->hasResult = DATA_SET_FLAG;
-
+  
   if (pResInfo->superTableQ) {
     memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SSpreadInfo));
   }
@@ -3469,30 +3609,30 @@ static void spread_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 void spread_func_merge(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   SSpreadInfo *pResData = pResInfo->interResultBuf;
-
+  
   int32_t notNullElems = 0;
   for (int32_t i = 0; i < pCtx->size; ++i) {
     SSpreadInfo *input = (SSpreadInfo *)GET_INPUT_CHAR_INDEX(pCtx, i);
-
+    
     /* no assign tag, the value is null */
     if (input->hasResult != DATA_SET_FLAG) {
       continue;
     }
-
+    
     if (pResData->min > input->min) {
       pResData->min = input->min;
     }
-
+    
     if (pResData->max < input->max) {
       pResData->max = input->max;
     }
-
+    
     pResData->hasResult = DATA_SET_FLAG;
     notNullElems++;
   }
-
+  
   if (notNullElems > 0) {
     memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SSpreadInfo));
     pResInfo->hasResult = DATA_SET_FLAG;
@@ -3508,15 +3648,15 @@ void spread_func_sec_merge(SQLFunctionCtx *pCtx) {
   if (pData->hasResult != DATA_SET_FLAG) {
     return;
   }
-
+  
   if (pCtx->param[0].dKey > pData->min) {
     pCtx->param[0].dKey = pData->min;
   }
-
+  
   if (pCtx->param[3].dKey < pData->max) {
     pCtx->param[3].dKey = pData->max;
   }
-
+  
   GET_RES_INFO(pCtx)->hasResult = DATA_SET_FLAG;
 }
 
@@ -3526,440 +3666,33 @@ void spread_function_finalizer(SQLFunctionCtx *pCtx) {
    * the type of intermediate data is binary
    */
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   if (pCtx->currentStage == SECONDARY_STAGE_MERGE) {
     assert(pCtx->inputType == TSDB_DATA_TYPE_BINARY);
-
+    
     if (pResInfo->hasResult != DATA_SET_FLAG) {
       setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
       return;
     }
-
+    
     *(double *)pCtx->aOutputBuf = pCtx->param[3].dKey - pCtx->param[0].dKey;
   } else {
     assert((pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_DOUBLE) ||
-           (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP));
-
+        (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP));
+    
     SSpreadInfo *pInfo = GET_RES_INFO(pCtx)->interResultBuf;
     if (pInfo->hasResult != DATA_SET_FLAG) {
       setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
       return;
     }
-
+    
     *(double *)pCtx->aOutputBuf = pInfo->max - pInfo->min;
   }
   
   GET_RES_INFO(pCtx)->numOfRes = 1;  // todo add test case
+  doFinalizer(pCtx);
 }
 
-/*
- * Compare two strings
- *    TSDB_MATCH:            Match
- *    TSDB_NOMATCH:          No match
- *    TSDB_NOWILDCARDMATCH:  No match in spite of having * or % wildcards.
- * Like matching rules:
- *      '%': Matches zero or more characters
- *      '_': Matches one character
- *
- */
-int patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
-  char c, c1;
-
-  int32_t i = 0;
-  int32_t j = 0;
-
-  while ((c = patterStr[i++]) != 0) {
-    if (c == pInfo->matchAll) { /* Match "*" */
-
-      while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
-        if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
-          // empty string, return not match
-          return TSDB_PATTERN_NOWILDCARDMATCH;
-        }
-      }
-
-      if (c == 0) {
-        return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */
-      }
-
-      char next[3] = {toupper(c), tolower(c), 0};
-      while (1) {
-        size_t n = strcspn(str, next);
-        str += n;
-
-        if (str[0] == 0 || (n >= size - 1)) {
-          break;
-        }
-
-        int32_t ret = patternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
-        if (ret != TSDB_PATTERN_NOMATCH) {
-          return ret;
-        }
-      }
-      return TSDB_PATTERN_NOWILDCARDMATCH;
-    }
-
-    c1 = str[j++];
-
-    if (j <= size) {
-      if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
-        continue;
-      }
-    }
-
-    return TSDB_PATTERN_NOMATCH;
-  }
-
-  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
-}
-
-int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo) {
-  wchar_t c, c1;
-  wchar_t matchOne = L'_';  // "_"
-  wchar_t matchAll = L'%';  // "%"
-
-  int32_t i = 0;
-  int32_t j = 0;
-
-  while ((c = patterStr[i++]) != 0) {
-    if (c == matchAll) { /* Match "%" */
-
-      while ((c = patterStr[i++]) == matchAll || c == matchOne) {
-        if (c == matchOne && (j > size || str[j++] == 0)) {
-          return TSDB_PATTERN_NOWILDCARDMATCH;
-        }
-      }
-      if (c == 0) {
-        return TSDB_PATTERN_MATCH;
-      }
-
-      wchar_t accept[3] = {towupper(c), towlower(c), 0};
-      while (1) {
-        size_t n = wcsspn(str, accept);
-
-        str += n;
-        if (str[0] == 0 || (n >= size - 1)) {
-          break;
-        }
-
-        str++;
-
-        int32_t ret = WCSPatternMatch(&patterStr[i], str, wcslen(str), pInfo);
-        if (ret != TSDB_PATTERN_NOMATCH) {
-          return ret;
-        }
-      }
-
-      return TSDB_PATTERN_NOWILDCARDMATCH;
-    }
-
-    c1 = str[j++];
-
-    if (j <= size) {
-      if (c == c1 || towlower(c) == towlower(c1) || (c == matchOne && c1 != 0)) {
-        continue;
-      }
-    }
-
-    return TSDB_PATTERN_NOMATCH;
-  }
-
-  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
-}
-
-static void getStatics_i8(int64_t *primaryKey, int32_t type, int8_t *data, int32_t numOfRow, int64_t *min, int64_t *max,
-                          int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  *min = INT64_MAX;
-  *max = INT64_MIN;
-  *minIndex = 0;
-  *maxIndex = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  //  int64_t lastKey = 0;
-  //  int8_t  lastVal = TSDB_DATA_TINYINT_NULL;
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((char *)&data[i], type)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    *sum += data[i];
-    if (*min > data[i]) {
-      *min = data[i];
-      *minIndex = i;
-    }
-
-    if (*max < data[i]) {
-      *max = data[i];
-      *maxIndex = i;
-    }
-
-    //    if (type != TSDB_DATA_TYPE_BOOL) { // ignore the bool data type pre-calculation
-    //      if (isNull((char *)&lastVal, type)) {
-    //        lastKey = primaryKey[i];
-    //        lastVal = data[i];
-    //      } else {
-    //        *wsum = lastVal * (primaryKey[i] - lastKey);
-    //        lastKey = primaryKey[i];
-    //        lastVal = data[i];
-    //      }
-    //    }
-  }
-}
-
-static void getStatics_i16(int64_t *primaryKey, int16_t *data, int32_t numOfRow, int64_t *min, int64_t *max,
-                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  *min = INT64_MAX;
-  *max = INT64_MIN;
-  *minIndex = 0;
-  *maxIndex = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  //  int64_t lastKey = 0;
-  //  int16_t lastVal = TSDB_DATA_SMALLINT_NULL;
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_SMALLINT)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    *sum += data[i];
-    if (*min > data[i]) {
-      *min = data[i];
-      *minIndex = i;
-    }
-
-    if (*max < data[i]) {
-      *max = data[i];
-      *maxIndex = i;
-    }
-
-    //    if (isNull(&lastVal, TSDB_DATA_TYPE_SMALLINT)) {
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    } else {
-    //      *wsum = lastVal * (primaryKey[i] - lastKey);
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    }
-  }
-}
-
-static void getStatics_i32(int64_t *primaryKey, int32_t *data, int32_t numOfRow, int64_t *min, int64_t *max,
-                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  *min = INT64_MAX;
-  *max = INT64_MIN;
-  *minIndex = 0;
-  *maxIndex = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  //  int64_t lastKey = 0;
-  //  int32_t lastVal = TSDB_DATA_INT_NULL;
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_INT)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    *sum += data[i];
-    if (*min > data[i]) {
-      *min = data[i];
-      *minIndex = i;
-    }
-
-    if (*max < data[i]) {
-      *max = data[i];
-      *maxIndex = i;
-    }
-
-    //    if (isNull(&lastVal, TSDB_DATA_TYPE_INT)) {
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    } else {
-    //      *wsum = lastVal * (primaryKey[i] - lastKey);
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    }
-  }
-}
-
-static void getStatics_i64(int64_t *primaryKey, int64_t *data, int32_t numOfRow, int64_t *min, int64_t *max,
-                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  *min = INT64_MAX;
-  *max = INT64_MIN;
-  *minIndex = 0;
-  *maxIndex = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_BIGINT)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    *sum += data[i];
-    if (*min > data[i]) {
-      *min = data[i];
-      *minIndex = i;
-    }
-
-    if (*max < data[i]) {
-      *max = data[i];
-      *maxIndex = i;
-    }
-
-    //    if (isNull(&lastVal, TSDB_DATA_TYPE_BIGINT)) {
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    } else {
-    //      *wsum = lastVal * (primaryKey[i] - lastKey);
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    }
-  }
-}
-
-static void getStatics_f(int64_t *primaryKey, float *data, int32_t numOfRow, double *min, double *max, double *sum,
-                         int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  float fmin      = DBL_MAX;
-  float fmax      = -DBL_MAX;
-  double dsum     = 0;
-  *minIndex       = 0;
-  *maxIndex       = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_FLOAT)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    float fv = 0;
-    fv = GET_FLOAT_VAL(&(data[i]));
-    dsum += fv;
-    if (fmin > fv) {
-      fmin = fv;
-      *minIndex = i;
-    }
-
-    if (fmax < fv) {
-      fmax = fv;
-      *maxIndex = i;
-    }
-
-    //    if (isNull(&lastVal, TSDB_DATA_TYPE_FLOAT)) {
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    } else {
-    //      *wsum = lastVal * (primaryKey[i] - lastKey);
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    }
-  }
-
-  double csum = 0;
-  csum = GET_DOUBLE_VAL(sum);
-  csum += dsum;
-#ifdef _TD_ARM_32_
-  SET_DOUBLE_VAL_ALIGN(sum, &csum);
-  SET_DOUBLE_VAL_ALIGN(max, &fmax);
-  SET_DOUBLE_VAL_ALIGN(min, &fmin);
-#else
-  *sum = csum;
-  *max = fmax;
-  *min = fmin;
-#endif
-}
-
-static void getStatics_d(int64_t *primaryKey, double *data, int32_t numOfRow, double *min, double *max, double *sum,
-                         int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  double dmin      = DBL_MAX;
-  double dmax      = -DBL_MAX;
-  double dsum      = 0;
-  *minIndex        = 0;
-  *maxIndex        = 0;
-
-  assert(numOfRow <= INT16_MAX);
-
-  for (int32_t i = 0; i < numOfRow; ++i) {
-    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_DOUBLE)) {
-      (*numOfNull) += 1;
-      continue;
-    }
-
-    double dv = 0;
-    dv = GET_DOUBLE_VAL(&(data[i]));
-    dsum += dv;
-    if (dmin > dv) {
-      dmin = dv;
-      *minIndex = i;
-    }
-
-    if (dmax < dv) {
-      dmax = dv;
-      *maxIndex = i;
-    }
-
-    //    if (isNull(&lastVal, TSDB_DATA_TYPE_DOUBLE)) {
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    } else {
-    //      *wsum = lastVal * (primaryKey[i] - lastKey);
-    //      lastKey = primaryKey[i];
-    //      lastVal = data[i];
-    //    }
-  }
- 
-  double csum = 0;
-  csum = GET_DOUBLE_VAL(sum);
-  csum += dsum;
-
-
-#ifdef _TD_ARM_32_
-    SET_DOUBLE_VAL_ALIGN(sum, &csum);
-    SET_DOUBLE_VAL_ALIGN(max, &dmax);
-    SET_DOUBLE_VAL_ALIGN(min, &dmin);
-#else
-    *sum = csum;
-    *max = dmax;
-    *min = dmin;
-#endif
-}
-
-void getStatistics(char *priData, char *data, int32_t size, int32_t numOfRow, int32_t type, int64_t *min, int64_t *max,
-                   int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
-  int64_t *primaryKey = (int64_t *)priData;
-  if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-    for (int32_t i = 0; i < numOfRow; ++i) {
-      if (isNull(data + i * size, type)) {
-        (*numOfNull) += 1;
-        continue;
-      }
-    }
-  } else {
-    if (type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_BOOL) {
-      getStatics_i8(primaryKey, type, (int8_t *)data, numOfRow, min, max, sum, minIndex, maxIndex, numOfNull);
-    } else if (type == TSDB_DATA_TYPE_SMALLINT) {
-      getStatics_i16(primaryKey, (int16_t *)data, numOfRow, min, max, sum, minIndex, maxIndex, numOfNull);
-    } else if (type == TSDB_DATA_TYPE_INT) {
-      getStatics_i32(primaryKey, (int32_t *)data, numOfRow, min, max, sum, minIndex, maxIndex, numOfNull);
-    } else if (type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_TIMESTAMP) {
-      getStatics_i64(primaryKey, (int64_t *)data, numOfRow, min, max, sum, minIndex, maxIndex, numOfNull);
-    } else if (type == TSDB_DATA_TYPE_DOUBLE) {
-      getStatics_d(primaryKey, (double *)data, numOfRow, (double*) min, (double*) max, (double*) sum, minIndex, maxIndex, numOfNull);
-    } else if (type == TSDB_DATA_TYPE_FLOAT) {
-      getStatics_f(primaryKey, (float *)data, numOfRow, (double*) min, (double*) max, (double*) sum, minIndex, maxIndex, numOfNull);
-    }
-  }
-}
 
 /**
  * param[1]: start time
@@ -3970,13 +3703,13 @@ static bool twa_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;
   }
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);  //->aOutputBuf + pCtx->outputBytes;
   STwaInfo *   pInfo = pResInfo->interResultBuf;
-
+  
   pInfo->lastKey = INT64_MIN;
   pInfo->type = pCtx->inputType;
-
+  
   return true;
 }
 
@@ -4008,69 +3741,67 @@ static FORCE_INLINE void setTWALastVal(SQLFunctionCtx *pCtx, const char *data, i
 static void twa_function(SQLFunctionCtx *pCtx) {
   void * data = GET_INPUT_CHAR(pCtx);
   TSKEY *primaryKey = pCtx->ptsList;
-
-  assert(IS_DATA_BLOCK_LOADED(pCtx->blockStatus));
-
+  
   int32_t notNullElems = 0;
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   STwaInfo *   pInfo = pResInfo->interResultBuf;
-
+  
   int32_t i = 0;
-
+  
   // skip null value
   while (pCtx->hasNull && i < pCtx->size && isNull((char *)data + pCtx->inputBytes * i, pCtx->inputType)) {
     i++;
   }
-
+  
   if (i >= pCtx->size) {
     return;
   }
-
+  
   if (pInfo->lastKey == INT64_MIN) {
     pInfo->lastKey = pCtx->nStartQueryTimestamp;
     setTWALastVal(pCtx, data, i, pInfo);
-
+    
     pInfo->hasResult = DATA_SET_FLAG;
   }
-
+  
   notNullElems++;
-
+  
   if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT || pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
     pInfo->dOutput += pInfo->dLastValue * (primaryKey[i] - pInfo->lastKey);
   } else {
     pInfo->iOutput += pInfo->iLastValue * (primaryKey[i] - pInfo->lastKey);
   }
-
+  
   pInfo->lastKey = primaryKey[i];
   setTWALastVal(pCtx, data, i, pInfo);
-
+  
   for (++i; i < pCtx->size; i++) {
     if (pCtx->hasNull && isNull((char *)data + pCtx->inputBytes * i, pCtx->inputType)) {
       continue;
     }
-
+    
     notNullElems++;
     if (pCtx->inputType == TSDB_DATA_TYPE_FLOAT || pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
       pInfo->dOutput += pInfo->dLastValue * (primaryKey[i] - pInfo->lastKey);
     } else {
       pInfo->iOutput += pInfo->iLastValue * (primaryKey[i] - pInfo->lastKey);
     }
-
+    
     pInfo->lastKey = primaryKey[i];
     setTWALastVal(pCtx, data, i, pInfo);
   }
-
+  
   SET_VAL(pCtx, notNullElems, 1);
-
+  
   if (notNullElems > 0) {
     pResInfo->hasResult = DATA_SET_FLAG;
   }
-
+  
   if (pResInfo->superTableQ) {
     memcpy(pCtx->aOutputBuf, pInfo, sizeof(STwaInfo));
   }
-
+  
   //  pCtx->numOfIteratedElems += notNullElems;
 }
 
@@ -4115,33 +3846,33 @@ static void twa_function_f(SQLFunctionCtx *pCtx, int32_t index) {
 static void twa_func_merge(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   assert(pResInfo->superTableQ);
-
+  
   STwaInfo *pBuf = (STwaInfo *)pCtx->aOutputBuf;
   char *    indicator = pCtx->aInputElemBuf;
-
+  
   int32_t numOfNotNull = 0;
   for (int32_t i = 0; i < pCtx->size; ++i, indicator += sizeof(STwaInfo)) {
     STwaInfo *pInput = (STwaInfo*) indicator;
-
+    
     if (pInput->hasResult != DATA_SET_FLAG) {
       continue;
     }
-
+    
     numOfNotNull++;
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
       pBuf->iOutput += pInput->iOutput;
     } else {
       pBuf->dOutput += pInput->dOutput;
     }
-
+    
     pBuf->SKey = pInput->SKey;
     pBuf->EKey = pInput->EKey;
     pBuf->lastKey = pInput->lastKey;
     pBuf->iLastValue = pInput->iLastValue;
   }
-
+  
   SET_VAL(pCtx, numOfNotNull, 1);
-
+  
   if (numOfNotNull > 0) {
     pBuf->hasResult = DATA_SET_FLAG;
   }
@@ -4155,22 +3886,22 @@ static void twa_func_merge(SQLFunctionCtx *pCtx) {
 void twa_function_copy(SQLFunctionCtx *pCtx) {
   assert(pCtx->inputType == TSDB_DATA_TYPE_BINARY);
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   memcpy(pResInfo->interResultBuf, pCtx->aInputElemBuf, (size_t)pCtx->inputBytes);
   pResInfo->hasResult = ((STwaInfo *)pCtx->aInputElemBuf)->hasResult;
 }
 
 void twa_function_finalizer(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   STwaInfo *pInfo = (STwaInfo *)pResInfo->interResultBuf;
   assert(pInfo->EKey >= pInfo->lastKey && pInfo->hasResult == pResInfo->hasResult);
-
+  
   if (pInfo->hasResult != DATA_SET_FLAG) {
     setNull(pCtx->aOutputBuf, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
     return;
   }
-
+  
   if (pInfo->SKey == pInfo->EKey) {
     *(double *)pCtx->aOutputBuf = 0;
   } else if (pInfo->type >= TSDB_DATA_TYPE_TINYINT && pInfo->type <= TSDB_DATA_TYPE_BIGINT) {
@@ -4180,21 +3911,21 @@ void twa_function_finalizer(SQLFunctionCtx *pCtx) {
     pInfo->dOutput += pInfo->dLastValue * (pInfo->EKey - pInfo->lastKey);
     *(double *)pCtx->aOutputBuf = pInfo->dOutput / (pInfo->EKey - pInfo->SKey);
   }
-
+  
   GET_RES_INFO(pCtx)->numOfRes = 1;
   doFinalizer(pCtx);
 }
 
 /**
- * param[1]: default value/previous value of specified timestamp
- * param[2]: next value of specified timestamp
- * param[3]: denotes if the result is a precious result or interpolation results
  *
  * @param pCtx
  */
 static void interp_function(SQLFunctionCtx *pCtx) {
   // at this point, the value is existed, return directly
-  if (pCtx->param[3].i64Key == 1) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  SInterpInfoDetail* pInfo = pResInfo->interResultBuf;
+
+  if (pCtx->size == 1) {
     char *pData = GET_INPUT_CHAR(pCtx);
     assignVal(pCtx->aOutputBuf, pData, pCtx->inputBytes, pCtx->inputType);
   } else {
@@ -4202,84 +3933,74 @@ static void interp_function(SQLFunctionCtx *pCtx) {
      * use interpolation to generate the result.
      * Note: the result of primary timestamp column uses the timestamp specified by user in the query sql
      */
-    assert(pCtx->param[3].i64Key == 2);
-
-    SInterpInfo        interpInfo = *(SInterpInfo *)pCtx->aOutputBuf;
-    SInterpInfoDetail *pInfoDetail = interpInfo.pInterpDetail;
-
-    /* set no output result */
-    if (pInfoDetail->type == TSDB_INTERPO_NONE) {
-      pCtx->param[3].i64Key = 0;
-    } else if (pInfoDetail->primaryCol == 1) {
-      *(TSKEY *)pCtx->aOutputBuf = pInfoDetail->ts;
+    assert(pCtx->size == 2);
+    if (pInfo->type == TSDB_FILL_NONE) {  // set no output result
+      return;
+    }
+    
+    if (pInfo->primaryCol == 1) {
+      *(TSKEY *) pCtx->aOutputBuf = pInfo->ts;
     } else {
-      if (pInfoDetail->type == TSDB_INTERPO_NULL) {
-        setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
-      } else if (pInfoDetail->type == TSDB_INTERPO_SET_VALUE) {
-        tVariantDump(&pCtx->param[1], pCtx->aOutputBuf, pCtx->inputType);
-      } else if (pInfoDetail->type == TSDB_INTERPO_PREV) {
-        char *data = pCtx->param[1].pz;
-        char *pVal = data + TSDB_KEYSIZE;
-
-        if (pCtx->outputType == TSDB_DATA_TYPE_FLOAT) {
-          float v = GET_DOUBLE_VAL(pVal);
-          assignVal(pCtx->aOutputBuf, (const char*) &v, pCtx->outputBytes, pCtx->outputType);
+      if (pInfo->type == TSDB_FILL_NULL) {
+        if (pCtx->outputType == TSDB_DATA_TYPE_BINARY || pCtx->outputType == TSDB_DATA_TYPE_NCHAR) {
+          setVardataNull(pCtx->aOutputBuf, pCtx->outputType);
         } else {
-          assignVal(pCtx->aOutputBuf, pVal, pCtx->outputBytes, pCtx->outputType);
+          setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes);
         }
-
-      } else if (pInfoDetail->type == TSDB_INTERPO_LINEAR) {
-        char *data1 = pCtx->param[1].pz;
-        char *data2 = pCtx->param[2].pz;
-
-        char *pVal1 = data1 + TSDB_KEYSIZE;
-        char *pVal2 = data2 + TSDB_KEYSIZE;
-
-        SPoint point1 = {.key = *(TSKEY *)data1, .val = &pCtx->param[1].i64Key};
-        SPoint point2 = {.key = *(TSKEY *)data2, .val = &pCtx->param[2].i64Key};
-
-        SPoint point = {.key = pInfoDetail->ts, .val = pCtx->aOutputBuf};
-
+  
+        SET_VAL(pCtx, pCtx->size, 1);
+      } else if (pInfo->type == TSDB_FILL_SET_VALUE) {
+        tVariantDump(&pCtx->param[1], pCtx->aOutputBuf, pCtx->inputType, true);
+      } else if (pInfo->type == TSDB_FILL_PREV) {
+        char *data = GET_INPUT_CHAR_INDEX(pCtx, 0);
+        assignVal(pCtx->aOutputBuf, data, pCtx->outputBytes, pCtx->outputType);
+  
+        SET_VAL(pCtx, pCtx->size, 1);
+      } else if (pInfo->type == TSDB_FILL_LINEAR) {
+        char *data1 = GET_INPUT_CHAR_INDEX(pCtx, 0);
+        char *data2 = GET_INPUT_CHAR_INDEX(pCtx, 1);
+      
+        TSKEY key1 = pCtx->ptsList[0];
+        TSKEY key2 = pCtx->ptsList[1];
+      
+        SPoint point1 = {.key = key1, .val = data1};
+        SPoint point2 = {.key = key2, .val = data2};
+      
+        SPoint point = {.key = pInfo->ts, .val = pCtx->aOutputBuf};
+      
         int32_t srcType = pCtx->inputType;
         if ((srcType >= TSDB_DATA_TYPE_TINYINT && srcType <= TSDB_DATA_TYPE_BIGINT) ||
             srcType == TSDB_DATA_TYPE_TIMESTAMP || srcType == TSDB_DATA_TYPE_DOUBLE) {
-          point1.val = pVal1;
-
-          point2.val = pVal2;
-
-          if (isNull(pVal1, srcType) || isNull(pVal2, srcType)) {
+          point1.val = data1;
+          point2.val = data2;
+        
+          if (isNull(data1, srcType) || isNull(data2, srcType)) {
             setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes);
           } else {
             taosDoLinearInterpolation(pCtx->outputType, &point1, &point2, &point);
           }
         } else if (srcType == TSDB_DATA_TYPE_FLOAT) {
-          float v1 = GET_DOUBLE_VAL(pVal1);
-          float v2 = GET_DOUBLE_VAL(pVal2);
-
-          point1.val = &v1;
-          point2.val = &v2;
-
-          if (isNull(pVal1, srcType) || isNull(pVal2, srcType)) {
+          point1.val = data1;
+          point2.val = data2;
+        
+          if (isNull(data1, srcType) || isNull(data2, srcType)) {
             setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes);
           } else {
             taosDoLinearInterpolation(pCtx->outputType, &point1, &point2, &point);
           }
-
+        
         } else {
-          setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes);
+          if (srcType == TSDB_DATA_TYPE_BINARY || srcType == TSDB_DATA_TYPE_NCHAR) {
+            setVardataNull(pCtx->aOutputBuf, pCtx->inputType);
+          } else {
+            setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes);
+          }
         }
       }
     }
-
-    free(interpInfo.pInterpDetail);
+    
   }
-
-  pCtx->size = pCtx->param[3].i64Key;
-
-  tVariantDestroy(&pCtx->param[1]);
-  tVariantDestroy(&pCtx->param[2]);
-
-  // data in the check operation are all null, not output
+  
   SET_VAL(pCtx, pCtx->size, 1);
 }
 
@@ -4287,11 +4008,11 @@ static bool ts_comp_function_setup(SQLFunctionCtx *pCtx) {
   if (!function_setup(pCtx)) {
     return false;  // not initialized since it has been initialized
   }
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   STSCompInfo *pInfo = pResInfo->interResultBuf;
-
-  pInfo->pTSBuf = tsBufCreate(false);
+  
+  pInfo->pTSBuf = tsBufCreate(false, pCtx->order);
   pInfo->pTSBuf->tsOrder = pCtx->order;
   return true;
 }
@@ -4299,21 +4020,20 @@ static bool ts_comp_function_setup(SQLFunctionCtx *pCtx) {
 static void ts_comp_function(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   STSBuf *     pTSbuf = ((STSCompInfo *)(pResInfo->interResultBuf))->pTSBuf;
-
+  
   const char *input = GET_INPUT_CHAR(pCtx);
-
+  
   // primary ts must be existed, so no need to check its existance
-  if (pCtx->order == TSQL_SO_ASC) {
-    tsBufAppend(pTSbuf, 0, pCtx->tag.i64Key, input, pCtx->size * TSDB_KEYSIZE);
+  if (pCtx->order == TSDB_ORDER_ASC) {
+    tsBufAppend(pTSbuf, 0, &pCtx->tag, input, pCtx->size * TSDB_KEYSIZE);
   } else {
     for (int32_t i = pCtx->size - 1; i >= 0; --i) {
       char *d = GET_INPUT_CHAR_INDEX(pCtx, i);
-      tsBufAppend(pTSbuf, 0, pCtx->tag.i64Key, d, TSDB_KEYSIZE);
+      tsBufAppend(pTSbuf, 0, &pCtx->tag, d, TSDB_KEYSIZE);
     }
   }
-
+  
   SET_VAL(pCtx, pCtx->size, 1);
-
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
@@ -4322,31 +4042,483 @@ static void ts_comp_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
     return;
   }
-
+  
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
   STSCompInfo *pInfo = pResInfo->interResultBuf;
-
+  
   STSBuf *pTSbuf = pInfo->pTSBuf;
-
-  tsBufAppend(pTSbuf, 0, pCtx->tag.i64Key, pData, TSDB_KEYSIZE);
+  
+  tsBufAppend(pTSbuf, 0, &pCtx->tag, pData, TSDB_KEYSIZE);
   SET_VAL(pCtx, pCtx->size, 1);
-
+  
   pResInfo->hasResult = DATA_SET_FLAG;
 }
 
 static void ts_comp_finalize(SQLFunctionCtx *pCtx) {
   SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
+  
   STSCompInfo *pInfo = pResInfo->interResultBuf;
   STSBuf *     pTSbuf = pInfo->pTSBuf;
-
+  
   tsBufFlush(pTSbuf);
   strcpy(pCtx->aOutputBuf, pTSbuf->path);
+  
+  tsBufDestroy(pTSbuf);
+  doFinalizer(pCtx);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// RATE functions
+
+static double do_calc_rate(const SRateInfo* pRateInfo) {
+  if ((INT64_MIN == pRateInfo->lastKey) || (INT64_MIN == pRateInfo->firstKey) || (pRateInfo->firstKey >= pRateInfo->lastKey)) {
+    return 0;
+  }
+  
+  int64_t diff = 0;
+  
+  if (pRateInfo->isIRate) {
+    diff = pRateInfo->lastValue;
+    if (diff >= pRateInfo->firstValue) {
+      diff -= pRateInfo->firstValue;
+    }
+  } else {
+    diff = pRateInfo->CorrectionValue + pRateInfo->lastValue -  pRateInfo->firstValue;
+    if (diff <= 0) {
+      return 0;
+    }
+  }
+  
+  int64_t duration = pRateInfo->lastKey - pRateInfo->firstKey;
+  duration = (duration + 500) / 1000;
+  
+  double resultVal = ((double)diff) / duration;
+  
+  tscDebug("do_calc_rate() isIRate:%d firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " resultVal:%f",
+         pRateInfo->isIRate, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, resultVal);
+  
+  return resultVal;
+}
+
+
+static bool rate_function_setup(SQLFunctionCtx *pCtx) {
+  if (!function_setup(pCtx)) {
+    return false;
+  }
+  
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);  //->aOutputBuf + pCtx->outputBytes;
+  SRateInfo *   pInfo = pResInfo->interResultBuf;
+  
+  pInfo->CorrectionValue = 0;
+  pInfo->firstKey    = INT64_MIN;
+  pInfo->lastKey     = INT64_MIN;
+  pInfo->firstValue  = INT64_MIN;
+  pInfo->lastValue   = INT64_MIN;
+  pInfo->num = 0;
+  pInfo->sum = 0;
+  
+  pInfo->hasResult = 0;
+  pInfo->isIRate = ((pCtx->functionId == TSDB_FUNC_IRATE) || (pCtx->functionId == TSDB_FUNC_SUM_IRATE) || (pCtx->functionId == TSDB_FUNC_AVG_IRATE));
+  return true;
+}
+
+
+static void rate_function(SQLFunctionCtx *pCtx) {
+  
+  int32_t      notNullElems = 0;
+  SResultInfo *pResInfo     = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo    = (SRateInfo *)pResInfo->interResultBuf;
+  TSKEY       *primaryKey   = pCtx->ptsList;
+  
+  tscDebug("%p rate_function() size:%d, hasNull:%d", pCtx, pCtx->size, pCtx->hasNull);
+  
+  for (int32_t i = 0; i < pCtx->size; ++i) {
+    char *pData = GET_INPUT_CHAR_INDEX(pCtx, i);
+    if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
+      tscDebug("%p rate_function() index of null data:%d", pCtx, i);
+      continue;
+    }
+    
+    notNullElems++;
+    
+    int64_t v = 0;
+    switch (pCtx->inputType) {
+      case TSDB_DATA_TYPE_TINYINT:
+        v = (int64_t)GET_INT8_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        v = (int64_t)GET_INT16_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_INT:
+        v = (int64_t)GET_INT32_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_BIGINT:
+        v = (int64_t)GET_INT64_VAL(pData);
+        break;
+      default:
+        assert(0);
+    }
+    
+    if ((INT64_MIN == pRateInfo->firstValue) || (INT64_MIN == pRateInfo->firstKey)) {
+      pRateInfo->firstValue = v;
+      pRateInfo->firstKey = primaryKey[i];
+      
+      tscDebug("firstValue:%" PRId64 " firstKey:%" PRId64, pRateInfo->firstValue, pRateInfo->firstKey);
+    }
+    
+    if (INT64_MIN == pRateInfo->lastValue) {
+      pRateInfo->lastValue = v;
+    } else if (v < pRateInfo->lastValue) {
+      pRateInfo->CorrectionValue += pRateInfo->lastValue;
+      tscDebug("CorrectionValue:%" PRId64, pRateInfo->CorrectionValue);
+    }
+    
+    pRateInfo->lastValue = v;
+    pRateInfo->lastKey   = primaryKey[i];
+    tscDebug("lastValue:%" PRId64 " lastKey:%" PRId64, pRateInfo->lastValue, pRateInfo->lastKey);
+  }
+  
+  if (!pCtx->hasNull) {
+    assert(pCtx->size == notNullElems);
+  }
+  
+  SET_VAL(pCtx, notNullElems, 1);
+  
+  if (notNullElems > 0) {
+    pRateInfo->hasResult = DATA_SET_FLAG;
+    pResInfo->hasResult  = DATA_SET_FLAG;
+  }
+  
+  // keep the data into the final output buffer for super table query since this execution may be the last one
+  if (pResInfo->superTableQ) {
+    memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SRateInfo));
+  }
+}
+
+static void rate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
+  void *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
+  if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
+    return;
+  }
+  
+  // NOTE: keep the intermediate result into the interResultBuf
+  SResultInfo *pResInfo   = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo  = (SRateInfo *)pResInfo->interResultBuf;
+  TSKEY       *primaryKey = pCtx->ptsList;
+  
+  int64_t v = 0;
+  switch (pCtx->inputType) {
+    case TSDB_DATA_TYPE_TINYINT:
+      v = (int64_t)GET_INT8_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      v = (int64_t)GET_INT16_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_INT:
+      v = (int64_t)GET_INT32_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+      v = (int64_t)GET_INT64_VAL(pData);
+      break;
+    default:
+      assert(0);
+  }
+  
+  if ((INT64_MIN == pRateInfo->firstValue) || (INT64_MIN == pRateInfo->firstKey)) {
+    pRateInfo->firstValue = v;
+    pRateInfo->firstKey = primaryKey[index];
+  }
+  
+  if (INT64_MIN == pRateInfo->lastValue) {
+    pRateInfo->lastValue = v;
+  } else if (v < pRateInfo->lastValue) {
+    pRateInfo->CorrectionValue += pRateInfo->lastValue;
+  }
+  
+  pRateInfo->lastValue = v;
+  pRateInfo->lastKey   = primaryKey[index];
+  
+  tscDebug("====%p rate_function_f() index:%d lastValue:%" PRId64 " lastKey:%" PRId64 " CorrectionValue:%" PRId64, pCtx, index, pRateInfo->lastValue, pRateInfo->lastKey, pRateInfo->CorrectionValue);
+  
+  SET_VAL(pCtx, 1, 1);
+  
+  // set has result flag
+  pRateInfo->hasResult = DATA_SET_FLAG;
+  pResInfo->hasResult  = DATA_SET_FLAG;
+  
+  // keep the data into the final output buffer for super table query since this execution may be the last one
+  if (pResInfo->superTableQ) {
+    memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SRateInfo));
+  }
+}
+
+
+
+static void rate_func_merge(SQLFunctionCtx *pCtx) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  assert(pResInfo->superTableQ);
+  
+  tscDebug("rate_func_merge() size:%d", pCtx->size);
+  
+  //SRateInfo *pRateInfo = (SRateInfo *)pResInfo->interResultBuf;
+  SRateInfo *pBuf      = (SRateInfo *)pCtx->aOutputBuf;
+  char      *indicator = pCtx->aInputElemBuf;
+  
+  assert(1 == pCtx->size);
+  
+  int32_t numOfNotNull = 0;
+  for (int32_t i = 0; i < pCtx->size; ++i, indicator += sizeof(SRateInfo)) {
+    SRateInfo *pInput = (SRateInfo *)indicator;
+    if (DATA_SET_FLAG != pInput->hasResult) {
+      continue;
+    }
+    
+    numOfNotNull++;
+    memcpy(pBuf, pInput, sizeof(SRateInfo));
+    tscDebug("%p rate_func_merge() isIRate:%d firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64,
+           pCtx, pInput->isIRate, pInput->firstKey, pInput->lastKey, pInput->firstValue, pInput->lastValue, pInput->CorrectionValue);
+  }
+  
+  SET_VAL(pCtx, numOfNotNull, 1);
+  
+  if (numOfNotNull > 0) {
+    pBuf->hasResult = DATA_SET_FLAG;
+  }
+  
+  return;
+}
+
+
+
+static void rate_func_copy(SQLFunctionCtx *pCtx) {
+  assert(pCtx->inputType == TSDB_DATA_TYPE_BINARY);
+  
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  memcpy(pResInfo->interResultBuf, pCtx->aInputElemBuf, (size_t)pCtx->inputBytes);
+  pResInfo->hasResult = ((SRateInfo*)pCtx->aInputElemBuf)->hasResult;
+  
+  SRateInfo* pRateInfo = (SRateInfo*)pCtx->aInputElemBuf;
+  tscDebug("%p rate_func_second_merge() firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " hasResult:%d",
+         pCtx, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, pRateInfo->hasResult);
+}
 
-  tsBufDestory(pTSbuf);
+
+
+static void rate_finalizer(SQLFunctionCtx *pCtx) {
+  SResultInfo *pResInfo  = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo = (SRateInfo *)pResInfo->interResultBuf;
+  
+  tscDebug("%p isIRate:%d firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " hasResult:%d",
+         pCtx, pRateInfo->isIRate, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, pRateInfo->hasResult);
+  
+  if (pRateInfo->hasResult != DATA_SET_FLAG) {
+    setNull(pCtx->aOutputBuf, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
+    return;
+  }
+  
+  *(double*)pCtx->aOutputBuf = do_calc_rate(pRateInfo);
+  
+  tscDebug("rate_finalizer() output result:%f", *(double *)pCtx->aOutputBuf);
+  
+  // cannot set the numOfIteratedElems again since it is set during previous iteration
+  pResInfo->numOfRes  = 1;
+  pResInfo->hasResult = DATA_SET_FLAG;
+  
   doFinalizer(pCtx);
 }
 
+
+static void irate_function(SQLFunctionCtx *pCtx) {
+  
+  int32_t       notNullElems = 0;
+  SResultInfo  *pResInfo     = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo    = (SRateInfo *)pResInfo->interResultBuf;
+  TSKEY        *primaryKey   = pCtx->ptsList;
+  
+  tscDebug("%p irate_function() size:%d, hasNull:%d", pCtx, pCtx->size, pCtx->hasNull);
+  
+  if (pCtx->size < 1) {
+    return;
+  }
+  
+  for (int32_t i = pCtx->size - 1; i >= 0; --i) {
+    char *pData = GET_INPUT_CHAR_INDEX(pCtx, i);
+    if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
+      tscDebug("%p irate_function() index of null data:%d", pCtx, i);
+      continue;
+    }
+    
+    notNullElems++;
+    
+    int64_t v = 0;
+    switch (pCtx->inputType) {
+      case TSDB_DATA_TYPE_TINYINT:
+        v = (int64_t)GET_INT8_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        v = (int64_t)GET_INT16_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_INT:
+        v = (int64_t)GET_INT32_VAL(pData);
+        break;
+      case TSDB_DATA_TYPE_BIGINT:
+        v = (int64_t)GET_INT64_VAL(pData);
+        break;
+      default:
+        assert(0);
+    }
+    
+    // TODO: calc once if only call this function once ????
+    if ((INT64_MIN == pRateInfo->lastKey) || (INT64_MIN == pRateInfo->lastValue)) {
+      pRateInfo->lastValue = v;
+      pRateInfo->lastKey   = primaryKey[i];
+      
+      tscDebug("%p irate_function() lastValue:%" PRId64 " lastKey:%" PRId64, pCtx, pRateInfo->lastValue, pRateInfo->lastKey);
+      continue;
+    }
+    
+    if ((INT64_MIN == pRateInfo->firstKey) || (INT64_MIN == pRateInfo->firstValue)){
+      pRateInfo->firstValue = v;
+      pRateInfo->firstKey = primaryKey[i];
+      
+      tscDebug("%p irate_function() firstValue:%" PRId64 " firstKey:%" PRId64, pCtx, pRateInfo->firstValue, pRateInfo->firstKey);
+      break;
+    }
+  }
+  
+  SET_VAL(pCtx, notNullElems, 1);
+  
+  if (notNullElems > 0) {
+    pRateInfo->hasResult = DATA_SET_FLAG;
+    pResInfo->hasResult  = DATA_SET_FLAG;
+  }
+  
+  // keep the data into the final output buffer for super table query since this execution may be the last one
+  if (pResInfo->superTableQ) {
+    memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SRateInfo));
+  }
+}
+
+static void irate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
+  void *pData = GET_INPUT_CHAR_INDEX(pCtx, index);
+  if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
+    return;
+  }
+  
+  // NOTE: keep the intermediate result into the interResultBuf
+  SResultInfo  *pResInfo   = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo  = (SRateInfo *)pResInfo->interResultBuf;
+  TSKEY        *primaryKey = pCtx->ptsList;
+  
+  int64_t v = 0;
+  switch (pCtx->inputType) {
+    case TSDB_DATA_TYPE_TINYINT:
+      v = (int64_t)GET_INT8_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      v = (int64_t)GET_INT16_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_INT:
+      v = (int64_t)GET_INT32_VAL(pData);
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+      v = (int64_t)GET_INT64_VAL(pData);
+      break;
+    default:
+      assert(0);
+  }
+  
+  pRateInfo->firstKey   = pRateInfo->lastKey;
+  pRateInfo->firstValue = pRateInfo->lastValue;
+  
+  pRateInfo->lastValue = v;
+  pRateInfo->lastKey   = primaryKey[index];
+  
+  tscDebug("====%p irate_function_f() index:%d lastValue:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " firstKey:%" PRId64, pCtx, index, pRateInfo->lastValue, pRateInfo->lastKey, pRateInfo->firstValue , pRateInfo->firstKey);
+  
+  SET_VAL(pCtx, 1, 1);
+  
+  // set has result flag
+  pRateInfo->hasResult = DATA_SET_FLAG;
+  pResInfo->hasResult  = DATA_SET_FLAG;
+  
+  // keep the data into the final output buffer for super table query since this execution may be the last one
+  if (pResInfo->superTableQ) {
+    memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SRateInfo));
+  }
+}
+
+static void do_sumrate_merge(SQLFunctionCtx *pCtx) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  assert(pResInfo->superTableQ);
+  
+  SRateInfo *pRateInfo = (SRateInfo *)pResInfo->interResultBuf;
+  char *    input = GET_INPUT_CHAR(pCtx);
+  
+  for (int32_t i = 0; i < pCtx->size; ++i, input += pCtx->inputBytes) {
+    SRateInfo *pInput = (SRateInfo *)input;
+    
+    tscDebug("%p do_sumrate_merge() hasResult:%d input num:%" PRId64 " input sum:%f total num:%" PRId64 " total sum:%f", pCtx, pInput->hasResult, pInput->num, pInput->sum, pRateInfo->num, pRateInfo->sum);
+    
+    if (pInput->hasResult != DATA_SET_FLAG) {
+      continue;
+    } else if (pInput->num == 0) {
+      pRateInfo->sum += do_calc_rate(pInput);
+      pRateInfo->num++;
+    } else {
+      pRateInfo->sum += pInput->sum;
+      pRateInfo->num += pInput->num;
+    }
+    pRateInfo->hasResult = DATA_SET_FLAG;
+  }
+  
+  // if the data set hasResult is not set, the result is null
+  if (DATA_SET_FLAG == pRateInfo->hasResult) {
+    pResInfo->hasResult = DATA_SET_FLAG;
+    SET_VAL(pCtx, pRateInfo->num, 1);
+    memcpy(pCtx->aOutputBuf, pResInfo->interResultBuf, sizeof(SRateInfo));
+  }
+}
+
+static void sumrate_func_merge(SQLFunctionCtx *pCtx) {
+  tscDebug("%p sumrate_func_merge() process ...", pCtx);
+  do_sumrate_merge(pCtx);
+}
+
+static void sumrate_func_second_merge(SQLFunctionCtx *pCtx) {
+  tscDebug("%p sumrate_func_second_merge() process ...", pCtx);
+  do_sumrate_merge(pCtx);
+}
+
+static void sumrate_finalizer(SQLFunctionCtx *pCtx) {
+  SResultInfo *pResInfo  = GET_RES_INFO(pCtx);
+  SRateInfo   *pRateInfo = (SRateInfo *)pResInfo->interResultBuf;
+  
+  tscDebug("%p sumrate_finalizer() superTableQ:%d num:%" PRId64 " sum:%f hasResult:%d", pCtx, pResInfo->superTableQ, pRateInfo->num, pRateInfo->sum, pRateInfo->hasResult);
+  
+  if (pRateInfo->hasResult != DATA_SET_FLAG) {
+    setNull(pCtx->aOutputBuf, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
+    return;
+  }
+  
+  if (pRateInfo->num == 0) {
+    // from meter
+    *(double*)pCtx->aOutputBuf = do_calc_rate(pRateInfo);
+  } else if (pCtx->functionId == TSDB_FUNC_SUM_RATE || pCtx->functionId == TSDB_FUNC_SUM_IRATE) {
+    *(double*)pCtx->aOutputBuf = pRateInfo->sum;
+  } else {
+    *(double*)pCtx->aOutputBuf = pRateInfo->sum / pRateInfo->num;
+  }
+  
+  pResInfo->numOfRes  = 1;
+  pResInfo->hasResult = DATA_SET_FLAG;
+  doFinalizer(pCtx);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+
 /*
  * function compatible list.
  * tag and ts are not involved in the compatibility check
@@ -4358,443 +4530,543 @@ static void ts_comp_finalize(SQLFunctionCtx *pCtx) {
  *    e.g., count/sum/avg/min/max/stddev/percentile/apercentile/first/last...
  *
  */
-int32_t funcCompatDefList[28] = {
-    /*
-     * count, sum, avg, min, max, stddev, percentile, apercentile, first, last
-     */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
-    /*
-     * last_row, top, bottom, spread, twa, leastsqr, ts, ts_dummy, tag_dummy, ts_z, tag
-     */
-    4, -1, -1, 1, 1, 1, 1, 1, 1, -1, 1,
+int32_t functionCompatList[] = {
+    // count,       sum,      avg,       min,      max,  stddev,    percentile, apercentile, first,   last
+    1,          1,        1,         1,        1,      1,          1,           1,        1,      1,
+    // last_row,    top,    bottom,     spread,    twa,  leastsqr,     ts,       ts_dummy, tag_dummy, ts_z
+    4,         -1,       -1,         1,        1,      1,          1,           1,        1,     -1,
+    //  tag,       colprj,  tagprj,   arithmetic, diff, first_dist, last_dist,    interp      rate   irate
+    1,          1,        1,         1,       -1,      1,          1,           5,        1,      1,
+    // sum_rate, sum_irate, avg_rate, avg_irate
+    1,          1,        1,         1,
+};
 
-    /*
-     * colprj, tagprj, arithmetic, diff, first_dist, last_dist, interp
-     */
-    1, 1, 1, -1, 1, 1, 5};
-
-SQLAggFuncElem aAggs[28] = {{
-                                // 0, count function does not invoke the finalize function
-                                "count",
-                                TSDB_FUNC_COUNT,
-                                TSDB_FUNC_COUNT,
-                                TSDB_BASE_FUNC_SO,
-                                function_setup,
-                                count_function,
-                                count_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                count_func_merge,
-                                count_func_merge,
-                                count_load_data_info,
-                            },
-                            {
-                                // 1
-                                "sum",
-                                TSDB_FUNC_SUM,
-                                TSDB_FUNC_SUM,
-                                TSDB_BASE_FUNC_SO,
-                                function_setup,
-                                sum_function,
-                                sum_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                sum_func_merge,
-                                sum_func_second_merge,
-                                precal_req_load_info,
-                            },
-                            {
-                                // 2
-                                "avg",
-                                TSDB_FUNC_AVG,
-                                TSDB_FUNC_AVG,
-                                TSDB_BASE_FUNC_SO,
-                                function_setup,
-                                avg_function,
-                                avg_function_f,
-                                no_next_step,
-                                avg_finalizer,
-                                avg_func_merge,
-                                avg_func_second_merge,
-                                precal_req_load_info,
-                            },
-                            {
-                                // 3
-                                "min",
-                                TSDB_FUNC_MIN,
-                                TSDB_FUNC_MIN,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
-                                min_func_setup,
-                                min_function,
-                                min_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                min_func_merge,
-                                min_func_second_merge,
-                                precal_req_load_info,
-                            },
-                            {
-                                // 4
-                                "max",
-                                TSDB_FUNC_MAX,
-                                TSDB_FUNC_MAX,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
-                                max_func_setup,
-                                max_function,
-                                max_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                max_func_merge,
-                                max_func_second_merge,
-                                precal_req_load_info,
-                            },
-                            {
-                                // 5
-                                "stddev",
-                                TSDB_FUNC_STDDEV,
-                                TSDB_FUNC_INVALID_ID,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
-                                function_setup,
-                                stddev_function,
-                                stddev_function_f,
-                                stddev_next_step,
-                                stddev_finalizer,
-                                noop1,
-                                noop1,
-                                data_req_load_info,
-                            },
-                            {
-                                // 6
-                                "percentile",
-                                TSDB_FUNC_PERCT,
-                                TSDB_FUNC_INVALID_ID,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
-                                percentile_function_setup,
-                                percentile_function,
-                                percentile_function_f,
-                                no_next_step,
-                                percentile_finalizer,
-                                noop1,
-                                noop1,
-                                data_req_load_info,
-                            },
-                            {
-                                // 7
-                                "apercentile",
-                                TSDB_FUNC_APERCT,
-                                TSDB_FUNC_APERCT,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_METRIC,
-                                apercentile_function_setup,
-                                apercentile_function,
-                                apercentile_function_f,
-                                no_next_step,
-                                apercentile_finalizer,
-                                apercentile_func_merge,
-                                apercentile_func_second_merge,
-                                data_req_load_info,
-                            },
-                            {
-                                // 8
-                                "first",
-                                TSDB_FUNC_FIRST,
-                                TSDB_FUNC_FIRST_DST,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
-                                function_setup,
-                                first_function,
-                                first_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                noop1,
-                                noop1,
-                                first_data_req_info,
-                            },
-                            {
-                                // 9
-                                "last",
-                                TSDB_FUNC_LAST,
-                                TSDB_FUNC_LAST_DST,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
-                                function_setup,
-                                last_function,
-                                last_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                noop1,
-                                noop1,
-                                last_data_req_info,
-                            },
-                            {
-                                // 10
-                                "last_row",
-                                TSDB_FUNC_LAST_ROW,
-                                TSDB_FUNC_LAST_ROW,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_NEED_TS |
-                                    TSDB_FUNCSTATE_SELECTIVITY,
-                                first_last_function_setup,
-                                last_row_function,
-                                noop2,
-                                no_next_step,
-                                last_row_finalizer,
-                                noop1,
-                                last_dist_func_second_merge,
-                                data_req_load_info,
-                            },
-                            {
-                                // 11
-                                "top",
-                                TSDB_FUNC_TOP,
-                                TSDB_FUNC_TOP,
-                                TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_NEED_TS |
-                                    TSDB_FUNCSTATE_SELECTIVITY,
-                                top_bottom_function_setup,
-                                top_function,
-                                top_function_f,
-                                no_next_step,
-                                top_bottom_func_finalizer,
-                                top_func_merge,
-                                top_func_second_merge,
-                                data_req_load_info,
-                            },
-                            {
-                                // 12
-                                "bottom",
-                                TSDB_FUNC_BOTTOM,
-                                TSDB_FUNC_BOTTOM,
-                                TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_NEED_TS |
-                                    TSDB_FUNCSTATE_SELECTIVITY,
-                                top_bottom_function_setup,
-                                bottom_function,
-                                bottom_function_f,
-                                no_next_step,
-                                top_bottom_func_finalizer,
-                                bottom_func_merge,
-                                bottom_func_second_merge,
-                                data_req_load_info,
-                            },
-                            {
-                                // 13
-                                "spread",
-                                TSDB_FUNC_SPREAD,
-                                TSDB_FUNC_SPREAD,
-                                TSDB_BASE_FUNC_SO,
-                                spread_function_setup,
-                                spread_function,
-                                spread_function_f,
-                                no_next_step,
-                                spread_function_finalizer,
-                                spread_func_merge,
-                                spread_func_sec_merge,
-                                count_load_data_info,
-                            },
-                            {
-                                // 14
-                                "twa",
-                                TSDB_FUNC_TWA,
-                                TSDB_FUNC_TWA,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                                twa_function_setup,
-                                twa_function,
-                                twa_function_f,
-                                no_next_step,
-                                twa_function_finalizer,
-                                twa_func_merge,
-                                twa_function_copy,
-                                data_req_load_info,
-                            },
-                            {
-                                // 15
-                                "leastsquares",
-                                TSDB_FUNC_LEASTSQR,
-                                TSDB_FUNC_INVALID_ID,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
-                                leastsquares_function_setup,
-                                leastsquares_function,
-                                leastsquares_function_f,
-                                no_next_step,
-                                leastsquares_finalizer,
-                                noop1,
-                                noop1,
-                                data_req_load_info,
-                            },
-                            {
-                                // 16
-                                "ts",
-                                TSDB_FUNC_TS,
-                                TSDB_FUNC_TS,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                                function_setup,
-                                date_col_output_function,
-                                date_col_output_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                no_data_info,
-                            },
-                            {
-                                // 17
-                                "ts",
-                                TSDB_FUNC_TS_DUMMY,
-                                TSDB_FUNC_TS_DUMMY,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                                function_setup,
-                                noop1,
-                                noop2,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                data_req_load_info,
-                            },
-                            {
-                                // 18
-                                "tag",
-                                TSDB_FUNC_TAG_DUMMY,
-                                TSDB_FUNC_TAG_DUMMY,
-                                TSDB_BASE_FUNC_SO,
-                                function_setup,
-                                tag_function,
-                                noop2,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                no_data_info,
-                            },
-                            {
-                                // 19
-                                "ts",
-                                TSDB_FUNC_TS_COMP,
-                                TSDB_FUNC_TS_COMP,
-                                TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_NEED_TS,
-                                ts_comp_function_setup,
-                                ts_comp_function,
-                                ts_comp_function_f,
-                                no_next_step,
-                                ts_comp_finalize,
-                                copy_function,
-                                copy_function,
-                                data_req_load_info,
-                            },
-                            {
-                                // 20
-                                "tag",
-                                TSDB_FUNC_TAG,
-                                TSDB_FUNC_TAG,
-                                TSDB_BASE_FUNC_SO,
-                                function_setup,
-                                tag_function,
-                                tag_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                no_data_info,
-                            },
-                            {
-                                // 21, column project sql function
-                                "colprj",
-                                TSDB_FUNC_PRJ,
-                                TSDB_FUNC_PRJ,
-                                TSDB_BASE_FUNC_MO | TSDB_FUNCSTATE_NEED_TS,
-                                function_setup,
-                                col_project_function,
-                                col_project_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                data_req_load_info,
-                            },
-                            {
-                                // 22, multi-output, tag function has only one result
-                                "tagprj",
-                                TSDB_FUNC_TAGPRJ,
-                                TSDB_FUNC_TAGPRJ,
-                                TSDB_BASE_FUNC_MO,
-                                function_setup,
-                                tag_project_function,
-                                tag_project_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                no_data_info,
-                            },
-                            {
-                                // 23
-                                "arithmetic",
-                                TSDB_FUNC_ARITHM,
-                                TSDB_FUNC_ARITHM,
-                                TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_NEED_TS,
-                                function_setup,
-                                arithmetic_function,
-                                arithmetic_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                copy_function,
-                                copy_function,
-                                data_req_load_info,
-                            },
-                            {
-                                // 24
-                                "diff",
-                                TSDB_FUNC_DIFF,
-                                TSDB_FUNC_INVALID_ID,
-                                TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_NEED_TS,
-                                diff_function_setup,
-                                diff_function,
-                                diff_function_f,
-                                no_next_step,
-                                doFinalizer,
-                                noop1,
-                                noop1,
-                                data_req_load_info,
-                            },
-                            // distributed version used in two-stage aggregation processes
-                            {
-                                // 25
-                                "first_dist",
-                                TSDB_FUNC_FIRST_DST,
-                                TSDB_FUNC_FIRST_DST,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SELECTIVITY,
-                                first_last_function_setup,
-                                first_dist_function,
-                                first_dist_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                first_dist_func_merge,
-                                first_dist_func_second_merge,
-                                first_dist_data_req_info,
-                            },
-                            {
-                                // 26
-                                "last_dist",
-                                TSDB_FUNC_LAST_DST,
-                                TSDB_FUNC_LAST_DST,
-                                TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SELECTIVITY,
-                                first_last_function_setup,
-                                last_dist_function,
-                                last_dist_function_f,
-                                no_next_step,
-                                function_finalizer,
-                                last_dist_func_merge,
-                                last_dist_func_second_merge,
-                                last_dist_data_req_info,
-                            },
-                            {
-                                // 27
-                                "interp",
-                                TSDB_FUNC_INTERP,
-                                TSDB_FUNC_INTERP,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_NEED_TS,
-                                function_setup,
-                                interp_function,
-                                do_sum_f,  // todo filter handle
-                                no_next_step,
-                                doFinalizer,
-                                noop1,
-                                copy_function,
-                                no_data_info,
-                            }};
+SQLAggFuncElem aAggs[] = {{
+                              // 0, count function does not invoke the finalize function
+                              "count",
+                              TSDB_FUNC_COUNT,
+                              TSDB_FUNC_COUNT,
+                              TSDB_BASE_FUNC_SO,
+                              function_setup,
+                              count_function,
+                              count_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              count_func_merge,
+                              count_func_merge,
+                              count_load_data_info,
+                          },
+                          {
+                              // 1
+                              "sum",
+                              TSDB_FUNC_SUM,
+                              TSDB_FUNC_SUM,
+                              TSDB_BASE_FUNC_SO,
+                              function_setup,
+                              sum_function,
+                              sum_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              sum_func_merge,
+                              sum_func_second_merge,
+                              statisRequired,
+                          },
+                          {
+                              // 2
+                              "avg",
+                              TSDB_FUNC_AVG,
+                              TSDB_FUNC_AVG,
+                              TSDB_BASE_FUNC_SO,
+                              function_setup,
+                              avg_function,
+                              avg_function_f,
+                              no_next_step,
+                              avg_finalizer,
+                              avg_func_merge,
+                              avg_func_second_merge,
+                              statisRequired,
+                          },
+                          {
+                              // 3
+                              "min",
+                              TSDB_FUNC_MIN,
+                              TSDB_FUNC_MIN,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
+                              min_func_setup,
+                              min_function,
+                              min_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              min_func_merge,
+                              min_func_second_merge,
+                              statisRequired,
+                          },
+                          {
+                              // 4
+                              "max",
+                              TSDB_FUNC_MAX,
+                              TSDB_FUNC_MAX,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
+                              max_func_setup,
+                              max_function,
+                              max_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              max_func_merge,
+                              max_func_second_merge,
+                              statisRequired,
+                          },
+                          {
+                              // 5
+                              "stddev",
+                              TSDB_FUNC_STDDEV,
+                              TSDB_FUNC_INVALID_ID,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
+                              function_setup,
+                              stddev_function,
+                              stddev_function_f,
+                              stddev_next_step,
+                              stddev_finalizer,
+                              noop1,
+                              noop1,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 6
+                              "percentile",
+                              TSDB_FUNC_PERCT,
+                              TSDB_FUNC_INVALID_ID,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
+                              percentile_function_setup,
+                              percentile_function,
+                              percentile_function_f,
+                              percentile_next_step,
+                              percentile_finalizer,
+                              noop1,
+                              noop1,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 7
+                              "apercentile",
+                              TSDB_FUNC_APERCT,
+                              TSDB_FUNC_APERCT,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_STABLE,
+                              apercentile_function_setup,
+                              apercentile_function,
+                              apercentile_function_f,
+                              no_next_step,
+                              apercentile_finalizer,
+                              apercentile_func_merge,
+                              apercentile_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 8
+                              "first",
+                              TSDB_FUNC_FIRST,
+                              TSDB_FUNC_FIRST_DST,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
+                              function_setup,
+                              first_function,
+                              first_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              noop1,
+                              noop1,
+                              firstFuncRequired,
+                          },
+                          {
+                              // 9
+                              "last",
+                              TSDB_FUNC_LAST,
+                              TSDB_FUNC_LAST_DST,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
+                              function_setup,
+                              last_function,
+                              last_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              noop1,
+                              noop1,
+                              lastFuncRequired,
+                          },
+                          {
+                              // 10
+                              "last_row",
+                              TSDB_FUNC_LAST_ROW,
+                              TSDB_FUNC_LAST_ROW,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS |
+                                  TSDB_FUNCSTATE_SELECTIVITY,
+                              first_last_function_setup,
+                              last_row_function,
+                              noop2,
+                              no_next_step,
+                              last_row_finalizer,
+                              noop1,
+                              last_dist_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 11
+                              "top",
+                              TSDB_FUNC_TOP,
+                              TSDB_FUNC_TOP,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_NEED_TS |
+                                  TSDB_FUNCSTATE_SELECTIVITY,
+                              top_bottom_function_setup,
+                              top_function,
+                              top_function_f,
+                              no_next_step,
+                              top_bottom_func_finalizer,
+                              top_func_merge,
+                              top_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 12
+                              "bottom",
+                              TSDB_FUNC_BOTTOM,
+                              TSDB_FUNC_BOTTOM,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_NEED_TS |
+                                  TSDB_FUNCSTATE_SELECTIVITY,
+                              top_bottom_function_setup,
+                              bottom_function,
+                              bottom_function_f,
+                              no_next_step,
+                              top_bottom_func_finalizer,
+                              bottom_func_merge,
+                              bottom_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 13
+                              "spread",
+                              TSDB_FUNC_SPREAD,
+                              TSDB_FUNC_SPREAD,
+                              TSDB_BASE_FUNC_SO,
+                              spread_function_setup,
+                              spread_function,
+                              spread_function_f,
+                              no_next_step,
+                              spread_function_finalizer,
+                              spread_func_merge,
+                              spread_func_sec_merge,
+                              count_load_data_info,
+                          },
+                          {
+                              // 14
+                              "twa",
+                              TSDB_FUNC_TWA,
+                              TSDB_FUNC_TWA,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              twa_function_setup,
+                              twa_function,
+                              twa_function_f,
+                              no_next_step,
+                              twa_function_finalizer,
+                              twa_func_merge,
+                              twa_function_copy,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 15
+                              "leastsquares",
+                              TSDB_FUNC_LEASTSQR,
+                              TSDB_FUNC_INVALID_ID,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_OF,
+                              leastsquares_function_setup,
+                              leastsquares_function,
+                              leastsquares_function_f,
+                              no_next_step,
+                              leastsquares_finalizer,
+                              noop1,
+                              noop1,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 16
+                              "ts",
+                              TSDB_FUNC_TS,
+                              TSDB_FUNC_TS,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              function_setup,
+                              date_col_output_function,
+                              date_col_output_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              no_data_info,
+                          },
+                          {
+                              // 17
+                              "ts",
+                              TSDB_FUNC_TS_DUMMY,
+                              TSDB_FUNC_TS_DUMMY,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              function_setup,
+                              noop1,
+                              noop2,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 18
+                              "tag",
+                              TSDB_FUNC_TAG_DUMMY,
+                              TSDB_FUNC_TAG_DUMMY,
+                              TSDB_BASE_FUNC_SO,
+                              function_setup,
+                              tag_function,
+                              noop2,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              no_data_info,
+                          },
+                          {
+                              // 19
+                              "ts",
+                              TSDB_FUNC_TS_COMP,
+                              TSDB_FUNC_TS_COMP,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_NEED_TS,
+                              ts_comp_function_setup,
+                              ts_comp_function,
+                              ts_comp_function_f,
+                              no_next_step,
+                              ts_comp_finalize,
+                              copy_function,
+                              copy_function,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 20
+                              "tag",
+                              TSDB_FUNC_TAG,
+                              TSDB_FUNC_TAG,
+                              TSDB_BASE_FUNC_SO,
+                              function_setup,
+                              tag_function,
+                              tag_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              no_data_info,
+                          },
+                          {
+                              // 21, column project sql function
+                              "colprj",
+                              TSDB_FUNC_PRJ,
+                              TSDB_FUNC_PRJ,
+                              TSDB_BASE_FUNC_MO | TSDB_FUNCSTATE_NEED_TS,
+                              function_setup,
+                              col_project_function,
+                              col_project_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 22, multi-output, tag function has only one result
+                              "tagprj",
+                              TSDB_FUNC_TAGPRJ,
+                              TSDB_FUNC_TAGPRJ,
+                              TSDB_BASE_FUNC_MO,
+                              function_setup,
+                              tag_project_function,
+                              tag_project_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              no_data_info,
+                          },
+                          {
+                              // 23
+                              "arithmetic",
+                              TSDB_FUNC_ARITHM,
+                              TSDB_FUNC_ARITHM,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS,
+                              function_setup,
+                              arithmetic_function,
+                              arithmetic_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              copy_function,
+                              copy_function,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 24
+                              "diff",
+                              TSDB_FUNC_DIFF,
+                              TSDB_FUNC_INVALID_ID,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_NEED_TS,
+                              diff_function_setup,
+                              diff_function,
+                              diff_function_f,
+                              no_next_step,
+                              doFinalizer,
+                              noop1,
+                              noop1,
+                              dataBlockRequired,
+                          },
+    // distributed version used in two-stage aggregation processes
+                          {
+                              // 25
+                              "first_dist",
+                              TSDB_FUNC_FIRST_DST,
+                              TSDB_FUNC_FIRST_DST,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SELECTIVITY,
+                              first_last_function_setup,
+                              first_dist_function,
+                              first_dist_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              first_dist_func_merge,
+                              first_dist_func_second_merge,
+                              firstDistFuncRequired,
+                          },
+                          {
+                              // 26
+                              "last_dist",
+                              TSDB_FUNC_LAST_DST,
+                              TSDB_FUNC_LAST_DST,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS | TSDB_FUNCSTATE_SELECTIVITY,
+                              first_last_function_setup,
+                              last_dist_function,
+                              last_dist_function_f,
+                              no_next_step,
+                              function_finalizer,
+                              last_dist_func_merge,
+                              last_dist_func_second_merge,
+                              lastDistFuncRequired,
+                          },
+                          {
+                              // 27
+                              "interp",
+                              TSDB_FUNC_INTERP,
+                              TSDB_FUNC_INTERP,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_OF | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_NEED_TS ,
+                              function_setup,
+                              interp_function,
+                              do_sum_f,  // todo filter handle
+                              no_next_step,
+                              doFinalizer,
+                              noop1,
+                              copy_function,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 28
+                              "rate",
+                              TSDB_FUNC_RATE,
+                              TSDB_FUNC_RATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              rate_function,
+                              rate_function_f,
+                              no_next_step,
+                              rate_finalizer,
+                              rate_func_merge,
+                              rate_func_copy,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 29
+                              "irate",
+                              TSDB_FUNC_IRATE,
+                              TSDB_FUNC_IRATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              irate_function,
+                              irate_function_f,
+                              no_next_step,
+                              rate_finalizer,
+                              rate_func_merge,
+                              rate_func_copy,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 30
+                              "sum_rate",
+                              TSDB_FUNC_SUM_RATE,
+                              TSDB_FUNC_SUM_RATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              rate_function,
+                              rate_function_f,
+                              no_next_step,
+                              sumrate_finalizer,
+                              sumrate_func_merge,
+                              sumrate_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 31
+                              "sum_irate",
+                              TSDB_FUNC_SUM_IRATE,
+                              TSDB_FUNC_SUM_IRATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              irate_function,
+                              irate_function_f,
+                              no_next_step,
+                              sumrate_finalizer,
+                              sumrate_func_merge,
+                              sumrate_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 32
+                              "avg_rate",
+                              TSDB_FUNC_AVG_RATE,
+                              TSDB_FUNC_AVG_RATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              rate_function,
+                              rate_function_f,
+                              no_next_step,
+                              sumrate_finalizer,
+                              sumrate_func_merge,
+                              sumrate_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 33
+                              "avg_irate",
+                              TSDB_FUNC_AVG_IRATE,
+                              TSDB_FUNC_AVG_IRATE,
+                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
+                              rate_function_setup,
+                              irate_function,
+                              irate_function_f,
+                              no_next_step,
+                              sumrate_finalizer,
+                              sumrate_func_merge,
+                              sumrate_func_second_merge,
+                              dataBlockRequired,
+                          },
+                          {
+                              // 34
+                              "tid_tag",   // return table id and the corresponding tags for join match and subscribe
+                              TSDB_FUNC_TID_TAG,
+                              TSDB_FUNC_TID_TAG,
+                              TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STABLE,
+                              function_setup,
+                              noop1,
+                              noop2,
+                              no_next_step,
+                              noop1,
+                              noop1,
+                              noop1,
+                              dataBlockRequired,
+                          }};
diff --git a/src/client/src/tscJoinProcess.c b/src/client/src/tscJoinProcess.c
deleted file mode 100644
index 1bafb60f1a0e487aeaa7b70e1c1817111f8a631d..0000000000000000000000000000000000000000
--- a/src/client/src/tscJoinProcess.c
+++ /dev/null
@@ -1,1728 +0,0 @@
-/*
- * 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 "os.h"
-#include "tscJoinProcess.h"
-#include "tcache.h"
-#include "tscUtil.h"
-#include "tsclient.h"
-#include "tscompression.h"
-#include "ttime.h"
-#include "tutil.h"
-
-static void freeSubqueryObj(SSqlObj* pSql);
-
-static bool doCompare(int32_t order, int64_t left, int64_t right) {
-  if (order == TSQL_SO_ASC) {
-    return left < right;
-  } else {
-    return left > right;
-  }
-}
-
-static int64_t doTSBlockIntersect(SSqlObj* pSql, SJoinSubquerySupporter* pSupporter1,
-                                  SJoinSubquerySupporter* pSupporter2, TSKEY* st, TSKEY* et) {
-  STSBuf* output1 = tsBufCreate(true);
-  STSBuf* output2 = tsBufCreate(true);
-
-  *st = INT64_MAX;
-  *et = INT64_MIN;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
-  
-  SLimitVal* pLimit = &pQueryInfo->limit;
-  int32_t    order = pQueryInfo->order.order;
-  
-  SQueryInfo* pSubQueryInfo1 = tscGetQueryInfoDetail(&pSql->pSubs[0]->cmd, 0);
-  SQueryInfo* pSubQueryInfo2 = tscGetQueryInfoDetail(&pSql->pSubs[1]->cmd, 0);
-  
-  pSubQueryInfo1->tsBuf = output1;
-  pSubQueryInfo2->tsBuf = output2;
-
-  tsBufResetPos(pSupporter1->pTSBuf);
-  tsBufResetPos(pSupporter2->pTSBuf);
-
-  // TODO add more details information
-  if (!tsBufNextPos(pSupporter1->pTSBuf)) {
-    tsBufFlush(output1);
-    tsBufFlush(output2);
-
-    tscTrace("%p input1 is empty, 0 for secondary query after ts blocks intersecting", pSql);
-    return 0;
-  }
-
-  if (!tsBufNextPos(pSupporter2->pTSBuf)) {
-    tsBufFlush(output1);
-    tsBufFlush(output2);
-
-    tscTrace("%p input2 is empty, 0 for secondary query after ts blocks intersecting", pSql);
-    return 0;
-  }
-
-  int64_t numOfInput1 = 1;
-  int64_t numOfInput2 = 1;
-
-  while (1) {
-    STSElem elem1 = tsBufGetElem(pSupporter1->pTSBuf);
-    STSElem elem2 = tsBufGetElem(pSupporter2->pTSBuf);
-
-#ifdef _DEBUG_VIEW
-    // for debug purpose
-    tscPrint("%" PRId64 ", tags:%d \t %" PRId64 ", tags:%d", elem1.ts, elem1.tag, elem2.ts, elem2.tag);
-#endif
-
-    if (elem1.tag < elem2.tag || (elem1.tag == elem2.tag && doCompare(order, elem1.ts, elem2.ts))) {
-      if (!tsBufNextPos(pSupporter1->pTSBuf)) {
-        break;
-      }
-
-      numOfInput1++;
-    } else if (elem1.tag > elem2.tag || (elem1.tag == elem2.tag && doCompare(order, elem2.ts, elem1.ts))) {
-      if (!tsBufNextPos(pSupporter2->pTSBuf)) {
-        break;
-      }
-
-      numOfInput2++;
-    } else {
-      /*
-       * in case of stable query, limit/offset is not applied here. the limit/offset is applied to the
-       * final results which is acquired after the secondry merge of in the client.
-       */
-      if (pLimit->offset == 0 || pQueryInfo->nAggTimeInterval > 0 || QUERY_IS_STABLE_QUERY(pQueryInfo->type)) {
-        if (*st > elem1.ts) {
-          *st = elem1.ts;
-        }
-  
-        if (*et < elem1.ts) {
-          *et = elem1.ts;
-        }
-        
-        tsBufAppend(output1, elem1.vnode, elem1.tag, (const char*)&elem1.ts, sizeof(elem1.ts));
-        tsBufAppend(output2, elem2.vnode, elem2.tag, (const char*)&elem2.ts, sizeof(elem2.ts));
-      } else {
-        pLimit->offset -= 1;
-      }
-
-      if (!tsBufNextPos(pSupporter1->pTSBuf)) {
-        break;
-      }
-
-      numOfInput1++;
-
-      if (!tsBufNextPos(pSupporter2->pTSBuf)) {
-        break;
-      }
-
-      numOfInput2++;
-    }
-  }
-
-  /*
-   * failed to set the correct ts order yet in two cases:
-   * 1. only one element
-   * 2. only one element for each tag.
-   */
-  if (output1->tsOrder == -1) {
-    output1->tsOrder = TSQL_SO_ASC;
-    output2->tsOrder = TSQL_SO_ASC;
-  }
-
-  tsBufFlush(output1);
-  tsBufFlush(output2);
-
-  tsBufDestory(pSupporter1->pTSBuf);
-  tsBufDestory(pSupporter2->pTSBuf);
-
-  tscTrace("%p input1:%" PRId64 ", input2:%" PRId64 ", final:%" PRId64 " for secondary query after ts blocks "
-           "intersecting, skey:%" PRId64 ", ekey:%" PRId64, pSql,
-           numOfInput1, numOfInput2, output1->numOfTotal, *st, *et);
-
-  return output1->numOfTotal;
-}
-
-// todo handle failed to create sub query
-SJoinSubquerySupporter* tscCreateJoinSupporter(SSqlObj* pSql, SSubqueryState* pState, int32_t index) {
-  SJoinSubquerySupporter* pSupporter = calloc(1, sizeof(SJoinSubquerySupporter));
-  if (pSupporter == NULL) {
-    return NULL;
-  }
-
-  pSupporter->pObj = pSql;
-  pSupporter->pState = pState;
-
-  pSupporter->subqueryIndex = index;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
-  
-  pSupporter->interval = pQueryInfo->nAggTimeInterval;
-  pSupporter->limit = pQueryInfo->limit;
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, pSql->cmd.clauseIndex, index);
-  pSupporter->uid = pMeterMetaInfo->pMeterMeta->uid;
-  
-  assert (pSupporter->uid != 0);
-
-  getTmpfilePath("join-", pSupporter->path);
-  pSupporter->f = fopen(pSupporter->path, "w");
-
-  if (pSupporter->f == NULL) {
-    tscError("%p failed to create tmp file:%s, reason:%s", pSql, pSupporter->path, strerror(errno));
-  }
-
-  return pSupporter;
-}
-
-void tscDestroyJoinSupporter(SJoinSubquerySupporter* pSupporter) {
-  if (pSupporter == NULL) {
-    return;
-  }
-
-  tscSqlExprInfoDestroy(&pSupporter->exprsInfo);
-  tscColumnBaseInfoDestroy(&pSupporter->colList);
-
-  tscClearFieldInfo(&pSupporter->fieldsInfo);
-
-  if (pSupporter->f != NULL) {
-    fclose(pSupporter->f);
-    unlink(pSupporter->path);
-  }
-
-  tscTagCondRelease(&pSupporter->tagCond);
-  free(pSupporter);
-}
-
-/*
- * need the secondary query process
- * In case of count(ts)/count(*)/spread(ts) query, that are only applied to
- * primary timestamp column , the secondary query is not necessary
- *
- */
-bool needSecondaryQuery(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->colList.numOfCols; ++i) {
-    SColumnBase* pBase = tscColumnBaseInfoGet(&pQueryInfo->colList, i);
-    if (pBase->colIndex.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-/*
- * launch secondary stage query to fetch the result that contains timestamp in set
- */
-int32_t tscLaunchSecondPhaseSubqueries(SSqlObj* pSql) {
-  int32_t                 numOfSub = 0;
-  SJoinSubquerySupporter* pSupporter = NULL;
-  
-  /*
-   * If the columns are not involved in the final select clause, the secondary query will not be launched
-   * for the subquery.
-   */
-  SSubqueryState* pState = NULL;
-  
-  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    pSupporter = pSql->pSubs[i]->param;
-    if (pSupporter->exprsInfo.numOfExprs > 0) {
-      ++numOfSub;
-    }
-  }
-  
-  assert(numOfSub > 0);
-  
-  // scan all subquery, if one sub query has only ts, ignore it
-  tscTrace("%p start to launch secondary subqueries, total:%d, only:%d needs to query, others are not retrieve in "
-      "select clause", pSql, pSql->numOfSubs, numOfSub);
-
-  /*
-   * the subqueries that do not actually launch the secondary query to virtual node is set as completed.
-   */
-  pState = pSupporter->pState;
-  pState->numOfTotal = pSql->numOfSubs;
-  pState->numOfCompleted = (pSql->numOfSubs - numOfSub);
-  
-  bool success = true;
-  
-  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    SSqlObj *pPrevSub = pSql->pSubs[i];
-    pSql->pSubs[i] = NULL;
-    
-    pSupporter = pPrevSub->param;
-  
-    if (pSupporter->exprsInfo.numOfExprs == 0) {
-      tscTrace("%p subIndex: %d, not need to launch query, ignore it", pSql, i);
-    
-      tscDestroyJoinSupporter(pSupporter);
-      tscFreeSqlObj(pPrevSub);
-    
-      pSql->pSubs[i] = NULL;
-      continue;
-    }
-  
-    SQueryInfo *pSubQueryInfo = tscGetQueryInfoDetail(&pPrevSub->cmd, 0);
-    STSBuf *pTSBuf = pSubQueryInfo->tsBuf;
-    pSubQueryInfo->tsBuf = NULL;
-  
-    // free result for async object will also free sqlObj
-    taos_free_result(pPrevSub);
-  
-    SSqlObj *pNew = createSubqueryObj(pSql, (int16_t) i, tscJoinQueryCallback, pSupporter, NULL);
-    if (pNew == NULL) {
-      tscDestroyJoinSupporter(pSupporter);
-      success = false;
-      break;
-    }
-  
-    tscClearSubqueryInfo(&pNew->cmd);
-    pSql->pSubs[i] = pNew;
-  
-    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-    pQueryInfo->tsBuf = pTSBuf;  // transfer the ownership of timestamp comp-z data to the new created object
-  
-    // set the second stage sub query for join process
-    pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_SEC_STAGE;
-  
-    pQueryInfo->nAggTimeInterval = pSupporter->interval;
-    pQueryInfo->groupbyExpr = pSupporter->groupbyExpr;
-  
-    tscColumnBaseInfoCopy(&pQueryInfo->colList, &pSupporter->colList, 0);
-    tscTagCondCopy(&pQueryInfo->tagCond, &pSupporter->tagCond);
-  
-    tscSqlExprCopy(&pQueryInfo->exprsInfo, &pSupporter->exprsInfo, pSupporter->uid);
-    tscFieldInfoCopyAll(&pQueryInfo->fieldsInfo, &pSupporter->fieldsInfo);
-  
-    /*
-     * if the first column of the secondary query is not ts function, add this function.
-     * Because this column is required to filter with timestamp after intersecting.
-     */
-    if (pSupporter->exprsInfo.pExprs[0].functionId != TSDB_FUNC_TS) {
-      tscAddTimestampColumn(pQueryInfo, TSDB_FUNC_TS, 0);
-    }
-  
-    // todo refactor function name
-    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-    assert(pNew->numOfSubs == 0 && pNew->cmd.numOfClause == 1 && pNewQueryInfo->numOfTables == 1);
-  
-    tscFieldInfoCalOffset(pNewQueryInfo);
-  
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pNewQueryInfo, 0);
-  
-    /*
-     * When handling the projection query, the offset value will be modified for table-table join, which is changed
-     * during the timestamp intersection.
-     */
-    pSupporter->limit = pQueryInfo->limit;
-    pNewQueryInfo->limit = pSupporter->limit;
-  
-    // fetch the join tag column
-    if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-      SSqlExpr *pExpr = tscSqlExprGet(pNewQueryInfo, 0);
-      assert(pQueryInfo->tagCond.joinInfo.hasJoin);
-    
-      int16_t tagColIndex = tscGetJoinTagColIndexByUid(&pQueryInfo->tagCond, pMeterMetaInfo->pMeterMeta->uid);
-      pExpr->param[0].i64Key = tagColIndex;
-      pExpr->numOfParams = 1;
-    }
-  
-    tscPrintSelectClause(pNew, 0);
-  
-    tscTrace("%p subquery:%p tableIndex:%d, vnodeIdx:%d, type:%d, exprInfo:%d, colList:%d, fieldsInfo:%d, name:%s",
-             pSql, pNew, 0, pMeterMetaInfo->vnodeIndex, pNewQueryInfo->type,
-             pNewQueryInfo->exprsInfo.numOfExprs, pNewQueryInfo->colList.numOfCols,
-             pNewQueryInfo->fieldsInfo.numOfOutputCols, pNewQueryInfo->pMeterInfo[0]->name);
-  }
-  
-  //prepare the subqueries object failed, abort
-  if (!success) {
-    pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscError("%p failed to prepare subqueries objs for secondary phase query, numOfSub:%d, code:%d", pSql,
-        pSql->numOfSubs, pSql->res.code);
-    freeSubqueryObj(pSql);
-    
-    return pSql->res.code;
-  }
-  
-  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    SSqlObj* pSub = pSql->pSubs[i];
-    if (pSub == NULL) {
-      continue;
-    }
-    
-    tscProcessSql(pSub);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static void freeSubqueryObj(SSqlObj* pSql) {
-  SSubqueryState* pState = NULL;
-
-  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    if (pSql->pSubs[i] != NULL) {
-      SJoinSubquerySupporter* p = pSql->pSubs[i]->param;
-      pState = p->pState;
-
-      tscDestroyJoinSupporter(p);
-
-      if (pSql->pSubs[i]->res.code == TSDB_CODE_SUCCESS) {
-        taos_free_result(pSql->pSubs[i]);
-      }
-    }
-  }
-
-  tfree(pState);
-  pSql->numOfSubs = 0;
-}
-
-static void doQuitSubquery(SSqlObj* pParentSql) {
-  freeSubqueryObj(pParentSql);
-
-  tsem_wait(&pParentSql->emptyRspSem);
-  tsem_wait(&pParentSql->emptyRspSem);
-
-  tsem_post(&pParentSql->rspSem);
-}
-
-static void quitAllSubquery(SSqlObj* pSqlObj, SJoinSubquerySupporter* pSupporter) {
-  int32_t numOfTotal = pSupporter->pState->numOfTotal;
-  int32_t finished = atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1);
-  
-  if (finished >= numOfTotal) {
-    pSqlObj->res.code = abs(pSupporter->pState->code);
-    tscError("%p all subquery return and query failed, global code:%d", pSqlObj, pSqlObj->res.code);
-
-    doQuitSubquery(pSqlObj);
-  }
-}
-
-// update the query time range according to the join results on timestamp
-static void updateQueryTimeRange(SQueryInfo* pQueryInfo, int64_t st, int64_t et) {
-  assert(pQueryInfo->stime <= st && pQueryInfo->etime >= et);
-
-  pQueryInfo->stime = st;
-  pQueryInfo->etime = et;
-}
-
-static void joinRetrieveCallback(void* param, TAOS_RES* tres, int numOfRows) {
-  SJoinSubquerySupporter* pSupporter = (SJoinSubquerySupporter*)param;
-  SSqlObj*                pParentSql = pSupporter->pObj;
-
-  SSqlObj* pSql = (SSqlObj*)tres;
-  SSqlCmd* pCmd = &pSql->cmd;
-  SSqlRes* pRes = &pSql->res;
-  
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  if ((pQueryInfo->type & TSDB_QUERY_TYPE_JOIN_SEC_STAGE) == 0) {
-    if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
-      tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows,
-               pSupporter->pState->code);
-
-      quitAllSubquery(pParentSql, pSupporter);
-      return;
-    }
-
-    if (numOfRows > 0) {  // write the data into disk
-      fwrite(pSql->res.data, pSql->res.numOfRows, 1, pSupporter->f);
-      fclose(pSupporter->f);
-
-      STSBuf* pBuf = tsBufCreateFromFile(pSupporter->path, true);
-      if (pBuf == NULL) {
-        tscError("%p invalid ts comp file from vnode, abort sub query, file size:%d", pSql, numOfRows);
-
-        pSupporter->pState->code = TSDB_CODE_APP_ERROR;  // todo set the informative code
-        quitAllSubquery(pParentSql, pSupporter);
-        return;
-      }
-
-      if (pSupporter->pTSBuf == NULL) {
-        tscTrace("%p create tmp file for ts block:%s", pSql, pBuf->path);
-        pSupporter->pTSBuf = pBuf;
-      } else {
-        assert(pQueryInfo->numOfTables == 1);  // for subquery, only one metermetaInfo
-        SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-        tsBufMerge(pSupporter->pTSBuf, pBuf, pMeterMetaInfo->vnodeIndex);
-        tsBufDestory(pBuf);
-      }
-
-      // open new file to save the result
-      getTmpfilePath("ts-join", pSupporter->path);
-      pSupporter->f = fopen(pSupporter->path, "w");
-      pSql->res.row = pSql->res.numOfRows;
-
-      taos_fetch_rows_a(tres, joinRetrieveCallback, param);
-    } else if (numOfRows == 0) {  // no data from this vnode anymore
-      SQueryInfo* pParentQueryInfo = tscGetQueryInfoDetail(&pParentSql->cmd, pParentSql->cmd.clauseIndex);
-      
-      //todo refactor
-      if (tscNonOrderedProjectionQueryOnSTable(pParentQueryInfo, 0)) {
-        SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-        assert(pQueryInfo->numOfTables == 1);
-
-        // for projection query, need to try next vnode
-        int32_t totalVnode = pMeterMetaInfo->pMetricMeta->numOfVnodes;
-        if ((++pMeterMetaInfo->vnodeIndex) < totalVnode) {
-          tscTrace("%p current vnode:%d exhausted, try next:%d. total vnode:%d. current numOfRes:%d", pSql,
-                   pMeterMetaInfo->vnodeIndex - 1, pMeterMetaInfo->vnodeIndex, totalVnode, pRes->numOfTotal);
-  
-          pSql->cmd.command = TSDB_SQL_SELECT;
-          pSql->fp = tscJoinQueryCallback;
-          tscProcessSql(pSql);
-
-          return;
-        }
-      }
-  
-      int32_t numOfTotal = pSupporter->pState->numOfTotal;
-      int32_t finished = atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1);
-  
-      if (finished >= numOfTotal) {
-        assert(finished == numOfTotal);
-        
-        if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
-          tscTrace("%p sub:%p, numOfSub:%d, quit from further procedure due to other queries failure", pParentSql, tres,
-                   pSupporter->subqueryIndex);
-          doQuitSubquery(pParentSql);
-          return;
-        }
-
-        tscTrace("%p all subqueries retrieve ts complete, do ts block intersect", pParentSql);
-
-        SJoinSubquerySupporter* p1 = pParentSql->pSubs[0]->param;
-        SJoinSubquerySupporter* p2 = pParentSql->pSubs[1]->param;
-
-        TSKEY st, et;
-
-        int64_t num = doTSBlockIntersect(pParentSql, p1, p2, &st, &et);
-        if (num <= 0) {  // no result during ts intersect
-          tscTrace("%p free all sub SqlObj and quit", pParentSql);
-          doQuitSubquery(pParentSql);
-        } else {
-          updateQueryTimeRange(pParentQueryInfo, st, et);
-          tscLaunchSecondPhaseSubqueries(pParentSql);
-        }
-      }
-    } else {  // failure of sub query
-      tscError("%p sub query failed, code:%d, index:%d", pSql, numOfRows, pSupporter->subqueryIndex);
-      pSupporter->pState->code = numOfRows;
-
-      quitAllSubquery(pParentSql, pSupporter);
-      return;
-    }
-
-  } else {  // secondary stage retrieve, driven by taos_fetch_row or other functions
-    if (numOfRows < 0) {
-      pSupporter->pState->code = numOfRows;
-      tscError("%p retrieve failed, code:%d, index:%d", pSql, numOfRows, pSupporter->subqueryIndex);
-    }
-
-    if (numOfRows >= 0) {
-      pSql->res.numOfTotal += pSql->res.numOfRows;
-    }
-  
-    if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && numOfRows == 0) {
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-      assert(pQueryInfo->numOfTables == 1);
-
-      // for projection query, need to try next vnode if current vnode is exhausted
-      if ((++pMeterMetaInfo->vnodeIndex) < pMeterMetaInfo->pMetricMeta->numOfVnodes) {
-        pSupporter->pState->numOfCompleted = 0;
-        pSupporter->pState->numOfTotal = 1;
-
-        pSql->cmd.command = TSDB_SQL_SELECT;
-        pSql->fp = tscJoinQueryCallback;
-        tscProcessSql(pSql);
-
-        return;
-      }
-    }
-  
-    int32_t numOfTotal = pSupporter->pState->numOfTotal;
-    int32_t finished = atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1);
-  
-    if (finished >= numOfTotal) {
-      assert(finished == numOfTotal);
-      tscTrace("%p all %d secondary subquery retrieves completed, global code:%d", tres, numOfTotal,
-               pParentSql->res.code);
-
-      if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
-        pParentSql->res.code = abs(pSupporter->pState->code);
-        freeSubqueryObj(pParentSql);
-      }
-
-      tsem_post(&pParentSql->rspSem);
-    } else {
-      tscTrace("%p sub:%p completed, completed:%d, total:%d", pParentSql, tres, finished, numOfTotal);
-    }
-  }
-}
-
-static SJoinSubquerySupporter* tscUpdateSubqueryStatus(SSqlObj* pSql, int32_t numOfFetch) {
-  int32_t notInvolved = 0;
-  SJoinSubquerySupporter* pSupporter = NULL;
-  SSubqueryState* pState = NULL;
-  
-  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    if (pSql->pSubs[i] == NULL) {
-      notInvolved++;
-    } else {
-      pSupporter = (SJoinSubquerySupporter*)pSql->pSubs[i]->param;
-      pState = pSupporter->pState;
-    }
-  }
-  
-  pState->numOfTotal = pSql->numOfSubs;
-  pState->numOfCompleted = pSql->numOfSubs - numOfFetch;
-  
-  return pSupporter;
-}
-
-void tscFetchDatablockFromSubquery(SSqlObj* pSql) {
-  int32_t numOfFetch = 0;
-  assert(pSql->numOfSubs >= 1);
-  
-  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    if (pSql->pSubs[i] == NULL) {  // this subquery does not need to involve in secondary query
-      continue;
-    }
-    
-    SSqlRes *pRes = &pSql->pSubs[i]->res;
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->pSubs[i]->cmd, 0);
-  
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  
-    if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-      if (pRes->row >= pRes->numOfRows && pMeterMetaInfo->vnodeIndex < pMeterMetaInfo->pMetricMeta->numOfVnodes &&
-          (!tscHasReachLimitation(pQueryInfo, pRes))) {
-        numOfFetch++;
-      }
-    } else {
-      if (pRes->row >= pRes->numOfRows && (!tscHasReachLimitation(pQueryInfo, pRes))) {
-        numOfFetch++;
-      }
-    }
-  }
-
-  if (numOfFetch <= 0) {
-    return;
-  }
-
-  // TODO multi-vnode retrieve for projection query with limitation has bugs, since the global limiation is not handled
-  tscTrace("%p retrieve data from %d subqueries", pSql, numOfFetch);
-
-  SJoinSubquerySupporter* pSupporter = tscUpdateSubqueryStatus(pSql, numOfFetch);
-  
-  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    SSqlObj* pSql1 = pSql->pSubs[i];
-    if (pSql1 == NULL) {
-      continue;
-    }
-    
-    SSqlRes* pRes1 = &pSql1->res;
-    SSqlCmd* pCmd1 = &pSql1->cmd;
-
-    pSupporter = (SJoinSubquerySupporter*)pSql1->param;
-
-    // wait for all subqueries completed
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd1, 0);
-    assert(pRes1->numOfRows >= 0 && pQueryInfo->numOfTables == 1);
-
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-    
-    if (pRes1->row >= pRes1->numOfRows) {
-      tscTrace("%p subquery:%p retrieve data from vnode, subquery:%d, vnodeIndex:%d", pSql, pSql1,
-               pSupporter->subqueryIndex, pMeterMetaInfo->vnodeIndex);
-
-      tscResetForNextRetrieve(pRes1);
-      pSql1->fp = joinRetrieveCallback;
-
-      if (pCmd1->command < TSDB_SQL_LOCAL) {
-        pCmd1->command = (pCmd1->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-      }
-
-      tscProcessSql(pSql1);
-    }
-  }
-
-  // wait for all subquery completed
-  tsem_wait(&pSql->rspSem);
-  
-  // update the records for each subquery
-  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
-    if (pSql->pSubs[i] == NULL) {
-      continue;
-    }
-    
-    SSqlRes* pRes1 = &pSql->pSubs[i]->res;
-    pRes1->numOfTotalInCurrentClause += pRes1->numOfRows;
-  }
-}
-
-// all subqueries return, set the result output index
-void tscSetupOutputColumnIndex(SSqlObj* pSql) {
-  SSqlCmd* pCmd = &pSql->cmd;
-  SSqlRes* pRes = &pSql->res;
-
-  tscTrace("%p all subquery response, retrieve data", pSql);
-
-  if (pRes->pColumnIndex != NULL) {
-    return;  // the column transfer support struct has been built
-  }
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  pRes->pColumnIndex = calloc(1, sizeof(SColumnIndex) * pQueryInfo->fieldsInfo.numOfOutputCols);
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-
-    int32_t tableIndexOfSub = -1;
-    for (int32_t j = 0; j < pQueryInfo->numOfTables; ++j) {
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, j);
-      if (pMeterMetaInfo->pMeterMeta->uid == pExpr->uid) {
-        tableIndexOfSub = j;
-        break;
-      }
-    }
-
-    assert(tableIndexOfSub >= 0 && tableIndexOfSub < pQueryInfo->numOfTables);
-    
-    SSqlCmd* pSubCmd = &pSql->pSubs[tableIndexOfSub]->cmd;
-    SQueryInfo* pSubQueryInfo = tscGetQueryInfoDetail(pSubCmd, 0);
-    
-    for (int32_t k = 0; k < pSubQueryInfo->exprsInfo.numOfExprs; ++k) {
-      SSqlExpr* pSubExpr = tscSqlExprGet(pSubQueryInfo, k);
-      if (pExpr->functionId == pSubExpr->functionId && pExpr->colInfo.colId == pSubExpr->colInfo.colId) {
-        pRes->pColumnIndex[i] = (SColumnIndex){.tableIndex = tableIndexOfSub, .columnIndex = k};
-        break;
-      }
-    }
-  }
-}
-
-void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
-  SSqlObj* pSql = (SSqlObj*)tres;
-  //  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
-
-  //  int32_t idx = pSql->cmd.vnodeIdx;
-
-  //  SVnodeSidList *vnodeInfo = NULL;
-  //  if (pMeterMetaInfo->pMetricMeta != NULL) {
-  //    vnodeInfo = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, idx - 1);
-  //  }
-
-  SJoinSubquerySupporter* pSupporter = (SJoinSubquerySupporter*)param;
-
-  //  if (atomic_add_fetch_32(pSupporter->numOfComplete, 1) >=
-  //      pSupporter->numOfTotal) {
-  //    SSqlObj *pParentObj = pSupporter->pObj;
-  //
-  //    if ((pSql->cmd.type & TSDB_QUERY_TYPE_JOIN_SEC_STAGE) != 1) {
-  //      int32_t num = 0;
-  //      tscFetchDatablockFromSubquery(pParentObj);
-  //      TSKEY* ts = tscGetQualifiedTSList(pParentObj, &num);
-  //
-  //      if (num <= 0) {
-  //        // no qualified result
-  //      }
-  //
-  //      tscLaunchSecondPhaseSubqueries(pSql, ts, num);
-  //    } else {
-
-  //    }
-  //  } else {
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  if ((pQueryInfo->type & TSDB_QUERY_TYPE_JOIN_SEC_STAGE) != TSDB_QUERY_TYPE_JOIN_SEC_STAGE) {
-    if (code != TSDB_CODE_SUCCESS) {  // direct call joinRetrieveCallback and set the error code
-      joinRetrieveCallback(param, pSql, code);
-    } else {  // first stage query, continue to retrieve data
-      pSql->fp = joinRetrieveCallback;
-      pSql->cmd.command = TSDB_SQL_FETCH;
-      tscProcessSql(pSql);
-    }
-
-  } else {  // second stage join subquery
-    SSqlObj* pParentSql = pSupporter->pObj;
-
-    if (pSupporter->pState->code != TSDB_CODE_SUCCESS) {
-      tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, code,
-               pSupporter->pState->code);
-      quitAllSubquery(pParentSql, pSupporter);
-
-      return;
-    }
-
-    if (code != TSDB_CODE_SUCCESS) {
-      tscError("%p sub query failed, code:%d, set global code:%d, index:%d", pSql, code, code,
-               pSupporter->subqueryIndex);
-      pSupporter->pState->code = code;  // todo set the informative code
-
-      quitAllSubquery(pParentSql, pSupporter);
-    } else {
-      int32_t numOfTotal = pSupporter->pState->numOfTotal;
-      int32_t finished = atomic_add_fetch_32(&pSupporter->pState->numOfCompleted, 1);
-      
-      if (finished >= numOfTotal) {
-        assert(finished == numOfTotal);
-        
-        tscSetupOutputColumnIndex(pParentSql);
-        SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-        /**
-         * if the query is a continue query (vnodeIndex > 0 for projection query) for next vnode, do the retrieval of
-         * data instead of returning to its invoker
-         */
-        if (pMeterMetaInfo->vnodeIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-          assert(pMeterMetaInfo->vnodeIndex < pMeterMetaInfo->pMetricMeta->numOfVnodes);
-          pSupporter->pState->numOfCompleted = 0;  // reset the record value
-
-          pSql->fp = joinRetrieveCallback;  // continue retrieve data
-          pSql->cmd.command = TSDB_SQL_FETCH;
-          tscProcessSql(pSql);
-        } else {  // first retrieve from vnode during the secondary stage sub-query
-          if (pParentSql->fp == NULL) {
-            tsem_wait(&pParentSql->emptyRspSem);
-            tsem_wait(&pParentSql->emptyRspSem);
-
-            tsem_post(&pParentSql->rspSem);
-          } else {
-            // set the command flag must be after the semaphore been correctly set.
-            //    pPObj->cmd.command = TSDB_SQL_RETRIEVE_METRIC;
-            //    if (pPObj->res.code == TSDB_CODE_SUCCESS) {
-            //      (*pPObj->fp)(pPObj->param, pPObj, 0);
-            //    } else {
-            //      tscQueueAsyncRes(pPObj);
-            //    }
-            assert(0);
-          }
-        }
-      }
-    }
-  }
-}
-
-static int32_t getDataStartOffset() {
-  return sizeof(STSBufFileHeader) + TS_COMP_FILE_VNODE_MAX * sizeof(STSVnodeBlockInfo);
-}
-
-static int32_t doUpdateVnodeInfo(STSBuf* pTSBuf, int64_t offset, STSVnodeBlockInfo* pVInfo) {
-  if (offset < 0 || offset >= getDataStartOffset()) {
-    return -1;
-  }
-
-  if (fseek(pTSBuf->f, offset, SEEK_SET) != 0) {
-    return -1;
-  }
-
-  fwrite(pVInfo, sizeof(STSVnodeBlockInfo), 1, pTSBuf->f);
-  return 0;
-}
-
-// update prev vnode length info in file
-static void TSBufUpdateVnodeInfo(STSBuf* pTSBuf, int32_t index, STSVnodeBlockInfo* pBlockInfo) {
-  int32_t offset = sizeof(STSBufFileHeader) + index * sizeof(STSVnodeBlockInfo);
-  doUpdateVnodeInfo(pTSBuf, offset, pBlockInfo);
-}
-
-static STSBuf* allocResForTSBuf(STSBuf* pTSBuf) {
-  const int32_t INITIAL_VNODEINFO_SIZE = 4;
-
-  pTSBuf->numOfAlloc = INITIAL_VNODEINFO_SIZE;
-  pTSBuf->pData = calloc(pTSBuf->numOfAlloc, sizeof(STSVnodeBlockInfoEx));
-  if (pTSBuf->pData == NULL) {
-    tsBufDestory(pTSBuf);
-    return NULL;
-  }
-
-  pTSBuf->tsData.rawBuf = malloc(MEM_BUF_SIZE);
-  if (pTSBuf->tsData.rawBuf == NULL) {
-    tsBufDestory(pTSBuf);
-    return NULL;
-  }
-
-  pTSBuf->bufSize = MEM_BUF_SIZE;
-  pTSBuf->tsData.threshold = MEM_BUF_SIZE;
-  pTSBuf->tsData.allocSize = MEM_BUF_SIZE;
-
-  pTSBuf->assistBuf = malloc(MEM_BUF_SIZE);
-  if (pTSBuf->assistBuf == NULL) {
-    tsBufDestory(pTSBuf);
-    return NULL;
-  }
-
-  pTSBuf->block.payload = malloc(MEM_BUF_SIZE);
-  if (pTSBuf->block.payload == NULL) {
-    tsBufDestory(pTSBuf);
-    return NULL;
-  }
-
-  pTSBuf->fileSize += getDataStartOffset();
-  return pTSBuf;
-}
-
-static int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader);
-
-/**
- * todo error handling
- * support auto closeable tmp file
- * @param path
- * @return
- */
-STSBuf* tsBufCreate(bool autoDelete) {
-  STSBuf* pTSBuf = calloc(1, sizeof(STSBuf));
-  if (pTSBuf == NULL) {
-    return NULL;
-  }
-
-  getTmpfilePath("join", pTSBuf->path);
-  pTSBuf->f = fopen(pTSBuf->path, "w+");
-  if (pTSBuf->f == NULL) {
-    free(pTSBuf);
-    return NULL;
-  }
-
-  if (NULL == allocResForTSBuf(pTSBuf)) {
-    return NULL;
-  }
-
-  // update the header info
-  STSBufFileHeader header = {.magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = TSQL_SO_ASC};
-  STSBufUpdateHeader(pTSBuf, &header);
-
-  tsBufResetPos(pTSBuf);
-  pTSBuf->cur.order = TSQL_SO_ASC;
-
-  pTSBuf->autoDelete = autoDelete;
-  pTSBuf->tsOrder = -1;
-
-  return pTSBuf;
-}
-
-STSBuf* tsBufCreateFromFile(const char* path, bool autoDelete) {
-  STSBuf* pTSBuf = calloc(1, sizeof(STSBuf));
-  if (pTSBuf == NULL) {
-    return NULL;
-  }
-
-  strncpy(pTSBuf->path, path, PATH_MAX);
-
-  pTSBuf->f = fopen(pTSBuf->path, "r+");
-  if (pTSBuf->f == NULL) {
-    free(pTSBuf);
-    return NULL;
-  }
-
-  if (allocResForTSBuf(pTSBuf) == NULL) {
-    return NULL;
-  }
-
-  // validate the file magic number
-  STSBufFileHeader header = {0};
-  fseek(pTSBuf->f, 0, SEEK_SET);
-  fread(&header, 1, sizeof(header), pTSBuf->f);
-
-  // invalid file
-  if (header.magic != TS_COMP_FILE_MAGIC) {
-    return NULL;
-  }
-
-  if (header.numOfVnode > pTSBuf->numOfAlloc) {
-    pTSBuf->numOfAlloc = header.numOfVnode;
-    STSVnodeBlockInfoEx* tmp = realloc(pTSBuf->pData, sizeof(STSVnodeBlockInfoEx) * pTSBuf->numOfAlloc);
-    if (tmp == NULL) {
-      tsBufDestory(pTSBuf);
-      return NULL;
-    }
-
-    pTSBuf->pData = tmp;
-  }
-
-  pTSBuf->numOfVnodes = header.numOfVnode;
-
-  // check the ts order
-  pTSBuf->tsOrder = header.tsOrder;
-  if (pTSBuf->tsOrder != TSQL_SO_ASC && pTSBuf->tsOrder != TSQL_SO_DESC) {
-    tscError("invalid order info in buf:%d", pTSBuf->tsOrder);
-    tsBufDestory(pTSBuf);
-    return NULL;
-  }
-
-  size_t infoSize = sizeof(STSVnodeBlockInfo) * pTSBuf->numOfVnodes;
-
-  STSVnodeBlockInfo* buf = (STSVnodeBlockInfo*)calloc(1, infoSize);
-  
-  //int64_t pos = ftell(pTSBuf->f); //pos not used
-  fread(buf, infoSize, 1, pTSBuf->f);
-
-  // the length value for each vnode is not kept in file, so does not set the length value
-  for (int32_t i = 0; i < pTSBuf->numOfVnodes; ++i) {
-    STSVnodeBlockInfoEx* pBlockList = &pTSBuf->pData[i];
-    memcpy(&pBlockList->info, &buf[i], sizeof(STSVnodeBlockInfo));
-  }
-
-  free(buf);
-
-  fseek(pTSBuf->f, 0, SEEK_END);
-
-  struct stat fileStat;
-  fstat(fileno(pTSBuf->f), &fileStat);
-
-  pTSBuf->fileSize = (uint32_t)fileStat.st_size;
-  tsBufResetPos(pTSBuf);
-
-  // ascending by default
-  pTSBuf->cur.order = TSQL_SO_ASC;
-
-  pTSBuf->autoDelete = autoDelete;
-
-  tscTrace("create tsBuf from file:%s, fd:%d, size:%d, numOfVnode:%d, autoDelete:%d", pTSBuf->path, fileno(pTSBuf->f),
-           pTSBuf->fileSize, pTSBuf->numOfVnodes, pTSBuf->autoDelete);
-
-  return pTSBuf;
-}
-
-void* tsBufDestory(STSBuf* pTSBuf) {
-  if (pTSBuf == NULL) {
-    return NULL;
-  }
-
-  tfree(pTSBuf->assistBuf);
-  tfree(pTSBuf->tsData.rawBuf);
-
-  tfree(pTSBuf->pData);
-  tfree(pTSBuf->block.payload);
-
-  fclose(pTSBuf->f);
-
-  if (pTSBuf->autoDelete) {
-    tscTrace("tsBuf %p destroyed, delete tmp file:%s", pTSBuf, pTSBuf->path);
-    unlink(pTSBuf->path);
-  } else {
-    tscTrace("tsBuf %p destroyed, tmp file:%s, remains", pTSBuf, pTSBuf->path);
-  }
-
-  free(pTSBuf);
-  return NULL;
-}
-
-static STSVnodeBlockInfoEx* tsBufGetLastVnodeInfo(STSBuf* pTSBuf) {
-  int32_t last = pTSBuf->numOfVnodes - 1;
-
-  assert(last >= 0);
-  return &pTSBuf->pData[last];
-}
-
-static STSVnodeBlockInfoEx* addOneVnodeInfo(STSBuf* pTSBuf, int32_t vnodeId) {
-  if (pTSBuf->numOfAlloc <= pTSBuf->numOfVnodes) {
-    uint32_t newSize = (uint32_t)(pTSBuf->numOfAlloc * 1.5);
-    assert(newSize > pTSBuf->numOfAlloc);
-
-    STSVnodeBlockInfoEx* tmp = (STSVnodeBlockInfoEx*)realloc(pTSBuf->pData, sizeof(STSVnodeBlockInfoEx) * newSize);
-    if (tmp == NULL) {
-      return NULL;
-    }
-
-    pTSBuf->pData = tmp;
-    pTSBuf->numOfAlloc = newSize;
-    memset(&pTSBuf->pData[pTSBuf->numOfVnodes], 0, sizeof(STSVnodeBlockInfoEx) * (newSize - pTSBuf->numOfVnodes));
-  }
-
-  if (pTSBuf->numOfVnodes > 0) {
-    STSVnodeBlockInfoEx* pPrevBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
-
-    // update prev vnode length info in file
-    TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, &pPrevBlockInfoEx->info);
-  }
-
-  // set initial value for vnode block
-  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[pTSBuf->numOfVnodes].info;
-  pBlockInfo->vnode = vnodeId;
-  pBlockInfo->offset = pTSBuf->fileSize;
-  assert(pBlockInfo->offset >= getDataStartOffset());
-
-  // update vnode info in file
-  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes, pBlockInfo);
-
-  // add one vnode info
-  pTSBuf->numOfVnodes += 1;
-
-  // update the header info
-  STSBufFileHeader header = {
-      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
-
-  STSBufUpdateHeader(pTSBuf, &header);
-  return tsBufGetLastVnodeInfo(pTSBuf);
-}
-
-static void shrinkBuffer(STSList* ptsData) {
-  // shrink tmp buffer size if it consumes too many memory compared to the pre-defined size
-  if (ptsData->allocSize >= ptsData->threshold * 2) {
-    ptsData->rawBuf = realloc(ptsData->rawBuf, MEM_BUF_SIZE);
-    ptsData->allocSize = MEM_BUF_SIZE;
-  }
-}
-
-static void writeDataToDisk(STSBuf* pTSBuf) {
-  if (pTSBuf->tsData.len == 0) {
-    return;
-  }
-
-  STSBlock* pBlock = &pTSBuf->block;
-
-  pBlock->numOfElem = pTSBuf->tsData.len / TSDB_KEYSIZE;
-  pBlock->compLen =
-      tsCompressTimestamp(pTSBuf->tsData.rawBuf, pTSBuf->tsData.len, pTSBuf->tsData.len / TSDB_KEYSIZE, pBlock->payload,
-                          pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
-
-  int64_t r = fseek(pTSBuf->f, pTSBuf->fileSize, SEEK_SET);
-  UNUSED(r);
-
-  /*
-   * format for output data:
-   * 1. tags, number of ts, size after compressed, payload, size after compressed
-   * 2. tags, number of ts, size after compressed, payload, size after compressed
-   *
-   * both side has the compressed length is used to support load data forwards/backwords.
-   */
-  fwrite(&pBlock->tag, sizeof(pBlock->tag), 1, pTSBuf->f);
-  fwrite(&pBlock->numOfElem, sizeof(pBlock->numOfElem), 1, pTSBuf->f);
-
-  fwrite(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
-
-  fwrite(pBlock->payload, (size_t)pBlock->compLen, 1, pTSBuf->f);
-
-  fwrite(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
-
-  int32_t blockSize = sizeof(pBlock->tag) + sizeof(pBlock->numOfElem) + sizeof(pBlock->compLen) * 2 + pBlock->compLen;
-  pTSBuf->fileSize += blockSize;
-
-  pTSBuf->tsData.len = 0;
-
-  STSVnodeBlockInfoEx* pVnodeBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
-
-  pVnodeBlockInfoEx->info.compLen += blockSize;
-  pVnodeBlockInfoEx->info.numOfBlocks += 1;
-
-  shrinkBuffer(&pTSBuf->tsData);
-}
-
-static void expandBuffer(STSList* ptsData, int32_t inputSize) {
-  if (ptsData->allocSize - ptsData->len < inputSize) {
-    int32_t newSize = inputSize + ptsData->len;
-    char*   tmp = realloc(ptsData->rawBuf, (size_t)newSize);
-    if (tmp == NULL) {
-      // todo
-    }
-
-    ptsData->rawBuf = tmp;
-    ptsData->allocSize = newSize;
-  }
-}
-
-STSBlock* readDataFromDisk(STSBuf* pTSBuf, int32_t order, bool decomp) {
-  STSBlock* pBlock = &pTSBuf->block;
-
-  // clear the memory buffer
-  void* tmp = pBlock->payload;
-  memset(pBlock, 0, sizeof(STSBlock));
-  pBlock->payload = tmp;
-
-  if (order == TSQL_SO_DESC) {
-    /*
-     * set the right position for the reversed traverse, the reversed traverse is started from
-     * the end of each comp data block
-     */
-    fseek(pTSBuf->f, -sizeof(pBlock->padding), SEEK_CUR);
-    fread(&pBlock->padding, sizeof(pBlock->padding), 1, pTSBuf->f);
-
-    pBlock->compLen = pBlock->padding;
-    int32_t offset = pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
-    fseek(pTSBuf->f, -offset, SEEK_CUR);
-  }
-
-  fread(&pBlock->tag, sizeof(pBlock->tag), 1, pTSBuf->f);
-  fread(&pBlock->numOfElem, sizeof(pBlock->numOfElem), 1, pTSBuf->f);
-
-  fread(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
-  fread(pBlock->payload, (size_t)pBlock->compLen, 1, pTSBuf->f);
-
-  if (decomp) {
-    pTSBuf->tsData.len =
-        tsDecompressTimestamp(pBlock->payload, pBlock->compLen, pBlock->numOfElem, pTSBuf->tsData.rawBuf,
-                              pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
-  }
-
-  // read the comp length at the length of comp block
-  fread(&pBlock->padding, sizeof(pBlock->padding), 1, pTSBuf->f);
-
-  // for backwards traverse, set the start position at the end of previous block
-  if (order == TSQL_SO_DESC) {
-    int32_t offset = pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
-    int64_t r = fseek(pTSBuf->f, -offset, SEEK_CUR);
-    UNUSED(r);
-  }
-
-  return pBlock;
-}
-
-// set the order of ts buffer if the ts order has not been set yet
-static int32_t setCheckTSOrder(STSBuf* pTSBuf, const char* pData, int32_t len) {
-  STSList* ptsData = &pTSBuf->tsData;
-
-  if (pTSBuf->tsOrder == -1) {
-    if (ptsData->len > 0) {
-      TSKEY lastKey = *(TSKEY*)(ptsData->rawBuf + ptsData->len - TSDB_KEYSIZE);
-
-      if (lastKey > *(TSKEY*)pData) {
-        pTSBuf->tsOrder = TSQL_SO_DESC;
-      } else {
-        pTSBuf->tsOrder = TSQL_SO_ASC;
-      }
-    } else if (len > TSDB_KEYSIZE) {
-      // no data in current vnode, more than one ts is added, check the orders
-      TSKEY k1 = *(TSKEY*)(pData);
-      TSKEY k2 = *(TSKEY*)(pData + TSDB_KEYSIZE);
-
-      if (k1 < k2) {
-        pTSBuf->tsOrder = TSQL_SO_ASC;
-      } else if (k1 > k2) {
-        pTSBuf->tsOrder = TSQL_SO_DESC;
-      } else {
-        // todo handle error
-      }
-    }
-  } else {
-    // todo the timestamp order is set, check the asc/desc order of appended data
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void tsBufAppend(STSBuf* pTSBuf, int32_t vnodeId, int64_t tag, const char* pData, int32_t len) {
-  STSVnodeBlockInfoEx* pBlockInfo = NULL;
-  STSList*             ptsData = &pTSBuf->tsData;
-
-  if (pTSBuf->numOfVnodes == 0 || tsBufGetLastVnodeInfo(pTSBuf)->info.vnode != vnodeId) {
-    writeDataToDisk(pTSBuf);
-    shrinkBuffer(ptsData);
-
-    pBlockInfo = addOneVnodeInfo(pTSBuf, vnodeId);
-  } else {
-    pBlockInfo = tsBufGetLastVnodeInfo(pTSBuf);
-  }
-
-  assert(pBlockInfo->info.vnode == vnodeId);
-
-  if (pTSBuf->block.tag != tag && ptsData->len > 0) {
-    // new arrived data with different tags value, save current value into disk first
-    writeDataToDisk(pTSBuf);
-  } else {
-    expandBuffer(ptsData, len);
-  }
-
-  pTSBuf->block.tag = tag;
-  memcpy(ptsData->rawBuf + ptsData->len, pData, (size_t)len);
-
-  // todo check return value
-  setCheckTSOrder(pTSBuf, pData, len);
-
-  ptsData->len += len;
-  pBlockInfo->len += len;
-
-  pTSBuf->numOfTotal += len / TSDB_KEYSIZE;
-
-  // the size of raw data exceeds the size of the default prepared buffer, so
-  // during getBufBlock, the output buffer needs to be large enough.
-  if (ptsData->len >= ptsData->threshold) {
-    writeDataToDisk(pTSBuf);
-    shrinkBuffer(ptsData);
-  }
-
-  tsBufResetPos(pTSBuf);
-}
-
-void tsBufFlush(STSBuf* pTSBuf) {
-  if (pTSBuf->tsData.len <= 0) {
-    return;
-  }
-
-  writeDataToDisk(pTSBuf);
-  shrinkBuffer(&pTSBuf->tsData);
-
-  STSVnodeBlockInfoEx* pBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
-
-  // update prev vnode length info in file
-  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, &pBlockInfoEx->info);
-
-  // save the ts order into header
-  STSBufFileHeader header = {
-      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
-  STSBufUpdateHeader(pTSBuf, &header);
-
-  fsync(fileno(pTSBuf->f));
-}
-
-static int32_t tsBufFindVnodeIndexFromId(STSVnodeBlockInfoEx* pVnodeInfoEx, int32_t numOfVnodes, int32_t vnodeId) {
-  int32_t j = -1;
-  for (int32_t i = 0; i < numOfVnodes; ++i) {
-    if (pVnodeInfoEx[i].info.vnode == vnodeId) {
-      j = i;
-      break;
-    }
-  }
-
-  return j;
-}
-
-// todo opt performance by cache blocks info
-static int32_t tsBufFindBlock(STSBuf* pTSBuf, STSVnodeBlockInfo* pBlockInfo, int32_t blockIndex) {
-  if (fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET) != 0) {
-    return -1;
-  }
-
-  // sequentially read the compressed data blocks, start from the beginning of the comp data block of this vnode
-  int32_t i = 0;
-  bool    decomp = false;
-
-  while ((i++) <= blockIndex) {
-    if (readDataFromDisk(pTSBuf, TSQL_SO_ASC, decomp) == NULL) {
-      return -1;
-    }
-  }
-
-  // set the file position to be the end of previous comp block
-  if (pTSBuf->cur.order == TSQL_SO_DESC) {
-    STSBlock* pBlock = &pTSBuf->block;
-    int32_t   compBlockSize =
-        pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
-    fseek(pTSBuf->f, -compBlockSize, SEEK_CUR);
-  }
-
-  return 0;
-}
-
-static int32_t tsBufFindBlockByTag(STSBuf* pTSBuf, STSVnodeBlockInfo* pBlockInfo, int64_t tag) {
-  bool decomp = false;
-
-  int64_t offset = 0;
-  if (pTSBuf->cur.order == TSQL_SO_ASC) {
-    offset = pBlockInfo->offset;
-  } else {  // reversed traverse starts from the end of block
-    offset = pBlockInfo->offset + pBlockInfo->compLen;
-  }
-
-  if (fseek(pTSBuf->f, offset, SEEK_SET) != 0) {
-    return -1;
-  }
-
-  for (int32_t i = 0; i < pBlockInfo->numOfBlocks; ++i) {
-    if (readDataFromDisk(pTSBuf, pTSBuf->cur.order, decomp) == NULL) {
-      return -1;
-    }
-
-    if (pTSBuf->block.tag == tag) {
-      return i;
-    }
-  }
-
-  return -1;
-}
-
-static void tsBufGetBlock(STSBuf* pTSBuf, int32_t vnodeIndex, int32_t blockIndex) {
-  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[vnodeIndex].info;
-  if (pBlockInfo->numOfBlocks <= blockIndex) {
-    assert(false);
-  }
-
-  STSCursor* pCur = &pTSBuf->cur;
-  if (pCur->vnodeIndex == vnodeIndex && ((pCur->blockIndex <= blockIndex && pCur->order == TSQL_SO_ASC) ||
-                                         (pCur->blockIndex >= blockIndex && pCur->order == TSQL_SO_DESC))) {
-    int32_t i = 0;
-    bool    decomp = false;
-    int32_t step = abs(blockIndex - pCur->blockIndex);
-
-    while ((++i) <= step) {
-      if (readDataFromDisk(pTSBuf, pCur->order, decomp) == NULL) {
-        return;
-      }
-    }
-  } else {
-    if (tsBufFindBlock(pTSBuf, pBlockInfo, blockIndex) == -1) {
-      assert(false);
-    }
-  }
-
-  STSBlock* pBlock = &pTSBuf->block;
-
-  size_t s = pBlock->numOfElem * TSDB_KEYSIZE;
-
-  /*
-   * In order to accommodate all the qualified data, the actual buffer size for one block with identical tags value
-   * may exceed the maximum allowed size during *tsBufAppend* function by invoking expandBuffer function
-   */
-  if (s > pTSBuf->tsData.allocSize) {
-    expandBuffer(&pTSBuf->tsData, s);
-  }
-
-  pTSBuf->tsData.len =
-      tsDecompressTimestamp(pBlock->payload, pBlock->compLen, pBlock->numOfElem, pTSBuf->tsData.rawBuf,
-                            pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
-
-  assert((pTSBuf->tsData.len / TSDB_KEYSIZE == pBlock->numOfElem) && (pTSBuf->tsData.allocSize >= pTSBuf->tsData.len));
-
-  pCur->vnodeIndex = vnodeIndex;
-  pCur->blockIndex = blockIndex;
-
-  pCur->tsIndex = (pCur->order == TSQL_SO_ASC) ? 0 : pBlock->numOfElem - 1;
-}
-
-STSVnodeBlockInfo* tsBufGetVnodeBlockInfo(STSBuf* pTSBuf, int32_t vnodeId) {
-  int32_t j = tsBufFindVnodeIndexFromId(pTSBuf->pData, pTSBuf->numOfVnodes, vnodeId);
-  if (j == -1) {
-    return NULL;
-  }
-
-  return &pTSBuf->pData[j].info;
-}
-
-int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader) {
-  if ((pTSBuf->f == NULL) || pHeader == NULL || pHeader->numOfVnode < 0 || pHeader->magic != TS_COMP_FILE_MAGIC) {
-    return -1;
-  }
-
-  int64_t r = fseek(pTSBuf->f, 0, SEEK_SET);
-  if (r != 0) {
-    return -1;
-  }
-
-  fwrite(pHeader, sizeof(STSBufFileHeader), 1, pTSBuf->f);
-  return 0;
-}
-
-bool tsBufNextPos(STSBuf* pTSBuf) {
-  if (pTSBuf == NULL || pTSBuf->numOfVnodes == 0) {
-    return false;
-  }
-
-  STSCursor* pCur = &pTSBuf->cur;
-
-  // get the first/last position according to traverse order
-  if (pCur->vnodeIndex == -1) {
-    if (pCur->order == TSQL_SO_ASC) {
-      tsBufGetBlock(pTSBuf, 0, 0);
-
-      if (pTSBuf->block.numOfElem == 0) {  // the whole list is empty, return
-        tsBufResetPos(pTSBuf);
-        return false;
-      } else {
-        return true;
-      }
-
-    } else {  // get the last timestamp record in the last block of the last vnode
-      assert(pTSBuf->numOfVnodes > 0);
-
-      int32_t vnodeIndex = pTSBuf->numOfVnodes - 1;
-      pCur->vnodeIndex = vnodeIndex;
-
-      int32_t            vnodeId = pTSBuf->pData[pCur->vnodeIndex].info.vnode;
-      STSVnodeBlockInfo* pBlockInfo = tsBufGetVnodeBlockInfo(pTSBuf, vnodeId);
-      int32_t            blockIndex = pBlockInfo->numOfBlocks - 1;
-
-      tsBufGetBlock(pTSBuf, vnodeIndex, blockIndex);
-
-      pCur->tsIndex = pTSBuf->block.numOfElem - 1;
-      if (pTSBuf->block.numOfElem == 0) {
-        tsBufResetPos(pTSBuf);
-        return false;
-      } else {
-        return true;
-      }
-    }
-  }
-
-  int32_t step = pCur->order == TSQL_SO_ASC ? 1 : -1;
-
-  while (1) {
-    assert(pTSBuf->tsData.len == pTSBuf->block.numOfElem * TSDB_KEYSIZE);
-
-    if ((pCur->order == TSQL_SO_ASC && pCur->tsIndex >= pTSBuf->block.numOfElem - 1) ||
-        (pCur->order == TSQL_SO_DESC && pCur->tsIndex <= 0)) {
-      int32_t vnodeId = pTSBuf->pData[pCur->vnodeIndex].info.vnode;
-
-      STSVnodeBlockInfo* pBlockInfo = tsBufGetVnodeBlockInfo(pTSBuf, vnodeId);
-      if (pBlockInfo == NULL || (pCur->blockIndex >= pBlockInfo->numOfBlocks - 1 && pCur->order == TSQL_SO_ASC) ||
-          (pCur->blockIndex <= 0 && pCur->order == TSQL_SO_DESC)) {
-        if ((pCur->vnodeIndex >= pTSBuf->numOfVnodes - 1 && pCur->order == TSQL_SO_ASC) ||
-            (pCur->vnodeIndex <= 0 && pCur->order == TSQL_SO_DESC)) {
-          pCur->vnodeIndex = -1;
-          return false;
-        }
-        
-        if (pBlockInfo == NULL) {
-          return false;
-        }
-
-        int32_t blockIndex = pCur->order == TSQL_SO_ASC ? 0 : pBlockInfo->numOfBlocks - 1;
-        tsBufGetBlock(pTSBuf, pCur->vnodeIndex + step, blockIndex);
-        break;
-
-      } else {
-        tsBufGetBlock(pTSBuf, pCur->vnodeIndex, pCur->blockIndex + step);
-        break;
-      }
-    } else {
-      pCur->tsIndex += step;
-      break;
-    }
-  }
-
-  return true;
-}
-
-void tsBufResetPos(STSBuf* pTSBuf) {
-  if (pTSBuf == NULL) {
-    return;
-  }
-
-  pTSBuf->cur = (STSCursor){.tsIndex = -1, .blockIndex = -1, .vnodeIndex = -1, .order = pTSBuf->cur.order};
-}
-
-STSElem tsBufGetElem(STSBuf* pTSBuf) {
-  STSElem    elem1 = {.vnode = -1};
-  STSCursor* pCur = &pTSBuf->cur;
-
-  if (pTSBuf == NULL || pCur->vnodeIndex < 0) {
-    return elem1;
-  }
-
-  STSBlock* pBlock = &pTSBuf->block;
-
-  elem1.vnode = pTSBuf->pData[pCur->vnodeIndex].info.vnode;
-  elem1.ts = *(TSKEY*)(pTSBuf->tsData.rawBuf + pCur->tsIndex * TSDB_KEYSIZE);
-  elem1.tag = pBlock->tag;
-
-  return elem1;
-}
-
-/**
- * current only support ts comp data from two vnode merge
- * @param pDestBuf
- * @param pSrcBuf
- * @param vnodeId
- * @return
- */
-int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf, int32_t vnodeId) {
-  if (pDestBuf == NULL || pSrcBuf == NULL || pSrcBuf->numOfVnodes <= 0) {
-    return 0;
-  }
-
-  if (pDestBuf->numOfVnodes + pSrcBuf->numOfVnodes > TS_COMP_FILE_VNODE_MAX) {
-    return -1;
-  }
-
-  // src can only have one vnode index
-  if (pSrcBuf->numOfVnodes > 1) {
-    return -1;
-  }
-
-  // there are data in buffer, flush to disk first
-  tsBufFlush(pDestBuf);
-
-  // compared with the last vnode id
-  if (vnodeId != tsBufGetLastVnodeInfo(pDestBuf)->info.vnode) {
-    int32_t oldSize = pDestBuf->numOfVnodes;
-    int32_t newSize = oldSize + pSrcBuf->numOfVnodes;
-
-    if (pDestBuf->numOfAlloc < newSize) {
-      pDestBuf->numOfAlloc = newSize;
-
-      STSVnodeBlockInfoEx* tmp = realloc(pDestBuf->pData, sizeof(STSVnodeBlockInfoEx) * newSize);
-      if (tmp == NULL) {
-        return -1;
-      }
-
-      pDestBuf->pData = tmp;
-    }
-
-    // directly copy the vnode index information
-    memcpy(&pDestBuf->pData[oldSize], pSrcBuf->pData, (size_t)pSrcBuf->numOfVnodes * sizeof(STSVnodeBlockInfoEx));
-
-    // set the new offset value
-    for (int32_t i = 0; i < pSrcBuf->numOfVnodes; ++i) {
-      STSVnodeBlockInfoEx* pBlockInfoEx = &pDestBuf->pData[i + oldSize];
-      pBlockInfoEx->info.offset = (pSrcBuf->pData[i].info.offset - getDataStartOffset()) + pDestBuf->fileSize;
-      pBlockInfoEx->info.vnode = vnodeId;
-    }
-
-    pDestBuf->numOfVnodes = newSize;
-  } else {
-    STSVnodeBlockInfoEx* pBlockInfoEx = tsBufGetLastVnodeInfo(pDestBuf);
-
-    pBlockInfoEx->len += pSrcBuf->pData[0].len;
-    pBlockInfoEx->info.numOfBlocks += pSrcBuf->pData[0].info.numOfBlocks;
-    pBlockInfoEx->info.compLen += pSrcBuf->pData[0].info.compLen;
-    pBlockInfoEx->info.vnode = vnodeId;
-  }
-
-  int32_t r = fseek(pDestBuf->f, 0, SEEK_END);
-  assert(r == 0);
-
-  int64_t offset = getDataStartOffset();
-  int32_t size = pSrcBuf->fileSize - offset;
-
-#ifdef LINUX
-  ssize_t rc = tsendfile(fileno(pDestBuf->f), fileno(pSrcBuf->f), &offset, size);
-#else
-  ssize_t rc = fsendfile(pDestBuf->f, pSrcBuf->f, &offset, size);
-#endif
-
-  if (rc == -1) {
-    tscError("failed to merge tsBuf from:%s to %s, reason:%s\n", pSrcBuf->path, pDestBuf->path, strerror(errno));
-    return -1;
-  }
-
-  if (rc != size) {
-    tscError("failed to merge tsBuf from:%s to %s, reason:%s\n", pSrcBuf->path, pDestBuf->path, strerror(errno));
-    return -1;
-  }
-
-  pDestBuf->numOfTotal += pSrcBuf->numOfTotal;
-
-  int32_t oldSize = pDestBuf->fileSize;
-
-  struct stat fileStat;
-  fstat(fileno(pDestBuf->f), &fileStat);
-  pDestBuf->fileSize = (uint32_t)fileStat.st_size;
-
-  assert(pDestBuf->fileSize == oldSize + size);
-
-  tscTrace("tsBuf merge success, %p, path:%s, fd:%d, file size:%d, numOfVnode:%d, autoDelete:%d", pDestBuf,
-           pDestBuf->path, fileno(pDestBuf->f), pDestBuf->fileSize, pDestBuf->numOfVnodes, pDestBuf->autoDelete);
-
-  return 0;
-}
-
-STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_t len, int32_t order) {
-  STSBuf* pTSBuf = tsBufCreate(true);
-
-  STSVnodeBlockInfo* pBlockInfo = &(addOneVnodeInfo(pTSBuf, 0)->info);
-  pBlockInfo->numOfBlocks = numOfBlocks;
-  pBlockInfo->compLen = len;
-  pBlockInfo->offset = getDataStartOffset();
-  pBlockInfo->vnode = 0;
-
-  // update prev vnode length info in file
-  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, pBlockInfo);
-
-  fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET);
-  fwrite((void*)pData, 1, len, pTSBuf->f);
-  pTSBuf->fileSize += len;
-
-  pTSBuf->tsOrder = order;
-  assert(order == TSQL_SO_ASC || order == TSQL_SO_DESC);
-
-  STSBufFileHeader header = {
-      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
-  STSBufUpdateHeader(pTSBuf, &header);
-
-  fsync(fileno(pTSBuf->f));
-
-  return pTSBuf;
-}
-
-STSElem tsBufGetElemStartPos(STSBuf* pTSBuf, int32_t vnodeId, int64_t tag) {
-  STSElem elem = {.vnode = -1};
-
-  if (pTSBuf == NULL) {
-    return elem;
-  }
-
-  int32_t j = tsBufFindVnodeIndexFromId(pTSBuf->pData, pTSBuf->numOfVnodes, vnodeId);
-  if (j == -1) {
-    return elem;
-  }
-
-  // for debug purpose
-  //  tsBufDisplay(pTSBuf);
-
-  STSCursor*         pCur = &pTSBuf->cur;
-  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[j].info;
-
-  int32_t blockIndex = tsBufFindBlockByTag(pTSBuf, pBlockInfo, tag);
-  if (blockIndex < 0) {
-    return elem;
-  }
-
-  pCur->vnodeIndex = j;
-  pCur->blockIndex = blockIndex;
-  tsBufGetBlock(pTSBuf, j, blockIndex);
-
-  return tsBufGetElem(pTSBuf);
-}
-
-STSCursor tsBufGetCursor(STSBuf* pTSBuf) {
-  STSCursor c = {.vnodeIndex = -1};
-  if (pTSBuf == NULL) {
-    return c;
-  }
-
-  return pTSBuf->cur;
-}
-
-void tsBufSetCursor(STSBuf* pTSBuf, STSCursor* pCur) {
-  if (pTSBuf == NULL || pCur == NULL) {
-    return;
-  }
-
-  //  assert(pCur->vnodeIndex != -1 && pCur->tsIndex >= 0 && pCur->blockIndex >= 0);
-  if (pCur->vnodeIndex != -1) {
-    tsBufGetBlock(pTSBuf, pCur->vnodeIndex, pCur->blockIndex);
-  }
-
-  pTSBuf->cur = *pCur;
-}
-
-void tsBufSetTraverseOrder(STSBuf* pTSBuf, int32_t order) {
-  if (pTSBuf == NULL) {
-    return;
-  }
-
-  pTSBuf->cur.order = order;
-}
-
-STSBuf* tsBufClone(STSBuf* pTSBuf) {
-  if (pTSBuf == NULL) {
-    return NULL;
-  }
-
-  return tsBufCreateFromFile(pTSBuf->path, false);
-}
-
-void tsBufDisplay(STSBuf* pTSBuf) {
-  printf("-------start of ts comp file-------\n");
-  printf("number of vnode:%d\n", pTSBuf->numOfVnodes);
-
-  int32_t old = pTSBuf->cur.order;
-  pTSBuf->cur.order = TSQL_SO_ASC;
-
-  tsBufResetPos(pTSBuf);
-
-  while (tsBufNextPos(pTSBuf)) {
-    STSElem elem = tsBufGetElem(pTSBuf);
-    printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, *(int64_t*) elem.tag, elem.ts);
-  }
-
-  pTSBuf->cur.order = old;
-  printf("-------end of ts comp file-------\n");
-}
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 402838bb680b7d4e61c3e17415eb4b7450944ccd..030b033653613faf1cc3071bedfaf79613f17ae6 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -16,17 +16,38 @@
 #include "os.h"
 #include "taosmsg.h"
 
+#include "taosdef.h"
 #include "tcache.h"
+#include "tname.h"
+#include "tscLog.h"
 #include "tscUtil.h"
-#include "tsclient.h"
-#include "ttypes.h"
-
-#include "textbuffer.h"
-#include "tscSecondaryMerge.h"
 #include "tschemautil.h"
-#include "tsocket.h"
-
-static void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, size_t valueLength);
+#include "tsclient.h"
+#include "taos.h"
+#include "tscSubquery.h"
+
+#define STR_NOCASE_EQUAL(str1, len1, str2, len2) ((len1 == len2) && 0 == strncasecmp(str1, str2, len1)) 
+
+typedef enum BuildType {
+  SCREATE_BUILD_TABLE = 1, 
+  SCREATE_BUILD_DB    = 2, 
+} BuildType; 
+
+typedef enum Stage {
+  SCREATE_CALLBACK_QUERY    = 1,
+  SCREATE_CALLBACK_RETRIEVE = 2,
+} Stage;
+
+// support 'show create table'   
+typedef struct SCreateBuilder {
+  char sTableName[TSDB_TABLE_FNAME_LEN];
+  char buf[TSDB_TABLE_FNAME_LEN];
+  SSqlObj *pParentSql; 
+  SSqlObj *pInterSql;
+  int32_t (*fp)(void *para, char* result);
+  Stage callStage;
+} SCreateBuilder; 
+static void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, int16_t type, size_t valueLength);
 
 static int32_t getToStringLength(const char *pData, int32_t length, int32_t type) {
   char buf[512] = {0};
@@ -56,7 +77,7 @@ static int32_t getToStringLength(const char *pData, int32_t length, int32_t type
     } break;
     case TSDB_DATA_TYPE_TIMESTAMP:
     case TSDB_DATA_TYPE_BIGINT:
-      len = sprintf(buf, "%" PRId64 "", *(int64_t *)pData);
+      len = sprintf(buf, "%" PRId64, *(int64_t *)pData);
       break;
     case TSDB_DATA_TYPE_BOOL:
       len = MAX_BOOL_TYPE_LENGTH;
@@ -77,20 +98,22 @@ static int32_t getToStringLength(const 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 = tscGetMeterMetaInfo(&pSql->cmd, 0, 0)->pMeterMeta;
+  STableMeta *pMeta = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0)->pTableMeta;
 
-  if (pMeta->meterType == TSDB_METER_METRIC || pMeta->meterType == TSDB_METER_OTABLE ||
-      pMeta->meterType == TSDB_METER_STABLE) {
+  if (pMeta->tableType == TSDB_SUPER_TABLE || pMeta->tableType == TSDB_NORMAL_TABLE ||
+      pMeta->tableType == TSDB_STREAM_TABLE) {
     return 0;
   }
 
   char *   pTagValue = tsGetTagsValue(pMeta);
-  SSchema *pTagsSchema = tsGetTagSchema(pMeta);
+  SSchema *pTagsSchema = tscGetTableTagSchema(pMeta);
 
   int32_t len = getToStringLength(pTagValue, pTagsSchema[0].bytes, pTagsSchema[0].type);
 
   pTagValue += pTagsSchema[0].bytes;
-  for (int32_t i = 1; i < pMeta->numOfTags; ++i) {
+  int32_t numOfTags = tscGetNumOfTags(pMeta);
+  
+  for (int32_t i = 1; i < numOfTags; ++i) {
     int32_t tLen = getToStringLength(pTagValue, pTagsSchema[i].bytes, pTagsSchema[i].type);
     if (len < tLen) {
       len = tLen;
@@ -108,8 +131,8 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
   // one column for each row
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  SMeterMeta *    pMeta = pMeterMetaInfo->pMeterMeta;
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableMeta *    pMeta = pTableMetaInfo->pTableMeta;
 
   /*
    * tagValueCnt is to denote the number of tags columns for meter, not metric. and is to show the column data.
@@ -117,42 +140,49 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
    * for metric, the value of tagValueCnt must be 0, but the numOfTags is not 0
    */
 
-  int32_t numOfRows = pMeta->numOfColumns;
-  int32_t totalNumOfRows = numOfRows + pMeta->numOfTags;
+  int32_t numOfRows = tscGetNumOfColumns(pMeta);
+  int32_t totalNumOfRows = numOfRows + tscGetNumOfTags(pMeta);
 
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    numOfRows = pMeta->numOfColumns + pMeta->numOfTags;
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    numOfRows = numOfRows + tscGetNumOfTags(pMeta);
   }
 
   tscInitResObjForLocalQuery(pSql, totalNumOfRows, rowLen);
-  SSchema *pSchema = tsGetSchema(pMeta);
+  SSchema *pSchema = tscGetTableSchema(pMeta);
 
   for (int32_t i = 0; i < numOfRows; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, 0);
-    strncpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * totalNumOfRows + pField->bytes * i, pSchema[i].name,
-            TSDB_COL_NAME_LEN);
+    TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 0);
+    char* dst = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * totalNumOfRows + pField->bytes * i;
+    STR_WITH_MAXSIZE_TO_VARSTR(dst, pSchema[i].name, pField->bytes);
 
     char *type = tDataTypeDesc[pSchema[i].type].aName;
 
-    pField = tscFieldInfoGetField(pQueryInfo, 1);
-    strncpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 1) * totalNumOfRows + pField->bytes * i, type, pField->bytes);
-
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 1);
+    dst = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 1) * totalNumOfRows + pField->bytes * i;
+    
+    STR_WITH_MAXSIZE_TO_VARSTR(dst, type, pField->bytes);
+    
     int32_t bytes = pSchema[i].bytes;
-    if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
-      bytes = bytes / TSDB_NCHAR_SIZE;
+    if (pSchema[i].type == TSDB_DATA_TYPE_BINARY || pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+      bytes -= VARSTR_HEADER_SIZE;
+      
+      if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+        bytes = bytes / TSDB_NCHAR_SIZE;
+      }
     }
 
-    pField = tscFieldInfoGetField(pQueryInfo, 2);
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 2);
     *(int32_t *)(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 2) * totalNumOfRows + pField->bytes * i) = bytes;
 
-    pField = tscFieldInfoGetField(pQueryInfo, 3);
-    if (i >= pMeta->numOfColumns && pMeta->numOfTags != 0) {
-      strncpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 3) * totalNumOfRows + pField->bytes * i, "tag",
-              strlen("tag") + 1);
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 3);
+    if (i >= tscGetNumOfColumns(pMeta) && tscGetNumOfTags(pMeta) != 0) {
+      char* output = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 3) * totalNumOfRows + pField->bytes * i;
+      const char *src = "TAG";
+      STR_WITH_MAXSIZE_TO_VARSTR(output, src, pField->bytes);
     }
   }
 
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
     return 0;
   }
 
@@ -160,70 +190,35 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
   char *pTagValue = tsGetTagsValue(pMeta);
   for (int32_t i = numOfRows; i < totalNumOfRows; ++i) {
     // field name
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, 0);
-    strncpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * totalNumOfRows + pField->bytes * i, pSchema[i].name,
-            TSDB_COL_NAME_LEN);
+    TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 0);
+    char* output = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * totalNumOfRows + pField->bytes * i;
+    STR_WITH_MAXSIZE_TO_VARSTR(output, pSchema[i].name, pField->bytes);
 
     // type name
-    pField = tscFieldInfoGetField(pQueryInfo, 1);
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 1);
     char *type = tDataTypeDesc[pSchema[i].type].aName;
-    strncpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 1) * totalNumOfRows + pField->bytes * i, type, pField->bytes);
+    
+    output = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 1) * totalNumOfRows + pField->bytes * i;
+    STR_WITH_MAXSIZE_TO_VARSTR(output, type, pField->bytes);
 
     // type length
     int32_t bytes = pSchema[i].bytes;
-    pField = tscFieldInfoGetField(pQueryInfo, 2);
-    if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
-      bytes = bytes / TSDB_NCHAR_SIZE;
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 2);
+    if (pSchema[i].type == TSDB_DATA_TYPE_BINARY || pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+      bytes -= VARSTR_HEADER_SIZE;
+      
+      if (pSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+        bytes = bytes / TSDB_NCHAR_SIZE;
+      }
     }
 
     *(int32_t *)(pRes->data + tscFieldInfoGetOffset(pQueryInfo, 2) * totalNumOfRows + pField->bytes * i) = bytes;
 
     // tag value
-    pField = tscFieldInfoGetField(pQueryInfo, 3);
+    pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 3);
     char *target = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 3) * totalNumOfRows + pField->bytes * i;
-
-    if (isNull(pTagValue, pSchema[i].type)) {
-      sprintf(target, "%s", TSDB_DATA_NULL_STR);
-    } else {
-      switch (pSchema[i].type) {
-        case TSDB_DATA_TYPE_BINARY:
-          /* binary are not null-terminated string */
-          strncpy(target, pTagValue, pSchema[i].bytes);
-          break;
-        case TSDB_DATA_TYPE_NCHAR:
-          taosUcs4ToMbs(pTagValue, pSchema[i].bytes, target);
-          break;
-        case TSDB_DATA_TYPE_FLOAT: {
-          float fv = 0;
-          fv = GET_FLOAT_VAL(pTagValue);
-          sprintf(target, "%f", fv);
-        } break;
-        case TSDB_DATA_TYPE_DOUBLE: {
-          double dv = 0;
-          dv = GET_DOUBLE_VAL(pTagValue);
-          sprintf(target, "%lf", dv);
-        } break;
-        case TSDB_DATA_TYPE_TINYINT:
-          sprintf(target, "%d", *(int8_t *)pTagValue);
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          sprintf(target, "%d", *(int16_t *)pTagValue);
-          break;
-        case TSDB_DATA_TYPE_INT:
-          sprintf(target, "%d", *(int32_t *)pTagValue);
-          break;
-        case TSDB_DATA_TYPE_BIGINT:
-          sprintf(target, "%" PRId64 "", *(int64_t *)pTagValue);
-          break;
-        case TSDB_DATA_TYPE_BOOL: {
-          char *val = (*((int8_t *)pTagValue) == 0) ? "false" : "true";
-          sprintf(target, "%s", val);
-          break;
-        }
-        default:
-          break;
-      }
-    }
+    const char *src = "TAG";
+    STR_WITH_MAXSIZE_TO_VARSTR(target, src, pField->bytes);
 
     pTagValue += pSchema[i].bytes;
   }
@@ -231,276 +226,762 @@ static int32_t tscSetValueToResObj(SSqlObj *pSql, int32_t rowLen) {
   return 0;
 }
 
-static int32_t tscBuildMeterSchemaResultFields(SSqlObj *pSql, int32_t numOfCols, int32_t typeColLength,
+static int32_t tscBuildTableSchemaResultFields(SSqlObj *pSql, int32_t numOfCols, int32_t typeColLength,
                                                int32_t noteColLength) {
   int32_t  rowLen = 0;
-  SSqlCmd *pCmd = &pSql->cmd;
-  pCmd->numOfCols = numOfCols;
+  SColumnIndex index = {0};
+  
+  pSql->cmd.numOfCols = numOfCols;
 
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  pQueryInfo->order.order = TSQL_SO_ASC;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
 
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_BINARY, "Field", TSDB_COL_NAME_LEN);
-  rowLen += TSDB_COL_NAME_LEN;
+  TAOS_FIELD f = {.type = TSDB_DATA_TYPE_BINARY, .bytes = (TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE};
+  tstrncpy(f.name, "Field", sizeof(f.name));
+  
+  SFieldSupInfo* pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_BINARY,
+      (TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE, (TSDB_COL_NAME_LEN - 1), false);
+  
+  rowLen += ((TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE);
 
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 1, TSDB_DATA_TYPE_BINARY, "Type", typeColLength);
-  rowLen += typeColLength;
+  f.bytes = (int16_t)(typeColLength + VARSTR_HEADER_SIZE);
+  f.type = TSDB_DATA_TYPE_BINARY;
+  tstrncpy(f.name, "Type", sizeof(f.name));
+  
+  pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_BINARY, (int16_t)(typeColLength + VARSTR_HEADER_SIZE),
+      typeColLength, false);
+  
+  rowLen += typeColLength + VARSTR_HEADER_SIZE;
 
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 2, TSDB_DATA_TYPE_INT, "Length", sizeof(int32_t));
+  f.bytes = sizeof(int32_t);
+  f.type = TSDB_DATA_TYPE_INT;
+  tstrncpy(f.name, "Length", sizeof(f.name));
+  
+  pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_INT, sizeof(int32_t),
+      sizeof(int32_t), false);
+  
   rowLen += sizeof(int32_t);
 
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 3, TSDB_DATA_TYPE_BINARY, "Note", noteColLength);
-  rowLen += noteColLength;
-
+  f.bytes = (int16_t)(noteColLength + VARSTR_HEADER_SIZE);
+  f.type = TSDB_DATA_TYPE_BINARY;
+  tstrncpy(f.name, "Note", sizeof(f.name));
+  
+  pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_BINARY, (int16_t)(noteColLength + VARSTR_HEADER_SIZE),
+      noteColLength, false);
+  
+  rowLen += noteColLength + VARSTR_HEADER_SIZE;
   return rowLen;
 }
 
 static int32_t tscProcessDescribeTable(SSqlObj *pSql) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   
-  assert(tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0)->pMeterMeta != NULL);
+  assert(tscGetMetaInfo(pQueryInfo, 0)->pTableMeta != NULL);
 
-  const int32_t NUM_OF_DESCRIBE_TABLE_COLUMNS = 4;
+  const int32_t NUM_OF_DESC_TABLE_COLUMNS = 4;
   const int32_t TYPE_COLUMN_LENGTH = 16;
   const int32_t NOTE_COLUMN_MIN_LENGTH = 8;
 
-  int32_t note_field_length = tscMaxLengthOfTagsFields(pSql);
-  if (note_field_length == 0) {
-    note_field_length = NOTE_COLUMN_MIN_LENGTH;
+  int32_t noteFieldLen = tscMaxLengthOfTagsFields(pSql);
+  if (noteFieldLen == 0) {
+    noteFieldLen = NOTE_COLUMN_MIN_LENGTH;
   }
 
-  int32_t rowLen =
-      tscBuildMeterSchemaResultFields(pSql, NUM_OF_DESCRIBE_TABLE_COLUMNS, TYPE_COLUMN_LENGTH, note_field_length);
-  tscFieldInfoCalOffset(pQueryInfo);
+  int32_t rowLen = tscBuildTableSchemaResultFields(pSql, NUM_OF_DESC_TABLE_COLUMNS, TYPE_COLUMN_LENGTH, noteFieldLen);
+  tscFieldInfoUpdateOffset(pQueryInfo);
   return tscSetValueToResObj(pSql, rowLen);
 }
+static int32_t tscGetNthFieldResult(TAOS_ROW row, TAOS_FIELD* fields, int *lengths, int idx, char *result) {
+  const char *val = row[idx];
+  if (val == NULL) {
+    sprintf(result, "%s", TSDB_DATA_NULL_STR);
+    return -1;
+  } 
+  uint8_t type = fields[idx].type;
+  int32_t length = lengths[idx]; 
+
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL: 
+      sprintf(result, "%s", ((((int)(*((char *)val))) == 1) ? "true" : "false"));
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      sprintf(result, "%d", (int)(*((char *)val)));
+      break;
+    case TSDB_DATA_TYPE_SMALLINT: 
+      sprintf(result, "%d", (int)(*((short *)val)));
+      break;
+    case TSDB_DATA_TYPE_INT:
+      sprintf(result, "%d", *((int *)val));
+      break;
+    case TSDB_DATA_TYPE_BIGINT: 
+      sprintf(result, "%"PRId64, *((int64_t *)val)); 
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      sprintf(result, "%f", GET_FLOAT_VAL(val)); 
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      sprintf(result, "%f", GET_DOUBLE_VAL(val)); 
+      break;
+    case TSDB_DATA_TYPE_NCHAR:
+    case TSDB_DATA_TYPE_BINARY:
+      memcpy(result, val, length); 
+      break;
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      ///formatTimestamp(buf, *(int64_t*)val, TSDB_TIME_PRECISION_MICRO);
+      //memcpy(result, val, strlen(buf));
+      sprintf(result, "%"PRId64, *((int64_t *)val)); 
+      break;
+    default:
+      break; 
+  }
+  return 0;
+} 
+
+void tscSCreateCallBack(void *param, TAOS_RES *tres, int code) {
+  if (param == NULL || tres == NULL) {
+    return;
+  }  
+  SCreateBuilder *builder = (SCreateBuilder *)(param);
+  SSqlObj *pParentSql = builder->pParentSql;  
+  SSqlObj *pSql = (SSqlObj *)tres; 
+
+  SSqlRes *pRes = &pParentSql->res;
+  pRes->code = taos_errno(pSql); 
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    taos_free_result(pSql);  
+    free(builder);
+    tscQueueAsyncRes(pParentSql);
+    return;
+  }
 
-// todo add order support
-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;
-  SSqlRes *       pRes = &pSql->res;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if (builder->callStage == SCREATE_CALLBACK_QUERY) {
+    taos_fetch_rows_a(tres, tscSCreateCallBack, param);    
+    builder->callStage = SCREATE_CALLBACK_RETRIEVE;
+  } else {
+    char *result = calloc(1, TSDB_MAX_BINARY_LEN);
+    pRes->code = builder->fp(builder, result);
+
+    taos_free_result(pSql);  
+    free(builder);
+    free(result);
+
+    if (pRes->code == TSDB_CODE_SUCCESS) {
+      (*pParentSql->fp)(pParentSql->param, pParentSql, code);  
+    } else {
+      tscQueueAsyncRes(pParentSql);
+    }
+  }
+}
+
+TAOS_ROW tscFetchRow(void *param) {
+  SCreateBuilder *builder = (SCreateBuilder *)param;
+  if (builder == NULL) {
+    return NULL;
+  } 
+  SSqlObj *pSql = builder->pInterSql;
+  if (pSql == NULL || pSql->signature != pSql) {
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return NULL;
+  }
   
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+  
+  if (pRes->qhandle == 0 ||
+      pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT ||
+      pCmd->command == TSDB_SQL_INSERT) {
+    return NULL;
+  }
 
-  SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
-  SSchema *    pSchema = tsGetTagSchema(pMeterMetaInfo->pMeterMeta);
+  // set the sql object owner
+  tscSetSqlOwner(pSql);
+
+  // current data set are exhausted, fetch more data from node
+  if (pRes->row >= pRes->numOfRows && (pRes->completed != true || hasMoreVnodesToTry(pSql) || hasMoreClauseToTry(pSql)) &&
+      (pCmd->command == TSDB_SQL_RETRIEVE ||
+       pCmd->command == TSDB_SQL_RETRIEVE_LOCALMERGE ||
+       pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE ||
+       pCmd->command == TSDB_SQL_FETCH ||
+       pCmd->command == TSDB_SQL_SHOW ||
+       pCmd->command == TSDB_SQL_SHOW_CREATE_TABLE ||
+       pCmd->command == TSDB_SQL_SHOW_CREATE_DATABASE ||
+       pCmd->command == TSDB_SQL_SELECT ||
+       pCmd->command == TSDB_SQL_DESCRIBE_TABLE ||
+       pCmd->command == TSDB_SQL_SERV_STATUS ||
+       pCmd->command == TSDB_SQL_CURRENT_DB ||
+       pCmd->command == TSDB_SQL_SERV_VERSION ||
+       pCmd->command == TSDB_SQL_CLI_VERSION ||
+       pCmd->command == TSDB_SQL_CURRENT_USER )) {
+    taos_fetch_rows_a(pSql, tscSCreateCallBack, param);
+    return NULL;
+  }
 
-  int32_t vOffset[TSDB_MAX_COLUMNS] = {0};
+  void* data = doSetResultRowData(pSql, true);
 
-  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;
+  tscClearSqlOwner(pSql);
+  return data;
+}
+static int32_t tscGetTableTagValue(SCreateBuilder *builder, char *result) {
+  TAOS_ROW row = tscFetchRow(builder);
+  SSqlObj* pSql = builder->pInterSql;
+
+  if (row == NULL) {
+   return TSDB_CODE_MND_INVALID_TABLE_NAME;
+  }
+
+  int32_t* lengths = taos_fetch_lengths(pSql);  
+  int num_fields = taos_num_fields(pSql);
+  TAOS_FIELD *fields = taos_fetch_fields(pSql);
+
+  char buf[TSDB_COL_NAME_LEN + 16]; 
+  for (int i = 0; i < num_fields; i++) {
+    memset(buf, 0, sizeof(buf));
+    int32_t ret = tscGetNthFieldResult(row, fields, lengths, i, buf);
+
+    if (i == 0) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s", "(");
+    } 
+    if ((fields[i].type == TSDB_DATA_TYPE_NCHAR 
+        || fields[i].type == TSDB_DATA_TYPE_BINARY 
+        || fields[i].type == TSDB_DATA_TYPE_TIMESTAMP) && 0 == ret) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "\"%s\",", buf);
     } else {
-      vOffset[f] = vOffset[f - 1] + pSchema[tagColumnIndex].bytes;
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s,", buf);
+    }
+    if (i == num_fields - 1) {
+      sprintf(result + strlen(result) - 1, "%s", ")");
     }
+  }  
+
+  if (0 == strlen(result)) {
+   return TSDB_CODE_MND_INVALID_TABLE_NAME; 
   }
+  return TSDB_CODE_SUCCESS;
+}
 
-  int32_t totalNumOfResults = pMetricMeta->numOfMeters;
-  int32_t rowLen = tscGetResRowLength(pQueryInfo);
 
-  tscInitResObjForLocalQuery(pSql, totalNumOfResults, rowLen);
+// build 'show create table/database' result fields 
+static int32_t tscSCreateBuildResultFields(SSqlObj *pSql, BuildType type, const char *ddl) {
+  int32_t  rowLen = 0;
+  int16_t  ddlLen = (int16_t)strlen(ddl); 
+  SColumnIndex index = {0};
+  pSql->cmd.numOfCols = 2;
 
-  int32_t rowIdx = 0;
-  for (int32_t i = 0; i < pMetricMeta->numOfVnodes; ++i) {
-    SVnodeSidList *pSidList = (SVnodeSidList *)((char *)pMetricMeta + pMetricMeta->list[i]);
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
 
-    for (int32_t j = 0; j < pSidList->numOfSids; ++j) {
-      SMeterSidExtInfo *pSidExt = tscGetMeterSidInfo(pSidList, j);
-      
-      for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-        SColIndexEx *pColIndex = &tscSqlExprGet(pQueryInfo, k)->colInfo;
-        int16_t      offsetId = pColIndex->colIdx;
+  TAOS_FIELD f; 
+  if (type == SCREATE_BUILD_TABLE) {
+    f.type  = TSDB_DATA_TYPE_BINARY;
+    f.bytes = (TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+    tstrncpy(f.name, "Table", sizeof(f.name));
+  } else {
+    f.type  = TSDB_DATA_TYPE_BINARY;
+    f.bytes =  (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+    tstrncpy(f.name, "Database", sizeof(f.name));
+  } 
 
-        assert((pColIndex->flag & TSDB_COL_TAG) != 0);
+  SFieldSupInfo* pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_BINARY,
+      f.bytes, f.bytes - VARSTR_HEADER_SIZE, false);
 
-        char *      val = pSidExt->tags + vOffset[offsetId];
-        TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, k);
+  rowLen += f.bytes; 
 
-        memcpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, k) * totalNumOfResults + pField->bytes * rowIdx, val,
-               (size_t)pField->bytes);
-      }
-      rowIdx++;
-    }
+  f.bytes = (int16_t)(ddlLen + VARSTR_HEADER_SIZE);
+  f.type = TSDB_DATA_TYPE_BINARY;
+  if (type == SCREATE_BUILD_TABLE) {
+    tstrncpy(f.name, "Create Table", sizeof(f.name));
+  } else {
+    tstrncpy(f.name, "Create Database", sizeof(f.name));
   }
 
-  return 0;
-}
+  pInfo = tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+  pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index, TSDB_DATA_TYPE_BINARY, 
+      (int16_t)(ddlLen + VARSTR_HEADER_SIZE), ddlLen, false);
 
-static int tscBuildMetricTagSqlFunctionResult(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
+  rowLen += ddlLen + VARSTR_HEADER_SIZE;
+
+  return rowLen;
+}
+static int32_t tscSCreateSetValueToResObj(SSqlObj *pSql, int32_t rowLen, const char *tableName, const char *ddl) {
   SSqlRes *pRes = &pSql->res;
 
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  
-  SMetricMeta *pMetricMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0)->pMetricMeta;
-  int32_t      totalNumOfResults = 1;  // count function only produce one result
-  int32_t      rowLen = tscGetResRowLength(pQueryInfo);
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  int32_t numOfRows = 1;
+  if (strlen(ddl) == 0) {
+    
+  }
+  tscInitResObjForLocalQuery(pSql, numOfRows, rowLen);
 
-  tscInitResObjForLocalQuery(pSql, totalNumOfResults, rowLen);
+  TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 0);
+  char* dst = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 0) * numOfRows;
+  STR_WITH_MAXSIZE_TO_VARSTR(dst, tableName, pField->bytes);
 
-  int32_t rowIdx = 0;
-  for (int32_t i = 0; i < totalNumOfResults; ++i) {
-    for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-      SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
+  pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 1);
+  dst = pRes->data + tscFieldInfoGetOffset(pQueryInfo, 1) * numOfRows;
+  STR_WITH_MAXSIZE_TO_VARSTR(dst, ddl, pField->bytes);
+  return 0;
+}
+static int32_t tscSCreateBuildResult(SSqlObj *pSql, BuildType type, const char *str, const char *result) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0); 
+  int32_t rowLen = tscSCreateBuildResultFields(pSql, type, result);
 
-      if (pExpr->colInfo.colIdx == -1 && pExpr->functionId == TSDB_FUNC_COUNT) {
-        TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, k);
+  tscFieldInfoUpdateOffset(pQueryInfo);
+  return tscSCreateSetValueToResObj(pSql, rowLen, str, result);  
+}
+int32_t tscRebuildCreateTableStatement(void *param,char *result) {
+  SCreateBuilder *builder = (SCreateBuilder *)param;
+  int32_t code = TSDB_CODE_SUCCESS;
 
-        memcpy(pRes->data + tscFieldInfoGetOffset(pQueryInfo, i) * totalNumOfResults + pField->bytes * rowIdx,
-               &pMetricMeta->numOfMeters, sizeof(pMetricMeta->numOfMeters));
-      } else {
-        tscError("not support operations");
-        continue;
+  char *buf = calloc(1,TSDB_MAX_BINARY_LEN);
+  if (buf == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  code = tscGetTableTagValue(builder, buf);
+  if (code == TSDB_CODE_SUCCESS) {
+    snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "CREATE TABLE %s USING %s TAGS %s", builder->buf, builder->sTableName, buf);
+    code = tscSCreateBuildResult(builder->pParentSql, SCREATE_BUILD_TABLE, builder->buf, result);    
+  }  
+  free(buf);
+  return code;
+}
+
+static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
+  TAOS_ROW row = tscFetchRow(builder);
+  if (row == NULL) {
+   return TSDB_CODE_MND_DB_NOT_SELECTED; 
+  }
+  const char *showColumns[] = {"REPLICA", "QUORUM", "DAYS", "KEEP", "BLOCKS", NULL};
+
+  SSqlObj *pSql = builder->pInterSql;
+  TAOS_FIELD *fields = taos_fetch_fields(pSql);
+  int num_fields = taos_num_fields(pSql);
+
+  char buf[TSDB_DB_NAME_LEN + 64] = {0}; 
+  do {
+    int32_t* lengths = taos_fetch_lengths(pSql);  
+    int32_t ret = tscGetNthFieldResult(row, fields, lengths, 0, buf);
+    if (0 == ret && STR_NOCASE_EQUAL(buf, strlen(buf), builder->buf, strlen(builder->buf))) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "CREATE DATABASE %s", buf);  
+      for (int i = 1; i < num_fields; i++) {
+        for (int j = 0; showColumns[j] != NULL; j++) {
+          if (STR_NOCASE_EQUAL(fields[i].name, strlen(fields[i].name), showColumns[j], strlen(showColumns[j]))) {
+            memset(buf, 0, sizeof(buf));
+            ret = tscGetNthFieldResult(row, fields, lengths, i, buf);
+            if (ret == 0) {
+              snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), " %s %s", showColumns[j], buf); 
+            }
+          }
+        }
       }
+      break;
+    } 
+    
+    row = tscFetchRow(builder);
+  } while (row != NULL);
+
+  if (0 == strlen(result)) {
+   return TSDB_CODE_MND_DB_NOT_SELECTED; 
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+int32_t tscRebuildCreateDBStatement(void *param,char *result) {
+  SCreateBuilder *builder = (SCreateBuilder *)param;
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  char *buf = calloc(1, TSDB_MAX_BINARY_LEN);
+  if (buf == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+  code = tscGetDBInfo(param, buf);  
+  if (code == TSDB_CODE_SUCCESS) {
+    code = tscSCreateBuildResult(builder->pParentSql, SCREATE_BUILD_DB, builder->buf, buf);    
+  }
+  free(buf);
+  return code;
+}
+
+static int32_t tscGetTableTagColumnName(SSqlObj *pSql, char **result) {
+  char *buf = (char *)malloc(TSDB_MAX_BINARY_LEN);
+  if (buf == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY; 
+  }
+  buf[0] = 0;
+
+  STableMeta *pMeta = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0)->pTableMeta; 
+  if (pMeta->tableType == TSDB_SUPER_TABLE || pMeta->tableType == TSDB_NORMAL_TABLE ||
+      pMeta->tableType == TSDB_STREAM_TABLE) {
+    free(buf);
+    return TSDB_CODE_TSC_INVALID_VALUE;
+  } 
+
+  SSchema *pTagsSchema = tscGetTableTagSchema(pMeta);  
+  int32_t numOfTags = tscGetNumOfTags(pMeta);
+  for (int32_t i = 0; i < numOfTags; i++) {
+    if (i != numOfTags - 1) {
+      snprintf(buf + strlen(buf), TSDB_MAX_BINARY_LEN - strlen(buf), "%s,", pTagsSchema[i].name);  
+    } else {
+      snprintf(buf + strlen(buf), TSDB_MAX_BINARY_LEN - strlen(buf), "%s", pTagsSchema[i].name);
     }
-    rowIdx++;
+  }   
+
+  *result = buf;
+  return TSDB_CODE_SUCCESS;
+}  
+static int32_t tscRebuildDDLForSubTable(SSqlObj *pSql, const char *tableName, char *ddl) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableMeta *    pMeta = pTableMetaInfo->pTableMeta;
+
+  SSqlObj *pInterSql = (SSqlObj *)calloc(1, sizeof(SSqlObj)); 
+  if (pInterSql == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }  
+
+  SCreateBuilder *param = (SCreateBuilder *)malloc(sizeof(SCreateBuilder));    
+  if (param == NULL) {
+    free(pInterSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  return 0;
+  char fullName[TSDB_TABLE_FNAME_LEN] = {0};
+  extractDBName(pTableMetaInfo->name, fullName);
+  extractTableName(pMeta->sTableId, param->sTableName);
+  snprintf(fullName + strlen(fullName), TSDB_TABLE_FNAME_LEN - strlen(fullName),  ".%s", param->sTableName);
+  extractTableName(pTableMetaInfo->name, param->buf);
+
+  param->pParentSql = pSql;
+  param->pInterSql  = pInterSql;
+  param->fp         = tscRebuildCreateTableStatement;
+  param->callStage  = SCREATE_CALLBACK_QUERY;
+
+  char *query = (char *)calloc(1, TSDB_MAX_BINARY_LEN); 
+  if (query == NULL) {
+    free(param);
+    free(pInterSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  char *columns = NULL;
+  int32_t code = tscGetTableTagColumnName(pSql, &columns) ;
+  if (code != TSDB_CODE_SUCCESS) {
+    free(param); 
+    free(pInterSql);
+    free(query);
+    return code;
+  }
+
+  snprintf(query + strlen(query), TSDB_MAX_BINARY_LEN - strlen(query), "SELECT %s FROM %s WHERE TBNAME IN(\'%s\')", columns, fullName, param->buf);
+  doAsyncQuery(pSql->pTscObj, pInterSql, tscSCreateCallBack, param, query, strlen(query));
+  free(query);
+  free(columns);
+
+  return TSDB_CODE_TSC_ACTION_IN_PROGRESS; 
 }
+static int32_t tscRebuildDDLForNormalTable(SSqlObj *pSql, const char *tableName, char *ddl) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableMeta *    pMeta = pTableMetaInfo->pTableMeta;
 
-static int tscProcessQueryTags(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  
-  SMeterMeta *pMeterMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0)->pMeterMeta;
-  if (pMeterMeta == NULL || pMeterMeta->numOfTags == 0 || pMeterMeta->numOfColumns == 0) {
-    strcpy(pCmd->payload, "invalid table");
-    pSql->res.code = TSDB_CODE_INVALID_TABLE;
-    return pSql->res.code;
+  int32_t numOfRows = tscGetNumOfColumns(pMeta);
+  SSchema *pSchema = tscGetTableSchema(pMeta);
+
+  char *result = ddl;
+  sprintf(result, "create table %s (", tableName);
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    uint8_t type = pSchema[i].type;
+    if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s(%d),", pSchema[i].name,tDataTypeDesc[pSchema[i].type].aName,pSchema->bytes);
+    } else {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypeDesc[pSchema[i].type].aName); 
+    }
+  }
+  sprintf(result + strlen(result) - 1, "%s", ")");
+
+  return TSDB_CODE_SUCCESS;
+}
+static int32_t tscRebuildDDLForSuperTable(SSqlObj *pSql, const char *tableName, char *ddl) {
+  char *result = ddl;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableMeta *    pMeta = pTableMetaInfo->pTableMeta;
+
+  int32_t numOfRows = tscGetNumOfColumns(pMeta);
+  int32_t totalRows = numOfRows + tscGetNumOfTags(pMeta);
+  SSchema *pSchema = tscGetTableSchema(pMeta);
+
+  sprintf(result, "create table %s (", tableName);
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    uint8_t type = pSchema[i].type;
+    if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result),"%s %s(%d),", pSchema[i].name,tDataTypeDesc[pSchema[i].type].aName,pSchema->bytes);
+    } else {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypeDesc[type].aName); 
+    }
   }
+  snprintf(result + strlen(result) - 1, TSDB_MAX_BINARY_LEN - strlen(result), "%s %s", ")", "TAGS (");
 
-  SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 0);
-  if (pExpr->functionId == TSDB_FUNC_COUNT) {
-    return tscBuildMetricTagSqlFunctionResult(pSql);
+  for (int32_t i = numOfRows; i < totalRows; i++) {
+    uint8_t type = pSchema[i].type;
+    if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s(%d),", pSchema[i].name,tDataTypeDesc[pSchema[i].type].aName,pSchema->bytes);
+    } else {
+      snprintf(result + strlen(result), TSDB_MAX_BINARY_LEN - strlen(result), "%s %s,", pSchema[i].name, tDataTypeDesc[type].aName); 
+    }
+  }
+  sprintf(result + strlen(result) - 1, "%s", ")");
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t tscProcessShowCreateTable(SSqlObj *pSql) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  assert(pTableMetaInfo->pTableMeta != NULL);
+
+  char tableName[TSDB_TABLE_NAME_LEN] = {0};
+  extractTableName(pTableMetaInfo->name, tableName);
+
+  char *result = (char *)calloc(1, TSDB_MAX_BINARY_LEN);
+  int32_t code = TSDB_CODE_SUCCESS;
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    code = tscRebuildDDLForSuperTable(pSql, tableName, result);
+  } else if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+    code = tscRebuildDDLForNormalTable(pSql, tableName, result);
+  } else if (UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) {
+    code = tscRebuildDDLForSubTable(pSql, tableName, result);
   } else {
-    return tscBuildMetricTagProjectionResult(pSql);
+    code = TSDB_CODE_TSC_INVALID_VALUE;
   }
+
+  if (code == TSDB_CODE_SUCCESS) {
+    code = tscSCreateBuildResult(pSql, SCREATE_BUILD_TABLE, tableName, result);
+  } 
+  free(result);
+  return code;
 }
 
-static void tscProcessCurrentUser(SSqlObj *pSql) {
+static int32_t tscProcessShowCreateDatabase(SSqlObj *pSql) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  
-  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
-  tscSetLocalQueryResult(pSql, pSql->pTscObj->user, pExpr->aliasName, TSDB_USER_LEN);
+
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  SSqlObj *pInterSql = (SSqlObj *)calloc(1, sizeof(SSqlObj)); 
+  if (pInterSql == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }  
+
+  SCreateBuilder *param = (SCreateBuilder *)malloc(sizeof(SCreateBuilder));    
+  if (param == NULL) {
+    free(pInterSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+  extractTableName(pTableMetaInfo->name, param->buf);
+  param->pParentSql = pSql;
+  param->pInterSql  = pInterSql;
+  param->fp         = tscRebuildCreateDBStatement;
+  param->callStage  = SCREATE_CALLBACK_QUERY;
+   
+  const char *query = "show databases";
+  doAsyncQuery(pSql->pTscObj, pInterSql, tscSCreateCallBack, param, query, strlen(query));
+  return TSDB_CODE_TSC_ACTION_IN_PROGRESS;
+}
+static int32_t tscProcessCurrentUser(SSqlObj *pSql) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->resBytes = TSDB_USER_LEN + TSDB_DATA_TYPE_BINARY;
+  pExpr->resType = TSDB_DATA_TYPE_BINARY;
+
+  char* vx = calloc(1, pExpr->resBytes);
+  if (vx == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  size_t size = sizeof(pSql->pTscObj->user);
+  STR_WITH_MAXSIZE_TO_VARSTR(vx, pSql->pTscObj->user, size);
+
+  tscSetLocalQueryResult(pSql, vx, pExpr->aliasName, pExpr->resType, pExpr->resBytes);
+  free(vx);
+
+  return TSDB_CODE_SUCCESS;
 }
 
-static void tscProcessCurrentDB(SSqlObj *pSql) {
-  char db[TSDB_DB_NAME_LEN + 1] = {0};
+static int32_t tscProcessCurrentDB(SSqlObj *pSql) {
+  char db[TSDB_DB_NAME_LEN] = {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);
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->resType = TSDB_DATA_TYPE_BINARY;
+
+  size_t t = strlen(db);
+  pExpr->resBytes = TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE;
+
+  char* vx = calloc(1, pExpr->resBytes);
+  if (vx == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  
-  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
-  tscSetLocalQueryResult(pSql, db, pExpr->aliasName, TSDB_DB_NAME_LEN);
+
+  if (t == 0) {
+    setVardataNull(vx, TSDB_DATA_TYPE_BINARY);
+  } else {
+    STR_WITH_SIZE_TO_VARSTR(vx, db, (VarDataLenT)t);
+  }
+
+  tscSetLocalQueryResult(pSql, vx, pExpr->aliasName, pExpr->resType, pExpr->resBytes);
+  free(vx);
+
+  return TSDB_CODE_SUCCESS;
 }
 
-static void tscProcessServerVer(SSqlObj *pSql) {
+static int32_t tscProcessServerVer(SSqlObj *pSql) {
   const char* v = pSql->pTscObj->sversion;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  
-  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
-  tscSetLocalQueryResult(pSql, v, pExpr->aliasName, tListLen(pSql->pTscObj->sversion));
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->resType = TSDB_DATA_TYPE_BINARY;
+
+  size_t t = strlen(v);
+  pExpr->resBytes = (int16_t)(t + VARSTR_HEADER_SIZE);
+
+  char* vx = calloc(1, pExpr->resBytes);
+  if (vx == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+
+  }
+
+  STR_WITH_SIZE_TO_VARSTR(vx, v, (VarDataLenT)t);
+  tscSetLocalQueryResult(pSql, vx, pExpr->aliasName, pExpr->resType, pExpr->resBytes);
+
+  free(vx);
+  return TSDB_CODE_SUCCESS;
+
 }
 
-static void tscProcessClientVer(SSqlObj *pSql) {
+static int32_t tscProcessClientVer(SSqlObj *pSql) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  
-  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
-  tscSetLocalQueryResult(pSql, version, pExpr->aliasName, strlen(version));
+
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->resType = TSDB_DATA_TYPE_BINARY;
+
+  size_t t = strlen(version);
+  pExpr->resBytes = (int16_t)(t + VARSTR_HEADER_SIZE);
+
+  char* v = calloc(1, pExpr->resBytes);
+  if (v == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+
+  }
+
+  STR_WITH_SIZE_TO_VARSTR(v, version, (VarDataLenT)t);
+  tscSetLocalQueryResult(pSql, v, pExpr->aliasName, pExpr->resType, pExpr->resBytes);
+
+  free(v);
+  return TSDB_CODE_SUCCESS;
+
 }
 
-static void tscProcessServStatus(SSqlObj *pSql) {
+static int32_t 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;
+    if (pObj->pHb->res.code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+      pSql->res.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+      return pSql->res.code;
     }
   } else {
-    if (pSql->res.code == TSDB_CODE_NETWORK_UNAVAIL) {
-      return;
+    if (pSql->res.code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+      return pSql->res.code;
     }
   }
-  
+
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  
-  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
-  tscSetLocalQueryResult(pSql, "1", pExpr->aliasName, 2);
+
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  int32_t val = 1;
+  tscSetLocalQueryResult(pSql, (char*) &val, pExpr->aliasName, TSDB_DATA_TYPE_INT, sizeof(int32_t));
+  return TSDB_CODE_SUCCESS;
 }
 
-void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, size_t valueLength) {
+void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, int16_t type, size_t valueLength) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
   pCmd->numOfCols = 1;
-  
+
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  pQueryInfo->order.order = TSQL_SO_ASC;
-  
-  tscClearFieldInfo(&pQueryInfo->fieldsInfo);
-  
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_BINARY, columnName, valueLength);
-  tscInitResObjForLocalQuery(pSql, 1, valueLength);
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
+
+  tscFieldInfoClear(&pQueryInfo->fieldsInfo);
+  pQueryInfo->fieldsInfo.pFields = taosArrayInit(1, sizeof(TAOS_FIELD));
+  pQueryInfo->fieldsInfo.pSupportInfo = taosArrayInit(1, sizeof(SFieldSupInfo));
+
+  TAOS_FIELD f = tscCreateField((int8_t)type, columnName, (int16_t)valueLength);
+  tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+
+  tscInitResObjForLocalQuery(pSql, 1, (int32_t)valueLength);
 
-  TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, 0);
-  strncpy(pRes->data, val, pField->bytes);
+  TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, 0);
+  SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, 0);
+  pInfo->pSqlExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+
+  memcpy(pRes->data, val, pField->bytes);
 }
 
 int tscProcessLocalCmd(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
 
   if (pCmd->command == TSDB_SQL_CFG_LOCAL) {
-    pSql->res.code = (uint8_t)tsCfgDynamicOptions(pCmd->payload);
+    pRes->code = (uint8_t)taosCfgDynamicOptions(pCmd->payload);
   } else if (pCmd->command == TSDB_SQL_DESCRIBE_TABLE) {
-    pSql->res.code = (uint8_t)tscProcessDescribeTable(pSql);
-  } else if (pCmd->command == TSDB_SQL_RETRIEVE_TAGS) {
-    pSql->res.code = (uint8_t)tscProcessQueryTags(pSql);
+    pRes->code = (uint8_t)tscProcessDescribeTable(pSql);
   } else if (pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
     /*
      * 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;
+    pRes->qhandle = 0x1;
+    pRes->numOfRows = 0;
+  } else if (pCmd->command == TSDB_SQL_SHOW_CREATE_TABLE) {
+    pRes->code = tscProcessShowCreateTable(pSql); 
+  } else if (pCmd->command == TSDB_SQL_SHOW_CREATE_DATABASE) {
+    pRes->code = tscProcessShowCreateDatabase(pSql); 
   } else if (pCmd->command == TSDB_SQL_RESET_CACHE) {
-    taosClearDataCache(tscCacheHandle);
+    taosCacheEmpty(tscMetaCache);
+    pRes->code = TSDB_CODE_SUCCESS;
   } else if (pCmd->command == TSDB_SQL_SERV_VERSION) {
-    tscProcessServerVer(pSql);
+    pRes->code = tscProcessServerVer(pSql);
   } else if (pCmd->command == TSDB_SQL_CLI_VERSION) {
-    tscProcessClientVer(pSql);
+    pRes->code = tscProcessClientVer(pSql);
   } else if (pCmd->command == TSDB_SQL_CURRENT_USER) {
-    tscProcessCurrentUser(pSql);
+    pRes->code = tscProcessCurrentUser(pSql);
   } else if (pCmd->command == TSDB_SQL_CURRENT_DB) {
-    tscProcessCurrentDB(pSql);
+    pRes->code = tscProcessCurrentDB(pSql);
   } else if (pCmd->command == TSDB_SQL_SERV_STATUS) {
-    tscProcessServStatus(pSql);
+    pRes->code = tscProcessServStatus(pSql);
   } else {
-    pSql->res.code = TSDB_CODE_INVALID_SQL;
+    pRes->code = TSDB_CODE_TSC_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
-  int32_t code = pSql->res.code;
 
-  if (pSql->fp != NULL) {  // callback function
-    if (code == 0) {
-      (*pSql->fp)(pSql->param, pSql, 0);
-    } else {
-      tscQueueAsyncRes(pSql);
-    }
+  int32_t code = pRes->code;
+  if (code == TSDB_CODE_SUCCESS) {
+    (*pSql->fp)(pSql->param, pSql, code);
+  } else if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS){
+  } else {
+    tscQueueAsyncRes(pSql);
   }
-
   return code;
 }
diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
new file mode 100644
index 0000000000000000000000000000000000000000..19abbe32e5ce67b626dd94c3db9574d6a3afe6e8
--- /dev/null
+++ b/src/client/src/tscLocalMerge.c
@@ -0,0 +1,1580 @@
+/*
+ * 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 "os.h"
+#include "tlosertree.h"
+#include "tscUtil.h"
+#include "tschemautil.h"
+#include "tsclient.h"
+#include "tutil.h"
+#include "tscLog.h"
+#include "tscLocalMerge.h"
+
+typedef struct SCompareParam {
+  SLocalDataSource **pLocalData;
+  tOrderDescriptor * pDesc;
+  int32_t            num;
+  int32_t            groupOrderType;
+} SCompareParam;
+
+int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
+  int32_t pLeftIdx = *(int32_t *)pLeft;
+  int32_t pRightIdx = *(int32_t *)pRight;
+
+  SCompareParam *    pParam = (SCompareParam *)param;
+  tOrderDescriptor * pDesc = pParam->pDesc;
+  SLocalDataSource **pLocalData = pParam->pLocalData;
+
+  /* this input is exhausted, set the special value to denote this */
+  if (pLocalData[pLeftIdx]->rowIdx == -1) {
+    return 1;
+  }
+
+  if (pLocalData[pRightIdx]->rowIdx == -1) {
+    return -1;
+  }
+
+  if (pParam->groupOrderType == TSDB_ORDER_DESC) {  // desc
+    return compare_d(pDesc, pParam->num, pLocalData[pLeftIdx]->rowIdx, pLocalData[pLeftIdx]->filePage.data,
+                     pParam->num, pLocalData[pRightIdx]->rowIdx, pLocalData[pRightIdx]->filePage.data);
+  } else {
+    return compare_a(pDesc, pParam->num, pLocalData[pLeftIdx]->rowIdx, pLocalData[pLeftIdx]->filePage.data,
+                     pParam->num, pLocalData[pRightIdx]->rowIdx, pLocalData[pRightIdx]->filePage.data);
+  }
+}
+
+static void tscInitSqlContext(SSqlCmd *pCmd, 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 pRes structure is formatted in accordance with the pCmd object.
+   */
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t i = 0; i < size; ++i) {
+    SQLFunctionCtx *pCtx = &pReducer->pCtx[i];
+    SSqlExpr *      pExpr = tscSqlExprGet(pQueryInfo, i);
+
+    pCtx->aOutputBuf = pReducer->pResultBuf->data + pExpr->offset * pReducer->resColModel->capacity;
+    pCtx->order = pQueryInfo->order.order;
+    pCtx->functionId = pExpr->functionId;
+
+    // input buffer hold only one point data
+    int16_t  offset = getColumnModelOffset(pDesc->pColumnModel, i);
+    SSchema *pSchema = getColumnModelSchema(pDesc->pColumnModel, i);
+
+    pCtx->aInputElemBuf = pReducer->pTempBuffer->data + offset;
+
+    // input data format comes from pModel
+    pCtx->inputType = pSchema->type;
+    pCtx->inputBytes = pSchema->bytes;
+
+    // output data format yet comes from pCmd.
+    pCtx->outputBytes = pExpr->resBytes;
+    pCtx->outputType = pExpr->resType;
+
+    pCtx->startOffset = 0;
+    pCtx->size = 1;
+    pCtx->hasNull = true;
+    pCtx->currentStage = SECONDARY_STAGE_MERGE;
+
+    // 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 = pQueryInfo->order.order;
+      pCtx->param[2].nType  = TSDB_DATA_TYPE_BIGINT;
+      pCtx->param[1].i64Key = pQueryInfo->order.orderColId;
+    }
+
+    SResultInfo *pResInfo = &pReducer->pResInfo[i];
+    pResInfo->bufLen = pExpr->interBytes;
+    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(pQueryInfo->fieldsInfo.numOfOutput, POINTER_BYTES);
+
+  SQLFunctionCtx *pCtx = NULL;
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 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 || pCtx == NULL) {
+    free(pTagCtx);
+  } else {
+    pCtx->tagInfo.pTagCtxList = pTagCtx;
+    pCtx->tagInfo.numOfTagCols = n;
+    pCtx->tagInfo.tagsLen = tagLen;
+  }
+}
+
+static SFillColInfo* createFillColInfo(SQueryInfo* pQueryInfo) {
+  int32_t numOfCols = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+  int32_t offset = 0;
+  
+  SFillColInfo* pFillCol = calloc(numOfCols, sizeof(SFillColInfo));
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+    
+    pFillCol[i].col.bytes  = pExpr->resBytes;
+    pFillCol[i].col.type   = (int8_t)pExpr->resType;
+    pFillCol[i].col.colId  = pExpr->colInfo.colId;
+    pFillCol[i].flag       = pExpr->colInfo.flag;
+    pFillCol[i].col.offset = offset;
+    pFillCol[i].functionId = pExpr->functionId;
+    pFillCol[i].fillVal.i  = pQueryInfo->fillVal[i];
+    offset += pExpr->resBytes;
+  }
+  
+  return pFillCol;
+}
+
+void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
+                           SColumnModel *finalmodel, SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+  
+  if (pMemBuffer == NULL) {
+    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
+    tscError("%p pMemBuffer is NULL", pMemBuffer);
+    pRes->code = TSDB_CODE_TSC_APP_ERROR;
+    return;
+  }
+ 
+  if (pDesc->pColumnModel == NULL) {
+    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
+    tscError("%p no local buffer or intermediate result format model", pSql);
+    pRes->code = TSDB_CODE_TSC_APP_ERROR;
+    return;
+  }
+
+  int32_t numOfFlush = 0;
+  for (int32_t i = 0; i < numOfBuffer; ++i) {
+    int32_t len = pMemBuffer[i]->fileMeta.flushoutData.nLength;
+    if (len == 0) {
+      tscDebug("%p no data retrieved from orderOfVnode:%d", pSql, i + 1);
+      continue;
+    }
+
+    numOfFlush += len;
+  }
+
+  if (numOfFlush == 0 || numOfBuffer == 0) {
+    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
+    tscDebug("%p retrieved no data", pSql);
+    return;
+  }
+
+  if (pDesc->pColumnModel->capacity >= pMemBuffer[0]->pageSize) {
+    tscError("%p Invalid value of buffer capacity %d and page size %d ", pSql, pDesc->pColumnModel->capacity,
+             pMemBuffer[0]->pageSize);
+
+    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
+    pRes->code = TSDB_CODE_TSC_APP_ERROR;
+    return;
+  }
+
+  size_t size = sizeof(SLocalReducer) + POINTER_BYTES * numOfFlush;
+  
+  SLocalReducer *pReducer = (SLocalReducer *) calloc(1, size);
+  if (pReducer == NULL) {
+    tscError("%p failed to create local merge structure, out of memory", pSql);
+
+    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return;
+  }
+
+  pReducer->pExtMemBuffer = pMemBuffer;
+  pReducer->pLocalDataSrc = (SLocalDataSource **)&pReducer[1];
+  assert(pReducer->pLocalDataSrc != NULL);
+
+  pReducer->numOfBuffer = numOfFlush;
+  pReducer->numOfVnode = numOfBuffer;
+
+  pReducer->pDesc = pDesc;
+  tscDebug("%p the number of merged leaves is: %d", pSql, pReducer->numOfBuffer);
+
+  int32_t idx = 0;
+  for (int32_t i = 0; i < numOfBuffer; ++i) {
+    int32_t numOfFlushoutInFile = pMemBuffer[i]->fileMeta.flushoutData.nLength;
+
+    for (int32_t j = 0; j < numOfFlushoutInFile; ++j) {
+      SLocalDataSource *ds = (SLocalDataSource *)malloc(sizeof(SLocalDataSource) + pMemBuffer[0]->pageSize);
+      if (ds == NULL) {
+        tscError("%p failed to create merge structure", pSql);
+        pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+        taosTFree(pReducer);
+        return;
+      }
+      
+      pReducer->pLocalDataSrc[idx] = ds;
+
+      ds->pMemBuffer = pMemBuffer[i];
+      ds->flushoutIdx = j;
+      ds->filePage.num = 0;
+      ds->pageId = 0;
+      ds->rowIdx = 0;
+
+      tscDebug("%p load data from disk into memory, orderOfVnode:%d, total:%d", pSql, i + 1, idx + 1);
+      tExtMemBufferLoadData(pMemBuffer[i], &(ds->filePage), j, 0);
+#ifdef _DEBUG_VIEW
+      printf("load data page into mem for build loser tree: %" PRIu64 " rows\n", ds->filePage.num);
+      SSrcColumnInfo colInfo[256] = {0};
+      SQueryInfo *   pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+      tscGetSrcColumnInfo(colInfo, pQueryInfo);
+
+      tColModelDisplayEx(pDesc->pColumnModel, ds->filePage.data, ds->filePage.num,
+                         pMemBuffer[0]->numOfElemsPerPage, colInfo);
+#endif
+      
+      if (ds->filePage.num == 0) {  // no data in this flush, the index does not increase
+        tscDebug("%p flush data is empty, ignore %d flush record", pSql, idx);
+        taosTFree(ds);
+        continue;
+      }
+      
+      idx += 1;
+    }
+  }
+  
+  // no data actually, no need to merge result.
+  if (idx == 0) {
+    taosTFree(pReducer);
+    return;
+  }
+
+  pReducer->numOfBuffer = idx;
+
+  SCompareParam *param = malloc(sizeof(SCompareParam));
+  if (param == NULL) {
+    taosTFree(pReducer);
+    return;
+  }
+
+  param->pLocalData = pReducer->pLocalDataSrc;
+  param->pDesc = pReducer->pDesc;
+  param->num = pReducer->pLocalDataSrc[0]->pMemBuffer->numOfElemsPerPage;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  param->groupOrderType = pQueryInfo->groupbyExpr.orderType;
+  pReducer->orderPrjOnSTable = tscOrderedProjectionQueryOnSTable(pQueryInfo, 0);
+
+  pRes->code = tLoserTreeCreate(&pReducer->pLoserTree, pReducer->numOfBuffer, param, treeComparator);
+  if (pReducer->pLoserTree == NULL || pRes->code != 0) {
+    taosTFree(param);
+    taosTFree(pReducer);
+    return;
+  }
+
+  // the input data format follows the old format, but output in a new format.
+  // so, all the input must be parsed as old format
+  pReducer->pCtx = (SQLFunctionCtx *)calloc(tscSqlExprNumOfExprs(pQueryInfo), sizeof(SQLFunctionCtx));
+  pReducer->rowSize = pMemBuffer[0]->nElemSize;
+
+  tscRestoreSQLFuncForSTableQuery(pQueryInfo);
+  tscFieldInfoUpdateOffset(pQueryInfo);
+
+  if (pReducer->rowSize > pMemBuffer[0]->pageSize) {
+    assert(false);  // todo fixed row size is larger than the minimum page size;
+  }
+
+  pReducer->hasPrevRow = false;
+  pReducer->hasUnprocessedRow = false;
+
+  pReducer->prevRowOfInput = (char *)calloc(1, pReducer->rowSize);
+
+  // 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));
+  pReducer->discard = false;
+
+  pReducer->nResultBufSize = pMemBuffer[0]->pageSize * 16;
+  pReducer->pResultBuf = (tFilePage *)calloc(1, pReducer->nResultBufSize + sizeof(tFilePage));
+
+  pReducer->finalRowSize = tscGetResRowLength(pQueryInfo->exprList);
+  pReducer->resColModel = finalmodel;
+  pReducer->resColModel->capacity = pReducer->nResultBufSize;
+
+  assert(pReducer->finalRowSize > 0);
+  if (pReducer->finalRowSize > 0) {
+    pReducer->resColModel->capacity /= pReducer->finalRowSize;
+  }
+  assert(pReducer->finalRowSize <= pReducer->rowSize);
+
+  pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->capacity);
+
+  if (pReducer->pTempBuffer == NULL || pReducer->discardData == NULL || pReducer->pResultBuf == NULL ||
+      /*pReducer->pBufForInterpo == NULL || */pReducer->pFinalRes == NULL || pReducer->prevRowOfInput == NULL) {
+    taosTFree(pReducer->pTempBuffer);
+    taosTFree(pReducer->discardData);
+    taosTFree(pReducer->pResultBuf);
+    taosTFree(pReducer->pFinalRes);
+    taosTFree(pReducer->prevRowOfInput);
+    taosTFree(pReducer->pLoserTree);
+    taosTFree(param);
+    taosTFree(pReducer);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return;
+  }
+  
+  size_t numOfCols = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  pReducer->pTempBuffer->num = 0;
+  pReducer->pResInfo = calloc(numOfCols, sizeof(SResultInfo));
+
+  tscCreateResPointerInfo(pRes, pQueryInfo);
+  tscInitSqlContext(pCmd, pReducer, pDesc);
+
+  // we change the capacity of schema to denote that there is only one row in temp buffer
+  pReducer->pDesc->pColumnModel->capacity = 1;
+
+  // restore the limitation value at the last stage
+  if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+    pQueryInfo->limit.limit = pQueryInfo->clauseLimit;
+    pQueryInfo->limit.offset = pQueryInfo->prjOffset;
+  }
+
+  pReducer->offset = (int32_t)pQueryInfo->limit.offset;
+
+  pRes->pLocalReducer = pReducer;
+  pRes->numOfGroups = 0;
+
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
+  TSKEY stime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.skey : pQueryInfo->window.ekey;
+  int64_t revisedSTime = taosTimeTruncate(stime, &pQueryInfo->interval, tinfo.precision);
+  
+  if (pQueryInfo->fillType != TSDB_FILL_NONE) {
+    SFillColInfo* pFillCol = createFillColInfo(pQueryInfo);
+    pReducer->pFillInfo = taosInitFillInfo(pQueryInfo->order.order, revisedSTime, pQueryInfo->groupbyExpr.numOfGroupCols,
+                                           4096, (int32_t)numOfCols, pQueryInfo->interval.sliding, pQueryInfo->interval.slidingUnit,
+                                           tinfo.precision, pQueryInfo->fillType, pFillCol);
+  }
+}
+
+static int32_t tscFlushTmpBufferImpl(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage,
+                                     int32_t orderType) {
+  if (pPage->num == 0) {
+    return 0;
+  }
+
+  assert(pPage->num <= pDesc->pColumnModel->capacity);
+
+  // sort before flush to disk, the data must be consecutively put on tFilePage.
+  if (pDesc->orderInfo.numOfCols > 0) {
+    tColDataQSort(pDesc, (int32_t)pPage->num, 0, (int32_t)pPage->num - 1, pPage->data, orderType);
+  }
+
+#ifdef _DEBUG_VIEW
+  printf("%" PRIu64 " rows data flushed to disk after been sorted:\n", pPage->num);
+  tColModelDisplay(pDesc->pColumnModel, pPage->data, pPage->num, pPage->num);
+#endif
+
+  // write to cache after being sorted
+  if (tExtMemBufferPut(pMemoryBuf, pPage->data, (int32_t)pPage->num) < 0) {
+    tscError("failed to save data in temporary buffer");
+    return -1;
+  }
+
+  pPage->num = 0;
+  return 0;
+}
+
+int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, int32_t orderType) {
+  int32_t ret = 0;
+  if ((ret = tscFlushTmpBufferImpl(pMemoryBuf, pDesc, pPage, orderType)) != 0) {
+    return ret;
+  }
+
+  if ((ret = tExtMemBufferFlush(pMemoryBuf)) != 0) {
+    return ret;
+  }
+
+  return 0;
+}
+
+int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
+                     int32_t numOfRows, int32_t orderType) {
+  SColumnModel *pModel = pDesc->pColumnModel;
+
+  if (pPage->num + numOfRows <= pModel->capacity) {
+    tColModelAppend(pModel, pPage, data, 0, numOfRows, numOfRows);
+    return 0;
+  }
+
+  // current buffer is overflow, flush data to extensive buffer
+  int32_t numOfRemainEntries = pModel->capacity - (int32_t)pPage->num;
+  tColModelAppend(pModel, pPage, data, 0, numOfRemainEntries, numOfRows);
+
+  // current buffer is full, need to flushed to disk
+  assert(pPage->num == pModel->capacity);
+  int32_t code = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType);
+  if (code != 0) {
+    return code;
+  }
+
+  int32_t remain = numOfRows - numOfRemainEntries;
+
+  while (remain > 0) {
+    int32_t numOfWriteElems = 0;
+    if (remain > pModel->capacity) {
+      numOfWriteElems = pModel->capacity;
+    } else {
+      numOfWriteElems = remain;
+    }
+
+    tColModelAppend(pModel, pPage, data, numOfRows - remain, numOfWriteElems, numOfRows);
+
+    if (pPage->num == pModel->capacity) {
+      if ((code = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType)) != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+    } else {
+      pPage->num = numOfWriteElems;
+    }
+
+    remain -= numOfWriteElems;
+    numOfRemainEntries += numOfWriteElems;
+  }
+
+  return 0;
+}
+
+void tscDestroyLocalReducer(SSqlObj *pSql) {
+  if (pSql == NULL) {
+    return;
+  }
+
+  SSqlRes *pRes = &(pSql->res);
+  if (pRes->pLocalReducer == NULL) {
+    return;
+  }
+
+  SSqlCmd *   pCmd = &pSql->cmd;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  // there is no more result, so we release all allocated resource
+  SLocalReducer *pLocalReducer = (SLocalReducer *)atomic_exchange_ptr(&pRes->pLocalReducer, NULL);
+  if (pLocalReducer != NULL) {
+    int32_t status = 0;
+    while ((status = atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY,
+                                                    TSC_LOCALREDUCE_TOBE_FREED)) == TSC_LOCALREDUCE_IN_PROGRESS) {
+      taosMsleep(100);
+      tscDebug("%p waiting for delete procedure, status: %d", pSql, status);
+    }
+
+    pLocalReducer->pFillInfo = taosDestoryFillInfo(pLocalReducer->pFillInfo);
+
+    if (pLocalReducer->pCtx != NULL) {
+      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+        SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[i];
+
+        tVariantDestroy(&pCtx->tag);
+        if (pCtx->tagInfo.pTagCtxList != NULL) {
+          taosTFree(pCtx->tagInfo.pTagCtxList);
+        }
+      }
+
+      taosTFree(pLocalReducer->pCtx);
+    }
+
+    taosTFree(pLocalReducer->prevRowOfInput);
+
+    taosTFree(pLocalReducer->pTempBuffer);
+    taosTFree(pLocalReducer->pResultBuf);
+
+    if (pLocalReducer->pResInfo != NULL) {
+      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+        taosTFree(pLocalReducer->pResInfo[i].interResultBuf);
+      }
+
+      taosTFree(pLocalReducer->pResInfo);
+    }
+
+    if (pLocalReducer->pLoserTree) {
+      taosTFree(pLocalReducer->pLoserTree->param);
+      taosTFree(pLocalReducer->pLoserTree);
+    }
+
+    taosTFree(pLocalReducer->pFinalRes);
+    taosTFree(pLocalReducer->discardData);
+
+    tscLocalReducerEnvDestroy(pLocalReducer->pExtMemBuffer, pLocalReducer->pDesc, pLocalReducer->resColModel,
+                              pLocalReducer->numOfVnode);
+    for (int32_t i = 0; i < pLocalReducer->numOfBuffer; ++i) {
+      taosTFree(pLocalReducer->pLocalDataSrc[i]);
+    }
+
+    pLocalReducer->numOfBuffer = 0;
+    pLocalReducer->numOfCompleted = 0;
+    free(pLocalReducer);
+  } else {
+    tscDebug("%p already freed or another free function is invoked", pSql);
+  }
+
+  tscDebug("%p free local reducer finished", pSql);
+}
+
+static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCmd, SColumnModel *pModel) {
+  int32_t     numOfGroupByCols = 0;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
+    numOfGroupByCols = pQueryInfo->groupbyExpr.numOfGroupCols;
+  }
+
+  // primary timestamp column is involved in final result
+  if (pQueryInfo->interval.interval != 0 || tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+    numOfGroupByCols++;
+  }
+
+  int32_t *orderIdx = (int32_t *)calloc(numOfGroupByCols, sizeof(int32_t));
+  if (orderIdx == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  if (numOfGroupByCols > 0) {
+    int32_t startCols = pQueryInfo->fieldsInfo.numOfOutput - pQueryInfo->groupbyExpr.numOfGroupCols;
+
+    // tags value locate at the last columns
+    for (int32_t i = 0; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
+      orderIdx[i] = startCols++;
+    }
+
+    if (pQueryInfo->interval.interval != 0) {
+      // the first column is the timestamp, handles queries like "interval(10m) group by tags"
+      orderIdx[numOfGroupByCols - 1] = PRIMARYKEY_TIMESTAMP_COL_INDEX;
+    }
+  }
+
+  *pOrderDesc = tOrderDesCreate(orderIdx, numOfGroupByCols, pModel, pQueryInfo->order.order);
+  taosTFree(orderIdx);
+
+  if (*pOrderDesc == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  } else {
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+bool isSameGroup(SSqlCmd *pCmd, SLocalReducer *pReducer, char *pPrev, tFilePage *tmpBuffer) {
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  // disable merge procedure for column projection query
+  int16_t functionId = pReducer->pCtx[0].functionId;
+  assert(functionId != TSDB_FUNC_ARITHM);
+  if (pReducer->orderPrjOnSTable) {
+    return true;
+  }
+
+  if (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_ARITHM) {
+    return false;
+  }
+
+  tOrderDescriptor *pOrderDesc = pReducer->pDesc;
+  SColumnOrderInfo* orderInfo = &pOrderDesc->orderInfo;
+
+  // no group by columns, all data belongs to one group
+  int32_t numOfCols = orderInfo->numOfCols;
+  if (numOfCols <= 0) {
+    return true;
+  }
+
+  if (orderInfo->pData[numOfCols - 1] == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+    /*
+     * super table interval query
+     * if the order columns is the primary timestamp, all result data belongs to one group
+     */
+    assert(pQueryInfo->interval.interval > 0);
+    if (numOfCols == 1) {
+      return true;
+    }
+  } else {  // simple group by query
+    assert(pQueryInfo->interval.interval == 0);
+  }
+
+  // only one row exists
+  int32_t index = orderInfo->pData[0];
+  int32_t offset = (pOrderDesc->pColumnModel)->pFields[index].offset;
+
+  int32_t ret = memcmp(pPrev + offset, tmpBuffer->data + offset, pOrderDesc->pColumnModel->rowSize - offset);
+  return ret == 0;
+}
+
+int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pOrderDesc,
+                                 SColumnModel **pFinalModel, uint32_t nBufferSizes) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SSchema *     pSchema = NULL;
+  SColumnModel *pModel = NULL;
+  *pFinalModel = NULL;
+
+  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  (*pMemBuffer) = (tExtMemBuffer **)malloc(POINTER_BYTES * pSql->numOfSubs);
+  if (*pMemBuffer == NULL) {
+    tscError("%p failed to allocate memory", pSql);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return pRes->code;
+  }
+  
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  pSchema = (SSchema *)calloc(1, sizeof(SSchema) * size);
+  if (pSchema == NULL) {
+    tscError("%p failed to allocate memory", pSql);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return pRes->code;
+  }
+
+  int32_t rlen = 0;
+  for (int32_t i = 0; i < size; ++i) {
+    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
+
+    pSchema[i].bytes = pExpr->resBytes;
+    pSchema[i].type = (int8_t)pExpr->resType;
+
+    rlen += pExpr->resBytes;
+  }
+
+  int32_t capacity = 0;
+  if (rlen != 0) {
+    capacity = nBufferSizes / rlen;
+  }
+  
+  pModel = createColumnModel(pSchema, (int32_t)size, capacity);
+
+  int32_t pg = DEFAULT_PAGE_SIZE;
+  int32_t overhead = sizeof(tFilePage);
+  while((pg - overhead) < pModel->rowSize * 2) {
+    pg *= 2;
+  }
+
+  size_t numOfSubs = pTableMetaInfo->vgroupList->numOfVgroups;
+  for (int32_t i = 0; i < numOfSubs; ++i) {
+    (*pMemBuffer)[i] = createExtMemBuffer(nBufferSizes, rlen, pg, pModel);
+    (*pMemBuffer)[i]->flushModel = MULTIPLE_APPEND_MODEL;
+  }
+
+  if (createOrderDescriptor(pOrderDesc, pCmd, pModel) != TSDB_CODE_SUCCESS) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    taosTFree(pSchema);
+    return pRes->code;
+  }
+
+  // final result depends on the fields number
+  memset(pSchema, 0, sizeof(SSchema) * size);
+  for (int32_t i = 0; i < size; ++i) {
+    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
+
+    SSchema *p1 = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pExpr->colInfo.colIndex);
+
+    int32_t inter = 0;
+    int16_t type = -1;
+    int16_t bytes = 0;
+
+    //    if ((pExpr->functionId >= TSDB_FUNC_FIRST_DST && pExpr->functionId <= TSDB_FUNC_LAST_DST) ||
+    //        (pExpr->functionId >= TSDB_FUNC_SUM && pExpr->functionId <= TSDB_FUNC_MAX) ||
+    //        pExpr->functionId == TSDB_FUNC_LAST_ROW) {
+    // the final result size and type in the same as query on single table.
+    // so here, set the flag to be false;
+
+    int32_t functionId = pExpr->functionId;
+    if (functionId >= TSDB_FUNC_TS && functionId <= TSDB_FUNC_DIFF) {
+      type = pModel->pFields[i].field.type;
+      bytes = pModel->pFields[i].field.bytes;
+    } else {
+      if (functionId == TSDB_FUNC_FIRST_DST) {
+        functionId = TSDB_FUNC_FIRST;
+      } else if (functionId == TSDB_FUNC_LAST_DST) {
+        functionId = TSDB_FUNC_LAST;
+      }
+
+      getResultDataInfo(p1->type, p1->bytes, functionId, 0, &type, &bytes, &inter, 0, false);
+    }
+
+    pSchema[i].type = (uint8_t)type;
+    pSchema[i].bytes = bytes;
+    strcpy(pSchema[i].name, pModel->pFields[i].field.name);
+  }
+  
+  *pFinalModel = createColumnModel(pSchema, (int32_t)size, capacity);
+  taosTFree(pSchema);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+/**
+ * @param pMemBuffer
+ * @param pDesc
+ * @param pFinalModel
+ * @param numOfVnodes
+ */
+void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, SColumnModel *pFinalModel,
+                               int32_t numOfVnodes) {
+  destroyColumnModel(pFinalModel);
+  tOrderDescDestroy(pDesc);
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    pMemBuffer[i] = destoryExtMemBuffer(pMemBuffer[i]);
+  }
+
+  taosTFree(pMemBuffer);
+}
+
+/**
+ *
+ * @param pLocalReducer
+ * @param pOneInterDataSrc
+ * @param treeList
+ * @return the number of remain input source. if ret == 0, all data has been handled
+ */
+int32_t loadNewDataFromDiskFor(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
+                               bool *needAdjustLoserTree) {
+  pOneInterDataSrc->rowIdx = 0;
+  pOneInterDataSrc->pageId += 1;
+
+  if ((uint32_t)pOneInterDataSrc->pageId <
+      pOneInterDataSrc->pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[pOneInterDataSrc->flushoutIdx].numOfPages) {
+    tExtMemBufferLoadData(pOneInterDataSrc->pMemBuffer, &(pOneInterDataSrc->filePage), pOneInterDataSrc->flushoutIdx,
+                          pOneInterDataSrc->pageId);
+
+#if defined(_DEBUG_VIEW)
+    printf("new page load to buffer\n");
+    tColModelDisplay(pOneInterDataSrc->pMemBuffer->pColumnModel, pOneInterDataSrc->filePage.data,
+                     pOneInterDataSrc->filePage.num, pOneInterDataSrc->pMemBuffer->pColumnModel->capacity);
+#endif
+    *needAdjustLoserTree = true;
+  } else {
+    pLocalReducer->numOfCompleted += 1;
+
+    pOneInterDataSrc->rowIdx = -1;
+    pOneInterDataSrc->pageId = -1;
+    *needAdjustLoserTree = true;
+  }
+
+  return pLocalReducer->numOfBuffer;
+}
+
+void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
+                                SLoserTreeInfo *pTree) {
+  /*
+   * load a new data page into memory for intermediate dataset source,
+   * since it's last record in buffer has been chosen to be processed, as the winner of loser-tree
+   */
+  bool needToAdjust = true;
+  if (pOneInterDataSrc->filePage.num <= pOneInterDataSrc->rowIdx) {
+    loadNewDataFromDiskFor(pLocalReducer, pOneInterDataSrc, &needToAdjust);
+  }
+
+  /*
+   * adjust loser tree otherwise, according to new candidate data
+   * if the loser tree is rebuild completed, we do not need to adjust
+   */
+  if (needToAdjust) {
+    int32_t leafNodeIdx = pTree->pNode[0].index + pLocalReducer->numOfBuffer;
+
+#ifdef _DEBUG_VIEW
+    printf("before adjust:\t");
+    tLoserTreeDisplay(pTree);
+#endif
+
+    tLoserTreeAdjust(pTree, leafNodeIdx);
+
+#ifdef _DEBUG_VIEW
+    printf("\nafter adjust:\t");
+    tLoserTreeDisplay(pTree);
+    printf("\n");
+#endif
+  }
+}
+
+void savePrevRecordAndSetupFillInfo(SLocalReducer *pLocalReducer, SQueryInfo *pQueryInfo, SFillInfo *pFillInfo) {
+  // discard following dataset in the same group and reset the interpolation information
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+
+  if (pFillInfo != NULL) {
+    int64_t stime = (pQueryInfo->window.skey < pQueryInfo->window.ekey) ? pQueryInfo->window.skey : pQueryInfo->window.ekey;
+    int64_t revisedSTime = taosTimeTruncate(stime, &pQueryInfo->interval, tinfo.precision);
+  
+    taosResetFillInfo(pFillInfo, revisedSTime);
+  }
+
+  pLocalReducer->discard = true;
+  pLocalReducer->discardData->num = 0;
+
+  SColumnModel *pModel = pLocalReducer->pDesc->pColumnModel;
+  tColModelAppend(pModel, pLocalReducer->discardData, pLocalReducer->prevRowOfInput, 0, 1, 1);
+}
+
+static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer, SQueryInfo* pQueryInfo) {
+  assert(pQueryInfo->interval.interval == 0 || pQueryInfo->fillType == TSDB_FILL_NONE);
+
+  tFilePage * pBeforeFillData = pLocalReducer->pResultBuf;
+
+  pRes->data = pLocalReducer->pFinalRes;
+  pRes->numOfRows = pBeforeFillData->num;
+
+  if (pQueryInfo->limit.offset > 0) {
+    if (pQueryInfo->limit.offset < pRes->numOfRows) {
+      int32_t prevSize = (int32_t)pBeforeFillData->num;
+      tColModelErase(pLocalReducer->resColModel, pBeforeFillData, prevSize, 0, (int32_t)pQueryInfo->limit.offset - 1);
+
+      /* remove the hole in column model */
+      tColModelCompact(pLocalReducer->resColModel, pBeforeFillData, prevSize);
+
+      pRes->numOfRows -= pQueryInfo->limit.offset;
+      pQueryInfo->limit.offset = 0;
+    } else {
+      pQueryInfo->limit.offset -= pRes->numOfRows;
+      pRes->numOfRows = 0;
+    }
+  }
+
+  pRes->numOfRowsGroup += pRes->numOfRows;
+
+  // impose the limitation of output rows on the final result
+  if (pQueryInfo->limit.limit >= 0 && pRes->numOfRowsGroup > pQueryInfo->limit.limit) {
+    int32_t prevSize = (int32_t)pBeforeFillData->num;
+    int32_t overflow = (int32_t)(pRes->numOfRowsGroup - pQueryInfo->limit.limit);
+    assert(overflow < pRes->numOfRows);
+
+    pRes->numOfRowsGroup = pQueryInfo->limit.limit;
+    pRes->numOfRows -= overflow;
+    pBeforeFillData->num -= overflow;
+
+    tColModelCompact(pLocalReducer->resColModel, pBeforeFillData, prevSize);
+
+    // set remain data to be discarded, and reset the interpolation information
+    savePrevRecordAndSetupFillInfo(pLocalReducer, pQueryInfo, pLocalReducer->pFillInfo);
+  }
+
+  memcpy(pRes->data, pBeforeFillData->data, (size_t)(pRes->numOfRows * pLocalReducer->finalRowSize));
+
+  pRes->numOfClauseTotal += pRes->numOfRows;
+  pBeforeFillData->num = 0;
+}
+
+/*
+ * Note: pRes->pLocalReducer may be null, due to the fact that "tscDestroyLocalReducer" is called
+ * by "interuptHandler" function in shell
+ */
+static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneOutput) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+  
+  tFilePage  *pBeforeFillData = pLocalReducer->pResultBuf;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  SFillInfo  *pFillInfo = pLocalReducer->pFillInfo;
+
+  // todo extract function
+  int64_t actualETime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey: pQueryInfo->window.skey;
+
+  tFilePage **pResPages = malloc(POINTER_BYTES * pQueryInfo->fieldsInfo.numOfOutput);
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+    pResPages[i] = calloc(1, sizeof(tFilePage) + pField->bytes * pLocalReducer->resColModel->capacity);
+  }
+
+  while (1) {
+    int64_t newRows = taosGenerateDataBlock(pFillInfo, pResPages, pLocalReducer->resColModel->capacity);
+
+    if (pQueryInfo->limit.offset < newRows) {
+      newRows -= pQueryInfo->limit.offset;
+
+      if (pQueryInfo->limit.offset > 0) {
+        for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+          TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+          memmove(pResPages[i]->data, pResPages[i]->data + pField->bytes * pQueryInfo->limit.offset,
+                  (size_t)(newRows * pField->bytes));
+        }
+      }
+
+      pRes->data = pLocalReducer->pFinalRes;
+      pRes->numOfRows = newRows;
+
+      pQueryInfo->limit.offset = 0;
+      break;
+    } else {
+      pQueryInfo->limit.offset -= newRows;
+      pRes->numOfRows = 0;
+
+      int32_t rpoints = taosNumOfRemainRows(pFillInfo);
+      if (rpoints <= 0) {
+        if (!doneOutput) { // reduce procedure has not completed yet, but current results for fill are exhausted
+          break;
+        }
+
+        // all output in current group are completed
+        int32_t totalRemainRows = (int32_t)getFilledNumOfRes(pFillInfo, actualETime, pLocalReducer->resColModel->capacity);
+        if (totalRemainRows <= 0) {
+          break;
+        }
+      }
+    }
+  }
+
+  if (pRes->numOfRows > 0) {
+    int32_t currentTotal = (int32_t)(pRes->numOfRowsGroup + pRes->numOfRows);
+
+    if (pQueryInfo->limit.limit >= 0 && currentTotal > pQueryInfo->limit.limit) {
+      int32_t overflow = (int32_t)(currentTotal - pQueryInfo->limit.limit);
+
+      pRes->numOfRows -= overflow;
+      assert(pRes->numOfRows >= 0);
+
+      /* set remain data to be discarded, and reset the interpolation information */
+      savePrevRecordAndSetupFillInfo(pLocalReducer, pQueryInfo, pFillInfo);
+    }
+
+    for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+      TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+      int16_t     offset = getColumnModelOffset(pLocalReducer->resColModel, i);
+      memcpy(pRes->data + offset * pRes->numOfRows, pResPages[i]->data, (size_t)(pField->bytes * pRes->numOfRows));
+    }
+
+    pRes->numOfRowsGroup += pRes->numOfRows;
+    pRes->numOfClauseTotal += pRes->numOfRows;
+  }
+
+  pBeforeFillData->num = 0;
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    taosTFree(pResPages[i]);
+  }
+  
+  taosTFree(pResPages);
+}
+
+static void savePreviousRow(SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
+  SColumnModel *pColumnModel = pLocalReducer->pDesc->pColumnModel;
+  assert(pColumnModel->capacity == 1 && tmpBuffer->num == 1);
+
+  // copy to previous temp buffer
+  for (int32_t i = 0; i < pColumnModel->numOfCols; ++i) {
+    SSchema *pSchema = getColumnModelSchema(pColumnModel, i);
+    int16_t  offset = getColumnModelOffset(pColumnModel, i);
+
+    memcpy(pLocalReducer->prevRowOfInput + offset, tmpBuffer->data + offset, pSchema->bytes);
+  }
+
+  tmpBuffer->num = 0;
+  pLocalReducer->hasPrevRow = true;
+}
+
+static void doExecuteSecondaryMerge(SSqlCmd *pCmd, SLocalReducer *pLocalReducer, bool needInit) {
+  // the tag columns need to be set before all functions execution
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t j = 0; j < size; ++j) {
+    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[j];
+
+    // tags/tags_dummy function, the tag field of SQLFunctionCtx is from the input buffer
+    int32_t functionId = pCtx->functionId;
+    if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TS_DUMMY) {
+      tVariantDestroy(&pCtx->tag);
+      char* input = pCtx->aInputElemBuf;
+      
+      if (pCtx->inputType == TSDB_DATA_TYPE_BINARY || pCtx->inputType == TSDB_DATA_TYPE_NCHAR) {
+        assert(varDataLen(input) <= pCtx->inputBytes);
+        tVariantCreateFromBinary(&pCtx->tag, varDataVal(input), varDataLen(input), pCtx->inputType);
+      } else {
+        tVariantCreateFromBinary(&pCtx->tag, input, pCtx->inputBytes, pCtx->inputType);
+      }
+    } else if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+      SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, j);
+      pCtx->param[0].i64Key = pExpr->param[0].i64Key;
+    }
+
+    pCtx->currentStage = SECONDARY_STAGE_MERGE;
+
+    if (needInit) {
+      aAggs[pCtx->functionId].init(pCtx);
+    }
+  }
+
+  for (int32_t j = 0; j < size; ++j) {
+    int32_t functionId = pLocalReducer->pCtx[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);
+  }
+}
+
+static int64_t getNumOfResultLocal(SQueryInfo *pQueryInfo, SQLFunctionCtx *pCtx) {
+  int64_t maxOutput = 0;
+  
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t j = 0; j < size; ++j) {
+    /*
+     * ts, tag, tagprj function can not decide the output number of current query
+     * the number of output result is decided by main output
+     */
+    int32_t functionId = pCtx[j].functionId;
+    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ) {
+      continue;
+    }
+
+    SResultInfo* pResInfo = GET_RES_INFO(&pCtx[j]);
+    if (maxOutput < pResInfo->numOfRes) {
+      maxOutput = pResInfo->numOfRes;
+    }
+  }
+
+  return maxOutput;
+}
+
+/*
+ * 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(SQueryInfo *pQueryInfo, int32_t numOfRes, SLocalReducer *pLocalReducer) {
+  int32_t maxBufSize = 0;  // find the max tags column length to prepare the buffer
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t k = 0; k < size; ++k) {
+    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, k);
+    if (maxBufSize < pExpr->resBytes && pExpr->functionId == TSDB_FUNC_TAG) {
+      maxBufSize = pExpr->resBytes;
+    }
+  }
+
+  assert(maxBufSize >= 0);
+
+  char *buf = malloc((size_t)maxBufSize);
+  for (int32_t k = 0; k < size; ++k) {
+    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
+    if (pCtx->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);
+    memcpy(buf, pCtx->aOutputBuf, (size_t)pCtx->outputBytes);
+
+    for (int32_t i = 0; i < inc; ++i) {
+      pCtx->aOutputBuf += pCtx->outputBytes;
+      memcpy(pCtx->aOutputBuf, buf, (size_t)pCtx->outputBytes);
+    }
+  }
+
+  free(buf);
+}
+
+int32_t finalizeRes(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t k = 0; k < size; ++k) {
+    SQLFunctionCtx* pCtx = &pLocalReducer->pCtx[k];
+    aAggs[pCtx->functionId].xFinalize(pCtx);
+  }
+
+  pLocalReducer->hasPrevRow = false;
+
+  int32_t numOfRes = (int32_t)getNumOfResultLocal(pQueryInfo, pLocalReducer->pCtx);
+  pLocalReducer->pResultBuf->num += numOfRes;
+
+  fillMultiRowsOfTagsVal(pQueryInfo, numOfRes, pLocalReducer);
+  return numOfRes;
+}
+
+/*
+ * points merge:
+ * points are merged according to the sort info, which is tags columns and timestamp column.
+ * In case of points without either tags columns or timestamp, such as
+ * results generated by simple aggregation function, we merge them all into one points
+ * *Exception*: column projection query, required no merge procedure
+ */
+bool needToMerge(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
+  int32_t ret = 0;  // merge all result by default
+
+  int16_t functionId = pLocalReducer->pCtx[0].functionId;
+
+  // todo opt performance
+  if ((/*functionId == TSDB_FUNC_PRJ || */functionId == TSDB_FUNC_ARITHM) || (tscIsProjectionQueryOnSTable(pQueryInfo, 0))) {  // column projection query
+    ret = 1;                                                            // disable merge procedure
+  } else {
+    tOrderDescriptor *pDesc = pLocalReducer->pDesc;
+    if (pDesc->orderInfo.numOfCols > 0) {
+      if (pDesc->tsOrder == TSDB_ORDER_ASC) {  // asc
+        // todo refactor comparator
+        ret = compare_a(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
+      } else {  // desc
+        ret = compare_d(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
+      }
+    }
+  }
+
+  /* if ret == 0, means the result belongs to the same group */
+  return (ret == 0);
+}
+
+static bool reachGroupResultLimit(SQueryInfo *pQueryInfo, SSqlRes *pRes) {
+  return (pRes->numOfGroups >= pQueryInfo->slimit.limit && pQueryInfo->slimit.limit >= 0);
+}
+
+static bool saveGroupResultInfo(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  if (pRes->numOfRowsGroup > 0) {
+    pRes->numOfGroups += 1;
+  }
+
+  // the output group is limited by the slimit clause
+  if (reachGroupResultLimit(pQueryInfo, pRes)) {
+    return true;
+  }
+
+  //    pRes->pGroupRec = realloc(pRes->pGroupRec, pRes->numOfGroups*sizeof(SResRec));
+  //    pRes->pGroupRec[pRes->numOfGroups-1].numOfRows = pRes->numOfRows;
+  //    pRes->pGroupRec[pRes->numOfGroups-1].numOfClauseTotal = pRes->numOfClauseTotal;
+
+  return false;
+}
+
+/**
+ *
+ * @param pSql
+ * @param pLocalReducer
+ * @param noMoreCurrentGroupRes
+ * @return if current group is skipped, return false, and do NOT record it into pRes->numOfGroups
+ */
+bool genFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCurrentGroupRes) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SQueryInfo *  pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  tFilePage *   pResBuf = pLocalReducer->pResultBuf;
+  SColumnModel *pModel = pLocalReducer->resColModel;
+
+  pRes->code = TSDB_CODE_SUCCESS;
+
+  /*
+   * 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 (pQueryInfo->slimit.offset > 0) {
+    pRes->numOfRows = 0;
+    pQueryInfo->slimit.offset -= 1;
+    pLocalReducer->discard = !noMoreCurrentGroupRes;
+
+    if (pLocalReducer->discard) {
+      SColumnModel *pInternModel = pLocalReducer->pDesc->pColumnModel;
+      tColModelAppend(pInternModel, pLocalReducer->discardData, pLocalReducer->pTempBuffer->data, 0, 1, 1);
+    }
+
+    return false;
+  }
+
+  tColModelCompact(pModel, pResBuf, pModel->capacity);
+
+#ifdef _DEBUG_VIEW
+  printf("final result before interpo:\n");
+//  tColModelDisplay(pLocalReducer->resColModel, pLocalReducer->pBufForInterpo, pResBuf->num, pResBuf->num);
+#endif
+
+  // no interval query, no fill operation
+  if (pQueryInfo->interval.interval == 0 || pQueryInfo->fillType == TSDB_FILL_NONE) {
+    genFinalResWithoutFill(pRes, pLocalReducer, pQueryInfo);
+  } else {
+    SFillInfo* pFillInfo = pLocalReducer->pFillInfo;
+    if (pFillInfo != NULL) {
+      TSKEY ekey = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey: pQueryInfo->window.skey;
+
+      taosFillSetStartInfo(pFillInfo, (int32_t)pResBuf->num, ekey);
+      taosFillCopyInputDataFromOneFilePage(pFillInfo, pResBuf);
+    }
+    
+    doFillResult(pSql, pLocalReducer, noMoreCurrentGroupRes);
+  }
+
+  return true;
+}
+
+void resetOutputBuf(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer) {  // reset output buffer to the beginning
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    pLocalReducer->pCtx[i].aOutputBuf =
+        pLocalReducer->pResultBuf->data + tscFieldInfoGetOffset(pQueryInfo, i) * pLocalReducer->resColModel->capacity;
+  }
+
+  memset(pLocalReducer->pResultBuf, 0, pLocalReducer->nResultBufSize + sizeof(tFilePage));
+}
+
+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
+  pRes->numOfRows = 0;
+  pRes->numOfRowsGroup = 0;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  pQueryInfo->limit.offset = pLocalReducer->offset;
+
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
+  // for group result interpolation, do not return if not data is generated
+  if (pQueryInfo->fillType != TSDB_FILL_NONE) {
+    TSKEY skey = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.skey:pQueryInfo->window.ekey;//MIN(pQueryInfo->window.skey, pQueryInfo->window.ekey);
+    int64_t newTime = taosTimeTruncate(skey, &pQueryInfo->interval, tinfo.precision);
+    taosResetFillInfo(pLocalReducer->pFillInfo, newTime);
+  }
+}
+
+static bool isAllSourcesCompleted(SLocalReducer *pLocalReducer) {
+  return (pLocalReducer->numOfBuffer == pLocalReducer->numOfCompleted);
+}
+
+static bool doBuildFilledResultForGroup(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SFillInfo *pFillInfo = pLocalReducer->pFillInfo;
+
+  if (pFillInfo != NULL && taosNumOfRemainRows(pFillInfo) > 0) {
+    assert(pQueryInfo->fillType != TSDB_FILL_NONE);
+
+    tFilePage *pFinalDataBuf = pLocalReducer->pResultBuf;
+    int64_t etime = *(int64_t *)(pFinalDataBuf->data + TSDB_KEYSIZE * (pFillInfo->numOfRows - 1));
+
+    // the first column must be the timestamp column
+    int32_t rows = (int32_t)getFilledNumOfRes(pFillInfo, etime, pLocalReducer->resColModel->capacity);
+    if (rows > 0) {  // do fill gap
+      doFillResult(pSql, pLocalReducer, false);
+    }
+
+    return true;
+  } else {
+    return false;
+  }
+}
+
+static bool doHandleLastRemainData(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SFillInfo     *pFillInfo = pLocalReducer->pFillInfo;
+
+  bool prevGroupCompleted = (!pLocalReducer->discard) && pLocalReducer->hasUnprocessedRow;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  if ((isAllSourcesCompleted(pLocalReducer) && !pLocalReducer->hasPrevRow) || pLocalReducer->pLocalDataSrc[0] == NULL ||
+      prevGroupCompleted) {
+    // if fillType == TSDB_FILL_NONE, return directly
+    if (pQueryInfo->fillType != TSDB_FILL_NONE &&
+      ((pRes->numOfRowsGroup < pQueryInfo->limit.limit && pQueryInfo->limit.limit > 0) || (pQueryInfo->limit.limit < 0))) {
+      int64_t etime = (pQueryInfo->order.order == TSDB_ORDER_ASC)? pQueryInfo->window.ekey : pQueryInfo->window.skey;
+
+      int32_t rows = (int32_t)getFilledNumOfRes(pFillInfo, etime, pLocalReducer->resColModel->capacity);
+      if (rows > 0) {
+        doFillResult(pSql, pLocalReducer, true);
+      }
+    }
+
+    /*
+     * 1. numOfRows == 0, means no interpolation results are generated.
+     * 2. if all local data sources are consumed, and no un-processed rows exist.
+     *
+     * No results will be generated and query completed.
+     */
+    if (pRes->numOfRows > 0 || (isAllSourcesCompleted(pLocalReducer) && (!pLocalReducer->hasUnprocessedRow))) {
+      return true;
+    }
+
+    // start to process result for a new group and save the result info of previous group
+    if (saveGroupResultInfo(pSql)) {
+      return true;
+    }
+
+    resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+  }
+
+  return false;
+}
+
+static void doProcessResultInNextWindow(SSqlObj *pSql, int32_t numOfRes) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SQueryInfo *   pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+
+  for (int32_t k = 0; k < size; ++k) {
+    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
+    pCtx->aOutputBuf += pCtx->outputBytes * numOfRes;
+
+    // set the correct output timestamp column position
+    if (pCtx->functionId == TSDB_FUNC_TOP || pCtx->functionId == TSDB_FUNC_BOTTOM) {
+      pCtx->ptsOutputBuf = ((char *)pCtx->ptsOutputBuf + TSDB_KEYSIZE * numOfRes);
+    }
+  }
+
+  doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
+}
+
+int32_t tscDoLocalMerge(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  tscResetForNextRetrieve(pRes);
+
+  if (pSql->signature != pSql || pRes == NULL || pRes->pLocalReducer == NULL) {  // all data has been processed
+    tscError("%p local merge abort due to error occurs, code:%s", pSql, tstrerror(pRes->code));
+    return pRes->code;
+  }
+
+  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
+  SQueryInfo    *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  // set the data merge in progress
+  int32_t prevStatus =
+      atomic_val_compare_exchange_32(&pLocalReducer->status, TSC_LOCALREDUCE_READY, TSC_LOCALREDUCE_IN_PROGRESS);
+  if (prevStatus != TSC_LOCALREDUCE_READY) {
+    assert(prevStatus == TSC_LOCALREDUCE_TOBE_FREED);  // it is in tscDestroyLocalReducer function already
+    return TSDB_CODE_SUCCESS;
+  }
+
+  tFilePage *tmpBuffer = pLocalReducer->pTempBuffer;
+
+  if (doHandleLastRemainData(pSql)) {
+    pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (doBuildFilledResultForGroup(pSql)) {
+    pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
+    return TSDB_CODE_SUCCESS;
+  }
+
+  SLoserTreeInfo *pTree = pLocalReducer->pLoserTree;
+
+  // clear buffer
+  handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
+  SColumnModel *pModel = pLocalReducer->pDesc->pColumnModel;
+
+  while (1) {
+    if (isAllSourcesCompleted(pLocalReducer)) {
+      break;
+    }
+
+#ifdef _DEBUG_VIEW
+    printf("chosen data in pTree[0] = %d\n", pTree->pNode[0].index);
+#endif
+    assert((pTree->pNode[0].index < pLocalReducer->numOfBuffer) && (pTree->pNode[0].index >= 0) && tmpBuffer->num == 0);
+
+    // chosen from loser tree
+    SLocalDataSource *pOneDataSrc = pLocalReducer->pLocalDataSrc[pTree->pNode[0].index];
+
+    tColModelAppend(pModel, tmpBuffer, pOneDataSrc->filePage.data, pOneDataSrc->rowIdx, 1,
+                    pOneDataSrc->pMemBuffer->pColumnModel->capacity);
+
+#if defined(_DEBUG_VIEW)
+    printf("chosen row:\t");
+    SSrcColumnInfo colInfo[256] = {0};
+    tscGetSrcColumnInfo(colInfo, pQueryInfo);
+
+    tColModelDisplayEx(pModel, tmpBuffer->data, tmpBuffer->num, pModel->capacity, colInfo);
+#endif
+
+    if (pLocalReducer->discard) {
+      assert(pLocalReducer->hasUnprocessedRow == false);
+
+      /* current record belongs to the same group of previous record, need to discard it */
+      if (isSameGroup(pCmd, pLocalReducer, pLocalReducer->discardData->data, tmpBuffer)) {
+        tmpBuffer->num = 0;
+        pOneDataSrc->rowIdx += 1;
+
+        adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+
+        // all inputs are exhausted, abort current process
+        if (isAllSourcesCompleted(pLocalReducer)) {
+          break;
+        }
+
+        // data belongs to the same group needs to be discarded
+        continue;
+      } else {
+        pLocalReducer->discard = false;
+        pLocalReducer->discardData->num = 0;
+
+        if (saveGroupResultInfo(pSql)) {
+          pLocalReducer->status = TSC_LOCALREDUCE_READY;
+          return TSDB_CODE_SUCCESS;
+        }
+
+        resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+      }
+    }
+
+    if (pLocalReducer->hasPrevRow) {
+      if (needToMerge(pQueryInfo, pLocalReducer, tmpBuffer)) {
+        // belong to the group of the previous row, continue process it
+        doExecuteSecondaryMerge(pCmd, pLocalReducer, false);
+
+        // copy to buffer
+        savePreviousRow(pLocalReducer, tmpBuffer);
+      } else {
+        /*
+         * current row does not belong to the group of previous row.
+         * so the processing of previous group is completed.
+         */
+        int32_t numOfRes = finalizeRes(pQueryInfo, pLocalReducer);
+        bool   sameGroup = isSameGroup(pCmd, pLocalReducer, pLocalReducer->prevRowOfInput, tmpBuffer);
+
+        tFilePage *pResBuf = pLocalReducer->pResultBuf;
+
+        /*
+         * if the previous group does NOT generate any result (pResBuf->num == 0),
+         * continue to process results instead of return results.
+         */
+        if ((!sameGroup && pResBuf->num > 0) || (pResBuf->num == pLocalReducer->resColModel->capacity)) {
+          // does not belong to the same group
+          bool notSkipped = genFinalResults(pSql, pLocalReducer, !sameGroup);
+
+          // this row needs to discard, since it belongs to the group of previous
+          if (pLocalReducer->discard && sameGroup) {
+            pLocalReducer->hasUnprocessedRow = false;
+            tmpBuffer->num = 0;
+          } else {
+            // current row does not belongs to the previous group, so it is not be handled yet.
+            pLocalReducer->hasUnprocessedRow = true;
+          }
+
+          resetOutputBuf(pQueryInfo, pLocalReducer);
+          pOneDataSrc->rowIdx += 1;
+
+          // here we do not check the return value
+          adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+          assert(pLocalReducer->status == TSC_LOCALREDUCE_IN_PROGRESS);
+
+          if (pRes->numOfRows == 0) {
+            handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
+
+            if (!sameGroup) {
+              /*
+               * previous group is done, prepare for the next group
+               * If previous group is not skipped, keep it in pRes->numOfGroups
+               */
+              if (notSkipped && saveGroupResultInfo(pSql)) {
+                pLocalReducer->status = TSC_LOCALREDUCE_READY;
+                return TSDB_CODE_SUCCESS;
+              }
+
+              resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
+            }
+          } else {
+            /*
+             * if next record belongs to a new group, we do not handle this record here.
+             * We start the process in a new round.
+             */
+            if (sameGroup) {
+              handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
+            }
+          }
+
+          // current group has no result,
+          if (pRes->numOfRows == 0) {
+            continue;
+          } else {
+            pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
+            return TSDB_CODE_SUCCESS;
+          }
+        } else {  // result buffer is not full
+          doProcessResultInNextWindow(pSql, numOfRes);
+          savePreviousRow(pLocalReducer, tmpBuffer);
+        }
+      }
+    } else {
+      doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
+      savePreviousRow(pLocalReducer, tmpBuffer);  // copy the processed row to buffer
+    }
+
+    pOneDataSrc->rowIdx += 1;
+    adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
+  }
+
+  if (pLocalReducer->hasPrevRow) {
+    finalizeRes(pQueryInfo, pLocalReducer);
+  }
+
+  if (pLocalReducer->pResultBuf->num) {
+    genFinalResults(pSql, pLocalReducer, true);
+  }
+
+  assert(pLocalReducer->status == TSC_LOCALREDUCE_IN_PROGRESS && pRes->row == 0);
+  pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen) {
+  SSqlRes *pRes = &pObj->res;
+  if (pRes->pLocalReducer != NULL) {
+    tscDestroyLocalReducer(pObj);
+  }
+
+  pRes->qhandle = 1;  // hack to pass the safety check in fetch_row function
+  pRes->numOfRows = 0;
+  pRes->row = 0;
+
+  pRes->rspType = 0;  // used as a flag to denote if taos_retrieved() has been called yet
+  pRes->pLocalReducer = (SLocalReducer *)calloc(1, sizeof(SLocalReducer));
+
+  /*
+   * we need one additional byte space
+   * the sprintf function needs one additional space to put '\0' at the end of string
+   */
+  size_t allocSize = numOfRes * rowLen + sizeof(tFilePage) + 1;
+  pRes->pLocalReducer->pResultBuf = (tFilePage *)calloc(1, allocSize);
+
+  pRes->pLocalReducer->pResultBuf->num = numOfRes;
+  pRes->data = pRes->pLocalReducer->pResultBuf->data;
+}
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 6ef28a55f60fc847dc36de26856682d2fb6b65c8..0480370dfad073c97b2ab4402703ed65666ed5ca 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -19,17 +19,19 @@
 #define _XOPEN_SOURCE
 
 #include "os.h"
+
 #include "hash.h"
-#include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
-#include "tsqldef.h"
-#include "ttypes.h"
+#include "ttokendef.h"
+#include "taosdef.h"
 
-#include "tlog.h"
+#include "tscLog.h"
+#include "tscSubquery.h"
 #include "tstoken.h"
-#include "ttime.h"
+
+#include "tdataformat.h"
 
 enum {
   TSDB_USE_SERVER_TS = 0,
@@ -38,41 +40,58 @@ enum {
 
 static int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int32_t * numOfRows);
 
-static int32_t tscToInteger(SSQLToken *pToken, int64_t *value, char **endPtr) {
-  int32_t numType = isValidNumber(pToken);
-  if (TK_ILLEGAL == numType) {
-    return numType;
+static int32_t tscToInteger(SStrToken *pToken, int64_t *value, char **endPtr) {
+  if (pToken->n == 0) {
+    return TK_ILLEGAL;
   }
+  
 
   int32_t radix = 10;
-  if (numType == TK_HEX) {
+  if (pToken->type == TK_HEX) {
     radix = 16;
-  } else if (numType == TK_OCT) {
-    radix = 8;
-  } else if (numType == TK_BIN) {
+  } else if (pToken->type == TK_BIN) {
     radix = 2;
   }
-
+  
   errno = 0;
   *value = strtoll(pToken->z, endPtr, radix);
+  if (**endPtr == 'e' || **endPtr == 'E' || **endPtr == '.') {
+    errno = 0;
+    double v = round(strtod(pToken->z, endPtr));
+    if (v > INT64_MAX || v <= INT64_MIN) {
+      errno = ERANGE;
+    } else {
+      *value = (int64_t)v;
+    }
+  }
+  
+  // not a valid integer number, return error
+  if (*endPtr - pToken->z != pToken->n) {
+    return TK_ILLEGAL;
+  }
 
-  return numType;
+  return pToken->type;
 }
 
-static int32_t tscToDouble(SSQLToken *pToken, double *value, char **endPtr) {
-  int32_t numType = isValidNumber(pToken);
-  if (TK_ILLEGAL == numType) {
-    return numType;
+static int32_t tscToDouble(SStrToken *pToken, double *value, char **endPtr) {
+  if (pToken->n == 0) {
+    return TK_ILLEGAL;
   }
-
+  
   errno = 0;
   *value = strtod(pToken->z, endPtr);
-  return numType;
+  
+  // not a valid integer number, return error
+  if ((*endPtr - pToken->z) != pToken->n) {
+    return TK_ILLEGAL;
+  }
+
+  return pToken->type;
 }
 
-int tsParseTime(SSQLToken *pToken, int64_t *time, char **next, char *error, int16_t timePrec) {
+int tsParseTime(SStrToken *pToken, int64_t *time, char **next, char *error, int16_t timePrec) {
   int32_t   index = 0;
-  SSQLToken sToken;
+  SStrToken sToken;
   int64_t   interval;
   int64_t   useconds = 0;
   char *    pTokenEnd = *next;
@@ -84,10 +103,10 @@ int tsParseTime(SSQLToken *pToken, int64_t *time, char **next, char *error, int1
   } else if (strncmp(pToken->z, "0", 1) == 0 && pToken->n == 1) {
     // do nothing
   } else if (pToken->type == TK_INTEGER) {
-    useconds = str2int64(pToken->z);
+    useconds = tsosStr2int64(pToken->z);
   } else {
     // strptime("2001-11-12 18:31:01", "%Y-%m-%d %H:%M:%S", &tm);
-    if (taosParseTime(pToken->z, time, pToken->n, timePrec) != TSDB_CODE_SUCCESS) {
+    if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
       return tscInvalidSQLErrMsg(error, "invalid timestamp format", pToken->z);
     }
 
@@ -109,7 +128,7 @@ int tsParseTime(SSQLToken *pToken, int64_t *time, char **next, char *error, int1
    * time expression:
    * e.g., now+12a, now-5h
    */
-  SSQLToken valueToken;
+  SStrToken valueToken;
   index = 0;
   sToken = tStrGetToken(pTokenEnd, &index, false, 0, NULL);
   pTokenEnd += index;
@@ -123,8 +142,8 @@ int tsParseTime(SSQLToken *pToken, int64_t *time, char **next, char *error, int1
       return tscInvalidSQLErrMsg(error, "value expected in timestamp", sToken.z);
     }
 
-    if (getTimestampInUsFromStr(valueToken.z, valueToken.n, &interval) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (parseAbsoluteDuration(valueToken.z, valueToken.n, &interval) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     if (timePrec == TSDB_TIME_PRECISION_MILLI) {
@@ -144,7 +163,7 @@ int tsParseTime(SSQLToken *pToken, int64_t *time, char **next, char *error, int1
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload, char *msg, char **str, bool primaryKey,
+int32_t tsParseOneColumnData(SSchema *pSchema, SStrToken *pToken, char *payload, char *msg, char **str, bool primaryKey,
                              int16_t timePrec) {
   int64_t iv;
   int32_t numType;
@@ -161,7 +180,7 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
         } else if (strncasecmp(TSDB_DATA_NULL_STR_L, pToken->z, pToken->n) == 0) {
           *(uint8_t *)payload = TSDB_DATA_BOOL_NULL;
         } else {
-          return tscInvalidSQLErrMsg(msg, "invalid bool data", pToken->z);
+          return tscSQLSyntaxErrMsg(msg, "invalid bool data", pToken->z);
         }
       } else if (pToken->type == TK_INTEGER) {
         iv = strtoll(pToken->z, NULL, 10);
@@ -242,7 +261,7 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
         numType = tscToInteger(pToken, &iv, &endptr);
         if (TK_ILLEGAL == numType) {
           return tscInvalidSQLErrMsg(msg, "invalid bigint data", pToken->z);
-        } else if (errno == ERANGE || iv > INT64_MAX || iv <= INT64_MIN) {
+        } else if (errno == ERANGE || iv == INT64_MIN) {
           return tscInvalidSQLErrMsg(msg, "bigint data overflow", pToken->z);
         }
 
@@ -302,32 +321,30 @@ int32_t tsParseOneColumnData(SSchema *pSchema, SSQLToken *pToken, char *payload,
     case TSDB_DATA_TYPE_BINARY:
       // binary data cannot be null-terminated char string, otherwise the last char of the string is lost
       if (pToken->type == TK_NULL) {
-        *payload = TSDB_DATA_BINARY_NULL;
+        setVardataNull(payload, TSDB_DATA_TYPE_BINARY);
       } else { // too long values will return invalid sql, not be truncated automatically
-        if (pToken->n > pSchema->bytes) {
+        if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) { //todo refactor
           return tscInvalidSQLErrMsg(msg, "string data overflow", pToken->z);
         }
         
-        strncpy(payload, pToken->z, pToken->n);
-        
-        if (pToken->n < pSchema->bytes) {
-          payload[pToken->n] = 0;   // add the null-terminated char if the length of the string is shorter than the available space
-        }
+        STR_WITH_SIZE_TO_VARSTR(payload, pToken->z, pToken->n);
       }
 
       break;
 
     case TSDB_DATA_TYPE_NCHAR:
       if (pToken->type == TK_NULL) {
-        *(uint32_t *)payload = TSDB_DATA_NCHAR_NULL;
+        setVardataNull(payload, TSDB_DATA_TYPE_NCHAR);
       } else {
-        // if the converted output len is over than pSchema->bytes, return error: 'Argument list too long'
-        if (!taosMbsToUcs4(pToken->z, pToken->n, payload, pSchema->bytes)) {
+        // if the converted output len is over than pColumnModel->bytes, return error: 'Argument list too long'
+        size_t output = 0;
+        if (!taosMbsToUcs4(pToken->z, pToken->n, varDataVal(payload), pSchema->bytes - VARSTR_HEADER_SIZE, &output)) {
           char buf[512] = {0};
-          snprintf(buf, 512, "%s", strerror(errno));
-          
+          snprintf(buf, tListLen(buf), "%s", strerror(errno));
           return tscInvalidSQLErrMsg(msg, buf, pToken->z);
         }
+        
+        varDataSetLen(payload, output);
       }
       break;
 
@@ -392,8 +409,7 @@ static int32_t tsCheckTimestamp(STableDataBlocks *pDataBlocks, const char *start
 int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[], SParsedDataColInfo *spd, char *error,
                       int16_t timePrec, int32_t *code, char *tmpTokenBuf) {
   int32_t index = 0;
-  // bool      isPrevOptr; //fang, never used
-  SSQLToken sToken = {0};
+  SStrToken sToken = {0};
   char *    payload = pDataBlocks->pData + pDataBlocks->size;
 
   // 1. set the parsed value from sql string
@@ -410,21 +426,21 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
     *str += index;
 
     if (sToken.type == TK_QUESTION) {
-      uint32_t offset = start - pDataBlocks->pData;
+      uint32_t offset = (uint32_t)(start - pDataBlocks->pData);
       if (tscAddParamToDataBlock(pDataBlocks, pSchema->type, (uint8_t)timePrec, pSchema->bytes, offset) != NULL) {
         continue;
       }
 
       strcpy(error, "client out of memory");
-      *code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+      *code = TSDB_CODE_TSC_OUT_OF_MEMORY;
       return -1;
     }
 
-    if (((sToken.type != TK_NOW) && (sToken.type != TK_INTEGER) && (sToken.type != TK_STRING) &&
-         (sToken.type != TK_FLOAT) && (sToken.type != TK_BOOL) && (sToken.type != TK_NULL)) ||
-        (sToken.n == 0) || (sToken.type == TK_RP)) {
-      tscInvalidSQLErrMsg(error, "invalid data or symbol", sToken.z);
-      *code = TSDB_CODE_INVALID_SQL;
+    int16_t type = sToken.type;
+    if ((type != TK_NOW && type != TK_INTEGER && type != TK_STRING && type != TK_FLOAT && type != TK_BOOL &&
+         type != TK_NULL && type != TK_HEX && type != TK_OCT && type != TK_BIN) || (sToken.n == 0) || (type == TK_RP)) {
+      tscSQLSyntaxErrMsg(error, "invalid data or symbol", sToken.z);
+      *code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
       return -1;
     }
 
@@ -434,7 +450,7 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
       char    delim = sToken.z[0];
       int32_t cnt = 0;
       int32_t j = 0;
-      for (int32_t k = 1; k < sToken.n - 1; ++k) {
+      for (uint32_t k = 1; k < sToken.n - 1; ++k) {
         if (sToken.z[k] == delim || sToken.z[k] == '\\') {
           if (sToken.z[k + 1] == delim) {
             cnt++;
@@ -456,13 +472,13 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
     bool    isPrimaryKey = (colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX);
     int32_t ret = tsParseOneColumnData(pSchema, &sToken, start, error, str, isPrimaryKey, timePrec);
     if (ret != TSDB_CODE_SUCCESS) {
-      *code = TSDB_CODE_INVALID_SQL;
+      *code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
       return -1;  // NOTE: here 0 mean error!
     }
 
     if (isPrimaryKey && tsCheckTimestamp(pDataBlocks, start) != TSDB_CODE_SUCCESS) {
       tscInvalidSQLErrMsg(error, "client time/server time can not be mixed up", sToken.z);
-      *code = TSDB_CODE_INVALID_TIME_STAMP;
+      *code = TSDB_CODE_TSC_INVALID_TIME_STAMP;
       return -1;
     }
   }
@@ -472,14 +488,23 @@ int tsParseOneRowData(char **str, STableDataBlocks *pDataBlocks, SSchema schema[
     char *ptr = payload;
 
     for (int32_t i = 0; i < spd->numOfCols; ++i) {
+      
       if (!spd->hasVal[i]) {  // current column do not have any value to insert, set it to null
-        setNull(ptr, schema[i].type, schema[i].bytes);
+        if (schema[i].type == TSDB_DATA_TYPE_BINARY) {
+          varDataSetLen(ptr, sizeof(int8_t));
+          *(uint8_t*) varDataVal(ptr) = TSDB_DATA_BINARY_NULL;
+        } else if (schema[i].type == TSDB_DATA_TYPE_NCHAR) {
+          varDataSetLen(ptr, sizeof(int32_t));
+          *(uint32_t*) varDataVal(ptr) = TSDB_DATA_NCHAR_NULL;
+        } else {
+          setNull(ptr, schema[i].type, schema[i].bytes);
+        }
       }
-
+      
       ptr += schema[i].bytes;
     }
 
-    rowSize = ptr - payload;
+    rowSize = (int32_t)(ptr - payload);
   }
 
   return rowSize;
@@ -496,19 +521,21 @@ static int32_t rowDataCompar(const void *lhs, const void *rhs) {
   }
 }
 
-int tsParseValues(char **str, STableDataBlocks *pDataBlock, SMeterMeta *pMeterMeta, int maxRows,
+int tsParseValues(char **str, STableDataBlocks *pDataBlock, STableMeta *pTableMeta, int maxRows,
                   SParsedDataColInfo *spd, char *error, int32_t *code, char *tmpTokenBuf) {
   int32_t   index = 0;
-  SSQLToken sToken;
+  SStrToken sToken;
 
-  int16_t numOfRows = 0;
+  int32_t numOfRows = 0;
 
-  SSchema *pSchema = tsGetSchema(pMeterMeta);
-  int32_t  precision = pMeterMeta->precision;
+  SSchema *pSchema = tscGetTableSchema(pTableMeta);
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  
+  int32_t  precision = tinfo.precision;
 
   if (spd->hasVal[0] == false) {
     strcpy(error, "primary timestamp column can not be null");
-    *code = TSDB_CODE_INVALID_SQL;
+    *code = TSDB_CODE_TSC_INVALID_SQL;
     return -1;
   }
 
@@ -518,9 +545,9 @@ int tsParseValues(char **str, STableDataBlocks *pDataBlock, SMeterMeta *pMeterMe
     if (sToken.n == 0 || sToken.type != TK_LP) break;
 
     *str += index;
-    if (numOfRows >= maxRows || pDataBlock->size + pMeterMeta->rowSize >= pDataBlock->nAllocSize) {
+    if (numOfRows >= maxRows || pDataBlock->size + tinfo.rowSize >= pDataBlock->nAllocSize) {
       int32_t tSize;
-      int32_t retcode = tscAllocateMemIfNeed(pDataBlock, pMeterMeta->rowSize, &tSize);
+      int32_t retcode = tscAllocateMemIfNeed(pDataBlock, tinfo.rowSize, &tSize);
       if (retcode != TSDB_CODE_SUCCESS) {  //TODO pass the correct error code to client
         strcpy(error, "client out of memory");
         *code = retcode;
@@ -541,8 +568,8 @@ int tsParseValues(char **str, STableDataBlocks *pDataBlock, SMeterMeta *pMeterMe
     sToken = tStrGetToken(*str, &index, false, 0, NULL);
     *str += index;
     if (sToken.n == 0 || sToken.type != TK_RP) {
-      tscInvalidSQLErrMsg(error, ") expected", *str);
-      *code = TSDB_CODE_INVALID_SQL;
+      tscSQLSyntaxErrMsg(error, ") expected", *str);
+      *code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
       return -1;
     }
 
@@ -551,7 +578,7 @@ int tsParseValues(char **str, STableDataBlocks *pDataBlock, SMeterMeta *pMeterMe
 
   if (numOfRows <= 0) {
     strcpy(error, "no any data points");
-    *code = TSDB_CODE_INVALID_SQL;
+    *code = TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
     return -1;
   } else {
     return numOfRows;
@@ -576,7 +603,6 @@ int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int3
   size_t    remain = pDataBlock->nAllocSize - pDataBlock->size;
   const int factor = 5;
   uint32_t nAllocSizeOld = pDataBlock->nAllocSize;
-  assert(pDataBlock->headerSize >= 0);
   
   // expand the allocated size
   if (remain < rowSize * factor) {
@@ -593,7 +619,7 @@ int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int3
       // do nothing, if allocate more memory failed
       pDataBlock->nAllocSize = nAllocSizeOld;
       *numOfRows = (int32_t)(pDataBlock->nAllocSize - pDataBlock->headerSize) / rowSize;
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }
   }
 
@@ -601,19 +627,19 @@ int32_t tscAllocateMemIfNeed(STableDataBlocks *pDataBlock, int32_t rowSize, int3
   return TSDB_CODE_SUCCESS;
 }
 
-static void tsSetBlockInfo(SShellSubmitBlock *pBlocks, const SMeterMeta *pMeterMeta, int32_t numOfRows) {
-  pBlocks->sid = pMeterMeta->sid;
-  pBlocks->uid = pMeterMeta->uid;
-  pBlocks->sversion = pMeterMeta->sversion;
+static void tsSetBlockInfo(SSubmitBlk *pBlocks, const STableMeta *pTableMeta, int32_t numOfRows) {
+  pBlocks->tid = pTableMeta->id.tid;
+  pBlocks->uid = pTableMeta->id.uid;
+  pBlocks->sversion = pTableMeta->sversion;
   pBlocks->numOfRows += numOfRows;
 }
 
 // data block is disordered, sort it in ascending order
-void sortRemoveDuplicates(STableDataBlocks *dataBuf) {
-  SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)dataBuf->pData;
+void tscSortRemoveDataBlockDupRows(STableDataBlocks *dataBuf) {
+  SSubmitBlk *pBlocks = (SSubmitBlk *)dataBuf->pData;
 
   // size is less than the total size, since duplicated rows may be removed yet.
-  assert(pBlocks->numOfRows * dataBuf->rowSize + sizeof(SShellSubmitBlock) == dataBuf->size);
+  assert(pBlocks->numOfRows * dataBuf->rowSize + sizeof(SSubmitBlk) == dataBuf->size);
 
   // if use server time, this block must be ordered
   if (dataBuf->tsSource == TSDB_USE_SERVER_TS) {
@@ -621,7 +647,7 @@ void sortRemoveDuplicates(STableDataBlocks *dataBuf) {
   }
 
   if (!dataBuf->ordered) {
-    char *pBlockData = pBlocks->payLoad;
+    char *pBlockData = pBlocks->data;
     qsort(pBlockData, pBlocks->numOfRows, dataBuf->rowSize, rowDataCompar);
 
     int32_t i = 0;
@@ -647,37 +673,38 @@ void sortRemoveDuplicates(STableDataBlocks *dataBuf) {
     dataBuf->ordered = true;
 
     pBlocks->numOfRows = i + 1;
-    dataBuf->size = sizeof(SShellSubmitBlock) + dataBuf->rowSize * pBlocks->numOfRows;
+    dataBuf->size = sizeof(SSubmitBlk) + dataBuf->rowSize * pBlocks->numOfRows;
   }
 }
 
-static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableHashList, char **str, SParsedDataColInfo *spd,
+static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableList, char **str, SParsedDataColInfo *spd,
                                       int32_t *totalNum) {
   SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  SMeterMeta *    pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableMeta *    pTableMeta = pTableMetaInfo->pTableMeta;
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  
   STableDataBlocks *dataBuf = NULL;
-  int32_t ret = tscGetDataBlockFromList(pTableHashList, pCmd->pDataBlocks, pMeterMeta->uid, TSDB_DEFAULT_PAYLOAD_SIZE,
-                                        sizeof(SShellSubmitBlock), pMeterMeta->rowSize, pMeterMetaInfo->name,
-                                        pMeterMeta, &dataBuf);
+  int32_t ret = tscGetDataBlockFromList(pTableList, pCmd->pDataBlocks, pTableMeta->id.uid, TSDB_DEFAULT_PAYLOAD_SIZE,
+                                        sizeof(SSubmitBlk), tinfo.rowSize, pTableMetaInfo->name,
+                                        pTableMeta, &dataBuf);
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
   
   int32_t maxNumOfRows;
-  ret = tscAllocateMemIfNeed(dataBuf, pMeterMeta->rowSize, &maxNumOfRows);
+  ret = tscAllocateMemIfNeed(dataBuf, tinfo.rowSize, &maxNumOfRows);
   if (TSDB_CODE_SUCCESS != ret) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  int32_t code = TSDB_CODE_INVALID_SQL;
+  int32_t code = TSDB_CODE_TSC_INVALID_SQL;
   char *  tmpTokenBuf = calloc(1, 4096);  // used for deleting Escape character: \\, \', \"
   if (NULL == tmpTokenBuf) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  int32_t numOfRows = tsParseValues(str, dataBuf, pMeterMeta, maxNumOfRows, spd, pCmd->payload, &code, tmpTokenBuf);
+  int32_t numOfRows = tsParseValues(str, dataBuf, pTableMeta, maxNumOfRows, spd, pCmd->payload, &code, tmpTokenBuf);
   free(tmpTokenBuf);
   if (numOfRows <= 0) {
     return code;
@@ -687,15 +714,15 @@ static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableHashList, char
     SParamInfo *param = dataBuf->params + i;
     if (param->idx == -1) {
       param->idx = pCmd->numOfParams++;
-      param->offset -= sizeof(SShellSubmitBlock);
+      param->offset -= sizeof(SSubmitBlk);
     }
   }
 
-  SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)(dataBuf->pData);
-  tsSetBlockInfo(pBlocks, pMeterMeta, numOfRows);
+  SSubmitBlk *pBlocks = (SSubmitBlk *)(dataBuf->pData);
+  tsSetBlockInfo(pBlocks, pTableMeta, numOfRows);
 
-  dataBuf->vgid = pMeterMeta->vgid;
-  dataBuf->numOfMeters = 1;
+  dataBuf->vgId = pTableMeta->vgroupInfo.vgId;
+  dataBuf->numOfTables = 1;
 
   /*
    * the value of pRes->numOfRows does not affect the true result of AFFECTED ROWS,
@@ -707,8 +734,8 @@ static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableHashList, char
 
 static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
   int32_t   index = 0;
-  SSQLToken sToken = {0};
-  SSQLToken tableToken = {0};
+  SStrToken sToken = {0};
+  SStrToken tableToken = {0};
   int32_t   code = TSDB_CODE_SUCCESS;
   
   const int32_t TABLE_INDEX = 0;
@@ -753,48 +780,52 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
   }
 
   if (numOfColList == 0 && cstart != NULL) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
   
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, TABLE_INDEX);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX);
   
   if (sToken.type == TK_USING) {  // create table if not exists according to the super table
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
     sql += index;
 
-    STagData *pTag = (STagData *)pCmd->payload;
+    tscAllocPayload(pCmd, sizeof(STagData));
+    STagData *pTag = &pCmd->tagData;
+
     memset(pTag, 0, sizeof(STagData));
     
-    /*
-     * the source super table is moved to the secondary position of the pMeterMetaInfo list
-     */
+    //the source super table is moved to the secondary position of the pTableMetaInfo list
     if (pQueryInfo->numOfTables < 2) {
-      tscAddEmptyMeterMetaInfo(pQueryInfo);
+      tscAddEmptyMetaInfo(pQueryInfo);
     }
 
-    SMeterMetaInfo *pSTableMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, STABLE_INDEX);
-    setMeterID(pSTableMeterMetaInfo, &sToken, pSql);
+    STableMetaInfo *pSTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
+    code = tscSetTableFullName(pSTableMeterMetaInfo, &sToken, pSql);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
 
-    strncpy(pTag->name, pSTableMeterMetaInfo->name, TSDB_METER_ID_LEN);
-    code = tscGetMeterMeta(pSql, pSTableMeterMetaInfo);
+    tstrncpy(pTag->name, pSTableMeterMetaInfo->name, sizeof(pTag->name));
+    code = tscGetTableMeta(pSql, pSTableMeterMetaInfo);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
 
-    if (!UTIL_METER_IS_SUPERTABLE(pSTableMeterMetaInfo)) {
+    if (!UTIL_TABLE_IS_SUPER_TABLE(pSTableMeterMetaInfo)) {
       return tscInvalidSQLErrMsg(pCmd->payload, "create table only from super table is allowed", sToken.z);
     }
 
-    SSchema *pTagSchema = tsGetTagSchema(pSTableMeterMetaInfo->pMeterMeta);
-
+    SSchema *pTagSchema = tscGetTableTagSchema(pSTableMeterMetaInfo->pTableMeta);
+    STableComInfo tinfo = tscGetTableInfo(pSTableMeterMetaInfo->pTableMeta);
+    
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
     sql += index;
 
     SParsedDataColInfo spd = {0};
-
-    uint8_t numOfTags = pSTableMeterMetaInfo->pMeterMeta->numOfTags;
+    
+    uint8_t numOfTags = tscGetNumOfTags(pSTableMeterMetaInfo->pTableMeta);
     spd.numOfCols = numOfTags;
 
     // if specify some tags column
@@ -814,9 +845,8 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
         sql += index;
 
         if (TK_STRING == sToken.type) {
-          sToken.n = strdequote(sToken.z);
-          strtrim(sToken.z);
-          sToken.n = (uint32_t)strlen(sToken.z);
+          strdequote(sToken.z);
+          sToken.n = (uint32_t)strtrim(sToken.z);
         }
 
         if (sToken.type == TK_RP) {
@@ -860,18 +890,26 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscInvalidSQLErrMsg(pCmd->payload, "keyword TAGS expected", sToken.z);
     }
 
+    SKVRowBuilder kvRowBuilder = {0};
+    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+
     uint32_t ignoreTokenTypes = TK_LP;
     uint32_t numOfIgnoreToken = 1;
     for (int i = 0; i < spd.numOfAssignedCols; ++i) {
-      char *  tagVal = pTag->data + spd.elems[i].offset;
-      int16_t colIndex = spd.elems[i].colIndex;
+      SSchema* pSchema = pTagSchema + spd.elems[i].colIndex;
 
       index = 0;
       sToken = tStrGetToken(sql, &index, true, numOfIgnoreToken, &ignoreTokenTypes);
       sql += index;
-      if (sToken.n == 0) {
-        break;
-      } else if (sToken.type == TK_RP) {
+
+      if (TK_ILLEGAL == sToken.type) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
+
+      if (sToken.n == 0 || sToken.type == TK_RP) {
         break;
       }
 
@@ -881,50 +919,47 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
         sToken.n -= 2;
       }
 
-      code = tsParseOneColumnData(&pTagSchema[colIndex], &sToken, tagVal, pCmd->payload, &sql, false,
-                                  pSTableMeterMetaInfo->pMeterMeta->precision);
+      char tagVal[TSDB_MAX_TAGS_LEN];
+      code = tsParseOneColumnData(pSchema, &sToken, tagVal, pCmd->payload, &sql, false, tinfo.precision);
       if (code != TSDB_CODE_SUCCESS) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
         return code;
       }
 
-      if ((pTagSchema[colIndex].type == TSDB_DATA_TYPE_BINARY || pTagSchema[colIndex].type == TSDB_DATA_TYPE_NCHAR) &&
-          sToken.n > pTagSchema[colIndex].bytes) {
-        return tscInvalidSQLErrMsg(pCmd->payload, "string too long", sToken.z);
-      }
+      tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
+    }
+
+    SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
+    tdDestroyKVRowBuilder(&kvRowBuilder);
+    if (row == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }
+    tdSortKVRowByColIdx(row);
+    pTag->dataLen = kvRowLen(row);
+    kvRowCpy(pTag->data, row);
+    free(row);
 
     index = 0;
     sToken = tStrGetToken(sql, &index, false, 0, NULL);
     sql += index;
     if (sToken.n == 0 || sToken.type != TK_RP) {
-      return tscInvalidSQLErrMsg(pCmd->payload, ") expected", sToken.z);
+      return tscSQLSyntaxErrMsg(pCmd->payload, ") expected", sToken.z);
     }
 
-    // 2. set the null value for the columns that do not assign values
-    if (spd.numOfAssignedCols < spd.numOfCols) {
-      char *ptr = pTag->data;
-
-      for (int32_t i = 0; i < spd.numOfCols; ++i) {
-        if (!spd.hasVal[i]) {  // current tag column do not have any value to insert, set it to null
-          setNull(ptr, pTagSchema[i].type, pTagSchema[i].bytes);
-        }
-
-        ptr += pTagSchema[i].bytes;
-      }
-    }
+    pTag->dataLen = htonl(pTag->dataLen);
 
     if (tscValidateName(&tableToken) != TSDB_CODE_SUCCESS) {
       return tscInvalidSQLErrMsg(pCmd->payload, "invalid table name", *sqlstr);
     }
 
-    int32_t ret = setMeterID(pMeterMetaInfo, &tableToken, pSql);
+    int32_t ret = tscSetTableFullName(pTableMetaInfo, &tableToken, pSql);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
 
     createTable = true;
-    code = tscGetMeterMetaEx(pSql, pMeterMetaInfo, true);
-    if (TSDB_CODE_ACTION_IN_PROGRESS == code) {
+    code = tscGetMeterMetaEx(pSql, pTableMetaInfo, true);
+    if (TSDB_CODE_TSC_ACTION_IN_PROGRESS == code) {
       return code;
     }
     
@@ -934,10 +969,14 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     } else {
       sql = sToken.z;
     }
-    code = tscGetMeterMeta(pSql, pMeterMetaInfo);
+    code = tscGetMeterMetaEx(pSql, pTableMetaInfo, false);
+    
+    if (pCmd->curSql == NULL) {
+      assert(code == TSDB_CODE_TSC_ACTION_IN_PROGRESS);
+    }
   }
 
-  int32_t len = cend - cstart + 1;
+  int32_t len = (int32_t)(cend - cstart + 1);
   if (cstart != NULL && createTable == true) {
     /* move the column list to start position of the next accessed points */
     memmove(sql - len, cstart, len);
@@ -946,17 +985,21 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     *sqlstr = sql;
   }
 
+  if (*sqlstr == NULL) {
+    code = TSDB_CODE_TSC_INVALID_SQL;
+  }
+  
   return code;
 }
 
-int validateTableName(char *tblName, int len) {
-  char buf[TSDB_METER_ID_LEN] = {0};
-  strncpy(buf, tblName, len);
+int validateTableName(char *tblName, int len, SStrToken* psTblToken) {
+  tstrncpy(psTblToken->z, tblName, TSDB_TABLE_FNAME_LEN);
 
-  SSQLToken token = {.n = len, .type = TK_ID, .z = buf};
-  tSQLGetToken(buf, &token.type);
+  psTblToken->n    = len;
+  psTblToken->type = TK_ID;
+  tSQLGetToken(psTblToken->z, &psTblToken->type);
 
-  return tscValidateName(&token);
+  return tscValidateName(psTblToken);
 }
 
 static int32_t validateDataSource(SSqlCmd *pCmd, int8_t type, const char *sql) {
@@ -977,48 +1020,43 @@ static int32_t validateDataSource(SSqlCmd *pCmd, int8_t type, const char *sql) {
  * @param pSql
  * @return
  */
-int doParseInsertSql(SSqlObj *pSql, char *str) {
+int tsParseInsertSql(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
+  char* str = pCmd->curSql;
 
   int32_t totalNum = 0;
   int32_t code = TSDB_CODE_SUCCESS;
 
-  SMeterMetaInfo *pMeterMetaInfo = NULL;
-
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   assert(pQueryInfo != NULL);
 
-  if (pQueryInfo->numOfTables == 0) {
-    pMeterMetaInfo = tscAddEmptyMeterMetaInfo(pQueryInfo);
-  } else {
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo *pTableMetaInfo = (pQueryInfo->numOfTables == 0)? tscAddEmptyMetaInfo(pQueryInfo):tscGetMetaInfo(pQueryInfo, 0);
+  if (pTableMetaInfo == NULL) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    code = terrno;
+    return code;
   }
 
-  if ((code = tscAllocPayload(pCmd, TSDB_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {
+  if ((code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {
     return code;
   }
 
-  assert(((NULL == pSql->asyncTblPos) && (NULL == pSql->pTableHashList))
-      || ((NULL != pSql->asyncTblPos) && (NULL != pSql->pTableHashList)));
-
-  if ((NULL == pSql->asyncTblPos) && (NULL == pSql->pTableHashList)) {
-    pSql->pTableHashList = taosInitHashTable(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
-
-    pSql->cmd.pDataBlocks = tscCreateBlockArrayList();
-    if (NULL == pSql->pTableHashList || NULL == pSql->cmd.pDataBlocks) {
-      code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-      goto _error_clean;
+  if (NULL == pCmd->pTableList) {
+    pCmd->pTableList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+    pCmd->pDataBlocks = taosArrayInit(4, POINTER_BYTES);
+    if (NULL == pCmd->pTableList || NULL == pSql->cmd.pDataBlocks) {
+      code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      goto _error;
     }
   } else {
-    assert((NULL != pSql->asyncTblPos) && (NULL != pSql->pTableHashList));
-    str = pSql->asyncTblPos;
+    str = pCmd->curSql;
   }
   
-  tscTrace("%p create data block list for submit data:%p, asyncTblPos:%p, pTableHashList:%p", pSql, pSql->cmd.pDataBlocks, pSql->asyncTblPos, pSql->pTableHashList);
+  tscDebug("%p create data block list for submit data:%p, pTableList:%p", pSql, pCmd->pDataBlocks, pCmd->pTableList);
 
   while (1) {
     int32_t   index = 0;
-    SSQLToken sToken = tStrGetToken(str, &index, false, 0, NULL);
+    SStrToken sToken = tStrGetToken(str, &index, false, 0, NULL);
 
     // no data in the sql string anymore.
     if (sToken.n == 0) {
@@ -1035,52 +1073,44 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
        * Otherwise, create the first submit block and submit to virtual node.
        */
       if (totalNum == 0) {
-        code = TSDB_CODE_INVALID_SQL;
-        goto _error_clean;
+        code = TSDB_CODE_TSC_INVALID_SQL;
+        goto _error;
       } else {
         break;
       }
     }
 
-    pSql->asyncTblPos = sToken.z;
-
+    pCmd->curSql = sToken.z;
+    char buf[TSDB_TABLE_FNAME_LEN];
+    SStrToken sTblToken;
+    sTblToken.z = buf;
     // Check if the table name available or not
-    if (validateTableName(sToken.z, sToken.n) != TSDB_CODE_SUCCESS) {
+    if (validateTableName(sToken.z, sToken.n, &sTblToken) != TSDB_CODE_SUCCESS) {
       code = tscInvalidSQLErrMsg(pCmd->payload, "table name invalid", sToken.z);
-      goto _error_clean;
+      goto _error;
     }
 
-    if ((code = setMeterID(pMeterMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
-      goto _error_clean;
+    if ((code = tscSetTableFullName(pTableMetaInfo, &sTblToken, pSql)) != TSDB_CODE_SUCCESS) {
+      goto _error;
     }
 
-    void *fp = pSql->fp;
-    ptrdiff_t pos = pSql->asyncTblPos - pSql->sqlstr;
-    
     if ((code = tscCheckIfCreateTable(&str, pSql)) != TSDB_CODE_SUCCESS) {
       /*
-       * For async insert, after get the metermeta from server, the sql string will not be
-       * parsed using the new metermeta to avoid the overhead cause by get metermeta data information.
-       * And during the getMeterMetaCallback function, the sql string will be parsed from the
-       * interrupted position.
+       * After retrieving the table meta from server, the sql string will be parsed from the paused position.
+       * And during the getTableMetaCallback function, the sql string will be parsed from the paused position.
        */
-      if (fp != NULL) {
-        if (TSDB_CODE_ACTION_IN_PROGRESS == code) {
-          tscTrace("async insert and waiting to get meter meta, then continue parse sql from offset: %" PRId64, pos);
-          return code;
-        }
-        
-        // todo add to return
-        tscError("async insert parse error, code:%d, %s", code, tsError[code]);
-        pSql->asyncTblPos = NULL;
+      if (TSDB_CODE_TSC_ACTION_IN_PROGRESS == code) {
+        return code;
       }
       
-      goto _error_clean;       // TODO: should _clean or _error_clean to async flow ????
+      tscError("%p async insert parse error, code:%s", pSql, tstrerror(code));
+      pCmd->curSql = NULL;
+      goto _error;
     }
 
-    if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
       code = tscInvalidSQLErrMsg(pCmd->payload, "insert data into super table is not supported", NULL);
-      goto _error_clean;
+      goto _error;
     }
 
     index = 0;
@@ -1089,30 +1119,32 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
 
     if (sToken.n == 0) {
       code = tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES or FILE required", sToken.z);
-      goto _error_clean;
+      goto _error;
     }
-
+    
+    STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+    
     if (sToken.type == TK_VALUES) {
-      SParsedDataColInfo spd = {.numOfCols = pMeterMetaInfo->pMeterMeta->numOfColumns};
-      SSchema *          pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
-
-      tscSetAssignedColumnInfo(&spd, pSchema, pMeterMetaInfo->pMeterMeta->numOfColumns);
+      SParsedDataColInfo spd = {.numOfCols = tinfo.numOfColumns};
+      
+      SSchema *pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
+      tscSetAssignedColumnInfo(&spd, pSchema, tinfo.numOfColumns);
 
       if (validateDataSource(pCmd, DATA_FROM_SQL_STRING, sToken.z) != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
+        goto _error;
       }
 
       /*
        * app here insert data in different vnodes, so we need to set the following
        * data in another submit procedure using async insert routines
        */
-      code = doParseInsertStatement(pSql, pSql->pTableHashList, &str, &spd, &totalNum);
+      code = doParseInsertStatement(pSql, pCmd->pTableList, &str, &spd, &totalNum);
       if (code != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
+        goto _error;
       }
     } else if (sToken.type == TK_FILE) {
       if (validateDataSource(pCmd, DATA_FROM_DATA_FILE, sToken.z) != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
+        goto _error;
       }
 
       index = 0;
@@ -1120,46 +1152,36 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
       str += index;
       if (sToken.n == 0) {
         code = tscInvalidSQLErrMsg(pCmd->payload, "file path is required following keyword FILE", sToken.z);
-        goto _error_clean;
+        goto _error;
       }
 
-      char fname[PATH_MAX] = {0};
-      strncpy(fname, sToken.z, sToken.n);
-      strdequote(fname);
+      strncpy(pCmd->payload, sToken.z, sToken.n);
+      strdequote(pCmd->payload);
 
+      // todo refactor extract method
       wordexp_t full_path;
-      if (wordexp(fname, &full_path, 0) != 0) {
+      if (wordexp(pCmd->payload, &full_path, 0) != 0) {
         code = tscInvalidSQLErrMsg(pCmd->payload, "invalid filename", sToken.z);
-        goto _error_clean;
+        goto _error;
       }
-      strcpy(fname, full_path.we_wordv[0]);
-      wordfree(&full_path);
 
-      STableDataBlocks *pDataBlock = NULL;
-      SMeterMeta* pMeterMeta = pMeterMetaInfo->pMeterMeta;
-      
-      int32_t ret = tscCreateDataBlock(PATH_MAX, pMeterMeta->rowSize, sizeof(SShellSubmitBlock), pMeterMetaInfo->name,
-                                       pMeterMeta, &pDataBlock);
-      if (ret != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
-      }
+      tstrncpy(pCmd->payload, full_path.we_wordv[0], pCmd->allocSize);
+      wordfree(&full_path);
 
-      tscAppendDataBlock(pCmd->pDataBlocks, pDataBlock);
-      strcpy(pDataBlock->filename, fname);
     } else if (sToken.type == TK_LP) {
       /* insert into tablename(col1, col2,..., coln) values(v1, v2,... vn); */
-      SMeterMeta *pMeterMeta = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0)->pMeterMeta;
-      SSchema *   pSchema = tsGetSchema(pMeterMeta);
+      STableMeta *pTableMeta = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0)->pTableMeta;
+      SSchema *   pSchema = tscGetTableSchema(pTableMeta);
 
       if (validateDataSource(pCmd, DATA_FROM_SQL_STRING, sToken.z) != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
+        goto _error;
       }
 
       SParsedDataColInfo spd = {0};
-      spd.numOfCols = pMeterMeta->numOfColumns;
+      spd.numOfCols = tinfo.numOfColumns;
 
       int16_t offset[TSDB_MAX_COLUMNS] = {0};
-      for (int32_t t = 1; t < pMeterMeta->numOfColumns; ++t) {
+      for (int32_t t = 1; t < tinfo.numOfColumns; ++t) {
         offset[t] = offset[t - 1] + pSchema[t - 1].bytes;
       }
 
@@ -1169,9 +1191,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
         str += index;
 
         if (TK_STRING == sToken.type) {
-          sToken.n = strdequote(sToken.z);
-          strtrim(sToken.z);
-          sToken.n = (uint32_t)strlen(sToken.z);
+          tscDequoteAndTrimToken(&sToken);
         }
 
         if (sToken.type == TK_RP) {
@@ -1181,7 +1201,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
         bool findColumnIndex = false;
 
         // todo speedup by using hash list
-        for (int32_t t = 0; t < pMeterMeta->numOfColumns; ++t) {
+        for (int32_t t = 0; t < tinfo.numOfColumns; ++t) {
           if (strncmp(sToken.z, pSchema[t].name, sToken.n) == 0 && strlen(pSchema[t].name) == sToken.n) {
             SParsedColElem *pElem = &spd.elems[spd.numOfAssignedCols++];
             pElem->offset = offset[t];
@@ -1189,7 +1209,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
 
             if (spd.hasVal[t] == true) {
               code = tscInvalidSQLErrMsg(pCmd->payload, "duplicated column name", sToken.z);
-              goto _error_clean;
+              goto _error;
             }
 
             spd.hasVal[t] = true;
@@ -1200,13 +1220,13 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
 
         if (!findColumnIndex) {
           code = tscInvalidSQLErrMsg(pCmd->payload, "invalid column name", sToken.z);
-          goto _error_clean;
+          goto _error;
         }
       }
 
-      if (spd.numOfAssignedCols == 0 || spd.numOfAssignedCols > pMeterMeta->numOfColumns) {
+      if (spd.numOfAssignedCols == 0 || spd.numOfAssignedCols > tinfo.numOfColumns) {
         code = tscInvalidSQLErrMsg(pCmd->payload, "column name expected", sToken.z);
-        goto _error_clean;
+        goto _error;
       }
 
       index = 0;
@@ -1215,16 +1235,16 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
 
       if (sToken.type != TK_VALUES) {
         code = tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES is expected", sToken.z);
-        goto _error_clean;
+        goto _error;
       }
 
-      code = doParseInsertStatement(pSql, pSql->pTableHashList, &str, &spd, &totalNum);
+      code = doParseInsertStatement(pSql, pCmd->pTableList, &str, &spd, &totalNum);
       if (code != TSDB_CODE_SUCCESS) {
-        goto _error_clean;
+        goto _error;
       }
     } else {
       code = tscInvalidSQLErrMsg(pCmd->payload, "keyword VALUES or FILE are required", sToken.z);
-      goto _error_clean;
+      goto _error;
     }
   }
 
@@ -1233,113 +1253,113 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
     goto _clean;
   }
 
-  // submit to more than one vnode
-  if (pCmd->pDataBlocks->nSize > 0) {
-    // merge according to vgid
+  if (taosArrayGetSize(pCmd->pDataBlocks) > 0) { // merge according to vgId
     if ((code = tscMergeTableDataBlocks(pSql, pCmd->pDataBlocks)) != TSDB_CODE_SUCCESS) {
-      goto _error_clean;
+      goto _error;
     }
-
-    STableDataBlocks *pDataBlock = pCmd->pDataBlocks->pData[0];
-    if ((code = tscCopyDataBlockToPayload(pSql, pDataBlock)) != TSDB_CODE_SUCCESS) {
-      goto _error_clean;
-    }
-
-    pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
-
-    // set the next sent data vnode index in data block arraylist
-    pMeterMetaInfo->vnodeIndex = 1;
-  } else {
-    pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
   }
 
   code = TSDB_CODE_SUCCESS;
   goto _clean;
 
-_error_clean:
+_error:
   pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
 
 _clean:
-  taosCleanUpHashTable(pSql->pTableHashList);
+  taosHashCleanup(pCmd->pTableList);
+  pCmd->pTableList = NULL;
   
-  pSql->pTableHashList = NULL;
-  pSql->asyncTblPos    = NULL;
-  pCmd->isParseFinish  = 1;
+  pCmd->curSql    = NULL;
+  pCmd->parseFinished  = 1;
   
   return code;
 }
 
-int tsParseInsertSql(SSqlObj *pSql) {
+int tsInsertInitialCheck(SSqlObj *pSql) {
   if (!pSql->pTscObj->writeAuth) {
-    return TSDB_CODE_NO_RIGHTS;
+    return TSDB_CODE_TSC_NO_WRITE_AUTH;
   }
 
   int32_t  index = 0;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SSQLToken sToken = tStrGetToken(pSql->sqlstr, &index, false, 0, NULL);
+  SStrToken sToken = tStrGetToken(pSql->sqlstr, &index, false, 0, NULL);
   assert(sToken.type == TK_INSERT || sToken.type == TK_IMPORT);
 
   pCmd->count = 0;
   pCmd->command = TSDB_SQL_INSERT;
+  pSql->res.numOfRows = 0;
 
-  SQueryInfo *pQueryInfo = NULL;
-  tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex, &pQueryInfo);
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex);
 
-  uint16_t type = (sToken.type == TK_INSERT)? TSDB_QUERY_TYPE_INSERT:TSDB_QUERY_TYPE_IMPORT;
-  TSDB_QUERY_SET_TYPE(pQueryInfo->type, type);
+  TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT | pCmd->insertType);
 
   sToken = tStrGetToken(pSql->sqlstr, &index, false, 0, NULL);
   if (sToken.type != TK_INTO) {
     return tscInvalidSQLErrMsg(pCmd->payload, "keyword INTO is expected", sToken.z);
   }
 
-  pSql->res.numOfRows = 0;
-  return doParseInsertSql(pSql, pSql->sqlstr + index);
+  pCmd->curSql = sToken.z + sToken.n;
+  return TSDB_CODE_SUCCESS;
 }
 
-int tsParseSql(SSqlObj *pSql, bool multiVnodeInsertion) {
+int tsParseSql(SSqlObj *pSql, bool initial) {
   int32_t ret = TSDB_CODE_SUCCESS;
+  SSqlCmd* pCmd = &pSql->cmd;
 
-  if (NULL == pSql->asyncTblPos) {
-    tscCleanSqlCmd(&pSql->cmd);
-  } else {
-    tscTrace("continue parse sql: %s", pSql->asyncTblPos);
+  if ((!pCmd->parseFinished) && (!initial)) {
+    tscDebug("%p resume to parse sql: %s", pSql, pCmd->curSql);
   }
   
-  if (tscIsInsertOrImportData(pSql->sqlstr)) {
+  ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  if (TSDB_CODE_SUCCESS != ret) {
+    return ret;
+  }
+
+  if (tscIsInsertData(pSql->sqlstr)) {
     /*
-     * only for async multi-vnode insertion
-     * Set the fp before parse the sql string, in case of getmetermeta failed, in which
-     * the error handle callback function can rightfully restore the user defined function (fp)
+     * Set the fp before parse the sql string, in case of getTableMeta failed, in which
+     * the error handle callback function can rightfully restore the user-defined callback function (fp).
      */
-    if (pSql->fp != NULL && multiVnodeInsertion) {
-      assert(pSql->fetchFp == NULL);
+    if (initial && (pSql->cmd.insertType != TSDB_QUERY_TYPE_STMT_INSERT)) {
       pSql->fetchFp = pSql->fp;
+      pSql->fp = (void(*)())tscHandleMultivnodeInsert;
+    }
 
-      // replace user defined callback function with multi-insert proxy function
-      pSql->fp = tscAsyncInsertMultiVnodesProxy;
+    if (initial && ((ret = tsInsertInitialCheck(pSql)) != TSDB_CODE_SUCCESS)) {
+      return ret;
     }
 
+    // make a backup as tsParseInsertSql may modify the string
+    char* sqlstr = strdup(pSql->sqlstr);
     ret = tsParseInsertSql(pSql);
+    if (sqlstr == NULL || pSql->parseRetry >= 1 || ret != TSDB_CODE_TSC_INVALID_SQL) {
+      free(sqlstr);
+    } else {
+      tscResetSqlCmdObj(pCmd, true);
+      free(pSql->sqlstr);
+      pSql->sqlstr = sqlstr;
+      pSql->parseRetry++;
+      if ((ret = tsInsertInitialCheck(pSql)) == TSDB_CODE_SUCCESS) {
+        ret = tsParseInsertSql(pSql);
+      }
+    }
   } else {
-    ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
-    if (TSDB_CODE_SUCCESS != ret) return ret;
-
-    SSqlInfo SQLInfo = {0};
-    tSQLParse(&SQLInfo, pSql->sqlstr);
-
+    SSqlInfo SQLInfo = qSQLParse(pSql->sqlstr);
     ret = tscToSQLCmd(pSql, &SQLInfo);
+    if (ret == TSDB_CODE_TSC_INVALID_SQL && pSql->parseRetry == 0 && SQLInfo.type == TSDB_SQL_NULL) {
+      tscResetSqlCmdObj(pCmd, true);
+      pSql->parseRetry++;
+      ret = tscToSQLCmd(pSql, &SQLInfo);
+    }
     SQLInfoDestroy(&SQLInfo);
   }
 
   /*
-   * the pRes->code may be modified or even released by another thread in tscMeterMetaCallBack
-   * function, so do NOT use pRes->code to determine if the getMeterMeta/getMetricMeta function
-   * invokes new threads to get data from mnode or simply retrieves data from cache.
-   *
-   * do NOT assign return code to pRes->code for the same reason for it may be released by another thread
-   * pRes->code = ret;
+   * the pRes->code may be modified or released by another thread in tscTableMetaCallBack function,
+   * so do NOT use pRes->code to determine if the getTableMeta function
+   * invokes new threads to get data from mgmt node or simply retrieves data from cache.
+   * do NOT assign return code to pRes->code for the same reason since it may be released by another thread already.
    */
   return ret;
 }
@@ -1347,238 +1367,162 @@ int tsParseSql(SSqlObj *pSql, bool multiVnodeInsertion) {
 static int doPackSendDataBlock(SSqlObj *pSql, int32_t numOfRows, STableDataBlocks *pTableDataBlocks) {
   int32_t  code = TSDB_CODE_SUCCESS;
   SSqlCmd *pCmd = &pSql->cmd;
+  pSql->res.numOfRows = 0;
 
   assert(pCmd->numOfClause == 1);
-  SMeterMeta *pMeterMeta = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0)->pMeterMeta;
+  STableMeta *pTableMeta = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0)->pTableMeta;
 
-  SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)(pTableDataBlocks->pData);
-  tsSetBlockInfo(pBlocks, pMeterMeta, numOfRows);
+  SSubmitBlk *pBlocks = (SSubmitBlk *)(pTableDataBlocks->pData);
+  tsSetBlockInfo(pBlocks, pTableMeta, numOfRows);
 
   if ((code = tscMergeTableDataBlocks(pSql, pCmd->pDataBlocks)) != TSDB_CODE_SUCCESS) {
     return code;
   }
 
-  // the pDataBlock is different from the pTableDataBlocks
-  STableDataBlocks *pDataBlock = pCmd->pDataBlocks->pData[0];
+  STableDataBlocks *pDataBlock = taosArrayGetP(pCmd->pDataBlocks, 0);
   if ((code = tscCopyDataBlockToPayload(pSql, pDataBlock)) != TSDB_CODE_SUCCESS) {
     return code;
   }
 
-  if ((code = tscProcessSql(pSql)) != TSDB_CODE_SUCCESS) {
-    return code;
+  return tscProcessSql(pSql);
+}
+
+typedef struct SImportFileSupport {
+  SSqlObj *pSql;
+  FILE    *fp;
+} SImportFileSupport;
+
+static void parseFileSendDataBlock(void *param, TAOS_RES *tres, int code) {
+  assert(param != NULL && tres != NULL);
+
+  SSqlObj *pSql = tres;
+  SSqlCmd *pCmd = &pSql->cmd;
+
+  SImportFileSupport *pSupporter = (SImportFileSupport *) param;
+
+  SSqlObj *pParentSql = pSupporter->pSql;
+  FILE    *fp = pSupporter->fp;
+
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {  // handle error
+    assert(taos_errno(pSql) == code);
+
+    taos_free_result(pSql);
+    taosTFree(pSupporter);
+    fclose(fp);
+
+    pParentSql->res.code = code;
+    tscQueueAsyncRes(pParentSql);
+    return;
   }
 
-  return TSDB_CODE_SUCCESS;
-}
+  // accumulate the total submit records
+  pParentSql->res.numOfRows += pSql->res.numOfRows;
 
-static int tscInsertDataFromFile(SSqlObj *pSql, FILE *fp, char *tmpTokenBuf) {
-  size_t          readLen = 0;
-  char *          line = NULL;
-  size_t          n = 0;
-  int             len = 0;
-  int32_t         maxRows = 0;
-  SSqlCmd *       pCmd = &pSql->cmd;
-  int             numOfRows = 0;
-  int32_t         code = 0;
-  int             nrows = 0;
-  
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  SMeterMeta *    pMeterMeta = pMeterMetaInfo->pMeterMeta;
-  assert(pCmd->numOfClause == 1);
-  
-  int32_t         rowSize = pMeterMeta->rowSize;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableMeta *    pTableMeta = pTableMetaInfo->pTableMeta;
+  SSchema *       pSchema = tscGetTableSchema(pTableMeta);
+  STableComInfo   tinfo = tscGetTableInfo(pTableMeta);
+
+  SParsedDataColInfo spd = {.numOfCols = tinfo.numOfColumns};
+  tscSetAssignedColumnInfo(&spd, pSchema, tinfo.numOfColumns);
+
+  size_t  n = 0;
+  ssize_t readLen = 0;
+  char *  line = NULL;
+  int32_t count = 0;
+  int32_t maxRows = 0;
+
+  tscDestroyBlockArrayList(pSql->cmd.pDataBlocks);
+  pCmd->pDataBlocks = taosArrayInit(1, POINTER_BYTES);
 
-  pCmd->pDataBlocks = tscCreateBlockArrayList();
   STableDataBlocks *pTableDataBlock = NULL;
-  int32_t           ret = tscCreateDataBlock(TSDB_PAYLOAD_SIZE, rowSize, sizeof(SShellSubmitBlock),
-                                   pMeterMetaInfo->name, pMeterMeta, &pTableDataBlock);
+  int32_t ret = tscCreateDataBlock(TSDB_PAYLOAD_SIZE, tinfo.rowSize, sizeof(SSubmitBlk), pTableMetaInfo->name, pTableMeta, &pTableDataBlock);
   if (ret != TSDB_CODE_SUCCESS) {
-    return -1;
+//    return ret;
   }
 
-  tscAppendDataBlock(pCmd->pDataBlocks, pTableDataBlock);
-
-  code = tscAllocateMemIfNeed(pTableDataBlock, rowSize, &maxRows);
-  if (TSDB_CODE_SUCCESS != code) return -1;
+  taosArrayPush(pCmd->pDataBlocks, &pTableDataBlock);
+  tscAllocateMemIfNeed(pTableDataBlock, tinfo.rowSize, &maxRows);
 
-  int                count = 0;
-  SParsedDataColInfo spd = {.numOfCols = pMeterMeta->numOfColumns};
-  SSchema *          pSchema = tsGetSchema(pMeterMeta);
+  char *tokenBuf = calloc(1, 4096);
 
-  tscSetAssignedColumnInfo(&spd, pSchema, pMeterMeta->numOfColumns);
+  while ((readLen = taosGetline(&line, &n, fp)) != -1) {
+    if (('\r' == line[readLen - 1]) || ('\n' == line[readLen - 1])) {
+      line[--readLen] = 0;
+    }
 
-  while ((readLen = getline(&line, &n, fp)) != -1) {
-    // line[--readLen] = '\0';
-    if (('\r' == line[readLen - 1]) || ('\n' == line[readLen - 1])) line[--readLen] = 0;
-    if (readLen == 0) continue;  // fang, <= to ==
+    if (readLen == 0) {
+      continue;
+    }
 
     char *lineptr = line;
     strtolower(line, line);
-    
-    len = tsParseOneRowData(&lineptr, pTableDataBlock, pSchema, &spd, pCmd->payload, pMeterMeta->precision, &code, tmpTokenBuf);
+
+    int32_t len =
+        tsParseOneRowData(&lineptr, pTableDataBlock, pSchema, &spd, pCmd->payload, tinfo.precision, &code, tokenBuf);
     if (len <= 0 || pTableDataBlock->numOfParams > 0) {
       pSql->res.code = code;
-      return (-code);
+      break;
     }
 
     pTableDataBlock->size += len;
 
-    count++;
-    nrows++;
-    if (count >= maxRows) {
-      if ((code = doPackSendDataBlock(pSql, count, pTableDataBlock)) != TSDB_CODE_SUCCESS) {
-        return -code;
-      }
-
-      pTableDataBlock = pCmd->pDataBlocks->pData[0];
-      pTableDataBlock->size = sizeof(SShellSubmitBlock);
-      pTableDataBlock->rowSize = pMeterMeta->rowSize;
-
-      numOfRows += pSql->res.numOfRows;
-      pSql->res.numOfRows = 0;
-      count = 0;
+    if (++count >= maxRows) {
+      break;
     }
   }
 
+  taosTFree(tokenBuf);
+  free(line);
+
   if (count > 0) {
-    if ((code = doPackSendDataBlock(pSql, count, pTableDataBlock)) != TSDB_CODE_SUCCESS) {
-      return -code;
+    code = doPackSendDataBlock(pSql, count, pTableDataBlock);
+    if (code != TSDB_CODE_SUCCESS) {
+      pParentSql->res.code = code;
+      tscQueueAsyncRes(pParentSql);
+      return;
     }
 
-    numOfRows += pSql->res.numOfRows;
-    pSql->res.numOfRows = 0;
-  }
-
-  if (line) tfree(line);
-
-  return numOfRows;
-}
-
-/* multi-vnodes insertion in sync query model
- *
- * modify history
- * 2019.05.10 lihui
- * Remove the code for importing records from files
- */
-void tscProcessMultiVnodesInsert(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  // not insert/import, return directly
-  if (pCmd->command != TSDB_SQL_INSERT) {
-    return;
-  }
-
-  // SSqlCmd may have been released
-  if (pCmd->pDataBlocks == NULL) {
-    return;
-  }
-
-  STableDataBlocks *pDataBlock = NULL;
-  SMeterMetaInfo *  pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  assert(pCmd->numOfClause == 1);
-  
-  int32_t           code = TSDB_CODE_SUCCESS;
-
-  /* the first block has been sent to server in processSQL function */
-  assert(pMeterMetaInfo->vnodeIndex >= 1 && pCmd->pDataBlocks != NULL);
-
-  if (pMeterMetaInfo->vnodeIndex < pCmd->pDataBlocks->nSize) {
-    SDataBlockList *pDataBlocks = pCmd->pDataBlocks;
-
-    for (int32_t i = pMeterMetaInfo->vnodeIndex; i < pDataBlocks->nSize; ++i) {
-      pDataBlock = pDataBlocks->pData[i];
-      if (pDataBlock == NULL) {
-        continue;
-      }
+  } else {
+    taos_free_result(pSql);
+    taosTFree(pSupporter);
+    fclose(fp);
 
-      if ((code = tscCopyDataBlockToPayload(pSql, pDataBlock)) != TSDB_CODE_SUCCESS) {
-        tscTrace("%p build submit data block failed, vnodeIdx:%d, total:%d", pSql, pMeterMetaInfo->vnodeIndex,
-                 pDataBlocks->nSize);
-        continue;
-      }
+    pParentSql->fp = pParentSql->fetchFp;
 
-      tscProcessSql(pSql);
-    }
+    // all data has been sent to vnode, call user function
+    int32_t v = (pParentSql->res.code != TSDB_CODE_SUCCESS) ? pParentSql->res.code : (int32_t)pParentSql->res.numOfRows;
+    (*pParentSql->fp)(pParentSql->param, pParentSql, v);
   }
-
-  // all data have been submit to vnode, release data blocks
-  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
 }
 
-// multi-vnodes insertion in sync query model
-void tscProcessMultiVnodesInsertFromFile(SSqlObj *pSql) {
+void tscProcessMultiVnodesImportFromFile(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
   if (pCmd->command != TSDB_SQL_INSERT) {
     return;
   }
 
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  assert(pCmd->dataSourceType == DATA_FROM_DATA_FILE  && strlen(pCmd->payload) != 0);
 
-  STableDataBlocks *pDataBlock = NULL;
-  int32_t           affected_rows = 0;
+  SImportFileSupport *pSupporter = calloc(1, sizeof(SImportFileSupport));
+  SSqlObj *pNew = createSubqueryObj(pSql, 0, parseFileSendDataBlock, pSupporter, TSDB_SQL_INSERT, NULL);
 
-  assert(pCmd->dataSourceType == DATA_FROM_DATA_FILE && pCmd->pDataBlocks != NULL);
-  SDataBlockList *pDataBlockList = pCmd->pDataBlocks;
-  pCmd->pDataBlocks = NULL;
+  pNew->cmd.pDataBlocks = taosArrayInit(4, POINTER_BYTES);
+  pCmd->count = 1;
 
-  char path[PATH_MAX] = {0};
+  FILE *fp = fopen(pCmd->payload, "r");
+  if (fp == NULL) {
+    pSql->res.code = TAOS_SYSTEM_ERROR(errno);
+    tscError("%p failed to open file %s to load data from file, code:%s", pSql, pCmd->payload, tstrerror(pSql->res.code));
 
-  for (int32_t i = 0; i < pDataBlockList->nSize; ++i) {
-    pDataBlock = pDataBlockList->pData[i];
-    if (pDataBlock == NULL) {
-      continue;
-    }
+    taosTFree(pSupporter)
+    tscQueueAsyncRes(pSql);
 
-    if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_PAYLOAD_SIZE)) {
-      tscError("%p failed to malloc when insert file", pSql);
-      continue;
-    }
-    pCmd->count = 1;
-
-    strncpy(path, pDataBlock->filename, PATH_MAX);
-
-    FILE *fp = fopen(path, "r");
-    if (fp == NULL) {
-      tscError("%p failed to open file %s to load data from file, reason:%s", pSql, path, strerror(errno));
-      continue;
-    }
-
-    strncpy(pMeterMetaInfo->name, pDataBlock->meterId, TSDB_METER_ID_LEN);
-    memset(pDataBlock->pData, 0, pDataBlock->nAllocSize);
-
-    int32_t ret = tscGetMeterMeta(pSql, pMeterMetaInfo);
-    if (ret != TSDB_CODE_SUCCESS) {
-      tscError("%p get meter meta failed, abort", pSql);
-      continue;
-    }
-
-    char *tmpTokenBuf = calloc(1, 4096);  // used for deleting Escape character: \\, \', \"
-    if (NULL == tmpTokenBuf) {
-      tscError("%p calloc failed", pSql);
-      continue;
-    }
-
-    int nrows = tscInsertDataFromFile(pSql, fp, tmpTokenBuf);
-    free(tmpTokenBuf);
-
-    pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-
-    if (nrows < 0) {
-      fclose(fp);
-      tscTrace("%p no records(%d) in file %s", pSql, nrows, path);
-      continue;
-    }
-
-    fclose(fp);
-    affected_rows += nrows;
-
-    tscTrace("%p Insert data %d records from file %s", pSql, nrows, path);
+    return;
   }
 
-  pSql->res.numOfRows = affected_rows;
+  pSupporter->pSql = pSql;
+  pSupporter->fp = fp;
 
-  // all data have been submit to vnode, release data blocks
-  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-  tscDestroyBlockArrayList(pDataBlockList);
+  parseFileSendDataBlock(pSupporter, pNew, 0);
 }
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 4ab63c18e9ad339664b1771bead46aedcb0c9d48..cdbd8685df55d74836b2bcc768e52bf22b972d72 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -12,18 +12,18 @@
  * 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 "os.h"
 
 #include "taos.h"
 #include "tsclient.h"
-#include "tscSQLParser.h"
 #include "tscUtil.h"
 #include "ttimer.h"
 #include "taosmsg.h"
 #include "tstrbuild.h"
-
+#include "tscLog.h"
+#include "tscSubquery.h"
 
 int tsParseInsertSql(SSqlObj *pSql);
-int taos_query_imp(STscObj* pObj, SSqlObj* pSql);
 
 ////////////////////////////////////////////////////////////////////////////////
 // functions for normal statement preparation
@@ -61,7 +61,7 @@ static int normalStmtAddPart(SNormalStmt* stmt, bool isParam, char* str, uint32_
     size *= 2;
     void* tmp = realloc(stmt->parts, sizeof(SNormalStmtPart) * size);
     if (tmp == NULL) {
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }
     stmt->sizeParts = size;
     stmt->parts = (SNormalStmtPart*)tmp;
@@ -132,7 +132,7 @@ static int normalStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
       case TSDB_DATA_TYPE_NCHAR:
         var->pz = (char*)malloc((*tb->length) + 1);
         if (var->pz == NULL) {
-          return TSDB_CODE_CLI_OUT_OF_MEMORY;
+          return TSDB_CODE_TSC_OUT_OF_MEMORY;
         }
         memcpy(var->pz, tb->buffer, (*tb->length));
         var->pz[*tb->length] = 0;
@@ -140,8 +140,8 @@ static int normalStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
         break;
 
       default:
-        tscTrace("param %d: type mismatch or invalid", i);
-        return TSDB_CODE_INVALID_VALUE;
+        tscDebug("param %d: type mismatch or invalid", i);
+        return TSDB_CODE_TSC_INVALID_VALUE;
     }
   }
   
@@ -155,7 +155,7 @@ static int normalStmtPrepare(STscStmt* stmt) {
   uint32_t i = 0, start = 0;
 
   while (sql[i] != 0) {
-    SSQLToken token = {0};
+    SStrToken token = {0};
     token.n = tSQLGetToken(sql + i, &token.type);
 
     if (token.type == TK_QUESTION) {
@@ -186,7 +186,7 @@ static int normalStmtPrepare(STscStmt* stmt) {
   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_TSC_OUT_OF_MEMORY;
     }
   }
 
@@ -195,7 +195,7 @@ static int normalStmtPrepare(STscStmt* stmt) {
 
 static char* normalStmtBuildSql(STscStmt* stmt) {
   SNormalStmt* normal = &stmt->normal;
-  SStringBuilder sb = {0};
+  SStringBuilder sb; memset(&sb, 0, sizeof(sb));
 
   if (taosStringBuilderSetJmp(&sb) != 0) {
     taosStringBuilderDestroy(&sb);
@@ -263,12 +263,16 @@ static char* normalStmtBuildSql(STscStmt* stmt) {
 
 static int doBindParam(char* data, SParamInfo* param, TAOS_BIND* bind) {
   if (bind->is_null != NULL && *(bind->is_null)) {
-    setNull(data, param->type, param->bytes);
+    if (param->type == TSDB_DATA_TYPE_BINARY || param->type == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(data + param->offset, param->type);
+    } else {
+      setNull(data + param->offset, param->type, param->bytes);
+    }
     return TSDB_CODE_SUCCESS;
   }
 
   if (bind->buffer_type != param->type) {
-    return TSDB_CODE_INVALID_VALUE;
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
   short size = 0;
@@ -294,21 +298,24 @@ static int doBindParam(char* data, SParamInfo* param, TAOS_BIND* bind) {
       break;
 
     case TSDB_DATA_TYPE_BINARY:
-      if ((*bind->length) > param->bytes) {
-        return TSDB_CODE_INVALID_VALUE;
+      if ((*bind->length) > (uintptr_t)param->bytes) {
+        return TSDB_CODE_TSC_INVALID_VALUE;
       }
       size = (short)*bind->length;
-      break;
+      STR_WITH_SIZE_TO_VARSTR(data + param->offset, bind->buffer, size);
+      return TSDB_CODE_SUCCESS;
     
-    case TSDB_DATA_TYPE_NCHAR:
-      if (!taosMbsToUcs4(bind->buffer, *bind->length, data + param->offset, param->bytes)) {
-        return TSDB_CODE_INVALID_VALUE;
-      }
+    case TSDB_DATA_TYPE_NCHAR: {
+      size_t output = 0;
+      if (!taosMbsToUcs4(bind->buffer, *bind->length, varDataVal(data + param->offset), param->bytes - VARSTR_HEADER_SIZE, &output)) {
+        return TSDB_CODE_TSC_INVALID_VALUE;
+      }      
+      varDataSetLen(data + param->offset, output);
       return TSDB_CODE_SUCCESS;
-
+    }
     default:
       assert(false);
-      return TSDB_CODE_INVALID_VALUE;
+      return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
   memcpy(data + param->offset, bind->buffer, size);
@@ -324,31 +331,32 @@ static int insertStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
     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);
+  size_t size = taosArrayGetSize(pCmd->pDataBlocks);
+  for (int32_t i = 0; i < size; ++i) {
+    STableDataBlocks* pBlock = taosArrayGetP(pCmd->pDataBlocks, i);
+    uint32_t          totalDataSize = pBlock->size - sizeof(SSubmitBlk);
     uint32_t          dataSize = totalDataSize / alloced;
     assert(dataSize * alloced == totalDataSize);
 
     if (alloced == binded) {
-      totalDataSize += dataSize + sizeof(SShellSubmitBlock);
+      totalDataSize += dataSize + sizeof(SSubmitBlk);
       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;
+          return TSDB_CODE_TSC_OUT_OF_MEMORY;
         }
         pBlock->pData = (char*)tmp;
         pBlock->nAllocSize = (uint32_t)(totalDataSize * factor);
       }
     }
 
-    char* data = pBlock->pData + sizeof(SShellSubmitBlock) + dataSize * binded;
+    char* data = pBlock->pData + sizeof(SSubmitBlk) + 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);
+        tscDebug("param %d: type mismatch or invalid", param->idx);
         return code;
       }
     }
@@ -363,13 +371,14 @@ static int insertStmtBindParam(STscStmt* stmt, TAOS_BIND* bind) {
     return TSDB_CODE_SUCCESS;
   }
 
-  for (int32_t i = 0; i < pCmd->pDataBlocks->nSize; ++i) {
-    STableDataBlocks* pBlock = pCmd->pDataBlocks->pData[i];
+  size_t total = taosArrayGetSize(pCmd->pDataBlocks);
+  for (int32_t i = 0; i < total; ++i) {
+    STableDataBlocks* pBlock = taosArrayGetP(pCmd->pDataBlocks, i);
 
-    uint32_t totalDataSize = pBlock->size - sizeof(SShellSubmitBlock);
+    uint32_t totalDataSize = pBlock->size - sizeof(SSubmitBlk);
     pBlock->size += totalDataSize / alloced;
 
-    SShellSubmitBlock* pSubmit = (SShellSubmitBlock*)pBlock->pData;
+    SSubmitBlk* pSubmit = (SSubmitBlk*)pBlock->pData;
     pSubmit->numOfRows += pSubmit->numOfRows / alloced;
   }
 
@@ -384,62 +393,56 @@ static int insertStmtAddBatch(STscStmt* stmt) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int insertStmtPrepare(STscStmt* stmt) {
-  SSqlObj *pSql = stmt->pSql;
-  pSql->cmd.numOfParams = 0;
-  pSql->cmd.batchSize = 0;
-
-  return tsParseInsertSql(pSql);
-}
-
 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;
+    size_t size = taosArrayGetSize(pCmd->pDataBlocks);
+    for (int32_t i = 0; i < size; ++i) {
+      STableDataBlocks* pBlock = taosArrayGetP(pCmd->pDataBlocks, i);
 
-      SShellSubmitBlock* pSubmit = (SShellSubmitBlock*)pBlock->pData;
+      uint32_t totalDataSize = pBlock->size - sizeof(SSubmitBlk);
+      pBlock->size = sizeof(SSubmitBlk) + totalDataSize / alloced;
+
+      SSubmitBlk* pSubmit = (SSubmitBlk*)pBlock->pData;
       pSubmit->numOfRows = pSubmit->numOfRows / alloced;
     }
   }
   pCmd->batchSize = 0;
   
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  pMeterMetaInfo->vnodeIndex = 0;
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  pTableMetaInfo->vgroupIndex = 0;
   return TSDB_CODE_SUCCESS;
 }
 
 static int insertStmtExecute(STscStmt* stmt) {
   SSqlCmd* pCmd = &stmt->pSql->cmd;
   if (pCmd->batchSize == 0) {
-    return TSDB_CODE_INVALID_VALUE;
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
   if ((pCmd->batchSize % 2) == 1) {
     ++pCmd->batchSize;
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
   assert(pCmd->numOfClause == 1);
-  
-  if (pCmd->pDataBlocks->nSize > 0) {
+
+  if (taosArrayGetSize(pCmd->pDataBlocks) > 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];
+    STableDataBlocks *pDataBlock = taosArrayGetP(pCmd->pDataBlocks, 0);
     code = tscCopyDataBlockToPayload(stmt->pSql, pDataBlock);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
 
     // set the next sent data vnode index in data block arraylist
-    pMeterMetaInfo->vnodeIndex = 1;
+    pTableMetaInfo->vgroupIndex = 1;
   } else {
     pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
   }
@@ -448,19 +451,20 @@ static int insertStmtExecute(STscStmt* stmt) {
   SSqlRes *pRes = &pSql->res;
   pRes->numOfRows = 0;
   pRes->numOfTotal = 0;
-  pRes->numOfTotalInCurrentClause = 0;
+  pRes->numOfClauseTotal = 0;
   
   pRes->qhandle = 0;
-  pSql->thandle = NULL;
+
+  pSql->cmd.insertType = 0;
+  pSql->fetchFp    = waitForQueryRsp;
+  pSql->fp         = (void(*)())tscHandleMultivnodeInsert;
 
   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);
-  }
+  // wait for the callback function to post the semaphore
+  tsem_wait(&pSql->rspSem);
+  return pSql->res.code;
 
-  return pRes->code;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -469,30 +473,31 @@ static int insertStmtExecute(STscStmt* stmt) {
 TAOS_STMT* taos_stmt_init(TAOS* taos) {
   STscObj* pObj = (STscObj*)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
     tscError("connection disconnected");
     return NULL;
   }
 
   STscStmt* pStmt = calloc(1, sizeof(STscStmt));
   if (pStmt == NULL) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
     tscError("failed to allocate memory for statement");
     return NULL;
   }
+  pStmt->taos = pObj;
 
   SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
     free(pStmt);
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    terrno = TSDB_CODE_TSC_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;
+  pSql->signature     = pSql;
+  pSql->pTscObj       = pObj;
+  pSql->maxRetry      = TSDB_MAX_REPLICA;
 
   pStmt->pSql = pSql;
   return pStmt;
@@ -500,22 +505,57 @@ TAOS_STMT* taos_stmt_init(TAOS* taos) {
 
 int taos_stmt_prepare(TAOS_STMT* stmt, const char* sql, unsigned long length) {
   STscStmt* pStmt = (STscStmt*)stmt;
-  if (length == 0) {
-    length = strlen(sql);
+
+  if (stmt == NULL || pStmt->taos == NULL || pStmt->pSql == NULL) {
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return TSDB_CODE_TSC_DISCONNECTED;
   }
-  char* sqlstr = (char*)malloc(length + 1);
-  if (sqlstr == NULL) {
-    tscError("failed to malloc sql string buffer");
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+
+  SSqlObj* pSql = pStmt->pSql;
+  size_t   sqlLen = strlen(sql);
+  
+  //doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
+  SSqlCmd *pCmd    = &pSql->cmd;
+  SSqlRes *pRes    = &pSql->res;
+  pSql->param      = (void*) pSql;
+  pSql->fp         = waitForQueryRsp;
+  pSql->cmd.insertType = TSDB_QUERY_TYPE_STMT_INSERT;
+  
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
+    tscError("%p failed to malloc payload buffer", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
-  memcpy(sqlstr, sql, length);
-  sqlstr[length] = 0;
-  strtolower(sqlstr, sqlstr);
+  
+  pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
+  
+  if (pSql->sqlstr == NULL) {
+    tscError("%p failed to malloc sql string buffer", pSql);
+    free(pCmd->payload);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+  
+  pRes->qhandle = 0;
+  pRes->numOfRows = 1;
+  
+  strtolower(pSql->sqlstr, sql);
+  tscDebugL("%p SQL: %s", pSql, pSql->sqlstr);
 
-  pStmt->pSql->sqlstr = sqlstr;
-  if (tscIsInsertOrImportData(sqlstr)) {
+  if (tscIsInsertData(pSql->sqlstr)) {  
     pStmt->isInsert = true;
-    return insertStmtPrepare(pStmt);
+    
+    pSql->cmd.numOfParams = 0;
+    pSql->cmd.batchSize   = 0;
+
+    registerSqlObj(pSql);
+
+    int32_t code = tsParseSql(pSql, true);
+    if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+      // wait for the callback function to post the semaphore
+      tsem_wait(&pSql->rspSem);
+      return pSql->res.code;
+    }
+    
+    return code;
   }
 
   pStmt->isInsert = false;
@@ -536,7 +576,7 @@ int taos_stmt_close(TAOS_STMT* stmt) {
     free(normal->sql);
   }
 
-  tscFreeSqlObj(pStmt->pSql);
+  taos_free_result(pStmt->pSql);
   free(pStmt);
   return TSDB_CODE_SUCCESS;
 }
@@ -554,7 +594,7 @@ int taos_stmt_add_batch(TAOS_STMT* stmt) {
   if (pStmt->isInsert) {
     return insertStmtAddBatch(pStmt);
   }
-  return TSDB_CODE_OPS_NOT_SUPPORT;
+  return TSDB_CODE_COM_OPS_NOT_SUPPORT;
 }
 
 int taos_stmt_reset(TAOS_STMT* stmt) {
@@ -573,11 +613,15 @@ int taos_stmt_execute(TAOS_STMT* stmt) {
   } else {
     char* sql = normalStmtBuildSql(pStmt);
     if (sql == NULL) {
-      ret = TSDB_CODE_CLI_OUT_OF_MEMORY;
+      ret = TSDB_CODE_TSC_OUT_OF_MEMORY;
     } else {
-      tfree(pStmt->pSql->sqlstr);
-      pStmt->pSql->sqlstr = sql;
-      ret = taos_query_imp(pStmt->taos, pStmt->pSql);
+      if (pStmt->pSql != NULL) {
+        taos_free_result(pStmt->pSql);
+        pStmt->pSql = NULL;
+      }
+      pStmt->pSql = taos_query((TAOS*)pStmt->taos, sql);
+      ret = taos_errno(pStmt->pSql);
+      free(sql);
     }
   }
   return ret;
diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index a7a774b3a8ce71a608d15ec9a71f931a7a59a06a..f2f997a59494ab7ab4e8da31edb4b819730e30c4 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -14,17 +14,15 @@
  */
 
 #include "os.h"
-#include "tlog.h"
+#include "tscLog.h"
 #include "tsclient.h"
-#include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
+#include "taosmsg.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;
@@ -35,7 +33,7 @@ void tscInitConnCb(void *param, TAOS_RES *result, int code) {
     tscSlowQueryConnInitialized = false;
     free(sql);
   } else {
-    tscTrace("taos:%p, slow query connect success, code:%d", tscSlowQueryConn, code);
+    tscDebug("taos:%p, slow query connect success, code:%d", tscSlowQueryConn, code);
     tscSlowQueryConnInitialized = true;
     tscSaveSlowQueryFp(sql, NULL);
   }
@@ -60,14 +58,14 @@ void tscAddIntoSqlList(SSqlObj *pSql) {
   pSql->stime = taosGetTimestampMs();
   pSql->listed = 1;
 
-  tscTrace("%p added into sqlList", pSql);
+  tscDebug("%p added into sqlList", pSql);
 }
 
 void tscSaveSlowQueryFpCb(void *param, TAOS_RES *result, int code) {
   if (code < 0) {
     tscError("failed to save slow query, code:%d", code);
   } else {
-    tscTrace("success to save slow query, code:%d", code);
+    tscDebug("success to save slow query, code:%d", code);
   }
 }
 
@@ -76,36 +74,46 @@ void tscSaveSlowQueryFp(void *handle, void *tmrId) {
 
   if (!tscSlowQueryConnInitialized) {
     if (tscSlowQueryConn == NULL) {
-      tscTrace("start to init slow query connect");
+      tscDebug("start to init slow query connect");
       taos_connect_a(NULL, "monitor", tsInternalPass, "", 0, tscInitConnCb, sql, &tscSlowQueryConn);
     } else {
       tscError("taos:%p, slow query connect is already initialized", tscSlowQueryConn);
       free(sql);
     }
   } else {
-    tscTrace("taos:%p, save slow query:%s", tscSlowQueryConn, sql);
+    tscDebug("taos:%p, save slow query:%s", tscSlowQueryConn, sql);
     taos_query_a(tscSlowQueryConn, 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:%" PRId64 " sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
+  const static int64_t SLOW_QUERY_INTERVAL = 3000000L; // todo configurable
+  size_t size = 200;  // other part of sql string, expect the main sql str
+  
+  if (pSql->res.useconds < SLOW_QUERY_INTERVAL) {
+    return;
+  }
 
-  char *sql = malloc(200);
-  int   len = snprintf(sql, 200, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
+  tscDebug("%p query time:%" PRId64 " sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
+  int32_t sqlSize = (int32_t)(TSDB_SLOW_QUERY_SQL_LEN + size);
+  
+  char *sql = malloc(sqlSize);
+  if (sql == NULL) {
+    tscError("%p failed to allocate memory to sent slow query to dnode", pSql);
+    return;
+  }
+  
+  int len = snprintf(sql, size, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
           pSql->pTscObj->user, pSql->stime, pSql->res.useconds);
-  int sqlLen = snprintf(sql + len, TSDB_SHOW_SQL_LEN, "%s", pSql->sqlstr);
-  if (sqlLen > TSDB_SHOW_SQL_LEN - 1) {
-    sqlLen = len + TSDB_SHOW_SQL_LEN - 1;
+  int sqlLen = snprintf(sql + len, TSDB_SLOW_QUERY_SQL_LEN, "%s", pSql->sqlstr);
+  if (sqlLen > TSDB_SLOW_QUERY_SQL_LEN - 1) {
+    sqlLen = len + TSDB_SLOW_QUERY_SQL_LEN - 1;
   } else {
     sqlLen += len;
   }
+  
   strcpy(sql + sqlLen, "')");
-
   taosTmrStart(tscSaveSlowQueryFp, 200, sql, tscTmr);
 }
 
@@ -129,7 +137,7 @@ void tscRemoveFromSqlList(SSqlObj *pSql) {
   pSql->listed = 0;
 
   tscSaveSlowQuery(pSql);
-  tscTrace("%p removed from sqlList", pSql);
+  tscDebug("%p removed from sqlList", pSql);
 }
 
 void tscKillQuery(STscObj *pObj, uint32_t killId) {
@@ -145,7 +153,7 @@ void tscKillQuery(STscObj *pObj, uint32_t killId) {
 
   if (pSql == NULL) return;
 
-  tscTrace("%p query is killed, queryId:%d thandle:%p", pSql, killId, pSql->thandle);
+  tscDebug("%p query is killed, queryId:%d", pSql, killId);
   taos_stop_query(pSql);
 }
 
@@ -197,28 +205,28 @@ void tscKillStream(STscObj *pObj, uint32_t killId) {
   }
 
   pthread_mutex_unlock(&pObj->mutex);
-  
-  if (pStream) {
-    tscTrace("%p stream:%p is killed, streamId:%d", pStream->pSql, pStream, killId);
-  }
 
-  if (pStream->callback) {
-    pStream->callback(pStream->param);
+  if (pStream) {
+    tscDebug("%p stream:%p is killed, streamId:%d", pStream->pSql, pStream, killId);
+    if (pStream->callback) {
+      pStream->callback(pStream->param);
+    }
+    taos_close_stream(pStream);
+  } else {
+    tscError("failed to kill stream, streamId:%d not exist", killId);
   }
-  taos_close_stream(pStream);
 }
 
-char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj) {
-  SQList *pQList = (SQList *)pMsg;
-  char *  pMax = pMsg + TSDB_PAYLOAD_SIZE - 256;
-
-  SQDesc *pQdesc = pQList->qdesc;
-  pQList->numOfQueries = 0;
+int tscBuildQueryStreamDesc(void *pMsg, STscObj *pObj) {
+  SCMHeartBeatMsg *pHeartbeat = pMsg;
+  int allocedQueriesNum = pHeartbeat->numOfQueries;
+  int allocedStreamsNum = pHeartbeat->numOfStreams;
+  
+  pHeartbeat->numOfQueries = 0;
+  SQueryDesc *pQdesc = (SQueryDesc *)pHeartbeat->pData;
 
   // We extract the lock to tscBuildHeartBeatMsg function.
-  /* pthread_mutex_lock (&pObj->mutex); */
 
-  pMsg += sizeof(SQList);
   SSqlObj *pSql = pObj->sqlList;
   while (pSql) {
     /*
@@ -230,48 +238,46 @@ char *tscBuildQueryStreamDesc(char *pMsg, STscObj *pObj) {
       continue;
     }
 
-    strncpy(pQdesc->sql, pSql->sqlstr, TSDB_SHOW_SQL_LEN - 1);
-    pQdesc->sql[TSDB_SHOW_SQL_LEN - 1] = 0;
-    pQdesc->stime = pSql->stime;
-    pQdesc->queryId = pSql->queryId;
-    pQdesc->useconds = pSql->res.useconds;
+    tstrncpy(pQdesc->sql, pSql->sqlstr, sizeof(pQdesc->sql));
+    pQdesc->stime = htobe64(pSql->stime);
+    pQdesc->queryId = htonl(pSql->queryId);
+    pQdesc->useconds = htobe64(pSql->res.useconds);
 
-    pQList->numOfQueries++;
+    pHeartbeat->numOfQueries++;
     pQdesc++;
     pSql = pSql->next;
-    pMsg += sizeof(SQDesc);
-    if (pMsg > pMax) break;
+    if (pHeartbeat->numOfQueries >= allocedQueriesNum) break;
   }
 
-  SSList *pSList = (SSList *)pMsg;
-  SSDesc *pSdesc = pSList->sdesc;
-  pSList->numOfStreams = 0;
+  pHeartbeat->numOfStreams = 0;
+  SStreamDesc *pSdesc = (SStreamDesc *)pQdesc;
 
-  pMsg += sizeof(SSList);
   SSqlStream *pStream = pObj->streamList;
   while (pStream) {
-    strncpy(pSdesc->sql, pStream->pSql->sqlstr, TSDB_SHOW_SQL_LEN - 1);
-    pSdesc->sql[TSDB_SHOW_SQL_LEN - 1] = 0;
-    pSdesc->streamId = pStream->streamId;
-    pSdesc->num = pStream->num;
+    tstrncpy(pSdesc->sql, pStream->pSql->sqlstr, sizeof(pSdesc->sql));
+    pSdesc->streamId = htonl(pStream->streamId);
+    pSdesc->num = htobe64(pStream->num);
 
-    pSdesc->useconds = pStream->useconds;
-    pSdesc->stime = pStream->stime - pStream->interval;
-    pSdesc->ctime = pStream->ctime;
+    pSdesc->useconds = htobe64(pStream->useconds);
+    pSdesc->stime = htobe64(pStream->stime - pStream->interval.interval);
+    pSdesc->ctime = htobe64(pStream->ctime);
 
-    pSdesc->slidingTime = pStream->slidingTime;
-    pSdesc->interval = pStream->interval;
+    pSdesc->slidingTime = htobe64(pStream->interval.sliding);
+    pSdesc->interval = htobe64(pStream->interval.interval);
 
-    pSList->numOfStreams++;
+    pHeartbeat->numOfStreams++;
     pSdesc++;
     pStream = pStream->next;
-    pMsg += sizeof(SSDesc);
-    if (pMsg > pMax) break;
+    if (pHeartbeat->numOfStreams >= allocedStreamsNum) break;
   }
 
-  /* pthread_mutex_unlock (&pObj->mutex); */
+  int32_t msgLen = pHeartbeat->numOfQueries * sizeof(SQueryDesc) + pHeartbeat->numOfStreams * sizeof(SStreamDesc) +
+                   sizeof(SCMHeartBeatMsg);
+  pHeartbeat->connId = htonl(pObj->connId);
+  pHeartbeat->numOfQueries = htonl(pHeartbeat->numOfQueries);
+  pHeartbeat->numOfStreams = htonl(pHeartbeat->numOfStreams);
 
-  return pMsg;
+  return msgLen;
 }
 
 void tscKillConnection(STscObj *pObj) {
@@ -279,9 +285,9 @@ void tscKillConnection(STscObj *pObj) {
 
   SSqlObj *pSql = pObj->sqlList;
   while (pSql) {
-    taosStopRpcConn(pSql->thandle);
     pSql = pSql->next;
   }
+  
 
   SSqlStream *pStream = pObj->streamList;
   while (pStream) {
@@ -292,7 +298,6 @@ void tscKillConnection(STscObj *pObj) {
 
   pthread_mutex_unlock(&pObj->mutex);
 
+  tscDebug("connection:%p is killed", pObj);
   taos_close(pObj);
-
-  tscTrace("connection:%p is killed", pObj);
 }
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index ef5ec5808b66b3a100fd72714d7e0972eb574298..f690d13164bb82749ec7ce9f6229376bfb3f61ac 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -13,100 +13,108 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _XOPEN_SOURCE
+#define _BSD_SOURCE
+#define _XOPEN_SOURCE 500
 #define _DEFAULT_SOURCE
 
 #include "os.h"
+#include "qAst.h"
 #include "taos.h"
 #include "taosmsg.h"
-#include "tstoken.h"
-#include "tstrbuild.h"
-#include "ttime.h"
-
-#include "tscSQLParser.h"
+#include "tcompare.h"
+#include "tname.h"
+#include "tscLog.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
+#include "tstoken.h"
+#include "tstrbuild.h"
+#include "ttokendef.h"
 
 #define DEFAULT_PRIMARY_TIMESTAMP_COL_NAME "_c0"
 
-// -1 is tbname column index, so here use the -2 as the initial value
-#define COLUMN_INDEX_INITIAL_VAL (-2)
+#define TSWINDOW_IS_EQUAL(t1, t2) (((t1).skey == (t2).skey) && ((t1).ekey == (t2).ekey))
+
+// -1 is tbname column index, so here use the -3 as the initial value
+#define COLUMN_INDEX_INITIAL_VAL (-3)
 #define COLUMN_INDEX_INITIALIZER \
   { COLUMN_INDEX_INITIAL_VAL, COLUMN_INDEX_INITIAL_VAL }
 #define COLUMN_INDEX_VALIDE(index) (((index).tableIndex >= 0) && ((index).columnIndex >= TSDB_TBNAME_COLUMN_INDEX))
 #define TBNAME_LIST_SEP ","
 
-typedef struct SColumnList {
+typedef struct SColumnList {  // todo refactor
   int32_t      num;
   SColumnIndex ids[TSDB_MAX_COLUMNS];
 } SColumnList;
 
-static SSqlExpr* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t outputIndex, int32_t colIdx, int32_t tableIndex);
+typedef struct SConvertFunc {
+  int32_t originFuncId;
+  int32_t execFuncId;
+} SConvertFunc;
+static SSqlExpr* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t outputIndex, int32_t colIndex, int32_t tableIndex);
 
 static int32_t setShowInfo(SSqlObj* pSql, SSqlInfo* pInfo);
 static char*   getAccountId(SSqlObj* pSql);
 
 static bool has(tFieldList* pFieldList, int32_t startIdx, const char* name);
-static void getCurrentDBName(SSqlObj* pSql, SSQLToken* pDBToken);
-static bool hasSpecifyDB(SSQLToken* pTableName);
+static void getCurrentDBName(SSqlObj* pSql, SStrToken* pDBToken);
+static bool hasSpecifyDB(SStrToken* pTableName);
 static bool validateTableColumnInfo(tFieldList* pFieldList, SSqlCmd* pCmd);
 static bool validateTagParams(tFieldList* pTagsList, tFieldList* pFieldList, SSqlCmd* pCmd);
 
-static int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQLToken* tableName, int32_t* len);
+static int32_t setObjFullName(char* fullName, const char* account, SStrToken* pDB, SStrToken* tableName, int32_t* len);
 
 static void getColumnName(tSQLExprItem* pItem, char* resultFieldName, int32_t nameLength);
 static void getRevisedName(char* resultFieldName, int32_t functionId, int32_t maxLen, char* columnName);
 
-static int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprItem* pItem);
+static int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSQLExprItem* pItem, bool finalResult);
 static int32_t insertResultField(SQueryInfo* pQueryInfo, int32_t outputIndex, SColumnList* pIdList, int16_t bytes,
-                                 int8_t type, char* fieldName);
+                                 int8_t type, char* fieldName, SSqlExpr* pSqlExpr);
 static int32_t changeFunctionID(int32_t optr, int16_t* functionId);
-static int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable);
+static int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable, bool joinQuery);
 
 static bool validateIpAddress(const char* ip, size_t size);
-static bool hasUnsupportFunctionsForSTableQuery(SQueryInfo* pQueryInfo);
-static bool functionCompatibleCheck(SQueryInfo* pQueryInfo);
+static bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
+static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery);
 static void setColumnOffsetValueInResultset(SQueryInfo* pQueryInfo);
 
 static int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, tVariantList* pList, SSqlCmd* pCmd);
 
-static int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
-static int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
+static int32_t parseIntervalClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
+static int32_t parseOffsetClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
+static int32_t parseSlidingClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
 
-static int32_t addProjectionExprAndResultField(SQueryInfo* pQueryInfo, tSQLExprItem* pItem);
+static int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExprItem* pItem);
 
 static int32_t parseWhereClause(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SSqlObj* pSql);
-static int32_t parseFillClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL);
-static int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema* pSchema);
+static int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL);
+static int32_t parseOrderbyClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema* pSchema);
 
-static int32_t tsRewriteFieldNameIfNecessary(SQueryInfo* pQueryInfo);
+static int32_t tsRewriteFieldNameIfNecessary(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
 static int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo);
-static int32_t validateSqlFunctionInStreamSql(SQueryInfo* pQueryInfo);
-static int32_t buildArithmeticExprString(tSQLExpr* pExpr, char** exprString);
-static int32_t validateFunctionsInIntervalOrGroupbyQuery(SQueryInfo* pQueryInfo);
-static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList);
+static int32_t validateSqlFunctionInStreamSql(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
+static int32_t validateFunctionsInIntervalOrGroupbyQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
+static int32_t validateArithmeticSQLExpr(SSqlCmd* pCmd, tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList, int32_t* type);
+static int32_t validateEp(char* ep);
 static int32_t validateDNodeConfig(tDCLSQL* pOptions);
 static int32_t validateLocalConfig(tDCLSQL* pOptions);
 static int32_t validateColumnName(char* name);
-static int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo);
+static int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType);
 
 static bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField);
 static bool hasTimestampForPointInterpQuery(SQueryInfo* pQueryInfo);
-static bool hasDefaultQueryTimeRange(SQueryInfo *pQueryInfo);
+static bool hasNormalColumnFilter(SQueryInfo* pQueryInfo);
 
-static void updateTagColumnIndex(SQueryInfo* pQueryInfo, int32_t tableIndex);
-
-static int32_t parseLimitClause(SQueryInfo* pQueryInfo, int32_t index, SQuerySQL* pQuerySql, SSqlObj* pSql);
+static int32_t parseLimitClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t index, SQuerySQL* pQuerySql, SSqlObj* pSql);
 static int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDBInfo* pCreateDbSql);
-static int32_t getColumnIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
-static int32_t getTableIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
+static int32_t getColumnIndexByName(SSqlCmd* pCmd, const SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
+static int32_t getTableIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
 static int32_t optrToString(tSQLExpr* pExpr, char** exprString);
 
-static int32_t getMeterIndex(SSQLToken* pTableToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
+static int32_t getTableIndexImpl(SStrToken* pTableToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex);
 static int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo);
-static int32_t doLocalQueryProcess(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
-static int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate);
+static int32_t doLocalQueryProcess(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql);
+static int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCMCreateDbMsg* pCreate);
 
 static SColumnList getColumnList(int32_t num, int16_t tableIndex, int32_t columnIndex);
 
@@ -114,6 +122,7 @@ static int32_t doCheckForCreateTable(SSqlObj* pSql, int32_t subClauseIndex, SSql
 static int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo);
 static int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo);
 static int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index);
+static int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSQLExpr* pSqlExpr, SArray* pExprInfo, SQueryInfo* pQueryInfo, SArray* pCols);
 
 /*
  * Used during parsing query sql. Since the query sql usually small in length, error position
@@ -123,38 +132,23 @@ static int32_t invalidSqlErrMsg(char* dstBuffer, const char* errMsg) {
   return tscInvalidSQLErrMsg(dstBuffer, errMsg, NULL);
 }
 
-static int32_t tscQueryOnlyMetricTags(SQueryInfo* pQueryInfo, bool* queryOnMetricTags) {
-  assert(QUERY_IS_STABLE_QUERY(pQueryInfo->type));
-
-  *queryOnMetricTags = true;
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-
-    if (pExpr->functionId != TSDB_FUNC_TAGPRJ &&
-        !(pExpr->functionId == TSDB_FUNC_COUNT && pExpr->colInfo.colIdx == TSDB_TBNAME_COLUMN_INDEX)) {
-      *queryOnMetricTags = false;
-      break;
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int setColumnFilterInfoForTimestamp(SQueryInfo* pQueryInfo, tVariant* pVar) {
+static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) {
   int64_t     time = 0;
   const char* msg = "invalid timestamp";
 
   strdequote(pVar->pz);
   char*           seg = strnchr(pVar->pz, '-', pVar->nLen, false);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
   if (seg != NULL) {
-    if (taosParseTime(pVar->pz, &time, pVar->nLen, pMeterMetaInfo->pMeterMeta->precision) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg);
+    if (taosParseTime(pVar->pz, &time, pVar->nLen, tinfo.precision, tsDaylight) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
     }
   } else {
-    if (tVariantDump(pVar, (char*)&time, TSDB_DATA_TYPE_BIGINT)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg);
+    if (tVariantDump(pVar, (char*)&time, TSDB_DATA_TYPE_BIGINT, true)) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
     }
   }
 
@@ -164,7 +158,7 @@ static int setColumnFilterInfoForTimestamp(SQueryInfo* pQueryInfo, tVariant* pVa
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t handlePassword(SSqlCmd* pCmd, SSQLToken* pPwd) {
+static int32_t handlePassword(SSqlCmd* pCmd, SStrToken* pPwd) {
   const char* msg1 = "password can not be empty";
   const char* msg2 = "name or password too long";
   const char* msg3 = "password needs single quote marks enclosed";
@@ -174,37 +168,43 @@ static int32_t handlePassword(SSqlCmd* pCmd, SSQLToken* pPwd) {
   }
 
   strdequote(pPwd->z);
-  strtrim(pPwd->z);  // trim space before and after passwords
-  pPwd->n = strlen(pPwd->z);
+  pPwd->n = (uint32_t)strtrim(pPwd->z);  // trim space before and after passwords
 
   if (pPwd->n <= 0) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (pPwd->n > TSDB_PASSWORD_LEN) {
+  if (pPwd->n >= TSDB_PASSWORD_LEN) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-// todo handle memory leak in error handle function
 int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   if (pInfo == NULL || pSql == NULL || pSql->signature != pSql) {
-    return TSDB_CODE_APP_ERROR;
+    return TSDB_CODE_TSC_APP_ERROR;
   }
 
-  SSqlCmd*    pCmd = &(pSql->cmd);
-  SQueryInfo* pQueryInfo = NULL;
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
 
+  int32_t code = TSDB_CODE_SUCCESS;
   if (!pInfo->valid) {
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), pInfo->pzErrMsg);
+    return tscSQLSyntaxErrMsg(tscGetErrorMsgPayload(pCmd), NULL, pInfo->pzErrMsg);
   }
 
-  int32_t code = tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex, &pQueryInfo);
-  assert(pQueryInfo->numOfTables == 0);
-  
-  SMeterMetaInfo* pMeterMetaInfo = tscAddEmptyMeterMetaInfo(pQueryInfo);
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex);
+  if (pQueryInfo == NULL) {
+    pRes->code = terrno;
+    return pRes->code;
+  }
+
+  STableMetaInfo* pTableMetaInfo = (pQueryInfo->numOfTables == 0)? tscAddEmptyMetaInfo(pQueryInfo) : pQueryInfo->pTableMetaInfo[0];
+  if (pTableMetaInfo == NULL) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return pRes->code;
+  }
 
   pCmd->command = pInfo->type;
 
@@ -214,11 +214,10 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     case TSDB_SQL_DROP_ACCT:
     case TSDB_SQL_DROP_DNODE:
     case TSDB_SQL_DROP_DB: {
-      const char* msg1 = "invalid ip address";
       const char* msg2 = "invalid name";
       const char* msg3 = "param name too long";
 
-      SSQLToken* pzName = &pInfo->pDCLInfo->a[0];
+      SStrToken* pzName = &pInfo->pDCLInfo->a[0];
       if ((pInfo->type != TSDB_SQL_DROP_DNODE) && (tscValidateName(pzName) != TSDB_CODE_SUCCESS)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
@@ -226,7 +225,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       if (pInfo->type == TSDB_SQL_DROP_DB) {
         assert(pInfo->pDCLInfo->nTokens == 1);
 
-        code = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), pzName, NULL, NULL);
+        code = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pzName, NULL, NULL);
         if (code != TSDB_CODE_SUCCESS) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
         }
@@ -234,21 +233,19 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       } else if (pInfo->type == TSDB_SQL_DROP_TABLE) {
         assert(pInfo->pDCLInfo->nTokens == 1);
 
-        if (setMeterID(pMeterMetaInfo, pzName, pSql) != TSDB_CODE_SUCCESS) {
-          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+        code = tscSetTableFullName(pTableMetaInfo, pzName, pSql);
+        if(code != TSDB_CODE_SUCCESS) {
+          return code; 
         }
       } else if (pInfo->type == TSDB_SQL_DROP_DNODE) {
-        if (!validateIpAddress(pzName->z, pzName->n)) {
-          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-        }
-
-        strncpy(pMeterMetaInfo->name, pzName->z, pzName->n);
+        pzName->n = strdequote(pzName->z);
+        strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
       } else {  // drop user
-        if (pzName->n > TSDB_USER_LEN) {
+        if (pzName->n >= TSDB_USER_LEN) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
 
-        strncpy(pMeterMetaInfo->name, pzName->z, pzName->n);
+        strncpy(pTableMetaInfo->name, pzName->z, pzName->n);
       }
 
       break;
@@ -256,13 +253,13 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     case TSDB_SQL_USE_DB: {
       const char* msg = "invalid db name";
-      SSQLToken*  pToken = &pInfo->pDCLInfo->a[0];
+      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
 
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      int32_t ret = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), pToken, NULL, NULL);
+      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pToken, NULL, NULL);
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
@@ -276,7 +273,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     case TSDB_SQL_SHOW: {
       if (setShowInfo(pSql, pInfo) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
       break;
@@ -292,30 +289,27 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      int32_t ret = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname), NULL, NULL);
+      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), &(pCreateDB->dbname), NULL, NULL);
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       if (parseCreateDBOptions(pCmd, pCreateDB) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
       break;
     }
 
-    case TSDB_SQL_CREATE_DNODE: {  // todo parse hostname
-      const char* msg = "invalid ip address";
+    case TSDB_SQL_CREATE_DNODE: {  // todo hostname
+      const char* msg = "invalid host name (ip address)";
 
       if (pInfo->pDCLInfo->nTokens > 1) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
 
-      SSQLToken* pIpAddr = &pInfo->pDCLInfo->a[0];
-      if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) {
-        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
-      }
-
+      SStrToken* pIpAddr = &pInfo->pDCLInfo->a[0];
+      pIpAddr->n = strdequote(pIpAddr->z);
       break;
     }
 
@@ -325,14 +319,14 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg2 = "invalid user/account name";
       const char* msg3 = "name too long";
 
-      SSQLToken* pName = &pInfo->pDCLInfo->user.user;
-      SSQLToken* pPwd = &pInfo->pDCLInfo->user.passwd;
+      SStrToken* pName = &pInfo->pDCLInfo->user.user;
+      SStrToken* pPwd = &pInfo->pDCLInfo->user.passwd;
 
       if (handlePassword(pCmd, pPwd) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
-      if (pName->n > TSDB_USER_LEN) {
+      if (pName->n >= TSDB_USER_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
@@ -355,45 +349,81 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     case TSDB_SQL_DESCRIBE_TABLE: {
-      SSQLToken*  pToken = &pInfo->pDCLInfo->a[0];
-      const char* msg2 = "table name is too long";
+      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
       const char* msg1 = "invalid table name";
+      const char* msg2 = "table name too long";
 
       if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      if (pToken->n > TSDB_METER_NAME_LEN) {
+      if (!tscValidateTableNameLength(pToken->n)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
-      if (setMeterID(pMeterMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+      // additional msg has been attached already
+      if (tscSetTableFullName(pTableMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
+
+      return tscGetTableMeta(pSql, pTableMetaInfo);
+    }
+    case TSDB_SQL_SHOW_CREATE_TABLE: {
+      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
+      const char* msg1 = "invalid table name";
+      const char* msg2 = "table name is too long";
+
+      if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+
+      if (!tscValidateTableNameLength(pToken->n)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
-      return tscGetMeterMeta(pSql, pMeterMetaInfo);
+      if (tscSetTableFullName(pTableMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
+      return tscGetTableMeta(pSql, pTableMetaInfo);
     }
+    case TSDB_SQL_SHOW_CREATE_DATABASE: {
+      const char* msg1 = "invalid database name";
+      const char* msg2 = "table name is too long";
+      SStrToken*  pToken = &pInfo->pDCLInfo->a[0];
 
+      if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+      if (pToken->n > TSDB_DB_NAME_LEN) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+      if (tscSetTableFullName(pTableMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
+      return TSDB_CODE_SUCCESS; 
+    }                                
     case TSDB_SQL_CFG_DNODE: {
-      const char* msg1 = "invalid ip address";
-      const char* msg2 = "invalid configure options or values";
+      const char* msg2 = "invalid configure options or values, such as resetlog / debugFlag 135 / balance 'vnode:2-dnode:2' / monitor 1 ";
+      const char* msg3 = "invalid dnode ep";
 
       /* validate the ip address */
       tDCLSQL* pDCL = pInfo->pDCLInfo;
-      if (!validateIpAddress(pDCL->a[0].z, pDCL->a[0].n)) {
-        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
-      }
 
       /* validate the parameter names and options */
       if (validateDNodeConfig(pDCL) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
-      char* pMsg = pCmd->payload + tsRpcHeadSize;
-      pMsg += sizeof(SMgmtHead);
+      char* pMsg = pCmd->payload;
 
-      SCfgMsg* pCfg = (SCfgMsg*)pMsg;
-      strncpy(pCfg->ip, pDCL->a[0].z, pDCL->a[0].n);
+      SCMCfgDnodeMsg* pCfg = (SCMCfgDnodeMsg*)pMsg;
+      pDCL->a[0].n = strdequote(pDCL->a[0].z);
+      
+      strncpy(pCfg->ep, pDCL->a[0].z, pDCL->a[0].n);
+
+      if (validateEp(pCfg->ep) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
 
       strncpy(pCfg->config, pDCL->a[1].z, pDCL->a[1].n);
 
@@ -413,13 +443,12 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       const char* msg3 = "name too long";
 
       pCmd->command = pInfo->type;
-      //tDCLSQL* pDCL = pInfo->pDCLInfo;
 
       SUserInfo* pUser = &pInfo->pDCLInfo->user;
-      SSQLToken* pName = &pUser->user;
-      SSQLToken* pPwd = &pUser->passwd;
+      SStrToken* pName = &pUser->user;
+      SStrToken* pPwd = &pUser->passwd;
 
-      if (pName->n > TSDB_USER_LEN) {
+      if (pName->n >= TSDB_USER_LEN) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
@@ -429,17 +458,17 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
       if (pCmd->command == TSDB_SQL_CREATE_USER) {
         if (handlePassword(pCmd, pPwd) != TSDB_CODE_SUCCESS) {
-          return TSDB_CODE_INVALID_SQL;
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
       } else {
         if (pUser->type == TSDB_ALTER_USER_PASSWD) {
           if (handlePassword(pCmd, pPwd) != TSDB_CODE_SUCCESS) {
-            return TSDB_CODE_INVALID_SQL;
+            return TSDB_CODE_TSC_INVALID_SQL;
           }
         } else if (pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
           assert(pPwd->type == TSDB_DATA_TYPE_NULL);
 
-          SSQLToken* pPrivilege = &pUser->privilege;
+          SStrToken* pPrivilege = &pUser->privilege;
 
           if (strncasecmp(pPrivilege->z, "super", 5) == 0 && pPrivilege->n == 5) {
             pCmd->count = 1;
@@ -485,6 +514,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         }
 
       } else if (pCreateTable->type == TSQL_CREATE_TABLE_FROM_STABLE) {
+        assert(pCmd->numOfCols == 0);
         if ((code = doCheckForCreateFromStable(pSql, pInfo)) != TSDB_CODE_SUCCESS) {
           return code;
         }
@@ -499,41 +529,45 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     case TSDB_SQL_SELECT: {
-      assert(pCmd->numOfClause == 1);
       const char* msg1 = "columns in select clause not identical";
-      
+
       for (int32_t i = pCmd->numOfClause; i < pInfo->subclauseInfo.numOfClause; ++i) {
-        SQueryInfo* pqi = NULL;
-        if ((code = tscGetQueryInfoDetailSafely(pCmd, i, &pqi)) != TSDB_CODE_SUCCESS) {
-          return code;
+        SQueryInfo* pqi = tscGetQueryInfoDetailSafely(pCmd, i);
+        if (pqi == NULL) {
+          pRes->code = terrno;
+          return pRes->code;
         }
       }
 
       assert(pCmd->numOfClause == pInfo->subclauseInfo.numOfClause);
-      for (int32_t i = 0; i < pInfo->subclauseInfo.numOfClause; ++i) {
+      for (int32_t i = pCmd->clauseIndex; i < pInfo->subclauseInfo.numOfClause; ++i) {
         SQuerySQL* pQuerySql = pInfo->subclauseInfo.pClause[i];
-
+        tscTrace("%p start to parse %dth subclause, total:%d", pSql, i, pInfo->subclauseInfo.numOfClause);
         if ((code = doCheckForQuery(pSql, pQuerySql, i)) != TSDB_CODE_SUCCESS) {
           return code;
         }
-  
+
         tscPrintSelectClause(pSql, i);
+        pCmd->clauseIndex += 1;
       }
-      
+
+      // restore the clause index
+      pCmd->clauseIndex = 0;
       // set the command/global limit parameters from the first subclause to the sqlcmd object
       SQueryInfo* pQueryInfo1 = tscGetQueryInfoDetail(pCmd, 0);
       pCmd->command = pQueryInfo1->command;
-  
+
       // if there is only one element, the limit of clause is the limit of global result.
-      for(int32_t i = 1; i < pCmd->numOfClause; ++i) {
+      for (int32_t i = 1; i < pCmd->numOfClause; ++i) {
         SQueryInfo* pQueryInfo2 = tscGetQueryInfoDetail(pCmd, i);
-        
+
         int32_t ret = tscFieldInfoCompare(&pQueryInfo1->fieldsInfo, &pQueryInfo2->fieldsInfo);
         if (ret != 0) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
         }
       }
 
+      pCmd->parseFinished = 1;
       return TSDB_CODE_SUCCESS;  // do not build query message here
     }
 
@@ -548,7 +582,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     case TSDB_SQL_KILL_QUERY:
     case TSDB_SQL_KILL_STREAM:
     case TSDB_SQL_KILL_CONNECTION: {
-      if ((code = setKillInfo(pSql, pInfo)) != TSDB_CODE_SUCCESS) {
+      if ((code = setKillInfo(pSql, pInfo, pInfo->type)) != TSDB_CODE_SUCCESS) {
         return code;
       }
 
@@ -559,6 +593,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "not support sql expression");
   }
 
+  pSql->cmd.parseFinished = 1;
   return tscBuildMsg[pCmd->command](pSql, pInfo);
 }
 
@@ -567,7 +602,9 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
  * are available.
  */
 static bool isTopBottomQuery(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t i = 0; i < size; ++i) {
     int32_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
 
     if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
@@ -578,37 +615,45 @@ static bool isTopBottomQuery(SQueryInfo* pQueryInfo) {
   return false;
 }
 
-int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
+int32_t parseIntervalClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
   const char* msg1 = "invalid query expression";
   const char* msg2 = "interval cannot be less than 10 ms";
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
   if (pQuerySql->interval.type == 0 || pQuerySql->interval.n == 0) {
     return TSDB_CODE_SUCCESS;
   }
 
   // interval is not null
-  SSQLToken* t = &pQuerySql->interval;
-  if (getTimestampInUsFromStr(t->z, t->n, &pQueryInfo->nAggTimeInterval) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
-  }
-
-  // if the unit of time window value is millisecond, change the value from microsecond
-  if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-    pQueryInfo->nAggTimeInterval = pQueryInfo->nAggTimeInterval / 1000;
+  SStrToken* t = &pQuerySql->interval;
+  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.interval, &pQueryInfo->interval.intervalUnit) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  /* parser has filter the illegal type, no need to check here */
-  pQueryInfo->intervalTimeUnit = pQuerySql->interval.z[pQuerySql->interval.n - 1];
+  if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
+    // if the unit of time window value is millisecond, change the value from microsecond
+    if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
+      pQueryInfo->interval.interval = pQueryInfo->interval.interval / 1000;
+    }
 
-  // interval cannot be less than 10 milliseconds
-  if (pQueryInfo->nAggTimeInterval < tsMinIntervalTime) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    // interval cannot be less than 10 milliseconds
+    if (pQueryInfo->interval.interval < tsMinIntervalTime) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
   }
 
   // for top/bottom + interval query, we do not add additional timestamp column in the front
   if (isTopBottomQuery(pQueryInfo)) {
+    if (parseOffsetClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+
+    if (parseSlidingClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+
     return TSDB_CODE_SUCCESS;
   }
 
@@ -616,19 +661,20 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
    * check invalid SQL:
    * select count(tbname)/count(tag1)/count(tag2) from super_table_name interval(1d);
    */
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId == TSDB_FUNC_COUNT && TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   }
-  
+
   /*
    * check invalid SQL:
    * select tbname, tags_fields from super_table_name interval(1s)
    */
-  if (tscQueryMetricTags(pQueryInfo) && pQueryInfo->nAggTimeInterval > 0) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+  if (tscQueryTags(pQueryInfo) && pQueryInfo->interval.interval > 0) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
   // need to add timestamp column in result set, if interval is existed
@@ -636,106 +682,178 @@ int32_t parseIntervalClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
 
   int32_t tableIndex = COLUMN_INDEX_INITIAL_VAL;
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-    if (pMeterMetaInfo->pMeterMeta->uid == uid) {
+    pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
+    if (pTableMetaInfo->pTableMeta->id.uid == uid) {
       tableIndex = i;
       break;
     }
   }
 
   if (tableIndex == COLUMN_INDEX_INITIAL_VAL) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
+  SSchema s = {.bytes = TSDB_KEYSIZE, .type = TSDB_DATA_TYPE_TIMESTAMP, .colId = PRIMARYKEY_TIMESTAMP_COL_INDEX};
+  tstrncpy(s.name, aAggs[TSDB_FUNC_TS].aName, sizeof(s.name));
+
   SColumnIndex index = {tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX};
-  tscSqlExprInsert(pQueryInfo, 0, TSDB_FUNC_TS, &index, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, TSDB_KEYSIZE);
+  tscAddSpecialColumnForSelect(pQueryInfo, 0, TSDB_FUNC_TS, &index, &s, TSDB_COL_NORMAL);
 
-  SColumnList ids = getColumnList(1, 0, PRIMARYKEY_TIMESTAMP_COL_INDEX);
+  if (parseOffsetClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
 
-  int32_t ret = insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS].aName);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return ret;
+  if (parseSlidingClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
-  
-  if (setSlidingClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t parseOffsetClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
+  const char* msg1 = "interval offset cannot be negative";
+  const char* msg2 = "interval offset should be shorter than interval";
+  const char* msg3 = "cannot use 'year' as offset when interval is 'month'";
+
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+
+  SStrToken* t = &pQuerySql->offset;
+  if (t->n == 0) {
+    pQueryInfo->interval.offsetUnit = pQueryInfo->interval.intervalUnit;
+    pQueryInfo->interval.offset = 0;
+    return TSDB_CODE_SUCCESS;
   }
-  
+
+  if (parseNatualDuration(t->z, t->n, &pQueryInfo->interval.offset, &pQueryInfo->interval.offsetUnit) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
+
+  if (pQueryInfo->interval.offset < 0) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  }
+
+  if (pQueryInfo->interval.offsetUnit != 'n' && pQueryInfo->interval.offsetUnit != 'y') {
+    // if the unit of time window value is millisecond, change the value from microsecond
+    if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
+      pQueryInfo->interval.offset = pQueryInfo->interval.offset / 1000;
+    }
+    if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
+      if (pQueryInfo->interval.offset >= pQueryInfo->interval.interval) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
+    }
+  } else if (pQueryInfo->interval.offsetUnit == pQueryInfo->interval.intervalUnit) {
+    if (pQueryInfo->interval.offset >= pQueryInfo->interval.interval) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
+  } else if (pQueryInfo->interval.intervalUnit == 'n' && pQueryInfo->interval.offsetUnit == 'y') {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+  } else if (pQueryInfo->interval.intervalUnit == 'y' && pQueryInfo->interval.offsetUnit == 'n') {
+    if (pQueryInfo->interval.interval * 12 <= pQueryInfo->interval.offset) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
+  } else {
+    // TODO: offset should be shorter than interval, but how to check
+    // conflicts like 30days offset and 1 month interval
+  }
+
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t setSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
+int32_t parseSlidingClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
   const char* msg0 = "sliding value too small";
   const char* msg1 = "sliding value no larger than the interval value";
+  const char* msg2 = "sliding value can not less than 1% of interval value";
+  const char* msg3 = "does not support sliding when interval is natual month/year";
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  SSQLToken*      pSliding = &pQuerySql->sliding;
+  const static int32_t INTERVAL_SLIDING_FACTOR = 100;
 
-  if (pSliding->n != 0) {
-    getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
-    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-      pQueryInfo->nSlidingTime /= 1000;
-    }
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
 
-    if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg0);
-    }
+  SStrToken* pSliding = &pQuerySql->sliding;
+  if (pSliding->n == 0) {
+    pQueryInfo->interval.slidingUnit = pQueryInfo->interval.intervalUnit;
+    pQueryInfo->interval.sliding = pQueryInfo->interval.interval;
+    return TSDB_CODE_SUCCESS;
+  }
 
-    if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
-    }
-  } else {
-    pSliding->n = pQueryInfo->nAggTimeInterval;
+  if (pQueryInfo->interval.intervalUnit == 'n' || pQueryInfo->interval.intervalUnit == 'y') {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+  }
+
+  parseAbsoluteDuration(pSliding->z, pSliding->n, &pQueryInfo->interval.sliding);
+  if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
+    pQueryInfo->interval.sliding /= 1000;
+  }
+
+  if (pQueryInfo->interval.sliding < tsMinSlidingTime) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
+  }
+
+  if (pQueryInfo->interval.sliding > pQueryInfo->interval.interval) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  }
+
+  if ((pQueryInfo->interval.interval != 0) && (pQueryInfo->interval.interval/pQueryInfo->interval.sliding > INTERVAL_SLIDING_FACTOR)) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t setMeterID(SMeterMetaInfo* pMeterMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql) {
-  const char* msg = "name too long";
+int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pzTableName, SSqlObj* pSql) {
+  const char* msg1 = "name too long";
+  const char* msg2 = "current database or database name invalid";
 
   SSqlCmd* pCmd = &pSql->cmd;
   int32_t  code = TSDB_CODE_SUCCESS;
 
-  // backup the old name in pMeterMetaInfo
-  size_t size = strlen(pMeterMetaInfo->name);
-  char* oldName = NULL;
+  // backup the old name in pTableMetaInfo
+  size_t size = strlen(pTableMetaInfo->name);
+  char*  oldName = NULL;
   if (size > 0) {
-    oldName = strdup(pMeterMetaInfo->name);
+    oldName = strdup(pTableMetaInfo->name);
   }
-  
+
   if (hasSpecifyDB(pzTableName)) {
     // db has been specified in sql string so we ignore current db path
-    code = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), NULL, pzTableName, NULL);
+    code = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), NULL, pzTableName, NULL);
+    if (code != TSDB_CODE_SUCCESS) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    }
   } else {  // get current DB name first, then set it into path
-    SSQLToken t = {0};
+    SStrToken t = {0};
     getCurrentDBName(pSql, &t);
-
-    code = setObjFullName(pMeterMetaInfo->name, NULL, &t, pzTableName, NULL);
-  }
-
-  if (code != TSDB_CODE_SUCCESS) {
-    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+    if (t.n == 0) {
+      code = invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    } else {
+      code = setObjFullName(pTableMetaInfo->name, NULL, &t, pzTableName, NULL);
+      if (code != TSDB_CODE_SUCCESS) {
+        code = invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+    } 
   }
 
   if (code != TSDB_CODE_SUCCESS) {
-    free(oldName);
+    taosTFree(oldName);
     return code;
   }
-  
+
   /*
    * the old name exists and is not equalled to the new name. Release the metermeta/metricmeta
    * that are corresponding to the old name for the new table name.
    */
   if (size > 0) {
-    if (strncasecmp(oldName, pMeterMetaInfo->name, tListLen(pMeterMetaInfo->name)) != 0) {
-      tscClearMeterMetaInfo(pMeterMetaInfo, false);
+    if (strncasecmp(oldName, pTableMetaInfo->name, tListLen(pTableMetaInfo->name)) != 0) {
+      tscClearTableMetaInfo(pTableMetaInfo, false);
     }
   } else {
-    assert(pMeterMetaInfo->pMeterMeta == NULL && pMeterMetaInfo->pMetricMeta == NULL);
+    assert(pTableMetaInfo->pTableMeta == NULL);
   }
-  
-  tfree(oldName);
+
+  taosTFree(oldName);
   return TSDB_CODE_SUCCESS;
 }
 
@@ -764,6 +882,10 @@ static bool validateTableColumnInfo(tFieldList* pFieldList, SSqlCmd* pCmd) {
 
   int32_t nLen = 0;
   for (int32_t i = 0; i < pFieldList->nField; ++i) {
+    if (pFieldList->p[i].bytes == 0) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
+      return false;
+    }
     nLen += pFieldList->p[i].bytes;
   }
 
@@ -820,6 +942,10 @@ static bool validateTagParams(tFieldList* pTagsList, tFieldList* pFieldList, SSq
 
   int32_t nLen = 0;
   for (int32_t i = 0; i < pTagsList->nField; ++i) {
+    if (pTagsList->p[i].bytes == 0) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
+      return false;
+    }
     nLen += pTagsList->p[i].bytes;
   }
 
@@ -881,12 +1007,15 @@ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
   const char* msg6 = "invalid data type in tags";
 
   assert(pCmd->numOfClause == 1);
-  
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
 
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
+
+  int32_t numOfTags = tscGetNumOfTags(pTableMeta);
+  int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+  
   // no more than 6 tags
-  if (pMeterMeta->numOfTags == TSDB_MAX_TAGS) {
+  if (numOfTags == TSDB_MAX_TAGS) {
     char msg[128] = {0};
     sprintf(msg, "tags no more than %d", TSDB_MAX_TAGS);
 
@@ -900,15 +1029,15 @@ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
     return false;
   }
 
-  if (pTagField->type < TSDB_DATA_TYPE_BOOL && pTagField->type > TSDB_DATA_TYPE_NCHAR) {
+  if ((pTagField->type < TSDB_DATA_TYPE_BOOL) || (pTagField->type > TSDB_DATA_TYPE_NCHAR)) {
     invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
     return false;
   }
 
-  SSchema* pTagSchema = tsGetTagSchema(pMeterMetaInfo->pMeterMeta);
+  SSchema* pTagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
   int32_t  nLen = 0;
 
-  for (int32_t i = 0; i < pMeterMeta->numOfTags; ++i) {
+  for (int32_t i = 0; i < numOfTags; ++i) {
     nLen += pTagSchema[i].bytes;
   }
 
@@ -931,10 +1060,10 @@ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) {
   }
 
   // field name must be unique
-  SSchema* pSchema = tsGetSchema(pMeterMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMeta);
 
-  for (int32_t i = 0; i < pMeterMeta->numOfTags + pMeterMeta->numOfColumns; ++i) {
-    if (strncasecmp(pTagField->name, pSchema[i].name, TSDB_COL_NAME_LEN) == 0) {
+  for (int32_t i = 0; i < numOfTags + numOfCols; ++i) {
+    if (strncasecmp(pTagField->name, pSchema[i].name, sizeof(pTagField->name) - 1) == 0) {
       invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       return false;
     }
@@ -952,12 +1081,14 @@ bool validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
   const char* msg6 = "invalid column length";
 
   assert(pCmd->numOfClause == 1);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
+  
+  int32_t numOfTags = tscGetNumOfTags(pTableMeta);
+  int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+  
   // no more max columns
-  if (pMeterMeta->numOfColumns >= TSDB_MAX_COLUMNS ||
-      pMeterMeta->numOfTags + pMeterMeta->numOfColumns >= TSDB_MAX_COLUMNS) {
+  if (numOfCols >= TSDB_MAX_COLUMNS || numOfTags + numOfCols >= TSDB_MAX_COLUMNS) {
     invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     return false;
   }
@@ -972,10 +1103,10 @@ bool validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
     return false;
   }
 
-  SSchema* pSchema = tsGetSchema(pMeterMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMeta);
   int32_t  nLen = 0;
 
-  for (int32_t i = 0; i < pMeterMeta->numOfColumns; ++i) {
+  for (int32_t i = 0; i < numOfCols; ++i) {
     nLen += pSchema[i].bytes;
   }
 
@@ -991,8 +1122,8 @@ bool validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
   }
 
   // field name must be unique
-  for (int32_t i = 0; i < pMeterMeta->numOfTags + pMeterMeta->numOfColumns; ++i) {
-    if (strncasecmp(pColField->name, pSchema[i].name, TSDB_COL_NAME_LEN) == 0) {
+  for (int32_t i = 0; i < numOfTags + numOfCols; ++i) {
+    if (strncasecmp(pColField->name, pSchema[i].name, sizeof(pColField->name) - 1) == 0) {
       invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       return false;
     }
@@ -1004,7 +1135,8 @@ bool validateOneColumn(SSqlCmd* pCmd, TAOS_FIELD* pColField) {
 /* is contained in pFieldList or not */
 static bool has(tFieldList* pFieldList, int32_t startIdx, const char* name) {
   for (int32_t j = startIdx; j < pFieldList->nField; ++j) {
-    if (strncasecmp(name, pFieldList->p[j].name, TSDB_COL_NAME_LEN) == 0) return true;
+    TAOS_FIELD* field = pFieldList->p + j;
+    if (strncasecmp(name, field->name, sizeof(field->name) - 1) == 0) return true;
   }
 
   return false;
@@ -1012,14 +1144,14 @@ static bool has(tFieldList* pFieldList, int32_t startIdx, const char* name) {
 
 static char* getAccountId(SSqlObj* pSql) { return pSql->pTscObj->acctId; }
 
-static void getCurrentDBName(SSqlObj* pSql, SSQLToken* pDBToken) {
+static void getCurrentDBName(SSqlObj* pSql, SStrToken* pDBToken) {
   pDBToken->z = pSql->pTscObj->db;
-  pDBToken->n = strlen(pSql->pTscObj->db);
+  pDBToken->n = (uint32_t)strlen(pSql->pTscObj->db);
 }
 
 /* length limitation, strstr cannot be applied */
-static bool hasSpecifyDB(SSQLToken* pTableName) {
-  for (int32_t i = 0; i < pTableName->n; ++i) {
+static bool hasSpecifyDB(SStrToken* pTableName) {
+  for (uint32_t i = 0; i < pTableName->n; ++i) {
     if (pTableName->z[i] == TS_PATH_DELIMITER[0]) {
       return true;
     }
@@ -1028,11 +1160,11 @@ static bool hasSpecifyDB(SSQLToken* pTableName) {
   return false;
 }
 
-int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQLToken* tableName, int32_t* xlen) {
+int32_t setObjFullName(char* fullName, const char* account, SStrToken* pDB, SStrToken* tableName, int32_t* xlen) {
   int32_t totalLen = 0;
 
   if (account != NULL) {
-    int32_t len = strlen(account);
+    int32_t len = (int32_t)strlen(account);
     strcpy(fullName, account);
     fullName[len] = TS_PATH_DELIMITER[0];
     totalLen += (len + 1);
@@ -1040,8 +1172,8 @@ int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQL
 
   /* db name is not specified, the tableName dose not include db name */
   if (pDB != NULL) {
-    if (pDB->n > TSDB_DB_NAME_LEN) {
-      return TSDB_CODE_INVALID_SQL;
+    if (pDB->n >= TSDB_ACCT_LEN + TSDB_DB_NAME_LEN || pDB->n == 0) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     memcpy(&fullName[totalLen], pDB->z, pDB->n);
@@ -1054,13 +1186,13 @@ int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQL
       totalLen += 1;
 
       /* here we only check the table name length limitation */
-      if (tableName->n > TSDB_METER_NAME_LEN) {
-        return TSDB_CODE_INVALID_SQL;
+      if (!tscValidateTableNameLength(tableName->n)) {
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     } else {  // pDB == NULL, the db prefix name is specified in tableName
       /* the length limitation includes tablename + dbname + sep */
-      if (tableName->n > TSDB_METER_NAME_LEN + TSDB_DB_NAME_LEN + tListLen(TS_PATH_DELIMITER)) {
-        return TSDB_CODE_INVALID_SQL;
+      if (tableName->n >= TSDB_TABLE_NAME_LEN + TSDB_DB_NAME_LEN) {
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     }
 
@@ -1072,275 +1204,356 @@ int32_t setObjFullName(char* fullName, const char* account, SSQLToken* pDB, SSQL
     *xlen = totalLen;
   }
 
-  if (totalLen < TSDB_METER_ID_LEN) {
+  if (totalLen < TSDB_TABLE_FNAME_LEN) {
     fullName[totalLen] = 0;
   }
 
-  return (totalLen <= TSDB_METER_ID_LEN) ? TSDB_CODE_SUCCESS : TSDB_CODE_INVALID_SQL;
-}
-
-static void extractColumnNameFromString(tSQLExprItem* pItem) {
-  if (pItem->pNode->nSQLOptr == TK_STRING) {
-    pItem->pNode->val.nLen = strdequote(pItem->pNode->val.pz);
-    pItem->pNode->nSQLOptr = TK_ID;
-
-    SSQLToken* pIdToken = &pItem->pNode->colInfo;
-    pIdToken->type = TK_ID;
-    pIdToken->z = pItem->pNode->val.pz;
-    pIdToken->n = pItem->pNode->val.nLen;
-  }
+  return (totalLen < TSDB_TABLE_FNAME_LEN) ? TSDB_CODE_SUCCESS : TSDB_CODE_TSC_INVALID_SQL;
 }
 
-int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable) {
-  assert(pSelection != NULL && pCmd != NULL);
-
+static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t exprIndex, tSQLExprItem* pItem) {
   const char* msg1 = "invalid column name, or illegal column type";
-  const char* msg2 = "functions can not be mixed up";
-  const char* msg3 = "not support query expression";
+  const char* msg2 = "invalid arithmetic expression in select clause";
+  const char* msg3 = "tag columns can not be used in arithmetic expression";
   const char* msg4 = "columns from different table mixed up in arithmetic expression";
-  const char* msg5 = "invalid function name";
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
-
-  for (int32_t i = 0; i < pSelection->nExpr; ++i) {
-    int32_t       outputIndex = pQueryInfo->fieldsInfo.numOfOutputCols;
-    tSQLExprItem* pItem = &pSelection->a[i];
-
-    // project on all fields
-    if (pItem->pNode->nSQLOptr == TK_ALL || pItem->pNode->nSQLOptr == TK_ID || pItem->pNode->nSQLOptr == TK_STRING) {
-      // it is actually a function, but the function name is invalid
-      if (pItem->pNode->nSQLOptr == TK_ID && (pItem->pNode->colInfo.z == NULL && pItem->pNode->colInfo.n == 0)) {
-        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
-      }
-
-      // if the name of column is quoted, remove it and set the right information for later process
-      extractColumnNameFromString(pItem);
 
-      pQueryInfo->type |= TSDB_QUERY_TYPE_PROJECTION_QUERY;
-
-      // select table_name1.field_name1, table_name2.field_name2  from table_name1, table_name2
-      if (addProjectionExprAndResultField(pQueryInfo, pItem) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
-      }
-    } else if (pItem->pNode->nSQLOptr >= TK_COUNT && pItem->pNode->nSQLOptr <= TK_LAST_ROW) {
-      // sql function in selection clause, append sql function info in pSqlCmd structure sequentially
-      if (addExprAndResultField(pQueryInfo, outputIndex, pItem) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
-      }
-
-    } else if (pItem->pNode->nSQLOptr >= TK_PLUS && pItem->pNode->nSQLOptr <= TK_REM) {
-      // arithmetic function in select
-      SColumnList columnList = {0};
-      if (validateArithmeticSQLExpr(pItem->pNode, pQueryInfo, &columnList) != TSDB_CODE_SUCCESS) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
-      }
-      
-      int32_t tableIndex = columnList.ids[0].tableIndex;
-      for(int32_t f = 1; f < columnList.num; ++f) {
-        if (columnList.ids[f].tableIndex != tableIndex) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-        }
-      }
+  // arithmetic function in select clause
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
 
-      char  arithmeticExprStr[1024] = {0};
-      char* p = arithmeticExprStr;
+  SColumnList columnList = {0};
+  int32_t     arithmeticType = NON_ARITHMEIC_EXPR;
 
-      if (buildArithmeticExprString(pItem->pNode, &p) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
-      }
+  if (validateArithmeticSQLExpr(pCmd, pItem->pNode, pQueryInfo, &columnList, &arithmeticType) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  }
 
-      // expr string is set as the parameter of function
-      SColumnIndex index = {.tableIndex = tableIndex};
-      SSqlExpr*    pExpr = tscSqlExprInsert(pQueryInfo, outputIndex, TSDB_FUNC_ARITHM, &index, TSDB_DATA_TYPE_DOUBLE,
-                                         sizeof(double), sizeof(double));
-      addExprParams(pExpr, arithmeticExprStr, TSDB_DATA_TYPE_BINARY, strlen(arithmeticExprStr), index.tableIndex);
+  int32_t tableIndex = columnList.ids[0].tableIndex;
+  if (arithmeticType == NORMAL_ARITHMETIC) {
+    pQueryInfo->type |= TSDB_QUERY_TYPE_PROJECTION_QUERY;
 
-      /* todo alias name should use the original sql string */
-      if (pItem->aliasName != NULL) {
-        strncpy(pExpr->aliasName, pItem->aliasName, TSDB_COL_NAME_LEN);
-      } else {
-        strncpy(pExpr->aliasName, arithmeticExprStr, TSDB_COL_NAME_LEN);
+    // all columns in arithmetic expression must belong to the same table
+    for (int32_t f = 1; f < columnList.num; ++f) {
+      if (columnList.ids[f].tableIndex != tableIndex) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
       }
-
-      insertResultField(pQueryInfo, i, &columnList, sizeof(double), TSDB_DATA_TYPE_DOUBLE, pExpr->aliasName);
-    } else {
-      /*
-       * not support such expression
-       * e.g., select 12+5 from table_name
-       */
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
-    }
-
-    if (pQueryInfo->fieldsInfo.numOfOutputCols > TSDB_MAX_COLUMNS) {
-      return TSDB_CODE_INVALID_SQL;
     }
-  }
 
-  if (!functionCompatibleCheck(pQueryInfo)) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
-  }
+    // expr string is set as the parameter of function
+    SColumnIndex index = {.tableIndex = tableIndex};
 
-  if (isSTable) {
-    pQueryInfo->type |= TSDB_QUERY_TYPE_STABLE_QUERY;
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+    SSqlExpr* pExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_ARITHM, &index, TSDB_DATA_TYPE_DOUBLE, sizeof(double),
+                                       sizeof(double), false);
 
-    if (tscQueryMetricTags(pQueryInfo)) {  // local handle the metric tag query
-      pCmd->count = pMeterMetaInfo->pMeterMeta->numOfColumns;  // the number of meter schema, tricky.
-      pQueryInfo->command = TSDB_SQL_RETRIEVE_TAGS;
-    }
+    char* name = (pItem->aliasName != NULL)? pItem->aliasName:pItem->pNode->token.z;
+    size_t len = MIN(sizeof(pExpr->aliasName), pItem->pNode->token.n + 1);
+    tstrncpy(pExpr->aliasName, name, len);
 
-    /*
-     * transfer sql functions that need secondary merge into another format
-     * in dealing with metric queries such as: count/first/last
-     */
-    tscTansformSQLFunctionForSTableQuery(pQueryInfo);
+    tExprNode* pNode = NULL;
+    SArray* colList = taosArrayInit(10, sizeof(SColIndex));
 
-    if (hasUnsupportFunctionsForSTableQuery(pQueryInfo)) {
-      return TSDB_CODE_INVALID_SQL;
+    int32_t ret = exprTreeFromSqlExpr(pCmd, &pNode, pItem->pNode, pQueryInfo->exprList, pQueryInfo, colList);
+    if (ret != TSDB_CODE_SUCCESS) {
+      taosArrayDestroy(colList);
+      tExprTreeDestroy(&pNode, NULL);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
-  }
 
-  return TSDB_CODE_SUCCESS;
-}
+    size_t numOfNode = taosArrayGetSize(colList);
+    for(int32_t k = 0; k < numOfNode; ++k) {
+      SColIndex* pIndex = taosArrayGet(colList, k);
+      if (TSDB_COL_IS_TAG(pIndex->flag)) {
+        tExprTreeDestroy(&pNode, NULL);
+        taosArrayDestroy(colList);
+        tExprTreeDestroy(&pNode, NULL);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
+    }
 
-int32_t insertResultField(SQueryInfo* pQueryInfo, int32_t outputIndex, SColumnList* pIdList, int16_t bytes, int8_t type,
-                          char* fieldName) {
-  for (int32_t i = 0; i < pIdList->num; ++i) {
-    tscColumnBaseInfoInsert(pQueryInfo, &(pIdList->ids[i]));
-  }
+    SBufferWriter bw = tbufInitWriter(NULL, false);
 
-  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, outputIndex, type, fieldName, bytes);
-  return TSDB_CODE_SUCCESS;
-}
+    TRY(0) {
+        exprTreeToBinary(&bw, pNode);
+      } CATCH(code) {
+        tbufCloseWriter(&bw);
+        UNUSED(code);
+        // TODO: other error handling
+      } END_TRY
 
-SSqlExpr* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t outputIndex, int32_t colIdx, int32_t tableIndex) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
-  SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
+    len = tbufTell(&bw);
+    char* c = tbufGetData(&bw, false);
 
-  SSchema* pSchema = tsGetColumnSchema(pMeterMeta, colIdx);
-  int32_t  numOfCols = pMeterMeta->numOfColumns;
+    // set the serialized binary string as the parameter of arithmetic expression
+    addExprParams(pExpr, c, TSDB_DATA_TYPE_BINARY, (int32_t)len, index.tableIndex);
 
-  int16_t functionId = (int16_t)((colIdx >= numOfCols) ? TSDB_FUNC_TAGPRJ : TSDB_FUNC_PRJ);
+    insertResultField(pQueryInfo, exprIndex, &columnList, sizeof(double), TSDB_DATA_TYPE_DOUBLE, pExpr->aliasName, pExpr);
 
-  if (functionId == TSDB_FUNC_TAGPRJ) {
-    addRequiredTagColumn(pQueryInfo, colIdx - numOfCols, tableIndex);
-    pQueryInfo->type = TSDB_QUERY_TYPE_STABLE_QUERY;
+    tbufCloseWriter(&bw);
+    taosArrayDestroy(colList);
+    tExprTreeDestroy(&pNode, NULL);
   } else {
-    pQueryInfo->type = TSDB_QUERY_TYPE_PROJECTION_QUERY;
-  }
+    columnList.num = 0;
+    columnList.ids[0] = (SColumnIndex) {0, 0};
 
-  SColumnIndex index = {tableIndex, colIdx};
-  SSqlExpr*    pExpr =
-      tscSqlExprInsert(pQueryInfo, outputIndex, functionId, &index, pSchema->type, pSchema->bytes, pSchema->bytes);
+    char aliasName[TSDB_COL_NAME_LEN] = {0};
+    if (pItem->aliasName != NULL) {
+      tstrncpy(aliasName, pItem->aliasName, TSDB_COL_NAME_LEN);
+    } else {
+      int32_t nameLen = MIN(TSDB_COL_NAME_LEN, pItem->pNode->token.n + 1);
+      tstrncpy(aliasName, pItem->pNode->token.z, nameLen);
+    }
 
-  return pExpr;
-}
+    insertResultField(pQueryInfo, exprIndex, &columnList, sizeof(double), TSDB_DATA_TYPE_DOUBLE, aliasName, NULL);
 
-void addRequiredTagColumn(SQueryInfo* pQueryInfo, int32_t tagColIndex, int32_t tableIndex) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
+    int32_t slot = tscNumOfFields(pQueryInfo) - 1;
+    SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, slot);
 
-  if (pMeterMetaInfo->numOfTags == 0 || pMeterMetaInfo->tagColumnIndex[pMeterMetaInfo->numOfTags - 1] < tagColIndex) {
-    pMeterMetaInfo->tagColumnIndex[pMeterMetaInfo->numOfTags++] = tagColIndex;
-  } else {  // find the appropriate position
-    for (int32_t i = 0; i < pMeterMetaInfo->numOfTags; ++i) {
-      if (tagColIndex > pMeterMetaInfo->tagColumnIndex[i]) {
-        continue;
-      } else if (tagColIndex == pMeterMetaInfo->tagColumnIndex[i]) {
-        break;
-      } else {
-        memmove(&pMeterMetaInfo->tagColumnIndex[i + 1], &pMeterMetaInfo->tagColumnIndex[i],
-                sizeof(pMeterMetaInfo->tagColumnIndex[0]) * (pMeterMetaInfo->numOfTags - i));
+    if (pInfo->pSqlExpr == NULL) {
+      SExprInfo* pArithExprInfo = calloc(1, sizeof(SExprInfo));
 
-        pMeterMetaInfo->tagColumnIndex[i] = tagColIndex;
+      // arithmetic expression always return result in the format of double float
+      pArithExprInfo->bytes = sizeof(double);
+      pArithExprInfo->interBytes = sizeof(double);
+      pArithExprInfo->type = TSDB_DATA_TYPE_DOUBLE;
 
-        pMeterMetaInfo->numOfTags++;
-        break;
+      int32_t ret = exprTreeFromSqlExpr(pCmd, &pArithExprInfo->pExpr, pItem->pNode, pQueryInfo->exprList, pQueryInfo, NULL);
+      if (ret != TSDB_CODE_SUCCESS) {
+        tExprTreeDestroy(&pArithExprInfo->pExpr, NULL);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "invalid expression in select clause");
       }
+
+      pInfo->pArithExprInfo = pArithExprInfo;
     }
   }
 
-  // plus one means tbname
-  assert(tagColIndex >= -1 && tagColIndex < TSDB_MAX_TAGS && pMeterMetaInfo->numOfTags <= TSDB_MAX_TAGS + 1);
+  return TSDB_CODE_SUCCESS;
+}
+
+static void tscInsertPrimaryTSSourceColumn(SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
+  SColumnIndex tsCol = {.tableIndex = pIndex->tableIndex, .columnIndex = PRIMARYKEY_TIMESTAMP_COL_INDEX};
+  tscColumnListInsert(pQueryInfo->colList, &tsCol);
 }
 
 static void addProjectQueryCol(SQueryInfo* pQueryInfo, int32_t startPos, SColumnIndex* pIndex, tSQLExprItem* pItem) {
   SSqlExpr* pExpr = doAddProjectCol(pQueryInfo, startPos, pIndex->columnIndex, pIndex->tableIndex);
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, pIndex->tableIndex);
-  SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, pIndex->tableIndex);
+  STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
 
-  SSchema* pSchema = tsGetColumnSchema(pMeterMeta, pIndex->columnIndex);
+  SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, pIndex->columnIndex);
 
   char* colName = (pItem->aliasName == NULL) ? pSchema->name : pItem->aliasName;
+  tstrncpy(pExpr->aliasName, colName, sizeof(pExpr->aliasName));
 
   SColumnList ids = {0};
   ids.num = 1;
   ids.ids[0] = *pIndex;
 
-  if (pIndex->columnIndex >= pMeterMeta->numOfColumns || pIndex->columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+  if (pIndex->columnIndex == TSDB_TBNAME_COLUMN_INDEX || pIndex->columnIndex == TSDB_UD_COLUMN_INDEX ||
+      pIndex->columnIndex >= tscGetNumOfColumns(pTableMeta)) {
     ids.num = 0;
   }
 
-  insertResultField(pQueryInfo, startPos, &ids, pExpr->resBytes, pExpr->resType, colName);
+  insertResultField(pQueryInfo, startPos, &ids, pExpr->resBytes, (int8_t)pExpr->resType, pExpr->aliasName, pExpr);
 }
 
-void tscAddSpecialColumnForSelect(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
-                                  SColumnIndex* pIndex, SSchema* pColSchema, int16_t flag) {
-  SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, outputColIndex, functionId, pIndex, pColSchema->type,
-                                     pColSchema->bytes, pColSchema->bytes);
+int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable, bool joinQuery) {
+  assert(pSelection != NULL && pCmd != NULL);
 
-  SColumnList ids = getColumnList(1, pIndex->tableIndex, pIndex->columnIndex);
-  if (TSDB_COL_IS_TAG(flag)) {
-    ids.num = 0;
-  }
+  const char* msg2 = "functions can not be mixed up";
+  const char* msg3 = "not support query expression";
+  const char* msg5 = "invalid function name";
 
-  insertResultField(pQueryInfo, outputColIndex, &ids, pColSchema->bytes, pColSchema->type, pColSchema->name);
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
 
-  pExpr->colInfo.flag = flag;
-  if (TSDB_COL_IS_TAG(flag)) {
-    addRequiredTagColumn(pQueryInfo, pIndex->columnIndex, pIndex->tableIndex);
+  if (pQueryInfo->colList == NULL) {
+    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
   }
-}
 
-static int32_t doAddProjectionExprAndResultFields(SQueryInfo* pQueryInfo, SColumnIndex* pIndex, int32_t startPos) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, pIndex->tableIndex);
+  for (int32_t i = 0; i < pSelection->nExpr; ++i) {
+    int32_t outputIndex = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+    tSQLExprItem* pItem = &pSelection->a[i];
+
+    // project on all fields
+    int32_t optr = pItem->pNode->nSQLOptr;
+
+    if (optr == TK_ALL || optr == TK_ID || optr == TK_STRING || optr == TK_INTEGER || optr == TK_FLOAT) {
+      // it is actually a function, but the function name is invalid
+      if (pItem->pNode->nSQLOptr == TK_ID && (pItem->pNode->colInfo.z == NULL && pItem->pNode->colInfo.n == 0)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
+      }
+
+      // select table_name1.field_name1, table_name2.field_name2  from table_name1, table_name2
+      if (addProjectionExprAndResultField(pCmd, pQueryInfo, pItem) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
+    } else if (pItem->pNode->nSQLOptr >= TK_COUNT && pItem->pNode->nSQLOptr <= TK_TBID) {
+      // sql function in selection clause, append sql function info in pSqlCmd structure sequentially
+      if (addExprAndResultField(pCmd, pQueryInfo, outputIndex, pItem, true) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
+
+    } else if (pItem->pNode->nSQLOptr >= TK_PLUS && pItem->pNode->nSQLOptr <= TK_REM) {
+      int32_t code = handleArithmeticExpr(pCmd, clauseIndex, i, pItem);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+    } else {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+    }
+
+    if (pQueryInfo->fieldsInfo.numOfOutput > TSDB_MAX_COLUMNS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  }
+
+  // there is only one user-defined column in the final result field, add the timestamp column.
+  size_t numOfSrcCols = taosArrayGetSize(pQueryInfo->colList);
+  if (numOfSrcCols <= 0 && !tscQueryTags(pQueryInfo)) {
+    SColumnIndex index = {0};
+
+    // set the constant column value always attached to first table.
+    STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, clauseIndex, 0);
+    SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, PRIMARYKEY_TIMESTAMP_COL_INDEX);
+
+    // add the timestamp column into the output columns
+    int32_t numOfCols = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+    tscAddSpecialColumnForSelect(pQueryInfo, numOfCols, TSDB_FUNC_PRJ, &index, pSchema, TSDB_COL_NORMAL);
+
+    SFieldSupInfo* pSupInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, numOfCols);
+    pSupInfo->visible = false;
+
+    pQueryInfo->type |= TSDB_QUERY_TYPE_PROJECTION_QUERY;
+  }
+
+  if (!functionCompatibleCheck(pQueryInfo, joinQuery)) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  }
+
+  /*
+   * transfer sql functions that need secondary merge into another format
+   * in dealing with super table queries such as: count/first/last
+   */
+  if (isSTable) {
+    tscTansformSQLFuncForSTableQuery(pQueryInfo);
+
+    if (hasUnsupportFunctionsForSTableQuery(pCmd, pQueryInfo)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t insertResultField(SQueryInfo* pQueryInfo, int32_t outputIndex, SColumnList* pIdList, int16_t bytes,
+    int8_t type, char* fieldName, SSqlExpr* pSqlExpr) {
+  
+  for (int32_t i = 0; i < pIdList->num; ++i) {
+    int32_t tableId = pIdList->ids[i].tableIndex;
+    STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[tableId];
+    
+    int32_t numOfCols = tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+    if (pIdList->ids[i].columnIndex >= numOfCols) {
+      continue;
+    }
+    
+    tscColumnListInsert(pQueryInfo->colList, &(pIdList->ids[i]));
+  }
+  
+  TAOS_FIELD f = tscCreateField(type, fieldName, bytes);
+  SFieldSupInfo* pInfo = tscFieldInfoInsert(&pQueryInfo->fieldsInfo, outputIndex, &f);
+  pInfo->pSqlExpr = pSqlExpr;
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+SSqlExpr* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t outputIndex, int32_t colIndex, int32_t tableIndex) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
+  STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
+  int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+  
+  SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, colIndex);
+
+  int16_t functionId = (int16_t)((colIndex >= numOfCols) ? TSDB_FUNC_TAGPRJ : TSDB_FUNC_PRJ);
+  SColumnIndex index = {.tableIndex = tableIndex,};
+  
+  if (functionId == TSDB_FUNC_TAGPRJ) {
+    index.columnIndex = colIndex - tscGetNumOfColumns(pTableMeta);
+  
+    tscColumnListInsert(pTableMetaInfo->tagColList, &index);
+  } else {
+    index.columnIndex = colIndex;
+  }
+  
+  return tscSqlExprAppend(pQueryInfo, functionId, &index, pSchema->type, pSchema->bytes,
+      pSchema->bytes, functionId == TSDB_FUNC_TAGPRJ);
+}
+
+SSqlExpr* tscAddSpecialColumnForSelect(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId,
+                                  SColumnIndex* pIndex, SSchema* pColSchema, int16_t flag) {
+  SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, outputColIndex, functionId, pIndex, pColSchema->type,
+                                     pColSchema->bytes, pColSchema->bytes, TSDB_COL_IS_TAG(flag));
+  tstrncpy(pExpr->aliasName, pColSchema->name, sizeof(pExpr->aliasName));
+
+  SColumnList ids = getColumnList(1, pIndex->tableIndex, pIndex->columnIndex);
+  if (TSDB_COL_IS_TAG(flag)) {
+    ids.num = 0;
+  }
+
+  insertResultField(pQueryInfo, outputColIndex, &ids, pColSchema->bytes, pColSchema->type, pColSchema->name, pExpr);
+
+  pExpr->colInfo.flag = flag;
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, pIndex->tableIndex);
+  
+  if (TSDB_COL_IS_TAG(flag)) {
+    tscColumnListInsert(pTableMetaInfo->tagColList, pIndex);
+  }
+
+  return pExpr;
+}
+
+static int32_t doAddProjectionExprAndResultFields(SQueryInfo* pQueryInfo, SColumnIndex* pIndex, int32_t startPos) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, pIndex->tableIndex);
 
   int32_t     numOfTotalColumns = 0;
-  SMeterMeta* pMeterMeta = pMeterMetaInfo->pMeterMeta;
-  SSchema*    pSchema = tsGetSchema(pMeterMeta);
+  STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+  SSchema*    pSchema = tscGetTableSchema(pTableMeta);
 
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    numOfTotalColumns = pMeterMeta->numOfColumns + pMeterMeta->numOfTags;
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    numOfTotalColumns = tinfo.numOfColumns + tinfo.numOfTags;
   } else {
-    numOfTotalColumns = pMeterMeta->numOfColumns;
+    numOfTotalColumns = tinfo.numOfColumns;
   }
 
   for (int32_t j = 0; j < numOfTotalColumns; ++j) {
-    doAddProjectCol(pQueryInfo, startPos + j, j, pIndex->tableIndex);
+    SSqlExpr* pExpr = doAddProjectCol(pQueryInfo, startPos + j, j, pIndex->tableIndex);
+    tstrncpy(pExpr->aliasName, pSchema[j].name, sizeof(pExpr->aliasName));
 
     pIndex->columnIndex = j;
     SColumnList ids = {0};
     ids.ids[0] = *pIndex;
+    ids.num = 1;
 
-    // tag columns do not add to source list
-    ids.num = (j >= pMeterMeta->numOfColumns) ? 0 : 1;
-
-    insertResultField(pQueryInfo, startPos + j, &ids, pSchema[j].bytes, pSchema[j].type, pSchema[j].name);
+    insertResultField(pQueryInfo, startPos + j, &ids, pSchema[j].bytes, pSchema[j].type, pSchema[j].name, pExpr);
   }
 
   return numOfTotalColumns;
 }
 
-int32_t addProjectionExprAndResultField(SQueryInfo* pQueryInfo, tSQLExprItem* pItem) {
+int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExprItem* pItem) {
   const char* msg0 = "invalid column name";
-  const char* msg1 = "tag for table query is not allowed";
+  const char* msg1 = "tag for normal table query is not allowed";
+
+  int32_t startPos = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+  int32_t optr = pItem->pNode->nSQLOptr;
 
-  int32_t startPos = pQueryInfo->fieldsInfo.numOfOutputCols;
+  if (optr == TK_ALL) {  // project on all fields
+    TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_PROJECTION_QUERY);
 
-  if (pItem->pNode->nSQLOptr == TK_ALL) {  // project on all fields
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
     if (getTableIndexByName(&pItem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
     }
 
     // all meters columns are required
@@ -1353,49 +1566,67 @@ int32_t addProjectionExprAndResultField(SQueryInfo* pQueryInfo, tSQLExprItem* pI
     } else {
       doAddProjectionExprAndResultFields(pQueryInfo, &index, startPos);
     }
-  } else if (pItem->pNode->nSQLOptr == TK_ID) {  // simple column projection query
+
+    // add the primary timestamp column even though it is not required by user
+    tscInsertPrimaryTSSourceColumn(pQueryInfo, &index);
+  } else if (optr == TK_STRING || optr == TK_INTEGER || optr == TK_FLOAT) {  // simple column projection query
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
 
-    if (getColumnIndexByName(&pItem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+    // user-specified constant value as a new result column
+    index.columnIndex = (pQueryInfo->udColumnId--);
+    index.tableIndex = 0;
+
+    SSchema colSchema = tGetUserSpecifiedColumnSchema(&pItem->pNode->val, &pItem->pNode->token, pItem->aliasName);
+    SSqlExpr* pExpr =
+        tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_PRJ, &index, &colSchema, TSDB_COL_UDC);
+
+    // NOTE: the first parameter is reserved for the tag column id during join query process.
+    pExpr->numOfParams = 2;
+    tVariantAssign(&pExpr->param[1], &pItem->pNode->val);
+  } else if (optr == TK_ID) {
+    SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+
+    if (getColumnIndexByName(pCmd, &pItem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
     }
 
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
-      SSchema colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = TSDB_METER_NAME_LEN};
-      strcpy(colSchema.name, TSQL_TBNAME_L);
-
-      pQueryInfo->type = TSDB_QUERY_TYPE_STABLE_QUERY;
-      tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, &colSchema, true);
+      SSchema colSchema = tGetTableNameColumnSchema();
+      tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, &colSchema, TSDB_COL_TAG);
     } else {
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-      SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+      STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
 
-      if (index.columnIndex >= pMeterMeta->numOfColumns && UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      if (index.columnIndex >= tscGetNumOfColumns(pTableMeta) && UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
       addProjectQueryCol(pQueryInfo, startPos, &index, pItem);
+      pQueryInfo->type |= TSDB_QUERY_TYPE_PROJECTION_QUERY;
     }
+
+    // add the primary timestamp column even though it is not required by user
+    tscInsertPrimaryTSSourceColumn(pQueryInfo, &index);
   } else {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setExprInfoForFunctions(SQueryInfo* pQueryInfo, SSchema* pSchema, int32_t functionID, char* aliasName,
+static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSchema* pSchema, SConvertFunc cvtFunc, char* aliasName,
                                        int32_t resColIdx, SColumnIndex* pColIndex) {
+  const char* msg1 = "not support column types";
+
   int16_t type = 0;
   int16_t bytes = 0;
-
-  char        columnName[TSDB_COL_NAME_LEN] = {0};
-  const char* msg1 = "not support column types";
+  char    columnName[TSDB_COL_NAME_LEN] = {0};
+  int32_t functionID = cvtFunc.execFuncId;
 
   if (functionID == TSDB_FUNC_SPREAD) {
-    if (pSchema[pColIndex->columnIndex].type == TSDB_DATA_TYPE_BINARY ||
-        pSchema[pColIndex->columnIndex].type == TSDB_DATA_TYPE_NCHAR ||
-        pSchema[pColIndex->columnIndex].type == TSDB_DATA_TYPE_BOOL) {
-      invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    int32_t t1 = pSchema[pColIndex->columnIndex].type;
+    if (t1 == TSDB_DATA_TYPE_BINARY || t1 == TSDB_DATA_TYPE_NCHAR || t1 == TSDB_DATA_TYPE_BOOL) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       return -1;
     } else {
       type = TSDB_DATA_TYPE_DOUBLE;
@@ -1405,30 +1636,40 @@ static int32_t setExprInfoForFunctions(SQueryInfo* pQueryInfo, SSchema* pSchema,
     type = pSchema[pColIndex->columnIndex].type;
     bytes = pSchema[pColIndex->columnIndex].bytes;
   }
-
+  
   if (aliasName != NULL) {
-    strcpy(columnName, aliasName);
+    tstrncpy(columnName, aliasName, sizeof(columnName));
   } else {
-    getRevisedName(columnName, functionID, TSDB_COL_NAME_LEN, pSchema[pColIndex->columnIndex].name);
+    getRevisedName(columnName, cvtFunc.originFuncId, sizeof(columnName) - 1, pSchema[pColIndex->columnIndex].name);
   }
 
-  tscSqlExprInsert(pQueryInfo, resColIdx, functionID, pColIndex, type, bytes, bytes);
+  SSqlExpr* pExpr = tscSqlExprAppend(pQueryInfo, functionID, pColIndex, type, bytes, bytes, false);
+  tstrncpy(pExpr->aliasName, columnName, sizeof(pExpr->aliasName));
 
-  // for point interpolation/last_row query, we need the timestamp column to be loaded
-  SColumnIndex index = {.tableIndex = pColIndex->tableIndex, .columnIndex = PRIMARYKEY_TIMESTAMP_COL_INDEX};
-  if (functionID == TSDB_FUNC_INTERP || functionID == TSDB_FUNC_LAST_ROW) {
-    tscColumnBaseInfoInsert(pQueryInfo, &index);
+  if (cvtFunc.originFuncId == TSDB_FUNC_LAST_ROW && cvtFunc.originFuncId != functionID) {
+    pExpr->colInfo.flag |= TSDB_COL_NULL;
+  }
+
+  // set reverse order scan data blocks for last query
+  if (functionID == TSDB_FUNC_LAST) {
+    pExpr->numOfParams = 1;
+    pExpr->param[0].i64Key = TSDB_ORDER_DESC;
+    pExpr->param[0].nType = TSDB_DATA_TYPE_INT;
   }
+  
+  // for all queries, the timestamp column needs to be loaded
+  SColumnIndex index = {.tableIndex = pColIndex->tableIndex, .columnIndex = PRIMARYKEY_TIMESTAMP_COL_INDEX};
+  tscColumnListInsert(pQueryInfo->colList, &index);
 
   SColumnList ids = getColumnList(1, pColIndex->tableIndex, pColIndex->columnIndex);
-  insertResultField(pQueryInfo, resColIdx, &ids, bytes, type, columnName);
+  insertResultField(pQueryInfo, resColIdx, &ids, bytes, (int8_t)type, columnName, pExpr);
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprItem* pItem) {
-  SMeterMetaInfo* pMeterMetaInfo = NULL;
-  int32_t         optr = pItem->pNode->nSQLOptr;
+int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t colIndex, tSQLExprItem* pItem, bool finalResult) {
+  STableMetaInfo* pTableMetaInfo = NULL;
+  int32_t optr = pItem->pNode->nSQLOptr;
 
   const char* msg1 = "not support column types";
   const char* msg2 = "invalid parameters";
@@ -1436,74 +1677,114 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
   const char* msg4 = "invalid table name";
   const char* msg5 = "parameter is out of range [0, 100]";
   const char* msg6 = "function applied to tags not allowed";
+  const char* msg7 = "normal table can not apply this function";
+  const char* msg8 = "multi-columns selection does not support alias column name";
+  const char* msg9 = "invalid function";
 
   switch (optr) {
     case TK_COUNT: {
-      if (pItem->pNode->pParam != NULL && pItem->pNode->pParam->nExpr != 1) {
         /* more than one parameter for count() function */
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      if (pItem->pNode->pParam != NULL && pItem->pNode->pParam->nExpr != 1) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       int16_t functionID = 0;
       if (changeFunctionID(optr, &functionID) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
+      SSqlExpr* pExpr = NULL;
       SColumnIndex index = COLUMN_INDEX_INITIALIZER;
 
       if (pItem->pNode->pParam != NULL) {
-        SSQLToken* pToken = &pItem->pNode->pParam->a[0].pNode->colInfo;
-        if (pToken->z == NULL || pToken->n == 0) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg3);
-        }
-
         tSQLExprItem* pParamElem = &pItem->pNode->pParam->a[0];
-        if (pParamElem->pNode->nSQLOptr == TK_ALL) {
+        SStrToken* pToken = &pParamElem->pNode->colInfo;
+        short sqlOptr = pParamElem->pNode->nSQLOptr;
+        if ((pToken->z == NULL || pToken->n == 0) 
+            && (TK_INTEGER != sqlOptr)) /*select count(1) from table*/ {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+        } 
+        if (sqlOptr == TK_ALL) {
           // select table.*
           // check if the table name is valid or not
-          SSQLToken tmpToken = pParamElem->pNode->colInfo;
+          SStrToken tmpToken = pParamElem->pNode->colInfo;
 
           if (getTableIndexByName(&tmpToken, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-            return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
           }
 
           index = (SColumnIndex){0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
           int32_t size = tDataTypeDesc[TSDB_DATA_TYPE_BIGINT].nSize;
-          tscSqlExprInsert(pQueryInfo, colIdx, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size);
+          pExpr = tscSqlExprAppend(pQueryInfo, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size, false);
+        } else if (sqlOptr == TK_INTEGER) { // select count(1) from table1
+          char buf[8] = {0};  
+          int64_t val = -1;
+          tVariant* pVariant = &pParamElem->pNode->val;
+          if (pVariant->nType == TSDB_DATA_TYPE_BIGINT) {
+            tVariantDump(pVariant, buf, TSDB_DATA_TYPE_BIGINT, true);
+            val = GET_INT64_VAL(buf); 
+          }
+          if (val == 1) {
+            index = (SColumnIndex){0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
+            int32_t size = tDataTypeDesc[TSDB_DATA_TYPE_BIGINT].nSize;
+            pExpr = tscSqlExprAppend(pQueryInfo, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size, false);
+          } else {
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+          }
         } else {
-          // count the number of meters created according to the metric
-          if (getColumnIndexByName(pToken, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-            return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+          // count the number of meters created according to the super table
+          if (getColumnIndexByName(pCmd, pToken, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
           }
 
-          pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
+          pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
 
           // count tag is equalled to count(tbname)
-          if (index.columnIndex >= pMeterMetaInfo->pMeterMeta->numOfColumns) {
+          bool isTag = false;
+          if (index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta) || index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
             index.columnIndex = TSDB_TBNAME_COLUMN_INDEX;
+            isTag = true;
           }
 
           int32_t size = tDataTypeDesc[TSDB_DATA_TYPE_BIGINT].nSize;
-          tscSqlExprInsert(pQueryInfo, colIdx, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size);
+          pExpr = tscSqlExprAppend(pQueryInfo, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size, isTag);
         }
       } else {  // count(*) is equalled to count(primary_timestamp_key)
         index = (SColumnIndex){0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
-
         int32_t size = tDataTypeDesc[TSDB_DATA_TYPE_BIGINT].nSize;
-        tscSqlExprInsert(pQueryInfo, colIdx, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size);
+        pExpr = tscSqlExprAppend(pQueryInfo, functionID, &index, TSDB_DATA_TYPE_BIGINT, size, size, false);
       }
 
-      char columnName[TSDB_COL_NAME_LEN] = {0};
-      getColumnName(pItem, columnName, TSDB_COL_NAME_LEN);
+      pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
 
-      // count always use the primary timestamp key column, which is 0.
+      memset(pExpr->aliasName, 0, tListLen(pExpr->aliasName));
+      getColumnName(pItem, pExpr->aliasName, sizeof(pExpr->aliasName) - 1);
+      
       SColumnList ids = getColumnList(1, index.tableIndex, index.columnIndex);
+      if (finalResult) {
+        int32_t numOfOutput = tscNumOfFields(pQueryInfo);
+        insertResultField(pQueryInfo, numOfOutput, &ids, sizeof(int64_t), TSDB_DATA_TYPE_BIGINT, pExpr->aliasName, pExpr);
+      } else {
+        for (int32_t i = 0; i < ids.num; ++i) {
+          tscColumnListInsert(pQueryInfo->colList, &(ids.ids[i]));
+        }
+      }
+
+      // the time stamp may be always needed
+      if (index.tableIndex < tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+        tscInsertPrimaryTSSourceColumn(pQueryInfo, &index);
+      }
 
-      insertResultField(pQueryInfo, colIdx, &ids, sizeof(int64_t), TSDB_DATA_TYPE_BIGINT, columnName);
       return TSDB_CODE_SUCCESS;
     }
     case TK_SUM:
     case TK_AVG:
+    case TK_RATE:
+    case TK_IRATE:
+    case TK_SUM_RATE:
+    case TK_SUM_IRATE:
+    case TK_AVG_RATE:
+    case TK_AVG_IRATE:
     case TK_TWA:
     case TK_MIN:
     case TK_MAX:
@@ -1514,76 +1795,75 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
       if (pItem->pNode->pParam == NULL || (optr != TK_LEASTSQUARES && pItem->pNode->pParam->nExpr != 1) ||
           (optr == TK_LEASTSQUARES && pItem->pNode->pParam->nExpr != 3)) {
         /* no parameters or more than one parameter for function */
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       tSQLExprItem* pParamElem = &(pItem->pNode->pParam->a[0]);
       if (pParamElem->pNode->nSQLOptr != TK_ALL && pParamElem->pNode->nSQLOptr != TK_ID) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-      if ((getColumnIndexByName(&pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) ||
-          index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      if ((getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
+      if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
       // 2. check if sql function can be applied on this column data type
-      pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-      SSchema* pSchema = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, index.columnIndex);
+      pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+      SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, index.columnIndex);
       int16_t  colType = pSchema->type;
 
       if (colType <= TSDB_DATA_TYPE_BOOL || colType >= TSDB_DATA_TYPE_BINARY) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      char columnName[TSDB_COL_NAME_LEN] = {0};
-      getColumnName(pItem, columnName, TSDB_COL_NAME_LEN);
-
       int16_t resultType = 0;
       int16_t resultSize = 0;
-      int16_t intermediateResSize = 0;
+      int32_t intermediateResSize = 0;
 
       int16_t functionID = 0;
       if (changeFunctionID(optr, &functionID) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
       if (getResultDataInfo(pSchema->type, pSchema->bytes, functionID, 0, &resultType, &resultSize,
                             &intermediateResSize, 0, false) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
       // set the first column ts for diff query
       if (optr == TK_DIFF) {
-        colIdx += 1;
+        colIndex += 1;
         SColumnIndex indexTS = {.tableIndex = index.tableIndex, .columnIndex = 0};
-        tscSqlExprInsert(pQueryInfo, 0, TSDB_FUNC_TS_DUMMY, &indexTS, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE,
-                         TSDB_KEYSIZE);
+        SSqlExpr* pExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &indexTS, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE,
+                         TSDB_KEYSIZE, false);
 
         SColumnList ids = getColumnList(1, 0, 0);
-        insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS_DUMMY].aName);
+        insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, aAggs[TSDB_FUNC_TS_DUMMY].aName, pExpr);
       }
 
       // functions can not be applied to tags
-      if (index.columnIndex >= pMeterMetaInfo->pMeterMeta->numOfColumns) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+      if (index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
-      SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, colIdx, functionID, &index, resultType, resultSize, resultSize);
+      SSqlExpr* pExpr = tscSqlExprAppend(pQueryInfo, functionID, &index, resultType, resultSize, resultSize, false);
 
       if (optr == TK_LEASTSQUARES) {
         /* set the leastsquares parameters */
         char val[8] = {0};
-        if (tVariantDump(&pParamElem[1].pNode->val, val, TSDB_DATA_TYPE_DOUBLE) < 0) {
-          return TSDB_CODE_INVALID_SQL;
+        if (tVariantDump(&pParamElem[1].pNode->val, val, TSDB_DATA_TYPE_DOUBLE, true) < 0) {
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
 
         addExprParams(pExpr, val, TSDB_DATA_TYPE_DOUBLE, DOUBLE_BYTES, 0);
 
         memset(val, 0, tListLen(val));
-        if (tVariantDump(&pParamElem[2].pNode->val, val, TSDB_DATA_TYPE_DOUBLE) < 0) {
-          return TSDB_CODE_INVALID_SQL;
+        if (tVariantDump(&pParamElem[2].pNode->val, val, TSDB_DATA_TYPE_DOUBLE, true) < 0) {
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
 
         addExprParams(pExpr, val, TSDB_DATA_TYPE_DOUBLE, sizeof(double), 0);
@@ -1592,9 +1872,20 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
       SColumnList ids = {0};
       ids.num = 1;
       ids.ids[0] = index;
+  
+      memset(pExpr->aliasName, 0, tListLen(pExpr->aliasName));
+      getColumnName(pItem, pExpr->aliasName, sizeof(pExpr->aliasName) - 1);
+  
+      if (finalResult) {
+        int32_t numOfOutput = tscNumOfFields(pQueryInfo);
+        insertResultField(pQueryInfo, numOfOutput, &ids, pExpr->resBytes, (int32_t)pExpr->resType, pExpr->aliasName, pExpr);
+      } else {
+        for (int32_t i = 0; i < ids.num; ++i) {
+          tscColumnListInsert(pQueryInfo->colList, &(ids.ids[i]));
+        }
+      }
 
-      insertResultField(pQueryInfo, colIdx, &ids, pExpr->resBytes, pExpr->resType, columnName);
-
+      tscInsertPrimaryTSSourceColumn(pQueryInfo, &index);
       return TSDB_CODE_SUCCESS;
     }
     case TK_FIRST:
@@ -1605,79 +1896,112 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
       bool requireAllFields = (pItem->pNode->pParam == NULL);
 
       int16_t functionID = 0;
-      changeFunctionID(optr, &functionID);
+      if (changeFunctionID(optr, &functionID) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
+      }
+
+      // NOTE: has time range condition or normal column filter condition, the last_row query will be transferred to last query
+      SConvertFunc cvtFunc = {.originFuncId = functionID, .execFuncId = functionID};
+      if (functionID == TSDB_FUNC_LAST_ROW && ((!TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER)) || (hasNormalColumnFilter(pQueryInfo)))) {
+        cvtFunc.execFuncId = TSDB_FUNC_LAST;
+      }
 
       if (!requireAllFields) {
         if (pItem->pNode->pParam->nExpr < 1) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
 
-        /* in first/last function, multiple columns can be add to resultset */
+        if (pItem->pNode->pParam->nExpr > 1 && (pItem->aliasName != NULL && strlen(pItem->aliasName) > 0)) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
+        }
 
+        /* in first/last function, multiple columns can be add to resultset */
         for (int32_t i = 0; i < pItem->pNode->pParam->nExpr; ++i) {
           tSQLExprItem* pParamElem = &(pItem->pNode->pParam->a[i]);
           if (pParamElem->pNode->nSQLOptr != TK_ALL && pParamElem->pNode->nSQLOptr != TK_ID) {
-            return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
           }
 
           SColumnIndex index = COLUMN_INDEX_INITIALIZER;
 
           if (pParamElem->pNode->nSQLOptr == TK_ALL) {
             // select table.*
-            SSQLToken tmpToken = pParamElem->pNode->colInfo;
+            SStrToken tmpToken = pParamElem->pNode->colInfo;
 
             if (getTableIndexByName(&tmpToken, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-              return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+              return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
             }
 
-            pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-            SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+            pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+            SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
-            for (int32_t j = 0; j < pMeterMetaInfo->pMeterMeta->numOfColumns; ++j) {
+            for (int32_t j = 0; j < tscGetNumOfColumns(pTableMetaInfo->pTableMeta); ++j) {
               index.columnIndex = j;
-              if (setExprInfoForFunctions(pQueryInfo, pSchema, functionID, pItem->aliasName, colIdx++, &index) != 0) {
-                return TSDB_CODE_INVALID_SQL;
+              if (setExprInfoForFunctions(pCmd, pQueryInfo, pSchema, cvtFunc, pItem->aliasName, colIndex++, &index) != 0) {
+                return TSDB_CODE_TSC_INVALID_SQL;
               }
             }
 
           } else {
-            if (getColumnIndexByName(&pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-              return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+            if (getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+              return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
             }
 
-            pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-            SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+            pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+            SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
             // functions can not be applied to tags
-            if (index.columnIndex >= pMeterMetaInfo->pMeterMeta->numOfColumns) {
-              return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+            if ((index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) || (index.columnIndex < 0)) {
+              return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
+            }
+            if (setExprInfoForFunctions(pCmd, pQueryInfo, pSchema, cvtFunc, pItem->aliasName, colIndex + i, &index) != 0) {
+              return TSDB_CODE_TSC_INVALID_SQL;
             }
 
-            if (setExprInfoForFunctions(pQueryInfo, pSchema, functionID, pItem->aliasName, colIdx + i, &index) != 0) {
-              return TSDB_CODE_INVALID_SQL;
+            if (optr == TK_LAST) {  // todo refactor
+              SSqlGroupbyExpr* pGroupBy = &pQueryInfo->groupbyExpr;
+              if (pGroupBy->numOfGroupCols > 0) {
+                for(int32_t k = 0; k < pGroupBy->numOfGroupCols; ++k) {
+                  SColIndex* pIndex = taosArrayGet(pGroupBy->columnInfo, k);
+                  if (!TSDB_COL_IS_TAG(pIndex->flag) && pIndex->colIndex < tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) { // group by normal columns
+                    SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, colIndex + i);
+                    pExpr->numOfParams = 1;
+                    pExpr->param->i64Key = TSDB_ORDER_ASC;
+
+                    break;
+                  }
+                }
+              }
             }
           }
         }
-
+        
         return TSDB_CODE_SUCCESS;
       } else {  // select * from xxx
         int32_t numOfFields = 0;
 
+        // multicolumn selection does not support alias name
+        if (pItem->aliasName != NULL && strlen(pItem->aliasName) > 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
+        }
+
         for (int32_t j = 0; j < pQueryInfo->numOfTables; ++j) {
-          pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, j);
-          SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+          pTableMetaInfo = tscGetMetaInfo(pQueryInfo, j);
+          SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
-          for (int32_t i = 0; i < pMeterMetaInfo->pMeterMeta->numOfColumns; ++i) {
+          for (int32_t i = 0; i < tscGetNumOfColumns(pTableMetaInfo->pTableMeta); ++i) {
             SColumnIndex index = {.tableIndex = j, .columnIndex = i};
-            if (setExprInfoForFunctions(pQueryInfo, pSchema, functionID, pItem->aliasName, colIdx + i + j, &index) !=
-                0) {
-              return TSDB_CODE_INVALID_SQL;
+            if (setExprInfoForFunctions(pCmd, pQueryInfo, pSchema, cvtFunc, pItem->aliasName, colIndex, &index) != 0) {
+              return TSDB_CODE_TSC_INVALID_SQL;
             }
+
+            colIndex++;
           }
 
-          numOfFields += pMeterMetaInfo->pMeterMeta->numOfColumns;
+          numOfFields += tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
         }
 
+        
         return TSDB_CODE_SUCCESS;
       }
     }
@@ -1688,39 +2012,39 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
       // 1. valid the number of parameters
       if (pItem->pNode->pParam == NULL || pItem->pNode->pParam->nExpr != 2) {
         /* no parameters or more than one parameter for function */
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       tSQLExprItem* pParamElem = &(pItem->pNode->pParam->a[0]);
       if (pParamElem->pNode->nSQLOptr != TK_ID) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
-
-      char columnName[TSDB_COL_NAME_LEN] = {0};
-      getColumnName(pItem, columnName, TSDB_COL_NAME_LEN);
-
+      
       SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-      if (getColumnIndexByName(&pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      if (getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
-
-      pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-      SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+      if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
+      }
+      
+      pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+      SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
       // functions can not be applied to tags
-      if (index.columnIndex >= pMeterMetaInfo->pMeterMeta->numOfColumns) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+      if (index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
       // 2. valid the column type
       int16_t colType = pSchema[index.columnIndex].type;
       if (colType == TSDB_DATA_TYPE_BOOL || colType >= TSDB_DATA_TYPE_BINARY) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
       // 3. valid the parameters
       if (pParamElem[1].pNode->nSQLOptr == TK_ID) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       tVariant* pVariant = &pParamElem[1].pNode->val;
@@ -1729,13 +2053,14 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
       int16_t resultSize = pSchema[index.columnIndex].bytes;
 
       char    val[8] = {0};
-      int32_t numOfAddedColumn = 1;
+      SSqlExpr* pExpr = NULL;
+      
       if (optr == TK_PERCENTILE || optr == TK_APERCENTILE) {
-        tVariantDump(pVariant, val, TSDB_DATA_TYPE_DOUBLE);
+        tVariantDump(pVariant, val, TSDB_DATA_TYPE_DOUBLE, true);
 
         double dp = GET_DOUBLE_VAL(val);
         if (dp < 0 || dp > TOP_BOTTOM_QUERY_LIMIT) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
         }
 
         resultSize = sizeof(double);
@@ -1748,53 +2073,137 @@ int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIdx, tSQLExprIt
          */
         int16_t functionId = 0;
         if (changeFunctionID(optr, &functionId) != TSDB_CODE_SUCCESS) {
-          return TSDB_CODE_INVALID_SQL;
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
+        tscInsertPrimaryTSSourceColumn(pQueryInfo, &index);
+        colIndex += 1;  // the first column is ts
 
-        SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, colIdx, functionId, &index, resultType, resultSize, resultSize);
+        pExpr = tscSqlExprAppend(pQueryInfo, functionId, &index, resultType, resultSize, resultSize, false);
         addExprParams(pExpr, val, TSDB_DATA_TYPE_DOUBLE, sizeof(double), 0);
       } else {
-        tVariantDump(pVariant, val, TSDB_DATA_TYPE_BIGINT);
+        tVariantDump(pVariant, val, TSDB_DATA_TYPE_BIGINT, true);
 
-        int64_t nTop = *((int32_t*)val);
+        int64_t nTop = GET_INT32_VAL(val);
         if (nTop <= 0 || nTop > 100) {  // todo use macro
-          return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
         }
 
         int16_t functionId = 0;
         if (changeFunctionID(optr, &functionId) != TSDB_CODE_SUCCESS) {
-          return TSDB_CODE_INVALID_SQL;
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
 
+        // todo REFACTOR
         // set the first column ts for top/bottom query
         SColumnIndex index1 = {0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
-        tscSqlExprInsert(pQueryInfo, 0, TSDB_FUNC_TS, &index1, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, TSDB_KEYSIZE);
+        pExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS, &index1, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE,
+            TSDB_KEYSIZE, false);
+        tstrncpy(pExpr->aliasName, aAggs[TSDB_FUNC_TS].aName, sizeof(pExpr->aliasName));
 
-        const int32_t TS_COLUMN_INDEX = 0;
+        const int32_t TS_COLUMN_INDEX = PRIMARYKEY_TIMESTAMP_COL_INDEX;
         SColumnList   ids = getColumnList(1, 0, TS_COLUMN_INDEX);
         insertResultField(pQueryInfo, TS_COLUMN_INDEX, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP,
-                          aAggs[TSDB_FUNC_TS].aName);
+                          aAggs[TSDB_FUNC_TS].aName, pExpr);
 
-        colIdx += 1;  // the first column is ts
-        numOfAddedColumn += 1;
+        colIndex += 1;  // the first column is ts
 
-        SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, colIdx, functionId, &index, resultType, resultSize, resultSize);
+        pExpr = tscSqlExprAppend(pQueryInfo, functionId, &index, resultType, resultSize, resultSize, false);
         addExprParams(pExpr, val, TSDB_DATA_TYPE_BIGINT, sizeof(int64_t), 0);
       }
-
+  
+      memset(pExpr->aliasName, 0, tListLen(pExpr->aliasName));
+      getColumnName(pItem, pExpr->aliasName, sizeof(pExpr->aliasName) - 1);
+  
       SColumnList ids = getColumnList(1, 0, index.columnIndex);
-      insertResultField(pQueryInfo, colIdx, &ids, resultSize, resultType, columnName);
+      if (finalResult) {
+        insertResultField(pQueryInfo, colIndex, &ids, resultSize, resultType, pExpr->aliasName, pExpr);
+      } else {
+        for (int32_t i = 0; i < ids.num; ++i) {
+          tscColumnListInsert(pQueryInfo->colList, &(ids.ids[i]));
+        }
+      }
+
+      return TSDB_CODE_SUCCESS;
+    };
+    
+    case TK_TBID: {
+      pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+      if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
+      }
+    
+      // no parameters or more than one parameter for function
+      if (pItem->pNode->pParam == NULL || pItem->pNode->pParam->nExpr != 1) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
+      
+      tSQLExpr* pParam = pItem->pNode->pParam->a[0].pNode;
+    
+      SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+      if (getColumnIndexByName(pCmd, &pParam->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
+    
+      pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+      SSchema* pSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+  
+      // functions can not be applied to normal columns
+      int32_t numOfCols = tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+      if (index.columnIndex < numOfCols && index.columnIndex != TSDB_TBNAME_COLUMN_INDEX) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
+      }
+    
+      if (index.columnIndex > 0) {
+        index.columnIndex -= numOfCols;
+      }
+      
+      // 2. valid the column type
+      int16_t colType = 0;
+      if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+        colType = TSDB_DATA_TYPE_BINARY;
+      } else {
+        colType = pSchema[index.columnIndex].type;
+      }
+      
+      if (colType == TSDB_DATA_TYPE_BOOL) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+      }
+
+      tscColumnListInsert(pTableMetaInfo->tagColList, &index);
+      SSchema* pTagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+      
+      SSchema s = {0};
+      if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+        s = tGetTableNameColumnSchema();
+      } else {
+        s = pTagSchema[index.columnIndex];
+      }
+      
+      int16_t bytes = 0;
+      int16_t type  = 0;
+      int32_t inter = 0;
+
+      int32_t ret = getResultDataInfo(s.type, s.bytes, TSDB_FUNC_TID_TAG, 0, &type, &bytes, &inter, 0, 0);
+      assert(ret == TSDB_CODE_SUCCESS);
+      
+      s.type = (uint8_t)type;
+      s.bytes = bytes;
 
+      TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY);
+      tscAddSpecialColumnForSelect(pQueryInfo, 0, TSDB_FUNC_TID_TAG, &index, &s, TSDB_COL_TAG);
+      
       return TSDB_CODE_SUCCESS;
     }
+    
     default:
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
   }
+  
 }
 
 // todo refactor
 static SColumnList getColumnList(int32_t num, int16_t tableIndex, int32_t columnIndex) {
-  assert(num == 1 && columnIndex >= -1 && tableIndex >= 0);
+  assert(num == 1 && tableIndex >= 0);
 
   SColumnList columnList = {0};
   columnList.num = num;
@@ -1810,7 +2219,7 @@ void getColumnName(tSQLExprItem* pItem, char* resultFieldName, int32_t nameLengt
   if (pItem->aliasName != NULL) {
     strncpy(resultFieldName, pItem->aliasName, nameLength);
   } else {
-    int32_t len = (pItem->pNode->operand.n < nameLength) ? pItem->pNode->operand.n : nameLength;
+    int32_t len = ((int32_t)pItem->pNode->operand.n < nameLength) ? (int32_t)pItem->pNode->operand.n : nameLength;
     strncpy(resultFieldName, pItem->pNode->operand.z, len);
   }
 }
@@ -1819,20 +2228,20 @@ void getRevisedName(char* resultFieldName, int32_t functionId, int32_t maxLen, c
   snprintf(resultFieldName, maxLen, "%s(%s)", aAggs[functionId].aName, columnName);
 }
 
-static bool isTablenameToken(SSQLToken* token) {
-  SSQLToken tmpToken = *token;
-  SSQLToken tableToken = {0};
+static bool isTablenameToken(SStrToken* token) {
+  SStrToken tmpToken = *token;
+  SStrToken tableToken = {0};
 
   extractTableNameFromToken(&tmpToken, &tableToken);
 
   return (strncasecmp(TSQL_TBNAME_L, tmpToken.z, tmpToken.n) == 0 && tmpToken.n == strlen(TSQL_TBNAME_L));
 }
 
-static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SSQLToken* pToken) {
-  SMeterMeta* pMeterMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index)->pMeterMeta;
+static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SStrToken* pToken) {
+  STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, index)->pTableMeta;
 
-  int32_t  numOfCols = pMeterMeta->numOfColumns + pMeterMeta->numOfTags;
-  SSchema* pSchema = tsGetSchema(pMeterMeta);
+  int32_t  numOfCols = tscGetNumOfColumns(pTableMeta) + tscGetNumOfTags(pTableMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMeta);
 
   int16_t columnIndex = COLUMN_INDEX_INITIAL_VAL;
 
@@ -1843,13 +2252,14 @@ static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SSQLToken
 
     if (strncasecmp(pSchema[i].name, pToken->z, pToken->n) == 0) {
       columnIndex = i;
+      break;
     }
   }
 
   return columnIndex;
 }
 
-int32_t doGetColumnIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
+int32_t doGetColumnIndexByName(SSqlCmd* pCmd, SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
   const char* msg0 = "ambiguous column name";
   const char* msg1 = "invalid column name";
 
@@ -1865,7 +2275,7 @@ int32_t doGetColumnIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColum
 
         if (colIndex != COLUMN_INDEX_INITIAL_VAL) {
           if (pIndex->columnIndex != COLUMN_INDEX_INITIAL_VAL) {
-            return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+            return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
           } else {
             pIndex->tableIndex = i;
             pIndex->columnIndex = colIndex;
@@ -1880,18 +2290,18 @@ int32_t doGetColumnIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColum
     }
 
     if (pIndex->columnIndex == COLUMN_INDEX_INITIAL_VAL) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   }
 
   if (COLUMN_INDEX_VALIDE(*pIndex)) {
     return TSDB_CODE_SUCCESS;
   } else {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 }
 
-int32_t getMeterIndex(SSQLToken* pTableToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
+int32_t getTableIndexImpl(SStrToken* pTableToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
   if (pTableToken->n == 0) {  // only one table and no table name prefix in column name
     if (pQueryInfo->numOfTables == 1) {
       pIndex->tableIndex = 0;
@@ -1901,48 +2311,45 @@ int32_t getMeterIndex(SSQLToken* pTableToken, SQueryInfo* pQueryInfo, SColumnInd
   }
 
   pIndex->tableIndex = COLUMN_INDEX_INITIAL_VAL;
-  char tableName[TSDB_METER_ID_LEN + 1] = {0};
-
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-    extractTableName(pMeterMetaInfo->name, tableName);
-
-    if (strncasecmp(tableName, pTableToken->z, pTableToken->n) == 0 && strlen(tableName) == pTableToken->n) {
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
+    char* name = pTableMetaInfo->aliasName;
+    if (strncasecmp(name, pTableToken->z, pTableToken->n) == 0 && strlen(name) == pTableToken->n) {
       pIndex->tableIndex = i;
       break;
     }
   }
 
   if (pIndex->tableIndex < 0) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t getTableIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
-  SSQLToken tableToken = {0};
+int32_t getTableIndexByName(SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
+  SStrToken tableToken = {0};
   extractTableNameFromToken(pToken, &tableToken);
 
-  if (getMeterIndex(&tableToken, pQueryInfo, pIndex) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (getTableIndexImpl(&tableToken, pQueryInfo, pIndex) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t getColumnIndexByName(SSQLToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
-  if (pQueryInfo->pMeterInfo == NULL || pQueryInfo->numOfTables == 0) {
-    return TSDB_CODE_INVALID_SQL;
+int32_t getColumnIndexByName(SSqlCmd* pCmd, const SStrToken* pToken, SQueryInfo* pQueryInfo, SColumnIndex* pIndex) {
+  if (pQueryInfo->pTableMetaInfo == NULL || pQueryInfo->numOfTables == 0) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  SSQLToken tmpToken = *pToken;
+  SStrToken tmpToken = *pToken;
 
   if (getTableIndexByName(&tmpToken, pQueryInfo, pIndex) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  return doGetColumnIndexByName(&tmpToken, pQueryInfo, pIndex);
+  return doGetColumnIndexByName(pCmd, &tmpToken, pQueryInfo, pIndex);
 }
 
 int32_t changeFunctionID(int32_t optr, int16_t* functionId) {
@@ -1956,6 +2363,24 @@ int32_t changeFunctionID(int32_t optr, int16_t* functionId) {
     case TK_AVG:
       *functionId = TSDB_FUNC_AVG;
       break;
+    case TK_RATE:
+      *functionId = TSDB_FUNC_RATE;
+      break;
+    case TK_IRATE:
+      *functionId = TSDB_FUNC_IRATE;
+      break;
+    case TK_SUM_RATE:
+      *functionId = TSDB_FUNC_SUM_RATE;
+      break;
+    case TK_SUM_IRATE:
+      *functionId = TSDB_FUNC_SUM_IRATE;
+      break;
+    case TK_AVG_RATE:
+      *functionId = TSDB_FUNC_AVG_RATE;
+      break;
+    case TK_AVG_IRATE:
+      *functionId = TSDB_FUNC_AVG_IRATE;
+      break;
     case TK_MIN:
       *functionId = TSDB_FUNC_MIN;
       break;
@@ -2010,9 +2435,9 @@ int32_t changeFunctionID(int32_t optr, int16_t* functionId) {
 
 int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   SSqlCmd*        pCmd = &pSql->cmd;
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
   assert(pCmd->numOfClause == 1);
-  
+
   pCmd->command = TSDB_SQL_SHOW;
 
   const char* msg1 = "invalid name";
@@ -2030,11 +2455,10 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   int16_t    showType = pShowInfo->showType;
   if (showType == TSDB_MGMT_TABLE_TABLE || showType == TSDB_MGMT_TABLE_METRIC || showType == TSDB_MGMT_TABLE_VGROUP) {
     // db prefix in tagCond, show table conds in payload
-    SSQLToken* pDbPrefixToken = &pShowInfo->prefix;
+    SStrToken* pDbPrefixToken = &pShowInfo->prefix;
     if (pDbPrefixToken->type != 0) {
-      assert(pDbPrefixToken->n >= 0);
 
-      if (pDbPrefixToken->n > TSDB_DB_NAME_LEN) {  // db name is too long
+      if (pDbPrefixToken->n >= TSDB_DB_NAME_LEN) {  // db name is too long
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
@@ -2046,14 +2470,14 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      int32_t ret = setObjFullName(pMeterMetaInfo->name, getAccountId(pSql), pDbPrefixToken, NULL, NULL);
+      int32_t ret = setObjFullName(pTableMetaInfo->name, getAccountId(pSql), pDbPrefixToken, NULL, NULL);
       if (ret != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
     }
 
     // show table/stable like 'xxxx', set the like pattern for show tables
-    SSQLToken* pPattern = &pShowInfo->pattern;
+    SStrToken* pPattern = &pShowInfo->pattern;
     if (pPattern->type != 0) {
       pPattern->n = strdequote(pPattern->z);
 
@@ -2061,7 +2485,7 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
-      if (pCmd->payloadLen > TSDB_METER_NAME_LEN) {
+      if (!tscValidateTableNameLength(pCmd->payloadLen)) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
     }
@@ -2071,8 +2495,8 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     }
 
     // show vnodes may be ip addr of dnode in payload
-    SSQLToken* pDnodeIp = &pShowInfo->prefix;
-    if (pDnodeIp->n > TSDB_IPv4ADDR_LEN) {  // ip addr is too long
+    SStrToken* pDnodeIp = &pShowInfo->prefix;
+    if (pDnodeIp->n >= TSDB_IPv4ADDR_LEN) {  // ip addr is too long
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
@@ -2084,37 +2508,45 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
-  const char* msg1 = "invalid ip address";
-  const char* msg2 = "invalid port";
+int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) {
+  const char* msg1 = "invalid connection ID";
+  const char* msg2 = "invalid query ID";
+  const char* msg3 = "invalid stream ID";
 
   SSqlCmd* pCmd = &pSql->cmd;
   pCmd->command = pInfo->type;
-
-  SSQLToken* ip = &(pInfo->pDCLInfo->ip);
-  if (ip->n > TSDB_KILL_MSG_LEN) {
-    return TSDB_CODE_INVALID_SQL;
+  
+  SStrToken* idStr = &(pInfo->pDCLInfo->ip);
+  if (idStr->n > TSDB_KILL_MSG_LEN) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  strncpy(pCmd->payload, ip->z, ip->n);
+  strncpy(pCmd->payload, idStr->z, idStr->n);
 
   const char delim = ':';
+  char* connIdStr = strtok(idStr->z, &delim);
+  char* queryIdStr = strtok(NULL, &delim);
 
-  char* ipStr = strtok(ip->z, &delim);
-  char* portStr = strtok(NULL, &delim);
-
-  if (!validateIpAddress(ipStr, strlen(ipStr))) {
-    memset(pCmd->payload, 0, tListLen(pCmd->payload));
-
+  int32_t connId = (int32_t)strtol(connIdStr, NULL, 10);
+  if (connId <= 0) {
+    memset(pCmd->payload, 0, strlen(pCmd->payload));
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  uint16_t port = (uint16_t)strtol(portStr, NULL, 10);
-  if (port <= 0 || port > 65535) {
-    memset(pCmd->payload, 0, tListLen(pCmd->payload));
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  if (killType == TSDB_SQL_KILL_CONNECTION) {
+    return TSDB_CODE_SUCCESS;
   }
 
+  int32_t queryId = (int32_t)strtol(queryIdStr, NULL, 10);
+  if (queryId <= 0) {
+    memset(pCmd->payload, 0, strlen(pCmd->payload));
+    if (killType == TSDB_SQL_KILL_QUERY) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    } else {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+    }
+  }
+  
   return TSDB_CODE_SUCCESS;
 }
 
@@ -2124,40 +2556,43 @@ bool validateIpAddress(const char* ip, size_t size) {
 
   strncpy(tmp, ip, size);
 
-  in_addr_t ipAddr = inet_addr(tmp);
+  in_addr_t epAddr = taosInetAddr(tmp);
 
-  return ipAddr != INADDR_NONE;
+  return epAddr != INADDR_NONE;
 }
 
-int32_t tscTansformSQLFunctionForSTableQuery(SQueryInfo* pQueryInfo) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+int32_t tscTansformSQLFuncForSTableQuery(SQueryInfo* pQueryInfo) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  if (pMeterMetaInfo->pMeterMeta == NULL || !UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    return TSDB_CODE_INVALID_SQL;
+  if (pTableMetaInfo->pTableMeta == NULL || !UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  assert(pMeterMetaInfo->pMeterMeta->numOfTags >= 0);
+  assert(tscGetNumOfTags(pTableMetaInfo->pTableMeta) >= 0);
 
   int16_t bytes = 0;
   int16_t type = 0;
-  int16_t intermediateBytes = 0;
-
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
+  int32_t interBytes = 0;
+  
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t k = 0; k < size; ++k) {
     SSqlExpr*   pExpr = tscSqlExprGet(pQueryInfo, k);
-    TAOS_FIELD* pField = tscFieldInfoGetField(pQueryInfo, k);
-
     int16_t functionId = aAggs[pExpr->functionId].stableFuncId;
 
+    int32_t colIndex = pExpr->colInfo.colIndex;
+    SSchema* pSrcSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, colIndex);
+    
     if ((functionId >= TSDB_FUNC_SUM && functionId <= TSDB_FUNC_TWA) ||
-        (functionId >= TSDB_FUNC_FIRST_DST && functionId <= TSDB_FUNC_LAST_DST)) {
-      if (getResultDataInfo(pField->type, pField->bytes, functionId, pExpr->param[0].i64Key, &type, &bytes,
-                            &intermediateBytes, 0, true) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
+        (functionId >= TSDB_FUNC_FIRST_DST && functionId <= TSDB_FUNC_LAST_DST) ||
+        (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE)) {
+      if (getResultDataInfo(pSrcSchema->type, pSrcSchema->bytes, functionId, (int32_t)pExpr->param[0].i64Key, &type, &bytes,
+                            &interBytes, 0, true) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
 
-      tscSqlExprUpdate(pQueryInfo, k, functionId, pExpr->colInfo.colIdx, TSDB_DATA_TYPE_BINARY, bytes);
+      tscSqlExprUpdate(pQueryInfo, k, functionId, pExpr->colInfo.colIndex, TSDB_DATA_TYPE_BINARY, bytes);
       // todo refactor
-      pExpr->interResBytes = intermediateBytes;
+      pExpr->interBytes = interBytes;
     }
   }
 
@@ -2166,243 +2601,209 @@ int32_t tscTansformSQLFunctionForSTableQuery(SQueryInfo* pQueryInfo) {
 }
 
 /* transfer the field-info back to original input format */
-void tscRestoreSQLFunctionForMetricQuery(SQueryInfo* pQueryInfo) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  if (!UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
+void tscRestoreSQLFuncForSTableQuery(SQueryInfo* pQueryInfo) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
     return;
   }
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr*   pExpr = tscSqlExprGet(pQueryInfo, i);
-    TAOS_FIELD* pField = tscFieldInfoGetField(pQueryInfo, i);
-
-    if ((pExpr->functionId >= TSDB_FUNC_FIRST_DST && pExpr->functionId <= TSDB_FUNC_LAST_DST) ||
-        (pExpr->functionId >= TSDB_FUNC_SUM && pExpr->functionId <= TSDB_FUNC_MAX)) {
-      pExpr->resBytes = pField->bytes;
-      pExpr->resType = pField->type;
+    SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pExpr->colInfo.colIndex);
+    
+    // the final result size and type in the same as query on single table.
+    // so here, set the flag to be false;
+    int32_t inter = 0;
+    
+    int32_t functionId = pExpr->functionId;
+    if (functionId >= TSDB_FUNC_TS && functionId <= TSDB_FUNC_DIFF) {
+      continue;
     }
+    
+    if (functionId == TSDB_FUNC_FIRST_DST) {
+      functionId = TSDB_FUNC_FIRST;
+    } else if (functionId == TSDB_FUNC_LAST_DST) {
+      functionId = TSDB_FUNC_LAST;
+    }
+    
+    getResultDataInfo(pSchema->type, pSchema->bytes, functionId, 0, &pExpr->resType, &pExpr->resBytes,
+                      &inter, 0, false);
   }
 }
 
-bool hasUnsupportFunctionsForSTableQuery(SQueryInfo* pQueryInfo) {
+bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg1 = "TWA not allowed to apply to super table directly";
   const char* msg2 = "TWA only support group by tbname for super table query";
   const char* msg3 = "function not support for super table query";
-  
+
   // filter sql function not supported by metric query yet.
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < size; ++i) {
     int32_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
-    if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_METRIC) == 0) {
-      invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_STABLE) == 0) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       return true;
     }
   }
 
   if (tscIsTWAQuery(pQueryInfo)) {
     if (pQueryInfo->groupbyExpr.numOfGroupCols == 0) {
-      invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       return true;
     }
 
-    if (pQueryInfo->groupbyExpr.numOfGroupCols != 1 ||
-        pQueryInfo->groupbyExpr.columnInfo[0].colIdx != TSDB_TBNAME_COLUMN_INDEX) {
-      invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    if (pQueryInfo->groupbyExpr.numOfGroupCols != 1) {
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       return true;
+    } else {
+      SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, 0);
+      if (pColIndex->colIndex != TSDB_TBNAME_COLUMN_INDEX) {
+        invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+        return true;
+      }
     }
   }
 
   return false;
 }
 
-static bool functionCompatibleCheck(SQueryInfo* pQueryInfo) {
+static bool functionCompatibleCheck(SQueryInfo* pQueryInfo, bool joinQuery) {
   int32_t startIdx = 0;
-  int32_t functionID = tscSqlExprGet(pQueryInfo, startIdx)->functionId;
-
-  // ts function can be simultaneously used with any other functions.
-  if (functionID == TSDB_FUNC_TS || functionID == TSDB_FUNC_TS_DUMMY) {
-    startIdx++;
-  }
-
-  int32_t factor = funcCompatDefList[tscSqlExprGet(pQueryInfo, startIdx)->functionId];
-
-  // diff function cannot be executed with other function
-  // arithmetic function can be executed with other arithmetic functions
-  for (int32_t i = startIdx + 1; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-
-    int16_t functionId = pExpr->functionId;
-    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TS) {
-      continue;
-    }
-
-    if (functionId == TSDB_FUNC_PRJ && pExpr->colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-      continue;
-    }
-
-    if (funcCompatDefList[functionId] != factor) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-void updateTagColumnIndex(SQueryInfo* pQueryInfo, int32_t tableIndex) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
-
-  /*
-   * update tags column index for group by tags
-   * group by columns belong to this table
-   */
-  if (pQueryInfo->groupbyExpr.numOfGroupCols > 0 && pQueryInfo->groupbyExpr.tableIndex == tableIndex) {
-    for (int32_t i = 0; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
-      int32_t index = pQueryInfo->groupbyExpr.columnInfo[i].colIdx;
-
-      for (int32_t j = 0; j < pMeterMetaInfo->numOfTags; ++j) {
-        int32_t tagColIndex = pMeterMetaInfo->tagColumnIndex[j];
-        if (tagColIndex == index) {
-          pQueryInfo->groupbyExpr.columnInfo[i].colIdx = j;
-          break;
-        }
-      }
-    }
+  
+  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, startIdx);
+  int32_t functionID = pExpr->functionId;
+
+  // ts function can be simultaneously used with any other functions.
+  if (functionID == TSDB_FUNC_TS || functionID == TSDB_FUNC_TS_DUMMY) {
+    startIdx++;
   }
 
-  // update tags column index for expression
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+  int32_t factor = functionCompatList[tscSqlExprGet(pQueryInfo, startIdx)->functionId];
+
+  // diff function cannot be executed with other function
+  // arithmetic function can be executed with other arithmetic functions
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t i = startIdx + 1; i < size; ++i) {
+    SSqlExpr* pExpr1 = tscSqlExprGet(pQueryInfo, i);
 
-    if (!TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {  // not tags, continue
+    int16_t functionId = pExpr1->functionId;
+    if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TS) {
       continue;
     }
 
-    // not belongs to this table
-    if (pExpr->uid != pMeterMetaInfo->pMeterMeta->uid) {
+    if (functionId == TSDB_FUNC_PRJ && (pExpr1->colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX || TSDB_COL_IS_UD_COL(pExpr1->colInfo.flag))) {
       continue;
     }
 
-    for (int32_t j = 0; j < pMeterMetaInfo->numOfTags; ++j) {
-      if (pExpr->colInfo.colIdx == pMeterMetaInfo->tagColumnIndex[j]) {
-        pExpr->colInfo.colIdx = j;
-        break;
-      }
+    if (functionCompatList[functionId] != factor) {
+      return false;
     }
-  }
-
-  // update join condition tag column index
-  SJoinInfo* pJoinInfo = &pQueryInfo->tagCond.joinInfo;
-  if (!pJoinInfo->hasJoin) {  // not join query
-    return;
-  }
-
-  assert(pJoinInfo->left.uid != pJoinInfo->right.uid);
 
-  // the join condition expression node belongs to this table(super table)
-  if (pMeterMetaInfo->pMeterMeta->uid == pJoinInfo->left.uid) {
-    for (int32_t i = 0; i < pMeterMetaInfo->numOfTags; ++i) {
-      if (pJoinInfo->left.tagCol == pMeterMetaInfo->tagColumnIndex[i]) {
-        pJoinInfo->left.tagCol = i;
-      }
+    if (functionId == TSDB_FUNC_LAST_ROW && joinQuery) {
+      return false;
     }
   }
 
-  if (pMeterMetaInfo->pMeterMeta->uid == pJoinInfo->right.uid) {
-    for (int32_t i = 0; i < pMeterMetaInfo->numOfTags; ++i) {
-      if (pJoinInfo->right.tagCol == pMeterMetaInfo->tagColumnIndex[i]) {
-        pJoinInfo->right.tagCol = i;
-      }
-    }
-  }
+  return true;
 }
 
 int32_t parseGroupbyClause(SQueryInfo* pQueryInfo, tVariantList* pList, SSqlCmd* pCmd) {
   const char* msg1 = "too many columns in group by clause";
   const char* msg2 = "invalid column name in group by clause";
-  const char* msg3 = "group by columns must belong to one table";
+//  const char* msg3 = "group by columns must belong to one table";
   const char* msg7 = "not support group by expression";
   const char* msg8 = "not allowed column type for group by";
   const char* msg9 = "tags not allowed for table query";
 
-  // todo : handle two meter situation
-  SMeterMetaInfo* pMeterMetaInfo = NULL;
+  // todo : handle two tables situation
+  STableMetaInfo* pTableMetaInfo = NULL;
 
   if (pList == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
+  if (pQueryInfo->colList == NULL) {
+    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
+  }
+  
   pQueryInfo->groupbyExpr.numOfGroupCols = pList->nExpr;
   if (pList->nExpr > TSDB_MAX_TAGS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  SMeterMeta* pMeterMeta = NULL;
+  STableMeta* pTableMeta = NULL;
   SSchema*    pSchema = NULL;
-  SSchema     s = tsGetTbnameColumnSchema();
+  SSchema     s = tscGetTbnameColumnSchema();
 
   int32_t tableIndex = COLUMN_INDEX_INITIAL_VAL;
-
+  
   for (int32_t i = 0; i < pList->nExpr; ++i) {
     tVariant* pVar = &pList->a[i].pVar;
-    SSQLToken token = {pVar->nLen, pVar->nType, pVar->pz};
+    SStrToken token = {pVar->nLen, pVar->nType, pVar->pz};
 
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-
-    if (getColumnIndexByName(&token, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
-    }
-
-    if (tableIndex != index.tableIndex && tableIndex >= 0) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    if (getColumnIndexByName(pCmd, &token, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
 
     tableIndex = index.tableIndex;
 
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-    pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
+    pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+    pTableMeta = pTableMetaInfo->pTableMeta;
+  
+    int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
       pSchema = &s;
     } else {
-      pSchema = tsGetColumnSchema(pMeterMeta, index.columnIndex);
+      pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
     }
 
     bool groupTag = false;
-    if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= pMeterMeta->numOfColumns) {
+    if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= numOfCols) {
       groupTag = true;
     }
-
+  
+    SSqlGroupbyExpr* pGroupExpr = &pQueryInfo->groupbyExpr;
+    if (pGroupExpr->columnInfo == NULL) {
+      pGroupExpr->columnInfo = taosArrayInit(4, sizeof(SColIndex));
+    }
+    
     if (groupTag) {
-      if (!UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg9);
+      if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
       }
 
       int32_t relIndex = index.columnIndex;
       if (index.columnIndex != TSDB_TBNAME_COLUMN_INDEX) {
-        relIndex -= pMeterMeta->numOfColumns;
+        relIndex -= numOfCols;
       }
 
-      pQueryInfo->groupbyExpr.columnInfo[i] =
-          (SColIndexEx){.colIdx = relIndex, .flag = TSDB_COL_TAG, .colId = pSchema->colId};  // relIndex;
-      addRequiredTagColumn(pQueryInfo, pQueryInfo->groupbyExpr.columnInfo[i].colIdx, index.tableIndex);
+      SColIndex colIndex = { .colIndex = relIndex, .flag = TSDB_COL_TAG, .colId = pSchema->colId, };
+      taosArrayPush(pGroupExpr->columnInfo, &colIndex);
+      
+      index.columnIndex = relIndex;
+      tscColumnListInsert(pTableMetaInfo->tagColList, &index);
     } else {
       // check if the column type is valid, here only support the bool/tinyint/smallint/bigint group by
       if (pSchema->type > TSDB_DATA_TYPE_BINARY) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg8);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
       }
 
-      tscColumnBaseInfoInsert(pQueryInfo, &index);
-      pQueryInfo->groupbyExpr.columnInfo[i] =
-          (SColIndexEx){.colIdx = index.columnIndex, .flag = TSDB_COL_NORMAL, .colId = pSchema->colId};  // relIndex;
-      pQueryInfo->groupbyExpr.orderType = TSQL_SO_ASC;
+      tscColumnListInsert(pQueryInfo->colList, &index);
+      
+      SColIndex colIndex = { .colIndex = index.columnIndex, .flag = TSDB_COL_NORMAL, .colId = pSchema->colId };
+      taosArrayPush(pGroupExpr->columnInfo, &colIndex);
+      pQueryInfo->groupbyExpr.orderType = TSDB_ORDER_ASC;
 
       if (i == 0 && pList->nExpr > 1) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg7);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
       }
     }
   }
 
   pQueryInfo->groupbyExpr.tableIndex = tableIndex;
-
   return TSDB_CODE_SUCCESS;
 }
 
@@ -2410,19 +2811,22 @@ void setColumnOffsetValueInResultset(SQueryInfo* pQueryInfo) {
   if (QUERY_IS_STABLE_QUERY(pQueryInfo->type)) {
     tscFieldInfoUpdateOffsetForInterResult(pQueryInfo);
   } else {
-    tscFieldInfoCalOffset(pQueryInfo);
+    tscFieldInfoUpdateOffset(pQueryInfo);
   }
 }
 
-static SColumnFilterInfo* addColumnFilterInfo(SColumnBase* pColumn) {
+static SColumnFilterInfo* addColumnFilterInfo(SColumn* pColumn) {
   if (pColumn == NULL) {
     return NULL;
   }
 
   int32_t size = pColumn->numOfFilters + 1;
-  char*   tmp = (char*)realloc((void*)(pColumn->filterInfo), sizeof(SColumnFilterInfo) * (size));
+
+  char* tmp = (char*) realloc((void*)(pColumn->filterInfo), sizeof(SColumnFilterInfo) * (size));
   if (tmp != NULL) {
     pColumn->filterInfo = (SColumnFilterInfo*)tmp;
+  } else {
+    return NULL;
   }
 
   pColumn->numOfFilters++;
@@ -2433,14 +2837,14 @@ static SColumnFilterInfo* addColumnFilterInfo(SColumnBase* pColumn) {
   return pColFilterInfo;
 }
 
-static int32_t doExtractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnFilterInfo* pColumnFilter,
+static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SColumnFilterInfo* pColumnFilter,
                                          SColumnIndex* columnIndex, tSQLExpr* pExpr) {
   const char* msg = "not supported filter condition";
 
   tSQLExpr*       pRight = pExpr->pRight;
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, columnIndex->tableIndex);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, columnIndex->tableIndex);
 
-  SSchema* pSchema = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, columnIndex->columnIndex);
+  SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, columnIndex->columnIndex);
 
   int16_t colType = pSchema->type;
   if (colType >= TSDB_DATA_TYPE_TINYINT && colType <= TSDB_DATA_TYPE_BIGINT) {
@@ -2448,33 +2852,37 @@ static int32_t doExtractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnFilterIn
   } else if (colType == TSDB_DATA_TYPE_FLOAT || colType == TSDB_DATA_TYPE_DOUBLE) {
     colType = TSDB_DATA_TYPE_DOUBLE;
   } else if ((colType == TSDB_DATA_TYPE_TIMESTAMP) && (TSDB_DATA_TYPE_BINARY == pRight->val.nType)) {
-    int retVal = setColumnFilterInfoForTimestamp(pQueryInfo, &pRight->val);
+    int retVal = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, &pRight->val);
     if (TSDB_CODE_SUCCESS != retVal) {
       return retVal;
     }
   }
 
+  int32_t retVal = TSDB_CODE_SUCCESS;
   if (pExpr->nSQLOptr == TK_LE || pExpr->nSQLOptr == TK_LT) {
-    tVariantDump(&pRight->val, (char*)&pColumnFilter->upperBndd, colType);
-  } else {  // TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
-    if (colType == TSDB_DATA_TYPE_BINARY) {
-      pColumnFilter->pz = (int64_t)calloc(1, pRight->val.nLen + 1);
-      pColumnFilter->len = pRight->val.nLen;
+    retVal = tVariantDump(&pRight->val, (char*)&pColumnFilter->upperBndd, colType, false);
 
-      tVariantDump(&pRight->val, (char*)pColumnFilter->pz, colType);
-    } else if (colType == TSDB_DATA_TYPE_NCHAR) {
-      // pRight->val.nLen + 1 is larger than the actual nchar string length
-      pColumnFilter->pz = (int64_t)calloc(1, (pRight->val.nLen + 1) * TSDB_NCHAR_SIZE);
+  // TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
+  } else if (colType == TSDB_DATA_TYPE_BINARY) {
+    pColumnFilter->pz = (int64_t)calloc(1, pRight->val.nLen + TSDB_NCHAR_SIZE);
+    pColumnFilter->len = pRight->val.nLen;
+    retVal = tVariantDump(&pRight->val, (char*)pColumnFilter->pz, colType, false);
 
-      tVariantDump(&pRight->val, (char*)pColumnFilter->pz, colType);
+  } else if (colType == TSDB_DATA_TYPE_NCHAR) {
+    // pRight->val.nLen + 1 is larger than the actual nchar string length
+    pColumnFilter->pz = (int64_t)calloc(1, (pRight->val.nLen + 1) * TSDB_NCHAR_SIZE);
+    retVal = tVariantDump(&pRight->val, (char*)pColumnFilter->pz, colType, false);
+    size_t len = twcslen((wchar_t*)pColumnFilter->pz);
+    pColumnFilter->len = len * TSDB_NCHAR_SIZE;
 
-      size_t len = wcslen((wchar_t*)pColumnFilter->pz);
-      pColumnFilter->len = len * TSDB_NCHAR_SIZE;
-    } else {
-      tVariantDump(&pRight->val, (char*)&pColumnFilter->lowerBndd, colType);
-    }
+  } else {
+    retVal = tVariantDump(&pRight->val, (char*)&pColumnFilter->lowerBndd, colType, false);
   }
 
+  if (retVal != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+  } 
+
   switch (pExpr->nSQLOptr) {
     case TK_LE:
       pColumnFilter->upperRelOptr = TSDB_RELATION_LESS_EQUAL;
@@ -2483,10 +2891,10 @@ static int32_t doExtractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnFilterIn
       pColumnFilter->upperRelOptr = TSDB_RELATION_LESS;
       break;
     case TK_GT:
-      pColumnFilter->lowerRelOptr = TSDB_RELATION_LARGE;
+      pColumnFilter->lowerRelOptr = TSDB_RELATION_GREATER;
       break;
     case TK_GE:
-      pColumnFilter->lowerRelOptr = TSDB_RELATION_LARGE_EQUAL;
+      pColumnFilter->lowerRelOptr = TSDB_RELATION_GREATER_EQUAL;
       break;
     case TK_EQ:
       pColumnFilter->lowerRelOptr = TSDB_RELATION_EQUAL;
@@ -2497,8 +2905,14 @@ static int32_t doExtractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnFilterIn
     case TK_LIKE:
       pColumnFilter->lowerRelOptr = TSDB_RELATION_LIKE;
       break;
+    case TK_ISNULL:
+      pColumnFilter->lowerRelOptr = TSDB_RELATION_ISNULL;
+      break;
+    case TK_NOTNULL:
+      pColumnFilter->lowerRelOptr = TSDB_RELATION_NOTNULL;
+      break;
     default:
-      return invalidSqlErrMsg(pQueryInfo->msg, msg);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -2519,7 +2933,7 @@ typedef struct SCondExpr {
   bool      tsJoin;
 } SCondExpr;
 
-static int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t optr, int16_t timePrecision);
+static int32_t getTimeRange(STimeWindow* win, tSQLExpr* pRight, int32_t optr, int16_t timePrecision);
 
 static int32_t tSQLExprNodeToString(tSQLExpr* pExpr, char** str) {
   if (pExpr->nSQLOptr == TK_ID) {  // column name
@@ -2529,27 +2943,33 @@ static int32_t tSQLExprNodeToString(tSQLExpr* pExpr, char** str) {
   } else if (pExpr->nSQLOptr >= TK_BOOL && pExpr->nSQLOptr <= TK_STRING) {  // value
     *str += tVariantToString(&pExpr->val, *str);
 
-  } else {
+  } else if (pExpr->nSQLOptr >= TK_COUNT && pExpr->nSQLOptr <= TK_AVG_IRATE) {
+    /*
+     * arithmetic expression of aggregation, such as count(ts) + count(ts) *2
+     */
+    strncpy(*str, pExpr->operand.z, pExpr->operand.n);
+    *str += pExpr->operand.n;
+  } else {  // not supported operation
     assert(false);
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
+// pExpr->nSQLOptr == 0 while handling "is null" query
 static bool isExprLeafNode(tSQLExpr* pExpr) {
   return (pExpr->pRight == NULL && pExpr->pLeft == NULL) &&
-         (pExpr->nSQLOptr == TK_ID || (pExpr->nSQLOptr >= TK_BOOL && pExpr->nSQLOptr <= TK_NCHAR) ||
-          pExpr->nSQLOptr == TK_SET);
+         (pExpr->nSQLOptr == 0 || pExpr->nSQLOptr == TK_ID || (pExpr->nSQLOptr >= TK_BOOL && pExpr->nSQLOptr <= TK_NCHAR) || pExpr->nSQLOptr == TK_SET);
 }
 
-static bool isExprDirectParentOfLeaftNode(tSQLExpr* pExpr) {
+static bool isExprDirectParentOfLeafNode(tSQLExpr* pExpr) {
   return (pExpr->pLeft != NULL && pExpr->pRight != NULL) &&
          (isExprLeafNode(pExpr->pLeft) && isExprLeafNode(pExpr->pRight));
 }
 
 static int32_t tSQLExprLeafToString(tSQLExpr* pExpr, bool addParentheses, char** output) {
-  if (!isExprDirectParentOfLeaftNode(pExpr)) {
-    return TSDB_CODE_INVALID_SQL;
+  if (!isExprDirectParentOfLeafNode(pExpr)) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   tSQLExpr* pLeft = pExpr->pLeft;
@@ -2562,7 +2982,7 @@ static int32_t tSQLExprLeafToString(tSQLExpr* pExpr, bool addParentheses, char**
 
   tSQLExprNodeToString(pLeft, output);
   if (optrToString(pExpr, output) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   tSQLExprNodeToString(pRight, output);
@@ -2628,7 +3048,7 @@ static int32_t optrToString(tSQLExpr* pExpr, char** exprString) {
       break;
     }
     default:
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   *exprString += 1;
@@ -2636,10 +3056,10 @@ static int32_t optrToString(tSQLExpr* pExpr, char** exprString) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t tablenameListToString(tSQLExpr* pExpr, /*char* str*/ SStringBuilder* sb) {
+static int32_t tablenameListToString(tSQLExpr* pExpr, SStringBuilder* sb) {
   tSQLExprList* pList = pExpr->pParam;
   if (pList->nExpr <= 0) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   if (pList->nExpr > 0) {
@@ -2654,15 +3074,15 @@ static int32_t tablenameListToString(tSQLExpr* pExpr, /*char* str*/ SStringBuild
       taosStringBuilderAppendString(sb, TBNAME_LIST_SEP);
     }
 
-    if (pSub->val.nLen <= 0 || pSub->val.nLen > TSDB_METER_NAME_LEN) {
-      return TSDB_CODE_INVALID_SQL;
+    if (pSub->val.nLen <= 0 || !tscValidateTableNameLength(pSub->val.nLen)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t tablenameCondToString(tSQLExpr* pExpr, /*char* str*/ SStringBuilder* sb) {
+static int32_t tablenameCondToString(tSQLExpr* pExpr, SStringBuilder* sb) {
   taosStringBuilderAppendStringLen(sb, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN);
   taosStringBuilderAppendString(sb, pExpr->val.pz);
 
@@ -2676,16 +3096,17 @@ enum {
   TSQL_EXPR_TBNAME = 3,
 };
 
-static int32_t extractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnIndex* pIndex, tSQLExpr* pExpr, int32_t sqlOptr) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, pIndex->tableIndex);
+static int32_t extractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SColumnIndex* pIndex, tSQLExpr* pExpr, int32_t sqlOptr) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, pIndex->tableIndex);
 
-  SMeterMeta* pMeterMeta = pMeterMetaInfo->pMeterMeta;
-  SSchema*    pSchema = tsGetColumnSchema(pMeterMeta, pIndex->columnIndex);
+  STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+  SSchema*    pSchema = tscGetTableColumnSchema(pTableMeta, pIndex->columnIndex);
 
   const char* msg1 = "non binary column not support like operator";
-  const char* msg2 = "binary column not support this operator";
+  const char* msg2 = "binary column not support this operator";  
+  const char* msg3 = "bool column not support this operator";
 
-  SColumnBase*       pColumn = tscColumnBaseInfoInsert(pQueryInfo, pIndex);
+  SColumn* pColumn = tscColumnListInsert(pQueryInfo->colList, pIndex);
   SColumnFilterInfo* pColFilter = NULL;
 
   /*
@@ -2699,28 +3120,41 @@ static int32_t extractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnIndex* pIn
     } else {  // update the existed column filter information, find the filter info here
       pColFilter = &pColumn->filterInfo[0];
     }
+
+    if (pColFilter == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
   } else if (sqlOptr == TK_OR) {
     // TODO fixme: failed to invalid the filter expression: "col1 = 1 OR col2 = 2"
     pColFilter = addColumnFilterInfo(pColumn);
+    if (pColFilter == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
   } else {  // error;
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  pColFilter->filterOnBinary =
+  pColFilter->filterstr =
       ((pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) ? 1 : 0);
 
-  if (pColFilter->filterOnBinary) {
+  if (pColFilter->filterstr) {
     if (pExpr->nSQLOptr != TK_EQ && pExpr->nSQLOptr != TK_NE && pExpr->nSQLOptr != TK_LIKE) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
   } else {
     if (pExpr->nSQLOptr == TK_LIKE) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    }
+    
+    if (pSchema->type == TSDB_DATA_TYPE_BOOL) {
+      if (pExpr->nSQLOptr != TK_EQ && pExpr->nSQLOptr != TK_NE) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
     }
   }
 
   pColumn->colIndex = *pIndex;
-  return doExtractColumnFilterInfo(pQueryInfo, pColFilter, pIndex, pExpr);
+  return doExtractColumnFilterInfo(pCmd, pQueryInfo, pColFilter, pIndex, pExpr);
 }
 
 static void relToString(tSQLExpr* pExpr, char** str) {
@@ -2739,12 +3173,13 @@ static void relToString(tSQLExpr* pExpr, char** str) {
   }
 }
 
+UNUSED_FUNC
 static int32_t getTagCondString(tSQLExpr* pExpr, char** str) {
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
-  if (!isExprDirectParentOfLeaftNode(pExpr)) {
+  if (!isExprDirectParentOfLeafNode(pExpr)) {
     *(*str) = '(';
     *str += 1;
 
@@ -2766,7 +3201,7 @@ static int32_t getTagCondString(tSQLExpr* pExpr, char** str) {
   return tSQLExprLeafToString(pExpr, true, str);
 }
 
-static int32_t getTablenameCond(SQueryInfo* pQueryInfo, tSQLExpr* pTableCond, SStringBuilder* sb) {
+static int32_t getTablenameCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pTableCond, SStringBuilder* sb) {
   const char* msg0 = "invalid table name list";
 
   if (pTableCond == NULL) {
@@ -2777,7 +3212,7 @@ static int32_t getTablenameCond(SQueryInfo* pQueryInfo, tSQLExpr* pTableCond, SS
   tSQLExpr* pRight = pTableCond->pRight;
 
   if (!isTablenameToken(&pLeft->colInfo)) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   int32_t ret = TSDB_CODE_SUCCESS;
@@ -2789,43 +3224,45 @@ static int32_t getTablenameCond(SQueryInfo* pQueryInfo, tSQLExpr* pTableCond, SS
   }
 
   if (ret != TSDB_CODE_SUCCESS) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg0);
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
   }
 
   return ret;
 }
 
-static int32_t getColumnQueryCondInfo(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, int32_t relOptr) {
+static int32_t getColumnQueryCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr, int32_t relOptr) {
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
-  if (!isExprDirectParentOfLeaftNode(pExpr)) {  // internal node
-    int32_t ret = getColumnQueryCondInfo(pQueryInfo, pExpr->pLeft, pExpr->nSQLOptr);
+  if (!isExprDirectParentOfLeafNode(pExpr)) {  // internal node
+    int32_t ret = getColumnQueryCondInfo(pCmd, pQueryInfo, pExpr->pLeft, pExpr->nSQLOptr);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
 
-    return getColumnQueryCondInfo(pQueryInfo, pExpr->pRight, pExpr->nSQLOptr);
+    return getColumnQueryCondInfo(pCmd, pQueryInfo, pExpr->pRight, pExpr->nSQLOptr);
   } else {  // handle leaf node
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    if (getColumnIndexByName(&pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (getColumnIndexByName(pCmd, &pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    return extractColumnFilterInfo(pQueryInfo, &index, pExpr, relOptr);
+    return extractColumnFilterInfo(pCmd, pQueryInfo, &index, pExpr, relOptr);
   }
 }
 
-static int32_t getJoinCondInfo(SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
-  const char* msg = "invalid join query condition";
+static int32_t getJoinCondInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
+  const char* msg1 = "invalid join query condition";
+  const char* msg3 = "type of join columns must be identical";
+  const char* msg4 = "invalid column name in join condition";
 
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
-  if (!isExprDirectParentOfLeaftNode(pExpr)) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg);
+  if (!isExprDirectParentOfLeafNode(pExpr)) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
   STagCond*  pTagCond = &pQueryInfo->tagCond;
@@ -2833,105 +3270,127 @@ static int32_t getJoinCondInfo(SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
   SJoinNode* pRight = &pTagCond->joinInfo.right;
 
   SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-  if (getColumnIndexByName(&pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (getColumnIndexByName(pCmd, &pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-  int16_t         tagColIndex = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+  SSchema* pTagSchema1 = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, index.columnIndex);
 
-  pLeft->uid = pMeterMetaInfo->pMeterMeta->uid;
-  pLeft->tagCol = tagColIndex;
-  strcpy(pLeft->meterId, pMeterMetaInfo->name);
+  pLeft->uid = pTableMetaInfo->pTableMeta->id.uid;
+  pLeft->tagColId = pTagSchema1->colId;
+  strcpy(pLeft->tableId, pTableMetaInfo->name);
 
   index = (SColumnIndex)COLUMN_INDEX_INITIALIZER;
-  if (getColumnIndexByName(&pExpr->pRight->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (getColumnIndexByName(pCmd, &pExpr->pRight->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
   }
 
-  pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-  tagColIndex = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
+  pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+  SSchema* pTagSchema2 = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, index.columnIndex);
 
-  pRight->uid = pMeterMetaInfo->pMeterMeta->uid;
-  pRight->tagCol = tagColIndex;
-  strcpy(pRight->meterId, pMeterMetaInfo->name);
+  pRight->uid = pTableMetaInfo->pTableMeta->id.uid;
+  pRight->tagColId = pTagSchema2->colId;
+  strcpy(pRight->tableId, pTableMetaInfo->name);
+
+  if (pTagSchema1->type != pTagSchema2->type) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+  }
 
   pTagCond->joinInfo.hasJoin = true;
   return TSDB_CODE_SUCCESS;
 }
 
 // todo error handle / such as and /or mixed with +/-/*/
-int32_t buildArithmeticExprString(tSQLExpr* pExpr, char** exprString) {
+int32_t doArithmeticExprToString(tSQLExpr* pExpr, char** exprString) {
   tSQLExpr* pLeft = pExpr->pLeft;
   tSQLExpr* pRight = pExpr->pRight;
 
-  *(*exprString) = '(';
-  *exprString += 1;
+  *(*exprString)++ = '(';
 
   if (pLeft->nSQLOptr >= TK_PLUS && pLeft->nSQLOptr <= TK_REM) {
-    buildArithmeticExprString(pLeft, exprString);
+    doArithmeticExprToString(pLeft, exprString);
   } else {
     int32_t ret = tSQLExprNodeToString(pLeft, exprString);
     if (ret != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
   optrToString(pExpr, exprString);
 
   if (pRight->nSQLOptr >= TK_PLUS && pRight->nSQLOptr <= TK_REM) {
-    buildArithmeticExprString(pRight, exprString);
+    doArithmeticExprToString(pRight, exprString);
   } else {
     int32_t ret = tSQLExprNodeToString(pRight, exprString);
     if (ret != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
-  *(*exprString) = ')';
-  *exprString += 1;
+  *(*exprString)++ = ')';
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList) {
+static int32_t validateSQLExpr(SSqlCmd* pCmd, tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList, int32_t* type) {
   if (pExpr->nSQLOptr == TK_ID) {
-      SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-      if (getColumnIndexByName(&pExpr->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-        return TSDB_CODE_INVALID_SQL;
-      }
+    if (*type == NON_ARITHMEIC_EXPR) {
+      *type = NORMAL_ARITHMETIC;
+    } else if (*type == AGG_ARIGHTMEIC) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
 
-      // if column is timestamp, bool, binary, nchar, not support arithmetic, so return invalid sql
-      SMeterMeta* pMeterMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex)->pMeterMeta;
-      SSchema* pSchema = tsGetSchema(pMeterMeta) + index.columnIndex;
-      if ((pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) || (pSchema->type == TSDB_DATA_TYPE_BOOL)
-        || (pSchema->type == TSDB_DATA_TYPE_BINARY) || (pSchema->type == TSDB_DATA_TYPE_NCHAR)){
-        return TSDB_CODE_INVALID_SQL;
-      }
-      
-      pList->ids[pList->num++] = index;
+    SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+    if (getColumnIndexByName(pCmd, &pExpr->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+
+    // if column is timestamp, bool, binary, nchar, not support arithmetic, so return invalid sql
+    STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, index.tableIndex)->pTableMeta;
+    SSchema*    pSchema = tscGetTableSchema(pTableMeta) + index.columnIndex;
+    
+    if ((pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) || (pSchema->type == TSDB_DATA_TYPE_BOOL) ||
+        (pSchema->type == TSDB_DATA_TYPE_BINARY) || (pSchema->type == TSDB_DATA_TYPE_NCHAR)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+
+    pList->ids[pList->num++] = index;
   } else if (pExpr->nSQLOptr == TK_FLOAT && (isnan(pExpr->val.dKey) || isinf(pExpr->val.dKey))) {
-    return TSDB_CODE_INVALID_SQL;
-  } else if (pExpr->nSQLOptr >= TK_MIN && pExpr->nSQLOptr <= TK_LAST_ROW) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
+  } else if (pExpr->nSQLOptr >= TK_COUNT && pExpr->nSQLOptr <= TK_AVG_IRATE) {
+    if (*type == NON_ARITHMEIC_EXPR) {
+      *type = AGG_ARIGHTMEIC;
+    } else if (*type == NORMAL_ARITHMETIC) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+
+    int32_t outputIndex = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+  
+    tSQLExprItem item = {.pNode = pExpr, .aliasName = NULL};
+  
+    // sql function in selection clause, append sql function info in pSqlCmd structure sequentially
+    if (addExprAndResultField(pCmd, pQueryInfo, outputIndex, &item, false) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList) {
+static int32_t validateArithmeticSQLExpr(SSqlCmd* pCmd, tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList, int32_t* type) {
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
   tSQLExpr* pLeft = pExpr->pLeft;
   if (pLeft->nSQLOptr >= TK_PLUS && pLeft->nSQLOptr <= TK_REM) {
-    int32_t ret = validateArithmeticSQLExpr(pLeft, pQueryInfo, pList);
+    int32_t ret = validateArithmeticSQLExpr(pCmd, pLeft, pQueryInfo, pList, type);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
   } else {
-    int32_t ret = validateSQLExpr(pLeft, pQueryInfo, pList);
+    int32_t ret = validateSQLExpr(pCmd, pLeft, pQueryInfo, pList, type);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -2939,12 +3398,12 @@ static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo
 
   tSQLExpr* pRight = pExpr->pRight;
   if (pRight->nSQLOptr >= TK_PLUS && pRight->nSQLOptr <= TK_REM) {
-    int32_t ret = validateArithmeticSQLExpr(pRight, pQueryInfo, pList);
+    int32_t ret = validateArithmeticSQLExpr(pCmd, pRight, pQueryInfo, pList, type);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
   } else {
-    int32_t ret = validateSQLExpr(pRight, pQueryInfo, pList);
+    int32_t ret = validateSQLExpr(pCmd, pRight, pQueryInfo, pList, type);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -2966,10 +3425,22 @@ static bool isValidExpr(tSQLExpr* pLeft, tSQLExpr* pRight, int32_t optr) {
    *
    * However, columnA < 4+12 is valid
    */
-  if ((pLeft->nSQLOptr >= TK_COUNT && pLeft->nSQLOptr <= TK_LAST_ROW) ||
-      (pRight->nSQLOptr >= TK_COUNT && pRight->nSQLOptr <= TK_LAST_ROW) ||
-      (pLeft->nSQLOptr >= TK_BOOL && pLeft->nSQLOptr <= TK_BINARY && pRight->nSQLOptr >= TK_BOOL &&
-       pRight->nSQLOptr <= TK_BINARY)) {
+  if (pLeft->nSQLOptr >= TK_COUNT && pLeft->nSQLOptr <= TK_AVG_IRATE) {
+    return false;
+  }
+
+  if (pRight == NULL) {
+    return true;
+  }
+
+  if (pRight->nSQLOptr >= TK_COUNT && pRight->nSQLOptr <= TK_AVG_IRATE) {
+    return false;
+  }
+  
+  if (pLeft->nSQLOptr >= TK_BOOL
+    && pLeft->nSQLOptr <= TK_BINARY
+    && pRight->nSQLOptr >= TK_BOOL
+    && pRight->nSQLOptr <= TK_BINARY) {
     return false;
   }
 
@@ -3011,13 +3482,12 @@ static void exchangeExpr(tSQLExpr* pExpr) {
   }
 }
 
-static bool validateJoinExprNode(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SColumnIndex* pLeftIndex) {
+static bool validateJoinExprNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SColumnIndex* pLeftIndex) {
   const char* msg1 = "illegal column name";
   const char* msg2 = "= is expected in join expression";
   const char* msg3 = "join column must have same type";
   const char* msg4 = "self join is not allowed";
   const char* msg5 = "join table must be the same type(table to table, super table to super table)";
-  const char* msg6 = "tags in join condition not support binary/nchar types";
 
   tSQLExpr* pRight = pExpr->pRight;
 
@@ -3026,40 +3496,37 @@ static bool validateJoinExprNode(SQueryInfo* pQueryInfo, tSQLExpr* pExpr, SColum
   }
 
   if (pExpr->nSQLOptr != TK_EQ) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
     return false;
   }
 
   SColumnIndex rightIndex = COLUMN_INDEX_INITIALIZER;
 
-  if (getColumnIndexByName(&pRight->colInfo, pQueryInfo, &rightIndex) != TSDB_CODE_SUCCESS) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg1);
+  if (getColumnIndexByName(pCmd, &pRight->colInfo, pQueryInfo, &rightIndex) != TSDB_CODE_SUCCESS) {
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     return false;
   }
 
   // todo extract function
-  SMeterMetaInfo* pLeftMeterMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, pLeftIndex->tableIndex);
-  SSchema*        pLeftSchema = tsGetSchema(pLeftMeterMeta->pMeterMeta);
+  STableMetaInfo* pLeftMeterMeta = tscGetMetaInfo(pQueryInfo, pLeftIndex->tableIndex);
+  SSchema*        pLeftSchema = tscGetTableSchema(pLeftMeterMeta->pTableMeta);
   int16_t         leftType = pLeftSchema[pLeftIndex->columnIndex].type;
 
-  SMeterMetaInfo* pRightMeterMeta = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, rightIndex.tableIndex);
-  SSchema*        pRightSchema = tsGetSchema(pRightMeterMeta->pMeterMeta);
+  STableMetaInfo* pRightMeterMeta = tscGetMetaInfo(pQueryInfo, rightIndex.tableIndex);
+  SSchema*        pRightSchema = tscGetTableSchema(pRightMeterMeta->pTableMeta);
   int16_t         rightType = pRightSchema[rightIndex.columnIndex].type;
 
   if (leftType != rightType) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     return false;
   } else if (pLeftIndex->tableIndex == rightIndex.tableIndex) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg4);
-    return false;
-  } else if (leftType == TSDB_DATA_TYPE_BINARY || leftType == TSDB_DATA_TYPE_NCHAR) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg6);
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
     return false;
   }
 
   // table to table/ super table to super table are allowed
-  if (UTIL_METER_IS_SUPERTABLE(pLeftMeterMeta) != UTIL_METER_IS_SUPERTABLE(pRightMeterMeta)) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg5);
+  if (UTIL_TABLE_IS_SUPER_TABLE(pLeftMeterMeta) != UTIL_TABLE_IS_SUPER_TABLE(pRightMeterMeta)) {
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
     return false;
   }
 
@@ -3092,39 +3559,40 @@ static int32_t setExprToCond(tSQLExpr** parent, tSQLExpr* pExpr, const char* msg
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t handleExprInQueryCond(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pCondExpr, int32_t* type,
-                                     int32_t parentOptr) {
-  const char* msg1 = "meter query cannot use tags filter";
+static int32_t handleExprInQueryCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pCondExpr,
+                                     int32_t* type, int32_t parentOptr) {
+  const char* msg1 = "table query cannot use tags filter";
   const char* msg2 = "illegal column name";
   const char* msg3 = "only one query time range allowed";
   const char* msg4 = "only one join condition allowed";
   const char* msg5 = "not support ordinary column join";
   const char* msg6 = "only one query condition on tbname allowed";
   const char* msg7 = "only in/like allowed in filter table name";
-
+  const char* msg8 = "wildcard string should be less than 20 characters";
+  
   tSQLExpr* pLeft = (*pExpr)->pLeft;
   tSQLExpr* pRight = (*pExpr)->pRight;
 
   int32_t ret = TSDB_CODE_SUCCESS;
 
   SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-  if (getColumnIndexByName(&pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+  if (getColumnIndexByName(pCmd, &pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
-  assert(isExprDirectParentOfLeaftNode(*pExpr));
+  assert(isExprDirectParentOfLeafNode(*pExpr));
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-  SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+  STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
 
   if (index.columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {  // query on time range
-    if (!validateJoinExprNode(pQueryInfo, *pExpr, &index)) {
-      return TSDB_CODE_INVALID_SQL;
+    if (!validateJoinExprNode(pCmd, pQueryInfo, *pExpr, &index)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     // set join query condition
     if (pRight->nSQLOptr == TK_ID) {  // no need to keep the timestamp join condition
-      pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_QUERY;
+      TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_QUERY);
       pCondExpr->tsJoin = true;
 
       /*
@@ -3138,31 +3606,34 @@ static int32_t handleExprInQueryCond(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, S
 
     *pExpr = NULL;  // remove this expression
     *type = TSQL_EXPR_TS;
-  } else if (index.columnIndex >= pMeterMeta->numOfColumns ||
-             index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {  // query on tags
-    // check for tag query condition
-    if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+  } else if (index.columnIndex >= tscGetNumOfColumns(pTableMeta) || index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
+    // query on tags, check for tag query condition
+    if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     // check for like expression
     if ((*pExpr)->nSQLOptr == TK_LIKE) {
       if (pRight->val.nLen > TSDB_PATTERN_STRING_MAX_LEN) {
-        return TSDB_CODE_INVALID_SQL;
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
       }
 
-      SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+      SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
       if ((!isTablenameToken(&pLeft->colInfo)) && pSchema[index.columnIndex].type != TSDB_DATA_TYPE_BINARY &&
           pSchema[index.columnIndex].type != TSDB_DATA_TYPE_NCHAR) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
     }
 
-    // in case of in operator, keep it in a seperate attribute
+    // in case of in operator, keep it in a seprate attribute
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
       if (!validTableNameOptr(*pExpr)) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg7);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
+      }
+  
+      if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
       if (pCondExpr->pTableCond == NULL) {
@@ -3170,19 +3641,19 @@ static int32_t handleExprInQueryCond(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, S
         pCondExpr->relType = parentOptr;
         pCondExpr->tableCondIndex = index.tableIndex;
       } else {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
       *type = TSQL_EXPR_TBNAME;
       *pExpr = NULL;
     } else {
-      if (pRight->nSQLOptr == TK_ID) {  // join on tag columns for stable query
-        if (!validateJoinExprNode(pQueryInfo, *pExpr, &index)) {
-          return TSDB_CODE_INVALID_SQL;
+      if (pRight != NULL && pRight->nSQLOptr == TK_ID) {  // join on tag columns for stable query
+        if (!validateJoinExprNode(pCmd, pQueryInfo, *pExpr, &index)) {
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
 
         if (pCondExpr->pJoinExpr != NULL) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
         }
 
         pQueryInfo->type |= TSDB_QUERY_TYPE_JOIN_QUERY;
@@ -3201,7 +3672,7 @@ static int32_t handleExprInQueryCond(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, S
     *type = TSQL_EXPR_COLUMN;
 
     if (pRight->nSQLOptr == TK_ID) {  // other column cannot be served as the join column
-      return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
     }
 
     ret = setExprToCond(&pCondExpr->pColumnCond, *pExpr, NULL, parentOptr, pQueryInfo->msg);
@@ -3211,8 +3682,8 @@ static int32_t handleExprInQueryCond(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, S
   return ret;
 }
 
-int32_t getQueryCondExpr(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pCondExpr, int32_t* type,
-                         int32_t parentOptr) {
+int32_t getQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pCondExpr,
+                        int32_t* type, int32_t parentOptr) {
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
@@ -3223,19 +3694,19 @@ int32_t getQueryCondExpr(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pC
   tSQLExpr* pRight = (*pExpr)->pRight;
 
   if (!isValidExpr(pLeft, pRight, (*pExpr)->nSQLOptr)) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   int32_t leftType = -1;
   int32_t rightType = -1;
 
-  if (!isExprDirectParentOfLeaftNode(*pExpr)) {
-    int32_t ret = getQueryCondExpr(pQueryInfo, &(*pExpr)->pLeft, pCondExpr, &leftType, (*pExpr)->nSQLOptr);
+  if (!isExprDirectParentOfLeafNode(*pExpr)) {
+    int32_t ret = getQueryCondExpr(pCmd, pQueryInfo, &(*pExpr)->pLeft, pCondExpr, &leftType, (*pExpr)->nSQLOptr);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
 
-    ret = getQueryCondExpr(pQueryInfo, &(*pExpr)->pRight, pCondExpr, &rightType, (*pExpr)->nSQLOptr);
+    ret = getQueryCondExpr(pCmd, pQueryInfo, &(*pExpr)->pRight, pCondExpr, &rightType, (*pExpr)->nSQLOptr);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -3246,7 +3717,7 @@ int32_t getQueryCondExpr(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pC
      */
     if (leftType != rightType) {
       if ((*pExpr)->nSQLOptr == TK_OR && (leftType + rightType != TSQL_EXPR_TBNAME + TSQL_EXPR_TAG)) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
     }
 
@@ -3256,11 +3727,11 @@ int32_t getQueryCondExpr(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SCondExpr* pC
 
   exchangeExpr(*pExpr);
 
-  return handleExprInQueryCond(pQueryInfo, pExpr, pCondExpr, type, parentOptr);
+  return handleExprInQueryCond(pCmd, pQueryInfo, pExpr, pCondExpr, type, parentOptr);
 }
 
 static void doCompactQueryExpr(tSQLExpr** pExpr) {
-  if (*pExpr == NULL || isExprDirectParentOfLeaftNode(*pExpr)) {
+  if (*pExpr == NULL || isExprDirectParentOfLeafNode(*pExpr)) {
     return;
   }
 
@@ -3290,12 +3761,12 @@ static void doCompactQueryExpr(tSQLExpr** pExpr) {
   }
 }
 
-static void doExtractExprForSTable(tSQLExpr** pExpr, SQueryInfo* pQueryInfo, tSQLExpr** pOut, int32_t tableIndex) {
-  if (isExprDirectParentOfLeaftNode(*pExpr)) {
+static void doExtractExprForSTable(SSqlCmd* pCmd, tSQLExpr** pExpr, SQueryInfo* pQueryInfo, tSQLExpr** pOut, int32_t tableIndex) {
+  if (isExprDirectParentOfLeafNode(*pExpr)) {
     tSQLExpr* pLeft = (*pExpr)->pLeft;
 
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    if (getColumnIndexByName(&pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+    if (getColumnIndexByName(pCmd, &pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
       return;
     }
 
@@ -3303,7 +3774,7 @@ static void doExtractExprForSTable(tSQLExpr** pExpr, SQueryInfo* pQueryInfo, tSQ
       return;
     }
 
-    SSQLToken t = {0};
+    SStrToken t = {0};
     extractTableNameFromToken(&pLeft->colInfo, &t);
 
     *pOut = *pExpr;
@@ -3312,16 +3783,16 @@ static void doExtractExprForSTable(tSQLExpr** pExpr, SQueryInfo* pQueryInfo, tSQ
   } else {
     *pOut = tSQLExprCreate(NULL, NULL, (*pExpr)->nSQLOptr);
 
-    doExtractExprForSTable(&(*pExpr)->pLeft, pQueryInfo, &((*pOut)->pLeft), tableIndex);
-    doExtractExprForSTable(&(*pExpr)->pRight, pQueryInfo, &((*pOut)->pRight), tableIndex);
+    doExtractExprForSTable(pCmd, &(*pExpr)->pLeft, pQueryInfo, &((*pOut)->pLeft), tableIndex);
+    doExtractExprForSTable(pCmd, &(*pExpr)->pRight, pQueryInfo, &((*pOut)->pRight), tableIndex);
   }
 }
 
-static tSQLExpr* extractExprForSTable(tSQLExpr** pExpr, SQueryInfo* pQueryInfo, int32_t tableIndex) {
+static tSQLExpr* extractExprForSTable(SSqlCmd* pCmd, tSQLExpr** pExpr, SQueryInfo* pQueryInfo, int32_t tableIndex) {
   tSQLExpr* pResExpr = NULL;
 
   if (*pExpr != NULL) {
-    doExtractExprForSTable(pExpr, pQueryInfo, &pResExpr, tableIndex);
+    doExtractExprForSTable(pCmd, pExpr, pQueryInfo, &pResExpr, tableIndex);
     doCompactQueryExpr(&pResExpr);
   }
 
@@ -3341,18 +3812,18 @@ int tableNameCompar(const void* lhs, const void* rhs) {
   return ret > 0 ? 1 : -1;
 }
 
-static int32_t setTableCondForMetricQuery(SQueryInfo* pQueryInfo, const char* account, tSQLExpr* pExpr,
-                                          int16_t tableCondIndex, SStringBuilder* sb) {
+static int32_t setTableCondForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, const char* account,
+                                          tSQLExpr* pExpr, int16_t tableCondIndex, SStringBuilder* sb) {
   const char* msg = "table name too long";
 
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableCondIndex);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableCondIndex);
 
   STagCond* pTagCond = &pQueryInfo->tagCond;
-  pTagCond->tbnameCond.uid = pMeterMetaInfo->pMeterMeta->uid;
+  pTagCond->tbnameCond.uid = pTableMetaInfo->pTableMeta->id.uid;
 
   assert(pExpr->nSQLOptr == TK_LIKE || pExpr->nSQLOptr == TK_IN);
 
@@ -3362,10 +3833,10 @@ static int32_t setTableCondForMetricQuery(SQueryInfo* pQueryInfo, const char* ac
     return TSDB_CODE_SUCCESS;
   }
 
-  SStringBuilder sb1 = {0};
+  SStringBuilder sb1; memset(&sb1, 0, sizeof(sb1));
   taosStringBuilderAppendStringLen(&sb1, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN);
 
-  char db[TSDB_METER_ID_LEN] = {0};
+  char db[TSDB_TABLE_FNAME_LEN] = {0};
 
   // remove the duplicated input table names
   int32_t num = 0;
@@ -3382,23 +3853,24 @@ static int32_t setTableCondForMetricQuery(SQueryInfo* pQueryInfo, const char* ac
   }
   num = j;
 
-  SSQLToken dbToken = extractDBName(pMeterMetaInfo->name, db);
-
+  char* name = extractDBName(pTableMetaInfo->name, db);
+  SStrToken dbToken = { .type = TK_STRING, .z = name, .n = (uint32_t)strlen(name) };
+  
   for (int32_t i = 0; i < num; ++i) {
     if (i >= 1) {
       taosStringBuilderAppendStringLen(&sb1, TBNAME_LIST_SEP, 1);
     }
 
-    char      idBuf[TSDB_METER_ID_LEN + 1] = {0};
-    int32_t   xlen = strlen(segments[i]);
-    SSQLToken t = {.z = segments[i], .n = xlen, .type = TK_STRING};
+    char      idBuf[TSDB_TABLE_FNAME_LEN] = {0};
+    int32_t   xlen = (int32_t)strlen(segments[i]);
+    SStrToken t = {.z = segments[i], .n = xlen, .type = TK_STRING};
 
     int32_t ret = setObjFullName(idBuf, account, &dbToken, &t, &xlen);
     if (ret != TSDB_CODE_SUCCESS) {
       taosStringBuilderDestroy(&sb1);
-      tfree(segments);
+      taosTFree(segments);
 
-      invalidSqlErrMsg(pQueryInfo->msg, msg);
+      invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       return ret;
     }
 
@@ -3409,20 +3881,24 @@ static int32_t setTableCondForMetricQuery(SQueryInfo* pQueryInfo, const char* ac
   pQueryInfo->tagCond.tbnameCond.cond = strdup(str);
 
   taosStringBuilderDestroy(&sb1);
-  tfree(segments);
+  taosTFree(segments);
   return TSDB_CODE_SUCCESS;
 }
 
 static bool validateFilterExpr(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->colList.numOfCols; ++i) {
-    SColumnBase* pColBase = &pQueryInfo->colList.pColList[i];
+  SArray* pColList = pQueryInfo->colList;
+  
+  size_t num = taosArrayGetSize(pColList);
+  
+  for (int32_t i = 0; i < num; ++i) {
+    SColumn* pCol = taosArrayGetP(pColList, i);
 
-    for (int32_t j = 0; j < pColBase->numOfFilters; ++j) {
-      SColumnFilterInfo* pColFilter = &pColBase->filterInfo[j];
+    for (int32_t j = 0; j < pCol->numOfFilters; ++j) {
+      SColumnFilterInfo* pColFilter = &pCol->filterInfo[j];
       int32_t            lowerOptr = pColFilter->lowerRelOptr;
       int32_t            upperOptr = pColFilter->upperRelOptr;
 
-      if ((lowerOptr == TSDB_RELATION_LARGE_EQUAL || lowerOptr == TSDB_RELATION_LARGE) &&
+      if ((lowerOptr == TSDB_RELATION_GREATER_EQUAL || lowerOptr == TSDB_RELATION_GREATER) &&
           (upperOptr == TSDB_RELATION_LESS_EQUAL || upperOptr == TSDB_RELATION_LESS)) {
         continue;
       }
@@ -3437,7 +3913,7 @@ static bool validateFilterExpr(SQueryInfo* pQueryInfo) {
   return true;
 }
 
-static int32_t getTimeRangeFromExpr(SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
+static int32_t getTimeRangeFromExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
   const char* msg0 = "invalid timestamp";
   const char* msg1 = "only one time stamp window allowed";
 
@@ -3445,46 +3921,44 @@ static int32_t getTimeRangeFromExpr(SQueryInfo* pQueryInfo, tSQLExpr* pExpr) {
     return TSDB_CODE_SUCCESS;
   }
 
-  if (!isExprDirectParentOfLeaftNode(pExpr)) {
+  if (!isExprDirectParentOfLeafNode(pExpr)) {
     if (pExpr->nSQLOptr == TK_OR) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
-    getTimeRangeFromExpr(pQueryInfo, pExpr->pLeft);
+    getTimeRangeFromExpr(pCmd, pQueryInfo, pExpr->pLeft);
 
-    return getTimeRangeFromExpr(pQueryInfo, pExpr->pRight);
+    return getTimeRangeFromExpr(pCmd, pQueryInfo, pExpr->pRight);
   } else {
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    if (getColumnIndexByName(&pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (getColumnIndexByName(pCmd, &pExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-    SMeterMeta*     pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+    STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+    
     tSQLExpr* pRight = pExpr->pRight;
 
-    TSKEY stime = 0;
-    TSKEY etime = INT64_MAX;
-
-    if (getTimeRange(&stime, &etime, pRight, pExpr->nSQLOptr, pMeterMeta->precision) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+    STimeWindow win = {.skey = INT64_MIN, .ekey = INT64_MAX};
+    if (getTimeRange(&win, pRight, pExpr->nSQLOptr, tinfo.precision) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
     }
 
     // update the timestamp query range
-    if (pQueryInfo->stime < stime) {
-      pQueryInfo->stime = stime;
+    if (pQueryInfo->window.skey < win.skey) {
+      pQueryInfo->window.skey = win.skey;
     }
 
-    if (pQueryInfo->etime > etime) {
-      pQueryInfo->etime = etime;
+    if (pQueryInfo->window.ekey > win.ekey) {
+      pQueryInfo->window.ekey = win.ekey;
     }
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateJoinExpr(SQueryInfo* pQueryInfo, SCondExpr* pCondExpr) {
+static int32_t validateJoinExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondExpr* pCondExpr) {
   const char* msg1 = "super table join requires tags column";
   const char* msg2 = "timestamp join condition missing";
   const char* msg3 = "condition missing for join query";
@@ -3493,20 +3967,20 @@ static int32_t validateJoinExpr(SQueryInfo* pQueryInfo, SCondExpr* pCondExpr) {
     if (pQueryInfo->numOfTables == 1) {
       return TSDB_CODE_SUCCESS;
     } else {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {  // for stable join, tag columns
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {  // for stable join, tag columns
                                                    // must be present for join
     if (pCondExpr->pJoinExpr == NULL) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   }
 
   if (!pCondExpr->tsJoin) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -3534,50 +4008,78 @@ static void cleanQueryExpr(SCondExpr* pCondExpr) {
   }
 }
 
-static void doAddJoinTagsColumnsIntoTagList(SQueryInfo* pQueryInfo, SCondExpr* pCondExpr) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  if (QUERY_IS_JOIN_QUERY(pQueryInfo->type) && UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
+static void doAddJoinTagsColumnsIntoTagList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondExpr* pCondExpr) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (QUERY_IS_JOIN_QUERY(pQueryInfo->type) && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
     SColumnIndex index = {0};
 
-    getColumnIndexByName(&pCondExpr->pJoinExpr->pLeft->colInfo, pQueryInfo, &index);
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-
-    int32_t columnInfo = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
-    addRequiredTagColumn(pQueryInfo, columnInfo, index.tableIndex);
-
-    getColumnIndexByName(&pCondExpr->pJoinExpr->pRight->colInfo, pQueryInfo, &index);
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index.tableIndex);
-
-    columnInfo = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
-    addRequiredTagColumn(pQueryInfo, columnInfo, index.tableIndex);
+    if (getColumnIndexByName(pCmd, &pCondExpr->pJoinExpr->pLeft->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      tscError("%p: invalid column name (left)", pQueryInfo);
+    }
+    pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+  
+    index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+    tscColumnListInsert(pTableMetaInfo->tagColList, &index);
+  
+    if (getColumnIndexByName(pCmd, &pCondExpr->pJoinExpr->pRight->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      tscError("%p: invalid column name (right)", pQueryInfo);
+    }
+    pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
+  
+    index.columnIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+    tscColumnListInsert(pTableMetaInfo->tagColList, &index);
   }
 }
 
-static int32_t getTagQueryCondExpr(SQueryInfo* pQueryInfo, SCondExpr* pCondExpr, tSQLExpr** pExpr) {
+static int32_t getTagQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondExpr* pCondExpr, tSQLExpr** pExpr) {
   int32_t ret = TSDB_CODE_SUCCESS;
 
-  if (pCondExpr->pTagCond != NULL) {
-    for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-      tSQLExpr* p1 = extractExprForSTable(pExpr, pQueryInfo, i);
-
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-
-      char  c[TSDB_MAX_TAGS_LEN] = {0};
-      char* str = c;
-
-      if ((ret = getTagCondString(p1, &str)) != TSDB_CODE_SUCCESS) {
-        return ret;
-      }
-
-      tsSetMetricQueryCond(&pQueryInfo->tagCond, pMeterMetaInfo->pMeterMeta->uid, c);
-
-      doCompactQueryExpr(pExpr);
-      tSQLExprDestroy(p1);
+  if (pCondExpr->pTagCond == NULL) {
+    return ret;
+  }
+  
+  for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+    tSQLExpr* p1 = extractExprForSTable(pCmd, pExpr, pQueryInfo, i);
+    if (p1 == NULL) {  // no query condition on this table
+      continue;
     }
 
-    pCondExpr->pTagCond = NULL;
+    tExprNode* p = NULL;
+  
+    SArray* colList = taosArrayInit(10, sizeof(SColIndex));
+    ret = exprTreeFromSqlExpr(pCmd, &p, p1, NULL, pQueryInfo, colList);
+    SBufferWriter bw = tbufInitWriter(NULL, false);
+
+    TRY(0) {
+      exprTreeToBinary(&bw, p);
+    } CATCH(code) {
+      tbufCloseWriter(&bw);
+      UNUSED(code);
+      // TODO: more error handling
+    } END_TRY
+    
+    // add to source column list
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
+    int64_t uid = pTableMetaInfo->pTableMeta->id.uid;
+    int32_t numOfCols = tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+    
+    size_t num = taosArrayGetSize(colList);
+    for(int32_t j = 0; j < num; ++j) {
+      SColIndex* pIndex = taosArrayGet(colList, j);
+      SColumnIndex index = {.tableIndex = i, .columnIndex = pIndex->colIndex - numOfCols};
+      tscColumnListInsert(pTableMetaInfo->tagColList, &index);
+    }
+    
+    tsSetSTableQueryCond(&pQueryInfo->tagCond, uid, &bw);
+    doCompactQueryExpr(pExpr);
+    
+    tSQLExprDestroy(p1);
+    tExprTreeDestroy(&p, NULL);
+    
+    taosArrayDestroy(colList);
   }
 
+  pCondExpr->pTagCond = NULL;
   return ret;
 }
 int32_t parseWhereClause(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SSqlObj* pSql) {
@@ -3585,24 +4087,21 @@ int32_t parseWhereClause(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SSqlObj* pSql
     return TSDB_CODE_SUCCESS;
   }
 
-  const char* msg = "invalid filter expression";
   const char* msg1 = "invalid expression";
+  const char* msg2 = "invalid filter expression";
 
   int32_t ret = TSDB_CODE_SUCCESS;
 
-  pQueryInfo->stime = 0;
-  pQueryInfo->etime = INT64_MAX;
-
   // tags query condition may be larger than 512bytes, therefore, we need to prepare enough large space
-  SStringBuilder sb = {0};
+  SStringBuilder sb; memset(&sb, 0, sizeof(sb));
   SCondExpr      condExpr = {0};
 
   if ((*pExpr)->pLeft == NULL || (*pExpr)->pRight == NULL) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(&pSql->cmd), msg1);
   }
 
   int32_t type = 0;
-  if ((ret = getQueryCondExpr(pQueryInfo, pExpr, &condExpr, &type, (*pExpr)->nSQLOptr)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getQueryCondExpr(&pSql->cmd, pQueryInfo, pExpr, &condExpr, &type, (*pExpr)->nSQLOptr)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
@@ -3612,52 +4111,52 @@ int32_t parseWhereClause(SQueryInfo* pQueryInfo, tSQLExpr** pExpr, SSqlObj* pSql
   condExpr.pTagCond = (*pExpr);
 
   // 1. check if it is a join query
-  if ((ret = validateJoinExpr(pQueryInfo, &condExpr)) != TSDB_CODE_SUCCESS) {
+  if ((ret = validateJoinExpr(&pSql->cmd, pQueryInfo, &condExpr)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 2. get the query time range
-  if ((ret = getTimeRangeFromExpr(pQueryInfo, condExpr.pTimewindow)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getTimeRangeFromExpr(&pSql->cmd, pQueryInfo, condExpr.pTimewindow)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 3. get the tag query condition
-  if ((ret = getTagQueryCondExpr(pQueryInfo, &condExpr, pExpr)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getTagQueryCondExpr(&pSql->cmd, pQueryInfo, &condExpr, pExpr)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 4. get the table name query condition
-  if ((ret = getTablenameCond(pQueryInfo, condExpr.pTableCond, &sb)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getTablenameCond(&pSql->cmd, pQueryInfo, condExpr.pTableCond, &sb)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 5. other column query condition
-  if ((ret = getColumnQueryCondInfo(pQueryInfo, condExpr.pColumnCond, TK_AND)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getColumnQueryCondInfo(&pSql->cmd, pQueryInfo, condExpr.pColumnCond, TK_AND)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 6. join condition
-  if ((ret = getJoinCondInfo(pQueryInfo, condExpr.pJoinExpr)) != TSDB_CODE_SUCCESS) {
+  if ((ret = getJoinCondInfo(&pSql->cmd, pQueryInfo, condExpr.pJoinExpr)) != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
   // 7. query condition for table name
   pQueryInfo->tagCond.relType = (condExpr.relType == TK_AND) ? TSDB_RELATION_AND : TSDB_RELATION_OR;
 
-  ret = setTableCondForMetricQuery(pQueryInfo, getAccountId(pSql), condExpr.pTableCond, condExpr.tableCondIndex, &sb);
+  ret = setTableCondForSTableQuery(&pSql->cmd, pQueryInfo, getAccountId(pSql), condExpr.pTableCond, condExpr.tableCondIndex, &sb);
   taosStringBuilderDestroy(&sb);
 
   if (!validateFilterExpr(pQueryInfo)) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(&pSql->cmd), msg2);
   }
 
-  doAddJoinTagsColumnsIntoTagList(pQueryInfo, &condExpr);
+  doAddJoinTagsColumnsIntoTagList(&pSql->cmd, pQueryInfo, &condExpr);
 
   cleanQueryExpr(&condExpr);
   return ret;
 }
 
-int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t optr, int16_t timePrecision) {
+int32_t getTimeRange(STimeWindow* win, tSQLExpr* pRight, int32_t optr, int16_t timePrecision) {
   // this is join condition, do nothing
   if (pRight->nSQLOptr == TK_ID) {
     return TSDB_CODE_SUCCESS;
@@ -3668,7 +4167,7 @@ int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t o
    * where ts in ('2015-12-12 4:8:12')
    */
   if (pRight->nSQLOptr == TK_SET || optr == TK_IN) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   int64_t val = 0;
@@ -3678,17 +4177,17 @@ int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t o
 
     char* seg = strnchr(pRight->val.pz, '-', pRight->val.nLen, false);
     if (seg != NULL) {
-      if (taosParseTime(pRight->val.pz, &val, pRight->val.nLen, TSDB_TIME_PRECISION_MICRO) == TSDB_CODE_SUCCESS) {
+      if (taosParseTime(pRight->val.pz, &val, pRight->val.nLen, TSDB_TIME_PRECISION_MICRO, tsDaylight) == TSDB_CODE_SUCCESS) {
         parsed = true;
       } else {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     } else {
-      SSQLToken token = {.z = pRight->val.pz, .n = pRight->val.nLen, .type = TK_ID};
+      SStrToken token = {.z = pRight->val.pz, .n = pRight->val.nLen, .type = TK_ID};
       int32_t   len = tSQLGetToken(pRight->val.pz, &token.type);
 
       if ((token.type != TK_INTEGER && token.type != TK_FLOAT) || len != pRight->val.nLen) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     }
   } else if (pRight->nSQLOptr == TK_INTEGER && timePrecision == TSDB_TIME_PRECISION_MILLI) {
@@ -3710,7 +4209,7 @@ int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t o
      * failed to parse timestamp in regular formation, try next
      * it may be a epoch time in string format
      */
-    tVariantDump(&pRight->val, (char*)&val, TSDB_DATA_TYPE_BIGINT);
+    tVariantDump(&pRight->val, (char*)&val, TSDB_DATA_TYPE_BIGINT, true);
 
     /*
      * transfer it into MICROSECOND format if it is a string, since for
@@ -3732,26 +4231,26 @@ int32_t getTimeRange(int64_t* stime, int64_t* etime, tSQLExpr* pRight, int32_t o
   }
 
   if (optr == TK_LE) {
-    *etime = val;
+    win->ekey = val;
   } else if (optr == TK_LT) {
-    *etime = val - delta;
+    win->ekey = val - delta;
   } else if (optr == TK_GT) {
-    *stime = val + delta;
+    win->skey = val + delta;
   } else if (optr == TK_GE) {
-    *stime = val;
+    win->skey = val;
   } else if (optr == TK_EQ) {
-    *stime = val;
-    *etime = *stime;
+    win->ekey = win->skey = val;
   }
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tsRewriteFieldNameIfNecessary(SQueryInfo* pQueryInfo) {
+// todo error !!!!
+int32_t tsRewriteFieldNameIfNecessary(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char rep[] = {'(', ')', '*', ',', '.', '/', '\\', '+', '-', '%', ' '};
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    char* fieldName = tscFieldInfoGetField(pQueryInfo, i)->name;
-    for (int32_t j = 0; j < TSDB_COL_NAME_LEN && fieldName[j] != 0; ++j) {
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    char* fieldName = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i)->name;
+    for (int32_t j = 0; j < (TSDB_COL_NAME_LEN - 1) && fieldName[j] != 0; ++j) {
       for (int32_t k = 0; k < tListLen(rep); ++k) {
         if (fieldName[j] == rep[k]) {
           fieldName[j] = '_';
@@ -3764,12 +4263,12 @@ int32_t tsRewriteFieldNameIfNecessary(SQueryInfo* pQueryInfo) {
   }
 
   // the column name may be identical, here check again
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    char* fieldName = tscFieldInfoGetField(pQueryInfo, i)->name;
-    for (int32_t j = i + 1; j < pQueryInfo->fieldsInfo.numOfOutputCols; ++j) {
-      if (strncasecmp(fieldName, tscFieldInfoGetField(pQueryInfo, j)->name, TSDB_COL_NAME_LEN) == 0) {
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    char* fieldName = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i)->name;
+    for (int32_t j = i + 1; j < pQueryInfo->fieldsInfo.numOfOutput; ++j) {
+      if (strncasecmp(fieldName, tscFieldInfoGetField(&pQueryInfo->fieldsInfo, j)->name, (TSDB_COL_NAME_LEN - 1)) == 0) {
         const char* msg = "duplicated column name in new table";
-        return invalidSqlErrMsg(pQueryInfo->msg, msg);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
     }
   }
@@ -3777,7 +4276,7 @@ int32_t tsRewriteFieldNameIfNecessary(SQueryInfo* pQueryInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t parseFillClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL) {
+int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL) {
   tVariantList*     pFillToken = pQuerySQL->fillType;
   tVariantListItem* pItem = &pFillToken->a[0];
 
@@ -3788,33 +4287,39 @@ int32_t parseFillClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL) {
   const char* msg2 = "invalid fill option";
 
   if (pItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
-
-  if (pQueryInfo->defaultVal == NULL) {
-    pQueryInfo->defaultVal = calloc(pQueryInfo->fieldsInfo.numOfOutputCols, sizeof(int64_t));
-    if (pQueryInfo->defaultVal == NULL) {
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+  
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  if (pQueryInfo->fillVal == NULL) {
+    pQueryInfo->fillVal = calloc(size, sizeof(int64_t));
+    if (pQueryInfo->fillVal == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
     }
   }
 
   if (strncasecmp(pItem->pVar.pz, "none", 4) == 0 && pItem->pVar.nLen == 4) {
-    pQueryInfo->interpoType = TSDB_INTERPO_NONE;
+    pQueryInfo->fillType = TSDB_FILL_NONE;
   } else if (strncasecmp(pItem->pVar.pz, "null", 4) == 0 && pItem->pVar.nLen == 4) {
-    pQueryInfo->interpoType = TSDB_INTERPO_NULL;
-    for (int32_t i = START_INTERPO_COL_IDX; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-      TAOS_FIELD* pFields = tscFieldInfoGetField(pQueryInfo, i);
-      setNull((char*)&pQueryInfo->defaultVal[i], pFields->type, pFields->bytes);
+    pQueryInfo->fillType = TSDB_FILL_NULL;
+    for (int32_t i = START_INTERPO_COL_IDX; i < size; ++i) {
+      TAOS_FIELD* pFields = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+      if (pFields->type == TSDB_DATA_TYPE_BINARY || pFields->type == TSDB_DATA_TYPE_NCHAR) {
+        setVardataNull((char*) &pQueryInfo->fillVal[i], pFields->type);
+      } else {
+        setNull((char*)&pQueryInfo->fillVal[i], pFields->type, pFields->bytes);
+      };
     }
   } else if (strncasecmp(pItem->pVar.pz, "prev", 4) == 0 && pItem->pVar.nLen == 4) {
-    pQueryInfo->interpoType = TSDB_INTERPO_PREV;
+    pQueryInfo->fillType = TSDB_FILL_PREV;
   } else if (strncasecmp(pItem->pVar.pz, "linear", 6) == 0 && pItem->pVar.nLen == 6) {
-    pQueryInfo->interpoType = TSDB_INTERPO_LINEAR;
+    pQueryInfo->fillType = TSDB_FILL_LINEAR;
   } else if (strncasecmp(pItem->pVar.pz, "value", 5) == 0 && pItem->pVar.nLen == 5) {
-    pQueryInfo->interpoType = TSDB_INTERPO_SET_VALUE;
+    pQueryInfo->fillType = TSDB_FILL_SET_VALUE;
 
     if (pFillToken->nExpr == 1) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     int32_t startPos = 1;
@@ -3824,46 +4329,44 @@ int32_t parseFillClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL) {
     if (tscIsPointInterpQuery(pQueryInfo)) {
       startPos = 0;
 
-      if (numOfFillVal > pQueryInfo->fieldsInfo.numOfOutputCols) {
-        numOfFillVal = pQueryInfo->fieldsInfo.numOfOutputCols;
+      if (numOfFillVal > size) {
+        numOfFillVal = (int32_t)size;
       }
     } else {
-      numOfFillVal = (pFillToken->nExpr > pQueryInfo->fieldsInfo.numOfOutputCols)
-                         ? pQueryInfo->fieldsInfo.numOfOutputCols
-                         : pFillToken->nExpr;
+      numOfFillVal = (pFillToken->nExpr >  (int32_t)size) ? (int32_t)size : pFillToken->nExpr;
     }
 
     int32_t j = 1;
 
     for (int32_t i = startPos; i < numOfFillVal; ++i, ++j) {
-      TAOS_FIELD* pFields = tscFieldInfoGetField(pQueryInfo, i);
-  
+      TAOS_FIELD* pFields = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+
       if (pFields->type == TSDB_DATA_TYPE_BINARY || pFields->type == TSDB_DATA_TYPE_NCHAR) {
-        setNull((char*)(&pQueryInfo->defaultVal[i]), pFields->type, pFields->bytes);
+        setVardataNull((char*) &pQueryInfo->fillVal[i], pFields->type);
         continue;
       }
-      
-      int32_t ret = tVariantDump(&pFillToken->a[j].pVar, (char*)&pQueryInfo->defaultVal[i], pFields->type);
+
+      int32_t ret = tVariantDump(&pFillToken->a[j].pVar, (char*)&pQueryInfo->fillVal[i], pFields->type, true);
       if (ret != TSDB_CODE_SUCCESS) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
       }
     }
-
-    if ((pFillToken->nExpr < pQueryInfo->fieldsInfo.numOfOutputCols) ||
-        ((pFillToken->nExpr - 1 < pQueryInfo->fieldsInfo.numOfOutputCols) && (tscIsPointInterpQuery(pQueryInfo)))) {
+    
+    if ((pFillToken->nExpr < size) || ((pFillToken->nExpr - 1 < size) && (tscIsPointInterpQuery(pQueryInfo)))) {
       tVariantListItem* lastItem = &pFillToken->a[pFillToken->nExpr - 1];
 
-      for (int32_t i = numOfFillVal; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-        TAOS_FIELD* pFields = tscFieldInfoGetField(pQueryInfo, i);
-        tVariantDump(&lastItem->pVar, (char*)&pQueryInfo->defaultVal[i], pFields->type);
+      for (int32_t i = numOfFillVal; i < size; ++i) {
+        TAOS_FIELD* pFields = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
 
         if (pFields->type == TSDB_DATA_TYPE_BINARY || pFields->type == TSDB_DATA_TYPE_NCHAR) {
-          setNull((char*)(&pQueryInfo->defaultVal[i]), pFields->type, pFields->bytes);
+          setVardataNull((char*) &pQueryInfo->fillVal[i], pFields->type);
+        } else {
+          tVariantDump(&lastItem->pVar, (char*)&pQueryInfo->fillVal[i], pFields->type, true);
         }
       }
     }
   } else {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
   return TSDB_CODE_SUCCESS;
@@ -3871,30 +4374,30 @@ int32_t parseFillClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySQL) {
 
 static void setDefaultOrderInfo(SQueryInfo* pQueryInfo) {
   /* set default timestamp order information for all queries */
-  pQueryInfo->order.order = TSQL_SO_ASC;
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   if (isTopBottomQuery(pQueryInfo)) {
-    pQueryInfo->order.order = TSQL_SO_ASC;
+    pQueryInfo->order.order = TSDB_ORDER_ASC;
     pQueryInfo->order.orderColId = PRIMARYKEY_TIMESTAMP_COL_INDEX;
   } else {
     pQueryInfo->order.orderColId = -1;
   }
 
-  /* for metric query, set default ascending order for group output */
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    pQueryInfo->groupbyExpr.orderType = TSQL_SO_ASC;
+  /* for super table query, set default ascending order for group output */
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    pQueryInfo->groupbyExpr.orderType = TSDB_ORDER_ASC;
   }
 }
 
-int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema* pSchema) {
+int32_t parseOrderbyClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema* pSchema) {
   const char* msg0 = "only support order by primary timestamp";
   const char* msg1 = "invalid column name";
   const char* msg2 = "only support order by primary timestamp and queried column";
   const char* msg3 = "only support order by primary timestamp and first tag in groupby clause";
 
   setDefaultOrderInfo(pQueryInfo);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   if (pQuerySql->pSortOrder == NULL) {
     return TSDB_CODE_SUCCESS;
@@ -3908,13 +4411,13 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
    *
    * for super table query, the order option must be less than 3.
    */
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
+  if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
     if (pSortorder->nExpr > 1) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
     }
   } else {
     if (pSortorder->nExpr > 2) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
   }
 
@@ -3926,20 +4429,26 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
     return TSDB_CODE_SUCCESS;
   }
 
-  SSQLToken    columnName = {pVar->nLen, pVar->nType, pVar->pz};
+  SStrToken    columnName = {pVar->nLen, pVar->nType, pVar->pz};
   SColumnIndex index = {0};
 
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {  // metric query
-    if (getColumnIndexByName(&columnName, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {  // super table query
+    if (getColumnIndexByName(pCmd, &columnName, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     bool orderByTags = false;
     bool orderByTS = false;
 
-    if (index.columnIndex >= pMeterMetaInfo->pMeterMeta->numOfColumns) {
-      int32_t relTagIndex = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
-      if (relTagIndex == pQueryInfo->groupbyExpr.columnInfo[0].colIdx) {
+    if (index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
+      int32_t relTagIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
+      
+      // it is a tag column
+      if (pQueryInfo->groupbyExpr.columnInfo == NULL) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }
+      SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, 0);
+      if (relTagIndex == pColIndex->colIndex) {
         orderByTags = true;
       }
     } else if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
@@ -3951,14 +4460,14 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
     }
 
     if (!(orderByTags || orderByTS) && !isTopBottomQuery(pQueryInfo)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     } else {
       assert(!(orderByTags && orderByTS));
     }
 
     if (pSortorder->nExpr == 1) {
       if (orderByTags) {
-        pQueryInfo->groupbyExpr.orderIndex = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
+        pQueryInfo->groupbyExpr.orderIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
         pQueryInfo->groupbyExpr.orderType = pQuerySql->pSortOrder->a[0].sortOrder;
       } else if (isTopBottomQuery(pQueryInfo)) {
         /* order of top/bottom query in interval is not valid  */
@@ -3966,8 +4475,8 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
         assert(pExpr->functionId == TSDB_FUNC_TS);
 
         pExpr = tscSqlExprGet(pQueryInfo, 1);
-        if (pExpr->colInfo.colIdx != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        if (pExpr->colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
         }
 
         pQueryInfo->order.order = pQuerySql->pSortOrder->a[0].sortOrder;
@@ -3981,7 +4490,7 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
 
     if (pSortorder->nExpr == 2) {
       if (orderByTags) {
-        pQueryInfo->groupbyExpr.orderIndex = index.columnIndex - pMeterMetaInfo->pMeterMeta->numOfColumns;
+        pQueryInfo->groupbyExpr.orderIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
         pQueryInfo->groupbyExpr.orderType = pQuerySql->pSortOrder->a[0].sortOrder;
       } else {
         pQueryInfo->order.order = pSortorder->a[0].sortOrder;
@@ -3989,13 +4498,13 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
       }
 
       tVariant* pVar2 = &pSortorder->a[1].pVar;
-      SSQLToken cname = {pVar2->nLen, pVar2->nType, pVar2->pz};
-      if (getColumnIndexByName(&cname, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      SStrToken cname = {pVar2->nLen, pVar2->nType, pVar2->pz};
+      if (getColumnIndexByName(pCmd, &cname, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
       if (index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       } else {
         pQueryInfo->order.order = pSortorder->a[1].sortOrder;
         pQueryInfo->order.orderColId = PRIMARYKEY_TIMESTAMP_COL_INDEX;
@@ -4003,12 +4512,12 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
     }
 
   } else {  // meter query
-    if (getColumnIndexByName(&columnName, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    if (getColumnIndexByName(pCmd, &columnName, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     if (index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX && !isTopBottomQuery(pQueryInfo)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
 
     if (isTopBottomQuery(pQueryInfo)) {
@@ -4017,8 +4526,8 @@ int32_t parseOrderbyClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql, SSchema
       assert(pExpr->functionId == TSDB_FUNC_TS);
 
       pExpr = tscSqlExprGet(pQueryInfo, 1);
-      if (pExpr->colInfo.colIdx != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      if (pExpr->colInfo.colIndex != index.columnIndex && index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       pQueryInfo->order.order = pQuerySql->pSortOrder->a[0].sortOrder;
@@ -4036,248 +4545,300 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
   const int32_t DEFAULT_TABLE_INDEX = 0;
 
   const char* msg1 = "invalid table name";
-  const char* msg2 = "table name too long";
   const char* msg3 = "manipulation of tag available for super table";
   const char* msg4 = "set tag value only available for table";
   const char* msg5 = "only support add one tag";
   const char* msg6 = "column can only be modified by super table";
+  
+  const char* msg7 = "no tags can be dropped";
+  const char* msg8 = "only support one tag";
+  const char* msg9 = "tag name too long";
+  
+  const char* msg10 = "invalid tag name";
+  const char* msg11 = "primary tag cannot be dropped";
+  const char* msg12 = "update normal column not supported";
+  const char* msg13 = "invalid tag value";
+  const char* msg14 = "tag value too long";
+  
+  const char* msg15 = "no columns can be dropped";
+  const char* msg16 = "only support one column";
+  const char* msg17 = "invalid column name";
+  const char* msg18 = "primary timestamp column cannot be dropped";
+  const char* msg19 = "invalid new tag name";
 
   SSqlCmd*        pCmd = &pSql->cmd;
   SAlterTableSQL* pAlterSQL = pInfo->pAlterInfo;
   SQueryInfo*     pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, DEFAULT_TABLE_INDEX);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, DEFAULT_TABLE_INDEX);
 
   if (tscValidateName(&(pAlterSQL->name)) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (setMeterID(pMeterMetaInfo, &(pAlterSQL->name), pSql) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+  if (tscSetTableFullName(pTableMetaInfo, &(pAlterSQL->name), pSql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  int32_t ret = tscGetMeterMeta(pSql, pMeterMetaInfo);
+  int32_t ret = tscGetTableMeta(pSql, pTableMetaInfo);
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
 
-  SMeterMeta* pMeterMeta = pMeterMetaInfo->pMeterMeta;
+  STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
 
   if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN ||
       pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
-    if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
-  } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) && (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo))) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+  } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) && (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo))) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
   } else if ((pAlterSQL->type == TSDB_ALTER_TABLE_ADD_COLUMN || pAlterSQL->type == TSDB_ALTER_TABLE_DROP_COLUMN) &&
-             UTIL_METER_IS_CREATE_FROM_METRIC(pMeterMetaInfo)) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+             UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
   }
 
   if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
     tFieldList* pFieldList = pAlterSQL->pAddColumns;
     if (pFieldList->nField > 1) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
     }
 
     if (!validateOneTags(pCmd, &pFieldList->p[0])) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
-
-    tscFieldInfoSetValFromField(&pQueryInfo->fieldsInfo, 0, &pFieldList->p[0]);
+  
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &pFieldList->p[0]);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN) {
-    const char* msg1 = "no tags can be dropped";
-    const char* msg2 = "only support one tag";
-    const char* msg3 = "tag name too long";
-    const char* msg4 = "illegal tag name";
-    const char* msg5 = "primary tag cannot be dropped";
-
-    if (pMeterMeta->numOfTags == 1) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    if (tscGetNumOfTags(pTableMeta) == 1) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
     }
 
     // numOfTags == 1
     if (pAlterSQL->varList->nExpr > 1) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
     }
 
     tVariantListItem* pItem = &pAlterSQL->varList->a[0];
-    if (pItem->pVar.nLen > TSDB_COL_NAME_LEN) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    if (pItem->pVar.nLen >= TSDB_COL_NAME_LEN) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
     }
 
     SColumnIndex index = COLUMN_INDEX_INITIALIZER;
-    SSQLToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen, .type = TK_STRING};
+    SStrToken    name = {.z = pItem->pVar.pz, .n = pItem->pVar.nLen, .type = TK_STRING};
 
-    if (getColumnIndexByName(&name, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (getColumnIndexByName(pCmd, &name, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    if (index.columnIndex < pMeterMeta->numOfColumns) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-    } else if (index.columnIndex == 0) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+    int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+    if (index.columnIndex < numOfCols) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg10);
+    } else if (index.columnIndex == numOfCols) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg11);
     }
 
     char name1[128] = {0};
     strncpy(name1, pItem->pVar.pz, pItem->pVar.nLen);
-    tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_INT, name1,
-                         tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+  
+    TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
-    const char* msg1 = "tag name too long";
-    const char* msg2 = "invalid tag name";
-
     tVariantList* pVarList = pAlterSQL->varList;
     if (pVarList->nExpr > 2) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     tVariantListItem* pSrcItem = &pAlterSQL->varList->a[0];
     tVariantListItem* pDstItem = &pAlterSQL->varList->a[1];
 
     if (pSrcItem->pVar.nLen >= TSDB_COL_NAME_LEN || pDstItem->pVar.nLen >= TSDB_COL_NAME_LEN) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
     }
 
     if (pSrcItem->pVar.nType != TSDB_DATA_TYPE_BINARY || pDstItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg10);
     }
 
     SColumnIndex srcIndex = COLUMN_INDEX_INITIALIZER;
     SColumnIndex destIndex = COLUMN_INDEX_INITIALIZER;
 
-    SSQLToken srcToken = {.z = pSrcItem->pVar.pz, .n = pSrcItem->pVar.nLen, .type = TK_STRING};
-    if (getColumnIndexByName(&srcToken, pQueryInfo, &srcIndex) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    SStrToken srcToken = {.z = pSrcItem->pVar.pz, .n = pSrcItem->pVar.nLen, .type = TK_STRING};
+    if (getColumnIndexByName(pCmd, &srcToken, pQueryInfo, &srcIndex) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg17);
     }
 
-    SSQLToken destToken = {.z = pDstItem->pVar.pz, .n = pDstItem->pVar.nLen, .type = TK_STRING};
-    if (getColumnIndexByName(&destToken, pQueryInfo, &destIndex) == TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    SStrToken destToken = {.z = pDstItem->pVar.pz, .n = pDstItem->pVar.nLen, .type = TK_STRING};
+    if (getColumnIndexByName(pCmd, &destToken, pQueryInfo, &destIndex) == TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg19);
     }
 
-    char name[128] = {0};
+    char name[TSDB_COL_NAME_LEN] = {0};
     strncpy(name, pVarList->a[0].pVar.pz, pVarList->a[0].pVar.nLen);
-    tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_INT, name, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
 
     memset(name, 0, tListLen(name));
     strncpy(name, pVarList->a[1].pVar.pz, pVarList->a[1].pVar.nLen);
-    tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 1, TSDB_DATA_TYPE_INT, name, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    f = tscCreateField(TSDB_DATA_TYPE_INT, name, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
-    const char* msg1 = "invalid tag value";
-    const char* msg2 = "update normal column not supported";
-    const char* msg3 = "tag value too long";
-
     // Note: update can only be applied to table not super table.
-    // the following is handle display tags value for meters created according to super table
+    // the following is used to handle tags value for table created according to super table
+    pCmd->command = TSDB_SQL_UPDATE_TAGS_VAL;
+    
     tVariantList* pVarList = pAlterSQL->varList;
     tVariant*     pTagName = &pVarList->a[0].pVar;
+    int16_t       numOfTags = tscGetNumOfTags(pTableMeta);
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SSQLToken    name = {.type = TK_STRING, .z = pTagName->pz, .n = pTagName->nLen};
-    if (getColumnIndexByName(&name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    SStrToken    name = {.type = TK_STRING, .z = pTagName->pz, .n = pTagName->nLen};
+    if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    if (columnIndex.columnIndex < pMeterMeta->numOfColumns) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    if (columnIndex.columnIndex < tscGetNumOfColumns(pTableMeta)) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg12);
     }
 
-    SSchema* pTagsSchema = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, columnIndex.columnIndex);
-    if (tVariantDump(&pVarList->a[1].pVar, pAlterSQL->tagData.data /*pCmd->payload*/, pTagsSchema->type) !=
-        TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    SSchema* pTagsSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, columnIndex.columnIndex);
+    if (tVariantDump(&pVarList->a[1].pVar, pAlterSQL->tagData.data, pTagsSchema->type, true) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg13);
     }
+    
+    pAlterSQL->tagData.dataLen = pTagsSchema->bytes;
 
     // validate the length of binary
     if ((pTagsSchema->type == TSDB_DATA_TYPE_BINARY || pTagsSchema->type == TSDB_DATA_TYPE_NCHAR) &&
-        pVarList->a[1].pVar.nLen > pTagsSchema->bytes) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+        (pVarList->a[1].pVar.nLen + VARSTR_HEADER_SIZE) > pTagsSchema->bytes) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg14);
     }
 
-    char name1[128] = {0};
-    strncpy(name1, pTagName->pz, pTagName->nLen);
-    tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_INT, name1,
-                         tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    int32_t schemaLen = sizeof(STColumn) * numOfTags;
+    int32_t size = sizeof(SUpdateTableTagValMsg) + pTagsSchema->bytes + schemaLen + TSDB_EXTRA_PAYLOAD_SIZE;
 
+    if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
+      tscError("%p failed to malloc for alter table msg", pSql);
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+
+    SUpdateTableTagValMsg* pUpdateMsg = (SUpdateTableTagValMsg*) pCmd->payload;
+    pUpdateMsg->head.vgId = htonl(pTableMeta->vgroupInfo.vgId);
+    pUpdateMsg->tid       = htonl(pTableMeta->id.tid);
+    pUpdateMsg->uid       = htobe64(pTableMeta->id.uid);
+    pUpdateMsg->colId     = htons(pTagsSchema->colId);
+    pUpdateMsg->type      = pTagsSchema->type;
+    pUpdateMsg->bytes     = htons(pTagsSchema->bytes);
+    pUpdateMsg->tversion  = htons(pTableMeta->tversion);
+    pUpdateMsg->numOfTags = htons(numOfTags);
+    pUpdateMsg->schemaLen = htonl(schemaLen);
+
+    // the schema is located after the msg body, then followed by true tag value
+    char* d = pUpdateMsg->data;
+    SSchema* pTagCols = tscGetTableTagSchema(pTableMeta);
+    for (int i = 0; i < numOfTags; ++i) {
+      STColumn* pCol = (STColumn*) d;
+      pCol->colId = htons(pTagCols[i].colId);
+      pCol->bytes = htons(pTagCols[i].bytes);
+      pCol->type  = pTagCols[i].type;
+      pCol->offset = 0;
+
+      d += sizeof(STColumn);
+    }
+
+    // copy the tag value to msg body
+    tVariantDump(&pVarList->a[1].pVar, pUpdateMsg->data + schemaLen, pTagsSchema->type, true);
+    
+    int32_t len = 0;
+    if (pTagsSchema->type != TSDB_DATA_TYPE_BINARY && pTagsSchema->type != TSDB_DATA_TYPE_NCHAR) {
+      len = tDataTypeDesc[pTagsSchema->type].nSize;
+    } else {
+      len = varDataTLen(pUpdateMsg->data + schemaLen);
+    }
+    
+    pUpdateMsg->tagValLen = htonl(len);  // length may be changed after dump data
+    
+    int32_t total = sizeof(SUpdateTableTagValMsg) + len + schemaLen;
+    pUpdateMsg->head.contLen = htonl(total);
+    
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_COLUMN) {
     tFieldList* pFieldList = pAlterSQL->pAddColumns;
     if (pFieldList->nField > 1) {
       const char* msg = "only support add one column";
-      return invalidSqlErrMsg(pQueryInfo->msg, msg);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
     }
 
     if (!validateOneColumn(pCmd, &pFieldList->p[0])) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
-
-    tscFieldInfoSetValFromField(&pQueryInfo->fieldsInfo, 0, &pFieldList->p[0]);
+  
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &pFieldList->p[0]);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
-    const char* msg1 = "no columns can be dropped";
-    const char* msg2 = "only support one column";
-    const char* msg4 = "illegal column name";
-    const char* msg3 = "primary timestamp column cannot be dropped";
-
-    if (pMeterMeta->numOfColumns == TSDB_MIN_COLUMNS) {  //
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    if (tscGetNumOfColumns(pTableMeta) == TSDB_MIN_COLUMNS) {  //
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg15);
     }
 
     if (pAlterSQL->varList->nExpr > 1) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg16);
     }
 
     tVariantListItem* pItem = &pAlterSQL->varList->a[0];
 
     SColumnIndex columnIndex = COLUMN_INDEX_INITIALIZER;
-    SSQLToken    name = {.type = TK_STRING, .z = pItem->pVar.pz, .n = pItem->pVar.nLen};
-    if (getColumnIndexByName(&name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+    SStrToken    name = {.type = TK_STRING, .z = pItem->pVar.pz, .n = pItem->pVar.nLen};
+    if (getColumnIndexByName(pCmd, &name, pQueryInfo, &columnIndex) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg17);
     }
 
     if (columnIndex.columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg18);
     }
 
-    char name1[128] = {0};
-    strncpy(name1, pItem->pVar.pz, pItem->pVar.nLen);
-    tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_INT, name1,
-                         tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    char name1[TSDB_COL_NAME_LEN] = {0};
+    tstrncpy(name1, pItem->pVar.pz, sizeof(name1));
+    TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t validateSqlFunctionInStreamSql(SQueryInfo* pQueryInfo) {
+int32_t validateSqlFunctionInStreamSql(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg0 = "sample interval can not be less than 10ms.";
   const char* msg1 = "functions not allowed in select clause";
 
-  if (pQueryInfo->nAggTimeInterval != 0 && pQueryInfo->nAggTimeInterval < 10) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+  if (pQueryInfo->interval.interval != 0 && pQueryInfo->interval.interval < 10 &&
+     pQueryInfo->interval.intervalUnit != 'n' &&
+     pQueryInfo->interval.intervalUnit != 'y') {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
   }
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  for (int32_t i = 0; i < size; ++i) {
     int32_t functId = tscSqlExprGet(pQueryInfo, i)->functionId;
     if (!IS_STREAM_QUERY_VALID(aAggs[functId].nStatus)) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t validateFunctionsInIntervalOrGroupbyQuery(SQueryInfo* pQueryInfo) {
+int32_t validateFunctionsInIntervalOrGroupbyQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   bool        isProjectionFunction = false;
   const char* msg1 = "column projection is not compatible with interval";
 
   // multi-output set/ todo refactor
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  
+  for (int32_t k = 0; k < size; ++k) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, k);
 
     // projection query on primary timestamp, the selectivity function needs to be present.
     if (pExpr->functionId == TSDB_FUNC_PRJ && pExpr->colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
       bool hasSelectivity = false;
-      for (int32_t j = 0; j < pQueryInfo->fieldsInfo.numOfOutputCols; ++j) {
+      for (int32_t j = 0; j < size; ++j) {
         SSqlExpr* pEx = tscSqlExprGet(pQueryInfo, j);
         if ((aAggs[pEx->functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) == TSDB_FUNCSTATE_SELECTIVITY) {
           hasSelectivity = true;
@@ -4290,17 +4851,17 @@ int32_t validateFunctionsInIntervalOrGroupbyQuery(SQueryInfo* pQueryInfo) {
       }
     }
 
-    if (pExpr->functionId == TSDB_FUNC_PRJ || pExpr->functionId == TSDB_FUNC_DIFF ||
+    if ((pExpr->functionId == TSDB_FUNC_PRJ && pExpr->numOfParams == 0) || pExpr->functionId == TSDB_FUNC_DIFF ||
         pExpr->functionId == TSDB_FUNC_ARITHM) {
       isProjectionFunction = true;
     }
   }
 
   if (isProjectionFunction) {
-    invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  return isProjectionFunction == true ? TSDB_CODE_INVALID_SQL : TSDB_CODE_SUCCESS;
+  return isProjectionFunction == true ? TSDB_CODE_TSC_INVALID_SQL : TSDB_CODE_SUCCESS;
 }
 
 typedef struct SDNodeDynConfOption {
@@ -4308,46 +4869,86 @@ typedef struct SDNodeDynConfOption {
   int32_t len;   // name string length
 } SDNodeDynConfOption;
 
+
+int32_t validateEp(char* ep) {  
+  char buf[TSDB_EP_LEN + 1] = {0};
+  tstrncpy(buf, ep, TSDB_EP_LEN);
+
+  char* pos = strchr(buf, ':');
+  if (NULL == pos) {
+    int32_t val = strtol(ep, NULL, 10);
+    if (val <= 0 || val > 65536) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  } else {
+    uint16_t port = atoi(pos + 1);
+    if (0 == port) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t validateDNodeConfig(tDCLSQL* pOptions) {
   if (pOptions->nTokens < 2 || pOptions->nTokens > 3) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  const SDNodeDynConfOption DNODE_DYNAMIC_CFG_OPTIONS[14] = {
-      {"resetLog", 8},      {"resetQueryCache", 15}, {"dDebugFlag", 10},       {"rpcDebugFlag", 12},
-      {"tmrDebugFlag", 12}, {"cDebugFlag", 10},      {"uDebugFlag", 10},       {"mDebugFlag", 10},
-      {"sdbDebugFlag", 12}, {"httpDebugFlag", 13},   {"monitorDebugFlag", 16}, {"qDebugflag", 10},
-      {"debugFlag", 9},     {"monitor", 7}};
+  const int tokenLogEnd = 2;
+  const int tokenBalance = 2;
+  const int tokenMonitor = 3;
+  const int tokenDebugFlag = 4;
+  const int tokenDebugFlagEnd = 20;
+  const SDNodeDynConfOption cfgOptions[] = {
+      {"resetLog", 8},    {"resetQueryCache", 15},  {"balance", 7},     {"monitor", 7},
+      {"debugFlag", 9},   {"monitorDebugFlag", 16}, {"vDebugFlag", 10}, {"mDebugFlag", 10},
+      {"cDebugFlag", 10}, {"httpDebugFlag", 13},    {"qDebugflag", 10}, {"sdbDebugFlag", 12},
+      {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
+      {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
+      {"cqDebugFlag", 11},
+  };
 
-  SSQLToken* pOptionToken = &pOptions->a[1];
+  SStrToken* pOptionToken = &pOptions->a[1];
 
   if (pOptions->nTokens == 2) {
     // reset log and reset query cache does not need value
-    for (int32_t i = 0; i < 2; ++i) {
-      const SDNodeDynConfOption* pOption = &DNODE_DYNAMIC_CFG_OPTIONS[i];
+    for (int32_t i = 0; i < tokenLogEnd; ++i) {
+      const SDNodeDynConfOption* pOption = &cfgOptions[i];
       if ((strncasecmp(pOption->name, pOptionToken->z, pOptionToken->n) == 0) && (pOption->len == pOptionToken->n)) {
         return TSDB_CODE_SUCCESS;
       }
     }
-  } else if ((strncasecmp(DNODE_DYNAMIC_CFG_OPTIONS[13].name, pOptionToken->z, pOptionToken->n) == 0) &&
-             (DNODE_DYNAMIC_CFG_OPTIONS[13].len == pOptionToken->n)) {
-    SSQLToken* pValToken = &pOptions->a[2];
+  } else if ((strncasecmp(cfgOptions[tokenBalance].name, pOptionToken->z, pOptionToken->n) == 0) &&
+             (cfgOptions[tokenBalance].len == pOptionToken->n)) {
+    SStrToken* pValToken = &pOptions->a[2];
+    int32_t vnodeId = 0;
+    int32_t dnodeId = 0;
+    strdequote(pValToken->z);
+    bool parseOk = taosCheckBalanceCfgOptions(pValToken->z, &vnodeId, &dnodeId);
+    if (!parseOk) {
+      return TSDB_CODE_TSC_INVALID_SQL;  // options value is invalid
+    }
+    return TSDB_CODE_SUCCESS;
+  } else if ((strncasecmp(cfgOptions[tokenMonitor].name, pOptionToken->z, pOptionToken->n) == 0) &&
+             (cfgOptions[tokenMonitor].len == pOptionToken->n)) {
+    SStrToken* pValToken = &pOptions->a[2];
     int32_t    val = strtol(pValToken->z, NULL, 10);
     if (val != 0 && val != 1) {
-      return TSDB_CODE_INVALID_SQL;  // options value is invalid
+      return TSDB_CODE_TSC_INVALID_SQL;  // options value is invalid
     }
     return TSDB_CODE_SUCCESS;
   } else {
-    SSQLToken* pValToken = &pOptions->a[2];
+    SStrToken* pValToken = &pOptions->a[2];
 
     int32_t val = strtol(pValToken->z, NULL, 10);
-    if (val < 131 || val > 199) {
+    if (val < 0 || val > 256) {
       /* options value is out of valid range */
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    for (int32_t i = 2; i < tListLen(DNODE_DYNAMIC_CFG_OPTIONS) - 1; ++i) {
-      const SDNodeDynConfOption* pOption = &DNODE_DYNAMIC_CFG_OPTIONS[i];
+    for (int32_t i = tokenDebugFlag; i < tokenDebugFlagEnd; ++i) {
+      const SDNodeDynConfOption* pOption = &cfgOptions[i];
 
       if ((strncasecmp(pOption->name, pOptionToken->z, pOptionToken->n) == 0) && (pOption->len == pOptionToken->n)) {
         /* options is valid */
@@ -4356,18 +4957,18 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
     }
   }
 
-  return TSDB_CODE_INVALID_SQL;
+  return TSDB_CODE_TSC_INVALID_SQL;
 }
 
 int32_t validateLocalConfig(tDCLSQL* pOptions) {
   if (pOptions->nTokens < 1 || pOptions->nTokens > 2) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   SDNodeDynConfOption LOCAL_DYNAMIC_CFG_OPTIONS[6] = {{"resetLog", 8},    {"rpcDebugFlag", 12}, {"tmrDebugFlag", 12},
                                                       {"cDebugFlag", 10}, {"uDebugFlag", 10},   {"debugFlag", 9}};
 
-  SSQLToken* pOptionToken = &pOptions->a[0];
+  SStrToken* pOptionToken = &pOptions->a[0];
 
   if (pOptions->nTokens == 1) {
     // reset log does not need value
@@ -4378,12 +4979,12 @@ int32_t validateLocalConfig(tDCLSQL* pOptions) {
       }
     }
   } else {
-    SSQLToken* pValToken = &pOptions->a[1];
+    SStrToken* pValToken = &pOptions->a[1];
 
     int32_t val = strtol(pValToken->z, NULL, 10);
     if (val < 131 || val > 199) {
       // options value is out of valid range
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     for (int32_t i = 1; i < tListLen(LOCAL_DYNAMIC_CFG_OPTIONS); ++i) {
@@ -4394,36 +4995,35 @@ int32_t validateLocalConfig(tDCLSQL* pOptions) {
       }
     }
   }
-  return TSDB_CODE_INVALID_SQL;
+  return TSDB_CODE_TSC_INVALID_SQL;
 }
 
 int32_t validateColumnName(char* name) {
-  bool ret = isKeyWord(name, strlen(name));
+  bool ret = isKeyWord(name, (int32_t)strlen(name));
   if (ret) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  SSQLToken token = {.z = name};
+  SStrToken token = {.z = name};
   token.n = tSQLGetToken(name, &token.type);
 
   if (token.type != TK_STRING && token.type != TK_ID) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   if (token.type == TK_STRING) {
     strdequote(token.z);
-    strtrim(token.z);
-    token.n = (uint32_t)strlen(token.z);
+    token.n = (uint32_t)strtrim(token.z);
 
     int32_t k = tSQLGetToken(token.z, &token.type);
     if (k != token.n) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     return validateColumnName(token.z);
   } else {
     if (isNumber(&token)) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
@@ -4435,64 +5035,53 @@ bool hasTimestampForPointInterpQuery(SQueryInfo* pQueryInfo) {
     return true;
   }
 
-  return (pQueryInfo->stime == pQueryInfo->etime) && (pQueryInfo->stime != 0);
+  return (pQueryInfo->window.skey == pQueryInfo->window.ekey) && (pQueryInfo->window.skey != 0);
 }
 
-int32_t parseLimitClause(SQueryInfo* pQueryInfo, int32_t clauseIndex, SQuerySQL* pQuerySql, SSqlObj* pSql) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+int32_t parseLimitClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t clauseIndex, SQuerySQL* pQuerySql, SSqlObj* pSql) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   const char* msg0 = "soffset/offset can not be less than 0";
   const char* msg1 = "slimit/soffset only available for STable query";
-  const char* msg2 = "function not supported on table";
+  const char* msg2 = "functions mixed up in table query";
   const char* msg3 = "slimit/soffset can not apply to projection query";
-  
+
   // handle the limit offset value, validate the limit
   pQueryInfo->limit = pQuerySql->limit;
   pQueryInfo->clauseLimit = pQueryInfo->limit.limit;
-
   pQueryInfo->slimit = pQuerySql->slimit;
-
+  
+  tscDebug("%p limit:%" PRId64 ", offset:%" PRId64 " slimit:%" PRId64 ", soffset:%" PRId64, pSql, pQueryInfo->limit.limit,
+      pQueryInfo->limit.offset, pQueryInfo->slimit.limit, pQueryInfo->slimit.offset);
+  
   if (pQueryInfo->slimit.offset < 0 || pQueryInfo->limit.offset < 0) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg0);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
   }
 
   if (pQueryInfo->limit.limit == 0) {
-    tscTrace("%p limit 0, no output result", pSql);
+    tscDebug("%p limit 0, no output result", pSql);
     pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
     return TSDB_CODE_SUCCESS;
   }
 
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    bool queryOnTags = false;
-    if (tscQueryOnlyMetricTags(pQueryInfo, &queryOnTags) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
-    }
-
-    if (queryOnTags == true) {  // local handle the metric tag query
-      pQueryInfo->command = TSDB_SQL_RETRIEVE_TAGS;
-    } else {
+  // todo refactor
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    if (!tscQueryTags(pQueryInfo)) {  // local handle the super table tag query
       if (tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
         if (pQueryInfo->slimit.limit > 0 || pQueryInfo->slimit.offset > 0) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
-  
-        if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-//        if (pQueryInfo->order.orderColId >= 0) {
-//          if (pQueryInfo->limit.limit == -1) {
-//            return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-//          } else if (pQueryInfo->limit.limit > 10000) { // the result set can not be larger than 10000
-//            //todo use global config parameter
-//            return invalidSqlErrMsg(pQueryInfo->msg, msg5);
-//          }
-//        }
-    
-          pQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY; // for projection query on super table, all queries are subqueries
+
+        // for projection query on super table, all queries are subqueries
+        if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) &&
+            !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_QUERY)) {
+          pQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;
         }
       }
     }
 
     if (pQueryInfo->slimit.limit == 0) {
-      tscTrace("%p limit 0, no output result", pSql);
+      tscDebug("%p slimit 0, no output result", pSql);
       pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
       return TSDB_CODE_SUCCESS;
     }
@@ -4503,22 +5092,22 @@ int32_t parseLimitClause(SQueryInfo* pQueryInfo, int32_t clauseIndex, SQuerySQL*
      * And then launching multiple async-queries against all qualified virtual nodes, during the first-stage
      * query operation.
      */
-    int32_t code = tscGetMetricMeta(pSql, clauseIndex);
+    int32_t code = tscGetSTableVgroupInfo(pSql, clauseIndex);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
 
     // No tables included. No results generated. Query results are empty.
-    SMetricMeta* pMetricMeta = pMeterMetaInfo->pMetricMeta;
-    if (pMeterMetaInfo->pMeterMeta == NULL || pMetricMeta == NULL || pMetricMeta->numOfMeters == 0) {
-      tscTrace("%p no table in metricmeta, no output result", pSql);
+    if (pTableMetaInfo->vgroupList->numOfVgroups == 0) {
+      tscDebug("%p no table in super table, no output result", pSql);
       pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+      return TSDB_CODE_SUCCESS;
     }
 
     // keep original limitation value in globalLimit
     pQueryInfo->clauseLimit = pQueryInfo->limit.limit;
     pQueryInfo->prjOffset = pQueryInfo->limit.offset;
-    
+
     if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
       /*
        * the limitation/offset value should be removed during retrieve data from virtual node,
@@ -4528,27 +5117,37 @@ int32_t parseLimitClause(SQueryInfo* pQueryInfo, int32_t clauseIndex, SQuerySQL*
       if (pQueryInfo->limit.limit > 0) {
         pQueryInfo->limit.limit = -1;
       }
-      
+
       pQueryInfo->limit.offset = 0;
     }
   } else {
     if (pQueryInfo->slimit.limit != -1 || pQueryInfo->slimit.offset != 0) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
-
+  
+    size_t size = taosArrayGetSize(pQueryInfo->exprList);
+    
+    bool hasTags = false;
+    bool hasOtherFunc = false;
     // filter the query functions operating on "tbname" column that are not supported by normal columns.
-    for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+    for (int32_t i = 0; i < size; ++i) {
       SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-      if (pExpr->colInfo.colIdx == TSDB_TBNAME_COLUMN_INDEX) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      if (TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {
+        hasTags = true;
+      } else {
+        hasOtherFunc = true;
       }
     }
+    
+    if (hasTags && hasOtherFunc) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+    }
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
+static int32_t setKeepOption(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
   const char* msg = "invalid number of options";
 
   pMsg->daysToKeep = htonl(-1);
@@ -4559,17 +5158,17 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* p
   if (pKeep != NULL) {
     switch (pKeep->nExpr) {
       case 1:
-        pMsg->daysToKeep = htonl(pKeep->a[0].pVar.i64Key);
+        pMsg->daysToKeep = htonl((int32_t)pKeep->a[0].pVar.i64Key);
         break;
       case 2: {
-        pMsg->daysToKeep = htonl(pKeep->a[0].pVar.i64Key);
-        pMsg->daysToKeep1 = htonl(pKeep->a[1].pVar.i64Key);
+        pMsg->daysToKeep = htonl((int32_t)pKeep->a[0].pVar.i64Key);
+        pMsg->daysToKeep1 = htonl((int32_t)pKeep->a[1].pVar.i64Key);
         break;
       }
       case 3: {
-        pMsg->daysToKeep = htonl(pKeep->a[0].pVar.i64Key);
-        pMsg->daysToKeep1 = htonl(pKeep->a[1].pVar.i64Key);
-        pMsg->daysToKeep2 = htonl(pKeep->a[2].pVar.i64Key);
+        pMsg->daysToKeep = htonl((int32_t)pKeep->a[0].pVar.i64Key);
+        pMsg->daysToKeep1 = htonl((int32_t)pKeep->a[1].pVar.i64Key);
+        pMsg->daysToKeep2 = htonl((int32_t)pKeep->a[2].pVar.i64Key);
         break;
       }
       default: { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); }
@@ -4579,12 +5178,12 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* p
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t setTimePrecisionOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDbInfo) {
+static int32_t setTimePrecision(SSqlCmd* pCmd, SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDbInfo) {
   const char* msg = "invalid time precision";
 
   pMsg->precision = TSDB_TIME_PRECISION_MILLI;  // millisecond by default
 
-  SSQLToken* pToken = &pCreateDbInfo->precision;
+  SStrToken* pToken = &pCreateDbInfo->precision;
   if (pToken->n > 0) {
     pToken->n = strdequote(pToken->z);
 
@@ -4603,92 +5202,95 @@ static int32_t setTimePrecisionOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreate
   return TSDB_CODE_SUCCESS;
 }
 
-static void setCreateDBOption(SCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
-  pMsg->blocksPerMeter = htons(pCreateDb->numOfBlocksPerTable);
-  pMsg->compression = pCreateDb->compressionLevel;
-
-  pMsg->commitLog = (char)pCreateDb->commitLog;
-  pMsg->commitTime = htonl(pCreateDb->commitTime);
-  pMsg->maxSessions = htonl(pCreateDb->tablesPerVnode);
-  pMsg->cacheNumOfBlocks.fraction = pCreateDb->numOfAvgCacheBlocks;
+static void setCreateDBOption(SCMCreateDbMsg* pMsg, SCreateDBInfo* pCreateDb) {
+  pMsg->maxTables = htonl(-1);  // max tables can not be set anymore
   pMsg->cacheBlockSize = htonl(pCreateDb->cacheBlockSize);
-  pMsg->rowsInFileBlock = htonl(pCreateDb->rowPerFileBlock);
+  pMsg->totalBlocks = htonl(pCreateDb->numOfBlocks);
   pMsg->daysPerFile = htonl(pCreateDb->daysPerFile);
+  pMsg->commitTime = htonl((int32_t)pCreateDb->commitTime);
+  pMsg->minRowsPerFileBlock = htonl(pCreateDb->minRowsPerBlock);
+  pMsg->maxRowsPerFileBlock = htonl(pCreateDb->maxRowsPerBlock);
+  pMsg->fsyncPeriod = htonl(pCreateDb->fsyncPeriod);
+  pMsg->compression = pCreateDb->compressionLevel;
+  pMsg->walLevel = (char)pCreateDb->walLevel;
   pMsg->replications = pCreateDb->replica;
+  pMsg->quorum = pCreateDb->quorum;
+  pMsg->ignoreExist = pCreateDb->ignoreExists;
 }
 
 int32_t parseCreateDBOptions(SSqlCmd* pCmd, SCreateDBInfo* pCreateDbSql) {
-  SCreateDbMsg* pMsg = (SCreateDbMsg*)(pCmd->payload + tsRpcHeadSize + sizeof(SMgmtHead));
+  SCMCreateDbMsg* pMsg = (SCMCreateDbMsg*)(pCmd->payload);
   setCreateDBOption(pMsg, pCreateDbSql);
 
   if (setKeepOption(pCmd, pMsg, pCreateDbSql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  if (setTimePrecisionOption(pCmd, pMsg, pCreateDbSql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (setTimePrecision(pCmd, pMsg, pCreateDbSql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   if (tscCheckCreateDbParams(pCmd, pMsg) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-void tscAddTimestampColumn(SQueryInfo* pQueryInfo, int16_t functionId, int16_t tableIndex) {
-  // the first column not timestamp column, add it
-  SSqlExpr* pExpr = NULL;
-  if (pQueryInfo->exprsInfo.numOfExprs > 0) {
-    pExpr = tscSqlExprGet(pQueryInfo, 0);
-  }
-
-  if (pExpr == NULL || pExpr->colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX || pExpr->functionId != functionId) {
-    SColumnIndex index = {tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX};
-
-    pExpr = tscSqlExprInsert(pQueryInfo, 0, functionId, &index, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, TSDB_KEYSIZE);
-    pExpr->colInfo.flag = TSDB_COL_NORMAL;
-
-    // NOTE: tag column does not add to source column list
-    SColumnList ids = getColumnList(1, tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX);
-
-    insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, "ts");
-  }
-}
+//void tscAddTimestampColumn(SQueryInfo* pQueryInfo, int16_t functionId, int16_t tableIndex) {
+//  // the first column not timestamp column, add it
+//  SSqlExpr* pExpr = NULL;
+//  if (tscSqlExprNumOfExprs(pQueryInfo) > 0) {
+//    pExpr = tscSqlExprGet(pQueryInfo, 0);
+//  }
+//
+//  if (pExpr == NULL || pExpr->colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX || pExpr->functionId != functionId) {
+//    SColumnIndex index = {tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX};
+//
+//    pExpr = tscSqlExprInsert(pQueryInfo, 0, functionId, &index, TSDB_DATA_TYPE_TIMESTAMP, TSDB_KEYSIZE, TSDB_KEYSIZE, false);
+//    pExpr->colInfo.flag = TSDB_COL_NORMAL;
+//
+//    // NOTE: tag column does not add to source column list
+//    SColumnList ids = getColumnList(1, tableIndex, PRIMARYKEY_TIMESTAMP_COL_INDEX);
+//
+//    insertResultField(pQueryInfo, 0, &ids, TSDB_KEYSIZE, TSDB_DATA_TYPE_TIMESTAMP, "ts", pExpr);
+//  }
+//}
 
 void addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t subClauseIndex, int32_t tableIndex) {
   SQueryInfo* pParentQueryInfo = tscGetQueryInfoDetail(&pParentObj->cmd, subClauseIndex);
 
   if (pParentQueryInfo->groupbyExpr.numOfGroupCols > 0) {
     SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, subClauseIndex);
-    int32_t     num = pQueryInfo->exprsInfo.numOfExprs;
-
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, num - 1);
+    size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, (int32_t)size - 1);
 
     if (pExpr->functionId != TSDB_FUNC_TAG) {
-      SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
-      int16_t         columnInfo = tscGetJoinTagColIndexByUid(&pQueryInfo->tagCond, pMeterMetaInfo->pMeterMeta->uid);
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
+      int16_t         columnInfo = tscGetJoinTagColIdByUid(&pQueryInfo->tagCond, pTableMetaInfo->pTableMeta->id.uid);
       SColumnIndex    index = {.tableIndex = 0, .columnIndex = columnInfo};
-      SSchema*        pSchema = tsGetTagSchema(pMeterMetaInfo->pMeterMeta);
+      SSchema*        pSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
 
       int16_t type = pSchema[index.columnIndex].type;
       int16_t bytes = pSchema[index.columnIndex].bytes;
       char*   name = pSchema[index.columnIndex].name;
-
-      pExpr = tscSqlExprInsert(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, TSDB_FUNC_TAG, &index, type, bytes,
-                               bytes);
+  
+      pExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TAG, &index, type, bytes, bytes, true);
       pExpr->colInfo.flag = TSDB_COL_TAG;
 
       // NOTE: tag column does not add to source column list
       SColumnList ids = {0};
-      insertResultField(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, &ids, bytes, type, name);
+      insertResultField(pQueryInfo, (int32_t)size, &ids, bytes, (int8_t)type, name, pExpr);
 
       int32_t relIndex = index.columnIndex;
 
-      pExpr->colInfo.colIdx = relIndex;
-      pQueryInfo->groupbyExpr.columnInfo[0].colIdx = relIndex;
+      pExpr->colInfo.colIndex = relIndex;
+      SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, 0);
+      pColIndex->colIndex = relIndex;
 
-      addRequiredTagColumn(pQueryInfo, pQueryInfo->groupbyExpr.columnInfo[0].colIdx, 0);
+      index = (SColumnIndex) {.tableIndex = tableIndex, .columnIndex = relIndex};
+      tscColumnListInsert(pTableMetaInfo->tagColList, &index);
     }
   }
 }
@@ -4696,37 +5298,35 @@ void addGroupInfoForSubquery(SSqlObj* pParentObj, SSqlObj* pSql, int32_t subClau
 // limit the output to be 1 for each state value
 static void doLimitOutputNormalColOfGroupby(SSqlExpr* pExpr) {
   int32_t outputRow = 1;
-  tVariantCreateFromBinary(&pExpr->param[0], (char*) &outputRow, sizeof(int32_t), TSDB_DATA_TYPE_INT);
+  tVariantCreateFromBinary(&pExpr->param[0], (char*)&outputRow, sizeof(int32_t), TSDB_DATA_TYPE_INT);
   pExpr->numOfParams = 1;
 }
 
 void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex) {
-  int32_t index = pQueryInfo->groupbyExpr.columnInfo[tagIndex].colIdx;
+  SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, tagIndex);
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  SSchema*     pSchema = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, index);
-  SColumnIndex colIndex = {.tableIndex = 0, .columnIndex = index};
+  SSchema*     pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pColIndex->colIndex);
+  SColumnIndex colIndex = {.tableIndex = 0, .columnIndex = pColIndex->colIndex};
 
-  SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, TSDB_FUNC_PRJ, &colIndex,
-                                     pSchema->type, pSchema->bytes, pSchema->bytes);
+  tscAddSpecialColumnForSelect(pQueryInfo, (int32_t)size, TSDB_FUNC_PRJ, &colIndex, pSchema, TSDB_COL_NORMAL);
 
-  pExpr->colInfo.flag = TSDB_COL_NORMAL;
-  doLimitOutputNormalColOfGroupby(pExpr);
-  
-  // NOTE: tag column does not add to source column list
-  SColumnList list = {0};
-  list.num = 1;
-  list.ids[0] = colIndex;
-
-  insertResultField(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, &list, pSchema->bytes, pSchema->type,
-                    pSchema->name);
-  tscFieldInfoUpdateVisible(&pQueryInfo->fieldsInfo, pQueryInfo->fieldsInfo.numOfOutputCols - 1, false);
+  SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, (int32_t)size);
+  doLimitOutputNormalColOfGroupby(pInfo->pSqlExpr);
+  pInfo->visible = false;
 }
 
 static void doUpdateSqlFunctionForTagPrj(SQueryInfo* pQueryInfo) {
   int32_t tagLength = 0;
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+
+//todo is 0??
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  bool isSTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
+
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId == TSDB_FUNC_TAGPRJ || pExpr->functionId == TSDB_FUNC_TAG) {
       pExpr->functionId = TSDB_FUNC_TAG_DUMMY;
@@ -4737,26 +5337,31 @@ static void doUpdateSqlFunctionForTagPrj(SQueryInfo* pQueryInfo) {
     }
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  SSchema*        pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-    if (pExpr->functionId != TSDB_FUNC_TAG_DUMMY && pExpr->functionId != TSDB_FUNC_TS_DUMMY) {
-      SSchema* pColSchema = &pSchema[pExpr->colInfo.colIdx];
-      getResultDataInfo(pColSchema->type, pColSchema->bytes, pExpr->functionId, pExpr->param[0].i64Key, &pExpr->resType,
-                        &pExpr->resBytes, &pExpr->interResBytes, tagLength, true);
+    if ((pExpr->functionId != TSDB_FUNC_TAG_DUMMY && pExpr->functionId != TSDB_FUNC_TS_DUMMY) &&
+       !(pExpr->functionId == TSDB_FUNC_PRJ && TSDB_COL_IS_UD_COL(pExpr->colInfo.flag))) {
+      SSchema* pColSchema = &pSchema[pExpr->colInfo.colIndex];
+      getResultDataInfo(pColSchema->type, pColSchema->bytes, pExpr->functionId, (int32_t)pExpr->param[0].i64Key, &pExpr->resType,
+                        &pExpr->resBytes, &pExpr->interBytes, tagLength, isSTable);
     }
   }
 }
 
-static void doUpdateSqlFunctionForColPrj(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+static int32_t doUpdateSqlFunctionForColPrj(SQueryInfo* pQueryInfo) {
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-    if (pExpr->functionId == TSDB_FUNC_PRJ) {
+
+    if (pExpr->functionId == TSDB_FUNC_PRJ && (!TSDB_COL_IS_UD_COL(pExpr->colInfo.flag) && (pExpr->colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX))) {
       bool qualifiedCol = false;
       for (int32_t j = 0; j < pQueryInfo->groupbyExpr.numOfGroupCols; ++j) {
-        if (pExpr->colInfo.colId == pQueryInfo->groupbyExpr.columnInfo[j].colId) {
+        SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, j);
+  
+        if (pExpr->colInfo.colId == pColIndex->colId) {
           qualifiedCol = true;
           doLimitOutputNormalColOfGroupby(pExpr);
           pExpr->numOfParams = 1;
@@ -4764,14 +5369,21 @@ static void doUpdateSqlFunctionForColPrj(SQueryInfo* pQueryInfo) {
         }
       }
 
-      assert(qualifiedCol);
+      // it is not a tag column/tbname column/user-defined column, return error
+      if (!qualifiedCol) {
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
     }
   }
+
+  return TSDB_CODE_SUCCESS;
 }
 
 static bool tagColumnInGroupby(SSqlGroupbyExpr* pGroupbyExpr, int16_t columnId) {
   for (int32_t j = 0; j < pGroupbyExpr->numOfGroupCols; ++j) {
-    if (columnId == pGroupbyExpr->columnInfo[j].colId && pGroupbyExpr->columnInfo[j].flag == TSDB_COL_TAG) {
+    SColIndex* pColIndex = taosArrayGet(pGroupbyExpr->columnInfo, j);
+  
+    if (columnId == pColIndex->colId && TSDB_COL_IS_TAG(pColIndex->flag )) {
       return true;
     }
   }
@@ -4782,8 +5394,9 @@ static bool tagColumnInGroupby(SSqlGroupbyExpr* pGroupbyExpr, int16_t columnId)
 static bool onlyTagPrjFunction(SQueryInfo* pQueryInfo) {
   bool hasTagPrj = false;
   bool hasColumnPrj = false;
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId == TSDB_FUNC_PRJ) {
       hasColumnPrj = true;
@@ -4799,7 +5412,8 @@ static bool onlyTagPrjFunction(SQueryInfo* pQueryInfo) {
 static bool allTagPrjInGroupby(SQueryInfo* pQueryInfo) {
   bool allInGroupby = true;
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId != TSDB_FUNC_TAGPRJ) {
       continue;
@@ -4816,7 +5430,9 @@ static bool allTagPrjInGroupby(SQueryInfo* pQueryInfo) {
 }
 
 static void updateTagPrjFunction(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  size_t size = taosArrayGetSize(pQueryInfo->exprList);
+  
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId == TSDB_FUNC_TAGPRJ) {
       pExpr->functionId = TSDB_FUNC_TAG;
@@ -4830,25 +5446,28 @@ static void updateTagPrjFunction(SQueryInfo* pQueryInfo) {
  * 2. if selectivity function and tagprj function both exist, there should be only
  *    one selectivity function exists.
  */
-static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo) {
+static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, SSqlCmd* pCmd) {
   const char* msg1 = "only one selectivity function allowed in presence of tags function";
   const char* msg3 = "aggregation function should not be mixed up with projection";
 
-  bool    tagColExists = false;
+  bool    tagTsColExists = false;
   int16_t numOfSelectivity = 0;
   int16_t numOfAggregation = 0;
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+  size_t numOfExprs = taosArrayGetSize(pQueryInfo->exprList);
+  for (int32_t i = 0; i < numOfExprs; ++i) {
+    SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, i);
     if (pExpr->functionId == TSDB_FUNC_TAGPRJ ||
         (pExpr->functionId == TSDB_FUNC_PRJ && pExpr->colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX)) {
-      tagColExists = true;
+      tagTsColExists = true;  // selectivity + ts/tag column
       break;
     }
   }
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    int16_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
+  for (int32_t i = 0; i < numOfExprs; ++i) {
+    SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, i);
+  
+    int16_t functionId = pExpr->functionId;
     if (functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_TS ||
         functionId == TSDB_FUNC_ARITHM) {
       continue;
@@ -4861,11 +5480,11 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo) {
     }
   }
 
-  if (tagColExists) {  // check if the selectivity function exists
+  if (tagTsColExists) {  // check if the selectivity function exists
     // When the tag projection function on tag column that is not in the group by clause, aggregation function and
     // selectivity function exist in select clause is not allowed.
     if (numOfAggregation > 0) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     /*
@@ -4873,36 +5492,50 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo) {
      */
     if (numOfSelectivity == 1) {
       doUpdateSqlFunctionForTagPrj(pQueryInfo);
-      doUpdateSqlFunctionForColPrj(pQueryInfo);
+      int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+
     } else if (numOfSelectivity > 1) {
       /*
        * If more than one selectivity functions exist, all the selectivity functions must be last_row.
        * Otherwise, return with error code.
        */
-      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-        int16_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
-        if (functionId == TSDB_FUNC_TAGPRJ) {
+      for (int32_t i = 0; i < numOfExprs; ++i) {
+        SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+        int16_t functionId = pExpr->functionId;
+        if (functionId == TSDB_FUNC_TAGPRJ || (aAggs[functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) == 0) {
           continue;
         }
 
-        if (((aAggs[functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) && (functionId != TSDB_FUNC_LAST_ROW)) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+        if ((functionId == TSDB_FUNC_LAST_ROW) ||
+             (functionId == TSDB_FUNC_LAST_DST && (pExpr->colInfo.flag & TSDB_COL_NULL) != 0)) {
+          // do nothing
+        } else {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
         }
       }
 
       doUpdateSqlFunctionForTagPrj(pQueryInfo);
-      doUpdateSqlFunctionForColPrj(pQueryInfo);
+      int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
     }
   } else {
-    if ((pQueryInfo->type & TSDB_QUERY_TYPE_PROJECTION_QUERY) == TSDB_QUERY_TYPE_PROJECTION_QUERY) {
+    if ((pQueryInfo->type & TSDB_QUERY_TYPE_PROJECTION_QUERY) != 0) {
       if (numOfAggregation > 0 && pQueryInfo->groupbyExpr.numOfGroupCols == 0) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
       }
 
       if (numOfAggregation > 0 || numOfSelectivity > 0) {
         // clear the projection type flag
         pQueryInfo->type &= (~TSDB_QUERY_TYPE_PROJECTION_QUERY);
-        doUpdateSqlFunctionForColPrj(pQueryInfo);
+        int32_t code = doUpdateSqlFunctionForColPrj(pQueryInfo);
+        if (code != TSDB_CODE_SUCCESS) {
+          return code;
+        }
       }
     }
   }
@@ -4910,52 +5543,60 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t doAddGroupbyColumnsOnDemand(SQueryInfo* pQueryInfo) {
+static int32_t doAddGroupbyColumnsOnDemand(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg2 = "interval not allowed in group by normal column";
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+  SSchema s = tGetTableNameColumnSchema();
+  SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
   int16_t  bytes = 0;
   int16_t  type = 0;
   char*    name = NULL;
 
   for (int32_t i = 0; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
-    SColIndexEx* pColIndex = &pQueryInfo->groupbyExpr.columnInfo[i];
-
-    int16_t colIndex = pColIndex->colIdx;
-    if (pColIndex->colIdx == TSDB_TBNAME_COLUMN_INDEX) {
-      type = TSDB_DATA_TYPE_BINARY;
-      bytes = TSDB_METER_NAME_LEN;
-      name = TSQL_TBNAME_L;
+    SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, i);
+    int16_t colIndex = pColIndex->colIndex;
+    if (colIndex == TSDB_TBNAME_COLUMN_INDEX) {
+      type  = s.type;
+      bytes = s.bytes;
+      name  = s.name;
     } else {
-      colIndex = (TSDB_COL_IS_TAG(pColIndex->flag)) ? pMeterMetaInfo->pMeterMeta->numOfColumns + pColIndex->colIdx
-                                                    : pColIndex->colIdx;
-
-      type = pSchema[colIndex].type;
-      bytes = pSchema[colIndex].bytes;
-      name = pSchema[colIndex].name;
+      if (TSDB_COL_IS_TAG(pColIndex->flag)) {
+        SSchema* tagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+        
+        type  = tagSchema[colIndex].type;
+        bytes = tagSchema[colIndex].bytes;
+        name  = tagSchema[colIndex].name;
+      } else {
+        type  = pSchema[colIndex].type;
+        bytes = pSchema[colIndex].bytes;
+        name  = pSchema[colIndex].name;
+      }
     }
-
+  
+    size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
     if (TSDB_COL_IS_TAG(pColIndex->flag)) {
       SColumnIndex index = {.tableIndex = pQueryInfo->groupbyExpr.tableIndex, .columnIndex = colIndex};
-
-      SSqlExpr* pExpr = tscSqlExprInsert(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, TSDB_FUNC_TAG, &index,
-                                         type, bytes, bytes);
-
+      SSqlExpr* pExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TAG, &index, type, bytes, bytes, true);
+      
+      memset(pExpr->aliasName, 0, sizeof(pExpr->aliasName));
+      tstrncpy(pExpr->aliasName, name, sizeof(pExpr->aliasName));
+      
       pExpr->colInfo.flag = TSDB_COL_TAG;
 
       // NOTE: tag column does not add to source column list
-      SColumnList ids = {0};
-      insertResultField(pQueryInfo, pQueryInfo->fieldsInfo.numOfOutputCols, &ids, bytes, type, name);
+      SColumnList ids = getColumnList(1, 0, pColIndex->colIndex);
+      insertResultField(pQueryInfo, (int32_t)size, &ids, bytes, (int8_t)type, name, pExpr);
     } else {
       // if this query is "group by" normal column, interval is not allowed
-      if (pQueryInfo->nAggTimeInterval > 0) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+      if (pQueryInfo->interval.interval > 0) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
       bool hasGroupColumn = false;
-      for (int32_t j = 0; j < pQueryInfo->fieldsInfo.numOfOutputCols; ++j) {
+      for (int32_t j = 0; j < size; ++j) {
         SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, j);
         if (pExpr->colInfo.colId == pColIndex->colId) {
           break;
@@ -4982,8 +5623,8 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
   const char* msg4 = "retrieve tags not compatible with group by or interval query";
 
   // only retrieve tags, group by is not supportted
-  if (pCmd->command == TSDB_SQL_RETRIEVE_TAGS) {
-    if (pQueryInfo->groupbyExpr.numOfGroupCols > 0 || pQueryInfo->nAggTimeInterval > 0) {
+  if (tscQueryTags(pQueryInfo)) {
+    if (pQueryInfo->groupbyExpr.numOfGroupCols > 0 || pQueryInfo->interval.interval > 0) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
     } else {
       return TSDB_CODE_SUCCESS;
@@ -4994,11 +5635,12 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
     // check if all the tags prj columns belongs to the group by columns
     if (onlyTagPrjFunction(pQueryInfo) && allTagPrjInGroupby(pQueryInfo)) {
       updateTagPrjFunction(pQueryInfo);
-      return doAddGroupbyColumnsOnDemand(pQueryInfo);
+      return doAddGroupbyColumnsOnDemand(pCmd, pQueryInfo);
     }
 
     // check all query functions in selection clause, multi-output functions are not allowed
-    for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+    size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+    for (int32_t i = 0; i < size; ++i) {
       SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
       int32_t   functId = pExpr->functionId;
 
@@ -5009,7 +5651,7 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
       if (functId == TSDB_FUNC_PRJ && pExpr->colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
         bool qualified = false;
         for (int32_t j = 0; j < pQueryInfo->groupbyExpr.numOfGroupCols; ++j) {
-          SColIndexEx* pColIndex = &pQueryInfo->groupbyExpr.columnInfo[j];
+          SColIndex* pColIndex = taosArrayGet(pQueryInfo->groupbyExpr.columnInfo, j);
           if (pColIndex->colId == pExpr->colInfo.colId) {
             qualified = true;
             break;
@@ -5017,56 +5659,55 @@ int32_t doFunctionsCompatibleCheck(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
         }
 
         if (!qualified) {
-          return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
         }
       }
 
       if (IS_MULTIOUTPUT(aAggs[functId].nStatus) && functId != TSDB_FUNC_TOP && functId != TSDB_FUNC_BOTTOM &&
           functId != TSDB_FUNC_TAGPRJ && functId != TSDB_FUNC_PRJ) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
 
-      if (functId == TSDB_FUNC_COUNT && pExpr->colInfo.colIdx == TSDB_TBNAME_COLUMN_INDEX) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+      if (functId == TSDB_FUNC_COUNT && pExpr->colInfo.colIndex == TSDB_TBNAME_COLUMN_INDEX) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
       }
     }
 
-    if (checkUpdateTagPrjFunctions(pQueryInfo) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (checkUpdateTagPrjFunctions(pQueryInfo, pCmd) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     /*
      * group by tag function must be not changed the function name, otherwise, the group operation may fail to
      * divide the subset of final result.
      */
-    if (doAddGroupbyColumnsOnDemand(pQueryInfo) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+    if (doAddGroupbyColumnsOnDemand(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    // projection query on metric does not compatible with "group by" syntax
+    // projection query on super table does not compatible with "group by" syntax
     if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
     return TSDB_CODE_SUCCESS;
   } else {
-    return checkUpdateTagPrjFunctions(pQueryInfo);
+    return checkUpdateTagPrjFunctions(pQueryInfo, pCmd);
   }
 }
-
-int32_t doLocalQueryProcess(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
+int32_t doLocalQueryProcess(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
   const char* msg1 = "only one expression allowed";
   const char* msg2 = "invalid expression in select clause";
   const char* msg3 = "invalid function";
 
   tSQLExprList* pExprList = pQuerySql->pSelection;
   if (pExprList->nExpr != 1) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
   tSQLExpr* pExpr = pExprList->a[0].pNode;
   if (pExpr->operand.z == NULL) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
   // TODO redefine the function
@@ -5085,60 +5726,57 @@ int32_t doLocalQueryProcess(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
     }
   }
 
-  SSqlExpr* pExpr1 = tscSqlExprInsertEmpty(pQueryInfo, 0, TSDB_FUNC_TAG_DUMMY);
-  if (pExprList->a[0].aliasName != NULL) {
-    strncpy(pExpr1->aliasName, pExprList->a[0].aliasName, tListLen(pExpr1->aliasName));
-  } else {
-    strncpy(pExpr1->aliasName, functionsInfo[index].name, tListLen(pExpr1->aliasName));
-  }
-
   switch (index) {
     case 0:
-      pQueryInfo->command = TSDB_SQL_CURRENT_DB;
-      return TSDB_CODE_SUCCESS;
+      pQueryInfo->command = TSDB_SQL_CURRENT_DB;break;
     case 1:
-      pQueryInfo->command = TSDB_SQL_SERV_VERSION;
-      return TSDB_CODE_SUCCESS;
-    case 2:
-      pQueryInfo->command = TSDB_SQL_SERV_STATUS;
-      return TSDB_CODE_SUCCESS;
+      pQueryInfo->command = TSDB_SQL_SERV_VERSION;break;
+      case 2:
+      pQueryInfo->command = TSDB_SQL_SERV_STATUS;break;
     case 3:
-      pQueryInfo->command = TSDB_SQL_CLI_VERSION;
-      return TSDB_CODE_SUCCESS;
+      pQueryInfo->command = TSDB_SQL_CLI_VERSION;break;
     case 4:
-      pQueryInfo->command = TSDB_SQL_CURRENT_USER;
-      return TSDB_CODE_SUCCESS;
-    default: { return invalidSqlErrMsg(pQueryInfo->msg, msg3); }
+      pQueryInfo->command = TSDB_SQL_CURRENT_USER;break;
+    default: { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3); }
   }
+  
+  SColumnIndex ind = {0};
+  SSqlExpr* pExpr1 = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TAG_DUMMY, &ind, TSDB_DATA_TYPE_INT,
+                                      tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize, false);
+  
+  const char* name = (pExprList->a[0].aliasName != NULL)? pExprList->a[0].aliasName:functionsInfo[index].name;
+  tstrncpy(pExpr1->aliasName, name, tListLen(pExpr1->aliasName));
+  
+  return TSDB_CODE_SUCCESS;
 }
 
 // can only perform the parameters based on the macro definitation
-int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
+int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCMCreateDbMsg* pCreate) {
   char msg[512] = {0};
 
-  if (pCreate->commitLog != -1 && (pCreate->commitLog < 0 || pCreate->commitLog > 1)) {
-    snprintf(msg, tListLen(msg), "invalid db option commitLog: %d, only 0 or 1 allowed", pCreate->commitLog);
+  if (pCreate->walLevel != -1 && (pCreate->walLevel < TSDB_MIN_WAL_LEVEL || pCreate->walLevel > TSDB_MAX_WAL_LEVEL)) {
+    snprintf(msg, tListLen(msg), "invalid db option walLevel: %d, only 1-2 allowed", pCreate->walLevel);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
   if (pCreate->replications != -1 &&
-      (pCreate->replications < TSDB_REPLICA_MIN_NUM || pCreate->replications > TSDB_REPLICA_MAX_NUM)) {
+      (pCreate->replications < TSDB_MIN_DB_REPLICA_OPTION || pCreate->replications > TSDB_MAX_DB_REPLICA_OPTION)) {
     snprintf(msg, tListLen(msg), "invalid db option replications: %d valid range: [%d, %d]", pCreate->replications,
-             TSDB_REPLICA_MIN_NUM, TSDB_REPLICA_MAX_NUM);
+             TSDB_MIN_DB_REPLICA_OPTION, TSDB_MAX_DB_REPLICA_OPTION);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  int32_t val = htonl(pCreate->daysPerFile);
-  if (val != -1 && (val < TSDB_FILE_MIN_PARTITION_RANGE || val > TSDB_FILE_MAX_PARTITION_RANGE)) {
-    snprintf(msg, tListLen(msg), "invalid db option daysPerFile: %d valid range: [%d, %d]", val,
-             TSDB_FILE_MIN_PARTITION_RANGE, TSDB_FILE_MAX_PARTITION_RANGE);
+  if (pCreate->quorum != -1 &&
+      (pCreate->quorum < TSDB_MIN_DB_REPLICA_OPTION || pCreate->quorum > TSDB_MAX_DB_REPLICA_OPTION)) {
+    snprintf(msg, tListLen(msg), "invalid db option quorum: %d valid range: [%d, %d]", pCreate->quorum,
+             TSDB_MIN_DB_REPLICA_OPTION, TSDB_MAX_DB_REPLICA_OPTION);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  val = htonl(pCreate->rowsInFileBlock);
-  if (val != -1 && (val < TSDB_MIN_ROWS_IN_FILEBLOCK || val > TSDB_MAX_ROWS_IN_FILEBLOCK)) {
-    snprintf(msg, tListLen(msg), "invalid db option rowsInFileBlock: %d valid range: [%d, %d]", val,
-             TSDB_MIN_ROWS_IN_FILEBLOCK, TSDB_MAX_ROWS_IN_FILEBLOCK);
+  int32_t val = htonl(pCreate->daysPerFile);
+  if (val != -1 && (val < TSDB_MIN_DAYS_PER_FILE || val > TSDB_MAX_DAYS_PER_FILE)) {
+    snprintf(msg, tListLen(msg), "invalid db option daysPerFile: %d valid range: [%d, %d]", val,
+             TSDB_MIN_DAYS_PER_FILE, TSDB_MAX_DAYS_PER_FILE);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
@@ -5149,10 +5787,10 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  val = htonl(pCreate->maxSessions);
-  if (val != -1 && (val < TSDB_MIN_TABLES_PER_VNODE || val > TSDB_MAX_TABLES_PER_VNODE)) {
+  val = htonl(pCreate->maxTables);
+  if (val != -1 && (val < TSDB_MIN_TABLES || val > TSDB_MAX_TABLES)) {
     snprintf(msg, tListLen(msg), "invalid db option maxSessions: %d valid range: [%d, %d]", val,
-             TSDB_MIN_TABLES_PER_VNODE, TSDB_MAX_TABLES_PER_VNODE);
+             TSDB_MIN_TABLES, TSDB_MAX_TABLES);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
@@ -5162,24 +5800,24 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  if (pCreate->cacheNumOfBlocks.fraction != -1 && (pCreate->cacheNumOfBlocks.fraction < TSDB_MIN_AVG_BLOCKS ||
-                                                   pCreate->cacheNumOfBlocks.fraction > TSDB_MAX_AVG_BLOCKS)) {
-    snprintf(msg, tListLen(msg), "invalid db option ablocks: %f valid value: [%d, %d]",
-             pCreate->cacheNumOfBlocks.fraction, TSDB_MIN_AVG_BLOCKS, TSDB_MAX_AVG_BLOCKS);
+  val = htonl(pCreate->commitTime);
+  if (val != -1 && (val < TSDB_MIN_COMMIT_TIME || val > TSDB_MAX_COMMIT_TIME)) {
+    snprintf(msg, tListLen(msg), "invalid db option commitTime: %d valid range: [%d, %d]", val,
+             TSDB_MIN_COMMIT_TIME, TSDB_MAX_COMMIT_TIME);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  val = htonl(pCreate->commitTime);
-  if (val != -1 && (val < TSDB_MIN_COMMIT_TIME_INTERVAL || val > TSDB_MAX_COMMIT_TIME_INTERVAL)) {
-    snprintf(msg, tListLen(msg), "invalid db option commitTime: %d valid range: [%d, %d]", val,
-             TSDB_MIN_COMMIT_TIME_INTERVAL, TSDB_MAX_COMMIT_TIME_INTERVAL);
+  val = htonl(pCreate->fsyncPeriod);
+  if (val != -1 && (val < TSDB_MIN_FSYNC_PERIOD || val > TSDB_MAX_FSYNC_PERIOD)) {
+    snprintf(msg, tListLen(msg), "invalid db option fsyncPeriod: %d valid range: [%d, %d]", val,
+             TSDB_MIN_FSYNC_PERIOD, TSDB_MAX_FSYNC_PERIOD);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
   if (pCreate->compression != -1 &&
-      (pCreate->compression < TSDB_MIN_COMPRESSION_LEVEL || pCreate->compression > TSDB_MAX_COMPRESSION_LEVEL)) {
+      (pCreate->compression < TSDB_MIN_COMP_LEVEL || pCreate->compression > TSDB_MAX_COMP_LEVEL)) {
     snprintf(msg, tListLen(msg), "invalid db option compression: %d valid range: [%d, %d]", pCreate->compression,
-             TSDB_MIN_COMPRESSION_LEVEL, TSDB_MAX_COMPRESSION_LEVEL);
+             TSDB_MIN_COMP_LEVEL, TSDB_MAX_COMP_LEVEL);
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
@@ -5190,42 +5828,43 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
 void tscPrintSelectClause(SSqlObj* pSql, int32_t subClauseIndex) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, subClauseIndex);
 
-  if (pQueryInfo->exprsInfo.numOfExprs == 0) {
+  int32_t size = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+  if (size == 0) {
     return;
   }
 
   int32_t totalBufSize = 1024;
-  
-  char str[1024] = {0};
+
+  char    str[1024] = {0};
   int32_t offset = 0;
 
-  offset += sprintf(str, "num:%d [", pQueryInfo->exprsInfo.numOfExprs);
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
+  offset += sprintf(str, "num:%d [", size);
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
 
     char    tmpBuf[1024] = {0};
-    int32_t tmpLen       = 0;
-    tmpLen = sprintf(tmpBuf, "%s(uid:%" PRId64 ", %d)", aAggs[pExpr->functionId].aName, pExpr->uid, pExpr->colInfo.colId);
+    int32_t tmpLen = 0;
+    tmpLen =
+        sprintf(tmpBuf, "%s(uid:%" PRId64 ", %d)", aAggs[pExpr->functionId].aName, pExpr->uid, pExpr->colInfo.colId);
     if (tmpLen + offset > totalBufSize) break;
 
     offset += sprintf(str + offset, "%s", tmpBuf);
-    
-    if (i < pQueryInfo->exprsInfo.numOfExprs - 1) {
+
+    if (i < size - 1) {
       str[offset++] = ',';
     }
   }
 
   str[offset] = ']';
-  tscTrace("%p select clause:%s", pSql, str);
+  tscDebug("%p select clause:%s", pSql, str);
 }
 
 int32_t doCheckForCreateTable(SSqlObj* pSql, int32_t subClauseIndex, SSqlInfo* pInfo) {
   const char* msg1 = "invalid table name";
-  const char* msg2 = "table name too long";
 
   SSqlCmd*        pCmd = &pSql->cmd;
   SQueryInfo*     pQueryInfo = tscGetQueryInfoDetail(pCmd, subClauseIndex);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   SCreateTableSQL* pCreateTable = pInfo->pCreateTableInfo;
 
@@ -5235,31 +5874,31 @@ int32_t doCheckForCreateTable(SSqlObj* pSql, int32_t subClauseIndex, SSqlInfo* p
   assert(pFieldList != NULL);
 
   // if sql specifies db, use it, otherwise use default db
-  SSQLToken* pzTableName = &(pCreateTable->name);
+  SStrToken* pzTableName = &(pCreateTable->name);
 
   if (tscValidateName(pzTableName) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (setMeterID(pMeterMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
+  if (tscSetTableFullName(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   if (!validateTableColumnInfo(pFieldList, pCmd) ||
       (pTagList != NULL && !validateTagParams(pTagList, pFieldList, pCmd))) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   int32_t col = 0;
   for (; col < pFieldList->nField; ++col) {
-    tscFieldInfoSetValFromField(&pQueryInfo->fieldsInfo, col, &pFieldList->p[col]);
+    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &pFieldList->p[col]);
   }
 
   pCmd->numOfCols = (int16_t)pFieldList->nField;
 
-  if (pTagList != NULL) {  // create metric[optional]
+  if (pTagList != NULL) {  // create super table[optional]
     for (int32_t i = 0; i < pTagList->nField; ++i) {
-      tscFieldInfoSetValFromField(&pQueryInfo->fieldsInfo, col++, &pTagList->p[i]);
+      tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &pTagList->p[i]);
     }
 
     pCmd->count = pTagList->nField;
@@ -5280,64 +5919,98 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   SQueryInfo*      pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
   // two table: the first one is for current table, and the secondary is for the super table.
-  tscAddEmptyMeterMetaInfo(pQueryInfo);
-  assert(pQueryInfo->numOfTables == 2);
+  if (pQueryInfo->numOfTables < 2) {
+    tscAddEmptyMetaInfo(pQueryInfo);
+  }
 
   const int32_t TABLE_INDEX = 0;
   const int32_t STABLE_INDEX = 1;
 
-  SMeterMetaInfo* pStableMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, STABLE_INDEX);
+  STableMetaInfo* pStableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
 
   // super table name, create table by using dst
-  SSQLToken* pToken = &(pCreateTable->usingInfo.stableName);
+  SStrToken* pToken = &(pCreateTable->usingInfo.stableName);
 
   if (tscValidateName(pToken) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (setMeterID(pStableMeterMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  if (tscSetTableFullName(pStableMeterMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   // get meter meta from mnode
-  strncpy(pCreateTable->usingInfo.tagdata.name, pStableMeterMetaInfo->name, TSDB_METER_ID_LEN);
+  tstrncpy(pCreateTable->usingInfo.tagdata.name, pStableMeterMetaInfo->name, sizeof(pCreateTable->usingInfo.tagdata.name));
   tVariantList* pList = pInfo->pCreateTableInfo->usingInfo.pTagVals;
 
-  int32_t code = tscGetMeterMeta(pSql, pStableMeterMetaInfo);
+  int32_t code = tscGetTableMeta(pSql, pStableMeterMetaInfo);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }
 
-  if (pStableMeterMetaInfo->pMeterMeta->numOfTags != pList->nExpr) {
+  if (tscGetNumOfTags(pStableMeterMetaInfo->pTableMeta) != pList->nExpr) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
   }
 
   // too long tag values will return invalid sql, not be truncated automatically
-  SSchema* pTagSchema = tsGetTagSchema(pStableMeterMetaInfo->pMeterMeta);
+  SSchema* pTagSchema = tscGetTableTagSchema(pStableMeterMetaInfo->pTableMeta);
+
+  STagData* pTag = &pCreateTable->usingInfo.tagdata;
+  SKVRowBuilder kvRowBuilder = {0};
+  if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  char* tagVal = pCreateTable->usingInfo.tagdata.data;
+  int32_t ret = TSDB_CODE_SUCCESS;
   for (int32_t i = 0; i < pList->nExpr; ++i) {
-    int32_t ret = tVariantDump(&(pList->a[i].pVar), tagVal, pTagSchema[i].type);
+    SSchema* pSchema = &pTagSchema[i];
+    
+    char tagVal[TSDB_MAX_TAGS_LEN];
+    if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
+      if (pList->a[i].pVar.nLen > pSchema->bytes) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
+    }
+
+    ret = tVariantDump(&(pList->a[i].pVar), tagVal, pSchema->type, true);
+
+    // check again after the convert since it may be converted from binary to nchar.
+    if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
+      int16_t len = varDataTLen(tagVal);
+      if (len > pSchema->bytes) {
+        tdDestroyKVRowBuilder(&kvRowBuilder);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      }
+    }
+
     if (ret != TSDB_CODE_SUCCESS) {
+      tdDestroyKVRowBuilder(&kvRowBuilder);
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
     }
 
-    // validate the length of binary
-    if ((pTagSchema[i].type == TSDB_DATA_TYPE_BINARY || pTagSchema[i].type == TSDB_DATA_TYPE_NCHAR) &&
-        pList->a[i].pVar.nLen > pTagSchema[i].bytes) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
-    }
 
-    tagVal += pTagSchema[i].bytes;
+
+    tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
+  }
+
+  SKVRow row = tdGetKVRowFromBuilder(&kvRowBuilder);
+  tdDestroyKVRowBuilder(&kvRowBuilder);
+  if (row == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
+  tdSortKVRowByColIdx(row);
+  pTag->dataLen = kvRowLen(row);
+  kvRowCpy(pTag->data, row);
+  free(row);
 
   // table name
   if (tscValidateName(&pInfo->pCreateTableInfo->name) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  SMeterMetaInfo* pTableMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, TABLE_INDEX);
-  int32_t         ret = setMeterID(pTableMeterMetaInfo, &pInfo->pCreateTableInfo->name, pSql);
+  STableMetaInfo* pTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX);
+  ret = tscSetTableFullName(pTableMeterMetaInfo, &pInfo->pCreateTableInfo->name, pSql);
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
@@ -5351,77 +6024,81 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
   const char* msg3 = "fill only available for interval query";
   const char* msg4 = "fill option not supported in stream computing";
   const char* msg5 = "sql too long";  // todo ADD support
-
+  const char* msg6 = "from missing in subclause";
+  
   SSqlCmd*    pCmd = &pSql->cmd;
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
   assert(pQueryInfo->numOfTables == 1);
 
   SCreateTableSQL* pCreateTable = pInfo->pCreateTableInfo;
-  SMeterMetaInfo*  pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo*  pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   // if sql specifies db, use it, otherwise use default db
-  SSQLToken* pzTableName = &(pCreateTable->name);
+  SStrToken* pzTableName = &(pCreateTable->name);
   SQuerySQL* pQuerySql = pCreateTable->pSelect;
 
   if (tscValidateName(pzTableName) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
-
+  
   tVariantList* pSrcMeterName = pInfo->pCreateTableInfo->pSelect->from;
-  tVariant*     pVar = &pSrcMeterName->a[0].pVar;
-
-  SSQLToken srcToken = {.z = pVar->pz, .n = pVar->nLen, .type = TK_STRING};
+  if (pSrcMeterName == NULL || pSrcMeterName->nExpr == 0) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
+  }
+  
+  tVariant* pVar = &pSrcMeterName->a[0].pVar;
+  SStrToken srcToken = {.z = pVar->pz, .n = pVar->nLen, .type = TK_STRING};
   if (tscValidateName(&srcToken) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (setMeterID(pMeterMetaInfo, &srcToken, pSql) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+  if (tscSetTableFullName(pTableMetaInfo, &srcToken, pSql) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
-  int32_t code = tscGetMeterMeta(pSql, pMeterMetaInfo);
+  int32_t code = tscGetTableMeta(pSql, pTableMetaInfo);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }
 
-  bool isSTable = UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
-  if (parseSelectClause(&pSql->cmd, 0, pQuerySql->pSelection, isSTable) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  bool isSTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
+  if (parseSelectClause(&pSql->cmd, 0, pQuerySql->pSelection, isSTable, false) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   if (pQuerySql->pWhere != NULL) {  // query condition in stream computing
     if (parseWhereClause(pQueryInfo, &pQuerySql->pWhere, pSql) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
   // set interval value
-  if (parseIntervalClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (parseIntervalClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   } else {
-    if ((pQueryInfo->nAggTimeInterval > 0) &&
-        (validateFunctionsInIntervalOrGroupbyQuery(pQueryInfo) != TSDB_CODE_SUCCESS)) {
-      return TSDB_CODE_INVALID_SQL;
+    if ((pQueryInfo->interval.interval > 0) &&
+        (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
   }
 
   // set the created table[stream] name
-  if (setMeterID(pMeterMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg1);
+  if (tscSetTableFullName(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
   if (pQuerySql->selectToken.n > TSDB_MAX_SAVED_SQL_LEN) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg5);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
   }
 
-  if (tsRewriteFieldNameIfNecessary(pQueryInfo) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (tsRewriteFieldNameIfNecessary(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
+  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
 
-  if (validateSqlFunctionInStreamSql(pQueryInfo) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  if (validateSqlFunctionInStreamSql(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   /*
@@ -5429,48 +6106,50 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
    * not here.
    */
   if (pQuerySql->fillType != NULL) {
-    if (pQueryInfo->nAggTimeInterval == 0) {
-      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
+    if (pQueryInfo->interval.interval == 0) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
     }
 
     tVariantListItem* pItem = &pQuerySql->fillType->a[0];
     if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
       if (!((strncmp(pItem->pVar.pz, "none", 4) == 0 && pItem->pVar.nLen == 4) ||
             (strncmp(pItem->pVar.pz, "null", 4) == 0 && pItem->pVar.nLen == 4))) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg4);
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4);
       }
     }
   }
 
   // set the number of stream table columns
-  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
+  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   assert(pQuerySql != NULL && (pQuerySql->from == NULL || pQuerySql->from->nExpr > 0));
 
-  const char* msg0 = "invalid table name";
-  const char* msg1 = "table name too long";
-  const char* msg2 = "point interpolation query needs timestamp";
-  const char* msg3 = "sliding value too small";
-  const char* msg4 = "sliding value no larger than the interval value";
-  const char* msg5 = "fill only available for interval query";
-  const char* msg6 = "start(end) time of query range required or time range too large";
-  const char* msg7 = "illegal number of tables in from clause";
-  const char* msg8 = "too many columns in selection clause";
-  const char* msg9 = "TWA query requires both the start and end time";
+  const char* msg0  = "invalid table name";
+  //const char* msg1  = "table name too long";
+  const char* msg2  = "point interpolation query needs timestamp";
+  const char* msg5  = "fill only available for interval query";
+  const char* msg6  = "start(end) time of query range required or time range too large";
+  const char* msg7  = "illegal number of tables in from clause";
+  const char* msg8  = "too many columns in selection clause";
+  const char* msg9  = "TWA query requires both the start and end time";
+  const char* msg10 = "too many tables in from clause";
+  const char* msg11 = "invalid table alias name";
 
   int32_t code = TSDB_CODE_SUCCESS;
 
   SSqlCmd* pCmd = &pSql->cmd;
 
   SQueryInfo*     pQueryInfo = tscGetQueryInfoDetail(pCmd, index);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  if (pMeterMetaInfo == NULL) {
-    pMeterMetaInfo = tscAddEmptyMeterMetaInfo(pQueryInfo);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (pTableMetaInfo == NULL) {
+    pTableMetaInfo = tscAddEmptyMetaInfo(pQueryInfo);
   }
-  
+
+  assert(pCmd->clauseIndex == index);
+
   // too many result columns not support order by in query
   if (pQuerySql->pSelection->nExpr > TSDB_MAX_COLUMNS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg8);
@@ -5486,17 +6165,21 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   if (pQuerySql->from == NULL) {
     assert(pQuerySql->fillType == NULL && pQuerySql->pGroupby == NULL && pQuerySql->pWhere == NULL &&
            pQuerySql->pSortOrder == NULL);
-    return doLocalQueryProcess(pQueryInfo, pQuerySql);
+    return doLocalQueryProcess(pCmd, pQueryInfo, pQuerySql);
   }
 
-  if (pQuerySql->from->nExpr > TSDB_MAX_JOIN_TABLE_NUM) {
+  if (pQuerySql->from->nExpr > TSDB_MAX_JOIN_TABLE_NUM * 2) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg7);
   }
 
   pQueryInfo->command = TSDB_SQL_SELECT;
-  
+
+  if (pQuerySql->from->nExpr > 4) {
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg10);
+  }
+
   // set all query tables, which are maybe more than one.
-  for (int32_t i = 0; i < pQuerySql->from->nExpr; ++i) {
+  for (int32_t i = 0; i < pQuerySql->from->nExpr; ) {
     tVariant* pTableItem = &pQuerySql->from->a[i].pVar;
 
     if (pTableItem->nType != TSDB_DATA_TYPE_BINARY) {
@@ -5505,123 +6188,129 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
 
     pTableItem->nLen = strdequote(pTableItem->pz);
 
-    SSQLToken tableName = {.z = pTableItem->pz, .n = pTableItem->nLen, .type = TK_STRING};
+    SStrToken tableName = {.z = pTableItem->pz, .n = pTableItem->nLen, .type = TK_STRING};
     if (tscValidateName(&tableName) != TSDB_CODE_SUCCESS) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg0);
     }
 
-    if (pQueryInfo->numOfTables <= i) {  // more than one table
-      tscAddEmptyMeterMetaInfo(pQueryInfo);
+    if (pQueryInfo->numOfTables <= i/2) {  // more than one table
+      tscAddEmptyMetaInfo(pQueryInfo);
     }
 
-    SMeterMetaInfo* pMeterInfo1 = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
+    STableMetaInfo* pTableMetaInfo1 = tscGetMetaInfo(pQueryInfo, i/2);
 
-    SSQLToken t = {.type = TSDB_DATA_TYPE_BINARY, .n = pTableItem->nLen, .z = pTableItem->pz};
-    if (setMeterID(pMeterInfo1, &t, pSql) != TSDB_CODE_SUCCESS) {
-      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
+    SStrToken t = {.type = TSDB_DATA_TYPE_BINARY, .n = pTableItem->nLen, .z = pTableItem->pz};
+    if (tscSetTableFullName(pTableMetaInfo1, &t, pSql) != TSDB_CODE_SUCCESS) {
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    code = tscGetMeterMeta(pSql, pMeterInfo1);
-    if (code != TSDB_CODE_SUCCESS) {
-      return code;
+    tVariant* pTableItem1 = &pQuerySql->from->a[i + 1].pVar;
+    SStrToken aliasName = {.z = pTableItem1->pz, .n = pTableItem1->nLen, .type = TK_STRING};
+    if (tscValidateName(&aliasName) != TSDB_CODE_SUCCESS) {
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg11);
     }
-  }
 
-  assert(pQueryInfo->numOfTables == pQuerySql->from->nExpr);
+    // has no table alias name
+    if (memcmp(pTableItem->pz, pTableItem1->pz, pTableItem1->nLen) == 0) {
+      extractTableName(pTableMetaInfo1->name, pTableMetaInfo1->aliasName);
+    } else {
+      tstrncpy(pTableMetaInfo1->aliasName, pTableItem1->pz, sizeof(pTableMetaInfo1->aliasName));
+    }
 
-  // parse the group by clause in the first place
-  if (parseGroupbyClause(pQueryInfo, pQuerySql->pGroupby, pCmd) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
-  }
+    code = tscGetTableMeta(pSql, pTableMetaInfo1);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
 
-  bool isSTable = UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
-  if (parseSelectClause(pCmd, index, pQuerySql->pSelection, isSTable) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+    i += 2;
   }
 
-  // set interval value
-  if (parseIntervalClause(pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
-  } else {
-    if ((pQueryInfo->nAggTimeInterval > 0) &&
-        (validateFunctionsInIntervalOrGroupbyQuery(pQueryInfo) != TSDB_CODE_SUCCESS)) {
-      return TSDB_CODE_INVALID_SQL;
+  assert(pQueryInfo->numOfTables == pQuerySql->from->nExpr / 2);
+  bool isSTable = false;
+  
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    isSTable = true;
+    code = tscGetSTableVgroupInfo(pSql, index);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
     }
+    
+    TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_STABLE_QUERY);
+  } else {
+    TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TABLE_QUERY);
   }
 
-  // set order by info
-  if (parseOrderbyClause(pQueryInfo, pQuerySql, tsGetSchema(pMeterMetaInfo->pMeterMeta)) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_SQL;
+  // parse the group by clause in the first place
+  if (parseGroupbyClause(pQueryInfo, pQuerySql->pGroupby, pCmd) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   // set where info
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+
   if (pQuerySql->pWhere != NULL) {
     if (parseWhereClause(pQueryInfo, &pQuerySql->pWhere, pSql) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     pQuerySql->pWhere = NULL;
-
-    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-      pQueryInfo->stime = pQueryInfo->stime / 1000;
-      pQueryInfo->etime = pQueryInfo->etime / 1000;
+    if (tinfo.precision == TSDB_TIME_PRECISION_MILLI) {
+      pQueryInfo->window.skey = pQueryInfo->window.skey / 1000;
+      pQueryInfo->window.ekey = pQueryInfo->window.ekey / 1000;
     }
   } else {  // set the time rang
-    pQueryInfo->stime = 0;
-    pQueryInfo->etime = INT64_MAX;
+    if (pQuerySql->from->nExpr > 2) { // it is a join query, no wher clause is not allowed.
+      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "condition missing for join query ");
+    }
+  }
+
+  int32_t joinQuery = (pQuerySql->from != NULL && pQuerySql->from->nExpr > 2);
+
+  if (parseSelectClause(pCmd, index, pQuerySql->pSelection, isSTable, joinQuery) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  }
+
+  // set interval value
+  if (parseIntervalClause(pCmd, pQueryInfo, pQuerySql) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
+  } else {
+    if ((pQueryInfo->interval.interval > 0) &&
+        (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+  }
+
+  // set order by info
+  if (parseOrderbyClause(pCmd, pQueryInfo, pQuerySql, tscGetTableSchema(pTableMetaInfo->pTableMeta)) != TSDB_CODE_SUCCESS) {
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   // user does not specified the query time window, twa is not allowed in such case.
-  if ((pQueryInfo->stime == 0 || pQueryInfo->etime == INT64_MAX ||
-       (pQueryInfo->etime == INT64_MAX / 1000 && pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI)) &&
-      tscIsTWAQuery(pQueryInfo)) {
+  if ((pQueryInfo->window.skey == INT64_MIN || pQueryInfo->window.ekey == INT64_MAX ||
+       (pQueryInfo->window.ekey == INT64_MAX / 1000 && tinfo.precision == TSDB_TIME_PRECISION_MILLI)) && tscIsTWAQuery(pQueryInfo)) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg9);
   }
 
   // no result due to invalid query time range
-  if (pQueryInfo->stime > pQueryInfo->etime) {
-    pCmd->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+  if (pQueryInfo->window.skey > pQueryInfo->window.ekey) {
+    pQueryInfo->command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
     return TSDB_CODE_SUCCESS;
   }
 
   if (!hasTimestampForPointInterpQuery(pQueryInfo)) {
-    return invalidSqlErrMsg(pQueryInfo->msg, msg2);
+    return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
-  
-//  // set sliding value, the query time range needs to be decide in the first place
-//  SSQLToken* pSliding = &pQuerySql->sliding;
-//  if (pSliding->n != 0) {
-//    if (!tscEmbedded && pCmd->inStream == 0 && hasDefaultQueryTimeRange(pQueryInfo)) {  // sliding only allowed in stream
-//      const char* msg = "time range expected for sliding window query";
-//      return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
-//    }
-//
-//    getTimestampInUsFromStr(pSliding->z, pSliding->n, &pQueryInfo->nSlidingTime);
-//    if (pMeterMetaInfo->pMeterMeta->precision == TSDB_TIME_PRECISION_MILLI) {
-//      pQueryInfo->nSlidingTime /= 1000;
-//    }
-//
-//    if (pQueryInfo->nSlidingTime < tsMinSlidingTime) {
-//      return invalidSqlErrMsg(pQueryInfo->msg, msg3);
-//    }
-//
-//    if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
-//      return invalidSqlErrMsg(pQueryInfo->msg, msg4);
-//    }
-//  } else {
-//    pQueryInfo->nSlidingTime = -1;
-//  }
 
   // in case of join query, time range is required.
   if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
-    int64_t timeRange = labs(pQueryInfo->stime - pQueryInfo->etime);
+    int64_t timeRange = ABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
 
-    if (timeRange == 0 && pQueryInfo->stime == 0) {
+    if (timeRange == 0 && pQueryInfo->window.skey == 0) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
     }
   }
 
-  if ((code = parseLimitClause(pQueryInfo, index, pQuerySql, pSql)) != TSDB_CODE_SUCCESS) {
+  if ((code = parseLimitClause(pCmd, pQueryInfo, index, pQuerySql, pSql)) != TSDB_CODE_SUCCESS) {
     return code;
   }
 
@@ -5631,28 +6320,29 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
 
   setColumnOffsetValueInResultset(pQueryInfo);
 
-  for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    updateTagColumnIndex(pQueryInfo, i);
-  }
-  
   /*
    * fill options are set at the end position, when all columns are set properly
    * the columns may be increased due to group by operation
    */
   if (pQuerySql->fillType != NULL) {
-    if (pQueryInfo->nAggTimeInterval == 0 && (!tscIsPointInterpQuery(pQueryInfo))) {
+    if (pQueryInfo->interval.interval == 0 && (!tscIsPointInterpQuery(pQueryInfo))) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg5);
     }
-    
-    if (pQueryInfo->nAggTimeInterval > 0) {
-      int64_t timeRange = labs(pQueryInfo->stime - pQueryInfo->etime);
+
+    if (pQueryInfo->interval.interval > 0 && pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
+      bool initialWindows = TSWINDOW_IS_EQUAL(pQueryInfo->window, TSWINDOW_INITIALIZER);
+      if (initialWindows) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
+      }
+
+      int64_t timeRange = ABS(pQueryInfo->window.skey - pQueryInfo->window.ekey);
       // number of result is not greater than 10,000,000
-      if ((timeRange == 0) || (timeRange / pQueryInfo->nAggTimeInterval) > MAX_RETRIEVE_ROWS_IN_INTERVAL_QUERY) {
-        return invalidSqlErrMsg(pQueryInfo->msg, msg6);
+      if ((timeRange == 0) || (timeRange / pQueryInfo->interval.interval) > MAX_INTERVAL_TIME_WINDOW) {
+        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
     }
-    
-    int32_t ret = parseFillClause(pQueryInfo, pQuerySql);
+
+    int32_t ret = parseFillClause(pCmd, pQueryInfo, pQuerySql);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -5661,7 +6351,133 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
   return TSDB_CODE_SUCCESS;  // Does not build query message here
 }
 
-bool hasDefaultQueryTimeRange(SQueryInfo *pQueryInfo) {
-  return (pQueryInfo->stime == 0 && pQueryInfo->etime == INT64_MAX) ||
-         (pQueryInfo->stime == INT64_MAX && pQueryInfo->etime == 0);
-}
\ No newline at end of file
+int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSQLExpr* pSqlExpr, SArray* pExprInfo, SQueryInfo* pQueryInfo, SArray* pCols) {
+  tExprNode* pLeft = NULL;
+  tExprNode* pRight= NULL;
+  
+  if (pSqlExpr->pLeft != NULL) {
+    int32_t ret = exprTreeFromSqlExpr(pCmd, &pLeft, pSqlExpr->pLeft, pExprInfo, pQueryInfo, pCols);
+    if (ret != TSDB_CODE_SUCCESS) {
+      return ret;
+    }
+  }
+  
+  if (pSqlExpr->pRight != NULL) {
+    int32_t ret = exprTreeFromSqlExpr(pCmd, &pRight, pSqlExpr->pRight, pExprInfo, pQueryInfo, pCols);
+    if (ret != TSDB_CODE_SUCCESS) {
+      return ret;
+    }
+  }
+
+  if (pSqlExpr->pLeft == NULL && pSqlExpr->pRight == NULL && pSqlExpr->nSQLOptr == 0) {
+    *pExpr = calloc(1, sizeof(tExprNode));
+    return TSDB_CODE_SUCCESS;
+  }
+  
+  if (pSqlExpr->pLeft == NULL) {
+    if (pSqlExpr->nSQLOptr >= TK_BOOL && pSqlExpr->nSQLOptr <= TK_STRING) {
+      *pExpr = calloc(1, sizeof(tExprNode));
+      (*pExpr)->nodeType = TSQL_NODE_VALUE;
+      (*pExpr)->pVal = calloc(1, sizeof(tVariant));
+      
+      tVariantAssign((*pExpr)->pVal, &pSqlExpr->val);
+      return TSDB_CODE_SUCCESS;
+    } else if (pSqlExpr->nSQLOptr >= TK_COUNT && pSqlExpr->nSQLOptr <= TK_AVG_IRATE) {
+      // arithmetic expression on the results of aggregation functions
+      *pExpr = calloc(1, sizeof(tExprNode));
+      (*pExpr)->nodeType = TSQL_NODE_COL;
+      (*pExpr)->pSchema = calloc(1, sizeof(SSchema));
+      strncpy((*pExpr)->pSchema->name, pSqlExpr->operand.z, pSqlExpr->operand.n);
+      
+      // set the input column data byte and type.
+      size_t size = taosArrayGetSize(pExprInfo);
+      
+      for (int32_t i = 0; i < size; ++i) {
+        SSqlExpr* p1 = taosArrayGetP(pExprInfo, i);
+        
+        if (strcmp((*pExpr)->pSchema->name, p1->aliasName) == 0) {
+          (*pExpr)->pSchema->type = (uint8_t)p1->resType;
+          (*pExpr)->pSchema->bytes = p1->resBytes;
+          break;
+        }
+      }
+    } else if (pSqlExpr->nSQLOptr == TK_ID) { // column name, normal column arithmetic expression
+      SColumnIndex index = {0};
+      int32_t ret = getColumnIndexByName(pCmd, &pSqlExpr->colInfo, pQueryInfo, &index);
+      if (ret != TSDB_CODE_SUCCESS) {
+        return ret;
+      }
+
+      STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
+      int32_t numOfColumns = tscGetNumOfColumns(pTableMeta);
+
+      *pExpr = calloc(1, sizeof(tExprNode));
+      (*pExpr)->nodeType = TSQL_NODE_COL;
+      (*pExpr)->pSchema = calloc(1, sizeof(SSchema));
+
+      SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
+      *(*pExpr)->pSchema = *pSchema;
+  
+      if (pCols != NULL) {  // record the involved columns
+        SColIndex colIndex = {0};
+        tstrncpy(colIndex.name, pSchema->name, sizeof(colIndex.name));
+        colIndex.colId = pSchema->colId;
+        colIndex.colIndex = index.columnIndex;
+        colIndex.flag = (index.columnIndex >= numOfColumns)? 1:0;
+
+        taosArrayPush(pCols, &colIndex);
+      }
+      
+      return TSDB_CODE_SUCCESS;
+    } else {
+      return TSDB_CODE_TSC_INVALID_SQL;
+    }
+    
+  } else {
+    *pExpr = (tExprNode *)calloc(1, sizeof(tExprNode));
+    (*pExpr)->nodeType = TSQL_NODE_EXPR;
+    
+    (*pExpr)->_node.hasPK = false;
+    (*pExpr)->_node.pLeft = pLeft;
+    (*pExpr)->_node.pRight = pRight;
+    
+    SStrToken t = {.type = pSqlExpr->nSQLOptr};
+    (*pExpr)->_node.optr = getBinaryExprOptr(&t);
+    
+    assert((*pExpr)->_node.optr != 0);
+
+    // check for dividing by 0
+    if ((*pExpr)->_node.optr == TSDB_BINARY_OP_DIVIDE) {
+      if (pRight->nodeType == TSQL_NODE_VALUE) {
+        if (pRight->pVal->nType == TSDB_DATA_TYPE_INT && pRight->pVal->i64Key == 0) {
+          return TSDB_CODE_TSC_INVALID_SQL;
+        } else if (pRight->pVal->nType == TSDB_DATA_TYPE_FLOAT && pRight->pVal->dKey == 0) {
+          return TSDB_CODE_TSC_INVALID_SQL;
+        }
+      }
+    }
+
+    // NOTE: binary|nchar data allows the >|< type filter
+    if ((*pExpr)->_node.optr != TSDB_RELATION_EQUAL && (*pExpr)->_node.optr != TSDB_RELATION_NOT_EQUAL) {
+      if (pRight != NULL && pRight->nodeType == TSQL_NODE_VALUE) {
+        if (pRight->pVal->nType == TSDB_DATA_TYPE_BOOL) {
+          return TSDB_CODE_TSC_INVALID_SQL;
+        }
+      }
+    }
+  }
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+bool hasNormalColumnFilter(SQueryInfo* pQueryInfo) {
+  size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumn* pCol = taosArrayGetP(pQueryInfo->colList, i);
+    if (pCol->numOfFilters > 0) {
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/src/client/src/tscSQLParserImpl.c b/src/client/src/tscSQLParserImpl.c
deleted file mode 100644
index 17e1c6f45790acc36c35111aec75e00be227044f..0000000000000000000000000000000000000000
--- a/src/client/src/tscSQLParserImpl.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/*
- * 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 "os.h"
-#include "taosmsg.h"
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tscSQLParser.h"
-#include "tstoken.h"
-#include "ttime.h"
-#include "tutil.h"
-
-int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pStr) {
-  void *pParser = ParseAlloc(malloc);
-  pSQLInfo->valid = true;
-
-  int32_t i = 0;
-  while (1) {
-    SSQLToken t0 = {0};
-
-    if (pStr[i] == 0) {
-      Parse(pParser, 0, t0, pSQLInfo);
-      goto abort_parse;
-    }
-
-    t0.n = tSQLGetToken((char *)&pStr[i], &t0.type);
-    t0.z = (char *)(pStr + i);
-    i += t0.n;
-
-    switch (t0.type) {
-      case TK_SPACE:
-      case TK_COMMENT: {
-        break;
-      }
-      case TK_SEMI: {
-        Parse(pParser, 0, t0, pSQLInfo);
-        goto abort_parse;
-      }
-      case TK_ILLEGAL: {
-        snprintf(pSQLInfo->pzErrMsg, tListLen(pSQLInfo->pzErrMsg), "unrecognized token: \"%s\"", t0.z);
-        pSQLInfo->valid = false;
-        goto abort_parse;
-      }
-      default:
-        Parse(pParser, t0.type, t0, pSQLInfo);
-        if (pSQLInfo->valid == false) {
-          goto abort_parse;
-        }
-    }
-  }
-
-abort_parse:
-  ParseFree(pParser, free);
-  return 0;
-}
-
-tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SSQLToken *pToken) {
-  if (pList == NULL) {
-    pList = calloc(1, sizeof(tSQLExprList));
-  }
-
-  if (pList->nAlloc <= pList->nExpr) {  //
-    pList->nAlloc = (pList->nAlloc << 1) + 4;
-    pList->a = realloc(pList->a, pList->nAlloc * sizeof(pList->a[0]));
-    if (pList->a == 0) {
-      pList->nExpr = pList->nAlloc = 0;
-      return pList;
-    }
-  }
-  assert(pList->a != 0);
-
-  if (pNode || pToken) {
-    struct tSQLExprItem *pItem = &pList->a[pList->nExpr++];
-    memset(pItem, 0, sizeof(*pItem));
-    pItem->pNode = pNode;
-    if (pToken) {  // set the as clause
-      pItem->aliasName = malloc(pToken->n + 1);
-      strncpy(pItem->aliasName, pToken->z, pToken->n);
-      pItem->aliasName[pToken->n] = 0;
-
-      strdequote(pItem->aliasName);
-    }
-  }
-  return pList;
-}
-
-void tSQLExprListDestroy(tSQLExprList *pList) {
-  if (pList == NULL) return;
-
-  for (int32_t i = 0; i < pList->nExpr; ++i) {
-    if (pList->a[i].aliasName != NULL) {
-      free(pList->a[i].aliasName);
-    }
-    tSQLExprDestroy(pList->a[i].pNode);
-  }
-
-  free(pList->a);
-  free(pList);
-}
-
-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(pAliasToken->type);
-
-    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;  // TK_TIMESTAMP used to denote the time value is in microsecond
-  } else if (optrType == TK_VARIABLE) {
-    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 {  // it must be the column name (tk_id) if it is not the number
-    assert(optrType == TK_ID || optrType == TK_ALL);
-    if (pAliasToken != NULL) {
-      nodePtr->colInfo = *pAliasToken;
-    }
-
-    nodePtr->nSQLOptr = optrType;
-  }
-  return nodePtr;
-}
-
-/*
- * pList is the parameters for function with id(optType)
- * function name is denoted by pFunctionToken
- */
-tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SSQLToken *pFuncToken, SSQLToken *endToken, int32_t optType) {
-  if (pFuncToken == NULL) return NULL;
-
-  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
-  pExpr->nSQLOptr = optType;
-  pExpr->pParam = pList;
-
-  int32_t len = (endToken->z + endToken->n) - pFuncToken->z;
-  pExpr->operand.z = pFuncToken->z;
-
-  pExpr->operand.n = len;  // raw field name
-  pExpr->operand.type = pFuncToken->type;
-  return pExpr;
-}
-
-/*
- * create binary expression in this procedure
- * if the expr is arithmetic, calculate the result and set it to tSQLExpr Object
- */
-tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
-  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
-
-  if (optrType == TK_PLUS || optrType == TK_MINUS || optrType == TK_STAR || optrType == TK_DIVIDE ||
-      optrType == TK_REM) {
-    /*
-     * if a token is noted as the TK_TIMESTAMP, the time precision is microsecond
-     * Otherwise, the time precision is adaptive, determined by the time precision from databases.
-     */
-    if ((pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_INTEGER) ||
-        (pLeft->nSQLOptr == TK_TIMESTAMP && pRight->nSQLOptr == TK_TIMESTAMP)) {
-      pExpr->val.nType = TSDB_DATA_TYPE_BIGINT;
-      pExpr->nSQLOptr = pLeft->nSQLOptr;
-
-      switch (optrType) {
-        case TK_PLUS: {
-          pExpr->val.i64Key = pLeft->val.i64Key + pRight->val.i64Key;
-          break;
-        }
-        case TK_MINUS: {
-          pExpr->val.i64Key = pLeft->val.i64Key - pRight->val.i64Key;
-          break;
-        }
-        case TK_STAR: {
-          pExpr->val.i64Key = pLeft->val.i64Key * pRight->val.i64Key;
-          break;
-        }
-        case TK_DIVIDE: {
-          pExpr->nSQLOptr = TK_FLOAT;
-          pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
-          pExpr->val.dKey = (double)pLeft->val.i64Key / pRight->val.i64Key;
-          break;
-        }
-        case TK_REM: {
-          pExpr->val.i64Key = pLeft->val.i64Key % pRight->val.i64Key;
-          break;
-        }
-      }
-
-      tSQLExprDestroy(pLeft);
-      tSQLExprDestroy(pRight);
-
-    } else if ((pLeft->val.nType == TSDB_DATA_TYPE_DOUBLE && pRight->val.nType == TSDB_DATA_TYPE_BIGINT) ||
-               (pRight->val.nType == TSDB_DATA_TYPE_DOUBLE && pLeft->val.nType == TSDB_DATA_TYPE_BIGINT)) {
-      pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
-      pExpr->nSQLOptr = TK_FLOAT;
-
-      double left = pLeft->val.nType == TSDB_DATA_TYPE_DOUBLE ? pLeft->val.dKey : pLeft->val.i64Key;
-      double right = pRight->val.nType == TSDB_DATA_TYPE_DOUBLE ? pRight->val.dKey : pRight->val.i64Key;
-
-      switch (optrType) {
-        case TK_PLUS: {
-          pExpr->val.dKey = left + right;
-          break;
-        }
-        case TK_MINUS: {
-          pExpr->val.dKey = left - right;
-          break;
-        }
-        case TK_STAR: {
-          pExpr->val.dKey = left * right;
-          break;
-        }
-        case TK_DIVIDE: {
-          pExpr->val.dKey = left / right;
-          break;
-        }
-        case TK_REM: {
-          pExpr->val.dKey = left - ((int64_t)(left / right)) * right;
-          break;
-        }
-      }
-
-      tSQLExprDestroy(pLeft);
-      tSQLExprDestroy(pRight);
-
-    } else {
-      pExpr->nSQLOptr = optrType;
-      pExpr->pLeft = pLeft;
-      pExpr->pRight = pRight;
-    }
-  } else if (optrType == TK_IN) {
-    pExpr->nSQLOptr = optrType;
-    pExpr->pLeft = pLeft;
-
-    tSQLExpr *pRSub = calloc(1, sizeof(tSQLExpr));
-    pRSub->nSQLOptr = TK_SET;  // TODO refactor .....
-    pRSub->pParam = (tSQLExprList *)pRight;
-
-    pExpr->pRight = pRSub;
-  } else {
-    pExpr->nSQLOptr = optrType;
-    pExpr->pLeft = pLeft;
-    pExpr->pRight = pRight;
-  }
-
-  return pExpr;
-}
-
-void tSQLExprNodeDestroy(tSQLExpr *pExpr) {
-  if (pExpr == NULL) {
-    return;
-  }
-
-  if (pExpr->nSQLOptr == TK_STRING) {
-    tVariantDestroy(&pExpr->val);
-  }
-
-  tSQLExprListDestroy(pExpr->pParam);
-
-  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;
-
-    void *ptr = realloc(pList->a, newSize * sizeof(pList->a[0]));
-    if (ptr == 0) {
-      return NULL;
-    }
-
-    pList->nAlloc = newSize;
-    pList->a = ptr;
-  }
-
-  assert(pList->a != 0);
-  return pList;
-}
-
-tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder) {
-  if (pList == NULL) {
-    pList = calloc(1, sizeof(tVariantList));
-  }
-
-  if (tVariantListExpand(pList) == NULL) {
-    return pList;
-  }
-
-  if (pVar) {
-    tVariantListItem *pItem = &pList->a[pList->nExpr++];
-    /*
-     * Here we do not employ the assign function, since we need the pz attribute of structure
-     * , which is the point to char string, to free it!
-     *
-     * Otherwise, the original pointer may be lost, which causes memory leak.
-     */
-    memcpy(pItem, pVar, sizeof(tVariant));
-    pItem->sortOrder = sortOrder;
-  }
-  return pList;
-}
-
-tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index) {
-  if (pList == NULL || index >= pList->nExpr) {
-    return tVariantListAppend(NULL, pVar, sortOrder);
-  }
-
-  if (tVariantListExpand(pList) == NULL) {
-    return pList;
-  }
-
-  if (pVar) {
-    memmove(&pList->a[index + 1], &pList->a[index], sizeof(tVariantListItem) * (pList->nExpr - index));
-
-    tVariantListItem *pItem = &pList->a[index];
-    /*
-     * Here we do not employ the assign function, since we need the pz attribute of structure
-     * , which is the point to char string, to free it!
-     *
-     * Otherwise, the original pointer may be lost, which causes memory leak.
-     */
-    memcpy(pItem, pVar, sizeof(tVariant));
-    pItem->sortOrder = sortOrder;
-
-    pList->nExpr++;
-  }
-
-  return pList;
-}
-
-void tVariantListDestroy(tVariantList *pList) {
-  if (pList == NULL) return;
-
-  for (int32_t i = 0; i < pList->nExpr; ++i) {
-    tVariantDestroy(&pList->a[i].pVar);
-  }
-
-  free(pList->a);
-  free(pList);
-}
-
-tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder) {
-  if (pList == NULL) {
-    pList = calloc(1, sizeof(tVariantList));
-  }
-
-  if (tVariantListExpand(pList) == NULL) {
-    return pList;
-  }
-
-  if (pAliasToken) {
-    tVariant t = {0};
-    tVariantCreate(&t, pAliasToken);
-
-    tVariantListItem *pItem = &pList->a[pList->nExpr++];
-    memcpy(pItem, &t, sizeof(tVariant));
-    pItem->sortOrder = sortOrder;
-  }
-  return pList;
-}
-
-tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField) {
-  if (pList == NULL) pList = calloc(1, sizeof(tFieldList));
-
-  if (pList->nAlloc <= pList->nField) {  //
-    pList->nAlloc = (pList->nAlloc << 1) + 4;
-    pList->p = realloc(pList->p, pList->nAlloc * sizeof(pList->p[0]));
-    if (pList->p == 0) {
-      pList->nField = pList->nAlloc = 0;
-      return pList;
-    }
-  }
-  assert(pList->p != 0);
-
-  if (pField) {
-    struct TAOS_FIELD *pItem = (struct TAOS_FIELD *)&pList->p[pList->nField++];
-    memcpy(pItem, pField, sizeof(TAOS_FIELD));
-  }
-  return pList;
-}
-
-void tFieldListDestroy(tFieldList *pList) {
-  if (pList == NULL) return;
-
-  free(pList->p);
-  free(pList);
-}
-
-void setDBName(SSQLToken *pCpxName, SSQLToken *pDB) {
-  pCpxName->type = pDB->type;
-  pCpxName->z = pDB->z;
-  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 */
-  if (pName->n >= maxLen) {
-    pName->n = maxLen - 1;
-  }
-
-  strncpy(pField->name, pName->z, pName->n);
-  pField->name[pName->n] = 0;
-
-  pField->type = pType->type;
-  pField->bytes = pType->bytes;
-}
-
-void tSQLSetColumnType(TAOS_FIELD *pField, SSQLToken *type) {
-  pField->type = -1;
-
-  for (int8_t i = 0; i < sizeof(tDataTypeDesc) / sizeof(tDataTypeDesc[0]); ++i) {
-    if ((strncasecmp(type->z, tDataTypeDesc[i].aName, tDataTypeDesc[i].nameLen) == 0) &&
-        (type->n == tDataTypeDesc[i].nameLen)) {
-      pField->type = i;
-      pField->bytes = tDataTypeDesc[i].nSize;
-
-      if (i == TSDB_DATA_TYPE_NCHAR) {
-        /*
-         * for nchar, the TOKENTYPE is the number of character, so the length is the
-         * number of bytes in UCS-4 format, which is 4 times larger than the
-         * number of characters
-         */
-        pField->bytes = -(int32_t)type->type * TSDB_NCHAR_SIZE;
-      } else if (i == TSDB_DATA_TYPE_BINARY) {
-        /* for binary, the TOKENTYPE is the length of binary */
-        pField->bytes = -(int32_t)type->type;
-      }
-      break;
-    }
-  }
-}
-
-/*
- * extract the select info out of sql string
- */
-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);
-
-  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->pGroupby = pGroupby;
-  pQuery->pSortOrder = pSortOrder;
-  pQuery->pWhere = pWhere;
-
-  if (pLimit != NULL) {
-    pQuery->limit = *pLimit;
-  }
-
-  if (pGLimit != NULL) {
-    pQuery->slimit = *pGLimit;
-  }
-
-  if (pInterval != NULL) {
-    pQuery->interval = *pInterval;
-  }
-
-  if (pSliding != NULL) {
-    pQuery->sliding = *pSliding;
-  }
-
-  pQuery->fillType = pFill;
-  return pQuery;
-}
-
-tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList) {
-  if (pList == NULL) pList = calloc(1, sizeof(tSQLExprListList));
-
-  if (pList->nAlloc <= pList->nList) {  //
-    pList->nAlloc = (pList->nAlloc << 1) + 4;
-    pList->a = realloc(pList->a, pList->nAlloc * sizeof(pList->a[0]));
-    if (pList->a == 0) {
-      pList->nList = pList->nAlloc = 0;
-      return pList;
-    }
-  }
-  assert(pList->a != 0);
-
-  if (pExprList) {
-    pList->a[pList->nList++] = pExprList;
-  }
-
-  return pList;
-}
-
-void doDestroyQuerySql(SQuerySQL *pQuerySql) {
-  if (pQuerySql == NULL) {
-    return;
-  }
-  
-  tSQLExprListDestroy(pQuerySql->pSelection);
-  
-  pQuerySql->pSelection = NULL;
-  
-  tSQLExprDestroy(pQuerySql->pWhere);
-  pQuerySql->pWhere = NULL;
-  
-  tVariantListDestroy(pQuerySql->pSortOrder);
-  pQuerySql->pSortOrder = NULL;
-  
-  tVariantListDestroy(pQuerySql->pGroupby);
-  pQuerySql->pGroupby = NULL;
-  
-  tVariantListDestroy(pQuerySql->from);
-  pQuerySql->from = NULL;
-  
-  tVariantListDestroy(pQuerySql->fillType);
-  
-  free(pQuerySql);
-}
-
-void destroyAllSelectClause(SSubclauseInfo *pClause) {
-  if (pClause == NULL || pClause->numOfClause == 0) {
-    return;
-  }
-
-  for(int32_t i = 0; i < pClause->numOfClause; ++i) {
-    SQuerySQL *pQuerySql = pClause->pClause[i];
-    doDestroyQuerySql(pQuerySql);
-  }
-  
-  tfree(pClause->pClause);
-}
-
-SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SSQLToken *pStableName,
-                                    tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type) {
-  SCreateTableSQL *pCreate = calloc(1, sizeof(SCreateTableSQL));
-
-  switch (type) {
-    case TSQL_CREATE_TABLE: {
-      pCreate->colInfo.pColumns = pCols;
-      assert(pTagVals == NULL && pTags == NULL);
-      break;
-    }
-    case TSQL_CREATE_STABLE: {
-      pCreate->colInfo.pColumns = pCols;
-      pCreate->colInfo.pTagColumns = pTags;
-      assert(pTagVals == NULL && pTags != NULL && pCols != NULL);
-      break;
-    }
-    case TSQL_CREATE_TABLE_FROM_STABLE: {
-      pCreate->usingInfo.pTagVals = pTagVals;
-      pCreate->usingInfo.stableName = *pStableName;
-      break;
-    }
-    case TSQL_CREATE_STREAM: {
-      pCreate->pSelect = pSelect;
-      break;
-    }
-    default:
-      assert(false);
-  }
-
-  pCreate->type = type;
-  return pCreate;
-}
-
-SAlterTableSQL *tAlterTableSQLElems(SSQLToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type) {
-  SAlterTableSQL *pAlterTable = calloc(1, sizeof(SAlterTableSQL));
-  
-  pAlterTable->name = *pMeterName;
-  pAlterTable->type = type;
-
-  if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
-    pAlterTable->pAddColumns = pCols;
-    assert(pVals == NULL);
-  } else {
-    /*
-     * ALTER_TABLE_TAGS_CHG, ALTER_TABLE_TAGS_SET, ALTER_TABLE_TAGS_DROP,
-     * ALTER_TABLE_DROP_COLUMN
-     */
-    pAlterTable->varList = pVals;
-    assert(pCols == NULL);
-  }
-
-  return pAlterTable;
-}
-
-void SQLInfoDestroy(SSqlInfo *pInfo) {
-  if (pInfo == NULL) return;
-
-  if (pInfo->type == TSDB_SQL_SELECT) {
-    destroyAllSelectClause(&pInfo->subclauseInfo);
-  } else if (pInfo->type == TSDB_SQL_CREATE_TABLE) {
-    SCreateTableSQL *pCreateTableInfo = pInfo->pCreateTableInfo;
-    doDestroyQuerySql(pCreateTableInfo->pSelect);
-
-    tFieldListDestroy(pCreateTableInfo->colInfo.pColumns);
-    tFieldListDestroy(pCreateTableInfo->colInfo.pTagColumns);
-
-    tVariantListDestroy(pCreateTableInfo->usingInfo.pTagVals);
-    tfree(pInfo->pCreateTableInfo);
-  } else if (pInfo->type == TSDB_SQL_ALTER_TABLE) {
-    tVariantListDestroy(pInfo->pAlterInfo->varList);
-    tFieldListDestroy(pInfo->pAlterInfo->pAddColumns);
-    
-    tfree(pInfo->pAlterInfo);
-  } else {
-    if (pInfo->pDCLInfo != NULL && pInfo->pDCLInfo->nAlloc > 0) {
-      free(pInfo->pDCLInfo->a);
-    }
-
-    if (pInfo->type == TSDB_SQL_CREATE_DB) {
-      tVariantListDestroy(pInfo->pDCLInfo->dbOpt.keep);
-    }
-
-    tfree(pInfo->pDCLInfo);
-  }
-}
-
-SSubclauseInfo* setSubclause(SSubclauseInfo* pSubclause, void *pSqlExprInfo) {
-  if (pSubclause == NULL) {
-    pSubclause = calloc(1, sizeof(SSubclauseInfo));
-  }
-  
-  int32_t newSize = pSubclause->numOfClause + 1;
-  char* tmp = realloc(pSubclause->pClause, newSize * POINTER_BYTES);
-  if (tmp == NULL) {
-    return pSubclause;
-  }
-  
-  pSubclause->pClause = (SQuerySQL**) tmp;
-  
-  pSubclause->pClause[newSize - 1] = pSqlExprInfo;
-  pSubclause->numOfClause++;
-  
-  return pSubclause;
-}
-
-SSqlInfo* setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SSQLToken *pMeterName, int32_t type) {
-  pInfo->type = type;
-  
-  if (type == TSDB_SQL_SELECT) {
-    pInfo->subclauseInfo = *(SSubclauseInfo*) pSqlExprInfo;
-    free(pSqlExprInfo);
-  } else {
-    pInfo->pCreateTableInfo = pSqlExprInfo;
-  }
-  
-  if (pMeterName != NULL) {
-    pInfo->pCreateTableInfo->name = *pMeterName;
-  }
-  
-  return pInfo;
-}
-
-SSubclauseInfo* appendSelectClause(SSubclauseInfo *pQueryInfo, void *pSubclause) {
-  char* tmp = realloc(pQueryInfo->pClause, (pQueryInfo->numOfClause + 1) * POINTER_BYTES);
-  if (tmp == NULL) {  // out of memory
-    return pQueryInfo;
-  }
-  
-  pQueryInfo->pClause = (SQuerySQL**) tmp;
-  pQueryInfo->pClause[pQueryInfo->numOfClause++] = pSubclause;
-  
-  return pQueryInfo;
-}
-
-void setCreatedMeterName(SSqlInfo *pInfo, SSQLToken *pMeterName, SSQLToken *pIfNotExists) {
-  pInfo->pCreateTableInfo->name = *pMeterName;
-  pInfo->pCreateTableInfo->existCheck = (pIfNotExists->n != 0);
-}
-
-void tTokenListBuyMoreSpace(tDCLSQL *pTokenList) {
-  if (pTokenList->nAlloc <= pTokenList->nTokens) {  //
-    pTokenList->nAlloc = (pTokenList->nAlloc << 1) + 4;
-    pTokenList->a = realloc(pTokenList->a, pTokenList->nAlloc * sizeof(pTokenList->a[0]));
-    if (pTokenList->a == 0) {
-      pTokenList->nTokens = pTokenList->nAlloc = 0;
-    }
-  }
-}
-
-tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SSQLToken *pToken) {
-  if (pToken == NULL) return NULL;
-
-  if (pTokenList == NULL) pTokenList = calloc(1, sizeof(tDCLSQL));
-
-  tTokenListBuyMoreSpace(pTokenList);
-  pTokenList->a[pTokenList->nTokens++] = *pToken;
-
-  return pTokenList;
-}
-
-void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
-  pInfo->type = type;
-
-  if (nParam == 0) return;
-  if (pInfo->pDCLInfo == NULL) pInfo->pDCLInfo = (tDCLSQL *)calloc(1, sizeof(tDCLSQL));
-
-  va_list va;
-  va_start(va, nParam);
-
-  while (nParam-- > 0) {
-    SSQLToken *pToken = va_arg(va, SSQLToken *);
-    (void)tTokenListAppend(pInfo->pDCLInfo, pToken);
-  }
-  va_end(va);
-}
-
-void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SSQLToken* pToken, SSQLToken* existsCheck) {
-  pInfo->type = type;
-  
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-  
-  tTokenListAppend(pInfo->pDCLInfo, pToken);
-  pInfo->pDCLInfo->existsCheck = (existsCheck->n == 1);
-}
-
-void setShowOptions(SSqlInfo *pInfo, int32_t type, SSQLToken* prefix, SSQLToken* pPatterns) {
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-  
-  pInfo->type = TSDB_SQL_SHOW;
-  
-  SShowInfo* pShowInfo = &pInfo->pDCLInfo->showOpt;
-  pShowInfo->showType = type;
-  
-  if (prefix != NULL && prefix->type != 0) {
-    pShowInfo->prefix = *prefix;
-  } else {
-    pShowInfo->prefix.type = 0;
-  }
-  
-  if (pPatterns != NULL && pPatterns->type != 0) {
-    pShowInfo->pattern = *pPatterns;
-  } else {
-    pShowInfo->pattern.type = 0;
-  }
-}
-
-void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pToken, SCreateDBInfo *pDB, SSQLToken *pIgExists) {
-  pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-
-  pInfo->pDCLInfo->dbOpt = *pDB;
-  pInfo->pDCLInfo->dbOpt.dbname = *pToken;
-
-  tTokenListAppend(pInfo->pDCLInfo, pIgExists);
-}
-
-void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken *pPwd, SCreateAcctSQL *pAcctInfo) {
-  pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-
-  pInfo->pDCLInfo->acctOpt = *pAcctInfo;
-  
-  assert(pName != NULL);
-  pInfo->pDCLInfo->user.user = *pName;
-  
-  if (pPwd != NULL) {
-    pInfo->pDCLInfo->user.passwd = *pPwd;
-  }
-}
-
-void setCreateUserSQL(SSqlInfo *pInfo, SSQLToken *pName, SSQLToken *pPasswd) {
-  pInfo->type = TSDB_SQL_CREATE_USER;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-  
-  assert(pName != NULL && pPasswd != NULL);
-  
-  pInfo->pDCLInfo->user.user = *pName;
-  pInfo->pDCLInfo->user.passwd = *pPasswd;
-}
-
-void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken* pPwd, SSQLToken *pPrivilege) {
-  pInfo->type = TSDB_SQL_ALTER_USER;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-  
-  assert(pName != NULL);
-  
-  SUserInfo* pUser = &pInfo->pDCLInfo->user;
-  pUser->type = type;
-  pUser->user = *pName;
-  
-  if (pPwd != NULL) {
-    pUser->passwd = *pPwd;
-  } else {
-    pUser->passwd.type = TSDB_DATA_TYPE_NULL;
-  }
-  
-  if (pPrivilege != NULL) {
-    pUser->privilege = *pPrivilege;
-  } else {
-    pUser->privilege.type = TSDB_DATA_TYPE_NULL;
-  }
-}
-
-void setKillSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *ip) {
-  pInfo->type = type;
-  if (pInfo->pDCLInfo == NULL) {
-    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
-  }
-  
-  assert(ip != NULL);
-  
-  pInfo->pDCLInfo->ip = *ip;
-}
-
-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));
-}
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 648c25657cf4e60549ed9a60b702aea9d8f1445a..1e841c68fdad040e53b41ca749dd686c4cbb5e2e 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -16,9 +16,55 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
-#include "tsqldef.h"
-#include "ttypes.h"
+#include "ttokendef.h"
+#include "taosdef.h"
 #include "tutil.h"
+#include "tsclient.h"
+
+int32_t tscGetNumOfTags(const STableMeta* pTableMeta) {
+  assert(pTableMeta != NULL);
+  
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  
+  if (pTableMeta->tableType == TSDB_NORMAL_TABLE) {
+    assert(tinfo.numOfTags == 0);
+    return 0;
+  }
+  
+  if (pTableMeta->tableType == TSDB_SUPER_TABLE || pTableMeta->tableType == TSDB_CHILD_TABLE) {
+    return tinfo.numOfTags;
+  }
+  
+  assert(tinfo.numOfTags == 0);
+  return 0;
+}
+
+int32_t tscGetNumOfColumns(const STableMeta* pTableMeta) {
+  assert(pTableMeta != NULL);
+  
+  // table created according to super table, use data from super table
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  return tinfo.numOfColumns;
+}
+
+SSchema *tscGetTableSchema(const STableMeta *pTableMeta) {
+  assert(pTableMeta != NULL);
+  return (SSchema*) pTableMeta->schema;
+}
+
+SSchema* tscGetTableTagSchema(const STableMeta* pTableMeta) {
+  assert(pTableMeta != NULL && (pTableMeta->tableType == TSDB_SUPER_TABLE || pTableMeta->tableType == TSDB_CHILD_TABLE));
+  
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  assert(tinfo.numOfTags > 0);
+  
+  return tscGetTableColumnSchema(pTableMeta, tinfo.numOfColumns);
+}
+
+STableComInfo tscGetTableInfo(const STableMeta* pTableMeta) {
+  assert(pTableMeta != NULL);
+  return pTableMeta->tableInfo;
+}
 
 bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols) {
   if (!VALIDNUMOFCOLS(numOfCols)) {
@@ -52,7 +98,7 @@ bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols) {
 
     // 3. valid column names
     for (int32_t j = i + 1; j < numOfCols; ++j) {
-      if (strncasecmp(pSchema[i].name, pSchema[j].name, TSDB_COL_NAME_LEN) == 0) {
+      if (strncasecmp(pSchema[i].name, pSchema[j].name, sizeof(pSchema[i].name) - 1) == 0) {
         return false;
       }
     }
@@ -64,74 +110,106 @@ bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols) {
   return (rowLen <= TSDB_MAX_BYTES_PER_ROW);
 }
 
-struct SSchema* tsGetSchema(SMeterMeta* pMeta) {
-  if (pMeta == NULL) {
-    return NULL;
-  }
-  return tsGetColumnSchema(pMeta, 0);
+SSchema* tscGetTableColumnSchema(const STableMeta* pTableMeta, int32_t colIndex) {
+  assert(pTableMeta != NULL);
+  
+  SSchema* pSchema = (SSchema*) pTableMeta->schema;
+  return &pSchema[colIndex];
 }
 
-struct SSchema* tsGetTagSchema(SMeterMeta* pMeta) {
-  if (pMeta == NULL || pMeta->numOfTags == 0) {
-    return NULL;
+// TODO for large number of columns, employ the binary search method
+SSchema* tscGetTableColumnSchemaById(STableMeta* pTableMeta, int16_t colId) {
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+
+  for(int32_t i = 0; i < tinfo.numOfColumns + tinfo.numOfTags; ++i) {
+    if (pTableMeta->schema[i].colId == colId) {
+      return &pTableMeta->schema[i];
+    }
   }
 
-  return tsGetColumnSchema(pMeta, pMeta->numOfColumns);
+  return NULL;
 }
 
-struct SSchema* tsGetColumnSchema(SMeterMeta* pMeta, int32_t startCol) {
-  return (SSchema*)(((char*)pMeta + sizeof(SMeterMeta)) + startCol * sizeof(SSchema));
+struct SSchema tscGetTbnameColumnSchema() {
+  struct SSchema s = {
+      .colId = TSDB_TBNAME_COLUMN_INDEX,
+      .type  = TSDB_DATA_TYPE_BINARY,
+      .bytes = TSDB_TABLE_NAME_LEN
+  };
+  
+  strcpy(s.name, TSQL_TBNAME_L);
+  return s;
+}
+static void tscInitCorVgroupInfo(SCMCorVgroupInfo *corVgroupInfo, SCMVgroupInfo *vgroupInfo) {
+  corVgroupInfo->version = 0;
+  corVgroupInfo->inUse = 0;
+  corVgroupInfo->numOfEps = vgroupInfo->numOfEps;
+  for (int32_t i = 0; i < corVgroupInfo->numOfEps; i++) {
+    strncpy(corVgroupInfo->epAddr[i].fqdn, vgroupInfo->epAddr[i].fqdn, TSDB_FQDN_LEN);
+    corVgroupInfo->epAddr[i].port = vgroupInfo->epAddr[i].port;
+  }
 }
+STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg, size_t* size) {
+  assert(pTableMetaMsg != NULL);
+  
+  int32_t schemaSize = (pTableMetaMsg->numOfColumns + pTableMetaMsg->numOfTags) * sizeof(SSchema);
+  STableMeta* pTableMeta = calloc(1, sizeof(STableMeta) + schemaSize);
+  pTableMeta->tableType = pTableMetaMsg->tableType;
+  
+  pTableMeta->tableInfo = (STableComInfo) {
+    .numOfTags    = pTableMetaMsg->numOfTags,
+    .precision    = pTableMetaMsg->precision,
+    .numOfColumns = pTableMetaMsg->numOfColumns,
+  };
+  
+  pTableMeta->id.tid = pTableMetaMsg->sid;
+  pTableMeta->id.uid = pTableMetaMsg->uid;
+  pTableMeta->vgroupInfo = pTableMetaMsg->vgroup;
 
-struct SSchema tsGetTbnameColumnSchema() {
-  struct SSchema s = {.colId = TSDB_TBNAME_COLUMN_INDEX, .type = TSDB_DATA_TYPE_BINARY, .bytes = TSDB_METER_NAME_LEN};
-  strcpy(s.name, TSQL_TBNAME_L);
+  tscInitCorVgroupInfo(&pTableMeta->corVgroupInfo, &pTableMeta->vgroupInfo);
+
+  pTableMeta->sversion = pTableMetaMsg->sversion;
+  pTableMeta->tversion = pTableMetaMsg->tversion;
+  tstrncpy(pTableMeta->sTableId, pTableMetaMsg->sTableId, TSDB_TABLE_FNAME_LEN);
   
-  return s;
+  memcpy(pTableMeta->schema, pTableMetaMsg->schema, schemaSize);
+  
+  int32_t numOfTotalCols = pTableMeta->tableInfo.numOfColumns;
+  for(int32_t i = 0; i < numOfTotalCols; ++i) {
+    pTableMeta->tableInfo.rowSize += pTableMeta->schema[i].bytes;
+  }
+  
+  if (size != NULL) {
+    *size = sizeof(STableMeta) + schemaSize;
+  }
+  
+  return pTableMeta;
 }
 
 /**
- * the MeterMeta data format in memory is as follows:
+ * the TableMeta data format in memory is as follows:
  *
  * +--------------------+
- * |SMeterMeta Body data|  sizeof(SMeterMeta)
+ * |STableMeta Body data|  sizeof(STableMeta)
  * +--------------------+
  * |Schema data         |  numOfTotalColumns * sizeof(SSchema)
  * +--------------------+
  * |Tags data           |  tag_col_1.bytes + tag_col_2.bytes + ....
  * +--------------------+
  *
- * @param pMeta
+ * @param pTableMeta
  * @return
  */
-char* tsGetTagsValue(SMeterMeta* pMeta) {
-  int32_t  numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
-  uint32_t offset = sizeof(SMeterMeta) + numOfTotalCols * sizeof(SSchema);
+char* tsGetTagsValue(STableMeta* pTableMeta) {
+  int32_t offset = 0;
+//  int32_t  numOfTotalCols = pTableMeta->numOfColumns + pTableMeta->numOfTags;
+//  uint32_t offset = sizeof(STableMeta) + numOfTotalCols * sizeof(SSchema);
 
-  return ((char*)pMeta + offset);
-}
-
-bool tsMeterMetaIdentical(SMeterMeta* p1, SMeterMeta* p2) {
-  if (p1 == NULL || p2 == NULL || p1->uid != p2->uid || p1->sversion != p2->sversion) {
-    return false;
-  }
-
-  if (p1 == p2) {
-    return true;
-  }
-
-  size_t size = sizeof(SMeterMeta) + p1->numOfColumns * sizeof(SSchema);
-
-  for (int32_t i = 0; i < p1->numOfTags; ++i) {
-    SSchema* pColSchema = tsGetColumnSchema(p1, i + p1->numOfColumns);
-    size += pColSchema->bytes;
-  }
-
-  return memcmp(p1, p2, size) == 0;
+  return ((char*)pTableMeta + offset);
 }
 
 // todo refactor
-static FORCE_INLINE char* skipSegments(char* input, char delim, int32_t num) {
+UNUSED_FUNC static FORCE_INLINE char* skipSegments(char* input, char delim, int32_t num) {
   for (int32_t i = 0; i < num; ++i) {
     while (*input != 0 && *input++ != delim) {
     };
@@ -139,7 +217,7 @@ static FORCE_INLINE char* skipSegments(char* input, char delim, int32_t num) {
   return input;
 }
 
-static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
+UNUSED_FUNC static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
   size_t len = 0;
   while (*src != delimiter && *src != 0) {
     *dst++ = *src++;
@@ -149,43 +227,3 @@ static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
   return len;
 }
 
-/**
- * extract table name from meterid, which the format of userid.dbname.metername
- * @param meterId
- * @return
- */
-void extractTableName(char* meterId, char* name) {
-  char* r = skipSegments(meterId, TS_PATH_DELIMITER[0], 2);
-  copy(name, r, TS_PATH_DELIMITER[0]);
-}
-
-SSQLToken extractDBName(char* meterId, char* name) {
-  char* r = skipSegments(meterId, TS_PATH_DELIMITER[0], 1);
-  size_t len = copy(name, r, TS_PATH_DELIMITER[0]);
-
-  SSQLToken token = {.z = name, .n = len, .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;
-  }
-}
diff --git a/src/client/src/tscSecondaryMerge.c b/src/client/src/tscSecondaryMerge.c
deleted file mode 100644
index 30f1dfad773304f98b76df152cb90085bf95c55f..0000000000000000000000000000000000000000
--- a/src/client/src/tscSecondaryMerge.c
+++ /dev/null
@@ -1,1575 +0,0 @@
-/*
- * 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 "os.h"
-#include "tlosertree.h"
-#include "tscSecondaryMerge.h"
-#include "tscUtil.h"
-#include "tsclient.h"
-#include "tutil.h"
-
-typedef struct SCompareParam {
-  SLocalDataSource **pLocalData;
-  tOrderDescriptor * pDesc;
-  int32_t            numOfElems;
-  int32_t            groupOrderType;
-} SCompareParam;
-
-int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
-  int32_t pLeftIdx = *(int32_t *)pLeft;
-  int32_t pRightIdx = *(int32_t *)pRight;
-
-  SCompareParam *    pParam = (SCompareParam *)param;
-  tOrderDescriptor * pDesc = pParam->pDesc;
-  SLocalDataSource **pLocalData = pParam->pLocalData;
-
-  /* this input is exhausted, set the special value to denote this */
-  if (pLocalData[pLeftIdx]->rowIdx == -1) {
-    return 1;
-  }
-
-  if (pLocalData[pRightIdx]->rowIdx == -1) {
-    return -1;
-  }
-
-  if (pParam->groupOrderType == TSQL_SO_DESC) {  // desc
-    return compare_d(pDesc, pParam->numOfElems, pLocalData[pLeftIdx]->rowIdx, pLocalData[pLeftIdx]->filePage.data,
-                     pParam->numOfElems, pLocalData[pRightIdx]->rowIdx, pLocalData[pRightIdx]->filePage.data);
-  } else {
-    return compare_a(pDesc, pParam->numOfElems, pLocalData[pLeftIdx]->rowIdx, pLocalData[pLeftIdx]->filePage.data,
-                     pParam->numOfElems, pLocalData[pRightIdx]->rowIdx, pLocalData[pRightIdx]->filePage.data);
-  }
-}
-
-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 pRes structure is formatted in accordance with the pCmd object.
-   */
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SQLFunctionCtx *pCtx = &pReducer->pCtx[i];
-
-    pCtx->aOutputBuf = pReducer->pResultBuf->data + tscFieldInfoGetOffset(pQueryInfo, i) * pReducer->resColModel->maxCapacity;
-    pCtx->order = pQueryInfo->order.order;
-    pCtx->functionId = pQueryInfo->exprsInfo.pExprs[i].functionId;
-
-    // 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;
-    pCtx->inputBytes = pDesc->pSchema->pFields[i].bytes;
-
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-    // output data format yet comes from pCmd.
-    pCtx->outputBytes = pField->bytes;
-    pCtx->outputType = pField->type;
-
-    pCtx->startOffset = 0;
-    pCtx->size = 1;
-    pCtx->hasNull = true;
-    pCtx->currentStage = SECONDARY_STAGE_MERGE;
-
-    pRes->bytes[i] = pField->bytes;
-
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
-
-    // 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 = pQueryInfo->order.order;
-      pCtx->param[2].nType = TSDB_DATA_TYPE_BIGINT;
-      pCtx->param[1].i64Key = pQueryInfo->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(pQueryInfo->fieldsInfo.numOfOutputCols, POINTER_BYTES);
-
-  SQLFunctionCtx* pCtx = NULL;
-  for(int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 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;
-  }
-}
-
-/*
- * todo release allocated memory process with async process
- */
-void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrderDescriptor *pDesc,
-                           tColModel *finalmodel, SSqlCmd *pCmd, SSqlRes *pRes) {
-  // offset of cmd in SSqlObj structure
-  char *pSqlObjAddr = (char *)pCmd - offsetof(SSqlObj, cmd);
-
-  if (pMemBuffer == NULL || pDesc->pSchema == NULL) {
-    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
-
-    tscError("%p no local buffer or intermediate result format model", pSqlObjAddr);
-    pRes->code = TSDB_CODE_APP_ERROR;
-    return;
-  }
-
-  int32_t numOfFlush = 0;
-  for (int32_t i = 0; i < numOfBuffer; ++i) {
-    int32_t len = pMemBuffer[i]->fileMeta.flushoutData.nLength;
-    if (len == 0) {
-      tscTrace("%p no data retrieved from orderOfVnode:%d", pSqlObjAddr, i + 1);
-      continue;
-    }
-
-    numOfFlush += len;
-  }
-
-  if (numOfFlush == 0 || numOfBuffer == 0) {
-    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
-    tscTrace("%p retrieved no data", pSqlObjAddr);
-
-    return;
-  }
-
-  if (pDesc->pSchema->maxCapacity >= pMemBuffer[0]->nPageSize) {
-    tscError("%p Invalid value of buffer capacity %d and page size %d ", pSqlObjAddr, pDesc->pSchema->maxCapacity,
-             pMemBuffer[0]->nPageSize);
-
-    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
-    pRes->code = TSDB_CODE_APP_ERROR;
-    return;
-  }
-
-  size_t         nReducerSize = sizeof(SLocalReducer) + sizeof(void *) * numOfFlush;
-  SLocalReducer *pReducer = (SLocalReducer *)calloc(1, nReducerSize);
-  if (pReducer == NULL) {
-    tscError("%p failed to create merge structure", pSqlObjAddr);
-
-    tscLocalReducerEnvDestroy(pMemBuffer, pDesc, finalmodel, numOfBuffer);
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    return;
-  }
-
-  pReducer->pExtMemBuffer = pMemBuffer;
-  pReducer->pLocalDataSrc = (SLocalDataSource **)&pReducer[1];
-  assert(pReducer->pLocalDataSrc != NULL);
-
-  pReducer->numOfBuffer = numOfFlush;
-  pReducer->numOfVnode = numOfBuffer;
-
-  pReducer->pDesc = pDesc;
-  pTrace("%p the number of merged leaves is: %d", pSqlObjAddr, pReducer->numOfBuffer);
-
-  int32_t idx = 0;
-  for (int32_t i = 0; i < numOfBuffer; ++i) {
-    int32_t numOfFlushoutInFile = pMemBuffer[i]->fileMeta.flushoutData.nLength;
-
-    for (int32_t j = 0; j < numOfFlushoutInFile; ++j) {
-      SLocalDataSource *pDS = (SLocalDataSource *)malloc(sizeof(SLocalDataSource) + pMemBuffer[0]->nPageSize);
-      if (pDS == NULL) {
-        tscError("%p failed to create merge structure", pSqlObjAddr);
-        pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-        return;
-      }
-      pReducer->pLocalDataSrc[idx] = pDS;
-
-      pDS->pMemBuffer = pMemBuffer[i];
-      pDS->flushoutIdx = j;
-      pDS->filePage.numOfElems = 0;
-      pDS->pageId = 0;
-      pDS->rowIdx = 0;
-
-      tscTrace("%p load data from disk into memory, orderOfVnode:%d, total:%d", pSqlObjAddr, i + 1, idx + 1);
-      tExtMemBufferLoadData(pMemBuffer[i], &(pDS->filePage), j, 0);
-#ifdef _DEBUG_VIEW
-      printf("load data page into mem for build loser tree: %" PRIu64 " rows\n", pDS->filePage.numOfElems);
-      SSrcColumnInfo colInfo[256] = {0};
-      SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-
-      tscGetSrcColumnInfo(colInfo, pQueryInfo);
-
-      tColModelDisplayEx(pDesc->pSchema, pDS->filePage.data, pDS->filePage.numOfElems, pMemBuffer[0]->numOfElemsPerPage,
-                         colInfo);
-#endif
-      if (pDS->filePage.numOfElems == 0) {  // no data in this flush
-        tscTrace("%p flush data is empty, ignore %d flush record", pSqlObjAddr, idx);
-        tfree(pDS);
-        continue;
-      }
-      idx += 1;
-    }
-  }
-  assert(idx >= pReducer->numOfBuffer);
-  if (idx == 0) {
-    return;
-  }
-
-  pReducer->numOfBuffer = idx;
-
-  SCompareParam *param = malloc(sizeof(SCompareParam));
-  param->pLocalData = pReducer->pLocalDataSrc;
-  param->pDesc = pReducer->pDesc;
-  param->numOfElems = pReducer->pLocalDataSrc[0]->pMemBuffer->numOfElemsPerPage;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  param->groupOrderType = pQueryInfo->groupbyExpr.orderType;
-
-  pRes->code = tLoserTreeCreate(&pReducer->pLoserTree, pReducer->numOfBuffer, param, treeComparator);
-  if (pReducer->pLoserTree == NULL || pRes->code != 0) {
-    return;
-  }
-
-  // the input data format follows the old format, but output in a new format.
-  // so, all the input must be parsed as old format
-  pReducer->pCtx = (SQLFunctionCtx *)calloc(pQueryInfo->fieldsInfo.numOfOutputCols, sizeof(SQLFunctionCtx));
-
-  pReducer->rowSize = pMemBuffer[0]->nElemSize;
-
-  tscRestoreSQLFunctionForMetricQuery(pQueryInfo);
-  tscFieldInfoCalOffset(pQueryInfo);
-
-  if (pReducer->rowSize > pMemBuffer[0]->nPageSize) {
-    assert(false);  // todo fixed row size is larger than the minimum page size;
-  }
-
-  pReducer->hasPrevRow = false;
-  pReducer->hasUnprocessedRow = false;
-
-  pReducer->prevRowOfInput = (char *)calloc(1, pReducer->rowSize);
-
-  // 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));
-  pReducer->discard = false;
-
-  pReducer->nResultBufSize = pMemBuffer[0]->nPageSize * 16;
-  pReducer->pResultBuf = (tFilePage *)calloc(1, pReducer->nResultBufSize + sizeof(tFilePage));
-  
-  int32_t finalRowLength = tscGetResRowLength(pQueryInfo);
-  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->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)pQueryInfo->fieldsInfo.numOfOutputCols, sizeof(SResultInfo));
-
-  tscCreateResPointerInfo(pRes, pQueryInfo);
-  tscInitSqlContext(pCmd, pRes, pReducer, pDesc);
-
-  // we change the maxCapacity of schema to denote that there is only one row in temp buffer
-  pReducer->pDesc->pSchema->maxCapacity = 1;
-  
-  //restore the limitation value at the last stage
-  if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-    pQueryInfo->limit.limit = pQueryInfo->clauseLimit;
-    pQueryInfo->limit.offset = pQueryInfo->prjOffset;
-  }
-  
-  pReducer->offset = pQueryInfo->limit.offset;
-  
-  pRes->pLocalReducer = pReducer;
-  pRes->numOfGroups = 0;
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  int16_t prec = pMeterMetaInfo->pMeterMeta->precision;
-
-  int64_t stime = (pQueryInfo->stime < pQueryInfo->etime) ? pQueryInfo->stime : pQueryInfo->etime;
-  int64_t revisedSTime = taosGetIntervalStartTimestamp(stime, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit, prec);
-
-  SInterpolationInfo *pInterpoInfo = &pReducer->interpolationInfo;
-  taosInitInterpoInfo(pInterpoInfo, pQueryInfo->order.order, revisedSTime, pQueryInfo->groupbyExpr.numOfGroupCols,
-                      pReducer->rowSize);
-
-  int32_t startIndex = pQueryInfo->fieldsInfo.numOfOutputCols - pQueryInfo->groupbyExpr.numOfGroupCols;
-
-  if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
-    pInterpoInfo->pTags[0] = (char *)pInterpoInfo->pTags + POINTER_BYTES * pQueryInfo->groupbyExpr.numOfGroupCols;
-    for (int32_t i = 1; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
-      pInterpoInfo->pTags[i] = pReducer->resColModel->pFields[startIndex + i - 1].bytes + pInterpoInfo->pTags[i - 1];
-    }
-  } else {
-    assert(pInterpoInfo->pTags == NULL);
-  }
-}
-
-static int32_t tscFlushTmpBufferImpl(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage,
-                                     int32_t orderType) {
-  if (pPage->numOfElems == 0) {
-    return 0;
-  }
-
-  assert(pPage->numOfElems <= pDesc->pSchema->maxCapacity);
-
-  // sort before flush to disk, the data must be consecutively put on tFilePage.
-  if (pDesc->orderIdx.numOfOrderedCols > 0) {
-    tColDataQSort(pDesc, pPage->numOfElems, 0, pPage->numOfElems - 1, pPage->data, orderType);
-  }
-
-#ifdef _DEBUG_VIEW
-  printf("%" PRIu64 " rows data flushed to disk after been sorted:\n", pPage->numOfElems);
-  tColModelDisplay(pDesc->pSchema, pPage->data, pPage->numOfElems, pPage->numOfElems);
-#endif
-
-  // write to cache after being sorted
-  if (tExtMemBufferPut(pMemoryBuf, pPage->data, pPage->numOfElems) < 0) {
-    tscError("failed to save data in temporary buffer");
-    return -1;
-  }
-
-  pPage->numOfElems = 0;
-  return 0;
-}
-
-int32_t tscFlushTmpBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, int32_t orderType) {
-  int32_t ret = tscFlushTmpBufferImpl(pMemoryBuf, pDesc, pPage, orderType);
-  if (ret != 0) {
-    return -1;
-  }
-
-  if (!tExtMemBufferFlush(pMemoryBuf)) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePage *pPage, void *data,
-                     int32_t numOfRows, int32_t orderType) {
-  if (pPage->numOfElems + numOfRows <= pDesc->pSchema->maxCapacity) {
-    tColModelAppend(pDesc->pSchema, pPage, data, 0, numOfRows, numOfRows);
-    return 0;
-  }
-
-  tColModel *pModel = pDesc->pSchema;
-
-  int32_t numOfRemainEntries = pDesc->pSchema->maxCapacity - pPage->numOfElems;
-  tColModelAppend(pModel, pPage, data, 0, numOfRemainEntries, numOfRows);
-
-  /* current buffer is full, need to flushed to disk */
-  assert(pPage->numOfElems == pDesc->pSchema->maxCapacity);
-  int32_t ret = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType);
-  if (ret != 0) {
-    return -1;
-  }
-
-  int32_t remain = numOfRows - numOfRemainEntries;
-
-  while (remain > 0) {
-    int32_t numOfWriteElems = 0;
-    if (remain > pModel->maxCapacity) {
-      numOfWriteElems = pModel->maxCapacity;
-    } else {
-      numOfWriteElems = remain;
-    }
-
-    tColModelAppend(pModel, pPage, data, numOfRows - remain, numOfWriteElems, numOfRows);
-
-    if (pPage->numOfElems == pModel->maxCapacity) {
-      int32_t ret = tscFlushTmpBuffer(pMemoryBuf, pDesc, pPage, orderType);
-      if (ret != 0) {
-        return -1;
-      }
-    } else {
-      pPage->numOfElems = numOfWriteElems;
-    }
-
-    remain -= numOfWriteElems;
-    numOfRemainEntries += numOfWriteElems;
-  }
-
-  return 0;
-}
-
-void tscDestroyLocalReducer(SSqlObj *pSql) {
-  if (pSql == NULL) {
-    return;
-  }
-
-  tscTrace("%p start to free local reducer", pSql);
-  SSqlRes *pRes = &(pSql->res);
-  if (pRes->pLocalReducer == NULL) {
-    tscTrace("%p local reducer has been freed, abort", pSql);
-    return;
-  }
-
-  SSqlCmd *pCmd = &pSql->cmd;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  // there is no more result, so we release all allocated resource
-  SLocalReducer *pLocalReducer = (SLocalReducer*)atomic_exchange_ptr(&pRes->pLocalReducer, NULL);
-  if (pLocalReducer != NULL) {
-    int32_t status = 0;
-    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);
-    }
-
-    taosDestoryInterpoInfo(&pLocalReducer->interpolationInfo);
-
-    if (pLocalReducer->pCtx != NULL) {
-      for(int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-        SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[i];
-        
-        tVariantDestroy(&pCtx->tag);
-        if (pCtx->tagInfo.pTagCtxList != NULL) {
-          tfree(pCtx->tagInfo.pTagCtxList);
-        }
-      }
-      
-      tfree(pLocalReducer->pCtx);
-    }
-
-
-    tfree(pLocalReducer->prevRowOfInput);
-
-    tfree(pLocalReducer->pTempBuffer);
-    tfree(pLocalReducer->pResultBuf);
-
-    if (pLocalReducer->pResInfo != NULL) {
-      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-        tfree(pLocalReducer->pResInfo[i].interResultBuf);
-      }
-
-      tfree(pLocalReducer->pResInfo);
-    }
-
-    if (pLocalReducer->pLoserTree) {
-      tfree(pLocalReducer->pLoserTree->param);
-      tfree(pLocalReducer->pLoserTree);
-    }
-
-    tfree(pLocalReducer->pBufForInterpo);
-
-    tfree(pLocalReducer->pFinalRes);
-    tfree(pLocalReducer->discardData);
-
-    tscLocalReducerEnvDestroy(pLocalReducer->pExtMemBuffer, pLocalReducer->pDesc, pLocalReducer->resColModel,
-                              pLocalReducer->numOfVnode);
-    for (int32_t i = 0; i < pLocalReducer->numOfBuffer; ++i) {
-      tfree(pLocalReducer->pLocalDataSrc[i]);
-    }
-
-    pLocalReducer->numOfBuffer = 0;
-    pLocalReducer->numOfCompleted = 0;
-    free(pLocalReducer);
-  } else {
-    tscTrace("%p already freed or another free function is invoked", pSql);
-  }
-
-  tscTrace("%p free local reducer finished", pSql);
-}
-
-static int32_t createOrderDescriptor(tOrderDescriptor **pOrderDesc, SSqlCmd *pCmd, tColModel *pModel) {
-  int32_t numOfGroupByCols = 0;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
-    numOfGroupByCols = pQueryInfo->groupbyExpr.numOfGroupCols;
-  }
-
-  // primary timestamp column is involved in final result
-  if (pQueryInfo->nAggTimeInterval != 0 || tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-    numOfGroupByCols++;
-  }
-
-  int32_t *orderIdx = (int32_t *)calloc(numOfGroupByCols, sizeof(int32_t));
-  if (orderIdx == NULL) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
-  }
-
-  if (numOfGroupByCols > 0) {
-    int32_t startCols = pQueryInfo->fieldsInfo.numOfOutputCols - pQueryInfo->groupbyExpr.numOfGroupCols;
-
-    // tags value locate at the last columns
-    for (int32_t i = 0; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
-      orderIdx[i] = startCols++;
-    }
-
-    if (pQueryInfo->nAggTimeInterval != 0) {
-      // the first column is the timestamp, handles queries like "interval(10m) group by tags"
-      orderIdx[numOfGroupByCols - 1] = PRIMARYKEY_TIMESTAMP_COL_INDEX;
-    }
-  }
-
-  *pOrderDesc = tOrderDesCreate(orderIdx, numOfGroupByCols, pModel, pQueryInfo->order.order);
-  tfree(orderIdx);
-
-  if (*pOrderDesc == NULL) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
-  } else {
-    return TSDB_CODE_SUCCESS;
-  }
-}
-
-bool isSameGroup(SSqlCmd *pCmd, SLocalReducer *pReducer, char *pPrev, tFilePage *tmpBuffer) {
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  int16_t functionId = tscSqlExprGet(pQueryInfo, 0)->functionId;
-
-  // disable merge procedure for column projection query
-  assert(functionId != TSDB_FUNC_ARITHM);
-  
-  if (tscOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-    return true;
-  }
-  
-  if (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_ARITHM) {
-    return false;
-  }
-
-  tOrderDescriptor *pOrderDesc = pReducer->pDesc;
-  int32_t           numOfCols = pOrderDesc->orderIdx.numOfOrderedCols;
-
-  // no group by columns, all data belongs to one group
-  if (numOfCols <= 0) {
-    return true;
-  }
-
-  if (pOrderDesc->orderIdx.pData[numOfCols - 1] == PRIMARYKEY_TIMESTAMP_COL_INDEX) {  //<= 0
-    // super table interval query
-    assert(pQueryInfo->nAggTimeInterval > 0);
-    pOrderDesc->orderIdx.numOfOrderedCols -= 1;
-  } else {  // simple group by query
-    assert(pQueryInfo->nAggTimeInterval == 0);
-  }
-
-  // only one row exists
-  int32_t ret = compare_a(pOrderDesc, 1, 0, pPrev, 1, 0, tmpBuffer->data);
-  pOrderDesc->orderIdx.numOfOrderedCols = numOfCols;
-
-  return (ret == 0);
-}
-
-int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOrderDescriptor **pOrderDesc,
-                                 tColModel **pFinalModel, uint32_t nBufferSizes) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  SSchema *  pSchema = NULL;
-  tColModel *pModel = NULL;
-  *pFinalModel = NULL;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 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;
-    return pRes->code;
-  }
-
-  pSchema = (SSchema *)calloc(1, sizeof(SSchema) * pQueryInfo->fieldsInfo.numOfOutputCols);
-  if (pSchema == NULL) {
-    tscError("%p failed to allocate memory", pSql);
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    return pRes->code;
-  }
-
-  int32_t rlen = 0;
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
-
-    pSchema[i].bytes = pExpr->resBytes;
-    pSchema[i].type = pExpr->resType;
-
-    rlen += pExpr->resBytes;
-  }
-
-  int32_t capacity = 0;
-  if (rlen != 0) {
-    capacity = nBufferSizes / rlen;
-  }
-  
-  pModel = tColModelCreate(pSchema, pQueryInfo->fieldsInfo.numOfOutputCols, capacity);
-
-  for (int32_t i = 0; i < pMeterMetaInfo->pMetricMeta->numOfVnodes; ++i) {
-    char tmpPath[512] = {0};
-    getTmpfilePath("tv_bf_db", 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;
-  }
-
-  if (createOrderDescriptor(pOrderDesc, pCmd, pModel) != TSDB_CODE_SUCCESS) {
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    return pRes->code;
-  }
-
-  memset(pSchema, 0, sizeof(SSchema) * pQueryInfo->fieldsInfo.numOfOutputCols);
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
-    pSchema[i].type = pField->type;
-    pSchema[i].bytes = pField->bytes;
-    strcpy(pSchema[i].name, pField->name);
-  }
-
-  *pFinalModel = tColModelCreate(pSchema, pQueryInfo->fieldsInfo.numOfOutputCols, capacity);
-  tfree(pSchema);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/**
- * @param pMemBuffer
- * @param pDesc
- * @param pFinalModel
- * @param numOfVnodes
- */
-void tscLocalReducerEnvDestroy(tExtMemBuffer **pMemBuffer, tOrderDescriptor *pDesc, tColModel *pFinalModel,
-                               int32_t numOfVnodes) {
-  tColModelDestroy(pFinalModel);
-  tOrderDescDestroy(pDesc);
-  for (int32_t i = 0; i < numOfVnodes; ++i) {
-    tExtMemBufferDestroy(&pMemBuffer[i]);
-  }
-
-  tfree(pMemBuffer);
-}
-
-/**
- *
- * @param pLocalReducer
- * @param pOneInterDataSrc
- * @param treeList
- * @return the number of remain input source. if ret == 0, all data has been handled
- */
-int32_t loadNewDataFromDiskFor(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
-                               bool *needAdjustLoserTree) {
-  pOneInterDataSrc->rowIdx = 0;
-  pOneInterDataSrc->pageId += 1;
-
-  if (pOneInterDataSrc->pageId <
-      pOneInterDataSrc->pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[pOneInterDataSrc->flushoutIdx].numOfPages) {
-    tExtMemBufferLoadData(pOneInterDataSrc->pMemBuffer, &(pOneInterDataSrc->filePage), pOneInterDataSrc->flushoutIdx,
-                          pOneInterDataSrc->pageId);
-
-#if defined(_DEBUG_VIEW)
-    printf("new page load to buffer\n");
-    tColModelDisplay(pOneInterDataSrc->pMemBuffer->pColModel, pOneInterDataSrc->filePage.data,
-                     pOneInterDataSrc->filePage.numOfElems, pOneInterDataSrc->pMemBuffer->pColModel->maxCapacity);
-#endif
-    *needAdjustLoserTree = true;
-  } else {
-    pLocalReducer->numOfCompleted += 1;
-
-    pOneInterDataSrc->rowIdx = -1;
-    pOneInterDataSrc->pageId = -1;
-    *needAdjustLoserTree = true;
-  }
-
-  return pLocalReducer->numOfBuffer;
-}
-
-void adjustLoserTreeFromNewData(SLocalReducer *pLocalReducer, SLocalDataSource *pOneInterDataSrc,
-                                SLoserTreeInfo *pTree) {
-  /*
-   * load a new data page into memory for intermediate dataset source,
-   * since it's last record in buffer has been chosen to be processed, as the winner of loser-tree
-   */
-  bool needToAdjust = true;
-  if (pOneInterDataSrc->filePage.numOfElems <= pOneInterDataSrc->rowIdx) {
-    loadNewDataFromDiskFor(pLocalReducer, pOneInterDataSrc, &needToAdjust);
-  }
-
-  /*
-   * adjust loser tree otherwise, according to new candidate data
-   * if the loser tree is rebuild completed, we do not need to adjust
-   */
-  if (needToAdjust) {
-    int32_t leafNodeIdx = pTree->pNode[0].index + pLocalReducer->numOfBuffer;
-
-#ifdef _DEBUG_VIEW
-    printf("before adjust:\t");
-    tLoserTreeDisplay(pTree);
-#endif
-
-    tLoserTreeAdjust(pTree, leafNodeIdx);
-
-#ifdef _DEBUG_VIEW
-    printf("\nafter adjust:\t");
-    tLoserTreeDisplay(pTree);
-    printf("\n");
-#endif
-  }
-}
-
-void savePrevRecordAndSetupInterpoInfo(SLocalReducer *pLocalReducer, SQueryInfo* pQueryInfo, SInterpolationInfo *pInterpoInfo) {
-  // discard following dataset in the same group and reset the interpolation information
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  int16_t prec = pMeterMetaInfo->pMeterMeta->precision;
-
-  int64_t stime = (pQueryInfo->stime < pQueryInfo->etime) ? pQueryInfo->stime : pQueryInfo->etime;
-  int64_t revisedSTime = taosGetIntervalStartTimestamp(stime, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit, prec);
-
-  taosInitInterpoInfo(pInterpoInfo, pQueryInfo->order.order, revisedSTime, pQueryInfo->groupbyExpr.numOfGroupCols,
-                      pLocalReducer->rowSize);
-
-  pLocalReducer->discard = true;
-  pLocalReducer->discardData->numOfElems = 0;
-
-  tColModel *pModel = pLocalReducer->pDesc->pSchema;
-  tColModelAppend(pModel, pLocalReducer->discardData, pLocalReducer->prevRowOfInput, 0, 1, 1);
-}
-
-// todo merge with following function
-static void reversedCopyResultToDstBuf(SQueryInfo* pQueryInfo, SSqlRes *pRes, tFilePage *pFinalDataPage) {
-  
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
-    int32_t offset = tscFieldInfoGetOffset(pQueryInfo, i);
-    char *  src = pFinalDataPage->data + (pRes->numOfRows - 1) * pField->bytes + pRes->numOfRows * offset;
-    char *  dst = pRes->data + pRes->numOfRows * offset;
-
-    for (int32_t j = 0; j < pRes->numOfRows; ++j) {
-      memcpy(dst, src, (size_t)pField->bytes);
-      dst += pField->bytes;
-      src -= pField->bytes;
-    }
-  }
-}
-
-static void reversedCopyFromInterpolationToDstBuf(SQueryInfo* pQueryInfo, SSqlRes *pRes, tFilePage **pResPages, SLocalReducer *pLocalReducer) {
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
-    int32_t offset = tscFieldInfoGetOffset(pQueryInfo, i);
-    assert(offset == pLocalReducer->resColModel->colOffset[i]);
-
-    char *src = pResPages[i]->data + (pRes->numOfRows - 1) * pField->bytes;
-    char *dst = pRes->data + pRes->numOfRows * offset;
-
-    for (int32_t j = 0; j < pRes->numOfRows; ++j) {
-      memcpy(dst, src, (size_t)pField->bytes);
-      dst += pField->bytes;
-      src -= pField->bytes;
-    }
-  }
-}
-
-/*
- * Note: pRes->pLocalReducer may be null, due to the fact that "tscDestroyLocalReducer" is called
- * by "interuptHandler" function in shell
- */
-static void doInterpolateResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneOutput) {
-  SSqlCmd *  pCmd = &pSql->cmd;
-  SSqlRes *  pRes = &pSql->res;
-  tFilePage *pFinalDataPage = pLocalReducer->pResultBuf;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  if (pRes->pLocalReducer != pLocalReducer) {
-    /*
-     * Release the SSqlObj is called, and it is int destroying function invoked by other thread.
-     * However, the other thread will WAIT until current process fully completes.
-     * Since the flag of release struct is set by doLocalReduce function
-     */
-    assert(pRes->pLocalReducer == NULL);
-  }
-
-  if (pQueryInfo->nAggTimeInterval == 0 || pQueryInfo->interpoType == TSDB_INTERPO_NONE) {
-    // no interval query, no interpolation
-    pRes->data = pLocalReducer->pFinalRes;
-    pRes->numOfRows = pFinalDataPage->numOfElems;
-    pRes->numOfTotalInCurrentClause += pRes->numOfRows;
-
-    if (pQueryInfo->limit.offset > 0) {
-      if (pQueryInfo->limit.offset < pRes->numOfRows) {
-        int32_t prevSize = pFinalDataPage->numOfElems;
-        tColModelErase(pLocalReducer->resColModel, pFinalDataPage, prevSize, 0, pQueryInfo->limit.offset - 1);
-
-        /* remove the hole in column model */
-        tColModelCompact(pLocalReducer->resColModel, pFinalDataPage, prevSize);
-
-        pRes->numOfRows -= pQueryInfo->limit.offset;
-        pRes->numOfTotalInCurrentClause -= pQueryInfo->limit.offset;
-        pQueryInfo->limit.offset = 0;
-      } else {
-        pQueryInfo->limit.offset -= pRes->numOfRows;
-        pRes->numOfRows = 0;
-        pRes->numOfTotalInCurrentClause = 0;
-      }
-    }
-
-    if (pQueryInfo->limit.limit >= 0 && pRes->numOfTotalInCurrentClause > pQueryInfo->limit.limit) {
-      /* impose the limitation of output rows on the final result */
-      int32_t prevSize = pFinalDataPage->numOfElems;
-      int32_t overFlow = pRes->numOfTotalInCurrentClause - pQueryInfo->limit.limit;
-
-      assert(overFlow < pRes->numOfRows);
-
-      pRes->numOfTotalInCurrentClause = pQueryInfo->limit.limit;
-      pRes->numOfRows -= overFlow;
-      pFinalDataPage->numOfElems -= overFlow;
-
-      tColModelCompact(pLocalReducer->resColModel, pFinalDataPage, prevSize);
-
-      /* set remain data to be discarded, and reset the interpolation information */
-      savePrevRecordAndSetupInterpoInfo(pLocalReducer, pQueryInfo, &pLocalReducer->interpolationInfo);
-    }
-
-    int32_t rowSize = tscGetResRowLength(pQueryInfo);
-    // handle the descend order output
-//    if (pQueryInfo->order.order == TSQL_SO_ASC) {
-      memcpy(pRes->data, pFinalDataPage->data, pRes->numOfRows * rowSize);
-//    } else {
-//      reversedCopyResultToDstBuf(pQueryInfo, pRes, pFinalDataPage);
-//    }
-
-    pFinalDataPage->numOfElems = 0;
-    return;
-  }
-
-  int64_t *pPrimaryKeys = (int64_t *)pLocalReducer->pBufForInterpo;
-  
-  SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-
-  int64_t actualETime = (pQueryInfo->stime < pQueryInfo->etime) ? pQueryInfo->etime : pQueryInfo->stime;
-
-  tFilePage **pResPages = malloc(POINTER_BYTES * pQueryInfo->fieldsInfo.numOfOutputCols);
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-    pResPages[i] = calloc(1, sizeof(tFilePage) + pField->bytes * pLocalReducer->resColModel->maxCapacity);
-  }
-
-  char **  srcData = (char **)malloc((POINTER_BYTES + sizeof(int32_t)) * pQueryInfo->fieldsInfo.numOfOutputCols);
-  int32_t *functions = (int32_t *)((char *)srcData + pQueryInfo->fieldsInfo.numOfOutputCols * sizeof(void *));
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    srcData[i] = pLocalReducer->pBufForInterpo + tscFieldInfoGetOffset(pQueryInfo, i) * pInterpoInfo->numOfRawDataInRows;
-    functions[i] = tscSqlExprGet(pQueryInfo, i)->functionId;
-  }
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  int8_t precision = pMeterMetaInfo->pMeterMeta->precision;
-
-  while (1) {
-    int32_t remains = taosNumOfRemainPoints(pInterpoInfo);
-    TSKEY etime = taosGetRevisedEndKey(actualETime, pQueryInfo->order.order, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit,
-                                       precision);
-    int32_t nrows = taosGetNumOfResultWithInterpo(pInterpoInfo, pPrimaryKeys, remains, pQueryInfo->nAggTimeInterval, etime,
-                                                  pLocalReducer->resColModel->maxCapacity);
-
-    int32_t newRows = taosDoInterpoResult(pInterpoInfo, pQueryInfo->interpoType, pResPages, remains, nrows,
-                                          pQueryInfo->nAggTimeInterval, pPrimaryKeys, pLocalReducer->resColModel, srcData,
-                                          pQueryInfo->defaultVal, functions, pLocalReducer->resColModel->maxCapacity);
-    assert(newRows <= nrows);
-
-    if (pQueryInfo->limit.offset < newRows) {
-      newRows -= pQueryInfo->limit.offset;
-
-      if (pQueryInfo->limit.offset > 0) {
-        for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-          TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-          memmove(pResPages[i]->data, pResPages[i]->data + pField->bytes * pQueryInfo->limit.offset, newRows * pField->bytes);
-        }
-      }
-
-      pRes->data = pLocalReducer->pFinalRes;
-      pRes->numOfRows = newRows;
-      pRes->numOfTotalInCurrentClause += newRows;
-
-      pQueryInfo->limit.offset = 0;
-      break;
-    } else {
-      pQueryInfo->limit.offset -= newRows;
-      pRes->numOfRows = 0;
-
-      int32_t rpoints = taosNumOfRemainPoints(pInterpoInfo);
-      if (rpoints <= 0) {
-        if (!doneOutput) {
-          /* reduce procedure is not completed, but current results for interpolation are exhausted */
-          break;
-        }
-
-        /* all output for current group are completed */
-        int32_t totalRemainRows =
-            taosGetNumOfResWithoutLimit(pInterpoInfo, pPrimaryKeys, rpoints, pQueryInfo->nAggTimeInterval, actualETime);
-        if (totalRemainRows <= 0) {
-          break;
-        }
-      }
-    }
-  }
-
-  if (pRes->numOfRows > 0) {
-    if (pQueryInfo->limit.limit >= 0 && pRes->numOfTotalInCurrentClause > pQueryInfo->limit.limit) {
-      int32_t overFlow = pRes->numOfTotalInCurrentClause - pQueryInfo->limit.limit;
-      pRes->numOfRows -= overFlow;
-
-      assert(pRes->numOfRows >= 0);
-
-      pRes->numOfTotalInCurrentClause = pQueryInfo->limit.limit;
-      pFinalDataPage->numOfElems -= overFlow;
-
-      /* set remain data to be discarded, and reset the interpolation information */
-      savePrevRecordAndSetupInterpoInfo(pLocalReducer, pQueryInfo, pInterpoInfo);
-    }
-
-    if (pQueryInfo->order.order == TSQL_SO_ASC) {
-      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-        TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
-        memcpy(pRes->data + pLocalReducer->resColModel->colOffset[i] * pRes->numOfRows, pResPages[i]->data,
-               pField->bytes * pRes->numOfRows);
-      }
-    } else {
-      reversedCopyFromInterpolationToDstBuf(pQueryInfo, pRes, pResPages, pLocalReducer);
-    }
-  }
-
-  pFinalDataPage->numOfElems = 0;
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    tfree(pResPages[i]);
-  }
-  tfree(pResPages);
-
-  free(srcData);
-}
-
-static void savePreviousRow(SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
-  tColModel *pColModel = pLocalReducer->pDesc->pSchema;
-  assert(pColModel->maxCapacity == 1 && tmpBuffer->numOfElems == 1);
-
-  // copy to previous temp buffer
-  for (int32_t i = 0; i < pLocalReducer->pDesc->pSchema->numOfCols; ++i) {
-    memcpy(pLocalReducer->prevRowOfInput + pColModel->colOffset[i], tmpBuffer->data + pColModel->colOffset[i],
-           pColModel->pFields[i].bytes);
-  }
-
-  tmpBuffer->numOfElems = 0;
-  pLocalReducer->hasPrevRow = true;
-}
-
-static void doExecuteSecondaryMerge(SSqlCmd* pCmd, SLocalReducer *pLocalReducer, bool needInit) {
-  // the tag columns need to be set before all functions execution
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  for(int32_t j = 0; j < pQueryInfo->fieldsInfo.numOfOutputCols; ++j) {
-    SSqlExpr *      pExpr = tscSqlExprGet(pQueryInfo, j);
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[j];
-
-    tVariantAssign(&pCtx->param[0], &pExpr->param[0]);
-
-    // tags/tags_dummy function, the tag field of SQLFunctionCtx is from the input buffer
-    if (pExpr->functionId == TSDB_FUNC_TAG_DUMMY || pExpr->functionId == TSDB_FUNC_TAG ||
-        pExpr->functionId == TSDB_FUNC_TS_DUMMY) {
-      tVariantDestroy(&pCtx->tag);
-      tVariantCreateFromBinary(&pCtx->tag, pCtx->aInputElemBuf, pCtx->inputBytes, pCtx->inputType);
-    }
-
-    pCtx->currentStage = SECONDARY_STAGE_MERGE;
-
-    if (needInit) {
-      aAggs[pExpr->functionId].init(pCtx);
-    }
-  }
-
-  for (int32_t j = 0; j < pQueryInfo->fieldsInfo.numOfOutputCols; ++j) {
-    int32_t functionId = tscSqlExprGet(pQueryInfo, 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);
-  }
-}
-
-static int64_t getNumOfResultLocal(SQueryInfo *pQueryInfo, SQLFunctionCtx *pCtx) {
-  int64_t maxOutput = 0;
-  
-  for (int32_t j = 0; j < pQueryInfo->exprsInfo.numOfExprs; ++j) {
-    int32_t functionId = tscSqlExprGet(pQueryInfo, j)->functionId;
-
-    /*
-     * ts, tag, tagprj function can not decide the output number of current query
-     * the number of output result is decided by main output
-     */
-    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ) {
-      continue;
-    }
-
-    if (maxOutput < GET_RES_INFO(&pCtx[j])->numOfRes) {
-      maxOutput = GET_RES_INFO(&pCtx[j])->numOfRes;
-    }
-  }
-  return maxOutput;
-}
-
-/*
- * 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(SQueryInfo* pQueryInfo, int32_t numOfRes, SLocalReducer *pLocalReducer) {
-  int32_t maxBufSize = 0;  // find the max tags column length to prepare the buffer
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, k);
-    if (maxBufSize < pExpr->resBytes && pExpr->functionId == TSDB_FUNC_TAG) {
-      maxBufSize = pExpr->resBytes;
-    }
-  }
-
-  assert(maxBufSize >= 0);
-
-  char *buf = malloc((size_t) maxBufSize);
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 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);
-
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
-    memcpy(buf, pCtx->aOutputBuf, (size_t)pCtx->outputBytes);
-
-    for (int32_t i = 0; i < inc; ++i) {
-      pCtx->aOutputBuf += pCtx->outputBytes;
-      memcpy(pCtx->aOutputBuf, buf, (size_t)pCtx->outputBytes);
-    }
-  }
-
-  free(buf);
-}
-
-int32_t finalizeRes(SQueryInfo* pQueryInfo, SLocalReducer *pLocalReducer) {
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 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;
-
-  int32_t numOfRes = (int32_t)getNumOfResultLocal(pQueryInfo, pLocalReducer->pCtx);
-  pLocalReducer->pResultBuf->numOfElems += numOfRes;
-
-  fillMultiRowsOfTagsVal(pQueryInfo, numOfRes, pLocalReducer);
-  return numOfRes;
-}
-
-/*
- * points merge:
- * points are merged according to the sort info, which is tags columns and timestamp column.
- * In case of points without either tags columns or timestamp, such as
- * results generated by simple aggregation function, we merge them all into one points
- * *Exception*: column projection query, required no merge procedure
- */
-bool needToMerge(SQueryInfo* pQueryInfo, SLocalReducer *pLocalReducer, tFilePage *tmpBuffer) {
-  int32_t ret = 0;  // merge all result by default
-  int16_t functionId = tscSqlExprGet(pQueryInfo, 0)->functionId;
-
-  if (functionId == TSDB_FUNC_PRJ || functionId == TSDB_FUNC_ARITHM) {  // column projection query
-    ret = 1;                                                            // disable merge procedure
-  } else {
-    tOrderDescriptor *pDesc = pLocalReducer->pDesc;
-    if (pDesc->orderIdx.numOfOrderedCols > 0) {
-      if (pDesc->tsOrder == TSQL_SO_ASC) {  // asc
-        // todo refactor comparator
-        ret = compare_a(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
-      } else {  // desc
-        ret = compare_d(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
-      }
-    }
-  }
-
-  /* if ret == 0, means the result belongs to the same group */
-  return (ret == 0);
-}
-
-static bool reachGroupResultLimit(SQueryInfo* pQueryInfo, SSqlRes *pRes) {
-  return (pRes->numOfGroups >= pQueryInfo->slimit.limit && pQueryInfo->slimit.limit >= 0);
-}
-
-static bool saveGroupResultInfo(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  pRes->numOfGroups += 1;
-
-  // the output group is limited by the slimit clause
-  if (reachGroupResultLimit(pQueryInfo, pRes)) {
-    return true;
-  }
-
-  //    pRes->pGroupRec = realloc(pRes->pGroupRec, pRes->numOfGroups*sizeof(SResRec));
-  //    pRes->pGroupRec[pRes->numOfGroups-1].numOfRows = pRes->numOfRows;
-  //    pRes->pGroupRec[pRes->numOfGroups-1].numOfTotalInCurrentClause = pRes->numOfTotalInCurrentClause;
-
-  return false;
-}
-
-/**
- *
- * @param pSql
- * @param pLocalReducer
- * @param noMoreCurrentGroupRes
- * @return if current group is skipped, return false, and do NOT record it into pRes->numOfGroups
- */
-bool doGenerateFinalResults(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool noMoreCurrentGroupRes) {
-  SSqlCmd *  pCmd = &pSql->cmd;
-  SSqlRes *  pRes = &pSql->res;
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  tFilePage *pResBuf = pLocalReducer->pResultBuf;
-  tColModel *pModel = pLocalReducer->resColModel;
-
-  pRes->code = TSDB_CODE_SUCCESS;
-
-  /*
-   * 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 (pQueryInfo->slimit.offset > 0) {
-    pRes->numOfRows = 0;
-    pQueryInfo->slimit.offset -= 1;
-    pLocalReducer->discard = !noMoreCurrentGroupRes;
-    return false;
-  }
-
-  tColModelCompact(pModel, pResBuf, pModel->maxCapacity);
-  memcpy(pLocalReducer->pBufForInterpo, pResBuf->data, pLocalReducer->nResultBufSize);
-
-#ifdef _DEBUG_VIEW
-  printf("final result before interpo:\n");
-  tColModelDisplay(pLocalReducer->resColModel, pLocalReducer->pBufForInterpo, pResBuf->numOfElems, pResBuf->numOfElems);
-#endif
-
-  SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-  int32_t             startIndex = pQueryInfo->fieldsInfo.numOfOutputCols - pQueryInfo->groupbyExpr.numOfGroupCols;
-
-  for (int32_t i = 0; i < pQueryInfo->groupbyExpr.numOfGroupCols; ++i) {
-    memcpy(pInterpoInfo->pTags[i],
-           pLocalReducer->pBufForInterpo + pModel->colOffset[startIndex + i] * pResBuf->numOfElems,
-           pModel->pFields[startIndex + i].bytes);
-  }
-
-  taosInterpoSetStartInfo(&pLocalReducer->interpolationInfo, pResBuf->numOfElems, pQueryInfo->interpoType);
-  doInterpolateResult(pSql, pLocalReducer, noMoreCurrentGroupRes);
-
-  return true;
-}
-
-void resetOutputBuf(SQueryInfo* pQueryInfo, SLocalReducer *pLocalReducer) {  // reset output buffer to the beginning
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    pLocalReducer->pCtx[i].aOutputBuf =
-        pLocalReducer->pResultBuf->data + tscFieldInfoGetOffset(pQueryInfo, i) * pLocalReducer->resColModel->maxCapacity;
-  }
-
-  memset(pLocalReducer->pResultBuf, 0, pLocalReducer->nResultBufSize + sizeof(tFilePage));
-}
-
-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
-  pRes->numOfRows = 0;
-  pRes->numOfTotalInCurrentClause = 0;
-  
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  pQueryInfo->limit.offset = pLocalReducer->offset;
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  int16_t precision = pMeterMetaInfo->pMeterMeta->precision;
-
-  // for group result interpolation, do not return if not data is generated
-  if (pQueryInfo->interpoType != TSDB_INTERPO_NONE) {
-    int64_t stime = (pQueryInfo->stime < pQueryInfo->etime) ? pQueryInfo->stime : pQueryInfo->etime;
-    int64_t newTime = taosGetIntervalStartTimestamp(stime, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit, precision);
-
-    taosInitInterpoInfo(&pLocalReducer->interpolationInfo, pQueryInfo->order.order, newTime, pQueryInfo->groupbyExpr.numOfGroupCols,
-                        pLocalReducer->rowSize);
-  }
-}
-
-static bool isAllSourcesCompleted(SLocalReducer *pLocalReducer) {
-  return (pLocalReducer->numOfBuffer == pLocalReducer->numOfCompleted);
-}
-
-static bool doInterpolationForCurrentGroup(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SLocalReducer *     pLocalReducer = pRes->pLocalReducer;
-  SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  int8_t p = pMeterMetaInfo->pMeterMeta->precision;
-
-  if (taosHasRemainsDataForInterpolation(pInterpoInfo)) {
-    assert(pQueryInfo->interpoType != TSDB_INTERPO_NONE);
-
-    tFilePage *pFinalDataBuf = pLocalReducer->pResultBuf;
-    int64_t    etime = *(int64_t *)(pFinalDataBuf->data + TSDB_KEYSIZE * (pInterpoInfo->numOfRawDataInRows - 1));
-
-    int32_t remain = taosNumOfRemainPoints(pInterpoInfo);
-    TSKEY   ekey = taosGetRevisedEndKey(etime, pQueryInfo->order.order, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit, p);
-    int32_t rows = taosGetNumOfResultWithInterpo(pInterpoInfo, (TSKEY *)pLocalReducer->pBufForInterpo, remain,
-                                                 pQueryInfo->nAggTimeInterval, ekey, pLocalReducer->resColModel->maxCapacity);
-    if (rows > 0) {  // do interpo
-      doInterpolateResult(pSql, pLocalReducer, false);
-    }
-
-    return true;
-  } else {
-    return false;
-  }
-}
-
-static bool doHandleLastRemainData(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  SLocalReducer *     pLocalReducer = pRes->pLocalReducer;
-  SInterpolationInfo *pInterpoInfo = &pLocalReducer->interpolationInfo;
-
-  bool prevGroupCompleted = (!pLocalReducer->discard) && pLocalReducer->hasUnprocessedRow;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  int8_t precision = pMeterMetaInfo->pMeterMeta->precision;
-
-  if ((isAllSourcesCompleted(pLocalReducer) && !pLocalReducer->hasPrevRow) || pLocalReducer->pLocalDataSrc[0] == NULL ||
-      prevGroupCompleted) {
-    // if interpoType == TSDB_INTERPO_NONE, return directly
-    if (pQueryInfo->interpoType != TSDB_INTERPO_NONE) {
-      int64_t etime = (pQueryInfo->stime < pQueryInfo->etime) ? pQueryInfo->etime : pQueryInfo->stime;
-
-      etime = taosGetRevisedEndKey(etime, pQueryInfo->order.order, pQueryInfo->nAggTimeInterval, pQueryInfo->intervalTimeUnit, precision);
-      int32_t rows = taosGetNumOfResultWithInterpo(pInterpoInfo, NULL, 0, pQueryInfo->nAggTimeInterval, etime,
-                                                   pLocalReducer->resColModel->maxCapacity);
-      if (rows > 0) {  // do interpo
-        doInterpolateResult(pSql, pLocalReducer, true);
-      }
-    }
-
-    /*
-     * 1. numOfRows == 0, means no interpolation results are generated.
-     * 2. if all local data sources are consumed, and no un-processed rows exist.
-     *
-     * No results will be generated and query completed.
-     */
-    if (pRes->numOfRows > 0 || (isAllSourcesCompleted(pLocalReducer) && (!pLocalReducer->hasUnprocessedRow))) {
-      return true;
-    }
-
-    // start to process result for a new group and save the result info of previous group
-    if (saveGroupResultInfo(pSql)) {
-      return true;
-    }
-
-    resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
-  }
-
-  return false;
-}
-
-static void doMergeWithPrevRows(SSqlObj *pSql, int32_t numOfRes) {
-  SSqlCmd *      pCmd = &pSql->cmd;
-  SSqlRes *      pRes = &pSql->res;
-  
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, k);
-    SQLFunctionCtx *pCtx = &pLocalReducer->pCtx[k];
-
-    pCtx->aOutputBuf += pCtx->outputBytes * numOfRes;
-
-    // set the correct output timestamp column position
-    if (pExpr->functionId == TSDB_FUNC_TOP || pExpr->functionId == TSDB_FUNC_BOTTOM) {
-      pCtx->ptsOutputBuf = ((char *)pCtx->ptsOutputBuf + TSDB_KEYSIZE * numOfRes);
-    }
-  }
-
-  doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
-}
-
-int32_t tscDoLocalreduce(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-  
-  tscResetForNextRetrieve(pRes);
-  
-  if (pSql->signature != pSql || pRes == NULL || pRes->pLocalReducer == NULL) {  // all data has been processed
-    tscTrace("%s call the drop local reducer", __FUNCTION__);
-
-    tscDestroyLocalReducer(pSql);
-    return 0;
-  }
-  
-  SLocalReducer *pLocalReducer = pRes->pLocalReducer;
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  // set the data merge in progress
-  int32_t prevStatus =
-      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); // it is in tscDestroyLocalReducer function already
-    return TSDB_CODE_SUCCESS;
-  }
-
-  tFilePage *tmpBuffer = pLocalReducer->pTempBuffer;
-
-  if (doHandleLastRemainData(pSql)) {
-    pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (doInterpolationForCurrentGroup(pSql)) {
-    pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
-    return TSDB_CODE_SUCCESS;
-  }
-
-  SLoserTreeInfo *pTree = pLocalReducer->pLoserTree;
-
-  // clear buffer
-  handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
-  tColModel *pModel = pLocalReducer->pDesc->pSchema;
-
-  while (1) {
-    if (isAllSourcesCompleted(pLocalReducer)) {
-      break;
-    }
-
-#ifdef _DEBUG_VIEW
-    printf("chosen data in pTree[0] = %d\n", pTree->pNode[0].index);
-#endif
-    assert((pTree->pNode[0].index < pLocalReducer->numOfBuffer) && (pTree->pNode[0].index >= 0) &&
-           tmpBuffer->numOfElems == 0);
-
-    // chosen from loser tree
-    SLocalDataSource *pOneDataSrc = pLocalReducer->pLocalDataSrc[pTree->pNode[0].index];
-
-    tColModelAppend(pModel, tmpBuffer, pOneDataSrc->filePage.data, pOneDataSrc->rowIdx, 1,
-                    pOneDataSrc->pMemBuffer->pColModel->maxCapacity);
-
-#if defined(_DEBUG_VIEW)
-    printf("chosen row:\t");
-    SSrcColumnInfo colInfo[256] = {0};
-    tscGetSrcColumnInfo(colInfo, pQueryInfo);
-
-    tColModelDisplayEx(pModel, tmpBuffer->data, tmpBuffer->numOfElems, pModel->maxCapacity, colInfo);
-#endif
-
-    if (pLocalReducer->discard) {
-      assert(pLocalReducer->hasUnprocessedRow == false);
-
-      /* current record belongs to the same group of previous record, need to discard it */
-      if (isSameGroup(pCmd, pLocalReducer, pLocalReducer->discardData->data, tmpBuffer)) {
-        tmpBuffer->numOfElems = 0;
-        pOneDataSrc->rowIdx += 1;
-
-        adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
-
-        // all inputs are exhausted, abort current process
-        if (isAllSourcesCompleted(pLocalReducer)) {
-          break;
-        }
-
-        // data belongs to the same group needs to be discarded
-        continue;
-      } else {
-        pLocalReducer->discard = false;
-        pLocalReducer->discardData->numOfElems = 0;
-
-        if (saveGroupResultInfo(pSql)) {
-          pLocalReducer->status = TSC_LOCALREDUCE_READY;
-          return TSDB_CODE_SUCCESS;
-        }
-
-        resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
-      }
-    }
-
-    if (pLocalReducer->hasPrevRow) {
-      if (needToMerge(pQueryInfo, pLocalReducer, tmpBuffer)) {
-        // belong to the group of the previous row, continue process it
-        doExecuteSecondaryMerge(pCmd, pLocalReducer, false);
-
-        // copy to buffer
-        savePreviousRow(pLocalReducer, tmpBuffer);
-      } else {
-        /*
-         * current row does not belong to the group of previous row.
-         * so the processing of previous group is completed.
-         */
-        int32_t numOfRes = finalizeRes(pQueryInfo, pLocalReducer);
-
-        bool       sameGroup = isSameGroup(pCmd, pLocalReducer, pLocalReducer->prevRowOfInput, tmpBuffer);
-        tFilePage *pResBuf = pLocalReducer->pResultBuf;
-
-        /*
-         * if the previous group does NOT generate any result (pResBuf->numOfElems == 0),
-         * continue to process results instead of return results.
-         */
-        if ((!sameGroup && pResBuf->numOfElems > 0) ||
-            (pResBuf->numOfElems == pLocalReducer->resColModel->maxCapacity)) {
-          // does not belong to the same group
-          bool notSkipped = doGenerateFinalResults(pSql, pLocalReducer, !sameGroup);
-
-          // this row needs to discard, since it belongs to the group of previous
-          if (pLocalReducer->discard && sameGroup) {
-            pLocalReducer->hasUnprocessedRow = false;
-            tmpBuffer->numOfElems = 0;
-          } else {
-            // current row does not belongs to the previous group, so it is not be handled yet.
-            pLocalReducer->hasUnprocessedRow = true;
-          }
-
-          resetOutputBuf(pQueryInfo, pLocalReducer);
-          pOneDataSrc->rowIdx += 1;
-
-          // here we do not check the return value
-          adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
-          assert(pLocalReducer->status == TSC_LOCALREDUCE_IN_PROGRESS);
-
-          if (pRes->numOfRows == 0) {
-            handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
-
-            if (!sameGroup) {
-              /*
-               * previous group is done, prepare for the next group
-               * If previous group is not skipped, keep it in pRes->numOfGroups
-               */
-              if (notSkipped && saveGroupResultInfo(pSql)) {
-                pLocalReducer->status = TSC_LOCALREDUCE_READY;
-                return TSDB_CODE_SUCCESS;
-              }
-
-              resetEnvForNewResultset(pRes, pCmd, pLocalReducer);
-            }
-          } else {
-            /*
-             * if next record belongs to a new group, we do not handle this record here.
-             * We start the process in a new round.
-             */
-            if (sameGroup) {
-              handleUnprocessedRow(pCmd, pLocalReducer, tmpBuffer);
-            }
-          }
-
-          // current group has no result,
-          if (pRes->numOfRows == 0) {
-            continue;
-          } else {
-            pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
-            return TSDB_CODE_SUCCESS;
-          }
-        } else {  // result buffer is not full
-          doMergeWithPrevRows(pSql, numOfRes);
-          savePreviousRow(pLocalReducer, tmpBuffer);
-        }
-      }
-    } else {
-      doExecuteSecondaryMerge(pCmd, pLocalReducer, true);
-      savePreviousRow(pLocalReducer, tmpBuffer);  // copy the processed row to buffer
-    }
-
-    pOneDataSrc->rowIdx += 1;
-    adjustLoserTreeFromNewData(pLocalReducer, pOneDataSrc, pTree);
-  }
-
-  if (pLocalReducer->hasPrevRow) {
-    finalizeRes(pQueryInfo, pLocalReducer);
-  }
-
-  if (pLocalReducer->pResultBuf->numOfElems) {
-    doGenerateFinalResults(pSql, pLocalReducer, true);
-  }
-
-  assert(pLocalReducer->status == TSC_LOCALREDUCE_IN_PROGRESS && pRes->row == 0);
-  pLocalReducer->status = TSC_LOCALREDUCE_READY;  // set the flag, taos_free_result can release this result.
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen) {
-  SSqlRes *pRes = &pObj->res;
-  if (pRes->pLocalReducer != NULL) {
-    tscDestroyLocalReducer(pObj);
-  }
-
-  pRes->qhandle = 1;  // hack to pass the safety check in fetch_row function
-  pRes->numOfRows = 0;
-  pRes->row = 0;
-
-  pRes->rspType = 0;  // used as a flag to denote if taos_retrieved() has been called yet
-  pRes->pLocalReducer = (SLocalReducer *)calloc(1, sizeof(SLocalReducer));
-
-  /*
-   * we need one additional byte space
-   * the sprintf function needs one additional space to put '\0' at the end of string
-   */
-  size_t allocSize = numOfRes * rowLen + sizeof(tFilePage) + 1;
-  pRes->pLocalReducer->pResultBuf = (tFilePage *)calloc(1, allocSize);
-
-  pRes->pLocalReducer->pResultBuf->numOfElems = numOfRes;
-  pRes->data = pRes->pLocalReducer->pResultBuf->data;
-}
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 677f728472382fe35990a4aea2c8f6e2eb4a8505..0a5cfef80a1bd642fb6376712e39369a47e2c798 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -15,1588 +15,614 @@
 
 #include "os.h"
 #include "tcache.h"
+#include "tcmdtype.h"
 #include "trpc.h"
-#include "tscJoinProcess.h"
+#include "tscLocalMerge.h"
+#include "tscLog.h"
 #include "tscProfile.h"
-#include "tscSQLParser.h"
-#include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
-#include "tscompression.h"
-#include "tsocket.h"
-#include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
+#include "tlockfree.h"
 
-#define TSC_MGMT_VNODE 999
-
-SIpStrList tscMgmtIpList;
-int        tsMasterIndex = 0;
-int        tsSlaveIndex = 1;
+SRpcCorEpSet  tscMgmtEpSet;
 
 int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo) = {0};
 
 int (*tscProcessMsgRsp[TSDB_SQL_MAX])(SSqlObj *pSql);
-char *doBuildMsgHeader(SSqlObj *pSql, char **pStart);
-void (*tscUpdateVnodeMsg[TSDB_SQL_MAX])(SSqlObj *pSql, char *buf);
 void tscProcessActivityTimer(void *handle, void *tmrId);
 int tscKeepConn[TSDB_SQL_MAX] = {0};
-TSKEY tscGetSubscriptionProgress(void* sub, int64_t uid);
+
+TSKEY tscGetSubscriptionProgress(void* sub, int64_t uid, TSKEY dflt);
 void tscUpdateSubscriptionProgress(void* sub, int64_t uid, TSKEY ts);
 void tscSaveSubscriptionProgress(void* sub);
 
-static int32_t minMsgSize() { return tsRpcHeadSize + sizeof(STaosDigest); }
-
-void tscPrintMgmtIp() {
-  if (tscMgmtIpList.numOfIps <= 0) {
-    tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps);
-  } else {
-    for (int i = 0; i < tscMgmtIpList.numOfIps; ++i) {
-      tscTrace("mgmt index:%d ip:%s", i, tscMgmtIpList.ipstr[i]);
-    }
-  }
-}
-
-void tscSetMgmtIpListFromCluster(SIpList *pIpList) {
-  tscMgmtIpList.numOfIps = pIpList->numOfIps;
-  if (memcmp(tscMgmtIpList.ip, pIpList->ip, pIpList->numOfIps * 4) != 0) {
-    for (int i = 0; i < pIpList->numOfIps; ++i) {
-      tinet_ntoa(tscMgmtIpList.ipstr[i], pIpList->ip[i]);
-      tscMgmtIpList.ip[i] = pIpList->ip[i];
-    }
-    tscTrace("cluster mgmt IP list:");
-    tscPrintMgmtIp();
-  }
-}
-
-void tscSetMgmtIpListFromEdge() {
-  if (tscMgmtIpList.numOfIps != 2) {
-    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);
-    tscTrace("edge mgmt IP list:");
-    tscPrintMgmtIp();
+static int32_t minMsgSize() { return tsRpcHeadSize + 100; }
+static int32_t getWaitingTimeInterval(int32_t count) {
+  int32_t initial = 100; // 100 ms by default
+  if (count <= 1) {
+    return 0;
   }
-}
 
-void tscSetMgmtIpList(SIpList *pIpList) {
-  /*
-    * The iplist returned by the cluster edition is the current management nodes
-    * and the iplist returned by the edge edition is empty
-    */
-  if (pIpList->numOfIps != 0) {
-    tscSetMgmtIpListFromCluster(pIpList);
-  } else {
-    tscSetMgmtIpListFromEdge();
-  }
+  return initial * (2<<(count - 2));
 }
 
-/*
- * For each management node, try twice at least in case of poor network situation.
- * If the client start to connect to a non-management node from the client, and the first retry may fail due to
- * the poor network quality. And then, the second retry get the response with redirection command.
- * The retry will not be executed since only *two* retry is allowed in case of single management node in the cluster.
- * Therefore, we need to multiply the retry times by factor of 2 to fix this problem.
- */
-static int32_t tscGetMgmtConnMaxRetryTimes() {
-  int32_t factor = 2;
-  return tscMgmtIpList.numOfIps * factor;
-}
+static void tscSetDnodeEpSet(SSqlObj* pSql, SCMVgroupInfo* pVgroupInfo) {
+  assert(pSql != NULL && pVgroupInfo != NULL && pVgroupInfo->numOfEps > 0);
 
-void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
-  STscObj *pObj = (STscObj *)param;
-  if (pObj == NULL) return;
-  if (pObj != pObj->signature) {
-    tscError("heart beat msg, pObj:%p, signature:%p invalid", pObj, pObj->signature);
-    return;
-  }
+  SRpcEpSet* pEpSet = &pSql->epSet;
+  pEpSet->inUse = 0;
 
-  SSqlObj *pSql = pObj->pHb;
-  SSqlRes *pRes = &pSql->res;
+  // apply the FQDN string length check here
+  bool hasFqdn = false;
 
-  if (code == 0) {
-    SHeartBeatRsp *pRsp = (SHeartBeatRsp *)pRes->pRsp;
-    SIpList *      pIpList = &pRsp->ipList;
-    tscSetMgmtIpList(pIpList);
+  pEpSet->numOfEps = pVgroupInfo->numOfEps;
+  for(int32_t i = 0; i < pVgroupInfo->numOfEps; ++i) {
+    strcpy(pEpSet->fqdn[i], pVgroupInfo->epAddr[i].fqdn);
+    pEpSet->port[i] = pVgroupInfo->epAddr[i].port;
 
-    if (pRsp->killConnection) {
-      tscKillConnection(pObj);
-    } else {
-      if (pRsp->queryId) tscKillQuery(pObj, pRsp->queryId);
-      if (pRsp->streamId) tscKillStream(pObj, pRsp->streamId);
+    if (!hasFqdn) {
+      hasFqdn = (strlen(pEpSet->fqdn[i]) > 0);
     }
-  } else {
-    tscTrace("heart beat failed, code:%d", code);
   }
 
-  taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
+  assert(hasFqdn);
 }
 
-void tscProcessActivityTimer(void *handle, void *tmrId) {
-  STscObj *pObj = (STscObj *)handle;
-
-  if (pObj == NULL) return;
-  if (pObj->signature != pObj) return;
-  if (pObj->pTimer != tmrId) return;
-
-  if (pObj->pHb == NULL) {
-    SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
-    if (NULL == pSql) return;
-
-    pSql->fp = tscProcessHeartBeatRsp;
-    
-    SQueryInfo *pQueryInfo = NULL;
-    tscGetQueryInfoDetailSafely(&pSql->cmd, 0, &pQueryInfo);
-    pQueryInfo->command = TSDB_SQL_HB;
-    
-    if (TSDB_CODE_SUCCESS != tscAllocPayload(&(pSql->cmd), TSDB_DEFAULT_PAYLOAD_SIZE)) {
-      tfree(pSql);
-      return;
-    }
-
-    pSql->param = pObj;
-    pSql->pTscObj = pObj;
-    pSql->signature = pSql;
-    pObj->pHb = pSql;
-    tscAddSubqueryInfo(&pObj->pHb->cmd);
-
-    tscTrace("%p pHb is allocated, pObj:%p", pObj->pHb, pObj);
-  }
-
-  if (tscShouldFreeHeatBeat(pObj->pHb)) {
-    tscTrace("%p free HB object and release connection, pConn:%p", pObj, pObj->pHb->thandle);
-    taosCloseRpcConn(pObj->pHb->thandle);
-
-    tscFreeSqlObj(pObj->pHb);
-    tscCloseTscObj(pObj);
-    return;
-  }
-
-  tscProcessSql(pObj->pHb);
-}
-
-void tscGetConnToMgmt(SSqlObj *pSql, uint8_t *pCode) {
-  STscObj *pTscObj = pSql->pTscObj;
-  if (pSql->retry < tscGetMgmtConnMaxRetryTimes()) {
-    *pCode = 0;
-    pSql->retry++;
-    pSql->index = pSql->index % tscMgmtIpList.numOfIps;
-    if (pSql->cmd.command > TSDB_SQL_READ && pSql->index == 0) pSql->index = 1;
-    void *thandle = taosGetConnFromCache(tscConnCache, tscMgmtIpList.ip[pSql->index], TSC_MGMT_VNODE, pTscObj->user);
-
-    if (thandle == NULL) {
-      SRpcConnInit connInit;
-      memset(&connInit, 0, sizeof(connInit));
-      connInit.cid = 0;
-      connInit.sid = 0;
-      connInit.meterId = pSql->pTscObj->user;
-      connInit.peerId = 0;
-      connInit.shandle = pTscMgmtConn;
-      connInit.ahandle = pSql;
-      connInit.peerPort = tsMgmtShellPort;
-      connInit.spi = 1;
-      connInit.encrypt = 0;
-      connInit.secret = pSql->pTscObj->pass;
-      
-      connInit.peerIp = tscMgmtIpList.ipstr[pSql->index];
-      thandle = taosOpenRpcConn(&connInit, pCode);
-    }
-
-    pSql->thandle = thandle;
-    pSql->ip = tscMgmtIpList.ip[pSql->index];
-    pSql->vnode = TSC_MGMT_VNODE;
-    tscTrace("%p mgmt index:%d ip:0x%x is picked up, pConn:%p", pSql, pSql->index, tscMgmtIpList.ip[pSql->index],
-             pSql->thandle);
-  }
-
-  // the pSql->res.code is the previous error(status) code.
-  if (pSql->thandle == NULL && pSql->retry >= pSql->maxRetry) {
-    if (pSql->res.code != TSDB_CODE_SUCCESS && pSql->res.code != TSDB_CODE_ACTION_IN_PROGRESS) {
-      *pCode = pSql->res.code;
-    }
-
-    tscError("%p reach the max retry:%d, code:%d", pSql, pSql->retry, *pCode);
-  }
+static void tscDumpMgmtEpSet(SRpcEpSet *epSet) {
+  taosCorBeginRead(&tscMgmtEpSet.version);
+  *epSet = tscMgmtEpSet.epSet;
+  taosCorEndRead(&tscMgmtEpSet.version);
+}  
+static void tscEpSetHtons(SRpcEpSet *s) {
+   for (int32_t i = 0; i < s->numOfEps; i++) {
+      s->port[i] = htons(s->port[i]);    
+   }
+} 
+bool tscEpSetIsEqual(SRpcEpSet *s1, SRpcEpSet *s2) {
+   if (s1->numOfEps != s2->numOfEps || s1->inUse != s2->inUse) {
+     return false;
+   } 
+   for (int32_t i = 0; i < s1->numOfEps; i++) {
+     if (s1->port[i] != s2->port[i] 
+        || strncmp(s1->fqdn[i], s2->fqdn[i], TSDB_FQDN_LEN) != 0)
+        return false;
+   }
+   return true;
 }
-
-void tscGetConnToVnode(SSqlObj *pSql, uint8_t *pCode) {
-  SVPeerDesc *pVPeersDesc = NULL;
-  static int  vidIndex = 0;
-  STscObj *   pTscObj = pSql->pTscObj;
-
-  pSql->thandle = NULL;
-
-  SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {  // multiple vnode query
-    SVnodeSidList *vnodeList = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, pMeterMetaInfo->vnodeIndex);
-    if (vnodeList != NULL) {
-      pVPeersDesc = vnodeList->vpeerDesc;
-    }
-  } else {
-    SMeterMeta *pMeta = pMeterMetaInfo->pMeterMeta;
-    if (pMeta == NULL) {
-      tscError("%p pMeterMeta is NULL", pSql);
-      pSql->retry = pSql->maxRetry;
-      return;
-    }
-    pVPeersDesc = pMeta->vpeerDesc;
-  }
-
-  if (pVPeersDesc == NULL) {
-    pSql->retry = pSql->maxRetry;
-    tscError("%p pVPeerDesc is NULL", pSql);
-  }
-
-  while (pSql->retry < pSql->maxRetry) {
-    (pSql->retry)++;
-    char ipstr[40] = {0};
-    if (pVPeersDesc[pSql->index].ip == 0) {
-      /*
-       * in the edge edition, ip is 0, and at this time we use masterIp instead
-       * in the cluster edition, ip is vnode ip
-       */
-      pVPeersDesc[pSql->index].ip = tscMgmtIpList.ip[0];
-    }
-    *pCode = TSDB_CODE_SUCCESS;
-
-    void *thandle =
-        taosGetConnFromCache(tscConnCache, pVPeersDesc[pSql->index].ip, pVPeersDesc[pSql->index].vnode, pTscObj->user);
-
-    if (thandle == NULL) {
-      SRpcConnInit connInit;
-      tinet_ntoa(ipstr, pVPeersDesc[pSql->index].ip);
-      memset(&connInit, 0, sizeof(connInit));
-      connInit.cid = vidIndex;
-      connInit.sid = 0;
-      connInit.spi = 0;
-      connInit.encrypt = 0;
-      connInit.meterId = pSql->pTscObj->user;
-      connInit.peerId = htonl((pVPeersDesc[pSql->index].vnode << TSDB_SHELL_VNODE_BITS));
-      connInit.shandle = pVnodeConn;
-      connInit.ahandle = pSql;
-      connInit.peerIp = ipstr;
-      connInit.peerPort = tsVnodeShellPort;
-      thandle = taosOpenRpcConn(&connInit, pCode);
-      vidIndex = (vidIndex + 1) % tscNumOfThreads;
-    }
-
-    pSql->thandle = thandle;
-    pSql->ip = pVPeersDesc[pSql->index].ip;
-    pSql->vnode = pVPeersDesc[pSql->index].vnode;
-    tscTrace("%p vnode:%d ip:%p index:%d is picked up, pConn:%p", pSql, pVPeersDesc[pSql->index].vnode,
-             pVPeersDesc[pSql->index].ip, pSql->index, pSql->thandle);
-
-    break;
-  }
-
-  // the pSql->res.code is the previous error(status) code.
-  if (pSql->thandle == NULL && pSql->retry >= pSql->maxRetry) {
-    if (pSql->res.code != TSDB_CODE_SUCCESS && pSql->res.code != TSDB_CODE_ACTION_IN_PROGRESS) {
-      *pCode = pSql->res.code;
-    }
-
-    tscError("%p reach the max retry:%d, code:%d", pSql, pSql->retry, *pCode);
-  }
+void tscUpdateMgmtEpSet(SRpcEpSet *pEpSet) {
+  // no need to update if equal
+  taosCorBeginWrite(&tscMgmtEpSet.version);
+  tscMgmtEpSet.epSet = *pEpSet;
+  taosCorEndWrite(&tscMgmtEpSet.version);
 }
-
-int tscSendMsgToServer(SSqlObj *pSql) {
-  uint8_t code = TSDB_CODE_NETWORK_UNAVAIL;
-
-  if (pSql->thandle == NULL) {
-    if (pSql->cmd.command < TSDB_SQL_MGMT)
-      tscGetConnToVnode(pSql, &code);
-    else
-      tscGetConnToMgmt(pSql, &code);
+static void tscDumpEpSetFromVgroupInfo(SCMCorVgroupInfo *pVgroupInfo, SRpcEpSet *pEpSet) {
+  if (pVgroupInfo == NULL) { return;}
+  taosCorBeginRead(&pVgroupInfo->version);
+  int8_t inUse = pVgroupInfo->inUse;
+  pEpSet->inUse = (inUse >= 0 && inUse < TSDB_MAX_REPLICA) ? inUse: 0; 
+  pEpSet->numOfEps = pVgroupInfo->numOfEps;  
+  for (int32_t i = 0; i < pVgroupInfo->numOfEps; ++i) {
+    tstrncpy(pEpSet->fqdn[i], pVgroupInfo->epAddr[i].fqdn, sizeof(pEpSet->fqdn[i]));
+    pEpSet->port[i] = pVgroupInfo->epAddr[i].port;
   }
-
-  if (pSql->thandle) {
-    /*
-     * the total length of message
-     * rpc header + actual message body + digest
-     *
-     * the pSql object may be released automatically during insert procedure, in which the access of
-     * message body by using "if (pHeader->msgType & 1)" may cause the segment fault.
-     *
-     */
-    size_t totalLen = pSql->cmd.payloadLen + tsRpcHeadSize + sizeof(STaosDigest);
-
-    // the memory will be released by taosProcessResponse, so no memory leak here
-    char *buf = malloc(totalLen);
-    if (NULL == buf) {
-      tscError("%p msg:%s malloc fail", pSql, taosMsg[pSql->cmd.msgType]);
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
-    }
-    memcpy(buf, pSql->cmd.payload, totalLen);
-
-    tscTrace("%p msg:%s is sent to server", pSql, taosMsg[pSql->cmd.msgType]);
-
-    char *pStart = taosBuildReqHeader(pSql->thandle, pSql->cmd.msgType, buf);
-    if (pStart) {
-      /*
-       * this SQL object may be released by other thread due to the completion of this query even before the log
-       * is dumped to log file. So the signature needs to be kept in a local variable.
-       */
-      uint64_t signature = (uint64_t)pSql->signature;
-      if (tscUpdateVnodeMsg[pSql->cmd.command]) (*tscUpdateVnodeMsg[pSql->cmd.command])(pSql, buf);
-
-      int ret = taosSendMsgToPeerH(pSql->thandle, pStart, pSql->cmd.payloadLen, pSql);
-      if (ret >= 0) {
-        code = 0;
-      }
-
-      tscTrace("%p send msg ret:%d code:%d sig:%p", pSql, ret, code, signature);
-    }
-  }
-
-  return code;
-}
-
-void tscProcessMgmtRedirect(SSqlObj *pSql, uint8_t *cont) {
-  SIpList *pIpList = (SIpList *)(cont);
-  tscSetMgmtIpList(pIpList);
-
-  if (pSql->cmd.command < TSDB_SQL_READ) {
-    tsMasterIndex = 0;
-    pSql->index = 0;
-  } else {
-    pSql->index++;
-  }
-
-  tscPrintMgmtIp();
+  taosCorEndRead(&pVgroupInfo->version);
 }
 
-void *tscProcessMsgFromServer(char *msg, void *ahandle, void *thandle) {
-  if (ahandle == NULL) return NULL;
-
-  SIntMsg *pMsg = (SIntMsg *)msg;
-  SSqlObj *pSql = (SSqlObj *)ahandle;
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-  STscObj *pObj = pSql->pTscObj;
-  int      code = TSDB_CODE_NETWORK_UNAVAIL;
-
-  if (pSql->signature != pSql) {
-    tscError("%p sql is already released, signature:%p", pSql, pSql->signature);
-    return NULL;
-  }
-
-  if (pSql->thandle != thandle) {
-    tscError("%p thandle:%p is different from received:%p", pSql, pSql->thandle, thandle);
-    return NULL;
-  }
-
-  tscTrace("%p msg:%p is received from server, pConn:%p", pSql, msg, thandle);
-
-  if (pSql->freed || pObj->signature != pObj) {
-    tscTrace("%p sql is already released or DB connection is closed, freed:%d pObj:%p signature:%p", pSql, pSql->freed,
-             pObj, pObj->signature);
-    taosAddConnIntoCache(tscConnCache, pSql->thandle, pSql->ip, pSql->vnode, pObj->user);
-    tscFreeSqlObj(pSql);
-    return ahandle;
-  }
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  if (msg == NULL) {
-    tscTrace("%p no response from ip:%s", pSql, taosIpStr(pSql->ip));
-
-    pSql->index++;
-    pSql->thandle = NULL;
-    // todo taos_stop_query() in async model
-    /*
-     * in case of
-     * 1. query cancelled(pRes->code != TSDB_CODE_QUERY_CANCELLED), do NOT re-issue the request to server.
-     * 2. retrieve, do NOT re-issue the retrieve request since the qhandle may have been released by server
-     */
-    if (pCmd->command != TSDB_SQL_FETCH && pCmd->command != TSDB_SQL_RETRIEVE && pCmd->command != TSDB_SQL_KILL_QUERY &&
-        pRes->code != TSDB_CODE_QUERY_CANCELLED) {
-      code = tscSendMsgToServer(pSql);
-      if (code == 0) return NULL;
-    }
-
-    // renew meter meta in case it is changed
-    if (pCmd->command < TSDB_SQL_FETCH && pRes->code != TSDB_CODE_QUERY_CANCELLED) {
-      pSql->maxRetry = TSDB_VNODES_SUPPORT * 2;
-      code = tscRenewMeterMeta(pSql, pMeterMetaInfo->name);
-      pRes->code = code;
-      if (code == TSDB_CODE_ACTION_IN_PROGRESS) return pSql;
-
-      if (pMeterMetaInfo->pMeterMeta) {
-        code = tscSendMsgToServer(pSql);
-        if (code == 0) return pSql;
-      }
-    }
-  } else {
-    uint16_t rspCode = pMsg->content[0];
-    
-    if (rspCode == TSDB_CODE_REDIRECT) {
-      tscTrace("%p it shall be redirected!", pSql);
-      taosAddConnIntoCache(tscConnCache, thandle, pSql->ip, pSql->vnode, pObj->user);
-      pSql->thandle = NULL;
-
-      if (pCmd->command > TSDB_SQL_MGMT) {
-        tscProcessMgmtRedirect(pSql, pMsg->content + 1);
-      } else if (pCmd->command == TSDB_SQL_INSERT) {
-        pSql->index++;
-        pSql->maxRetry = TSDB_VNODES_SUPPORT * 2;
-      } else {
-        pSql->index++;
-      }
-
-      code = tscSendMsgToServer(pSql);
-      if (code == 0) return pSql;
-      msg = NULL;
-    } else if (rspCode == TSDB_CODE_NOT_ACTIVE_TABLE || rspCode == TSDB_CODE_INVALID_TABLE_ID ||
-        rspCode == TSDB_CODE_INVALID_VNODE_ID || rspCode == TSDB_CODE_NOT_ACTIVE_VNODE ||
-        rspCode == TSDB_CODE_NETWORK_UNAVAIL || rspCode == TSDB_CODE_NOT_ACTIVE_SESSION ||
-        rspCode == TSDB_CODE_TABLE_ID_MISMATCH) {
-      /*
-       * not_active_table: 1. the virtual node may fail to create table, since the procedure of create table is asynchronized,
-       *                   the virtual node may have not create table till now, so try again by using the new metermeta.
-       *                   2. this requested table may have been removed by other client, so we need to renew the
-       *                   metermeta here.
-       *
-       * not_active_vnode: current vnode is move to other node due to node balance procedure or virtual node have been
-       *                   removed. So, renew metermeta and try again.
-       * not_active_session: db has been move to other node, the vnode does not exist on this dnode anymore.
-       */
-     pSql->thandle = NULL;
-      taosAddConnIntoCache(tscConnCache, thandle, pSql->ip, pSql->vnode, pObj->user);
-
-      if (pCmd->command == TSDB_SQL_CONNECT) {
-        code = TSDB_CODE_NETWORK_UNAVAIL;
-      } else if (pCmd->command == TSDB_SQL_HB) {
-        code = TSDB_CODE_NOT_READY;
-      } else {
-        tscTrace("%p it shall renew meter meta, code:%d", pSql, rspCode);
-
-        pSql->maxRetry = TSDB_VNODES_SUPPORT * 2;
-        pSql->res.code = (uint8_t)rspCode;  // keep the previous error code
-
-        code = tscRenewMeterMeta(pSql, pMeterMetaInfo->name);
-        if (code == TSDB_CODE_ACTION_IN_PROGRESS) return pSql;
-
-        if (pMeterMetaInfo->pMeterMeta) {
-          code = tscSendMsgToServer(pSql);
-          if (code == 0) return pSql;
-        }
-      }
-
-      msg = NULL;
-    } else {  // for other error set and return to invoker
-      code = rspCode;
-    }
-  }
-
-  pSql->retry = 0;
-
-  if (msg) {
-    if (pCmd->command < TSDB_SQL_MGMT) {
-      if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-        if (pMeterMetaInfo->pMeterMeta)  // it may be deleted
-          pMeterMetaInfo->pMeterMeta->index = pSql->index;
-      } else {
-        SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, pMeterMetaInfo->vnodeIndex);
-        pVnodeSidList->index = pSql->index;
-      }
-    } else {
-      if (pCmd->command > TSDB_SQL_READ)
-        tsSlaveIndex = pSql->index;
-      else
-        tsMasterIndex = pSql->index;
-    }
-  }
-
-  if (pSql->fp == NULL) tsem_wait(&pSql->emptyRspSem);
+static void tscUpdateVgroupInfo(SSqlObj *pObj, SRpcEpSet *pEpSet) {
+  SSqlCmd *pCmd = &pObj->cmd;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  if (pTableMetaInfo == NULL || pTableMetaInfo->pTableMeta == NULL) { return;}
+  SCMCorVgroupInfo *pVgroupInfo = &pTableMetaInfo->pTableMeta->corVgroupInfo;
 
-  pRes->rspLen = 0;
-  if (pRes->code != TSDB_CODE_QUERY_CANCELLED) {
-    pRes->code = (code != TSDB_CODE_SUCCESS) ? code : TSDB_CODE_NETWORK_UNAVAIL;
-  } else {
-    tscTrace("%p query is cancelled, code:%d", pSql, pRes->code);
+  taosCorBeginWrite(&pVgroupInfo->version);
+  tscDebug("before: Endpoint in use: %d", pVgroupInfo->inUse);
+  pVgroupInfo->inUse = pEpSet->inUse;
+  pVgroupInfo->numOfEps = pEpSet->numOfEps;
+  for (int32_t i = 0; i < pVgroupInfo->numOfEps; i++) {
+    tstrncpy(pVgroupInfo->epAddr[i].fqdn, pEpSet->fqdn[i], TSDB_FQDN_LEN);
+    pVgroupInfo->epAddr[i].port = pEpSet->port[i];
   }
-
-  if (msg && pRes->code != TSDB_CODE_QUERY_CANCELLED) {
-    assert(pMsg->msgType == pCmd->msgType + 1);
-    pRes->code = pMsg->content[0];
-    pRes->rspType = pMsg->msgType;
-    pRes->rspLen = pMsg->msgLen - sizeof(SIntMsg);
-
-    char *tmp = (char *)realloc(pRes->pRsp, pRes->rspLen);
-    if (tmp == NULL) {
-      pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    } else {
-      pRes->pRsp = tmp;
-      if (pRes->rspLen) {
-        memcpy(pRes->pRsp, pMsg->content + 1, pRes->rspLen - 1);
-      }
-    }
-
-    // ignore the error information returned from mnode when set ignore flag in sql
-    if (pRes->code == TSDB_CODE_DB_ALREADY_EXIST && pCmd->existsCheck && pRes->rspType == TSDB_MSG_TYPE_CREATE_DB_RSP) {
-      pRes->code = TSDB_CODE_SUCCESS;
-    }
-
-    /*
-     * There is not response callback function for submit response.
-     * The actual inserted number of points is the first number.
-     */
-    if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT_RSP) {
-      pRes->numOfRows += *(int32_t *)pRes->pRsp;
-
-      tscTrace("%p cmd:%d code:%d, inserted rows:%d, rsp len:%d", pSql, pCmd->command, pRes->code,
-               *(int32_t *)pRes->pRsp, pRes->rspLen);
-    } else {
-      tscTrace("%p cmd:%d code:%d rsp len:%d", pSql, pCmd->command, pRes->code, pRes->rspLen);
-    }
-  }
-
-  if (tscKeepConn[pCmd->command] == 0 ||
-      (pRes->code != TSDB_CODE_SUCCESS && pRes->code != TSDB_CODE_ACTION_IN_PROGRESS)) {
-    if (pSql->thandle != NULL) {
-      taosAddConnIntoCache(tscConnCache, pSql->thandle, pSql->ip, pSql->vnode, pObj->user);
-      pSql->thandle = NULL;
-    }
-  }
-
-  if (pSql->fp == NULL) {
-    tsem_post(&pSql->rspSem);
-  } else {
-    if (pRes->code == TSDB_CODE_SUCCESS && tscProcessMsgRsp[pCmd->command])
-      code = (*tscProcessMsgRsp[pCmd->command])(pSql);
-
-    if (code != TSDB_CODE_ACTION_IN_PROGRESS) {
-      int   command = pCmd->command;
-      void *taosres = tscKeepConn[command] ? pSql : NULL;
-      code = pRes->code ? -pRes->code : pRes->numOfRows;
-
-      tscTrace("%p Async SQL result:%d res:%p", pSql, code, taosres);
-
-      /*
-       * Whether to free sqlObj or not should be decided before call the user defined function, since this SqlObj
-       * may be freed in UDF, and reused by other threads before tscShouldFreeAsyncSqlObj called, in which case
-       * tscShouldFreeAsyncSqlObj checks an object which is actually allocated by other threads.
-       *
-       * If this block of memory is re-allocated for an insert thread, in which tscKeepConn[command] equals to 0,
-       * the tscShouldFreeAsyncSqlObj will success and tscFreeSqlObj free it immediately.
-       */
-      bool shouldFree = tscShouldFreeAsyncSqlObj(pSql);
-      if (command == TSDB_SQL_INSERT) {  // handle multi-vnode insertion situation
-        (*pSql->fp)(pSql, taosres, code);
-      } else {
-        (*pSql->fp)(pSql->param, taosres, code);
-      }
-
-      if (shouldFree) {
-        // If it is failed, all objects allocated during execution taos_connect_a should be released
-        if (command == TSDB_SQL_CONNECT) {
-          taos_close(pObj);
-          tscTrace("%p Async sql close failed connection", pSql);
-        } else {
-          tscFreeSqlObj(pSql);
-          tscTrace("%p Async sql is automatically freed", pSql);
-        }
-      }
-    }
-  }
-
-  return ahandle;
+  tscDebug("after: EndPoint in use: %d", pVgroupInfo->inUse);
+  taosCorEndWrite(&pVgroupInfo->version);
 }
 
-static SSqlObj *tscCreateSqlObjForSubquery(SSqlObj *pSql, SRetrieveSupport *trsupport, SSqlObj *prevSqlObj);
-static int      tscLaunchSTableSubqueries(SSqlObj *pSql);
-
-// todo merge with callback
-int32_t tscLaunchJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSubquerySupporter *pSupporter) {
-  SSqlCmd *   pCmd = &pSql->cmd;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-
-  pSql->res.qhandle = 0x1;
-  pSql->res.numOfRows = 0;
-
-  if (pSql->pSubs == NULL) {
-    pSql->pSubs = calloc(pSupporter->pState->numOfTotal, POINTER_BYTES);
-    if (pSql->pSubs == NULL) {
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
-    }
-  }
-
-  SSqlObj *pNew = createSubqueryObj(pSql, tableIndex, tscJoinQueryCallback, pSupporter, NULL);
-  if (pNew == NULL) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
-  }
-
-  pSql->pSubs[pSql->numOfSubs++] = pNew;
-  assert(pSql->numOfSubs <= pSupporter->pState->numOfTotal);
-
-  if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
-    addGroupInfoForSubquery(pSql, pNew, 0, tableIndex);
-
-    // refactor as one method
-    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-    assert(pNewQueryInfo != NULL);
-
-    tscColumnBaseInfoUpdateTableIndex(&pNewQueryInfo->colList, 0);
-    tscColumnBaseInfoCopy(&pSupporter->colList, &pNewQueryInfo->colList, 0);
-
-    tscSqlExprCopy(&pSupporter->exprsInfo, &pNewQueryInfo->exprsInfo, pSupporter->uid);
-
-    tscFieldInfoCopyAll(&pSupporter->fieldsInfo, &pNewQueryInfo->fieldsInfo);
-    tscTagCondCopy(&pSupporter->tagCond, &pNewQueryInfo->tagCond);
-
-    pNew->cmd.numOfCols = 0;
-    pNewQueryInfo->nAggTimeInterval = 0;
-    memset(&pNewQueryInfo->limit, 0, sizeof(SLimitVal));
-
-    // backup the data and clear it in the sqlcmd object
-    pSupporter->groupbyExpr = pNewQueryInfo->groupbyExpr;
-    memset(&pNewQueryInfo->groupbyExpr, 0, sizeof(SSqlGroupbyExpr));
-
-    // set the ts,tags that involved in join, as the output column of intermediate result
-    tscClearSubqueryInfo(&pNew->cmd);
-
-    SSchema      colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = 1};
-    SColumnIndex index = {0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
-
-    tscAddSpecialColumnForSelect(pNewQueryInfo, 0, TSDB_FUNC_TS_COMP, &index, &colSchema, TSDB_COL_NORMAL);
-
-    // set the tags value for ts_comp function
-    SSqlExpr *pExpr = tscSqlExprGet(pNewQueryInfo, 0);
-
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pNewQueryInfo, 0);
-    int16_t         tagColIndex = tscGetJoinTagColIndexByUid(&pSupporter->tagCond, pMeterMetaInfo->pMeterMeta->uid);
-
-    pExpr->param->i64Key = tagColIndex;
-    pExpr->numOfParams = 1;
-
-    // add the filter tag column
-    for (int32_t i = 0; i < pSupporter->colList.numOfCols; ++i) {
-      SColumnBase *pColBase = &pSupporter->colList.pColList[i];
-      if (pColBase->numOfFilters > 0) {  // copy to the pNew->cmd.colList if it is filtered.
-        tscColumnBaseCopy(&pNewQueryInfo->colList.pColList[pNewQueryInfo->colList.numOfCols], pColBase);
-        pNewQueryInfo->colList.numOfCols++;
-      }
-    }
-  
-    tscTrace("%p subquery:%p tableIndex:%d, vnodeIdx:%d, type:%d, transfer to ts_comp query to retrieve timestamps, "
-             "exprInfo:%d, colList:%d, fieldsInfo:%d, name:%s",
-             pSql, pNew, tableIndex, pMeterMetaInfo->vnodeIndex, pNewQueryInfo->type,
-             pNewQueryInfo->exprsInfo.numOfExprs, pNewQueryInfo->colList.numOfCols,
-             pNewQueryInfo->fieldsInfo.numOfOutputCols, pNewQueryInfo->pMeterInfo[0]->name);
-    tscPrintSelectClause(pNew, 0);
-  
-    tscTrace("%p subquery:%p tableIndex:%d, vnodeIdx:%d, type:%d, transfer to ts_comp query to retrieve timestamps, "
-             "exprInfo:%d, colList:%d, fieldsInfo:%d, name:%s",
-             pSql, pNew, tableIndex, pMeterMetaInfo->vnodeIndex, pNewQueryInfo->type,
-             pNewQueryInfo->exprsInfo.numOfExprs, pNewQueryInfo->colList.numOfCols,
-             pNewQueryInfo->fieldsInfo.numOfOutputCols, pNewQueryInfo->pMeterInfo[0]->name);
-    tscPrintSelectClause(pNew, 0);
+void tscPrintMgmtEp() {
+  SRpcEpSet dump;
+  tscDumpMgmtEpSet(&dump);
+  if (dump.numOfEps <= 0) {
+    tscError("invalid mnode EP list:%d", dump.numOfEps);
   } else {
-    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-    pNewQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;
-  }
-
-#ifdef _DEBUG_VIEW
-  tscPrintSelectClause(pNew, 0);
-#endif
-  
-  return tscProcessSql(pNew);
-}
-
-int doProcessSql(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  void *asyncFp = pSql->fp;
-  if (pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_FETCH || pCmd->command == TSDB_SQL_RETRIEVE ||
-      pCmd->command == TSDB_SQL_INSERT || pCmd->command == TSDB_SQL_CONNECT || pCmd->command == TSDB_SQL_HB ||
-      pCmd->command == TSDB_SQL_META || pCmd->command == TSDB_SQL_METRIC) {
-    tscBuildMsg[pCmd->command](pSql, NULL);
-  }
-
-  int32_t code = tscSendMsgToServer(pSql);
-
-  if (asyncFp) {
-    if (code != TSDB_CODE_SUCCESS) {
-      pRes->code = code;
-      tscQueueAsyncRes(pSql);
+    for (int i = 0; i < dump.numOfEps; ++i) {
+      tscDebug("mnode index:%d %s:%d", i, dump.fqdn[i], dump.port[i]);
     }
-    return 0;
   }
-
-  if (code != TSDB_CODE_SUCCESS) {
-    pRes->code = code;
-    return code;
-  }
-
-  tsem_wait(&pSql->rspSem);
-
-  if (pRes->code == TSDB_CODE_SUCCESS && tscProcessMsgRsp[pCmd->command]) (*tscProcessMsgRsp[pCmd->command])(pSql);
-
-  tsem_post(&pSql->emptyRspSem);
-
-  return pRes->code;
 }
 
-int tscProcessSql(SSqlObj *pSql) {
-  char *   name = NULL;
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-  
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo *pMeterMetaInfo = NULL;
-  int16_t         type = 0;
-
-  if (pQueryInfo != NULL) {
-    pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-    if (pMeterMetaInfo != NULL) {
-      name = pMeterMetaInfo->name;
-    }
-
-    type = pQueryInfo->type;
-  
-    // for hearbeat, numOfTables == 0;
-    assert((pQueryInfo->numOfTables == 0 && pQueryInfo->command == TSDB_SQL_HB) || pQueryInfo->numOfTables > 0);
-  }
-
-  tscTrace("%p SQL cmd:%d will be processed, name:%s, type:%d", pSql, pCmd->command, name, type);
-  pSql->retry = 0;
-  if (pSql->cmd.command < TSDB_SQL_MGMT) {
-    pSql->maxRetry = TSDB_VNODES_SUPPORT;
-
-    // the pMeterMetaInfo cannot be NULL
-    if (pMeterMetaInfo == NULL) {
-      pSql->res.code = TSDB_CODE_OTHERS;
-      return pSql->res.code;
-    }
-
-    if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-      pSql->index = pMeterMetaInfo->pMeterMeta->index;
-    } else {  // it must be the parent SSqlObj for super table query
-      if ((pQueryInfo->type & TSDB_QUERY_TYPE_SUBQUERY) != 0) {
-        int32_t idx = pMeterMetaInfo->vnodeIndex;
-
-        SVnodeSidList *pSidList = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, idx);
-        pSql->index = pSidList->index;
-      }
-    }
-  } else if (pSql->cmd.command < TSDB_SQL_LOCAL) {
-    pSql->index = pSql->cmd.command < TSDB_SQL_READ ? tsMasterIndex : tsSlaveIndex;
-  } else {  // local handler
-    return (*tscProcessMsgRsp[pCmd->command])(pSql);
-  }
-
-  // todo handle async situation
-  if (QUERY_IS_JOIN_QUERY(type)) {
-    if ((pQueryInfo->type & TSDB_QUERY_TYPE_SUBQUERY) == 0) {
-      SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
-
-      pState->numOfTotal = pQueryInfo->numOfTables;
-
-      for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-        SJoinSubquerySupporter *pSupporter = tscCreateJoinSupporter(pSql, pState, i);
-
-        if (pSupporter == NULL) {  // failed to create support struct, abort current query
-          tscError("%p tableIndex:%d, failed to allocate join support object, abort further query", pSql, i);
-          pState->numOfCompleted = pQueryInfo->numOfTables - i - 1;
-          pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-
-          return pSql->res.code;
-        }
-
-        int32_t code = tscLaunchJoinSubquery(pSql, i, pSupporter);
-        if (code != TSDB_CODE_SUCCESS) {  // failed to create subquery object, quit query
-          tscDestroyJoinSupporter(pSupporter);
-          pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-
-          break;
-        }
-      }
-
-      tsem_post(&pSql->emptyRspSem);
-      tsem_wait(&pSql->rspSem);
-
-      tsem_post(&pSql->emptyRspSem);
-
-      if (pSql->numOfSubs <= 0) {
-        pSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
-      } else {
-        pSql->cmd.command = TSDB_SQL_METRIC_JOIN_RETRIEVE;
-      }
-
-      return TSDB_CODE_SUCCESS;
-    } else {
-      // for first stage sub query, iterate all vnodes to get all timestamp
-      if ((pQueryInfo->type & TSDB_QUERY_TYPE_JOIN_SEC_STAGE) != TSDB_QUERY_TYPE_JOIN_SEC_STAGE) {
-        return doProcessSql(pSql);
-      }
-    }
-  }
-
-  if (tscIsTwoStageMergeMetricQuery(pQueryInfo, 0)) {
-    /*
-     * (ref. line: 964)
-     * Before this function returns from tscLaunchSTableSubqueries and continues, pSql may have been released at user
-     * program context after retrieving all data from vnodes. User function is called at tscRetrieveFromVnodeCallBack.
-     *
-     * when pSql being released, pSql->fp == NULL, it may pass the check of pSql->fp == NULL,
-     * which causes deadlock. So we keep it as local variable.
-     */
-    void *fp = pSql->fp;
-
-    if (tscLaunchSTableSubqueries(pSql) != TSDB_CODE_SUCCESS) {
-      return pRes->code;
-    }
-
-    if (fp == NULL) {
-      tsem_post(&pSql->emptyRspSem);
-      tsem_wait(&pSql->rspSem);
-      tsem_post(&pSql->emptyRspSem);
-
-      // set the command flag must be after the semaphore been correctly set.
-      pSql->cmd.command = TSDB_SQL_RETRIEVE_METRIC;
-    }
-
-    return pSql->res.code;
-  }
-
-  return doProcessSql(pSql);
-}
-
-static void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs, SSubqueryState* pState) {
-  assert(numOfSubs <= pSql->numOfSubs && numOfSubs >= 0 && pState != NULL);
-  
-  for(int32_t i = 0; i < numOfSubs; ++i) {
-    SSqlObj* pSub = pSql->pSubs[i];
-    assert(pSub != NULL);
-    
-    SRetrieveSupport* pSupport = pSub->param;
-  
-    tfree(pSupport->localBuffer);
-  
-    pthread_mutex_unlock(&pSupport->queryMutex);
-    pthread_mutex_destroy(&pSupport->queryMutex);
-  
-    tfree(pSupport);
-  
-    tscFreeSqlObj(pSub);
-  }
-  
-  free(pState);
-}
-
-int tscLaunchSTableSubqueries(SSqlObj *pSql) {
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  // pRes->code check only serves in launching metric sub-queries
-  if (pRes->code == TSDB_CODE_QUERY_CANCELLED) {
-    pCmd->command = TSDB_SQL_RETRIEVE_METRIC;  // enable the abort of kill metric function.
-    return pRes->code;
-  }
-
-  tExtMemBuffer **  pMemoryBuf = NULL;
-  tOrderDescriptor *pDesc = NULL;
-  tColModel *       pModel = NULL;
-
-  pRes->qhandle = 1;  // hack the qhandle check
-
-  const uint32_t nBufferSize = (1 << 16);  // 64KB
-
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  int32_t         numOfSubQueries = pMeterMetaInfo->pMetricMeta->numOfVnodes;
-  assert(numOfSubQueries > 0);
-
-  int32_t ret = tscLocalReducerEnvCreate(pSql, &pMemoryBuf, &pDesc, &pModel, nBufferSize);
-  if (ret != 0) {
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    if (pSql->fp) {
-      tscQueueAsyncRes(pSql);
-    }
-    return pRes->code;
-  }
-
-  pSql->pSubs = calloc(numOfSubQueries, POINTER_BYTES);
-  pSql->numOfSubs = numOfSubQueries;
-
-  tscTrace("%p retrieved query data from %d vnode(s)", pSql, numOfSubQueries);
-  SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
-  pState->numOfTotal = numOfSubQueries;
-  pRes->code = TSDB_CODE_SUCCESS;
-
-  int32_t i = 0;
-  for (; i < numOfSubQueries; ++i) {
-    SRetrieveSupport *trs = (SRetrieveSupport *)calloc(1, sizeof(SRetrieveSupport));
-    if (trs == NULL) {
-      tscError("%p failed to malloc buffer for SRetrieveSupport, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
-      break;
-    }
-    
-    trs->pExtMemBuffer = pMemoryBuf;
-    trs->pOrderDescriptor = pDesc;
-    trs->pState = pState;
-    
-    trs->localBuffer = (tFilePage *)calloc(1, nBufferSize + sizeof(tFilePage));
-    if (trs->localBuffer == NULL) {
-      tscError("%p failed to malloc buffer for local buffer, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
-      tfree(trs);
-      break;
-    }
-    
-    trs->subqueryIndex = i;
-    trs->pParentSqlObj = pSql;
-    trs->pFinalColModel = pModel;
-
-    pthread_mutexattr_t mutexattr = {0};
-    pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE_NP);
-    pthread_mutex_init(&trs->queryMutex, &mutexattr);
-    pthread_mutexattr_destroy(&mutexattr);
-
-    SSqlObj *pNew = tscCreateSqlObjForSubquery(pSql, trs, NULL);
-    if (pNew == NULL) {
-      tscError("%p failed to malloc buffer for subObj, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
-      tfree(trs->localBuffer);
-      tfree(trs);
-      break;
-    }
-
-    // todo handle multi-vnode situation
-    if (pQueryInfo->tsBuf) {
-      SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-      pNewQueryInfo->tsBuf = tsBufClone(pQueryInfo->tsBuf);
-    }
-    
-    tscTrace("%p sub:%p create subquery success. orderOfSub:%d", pSql, pNew, trs->subqueryIndex);
-  }
-  
-  if (i < numOfSubQueries) {
-    tscError("%p failed to prepare subquery structure and launch subqueries", pSql);
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-  
-    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, numOfSubQueries);
-    doCleanupSubqueries(pSql, i, pState);
-    return pRes->code;   // free all allocated resource
-  }
-  
-  if (pRes->code == TSDB_CODE_QUERY_CANCELLED) {
-    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, numOfSubQueries);
-    doCleanupSubqueries(pSql, i, pState);
-    return pRes->code;
-  }
-  
-  for(int32_t j = 0; j < numOfSubQueries; ++j) {
-    SSqlObj* pSub = pSql->pSubs[j];
-    SRetrieveSupport* pSupport = pSub->param;
-    
-    tscTrace("%p sub:%p launch subquery, orderOfSub:%d.", pSql, pSub, pSupport->subqueryIndex);
-    tscProcessSql(pSub);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static void tscFreeSubSqlObj(SRetrieveSupport *trsupport, SSqlObj *pSql) {
-  tscTrace("%p start to free subquery result", pSql);
-
-  if (pSql->res.code == TSDB_CODE_SUCCESS) {
-    taos_free_result(pSql);
-  }
-
-  tfree(trsupport->localBuffer);
-
-  pthread_mutex_unlock(&trsupport->queryMutex);
-  pthread_mutex_destroy(&trsupport->queryMutex);
-
-  tfree(trsupport);
-}
-
-static void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows);
-
-static void tscAbortFurtherRetryRetrieval(SRetrieveSupport *trsupport, TAOS_RES *tres, int32_t errCode) {
-// set no disk space error info
-#ifdef WINDOWS
-  LPVOID lpMsgBuf;
-  FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-                GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),  // Default language
-                (LPTSTR)&lpMsgBuf, 0, NULL);
-  tscError("sub:%p failed to flush data to disk:reason:%s", tres, lpMsgBuf);
-  LocalFree(lpMsgBuf);
-#else
-  char buf[256] = {0};
-  strerror_r(errno, buf, 256);
-  tscError("sub:%p failed to flush data to disk:reason:%s", tres, buf);
-#endif
-
-  trsupport->pState->code = -errCode;
-  trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
-
-  pthread_mutex_unlock(&trsupport->queryMutex);
-
-  tscRetrieveFromVnodeCallBack(trsupport, tres, trsupport->pState->code);
-}
-
-static void tscHandleSubRetrievalError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numOfRows) {
-  SSqlObj *pPObj = trsupport->pParentSqlObj;
-  int32_t  subqueryIndex = trsupport->subqueryIndex;
-
-  assert(pSql != NULL);
-  SSubqueryState* pState = trsupport->pState;
-  assert(pState->numOfCompleted < pState->numOfTotal && pState->numOfCompleted >= 0 &&
-         pPObj->numOfSubs == pState->numOfTotal);
-
-  /* retrieved in subquery failed. OR query cancelled in retrieve phase. */
-  if (pState->code == TSDB_CODE_SUCCESS && pPObj->res.code != TSDB_CODE_SUCCESS) {
-    pState->code = -(int)pPObj->res.code;
-
-    /*
-     * kill current sub-query connection, which may retrieve data from vnodes;
-     * Here we get: pPObj->res.code == TSDB_CODE_QUERY_CANCELLED
-     */
-    pSql->res.numOfRows = 0;
-    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;  // disable retry efforts
-    tscTrace("%p query is cancelled, sub:%p, orderOfSub:%d abort retrieve, code:%d", trsupport->pParentSqlObj, pSql,
-             subqueryIndex, pState->code);
+void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
+  STscObj *pObj = (STscObj *)param;
+  if (pObj == NULL) return;
+  if (pObj != pObj->signature) {
+    tscError("heart beat msg, pObj:%p, signature:%p invalid", pObj, pObj->signature);
+    return;
   }
 
-  if (numOfRows >= 0) {  // current query is successful, but other sub query failed, still abort current query.
-    tscTrace("%p sub:%p retrieve numOfRows:%d,orderOfSub:%d", pPObj, pSql, numOfRows, subqueryIndex);
-    tscError("%p sub:%p abort further retrieval due to other queries failure,orderOfSub:%d,code:%d", pPObj, pSql,
-        subqueryIndex, pState->code);
-  } else {
-    if (trsupport->numOfRetry++ < MAX_NUM_OF_SUBQUERY_RETRY && pState->code == TSDB_CODE_SUCCESS) {
-      /*
-       * current query failed, and the retry count is less than the available
-       * count, retry query clear previous retrieved data, then launch a new sub query
-       */
-      tExtMemBufferClear(trsupport->pExtMemBuffer[subqueryIndex]);
-
-      // clear local saved number of results
-      trsupport->localBuffer->numOfElems = 0;
-      pthread_mutex_unlock(&trsupport->queryMutex);
-
-      tscTrace("%p sub:%p retrieve failed, code:%d, orderOfSub:%d, retry:%d", trsupport->pParentSqlObj, pSql, numOfRows,
-               subqueryIndex, trsupport->numOfRetry);
-
-      SSqlObj *pNew = tscCreateSqlObjForSubquery(trsupport->pParentSqlObj, trsupport, pSql);
-      if (pNew == NULL) {
-        tscError("%p sub:%p failed to create new subquery sqlobj due to out of memory, abort retry",
-                 trsupport->pParentSqlObj, pSql);
-
-        pState->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-        trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
-        return;
-      }
+  SSqlObj *pSql = pObj->pHb;
+  SSqlRes *pRes = &pSql->res;
+
+  if (code == 0) {
+    SCMHeartBeatRsp *pRsp = (SCMHeartBeatRsp *)pRes->pRsp;
+    SRpcEpSet *      epSet = &pRsp->epSet;
+    if (epSet->numOfEps > 0) {
+      tscEpSetHtons(epSet);
+      tscUpdateMgmtEpSet(epSet);
+    } 
+
+    pSql->pTscObj->connId = htonl(pRsp->connId);
 
-      tscProcessSql(pNew);
+    if (pRsp->killConnection) {
+      tscKillConnection(pObj);
       return;
-    } else {  // reach the maximum retry count, abort
-      atomic_val_compare_exchange_32(&pState->code, TSDB_CODE_SUCCESS, numOfRows);
-      tscError("%p sub:%p retrieve failed,code:%d,orderOfSub:%d failed.no more retry,set global code:%d", pPObj, pSql,
-               numOfRows, subqueryIndex, pState->code);
+    } else {
+      if (pRsp->queryId) tscKillQuery(pObj, htonl(pRsp->queryId));
+      if (pRsp->streamId) tscKillStream(pObj, htonl(pRsp->streamId));
     }
+  } else {
+    tscDebug("heart beat failed, code:%s", tstrerror(code));
   }
 
-  int32_t numOfTotal = pState->numOfTotal;
+  taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
+}
 
-  int32_t finished = atomic_add_fetch_32(&pState->numOfCompleted, 1);
-  if (finished < numOfTotal) {
-    tscTrace("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pPObj, pSql, trsupport->subqueryIndex, finished);
-    return tscFreeSubSqlObj(trsupport, pSql);
+void tscProcessActivityTimer(void *handle, void *tmrId) {
+  STscObj *pObj = (STscObj *)handle;
+  if (pObj == NULL || pObj->signature != pObj) {
+    return;
   }
 
-  // all subqueries are failed
-  tscError("%p retrieve from %d vnode(s) completed,code:%d.FAILED.", pPObj, pState->numOfTotal, pState->code);
-  pPObj->res.code = -(pState->code);
-
-  // release allocated resource
-  tscLocalReducerEnvDestroy(trsupport->pExtMemBuffer, trsupport->pOrderDescriptor, trsupport->pFinalColModel,
-                            pState->numOfTotal);
-
-  tfree(trsupport->pState);
-  tscFreeSubSqlObj(trsupport, pSql);
-
-  // sync query, wait for the master SSqlObj to proceed
-  if (pPObj->fp == NULL) {
-    // sync query, wait for the master SSqlObj to proceed
-    tsem_wait(&pPObj->emptyRspSem);
-    tsem_wait(&pPObj->emptyRspSem);
-
-    tsem_post(&pPObj->rspSem);
+  SSqlObj* pHB = pObj->pHb;
+  if (pObj->pTimer != tmrId || pHB == NULL) {
+    return;
+  }
 
-    pPObj->cmd.command = TSDB_SQL_RETRIEVE_METRIC;
+  if (tscShouldFreeHeartBeat(pHB)) {
+    tscDebug("%p free HB object and release connection", pHB);
+    pObj->pHb = 0;
+    taos_free_result(pHB);
   } else {
-    // in case of second stage join subquery, invoke its callback function instead of regular QueueAsyncRes
-    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pPObj->cmd, 0);
-
-    if ((pQueryInfo->type & TSDB_QUERY_TYPE_JOIN_SEC_STAGE) == TSDB_QUERY_TYPE_JOIN_SEC_STAGE) {
-      (*pPObj->fp)(pPObj->param, pPObj, pPObj->res.code);
-    } else {  // regular super table query
-      if (pPObj->res.code != TSDB_CODE_SUCCESS) {
-        tscQueueAsyncRes(pPObj);
-      }
+    int32_t code = tscProcessSql(pHB);
+    if (code != TSDB_CODE_SUCCESS) {
+      tscError("%p failed to sent HB to server, reason:%s", pHB, tstrerror(code));
     }
   }
 }
 
-void tscRetrieveFromVnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
-  SRetrieveSupport *trsupport = (SRetrieveSupport *)param;
-  int32_t           idx = trsupport->subqueryIndex;
-  SSqlObj *         pPObj = trsupport->pParentSqlObj;
-  tOrderDescriptor *pDesc = trsupport->pOrderDescriptor;
-
-  SSqlObj *pSql = (SSqlObj *)tres;
-  if (pSql == NULL) {  // sql object has been released in error process, return immediately
-    tscTrace("%p subquery has been released, idx:%d, abort", pPObj, idx);
-    return;
-  }
-
-  SSubqueryState* pState = trsupport->pState;
-  assert(pState->numOfCompleted < pState->numOfTotal && pState->numOfCompleted >= 0 &&
-      pPObj->numOfSubs == pState->numOfTotal);
+int tscSendMsgToServer(SSqlObj *pSql) {
+  STscObj* pObj = pSql->pTscObj;
+  SSqlCmd* pCmd = &pSql->cmd;
   
-  // query process and cancel query process may execute at the same time
-  pthread_mutex_lock(&trsupport->queryMutex);
-
-  if (numOfRows < 0 || pState->code < 0 || pPObj->res.code != TSDB_CODE_SUCCESS) {
-    return tscHandleSubRetrievalError(trsupport, pSql, numOfRows);
+  char *pMsg = rpcMallocCont(pCmd->payloadLen);
+  if (NULL == pMsg) {
+    tscError("%p msg:%s malloc failed", pSql, taosMsg[pSql->cmd.msgType]);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  SSqlRes *   pRes = &pSql->res;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  // set the mgmt ip list
+  if (pSql->cmd.command >= TSDB_SQL_MGMT) {
+    tscDumpMgmtEpSet(&pSql->epSet);
+  }
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  memcpy(pMsg, pSql->cmd.payload, pSql->cmd.payloadLen);
 
-  SVnodeSidList *vnodeInfo = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, idx);
-  SVPeerDesc *   pSvd = &vnodeInfo->vpeerDesc[vnodeInfo->index];
+  SRpcMsg rpcMsg = {
+      .msgType = pSql->cmd.msgType,
+      .pCont   = pMsg,
+      .contLen = pSql->cmd.payloadLen,
+      .ahandle = pSql,
+      .handle  = &pSql->pRpcCtx,
+      .code    = 0
+  };
 
-  if (numOfRows > 0) {
-    assert(pRes->numOfRows == numOfRows);
-    int64_t num = atomic_add_fetch_64(&pState->numOfRetrievedRows, numOfRows);
+  // NOTE: the rpc context should be acquired before sending data to server.
+  // Otherwise, the pSql object may have been released already during the response function, which is
+  // processMsgFromServer function. In the meanwhile, the assignment of the rpc context to sql object will absolutely
+  // cause crash.
+  rpcSendRequest(pObj->pDnodeConn, &pSql->epSet, &rpcMsg);
+  return TSDB_CODE_SUCCESS;
+}
 
-    tscTrace("%p sub:%p retrieve numOfRows:%d totalNumOfRows:%d from ip:%u,vid:%d,orderOfSub:%d", pPObj, pSql,
-             pRes->numOfRows, pState->numOfRetrievedRows, pSvd->ip, pSvd->vnode, idx);
-    
-    if (num > tsMaxNumOfOrderedResults) {
-      tscError("%p sub:%p num of OrderedRes is too many, max allowed:%" PRId64 " , current:%" PRId64,
-          pPObj, pSql, tsMaxNumOfOrderedResults, num);
-      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_SORTED_RES_TOO_MANY);
-      return;
-    }
-    
+void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
+  uint64_t handle = (uint64_t) rpcMsg->ahandle;
 
-#ifdef _DEBUG_VIEW
-    printf("received data from vnode: %d rows\n", pRes->numOfRows);
-    SSrcColumnInfo colInfo[256] = {0};
+  void** p = taosCacheAcquireByKey(tscObjCache, &handle, sizeof(uint64_t));
+  if (p == NULL) {
+    rpcFreeCont(rpcMsg->pCont);
+    return;
+  }
 
-    tscGetSrcColumnInfo(colInfo, pQueryInfo);
-    tColModelDisplayEx(pDesc->pSchema, pRes->data, pRes->numOfRows, pRes->numOfRows, colInfo);
-#endif
-    if (tsTotalTmpDirGB != 0 && tsAvailTmpDirGB < tsMinimalTmpDirGB) {
-      tscError("%p sub:%p client disk space remain %.3f GB, need at least %.3f GB, stop query", pPObj, pSql,
-               tsAvailTmpDirGB, tsMinimalTmpDirGB);
-      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
-      return;
-    }
-    int32_t ret = saveToBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pRes->data,
-                               pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
-    if (ret < 0) {
-      // set no disk space error info, and abort retry
-      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
-    } else {
-      pthread_mutex_unlock(&trsupport->queryMutex);
-      taos_fetch_rows_a(tres, tscRetrieveFromVnodeCallBack, param);
-    }
+  SSqlObj* pSql = *p;
+  assert(pSql != NULL);
 
-  } else {  // all data has been retrieved to client
-    /* data in from current vnode is stored in cache and disk */
-    uint32_t numOfRowsFromVnode = trsupport->pExtMemBuffer[idx]->numOfAllElems + trsupport->localBuffer->numOfElems;
-    tscTrace("%p sub:%p all data retrieved from ip:%u,vid:%d, numOfRows:%d, orderOfSub:%d", pPObj, pSql, pSvd->ip,
-             pSvd->vnode, numOfRowsFromVnode, idx);
+  STscObj *pObj = pSql->pTscObj;
+  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
 
-    tColModelCompact(pDesc->pSchema, trsupport->localBuffer, pDesc->pSchema->maxCapacity);
+  assert(*pSql->self == pSql);
 
-#ifdef _DEBUG_VIEW
-    printf("%" PRIu64 " rows data flushed to disk:\n", trsupport->localBuffer->numOfElems);
-    SSrcColumnInfo colInfo[256] = {0};
-    tscGetSrcColumnInfo(colInfo, pQueryInfo);
-    tColModelDisplayEx(pDesc->pSchema, trsupport->localBuffer->data, trsupport->localBuffer->numOfElems,
-                       trsupport->localBuffer->numOfElems, colInfo);
-#endif
-    
-    if (tsTotalTmpDirGB != 0 && tsAvailTmpDirGB < tsMinimalTmpDirGB) {
-      tscError("%p sub:%p client disk space remain %.3f GB, need at least %.3f GB, stop query", pPObj, pSql,
-               tsAvailTmpDirGB, tsMinimalTmpDirGB);
-      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
-      return;
-    }
+  if (pObj->signature != pObj) {
+    tscDebug("%p DB connection is closed, cmd:%d pObj:%p signature:%p", pSql, pCmd->command, pObj, pObj->signature);
 
-    // each result for a vnode is ordered as an independant list,
-    // then used as an input of loser tree for disk-based merge routine
-    int32_t ret = tscFlushTmpBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer,
-                                    pQueryInfo->groupbyExpr.orderType);
-    if (ret != 0) {
-      /* set no disk space error info, and abort retry */
-      return tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_CLI_NO_DISKSPACE);
-    }
-  
-    // keep this value local variable, since the pState variable may be released by other threads, if atomic_add opertion
-    // increases the finished value up to pState->numOfTotal value, which means all subqueries are completed.
-    // In this case, the comparsion between finished value and released pState->numOfTotal is not safe.
-    int32_t numOfTotal = pState->numOfTotal;
+    taosCacheRelease(tscObjCache, (void**) &p, true);
+    rpcFreeCont(rpcMsg->pCont);
+    return;
+  }
 
-    int32_t finished = atomic_add_fetch_32(&pState->numOfCompleted, 1);
-    if (finished < numOfTotal) {
-      tscTrace("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pPObj, pSql, trsupport->subqueryIndex, finished);
-      return tscFreeSubSqlObj(trsupport, pSql);
-    }
+  pSql->pRpcCtx = NULL;    // clear the rpcCtx
 
-    // all sub-queries are returned, start to local merge process
-    pDesc->pSchema->maxCapacity = trsupport->pExtMemBuffer[idx]->numOfElemsPerPage;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if (pQueryInfo != NULL && pQueryInfo->type == TSDB_QUERY_TYPE_FREE_RESOURCE) {
+    tscDebug("%p sqlObj needs to be released or DB connection is closed, cmd:%d type:%d, pObj:%p signature:%p",
+        pSql, pCmd->command, pQueryInfo->type, pObj, pObj->signature);
 
-    tscTrace("%p retrieve from %d vnodes completed.final NumOfRows:%d,start to build loser tree", pPObj,
-             pState->numOfTotal, pState->numOfRetrievedRows);
-    
-    SQueryInfo *pPQueryInfo = tscGetQueryInfoDetail(&pPObj->cmd, 0);
-    tscClearInterpInfo(pPQueryInfo);
+    void** p1 = p;
+    taosCacheRelease(tscObjCache, (void**) &p1, false);
 
-    tscCreateLocalReducer(trsupport->pExtMemBuffer, pState->numOfTotal, pDesc, trsupport->pFinalColModel,
-                          &pPObj->cmd, &pPObj->res);
-    tscTrace("%p build loser tree completed", pPObj);
+    taosCacheRelease(tscObjCache, (void**) &p, true);
+    rpcFreeCont(rpcMsg->pCont);
+    return;
+  }
 
-    pPObj->res.precision = pSql->res.precision;
-    pPObj->res.numOfRows = 0;
-    pPObj->res.row = 0;
+  if (pEpSet) {
+    if (!tscEpSetIsEqual(&pSql->epSet, pEpSet)) {
+      if (pCmd->command < TSDB_SQL_MGMT) {
+        tscUpdateVgroupInfo(pSql, pEpSet);
+      } else {
+        tscUpdateMgmtEpSet(pEpSet);
+      }
+    }
+  }
 
-    // only free once
-    tfree(trsupport->pState);
-    
-    tscFreeSubSqlObj(trsupport, pSql);
+  int32_t cmd = pCmd->command;
+  if ((cmd == TSDB_SQL_SELECT || cmd == TSDB_SQL_FETCH || cmd == TSDB_SQL_INSERT || cmd == TSDB_SQL_UPDATE_TAGS_VAL) &&
+      (rpcMsg->code == TSDB_CODE_TDB_INVALID_TABLE_ID ||
+       rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID ||
+       rpcMsg->code == TSDB_CODE_RPC_NETWORK_UNAVAIL ||
+       rpcMsg->code == TSDB_CODE_APP_NOT_READY ||
+       rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE)) {
+    tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
 
-    if (pPObj->fp == NULL) {
-      tsem_wait(&pPObj->emptyRspSem);
-      tsem_wait(&pPObj->emptyRspSem);
+    // set the flag to denote that sql string needs to be re-parsed and build submit block with table schema
+    if (rpcMsg->code == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+      pSql->cmd.submitSchema = 1;
+    }
 
-      tsem_post(&pPObj->rspSem);
+    pSql->res.code = rpcMsg->code;  // keep the previous error code
+    if (pSql->retry > pSql->maxRetry) {
+      tscError("%p max retry %d reached, give up", pSql, pSql->maxRetry);
     } else {
-      // set the command flag must be after the semaphore been correctly set.
-      pPObj->cmd.command = TSDB_SQL_RETRIEVE_METRIC;
-      if (pPObj->res.code == TSDB_CODE_SUCCESS) {
-        (*pPObj->fp)(pPObj->param, pPObj, 0);
-      } else {
-        tscQueueAsyncRes(pPObj);
+      // wait for a little bit moment and then retry, todo do not sleep in rpc callback thread
+      if (rpcMsg->code == TSDB_CODE_APP_NOT_READY || rpcMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID) {
+        int32_t duration = getWaitingTimeInterval(pSql->retry);
+        taosMsleep(duration);
+      }
+
+      rpcMsg->code = tscRenewTableMeta(pSql, 0);
+
+      // if there is an error occurring, proceed to the following error handling procedure.
+      if (rpcMsg->code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+        taosCacheRelease(tscObjCache, (void**) &p, false);
+        rpcFreeCont(rpcMsg->pCont);
+        return;
       }
     }
   }
-}
 
-void tscKillMetricQuery(SSqlObj *pSql) {
-  SSqlCmd* pCmd = &pSql->cmd;
+  pRes->rspLen = 0;
   
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  if (!tscIsTwoStageMergeMetricQuery(pQueryInfo, 0)) {
-    return;
+  if (pRes->code == TSDB_CODE_TSC_QUERY_CANCELLED) {
+    tscDebug("%p query is cancelled, code:%s", pSql, tstrerror(pRes->code));
+  } else {
+    pRes->code = rpcMsg->code;
   }
 
-  for (int i = 0; i < pSql->numOfSubs; ++i) {
-    SSqlObj *pSub = pSql->pSubs[i];
+  if (pRes->code == TSDB_CODE_SUCCESS) {
+    tscDebug("%p reset retry counter to be 0 due to success rsp, old:%d", pSql, pSql->retry);
+    pSql->retry = 0;
+  }
 
-    if (pSub == NULL || pSub->thandle == NULL) {
-      continue;
+  if (pRes->code != TSDB_CODE_TSC_QUERY_CANCELLED) {
+    assert(rpcMsg->msgType == pCmd->msgType + 1);
+    pRes->code    = rpcMsg->code;
+    pRes->rspType = rpcMsg->msgType;
+    pRes->rspLen  = rpcMsg->contLen;
+
+    if (pRes->rspLen > 0 && rpcMsg->pCont) {
+      char *tmp = (char *)realloc(pRes->pRsp, pRes->rspLen);
+      if (tmp == NULL) {
+        pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      } else {
+        pRes->pRsp = tmp;
+        memcpy(pRes->pRsp, rpcMsg->pCont, pRes->rspLen);
+      }
+    } else {
+      pRes->pRsp = NULL;
     }
 
     /*
-     * here, we cannot set the command = TSDB_SQL_KILL_QUERY. Otherwise, it may cause
-     * sub-queries not correctly released and master sql object of metric query reaches an abnormal state.
+     * There is not response callback function for submit response.
+     * The actual inserted number of points is the first number.
      */
-    pSql->pSubs[i]->res.code = TSDB_CODE_QUERY_CANCELLED;
-    taosStopRpcConn(pSql->pSubs[i]->thandle);
+    if (rpcMsg->msgType == TSDB_MSG_TYPE_SUBMIT_RSP && pRes->pRsp != NULL) {
+      SShellSubmitRspMsg *pMsg = (SShellSubmitRspMsg*)pRes->pRsp;
+      pMsg->code = htonl(pMsg->code);
+      pMsg->numOfRows = htonl(pMsg->numOfRows);
+      pMsg->affectedRows = htonl(pMsg->affectedRows);
+      pMsg->failedRows = htonl(pMsg->failedRows);
+      pMsg->numOfFailedBlocks = htonl(pMsg->numOfFailedBlocks);
+
+      pRes->numOfRows += pMsg->affectedRows;
+      tscDebug("%p SQL cmd:%s, code:%s inserted rows:%d rspLen:%d", pSql, sqlCmd[pCmd->command], 
+          tstrerror(pRes->code), pMsg->affectedRows, pRes->rspLen);
+    } else {
+      tscDebug("%p SQL cmd:%s, code:%s rspLen:%d", pSql, sqlCmd[pCmd->command], tstrerror(pRes->code), pRes->rspLen);
+    }
+  }
+  
+  if (pRes->code == TSDB_CODE_SUCCESS && tscProcessMsgRsp[pCmd->command]) {
+    rpcMsg->code = (*tscProcessMsgRsp[pCmd->command])(pSql);
   }
 
-  pSql->numOfSubs = 0;
+  bool shouldFree = tscShouldBeFreed(pSql);
+  if (rpcMsg->code != TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    rpcMsg->code = (pRes->code == TSDB_CODE_SUCCESS) ? (int32_t)pRes->numOfRows : pRes->code;
+    (*pSql->fp)(pSql->param, pSql, rpcMsg->code);
+  }
 
-  /*
-   * 1. if the subqueries are not launched or partially launched, we need to waiting the launched
-   * query return to successfully free allocated resources.
-   * 2. if no any subqueries are launched yet, which means the metric query only in parse sql stage,
-   * set the res.code, and return.
-   */
-  const int64_t MAX_WAITING_TIME = 10000;  // 10 Sec.
-  int64_t       stime = taosGetTimestampMs();
+  void** p1 = p;
+  taosCacheRelease(tscObjCache, (void**) &p1, false);
 
-  while (pSql->cmd.command != TSDB_SQL_RETRIEVE_METRIC && pSql->cmd.command != TSDB_SQL_RETRIEVE_EMPTY_RESULT) {
-    taosMsleep(100);
-    if (taosGetTimestampMs() - stime > MAX_WAITING_TIME) {
-      break;
-    }
+  if (shouldFree) { // in case of table-meta/vgrouplist query, automatically free it
+    taosCacheRelease(tscObjCache, (void **)&p, true);
+    tscDebug("%p sqlObj is automatically freed", pSql);
   }
 
-  tscTrace("%p metric query is cancelled", pSql);
+  rpcFreeCont(rpcMsg->pCont);
 }
 
-static void tscRetrieveDataRes(void *param, TAOS_RES *tres, int retCode);
+int doProcessSql(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
 
-static SSqlObj *tscCreateSqlObjForSubquery(SSqlObj *pSql, SRetrieveSupport *trsupport, SSqlObj *prevSqlObj) {
-  const int32_t table_index = 0;
+  if (pCmd->command == TSDB_SQL_SELECT ||
+      pCmd->command == TSDB_SQL_FETCH ||
+      pCmd->command == TSDB_SQL_RETRIEVE ||
+      pCmd->command == TSDB_SQL_INSERT ||
+      pCmd->command == TSDB_SQL_CONNECT ||
+      pCmd->command == TSDB_SQL_HB ||
+      pCmd->command == TSDB_SQL_META ||
+      pCmd->command == TSDB_SQL_STABLEVGROUP) {
+    pRes->code = tscBuildMsg[pCmd->command](pSql, NULL);
+  }
   
-  SSqlObj *pNew = createSubqueryObj(pSql, table_index, tscRetrieveDataRes, trsupport, prevSqlObj);
-  if (pNew != NULL) {  // the sub query of two-stage super table query
-    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-    pQueryInfo->type |= TSDB_QUERY_TYPE_STABLE_SUBQUERY;
-    
-    assert(pQueryInfo->numOfTables == 1 && pNew->cmd.numOfClause == 1);
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    tscQueueAsyncRes(pSql);
+    return pRes->code;
+  }
 
-    // launch subquery for each vnode, so the subquery index equals to the vnodeIndex.
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, table_index);
-    pMeterMetaInfo->vnodeIndex = trsupport->subqueryIndex;
+  int32_t code = tscSendMsgToServer(pSql);
 
-    pSql->pSubs[trsupport->subqueryIndex] = pNew;
+  // NOTE: if code is TSDB_CODE_SUCCESS, pSql may have been released here already by other threads.
+  if (code != TSDB_CODE_SUCCESS) {
+    pRes->code = code;
+    tscQueueAsyncRes(pSql);
+    return code;
   }
-
-  return pNew;
+  
+  return TSDB_CODE_SUCCESS;
 }
 
-void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
-  SRetrieveSupport *trsupport = (SRetrieveSupport *)param;
-  
-  SSqlObj*  pParentSql = trsupport->pParentSqlObj;
-  SSqlObj*  pSql = (SSqlObj *)tres;
-  
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
-  assert(pSql->cmd.numOfClause == 1 && pSql->cmd.pQueryInfo[0]->numOfTables == 1);
+int tscProcessSql(SSqlObj *pSql) {
+  char    *name = NULL;
+  SSqlCmd *pCmd = &pSql->cmd;
   
-  int32_t idx = pMeterMetaInfo->vnodeIndex;
+  SQueryInfo     *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  STableMetaInfo *pTableMetaInfo = NULL;
+  uint32_t        type = 0;
+
+  if (pQueryInfo != NULL) {
+    pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+    name = (pTableMetaInfo != NULL)? pTableMetaInfo->name:NULL;
+    type = pQueryInfo->type;
 
-  SVnodeSidList *vnodeInfo = NULL;
-  SVPeerDesc *   pSvd = NULL;
-  if (pMeterMetaInfo->pMetricMeta != NULL) {
-    vnodeInfo = tscGetVnodeSidList(pMeterMetaInfo->pMetricMeta, idx);
-    pSvd = &vnodeInfo->vpeerDesc[vnodeInfo->index];
+    // while numOfTables equals to 0, it must be Heartbeat
+    assert((pQueryInfo->numOfTables == 0 && pQueryInfo->command == TSDB_SQL_HB) || pQueryInfo->numOfTables > 0);
   }
 
-  SSubqueryState* pState = trsupport->pState;
-  assert(pState->numOfCompleted < pState->numOfTotal && pState->numOfCompleted >= 0 &&
-         pParentSql->numOfSubs == pState->numOfTotal);
-  
-  if (pParentSql->res.code != TSDB_CODE_SUCCESS || pState->code != TSDB_CODE_SUCCESS) {
-    // metric query is killed, Note: code must be less than 0
-    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
-    if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
-      code = -(int)(pParentSql->res.code);
-    } else {
-      code = pState->code;
+  tscDebug("%p SQL cmd:%s will be processed, name:%s, type:%d", pSql, sqlCmd[pCmd->command], name, type);
+  if (pCmd->command < TSDB_SQL_MGMT) { // the pTableMetaInfo cannot be NULL
+    if (pTableMetaInfo == NULL) {
+      pSql->res.code = TSDB_CODE_TSC_APP_ERROR;
+      return pSql->res.code;
     }
-    tscTrace("%p query cancelled or failed, sub:%p, orderOfSub:%d abort, code:%d", pParentSql, pSql,
-             trsupport->subqueryIndex, code);
+  } else if (pCmd->command < TSDB_SQL_LOCAL) {
+    //pSql->epSet = tscMgmtEpSet;
+  } else {  // local handler
+    return (*tscProcessMsgRsp[pCmd->command])(pSql);
   }
+  
+  return doProcessSql(pSql);
+}
 
-  /*
-   * if a query on a vnode is failed, all retrieve operations from vnode that occurs later
-   * than this one are actually not necessary, we simply call the tscRetrieveFromVnodeCallBack
-   * function to abort current and remain retrieve process.
-   *
-   * NOTE: threadsafe is required.
-   */
-  if (code != TSDB_CODE_SUCCESS) {
-    if (trsupport->numOfRetry++ >= MAX_NUM_OF_SUBQUERY_RETRY) {
-      tscTrace("%p sub:%p reach the max retry count,set global code:%d", pParentSql, pSql, code);
-      atomic_val_compare_exchange_32(&pState->code, 0, code);
-    } else {  // does not reach the maximum retry count, go on
-      tscTrace("%p sub:%p failed code:%d, retry:%d", pParentSql, pSql, code, trsupport->numOfRetry);
-
-      SSqlObj *pNew = tscCreateSqlObjForSubquery(pParentSql, trsupport, pSql);
-      if (pNew == NULL) {
-        tscError("%p sub:%p failed to create new subquery due to out of memory, abort retry, vid:%d, orderOfSub:%d",
-                 trsupport->pParentSqlObj, pSql, pSvd != NULL ? pSvd->vnode : -1, trsupport->subqueryIndex);
-
-        pState->code = -TSDB_CODE_CLI_OUT_OF_MEMORY;
-        trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
-      } else {
-        SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
-        assert(pNewQueryInfo->pMeterInfo[0]->pMeterMeta != NULL && pNewQueryInfo->pMeterInfo[0]->pMetricMeta != NULL);
-        tscProcessSql(pNew);
-        return;
-      }
-    }
+void tscKillSTableQuery(SSqlObj *pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  if (!tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
+    return;
   }
 
-  if (pState->code != TSDB_CODE_SUCCESS) {  // failed, abort
-    if (vnodeInfo != NULL) {
-      tscTrace("%p sub:%p query failed,ip:%u,vid:%d,orderOfSub:%d,global code:%d", pParentSql, pSql,
-               vnodeInfo->vpeerDesc[vnodeInfo->index].ip, vnodeInfo->vpeerDesc[vnodeInfo->index].vnode,
-               trsupport->subqueryIndex, pState->code);
-    } else {
-      tscTrace("%p sub:%p query failed,orderOfSub:%d,global code:%d", pParentSql, pSql,
-               trsupport->subqueryIndex, pState->code);
+  pSql->res.code = TSDB_CODE_TSC_QUERY_CANCELLED;
+
+  for (int i = 0; i < pSql->numOfSubs; ++i) {
+    // NOTE: pSub may have been released already here
+    SSqlObj *pSub = pSql->pSubs[i];
+    if (pSub == NULL) {
+      continue;
     }
 
-    tscRetrieveFromVnodeCallBack(param, tres, pState->code);
-  } else {  // success, proceed to retrieve data from dnode
-    if (vnodeInfo != NULL) {
-      tscTrace("%p sub:%p query complete,ip:%u,vid:%d,orderOfSub:%d,retrieve data", trsupport->pParentSqlObj, pSql,
-             vnodeInfo->vpeerDesc[vnodeInfo->index].ip, vnodeInfo->vpeerDesc[vnodeInfo->index].vnode,
-             trsupport->subqueryIndex);
-    } else {
-      tscTrace("%p sub:%p query complete, orderOfSub:%d,retrieve data", trsupport->pParentSqlObj, pSql,
-             trsupport->subqueryIndex);
+    pSub->res.code = TSDB_CODE_TSC_QUERY_CANCELLED;
+    if (pSub->pRpcCtx != NULL) {
+      rpcCancelRequest(pSub->pRpcCtx);
     }
 
-    taos_fetch_rows_a(tres, tscRetrieveFromVnodeCallBack, param);
+    tscQueueAsyncRes(pSub); // async res? not other functions?
   }
-}
-
-int tscBuildRetrieveMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  char *pMsg, *pStart;
 
-  pStart = pSql->cmd.payload + tsRpcHeadSize;
-  pMsg = pStart;
-
-  *((uint64_t *)pMsg) = pSql->res.qhandle;
-  pMsg += sizeof(pSql->res.qhandle);
+  tscDebug("%p super table query cancelled", pSql);
+}
 
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  *((uint16_t *)pMsg) = htons(pQueryInfo->type);
-  pMsg += sizeof(pQueryInfo->type);
+int tscBuildFetchMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+  SRetrieveTableMsg *pRetrieveMsg = (SRetrieveTableMsg *) pSql->cmd.payload;
+  pRetrieveMsg->qhandle = htobe64(pSql->res.qhandle);
 
-  pSql->cmd.payloadLen = pMsg - pStart;
-  pSql->cmd.msgType = TSDB_MSG_TYPE_RETRIEVE;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+  pRetrieveMsg->free = htons(pQueryInfo->type);
 
-  return TSDB_CODE_SUCCESS;
-}
+  // todo valid the vgroupId at the client side
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    int32_t vgIndex = pTableMetaInfo->vgroupIndex;
+    
+    SVgroupsInfo* pVgroupInfo = pTableMetaInfo->vgroupList;
+    assert(pVgroupInfo->vgroups[vgIndex].vgId > 0 && vgIndex < pTableMetaInfo->vgroupList->numOfVgroups);
 
-void tscUpdateVnodeInSubmitMsg(SSqlObj *pSql, char *buf) {
-  SShellSubmitMsg *pShellMsg;
-  char *           pMsg;
-  SMeterMetaInfo * pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, pSql->cmd.clauseIndex, 0);
+    pRetrieveMsg->header.vgId = htonl(pVgroupInfo->vgroups[vgIndex].vgId);
+  } else {
+    STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+    pRetrieveMsg->header.vgId = htonl(pTableMeta->vgroupInfo.vgId);
+  }
 
-  SMeterMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
+  pSql->cmd.payloadLen = sizeof(SRetrieveTableMsg);
+  pSql->cmd.msgType = TSDB_MSG_TYPE_FETCH;
 
-  pMsg = buf + tsRpcHeadSize;
+  pRetrieveMsg->header.contLen = htonl(sizeof(SRetrieveTableMsg));
 
-  pShellMsg = (SShellSubmitMsg *)pMsg;
-  pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
-  tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip),
-           htons(pShellMsg->vnode));
+  return TSDB_CODE_SUCCESS;
 }
 
 int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SShellSubmitMsg *pShellMsg;
-  char *           pMsg, *pStart;
-
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  SMeterMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
-  pStart = pSql->cmd.payload + tsRpcHeadSize;
-  pMsg = pStart;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
+  
+  char* pMsg = pSql->cmd.payload;
+  
+  // NOTE: shell message size should not include SMsgDesc
+  int32_t size = pSql->cmd.payloadLen - sizeof(SMsgDesc);
+  int32_t vgId = pTableMeta->vgroupInfo.vgId;
 
-  pShellMsg = (SShellSubmitMsg *)pMsg;
+  SMsgDesc* pMsgDesc = (SMsgDesc*) pMsg;
+  pMsgDesc->numOfVnodes = htonl(1); // always one vnode
 
-  pShellMsg->import = htons(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT) ? 0 : 1);
-  pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pMeterMeta->index].vnode);
-  pShellMsg->numOfSid = htonl(pSql->cmd.numOfTablesInSubmit);  // number of meters to be inserted
+  pMsg += sizeof(SMsgDesc);
+  SSubmitMsg *pShellMsg = (SSubmitMsg *)pMsg;
 
-  // pSql->cmd.payloadLen is set during parse sql routine, so we do not use it here
-  pSql->cmd.msgType = TSDB_MSG_TYPE_SUBMIT;
-  tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip),
-           htons(pShellMsg->vnode));
+  pShellMsg->header.vgId = htonl(vgId);
+  pShellMsg->header.contLen = htonl(size);      // the length not includes the size of SMsgDesc
+  pShellMsg->length = pShellMsg->header.contLen;
   
-  return TSDB_CODE_SUCCESS;
-}
-
-void tscUpdateVnodeInQueryMsg(SSqlObj *pSql, char *buf) {
-  SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+  pShellMsg->numOfBlocks = htonl(pSql->cmd.numOfTablesInSubmit);  // number of tables to be inserted
 
-  char *          pStart = buf + tsRpcHeadSize;
-  SQueryMeterMsg *pQueryMsg = (SQueryMeterMsg *)pStart;
+  // pSql->cmd.payloadLen is set during copying data into payload
+  pSql->cmd.msgType = TSDB_MSG_TYPE_SUBMIT;
+  tscDumpEpSetFromVgroupInfo(&pTableMeta->corVgroupInfo, &pSql->epSet);
 
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {  // pSchema == NULL, query on meter
-    SMeterMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
-    pQueryMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
-  } else {  // query on metric
-    SMetricMeta *  pMetricMeta = pMeterMetaInfo->pMetricMeta;
-    SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, pMeterMetaInfo->vnodeIndex);
-    pQueryMsg->vnode = htons(pVnodeSidList->vpeerDesc[pSql->index].vnode);
-  }
+  tscDebug("%p build submit msg, vgId:%d numOfTables:%d numberOfEP:%d", pSql, vgId, pSql->cmd.numOfTablesInSubmit,
+      pSql->epSet.numOfEps);
+  return TSDB_CODE_SUCCESS;
 }
 
 /*
- * for meter query, simply return the size <= 1k
- * for metric query, estimate size according to meter tags
+ * for table query, simply return the size <= 1k
  */
 static int32_t tscEstimateQueryMsgSize(SSqlCmd *pCmd, int32_t clauseIndex) {
   const static int32_t MIN_QUERY_MSG_PKT_SIZE = TSDB_MAX_BYTES_PER_ROW * 5;
   SQueryInfo *         pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
 
-  int32_t srcColListSize = pQueryInfo->colList.numOfCols * sizeof(SColumnInfo);
-
-  int32_t         exprSize = sizeof(SSqlFuncExprMsg) * pQueryInfo->fieldsInfo.numOfOutputCols;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  // meter query without tags values
-  if (!UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    return MIN_QUERY_MSG_PKT_SIZE + minMsgSize() + sizeof(SQueryMeterMsg) + srcColListSize + exprSize;
-  }
-
-  SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
+  int32_t srcColListSize = (int32_t)(taosArrayGetSize(pQueryInfo->colList) * sizeof(SColumnInfo));
+  
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  int32_t exprSize = (int32_t)(sizeof(SSqlFuncMsg) * numOfExprs);
+  
+  return MIN_QUERY_MSG_PKT_SIZE + minMsgSize() + sizeof(SQueryTableMsg) + srcColListSize + exprSize + 4096;
+}
 
-  SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, pMeterMetaInfo->vnodeIndex);
+static char *doSerializeTableInfo(SQueryTableMsg* pQueryMsg, SSqlObj *pSql, char *pMsg) {
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, pSql->cmd.clauseIndex, 0);
+  TSKEY dfltKey = htobe64(pQueryMsg->window.skey);
 
-  int32_t meterInfoSize = (pMetricMeta->tagLen + sizeof(SMeterSidExtInfo)) * pVnodeSidList->numOfSids;
-  int32_t outputColumnSize = pQueryInfo->fieldsInfo.numOfOutputCols * sizeof(SSqlFuncExprMsg);
+  STableMeta * pTableMeta = pTableMetaInfo->pTableMeta;
+  if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) || pTableMetaInfo->pVgroupTables == NULL) {
+    
+    SCMVgroupInfo* pVgroupInfo = NULL;
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+      int32_t index = pTableMetaInfo->vgroupIndex;
+      assert(index >= 0);
+  
+      if (pTableMetaInfo->vgroupList->numOfVgroups > 0) {
+        assert(index < pTableMetaInfo->vgroupList->numOfVgroups);
+        pVgroupInfo = &pTableMetaInfo->vgroupList->vgroups[index];
+      }
+      tscDebug("%p query on stable, vgIndex:%d, numOfVgroups:%d", pSql, index, pTableMetaInfo->vgroupList->numOfVgroups);
+    } else {
+      pVgroupInfo = &pTableMeta->vgroupInfo;
+    }
 
-  int32_t size = meterInfoSize + outputColumnSize + srcColListSize + exprSize + MIN_QUERY_MSG_PKT_SIZE;
-  if (pQueryInfo->tsBuf != NULL) {
-    size += pQueryInfo->tsBuf->fileSize;
-  }
+    assert(pVgroupInfo != NULL);
 
-  return size;
-}
+    tscSetDnodeEpSet(pSql, pVgroupInfo);
+    pQueryMsg->head.vgId = htonl(pVgroupInfo->vgId);
 
-static char *doSerializeTableInfo(SSqlObj *pSql, int32_t numOfMeters, int32_t vnodeId, char *pMsg) {
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, pSql->cmd.clauseIndex, 0);
+    STableIdInfo *pTableIdInfo = (STableIdInfo *)pMsg;
+    pTableIdInfo->tid = htonl(pTableMeta->id.tid);
+    pTableIdInfo->uid = htobe64(pTableMeta->id.uid);
+    pTableIdInfo->key = htobe64(tscGetSubscriptionProgress(pSql->pSubscription, pTableMeta->id.uid, dfltKey));
 
-  SMeterMeta * pMeterMeta = pMeterMetaInfo->pMeterMeta;
-  SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
+    pQueryMsg->numOfTables = htonl(1);  // set the number of tables
+    pMsg += sizeof(STableIdInfo);
+  } else { // it is a subquery of the super table query, this EP info is acquired from vgroupInfo
+    int32_t index = pTableMetaInfo->vgroupIndex;
+    int32_t numOfVgroups = (int32_t)taosArrayGetSize(pTableMetaInfo->pVgroupTables);
+    assert(index >= 0 && index < numOfVgroups);
 
-  tscTrace("%p vid:%d, query on %d meters", pSql, htons(vnodeId), numOfMeters);
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-#ifdef _DEBUG_VIEW
-    tscTrace("%p sid:%d, uid:%" PRIu64, pSql, pMeterMetaInfo->pMeterMeta->sid, pMeterMetaInfo->pMeterMeta->uid);
-#endif
-    SMeterSidExtInfo *pMeterInfo = (SMeterSidExtInfo *)pMsg;
-    pMeterInfo->sid = htonl(pMeterMeta->sid);
-    pMeterInfo->uid = htobe64(pMeterMeta->uid);
-    pMeterInfo->key = htobe64(tscGetSubscriptionProgress(pSql->pSubscription, pMeterMeta->uid));
-    pMsg += sizeof(SMeterSidExtInfo);
-  } else {
-    SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, pMeterMetaInfo->vnodeIndex);
+    tscDebug("%p query on stable, vgIndex:%d, numOfVgroups:%d", pSql, index, numOfVgroups);
 
-    for (int32_t i = 0; i < numOfMeters; ++i) {
-      SMeterSidExtInfo *pMeterInfo = (SMeterSidExtInfo *)pMsg;
-      SMeterSidExtInfo *pQueryMeterInfo = tscGetMeterSidInfo(pVnodeSidList, i);
+    SVgroupTableInfo* pTableIdList = taosArrayGet(pTableMetaInfo->pVgroupTables, index);
 
-      pMeterInfo->sid = htonl(pQueryMeterInfo->sid);
-      pMeterInfo->uid = htobe64(pQueryMeterInfo->uid);
-      pMeterInfo->key = htobe64(tscGetSubscriptionProgress(pSql->pSubscription, pQueryMeterInfo->uid));
+    // set the vgroup info 
+    tscSetDnodeEpSet(pSql, &pTableIdList->vgInfo);
+    pQueryMsg->head.vgId = htonl(pTableIdList->vgInfo.vgId);
+    
+    int32_t numOfTables = (int32_t)taosArrayGetSize(pTableIdList->itemList);
+    pQueryMsg->numOfTables = htonl(numOfTables);  // set the number of tables
+  
+    // serialize each table id info
+    for(int32_t i = 0; i < numOfTables; ++i) {
+      STableIdInfo* pItem = taosArrayGet(pTableIdList->itemList, i);
       
-      pMsg += sizeof(SMeterSidExtInfo);
-
-      memcpy(pMsg, pQueryMeterInfo->tags, pMetricMeta->tagLen);
-      pMsg += pMetricMeta->tagLen;
-
-#ifdef _DEBUG_VIEW
-      tscTrace("%p sid:%d, uid:%" PRId64, pSql, pQueryMeterInfo->sid, pQueryMeterInfo->uid);
-#endif
+      STableIdInfo *pTableIdInfo = (STableIdInfo *)pMsg;
+      pTableIdInfo->tid = htonl(pItem->tid);
+      pTableIdInfo->uid = htobe64(pItem->uid);
+      pTableIdInfo->key = htobe64(tscGetSubscriptionProgress(pSql->pSubscription, pItem->uid, dfltKey));
+      pMsg += sizeof(STableIdInfo);
     }
   }
-
+  
+  tscDebug("%p vgId:%d, query on table:%s, tid:%d, uid:%" PRIu64, pSql, htonl(pQueryMsg->head.vgId), pTableMetaInfo->name,
+      pTableMeta->id.tid, pTableMeta->id.uid);
+  
   return pMsg;
 }
 
@@ -1607,132 +633,84 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for query msg", pSql);
-    return -1;
+    return TSDB_CODE_TSC_INVALID_SQL;  // todo add test for this
   }
-
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
   
-  char *          pStart = pCmd->payload + tsRpcHeadSize;
-
-  SMeterMeta * pMeterMeta = pMeterMetaInfo->pMeterMeta;
-  SMetricMeta *pMetricMeta = pMeterMetaInfo->pMetricMeta;
-
-  SQueryMeterMsg *pQueryMsg = (SQueryMeterMsg *)pStart;
-
-  int32_t msgLen = 0;
-  int32_t numOfMeters = 0;
-
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-    numOfMeters = 1;
-
-    tscTrace("%p query on vnode: %d, number of sid:%d, meter id: %s", pSql,
-             pMeterMeta->vpeerDesc[pMeterMeta->index].vnode, 1, pMeterMetaInfo->name);
-
-    pQueryMsg->vnode = htons(pMeterMeta->vpeerDesc[pMeterMeta->index].vnode);
-    pQueryMsg->uid = pMeterMeta->uid;
-    pQueryMsg->numOfTagsCols = 0;
-  } else {  // query on super table
-    if (pMeterMetaInfo->vnodeIndex < 0) {
-      tscError("%p error vnodeIdx:%d", pSql, pMeterMetaInfo->vnodeIndex);
-      return -1;
-    }
-
-    SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, pMeterMetaInfo->vnodeIndex);
-    uint32_t       vnodeId = pVnodeSidList->vpeerDesc[pVnodeSidList->index].vnode;
-
-    numOfMeters = pVnodeSidList->numOfSids;
-    if (numOfMeters <= 0) {
-      tscError("%p vid:%d,error numOfMeters in query message:%d", pSql, vnodeId, numOfMeters);
-      return -1;  // error
-    }
-
-    tscTrace("%p query on vid:%d, number of sid:%d", pSql, vnodeId, numOfMeters);
-    pQueryMsg->vnode = htons(vnodeId);
-  }
-
-  pQueryMsg->numOfSids = htonl(numOfMeters);
-  pQueryMsg->numOfTagsCols = htons(pMeterMetaInfo->numOfTags);
-
-  if (pQueryInfo->order.order == TSQL_SO_ASC) {
-    pQueryMsg->skey = htobe64(pQueryInfo->stime);
-    pQueryMsg->ekey = htobe64(pQueryInfo->etime);
-  } else {
-    pQueryMsg->skey = htobe64(pQueryInfo->etime);
-    pQueryMsg->ekey = htobe64(pQueryInfo->stime);
-  }
-
-  pQueryMsg->order = htons(pQueryInfo->order.order);
-  pQueryMsg->orderColId = htons(pQueryInfo->order.orderColId);
-
-  pQueryMsg->interpoType = htons(pQueryInfo->interpoType);
-
-  pQueryMsg->limit = htobe64(pQueryInfo->limit.limit);
-  pQueryMsg->offset = htobe64(pQueryInfo->limit.offset);
-
-  pQueryMsg->numOfCols = htons(pQueryInfo->colList.numOfCols);
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableMeta * pTableMeta = pTableMetaInfo->pTableMeta;
 
-  if (pQueryInfo->colList.numOfCols <= 0) {
-    tscError("%p illegal value of numOfCols in query msg: %d", pSql, pMeterMeta->numOfColumns);
-    return -1;
-  }
+  size_t numOfSrcCols = taosArrayGetSize(pQueryInfo->colList);
+  if (numOfSrcCols <= 0 && !tscQueryTags(pQueryInfo)) {
+    tscError("%p illegal value of numOfCols in query msg: %"PRIu64", table cols:%d", pSql, numOfSrcCols,
+        tscGetNumOfColumns(pTableMeta));
 
-  if (pMeterMeta->numOfTags < 0) {
-    tscError("%p illegal value of numOfTagsCols in query msg: %d", pSql, pMeterMeta->numOfTags);
-    return -1;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
-
-  pQueryMsg->nAggTimeInterval = htobe64(pQueryInfo->nAggTimeInterval);
-  pQueryMsg->intervalTimeUnit = pQueryInfo->intervalTimeUnit;
-  pQueryMsg->slidingTime = htobe64(pQueryInfo->nSlidingTime);
   
-  if (pQueryInfo->nAggTimeInterval < 0) {
-    tscError("%p illegal value of aggregation time interval in query msg: %ld", pSql, pQueryInfo->nAggTimeInterval);
-    return -1;
+  if (pQueryInfo->interval.interval < 0) {
+    tscError("%p illegal value of aggregation time interval in query msg: %ld", pSql, pQueryInfo->interval.interval);
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
-
+  
   if (pQueryInfo->groupbyExpr.numOfGroupCols < 0) {
     tscError("%p illegal value of numOfGroupCols in query msg: %d", pSql, pQueryInfo->groupbyExpr.numOfGroupCols);
-    return -1;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
-  pQueryMsg->numOfGroupCols = htons(pQueryInfo->groupbyExpr.numOfGroupCols);
-
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {  // query on meter
-    pQueryMsg->tagLength = 0;
-  } else {  // query on metric
-    pQueryMsg->tagLength = htons(pMetricMeta->tagLen);
-  }
-
-  pQueryMsg->queryType = htons(pQueryInfo->type);
-  pQueryMsg->numOfOutputCols = htons(pQueryInfo->exprsInfo.numOfExprs);
+  SQueryTableMsg *pQueryMsg = (SQueryTableMsg *)pCmd->payload;
 
-  if (pQueryInfo->fieldsInfo.numOfOutputCols < 0) {
-    tscError("%p illegal value of number of output columns in query msg: %d", pSql,
-             pQueryInfo->fieldsInfo.numOfOutputCols);
-    return -1;
-  }
+  int32_t numOfTags = (int32_t)taosArrayGetSize(pTableMetaInfo->tagColList);
+  
+  if (pQueryInfo->order.order == TSDB_ORDER_ASC) {
+    pQueryMsg->window.skey = htobe64(pQueryInfo->window.skey);
+    pQueryMsg->window.ekey = htobe64(pQueryInfo->window.ekey);
+  } else {
+    pQueryMsg->window.skey = htobe64(pQueryInfo->window.ekey);
+    pQueryMsg->window.ekey = htobe64(pQueryInfo->window.skey);
+  }
+
+  pQueryMsg->order          = htons(pQueryInfo->order.order);
+  pQueryMsg->orderColId     = htons(pQueryInfo->order.orderColId);
+  pQueryMsg->fillType       = htons(pQueryInfo->fillType);
+  pQueryMsg->limit          = htobe64(pQueryInfo->limit.limit);
+  pQueryMsg->offset         = htobe64(pQueryInfo->limit.offset);
+  pQueryMsg->numOfCols      = htons((int16_t)taosArrayGetSize(pQueryInfo->colList));
+  pQueryMsg->interval.interval   = htobe64(pQueryInfo->interval.interval);
+  pQueryMsg->interval.sliding   = htobe64(pQueryInfo->interval.sliding);
+  pQueryMsg->interval.offset   = htobe64(pQueryInfo->interval.offset);
+  pQueryMsg->interval.intervalUnit = pQueryInfo->interval.intervalUnit;
+  pQueryMsg->interval.slidingUnit = pQueryInfo->interval.slidingUnit;
+  pQueryMsg->interval.offsetUnit = pQueryInfo->interval.offsetUnit;
+  pQueryMsg->numOfGroupCols = htons(pQueryInfo->groupbyExpr.numOfGroupCols);
+  pQueryMsg->numOfTags      = htonl(numOfTags);
+  pQueryMsg->tagNameRelType = htons(pQueryInfo->tagCond.relType);
+  pQueryMsg->queryType      = htonl(pQueryInfo->type);
+  
+  size_t numOfOutput = tscSqlExprNumOfExprs(pQueryInfo);
+  pQueryMsg->numOfOutput = htons((int16_t)numOfOutput);
 
   // set column list ids
-  char *   pMsg = (char *)(pQueryMsg->colList) + pQueryInfo->colList.numOfCols * sizeof(SColumnInfo);
-  SSchema *pSchema = tsGetSchema(pMeterMeta);
-
-  for (int32_t i = 0; i < pQueryInfo->colList.numOfCols; ++i) {
-    SColumnBase *pCol = tscColumnBaseInfoGet(&pQueryInfo->colList, i);
-    SSchema *    pColSchema = &pSchema[pCol->colIndex.columnIndex];
+  size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
+  char *pMsg = (char *)(pQueryMsg->colList) + numOfCols * sizeof(SColumnInfo);
+  SSchema *pSchema = tscGetTableSchema(pTableMeta);
+  
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumn *pCol = taosArrayGetP(pQueryInfo->colList, i);
+    SSchema *pColSchema = &pSchema[pCol->colIndex.columnIndex];
 
-    if (pCol->colIndex.columnIndex >= pMeterMeta->numOfColumns || pColSchema->type < TSDB_DATA_TYPE_BOOL ||
+    if (pCol->colIndex.columnIndex >= tscGetNumOfColumns(pTableMeta) || pColSchema->type < TSDB_DATA_TYPE_BOOL ||
         pColSchema->type > TSDB_DATA_TYPE_NCHAR) {
-      tscError("%p vid:%d sid:%d id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s", pSql,
-               htons(pQueryMsg->vnode), pMeterMeta->sid, pMeterMetaInfo->name, pMeterMeta->numOfColumns, pCol->colIndex,
+      tscError("%p tid:%d uid:%" PRIu64" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s",
+          pSql, pTableMeta->id.tid, pTableMeta->id.uid, pTableMetaInfo->name, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex,
                pColSchema->name);
 
-      return -1;  // 0 means build msg failed
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     pQueryMsg->colList[i].colId = htons(pColSchema->colId);
     pQueryMsg->colList[i].bytes = htons(pColSchema->bytes);
-    pQueryMsg->colList[i].type = htons(pColSchema->type);
+    pQueryMsg->colList[i].type  = htons(pColSchema->type);
     pQueryMsg->colList[i].numOfFilters = htons(pCol->numOfFilters);
 
     // append the filter information after the basic column information
@@ -1740,13 +718,13 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       SColumnFilterInfo *pColFilter = &pCol->filterInfo[f];
 
       SColumnFilterInfo *pFilterMsg = (SColumnFilterInfo *)pMsg;
-      pFilterMsg->filterOnBinary = htons(pColFilter->filterOnBinary);
+      pFilterMsg->filterstr = htons(pColFilter->filterstr);
 
       pMsg += sizeof(SColumnFilterInfo);
 
-      if (pColFilter->filterOnBinary) {
+      if (pColFilter->filterstr) {
         pFilterMsg->len = htobe64(pColFilter->len);
-        memcpy(pMsg, (void *)pColFilter->pz, pColFilter->len + 1);
+        memcpy(pMsg, (void *)pColFilter->pz, (size_t)(pColFilter->len + 1));
         pMsg += (pColFilter->len + 1);  // append the additional filter binary info
       } else {
         pFilterMsg->lowerBndi = htobe64(pColFilter->lowerBndi);
@@ -1758,131 +736,150 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
       if (pColFilter->lowerRelOptr == TSDB_RELATION_INVALID && pColFilter->upperRelOptr == TSDB_RELATION_INVALID) {
         tscError("invalid filter info");
-        return -1;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     }
   }
 
-  bool hasArithmeticFunction = false;
-
-  SSqlFuncExprMsg *pSqlFuncExpr = (SSqlFuncExprMsg *)pMsg;
-
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  SSqlFuncMsg *pSqlFuncExpr = (SSqlFuncMsg *)pMsg;
+  for (int32_t i = 0; i < tscSqlExprNumOfExprs(pQueryInfo); ++i) {
     SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
 
-    if (pExpr->functionId == TSDB_FUNC_ARITHM) {
-      hasArithmeticFunction = true;
-    }
-
-    if (!tscValidateColumnId(pMeterMetaInfo, pExpr->colInfo.colId)) {
-      /* column id is not valid according to the cached metermeta, the meter meta is expired */
+    if (!tscValidateColumnId(pTableMetaInfo, pExpr->colInfo.colId, pExpr->numOfParams)) {
       tscError("%p table schema is not matched with parsed sql", pSql);
-      return -1;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
-    pSqlFuncExpr->colInfo.colId = htons(pExpr->colInfo.colId);
-    pSqlFuncExpr->colInfo.colIdx = htons(pExpr->colInfo.colIdx);
-    pSqlFuncExpr->colInfo.flag = htons(pExpr->colInfo.flag);
+    pSqlFuncExpr->colInfo.colId    = htons(pExpr->colInfo.colId);
+    pSqlFuncExpr->colInfo.colIndex = htons(pExpr->colInfo.colIndex);
+    pSqlFuncExpr->colInfo.flag     = htons(pExpr->colInfo.flag);
 
-    pSqlFuncExpr->functionId = htons(pExpr->functionId);
+    pSqlFuncExpr->functionId  = htons(pExpr->functionId);
     pSqlFuncExpr->numOfParams = htons(pExpr->numOfParams);
-    pMsg += sizeof(SSqlFuncExprMsg);
+    pMsg += sizeof(SSqlFuncMsg);
 
     for (int32_t j = 0; j < pExpr->numOfParams; ++j) {
+      // todo add log
       pSqlFuncExpr->arg[j].argType = htons((uint16_t)pExpr->param[j].nType);
       pSqlFuncExpr->arg[j].argBytes = htons(pExpr->param[j].nLen);
 
       if (pExpr->param[j].nType == TSDB_DATA_TYPE_BINARY) {
         memcpy(pMsg, pExpr->param[j].pz, pExpr->param[j].nLen);
-
-        // by plus one char to make the string null-terminated
-        pMsg += pExpr->param[j].nLen + 1;
+        pMsg += pExpr->param[j].nLen;
       } else {
         pSqlFuncExpr->arg[j].argValue.i64 = htobe64(pExpr->param[j].i64Key);
       }
     }
 
-    pSqlFuncExpr = (SSqlFuncExprMsg *)pMsg;
+    pSqlFuncExpr = (SSqlFuncMsg *)pMsg;
   }
-
-  int32_t len = 0;
-  if (hasArithmeticFunction) {
-    SColumnBase *pColBase = pQueryInfo->colList.pColList;
-    for (int32_t i = 0; i < pQueryInfo->colList.numOfCols; ++i) {
-      char *  name = pSchema[pColBase[i].colIndex.columnIndex].name;
-      int32_t lenx = strlen(name);
-      memcpy(pMsg, name, lenx);
-      *(pMsg + lenx) = ',';
-
-      len += (lenx + 1);  // one for comma
-      pMsg += (lenx + 1);
-    }
-  }
-
-  pQueryMsg->colNameLen = htonl(len);
-
+  
   // serialize the table info (sid, uid, tags)
-  pMsg = doSerializeTableInfo(pSql, numOfMeters, htons(pQueryMsg->vnode), pMsg);
-
-  // only include the required tag column schema. If a tag is not required, it won't be sent to vnode
-  if (pMeterMetaInfo->numOfTags > 0) {
-    // always transfer tag schema to vnode if exists
-    SSchema *pTagSchema = tsGetTagSchema(pMeterMeta);
-
-    for (int32_t j = 0; j < pMeterMetaInfo->numOfTags; ++j) {
-      if (pMeterMetaInfo->tagColumnIndex[j] == TSDB_TBNAME_COLUMN_INDEX) {
-        SSchema tbSchema = {
-            .bytes = TSDB_METER_NAME_LEN, .colId = TSDB_TBNAME_COLUMN_INDEX, .type = TSDB_DATA_TYPE_BINARY};
-        memcpy(pMsg, &tbSchema, sizeof(SSchema));
-      } else {
-        memcpy(pMsg, &pTagSchema[pMeterMetaInfo->tagColumnIndex[j]], sizeof(SSchema));
-      }
-
-      pMsg += sizeof(SSchema);
-    }
-  }
-
+  pMsg = doSerializeTableInfo(pQueryMsg, pSql, pMsg);
+  
   SSqlGroupbyExpr *pGroupbyExpr = &pQueryInfo->groupbyExpr;
-  if (pGroupbyExpr->numOfGroupCols != 0) {
+  if (pGroupbyExpr->numOfGroupCols > 0) {
     pQueryMsg->orderByIdx = htons(pGroupbyExpr->orderIndex);
     pQueryMsg->orderType = htons(pGroupbyExpr->orderType);
 
     for (int32_t j = 0; j < pGroupbyExpr->numOfGroupCols; ++j) {
-      SColIndexEx *pCol = &pGroupbyExpr->columnInfo[j];
-
+      SColIndex* pCol = taosArrayGet(pGroupbyExpr->columnInfo, j);
+  
       *((int16_t *)pMsg) = pCol->colId;
       pMsg += sizeof(pCol->colId);
 
-      *((int16_t *)pMsg) += pCol->colIdx;
-      pMsg += sizeof(pCol->colIdx);
-
-      *((int16_t *)pMsg) += pCol->colIdxInBuf;
-      pMsg += sizeof(pCol->colIdxInBuf);
+      *((int16_t *)pMsg) += pCol->colIndex;
+      pMsg += sizeof(pCol->colIndex);
 
       *((int16_t *)pMsg) += pCol->flag;
       pMsg += sizeof(pCol->flag);
+      
+      memcpy(pMsg, pCol->name, tListLen(pCol->name));
+      pMsg += tListLen(pCol->name);
+    }
+  }
+
+  if (pQueryInfo->fillType != TSDB_FILL_NONE) {
+    for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+      *((int64_t *)pMsg) = htobe64(pQueryInfo->fillVal[i]);
+      pMsg += sizeof(pQueryInfo->fillVal[0]);
+    }
+  }
+  
+  if (numOfTags != 0) {
+    int32_t numOfColumns = tscGetNumOfColumns(pTableMeta);
+    int32_t numOfTagColumns = tscGetNumOfTags(pTableMeta);
+    int32_t total = numOfTagColumns + numOfColumns;
+    
+    pSchema = tscGetTableTagSchema(pTableMeta);
+    
+    for (int32_t i = 0; i < numOfTags; ++i) {
+      SColumn *pCol = taosArrayGetP(pTableMetaInfo->tagColList, i);
+      SSchema *pColSchema = &pSchema[pCol->colIndex.columnIndex];
+
+      if ((pCol->colIndex.columnIndex >= numOfTagColumns || pCol->colIndex.columnIndex < -1) ||
+          (pColSchema->type < TSDB_DATA_TYPE_BOOL || pColSchema->type > TSDB_DATA_TYPE_NCHAR)) {
+        tscError("%p tid:%d uid:%" PRIu64 " id:%s, tag index out of range, totalCols:%d, numOfTags:%d, index:%d, column name:%s",
+                 pSql, pTableMeta->id.tid, pTableMeta->id.uid, pTableMetaInfo->name, total, numOfTagColumns,
+                 pCol->colIndex.columnIndex, pColSchema->name);
+
+        return TSDB_CODE_TSC_INVALID_SQL;
+      }
+  
+      SColumnInfo* pTagCol = (SColumnInfo*) pMsg;
+  
+      pTagCol->colId = htons(pColSchema->colId);
+      pTagCol->bytes = htons(pColSchema->bytes);
+      pTagCol->type  = htons(pColSchema->type);
+      pTagCol->numOfFilters = 0;
+      
+      pMsg += sizeof(SColumnInfo);
     }
   }
 
-  if (pQueryInfo->interpoType != TSDB_INTERPO_NONE) {
-    for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-      *((int64_t *)pMsg) = htobe64(pQueryInfo->defaultVal[i]);
-      pMsg += sizeof(pQueryInfo->defaultVal[0]);
+  // serialize tag column query condition
+  if (pQueryInfo->tagCond.pCond != NULL && taosArrayGetSize(pQueryInfo->tagCond.pCond) > 0) {
+    STagCond* pTagCond = &pQueryInfo->tagCond;
+    
+    SCond *pCond = tsGetSTableQueryCond(pTagCond, pTableMeta->id.uid);
+    if (pCond != NULL && pCond->cond != NULL) {
+      pQueryMsg->tagCondLen = htons(pCond->len);
+      memcpy(pMsg, pCond->cond, pCond->len);
+      
+      pMsg += pCond->len;
     }
   }
+  
+  if (pQueryInfo->tagCond.tbnameCond.cond == NULL) {
+    *pMsg = 0;
+    pMsg++;
+  } else {
+    strcpy(pMsg, pQueryInfo->tagCond.tbnameCond.cond);
+    pMsg += strlen(pQueryInfo->tagCond.tbnameCond.cond) + 1;
+  }
 
   // compressed ts block
-  pQueryMsg->tsOffset = htonl(pMsg - pStart);
+  pQueryMsg->tsOffset = htonl((int32_t)(pMsg - pCmd->payload));
   int32_t tsLen = 0;
   int32_t numOfBlocks = 0;
 
   if (pQueryInfo->tsBuf != NULL) {
-    STSVnodeBlockInfo *pBlockInfo = tsBufGetVnodeBlockInfo(pQueryInfo->tsBuf, pMeterMetaInfo->vnodeIndex);
+    STSVnodeBlockInfo *pBlockInfo = tsBufGetVnodeBlockInfo(pQueryInfo->tsBuf, pTableMetaInfo->vgroupIndex);
     assert(QUERY_IS_JOIN_QUERY(pQueryInfo->type) && pBlockInfo != NULL);  // this query should not be sent
 
     // todo refactor
-    fseek(pQueryInfo->tsBuf->f, pBlockInfo->offset, SEEK_SET);
-    fread(pMsg, pBlockInfo->compLen, 1, pQueryInfo->tsBuf->f);
+    if (fseek(pQueryInfo->tsBuf->f, pBlockInfo->offset, SEEK_SET) != 0) {
+      int code = TAOS_SYSTEM_ERROR(ferror(pQueryInfo->tsBuf->f));
+      tscError("%p: fseek failed: %s", pSql, tstrerror(code));
+      return code;
+    }
+
+    size_t s = fread(pMsg, 1, pBlockInfo->compLen, pQueryInfo->tsBuf->f);
+    if (s != pBlockInfo->compLen) {
+      int code = TAOS_SYSTEM_ERROR(ferror(pQueryInfo->tsBuf->f));
+      tscError("%p: fread didn't return expected data: %s", pSql, tstrerror(code));
+      return code;
+    }
 
     pMsg += pBlockInfo->compLen;
     tsLen = pBlockInfo->compLen;
@@ -1895,77 +892,64 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     pQueryMsg->tsOrder = htonl(pQueryInfo->tsBuf->tsOrder);
   }
 
-  msgLen = pMsg - pStart;
+  int32_t msgLen = (int32_t)(pMsg - pCmd->payload);
 
-  tscTrace("%p msg built success,len:%d bytes", pSql, msgLen);
+  tscDebug("%p msg built success,len:%d bytes", pSql, msgLen);
   pCmd->payloadLen = msgLen;
   pSql->cmd.msgType = TSDB_MSG_TYPE_QUERY;
-
-  assert(msgLen + minMsgSize() <= size);
+  
+  pQueryMsg->head.contLen = htonl(msgLen);
+  assert(msgLen + minMsgSize() <= (int32_t)pCmd->allocSize);
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildCreateDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateDbMsg *pCreateDbMsg;
-  char *        pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMCreateDbMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_DB;
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pCreateDbMsg = (SCreateDbMsg *)pMsg;
+  SCMCreateDbMsg *pCreateDbMsg = (SCMCreateDbMsg*)pCmd->payload;
 
   assert(pCmd->numOfClause == 1);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  
-  strncpy(pCreateDbMsg->db, pMeterMetaInfo->name, tListLen(pCreateDbMsg->db));
-  pMsg += sizeof(SCreateDbMsg);
-
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_CREATE_DB;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pCreateDbMsg->db, pTableMetaInfo->name, sizeof(pCreateDbMsg->db));
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildCreateDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateDnodeMsg *pCreate;
-
-  char *pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMCreateDnodeMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-
-  pCreate = (SCreateDnodeMsg *)pMsg;
-  strncpy(pCreate->ip, pInfo->pDCLInfo->a[0].z, pInfo->pDCLInfo->a[0].n);
-
-  pMsg += sizeof(SCreateDnodeMsg);
-
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_CREATE_DNODE;
+  SCMCreateDnodeMsg *pCreate = (SCMCreateDnodeMsg *)pCmd->payload;
+  strncpy(pCreate->ep, pInfo->pDCLInfo->a[0].z, pInfo->pDCLInfo->a[0].n);
+  
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_DNODE;
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateAcctMsg *pAlterMsg;
-  char *          pMsg, *pStart;
-  int             msgLen = 0;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMCreateAcctMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-
-  pAlterMsg = (SCreateAcctMsg *)pMsg;
+  SCMCreateAcctMsg *pAlterMsg = (SCMCreateAcctMsg *)pCmd->payload;
 
-  SSQLToken *pName = &pInfo->pDCLInfo->user.user;
-  SSQLToken *pPwd = &pInfo->pDCLInfo->user.passwd;
+  SStrToken *pName = &pInfo->pDCLInfo->user.user;
+  SStrToken *pPwd = &pInfo->pDCLInfo->user.passwd;
 
   strncpy(pAlterMsg->user, pName->z, pName->n);
   strncpy(pAlterMsg->pass, pPwd->z, pPwd->n);
 
-  pMsg += sizeof(SCreateAcctMsg);
-
   SCreateAcctSQL *pAcctOpt = &pInfo->pDCLInfo->acctOpt;
 
   pAlterMsg->cfg.maxUsers = htonl(pAcctOpt->maxUsers);
@@ -1991,26 +975,24 @@ int32_t tscBuildAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     }
   }
 
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-
-  pCmd->msgType = TSDB_MSG_TYPE_CREATE_ACCT;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_ACCT;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateUserMsg *pAlterMsg;
-  char *         pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMCreateUserMsg);
+
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pAlterMsg = (SCreateUserMsg *)pMsg;
+  SCMCreateUserMsg *pAlterMsg = (SCMCreateUserMsg*)pCmd->payload;
 
   SUserInfo *pUser = &pInfo->pDCLInfo->user;
   strncpy(pAlterMsg->user, pUser->user.z, pUser->user.n);
-  
-  pAlterMsg->flag = pUser->type;
+  pAlterMsg->flag = (int8_t)pUser->type;
 
   if (pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
     pAlterMsg->privilege = (char)pCmd->count;
@@ -2020,243 +1002,181 @@ int32_t tscBuildUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     strncpy(pAlterMsg->pass, pUser->passwd.z, pUser->passwd.n);
   }
 
-  pMsg += sizeof(SCreateUserMsg);
-  pCmd->payloadLen = pMsg - pStart;
-
   if (pUser->type == TSDB_ALTER_USER_PASSWD || pUser->type == TSDB_ALTER_USER_PRIVILEGES) {
-    pCmd->msgType = TSDB_MSG_TYPE_ALTER_USER;
+    pCmd->msgType = TSDB_MSG_TYPE_CM_ALTER_USER;
   } else {
-    pCmd->msgType = TSDB_MSG_TYPE_CREATE_USER;
+    pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_USER;
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildCfgDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  char *   pStart = NULL;
   SSqlCmd *pCmd = &pSql->cmd;
-
-  char *pMsg = doBuildMsgHeader(pSql, &pStart);
-  pMsg += sizeof(SCfgMsg);
-
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_CFG_PNODE;
-
+  pCmd->payloadLen = sizeof(SCMCfgDnodeMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CONFIG_DNODE;
   return TSDB_CODE_SUCCESS;
 }
 
-char *doBuildMsgHeader(SSqlObj *pSql, char **pStart) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  STscObj *pObj = pSql->pTscObj;
-
-  char *pMsg = pCmd->payload + tsRpcHeadSize;
-  *pStart = pMsg;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  strcpy(pMgmt->db, pObj->db);
-
-  pMsg += sizeof(SMgmtHead);
-
-  return pMsg;
-}
-
 int32_t tscBuildDropDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SDropDbMsg *pDropDbMsg;
-  char *      pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMDropDbMsg);
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pDropDbMsg = (SDropDbMsg *)pMsg;
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  strncpy(pDropDbMsg->db, pMeterMetaInfo->name, tListLen(pDropDbMsg->db));
-  pDropDbMsg->ignoreNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pMsg += sizeof(SDropDbMsg);
+  SCMDropDbMsg *pDropDbMsg = (SCMDropDbMsg*)pCmd->payload;
 
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_DROP_DB;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pDropDbMsg->db, pTableMetaInfo->name, sizeof(pDropDbMsg->db));
+  pDropDbMsg->ignoreNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
 
+  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DB;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildDropTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SDropTableMsg *pDropTableMsg;
-  char *         pMsg, *pStart;
-  int            msgLen = 0;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMDropTableMsg);
 
-  //pMsg = doBuildMsgHeader(pSql, &pStart);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-
-  pMsg   = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
-  pMsg += sizeof(SMgmtHead);
-
-  pDropTableMsg = (SDropTableMsg *)pMsg;
-
-  strcpy(pDropTableMsg->meterId, pMeterMetaInfo->name);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
+  SCMDropTableMsg *pDropTableMsg = (SCMDropTableMsg*)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  strcpy(pDropTableMsg->tableId, pTableMetaInfo->name);
   pDropTableMsg->igNotExists = pInfo->pDCLInfo->existsCheck ? 1 : 0;
-  pMsg += sizeof(SDropTableMsg);
-
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_DROP_TABLE;
 
+  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_TABLE;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildDropDnodeMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SDropDnodeMsg *pDrop;
-  char *         pMsg, *pStart;
+  SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMDropDnodeMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+  SCMDropDnodeMsg *pDrop = (SCMDropDnodeMsg *)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pDrop->ep, pTableMetaInfo->name, sizeof(pDrop->ep));
+  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_DNODE;
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pDrop = (SDropDnodeMsg *)pMsg;
+  return TSDB_CODE_SUCCESS;
+}
 
-  strcpy(pDrop->ip, pMeterMetaInfo->name);
+int32_t tscBuildDropUserMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMDropUserMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_USER;
 
-  pMsg += sizeof(SDropDnodeMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_DROP_DNODE;
+  SCMDropUserMsg *pDropMsg = (SCMDropUserMsg*)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pDropMsg->user, pTableMetaInfo->name, sizeof(pDropMsg->user));
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildDropAcctMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SDropUserMsg *pDropMsg;
-  char *        pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMDropUserMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_DROP_ACCT;
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pDropMsg = (SDropUserMsg *)pMsg;
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  strcpy(pDropMsg->user, pMeterMetaInfo->name);
-
-  pMsg += sizeof(SDropUserMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_DROP_USER;
+  SCMDropUserMsg *pDropMsg = (SCMDropUserMsg*)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pDropMsg->user, pTableMetaInfo->name, sizeof(pDropMsg->user));
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildUseDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SUseDbMsg *pUseDbMsg;
-  char *     pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMUseDbMsg);
 
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pUseDbMsg = (SUseDbMsg *)pMsg;
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  strcpy(pUseDbMsg->db, pMeterMetaInfo->name);
-
-  pMsg += sizeof(SUseDbMsg);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_USE_DB;
+  SCMUseDbMsg *pUseDbMsg = (SCMUseDbMsg*)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  strcpy(pUseDbMsg->db, pTableMetaInfo->name);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_USE_DB;
 
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildShowMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SShowMsg *pShowMsg;
-  char *    pMsg, *pStart;
-  int       msgLen = 0;
-
-  SSqlCmd *pCmd = &pSql->cmd;
   STscObj *pObj = pSql->pTscObj;
+  SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_SHOW;
+  pCmd->payloadLen = sizeof(SCMShowMsg) + 100;
 
-  int32_t size = minMsgSize() + sizeof(SMgmtHead) + sizeof(SShowTableMsg) + pCmd->payloadLen + TSDB_EXTRA_PAYLOAD_SIZE;
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
-    tscError("%p failed to malloc for show msg", pSql);
-    return -1;
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-  size_t          nameLen = strlen(pMeterMetaInfo->name);
+  SCMShowMsg *pShowMsg = (SCMShowMsg*)pCmd->payload;
 
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  size_t nameLen = strlen(pTableMetaInfo->name);
   if (nameLen > 0) {
-    strcpy(pMgmt->db, pMeterMetaInfo->name);  // prefix is set here
+    tstrncpy(pShowMsg->db, pTableMetaInfo->name, sizeof(pShowMsg->db));  // prefix is set here
   } else {
-    strcpy(pMgmt->db, pObj->db);
+    tstrncpy(pShowMsg->db, pObj->db, sizeof(pShowMsg->db));
   }
 
-  pMsg += sizeof(SMgmtHead);
-
-  pShowMsg = (SShowMsg *)pMsg;
   SShowInfo *pShowInfo = &pInfo->pDCLInfo->showOpt;
-
   pShowMsg->type = pShowInfo->showType;
 
   if (pShowInfo->showType != TSDB_MGMT_TABLE_VNODES) {
-    SSQLToken *pPattern = &pShowInfo->pattern;
+    SStrToken *pPattern = &pShowInfo->pattern;
     if (pPattern->type > 0) {  // only show tables support wildcard query
       strncpy(pShowMsg->payload, pPattern->z, pPattern->n);
       pShowMsg->payloadLen = htons(pPattern->n);
     }
-    pMsg += (sizeof(SShowTableMsg) + pPattern->n);
   } else {
-    SSQLToken *pIpAddr = &pShowInfo->prefix;
-    assert(pIpAddr->n > 0 && pIpAddr->type > 0);
+    SStrToken *pEpAddr = &pShowInfo->prefix;
+    assert(pEpAddr->n > 0 && pEpAddr->type > 0);
 
-    strncpy(pShowMsg->payload, pIpAddr->z, pIpAddr->n);
-    pShowMsg->payloadLen = htons(pIpAddr->n);
-
-    pMsg += (sizeof(SShowTableMsg) + pIpAddr->n);
+    strncpy(pShowMsg->payload, pEpAddr->z, pEpAddr->n);
+    pShowMsg->payloadLen = htons(pEpAddr->n);
   }
 
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_SHOW;
-
-  assert(msgLen + minMsgSize() <= size);
-
+  pCmd->payloadLen = sizeof(SCMShowMsg) + pShowMsg->payloadLen;
   return TSDB_CODE_SUCCESS;
 }
 
 int32_t tscBuildKillMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SKillQuery *pKill;
-  char *      pMsg, *pStart;
-
   SSqlCmd *pCmd = &pSql->cmd;
-
-  pMsg = doBuildMsgHeader(pSql, &pStart);
-  pKill = (SKillQuery *)pMsg;
-
-  pKill->handle = 0;
-  strncpy(pKill->queryId, pInfo->pDCLInfo->ip.z, pInfo->pDCLInfo->ip.n);
-
-  pMsg += sizeof(SKillQuery);
-
-  pCmd->payloadLen = pMsg - pStart;
+  pCmd->payloadLen = sizeof(SCMKillQueryMsg);
 
   switch (pCmd->command) {
     case TSDB_SQL_KILL_QUERY:
-      pCmd->msgType = TSDB_MSG_TYPE_KILL_QUERY;
+      pCmd->msgType = TSDB_MSG_TYPE_CM_KILL_QUERY;
       break;
     case TSDB_SQL_KILL_CONNECTION:
-      pCmd->msgType = TSDB_MSG_TYPE_KILL_CONNECTION;
+      pCmd->msgType = TSDB_MSG_TYPE_CM_KILL_CONN;
       break;
     case TSDB_SQL_KILL_STREAM:
-      pCmd->msgType = TSDB_MSG_TYPE_KILL_STREAM;
+      pCmd->msgType = TSDB_MSG_TYPE_CM_KILL_STREAM;
       break;
   }
   return TSDB_CODE_SUCCESS;
@@ -2265,7 +1185,7 @@ int32_t tscBuildKillMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &(pSql->cmd);
 
-  int32_t size = minMsgSize() + sizeof(SMgmtHead) + sizeof(SCreateTableMsg);
+  int32_t size = minMsgSize() + sizeof(SCMCreateTableMsg);
 
   SCreateTableSQL *pCreateTableInfo = pInfo->pCreateTableInfo;
   if (pCreateTableInfo->type == TSQL_CREATE_TABLE_FROM_STABLE) {
@@ -2282,56 +1202,51 @@ int tscEstimateCreateTableMsgLength(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 
 int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCreateTableMsg *pCreateTableMsg;
-  char *           pMsg, *pStart;
   int              msgLen = 0;
   SSchema *        pSchema;
   int              size = 0;
-
   SSqlCmd *pCmd = &pSql->cmd;
 
   SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   // Reallocate the payload size
   size = tscEstimateCreateTableMsgLength(pSql, pInfo);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for create table msg", pSql);
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
 
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
+  SCMCreateTableMsg *pCreateTableMsg = (SCMCreateTableMsg *)pCmd->payload;
+  strcpy(pCreateTableMsg->tableId, pTableMetaInfo->name);
 
   // use dbinfo from table id without modifying current db info
-  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
-
-  pMsg += sizeof(SMgmtHead);
-
-  pCreateTableMsg = (SCreateTableMsg *)pMsg;
-  strcpy(pCreateTableMsg->meterId, pMeterMetaInfo->name);
+  tscGetDBInfoFromTableFullName(pTableMetaInfo->name, pCreateTableMsg->db);
 
   SCreateTableSQL *pCreateTable = pInfo->pCreateTableInfo;
 
   pCreateTableMsg->igExists = pCreateTable->existCheck ? 1 : 0;
-
   pCreateTableMsg->numOfColumns = htons(pCmd->numOfCols);
   pCreateTableMsg->numOfTags = htons(pCmd->count);
 
   pCreateTableMsg->sqlLen = 0;
-  pMsg = (char *)pCreateTableMsg->schema;
+  char *pMsg = (char *)pCreateTableMsg->schema;
 
   int8_t type = pInfo->pCreateTableInfo->type;
   if (type == TSQL_CREATE_TABLE_FROM_STABLE) {  // create by using super table, tags value
-    memcpy(pMsg, &pInfo->pCreateTableInfo->usingInfo.tagdata, sizeof(STagData));
-    pMsg += sizeof(STagData);
+    STagData* pTag = &pInfo->pCreateTableInfo->usingInfo.tagdata;
+    *(int32_t*)pMsg = htonl(pTag->dataLen);
+    pMsg += sizeof(int32_t);
+    memcpy(pMsg, pTag->name, sizeof(pTag->name));
+    pMsg += sizeof(pTag->name);
+    memcpy(pMsg, pTag->data, pTag->dataLen);
+    pMsg += pTag->dataLen;
   } else {  // create (super) table
-    pSchema = pCreateTableMsg->schema;
+    pSchema = (SSchema *)pCreateTableMsg->schema;
 
     for (int i = 0; i < pCmd->numOfCols + pCmd->count; ++i) {
-      TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
+      TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
 
       pSchema->type = pField->type;
       strcpy(pSchema->name, pField->name);
@@ -2350,11 +1265,12 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
     }
   }
 
-  tscClearFieldInfo(&pQueryInfo->fieldsInfo);
+  tscFieldInfoClear(&pQueryInfo->fieldsInfo);
 
-  msgLen = pMsg - pStart;
+  msgLen = (int32_t)(pMsg - (char*)pCreateTableMsg);
+  pCreateTableMsg->contLen = htonl(msgLen);
   pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_CREATE_TABLE;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE;
 
   assert(msgLen + minMsgSize() <= size);
   return TSDB_CODE_SUCCESS;
@@ -2362,47 +1278,37 @@ int tscBuildCreateTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
 int tscEstimateAlterTableMsgLength(SSqlCmd *pCmd) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  return minMsgSize() + sizeof(SMgmtHead) + sizeof(SAlterTableMsg) + sizeof(SSchema) * tscNumOfFields(pQueryInfo) +
+  return minMsgSize() + sizeof(SCMAlterTableMsg) + sizeof(SSchema) * tscNumOfFields(pQueryInfo) +
          TSDB_EXTRA_PAYLOAD_SIZE;
 }
 
 int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SAlterTableMsg *pAlterTableMsg;
-  char *          pMsg, *pStart;
-  int             msgLen = 0;
-  int             size = 0;
+  char *pMsg;
+  int   msgLen = 0;
 
-  SSqlCmd *   pCmd = &pSql->cmd;
+  SSqlCmd    *pCmd = &pSql->cmd;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  size = tscEstimateAlterTableMsgLength(pCmd);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  
+  SAlterTableSQL *pAlterInfo = pInfo->pAlterInfo;
+  int size = tscEstimateAlterTableMsgLength(pCmd);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for alter table msg", pSql);
-    return -1;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
+  
+  SCMAlterTableMsg *pAlterTableMsg = (SCMAlterTableMsg *)pCmd->payload;
+  tscGetDBInfoFromTableFullName(pTableMetaInfo->name, pAlterTableMsg->db);
 
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
-  pMsg += sizeof(SMgmtHead);
-
-  SAlterTableSQL *pAlterInfo = pInfo->pAlterInfo;
-
-  pAlterTableMsg = (SAlterTableMsg *)pMsg;
-  strcpy(pAlterTableMsg->meterId, pMeterMetaInfo->name);
+  strcpy(pAlterTableMsg->tableId, pTableMetaInfo->name);
   pAlterTableMsg->type = htons(pAlterInfo->type);
 
   pAlterTableMsg->numOfCols = htons(tscNumOfFields(pQueryInfo));
-  memcpy(pAlterTableMsg->tagVal, pAlterInfo->tagData.data, TSDB_MAX_TAGS_LEN);
-
   SSchema *pSchema = pAlterTableMsg->schema;
   for (int i = 0; i < tscNumOfFields(pQueryInfo); ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
+    TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+  
     pSchema->type = pField->type;
     strcpy(pSchema->name, pField->name);
     pSchema->bytes = htons(pField->bytes);
@@ -2410,76 +1316,61 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   }
 
   pMsg = (char *)pSchema;
+  pAlterTableMsg->tagValLen = htonl(pAlterInfo->tagData.dataLen);
+  memcpy(pMsg, pAlterInfo->tagData.data, pAlterInfo->tagData.dataLen);
+  pMsg += pAlterInfo->tagData.dataLen;
+
+  msgLen = (int32_t)(pMsg - (char*)pAlterTableMsg);
 
-  msgLen = pMsg - pStart;
   pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_ALTER_TABLE;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_ALTER_TABLE;
 
   assert(msgLen + minMsgSize() <= size);
 
   return TSDB_CODE_SUCCESS;
 }
 
-int tscAlterDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SAlterDbMsg *pAlterDbMsg;
-  char *       pMsg, *pStart;
-  int          msgLen = 0;
-
-  SSqlCmd *       pCmd = &pSql->cmd;
-  STscObj *       pObj = pSql->pTscObj;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+int tscBuildUpdateTagMsg(SSqlObj* pSql, SSqlInfo *pInfo) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  pCmd->msgType = TSDB_MSG_TYPE_UPDATE_TAG_VAL;
+  
+  SUpdateTableTagValMsg* pUpdateMsg = (SUpdateTableTagValMsg*) pCmd->payload;
+  pCmd->payloadLen = htonl(pUpdateMsg->head.contLen);
 
-  pStart = pCmd->payload + tsRpcHeadSize;
-  pMsg = pStart;
+  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  strcpy(pMgmt->db, pObj->db);
-  pMsg += sizeof(SMgmtHead);
+  tscDumpEpSetFromVgroupInfo(&pTableMetaInfo->pTableMeta->corVgroupInfo, &pSql->epSet);
 
-  pAlterDbMsg = (SAlterDbMsg *)pMsg;
-  strcpy(pAlterDbMsg->db, pMeterMetaInfo->name);
+  return TSDB_CODE_SUCCESS;
+}
 
-  pMsg += sizeof(SAlterDbMsg);
+int tscAlterDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->payloadLen = sizeof(SCMAlterDbMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_ALTER_DB;
 
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_ALTER_DB;
+  SCMAlterDbMsg *pAlterDbMsg = (SCMAlterDbMsg*)pCmd->payload;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  tstrncpy(pAlterDbMsg->db, pTableMetaInfo->name, sizeof(pAlterDbMsg->db));
 
   return TSDB_CODE_SUCCESS;
 }
 
 int tscBuildRetrieveFromMgmtMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  char *pMsg, *pStart;
-  int   msgLen = 0;
-
   SSqlCmd *pCmd = &pSql->cmd;
-  STscObj *pObj = pSql->pTscObj;
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_RETRIEVE;
+  pCmd->payloadLen = sizeof(SRetrieveTableMsg);
 
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  size_t          nameLen = strlen(pMeterMetaInfo->name);
-
-  if (nameLen > 0) {
-    strcpy(pMgmt->db, pMeterMetaInfo->name);
-  } else {
-    strcpy(pMgmt->db, pObj->db);
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  pMsg += sizeof(SMgmtHead);
-
-  *((uint64_t *)pMsg) = pSql->res.qhandle;
-  pMsg += sizeof(pSql->res.qhandle);
-
-  *((uint16_t *)pMsg) = htons(pQueryInfo->type);
-  pMsg += sizeof(pQueryInfo->type);
-
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_RETRIEVE;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  SRetrieveTableMsg *pRetrieveMsg = (SRetrieveTableMsg*)pCmd->payload;
+  pRetrieveMsg->qhandle = htobe64(pSql->res.qhandle);
+  pRetrieveMsg->free = htons(pQueryInfo->type);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -2489,17 +1380,9 @@ static int tscSetResultPointer(SQueryInfo *pQueryInfo, SSqlRes *pRes) {
     return pRes->code;
   }
 
-  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-    int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, i);
-
-    pRes->bytes[i] = pField->bytes;
-//    if (pQueryInfo->order.order == TSQL_SO_DESC) {
-//      pRes->bytes[i] = -pRes->bytes[i];
-//      pRes->tsrow[i] = ((pRes->data + offset * pRes->numOfRows) + (pRes->numOfRows - 1) * pField->bytes);
-//    } else {
-      pRes->tsrow[i] = (pRes->data + offset * pRes->numOfRows);
-//    }
+  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    int16_t offset = tscFieldInfoGetOffset(pQueryInfo, i);
+    pRes->tsrow[i] = ((char*) pRes->data + offset * pRes->numOfRows);
   }
 
   return 0;
@@ -2518,7 +1401,6 @@ static int tscLocalResultCommonBuilder(SSqlObj *pSql, int32_t numOfRes) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   pRes->code = TSDB_CODE_SUCCESS;
-
   if (pRes->rspType == 0) {
     pRes->numOfRows = numOfRes;
     pRes->row = 0;
@@ -2543,48 +1425,45 @@ static int tscLocalResultCommonBuilder(SSqlObj *pSql, int32_t numOfRes) {
 
 int tscProcessDescribeTableRsp(SSqlObj *pSql) {
   SSqlCmd *       pCmd = &pSql->cmd;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
-
-  int32_t numOfRes = pMeterMetaInfo->pMeterMeta->numOfColumns + pMeterMetaInfo->pMeterMeta->numOfTags;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
 
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
+  int32_t numOfRes = tinfo.numOfColumns + tinfo.numOfTags;
   return tscLocalResultCommonBuilder(pSql, numOfRes);
 }
 
-int tscProcessTagRetrieveRsp(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  int32_t numOfRes = 0;
-  if (tscSqlExprGet(pQueryInfo, 0)->functionId == TSDB_FUNC_TAGPRJ) {
-    numOfRes = pMeterMetaInfo->pMetricMeta->numOfMeters;
-  } else {
-    numOfRes = 1;  // for count function, there is only one output.
-  }
+int tscProcessLocalRetrieveRsp(SSqlObj *pSql) {
+  int32_t numOfRes = 1;
+  pSql->res.completed = true;
   return tscLocalResultCommonBuilder(pSql, numOfRes);
 }
 
-int tscProcessRetrieveMetricRsp(SSqlObj *pSql) {
+int tscProcessRetrieveLocalMergeRsp(SSqlObj *pSql) {
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  pRes->code = tscDoLocalreduce(pSql);
+  int32_t code = pRes->code;
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    tscQueueAsyncRes(pSql);
+    return code;
+  }
+
+  pRes->code = tscDoLocalMerge(pSql);
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   if (pRes->code == TSDB_CODE_SUCCESS && pRes->numOfRows > 0) {
-    tscSetResultPointer(pQueryInfo, pRes);
+    tscCreateResPointerInfo(pRes, pQueryInfo);
   }
 
   pRes->row = 0;
+  pRes->completed = (pRes->numOfRows == 0);
 
-  uint8_t code = pRes->code;
-  if (pSql->fp) {  // async retrieve metric data
-    if (pRes->code == TSDB_CODE_SUCCESS) {
-      (*pSql->fp)(pSql->param, pSql, pRes->numOfRows);
-    } else {
-      tscQueueAsyncRes(pSql);
-    }
+  code = pRes->code;
+  if (pRes->code == TSDB_CODE_SUCCESS) {
+    (*pSql->fp)(pSql->param, pSql, pRes->numOfRows);
+  } else {
+    tscQueueAsyncRes(pSql);
   }
 
   return code;
@@ -2593,658 +1472,403 @@ int tscProcessRetrieveMetricRsp(SSqlObj *pSql) {
 int tscProcessEmptyResultRsp(SSqlObj *pSql) { return tscLocalResultCommonBuilder(pSql, 0); }
 
 int tscBuildConnectMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SConnectMsg *pConnect;
-  char *       pMsg, *pStart;
-
-  SSqlCmd *pCmd = &pSql->cmd;
   STscObj *pObj = pSql->pTscObj;
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
+  SSqlCmd *pCmd = &pSql->cmd;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_CONNECT;
+  pCmd->payloadLen = sizeof(SCMConnectMsg);
+
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) {
+    tscError("%p failed to malloc for query msg", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  pConnect = (SConnectMsg *)pMsg;
+  SCMConnectMsg *pConnect = (SCMConnectMsg*)pCmd->payload;
 
   char *db;  // ugly code to move the space
   db = strstr(pObj->db, TS_PATH_DELIMITER);
   db = (db == NULL) ? pObj->db : db + 1;
-  strcpy(pConnect->db, db);
-
-  strcpy(pConnect->clientVersion, version);
-
-  pMsg += sizeof(SConnectMsg);
-
-  pCmd->payloadLen = pMsg - pStart;
-  pCmd->msgType = TSDB_MSG_TYPE_CONNECT;
+  tstrncpy(pConnect->db, db, sizeof(pConnect->db));
+  tstrncpy(pConnect->clientVersion, version, sizeof(pConnect->clientVersion));
+  tstrncpy(pConnect->msgVersion, "", sizeof(pConnect->msgVersion));
 
   return TSDB_CODE_SUCCESS;
 }
 
-int tscBuildMeterMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SMeterInfoMsg *pInfoMsg;
-  char *         pMsg, *pStart;
-  int            msgLen = 0;
-
-  char *tmpData = 0;
-  if (pSql->cmd.allocSize > 0) {
-    tmpData = calloc(1, pSql->cmd.allocSize);
-    if (NULL == tmpData) {
-      return TSDB_CODE_CLI_OUT_OF_MEMORY;
-    }
-
-    // STagData is in binary format, strncpy is not available
-    memcpy(tmpData, pSql->cmd.payload, pSql->cmd.allocSize);
-  }
-
+int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *   pCmd = &pSql->cmd;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
+  SCMTableInfoMsg* pInfoMsg = (SCMTableInfoMsg *)pCmd->payload;
+  strcpy(pInfoMsg->tableId, pTableMetaInfo->name);
+  pInfoMsg->createFlag = htons(pSql->cmd.autoCreated ? 1 : 0);
 
-  pMsg += sizeof(SMgmtHead);
+  char* pMsg = (char*)pInfoMsg + sizeof(SCMTableInfoMsg);
 
-  pInfoMsg = (SMeterInfoMsg *)pMsg;
-  strcpy(pInfoMsg->meterId, pMeterMetaInfo->name);
-  pInfoMsg->createFlag = htons(pSql->cmd.createOnDemand ? 1 : 0);
-  pMsg += sizeof(SMeterInfoMsg);
-
-  if (pSql->cmd.createOnDemand) {
-    memcpy(pInfoMsg->tags, tmpData, sizeof(STagData));
-    pMsg += sizeof(STagData);
+  size_t len = htonl(pCmd->tagData.dataLen);
+  if (pSql->cmd.autoCreated) {
+    if (len > 0) {
+      len += sizeof(pCmd->tagData.name) + sizeof(pCmd->tagData.dataLen);
+      memcpy(pInfoMsg->tags, &pCmd->tagData, len);
+      pMsg += len;
+    }
   }
 
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_METERINFO;
-
-  tfree(tmpData);
+  pCmd->payloadLen = (int32_t)(pMsg - (char*)pInfoMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_TABLE_META;
 
-  assert(msgLen + minMsgSize() <= pCmd->allocSize);
   return TSDB_CODE_SUCCESS;
 }
 
 /**
- *  multi meter meta req pkg format:
- *  | SMgmtHead | SMultiMeterInfoMsg | meterId0 | meterId1 | meterId2 | ......
+ *  multi table meta req pkg format:
+ *  | SMgmtHead | SCMMultiTableInfoMsg | tableId0 | tableId1 | tableId2 | ......
  *      no used         4B
  **/
 int tscBuildMultiMeterMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+#if 0
   SSqlCmd *pCmd = &pSql->cmd;
 
   // copy payload content to temp buff
   char *tmpData = 0;
   if (pCmd->payloadLen > 0) {
-    tmpData = calloc(1, pCmd->payloadLen + 1);
-    if (NULL == tmpData) return -1;
+    if ((tmpData = calloc(1, pCmd->payloadLen + 1)) == NULL) return -1;
     memcpy(tmpData, pCmd->payload, pCmd->payloadLen);
   }
 
   // fill head info
   SMgmtHead *pMgmt = (SMgmtHead *)(pCmd->payload + tsRpcHeadSize);
-  memset(pMgmt->db, 0, TSDB_METER_ID_LEN);  // server don't need the db
+  memset(pMgmt->db, 0, TSDB_TABLE_FNAME_LEN);  // server don't need the db
 
-  SMultiMeterInfoMsg *pInfoMsg = (SMultiMeterInfoMsg *)(pCmd->payload + tsRpcHeadSize + sizeof(SMgmtHead));
-  pInfoMsg->numOfMeters = htonl((int32_t)pCmd->count);
+  SCMMultiTableInfoMsg *pInfoMsg = (SCMMultiTableInfoMsg *)(pCmd->payload + tsRpcHeadSize + sizeof(SMgmtHead));
+  pInfoMsg->numOfTables = htonl((int32_t)pCmd->count);
 
   if (pCmd->payloadLen > 0) {
-    memcpy(pInfoMsg->meterId, tmpData, pCmd->payloadLen);
+    memcpy(pInfoMsg->tableIds, tmpData, pCmd->payloadLen);
   }
 
-  tfree(tmpData);
+  taosTFree(tmpData);
 
-  pCmd->payloadLen += sizeof(SMgmtHead) + sizeof(SMultiMeterInfoMsg);
-  pCmd->msgType = TSDB_MSG_TYPE_MULTI_METERINFO;
+  pCmd->payloadLen += sizeof(SMgmtHead) + sizeof(SCMMultiTableInfoMsg);
+  pCmd->msgType = TSDB_MSG_TYPE_CM_TABLES_META;
 
   assert(pCmd->payloadLen + minMsgSize() <= pCmd->allocSize);
 
-  tscTrace("%p build load multi-metermeta msg completed, numOfMeters:%d, msg size:%d", pSql, pCmd->count,
+  tscDebug("%p build load multi-metermeta msg completed, numOfTables:%d, msg size:%d", pSql, pCmd->count,
            pCmd->payloadLen);
 
   return pCmd->payloadLen;
-}
-
-static int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
-  const int32_t defaultSize =
-      minMsgSize() + sizeof(SMetricMetaMsg) + sizeof(SMgmtHead) + sizeof(int16_t) * TSDB_MAX_TAGS;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-
-  int32_t n = 0;
-  for (int32_t i = 0; i < pQueryInfo->tagCond.numOfTagCond; ++i) {
-    n += strlen(pQueryInfo->tagCond.cond[i].cond);
-  }
-
-  int32_t tagLen = n * TSDB_NCHAR_SIZE;
-  if (pQueryInfo->tagCond.tbnameCond.cond != NULL) {
-    tagLen += strlen(pQueryInfo->tagCond.tbnameCond.cond) * TSDB_NCHAR_SIZE;
-  }
-
-  int32_t joinCondLen = (TSDB_METER_ID_LEN + sizeof(int16_t)) * 2;
-  int32_t elemSize = sizeof(SMetricMetaElemMsg) * pQueryInfo->numOfTables;
-
-  int32_t len = tagLen + joinCondLen + elemSize + defaultSize;
-
-  return MAX(len, TSDB_DEFAULT_PAYLOAD_SIZE);
-}
-
-int tscBuildMetricMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SMetricMetaMsg *pMetaMsg;
-  char *          pMsg, *pStart;
-  int             msgLen = 0;
-  int             tableIndex = 0;
-
-  SSqlCmd *   pCmd = &pSql->cmd;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-
-  STagCond *pTagCond = &pQueryInfo->tagCond;
-
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
-
-  int32_t size = tscEstimateMetricMetaMsgSize(pCmd);
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
-    tscError("%p failed to malloc for metric meter msg", pSql);
-    return -1;
-  }
-
-  pStart = pCmd->payload + tsRpcHeadSize;
-  pMsg = pStart;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  tscGetDBInfoFromMeterId(pMeterMetaInfo->name, pMgmt->db);
-
-  pMsg += sizeof(SMgmtHead);
-
-  pMetaMsg = (SMetricMetaMsg *)pMsg;
-  pMetaMsg->numOfMeters = htonl(pQueryInfo->numOfTables);
-
-  pMsg += sizeof(SMetricMetaMsg);
-
-  int32_t offset = pMsg - (char *)pMetaMsg;
-  pMetaMsg->join = htonl(offset);
-
-  // todo refactor
-  pMetaMsg->joinCondLen = htonl((TSDB_METER_ID_LEN + sizeof(int16_t)) * 2);
-
-  memcpy(pMsg, pTagCond->joinInfo.left.meterId, TSDB_METER_ID_LEN);
-  pMsg += TSDB_METER_ID_LEN;
-
-  *(int16_t *)pMsg = pTagCond->joinInfo.left.tagCol;
-  pMsg += sizeof(int16_t);
-
-  memcpy(pMsg, pTagCond->joinInfo.right.meterId, TSDB_METER_ID_LEN);
-  pMsg += TSDB_METER_ID_LEN;
-
-  *(int16_t *)pMsg = pTagCond->joinInfo.right.tagCol;
-  pMsg += sizeof(int16_t);
-
-  for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, i);
-    uint64_t uid = pMeterMetaInfo->pMeterMeta->uid;
-
-    offset = pMsg - (char *)pMetaMsg;
-    pMetaMsg->metaElem[i] = htonl(offset);
-
-    SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)pMsg;
-    pMsg += sizeof(SMetricMetaElemMsg);
-
-    // convert to unicode before sending to mnode for metric query
-    int32_t condLen = 0;
-    if (pTagCond->numOfTagCond > 0) {
-      SCond *pCond = tsGetMetricQueryCondPos(pTagCond, uid);
-      if (pCond != NULL) {
-        condLen = strlen(pCond->cond) + 1;
-
-        bool ret = taosMbsToUcs4(pCond->cond, condLen, pMsg, condLen * TSDB_NCHAR_SIZE);
-        if (!ret) {
-          tscError("%p mbs to ucs4 failed:%s", pSql, tsGetMetricQueryCondPos(pTagCond, uid));
-          return 0;
-        }
-      }
-    }
-
-    pElem->condLen = htonl(condLen);
-
-    offset = pMsg - (char *)pMetaMsg;
-    pElem->cond = htonl(offset);
-    pMsg += condLen * TSDB_NCHAR_SIZE;
-
-    pElem->rel = htons(pTagCond->relType);
-    if (pTagCond->tbnameCond.uid == uid) {
-      offset = pMsg - (char *)pMetaMsg;
-
-      pElem->tableCond = htonl(offset);
-
-      uint32_t len = strlen(pTagCond->tbnameCond.cond);
-      pElem->tableCondLen = htonl(len);
-
-      memcpy(pMsg, pTagCond->tbnameCond.cond, len);
-      pMsg += len;
-    }
-
-    SSqlGroupbyExpr *pGroupby = &pQueryInfo->groupbyExpr;
-
-    if (pGroupby->tableIndex != i && pGroupby->numOfGroupCols > 0) {
-      pElem->orderType = 0;
-      pElem->orderIndex = 0;
-      pElem->numOfGroupCols = 0;
-    } else {
-      pElem->numOfGroupCols = htons(pGroupby->numOfGroupCols);
-      for (int32_t j = 0; j < pMeterMetaInfo->numOfTags; ++j) {
-        pElem->tagCols[j] = htons(pMeterMetaInfo->tagColumnIndex[j]);
-      }
-
-      if (pGroupby->numOfGroupCols != 0) {
-        pElem->orderIndex = htons(pGroupby->orderIndex);
-        pElem->orderType = htons(pGroupby->orderType);
-        offset = pMsg - (char *)pMetaMsg;
-
-        pElem->groupbyTagColumnList = htonl(offset);
-        for (int32_t j = 0; j < pQueryInfo->groupbyExpr.numOfGroupCols; ++j) {
-          SColIndexEx *pCol = &pQueryInfo->groupbyExpr.columnInfo[j];
-          SColIndexEx *pDestCol = (SColIndexEx *)pMsg;
-
-          pDestCol->colIdxInBuf = 0;
-          pDestCol->colIdx = htons(pCol->colIdx);
-          pDestCol->colId = htons(pDestCol->colId);
-          pDestCol->flag = htons(pDestCol->flag);
-
-          pMsg += sizeof(SColIndexEx);
-        }
-      }
-    }
-
-    strcpy(pElem->meterId, pMeterMetaInfo->name);
-    pElem->numOfTags = htons(pMeterMetaInfo->numOfTags);
-
-    int16_t len = pMsg - (char *)pElem;
-    pElem->elemLen = htons(len);  // redundant data for integrate check
+#endif
+  return 0;  
+}
+
+//static UNUSED_FUNC int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
+////  const int32_t defaultSize =
+////      minMsgSize() + sizeof(SSuperTableMetaMsg) + sizeof(SMgmtHead) + sizeof(int16_t) * TSDB_MAX_TAGS;
+////  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+////
+////  int32_t n = 0;
+////  size_t size = taosArrayGetSize(pQueryInfo->tagCond.pCond);
+////  for (int32_t i = 0; i < size; ++i) {
+////    assert(0);
+//////    n += strlen(pQueryInfo->tagCond.cond[i].cond);
+////  }
+////
+////  int32_t tagLen = n * TSDB_NCHAR_SIZE;
+////  if (pQueryInfo->tagCond.tbnameCond.cond != NULL) {
+////    tagLen += strlen(pQueryInfo->tagCond.tbnameCond.cond) * TSDB_NCHAR_SIZE;
+////  }
+////
+////  int32_t joinCondLen = (TSDB_TABLE_FNAME_LEN + sizeof(int16_t)) * 2;
+////  int32_t elemSize = sizeof(SSuperTableMetaElemMsg) * pQueryInfo->numOfTables;
+////
+////  int32_t colSize = pQueryInfo->groupbyExpr.numOfGroupCols*sizeof(SColIndex);
+////
+////  int32_t len = tagLen + joinCondLen + elemSize + colSize + defaultSize;
+////
+////  return MAX(len, TSDB_DEFAULT_PAYLOAD_SIZE);
+//}
+
+int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  
+  char* pMsg = pCmd->payload;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  
+  SCMSTableVgroupMsg *pStableVgroupMsg = (SCMSTableVgroupMsg *) pMsg;
+  pStableVgroupMsg->numOfTables = htonl(pQueryInfo->numOfTables);
+  pMsg += sizeof(SCMSTableVgroupMsg);
+  
+  for(int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+    STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, i);
+    size_t size = sizeof(pTableMetaInfo->name);
+    tstrncpy(pMsg, pTableMetaInfo->name, size);
+    pMsg += size;
   }
 
-  msgLen = pMsg - pStart;
-  pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_METRIC_META;
-  assert(msgLen + minMsgSize() <= size);
-  
+  pCmd->msgType = TSDB_MSG_TYPE_CM_STABLE_VGROUP;
+  pCmd->payloadLen = (int32_t)(pMsg - pCmd->payload);
+
   return TSDB_CODE_SUCCESS;
 }
 
-int tscEstimateHeartBeatMsgLength(SSqlObj *pSql) {
-  int      size = 0;
+int tscBuildHeartBeatMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
+  SSqlCmd *pCmd = &pSql->cmd;
   STscObj *pObj = pSql->pTscObj;
 
-  size += tsRpcHeadSize + sizeof(SMgmtHead);
-  size += sizeof(SQList);
+  pthread_mutex_lock(&pObj->mutex);
 
+  int32_t numOfQueries = 2;
   SSqlObj *tpSql = pObj->sqlList;
   while (tpSql) {
-    size += sizeof(SQDesc);
     tpSql = tpSql->next;
+    numOfQueries++;
   }
 
-  size += sizeof(SSList);
+  int32_t numOfStreams = 2;
   SSqlStream *pStream = pObj->streamList;
   while (pStream) {
-    size += sizeof(SSDesc);
     pStream = pStream->next;
+    numOfStreams++;
   }
 
-  return size + TSDB_EXTRA_PAYLOAD_SIZE;
-}
-
-int tscBuildHeartBeatMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  char *pMsg, *pStart;
-  int   msgLen = 0;
-  int   size = 0;
-
-  SSqlCmd *pCmd = &pSql->cmd;
-  STscObj *pObj = pSql->pTscObj;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  size = tscEstimateHeartBeatMsgLength(pSql);
+  int size = numOfQueries * sizeof(SQueryDesc) + numOfStreams * sizeof(SStreamDesc) + sizeof(SCMHeartBeatMsg) + 100;
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
+    pthread_mutex_unlock(&pObj->mutex);
     tscError("%p failed to malloc for heartbeat msg", pSql);
-    return -1;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  pMsg = pCmd->payload + tsRpcHeadSize;
-  pStart = pMsg;
-
-  SMgmtHead *pMgmt = (SMgmtHead *)pMsg;
-  strcpy(pMgmt->db, pObj->db);
-  pMsg += sizeof(SMgmtHead);
+  SCMHeartBeatMsg *pHeartbeat = (SCMHeartBeatMsg *)pCmd->payload;
+  pHeartbeat->numOfQueries = numOfQueries;
+  pHeartbeat->numOfStreams = numOfStreams;
+  int msgLen = tscBuildQueryStreamDesc(pHeartbeat, pObj);
 
-  pMsg = tscBuildQueryStreamDesc(pMsg, pObj);
   pthread_mutex_unlock(&pObj->mutex);
 
-  msgLen = pMsg - pStart;
   pCmd->payloadLen = msgLen;
-  pCmd->msgType = TSDB_MSG_TYPE_HEARTBEAT;
+  pCmd->msgType = TSDB_MSG_TYPE_CM_HEARTBEAT;
 
-  assert(msgLen + minMsgSize() <= size);
-  return msgLen;
+  return TSDB_CODE_SUCCESS;
 }
 
-int tscProcessMeterMetaRsp(SSqlObj *pSql) {
-  SMeterMeta *pMeta;
-  SSchema *   pSchema;
-  uint8_t     ieType;
-
-  char *rsp = pSql->res.pRsp;
-
-  ieType = *rsp;
-  if (ieType != TSDB_IE_TYPE_META) {
-    tscError("invalid ie type:%d", ieType);
-    return TSDB_CODE_INVALID_IE;
-  }
-
-  rsp++;
-  pMeta = (SMeterMeta *)rsp;
+int tscProcessTableMetaRsp(SSqlObj *pSql) {
+  STableMetaMsg *pMetaMsg = (STableMetaMsg *)pSql->res.pRsp;
 
-  pMeta->sid = htonl(pMeta->sid);
-  pMeta->sversion = htons(pMeta->sversion);
-  pMeta->vgid = htonl(pMeta->vgid);
-  pMeta->uid = htobe64(pMeta->uid);
+  pMetaMsg->sid = htonl(pMetaMsg->sid);
+  pMetaMsg->sversion = htons(pMetaMsg->sversion);
+  pMetaMsg->tversion = htons(pMetaMsg->tversion);
+  pMetaMsg->vgroup.vgId = htonl(pMetaMsg->vgroup.vgId);
+  
+  pMetaMsg->uid = htobe64(pMetaMsg->uid);
+  pMetaMsg->contLen = htons(pMetaMsg->contLen);
+  pMetaMsg->numOfColumns = htons(pMetaMsg->numOfColumns);
 
-  if (pMeta->sid < 0 || pMeta->vgid < 0) {
-    tscError("invalid meter vgid:%d, sid%d", pMeta->vgid, pMeta->sid);
-    return TSDB_CODE_INVALID_VALUE;
+  if ((pMetaMsg->tableType != TSDB_SUPER_TABLE) &&
+      (pMetaMsg->sid <= 0 || pMetaMsg->vgroup.vgId < 2 || pMetaMsg->vgroup.numOfEps <= 0)) {
+    tscError("invalid value in table numOfEps:%d, vgId:%d tid:%d, name:%s", pMetaMsg->vgroup.numOfEps, pMetaMsg->vgroup.vgId,
+             pMetaMsg->sid, pMetaMsg->tableId);
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
-  pMeta->numOfColumns = htons(pMeta->numOfColumns);
-
-  if (pMeta->numOfTags > TSDB_MAX_TAGS || pMeta->numOfTags < 0) {
-    tscError("invalid numOfTags:%d", pMeta->numOfTags);
-    return TSDB_CODE_INVALID_VALUE;
+  if (pMetaMsg->numOfTags > TSDB_MAX_TAGS) {
+    tscError("invalid numOfTags:%d", pMetaMsg->numOfTags);
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
-  if (pMeta->numOfColumns > TSDB_MAX_COLUMNS || pMeta->numOfColumns <= 0) {
-    tscError("invalid numOfColumns:%d", pMeta->numOfColumns);
-    return TSDB_CODE_INVALID_VALUE;
+  if (pMetaMsg->numOfColumns > TSDB_MAX_COLUMNS || pMetaMsg->numOfColumns <= 0) {
+    tscError("invalid numOfColumns:%d", pMetaMsg->numOfColumns);
+    return TSDB_CODE_TSC_INVALID_VALUE;
   }
 
-  for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-    pMeta->vpeerDesc[i].vnode = htonl(pMeta->vpeerDesc[i].vnode);
+  for (int i = 0; i < pMetaMsg->vgroup.numOfEps; ++i) {
+    pMetaMsg->vgroup.epAddr[i].port = htons(pMetaMsg->vgroup.epAddr[i].port);
   }
 
-  pMeta->rowSize = 0;
-  rsp += sizeof(SMeterMeta);
-  pSchema = (SSchema *)rsp;
+  SSchema* pSchema = pMetaMsg->schema;
 
-  int32_t numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
+  int32_t numOfTotalCols = pMetaMsg->numOfColumns + pMetaMsg->numOfTags;
   for (int i = 0; i < numOfTotalCols; ++i) {
     pSchema->bytes = htons(pSchema->bytes);
     pSchema->colId = htons(pSchema->colId);
 
-    // ignore the tags length
-    if (i < pMeta->numOfColumns) {
-      pMeta->rowSize += pSchema->bytes;
+    if (pSchema->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      assert(i == 0);
     }
-    pSchema++;
-  }
-
-  rsp += numOfTotalCols * sizeof(SSchema);
 
-  int32_t  tagLen = 0;
-  SSchema *pTagsSchema = tsGetTagSchema(pMeta);
-
-  if (pMeta->meterType == TSDB_METER_MTABLE) {
-    for (int32_t i = 0; i < pMeta->numOfTags; ++i) {
-      tagLen += pTagsSchema[i].bytes;
-    }
+    assert(pSchema->type >= TSDB_DATA_TYPE_BOOL && pSchema->type <= TSDB_DATA_TYPE_NCHAR);
+    pSchema++;
   }
 
-  rsp += tagLen;
-  int32_t size = (int32_t)(rsp - (char *)pMeta);
-
-  // pMeta->index = rand() % TSDB_VNODES_SUPPORT;
-  pMeta->index = 0;
-
+  size_t size = 0;
+  STableMeta* pTableMeta = tscCreateTableMetaFromMsg(pMetaMsg, &size);
+  
   // todo add one more function: taosAddDataIfNotExists();
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
-  assert(pMeterMetaInfo->pMeterMeta == NULL);
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
+  assert(pTableMetaInfo->pTableMeta == NULL);
 
-  pMeterMetaInfo->pMeterMeta = (SMeterMeta *)taosAddDataIntoCache(tscCacheHandle, pMeterMetaInfo->name, (char *)pMeta,
-                                                                  size, tsMeterMetaKeepTimer);
+  pTableMetaInfo->pTableMeta = (STableMeta *) taosCachePut(tscMetaCache, pTableMetaInfo->name,
+      strlen(pTableMetaInfo->name), pTableMeta, size, tsTableMetaKeepTimer * 1000);
+  
   // todo handle out of memory case
-  if (pMeterMetaInfo->pMeterMeta == NULL) return 0;
+  if (pTableMetaInfo->pTableMeta == NULL) {
+    free(pTableMeta);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
 
-  return TSDB_CODE_OTHERS;
+  tscDebug("%p recv table meta, uid:%"PRId64 ", tid:%d, name:%s", pSql, pTableMeta->id.uid, pTableMeta->id.tid, pTableMetaInfo->name);
+  free(pTableMeta);
+  
+  return TSDB_CODE_SUCCESS;
 }
 
 /**
- *  multi meter meta rsp pkg format:
- *  | STaosRsp | ieType | SMultiMeterInfoMsg | SMeterMeta0 | SSchema0 | SMeterMeta1 | SSchema1 | SMeterMeta2 | SSchema2
+ *  multi table meta rsp pkg format:
+ *  | STaosRsp | ieType | SCMMultiTableInfoMsg | SMeterMeta0 | SSchema0 | SMeterMeta1 | SSchema1 | SMeterMeta2 | SSchema2
  *  |...... 1B        1B            4B
  **/
 int tscProcessMultiMeterMetaRsp(SSqlObj *pSql) {
-  SSchema *pSchema;
-  uint8_t  ieType;
-  int32_t  totalNum;
-  int32_t  i;
-
+#if 0
   char *rsp = pSql->res.pRsp;
 
   ieType = *rsp;
   if (ieType != TSDB_IE_TYPE_META) {
     tscError("invalid ie type:%d", ieType);
-    pSql->res.code = TSDB_CODE_INVALID_IE;
+    pSql->res.code = TSDB_CODE_TSC_INVALID_IE;
     pSql->res.numOfTotal = 0;
-    return TSDB_CODE_OTHERS;
+    return TSDB_CODE_TSC_APP_ERROR;
   }
 
   rsp++;
 
-  SMultiMeterInfoMsg *pInfo = (SMultiMeterInfoMsg *)rsp;
-  totalNum = htonl(pInfo->numOfMeters);
-  rsp += sizeof(SMultiMeterInfoMsg);
+  SCMMultiTableInfoMsg *pInfo = (SCMMultiTableInfoMsg *)rsp;
+  totalNum = htonl(pInfo->numOfTables);
+  rsp += sizeof(SCMMultiTableInfoMsg);
 
   for (i = 0; i < totalNum; i++) {
-    SMultiMeterMeta *pMultiMeta = (SMultiMeterMeta *)rsp;
-    SMeterMeta *     pMeta = &pMultiMeta->meta;
+    SMultiTableMeta *pMultiMeta = (SMultiTableMeta *)rsp;
+    STableMeta *     pMeta = pMultiMeta->metas;
 
     pMeta->sid = htonl(pMeta->sid);
     pMeta->sversion = htons(pMeta->sversion);
-    pMeta->vgid = htonl(pMeta->vgid);
+    pMeta->vgId = htonl(pMeta->vgId);
     pMeta->uid = htobe64(pMeta->uid);
 
-    if (pMeta->sid <= 0 || pMeta->vgid < 0) {
-      tscError("invalid meter vgid:%d, sid%d", pMeta->vgid, pMeta->sid);
-      pSql->res.code = TSDB_CODE_INVALID_VALUE;
-      pSql->res.numOfTotal = i;
-      return TSDB_CODE_OTHERS;
-    }
-
-    pMeta->numOfColumns = htons(pMeta->numOfColumns);
-
-    if (pMeta->numOfTags > TSDB_MAX_TAGS || pMeta->numOfTags < 0) {
-      tscError("invalid tag value count:%d", pMeta->numOfTags);
-      pSql->res.code = TSDB_CODE_INVALID_VALUE;
-      pSql->res.numOfTotal = i;
-      return TSDB_CODE_OTHERS;
-    }
-
-    if (pMeta->numOfTags > TSDB_MAX_TAGS || pMeta->numOfTags < 0) {
-      tscError("invalid numOfTags:%d", pMeta->numOfTags);
-      pSql->res.code = TSDB_CODE_INVALID_VALUE;
-      pSql->res.numOfTotal = i;
-      return TSDB_CODE_OTHERS;
-    }
-
-    if (pMeta->numOfColumns > TSDB_MAX_COLUMNS || pMeta->numOfColumns < 0) {
-      tscError("invalid numOfColumns:%d", pMeta->numOfColumns);
-      pSql->res.code = TSDB_CODE_INVALID_VALUE;
+    if (pMeta->sid <= 0 || pMeta->vgId < 0) {
+      tscError("invalid meter vgId:%d, sid%d", pMeta->vgId, pMeta->sid);
+      pSql->res.code = TSDB_CODE_TSC_INVALID_VALUE;
       pSql->res.numOfTotal = i;
-      return TSDB_CODE_OTHERS;
-    }
-
-    for (int j = 0; j < TSDB_VNODES_SUPPORT; ++j) {
-      pMeta->vpeerDesc[j].vnode = htonl(pMeta->vpeerDesc[j].vnode);
-    }
-
-    pMeta->rowSize = 0;
-    rsp += sizeof(SMultiMeterMeta);
-    pSchema = (SSchema *)rsp;
-
-    int32_t numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
-    for (int j = 0; j < numOfTotalCols; ++j) {
-      pSchema->bytes = htons(pSchema->bytes);
-      pSchema->colId = htons(pSchema->colId);
-
-      // ignore the tags length
-      if (j < pMeta->numOfColumns) {
-        pMeta->rowSize += pSchema->bytes;
-      }
-      pSchema++;
-    }
-
-    rsp += numOfTotalCols * sizeof(SSchema);
-
-    int32_t  tagLen = 0;
-    SSchema *pTagsSchema = tsGetTagSchema(pMeta);
-
-    if (pMeta->meterType == TSDB_METER_MTABLE) {
-      for (int32_t j = 0; j < pMeta->numOfTags; ++j) {
-        tagLen += pTagsSchema[j].bytes;
-      }
-    }
-
-    rsp += tagLen;
-    int32_t size = (int32_t)(rsp - ((char *)pMeta));  // Consistent with SMeterMeta in cache
-
-    pMeta->index = 0;
-    (void)taosAddDataIntoCache(tscCacheHandle, pMultiMeta->meterId, (char *)pMeta, size, tsMeterMetaKeepTimer);
+      return TSDB_CODE_TSC_APP_ERROR;
+    }
+
+    //    pMeta->numOfColumns = htons(pMeta->numOfColumns);
+    //
+    //    if (pMeta->numOfTags > TSDB_MAX_TAGS || pMeta->numOfTags < 0) {
+    //      tscError("invalid tag value count:%d", pMeta->numOfTags);
+    //      pSql->res.code = TSDB_CODE_TSC_INVALID_VALUE;
+    //      pSql->res.numOfTotal = i;
+    //      return TSDB_CODE_TSC_APP_ERROR;
+    //    }
+    //
+    //    if (pMeta->numOfTags > TSDB_MAX_TAGS || pMeta->numOfTags < 0) {
+    //      tscError("invalid numOfTags:%d", pMeta->numOfTags);
+    //      pSql->res.code = TSDB_CODE_TSC_INVALID_VALUE;
+    //      pSql->res.numOfTotal = i;
+    //      return TSDB_CODE_TSC_APP_ERROR;
+    //    }
+    //
+    //    if (pMeta->numOfColumns > TSDB_MAX_COLUMNS || pMeta->numOfColumns < 0) {
+    //      tscError("invalid numOfColumns:%d", pMeta->numOfColumns);
+    //      pSql->res.code = TSDB_CODE_TSC_INVALID_VALUE;
+    //      pSql->res.numOfTotal = i;
+    //      return TSDB_CODE_TSC_APP_ERROR;
+    //    }
+    //
+    //    for (int j = 0; j < TSDB_REPLICA_MAX_NUM; ++j) {
+    //      pMeta->vpeerDesc[j].vnode = htonl(pMeta->vpeerDesc[j].vnode);
+    //    }
+    //
+    //    pMeta->rowSize = 0;
+    //    rsp += sizeof(SMultiTableMeta);
+    //    pSchema = (SSchema *)rsp;
+    //
+    //    int32_t numOfTotalCols = pMeta->numOfColumns + pMeta->numOfTags;
+    //    for (int j = 0; j < numOfTotalCols; ++j) {
+    //      pSchema->bytes = htons(pSchema->bytes);
+    //      pSchema->colId = htons(pSchema->colId);
+    //
+    //      // ignore the tags length
+    //      if (j < pMeta->numOfColumns) {
+    //        pMeta->rowSize += pSchema->bytes;
+    //      }
+    //      pSchema++;
+    //    }
+    //
+    //    rsp += numOfTotalCols * sizeof(SSchema);
+    //
+    //    int32_t  tagLen = 0;
+    //    SSchema *pTagsSchema = tscGetTableTagSchema(pMeta);
+    //
+    //    if (pMeta->tableType == TSDB_CHILD_TABLE) {
+    //      for (int32_t j = 0; j < pMeta->numOfTags; ++j) {
+    //        tagLen += pTagsSchema[j].bytes;
+    //      }
+    //    }
+    //
+    //    rsp += tagLen;
+    //    int32_t size = (int32_t)(rsp - ((char *)pMeta));  // Consistent with STableMeta in cache
+    //
+    //    pMeta->index = 0;
+    //    (void)taosCachePut(tscMetaCache, pMeta->tableId, (char *)pMeta, size, tsTableMetaKeepTimer);
+    //  }
   }
-
+  
   pSql->res.code = TSDB_CODE_SUCCESS;
   pSql->res.numOfTotal = i;
-  tscTrace("%p load multi-metermeta resp complete num:%d", pSql, pSql->res.numOfTotal);
+  tscDebug("%p load multi-metermeta resp from complete num:%d", pSql, pSql->res.numOfTotal);
+#endif
+  
   return TSDB_CODE_SUCCESS;
 }
 
-int tscProcessMetricMetaRsp(SSqlObj *pSql) {
-  SMetricMeta *pMeta;
-  uint8_t      ieType;
-  void **      metricMetaList = NULL;
-  int32_t *    sizes = NULL;
-
-  char *rsp = pSql->res.pRsp;
-
-  ieType = *rsp;
-  if (ieType != TSDB_IE_TYPE_META) {
-    tscError("invalid ie type:%d", ieType);
-    return TSDB_CODE_INVALID_IE;
-  }
-
-  rsp++;
-
-  int32_t num = htons(*(int16_t *)rsp);
-  rsp += sizeof(int16_t);
-
-  metricMetaList = calloc(1, POINTER_BYTES * num);
-  sizes = calloc(1, sizeof(int32_t) * num);
-
-  // return with error code
-  if (metricMetaList == NULL || sizes == NULL) {
-    tfree(metricMetaList);
-    tfree(sizes);
-    pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-
-    return pSql->res.code;
-  }
-
-  for (int32_t k = 0; k < num; ++k) {
-    pMeta = (SMetricMeta *)rsp;
-
-    size_t size = (size_t)pSql->res.rspLen - 1;
-    rsp = rsp + sizeof(SMetricMeta);
-
-    pMeta->numOfMeters = htonl(pMeta->numOfMeters);
-    pMeta->numOfVnodes = htonl(pMeta->numOfVnodes);
-    pMeta->tagLen = htons(pMeta->tagLen);
-
-    size += pMeta->numOfVnodes * sizeof(SVnodeSidList *) + pMeta->numOfMeters * sizeof(SMeterSidExtInfo *);
-
-    char *pBuf = calloc(1, size);
-    if (pBuf == NULL) {
-      pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-      goto _error_clean;
-    }
-
-    SMetricMeta *pNewMetricMeta = (SMetricMeta *)pBuf;
-    metricMetaList[k] = pNewMetricMeta;
-
-    pNewMetricMeta->numOfMeters = pMeta->numOfMeters;
-    pNewMetricMeta->numOfVnodes = pMeta->numOfVnodes;
-    pNewMetricMeta->tagLen = pMeta->tagLen;
-
-    pBuf = pBuf + sizeof(SMetricMeta) + pNewMetricMeta->numOfVnodes * sizeof(SVnodeSidList *);
-
-    for (int32_t i = 0; i < pMeta->numOfVnodes; ++i) {
-      SVnodeSidList *pSidLists = (SVnodeSidList *)rsp;
-      memcpy(pBuf, pSidLists, sizeof(SVnodeSidList));
-
-      pNewMetricMeta->list[i] = pBuf - (char *)pNewMetricMeta;  // offset value
-      SVnodeSidList *pLists = (SVnodeSidList *)pBuf;
-
-      tscTrace("%p metricmeta:vid:%d,numOfMeters:%d", pSql, i, pLists->numOfSids);
-
-      pBuf += sizeof(SVnodeSidList) + sizeof(SMeterSidExtInfo *) * pSidLists->numOfSids;
-      rsp += sizeof(SVnodeSidList);
-
-      size_t elemSize = sizeof(SMeterSidExtInfo) + pNewMetricMeta->tagLen;
-      for (int32_t j = 0; j < pSidLists->numOfSids; ++j) {
-        pLists->pSidExtInfoList[j] = pBuf - (char *)pLists;
-        memcpy(pBuf, rsp, elemSize);
-
-        ((SMeterSidExtInfo *)pBuf)->uid = htobe64(((SMeterSidExtInfo *)pBuf)->uid);
-        ((SMeterSidExtInfo *)pBuf)->sid = htonl(((SMeterSidExtInfo *)pBuf)->sid);
-
-        rsp += elemSize;
-        pBuf += elemSize;
+int tscProcessSTableVgroupRsp(SSqlObj *pSql) {
+  SSqlRes* pRes = &pSql->res;
+  
+  // NOTE: the order of several table must be preserved.
+  SCMSTableVgroupRspMsg *pStableVgroup = (SCMSTableVgroupRspMsg *)pRes->pRsp;
+  pStableVgroup->numOfTables = htonl(pStableVgroup->numOfTables);
+  char* pMsg = pRes->pRsp + sizeof(SCMSTableVgroupRspMsg);
+  
+  // master sqlObj locates in param
+  SSqlObj* parent = pSql->param;
+  assert(parent != NULL);
+  
+  SSqlCmd* pCmd = &parent->cmd;
+  for(int32_t i = 0; i < pStableVgroup->numOfTables; ++i) {
+    STableMetaInfo *pInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, i);
+    SVgroupsInfo *  pVgroupInfo = (SVgroupsInfo *)pMsg;
+    pVgroupInfo->numOfVgroups = htonl(pVgroupInfo->numOfVgroups);
+
+    size_t size = sizeof(SCMVgroupInfo) * pVgroupInfo->numOfVgroups + sizeof(SVgroupsInfo);
+    pInfo->vgroupList = calloc(1, size);
+    assert(pInfo->vgroupList != NULL);
+
+    memcpy(pInfo->vgroupList, pVgroupInfo, size);
+    for (int32_t j = 0; j < pInfo->vgroupList->numOfVgroups; ++j) {
+      //just init, no need to lock
+      SCMVgroupInfo *pVgroups = &pInfo->vgroupList->vgroups[j];
+      pVgroups->vgId = htonl(pVgroups->vgId);
+      assert(pVgroups->numOfEps >= 1);
+
+      for (int32_t k = 0; k < pVgroups->numOfEps; ++k) {
+        pVgroups->epAddr[k].port = htons(pVgroups->epAddr[k].port);
       }
     }
 
-    sizes[k] = pBuf - (char *)pNewMetricMeta;
-  }
-
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  for (int32_t i = 0; i < num; ++i) {
-    char name[TSDB_MAX_TAGS_LEN + 1] = {0};
-
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-    tscGetMetricMetaCacheKey(pQueryInfo, name, pMeterMetaInfo->pMeterMeta->uid);
-
-#ifdef _DEBUG_VIEW
-    printf("generate the metric key:%s, index:%d\n", name, i);
-#endif
-
-    // release the used metricmeta
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
-
-    pMeterMetaInfo->pMetricMeta = (SMetricMeta *)taosAddDataIntoCache(tscCacheHandle, name, (char *)metricMetaList[i],
-                                                                      sizes[i], tsMetricMetaKeepTimer);
-    tfree(metricMetaList[i]);
-
-    // failed to put into cache
-    if (pMeterMetaInfo->pMetricMeta == NULL) {
-      pSql->res.code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-      goto _error_clean;
-    }
-  }
-
-_error_clean:
-  // free allocated resource
-  for (int32_t i = 0; i < num; ++i) {
-    tfree(metricMetaList[i]);
+    pMsg += size;
   }
-
-  free(sizes);
-  free(metricMetaList);
-
+  
   return pSql->res.code;
 }
 
@@ -3252,29 +1876,30 @@ _error_clean:
  * current process do not use the cache at all
  */
 int tscProcessShowRsp(SSqlObj *pSql) {
-  SMeterMeta * pMeta;
-  SShowRspMsg *pShow;
+  STableMetaMsg * pMetaMsg;
+  SCMShowRsp *pShow;
   SSchema *    pSchema;
   char         key[20];
 
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);  //?
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  pShow = (SShowRspMsg *)pRes->pRsp;
+  pShow = (SCMShowRsp *)pRes->pRsp;
+  pShow->qhandle = htobe64(pShow->qhandle);
   pRes->qhandle = pShow->qhandle;
 
   tscResetForNextRetrieve(pRes);
-  pMeta = &(pShow->meterMeta);
+  pMetaMsg = &(pShow->tableMeta);
 
-  pMeta->numOfColumns = ntohs(pMeta->numOfColumns);
+  pMetaMsg->numOfColumns = ntohs(pMetaMsg->numOfColumns);
 
-  pSchema = (SSchema *)((char *)pMeta + sizeof(SMeterMeta));
-  pMeta->sid = ntohs(pMeta->sid);
-  for (int i = 0; i < pMeta->numOfColumns; ++i) {
+  pSchema = pMetaMsg->schema;
+  pMetaMsg->sid = ntohs(pMetaMsg->sid);
+  for (int i = 0; i < pMetaMsg->numOfColumns; ++i) {
     pSchema->bytes = htons(pSchema->bytes);
     pSchema++;
   }
@@ -3282,49 +1907,102 @@ int tscProcessShowRsp(SSqlObj *pSql) {
   key[0] = pCmd->msgType + 'a';
   strcpy(key + 1, "showlist");
 
-  taosRemoveDataFromCache(tscCacheHandle, (void *)&(pMeterMetaInfo->pMeterMeta), false);
+  if (pTableMetaInfo->pTableMeta != NULL) {
+    taosCacheRelease(tscMetaCache, (void *)&(pTableMetaInfo->pTableMeta), false);
+  }
 
-  int32_t size = pMeta->numOfColumns * sizeof(SSchema) + sizeof(SMeterMeta);
-  pMeterMetaInfo->pMeterMeta =
-      (SMeterMeta *)taosAddDataIntoCache(tscCacheHandle, key, (char *)pMeta, size, tsMeterMetaKeepTimer);
-  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
-  SSchema *pMeterSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
+  size_t size = 0;
+  STableMeta* pTableMeta = tscCreateTableMetaFromMsg(pMetaMsg, &size);
+  
+  pTableMetaInfo->pTableMeta = taosCachePut(tscMetaCache, key, strlen(key), (char *)pTableMeta, size,
+      tsTableMetaKeepTimer * 1000);
+  SSchema *pTableSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
-  tscColumnBaseInfoReserve(&pQueryInfo->colList, pMeta->numOfColumns);
+  if (pQueryInfo->colList == NULL) {
+    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
+  }
+  
+  SFieldInfo* pFieldInfo = &pQueryInfo->fieldsInfo;
+  
   SColumnIndex index = {0};
-
-  for (int16_t i = 0; i < pMeta->numOfColumns; ++i) {
+  pSchema = pMetaMsg->schema;
+  
+  for (int16_t i = 0; i < pMetaMsg->numOfColumns; ++i, ++pSchema) {
     index.columnIndex = i;
-    tscColumnBaseInfoInsert(pQueryInfo, &index);
-    tscFieldInfoSetValFromSchema(&pQueryInfo->fieldsInfo, i, &pMeterSchema[i]);
+    tscColumnListInsert(pQueryInfo->colList, &index);
+    
+    TAOS_FIELD f = tscCreateField(pSchema->type, pSchema->name, pSchema->bytes);
+    SFieldSupInfo* pInfo = tscFieldInfoAppend(pFieldInfo, &f);
+    
+    pInfo->pSqlExpr = tscSqlExprAppend(pQueryInfo, TSDB_FUNC_TS_DUMMY, &index,
+                     pTableSchema[i].type, pTableSchema[i].bytes, pTableSchema[i].bytes, false);
   }
-
-  tscFieldInfoCalOffset(pQueryInfo);
+  
+  pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
+  tscFieldInfoUpdateOffset(pQueryInfo);
+  
+  taosTFree(pTableMeta);
   return 0;
 }
 
-int tscProcessConnectRsp(SSqlObj *pSql) {
-  char         temp[TSDB_METER_ID_LEN * 2];
-  SConnectRsp *pConnect;
+// TODO multithread problem
+static void createHBObj(STscObj* pObj) {
+  if (pObj->pHb != NULL) {
+    return;
+  }
+
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
+  if (NULL == pSql) return;
+
+  pSql->fp = tscProcessHeartBeatRsp;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetailSafely(&pSql->cmd, 0);
+  if (pQueryInfo == NULL) {
+    pSql->res.code = terrno;
+    return;
+  }
+
+  pQueryInfo->command = TSDB_SQL_HB;
+
+  pSql->cmd.command = pQueryInfo->command;
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(&(pSql->cmd), TSDB_DEFAULT_PAYLOAD_SIZE)) {
+    taosTFree(pSql);
+    return;
+  }
+
+  pSql->param = pObj;
+  pSql->pTscObj = pObj;
+  pSql->signature = pSql;
+
+  registerSqlObj(pSql);
+  tscDebug("%p HB is allocated, pObj:%p", pSql, pObj);
 
+  pObj->pHb = pSql;
+}
+
+int tscProcessConnectRsp(SSqlObj *pSql) {
+  char temp[TSDB_TABLE_FNAME_LEN * 2];
   STscObj *pObj = pSql->pTscObj;
   SSqlRes *pRes = &pSql->res;
 
-  pConnect = (SConnectRsp *)pRes->pRsp;
-  strcpy(pObj->acctId, pConnect->acctId);  // copy acctId from response
+  SCMConnectRsp *pConnect = (SCMConnectRsp *)pRes->pRsp;
+  tstrncpy(pObj->acctId, pConnect->acctId, sizeof(pObj->acctId));  // copy acctId from response
   int32_t len = sprintf(temp, "%s%s%s", pObj->acctId, TS_PATH_DELIMITER, pObj->db);
 
-  assert(len <= tListLen(pObj->db));
-  strncpy(pObj->db, temp, tListLen(pObj->db));
+  assert(len <= sizeof(pObj->db));
+  tstrncpy(pObj->db, temp, sizeof(pObj->db));
   
-  SIpList *    pIpList;
-  char *rsp = pRes->pRsp + sizeof(SConnectRsp);
-  pIpList = (SIpList *)rsp;
-  tscSetMgmtIpList(pIpList);
+  if (pConnect->epSet.numOfEps > 0) {
+    tscEpSetHtons(&pConnect->epSet);
+    tscUpdateMgmtEpSet(&pConnect->epSet);
+  } 
 
-  strcpy(pObj->sversion, pConnect->version);
+  strcpy(pObj->sversion, pConnect->serverVersion);
   pObj->writeAuth = pConnect->writeAuth;
   pObj->superAuth = pConnect->superAuth;
+  pObj->connId = htonl(pConnect->connId);
+
+  createHBObj(pObj);
   taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);
 
   return 0;
@@ -3332,23 +2010,23 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
 
 int tscProcessUseDbRsp(SSqlObj *pSql) {
   STscObj *       pObj = pSql->pTscObj;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
 
-  strcpy(pObj->db, pMeterMetaInfo->name);
+  tstrncpy(pObj->db, pTableMetaInfo->name, sizeof(pObj->db));
   return 0;
 }
 
-int tscProcessDropDbRsp(SSqlObj *UNUSED_PARAM(pSql)) {
-  taosClearDataCache(tscCacheHandle);
+int tscProcessDropDbRsp(SSqlObj *pSql) {
+  pSql->pTscObj->db[0] = 0;
+  taosCacheEmpty(tscMetaCache);
   return 0;
 }
 
 int tscProcessDropTableRsp(SSqlObj *pSql) {
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
 
-  SMeterMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
-  if (pMeterMeta == NULL) {
-    /* not in cache, abort */
+  STableMeta *pTableMeta = taosCacheAcquireByKey(tscMetaCache, pTableMetaInfo->name, strlen(pTableMetaInfo->name));
+  if (pTableMeta == NULL) { /* not in cache, abort */
     return 0;
   }
 
@@ -3359,37 +2037,34 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
    * The cached information is expired, however, we may have lost the ref of original meter. So, clear whole cache
    * instead.
    */
-  tscTrace("%p force release metermeta after drop table:%s", pSql, pMeterMetaInfo->name);
-  taosRemoveDataFromCache(tscCacheHandle, (void **)&pMeterMeta, true);
+  tscDebug("%p force release table meta after drop table:%s", pSql, pTableMetaInfo->name);
+  taosCacheRelease(tscMetaCache, (void **)&pTableMeta, true);
 
-  if (pMeterMetaInfo->pMeterMeta) {
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
+  if (pTableMetaInfo->pTableMeta) {
+    taosCacheRelease(tscMetaCache, (void **)&(pTableMetaInfo->pTableMeta), true);
   }
 
   return 0;
 }
 
 int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
 
-  SMeterMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
-  if (pMeterMeta == NULL) { /* not in cache, abort */
+  STableMeta *pTableMeta = taosCacheAcquireByKey(tscMetaCache, pTableMetaInfo->name, strlen(pTableMetaInfo->name));
+  if (pTableMeta == NULL) { /* not in cache, abort */
     return 0;
   }
 
-  tscTrace("%p force release metermeta in cache after alter-table: %s", pSql, pMeterMetaInfo->name);
-  taosRemoveDataFromCache(tscCacheHandle, (void **)&pMeterMeta, true);
+  tscDebug("%p force release metermeta in cache after alter-table: %s", pSql, pTableMetaInfo->name);
+  taosCacheRelease(tscMetaCache, (void **)&pTableMeta, true);
 
-  if (pMeterMetaInfo->pMeterMeta) {
-    bool isSuperTable = UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
-
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
+  if (pTableMetaInfo->pTableMeta) {
+    bool isSuperTable = UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
+    taosCacheRelease(tscMetaCache, (void **)&(pTableMetaInfo->pTableMeta), true);
 
     if (isSuperTable) {  // if it is a super table, reset whole query cache
-      tscTrace("%p reset query cache since table:%s is stable", pSql, pMeterMetaInfo->name);
-      taosClearDataCache(tscCacheHandle);
+      tscDebug("%p reset query cache since table:%s is stable", pSql, pTableMetaInfo->name);
+      taosCacheEmpty(tscMetaCache);
     }
   }
 
@@ -3400,45 +2075,58 @@ int tscProcessAlterDbMsgRsp(SSqlObj *pSql) {
   UNUSED(pSql);
   return 0;
 }
+int tscProcessShowCreateRsp(SSqlObj *pSql) {
+  return tscLocalResultCommonBuilder(pSql, 1);
+}
 
 int tscProcessQueryRsp(SSqlObj *pSql) {
   SSqlRes *pRes = &pSql->res;
 
-  pRes->qhandle = *((uint64_t *)pRes->pRsp);
+  SQueryTableRsp *pQuery = (SQueryTableRsp *)pRes->pRsp;
+  pQuery->qhandle = htobe64(pQuery->qhandle);
+  pRes->qhandle = pQuery->qhandle;
+
   pRes->data = NULL;
   tscResetForNextRetrieve(pRes);
   return 0;
 }
 
-int tscProcessRetrieveRspFromVnode(SSqlObj *pSql) {
+int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
-  STscObj *pObj = pSql->pTscObj;
 
-  SRetrieveMeterRsp *pRetrieve = (SRetrieveMeterRsp *)pRes->pRsp;
+  SRetrieveTableRsp *pRetrieve = (SRetrieveTableRsp *)pRes->pRsp;
+  if (pRetrieve == NULL) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return pRes->code;
+  }
 
   pRes->numOfRows = htonl(pRetrieve->numOfRows);
   pRes->precision = htons(pRetrieve->precision);
-  pRes->offset = htobe64(pRetrieve->offset);
-  pRes->useconds = htobe64(pRetrieve->useconds);
-  pRes->data = pRetrieve->data;
+  pRes->offset    = htobe64(pRetrieve->offset);
+  pRes->useconds  = htobe64(pRetrieve->useconds);
+  pRes->completed = (pRetrieve->completed == 1);
+  pRes->data      = pRetrieve->data;
   
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  tscSetResultPointer(pQueryInfo, pRes);
-
+  if (tscCreateResPointerInfo(pRes, pQueryInfo) != TSDB_CODE_SUCCESS) {
+    return pRes->code;
+  }
+  
   if (pSql->pSubscription != NULL) {
-    int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
+    int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
     
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, numOfCols - 1);
+    TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, numOfCols - 1);
     int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, numOfCols - 1);
     
     char* p = pRes->data + (pField->bytes + offset) * pRes->numOfRows;
 
-    int32_t numOfMeters = htonl(*(int32_t*)p);
+    int32_t numOfTables = htonl(*(int32_t*)p);
     p += sizeof(int32_t);
-    for (int i = 0; i < numOfMeters; i++) {
+    for (int i = 0; i < numOfTables; i++) {
       int64_t uid = htobe64(*(int64_t*)p);
       p += sizeof(int64_t);
+      p += sizeof(int32_t); // skip tid
       TSKEY key = htobe64(*(TSKEY*)p);
       p += sizeof(TSKEY);
       tscUpdateSubscriptionProgress(pSql->pSubscription, uid, key);
@@ -3446,224 +2134,121 @@ int tscProcessRetrieveRspFromVnode(SSqlObj *pSql) {
   }
 
   pRes->row = 0;
+  tscDebug("%p numOfRows:%" PRId64 ", offset:%" PRId64 ", complete:%d", pSql, pRes->numOfRows, pRes->offset, pRes->completed);
 
-  /**
-   * If the query result is exhausted, or current query is to free resource at server side,
-   * the connection will be recycled.
-   */
-  if ((pRes->numOfRows == 0 && !(tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && pRes->offset > 0)) ||
-      ((pQueryInfo->type & TSDB_QUERY_TYPE_FREE_RESOURCE) == TSDB_QUERY_TYPE_FREE_RESOURCE)) {
-    tscTrace("%p no result or free resource, recycle connection", pSql);
-    taosAddConnIntoCache(tscConnCache, pSql->thandle, pSql->ip, pSql->vnode, pObj->user);
-    pSql->thandle = NULL;
-  } else {
-    tscTrace("%p numOfRows:%d, offset:%d, not recycle connection", pSql, pRes->numOfRows, pRes->offset);
-  }
-
-  return 0;
-}
-
-int tscProcessRetrieveRspFromLocal(SSqlObj *pSql) {
-  SSqlRes *   pRes = &pSql->res;
-  SSqlCmd *   pCmd = &pSql->cmd;
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-
-  SRetrieveMeterRsp *pRetrieve = (SRetrieveMeterRsp *)pRes->pRsp;
-
-  pRes->numOfRows = htonl(pRetrieve->numOfRows);
-  pRes->data = pRetrieve->data;
-
-  tscSetResultPointer(pQueryInfo, pRes);
-  pRes->row = 0;
   return 0;
 }
 
-void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code);
-
-static int32_t doGetMeterMetaFromServer(SSqlObj *pSql, SMeterMetaInfo *pMeterMetaInfo) {
-  int32_t code = TSDB_CODE_SUCCESS;
+void tscTableMetaCallBack(void *param, TAOS_RES *res, int code);
 
+static int32_t getTableMetaFromMgmt(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
   SSqlObj *pNew = calloc(1, sizeof(SSqlObj));
   if (NULL == pNew) {
-    tscError("%p malloc failed for new sqlobj to get meter meta", pSql);
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    tscError("%p malloc failed for new sqlobj to get table meta", pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
   pNew->pTscObj = pSql->pTscObj;
   pNew->signature = pNew;
   pNew->cmd.command = TSDB_SQL_META;
 
+  registerSqlObj(pNew);
+
   tscAddSubqueryInfo(&pNew->cmd);
 
-  SQueryInfo *pNewQueryInfo = NULL;
-  tscGetQueryInfoDetailSafely(&pNew->cmd, 0, &pNewQueryInfo);
+  SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetailSafely(&pNew->cmd, 0);
 
-  pNew->cmd.createOnDemand = pSql->cmd.createOnDemand;  // create table if not exists
-  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
-    tscError("%p malloc failed for payload to get meter meta", pSql);
+  pNew->cmd.autoCreated = pSql->cmd.autoCreated;  // create table if not exists
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE + pSql->cmd.payloadLen)) {
+    tscError("%p malloc failed for payload to get table meta", pSql);
     free(pNew);
 
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
-  SMeterMetaInfo *pNewMeterMetaInfo = tscAddEmptyMeterMetaInfo(pNewQueryInfo);
+  STableMetaInfo *pNewMeterMetaInfo = tscAddEmptyMetaInfo(pNewQueryInfo);
   assert(pNew->cmd.numOfClause == 1 && pNewQueryInfo->numOfTables == 1);
 
-  strcpy(pNewMeterMetaInfo->name, pMeterMetaInfo->name);
-  memcpy(pNew->cmd.payload, pSql->cmd.payload, TSDB_DEFAULT_PAYLOAD_SIZE);  // tag information if table does not exists.
-  tscTrace("%p new pSqlObj:%p to get meterMeta", pSql, pNew);
-
-  if (pSql->fp == NULL) {
-    tsem_init(&pNew->rspSem, 0, 0);
-    tsem_init(&pNew->emptyRspSem, 0, 1);
-
-    code = tscProcessSql(pNew);
-
-    /*
-     * Update cache only on succeeding in getting metermeta.
-     * Transfer the ownership of metermeta to the new object, instead of invoking the release/acquire routine
-     */
-    if (code == TSDB_CODE_SUCCESS) {
-      pMeterMetaInfo->pMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**) &pNewMeterMetaInfo->pMeterMeta);
-      assert(pMeterMetaInfo->pMeterMeta != NULL);
-    }
-
-    tscTrace("%p get meter meta complete, code:%d, pMeterMeta:%p", pSql, code, pMeterMetaInfo->pMeterMeta);
-    tscFreeSqlObj(pNew);
+  tstrncpy(pNewMeterMetaInfo->name, pTableMetaInfo->name, sizeof(pNewMeterMetaInfo->name));
+  memcpy(&pNew->cmd.tagData, &pSql->cmd.tagData, sizeof(pSql->cmd.tagData));
+  tscDebug("%p new pSqlObj:%p to get tableMeta, auto create:%d", pSql, pNew, pNew->cmd.autoCreated);
 
-  } else {
-    pNew->fp = tscMeterMetaCallBack;
-    pNew->param = pSql;
-    pNew->sqlstr = strdup(pSql->sqlstr);
+  pNew->fp = tscTableMetaCallBack;
+  pNew->param = pSql;
 
-    code = tscProcessSql(pNew);
-    if (code == TSDB_CODE_SUCCESS) {
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-    }
+  int32_t code = tscProcessSql(pNew);
+  if (code == TSDB_CODE_SUCCESS) {
+    code = TSDB_CODE_TSC_ACTION_IN_PROGRESS;  // notify upper application that current process need to be terminated
   }
 
   return code;
 }
 
-int tscGetMeterMeta(SSqlObj *pSql, SMeterMetaInfo *pMeterMetaInfo) {
-  assert(strlen(pMeterMetaInfo->name) != 0);
+int32_t tscGetTableMeta(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
+  assert(strlen(pTableMetaInfo->name) != 0);
 
-  // If this SMeterMetaInfo owns a metermeta, release it first
-  if (pMeterMetaInfo->pMeterMeta != NULL) {
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), false);
+  // If this STableMetaInfo owns a table meta, release it first
+  if (pTableMetaInfo->pTableMeta != NULL) {
+    taosCacheRelease(tscMetaCache, (void **)&(pTableMetaInfo->pTableMeta), false);
   }
   
-  pMeterMetaInfo->pMeterMeta = (SMeterMeta *)taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
-  if (pMeterMetaInfo->pMeterMeta != NULL) {
-    SMeterMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
-
-    tscTrace("%p retrieve meterMeta from cache, the number of columns:%d, numOfTags:%d", pSql, pMeterMeta->numOfColumns,
-             pMeterMeta->numOfTags);
+  pTableMetaInfo->pTableMeta = (STableMeta *)taosCacheAcquireByKey(tscMetaCache, pTableMetaInfo->name, strlen(pTableMetaInfo->name));
+  if (pTableMetaInfo->pTableMeta != NULL) {
+    STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+    tscDebug("%p retrieve table Meta from cache, the number of columns:%d, numOfTags:%d, %p", pSql, tinfo.numOfColumns,
+             tinfo.numOfTags, pTableMetaInfo->pTableMeta);
 
     return TSDB_CODE_SUCCESS;
   }
-
-  /*
-   * for async insert operation, release data block buffer before issue new object to get metermeta
-   * because in metermeta callback function, the tscParse function will generate the submit data blocks
-   */
-  return doGetMeterMetaFromServer(pSql, pMeterMetaInfo);
-}
-
-int tscGetMeterMetaEx(SSqlObj *pSql, SMeterMetaInfo *pMeterMetaInfo, bool createIfNotExists) {
-  pSql->cmd.createOnDemand = createIfNotExists;
-  return tscGetMeterMeta(pSql, pMeterMetaInfo);
+  
+  return getTableMetaFromMgmt(pSql, pTableMetaInfo);
 }
 
-/*
- * in handling the renew metermeta problem during insertion,
- *
- * If the meter is created on demand during insertion, the routine usually waits for a short
- * period to re-issue the getMeterMeta msg, in which makes a greater change that vnode has
- * successfully created the corresponding table.
- */
-static void tscWaitingForCreateTable(SSqlCmd *pCmd) {
-  if (pCmd->command == TSDB_SQL_INSERT) {
-    taosMsleep(50);  // todo: global config
-  }
+int tscGetMeterMetaEx(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo, bool createIfNotExists) {
+  pSql->cmd.autoCreated = createIfNotExists;
+  return tscGetTableMeta(pSql, pTableMetaInfo);
 }
 
 /**
- * in renew metermeta, do not retrieve metadata in cache.
+ * retrieve table meta from mnode, and update the local table meta cache.
  * @param pSql          sql object
- * @param meterId       meter id
+ * @param tableIndex    table index
  * @return              status code
  */
-int tscRenewMeterMeta(SSqlObj *pSql, char *meterId) {
-  int code = 0;
-
-  // handle metric meta renew process
+int tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex) {
   SSqlCmd *pCmd = &pSql->cmd;
 
   SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  // enforce the renew metermeta operation in async model
-  if (pSql->fp == NULL) pSql->fp = (void *)0x1;
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
 
-  /*
-   * 1. only update the metermeta in force model metricmeta is not updated
-   * 2. if get metermeta failed, still get the metermeta
-   */
-  if (pMeterMetaInfo->pMeterMeta == NULL || !tscQueryOnMetric(pCmd)) {
-    if (pMeterMetaInfo->pMeterMeta) {
-      tscTrace("%p update meter meta, old: numOfTags:%d, numOfCols:%d, uid:%" PRId64 ", addr:%p", pSql,
-               pMeterMetaInfo->numOfTags, pCmd->numOfCols, pMeterMetaInfo->pMeterMeta->uid, pMeterMetaInfo->pMeterMeta);
-    }
-
-    tscWaitingForCreateTable(pCmd);
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
-
-    code = doGetMeterMetaFromServer(pSql, pMeterMetaInfo);  // todo ??
-  } else {
-    tscTrace("%p metric query not update metric meta, numOfTags:%d, numOfCols:%d, uid:%" PRId64 ", addr:%p", pSql,
-             pMeterMetaInfo->pMeterMeta->numOfTags, pCmd->numOfCols, pMeterMetaInfo->pMeterMeta->uid,
-             pMeterMetaInfo->pMeterMeta);
-  }
-
-  if (code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    if (pSql->fp == (void *)0x1) {
-      pSql->fp = NULL;
-    }
+  STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
+  if (pTableMetaInfo->pTableMeta) {
+    tscDebug("%p update table meta, old meta numOfTags:%d, numOfCols:%d, uid:%" PRId64 ", addr:%p", pSql,
+             tscGetNumOfTags(pTableMeta), tscGetNumOfColumns(pTableMeta), pTableMeta->id.uid, pTableMeta);
   }
 
-  return code;
+  taosCacheRelease(tscMetaCache, (void **)&(pTableMetaInfo->pTableMeta), true);
+  return getTableMetaFromMgmt(pSql, pTableMetaInfo);
 }
 
-int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
-  int      code = TSDB_CODE_NETWORK_UNAVAIL;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  /*
-   * the query condition is serialized into pCmd->payload, we need to rebuild key for metricmeta info in cache.
-   */
-  bool    required = false;
-
+static bool allVgroupInfoRetrieved(SSqlCmd* pCmd, int32_t clauseIndex) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    char tagstr[TSDB_MAX_TAGS_LEN + 1] = {0};
-
-    SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-    tscGetMetricMetaCacheKey(pQueryInfo, tagstr, pMeterMetaInfo->pMeterMeta->uid);
-
-    taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
-
-    SMetricMeta *ppMeta = (SMetricMeta *)taosGetDataFromCache(tscCacheHandle, tagstr);
-    if (ppMeta == NULL) {
-      required = true;
-      break;
-    } else {
-      pMeterMetaInfo->pMetricMeta = ppMeta;
+    STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
+    if (pTableMetaInfo->vgroupList == NULL) {
+      return false;
     }
   }
+  
+  // all super tables vgroupinfo are retrieved, no need to retrieve vgroup info anymore
+  return true;
+}
 
-  // all metricmeta for one clause are retrieved from cache, no need to retrieve metricmeta from management node
-  if (!required) {
+int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
+  int      code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+  SSqlCmd *pCmd = &pSql->cmd;
+  
+  if (allVgroupInfoRetrieved(pCmd, clauseIndex)) {
     return TSDB_CODE_SUCCESS;
   }
 
@@ -3671,18 +2256,20 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
   pNew->pTscObj = pSql->pTscObj;
   pNew->signature = pNew;
 
-  pNew->cmd.command = TSDB_SQL_METRIC;
-  
-  SQueryInfo *pNewQueryInfo = NULL;
-  if ((code = tscGetQueryInfoDetailSafely(&pNew->cmd, 0, &pNewQueryInfo)) != TSDB_CODE_SUCCESS) {
+  pNew->cmd.command = TSDB_SQL_STABLEVGROUP;
+
+  // TODO TEST IT
+  SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetailSafely(&pNew->cmd, 0);
+  if (pNewQueryInfo == NULL) {
+    tscFreeSqlObj(pNew);
     return code;
   }
   
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    SMeterMetaInfo *pMMInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-
-    SMeterMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMMInfo->name);
-    tscAddMeterMetaInfo(pNewQueryInfo, pMMInfo->name, pMeterMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
+    STableMetaInfo *pMInfo = tscGetMetaInfo(pQueryInfo, i);
+    STableMeta *pTableMeta = taosCacheAcquireByData(tscMetaCache, pMInfo->pTableMeta);
+    tscAddTableMetaInfo(pNewQueryInfo, pMInfo->name, pTableMeta, NULL, pMInfo->tagColList);
   }
 
   if ((code = tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {
@@ -3690,64 +2277,25 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
     return code;
   }
 
-  tscTagCondCopy(&pNewQueryInfo->tagCond, &pQueryInfo->tagCond);
-
-  pNewQueryInfo->groupbyExpr = pQueryInfo->groupbyExpr;
   pNewQueryInfo->numOfTables = pQueryInfo->numOfTables;
+  registerSqlObj(pNew);
 
-  pNewQueryInfo->slimit = pQueryInfo->slimit;
-  pNewQueryInfo->order = pQueryInfo->order;
-  
-  STagCond* pTagCond = &pNewQueryInfo->tagCond;
-  tscTrace("%p new sqlobj:%p info, numOfTables:%d, slimit:%" PRId64 ", soffset:%" PRId64 ", order:%d, tbname cond:%s",
-      pSql, pNew, pNewQueryInfo->numOfTables, pNewQueryInfo->slimit.limit, pNewQueryInfo->slimit.offset,
-      pNewQueryInfo->order.order, pTagCond->tbnameCond.cond)
-
-//  if (pSql->fp != NULL && pSql->pStream == NULL) {
-//    pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-//    tscFreeSubqueryInfo(pCmd);
-//  }
+  tscDebug("%p new sqlObj:%p to get vgroupInfo, numOfTables:%d", pSql, pNew, pNewQueryInfo->numOfTables);
 
-  tscTrace("%p allocate new pSqlObj:%p to get metricMeta", pSql, pNew);
-  if (pSql->fp == NULL) {
-    tsem_init(&pNew->rspSem, 0, 0);
-    tsem_init(&pNew->emptyRspSem, 0, 1);
-
-    code = tscProcessSql(pNew);
-
-    if (code == TSDB_CODE_SUCCESS) {//todo optimize the performance
-      for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-        char tagstr[TSDB_MAX_TAGS_LEN] = {0};
-    
-        SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
-        tscGetMetricMetaCacheKey(pQueryInfo, tagstr, pMeterMetaInfo->pMeterMeta->uid);
-
-#ifdef _DEBUG_VIEW
-        printf("create metric key:%s, index:%d\n", tagstr, i);
-#endif
-    
-        taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
-        pMeterMetaInfo->pMetricMeta = (SMetricMeta *)taosGetDataFromCache(tscCacheHandle, tagstr);
-      }
-    }
-
-    tscFreeSqlObj(pNew);
-  } else {
-    pNew->fp = tscMeterMetaCallBack;
-    pNew->param = pSql;
-    code = tscProcessSql(pNew);
-    if (code == TSDB_CODE_SUCCESS) {
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-    }
+  pNew->fp = tscTableMetaCallBack;
+  pNew->param = pSql;
+  code = tscProcessSql(pNew);
+  if (code == TSDB_CODE_SUCCESS) {
+    code = TSDB_CODE_TSC_ACTION_IN_PROGRESS;
   }
 
   return code;
 }
 
-void tscInitMsgs() {
+void tscInitMsgsFp() {
   tscBuildMsg[TSDB_SQL_SELECT] = tscBuildQueryMsg;
   tscBuildMsg[TSDB_SQL_INSERT] = tscBuildSubmitMsg;
-  tscBuildMsg[TSDB_SQL_FETCH] = tscBuildRetrieveMsg;
+  tscBuildMsg[TSDB_SQL_FETCH] = tscBuildFetchMsg;
 
   tscBuildMsg[TSDB_SQL_CREATE_DB] = tscBuildCreateDbMsg;
   tscBuildMsg[TSDB_SQL_CREATE_USER] = tscBuildUserMsg;
@@ -3756,7 +2304,7 @@ void tscInitMsgs() {
   tscBuildMsg[TSDB_SQL_ALTER_ACCT] = tscBuildAcctMsg;
 
   tscBuildMsg[TSDB_SQL_CREATE_TABLE] = tscBuildCreateTableMsg;
-  tscBuildMsg[TSDB_SQL_DROP_USER] = tscBuildDropAcctMsg;
+  tscBuildMsg[TSDB_SQL_DROP_USER] = tscBuildDropUserMsg;
   tscBuildMsg[TSDB_SQL_DROP_ACCT] = tscBuildDropAcctMsg;
   tscBuildMsg[TSDB_SQL_DROP_DB] = tscBuildDropDbMsg;
   tscBuildMsg[TSDB_SQL_DROP_TABLE] = tscBuildDropTableMsg;
@@ -3765,12 +2313,13 @@ void tscInitMsgs() {
   tscBuildMsg[TSDB_SQL_DROP_DNODE] = tscBuildDropDnodeMsg;
   tscBuildMsg[TSDB_SQL_CFG_DNODE] = tscBuildCfgDnodeMsg;
   tscBuildMsg[TSDB_SQL_ALTER_TABLE] = tscBuildAlterTableMsg;
+  tscBuildMsg[TSDB_SQL_UPDATE_TAGS_VAL] = tscBuildUpdateTagMsg;
   tscBuildMsg[TSDB_SQL_ALTER_DB] = tscAlterDbMsg;
 
   tscBuildMsg[TSDB_SQL_CONNECT] = tscBuildConnectMsg;
   tscBuildMsg[TSDB_SQL_USE_DB] = tscBuildUseDbMsg;
-  tscBuildMsg[TSDB_SQL_META] = tscBuildMeterMetaMsg;
-  tscBuildMsg[TSDB_SQL_METRIC] = tscBuildMetricMetaMsg;
+  tscBuildMsg[TSDB_SQL_META] = tscBuildTableMetaMsg;
+  tscBuildMsg[TSDB_SQL_STABLEVGROUP] = tscBuildSTableVgroupMsg;
   tscBuildMsg[TSDB_SQL_MULTI_META] = tscBuildMultiMeterMetaMsg;
 
   tscBuildMsg[TSDB_SQL_HB] = tscBuildHeartBeatMsg;
@@ -3781,40 +2330,40 @@ void tscInitMsgs() {
   tscBuildMsg[TSDB_SQL_KILL_CONNECTION] = tscBuildKillMsg;
 
   tscProcessMsgRsp[TSDB_SQL_SELECT] = tscProcessQueryRsp;
-  tscProcessMsgRsp[TSDB_SQL_FETCH] = tscProcessRetrieveRspFromVnode;
+  tscProcessMsgRsp[TSDB_SQL_FETCH] = tscProcessRetrieveRspFromNode;
 
   tscProcessMsgRsp[TSDB_SQL_DROP_DB] = tscProcessDropDbRsp;
   tscProcessMsgRsp[TSDB_SQL_DROP_TABLE] = tscProcessDropTableRsp;
   tscProcessMsgRsp[TSDB_SQL_CONNECT] = tscProcessConnectRsp;
   tscProcessMsgRsp[TSDB_SQL_USE_DB] = tscProcessUseDbRsp;
-  tscProcessMsgRsp[TSDB_SQL_META] = tscProcessMeterMetaRsp;
-  tscProcessMsgRsp[TSDB_SQL_METRIC] = tscProcessMetricMetaRsp;
+  tscProcessMsgRsp[TSDB_SQL_META] = tscProcessTableMetaRsp;
+  tscProcessMsgRsp[TSDB_SQL_STABLEVGROUP] = tscProcessSTableVgroupRsp;
   tscProcessMsgRsp[TSDB_SQL_MULTI_META] = tscProcessMultiMeterMetaRsp;
 
   tscProcessMsgRsp[TSDB_SQL_SHOW] = tscProcessShowRsp;
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE] = tscProcessRetrieveRspFromVnode;  // rsp handled by same function.
+  tscProcessMsgRsp[TSDB_SQL_RETRIEVE] = tscProcessRetrieveRspFromNode;  // rsp handled by same function.
   tscProcessMsgRsp[TSDB_SQL_DESCRIBE_TABLE] = tscProcessDescribeTableRsp;
 
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_TAGS] = tscProcessTagRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_CURRENT_DB] = tscProcessTagRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_CURRENT_USER] = tscProcessTagRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_SERV_VERSION] = tscProcessTagRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_CLI_VERSION] = tscProcessTagRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_SERV_STATUS] = tscProcessTagRetrieveRsp;
+  tscProcessMsgRsp[TSDB_SQL_CURRENT_DB]   = tscProcessLocalRetrieveRsp;
+  tscProcessMsgRsp[TSDB_SQL_CURRENT_USER] = tscProcessLocalRetrieveRsp;
+  tscProcessMsgRsp[TSDB_SQL_SERV_VERSION] = tscProcessLocalRetrieveRsp;
+  tscProcessMsgRsp[TSDB_SQL_CLI_VERSION]  = tscProcessLocalRetrieveRsp;
+  tscProcessMsgRsp[TSDB_SQL_SERV_STATUS]  = tscProcessLocalRetrieveRsp;
 
   tscProcessMsgRsp[TSDB_SQL_RETRIEVE_EMPTY_RESULT] = tscProcessEmptyResultRsp;
 
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_METRIC] = tscProcessRetrieveMetricRsp;
+  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_LOCALMERGE] = tscProcessRetrieveLocalMergeRsp;
 
   tscProcessMsgRsp[TSDB_SQL_ALTER_TABLE] = tscProcessAlterTableMsgRsp;
   tscProcessMsgRsp[TSDB_SQL_ALTER_DB] = tscProcessAlterDbMsgRsp;
 
+  tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_TABLE] = tscProcessShowCreateRsp;
+  tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_DATABASE] = tscProcessShowCreateRsp;
+  
+
   tscKeepConn[TSDB_SQL_SHOW] = 1;
   tscKeepConn[TSDB_SQL_RETRIEVE] = 1;
   tscKeepConn[TSDB_SQL_SELECT] = 1;
   tscKeepConn[TSDB_SQL_FETCH] = 1;
   tscKeepConn[TSDB_SQL_HB] = 1;
-
-  tscUpdateVnodeMsg[TSDB_SQL_SELECT] = tscUpdateVnodeInQueryMsg;
-  tscUpdateVnodeMsg[TSDB_SQL_INSERT] = tscUpdateVnodeInSubmitMsg;
 }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 6a03278a077bab0aa078685acd8a0ecd3402acce..430a762321718eb78f6271e43086390ea1f2439b 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -13,92 +13,113 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
 #include "hash.h"
+#include "os.h"
+#include "qAst.h"
+#include "tkey.h"
 #include "tcache.h"
-#include "tlog.h"
 #include "tnote.h"
 #include "trpc.h"
-#include "tscJoinProcess.h"
-#include "tscProfile.h"
-#include "tscSQLParser.h"
-#include "tscSecondaryMerge.h"
+#include "tscLog.h"
+#include "tscSubquery.h"
 #include "tscUtil.h"
 #include "tsclient.h"
-#include "tscompression.h"
-#include "tsocket.h"
-#include "ttimer.h"
+#include "ttokendef.h"
 #include "tutil.h"
+#include "tscProfile.h"
+
+static bool validImpl(const char* str, size_t maxsize) {
+  if (str == NULL) {
+    return false;
+  }
+  
+  size_t len = strlen(str);
+  if (len <= 0 || len > maxsize) {
+    return false;
+  }
+  
+  return true;
+}
+
+static bool validUserName(const char* user) {
+  return validImpl(user, TSDB_USER_LEN - 1);
+}
 
-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;
+static bool validPassword(const char* passwd) {
+  return validImpl(passwd, TSDB_PASSWORD_LEN - 1);
+}
 
+SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *auth, const char *db,
+                         uint16_t port, void (*fp)(void *, TAOS_RES *, int), void *param, void **taos) {
   taos_init();
 
-  if (pTscMgmtConn == NULL || pVnodeConn == NULL) {
-    globalCode = TSDB_CODE_APP_ERROR;
+  if (!validUserName(user)) {
+    terrno = TSDB_CODE_TSC_INVALID_USER_LENGTH;
     return NULL;
   }
 
-  if (user == NULL) {
-    globalCode = TSDB_CODE_INVALID_ACCT;
-    return NULL;
-  } else {
-    size_t len = strlen(user);
-    if (len <= 0 || len > TSDB_USER_LEN) {
-      globalCode = TSDB_CODE_INVALID_ACCT;
+  char secretEncrypt[32] = {0};
+  int  secretEncryptLen = 0;
+  if (auth == NULL) {
+    if (!validPassword(pass)) {
+      terrno = TSDB_CODE_TSC_INVALID_PASS_LENGTH;
       return NULL;
     }
-  }
-
-  if (pass == NULL) {
-    globalCode = TSDB_CODE_INVALID_PASS;
-    return NULL;
+    taosEncryptPass((uint8_t *)pass, strlen(pass), secretEncrypt);
   } else {
-    size_t len = strlen(pass);
-    if (len <= 0 || len > TSDB_KEY_LEN) {
-      globalCode = TSDB_CODE_INVALID_PASS;
+    int   outlen = 0;
+    int   len = (int)strlen(auth);
+    char *base64 = (char *)base64_decode(auth, len, &outlen);
+    if (base64 == NULL || outlen == 0) {
+      tscError("invalid auth info:%s", auth);
+      free(base64);
+      terrno = TSDB_CODE_TSC_INVALID_PASS_LENGTH;
       return NULL;
+    } else {
+      memcpy(secretEncrypt, base64, outlen);
+      free(base64);
     }
+    secretEncryptLen = outlen;
   }
 
-  if (ip && ip[0]) {
-    tscMgmtIpList.numOfIps = 4;
-    strcpy(tscMgmtIpList.ipstr[0], ip);
-    tscMgmtIpList.ip[0] = inet_addr(ip);
-    strcpy(tscMgmtIpList.ipstr[1], ip);
-    tscMgmtIpList.ip[1] = inet_addr(ip);
-    strcpy(tscMgmtIpList.ipstr[2], tsMasterIp);
-    tscMgmtIpList.ip[2] = inet_addr(tsMasterIp);
-    strcpy(tscMgmtIpList.ipstr[3], tsSecondIp);
-    tscMgmtIpList.ip[3] = inet_addr(tsSecondIp);
+  if (ip) {
+    if (tscSetMgmtEpSetFromCfg(ip, NULL) < 0) return NULL;
+    if (port) tscMgmtEpSet.epSet.port[0] = port;
+  } 
+ 
+  void *pDnodeConn = NULL;
+  if (tscInitRpc(user, secretEncrypt, &pDnodeConn) != 0) {
+    terrno = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+    return NULL;
   }
-
-  pObj = (STscObj *)malloc(sizeof(STscObj));
+ 
+  STscObj *pObj = (STscObj *)calloc(1, sizeof(STscObj));
   if (NULL == pObj) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    rpcClose(pDnodeConn);
     return NULL;
   }
 
-  memset(pObj, 0, sizeof(STscObj));
   pObj->signature = pObj;
+  pObj->pDnodeConn = pDnodeConn;
+  T_REF_INIT_VAL(pObj, 1);
 
-  strncpy(pObj->user, user, TSDB_USER_LEN);
-  taosEncryptPass((uint8_t *)pass, strlen(pass), pObj->pass);
-  pObj->mgmtPort = port ? port : tsMgmtShellPort;
+  tstrncpy(pObj->user, user, sizeof(pObj->user));
+  secretEncryptLen = MIN(secretEncryptLen, sizeof(pObj->pass));
+  memcpy(pObj->pass, secretEncrypt, secretEncryptLen);
 
   if (db) {
-    int32_t len = strlen(db);
+    int32_t len = (int32_t)strlen(db);
     /* db name is too long */
-    if (len > TSDB_DB_NAME_LEN) {
+    if (len >= TSDB_DB_NAME_LEN) {
+      terrno = TSDB_CODE_TSC_INVALID_DB_LENGTH;
+      rpcClose(pDnodeConn);
       free(pObj);
-      globalCode = TSDB_CODE_INVALID_DB;
       return NULL;
     }
 
-    char tmp[TSDB_DB_NAME_LEN + 1] = {0};
-    strcpy(tmp, db);
+    char tmp[TSDB_DB_NAME_LEN] = {0};
+    tstrncpy(tmp, db, sizeof(tmp));
 
     strdequote(tmp);
     strtolower(pObj->db, tmp);
@@ -106,173 +127,205 @@ TAOS *taos_connect_imp(const char *ip, const char *user, const char *pass, const
 
   pthread_mutex_init(&pObj->mutex, NULL);
 
-  SSqlObj *pSql = (SSqlObj *)malloc(sizeof(SSqlObj));
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
   if (NULL == pSql) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    rpcClose(pDnodeConn);
     free(pObj);
     return NULL;
   }
 
-  memset(pSql, 0, sizeof(SSqlObj));
-  pSql->pTscObj = pObj;
+  pSql->pTscObj   = pObj;
   pSql->signature = pSql;
+  pSql->maxRetry  = TSDB_MAX_REPLICA;
+  pSql->fp        = fp;
+  pSql->param     = param;
+  pSql->cmd.command = TSDB_SQL_CONNECT;
+
   tsem_init(&pSql->rspSem, 0, 0);
-  tsem_init(&pSql->emptyRspSem, 0, 1);
-  pObj->pSql = pSql;
-  pSql->fp = fp;
-  pSql->param = param;
-  if (taos != NULL) {
-    *taos = pObj;
-  }
 
-  pSql->cmd.command = TSDB_SQL_CONNECT;
   if (TSDB_CODE_SUCCESS != tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    rpcClose(pDnodeConn);
     free(pSql);
     free(pObj);
     return NULL;
   }
 
-  pSql->res.code = tscProcessSql(pSql);
-  if (fp != NULL) {
-    tscTrace("%p DB async connection is opening", pObj);
-    return pObj;
+  if (taos != NULL) {
+    *taos = pObj;
   }
 
-  if (pSql->res.code) {
-    taos_close(pObj);
-    return NULL;
-  }
+  registerSqlObj(pSql);
+  tsInsertHeadSize = sizeof(SMsgDesc) + sizeof(SSubmitMsg);
 
-  tscTrace("%p DB connection is opened", pObj);
-  return pObj;
+  return pSql;
 }
 
-TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
-  if (ip == NULL || (ip != NULL && (strcmp("127.0.0.1", ip) == 0 || strcasecmp("localhost", ip) == 0))) {
-    ip = tsMasterIp;
-  }
-  tscTrace("try to create a connection to %s", ip);
+static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
+  SSqlObj *pSql = (SSqlObj *) tres;
+  assert(pSql != NULL);
+  
+  tsem_post(&pSql->rspSem);
+}
 
-  void *taos = taos_connect_imp(ip, user, pass, db, port, NULL, NULL, NULL);
-  if (taos != NULL) {
-    STscObj *pObj = (STscObj *)taos;
+TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, const char *auth, const char *db,
+                            uint16_t port) {
+  STscObj *pObj = NULL;
+  SSqlObj *pSql = taosConnectImpl(ip, user, pass, auth, db, port, syncConnCallback, NULL, (void **)&pObj);
+  if (pSql != NULL) {
+    pSql->fp = syncConnCallback;
+    pSql->param = pSql;
 
+    tscProcessSql(pSql);
+    tsem_wait(&pSql->rspSem);
+
+    if (pSql->res.code != TSDB_CODE_SUCCESS) {
+      terrno = pSql->res.code;
+      taos_free_result(pSql);
+      taos_close(pObj);
+      return NULL;
+    }
+    
+    tscDebug("%p DB connection is opening, dnodeConn:%p", pObj, pObj->pDnodeConn);
+    taos_free_result(pSql);
+  
     // version compare only requires the first 3 segments of the version string
-    int code = taosCheckVersion(version, taos_get_server_info(taos), 3);
+    int code = taosCheckVersion(version, taos_get_server_info(pObj), 3);
     if (code != 0) {
-      pObj->pSql->res.code = code;
-      taos_close(taos);
+      terrno = code;
+      taos_close(pObj);
       return NULL;
+    } else {
+      return pObj;
     }
   }
 
-  return taos;
+  return NULL;
 }
 
-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) {
-  return taos_connect_imp(ip, user, pass, db, port, fp, param, taos);
-}
+TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
+  tscDebug("try to create a connection to %s:%u, user:%s db:%s", ip, port != 0 ? port : tsServerPort , user, db);
+  if (user == NULL) user = TSDB_DEFAULT_USER;
+  if (pass == NULL) pass = TSDB_DEFAULT_PASS;
 
-void taos_close(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
+  return taos_connect_internal(ip, user, pass, NULL, db, port);
+}
 
-  if (pObj == NULL) return;
-  if (pObj->signature != pObj) return;
+TAOS *taos_connect_auth(const char *ip, const char *user, const char *auth, const char *db, uint16_t port) {
+  tscDebug("try to create a connection to %s:%u by auth, user:%s db:%s", ip, port, user, db);
+  if (user == NULL) user = TSDB_DEFAULT_USER;
+  if (auth == NULL) return NULL;
 
-  if (pObj->pHb != NULL) {
-    tscSetFreeHeatBeat(pObj);
-  } else {
-    tscCloseTscObj(pObj);
-  }
+  return taos_connect_internal(ip, user, NULL, auth, db, port);
 }
 
-int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
-  SSqlRes *pRes = &pSql->res;
+TAOS *taos_connect_c(const char *ip, uint8_t ipLen, const char *user, uint8_t userLen, const char *pass,
+                     uint8_t passLen, const char *db, uint8_t dbLen, uint16_t port) {
+  char ipBuf[TSDB_EP_LEN] = {0};
+  char userBuf[TSDB_USER_LEN] = {0};
+  char passBuf[TSDB_PASSWORD_LEN] = {0};
+  char dbBuf[TSDB_DB_NAME_LEN] = {0};
+  strncpy(ipBuf, ip, MIN(TSDB_EP_LEN - 1, ipLen));
+  strncpy(userBuf, user, MIN(TSDB_USER_LEN - 1, userLen));
+  strncpy(passBuf, pass, MIN(TSDB_PASSWORD_LEN - 1, passLen));
+  strncpy(dbBuf, db, MIN(TSDB_DB_NAME_LEN - 1, dbLen));
+  return taos_connect(ipBuf, userBuf, passBuf, dbBuf, port);
+}
 
-  pRes->numOfRows = 1;
-  pRes->numOfTotal = 0;
-  pRes->numOfTotalInCurrentClause = 0;
+static void asyncConnCallback(void *param, TAOS_RES *tres, int code) {
+  SSqlObj *pSql = (SSqlObj *) tres;
+  assert(pSql != NULL);
+  
+  pSql->fetchFp(pSql->param, tres, code);
+}
 
-  pSql->asyncTblPos = NULL;
-  if (NULL != pSql->pTableHashList) {
-    taosCleanUpHashTable(pSql->pTableHashList);
-    pSql->pTableHashList = NULL;
+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) {
+  SSqlObj* pSql = taosConnectImpl(ip, user, pass, NULL, db, port, asyncConnCallback, param, taos);
+  if (pSql == NULL) {
+    return NULL;
   }
   
-  tscDump("%p pObj:%p, SQL: %s", pSql, pObj, pSql->sqlstr);
-
-  pRes->code = (uint8_t)tsParseSql(pSql, false);
+  pSql->fetchFp = fp;
+  pSql->res.code = tscProcessSql(pSql);
+  tscDebug("%p DB async connection is opening", taos);
+  return taos;
+}
 
-  /*
-   * 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;
+void taos_close(TAOS *taos) {
+  STscObj *pObj = (STscObj *)taos;
 
-  if (pRes->code == TSDB_CODE_SUCCESS) {
-    tscDoQuery(pSql);
+  if (pObj == NULL || pObj->signature != pObj)  {
+    return;
   }
 
-  if (pRes->code == TSDB_CODE_SUCCESS) {
-    tscTrace("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(pObj), pObj);
-  } else {
-    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(pObj), pObj);
+  SSqlObj* pHb = pObj->pHb;
+  if (pHb != NULL && atomic_val_compare_exchange_ptr(&pObj->pHb, pHb, 0) == pHb) {
+    if (pHb->pRpcCtx != NULL) {  // wait for rsp from dnode
+      rpcCancelRequest(pHb->pRpcCtx);
+      pHb->pRpcCtx = NULL;
+    }
+
+    tscDebug("%p HB is freed", pHb);
+    taos_free_result(pHb);
   }
 
-  if (pRes->code != TSDB_CODE_SUCCESS) {
-    tscFreeSqlObjPartial(pSql);
+  int32_t ref = T_REF_DEC(pObj);
+  assert(ref >= 0);
+
+  if (ref > 0) {
+    tscDebug("%p %d remain sqlObjs, not free tscObj and dnodeConn:%p", pObj, ref, pObj->pDnodeConn);
+    return;
   }
 
-  return pRes->code;
+  tscDebug("%p all sqlObj are freed, free tscObj and close dnodeConn:%p", pObj, pObj->pDnodeConn);
+  tscCloseTscObj(pObj);
 }
 
-int taos_query(TAOS *taos, const char *sqlstr) {
+void waitForQueryRsp(void *param, TAOS_RES *tres, int code) {
+  assert(tres != NULL);
+  
+  SSqlObj *pSql = (SSqlObj *) tres;
+  tsem_post(&pSql->rspSem);
+}
+
+static void waitForRetrieveRsp(void *param, TAOS_RES *tres, int numOfRows) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  tsem_post(&pSql->rspSem);
+}
+
+TAOS_RES* taos_query_c(TAOS *taos, const char *sqlstr, uint32_t sqlLen) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return NULL;
   }
-
-  SSqlObj *pSql = pObj->pSql;
-  SSqlRes *pRes = &pSql->res;
-
-  size_t sqlLen = strlen(sqlstr);
-  if (sqlLen > tsMaxSQLStringLen) {
-    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;
+  
+  if (sqlLen > (uint32_t)tsMaxSQLStringLen) {
+    tscError("sql string exceeds max length:%d", tsMaxSQLStringLen);
+    terrno = TSDB_CODE_TSC_INVALID_SQL;
+    return NULL;
   }
 
   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;
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    tscError("failed to malloc sqlObj");
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return NULL;
   }
+  
+  tsem_init(&pSql->rspSem, 0, 0);
+  doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
 
-  pSql->sqlstr = sql;
-  strtolower(pSql->sqlstr, sqlstr);
-  return taos_query_imp(pObj, pSql);
+  tsem_wait(&pSql->rspSem);
+  return pSql; 
 }
 
-TAOS_RES *taos_use_result(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return NULL;
-  }
-
-  return pObj->pSql;
+TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
+  return taos_query_c(taos, sqlstr, (uint32_t)strlen(sqlstr));
 }
 
 int taos_result_precision(TAOS_RES *res) {
@@ -288,27 +341,35 @@ int taos_num_fields(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   if (pSql == NULL || pSql->signature != pSql) return 0;
 
+  int32_t num = 0;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   if (pQueryInfo == NULL) {
-    return 0;
+    return num;
   }
 
-  SFieldInfo *pFieldsInfo = &pQueryInfo->fieldsInfo;
-  return (pFieldsInfo->numOfOutputCols - pFieldsInfo->numOfHiddenCols);
+  size_t numOfCols = tscNumOfFields(pQueryInfo);
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    SFieldSupInfo* pInfo = taosArrayGet(pQueryInfo->fieldsInfo.pSupportInfo, i);
+    if (pInfo->visible) {
+      num++;
+    }
+  }
+  
+  return num;
 }
 
-int taos_field_count(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) return 0;
+int taos_field_count(TAOS_RES *tres) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return taos_num_fields(pObj->pSql);
+  return taos_num_fields(pSql);
 }
 
-int taos_affected_rows(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) return 0;
+int taos_affected_rows(TAOS_RES *tres) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return (pObj->pSql->res.numOfRows);
+  return (int)(pSql->res.numOfRows);
 }
 
 TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
@@ -316,7 +377,16 @@ TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
   if (pSql == NULL || pSql->signature != pSql) return 0;
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  return pQueryInfo->fieldsInfo.pFields;
+  if (pQueryInfo == NULL) {
+    return NULL;
+  }
+  
+  size_t numOfCols = tscNumOfFields(pQueryInfo);
+  if (numOfCols == 0) {
+    return NULL;
+  }
+  
+  return pQueryInfo->fieldsInfo.pFields->pData;
 }
 
 int taos_retrieve(TAOS_RES *res) {
@@ -334,16 +404,15 @@ int taos_retrieve(TAOS_RES *res) {
   }
   tscProcessSql(pSql);
 
-  return pRes->numOfRows;
+  return (int)pRes->numOfRows;
 }
 
 int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   SSqlObj *pSql = (SSqlObj *)res;
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-  STscObj *pObj = pSql->pTscObj;
 
-  if (pRes->qhandle == 0 || pObj->pSql != pSql) {
+  if (pRes->qhandle == 0 || pSql->signature != pSql) {
     *rows = NULL;
     return 0;
   }
@@ -361,292 +430,71 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   }
 
   // secondary merge has handle this situation
-  if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC) {
-    pRes->numOfTotalInCurrentClause += pRes->numOfRows;
+  if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE) {
+    pRes->numOfClauseTotal += pRes->numOfRows;
   }
 
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-//    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i, pQueryInfo->order) +
-//                     pRes->bytes[i] * (1 - pQueryInfo->order.order) * (pRes->numOfRows - 1);
-    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i, pQueryInfo->order);
+  if (pQueryInfo == NULL)
+    return 0;
+
+  assert(0);
+  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i);
   }
 
   *rows = pRes->tsrow;
 
-  return (pQueryInfo->order.order == TSQL_SO_DESC) ? pRes->numOfRows : -pRes->numOfRows;
+  return (int)((pQueryInfo->order.order == TSDB_ORDER_DESC) ? pRes->numOfRows : -pRes->numOfRows);
 }
 
-static void **doSetResultRowData(SSqlObj *pSql) {
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-  
-  assert(pRes->row >= 0 && pRes->row <= pRes->numOfRows);
-  
-  if (pRes->row >= pRes->numOfRows) {  // all the results has returned to invoker
-    tfree(pRes->tsrow);
-    return pRes->tsrow;
-  }
-  
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-
-  int32_t num = 0;
-  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i, pQueryInfo->order) + pRes->bytes[i] * pRes->row;
-
-    // primary key column cannot be null in interval query, no need to check
-    if (i == 0 && pQueryInfo->nAggTimeInterval > 0) {
-      continue;
-    }
-
-    TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-    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
-      if (pRes->buffer[num] == NULL) {
-        pRes->buffer[num] = malloc(pField->bytes + TSDB_NCHAR_SIZE);
-      }
-
-      /* string terminated char for binary data*/
-      memset(pRes->buffer[num], 0, pField->bytes + TSDB_NCHAR_SIZE);
-
-      if (taosUcs4ToMbs(pRes->tsrow[i], pField->bytes, pRes->buffer[num])) {
-        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;
-      }
-      
-      num++;
-    }
+TAOS_ROW taos_fetch_row(TAOS_RES *res) {
+  SSqlObj *pSql = (SSqlObj *)res;
+  if (pSql == NULL || pSql->signature != pSql) {
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return NULL;
   }
-
-  assert(num <= pQueryInfo->fieldsInfo.numOfOutputCols);
   
-  pRes->row++; // index increase one-step
-  return pRes->tsrow;
-}
-
-static bool tscHashRemainDataInSubqueryResultSet(SSqlObj *pSql) {
-  bool     hasData = true;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
-    bool allSubqueryExhausted = true;
-
-    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-      if (pSql->pSubs[i] == NULL) {
-        continue;
-      }
-
-      SSqlRes *pRes1 = &pSql->pSubs[i]->res;
-      SSqlCmd *pCmd1 = &pSql->pSubs[i]->cmd;
-
-      SQueryInfo *    pQueryInfo1 = tscGetQueryInfoDetail(pCmd1, pCmd1->clauseIndex);
-      SMeterMetaInfo *pMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo1, 0);
-
-      assert(pQueryInfo1->numOfTables == 1);
-
-      /*
-       * if the global limitation is not reached, and current result has not exhausted, or next more vnodes are
-       * available, goes on
-       */
-      if (pMetaInfo->vnodeIndex < pMetaInfo->pMetricMeta->numOfVnodes && pRes1->row < pRes1->numOfRows &&
-          (!tscHasReachLimitation(pQueryInfo1, pRes1))) {
-        allSubqueryExhausted = false;
-        break;
-      }
-    }
-
-    hasData = !allSubqueryExhausted;
-  } else {  // otherwise, in case inner join, if any subquery exhausted, query completed.
-    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-      if (pSql->pSubs[i] == 0) {
-        continue;
-      }
-      
-      SSqlRes *   pRes1 = &pSql->pSubs[i]->res;
-      SQueryInfo *pQueryInfo1 = tscGetQueryInfoDetail(&pSql->pSubs[i]->cmd, 0);
-
-      if ((pRes1->row >= pRes1->numOfRows && tscHasReachLimitation(pQueryInfo1, pRes1) &&
-           tscProjectionQueryOnTable(pQueryInfo1)) ||
-          (pRes1->numOfRows == 0)) {
-        hasData = false;
-        break;
-      }
-    }
-  }
-
-  return hasData;
-}
-
-static void **tscBuildResFromSubqueries(SSqlObj *pSql) {
-  SSqlRes *pRes = &pSql->res;
-
-  while (1) {
-    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
-    if (pRes->tsrow == NULL) {
-      pRes->tsrow = calloc(pQueryInfo->exprsInfo.numOfExprs, POINTER_BYTES);
-    }
-
-    bool success = false;
-
-    int32_t numOfTableHasRes = 0;
-    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-      if (pSql->pSubs[i] != 0) {
-        numOfTableHasRes++;
-      }
-    }
-
-    if (numOfTableHasRes >= 2) {  // do merge result
-
-        success = (doSetResultRowData(pSql->pSubs[0]) != NULL) &&
-            (doSetResultRowData(pSql->pSubs[1]) != NULL);
-        //        TSKEY key1 = *(TSKEY *)pRes1->tsrow[0];
-        //        TSKEY key2 = *(TSKEY *)pRes2->tsrow[0];
-        //        printf("first:%" PRId64 ", second:%" PRId64 "\n", key1, key2);
-    } else {  // only one subquery
-      SSqlObj *pSub = pSql->pSubs[0];
-      if (pSub == NULL) {
-        pSub = pSql->pSubs[1];
-      }
-
-      success = (doSetResultRowData(pSub) != NULL);
-    }
-
-    if (success) {  // current row of final output has been built, return to app
-      for (int32_t i = 0; i < pQueryInfo->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];
-      }
-
-      pRes->numOfTotalInCurrentClause++;
-
-      break;
-    } else {  // continue retrieve data from vnode
-      if (!tscHashRemainDataInSubqueryResultSet(pSql)) {
-        tscTrace("%p at least one subquery exhausted, free all other %d subqueries", pSql, pSql->numOfSubs - 1);
-        SSubqueryState *pState = NULL;
-
-        // free all sub sqlobj
-        for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
-          SSqlObj *pChildObj = pSql->pSubs[i];
-          if (pChildObj == NULL) {
-            continue;
-          }
-
-          SJoinSubquerySupporter *pSupporter = (SJoinSubquerySupporter *)pChildObj->param;
-          pState = pSupporter->pState;
-
-          tscDestroyJoinSupporter(pChildObj->param);
-          taos_free_result(pChildObj);
-        }
-
-        free(pState);
-        return NULL;
-      }
-
-      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) {
+  
+  if (pRes->qhandle == 0 ||
+      pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT ||
+      pCmd->command == TSDB_SQL_INSERT) {
     return NULL;
   }
 
-  if (pCmd->command == TSDB_SQL_METRIC_JOIN_RETRIEVE) {
-    tscFetchDatablockFromSubquery(pSql);
-
-    if (pRes->code == TSDB_CODE_SUCCESS) {
-      tscTrace("%p data from all subqueries have been retrieved to client", pSql);
-      return tscBuildResFromSubqueries(pSql);
-    } else {
-      tscTrace("%p retrieve data from subquery failed, code:%d", pSql, pRes->code);
-      return NULL;
-    }
-
-  } else if (pRes->row >= pRes->numOfRows) {
-    /**
-     * NOT a join query
-     *
-     * If the data block of current result set have been consumed already, try fetch next result
-     * data block from virtual node.
-     */
-    tscResetForNextRetrieve(pRes);
-
-    if (pCmd->command < TSDB_SQL_LOCAL) {
-      pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-    }
-
-    tscProcessSql(pSql);  // retrieve data from virtual node
-
-    //if failed to retrieve data from current virtual node, try next one if exists
-    if (hasMoreVnodesToTry(pSql)) {
-      tscTryQueryNextVnode(pSql, NULL);
-    }
-
-    /*
-     * local reducer has handle this case,
-     * so no need to add the pRes->numOfRows for super table query
-     */
-    if (pCmd->command != TSDB_SQL_RETRIEVE_METRIC) {
-      pRes->numOfTotalInCurrentClause += pRes->numOfRows;
-    }
-
-    if (pRes->numOfRows == 0) {
-      return NULL;
-    }
-  }
-
-  return doSetResultRowData(pSql);
-}
+  // set the sql object owner
+  tscSetSqlOwner(pSql);
 
-TAOS_ROW taos_fetch_row(TAOS_RES *res) {
-  SSqlObj *pSql = (SSqlObj *)res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  if (pSql == NULL || pSql->signature != pSql) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return NULL;
+  // current data set are exhausted, fetch more data from node
+  if (pRes->row >= pRes->numOfRows && (pRes->completed != true || hasMoreVnodesToTry(pSql) || hasMoreClauseToTry(pSql)) &&
+      (pCmd->command == TSDB_SQL_RETRIEVE ||
+       pCmd->command == TSDB_SQL_RETRIEVE_LOCALMERGE ||
+       pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE ||
+       pCmd->command == TSDB_SQL_FETCH ||
+       pCmd->command == TSDB_SQL_SHOW ||
+       pCmd->command == TSDB_SQL_SHOW_CREATE_TABLE ||
+       pCmd->command == TSDB_SQL_SHOW_CREATE_DATABASE ||
+       pCmd->command == TSDB_SQL_SELECT ||
+       pCmd->command == TSDB_SQL_DESCRIBE_TABLE ||
+       pCmd->command == TSDB_SQL_SERV_STATUS ||
+       pCmd->command == TSDB_SQL_CURRENT_DB ||
+       pCmd->command == TSDB_SQL_SERV_VERSION ||
+       pCmd->command == TSDB_SQL_CLI_VERSION ||
+       pCmd->command == TSDB_SQL_CURRENT_USER )) {
+    taos_fetch_rows_a(res, waitForRetrieveRsp, pSql->pTscObj);
+    tsem_wait(&pSql->rspSem);
   }
 
-  /*
-   * projection query on super table, access each virtual node sequentially retrieve data from vnode list,
-   * instead of two-stage merge
-   */
-  TAOS_ROW rows = taos_fetch_row_impl(res);
-  if (rows != NULL) {
-    return rows;
-  }
-
-  // current subclause is completed, try the next subclause
-  while (rows == NULL && pCmd->clauseIndex < pCmd->numOfClause - 1) {
-    tscTryQueryNextClause(pSql, NULL);
-    
-    // if the rows is not NULL, return immediately
-    rows = taos_fetch_row_impl(res);
-  }
+  void* data = doSetResultRowData(pSql, true);
 
-  return rows;
+  tscClearSqlOwner(pSql);
+  return data;
 }
 
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
+#if 0
   SSqlObj *pSql = (SSqlObj *)res;
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
@@ -654,13 +502,13 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
   int nRows = 0;
 
   if (pSql == NULL || pSql->signature != pSql) {
-    globalCode = TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
     *rows = NULL;
     return 0;
   }
 
   // projection query on metric, pipeline retrieve data from vnode list,
-  // instead of two-stage mergevnodeProcessMsgFromShell free qhandle
+  // instead of two-stage mergednodeProcessMsgFromShell free qhandle
   nRows = taos_fetch_block_impl(res, rows);
 
   // current subclause is completed, try the next subclause
@@ -670,22 +518,26 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
     pSql->cmd.command = pQueryInfo->command;
     pCmd->clauseIndex++;
 
-    pRes->numOfTotal += pRes->numOfTotalInCurrentClause;
-    pRes->numOfTotalInCurrentClause = 0;
+    pRes->numOfTotal += pRes->numOfClauseTotal;
+    pRes->numOfClauseTotal = 0;
     pRes->rspType = 0;
 
     pSql->numOfSubs = 0;
-    tfree(pSql->pSubs);
+    taosTFree(pSql->pSubs);
 
     assert(pSql->fp == NULL);
 
-    tscTrace("%p try data in the next subclause:%d, total subclause:%d", pSql, pCmd->clauseIndex, pCmd->numOfClause);
+    tscDebug("%p try data in the next subclause:%d, total subclause:%d", pSql, pCmd->clauseIndex, pCmd->numOfClause);
     tscProcessSql(pSql);
 
     nRows = taos_fetch_block_impl(res, rows);
   }
 
   return nRows;
+#endif
+
+  (*rows) = taos_fetch_row(res);
+  return ((*rows) != NULL)? 1:0;
 }
 
 int taos_select_db(TAOS *taos, const char *db) {
@@ -693,182 +545,116 @@ int taos_select_db(TAOS *taos, const char *db) {
 
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return TSDB_CODE_TSC_DISCONNECTED;
   }
 
   snprintf(sql, tListLen(sql), "use %s", db);
-  return taos_query(taos, sql);
+  SSqlObj* pSql = taos_query(taos, sql);
+  int32_t code = pSql->res.code;
+  taos_free_result(pSql);
+  
+  return code;
 }
 
-void taos_free_result_imp(TAOS_RES* res, int keepCmd) {
-  if (res == NULL) return;
-
-  SSqlObj *pSql = (SSqlObj *)res;
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  tscTrace("%p start to free result", pSql);
-
-  if (pSql->signature != pSql) return;
+// send free message to vnode to free qhandle and corresponding resources in vnode
+static UNUSED_FUNC bool tscKillQueryInDnode(SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
 
   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);
-    if (pSql->fp != NULL) {
-      pSql->thandle = NULL;
-      tscFreeSqlObj(pSql);
-      tscTrace("%p Async SqlObj is freed by app", pSql);
-    } else if (keepCmd) {
-      tscFreeSqlResult(pSql);
-    } else {
-      tscFreeSqlObjPartial(pSql);
-    }
-    return;
+    return true;
   }
 
-  // set freeFlag to 1 in retrieve message if there are un-retrieved results
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  if (pQueryInfo == NULL) {
-    tscFreeSqlObjPartial(pSql);
-    return;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if ((pQueryInfo == NULL) || tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
+    return true;
   }
 
-  pQueryInfo->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  tscRemoveFromSqlList(pSql);
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
-  /*
-   * case 1. Partial data have been retrieved from vnodes, but not all data has been retrieved yet.
-   *         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 connection.
-   * case 3. If the query process is cancelled by user in stable query, tscProcessSql should not be called
-   *         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 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 && pMeterMetaInfo->pMeterMeta != NULL))) {
+  int32_t cmd = pCmd->command;
+  if (pRes->code == TSDB_CODE_SUCCESS && pRes->completed == false && pSql->pStream == NULL && (pTableMetaInfo->pTableMeta != NULL) &&
+      (cmd == TSDB_SQL_SELECT ||
+       cmd == TSDB_SQL_SHOW ||
+       cmd == TSDB_SQL_RETRIEVE ||
+       cmd == TSDB_SQL_FETCH)) {
+    pQueryInfo->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-
-    tscTrace("%p code:%d, numOfRows:%d, command:%d", pSql, pRes->code, pRes->numOfRows, pCmd->command);
-    
-    void *fp = pSql->fp;
-    if (fp != NULL) {
-      pSql->freed = 1;
-    }
+    tscDebug("%p send msg to dnode to free qhandle ASAP before free sqlObj, command:%s", pSql, sqlCmd[pCmd->command]);
 
     tscProcessSql(pSql);
-
-    /*
-     *  If release connection msg is sent to vnode, the corresponding SqlObj for async query can not be freed instantly,
-     *  since its free operation is delegated to callback function, which is tscProcessMsgFromServer.
-     */
-    if (fp == NULL) {
-      /*
-       * fp may be released here, so we cannot use the pSql->fp
-       *
-       * 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;
-      if (keepCmd) {
-        tscFreeSqlResult(pSql);
-        tscTrace("%p sql result is freed by app while sql command is kept", pSql);
-      } else {
-        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));
-      tscFreeSqlObj(pSql);
-      tscTrace("%p Async sql result is freed by app", pSql);
-    } else if (keepCmd) {
-      tscFreeSqlResult(pSql);
-      tscTrace("%p sql result is freed while sql command is kept", pSql);
-    } else {
-      tscFreeSqlObjPartial(pSql);
-      tscTrace("%p sql result is freed", pSql);
-    }
+    return false;
   }
-}
 
-void taos_free_result(TAOS_RES *res) {
-  taos_free_result_imp(res, 0);
+  return true;
 }
 
-int taos_errno(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  int      code;
-
-  if (pObj == NULL || pObj->signature != pObj) return globalCode;
-
-  if ((int8_t)(pObj->pSql->res.code) == -1)
-    code = TSDB_CODE_OTHERS;
-  else
-    code = pObj->pSql->res.code;
+void taos_free_result(TAOS_RES *res) {
+  SSqlObj* pSql = (SSqlObj*) res;
+  if (pSql == NULL || pSql->signature != pSql) {
+    tscError("%p already released sqlObj", res);
+    return;
+  }
 
-  return code;
+  bool freeNow = tscKillQueryInDnode(pSql);
+  if (freeNow) {
+    tscDebug("%p free sqlObj in cache", pSql);
+    SSqlObj** p = pSql->self;
+    taosCacheRelease(tscObjCache, (void**) &p, true);
+  }
 }
 
-static bool validErrorCode(int32_t code) {
-  return code >= TSDB_CODE_SUCCESS && code < TSDB_CODE_MAX_ERROR_CODE;
+int taos_errno(TAOS_RES *tres) {
+  SSqlObj *pSql = (SSqlObj *) tres;
+  if (pSql == NULL || pSql->signature != pSql) {
+    return terrno;
+  }
+
+  return pSql->res.code;
 }
 
 /*
- * In case of invalid sql error, additional information is attached to explain
+ * In case of invalid sql/sql syntax error, additional information is attached to explain
  * why the sql is invalid
  */
-static bool hasAdditionalErrorInfo(int32_t code, SSqlCmd* pCmd) {
-  if (code != TSDB_CODE_INVALID_SQL) {
+static bool hasAdditionalErrorInfo(int32_t code, SSqlCmd *pCmd) {
+  if (code != TSDB_CODE_TSC_INVALID_SQL
+      && code != TSDB_CODE_TSC_SQL_SYNTAX_ERROR) {
     return false;
   }
 
   size_t len = strlen(pCmd->payload);
-  
-  char* z = NULL;
+
+  char *z = NULL;
   if (len > 0) {
-    z = strstr (pCmd->payload, "invalid SQL");
+      z = strstr(pCmd->payload, "invalid SQL");
+      if (z == NULL) {
+        z = strstr(pCmd->payload, "syntax error");
+      }
   }
-  
   return z != NULL;
 }
 
-char *taos_errstr(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  uint8_t  code;
+// todo should not be used in async model
+char *taos_errstr(TAOS_RES *tres) {
+  SSqlObj *pSql = (SSqlObj *) tres;
 
-  if (pObj == NULL || pObj->signature != pObj) return tsError[globalCode];
-
-  SSqlObj* pSql = pObj->pSql;
-  
-  if (validErrorCode(pSql->res.code)) {
-    code = pSql->res.code;
-  } else {
-    code = TSDB_CODE_OTHERS;  //unknown error
+  if (pSql == NULL || pSql->signature != pSql) {
+    return (char*) tstrerror(terrno);
   }
 
-  if (hasAdditionalErrorInfo(code, &pSql->cmd)) {
+  if (hasAdditionalErrorInfo(pSql->res.code, &pSql->cmd)) {
     return pSql->cmd.payload;
   } else {
-    return tsError[code];
+    return (char*)tstrerror(pSql->res.code);
   }
 }
 
 void taos_config(int debug, char *log_path) {
   uDebugFlag = debug;
-  strcpy(logDir, log_path);
+  tstrncpy(tsLogDir, log_path, TSDB_FILENAME_LEN);
 }
 
 char *taos_get_server_info(TAOS *taos) {
@@ -879,36 +665,44 @@ char *taos_get_server_info(TAOS *taos) {
   return pObj->sversion;
 }
 
+int* taos_fetch_lengths(TAOS_RES *res) {
+  SSqlObj* pSql = (SSqlObj* ) res;
+  if (pSql == NULL || pSql->signature != pSql) {
+    return NULL;
+  }
+  
+  return pSql->res.length;
+}
+
 char *taos_get_client_info() { return version; }
 
 void taos_stop_query(TAOS_RES *res) {
-  if (res == NULL) return;
-
   SSqlObj *pSql = (SSqlObj *)res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  if (pSql->signature != pSql) return;
-  tscTrace("%p start to cancel query", res);
+  if (pSql == NULL || pSql->signature != pSql) {
+    return;
+  }
 
-  pSql->res.code = TSDB_CODE_QUERY_CANCELLED;
+  tscDebug("%p start to cancel query", res);
+  SSqlCmd *pCmd = &pSql->cmd;
 
+  // TODO there are multi-thread problem.
+  // It may have been released by the other thread already.
+  // The ref count may fix this problem.
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  if (tscIsTwoStageMergeMetricQuery(pQueryInfo, 0)) {
-    tscKillMetricQuery(pSql);
-    return;
-  }
 
-  if (pSql->cmd.command >= TSDB_SQL_LOCAL) {
-    return;
-  }
+  // set the error code for master pSqlObj firstly
+  pSql->res.code = TSDB_CODE_TSC_QUERY_CANCELLED;
 
-  if (pSql->thandle == NULL) {
-    tscTrace("%p no connection, abort cancel", res);
-    return;
+  if (tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
+    assert(pSql->pRpcCtx == NULL);
+    tscKillSTableQuery(pSql);
+  } else {
+    if (pSql->cmd.command < TSDB_SQL_LOCAL) {
+      rpcCancelRequest(pSql->pRpcCtx);
+    }
   }
 
-  taosStopRpcConn(pSql->thandle);
-  tscTrace("%p query is cancelled", res);
+  tscDebug("%p query is cancelled", res);
 }
 
 int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields) {
@@ -954,14 +748,14 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
 
       case TSDB_DATA_TYPE_BINARY:
       case TSDB_DATA_TYPE_NCHAR: {
-          size_t xlen = 0;
-          for (xlen = 0; xlen <= fields[i].bytes; xlen++) {
-            char c = ((char*)row[i])[xlen];
-            if (c == 0) break;
-            str[len++] = c;
-          }
-          str[len] = 0;
-        } break;
+        size_t xlen = 0;
+        for (xlen = 0; xlen < fields[i].bytes - VARSTR_HEADER_SIZE; xlen++) {
+          char c = ((char *)row[i])[xlen];
+          if (c == 0) break;
+          str[len++] = c;
+        }
+        str[len] = 0;
+      } break;
 
       case TSDB_DATA_TYPE_TIMESTAMP:
         len += sprintf(str + len, "%" PRId64, *((int64_t *)row[i]));
@@ -977,77 +771,102 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
   return len;
 }
 
+static void asyncCallback(void *param, TAOS_RES *tres, int code) {
+  assert(param != NULL);
+  SSqlObj *pSql = ((SSqlObj *)param);
+  pSql->res.code = code;
+  tsem_post(&pSql->rspSem);
+}
+
 int taos_validate_sql(TAOS *taos, const char *sql) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return TSDB_CODE_TSC_DISCONNECTED;
   }
 
-  SSqlObj *pSql = pObj->pSql;
-  SSqlRes *pRes = &pSql->res;
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
 
-  pRes->numOfRows = 1;
+  pSql->pTscObj = taos;
+  pSql->signature = pSql;
+
+  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+  
   pRes->numOfTotal = 0;
-  pRes->numOfTotalInCurrentClause = 0;
+  pRes->numOfClauseTotal = 0;
+
 
-  tscTrace("%p Valid SQL: %s pObj:%p", pSql, sql, pObj);
+  tscDebug("%p Valid SQL: %s pObj:%p", pSql, sql, pObj);
 
-  int32_t sqlLen = strlen(sql);
+  int32_t sqlLen = (int32_t)strlen(sql);
   if (sqlLen > tsMaxSQLStringLen) {
     tscError("%p sql too long", pSql);
-    pRes->code = TSDB_CODE_INVALID_SQL;
+    pRes->code = TSDB_CODE_TSC_INVALID_SQL;
+    taosTFree(pSql);
     return pRes->code;
   }
 
   pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
   if (pSql->sqlstr == NULL) {
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
     tscError("%p failed to malloc sql string buffer", pSql);
-    tscTrace("%p Valid SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+    tscDebug("%p Valid SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+    taosTFree(pSql);
     return pRes->code;
   }
 
   strtolower(pSql->sqlstr, sql);
 
-  pSql->asyncTblPos = NULL;
-  if (NULL != pSql->pTableHashList) {
-    taosCleanUpHashTable(pSql->pTableHashList);
-    pSql->pTableHashList = NULL;
+  pCmd->curSql = NULL;
+  if (NULL != pCmd->pTableList) {
+    taosHashCleanup(pCmd->pTableList);
+    pCmd->pTableList = NULL;
   }
 
-  pRes->code = (uint8_t)tsParseSql(pSql, false);
-  int code = pRes->code;
+  pSql->fp = asyncCallback;
+  pSql->fetchFp = asyncCallback;
+  pSql->param = pSql;
+  int code = tsParseSql(pSql, true);
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    tsem_wait(&pSql->rspSem);
+    code = pSql->res.code;
+  }
 
-  tscTrace("%p Valid SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
-  taos_free_result(pSql);
+  if (code != TSDB_CODE_SUCCESS) {
+    tscDebug("%p Valid SQL result:%d, %s pObj:%p", pSql, code, taos_errstr(taos), pObj);
+  }
 
+  taos_free_result(pSql);
   return code;
 }
 
 static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t tblListLen) {
   // must before clean the sqlcmd object
-  tscCleanSqlCmd(&pSql->cmd);
+  tscResetSqlCmdObj(&pSql->cmd, false);
 
   SSqlCmd *pCmd = &pSql->cmd;
 
   pCmd->command = TSDB_SQL_MULTI_META;
   pCmd->count = 0;
 
-  int   code = TSDB_CODE_INVALID_METER_ID;
+  int   code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
   char *str = (char *)tblNameList;
 
-  SQueryInfo *pQueryInfo = NULL;
-  tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex, &pQueryInfo);
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetailSafely(pCmd, pCmd->clauseIndex);
+  if (pQueryInfo == NULL) {
+    pSql->res.code = terrno;
+    return terrno;
+  }
 
-  SMeterMetaInfo *pMeterMetaInfo = tscAddEmptyMeterMetaInfo(pQueryInfo);
+  STableMetaInfo *pTableMetaInfo = tscAddEmptyMetaInfo(pQueryInfo);
 
   if ((code = tscAllocPayload(pCmd, tblListLen + 16)) != TSDB_CODE_SUCCESS) {
     return code;
   }
 
   char *nextStr;
-  char  tblName[TSDB_METER_ID_LEN];
+  char  tblName[TSDB_TABLE_FNAME_LEN];
   int   payloadLen = 0;
   char *pMsg = pCmd->payload;
   while (1) {
@@ -1057,38 +876,36 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
     }
 
     memcpy(tblName, str, nextStr - str);
-    int32_t len = nextStr - str;
+    int32_t len = (int32_t)(nextStr - str);
     tblName[len] = '\0';
 
     str = nextStr + 1;
+    len = (int32_t)strtrim(tblName);
 
-    strtrim(tblName);
-    len = (uint32_t)strlen(tblName);
-
-    SSQLToken sToken = {.n = len, .type = TK_ID, .z = tblName};
+    SStrToken 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;
+      code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
       sprintf(pCmd->payload, "table name is invalid");
       return code;
     }
 
-    if ((code = setMeterID(pMeterMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
+    if ((code = tscSetTableFullName(pTableMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
       return code;
     }
 
     if (++pCmd->count > TSDB_MULTI_METERMETA_MAX_NUM) {
-      code = TSDB_CODE_INVALID_METER_ID;
+      code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
       sprintf(pCmd->payload, "tables over the max number");
       return code;
     }
 
-    if (payloadLen + strlen(pMeterMetaInfo->name) + 128 >= pCmd->allocSize) {
+    if (payloadLen + strlen(pTableMetaInfo->name) + 128 >= pCmd->allocSize) {
       char *pNewMem = realloc(pCmd->payload, pCmd->allocSize + tblListLen);
       if (pNewMem == NULL) {
-        code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+        code = TSDB_CODE_TSC_OUT_OF_MEMORY;
         sprintf(pCmd->payload, "failed to allocate memory");
         return code;
       }
@@ -1098,7 +915,7 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
       pMsg = pCmd->payload;
     }
 
-    payloadLen += sprintf(pMsg + payloadLen, "%s,", pMeterMetaInfo->name);
+    payloadLen += sprintf(pMsg + payloadLen, "%s,", pTableMetaInfo->name);
   }
 
   *(pMsg + payloadLen) = '\0';
@@ -1112,37 +929,39 @@ int taos_load_table_info(TAOS *taos, const char *tableNameList) {
 
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return TSDB_CODE_TSC_DISCONNECTED;
   }
 
-  SSqlObj *pSql = pObj->pSql;
-  SSqlRes *pRes = &pSql->res;
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  pSql->pTscObj = taos;
+  pSql->signature = pSql;
 
-  pRes->numOfTotal = 0;  // the number of getting table meta from server
-  pRes->numOfTotalInCurrentClause = 0;
+  SSqlRes *pRes = &pSql->res;
 
   pRes->code = 0;
+  pRes->numOfTotal = 0;  // the number of getting table meta from server
+  pRes->numOfClauseTotal = 0;
 
   assert(pSql->fp == NULL);
-  tscTrace("%p tableNameList: %s pObj:%p", pSql, tableNameList, pObj);
+  tscDebug("%p tableNameList: %s pObj:%p", pSql, tableNameList, pObj);
 
-  int32_t tblListLen = strlen(tableNameList);
+  int32_t tblListLen = (int32_t)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;
+    tscFreeSqlObj(pSql);
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   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;
+    tscFreeSqlObj(pSql);
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
   strtolower(str, tableNameList);
-  pRes->code = (uint8_t)tscParseTblNameList(pSql, str, tblListLen);
+  int32_t 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.
@@ -1150,19 +969,19 @@ int taos_load_table_info(TAOS *taos, const char *tableNameList) {
    * 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;
+  if (code != TSDB_CODE_SUCCESS) {
+    tscFreeSqlObj(pSql);
+    return 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);
+  tscDebug("%p load multi table meta result:%d %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
+  if ((code = pRes->code) != TSDB_CODE_SUCCESS) {
+    tscFreeSqlObj(pSql);
   }
 
-  return pRes->code;
+  return code;
 }
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 9fc9706dd9fb87179fabcc484f7ae56afb231914..81b8cf7359a93764551cc4765efebc19be4d62ad 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -13,16 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <tschemautil.h>
 #include "os.h"
-#include "tlog.h"
-#include "tscSQLParser.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tutil.h"
-
 #include "taosmsg.h"
+#include "tscLog.h"
 #include "tscUtil.h"
+#include "tsched.h"
+#include "tcache.h"
 #include "tsclient.h"
+#include "ttimer.h"
+#include "tutil.h"
 
 #include "tscProfile.h"
 
@@ -36,7 +36,7 @@ static int64_t getDelayValueAfterTimewindowClosed(SSqlStream* pStream, int64_t l
 }
 
 static bool isProjectStream(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
     SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr->functionId != TSDB_FUNC_PRJ) {
       return false;
@@ -46,22 +46,23 @@ static bool isProjectStream(SQueryInfo* pQueryInfo) {
   return true;
 }
 
-static int64_t tscGetRetryDelayTime(int64_t slidingTime, int16_t prec) {
-  float retryRangeFactor = 0.3;
-
-  // change to ms
-  if (prec == TSDB_TIME_PRECISION_MICRO) {
-    slidingTime = slidingTime / 1000;
-  }
-
-  int64_t retryDelta = (int64_t)tsStreamCompRetryDelay * retryRangeFactor;
+static int64_t tscGetRetryDelayTime(SSqlStream* pStream, int64_t slidingTime, int16_t prec) {
+  float retryRangeFactor = 0.3f;
+  int64_t retryDelta = (int64_t)(tsStreamCompRetryDelay * retryRangeFactor);
   retryDelta = ((rand() % retryDelta) + tsStreamCompRetryDelay) * 1000L;
 
-  if (slidingTime < retryDelta) {
-    return slidingTime;
-  } else {
-    return retryDelta;
+  if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
+    // change to ms
+    if (prec == TSDB_TIME_PRECISION_MICRO) {
+      slidingTime = slidingTime / 1000;
+    }
+
+    if (slidingTime < retryDelta) {
+      return slidingTime;
+    }
   }
+  
+  return retryDelta;
 }
 
 static void tscProcessStreamLaunchQuery(SSchedMsg *pMsg) {
@@ -69,38 +70,33 @@ static void tscProcessStreamLaunchQuery(SSchedMsg *pMsg) {
   SSqlObj *   pSql = pStream->pSql;
 
   pSql->fp = tscProcessStreamQueryCallback;
+  pSql->fetchFp = tscProcessStreamQueryCallback;
   pSql->param = pStream;
+  pSql->res.completed = false;
   
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
-  int code = tscGetMeterMeta(pSql, pMeterMetaInfo);
+  int code = tscGetTableMeta(pSql, pTableMetaInfo);
   pSql->res.code = code;
 
-  if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
-
-  if (code == 0 && UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    code = tscGetMetricMeta(pSql, 0);
+  if (code == 0 && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    code = tscGetSTableVgroupInfo(pSql, 0);
     pSql->res.code = code;
-
-    if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
   }
 
-  tscTansformSQLFunctionForSTableQuery(pQueryInfo);
-
   // failed to get meter/metric meta, retry in 10sec.
   if (code != TSDB_CODE_SUCCESS) {
-    int64_t retryDelayTime = tscGetRetryDelayTime(pStream->slidingTime, pStream->precision);
-    tscError("%p stream:%p,get metermeta failed, retry in %" PRId64 "ms", pStream->pSql, pStream, retryDelayTime);
-  
+    int64_t retryDelayTime = tscGetRetryDelayTime(pStream, pStream->interval.sliding, pStream->precision);
+    tscDebug("%p stream:%p,get metermeta failed, retry in %" PRId64 "ms", pStream->pSql, pStream, retryDelayTime);
     tscSetRetryTimer(pStream, pSql, retryDelayTime);
-    return;
-  }
-
-  tscTrace("%p stream:%p start stream query on:%s", pSql, pStream, pMeterMetaInfo->name);
-  tscProcessSql(pStream->pSql);
 
-  tscIncStreamExecutionCount(pStream);
+  } else {
+    tscTansformSQLFuncForSTableQuery(pQueryInfo);
+    tscDebug("%p stream:%p start stream query on:%s", pSql, pStream, pTableMetaInfo->name);
+    tscDoQuery(pStream->pSql);
+    tscIncStreamExecutionCount(pStream);
+  }
 }
 
 static void tscProcessStreamTimer(void *handle, void *tmrId) {
@@ -112,26 +108,50 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
   pStream->numOfRes = 0;  // reset the numOfRes.
   SSqlObj *pSql = pStream->pSql;
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  tscTrace("%p add into timer", pSql);
+  tscDebug("%p add into timer", pSql);
 
-  if (isProjectStream(pQueryInfo)) {
+  if (pStream->isProject) {
     /*
-     * pQueryInfo->etime, which is the start time, does not change in case of
+     * pQueryInfo->window.ekey, which is the start time, does not change in case of
      * repeat first execution, once the first execution failed.
      */
-    pQueryInfo->stime = pStream->stime;  // start time
+    pQueryInfo->window.skey = pStream->stime;  // start time
 
-    pQueryInfo->etime = taosGetTimestamp(pStream->precision);  // end time
-    if (pQueryInfo->etime > pStream->etime) {
-      pQueryInfo->etime = pStream->etime;
+    pQueryInfo->window.ekey = taosGetTimestamp(pStream->precision);  // end time
+    if (pQueryInfo->window.ekey > pStream->etime) {
+      pQueryInfo->window.ekey = pStream->etime;
     }
   } else {
-    pQueryInfo->stime = pStream->stime - pStream->interval;
-    pQueryInfo->etime = pStream->stime - 1;
+    pQueryInfo->window.skey = pStream->stime;
+    int64_t etime = taosGetTimestamp(pStream->precision);
+    // delay to wait all data in last time window
+    if (pStream->precision == TSDB_TIME_PRECISION_MICRO) {
+      etime -= tsMaxStreamComputDelay * 1000l;
+    } else {
+      etime -= tsMaxStreamComputDelay;
+    }
+    if (etime > pStream->etime) {
+      etime = pStream->etime;
+    } else if (pStream->interval.intervalUnit != 'y' && pStream->interval.intervalUnit != 'n') {
+      etime = pStream->stime + (etime - pStream->stime) / pStream->interval.interval * pStream->interval.interval;
+    } else {
+      etime = taosTimeTruncate(etime, &pStream->interval, pStream->precision);
+    }
+    pQueryInfo->window.ekey = etime;
+    if (pQueryInfo->window.skey >= pQueryInfo->window.ekey) {
+      int64_t timer = pStream->interval.sliding;
+      if (pStream->interval.intervalUnit == 'y' || pStream->interval.intervalUnit == 'n') {
+        timer = 86400 * 1000l;
+      } else if (pStream->precision == TSDB_TIME_PRECISION_MICRO) {
+        timer /= 1000l;
+      }
+      tscSetRetryTimer(pStream, pSql, timer);
+      return;
+    }
   }
 
   // launch stream computing in a new thread
-  SSchedMsg schedMsg;
+  SSchedMsg schedMsg = { 0 };
   schedMsg.fp = tscProcessStreamLaunchQuery;
   schedMsg.ahandle = pStream;
   schedMsg.thandle = (void *)1;
@@ -142,12 +162,13 @@ static void tscProcessStreamTimer(void *handle, void *tmrId) {
 static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOfRows) {
   SSqlStream *pStream = (SSqlStream *)param;
   if (tres == NULL || numOfRows < 0) {
-    int64_t retryDelay = tscGetRetryDelayTime(pStream->slidingTime, pStream->precision);
-    tscError("%p stream:%p, query data failed, code:%d, retry in %" PRId64 "ms", pStream->pSql, pStream, numOfRows,
+    int64_t retryDelay = tscGetRetryDelayTime(pStream, pStream->interval.sliding, pStream->precision);
+    tscError("%p stream:%p, query data failed, code:0x%08x, retry in %" PRId64 "ms", pStream->pSql, pStream, numOfRows,
              retryDelay);
 
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(&pStream->pSql->cmd, 0, 0);
-    tscClearMeterMetaInfo(pMeterMetaInfo, true);
+    STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pStream->pSql->cmd, 0, 0);
+    taosCacheRelease(tscMetaCache, (void**)&(pTableMetaInfo->pTableMeta), true);
+    taosTFree(pTableMetaInfo->vgroupList);
   
     tscSetRetryTimer(pStream, pStream->pSql, retryDelay);
     return;
@@ -156,121 +177,113 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf
   taos_fetch_rows_a(tres, tscProcessStreamRetrieveResult, param);
 }
 
-static void tscSetTimestampForRes(SSqlStream *pStream, SSqlObj *pSql) {
-  SSqlRes *pRes = &pSql->res;
+// no need to be called as this is alreay done in the query
+static void tscStreamFillTimeGap(SSqlStream* pStream, TSKEY ts) {
+#if 0
+  SSqlObj *   pSql = pStream->pSql;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  
+  if (pQueryInfo->fillType != TSDB_FILL_SET_VALUE && pQueryInfo->fillType != TSDB_FILL_NULL) {
+    return;
+  }
 
-  int64_t  timestamp = *(int64_t *)pRes->data;
-  int64_t actualTimestamp = pStream->stime - pStream->interval;
+  SSqlRes *pRes = &pSql->res;
+  /* failed to retrieve any result in this retrieve */
+  pSql->res.numOfRows = 1;
+  void *row[TSDB_MAX_COLUMNS] = {0};
+  char  tmpRes[TSDB_MAX_BYTES_PER_ROW] = {0};
+  void *oldPtr = pSql->res.data;
+  pSql->res.data = tmpRes;
+  int32_t rowNum = 0;
+
+  while (pStream->stime + pStream->slidingTime < ts) {
+    pStream->stime += pStream->slidingTime;
+    *(TSKEY*)row[0] =  pStream->stime;
+    for (int32_t i = 1; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+      int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, i);
+      TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+      assignVal(pSql->res.data + offset, (char *)(&pQueryInfo->fillVal[i]), pField->bytes, pField->type);
+      row[i] = pSql->res.data + offset;
+    }
+    (*pStream->fp)(pStream->param, pSql, row);
+    ++rowNum;
+  }
 
-  if (timestamp != actualTimestamp) {
-    // reset the timestamp of each agg point by using start time of each interval
-    *((int64_t *)pRes->data) = actualTimestamp;
-    tscWarn("%p stream:%p, timestamp of points is:%" PRId64 ", reset to %" PRId64 "", pSql, pStream, timestamp, actualTimestamp);
+  if (rowNum > 0) {
+    tscDebug("%p stream:%p %d rows padded", pSql, pStream, rowNum);
   }
+
+  pRes->numOfRows = 0;
+  pRes->data = oldPtr;
+#endif
 }
 
 static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOfRows) {
   SSqlStream *    pStream = (SSqlStream *)param;
   SSqlObj *       pSql = (SSqlObj *)res;
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 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 %" PRId64 "ms", pSql, pStream, numOfRows, retryDelayTime);
-    tscClearMeterMetaInfo(pMeterMetaInfo, true);
+    int64_t retryDelayTime = tscGetRetryDelayTime(pStream, pStream->interval.sliding, pStream->precision);
+    tscError("%p stream:%p, retrieve data failed, code:0x%08x, retry in %" PRId64 "ms", pSql, pStream, numOfRows, retryDelayTime);
   
     tscSetRetryTimer(pStream, pStream->pSql, retryDelayTime);
     return;
   }
 
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
+
   if (numOfRows > 0) { // when reaching here the first execution of stream computing is successful.
-    pStream->numOfRes += numOfRows;
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-    
     for(int32_t i = 0; i < numOfRows; ++i) {
       TAOS_ROW row = taos_fetch_row(res);
-      tscTrace("%p stream:%p fetch result", pSql, pStream);
-      if (isProjectStream(pQueryInfo)) {
+      if (row != NULL) {
+        tscDebug("%p stream:%p fetch result", pSql, pStream);
+        tscStreamFillTimeGap(pStream, *(TSKEY*)row[0]);
         pStream->stime = *(TSKEY *)row[0];
-      } else {
-        tscSetTimestampForRes(pStream, pSql);
+        // user callback function
+        (*pStream->fp)(pStream->param, res, row);
+        pStream->numOfRes++;
       }
-
-      // user callback function
-      (*pStream->fp)(pStream->param, res, row);
     }
 
+    if (!pStream->isProject) {
+      pStream->stime = taosTimeAdd(pStream->stime, pStream->interval.sliding, pStream->interval.slidingUnit, pStream->precision);
+    }
     // actually only one row is returned. this following is not necessary
     taos_fetch_rows_a(res, tscProcessStreamRetrieveResult, pStream);
   } else {  // numOfRows == 0, all data has been retrieved
     pStream->useconds += pSql->res.useconds;
-
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-    
     if (pStream->numOfRes == 0) {
-      if (pQueryInfo->interpoType == TSDB_INTERPO_SET_VALUE || pQueryInfo->interpoType == TSDB_INTERPO_NULL) {
-        SSqlRes *pRes = &pSql->res;
-
-        /* failed to retrieve any result in this retrieve */
-        pSql->res.numOfRows = 1;
-        void *row[TSDB_MAX_COLUMNS] = {0};
-        char  tmpRes[TSDB_MAX_BYTES_PER_ROW] = {0};
-
-        void *oldPtr = pSql->res.data;
-        pSql->res.data = tmpRes;
-  
-        for (int32_t i = 1; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-          int16_t     offset = tscFieldInfoGetOffset(pQueryInfo, i);
-          TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
-
-          assignVal(pSql->res.data + offset, (char *)(&pQueryInfo->defaultVal[i]), pField->bytes, pField->type);
-          row[i] = pSql->res.data + offset;
-        }
-
-        tscSetTimestampForRes(pStream, pSql);
-        row[0] = pRes->data;
-
-        //            char result[512] = {0};
-        //            taos_print_row(result, row, pQueryInfo->fieldsInfo.pFields, pQueryInfo->fieldsInfo.numOfOutputCols);
-        //            tscPrint("%p stream:%p query result: %s", pSql, pStream, result);
-        tscTrace("%p stream:%p fetch result", pSql, pStream);
-
-        // user callback function
-        (*pStream->fp)(pStream->param, res, row);
-
-        pRes->numOfRows = 0;
-        pRes->data = oldPtr;
-      } else if (isProjectStream(pQueryInfo)) {
+      if (pStream->isProject) {
         /* no resuls in the query range, retry */
         // todo set retry dynamic time
         int32_t retry = tsProjectExecInterval;
-        tscError("%p stream:%p, retrieve no data, code:%d, retry in %" PRId64 "ms", pSql, pStream, numOfRows, retry);
+        tscError("%p stream:%p, retrieve no data, code:0x%08x, retry in %" PRId32 "ms", pSql, pStream, numOfRows, retry);
 
-        tscClearSqlMetaInfoForce(&(pStream->pSql->cmd));
-        
         tscSetRetryTimer(pStream, pStream->pSql, retry);
         return;
       }
-    } else {
-      if (isProjectStream(pQueryInfo)) {
-        pStream->stime += 1;
-      }
+    } else if (pStream->isProject) {
+      pStream->stime += 1;
     }
 
-    tscTrace("%p stream:%p, query on:%s, fetch result completed, fetched rows:%d", pSql, pStream, pMeterMetaInfo->name,
+    tscDebug("%p stream:%p, query on:%s, fetch result completed, fetched rows:%" PRId64, pSql, pStream, pTableMetaInfo->name,
              pStream->numOfRes);
 
     // release the metric/meter meta information reference, so data in cache can be updated
-    tscClearMeterMetaInfo(pMeterMetaInfo, false);
+
+    taosCacheRelease(tscMetaCache, (void**)&(pTableMetaInfo->pTableMeta), false);
+    tscFreeSqlResult(pSql);
+    taosTFree(pSql->pSubs);
+    pSql->numOfSubs = 0;
+    taosTFree(pTableMetaInfo->vgroupList);
     tscSetNextLaunchTimer(pStream, pSql);
   }
 }
 
 static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer) {
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   int64_t delay = getDelayValueAfterTimewindowClosed(pStream, timer);
   
-  if (isProjectStream(pQueryInfo)) {
+  if (pStream->isProject) {
     int64_t now = taosGetTimestamp(pStream->precision);
     int64_t etime = now > pStream->etime ? pStream->etime : now;
 
@@ -278,7 +291,7 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer)
       /*
        * current time window will be closed, since it too early to exceed the maxRetentWindow value
        */
-      tscTrace("%p stream:%p, etime:%" PRId64 " is too old, exceeds the max retention time window:%" PRId64 ", stop the stream",
+      tscDebug("%p stream:%p, etime:%" PRId64 " is too old, exceeds the max retention time window:%" PRId64 ", stop the stream",
                pStream->pSql, pStream, pStream->stime, pStream->etime);
       // TODO : How to terminate stream here
       if (pStream->callback) {
@@ -289,37 +302,40 @@ static void tscSetRetryTimer(SSqlStream *pStream, SSqlObj *pSql, int64_t timer)
       return;
     }
   
-    tscTrace("%p stream:%p, next start at %" PRId64 ", in %" PRId64 "ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64 "", pStream->pSql, pStream,
+    tscDebug("%p stream:%p, next start at %" PRId64 ", in %" PRId64 "ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64, pStream->pSql, pStream,
              now + timer, timer, delay, pStream->stime, etime);
   } else {
-    tscTrace("%p stream:%p, next start at %" PRId64 ", in %" PRId64 "ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64 "", pStream->pSql, pStream,
-             pStream->stime, timer, delay, pStream->stime - pStream->interval, pStream->stime - 1);
+    tscDebug("%p stream:%p, next start at %" PRId64 ", in %" PRId64 "ms. delay:%" PRId64 "ms qrange %" PRId64 "-%" PRId64, pStream->pSql, pStream,
+             pStream->stime, timer, delay, pStream->stime - pStream->interval.interval, pStream->stime - 1);
   }
 
   pSql->cmd.command = TSDB_SQL_SELECT;
 
   // start timer for next computing
-  taosTmrReset(tscProcessStreamTimer, timer, pStream, tscTmr, &pStream->pTimer);
+  taosTmrReset(tscProcessStreamTimer, (int32_t)timer, pStream, tscTmr, &pStream->pTimer);
 }
 
 static int64_t getLaunchTimeDelay(const SSqlStream* pStream) {
-  int64_t delayDelta = (int64_t)(pStream->slidingTime * tsStreamComputDelayRatio);
-  
   int64_t maxDelay =
       (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMaxStreamComputDelay * 1000L : tsMaxStreamComputDelay;
   
-  if (delayDelta > maxDelay) {
-    delayDelta = maxDelay;
-  }
-  
-  int64_t remainTimeWindow = pStream->slidingTime - delayDelta;
-  if (maxDelay > remainTimeWindow) {
-    maxDelay = (remainTimeWindow / 1.5);
+  int64_t delayDelta = maxDelay;
+  if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
+    delayDelta = (int64_t)(pStream->interval.sliding * tsStreamComputDelayRatio);
+    if (delayDelta > maxDelay) {
+      delayDelta = maxDelay;
+    }
+    int64_t remainTimeWindow = pStream->interval.sliding - delayDelta;
+    if (maxDelay > remainTimeWindow) {
+      maxDelay = (int64_t)(remainTimeWindow / 1.5f);
+    }
   }
   
   int64_t currentDelay = (rand() % maxDelay);  // a random number
   currentDelay += delayDelta;
-  assert(currentDelay < pStream->slidingTime);
+  if (pStream->interval.intervalUnit != 'n' && pStream->interval.intervalUnit != 'y') {
+    assert(currentDelay < pStream->interval.sliding);
+  }
   
   return currentDelay;
 }
@@ -328,15 +344,14 @@ static int64_t getLaunchTimeDelay(const SSqlStream* pStream) {
 static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
   int64_t timer = 0;
   
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  if (isProjectStream(pQueryInfo)) {
+  if (pStream->isProject) {
     /*
      * for project query, no mater fetch data successfully or not, next launch will issue
      * more than the sliding time window
      */
-    timer = pStream->slidingTime;
+    timer = pStream->interval.sliding;
     if (pStream->stime > pStream->etime) {
-      tscTrace("%p stream:%p, stime:%" PRId64 " is larger than end time: %" PRId64 ", stop the stream", pStream->pSql, pStream,
+      tscDebug("%p stream:%p, stime:%" PRId64 " is larger than end time: %" PRId64 ", stop the stream", pStream->pSql, pStream,
                pStream->stime, pStream->etime);
       // TODO : How to terminate stream here
       if (pStream->callback) {
@@ -347,9 +362,10 @@ static void tscSetNextLaunchTimer(SSqlStream *pStream, SSqlObj *pSql) {
       return;
     }
   } else {
-    pStream->stime += pStream->slidingTime;
-    if ((pStream->stime - pStream->interval) >= pStream->etime) {
-      tscTrace("%p stream:%p, stime:%" PRId64 " is larger than end time: %" PRId64 ", stop the stream", pStream->pSql, pStream,
+    int64_t stime = taosTimeTruncate(pStream->stime - 1, &pStream->interval, pStream->precision);
+    //int64_t stime = taosGetIntervalStartTimestamp(pStream->stime - 1, pStream->interval.interval, pStream->interval.interval, pStream->interval.intervalUnit, pStream->precision);
+    if (stime >= pStream->etime) {
+      tscDebug("%p stream:%p, stime:%" PRId64 " is larger than end time: %" PRId64 ", stop the stream", pStream->pSql, pStream,
                pStream->stime, pStream->etime);
       // TODO : How to terminate stream here
       if (pStream->callback) {
@@ -381,63 +397,70 @@ static void tscSetSlidingWindowInfo(SSqlObj *pSql, SSqlStream *pStream) {
   
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   
-  if (pQueryInfo->nAggTimeInterval < minIntervalTime) {
-    tscWarn("%p stream:%p, original sample interval:%ld too small, reset to:%" PRId64 "", pSql, pStream,
-            pQueryInfo->nAggTimeInterval, minIntervalTime);
-    pQueryInfo->nAggTimeInterval = minIntervalTime;
+  if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit!= 'y' && pQueryInfo->interval.interval < minIntervalTime) {
+    tscWarn("%p stream:%p, original sample interval:%ld too small, reset to:%" PRId64, pSql, pStream,
+            pQueryInfo->interval.interval, minIntervalTime);
+    pQueryInfo->interval.interval = minIntervalTime;
   }
 
-  pStream->interval = pQueryInfo->nAggTimeInterval;  // it shall be derived from sql string
+  pStream->interval.intervalUnit = pQueryInfo->interval.intervalUnit;
+  pStream->interval.interval = pQueryInfo->interval.interval;  // it shall be derived from sql string
 
-  if (pQueryInfo->nSlidingTime == 0) {
-    pQueryInfo->nSlidingTime = pQueryInfo->nAggTimeInterval;
+  if (pQueryInfo->interval.sliding <= 0) {
+    pQueryInfo->interval.sliding = pQueryInfo->interval.interval;
+    pQueryInfo->interval.slidingUnit = pQueryInfo->interval.intervalUnit;
   }
 
   int64_t minSlidingTime =
       (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsMinSlidingTime * 1000L : tsMinSlidingTime;
 
-  if (pQueryInfo->nSlidingTime < minSlidingTime) {
-    tscWarn("%p stream:%p, original sliding value:%" PRId64 " too small, reset to:%" PRId64 "", pSql, pStream,
-        pQueryInfo->nSlidingTime, minSlidingTime);
+  if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit!= 'y' && pQueryInfo->interval.sliding < minSlidingTime) {
+    tscWarn("%p stream:%p, original sliding value:%" PRId64 " too small, reset to:%" PRId64, pSql, pStream,
+        pQueryInfo->interval.sliding, minSlidingTime);
 
-    pQueryInfo->nSlidingTime = minSlidingTime;
+    pQueryInfo->interval.sliding = minSlidingTime;
   }
 
-  if (pQueryInfo->nSlidingTime > pQueryInfo->nAggTimeInterval) {
-    tscWarn("%p stream:%p, sliding value:%" PRId64 " can not be larger than interval range, reset to:%" PRId64 "", pSql, pStream,
-            pQueryInfo->nSlidingTime, pQueryInfo->nAggTimeInterval);
+  if (pQueryInfo->interval.sliding > pQueryInfo->interval.interval) {
+    tscWarn("%p stream:%p, sliding value:%" PRId64 " can not be larger than interval range, reset to:%" PRId64, pSql, pStream,
+            pQueryInfo->interval.sliding, pQueryInfo->interval.interval);
 
-    pQueryInfo->nSlidingTime = pQueryInfo->nAggTimeInterval;
+    pQueryInfo->interval.sliding = pQueryInfo->interval.interval;
   }
 
-  pStream->slidingTime = pQueryInfo->nSlidingTime;
+  pStream->interval.slidingUnit = pQueryInfo->interval.slidingUnit;
+  pStream->interval.sliding = pQueryInfo->interval.sliding;
   
-  pQueryInfo->nAggTimeInterval = 0; // clear the interval value to avoid the force time window split by query processor
-  pQueryInfo->nSlidingTime = 0;
+  if (pStream->isProject) {
+    pQueryInfo->interval.interval = 0; // clear the interval value to avoid the force time window split by query processor
+    pQueryInfo->interval.sliding = 0;
+  }
 }
 
 static int64_t tscGetStreamStartTimestamp(SSqlObj *pSql, SSqlStream *pStream, int64_t stime) {
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   
-  if (isProjectStream(pQueryInfo)) {
+  if (pStream->isProject) {
     // no data in table, flush all data till now to destination meter, 10sec delay
-    pStream->interval = tsProjectExecInterval;
-    pStream->slidingTime = tsProjectExecInterval;
+    pStream->interval.interval = tsProjectExecInterval;
+    pStream->interval.sliding = tsProjectExecInterval;
 
     if (stime != 0) {  // first projection start from the latest event timestamp
-      assert(stime >= pQueryInfo->stime);
+      assert(stime >= pQueryInfo->window.skey);
       stime += 1;  // exclude the last records from table
     } else {
-      stime = pQueryInfo->stime;
+      stime = pQueryInfo->window.skey;
     }
   } else {             // timewindow based aggregation stream
     if (stime == 0) {  // no data in meter till now
-      stime = ((int64_t)taosGetTimestamp(pStream->precision) / pStream->interval) * pStream->interval;
-      tscWarn("%p stream:%p, last timestamp:0, reset to:%" PRId64 "", pSql, pStream, stime);
+      if (pQueryInfo->window.skey != INT64_MIN) {
+        stime = pQueryInfo->window.skey;
+      }
+      stime = taosTimeTruncate(stime, &pStream->interval, pStream->precision);
     } else {
-      int64_t newStime = (stime / pStream->interval) * pStream->interval;
+      int64_t newStime = taosTimeTruncate(stime, &pStream->interval, pStream->precision);
       if (newStime != stime) {
-        tscWarn("%p stream:%p, last timestamp:%" PRId64 ", reset to:%" PRId64 "", pSql, pStream, stime, newStime);
+        tscWarn("%p stream:%p, last timestamp:%" PRId64 ", reset to:%" PRId64, pSql, pStream, stime, newStime);
         stime = newStime;
       }
     }
@@ -447,8 +470,10 @@ static int64_t tscGetStreamStartTimestamp(SSqlObj *pSql, SSqlStream *pStream, in
 }
 
 static int64_t tscGetLaunchTimestamp(const SSqlStream *pStream) {
-  int64_t timer = pStream->stime - taosGetTimestamp(pStream->precision);
-  if (timer < 0) timer = 0;
+  int64_t timer = 0, now = taosGetTimestamp(pStream->precision);
+  if (pStream->stime > now) {
+    timer = pStream->stime - now;
+  }
 
   int64_t startDelay =
       (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? tsStreamCompStartDelay * 1000L : tsStreamCompStartDelay;
@@ -459,20 +484,57 @@ static int64_t tscGetLaunchTimestamp(const SSqlStream *pStream) {
   return (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? timer / 1000L : timer;
 }
 
-static void setErrorInfo(STscObj* pObj, int32_t code, char* info) {
-  if (pObj == NULL) {
+static void setErrorInfo(SSqlObj* pSql, int32_t code, char* info) {
+  if (pSql == NULL) {
     return;
   }
 
-  SSqlCmd* pCmd = &pObj->pSql->cmd;
+  SSqlCmd* pCmd = &pSql->cmd;
 
-  pObj->pSql->res.code = code;
+  pSql->res.code = code;
   
   if (info != NULL) {
     strncpy(pCmd->payload, info, pCmd->payloadLen);
   }
 }
 
+static void tscCreateStream(void *param, TAOS_RES *res, int code) {
+  SSqlStream* pStream = (SSqlStream*)param;
+  SSqlObj* pSql = pStream->pSql;
+  SSqlCmd* pCmd = &pSql->cmd;
+
+  if (code != TSDB_CODE_SUCCESS) {
+    setErrorInfo(pSql, code, pCmd->payload);
+    tscError("%p open stream failed, sql:%s, reason:%s, code:0x%08x", pSql, pSql->sqlstr, pCmd->payload, code);
+    pStream->fp(pStream->param, NULL, NULL);
+    return;
+  }
+
+  registerSqlObj(pSql);
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
+  pStream->isProject = isProjectStream(pQueryInfo);
+  pStream->precision = tinfo.precision;
+
+  pStream->ctime = taosGetTimestamp(pStream->precision);
+  pStream->etime = pQueryInfo->window.ekey;
+
+  tscAddIntoStreamList(pStream);
+
+  tscSetSlidingWindowInfo(pSql, pStream);
+  pStream->stime = tscGetStreamStartTimestamp(pSql, pStream, pStream->stime);
+
+  int64_t starttime = tscGetLaunchTimestamp(pStream);
+  pCmd->command = TSDB_SQL_SELECT;
+  taosTmrReset(tscProcessStreamTimer, (int32_t)starttime, pStream, tscTmr, &pStream->pTimer);
+
+  tscDebug("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql,
+           pStream, pTableMetaInfo->name, pStream->interval.interval, pStream->interval.sliding, starttime, pSql->sqlstr);
+}
+
 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;
@@ -480,88 +542,54 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
 
   SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
     return NULL;
   }
 
   pSql->signature = pSql;
   pSql->pTscObj = pObj;
+
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-  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) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
-
-    tfree(pSql);
-    return NULL;
-  }
-
-  tsem_init(&pSql->rspSem, 0, 0);
-  tsem_init(&pSql->emptyRspSem, 0, 1);
-
-  SSqlInfo SQLInfo = {0};
-  tSQLParse(&SQLInfo, pSql->sqlstr);
-
-  tscCleanSqlCmd(&pSql->cmd);
-  ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
-  if (TSDB_CODE_SUCCESS != ret) {
-    setErrorInfo(pObj, ret, NULL);
-    tscError("%p open stream failed, sql:%s, code:%d", pSql, sqlstr, TSDB_CODE_CLI_OUT_OF_MEMORY);
-    tscFreeSqlObj(pSql);
-    return NULL;
-  }
-  
-  pSql->cmd.inStream = 1;  // 1 means sql in stream, allowed the sliding clause.
-  pRes->code = tscToSQLCmd(pSql, &SQLInfo);
-  SQLInfoDestroy(&SQLInfo);
-
-  if (pRes->code != TSDB_CODE_SUCCESS) {
-    setErrorInfo(pObj, pRes->code, pCmd->payload);
-
-    tscError("%p open stream failed, sql:%s, reason:%s, code:%d", pSql, sqlstr, pCmd->payload, pRes->code);
-    tscFreeSqlObj(pSql);
-    return NULL;
-  }
 
   SSqlStream *pStream = (SSqlStream *)calloc(1, sizeof(SSqlStream));
   if (pStream == NULL) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
-
-    tscError("%p open stream failed, sql:%s, reason:%s, code:%d", pSql, sqlstr, pCmd->payload, pRes->code);
+    tscError("%p open stream failed, sql:%s, reason:%s, code:0x%08x", pSql, sqlstr, pCmd->payload, pRes->code);
     tscFreeSqlObj(pSql);
     return NULL;
   }
 
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-
+  pStream->stime = stime;
   pStream->fp = fp;
   pStream->callback = callback;
   pStream->param = param;
   pStream->pSql = pSql;
-  pStream->precision = pMeterMetaInfo->pMeterMeta->precision;
-
-  pStream->ctime = taosGetTimestamp(pStream->precision);
-  pStream->etime = pQueryInfo->etime;
-
   pSql->pStream = pStream;
-  tscAddIntoStreamList(pStream);
+  pSql->param = pStream;
+  pSql->maxRetry = TSDB_MAX_REPLICA;
 
-  tscSetSlidingWindowInfo(pSql, pStream);
-  pStream->stime = tscGetStreamStartTimestamp(pSql, pStream, stime);
+  pSql->sqlstr = calloc(1, strlen(sqlstr) + 1);
+  if (pSql->sqlstr == NULL) {
+    tscError("%p failed to malloc sql string buffer", pSql);
+    tscFreeSqlObj(pSql);
+    return NULL;
+  }
 
-  int64_t starttime = tscGetLaunchTimestamp(pStream);
-  taosTmrReset(tscProcessStreamTimer, starttime, pStream, tscTmr, &pStream->pTimer);
+  strtolower(pSql->sqlstr, sqlstr);
+
+  tscDebugL("%p SQL: %s", pSql, pSql->sqlstr);
+  tsem_init(&pSql->rspSem, 0, 0);
 
-  tscTrace("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql,
-           pStream, pMeterMetaInfo->name, pStream->interval, pStream->slidingTime, starttime, sqlstr);
+  pSql->fp = tscCreateStream;
+  pSql->fetchFp = tscCreateStream;
+  int32_t code = tsParseSql(pSql, true);
+  if (code == TSDB_CODE_SUCCESS) {
+    tscCreateStream(pStream, pSql, code);
+  } else if (code != TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    tscError("%p open stream failed, sql:%s, code:%s", pSql, sqlstr, tstrerror(pRes->code));
+    tscFreeSqlObj(pSql);
+    free(pStream);
+    return NULL;
+  }
 
   return pStream;
 }
@@ -582,10 +610,13 @@ void taos_close_stream(TAOS_STREAM *handle) {
     tscRemoveFromStreamList(pStream, pSql);
 
     taosTmrStopA(&(pStream->pTimer));
-    tscFreeSqlObj(pSql);
+
+    tscDebug("%p stream:%p is closed", pSql, pStream);
+    // notify CQ to release the pStream object
+    pStream->fp(pStream->param, NULL, NULL);
     pStream->pSql = NULL;
 
-    tscTrace("%p stream:%p is closed", pSql, pStream);
-    tfree(pStream);
+    taos_free_result(pSql);
+    taosTFree(pStream);
   }
 }
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 610c119e6d327c9b8b372136959b07098ffaef2e..2c81bd7c7ce25535dfffe9c1fd6f8a0197fb900b 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -14,16 +14,13 @@
  */
 
 #include "os.h"
-
-#include "shash.h"
 #include "taos.h"
-#include "tlog.h"
 #include "trpc.h"
 #include "tsclient.h"
 #include "tsocket.h"
-#include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
+#include "tscLog.h"
 #include "tscUtil.h"
 #include "tcache.h"
 #include "tscProfile.h"
@@ -36,6 +33,7 @@ typedef struct SSubscriptionProgress {
 typedef struct SSub {
   void *                  signature;
   char                    topic[32];
+  tsem_t                  sem;
   int64_t                 lastSyncTime;
   int64_t                 lastConsumeTime;
   TAOS *                  taos;
@@ -44,8 +42,7 @@ typedef struct SSub {
   int                     interval;
   TAOS_SUBSCRIBE_CALLBACK fp;
   void *                  param;
-  int                     numOfMeters;
-  SSubscriptionProgress * progress;
+  SArray* progress;
 } SSub;
 
 
@@ -57,94 +54,148 @@ static int tscCompareSubscriptionProgress(const void* a, const void* b) {
   return 0;
 }
 
-TSKEY tscGetSubscriptionProgress(void* sub, int64_t uid) {
-  if (sub == NULL)
-    return 0;
-
-  SSub* pSub = (SSub*)sub;
-  for (int s = 0, e = pSub->numOfMeters; s < e;) {
-    int m = (s + e) / 2;
-    SSubscriptionProgress* p = pSub->progress + m;
-    if (p->uid > uid)
-      e = m;
-    else if (p->uid < uid)
-      s = m + 1;
-    else
-      return p->key;
+TSKEY tscGetSubscriptionProgress(void* sub, int64_t uid, TSKEY dflt) {
+  if (sub == NULL) {
+    return dflt;
   }
+  SSub* pSub = (SSub*)sub;
 
-  return 0;
+  SSubscriptionProgress target = {.uid = uid, .key = 0};
+  SSubscriptionProgress* p = taosArraySearch(pSub->progress, &target, tscCompareSubscriptionProgress);
+  if (p == NULL) {
+    return dflt;
+  }
+  return p->key;
 }
 
 void tscUpdateSubscriptionProgress(void* sub, int64_t uid, TSKEY ts) {
   if( sub == NULL)
     return;
-
   SSub* pSub = (SSub*)sub;
-  for (int s = 0, e = pSub->numOfMeters; s < e;) {
-    int m = (s + e) / 2;
-    SSubscriptionProgress* p = pSub->progress + m;
-    if (p->uid > uid)
-      e = m;
-    else if (p->uid < uid)
-      s = m + 1;
-    else {
-      if (ts >= p->key) p->key = ts;
-      break;
-    }
+
+  SSubscriptionProgress target = {.uid = uid, .key = ts};
+  SSubscriptionProgress* p = taosArraySearch(pSub->progress, &target, tscCompareSubscriptionProgress);
+  if (p != NULL) {
+    p->key = ts;
   }
 }
 
 
+static void asyncCallback(void *param, TAOS_RES *tres, int code) {
+  assert(param != NULL);
+  SSub *pSub = ((SSub *)param);
+  pSub->pSql->res.code = code;
+  tsem_post(&pSub->sem);
+}
+
+
 static SSub* tscCreateSubscription(STscObj* pObj, const char* topic, const char* sql) {
+  int code = TSDB_CODE_SUCCESS, line = __LINE__;
+  SSqlObj* pSql = NULL;
+
   SSub* pSub = calloc(1, sizeof(SSub));
   if (pSub == NULL) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscError("failed to allocate memory for subscription");
-    return NULL;
+    line = __LINE__;
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto fail;
+  }
+  pSub->signature = pSub;
+  if (tsem_init(&pSub->sem, 0, 0) == -1) {
+    line = __LINE__;
+    code = TAOS_SYSTEM_ERROR(errno);
+    goto fail;
+  }
+
+  tstrncpy(pSub->topic, topic, sizeof(pSub->topic));
+  pSub->progress = taosArrayInit(32, sizeof(SSubscriptionProgress));
+  if (pSub->progress == NULL) {
+    line = __LINE__;
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto fail;
   }
 
-  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  pSql = calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
-    globalCode = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscError("failed to allocate SSqlObj for subscription");
-    goto failed;
+    line = __LINE__;
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto fail;
   }
 
   pSql->signature = pSql;
   pSql->pTscObj = pObj;
+  pSql->pSubscription = pSub;
+  pSub->pSql = pSql;
 
-  char* sqlstr = (char*)malloc(strlen(sql) + 1);
-  if (sqlstr == NULL) {
-    tscError("failed to allocate sql string for subscription");
-    goto failed;
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+  if (tsem_init(&pSql->rspSem, 0, 0) == -1) {
+    line = __LINE__;
+    code = TAOS_SYSTEM_ERROR(errno);
+    goto fail;
   }
-  strcpy(sqlstr, sql);
-  strtolower(sqlstr, sqlstr);
-  pSql->sqlstr = sqlstr;
 
-  tsem_init(&pSql->rspSem, 0, 0);
-  tsem_init(&pSql->emptyRspSem, 0, 1);
+  pSql->param = pSub;
+  pSql->maxRetry = TSDB_MAX_REPLICA;
+  pSql->fp = asyncCallback;
+  pSql->fetchFp = asyncCallback;
+  pSql->sqlstr = strdup(sql);
+  if (pSql->sqlstr == NULL) {
+    line = __LINE__;
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto fail;
+  }
 
-  SSqlRes *pRes = &pSql->res;
+  strtolower(pSql->sqlstr, pSql->sqlstr);
+  pRes->qhandle = 0;
   pRes->numOfRows = 1;
-  pRes->numOfTotal = 0;
 
-  pSql->pSubscription = pSub;
-  pSub->pSql = pSql;
-  pSub->signature = pSub;
-  strncpy(pSub->topic, topic, sizeof(pSub->topic));
-  pSub->topic[sizeof(pSub->topic) - 1] = 0;
-  return pSub;
+  code = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
+  if (code != TSDB_CODE_SUCCESS) {
+    line = __LINE__;
+    goto fail;
+  }
+
+  registerSqlObj(pSql);
+
+  code = tsParseSql(pSql, false);
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    tsem_wait(&pSub->sem);
+    code = pSql->res.code;
+  }
 
-failed:
-  if (sqlstr != NULL) {
-    free(sqlstr);
+  if (code != TSDB_CODE_SUCCESS) {
+    line = __LINE__;
+    goto fail;
+  }
+
+  if (pSql->cmd.command != TSDB_SQL_SELECT) {
+    line = __LINE__;
+    code = TSDB_CODE_TSC_INVALID_SQL;
+    goto fail;
   }
+
+  return pSub;
+
+fail:
+  tscError("tscCreateSubscription failed at line %d, reason: %s", line, tstrerror(code));
   if (pSql != NULL) {
-    free(pSql);
+    if (pSql->self != NULL) {
+      taos_free_result(pSql);
+    } else {
+      tscFreeSqlObj(pSql);
+    }
+
+    pSql = NULL;
   }
-  free(pSub);
+
+  if (pSub != NULL) {
+    taosArrayDestroy(pSub->progress);
+    tsem_destroy(&pSub->sem);
+    free(pSub);
+    pSub = NULL;
+  }
+
+  terrno = code;
   return NULL;
 }
 
@@ -162,77 +213,111 @@ static void tscProcessSubscriptionTimer(void *handle, void *tmrId) {
 }
 
 
-int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
-  int code = (uint8_t)tsParseSql(pSub->pSql, false);
-  if (code != TSDB_CODE_SUCCESS) {
-    tscError("failed to parse sql statement: %s", pSub->topic);
-    return 0;
+static SArray* getTableList( SSqlObj* pSql ) {
+  const char* p = strstr( pSql->sqlstr, " from " );
+  assert(p != NULL); // we are sure this is a 'select' statement
+  char* sql = alloca(strlen(p) + 32);
+  sprintf(sql, "select tbid(tbname)%s", p);
+  
+  SSqlObj* pNew = taos_query(pSql->pTscObj, sql);
+  if (pNew == NULL) {
+    tscError("failed to retrieve table id: cannot create new sql object.");
+    return NULL;
+
+  } else if (taos_errno(pNew) != TSDB_CODE_SUCCESS) {
+    tscError("failed to retrieve table id: %s", tstrerror(taos_errno(pNew)));
+    return NULL;
   }
 
-  SSqlCmd* pCmd = &pSub->pSql->cmd;
-  if (pCmd->command != TSDB_SQL_SELECT) {
-    tscError("only 'select' statement is allowed in subscription: %s", pSub->topic);
-    return 0;
+  TAOS_ROW row;
+  SArray* result = taosArrayInit( 128, sizeof(STidTags) );
+  while ((row = taos_fetch_row(pNew))) {
+    STidTags tags;
+    memcpy(&tags, row[0], sizeof(tags));
+    taosArrayPush(result, &tags);
+  }
+
+  taos_free_result(pNew);
+  
+  return result;
+}
+
+static int32_t compareTidTag(const void* p1, const void* p2) {
+  const STidTags* t1 = (const STidTags*)p1;
+  const STidTags* t2 = (const STidTags*)p2;
+  
+  if (t1->vgId != t2->vgId) {
+    return (t1->vgId > t2->vgId) ? 1 : -1;
+  }
+  if (t1->tid != t2->tid) {
+    return (t1->tid > t2->tid) ? 1 : -1;
   }
+  return 0;
+}
+
 
-  SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, 0, 0);
-  int numOfMeters = 0;
-  if (!UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-    SMetricMeta* pMetricMeta = pMeterMetaInfo->pMetricMeta;
-    for (int32_t i = 0; i < pMetricMeta->numOfVnodes; i++) {
-      SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, i);
-      numOfMeters += pVnodeSidList->numOfSids;
+static int tscUpdateSubscription(STscObj* pObj, SSub* pSub) {
+  SSqlObj* pSql = pSub->pSql;
+
+  SSqlCmd* pCmd = &pSql->cmd;
+
+  pSub->lastSyncTime = taosGetTimestampMs();
+
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  if (UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) {
+    STableMeta * pTableMeta = pTableMetaInfo->pTableMeta;
+    SSubscriptionProgress target = {.uid = pTableMeta->id.uid, .key = 0};
+    SSubscriptionProgress* p = taosArraySearch(pSub->progress, &target, tscCompareSubscriptionProgress);
+    if (p == NULL) {
+      taosArrayClear(pSub->progress);
+      taosArrayPush(pSub->progress, &target);
     }
+    return 1;
   }
 
-  SSubscriptionProgress* progress = (SSubscriptionProgress*)calloc(numOfMeters, sizeof(SSubscriptionProgress));
-  if (progress == NULL) {
-    tscError("failed to allocate memory for progress: %s", pSub->topic);
+  SArray* tables = getTableList(pSql);
+  if (tables == NULL) {
     return 0;
   }
+  size_t numOfTables = taosArrayGetSize(tables);
 
-  if (UTIL_METER_IS_NOMRAL_METER(pMeterMetaInfo)) {
-    numOfMeters = 1;
-    int64_t uid = pMeterMetaInfo->pMeterMeta->uid;
-    progress[0].uid = uid;
-    progress[0].key = tscGetSubscriptionProgress(pSub, uid);
-  } else {
-    SMetricMeta* pMetricMeta = pMeterMetaInfo->pMetricMeta;
-    numOfMeters = 0;
-    for (int32_t i = 0; i < pMetricMeta->numOfVnodes; i++) {
-      SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, i);
-      for (int32_t j = 0; j < pVnodeSidList->numOfSids; j++) {
-        SMeterSidExtInfo *pMeterInfo = tscGetMeterSidInfo(pVnodeSidList, j);
-        int64_t uid = pMeterInfo->uid;
-        progress[numOfMeters].uid = uid;
-        progress[numOfMeters++].key = tscGetSubscriptionProgress(pSub, uid);
-      }
-    }
-    qsort(progress, numOfMeters, sizeof(SSubscriptionProgress), tscCompareSubscriptionProgress);
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  SArray* progress = taosArrayInit(numOfTables, sizeof(SSubscriptionProgress));
+  for( size_t i = 0; i < numOfTables; i++ ) {
+    STidTags* tt = taosArrayGet( tables, i );
+    SSubscriptionProgress p = { .uid = tt->uid };
+    p.key = tscGetSubscriptionProgress(pSub, tt->uid, pQueryInfo->window.skey);
+    taosArrayPush(progress, &p);
   }
+  taosArraySort(progress, tscCompareSubscriptionProgress);
 
-  free(pSub->progress);
-  pSub->numOfMeters = numOfMeters;
+  taosArrayDestroy(pSub->progress);
   pSub->progress = progress;
 
-  pSub->lastSyncTime = taosGetTimestampMs();
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    taosArraySort( tables, compareTidTag );
+    tscFreeVgroupTableInfo(pTableMetaInfo->pVgroupTables);
+    tscBuildVgroupTableInfo(pSql, pTableMetaInfo, tables);
+  }
+  taosArrayDestroy(tables);
 
+  TSDB_QUERY_SET_TYPE(tscGetQueryInfoDetail(pCmd, 0)->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
   return 1;
 }
 
 
 static int tscLoadSubscriptionProgress(SSub* pSub) {
   char buf[TSDB_MAX_SQL_LEN];
-  sprintf(buf, "%s/subscribe/%s", dataDir, pSub->topic);
+  sprintf(buf, "%s/subscribe/%s", tsDataDir, pSub->topic);
 
   FILE* fp = fopen(buf, "r");
   if (fp == NULL) {
-    tscTrace("subscription progress file does not exist: %s", pSub->topic);
+    tscDebug("subscription progress file does not exist: %s", pSub->topic);
     return 1;
   }
 
   if (fgets(buf, sizeof(buf), fp) == NULL) {
-    tscTrace("invalid subscription progress file: %s", pSub->topic);
+    tscDebug("invalid subscription progress file: %s", pSub->topic);
     fclose(fp);
     return 0;
   }
@@ -246,37 +331,27 @@ static int tscLoadSubscriptionProgress(SSub* pSub) {
     }
   }
   if (strcmp(buf, pSub->pSql->sqlstr) != 0) {
-    tscTrace("subscription sql statement mismatch: %s", pSub->topic);
+    tscDebug("subscription sql statement mismatch: %s", pSub->topic);
     fclose(fp);
     return 0;
   }
 
-  if (fgets(buf, sizeof(buf), fp) == NULL || atoi(buf) < 0) {
-    tscTrace("invalid subscription progress file: %s", pSub->topic);
-    fclose(fp);
-    return 0;
-  }
-
-  int numOfMeters = atoi(buf);
-  SSubscriptionProgress* progress = calloc(numOfMeters, sizeof(SSubscriptionProgress));
-  for (int i = 0; i < numOfMeters; i++) {
+  SArray* progress = pSub->progress;
+  taosArrayClear(progress);
+  while( 1 ) {
     if (fgets(buf, sizeof(buf), fp) == NULL) {
       fclose(fp);
-      free(progress);
       return 0;
     }
-    int64_t uid, key;
-    sscanf(buf, "%" SCNd64 ":%" SCNd64, &uid, &key);
-    progress[i].uid = uid;
-    progress[i].key = key;
+    SSubscriptionProgress p;
+    sscanf(buf, "%" SCNd64 ":%" SCNd64, &p.uid, &p.key);
+    taosArrayPush(progress, &p);
   }
 
   fclose(fp);
 
-  qsort(progress, numOfMeters, sizeof(SSubscriptionProgress), tscCompareSubscriptionProgress);
-  pSub->numOfMeters = numOfMeters;
-  pSub->progress = progress;
-  tscTrace("subscription progress loaded, %d tables: %s", numOfMeters, pSub->topic);
+  taosArraySort(progress, tscCompareSubscriptionProgress);
+  tscDebug("subscription progress loaded, %" PRIzu " tables: %s", taosArrayGetSize(progress), pSub->topic);
   return 1;
 }
 
@@ -284,12 +359,12 @@ void tscSaveSubscriptionProgress(void* sub) {
   SSub* pSub = (SSub*)sub;
 
   char path[256];
-  sprintf(path, "%s/subscribe", dataDir);
-  if (access(path, 0) != 0) {
-    mkdir(path, 0777);
+  sprintf(path, "%s/subscribe", tsDataDir);
+  if (taosMkDir(path, 0777) != 0) {
+    tscError("failed to create subscribe dir: %s", path);
   }
 
-  sprintf(path, "%s/subscribe/%s", dataDir, pSub->topic);
+  sprintf(path, "%s/subscribe/%s", tsDataDir, pSub->topic);
   FILE* fp = fopen(path, "w+");
   if (fp == NULL) {
     tscError("failed to create progress file for subscription: %s", pSub->topic);
@@ -297,11 +372,10 @@ void tscSaveSubscriptionProgress(void* sub) {
   }
 
   fputs(pSub->pSql->sqlstr, fp);
-  fprintf(fp, "\n%d\n", pSub->numOfMeters);
-  for (int i = 0; i < pSub->numOfMeters; i++) {
-    int64_t uid = pSub->progress[i].uid;
-    TSKEY key = pSub->progress[i].key;
-    fprintf(fp, "%" PRId64 ":%" PRId64 "\n", uid, key);
+  fprintf(fp, "\n");
+  for(size_t i = 0; i < taosArrayGetSize(pSub->progress); i++) {
+    SSubscriptionProgress* p = taosArrayGet(pSub->progress, i);
+    fprintf(fp, "%" PRId64 ":%" PRId64 "\n", p->uid, p->key);
   }
 
   fclose(fp);
@@ -310,7 +384,7 @@ void tscSaveSubscriptionProgress(void* sub) {
 TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval) {
   STscObj* pObj = (STscObj*)taos;
   if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
     tscError("connection disconnected");
     return NULL;
   }
@@ -322,7 +396,7 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
   pSub->taos = taos;
 
   if (restart) {
-    tscTrace("restart subscription: %s", topic);
+    tscDebug("restart subscription: %s", topic);
   } else {
     tscLoadSubscriptionProgress(pSub);
   }
@@ -334,7 +408,7 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
 
   pSub->interval = interval;
   if (fp != NULL) {
-    tscTrace("asynchronize subscription, create new timer", topic);
+    tscDebug("asynchronize subscription, create new timer: %s", topic);
     pSub->fp = fp;
     pSub->param = param;
     taosTmrReset(tscProcessSubscriptionTimer, interval, pSub, tscTmr, &pSub->pTimer);
@@ -343,63 +417,67 @@ TAOS_SUB *taos_subscribe(TAOS *taos, int restart, const char* topic, const char
   return pSub;
 }
 
-void taos_free_result_imp(SSqlObj* pSql, int keepCmd);
-
 TAOS_RES *taos_consume(TAOS_SUB *tsub) {
   SSub *pSub = (SSub *)tsub;
   if (pSub == NULL) return NULL;
 
   tscSaveSubscriptionProgress(pSub);
 
-  SSqlObj* pSql = pSub->pSql;
+  SSqlObj *pSql = pSub->pSql;
   SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if (taosArrayGetSize(pSub->progress) > 0) { // fix crash in single tabel subscription
+    pQueryInfo->window.skey = ((SSubscriptionProgress*)taosArrayGet(pSub->progress, 0))->key;
+  }
 
   if (pSub->pTimer == NULL) {
     int64_t duration = taosGetTimestampMs() - pSub->lastConsumeTime;
     if (duration < (int64_t)(pSub->interval)) {
-      tscTrace("subscription consume too frequently, blocking...");
+      tscDebug("subscription consume too frequently, blocking...");
       taosMsleep(pSub->interval - (int32_t)duration);
     }
   }
 
+  size_t size = taosArrayGetSize(pSub->progress) * sizeof(STableIdInfo);
+  size += sizeof(SQueryTableMsg) + 4096;
+  tscAllocPayload(&pSql->cmd, (int)size);
   for (int retry = 0; retry < 3; retry++) {
     tscRemoveFromSqlList(pSql);
 
     if (taosGetTimestampMs() - pSub->lastSyncTime > 10 * 60 * 1000) {
-      tscTrace("begin meter synchronization");
-      char* sqlstr = pSql->sqlstr;
-      pSql->sqlstr = NULL;
-      taos_free_result_imp(pSql, 0);
-      pSql->sqlstr = sqlstr;
-      taosClearDataCache(tscCacheHandle);
+      tscDebug("begin table synchronization");
       if (!tscUpdateSubscription(pSub->taos, pSub)) return NULL;
-      tscTrace("meter synchronization completed");
-    } else {
-      SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-      
-      uint16_t type = pQueryInfo->type;
-      taos_free_result_imp(pSql, 1);
-      pRes->numOfRows = 1;
-      pRes->numOfTotal = 0;
-      pRes->qhandle = 0;
-      pSql->thandle = NULL;
-      pSql->cmd.command = TSDB_SQL_SELECT;
-      pQueryInfo->type = type;
-
-      tscGetMeterMetaInfo(&pSql->cmd, 0, 0)->vnodeIndex = 0;
+      tscDebug("table synchronization completed");
     }
 
+    uint32_t type = pQueryInfo->type;
+    tscFreeSqlResult(pSql);
+    pRes->numOfRows = 1;
+    pRes->qhandle = 0;
+    pSql->cmd.command = TSDB_SQL_SELECT;
+    pQueryInfo->type = type;
+
+    pTableMetaInfo->vgroupIndex = 0;
+
+    pSql->fp = asyncCallback;
+    pSql->fetchFp = asyncCallback;
+    pSql->param = pSub;
     tscDoQuery(pSql);
-    if (pRes->code != TSDB_CODE_NOT_ACTIVE_TABLE) {
-      break;
+    tsem_wait(&pSub->sem);
+
+    if (pRes->code != TSDB_CODE_SUCCESS) {
+      continue;
     }
     // meter was removed, make sync time zero, so that next retry will
     // do synchronization first
     pSub->lastSyncTime = 0;
+    break;
   }
 
   if (pRes->code != TSDB_CODE_SUCCESS) {
-    tscError("failed to query data, error code=%d", pRes->code);
+    tscError("failed to query data: %s", tstrerror(pRes->code));
     tscRemoveFromSqlList(pSql);
     return NULL;
   }
@@ -417,15 +495,24 @@ void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress) {
   }
 
   if (keepProgress) {
-    tscSaveSubscriptionProgress(pSub);
+    if (pSub->progress != NULL) {
+      tscSaveSubscriptionProgress(pSub);
+    }
   } else {
     char path[256];
-    sprintf(path, "%s/subscribe/%s", dataDir, pSub->topic);
-    remove(path);
+    sprintf(path, "%s/subscribe/%s", tsDataDir, pSub->topic);
+    if (remove(path) != 0) {
+      tscError("failed to remove progress file, topic = %s, error = %s", pSub->topic, strerror(errno));
+    }
+  }
+
+  if (pSub->pSql != NULL) {
+    taos_free_result(pSub->pSql);
   }
 
   tscFreeSqlObj(pSub->pSql);
-  free(pSub->progress);
+  taosArrayDestroy(pSub->progress);
+  tsem_destroy(&pSub->sem);
   memset(pSub, 0, sizeof(*pSub));
   free(pSub);
 }
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
new file mode 100644
index 0000000000000000000000000000000000000000..390c3ca92d3b8398d6ca88f11d0c6e45f3f77010
--- /dev/null
+++ b/src/client/src/tscSubquery.c
@@ -0,0 +1,2284 @@
+/*
+ * 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/>.
+ */
+#define _GNU_SOURCE
+ 
+#include "os.h"
+
+#include "qAst.h"
+#include "qTsbuf.h"
+#include "tcompare.h"
+#include "tscLog.h"
+#include "tscSubquery.h"
+#include "tschemautil.h"
+#include "tsclient.h"
+#include "tscSubquery.h"
+
+typedef struct SInsertSupporter {
+  SSubqueryState* pState;
+  SSqlObj*  pSql;
+  int32_t   index;
+} SInsertSupporter;
+
+static void freeJoinSubqueryObj(SSqlObj* pSql);
+static bool tscHasRemainDataInSubqueryResultSet(SSqlObj *pSql);
+
+static bool tsCompare(int32_t order, int64_t left, int64_t right) {
+  if (order == TSDB_ORDER_ASC) {
+    return left < right;
+  } else {
+    return left > right;
+  }
+}
+
+static int64_t doTSBlockIntersect(SSqlObj* pSql, SJoinSupporter* pSupporter1, SJoinSupporter* pSupporter2, STimeWindow * win) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+
+  STSBuf* output1 = tsBufCreate(true, pQueryInfo->order.order);
+  STSBuf* output2 = tsBufCreate(true, pQueryInfo->order.order);
+
+  win->skey = INT64_MAX;
+  win->ekey = INT64_MIN;
+
+  SLimitVal* pLimit = &pQueryInfo->limit;
+  int32_t    order = pQueryInfo->order.order;
+  
+  SQueryInfo* pSubQueryInfo1 = tscGetQueryInfoDetail(&pSql->pSubs[0]->cmd, 0);
+  SQueryInfo* pSubQueryInfo2 = tscGetQueryInfoDetail(&pSql->pSubs[1]->cmd, 0);
+  
+  pSubQueryInfo1->tsBuf = output1;
+  pSubQueryInfo2->tsBuf = output2;
+
+  // no result generated, return directly
+  if (pSupporter1->pTSBuf == NULL || pSupporter2->pTSBuf == NULL) {
+    tscDebug("%p at least one ts-comp is empty, 0 for secondary query after ts blocks intersecting", pSql);
+    return 0;
+  }
+
+  tsBufResetPos(pSupporter1->pTSBuf);
+  tsBufResetPos(pSupporter2->pTSBuf);
+
+  if (!tsBufNextPos(pSupporter1->pTSBuf)) {
+    tsBufFlush(output1);
+    tsBufFlush(output2);
+
+    tscDebug("%p input1 is empty, 0 for secondary query after ts blocks intersecting", pSql);
+    return 0;
+  }
+
+  if (!tsBufNextPos(pSupporter2->pTSBuf)) {
+    tsBufFlush(output1);
+    tsBufFlush(output2);
+
+    tscDebug("%p input2 is empty, 0 for secondary query after ts blocks intersecting", pSql);
+    return 0;
+  }
+
+  int64_t numOfInput1 = 1;
+  int64_t numOfInput2 = 1;
+
+  while (1) {
+    STSElem elem1 = tsBufGetElem(pSupporter1->pTSBuf);
+    STSElem elem2 = tsBufGetElem(pSupporter2->pTSBuf);
+
+#ifdef _DEBUG_VIEW
+    tscInfo("%" PRId64 ", tags:%"PRId64" \t %" PRId64 ", tags:%"PRId64, elem1.ts, elem1.tag.i64Key, elem2.ts, elem2.tag.i64Key);
+#endif
+
+    int32_t res = tVariantCompare(&elem1.tag, &elem2.tag);
+    if (res == -1 || (res == 0 && tsCompare(order, elem1.ts, elem2.ts))) {
+      if (!tsBufNextPos(pSupporter1->pTSBuf)) {
+        break;
+      }
+
+      numOfInput1++;
+    } else if ((res > 0) || (res == 0 && tsCompare(order, elem2.ts, elem1.ts))) {
+      if (!tsBufNextPos(pSupporter2->pTSBuf)) {
+        break;
+      }
+
+      numOfInput2++;
+    } else {
+      /*
+       * in case of stable query, limit/offset is not applied here. the limit/offset is applied to the
+       * final results which is acquired after the secondry merge of in the client.
+       */
+      if (pLimit->offset == 0 || pQueryInfo->interval.interval > 0 || QUERY_IS_STABLE_QUERY(pQueryInfo->type)) {
+        if (win->skey > elem1.ts) {
+          win->skey = elem1.ts;
+        }
+  
+        if (win->ekey < elem1.ts) {
+          win->ekey = elem1.ts;
+        }
+        
+        tsBufAppend(output1, elem1.vnode, &elem1.tag, (const char*)&elem1.ts, sizeof(elem1.ts));
+        tsBufAppend(output2, elem2.vnode, &elem2.tag, (const char*)&elem2.ts, sizeof(elem2.ts));
+      } else {
+        pLimit->offset -= 1;
+      }
+
+      if (!tsBufNextPos(pSupporter1->pTSBuf)) {
+        break;
+      }
+
+      numOfInput1++;
+
+      if (!tsBufNextPos(pSupporter2->pTSBuf)) {
+        break;
+      }
+
+      numOfInput2++;
+    }
+  }
+
+  /*
+   * failed to set the correct ts order yet in two cases:
+   * 1. only one element
+   * 2. only one element for each tag.
+   */
+  if (output1->tsOrder == -1) {
+    output1->tsOrder = TSDB_ORDER_ASC;
+    output2->tsOrder = TSDB_ORDER_ASC;
+  }
+
+  tsBufFlush(output1);
+  tsBufFlush(output2);
+
+  tsBufDestroy(pSupporter1->pTSBuf);
+  tsBufDestroy(pSupporter2->pTSBuf);
+
+  tscDebug("%p input1:%" PRId64 ", input2:%" PRId64 ", final:%" PRId64 " for secondary query after ts blocks "
+           "intersecting, skey:%" PRId64 ", ekey:%" PRId64, pSql, numOfInput1, numOfInput2, output1->numOfTotal,
+           win->skey, win->ekey);
+
+  return output1->numOfTotal;
+}
+
+// todo handle failed to create sub query
+SJoinSupporter* tscCreateJoinSupporter(SSqlObj* pSql, SSubqueryState* pState, int32_t index) {
+  SJoinSupporter* pSupporter = calloc(1, sizeof(SJoinSupporter));
+  if (pSupporter == NULL) {
+    return NULL;
+  }
+
+  pSupporter->pObj = pSql;
+  pSupporter->pState = pState;
+
+  pSupporter->subqueryIndex = index;
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+  
+  memcpy(&pSupporter->interval, &pQueryInfo->interval, sizeof(pSupporter->interval));
+  pSupporter->limit = pQueryInfo->limit;
+
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, pSql->cmd.clauseIndex, index);
+  pSupporter->uid = pTableMetaInfo->pTableMeta->id.uid;
+  assert (pSupporter->uid != 0);
+
+  taosGetTmpfilePath("join-", pSupporter->path);
+  pSupporter->f = fopen(pSupporter->path, "w");
+
+  // todo handle error
+  if (pSupporter->f == NULL) {
+    tscError("%p failed to create tmp file:%s, reason:%s", pSql, pSupporter->path, strerror(errno));
+  }
+
+  return pSupporter;
+}
+
+static void tscDestroyJoinSupporter(SJoinSupporter* pSupporter) {
+  if (pSupporter == NULL) {
+    return;
+  }
+
+  if (pSupporter->exprList != NULL) {
+    tscSqlExprInfoDestroy(pSupporter->exprList);
+  }
+  
+  if (pSupporter->colList != NULL) {
+    tscColumnListDestroy(pSupporter->colList);
+  }
+
+  tscFieldInfoClear(&pSupporter->fieldsInfo);
+
+  if (pSupporter->f != NULL) {
+    fclose(pSupporter->f);
+    unlink(pSupporter->path);
+    pSupporter->f = NULL;
+  }
+
+  taosTFree(pSupporter->pIdTagList);
+  tscTagCondRelease(&pSupporter->tagCond);
+  free(pSupporter);
+}
+
+/*
+ * need the secondary query process
+ * In case of count(ts)/count(*)/spread(ts) query, that are only applied to
+ * primary timestamp column , the secondary query is not necessary
+ *
+ */
+static UNUSED_FUNC bool needSecondaryQuery(SQueryInfo* pQueryInfo) {
+  size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
+  
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumn* base = taosArrayGet(pQueryInfo->colList, i);
+    if (base->colIndex.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/*
+ * launch secondary stage query to fetch the result that contains timestamp in set
+ */
+static int32_t tscLaunchRealSubqueries(SSqlObj* pSql) {
+  int32_t         numOfSub = 0;
+  SJoinSupporter* pSupporter = NULL;
+  
+  //If the columns are not involved in the final select clause, the corresponding query will not be issued.
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    pSupporter = pSql->pSubs[i]->param;
+    if (taosArrayGetSize(pSupporter->exprList) > 0) {
+      ++numOfSub;
+    }
+  }
+  
+  assert(numOfSub > 0);
+  
+  // scan all subquery, if one sub query has only ts, ignore it
+  tscDebug("%p start to launch secondary subqueries, total:%d, only:%d needs to query", pSql, pSql->numOfSubs, numOfSub);
+
+  //the subqueries that do not actually launch the secondary query to virtual node is set as completed.
+  SSubqueryState* pState = pSupporter->pState;
+  pState->numOfTotal = pSql->numOfSubs;
+  pState->numOfRemain = numOfSub;
+  
+  bool success = true;
+  
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    SSqlObj *pPrevSub = pSql->pSubs[i];
+    pSql->pSubs[i] = NULL;
+    
+    pSupporter = pPrevSub->param;
+  
+    if (taosArrayGetSize(pSupporter->exprList) == 0) {
+      tscDebug("%p subIndex: %d, no need to launch query, ignore it", pSql, i);
+    
+      tscDestroyJoinSupporter(pSupporter);
+      taos_free_result(pPrevSub);
+    
+      pSql->pSubs[i] = NULL;
+      continue;
+    }
+  
+    SQueryInfo *pSubQueryInfo = tscGetQueryInfoDetail(&pPrevSub->cmd, 0);
+    STSBuf *pTSBuf = pSubQueryInfo->tsBuf;
+    pSubQueryInfo->tsBuf = NULL;
+  
+    // free result for async object will also free sqlObj
+    assert(tscSqlExprNumOfExprs(pSubQueryInfo) == 1); // ts_comp query only requires one resutl columns
+    taos_free_result(pPrevSub);
+  
+    SSqlObj *pNew = createSubqueryObj(pSql, (int16_t) i, tscJoinQueryCallback, pSupporter, TSDB_SQL_SELECT, NULL);
+    if (pNew == NULL) {
+      tscDestroyJoinSupporter(pSupporter);
+      success = false;
+      break;
+    }
+
+    tscClearSubqueryInfo(&pNew->cmd);
+    pSql->pSubs[i] = pNew;
+  
+    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+    pQueryInfo->tsBuf = pTSBuf;  // transfer the ownership of timestamp comp-z data to the new created object
+
+    // set the second stage sub query for join process
+    TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE);
+
+    memcpy(&pQueryInfo->interval, &pSupporter->interval, sizeof(pQueryInfo->interval));
+
+    tscTagCondCopy(&pQueryInfo->tagCond, &pSupporter->tagCond);
+
+    pQueryInfo->colList = pSupporter->colList;
+    pQueryInfo->exprList = pSupporter->exprList;
+    pQueryInfo->fieldsInfo = pSupporter->fieldsInfo;
+
+    pSupporter->exprList = NULL;
+    pSupporter->colList = NULL;
+    memset(&pSupporter->fieldsInfo, 0, sizeof(SFieldInfo));
+  
+    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+    assert(pNew->numOfSubs == 0 && pNew->cmd.numOfClause == 1 && pNewQueryInfo->numOfTables == 1);
+  
+    tscFieldInfoUpdateOffset(pNewQueryInfo);
+  
+    STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pNewQueryInfo, 0);
+  
+    /*
+     * When handling the projection query, the offset value will be modified for table-table join, which is changed
+     * during the timestamp intersection.
+     */
+    pSupporter->limit = pQueryInfo->limit;
+    pNewQueryInfo->limit = pSupporter->limit;
+
+    SColumnIndex index = {.tableIndex = 0, .columnIndex = PRIMARYKEY_TIMESTAMP_COL_INDEX};
+    SSchema* s = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, 0);
+
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, 0);
+    int16_t funcId = pExpr->functionId;
+
+    if ((pExpr->colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX) ||
+        (funcId != TSDB_FUNC_TS && funcId != TSDB_FUNC_TS_DUMMY && funcId != TSDB_FUNC_PRJ)) {
+
+      int16_t functionId = tscIsProjectionQuery(pQueryInfo)? TSDB_FUNC_PRJ : TSDB_FUNC_TS;
+
+      tscAddSpecialColumnForSelect(pQueryInfo, 0, functionId, &index, s, TSDB_COL_NORMAL);
+      tscPrintSelectClause(pNew, 0);
+      tscFieldInfoUpdateOffset(pNewQueryInfo);
+
+      pExpr = tscSqlExprGet(pQueryInfo, 0);
+    }
+
+    // set the join condition tag column info, todo extract method
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+      assert(pQueryInfo->tagCond.joinInfo.hasJoin);
+      int16_t colId = tscGetJoinTagColIdByUid(&pQueryInfo->tagCond, pTableMetaInfo->pTableMeta->id.uid);
+
+      // set the tag column id for executor to extract correct tag value
+      pExpr->param[0].i64Key = colId;
+      pExpr->numOfParams = 1;
+    }
+
+    size_t numOfCols = taosArrayGetSize(pNewQueryInfo->colList);
+    tscDebug("%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
+             pSql, pNew, 0, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, taosArrayGetSize(pNewQueryInfo->exprList),
+             numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
+  }
+  
+  //prepare the subqueries object failed, abort
+  if (!success) {
+    pSql->res.code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscError("%p failed to prepare subqueries objs for secondary phase query, numOfSub:%d, code:%d", pSql,
+        pSql->numOfSubs, pSql->res.code);
+    freeJoinSubqueryObj(pSql);
+    
+    return pSql->res.code;
+  }
+  
+  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    if (pSql->pSubs[i] == NULL) {
+      continue;
+    }
+
+    tscDoQuery(pSql->pSubs[i]);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void freeJoinSubqueryObj(SSqlObj* pSql) {
+  SSubqueryState* pState = NULL;
+
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    SSqlObj* pSub = pSql->pSubs[i];
+    if (pSub == NULL) {
+      continue;
+    }
+    
+    SJoinSupporter* p = pSub->param;
+    pState = p->pState;
+
+    tscDestroyJoinSupporter(p);
+
+    if (pSub->res.code == TSDB_CODE_SUCCESS) {
+      taos_free_result(pSub);
+    }
+  }
+
+  taosTFree(pState);
+  pSql->numOfSubs = 0;
+}
+
+static void quitAllSubquery(SSqlObj* pSqlObj, SJoinSupporter* pSupporter) {
+  assert(pSupporter->pState->numOfRemain > 0);
+
+  if (atomic_sub_fetch_32(&pSupporter->pState->numOfRemain, 1) <= 0) {
+    tscError("%p all subquery return and query failed, global code:%d", pSqlObj, pSqlObj->res.code);
+    freeJoinSubqueryObj(pSqlObj);
+  }
+}
+
+// update the query time range according to the join results on timestamp
+static void updateQueryTimeRange(SQueryInfo* pQueryInfo, STimeWindow* win) {
+  assert(pQueryInfo->window.skey <= win->skey && pQueryInfo->window.ekey >= win->ekey);
+  pQueryInfo->window = *win;
+}
+
+int32_t tscCompareTidTags(const void* p1, const void* p2) {
+  const STidTags* t1 = (const STidTags*) varDataVal(p1);
+  const STidTags* t2 = (const STidTags*) varDataVal(p2);
+  
+  if (t1->vgId != t2->vgId) {
+    return (t1->vgId > t2->vgId) ? 1 : -1;
+  }
+
+  if (t1->tid != t2->tid) {
+    return (t1->tid > t2->tid) ? 1 : -1;
+  }
+  return 0;
+}
+
+void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArray* tables) {
+  SArray*   result = taosArrayInit(4, sizeof(SVgroupTableInfo));
+  SArray*   vgTables = NULL;
+  STidTags* prev = NULL;
+
+  size_t numOfTables = taosArrayGetSize(tables);
+  for (size_t i = 0; i < numOfTables; i++) {
+    STidTags* tt = taosArrayGet(tables, i);
+
+    if (prev == NULL || tt->vgId != prev->vgId) {
+      SVgroupsInfo* pvg = pTableMetaInfo->vgroupList;
+
+      SVgroupTableInfo info = {{0}};
+      for (int32_t m = 0; m < pvg->numOfVgroups; ++m) {
+        if (tt->vgId == pvg->vgroups[m].vgId) {
+          info.vgInfo = pvg->vgroups[m];
+          break;
+        }
+      }
+      assert(info.vgInfo.numOfEps != 0);
+
+      vgTables = taosArrayInit(4, sizeof(STableIdInfo));
+      info.itemList = vgTables;
+      taosArrayPush(result, &info);
+    }
+
+    tscDebug("%p tid:%d, uid:%"PRIu64",vgId:%d added for vnode query", pSql, tt->tid, tt->uid, tt->vgId)
+    STableIdInfo item = {.uid = tt->uid, .tid = tt->tid, .key = INT64_MIN};
+    taosArrayPush(vgTables, &item);
+    prev = tt;
+  }
+
+  pTableMetaInfo->pVgroupTables = result;
+  pTableMetaInfo->vgroupIndex = 0;
+}
+
+static void issueTSCompQuery(SSqlObj* pSql, SJoinSupporter* pSupporter, SSqlObj* pParent) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  tscClearSubqueryInfo(pCmd);
+  tscFreeSqlResult(pSql);
+  
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  
+  tscInitQueryInfo(pQueryInfo);
+
+  TSDB_QUERY_CLEAR_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY);
+  TSDB_QUERY_SET_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
+  
+  pCmd->command = TSDB_SQL_SELECT;
+  pSql->fp = tscJoinQueryCallback;
+  
+  SSchema colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = 1};
+  
+  SColumnIndex index = {0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
+  tscAddSpecialColumnForSelect(pQueryInfo, 0, TSDB_FUNC_TS_COMP, &index, &colSchema, TSDB_COL_NORMAL);
+  
+  // set the tags value for ts_comp function
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, 0);
+    int16_t tagColId = tscGetJoinTagColIdByUid(&pSupporter->tagCond, pTableMetaInfo->pTableMeta->id.uid);
+    pExpr->param->i64Key = tagColId;
+    pExpr->numOfParams = 1;
+  }
+
+  // add the filter tag column
+  if (pSupporter->colList != NULL) {
+    size_t s = taosArrayGetSize(pSupporter->colList);
+    
+    for (int32_t i = 0; i < s; ++i) {
+      SColumn *pCol = taosArrayGetP(pSupporter->colList, i);
+      
+      if (pCol->numOfFilters > 0) {  // copy to the pNew->cmd.colList if it is filtered.
+        SColumn *p = tscColumnClone(pCol);
+        taosArrayPush(pQueryInfo->colList, &p);
+      }
+    }
+  }
+  
+  size_t numOfCols = taosArrayGetSize(pQueryInfo->colList);
+  
+  tscDebug(
+      "%p subquery:%p tableIndex:%d, vgroupIndex:%d, numOfVgroups:%d, type:%d, ts_comp query to retrieve timestamps, "
+      "numOfExpr:%" PRIzu ", colList:%" PRIzu ", numOfOutputFields:%d, name:%s",
+      pParent, pSql, 0, pTableMetaInfo->vgroupIndex, pTableMetaInfo->vgroupList->numOfVgroups, pQueryInfo->type,
+      tscSqlExprNumOfExprs(pQueryInfo), numOfCols, pQueryInfo->fieldsInfo.numOfOutput, pTableMetaInfo->name);
+  
+  tscProcessSql(pSql);
+}
+
+static bool checkForDuplicateTagVal(SQueryInfo* pQueryInfo, SJoinSupporter* p1, SSqlObj* pPSqlObj) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  SSchema* pSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);// todo: tags mismatch, tags not completed
+  SColumn *pCol = taosArrayGetP(pTableMetaInfo->tagColList, 0);
+  SSchema *pColSchema = &pSchema[pCol->colIndex.columnIndex];
+
+  for(int32_t i = 1; i < p1->num; ++i) {
+    STidTags* prev = (STidTags*) varDataVal(p1->pIdTagList + (i - 1) * p1->tagSize);
+    STidTags* p = (STidTags*) varDataVal(p1->pIdTagList + i * p1->tagSize);
+    assert(prev->vgId >= 1 && p->vgId >= 1);
+
+    if (doCompare(prev->tag, p->tag, pColSchema->type, pColSchema->bytes) == 0) {
+      tscError("%p join tags have same value for different table, free all sub SqlObj and quit", pPSqlObj);
+      pPSqlObj->res.code = TSDB_CODE_QRY_DUP_JOIN_KEY;
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pParentSql, SArray** s1, SArray** s2) {
+  tscDebug("%p all subqueries retrieve <tid, tags> complete, do tags match", pParentSql);
+
+  SJoinSupporter* p1 = pParentSql->pSubs[0]->param;
+  SJoinSupporter* p2 = pParentSql->pSubs[1]->param;
+
+  qsort(p1->pIdTagList, p1->num, p1->tagSize, tscCompareTidTags);
+  qsort(p2->pIdTagList, p2->num, p2->tagSize, tscCompareTidTags);
+
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  int16_t tagColId = tscGetJoinTagColIdByUid(&pQueryInfo->tagCond, pTableMetaInfo->pTableMeta->id.uid);
+
+  SSchema* pColSchema = tscGetTableColumnSchemaById(pTableMetaInfo->pTableMeta, tagColId);
+
+  // int16_t for padding
+  *s1 = taosArrayInit(p1->num, p1->tagSize - sizeof(int16_t));
+  *s2 = taosArrayInit(p2->num, p2->tagSize - sizeof(int16_t));
+
+  if (!(checkForDuplicateTagVal(pQueryInfo, p1, pParentSql) && checkForDuplicateTagVal(pQueryInfo, p2, pParentSql))) {
+    return TSDB_CODE_QRY_DUP_JOIN_KEY;
+  }
+
+  int32_t i = 0, j = 0;
+  while(i < p1->num && j < p2->num) {
+    STidTags* pp1 = (STidTags*) varDataVal(p1->pIdTagList + i * p1->tagSize);
+    STidTags* pp2 = (STidTags*) varDataVal(p2->pIdTagList + j * p2->tagSize);
+    assert(pp1->tid != 0 && pp2->tid != 0);
+
+    int32_t ret = doCompare(pp1->tag, pp2->tag, pColSchema->type, pColSchema->bytes);
+    if (ret == 0) {
+      tscDebug("%p tag matched, vgId:%d, val:%d, tid:%d, uid:%"PRIu64", tid:%d, uid:%"PRIu64, pParentSql, pp1->vgId,
+               *(int*) pp1->tag, pp1->tid, pp1->uid, pp2->tid, pp2->uid);
+
+      taosArrayPush(*s1, pp1);
+      taosArrayPush(*s2, pp2);
+      j++;
+      i++;
+    } else if (ret > 0) {
+      j++;
+    } else {
+      i++;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRows) {
+  SJoinSupporter* pSupporter = (SJoinSupporter*)param;
+
+  SSqlObj* pParentSql = pSupporter->pObj;
+
+  SSqlObj* pSql = (SSqlObj*)tres;
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  assert(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY));
+
+  // check for the error code firstly
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    // todo retry if other subqueries are not failed
+
+    assert(numOfRows < 0 && numOfRows == taos_errno(pSql));
+    tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex);
+
+    pParentSql->res.code = numOfRows;
+    quitAllSubquery(pParentSql, pSupporter);
+
+    tscQueueAsyncRes(pParentSql);
+    return;
+  }
+
+  // keep the results in memory
+  if (numOfRows > 0) {
+    size_t validLen = (size_t)(pSupporter->tagSize * pRes->numOfRows);
+    size_t length = pSupporter->totalLen + validLen;
+
+    // todo handle memory error
+    char* tmp = realloc(pSupporter->pIdTagList, length);
+    if (tmp == NULL) {
+      tscError("%p failed to malloc memory", pSql);
+
+      pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
+      quitAllSubquery(pParentSql, pSupporter);
+
+      tscQueueAsyncRes(pParentSql);
+      return;
+    }
+
+    pSupporter->pIdTagList = tmp;
+
+    memcpy(pSupporter->pIdTagList + pSupporter->totalLen, pRes->data, validLen);
+    pSupporter->totalLen += (int32_t)validLen;
+    pSupporter->num += (int32_t)pRes->numOfRows;
+
+    // query not completed, continue to retrieve tid + tag tuples
+    if (!pRes->completed) {
+      taos_fetch_rows_a(tres, tidTagRetrieveCallback, param);
+      return;
+    }
+  }
+
+  // data in current vnode has all returned to client, try next vnode if exits
+  // <tid + tag> tuples have been retrieved to client, try <tid + tag> tuples from the next vnode
+  if (hasMoreVnodesToTry(pSql)) {
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+    int32_t totalVgroups = pTableMetaInfo->vgroupList->numOfVgroups;
+    pTableMetaInfo->vgroupIndex += 1;
+    assert(pTableMetaInfo->vgroupIndex < totalVgroups);
+
+    tscDebug("%p tid_tag from vgroup index:%d completed, try next vgroup:%d. total vgroups:%d. current numOfRes:%d",
+             pSql, pTableMetaInfo->vgroupIndex - 1, pTableMetaInfo->vgroupIndex, totalVgroups, pSupporter->num);
+
+    pCmd->command = TSDB_SQL_SELECT;
+    tscResetForNextRetrieve(&pSql->res);
+
+    // set the callback function
+    pSql->fp = tscJoinQueryCallback;
+    tscProcessSql(pSql);
+    return;
+  }
+
+  // no data exists in next vnode, mark the <tid, tags> query completed
+  // only when there is no subquery exits any more, proceeds to get the intersect of the <tid, tags> tuple sets.
+  if (atomic_sub_fetch_32(&pSupporter->pState->numOfRemain, 1) > 0) {
+    return;
+  }
+
+  SArray *s1 = NULL, *s2 = NULL;
+  int32_t code = getIntersectionOfTableTuple(pQueryInfo, pParentSql, &s1, &s2);
+  if (code != TSDB_CODE_SUCCESS) {
+    freeJoinSubqueryObj(pParentSql);
+    pParentSql->res.code = code;
+    tscQueueAsyncRes(pParentSql);
+
+    taosArrayDestroy(s1);
+    taosArrayDestroy(s2);
+    return;
+  }
+
+  if (taosArrayGetSize(s1) == 0 || taosArrayGetSize(s2) == 0) {  // no results,return.
+    tscDebug("%p tag intersect does not generated qualified tables for join, free all sub SqlObj and quit", pParentSql);
+    freeJoinSubqueryObj(pParentSql);
+
+    // set no result command
+    pParentSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+    (*pParentSql->fp)(pParentSql->param, pParentSql, 0);
+  } else {
+    // proceed to for ts_comp query
+    SSqlCmd* pSubCmd1 = &pParentSql->pSubs[0]->cmd;
+    SSqlCmd* pSubCmd2 = &pParentSql->pSubs[1]->cmd;
+
+    SQueryInfo*     pQueryInfo1 = tscGetQueryInfoDetail(pSubCmd1, 0);
+    STableMetaInfo* pTableMetaInfo1 = tscGetMetaInfo(pQueryInfo1, 0);
+    tscBuildVgroupTableInfo(pParentSql, pTableMetaInfo1, s1);
+
+    SQueryInfo*     pQueryInfo2 = tscGetQueryInfoDetail(pSubCmd2, 0);
+    STableMetaInfo* pTableMetaInfo2 = tscGetMetaInfo(pQueryInfo2, 0);
+    tscBuildVgroupTableInfo(pParentSql, pTableMetaInfo2, s2);
+
+    pSupporter->pState->numOfTotal = 2;
+    pSupporter->pState->numOfRemain = pSupporter->pState->numOfTotal;
+
+    for (int32_t m = 0; m < pParentSql->numOfSubs; ++m) {
+      SSqlObj* sub = pParentSql->pSubs[m];
+      issueTSCompQuery(sub, sub->param, pParentSql);
+    }
+  }
+
+  taosArrayDestroy(s1);
+  taosArrayDestroy(s2);
+}
+
+static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRows) {
+  SJoinSupporter* pSupporter = (SJoinSupporter*)param;
+
+  SSqlObj* pParentSql = pSupporter->pObj;
+
+  SSqlObj* pSql = (SSqlObj*)tres;
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  assert(!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE));
+
+  // check for the error code firstly
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    // todo retry if other subqueries are not failed yet 
+    assert(numOfRows < 0 && numOfRows == taos_errno(pSql));
+    tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex);
+
+    pParentSql->res.code = numOfRows;
+    quitAllSubquery(pParentSql, pSupporter);
+
+    tscQueueAsyncRes(pParentSql);
+    return;
+  }
+
+  if (numOfRows > 0) {  // write the compressed timestamp to disk file
+    fwrite(pRes->data, (size_t)pRes->numOfRows, 1, pSupporter->f);
+    fclose(pSupporter->f);
+    pSupporter->f = NULL;
+
+    STSBuf* pBuf = tsBufCreateFromFile(pSupporter->path, true);
+    if (pBuf == NULL) {  // in error process, close the fd
+      tscError("%p invalid ts comp file from vnode, abort subquery, file size:%d", pSql, numOfRows);
+
+      pParentSql->res.code = TAOS_SYSTEM_ERROR(errno);
+      tscQueueAsyncRes(pParentSql);
+
+      return;
+    }
+
+    if (pSupporter->pTSBuf == NULL) {
+      tscDebug("%p create tmp file for ts block:%s, size:%d bytes", pSql, pBuf->path, numOfRows);
+      pSupporter->pTSBuf = pBuf;
+    } else {
+      assert(pQueryInfo->numOfTables == 1);  // for subquery, only one
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+      tsBufMerge(pSupporter->pTSBuf, pBuf, pTableMetaInfo->vgroupIndex);
+      tsBufDestroy(pBuf);
+    }
+
+    // continue to retrieve ts-comp data from vnode
+    if (!pRes->completed) {
+      taosGetTmpfilePath("ts-join", pSupporter->path);
+      pSupporter->f = fopen(pSupporter->path, "w");
+      pRes->row = (int32_t)pRes->numOfRows;
+
+      taos_fetch_rows_a(tres, tsCompRetrieveCallback, param);
+      return;
+    }
+  }
+
+  if (hasMoreVnodesToTry(pSql)) {
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+    int32_t totalVgroups = pTableMetaInfo->vgroupList->numOfVgroups;
+    pTableMetaInfo->vgroupIndex += 1;
+    assert(pTableMetaInfo->vgroupIndex < totalVgroups);
+
+    tscDebug("%p results from vgroup index:%d completed, try next vgroup:%d. total vgroups:%d. current numOfRes:%" PRId64,
+             pSql, pTableMetaInfo->vgroupIndex - 1, pTableMetaInfo->vgroupIndex, totalVgroups,
+             pRes->numOfClauseTotal);
+
+    pCmd->command = TSDB_SQL_SELECT;
+    tscResetForNextRetrieve(&pSql->res);
+
+    assert(pSupporter->f == NULL);
+    taosGetTmpfilePath("ts-join", pSupporter->path);
+    
+    // TODO check for failure
+    pSupporter->f = fopen(pSupporter->path, "w");
+    pRes->row = (int32_t)pRes->numOfRows;
+
+    // set the callback function
+    pSql->fp = tscJoinQueryCallback;
+    tscProcessSql(pSql);
+    return;
+  }
+
+  if (atomic_sub_fetch_32(&pSupporter->pState->numOfRemain, 1) > 0) {
+    return;
+  }
+
+  tscDebug("%p all subquery retrieve ts complete, do ts block intersect", pParentSql);
+
+  // proceeds to launched secondary query to retrieve final data
+  SJoinSupporter* p1 = pParentSql->pSubs[0]->param;
+  SJoinSupporter* p2 = pParentSql->pSubs[1]->param;
+
+  STimeWindow win = TSWINDOW_INITIALIZER;
+  int64_t num = doTSBlockIntersect(pParentSql, p1, p2, &win);
+  if (num <= 0) {  // no result during ts intersect
+    tscDebug("%p no results generated in ts intersection, free all sub SqlObj and quit", pParentSql);
+    freeJoinSubqueryObj(pParentSql);
+
+    // set no result command
+    pParentSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+    (*pParentSql->fp)(pParentSql->param, pParentSql, 0);
+    return;
+  }
+
+  // launch the query the retrieve actual results from vnode along with the filtered timestamp
+  SQueryInfo* pPQueryInfo = tscGetQueryInfoDetail(&pParentSql->cmd, pParentSql->cmd.clauseIndex);
+  updateQueryTimeRange(pPQueryInfo, &win);
+  tscLaunchRealSubqueries(pParentSql);
+}
+
+static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfRows) {
+  SJoinSupporter* pSupporter = (SJoinSupporter*)param;
+
+  SSqlObj* pParentSql = pSupporter->pObj;
+  SSubqueryState* pState = pSupporter->pState;
+
+  SSqlObj* pSql = (SSqlObj*)tres;
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    assert(numOfRows == taos_errno(pSql));
+
+    pParentSql->res.code = numOfRows;
+    tscError("%p retrieve failed, index:%d, code:%s", pSql, pSupporter->subqueryIndex, tstrerror(numOfRows));
+
+    tscQueueAsyncRes(pParentSql);
+    return;
+  }
+
+  if (numOfRows >= 0) {
+    pRes->numOfTotal += pRes->numOfRows;
+  }
+
+  if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && numOfRows == 0) {
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+    assert(pQueryInfo->numOfTables == 1);
+
+    // for projection query, need to try next vnode if current vnode is exhausted
+    if ((++pTableMetaInfo->vgroupIndex) < pTableMetaInfo->vgroupList->numOfVgroups) {
+      pState->numOfRemain = 1;
+      pState->numOfTotal = 1;
+
+      pSql->cmd.command = TSDB_SQL_SELECT;
+      pSql->fp = tscJoinQueryCallback;
+      tscProcessSql(pSql);
+
+      return;
+    }
+  }
+
+  if (atomic_sub_fetch_32(&pState->numOfRemain, 1) > 0) {
+    tscDebug("%p sub:%p completed, remain:%d, total:%d", pParentSql, tres, pState->numOfRemain, pState->numOfTotal);
+    return;
+  }
+
+  tscDebug("%p all %d secondary subqueries retrieval completed, code:%d", tres, pState->numOfTotal, pParentSql->res.code);
+
+  if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
+    freeJoinSubqueryObj(pParentSql);
+    pParentSql->res.completed = true;
+  }
+
+  // update the records for each subquery in parent sql object.
+  for (int32_t i = 0; i < pParentSql->numOfSubs; ++i) {
+    if (pParentSql->pSubs[i] == NULL) {
+      continue;
+    }
+
+    SSqlRes* pRes1 = &pParentSql->pSubs[i]->res;
+    pRes1->numOfClauseTotal += pRes1->numOfRows;
+  }
+
+  // data has retrieved to client, build the join results
+  tscBuildResFromSubqueries(pParentSql);
+}
+
+static SJoinSupporter* tscUpdateSubqueryStatus(SSqlObj* pSql, int32_t numOfFetch) {
+  int32_t notInvolved = 0;
+  SJoinSupporter* pSupporter = NULL;
+  SSubqueryState* pState = NULL;
+  
+  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    if (pSql->pSubs[i] == NULL) {
+      notInvolved++;
+    } else {
+      pSupporter = (SJoinSupporter*)pSql->pSubs[i]->param;
+      pState = pSupporter->pState;
+    }
+  }
+  
+  assert(pState != NULL);
+  if (pState != NULL) {
+    pState->numOfTotal = pSql->numOfSubs;
+    pState->numOfRemain = numOfFetch;
+  }
+  
+  return pSupporter;
+}
+
+void tscFetchDatablockFromSubquery(SSqlObj* pSql) {
+  assert(pSql->numOfSubs >= 1);
+  
+  int32_t numOfFetch = 0;
+  bool hasData = true;
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    // if the subquery is NULL, it does not involved in the final result generation
+    SSqlObj* pSub = pSql->pSubs[i];
+    if (pSub == NULL) {
+      continue;
+    }
+    
+    SSqlRes *pRes = &pSub->res;
+    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSub->cmd, 0);
+
+    if (!tscHasReachLimitation(pQueryInfo, pRes)) {
+      if (pRes->row >= pRes->numOfRows) {
+        hasData = false;
+
+        if (!pRes->completed) {
+          numOfFetch++;
+        }
+      }
+    } else {  // has reach the limitation, no data anymore
+      if (pRes->row >= pRes->numOfRows) {
+        hasData = false;
+        break;
+      }
+    }
+  }
+
+  // has data remains in client side, and continue to return data to app
+  if (hasData) {
+    tscBuildResFromSubqueries(pSql);
+    return;
+  } else if (numOfFetch <= 0) {
+    pSql->res.completed = true;
+    freeJoinSubqueryObj(pSql);
+    
+    if (pSql->res.code == TSDB_CODE_SUCCESS) {
+      (*pSql->fp)(pSql->param, pSql, 0);
+    } else {
+      tscQueueAsyncRes(pSql);
+    }
+    
+    return;
+  }
+
+  // TODO multi-vnode retrieve for projection query with limitation has bugs, since the global limiation is not handled
+  tscDebug("%p retrieve data from %d subqueries", pSql, numOfFetch);
+  SJoinSupporter* pSupporter = tscUpdateSubqueryStatus(pSql, numOfFetch);
+  
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    SSqlObj* pSql1 = pSql->pSubs[i];
+    if (pSql1 == NULL) {
+      continue;
+    }
+    
+    SSqlRes* pRes1 = &pSql1->res;
+    SSqlCmd* pCmd1 = &pSql1->cmd;
+
+    pSupporter = (SJoinSupporter*)pSql1->param;
+
+    // wait for all subqueries completed
+    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd1, 0);
+    assert(pRes1->numOfRows >= 0 && pQueryInfo->numOfTables == 1);
+
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+    
+    if (pRes1->row >= pRes1->numOfRows) {
+      tscDebug("%p subquery:%p retrieve data from vnode, subquery:%d, vgroupIndex:%d", pSql, pSql1,
+               pSupporter->subqueryIndex, pTableMetaInfo->vgroupIndex);
+
+      tscResetForNextRetrieve(pRes1);
+      pSql1->fp = joinRetrieveFinalResCallback;
+
+      if (pCmd1->command < TSDB_SQL_LOCAL) {
+        pCmd1->command = (pCmd1->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
+      }
+
+      tscProcessSql(pSql1);
+    }
+  }
+}
+
+// all subqueries return, set the result output index
+void tscSetupOutputColumnIndex(SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  tscDebug("%p all subquery response, retrieve data for subclause:%d", pSql, pCmd->clauseIndex);
+
+  // the column transfer support struct has been built
+  if (pRes->pColumnIndex != NULL) {
+    return;
+  }
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  int32_t numOfExprs = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+  pRes->pColumnIndex = calloc(1, sizeof(SColumnIndex) * numOfExprs);
+  if (pRes->pColumnIndex == NULL) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return;
+  }
+
+  for (int32_t i = 0; i < numOfExprs; ++i) {
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+
+    int32_t tableIndexOfSub = -1;
+    for (int32_t j = 0; j < pQueryInfo->numOfTables; ++j) {
+      STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, j);
+      if (pTableMetaInfo->pTableMeta->id.uid == pExpr->uid) {
+        tableIndexOfSub = j;
+        break;
+      }
+    }
+
+    assert(tableIndexOfSub >= 0 && tableIndexOfSub < pQueryInfo->numOfTables);
+    
+    SSqlCmd* pSubCmd = &pSql->pSubs[tableIndexOfSub]->cmd;
+    SQueryInfo* pSubQueryInfo = tscGetQueryInfoDetail(pSubCmd, 0);
+    
+    size_t numOfSubExpr = taosArrayGetSize(pSubQueryInfo->exprList);
+    for (int32_t k = 0; k < numOfSubExpr; ++k) {
+      SSqlExpr* pSubExpr = tscSqlExprGet(pSubQueryInfo, k);
+      if (pExpr->functionId == pSubExpr->functionId && pExpr->colInfo.colId == pSubExpr->colInfo.colId) {
+        pRes->pColumnIndex[i] = (SColumnIndex){.tableIndex = tableIndexOfSub, .columnIndex = k};
+        break;
+      }
+    }
+  }
+
+  // restore the offset value for super table query in case of final result.
+  tscRestoreSQLFuncForSTableQuery(pQueryInfo);
+  tscFieldInfoUpdateOffset(pQueryInfo);
+}
+
+void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) {
+  SSqlObj* pSql = (SSqlObj*)tres;
+
+  SJoinSupporter* pSupporter = (SJoinSupporter*)param;
+  SSqlObj* pParentSql = pSupporter->pObj;
+
+  // There is only one subquery and table for each subquery.
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  assert(pQueryInfo->numOfTables == 1 && pSql->cmd.numOfClause == 1);
+
+  // retrieve actual query results from vnode during the second stage join subquery
+  if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
+    tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, code, pParentSql->res.code);
+    quitAllSubquery(pParentSql, pSupporter);
+    tscQueueAsyncRes(pParentSql);
+
+    return;
+  }
+
+  // TODO here retry is required, not directly returns to client
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    assert(taos_errno(pSql) == code);
+
+    tscError("%p abort query, code:%s, global code:%s", pSql, tstrerror(code), tstrerror(pParentSql->res.code));
+    pParentSql->res.code = code;
+
+    quitAllSubquery(pParentSql, pSupporter);
+    tscQueueAsyncRes(pParentSql);
+
+    return;
+  }
+
+  // retrieve <tid, tag> tuples from vnode
+  if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY)) {
+    pSql->fp = tidTagRetrieveCallback;
+    pSql->cmd.command = TSDB_SQL_FETCH;
+    tscProcessSql(pSql);
+    return;
+  }
+
+  // retrieve ts_comp info from vnode
+  if (!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
+    pSql->fp = tsCompRetrieveCallback;
+    pSql->cmd.command = TSDB_SQL_FETCH;
+    tscProcessSql(pSql);
+    return;
+  }
+
+  // wait for the other subqueries response from vnode
+  if (atomic_sub_fetch_32(&pSupporter->pState->numOfRemain, 1) > 0) {
+    return;
+  }
+
+  tscSetupOutputColumnIndex(pParentSql);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  /**
+   * if the query is a continue query (vgroupIndex > 0 for projection query) for next vnode, do the retrieval of
+   * data instead of returning to its invoker
+   */
+  if (pTableMetaInfo->vgroupIndex > 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+    pSupporter->pState->numOfRemain = pSupporter->pState->numOfTotal;  // reset the record value
+
+    pSql->fp = joinRetrieveFinalResCallback;  // continue retrieve data
+    pSql->cmd.command = TSDB_SQL_FETCH;
+    tscProcessSql(pSql);
+  } else {  // first retrieve from vnode during the secondary stage sub-query
+    // set the command flag must be after the semaphore been correctly set.
+    if (pParentSql->res.code == TSDB_CODE_SUCCESS) {
+      (*pParentSql->fp)(pParentSql->param, pParentSql, 0);
+    } else {
+      tscQueueAsyncRes(pParentSql);
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code);
+
+static SSqlObj *tscCreateSTableSubquery(SSqlObj *pSql, SRetrieveSupport *trsupport, SSqlObj *prevSqlObj);
+
+// TODO
+int32_t tscCreateJoinSubquery(SSqlObj *pSql, int16_t tableIndex, SJoinSupporter *pSupporter) {
+  SSqlCmd *   pCmd = &pSql->cmd;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  
+  pSql->res.qhandle = 0x1;
+  assert(pSql->res.numOfRows == 0);
+
+  if (pSql->pSubs == NULL) {
+    pSql->pSubs = calloc(pSupporter->pState->numOfTotal, POINTER_BYTES);
+    if (pSql->pSubs == NULL) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+  }
+  
+  SSqlObj *pNew = createSubqueryObj(pSql, tableIndex, tscJoinQueryCallback, pSupporter, TSDB_SQL_SELECT, NULL);
+  if (pNew == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+  
+  pSql->pSubs[pSql->numOfSubs++] = pNew;
+  assert(pSql->numOfSubs <= pSupporter->pState->numOfTotal);
+  
+  if (QUERY_IS_JOIN_QUERY(pQueryInfo->type)) {
+    addGroupInfoForSubquery(pSql, pNew, 0, tableIndex);
+    
+    // refactor as one method
+    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+    assert(pNewQueryInfo != NULL);
+    
+    // update the table index
+    size_t num = taosArrayGetSize(pNewQueryInfo->colList);
+    for (int32_t i = 0; i < num; ++i) {
+      SColumn* pCol = taosArrayGetP(pNewQueryInfo->colList, i);
+      pCol->colIndex.tableIndex = 0;
+    }
+    
+    pSupporter->colList = pNewQueryInfo->colList;
+    pNewQueryInfo->colList = NULL;
+    
+    pSupporter->exprList = pNewQueryInfo->exprList;
+    pNewQueryInfo->exprList = NULL;
+    
+    pSupporter->fieldsInfo = pNewQueryInfo->fieldsInfo;
+  
+    // this data needs to be transfer to support struct
+    memset(&pNewQueryInfo->fieldsInfo, 0, sizeof(SFieldInfo));
+    if (tscTagCondCopy(&pSupporter->tagCond, &pNewQueryInfo->tagCond) != 0) {
+      return TSDB_CODE_TSC_OUT_OF_MEMORY;
+    }
+
+    pNew->cmd.numOfCols = 0;
+    pNewQueryInfo->interval.interval = 0;
+    pSupporter->limit = pNewQueryInfo->limit;
+
+    pNewQueryInfo->limit.limit = -1;
+    pNewQueryInfo->limit.offset = 0;
+
+    // backup the data and clear it in the sqlcmd object
+    memset(&pNewQueryInfo->groupbyExpr, 0, sizeof(SSqlGroupbyExpr));
+    
+    tscInitQueryInfo(pNewQueryInfo);
+    STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pNewQueryInfo, 0);
+    
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) { // return the tableId & tag
+      SColumnIndex index = {0};
+
+      STagCond* pTagCond = &pSupporter->tagCond;
+      assert(pTagCond->joinInfo.hasJoin);
+
+      int32_t tagColId = tscGetJoinTagColIdByUid(pTagCond, pTableMetaInfo->pTableMeta->id.uid);
+      SSchema* s = tscGetTableColumnSchemaById(pTableMetaInfo->pTableMeta, tagColId);
+
+      // get the tag colId column index
+      int32_t numOfTags = tscGetNumOfTags(pTableMetaInfo->pTableMeta);
+      SSchema* pSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+      for(int32_t i = 0; i < numOfTags; ++i) {
+        if (pSchema[i].colId == tagColId) {
+          index.columnIndex = i;
+          break;
+        }
+      }
+
+      int16_t bytes = 0;
+      int16_t type  = 0;
+      int32_t inter = 0;
+
+      getResultDataInfo(s->type, s->bytes, TSDB_FUNC_TID_TAG, 0, &type, &bytes, &inter, 0, 0);
+
+      SSchema s1 = {.colId = s->colId, .type = (uint8_t)type, .bytes = bytes};
+      pSupporter->tagSize = s1.bytes;
+      assert(isValidDataType(s1.type) && s1.bytes > 0);
+
+      // set get tags query type
+      TSDB_QUERY_SET_TYPE(pNewQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY);
+      tscAddSpecialColumnForSelect(pNewQueryInfo, 0, TSDB_FUNC_TID_TAG, &index, &s1, TSDB_COL_TAG);
+      size_t numOfCols = taosArrayGetSize(pNewQueryInfo->colList);
+  
+      tscDebug(
+          "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%d, transfer to tid_tag query to retrieve (tableId, tags), "
+          "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, tagIndex:%d, name:%s",
+          pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
+          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, index.columnIndex, pNewQueryInfo->pTableMetaInfo[0]->name);
+    } else {
+      SSchema      colSchema = {.type = TSDB_DATA_TYPE_BINARY, .bytes = 1};
+      SColumnIndex index = {0, PRIMARYKEY_TIMESTAMP_COL_INDEX};
+      tscAddSpecialColumnForSelect(pNewQueryInfo, 0, TSDB_FUNC_TS_COMP, &index, &colSchema, TSDB_COL_NORMAL);
+
+      // set the tags value for ts_comp function
+      SSqlExpr *pExpr = tscSqlExprGet(pNewQueryInfo, 0);
+
+      if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+        int16_t tagColId = tscGetJoinTagColIdByUid(&pSupporter->tagCond, pTableMetaInfo->pTableMeta->id.uid);
+        pExpr->param->i64Key = tagColId;
+        pExpr->numOfParams = 1;
+      }
+
+      // add the filter tag column
+      if (pSupporter->colList != NULL) {
+        size_t s = taosArrayGetSize(pSupporter->colList);
+
+        for (int32_t i = 0; i < s; ++i) {
+          SColumn *pCol = taosArrayGetP(pSupporter->colList, i);
+
+          if (pCol->numOfFilters > 0) {  // copy to the pNew->cmd.colList if it is filtered.
+            SColumn *p = tscColumnClone(pCol);
+            taosArrayPush(pNewQueryInfo->colList, &p);
+          }
+        }
+      }
+
+      size_t numOfCols = taosArrayGetSize(pNewQueryInfo->colList);
+
+      tscDebug(
+          "%p subquery:%p tableIndex:%d, vgroupIndex:%d, type:%u, transfer to ts_comp query to retrieve timestamps, "
+          "exprInfo:%" PRIzu ", colList:%" PRIzu ", fieldsInfo:%d, name:%s",
+          pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
+          numOfCols, pNewQueryInfo->fieldsInfo.numOfOutput, pNewQueryInfo->pTableMetaInfo[0]->name);
+    }
+  } else {
+    assert(0);
+    SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+    pNewQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void tscHandleMasterJoinQuery(SSqlObj* pSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  assert((pQueryInfo->type & TSDB_QUERY_TYPE_SUBQUERY) == 0);
+
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  // todo add test
+  SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
+  if (pState == NULL) {
+    code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
+  }
+
+  pState->numOfTotal = pQueryInfo->numOfTables;
+  pState->numOfRemain = pState->numOfTotal;
+
+  bool hasEmptySub = false;
+
+  tscDebug("%p start subquery, total:%d", pSql, pQueryInfo->numOfTables);
+  for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+    SJoinSupporter *pSupporter = tscCreateJoinSupporter(pSql, pState, i);
+    
+    if (pSupporter == NULL) {  // failed to create support struct, abort current query
+      tscError("%p tableIndex:%d, failed to allocate join support object, abort further query", pSql, i);
+      code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      goto _error;
+    }
+    
+    code = tscCreateJoinSubquery(pSql, i, pSupporter);
+    if (code != TSDB_CODE_SUCCESS) {  // failed to create subquery object, quit query
+      tscDestroyJoinSupporter(pSupporter);
+      goto _error;
+    }
+
+    SSqlObj* pSub = pSql->pSubs[i];
+    STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSub->cmd, 0, 0);
+    if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) && (pTableMetaInfo->vgroupList->numOfVgroups == 0)) {
+      hasEmptySub = true;
+      break;
+    }
+  }
+
+  if (hasEmptySub) {  // at least one subquery is empty, do nothing and return
+    freeJoinSubqueryObj(pSql);
+    pSql->cmd.command = TSDB_SQL_RETRIEVE_EMPTY_RESULT;
+    (*pSql->fp)(pSql->param, pSql, 0);
+  } else {
+    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+      SSqlObj* pSub = pSql->pSubs[i];
+      if ((code = tscProcessSql(pSub)) != TSDB_CODE_SUCCESS) {
+        pState->numOfRemain = i - 1;  // the already sent reques will continue and do not go to the error process routine
+        break;
+      }
+    }
+
+    pSql->cmd.command = TSDB_SQL_TABLE_JOIN_RETRIEVE;
+  }
+
+  return;
+
+  _error:
+  pRes->code = code;
+  tscQueueAsyncRes(pSql);
+}
+
+static void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs, SSubqueryState* pState) {
+  assert(numOfSubs <= pSql->numOfSubs && numOfSubs >= 0 && pState != NULL);
+  
+  for(int32_t i = 0; i < numOfSubs; ++i) {
+    SSqlObj* pSub = pSql->pSubs[i];
+    assert(pSub != NULL);
+    
+    SRetrieveSupport* pSupport = pSub->param;
+    
+    taosTFree(pSupport->localBuffer);
+    taosTFree(pSupport);
+    
+    taos_free_result(pSub);
+  }
+  
+  free(pState);
+}
+
+int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
+  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+  
+  // pRes->code check only serves in launching metric sub-queries
+  if (pRes->code == TSDB_CODE_TSC_QUERY_CANCELLED) {
+    pCmd->command = TSDB_SQL_RETRIEVE_LOCALMERGE;  // enable the abort of kill super table function.
+    return pRes->code;
+  }
+  
+  tExtMemBuffer **  pMemoryBuf = NULL;
+  tOrderDescriptor *pDesc = NULL;
+  SColumnModel *    pModel = NULL;
+  
+  pRes->qhandle = 0x1;  // hack the qhandle check
+  
+  const uint32_t nBufferSize = (1u << 16);  // 64KB
+  
+  SQueryInfo     *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  
+  pSql->numOfSubs = pTableMetaInfo->vgroupList->numOfVgroups;
+  assert(pSql->numOfSubs > 0);
+  
+  int32_t ret = tscLocalReducerEnvCreate(pSql, &pMemoryBuf, &pDesc, &pModel, nBufferSize);
+  if (ret != 0) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscQueueAsyncRes(pSql);
+    taosTFree(pMemoryBuf);
+    return ret;
+  }
+  
+  pSql->pSubs = calloc(pSql->numOfSubs, POINTER_BYTES);
+
+  tscDebug("%p retrieved query data from %d vnode(s)", pSql, pSql->numOfSubs);
+  SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
+
+  if (pSql->pSubs == NULL || pState == NULL) {
+    taosTFree(pState);
+    taosTFree(pSql->pSubs);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, pSql->numOfSubs);
+
+    tscQueueAsyncRes(pSql);
+    return ret;
+  }
+
+  pState->numOfTotal = pSql->numOfSubs;
+  pState->numOfRemain = pSql->numOfSubs;
+
+  pRes->code = TSDB_CODE_SUCCESS;
+  
+  int32_t i = 0;
+  for (; i < pSql->numOfSubs; ++i) {
+    SRetrieveSupport *trs = (SRetrieveSupport *)calloc(1, sizeof(SRetrieveSupport));
+    if (trs == NULL) {
+      tscError("%p failed to malloc buffer for SRetrieveSupport, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
+      break;
+    }
+    
+    trs->pExtMemBuffer = pMemoryBuf;
+    trs->pOrderDescriptor = pDesc;
+    trs->pState = pState;
+    
+    trs->localBuffer = (tFilePage *)calloc(1, nBufferSize + sizeof(tFilePage));
+    if (trs->localBuffer == NULL) {
+      tscError("%p failed to malloc buffer for local buffer, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
+      taosTFree(trs);
+      break;
+    }
+    
+    trs->subqueryIndex = i;
+    trs->pParentSql = pSql;
+    trs->pFinalColModel = pModel;
+    
+    SSqlObj *pNew = tscCreateSTableSubquery(pSql, trs, NULL);
+    if (pNew == NULL) {
+      tscError("%p failed to malloc buffer for subObj, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
+      taosTFree(trs->localBuffer);
+      taosTFree(trs);
+      break;
+    }
+    
+    // todo handle multi-vnode situation
+    if (pQueryInfo->tsBuf) {
+      SQueryInfo *pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+      pNewQueryInfo->tsBuf = tsBufClone(pQueryInfo->tsBuf);
+      assert(pNewQueryInfo->tsBuf != NULL);
+    }
+    
+    tscDebug("%p sub:%p create subquery success. orderOfSub:%d", pSql, pNew, trs->subqueryIndex);
+  }
+  
+  if (i < pSql->numOfSubs) {
+    tscError("%p failed to prepare subquery structure and launch subqueries", pSql);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    
+    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, pSql->numOfSubs);
+    doCleanupSubqueries(pSql, i, pState);
+    return pRes->code;   // free all allocated resource
+  }
+  
+  if (pRes->code == TSDB_CODE_TSC_QUERY_CANCELLED) {
+    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, pSql->numOfSubs);
+    doCleanupSubqueries(pSql, i, pState);
+    return pRes->code;
+  }
+  
+  for(int32_t j = 0; j < pSql->numOfSubs; ++j) {
+    SSqlObj* pSub = pSql->pSubs[j];
+    SRetrieveSupport* pSupport = pSub->param;
+    
+    tscDebug("%p sub:%p launch subquery, orderOfSub:%d.", pSql, pSub, pSupport->subqueryIndex);
+    tscProcessSql(pSub);
+  }
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+static void tscFreeSubSqlObj(SRetrieveSupport *trsupport, SSqlObj *pSql) {
+  tscDebug("%p start to free subquery obj", pSql);
+
+  int32_t  index = trsupport->subqueryIndex;
+  SSqlObj *pParentSql = trsupport->pParentSql;
+
+  assert(pSql == pParentSql->pSubs[index]);
+//  pParentSql->pSubs[index] = NULL;
+//
+//  taos_free_result(pSql);
+  taosTFree(trsupport->localBuffer);
+  taosTFree(trsupport);
+}
+
+static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfRows);
+static void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numOfRows);
+
+static void tscAbortFurtherRetryRetrieval(SRetrieveSupport *trsupport, TAOS_RES *tres, int32_t code) {
+// set no disk space error info
+  tscError("sub:%p failed to flush data to disk, reason:%s", tres, tstrerror(code));
+  SSqlObj* pParentSql = trsupport->pParentSql;
+
+  pParentSql->res.code = code;
+  trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
+  tscHandleSubqueryError(trsupport, tres, pParentSql->res.code);
+}
+
+/*
+ * current query failed, and the retry count is less than the available
+ * count, retry query clear previous retrieved data, then launch a new sub query
+ */
+static int32_t tscReissueSubquery(SRetrieveSupport *trsupport, SSqlObj *pSql, int32_t code) {
+  SSqlObj *pParentSql = trsupport->pParentSql;
+  int32_t  subqueryIndex = trsupport->subqueryIndex;
+
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
+  SCMVgroupInfo* pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
+
+  tExtMemBufferClear(trsupport->pExtMemBuffer[subqueryIndex]);
+
+  // clear local saved number of results
+  trsupport->localBuffer->num = 0;
+  tscError("%p sub:%p retrieve/query failed, code:%s, orderOfSub:%d, retry:%d", trsupport->pParentSql, pSql,
+           tstrerror(code), subqueryIndex, trsupport->numOfRetry);
+
+  SSqlObj *pNew = tscCreateSTableSubquery(trsupport->pParentSql, trsupport, pSql);
+  if (pNew == NULL) {
+    tscError("%p sub:%p failed to create new subquery due to error:%s, abort retry, vgId:%d, orderOfSub:%d",
+             trsupport->pParentSql, pSql, tstrerror(terrno), pVgroup->vgId, trsupport->subqueryIndex);
+
+    pParentSql->res.code = terrno;
+    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
+
+    return pParentSql->res.code;
+  }
+
+  int32_t ret = tscProcessSql(pNew);
+
+  // if failed to process sql, let following code handle the pSql
+  if (ret == TSDB_CODE_SUCCESS) {
+    taos_free_result(pSql);
+    return ret;
+  } else {
+    return ret;
+  }
+}
+
+void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numOfRows) {
+  SSqlObj *pParentSql = trsupport->pParentSql;
+  int32_t  subqueryIndex = trsupport->subqueryIndex;
+  
+  assert(pSql != NULL);
+  SSubqueryState* pState = trsupport->pState;
+  assert(pState->numOfRemain <= pState->numOfTotal && pState->numOfRemain >= 0 && pParentSql->numOfSubs == pState->numOfTotal);
+  
+  // retrieved in subquery failed. OR query cancelled in retrieve phase.
+  if (taos_errno(pSql) == TSDB_CODE_SUCCESS && pParentSql->res.code != TSDB_CODE_SUCCESS) {
+
+    /*
+     * kill current sub-query connection, which may retrieve data from vnodes;
+     * Here we get: pPObj->res.code == TSDB_CODE_TSC_QUERY_CANCELLED
+     */
+    pSql->res.numOfRows = 0;
+    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;  // disable retry efforts
+    tscDebug("%p query is cancelled, sub:%p, orderOfSub:%d abort retrieve, code:%s", pParentSql, pSql,
+             subqueryIndex, tstrerror(pParentSql->res.code));
+  }
+
+  if (numOfRows >= 0) {  // current query is successful, but other sub query failed, still abort current query.
+    tscDebug("%p sub:%p retrieve numOfRows:%d,orderOfSub:%d", pParentSql, pSql, numOfRows, subqueryIndex);
+    tscError("%p sub:%p abort further retrieval due to other queries failure,orderOfSub:%d,code:%s", pParentSql, pSql,
+             subqueryIndex, tstrerror(pParentSql->res.code));
+  } else {
+    if (trsupport->numOfRetry++ < MAX_NUM_OF_SUBQUERY_RETRY && pParentSql->res.code == TSDB_CODE_SUCCESS) {
+      if (tscReissueSubquery(trsupport, pSql, numOfRows) == TSDB_CODE_SUCCESS) {
+        return;
+      }
+    } else {  // reach the maximum retry count, abort
+      atomic_val_compare_exchange_32(&pParentSql->res.code, TSDB_CODE_SUCCESS, numOfRows);
+      tscError("%p sub:%p retrieve failed,code:%s,orderOfSub:%d failed.no more retry,set global code:%s", pParentSql, pSql,
+               tstrerror(numOfRows), subqueryIndex, tstrerror(pParentSql->res.code));
+    }
+  }
+
+  int32_t remain = -1;
+  if ((remain = atomic_sub_fetch_32(&pState->numOfRemain, 1)) > 0) {
+    tscDebug("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pParentSql, pSql, trsupport->subqueryIndex,
+        pState->numOfTotal - remain);
+
+    tscFreeSubSqlObj(trsupport, pSql);
+    return;
+  }
+  
+  // all subqueries are failed
+  tscError("%p retrieve from %d vnode(s) completed,code:%s.FAILED.", pParentSql, pState->numOfTotal,
+      tstrerror(pParentSql->res.code));
+
+  // release allocated resource
+  tscLocalReducerEnvDestroy(trsupport->pExtMemBuffer, trsupport->pOrderDescriptor, trsupport->pFinalColModel,
+                            pState->numOfTotal);
+  
+  taosTFree(trsupport->pState);
+  tscFreeSubSqlObj(trsupport, pSql);
+
+  // in case of second stage join subquery, invoke its callback function instead of regular QueueAsyncRes
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pParentSql->cmd, 0);
+
+  if (!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
+    (*pParentSql->fp)(pParentSql->param, pParentSql, pParentSql->res.code);
+  } else {  // regular super table query
+    if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
+      tscQueueAsyncRes(pParentSql);
+    }
+  }
+}
+
+static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* pSql) {
+  int32_t           idx = trsupport->subqueryIndex;
+  SSqlObj *         pParentSql = trsupport->pParentSql;
+  tOrderDescriptor *pDesc = trsupport->pOrderDescriptor;
+  
+  SSubqueryState* pState = trsupport->pState;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  
+  STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
+  
+  // data in from current vnode is stored in cache and disk
+  uint32_t numOfRowsFromSubquery = (uint32_t)(trsupport->pExtMemBuffer[idx]->numOfTotalElems + trsupport->localBuffer->num);
+    tscDebug("%p sub:%p all data retrieved from ep:%s, vgId:%d, numOfRows:%d, orderOfSub:%d", pParentSql, pSql,
+        pTableMetaInfo->vgroupList->vgroups[0].epAddr[0].fqdn, pTableMetaInfo->vgroupList->vgroups[0].vgId,
+        numOfRowsFromSubquery, idx);
+  
+  tColModelCompact(pDesc->pColumnModel, trsupport->localBuffer, pDesc->pColumnModel->capacity);
+
+#ifdef _DEBUG_VIEW
+  printf("%" PRIu64 " rows data flushed to disk:\n", trsupport->localBuffer->num);
+    SSrcColumnInfo colInfo[256] = {0};
+    tscGetSrcColumnInfo(colInfo, pQueryInfo);
+    tColModelDisplayEx(pDesc->pColumnModel, trsupport->localBuffer->data, trsupport->localBuffer->num,
+                       trsupport->localBuffer->num, colInfo);
+#endif
+  
+  if (tsTotalTmpDirGB != 0 && tsAvailTmpDirectorySpace < tsReservedTmpDirectorySpace) {
+    tscError("%p sub:%p client disk space remain %.3f GB, need at least %.3f GB, stop query", pParentSql, pSql,
+             tsAvailTmpDirectorySpace, tsReservedTmpDirectorySpace);
+    tscAbortFurtherRetryRetrieval(trsupport, pSql, TSDB_CODE_TSC_NO_DISKSPACE);
+    return;
+  }
+  
+  // each result for a vnode is ordered as an independant list,
+  // then used as an input of loser tree for disk-based merge
+  int32_t code = tscFlushTmpBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pQueryInfo->groupbyExpr.orderType);
+  if (code != 0) { // set no disk space error info, and abort retry
+    tscAbortFurtherRetryRetrieval(trsupport, pSql, code);
+    return;
+  }
+  
+  int32_t remain = -1;
+  if ((remain = atomic_sub_fetch_32(&pState->numOfRemain, 1)) > 0) {
+    tscDebug("%p sub:%p orderOfSub:%d freed, finished subqueries:%d", pParentSql, pSql, trsupport->subqueryIndex,
+        pState->numOfTotal - remain);
+
+    tscFreeSubSqlObj(trsupport, pSql);
+    return;
+  }
+  
+  // all sub-queries are returned, start to local merge process
+  pDesc->pColumnModel->capacity = trsupport->pExtMemBuffer[idx]->numOfElemsPerPage;
+  
+  tscDebug("%p retrieve from %d vnodes completed.final NumOfRows:%" PRId64 ",start to build loser tree", pParentSql,
+           pState->numOfTotal, pState->numOfRetrievedRows);
+  
+  SQueryInfo *pPQueryInfo = tscGetQueryInfoDetail(&pParentSql->cmd, 0);
+  tscClearInterpInfo(pPQueryInfo);
+  
+  tscCreateLocalReducer(trsupport->pExtMemBuffer, pState->numOfTotal, pDesc, trsupport->pFinalColModel, pParentSql);
+  tscDebug("%p build loser tree completed", pParentSql);
+  
+  pParentSql->res.precision = pSql->res.precision;
+  pParentSql->res.numOfRows = 0;
+  pParentSql->res.row = 0;
+  
+  // only free once
+  taosTFree(trsupport->pState);
+  tscFreeSubSqlObj(trsupport, pSql);
+
+  // set the command flag must be after the semaphore been correctly set.
+  pParentSql->cmd.command = TSDB_SQL_RETRIEVE_LOCALMERGE;
+  if (pParentSql->res.code == TSDB_CODE_SUCCESS) {
+    (*pParentSql->fp)(pParentSql->param, pParentSql, 0);
+  } else {
+    tscQueueAsyncRes(pParentSql);
+  }
+}
+
+static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfRows) {
+  SRetrieveSupport *trsupport = (SRetrieveSupport *)param;
+  tOrderDescriptor *pDesc = trsupport->pOrderDescriptor;
+  int32_t           idx   = trsupport->subqueryIndex;
+  SSqlObj *         pParentSql = trsupport->pParentSql;
+
+  assert(tres != NULL);
+  SSqlObj *pSql = (SSqlObj *)tres;
+
+  SSubqueryState* pState = trsupport->pState;
+  assert(pState->numOfRemain <= pState->numOfTotal && pState->numOfRemain >= 0 && pParentSql->numOfSubs == pState->numOfTotal);
+  
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
+  SCMVgroupInfo  *pVgroup = &pTableMetaInfo->vgroupList->vgroups[0];
+
+  if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
+    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
+    tscDebug("%p query cancelled/failed, sub:%p, vgId:%d, orderOfSub:%d, code:%s, global code:%s",
+             pParentSql, pSql, pVgroup->vgId, trsupport->subqueryIndex, tstrerror(numOfRows), tstrerror(pParentSql->res.code));
+
+    tscHandleSubqueryError(param, tres, numOfRows);
+    return;
+  }
+
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    assert(numOfRows == taos_errno(pSql));
+
+    if (trsupport->numOfRetry++ < MAX_NUM_OF_SUBQUERY_RETRY) {
+      tscError("%p sub:%p failed code:%s, retry:%d", pParentSql, pSql, tstrerror(numOfRows), trsupport->numOfRetry);
+
+      if (tscReissueSubquery(trsupport, pSql, numOfRows) == TSDB_CODE_SUCCESS) {
+        return;
+      }
+    } else {
+      tscDebug("%p sub:%p reach the max retry times, set global code:%s", pParentSql, pSql, tstrerror(numOfRows));
+      atomic_val_compare_exchange_32(&pParentSql->res.code, TSDB_CODE_SUCCESS, numOfRows);  // set global code and abort
+    }
+
+    tscHandleSubqueryError(param, tres, numOfRows);
+    return;
+  }
+  
+  SSqlRes *   pRes = &pSql->res;
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  
+  if (numOfRows > 0) {
+    assert(pRes->numOfRows == numOfRows);
+    int64_t num = atomic_add_fetch_64(&pState->numOfRetrievedRows, numOfRows);
+    
+    tscDebug("%p sub:%p retrieve numOfRows:%" PRId64 " totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d", pParentSql, pSql,
+             pRes->numOfRows, pState->numOfRetrievedRows, pSql->epSet.fqdn[pSql->epSet.inUse], idx);
+
+    if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
+      tscError("%p sub:%p num of OrderedRes is too many, max allowed:%" PRId32 " , current:%" PRId64,
+               pParentSql, pSql, tsMaxNumOfOrderedResults, num);
+      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_SORTED_RES_TOO_MANY);
+      return;
+    }
+
+#ifdef _DEBUG_VIEW
+    printf("received data from vnode: %"PRIu64" rows\n", pRes->numOfRows);
+    SSrcColumnInfo colInfo[256] = {0};
+
+    tscGetSrcColumnInfo(colInfo, pQueryInfo);
+    tColModelDisplayEx(pDesc->pColumnModel, pRes->data, pRes->numOfRows, pRes->numOfRows, colInfo);
+#endif
+    
+    // no disk space for tmp directory
+    if (tsTotalTmpDirGB != 0 && tsAvailTmpDirectorySpace < tsReservedTmpDirectorySpace) {
+      tscError("%p sub:%p client disk space remain %.3f GB, need at least %.3f GB, stop query", pParentSql, pSql,
+               tsAvailTmpDirectorySpace, tsReservedTmpDirectorySpace);
+      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_NO_DISKSPACE);
+      return;
+    }
+    
+    int32_t ret = saveToBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pRes->data,
+                               (int32_t)pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
+    if (ret != 0) { // set no disk space error info, and abort retry
+      tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_NO_DISKSPACE);
+    } else if (pRes->completed) {
+      tscAllDataRetrievedFromDnode(trsupport, pSql);
+    } else { // continue fetch data from dnode
+      taos_fetch_rows_a(tres, tscRetrieveFromDnodeCallBack, param);
+    }
+    
+  } else { // all data has been retrieved to client
+    tscAllDataRetrievedFromDnode(trsupport, pSql);
+  }
+}
+
+static SSqlObj *tscCreateSTableSubquery(SSqlObj *pSql, SRetrieveSupport *trsupport, SSqlObj *prevSqlObj) {
+  const int32_t table_index = 0;
+  
+  SSqlObj *pNew = createSubqueryObj(pSql, table_index, tscRetrieveDataRes, trsupport, TSDB_SQL_SELECT, prevSqlObj);
+  if (pNew != NULL) {  // the sub query of two-stage super table query
+    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+
+    pQueryInfo->type |= TSDB_QUERY_TYPE_STABLE_SUBQUERY;
+    assert(pQueryInfo->numOfTables == 1 && pNew->cmd.numOfClause == 1 && trsupport->subqueryIndex < pSql->numOfSubs);
+    
+    // launch subquery for each vnode, so the subquery index equals to the vgroupIndex.
+    STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, table_index);
+    pTableMetaInfo->vgroupIndex = trsupport->subqueryIndex;
+    
+    pSql->pSubs[trsupport->subqueryIndex] = pNew;
+  }
+  
+  return pNew;
+}
+
+void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
+  SRetrieveSupport *trsupport = (SRetrieveSupport *) param;
+  
+  SSqlObj*  pParentSql = trsupport->pParentSql;
+  SSqlObj*  pSql = (SSqlObj *) tres;
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  assert(pSql->cmd.numOfClause == 1 && pQueryInfo->numOfTables == 1);
+  
+  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, 0, 0);
+  SCMVgroupInfo* pVgroup = &pTableMetaInfo->vgroupList->vgroups[trsupport->subqueryIndex];
+
+  // stable query killed or other subquery failed, all query stopped
+  if (pParentSql->res.code != TSDB_CODE_SUCCESS) {
+    trsupport->numOfRetry = MAX_NUM_OF_SUBQUERY_RETRY;
+    tscError("%p query cancelled or failed, sub:%p, vgId:%d, orderOfSub:%d, code:%s, global code:%s",
+        pParentSql, pSql, pVgroup->vgId, trsupport->subqueryIndex, tstrerror(code), tstrerror(pParentSql->res.code));
+
+    tscHandleSubqueryError(param, tres, code);
+    return;
+  }
+  
+  /*
+   * if a subquery on a vnode failed, all retrieve operations from vnode that occurs later
+   * than this one are actually not necessary, we simply call the tscRetrieveFromDnodeCallBack
+   * function to abort current and remain retrieve process.
+   *
+   * NOTE: thread safe is required.
+   */
+  if (taos_errno(pSql) != TSDB_CODE_SUCCESS) {
+    assert(code == taos_errno(pSql));
+
+    if (trsupport->numOfRetry++ < MAX_NUM_OF_SUBQUERY_RETRY) {
+      tscError("%p sub:%p failed code:%s, retry:%d", pParentSql, pSql, tstrerror(code), trsupport->numOfRetry);
+      if (tscReissueSubquery(trsupport, pSql, code) == TSDB_CODE_SUCCESS) {
+        return;
+      }
+    } else {
+      tscError("%p sub:%p reach the max retry times, set global code:%s", pParentSql, pSql, tstrerror(code));
+      atomic_val_compare_exchange_32(&pParentSql->res.code, TSDB_CODE_SUCCESS, code);  // set global code and abort
+    }
+
+    tscHandleSubqueryError(param, tres, pParentSql->res.code);
+    return;
+  }
+
+  tscDebug("%p sub:%p query complete, ep:%s, vgId:%d, orderOfSub:%d, retrieve data", trsupport->pParentSql, pSql,
+             pVgroup->epAddr[0].fqdn, pVgroup->vgId, trsupport->subqueryIndex);
+
+  if (pSql->res.qhandle == 0) { // qhandle is NULL, code is TSDB_CODE_SUCCESS means no results generated from this vnode
+    tscRetrieveFromDnodeCallBack(param, pSql, 0);
+  } else {
+    taos_fetch_rows_a(tres, tscRetrieveFromDnodeCallBack, param);
+  }
+}
+
+static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) {
+  SInsertSupporter *pSupporter = (SInsertSupporter *)param;
+  SSqlObj* pParentObj = pSupporter->pSql;
+  SSubqueryState* pState = pSupporter->pState;
+
+  // record the total inserted rows
+  if (numOfRows > 0) {
+    pParentObj->res.numOfRows += numOfRows;
+  }
+
+  if (taos_errno(tres) != TSDB_CODE_SUCCESS) {
+    SSqlObj* pSql = (SSqlObj*) tres;
+    assert(pSql != NULL && pSql->res.code == numOfRows);
+    
+    pParentObj->res.code = pSql->res.code;
+  }
+
+  taosTFree(pSupporter);
+  if (atomic_sub_fetch_32(&pState->numOfRemain, 1) > 0) {
+    return;
+  }
+  
+  tscDebug("%p Async insertion completed, total inserted:%" PRId64, pParentObj, pParentObj->res.numOfRows);
+
+  // release data block data
+  taosTFree(pState);
+
+  // restore user defined fp
+  pParentObj->fp = pParentObj->fetchFp;
+
+  // todo remove this parameter in async callback function definition.
+  // all data has been sent to vnode, call user function
+  int32_t v = (pParentObj->res.code != TSDB_CODE_SUCCESS) ? pParentObj->res.code : (int32_t)pParentObj->res.numOfRows;
+  (*pParentObj->fp)(pParentObj->param, pParentObj, v);
+}
+
+/**
+ * it is a subquery, so after parse the sql string, copy the submit block to payload of itself
+ * @param pSql
+ * @return
+ */
+int32_t tscHandleInsertRetry(SSqlObj* pSql) {
+  assert(pSql != NULL && pSql->param != NULL);
+  SSqlCmd* pCmd = &pSql->cmd;
+  SSqlRes* pRes = &pSql->res;
+
+  SInsertSupporter* pSupporter = (SInsertSupporter*) pSql->param;
+  assert(pSupporter->index < pSupporter->pState->numOfTotal);
+
+  STableDataBlocks* pTableDataBlock = taosArrayGetP(pCmd->pDataBlocks, pSupporter->index);
+  int32_t code = tscCopyDataBlockToPayload(pSql, pTableDataBlock);
+
+  if ((pRes->code = code)!= TSDB_CODE_SUCCESS) {
+    tscQueueAsyncRes(pSql);
+    return code;  // here the pSql may have been released already.
+  }
+
+  return tscProcessSql(pSql);
+}
+
+int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  pSql->numOfSubs = (uint16_t)taosArrayGetSize(pCmd->pDataBlocks);
+  assert(pSql->numOfSubs > 0);
+
+  pRes->code = TSDB_CODE_SUCCESS;
+
+  // the number of already initialized subqueries
+  int32_t numOfSub = 0;
+
+  SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
+  pState->numOfTotal = pSql->numOfSubs;
+  pState->numOfRemain = pSql->numOfSubs;
+
+  pSql->pSubs = calloc(pSql->numOfSubs, POINTER_BYTES);
+  if (pSql->pSubs == NULL) {
+    goto _error;
+  }
+
+  tscDebug("%p submit data to %d vnode(s)", pSql, pSql->numOfSubs);
+
+  while(numOfSub < pSql->numOfSubs) {
+    SInsertSupporter* pSupporter = calloc(1, sizeof(SInsertSupporter));
+    if (pSupporter == NULL) {
+      goto _error;
+    }
+
+    pSupporter->pSql   = pSql;
+    pSupporter->pState = pState;
+    pSupporter->index  = numOfSub;
+
+    SSqlObj *pNew = createSimpleSubObj(pSql, multiVnodeInsertFinalize, pSupporter, TSDB_SQL_INSERT);
+    if (pNew == NULL) {
+      tscError("%p failed to malloc buffer for subObj, orderOfSub:%d, reason:%s", pSql, numOfSub, strerror(errno));
+      goto _error;
+    }
+  
+    /*
+     * assign the callback function to fetchFp to make sure that the error process function can restore
+     * the callback function (multiVnodeInsertFinalize) correctly.
+     */
+    pNew->fetchFp = pNew->fp;
+    pSql->pSubs[numOfSub] = pNew;
+
+    STableDataBlocks* pTableDataBlock = taosArrayGetP(pCmd->pDataBlocks, numOfSub);
+    pRes->code = tscCopyDataBlockToPayload(pNew, pTableDataBlock);
+    if (pRes->code == TSDB_CODE_SUCCESS) {
+      tscDebug("%p sub:%p create subObj success. orderOfSub:%d", pSql, pNew, numOfSub);
+      numOfSub++;
+    } else {
+      tscDebug("%p prepare submit data block failed in async insertion, vnodeIdx:%d, total:%d, code:%s", pSql, numOfSub,
+               pSql->numOfSubs, tstrerror(pRes->code));
+      goto _error;
+    }
+  }
+  
+  if (numOfSub < pSql->numOfSubs) {
+    tscError("%p failed to prepare subObj structure and launch sub-insertion", pSql);
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
+  }
+
+  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
+
+  // use the local variable
+  for (int32_t j = 0; j < numOfSub; ++j) {
+    SSqlObj *pSub = pSql->pSubs[j];
+    tscDebug("%p sub:%p launch sub insert, orderOfSub:%d", pSql, pSub, j);
+    tscProcessSql(pSub);
+  }
+
+  return TSDB_CODE_SUCCESS;
+
+  _error:
+  taosTFree(pState);
+  return TSDB_CODE_TSC_OUT_OF_MEMORY;
+}
+
+static char* getResultBlockPosition(SSqlCmd* pCmd, SSqlRes* pRes, int32_t columnIndex, int16_t* bytes) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  SFieldSupInfo* pInfo = (SFieldSupInfo*) TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.pSupportInfo, columnIndex);
+  assert(pInfo->pSqlExpr != NULL);
+
+  *bytes = pInfo->pSqlExpr->resBytes;
+  char* pData = pRes->data + pInfo->pSqlExpr->offset * pRes->numOfRows;
+
+  return pData;
+}
+
+static void doBuildResFromSubqueries(SSqlObj* pSql) {
+  SSqlRes* pRes = &pSql->res;
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+
+  int32_t numOfRes = INT32_MAX;
+  for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    if (pSql->pSubs[i] == NULL) {
+      continue;
+    }
+
+    numOfRes = (int32_t)(MIN(numOfRes, pSql->pSubs[i]->res.numOfRows));
+  }
+
+  if (numOfRes == 0) {
+    return;
+  }
+
+  int32_t totalSize = tscGetResRowLength(pQueryInfo->exprList);
+
+  assert(numOfRes * totalSize > 0);
+  char* tmp = realloc(pRes->pRsp, numOfRes * totalSize);
+  if (tmp == NULL) {
+    pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return;
+  } else {
+    pRes->pRsp = tmp;
+  }
+
+  pRes->data = pRes->pRsp;
+
+  char* data = pRes->data;
+  int16_t bytes = 0;
+
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  for(int32_t i = 0; i < numOfExprs; ++i) {
+    SColumnIndex* pIndex = &pRes->pColumnIndex[i];
+    SSqlRes *pRes1 = &pSql->pSubs[pIndex->tableIndex]->res;
+    SSqlCmd *pCmd1 = &pSql->pSubs[pIndex->tableIndex]->cmd;
+
+    char* pData = getResultBlockPosition(pCmd1, pRes1, pIndex->columnIndex, &bytes);
+    memcpy(data, pData, bytes * numOfRes);
+
+    data += bytes * numOfRes;
+    pRes1->row = numOfRes;
+  }
+
+  pRes->numOfRows = numOfRes;
+  pRes->numOfClauseTotal += numOfRes;
+}
+
+void tscBuildResFromSubqueries(SSqlObj *pSql) {
+  SSqlRes* pRes = &pSql->res;
+
+  if (pRes->code != TSDB_CODE_SUCCESS) {
+    tscQueueAsyncRes(pSql);
+    return;
+  }
+
+  if (pRes->tsrow == NULL) {
+    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+
+    size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+    pRes->tsrow  = calloc(numOfExprs, POINTER_BYTES);
+    pRes->buffer = calloc(numOfExprs, POINTER_BYTES);
+    pRes->length = calloc(numOfExprs, sizeof(int32_t));
+
+    if (pRes->tsrow == NULL || pRes->buffer == NULL || pRes->length == NULL) {
+      pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      tscQueueAsyncRes(pSql);
+      return;
+    }
+
+    tscRestoreSQLFuncForSTableQuery(pQueryInfo);
+  }
+
+  while (1) {
+    assert (pRes->row >= pRes->numOfRows);
+
+    doBuildResFromSubqueries(pSql);
+    tsem_post(&pSql->rspSem);
+    return;
+  }
+}
+
+static void transferNcharData(SSqlObj *pSql, int32_t columnIndex, TAOS_FIELD *pField) {
+  SSqlRes *pRes = &pSql->res;
+  
+  if (pRes->tsrow[columnIndex] != NULL && pField->type == TSDB_DATA_TYPE_NCHAR) {
+    // convert unicode to native code in a temporary buffer extra one byte for terminated symbol
+    if (pRes->buffer[columnIndex] == NULL) {
+      pRes->buffer[columnIndex] = malloc(pField->bytes + TSDB_NCHAR_SIZE);
+    }
+    
+    /* string terminated char for binary data*/
+    memset(pRes->buffer[columnIndex], 0, pField->bytes + TSDB_NCHAR_SIZE);
+    
+    int32_t length = taosUcs4ToMbs(pRes->tsrow[columnIndex], pRes->length[columnIndex], pRes->buffer[columnIndex]);
+    if ( length >= 0 ) {
+      pRes->tsrow[columnIndex] = pRes->buffer[columnIndex];
+      pRes->length[columnIndex] = length;
+    } else {
+      tscError("%p charset:%s to %s. val:%s convert failed.", pSql, DEFAULT_UNICODE_ENCODEC, tsCharset, (char*)pRes->tsrow[columnIndex]);
+      pRes->tsrow[columnIndex] = NULL;
+      pRes->length[columnIndex] = 0;
+    }
+  }
+}
+
+static char *getArithemicInputSrc(void *param, const char *name, int32_t colId) {
+  SArithmeticSupport *pSupport = (SArithmeticSupport *) param;
+
+  int32_t index = -1;
+  SSqlExpr* pExpr = NULL;
+  
+  for (int32_t i = 0; i < pSupport->numOfCols; ++i) {
+    pExpr = taosArrayGetP(pSupport->exprList, i);
+    if (strncmp(name, pExpr->aliasName, sizeof(pExpr->aliasName) - 1) == 0) {
+      index = i;
+      break;
+    }
+  }
+
+  assert(index >= 0 && index < pSupport->numOfCols);
+  return pSupport->data[index] + pSupport->offset * pExpr->resBytes;
+}
+
+void **doSetResultRowData(SSqlObj *pSql, bool finalResult) {
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+
+  assert(pRes->row >= 0 && pRes->row <= pRes->numOfRows);
+  if (pRes->row >= pRes->numOfRows) {  // all the results has returned to invoker
+    taosTFree(pRes->tsrow);
+    return pRes->tsrow;
+  }
+
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+
+  size_t size = tscNumOfFields(pQueryInfo);
+  for (int i = 0; i < size; ++i) {
+    SFieldSupInfo* pSup = TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.pSupportInfo, i);
+    if (pSup->pSqlExpr != NULL) {
+      tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i);
+    }
+
+    // primary key column cannot be null in interval query, no need to check
+    if (i == 0 && pQueryInfo->interval.interval > 0) {
+      continue;
+    }
+
+    TAOS_FIELD *pField = TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.pFields, i);
+    if (pRes->tsrow[i] != NULL && pField->type == TSDB_DATA_TYPE_NCHAR) {
+      transferNcharData(pSql, i, pField);
+    }
+
+    // calculate the result from several other columns
+    if (pSup->pArithExprInfo != NULL) {
+      if (pRes->pArithSup == NULL) {
+        pRes->pArithSup = (SArithmeticSupport*)calloc(1, sizeof(SArithmeticSupport));
+      }
+
+      pRes->pArithSup->offset     = 0;
+      pRes->pArithSup->pArithExpr = pSup->pArithExprInfo;
+      pRes->pArithSup->numOfCols  = (int32_t)tscSqlExprNumOfExprs(pQueryInfo);
+      pRes->pArithSup->exprList   = pQueryInfo->exprList;
+      pRes->pArithSup->data       = calloc(pRes->pArithSup->numOfCols, POINTER_BYTES);
+
+      if (pRes->buffer[i] == NULL) {
+        TAOS_FIELD* field = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+        pRes->buffer[i] = malloc(field->bytes);
+      }
+
+      for(int32_t k = 0; k < pRes->pArithSup->numOfCols; ++k) {
+        SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, k);
+        pRes->pArithSup->data[k] = (pRes->data + pRes->numOfRows* pExpr->offset) + pRes->row*pExpr->resBytes;
+      }
+
+      tExprTreeCalcTraverse(pRes->pArithSup->pArithExpr->pExpr, 1, pRes->buffer[i], pRes->pArithSup,
+          TSDB_ORDER_ASC, getArithemicInputSrc);
+      pRes->tsrow[i] = pRes->buffer[i];
+    }
+  }
+
+  pRes->row++;  // index increase one-step
+  return pRes->tsrow;
+}
+
+static UNUSED_FUNC bool tscHasRemainDataInSubqueryResultSet(SSqlObj *pSql) {
+  bool     hasData = true;
+  SSqlCmd *pCmd = &pSql->cmd;
+  
+  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+  if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0)) {
+    bool allSubqueryExhausted = true;
+    
+    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+      if (pSql->pSubs[i] == NULL) {
+        continue;
+      }
+      
+      SSqlRes *pRes1 = &pSql->pSubs[i]->res;
+      SSqlCmd *pCmd1 = &pSql->pSubs[i]->cmd;
+      
+      SQueryInfo *pQueryInfo1 = tscGetQueryInfoDetail(pCmd1, pCmd1->clauseIndex);
+      assert(pQueryInfo1->numOfTables == 1);
+      
+      STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo1, 0);
+      
+      /*
+       * if the global limitation is not reached, and current result has not exhausted, or next more vnodes are
+       * available, goes on
+       */
+      if (pTableMetaInfo->vgroupIndex < pTableMetaInfo->vgroupList->numOfVgroups && pRes1->row < pRes1->numOfRows &&
+          (!tscHasReachLimitation(pQueryInfo1, pRes1))) {
+        allSubqueryExhausted = false;
+        break;
+      }
+    }
+    
+    hasData = !allSubqueryExhausted;
+  } else {  // otherwise, in case inner join, if any subquery exhausted, query completed.
+    for (int32_t i = 0; i < pSql->numOfSubs; ++i) {
+      if (pSql->pSubs[i] == 0) {
+        continue;
+      }
+      
+      SSqlRes *   pRes1 = &pSql->pSubs[i]->res;
+      SQueryInfo *pQueryInfo1 = tscGetQueryInfoDetail(&pSql->pSubs[i]->cmd, 0);
+      
+      if ((pRes1->row >= pRes1->numOfRows && tscHasReachLimitation(pQueryInfo1, pRes1) &&
+          tscIsProjectionQuery(pQueryInfo1)) || (pRes1->numOfRows == 0)) {
+        hasData = false;
+        break;
+      }
+    }
+  }
+  
+  return hasData;
+}
diff --git a/src/client/src/tscSyntaxtreefunction.c b/src/client/src/tscSyntaxtreefunction.c
deleted file mode 100644
index 1d82b0f239572676c204025fe535704c192e4da6..0000000000000000000000000000000000000000
--- a/src/client/src/tscSyntaxtreefunction.c
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
- * 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 "os.h"
-
-#include "tscSyntaxtreefunction.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)     \
-  {                                                                                                   \
-    int32_t i = ((_ord) == TSQL_SO_ASC) ? 0 : MAX(len1, len2) - 1;                                    \
-    int32_t step = ((_ord) == TSQL_SO_ASC) ? 1 : -1;                                                  \
-                                                                                                      \
-    if ((len1) == (len2)) {                                                                           \
-      for (; i < (len2) && i >= 0; i += step, (out) += 1) {                                        \
-        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[i] op(right)[i];                                                      \
-      }                                                                                               \
-    } else if ((len1) == 1) {                                                                         \
-      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
-        if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) {         \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[0] op(right)[i];                                                      \
-      }                                                                                               \
-    } else if ((len2) == 1) {                                                                         \
-      for (; i >= 0 && i < (len1); i += step, (out) += 1) {                                        \
-        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) {         \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[i] op(right)[0];                                                      \
-      }                                                                                               \
-    }                                                                                                 \
-  }
-
-#define ARRAY_LIST_OP_REM(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 step = (_ord == TSQL_SO_ASC) ? 1 : -1;                                                    \
-                                                                                                      \
-    if (len1 == (len2)) {                                                                             \
-      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
-        if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) {     \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i];      \
-      }                                                                                               \
-    } else if (len1 == 1) {                                                                           \
-      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
-        if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) {       \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i];      \
-      }                                                                                               \
-    } else if ((len2) == 1) {                                                                         \
-      for (; i >= 0 && i < len1; i += step, (out) += 1) {                                          \
-        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) {       \
-          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
-          continue;                                                                                   \
-        }                                                                                             \
-        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[0])) * (right)[0];      \
-      }                                                                                               \
-    }                                                                                                 \
-  }
-
-#define ARRAY_LIST_ADD(left, right, _left_type, _right_type, len1, len2, out, _ord) \
-  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, +, TSDB_DATA_TYPE_DOUBLE, _ord)
-#define ARRAY_LIST_SUB(left, right, _left_type, _right_type, len1, len2, out, _ord) \
-  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, -, TSDB_DATA_TYPE_DOUBLE, _ord)
-#define ARRAY_LIST_MULTI(left, right, _left_type, _right_type, len1, len2, out, _ord) \
-  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, *, TSDB_DATA_TYPE_DOUBLE, _ord)
-#define ARRAY_LIST_DIV(left, right, _left_type, _right_type, len1, len2, out, _ord) \
-  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, /, TSDB_DATA_TYPE_DOUBLE, _ord)
-#define ARRAY_LIST_REM(left, right, _left_type, _right_type, len1, len2, out, _ord) \
-  ARRAY_LIST_OP_REM(left, right, _left_type, _right_type, len1, len2, out, %, TSDB_DATA_TYPE_DOUBLE, _ord)
-
-#define TYPE_CONVERT_DOUBLE_RES(left, right, out, _type_left, _type_right, _type_res) \
-  _type_left * pLeft = (_type_left *)(left);                                          \
-  _type_right *pRight = (_type_right *)(right);                                       \
-  _type_res *  pOutput = (_type_res *)(out);
-
-#define TYPE_CONVERT(left, right, out, _type_left, _type_right) \
-  TYPE_CONVERT_DOUBLE_RES(left, right, out, _type_left, _type_right, double)
-
-void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  int32_t *pRight = (int32_t *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[i] + pRight[i];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[0] + pRight[i];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-      *pOutput = (double)pLeft[i] + pRight[0];
-    }
-  }
-}
-
-void calc_fn_i32_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int8_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int16_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int64_t);
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, float)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int8_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int16_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i8_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i8_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int64_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, float)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_i16_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i16_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int16_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i16_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i16_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int64_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, float)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_i64_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_i64_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i64_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int64_t)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, float)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_f_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_f_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_f_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i64_f_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, float)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_d_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_d_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_d_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i64_d_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_f_d_add(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, double)
-  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  int32_t *pRight = (int32_t *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      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);
-        continue;
-      }
-      *pOutput = (double)pLeft[i] - pRight[i];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-      *pOutput = (double)pLeft[0] - pRight[i];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-      *pOutput = (double)pLeft[i] - pRight[0];
-    }
-  }
-}
-
-void calc_fn_i32_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int32_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int32_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int32_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int32_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int8_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int16_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int32_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int64_t)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, float)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, double)
-  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  int32_t *pRight = (int32_t *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[i] * pRight[i];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[0] * pRight[i];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-      *pOutput = (double)pLeft[i] * pRight[0];
-    }
-  }
-}
-
-void calc_fn_i32_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int8_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int16_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int64_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, float)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int8_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int16_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i8_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i8_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int64_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, float)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_i16_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i16_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int16_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i16_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i16_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int64_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, float)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_i64_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_i64_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_i64_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_i64_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int64_t)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, float)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_f_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_f_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_f_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i64_f_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_f_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, float)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i8_d_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i16_d_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i32_d_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_i64_d_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  calc_fn_f_d_multi(right, left, numRight, numLeft, output, order);
-}
-
-void calc_fn_d_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, double)
-  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  int32_t *pRight = (int32_t *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[i] / pRight[i];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-
-      *pOutput = (double)pLeft[0] / pRight[i];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        continue;
-      }
-      *pOutput = (double)pLeft[i] / pRight[0];
-    }
-  }
-}
-
-void calc_fn_i32_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int32_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int32_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int32_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int32_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int8_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int16_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int32_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int64_t)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, float)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, double)
-  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  int32_t *pRight = (int32_t *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  }
-}
-
-void calc_fn_i32_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int32_t, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  int32_t *pLeft = (int32_t *)left;
-  double * pRight = (double *)right;
-  double * pOutput = (double *)output;
-
-  int32_t i = (order == TSQL_SO_ASC) ? 0 : MAX(numLeft, numRight) - 1;
-  int32_t step = (order == TSQL_SO_ASC) ? 1 : -1;
-
-  if (numLeft == numRight) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  } else if (numLeft == 1) {
-    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
-      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  } else if (numRight == 1) {
-    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
-      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
-        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];
-    }
-  }
-}
-
-void calc_fn_i8_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int32_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i8_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int8_t, double)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int32_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i16_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int16_t, double)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int32_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_i64_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, int64_t, double)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int32_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_f_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, float, double)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int8_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int16_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int32_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, int64_t)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, float)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
-}
-
-void calc_fn_d_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
-  TYPE_CONVERT(left, right, output, double, double)
-  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
-}
-
-/*
- * 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, 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, 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_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
-    {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, 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, 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_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
-    {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, 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, 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_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
-    {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, 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, 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_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
-    {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, 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, 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_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
-    {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
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-_bi_consumer_fn_t tGetBiConsumerFn(int32_t leftType, int32_t rightType, int32_t optr) {
-  switch (optr) {
-    case TSDB_BINARY_OP_ADD:
-      return add_function_arraylist[leftType][rightType];
-    case TSDB_BINARY_OP_SUBTRACT:
-      return sub_function_arraylist[leftType][rightType];
-    case TSDB_BINARY_OP_MULTIPLY:
-      return multi_function_arraylist[leftType][rightType];
-    case TSDB_BINARY_OP_DIVIDE:
-      return div_function_arraylist[leftType][rightType];
-    case TSDB_BINARY_OP_REMAINDER:
-      return rem_function_arraylist[leftType][rightType];
-    default:
-      return NULL;
-  }
-  return NULL;
-}
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 6c685b06b4e109cee43262a2ae382f56c495d9ce..620fe13a9fd37c44b9fa9d25183d5134304a08c3 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -16,77 +16,96 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "tcache.h"
-#include "tlog.h"
 #include "trpc.h"
-#include "tsdb.h"
-#include "tsocket.h"
 #include "tsystem.h"
-#include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
-
+#include "tsched.h"
+#include "tscLog.h"
+#include "tscUtil.h"
 #include "tsclient.h"
+#include "tglobal.h"
+#include "tconfig.h"
+#include "ttimezone.h"
+#include "tlocale.h"
+
 // global, not configurable
-void *  pVnodeConn;
-void *  pVMeterConn;
-void *  pTscMgmtConn;
-void *  pSlaveConn;
-void *  tscCacheHandle;
-uint8_t globalCode = 0;
-int     initialized = 0;
-int     slaveIndex;
+SCacheObj*  tscMetaCache;
+SCacheObj*  tscObjCache;
 void *  tscTmr;
 void *  tscQhandle;
-void *  tscConnCache;
 void *  tscCheckDiskUsageTmr;
 int     tsInsertHeadSize;
 
-extern int            tscEmbedded;
-int                   tscNumOfThreads;
-static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
+int tscNumOfThreads;
 
-extern int  tsTscEnableRecordSql;
-extern int  tsNumOfLogLines;
+static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
 void taosInitNote(int numOfNoteLines, int maxNotes, char* lable);
-void deltaToUtcInitOnce();
+//void tscUpdateEpSet(void *ahandle, SRpcEpSet *pEpSet);
 
-void tscCheckDiskUsage(void *para, void *unused) {
+void tscCheckDiskUsage(void *UNUSED_PARAM(para), void* UNUSED_PARAM(param)) {
   taosGetDisk();
   taosTmrReset(tscCheckDiskUsage, 1000, NULL, tscTmr, &tscCheckDiskUsageTmr);
 }
 
-void taos_init_imp() {
-  char        temp[128];
-  struct stat dirstat;
-  SRpcInit    rpcInit;
+int32_t tscInitRpc(const char *user, const char *secretEncrypt, void **pDnodeConn) {
+  SRpcInit rpcInit;
+
+  if (*pDnodeConn == NULL) {
+    memset(&rpcInit, 0, sizeof(rpcInit));
+    rpcInit.localPort = 0;
+    rpcInit.label = "TSC";
+    rpcInit.numOfThreads = 1;  // every DB connection has only one thread
+    rpcInit.cfp = tscProcessMsgFromServer;
+    rpcInit.sessions = tsMaxConnections;
+    rpcInit.connType = TAOS_CONN_CLIENT;
+    rpcInit.user = (char *)user;
+    rpcInit.idleTime = 2000;
+    rpcInit.ckey = "key";
+    rpcInit.spi = 1;
+    rpcInit.secret = (char *)secretEncrypt;
+
+    *pDnodeConn = rpcOpen(&rpcInit);
+    if (*pDnodeConn == NULL) {
+      tscError("failed to init connection to TDengine");
+      return -1;
+    } else {
+      tscDebug("dnodeConn:%p is created, user:%s", *pDnodeConn, user);
+    }
+  }
 
+  return 0;
+}
+
+void taos_init_imp(void) {
+  char temp[128];
+  
+  errno = TSDB_CODE_SUCCESS;
   srand(taosGetTimestampSec());
   deltaToUtcInitOnce();
 
   if (tscEmbedded == 0) {
-    /*
-     * set localIp = 0
-     * means unset tsLocalIp in client
-     * except read from config file
-     */
-    strcpy(tsLocalIp, "0.0.0.0");
 
     // Read global configuration.
-    tsReadGlobalLogConfig();
+    taosInitGlobalCfg();
+    taosReadGlobalLogCfg();
 
     // For log directory
-    if (stat(logDir, &dirstat) < 0) mkdir(logDir, 0755);
+    if (mkdir(tsLogDir, 0755) != 0 && errno != EEXIST) {
+      printf("failed to create log dir:%s\n", tsLogDir);
+    }
 
-    sprintf(temp, "%s/taoslog", logDir);
+    sprintf(temp, "%s/taoslog", tsLogDir);
     if (taosInitLog(temp, tsNumOfLogLines, 10) < 0) {
-      printf("failed to open log file in directory:%s\n", logDir);
+      printf("failed to open log file in directory:%s\n", tsLogDir);
     }
 
-    tsReadGlobalConfig();
-    tsPrintGlobalConfig();
+    taosReadGlobalCfg();
+    taosCheckGlobalCfg();
+    taosPrintGlobalCfg();
 
-    tscTrace("starting to initialize TAOS client ...");
-    tscTrace("Local IP address is:%s", tsLocalIp);
+    tscDebug("starting to initialize TAOS client ...");
+    tscDebug("Local End Point is:%s", tsLocalEp);
   }
 
   taosSetCoreDump();
@@ -94,29 +113,17 @@ void taos_init_imp() {
   if (tsTscEnableRecordSql != 0) {
     taosInitNote(tsNumOfLogLines / 10, 1, (char*)"tsc_note");
   }
-  
-  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 (tscSetMgmtEpSetFromCfg(tsFirst, tsSecond) < 0) {
+    tscError("failed to init mnode EP list");
+    return;
+  } 
 
-  if (tsSecondIp[0]) {
-    tscMgmtIpList.numOfIps = 3;
-    strcpy(tscMgmtIpList.ipstr[2], tsSecondIp);
-    tscMgmtIpList.ip[2] = inet_addr(tsSecondIp);
-  }
+  tscInitMsgsFp();
+  int queueSize = tsMaxConnections*2;
 
-  tscInitMsgs();
-  slaveIndex = rand();
-  int queueSize = tsMaxVnodeConnections + tsMaxMeterConnections + tsMaxMgmtConnections + tsMaxMgmtConnections;
-
-  if (tscEmbedded == 0) {
-    tscNumOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 2.0;
-  } else {
-    tscNumOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 4.0;
-  }
+  double factor = (tscEmbedded == 0)? 2.0:4.0;
+  tscNumOfThreads = (int)(tsNumOfCores * tsNumOfThreadsPerCore / factor);
 
   if (tscNumOfThreads < 2) tscNumOfThreads = 2;
 
@@ -126,84 +133,54 @@ void taos_init_imp() {
     return;
   }
 
-  memset(&rpcInit, 0, sizeof(rpcInit));
-  rpcInit.localIp = tsLocalIp;
-  rpcInit.localPort = 0;
-  rpcInit.label = "TSC-vnode";
-  rpcInit.numOfThreads = tscNumOfThreads;
-  rpcInit.fp = tscProcessMsgFromServer;
-  rpcInit.bits = 20;
-  rpcInit.numOfChanns = tscNumOfThreads;
-  rpcInit.sessionsPerChann = tsMaxVnodeConnections / tscNumOfThreads;
-  rpcInit.idMgmt = TAOS_ID_FREE;
-  rpcInit.noFree = 0;
-  rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
-  rpcInit.qhandle = tscQhandle;
-  pVnodeConn = taosOpenRpc(&rpcInit);
-  if (pVnodeConn == NULL) {
-    tscError("failed to init connection to vnode");
-    return;
+  tscTmr = taosTmrInit(tsMaxConnections * 2, 200, 60000, "TSC");
+  if(0 == tscEmbedded){
+    taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);      
   }
 
-  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;
-    }
+  int64_t refreshTime = 10; // 10 seconds by default
+  if (tscMetaCache == NULL) {
+    tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, refreshTime, false, NULL, "tableMeta");
+    tscObjCache = taosCacheInit(TSDB_DATA_TYPE_BIGINT, refreshTime/2, false, tscFreeSqlObjInCache, "sqlObj");
   }
 
-  memset(&rpcInit, 0, sizeof(rpcInit));
-  rpcInit.localIp = tsLocalIp;
-  rpcInit.localPort = 0;
-  rpcInit.label = "TSC-mgmt";
-  rpcInit.numOfThreads = 1;
-  rpcInit.fp = tscProcessMsgFromServer;
-  rpcInit.bits = 20;
-  rpcInit.numOfChanns = 1;
-  rpcInit.sessionsPerChann = tsMaxMgmtConnections;
-  rpcInit.idMgmt = TAOS_ID_FREE;
-  rpcInit.noFree = 0;
-  rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
-  rpcInit.qhandle = tscQhandle;
-  pTscMgmtConn = taosOpenRpc(&rpcInit);
-  if (pTscMgmtConn == NULL) {
-    tscError("failed to init connection to mgmt");
-    return;
-  }
+  tscDebug("client is initialized successfully");
+}
 
-  tscTmr = taosTmrInit(tsMaxMgmtConnections * 2, 200, 60000, "TSC");
-  if(0 == tscEmbedded){
-    taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);      
-  }
-  int64_t refreshTime = tsMetricMetaKeepTimer < tsMeterMetaKeepTimer ? tsMetricMetaKeepTimer : tsMeterMetaKeepTimer;
-  refreshTime = refreshTime > 2 ? 2 : refreshTime;
-  refreshTime = refreshTime < 1 ? 1 : refreshTime;
+void taos_init() { pthread_once(&tscinit, taos_init_imp); }
 
-  if (tscCacheHandle == NULL) tscCacheHandle = taosInitDataCache(tsMaxMeterConnections / 2, tscTmr, refreshTime);
+void taos_cleanup() {
+  if (tscMetaCache != NULL) {
+    taosCacheCleanup(tscMetaCache);
+    tscMetaCache = NULL;
 
-  tscConnCache = taosOpenConnCache(tsMaxMeterConnections * 2, taosCloseRpcConn, tscTmr, tsShellActivityTimer * 1000);
+    taosCacheCleanup(tscObjCache);
+    tscObjCache = NULL;
+  }
+  
+  if (tscQhandle != NULL) {
+    taosCleanUpScheduler(tscQhandle);
+    tscQhandle = NULL;
+  }
 
-  initialized = 1;
-  tscTrace("client is initialized successfully");
-  tsInsertHeadSize = tsRpcHeadSize + sizeof(SShellSubmitMsg);
+  taosCleanupKeywordsTable();
+  taosCloseLog();
+  
+  taosTmrCleanUp(tscTmr);
 }
 
-void taos_init() { pthread_once(&tscinit, taos_init_imp); }
-
 static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
-  SGlobalConfig *cfg = NULL;
+  SGlobalCfg *cfg = NULL;
 
   switch (option) {
     case TSDB_OPTION_CONFIGDIR:
-      cfg = tsGetConfigOption("configDir");
+      cfg = taosGetConfigOption("configDir");
       assert(cfg != NULL);
     
-      if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
-        strncpy(configDir, pStr, TSDB_FILENAME_LEN);
-        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
-        tscPrint("set config file directory:%s", pStr);
+      if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
+        tstrncpy(configDir, pStr, TSDB_FILENAME_LEN);
+        cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
+        tscInfo("set config file directory:%s", pStr);
       } else {
         tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
                 tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
@@ -211,51 +188,51 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
       break;
 
     case TSDB_OPTION_SHELL_ACTIVITY_TIMER:
-      cfg = tsGetConfigOption("shellActivityTimer");
+      cfg = taosGetConfigOption("shellActivityTimer");
       assert(cfg != NULL);
     
-      if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
         tsShellActivityTimer = atoi(pStr);
         if (tsShellActivityTimer < 1) tsShellActivityTimer = 1;
         if (tsShellActivityTimer > 3600) tsShellActivityTimer = 3600;
-        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
-        tscPrint("set shellActivityTimer:%d", tsShellActivityTimer);
+        cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
+        tscInfo("set shellActivityTimer:%d", tsShellActivityTimer);
       } else {
         tscWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, pStr,
-                tsCfgStatusStr[cfg->cfgStatus], (int32_t *)cfg->ptr);
+                tsCfgStatusStr[cfg->cfgStatus], *(int32_t *)cfg->ptr);
       }
       break;
 
     case TSDB_OPTION_LOCALE: {  // set locale
-      cfg = tsGetConfigOption("locale");
+      cfg = taosGetConfigOption("locale");
       assert(cfg != NULL);
   
       size_t len = strlen(pStr);
       if (len == 0 || len > TSDB_LOCALE_LEN) {
-        tscPrint("Invalid locale:%s, use default", pStr);
+        tscInfo("Invalid locale:%s, use default", pStr);
         return -1;
       }
 
-      if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
         char sep = '.';
 
         if (strlen(tsLocale) == 0) { // locale does not set yet
           char* defaultLocale = setlocale(LC_CTYPE, "");
-          strcpy(tsLocale, defaultLocale);
+          tstrncpy(tsLocale, defaultLocale, TSDB_LOCALE_LEN);
         }
 
         // set the user specified locale
         char *locale = setlocale(LC_CTYPE, pStr);
 
         if (locale != NULL) {
-          tscPrint("locale set, prev locale:%s, new locale:%s", tsLocale, locale);
-          cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+          tscInfo("locale set, prev locale:%s, new locale:%s", tsLocale, locale);
+          cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
         } else { // 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);
+          tscInfo("failed to set locale:%s, current locale:%s", pStr, tsLocale);
         }
 
-        strncpy(tsLocale, locale, tListLen(tsLocale));
+        tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
 
         char *charset = strrchr(tsLocale, sep);
         if (charset != NULL) {
@@ -265,21 +242,21 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
 
           if (taosValidateEncodec(charset)) {
             if (strlen(tsCharset) == 0) {
-              tscPrint("charset set:%s", charset);
+              tscInfo("charset set:%s", charset);
             } else {
-              tscPrint("charset changed from %s to %s", tsCharset, charset);
+              tscInfo("charset changed from %s to %s", tsCharset, charset);
             }
 
-            strncpy(tsCharset, charset, tListLen(tsCharset));
-            cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+            tstrncpy(tsCharset, charset, TSDB_LOCALE_LEN);
+            cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
 
           } else {
-            tscPrint("charset:%s is not valid in locale, charset remains:%s", charset, tsCharset);
+            tscInfo("charset:%s is not valid in locale, charset remains:%s", charset, tsCharset);
           }
 
           free(charset);
         } else { // it may be windows system
-          tscPrint("charset remains:%s", tsCharset);
+          tscInfo("charset remains:%s", tsCharset);
         }
       } else {
         tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
@@ -290,27 +267,27 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
 
     case TSDB_OPTION_CHARSET: {
       /* set charset will override the value of charset, assigned during system locale changed */
-      cfg = tsGetConfigOption("charset");
+      cfg = taosGetConfigOption("charset");
       assert(cfg != NULL);
       
       size_t len = strlen(pStr);
       if (len == 0 || len > TSDB_LOCALE_LEN) {
-        tscPrint("failed to set charset:%s", pStr);
+        tscInfo("failed to set charset:%s", pStr);
         return -1;
       }
 
-      if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
         if (taosValidateEncodec(pStr)) {
           if (strlen(tsCharset) == 0) {
-            tscPrint("charset is set:%s", pStr);
+            tscInfo("charset is set:%s", pStr);
           } else {
-            tscPrint("charset changed from %s to %s", tsCharset, pStr);
+            tscInfo("charset changed from %s to %s", tsCharset, pStr);
           }
 
-          strncpy(tsCharset, pStr, tListLen(tsCharset));
-          cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
+          tstrncpy(tsCharset, pStr, TSDB_LOCALE_LEN);
+          cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
         } else {
-          tscPrint("charset:%s not valid", pStr);
+          tscInfo("charset:%s not valid", pStr);
         }
       } else {
         tscWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, pStr,
@@ -321,36 +298,20 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
     }
 
     case TSDB_OPTION_TIMEZONE:
-      cfg = tsGetConfigOption("timezone");
+      cfg = taosGetConfigOption("timezone");
       assert(cfg != NULL);
     
-      if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
-        strcpy(tsTimezone, pStr);
+      if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
+        tstrncpy(tsTimezone, pStr, TSDB_TIMEZONE_LEN);
         tsSetTimeZone();
-        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
-        tscTrace("timezone set:%s, input:%s by taos_options", tsTimezone, pStr);
+        cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
+        tscDebug("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->option, pStr,
                 tsCfgStatusStr[cfg->cfgStatus], (char *)cfg->ptr);
       }
       break;
 
-    case TSDB_OPTION_SOCKET_TYPE:
-      cfg = tsGetConfigOption("sockettype");
-      assert(cfg != NULL);
-    
-      if (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, pStr, tListLen(tsSocketType));
-        cfg->cfgStatus = TSDB_CFG_CSTATUS_OPTION;
-        tscPrint("socket type is set:%s", tsSocketType);
-      }
-      break;
-
     default:
       // TODO return the correct error code to client in the format for taos_errstr()
       tscError("Invalid option %d", option);
@@ -360,13 +321,12 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
   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);
+      tscInfo("haven't acquire lock after spin %d times.", i);
       sched_yield();
     }
   }
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index e9395d7dde46e478ae5058e6842579eb33079b57..a98b0272b6fe800ba61c1d8dcdac85ae85e8ee8f 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -13,156 +13,89 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
 #include "tscUtil.h"
 #include "hash.h"
+#include "os.h"
+#include "qAst.h"
 #include "taosmsg.h"
 #include "tcache.h"
 #include "tkey.h"
 #include "tmd5.h"
-#include "tscJoinProcess.h"
+#include "tscLocalMerge.h"
+#include "tscLog.h"
 #include "tscProfile.h"
-#include "tscSecondaryMerge.h"
+#include "tscSubquery.h"
 #include "tschemautil.h"
 #include "tsclient.h"
-#include "tsqldef.h"
 #include "ttimer.h"
+#include "ttokendef.h"
 
-/*
- * the detailed information regarding metric meta key is:
- * fullmetername + '.' + tagQueryCond + '.' + tableNameCond + '.' + joinCond +
- * '.' + relation + '.' + [tagId1, tagId2,...] + '.' + group_orderType
- *
- * if querycond/tablenameCond/joinCond is null, its format is:
- * fullmetername + '.' + '(nil)' + '.' + '(nil)' + relation + '.' + [tagId1,
- * tagId2,...] + '.' + group_orderType
- */
-void tscGetMetricMetaCacheKey(SQueryInfo* pQueryInfo, char* str, uint64_t uid) {
-  int32_t         index = -1;
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoByUid(pQueryInfo, uid, &index);
-
-  int32_t len = 0;
-  char    tagIdBuf[128] = {0};
-  for (int32_t i = 0; i < pMeterMetaInfo->numOfTags; ++i) {
-    len += sprintf(&tagIdBuf[len], "%d,", pMeterMetaInfo->tagColumnIndex[i]);
-  }
-
-  STagCond* pTagCond = &pQueryInfo->tagCond;
-  assert(len < tListLen(tagIdBuf));
-
-  const int32_t maxKeySize = TSDB_MAX_TAGS_LEN;  // allowed max key size
-
-  SCond* cond = tsGetMetricQueryCondPos(pTagCond, uid);
-
-  char join[512] = {0};
-  if (pTagCond->joinInfo.hasJoin) {
-    sprintf(join, "%s,%s", pTagCond->joinInfo.left.meterId, pTagCond->joinInfo.right.meterId);
-  }
-
-  // estimate the buffer size
-  size_t tbnameCondLen = pTagCond->tbnameCond.cond != NULL ? strlen(pTagCond->tbnameCond.cond) : 0;
-  size_t redundantLen = 20;
-
-  size_t bufSize = strlen(pMeterMetaInfo->name) + tbnameCondLen + strlen(join) + strlen(tagIdBuf);
-  if (cond != NULL) {
-    bufSize += strlen(cond->cond);
-  }
-
-  bufSize = (size_t)((bufSize + redundantLen) * 1.5);
-  char* tmp = calloc(1, bufSize);
+static void freeQueryInfoImpl(SQueryInfo* pQueryInfo);
+static void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool removeFromCache);
 
-  int32_t keyLen = snprintf(tmp, bufSize, "%s,%s,%s,%d,%s,[%s],%d", pMeterMetaInfo->name,
-                            (cond != NULL ? cond->cond : NULL), (tbnameCondLen > 0 ? pTagCond->tbnameCond.cond : NULL),
-                            pTagCond->relType, join, tagIdBuf, pQueryInfo->groupbyExpr.orderType);
-
-  assert(keyLen <= bufSize);
-
-  if (keyLen < maxKeySize) {
-    strcpy(str, tmp);
-  } else {  // using md5 to hash
-    MD5_CTX ctx;
-    MD5Init(&ctx);
-
-    MD5Update(&ctx, (uint8_t*)tmp, keyLen);
-    char* pStr = base64_encode(ctx.digest, tListLen(ctx.digest));
-    strcpy(str, pStr);
+SCond* tsGetSTableQueryCond(STagCond* pTagCond, uint64_t uid) {
+  if (pTagCond->pCond == NULL) {
+    return NULL;
   }
-
-  free(tmp);
-}
-
-SCond* tsGetMetricQueryCondPos(STagCond* pTagCond, uint64_t uid) {
-  for (int32_t i = 0; i < TSDB_MAX_JOIN_TABLE_NUM; ++i) {
-    if (uid == pTagCond->cond[i].uid) {
-      return &pTagCond->cond[i];
+  
+  size_t size = taosArrayGetSize(pTagCond->pCond);
+  for (int32_t i = 0; i < size; ++i) {
+    SCond* pCond = taosArrayGet(pTagCond->pCond, i);
+    
+    if (uid == pCond->uid) {
+      return pCond;
     }
   }
 
   return NULL;
 }
 
-void tsSetMetricQueryCond(STagCond* pTagCond, uint64_t uid, const char* str) {
-  size_t len = strlen(str);
-  if (len == 0) {
+void tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, SBufferWriter* bw) {
+  if (tbufTell(bw) == 0) {
     return;
   }
-
-  SCond* pDest = &pTagCond->cond[pTagCond->numOfTagCond];
-  pDest->uid = uid;
-  pDest->cond = strdup(str);
-
-  pTagCond->numOfTagCond += 1;
-}
-
-bool tscQueryOnMetric(SSqlCmd* pCmd) {
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-
-  return ((pQueryInfo->type & TSDB_QUERY_TYPE_STABLE_QUERY) == TSDB_QUERY_TYPE_STABLE_QUERY) &&
-         (pCmd->msgType == TSDB_MSG_TYPE_QUERY);
-}
-
-bool tscQueryMetricTags(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    if (tscSqlExprGet(pQueryInfo, i)->functionId != TSDB_FUNC_TAGPRJ) {
-      return false;
-    }
+  
+  SCond cond = {
+    .uid = uid,
+    .len = (int32_t)(tbufTell(bw)),
+    .cond = NULL,
+  };
+  
+  cond.cond = tbufGetData(bw, true);
+  
+  if (pTagCond->pCond == NULL) {
+    pTagCond->pCond = taosArrayInit(3, sizeof(SCond));
   }
-
-  return true;
+  
+  taosArrayPush(pTagCond->pCond, &cond);
 }
 
-bool tscIsSelectivityWithTagQuery(SSqlCmd* pCmd) {
-  bool    hasTags = false;
-  int32_t numOfSelectivity = 0;
-
-  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+bool tscQueryTags(SQueryInfo* pQueryInfo) {
+  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+    int32_t functId = pExpr->functionId;
 
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
-    int32_t functId = tscSqlExprGet(pQueryInfo, i)->functionId;
-    if (functId == TSDB_FUNC_TAG_DUMMY) {
-      hasTags = true;
+    // "select count(tbname)" query
+    if (functId == TSDB_FUNC_COUNT && pExpr->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
       continue;
     }
 
-    if ((aAggs[functId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
-      numOfSelectivity++;
+    if (functId != TSDB_FUNC_TAGPRJ && functId != TSDB_FUNC_TID_TAG) {
+      return false;
     }
   }
 
-  if (numOfSelectivity > 0 && hasTags) {
-    return true;
-  }
-
-  return false;
+  return true;
 }
 
-void tscGetDBInfoFromMeterId(char* meterId, char* db) {
-  char* st = strstr(meterId, TS_PATH_DELIMITER);
+// todo refactor, extract methods and move the common module
+void tscGetDBInfoFromTableFullName(char* tableId, char* db) {
+  char* st = strstr(tableId, TS_PATH_DELIMITER);
   if (st != NULL) {
     char* end = strstr(st + 1, TS_PATH_DELIMITER);
     if (end != NULL) {
-      memcpy(db, meterId, (end - meterId));
-      db[end - meterId] = 0;
+      memcpy(db, tableId, (end - tableId));
+      db[end - tableId] = 0;
       return;
     }
   }
@@ -170,51 +103,21 @@ void tscGetDBInfoFromMeterId(char* meterId, char* db) {
   db[0] = 0;
 }
 
-SVnodeSidList* tscGetVnodeSidList(SMetricMeta* pMetricmeta, int32_t vnodeIdx) {
-  if (pMetricmeta == NULL) {
-    tscError("illegal metricmeta");
-    return 0;
-  }
-
-  if (pMetricmeta->numOfVnodes == 0 || pMetricmeta->numOfMeters == 0) {
-    return 0;
-  }
-
-  if (vnodeIdx < 0 || vnodeIdx >= pMetricmeta->numOfVnodes) {
-    int32_t vnodeRange = (pMetricmeta->numOfVnodes > 0) ? (pMetricmeta->numOfVnodes - 1) : 0;
-    tscError("illegal vnodeIdx:%d, reset to 0, vnodeIdx range:%d-%d", vnodeIdx, 0, vnodeRange);
-
-    vnodeIdx = 0;
-  }
-
-  return (SVnodeSidList*)(pMetricmeta->list[vnodeIdx] + (char*)pMetricmeta);
-}
-
-SMeterSidExtInfo* tscGetMeterSidInfo(SVnodeSidList* pSidList, int32_t idx) {
-  if (pSidList == NULL) {
-    tscError("illegal sidlist");
-    return 0;
-  }
-
-  if (idx < 0 || idx >= pSidList->numOfSids) {
-    int32_t sidRange = (pSidList->numOfSids > 0) ? (pSidList->numOfSids - 1) : 0;
-
-    tscError("illegal sidIdx:%d, reset to 0, sidIdx range:%d-%d", idx, 0, sidRange);
-    idx = 0;
-  }
-  return (SMeterSidExtInfo*)(pSidList->pSidExtInfoList[idx] + (char*)pSidList);
-}
-
-bool tscIsTwoStageMergeMetricQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
+bool tscIsTwoStageSTableQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   if (pQueryInfo == NULL) {
     return false;
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
-  if (pMeterMetaInfo == NULL || pMeterMetaInfo->pMetricMeta == NULL) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
+  if (pTableMetaInfo == NULL) {
     return false;
   }
   
+  // for select query super table, the super table vgroup list can not be null in any cases.
+  if (pQueryInfo->command == TSDB_SQL_SELECT && UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    assert(pTableMetaInfo->vgroupList != NULL);
+  }
+  
   if ((pQueryInfo->type & TSDB_QUERY_TYPE_FREE_RESOURCE) == TSDB_QUERY_TYPE_FREE_RESOURCE) {
     return false;
   }
@@ -224,37 +127,37 @@ bool tscIsTwoStageMergeMetricQuery(SQueryInfo* pQueryInfo, int32_t tableIndex) {
     return false;
   }
 
-  if (((pQueryInfo->type & TSDB_QUERY_TYPE_STABLE_SUBQUERY) != TSDB_QUERY_TYPE_STABLE_SUBQUERY) &&
-      pQueryInfo->command == TSDB_SQL_SELECT) {
-    return UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
+  if (!TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_STABLE_SUBQUERY) && pQueryInfo->command == TSDB_SQL_SELECT) {
+    return UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo);
   }
 
   return false;
 }
 
 bool tscIsProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, tableIndex);
   
   /*
    * In following cases, return false for non ordered project query on super table
-   * 1. failed to get metermeta from server; 2. not a super table; 3. limitation is 0;
+   * 1. failed to get tableMeta from server; 2. not a super table; 3. limitation is 0;
    * 4. show queries, instead of a select query
    */
-  if (pMeterMetaInfo == NULL || !UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo) ||
-      pQueryInfo->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT || pQueryInfo->exprsInfo.numOfExprs == 0) {
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  if (pTableMetaInfo == NULL || !UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) ||
+      pQueryInfo->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT || numOfExprs == 0) {
     return false;
   }
   
-  // only query on tag, not a projection query
-  if (tscQueryMetricTags(pQueryInfo)) {
-    return false;
-  }
-  
-  // for project query, only the following two function is allowed
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+  for (int32_t i = 0; i < numOfExprs; ++i) {
     int32_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
-    if (functionId != TSDB_FUNC_PRJ && functionId != TSDB_FUNC_TAGPRJ && functionId != TSDB_FUNC_TAG &&
-        functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_ARITHM) {
+
+    if (functionId != TSDB_FUNC_PRJ &&
+        functionId != TSDB_FUNC_TAGPRJ &&
+        functionId != TSDB_FUNC_TAG &&
+        functionId != TSDB_FUNC_TS &&
+        functionId != TSDB_FUNC_ARITHM &&
+        functionId != TSDB_FUNC_TS_COMP &&
+        functionId != TSDB_FUNC_TID_TAG) {
       return false;
     }
   }
@@ -262,12 +165,13 @@ bool tscIsProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   return true;
 }
 
+// not order by timestamp projection query on super table
 bool tscNonOrderedProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   if (!tscIsProjectionQueryOnSTable(pQueryInfo, tableIndex)) {
     return false;
   }
   
-  // order by column exists, not a non-ordered projection query
+  // order by columnIndex exists, not a non-ordered projection query
   return pQueryInfo->order.orderColId < 0;
 }
 
@@ -276,14 +180,18 @@ bool tscOrderedProjectionQueryOnSTable(SQueryInfo* pQueryInfo, int32_t tableInde
     return false;
   }
   
-  // order by column exists, a non-ordered projection query
+  // order by columnIndex exists, a non-ordered projection query
   return pQueryInfo->order.orderColId >= 0;
 }
 
-bool tscProjectionQueryOnTable(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
+bool tscIsProjectionQuery(SQueryInfo* pQueryInfo) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+
+  for (int32_t i = 0; i < size; ++i) {
     int32_t functionId = tscSqlExprGet(pQueryInfo, i)->functionId;
-    if (functionId != TSDB_FUNC_PRJ && functionId != TSDB_FUNC_TS) {
+
+    if (functionId != TSDB_FUNC_PRJ && functionId != TSDB_FUNC_TAGPRJ && functionId != TSDB_FUNC_TAG &&
+        functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_ARITHM) {
       return false;
     }
   }
@@ -292,11 +200,14 @@ bool tscProjectionQueryOnTable(SQueryInfo* pQueryInfo) {
 }
 
 bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
+  size_t size = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  for (int32_t i = 0; i < size; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-    if (pExpr == NULL) {
-      return false;
-    }
+    assert(pExpr != NULL);
+//    if (pExpr == NULL) {
+//      return false;
+//    }
 
     int32_t functionId = pExpr->functionId;
     if (functionId == TSDB_FUNC_TAG) {
@@ -307,11 +218,13 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
       return false;
     }
   }
+
   return true;
 }
 
 bool tscIsTWAQuery(SQueryInfo* pQueryInfo) {
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < numOfExprs; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     if (pExpr == NULL) {
       continue;
@@ -331,42 +244,23 @@ void tscClearInterpInfo(SQueryInfo* pQueryInfo) {
     return;
   }
 
-  pQueryInfo->interpoType = TSDB_INTERPO_NONE;
-  tfree(pQueryInfo->defaultVal);
-}
-
-void tscClearSqlMetaInfoForce(SSqlCmd* pCmd) {
-  /* remove the metermeta/metricmeta in cache */
-  //    taosRemoveDataFromCache(tscCacheHandle, (void**)&(pCmd->pMeterMeta), true);
-  //    taosRemoveDataFromCache(tscCacheHandle, (void**)&(pCmd->pMetricMeta), true);
+  pQueryInfo->fillType = TSDB_FILL_NONE;
+  taosTFree(pQueryInfo->fillVal);
 }
 
 int32_t tscCreateResPointerInfo(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
   if (pRes->tsrow == NULL) {
-    pRes->numOfnchar = 0;
-  
-    int32_t numOfOutputCols = pQueryInfo->fieldsInfo.numOfOutputCols;
-    for (int32_t i = 0; i < numOfOutputCols; ++i) {
-      TAOS_FIELD* pField = tscFieldInfoGetField(pQueryInfo, i);
-      if (pField->type == TSDB_DATA_TYPE_NCHAR) {
-        pRes->numOfnchar++;
-      }
-    }
-  
-    pRes->tsrow = calloc(1, (POINTER_BYTES + sizeof(short)) * numOfOutputCols + POINTER_BYTES * pRes->numOfnchar);
-    pRes->bytes = calloc(numOfOutputCols, sizeof(short));
-  
-    if (pRes->numOfnchar > 0) {
-      pRes->buffer = calloc(POINTER_BYTES, pRes->numOfnchar);
-    }
-  
+    int32_t numOfOutput = pQueryInfo->fieldsInfo.numOfOutput;
+    pRes->numOfCols = numOfOutput;
+
+    pRes->tsrow  = calloc(numOfOutput, POINTER_BYTES);
+    pRes->length = calloc(numOfOutput, sizeof(int32_t));
+    pRes->buffer = calloc(numOfOutput, POINTER_BYTES);
+
     // not enough memory
-    if (pRes->tsrow == NULL || pRes->bytes == NULL || (pRes->buffer == NULL && pRes->numOfnchar > 0)) {
-      tfree(pRes->tsrow);
-      tfree(pRes->bytes);
-      tfree(pRes->buffer);
-    
-      pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    if (pRes->tsrow == NULL || (pRes->buffer == NULL && pRes->numOfCols > 0)) {
+      taosTFree(pRes->tsrow);
+      pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
       return pRes->code;
     }
   }
@@ -374,109 +268,155 @@ int32_t tscCreateResPointerInfo(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
-void tscDestroyResPointerInfo(SSqlRes* pRes) {
-  if (pRes->buffer != NULL) {
-    assert(pRes->numOfnchar > 0);
-    // free all buffers containing the multibyte string
-    for (int i = 0; i < pRes->numOfnchar; i++) {
-      tfree(pRes->buffer[i]);
+static void tscDestroyResPointerInfo(SSqlRes* pRes) {
+  if (pRes->buffer != NULL) { // free all buffers containing the multibyte string
+    for (int i = 0; i < pRes->numOfCols; i++) {
+      taosTFree(pRes->buffer[i]);
     }
     
-    pRes->numOfnchar = 0;
+    pRes->numOfCols = 0;
   }
   
-  tfree(pRes->pRsp);
-  tfree(pRes->tsrow);
-  
-  tfree(pRes->pGroupRec);
-  tfree(pRes->pColumnIndex);
-  tfree(pRes->buffer);
-  tfree(pRes->bytes);
+  taosTFree(pRes->pRsp);
+
+  taosTFree(pRes->tsrow);
+  taosTFree(pRes->length);
+  taosTFree(pRes->buffer);
+
+  taosTFree(pRes->pGroupRec);
+  taosTFree(pRes->pColumnIndex);
+
+  if (pRes->pArithSup != NULL) {
+    taosTFree(pRes->pArithSup->data);
+    taosTFree(pRes->pArithSup);
+  }
   
   pRes->data = NULL;  // pRes->data points to the buffer of pRsp, no need to free
 }
 
-void tscFreeSqlCmdData(SSqlCmd* pCmd) {
-  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-  tscFreeSubqueryInfo(pCmd);
-}
-
-/*
- * this function must not change the pRes->code value, since it may be used later.
- */
-void tscFreeResData(SSqlObj* pSql) {
-  SSqlRes* pRes = &pSql->res;
-  
-  pRes->row = 0;
-  
-  pRes->rspType = 0;
-  pRes->rspLen = 0;
-  pRes->row = 0;
+static void tscFreeQueryInfo(SSqlCmd* pCmd, bool removeFromCache) {
+  if (pCmd == NULL || pCmd->numOfClause == 0) {
+    return;
+  }
   
-  pRes->numOfRows = 0;
-  pRes->numOfTotal = 0;
-  pRes->numOfTotalInCurrentClause = 0;
+  for (int32_t i = 0; i < pCmd->numOfClause; ++i) {
+    char* addr = (char*)pCmd - offsetof(SSqlObj, cmd);
+    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, i);
+    
+    freeQueryInfoImpl(pQueryInfo);
+    clearAllTableMetaInfo(pQueryInfo, (const char*)addr, removeFromCache);
+    taosTFree(pQueryInfo);
+  }
   
-  pRes->numOfGroups = 0;
-  pRes->precision = 0;
-  pRes->qhandle = 0;
+  pCmd->numOfClause = 0;
+  taosTFree(pCmd->pQueryInfo);
+}
+
+void tscResetSqlCmdObj(SSqlCmd* pCmd, bool removeFromCache) {
+  pCmd->command   = 0;
+  pCmd->numOfCols = 0;
+  pCmd->count     = 0;
+  pCmd->curSql    = NULL;
+  pCmd->msgType   = 0;
+  pCmd->parseFinished = 0;
+  pCmd->autoCreated = 0;
   
-  pRes->offset = 0;
-  pRes->useconds = 0;
+  taosHashCleanup(pCmd->pTableList);
+  pCmd->pTableList = NULL;
   
-  tscDestroyLocalReducer(pSql);
+  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
   
-  tscDestroyResPointerInfo(pRes);
+  tscFreeQueryInfo(pCmd, removeFromCache);
 }
 
 void tscFreeSqlResult(SSqlObj* pSql) {
-  tfree(pSql->res.pRsp);
-  pSql->res.row = 0;
-  pSql->res.numOfRows = 0;
-  pSql->res.numOfTotal = 0;
-
-  pSql->res.numOfGroups = 0;
-  tfree(pSql->res.pGroupRec);
-
   tscDestroyLocalReducer(pSql);
-
-  tscDestroyResPointerInfo(&pSql->res);
-  tfree(pSql->res.pColumnIndex);
+  
+  SSqlRes* pRes = &pSql->res;
+  tscDestroyResPointerInfo(pRes);
+  
+  memset(&pSql->res, 0, sizeof(SSqlRes));
 }
 
-void tscFreeSqlObjPartial(SSqlObj* pSql) {
+void tscPartiallyFreeSqlObj(SSqlObj* pSql) {
   if (pSql == NULL || pSql->signature != pSql) {
     return;
   }
 
   SSqlCmd* pCmd = &pSql->cmd;
-  STscObj* pObj = pSql->pTscObj;
-
   int32_t cmd = pCmd->command;
-  if (cmd < TSDB_SQL_INSERT || cmd == TSDB_SQL_RETRIEVE_METRIC || cmd == TSDB_SQL_RETRIEVE_EMPTY_RESULT ||
-      cmd == TSDB_SQL_METRIC_JOIN_RETRIEVE) {
+  if (cmd < TSDB_SQL_INSERT || cmd == TSDB_SQL_RETRIEVE_LOCALMERGE || cmd == TSDB_SQL_RETRIEVE_EMPTY_RESULT ||
+      cmd == TSDB_SQL_TABLE_JOIN_RETRIEVE) {
     tscRemoveFromSqlList(pSql);
   }
+  
+  // pSql->sqlstr will be used by tscBuildQueryStreamDesc
+//  if (pObj->signature == pObj) {
+    //pthread_mutex_lock(&pObj->mutex);
+    taosTFree(pSql->sqlstr);
+    //pthread_mutex_unlock(&pObj->mutex);
+//  }
+  
+  tscFreeSqlResult(pSql);
+  
+  taosTFree(pSql->pSubs);
+  pSql->numOfSubs = 0;
+  pSql->self = 0;
+  
+  tscResetSqlCmdObj(pCmd, false);
+}
 
-  pCmd->command = 0;
+static UNUSED_FUNC void tscFreeSubobj(SSqlObj* pSql) {
+  if (pSql->numOfSubs == 0) {
+    return;
+  }
 
-  // pSql->sqlstr will be used by tscBuildQueryStreamDesc
-  pthread_mutex_lock(&pObj->mutex);
-  tfree(pSql->sqlstr);
-  pthread_mutex_unlock(&pObj->mutex);
+  tscDebug("%p start to free sub SqlObj, numOfSub:%d", pSql, pSql->numOfSubs);
+
+  for(int32_t i = 0; i < pSql->numOfSubs; ++i) {
+    tscDebug("%p free sub SqlObj:%p, index:%d", pSql, pSql->pSubs[i], i);
+    taos_free_result(pSql->pSubs[i]);
+    pSql->pSubs[i] = NULL;
+  }
 
-  tscFreeSqlResult(pSql);
-  tfree(pSql->pSubs);
   pSql->numOfSubs = 0;
+}
+
+/**
+ * The free operation will cause the pSql to be removed from hash table and free it in
+ * the function of processmsgfromserver is impossible in this case, since it will fail
+ * to retrieve pSqlObj in hashtable.
+ *
+ * @param pSql
+ */
+void tscFreeSqlObjInCache(void *pSql) {
+  assert(pSql != NULL);
 
-  tscFreeSqlCmdData(pCmd);
+  SSqlObj** p = (SSqlObj**)pSql;
+  STscObj* pTscObj = (*p)->pTscObj;
+
+  assert((*p)->self != 0 && (*p)->self == (p));
+  tscFreeSqlObj(*p);
+
+  int32_t ref = T_REF_DEC(pTscObj);
+  assert(ref >= 0);
+
+  tscDebug("%p free sqlObj completed, tscObj:%p ref:%d", *p, pTscObj, ref);
+  if (ref == 0) {
+    tscDebug("%p all sqlObj freed, free tscObj:%p", *p, pTscObj);
+    tscCloseTscObj(pTscObj);
+  }
 }
 
 void tscFreeSqlObj(SSqlObj* pSql) {
-  if (pSql == NULL || pSql->signature != pSql) return;
+  if (pSql == NULL || pSql->signature != pSql) {
+    return;
+  }
+
+  tscDebug("%p start to free sqlObj", pSql);
 
-  tscTrace("%p start to free sql object", pSql);
-  tscFreeSqlObjPartial(pSql);
+  tscFreeSubobj(pSql);
+  tscPartiallyFreeSqlObj(pSql);
 
   pSql->signature = NULL;
   pSql->fp = NULL;
@@ -484,14 +424,12 @@ void tscFreeSqlObj(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
 
   memset(pCmd->payload, 0, (size_t)pCmd->allocSize);
-  tfree(pCmd->payload);
-
+  taosTFree(pCmd->payload);
   pCmd->allocSize = 0;
+  
+  taosTFree(pSql->sqlstr);
+  tsem_destroy(&pSql->rspSem);
 
-  if (pSql->fp == NULL) {
-    tsem_destroy(&pSql->rspSem);
-    tsem_destroy(&pSql->emptyRspSem);
-  }
   free(pSql);
 }
 
@@ -500,15 +438,18 @@ void tscDestroyDataBlock(STableDataBlocks* pDataBlock) {
     return;
   }
 
-  tfree(pDataBlock->pData);
-  tfree(pDataBlock->params);
+  taosTFree(pDataBlock->pData);
+  taosTFree(pDataBlock->params);
 
   // free the refcount for metermeta
-  taosRemoveDataFromCache(tscCacheHandle, (void**)&(pDataBlock->pMeterMeta), false);
-  tfree(pDataBlock);
+  if (pDataBlock->pTableMeta != NULL) {
+    taosCacheRelease(tscMetaCache, (void**)&(pDataBlock->pTableMeta), false);
+  }
+
+  taosTFree(pDataBlock);
 }
 
-SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, short bytes,
+SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes,
                                    uint32_t offset) {
   uint32_t needed = pDataBlock->numOfParams + 1;
   if (needed > pDataBlock->numOfAllocedParams) {
@@ -532,100 +473,66 @@ SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint
   return param;
 }
 
-SDataBlockList* tscCreateBlockArrayList() {
-  const int32_t DEFAULT_INITIAL_NUM_OF_BLOCK = 16;
-
-  SDataBlockList* pDataBlockArrayList = calloc(1, sizeof(SDataBlockList));
-  if (pDataBlockArrayList == NULL) {
-    return NULL;
-  }
-  pDataBlockArrayList->nAlloc = DEFAULT_INITIAL_NUM_OF_BLOCK;
-  pDataBlockArrayList->pData = calloc(1, POINTER_BYTES * pDataBlockArrayList->nAlloc);
-  if (pDataBlockArrayList->pData == NULL) {
-    free(pDataBlockArrayList);
-    return NULL;
-  }
-
-  return pDataBlockArrayList;
-}
-
-void tscAppendDataBlock(SDataBlockList* pList, STableDataBlocks* pBlocks) {
-  if (pList->nSize >= pList->nAlloc) {
-    pList->nAlloc = (pList->nAlloc) << 1U;
-    pList->pData = realloc(pList->pData, POINTER_BYTES * (size_t)pList->nAlloc);
-
-    // reset allocated memory
-    memset(pList->pData + pList->nSize, 0, POINTER_BYTES * (pList->nAlloc - pList->nSize));
-  }
-
-  pList->pData[pList->nSize++] = pBlocks;
-}
-
-void* tscDestroyBlockArrayList(SDataBlockList* pList) {
-  if (pList == NULL) {
+void*  tscDestroyBlockArrayList(SArray* pDataBlockList) {
+  if (pDataBlockList == NULL) {
     return NULL;
   }
 
-  for (int32_t i = 0; i < pList->nSize; i++) {
-    tscDestroyDataBlock(pList->pData[i]);
+  size_t size = taosArrayGetSize(pDataBlockList);
+  for (int32_t i = 0; i < size; i++) {
+    void* d = taosArrayGetP(pDataBlockList, i);
+    tscDestroyDataBlock(d);
   }
 
-  tfree(pList->pData);
-  tfree(pList);
-
+  taosArrayDestroy(pDataBlockList);
   return NULL;
 }
 
 int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock) {
   SSqlCmd* pCmd = &pSql->cmd;
-  assert(pDataBlock->pMeterMeta != NULL);
+  assert(pDataBlock->pTableMeta != NULL);
 
-  pCmd->numOfTablesInSubmit = pDataBlock->numOfMeters;
+  pCmd->numOfTablesInSubmit = pDataBlock->numOfTables;
 
   assert(pCmd->numOfClause == 1);
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, 0);
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
+
+  // set the correct table meta object, the table meta has been locked in pDataBlocks, so it must be in the cache
+  if (pTableMetaInfo->pTableMeta != pDataBlock->pTableMeta) {
+    tstrncpy(pTableMetaInfo->name, pDataBlock->tableId, sizeof(pTableMetaInfo->name));
 
-  // set the correct metermeta object, the metermeta has been locked in pDataBlocks, so it must be in the cache
-  if (pMeterMetaInfo->pMeterMeta != pDataBlock->pMeterMeta) {
-    strcpy(pMeterMetaInfo->name, pDataBlock->meterId);
-    taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), false);
+    if (pTableMetaInfo->pTableMeta != NULL) {
+      taosCacheRelease(tscMetaCache, (void**)&(pTableMetaInfo->pTableMeta), false);
+    }
 
-    pMeterMetaInfo->pMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pDataBlock->pMeterMeta);
+    pTableMetaInfo->pTableMeta = taosCacheTransfer(tscMetaCache, (void**)&pDataBlock->pTableMeta);
   } else {
-    assert(strncmp(pMeterMetaInfo->name, pDataBlock->meterId, tListLen(pDataBlock->meterId)) == 0);
+    assert(strncmp(pTableMetaInfo->name, pDataBlock->tableId, tListLen(pDataBlock->tableId)) == 0);
   }
 
   /*
    * the submit message consists of : [RPC header|message body|digest]
-   * the dataBlock only includes the RPC Header buffer and actual submit messsage body, space for digest needs
+   * the dataBlock only includes the RPC Header buffer and actual submit message body, space for digest needs
    * additional space.
    */
-  int ret = tscAllocPayload(pCmd, pDataBlock->nAllocSize + sizeof(STaosDigest));
+  int ret = tscAllocPayload(pCmd, pDataBlock->size + 100);
   if (TSDB_CODE_SUCCESS != ret) {
     return ret;
   }
 
-  memcpy(pCmd->payload, pDataBlock->pData, pDataBlock->nAllocSize);
+  assert(pDataBlock->size <= pDataBlock->nAllocSize);
+  memcpy(pCmd->payload, pDataBlock->pData, pDataBlock->size);
 
   /*
    * the payloadLen should be actual message body size
    * the old value of payloadLen is the allocated payload size
    */
-  pCmd->payloadLen = pDataBlock->nAllocSize - tsRpcHeadSize;
+  pCmd->payloadLen = pDataBlock->size;
 
-  assert(pCmd->allocSize >= pCmd->payloadLen + tsRpcHeadSize + sizeof(STaosDigest));
+  assert(pCmd->allocSize >= (uint32_t)(pCmd->payloadLen + 100) && pCmd->payloadLen > 0);
   return TSDB_CODE_SUCCESS;
 }
 
-void tscFreeUnusedDataBlocks(SDataBlockList* pList) {
-  /* release additional memory consumption */
-  for (int32_t i = 0; i < pList->nSize; ++i) {
-    STableDataBlocks* pDataBlock = pList->pData[i];
-    pDataBlock->pData = realloc(pDataBlock->pData, pDataBlock->size);
-    pDataBlock->nAllocSize = (uint32_t)pDataBlock->size;
-  }
-}
-
 /**
  * create the in-memory buffer for each table to keep the submitted data block
  * @param initialSize
@@ -636,11 +543,11 @@ void tscFreeUnusedDataBlocks(SDataBlockList* pList) {
  * @return
  */
 int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, const char* name,
-                           SMeterMeta* pMeterMeta, STableDataBlocks** dataBlocks) {
+                           STableMeta* pTableMeta, STableDataBlocks** dataBlocks) {
   STableDataBlocks* dataBuf = (STableDataBlocks*)calloc(1, sizeof(STableDataBlocks));
   if (dataBuf == NULL) {
     tscError("failed to allocated memory, reason:%s", strerror(errno));
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
   dataBuf->nAllocSize = (uint32_t)initialSize;
@@ -650,6 +557,11 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
   }
   
   dataBuf->pData = calloc(1, dataBuf->nAllocSize);
+  if (dataBuf->pData == NULL) {
+    tscError("failed to allocated memory, reason:%s", strerror(errno));
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
   dataBuf->ordered = true;
   dataBuf->prevTS = INT64_MIN;
 
@@ -657,67 +569,149 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
   dataBuf->size = startOffset;
   dataBuf->tsSource = -1;
 
-  strncpy(dataBuf->meterId, name, TSDB_METER_ID_LEN);
+  tstrncpy(dataBuf->tableId, name, sizeof(dataBuf->tableId));
 
   /*
-   * The metermeta may be released since the metermeta cache are completed clean by other thread
+   * The table meta may be released since the table meta cache are completed clean by other thread
    * due to operation such as drop database. So here we add the reference count directly instead of invoke
    * taosGetDataFromCache, which may return NULL value.
    */
-  dataBuf->pMeterMeta = taosGetDataFromExists(tscCacheHandle, pMeterMeta);
-  assert(initialSize > 0 && pMeterMeta != NULL && dataBuf->pMeterMeta != NULL);
+  dataBuf->pTableMeta = taosCacheAcquireByData(tscMetaCache, pTableMeta);
+  assert(initialSize > 0 && pTableMeta != NULL && dataBuf->pTableMeta != NULL);
 
   *dataBlocks = dataBuf;
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscGetDataBlockFromList(void* pHashList, SDataBlockList* pDataBlockList, int64_t id, int32_t size,
-                                int32_t startOffset, int32_t rowSize, const char* tableId, SMeterMeta* pMeterMeta,
+int32_t tscGetDataBlockFromList(void* pHashList, SArray* pDataBlockList, int64_t id, int32_t size,
+                                int32_t startOffset, int32_t rowSize, const char* tableId, STableMeta* pTableMeta,
                                 STableDataBlocks** dataBlocks) {
   *dataBlocks = NULL;
 
-  STableDataBlocks** t1 = (STableDataBlocks**)taosGetDataFromHash(pHashList, (const char*)&id, sizeof(id));
+  STableDataBlocks** t1 = (STableDataBlocks**)taosHashGet(pHashList, (const char*)&id, sizeof(id));
   if (t1 != NULL) {
     *dataBlocks = *t1;
   }
 
   if (*dataBlocks == NULL) {
-    int32_t ret = tscCreateDataBlock((size_t)size, rowSize, startOffset, tableId, pMeterMeta, dataBlocks);
+    int32_t ret = tscCreateDataBlock((size_t)size, rowSize, startOffset, tableId, pTableMeta, dataBlocks);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
 
-    taosAddToHashTable(pHashList, (const char*)&id, sizeof(int64_t), (char*)dataBlocks, POINTER_BYTES);
-    tscAppendDataBlock(pDataBlockList, *dataBlocks);
+    taosHashPut(pHashList, (const char*)&id, sizeof(int64_t), (char*)dataBlocks, POINTER_BYTES);
+    taosArrayPush(pDataBlockList, dataBlocks);
   }
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockList) {
+static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock, bool includeSchema) {
+  // TODO: optimize this function, handle the case while binary is not presented
+  STableMeta*   pTableMeta = pTableDataBlock->pTableMeta;
+  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
+  SSchema*      pSchema = tscGetTableSchema(pTableMeta);
+
+  SSubmitBlk* pBlock = pDataBlock;
+  memcpy(pDataBlock, pTableDataBlock->pData, sizeof(SSubmitBlk));
+  pDataBlock = (char*)pDataBlock + sizeof(SSubmitBlk);
+
+  int32_t flen = 0;  // original total length of row
+
+  // schema needs to be included into the submit data block
+  if (includeSchema) {
+    int32_t numOfCols = tscGetNumOfColumns(pTableDataBlock->pTableMeta);
+    for(int32_t j = 0; j < numOfCols; ++j) {
+      STColumn* pCol = (STColumn*) pDataBlock;
+      pCol->colId = htons(pSchema[j].colId);
+      pCol->type  = pSchema[j].type;
+      pCol->bytes = htons(pSchema[j].bytes);
+      pCol->offset = 0;
+
+      pDataBlock = (char*)pDataBlock + sizeof(STColumn);
+      flen += TYPE_BYTES[pSchema[j].type];
+    }
+
+    int32_t schemaSize = sizeof(STColumn) * numOfCols;
+    pBlock->schemaLen = schemaSize;
+  } else {
+    for (int32_t j = 0; j < tinfo.numOfColumns; ++j) {
+      flen += TYPE_BYTES[pSchema[j].type];
+    }
+
+    pBlock->schemaLen = 0;
+  }
+
+  char* p = pTableDataBlock->pData + sizeof(SSubmitBlk);
+  pBlock->dataLen = 0;
+  int32_t numOfRows = htons(pBlock->numOfRows);
+  
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    SDataRow trow = (SDataRow) pDataBlock;
+    dataRowSetLen(trow, (uint16_t)(TD_DATA_ROW_HEAD_SIZE + flen));
+    dataRowSetVersion(trow, pTableMeta->sversion);
+
+    int toffset = 0;
+    for (int32_t j = 0; j < tinfo.numOfColumns; j++) {
+      tdAppendColVal(trow, p, pSchema[j].type, pSchema[j].bytes, toffset);
+      toffset += TYPE_BYTES[pSchema[j].type];
+      p += pSchema[j].bytes;
+    }
+
+    pDataBlock = (char*)pDataBlock + dataRowLen(trow);
+    pBlock->dataLen += dataRowLen(trow);
+  }
+
+  int32_t len = pBlock->dataLen + pBlock->schemaLen;
+  pBlock->dataLen = htonl(pBlock->dataLen);
+  pBlock->schemaLen = htonl(pBlock->schemaLen);
+
+  return len;
+}
+
+static int32_t getRowExpandSize(STableMeta* pTableMeta) {
+  int32_t result = TD_DATA_ROW_HEAD_SIZE;
+  int32_t columns = tscGetNumOfColumns(pTableMeta);
+  SSchema* pSchema = tscGetTableSchema(pTableMeta);
+  for(int32_t i = 0; i < columns; i++) {
+    if (IS_VAR_DATA_TYPE((pSchema + i)->type)) {
+      result += TYPE_BYTES[TSDB_DATA_TYPE_BINARY];
+    }
+  }
+  return result;
+}
+
+int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SArray* pTableDataBlockList) {
   SSqlCmd* pCmd = &pSql->cmd;
 
-  void* pVnodeDataBlockHashList = taosInitHashTable(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
-  SDataBlockList* pVnodeDataBlockList = tscCreateBlockArrayList();
+  // the maximum expanded size in byte when a row-wise data is converted to SDataRow format
+  STableDataBlocks* pOneTableBlock = taosArrayGetP(pTableDataBlockList, 0);
+  int32_t expandSize = getRowExpandSize(pOneTableBlock->pTableMeta);
 
-  for (int32_t i = 0; i < pTableDataBlockList->nSize; ++i) {
-    STableDataBlocks* pOneTableBlock = pTableDataBlockList->pData[i];
+  void* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+  SArray* pVnodeDataBlockList = taosArrayInit(8, POINTER_BYTES);
 
+  size_t total = taosArrayGetSize(pTableDataBlockList);
+  for (int32_t i = 0; i < total; ++i) {
+    pOneTableBlock = taosArrayGetP(pTableDataBlockList, i);
     STableDataBlocks* dataBuf = NULL;
-    int32_t           ret =
-        tscGetDataBlockFromList(pVnodeDataBlockHashList, pVnodeDataBlockList, pOneTableBlock->vgid, TSDB_PAYLOAD_SIZE,
-                                tsInsertHeadSize, 0, pOneTableBlock->meterId, pOneTableBlock->pMeterMeta, &dataBuf);
+    
+    int32_t ret =
+        tscGetDataBlockFromList(pVnodeDataBlockHashList, pVnodeDataBlockList, pOneTableBlock->vgId, TSDB_PAYLOAD_SIZE,
+                                tsInsertHeadSize, 0, pOneTableBlock->tableId, pOneTableBlock->pTableMeta, &dataBuf);
     if (ret != TSDB_CODE_SUCCESS) {
       tscError("%p failed to prepare the data block buffer for merging table data, code:%d", pSql, ret);
-      taosCleanUpHashTable(pVnodeDataBlockHashList);
+      taosHashCleanup(pVnodeDataBlockHashList);
       tscDestroyBlockArrayList(pVnodeDataBlockList);
       return ret;
     }
 
-    int64_t destSize = dataBuf->size + pOneTableBlock->size;
+    SSubmitBlk* pBlocks = (SSubmitBlk*) pOneTableBlock->pData;
+    int64_t destSize = dataBuf->size + pOneTableBlock->size + pBlocks->numOfRows * expandSize + sizeof(STColumn) * tscGetNumOfColumns(pOneTableBlock->pTableMeta);
+
     if (dataBuf->nAllocSize < destSize) {
       while (dataBuf->nAllocSize < destSize) {
-        dataBuf->nAllocSize = dataBuf->nAllocSize * 1.5;
+        dataBuf->nAllocSize = (uint32_t)(dataBuf->nAllocSize * 1.5);
       }
 
       char* tmp = realloc(dataBuf->pData, dataBuf->nAllocSize);
@@ -727,31 +721,39 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
       } else {  // failed to allocate memory, free already allocated memory and return error code
         tscError("%p failed to allocate memory for merging submit block, size:%d", pSql, dataBuf->nAllocSize);
 
-        taosCleanUpHashTable(pVnodeDataBlockHashList);
-        tfree(dataBuf->pData);
+        taosHashCleanup(pVnodeDataBlockHashList);
         tscDestroyBlockArrayList(pVnodeDataBlockList);
+        taosTFree(dataBuf->pData);
 
-        return TSDB_CODE_CLI_OUT_OF_MEMORY;
+        return TSDB_CODE_TSC_OUT_OF_MEMORY;
       }
     }
 
-    SShellSubmitBlock* pBlocks = (SShellSubmitBlock*)pOneTableBlock->pData;
-    sortRemoveDuplicates(pOneTableBlock);
-
-    char* e = (char*)pBlocks->payLoad + pOneTableBlock->rowSize*(pBlocks->numOfRows-1);
+    tscSortRemoveDataBlockDupRows(pOneTableBlock);
+    char* ekey = (char*)pBlocks->data + pOneTableBlock->rowSize*(pBlocks->numOfRows-1);
     
-    tscTrace("%p meterId:%s, sid:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, pOneTableBlock->meterId, pBlocks->sid,
-             pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->payLoad), GET_INT64_VAL(e));
+    tscDebug("%p tableId:%s, sid:%d rows:%d sversion:%d skey:%" PRId64 ", ekey:%" PRId64, pSql, pOneTableBlock->tableId,
+        pBlocks->tid, pBlocks->numOfRows, pBlocks->sversion, GET_INT64_VAL(pBlocks->data), GET_INT64_VAL(ekey));
+
+    int32_t len = pBlocks->numOfRows * (pOneTableBlock->rowSize + expandSize) + sizeof(STColumn) * tscGetNumOfColumns(pOneTableBlock->pTableMeta);
 
-    pBlocks->sid = htonl(pBlocks->sid);
+    pBlocks->tid = htonl(pBlocks->tid);
     pBlocks->uid = htobe64(pBlocks->uid);
     pBlocks->sversion = htonl(pBlocks->sversion);
     pBlocks->numOfRows = htons(pBlocks->numOfRows);
+    pBlocks->schemaLen = 0;
+
+    // erase the empty space reserved for binary data
+    int32_t finalLen = trimDataBlock(dataBuf->pData + dataBuf->size, pOneTableBlock, pCmd->submitSchema);
+    assert(finalLen <= len);
+
+    dataBuf->size += (finalLen + sizeof(SSubmitBlk));
+    assert(dataBuf->size <= dataBuf->nAllocSize);
 
-    memcpy(dataBuf->pData + dataBuf->size, pOneTableBlock->pData, pOneTableBlock->size);
+    // the length does not include the SSubmitBlk structure
+    pBlocks->dataLen = htonl(finalLen);
 
-    dataBuf->size += pOneTableBlock->size;
-    dataBuf->numOfMeters += 1;
+    dataBuf->numOfTables += 1;
   }
 
   tscDestroyBlockArrayList(pTableDataBlockList);
@@ -759,30 +761,36 @@ int32_t tscMergeTableDataBlocks(SSqlObj* pSql, SDataBlockList* pTableDataBlockLi
   // free the table data blocks;
   pCmd->pDataBlocks = pVnodeDataBlockList;
 
-  tscFreeUnusedDataBlocks(pCmd->pDataBlocks);
-  taosCleanUpHashTable(pVnodeDataBlockHashList);
+//  tscFreeUnusedDataBlocks(pCmd->pDataBlocks);
+  taosHashCleanup(pVnodeDataBlockHashList);
 
   return TSDB_CODE_SUCCESS;
 }
 
+// TODO: all subqueries should be freed correctly before close this connection.
 void tscCloseTscObj(STscObj* pObj) {
-  pObj->signature = NULL;
-  SSqlObj* pSql = pObj->pSql;
-  globalCode = pSql->res.code;
+  assert(pObj != NULL);
 
+  pObj->signature = NULL;
   taosTmrStopA(&(pObj->pTimer));
-  tscFreeSqlObj(pSql);
+
+  void* p = pObj->pDnodeConn;
+  if (pObj->pDnodeConn != NULL) {
+    rpcClose(pObj->pDnodeConn);
+    pObj->pDnodeConn = NULL;
+  }
 
   pthread_mutex_destroy(&pObj->mutex);
-  tscTrace("%p DB connection is closed", pObj);
-  tfree(pObj);
+
+  tscDebug("%p DB connection is closed, dnodeConn:%p", pObj, p);
+  taosTFree(pObj);
 }
 
-bool tscIsInsertOrImportData(char* sqlstr) {
+bool tscIsInsertData(char* sqlstr) {
   int32_t index = 0;
 
   do {
-    SSQLToken t0 = tStrGetToken(sqlstr, &index, false, 0, NULL);
+    SStrToken t0 = tStrGetToken(sqlstr, &index, false, 0, NULL);
     if (t0.type != TK_LP) {
       return t0.type == TK_INSERT || t0.type == TK_IMPORT;
     }
@@ -795,197 +803,133 @@ int tscAllocPayload(SSqlCmd* pCmd, int size) {
   if (pCmd->payload == NULL) {
     assert(pCmd->allocSize == 0);
 
-    pCmd->payload = (char*)malloc(size);
-    if (pCmd->payload == NULL) return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    pCmd->payload = (char*)calloc(1, size);
+    if (pCmd->payload == NULL) return TSDB_CODE_TSC_OUT_OF_MEMORY;
     pCmd->allocSize = size;
   } else {
-    if (pCmd->allocSize < size) {
+    if (pCmd->allocSize < (uint32_t)size) {
       char* b = realloc(pCmd->payload, size);
-      if (b == NULL) return TSDB_CODE_CLI_OUT_OF_MEMORY;
+      if (b == NULL) return TSDB_CODE_TSC_OUT_OF_MEMORY;
       pCmd->payload = b;
       pCmd->allocSize = size;
     }
+    
+    memset(pCmd->payload, 0, pCmd->allocSize);
   }
 
-  memset(pCmd->payload, 0, pCmd->allocSize);
-  assert(pCmd->allocSize >= size);
-
+  assert(pCmd->allocSize >= (uint32_t)size);
   return TSDB_CODE_SUCCESS;
 }
 
-static void ensureSpace(SFieldInfo* pFieldInfo, int32_t size) {
-  if (size > pFieldInfo->numOfAlloc) {
-    int32_t oldSize = pFieldInfo->numOfAlloc;
-
-    int32_t newSize = (oldSize <= 0) ? 8 : (oldSize << 1);
-    while (newSize < size) {
-      newSize = (newSize << 1);
-    }
-
-    if (newSize > TSDB_MAX_COLUMNS) {
-      newSize = TSDB_MAX_COLUMNS;
-    }
+TAOS_FIELD tscCreateField(int8_t type, const char* name, int16_t bytes) {
+  TAOS_FIELD f = { .type = type, .bytes = bytes, };
+  tstrncpy(f.name, name, sizeof(f.name));
+  return f;
+}
 
-    int32_t inc = newSize - oldSize;
+SFieldSupInfo* tscFieldInfoAppend(SFieldInfo* pFieldInfo, TAOS_FIELD* pField) {
+  assert(pFieldInfo != NULL);
+  taosArrayPush(pFieldInfo->pFields, pField);
+  pFieldInfo->numOfOutput++;
+  
+  struct SFieldSupInfo info = {
+    .pSqlExpr = NULL,
+    .pArithExprInfo = NULL,
+    .visible = true,
+  };
+  
+  return taosArrayPush(pFieldInfo->pSupportInfo, &info);
+}
 
-    pFieldInfo->pFields = realloc(pFieldInfo->pFields, newSize * sizeof(TAOS_FIELD));
-    memset(&pFieldInfo->pFields[oldSize], 0, inc * sizeof(TAOS_FIELD));
+SFieldSupInfo* tscFieldInfoGetSupp(SFieldInfo* pFieldInfo, int32_t index) {
+  return TARRAY_GET_ELEM(pFieldInfo->pSupportInfo, index);
+}
 
-    pFieldInfo->pOffset = realloc(pFieldInfo->pOffset, newSize * sizeof(int16_t));
-    memset(&pFieldInfo->pOffset[oldSize], 0, inc * sizeof(int16_t));
+SFieldSupInfo* tscFieldInfoInsert(SFieldInfo* pFieldInfo, int32_t index, TAOS_FIELD* field) {
+  taosArrayInsert(pFieldInfo->pFields, index, field);
+  pFieldInfo->numOfOutput++;
+  
+  struct SFieldSupInfo info = {
+      .pSqlExpr = NULL,
+      .pArithExprInfo = NULL,
+      .visible = true,
+  };
+  
+  return taosArrayInsert(pFieldInfo->pSupportInfo, index, &info);
+}
 
-    pFieldInfo->pVisibleCols = realloc(pFieldInfo->pVisibleCols, newSize * sizeof(bool));
+void tscFieldInfoUpdateOffset(SQueryInfo* pQueryInfo) {
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->offset = 0;
+  
+  for (int32_t i = 1; i < numOfExprs; ++i) {
+    SSqlExpr* prev = taosArrayGetP(pQueryInfo->exprList, i - 1);
+    SSqlExpr* p = taosArrayGetP(pQueryInfo->exprList, i);
+  
+    p->offset = prev->offset + prev->resBytes;
+  }
+}
 
-    pFieldInfo->numOfAlloc = newSize;
+void tscFieldInfoUpdateOffsetForInterResult(SQueryInfo* pQueryInfo) {
+  if (tscSqlExprNumOfExprs(pQueryInfo) == 0) {
+    return;
+  }
+  
+  SSqlExpr* pExpr = taosArrayGetP(pQueryInfo->exprList, 0);
+  pExpr->offset = 0;
+  
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 1; i < numOfExprs; ++i) {
+    SSqlExpr* prev = taosArrayGetP(pQueryInfo->exprList, i - 1);
+    SSqlExpr* p = taosArrayGetP(pQueryInfo->exprList, i);
+    
+    p->offset = prev->offset + prev->resBytes;
   }
 }
 
-static void evic(SFieldInfo* pFieldInfo, int32_t index) {
-  if (index < pFieldInfo->numOfOutputCols) {
-    memmove(&pFieldInfo->pFields[index + 1], &pFieldInfo->pFields[index],
-            sizeof(pFieldInfo->pFields[0]) * (pFieldInfo->numOfOutputCols - index));
+void tscFieldInfoCopy(SFieldInfo* dst, const SFieldInfo* src) {
+  dst->numOfOutput = src->numOfOutput;
+
+  if (dst->pFields == NULL) {
+    dst->pFields = taosArrayClone(src->pFields);
+  } else {
+    taosArrayCopy(dst->pFields, src->pFields);
+  }
+  
+  if (dst->pSupportInfo == NULL) {
+    dst->pSupportInfo = taosArrayClone(src->pSupportInfo);
+  } else {
+    taosArrayCopy(dst->pSupportInfo, src->pSupportInfo);
   }
 }
 
-static void setValueImpl(TAOS_FIELD* pField, int8_t type, const char* name, int16_t bytes) {
-  pField->type = type;
-  strncpy(pField->name, name, TSDB_COL_NAME_LEN);
-  pField->bytes = bytes;
+TAOS_FIELD* tscFieldInfoGetField(SFieldInfo* pFieldInfo, int32_t index) {
+  assert(index < pFieldInfo->numOfOutput);
+  return TARRAY_GET_ELEM(pFieldInfo->pFields, index);
 }
 
-void tscFieldInfoSetValFromSchema(SFieldInfo* pFieldInfo, int32_t index, SSchema* pSchema) {
-  ensureSpace(pFieldInfo, pFieldInfo->numOfOutputCols + 1);
-  evic(pFieldInfo, index);
+int16_t tscFieldInfoGetOffset(SQueryInfo* pQueryInfo, int32_t index) {
+  SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pQueryInfo->fieldsInfo, index);
+  assert(pInfo != NULL && pInfo->pSqlExpr != NULL);
 
-  TAOS_FIELD* pField = &pFieldInfo->pFields[index];
-  setValueImpl(pField, pSchema->type, pSchema->name, pSchema->bytes);
-  pFieldInfo->numOfOutputCols++;
+  return pInfo->pSqlExpr->offset;
 }
 
-void tscFieldInfoSetValFromField(SFieldInfo* pFieldInfo, int32_t index, TAOS_FIELD* pField) {
-  ensureSpace(pFieldInfo, pFieldInfo->numOfOutputCols + 1);
-  evic(pFieldInfo, index);
+int32_t tscFieldInfoCompare(const SFieldInfo* pFieldInfo1, const SFieldInfo* pFieldInfo2) {
+  assert(pFieldInfo1 != NULL && pFieldInfo2 != NULL);
 
-  memcpy(&pFieldInfo->pFields[index], pField, sizeof(TAOS_FIELD));
-  pFieldInfo->pVisibleCols[index] = true;
+  if (pFieldInfo1->numOfOutput != pFieldInfo2->numOfOutput) {
+    return pFieldInfo1->numOfOutput - pFieldInfo2->numOfOutput;
+  }
 
-  pFieldInfo->numOfOutputCols++;
-}
+  for (int32_t i = 0; i < pFieldInfo1->numOfOutput; ++i) {
+    TAOS_FIELD* pField1 = tscFieldInfoGetField((SFieldInfo*) pFieldInfo1, i);
+    TAOS_FIELD* pField2 = tscFieldInfoGetField((SFieldInfo*) pFieldInfo2, i);
 
-void tscFieldInfoUpdateVisible(SFieldInfo* pFieldInfo, int32_t index, bool visible) {
-  if (index < 0 || index >= pFieldInfo->numOfOutputCols) {
-    return;
-  }
-
-  bool oldVisible = pFieldInfo->pVisibleCols[index];
-  pFieldInfo->pVisibleCols[index] = visible;
-
-  if (oldVisible != visible) {
-    if (!visible) {
-      pFieldInfo->numOfHiddenCols += 1;
-    } else {
-      if (pFieldInfo->numOfHiddenCols > 0) {
-        pFieldInfo->numOfHiddenCols -= 1;
-      }
-    }
-  }
-}
-
-void tscFieldInfoSetValue(SFieldInfo* pFieldInfo, int32_t index, int8_t type, const char* name, int16_t bytes) {
-  ensureSpace(pFieldInfo, pFieldInfo->numOfOutputCols + 1);
-  evic(pFieldInfo, index);
-
-  TAOS_FIELD* pField = &pFieldInfo->pFields[index];
-  setValueImpl(pField, type, name, bytes);
-
-  pFieldInfo->pVisibleCols[index] = true;
-  pFieldInfo->numOfOutputCols++;
-}
-
-void tscFieldInfoCalOffset(SQueryInfo* pQueryInfo) {
-  SFieldInfo* pFieldInfo = &pQueryInfo->fieldsInfo;
-  pFieldInfo->pOffset[0] = 0;
-
-  for (int32_t i = 1; i < pFieldInfo->numOfOutputCols; ++i) {
-    pFieldInfo->pOffset[i] = pFieldInfo->pOffset[i - 1] + pFieldInfo->pFields[i - 1].bytes;
-  }
-}
-
-void tscFieldInfoUpdateOffsetForInterResult(SQueryInfo* pQueryInfo) {
-  SFieldInfo* pFieldInfo = &pQueryInfo->fieldsInfo;
-  if (pFieldInfo->numOfOutputCols == 0) {
-    return;
-  }
-
-  pFieldInfo->pOffset[0] = 0;
-
-  /*
-   * the retTypeLen is used to store the intermediate result length
-   * for potential secondary merge exists
-   */
-  for (int32_t i = 1; i < pFieldInfo->numOfOutputCols; ++i) {
-    pFieldInfo->pOffset[i] = pFieldInfo->pOffset[i - 1] + tscSqlExprGet(pQueryInfo, i - 1)->resBytes;
-  }
-}
-
-void tscFieldInfoCopy(SFieldInfo* src, SFieldInfo* dst, const int32_t* indexList, int32_t size) {
-  if (src == NULL) {
-    return;
-  }
-
-  if (size <= 0) {
-    *dst = *src;
-    tscFieldInfoCopyAll(dst, src);
-  } else {  // only copy the required column
-    for (int32_t i = 0; i < size; ++i) {
-      assert(indexList[i] >= 0 && indexList[i] <= src->numOfOutputCols);
-      tscFieldInfoSetValFromField(dst, i, &src->pFields[indexList[i]]);
-    }
-  }
-}
-
-void tscFieldInfoCopyAll(SFieldInfo* dst, SFieldInfo* src) {
-  *dst = *src;
-
-  dst->pFields = malloc(sizeof(TAOS_FIELD) * dst->numOfAlloc);
-  dst->pOffset = malloc(sizeof(short) * dst->numOfAlloc);
-  dst->pVisibleCols = malloc(sizeof(bool) * dst->numOfAlloc);
-
-  memcpy(dst->pFields, src->pFields, sizeof(TAOS_FIELD) * dst->numOfOutputCols);
-  memcpy(dst->pOffset, src->pOffset, sizeof(short) * dst->numOfOutputCols);
-  memcpy(dst->pVisibleCols, src->pVisibleCols, sizeof(bool) * dst->numOfOutputCols);
-}
-
-TAOS_FIELD* tscFieldInfoGetField(SQueryInfo* pQueryInfo, int32_t index) {
-  if (index >= pQueryInfo->fieldsInfo.numOfOutputCols) {
-    return NULL;
-  }
-
-  return &pQueryInfo->fieldsInfo.pFields[index];
-}
-
-int32_t tscNumOfFields(SQueryInfo* pQueryInfo) { return pQueryInfo->fieldsInfo.numOfOutputCols; }
-
-int16_t tscFieldInfoGetOffset(SQueryInfo* pQueryInfo, int32_t index) {
-  if (index >= pQueryInfo->fieldsInfo.numOfOutputCols) {
-    return 0;
-  }
-
-  return pQueryInfo->fieldsInfo.pOffset[index];
-}
-
-int32_t tscFieldInfoCompare(SFieldInfo* pFieldInfo1, SFieldInfo* pFieldInfo2) {
-  assert(pFieldInfo1 != NULL && pFieldInfo2 != NULL);
-
-  if (pFieldInfo1->numOfOutputCols != pFieldInfo2->numOfOutputCols) {
-    return pFieldInfo1->numOfOutputCols - pFieldInfo2->numOfOutputCols;
-  }
-
-  for (int32_t i = 0; i < pFieldInfo1->numOfOutputCols; ++i) {
-    TAOS_FIELD* pField1 = &pFieldInfo1->pFields[i];
-    TAOS_FIELD* pField2 = &pFieldInfo2->pFields[i];
-
-    if (pField1->type != pField2->type || pField1->bytes != pField2->bytes ||
+    if (pField1->type != pField2->type ||
+        pField1->bytes != pField2->bytes ||
         strcasecmp(pField1->name, pField2->name) != 0) {
       return 1;
     }
@@ -994,128 +938,115 @@ int32_t tscFieldInfoCompare(SFieldInfo* pFieldInfo1, SFieldInfo* pFieldInfo2) {
   return 0;
 }
 
-int32_t tscGetResRowLength(SQueryInfo* pQueryInfo) {
-  SFieldInfo* pFieldInfo = &pQueryInfo->fieldsInfo;
-  if (pFieldInfo->numOfOutputCols <= 0) {
+int32_t tscGetResRowLength(SArray* pExprList) {
+  size_t num = taosArrayGetSize(pExprList);
+  if (num == 0) {
     return 0;
   }
-
-  return pFieldInfo->pOffset[pFieldInfo->numOfOutputCols - 1] +
-         pFieldInfo->pFields[pFieldInfo->numOfOutputCols - 1].bytes;
+  
+  int32_t size = 0;
+  for(int32_t i = 0; i < num; ++i) {
+    SSqlExpr* pExpr = taosArrayGetP(pExprList, i);
+    size += pExpr->resBytes;
+  }
+  
+  return size;
 }
 
-void tscClearFieldInfo(SFieldInfo* pFieldInfo) {
+void tscFieldInfoClear(SFieldInfo* pFieldInfo) {
   if (pFieldInfo == NULL) {
     return;
   }
 
-  tfree(pFieldInfo->pOffset);
-  tfree(pFieldInfo->pFields);
-  tfree(pFieldInfo->pVisibleCols);
-
-  memset(pFieldInfo, 0, sizeof(SFieldInfo));
-}
-
-static void _exprCheckSpace(SSqlExprInfo* pExprInfo, int32_t size) {
-  if (size > pExprInfo->numOfAlloc) {
-    uint32_t oldSize = pExprInfo->numOfAlloc;
-
-    uint32_t newSize = (oldSize <= 0) ? 8 : (oldSize << 1U);
-    while (newSize < size) {
-      newSize = (newSize << 1U);
-    }
-
-    if (newSize > TSDB_MAX_COLUMNS) {
-      newSize = TSDB_MAX_COLUMNS;
+  taosArrayDestroy(pFieldInfo->pFields);
+  
+  for(int32_t i = 0; i < pFieldInfo->numOfOutput; ++i) {
+    SFieldSupInfo* pInfo = taosArrayGet(pFieldInfo->pSupportInfo, i);
+    
+    if (pInfo->pArithExprInfo != NULL) {
+      tExprTreeDestroy(&pInfo->pArithExprInfo->pExpr, NULL);
+      taosTFree(pInfo->pArithExprInfo);
     }
-
-    int32_t inc = newSize - oldSize;
-
-    pExprInfo->pExprs = realloc(pExprInfo->pExprs, newSize * sizeof(SSqlExpr));
-    memset(&pExprInfo->pExprs[oldSize], 0, inc * sizeof(SSqlExpr));
-
-    pExprInfo->numOfAlloc = newSize;
   }
+  
+  taosArrayDestroy(pFieldInfo->pSupportInfo);
+  memset(pFieldInfo, 0, sizeof(SFieldInfo));
 }
 
-static void _exprEvic(SSqlExprInfo* pExprInfo, int32_t index) {
-  if (index < pExprInfo->numOfExprs) {
-    memmove(&pExprInfo->pExprs[index + 1], &pExprInfo->pExprs[index],
-            sizeof(pExprInfo->pExprs[0]) * (pExprInfo->numOfExprs - index));
+static SSqlExpr* doBuildSqlExpr(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+    int16_t size, int16_t interSize, int32_t colType) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, pColIndex->tableIndex);
+  
+  SSqlExpr* pExpr = calloc(1, sizeof(SSqlExpr));
+  if (pExpr == NULL) {
+    return NULL;
   }
-}
-
-SSqlExpr* tscSqlExprInsertEmpty(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId) {
-  SSqlExprInfo* pExprInfo = &pQueryInfo->exprsInfo;
-
-  _exprCheckSpace(pExprInfo, pExprInfo->numOfExprs + 1);
-  _exprEvic(pExprInfo, index);
-
-  SSqlExpr* pExpr = &pExprInfo->pExprs[index];
-  pExpr->functionId = functionId;
-
-  pExprInfo->numOfExprs++;
-  return pExpr;
-}
-
-SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, SColumnIndex* pColIndex,
-                           int16_t type, int16_t size, int16_t interSize) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, pColIndex->tableIndex);
-
-  SSqlExprInfo* pExprInfo = &pQueryInfo->exprsInfo;
-
-  _exprCheckSpace(pExprInfo, pExprInfo->numOfExprs + 1);
-  _exprEvic(pExprInfo, index);
-
-  SSqlExpr* pExpr = &pExprInfo->pExprs[index];
 
   pExpr->functionId = functionId;
-  int16_t numOfCols = pMeterMetaInfo->pMeterMeta->numOfColumns;
 
-  // set the correct column index
+  // set the correct columnIndex index
   if (pColIndex->columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
     pExpr->colInfo.colId = TSDB_TBNAME_COLUMN_INDEX;
+  } else if (pColIndex->columnIndex <= TSDB_UD_COLUMN_INDEX) {
+    pExpr->colInfo.colId = pColIndex->columnIndex;
   } else {
-    SSchema* pSchema = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, pColIndex->columnIndex);
-    pExpr->colInfo.colId = pSchema->colId;
+    if (TSDB_COL_IS_TAG(colType)) {
+      SSchema* pSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+      pExpr->colInfo.colId = pSchema[pColIndex->columnIndex].colId;
+      tstrncpy(pExpr->colInfo.name, pSchema[pColIndex->columnIndex].name, sizeof(pExpr->colInfo.name));
+    } else if (pTableMetaInfo->pTableMeta != NULL) {
+      // in handling select database/version/server_status(), the pTableMeta is NULL
+      SSchema* pSchema = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pColIndex->columnIndex);
+      pExpr->colInfo.colId = pSchema->colId;
+      tstrncpy(pExpr->colInfo.name, pSchema->name, sizeof(pExpr->colInfo.name));
+    }
   }
+  
+  pExpr->colInfo.flag     = colType;
+  pExpr->colInfo.colIndex = pColIndex->columnIndex;
 
-  // tag columns require the column index revised.
-  if (pColIndex->columnIndex >= numOfCols) {
-    pColIndex->columnIndex -= numOfCols;
-    pExpr->colInfo.flag = TSDB_COL_TAG;
-  } else {
-    if (pColIndex->columnIndex != TSDB_TBNAME_COLUMN_INDEX) {
-      pExpr->colInfo.flag = TSDB_COL_NORMAL;
-    } else {
-      pExpr->colInfo.flag = TSDB_COL_TAG;
-    }
+  pExpr->resType       = type;
+  pExpr->resBytes      = size;
+  pExpr->interBytes    = interSize;
+  
+  if (pTableMetaInfo->pTableMeta) {
+    pExpr->uid = pTableMetaInfo->pTableMeta->id.uid;
   }
+  
+  return pExpr;
+}
 
-  pExpr->colInfo.colIdx = pColIndex->columnIndex;
-  pExpr->resType = type;
-  pExpr->resBytes = size;
-  pExpr->interResBytes = interSize;
-  pExpr->uid = pMeterMetaInfo->pMeterMeta->uid;
+SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+                           int16_t size, int16_t interSize, bool isTagCol) {
+  int32_t num = (int32_t)taosArrayGetSize(pQueryInfo->exprList);
+  if (index == num) {
+    return tscSqlExprAppend(pQueryInfo, functionId, pColIndex, type, size, interSize, isTagCol);
+  }
+  
+  SSqlExpr* pExpr = doBuildSqlExpr(pQueryInfo, functionId, pColIndex, type, size, interSize, isTagCol);
+  taosArrayInsert(pQueryInfo->exprList, index, &pExpr);
+  return pExpr;
+}
 
-  pExprInfo->numOfExprs++;
+SSqlExpr* tscSqlExprAppend(SQueryInfo* pQueryInfo, int16_t functionId, SColumnIndex* pColIndex, int16_t type,
+    int16_t size, int16_t interSize, bool isTagCol) {
+  SSqlExpr* pExpr = doBuildSqlExpr(pQueryInfo, functionId, pColIndex, type, size, interSize, isTagCol);
+  taosArrayPush(pQueryInfo->exprList, &pExpr);
   return pExpr;
 }
 
 SSqlExpr* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functionId, int16_t srcColumnIndex,
                            int16_t type, int16_t size) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  SSqlExprInfo*   pExprInfo = &pQueryInfo->exprsInfo;
-  if (index > pExprInfo->numOfExprs) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, index);
+  if (pExpr == NULL) {
     return NULL;
   }
 
-  SSqlExpr* pExpr = &pExprInfo->pExprs[index];
-
   pExpr->functionId = functionId;
 
-  pExpr->colInfo.colIdx = srcColumnIndex;
-  pExpr->colInfo.colId = tsGetColumnSchema(pMeterMetaInfo->pMeterMeta, srcColumnIndex)->colId;
+  pExpr->colInfo.colIndex = srcColumnIndex;
+  pExpr->colInfo.colId = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, srcColumnIndex)->colId;
 
   pExpr->resType = type;
   pExpr->resBytes = size;
@@ -1123,6 +1054,10 @@ SSqlExpr* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functi
   return pExpr;
 }
 
+size_t tscSqlExprNumOfExprs(SQueryInfo* pQueryInfo) {
+  return taosArrayGetSize(pQueryInfo->exprList);
+}
+
 void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes, int16_t tableIndex) {
   if (pExpr == NULL || argument == NULL || bytes == 0) {
     return;
@@ -1137,14 +1072,10 @@ void addExprParams(SSqlExpr* pExpr, char* argument, int32_t type, int32_t bytes,
 }
 
 SSqlExpr* tscSqlExprGet(SQueryInfo* pQueryInfo, int32_t index) {
-  if (pQueryInfo->exprsInfo.numOfExprs <= index) {
-    return NULL;
-  }
-
-  return &pQueryInfo->exprsInfo.pExprs[index];
+  return taosArrayGetP(pQueryInfo->exprList, index);
 }
 
-void* tscSqlExprDestroy(SSqlExpr* pExpr) {
+void* sqlExprDestroy(SSqlExpr* pExpr) {
   if (pExpr == NULL) {
     return NULL;
   }
@@ -1153,228 +1084,157 @@ void* tscSqlExprDestroy(SSqlExpr* pExpr) {
     tVariantDestroy(&pExpr->param[i]);
   }
   
+  taosTFree(pExpr);
+  
   return NULL;
 }
 
 /*
  * NOTE: Does not release SSqlExprInfo here.
  */
-void tscSqlExprInfoDestroy(SSqlExprInfo* pExprInfo) {
-  if (pExprInfo->numOfAlloc == 0) {
-    return;
-  }
+void tscSqlExprInfoDestroy(SArray* pExprInfo) {
+  size_t size = taosArrayGetSize(pExprInfo);
   
-  for(int32_t i = 0; i < pExprInfo->numOfAlloc; ++i) {
-    tscSqlExprDestroy(&pExprInfo->pExprs[i]);
+  for(int32_t i = 0; i < size; ++i) {
+    SSqlExpr* pExpr = taosArrayGetP(pExprInfo, i);
+    sqlExprDestroy(pExpr);
   }
   
-  tfree(pExprInfo->pExprs);
-  
-  pExprInfo->numOfAlloc = 0;
-  pExprInfo->numOfExprs = 0;
-}
-
-
-void tscSqlExprCopy(SSqlExprInfo* dst, const SSqlExprInfo* src, uint64_t tableuid) {
-  if (src == NULL) {
-    return;
-  }
-
-  *dst = *src;
-
-  dst->pExprs = calloc(dst->numOfAlloc, sizeof(SSqlExpr));
-  int16_t num = 0;
-  for (int32_t i = 0; i < src->numOfExprs; ++i) {
-    if (src->pExprs[i].uid == tableuid) {
-      dst->pExprs[num++] = src->pExprs[i];
-    }
-  }
-
-  dst->numOfExprs = num;
-  for (int32_t i = 0; i < dst->numOfExprs; ++i) {
-    for (int32_t j = 0; j < src->pExprs[i].numOfParams; ++j) {
-      tVariantAssign(&dst->pExprs[i].param[j], &src->pExprs[i].param[j]);
-    }
-  }
-}
-
-static void clearVal(SColumnBase* pBase) {
-  memset(pBase, 0, sizeof(SColumnBase));
-
-  pBase->colIndex.tableIndex = -2;
-  pBase->colIndex.columnIndex = -2;
+  taosArrayDestroy(pExprInfo);
 }
 
-static void _cf_ensureSpace(SColumnBaseInfo* pcolList, int32_t size) {
-  if (pcolList->numOfAlloc < size) {
-    int32_t oldSize = pcolList->numOfAlloc;
-
-    int32_t newSize = (oldSize <= 0) ? 8 : (oldSize << 1);
-    while (newSize < size) {
-      newSize = (newSize << 1);
-    }
+int32_t tscSqlExprCopy(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy) {
+  assert(src != NULL && dst != NULL);
+  
+  size_t size = taosArrayGetSize(src);
+  for (int32_t i = 0; i < size; ++i) {
+    SSqlExpr* pExpr = taosArrayGetP(src, i);
+    
+    if (pExpr->uid == uid) {
+      
+      if (deepcopy) {
+        SSqlExpr* p1 = calloc(1, sizeof(SSqlExpr));
+        if (p1 == NULL) {
+          return -1;
+        }
 
-    if (newSize > TSDB_MAX_COLUMNS) {
-      newSize = TSDB_MAX_COLUMNS;
+        *p1 = *pExpr;
+        for (int32_t j = 0; j < pExpr->numOfParams; ++j) {
+          tVariantAssign(&p1->param[j], &pExpr->param[j]);
+        }
+        
+        taosArrayPush(dst, &p1);
+      } else {
+        taosArrayPush(dst, &pExpr);
+      }
     }
-
-    int32_t inc = newSize - oldSize;
-
-    pcolList->pColList = realloc(pcolList->pColList, newSize * sizeof(SColumnBase));
-    memset(&pcolList->pColList[oldSize], 0, inc * sizeof(SColumnBase));
-
-    pcolList->numOfAlloc = newSize;
-  }
-}
-
-static void _cf_evic(SColumnBaseInfo* pcolList, int32_t index) {
-  if (index < pcolList->numOfCols) {
-    memmove(&pcolList->pColList[index + 1], &pcolList->pColList[index],
-            sizeof(SColumnBase) * (pcolList->numOfCols - index));
-
-    clearVal(&pcolList->pColList[index]);
-  }
-}
-
-SColumnBase* tscColumnBaseInfoGet(SColumnBaseInfo* pColumnBaseInfo, int32_t index) {
-  if (pColumnBaseInfo == NULL || pColumnBaseInfo->numOfCols < index) {
-    return NULL;
   }
 
-  return &pColumnBaseInfo->pColList[index];
-}
-
-void tscColumnBaseInfoUpdateTableIndex(SColumnBaseInfo* pColList, int16_t tableIndex) {
-  for (int32_t i = 0; i < pColList->numOfCols; ++i) {
-    pColList->pColList[i].colIndex.tableIndex = tableIndex;
-  }
+  return 0;
 }
 
-// todo refactor
-SColumnBase* tscColumnBaseInfoInsert(SQueryInfo* pQueryInfo, SColumnIndex* pColIndex) {
-  SColumnBaseInfo* pcolList = &pQueryInfo->colList;
-
-  // ignore the tbname column to be inserted into source list
+SColumn* tscColumnListInsert(SArray* pColumnList, SColumnIndex* pColIndex) {
+  // ignore the tbname columnIndex to be inserted into source list
   if (pColIndex->columnIndex < 0) {
     return NULL;
   }
-
+  
+  size_t numOfCols = taosArrayGetSize(pColumnList);
   int16_t col = pColIndex->columnIndex;
 
   int32_t i = 0;
-  while (i < pcolList->numOfCols) {
-    if (pcolList->pColList[i].colIndex.columnIndex < col) {
+  while (i < numOfCols) {
+    SColumn* pCol = taosArrayGetP(pColumnList, i);
+    if (pCol->colIndex.columnIndex < col) {
       i++;
-    } else if (pcolList->pColList[i].colIndex.tableIndex < pColIndex->tableIndex) {
+    } else if (pCol->colIndex.tableIndex < pColIndex->tableIndex) {
       i++;
     } else {
       break;
     }
   }
 
-  SColumnIndex* pIndex = &pcolList->pColList[i].colIndex;
-  if ((i < pcolList->numOfCols && (pIndex->columnIndex > col || pIndex->tableIndex != pColIndex->tableIndex)) ||
-      (i >= pcolList->numOfCols)) {
-    _cf_ensureSpace(pcolList, pcolList->numOfCols + 1);
-    _cf_evic(pcolList, i);
-
-    pcolList->pColList[i].colIndex = *pColIndex;
-    pcolList->numOfCols++;
-  }
-
-  return &pcolList->pColList[i];
-}
+  if (i >= numOfCols || numOfCols == 0) {
+    SColumn* b = calloc(1, sizeof(SColumn));
+    if (b == NULL) {
+      return NULL;
+    }
 
-void tscColumnFilterInfoCopy(SColumnFilterInfo* dst, const SColumnFilterInfo* src) {
-  assert(src != NULL && dst != NULL);
+    b->colIndex = *pColIndex;
+    taosArrayInsert(pColumnList, i, &b);
+  } else {
+    SColumn* pCol = taosArrayGetP(pColumnList, i);
+  
+    if (i < numOfCols && (pCol->colIndex.columnIndex > col || pCol->colIndex.tableIndex != pColIndex->tableIndex)) {
+      SColumn* b = calloc(1, sizeof(SColumn));
+      if (b == NULL) {
+        return NULL;
+      }
 
-  assert(src->filterOnBinary == 0 || src->filterOnBinary == 1);
-  if (src->lowerRelOptr == TSDB_RELATION_INVALID && src->upperRelOptr == TSDB_RELATION_INVALID) {
-    assert(0);
+      b->colIndex = *pColIndex;
+      taosArrayInsert(pColumnList, i, &b);
+    }
   }
 
-  *dst = *src;
-  if (dst->filterOnBinary) {
-    size_t len = (size_t)dst->len + 1;
-    char*  pTmp = calloc(1, len);
-    dst->pz = (int64_t)pTmp;
-    memcpy((char*)dst->pz, (char*)src->pz, (size_t)len);
-  }
+  return taosArrayGetP(pColumnList, i);
 }
 
-void tscColumnBaseCopy(SColumnBase* dst, const SColumnBase* src) {
-  assert(src != NULL && dst != NULL);
-
-  *dst = *src;
-
-  if (src->numOfFilters > 0) {
-    dst->filterInfo = calloc(1, src->numOfFilters * sizeof(SColumnFilterInfo));
-
-    for (int32_t j = 0; j < src->numOfFilters; ++j) {
-      tscColumnFilterInfoCopy(&dst->filterInfo[j], &src->filterInfo[j]);
+static void destroyFilterInfo(SColumnFilterInfo* pFilterInfo, int32_t numOfFilters) {
+  for(int32_t i = 0; i < numOfFilters; ++i) {
+    if (pFilterInfo[i].filterstr) {
+      taosTFree(pFilterInfo[i].pz);
     }
-  } else {
-    assert(src->filterInfo == NULL);
   }
+  
+  taosTFree(pFilterInfo);
 }
 
-void tscColumnBaseInfoCopy(SColumnBaseInfo* dst, const SColumnBaseInfo* src, int16_t tableIndex) {
-  if (src == NULL) {
-    return;
+SColumn* tscColumnClone(const SColumn* src) {
+  assert(src != NULL);
+  
+  SColumn* dst = calloc(1, sizeof(SColumn));
+  if (dst == NULL) {
+    return NULL;
   }
 
-  *dst = *src;
-  dst->pColList = calloc(1, sizeof(SColumnBase) * dst->numOfAlloc);
-
-  int16_t num = 0;
-  for (int32_t i = 0; i < src->numOfCols; ++i) {
-    if (src->pColList[i].colIndex.tableIndex == tableIndex || tableIndex < 0) {
-      dst->pColList[num] = src->pColList[i];
+  dst->colIndex     = src->colIndex;
+  dst->numOfFilters = src->numOfFilters;
+  dst->filterInfo   = tscFilterInfoClone(src->filterInfo, src->numOfFilters);
+  
+  return dst;
+}
 
-      if (dst->pColList[num].numOfFilters > 0) {
-        dst->pColList[num].filterInfo = calloc(1, dst->pColList[num].numOfFilters * sizeof(SColumnFilterInfo));
+static void tscColumnDestroy(SColumn* pCol) {
+  destroyFilterInfo(pCol->filterInfo, pCol->numOfFilters);
+  free(pCol);
+}
 
-        for (int32_t j = 0; j < dst->pColList[num].numOfFilters; ++j) {
-          tscColumnFilterInfoCopy(&dst->pColList[num].filterInfo[j], &src->pColList[i].filterInfo[j]);
-        }
-      }
+void tscColumnListCopy(SArray* dst, const SArray* src, int16_t tableIndex) {
+  assert(src != NULL && dst != NULL);
+  
+  size_t num = taosArrayGetSize(src);
+  for (int32_t i = 0; i < num; ++i) {
+    SColumn* pCol = taosArrayGetP(src, i);
 
-      num += 1;
+    if (pCol->colIndex.tableIndex == tableIndex || tableIndex < 0) {
+      SColumn* p = tscColumnClone(pCol);
+      taosArrayPush(dst, &p);
     }
   }
-
-  dst->numOfCols = num;
 }
 
-void tscColumnBaseInfoDestroy(SColumnBaseInfo* pColumnBaseInfo) {
-  if (pColumnBaseInfo == NULL) {
+void tscColumnListDestroy(SArray* pColumnList) {
+  if (pColumnList == NULL) {
     return;
   }
 
-  assert(pColumnBaseInfo->numOfCols <= TSDB_MAX_COLUMNS);
-
-  for (int32_t i = 0; i < pColumnBaseInfo->numOfCols; ++i) {
-    SColumnBase* pColBase = &(pColumnBaseInfo->pColList[i]);
-
-    if (pColBase->numOfFilters > 0) {
-      for (int32_t j = 0; j < pColBase->numOfFilters; ++j) {
-        assert(pColBase->filterInfo[j].filterOnBinary == 0 || pColBase->filterInfo[j].filterOnBinary == 1);
-
-        if (pColBase->filterInfo[j].filterOnBinary) {
-          free((char*)pColBase->filterInfo[j].pz);
-          pColBase->filterInfo[j].pz = 0;
-        }
-      }
-    }
-
-    tfree(pColBase->filterInfo);
+  size_t num = taosArrayGetSize(pColumnList);
+  for (int32_t i = 0; i < num; ++i) {
+    SColumn* pCol = taosArrayGetP(pColumnList, i);
+    tscColumnDestroy(pCol);
   }
 
-  tfree(pColumnBaseInfo->pColList);
-}
-
-void tscColumnBaseInfoReserve(SColumnBaseInfo* pColumnBaseInfo, int32_t size) {
-  _cf_ensureSpace(pColumnBaseInfo, size);
+  taosArrayDestroy(pColumnList);
 }
 
 /*
@@ -1391,10 +1251,9 @@ void tscColumnBaseInfoReserve(SColumnBaseInfo* pColumnBaseInfo, int32_t size) {
  * 'first_part.second_part'
  *
  */
-static int32_t validateQuoteToken(SSQLToken* pToken) {
-  pToken->n = strdequote(pToken->z);
-  strtrim(pToken->z);
-  pToken->n = (uint32_t)strlen(pToken->z);
+static int32_t validateQuoteToken(SStrToken* pToken) {
+  strdequote(pToken->z);
+  pToken->n = (uint32_t)strtrim(pToken->z);
 
   int32_t k = tSQLGetToken(pToken->z, &pToken->type);
 
@@ -1403,22 +1262,66 @@ static int32_t validateQuoteToken(SSQLToken* pToken) {
   }
 
   if (k != pToken->n || pToken->type != TK_ID) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscValidateName(SSQLToken* pToken) {
+void tscDequoteAndTrimToken(SStrToken* pToken) {
+  assert(pToken->type == TK_STRING);
+
+  uint32_t first = 0, last = pToken->n;
+
+  // trim leading spaces
+  while (first < last) {
+    char c = pToken->z[first];
+    if (c != ' ' && c != '\t') {
+      break;
+    }
+    first++;
+  }
+
+  // trim ending spaces
+  while (first < last) {
+    char c = pToken->z[last - 1];
+    if (c != ' ' && c != '\t') {
+      break;
+    }
+    last--;
+  }
+
+  // there are still at least two characters
+  if (first < last - 1) {
+    char c = pToken->z[first];
+    // dequote
+    if ((c == '\'' || c == '"') && c == pToken->z[last - 1]) {
+      first++;
+      last--;
+    }
+  }
+
+  // left shift the string and pad spaces
+  for (uint32_t i = 0; i + first < last; i++) {
+    pToken->z[i] = pToken->z[first + i];
+  }
+  for (uint32_t i = last - first; i < pToken->n; i++) {
+    pToken->z[i] = ' ';
+  }
+
+  // adjust token length
+  pToken->n = last - first;
+}
+
+int32_t tscValidateName(SStrToken* pToken) {
   if (pToken->type != TK_STRING && pToken->type != TK_ID) {
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   char* sep = strnchr(pToken->z, TS_PATH_DELIMITER[0], pToken->n, true);
   if (sep == NULL) {  // single part
     if (pToken->type == TK_STRING) {
-      pToken->n = strdequote(pToken->z);
-      strtrim(pToken->z);
-      pToken->n = (uint32_t)strlen(pToken->z);
+      strdequote(pToken->z);
+      pToken->n = (uint32_t)strtrim(pToken->z);
 
       int len = tSQLGetToken(pToken->z, &pToken->type);
 
@@ -1428,14 +1331,14 @@ int32_t tscValidateName(SSQLToken* pToken) {
       } else {
         sep = strnchr(pToken->z, TS_PATH_DELIMITER[0], pToken->n, true);
         if (sep == NULL) {
-          return TSDB_CODE_INVALID_SQL;
+          return TSDB_CODE_TSC_INVALID_SQL;
         }
 
         return tscValidateName(pToken);
       }
     } else {
       if (isNumber(pToken)) {
-        return TSDB_CODE_INVALID_SQL;
+        return TSDB_CODE_TSC_INVALID_SQL;
       }
     }
   } else {  // two part
@@ -1443,34 +1346,33 @@ int32_t tscValidateName(SSQLToken* pToken) {
     char*   pStr = pToken->z;
 
     if (pToken->type == TK_SPACE) {
-      strtrim(pToken->z);
-      pToken->n = (uint32_t)strlen(pToken->z);
+      pToken->n = (uint32_t)strtrim(pToken->z);
     }
 
     pToken->n = tSQLGetToken(pToken->z, &pToken->type);
     if (pToken->z[pToken->n] != TS_PATH_DELIMITER[0]) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     if (pToken->type != TK_STRING && pToken->type != TK_ID) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     if (pToken->type == TK_STRING && validateQuoteToken(pToken) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     int32_t firstPartLen = pToken->n;
 
     pToken->z = sep + 1;
-    pToken->n = oldLen - (sep - pStr) - 1;
+    pToken->n = (uint32_t)(oldLen - (sep - pStr) - 1);
     int32_t len = tSQLGetToken(pToken->z, &pToken->type);
     if (len != pToken->n || (pToken->type != TK_STRING && pToken->type != TK_ID)) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     if (pToken->type == TK_STRING && validateQuoteToken(pToken) != TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_INVALID_SQL;
+      return TSDB_CODE_TSC_INVALID_SQL;
     }
 
     // re-build the whole name string
@@ -1497,17 +1399,19 @@ void tscIncStreamExecutionCount(void* pStream) {
   ps->num += 1;
 }
 
-bool tscValidateColumnId(SMeterMetaInfo* pMeterMetaInfo, int32_t colId) {
-  if (pMeterMetaInfo->pMeterMeta == NULL) {
+bool tscValidateColumnId(STableMetaInfo* pTableMetaInfo, int32_t colId, int32_t numOfParams) {
+  if (pTableMetaInfo->pTableMeta == NULL) {
     return false;
   }
 
-  if (colId == -1 && UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
+  if (colId == TSDB_TBNAME_COLUMN_INDEX || (colId <= TSDB_UD_COLUMN_INDEX && numOfParams == 2)) {
     return true;
   }
 
-  SSchema* pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
-  int32_t  numOfTotal = pMeterMetaInfo->pMeterMeta->numOfTags + pMeterMetaInfo->pMeterMeta->numOfColumns;
+  SSchema* pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
+  STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+  
+  int32_t  numOfTotal = tinfo.numOfTags + tinfo.numOfColumns;
 
   for (int32_t i = 0; i < numOfTotal; ++i) {
     if (pSchema[i].colId == colId) {
@@ -1518,53 +1422,83 @@ bool tscValidateColumnId(SMeterMetaInfo* pMeterMetaInfo, int32_t colId) {
   return false;
 }
 
-void tscTagCondCopy(STagCond* dest, const STagCond* src) {
+int32_t tscTagCondCopy(STagCond* dest, const STagCond* src) {
   memset(dest, 0, sizeof(STagCond));
 
   if (src->tbnameCond.cond != NULL) {
     dest->tbnameCond.cond = strdup(src->tbnameCond.cond);
+    if (dest->tbnameCond.cond == NULL) {
+      return -1;
+    }
   }
 
   dest->tbnameCond.uid = src->tbnameCond.uid;
 
   memcpy(&dest->joinInfo, &src->joinInfo, sizeof(SJoinInfo));
+  dest->relType = src->relType;
+  
+  if (src->pCond == NULL) {
+    return 0;
+  }
+  
+  size_t s = taosArrayGetSize(src->pCond);
+  dest->pCond = taosArrayInit(s, sizeof(SCond));
+  
+  for (int32_t i = 0; i < s; ++i) {
+    SCond* pCond = taosArrayGet(src->pCond, i);
+    
+    SCond c = {0};
+    c.len = pCond->len;
+    c.uid = pCond->uid;
+    
+    if (pCond->len > 0) {
+      assert(pCond->cond != NULL);
+      c.cond = malloc(c.len);
+      if (c.cond == NULL) {
+        return -1;
+      }
 
-  for (int32_t i = 0; i < src->numOfTagCond; ++i) {
-    if (src->cond[i].cond != NULL) {
-      dest->cond[i].cond = strdup(src->cond[i].cond);
+      memcpy(c.cond, pCond->cond, c.len);
     }
-
-    dest->cond[i].uid = src->cond[i].uid;
+    
+    taosArrayPush(dest->pCond, &c);
   }
 
-  dest->relType = src->relType;
-  dest->numOfTagCond = src->numOfTagCond;
+  return 0;
 }
 
-void tscTagCondRelease(STagCond* pCond) {
-  free(pCond->tbnameCond.cond);
-  for (int32_t i = 0; i < pCond->numOfTagCond; ++i) {
-    free(pCond->cond[i].cond);
+void tscTagCondRelease(STagCond* pTagCond) {
+  free(pTagCond->tbnameCond.cond);
+  
+  if (pTagCond->pCond != NULL) {
+    size_t s = taosArrayGetSize(pTagCond->pCond);
+    for (int32_t i = 0; i < s; ++i) {
+      SCond* p = taosArrayGet(pTagCond->pCond, i);
+      taosTFree(p->cond);
+    }
+  
+    taosArrayDestroy(pTagCond->pCond);
   }
 
-  memset(pCond, 0, sizeof(STagCond));
+  memset(pTagCond, 0, sizeof(STagCond));
 }
 
 void tscGetSrcColumnInfo(SSrcColumnInfo* pColInfo, SQueryInfo* pQueryInfo) {
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  SSchema*        pSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
-
-  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  SSchema*        pSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
+  
+  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  for (int32_t i = 0; i < numOfExprs; ++i) {
     SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
     pColInfo[i].functionId = pExpr->functionId;
 
     if (TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {
-      SSchema* pTagSchema = tsGetTagSchema(pMeterMetaInfo->pMeterMeta);
-      int16_t  actualTagIndex = pMeterMetaInfo->tagColumnIndex[pExpr->colInfo.colIdx];
-
-      pColInfo[i].type = (actualTagIndex != -1) ? pTagSchema[actualTagIndex].type : TSDB_DATA_TYPE_BINARY;
+      SSchema* pTagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
+      
+      int16_t index = pExpr->colInfo.colIndex;
+      pColInfo[i].type = (index != -1) ? pTagSchema[index].type : TSDB_DATA_TYPE_BINARY;
     } else {
-      pColInfo[i].type = pSchema[pExpr->colInfo.colIdx].type;
+      pColInfo[i].type = pSchema[pExpr->colInfo.colIndex].type;
     }
   }
 }
@@ -1582,85 +1516,43 @@ void tscSetFreeHeatBeat(STscObj* pObj) {
   pQueryInfo->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
 }
 
-bool tscShouldFreeHeatBeat(SSqlObj* pHb) {
+bool tscShouldFreeHeartBeat(SSqlObj* pHb) {
   assert(pHb == pHb->signature);
 
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pHb->cmd, 0);
   return pQueryInfo->type == TSDB_QUERY_TYPE_FREE_RESOURCE;
 }
 
-void tscCleanSqlCmd(SSqlCmd* pCmd) {
-  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
-  tscFreeSubqueryInfo(pCmd);
-
-  uint32_t allocSize = pCmd->allocSize;
-  char*    allocPtr = pCmd->payload;
-
-  memset(pCmd, 0, sizeof(SSqlCmd));
-
-  // restore values
-  pCmd->allocSize = allocSize;
-  pCmd->payload = allocPtr;
-}
-
 /*
- * the following three kinds of SqlObj should not be freed
+ * the following four kinds of SqlObj should not be freed
  * 1. SqlObj for stream computing
  * 2. main SqlObj
  * 3. heartbeat SqlObj
+ * 4. SqlObj for subscription
  *
  * If res code is error and SqlObj does not belong to above types, it should be
  * automatically freed for async query, ignoring that connection should be kept.
  *
  * If connection need to be recycled, the SqlObj also should be freed.
  */
-bool tscShouldFreeAsyncSqlObj(SSqlObj* pSql) {
-  if (pSql == NULL || pSql->signature != pSql || pSql->fp == NULL) {
+bool tscShouldBeFreed(SSqlObj* pSql) {
+  if (pSql == NULL || pSql->signature != pSql) {
     return false;
   }
-
+  
   STscObj* pTscObj = pSql->pTscObj;
-  if (pSql->pStream != NULL || pTscObj->pHb == pSql) {
+  if (pSql->pStream != NULL || pTscObj->pHb == pSql || pSql->pSubscription != NULL) {
     return false;
   }
 
+  // only the table meta and super table vgroup query will free resource automatically
   int32_t command = pSql->cmd.command;
-  if (pTscObj->pSql == pSql) {
-    /*
-     * in case of taos_connect_a query, the object should all be released, even it is the
-     * master sql object. Otherwise, the master sql should not be released
-     */
-    if (command == TSDB_SQL_CONNECT && pSql->res.code != TSDB_CODE_SUCCESS) {
-      return true;
-    }
-
-    return false;
+  if (command == TSDB_SQL_META || command == TSDB_SQL_STABLEVGROUP) {
+    return true;
   }
 
-  if (command == TSDB_SQL_INSERT) {
-    SSqlCmd* pCmd = &pSql->cmd;
-
-    /*
-     * in case of multi-vnode insertion, the object should not be released until all
-     * data blocks have been submit to vnode.
-     */
-    SDataBlockList* pDataBlocks = pCmd->pDataBlocks;
-    SQueryInfo*     pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-
-    SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-    assert(pQueryInfo->numOfTables == 1 || pQueryInfo->numOfTables == 2);
-
-    if (pDataBlocks == NULL || pMeterMetaInfo->vnodeIndex >= pDataBlocks->nSize) {
-      tscTrace("%p object should be release since all data blocks have been submit", pSql);
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    return tscKeepConn[command] == 0 ||
-           (pSql->res.code != TSDB_CODE_ACTION_IN_PROGRESS && pSql->res.code != TSDB_CODE_SUCCESS);
-  }
-}
+  return false;
+}
 
 /**
  *
@@ -1669,7 +1561,7 @@ bool tscShouldFreeAsyncSqlObj(SSqlObj* pSql) {
  * @param tableIndex  denote the table index for join query, where more than one table exists
  * @return
  */
-SMeterMetaInfo* tscGetMeterMetaInfo(SSqlCmd* pCmd, int32_t clauseIndex, int32_t tableIndex) {
+STableMetaInfo* tscGetTableMetaInfoFromCmd(SSqlCmd* pCmd, int32_t clauseIndex, int32_t tableIndex) {
   if (pCmd == NULL || pCmd->numOfClause == 0) {
     return NULL;
   }
@@ -1677,53 +1569,43 @@ SMeterMetaInfo* tscGetMeterMetaInfo(SSqlCmd* pCmd, int32_t clauseIndex, int32_t
   assert(clauseIndex >= 0 && clauseIndex < pCmd->numOfClause);
 
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex);
-  return tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, tableIndex);
+  return tscGetMetaInfo(pQueryInfo, tableIndex);
 }
 
-SMeterMetaInfo* tscGetMeterMetaInfoFromQueryInfo(SQueryInfo* pQueryInfo, int32_t tableIndex) {
+STableMetaInfo* tscGetMetaInfo(SQueryInfo* pQueryInfo, int32_t tableIndex) {
   assert(pQueryInfo != NULL);
 
-  if (pQueryInfo->pMeterInfo == NULL) {
+  if (pQueryInfo->pTableMetaInfo == NULL) {
     assert(pQueryInfo->numOfTables == 0);
     return NULL;
   }
 
-  assert(tableIndex >= 0 && tableIndex <= pQueryInfo->numOfTables && pQueryInfo->pMeterInfo != NULL);
-
-  return pQueryInfo->pMeterInfo[tableIndex];
-}
-
-SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t subClauseIndex) {
-  assert(pCmd != NULL && subClauseIndex >= 0 && subClauseIndex < TSDB_MAX_UNION_CLAUSE);
-
-  if (pCmd->pQueryInfo == NULL || subClauseIndex >= pCmd->numOfClause) {
-    return NULL;
-  }
+  assert(tableIndex >= 0 && tableIndex <= pQueryInfo->numOfTables && pQueryInfo->pTableMetaInfo != NULL);
 
-  return pCmd->pQueryInfo[subClauseIndex];
+  return pQueryInfo->pTableMetaInfo[tableIndex];
 }
 
-int32_t tscGetQueryInfoDetailSafely(SSqlCmd* pCmd, int32_t subClauseIndex, SQueryInfo** pQueryInfo) {
+SQueryInfo* tscGetQueryInfoDetailSafely(SSqlCmd* pCmd, int32_t subClauseIndex) {
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, subClauseIndex);
   int32_t ret = TSDB_CODE_SUCCESS;
 
-  *pQueryInfo = tscGetQueryInfoDetail(pCmd, subClauseIndex);
-
-  while ((*pQueryInfo) == NULL) {
+  while ((pQueryInfo) == NULL) {
     if ((ret = tscAddSubqueryInfo(pCmd)) != TSDB_CODE_SUCCESS) {
-      return ret;
+      terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      return NULL;
     }
 
-    (*pQueryInfo) = tscGetQueryInfoDetail(pCmd, subClauseIndex);
+    pQueryInfo = tscGetQueryInfoDetail(pCmd, subClauseIndex);
   }
 
-  return TSDB_CODE_SUCCESS;
+  return pQueryInfo;
 }
 
-SMeterMetaInfo* tscGetMeterMetaInfoByUid(SQueryInfo* pQueryInfo, uint64_t uid, int32_t* index) {
+STableMetaInfo* tscGetTableMetaInfoByUid(SQueryInfo* pQueryInfo, uint64_t uid, int32_t* index) {
   int32_t k = -1;
 
   for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
-    if (pQueryInfo->pMeterInfo[i]->pMeterMeta->uid == uid) {
+    if (pQueryInfo->pTableMetaInfo[i]->pTableMeta->id.uid == uid) {
       k = i;
       break;
     }
@@ -1734,342 +1616,584 @@ SMeterMetaInfo* tscGetMeterMetaInfoByUid(SQueryInfo* pQueryInfo, uint64_t uid, i
   }
 
   assert(k != -1);
-  return tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, k);
+  return tscGetMetaInfo(pQueryInfo, k);
+}
+
+void tscInitQueryInfo(SQueryInfo* pQueryInfo) {
+  assert(pQueryInfo->fieldsInfo.pFields == NULL);
+  pQueryInfo->fieldsInfo.pFields = taosArrayInit(4, sizeof(TAOS_FIELD));
+  
+  assert(pQueryInfo->fieldsInfo.pSupportInfo == NULL);
+  pQueryInfo->fieldsInfo.pSupportInfo = taosArrayInit(4, sizeof(SFieldSupInfo));
+  
+  assert(pQueryInfo->exprList == NULL);
+  pQueryInfo->exprList   = taosArrayInit(4, POINTER_BYTES);
+  pQueryInfo->colList    = taosArrayInit(4, POINTER_BYTES);
+  pQueryInfo->udColumnId = TSDB_UD_COLUMN_INDEX;
 }
 
 int32_t tscAddSubqueryInfo(SSqlCmd* pCmd) {
   assert(pCmd != NULL);
 
+  // todo refactor: remove this structure
   size_t s = pCmd->numOfClause + 1;
   char*  tmp = realloc(pCmd->pQueryInfo, s * POINTER_BYTES);
   if (tmp == NULL) {
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
   }
 
   pCmd->pQueryInfo = (SQueryInfo**)tmp;
 
   SQueryInfo* pQueryInfo = calloc(1, sizeof(SQueryInfo));
+  if (pQueryInfo == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  tscInitQueryInfo(pQueryInfo);
+
+  pQueryInfo->window = TSWINDOW_INITIALIZER;
   pQueryInfo->msg = pCmd->payload;  // pointer to the parent error message buffer
 
   pCmd->pQueryInfo[pCmd->numOfClause++] = pQueryInfo;
   return TSDB_CODE_SUCCESS;
 }
 
-static void doClearSubqueryInfo(SQueryInfo* pQueryInfo) {
+static void freeQueryInfoImpl(SQueryInfo* pQueryInfo) {
   tscTagCondRelease(&pQueryInfo->tagCond);
-  tscClearFieldInfo(&pQueryInfo->fieldsInfo);
+  tscFieldInfoClear(&pQueryInfo->fieldsInfo);
 
-  tscSqlExprInfoDestroy(&pQueryInfo->exprsInfo);
-  memset(&pQueryInfo->exprsInfo, 0, sizeof(pQueryInfo->exprsInfo));
+  tscSqlExprInfoDestroy(pQueryInfo->exprList);
+  pQueryInfo->exprList = NULL;
 
-  tscColumnBaseInfoDestroy(&pQueryInfo->colList);
-  memset(&pQueryInfo->colList, 0, sizeof(pQueryInfo->colList));
+  tscColumnListDestroy(pQueryInfo->colList);
+  pQueryInfo->colList = NULL;
 
-  pQueryInfo->tsBuf = tsBufDestory(pQueryInfo->tsBuf);
+  if (pQueryInfo->groupbyExpr.columnInfo != NULL) {
+    taosArrayDestroy(pQueryInfo->groupbyExpr.columnInfo);
+    pQueryInfo->groupbyExpr.columnInfo = NULL;
+  }
+  
+  pQueryInfo->tsBuf = tsBufDestroy(pQueryInfo->tsBuf);
 
-  tfree(pQueryInfo->defaultVal);
+  taosTFree(pQueryInfo->fillVal);
 }
 
 void tscClearSubqueryInfo(SSqlCmd* pCmd) {
   for (int32_t i = 0; i < pCmd->numOfClause; ++i) {
     SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, i);
-    doClearSubqueryInfo(pQueryInfo);
+    freeQueryInfoImpl(pQueryInfo);
   }
 }
 
-void tscFreeSubqueryInfo(SSqlCmd* pCmd) {
-  if (pCmd == NULL || pCmd->numOfClause == 0) {
-    return;
+void tscFreeVgroupTableInfo(SArray* pVgroupTables) {
+  if (pVgroupTables != NULL) {
+    for (size_t i = 0; i < taosArrayGetSize(pVgroupTables); i++) {
+      SVgroupTableInfo* pInfo = taosArrayGet(pVgroupTables, i);
+      taosArrayDestroy(pInfo->itemList);
+    }
+    taosArrayDestroy(pVgroupTables);
   }
+}
 
-  for (int32_t i = 0; i < pCmd->numOfClause; ++i) {
-    char* addr = (char*)pCmd - offsetof(SSqlObj, cmd);
-
-    SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, i);
-
-    doClearSubqueryInfo(pQueryInfo);
-    tscRemoveAllMeterMetaInfo(pQueryInfo, (const char*)addr, false);
-    tfree(pQueryInfo);
+void clearAllTableMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool removeFromCache) {
+  tscDebug("%p deref the table meta in cache, numOfTables:%d", address, pQueryInfo->numOfTables);
+  
+  for(int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
+    STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, i);
+    tscFreeVgroupTableInfo(pTableMetaInfo->pVgroupTables);
+    tscClearTableMetaInfo(pTableMetaInfo, removeFromCache);
+    free(pTableMetaInfo);
   }
-
-  pCmd->numOfClause = 0;
-  tfree(pCmd->pQueryInfo);
+  
+  taosTFree(pQueryInfo->pTableMetaInfo);
 }
 
-SMeterMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, SMeterMeta* pMeterMeta,
-                                    SMetricMeta* pMetricMeta, int16_t numOfTags, int16_t* tags) {
-  void* pAlloc = realloc(pQueryInfo->pMeterInfo, (pQueryInfo->numOfTables + 1) * POINTER_BYTES);
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
+                                    SVgroupsInfo* vgroupList, SArray* pTagCols) {
+  void* pAlloc = realloc(pQueryInfo->pTableMetaInfo, (pQueryInfo->numOfTables + 1) * POINTER_BYTES);
   if (pAlloc == NULL) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
     return NULL;
   }
 
-  pQueryInfo->pMeterInfo = pAlloc;
-  pQueryInfo->pMeterInfo[pQueryInfo->numOfTables] = calloc(1, sizeof(SMeterMetaInfo));
+  pQueryInfo->pTableMetaInfo = pAlloc;
+  STableMetaInfo* pTableMetaInfo = calloc(1, sizeof(STableMetaInfo));
+  if (pTableMetaInfo == NULL) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return NULL;
+  }
 
-  SMeterMetaInfo* pMeterMetaInfo = pQueryInfo->pMeterInfo[pQueryInfo->numOfTables];
-  assert(pMeterMetaInfo != NULL);
+  pQueryInfo->pTableMetaInfo[pQueryInfo->numOfTables] = pTableMetaInfo;
 
   if (name != NULL) {
-    assert(strlen(name) <= TSDB_METER_ID_LEN);
-    strcpy(pMeterMetaInfo->name, name);
+    tstrncpy(pTableMetaInfo->name, name, sizeof(pTableMetaInfo->name));
   }
 
-  pMeterMetaInfo->pMeterMeta = pMeterMeta;
-  pMeterMetaInfo->pMetricMeta = pMetricMeta;
-  pMeterMetaInfo->numOfTags = numOfTags;
+  pTableMetaInfo->pTableMeta = pTableMeta;
+  
+  if (vgroupList != NULL) {
+    size_t size = sizeof(SVgroupsInfo) + sizeof(SCMVgroupInfo) * vgroupList->numOfVgroups;
+    pTableMetaInfo->vgroupList = malloc(size);
+    if (pTableMetaInfo->vgroupList == NULL) {
+      return NULL;
+    }
+
+    memcpy(pTableMetaInfo->vgroupList, vgroupList, size);
+  }
 
-  if (tags != NULL) {
-    memcpy(pMeterMetaInfo->tagColumnIndex, tags, sizeof(pMeterMetaInfo->tagColumnIndex[0]) * numOfTags);
+  pTableMetaInfo->tagColList = taosArrayInit(4, POINTER_BYTES);
+  if (pTableMetaInfo->tagColList == NULL) {
+    return NULL;
   }
 
+  if (pTagCols != NULL) {
+    tscColumnListCopy(pTableMetaInfo->tagColList, pTagCols, -1);
+  }
+  
   pQueryInfo->numOfTables += 1;
-  return pMeterMetaInfo;
+  return pTableMetaInfo;
 }
 
-SMeterMetaInfo* tscAddEmptyMeterMetaInfo(SQueryInfo* pQueryInfo) {
-  return tscAddMeterMetaInfo(pQueryInfo, NULL, NULL, NULL, 0, NULL);
+STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo* pQueryInfo) {
+  return tscAddTableMetaInfo(pQueryInfo, NULL, NULL, NULL, NULL);
 }
 
-void doRemoveMeterMetaInfo(SQueryInfo* pQueryInfo, int32_t index, bool removeFromCache) {
-  if (index < 0 || index >= pQueryInfo->numOfTables) {
+void tscClearTableMetaInfo(STableMetaInfo* pTableMetaInfo, bool removeFromCache) {
+  if (pTableMetaInfo == NULL) {
     return;
   }
 
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, index);
+  if (pTableMetaInfo->pTableMeta != NULL) {
+    taosCacheRelease(tscMetaCache, (void**)&(pTableMetaInfo->pTableMeta), removeFromCache);
+  }
 
-  tscClearMeterMetaInfo(pMeterMetaInfo, removeFromCache);
-  free(pMeterMetaInfo);
+  taosTFree(pTableMetaInfo->vgroupList);
+  
+  tscColumnListDestroy(pTableMetaInfo->tagColList);
+  pTableMetaInfo->tagColList = NULL;
+}
 
-  int32_t after = pQueryInfo->numOfTables - index - 1;
-  if (after > 0) {
-    memmove(&pQueryInfo->pMeterInfo[index], &pQueryInfo->pMeterInfo[index + 1], after * POINTER_BYTES);
+void tscResetForNextRetrieve(SSqlRes* pRes) {
+  if (pRes == NULL) {
+    return;
   }
 
-  pQueryInfo->numOfTables -= 1;
+  pRes->row = 0;
+  pRes->numOfRows = 0;
 }
 
-void tscRemoveAllMeterMetaInfo(SQueryInfo* pQueryInfo, const char* address, bool removeFromCache) {
-  tscTrace("%p deref the metric/meter meta in cache, numOfTables:%d", address, pQueryInfo->numOfTables);
+void registerSqlObj(SSqlObj* pSql) {
+  int32_t DEFAULT_LIFE_TIME = 2 * 600 * 1000;  // 1200 sec
 
-  int32_t index = pQueryInfo->numOfTables;
-  while (index >= 0) {
-    doRemoveMeterMetaInfo(pQueryInfo, --index, removeFromCache);
-  }
+  int32_t ref = T_REF_INC(pSql->pTscObj);
+  tscDebug("%p add to tscObj:%p, ref:%d", pSql, pSql->pTscObj, ref);
 
-  tfree(pQueryInfo->pMeterInfo);
+  uint64_t p = (uint64_t) pSql;
+  pSql->self = taosCachePut(tscObjCache, &p, sizeof(uint64_t), &p, sizeof(uint64_t), DEFAULT_LIFE_TIME);
 }
 
-void tscClearMeterMetaInfo(SMeterMetaInfo* pMeterMetaInfo, bool removeFromCache) {
-  if (pMeterMetaInfo == NULL) {
-    return;
+SSqlObj* createSimpleSubObj(SSqlObj* pSql, void (*fp)(), void* param, int32_t cmd) {
+  SSqlObj* pNew = (SSqlObj*)calloc(1, sizeof(SSqlObj));
+  if (pNew == NULL) {
+    tscError("%p new subquery failed, tableIndex:%d", pSql, 0);
+    return NULL;
   }
 
-  taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), removeFromCache);
-  taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMetricMeta), removeFromCache);
+  pNew->pTscObj = pSql->pTscObj;
+  pNew->signature = pNew;
+
+  SSqlCmd* pCmd = &pNew->cmd;
+  pCmd->command = cmd;
+  pCmd->parseFinished = 1;
+  pCmd->autoCreated = pSql->cmd.autoCreated;
+  memcpy(&pCmd->tagData, &pSql->cmd.tagData, sizeof(pCmd->tagData));
+
+  if (tscAddSubqueryInfo(pCmd) != TSDB_CODE_SUCCESS) {
+    tscFreeSqlObj(pNew);
+    return NULL;
+  }
+
+  pNew->fp = fp;
+  pNew->fetchFp = fp;
+  pNew->param = param;
+  pNew->maxRetry = TSDB_MAX_REPLICA;
+
+  pNew->sqlstr = strdup(pSql->sqlstr);
+  if (pNew->sqlstr == NULL) {
+    tscError("%p new subquery failed", pSql);
+    tscFreeSqlObj(pNew);
+    return NULL;
+  }
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetailSafely(pCmd, 0);
+
+  assert(pSql->cmd.clauseIndex == 0);
+  STableMetaInfo* pMasterTableMetaInfo = tscGetTableMetaInfoFromCmd(&pSql->cmd, pSql->cmd.clauseIndex, 0);
+
+  tscAddTableMetaInfo(pQueryInfo, pMasterTableMetaInfo->name, NULL, NULL, NULL);
+
+  registerSqlObj(pNew);
+  return pNew;
 }
 
-void tscResetForNextRetrieve(SSqlRes* pRes) {
-  if (pRes == NULL) {
+// current sql function is not direct output result, so create a dummy output field
+static void doSetNewFieldInfo(SQueryInfo* pNewQueryInfo, SSqlExpr* pExpr) {
+  TAOS_FIELD f = {.type = (uint8_t)pExpr->resType, .bytes = pExpr->resBytes};
+  tstrncpy(f.name, pExpr->aliasName, sizeof(f.name));
+
+  SFieldSupInfo* pInfo1 = tscFieldInfoAppend(&pNewQueryInfo->fieldsInfo, &f);
+
+  pInfo1->pSqlExpr = pExpr;
+  pInfo1->visible = false;
+}
+
+static void doSetSqlExprAndResultFieldInfo(SQueryInfo* pQueryInfo, SQueryInfo* pNewQueryInfo, int64_t uid) {
+  int32_t numOfOutput = (int32_t)tscSqlExprNumOfExprs(pNewQueryInfo);
+  if (numOfOutput == 0) {
     return;
   }
 
-  pRes->row = 0;
-  pRes->numOfRows = 0;
+  size_t      numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
+  SFieldInfo* pFieldInfo = &pQueryInfo->fieldsInfo;
+
+  // set the field info in pNewQueryInfo object
+  for (int32_t i = 0; i < numOfExprs; ++i) {
+    SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
+
+    if (pExpr->uid == uid) {
+      if (i < pFieldInfo->numOfOutput) {
+        SFieldSupInfo* pInfo = tscFieldInfoGetSupp(pFieldInfo, i);
+
+        if (pInfo->pSqlExpr != NULL) {
+          TAOS_FIELD* p = tscFieldInfoGetField(pFieldInfo, i);
+          assert(strcmp(p->name, pExpr->aliasName) == 0);
+
+          SFieldSupInfo* pInfo1 = tscFieldInfoAppend(&pNewQueryInfo->fieldsInfo, p);
+          *pInfo1 = *pInfo;
+        } else {
+          assert(pInfo->pArithExprInfo != NULL);
+          doSetNewFieldInfo(pNewQueryInfo, pExpr);
+        }
+      } else { // it is a arithmetic column, does not have actual field for sqlExpr, so build it
+        doSetNewFieldInfo(pNewQueryInfo, pExpr);
+      }
+    }
+  }
+
+  // make sure the the sqlExpr for each fields is correct
+  numOfExprs = tscSqlExprNumOfExprs(pNewQueryInfo);
+
+  // update the pSqlExpr pointer in SFieldSupInfo according the field name
+  // make sure the pSqlExpr point to the correct SqlExpr in pNewQueryInfo, not SqlExpr in pQueryInfo
+  for (int32_t f = 0; f < pNewQueryInfo->fieldsInfo.numOfOutput; ++f) {
+    TAOS_FIELD* field = tscFieldInfoGetField(&pNewQueryInfo->fieldsInfo, f);
+
+    bool matched = false;
+    for (int32_t k1 = 0; k1 < numOfExprs; ++k1) {
+      SSqlExpr* pExpr1 = tscSqlExprGet(pNewQueryInfo, k1);
+
+      if (strcmp(field->name, pExpr1->aliasName) == 0) {  // establish link according to the result field name
+        SFieldSupInfo* pInfo = tscFieldInfoGetSupp(&pNewQueryInfo->fieldsInfo, f);
+        pInfo->pSqlExpr = pExpr1;
+
+        matched = true;
+        break;
+      }
+    }
+
+    assert(matched);
+    (void)matched;
+  }
+
+  tscFieldInfoUpdateOffset(pNewQueryInfo);
 }
 
-SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void* param, SSqlObj* pPrevSql) {
-  SSqlCmd*        pCmd = &pSql->cmd;
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfo(pCmd, pCmd->clauseIndex, tableIndex);
+SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void* param, int32_t cmd, SSqlObj* pPrevSql) {
+  SSqlCmd* pCmd = &pSql->cmd;
 
   SSqlObj* pNew = (SSqlObj*)calloc(1, sizeof(SSqlObj));
   if (pNew == NULL) {
-    tscError("%p new subquery failed, tableIndex:%d, vnodeIndex:%d", pSql, tableIndex, pMeterMetaInfo->vnodeIndex);
+    tscError("%p new subquery failed, tableIndex:%d", pSql, tableIndex);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
     return NULL;
   }
+  
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, tableIndex);
 
   pNew->pTscObj = pSql->pTscObj;
   pNew->signature = pNew;
 
   pNew->sqlstr = strdup(pSql->sqlstr);
   if (pNew->sqlstr == NULL) {
-    tscError("%p new subquery failed, tableIndex:%d, vnodeIndex:%d", pSql, tableIndex, pMeterMetaInfo->vnodeIndex);
-
-    free(pNew);
-    return NULL;
+    tscError("%p new subquery failed, tableIndex:%d, vgroupIndex:%d", pSql, tableIndex, pTableMetaInfo->vgroupIndex);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
   }
 
-  memcpy(&pNew->cmd, pCmd, sizeof(SSqlCmd));
-
-  pNew->cmd.command = TSDB_SQL_SELECT;
-  pNew->cmd.payload = NULL;
-  pNew->cmd.allocSize = 0;
+  SSqlCmd* pnCmd = &pNew->cmd;
+  memcpy(pnCmd, pCmd, sizeof(SSqlCmd));
+  
+  pnCmd->command = cmd;
+  pnCmd->payload = NULL;
+  pnCmd->allocSize = 0;
 
-  pNew->cmd.pQueryInfo = NULL;
-  pNew->cmd.numOfClause = 0;
-  pNew->cmd.clauseIndex = 0;
+  pnCmd->pQueryInfo = NULL;
+  pnCmd->numOfClause = 0;
+  pnCmd->clauseIndex = 0;
+  pnCmd->pDataBlocks = NULL;
+  pnCmd->parseFinished = 1;
 
-  if (tscAddSubqueryInfo(&pNew->cmd) != TSDB_CODE_SUCCESS) {
-    tscFreeSqlObj(pNew);
-    return NULL;
+  if (tscAddSubqueryInfo(pnCmd) != TSDB_CODE_SUCCESS) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
   }
 
-  SQueryInfo* pNewQueryInfo = tscGetQueryInfoDetail(&pNew->cmd, 0);
+  SQueryInfo* pNewQueryInfo = tscGetQueryInfoDetail(pnCmd, 0);
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
-  memcpy(pNewQueryInfo, pQueryInfo, sizeof(SQueryInfo));
-
-  memset(&pNewQueryInfo->colList, 0, sizeof(pNewQueryInfo->colList));
-  memset(&pNewQueryInfo->fieldsInfo, 0, sizeof(SFieldInfo));
-
-  pNewQueryInfo->pMeterInfo = NULL;
-  pNewQueryInfo->defaultVal = NULL;
+  pNewQueryInfo->command = pQueryInfo->command;
+  memcpy(&pNewQueryInfo->interval, &pQueryInfo->interval, sizeof(pNewQueryInfo->interval));
+  pNewQueryInfo->type   = pQueryInfo->type;
+  pNewQueryInfo->window = pQueryInfo->window;
+  pNewQueryInfo->limit  = pQueryInfo->limit;
+  pNewQueryInfo->slimit = pQueryInfo->slimit;
+  pNewQueryInfo->order  = pQueryInfo->order;
+  pNewQueryInfo->tsBuf  = NULL;
+  pNewQueryInfo->fillType = pQueryInfo->fillType;
+  pNewQueryInfo->fillVal  = NULL;
+  pNewQueryInfo->clauseLimit = pQueryInfo->clauseLimit;
   pNewQueryInfo->numOfTables = 0;
-  pNewQueryInfo->tsBuf = NULL;
+  pNewQueryInfo->pTableMetaInfo = NULL;
+  
+  pNewQueryInfo->groupbyExpr = pQueryInfo->groupbyExpr;
+  if (pQueryInfo->groupbyExpr.columnInfo != NULL) {
+    pNewQueryInfo->groupbyExpr.columnInfo = taosArrayClone(pQueryInfo->groupbyExpr.columnInfo);
+    if (pNewQueryInfo->groupbyExpr.columnInfo == NULL) {
+      terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      goto _error;
+    }
+  }
+  
+  if (tscTagCondCopy(&pNewQueryInfo->tagCond, &pQueryInfo->tagCond) != 0) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
+  }
 
-  tscTagCondCopy(&pNewQueryInfo->tagCond, &pQueryInfo->tagCond);
+  if (pQueryInfo->fillType != TSDB_FILL_NONE) {
+    pNewQueryInfo->fillVal = malloc(pQueryInfo->fieldsInfo.numOfOutput * sizeof(int64_t));
+    if (pNewQueryInfo->fillVal == NULL) {
+      terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+      goto _error;
+    }
 
-  if (pQueryInfo->interpoType != TSDB_INTERPO_NONE) {
-    pNewQueryInfo->defaultVal = malloc(pQueryInfo->fieldsInfo.numOfOutputCols * sizeof(int64_t));
-    memcpy(pNewQueryInfo->defaultVal, pQueryInfo->defaultVal, pQueryInfo->fieldsInfo.numOfOutputCols * sizeof(int64_t));
+    memcpy(pNewQueryInfo->fillVal, pQueryInfo->fillVal, pQueryInfo->fieldsInfo.numOfOutput * sizeof(int64_t));
   }
 
-  if (tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE) != TSDB_CODE_SUCCESS) {
-    tscError("%p new subquery failed, tableIndex:%d, vnodeIndex:%d", pSql, tableIndex, pMeterMetaInfo->vnodeIndex);
-    tscFreeSqlObj(pNew);
-    return NULL;
+  if (tscAllocPayload(pnCmd, TSDB_DEFAULT_PAYLOAD_SIZE) != TSDB_CODE_SUCCESS) {
+    tscError("%p new subquery failed, tableIndex:%d, vgroupIndex:%d", pSql, tableIndex, pTableMetaInfo->vgroupIndex);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
   }
-
-  tscColumnBaseInfoCopy(&pNewQueryInfo->colList, &pQueryInfo->colList, (int16_t)tableIndex);
+  
+  tscColumnListCopy(pNewQueryInfo->colList, pQueryInfo->colList, (int16_t)tableIndex);
 
   // set the correct query type
   if (pPrevSql != NULL) {
     SQueryInfo* pPrevQueryInfo = tscGetQueryInfoDetail(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex);
     pNewQueryInfo->type = pPrevQueryInfo->type;
   } else {
-    pNewQueryInfo->type |= TSDB_QUERY_TYPE_SUBQUERY;  // it must be the subquery
+    TSDB_QUERY_SET_TYPE(pNewQueryInfo->type, TSDB_QUERY_TYPE_SUBQUERY);// it must be the subquery
   }
 
-  uint64_t uid = pMeterMetaInfo->pMeterMeta->uid;
-  tscSqlExprCopy(&pNewQueryInfo->exprsInfo, &pQueryInfo->exprsInfo, uid);
-
-  int32_t numOfOutputCols = pNewQueryInfo->exprsInfo.numOfExprs;
-
-  if (numOfOutputCols > 0) {
-    int32_t* indexList = calloc(1, numOfOutputCols * sizeof(int32_t));
-    for (int32_t i = 0, j = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
-      SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, i);
-      if (pExpr->uid == uid) {
-        indexList[j++] = i;
-      }
-    }
-
-    tscFieldInfoCopy(&pQueryInfo->fieldsInfo, &pNewQueryInfo->fieldsInfo, indexList, numOfOutputCols);
-    free(indexList);
-
-    tscFieldInfoUpdateOffsetForInterResult(pNewQueryInfo);
+  uint64_t uid = pTableMetaInfo->pTableMeta->id.uid;
+  if (tscSqlExprCopy(pNewQueryInfo->exprList, pQueryInfo->exprList, uid, true) != 0) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    goto _error;
   }
 
-  pNew->fp = fp;
-  pNew->param = param;
+  doSetSqlExprAndResultFieldInfo(pQueryInfo, pNewQueryInfo, uid);
 
-  char key[TSDB_MAX_TAGS_LEN + 1] = {0};
-  tscGetMetricMetaCacheKey(pQueryInfo, key, uid);
+  pNew->fp = fp;
+  pNew->fetchFp = fp;
 
-#ifdef _DEBUG_VIEW
-  printf("the metricmeta key is:%s\n", key);
-#endif
+  pNew->param = param;
+  pNew->maxRetry = TSDB_MAX_REPLICA;
 
-  char*           name = pMeterMetaInfo->name;
-  SMeterMetaInfo* pFinalInfo = NULL;
+  char* name = pTableMetaInfo->name;
+  STableMetaInfo* pFinalInfo = NULL;
 
   if (pPrevSql == NULL) {
-    SMeterMeta*  pMeterMeta = taosGetDataFromCache(tscCacheHandle, name);
-    SMetricMeta* pMetricMeta = taosGetDataFromCache(tscCacheHandle, key);
-
-    pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pMeterMeta, pMetricMeta, pMeterMetaInfo->numOfTags,
-                                     pMeterMetaInfo->tagColumnIndex);
-  } else {  // transfer the ownership of pMeterMeta/pMetricMeta to the newly create sql object.
-    SMeterMetaInfo* pPrevInfo = tscGetMeterMetaInfo(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
+    STableMeta* pTableMeta = taosCacheAcquireByData(tscMetaCache, pTableMetaInfo->pTableMeta);  // get by name may failed due to the cache cleanup
+    assert(pTableMeta != NULL);
 
-    SMeterMeta*  pPrevMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pPrevInfo->pMeterMeta);
-    SMetricMeta* pPrevMetricMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pPrevInfo->pMetricMeta);
+    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pTableMeta, pTableMetaInfo->vgroupList, pTableMetaInfo->tagColList);
+  } else {  // transfer the ownership of pTableMeta to the newly create sql object.
+    STableMetaInfo* pPrevInfo = tscGetTableMetaInfoFromCmd(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
 
-    pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pPrevMeterMeta, pPrevMetricMeta, pMeterMetaInfo->numOfTags,
-                                     pMeterMetaInfo->tagColumnIndex);
+    STableMeta*  pPrevTableMeta = taosCacheTransfer(tscMetaCache, (void**)&pPrevInfo->pTableMeta);
+    
+    SVgroupsInfo* pVgroupsInfo = pPrevInfo->vgroupList;
+    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pPrevTableMeta, pVgroupsInfo, pTableMetaInfo->tagColList);
   }
 
-  assert(pFinalInfo->pMeterMeta != NULL && pNewQueryInfo->numOfTables == 1);
-  if (UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo)) {
-    assert(pFinalInfo->pMetricMeta != NULL);
+  if (pFinalInfo->pTableMeta == NULL) {
+    tscError("%p new subquery failed since no tableMeta in cache, name:%s", pSql, name);
+
+    if (pPrevSql != NULL) { // pass the previous error to client
+      assert(pPrevSql->res.code != TSDB_CODE_SUCCESS);
+      terrno = pPrevSql->res.code;
+    } else {
+      terrno = TSDB_CODE_TSC_APP_ERROR;
+    }
+
+    goto _error;
   }
   
-  tscTrace(
-      "%p new subquery: %p, tableIndex:%d, vnodeIdx:%d, type:%d, exprInfo:%d, colList:%d,"
-      "fieldInfo:%d, name:%s, qrang:%" PRId64 " - %" PRId64 " order:%d, limit:%" PRId64,
-      pSql, pNew, tableIndex, pMeterMetaInfo->vnodeIndex, pNewQueryInfo->type, pNewQueryInfo->exprsInfo.numOfExprs,
-      pNewQueryInfo->colList.numOfCols, pNewQueryInfo->fieldsInfo.numOfOutputCols, pFinalInfo->name, pNewQueryInfo->stime,
-      pNewQueryInfo->etime, pNewQueryInfo->order.order, pNewQueryInfo->limit.limit);
+  assert(pNewQueryInfo->numOfTables == 1);
   
-  tscPrintSelectClause(pNew, 0);
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
+    assert(pFinalInfo->vgroupList != NULL);
+  }
 
+  if (cmd == TSDB_SQL_SELECT) {
+    size_t size = taosArrayGetSize(pNewQueryInfo->colList);
+    
+    tscDebug(
+        "%p new subquery:%p, tableIndex:%d, vgroupIndex:%d, type:%d, exprInfo:%" PRIzu ", colList:%" PRIzu ","
+        "fieldInfo:%d, name:%s, qrang:%" PRId64 " - %" PRId64 " order:%d, limit:%" PRId64,
+        pSql, pNew, tableIndex, pTableMetaInfo->vgroupIndex, pNewQueryInfo->type, tscSqlExprNumOfExprs(pNewQueryInfo),
+        size, pNewQueryInfo->fieldsInfo.numOfOutput, pFinalInfo->name, pNewQueryInfo->window.skey,
+        pNewQueryInfo->window.ekey, pNewQueryInfo->order.order, pNewQueryInfo->limit.limit);
+    
+    tscPrintSelectClause(pNew, 0);
+  } else {
+    tscDebug("%p new sub insertion: %p, vnodeIdx:%d", pSql, pNew, pTableMetaInfo->vgroupIndex);
+  }
+
+  registerSqlObj(pNew);
   return pNew;
+
+_error:
+  tscFreeSqlObj(pNew);
+  return NULL;
 }
 
+/**
+ * To decide if current is a two-stage super table query, join query, or insert. And invoke different
+ * procedure accordingly
+ * @param pSql
+ */
 void tscDoQuery(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
-  void*    fp = pSql->fp;
+  SSqlRes* pRes = &pSql->res;
   
-  pSql->res.code = TSDB_CODE_SUCCESS;
+  pRes->code = TSDB_CODE_SUCCESS;
   
   if (pCmd->command > TSDB_SQL_LOCAL) {
     tscProcessLocalCmd(pSql);
+    return;
+  }
+  
+  if (pCmd->command == TSDB_SQL_SELECT) {
+    tscAddIntoSqlList(pSql);
+  }
+
+  if (pCmd->dataSourceType == DATA_FROM_DATA_FILE) {
+    tscProcessMultiVnodesImportFromFile(pSql);
   } else {
-    if (pCmd->command == TSDB_SQL_SELECT) {
-      tscAddIntoSqlList(pSql);
+    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+    uint16_t type = pQueryInfo->type;
+  
+    if (pSql->fp == (void(*)())tscHandleMultivnodeInsert) {  // multi-vnodes insertion
+      tscHandleMultivnodeInsert(pSql);
+      return;
     }
+  
+    if (QUERY_IS_JOIN_QUERY(type)) {
+      if (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_SUBQUERY)) {
+        tscHandleMasterJoinQuery(pSql);
+      } else { // for first stage sub query, iterate all vnodes to get all timestamp
+        if (!TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
+          tscProcessSql(pSql);
+        } else { // secondary stage join query.
+          if (tscIsTwoStageSTableQuery(pQueryInfo, 0)) {  // super table query
+            tscHandleMasterSTableQuery(pSql);
+          } else {
+            tscProcessSql(pSql);
+          }
+        }
+      }
 
-    if (pCmd->dataSourceType == DATA_FROM_DATA_FILE) {
-      tscProcessMultiVnodesInsertFromFile(pSql);
-    } else {
-      // pSql may be released in this function if it is a async insertion.
-      tscProcessSql(pSql);
-      if (NULL == fp) tscProcessMultiVnodesInsert(pSql);
+      return;
+    } else if (tscIsTwoStageSTableQuery(pQueryInfo, 0)) {  // super table query
+      tscHandleMasterSTableQuery(pSql);
+      return;
     }
+    
+    tscProcessSql(pSql);
   }
 }
 
-int16_t tscGetJoinTagColIndexByUid(STagCond* pTagCond, uint64_t uid) {
+int16_t tscGetJoinTagColIdByUid(STagCond* pTagCond, uint64_t uid) {
   if (pTagCond->joinInfo.left.uid == uid) {
-    return pTagCond->joinInfo.left.tagCol;
+    return pTagCond->joinInfo.left.tagColId;
+  } else if (pTagCond->joinInfo.right.uid == uid) {
+    return pTagCond->joinInfo.right.tagColId;
   } else {
-    return pTagCond->joinInfo.right.tagCol;
+    assert(0);
+    return -1;
+  }
+}
+
+bool tscIsUpdateQuery(SSqlObj* pSql) {
+  if (pSql == NULL || pSql->signature != pSql) {
+    terrno = TSDB_CODE_TSC_DISCONNECTED;
+    return TSDB_CODE_TSC_DISCONNECTED;
   }
+
+  SSqlCmd* pCmd = &pSql->cmd;
+  return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) || TSDB_SQL_USE_DB == pCmd->command);
 }
 
-bool tscIsUpdateQuery(STscObj* pObj) {
-  if (pObj == NULL || pObj->signature != pObj) {
-    globalCode = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
+int32_t tscSQLSyntaxErrMsg(char* msg, const char* additionalInfo,  const char* sql) {
+  const char* msgFormat1 = "syntax error near \'%s\'";
+  const char* msgFormat2 = "syntax error near \'%s\' (%s)";
+  const char* msgFormat3 = "%s";
+
+  const char* prefix = "syntax error"; 
+  const int32_t BACKWARD_CHAR_STEP = 0;
+
+  if (sql == NULL) {
+    assert(additionalInfo != NULL);
+    sprintf(msg, msgFormat1, additionalInfo);
+    return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
   }
 
-  SSqlCmd* pCmd = &pObj->pSql->cmd;
-  return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) ||
-          TSDB_SQL_USE_DB == pCmd->command)
-             ? 1
-             : 0;
+  char buf[64] = {0};  // only extract part of sql string
+  strncpy(buf, (sql - BACKWARD_CHAR_STEP), tListLen(buf) - 1);
+
+  if (additionalInfo != NULL) {
+    sprintf(msg, msgFormat2, buf, additionalInfo);
+  } else {
+    const char* msgFormat = (0 == strncmp(sql, prefix, strlen(prefix))) ? msgFormat3 : msgFormat1; 
+    sprintf(msg, msgFormat, buf);
+  }
+
+  return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
+  
 }
 
 int32_t tscInvalidSQLErrMsg(char* msg, const char* additionalInfo, const char* sql) {
   const char* msgFormat1 = "invalid SQL: %s";
-  const char* msgFormat2 = "invalid SQL: syntax error near \"%s\" (%s)";
-  const char* msgFormat3 = "invalid SQL: syntax error near \"%s\"";
+  const char* msgFormat2 = "invalid SQL: \'%s\' (%s)";
+  const char* msgFormat3 = "invalid SQL: \'%s\'";
 
   const int32_t BACKWARD_CHAR_STEP = 0;
 
   if (sql == NULL) {
     assert(additionalInfo != NULL);
     sprintf(msg, msgFormat1, additionalInfo);
-    return TSDB_CODE_INVALID_SQL;
+    return TSDB_CODE_TSC_INVALID_SQL;
   }
 
   char buf[64] = {0};  // only extract part of sql string
@@ -2081,34 +2205,47 @@ int32_t tscInvalidSQLErrMsg(char* msg, const char* additionalInfo, const char* s
     sprintf(msg, msgFormat3, buf);  // no additional information for invalid sql error
   }
 
-  return TSDB_CODE_INVALID_SQL;
+  return TSDB_CODE_TSC_INVALID_SQL;
 }
 
 bool tscHasReachLimitation(SQueryInfo* pQueryInfo, SSqlRes* pRes) {
   assert(pQueryInfo != NULL && pQueryInfo->clauseLimit != 0);
-  return (pQueryInfo->clauseLimit > 0 && pRes->numOfTotalInCurrentClause >= pQueryInfo->clauseLimit);
+  return (pQueryInfo->clauseLimit > 0 && pRes->numOfClauseTotal >= pQueryInfo->clauseLimit);
 }
 
 char* tscGetErrorMsgPayload(SSqlCmd* pCmd) { return pCmd->payload; }
 
 /**
  *  If current vnode query does not return results anymore (pRes->numOfRows == 0), try the next vnode if exists,
- *  in case of multi-vnode super table projection query and the result does not reach the limitation.
+ *  while multi-vnode super table projection query and the result does not reach the limitation.
  */
 bool hasMoreVnodesToTry(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
+  if (pCmd->command != TSDB_SQL_FETCH) {
+    return false;
+  }
 
+  assert(pRes->completed);
   SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  if (!UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo) || (pMeterMetaInfo->pMetricMeta == NULL)) {
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+
+  // for normal table, no need to try any more if results are all retrieved from one vnode
+  if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) || (pTableMetaInfo->vgroupList == NULL)) {
     return false;
   }
   
-  int32_t totalVnode = pMeterMetaInfo->pMetricMeta->numOfVnodes;
-  return pRes->numOfRows == 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) &&
-         (!tscHasReachLimitation(pQueryInfo, pRes)) && (pMeterMetaInfo->vnodeIndex < totalVnode - 1);
+  int32_t numOfVgroups = pTableMetaInfo->vgroupList->numOfVgroups;
+  if (pTableMetaInfo->pVgroupTables != NULL) {
+    numOfVgroups = (int32_t)taosArrayGetSize(pTableMetaInfo->pVgroupTables);
+  }
+
+  return tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) &&
+         (!tscHasReachLimitation(pQueryInfo, pRes)) && (pTableMetaInfo->vgroupIndex < numOfVgroups - 1);
+}
+
+bool hasMoreClauseToTry(SSqlObj* pSql) {
+  return pSql->cmd.clauseIndex < pSql->cmd.numOfClause - 1;
 }
 
 void tscTryQueryNextVnode(SSqlObj* pSql, __async_cb_func_t fp) {
@@ -2122,13 +2259,12 @@ void tscTryQueryNextVnode(SSqlObj* pSql, __async_cb_func_t fp) {
    * if case of: multi-vnode super table projection query
    */
   assert(pRes->numOfRows == 0 && tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && !tscHasReachLimitation(pQueryInfo, pRes));
-
-  SMeterMetaInfo* pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, 0);
-  int32_t         totalVnode = pMeterMetaInfo->pMetricMeta->numOfVnodes;
-
-  while (++pMeterMetaInfo->vnodeIndex < totalVnode) {
-    tscTrace("%p current vnode:%d exhausted, try next:%d. total vnode:%d. current numOfRes:%d", pSql,
-             pMeterMetaInfo->vnodeIndex - 1, pMeterMetaInfo->vnodeIndex, totalVnode, pRes->numOfTotalInCurrentClause);
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  
+  int32_t totalVgroups = pTableMetaInfo->vgroupList->numOfVgroups;
+  if (++pTableMetaInfo->vgroupIndex < totalVgroups) {
+    tscDebug("%p results from vgroup index:%d completed, try next:%d. total vgroups:%d. current numOfRes:%" PRId64, pSql,
+             pTableMetaInfo->vgroupIndex - 1, pTableMetaInfo->vgroupIndex, totalVgroups, pRes->numOfClauseTotal);
 
     /*
      * update the limit and offset value for the query on the next vnode,
@@ -2136,18 +2272,18 @@ void tscTryQueryNextVnode(SSqlObj* pSql, __async_cb_func_t fp) {
      *
      * NOTE:
      * if the pRes->offset is larger than 0, the start returned position has not reached yet.
-     * Therefore, the pRes->numOfRows, as well as pRes->numOfTotalInCurrentClause, must be 0.
+     * Therefore, the pRes->numOfRows, as well as pRes->numOfClauseTotal, must be 0.
      * The pRes->offset value will be updated by virtual node, during query execution.
      */
     if (pQueryInfo->clauseLimit >= 0) {
-      pQueryInfo->limit.limit = pQueryInfo->clauseLimit - pRes->numOfTotalInCurrentClause;
+      pQueryInfo->limit.limit = pQueryInfo->clauseLimit - pRes->numOfClauseTotal;
     }
 
     pQueryInfo->limit.offset = pRes->offset;
-
     assert((pRes->offset >= 0 && pRes->numOfRows == 0) || (pRes->offset == 0 && pRes->numOfRows >= 0));
-    tscTrace("%p new query to next vnode, vnode index:%d, limit:%" PRId64 ", offset:%" PRId64 ", glimit:%" PRId64, pSql,
-             pMeterMetaInfo->vnodeIndex, pQueryInfo->limit.limit, pQueryInfo->limit.offset, pQueryInfo->clauseLimit);
+    
+    tscDebug("%p new query to next vgroup, index:%d, limit:%" PRId64 ", offset:%" PRId64 ", glimit:%" PRId64,
+        pSql, pTableMetaInfo->vgroupIndex, pQueryInfo->limit.limit, pQueryInfo->limit.offset, pQueryInfo->clauseLimit);
 
     /*
      * For project query with super table join, the numOfSub is equalled to the number of all subqueries.
@@ -2160,47 +2296,15 @@ void tscTryQueryNextVnode(SSqlObj* pSql, __async_cb_func_t fp) {
 
     tscResetForNextRetrieve(pRes);
 
-    // in case of async query, set the callback function
-    void* fp1 = pSql->fp;
+    // set the callback function
     pSql->fp = fp;
-
-    if (fp1 != NULL) {
-      assert(fp != NULL);
-    }
-
-    int32_t ret = tscProcessSql(pSql);  // todo check for failure
-
-    // in case of async query, return now
-    if (fp != NULL) {
-      return;
-    }
-
-    if (ret != TSDB_CODE_SUCCESS) {
-      pSql->res.code = ret;
-      return;
-    }
-
-    // retrieve data
-    assert(pCmd->command == TSDB_SQL_SELECT);
-    pCmd->command = TSDB_SQL_FETCH;
-
-    if ((ret = tscProcessSql(pSql)) != TSDB_CODE_SUCCESS) {
-      pSql->res.code = ret;
-      return;
-    }
-
-    // if the result from current virtual node are empty, try next if exists. otherwise, return the results.
-    if (pRes->numOfRows > 0) {
-      break;
-    }
-  }
-
-  if (pRes->numOfRows == 0) {
-    tscTrace("%p all vnodes exhausted, prj query completed. total res:%d", pSql, totalVnode, pRes->numOfTotal);
+    tscProcessSql(pSql);
+  } else {
+    tscDebug("%p try all %d vnodes, query complete. current numOfRes:%" PRId64, pSql, totalVgroups, pRes->numOfClauseTotal);
   }
 }
 
-void tscTryQueryNextClause(SSqlObj* pSql, void (*queryFp)()) {
+void tscTryQueryNextClause(SSqlObj* pSql, __async_cb_func_t fp) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
 
@@ -2213,23 +2317,94 @@ void tscTryQueryNextClause(SSqlObj* pSql, void (*queryFp)()) {
   pSql->cmd.command = pQueryInfo->command;
 
   //backup the total number of result first
-  int64_t num = pRes->numOfTotal + pRes->numOfTotalInCurrentClause;
-  tscFreeResData(pSql);
+  int64_t num = pRes->numOfTotal + pRes->numOfClauseTotal;
+  tscFreeSqlResult(pSql);
   
   pRes->numOfTotal = num;
   
-  tfree(pSql->pSubs);
+  taosTFree(pSql->pSubs);
   pSql->numOfSubs = 0;
-  
-  if (pSql->fp != NULL) {
-    pSql->fp = queryFp;
-    assert(queryFp != NULL);
-  }
+  pSql->fp = fp;
 
-  tscTrace("%p try data in the next subclause:%d, total subclause:%d", pSql, pCmd->clauseIndex, pCmd->numOfClause);
+  tscDebug("%p try data in the next subclause:%d, total subclause:%d", pSql, pCmd->clauseIndex, pCmd->numOfClause);
   if (pCmd->command > TSDB_SQL_LOCAL) {
     tscProcessLocalCmd(pSql);
   } else {
-    tscProcessSql(pSql);
+    tscDoQuery(pSql);
+  }
+}
+
+void* malloc_throw(size_t size) {
+  void* p = malloc(size);
+  if (p == NULL) {
+    THROW(TSDB_CODE_TSC_OUT_OF_MEMORY);
   }
+  return p;
+}
+
+void* calloc_throw(size_t nmemb, size_t size) {
+  void* p = calloc(nmemb, size);
+  if (p == NULL) {
+    THROW(TSDB_CODE_TSC_OUT_OF_MEMORY);
+  }
+  return p;
+}
+
+char* strdup_throw(const char* str) {
+  char* p = strdup(str);
+  if (p == NULL) {
+    THROW(TSDB_CODE_TSC_OUT_OF_MEMORY);
+  }
+  return p;
+}
+
+int tscSetMgmtEpSetFromCfg(const char *first, const char *second) {
+  // init mgmt ip set 
+  tscMgmtEpSet.version = 0;
+  SRpcEpSet *mgmtEpSet = &(tscMgmtEpSet.epSet);
+  mgmtEpSet->numOfEps = 0;
+  mgmtEpSet->inUse = 0;
+
+  if (first && first[0] != 0) {
+    if (strlen(first) >= TSDB_EP_LEN) {
+      terrno = TSDB_CODE_TSC_INVALID_FQDN;
+      return -1;
+    }
+    taosGetFqdnPortFromEp(first, mgmtEpSet->fqdn[mgmtEpSet->numOfEps], &(mgmtEpSet->port[mgmtEpSet->numOfEps]));
+    mgmtEpSet->numOfEps++;
+  }
+
+  if (second && second[0] != 0) {
+    if (strlen(second) >= TSDB_EP_LEN) {
+      terrno = TSDB_CODE_TSC_INVALID_FQDN;
+      return -1;
+    }
+    taosGetFqdnPortFromEp(second, mgmtEpSet->fqdn[mgmtEpSet->numOfEps], &(mgmtEpSet->port[mgmtEpSet->numOfEps]));
+    mgmtEpSet->numOfEps++;
+  }
+
+  if (mgmtEpSet->numOfEps == 0) {
+    terrno = TSDB_CODE_TSC_INVALID_FQDN;
+    return -1;
+  }
+
+  return 0;
+}
+
+bool tscSetSqlOwner(SSqlObj* pSql) {
+  SSqlRes* pRes = &pSql->res;
+
+  // set the sql object owner
+  uint64_t threadId = taosGetPthreadId();
+  if (atomic_val_compare_exchange_64(&pSql->owner, 0, threadId) != 0) {
+    pRes->code = TSDB_CODE_QRY_IN_EXEC;
+    return false;
+  }
+
+  return true;
+}
+
+void tscClearSqlOwner(SSqlObj* pSql) {
+  assert(taosCheckPthreadValid(pSql->owner));
+  atomic_store_64(&pSql->owner, 0);
 }
diff --git a/src/client/tests/CMakeLists.txt b/src/client/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f07af85e255eaa5e285d9a4ce0853251e0fdaa21
--- /dev/null
+++ b/src/client/tests/CMakeLists.txt
@@ -0,0 +1,15 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)
+FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib)
+
+IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
+    MESSAGE(STATUS "gTest library found, build unit test")
+
+    INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
+    AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+
+    ADD_EXECUTABLE(cliTest ${SOURCE_LIST})
+    TARGET_LINK_LIBRARIES(cliTest taos tutil common gtest pthread)
+ENDIF()
\ No newline at end of file
diff --git a/src/client/tests/timeParseTest.cpp b/src/client/tests/timeParseTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bee01b5cecdf5f42a6cd0105fa6b808a23957012
--- /dev/null
+++ b/src/client/tests/timeParseTest.cpp
@@ -0,0 +1,167 @@
+#include "os.h"
+#include <gtest/gtest.h>
+#include <cassert>
+#include <iostream>
+
+#include "taos.h"
+#include "tstoken.h"
+#include "tutil.h"
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+
+extern void deltaToUtcInitOnce();
+/* test parse time function */
+TEST(testCase, parse_time) {
+  
+  taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
+  deltaToUtcInitOnce();
+  
+  char t1[] = "2018-1-1 1:1:1.952798";
+  char t13[] = "1970-1-1 0:0:0";
+
+  int64_t time = 0, time1 = 0;
+
+  taosParseTime(t1, &time, strlen(t1), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 1514739661952);
+
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, timezone * MILLISECOND_PER_SECOND);
+
+  char t2[] = "2018-1-1T1:1:1.952Z";
+  taosParseTime(t2, &time, strlen(t2), TSDB_TIME_PRECISION_MILLI, 0);
+
+  EXPECT_EQ(time, 1514739661952 + 28800000);
+
+  char t3[] = "2018-1-1 1:01:01.952";
+  taosParseTime(t3, &time, strlen(t3), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 1514739661952);
+
+  char t4[] = "2018-1-1 1:01:01.9";
+  char t5[] = "2018-1-1 1:01:1.900";
+  char t6[] = "2018-01-01 1:1:1.90";
+  char t7[] = "2018-01-01 01:01:01.9";
+  char t8[] = "2018-01-01 01:01:01.9007865";
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t5, &time1, strlen(t5), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t6, &time1, strlen(t6), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t7, &time1, strlen(t7), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t5, &time, strlen(t5), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t8, &time1, strlen(t8), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t9[] = "2017-4-3 1:1:2.980";
+  char t10[] = "2017-4-3T2:1:2.98+9:00";
+  taosParseTime(t9, &time, strlen(t9), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t10, &time1, strlen(t10), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t11[] = "2017-4-3T2:1:2.98+09:00";
+  taosParseTime(t11, &time, strlen(t11), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t10, &time1, strlen(t10), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t12[] = "2017-4-3T2:1:2.98+0900";
+  taosParseTime(t11, &time, strlen(t11), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t12, &time1, strlen(t12), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "UTC");  
+  deltaToUtcInitOnce();
+  
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 0);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Shanghai");
+  deltaToUtcInitOnce();
+  
+  char t14[] = "1970-1-1T0:0:0Z";
+  taosParseTime(t14, &time, strlen(t14), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 0);
+
+  char t40[] = "1970-1-1 0:0:0.999999999";
+  taosParseTime(t40, &time, strlen(t40), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 999 + timezone * MILLISECOND_PER_SECOND);
+
+  char t41[] = "1997-1-1 0:0:0.999999999";
+  taosParseTime(t41, &time, strlen(t41), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 852048000999);
+
+  int64_t k = timezone;
+  char    t42[] = "1997-1-1T0:0:0.999999999Z";
+  taosParseTime(t42, &time, strlen(t42), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 852048000999 - timezone * MILLISECOND_PER_SECOND);
+
+  ////////////////////////////////////////////////////////////////////
+  // illegal timestamp format
+  char t15[] = "2017-12-33 0:0:0";
+  EXPECT_EQ(taosParseTime(t15, &time, strlen(t15), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t16[] = "2017-12-31 99:0:0";
+  EXPECT_EQ(taosParseTime(t16, &time, strlen(t16), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t17[] = "2017-12-31T9:0:0";
+  EXPECT_EQ(taosParseTime(t17, &time, strlen(t17), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t18[] = "2017-12-31T9:0:0.Z";
+  EXPECT_EQ(taosParseTime(t18, &time, strlen(t18), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t19[] = "2017-12-31 9:0:0.-1";
+  EXPECT_EQ(taosParseTime(t19, &time, strlen(t19), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t20[] = "2017-12-31 9:0:0.1+12:99";
+  EXPECT_EQ(taosParseTime(t20, &time, strlen(t20), TSDB_TIME_PRECISION_MILLI, 0), 0);
+  EXPECT_EQ(time, 1514682000100);
+
+  char t21[] = "2017-12-31T9:0:0.1+12:99";
+  EXPECT_EQ(taosParseTime(t21, &time, strlen(t21), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t22[] = "2017-12-31 9:0:0.1+13:1";
+  EXPECT_EQ(taosParseTime(t22, &time, strlen(t22), TSDB_TIME_PRECISION_MILLI, 0), 0);
+
+  char t23[] = "2017-12-31T9:0:0.1+13:1";
+  EXPECT_EQ(taosParseTime(t23, &time, strlen(t23), TSDB_TIME_PRECISION_MILLI, 0), 0);
+
+
+  //======================== add some case ============================//
+  
+  char b1[] = "9999-12-31 23:59:59.999";
+  taosParseTime(b1, &time, strlen(b1), TSDB_TIME_PRECISION_MILLI,0);
+  EXPECT_EQ(time, 253402271999999);
+
+
+  char b2[] = "2020-01-01 01:01:01.321";
+  taosParseTime(b2, &time, strlen(b2), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 1577811661321);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "America/New_York");  
+  deltaToUtcInitOnce();
+  
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 18000 * MILLISECOND_PER_SECOND);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Tokyo");  
+  deltaToUtcInitOnce();
+  
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, -32400 * MILLISECOND_PER_SECOND);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Shanghai");
+  deltaToUtcInitOnce();
+  
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, -28800 * MILLISECOND_PER_SECOND);
+}
+
+
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0da7bda994db83882e36e9d52a7983635ad85330
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,8 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+
+ADD_LIBRARY(common ${SRC})
+TARGET_LINK_LIBRARIES(common tutil)
diff --git a/src/common/inc/tcmdtype.h b/src/common/inc/tcmdtype.h
new file mode 100644
index 0000000000000000000000000000000000000000..69bbccd67e79eb77e3afd0523dec765e53a5cfa1
--- /dev/null
+++ b/src/common/inc/tcmdtype.h
@@ -0,0 +1,115 @@
+/*
+ * 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_TSQLMSGTYPE_H
+#define TDENGINE_TSQLMSGTYPE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// sql type
+
+#ifdef TSDB_SQL_C
+#define TSDB_DEFINE_SQL_TYPE( name, msg ) msg, 
+char *sqlCmd[] = {
+  "null",
+#else
+#define TSDB_DEFINE_SQL_TYPE( name, msg ) name,
+enum {
+  TSDB_SQL_NULL = 0,
+#endif
+
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SELECT, "select" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_FETCH, "fetch" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_INSERT, "insert" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_UPDATE_TAGS_VAL, "update-tag-val" )
+  
+  // the SQL below is for mgmt node
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_MGMT, "mgmt" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_DB, "create-db" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_TABLE, "create-table" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_DB, "drop-db" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_TABLE, "drop-table" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_ACCT, "create-acct" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_USER, "create-user" ) 
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_ACCT, "drop-acct" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_USER, "drop-user" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_USER, "alter-user" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_ACCT, "alter-acct" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_TABLE, "alter-table" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_DB, "alter-db" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_MNODE, "create-mnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_MNODE, "drop-mnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_DNODE, "create-dnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_DNODE, "drop-dnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CFG_DNODE, "cfg-dnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CFG_MNODE, "cfg-mnode" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SHOW, "show" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_RETRIEVE, "retrieve" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_QUERY, "kill-query" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_STREAM, "kill-stream" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_CONNECTION, "kill-connection" )
+
+  // SQL below is for read operation
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_READ, "read" )  
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CONNECT, "connect" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_USE_DB, "use-db" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_META, "meta" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_STABLEVGROUP, "stable-vgroup" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_MULTI_META, "multi-meta" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_HB, "heart-beat" )
+
+  // SQL below for client local 
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_LOCAL, "local" ) 
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DESCRIBE_TABLE, "describe-table" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_RETRIEVE_LOCALMERGE, "retrieve-localmerge" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_TABLE_JOIN_RETRIEVE, "join-retrieve" )
+
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SHOW_CREATE_TABLE, "show-create-table")
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SHOW_CREATE_DATABASE, "show-create-database")
+
+  /*
+   * build empty result instead of accessing dnode to fetch result
+   * reset the client cache
+   */
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_RETRIEVE_EMPTY_RESULT, "retrieve-empty-result" )
+
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_RESET_CACHE, "reset-cache" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SERV_STATUS, "serv-status" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CURRENT_DB, "current-db" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SERV_VERSION, "serv-version" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CLI_VERSION, "cli-version" )
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CURRENT_USER, "current-user ")
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CFG_LOCAL, "cfg-local" )
+
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_MAX, "max" )
+};
+
+// create table operation type
+enum TSQL_TYPE {
+  TSQL_CREATE_TABLE = 0x1,
+  TSQL_CREATE_STABLE = 0x2,
+  TSQL_CREATE_TABLE_FROM_STABLE = 0x3,
+  TSQL_CREATE_STREAM = 0x4,
+};
+
+extern char *sqlCmd[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSQLMSGTYPE_H
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
new file mode 100644
index 0000000000000000000000000000000000000000..cc4afeb3f850785ffb18a972961668f91061c6a4
--- /dev/null
+++ b/src/common/inc/tdataformat.h
@@ -0,0 +1,358 @@
+/*
+ * 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 _TD_DATA_FORMAT_H_
+#define _TD_DATA_FORMAT_H_
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "talgo.h"
+#include "taosdef.h"
+#include "tutil.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define STR_TO_VARSTR(x, str)             \
+  do {                                    \
+    VarDataLenT __len = strlen(str);      \
+    *(VarDataLenT *)(x) = __len;          \
+    memcpy(varDataVal(x), (str), __len); \
+  } while (0);
+
+#define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs)      \
+  do {                                                 \
+    char *_e = stpncpy(varDataVal(x), (str), (_maxs)-VARSTR_HEADER_SIZE); \
+    varDataSetLen(x, (_e - (x)-VARSTR_HEADER_SIZE));   \
+  } while (0)
+
+#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) \
+  do {                                         \
+    *(VarDataLenT *)(x) = (_size);             \
+    memcpy(varDataVal(x), (str), (_size));    \
+  } while (0);
+
+// ----------------- TSDB COLUMN DEFINITION
+typedef struct {
+  int8_t  type;    // Column type
+  int16_t colId;   // column ID
+  int16_t bytes;   // column bytes
+  int16_t offset;  // point offset in SDataRow after the header part
+} STColumn;
+
+#define colType(col) ((col)->type)
+#define colColId(col) ((col)->colId)
+#define colBytes(col) ((col)->bytes)
+#define colOffset(col) ((col)->offset)
+
+#define colSetType(col, t) (colType(col) = (t))
+#define colSetColId(col, id) (colColId(col) = (id))
+#define colSetBytes(col, b) (colBytes(col) = (b))
+#define colSetOffset(col, o) (colOffset(col) = (o))
+
+// ----------------- TSDB SCHEMA DEFINITION
+typedef struct {
+  int      version;    // version
+  int      numOfCols;  // Number of columns appended
+  int      tlen;       // maximum length of a SDataRow without the header part
+  uint16_t flen;       // First part length in a SDataRow after the header part
+  uint16_t vlen;       // pure value part length, excluded the overhead
+  STColumn columns[];
+} STSchema;
+
+#define schemaNCols(s) ((s)->numOfCols)
+#define schemaVersion(s) ((s)->version)
+#define schemaTLen(s) ((s)->tlen)
+#define schemaFLen(s) ((s)->flen)
+#define schemaVLen(s) ((s)->vlen)
+#define schemaColAt(s, i) ((s)->columns + i)
+#define tdFreeSchema(s) taosTFree((s))
+
+STSchema *tdDupSchema(STSchema *pSchema);
+int       tdEncodeSchema(void **buf, STSchema *pSchema);
+void *    tdDecodeSchema(void *buf, STSchema **pRSchema);
+
+static FORCE_INLINE int comparColId(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 > ((STColumn *)key2)->colId) {
+    return 1;
+  } else if (*(int16_t *)key1 < ((STColumn *)key2)->colId) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) {
+  void *ptr = bsearch(&colId, (void *)pSchema->columns, schemaNCols(pSchema), sizeof(STColumn), comparColId);
+  if (ptr == NULL) return NULL;
+  return (STColumn *)ptr;
+}
+
+// ----------------- SCHEMA BUILDER DEFINITION
+typedef struct {
+  int       tCols;
+  int       nCols;
+  int       tlen;
+  uint16_t  flen;
+  uint16_t  vlen;
+  int       version;
+  STColumn *columns;
+} STSchemaBuilder;
+
+int       tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+void      tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
+void      tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+int       tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes);
+STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
+
+// ----------------- Data row structure
+
+/* A data row, the format is like below:
+ * |<--------------------+--------------------------- len ---------------------------------->|
+ * |<--     Head      -->|<---------   flen -------------->|                                 |
+ * +---------------------+---------------------------------+---------------------------------+
+ * | uint16_t |  int16_t |                                 |                                 |
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |   len    | sversion |           First part            |             Second part         |
+ * +----------+----------+---------------------------------+---------------------------------+
+ */
+typedef void *SDataRow;
+
+#define TD_DATA_ROW_HEAD_SIZE (sizeof(uint16_t) + sizeof(int16_t))
+
+#define dataRowLen(r) (*(uint16_t *)(r))
+#define dataRowVersion(r) *(int16_t *)POINTER_SHIFT(r, sizeof(int16_t))
+#define dataRowTuple(r) POINTER_SHIFT(r, TD_DATA_ROW_HEAD_SIZE)
+#define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
+#define dataRowSetLen(r, l) (dataRowLen(r) = (l))
+#define dataRowSetVersion(r, v) (dataRowVersion(r) = (v))
+#define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
+#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE)
+
+SDataRow tdNewDataRowFromSchema(STSchema *pSchema);
+void     tdFreeDataRow(SDataRow row);
+void     tdInitDataRow(SDataRow row, STSchema *pSchema);
+SDataRow tdDataRowDup(SDataRow row);
+
+// offset here not include dataRow header length
+static FORCE_INLINE int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_t offset) {
+  ASSERT(value != NULL);
+  int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE;
+  char *  ptr = (char *)POINTER_SHIFT(row, dataRowLen(row));
+
+  switch (type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      *(VarDataOffsetT *)POINTER_SHIFT(row, toffset) = dataRowLen(row);
+      memcpy(ptr, value, varDataTLen(value));
+      dataRowLen(row) += varDataTLen(value);
+      break;
+    default:
+      memcpy(POINTER_SHIFT(row, toffset), value, TYPE_BYTES[type]);
+      break;
+  }
+
+  return 0;
+}
+
+// NOTE: offset here including the header size
+static FORCE_INLINE void *tdGetRowDataOfCol(SDataRow row, int8_t type, int32_t offset) {
+  switch (type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      return POINTER_SHIFT(row, *(VarDataOffsetT *)POINTER_SHIFT(row, offset));
+    default:
+      return POINTER_SHIFT(row, offset);
+  }
+}
+
+// ----------------- Data column structure
+typedef struct SDataCol {
+  int8_t          type;       // column type
+  int16_t         colId;      // column ID
+  int             bytes;      // column data bytes defined
+  int             offset;     // data offset in a SDataRow (including the header size)
+  int             spaceSize;  // Total space size for this column
+  int             len;        // column data length
+  VarDataOffsetT *dataOff;    // For binary and nchar data, the offset in the data column
+  void *          pData;      // Actual data pointer
+} SDataCol;
+
+static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; }
+
+void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints);
+void dataColAppendVal(SDataCol *pCol, void *value, int numOfRows, int maxPoints);
+void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfRows);
+void dataColSetOffset(SDataCol *pCol, int nEle);
+
+bool isNEleNull(SDataCol *pCol, int nEle);
+void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints);
+
+// Get the data pointer from a column-wised data
+static FORCE_INLINE void *tdGetColDataOfRow(SDataCol *pCol, int row) {
+  switch (pCol->type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      return POINTER_SHIFT(pCol->pData, pCol->dataOff[row]);
+      break;
+
+    default:
+      return POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * row);
+      break;
+  }
+}
+
+static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) {
+  ASSERT(rows > 0);
+
+  switch (pDataCol->type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      return pDataCol->dataOff[rows - 1] + varDataTLen(tdGetColDataOfRow(pDataCol, rows - 1));
+      break;
+    default:
+      return TYPE_BYTES[pDataCol->type] * rows;
+  }
+}
+
+typedef struct {
+  int maxRowSize;
+  int maxCols;    // max number of columns
+  int maxPoints;  // max number of points
+  int bufSize;
+
+  int       numOfRows;
+  int       numOfCols;  // Total number of cols
+  int       sversion;   // TODO: set sversion
+  void *    buf;
+  SDataCol *cols;
+} SDataCols;
+
+#define keyCol(pCols) (&((pCols)->cols[0]))  // Key column
+#define dataColsKeyAt(pCols, idx) ((TSKEY *)(keyCol(pCols)->pData))[(idx)]
+#define dataColsKeyFirst(pCols) dataColsKeyAt(pCols, 0)
+#define dataColsKeyLast(pCols) ((pCols->numOfRows == 0) ? 0 : dataColsKeyAt(pCols, (pCols)->numOfRows - 1))
+
+SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows);
+void       tdResetDataCols(SDataCols *pCols);
+int        tdInitDataCols(SDataCols *pCols, STSchema *pSchema);
+SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData);
+void       tdFreeDataCols(SDataCols *pCols);
+void       tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols);
+void       tdPopDataColsPoints(SDataCols *pCols, int pointsToPop);  //!!!!
+int        tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge);
+void       tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, int limit1, SDataCols *src2, int *iter2,
+                              int limit2, int tRows);
+
+// ----------------- K-V data row structure
+/*
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |  int16_t |  int16_t |                                 |                                 |
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |    len   |   ncols  |           cols index            |             data part           |
+ * +----------+----------+---------------------------------+---------------------------------+
+ */
+typedef void *SKVRow;
+
+typedef struct {
+  int16_t colId;
+  int16_t offset;
+} SColIdx;
+
+#define TD_KV_ROW_HEAD_SIZE (2 * sizeof(int16_t))
+
+#define kvRowLen(r) (*(int16_t *)(r))
+#define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
+#define kvRowSetLen(r, len) kvRowLen(r) = (len)
+#define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
+#define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
+#define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
+#define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
+#define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
+#define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
+#define kvRowFree(r) taosTFree(r)
+#define kvRowEnd(r) POINTER_SHIFT(r, kvRowLen(r))
+
+SKVRow tdKVRowDup(SKVRow row);
+int    tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value);
+int    tdEncodeKVRow(void **buf, SKVRow row);
+void * tdDecodeKVRow(void *buf, SKVRow *row);
+void   tdSortKVRowByColIdx(SKVRow row);
+
+static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
+    return 1;
+  } else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE void *tdGetKVRowValOfCol(SKVRow row, int16_t colId) {
+  void *ret = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
+  if (ret == NULL) return NULL;
+  return kvRowColVal(row, (SColIdx *)ret);
+}
+
+// ----------------- K-V data row builder
+typedef struct {
+  int16_t  tCols;
+  int16_t  nCols;
+  SColIdx *pColIdx;
+  int16_t  alloc;
+  int16_t  size;
+  void *   buf;
+} SKVRowBuilder;
+
+int    tdInitKVRowBuilder(SKVRowBuilder *pBuilder);
+void   tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder);
+void   tdResetKVRowBuilder(SKVRowBuilder *pBuilder);
+SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
+
+static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
+  if (pBuilder->nCols >= pBuilder->tCols) {
+    pBuilder->tCols *= 2;
+    pBuilder->pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols);
+    if (pBuilder->pColIdx == NULL) return -1;
+  }
+
+  pBuilder->pColIdx[pBuilder->nCols].colId = colId;
+  pBuilder->pColIdx[pBuilder->nCols].offset = pBuilder->size;
+
+  pBuilder->nCols++;
+
+  int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
+  if (tlen > pBuilder->alloc - pBuilder->size) {
+    while (tlen > pBuilder->alloc - pBuilder->size) {
+      pBuilder->alloc *= 2;
+    }
+    pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
+    if (pBuilder->buf == NULL) return -1;
+  }
+
+  memcpy(POINTER_SHIFT(pBuilder->buf, pBuilder->size), value, tlen);
+  pBuilder->size += tlen;
+
+  return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _TD_DATA_FORMAT_H_
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
new file mode 100644
index 0000000000000000000000000000000000000000..798e2654555c9e7ed9ff88c6da10b4a20841b718
--- /dev/null
+++ b/src/common/inc/tglobal.h
@@ -0,0 +1,193 @@
+/*
+ * 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_COMMON_GLOBAL_H
+#define TDENGINE_COMMON_GLOBAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// cluster
+extern char     tsFirst[];
+extern char     tsSecond[];
+extern char     tsLocalFqdn[];
+extern char     tsLocalEp[];
+extern uint16_t tsServerPort;
+extern uint16_t tsDnodeShellPort;
+extern uint16_t tsDnodeDnodePort;
+extern uint16_t tsSyncPort;
+extern uint16_t tsArbitratorPort;
+extern int32_t  tsStatusInterval;
+extern int32_t  tsNumOfMnodes;
+extern int32_t  tsEnableVnodeBak;
+extern int32_t  tsEnableTelemetryReporting;
+
+// common
+extern int      tsRpcTimer;
+extern int      tsRpcMaxTime;
+extern int32_t  tsMaxConnections;
+extern int32_t  tsMaxShellConns;
+extern int32_t  tsShellActivityTimer;
+extern uint32_t tsMaxTmrCtrl;
+extern float    tsNumOfThreadsPerCore;
+extern float    tsRatioOfQueryThreads;
+extern int8_t   tsDaylight;
+extern char     tsTimezone[];
+extern char     tsLocale[];
+extern char     tsCharset[];  // default encode string
+extern int32_t  tsEnableCoreFile;
+extern int32_t  tsCompressMsgSize;
+
+// client
+extern int32_t tsTableMetaKeepTimer;
+extern int32_t tsMaxSQLStringLen;
+extern int32_t tsTscEnableRecordSql;
+extern int32_t tsMaxNumOfOrderedResults;
+extern int32_t tsMinSlidingTime;
+extern int32_t tsMinIntervalTime;
+extern int32_t tsMaxStreamComputDelay;
+extern int32_t tsStreamCompStartDelay;
+extern int32_t tsStreamCompRetryDelay;
+extern float   tsStreamComputDelayRatio;  // the delayed computing ration of the whole time window
+extern int32_t tsProjectExecInterval;
+extern int64_t tsMaxRetentWindow;
+
+// db parameters in client
+extern int32_t tsCacheBlockSize;
+extern int32_t tsBlocksPerVnode;
+extern int32_t tsMinTablePerVnode;
+extern int32_t tsMaxTablePerVnode;
+extern int32_t tsTableIncStepPerVnode;
+extern int32_t tsMaxVgroupsPerDb;
+extern int16_t tsDaysPerFile;
+extern int32_t tsDaysToKeep;
+extern int32_t tsMinRowsInFileBlock;
+extern int32_t tsMaxRowsInFileBlock;
+extern int16_t tsCommitTime;  // seconds
+extern int32_t tsTimePrecision;
+extern int16_t tsCompression;
+extern int16_t tsWAL;
+extern int32_t tsFsyncPeriod;
+extern int32_t tsReplications;
+extern int32_t tsQuorum;
+
+// balance
+extern int32_t tsEnableBalance;
+extern int32_t tsAlternativeRole;
+extern int32_t tsBalanceInterval;
+extern int32_t tsOfflineThreshold;
+extern int32_t tsMnodeEqualVnodeNum;
+
+// restful
+extern int32_t  tsEnableHttpModule;
+extern int32_t  tsRestRowLimit;
+extern uint16_t tsHttpPort;
+extern int32_t  tsHttpCacheSessions;
+extern int32_t  tsHttpSessionExpire;
+extern int32_t  tsHttpMaxThreads;
+extern int32_t  tsHttpEnableCompress;
+extern int32_t  tsHttpEnableRecordSql;
+extern int32_t  tsTelegrafUseFieldNum;
+
+// mqtt
+extern int32_t tsEnableMqttModule;
+extern char tsMqttHostName[];
+extern char tsMqttPort[];
+extern char tsMqttUser[];
+extern char tsMqttPass[];
+extern char tsMqttClientId[];
+extern char tsMqttTopic[];
+
+// monitor
+extern int32_t tsEnableMonitorModule;
+extern char    tsMonitorDbName[];
+extern char    tsInternalPass[];
+extern int32_t tsMonitorInterval;
+
+// internal
+extern int32_t tsPrintAuth;
+extern int32_t tscEmbedded;
+extern char    configDir[];
+extern char    tsVnodeDir[];
+extern char    tsDnodeDir[];
+extern char    tsMnodeDir[];
+extern char    tsDataDir[];
+extern char    tsLogDir[];
+extern char    tsScriptDir[];
+extern int64_t tsMsPerDay[3];
+extern char    tsVnodeBakDir[];
+
+// system info
+extern char    tsOsName[];
+extern int64_t tsPageSize;
+extern int64_t tsOpenMax;
+extern int64_t tsStreamMax;
+extern int32_t tsNumOfCores;
+extern float   tsTotalLogDirGB;
+extern float   tsTotalTmpDirGB;
+extern float   tsTotalDataDirGB;
+extern float   tsAvailLogDirGB;
+extern float   tsAvailTmpDirectorySpace;
+extern float   tsAvailDataDirGB;
+extern float   tsMinimalLogDirGB;
+extern float   tsReservedTmpDirectorySpace;
+extern float   tsMinimalDataDirGB;
+extern int32_t tsTotalMemoryMB;
+extern int32_t tsVersion;
+
+// build info
+extern char version[];
+extern char compatible_version[];
+extern char gitinfo[];
+extern char gitinfoOfInternal[];
+extern char buildinfo[];
+
+// log
+extern int32_t tsAsyncLog;
+extern int32_t tsNumOfLogLines;
+extern int32_t tsLogKeepDays;
+extern int32_t dDebugFlag;
+extern int32_t vDebugFlag;
+extern int32_t mDebugFlag;
+extern int32_t cDebugFlag;
+extern int32_t jniDebugFlag;
+extern int32_t tmrDebugFlag;
+extern int32_t sdbDebugFlag;
+extern int32_t httpDebugFlag;
+extern int32_t mqttDebugFlag;
+extern int32_t monitorDebugFlag;
+extern int32_t uDebugFlag;
+extern int32_t rpcDebugFlag;
+extern int32_t odbcDebugFlag;
+extern int32_t qDebugFlag;
+extern int32_t wDebugFlag;
+extern int32_t cqDebugFlag;
+extern int32_t debugFlag;
+
+#define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
+
+void taosInitGlobalCfg();
+bool taosCheckGlobalCfg();
+void taosSetAllDebugFlag();
+bool taosCfgDynamicOptions(char *msg);
+int  taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port);
+bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId);
+ 
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/common/inc/tlocale.h b/src/common/inc/tlocale.h
new file mode 100644
index 0000000000000000000000000000000000000000..91ae3866226e65cc305b03338075380b3949dd96
--- /dev/null
+++ b/src/common/inc/tlocale.h
@@ -0,0 +1,29 @@
+/*
+ * 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_COMMON_LOCALE_H
+#define TDENGINE_COMMON_LOCALE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void tsSetLocale();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/common/inc/tname.h b/src/common/inc/tname.h
new file mode 100644
index 0000000000000000000000000000000000000000..6b73d98b81fa8cbcce8d322f566d8b6709396f1c
--- /dev/null
+++ b/src/common/inc/tname.h
@@ -0,0 +1,40 @@
+#ifndef TDENGINE_NAME_H
+#define TDENGINE_NAME_H
+
+#include "os.h"
+#include "taosmsg.h"
+#include "tstoken.h"
+#include "tvariant.h"
+
+typedef struct SDataStatis {
+  int16_t colId;
+  int64_t sum;
+  int64_t max;
+  int64_t min;
+  int16_t maxIndex;
+  int16_t minIndex;
+  int16_t numOfNull;
+} SDataStatis;
+
+typedef struct SColumnInfoData {
+  SColumnInfo info;
+  void* pData;    // the corresponding block data in memory
+} SColumnInfoData;
+
+void extractTableName(const char *tableId, char *name);
+
+char* extractDBName(const char *tableId, char *name);
+
+void extractTableNameFromToken(SStrToken *pToken, SStrToken* pTable);
+
+SSchema tGetTableNameColumnSchema();
+
+SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const char* name);
+
+bool tscValidateTableNameLength(size_t len);
+
+SColumnFilterInfo* tscFilterInfoClone(const SColumnFilterInfo* src, int32_t numOfFilters);
+
+// int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t slidingTime, int64_t intervalTime, char timeUnit, int16_t precision);
+
+#endif  // TDENGINE_NAME_H
diff --git a/src/common/inc/tsystem.h b/src/common/inc/tsystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..93d305e49c6707e7c567a2fbca94b652067f421a
--- /dev/null
+++ b/src/common/inc/tsystem.h
@@ -0,0 +1,38 @@
+/*
+ * 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_TSYSTEM_H
+#define TDENGINE_TSYSTEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool taosGetSysMemory(float *memoryUsedMB);
+bool taosGetProcMemory(float *memoryUsedMB);
+bool taosGetDisk();
+bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage);
+bool taosGetBandSpeed(float *bandSpeedKb);
+bool taosGetProcIO(float *readKB, float *writeKB);
+void taosGetSystemInfo();
+void taosPrintOsInfo();
+void taosKillSystem();
+void taosSetCoreDump();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/common/inc/ttimezone.h b/src/common/inc/ttimezone.h
new file mode 100644
index 0000000000000000000000000000000000000000..0ae983dba054739bdd8521dfb2e1f6447205014c
--- /dev/null
+++ b/src/common/inc/ttimezone.h
@@ -0,0 +1,29 @@
+/*
+ * 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_COMMON_TIMEZONE_H
+#define TDENGINE_COMMON_TIMEZONE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void tsSetTimeZone();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/common/inc/tulog.h b/src/common/inc/tulog.h
new file mode 100644
index 0000000000000000000000000000000000000000..2dc2895e6324053992b5cbdcad5486071b68dbc9
--- /dev/null
+++ b/src/common/inc/tulog.h
@@ -0,0 +1,42 @@
+/*
+ * 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_COMMON_ULOG_H
+#define TDENGINE_COMMON_ULOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+
+extern int32_t uDebugFlag;
+extern int32_t tscEmbedded;
+
+#define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
+#define uError(...) { if (uDebugFlag & DEBUG_ERROR) { taosPrintLog("UTL ERROR ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
+#define uWarn(...)  { if (uDebugFlag & DEBUG_WARN)  { taosPrintLog("UTL WARN ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
+#define uInfo(...)  { if (uDebugFlag & DEBUG_INFO)  { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }}
+#define uDebug(...) { if (uDebugFlag & DEBUG_DEBUG) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
+#define uTrace(...) { if (uDebugFlag & DEBUG_TRACE) { taosPrintLog("UTL ", uDebugFlag, __VA_ARGS__); }}
+
+#define pError(...) { taosPrintLog("APP ERROR ", 255, __VA_ARGS__); }  
+#define pPrint(...) { taosPrintLog("APP ", 255, __VA_ARGS__); }  
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/common/inc/tvariant.h b/src/common/inc/tvariant.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9973bcb9595c5ace0b4cb20f2d8776a5cf05501
--- /dev/null
+++ b/src/common/inc/tvariant.h
@@ -0,0 +1,61 @@
+/*
+ * 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_TVARIANT_H
+#define TDENGINE_TVARIANT_H
+
+#include "tstoken.h"
+#include "tarray.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// variant, each number/string/field_id has a corresponding struct during parsing sql
+typedef struct tVariant {
+  uint32_t nType;
+  int32_t  nLen;  // only used for string, for number, it is useless
+  union {
+    int64_t  i64Key;
+    double   dKey;
+    char *   pz;
+    wchar_t *wpz;
+    SArray  *arr; // only for 'in' query to hold value list, not value for a field
+  };
+} tVariant;
+
+void tVariantCreate(tVariant *pVar, SStrToken *token);
+
+void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
+
+void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32_t type);
+
+void tVariantDestroy(tVariant *pV);
+
+void tVariantAssign(tVariant *pDst, const tVariant *pSrc);
+
+int32_t tVariantCompare(const tVariant* p1, const tVariant* p2);
+
+int32_t tVariantToString(tVariant *pVar, char *dst);
+
+int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix);
+
+int32_t tVariantTypeSetType(tVariant *pVariant, char type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TVARIANT_H
diff --git a/src/common/src/sqlcmdstr.c b/src/common/src/sqlcmdstr.c
new file mode 100644
index 0000000000000000000000000000000000000000..672106523e7c7eab8c606db1940dd9485e7f4c8f
--- /dev/null
+++ b/src/common/src/sqlcmdstr.c
@@ -0,0 +1,18 @@
+/*
+ * 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/>.
+ */
+
+#define TSDB_SQL_C
+
+#include "tcmdtype.h"
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7f40442a0b18c07193a10db61452c820e603473
--- /dev/null
+++ b/src/common/src/tdataformat.c
@@ -0,0 +1,719 @@
+/*
+ * 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 "tdataformat.h"
+#include "tulog.h"
+#include "talgo.h"
+#include "tcoding.h"
+#include "wchar.h"
+
+/**
+ * Duplicate the schema and return a new object
+ */
+STSchema *tdDupSchema(STSchema *pSchema) {
+
+  int tlen = sizeof(STSchema) + sizeof(STColumn) * schemaNCols(pSchema);
+  STSchema *tSchema = (STSchema *)malloc(tlen);
+  if (tSchema == NULL) return NULL;
+
+  memcpy((void *)tSchema, (void *)pSchema, tlen);
+
+  return tSchema;
+}
+
+/**
+ * Encode a schema to dst, and return the next pointer
+ */
+int tdEncodeSchema(void **buf, STSchema *pSchema) {
+  int tlen = 0;
+  tlen += taosEncodeFixedI32(buf, schemaVersion(pSchema));
+  tlen += taosEncodeFixedI32(buf, schemaNCols(pSchema));
+
+  for (int i = 0; i < schemaNCols(pSchema); i++) {
+    STColumn *pCol = schemaColAt(pSchema, i);
+    tlen += taosEncodeFixedI8(buf, colType(pCol));
+    tlen += taosEncodeFixedI16(buf, colColId(pCol));
+    tlen += taosEncodeFixedI16(buf, colBytes(pCol));
+  }
+
+  return tlen;
+}
+
+/**
+ * Decode a schema from a binary.
+ */
+void *tdDecodeSchema(void *buf, STSchema **pRSchema) {
+  int version = 0;
+  int numOfCols = 0;
+  STSchemaBuilder schemaBuilder;
+
+  buf = taosDecodeFixedI32(buf, &version);
+  buf = taosDecodeFixedI32(buf, &numOfCols);
+
+  if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL;
+
+  for (int i = 0; i < numOfCols; i++) {
+    int8_t  type = 0;
+    int16_t colId = 0;
+    int16_t bytes = 0;
+    buf = taosDecodeFixedI8(buf, &type);
+    buf = taosDecodeFixedI16(buf, &colId);
+    buf = taosDecodeFixedI16(buf, &bytes);
+    if (tdAddColToSchema(&schemaBuilder, type, colId, bytes) < 0) {
+      tdDestroyTSchemaBuilder(&schemaBuilder);
+      return NULL;
+    }
+  }
+
+  *pRSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+  return buf;
+}
+
+int tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version) {
+  if (pBuilder == NULL) return -1;
+
+  pBuilder->tCols = 256;
+  pBuilder->columns = (STColumn *)malloc(sizeof(STColumn) * pBuilder->tCols);
+  if (pBuilder->columns == NULL) return -1;
+
+  tdResetTSchemaBuilder(pBuilder, version);
+  return 0;
+}
+
+void tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder) {
+  if (pBuilder) {
+    taosTFree(pBuilder->columns);
+  }
+}
+
+void tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version) {
+  pBuilder->nCols = 0;
+  pBuilder->tlen = 0;
+  pBuilder->flen = 0;
+  pBuilder->vlen = 0;
+  pBuilder->version = version;
+}
+
+int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes) {
+  if (!isValidDataType(type)) return -1;
+
+  if (pBuilder->nCols >= pBuilder->tCols) {
+    pBuilder->tCols *= 2;
+    pBuilder->columns = (STColumn *)realloc(pBuilder->columns, sizeof(STColumn) * pBuilder->tCols);
+    if (pBuilder->columns == NULL) return -1;
+  }
+
+  STColumn *pCol = &(pBuilder->columns[pBuilder->nCols]);
+  colSetType(pCol, type);
+  colSetColId(pCol, colId);
+  if (pBuilder->nCols == 0) {
+    colSetOffset(pCol, 0);
+  } else {
+    STColumn *pTCol = &(pBuilder->columns[pBuilder->nCols-1]);
+    colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]);
+  }
+
+  if (IS_VAR_DATA_TYPE(type)) {
+    colSetBytes(pCol, bytes);
+    pBuilder->tlen += (TYPE_BYTES[type] + bytes);
+    pBuilder->vlen += bytes - sizeof(VarDataLenT);
+  } else {
+    colSetBytes(pCol, TYPE_BYTES[type]);
+    pBuilder->tlen += TYPE_BYTES[type];
+    pBuilder->vlen += TYPE_BYTES[type];
+  }
+
+  pBuilder->nCols++;
+  pBuilder->flen += TYPE_BYTES[type];
+
+  ASSERT(pCol->offset < pBuilder->flen);
+
+  return 0;
+}
+
+STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder) {
+  if (pBuilder->nCols <= 0) return NULL;
+
+  int tlen = sizeof(STSchema) + sizeof(STColumn) * pBuilder->nCols;
+
+  STSchema *pSchema = (STSchema *)malloc(tlen);
+  if (pSchema == NULL) return NULL;
+
+  schemaVersion(pSchema) = pBuilder->version;
+  schemaNCols(pSchema) = pBuilder->nCols;
+  schemaTLen(pSchema) = pBuilder->tlen;
+  schemaFLen(pSchema) = pBuilder->flen;
+  schemaVLen(pSchema) = pBuilder->vlen;
+
+  memcpy(schemaColAt(pSchema, 0), pBuilder->columns, sizeof(STColumn) * pBuilder->nCols);
+
+  return pSchema;
+}
+
+/**
+ * Initialize a data row
+ */
+void tdInitDataRow(SDataRow row, STSchema *pSchema) {
+  dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + schemaFLen(pSchema));
+  dataRowSetVersion(row, schemaVersion(pSchema));
+}
+
+SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
+  int32_t size = dataRowMaxBytesFromSchema(pSchema);
+
+  SDataRow row = malloc(size);
+  if (row == NULL) return NULL;
+
+  tdInitDataRow(row, pSchema);
+  return row;
+}
+
+/**
+ * Free the SDataRow object
+ */
+void tdFreeDataRow(SDataRow row) {
+  if (row) free(row);
+}
+
+SDataRow tdDataRowDup(SDataRow row) {
+  SDataRow trow = malloc(dataRowLen(row));
+  if (trow == NULL) return NULL;
+
+  dataRowCpy(trow, row);
+  return trow;
+}
+
+void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints) {
+  pDataCol->type = colType(pCol);
+  pDataCol->colId = colColId(pCol);
+  pDataCol->bytes = colBytes(pCol);
+  pDataCol->offset = colOffset(pCol) + TD_DATA_ROW_HEAD_SIZE;
+
+  pDataCol->len = 0;
+  if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+    pDataCol->dataOff = (VarDataOffsetT *)(*pBuf);
+    pDataCol->pData = POINTER_SHIFT(*pBuf, sizeof(VarDataOffsetT) * maxPoints);
+    pDataCol->spaceSize = pDataCol->bytes * maxPoints;
+    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize + sizeof(VarDataOffsetT) * maxPoints);
+  } else {
+    pDataCol->spaceSize = pDataCol->bytes * maxPoints;
+    pDataCol->dataOff = NULL;
+    pDataCol->pData = *pBuf;
+    *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize);
+  }
+}
+
+void dataColAppendVal(SDataCol *pCol, void *value, int numOfRows, int maxPoints) {
+  ASSERT(pCol != NULL && value != NULL);
+
+  switch (pCol->type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      // set offset
+      pCol->dataOff[numOfRows] = pCol->len;
+      // Copy data
+      memcpy(POINTER_SHIFT(pCol->pData, pCol->len), value, varDataTLen(value));
+      // Update the length
+      pCol->len += varDataTLen(value);
+      break;
+    default:
+      ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfRows);
+      memcpy(POINTER_SHIFT(pCol->pData, pCol->len), value, pCol->bytes);
+      pCol->len += pCol->bytes;
+      break;
+  }
+}
+
+void dataColPopPoints(SDataCol *pCol, int pointsToPop, int numOfRows) {
+  int pointsLeft = numOfRows - pointsToPop;
+
+  ASSERT(pointsLeft > 0);
+
+  if (pCol->type == TSDB_DATA_TYPE_BINARY || pCol->type == TSDB_DATA_TYPE_NCHAR) {
+    ASSERT(pCol->len > 0);
+    VarDataOffsetT toffset = pCol->dataOff[pointsToPop];
+    pCol->len = pCol->len - toffset;
+    ASSERT(pCol->len > 0);
+    memmove(pCol->pData, POINTER_SHIFT(pCol->pData, toffset), pCol->len);
+    dataColSetOffset(pCol, pointsLeft);
+  } else {
+    ASSERT(pCol->len == TYPE_BYTES[pCol->type] * numOfRows);
+    pCol->len = TYPE_BYTES[pCol->type] * pointsLeft;
+    memmove(pCol->pData, POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * pointsToPop), pCol->len);
+  }
+}
+
+bool isNEleNull(SDataCol *pCol, int nEle) {
+  switch (pCol->type) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      for (int i = 0; i < nEle; i++) {
+        if (!isNull(tdGetColDataOfRow(pCol, i), pCol->type)) return false;
+      }
+      return true;
+    default:
+      for (int i = 0; i < nEle; i++) {
+        if (!isNull(tdGetColDataOfRow(pCol, i), pCol->type)) return false;
+      }
+      return true;
+  }
+}
+
+void dataColSetNullAt(SDataCol *pCol, int index) {
+  if (IS_VAR_DATA_TYPE(pCol->type)) {
+    pCol->dataOff[index] = pCol->len;
+    char *ptr = POINTER_SHIFT(pCol->pData, pCol->len);
+    setVardataNull(ptr, pCol->type);
+    pCol->len += varDataTLen(ptr);
+  } else {
+    setNull(POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * index), pCol->type, pCol->bytes);
+    pCol->len += TYPE_BYTES[pCol->type];
+  }
+}
+
+void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) {
+
+  if (IS_VAR_DATA_TYPE(pCol->type)) {
+    pCol->len = 0;
+    for (int i = 0; i < nEle; i++) {
+      dataColSetNullAt(pCol, i);
+    }
+  } else {
+    setNullN(pCol->pData, pCol->type, pCol->bytes, nEle);
+    pCol->len = TYPE_BYTES[pCol->type] * nEle;
+  }
+}
+
+void dataColSetOffset(SDataCol *pCol, int nEle) {
+  ASSERT(((pCol->type == TSDB_DATA_TYPE_BINARY) || (pCol->type == TSDB_DATA_TYPE_NCHAR)));
+
+  void *tptr = pCol->pData;
+  // char *tptr = (char *)(pCol->pData);
+
+  VarDataOffsetT offset = 0;
+  for (int i = 0; i < nEle; i++) {
+    pCol->dataOff[i] = offset;
+    offset += varDataTLen(tptr);
+    tptr = POINTER_SHIFT(tptr, varDataTLen(tptr));
+  }
+}
+
+SDataCols *tdNewDataCols(int maxRowSize, int maxCols, int maxRows) {
+  SDataCols *pCols = (SDataCols *)calloc(1, sizeof(SDataCols));
+  if (pCols == NULL) {
+    uDebug("malloc failure, size:%"PRId64" failed, reason:%s", sizeof(SDataCols), strerror(errno));
+    return NULL;
+  }
+
+  pCols->cols = (SDataCol *)calloc(maxCols, sizeof(SDataCol));
+  if (pCols->cols == NULL) {
+    uDebug("malloc failure, size:%"PRId64" failed, reason:%s", sizeof(SDataCol) * maxCols, strerror(errno));
+    tdFreeDataCols(pCols);
+    return NULL;
+  }
+
+  pCols->maxRowSize = maxRowSize;
+  pCols->maxCols = maxCols;
+  pCols->maxPoints = maxRows;
+  pCols->bufSize = maxRowSize * maxRows;
+
+  pCols->buf = malloc(pCols->bufSize);
+  if (pCols->buf == NULL) {
+    uDebug("malloc failure, size:%"PRId64" failed, reason:%s", sizeof(SDataCol) * maxCols, strerror(errno));
+    tdFreeDataCols(pCols);
+    return NULL;
+  }
+
+  return pCols;
+}
+
+int tdInitDataCols(SDataCols *pCols, STSchema *pSchema) {
+  if (schemaNCols(pSchema) > pCols->maxCols) {
+    pCols->maxCols = schemaNCols(pSchema);
+    pCols->cols = (SDataCol *)realloc(pCols->cols, sizeof(SDataCol) * pCols->maxCols);
+    if (pCols->cols == NULL) return -1;
+  }
+
+  if (schemaTLen(pSchema) > pCols->maxRowSize) {
+    pCols->maxRowSize = schemaTLen(pSchema);
+    pCols->bufSize = schemaTLen(pSchema) * pCols->maxPoints;
+    pCols->buf = realloc(pCols->buf, pCols->bufSize);
+    if (pCols->buf == NULL) return -1;
+  }
+
+  tdResetDataCols(pCols);
+  pCols->numOfCols = schemaNCols(pSchema);
+
+  void *ptr = pCols->buf;
+  for (int i = 0; i < schemaNCols(pSchema); i++) {
+    dataColInit(pCols->cols + i, schemaColAt(pSchema, i), &ptr, pCols->maxPoints);
+    ASSERT((char *)ptr - (char *)(pCols->buf) <= pCols->bufSize);
+  }
+  
+  return 0;
+}
+
+void tdFreeDataCols(SDataCols *pCols) {
+  if (pCols) {
+    taosTFree(pCols->buf);
+    taosTFree(pCols->cols);
+    free(pCols);
+  }
+}
+
+SDataCols *tdDupDataCols(SDataCols *pDataCols, bool keepData) {
+  SDataCols *pRet = tdNewDataCols(pDataCols->maxRowSize, pDataCols->maxCols, pDataCols->maxPoints);
+  if (pRet == NULL) return NULL;
+
+  pRet->numOfCols = pDataCols->numOfCols;
+  pRet->sversion = pDataCols->sversion;
+  if (keepData) pRet->numOfRows = pDataCols->numOfRows;
+
+  for (int i = 0; i < pDataCols->numOfCols; i++) {
+    pRet->cols[i].type = pDataCols->cols[i].type;
+    pRet->cols[i].colId = pDataCols->cols[i].colId;
+    pRet->cols[i].bytes = pDataCols->cols[i].bytes;
+    pRet->cols[i].offset = pDataCols->cols[i].offset;
+
+    pRet->cols[i].spaceSize = pDataCols->cols[i].spaceSize;
+    pRet->cols[i].pData = (void *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].pData) - (char *)(pDataCols->buf)));
+
+    if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) {
+      ASSERT(pDataCols->cols[i].dataOff != NULL);
+      pRet->cols[i].dataOff =
+          (int32_t *)((char *)pRet->buf + ((char *)(pDataCols->cols[i].dataOff) - (char *)(pDataCols->buf)));
+    }
+
+    if (keepData) {
+      pRet->cols[i].len = pDataCols->cols[i].len;
+      if (pDataCols->cols[i].len > 0) {
+        memcpy(pRet->cols[i].pData, pDataCols->cols[i].pData, pDataCols->cols[i].len);
+        if (pRet->cols[i].type == TSDB_DATA_TYPE_BINARY || pRet->cols[i].type == TSDB_DATA_TYPE_NCHAR) {
+          memcpy(pRet->cols[i].dataOff, pDataCols->cols[i].dataOff, sizeof(VarDataOffsetT) * pDataCols->maxPoints);
+        }
+      }
+    }
+  }
+
+  return pRet;
+}
+
+void tdResetDataCols(SDataCols *pCols) {
+  if (pCols != NULL) {
+    pCols->numOfRows = 0;
+    for (int i = 0; i < pCols->maxCols; i++) {
+      dataColReset(pCols->cols + i);
+    }
+  }
+}
+
+void tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols) {
+  ASSERT(dataColsKeyLast(pCols) < dataRowKey(row));
+
+  int rcol = 0;
+  int dcol = 0;
+
+  while (dcol < pCols->numOfCols) {
+    SDataCol *pDataCol = &(pCols->cols[dcol]);
+    if (rcol >= schemaNCols(pSchema)) {
+      dataColSetNullAt(pDataCol, pCols->numOfRows);
+      dcol++;
+      continue;
+    }
+
+    STColumn *pRowCol = schemaColAt(pSchema, rcol);
+    if (pRowCol->colId == pDataCol->colId) {
+      void *value = tdGetRowDataOfCol(row, pRowCol->type, pRowCol->offset+TD_DATA_ROW_HEAD_SIZE);
+      dataColAppendVal(pDataCol, value, pCols->numOfRows, pCols->maxPoints);
+      dcol++;
+      rcol++;
+    } else if (pRowCol->colId < pDataCol->colId) {
+      rcol++;
+    } else {
+      dataColSetNullAt(pDataCol, pCols->numOfRows);
+      dcol++;
+    }
+  }
+  pCols->numOfRows++;
+}
+
+// Pop pointsToPop points from the SDataCols
+void tdPopDataColsPoints(SDataCols *pCols, int pointsToPop) {
+  int pointsLeft = pCols->numOfRows - pointsToPop;
+  if (pointsLeft <= 0) {
+    tdResetDataCols(pCols);
+    return;
+  }
+
+  for (int iCol = 0; iCol < pCols->numOfCols; iCol++) {
+    SDataCol *pCol = pCols->cols + iCol;
+    dataColPopPoints(pCol, pointsToPop, pCols->numOfRows);
+  }
+  pCols->numOfRows = pointsLeft;
+}
+
+int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge) {
+  ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfRows);
+  ASSERT(target->numOfRows + rowsToMerge <= target->maxPoints);
+  ASSERT(target->numOfCols == source->numOfCols);
+
+  SDataCols *pTarget = NULL;
+
+  if (dataColsKeyLast(target) < dataColsKeyFirst(source)) {  // No overlap
+    for (int i = 0; i < rowsToMerge; i++) {
+      for (int j = 0; j < source->numOfCols; j++) {
+        if (source->cols[j].len > 0) {
+          dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i), target->numOfRows,
+                           target->maxPoints);
+        }
+      }
+      target->numOfRows++;
+    }
+  } else {
+    pTarget = tdDupDataCols(target, true);
+    if (pTarget == NULL) goto _err;
+
+    int iter1 = 0;
+    int iter2 = 0;
+    tdMergeTwoDataCols(target, pTarget, &iter1, pTarget->numOfRows, source, &iter2, source->numOfRows,
+                       pTarget->numOfRows + rowsToMerge);
+  }
+
+  tdFreeDataCols(pTarget);
+  return 0;
+
+_err:
+  tdFreeDataCols(pTarget);
+  return -1;
+}
+
+void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, int limit1, SDataCols *src2, int *iter2, int limit2, int tRows) {
+  tdResetDataCols(target);
+  ASSERT(limit1 <= src1->numOfRows && limit2 <= src2->numOfRows);
+
+  while (target->numOfRows < tRows) {
+    if (*iter1 >= limit1 && *iter2 >= limit2) break;
+
+    TSKEY key1 = (*iter1 >= limit1) ? INT64_MAX : ((TSKEY *)(src1->cols[0].pData))[*iter1];
+    TSKEY key2 = (*iter2 >= limit2) ? INT64_MAX : ((TSKEY *)(src2->cols[0].pData))[*iter2];
+
+    if (key1 <= key2) {
+      for (int i = 0; i < src1->numOfCols; i++) {
+        ASSERT(target->cols[i].type == src1->cols[i].type);
+        if (src1->cols[i].len > 0) {
+          dataColAppendVal(&(target->cols[i]), tdGetColDataOfRow(src1->cols + i, *iter1), target->numOfRows,
+                           target->maxPoints);
+        }
+      }
+
+      target->numOfRows++;
+      (*iter1)++;
+      if (key1 == key2) (*iter2)++;
+    } else {
+      for (int i = 0; i < src2->numOfCols; i++) {
+        ASSERT(target->cols[i].type == src2->cols[i].type);
+        if (src2->cols[i].len > 0) {
+          dataColAppendVal(&(target->cols[i]), tdGetColDataOfRow(src2->cols + i, *iter2), target->numOfRows,
+                           target->maxPoints);
+        }
+      }
+
+      target->numOfRows++;
+      (*iter2)++;
+    }
+  }
+}
+
+SKVRow tdKVRowDup(SKVRow row) {
+  SKVRow trow = malloc(kvRowLen(row));
+  if (trow == NULL) return NULL;
+
+  kvRowCpy(trow, row);
+  return trow;
+}
+
+static int compareColIdx(const void* a, const void* b) {
+  const SColIdx* x = (const SColIdx*)a;
+  const SColIdx* y = (const SColIdx*)b;
+  if (x->colId > y->colId) {
+    return 1;
+  }
+  if (x->colId < y->colId) {
+    return -1;
+  }
+  return 0;
+}
+
+void tdSortKVRowByColIdx(SKVRow row) {
+  qsort(kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), compareColIdx);
+}
+
+int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
+  SColIdx *pColIdx = NULL;
+  SKVRow   row = *orow;
+  SKVRow   nrow = NULL;
+  void *   ptr = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_GE);
+
+  if (ptr == NULL || ((SColIdx *)ptr)->colId < colId) { // need to add a column value to the row
+    int diff = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
+    nrow = malloc(kvRowLen(row) + sizeof(SColIdx) + diff);
+    if (nrow == NULL) return -1;
+
+    kvRowSetLen(nrow, kvRowLen(row) + (int16_t)sizeof(SColIdx) + diff);
+    kvRowSetNCols(nrow, kvRowNCols(row) + 1);
+
+    if (ptr == NULL) {
+      memcpy(kvRowColIdx(nrow), kvRowColIdx(row), sizeof(SColIdx) * kvRowNCols(row));
+      memcpy(kvRowValues(nrow), kvRowValues(row), POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row)));
+      int colIdx = kvRowNCols(nrow) - 1;
+      kvRowColIdxAt(nrow, colIdx)->colId = colId;
+      kvRowColIdxAt(nrow, colIdx)->offset = (int16_t)(POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row)));
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx)), value, diff);
+    } else {
+      int16_t tlen = (int16_t)(POINTER_DISTANCE(ptr, kvRowColIdx(row)));
+      if (tlen > 0) {
+        memcpy(kvRowColIdx(nrow), kvRowColIdx(row), tlen);
+        memcpy(kvRowValues(nrow), kvRowValues(row), ((SColIdx *)ptr)->offset);
+      }
+
+      int colIdx = tlen / sizeof(SColIdx);
+      kvRowColIdxAt(nrow, colIdx)->colId = colId;
+      kvRowColIdxAt(nrow, colIdx)->offset = ((SColIdx *)ptr)->offset;
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx)), value, diff);
+
+      for (int i = colIdx; i < kvRowNCols(row); i++) {
+        kvRowColIdxAt(nrow, i + 1)->colId = kvRowColIdxAt(row, i)->colId;
+        kvRowColIdxAt(nrow, i + 1)->offset = kvRowColIdxAt(row, i)->offset + diff;
+      }
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx + 1)), kvRowColVal(row, kvRowColIdxAt(row, colIdx)),
+             POINTER_DISTANCE(kvRowEnd(row), kvRowColVal(row, kvRowColIdxAt(row, colIdx)))
+
+      );
+    }
+
+    *orow = nrow;
+    free(row);
+  } else {
+    ASSERT(((SColIdx *)ptr)->colId == colId);
+    if (IS_VAR_DATA_TYPE(type)) {
+      void *pOldVal = kvRowColVal(row, (SColIdx *)ptr);
+
+      if (varDataTLen(value) == varDataTLen(pOldVal)) { // just update the column value in place
+        memcpy(pOldVal, value, varDataTLen(value));
+      } else { // need to reallocate the memory
+        int16_t diff = varDataTLen(value) - varDataTLen(pOldVal);
+        int16_t nlen = kvRowLen(row) + diff;
+        ASSERT(nlen > 0);
+        nrow = malloc(nlen);
+        if (nrow == NULL) return -1;
+
+        kvRowSetLen(nrow, nlen);
+        kvRowSetNCols(nrow, kvRowNCols(row));
+
+        // Copy part ahead
+        nlen = (int16_t)(POINTER_DISTANCE(ptr, kvRowColIdx(row)));
+        ASSERT(nlen % sizeof(SColIdx) == 0);
+        if (nlen > 0) {
+          ASSERT(((SColIdx *)ptr)->offset > 0);
+          memcpy(kvRowColIdx(nrow), kvRowColIdx(row), nlen);
+          memcpy(kvRowValues(nrow), kvRowValues(row), ((SColIdx *)ptr)->offset);
+        }
+
+        // Construct current column value
+        int colIdx = nlen / sizeof(SColIdx);
+        pColIdx = kvRowColIdxAt(nrow, colIdx);
+        pColIdx->colId = ((SColIdx *)ptr)->colId;
+        pColIdx->offset = ((SColIdx *)ptr)->offset;
+        memcpy(kvRowColVal(nrow, pColIdx), value, varDataTLen(value));
+ 
+        // Construct columns after
+        if (kvRowNCols(nrow) - colIdx - 1 > 0) {
+          for (int i = colIdx + 1; i < kvRowNCols(nrow); i++) {
+            kvRowColIdxAt(nrow, i)->colId = kvRowColIdxAt(row, i)->colId;
+            kvRowColIdxAt(nrow, i)->offset = kvRowColIdxAt(row, i)->offset + diff;
+          }
+          memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx + 1)), kvRowColVal(row, kvRowColIdxAt(row, colIdx + 1)),
+                 POINTER_DISTANCE(kvRowEnd(row), kvRowColVal(row, kvRowColIdxAt(row, colIdx + 1))));
+        }
+
+        *orow = nrow;
+        free(row);
+      }
+    } else {
+      memcpy(kvRowColVal(row, (SColIdx *)ptr), value, TYPE_BYTES[type]);
+    }
+  }
+
+  return 0;
+}
+
+int tdEncodeKVRow(void **buf, SKVRow row) {
+  // May change the encode purpose
+  if (buf != NULL) {
+    kvRowCpy(*buf, row);
+    *buf = POINTER_SHIFT(*buf, kvRowLen(row));
+  }
+
+  return kvRowLen(row);
+}
+
+void *tdDecodeKVRow(void *buf, SKVRow *row) {
+  *row = tdKVRowDup(buf);
+  if (*row == NULL) return NULL;
+  return POINTER_SHIFT(buf, kvRowLen(*row));
+}
+
+int tdInitKVRowBuilder(SKVRowBuilder *pBuilder) {
+  pBuilder->tCols = 128;
+  pBuilder->nCols = 0;
+  pBuilder->pColIdx = (SColIdx *)malloc(sizeof(SColIdx) * pBuilder->tCols);
+  if (pBuilder->pColIdx == NULL) return -1;
+  pBuilder->alloc = 1024;
+  pBuilder->size = 0;
+  pBuilder->buf = malloc(pBuilder->alloc);
+  if (pBuilder->buf == NULL) {
+    free(pBuilder->pColIdx);
+    return -1;
+  }
+  return 0;
+}
+
+void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder) {
+  taosTFree(pBuilder->pColIdx);
+  taosTFree(pBuilder->buf);
+}
+
+void tdResetKVRowBuilder(SKVRowBuilder *pBuilder) {
+  pBuilder->nCols = 0;
+  pBuilder->size = 0;
+}
+
+SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder) {
+  int tlen = sizeof(SColIdx) * pBuilder->nCols + pBuilder->size;
+  if (tlen == 0) return NULL;
+
+  tlen += TD_KV_ROW_HEAD_SIZE;
+
+  SKVRow row = malloc(tlen);
+  if (row == NULL) return NULL;
+
+  kvRowSetNCols(row, pBuilder->nCols);
+  kvRowSetLen(row, tlen);
+
+  memcpy(kvRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
+  memcpy(kvRowValues(row), pBuilder->buf, pBuilder->size);
+
+  return row;
+}
\ No newline at end of file
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
new file mode 100644
index 0000000000000000000000000000000000000000..2630e3c468bd43a4c23b2f391e8e25254cbe8672
--- /dev/null
+++ b/src/common/src/tglobal.c
@@ -0,0 +1,1407 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tulog.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "monitor.h"
+#include "tsocket.h"
+#include "tutil.h"
+#include "tlocale.h"
+#include "ttimezone.h"
+#include "tsync.h"
+
+// cluster
+char     tsFirst[TSDB_EP_LEN] = {0};
+char     tsSecond[TSDB_EP_LEN] = {0};
+char     tsArbitrator[TSDB_EP_LEN] = {0};
+char     tsLocalFqdn[TSDB_FQDN_LEN] = {0};
+char     tsLocalEp[TSDB_EP_LEN] = {0};  // Local End Point, hostname:port
+uint16_t tsServerPort = 6030;
+uint16_t tsDnodeShellPort = 6030;  // udp[6035-6039] tcp[6035]
+uint16_t tsDnodeDnodePort = 6035;  // udp/tcp
+uint16_t tsSyncPort = 6040;
+uint16_t tsArbitratorPort = 6042;
+int32_t  tsStatusInterval = 1;  // second
+int32_t  tsNumOfMnodes = 3;
+int32_t  tsEnableVnodeBak = 1;
+int32_t  tsEnableTelemetryReporting = 1;
+
+// common
+int32_t tsRpcTimer = 1000;
+int32_t tsRpcMaxTime = 600;  // seconds;
+int32_t tsMaxShellConns = 5000;
+int32_t tsMaxConnections = 5000;
+int32_t tsShellActivityTimer = 3;  // second
+float   tsNumOfThreadsPerCore = 1.0;
+float   tsRatioOfQueryThreads = 0.5;
+int8_t  tsDaylight = 0;
+char    tsTimezone[TSDB_TIMEZONE_LEN] = {0};
+char    tsLocale[TSDB_LOCALE_LEN] = {0};
+char    tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
+int32_t tsEnableCoreFile = 0;
+int32_t tsMaxBinaryDisplayWidth = 30;
+
+/*
+ * denote if the server needs to compress response message at the application layer to client, including query rsp,
+ * metricmeta rsp, and multi-meter query rsp message body. The client compress the submit message to server.
+ *
+ * 0: all data are compressed
+ * -1: all data are not compressed
+ * other values: if the message payload size is greater than the tsCompressMsgSize, the message will be compressed.
+ */
+int32_t tsCompressMsgSize = -1;
+
+// client
+int32_t tsTableMetaKeepTimer = 7200;  // second
+int32_t tsMaxSQLStringLen = TSDB_MAX_SQL_LEN;
+int32_t tsTscEnableRecordSql = 0;
+
+// the maximum number of results for projection query on super table that are returned from
+// one virtual node, to order according to timestamp
+int32_t tsMaxNumOfOrderedResults = 100000;
+
+// 10 ms for sliding time, the value will changed in case of time precision changed
+int32_t tsMinSlidingTime = 10;
+
+// 10 ms for interval time range, changed accordingly
+int32_t tsMinIntervalTime = 10;
+
+// 20sec, the maximum value of stream computing delay, changed accordingly
+int32_t tsMaxStreamComputDelay = 20000;
+
+// 10sec, the first stream computing delay time after system launched successfully, changed accordingly
+int32_t tsStreamCompStartDelay = 10000;
+
+// the stream computing delay time after executing failed, change accordingly
+int32_t tsStreamCompRetryDelay = 10;
+
+// The delayed computing ration. 10% of the whole computing time window by default.
+float tsStreamComputDelayRatio = 0.1f;
+
+int32_t tsProjectExecInterval = 10000;   // every 10sec, the projection will be executed once
+int64_t tsMaxRetentWindow = 24 * 3600L;  // maximum time window tolerance
+
+// db parameters
+int32_t tsCacheBlockSize = TSDB_DEFAULT_CACHE_BLOCK_SIZE;
+int32_t tsBlocksPerVnode = TSDB_DEFAULT_TOTAL_BLOCKS;
+int16_t tsDaysPerFile    = TSDB_DEFAULT_DAYS_PER_FILE;
+int32_t tsDaysToKeep     = TSDB_DEFAULT_KEEP;
+int32_t tsMinRowsInFileBlock = TSDB_DEFAULT_MIN_ROW_FBLOCK;
+int32_t tsMaxRowsInFileBlock = TSDB_DEFAULT_MAX_ROW_FBLOCK;
+int16_t tsCommitTime    = TSDB_DEFAULT_COMMIT_TIME;  // seconds
+int32_t tsTimePrecision = TSDB_DEFAULT_PRECISION;
+int16_t tsCompression   = TSDB_DEFAULT_COMP_LEVEL;
+int16_t tsWAL           = TSDB_DEFAULT_WAL_LEVEL;
+int32_t tsFsyncPeriod   = TSDB_DEFAULT_FSYNC_PERIOD;
+int32_t tsReplications  = TSDB_DEFAULT_DB_REPLICA_OPTION;
+int32_t tsQuorum        = TSDB_DEFAULT_DB_QUORUM_OPTION;
+int32_t tsMaxVgroupsPerDb  = 0;
+int32_t tsMinTablePerVnode = TSDB_TABLES_STEP;
+int32_t tsMaxTablePerVnode = TSDB_DEFAULT_TABLES;
+int32_t tsTableIncStepPerVnode = TSDB_TABLES_STEP;
+
+// balance
+int32_t tsEnableBalance = 1;
+int32_t tsAlternativeRole = 0;
+int32_t tsBalanceInterval = 300;  // seconds
+int32_t tsOfflineThreshold = 86400*100;   // seconds 10days
+int32_t tsMnodeEqualVnodeNum = 4;
+
+// restful
+int32_t  tsEnableHttpModule = 1;
+int32_t  tsRestRowLimit = 10240;
+uint16_t tsHttpPort = 6041;  // only tcp, range tcp[6041]
+int32_t  tsHttpCacheSessions = 1000;
+int32_t  tsHttpSessionExpire = 36000;
+int32_t  tsHttpMaxThreads = 2;
+int32_t  tsHttpEnableCompress = 1;
+int32_t  tsHttpEnableRecordSql = 0;
+int32_t  tsTelegrafUseFieldNum = 0;
+
+// mqtt
+int32_t tsEnableMqttModule = 0;  // not finished yet, not started it by default
+char    tsMqttHostName[TSDB_MQTT_HOSTNAME_LEN] = "test.mosquitto.org";
+char    tsMqttPort[TSDB_MQTT_PORT_LEN] = "1883";
+char    tsMqttUser[TSDB_MQTT_USER_LEN] = {0};
+char    tsMqttPass[TSDB_MQTT_PASS_LEN] = {0};
+char    tsMqttClientId[TSDB_MQTT_CLIENT_ID_LEN] = "TDengineMqttSubscriber";
+char    tsMqttTopic[TSDB_MQTT_TOPIC_LEN] = "/test"; // #
+
+// monitor
+int32_t tsEnableMonitorModule = 1;
+char    tsMonitorDbName[TSDB_DB_NAME_LEN] = "log";
+char    tsInternalPass[] = "secretkey";
+int32_t tsMonitorInterval = 30;  // seconds
+
+// internal
+int32_t tsPrintAuth = 0;
+int32_t tscEmbedded = 0;
+char    configDir[TSDB_FILENAME_LEN] = {0};
+char    tsVnodeDir[TSDB_FILENAME_LEN] = {0};
+char    tsDnodeDir[TSDB_FILENAME_LEN] = {0};
+char    tsMnodeDir[TSDB_FILENAME_LEN] = {0};
+char    tsDataDir[TSDB_FILENAME_LEN] = {0};
+char    tsScriptDir[TSDB_FILENAME_LEN] = {0};
+char    tsVnodeBakDir[TSDB_FILENAME_LEN] = {0};
+
+/*
+ * minimum scale for whole system, millisecond by default
+ * for TSDB_TIME_PRECISION_MILLI: 86400000L
+ *     TSDB_TIME_PRECISION_MICRO: 86400000000L
+ *     TSDB_TIME_PRECISION_NANO:  86400000000000L
+ */
+int64_t tsMsPerDay[] = {86400000L, 86400000000L, 86400000000000L};
+
+// system info
+char    tsOsName[10] = "Linux";
+int64_t tsPageSize;
+int64_t tsOpenMax;
+int64_t tsStreamMax;
+int32_t tsNumOfCores = 1;
+float   tsTotalTmpDirGB = 0;
+float   tsTotalDataDirGB = 0;
+float   tsAvailTmpDirectorySpace = 0;
+float   tsAvailDataDirGB = 0;
+float   tsReservedTmpDirectorySpace = 0.1f;
+float   tsMinimalDataDirGB = 0.5f;
+int32_t tsTotalMemoryMB = 0;
+int32_t tsVersion = 0;
+
+// log
+int32_t tsNumOfLogLines = 10000000;
+int32_t mDebugFlag = 135;
+int32_t sdbDebugFlag = 135;
+int32_t dDebugFlag = 135;
+int32_t vDebugFlag = 131;
+int32_t cDebugFlag = 131;
+int32_t jniDebugFlag = 131;
+int32_t odbcDebugFlag = 131;
+int32_t httpDebugFlag = 131;
+int32_t mqttDebugFlag = 131;
+int32_t monitorDebugFlag = 131;
+int32_t qDebugFlag = 131;
+int32_t rpcDebugFlag = 131;
+int32_t uDebugFlag = 131;
+int32_t debugFlag = 0;
+int32_t sDebugFlag = 135;
+int32_t wDebugFlag = 135;
+int32_t tsdbDebugFlag = 131;
+int32_t cqDebugFlag = 135;
+
+int32_t (*monitorStartSystemFp)() = NULL;
+void (*monitorStopSystemFp)() = NULL;
+void (*monitorExecuteSQLFp)(char *sql) = NULL;
+
+static pthread_once_t tsInitGlobalCfgOnce = PTHREAD_ONCE_INIT;
+
+void taosSetAllDebugFlag() {
+  if (debugFlag != 0) { 
+    mDebugFlag = debugFlag;
+    sdbDebugFlag = debugFlag;
+    dDebugFlag = debugFlag;
+    vDebugFlag = debugFlag;
+    cDebugFlag = debugFlag;
+    jniDebugFlag = debugFlag;
+    odbcDebugFlag = debugFlag;
+    httpDebugFlag = debugFlag;
+    mqttDebugFlag = debugFlag;
+    monitorDebugFlag = debugFlag;
+    qDebugFlag = debugFlag;    
+    rpcDebugFlag = debugFlag;
+    uDebugFlag = debugFlag;
+    sDebugFlag = debugFlag;
+    wDebugFlag = debugFlag;
+    tsdbDebugFlag = debugFlag;
+    cqDebugFlag = debugFlag;
+    uInfo("all debug flag are set to %d", debugFlag);
+  }
+}
+
+bool taosCfgDynamicOptions(char *msg) {
+  char *option, *value;
+  int32_t   olen, vlen;
+  int32_t   vint = 0;
+
+  paGetToken(msg, &option, &olen);
+  if (olen == 0) return TSDB_CODE_COM_INVALID_CFG_MSG;
+
+  paGetToken(option + olen + 1, &value, &vlen);
+  if (vlen == 0)
+    vint = 135;
+  else {
+    vint = atoi(value);
+  }
+
+  uInfo("change dynamic option: %s, value: %d", option, vint);
+
+  for (int32_t i = 0; i < tsGlobalConfigNum; ++i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    //if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_LOG)) continue;
+    if (cfg->valType != TAOS_CFG_VTYPE_INT32) continue;
+    
+    int32_t cfgLen = (int32_t)strlen(cfg->option);
+    if (cfgLen != olen) continue;
+    if (strncasecmp(option, cfg->option, olen) != 0) continue;
+    *((int32_t *)cfg->ptr) = vint;
+
+    if (strncasecmp(cfg->option, "monitor", olen) == 0) {
+      if (1 == vint) {
+        if (monitorStartSystemFp) {
+          (*monitorStartSystemFp)();
+          uInfo("monitor is enabled");
+        } else {
+          uError("monitor can't be updated, for monitor not initialized");
+        }
+      } else {
+        if (monitorStopSystemFp) {
+          (*monitorStopSystemFp)();
+          uInfo("monitor is disabled");
+        } else {
+          uError("monitor can't be updated, for monitor not initialized");
+        }
+      }
+      return true;
+    }
+
+    if (strncasecmp(cfg->option, "debugFlag", olen) == 0) {
+      taosSetAllDebugFlag();
+    }
+    
+    return true;
+  }
+
+  if (strncasecmp(option, "resetlog", 8) == 0) {
+    taosResetLog();
+    taosPrintGlobalCfg();
+    return true;
+  }
+
+  if (strncasecmp(option, "resetQueryCache", 15) == 0) {
+    if (monitorExecuteSQLFp) {
+      (*monitorExecuteSQLFp)("resetQueryCache");
+      uInfo("resetquerycache is executed");
+    } else {
+      uError("resetquerycache can't be executed, for monitor not started");
+    }
+  }
+
+  return false;
+}
+
+static void doInitGlobalConfig(void) {
+  osInit();
+  SGlobalCfg cfg = {0};
+  
+  // ip address
+  cfg.option = "firstEp";
+  cfg.ptr = tsFirst;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_EP_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "secondEp";
+  cfg.ptr = tsSecond;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_EP_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "fqdn";
+  cfg.ptr = tsLocalFqdn;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_FQDN_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // port
+  cfg.option = "serverPort";
+  cfg.ptr = &tsServerPort;
+  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 1;
+  cfg.maxValue = 65535;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // directory
+  cfg.option = "configDir";
+  cfg.ptr = configDir;
+  cfg.valType = TAOS_CFG_VTYPE_DIRECTORY;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_FILENAME_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "logDir";
+  cfg.ptr = tsLogDir;
+  cfg.valType = TAOS_CFG_VTYPE_DIRECTORY;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_FILENAME_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "scriptDir";
+  cfg.ptr = tsScriptDir;
+  cfg.valType = TAOS_CFG_VTYPE_DIRECTORY;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_FILENAME_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "dataDir";
+  cfg.ptr = tsDataDir;
+  cfg.valType = TAOS_CFG_VTYPE_DIRECTORY;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_FILENAME_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "arbitrator";
+  cfg.ptr = tsArbitrator;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_EP_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // dnode configs
+  cfg.option = "numOfThreadsPerCore";
+  cfg.ptr = &tsNumOfThreadsPerCore;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 10;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "ratioOfQueryThreads";
+  cfg.ptr = &tsRatioOfQueryThreads;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0.1f;
+  cfg.maxValue = 0.9f;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "numOfMnodes";
+  cfg.ptr = &tsNumOfMnodes;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 3;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "vnodeBak";
+  cfg.ptr = &tsEnableVnodeBak;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "telemetryReporting";
+  cfg.ptr = &tsEnableTelemetryReporting;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "balance";
+  cfg.ptr = &tsEnableBalance;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "balanceInterval";
+  cfg.ptr = &tsBalanceInterval;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 30000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // 0-any; 1-mnode; 2-vnode
+  cfg.option = "role";
+  cfg.ptr = &tsAlternativeRole;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 2;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // timer
+  cfg.option = "maxTmrCtrl";
+  cfg.ptr = &tsMaxTmrCtrl;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 8;
+  cfg.maxValue = 2048;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "monitorInterval";
+  cfg.ptr = &tsMonitorInterval;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 1;
+  cfg.maxValue = 600;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "offlineThreshold";
+  cfg.ptr = &tsOfflineThreshold;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 5;
+  cfg.maxValue = 7200000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "rpcTimer";
+  cfg.ptr = &tsRpcTimer;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 100;
+  cfg.maxValue = 3000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "rpcMaxTime";
+  cfg.ptr = &tsRpcMaxTime;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 100;
+  cfg.maxValue = 7200;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "statusInterval";
+  cfg.ptr = &tsStatusInterval;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 10;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "shellActivityTimer";
+  cfg.ptr = &tsShellActivityTimer;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 1;
+  cfg.maxValue = 120;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tableMetaKeepTimer";
+  cfg.ptr = &tsTableMetaKeepTimer;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 1;
+  cfg.maxValue = 8640000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minSlidingTime";
+  cfg.ptr = &tsMinSlidingTime;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 10;
+  cfg.maxValue = 1000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minIntervalTime";
+  cfg.ptr = &tsMinIntervalTime;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 1000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxStreamCompDelay";
+  cfg.ptr = &tsMaxStreamComputDelay;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 10;
+  cfg.maxValue = 1000000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxFirstStreamCompDelay";
+  cfg.ptr = &tsStreamCompStartDelay;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1000;
+  cfg.maxValue = 1000000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "retryStreamCompDelay";
+  cfg.ptr = &tsStreamCompRetryDelay;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 10;
+  cfg.maxValue = 1000000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_MS;
+
+  taosInitConfigOption(cfg);
+  cfg.option = "streamCompDelayRatio";
+  cfg.ptr = &tsStreamComputDelayRatio;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0.1f;
+  cfg.maxValue = 0.9f;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxVgroupsPerDb";
+  cfg.ptr = &tsMaxVgroupsPerDb;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 8192;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // database configs
+  cfg.option = "maxTablesPerVnode";
+  cfg.ptr = &tsMaxTablePerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TABLES;
+  cfg.maxValue = TSDB_MAX_TABLES;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minTablesPerVnode";
+  cfg.ptr = &tsMinTablePerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TABLES;
+  cfg.maxValue = TSDB_MAX_TABLES;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tableIncStepPerVnode";
+  cfg.ptr = &tsTableIncStepPerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TABLES;
+  cfg.maxValue = TSDB_MAX_TABLES;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "cache";
+  cfg.ptr = &tsCacheBlockSize;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_CACHE_BLOCK_SIZE;
+  cfg.maxValue = TSDB_MAX_CACHE_BLOCK_SIZE;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_Mb;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "blocks";
+  cfg.ptr = &tsBlocksPerVnode;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_TOTAL_BLOCKS;
+  cfg.maxValue = TSDB_MAX_TOTAL_BLOCKS;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "days";
+  cfg.ptr = &tsDaysPerFile;
+  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_DAYS_PER_FILE;
+  cfg.maxValue = TSDB_MAX_DAYS_PER_FILE;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "keep";
+  cfg.ptr = &tsDaysToKeep;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_KEEP;
+  cfg.maxValue = TSDB_MAX_KEEP;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minRows";
+  cfg.ptr = &tsMinRowsInFileBlock;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_MIN_ROW_FBLOCK;
+  cfg.maxValue = TSDB_MAX_MIN_ROW_FBLOCK;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxRows";
+  cfg.ptr = &tsMaxRowsInFileBlock;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_MAX_ROW_FBLOCK;
+  cfg.maxValue = TSDB_MAX_MAX_ROW_FBLOCK;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "comp";
+  cfg.ptr = &tsCompression;
+  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_COMP_LEVEL;
+  cfg.maxValue = TSDB_MAX_COMP_LEVEL;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "walLevel";
+  cfg.ptr = &tsWAL;
+  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_WAL_LEVEL;
+  cfg.maxValue = TSDB_MAX_WAL_LEVEL;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "fsync";
+  cfg.ptr = &tsFsyncPeriod;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_FSYNC_PERIOD;
+  cfg.maxValue = TSDB_MAX_FSYNC_PERIOD;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "replica";
+  cfg.ptr = &tsReplications;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_DB_REPLICA_OPTION;
+  cfg.maxValue = TSDB_MAX_DB_REPLICA_OPTION;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "quorum";
+  cfg.ptr = &tsQuorum;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MIN_DB_REPLICA_OPTION;
+  cfg.maxValue = TSDB_MAX_DB_REPLICA_OPTION;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mqttHostName";
+  cfg.ptr = tsMqttHostName;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_MQTT_HOSTNAME_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mqttPort";
+  cfg.ptr = tsMqttPort;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_MQTT_PORT_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mqttTopic";
+  cfg.ptr = tsMqttTopic;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_NOT_PRINT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = TSDB_MQTT_TOPIC_LEN;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "compressMsgSize";
+  cfg.ptr = &tsCompressMsgSize;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = -1;
+  cfg.maxValue = 10000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxSQLLength";
+  cfg.ptr = &tsMaxSQLStringLen;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MAX_SQL_LEN;
+  cfg.maxValue = TSDB_MAX_ALLOWED_SQL_LEN;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_BYTE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxNumOfOrderedRes";
+  cfg.ptr = &tsMaxNumOfOrderedResults;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = TSDB_MAX_SQL_LEN;
+  cfg.maxValue = TSDB_MAX_ALLOWED_SQL_LEN;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // locale & charset
+  cfg.option = "timezone";
+  cfg.ptr = tsTimezone;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = tListLen(tsTimezone);
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "locale";
+  cfg.ptr = tsLocale;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = tListLen(tsLocale);
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "charset";
+  cfg.ptr = tsCharset;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = tListLen(tsCharset);
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // connect configs
+  cfg.option = "maxShellConns";
+  cfg.ptr = &tsMaxShellConns;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 10;
+  cfg.maxValue = 50000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxConnections";
+  cfg.ptr = &tsMaxConnections;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 1;
+  cfg.maxValue = 100000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minimalLogDirGB";
+  cfg.ptr = &tsMinimalLogDirGB;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0.001f;
+  cfg.maxValue = 10000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_GB;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minimalTmpDirGB";
+  cfg.ptr = &tsReservedTmpDirectorySpace;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0.001f;
+  cfg.maxValue = 10000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_GB;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "minimalDataDirGB";
+  cfg.ptr = &tsMinimalDataDirGB;
+  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0.001f;
+  cfg.maxValue = 10000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_GB;
+  taosInitConfigOption(cfg);
+
+  // module configs
+  cfg.option = "mnodeEqualVnodeNum";
+  cfg.ptr = &tsMnodeEqualVnodeNum;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "http";
+  cfg.ptr = &tsEnableHttpModule;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mqtt";
+  cfg.ptr = &tsEnableMqttModule;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "monitor";
+  cfg.ptr = &tsEnableMonitorModule;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "httpEnableRecordSql";
+  cfg.ptr = &tsHttpEnableRecordSql;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "telegrafUseFieldNum";
+  cfg.ptr = &tsTelegrafUseFieldNum;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 1;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "httpMaxThreads";
+  cfg.ptr = &tsHttpMaxThreads;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 1;
+  cfg.maxValue = 1000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "restfulRowLimit";
+  cfg.ptr = &tsRestRowLimit;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 1;
+  cfg.maxValue = 10000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // debug flag
+  cfg.option = "numOfLogLines";
+  cfg.ptr = &tsNumOfLogLines;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 1000;
+  cfg.maxValue = 2000000000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "logKeepDays";
+  cfg.ptr = &tsLogKeepDays;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = -365000;
+  cfg.maxValue = 365000;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "asyncLog";
+  cfg.ptr = &tsAsyncLog;
+  cfg.valType = TAOS_CFG_VTYPE_INT16;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "debugFlag";
+  cfg.ptr = &debugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mDebugFlag";
+  cfg.ptr = &mDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "dDebugFlag";
+  cfg.ptr = &dDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "sDebugFlag";
+  cfg.ptr = &sDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "wDebugFlag";
+  cfg.ptr = &wDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+
+  cfg.option = "sdbDebugFlag";
+  cfg.ptr = &sdbDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "rpcDebugFlag";
+  cfg.ptr = &rpcDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tmrDebugFlag";
+  cfg.ptr = &tmrDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "cDebugFlag";
+  cfg.ptr = &cDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "jniDebugFlag";
+  cfg.ptr = &jniDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "odbcDebugFlag";
+  cfg.ptr = &odbcDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "uDebugFlag";
+  cfg.ptr = &uDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "httpDebugFlag";
+  cfg.ptr = &httpDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "mqttDebugFlag";
+  cfg.ptr = &mqttDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "monitorDebugFlag";
+  cfg.ptr = &monitorDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "qDebugFlag";
+  cfg.ptr = &qDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "vDebugFlag";
+  cfg.ptr = &vDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tsdbDebugFlag";
+  cfg.ptr = &tsdbDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "cqDebugFlag";
+  cfg.ptr = &cqDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "tscEnableRecordSql";
+  cfg.ptr = &tsTscEnableRecordSql;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "enableCoreFile";
+  cfg.ptr = &tsEnableCoreFile;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
+  cfg.minValue = 0;
+  cfg.maxValue = 1;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  // version info
+  cfg.option = "gitinfo";
+  cfg.ptr = gitinfo;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "gitinfoOfInternal";
+  cfg.ptr = gitinfoOfInternal;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "buildinfo";
+  cfg.ptr = buildinfo;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "version";
+  cfg.ptr = version;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 0;
+  cfg.maxValue = 0;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
+  cfg.option = "maxBinaryDisplayWidth";
+  cfg.ptr = &tsMaxBinaryDisplayWidth;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
+  cfg.minValue = 1;
+  cfg.maxValue = 65536;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+}
+
+void taosInitGlobalCfg() {
+  pthread_once(&tsInitGlobalCfgOnce, doInitGlobalConfig);
+}
+
+bool taosCheckGlobalCfg() {
+  char fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  if (debugFlag & DEBUG_TRACE || debugFlag & DEBUG_DEBUG || debugFlag & DEBUG_DUMP) {
+    taosSetAllDebugFlag();
+  }
+  
+  if (tsLocalFqdn[0] == 0) {
+    taosGetFqdn(tsLocalFqdn);
+  }
+
+  snprintf(tsLocalEp, sizeof(tsLocalEp), "%s:%u", tsLocalFqdn, tsServerPort);
+  uInfo("localEp is: %s", tsLocalEp);
+
+  if (tsFirst[0] == 0) {
+    strcpy(tsFirst, tsLocalEp);
+  } else {
+    taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+    snprintf(tsFirst, sizeof(tsFirst), "%s:%u", fqdn, port);
+  }
+
+  if (tsSecond[0] == 0) {
+    strcpy(tsSecond, tsLocalEp);
+  } else {
+    taosGetFqdnPortFromEp(tsSecond, fqdn, &port);
+    snprintf(tsSecond, sizeof(tsSecond), "%s:%u", fqdn, port);
+  }
+
+  taosGetSystemInfo();
+
+  tsSetLocale();
+
+  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
+  if (cfg_timezone && cfg_timezone->cfgStatus == TAOS_CFG_CSTATUS_FILE) {
+    tsSetTimeZone();
+  }
+
+  if (tsNumOfCores <= 0) {
+    tsNumOfCores = 1;
+  }
+
+  // todo refactor
+  tsVersion = 0;
+  for (int i = 0; i < 10; i++) {
+    if (version[i] >= '0' && version[i] <= '9') {
+      tsVersion = tsVersion * 10 + (version[i] - '0');
+    } else if (version[i] == 0) {
+      break;
+    }
+  }
+  
+  tsVersion = 10 * tsVersion;
+
+  tsDnodeShellPort = tsServerPort + TSDB_PORT_DNODESHELL;  // udp[6035-6039] tcp[6035]
+  tsDnodeDnodePort = tsServerPort + TSDB_PORT_DNODEDNODE;   // udp/tcp
+  tsSyncPort = tsServerPort + TSDB_PORT_SYNC;
+  tsHttpPort = tsServerPort + TSDB_PORT_HTTP;
+
+  return true;
+}
+
+int taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port) {
+  *port = 0;
+  strcpy(fqdn, ep);
+
+  char *temp = strchr(fqdn, ':');
+  if (temp) {   
+    *temp = 0;
+    *port = atoi(temp+1);
+  } 
+  
+  if (*port == 0) {
+    *port = tsServerPort;
+    return -1;
+  }
+
+  return 0; 
+}
+
+/*
+ * alter dnode 1 balance "vnode:1-dnode:2"
+ */
+
+bool taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId) {
+  int len = (int)strlen(option);
+  if (strncasecmp(option, "vnode:", 6) != 0) {
+    return false;
+  }
+
+  int pos = 0;
+  for (; pos < len; ++pos) {
+    if (option[pos] == '-') break;
+  }
+
+  if (++pos >= len) return false;
+  if (strncasecmp(option + pos, "dnode:", 6) != 0) {
+    return false;
+  }
+
+  *vnodeId = strtol(option + 6, NULL, 10);
+  *dnodeId = strtol(option + pos + 6, NULL, 10);
+  if (*vnodeId <= 1 || *dnodeId <= 0) {
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/common/src/tlocale.c b/src/common/src/tlocale.c
new file mode 100644
index 0000000000000000000000000000000000000000..46a3d951db8473cbb1b6346a66938312d4e41fb1
--- /dev/null
+++ b/src/common/src/tlocale.c
@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+#include "tglobal.h"
+#include "tconfig.h"
+#include "tutil.h"
+
+/**
+ * In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
+ * both the TDengine Server and the Client may be interrupted.
+ *
+ * In case that the setLocale failed to be executed, the right charset needs to be set.
+ */
+void tsSetLocale() {
+  char *locale = setlocale(LC_CTYPE, tsLocale);
+
+  // default locale or user specified locale is not valid, abort launch
+  if (locale == NULL) {
+    uError("Invalid locale:%s, please set the valid locale in config file", tsLocale);
+  }
+
+  if (strlen(tsCharset) == 0) {
+    uError("failed to get charset, please set the valid charset in config file");
+    exit(-1);
+  }
+
+  if (!taosValidateEncodec(tsCharset)) {
+    uError("Invalid charset:%s, please set the valid charset in config file", tsCharset);
+    exit(-1);
+  }
+}
\ No newline at end of file
diff --git a/src/common/src/tmessage.c b/src/common/src/tmessage.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b6dbfdb51baa45bb968f7281514ad039ae41434
--- /dev/null
+++ b/src/common/src/tmessage.c
@@ -0,0 +1,18 @@
+/*
+ * 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/>.
+ */
+
+#define TAOS_MESSAGE_C
+
+#include "taosmsg.h"
diff --git a/src/common/src/tname.c b/src/common/src/tname.c
new file mode 100644
index 0000000000000000000000000000000000000000..8879e9e7979be5b019b3048389105faa86ac9225
--- /dev/null
+++ b/src/common/src/tname.c
@@ -0,0 +1,190 @@
+#include "os.h"
+#include "tutil.h"
+
+#include "tname.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tvariant.h"
+
+// todo refactor
+UNUSED_FUNC static FORCE_INLINE const char* skipSegments(const char* input, char delim, int32_t num) {
+  for (int32_t i = 0; i < num; ++i) {
+    while (*input != 0 && *input++ != delim) {
+    };
+  }
+  return input;
+}
+
+UNUSED_FUNC static FORCE_INLINE size_t copy(char* dst, const char* src, char delimiter) {
+  size_t len = 0;
+  while (*src != delimiter && *src != 0) {
+    *dst++ = *src++;
+    len++;
+  }
+  
+  return len;
+}
+
+void extractTableName(const char* tableId, char* name) {
+  size_t s1 = strcspn(tableId, &TS_PATH_DELIMITER[0]);
+  size_t s2 = strcspn(&tableId[s1 + 1], &TS_PATH_DELIMITER[0]);
+  
+  tstrncpy(name, &tableId[s1 + s2 + 2], TSDB_TABLE_NAME_LEN);
+}
+
+char* extractDBName(const char* tableId, char* name) {
+  size_t offset1 = strcspn(tableId, &TS_PATH_DELIMITER[0]);
+  size_t len = strcspn(&tableId[offset1 + 1], &TS_PATH_DELIMITER[0]);
+  
+  return strncpy(name, &tableId[offset1 + 1], len);
+}
+
+SSchema tGetTableNameColumnSchema() {
+  SSchema s = {0};
+  s.bytes = TSDB_TABLE_NAME_LEN - 1 + VARSTR_HEADER_SIZE;
+  s.type  = TSDB_DATA_TYPE_BINARY;
+  s.colId = TSDB_TBNAME_COLUMN_INDEX;
+  tstrncpy(s.name, TSQL_TBNAME_L, TSDB_COL_NAME_LEN);
+  return s;
+}
+
+SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const char* name) {
+  SSchema s = {0};
+
+  s.type  = pVal->nType;
+  if (s.type == TSDB_DATA_TYPE_BINARY || s.type == TSDB_DATA_TYPE_NCHAR) {
+    s.bytes = (int16_t)(pVal->nLen + VARSTR_HEADER_SIZE);
+  } else {
+    s.bytes = tDataTypeDesc[pVal->nType].nSize;
+  }
+
+  s.colId = TSDB_UD_COLUMN_INDEX;
+  if (name != NULL) {
+    tstrncpy(s.name, name, sizeof(s.name));
+  } else {
+    size_t tlen = MIN(sizeof(s.name), exprStr->n + 1);
+    tstrncpy(s.name, exprStr->z, tlen);
+    strdequote(s.name);
+  }
+
+  return s;
+}
+
+bool tscValidateTableNameLength(size_t len) {
+  return len < TSDB_TABLE_NAME_LEN;
+}
+
+SColumnFilterInfo* tscFilterInfoClone(const SColumnFilterInfo* src, int32_t numOfFilters) {
+  if (numOfFilters == 0) {
+    assert(src == NULL);
+    return NULL;
+  }
+
+  SColumnFilterInfo* pFilter = calloc(1, numOfFilters * sizeof(SColumnFilterInfo));
+
+  memcpy(pFilter, src, sizeof(SColumnFilterInfo) * numOfFilters);
+  for (int32_t j = 0; j < numOfFilters; ++j) {
+
+    if (pFilter[j].filterstr) {
+      size_t len = (size_t) pFilter[j].len + 1 * TSDB_NCHAR_SIZE;
+      pFilter[j].pz = (int64_t) calloc(1, len);
+
+      memcpy((char*)pFilter[j].pz, (char*)src[j].pz, (size_t)len);
+    }
+  }
+
+  assert(src->filterstr == 0 || src->filterstr == 1);
+  assert(!(src->lowerRelOptr == TSDB_RELATION_INVALID && src->upperRelOptr == TSDB_RELATION_INVALID));
+
+  return pFilter;
+}
+
+#if 0
+int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t slidingTime, int64_t intervalTime, char timeUnit, int16_t precision) {
+  if (slidingTime == 0) {
+    return startTime;
+  }
+  int64_t start = startTime;
+  if (timeUnit == 'n' || timeUnit == 'y') {
+    start /= 1000;
+    if (precision == TSDB_TIME_PRECISION_MICRO) {
+      start /= 1000;
+    }
+    struct tm tm;
+    time_t t = (time_t)start;
+    localtime_r(&t, &tm);
+    tm.tm_sec = 0;
+    tm.tm_min = 0;
+    tm.tm_hour = 0;
+    tm.tm_mday = 1;
+
+    if (timeUnit == 'y') {
+      tm.tm_mon = 0;
+      tm.tm_year = (int)(tm.tm_year / slidingTime * slidingTime);
+    } else {
+      int mon = tm.tm_year * 12 + tm.tm_mon;
+      mon = (int)(mon / slidingTime * slidingTime);
+      tm.tm_year = mon / 12;
+      tm.tm_mon = mon % 12;
+    }
+
+    start = mktime(&tm) * 1000L;
+    if (precision == TSDB_TIME_PRECISION_MICRO) {
+      start *= 1000L;
+    }
+  } else {
+    int64_t delta = startTime - intervalTime;
+    int32_t factor = delta > 0? 1:-1;
+
+    start = (delta / slidingTime + factor) * slidingTime;
+
+    if (timeUnit == 'd' || timeUnit == 'w') {
+      /*
+      * here we revised the start time of day according to the local time zone,
+      * but in case of DST, the start time of one day need to be dynamically decided.
+      */
+      // todo refactor to extract function that is available for Linux/Windows/Mac platform
+  #if defined(WINDOWS) && _MSC_VER >= 1900
+      // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
+      int64_t timezone = _timezone;
+      int32_t daylight = _daylight;
+      char**  tzname = _tzname;
+  #endif
+
+      int64_t t = (precision == TSDB_TIME_PRECISION_MILLI) ? MILLISECOND_PER_SECOND : MILLISECOND_PER_SECOND * 1000L;
+      start += timezone * t;
+    }
+
+    int64_t end = start + intervalTime - 1;
+    if (end < startTime) {
+      start += slidingTime;
+    }
+  }
+
+  return start;
+}
+
+#endif
+
+/*
+ * tablePrefix.columnName
+ * extract table name and save it in pTable, with only column name in pToken
+ */
+void extractTableNameFromToken(SStrToken* pToken, SStrToken* 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 = (uint32_t)(r - pToken->z);
+    pTable->z = pToken->z;
+
+    r += 1;
+    pToken->n -= (uint32_t)(r - pToken->z);
+    pToken->z = r;
+  }
+}
diff --git a/src/common/src/ttimezone.c b/src/common/src/ttimezone.c
new file mode 100644
index 0000000000000000000000000000000000000000..62d4768db8a368daab105ac5abf6cf7607d5e52b
--- /dev/null
+++ b/src/common/src/ttimezone.c
@@ -0,0 +1,67 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+#include "tglobal.h"
+#include "tconfig.h"
+#include "tutil.h"
+
+// TODO refactor to set the tz value through parameter
+void tsSetTimeZone() {
+  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
+  if (cfg_timezone != NULL) {
+    uInfo("timezone is set to %s by %s", tsTimezone, tsCfgStatusStr[cfg_timezone->cfgStatus]);
+  }
+
+#ifdef WINDOWS
+  char winStr[TSDB_LOCALE_LEN * 2];
+  sprintf(winStr, "TZ=%s", tsTimezone);
+  putenv(winStr);
+#else
+  setenv("TZ", tsTimezone, 1);
+#endif
+  tzset();
+
+  /*
+  * get CURRENT time zone.
+  * system current time zone is affected by daylight saving time(DST)
+  *
+  * e.g., the local time zone of London in DST is GMT+01:00,
+  * otherwise is GMT+00:00
+  */
+#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+  // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
+  int64_t timezone = _timezone;
+  int32_t daylight = _daylight;
+  char **tzname = _tzname;
+#endif
+#endif
+
+  int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
+  tz += daylight;
+
+  /*
+  * format:
+  * (CST, +0800)
+  * (BST, +0100)
+  */
+  sprintf(tsTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+  tsDaylight = daylight;
+
+  uInfo("timezone format changed to %s", tsTimezone);
+}
diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff417b6cdef4c60dc8d563800a2b2d4c92c8d0c3
--- /dev/null
+++ b/src/common/src/ttypes.c
@@ -0,0 +1,582 @@
+/*
+ * 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 "os.h"
+
+#include "taosdef.h"
+#include "ttokendef.h"
+#include "tscompression.h"
+
+const int32_t TYPE_BYTES[11] = {
+    -1,                      // TSDB_DATA_TYPE_NULL
+    sizeof(int8_t),          // TSDB_DATA_TYPE_BOOL
+    sizeof(int8_t),          // TSDB_DATA_TYPE_TINYINT
+    sizeof(int16_t),         // TSDB_DATA_TYPE_SMALLINT
+    sizeof(int32_t),         // TSDB_DATA_TYPE_INT
+    sizeof(int64_t),         // TSDB_DATA_TYPE_BIGINT
+    sizeof(float),           // TSDB_DATA_TYPE_FLOAT
+    sizeof(double),          // TSDB_DATA_TYPE_DOUBLE
+    sizeof(VarDataOffsetT),  // TSDB_DATA_TYPE_BINARY
+    sizeof(TSKEY),           // TSDB_DATA_TYPE_TIMESTAMP
+    sizeof(VarDataOffsetT)   // TSDB_DATA_TYPE_NCHAR
+};
+
+static void getStatics_bool(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                            int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  int8_t *data = (int8_t *)pData;
+  *min = INT64_MAX;
+  *max = INT64_MIN;
+  *minIndex = 0;
+  *maxIndex = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((char *)&data[i], TSDB_DATA_TYPE_BOOL)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    *sum += data[i];
+    if (*min > data[i]) {
+      *min = data[i];
+      *minIndex = i;
+    }
+    
+    if (*max < data[i]) {
+      *max = data[i];
+      *maxIndex = i;
+    }
+  }
+}
+
+static void getStatics_i8(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                          int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  int8_t *data = (int8_t *)pData;
+  *min = INT64_MAX;
+  *max = INT64_MIN;
+  *minIndex = 0;
+  *maxIndex = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((char *)&data[i], TSDB_DATA_TYPE_TINYINT)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    *sum += data[i];
+    if (*min > data[i]) {
+      *min = data[i];
+      *minIndex = i;
+    }
+    
+    if (*max < data[i]) {
+      *max = data[i];
+      *maxIndex = i;
+    }
+  }
+}
+
+static void getStatics_i16(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  int16_t *data = (int16_t *)pData;
+  *min = INT64_MAX;
+  *max = INT64_MIN;
+  *minIndex = 0;
+  *maxIndex = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  //  int64_t lastKey = 0;
+  //  int16_t lastVal = TSDB_DATA_SMALLINT_NULL;
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_SMALLINT)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    *sum += data[i];
+    if (*min > data[i]) {
+      *min = data[i];
+      *minIndex = i;
+    }
+    
+    if (*max < data[i]) {
+      *max = data[i];
+      *maxIndex = i;
+    }
+    
+    //    if (isNull(&lastVal, TSDB_DATA_TYPE_SMALLINT)) {
+    //      lastKey = primaryKey[i];
+    //      lastVal = data[i];
+    //    } else {
+    //      *wsum = lastVal * (primaryKey[i] - lastKey);
+    //      lastKey = primaryKey[i];
+    //      lastVal = data[i];
+    //    }
+  }
+}
+
+static void getStatics_i32(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  int32_t *data = (int32_t *)pData;
+  *min = INT64_MAX;
+  *max = INT64_MIN;
+  *minIndex = 0;
+  *maxIndex = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  //  int64_t lastKey = 0;
+  //  int32_t lastVal = TSDB_DATA_INT_NULL;
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_INT)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    *sum += data[i];
+    if (*min > data[i]) {
+      *min = data[i];
+      *minIndex = i;
+    }
+    
+    if (*max < data[i]) {
+      *max = data[i];
+      *maxIndex = i;
+    }
+  }
+}
+
+static void getStatics_i64(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  int64_t *data = (int64_t *)pData;
+  *min = INT64_MAX;
+  *max = INT64_MIN;
+  *minIndex = 0;
+  *maxIndex = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_BIGINT)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    *sum += data[i];
+    if (*min > data[i]) {
+      *min = data[i];
+      *minIndex = i;
+    }
+    
+    if (*max < data[i]) {
+      *max = data[i];
+      *maxIndex = i;
+    }
+    
+    //    if (isNull(&lastVal, TSDB_DATA_TYPE_BIGINT)) {
+    //      lastKey = primaryKey[i];
+    //      lastVal = data[i];
+    //    } else {
+    //      *wsum = lastVal * (primaryKey[i] - lastKey);
+    //      lastKey = primaryKey[i];
+    //      lastVal = data[i];
+    //    }
+  }
+}
+
+static void getStatics_f(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                         int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  float *data = (float *)pData;
+  float fmin      = FLT_MAX;
+  float fmax      = -FLT_MAX;
+  double dsum     = 0;
+  *minIndex       = 0;
+  *maxIndex       = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_FLOAT)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    float fv = 0;
+    fv = GET_FLOAT_VAL(&(data[i]));
+    dsum += fv;
+    if (fmin > fv) {
+      fmin = fv;
+      *minIndex = i;
+    }
+    
+    if (fmax < fv) {
+      fmax = fv;
+      *maxIndex = i;
+    }
+  }
+  
+  double csum = 0;
+  csum = GET_DOUBLE_VAL(sum);
+  csum += dsum;
+#ifdef _TD_ARM_32_
+  SET_DOUBLE_VAL_ALIGN(sum, &csum);
+  SET_DOUBLE_VAL_ALIGN(max, &fmax);
+  SET_DOUBLE_VAL_ALIGN(min, &fmin);
+#else
+  *(double*)sum = csum;
+  *(double*)max = fmax;
+  *(double*)min = fmin;
+#endif
+}
+
+static void getStatics_d(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                         int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  double *data = (double *)pData;
+  double dmin      = DBL_MAX;
+  double dmax      = -DBL_MAX;
+  double dsum      = 0;
+  *minIndex        = 0;
+  *maxIndex        = 0;
+  
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull((const char*) &data[i], TSDB_DATA_TYPE_DOUBLE)) {
+      (*numOfNull) += 1;
+      continue;
+    }
+    
+    double dv = 0;
+    dv = GET_DOUBLE_VAL(&(data[i]));
+    dsum += dv;
+    if (dmin > dv) {
+      dmin = dv;
+      *minIndex = i;
+    }
+    
+    if (dmax < dv) {
+      dmax = dv;
+      *maxIndex = i;
+    }
+  }
+  
+  double csum = 0;
+  csum = GET_DOUBLE_VAL(sum);
+  csum += dsum;
+
+
+#ifdef _TD_ARM_32_
+  SET_DOUBLE_VAL_ALIGN(sum, &csum);
+  SET_DOUBLE_VAL_ALIGN(max, &dmax);
+  SET_DOUBLE_VAL_ALIGN(min, &dmin);
+#else
+  *(double*) sum = csum;
+  *(double*) max = dmax;
+  *(double*) min = dmin;
+#endif
+}
+
+static void getStatics_bin(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                         int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  const char* data = pData;
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull(data, TSDB_DATA_TYPE_BINARY)) {
+      (*numOfNull) += 1;
+    }
+    
+    data += varDataTLen(data);
+  }
+  
+  *sum = 0;
+  *max = 0;
+  *min = 0;
+  *minIndex = 0;
+  *maxIndex = 0;
+}
+
+static void getStatics_nchr(const TSKEY *primaryKey, const void *pData, int32_t numOfRow, int64_t *min, int64_t *max,
+                           int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int16_t *numOfNull) {
+  const char* data = pData;
+  ASSERT(numOfRow <= INT16_MAX);
+  
+  for (int32_t i = 0; i < numOfRow; ++i) {
+    if (isNull(data, TSDB_DATA_TYPE_NCHAR)) {
+      (*numOfNull) += 1;
+    }
+    
+    data += varDataTLen(data);
+  }
+  
+  *sum = 0;
+  *max = 0;
+  *min = 0;
+  *minIndex = 0;
+  *maxIndex = 0;
+}
+
+tDataTypeDescriptor tDataTypeDesc[11] = {
+  {TSDB_DATA_TYPE_NULL,      6, 1,            "NOTYPE",    NULL,                NULL,                  NULL},
+  {TSDB_DATA_TYPE_BOOL,      4, CHAR_BYTES,   "BOOL",      tsCompressBool,      tsDecompressBool,      getStatics_bool},
+  {TSDB_DATA_TYPE_TINYINT,   7, CHAR_BYTES,   "TINYINT",   tsCompressTinyint,   tsDecompressTinyint,   getStatics_i8},
+  {TSDB_DATA_TYPE_SMALLINT,  8, SHORT_BYTES,  "SMALLINT",  tsCompressSmallint,  tsDecompressSmallint,  getStatics_i16},
+  {TSDB_DATA_TYPE_INT,       3, INT_BYTES,    "INT",       tsCompressInt,       tsDecompressInt,       getStatics_i32},
+  {TSDB_DATA_TYPE_BIGINT,    6, LONG_BYTES,   "BIGINT",    tsCompressBigint,    tsDecompressBigint,    getStatics_i64},
+  {TSDB_DATA_TYPE_FLOAT,     5, FLOAT_BYTES,  "FLOAT",     tsCompressFloat,     tsDecompressFloat,     getStatics_f},
+  {TSDB_DATA_TYPE_DOUBLE,    6, DOUBLE_BYTES, "DOUBLE",    tsCompressDouble,    tsDecompressDouble,    getStatics_d},
+  {TSDB_DATA_TYPE_BINARY,    6, 0,            "BINARY",    tsCompressString,    tsDecompressString,    getStatics_bin},
+  {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES,   "TIMESTAMP", tsCompressTimestamp, tsDecompressTimestamp, getStatics_i64},
+  {TSDB_DATA_TYPE_NCHAR,     5, 8,            "NCHAR",     tsCompressString,    tsDecompressString,    getStatics_nchr},
+};
+
+char tTokenTypeSwitcher[13] = {
+    TSDB_DATA_TYPE_NULL,    // no type
+    TSDB_DATA_TYPE_BINARY,  // TK_ID
+    TSDB_DATA_TYPE_BOOL,    // TK_BOOL
+    TSDB_DATA_TYPE_BIGINT,  // TK_TINYINT
+    TSDB_DATA_TYPE_BIGINT,  // TK_SMALLINT
+    TSDB_DATA_TYPE_BIGINT,  // TK_INTEGER
+    TSDB_DATA_TYPE_BIGINT,  // TK_BIGINT
+    TSDB_DATA_TYPE_DOUBLE,  // TK_FLOAT
+    TSDB_DATA_TYPE_DOUBLE,  // TK_DOUBLE
+    TSDB_DATA_TYPE_BINARY,  // TK_STRING
+    TSDB_DATA_TYPE_BIGINT,  // TK_TIMESTAMP
+    TSDB_DATA_TYPE_BINARY,  // TK_BINARY
+    TSDB_DATA_TYPE_NCHAR,   // TK_NCHAR
+};
+
+bool isValidDataType(int32_t type) {
+  return type >= TSDB_DATA_TYPE_NULL && type <= TSDB_DATA_TYPE_NCHAR;
+}
+
+//bool isNull(const char *val, int32_t type) {
+//  switch (type) {
+//    case TSDB_DATA_TYPE_BOOL:
+//      return *(uint8_t *)val == TSDB_DATA_BOOL_NULL;
+//    case TSDB_DATA_TYPE_TINYINT:
+//      return *(uint8_t *)val == TSDB_DATA_TINYINT_NULL;
+//    case TSDB_DATA_TYPE_SMALLINT:
+//      return *(uint16_t *)val == TSDB_DATA_SMALLINT_NULL;
+//    case TSDB_DATA_TYPE_INT:
+//      return *(uint32_t *)val == TSDB_DATA_INT_NULL;
+//    case TSDB_DATA_TYPE_BIGINT:
+//    case TSDB_DATA_TYPE_TIMESTAMP:
+//      return *(uint64_t *)val == TSDB_DATA_BIGINT_NULL;
+//    case TSDB_DATA_TYPE_FLOAT:
+//      return *(uint32_t *)val == TSDB_DATA_FLOAT_NULL;
+//    case TSDB_DATA_TYPE_DOUBLE:
+//      return *(uint64_t *)val == TSDB_DATA_DOUBLE_NULL;
+//    case TSDB_DATA_TYPE_NCHAR:
+//      return *(uint32_t*) varDataVal(val) == TSDB_DATA_NCHAR_NULL;
+//    case TSDB_DATA_TYPE_BINARY:
+//      return *(uint8_t *) varDataVal(val) == TSDB_DATA_BINARY_NULL;
+//    default:
+//      return false;
+//  };
+//}
+
+void setVardataNull(char* val, int32_t type) {
+  if (type == TSDB_DATA_TYPE_BINARY) {
+    varDataSetLen(val, sizeof(int8_t));
+    *(uint8_t*) varDataVal(val) = TSDB_DATA_BINARY_NULL;
+  } else if (type == TSDB_DATA_TYPE_NCHAR) {
+    varDataSetLen(val, sizeof(int32_t));
+    *(uint32_t*) varDataVal(val) = TSDB_DATA_NCHAR_NULL;
+  } else {
+    assert(0);
+  }
+}
+
+void setNull(char *val, int32_t type, int32_t bytes) { setNullN(val, type, bytes, 1); }
+
+void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems) {
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint8_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_BOOL_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint8_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_TINYINT_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint16_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_SMALLINT_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_INT:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint32_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_INT_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint64_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_BIGINT_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint32_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_FLOAT_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint64_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_DOUBLE_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_NCHAR: // todo : without length?
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint32_t *)(val + i * bytes) = TSDB_DATA_NCHAR_NULL;
+      }
+      break;
+    case TSDB_DATA_TYPE_BINARY:
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint8_t *)(val + i * bytes) = TSDB_DATA_BINARY_NULL;
+      }
+      break;
+    default: {
+      for (int32_t i = 0; i < numOfElems; ++i) {
+        *(uint32_t *)(val + i * tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize) = TSDB_DATA_INT_NULL;
+      }
+      break;
+    }
+  }
+}
+
+static uint8_t  nullBool = TSDB_DATA_BOOL_NULL;
+static uint8_t  nullTinyInt = TSDB_DATA_TINYINT_NULL;
+static uint16_t nullSmallInt = TSDB_DATA_SMALLINT_NULL;
+static uint32_t nullInt = TSDB_DATA_INT_NULL;
+static uint64_t nullBigInt = TSDB_DATA_BIGINT_NULL;
+static uint32_t nullFloat = TSDB_DATA_FLOAT_NULL;
+static uint64_t nullDouble = TSDB_DATA_DOUBLE_NULL;
+
+static union {
+  tstr str;
+  char pad[sizeof(tstr) + 4];
+} nullBinary = {.str = {.len = 1}}, nullNchar = {.str = {.len = 4}};
+
+static void *nullValues[] = {
+    &nullBool,  &nullTinyInt, &nullSmallInt, &nullInt,    &nullBigInt,
+    &nullFloat, &nullDouble,  &nullBinary,   &nullBigInt, &nullNchar,
+};
+
+void *getNullValue(int32_t type) {
+  assert(type >= TSDB_DATA_TYPE_BOOL && type <= TSDB_DATA_TYPE_NCHAR);
+  return nullValues[type - 1];
+}
+
+void assignVal(char *val, const char *src, int32_t len, int32_t type) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT: {
+      *((int32_t *)val) = GET_INT32_VAL(src);
+      break;
+    }
+    case TSDB_DATA_TYPE_FLOAT: {
+#ifdef _TD_ARM_32_
+      float fv = GET_FLOAT_VAL(src);
+      SET_FLOAT_VAL_ALIGN(val, &fv);
+#else
+      *((float *)val) = GET_FLOAT_VAL(src);
+#endif
+      break;
+    };
+    case TSDB_DATA_TYPE_DOUBLE: {
+#ifdef _TD_ARM_32_
+      double dv = GET_DOUBLE_VAL(src);
+      SET_DOUBLE_VAL_ALIGN(val, &dv);
+#else
+      *((double *)val) = GET_DOUBLE_VAL(src);
+#endif
+      break;
+    };
+    case TSDB_DATA_TYPE_TIMESTAMP:
+    case TSDB_DATA_TYPE_BIGINT: {
+      *((int64_t *)val) = GET_INT64_VAL(src);
+      break;
+    };
+    case TSDB_DATA_TYPE_SMALLINT: {
+      *((int16_t *)val) = GET_INT16_VAL(src);
+      break;
+    };
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT: {
+      *((int8_t *)val) = GET_INT8_VAL(src);
+      break;
+    };
+    case TSDB_DATA_TYPE_BINARY: {
+      varDataCopy(val, src);
+      break;
+    };
+    case TSDB_DATA_TYPE_NCHAR: {
+      varDataCopy(val, src);
+      break;
+    };
+    default: {
+      memcpy(val, src, len);
+      break;
+    }
+  }
+}
+
+void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT: {
+      SWAP(*(int32_t *)(pLeft), *(int32_t *)(pRight), int32_t);
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP: {
+      SWAP(*(int64_t *)(pLeft), *(int64_t *)(pRight), int64_t);
+      break;
+    }
+    case TSDB_DATA_TYPE_DOUBLE: {
+      SWAP(*(double *)(pLeft), *(double *)(pRight), double);
+      break;
+    }
+    case TSDB_DATA_TYPE_SMALLINT: {
+      SWAP(*(int16_t *)(pLeft), *(int16_t *)(pRight), int16_t);
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_FLOAT: {
+      SWAP(*(float *)(pLeft), *(float *)(pRight), float);
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT: {
+      SWAP(*(int8_t *)(pLeft), *(int8_t *)(pRight), int8_t);
+      break;
+    }
+    
+    default: {
+      memcpy(buf, pLeft, size);
+      memcpy(pLeft, pRight, size);
+      memcpy(pRight, buf, size);
+      break;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/common/src/tvariant.c b/src/common/src/tvariant.c
new file mode 100644
index 0000000000000000000000000000000000000000..069d8eb2517cbbd70477652140294fb3b3863906
--- /dev/null
+++ b/src/common/src/tvariant.c
@@ -0,0 +1,957 @@
+/*
+ * 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 "os.h"
+
+#include "tvariant.h"
+#include "hash.h"
+#include "taos.h"
+#include "taosdef.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tutil.h"
+
+// todo support scientific expression number and oct number
+void tVariantCreate(tVariant *pVar, SStrToken *token) { tVariantCreateFromString(pVar, token->z, token->n, token->type); }
+
+void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type) {
+  memset(pVar, 0, sizeof(tVariant));
+  
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL: {
+      int32_t k = strncasecmp(pz, "true", 4);
+      if (k == 0) {
+        pVar->i64Key = TSDB_TRUE;
+      } else {
+        assert(strncasecmp(pz, "false", 5) == 0);
+        pVar->i64Key = TSDB_FALSE;
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_INT:
+      pVar->i64Key = strtoll(pz, NULL, 10);
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+    case TSDB_DATA_TYPE_FLOAT:
+      pVar->dKey = strtod(pz, NULL);
+      break;
+    case TSDB_DATA_TYPE_BINARY: {
+      pVar->pz = strndup(pz, len);
+      pVar->nLen = strdequote(pVar->pz);
+      break;
+    }
+    
+    default: {  // nType == 0 means the null value
+      type = TSDB_DATA_TYPE_NULL;
+    }
+  }
+  
+  pVar->nType = type;
+}
+
+/**
+ * create tVariant from binary string, not ascii data
+ * @param pVar
+ * @param pz
+ * @param len
+ * @param type
+ */
+void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32_t type) {
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT: {
+      pVar->i64Key = GET_INT8_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_SMALLINT: {
+      pVar->i64Key = GET_INT16_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_INT: {
+      pVar->i64Key = GET_INT32_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP: {
+      pVar->i64Key = GET_INT64_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_DOUBLE: {
+      pVar->dKey = GET_DOUBLE_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_FLOAT: {
+      pVar->dKey = GET_FLOAT_VAL(pz);
+      break;
+    }
+    case TSDB_DATA_TYPE_NCHAR: { // here we get the nchar length from raw binary bits length
+      size_t lenInwchar = len / TSDB_NCHAR_SIZE;
+
+      pVar->wpz = calloc(1, (lenInwchar + 1) * TSDB_NCHAR_SIZE);
+      memcpy(pVar->wpz, pz, lenInwchar * TSDB_NCHAR_SIZE);
+      pVar->nLen = (int32_t)len;
+      
+      break;
+    }
+    case TSDB_DATA_TYPE_BINARY: {  // todo refactor, extract a method
+      pVar->pz = calloc(len, sizeof(char));
+      memcpy(pVar->pz, pz, len);
+      pVar->nLen = (int32_t)len;
+      break;
+    }
+    
+    default:
+      pVar->i64Key = GET_INT32_VAL(pVar);
+  }
+  
+  pVar->nType = type;
+}
+
+void tVariantDestroy(tVariant *pVar) {
+  if (pVar == NULL) return;
+  
+  if (pVar->nType == TSDB_DATA_TYPE_BINARY || pVar->nType == TSDB_DATA_TYPE_NCHAR) {
+    taosTFree(pVar->pz);
+    pVar->nLen = 0;
+  }
+
+  // NOTE: this is only for string array
+  if (pVar->nType == TSDB_DATA_TYPE_ARRAY) {
+    size_t num = taosArrayGetSize(pVar->arr);
+    for(size_t i = 0; i < num; i++) {
+      void* p = taosArrayGetP(pVar->arr, i);
+      free(p);
+    }
+    taosArrayDestroy(pVar->arr);
+    pVar->arr = NULL;
+  }
+}
+
+void tVariantAssign(tVariant *pDst, const tVariant *pSrc) {
+  if (pSrc == NULL || pDst == NULL) return;
+  
+  *pDst = *pSrc;
+  
+  if (pSrc->nType == TSDB_DATA_TYPE_BINARY || pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
+    int32_t len = pSrc->nLen + 1;
+    if (pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
+      len = len * TSDB_NCHAR_SIZE;
+    }
+    
+    pDst->pz = calloc(1, len);
+    memcpy(pDst->pz, pSrc->pz, len);
+    return;
+  }
+
+  // this is only for string array
+  if (pSrc->nType == TSDB_DATA_TYPE_ARRAY) {
+    size_t num = taosArrayGetSize(pSrc->arr);
+    pDst->arr = taosArrayInit(num, sizeof(char*));
+    for(size_t i = 0; i < num; i++) {
+      char* p = (char*)taosArrayGetP(pSrc->arr, i);
+      char* n = strdup(p);
+      taosArrayPush(pDst->arr, &n);
+    }
+
+    return;
+  }
+
+  pDst->nLen = tDataTypeDesc[pDst->nType].nSize;
+}
+
+int32_t tVariantCompare(const tVariant* p1, const tVariant* p2) {
+  if (p1->nType == TSDB_DATA_TYPE_NULL && p2->nType == TSDB_DATA_TYPE_NULL) {
+    return 0;
+  }
+
+  if (p1->nType == TSDB_DATA_TYPE_NULL) {
+    return -1;
+  }
+
+  if (p2->nType == TSDB_DATA_TYPE_NULL) {
+    return 1;
+  }
+
+  switch (p1->nType) {
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR: {
+      if (p1->nLen == p2->nLen) {
+        return memcmp(p1->pz, p2->pz, p1->nLen);
+      } else {
+        return p1->nLen > p2->nLen? 1:-1;
+      }
+    };
+
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE:
+      if (p1->dKey == p2->dKey) {
+        return 0;
+      } else {
+        return p1->dKey > p2->dKey? 1:-1;
+      }
+
+    default:
+      if (p1->i64Key == p2->i64Key) {
+        return 0;
+      } else {
+        return p1->i64Key > p2->i64Key? 1:-1;
+      }
+  }
+}
+
+int32_t tVariantToString(tVariant *pVar, char *dst) {
+  if (pVar == NULL || dst == NULL) return 0;
+  
+  switch (pVar->nType) {
+    case TSDB_DATA_TYPE_BINARY: {
+      int32_t len = sprintf(dst, "\'%s\'", pVar->pz);
+      assert(len <= pVar->nLen + sizeof("\'") * 2);  // two more chars
+      return len;
+    }
+    
+    case TSDB_DATA_TYPE_NCHAR: {
+      dst[0] = '\'';
+      taosUcs4ToMbs(pVar->wpz, (twcslen(pVar->wpz) + 1) * TSDB_NCHAR_SIZE, dst + 1);
+      int32_t len = (int32_t)strlen(dst);
+      dst[len] = '\'';
+      dst[len + 1] = 0;
+      return len + 1;
+    }
+    
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_INT:
+      return sprintf(dst, "%d", (int32_t)pVar->i64Key);
+    
+    case TSDB_DATA_TYPE_BIGINT:
+      return sprintf(dst, "%" PRId64, pVar->i64Key);
+    
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE:
+      return sprintf(dst, "%.9lf", pVar->dKey);
+    
+    default:
+      return 0;
+  }
+}
+
+#if 0
+static int32_t doConvertToInteger(tVariant *pVariant, char *pDest, int32_t type, bool releaseVariantPtr) {
+  if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+    setNull(pDest, type, tDataTypeDesc[type].nSize);
+    return 0;
+  }
+
+  if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+    *((int64_t *)pDest) = pVariant->i64Key;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+    if ((pVariant->dKey < INT64_MIN) || (pVariant->dKey > INT64_MAX)) {
+      return -1;
+    }
+
+    *((int64_t *)pDest) = (int64_t)pVariant->dKey;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+    errno = 0;
+    char *endPtr = NULL;
+
+    SStrToken token = {0};
+    token.n = tSQLGetToken(pVariant->pz, &token.type);
+
+    if (token.type == TK_MINUS || token.type == TK_PLUS) {
+      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
+    }
+
+    if (token.type == TK_FLOAT) {
+      double v = strtod(pVariant->pz, &endPtr);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+
+      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+        return -1;
+      }
+
+      if ((v < INT64_MIN) || (v > INT64_MAX)) {
+        return -1;
+      }
+
+      *((int64_t *)pDest) = (int64_t)v;
+    } else if (token.type == TK_INTEGER) {
+      int64_t val = strtoll(pVariant->pz, &endPtr, 10);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+
+      if (errno == ERANGE) {
+        return -1;  // data overflow
+      }
+
+      *((int64_t *)pDest) = val;
+    } else if (token.type == TK_NULL) {
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      setNull(pDest, type, tDataTypeDesc[type].nSize);
+    } else {
+      return -1;
+    }
+
+  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
+    errno = 0;
+    wchar_t *endPtr = NULL;
+
+    SStrToken token = {0};
+    token.n = tSQLGetToken(pVariant->pz, &token.type);
+
+    if (token.type == TK_MINUS || token.type == TK_PLUS) {
+      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
+    }
+
+    if (token.type == TK_FLOAT) {
+      double v = wcstod(pVariant->wpz, &endPtr);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+
+      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+        return -1;
+      }
+
+      if ((v < INT64_MIN) || (v > INT64_MAX)) {
+        return -1;
+      }
+
+      *((int64_t *)pDest) = (int64_t)v;
+    } else if (token.type == TK_NULL) {
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      setNull(pDest, type, tDataTypeDesc[type].nSize);
+    } else {
+      int64_t val = wcstoll(pVariant->wpz, &endPtr, 10);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+
+      if (errno == ERANGE) {
+        return -1;  // data overflow
+      }
+
+      *((int64_t *)pDest) = val;
+    }
+  }
+
+  return 0;
+}
+#endif
+static FORCE_INLINE int32_t convertToBoolImpl(char *pStr, int32_t len) {
+  if ((strncasecmp(pStr, "true", len) == 0) && (len == 4)) {
+    return TSDB_TRUE;
+  } else if ((strncasecmp(pStr, "false", len) == 0) && (len == 5)) {
+    return TSDB_FALSE;
+  } else if (strcasecmp(pStr, TSDB_DATA_NULL_STR_L) == 0) {
+    return TSDB_DATA_BOOL_NULL;
+  } else {
+    return -1;
+  }
+}
+
+static FORCE_INLINE int32_t wcsconvertToBoolImpl(wchar_t *pstr, int32_t len) {
+  if ((wcsncasecmp(pstr, L"true", len) == 0) && (len == 4)) {
+    return TSDB_TRUE;
+  } else if (wcsncasecmp(pstr, L"false", len) == 0 && (len == 5)) {
+    return TSDB_FALSE;
+  } else {
+    return -1;
+  }
+}
+
+static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
+  const int32_t INITIAL_ALLOC_SIZE = 20;
+  char *        pBuf = NULL;
+  
+  if (*pDest == pVariant->pz) {
+    pBuf = calloc(1, INITIAL_ALLOC_SIZE);
+  }
+  
+  if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
+    size_t newSize = pVariant->nLen * TSDB_NCHAR_SIZE;
+    if (pBuf != NULL) {
+      if (newSize >= INITIAL_ALLOC_SIZE) {
+        pBuf = realloc(pBuf, newSize + 1);
+      }
+      
+      taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, pBuf);
+      free(pVariant->wpz);
+      pBuf[newSize] = 0;
+    } else {
+      taosUcs4ToMbs(pVariant->wpz, (int32_t)newSize, *pDest);
+    }
+    
+  } else {
+    if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+      sprintf(pBuf == NULL ? *pDest : pBuf, "%" PRId64, pVariant->i64Key);
+    } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+      sprintf(pBuf == NULL ? *pDest : pBuf, "%lf", pVariant->dKey);
+    } else if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
+      sprintf(pBuf == NULL ? *pDest : pBuf, "%s", (pVariant->i64Key == TSDB_TRUE) ? "TRUE" : "FALSE");
+    } else if (pVariant->nType == 0) {  // null data
+      setNull(pBuf == NULL ? *pDest : pBuf, TSDB_DATA_TYPE_BINARY, 0);
+    }
+  }
+  
+  if (pBuf != NULL) {
+    *pDest = pBuf;
+  }
+  
+  *pDestSize = (int32_t)strlen(*pDest);
+  return 0;
+}
+
+// todo handle the error
+static int32_t toNchar(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
+  char tmpBuf[40] = {0};
+  
+  char *  pDst = tmpBuf;
+  int32_t nLen = 0;
+  
+  if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+    nLen = sprintf(pDst, "%" PRId64, pVariant->i64Key);
+  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+    nLen = sprintf(pDst, "%lf", pVariant->dKey);
+  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+    pDst = pVariant->pz;
+    nLen = pVariant->nLen;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
+    nLen = sprintf(pDst, "%s", (pVariant->i64Key == TSDB_TRUE) ? "TRUE" : "FALSE");
+  }
+  
+  if (*pDest == pVariant->pz) {
+    wchar_t *pWStr = calloc(1, (nLen + 1) * TSDB_NCHAR_SIZE);
+    taosMbsToUcs4(pDst, nLen, (char *)pWStr, (nLen + 1) * TSDB_NCHAR_SIZE, NULL);
+    
+    // free the binary buffer in the first place
+    if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+      free(pVariant->wpz);
+    }
+    
+    pVariant->wpz = pWStr;
+    *pDestSize = twcslen(pVariant->wpz);
+    
+    // shrink the allocate memory, no need to check here.
+    char* tmp = realloc(pVariant->wpz, (*pDestSize + 1)*TSDB_NCHAR_SIZE);
+    assert(tmp != NULL);
+    
+    pVariant->wpz = (wchar_t *)tmp;
+  } else {
+    size_t output = -1;
+    taosMbsToUcs4(pDst, nLen, *pDest, (nLen + 1) * TSDB_NCHAR_SIZE, &output);
+    
+    if (pDestSize != NULL) {
+      *pDestSize = (int32_t)output;
+    }
+  }
+  
+  return 0;
+}
+
+static FORCE_INLINE int32_t convertToDouble(char *pStr, int32_t len, double *value) {
+  SStrToken stoken = {.z = pStr, .n = len};
+  
+  if (TK_ILLEGAL == isValidNumber(&stoken)) {
+    return -1;
+  }
+  
+  *value = strtod(pStr, NULL);
+  
+  return 0;
+}
+
+static FORCE_INLINE int32_t convertToInteger(tVariant *pVariant, int64_t *result, int32_t type, int64_t lowBnd,
+                                             int64_t upperBnd, bool releaseVariantPtr) {
+  if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+    setNull((char *)result, type, tDataTypeDesc[type].nSize);
+    return 0;
+  }
+  
+  if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+    *result = pVariant->i64Key;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+    *result = (int64_t)pVariant->dKey;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+    errno = 0;
+    char *endPtr = NULL;
+    
+    SStrToken token = {0};
+    token.n = tSQLGetToken(pVariant->pz, &token.type);
+    
+    if (token.type == TK_MINUS || token.type == TK_PLUS) {
+      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
+    }
+    
+    if (token.type == TK_NULL) {
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+
+      setNull((char *)result, type, tDataTypeDesc[type].nSize);
+      return 0;
+    }
+    
+    SStrToken sToken = {.z = pVariant->pz, .n = pVariant->nLen};
+    if (TK_ILLEGAL == isValidNumber(&sToken)) {
+      return -1;
+    }
+    
+    if (token.type == TK_FLOAT) {
+      double v = strtod(pVariant->pz, &endPtr);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      
+      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+        return -1;
+      }
+      
+      *result = (int64_t)v;
+    } else if (token.type == TK_INTEGER) {
+      int64_t val = strtoll(pVariant->pz, &endPtr, 10);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      
+      if (errno == ERANGE) {
+        return -1;  // data overflow
+      }
+      
+      *result = val;
+    } else {
+      return -1;
+    }
+  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
+    errno = 0;
+    wchar_t *endPtr = NULL;
+    
+    SStrToken token = {0};
+    token.n = tSQLGetToken(pVariant->pz, &token.type);
+    
+    if (token.type == TK_MINUS || token.type == TK_PLUS) {
+      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
+    }
+    
+    if (token.type == TK_FLOAT) {
+      double v = wcstod(pVariant->wpz, &endPtr);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      
+      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+        return -1;
+      }
+      
+      *result = (int64_t)v;
+    } else if (token.type == TK_NULL) {
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      setNull((char *)result, type, tDataTypeDesc[type].nSize);
+      return 0;
+    } else {
+      int64_t val = wcstoll(pVariant->wpz, &endPtr, 10);
+      if (releaseVariantPtr) {
+        free(pVariant->pz);
+        pVariant->nLen = 0;
+      }
+      
+      if (errno == ERANGE) {
+        return -1;  // data overflow
+      }
+      
+      *result = val;
+    }
+  }
+  
+  if ((*result <= lowBnd) || (*result > upperBnd)) {
+    return -1;
+  }
+  
+  return 0;
+}
+
+static int32_t convertToBool(tVariant *pVariant, int64_t *pDest) {
+  if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
+    *pDest = pVariant->i64Key;  // in order to be compatible to null of bool
+  } else if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+    *pDest = ((pVariant->i64Key != 0) ? TSDB_TRUE : TSDB_FALSE);
+  } else if (pVariant->nType == TSDB_DATA_TYPE_FLOAT || pVariant->nType == TSDB_DATA_TYPE_DOUBLE) {
+    *pDest = ((pVariant->dKey != 0) ? TSDB_TRUE : TSDB_FALSE);
+  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+    int32_t ret = 0;
+    if ((ret = convertToBoolImpl(pVariant->pz, pVariant->nLen)) < 0) {
+      return ret;
+    }
+    
+    *pDest = ret;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
+    int32_t ret = 0;
+    if ((ret = wcsconvertToBoolImpl(pVariant->wpz, pVariant->nLen)) < 0) {
+      return ret;
+    }
+    *pDest = ret;
+  } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+    *pDest = TSDB_DATA_BOOL_NULL;
+  }
+  
+  assert(*pDest == TSDB_TRUE || *pDest == TSDB_FALSE || *pDest == TSDB_DATA_BOOL_NULL);
+  return 0;
+}
+
+/*
+ * transfer data from variant serve as the implicit data conversion: from input sql string pVariant->nType
+ * to column type defined in schema
+ *
+ * todo handle the return value
+ */
+int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix) {
+  if (pVariant == NULL || (pVariant->nType != 0 && !isValidDataType(pVariant->nType))) {
+    return -1;
+  }
+
+  errno = 0;  // reset global error code
+  
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL: {
+      int64_t dst = 0;
+      if (convertToBool(pVariant, &dst) < 0) {
+        return -1;
+      }
+      *(int8_t *)payload = (int8_t)dst;
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_TINYINT: {
+      int64_t result = 0;
+      if (convertToInteger(pVariant, &result, type, INT8_MIN, INT8_MAX, false) < 0) {
+        return -1;
+      }
+      
+      *((int8_t *)payload) = (int8_t)result;
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_SMALLINT: {
+      int64_t result = 0;
+      if (convertToInteger(pVariant, &result, type, INT16_MIN, INT16_MAX, false) < 0) {
+        return -1;
+      }
+      
+      *((int16_t *)payload) = (int16_t)result;
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_INT: {
+      int64_t result = 0;
+      if (convertToInteger(pVariant, &result, type, INT32_MIN, INT32_MAX, false) < 0) {
+        return -1;
+      }
+      
+      *((int32_t *)payload) = (int32_t)result;
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_BIGINT: {
+      int64_t result = 0;
+      if (convertToInteger(pVariant, &result, type, INT64_MIN, INT64_MAX, false) < 0) {
+        return -1;
+      }
+      
+      *((int64_t *)payload) = (int64_t)result;
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_FLOAT: {
+      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+        if (strncasecmp(TSDB_DATA_NULL_STR_L, pVariant->pz, pVariant->nLen) == 0 &&
+            strlen(TSDB_DATA_NULL_STR_L) == pVariant->nLen) {
+          *((int32_t *)payload) = TSDB_DATA_FLOAT_NULL;
+          return 0;
+        } else {
+          double  value;
+          int32_t ret;
+          ret = convertToDouble(pVariant->pz, pVariant->nLen, &value);
+          if ((errno == ERANGE && (float)value == -1) || (ret != 0)) {
+            return -1;
+          }
+
+#ifdef _TD_ARM_32_
+          //memcpy(&payload, &value, sizeof(float));
+          float fv = (float)value;
+          SET_FLOAT_VAL_ALIGN(payload, &fv);
+#else
+          *((float *)payload) = (float)value;
+#endif
+        }
+      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+#ifdef _TD_ARM_32_
+        //memcpy(&payload, &pVariant->i64Key, sizeof(float));
+        float fv = (float)pVariant->i64Key;
+        SET_FLOAT_VAL_ALIGN(payload, &fv);
+#else
+        *((float *)payload) = (float)pVariant->i64Key;
+#endif
+      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+#ifdef _TD_ARM_32_
+        //memcpy(&payload, &pVariant->dKey, sizeof(float));
+        float fv = (float)pVariant->dKey;
+        SET_FLOAT_VAL_ALIGN(payload, &fv);
+#else
+        *((float *)payload) = (float)pVariant->dKey;
+#endif
+      } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+        *((int32_t *)payload) = TSDB_DATA_FLOAT_NULL;
+        return 0;
+      }
+
+#ifdef _TD_ARM_32_
+      float fv = GET_FLOAT_VAL(payload);
+      if (isinf(fv) || isnan(fv) || fv > FLT_MAX || fv < -FLT_MAX) {
+        return -1;
+      }
+#else
+      if (isinf(*((float *)payload)) || isnan(*((float *)payload)) || *((float *)payload) > FLT_MAX ||
+          *((float *)payload) < -FLT_MAX) {
+        return -1;
+      }
+#endif
+      break;
+    }
+    case TSDB_DATA_TYPE_DOUBLE: {
+      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+        if (strncasecmp(TSDB_DATA_NULL_STR_L, pVariant->pz, pVariant->nLen) == 0 &&
+            strlen(TSDB_DATA_NULL_STR_L) == pVariant->nLen) {
+          *((int64_t *)payload) = TSDB_DATA_DOUBLE_NULL;
+          return 0;
+        } else {
+          double  value = 0;
+          int32_t ret;
+          ret = convertToDouble(pVariant->pz, pVariant->nLen, &value);
+          if ((errno == ERANGE && value == -1) || (ret != 0)) {
+            return -1;
+          }
+
+#ifdef _TD_ARM_32_
+          SET_DOUBLE_VAL_ALIGN(payload, &value);
+#else
+          *((double *)payload) = value;
+#endif
+        }
+      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+#ifdef _TD_ARM_32_
+        double dv = (double)(pVariant->i64Key);
+        SET_DOUBLE_VAL_ALIGN(payload, &dv);
+#else
+        *((double *)payload) = (double)pVariant->i64Key;
+#endif
+      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
+#ifdef _TD_ARM_32_
+        double dv = (double)(pVariant->dKey);
+        SET_DOUBLE_VAL_ALIGN(payload, &dv);
+#else
+        *((double *)payload) = pVariant->dKey;
+#endif
+      } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+        *((int64_t *)payload) = TSDB_DATA_DOUBLE_NULL;
+        return 0;
+      }
+
+#ifdef _TD_ARM_32_
+      double dv = GET_DOUBLE_VAL(payload);
+      if (isinf(dv) || isnan(dv) || dv > DBL_MAX || dv < -DBL_MAX) {
+        return -1;
+      }
+#else
+      if (isinf(*((double *)payload)) || isnan(*((double *)payload)) || *((double *)payload) > DBL_MAX ||
+          *((double *)payload) < -DBL_MAX) {
+        return -1;
+      }
+#endif
+      break;
+    }
+    
+    case TSDB_DATA_TYPE_BINARY: {
+      if (!includeLengthPrefix) {
+        if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+          *(uint8_t*) payload = TSDB_DATA_BINARY_NULL;
+        } else {
+          if (pVariant->nType != TSDB_DATA_TYPE_BINARY) {
+            toBinary(pVariant, &payload, &pVariant->nLen);
+          } else {
+            strncpy(payload, pVariant->pz, pVariant->nLen);
+          }
+        }
+      } else {
+        if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+          setVardataNull(payload, TSDB_DATA_TYPE_BINARY);
+        } else {
+          char *p = varDataVal(payload);
+
+          if (pVariant->nType != TSDB_DATA_TYPE_BINARY) {
+            toBinary(pVariant, &p, &pVariant->nLen);
+          } else {
+            strncpy(p, pVariant->pz, pVariant->nLen);
+          }
+
+          varDataSetLen(payload, pVariant->nLen);
+          assert(p == varDataVal(payload));
+        }
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_TIMESTAMP: {
+      if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+        *((int64_t *)payload) = TSDB_DATA_BIGINT_NULL;
+      } else {
+        *((int64_t *)payload) = pVariant->i64Key;
+      }
+      break;
+    }
+    case TSDB_DATA_TYPE_NCHAR: {
+      int32_t newlen = 0;
+      if (!includeLengthPrefix) {
+        if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+          *(uint32_t *)payload = TSDB_DATA_NCHAR_NULL;
+        } else {
+          if (pVariant->nType != TSDB_DATA_TYPE_NCHAR) {
+            toNchar(pVariant, &payload, &newlen);
+          } else {
+            wcsncpy((wchar_t *)payload, pVariant->wpz, pVariant->nLen);
+          }
+        }
+      } else {
+        if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
+          setVardataNull(payload, TSDB_DATA_TYPE_NCHAR);
+        } else {
+          char *p = varDataVal(payload);
+
+          if (pVariant->nType != TSDB_DATA_TYPE_NCHAR) {
+            toNchar(pVariant, &p, &newlen);
+          } else {
+            wcsncpy((wchar_t *)p, pVariant->wpz, pVariant->nLen);
+            newlen = pVariant->nLen;
+          }
+
+          varDataSetLen(payload, newlen);  // the length may be changed after toNchar function called
+          assert(p == varDataVal(payload));
+        }
+      }
+      
+      break;
+    }
+  }
+  
+  return 0;
+}
+
+/*
+ * In variant, bool/smallint/tinyint/int/bigint share the same attribution of
+ * structure, also ignore the convert the type required
+ *
+ * It is actually the bigint/binary/bool/nchar type transfer
+ */
+int32_t tVariantTypeSetType(tVariant *pVariant, char type) {
+  if (pVariant == NULL || pVariant->nType == 0) {  // value is not set
+    return 0;
+  }
+  
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL: {  // bool
+      if (convertToBool(pVariant, &pVariant->i64Key) < 0) {
+        return -1;
+      }
+      
+      pVariant->nType = type;
+      break;
+    }
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT: {
+      convertToInteger(pVariant, &(pVariant->i64Key), type, INT64_MIN, INT64_MAX, true);
+      pVariant->nType = TSDB_DATA_TYPE_BIGINT;
+      break;
+    }
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE: {
+      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
+        errno = 0;
+        double v = strtod(pVariant->pz, NULL);
+        if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+          free(pVariant->pz);
+          return -1;
+        }
+        
+        free(pVariant->pz);
+        pVariant->dKey = v;
+      } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
+        errno = 0;
+        double v = wcstod(pVariant->wpz, NULL);
+        if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
+          free(pVariant->pz);
+          return -1;
+        }
+        
+        free(pVariant->pz);
+        pVariant->dKey = v;
+      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
+        pVariant->dKey = (double)(pVariant->i64Key);
+      }
+      
+      pVariant->nType = TSDB_DATA_TYPE_DOUBLE;
+      break;
+    }
+    case TSDB_DATA_TYPE_BINARY: {
+      if (pVariant->nType != TSDB_DATA_TYPE_BINARY) {
+        toBinary(pVariant, &pVariant->pz, &pVariant->nLen);
+      }
+      pVariant->nType = type;
+      break;
+    }
+    case TSDB_DATA_TYPE_NCHAR: {
+      if (pVariant->nType != TSDB_DATA_TYPE_NCHAR) {
+        toNchar(pVariant, &pVariant->pz, &pVariant->nLen);
+      }
+      pVariant->nType = type;
+      break;
+    }
+  }
+  
+  return 0;
+}
+
+
diff --git a/src/connector/go b/src/connector/go
new file mode 160000
index 0000000000000000000000000000000000000000..8d7bf743852897110cbdcc7c4322cd7a74d4167b
--- /dev/null
+++ b/src/connector/go
@@ -0,0 +1 @@
+Subproject commit 8d7bf743852897110cbdcc7c4322cd7a74d4167b
diff --git a/src/connector/go/src/taosSql/connection.go b/src/connector/go/src/taosSql/connection.go
deleted file mode 100755
index 2a3f5a9acd8ca9ea384d5bb0f081dc9495f7fd13..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/connection.go
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * 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/>.
- */
-
-package taosSql
-
-import "C"
-import (
-	"context"
-	"errors"
-	"database/sql/driver"
-	"unsafe"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type taosConn struct {
-	taos             unsafe.Pointer
-	affectedRows     int
-	insertId         int
-	cfg              *config
-	status           statusFlag
-	parseTime        bool
-	reset            bool // set when the Go SQL package calls ResetSession
-}
-
-type taosSqlResult struct {
-	affectedRows int64
-	insertId     int64
-}
-
-func (res *taosSqlResult) LastInsertId() (int64, error) {
-	return res.insertId, nil
-}
-
-func (res *taosSqlResult) RowsAffected() (int64, error) {
-	return res.affectedRows, nil
-}
-
-func (mc *taosConn) Begin() (driver.Tx, error) {
-	taosLog.Println("taosSql not support transaction")
-	return nil, errors.New("taosSql not support transaction")
-}
-
-func (mc *taosConn) Close() (err error) {
-	if mc.taos == nil {
-		return errConnNoExist
-	}
-	mc.taos_close()
-	return nil
-}
-
-func (mc *taosConn) Prepare(query string) (driver.Stmt, error) {
-	if mc.taos == nil {		
-		return nil, errInvalidConn
-	}	
-	
-	stmt := &taosSqlStmt{
-		mc:   mc,
-		pSql: query,
-	}
-
-    // find ? count and save  to stmt.paramCount
-	stmt.paramCount = strings.Count(query, "?")
-
-	//fmt.Printf("prepare alloc stmt:%p, sql:%s\n", stmt, query)
-	taosLog.Printf("prepare alloc stmt:%p, sql:%s\n", stmt, query)
-
-	return stmt, nil
-}
-
-func (mc *taosConn) interpolateParams(query string, args []driver.Value) (string, error) {
-	// Number of ? should be same to len(args)
-	if strings.Count(query, "?") != len(args) {
-		return "", driver.ErrSkip
-	}
-
-	buf := make([]byte, defaultBufSize)
-	buf = buf[:0]    // clear buf
-	argPos := 0
-
-	for i := 0; i < len(query); i++ {
-		q := strings.IndexByte(query[i:], '?')
-		if q == -1 {
-			buf = append(buf, query[i:]...)
-			break
-		}
-		buf = append(buf, query[i:i+q]...)
-		i += q
-
-		arg := args[argPos]
-		argPos++
-
-		if arg == nil {
-			buf = append(buf, "NULL"...)
-			continue
-		}
-
-		switch v := arg.(type) {
-		case int64:
-			buf = strconv.AppendInt(buf, v, 10)
-		case uint64:
-			// Handle uint64 explicitly because our custom ConvertValue emits unsigned values
-			buf = strconv.AppendUint(buf, v, 10)
-		case float64:
-			buf = strconv.AppendFloat(buf, v, 'g', -1, 64)
-		case bool:
-			if v {
-				buf = append(buf, '1')
-			} else {
-				buf = append(buf, '0')
-			}
-		case time.Time:
-			if v.IsZero() {
-				buf = append(buf, "'0000-00-00'"...)
-			} else {
-				v := v.In(mc.cfg.loc)
-				v = v.Add(time.Nanosecond * 500) // To round under microsecond
-				year := v.Year()
-				year100 := year / 100
-				year1 := year % 100
-				month := v.Month()
-				day := v.Day()
-				hour := v.Hour()
-				minute := v.Minute()
-				second := v.Second()
-				micro := v.Nanosecond() / 1000
-
-				buf = append(buf, []byte{
-					'\'',
-					digits10[year100], digits01[year100],
-					digits10[year1], digits01[year1],
-					'-',
-					digits10[month], digits01[month],
-					'-',
-					digits10[day], digits01[day],
-					' ',
-					digits10[hour], digits01[hour],
-					':',
-					digits10[minute], digits01[minute],
-					':',
-					digits10[second], digits01[second],
-				}...)
-
-				if micro != 0 {
-					micro10000 := micro / 10000
-					micro100 := micro / 100 % 100
-					micro1 := micro % 100
-					buf = append(buf, []byte{
-						'.',
-						digits10[micro10000], digits01[micro10000],
-						digits10[micro100], digits01[micro100],
-						digits10[micro1], digits01[micro1],
-					}...)
-				}
-				buf = append(buf, '\'')
-			}
-		case []byte:
-			if v == nil {
-				buf = append(buf, "NULL"...)
-			} else {
-				buf = append(buf, "_binary'"...)
-				if mc.status&statusNoBackslashEscapes == 0 {
-					buf = escapeBytesBackslash(buf, v)
-				} else {
-					buf = escapeBytesQuotes(buf, v)
-				}
-				buf = append(buf, '\'')
-			}
-		case string:
-			//buf = append(buf, '\'')
-			if mc.status&statusNoBackslashEscapes == 0 {
-				buf = escapeStringBackslash(buf, v)
-			} else {
-				buf = escapeStringQuotes(buf, v)
-			}
-			//buf = append(buf, '\'')
-		default:
-			return "", driver.ErrSkip
-		}
-
-		//if len(buf)+4 > mc.maxAllowedPacket {
-		if len(buf)+4 > maxTaosSqlLen {
-			return "", driver.ErrSkip
-		}
-	}
-	if argPos != len(args) {
-		return "", driver.ErrSkip
-	}
-	return string(buf), nil
-}
-
-func (mc *taosConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	if mc.taos == nil {
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try to interpolate the parameters to save extra roundtrips for preparing and closing a statement
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-	}
-	
-	mc.affectedRows = 0
-	mc.insertId     = 0
-	_, err := mc.taosQuery(query)
-	if err == nil {
-		return &taosSqlResult{
-			affectedRows: int64(mc.affectedRows),
-			insertId:     int64(mc.insertId),
-		}, err
-	}
-	
-	return nil, err
-}
-
-func (mc *taosConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	return mc.query(query, args)
-}
-
-func (mc *taosConn) query(query string, args []driver.Value) (*textRows, error) {
-	if mc.taos == nil {
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try client-side prepare to reduce roundtrip
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-	}
-
-	num_fields, err := mc.taosQuery(query)
-	if err == nil {
-		// Read Result
-		rows := new(textRows)
-		rows.mc = mc
-
-		// Columns field
-		rows.rs.columns, err = mc.readColumns(num_fields)
-		return rows, err
-	}
-	return nil, err
-}
-
-// Ping implements driver.Pinger interface
-func (mc *taosConn) Ping(ctx context.Context) (err error) {
-	if mc.taos != nil {
-	    return nil
-	}
-	return errInvalidConn
-}
-
-// BeginTx implements driver.ConnBeginTx interface
-func (mc *taosConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
-	taosLog.Println("taosSql not support transaction")
-	return nil, errors.New("taosSql not support transaction")
-}
-
-func (mc *taosConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := mc.query(query, dargs)
-	if err != nil {
-		return nil, err
-	}
-
-	return rows, err
-}
-
-func (mc *taosConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-
-	return mc.Exec(query, dargs)
-}
-
-func (mc *taosConn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-
-	stmt, err := mc.Prepare(query)
-	if err != nil {
-		return nil, err
-	}
-
-	return stmt, nil
-}
-
-func (stmt *taosSqlStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
-	if stmt.mc == nil {
-		return nil, errInvalidConn
-	}
-	dargs, err := namedValueToValue(args)
-
-	if err != nil {
-		return nil, err
-	}
-
-	rows, err := stmt.query(dargs)
-	if err != nil {
-		return nil, err
-	}
-	return rows, err
-}
-
-func (stmt *taosSqlStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
-	if stmt.mc == nil {
-		return nil, errInvalidConn
-	}
-
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-
-	return stmt.Exec(dargs)
-}
-
-func (mc *taosConn) CheckNamedValue(nv *driver.NamedValue) (err error) {
-	nv.Value, err = converter{}.ConvertValue(nv.Value)
-	return
-}
-
-// ResetSession implements driver.SessionResetter.
-// (From Go 1.10)
-func (mc *taosConn) ResetSession(ctx context.Context) error {
-	if mc.taos == nil {
-		return driver.ErrBadConn
-	}
-	mc.reset = true
-	return nil
-}
diff --git a/src/connector/go/src/taosSql/connector.go b/src/connector/go/src/taosSql/connector.go
deleted file mode 100755
index 55715b949ede42de59bae0ac229b26ef579faba7..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/connector.go
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-
-import (
-	"context"
-	"database/sql/driver"
-)
-
-type connector struct {
-	cfg *config
-}
-
-// Connect implements driver.Connector interface.
-// Connect returns a connection to the database.
-func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
-	var err error
- 	// New taosConn
-	mc := &taosConn{
-		cfg:              c.cfg,
-		parseTime:        c.cfg.parseTime,
-	}
-
-	// Connect to Server
-	mc.taos, err = mc.taosConnect(mc.cfg.addr, mc.cfg.user, mc.cfg.passwd, mc.cfg.dbName, mc.cfg.port)
-    if err != nil {
-        return nil, err
-    }
-
-	return mc, nil
-}
-
-// Driver implements driver.Connector interface.
-// Driver returns &taosSQLDriver{}.
-func (c *connector) Driver() driver.Driver {
-	return &taosSQLDriver{}
-}
diff --git a/src/connector/go/src/taosSql/const.go b/src/connector/go/src/taosSql/const.go
deleted file mode 100755
index 89214a0d45c5620d8b865bdc7afad45f2130b95b..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/const.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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/>.
- */
-
-package taosSql
-
-const (
-	timeFormat              = "2006-01-02 15:04:05"
-    maxTaosSqlLen           = 65380
-	defaultBufSize          = maxTaosSqlLen + 32
-)
-
-type fieldType byte
-
-type fieldFlag uint16
-
-const (
-	flagNotNULL fieldFlag = 1 << iota
-)
-
-type statusFlag uint16
-
-const (
-	statusInTrans statusFlag = 1 << iota
-	statusInAutocommit
-	statusReserved // Not in documentation
-	statusMoreResultsExists
-	statusNoGoodIndexUsed
-	statusNoIndexUsed
-	statusCursorExists
-	statusLastRowSent
-	statusDbDropped
-	statusNoBackslashEscapes
-	statusMetadataChanged
-	statusQueryWasSlow
-	statusPsOutParams
-	statusInTransReadonly
-	statusSessionStateChanged
-)
-
diff --git a/src/connector/go/src/taosSql/driver.go b/src/connector/go/src/taosSql/driver.go
deleted file mode 100755
index 6839979c61c1ede15ea95c9a1f9c570b84316de0..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/driver.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-
-import (
-	"context"
-	"database/sql"
-	"database/sql/driver"
-)
-
-// taosSqlDriver is exported to make the driver directly accessible.
-// In general the driver is used via the database/sql package.
-type taosSQLDriver struct{}
-
-// Open new Connection.
-// the DSN string is formatted
-func (d taosSQLDriver) Open(dsn string) (driver.Conn, error) {
-	cfg, err := parseDSN(dsn)
-	if err != nil {
-		return nil, err
-	}
-	c := &connector{
-		cfg: cfg,
-	}
-	return c.Connect(context.Background())
-}
-
-func init() {
-	sql.Register("taosSql", &taosSQLDriver{})
-	taosLogInit()
-}
diff --git a/src/connector/go/src/taosSql/dsn.go b/src/connector/go/src/taosSql/dsn.go
deleted file mode 100755
index c68ae1725cb730c770325a1b3603416b8c2ac1f6..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/dsn.go
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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/>.
- */
-
-package taosSql
-
-import (
-	"errors"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var (
-	errInvalidDSNUnescaped = errors.New("invalid DSN: did you forget to escape a param value?")
-	errInvalidDSNAddr      = errors.New("invalid DSN: network address not terminated (missing closing brace)")
-	errInvalidDSNPort      = errors.New("invalid DSN: network port is not a valid number")
-	errInvalidDSNNoSlash   = errors.New("invalid DSN: missing the slash separating the database name")
-)
-
-// Config is a configuration parsed from a DSN string.
-// If a new Config is created instead of being parsed from a DSN string,
-// the NewConfig function should be used, which sets default values.
-type config struct {
-	user              string // Username
-	passwd            string // Password (requires User)
-	net               string // Network type
-	addr              string // Network address (requires Net)
-	port              int
-	dbName            string            // Database name
-	params            map[string]string // Connection parameters
-	loc               *time.Location    // Location for time.Time values
-	columnsWithAlias  bool              // Prepend table alias to column names
-	interpolateParams bool              // Interpolate placeholders into query string
-	parseTime         bool              // Parse time values to time.Time
-}
-
-// NewConfig creates a new Config and sets default values.
-func newConfig() *config {
-	return &config{
-		loc:               time.UTC,
-		interpolateParams: true,
-		parseTime:         true,
-	}
-}
-
-// ParseDSN parses the DSN string to a Config
-func parseDSN(dsn string) (cfg *config, err error) {
-	taosLog.Println("input dsn:", dsn)
-
-	// New config with some default values
-	cfg = newConfig()
-
-	// [user[:password]@][net[(addr)]]/dbname[?param1=value1&paramN=valueN]
-	// Find the last '/' (since the password or the net addr might contain a '/')
-	foundSlash := false
-	for i := len(dsn) - 1; i >= 0; i-- {
-		if dsn[i] == '/' {
-			foundSlash = true
-			var j, k int
-
-			// left part is empty if i <= 0
-			if i > 0 {
-				// [username[:password]@][protocol[(address)]]
-				// Find the last '@' in dsn[:i]
-				for j = i; j >= 0; j-- {
-					if dsn[j] == '@' {
-						// username[:password]
-						// Find the first ':' in dsn[:j]
-						for k = 0; k < j; k++ {
-							if dsn[k] == ':' {
-								cfg.passwd = dsn[k+1 : j]
-								break
-							}
-						}
-						cfg.user = dsn[:k]
-
-						break
-					}
-				}
-
-				// [protocol[(address)]]
-				// Find the first '(' in dsn[j+1:i]
-				for k = j + 1; k < i; k++ {
-					if dsn[k] == '(' {
-						// dsn[i-1] must be == ')' if an address is specified
-						if dsn[i-1] != ')' {
-							if strings.ContainsRune(dsn[k+1:i], ')') {
-								return nil, errInvalidDSNUnescaped
-							}
-							return nil, errInvalidDSNAddr
-						}
-						strs := strings.Split(dsn[k+1:i-1], ":")
-						if len(strs) == 1 {
-							return nil, errInvalidDSNAddr
-						}
-						cfg.addr = strs[0]
-						cfg.port, err = strconv.Atoi(strs[1])
-						if err != nil {
-							return nil, errInvalidDSNPort
-						}
-						break
-					}
-				}
-				cfg.net = dsn[j+1 : k]
-			}
-
-			// dbname[?param1=value1&...&paramN=valueN]
-			// Find the first '?' in dsn[i+1:]
-			for j = i + 1; j < len(dsn); j++ {
-				if dsn[j] == '?' {
-					if err = parseDSNParams(cfg, dsn[j+1:]); err != nil {
-						return
-					}
-					break
-				}
-			}
-			cfg.dbName = dsn[i+1 : j]
-
-			break
-		}
-	}
-
-	if !foundSlash && len(dsn) > 0 {
-		return nil, errInvalidDSNNoSlash
-	}
-
-	taosLog.Printf("cfg info: %+v", cfg)
-
-	return
-}
-
-// parseDSNParams parses the DSN "query string"
-// Values must be url.QueryEscape'ed
-func parseDSNParams(cfg *config, params string) (err error) {
-	for _, v := range strings.Split(params, "&") {
-		param := strings.SplitN(v, "=", 2)
-		if len(param) != 2 {
-			continue
-		}
-
-		// cfg params
-		switch value := param[1]; param[0] {
-		case "columnsWithAlias":
-			var isBool bool
-			cfg.columnsWithAlias, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-
-		// Enable client side placeholder substitution
-		case "interpolateParams":
-			var isBool bool
-			cfg.interpolateParams, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-
-		// Time Location
-		case "loc":
-			if value, err = url.QueryUnescape(value); err != nil {
-				return
-			}
-			cfg.loc, err = time.LoadLocation(value)
-			if err != nil {
-				return
-			}
-
-		// time.Time parsing
-		case "parseTime":
-			var isBool bool
-			cfg.parseTime, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-
-		default:
-			// lazy init
-			if cfg.params == nil {
-				cfg.params = make(map[string]string)
-			}
-
-			if cfg.params[param[0]], err = url.QueryUnescape(value); err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
diff --git a/src/connector/go/src/taosSql/result.go b/src/connector/go/src/taosSql/result.go
deleted file mode 100755
index 2367560c31d06f56ac27c20d4a5a5aa099051077..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/result.go
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-
-import (
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-	"unsafe"
-)
-
-/******************************************************************************
-*                              Result                                         *
-******************************************************************************/
-// Read Packets as Field Packets until EOF-Packet or an Error appears
-func (mc *taosConn) readColumns(count int) ([]taosSqlField, error) {
-
-	columns := make([]taosSqlField, count)
-	var result unsafe.Pointer
-	result = C.taos_use_result(mc.taos)
-	if result == nil {
-		return nil, errors.New("invalid result")
-	}
-
-	pFields := (*C.struct_taosField)(C.taos_fetch_fields(result))
-
-	// TODO: Optimized rewriting !!!!
-	fields := (*[1 << 30]C.struct_taosField)(unsafe.Pointer(pFields))
-
-	for i := 0; i < count; i++ {
-		//columns[i].tableName = ms.taos.
-		//fmt.Println(reflect.TypeOf(fields[i].name))
-		var charray []byte
-		for j := range fields[i].name {
-			//fmt.Println("fields[i].name[j]: ", fields[i].name[j])
-			if fields[i].name[j] != 0 {
-				charray = append(charray, byte(fields[i].name[j]))
-			} else {
-				break
-			}
-		}
-		columns[i].name = string(charray)
-		columns[i].length = (uint32)(fields[i].bytes)
-		columns[i].fieldType = fieldType(fields[i]._type)
-		columns[i].flags = 0
-		// columns[i].decimals  = 0
-		//columns[i].charSet    = 0
-	}
-	return columns, nil
-}
-
-func (rows *taosSqlRows) readRow(dest []driver.Value) error {
-	mc := rows.mc
-
-	if rows.rs.done || mc == nil {
-		return io.EOF
-	}
-
-	var result unsafe.Pointer
-	result = C.taos_use_result(mc.taos)
-	if result == nil {
-		return errors.New(C.GoString(C.taos_errstr(mc.taos)))
-	}
-
-	//var row *unsafe.Pointer
-	row := C.taos_fetch_row(result)
-	if row == nil {
-		rows.rs.done = true
-		C.taos_free_result(result)
-		rows.mc = nil
-		return io.EOF
-	}
-
-	// because sizeof(void*)  == sizeof(int*) == 8
-	// notes: sizeof(int) == 8 in go, but sizeof(int) == 4 in C.
-	for i := range dest {
-		currentRow := (unsafe.Pointer)(uintptr(*((*int)(unsafe.Pointer(uintptr(unsafe.Pointer(row)) + uintptr(i)*unsafe.Sizeof(int(0)))))))
-
-		if currentRow == nil {
-			dest[i] = nil
-			continue
-		}
-
-		switch rows.rs.columns[i].fieldType {
-		case C.TSDB_DATA_TYPE_BOOL:
-			if (*((*byte)(currentRow))) != 0 {
-				dest[i] = true
-			} else {
-				dest[i] = false
-			}
-			break
-
-		case C.TSDB_DATA_TYPE_TINYINT:
-			dest[i] = (int)(*((*byte)(currentRow)))
-			break
-
-		case C.TSDB_DATA_TYPE_SMALLINT:
-			dest[i] = (int16)(*((*int16)(currentRow)))
-			break
-
-		case C.TSDB_DATA_TYPE_INT:
-			dest[i] = (int)(*((*int32)(currentRow))) // notes int32 of go <----> int of C
-			break
-
-		case C.TSDB_DATA_TYPE_BIGINT:
-			dest[i] = (int64)(*((*int64)(currentRow)))
-			break
-
-		case C.TSDB_DATA_TYPE_FLOAT:
-			dest[i] = (*((*float32)(currentRow)))
-			break
-
-		case C.TSDB_DATA_TYPE_DOUBLE:
-			dest[i] = (*((*float64)(currentRow)))
-			break
-
-		case C.TSDB_DATA_TYPE_BINARY, C.TSDB_DATA_TYPE_NCHAR:
-			charLen := rows.rs.columns[i].length
-			var index uint32
-			binaryVal := make([]byte, charLen)
-			for index = 0; index < charLen; index++ {
-				binaryVal[index] = *((*byte)(unsafe.Pointer(uintptr(currentRow) + uintptr(index))))
-			}
-			dest[i] = string(binaryVal[:])
-			break
-
-		case C.TSDB_DATA_TYPE_TIMESTAMP:
-			if mc.cfg.parseTime == true {
-				timestamp := (int64)(*((*int64)(currentRow)))
-				dest[i] = timestampConvertToString(timestamp, int(C.taos_result_precision(result)))
-			} else {
-				dest[i] = (int64)(*((*int64)(currentRow)))
-			}
-			break
-
-		default:
-			fmt.Println("default fieldType: set dest[] to nil")
-			dest[i] = nil
-			break
-		}
-	}
-
-	return nil
-}
-
-// Read result as Field format until all rows or an Error appears
-// call this func in conn mode
-func (rows *textRows) readRow(dest []driver.Value) error {
-	return rows.taosSqlRows.readRow(dest)
-}
-
-// call thsi func in stmt mode
-func (rows *binaryRows) readRow(dest []driver.Value) error {
-	return rows.taosSqlRows.readRow(dest)
-}
-
-func timestampConvertToString(timestamp int64, precision int) string {
-	var decimal, sVal, nsVal int64
-	if precision == 0 {
-		decimal = timestamp % 1000
-		sVal = timestamp / 1000
-		nsVal = decimal * 1000
-	} else {
-		decimal = timestamp % 1000000
-		sVal = timestamp / 1000000
-		nsVal = decimal * 1000000
-	}
-
-	date_time := time.Unix(sVal, nsVal)
-
-	//const base_format = "2006-01-02 15:04:05"
-	str_time := date_time.Format(timeFormat)
-
-	return (str_time + "." + strconv.Itoa(int(decimal)))
-}
diff --git a/src/connector/go/src/taosSql/rows.go b/src/connector/go/src/taosSql/rows.go
deleted file mode 100755
index 5040dca06d205865379e21d45e5d5dd3e2b793db..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/rows.go
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-
-import (
-	"database/sql"
-	"database/sql/driver"
-	"io"
-	"math"
-	"reflect"
-)
-
-type taosSqlField struct {
-	tableName string
-	name      string
-	length    uint32
-	flags     fieldFlag   // indicate whether this field can is null
-	fieldType fieldType
-	decimals  byte
-	charSet   uint8
-}
-
-type resultSet struct {
-	columns     []taosSqlField
-	columnNames []string
-	done        bool
-}
-
-type taosSqlRows struct {
-	mc     *taosConn
-	rs     resultSet
-}
-
-type binaryRows struct {
-	taosSqlRows
-}
-
-type textRows struct {
-	taosSqlRows
-}
-
-func (rows *taosSqlRows) Columns() []string {
-	if rows.rs.columnNames != nil {
-		return rows.rs.columnNames
-	}
-
-	columns := make([]string, len(rows.rs.columns))
-	if rows.mc != nil && rows.mc.cfg.columnsWithAlias {
-		for i := range columns {
-			if tableName := rows.rs.columns[i].tableName; len(tableName) > 0 {
-				columns[i] = tableName + "." + rows.rs.columns[i].name
-			} else {
-				columns[i] = rows.rs.columns[i].name
-			}
-		}
-	} else {
-		for i := range columns {
-			columns[i] = rows.rs.columns[i].name
-		}
-	}
-
-	rows.rs.columnNames = columns
-
-	return columns
-}
-
-func (rows *taosSqlRows) ColumnTypeDatabaseTypeName(i int) string {
-	return rows.rs.columns[i].typeDatabaseName()
-}
-
-func (rows *taosSqlRows) ColumnTypeLength(i int) (length int64, ok bool) {
- 	return int64(rows.rs.columns[i].length), true
-}
-
-func (rows *taosSqlRows) ColumnTypeNullable(i int) (nullable, ok bool) {
-	return rows.rs.columns[i].flags&flagNotNULL == 0, true
-}
-
-func (rows *taosSqlRows) ColumnTypePrecisionScale(i int) (int64, int64, bool) {
-	column := rows.rs.columns[i]
-	decimals := int64(column.decimals)
-
-	switch column.fieldType {
-	case C.TSDB_DATA_TYPE_FLOAT:
-        fallthrough
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		if decimals == 0x1f {
-			return math.MaxInt64, math.MaxInt64, true
-		}
-		return math.MaxInt64, decimals, true
-	}
-
-	return 0, 0, false
-}
-
-func (rows *taosSqlRows) ColumnTypeScanType(i int) reflect.Type {
-	return rows.rs.columns[i].scanType()
-}
-
-func (rows *taosSqlRows) Close() error {
-	if rows.mc != nil {
-		result := C.taos_use_result(rows.mc.taos)
-		if result != nil {
-			C.taos_free_result(result)
-		}
-		rows.mc = nil
-	}
-	return nil
-}
-
-func (rows *taosSqlRows) HasNextResultSet() (b bool) {
-	if rows.mc == nil {
-		return false
-	}
-	return rows.mc.status&statusMoreResultsExists != 0
-}
-
-func (rows *taosSqlRows) nextResultSet() (int, error) {
-	if rows.mc == nil {
-		return 0, io.EOF
-	}
-
-	// Remove unread packets from stream
-	if !rows.rs.done {
-		rows.rs.done = true
-	}
-
-	if !rows.HasNextResultSet() {
-		rows.mc = nil
-		return 0, io.EOF
-	}
-	rows.rs = resultSet{}
-	return 0,nil
-}
-
-func (rows *taosSqlRows) nextNotEmptyResultSet() (int, error) {
-	for {
-		resLen, err := rows.nextResultSet()
-		if err != nil {
-			return 0, err
-		}
-
-		if resLen > 0 {
-			return resLen, nil
-		}
-
-		rows.rs.done = true
-	}
-}
-
-func (rows *binaryRows) NextResultSet() error {
-	resLen, err := rows.nextNotEmptyResultSet()
-	if err != nil {
-		return err
-	}
-
-	rows.rs.columns, err = rows.mc.readColumns(resLen)
-	return err
-}
-
-// stmt.Query return binary rows, and get row from this func
-func (rows *binaryRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-
-func (rows *textRows) NextResultSet() (err error) {
-	resLen, err := rows.nextNotEmptyResultSet()
-	if err != nil {
-		return err
-	}
-
-	rows.rs.columns, err = rows.mc.readColumns(resLen)
-	return err
-}
-
-// db.Query return text rows, and get row from this func
-func (rows *textRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-
-func (mf *taosSqlField) typeDatabaseName() string {
-	//fmt.Println("######## (mf *taosSqlField) typeDatabaseName() mf.fieldType:", mf.fieldType)
-	switch mf.fieldType {
-	case C.TSDB_DATA_TYPE_BOOL:
-		return "BOOL"
-
-	case C.TSDB_DATA_TYPE_TINYINT:
-		return "TINYINT"
-
-	case C.TSDB_DATA_TYPE_SMALLINT:
-		return "SMALLINT"
-
-	case C.TSDB_DATA_TYPE_INT:
-		return "INT"
-
-	case C.TSDB_DATA_TYPE_BIGINT:
-		return "BIGINT"
-
-	case C.TSDB_DATA_TYPE_FLOAT:
-		return "FLOAT"
-
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		return "DOUBLE"
-
-	case C.TSDB_DATA_TYPE_BINARY:
-		return "BINARY"
-
-	case C.TSDB_DATA_TYPE_NCHAR:
-		return "NCHAR"
-
-	case C.TSDB_DATA_TYPE_TIMESTAMP:
-		return "TIMESTAMP"
-
-	default:
-		return ""
-	}
-}
-
-var (
-	scanTypeFloat32   = reflect.TypeOf(float32(0))
-	scanTypeFloat64   = reflect.TypeOf(float64(0))
-	scanTypeInt8      = reflect.TypeOf(int8(0))
-	scanTypeInt16     = reflect.TypeOf(int16(0))
-	scanTypeInt32     = reflect.TypeOf(int32(0))
-	scanTypeInt64     = reflect.TypeOf(int64(0))
-	scanTypeNullTime  = reflect.TypeOf(NullTime{})
-	scanTypeRawBytes  = reflect.TypeOf(sql.RawBytes{})
-	scanTypeUnknown   = reflect.TypeOf(new(interface{}))
-)
-
-func (mf *taosSqlField) scanType() reflect.Type {
-	//fmt.Println("######## (mf *taosSqlField) scanType() mf.fieldType:", mf.fieldType)
-	switch mf.fieldType {
-	case C.TSDB_DATA_TYPE_BOOL:
-		return scanTypeInt8
-
-	case C.TSDB_DATA_TYPE_TINYINT:
-		return scanTypeInt8
-
-	case C.TSDB_DATA_TYPE_SMALLINT:
-		return scanTypeInt16
-
-	case C.TSDB_DATA_TYPE_INT:
-		return scanTypeInt32
-
-	case C.TSDB_DATA_TYPE_BIGINT:
-		return scanTypeInt64
-
-	case C.TSDB_DATA_TYPE_FLOAT:
-		return scanTypeFloat32
-
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		return scanTypeFloat64
-
-	case C.TSDB_DATA_TYPE_BINARY:
-		return scanTypeRawBytes
-
-	case C.TSDB_DATA_TYPE_NCHAR:
-		return scanTypeRawBytes
-
-	case C.TSDB_DATA_TYPE_TIMESTAMP:
-		return scanTypeNullTime
-
-	default:
-		return scanTypeUnknown
-	}
-}
diff --git a/src/connector/go/src/taosSql/statement.go b/src/connector/go/src/taosSql/statement.go
deleted file mode 100755
index 3aa3e01564553798510a4d30806b7ec5c5793ba9..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/statement.go
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-
-import (
-	"database/sql/driver"
-	"fmt"
-	"reflect"
-)
-
-type taosSqlStmt struct {
-	mc         *taosConn
-	id         uint32
-	pSql       string
-	paramCount int
-}
-
-func (stmt *taosSqlStmt) Close() error {
-	return nil
-}
-
-func (stmt *taosSqlStmt) NumInput() int {
-	return stmt.paramCount
-}
-
-func (stmt *taosSqlStmt) Exec(args []driver.Value) (driver.Result, error) {
-	if stmt.mc == nil || stmt.mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	return stmt.mc.Exec(stmt.pSql, args)
-}
-
-func (stmt *taosSqlStmt) Query(args []driver.Value) (driver.Rows, error) {
-	if  stmt.mc == nil || stmt.mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	return stmt.query(args)
-}
-
-func (stmt *taosSqlStmt) query(args []driver.Value) (*binaryRows, error) {
-	mc := stmt.mc
-	if  mc == nil || mc.taos == nil {
-		return nil, errInvalidConn
-	}
-
-	querySql := stmt.pSql
-
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try client-side prepare to reduce roundtrip
-		prepared, err := mc.interpolateParams(stmt.pSql, args)
-		if err != nil {
-			return nil, err
-		}
-		querySql = prepared
-	}
-
-	num_fields, err := mc.taosQuery(querySql)
-	if err == nil {
-		// Read Result
-		rows := new(binaryRows)
-		rows.mc = mc
-		// Columns field
-		rows.rs.columns, err = mc.readColumns(num_fields)
-		return rows, err
-	}
-	return nil, err
-}
-
-type converter struct{}
-
-// ConvertValue mirrors the reference/default converter in database/sql/driver
-// with _one_ exception.  We support uint64 with their high bit and the default
-// implementation does not.  This function should be kept in sync with
-// database/sql/driver defaultConverter.ConvertValue() except for that
-// deliberate difference.
-func (c converter) ConvertValue(v interface{}) (driver.Value, error) {
-
-	if driver.IsValue(v) {
-		return v, nil
-	}
-
-	if vr, ok := v.(driver.Valuer); ok {
-		sv, err := callValuerValue(vr)
-		if err != nil {
-			return nil, err
-		}
-		if !driver.IsValue(sv) {
-			return nil, fmt.Errorf("non-Value type %T returned from Value", sv)
-		}
-
-		return sv, nil
-	}
-
-	rv := reflect.ValueOf(v)
-	switch rv.Kind() {
-	case reflect.Ptr:
-		// indirect pointers
-		if rv.IsNil() {
-			return nil, nil
-		} else {
-			return c.ConvertValue(rv.Elem().Interface())
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return rv.Int(), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return rv.Uint(), nil
-	case reflect.Float32, reflect.Float64:
-		return rv.Float(), nil
-	case reflect.Bool:
-		return rv.Bool(), nil
-	case reflect.Slice:
-		ek := rv.Type().Elem().Kind()
-		if ek == reflect.Uint8 {
-			return rv.Bytes(), nil
-		}
-		return nil, fmt.Errorf("unsupported type %T, a slice of %s", v, ek)
-	case reflect.String:
-		return rv.String(), nil
-	}
-	return nil, fmt.Errorf("unsupported type %T, a %s", v, rv.Kind())
-}
-
-var valuerReflectType = reflect.TypeOf((*driver.Valuer)(nil)).Elem()
-
-// callValuerValue returns vr.Value(), with one exception:
-// If vr.Value is an auto-generated method on a pointer type and the
-// pointer is nil, it would panic at runtime in the panicwrap
-// method. Treat it like nil instead.
-//
-// This is so people can implement driver.Value on value types and
-// still use nil pointers to those types to mean nil/NULL, just like
-// string/*string.
-//
-// This is an exact copy of the same-named unexported function from the
-// database/sql package.
-func callValuerValue(vr driver.Valuer) (v driver.Value, err error) {
-	if rv := reflect.ValueOf(vr); rv.Kind() == reflect.Ptr &&
-		rv.IsNil() &&
-		rv.Type().Elem().Implements(valuerReflectType) {
-		return nil, nil
-	}
-	return vr.Value()
-}
diff --git a/src/connector/go/src/taosSql/taosLog.go b/src/connector/go/src/taosSql/taosLog.go
deleted file mode 100755
index 63af5e34c15720403c4e09730e3bada54722fc39..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/taosLog.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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/>.
- */
-
-package taosSql
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"strings"
-)
-
-// Various errors the driver might return.
-var (
-	errInvalidConn    = errors.New("invalid connection")
-	errConnNoExist    = errors.New("no existent connection ")
-)
-
-var taosLog *log.Logger
-
-// SetLogger is used to set the logger for critical errors.
-// The initial logger
-func taosLogInit() {
-	cfgName := "/etc/taos/taos.cfg"
-	logNameDefault := "/var/log/taos/taosgo.log"
-	var logName string
-
-	// get log path from cfg file
-	cfgFile, err := os.OpenFile(cfgName, os.O_RDONLY, 0644)
-	defer cfgFile.Close()
-	if err != nil {
-		fmt.Println(err)
-		logName = logNameDefault
-	} else {
-		logName, err = getLogNameFromCfg(cfgFile)
-		if err != nil {
-			fmt.Println(err)
-			logName = logNameDefault
-		}
-	}
-
-	logFile, err := os.OpenFile(logName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	taosLog = log.New(logFile, "", log.LstdFlags)
-	taosLog.SetPrefix("TAOS DRIVER ")
-	taosLog.SetFlags(log.LstdFlags|log.Lshortfile)
-}
-
-func getLogNameFromCfg(f *os.File) (string, error) {
-		// Create file buf, *Reader
-	r := bufio.NewReader(f)
-	for {
-		//read one line, return to slice b
-		b, _, err := r.ReadLine()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			panic(err)
-		}
-
-		// Remove space of left and right
-		s := strings.TrimSpace(string(b))
-		if strings.Index(s, "#") == 0 {
-			// comment line
-			continue
-		}
-
-		if len(s) == 0 {
-			continue
-		}
-
-		var ns string
-		// If there is a comment on the right of the line, must be remove
-		index := strings.Index(s, "#")
-		if index > 0 {
-			// Gets the string to the left of the comment to determine whether it is empty
-			ns = s[:index]
-			if len(ns) == 0 {
-				continue
-			}
-		} else {
-			ns = s;
-		}
-
-		ss := strings.Fields(ns)
-        if strings.Compare("logDir", ss[0]) != 0 {
-        	continue
-		}
-
-		if len(ss) < 2 {
-			break
-		}
-
-		// Add a filename after the path
-		logName := ss[1] + "/taosgo.log"
-		return logName,nil
-	}
-
-    return "", errors.New("no config log path, use default")
-}
-
diff --git a/src/connector/go/src/taosSql/taosSqlCgo.go b/src/connector/go/src/taosSql/taosSqlCgo.go
deleted file mode 100755
index cc3aaa1658813cdfe667c5402c029525860fbf01..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/taosSqlCgo.go
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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/>.
- */
-package taosSql
-
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-
-import (
-	"errors"
-	"unsafe"
-)
-
-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)
-	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.ushort)(port))
-	if taosObj == nil {
-		return nil, errors.New("taos_connect() fail!")
-	}
-
-	return (unsafe.Pointer)(taosObj), nil
-}
-
-func (mc *taosConn) taosQuery(sqlstr string) (int, error) {
-	//taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
-
-	csqlstr := C.CString(sqlstr)
-	defer C.free(unsafe.Pointer(csqlstr))
-	code := int(C.taos_query(mc.taos, csqlstr))
-
-	if 0 != code {
-		mc.taos_error()
-		errStr := C.GoString(C.taos_errstr(mc.taos))
-		taosLog.Println("taos_query() failed:", errStr)
-		taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
-		return 0, errors.New(errStr)
-	}
-
-	// read result and save into mc struct
-	num_fields := int(C.taos_field_count(mc.taos))
-	if 0 == num_fields { // there are no select and show kinds of commands
-		mc.affectedRows = int(C.taos_affected_rows(mc.taos))
-		mc.insertId = 0
-	}
-
-	return num_fields, nil
-}
-
-func (mc *taosConn) taos_close() {
-	C.taos_close(mc.taos)
-}
-
-func (mc *taosConn) taos_error() {
-	// free local resouce: allocated memory/metric-meta refcnt
-	//var pRes unsafe.Pointer
-	pRes := C.taos_use_result(mc.taos)
-	C.taos_free_result(pRes)
-}
diff --git a/src/connector/go/src/taosSql/utils.go b/src/connector/go/src/taosSql/utils.go
deleted file mode 100755
index a104322fcc9012ea0370bdbea9b89e6674daabf3..0000000000000000000000000000000000000000
--- a/src/connector/go/src/taosSql/utils.go
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * 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/>.
- */
-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.
-// The 2nd return value indicates if the input was a valid bool value
-func readBool(input string) (value bool, valid bool) {
-	switch input {
-	case "1", "true", "TRUE", "True":
-		return true, true
-	case "0", "false", "FALSE", "False":
-		return false, true
-	}
-
-	// Not a valid bool value
-	return
-}
-
-/******************************************************************************
-*                           Time related utils                                *
-******************************************************************************/
-
-// NullTime represents a time.Time that may be NULL.
-// NullTime implements the Scanner interface so
-// it can be used as a scan destination:
-//
-//  var nt NullTime
-//  err := db.QueryRow("SELECT time FROM foo WHERE id=?", id).Scan(&nt)
-//  ...
-//  if nt.Valid {
-//     // use nt.Time
-//  } else {
-//     // NULL value
-//  }
-//
-// This NullTime implementation is not driver-specific
-type NullTime struct {
-	Time  time.Time
-	Valid bool // Valid is true if Time is not NULL
-}
-
-// Scan implements the Scanner interface.
-// The value type must be time.Time or string / []byte (formatted time-string),
-// otherwise Scan fails.
-func (nt *NullTime) Scan(value interface{}) (err error) {
-	if value == nil {
-		nt.Time, nt.Valid = time.Time{}, false
-		return
-	}
-
-	switch v := value.(type) {
-	case time.Time:
-		nt.Time, nt.Valid = v, true
-		return
-	case []byte:
-		nt.Time, err = parseDateTime(string(v), time.UTC)
-		nt.Valid = (err == nil)
-		return
-	case string:
-		nt.Time, err = parseDateTime(v, time.UTC)
-		nt.Valid = (err == nil)
-		return
-	}
-
-	nt.Valid = false
-	return fmt.Errorf("Can't convert %T to time.Time", value)
-}
-
-// Value implements the driver Valuer interface.
-func (nt NullTime) Value() (driver.Value, error) {
-	if !nt.Valid {
-		return nil, nil
-	}
-	return nt.Time, nil
-}
-
-func parseDateTime(str string, loc *time.Location) (t time.Time, err error) {
-	base := "0000-00-00 00:00:00.0000000"
-	switch len(str) {
-	case 10, 19, 21, 22, 23, 24, 25, 26: // up to "YYYY-MM-DD HH:MM:SS.MMMMMM"
-		if str == base[:len(str)] {
-			return
-		}
-		t, err = time.Parse(timeFormat[:len(str)], str)
-	default:
-		err = fmt.Errorf("invalid time string: %s", str)
-		return
-	}
-
-	// Adjust location
-	if err == nil && loc != time.UTC {
-		y, mo, d := t.Date()
-		h, mi, s := t.Clock()
-		t, err = time.Date(y, mo, d, h, mi, s, t.Nanosecond(), loc), nil
-	}
-
-	return
-}
-
-// zeroDateTime is used in formatBinaryDateTime to avoid an allocation
-// if the DATE or DATETIME has the zero value.
-// It must never be changed.
-// The current behavior depends on database/sql copying the result.
-var zeroDateTime = []byte("0000-00-00 00:00:00.000000")
-
-const digits01 = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-const digits10 = "0000000000111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999"
-
-/******************************************************************************
-*                       Convert from and to bytes                             *
-******************************************************************************/
-
-func uint64ToBytes(n uint64) []byte {
-	return []byte{
-		byte(n),
-		byte(n >> 8),
-		byte(n >> 16),
-		byte(n >> 24),
-		byte(n >> 32),
-		byte(n >> 40),
-		byte(n >> 48),
-		byte(n >> 56),
-	}
-}
-
-func uint64ToString(n uint64) []byte {
-	var a [20]byte
-	i := 20
-
-	// U+0030 = 0
-	// ...
-	// U+0039 = 9
-
-	var q uint64
-	for n >= 10 {
-		i--
-		q = n / 10
-		a[i] = uint8(n-q*10) + 0x30
-		n = q
-	}
-
-	i--
-	a[i] = uint8(n) + 0x30
-
-	return a[i:]
-}
-
-// treats string value as unsigned integer representation
-func stringToInt(b []byte) int {
-	val := 0
-	for i := range b {
-		val *= 10
-		val += int(b[i] - 0x30)
-	}
-	return val
-}
-
-// reserveBuffer checks cap(buf) and expand buffer to len(buf) + appendSize.
-// If cap(buf) is not enough, reallocate new buffer.
-func reserveBuffer(buf []byte, appendSize int) []byte {
-	newSize := len(buf) + appendSize
-	if cap(buf) < newSize {
-		// Grow buffer exponentially
-		newBuf := make([]byte, len(buf)*2+appendSize)
-		copy(newBuf, buf)
-		buf = newBuf
-	}
-	return buf[:newSize]
-}
-
-// escapeBytesBackslash escapes []byte with backslashes (\)
-// This escapes the contents of a string (provided as []byte) by adding backslashes before special
-// characters, and turning others into specific escape sequences, such as
-// turning newlines into \n and null bytes into \0.
-func escapeBytesBackslash(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-	for _, c := range v {
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		case '\'':
-			buf[pos] = '\\'
-			buf[pos+1] = '\''
-			pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos++
-		}
-	}
-	return buf[:pos]
-}
-
-// escapeStringBackslash is similar to escapeBytesBackslash but for string.
-func escapeStringBackslash(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		//case '\'':
-		//	buf[pos] = '\\'
-		//	buf[pos+1] = '\''
-		//	pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos++
-		}
-	}
-
-	return buf[:pos]
-}
-
-// escapeBytesQuotes escapes apostrophes in []byte by doubling them up.
-// This escapes the contents of a string by doubling up any apostrophes that
-// it contains. This is used when the NO_BACKSLASH_ESCAPES SQL_MODE is in
-// effect on the server.
-func escapeBytesQuotes(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for _, c := range v {
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-
-	return buf[:pos]
-}
-
-// escapeStringQuotes is similar to escapeBytesQuotes but for string.
-func escapeStringQuotes(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-
-	return buf[:pos]
-}
-
-/******************************************************************************
-*                               Sync utils                                    *
-******************************************************************************/
-
-// noCopy may be embedded into structs which must not be copied
-// after the first use.
-//
-// See https://github.com/golang/go/issues/8005#issuecomment-190753527
-// for details.
-type noCopy struct{}
-
-// Lock is a no-op used by -copylocks checker from `go vet`.
-func (*noCopy) Lock() {}
-
-// atomicBool is a wrapper around uint32 for usage as a boolean value with
-// atomic access.
-type atomicBool struct {
-	_noCopy noCopy
-	value   uint32
-}
-
-// IsSet returns whether the current boolean value is true
-func (ab *atomicBool) IsSet() bool {
-	return atomic.LoadUint32(&ab.value) > 0
-}
-
-// Set sets the value of the bool regardless of the previous value
-func (ab *atomicBool) Set(value bool) {
-	if value {
-		atomic.StoreUint32(&ab.value, 1)
-	} else {
-		atomic.StoreUint32(&ab.value, 0)
-	}
-}
-
-// TrySet sets the value of the bool and returns whether the value changed
-func (ab *atomicBool) TrySet(value bool) bool {
-	if value {
-		return atomic.SwapUint32(&ab.value, 1) == 0
-	}
-	return atomic.SwapUint32(&ab.value, 0) > 0
-}
-
-// atomicError is a wrapper for atomically accessed error values
-type atomicError struct {
-	_noCopy noCopy
-	value   atomic.Value
-}
-
-// Set sets the error value regardless of the previous value.
-// The value must not be nil
-func (ae *atomicError) Set(value error) {
-	ae.value.Store(value)
-}
-
-// Value returns the current error value
-func (ae *atomicError) Value() error {
-	if v := ae.value.Load(); v != nil {
-		// this will panic if the value doesn't implement the error interface
-		return v.(error)
-	}
-	return nil
-}
-
-func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
-	dargs := make([]driver.Value, len(named))
-	for n, param := range named {
-		if len(param.Name) > 0 {
-			// TODO: support the use of Named Parameters #561
-			return nil, errors.New("taosSql: driver does not support the use of Named Parameters")
-		}
-		dargs[n] = param.Value
-	}
-	return dargs, nil
-}
-
-
-/******************************************************************************
-*                     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()
-}
diff --git a/src/connector/grafana/tdengine/.gitignore b/src/connector/grafana/tdengine/.gitignore
deleted file mode 100755
index b58b02b878ca346b90de77891af8b46bebad00e4..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-node_modules
-npm-debug.log
-coverage/
-.aws-config.json
-awsconfig
-/emails/dist
-/public_gen
-/tmp
-vendor/phantomjs/phantomjs
-
-docs/AWS_S3_BUCKET
-docs/GIT_BRANCH
-docs/VERSION
-docs/GITCOMMIT
-docs/changed-files
-docs/changed-files
-
-# locally required config files
-public/css/*.min.css
-
-# Editor junk
-*.sublime-workspace
-*.swp
-.idea/
-*.iml
-
-/data/*
-/bin/*
-
-conf/custom.ini
-fig.yml
-profile.cov
-grafana
-.notouch
-
-# Test artifacts
-/dist/test/
diff --git a/src/connector/grafana/tdengine/.jscs.json b/src/connector/grafana/tdengine/.jscs.json
deleted file mode 100755
index a51ef6610e1243e281be7ac36c30a3865c10ee3e..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/.jscs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "esnext": true,
-    "disallowImplicitTypeConversion": ["string"],
-    "disallowKeywords": ["with"],
-    "disallowMultipleLineBreaks": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "validateIndentation": 2
-}
diff --git a/src/connector/grafana/tdengine/Gruntfile.js b/src/connector/grafana/tdengine/Gruntfile.js
deleted file mode 100755
index ad48c7f8483a4ebe1bfbf7f4960c7cd1419fe64a..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/Gruntfile.js
+++ /dev/null
@@ -1,85 +0,0 @@
-module.exports = function(grunt) {
-
-  require('load-grunt-tasks')(grunt);
-
-  grunt.loadNpmTasks('grunt-execute');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-
-  grunt.initConfig({
-
-    clean: ["dist"],
-
-    copy: {
-      src_to_dist: {
-        cwd: 'src',
-        expand: true,
-        src: ['**/*', '!**/*.js', '!**/*.scss'],
-        dest: 'dist'
-      },
-      dashboard_to_dist: {
-        expand: true,
-        src: ['dashboard/*'],
-        dest: 'dist'
-      },
-      pluginDef: {
-        expand: true,
-        src: ['README.md'],
-        dest: 'dist'
-      }
-    },
-
-    watch: {
-      rebuild_all: {
-        files: ['src/**/*'],
-        tasks: ['default'],
-        options: {spawn: false}
-      }
-    },
-
-    babel: {
-      options: {
-        sourceMap: true,
-        presets:  ['env'],
-        plugins: ['transform-object-rest-spread']
-      },
-      dist: {
-        files: [{
-          cwd: 'src',
-          expand: true,
-          src: ['**/*.js'],
-          dest: 'dist',
-          ext:'.js'
-        }]
-      },
-      distTestNoSystemJs: {
-        files: [{
-          cwd: 'src',
-          expand: true,
-          src: ['**/*.js'],
-          dest: 'dist/test',
-          ext:'.js'
-        }]
-      },
-      distTestsSpecsNoSystemJs: {
-        files: [{
-          expand: true,
-          cwd: 'spec',
-          src: ['**/*.js'],
-          dest: 'dist/test/spec',
-          ext:'.js'
-        }]
-      }
-    },
-
-    mochaTest: {
-      test: {
-        options: {
-          reporter: 'spec'
-        },
-        src: ['dist/test/spec/test-main.js', 'dist/test/spec/*_spec.js']
-      }
-    }
-  });
-
-  grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:dashboard_to_dist', 'copy:pluginDef', 'babel', 'mochaTest']);
-};
diff --git a/src/connector/grafana/tdengine/LICENSE b/src/connector/grafana/tdengine/LICENSE
deleted file mode 100755
index 20c71216de3fca699b10a3e22460f0e2d55453c8..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
- GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    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.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/README.md b/src/connector/grafana/tdengine/README.md
deleted file mode 100644
index 3012a54e9f34925a21d43c8258e472c49510e999..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-TDengine Datasource - build by Taosdata Inc. www.taosdata.com
-
-TDengine backend server implement 2 urls:
-
- * `/heartbeat` return 200 ok. Used for "Test connection" on the datasource config page.
- * `/query` return data based on input sqls.
-
-## Installation
-
-To install this plugin:
-Copy the data source you want to /var/lib/grafana/plugins/. Then restart grafana-server. The new data source should now be available in the data source type dropdown in the Add Data Source View.
-
-```
-cp -r <tdengine-extrach-dir>/connector/grafana/tdengine /var/lib/grafana/plugins/
-sudo service grafana-server restart
-```
-
-### Query API
-
-Example request
-``` javascript
-[{
-	"refId": "A",
-	"alias": "taosd-memory",
-	"sql": "select avg(mem_taosd) from sys.dn where ts > now-5m and ts < now interval(500a)"
-},
-{
-	"refId": "B",
-	"alias": "system-memory",
-	"sql": "select avg(mem_system) from sys.dn where ts > now-5m and ts < now interval(500a)"
-}]
-```
-
-Example response
-``` javascript
-[{
-	"datapoints": [
-		[206.488281, 1538137825000],
-		[206.488281, 1538137855000],
-		[206.488281, 1538137885500],
-		[210.609375, 1538137915500],
-		[210.867188, 1538137945500]
-	],
-	"refId": "A",
-	"target": "taosd-memory"
-},
-{
-	"datapoints": [
-		[2910.218750, 1538137825000],
-		[2912.265625, 1538137855000],
-		[2912.437500, 1538137885500],
-		[2916.644531, 1538137915500],
-		[2917.066406, 1538137945500]
-	],
-	"refId": "B",
-	"target": "system-memory"
-}]
-```
-
-### Heartbeat API
-
-Example request
-``` javascript
- Get request /heartbeat
-```
-
-Example response
-``` javascript   
-{
-	"message": "Grafana server receive a quest from you!"
-}
-```
-
-### Dev setup
-
-This plugin requires node 6.10.0
-
-``` javascript
-
-npm install -g yarn 
-yarn install
-npm run build
-
-```
-
-### Import Dashboard
-
-after login `http://localhost:3000 `, then you can import the tdengine demo dashboard to monitor the system metrics.
-
-you can import the  `dashboard/tdengine-grafana.json`:
-
-![import_dashboard](dashboard/import_dashboard.png)
-
-after finished import:
-
-![import_dashboard](dashboard/tdengine_dashboard.png)
diff --git a/src/connector/grafana/tdengine/dashboard/import_dashboard.png b/src/connector/grafana/tdengine/dashboard/import_dashboard.png
deleted file mode 100644
index be3704cb72d6c2614614852bfef17147ce49d061..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/dashboard/import_dashboard.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/dashboard/tdengine-grafana.json b/src/connector/grafana/tdengine/dashboard/tdengine-grafana.json
deleted file mode 100755
index 7a002a3d6b5d2f5dbf7c0b29c01dd8931775792c..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dashboard/tdengine-grafana.json
+++ /dev/null
@@ -1,588 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 3,
-  "links": [],
-  "panels": [
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "TDengine",
-      "description": "total  select  request  per minute last hour",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 8,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "次数/min",
-      "postfixFontSize": "20%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "alias": "req_select",
-          "refId": "A",
-          "sql": "select sum(req_select) from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": "120,240",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "req select",
-      "type": "singlestat",
-      "valueFontSize": "150%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "total"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "TDengine",
-      "description": "total   insert  request   per minute  for last hour",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "次数/min",
-      "postfixFontSize": "20%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "alias": "req_insert",
-          "refId": "A",
-          "sql": "select sum(req_insert) from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": "110,240",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "req  insert",
-      "type": "singlestat",
-      "valueFontSize": "150%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "total"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "taosd  max  memery  last 10 minutes",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 0,
-        "y": 6
-      },
-      "id": 12,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 4096,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              },
-              {
-                "color": "#EAB839",
-                "value": 2048
-              }
-            ],
-            "unit": "decmbytes"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "mem_taosd",
-          "refId": "A",
-          "sql": "select  max(mem_taosd)  from log.dn where ts >= now -10m and ts < now",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "taosd memery",
-      "type": "gauge"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "max System Memory last 1 hour",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 8,
-        "y": 6
-      },
-      "id": 10,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "last"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 4,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "semi-dark-orange",
-                "value": 60
-              },
-              {
-                "color": "dark-red",
-                "value": 80
-              }
-            ],
-            "title": "",
-            "unit": "decmbytes"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "mem_system",
-          "refId": "A",
-          "sql": "select  max(mem_system)  from log.dn where ts >= now -10h and ts < now",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "system memory",
-      "type": "gauge"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "avg band speed  last  one minute",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 16,
-        "y": 6
-      },
-      "id": 14,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "last"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 8192,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 4916
-              },
-              {
-                "color": "red",
-                "value": 6554
-              }
-            ],
-            "unit": "Kbits"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "band_speed",
-          "refId": "A",
-          "sql": "select avg(band_speed)  from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "band speed",
-      "type": "gauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "TDengine",
-      "description": "monitor system cpu",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 0,
-        "y": 12
-      },
-      "hideTimeOverride": true,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.4.3",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "cpu_system11",
-          "hide": false,
-          "refId": "A",
-          "sql": "select  avg(cpu_system) from log.dn where ts >= now-1h and ts < now  interval(1s)",
-          "target": "select metric",
-          "type": "timeserie"
-        },
-        {
-          "alias": "cpu_taosd",
-          "hide": false,
-          "refId": "B",
-          "sql": "select  avg(cpu_taosd) from log.dn where ts >= now-1h and ts < now  interval(1s)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": "1h",
-      "timeRegions": [],
-      "timeShift": "30s",
-      "title": "cpu_system",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "percent",
-          "label": "使用占比",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "TDengine",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 12
-      },
-      "id": 18,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "",
-          "refId": "A",
-          "sql": "select avg(disk_used)  disk_used from log.dn where ts >= $from and ts < $to interval(1s) group by ipaddr",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "avg_disk_used",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decgbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 20,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "TDengine",
-  "uid": "FE-vpe0Wk",
-  "version": 1
-}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dashboard/tdengine_dashboard.png b/src/connector/grafana/tdengine/dashboard/tdengine_dashboard.png
deleted file mode 100755
index a4b6a7669a47aeb44734b1c8e3241e9439c19ab7..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/dashboard/tdengine_dashboard.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/dist/README.md b/src/connector/grafana/tdengine/dist/README.md
deleted file mode 100644
index 3012a54e9f34925a21d43c8258e472c49510e999..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-TDengine Datasource - build by Taosdata Inc. www.taosdata.com
-
-TDengine backend server implement 2 urls:
-
- * `/heartbeat` return 200 ok. Used for "Test connection" on the datasource config page.
- * `/query` return data based on input sqls.
-
-## Installation
-
-To install this plugin:
-Copy the data source you want to /var/lib/grafana/plugins/. Then restart grafana-server. The new data source should now be available in the data source type dropdown in the Add Data Source View.
-
-```
-cp -r <tdengine-extrach-dir>/connector/grafana/tdengine /var/lib/grafana/plugins/
-sudo service grafana-server restart
-```
-
-### Query API
-
-Example request
-``` javascript
-[{
-	"refId": "A",
-	"alias": "taosd-memory",
-	"sql": "select avg(mem_taosd) from sys.dn where ts > now-5m and ts < now interval(500a)"
-},
-{
-	"refId": "B",
-	"alias": "system-memory",
-	"sql": "select avg(mem_system) from sys.dn where ts > now-5m and ts < now interval(500a)"
-}]
-```
-
-Example response
-``` javascript
-[{
-	"datapoints": [
-		[206.488281, 1538137825000],
-		[206.488281, 1538137855000],
-		[206.488281, 1538137885500],
-		[210.609375, 1538137915500],
-		[210.867188, 1538137945500]
-	],
-	"refId": "A",
-	"target": "taosd-memory"
-},
-{
-	"datapoints": [
-		[2910.218750, 1538137825000],
-		[2912.265625, 1538137855000],
-		[2912.437500, 1538137885500],
-		[2916.644531, 1538137915500],
-		[2917.066406, 1538137945500]
-	],
-	"refId": "B",
-	"target": "system-memory"
-}]
-```
-
-### Heartbeat API
-
-Example request
-``` javascript
- Get request /heartbeat
-```
-
-Example response
-``` javascript   
-{
-	"message": "Grafana server receive a quest from you!"
-}
-```
-
-### Dev setup
-
-This plugin requires node 6.10.0
-
-``` javascript
-
-npm install -g yarn 
-yarn install
-npm run build
-
-```
-
-### Import Dashboard
-
-after login `http://localhost:3000 `, then you can import the tdengine demo dashboard to monitor the system metrics.
-
-you can import the  `dashboard/tdengine-grafana.json`:
-
-![import_dashboard](dashboard/import_dashboard.png)
-
-after finished import:
-
-![import_dashboard](dashboard/tdengine_dashboard.png)
diff --git a/src/connector/grafana/tdengine/dist/css/query-editor.css b/src/connector/grafana/tdengine/dist/css/query-editor.css
deleted file mode 100644
index 3b678b9f3689d2131d2224826872b8a75cc1c9fe..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/css/query-editor.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.generic-datasource-query-row .query-keyword {
-  width: 75px;
-}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dist/dashboard/import_dashboard.png b/src/connector/grafana/tdengine/dist/dashboard/import_dashboard.png
deleted file mode 100644
index be3704cb72d6c2614614852bfef17147ce49d061..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/dist/dashboard/import_dashboard.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/dist/dashboard/tdengine-grafana.json b/src/connector/grafana/tdengine/dist/dashboard/tdengine-grafana.json
deleted file mode 100644
index 7a002a3d6b5d2f5dbf7c0b29c01dd8931775792c..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/dashboard/tdengine-grafana.json
+++ /dev/null
@@ -1,588 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 3,
-  "links": [],
-  "panels": [
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "TDengine",
-      "description": "total  select  request  per minute last hour",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 8,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "次数/min",
-      "postfixFontSize": "20%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "alias": "req_select",
-          "refId": "A",
-          "sql": "select sum(req_select) from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": "120,240",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "req select",
-      "type": "singlestat",
-      "valueFontSize": "150%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "total"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": true,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "TDengine",
-      "description": "total   insert  request   per minute  for last hour",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "次数/min",
-      "postfixFontSize": "20%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "alias": "req_insert",
-          "refId": "A",
-          "sql": "select sum(req_insert) from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": "110,240",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "req  insert",
-      "type": "singlestat",
-      "valueFontSize": "150%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "total"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "taosd  max  memery  last 10 minutes",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 0,
-        "y": 6
-      },
-      "id": 12,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 4096,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              },
-              {
-                "color": "#EAB839",
-                "value": 2048
-              }
-            ],
-            "unit": "decmbytes"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "mem_taosd",
-          "refId": "A",
-          "sql": "select  max(mem_taosd)  from log.dn where ts >= now -10m and ts < now",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "taosd memery",
-      "type": "gauge"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "max System Memory last 1 hour",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 8,
-        "y": 6
-      },
-      "id": 10,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "last"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 4,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "semi-dark-orange",
-                "value": 60
-              },
-              {
-                "color": "dark-red",
-                "value": 80
-              }
-            ],
-            "title": "",
-            "unit": "decmbytes"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "mem_system",
-          "refId": "A",
-          "sql": "select  max(mem_system)  from log.dn where ts >= now -10h and ts < now",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "system memory",
-      "type": "gauge"
-    },
-    {
-      "datasource": "TDengine",
-      "description": "avg band speed  last  one minute",
-      "gridPos": {
-        "h": 6,
-        "w": 8,
-        "x": 16,
-        "y": 6
-      },
-      "id": 14,
-      "options": {
-        "fieldOptions": {
-          "calcs": [
-            "last"
-          ],
-          "defaults": {
-            "mappings": [],
-            "max": 8192,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 4916
-              },
-              {
-                "color": "red",
-                "value": 6554
-              }
-            ],
-            "unit": "Kbits"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": true,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.3",
-      "targets": [
-        {
-          "alias": "band_speed",
-          "refId": "A",
-          "sql": "select avg(band_speed)  from log.dn where ts >= now-1h and ts < now interval(1m)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "band speed",
-      "type": "gauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "TDengine",
-      "description": "monitor system cpu",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 0,
-        "y": 12
-      },
-      "hideTimeOverride": true,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.4.3",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "cpu_system11",
-          "hide": false,
-          "refId": "A",
-          "sql": "select  avg(cpu_system) from log.dn where ts >= now-1h and ts < now  interval(1s)",
-          "target": "select metric",
-          "type": "timeserie"
-        },
-        {
-          "alias": "cpu_taosd",
-          "hide": false,
-          "refId": "B",
-          "sql": "select  avg(cpu_taosd) from log.dn where ts >= now-1h and ts < now  interval(1s)",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": "1h",
-      "timeRegions": [],
-      "timeShift": "30s",
-      "title": "cpu_system",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "percent",
-          "label": "使用占比",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "TDengine",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 12
-      },
-      "id": 18,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "",
-          "refId": "A",
-          "sql": "select avg(disk_used)  disk_used from log.dn where ts >= $from and ts < $to interval(1s) group by ipaddr",
-          "target": "select metric",
-          "type": "timeserie"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "avg_disk_used",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decgbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 20,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "TDengine",
-  "uid": "FE-vpe0Wk",
-  "version": 1
-}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dist/dashboard/tdengine_dashboard.png b/src/connector/grafana/tdengine/dist/dashboard/tdengine_dashboard.png
deleted file mode 100644
index a4b6a7669a47aeb44734b1c8e3241e9439c19ab7..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/dist/dashboard/tdengine_dashboard.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/dist/datasource.js b/src/connector/grafana/tdengine/dist/datasource.js
deleted file mode 100644
index 8190394f9304dfc809b9c6c14dfcb1853fb15a72..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/datasource.js
+++ /dev/null
@@ -1,156 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.GenericDatasource = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _lodash = require('lodash');
-
-var _lodash2 = _interopRequireDefault(_lodash);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var GenericDatasource = exports.GenericDatasource = function () {
-  function GenericDatasource(instanceSettings, $q, backendSrv, templateSrv) {
-    _classCallCheck(this, GenericDatasource);
-
-    this.type = instanceSettings.type;
-    this.url = instanceSettings.url;
-    this.name = instanceSettings.name;
-    this.q = $q;
-    this.backendSrv = backendSrv;
-    this.templateSrv = templateSrv;
-    this.headers = { 'Content-Type': 'application/json' };
-    this.headers.Authorization = this.getAuthorization(instanceSettings.jsonData);
-  }
-
-  _createClass(GenericDatasource, [{
-    key: 'query',
-    value: function query(options) {
-      var targets = this.buildQueryParameters(options);
-
-      if (targets.length <= 0) {
-        return this.q.when({ data: [] });
-      }
-
-      return this.doRequest({
-        url: this.url + '/grafana/query',
-        data: targets,
-        method: 'POST'
-      });
-    }
-  }, {
-    key: 'testDatasource',
-    value: function testDatasource() {
-      return this.doRequest({
-        url: this.url + '/grafana/heartbeat',
-        method: 'GET'
-      }).then(function (response) {
-        if (response.status === 200) {
-          return { status: "success", message: "TDengine Data source is working", title: "Success" };
-        }
-      });
-    }
-  }, {
-    key: 'doRequest',
-    value: function doRequest(options) {
-      options.headers = this.headers;
-
-      return this.backendSrv.datasourceRequest(options);
-    }
-  }, {
-    key: 'buildQueryParameters',
-    value: function buildQueryParameters(options) {
-      var _this = this;
-
-      var targets = _lodash2.default.map(options.targets, function (target) {
-        return {
-          refId: target.refId,
-          alias: _this.generateAlias(options, target),
-          sql: _this.generateSql(options, target)
-        };
-      });
-
-      return targets;
-    }
-  }, {
-    key: 'encode',
-    value: function encode(input) {
-      var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-      var output = "";
-      var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-      var i = 0;
-      while (i < input.length) {
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
-        enc1 = chr1 >> 2;
-        enc2 = (chr1 & 3) << 4 | chr2 >> 4;
-        enc3 = (chr2 & 15) << 2 | chr3 >> 6;
-        enc4 = chr3 & 63;
-        if (isNaN(chr2)) {
-          enc3 = enc4 = 64;
-        } else if (isNaN(chr3)) {
-          enc4 = 64;
-        }
-        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-      }
-
-      return output;
-    }
-  }, {
-    key: 'getAuthorization',
-    value: function getAuthorization(jsonData) {
-      jsonData = jsonData || {};
-      var defaultUser = jsonData.user || "root";
-      var defaultPassword = jsonData.password || "taosdata";
-
-      return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
-    }
-  }, {
-    key: 'generateAlias',
-    value: function generateAlias(options, target) {
-      var alias = target.alias || "";
-      alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
-      return alias;
-    }
-  }, {
-    key: 'generateSql',
-    value: function generateSql(options, target) {
-      var sql = target.sql;
-      if (sql == null || sql == "") {
-        return sql;
-      }
-
-      var queryStart = "now-1h";
-      if (options != null && options.range != null && options.range.from != null) {
-        queryStart = options.range.from.toISOString();
-      }
-
-      var queryEnd = "now";
-      if (options != null && options.range != null && options.range.to != null) {
-        queryEnd = options.range.to.toISOString();
-      }
-      var intervalMs = options.intervalMs || "20000";
-
-      intervalMs += "a";
-      sql = sql.replace(/^\s+|\s+$/gm, '');
-      sql = sql.replace("$from", "'" + queryStart + "'");
-      sql = sql.replace("$begin", "'" + queryStart + "'");
-      sql = sql.replace("$to", "'" + queryEnd + "'");
-      sql = sql.replace("$end", "'" + queryEnd + "'");
-      sql = sql.replace("$interval", intervalMs);
-
-      sql = this.templateSrv.replace(sql, options.scopedVars, 'csv');
-      return sql;
-    }
-  }]);
-
-  return GenericDatasource;
-}();
-//# sourceMappingURL=datasource.js.map
diff --git a/src/connector/grafana/tdengine/dist/datasource.js.map b/src/connector/grafana/tdengine/dist/datasource.js.map
deleted file mode 100644
index 0065a5ae0e536992c9c19490b785daf6873a5407..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/datasource.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../src/datasource.js"],"names":["GenericDatasource","instanceSettings","$q","backendSrv","templateSrv","type","url","name","q","headers","Authorization","getAuthorization","jsonData","options","targets","buildQueryParameters","length","when","data","doRequest","method","then","response","status","message","title","datasourceRequest","_","map","refId","target","alias","generateAlias","sql","generateSql","input","_keyStr","output","chr1","chr2","chr3","enc1","enc2","enc3","enc4","i","charCodeAt","isNaN","charAt","defaultUser","user","defaultPassword","password","encode","replace","scopedVars","queryStart","range","from","toISOString","queryEnd","to","intervalMs"],"mappings":";;;;;;;;;AAAA;;;;;;;;IAEaA,iB,WAAAA,iB;AAEX,6BAAYC,gBAAZ,EAA8BC,EAA9B,EAAkCC,UAAlC,EAA8CC,WAA9C,EAA2D;AAAA;;AACzD,SAAKC,IAAL,GAAYJ,iBAAiBI,IAA7B;AACA,SAAKC,GAAL,GAAWL,iBAAiBK,GAA5B;AACA,SAAKC,IAAL,GAAYN,iBAAiBM,IAA7B;AACA,SAAKC,CAAL,GAASN,EAAT;AACA,SAAKC,UAAL,GAAkBA,UAAlB;AACA,SAAKC,WAAL,GAAmBA,WAAnB;AACA,SAAKK,OAAL,GAAe,EAAC,gBAAgB,kBAAjB,EAAf;AACA,SAAKA,OAAL,CAAaC,aAAb,GAA6B,KAAKC,gBAAL,CAAsBV,iBAAiBW,QAAvC,CAA7B;AACD;;;;0BAEKC,O,EAAS;AACb,UAAIC,UAAU,KAAKC,oBAAL,CAA0BF,OAA1B,CAAd;;AAEA,UAAIC,QAAQE,MAAR,IAAkB,CAAtB,EAAyB;AACvB,eAAO,KAAKR,CAAL,CAAOS,IAAP,CAAY,EAACC,MAAM,EAAP,EAAZ,CAAP;AACD;;AAED,aAAO,KAAKC,SAAL,CAAe;AACpBb,aAAK,KAAKA,GAAL,GAAW,gBADI;AAEpBY,cAAMJ,OAFc;AAGpBM,gBAAQ;AAHY,OAAf,CAAP;AAKD;;;qCAEgB;AACf,aAAO,KAAKD,SAAL,CAAe;AACpBb,aAAK,KAAKA,GAAL,GAAW,oBADI;AAEpBc,gBAAQ;AAFY,OAAf,EAGJC,IAHI,CAGC,oBAAY;AAClB,YAAIC,SAASC,MAAT,KAAoB,GAAxB,EAA6B;AAC3B,iBAAO,EAAEA,QAAQ,SAAV,EAAqBC,SAAS,iCAA9B,EAAiEC,OAAO,SAAxE,EAAP;AACD;AACF,OAPM,CAAP;AAQD;;;8BAESZ,O,EAAS;AACjBA,cAAQJ,OAAR,GAAkB,KAAKA,OAAvB;;AAEA,aAAO,KAAKN,UAAL,CAAgBuB,iBAAhB,CAAkCb,OAAlC,CAAP;AACD;;;yCAEoBA,O,EAAS;AAAA;;AAE5B,UAAIC,UAAUa,iBAAEC,GAAF,CAAMf,QAAQC,OAAd,EAAuB,kBAAU;AAC7C,eAAO;AACLe,iBAAOC,OAAOD,KADT;AAELE,iBAAO,MAAKC,aAAL,CAAmBnB,OAAnB,EAA4BiB,MAA5B,CAFF;AAGLG,eAAK,MAAKC,WAAL,CAAiBrB,OAAjB,EAA0BiB,MAA1B;AAHA,SAAP;AAKD,OANa,CAAd;;AAQA,aAAOhB,OAAP;AACD;;;2BAEMqB,K,EAAO;AACZ,UAAIC,UAAU,mEAAd;AACA,UAAIC,SAAS,EAAb;AACA,UAAIC,IAAJ,EAAUC,IAAV,EAAgBC,IAAhB,EAAsBC,IAAtB,EAA4BC,IAA5B,EAAkCC,IAAlC,EAAwCC,IAAxC;AACA,UAAIC,IAAI,CAAR;AACA,aAAOA,IAAIV,MAAMnB,MAAjB,EAAyB;AACvBsB,eAAOH,MAAMW,UAAN,CAAiBD,GAAjB,CAAP;AACAN,eAAOJ,MAAMW,UAAN,CAAiBD,GAAjB,CAAP;AACAL,eAAOL,MAAMW,UAAN,CAAiBD,GAAjB,CAAP;AACAJ,eAAOH,QAAQ,CAAf;AACAI,eAAQ,CAACJ,OAAO,CAAR,KAAc,CAAf,GAAqBC,QAAQ,CAApC;AACAI,eAAQ,CAACJ,OAAO,EAAR,KAAe,CAAhB,GAAsBC,QAAQ,CAArC;AACAI,eAAOJ,OAAO,EAAd;AACA,YAAIO,MAAMR,IAAN,CAAJ,EAAiB;AACfI,iBAAOC,OAAO,EAAd;AACD,SAFD,MAEO,IAAIG,MAAMP,IAAN,CAAJ,EAAiB;AACtBI,iBAAO,EAAP;AACD;AACDP,iBAASA,SAASD,QAAQY,MAAR,CAAeP,IAAf,CAAT,GAAgCL,QAAQY,MAAR,CAAeN,IAAf,CAAhC,GAAuDN,QAAQY,MAAR,CAAeL,IAAf,CAAvD,GAA8EP,QAAQY,MAAR,CAAeJ,IAAf,CAAvF;AACD;;AAED,aAAOP,MAAP;AACD;;;qCAEgBzB,Q,EAAS;AACxBA,iBAAWA,YAAY,EAAvB;AACA,UAAIqC,cAAcrC,SAASsC,IAAT,IAAiB,MAAnC;AACA,UAAIC,kBAAkBvC,SAASwC,QAAT,IAAqB,UAA3C;;AAEA,aAAO,WAAW,KAAKC,MAAL,CAAYJ,cAAc,GAAd,GAAoBE,eAAhC,CAAlB;AACD;;;kCAEatC,O,EAASiB,M,EAAO;AAC5B,UAAIC,QAAQD,OAAOC,KAAP,IAAgB,EAA5B;AACAA,cAAQ,KAAK3B,WAAL,CAAiBkD,OAAjB,CAAyBvB,KAAzB,EAAgClB,QAAQ0C,UAAxC,EAAoD,KAApD,CAAR;AACA,aAAOxB,KAAP;AACD;;;gCAEWlB,O,EAASiB,M,EAAQ;AAC3B,UAAIG,MAAMH,OAAOG,GAAjB;AACA,UAAIA,OAAO,IAAP,IAAeA,OAAO,EAA1B,EAA6B;AAC3B,eAAOA,GAAP;AACD;;AAED,UAAIuB,aAAa,QAAjB;AACA,UAAI3C,WAAW,IAAX,IAAmBA,QAAQ4C,KAAR,IAAiB,IAApC,IAA4C5C,QAAQ4C,KAAR,CAAcC,IAAd,IAAsB,IAAtE,EAA2E;AACzEF,qBAAa3C,QAAQ4C,KAAR,CAAcC,IAAd,CAAmBC,WAAnB,EAAb;AACD;;AAED,UAAIC,WAAW,KAAf;AACA,UAAI/C,WAAW,IAAX,IAAmBA,QAAQ4C,KAAR,IAAiB,IAApC,IAA4C5C,QAAQ4C,KAAR,CAAcI,EAAd,IAAoB,IAApE,EAAyE;AACvED,mBAAW/C,QAAQ4C,KAAR,CAAcI,EAAd,CAAiBF,WAAjB,EAAX;AACD;AACD,UAAIG,aAAajD,QAAQiD,UAAR,IAAsB,OAAvC;;AAEAA,oBAAc,GAAd;AACA7B,YAAMA,IAAIqB,OAAJ,CAAY,aAAZ,EAA2B,EAA3B,CAAN;AACArB,YAAMA,IAAIqB,OAAJ,CAAY,OAAZ,EAAqB,MAAME,UAAN,GAAmB,GAAxC,CAAN;AACAvB,YAAMA,IAAIqB,OAAJ,CAAY,QAAZ,EAAsB,MAAME,UAAN,GAAmB,GAAzC,CAAN;AACAvB,YAAMA,IAAIqB,OAAJ,CAAY,KAAZ,EAAmB,MAAMM,QAAN,GAAiB,GAApC,CAAN;AACA3B,YAAMA,IAAIqB,OAAJ,CAAY,MAAZ,EAAoB,MAAMM,QAAN,GAAiB,GAArC,CAAN;AACA3B,YAAMA,IAAIqB,OAAJ,CAAY,WAAZ,EAAyBQ,UAAzB,CAAN;;AAEA7B,YAAM,KAAK7B,WAAL,CAAiBkD,OAAjB,CAAyBrB,GAAzB,EAA8BpB,QAAQ0C,UAAtC,EAAkD,KAAlD,CAAN;AACA,aAAOtB,GAAP;AACD","file":"datasource.js","sourcesContent":["import _ from \"lodash\";\n\nexport class GenericDatasource {\n\n  constructor(instanceSettings, $q, backendSrv, templateSrv) {\n    this.type = instanceSettings.type;\n    this.url = instanceSettings.url;\n    this.name = instanceSettings.name;\n    this.q = $q;\n    this.backendSrv = backendSrv;\n    this.templateSrv = templateSrv;\n    this.headers = {'Content-Type': 'application/json'};\n    this.headers.Authorization = this.getAuthorization(instanceSettings.jsonData);\n  }\n\n  query(options) {\n    var targets = this.buildQueryParameters(options);\n\n    if (targets.length <= 0) {\n      return this.q.when({data: []});\n    }\n\n    return this.doRequest({\n      url: this.url + '/grafana/query',\n      data: targets,\n      method: 'POST'\n    });\n  }\n\n  testDatasource() {\n    return this.doRequest({\n      url: this.url + '/grafana/heartbeat',\n      method: 'GET',\n    }).then(response => {\n      if (response.status === 200) {\n        return { status: \"success\", message: \"TDengine Data source is working\", title: \"Success\" };\n      }\n    });\n  }\n\n  doRequest(options) {\n    options.headers = this.headers;\n\n    return this.backendSrv.datasourceRequest(options);\n  }\n\n  buildQueryParameters(options) {\n\n    var targets = _.map(options.targets, target => {\n      return {\n        refId: target.refId,\n        alias: this.generateAlias(options, target),\n        sql: this.generateSql(options, target)\n      };\n    });\n\n    return targets;\n  }\n\n  encode(input) {\n    var _keyStr = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\";\n    var output = \"\";\n    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;\n    var i = 0;\n    while (i < input.length) {\n      chr1 = input.charCodeAt(i++);\n      chr2 = input.charCodeAt(i++);\n      chr3 = input.charCodeAt(i++);\n      enc1 = chr1 >> 2;\n      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);\n      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);\n      enc4 = chr3 & 63;\n      if (isNaN(chr2)) {\n        enc3 = enc4 = 64;\n      } else if (isNaN(chr3)) {\n        enc4 = 64;\n      }\n      output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);\n    }\n\n    return output;\n  }\n\n  getAuthorization(jsonData){\n    jsonData = jsonData || {};\n    var defaultUser = jsonData.user || \"root\";\n    var defaultPassword = jsonData.password || \"taosdata\";\n\n    return \"Basic \" + this.encode(defaultUser + \":\" + defaultPassword);\n  }\n\n  generateAlias(options, target){\n    var alias = target.alias || \"\";\n    alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');\n    return alias;\n  }\n\n  generateSql(options, target) {\n    var sql = target.sql;\n    if (sql == null || sql == \"\"){\n      return sql;\n    }\n\n    var queryStart = \"now-1h\";\n    if (options != null && options.range != null && options.range.from != null){\n      queryStart = options.range.from.toISOString();\n    }\n\n    var queryEnd = \"now\";\n    if (options != null && options.range != null && options.range.to != null){\n      queryEnd = options.range.to.toISOString();\n    }\n    var intervalMs = options.intervalMs || \"20000\";\n\n    intervalMs += \"a\";\n    sql = sql.replace(/^\\s+|\\s+$/gm, '');\n    sql = sql.replace(\"$from\", \"'\" + queryStart + \"'\");\n    sql = sql.replace(\"$begin\", \"'\" + queryStart + \"'\");\n    sql = sql.replace(\"$to\", \"'\" + queryEnd + \"'\");\n    sql = sql.replace(\"$end\", \"'\" + queryEnd + \"'\");\n    sql = sql.replace(\"$interval\", intervalMs);\n\n    sql = this.templateSrv.replace(sql, options.scopedVars, 'csv');\n    return sql;\n  }\n\n}"]}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dist/img/taosdata_logo.png b/src/connector/grafana/tdengine/dist/img/taosdata_logo.png
deleted file mode 100644
index 88d3bacd09593f2735f279714f4a534624042838..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/dist/img/taosdata_logo.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/dist/module.js b/src/connector/grafana/tdengine/dist/module.js
deleted file mode 100644
index 3e88e404a8f6d3e227ff20bc755aeeef5b2c7964..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/module.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AnnotationsQueryCtrl = exports.QueryOptionsCtrl = exports.ConfigCtrl = exports.QueryCtrl = exports.Datasource = undefined;
-
-var _datasource = require('./datasource');
-
-var _query_ctrl = require('./query_ctrl');
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var GenericConfigCtrl = function GenericConfigCtrl() {
-  _classCallCheck(this, GenericConfigCtrl);
-};
-
-GenericConfigCtrl.templateUrl = 'partials/config.html';
-
-var GenericQueryOptionsCtrl = function GenericQueryOptionsCtrl() {
-  _classCallCheck(this, GenericQueryOptionsCtrl);
-};
-
-GenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';
-
-var GenericAnnotationsQueryCtrl = function GenericAnnotationsQueryCtrl() {
-  _classCallCheck(this, GenericAnnotationsQueryCtrl);
-};
-
-GenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html';
-
-exports.Datasource = _datasource.GenericDatasource;
-exports.QueryCtrl = _query_ctrl.GenericDatasourceQueryCtrl;
-exports.ConfigCtrl = GenericConfigCtrl;
-exports.QueryOptionsCtrl = GenericQueryOptionsCtrl;
-exports.AnnotationsQueryCtrl = GenericAnnotationsQueryCtrl;
-//# sourceMappingURL=module.js.map
diff --git a/src/connector/grafana/tdengine/dist/module.js.map b/src/connector/grafana/tdengine/dist/module.js.map
deleted file mode 100644
index c6d4dfce1cdf0850807eefe3dafa059bf153d6a0..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/module.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../src/module.js"],"names":["GenericConfigCtrl","templateUrl","GenericQueryOptionsCtrl","GenericAnnotationsQueryCtrl","Datasource","GenericDatasource","QueryCtrl","GenericDatasourceQueryCtrl","ConfigCtrl","QueryOptionsCtrl","AnnotationsQueryCtrl"],"mappings":";;;;;;;AAAA;;AACA;;;;IAEMA,iB;;;;AACNA,kBAAkBC,WAAlB,GAAgC,sBAAhC;;IAEMC,uB;;;;AACNA,wBAAwBD,WAAxB,GAAsC,6BAAtC;;IAEME,2B;;;;AACNA,4BAA4BF,WAA5B,GAA0C,kCAA1C;;QAGuBG,U,GAArBC,6B;QAC8BC,S,GAA9BC,sC;QACqBC,U,GAArBR,iB;QAC2BS,gB,GAA3BP,uB;QAC+BQ,oB,GAA/BP,2B","file":"module.js","sourcesContent":["import {GenericDatasource} from './datasource';\nimport {GenericDatasourceQueryCtrl} from './query_ctrl';\n\nclass GenericConfigCtrl {}\nGenericConfigCtrl.templateUrl = 'partials/config.html';\n\nclass GenericQueryOptionsCtrl {}\nGenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';\n\nclass GenericAnnotationsQueryCtrl {}\nGenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html'\n\nexport {\n  GenericDatasource as Datasource,\n  GenericDatasourceQueryCtrl as QueryCtrl,\n  GenericConfigCtrl as ConfigCtrl,\n  GenericQueryOptionsCtrl as QueryOptionsCtrl,\n  GenericAnnotationsQueryCtrl as AnnotationsQueryCtrl\n};\n"]}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dist/partials/config.html b/src/connector/grafana/tdengine/dist/partials/config.html
deleted file mode 100644
index 801a75327188e95fa437ee1aabe06e6d04101f0a..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/partials/config.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h3 class="page-heading">TDengine Connection</h3>
-
-<div class="gf-form-group">
-	<div class="gf-form max-width-30">
-		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
-	</div>
-
-	<div class="gf-form-inline">
-		<div class="gf-form max-width-15">
-			<span class="gf-form-label width-7">User</span>
-			<input type="text" class="gf-form-input" ng-model='ctrl.current.jsonData.user' placeholder="root"></input>
-		</div>
-		<div class="gf-form max-width-15">
-			<span class="gf-form-label width-7">Password</span>
-			<input type="password" class="gf-form-input" ng-model='ctrl.current.jsonData.password' placeholder="taosdata"></input>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/dist/partials/query.editor.html b/src/connector/grafana/tdengine/dist/partials/query.editor.html
deleted file mode 100644
index 4fd209d39459166482139472996d245cd99a0ccd..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/partials/query.editor.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<query-editor-row query-ctrl="ctrl" can-collapse="true" >
-
-  <div class="gf-form-inline">  
-    <div class="gf-form gf-form--grow">
-      <label class="gf-form-label query-keyword width-7">INPUT SQL</label>
-      <input type="text" class="gf-form-input" ng-model="ctrl.target.sql" spellcheck='false' placeholder="select avg(mem_system)  from log.dn where ts >= $from and ts < $to interval($interval)" ng-blur="ctrl.panelCtrl.refresh()" data-mode="sql"></input>
-    </div>   
-  </div>
-  
-  <div class="gf-form-inline">
-    <div class="gf-form-inline"  ng-hide="ctrl.target.resultFormat === 'table'">
-      <div class="gf-form max-width-30">
-        <label class="gf-form-label query-keyword width-7">ALIAS BY</label>
-        <input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.panelCtrl.refresh()">
-      </div>
-    </div>    
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword" ng-click="ctrl.generateSQL()">
-        GENERATE SQL
-        <i class="fa fa-caret-down" ng-show="ctrl.showGenerateSQL"></i>
-        <i class="fa fa-caret-right" ng-hide="ctrl.showGenerateSQL"></i>
-      </label>
-    </div>
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
-        SHOW HELP
-        <i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
-        <i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
-      </label>
-    </div>        
-  </div>
-  
-  <div class="gf-form" ng-show="ctrl.showGenerateSQL">
-    <pre class="gf-form-pre">{{ctrl.lastGenerateSQL}}</pre>
-  </div>
-
-  <div class="gf-form"  ng-show="ctrl.showHelp">
-    <pre class="gf-form-pre alert alert-info">Use any SQL that can return Resultset such as:
-- [[timestamp1, value1], [timestamp2, value2], ... ]
-
-Macros:
-- $from -&gt; start timestamp of panel
-- $to -&gt; stop timestamp of panel
-- $interval -&gt; interval of panel
-
-Example of SQL:
-&nbsp;&nbsp;SELECT count(*)
-&nbsp;&nbsp;FROM db.table
-&nbsp;&nbsp;WHERE ts > $from and ts < $to
-&nbsp;&nbsp;INTERVAL ($interval)
-    </pre>
-  </div>
-
-  <div class="gf-form" ng-show="ctrl.lastQueryError">
-    <pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
-  </div>
-  
-</query-editor-row>
diff --git a/src/connector/grafana/tdengine/dist/plugin.json b/src/connector/grafana/tdengine/dist/plugin.json
deleted file mode 100644
index e9954ce6ce16c7b943f3002896144891c9dbc629..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/plugin.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "TDengine",
-  "id": "taosdata-tdengine-datasource",
-  "type": "datasource",
-
-  "partials": {
-    "config": "partials/config.html"
-  },
-
-  "metrics": true,
-  "annotations": false,
-
-  "info": {
-    "description": "grafana datasource plugin for tdengine",
-    "author": {
-      "name": "Taosdata Inc.",
-      "url": "https://www.taosdata.com"
-    },
-    "logos": {
-      "small": "img/taosdata_logo.png",
-      "large": "img/taosdata_logo.png"
-    },
-    "links": [
-      {"name": "GitHub", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"},
-      {"name": "AGPL 3.0", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine/LICENSE"}
-    ],
-    "version": "1.0.0",
-    "updated": "2020-01-13"
-  },
-
-  "dependencies": {
-    "grafanaVersion": "5.2.4",
-    "plugins": [ ]
-  }
-}
diff --git a/src/connector/grafana/tdengine/dist/query_ctrl.js b/src/connector/grafana/tdengine/dist/query_ctrl.js
deleted file mode 100644
index 0bc8f1cdfbc651eca4d374a9522a2c84c0a074c5..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/query_ctrl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.GenericDatasourceQueryCtrl = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _sdk = require('app/plugins/sdk');
-
-require('./css/query-editor.css!');
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var GenericDatasourceQueryCtrl = exports.GenericDatasourceQueryCtrl = function (_QueryCtrl) {
-  _inherits(GenericDatasourceQueryCtrl, _QueryCtrl);
-
-  function GenericDatasourceQueryCtrl($scope, $injector) {
-    _classCallCheck(this, GenericDatasourceQueryCtrl);
-
-    var _this = _possibleConstructorReturn(this, (GenericDatasourceQueryCtrl.__proto__ || Object.getPrototypeOf(GenericDatasourceQueryCtrl)).call(this, $scope, $injector));
-
-    _this.scope = $scope;
-    _this.target.target = _this.target.target || 'select metric';
-    _this.target.type = _this.target.type || 'timeserie';
-    return _this;
-  }
-
-  _createClass(GenericDatasourceQueryCtrl, [{
-    key: 'onChangeInternal',
-    value: function onChangeInternal() {
-      this.panelCtrl.refresh(); // Asks the panel to refresh data.
-    }
-  }, {
-    key: 'generateSQL',
-    value: function generateSQL(query) {
-      this.lastGenerateSQL = this.datasource.generateSql(this.panelCtrl, this.target);
-      this.showGenerateSQL = !this.showGenerateSQL;
-    }
-  }]);
-
-  return GenericDatasourceQueryCtrl;
-}(_sdk.QueryCtrl);
-
-GenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';
-//# sourceMappingURL=query_ctrl.js.map
diff --git a/src/connector/grafana/tdengine/dist/query_ctrl.js.map b/src/connector/grafana/tdengine/dist/query_ctrl.js.map
deleted file mode 100644
index f9410918e07578761e3483983b7d9df13373c873..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/dist/query_ctrl.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../src/query_ctrl.js"],"names":["GenericDatasourceQueryCtrl","$scope","$injector","scope","target","type","panelCtrl","refresh","query","lastGenerateSQL","datasource","generateSql","showGenerateSQL","QueryCtrl","templateUrl"],"mappings":";;;;;;;;;AAAA;;AACA;;;;;;;;IAEaA,0B,WAAAA,0B;;;AAEX,sCAAYC,MAAZ,EAAoBC,SAApB,EAAgC;AAAA;;AAAA,wJACxBD,MADwB,EAChBC,SADgB;;AAG9B,UAAKC,KAAL,GAAaF,MAAb;AACA,UAAKG,MAAL,CAAYA,MAAZ,GAAqB,MAAKA,MAAL,CAAYA,MAAZ,IAAsB,eAA3C;AACA,UAAKA,MAAL,CAAYC,IAAZ,GAAmB,MAAKD,MAAL,CAAYC,IAAZ,IAAoB,WAAvC;AAL8B;AAM/B;;;;uCAEkB;AACjB,WAAKC,SAAL,CAAeC,OAAf,GADiB,CACS;AAC3B;;;gCAEWC,K,EAAO;AACjB,WAAKC,eAAL,GAAuB,KAAKC,UAAL,CAAgBC,WAAhB,CAA6B,KAAKL,SAAlC,EAA6C,KAAKF,MAAlD,CAAvB;AACA,WAAKQ,eAAL,GAAuB,CAAC,KAAKA,eAA7B;AACD;;;;EAjB6CC,c;;AAqBhDb,2BAA2Bc,WAA3B,GAAyC,4BAAzC","file":"query_ctrl.js","sourcesContent":["import {QueryCtrl} from 'app/plugins/sdk';\nimport './css/query-editor.css!'\n\nexport class GenericDatasourceQueryCtrl extends QueryCtrl {\n\n  constructor($scope, $injector)  {\n    super($scope, $injector);\n\n    this.scope = $scope;\n    this.target.target = this.target.target || 'select metric';\n    this.target.type = this.target.type || 'timeserie';\n  }\n\n  onChangeInternal() {\n    this.panelCtrl.refresh(); // Asks the panel to refresh data.\n  }\n\n  generateSQL(query) {\n    this.lastGenerateSQL = this.datasource.generateSql( this.panelCtrl, this.target);\n    this.showGenerateSQL = !this.showGenerateSQL;\n  }\n\n}\n\nGenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';"]}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/package-lock.json b/src/connector/grafana/tdengine/package-lock.json
deleted file mode 100644
index 9401fbcd0ae0c67a10ff365d4015c977ba43ade1..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/package-lock.json
+++ /dev/null
@@ -1,4000 +0,0 @@
-{
-  "name": "TDengine",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@types/estree": {
-      "version": "0.0.38",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.38.tgz",
-      "integrity": "sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "12.12.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
-      "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
-      "dev": true
-    },
-    "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
-      "dev": true
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "acorn": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-      "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-      "dev": true
-    },
-    "acorn-globals": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
-      "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
-      "dev": true,
-      "requires": {
-        "acorn": "^4.0.4"
-      }
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-          "dev": true
-        }
-      }
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz",
-      "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==",
-      "dev": true
-    },
-    "babel": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz",
-      "integrity": "sha1-0NHn2APpdHZb7qMjLU4VPA77kPQ=",
-      "dev": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-          "dev": true
-        }
-      }
-    },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-define-map": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dev": true,
-      "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-regex": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
-      "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-dynamic-import": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
-    },
-    "babel-plugin-transform-amd-system-wrapper": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-amd-system-wrapper/-/babel-plugin-transform-amd-system-wrapper-0.3.7.tgz",
-      "integrity": "sha1-Uhx4LTVkRJHJeepoPopeHK/wukI=",
-      "dev": true,
-      "requires": {
-        "babel-template": "^6.9.0"
-      }
-    },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-cjs-system-wrapper": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.6.2.tgz",
-      "integrity": "sha1-vXSUd1KJQk/0k7btRV3klb1xuh0=",
-      "dev": true,
-      "requires": {
-        "babel-template": "^6.9.0"
-      }
-    },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
-      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
-      "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
-      "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
-      }
-    },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-plugin-transform-global-system-wrapper": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.3.4.tgz",
-      "integrity": "sha1-lI3X0p/CFEfjm9NEfy3rx/L3Oqw=",
-      "dev": true,
-      "requires": {
-        "babel-template": "^6.9.0"
-      }
-    },
-    "babel-plugin-transform-object-rest-spread": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
-        "babel-runtime": "^6.26.0"
-      }
-    },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.10.0"
-      }
-    },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "babel-plugin-transform-system-register": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz",
-      "integrity": "sha1-nf9AOQwnY6xRjwsq18XqT2WlviU=",
-      "dev": true
-    },
-    "babel-preset-env": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
-      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-to-generator": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
-        "babel-plugin-transform-es2015-classes": "^6.23.0",
-        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
-        "babel-plugin-transform-es2015-for-of": "^6.23.0",
-        "babel-plugin-transform-es2015-function-name": "^6.22.0",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
-        "babel-plugin-transform-es2015-object-super": "^6.22.0",
-        "babel-plugin-transform-es2015-parameters": "^6.23.0",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
-        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
-        "babel-plugin-transform-regenerator": "^6.22.0",
-        "browserslist": "^3.2.6",
-        "invariant": "^2.2.2",
-        "semver": "^5.3.0"
-      }
-    },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "body": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-      "dev": true,
-      "requires": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-      "dev": true,
-      "requires": {
-        "pako": "~0.2.0"
-      }
-    },
-    "browserslist": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
-      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30000844",
-        "electron-to-chromium": "^1.3.47"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "bytes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001016",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz",
-      "integrity": "sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
-    "chai": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
-      "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.0.1",
-        "deep-eql": "^0.1.3",
-        "type-detect": "^1.0.0"
-      }
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      }
-    },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dev": true,
-      "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      }
-    },
-    "coffeescript": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz",
-      "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=",
-      "dev": true
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
-      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "content-type-parser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
-      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==",
-      "dev": true
-    },
-    "continuable-cache": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.x"
-      }
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "data-uri-to-buffer": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz",
-      "integrity": "sha1-RuE6udqOMJdFyNAc5UchPr2y/j8=",
-      "dev": true
-    },
-    "dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "deep-eql": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-      "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
-      "dev": true,
-      "requires": {
-        "type-detect": "0.1.1"
-      },
-      "dependencies": {
-        "type-detect": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-          "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
-          "dev": true
-        }
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.322",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz",
-      "integrity": "sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "error": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
-      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
-      "dev": true,
-      "requires": {
-        "string-template": "~0.2.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.17.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0-next.1.tgz",
-      "integrity": "sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-template-strings": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es6-template-strings/-/es6-template-strings-2.0.1.tgz",
-      "integrity": "sha1-sWbGpiVi9Hi7d3X2ypYQOlmbSyw=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.12",
-        "esniff": "^1.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
-      "dev": true,
-      "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "esniff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz",
-      "integrity": "sha1-xmhJIp+RRk3t4uDUAgHtar9l8qw=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.12"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter2": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-      "dev": true
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
-      }
-    },
-    "file-sync-cmp": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
-      "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
-      "dev": true
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-      "dev": true,
-      "requires": {
-        "glob": "~5.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "~2.0.3"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-          "dev": true
-        }
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "getobject": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
-      "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-      "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.2",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
-    },
-    "globule": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-      "dev": true,
-      "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "grunt": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
-      "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
-      "dev": true,
-      "requires": {
-        "coffeescript": "~1.10.0",
-        "dateformat": "~1.0.12",
-        "eventemitter2": "~0.4.13",
-        "exit": "~0.1.1",
-        "findup-sync": "~0.3.0",
-        "glob": "~7.0.0",
-        "grunt-cli": "~1.2.0",
-        "grunt-known-options": "~1.1.0",
-        "grunt-legacy-log": "~2.0.0",
-        "grunt-legacy-util": "~1.1.1",
-        "iconv-lite": "~0.4.13",
-        "js-yaml": "~3.13.0",
-        "minimatch": "~3.0.2",
-        "mkdirp": "~0.5.1",
-        "nopt": "~3.0.6",
-        "path-is-absolute": "~1.0.0",
-        "rimraf": "~2.6.2"
-      }
-    },
-    "grunt-babel": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-babel/-/grunt-babel-6.0.0.tgz",
-      "integrity": "sha1-N4GJtIfeEWjExKn8iN1gBbNd+WA=",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.0.12"
-      }
-    },
-    "grunt-cli": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz",
-      "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
-      "dev": true,
-      "requires": {
-        "findup-sync": "~0.3.0",
-        "grunt-known-options": "~1.1.0",
-        "nopt": "~3.0.6",
-        "resolve": "~1.1.0"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
-      }
-    },
-    "grunt-contrib-clean": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-1.1.0.tgz",
-      "integrity": "sha1-Vkq/LQN4qYOhW54/MO51tzjEBjg=",
-      "dev": true,
-      "requires": {
-        "async": "^1.5.2",
-        "rimraf": "^2.5.1"
-      }
-    },
-    "grunt-contrib-copy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
-      "integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "file-sync-cmp": "^0.1.0"
-      }
-    },
-    "grunt-contrib-uglify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-2.3.0.tgz",
-      "integrity": "sha1-s9AmDr3WzvoS/y+Onh4ln33kIW8=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.0.0",
-        "maxmin": "^1.1.0",
-        "object.assign": "^4.0.4",
-        "uglify-js": "~2.8.21",
-        "uri-path": "^1.0.0"
-      }
-    },
-    "grunt-contrib-watch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz",
-      "integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.0",
-        "gaze": "^1.1.0",
-        "lodash": "^4.17.10",
-        "tiny-lr": "^1.1.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          },
-          "dependencies": {
-            "lodash": {
-              "version": "4.17.15",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-              "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "grunt-known-options": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
-      "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
-      "dev": true
-    },
-    "grunt-legacy-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz",
-      "integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==",
-      "dev": true,
-      "requires": {
-        "colors": "~1.1.2",
-        "grunt-legacy-log-utils": "~2.0.0",
-        "hooker": "~0.2.3",
-        "lodash": "~4.17.5"
-      }
-    },
-    "grunt-legacy-log-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz",
-      "integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==",
-      "dev": true,
-      "requires": {
-        "chalk": "~2.4.1",
-        "lodash": "~4.17.10"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "grunt-legacy-util": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz",
-      "integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==",
-      "dev": true,
-      "requires": {
-        "async": "~1.5.2",
-        "exit": "~0.1.1",
-        "getobject": "~0.1.0",
-        "hooker": "~0.2.3",
-        "lodash": "~4.17.10",
-        "underscore.string": "~3.3.4",
-        "which": "~1.3.0"
-      }
-    },
-    "grunt-mocha-test": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.13.3.tgz",
-      "integrity": "sha512-zQGEsi3d+ViPPi7/4jcj78afKKAKiAA5n61pknQYi25Ugik+aNOuRmiOkmb8mN2CeG8YxT+YdT1H1Q7B/eNkoQ==",
-      "dev": true,
-      "requires": {
-        "hooker": "^0.2.3",
-        "mkdirp": "^0.5.0"
-      }
-    },
-    "grunt-systemjs-builder": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-systemjs-builder/-/grunt-systemjs-builder-1.0.0.tgz",
-      "integrity": "sha1-XY58vspbNeK3tr0ALpqdfgPX3s0=",
-      "dev": true,
-      "requires": {
-        "systemjs-builder": "0.14.11 - 0.16.x"
-      }
-    },
-    "gzip-size": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz",
-      "integrity": "sha1-Zs+LEBBHInuVus5uodoMF37Vwi8=",
-      "dev": true,
-      "requires": {
-        "browserify-zlib": "^0.1.4",
-        "concat-stream": "^1.4.1"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
-      }
-    },
-    "hooker": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-      "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
-      "dev": true
-    },
-    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
-      "dev": true
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^1.0.1"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
-      "dev": true
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsdom": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz",
-      "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
-      "dev": true,
-      "requires": {
-        "abab": "^1.0.3",
-        "acorn": "^4.0.4",
-        "acorn-globals": "^3.1.0",
-        "array-equal": "^1.0.0",
-        "content-type-parser": "^1.0.1",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": ">= 0.2.37 < 0.3.0",
-        "escodegen": "^1.6.1",
-        "html-encoding-sniffer": "^1.0.1",
-        "nwmatcher": ">= 1.3.9 < 2.0.0",
-        "parse5": "^1.5.1",
-        "request": "^2.79.0",
-        "sax": "^1.2.1",
-        "symbol-tree": "^3.2.1",
-        "tough-cookie": "^2.3.2",
-        "webidl-conversions": "^4.0.0",
-        "whatwg-encoding": "^1.0.1",
-        "whatwg-url": "^4.3.0",
-        "xml-name-validator": "^2.0.1"
-      }
-    },
-    "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "livereload-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-      "dev": true
-    },
-    "load-grunt-tasks": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.5.2.tgz",
-      "integrity": "sha1-ByhWEYD9IP+KaSdQWFL8WKrqDIg=",
-      "dev": true,
-      "requires": {
-        "arrify": "^1.0.0",
-        "multimatch": "^2.0.0",
-        "pkg-up": "^1.0.0",
-        "resolve-pkg": "^0.1.0"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA=="
-    },
-    "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "maxmin": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz",
-      "integrity": "sha1-cTZehKmd2Piz99X94vANHn9zvmE=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.0.0",
-        "figures": "^1.0.1",
-        "gzip-size": "^1.0.0",
-        "pretty-bytes": "^1.0.0"
-      }
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      }
-    },
-    "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.42.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "mocha": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz",
-      "integrity": "sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "3.2.3",
-        "browser-stdout": "1.3.1",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "2.2.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.5",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
-        "wide-align": "1.1.3",
-        "yargs": "13.3.0",
-        "yargs-parser": "13.1.1",
-        "yargs-unparser": "1.6.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "multimatch": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-      "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-      "dev": true,
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "minimatch": "^3.0.0"
-      }
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "nwmatcher": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
-      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-      "dev": true
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parse5": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-up": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz",
-      "integrity": "sha1-Pgj7RhUlxEIWJKM7n35tCvWwWiY=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "pretty-bytes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.1.0"
-      }
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "prunk": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/prunk/-/prunk-1.3.1.tgz",
-      "integrity": "sha512-nLpTxQCqaKzdpzA344aK8u1wpVcnT0OD9oruH281TeqkqnxCWW4dD8Vn65mQWlfwPO8yWFyeK2h2qcw2N7hveA==",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz",
-      "integrity": "sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-      "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-      "dev": true,
-      "requires": {
-        "bytes": "1",
-        "string_decoder": "0.10"
-      },
-      "dependencies": {
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-      "dev": true
-    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.18.0",
-        "babel-types": "^6.19.0",
-        "private": "^0.1.6"
-      }
-    },
-    "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      }
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        }
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
-      "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-from": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
-      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
-      "dev": true
-    },
-    "resolve-pkg": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-0.1.0.tgz",
-      "integrity": "sha1-AsyZNBDik2livZcWahsHfalyVTE=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^2.0.0"
-      }
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.1"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "rollup": {
-      "version": "0.58.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.58.2.tgz",
-      "integrity": "sha512-RZVvCWm9BHOYloaE6LLiE/ibpjv1CmI8F8k0B0Cp+q1eezo3cswszJH1DN0djgzSlo0hjuuCmyeI+1XOYLl4wg==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.38",
-        "@types/node": "*"
-      }
-    },
-    "rsvp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
-      "dev": true
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-json-parse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.6"
-      }
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "string-template": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "systemjs": {
-      "version": "0.19.47",
-      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.47.tgz",
-      "integrity": "sha1-yMk5NxgPP1SBx2nNJyB2P7SjHG8=",
-      "dev": true,
-      "requires": {
-        "when": "^3.7.5"
-      }
-    },
-    "systemjs-builder": {
-      "version": "0.16.15",
-      "resolved": "https://registry.npmjs.org/systemjs-builder/-/systemjs-builder-0.16.15.tgz",
-      "integrity": "sha512-C18G//KWWwQpstAVBUDt0YbbqvSFVVtr0MFqtf2zB4U/cePOA00Btcja++mzlFLMnepVpDv0GdtfE/6A8lrxeA==",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.24.1",
-        "babel-plugin-syntax-dynamic-import": "^6.18.0",
-        "babel-plugin-transform-amd-system-wrapper": "^0.3.7",
-        "babel-plugin-transform-cjs-system-wrapper": "^0.6.2",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.6.5",
-        "babel-plugin-transform-global-system-wrapper": "^0.3.4",
-        "babel-plugin-transform-system-register": "^0.0.1",
-        "bluebird": "^3.3.4",
-        "data-uri-to-buffer": "0.0.4",
-        "es6-template-strings": "^2.0.0",
-        "glob": "^7.0.3",
-        "mkdirp": "^0.5.1",
-        "rollup": "^0.58.2",
-        "source-map": "^0.5.3",
-        "systemjs": "^0.19.46",
-        "terser": "3.8.1",
-        "traceur": "0.0.105"
-      }
-    },
-    "terser": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.8.1.tgz",
-      "integrity": "sha512-FRin3gKQ0vm0xPPLuxw1FqpVgv1b2pBpYCaFb5qe6A7sD749Fnq1VbDiX3CEFM0BV0fqDzFtBfgmxhxCdzKQIg==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.16.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.6"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.16",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-          "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "tiny-lr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-      "dev": true,
-      "requires": {
-        "body": "^5.1.0",
-        "debug": "^3.1.0",
-        "faye-websocket": "~0.10.0",
-        "livereload-js": "^2.3.0",
-        "object-assign": "^4.1.0",
-        "qs": "^6.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "traceur": {
-      "version": "0.0.105",
-      "resolved": "https://registry.npmjs.org/traceur/-/traceur-0.0.105.tgz",
-      "integrity": "sha1-XPne6D1rd4YcPWxE1ThZrterBHk=",
-      "dev": true,
-      "requires": {
-        "commander": "2.9.x",
-        "glob": "5.0.x",
-        "rsvp": "^3.0.13",
-        "semver": "^4.3.3",
-        "source-map-support": "~0.2.8"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-          "integrity": "sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "source-map-support": {
-          "version": "0.2.10",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-          "integrity": "sha1-6lo5AKHByyUJagrozFwrSxDe09w=",
-          "dev": true,
-          "requires": {
-            "source-map": "0.1.32"
-          }
-        }
-      }
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
-      "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=",
-      "dev": true
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true,
-      "optional": true
-    },
-    "underscore.string": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
-      "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "^1.0.3",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "uri-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
-      "integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-      "dev": true
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
-    },
-    "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-      "dev": true
-    },
-    "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "whatwg-url": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz",
-      "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=",
-      "dev": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-          "dev": true
-        }
-      }
-    },
-    "when": {
-      "version": "3.7.8",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
-      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "xml-name-validator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
-      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
-      }
-    },
-    "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
-      "dev": true,
-      "requires": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
-          }
-        }
-      }
-    },
-    "yarn": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.21.1.tgz",
-      "integrity": "sha512-dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ=="
-    }
-  }
-}
diff --git a/src/connector/grafana/tdengine/package.json b/src/connector/grafana/tdengine/package.json
deleted file mode 100644
index 8e542bef2647aa6bb4fe2f404665a4ce9c707345..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/package.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "TDengine",
-  "private": false,
-  "version": "1.0.0",
-  "description": "grafana datasource plugin for tdengine",
-  "scripts": {
-    "build": "./node_modules/grunt-cli/bin/grunt",
-    "test": "./node_modules/grunt-cli/bin/grunt mochaTest"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/taosdata/TDengine.git"
-  },
-  "author": "https://www.taosdata.com",
-  "license": "AGPL 3.0",
-  "bugs": {
-    "url": "https://github.com/taosdata/TDengine/issues"
-  },
-  "engineStrict": true,
-  "devDependencies": {
-    "babel": "^6.23.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "chai": "~3.5.0",
-    "grunt": "^1.0.4",
-    "grunt-babel": "~6.0.0",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-clean": "^1.1.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-uglify": "^2.3.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-mocha-test": "^0.13.2",
-    "grunt-systemjs-builder": "^1.0.0",
-    "jsdom": "~9.12.0",
-    "load-grunt-tasks": "^3.5.2",
-    "mocha": "^6.2.2",
-    "prunk": "^1.3.0",
-    "q": "^1.5.0"
-  },
-  "dependencies": {
-    "lodash": "^4.17.13",
-    "yarn": "^1.21.1"
-  },
-  "homepage": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"
-}
diff --git a/src/connector/grafana/tdengine/spec/datasource_spec.js b/src/connector/grafana/tdengine/spec/datasource_spec.js
deleted file mode 100755
index 201b6fecb4bddaca2219f5e9a1858a53222cae9a..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/spec/datasource_spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import {Datasource} from "../module";
-import Q from "q";
-
-describe('GenericDatasource', function() {
-    var ctx = {};
-
-    beforeEach(function() {
-        ctx.$q = Q;
-        ctx.backendSrv = {};
-        ctx.templateSrv = {};
-        ctx.ds = new Datasource({}, ctx.$q, ctx.backendSrv, ctx.templateSrv);
-    });
-
-    it('should return an empty array when no targets are set', function(done) {
-        ctx.ds.query({targets: []}).then(function(result) {
-            expect(result.data).to.have.length(0);
-            done();
-        });
-    });
-
-
-});
diff --git a/src/connector/grafana/tdengine/spec/test-main.js b/src/connector/grafana/tdengine/spec/test-main.js
deleted file mode 100755
index 3935b6fd4536c2c8cb8db06dd2c9af909adec0b9..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/spec/test-main.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import prunk from 'prunk';
-import {jsdom} from 'jsdom';
-import chai from 'chai';
-
-// Mock Grafana modules that are not available outside of the core project
-// Required for loading module.js
-prunk.mock('./css/query-editor.css!', 'no css, dude.');
-prunk.mock('app/plugins/sdk', {
-    QueryCtrl: null
-});
-
-// Setup jsdom
-// Required for loading angularjs
-global.document = jsdom('<html><head><script></script></head><body></body></html>');
-global.window = global.document.parentWindow;
-
-// Setup Chai
-chai.should();
-global.assert = chai.assert;
-global.expect = chai.expect;
diff --git a/src/connector/grafana/tdengine/src/css/query-editor.css b/src/connector/grafana/tdengine/src/css/query-editor.css
deleted file mode 100644
index 3b678b9f3689d2131d2224826872b8a75cc1c9fe..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/css/query-editor.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.generic-datasource-query-row .query-keyword {
-  width: 75px;
-}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/src/datasource.js b/src/connector/grafana/tdengine/src/datasource.js
deleted file mode 100644
index 08426bb3df6a8a8d78f6289284f56ac83c4713c8..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/datasource.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import _ from "lodash";
-
-export class GenericDatasource {
-
-  constructor(instanceSettings, $q, backendSrv, templateSrv) {
-    this.type = instanceSettings.type;
-    this.url = instanceSettings.url;
-    this.name = instanceSettings.name;
-    this.q = $q;
-    this.backendSrv = backendSrv;
-    this.templateSrv = templateSrv;
-    this.headers = {'Content-Type': 'application/json'};
-    this.headers.Authorization = this.getAuthorization(instanceSettings.jsonData);
-  }
-
-  query(options) {
-    var targets = this.buildQueryParameters(options);
-
-    if (targets.length <= 0) {
-      return this.q.when({data: []});
-    }
-
-    return this.doRequest({
-      url: this.url + '/grafana/query',
-      data: targets,
-      method: 'POST'
-    });
-  }
-
-  testDatasource() {
-    return this.doRequest({
-      url: this.url + '/grafana/heartbeat',
-      method: 'GET',
-    }).then(response => {
-      if (response.status === 200) {
-        return { status: "success", message: "TDengine Data source is working", title: "Success" };
-      }
-    });
-  }
-
-  doRequest(options) {
-    options.headers = this.headers;
-
-    return this.backendSrv.datasourceRequest(options);
-  }
-
-  buildQueryParameters(options) {
-
-    var targets = _.map(options.targets, target => {
-      return {
-        refId: target.refId,
-        alias: this.generateAlias(options, target),
-        sql: this.generateSql(options, target)
-      };
-    });
-
-    return targets;
-  }
-
-  encode(input) {
-    var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    var output = "";
-    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
-    while (i < input.length) {
-      chr1 = input.charCodeAt(i++);
-      chr2 = input.charCodeAt(i++);
-      chr3 = input.charCodeAt(i++);
-      enc1 = chr1 >> 2;
-      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-      enc4 = chr3 & 63;
-      if (isNaN(chr2)) {
-        enc3 = enc4 = 64;
-      } else if (isNaN(chr3)) {
-        enc4 = 64;
-      }
-      output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-    }
-
-    return output;
-  }
-
-  getAuthorization(jsonData){
-    jsonData = jsonData || {};
-    var defaultUser = jsonData.user || "root";
-    var defaultPassword = jsonData.password || "taosdata";
-
-    return "Basic " + this.encode(defaultUser + ":" + defaultPassword);
-  }
-
-  generateAlias(options, target){
-    var alias = target.alias || "";
-    alias = this.templateSrv.replace(alias, options.scopedVars, 'csv');
-    return alias;
-  }
-
-  generateSql(options, target) {
-    var sql = target.sql;
-    if (sql == null || sql == ""){
-      return sql;
-    }
-
-    var queryStart = "now-1h";
-    if (options != null && options.range != null && options.range.from != null){
-      queryStart = options.range.from.toISOString();
-    }
-
-    var queryEnd = "now";
-    if (options != null && options.range != null && options.range.to != null){
-      queryEnd = options.range.to.toISOString();
-    }
-    var intervalMs = options.intervalMs || "20000";
-
-    intervalMs += "a";
-    sql = sql.replace(/^\s+|\s+$/gm, '');
-    sql = sql.replace("$from", "'" + queryStart + "'");
-    sql = sql.replace("$begin", "'" + queryStart + "'");
-    sql = sql.replace("$to", "'" + queryEnd + "'");
-    sql = sql.replace("$end", "'" + queryEnd + "'");
-    sql = sql.replace("$interval", intervalMs);
-
-    sql = this.templateSrv.replace(sql, options.scopedVars, 'csv');
-    return sql;
-  }
-
-}
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/src/img/taosdata_logo.png b/src/connector/grafana/tdengine/src/img/taosdata_logo.png
deleted file mode 100644
index 88d3bacd09593f2735f279714f4a534624042838..0000000000000000000000000000000000000000
Binary files a/src/connector/grafana/tdengine/src/img/taosdata_logo.png and /dev/null differ
diff --git a/src/connector/grafana/tdengine/src/module.js b/src/connector/grafana/tdengine/src/module.js
deleted file mode 100644
index 8ab46f4edec3d0d65184984e8e9470b5e2626121..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/module.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import {GenericDatasource} from './datasource';
-import {GenericDatasourceQueryCtrl} from './query_ctrl';
-
-class GenericConfigCtrl {}
-GenericConfigCtrl.templateUrl = 'partials/config.html';
-
-class GenericQueryOptionsCtrl {}
-GenericQueryOptionsCtrl.templateUrl = 'partials/query.options.html';
-
-class GenericAnnotationsQueryCtrl {}
-GenericAnnotationsQueryCtrl.templateUrl = 'partials/annotations.editor.html'
-
-export {
-  GenericDatasource as Datasource,
-  GenericDatasourceQueryCtrl as QueryCtrl,
-  GenericConfigCtrl as ConfigCtrl,
-  GenericQueryOptionsCtrl as QueryOptionsCtrl,
-  GenericAnnotationsQueryCtrl as AnnotationsQueryCtrl
-};
diff --git a/src/connector/grafana/tdengine/src/partials/config.html b/src/connector/grafana/tdengine/src/partials/config.html
deleted file mode 100644
index 801a75327188e95fa437ee1aabe06e6d04101f0a..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/partials/config.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h3 class="page-heading">TDengine Connection</h3>
-
-<div class="gf-form-group">
-	<div class="gf-form max-width-30">
-		<span class="gf-form-label width-7">Host</span>
-		<input type="text" class="gf-form-input" ng-model='ctrl.current.url' placeholder="http://localhost:6020" bs-typeahead="{{['http://localhost:6020']}}" required></input>
-	</div>
-
-	<div class="gf-form-inline">
-		<div class="gf-form max-width-15">
-			<span class="gf-form-label width-7">User</span>
-			<input type="text" class="gf-form-input" ng-model='ctrl.current.jsonData.user' placeholder="root"></input>
-		</div>
-		<div class="gf-form max-width-15">
-			<span class="gf-form-label width-7">Password</span>
-			<input type="password" class="gf-form-input" ng-model='ctrl.current.jsonData.password' placeholder="taosdata"></input>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/src/partials/query.editor.html b/src/connector/grafana/tdengine/src/partials/query.editor.html
deleted file mode 100644
index 4fd209d39459166482139472996d245cd99a0ccd..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/partials/query.editor.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<query-editor-row query-ctrl="ctrl" can-collapse="true" >
-
-  <div class="gf-form-inline">  
-    <div class="gf-form gf-form--grow">
-      <label class="gf-form-label query-keyword width-7">INPUT SQL</label>
-      <input type="text" class="gf-form-input" ng-model="ctrl.target.sql" spellcheck='false' placeholder="select avg(mem_system)  from log.dn where ts >= $from and ts < $to interval($interval)" ng-blur="ctrl.panelCtrl.refresh()" data-mode="sql"></input>
-    </div>   
-  </div>
-  
-  <div class="gf-form-inline">
-    <div class="gf-form-inline"  ng-hide="ctrl.target.resultFormat === 'table'">
-      <div class="gf-form max-width-30">
-        <label class="gf-form-label query-keyword width-7">ALIAS BY</label>
-        <input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="Naming pattern" ng-blur="ctrl.panelCtrl.refresh()">
-      </div>
-    </div>    
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword" ng-click="ctrl.generateSQL()">
-        GENERATE SQL
-        <i class="fa fa-caret-down" ng-show="ctrl.showGenerateSQL"></i>
-        <i class="fa fa-caret-right" ng-hide="ctrl.showGenerateSQL"></i>
-      </label>
-    </div>
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
-        SHOW HELP
-        <i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
-        <i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
-      </label>
-    </div>        
-  </div>
-  
-  <div class="gf-form" ng-show="ctrl.showGenerateSQL">
-    <pre class="gf-form-pre">{{ctrl.lastGenerateSQL}}</pre>
-  </div>
-
-  <div class="gf-form"  ng-show="ctrl.showHelp">
-    <pre class="gf-form-pre alert alert-info">Use any SQL that can return Resultset such as:
-- [[timestamp1, value1], [timestamp2, value2], ... ]
-
-Macros:
-- $from -&gt; start timestamp of panel
-- $to -&gt; stop timestamp of panel
-- $interval -&gt; interval of panel
-
-Example of SQL:
-&nbsp;&nbsp;SELECT count(*)
-&nbsp;&nbsp;FROM db.table
-&nbsp;&nbsp;WHERE ts > $from and ts < $to
-&nbsp;&nbsp;INTERVAL ($interval)
-    </pre>
-  </div>
-
-  <div class="gf-form" ng-show="ctrl.lastQueryError">
-    <pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
-  </div>
-  
-</query-editor-row>
diff --git a/src/connector/grafana/tdengine/src/plugin.json b/src/connector/grafana/tdengine/src/plugin.json
deleted file mode 100644
index e9954ce6ce16c7b943f3002896144891c9dbc629..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/plugin.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "TDengine",
-  "id": "taosdata-tdengine-datasource",
-  "type": "datasource",
-
-  "partials": {
-    "config": "partials/config.html"
-  },
-
-  "metrics": true,
-  "annotations": false,
-
-  "info": {
-    "description": "grafana datasource plugin for tdengine",
-    "author": {
-      "name": "Taosdata Inc.",
-      "url": "https://www.taosdata.com"
-    },
-    "logos": {
-      "small": "img/taosdata_logo.png",
-      "large": "img/taosdata_logo.png"
-    },
-    "links": [
-      {"name": "GitHub", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine"},
-      {"name": "AGPL 3.0", "url": "https://github.com/taosdata/TDengine/tree/develop/src/connector/grafana/tdengine/LICENSE"}
-    ],
-    "version": "1.0.0",
-    "updated": "2020-01-13"
-  },
-
-  "dependencies": {
-    "grafanaVersion": "5.2.4",
-    "plugins": [ ]
-  }
-}
diff --git a/src/connector/grafana/tdengine/src/query_ctrl.js b/src/connector/grafana/tdengine/src/query_ctrl.js
deleted file mode 100644
index 2b3998f2ab30bb571ffd66275ec49e632e7236f5..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/src/query_ctrl.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {QueryCtrl} from 'app/plugins/sdk';
-import './css/query-editor.css!'
-
-export class GenericDatasourceQueryCtrl extends QueryCtrl {
-
-  constructor($scope, $injector)  {
-    super($scope, $injector);
-
-    this.scope = $scope;
-    this.target.target = this.target.target || 'select metric';
-    this.target.type = this.target.type || 'timeserie';
-  }
-
-  onChangeInternal() {
-    this.panelCtrl.refresh(); // Asks the panel to refresh data.
-  }
-
-  generateSQL(query) {
-    this.lastGenerateSQL = this.datasource.generateSql( this.panelCtrl, this.target);
-    this.showGenerateSQL = !this.showGenerateSQL;
-  }
-
-}
-
-GenericDatasourceQueryCtrl.templateUrl = 'partials/query.editor.html';
\ No newline at end of file
diff --git a/src/connector/grafana/tdengine/yarn.lock b/src/connector/grafana/tdengine/yarn.lock
deleted file mode 100644
index b2b869cb1ac179ece8d5e673bbabfe0856f9bd6e..0000000000000000000000000000000000000000
--- a/src/connector/grafana/tdengine/yarn.lock
+++ /dev/null
@@ -1,2963 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/estree@0.0.38":
-  version "0.0.38"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
-
-"@types/node@*":
-  version "10.3.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.6.tgz#ea8aab9439b59f40d19ec5f13b44642344872b11"
-
-abab@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-
-abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
-
-acorn-globals@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
-
-acorn@^4.0.4:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  dependencies:
-    color-convert "^1.9.0"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-async@^1.5.2, async@~1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  dependencies:
-    lodash "^4.17.10"
-
-async@~0.2.6:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
-
-babel-code-frame@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
-  dependencies:
-    chalk "^1.1.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.0.12, babel-core@^6.23.0:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.23.0"
-    babel-helpers "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-register "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.1"
-    babel-types "^6.23.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-core@^6.24.1, babel-core@^6.26.0:
-  version "6.26.3"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.1"
-    debug "^2.6.9"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.8"
-    slash "^1.0.0"
-    source-map "^0.5.7"
-
-babel-generator@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-define-map@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-hoist-variables@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-regex@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helpers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-dynamic-import@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-amd-system-wrapper@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-amd-system-wrapper/-/babel-plugin-transform-amd-system-wrapper-0.3.7.tgz#521c782d35644491c979ea683e8a5e1caff0ba42"
-  dependencies:
-    babel-template "^6.9.0"
-
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-cjs-system-wrapper@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.6.2.tgz#bd7494775289424ff493b6ed455de495bd71ba1d"
-  dependencies:
-    babel-template "^6.9.0"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-plugin-transform-es2015-classes@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-destructuring@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-for-of@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.6.5:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
-  dependencies:
-    babel-helper-hoist-variables "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-plugin-transform-es2015-modules-umd@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-object-super@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-global-system-wrapper@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.3.4.tgz#948dd7d29fc21447e39bd3447f2debc7f2f73aac"
-  dependencies:
-    babel-template "^6.9.0"
-
-babel-plugin-transform-object-rest-spread@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
-
-babel-plugin-transform-regenerator@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-  dependencies:
-    regenerator-transform "^0.10.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-system-register@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz#9dff40390c2763ac518f0b2ad7c5ea4f65a5be25"
-
-babel-preset-env@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.23.0"
-    babel-plugin-transform-es2015-classes "^6.23.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.23.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.23.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-umd "^6.23.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.23.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^3.2.6"
-    invariant "^2.2.2"
-    semver "^5.3.0"
-
-babel-register@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
-  dependencies:
-    babel-core "^6.23.0"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
-
-babel-runtime@^6.18.0, babel-runtime@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-template@^6.23.0, babel-template@^6.9.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-template@^6.24.1, babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.23.0, babel-traverse@^6.23.1:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.24.1, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.24.1, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babel@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel/-/babel-6.23.0.tgz#d0d1e7d803e974765beea3232d4e153c0efb90f4"
-
-babylon@^6.11.0, babylon@^6.15.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-
-balanced-match@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-bluebird@^3.3.4:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-
-body@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  dependencies:
-    continuable-cache "^0.3.1"
-    error "^7.0.0"
-    raw-body "~1.1.0"
-    safe-json-parse "~1.0.1"
-
-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
-browserify-zlib@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
-  dependencies:
-    pako "~0.2.0"
-
-browserslist@^3.2.6:
-  version "3.2.8"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
-  dependencies:
-    caniuse-lite "^1.0.30000844"
-    electron-to-chromium "^1.3.47"
-
-buffer-from@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
-bytes@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@^1.0.30000844:
-  version "1.0.30000859"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000859.tgz#da974adc5348fffe94724877a7ef8cb5d6d3d777"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
-chai@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
-  dependencies:
-    assertion-error "^1.0.1"
-    deep-eql "^0.1.3"
-    type-detect "^1.0.0"
-
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-coffeescript@~1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e"
-
-color-convert@^1.9.0:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
-  dependencies:
-    color-name "1.1.1"
-
-color-name@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.9.x:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-concat-stream@^1.4.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-content-type-parser@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
-
-continuable-cache@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-
-convert-source-map@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"
-
-convert-source-map@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-
-core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
-core-js@^2.5.0:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  dependencies:
-    cssom "0.3.x"
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
-
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
-d@^0.1.1, d@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
-  dependencies:
-    es5-ext "~0.10.2"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-data-uri-to-buffer@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz#46e13ab9da8e309745c8d01ce547213ebdb2fe3f"
-
-dateformat@~1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.3.0"
-
-debug@3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^2.1.1, debug@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@^2.6.8, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.0.0, decamelize@^1.1.2, decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-deep-eql@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
-  dependencies:
-    type-detect "0.1.1"
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-electron-to-chromium@^1.3.47:
-  version "1.3.50"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz#7438b76f92b41b919f3fbdd350fbd0757dacddf7"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-error-ex@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
-  dependencies:
-    string-template "~0.2.1"
-    xtend "~4.0.0"
-
-es-abstract@^1.17.0-next.1:
-  version "1.17.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172"
-  integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.0"
-    string.prototype.trimright "^2.1.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es5-ext@^0.10.12, es5-ext@^0.10.7, es5-ext@^0.10.9, es5-ext@~0.10.11, es5-ext@~0.10.2:
-  version "0.10.12"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047"
-  dependencies:
-    es6-iterator "2"
-    es6-symbol "~3.1"
-
-es6-iterator@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac"
-  dependencies:
-    d "^0.1.1"
-    es5-ext "^0.10.7"
-    es6-symbol "3"
-
-es6-symbol@3, es6-symbol@~3.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
-  dependencies:
-    d "~0.1.1"
-    es5-ext "~0.10.11"
-
-es6-template-strings@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-template-strings/-/es6-template-strings-2.0.1.tgz#b166c6a62562f478bb7775f6ca96103a599b4b2c"
-  dependencies:
-    es5-ext "^0.10.12"
-    esniff "^1.1"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escodegen@^1.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.2.0"
-
-esniff@^1.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/esniff/-/esniff-1.1.0.tgz#c66849229f91464dede2e0d40201ed6abf65f2ac"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.12"
-
-esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-estraverse@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-eventemitter2@~0.4.13:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
-
-exit@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
-extend@~3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
-faye-websocket@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-figures@^1.0.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-sync-cmp@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
-
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-findup-sync@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
-  dependencies:
-    glob "~5.0.0"
-
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
-  dependencies:
-    is-buffer "~2.0.3"
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-
-gaze@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  dependencies:
-    globule "^1.0.0"
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
-getobject@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/getobject/-/getobject-0.1.0.tgz#047a449789fa160d018f5486ed91320b6ec7885c"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob@5.0.x, glob@~5.0.0:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.3:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.5, glob@~7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@~7.0.0:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^9.0.0:
-  version "9.16.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.16.0.tgz#63e903658171ec2d9f51b1d31de5e2b8dc01fb80"
-
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-
-globule@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
-graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
-grunt-babel@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-babel/-/grunt-babel-6.0.0.tgz#378189b487de1168c4c4a9fc88dd6005b35df960"
-  dependencies:
-    babel-core "^6.0.12"
-
-grunt-cli@^1.2.0, grunt-cli@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.2.0.tgz#562b119ebb069ddb464ace2845501be97b35b6a8"
-  dependencies:
-    findup-sync "~0.3.0"
-    grunt-known-options "~1.1.0"
-    nopt "~3.0.6"
-    resolve "~1.1.0"
-
-grunt-contrib-clean@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-1.1.0.tgz#564abf2d0378a983a15b9e3f30ee75b738c40638"
-  dependencies:
-    async "^1.5.2"
-    rimraf "^2.5.1"
-
-grunt-contrib-copy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573"
-  dependencies:
-    chalk "^1.1.1"
-    file-sync-cmp "^0.1.0"
-
-grunt-contrib-uglify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-2.3.0.tgz#b3d0260ebdd6cefa12ff2f8e9e1e259f7de4216f"
-  dependencies:
-    chalk "^1.0.0"
-    maxmin "^1.1.0"
-    object.assign "^4.0.4"
-    uglify-js "~2.8.21"
-    uri-path "^1.0.0"
-
-grunt-contrib-watch@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz#c143ca5b824b288a024b856639a5345aedb78ed4"
-  dependencies:
-    async "^2.6.0"
-    gaze "^1.1.0"
-    lodash "^4.17.10"
-    tiny-lr "^1.1.1"
-
-grunt-known-options@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.0.tgz#a4274eeb32fa765da5a7a3b1712617ce3b144149"
-
-grunt-legacy-log-utils@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz#d2f442c7c0150065d9004b08fd7410d37519194e"
-  dependencies:
-    chalk "~2.4.1"
-    lodash "~4.17.10"
-
-grunt-legacy-log@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz#c8cd2c6c81a4465b9bbf2d874d963fef7a59ffb9"
-  dependencies:
-    colors "~1.1.2"
-    grunt-legacy-log-utils "~2.0.0"
-    hooker "~0.2.3"
-    lodash "~4.17.5"
-
-grunt-legacy-util@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz#e10624e7c86034e5b870c8a8616743f0a0845e42"
-  dependencies:
-    async "~1.5.2"
-    exit "~0.1.1"
-    getobject "~0.1.0"
-    hooker "~0.2.3"
-    lodash "~4.17.10"
-    underscore.string "~3.3.4"
-    which "~1.3.0"
-
-grunt-mocha-test@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/grunt-mocha-test/-/grunt-mocha-test-0.13.3.tgz#9028472b615bda6ddeaa7b30a5a164e9805de005"
-  dependencies:
-    hooker "^0.2.3"
-    mkdirp "^0.5.0"
-
-grunt-systemjs-builder@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-systemjs-builder/-/grunt-systemjs-builder-1.0.0.tgz#5d8e7cbeca5b35e2b7b6bd002e9a9d7e03d7decd"
-  dependencies:
-    systemjs-builder "0.14.11 - 0.16.x"
-
-grunt@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.0.4.tgz#c799883945a53a3d07622e0737c8f70bfe19eb38"
-  integrity sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==
-  dependencies:
-    coffeescript "~1.10.0"
-    dateformat "~1.0.12"
-    eventemitter2 "~0.4.13"
-    exit "~0.1.1"
-    findup-sync "~0.3.0"
-    glob "~7.0.0"
-    grunt-cli "~1.2.0"
-    grunt-known-options "~1.1.0"
-    grunt-legacy-log "~2.0.0"
-    grunt-legacy-util "~1.1.1"
-    iconv-lite "~0.4.13"
-    js-yaml "~3.13.0"
-    minimatch "~3.0.2"
-    mkdirp "~0.5.1"
-    nopt "~3.0.6"
-    path-is-absolute "~1.0.0"
-    rimraf "~2.6.2"
-
-gzip-size@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-1.0.0.tgz#66cf8b101047227b95bace6ea1da0c177ed5c22f"
-  dependencies:
-    browserify-zlib "^0.1.4"
-    concat-stream "^1.4.1"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-hooker@^0.2.3, hooker@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959"
-
-hosted-git-info@^2.1.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.1.tgz#6e4cee78b01bb849dcf93527708c69fdbee410df"
-
-html-encoding-sniffer@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-  dependencies:
-    whatwg-encoding "^1.0.1"
-
-http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-iconv-lite@~0.4.13:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-invariant@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  dependencies:
-    loose-envify "^1.0.0"
-
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  dependencies:
-    loose-envify "^1.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-buffer@^1.0.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
-
-is-buffer@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
-
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-regex@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
-  dependencies:
-    has "^1.0.3"
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
-
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
-js-yaml@3.13.1, js-yaml@~3.13.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsdom@~9.12.0:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
-  dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
-    array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json5@^0.5.0, json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-
-jsprim@^1.2.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
-  dependencies:
-    extsprintf "1.0.2"
-    json-schema "0.2.3"
-    verror "1.3.6"
-
-kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
-  dependencies:
-    is-buffer "^1.0.2"
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-livereload-js@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
-
-load-grunt-tasks@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/load-grunt-tasks/-/load-grunt-tasks-3.5.2.tgz#0728561180fd20ff8a6927505852fc58aaea0c88"
-  dependencies:
-    arrify "^1.0.0"
-    multimatch "^2.0.0"
-    pkg-up "^1.0.0"
-    resolve-pkg "^0.1.0"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.4, lodash@^4.2.0, lodash@~4.17.10, lodash@~4.17.5:
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
-
-lodash@^4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-log-symbols@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
-loose-envify@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
-maxmin@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/maxmin/-/maxmin-1.1.0.tgz#71365e84a99dd8f8b3f7d5fde2f00d1e7f73be61"
-  dependencies:
-    chalk "^1.0.0"
-    figures "^1.0.1"
-    gzip-size "^1.0.0"
-    pretty-bytes "^1.0.0"
-
-meow@^3.1.0, meow@^3.3.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
-mime-db@~1.26.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
-
-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-
-mime-types@^2.1.12:
-  version "2.1.14"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
-  dependencies:
-    mime-db "~1.26.0"
-
-mime-types@~2.1.17:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-mocha@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.2.tgz#5d8987e28940caf8957a7d7664b910dc5b2fea20"
-  integrity sha512-FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==
-  dependencies:
-    ansi-colors "3.2.3"
-    browser-stdout "1.3.1"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "2.2.0"
-    minimatch "3.0.4"
-    mkdirp "0.5.1"
-    ms "2.1.1"
-    node-environment-flags "1.0.5"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.0"
-    yargs-parser "13.1.1"
-    yargs-unparser "1.6.0"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-multimatch@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
-node-environment-flags@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
-  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
-nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-"nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
-
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
-
-object-keys@^1.0.11, object-keys@^1.0.8:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@4.1.0, object.assign@^4.0.4, object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-tmpdir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-p-limit@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1, path-is-absolute@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-up@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
-  dependencies:
-    find-up "^1.0.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-pretty-bytes@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
-  dependencies:
-    get-stdin "^4.0.1"
-    meow "^3.1.0"
-
-private@^0.1.6:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
-
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-
-prunk@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/prunk/-/prunk-1.3.1.tgz#5c1f5615c218ac76621b4d8a97ec13717807756a"
-
-psl@^1.1.24:
-  version "1.1.28"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.28.tgz#4fb6ceb08a1e2214d4fd4de0ca22dae13740bc7b"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-q@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-
-qs@^6.4.0, qs@~6.5.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-
-raw-body@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  dependencies:
-    bytes "1"
-    string_decoder "0.10"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-readable-stream@^2.2.2:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
-
-regenerator-runtime@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-
-regenerator-transform@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
-  dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
-    private "^0.1.6"
-
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  dependencies:
-    jsesc "~0.5.0"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  dependencies:
-    is-finite "^1.0.0"
-
-request@^2.79.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resolve-from@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-
-resolve-pkg@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-0.1.0.tgz#02cc993410e2936962bd97166a1b077da9725531"
-  dependencies:
-    resolve-from "^2.0.0"
-
-resolve@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
-rimraf@^2.5.1, rimraf@~2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-rollup@^0.58.2:
-  version "0.58.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.58.2.tgz#2feddea8c0c022f3e74b35c48e3c21b3433803ce"
-  dependencies:
-    "@types/estree" "0.0.38"
-    "@types/node" "*"
-
-rsvp@^3.0.13:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-
-safe-json-parse@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-
-sax@^1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
-semver@^4.3.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-semver@^5.7.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-support@^0.4.2:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
-  dependencies:
-    source-map "^0.5.3"
-
-source-map-support@~0.2.8:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc"
-  dependencies:
-    source-map "0.1.32"
-
-source-map@0.1.32:
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
-source-map@^0.5.6, source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-source-map@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  dependencies:
-    amdefine ">=0.0.4"
-
-spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
-
-sprintf-js@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-string-template@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.trimleft@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
-  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string.prototype.trimright@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
-  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string_decoder@0.10:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-json-comments@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
-  dependencies:
-    has-flag "^3.0.0"
-
-symbol-tree@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-
-"systemjs-builder@0.14.11 - 0.16.x":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/systemjs-builder/-/systemjs-builder-0.16.13.tgz#02b47d03afd1e2f29562b11ec8bc13457e785c76"
-  dependencies:
-    babel-core "^6.24.1"
-    babel-plugin-syntax-dynamic-import "^6.18.0"
-    babel-plugin-transform-amd-system-wrapper "^0.3.7"
-    babel-plugin-transform-cjs-system-wrapper "^0.6.2"
-    babel-plugin-transform-es2015-modules-systemjs "^6.6.5"
-    babel-plugin-transform-global-system-wrapper "^0.3.4"
-    babel-plugin-transform-system-register "^0.0.1"
-    bluebird "^3.3.4"
-    data-uri-to-buffer "0.0.4"
-    es6-template-strings "^2.0.0"
-    glob "^7.0.3"
-    mkdirp "^0.5.1"
-    rollup "^0.58.2"
-    source-map "^0.5.3"
-    systemjs "^0.19.46"
-    traceur "0.0.105"
-    uglify-js "^2.6.1"
-
-systemjs@^0.19.46:
-  version "0.19.47"
-  resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.47.tgz#c8c93937180f3f5481c769cd2720763fb4a31c6f"
-  dependencies:
-    when "^3.7.5"
-
-tiny-lr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-  dependencies:
-    body "^5.1.0"
-    debug "^3.1.0"
-    faye-websocket "~0.10.0"
-    livereload-js "^2.3.0"
-    object-assign "^4.1.0"
-    qs "^6.4.0"
-
-to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
-
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-
-tough-cookie@^2.3.2:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
-traceur@0.0.105:
-  version "0.0.105"
-  resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.105.tgz#5cf9dee83d6b77861c3d6c44d53859aed7ab0479"
-  dependencies:
-    commander "2.9.x"
-    glob "5.0.x"
-    rsvp "^3.0.13"
-    semver "^4.3.3"
-    source-map-support "~0.2.8"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-uglify-js@^2.6.1:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.6.4.tgz#65ea2fb3059c9394692f15fed87c2b36c16b9adf"
-  dependencies:
-    async "~0.2.6"
-    source-map "~0.5.1"
-    uglify-to-browserify "~1.0.0"
-    yargs "~3.10.0"
-
-uglify-js@~2.8.21:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
-underscore.string@~3.3.4:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
-  dependencies:
-    sprintf-js "^1.0.3"
-    util-deprecate "^1.0.2"
-
-uri-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/uri-path/-/uri-path-1.0.0.tgz#9747f018358933c31de0fccfd82d138e67262e32"
-
-util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-uuid@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.0.tgz#b237147804881d7b86f40a7ff8f590f15c37de32"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
-  dependencies:
-    extsprintf "1.0.2"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-
-websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  dependencies:
-    http-parser-js ">=0.4.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-
-whatwg-encoding@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
-  dependencies:
-    iconv-lite "0.4.19"
-
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-when@^3.7.5:
-  version "3.7.8"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@1.3.1, which@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xml-name-validator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-
-xtend@~4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yargs-parser@13.1.1, yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
-  dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
-
-yargs@13.3.0, yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
-yarn@^1.21.1:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.21.1.tgz#1d5da01a9a03492dc4a5957befc1fd12da83d89c"
-  integrity sha512-dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ==
diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
new file mode 160000
index 0000000000000000000000000000000000000000..d598db167eb256fe67409b7bb3d0eb7fffc3ff8c
--- /dev/null
+++ b/src/connector/grafanaplugin
@@ -0,0 +1 @@
+Subproject commit d598db167eb256fe67409b7bb3d0eb7fffc3ff8c
diff --git a/src/connector/jdbc/.classpath b/src/connector/jdbc/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..a5d95095ccaaf9549ee22ff2fbf684bfa43d31c9
--- /dev/null
+++ b/src/connector/jdbc/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/src/connector/jdbc/.project b/src/connector/jdbc/.project
new file mode 100644
index 0000000000000000000000000000000000000000..656ab58d205bf0e01c151728a75e5ab543facee6
--- /dev/null
+++ b/src/connector/jdbc/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>taos-jdbcdriver</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/src/connector/jdbc/.settings/org.eclipse.core.resources.prefs b/src/connector/jdbc/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index 1935ba2ee400625d903bb90ecbb42d9a185504ed..0000000000000000000000000000000000000000
--- a/src/connector/jdbc/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=GBK
-encoding//src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/src/connector/jdbc/.settings/org.eclipse.jdt.core.prefs b/src/connector/jdbc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 5ce4518899426199a8ab051fb032691fe545dcee..0000000000000000000000000000000000000000
--- a/src/connector/jdbc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/src/connector/jdbc/.settings/org.eclipse.m2e.core.prefs b/src/connector/jdbc/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100755
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000
--- a/src/connector/jdbc/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt
index 56a65a8ab526ad901941768938416f8bb10704c9..7f823b97b266dae11ce1ba384cc812a1a9d6b691 100644
--- a/src/connector/jdbc/CMakeLists.txt
+++ b/src/connector/jdbc/CMakeLists.txt
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-1.0.2-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.0-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})
diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
new file mode 100755
index 0000000000000000000000000000000000000000..3f6ebeff03f538e4963540e015c7fd4b310acc42
--- /dev/null
+++ b/src/connector/jdbc/deploy-pom.xml
@@ -0,0 +1,216 @@
+<!-- This xml is used for deploy taos-jdbcdriver to maven reprository, change name to pom.xml if you need to deploy new driver to maven reprository -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.taosdata.jdbc</groupId>
+  <artifactId>taos-jdbcdriver</artifactId>
+  <version>2.0.6</version>
+  <packaging>jar</packaging>
+
+  <name>JDBCDriver</name>
+  <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+  <description>TDengine JDBC Driver</description>
+
+
+  <licenses>
+    <license>
+      <name>GNU AFFERO GENERAL PUBLIC LICENSE Version 3</name>
+      <url>https://github.com/taosdata/TDengine/blob/master/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <connection>scm:git:git://github.com/taosdata/TDengine.git</connection>
+    <developerConnection>scm:git:git@github.com:taosdata/TDengine.git</developerConnection>
+    <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+    <tag>HEAD</tag>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>taosdata</name>
+      <email>support@taosdata.com</email>
+      <organization>https://www.taosdata.com/</organization>
+      <organizationUrl>https://www.taosdata.com/</organizationUrl>
+    </developer>
+  </developers>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.5</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/assembly-jar.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <source>8</source>
+          <target>8</target>
+          <debug>true</debug>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <charset>UTF-8</charset>
+          <docencoding>UTF-8</docencoding>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <doclint>none</doclint>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.7</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh-td</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.3</version>
+        <configuration>
+          <localCheckout>true</localCheckout>
+          <pushChanges>false</pushChanges>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+          <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.scm</groupId>
+            <artifactId>maven-scm-provider-gitexe</artifactId>
+            <version>1.11.2</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh-td</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>ossrh-td</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+
+</project>
diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
index 75abea9edcd4b2f14d69feeb885669801b54700d..36e2fa426b7647b4b2a3543ffa8470c310dc82b2 100755
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
@@ -1,105 +1,102 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.taosdata.jdbc</groupId>
-	<artifactId>taos-jdbcdriver</artifactId>
-	<version>1.0.2</version>
-	<packaging>jar</packaging>
-
-	<name>JDBCDriver</name>
-	<url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
-	<description>TDengine JDBC Driver</description>
-
-	<licenses>
-		<license>
-			<name>GNU AFFERO GENERAL PUBLIC LICENSE Version 3</name>
-			<url>https://github.com/taosdata/TDengine/blob/master/LICENSE</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<scm>
-		<connection>scm:git:git://github.com/taosdata/TDengine.git</connection>
-		<developerConnection>scm:git:git@github.com:taosdata/TDengine.git</developerConnection>
-		<url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
-		<tag>HEAD</tag>
-	</scm>
-
-	<developers>
-		<developer>
-			<name>taosdata</name>
-			<email>support@taosdata.com</email>
-			<organization>https://www.taosdata.com/</organization>
-			<organizationUrl>https://www.taosdata.com/</organizationUrl>
-		</developer>
-	</developers>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-
-		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-
-		<commons-logging.version>1.1.2</commons-logging.version>
-		<commons-lang3.version>3.5</commons-lang3.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>${commons-logging.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<descriptors>
-						<!--<descriptor>src/main/assembly/assembly.xml</descriptor>-->
-						<descriptor>src/main/assembly/assembly-jar.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<debug>true</debug>
-					<showDeprecation>true</showDeprecation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.taosdata.jdbc</groupId>
+    <artifactId>taos-jdbcdriver</artifactId>
+    <version>2.0.0</version>
+    <packaging>jar</packaging>
+    <name>JDBCDriver</name>
+    <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
 
+    <description>TDengine JDBC Driver</description>
+    <licenses>
+        <license>
+            <name>GNU AFFERO GENERAL PUBLIC LICENSE Version 3</name>
+            <url>https://github.com/taosdata/TDengine/blob/master/LICENSE</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:git://github.com/taosdata/TDengine.git</connection>
+        <developerConnection>scm:git:git@github.com:taosdata/TDengine.git</developerConnection>
+        <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
+        <tag>HEAD</tag>
+    </scm>
+    <developers>
+        <developer>
+            <name>taosdata</name>
+            <email>support@taosdata.com</email>
+            <organization>https://www.taosdata.com/</organization>
+            <organizationUrl>https://www.taosdata.com/</organizationUrl>
+        </developer>
+    </developers>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+        <commons-logging.version>1.1.2</commons-logging.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons-logging.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/assembly-jar.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <debug>true</debug>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12.4</version>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
index 027d2197a32a6d36bb574c76d9672ed4d5d1d1c7..86938031f6e4a6001bca2c8f2911e6a8f0284cc4 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
@@ -18,8 +18,8 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
 import java.sql.Date;
+import java.sql.*;
 import java.util.*;
 
 /*
@@ -102,41 +102,49 @@ public class DatabaseMetaDataResultSet implements ResultSet {
 
     @Override
     public byte getByte(int columnIndex) throws SQLException {
+        columnIndex--;
         return (byte) rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public short getShort(int columnIndex) throws SQLException {
+        columnIndex--;
         return (short) rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public int getInt(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public long getLong(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getLong(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public float getFloat(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getFloat(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public double getDouble(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getDouble(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+        columnIndex--;
         return new BigDecimal(rowCursor.getDouble(columnIndex, columnMetaDataList.get(columnIndex).getColType()));
     }
 
     @Override
     public byte[] getBytes(int columnIndex) throws SQLException {
+        columnIndex--;
         return (rowCursor.getString(columnIndex, columnMetaDataList.get(columnIndex).getColType())).getBytes();
     }
 
@@ -152,6 +160,7 @@ public class DatabaseMetaDataResultSet implements ResultSet {
 
     @Override
     public Timestamp getTimestamp(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getTimestamp(columnIndex);
     }
 
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
index 4640f6b446b6d285806408856489c5e950b37a81..ac0e4eb84aa0fbcc8162e68d94de00cb2f4e79f5 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
@@ -14,6 +14,7 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
+import java.io.*;
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.CallableStatement;
@@ -30,323 +31,340 @@ import java.sql.SQLXML;
 import java.sql.Savepoint;
 import java.sql.Statement;
 import java.sql.Struct;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 import java.util.concurrent.Executor;
 
 public class TSDBConnection implements Connection {
 
-	private TSDBJNIConnector connector = null;
-
-	protected Properties props = null;
-
-	private String catalog = null;
-
-	private TSDBDatabaseMetaData dbMetaData = null;
-
-	private Properties clientInfoProps = new Properties();
-
-	private int timeoutMilliseconds = 0;
-
-	private String tsCharSet = "";
-
-	public TSDBConnection(Properties info, TSDBDatabaseMetaData meta) throws SQLException {
-		this.dbMetaData = meta;
-		connect(info.getProperty(TSDBDriver.PROPERTY_KEY_HOST),
-				Integer.parseInt(info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "0")),
-				info.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME), info.getProperty(TSDBDriver.PROPERTY_KEY_USER),
-				info.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
-	}
-
-	private void connect(String host, int port, String dbName, String user, String password) throws SQLException {
-		this.connector = new TSDBJNIConnector();
-		this.connector.connect(host, port, dbName, user, password);
-
-		try {
-			this.setCatalog(dbName);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		this.dbMetaData.setConnection(this);
-	}
-
-	public TSDBJNIConnector getConnection() {
-		return this.connector;
-	}
-
-	public Statement createStatement() throws SQLException {
-		if (!this.connector.isClosed()) {
-			return new TSDBStatement(this.connector);
-		} else {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		}
-	}
-
-	public PreparedStatement prepareStatement(String sql) throws SQLException {
-		if (!this.connector.isClosed()) {
-			return new TSDBPreparedStatement(this.connector, sql);
-		} else {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		}
-	}
-
-	public CallableStatement prepareCall(String sql) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public String nativeSQL(String sql) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setAutoCommit(boolean autoCommit) throws SQLException {
-	}
-
-	public boolean getAutoCommit() throws SQLException {
-		return true;
-	}
-
-	public void commit() throws SQLException {
-	}
-
-	public void rollback() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void close() throws SQLException {
-		if (this.connector != null && !this.connector.isClosed()) {
-			this.connector.closeConnection();
-		} else {
-			throw new SQLException(TSDBConstants.WrapErrMsg("connection is already closed!"));
-		}
-	}
-
-	public boolean isClosed() throws SQLException {
-		return this.connector.isClosed();
-	}
-
-	/**
-	 * A connection's database is able to provide information describing its tables,
-	 * its supported SQL grammar, its stored procedures, the capabilities of this
-	 * connection, etc. This information is made available through a
-	 * DatabaseMetaData object.
-	 * 
-	 * @return a DatabaseMetaData object for this connection
-	 * @exception SQLException
-	 *                if a database access error occurs
-	 */
-	public DatabaseMetaData getMetaData() throws SQLException {
-		return this.dbMetaData;
-	}
-
-	/**
-	 * This readOnly option is not supported by TDengine. However, the method is intentionally left blank here to
-	 * support HikariCP connection.
-	 * @param readOnly
-	 * @throws SQLException
-	 */
-	public void setReadOnly(boolean readOnly) throws SQLException {
-	}
-
-	public boolean isReadOnly() throws SQLException {
-		return true;
-	}
-
-	public void setCatalog(String catalog) throws SQLException {
-		this.catalog = catalog;
-	}
-
-	public String getCatalog() throws SQLException {
-		return this.catalog;
-	}
-
-	/**
-	 * The transaction isolation level option is not supported by TDengine.
-	 * This method is intentionally left empty to support HikariCP connection.
-	 * @param level
-	 * @throws SQLException
-	 */
-	public void setTransactionIsolation(int level) throws SQLException {
-	}
-
-	/**
-	 * The transaction isolation level option is not supported by TDengine.
-	 * @return
-	 * @throws SQLException
-	 */
-	public int getTransactionIsolation() throws SQLException {
-		return Connection.TRANSACTION_NONE;
-	}
-
-	public SQLWarning getWarnings() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void clearWarnings() throws SQLException {
-		// left blank to support HikariCP connection
-		//todo: implement getWarnings according to the warning messages returned from TDengine
-	}
-
-	public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-			throws SQLException {
-		// This method is implemented in the current way to support Spark
-		if (resultSetType != ResultSet.TYPE_FORWARD_ONLY) {
-			throw new SQLException(TSDBConstants.INVALID_VARIABLES);
-		}
-
-		if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY) {
-			throw new SQLException(TSDBConstants.INVALID_VARIABLES);
-		}
-
-		return this.prepareStatement(sql);
-	}
-
-	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Map<String, Class<?>> getTypeMap() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setHoldability(int holdability) throws SQLException {
-		// intentionally left empty to support druid connection pool.
-	}
-
-	/**
-	 * the transaction is not supported by TDengine, so the opened ResultSet Objects will remain open
-	 * @return
-	 * @throws SQLException
-	 */
-	public int getHoldability() throws SQLException {
-		//intentionally left empty to support HikariCP connection.
-		return ResultSet.HOLD_CURSORS_OVER_COMMIT;
-	}
-
-	public Savepoint setSavepoint() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Savepoint setSavepoint(String name) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void rollback(Savepoint savepoint) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-			int resultSetHoldability) throws SQLException {
-		return this.prepareStatement(sql, resultSetType, resultSetConcurrency);
-	}
-
-	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
-			int resultSetHoldability) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Clob createClob() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Blob createBlob() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public NClob createNClob() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public SQLXML createSQLXML() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean isValid(int timeout) throws SQLException {
-		return !this.isClosed();
-	}
-
-	public void setClientInfo(String name, String value) throws SQLClientInfoException {
-		clientInfoProps.setProperty(name, value);
-	}
-
-	public void setClientInfo(Properties properties) throws SQLClientInfoException {
-		for (Enumeration<Object> enumer = properties.keys(); enumer.hasMoreElements();) {
-			String name = (String) enumer.nextElement();
-			clientInfoProps.put(name, properties.getProperty(name));
-		}
-	}
-
-	public String getClientInfo(String name) throws SQLException {
-		return clientInfoProps.getProperty(name);
-	}
-
-	public Properties getClientInfo() throws SQLException {
-		return clientInfoProps;
-	}
-
-	public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setSchema(String schema) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public String getSchema() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void abort(Executor executor) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-		this.timeoutMilliseconds = milliseconds;
-	}
-
-	public int getNetworkTimeout() throws SQLException {
-		return this.timeoutMilliseconds;
-	}
-
-	public <T> T unwrap(Class<T> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    private TSDBJNIConnector connector = null;
+
+    protected Properties props = null;
+
+    private String catalog = null;
+
+    private TSDBDatabaseMetaData dbMetaData = null;
+
+    private Properties clientInfoProps = new Properties();
+
+    private int timeoutMilliseconds = 0;
+
+    private String tsCharSet = "";
+
+    public TSDBConnection(Properties info, TSDBDatabaseMetaData meta) throws SQLException {
+        this.dbMetaData = meta;
+
+        connect(info.getProperty(TSDBDriver.PROPERTY_KEY_HOST),
+                Integer.parseInt(info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "0")),
+                info.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME), info.getProperty(TSDBDriver.PROPERTY_KEY_USER),
+                info.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
+    }
+
+    private void connect(String host, int port, String dbName, String user, String password) throws SQLException {
+        this.connector = new TSDBJNIConnector();
+        this.connector.connect(host, port, dbName, user, password);
+
+        try {
+            this.setCatalog(dbName);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        this.dbMetaData.setConnection(this);
+    }
+
+    public TSDBJNIConnector getConnection() {
+        return this.connector;
+    }
+
+    public Statement createStatement() throws SQLException {
+        if (!this.connector.isClosed()) {
+            TSDBStatement statement = new TSDBStatement(this, this.connector);
+            statement.setConnection(this);
+            return statement;
+        } else {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+    }
+
+    public TSDBSubscribe subscribe(String topic, String sql, boolean restart) throws SQLException {
+        if (this.connector.isClosed()) {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+
+        long id = this.connector.subscribe(topic, sql, restart, 0);
+        if (id == 0) {
+            throw new SQLException(TSDBConstants.WrapErrMsg("failed to create subscription"));
+        }
+
+        return new TSDBSubscribe(this.connector, id);
+    }
+
+    public PreparedStatement prepareStatement(String sql) throws SQLException {
+        if (!this.connector.isClosed()) {
+            return new TSDBPreparedStatement(this, this.connector, sql);
+        } else {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+    }
+
+    public CallableStatement prepareCall(String sql) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public String nativeSQL(String sql) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setAutoCommit(boolean autoCommit) throws SQLException {
+    }
+
+    public boolean getAutoCommit() throws SQLException {
+        return true;
+    }
+
+    public void commit() throws SQLException {
+    }
+
+    public void rollback() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void close() throws SQLException {
+        if (this.connector != null && !this.connector.isClosed()) {
+            this.connector.closeConnection();
+        } else {
+            throw new SQLException(TSDBConstants.WrapErrMsg("connection is already closed!"));
+        }
+    }
+
+    public boolean isClosed() throws SQLException {
+        return this.connector.isClosed();
+    }
+
+    /**
+     * A connection's database is able to provide information describing its tables,
+     * its supported SQL grammar, its stored procedures, the capabilities of this
+     * connection, etc. This information is made available through a
+     * DatabaseMetaData object.
+     *
+     * @return a DatabaseMetaData object for this connection
+     * @throws SQLException if a database access error occurs
+     */
+    public DatabaseMetaData getMetaData() throws SQLException {
+        return this.dbMetaData;
+    }
+
+    /**
+     * This readOnly option is not supported by TDengine. However, the method is intentionally left blank here to
+     * support HikariCP connection.
+     *
+     * @param readOnly
+     * @throws SQLException
+     */
+    public void setReadOnly(boolean readOnly) throws SQLException {
+    }
+
+    public boolean isReadOnly() throws SQLException {
+        return true;
+    }
+
+    public void setCatalog(String catalog) throws SQLException {
+        this.catalog = catalog;
+    }
+
+    public String getCatalog() throws SQLException {
+        return this.catalog;
+    }
+
+    /**
+     * The transaction isolation level option is not supported by TDengine.
+     * This method is intentionally left empty to support HikariCP connection.
+     *
+     * @param level
+     * @throws SQLException
+     */
+    public void setTransactionIsolation(int level) throws SQLException {
+    }
+
+    /**
+     * The transaction isolation level option is not supported by TDengine.
+     *
+     * @return
+     * @throws SQLException
+     */
+    public int getTransactionIsolation() throws SQLException {
+        return Connection.TRANSACTION_NONE;
+    }
+
+    public SQLWarning getWarnings() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void clearWarnings() throws SQLException {
+        // left blank to support HikariCP connection
+        //todo: implement getWarnings according to the warning messages returned from TDengine
+    }
+
+    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+            throws SQLException {
+        // This method is implemented in the current way to support Spark
+        if (resultSetType != ResultSet.TYPE_FORWARD_ONLY) {
+            throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+        }
+
+        if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY) {
+            throw new SQLException(TSDBConstants.INVALID_VARIABLES);
+        }
+
+        return this.prepareStatement(sql);
+    }
+
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Map<String, Class<?>> getTypeMap() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setHoldability(int holdability) throws SQLException {
+        // intentionally left empty to support druid connection pool.
+    }
+
+    /**
+     * the transaction is not supported by TDengine, so the opened ResultSet Objects will remain open
+     *
+     * @return
+     * @throws SQLException
+     */
+    public int getHoldability() throws SQLException {
+        //intentionally left empty to support HikariCP connection.
+        return ResultSet.HOLD_CURSORS_OVER_COMMIT;
+    }
+
+    public Savepoint setSavepoint() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Savepoint setSavepoint(String name) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void rollback(Savepoint savepoint) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+            throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
+                                              int resultSetHoldability) throws SQLException {
+        return this.prepareStatement(sql, resultSetType, resultSetConcurrency);
+    }
+
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+                                         int resultSetHoldability) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Clob createClob() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Blob createBlob() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public NClob createNClob() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public SQLXML createSQLXML() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean isValid(int timeout) throws SQLException {
+        return !this.isClosed();
+    }
+
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        clientInfoProps.setProperty(name, value);
+    }
+
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        for (Enumeration<Object> enumer = properties.keys(); enumer.hasMoreElements(); ) {
+            String name = (String) enumer.nextElement();
+            clientInfoProps.put(name, properties.getProperty(name));
+        }
+    }
+
+    public String getClientInfo(String name) throws SQLException {
+        return clientInfoProps.getProperty(name);
+    }
+
+    public Properties getClientInfo() throws SQLException {
+        return clientInfoProps;
+    }
+
+    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setSchema(String schema) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public String getSchema() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void abort(Executor executor) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+        this.timeoutMilliseconds = milliseconds;
+    }
+
+    public int getNetworkTimeout() throws SQLException {
+        return this.timeoutMilliseconds;
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
index 6cb3263e56749ffb9901fb0a401ab0be244c3646..15f66fa2029e7c1bf8a3ecf8ec68b53a8455c648 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
@@ -68,15 +68,15 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
 	}
 
 	public boolean nullsAreSortedLow() throws SQLException {
-		return false;
+		return !nullsAreSortedHigh();
 	}
 
 	public boolean nullsAreSortedAtStart() throws SQLException {
-		return false;
+		return true;
 	}
 
 	public boolean nullsAreSortedAtEnd() throws SQLException {
-		return false;
+		return !nullsAreSortedAtStart();
 	}
 
 	public String getDatabaseProductName() throws SQLException {
@@ -527,8 +527,9 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData {
 
 	public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
 			throws SQLException {
-		if (conn != null && !conn.isClosed()) {
-			Statement stmt = conn.createStatement();
+		Statement stmt = null;
+		if (null != conn && !conn.isClosed()) {
+			stmt = conn.createStatement();
 			if (catalog == null || catalog.length() < 1) {
 				catalog = conn.getCatalog();
 			}
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
index c297fb67b063355b4499b1020499104e1e10f627..97d93fb0a18fa887465583bce1492c8305faaec5 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
@@ -14,26 +14,29 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
-import org.apache.commons.lang3.StringUtils;
+
+import java.io.*;
 
 import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
 
 /**
  * The Java SQL framework allows for multiple database drivers. Each driver
  * should supply a class that implements the Driver interface
- * 
+ *
  * <p>
  * The DriverManager will try to load as many drivers as it can find and then
  * for any given connection request, it will ask each driver in turn to try to
  * connect to the target URL.
- * 
+ *
  * <p>
  * It is strongly recommended that each Driver class should be small and stand
  * alone so that the Driver class can be loaded and queried without bringing in
  * vast quantities of supporting code.
- * 
+ *
  * <p>
  * When a Driver class is loaded, it should create an instance of itself and
  * register it with the DriverManager. This means that a user can load and
@@ -41,39 +44,41 @@ import java.util.logging.Logger;
  */
 public class TSDBDriver implements java.sql.Driver {
 
-	@Deprecated
-	private static final String URL_PREFIX1 = "jdbc:TSDB://";
-
-	private static final String URL_PREFIX = "jdbc:TAOS://";
-
-	/**
-	 * Key used to retrieve the database value from the properties instance passed
-	 * to the driver.
-	 */
-	public static final String PROPERTY_KEY_DBNAME = "dbname";
-
-	/**
-	 * Key used to retrieve the host value from the properties instance passed to
-	 * the driver.
-	 */
-	public static final String PROPERTY_KEY_HOST = "host";
-	/**
-	 * Key used to retrieve the password value from the properties instance passed
-	 * to the driver.
-	 */
-	public static final String PROPERTY_KEY_PASSWORD = "password";
-
-	/**
-	 * Key used to retrieve the port number value from the properties instance
-	 * passed to the driver.
-	 */
-	public static final String PROPERTY_KEY_PORT = "port";
-
-	/**
-	 * Key used to retrieve the user value from the properties instance passed to
-	 * the driver.
-	 */
-	public static final String PROPERTY_KEY_USER = "user";
+
+    @Deprecated
+    private static final String URL_PREFIX1 = "jdbc:TSDB://";
+
+    private static final String URL_PREFIX = "jdbc:TAOS://";
+
+    /**
+     * Key used to retrieve the database value from the properties instance passed
+     * to the driver.
+     */
+    public static final String PROPERTY_KEY_DBNAME = "dbname";
+
+    /**
+     * Key used to retrieve the host value from the properties instance passed to
+     * the driver.
+     */
+    public static final String PROPERTY_KEY_HOST = "host";
+    /**
+     * Key used to retrieve the password value from the properties instance passed
+     * to the driver.
+     */
+    public static final String PROPERTY_KEY_PASSWORD = "password";
+
+    /**
+     * Key used to retrieve the port number value from the properties instance
+     * passed to the driver.
+     */
+    public static final String PROPERTY_KEY_PORT = "port";
+
+    /**
+     * Key used to retrieve the user value from the properties instance passed to
+     * the driver.
+     */
+    public static final String PROPERTY_KEY_USER = "user";
+
 
     /**
      * Key for the configuration file directory of TSDB client in properties instance
@@ -98,261 +103,319 @@ public class TSDBDriver implements java.sql.Driver {
 
     public static final String PROPERTY_KEY_PROTOCOL = "protocol";
 
-	/**
-	 * Index for port coming out of parseHostPortPair().
-	 */
-	public final static int PORT_NUMBER_INDEX = 1;
-
-	/**
-	 * Index for host coming out of parseHostPortPair().
-	 */
-	public final static int HOST_NAME_INDEX = 0;
-
-	private TSDBDatabaseMetaData dbMetaData = null;
-
-	static {
-		try {
-			java.sql.DriverManager.registerDriver(new TSDBDriver());
-		} catch (SQLException E) {
-			throw new RuntimeException(TSDBConstants.WrapErrMsg("can't register tdengine jdbc driver!"));
-		}
-	}
-
-	public Connection connect(String url, Properties info) throws SQLException {
-		if (url == null) {
-			throw new SQLException(TSDBConstants.WrapErrMsg("url is not set!"));
-		}
-
-		Properties props = null;
-
-		if ((props = parseURL(url, info)) == null) {
-			return null;
-		}
-
-		try {
-			TSDBJNIConnector.init((String) props.get(PROPERTY_KEY_CONFIG_DIR), (String) props.get(PROPERTY_KEY_LOCALE), (String) props.get(PROPERTY_KEY_CHARSET),
-					(String) props.get(PROPERTY_KEY_TIME_ZONE));
-			Connection newConn = new TSDBConnection(props, this.dbMetaData);
-			return newConn;
-		} catch (SQLWarning sqlWarning) {
-			sqlWarning.printStackTrace();
-			Connection newConn = new TSDBConnection(props, this.dbMetaData);
-			return newConn;
-		} catch (SQLException sqlEx) {
-			throw sqlEx;
-		} catch (Exception ex) {
-			SQLException sqlEx = new SQLException("SQLException:" + ex.toString());
-			sqlEx.initCause(ex);
-			throw sqlEx;
-		}
-	}
-
-	/**
-	 * Parses hostPortPair in the form of [host][:port] into an array, with the
-	 * element of index HOST_NAME_INDEX being the host (or null if not specified),
-	 * and the element of index PORT_NUMBER_INDEX being the port (or null if not
-	 * specified).
-	 * 
-	 * @param hostPortPair
-	 *            host and port in form of of [host][:port]
-	 * 
-	 * @return array containing host and port as Strings
-	 * 
-	 * @throws SQLException
-	 *             if a parse error occurs
-	 */
-	protected static String[] parseHostPortPair(String hostPortPair) throws SQLException {
-		String[] splitValues = new String[2];
-
-		int portIndex = hostPortPair.indexOf(":");
-
-		String hostname = null;
-
-		if (portIndex != -1) {
-			if ((portIndex + 1) < hostPortPair.length()) {
-				String portAsString = hostPortPair.substring(portIndex + 1);
-				hostname = hostPortPair.substring(0, portIndex);
-
-				splitValues[HOST_NAME_INDEX] = hostname;
-
-				splitValues[PORT_NUMBER_INDEX] = portAsString;
-			} else {
-				throw new SQLException(TSDBConstants.WrapErrMsg("port is not proper!"));
-			}
-		} else {
-			splitValues[HOST_NAME_INDEX] = hostPortPair;
-			splitValues[PORT_NUMBER_INDEX] = null;
-		}
-
-		return splitValues;
-	}
-
-	public boolean acceptsURL(String url) throws SQLException {
-		return true;
-	}
-
-	public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-		if (info == null) {
-			info = new Properties();
-		}
-
-		if ((url != null) && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1))) {
-			info = parseURL(url, info);
-		}
-
-		DriverPropertyInfo hostProp = new DriverPropertyInfo(PROPERTY_KEY_HOST, info.getProperty(PROPERTY_KEY_HOST));
-		hostProp.required = true;
-
-		DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT,
-				info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
-		portProp.required = false;
-
-		DriverPropertyInfo dbProp = new DriverPropertyInfo(PROPERTY_KEY_DBNAME, info.getProperty(PROPERTY_KEY_DBNAME));
-		dbProp.required = false;
-		dbProp.description = "Database name";
-
-		DriverPropertyInfo userProp = new DriverPropertyInfo(PROPERTY_KEY_USER, info.getProperty(PROPERTY_KEY_USER));
-		userProp.required = true;
-
-		DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD,
-				info.getProperty(PROPERTY_KEY_PASSWORD));
-		passwordProp.required = true;
-
-		DriverPropertyInfo[] propertyInfo = new DriverPropertyInfo[5];
-		propertyInfo[0] = hostProp;
-		propertyInfo[1] = portProp;
-		propertyInfo[2] = dbProp;
-		propertyInfo[3] = userProp;
-		propertyInfo[4] = passwordProp;
-
-		return propertyInfo;
-	}
-
-	/**
-	 * example: jdbc:TSDB://127.0.0.1:0/db?user=root&password=your_password
-	 */
-
-	public Properties parseURL(String url, Properties defaults) throws java.sql.SQLException {
-		Properties urlProps = (defaults != null) ? defaults : new Properties();
-		if (url == null) {
-			return null;
-		}
-
-		if (!StringUtils.startsWithIgnoreCase(url, URL_PREFIX) && !StringUtils.startsWithIgnoreCase(url, URL_PREFIX1)) {
-			return null;
-		}
-
-		String urlForMeta = url;
-
-		String dbProductName = url.substring(url.indexOf(":") + 1);
-		dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
-		int beginningOfSlashes = url.indexOf("//");
-		url = url.substring(beginningOfSlashes + 2);
-
-		String host = url.substring(0, url.indexOf(":"));
-		url = url.substring(url.indexOf(":") + 1);
-		urlProps.setProperty(PROPERTY_KEY_HOST, host);
-
-		String port = url.substring(0, url.indexOf("/"));
-		urlProps.setProperty(PROPERTY_KEY_PORT, port);
-		url = url.substring(url.indexOf("/") + 1);
-
-		if (url.indexOf("?") != -1) {
-			String dbName = url.substring(0, url.indexOf("?"));
-			urlProps.setProperty(PROPERTY_KEY_DBNAME, dbName);
-			url = url.trim().substring(1);
-		} else {
-			// without user & password so return
-			String dbName = url.trim();
-			urlProps.setProperty(PROPERTY_KEY_DBNAME, dbName);
-			this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, urlProps.getProperty("user"));
-			return urlProps;
-		}
-
-		String[] queryStrings = url.trim().split("&");
-		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]);
-					user = kvPair[1];
-					break;
-				case PROPERTY_KEY_PASSWORD:
-					urlProps.setProperty(PROPERTY_KEY_PASSWORD, kvPair[1]);
-					break;
-                case PROPERTY_KEY_TIME_ZONE:
-                    urlProps.setProperty(PROPERTY_KEY_TIME_ZONE, kvPair[1]);
-                    break;
-                case PROPERTY_KEY_LOCALE:
-                    urlProps.setProperty(PROPERTY_KEY_LOCALE, kvPair[1]);
-                    break;
-                case PROPERTY_KEY_CHARSET:
-                    urlProps.setProperty(PROPERTY_KEY_CHARSET, kvPair[1]);
-                    break;
-                case PROPERTY_KEY_CONFIG_DIR:
-                    urlProps.setProperty(PROPERTY_KEY_CONFIG_DIR, kvPair[1]);
+
+    /**
+     * Index for port coming out of parseHostPortPair().
+     */
+    public final static int PORT_NUMBER_INDEX = 1;
+
+    /**
+     * Index for host coming out of parseHostPortPair().
+     */
+    public final static int HOST_NAME_INDEX = 0;
+
+    private TSDBDatabaseMetaData dbMetaData = null;
+
+    static {
+        try {
+            java.sql.DriverManager.registerDriver(new TSDBDriver());
+        } catch (SQLException E) {
+            throw new RuntimeException(TSDBConstants.WrapErrMsg("can't register tdengine jdbc driver!"));
+        }
+    }
+
+    private List<String> loadConfigEndpoints(File cfgFile) {
+        List<String> endpoints = new ArrayList<>();
+        try (BufferedReader reader = new BufferedReader(new FileReader(cfgFile))) {
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                if (line.trim().startsWith("firstEp") || line.trim().startsWith("secondEp")) {
+                    endpoints.add(line.substring(line.indexOf('p') + 1).trim());
+                }
+                if (endpoints.size() > 1)
                     break;
-			}
-		}
-
-		this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, user);
-
-		return urlProps;
-	}
-
-	public int getMajorVersion() {
-		return 1;
-	}
-
-	public int getMinorVersion() {
-		return 1;
-	}
-
-	public boolean jdbcCompliant() {
-		return false;
-	}
-
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		return null;
-	}
-
-	/**
-	 * Returns the host property
-	 * 
-	 * @param props
-	 *            the java.util.Properties instance to retrieve the hostname from.
-	 * 
-	 * @return the host
-	 */
-	public String host(Properties props) {
-		return props.getProperty(PROPERTY_KEY_HOST, "localhost");
-	}
-
-	/**
-	 * Returns the port number property
-	 * 
-	 * @param props
-	 *            the properties to get the port number from
-	 * 
-	 * @return the port number
-	 */
-	public int port(Properties props) {
-		return Integer.parseInt(props.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
-	}
-
-	/**
-	 * Returns the database property from <code>props</code>
-	 * 
-	 * @param props
-	 *            the Properties to look for the database property.
-	 * 
-	 * @return the database name.
-	 */
-	public String database(Properties props) {
-		return props.getProperty(PROPERTY_KEY_DBNAME);
-	}
-}
\ No newline at end of file
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return endpoints;
+    }
+
+    /**
+     * @param cfgDirPath
+     * @return return the config dir
+     **/
+    private File loadConfigDir(String cfgDirPath) {
+        if (cfgDirPath == null)
+            return loadDefaultConfigDir();
+        File cfgDir = new File(cfgDirPath);
+        if (!cfgDir.exists())
+            return loadDefaultConfigDir();
+        return cfgDir;
+    }
+
+    /**
+     * @return search the default config dir, if the config dir is not exist will return null
+     */
+    private File loadDefaultConfigDir() {
+        File cfgDir;
+        File cfgDir_linux = new File("/etc/taos");
+        cfgDir = cfgDir_linux.exists() ? cfgDir_linux : null;
+        File cfgDir_windows = new File("C:\\TDengine\\cfg");
+        cfgDir = (cfgDir == null && cfgDir_windows.exists()) ? cfgDir_windows : cfgDir;
+        return cfgDir;
+    }
+
+    public Connection connect(String url, Properties info) throws SQLException {
+        if (url == null) {
+            throw new SQLException(TSDBConstants.WrapErrMsg("url is not set!"));
+        }
+
+        Properties props = null;
+        if ((props = parseURL(url, info)) == null) {
+            return null;
+        }
+
+        //load taos.cfg start
+        if (info.getProperty(TSDBDriver.PROPERTY_KEY_HOST) == null && info.getProperty(TSDBDriver.PROPERTY_KEY_PORT) == null) {
+            File cfgDir = loadConfigDir(info.getProperty(TSDBDriver.PROPERTY_KEY_CONFIG_DIR));
+            File cfgFile = cfgDir.listFiles((dir, name) -> "taos.cfg".equalsIgnoreCase(name))[0];
+            List<String> endpoints = loadConfigEndpoints(cfgFile);
+            if (!endpoints.isEmpty()) {
+                info.setProperty(TSDBDriver.PROPERTY_KEY_HOST, endpoints.get(0).split(":")[0]);
+                info.setProperty(TSDBDriver.PROPERTY_KEY_PORT, endpoints.get(0).split(":")[1]);
+            }
+        }
+
+        try {
+            TSDBJNIConnector.init((String) props.get(PROPERTY_KEY_CONFIG_DIR), (String) props.get(PROPERTY_KEY_LOCALE), (String) props.get(PROPERTY_KEY_CHARSET),
+                    (String) props.get(PROPERTY_KEY_TIME_ZONE));
+            Connection newConn = new TSDBConnection(props, this.dbMetaData);
+            return newConn;
+        } catch (SQLWarning sqlWarning) {
+            sqlWarning.printStackTrace();
+            Connection newConn = new TSDBConnection(props, this.dbMetaData);
+            return newConn;
+        } catch (SQLException sqlEx) {
+            throw sqlEx;
+        } catch (Exception ex) {
+            SQLException sqlEx = new SQLException("SQLException:" + ex.toString());
+            sqlEx.initCause(ex);
+            throw sqlEx;
+        }
+    }
+
+    /**
+     * Parses hostPortPair in the form of [host][:port] into an array, with the
+     * element of index HOST_NAME_INDEX being the host (or null if not specified),
+     * and the element of index PORT_NUMBER_INDEX being the port (or null if not
+     * specified).
+     *
+     * @param hostPortPair host and port in form of of [host][:port]
+     * @return array containing host and port as Strings
+     * @throws SQLException if a parse error occurs
+     */
+    protected static String[] parseHostPortPair(String hostPortPair) throws SQLException {
+        String[] splitValues = new String[2];
+
+        int portIndex = hostPortPair.indexOf(":");
+
+        String hostname = null;
+
+        if (portIndex != -1) {
+            if ((portIndex + 1) < hostPortPair.length()) {
+                String portAsString = hostPortPair.substring(portIndex + 1);
+                hostname = hostPortPair.substring(0, portIndex);
+
+                splitValues[HOST_NAME_INDEX] = hostname;
+
+                splitValues[PORT_NUMBER_INDEX] = portAsString;
+            } else {
+                throw new SQLException(TSDBConstants.WrapErrMsg("port is not proper!"));
+            }
+        } else {
+            splitValues[HOST_NAME_INDEX] = hostPortPair;
+            splitValues[PORT_NUMBER_INDEX] = null;
+        }
+
+        return splitValues;
+    }
+
+    public boolean acceptsURL(String url) throws SQLException {
+        return (url != null && url.length() > 0 && url.trim().length() > 0) && url.startsWith(URL_PREFIX);
+    }
+
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
+        if (info == null) {
+            info = new Properties();
+        }
+
+        if ((url != null) && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1))) {
+            info = parseURL(url, info);
+        }
+
+        DriverPropertyInfo hostProp = new DriverPropertyInfo(PROPERTY_KEY_HOST, info.getProperty(PROPERTY_KEY_HOST));
+        hostProp.required = true;
+
+        DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT, info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
+        portProp.required = false;
+
+        DriverPropertyInfo dbProp = new DriverPropertyInfo(PROPERTY_KEY_DBNAME, info.getProperty(PROPERTY_KEY_DBNAME));
+        dbProp.required = false;
+        dbProp.description = "Database name";
+
+        DriverPropertyInfo userProp = new DriverPropertyInfo(PROPERTY_KEY_USER, info.getProperty(PROPERTY_KEY_USER));
+        userProp.required = true;
+
+        DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD, info.getProperty(PROPERTY_KEY_PASSWORD));
+        passwordProp.required = true;
+
+        DriverPropertyInfo[] propertyInfo = new DriverPropertyInfo[5];
+        propertyInfo[0] = hostProp;
+        propertyInfo[1] = portProp;
+        propertyInfo[2] = dbProp;
+        propertyInfo[3] = userProp;
+        propertyInfo[4] = passwordProp;
+
+        return propertyInfo;
+    }
+
+    /**
+     * example: jdbc:TSDB://127.0.0.1:0/db?user=root&password=your_password
+     */
+    public Properties parseURL(String url, Properties defaults) throws java.sql.SQLException {
+        Properties urlProps = (defaults != null) ? defaults : new Properties();
+        if (url == null) {
+            return null;
+        }
+
+        if (!url.startsWith(URL_PREFIX) && !url.startsWith(URL_PREFIX1)) {
+            return null;
+        }
+
+        String urlForMeta = url;
+
+        String dbProductName = url.substring(url.indexOf(":") + 1);
+        dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
+        int beginningOfSlashes = url.indexOf("//");
+        url = url.substring(beginningOfSlashes + 2);
+
+        String host = url.substring(0, url.indexOf(":"));
+        url = url.substring(url.indexOf(":") + 1);
+        urlProps.setProperty(PROPERTY_KEY_HOST, host);
+
+        String port = url.substring(0, url.indexOf("/"));
+        urlProps.setProperty(PROPERTY_KEY_PORT, port);
+        url = url.substring(url.indexOf("/") + 1);
+
+        if (url.indexOf("?") != -1) {
+            String dbName = url.substring(0, url.indexOf("?"));
+            urlProps.setProperty(PROPERTY_KEY_DBNAME, dbName);
+            url = url.trim().substring(url.indexOf("?") + 1);
+        } else {
+            // without user & password so return
+            if (!url.trim().isEmpty()) {
+                String dbName = url.trim();
+                urlProps.setProperty(PROPERTY_KEY_DBNAME, dbName);
+            }
+            this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, urlProps.getProperty("user"));
+            return urlProps;
+        }
+
+        String user = "";
+
+        if (url.indexOf("&") == -1) {
+            String[] kvPair = url.trim().split("=");
+            if (kvPair.length == 2) {
+                setPropertyValue(urlProps, kvPair);
+                return urlProps;
+            }
+        }
+
+        String[] queryStrings = url.trim().split("&");
+        for (String queryStr : queryStrings) {
+            String[] kvPair = queryStr.trim().split("=");
+            if (kvPair.length < 2) {
+                continue;
+            }
+            setPropertyValue(urlProps, kvPair);
+        }
+
+        user = urlProps.getProperty(PROPERTY_KEY_USER).toString();
+        this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, user);
+
+        return urlProps;
+    }
+
+    public void setPropertyValue(Properties property, String[] keyValuePair) {
+        switch (keyValuePair[0].toLowerCase()) {
+            case PROPERTY_KEY_USER:
+                property.setProperty(PROPERTY_KEY_USER, keyValuePair[1]);
+                break;
+            case PROPERTY_KEY_PASSWORD:
+                property.setProperty(PROPERTY_KEY_PASSWORD, keyValuePair[1]);
+                break;
+            case PROPERTY_KEY_TIME_ZONE:
+                property.setProperty(PROPERTY_KEY_TIME_ZONE, keyValuePair[1]);
+                break;
+            case PROPERTY_KEY_LOCALE:
+                property.setProperty(PROPERTY_KEY_LOCALE, keyValuePair[1]);
+                break;
+            case PROPERTY_KEY_CHARSET:
+                property.setProperty(PROPERTY_KEY_CHARSET, keyValuePair[1]);
+                break;
+            case PROPERTY_KEY_CONFIG_DIR:
+                property.setProperty(PROPERTY_KEY_CONFIG_DIR, keyValuePair[1]);
+                break;
+        }
+    }
+
+
+    public int getMajorVersion() {
+        return 1;
+    }
+
+    public int getMinorVersion() {
+        return 1;
+    }
+
+    public boolean jdbcCompliant() {
+        return false;
+    }
+
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+    /**
+     * Returns the host property
+     *
+     * @param props the java.util.Properties instance to retrieve the hostname from.
+     * @return the host
+     */
+    public String host(Properties props) {
+        return props.getProperty(PROPERTY_KEY_HOST, "localhost");
+    }
+
+    /**
+     * Returns the port number property
+     *
+     * @param props the properties to get the port number from
+     * @return the port number
+     */
+    public int port(Properties props) {
+        return Integer.parseInt(props.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
+    }
+
+    /**
+     * Returns the database property from <code>props</code>
+     *
+     * @param props the Properties to look for the database property.
+     * @return the database name.
+     */
+    public String database(Properties props) {
+        return props.getProperty(PROPERTY_KEY_DBNAME);
+    }
+}
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
deleted file mode 100644
index 7d5b02606ea0b05069785331fe223503a205e46b..0000000000000000000000000000000000000000
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/***************************************************************************
- * 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/>.
- *****************************************************************************/
-package com.taosdata.jdbc;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * TDengine error code and error message enumeration.
- *
- */
-public enum TSDBError {
-
-    TSDB_CODE_SUCCESS(0, "success"),
-    TSDB_CODE_ACTION_IN_PROGRESS(1, "in progress"),
-    TSDB_CODE_LAST_SESSION_NOT_FINISHED(5, "last session not finished"),
-    TSDB_CODE_INVALID_SESSION_ID(6, "invalid session ID"),
-    TSDB_CODE_INVALID_TRAN_ID(7, "invalid tran ID"),
-    TSDB_CODE_INVALID_MSG_TYPE(8, "invalid msg type"),
-    TSDB_CODE_ALREADY_PROCESSED(9, "alredy processed"),
-    TSDB_CODE_AUTH_FAILURE(10, "authentication failure"),
-    TSDB_CODE_WRONG_MSG_SIZE(11, "wrong msg size"),
-    TSDB_CODE_UNEXPECTED_RESPONSE(12, "unexpected response"),
-    TSDB_CODE_INVALID_RESPONSE_TYPE(13, "invalid response type"),
-    TSDB_CODE_NO_RESOURCE(14, "no resource"),
-    TSDB_CODE_INVALID_TIME_STAMP(15, "invalid time stamp"),
-    TSDB_CODE_MISMATCHED_METER_ID(16, "mismatched meter ID"),
-    TSDB_CODE_ACTION_TRANS_NOT_FINISHED(17, "transcation not finished"),
-    TSDB_CODE_ACTION_NOT_ONLINE(18, "not online"),
-    TSDB_CODE_ACTION_SEND_FAILD(19, "send failed"),
-    TSDB_CODE_NOT_ACTIVE_SESSION(20, "not active session"),
-    TSDB_CODE_INSERT_FAILED(21, "insert failed"),
-    TSDB_CODE_APP_ERROR(22, "App error"),
-    TSDB_CODE_INVALID_IE(23, "invalid IE"),
-    TSDB_CODE_INVALID_VALUE(24, "invalid value"),
-    TSDB_CODE_REDIRECT(25, "service not available"),
-    TSDB_CODE_ALREADY_THERE(26, "already there"),
-    TSDB_CODE_INVALID_METER_ID(27, "invalid meter ID"),
-    TSDB_CODE_INVALID_SQL(28, "invalid SQL"), // this message often comes with additional info which will vary based on the specific error situation
-    TSDB_CODE_NETWORK_UNAVAIL(29, "failed to connect to server"),
-    TSDB_CODE_INVALID_MSG_LEN(30, "invalid msg len"),
-    TSDB_CODE_INVALID_DB(31, "invalid DB"),
-    TSDB_CODE_INVALID_TABLE(32, "invalid table"),
-    TSDB_CODE_DB_ALREADY_EXIST(33, "DB already there"),
-    TSDB_CODE_TABLE_ALREADY_EXIST(34, "table already there"),
-    TSDB_CODE_INVALID_USER(35, "invalid user name"),
-    TSDB_CODE_INVALID_ACCT(36, "invalid acct name"),
-    TSDB_CODE_INVALID_PASS(37, "invalid password"),
-    TSDB_CODE_DB_NOT_SELECTED(38, "DB not selected"),
-    TSDB_CODE_MEMORY_CORRUPTED(39, "memory corrupted"),
-    TSDB_CODE_USER_ALREADY_EXIST(40, "user name exists"),
-    TSDB_CODE_NO_RIGHTS(41, "not authorized"),
-    TSDB_CODE_DISCONNECTED(42, "login disconnected), login again"),
-    TSDB_CODE_NO_MASTER(43, "mgmt master node not available"),
-    TSDB_CODE_NOT_CONFIGURED(44, "not configured"),
-    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_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"),
-    TSDB_CODE_NO_REMOVE_MASTER(52, "can't remove dnode which is master"),
-    TSDB_CODE_WRONG_SCHEMA(53, "wrong schema"),
-    TSDB_CODE_NO_RESULT(54, "no results"),
-    TSDB_CODE_TOO_MANY_USERS(55, "num of users execeed maxUsers"),
-    TSDB_CODE_TOO_MANY_DATABSES(56, "num of databases execeed maxDbs"),
-    TSDB_CODE_TOO_MANY_TABLES(57, "num of tables execeed maxTables"),
-    TSDB_CODE_TOO_MANY_DNODES(58, "num of dnodes execeed maxDnodes"),
-    TSDB_CODE_TOO_MANY_ACCTS(59, "num of accounts execeed maxAccts"),
-    TSDB_CODE_ACCT_ALREADY_EXIST(60, "accout name exists"),
-    TSDB_CODE_DNODE_ALREADY_EXIST(61, "dnode ip exists"),
-    TSDB_CODE_SDB_ERROR(62, "sdb error"),
-    TSDB_CODE_METRICMETA_EXPIRED(63, "metric meta expired"), // local cached metric-meta expired causes error in metric query
-    TSDB_CODE_NOT_READY(64, "not ready"), // peer is not ready to process data
-    TSDB_CODE_MAX_SESSIONS(65, "too many sessions on server"), // too many sessions
-    TSDB_CODE_MAX_CONNECTIONS(66, "too many sessions from app"), // too many connections
-    TSDB_CODE_SESSION_ALREADY_EXIST(67, "session to dest is already there"),
-    TSDB_CODE_NO_QSUMMARY(68, "query list not there), please show again"),
-    TSDB_CODE_SERV_OUT_OF_MEMORY(69, "server out of memory"),
-    TSDB_CODE_INVALID_QHANDLE(70, "invalid query handle"),
-    TSDB_CODE_RELATED_TABLES_EXIST(71, "tables related to metric exist"),
-    TSDB_CODE_MONITOR_DB_FORBEIDDEN(72, "can't drop monitor database or tables"),
-    TSDB_CODE_VG_COMMITLOG_INIT_FAILED(73, "commit log init failed"),
-    TSDB_CODE_VG_INIT_FAILED(74, "vgroup init failed"),
-    TSDB_CODE_DATA_ALREADY_IMPORTED(75, "data is already imported"),
-    TSDB_CODE_OPS_NOT_SUPPORT(76, "not supported operation"),
-    TSDB_CODE_INVALID_QUERY_ID(77, "invalid query id string"),
-    TSDB_CODE_INVALID_STREAM_ID(78, "invalid stream id string"),
-    TSDB_CODE_INVALID_CONNECTION(79, "invalid connection string"),
-    TSDB_CODE_ACTION_NOT_BALANCED(80, "dnode not balanced"),
-    TSDB_CODE_CLI_OUT_OF_MEMORY(81, "client out of memory"),
-    TSDB_CODE_DATA_OVERFLOW(82, "data value overflow"),
-    TSDB_CODE_QUERY_CANCELLED(83, "query cancelled"),
-    TSDB_CODE_GRANT_POINT_LIMITED(84, "grant points limited"),
-    TSDB_CODE_GRANT_EXPIRED(85, "grant expired"),
-    TSDB_CODE_CLI_NO_DISKSPACE(86, "client no disk space"),
-    TSDB_CODE_FILE_CORRUPTED(87, "DB file corrupted"),
-    TSDB_CODE_INVALID_CLIENT_VERSION(88, "version of client and server not match");
-
-    private long errCode;
-    private String errMessage;
-    private static Map<Integer, String> errorCodeMap = new HashMap<>(86);
-    static {
-        errorCodeMap.put(0, "success");
-        errorCodeMap.put(1, "in progress");
-        errorCodeMap.put(5, "last session not finished");
-        errorCodeMap.put(6, "invalid session ID");
-        errorCodeMap.put(7, "invalid tran ID");
-        errorCodeMap.put(8, "invalid msg type");
-        errorCodeMap.put(9, "alredy processed");
-        errorCodeMap.put(10, "authentication failure");
-        errorCodeMap.put(11, "wrong msg size");
-        errorCodeMap.put(12, "unexpected response");
-        errorCodeMap.put(13, "invalid response type");
-        errorCodeMap.put(14, "no resource");
-        errorCodeMap.put(15, "invalid time stamp");
-        errorCodeMap.put(16, "mismatched meter ID");
-        errorCodeMap.put(17, "transcation not finished");
-        errorCodeMap.put(18, "not online");
-        errorCodeMap.put(19, "send failed");
-        errorCodeMap.put(20, "not active session");
-        errorCodeMap.put(21, "insert failed");
-        errorCodeMap.put(22, "App error");
-        errorCodeMap.put(23, "invalid IE");
-        errorCodeMap.put(24, "invalid value");
-        errorCodeMap.put(25, "service not available");
-        errorCodeMap.put(26, "already there");
-        errorCodeMap.put(27, "invalid meter ID");
-        errorCodeMap.put(28, "invalid SQL"); // this message often comes with additional info which will vary based on the specific error situation
-        errorCodeMap.put(29, "failed to connect to server");
-        errorCodeMap.put(30, "invalid msg len");
-        errorCodeMap.put(31, "invalid DB");
-        errorCodeMap.put(32, "invalid table");
-        errorCodeMap.put(33, "DB already there");
-        errorCodeMap.put(34, "table already there");
-        errorCodeMap.put(35, "invalid user name");
-        errorCodeMap.put(36, "invalid acct name");
-        errorCodeMap.put(37, "invalid password");
-        errorCodeMap.put(38, "DB not selected");
-        errorCodeMap.put(39, "memory corrupted");
-        errorCodeMap.put(40, "user name exists");
-        errorCodeMap.put(41, "not authorized");
-        errorCodeMap.put(42, "login disconnected); login again");
-        errorCodeMap.put(43, "mgmt master node not available");
-        errorCodeMap.put(44, "not configured");
-        errorCodeMap.put(45, "invalid option");
-        errorCodeMap.put(46, "node offline");
-        errorCodeMap.put(47, "sync required");
-        errorCodeMap.put(48, "more dnodes are needed");
-        errorCodeMap.put(49, "node in unsynced state");
-        errorCodeMap.put(50, "too slow");
-        errorCodeMap.put(51, "others");
-        errorCodeMap.put(52, "can't remove dnode which is master");
-        errorCodeMap.put(53, "wrong schema");
-        errorCodeMap.put(54, "no results");
-        errorCodeMap.put(55, "num of users execeed maxUsers");
-        errorCodeMap.put(56, "num of databases execeed maxDbs");
-        errorCodeMap.put(57, "num of tables execeed maxTables");
-        errorCodeMap.put(58, "num of dnodes execeed maxDnodes");
-        errorCodeMap.put(59, "num of accounts execeed maxAccts");
-        errorCodeMap.put(60, "accout name exists");
-        errorCodeMap.put(61, "dnode ip exists");
-        errorCodeMap.put(62, "sdb error");
-        errorCodeMap.put(63, "metric meta expired"); // local cached metric-meta expired causes error in metric query
-        errorCodeMap.put(64, "not ready"); // peer is not ready to process data
-        errorCodeMap.put(65, "too many sessions on server"); // too many sessions
-        errorCodeMap.put(66, "too many sessions from app"); // too many connections
-        errorCodeMap.put(67, "session to dest is already there");
-        errorCodeMap.put(68, "query list not there); please show again");
-        errorCodeMap.put(69, "server out of memory");
-        errorCodeMap.put(70, "invalid query handle");
-        errorCodeMap.put(71, "tables related to metric exist");
-        errorCodeMap.put(72, "can't drop monitor database or tables");
-        errorCodeMap.put(73, "commit log init failed");
-        errorCodeMap.put(74, "vgroup init failed");
-        errorCodeMap.put(75, "data is already imported");
-        errorCodeMap.put(76, "not supported operation");
-        errorCodeMap.put(77, "invalid query id string");
-        errorCodeMap.put(78, "invalid stream id string");
-        errorCodeMap.put(79, "invalid connection string");
-        errorCodeMap.put(80, "dnode not balanced");
-        errorCodeMap.put(81, "client out of memory");
-        errorCodeMap.put(82, "data value overflow");
-        errorCodeMap.put(83, "query cancelled");
-        errorCodeMap.put(84, "grant points limited");
-        errorCodeMap.put(85, "grant expired");
-        errorCodeMap.put(86, "client no disk space");
-        errorCodeMap.put(87, "DB file corrupted");
-        errorCodeMap.put(88, "version of client and server not match");
-    }
-
-    TSDBError(long code, String message) {
-        this.errCode = code;
-        this.errMessage = message;
-    }
-
-    public long getErrCode() {
-        return this.errCode;
-    }
-
-    public String getErrMessage() {
-        return this.errMessage;
-    }
-
-    public static String getErrMessageByCode(long errCode) {
-        return errorCodeMap.get(errCode);
-    }
-
-}
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 3adb601822567a6a7c515fa405801024e99a4609..0cd185de50d858aec78b60acc4055c1ae99a4cb5 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -19,7 +19,7 @@ import java.sql.SQLWarning;
 import java.util.List;
 
 public class TSDBJNIConnector {
-    static volatile Boolean isInitialized = false;
+    private static volatile Boolean isInitialized = false;
 
     static {
         System.loadLibrary("taos");
@@ -51,8 +51,6 @@ public class TSDBJNIConnector {
 
     /**
      * Returns the status of last result set in current connection
-     *
-     * @return
      */
     public boolean isResultsetClosed() {
         return this.isResultsetClosed;
@@ -99,7 +97,7 @@ public class TSDBJNIConnector {
 
         this.taos = this.connectImp(host, port, dbName, user, password);
         if (this.taos == TSDBConstants.JNI_NULL_POINTER) {
-            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg()), "", this.getErrCode());
+            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(0L)), "", this.getErrCode(0l));
         }
 
         return true;
@@ -112,57 +110,57 @@ public class TSDBJNIConnector {
      *
      * @throws SQLException
      */
-    public int executeQuery(String sql) throws SQLException {
+    public long executeQuery(String sql) throws SQLException {
+    	// close previous result set if the user forgets to invoke the 
+    	// free method to close previous result set.
         if (!this.isResultsetClosed) {
             freeResultSet(taosResultSetPointer);
         }
 
-        int code;
+        Long pSql = 0l;
         try {
-            code = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
+            pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
         } catch (Exception e) {
             e.printStackTrace();
+            this.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
         }
-        affectedRows = code;
-        if (code < 0) {
+        
+        int code = this.getErrCode(pSql);
+        if (code != 0) {
             affectedRows = -1;
-            if (code == TSDBConstants.JNI_TDENGINE_ERROR) {
-                throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg()), "", this.getErrCode());
-            } else {
-                throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode());
-            }
+            String msg = this.getErrMsg(pSql);
+            
+            this.freeResultSet(pSql);
+            throw new SQLException(TSDBConstants.WrapErrMsg(msg), "", code);
         }
 
-        // 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);
-        if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
-            isResultsetClosed = false;
-        }
-        return code;
+        // Try retrieving result set for the executed SQL using the current connection pointer. 
+        taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
+        isResultsetClosed = (taosResultSetPointer == TSDBConstants.JNI_NULL_POINTER);
+        
+        return pSql;
     }
 
-    private native int executeQueryImp(byte[] sqlBytes, long connection);
+    private native long executeQueryImp(byte[] sqlBytes, long connection);
 
     /**
      * Get recent error code by connection
      */
-    public int getErrCode() {
-        return Math.abs(this.getErrCodeImp(this.taos));
+    public int getErrCode(long pSql) {
+        return this.getErrCodeImp(this.taos, pSql);
     }
 
-    private native int getErrCodeImp(long connection);
+    private native int getErrCodeImp(long connection, long pSql);
 
     /**
      * Get recent error message by connection
      */
-    public String getErrMsg() {
-        return this.getErrMsgImp(this.taos);
+    public String getErrMsg(long pSql) {
+        return this.getErrMsgImp(pSql);
     }
 
-    private native String getErrMsgImp(long connection);
+    private native String getErrMsgImp(long pSql);
 
     /**
      * Get resultset pointer
@@ -172,7 +170,13 @@ public class TSDBJNIConnector {
         return taosResultSetPointer;
     }
 
-    private native long getResultSetImp(long connection);
+    private native long getResultSetImp(long connection, long pSql);
+    
+    public boolean isUpdateQuery(long pSql) {
+    	return isUpdateQueryImp(this.taos, pSql) == 1? true:false;
+    }
+    
+    private native long isUpdateQueryImp(long connection, long pSql);
 
     /**
      * Free resultset operation from C to release resultset pointer by JNI
@@ -181,21 +185,20 @@ public class TSDBJNIConnector {
         int res = TSDBConstants.JNI_SUCCESS;
         if (result != taosResultSetPointer && taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
             throw new RuntimeException("Invalid result set pointer");
-        } else if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
+        }
+
+        if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
             res = this.freeResultSetImp(this.taos, result);
-            isResultsetClosed = true; // reset resultSetPointer to 0 after freeResultSetImp() return
             taosResultSetPointer = TSDBConstants.JNI_NULL_POINTER;
-        } else {
-            isResultsetClosed = true;
         }
+        
+        isResultsetClosed = true;
         return res;
     }
 
     /**
      * Close the open result set which is associated to the current connection. If the result set is already
      * closed, return 0 for success.
-     *
-     * @return
      */
     public int freeResultSet() {
         int resCode = TSDBConstants.JNI_SUCCESS;
@@ -212,15 +215,15 @@ public class TSDBJNIConnector {
     /**
      * Get affected rows count
      */
-    public int getAffectedRows() {
+    public int getAffectedRows(long pSql) {
         int affectedRows = this.affectedRows;
         if (affectedRows < 0) {
-            affectedRows = this.getAffectedRowsImp(this.taos);
+            affectedRows = this.getAffectedRowsImp(this.taos, pSql);
         }
         return affectedRows;
     }
 
-    private native int getAffectedRowsImp(long connection);
+    private native int getAffectedRowsImp(long connection, long pSql);
 
     /**
      * Get schema metadata
@@ -248,7 +251,7 @@ public class TSDBJNIConnector {
     public void closeConnection() throws SQLException {
         int code = this.closeConnectionImp(this.taos);
         if (code < 0) {
-            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode());
+            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(0l));
         } else if (code == 0) {
             this.taos = TSDBConstants.JNI_NULL_POINTER;
         } else {
@@ -259,33 +262,33 @@ public class TSDBJNIConnector {
     private native int closeConnectionImp(long connection);
 
     /**
-     * Subscribe to a table in TSDB
+     * Create a subscription
      */
-    public long subscribe(String host, String user, String password, String database, String table, long time, int period) {
-        return subscribeImp(host, user, password, database, table, time, period);
+    long subscribe(String topic, String sql, boolean restart, int period) {
+        return subscribeImp(this.taos, restart, topic, sql, period);
     }
 
-    private native long subscribeImp(String host, String user, String password, String database, String table, long time, int period);
+    private native long subscribeImp(long connection, boolean restart, String topic, String sql, int period);
 
     /**
-     * Consume a subscribed table
+     * Consume a subscription
      */
-    public TSDBResultSetRowData consume(long subscription) {
-        return this.consumeImp(subscription);
+    long consume(long subscription) {
+       return this.consumeImp(subscription);
     }
 
-    private native TSDBResultSetRowData consumeImp(long subscription);
+    private native long consumeImp(long subscription);
 
     /**
-     * Unsubscribe a table
+     * Unsubscribe, close a subscription
      *
      * @param subscription
      */
-    public void unsubscribe(long subscription) {
-        unsubscribeImp(subscription);
+    void unsubscribe(long subscription, boolean isKeep) {
+        unsubscribeImp(subscription, isKeep);
     }
 
-    private native void unsubscribeImp(long subscription);
+    private native void unsubscribeImp(long subscription, boolean isKeep);
 
     /**
      * Validate if a <I>create table</I> sql statement is correct without actually creating that table
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
index 6097ad9c43f517f19c42da94c865a5c1caae65ea..230943fd53ae8fa36b9de40f851a5c263c052f0d 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
@@ -42,8 +42,8 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
 
     private SavedPreparedStatement savedPreparedStatement;
 
-    TSDBPreparedStatement(TSDBJNIConnector connecter, String sql) {
-        super(connecter);
+    TSDBPreparedStatement(TSDBConnection connection, TSDBJNIConnector connecter, String sql) {
+        super(connection, connecter);
         init(sql);
     }
 
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
index 8acf77975630e2f652b79d6c492f98194a943931..961633b8aec4ec433a56522e504fb35495ccfa78 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
@@ -51,47 +51,47 @@ public class TSDBResultSet implements ResultSet {
 	private boolean lastWasNull = false;
 	private final int COLUMN_INDEX_START_VALUE = 1;
 
-    public TSDBJNIConnector getJniConnector() {
-        return jniConnector;
-    }
+	public TSDBJNIConnector getJniConnector() {
+		return jniConnector;
+	}
 
-    public void setJniConnector(TSDBJNIConnector jniConnector) {
-        this.jniConnector = jniConnector;
-    }
+	public void setJniConnector(TSDBJNIConnector jniConnector) {
+		this.jniConnector = jniConnector;
+	}
 
-    public long getResultSetPointer() {
-        return resultSetPointer;
-    }
+	public long getResultSetPointer() {
+		return resultSetPointer;
+	}
 
-    public void setResultSetPointer(long resultSetPointer) {
-        this.resultSetPointer = resultSetPointer;
-    }
+	public void setResultSetPointer(long resultSetPointer) {
+		this.resultSetPointer = resultSetPointer;
+	}
 
-    public List<ColumnMetaData> getColumnMetaDataList() {
-        return columnMetaDataList;
-    }
+	public List<ColumnMetaData> getColumnMetaDataList() {
+		return columnMetaDataList;
+	}
 
-    public void setColumnMetaDataList(List<ColumnMetaData> columnMetaDataList) {
-        this.columnMetaDataList = columnMetaDataList;
-    }
+	public void setColumnMetaDataList(List<ColumnMetaData> columnMetaDataList) {
+		this.columnMetaDataList = columnMetaDataList;
+	}
 
-    public TSDBResultSetRowData getRowData() {
-        return rowData;
-    }
+	public TSDBResultSetRowData getRowData() {
+		return rowData;
+	}
 
-    public void setRowData(TSDBResultSetRowData rowData) {
-        this.rowData = rowData;
-    }
+	public void setRowData(TSDBResultSetRowData rowData) {
+		this.rowData = rowData;
+	}
 
-    public boolean isLastWasNull() {
-        return lastWasNull;
-    }
+	public boolean isLastWasNull() {
+		return lastWasNull;
+	}
 
-    public void setLastWasNull(boolean lastWasNull) {
-        this.lastWasNull = lastWasNull;
-    }
+	public void setLastWasNull(boolean lastWasNull) {
+		this.lastWasNull = lastWasNull;
+	}
 
-    public TSDBResultSet() {
+	public TSDBResultSet() {
 	}
 
 	public TSDBResultSet(TSDBJNIConnector connecter, long resultSetPointer) throws SQLException {
@@ -119,7 +119,7 @@ public class TSDBResultSet implements ResultSet {
 
 	public boolean next() throws SQLException {
 		if (rowData != null) {
-            this.rowData.clear();
+			this.rowData.clear();
 		}
 
 		int code = this.jniConnector.fetchRow(this.resultSetPointer, this.rowData);
@@ -154,119 +154,119 @@ public class TSDBResultSet implements ResultSet {
 	public String getString(int columnIndex) throws SQLException {
 		String res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
-		
-	    this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+
+		this.lastWasNull = this.rowData.wasNull(colIndex);
+		if (!lastWasNull) {
+			res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public boolean getBoolean(int columnIndex) throws SQLException {
-	    boolean res = false;
+		boolean res = false;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
 		if (!lastWasNull) {
-		    res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+			res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public byte getByte(int columnIndex) throws SQLException {
-	    byte res = 0;
+		byte res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
 		if (!lastWasNull) {
-		    res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+			res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public short getShort(int columnIndex) throws SQLException {
-	    short res = 0;
+		short res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
 		if (!lastWasNull) {
-		    res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+			res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public int getInt(int columnIndex) throws SQLException {
-	    int res = 0;
+		int res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public long getLong(int columnIndex) throws SQLException {
-	    long res = 0l;
+		long res = 0l;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public float getFloat(int columnIndex) throws SQLException {
-	    float res = 0;
-	    int colIndex = getTrueColumnIndex(columnIndex);
+		float res = 0;
+		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	public double getDouble(int columnIndex) throws SQLException {
-	    double res = 0;
+		double res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		}
 		return res;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.sql.ResultSet#getBigDecimal(int, int)
-	 * 
+	 *
 	 * @deprecated Use {@code getBigDecimal(int columnIndex)} or {@code
 	 * getBigDecimal(String columnLabel)}
 	 */
 	@Deprecated
 	public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-	    BigDecimal res = null;
+		BigDecimal res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
-        }
+		if (!lastWasNull) {
+			res = new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
+		}
 		return res;
 	}
 
 	public byte[] getBytes(int columnIndex) throws SQLException {
-	    byte[] res = null;
+		byte[] res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType()).getBytes();
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType()).getBytes();
+		}
 		return res;
 	}
 
@@ -281,13 +281,13 @@ public class TSDBResultSet implements ResultSet {
 	}
 
 	public Timestamp getTimestamp(int columnIndex) throws SQLException {
-	    Timestamp res = null;
+		Timestamp res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
 		this.lastWasNull = this.rowData.wasNull(colIndex);
-        if (!lastWasNull) {
-            res = this.rowData.getTimestamp(colIndex);
-        }
+		if (!lastWasNull) {
+			res = this.rowData.getTimestamp(colIndex);
+		}
 		return res;
 	}
 
@@ -297,9 +297,9 @@ public class TSDBResultSet implements ResultSet {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.sql.ResultSet#getUnicodeStream(int)
-	 * 
+	 *
 	 * * @deprecated use <code>getCharacterStream</code> in place of
 	 * <code>getUnicodeStream</code>
 	 */
@@ -409,13 +409,13 @@ public class TSDBResultSet implements ResultSet {
 	}
 
 	public int findColumn(String columnLabel) throws SQLException {
-        Iterator<ColumnMetaData> colMetaDataIt = this.columnMetaDataList.iterator();
-        while (colMetaDataIt.hasNext()) {
-            ColumnMetaData colMetaData = colMetaDataIt.next();
-            if (colMetaData.getColName() != null && colMetaData.getColName().equalsIgnoreCase(columnLabel)) {
-                return colMetaData.getColIndex() + 1;
-            }
-        }
+		Iterator<ColumnMetaData> colMetaDataIt = this.columnMetaDataList.iterator();
+		while (colMetaDataIt.hasNext()) {
+			ColumnMetaData colMetaData = colMetaDataIt.next();
+			if (colMetaData.getColName() != null && colMetaData.getColName().equalsIgnoreCase(columnLabel)) {
+				return colMetaData.getColIndex() + 1;
+			}
+		}
 		throw new SQLException(TSDBConstants.INVALID_VARIABLES);
 	}
 
@@ -882,7 +882,7 @@ public class TSDBResultSet implements ResultSet {
 	}
 
 	public String getNString(int columnIndex) throws SQLException {
-        int colIndex = getTrueColumnIndex(columnIndex);
+		int colIndex = getTrueColumnIndex(columnIndex);
 		return (String) rowData.get(colIndex);
 	}
 
@@ -1017,17 +1017,17 @@ public class TSDBResultSet implements ResultSet {
 	public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
 		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
 	}
-	
+
 	private int getTrueColumnIndex(int columnIndex) throws SQLException {
 		if (columnIndex < this.COLUMN_INDEX_START_VALUE) {
 			throw new SQLException("Column Index out of range, " + columnIndex + " < " + this.COLUMN_INDEX_START_VALUE);
 		}
-		
+
 		int numOfCols = this.columnMetaDataList.size();
 		if (columnIndex > numOfCols) {
 			throw new SQLException("Column Index out of range, " + columnIndex + " > " + numOfCols);
 		}
-		
+
 		return columnIndex - 1;
 	}
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
index 455b73bb927b8253f967d975a9030482c097f00c..5c6b0545e91a13b793478efa1ec687e616d1a9ef 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
@@ -19,276 +19,312 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TSDBStatement implements Statement {
-	private TSDBJNIConnector connecter = null;
+    private TSDBJNIConnector connecter = null;
 
-	/** To store batched commands */
-	protected List<String> batchedArgs;
+    /**
+     * To store batched commands
+     */
+    protected List<String> batchedArgs;
+
+    /**
+     * Timeout for a query
+     */
+    protected int queryTimeout = 0;
 
-	/** Timeout for a query */
-	protected int queryTimeout = 0;
+    private Long pSql = 0l;
 
     /**
      * Status of current statement
      */
-	private boolean isClosed = true;
+    private boolean isClosed = true;
+    private int affectedRows = 0;
+
+    private TSDBConnection connection;
 
-	TSDBStatement(TSDBJNIConnector connecter) {
-		this.connecter = connecter;
-		this.isClosed = false;
-	}
+    public void setConnection(TSDBConnection connection) {
+        this.connection = connection;
+    }
 
-	public <T> T unwrap(Class<T> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    TSDBStatement(TSDBConnection connection, TSDBJNIConnector connecter) {
+        this.connection = connection;
+        this.connecter = connecter;
+        this.isClosed = false;
+    }
 
-	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public ResultSet executeQuery(String sql) throws SQLException {
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public ResultSet executeQuery(String sql) throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		this.connecter.executeQuery(sql);
 
-		long resultSetPointer = this.connecter.getResultSet();
+        // TODO make sure it is not a update query
+        pSql = this.connecter.executeQuery(sql);
+
+        long resultSetPointer = this.connecter.getResultSet();
 
-		if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		} else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
-			return null;
-		} else {
-			return new TSDBResultSet(this.connecter, resultSetPointer);
-		}
-	}
+        if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
+            this.connecter.freeResultSet(pSql);
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+
+        // create/insert/update/delete/alter
+        if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
+            this.connecter.freeResultSet(pSql);
+            return null;
+        }
+
+        if (!this.connecter.isUpdateQuery(pSql)) {
+            return new TSDBResultSet(this.connecter, resultSetPointer);
+        } else {
+            this.connecter.freeResultSet(pSql);
+            return null;
+        }
 
-	public int executeUpdate(String sql) throws SQLException {
+    }
+
+    public int executeUpdate(String sql) throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		int res = this.connecter.executeQuery(sql);
-		long resultSetPointer = this.connecter.getResultSet();
-
-		if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		} else if (resultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
-			this.connecter.freeResultSet();
-			throw new SQLException("The executed SQL is not a DML or a DDL");
-		} else {
-			return res;
-		}
-	}
-
-	public String getErrorMsg() {
-		return this.connecter.getErrMsg();
-	}
-
-	public void close() throws SQLException {
+
+        // TODO check if current query is update query
+        pSql = this.connecter.executeQuery(sql);
+        long resultSetPointer = this.connecter.getResultSet();
+
+        if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
+            this.connecter.freeResultSet(pSql);
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+
+        this.affectedRows = this.connecter.getAffectedRows(pSql);
+        this.connecter.freeResultSet(pSql);
+
+        return this.affectedRows;
+    }
+
+    public String getErrorMsg(long pSql) {
+        return this.connecter.getErrMsg(pSql);
+    }
+
+    public void close() throws SQLException {
         if (!isClosed) {
             if (!this.connecter.isResultsetClosed()) {
                 this.connecter.freeResultSet();
             }
             isClosed = true;
         }
-	}
+    }
 
-	public int getMaxFieldSize() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public int getMaxFieldSize() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public void setMaxFieldSize(int max) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public void setMaxFieldSize(int max) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public int getMaxRows() throws SQLException {
-		// always set maxRows to zero, meaning unlimitted rows in a resultSet
-		return 0;
-	}
+    public int getMaxRows() throws SQLException {
+        // always set maxRows to zero, meaning unlimitted rows in a resultSet
+        return 0;
+    }
 
-	public void setMaxRows(int max) throws SQLException {
-		// always set maxRows to zero, meaning unlimitted rows in a resultSet
-	}
+    public void setMaxRows(int max) throws SQLException {
+        // always set maxRows to zero, meaning unlimitted rows in a resultSet
+    }
 
-	public void setEscapeProcessing(boolean enable) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public void setEscapeProcessing(boolean enable) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public int getQueryTimeout() throws SQLException {
-		return queryTimeout;
-	}
+    public int getQueryTimeout() throws SQLException {
+        return queryTimeout;
+    }
 
-	public void setQueryTimeout(int seconds) throws SQLException {
-		this.queryTimeout = seconds;
-	}
+    public void setQueryTimeout(int seconds) throws SQLException {
+        this.queryTimeout = seconds;
+    }
 
-	public void cancel() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public void cancel() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public SQLWarning getWarnings() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public SQLWarning getWarnings() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public void clearWarnings() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public void clearWarnings() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public void setCursorName(String name) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+    public void setCursorName(String name) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 
-	public boolean execute(String sql) throws SQLException {
+    public boolean execute(String sql) throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-	    boolean res = true;
-	    this.connecter.executeQuery(sql);
-	    long resultSetPointer = this.connecter.getResultSet();
+        boolean res = true;
+        pSql = this.connecter.executeQuery(sql);
+        long resultSetPointer = this.connecter.getResultSet();
 
         if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
+            this.connecter.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
         } else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
             // no result set is retrieved
+            this.connecter.freeResultSet(pSql);
             res = false;
         }
+
         return res;
-	}
+    }
 
-	public ResultSet getResultSet() throws SQLException {
+    public ResultSet getResultSet() throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		long resultSetPointer = connecter.getResultSet();
-		TSDBResultSet resSet = null;
+        long resultSetPointer = connecter.getResultSet();
+        TSDBResultSet resSet = null;
         if (resultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
             resSet = new TSDBResultSet(connecter, resultSetPointer);
         }
-		return resSet;
-	}
+        return resSet;
+    }
 
-	public int getUpdateCount() throws SQLException {
+    public int getUpdateCount() throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		return this.connecter.getAffectedRows();
-	}
-
-	public boolean getMoreResults() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void setFetchDirection(int direction) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int getFetchDirection() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	/*
-	 * used by spark
-	 */
-	public void setFetchSize(int rows) throws SQLException {
-	}
-
-	/*
-	 * used by spark
-	 */
-	public int getFetchSize() throws SQLException {
-		return 4096;
-	}
-
-	public int getResultSetConcurrency() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int getResultSetType() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void addBatch(String sql) throws SQLException {
-		if (batchedArgs == null) {
-			batchedArgs = new ArrayList<String>();
-		}
-		batchedArgs.add(sql);
-	}
-
-	public void clearBatch() throws SQLException {
-		batchedArgs.clear();
-	}
-
-	public int[] executeBatch() throws SQLException {
+
+        return this.affectedRows;
+    }
+
+    public boolean getMoreResults() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void setFetchDirection(int direction) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int getFetchDirection() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    /*
+     * used by spark
+     */
+    public void setFetchSize(int rows) throws SQLException {
+    }
+
+    /*
+     * used by spark
+     */
+    public int getFetchSize() throws SQLException {
+        return 4096;
+    }
+
+    public int getResultSetConcurrency() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int getResultSetType() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void addBatch(String sql) throws SQLException {
+        if (batchedArgs == null) {
+            batchedArgs = new ArrayList<>();
+        }
+        batchedArgs.add(sql);
+    }
+
+    public void clearBatch() throws SQLException {
+        batchedArgs.clear();
+    }
+
+    public int[] executeBatch() throws SQLException {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		if (batchedArgs == null) {
-			throw new SQLException(TSDBConstants.WrapErrMsg("Batch is empty!"));
-		} else {
-			int[] res = new int[batchedArgs.size()];
-			for (int i = 0; i < batchedArgs.size(); i++) {
-				res[i] = executeUpdate(batchedArgs.get(i));
-			}
-			return res;
-		}
-	}
-
-	public Connection getConnection() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean getMoreResults(int current) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public ResultSet getGeneratedKeys() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean execute(String sql, String[] columnNames) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public int getResultSetHoldability() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean isClosed() throws SQLException {
-	    return isClosed;
-	}
-
-	public void setPoolable(boolean poolable) throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean isPoolable() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public void closeOnCompletion() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
-
-	public boolean isCloseOnCompletion() throws SQLException {
-		throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
-	}
+        if (batchedArgs == null) {
+            throw new SQLException(TSDBConstants.WrapErrMsg("Batch is empty!"));
+        } else {
+            int[] res = new int[batchedArgs.size()];
+            for (int i = 0; i < batchedArgs.size(); i++) {
+                res[i] = executeUpdate(batchedArgs.get(i));
+            }
+            return res;
+        }
+    }
+
+    public Connection getConnection() throws SQLException {
+        if (this.connecter != null)
+            return this.connection;
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean getMoreResults(int current) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public ResultSet getGeneratedKeys() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean execute(String sql, String[] columnNames) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public int getResultSetHoldability() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean isClosed() throws SQLException {
+        return isClosed;
+    }
+
+    public void setPoolable(boolean poolable) throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean isPoolable() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public void closeOnCompletion() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
+
+    public boolean isCloseOnCompletion() throws SQLException {
+        throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
+    }
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
new file mode 100644
index 0000000000000000000000000000000000000000..deffd9aa2ae88802f71af5cbec66c5896cf4e19a
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
@@ -0,0 +1,70 @@
+/***************************************************************************
+ * 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/>.
+ *****************************************************************************/
+package com.taosdata.jdbc;
+
+import javax.management.OperationsException;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.TimerTask;
+import java.util.concurrent.*;
+
+public class TSDBSubscribe {
+    private TSDBJNIConnector connecter = null;
+    private long id = 0;
+
+    TSDBSubscribe(TSDBJNIConnector connecter, long id) throws SQLException {
+        if (null != connecter) {
+            this.connecter = connecter;
+            this.id = id;
+        } else {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+    }
+
+    /**
+     * consume
+     *
+     * @throws OperationsException, SQLException
+     */
+    public TSDBResultSet consume() throws OperationsException, SQLException {
+        if (this.connecter.isClosed()) {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+
+        long resultSetPointer = this.connecter.consume(this.id);
+
+        if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        } else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
+            return null;
+        } else {
+            return new TSDBResultSet(this.connecter, resultSetPointer);
+        }
+    }
+
+    /**
+     * close subscription
+     *
+     * @param keepProgress
+     * @throws SQLException
+     */
+    public void close(boolean keepProgress) throws SQLException {
+        if (this.connecter.isClosed()) {
+            throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+        }
+        this.connecter.unsubscribe(this.id, keepProgress);
+    }
+}
+
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribeCallBack.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribeCallBack.java
new file mode 100644
index 0000000000000000000000000000000000000000..c1b9b02fa85f8e2197f41d75f8f0c25b3f4c416c
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribeCallBack.java
@@ -0,0 +1,19 @@
+/***************************************************************************
+ * 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/>.
+ *****************************************************************************/
+package com.taosdata.jdbc;
+
+public interface TSDBSubscribeCallBack {
+    void invoke(TSDBResultSet resultSet);
+}
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
index 7e144cbe0f032b6e675749fce704e171f75f2d94..066dfad5d50fb5fcb31c00a645ccc0487f6a594e 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
@@ -23,6 +23,7 @@ import java.sql.SQLException;
 public class SqlSyntaxValidator {
 
     private TSDBConnection tsdbConnection;
+
     public SqlSyntaxValidator(Connection connection) {
         this.tsdbConnection = (TSDBConnection) connection;
     }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java
new file mode 100644
index 0000000000000000000000000000000000000000..800265868da6da5047453d542fc9e37c69fe1e36
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNode.java
@@ -0,0 +1,272 @@
+package com.taosdata.jdbc.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class TDNode {
+    
+    private int index;
+    private int running;
+    private int deployed;
+    private boolean testCluster;    
+    private String path;    
+    private String cfgDir;
+    private String dataDir;
+    private String logDir;
+    private String cfgPath;
+
+    public TDNode(int index) {
+        this.index = index;
+        running = 0;
+        deployed = 0;
+        testCluster = false;            
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public void setTestCluster(boolean testCluster) {
+        this.testCluster = testCluster;
+    }
+
+    public void setRunning(int running) {
+        this.running = running;
+    }
+
+    public void searchTaosd(File dir, ArrayList<String> taosdPath) {        
+        File[] fileList = dir.listFiles();
+        
+        if(fileList == null || fileList.length == 0) {
+            return;
+        }
+        
+        for(File file : fileList) {
+            if(file.isFile()) {
+                if(file.getName().equals("taosd")) {                        
+                    taosdPath.add(file.getAbsolutePath());
+                }
+            } else {
+                searchTaosd(file, taosdPath);
+            } 
+        }        
+    }
+
+    public void start() {
+        String selfPath = System.getProperty("user.dir");
+        String binPath = "";
+        String projDir = selfPath + "/../../../";
+
+        try {
+            ArrayList<String> taosdPath = new ArrayList<>();
+            
+            File dir = new File(projDir);
+            String realProjDir = dir.getCanonicalPath();
+            dir = new File(realProjDir);
+            System.out.println("project Dir: " + projDir);
+            searchTaosd(dir, taosdPath);
+                        
+            if(taosdPath.size() == 0) {
+                System.out.println("The project path doens't exist");
+                return;
+            } else {
+                for(String p : taosdPath) {
+                    if(!p.contains("packaging")) {
+                        binPath = p;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if(binPath.isEmpty()) {
+            System.out.println("taosd not found");
+            return;
+        } else {
+            System.out.println("taosd found in " + binPath);
+        }
+
+        if(this.deployed == 0) {
+            System.out.println("dnode" + index + "is not deployed");
+            return;
+        }
+
+        String cmd = "nohup " + binPath + " -c " + cfgDir + " > /dev/null 2>&1 & "; 
+        System.out.println("start taosd cmd: " + cmd);
+        
+        try{
+            Runtime.getRuntime().exec(cmd);  
+            TimeUnit.SECONDS.sleep(5);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        this.running = 1;        
+    }
+
+    public Integer getTaosdPid() {
+        String cmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"; 
+        String[] cmds = {"sh", "-c", cmd};
+        try {
+            Process process = Runtime.getRuntime().exec(cmds);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line = null;
+            Integer res = null;
+            while((line = reader.readLine()) != null) {
+                if(!line.isEmpty()) {
+                    res = Integer.valueOf(line);
+                    break;
+                }
+            }
+            
+            return res;
+        } catch (Exception e) {
+            e.printStackTrace();
+        } 
+        return null;
+    }
+
+    public void stop() {        
+
+        if (this.running != 0) {
+            Integer pid = null;                        
+            while((pid = getTaosdPid()) != null) {
+                
+                String killCmd = "kill -term " + pid;                                      
+                String[] killCmds = {"sh", "-c", killCmd};
+                try {                                
+                    Runtime.getRuntime().exec(killCmds).waitFor();                    
+
+                    TimeUnit.SECONDS.sleep(2);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }                
+            }
+
+            try {
+                for(int port = 6030; port < 6041; port ++) {
+                    String fuserCmd = "fuser -k -n tcp " + port;
+                    Runtime.getRuntime().exec(fuserCmd).waitFor();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            this.running = 0;
+            System.out.println("dnode:" + this.index + " is stopped by kill -term");
+        }
+    }
+
+    public void startIP() {
+        try{
+            String cmd = "sudo ifconfig lo:" + index + "192.168.0." + index + " up";        
+            Runtime.getRuntime().exec(cmd).waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void stopIP() {
+        try{
+            String cmd = "sudo ifconfig lo:" + index + "192.168.0." + index + " down";            
+            Runtime.getRuntime().exec(cmd).waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setCfgConfig(String option, String value) {
+        try{
+            String cmd = "echo " + option + " " + value + " >> " + this.cfgPath;
+            String[] cmdLine = {"sh", "-c", cmd};
+            Process ps = Runtime.getRuntime().exec(cmdLine);
+            ps.waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getDnodeRootDir() {
+        String dnodeRootDir = this.path + "/sim/psim/dnode" + this.index;
+        return dnodeRootDir;
+    }
+
+    public String getDnodesRootDir() {
+        String dnodesRootDir = this.path + "/sim/psim" + this.index;
+        return dnodesRootDir;
+    }
+
+    public void deploy() {
+        this.logDir = this.path + "/sim/dnode" + this.index + "/log";
+        this.dataDir = this.path + "/sim/dnode" + this.index + "/data";
+        this.cfgDir = this.path + "/sim/dnode" + this.index + "/cfg";
+        this.cfgPath = this.path + "/sim/dnode" + this.index + "/cfg/taos.cfg";
+
+        try {        
+            String cmd = "rm -rf " + this.logDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+            
+            cmd = "rm -rf " + this.cfgDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+
+            cmd = "rm -rf " + this.dataDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+
+            cmd = "mkdir -p " + this.logDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+
+            cmd = "mkdir -p " + this.cfgDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+
+            cmd = "mkdir -p " + this.dataDir;
+            Runtime.getRuntime().exec(cmd).waitFor();
+
+            cmd = "touch " + this.cfgPath;
+            Runtime.getRuntime().exec(cmd).waitFor();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }        
+
+        if(this.testCluster) {
+            startIP();
+            setCfgConfig("masterIp", "192.168.0.1");
+            setCfgConfig("secondIp", "192.168.0.2");
+            setCfgConfig("publicIp", "192.168.0." + this.index);
+            setCfgConfig("internalIp", "192.168.0." + this.index);
+            setCfgConfig("privateIp", "192.168.0." + this.index);
+        }
+        setCfgConfig("dataDir", this.dataDir);
+        setCfgConfig("logDir", this.logDir);
+        setCfgConfig("numOfLogLines", "1000000/00");
+        setCfgConfig("mnodeEqualVnodeNum", "0");
+        setCfgConfig("walLevel", "1");
+        setCfgConfig("statusInterval", "1");
+        setCfgConfig("numOfMnodes", "3");
+        setCfgConfig("numOfThreadsPerCore", "2.0");
+        setCfgConfig("monitor", "0");
+        setCfgConfig("maxVnodeConnections", "30000");
+        setCfgConfig("maxMgmtConnections", "30000");
+        setCfgConfig("maxMeterConnections", "30000");
+        setCfgConfig("maxShellConns", "30000");
+        setCfgConfig("locale", "en_US.UTF-8");
+        setCfgConfig("charset", "UTF-8");
+        setCfgConfig("asyncLog", "0");
+        setCfgConfig("anyIp", "0");
+        setCfgConfig("dDebugFlag", "135");
+        setCfgConfig("mDebugFlag", "135");
+        setCfgConfig("sdbDebugFlag", "135");
+        setCfgConfig("rpcDebugFlag", "135");
+        setCfgConfig("tmrDebugFlag", "131");
+        setCfgConfig("cDebugFlag", "135");
+        setCfgConfig("httpDebugFlag", "135");
+        setCfgConfig("monitorDebugFlag", "135");
+        setCfgConfig("udebugFlag", "135");
+        setCfgConfig("jnidebugFlag", "135");
+        setCfgConfig("qdebugFlag", "135"); 
+        this.deployed = 1;
+    }
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNodes.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNodes.java
new file mode 100644
index 0000000000000000000000000000000000000000..efc4c53e2864789811ca30110f9b69e5f685a89e
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/TDNodes.java
@@ -0,0 +1,72 @@
+package com.taosdata.jdbc.utils;
+
+import java.io.File;
+import java.util.*;
+
+public class TDNodes {
+    private ArrayList<TDNode> tdNodes; 
+    private boolean testCluster;     
+
+    public TDNodes () {
+        tdNodes = new ArrayList<>();
+        for(int i = 1; i < 11; i ++) {            
+            tdNodes.add(new TDNode(i));
+        }               
+    }
+
+    public void setTestCluster(boolean testCluster) {
+        this.testCluster = testCluster;
+    }
+
+    public void check(int index) {
+        if(index < 1 || index > 10) {
+            System.out.println("index: " + index + " should on a scale of [1, 10]");
+            return;
+        }
+    } 
+
+    public void deploy(int index) {
+        try {     
+            File file = new File(System.getProperty("user.dir") + "/../../../");
+            String projectRealPath = file.getCanonicalPath();
+            check(index);        
+            tdNodes.get(index - 1).setTestCluster(this.testCluster);            
+            tdNodes.get(index - 1).setPath(projectRealPath); 
+            tdNodes.get(index - 1).deploy();
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("deploy Test Exception");
+        }
+    }
+    
+    public void cfg(int index, String option, String value) {
+        check(index);
+        tdNodes.get(index - 1).setCfgConfig(option, value);
+    }
+
+    public TDNode getTDNode(int index) {
+        check(index);
+        return tdNodes.get(index - 1);
+    }
+    
+    public void start(int index) {
+        check(index);
+        tdNodes.get(index - 1).start();
+    }
+
+    public void stop(int index) {
+        check(index);
+        tdNodes.get(index - 1).stop();
+    }
+    
+    public void startIP(int index) {
+        check(index);
+        tdNodes.get(index - 1).startIP();
+    }
+
+    public void stopIP(int index) {
+        check(index);
+        tdNodes.get(index - 1).stopIP();
+    }
+
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/TestPreparedStatement.java b/src/connector/jdbc/src/test/java/TestPreparedStatement.java
index 2e2cc0ede6ae88c9b43c4890894378f13a3cc14a..1edb957493183c407b668bd68532e83fa1a64dba 100644
--- a/src/connector/jdbc/src/test/java/TestPreparedStatement.java
+++ b/src/connector/jdbc/src/test/java/TestPreparedStatement.java
@@ -6,24 +6,31 @@ import java.util.Properties;
 
 public class TestPreparedStatement {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws SQLException {
+        Connection connection = null;
         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";
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
+            String rawSql = "select * from test.log0601";
 //            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));
+                    System.out.printf("%d: %s \n", i, resSet.getString(i));
                 }
             }
+            resSet.close();
+            pstmt.close();
+            connection.close();
 
         } catch (Exception e) {
             e.printStackTrace();
+            if (null != connection) {
+                connection.close();
+            }
         }
     }
 }
diff --git a/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java b/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
index 519d7c6ab1f89f08795c1ff010bc5de1e5491f05..39a08f0fe98a279e62ca07f20047813edeab56db 100644
--- a/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
+++ b/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
@@ -1,29 +1,33 @@
 import com.taosdata.jdbc.TSDBDriver;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
+import java.sql.*;
 import java.util.Properties;
 
 public class TestTSDBDatabaseMetaData {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws SQLException {
+        Connection connection = null;
+        DatabaseMetaData dbMetaData = null;
+        ResultSet resSet = null;
         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();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
+            dbMetaData = connection.getMetaData();
+            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));
                 }
             }
+            resSet.close();
 
         } catch (Exception e) {
             e.printStackTrace();
+            if (null != connection) {
+                connection.close();
+            }
         }
     }
 }
diff --git a/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java b/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
new file mode 100644
index 0000000000000000000000000000000000000000..47acb200649be4c8c6af5817c2ef4c074a2a3fa0
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
@@ -0,0 +1,78 @@
+import com.taosdata.jdbc.TSDBConnection;
+import com.taosdata.jdbc.TSDBDriver;
+import com.taosdata.jdbc.TSDBResultSet;
+import com.taosdata.jdbc.TSDBSubscribe;
+
+import java.sql.DriverManager;
+import java.util.Properties;
+
+public class TestTSDBSubscribe {
+
+    public static TSDBConnection connectTDengine(String host, String database) throws Exception {
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+
+        String cs = String.format("jdbc:TAOS://%s:0/%s", host, database);
+        return (TSDBConnection)DriverManager.getConnection(cs, properties);
+    }
+
+    public static void main(String[] args) throws Exception {
+        String usage = "java -Djava.ext.dirs=../ TestTSDBSubscribe [-host host] <-db database> <-topic topic> <-sql sql>";
+        if (args.length < 2) {
+            System.err.println(usage);
+            return;
+        }
+
+        String host = "localhost", database = "", topic = "", sql = "";
+        for (int i = 0; i < args.length; i++) {
+            if ("-db".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                database = args[++i];
+            }
+            if ("-topic".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                topic = args[++i];
+            }
+            if ("-host".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                host = args[++i];
+            }
+            if ("-sql".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                sql = args[++i];
+            }
+        }
+        if (database.isEmpty() || topic.isEmpty() || sql.isEmpty()) {
+             System.err.println(usage);
+             return;
+        }
+
+        TSDBConnection connection = null;
+        TSDBSubscribe sub = null;
+        try {
+            connection = connectTDengine(host, database);
+            sub = ((TSDBConnection) connection).subscribe(topic, sql, false);
+
+            int total = 0;
+            while(true) {
+                TSDBResultSet rs = sub.consume();
+                int count = 0;
+                while(rs.next()) {
+                    count++;
+                }
+                total += count;
+                System.out.printf("%d rows consumed, total %d\n", count, total);
+                Thread.sleep(900);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (null != sub) {
+                sub.close(true);
+            }
+            if (null != connection) {
+                connection.close();
+            }
+        }
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b793a47c990a930579b749b1eec95abed6ad554e
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java
@@ -0,0 +1,33 @@
+package com.taosdata.jdbc;
+
+import com.taosdata.jdbc.utils.TDNodes;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public class BaseTest {
+
+    private static boolean testCluster = false;           
+    private static TDNodes nodes = new TDNodes();
+    
+    @BeforeClass
+    public static void setupEnv() {
+        try{                         
+            if (nodes.getTDNode(1).getTaosdPid() != null) {
+                System.out.println("Kill taosd before running JDBC test");
+                nodes.getTDNode(1).setRunning(1);
+                nodes.stop(1);
+            }
+            nodes.setTestCluster(testCluster);  
+            nodes.deploy(1);
+            nodes.start(1);
+        } catch (Exception e) {
+            e.printStackTrace();            
+        }
+    }
+
+    @AfterClass
+    public static void cleanUpEnv() {
+        nodes.stop(1);
+    }
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d96cbb5381d099f7b67ecdb5414093c54b37b65
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
@@ -0,0 +1,120 @@
+package com.taosdata.jdbc;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class BatchInsertTest extends BaseTest {
+
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String stbName = "meters";
+    static String host = "localhost";
+    static int numOfTables = 30;
+    final static int numOfRecordsPerTable = 1000;
+    static long ts = 1496732686000l;
+    final static String tablePrefix = "t";
+
+    @Before
+    public void createDatabase() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+                
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("use " + dbName);
+
+        String createTableSql = "create table " + stbName + "(ts timestamp, f1 int, f2 int, f3 int) tags(areaid int, loc binary(20))";  
+        statement.executeUpdate(createTableSql); 
+
+        for(int i = 0; i < numOfTables; i++) {
+            String loc = i % 2 == 0 ? "beijing" : "shanghai";
+            String createSubTalbesSql = "create table " + tablePrefix + i + " using " + stbName + " tags(" + i + ", '" + loc + "')";             
+            statement.executeUpdate(createSubTalbesSql); 
+        }
+
+    }
+    
+    @Test
+    public void testBatchInsert() throws SQLException{
+        
+        ExecutorService executorService = Executors.newFixedThreadPool(numOfTables);        
+                    
+        for (int i = 0; i < numOfTables; i++) { 
+            final int index = i;                       
+            executorService.execute(new Runnable() {
+                @Override
+                public void run() {                    
+                    try {                        
+                        long startTime = System.currentTimeMillis();                        
+                        Statement statement = connection.createStatement(); // get statement                        
+                        StringBuilder sb = new StringBuilder();
+                        sb.append("INSERT INTO " + tablePrefix + index + " VALUES");
+                        Random rand = new Random();
+                        for (int j = 1; j <= numOfRecordsPerTable; j++) {
+                            sb.append("(" + (ts + j) + ", ");
+                            sb.append(rand.nextInt(100) + ", ");
+                            sb.append(rand.nextInt(100) + ", ");
+                            sb.append(rand.nextInt(100) + ")");                            
+                        }                        
+                        statement.addBatch(sb.toString());                        
+                        statement.executeBatch();
+                        long endTime = System.currentTimeMillis();
+                        System.out.println("Thread " + index + " takes " + (endTime - startTime) +  " microseconds");
+                        connection.commit();                                                
+                        statement.close();                        
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+
+        executorService.shutdown();
+
+        try {
+            executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        Statement statement = connection.createStatement();
+        ResultSet rs = statement.executeQuery("select * from meters"); 
+        int num = 0;
+        while (rs.next()) {
+            num++;
+        }           
+        assertEquals(num, numOfTables * numOfRecordsPerTable);        
+        rs.close();
+    }
+
+
+    @After
+    public void close() throws Exception {        
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+    }
+    
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a54ece4eadc54e930a4af4faddb58dfef3ceb25a
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
@@ -0,0 +1,60 @@
+package com.taosdata.jdbc;
+
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static org.junit.Assert.assertTrue;
+
+public class ConnectionTest extends BaseTest {
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String stbName = "st";
+    static String host = "localhost";
+
+    @Test
+    public void testConnection() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        assertTrue(null != connection);
+        statement = connection.createStatement();
+        assertTrue(null != statement);
+
+        // try reconnect
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        try {
+            statement.execute("create database if not exists " + dbName);
+        } catch (SQLException e) {
+            assert false : "create database error: " + e.getMessage();
+        }
+
+        try {
+            if (!connection.isClosed()) {
+                if (!statement.isClosed()) {
+                    statement.executeUpdate("drop database " + dbName);
+                    statement.close();
+                }
+                connection.close();
+                Thread.sleep(10);
+            }
+        } catch (Exception e) {
+            assert false : "close connection error: " + e.getMessage();
+        }
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..284af3dfe75f7c436ec2ce875714afc235c525d8
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
@@ -0,0 +1,244 @@
+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class DatabaseMetaDataTest extends BaseTest {
+    static Connection connection = null;
+    static PreparedStatement statement = null;
+    static String dbName = "test";
+    static String tName = "t0";
+    static String host = "localhost";
+
+    @BeforeClass
+    public static void createConnection() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        String sql = "drop database if exists " + dbName;
+        statement = (TSDBPreparedStatement) connection.prepareStatement(sql);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+    }
+
+    @Test
+    public void testMetaDataTest() throws SQLException {
+
+        DatabaseMetaData databaseMetaData = connection.getMetaData();
+        ResultSet resultSet = databaseMetaData.getTables(dbName, "t*", "t*", new String[]{"t"});
+        while (resultSet.next()) {
+            for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
+                System.out.printf("%d: %s\n", i, resultSet.getString(i));
+            }
+        }
+        resultSet.close();
+        databaseMetaData.isWrapperFor(null);
+        databaseMetaData.allProceduresAreCallable();
+        databaseMetaData.allTablesAreSelectable();
+        databaseMetaData.getURL();
+        databaseMetaData.getUserName();
+        databaseMetaData.isReadOnly();
+        databaseMetaData.nullsAreSortedHigh();
+        databaseMetaData.nullsAreSortedLow();
+        databaseMetaData.nullsAreSortedAtStart();
+        databaseMetaData.nullsAreSortedAtEnd();
+        databaseMetaData.getDatabaseProductName();
+        databaseMetaData.getDatabaseProductVersion();
+        databaseMetaData.getDriverName();
+        databaseMetaData.getDriverVersion();
+        databaseMetaData.getDriverMajorVersion();
+        databaseMetaData.getDriverMinorVersion();
+        databaseMetaData.usesLocalFiles();
+        databaseMetaData.usesLocalFilePerTable();
+        databaseMetaData.supportsMixedCaseIdentifiers();
+        databaseMetaData.storesUpperCaseIdentifiers();
+        databaseMetaData.storesLowerCaseIdentifiers();
+        databaseMetaData.storesMixedCaseIdentifiers();
+        databaseMetaData.supportsMixedCaseQuotedIdentifiers();
+        databaseMetaData.storesUpperCaseQuotedIdentifiers();
+        databaseMetaData.storesLowerCaseQuotedIdentifiers();
+        databaseMetaData.storesMixedCaseQuotedIdentifiers();
+        databaseMetaData.getIdentifierQuoteString();
+        databaseMetaData.getSQLKeywords();
+        databaseMetaData.getNumericFunctions();
+        databaseMetaData.getStringFunctions();
+        databaseMetaData.getSystemFunctions();
+        databaseMetaData.getTimeDateFunctions();
+        databaseMetaData.getSearchStringEscape();
+        databaseMetaData.getExtraNameCharacters();
+        databaseMetaData.supportsAlterTableWithAddColumn();
+        databaseMetaData.supportsAlterTableWithDropColumn();
+        databaseMetaData.supportsColumnAliasing();
+        databaseMetaData.nullPlusNonNullIsNull();
+        databaseMetaData.supportsConvert();
+        databaseMetaData.supportsConvert(0, 0);
+        databaseMetaData.supportsTableCorrelationNames();
+        databaseMetaData.supportsDifferentTableCorrelationNames();
+        databaseMetaData.supportsExpressionsInOrderBy();
+        databaseMetaData.supportsOrderByUnrelated();
+        databaseMetaData.supportsGroupBy();
+        databaseMetaData.supportsGroupByUnrelated();
+        databaseMetaData.supportsGroupByBeyondSelect();
+        databaseMetaData.supportsLikeEscapeClause();
+        databaseMetaData.supportsMultipleResultSets();
+        databaseMetaData.supportsMultipleTransactions();
+        databaseMetaData.supportsNonNullableColumns();
+        databaseMetaData.supportsMinimumSQLGrammar();
+        databaseMetaData.supportsCoreSQLGrammar();
+        databaseMetaData.supportsExtendedSQLGrammar();
+        databaseMetaData.supportsANSI92EntryLevelSQL();
+        databaseMetaData.supportsANSI92IntermediateSQL();
+        databaseMetaData.supportsANSI92FullSQL();
+        databaseMetaData.supportsIntegrityEnhancementFacility();
+        databaseMetaData.supportsOuterJoins();
+        databaseMetaData.supportsFullOuterJoins();
+        databaseMetaData.supportsLimitedOuterJoins();
+        databaseMetaData.getSchemaTerm();
+        databaseMetaData.getProcedureTerm();
+        databaseMetaData.getCatalogTerm();
+        databaseMetaData.isCatalogAtStart();
+        databaseMetaData.getCatalogSeparator();
+        databaseMetaData.supportsSchemasInDataManipulation();
+        databaseMetaData.supportsSchemasInProcedureCalls();
+        databaseMetaData.supportsSchemasInTableDefinitions();
+        databaseMetaData.supportsSchemasInIndexDefinitions();
+        databaseMetaData.supportsSchemasInPrivilegeDefinitions();
+        databaseMetaData.supportsCatalogsInDataManipulation();
+        databaseMetaData.supportsCatalogsInProcedureCalls();
+        databaseMetaData.supportsCatalogsInTableDefinitions();
+        databaseMetaData.supportsCatalogsInIndexDefinitions();
+        databaseMetaData.supportsCatalogsInPrivilegeDefinitions();
+        databaseMetaData.supportsPositionedDelete();
+        databaseMetaData.supportsPositionedUpdate();
+        databaseMetaData.supportsSelectForUpdate();
+        databaseMetaData.supportsStoredProcedures();
+        databaseMetaData.supportsSubqueriesInComparisons();
+        databaseMetaData.supportsSubqueriesInExists();
+        databaseMetaData.supportsSubqueriesInIns();
+        databaseMetaData.supportsSubqueriesInQuantifieds();
+        databaseMetaData.supportsCorrelatedSubqueries();
+        databaseMetaData.supportsUnion();
+        databaseMetaData.supportsUnionAll();
+        databaseMetaData.supportsOpenCursorsAcrossCommit();
+        databaseMetaData.supportsOpenCursorsAcrossRollback();
+        databaseMetaData.supportsOpenStatementsAcrossCommit();
+        databaseMetaData.supportsOpenStatementsAcrossRollback();
+        databaseMetaData.getMaxBinaryLiteralLength();
+        databaseMetaData.getMaxCharLiteralLength();
+        databaseMetaData.getMaxColumnNameLength();
+        databaseMetaData.getMaxColumnsInGroupBy();
+        databaseMetaData.getMaxColumnsInIndex();
+        databaseMetaData.getMaxColumnsInOrderBy();
+        databaseMetaData.getMaxColumnsInSelect();
+        databaseMetaData.getMaxColumnsInTable();
+        databaseMetaData.getMaxConnections();
+        databaseMetaData.getMaxCursorNameLength();
+        databaseMetaData.getMaxIndexLength();
+        databaseMetaData.getMaxSchemaNameLength();
+        databaseMetaData.getMaxProcedureNameLength();
+        databaseMetaData.getMaxCatalogNameLength();
+        databaseMetaData.getMaxRowSize();
+        databaseMetaData.doesMaxRowSizeIncludeBlobs();
+        databaseMetaData.getMaxStatementLength();
+        databaseMetaData.getMaxStatements();
+        databaseMetaData.getMaxTableNameLength();
+        databaseMetaData.getMaxTablesInSelect();
+        databaseMetaData.getMaxUserNameLength();
+        databaseMetaData.getDefaultTransactionIsolation();
+        databaseMetaData.supportsTransactions();
+        databaseMetaData.supportsTransactionIsolationLevel(0);
+        databaseMetaData.supportsDataDefinitionAndDataManipulationTransactions();
+        databaseMetaData.supportsDataManipulationTransactionsOnly();
+        databaseMetaData.dataDefinitionCausesTransactionCommit();
+        databaseMetaData.dataDefinitionIgnoredInTransactions();
+        try {
+            databaseMetaData.getProcedures("", "", "");
+        } catch (Exception e) {
+        }
+        try {
+            databaseMetaData.getProcedureColumns("", "", "", "");
+        } catch (Exception e) {
+        }
+        try {
+            databaseMetaData.getTables("", "", "", new String[]{""});
+        } catch (Exception e) {
+        }
+        databaseMetaData.getSchemas();
+        databaseMetaData.getCatalogs();
+//        databaseMetaData.getTableTypes();
+
+        databaseMetaData.getColumns("", "", "", "");
+        databaseMetaData.getColumnPrivileges("", "", "", "");
+        databaseMetaData.getTablePrivileges("", "", "");
+        databaseMetaData.getBestRowIdentifier("", "", "", 0, false);
+        databaseMetaData.getVersionColumns("", "", "");
+        databaseMetaData.getPrimaryKeys("", "", "");
+        databaseMetaData.getImportedKeys("", "", "");
+        databaseMetaData.getExportedKeys("", "", "");
+        databaseMetaData.getCrossReference("", "", "", "", "", "");
+        databaseMetaData.getTypeInfo();
+        databaseMetaData.getIndexInfo("", "", "", false, false);
+        databaseMetaData.supportsResultSetType(0);
+        databaseMetaData.supportsResultSetConcurrency(0, 0);
+        databaseMetaData.ownUpdatesAreVisible(0);
+        databaseMetaData.ownDeletesAreVisible(0);
+        databaseMetaData.ownInsertsAreVisible(0);
+        databaseMetaData.othersUpdatesAreVisible(0);
+        databaseMetaData.othersDeletesAreVisible(0);
+        databaseMetaData.othersInsertsAreVisible(0);
+        databaseMetaData.updatesAreDetected(0);
+        databaseMetaData.deletesAreDetected(0);
+        databaseMetaData.insertsAreDetected(0);
+        databaseMetaData.supportsBatchUpdates();
+        databaseMetaData.getUDTs("", "", "", new int[]{0});
+        databaseMetaData.getConnection();
+        databaseMetaData.supportsSavepoints();
+        databaseMetaData.supportsNamedParameters();
+        databaseMetaData.supportsMultipleOpenResults();
+        databaseMetaData.supportsGetGeneratedKeys();
+        databaseMetaData.getSuperTypes("", "", "");
+        databaseMetaData.getSuperTables("", "", "");
+        databaseMetaData.getAttributes("", "", "", "");
+        databaseMetaData.supportsResultSetHoldability(0);
+        databaseMetaData.getResultSetHoldability();
+        databaseMetaData.getDatabaseMajorVersion();
+        databaseMetaData.getDatabaseMinorVersion();
+        databaseMetaData.getJDBCMajorVersion();
+        databaseMetaData.getJDBCMinorVersion();
+        databaseMetaData.getSQLStateType();
+        databaseMetaData.locatorsUpdateCopy();
+        databaseMetaData.supportsStatementPooling();
+        databaseMetaData.getRowIdLifetime();
+        databaseMetaData.getSchemas("", "");
+        databaseMetaData.supportsStoredFunctionsUsingCallSyntax();
+        databaseMetaData.autoCommitFailureClosesAllResultSets();
+        databaseMetaData.getClientInfoProperties();
+        databaseMetaData.getFunctions("", "", "");
+        databaseMetaData.getFunctionColumns("", "", "", "");
+        databaseMetaData.getPseudoColumns("", "", "", "");
+        databaseMetaData.generatedKeyAlwaysReturned();
+
+    }
+
+    @AfterClass
+    public static void close() throws Exception {
+        statement.executeUpdate("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..dbe16d9fea33be117cfa93a3ecd9a1ff4bd12cd8
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
@@ -0,0 +1,92 @@
+package com.taosdata.jdbc;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class ImportTest extends BaseTest {
+    Connection connection = null;
+    Statement statement = null;
+    String dbName = "test";
+    String tName = "t0";
+    String host = "localhost";
+
+    @Before
+    public void createDatabase() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+
+    }
+
+    @Test
+    public void insertData() throws Exception {
+        long ts = 1496732686000l;
+
+        for (int i = 0; i < 50; i++) {
+            ts++;
+            int row = statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
+            System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
+            assertEquals(1, row);
+        }
+    }
+
+    @Test
+    public void selectData() throws Exception {
+        insertData();
+        String sql = "select * from test.t0";
+        ResultSet resSet = statement.executeQuery(sql);
+
+        while (resSet.next()) {
+            for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
+                System.out.printf(i + ": " + resSet.getString(i) + "\t");
+            }
+        }
+        resSet.close();
+    }
+
+    @Test
+    public void importData() throws Exception {
+        // 避免时间重复
+        long ts = 1496732686000l;
+
+        StringBuilder sqlBuilder = new StringBuilder("insert into ").append(dbName).append(".").append(tName).append(" values ");
+
+        for (int i = 0; i < 50; i++) {
+            int a = i / 5;
+            long t = ts + a;
+            sqlBuilder.append("(").append(t).append(",").append((100 + i)).append(",").append(i).append(") ");
+        }
+        System.out.println(sqlBuilder.toString());
+        int rows = statement.executeUpdate(sqlBuilder.toString());
+        System.out.println(rows);
+        assertEquals(10, rows);
+    }
+
+    @After
+    public void close() throws Exception {
+        statement.executeUpdate("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0535214ac198685ad65edf338bc6d72f841731a8
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
@@ -0,0 +1,200 @@
+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@FixMethodOrder(MethodSorters.DEFAULT)
+public class PreparedStatementTest extends BaseTest {
+    static Connection connection = null;
+    static PreparedStatement statement = null;
+    static String dbName = "test";
+    static String tName = "t0";
+    static String host = "localhost";
+    static ResultSet resSet = null;
+
+    @BeforeClass
+    public static void createConnection() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        String sql = "drop database if exists " + dbName;
+        statement = (TSDBPreparedStatement) connection.prepareStatement(sql);
+
+    }
+
+    @Test
+    public void createTableAndQuery() throws SQLException {
+        long ts = System.currentTimeMillis();
+
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + "(ts timestamp, k1 int)");
+        statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
+
+        PreparedStatement selectStatement = connection.prepareStatement("select * from " + dbName + "." + tName);
+
+        ResultSet resultSet = selectStatement.executeQuery();
+        assertTrue(null != resultSet);
+
+        boolean isClosed = statement.isClosed();
+        assertEquals(false, isClosed);
+    }
+
+    @Test
+    public void testPreparedStatement() throws SQLException {
+        long ts = System.currentTimeMillis() + 20000;
+        PreparedStatement saveStatement = connection
+                .prepareStatement("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
+
+        int affectedRows = saveStatement.executeUpdate();
+        assertTrue(1 == affectedRows);
+    }
+
+    @Test
+    public void testSavedPreparedStatement() throws SQLException {
+        long ts = System.currentTimeMillis();
+
+        TSDBPreparedStatement saveStatement = (TSDBPreparedStatement) connection
+                .prepareStatement("insert into  " + dbName + "." + tName + " values (?, ?)");
+
+        saveStatement.setObject(1, ts + 10000);
+        saveStatement.setObject(2, 3);
+        int rows = saveStatement.executeUpdate();
+        assertEquals(1, rows);
+    }
+
+    @Test
+    public void testUnsupport() {
+        // if(null == resSet) {
+        // return;
+        // }
+        TSDBPreparedStatement tsdbStatement = (TSDBPreparedStatement) statement;
+        try {
+            tsdbStatement.unwrap(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isWrapperFor(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMaxFieldSize();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setMaxFieldSize(0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setEscapeProcessing(true);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.cancel();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getWarnings();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.clearWarnings();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setCursorName(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMoreResults();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setFetchDirection(0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getFetchDirection();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetConcurrency();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetType();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getConnection();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMoreResults();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getGeneratedKeys();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, 0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, new int[]{0});
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, new String[]{"str1", "str2"});
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetHoldability();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setPoolable(true);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isPoolable();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.closeOnCompletion();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isCloseOnCompletion();
+        } catch (SQLException e) {
+        }
+    }
+
+    @AfterClass
+    public static void close() throws Exception {
+        statement.executeUpdate("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+
+    }
+
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/QueryDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/QueryDataTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..611e21e887b1988a66019d437133d6c3f7926961
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/QueryDataTest.java
@@ -0,0 +1,81 @@
+package com.taosdata.jdbc;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import java.util.Properties;
+import java.util.concurrent.Executors;
+import java.util.concurrent.*;
+
+import static org.junit.Assert.assertTrue;
+
+public class QueryDataTest extends BaseTest {
+
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String stbName = "meters";
+    static String host = "localhost";
+    static int numOfTables = 30;
+    final static int numOfRecordsPerTable = 1000;
+    static long ts = 1496732686000l;
+    final static String tablePrefix = "t";
+
+    @Before
+    public void createDatabase() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+                
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("use " + dbName);
+
+        String createTableSql = "create table " + stbName + "(ts timestamp, name binary(6))";  
+        statement.executeUpdate(createTableSql); 
+    }
+    
+    @Test
+    public void testQueryBinaryData() throws SQLException{                
+                
+        String insertSql = "insert into "  + stbName + " values(now, 'taosda')";
+        System.out.println(insertSql);        
+
+        statement.executeUpdate(insertSql);
+
+        String querySql = "select * from " + stbName;
+        ResultSet rs = statement.executeQuery(querySql); 
+
+        while(rs.next()) {
+            String name = rs.getString(2) + "001";
+            System.out.println("name = " + name);
+            assertEquals(name, "taosda001");
+        }
+        rs.close();        
+    }
+
+
+    @After
+    public void close() throws Exception {        
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+    }
+    
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8067c547df148587766d87e204f5abad2bfb659d
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
@@ -0,0 +1,827 @@
+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.sql.rowset.serial.SerialBlob;
+import javax.sql.rowset.serial.SerialClob;
+import java.sql.*;
+import java.util.HashMap;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ResultSetTest extends BaseTest {
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String tName = "t0";
+    static String host = "localhost";
+    static ResultSet resSet = null;
+
+    @BeforeClass
+    public static void createDatabaseAndTable() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName +
+                " (ts timestamp, k1 int, k2 bigint, k3 float, k4 double, k5 binary(30), k6 smallint, k7 bool, k8 nchar(20))");
+
+        statement.executeQuery("use " + dbName);
+    }
+
+    @Test
+    public void testResultSet() {
+        String sql = null;
+        long ts = 1496732686000l;
+        int v1 = 2147483600;
+        long v2 = ts + 1000;
+        float v3 = 3.1415926f;
+        double v4 = 3.1415926535897;
+        String v5 = "涛思数据，强~！";
+        short v6 = 12;
+        boolean v7 = false;
+        String v8 = "TDengine is powerful";
+
+        sql = "insert into " + dbName + "." + tName + " values (" + ts + "," + v1 + "," + v2 + "," + v3 + "," + v4
+                + ",\"" + v5 + "\"," + v6 + "," + v7 + ",\"" + v8 + "\")";
+
+        try {
+            statement.executeUpdate(sql);
+            assertEquals(1, statement.getUpdateCount());
+        } catch (SQLException e) {
+            assert false : "insert error " + e.getMessage();
+        }
+
+        try {
+            statement.executeQuery("select * from " + dbName + "." + tName + " where ts = " + ts);
+            resSet = statement.getResultSet();
+            System.out.println(((TSDBResultSet) resSet).getRowData());
+            while (resSet.next()) {
+                assertEquals(ts, resSet.getLong(1));
+                assertEquals(ts, resSet.getLong("ts"));
+
+                System.out.println(resSet.getTimestamp(1));
+
+                assertEquals(v1, resSet.getInt(2));
+                assertEquals(v1, resSet.getInt("k1"));
+
+                assertEquals(v2, resSet.getLong(3));
+                assertEquals(v2, resSet.getLong("k2"));
+
+                assertEquals(v3, resSet.getFloat(4), 7);
+                assertEquals(v3, resSet.getFloat("k3"), 7);
+
+                assertEquals(v4, resSet.getDouble(5), 13);
+                assertEquals(v4, resSet.getDouble("k4"), 13);
+
+                assertEquals(v5, resSet.getString(6));
+                assertEquals(v5, resSet.getString("k5"));
+
+                assertEquals(v6, resSet.getShort(7));
+                assertEquals(v6, resSet.getShort("k6"));
+
+                assertEquals(v7, resSet.getBoolean(8));
+                assertEquals(v7, resSet.getBoolean("k7"));
+
+                assertEquals(v8, resSet.getString(9));
+                assertEquals(v8, resSet.getString("k8"));
+
+                resSet.getBytes(9);
+                resSet.getObject(6);
+                resSet.getObject("k8");
+            }
+            if (!resSet.isClosed()) {
+                resSet.close();
+            }
+        } catch (SQLException e) {
+            assert false : "insert error " + e.getMessage();
+        }
+    }
+
+    @Test
+    public void testUnsupport() throws SQLException {
+        statement.executeQuery("show databases");
+        resSet = statement.getResultSet();
+        try {
+            resSet.unwrap(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.isWrapperFor(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getAsciiStream(0);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getUnicodeStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getBinaryStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getAsciiStream("");
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getUnicodeStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getBinaryStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getWarnings();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.clearWarnings();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getCursorName();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getCharacterStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getCharacterStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.isBeforeFirst();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.isAfterLast();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.isFirst();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.isLast();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.beforeFirst();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.afterLast();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.first();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.last();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.absolute(1);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.relative(1);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.previous();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.setFetchDirection(0);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getFetchDirection();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.setFetchSize(0);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getFetchSize();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getConcurrency();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.rowUpdated();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.rowInserted();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.rowDeleted();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNull(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBoolean(0, true);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateByte(0, (byte) 2);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateShort(0, (short) 1);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateInt(0, 0);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateLong(0, 0l);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateFloat(0, 3.14f);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateDouble(0, 3.1415);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBigDecimal(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateString(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBytes(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateDate(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateTime(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateTimestamp(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateObject(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateObject(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNull(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBoolean("", false);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateByte("", (byte) 1);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateShort("", (short) 1);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateInt("", 0);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateLong("", 0l);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateFloat("", 3.14f);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateDouble("", 3.1415);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBigDecimal(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateString(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBytes(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateDate(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateTime(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateTimestamp(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateObject(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateObject(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.insertRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.deleteRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.refreshRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.cancelRowUpdates();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.moveToInsertRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.moveToCurrentRow();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getStatement();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getObject(0, new HashMap<>());
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getRef(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getBlob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getClob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getArray(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getObject("", new HashMap<>());
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getRef(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getBlob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getClob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getArray(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getDate(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getDate(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getTime(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getTime(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getTimestamp(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getTimestamp(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getURL(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getURL(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateRef(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateRef(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBlob(0, new SerialBlob("".getBytes("UTF8")));
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBlob("", new SerialBlob("".getBytes("UTF8")));
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateClob("", new SerialClob("".toCharArray()));
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateClob(0, new SerialClob("".toCharArray()));
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateArray(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateArray(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getRowId(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getRowId(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateRowId(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateRowId(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getHoldability();
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNString(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNString(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+
+        try {
+            resSet.getNClob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getNClob(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getSQLXML(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getSQLXML(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateSQLXML(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateSQLXML(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getNCharacterStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.getNCharacterStream(null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+
+        try {
+            resSet.updateNCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateNCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateAsciiStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateBinaryStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+        try {
+            resSet.updateCharacterStream(null, null);
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().contains("this operation is NOT supported currently!"));
+        }
+    }
+
+    @Test
+    public void testBatch() throws SQLException {
+        String[] sqls = new String[]{"insert into test.t0 values (1496732686001,2147483600,1496732687000,3.1415925,3.1415926535897," +
+                "'涛思数据，强~',12,0,'TDengine is powerful')", "insert into test.t0 values (1496732686002,2147483600,1496732687000,3.1415925,3.1415926535897," +
+                "'涛思数据，强~',12,1,'TDengine is powerful')"};
+        for (String sql : sqls) {
+            statement.addBatch(sql);
+        }
+        int[] res = statement.executeBatch();
+        assertEquals(res.length, 2);
+        statement.clearBatch();
+    }
+    @AfterClass
+    public static void close() throws Exception {
+        statement.executeUpdate("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+
+    }
+
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c75860e0f0a2647175de6e836f7f1aeb62c539a
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
@@ -0,0 +1,69 @@
+package com.taosdata.jdbc;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class SelectTest extends BaseTest {
+    Connection connection = null;
+    Statement statement = null;
+    String dbName = "test";
+    String tName = "t0";
+    String host = "localhost";
+
+    @Before
+    public void createDatabaseAndTable() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+    }
+
+    @Test
+    public void selectData() throws SQLException {
+        long ts = 1496732686000l;
+
+        for (int i = 0; i < 50; i++) {
+            ts++;
+            int row = statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
+            System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
+            assertEquals(1, row);
+        }
+
+        String sql = "select * from " + dbName + "." + tName;
+        ResultSet resSet = statement.executeQuery(sql);
+
+        int num = 0;
+        while (resSet.next()) {
+            num++;
+        }
+        resSet.close();
+
+        assertEquals(num, 50);
+    }
+
+    @After
+    public void close() throws Exception {
+        statement.executeUpdate("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6e01fb7c349bbab73fcc6878d85330ac39de2cfc
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
@@ -0,0 +1,122 @@
+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class StableTest extends BaseTest {
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String stbName = "st";
+    static String host = "localhost";
+
+    @BeforeClass
+    public static void createDatabase() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeQuery("use " + dbName);
+    }
+
+//    @Test
+    public void createStable() {
+        String sql = "create table " + stbName + " (ts timestamp, v1 int, v2 int) tags (tg nchar(20)) ";
+
+        try {
+            statement.executeUpdate(sql);
+        } catch (SQLException e) {
+            assert false : "error create stable" + e.getMessage();
+        }
+    }
+
+//    @Test
+    public void createTable() {
+        String sql = "create table t1 using " + stbName + " tags (\"beijing\")";
+
+        try {
+            statement.executeUpdate(sql);
+        } catch (SQLException e) {
+            assert false : "error create table" + e.getMessage();
+        }
+    }
+
+    @Test
+    public void describeSTable() {
+        createStable();
+        String sql = "describe " + stbName;
+        int num = 0;
+        System.out.println("describe stable");
+        try {
+            ResultSet res = statement.executeQuery(sql);
+            while (res.next()) {
+                for (int i = 1; i <= res.getMetaData().getColumnCount(); i++) {
+                    System.out.printf("%d: %s\n", i, res.getString(i));
+                }
+                num++;
+            }
+            res.close();
+            assertEquals(4, num);
+        } catch (SQLException e) {
+            assert false : "error describe stable" + e.getMessage();
+        }
+    }
+
+    @Test
+    public void describeTable() {
+        createTable();
+        String sql = "describe t1";
+        int num = 0;
+        System.out.println("describe table");
+        try {
+            ResultSet res = statement.executeQuery(sql);
+            while (res.next()) {
+                for (int i = 1; i <= res.getMetaData().getColumnCount(); i++) {
+                    System.out.printf("%d: %s\n", i, res.getString(i));
+                }
+                num++;
+            }
+            res.close();
+            assertEquals(4, num);
+        } catch (SQLException e) {
+            assert false : "error describe stable" + e.getMessage();
+        }
+    }
+
+    //    @Test
+    public void validCreateSql() {
+        String sql = "create table t2 using " + stbName + " tags (\"beijing\")";
+        boolean valid = ((TSDBConnection) connection).getConnection().validateCreateTableSql(sql);
+        assertEquals(true, valid);
+    }
+
+    @AfterClass
+    public static void close() throws Exception {
+        if (!statement.isClosed()) {
+            statement.executeUpdate("drop database " + dbName);
+            statement.close();
+            connection.close();
+            Thread.sleep(10);
+
+        }
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..db7b8c8cb14cbc0d1ae5a5a3a3bf8df590c4bc2a
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
@@ -0,0 +1,173 @@
+package com.taosdata.jdbc;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class StatementTest extends BaseTest {
+    static Connection connection = null;
+    static Statement statement = null;
+    static String dbName = "test";
+    static String tName = "t0";
+    static String host = "localhost";
+    static ResultSet resSet = null;
+
+    @BeforeClass
+    public static void createConnection() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+
+    }
+
+    @Test
+    public void createTableAndQuery() throws SQLException {
+        long ts = System.currentTimeMillis();
+
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + "(ts timestamp, k1 int)");
+        statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
+        statement.executeQuery("select * from " + dbName + "." + tName);
+        ResultSet resultSet = statement.getResultSet();
+        assertTrue(null != resultSet);
+
+        boolean isClosed = statement.isClosed();
+        assertEquals(false, isClosed);
+    }
+
+    @Test
+    public void testUnsupport() {
+//        if(null == resSet) {
+//            return;
+//        }
+        TSDBStatement tsdbStatement = (TSDBStatement) statement;
+        try {
+            tsdbStatement.unwrap(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isWrapperFor(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMaxFieldSize();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setMaxFieldSize(0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setEscapeProcessing(true);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.cancel();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getWarnings();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.clearWarnings();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setCursorName(null);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMoreResults();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setFetchDirection(0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getFetchDirection();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetConcurrency();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetType();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getConnection();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getMoreResults();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getGeneratedKeys();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, 0);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, new int[]{0});
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.executeUpdate(null, new String[]{"str1", "str2"});
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.getResultSetHoldability();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.setPoolable(true);
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isPoolable();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.closeOnCompletion();
+        } catch (SQLException e) {
+        }
+        try {
+            tsdbStatement.isCloseOnCompletion();
+        } catch (SQLException e) {
+        }
+    }
+
+    @AfterClass
+    public static void close() throws Exception {
+        if (!statement.isClosed()) {
+            statement.executeUpdate("drop database " + dbName);
+            statement.close();
+            connection.close();
+            Thread.sleep(10);
+
+        }
+    }
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a71c77d1d9dc718cc029c6a0b11ed63cd3034c1
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
@@ -0,0 +1,88 @@
+package com.taosdata.jdbc;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class SubscribeTest extends BaseTest {
+    Connection connection = null;
+    Statement statement = null;
+    String dbName = "test";
+    String tName = "t0";
+    String host = "localhost";
+    String topic = "test";
+
+    @Before
+    public void createDatabase() throws SQLException {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+        } catch (ClassNotFoundException e) {
+            return;
+        }
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+
+        statement = connection.createStatement();
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
+        long ts = System.currentTimeMillis();
+        for (int i = 0; i < 2; i++) {
+            ts += i;
+            String sql = "insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")";
+            statement.executeUpdate(sql);
+        }
+    }
+
+    @Test
+    public void subscribe() throws Exception {
+        TSDBSubscribe subscribe = null;
+        try {
+
+            String rawSql = "select * from " + dbName + "." + tName + ";";
+            System.out.println(rawSql);
+            subscribe = ((TSDBConnection) connection).subscribe(topic, rawSql, false);
+
+            int a = 0;
+            while (true) {
+                Thread.sleep(900);
+                TSDBResultSet resSet = subscribe.consume();
+
+                while (resSet.next()) {
+                    for (int i = 1; i <= resSet.getMetaData().getColumnCount(); i++) {
+                        System.out.printf(i + ": " + resSet.getString(i) + "\t");
+                    }
+                    System.out.println("\n======" + a + "==========");
+                }
+                resSet.close();
+                a++;
+                if (a >= 2) {
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (null != subscribe) {
+                subscribe.close(true);
+            }
+        }
+    }
+
+    @After
+    public void close() throws Exception {
+        statement.executeQuery("drop database " + dbName);
+        statement.close();
+        connection.close();
+        Thread.sleep(10);
+    }
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a0981063a5052f04b849b2187a78352a2c2560be
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
@@ -0,0 +1,47 @@
+package com.taosdata.jdbc;
+
+import org.junit.Test;
+
+import java.sql.SQLException;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class TSDBDriverTest {
+
+    @Test
+    public void urlParserTest() throws SQLException {
+        TSDBDriver driver = new TSDBDriver();
+        String url = "jdbc:TSDB://127.0.0.1:0/db";
+
+        Properties properties = new Properties(); 
+        driver.parseURL(url, properties);
+        assertEquals(properties.get("host"), "127.0.0.1");
+        assertEquals(properties.get("port"), "0");
+        assertEquals(properties.get("dbname"), "db");                
+        assertEquals(properties.get("user"), "root");   
+        assertEquals(properties.get("password"), "your_password");
+
+        url = "jdbc:TSDB://127.0.0.1:0/log?charset=UTF-8";
+        properties = new Properties(); 
+        driver.parseURL(url, properties);
+        assertEquals(properties.get("host"), "127.0.0.1");
+        assertEquals(properties.get("port"), "0");
+        assertEquals(properties.get("dbname"), "log");        
+        assertEquals(properties.get("charset"), "UTF-8"); 
+        
+        url = "jdbc:TSDB://127.0.0.1:0/";
+        properties = new Properties(); 
+        driver.parseURL(url, properties);
+        assertEquals(properties.get("host"), "127.0.0.1");
+        assertEquals(properties.get("port"), "0"); 
+        assertEquals(properties.get("dbname"), null);
+        
+        url = "jdbc:TSDB://127.0.0.1:0/db";
+        properties = new Properties(); 
+        driver.parseURL(url, properties);
+        assertEquals(properties.get("host"), "127.0.0.1");
+        assertEquals(properties.get("port"), "0"); 
+        assertEquals(properties.get("dbname"), "db");
+    }
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9608c4985db15312e8e2966badfe4db8241bc306
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
@@ -0,0 +1,108 @@
+package com.taosdata.jdbc.cases;
+
+import com.taosdata.jdbc.lib.TSDBCommon;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class BatchInsertTest {
+
+    static String host = "localhost";
+    static String dbName = "test";
+    static String stbName = "meters";
+    static int numOfTables = 30;
+    final static int numOfRecordsPerTable = 1000;
+    static long ts = 1496732686000l;
+    final static String tablePrefix = "t";
+
+    private Connection connection;
+
+    @Before
+    public void before() {
+        try {
+            connection = TSDBCommon.getConn(host);
+            TSDBCommon.createDatabase(connection, dbName);
+            TSDBCommon.createStable(connection, stbName);
+            TSDBCommon.createTables(connection, numOfTables, stbName, tablePrefix);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testBatchInsert(){
+        ExecutorService executorService = Executors.newFixedThreadPool(numOfTables);
+        for (int i = 0; i < numOfTables; i++) {
+            final int index = i;
+            executorService.execute(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        long startTime = System.currentTimeMillis();
+                        Statement statement = connection.createStatement(); // get statement
+                        StringBuilder sb = new StringBuilder();
+                        sb.append("INSERT INTO " + tablePrefix + index + " VALUES");
+                        Random rand = new Random();
+                        for (int j = 1; j <= numOfRecordsPerTable; j++) {
+                            sb.append("(" + (ts + j) + ", ");
+                            sb.append(rand.nextInt(100) + ", ");
+                            sb.append(rand.nextInt(100) + ", ");
+                            sb.append(rand.nextInt(100) + ")");
+                        }
+                        statement.addBatch(sb.toString());
+                        statement.executeBatch();
+                        long endTime = System.currentTimeMillis();
+                        System.out.println("Thread " + index + " takes " + (endTime - startTime) +  " microseconds");
+                        connection.commit();
+                        statement.close();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+
+        executorService.shutdown();
+        try {
+            executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        try{
+            Statement statement = connection.createStatement();
+            ResultSet rs = statement.executeQuery("select * from meters");
+            int num = 0;
+            while (rs.next()) {
+                num++;
+            }
+            assertEquals(num, numOfTables * numOfRecordsPerTable);
+            rs.close();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    @After
+    public void after() {
+        try {
+            if (connection != null)
+                connection.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/lib/TSDBCommon.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/lib/TSDBCommon.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e2613d617074571c86c39ef253d68af9a0f6922
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/lib/TSDBCommon.java
@@ -0,0 +1,47 @@
+package com.taosdata.jdbc.lib;
+
+import com.taosdata.jdbc.TSDBDriver;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class TSDBCommon {
+
+    public static Connection getConn(String host) throws SQLException, ClassNotFoundException {
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        return DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+    }
+
+    public static void createDatabase(Connection connection, String dbName) throws SQLException {
+        Statement statement = connection.createStatement();
+        statement.executeUpdate("drop database if exists " + dbName);
+        statement.executeUpdate("create database if not exists " + dbName);
+        statement.executeUpdate("use " + dbName);
+        statement.close();
+    }
+
+    public static void createStable(Connection connection, String stbName) throws SQLException {
+        Statement statement = connection.createStatement();
+        String createTableSql = "create table " + stbName + "(ts timestamp, f1 int, f2 int, f3 int) tags(areaid int, loc binary(20))";
+        statement.executeUpdate(createTableSql);
+        statement.close();
+    }
+
+    public static void createTables(Connection connection, int numOfTables, String stbName,String tablePrefix) throws SQLException {
+        Statement statement = connection.createStatement();
+        for(int i = 0; i < numOfTables; i++) {
+            String loc = i % 2 == 0 ? "beijing" : "shanghai";
+            String createSubTalbesSql = "create table " + tablePrefix + i + " using " + stbName + " tags(" + i + ", '" + loc + "')";
+            statement.executeUpdate(createSubTalbesSql);
+        }
+        statement.close();
+    }
+}
diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js
index 2b409268d95d4f2014359114d3717ad0ce8bbd7a..656741ea16fd607212711fb694e3e20e6007b2ac 100644
--- a/src/connector/nodejs/nodetaos/cinterface.js
+++ b/src/connector/nodejs/nodetaos/cinterface.js
@@ -10,6 +10,7 @@ const Struct = require('ref-struct');
 const FieldTypes = require('./constants');
 const errors = require ('./error');
 const TaosObjects = require('./taosobjects');
+const { NULL_POINTER } = require('ref');
 
 module.exports = CTaosInterface;
 
@@ -177,9 +178,10 @@ var char_arr = ArrayType(ref.types.char);
 var TaosField = Struct({
                       'name': char_arr,
                       });
-TaosField.fields.name.type.size = 64;
-TaosField.defineProperty('bytes', ref.types.short);
+TaosField.fields.name.type.size = 65;
 TaosField.defineProperty('type', ref.types.char);
+TaosField.defineProperty('bytes', ref.types.short);
+
 
 /**
  *
@@ -202,10 +204,10 @@ function CTaosInterface (config = null, pass = false) {
     'taos_connect': [ ref.types.void_ptr, [ ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.int ] ],
     //void taos_close(TAOS *taos)
     'taos_close': [ ref.types.void, [ ref.types.void_ptr ] ],
-    //TAOS_RES *taos_use_result(TAOS *taos);
-    'taos_use_result': [ ref.types.void_ptr, [ ref.types.void_ptr ] ],
+    //int *taos_fetch_lengths(TAOS_RES *taos);
+    'taos_fetch_lengths': [ ref.types.void_ptr, [ ref.types.void_ptr ] ],
     //int taos_query(TAOS *taos, char *sqlstr)
-    'taos_query': [ ref.types.int, [ ref.types.void_ptr, ref.types.char_ptr ] ],
+    'taos_query': [ ref.types.void_ptr, [ ref.types.void_ptr, ref.types.char_ptr ] ],
     //int taos_affected_rows(TAOS *taos)
     'taos_affected_rows': [ ref.types.int, [ ref.types.void_ptr] ],
     //int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows)
@@ -241,17 +243,12 @@ function CTaosInterface (config = null, pass = false) {
     'taos_fetch_rows_a': [ ref.types.void, [ ref.types.void_ptr, ref.types.void_ptr, ref.types.void_ptr ]],
 
     // Subscription
-    //TAOS_SUB *taos_subscribe(char *host, char *user, char *pass, char *db, char *table, long time, int mseconds)
-    ////TAOS_SUB *taos_subscribe(char *host, char *user, char *pass, char *db, char *table, int64_t time, int mseconds);
-    'taos_subscribe': [ ref.types.void_ptr, [ ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.char_ptr, ref.types.int64, ref.types.int] ],
-    //TAOS_ROW taos_consume(TAOS_SUB *tsub);
-    'taos_consume': [ ref.refType(ref.types.void_ptr2), [ref.types.void_ptr] ],
+    //TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)
+    'taos_subscribe': [ ref.types.void_ptr, [ ref.types.void_ptr, ref.types.int, ref.types.char_ptr, ref.types.char_ptr, ref.types.void_ptr, ref.types.void_ptr, ref.types.int] ],
+    // TAOS_RES *taos_consume(TAOS_SUB *tsub)
+    'taos_consume': [ ref.types.void_ptr, [ref.types.void_ptr] ],
     //void taos_unsubscribe(TAOS_SUB *tsub);
     'taos_unsubscribe': [ ref.types.void, [ ref.types.void_ptr ] ],
-    //int taos_subfields_count(TAOS_SUB *tsub);
-    'taos_subfields_count': [ ref.types.int, [ref.types.void_ptr ] ],
-    //TAOS_FIELD *taos_fetch_subfields(TAOS_SUB *tsub);
-    'taos_fetch_subfields': [ ref.refType(TaosField), [ ref.types.void_ptr ] ],
 
     // Continuous Query
     //TAOS_STREAM *taos_open_stream(TAOS *taos, char *sqlstr, void (*fp)(void *param, TAOS_RES *, TAOS_ROW row),
@@ -334,22 +331,22 @@ CTaosInterface.prototype.query = function query(connection, sql) {
 CTaosInterface.prototype.affectedRows = function affectedRows(connection) {
   return this.libtaos.taos_affected_rows(connection);
 }
-CTaosInterface.prototype.useResult = function useResult(connection) {
-  let result = this.libtaos.taos_use_result(connection);
+CTaosInterface.prototype.useResult = function useResult(result) {
+
   let fields = [];
   let pfields = this.fetchFields(result);
   if (ref.isNull(pfields) == false) {
-    pfields = ref.reinterpret(pfields, this.fieldsCount(connection) * 68, 0);
+    pfields = ref.reinterpret(pfields, this.fieldsCount(result) * 68, 0);
     for (let i = 0; i < pfields.length; i += 68) {
       //0 - 63 = name //64 - 65 = bytes, 66 - 67 = type
       fields.push( {
-        name: ref.readCString(ref.reinterpret(pfields,64,i)),
-        bytes: pfields[i + 64],
-        type: pfields[i + 66]
+        name: ref.readCString(ref.reinterpret(pfields,65,i)),
+        type: pfields[i + 65],
+        bytes: pfields[i + 66]
       })
     }
   }
-  return {result:result, fields:fields}
+  return fields;
 }
 CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
   let pblock = ref.ref(ref.ref(ref.NULL)); // equal to our raw data
@@ -357,19 +354,33 @@ CTaosInterface.prototype.fetchBlock = function fetchBlock(result, fields) {
   if (num_of_rows == 0) {
     return {block:null, num_of_rows:0};
   }
-  let isMicro = (this.libtaos.taos_result_precision(result) == FieldTypes.C_TIMESTAMP_MICRO)
+  var fieldL = this.libtaos.taos_fetch_lengths(result);
+
+  let isMicro = (this.libtaos.taos_result_precision(result) == FieldTypes.C_TIMESTAMP_MICRO);
+
+  var fieldlens = [];
+  
+  if (ref.isNull(fieldL) == false) {
+    
+    for (let i = 0; i < fields.length; i ++) {
+      let plen = ref.reinterpret(fieldL, 4, i*4);
+      let len = plen.readInt32LE(0);
+       fieldlens.push(len);
+    }
+  }
+
   let blocks = new Array(fields.length);
   blocks.fill(null);
   num_of_rows = Math.abs(num_of_rows);
   let offset = 0;
-  pblock = pblock.deref()
+  pblock = pblock.deref();
   for (let i = 0; i < fields.length; i++) {
-
+    pdata = ref.reinterpret(pblock,8,i*8);
+    pdata = ref.ref(pdata.readPointer());
     if (!convertFunctions[fields[i]['type']] ) {
       throw new errors.DatabaseError("Invalid data type returned from database");
     }
-    blocks[i] = convertFunctions[fields[i]['type']](pblock, num_of_rows, fields[i]['bytes'], offset, isMicro);
-    offset += fields[i]['bytes'] * num_of_rows;
+    blocks[i] = convertFunctions[fields[i]['type']](pdata, 1, fieldlens[i], offset, isMicro);
   }
   return {blocks: blocks, num_of_rows:Math.abs(num_of_rows)}
 }
@@ -386,17 +397,17 @@ CTaosInterface.prototype.numFields = function numFields(result) {
   return this.libtaos.taos_num_fields(result);
 }
 // Fetch fields count by connection, the latest query
-CTaosInterface.prototype.fieldsCount = function fieldsCount(connection) {
-  return this.libtaos.taos_field_count(connection);
+CTaosInterface.prototype.fieldsCount = function fieldsCount(result) {
+  return this.libtaos.taos_field_count(result);
 }
 CTaosInterface.prototype.fetchFields = function fetchFields(result) {
   return this.libtaos.taos_fetch_fields(result);
 }
-CTaosInterface.prototype.errno = function errno(connection) {
-  return this.libtaos.taos_errno(connection);
+CTaosInterface.prototype.errno = function errno(result) {
+  return this.libtaos.taos_errno(result);
 }
-CTaosInterface.prototype.errStr = function errStr(connection) {
-  return ref.readCString(this.libtaos.taos_errstr(connection));
+CTaosInterface.prototype.errStr = function errStr(result) {
+  return ref.readCString(this.libtaos.taos_errstr(result));
 }
 // Async
 CTaosInterface.prototype.query_a = function query_a(connection, sql, callback, param = ref.ref(ref.NULL)) {
@@ -417,18 +428,32 @@ CTaosInterface.prototype.fetch_rows_a = function fetch_rows_a(result, callback,
     // Data preparation to pass to cursor. Could be bottleneck in query execution callback times.
     let row = cti.libtaos.taos_fetch_row(result2);
     let fields = cti.fetchFields_a(result2);
+
     let isMicro = (cti.libtaos.taos_result_precision(result2) == FieldTypes.C_TIMESTAMP_MICRO);
     let blocks = new Array(fields.length);
     blocks.fill(null);
     numOfRows2 = Math.abs(numOfRows2);
     let offset = 0;
+    var fieldL = cti.libtaos.taos_fetch_lengths(result);
+    var fieldlens = [];
+    if (ref.isNull(fieldL) == false) {
+      
+      for (let i = 0; i < fields.length; i ++) {
+        let plen = ref.reinterpret(fieldL, 8, i*8);
+        let len = ref.get(plen,0,ref.types.int32);
+        fieldlens.push(len);
+      }
+    }
     if (numOfRows2 > 0){
       for (let i = 0; i < fields.length; i++) {
         if (!convertFunctions[fields[i]['type']] ) {
           throw new errors.DatabaseError("Invalid data type returned from database");
         }
-        blocks[i] = convertFunctions[fields[i]['type']](row, numOfRows2, fields[i]['bytes'], offset, isMicro);
-        offset += fields[i]['bytes'] * numOfRows2;
+        let prow = ref.reinterpret(row,8,i*8);
+        prow = prow.readPointer();
+        prow = ref.ref(prow);
+        blocks[i] = convertFunctions[fields[i]['type']](prow, 1, fieldlens[i], offset, isMicro);
+        //offset += fields[i]['bytes'] * numOfRows2;
       }
     }
     callback(param2, result2, numOfRows2, blocks);
@@ -445,11 +470,11 @@ CTaosInterface.prototype.fetchFields_a = function fetchFields_a (result) {
   if (ref.isNull(pfields) == false) {
     pfields = ref.reinterpret(pfields, 68 * pfieldscount , 0);
     for (let i = 0; i < pfields.length; i += 68) {
-      //0 - 63 = name //64 - 65 = bytes, 66 - 67 = type
+      //0 - 64 = name //65 = type, 66 - 67 = bytes
       fields.push( {
-        name: ref.readCString(ref.reinterpret(pfields,64,i)),
-        bytes: pfields[i + 64],
-        type: pfields[i + 66]
+        name: ref.readCString(ref.reinterpret(pfields,65,i)),
+        type: pfields[i + 65],
+        bytes: pfields[i + 66]
       })
     }
   }
@@ -472,64 +497,40 @@ CTaosInterface.prototype.getClientInfo = function getClientInfo() {
 }
 
 // Subscription
-CTaosInterface.prototype.subscribe = function subscribe(host=null, user="root", password="taosdata", db=null, table=null, time=null, mseconds=null) {
-  let dbOrig = db;
-  let tableOrig = table;
-  try  {
-    host = host != null ? ref.allocCString(host) : ref.alloc(ref.types.char_ptr, ref.NULL);
-  }
-  catch(err) {
-    throw "Attribute Error: host is expected as a str";
-  }
-  try {
-    user = ref.allocCString(user)
-  }
-  catch(err) {
-    throw "Attribute Error: user is expected as a str";
-  }
+CTaosInterface.prototype.subscribe = function subscribe(connection, restart, topic, sql, interval) {
+  let topicOrig = topic;
+  let sqlOrig = sql;
   try {
-    password = ref.allocCString(password);
+    sql = sql != null ? ref.allocCString(sql) : ref.alloc(ref.types.char_ptr, ref.NULL);
   }
   catch(err) {
-    throw "Attribute Error: password is expected as a str";
+    throw "Attribute Error: sql is expected as a str";
   }
   try {
-    db = db != null ? ref.allocCString(db) : ref.alloc(ref.types.char_ptr, ref.NULL);
+    topic = topic != null ? ref.allocCString(topic) : ref.alloc(ref.types.char_ptr, ref.NULL);
   }
   catch(err) {
-    throw "Attribute Error: db is expected as a str";
-  }
-  try {
-    table = table != null ? ref.allocCString(table) : ref.alloc(ref.types.char_ptr, ref.NULL);
+    throw TypeError("topic is expected as a str");
   }
-  catch(err) {
-    throw TypeError("table is expected as a str");
-  }
-  try {
-    mseconds = ref.alloc(ref.types.int, mseconds);
-  }
-  catch(err) {
-    throw TypeError("mseconds is expected as an int");
-  }
-  //TAOS_SUB *taos_subscribe(char *host, char *user, char *pass, char *db, char *table, int64_t time, int mseconds);
-  let subscription = this.libtaos.taos_subscribe(host, user, password, db, table, time, mseconds);
+
+  restart = ref.alloc(ref.types.int, restart);
+
+  let subscription = this.libtaos.taos_subscribe(connection, restart, topic, sql, null, null, interval);
   if (ref.isNull(subscription)) {
     throw new errors.TDError('Failed to subscribe to TDengine | Database: ' + dbOrig + ', Table: ' + tableOrig);
   }
   else {
-    console.log('Successfully subscribed to TDengine | Database: ' + dbOrig + ', Table: ' + tableOrig);
+    console.log('Successfully subscribed to TDengine - Topic: ' + topicOrig);
   }
   return subscription;
 }
-CTaosInterface.prototype.subFieldsCount = function subFieldsCount(subscription) {
-  return this.libtaos.taos_subfields_count(subscription);
-}
-CTaosInterface.prototype.fetchSubFields = function fetchSubFields(subscription) {
-  let pfields = this.libtaos.taos_fetch_subfields(subscription);
-  let pfieldscount = this.subFieldsCount(subscription);
+
+CTaosInterface.prototype.consume = function consume(subscription) {
+  let result = this.libtaos.taos_consume(subscription);
   let fields = [];
+  let pfields = this.fetchFields(result);
   if (ref.isNull(pfields) == false) {
-    pfields = ref.reinterpret(pfields, 68 * pfieldscount , 0);
+    pfields = ref.reinterpret(pfields, this.numFields(result) * 68, 0);
     for (let i = 0; i < pfields.length; i += 68) {
       //0 - 63 = name //64 - 65 = bytes, 66 - 67 = type
       fields.push( {
@@ -539,27 +540,23 @@ CTaosInterface.prototype.fetchSubFields = function fetchSubFields(subscription)
       })
     }
   }
-  return fields;
-}
-CTaosInterface.prototype.consume = function consume(subscription) {
-  let row = this.libtaos.taos_consume(subscription);
-  let fields = this.fetchSubFields(subscription);
-  //let isMicro = (cti.libtaos.taos_result_precision(result) == FieldTypes.C_TIMESTAMP_MICRO);
-  let isMicro = false; //no supported function for determining precision?
-  let blocks = new Array(fields.length);
-  blocks.fill(null);
-  let numOfRows2 = 1; //Math.abs(numOfRows2);
-  let offset = 0;
-  if (numOfRows2 > 0){
-    for (let i = 0; i < fields.length; i++) {
-      if (!convertFunctions[fields[i]['type']] ) {
-        throw new errors.DatabaseError("Invalid data type returned from database");
+
+  let data = [];
+  while(true) {
+    let { blocks, num_of_rows } = this.fetchBlock(result, fields);
+    if (num_of_rows == 0) {
+      break;
+    }
+    for (let i = 0; i < num_of_rows; i++) {
+      data.push([]);
+      let rowBlock = new Array(fields.length);
+      for (let j = 0; j < fields.length; j++) {
+        rowBlock[j] = blocks[j][i];
       }
-      blocks[i] = convertFunctions[fields[i]['type']](row, numOfRows2, fields[i]['bytes'], offset, isMicro);
-      offset += fields[i]['bytes'] * numOfRows2;
+      data[data.length-1] = (rowBlock);
     }
   }
-  return {blocks:blocks, fields:fields};
+  return { data: data, fields: fields, result: result };
 }
 CTaosInterface.prototype.unsubscribe = function unsubscribe(subscription) {
   //void taos_unsubscribe(TAOS_SUB *tsub);
diff --git a/src/connector/nodejs/nodetaos/connection.js b/src/connector/nodejs/nodetaos/connection.js
index bb7651544ab937f1c8ecb3ffdaa8a6b6e74a9e60..08186f87053ad0ed0982ec8941f0cf38c4ad0467 100644
--- a/src/connector/nodejs/nodetaos/connection.js
+++ b/src/connector/nodejs/nodetaos/connection.js
@@ -74,9 +74,11 @@ TDengineConnection.prototype.rollback = function rollback() {
  * Clear the results from connector
  * @private
  */
-TDengineConnection.prototype._clearResultSet = function _clearResultSet() {
+/*
+ TDengineConnection.prototype._clearResultSet = function _clearResultSet() {
   var result = this._chandle.useResult(this._conn).result;
   if (result) {
     this._chandle.freeResult(result)
   }
 }
+*/
diff --git a/src/connector/nodejs/nodetaos/cursor.js b/src/connector/nodejs/nodetaos/cursor.js
index 092c19dfd4af715749510736b45493483cb12d14..0c9214fe32656fdfb7edb6cfc0d0c3587d4f7bb6 100644
--- a/src/connector/nodejs/nodetaos/cursor.js
+++ b/src/connector/nodejs/nodetaos/cursor.js
@@ -98,7 +98,7 @@ TDengineCursor.prototype.execute = function execute(operation, options, callback
   if (this._connection == null) {
     throw new errors.ProgrammingError('Cursor is not connected');
   }
-  this._connection._clearResultSet();
+
   this._reset_result();
 
   let stmt = operation;
@@ -111,18 +111,18 @@ TDengineCursor.prototype.execute = function execute(operation, options, callback
     });
     obs.observe({ entryTypes: ['measure'] });
     performance.mark('A');
-    res = this._chandle.query(this._connection._conn, stmt);
+    this._result = this._chandle.query(this._connection._conn, stmt);
     performance.mark('B');
     performance.measure('query', 'A', 'B');
   }
   else {
-    res = this._chandle.query(this._connection._conn, stmt);
+    this._result = this._chandle.query(this._connection._conn, stmt);
   }
-
+  res = this._chandle.errno(this._result);
   if (res == 0) {
-    let fieldCount = this._chandle.fieldsCount(this._connection._conn);
+    let fieldCount = this._chandle.fieldsCount(this._result);
     if (fieldCount == 0) {
-      let affectedRowCount = this._chandle.affectedRows(this._connection._conn);
+      let affectedRowCount = this._chandle.affectedRows(this._result);
       let response = this._createAffectedResponse(affectedRowCount, time)
       if (options['quiet'] != true) {
         console.log(response);
@@ -131,16 +131,15 @@ TDengineCursor.prototype.execute = function execute(operation, options, callback
       return affectedRowCount; //return num of affected rows, common with insert, use statements
     }
     else {
-      let resAndField = this._chandle.useResult(this._connection._conn, fieldCount)
-      this._result = resAndField.result;
-      this._fields = resAndField.fields;
-      this.fields = resAndField.fields;
+      this._fields = this._chandle.useResult(this._result);
+      this.fields = this._fields;
       wrapCB(callback);
+
       return this._result; //return a pointer to the result
     }
   }
   else {
-    throw new errors.ProgrammingError(this._chandle.errStr(this._connection._conn))
+    throw new errors.ProgrammingError(this._chandle.errStr(this._result))
   }
 
 }
@@ -198,18 +197,18 @@ TDengineCursor.prototype.fetchall = function fetchall(options, callback) {
   while(true) {
 
     let blockAndRows = this._chandle.fetchBlock(this._result, this._fields);
-
     let block = blockAndRows.blocks;
     let num_of_rows = blockAndRows.num_of_rows;
-
     if (num_of_rows == 0) {
       break;
     }
     this._rowcount += num_of_rows;
+    let numoffields = this._fields.length;
     for (let i = 0; i < num_of_rows; i++) {
       data.push([]);
-      let rowBlock = new Array(this._fields.length);
-      for (let j = 0; j < this._fields.length; j++) {
+      
+      let rowBlock = new Array(numoffields);
+      for (let j = 0; j < numoffields; j++) {
         rowBlock[j] = block[j][i];
       }
       data[data.length-1] = (rowBlock);
@@ -221,7 +220,7 @@ TDengineCursor.prototype.fetchall = function fetchall(options, callback) {
   let response = this._createSetResponse(this._rowcount, time)
   console.log(response);
 
-  this._connection._clearResultSet();
+ // this._connection._clearResultSet();
   let fields = this.fields;
   this._reset_result();
   this.data = data;
@@ -266,13 +265,15 @@ TDengineCursor.prototype.execute_a = function execute_a (operation, options, cal
     }
 
     if (resCode >= 0) {
-      let fieldCount = cr._chandle.numFields(res2);
-      if (fieldCount == 0) {
-        cr._chandle.freeResult(res2);
-      }
-      else {
-        return res2;
-      }
+//      let fieldCount = cr._chandle.numFields(res2);
+//      if (fieldCount == 0) {
+//        //cr._chandle.freeResult(res2);
+//        return res2;
+//      } 
+//      else {
+//        return res2;
+//      }
+      return res2;
 
     }
     else {
@@ -381,6 +382,9 @@ TDengineCursor.prototype.stopQuery = function stopQuery(result) {
 }
 TDengineCursor.prototype._reset_result = function _reset_result() {
   this._rowcount = -1;
+  if (this._result != null) {
+    this._chandle.freeResult(this._result);
+  }
   this._result = null;
   this._fields = null;
   this.data = [];
@@ -405,18 +409,16 @@ TDengineCursor.prototype.getClientInfo = function getClientInfo() {
 /**
  * Subscribe to a table from a database in TDengine.
  * @param {Object} config - A configuration object containing the configuration options for the subscription
- * @param {string} config.host - The host to subscribe to
- * @param {string} config.user - The user to subscribe as
- * @param {string} config.password - The password for the said user
- * @param {string} config.db - The db containing the table to subscribe to
- * @param {string} config.table - The name of the table to subscribe to
- * @param {number} config.time - The start time to start a subscription session
- * @param {number} config.mseconds - The pulling period of the subscription session
+ * @param {string} config.restart - whether or not to continue a subscription if it already exits, otherwise start from beginning
+ * @param {string} config.topic - The unique identifier of a subscription
+ * @param {string} config.sql - A sql statement for data query
+ * @param {string} config.interval - The pulling interval
  * @return {Buffer} A buffer pointing to the subscription session handle
  * @since 1.3.0
  */
 TDengineCursor.prototype.subscribe = function subscribe(config) {
-  return this._chandle.subscribe(config.host, config.user, config.password, config.db, config.table, config.time, config.mseconds);
+  let restart = config.restart ? 1 : 0;
+  return this._chandle.subscribe(this._connection._conn, restart, config.topic, config.sql, config.interval);
 };
 /**
  * An infinite loop that consumes the latest data and calls a callback function that is provided.
@@ -426,18 +428,8 @@ TDengineCursor.prototype.subscribe = function subscribe(config) {
  */
 TDengineCursor.prototype.consumeData = async function consumeData(subscription, callback) {
   while (true) {
-    let res = this._chandle.consume(subscription);
-    let data = [];
-    let num_of_rows = res.blocks[0].length;
-    for (let j = 0; j < num_of_rows; j++) {
-      data.push([]);
-      let rowBlock = new Array(res.fields.length);
-      for (let k = 0; k < res.fields.length; k++) {
-        rowBlock[k] = res.blocks[k][j];
-      }
-      data[data.length-1] = rowBlock;
-    }
-    callback(data, res.fields, subscription);
+    let { data, fields, result} = this._chandle.consume(subscription);
+    callback(data, fields, result);
   }
 }
 /**
diff --git a/src/connector/nodejs/package-lock.json b/src/connector/nodejs/package-lock.json
index ab7789f7c68b0f647012a22df5881ada29c64c47..d13fe6959c07955f5b15c7281f571ab932a996c3 100644
--- a/src/connector/nodejs/package-lock.json
+++ b/src/connector/nodejs/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "td-connector",
-  "version": "1.5.0",
+  "name": "td2.0-connector",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/connector/nodejs/package.json b/src/connector/nodejs/package.json
index 7f42d40a915144086da2eb0a035386ba35c0d328..3f0600a09ca73c3fadbed1b7e65c51b30004edf5 100644
--- a/src/connector/nodejs/package.json
+++ b/src/connector/nodejs/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "td-connector",
-  "version": "1.5.0",
+  "name": "td2.0-connector",
+  "version": "2.0.1",
   "description": "A Node.js connector for TDengine.",
   "main": "tdengine.js",
   "scripts": {
diff --git a/src/connector/nodejs/readme.md b/src/connector/nodejs/readme.md
index cf60b110248288424a16ab66bc67e5c8f8f94c0f..26a28afbdd514ad97e969302e7d790f6240bb770 100644
--- a/src/connector/nodejs/readme.md
+++ b/src/connector/nodejs/readme.md
@@ -1,23 +1,24 @@
 # TDengine Node.js connector
-[![minzip](https://img.shields.io/bundlephobia/minzip/td-connector.svg)](https://github.com/taosdata/TDengine/tree/master/src/connector/nodejs) [![NPM](https://img.shields.io/npm/l/td-connector.svg)](https://github.com/taosdata/TDengine/#what-is-tdengine)
+[![minzip](https://img.shields.io/bundlephobia/minzip/td2.0-connector.svg)](https://github.com/taosdata/TDengine/tree/master/src/connector/nodejs) [![NPM](https://img.shields.io/npm/l/td2.0-connector.svg)](https://github.com/taosdata/TDengine/#what-is-tdengine)
 
-This is the Node.js library that lets you connect to [TDengine](https://www.github.com/taosdata/tdengine). It is built so that you can use as much of it as you want or as little of it as you want through providing an extensive API. If you want the raw data in the form of an array of arrays for the row data retrieved from a table, you can do that. If you want to wrap that data with objects that allow you easily manipulate and display data such as using a prettifier function, you can do that!
+This is the Node.js library that lets you connect to [TDengine](https://www.github.com/taosdata/tdengine) 2.0 version. It is built so that you can use as much of it as you want or as little of it as you want through providing an extensive API. If you want the raw data in the form of an array of arrays for the row data retrieved from a table, you can do that. If you want to wrap that data with objects that allow you easily manipulate and display data such as using a prettifier function, you can do that!
 
 ## Installation
 
 To get started, just type in the following to install the connector through [npm](https://www.npmjs.com/)
 
 ```cmd
-npm install td-connector
+npm install td2.0-connector
 ```
 
 To interact with TDengine, we make use of the [node-gyp](https://github.com/nodejs/node-gyp) library. To install, you will need to install the following depending on platform (the following instructions are quoted from node-gyp)
 
-### On Unix
+### On Linux
 
 - `python` (`v2.7` recommended, `v3.x.x` is **not** supported)
 - `make`
 - A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
+- `node` (between `v10.x` and `v11.x`, other version has some dependency compatibility problems)
 
 ### On macOS
 
@@ -71,12 +72,12 @@ The following is a short summary of the basic usage of the connector, the  full
 
 ### Connection
 
-To use the connector, first require the library ```td-connector```. Running the function ```taos.connect``` with the connection options passed in as an object will return a TDengine connection object. The required connection option is ```host```, other options if not set, will be the default values as shown below.
+To use the connector, first require the library ```td2.0-connector```. Running the function ```taos.connect``` with the connection options passed in as an object will return a TDengine connection object. The required connection option is ```host```, other options if not set, will be the default values as shown below.
 
 A cursor also needs to be initialized in order to interact with TDengine from Node.js.
 
 ```javascript
-const taos = require('td-connector');
+const taos = require('td2.0-connector');
 var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:0})
 var cursor = conn.cursor(); // Initializing a new cursor
 ```
diff --git a/src/connector/nodejs/test/test.js b/src/connector/nodejs/test/test.js
index 67f0a783b95a0e375e73a9da7bee38f5812d2dbb..73dac8b26ce07ff159ce3de535776e2495d1ebde 100644
--- a/src/connector/nodejs/test/test.js
+++ b/src/connector/nodejs/test/test.js
@@ -19,7 +19,7 @@ function randomBool() {
 }
 
 // Initialize
-
+//c1.execute('drop database td_connector_test;');
 c1.execute('create database if not exists td_connector_test;');
 c1.execute('use td_connector_test;')
 c1.execute('create table if not exists all_types (ts timestamp, _int int, _bigint bigint, _float float, _double double, _binary binary(40), _smallint smallint, _tinyint tinyint, _bool bool, _nchar nchar(40));');
@@ -33,12 +33,12 @@ for (let i = 0; i < 10000; i++) {
                     parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // Int
                     parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // BigInt
                     parseFloat( R(-3.4E38, 3.4E38) ), // Float
-                    parseFloat( R(-1.7E308, 1.7E308) ), // Double
+                    parseFloat( R(-1.7E30, 1.7E30) ), // Double
                     "\"Long Binary\"", // Binary
                     parseInt( R(-32767, 32767) ), // Small Int
                     parseInt( R(-127, 127) ), // Tiny Int
                     randomBool(),
-                    "\"Nchars 一些中文字幕\""]; // Bool
+                    "\"Nchars\""]; // Bool
   c1.execute('insert into td_connector_test.all_types values(' + insertData.join(',') + ' );', {quiet:true});
   if (i % 1000 == 0) {
     console.log("Insert # " , i);
@@ -46,12 +46,14 @@ for (let i = 0; i < 10000; i++) {
 }
 
 // Select
-c1.execute('select * from td_connector_test.all_types limit 10 offset 1000;');
+console.log('select * from td_connector_test.all_types limit 3 offset 100;');
+c1.execute('select * from td_connector_test.all_types limit 2 offset 100;');
 var d = c1.fetchall();
 console.log(c1.fields);
 console.log(d);
 
 // Functions
+console.log('select count(*), avg(_int), sum(_float), max(_bigint), min(_double) from td_connector_test.all_types;')
 c1.execute('select count(*), avg(_int), sum(_float), max(_bigint), min(_double) from td_connector_test.all_types;');
 var d = c1.fetchall();
 console.log(c1.fields);
@@ -62,9 +64,11 @@ console.log(d);
 c1.query('select count(*), stddev(_double), min(_tinyint) from all_types where _tinyint > 50 and _int < 0;', true).then(function(result){
   result.pretty();
 })
+
 c1.query('select _tinyint, _bool from all_types where _tinyint > 50 and _int < 0 limit 50;', true).then(function(result){
   result.pretty();
 })
+
 c1.query('select stddev(_double), stddev(_bigint), stddev(_float) from all_types;', true).then(function(result){
   result.pretty();
 })
@@ -83,54 +87,58 @@ q.execute().then(function(r) {
 
 // Raw Async Testing (Callbacks, not promises)
 function cb2(param, result, rowCount, rd) {
+  console.log('CB2 Callbacked!');  
   console.log("RES *", result);
-  console.log("Async fetched", rowCount, "rows");
+  console.log("Async fetched", rowCount, " rows");
   console.log("Passed Param: ", param);
-  console.log("Fields", rd.fields);
-  console.log("Data", rd.data);
-
+  console.log("Fields ", rd.fields);
+  console.log("Data ", rd.data);
 }
 function cb1(param,result,code) {
-  console.log('Callbacked!');
-  console.log("RES *", result);
+  console.log('CB1 Callbacked!');
+  console.log("RES * ", result);
   console.log("Status: ", code);
-  console.log("Passed Param", param);
-  c1.fetchall_a(result, cb2, param)
+  console.log("Passed Param ", param);
+  c1.fetchall_a(result, cb2, param);
 }
 
 c1.execute_a("describe td_connector_test.all_types;", cb1, {myparam:3.141});
 
 function cb4(param, result, rowCount, rd) {
+  console.log('CB4 Callbacked!');  
   console.log("RES *", result);
   console.log("Async fetched", rowCount, "rows");
   console.log("Passed Param: ", param);
   console.log("Fields", rd.fields);
   console.log("Data", rd.data);
-
 }
 // Without directly calling fetchall_a
 var thisRes;
 function cb3(param,result,code) {
-  console.log('Callbacked!');
+  console.log('CB3 Callbacked!');
   console.log("RES *", result);
-  console.log("Status: ", code);
+  console.log("Status:", code);
   console.log("Passed Param", param);
   thisRes = result;
 }
 //Test calling execute and fetchall seperately and not through callbacks
 var param = c1.execute_a("describe td_connector_test.all_types;", cb3, {e:2.718});
 console.log("Passed Param outside of callback: ", param);
+console.log(param);
 setTimeout(function(){
   c1.fetchall_a(thisRes, cb4, param);
 },100);
 
 // Async through promises
-var aq = c1.query('select count(*) from td_connector_test.all_types;')
+var aq = c1.query('select count(*) from td_connector_test.all_types;',false);
 aq.execute_a().then(function(data) {
   data.pretty();
-})
+});
 c1.query('describe td_connector_test.stabletest;').execute_a().then(r=> r.pretty());
 setTimeout(function(){
   c1.query('drop database td_connector_test;');
+},200);
+setTimeout(function(){
+  conn.close();
 },2000);
-conn.close();
+
diff --git a/src/connector/nodejs/test/testSubscribe.js b/src/connector/nodejs/test/testSubscribe.js
new file mode 100644
index 0000000000000000000000000000000000000000..30fb3f425683f0113873534f2b67255db811edcc
--- /dev/null
+++ b/src/connector/nodejs/test/testSubscribe.js
@@ -0,0 +1,16 @@
+const taos = require('../tdengine');
+var conn = taos.connect({host:"127.0.0.1", user:"root", password:"taosdata", config:"/etc/taos",port:10});
+var c1 = conn.cursor();
+let stime = new Date();
+let interval = 1000;
+c1.execute('use td_connector_test');
+let sub = c1.subscribe({
+  restart: true,
+  sql: "select AVG(_int) from td_connector_test.all_Types;",
+  topic: 'all_Types',
+  interval: 1000
+});
+
+c1.consumeData(sub, (data, fields) => {
+  console.log(data);
+});
\ No newline at end of file
diff --git a/src/connector/python/linux/python2/dist/taos-1.4.15.linux-x86_64.tar.gz b/src/connector/python/linux/python2/dist/taos-1.4.15.linux-x86_64.tar.gz
deleted file mode 100644
index b9c4e9e5718f5b35956fc46e37a5a67d41a1ae3f..0000000000000000000000000000000000000000
Binary files a/src/connector/python/linux/python2/dist/taos-1.4.15.linux-x86_64.tar.gz and /dev/null differ
diff --git a/src/connector/python/linux/python2/dist/taos-1.4.15.tar.gz b/src/connector/python/linux/python2/dist/taos-1.4.15.tar.gz
deleted file mode 100644
index c50a957a2a6440342d37ad57b31a4a86d15cc2d4..0000000000000000000000000000000000000000
Binary files a/src/connector/python/linux/python2/dist/taos-1.4.15.tar.gz and /dev/null differ
diff --git a/src/connector/python/linux/python2/setup.py b/src/connector/python/linux/python2/setup.py
index ae5ebad671bc528ffcbc48c945c3df437fde0f1e..2e4f80b8f01723d0b0921051e2b1bacc96d30f0d 100644
--- a/src/connector/python/linux/python2/setup.py
+++ b/src/connector/python/linux/python2/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/linux/python2/taos.egg-info/PKG-INFO b/src/connector/python/linux/python2/taos.egg-info/PKG-INFO
deleted file mode 100644
index ce6d8c58b2199d5cc15fa7042e089383c30c6e20..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python2/taos.egg-info/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: taos
-Version: 1.4.15
-Summary: TDengine python client package
-Home-page: https://github.com/pypa/sampleproject
-Author: Taosdata Inc.
-Author-email: support@taosdata.com
-License: UNKNOWN
-Description: # TDengine python client interface
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Operating System :: Linux
-Description-Content-Type: text/markdown
diff --git a/src/connector/python/linux/python2/taos.egg-info/SOURCES.txt b/src/connector/python/linux/python2/taos.egg-info/SOURCES.txt
deleted file mode 100644
index 23a38056c07fbfca16754614dc0389d6893893ff..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python2/taos.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-README.md
-setup.py
-taos/__init__.py
-taos/cinterface.py
-taos/connection.py
-taos/constants.py
-taos/cursor.py
-taos/dbapi.py
-taos/error.py
-taos.egg-info/PKG-INFO
-taos.egg-info/SOURCES.txt
-taos.egg-info/dependency_links.txt
-taos.egg-info/top_level.txt
\ No newline at end of file
diff --git a/src/connector/python/linux/python2/taos.egg-info/dependency_links.txt b/src/connector/python/linux/python2/taos.egg-info/dependency_links.txt
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python2/taos.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/connector/python/linux/python2/taos.egg-info/top_level.txt b/src/connector/python/linux/python2/taos.egg-info/top_level.txt
deleted file mode 100644
index 6b5f0c008b9a67f85944b090fb33fc84bfcaaf7b..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python2/taos.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-taos
diff --git a/src/connector/python/linux/python2/taos/cinterface.py b/src/connector/python/linux/python2/taos/cinterface.py
index 505619436cc1ad5d01a4134aede29477c6f6ae48..c26e5c0967918bd45f362b3df6267561e80dfd66 100644
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
     for i in range(abs(num_of_rows)):
         try:
             if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
             else:
                 res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
         except ValueError:
@@ -129,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
-                ('bytes', ctypes.c_short),
-                ('type', ctypes.c_char)]
+    _fields_ = [('name', ctypes.c_char * 65),
+                ('type', ctypes.c_char),
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):
@@ -141,11 +142,15 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
+    libtaos.taos_query.restype = ctypes.POINTER(ctypes.c_void_p)
 
     def __init__(self, config=None):
         '''
@@ -247,12 +252,12 @@ class CTaosInterface(object):
             raise AttributeError("sql is expected as a string")
         # finally:
         #     CTaosInterface.libtaos.close(connection)
-
+      
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -290,18 +295,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -314,13 +318,18 @@ class CTaosInterface(object):
 
         isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
         blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
         for i in range(len(fields)):
             data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+            if data == None:
+                blocks[i] = [None] * num_of_rows
+                continue
 
             if fields[i]['type'] not in _CONVERT_FUNC:
                 raise DatabaseError("Invalid data type returned from database")
             
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
 
         return blocks, abs(num_of_rows)
 
@@ -330,8 +339,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -379,29 +388,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection)
+        return CTaosInterface.libtaos.taos_errstr(result)
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeResult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/linux/python2/taos/connection.py b/src/connector/python/linux/python2/taos/connection.py
index 04fbbdec04144624a0b1f4ba25083a91ade21cce..552250f1164ced467cd29b5084524985aca8848b 100644
--- a/src/connector/python/linux/python2/taos/connection.py
+++ b/src/connector/python/linux/python2/taos/connection.py
@@ -78,9 +78,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/linux/python2/taos/constants.py b/src/connector/python/linux/python2/taos/constants.py
index a994bceaf61894ac0bf9a719a574d00a09c584a5..feb7050a40b67f88a6d7ca859764fbbc6b36af1c 100644
--- a/src/connector/python/linux/python2/taos/constants.py
+++ b/src/connector/python/linux/python2/taos/constants.py
@@ -28,6 +28,6 @@ class FieldType(object):
     C_FLOAT_NULL = float('nan')
     C_DOUBLE_NULL = float('nan')
     C_BINARY_NULL = bytearray([int('0xff', 16)])
-    # Time precision definition
+    # Timestamp precision definition
     C_TIMESTAMP_MILLI = 0
     C_TIMESTAMP_MICRO = 1
diff --git a/src/connector/python/linux/python2/taos/cursor.py b/src/connector/python/linux/python2/taos/cursor.py
index f18920c553aedf6e475c66643e6c336455df77f4..8c268d8afba2b971709fba6f157abfebdc8dfd1a 100644
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
@@ -1,5 +1,7 @@
 from .cinterface import CTaosInterface
 from .error import *
+from .constants import FieldType
+
 
 class TDengineCursor(object):
     """Database cursor which is used to manage the context of a fetch operation.
@@ -19,7 +21,7 @@ class TDengineCursor(object):
             if the cursor has not had an operation invoked via the .execute*() method yet.
 
         .rowcount:This read-only attribute specifies the number of rows that the last
-            .execute*() produced (for DQL statements like SELECT) or affected 
+            .execute*() produced (for DQL statements like SELECT) or affected
     """
 
     def __init__(self, connection=None):
@@ -32,6 +34,7 @@ class TDengineCursor(object):
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
+        self._logfile = ""
 
         if connection is not None:
             self._connection = connection
@@ -44,13 +47,14 @@ class TDengineCursor(object):
             raise OperationalError("Invalid use of fetch iterator")
 
         if self._block_rows <= self._block_iter:
-            block, self._block_rows = CTaosInterface.fetchBlock(self._result, self._fields)
+            block, self._block_rows = CTaosInterface.fetchBlock(
+                self._result, self._fields)
             if self._block_rows == 0:
                 raise StopIteration
             self._block = list(map(tuple, zip(*block)))
             self._block_iter = 0
 
-        data =  self._block[self._block_iter]
+        data = self._block[self._block_iter]
         self._block_iter += 1
 
         return data
@@ -80,13 +84,15 @@ class TDengineCursor(object):
         """
         pass
 
+    def log(self, logfile):
+        self._logfile = logfile
+
     def close(self):
         """Close the cursor.
         """
         if self._connection is None:
             return False
-        
-        self._connection.clear_result_set()
+
         self._reset_result()
         self._connection = None
 
@@ -101,24 +107,37 @@ class TDengineCursor(object):
         if not self._connection:
             # TODO : change the exception raised here
             raise ProgrammingError("Cursor is not connected")
-        
-        self._connection.clear_result_set()
+
         self._reset_result()
 
         stmt = operation
         if params is not None:
             pass
-        
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+
+        # global querySeqNum
+        # querySeqNum += 1
+        # localSeqNum = querySeqNum # avoid raice condition
+        # print("   >> Exec Query ({}): {}".format(localSeqNum, str(stmt)))
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        # print("   << Query ({}) Exec Done".format(localSeqNum))
+        if (self._logfile):
+            with open(self._logfile, "a") as logfile:
+                logfile.write("%s;\n" % operation)
+
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(
+                    self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(
+                    self._result)
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(
+                CTaosInterface.errStr(
+                    self._result ), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -130,6 +149,37 @@ class TDengineCursor(object):
         """
         pass
 
+    def istype(self, col, dataType):
+        if (dataType.upper() == "BOOL"):
+            if (self._description[col][1] == FieldType.C_BOOL):
+                return True
+        if (dataType.upper() == "TINYINT"):
+            if (self._description[col][1] == FieldType.C_TINYINT):
+                return True
+        if (dataType.upper() == "INT"):
+            if (self._description[col][1] == FieldType.C_INT):
+                return True
+        if (dataType.upper() == "BIGINT"):
+            if (self._description[col][1] == FieldType.C_INT):
+                return True
+        if (dataType.upper() == "FLOAT"):
+            if (self._description[col][1] == FieldType.C_FLOAT):
+                return True
+        if (dataType.upper() == "DOUBLE"):
+            if (self._description[col][1] == FieldType.C_DOUBLE):
+                return True
+        if (dataType.upper() == "BINARY"):
+            if (self._description[col][1] == FieldType.C_BINARY):
+                return True
+        if (dataType.upper() == "TIMESTAMP"):
+            if (self._description[col][1] == FieldType.C_TIMESTAMP):
+                return True
+        if (dataType.upper() == "NCHAR"):
+            if (self._description[col][1] == FieldType.C_NCHAR):
+                return True
+
+        return False
+
     def fetchmany(self):
         pass
 
@@ -138,21 +188,20 @@ class TDengineCursor(object):
         """
         if self._result is None or self._fields is None:
             raise OperationalError("Invalid use of fetchall")
-        
+
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchBlock(self._result, self._fields)
-            if num_of_fields == 0: break
+            block, num_of_fields = CTaosInterface.fetchBlock(
+                self._result, self._fields)
+            if num_of_fields == 0:
+                break
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        self._connection.clear_result_set()
-        
-        return list(map(tuple, zip(*buffer)))
-
 
+        return list(map(tuple, zip(*buffer)))
 
     def nextset(self):
         """
@@ -170,18 +219,21 @@ class TDengineCursor(object):
         """
         self._description = None
         self._rowcount = -1
+        if self._result is not None:
+            CTaosInterface.freeResult(self._result)
         self._result = None
         self._fields = None
         self._block = None
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
-    
+
     def _handle_result(self):
         """Handle the return result from query.
         """
         self._description = []
         for ele in self._fields:
-            self._description.append((ele['name'], ele['type'], None, None, None, None, False))
-        
+            self._description.append(
+                (ele['name'], ele['type'], None, None, None, None, False))
+
         return self._result
diff --git a/src/connector/python/linux/python3/dist/taos-1.4.15.linux-x86_64.tar.gz b/src/connector/python/linux/python3/dist/taos-1.4.15.linux-x86_64.tar.gz
deleted file mode 100644
index 422fa8db5033ee3b1f3c586413a65ebeab22561d..0000000000000000000000000000000000000000
Binary files a/src/connector/python/linux/python3/dist/taos-1.4.15.linux-x86_64.tar.gz and /dev/null differ
diff --git a/src/connector/python/linux/python3/dist/taos-1.4.15.tar.gz b/src/connector/python/linux/python3/dist/taos-1.4.15.tar.gz
deleted file mode 100644
index 51622a16a53a5945ebc9566227ee8e59599c5783..0000000000000000000000000000000000000000
Binary files a/src/connector/python/linux/python3/dist/taos-1.4.15.tar.gz and /dev/null differ
diff --git a/src/connector/python/linux/python3/setup.py b/src/connector/python/linux/python3/setup.py
index 0669953ca32083b7878190a481e1a1c13f1260dc..03a49fc1c5bac82f66d9c4c8dcc5f796ab8209a9 100644
--- a/src/connector/python/linux/python3/setup.py
+++ b/src/connector/python/linux/python3/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/linux/python3/taos.egg-info/PKG-INFO b/src/connector/python/linux/python3/taos.egg-info/PKG-INFO
deleted file mode 100644
index b1a77c8ac7359192ed1c40ddfe79fb29aa1a596e..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python3/taos.egg-info/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: taos
-Version: 1.4.15
-Summary: TDengine python client package
-Home-page: https://github.com/pypa/sampleproject
-Author: Taosdata Inc.
-Author-email: support@taosdata.com
-License: UNKNOWN
-Description: # TDengine python client interface
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: Linux
-Description-Content-Type: text/markdown
diff --git a/src/connector/python/linux/python3/taos.egg-info/SOURCES.txt b/src/connector/python/linux/python3/taos.egg-info/SOURCES.txt
deleted file mode 100644
index 23a38056c07fbfca16754614dc0389d6893893ff..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python3/taos.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-README.md
-setup.py
-taos/__init__.py
-taos/cinterface.py
-taos/connection.py
-taos/constants.py
-taos/cursor.py
-taos/dbapi.py
-taos/error.py
-taos.egg-info/PKG-INFO
-taos.egg-info/SOURCES.txt
-taos.egg-info/dependency_links.txt
-taos.egg-info/top_level.txt
\ No newline at end of file
diff --git a/src/connector/python/linux/python3/taos.egg-info/dependency_links.txt b/src/connector/python/linux/python3/taos.egg-info/dependency_links.txt
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python3/taos.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/connector/python/linux/python3/taos.egg-info/top_level.txt b/src/connector/python/linux/python3/taos.egg-info/top_level.txt
deleted file mode 100644
index 6b5f0c008b9a67f85944b090fb33fc84bfcaaf7b..0000000000000000000000000000000000000000
--- a/src/connector/python/linux/python3/taos.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-taos
diff --git a/src/connector/python/linux/python3/taos/cinterface.py b/src/connector/python/linux/python3/taos/cinterface.py
index 7fcedc9fe9400cc8db007897906d4568c2eb234f..c9d0551af5faedc0b9726fa9be28337f26bba079 100644
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
     for i in range(abs(num_of_rows)):
         try:
             if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
             else:
                 res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
         except ValueError:
@@ -129,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
-                ('bytes', ctypes.c_short),
-                ('type', ctypes.c_char)]
+    _fields_ = [('name', ctypes.c_char * 65),
+                ('type', ctypes.c_char),
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):
@@ -141,11 +142,15 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
+    libtaos.taos_query.restype = ctypes.POINTER(ctypes.c_void_p)
 
     def __init__(self, config=None):
         '''
@@ -221,8 +226,8 @@ class CTaosInterface(object):
         if connection.value == None:
             print('connect to TDengine failed')
             # sys.exit(1)
-        else:
-            print('connect to TDengine success')
+        #else:
+        #    print('connect to TDengine success')
 
         return connection
 
@@ -231,7 +236,7 @@ class CTaosInterface(object):
         '''Close the TDengine handle
         '''
         CTaosInterface.libtaos.taos_close(connection)
-        print('connection is closed')
+        #print('connection is closed')
 
     @staticmethod
     def query(connection, sql):
@@ -247,12 +252,12 @@ class CTaosInterface(object):
             raise AttributeError("sql is expected as a string")
         # finally:
         #     CTaosInterface.libtaos.close(connection)
-
+      
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -290,18 +295,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -314,13 +318,18 @@ class CTaosInterface(object):
 
         isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
         blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
         for i in range(len(fields)):
             data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+            if data == None:
+                blocks[i] = [None] * num_of_rows
+                continue
 
             if fields[i]['type'] not in _CONVERT_FUNC:
                 raise DatabaseError("Invalid data type returned from database")
             
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
 
         return blocks, abs(num_of_rows)
 
@@ -330,8 +339,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -379,29 +388,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection).decode('utf-8')
+        return CTaosInterface.libtaos.taos_errstr(result).decode('utf-8')
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeResult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/linux/python3/taos/connection.py b/src/connector/python/linux/python3/taos/connection.py
index 04fbbdec04144624a0b1f4ba25083a91ade21cce..552250f1164ced467cd29b5084524985aca8848b 100644
--- a/src/connector/python/linux/python3/taos/connection.py
+++ b/src/connector/python/linux/python3/taos/connection.py
@@ -78,9 +78,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/linux/python3/taos/cursor.py b/src/connector/python/linux/python3/taos/cursor.py
index 7a0ae767bc26122c0d8f404b2d9bc7590d2c3795..3f0f315d3388fcac1c752c847b7fa1c412b06749 100644
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
@@ -1,5 +1,10 @@
 from .cinterface import CTaosInterface
 from .error import *
+from .constants import FieldType
+import threading
+
+# querySeqNum = 0
+
 
 class TDengineCursor(object):
     """Database cursor which is used to manage the context of a fetch operation.
@@ -19,7 +24,7 @@ class TDengineCursor(object):
             if the cursor has not had an operation invoked via the .execute*() method yet.
 
         .rowcount:This read-only attribute specifies the number of rows that the last
-            .execute*() produced (for DQL statements like SELECT) or affected 
+            .execute*() produced (for DQL statements like SELECT) or affected
     """
 
     def __init__(self, connection=None):
@@ -32,6 +37,8 @@ class TDengineCursor(object):
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
+        self._logfile = ""
+        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection
@@ -44,13 +51,14 @@ class TDengineCursor(object):
             raise OperationalError("Invalid use of fetch iterator")
 
         if self._block_rows <= self._block_iter:
-            block, self._block_rows = CTaosInterface.fetchBlock(self._result, self._fields)
+            block, self._block_rows = CTaosInterface.fetchBlock(
+                self._result, self._fields)
             if self._block_rows == 0:
                 raise StopIteration
             self._block = list(map(tuple, zip(*block)))
             self._block_iter = 0
 
-        data =  self._block[self._block_iter]
+        data = self._block[self._block_iter]
         self._block_iter += 1
 
         return data
@@ -80,13 +88,15 @@ class TDengineCursor(object):
         """
         pass
 
+    def log(self, logfile):
+        self._logfile = logfile
+
     def close(self):
         """Close the cursor.
         """
         if self._connection is None:
             return False
-        
-        self._connection.clear_result_set()
+
         self._reset_result()
         self._connection = None
 
@@ -95,30 +105,49 @@ class TDengineCursor(object):
     def execute(self, operation, params=None):
         """Prepare and execute a database operation (query or command).
         """
+        # if threading.get_ident() != self._threadId:
+        #     info ="Cursor execute:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
+        #     raise OperationalError(info)
+            # print(info)
+            # return None
+
         if not operation:
             return None
 
         if not self._connection:
             # TODO : change the exception raised here
             raise ProgrammingError("Cursor is not connected")
-        
-        self._connection.clear_result_set()
+
         self._reset_result()
 
         stmt = operation
         if params is not None:
             pass
-        
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+
+        # global querySeqNum
+        # querySeqNum += 1
+        # localSeqNum = querySeqNum # avoid raice condition
+        # print("   >> Exec Query ({}): {}".format(localSeqNum, str(stmt)))
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        # print("   << Query ({}) Exec Done".format(localSeqNum))
+        if (self._logfile):
+            with open(self._logfile, "a") as logfile:
+                logfile.write("%s;\n" % operation)
+
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(
+                    self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(
+                    self._result)
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(
+                CTaosInterface.errStr(
+                    self._result), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -133,27 +162,61 @@ class TDengineCursor(object):
     def fetchmany(self):
         pass
 
+    def istype(self, col, dataType):
+        if (dataType.upper() == "BOOL"):
+            if (self._description[col][1] == FieldType.C_BOOL):
+                return True
+        if (dataType.upper() == "TINYINT"):
+            if (self._description[col][1] == FieldType.C_TINYINT):
+                return True
+        if (dataType.upper() == "INT"):
+            if (self._description[col][1] == FieldType.C_INT):
+                return True
+        if (dataType.upper() == "BIGINT"):
+            if (self._description[col][1] == FieldType.C_INT):
+                return True
+        if (dataType.upper() == "FLOAT"):
+            if (self._description[col][1] == FieldType.C_FLOAT):
+                return True
+        if (dataType.upper() == "DOUBLE"):
+            if (self._description[col][1] == FieldType.C_DOUBLE):
+                return True
+        if (dataType.upper() == "BINARY"):
+            if (self._description[col][1] == FieldType.C_BINARY):
+                return True
+        if (dataType.upper() == "TIMESTAMP"):
+            if (self._description[col][1] == FieldType.C_TIMESTAMP):
+                return True
+        if (dataType.upper() == "NCHAR"):
+            if (self._description[col][1] == FieldType.C_NCHAR):
+                return True
+
+        return False
+
     def fetchall(self):
         """Fetch all (remaining) rows of a query result, returning them as a sequence of sequences (e.g. a list of tuples). Note that the cursor's arraysize attribute can affect the performance of this operation.
         """
+        # if threading.get_ident() != self._threadId:
+        #     info ="[WARNING] Cursor fetchall:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
+        #     raise OperationalError(info)
+            # print(info)
+            # return None
         if self._result is None or self._fields is None:
             raise OperationalError("Invalid use of fetchall")
-        
+
         buffer = [[] for i in range(len(self._fields))]
         self._rowcount = 0
         while True:
-            block, num_of_fields = CTaosInterface.fetchBlock(self._result, self._fields)
-            if num_of_fields == 0: break
+            block, num_of_fields = CTaosInterface.fetchBlock(
+                self._result, self._fields)
+            if num_of_fields == 0:
+                break
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        self._connection.clear_result_set()
-        
         return list(map(tuple, zip(*buffer)))
 
-
-
     def nextset(self):
         """
         """
@@ -170,18 +233,28 @@ class TDengineCursor(object):
         """
         self._description = None
         self._rowcount = -1
+        if self._result is not None:
+            CTaosInterface.freeResult(self._result)
         self._result = None
         self._fields = None
         self._block = None
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
-    
+
     def _handle_result(self):
         """Handle the return result from query.
         """
+        # if threading.get_ident() != self._threadId:
+        #     info = "Cursor handleresult:Thread ID not match,creater:"+str(self._threadId)+" caller:"+str(threading.get_ident())
+        #     raise OperationalError(info)
+            # print(info)
+            # return None
+
         self._description = []
         for ele in self._fields:
-            self._description.append((ele['name'], ele['type'], None, None, None, None, False))
-        
+            self._description.append(
+                (ele['name'], ele['type'], None, None, None, None, False))
+
         return self._result
+
diff --git a/src/connector/python/windows/python2/dist/taos-1.4.15-py2-none-any.whl b/src/connector/python/windows/python2/dist/taos-1.4.15-py2-none-any.whl
deleted file mode 100644
index 6e97d3a5e40a62e80b633ab7e728839b4299b506..0000000000000000000000000000000000000000
Binary files a/src/connector/python/windows/python2/dist/taos-1.4.15-py2-none-any.whl and /dev/null differ
diff --git a/src/connector/python/windows/python2/dist/taos-1.4.15.tar.gz b/src/connector/python/windows/python2/dist/taos-1.4.15.tar.gz
deleted file mode 100644
index dcc20602426b475eaa88cd9aa9877a53cd72a62e..0000000000000000000000000000000000000000
Binary files a/src/connector/python/windows/python2/dist/taos-1.4.15.tar.gz and /dev/null differ
diff --git a/src/connector/python/windows/python2/setup.py b/src/connector/python/windows/python2/setup.py
index cace06f443b113b1efef4e15133eee96bbef91d3..fd82a55650fcc284892d8387fbcf8666398f4d1a 100644
--- a/src/connector/python/windows/python2/setup.py
+++ b/src/connector/python/windows/python2/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/windows/python2/taos.egg-info/PKG-INFO b/src/connector/python/windows/python2/taos.egg-info/PKG-INFO
deleted file mode 100644
index 9673ab6c5cd27eaa998b6e537bee90e72aeffc8d..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python2/taos.egg-info/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: taos
-Version: 1.4.15
-Summary: TDengine python client package
-Home-page: https://github.com/pypa/sampleproject
-Author: Taosdata Inc.
-Author-email: support@taosdata.com
-License: UNKNOWN
-Description: # TDengine python client interface
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 2
-Classifier: Operating System :: Windows
-Description-Content-Type: text/markdown
diff --git a/src/connector/python/windows/python2/taos.egg-info/SOURCES.txt b/src/connector/python/windows/python2/taos.egg-info/SOURCES.txt
deleted file mode 100644
index 23a38056c07fbfca16754614dc0389d6893893ff..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python2/taos.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-README.md
-setup.py
-taos/__init__.py
-taos/cinterface.py
-taos/connection.py
-taos/constants.py
-taos/cursor.py
-taos/dbapi.py
-taos/error.py
-taos.egg-info/PKG-INFO
-taos.egg-info/SOURCES.txt
-taos.egg-info/dependency_links.txt
-taos.egg-info/top_level.txt
\ No newline at end of file
diff --git a/src/connector/python/windows/python2/taos.egg-info/dependency_links.txt b/src/connector/python/windows/python2/taos.egg-info/dependency_links.txt
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python2/taos.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/connector/python/windows/python2/taos.egg-info/top_level.txt b/src/connector/python/windows/python2/taos.egg-info/top_level.txt
deleted file mode 100644
index 6b5f0c008b9a67f85944b090fb33fc84bfcaaf7b..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python2/taos.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-taos
diff --git a/src/connector/python/windows/python2/taos/cinterface.py b/src/connector/python/windows/python2/taos/cinterface.py
index f8cdfcc51ea1ea9ae5789c47f2b9e54879a53934..6a9c5bfcef0d317844b6b58796f307e5cf155a43 100644
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
     for i in range(abs(num_of_rows)):
         try:
             if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
             else:
                 res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
         except ValueError:
@@ -129,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
-                ('bytes', ctypes.c_short),
-                ('type', ctypes.c_char)]
+    _fields_ = [('name', ctypes.c_char * 65),
+                ('type', ctypes.c_char),
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):
@@ -141,11 +142,15 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
+    libtaos.taos_query.restype = ctypes.POINTER(ctypes.c_void_p)
 
     def __init__(self, config=None):
         '''
@@ -249,10 +254,10 @@ class CTaosInterface(object):
         #     CTaosInterface.libtaos.close(connection)
 
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -290,18 +295,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -314,13 +318,18 @@ class CTaosInterface(object):
 
         isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
         blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
         for i in range(len(fields)):
             data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+            if data == None:
+                blocks[i] = [None] * num_of_rows
+                continue
 
             if fields[i]['type'] not in _CONVERT_FUNC:
                 raise DatabaseError("Invalid data type returned from database")
             
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
 
         return blocks, abs(num_of_rows)
 
@@ -330,8 +339,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -379,29 +388,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection)
+        return CTaosInterface.libtaos.taos_errstr(result)
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeResult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/windows/python2/taos/connection.py b/src/connector/python/windows/python2/taos/connection.py
index e2783975d9c0f63c82a90b41a11fbaa0a3ffb5ac..d9576a553b810a975429b2cefc03e5e60f240a88 100644
--- a/src/connector/python/windows/python2/taos/connection.py
+++ b/src/connector/python/windows/python2/taos/connection.py
@@ -79,9 +79,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/windows/python2/taos/cursor.py b/src/connector/python/windows/python2/taos/cursor.py
index 976ec06707e7dd6f0a86a84ea9bce80e786875bc..7eee3bfc8f8559454f53aa967f5ad0294a1cb2bf 100644
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
@@ -86,7 +86,6 @@ class TDengineCursor(object):
         if self._connection is None:
             return False
         
-        self._connection.clear_result_set()
         self._reset_result()
         self._connection = None
 
@@ -102,23 +101,23 @@ class TDengineCursor(object):
             # TODO : change the exception raised here
             raise ProgrammingError("Cursor is not connected")
         
-        self._connection.clear_result_set()
         self._reset_result()
 
         stmt = operation
         if params is not None:
             pass
         
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(self._result)
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(self._result)
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(CTaosInterface.errStr(self._result), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -148,7 +147,6 @@ class TDengineCursor(object):
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        self._connection.clear_result_set()
         
         return list(map(tuple, zip(*buffer)))
 
@@ -170,6 +168,8 @@ class TDengineCursor(object):
         """
         self._description = None
         self._rowcount = -1
+        if self._result is not None:
+            CTaosInterface.freeResult(self._result)        
         self._result = None
         self._fields = None
         self._block = None
diff --git a/src/connector/python/windows/python3/dist/taos-1.4.15-py3-none-any.whl b/src/connector/python/windows/python3/dist/taos-1.4.15-py3-none-any.whl
deleted file mode 100644
index 3c4c8a34a6afd0121fe6c560f0d9499d8dbf5a9c..0000000000000000000000000000000000000000
Binary files a/src/connector/python/windows/python3/dist/taos-1.4.15-py3-none-any.whl and /dev/null differ
diff --git a/src/connector/python/windows/python3/dist/taos-1.4.15.tar.gz b/src/connector/python/windows/python3/dist/taos-1.4.15.tar.gz
deleted file mode 100644
index 6294828f6db7768f6b307b36f1cc3d43b4da0749..0000000000000000000000000000000000000000
Binary files a/src/connector/python/windows/python3/dist/taos-1.4.15.tar.gz and /dev/null differ
diff --git a/src/connector/python/windows/python3/setup.py b/src/connector/python/windows/python3/setup.py
index 7cac04b723ae557194c9d52c23a594bda1934b43..9abdace5a9953279d5d7ba9ec6eeab7dfe0500fe 100644
--- a/src/connector/python/windows/python3/setup.py
+++ b/src/connector/python/windows/python3/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/windows/python3/taos.egg-info/PKG-INFO b/src/connector/python/windows/python3/taos.egg-info/PKG-INFO
deleted file mode 100644
index 191327092b8e08799979cfa2ff7e7818af513c7f..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python3/taos.egg-info/PKG-INFO
+++ /dev/null
@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: taos
-Version: 1.4.15
-Summary: TDengine python client package
-Home-page: https://github.com/pypa/sampleproject
-Author: Hongze Cheng
-Author-email: hzcheng@taosdata.com
-License: UNKNOWN
-Description: # TDengine python client interface
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: Windows
-Description-Content-Type: text/markdown
diff --git a/src/connector/python/windows/python3/taos.egg-info/SOURCES.txt b/src/connector/python/windows/python3/taos.egg-info/SOURCES.txt
deleted file mode 100644
index 0dbf14e5b66927ae3af1e99843c3d5ab84a222f7..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python3/taos.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-README.md
-setup.py
-taos/__init__.py
-taos/cinterface.py
-taos/connection.py
-taos/constants.py
-taos/cursor.py
-taos/dbapi.py
-taos/error.py
-taos.egg-info/PKG-INFO
-taos.egg-info/SOURCES.txt
-taos.egg-info/dependency_links.txt
-taos.egg-info/top_level.txt
\ No newline at end of file
diff --git a/src/connector/python/windows/python3/taos.egg-info/dependency_links.txt b/src/connector/python/windows/python3/taos.egg-info/dependency_links.txt
deleted file mode 100644
index d3f5a12faa99758192ecc4ed3fc22c9249232e86..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python3/taos.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/connector/python/windows/python3/taos.egg-info/top_level.txt b/src/connector/python/windows/python3/taos.egg-info/top_level.txt
deleted file mode 100644
index bb442feabdde9fc9c6e9bfca85ca25a1ba0e42ab..0000000000000000000000000000000000000000
--- a/src/connector/python/windows/python3/taos.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-taos
diff --git a/src/connector/python/windows/python3/taos/cinterface.py b/src/connector/python/windows/python3/taos/cinterface.py
index b4b44e199c37cf90c9beddb16433591bc0713b23..fa7124431c92a179b2a0042b57e8ad45609ea352 100644
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@@ -96,7 +96,8 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
     for i in range(abs(num_of_rows)):
         try:
             if num_of_rows >= 0:
-                res.append( (ctypes.cast(data+nbytes*(abs(num_of_rows - i -1)),  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
+                tmpstr = ctypes.c_char_p(data)
+                res.append( tmpstr.value.decode() )
             else:
                 res.append( (ctypes.cast(data+nbytes*i,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[0].value )
         except ValueError:
@@ -129,9 +130,9 @@ _CONVERT_FUNC = {
 
 # Corresponding TAOS_FIELD structure in C
 class TaosField(ctypes.Structure):
-    _fields_ = [('name', ctypes.c_char * 64),
-                ('bytes', ctypes.c_short),
-                ('type', ctypes.c_char)]
+    _fields_ = [('name', ctypes.c_char * 65),
+                ('type', ctypes.c_char),
+                ('bytes', ctypes.c_short)]
 
 # C interface class
 class CTaosInterface(object):
@@ -141,11 +142,15 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
+    libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
+    libtaos.taos_query.restype = ctypes.POINTER(ctypes.c_void_p)
 
     def __init__(self, config=None):
         '''
@@ -249,10 +254,10 @@ class CTaosInterface(object):
         #     CTaosInterface.libtaos.close(connection)
 
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -290,18 +295,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -314,13 +318,18 @@ class CTaosInterface(object):
 
         isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
         blocks = [None] * len(fields)
+        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
         for i in range(len(fields)):
             data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+            if data == None:
+                blocks[i] = [None] * num_of_rows
+                continue
 
             if fields[i]['type'] not in _CONVERT_FUNC:
                 raise DatabaseError("Invalid data type returned from database")
             
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fields[i]['bytes'], isMicro)
+            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
 
         return blocks, abs(num_of_rows)
 
@@ -330,8 +339,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -379,29 +388,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection).decode('utf-8')
+        return CTaosInterface.libtaos.taos_errstr(result).decode('utf-8')
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeResult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/windows/python3/taos/connection.py b/src/connector/python/windows/python3/taos/connection.py
index e2783975d9c0f63c82a90b41a11fbaa0a3ffb5ac..d9576a553b810a975429b2cefc03e5e60f240a88 100644
--- a/src/connector/python/windows/python3/taos/connection.py
+++ b/src/connector/python/windows/python3/taos/connection.py
@@ -79,9 +79,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/windows/python3/taos/cursor.py b/src/connector/python/windows/python3/taos/cursor.py
index c7f34006422b559e21b75f36dcf81248e0b94713..5f5aa4e1d7d9b454132f533a9e84cca2859db735 100644
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
@@ -86,7 +86,6 @@ class TDengineCursor(object):
         if self._connection is None:
             return False
         
-        self._connection.clear_result_set()
         self._reset_result()
         self._connection = None
 
@@ -102,23 +101,23 @@ class TDengineCursor(object):
             # TODO : change the exception raised here
             raise ProgrammingError("Cursor is not connected")
         
-        self._connection.clear_result_set()
         self._reset_result()
 
         stmt = operation
         if params is not None:
             pass
         
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(self._result )
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(CTaosInterface.errStr(self._result ), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -148,7 +147,6 @@ class TDengineCursor(object):
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
 
-        self._connection.clear_result_set()
         
         return list(map(tuple, zip(*buffer)))
 
@@ -170,6 +168,8 @@ class TDengineCursor(object):
         """
         self._description = None
         self._rowcount = -1
+        if self._result is not None:
+            CTaosInterface.freeResult(self._result)
         self._result = None
         self._fields = None
         self._block = None
diff --git a/src/cq/CMakeLists.txt b/src/cq/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e6313973484467e4b67be88ffc21225923739b71
--- /dev/null
+++ b/src/cq/CMakeLists.txt
@@ -0,0 +1,17 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(tcq ${SRC})
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(tcq tutil common taos_static)
+  ELSE ()  
+    TARGET_LINK_LIBRARIES(tcq tutil common taos)
+  ENDIF ()
+  ADD_SUBDIRECTORY(test)
+ENDIF ()
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a99a84b8ebfe8ed503213299646da39b5b1d27a
--- /dev/null
+++ b/src/cq/src/cqMain.c
@@ -0,0 +1,340 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "taos.h"
+#include "tsclient.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "ttimer.h"
+#include "tcq.h"
+#include "tdataformat.h"
+#include "tglobal.h"
+#include "tlog.h"
+#include "twal.h"
+
+#define cFatal(...) { if (cqDebugFlag & DEBUG_FATAL) { taosPrintLog("CQ  FATAL ", 255, __VA_ARGS__); }}
+#define cError(...) { if (cqDebugFlag & DEBUG_ERROR) { taosPrintLog("CQ  ERROR ", 255, __VA_ARGS__); }}
+#define cWarn(...)  { if (cqDebugFlag & DEBUG_WARN)  { taosPrintLog("CQ  WARN ", 255, __VA_ARGS__); }}
+#define cInfo(...)  { if (cqDebugFlag & DEBUG_INFO)  { taosPrintLog("CQ  ", 255, __VA_ARGS__); }}
+#define cDebug(...) { if (cqDebugFlag & DEBUG_DEBUG) { taosPrintLog("CQ  ", cqDebugFlag, __VA_ARGS__); }}
+#define cTrace(...) { if (cqDebugFlag & DEBUG_TRACE) { taosPrintLog("CQ  ", cqDebugFlag, __VA_ARGS__); }}
+
+typedef struct {
+  int      vgId;
+  char     user[TSDB_USER_LEN];
+  char     pass[TSDB_PASSWORD_LEN];
+  char     db[TSDB_DB_NAME_LEN];
+  FCqWrite cqWrite;
+  void    *ahandle;
+  int      num;      // number of continuous streams
+  struct SCqObj *pHead;
+  void    *dbConn;
+  int      master;
+  void    *tmrCtrl;
+  pthread_mutex_t mutex;
+} SCqContext;
+
+typedef struct SCqObj {
+  tmr_h          tmrId;
+  uint64_t       uid;
+  int32_t        tid;      // table ID
+  int            rowSize;  // bytes of a row
+  char *         sqlStr;   // SQL string
+  STSchema *     pSchema;  // pointer to schema array
+  void *         pStream;
+  struct SCqObj *prev;
+  struct SCqObj *next;
+  SCqContext *   pContext;
+} SCqObj;
+
+static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row); 
+static void cqCreateStream(SCqContext *pContext, SCqObj *pObj);
+
+void *cqOpen(void *ahandle, const SCqCfg *pCfg) {
+  SCqContext *pContext = calloc(sizeof(SCqContext), 1);
+  if (pContext == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  pContext->tmrCtrl = taosTmrInit(0, 0, 0, "CQ");
+
+  tstrncpy(pContext->user, pCfg->user, sizeof(pContext->user));
+  tstrncpy(pContext->pass, pCfg->pass, sizeof(pContext->pass));
+  const char* db = pCfg->db;
+  for (const char* p = db; *p != 0; p++) {
+    if (*p == '.') {
+      db = p + 1;
+      break;
+    }
+  }
+  tstrncpy(pContext->db, db, sizeof(pContext->db));
+  pContext->vgId = pCfg->vgId;
+  pContext->cqWrite = pCfg->cqWrite;
+  pContext->ahandle = ahandle;
+  tscEmbedded = 1;
+
+  pthread_mutex_init(&pContext->mutex, NULL);
+
+  cInfo("vgId:%d, CQ is opened", pContext->vgId);
+
+  return pContext;
+}
+
+void cqClose(void *handle) {
+  SCqContext *pContext = handle;
+  if (handle == NULL) return;
+
+  // stop all CQs
+  cqStop(pContext);
+
+  // free all resources
+  pthread_mutex_lock(&pContext->mutex);
+
+  SCqObj *pObj = pContext->pHead;
+  while (pObj) {
+    SCqObj *pTemp = pObj;
+    pObj = pObj->next;
+    tdFreeSchema(pTemp->pSchema);
+    taosTFree(pTemp->sqlStr);
+    free(pTemp);
+  } 
+  
+  pthread_mutex_unlock(&pContext->mutex);
+
+  pthread_mutex_destroy(&pContext->mutex);
+
+  taosTmrCleanUp(pContext->tmrCtrl);
+  pContext->tmrCtrl = NULL;
+
+  cInfo("vgId:%d, CQ is closed", pContext->vgId);
+  free(pContext);
+}
+
+void cqStart(void *handle) {
+  SCqContext *pContext = handle;
+  if (pContext->dbConn || pContext->master) return;
+
+  cInfo("vgId:%d, start all CQs", pContext->vgId);
+  pthread_mutex_lock(&pContext->mutex);
+
+  pContext->master = 1;
+
+  SCqObj *pObj = pContext->pHead;
+  while (pObj) {
+    cqCreateStream(pContext, pObj);
+    pObj = pObj->next;
+  }
+
+  pthread_mutex_unlock(&pContext->mutex);
+}
+
+void cqStop(void *handle) {
+  SCqContext *pContext = handle;
+  cInfo("vgId:%d, stop all CQs", pContext->vgId);
+  if (pContext->dbConn == NULL || pContext->master == 0) return;
+
+  pthread_mutex_lock(&pContext->mutex);
+
+  pContext->master = 0;
+  SCqObj *pObj = pContext->pHead;
+  while (pObj) {
+    if (pObj->pStream) {
+      taos_close_stream(pObj->pStream);
+      pObj->pStream = NULL;
+      cInfo("vgId:%d, id:%d CQ:%s is closed", pContext->vgId, pObj->tid, pObj->sqlStr);
+    } else {
+      taosTmrStop(pObj->tmrId);
+      pObj->tmrId = 0;
+    }
+    pObj = pObj->next;
+  }
+
+  if (pContext->dbConn) taos_close(pContext->dbConn);
+  pContext->dbConn = NULL;
+
+  pthread_mutex_unlock(&pContext->mutex);
+}
+
+void *cqCreate(void *handle, uint64_t uid, int tid, char *sqlStr, STSchema *pSchema) {
+  SCqContext *pContext = handle;
+
+  SCqObj *pObj = calloc(sizeof(SCqObj), 1);
+  if (pObj == NULL) return NULL;
+
+  pObj->uid = uid;
+  pObj->tid = tid;
+  pObj->sqlStr = malloc(strlen(sqlStr)+1);
+  strcpy(pObj->sqlStr, sqlStr);
+
+  pObj->pSchema = tdDupSchema(pSchema);
+  pObj->rowSize = schemaTLen(pSchema);
+
+  cInfo("vgId:%d, id:%d CQ:%s is created", pContext->vgId, pObj->tid, pObj->sqlStr);
+
+  pthread_mutex_lock(&pContext->mutex);
+
+  pObj->next = pContext->pHead;
+  if (pContext->pHead) pContext->pHead->prev = pObj;
+  pContext->pHead = pObj;
+
+  cqCreateStream(pContext, pObj);
+
+  pthread_mutex_unlock(&pContext->mutex);
+
+  return pObj;
+}
+
+void cqDrop(void *handle) {
+  SCqObj *pObj = handle;
+  SCqContext *pContext = pObj->pContext;
+
+  pthread_mutex_lock(&pContext->mutex);
+
+  if (pObj->prev) {
+    pObj->prev->next = pObj->next;
+  } else {
+    pContext->pHead = pObj->next;
+  }
+
+  if (pObj->next) {
+    pObj->next->prev = pObj->prev;
+  }
+
+  // free the resources associated
+  if (pObj->pStream) {
+    taos_close_stream(pObj->pStream);
+    pObj->pStream = NULL;
+  } else {
+    taosTmrStop(pObj->tmrId);
+    pObj->tmrId = 0;
+  }
+
+  cInfo("vgId:%d, id:%d CQ:%s is dropped", pContext->vgId, pObj->tid, pObj->sqlStr); 
+  tdFreeSchema(pObj->pSchema);
+  free(pObj->sqlStr);
+  free(pObj);
+
+  pthread_mutex_unlock(&pContext->mutex);
+}
+
+static void doCreateStream(void *param, TAOS_RES *result, int code) {
+  SCqObj* pObj = (SCqObj*)param;
+  SCqContext* pContext = pObj->pContext;
+  SSqlObj* pSql = (SSqlObj*)result;
+  pContext->dbConn = pSql->pTscObj;
+  cqCreateStream(pContext, pObj);
+}
+
+static void cqProcessCreateTimer(void *param, void *tmrId) {
+  SCqObj* pObj = (SCqObj*)param;
+  SCqContext* pContext = pObj->pContext;
+
+  if (pContext->dbConn == NULL) {
+    cDebug("vgId:%d, try connect to TDengine", pContext->vgId);
+    taos_connect_a(NULL, pContext->user, pContext->pass, pContext->db, 0, doCreateStream, param, NULL);
+  } else {
+    cqCreateStream(pContext, pObj);
+  }
+}
+
+static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
+  pObj->pContext = pContext;
+
+  if (pContext->dbConn == NULL) {
+    cDebug("vgId:%d, create dbConn after 1000 ms", pContext->vgId);
+    pObj->tmrId = taosTmrStart(cqProcessCreateTimer, 1000, pObj, pContext->tmrCtrl);
+    return;
+  }
+  pObj->tmrId = 0;
+
+  pObj->pStream = taos_open_stream(pContext->dbConn, pObj->sqlStr, cqProcessStreamRes, 0, pObj, NULL);
+  if (pObj->pStream) {
+    pContext->num++;
+    cInfo("vgId:%d, id:%d CQ:%s is openned", pContext->vgId, pObj->tid, pObj->sqlStr);
+  } else {
+    cError("vgId:%d, id:%d CQ:%s, failed to open", pContext->vgId, pObj->tid, pObj->sqlStr);
+  }
+}
+
+static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
+  SCqObj     *pObj = (SCqObj *)param;
+  if (tres == NULL && row == NULL) {
+    pObj->pStream = NULL;
+    return;
+  }
+  SCqContext *pContext = pObj->pContext;
+  STSchema   *pSchema = pObj->pSchema;
+  if (pObj->pStream == NULL) return;
+
+  cDebug("vgId:%d, id:%d CQ:%s stream result is ready", pContext->vgId, pObj->tid, pObj->sqlStr);
+
+  int size = sizeof(SWalHead) + sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + TD_DATA_ROW_HEAD_SIZE + pObj->rowSize;
+  char *buffer = calloc(size, 1);
+
+  SWalHead   *pHead = (SWalHead *)buffer;
+  SSubmitMsg *pMsg = (SSubmitMsg *) (buffer + sizeof(SWalHead));
+  SSubmitBlk *pBlk = (SSubmitBlk *) (buffer + sizeof(SWalHead) + sizeof(SSubmitMsg));
+
+  SDataRow trow = (SDataRow)pBlk->data;
+  tdInitDataRow(trow, pSchema);
+
+  for (int32_t i = 0; i < pSchema->numOfCols; i++) {
+    STColumn *c = pSchema->columns + i;
+    void* val = row[i];
+    if (val == NULL) {
+      val = getNullValue(c->type);
+    } else if (c->type == TSDB_DATA_TYPE_BINARY) {
+      val = ((char*)val) - sizeof(VarDataLenT);
+    } else if (c->type == TSDB_DATA_TYPE_NCHAR) {
+      char buf[TSDB_MAX_NCHAR_LEN];
+      size_t len = taos_fetch_lengths(tres)[i];
+      taosMbsToUcs4(val, len, buf, sizeof(buf), &len);
+      memcpy(val + sizeof(VarDataLenT), buf, len);
+      varDataLen(val) = len;
+    }
+    tdAppendColVal(trow, val, c->type, c->bytes, c->offset);
+  }
+  pBlk->dataLen = htonl(dataRowLen(trow));
+  pBlk->schemaLen = 0;
+
+  pBlk->uid = htobe64(pObj->uid);
+  pBlk->tid = htonl(pObj->tid);
+  pBlk->numOfRows = htons(1);
+  pBlk->sversion = htonl(pSchema->version);
+  pBlk->padding = 0;
+
+  pHead->len = sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowLen(trow);
+
+  pMsg->header.vgId = htonl(pContext->vgId);
+  pMsg->header.contLen = htonl(pHead->len);
+  pMsg->length = pMsg->header.contLen;
+  pMsg->numOfBlocks = htonl(1);
+
+  pHead->msgType = TSDB_MSG_TYPE_SUBMIT;
+  pHead->version = 0;
+
+  // write into vnode write queue
+  pContext->cqWrite(pContext->ahandle, pHead, TAOS_QTYPE_CQ);
+  free(buffer);
+}
+
diff --git a/src/cq/test/CMakeLists.txt b/src/cq/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..59c0ac79cfffd35a40beb58a2a172a9bf27dca15
--- /dev/null
+++ b/src/cq/test/CMakeLists.txt
@@ -0,0 +1,6 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+LIST(APPEND CQTEST_SRC ./cqtest.c)
+ADD_EXECUTABLE(cqtest ${CQTEST_SRC})
+TARGET_LINK_LIBRARIES(cqtest tcq)
diff --git a/src/cq/test/cqtest.c b/src/cq/test/cqtest.c
new file mode 100644
index 0000000000000000000000000000000000000000..1daee644a7effc5fa50fbc340ad7df8e2b5d70b0
--- /dev/null
+++ b/src/cq/test/cqtest.c
@@ -0,0 +1,108 @@
+/*
+ * 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/>.
+ */
+
+//#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tglobal.h"
+#include "tlog.h"
+#include "tcq.h"
+
+int64_t  ver = 0;
+void    *pCq = NULL;
+
+int writeToQueue(void *pVnode, void *data, int type) {
+  return 0;
+}
+
+int main(int argc, char *argv[]) {
+  int num = 3;
+
+  for (int i=1; i<argc; ++i) {
+    if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+      dDebugFlag = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0 && i <argc-1) {
+      num = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-n num]: number of streams, default:%d\n", num);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", dDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  } 
+
+  taosInitLog("cq.log", 100000, 10);
+
+  SCqCfg cqCfg;
+  strcpy(cqCfg.user, TSDB_DEFAULT_USER);
+  strcpy(cqCfg.pass, TSDB_DEFAULT_PASS);
+  cqCfg.vgId = 2;
+  cqCfg.cqWrite = writeToQueue;
+
+  pCq = cqOpen(NULL, &cqCfg);
+  if (pCq == NULL) {
+    printf("failed to open CQ\n");
+    exit(-1);
+  }
+
+  STSchemaBuilder schemaBuilder = {0};
+
+  tdInitTSchemaBuilder(&schemaBuilder, 0);
+  tdAddColToSchema(&schemaBuilder, TSDB_DATA_TYPE_TIMESTAMP, 0, 8);
+  tdAddColToSchema(&schemaBuilder, TSDB_DATA_TYPE_INT, 1, 4);
+
+  STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+
+  for (int sid =1; sid<10; ++sid) {
+    cqCreate(pCq, sid, sid, "select avg(speed) from demo.t1 sliding(1s) interval(5s)", pSchema);
+  }
+
+  tdFreeSchema(pSchema);
+
+  while (1) {
+    char c = (char)getchar();
+    
+    switch(c) {
+      case 's':
+        cqStart(pCq);
+        break;
+      case 't':
+        cqStop(pCq);
+        break;
+      case 'c':
+        // create a CQ 
+        break;
+      case 'd':
+        // drop a CQ
+        break;
+      case 'q':
+        break;
+      default:
+        printf("invalid command:%c", c);
+    }
+
+    if (c=='q') break;
+  }
+
+  cqClose(pCq);
+
+  taosCloseLog();
+
+  return 0;
+}
diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dea90811ad83206b05e29b0e2468b8057ac8d7a8
--- /dev/null
+++ b/src/dnode/CMakeLists.txt
@@ -0,0 +1,52 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
+INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+
+IF (TD_LINUX)
+  ADD_EXECUTABLE(taosd ${SRC})
+  TARGET_LINK_LIBRARIES(taosd mnode monitor http tsdb twal vnode cJson lz4)
+
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(taosd taos_static)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosd taos)
+  ENDIF ()
+
+  IF (TD_ACCOUNT)
+    TARGET_LINK_LIBRARIES(taosd account)
+  ENDIF ()
+  
+  IF (TD_GRANT)
+    TARGET_LINK_LIBRARIES(taosd grant)
+  ENDIF ()
+
+  IF (TD_MQTT)
+    TARGET_LINK_LIBRARIES(taosd mqtt)
+  ENDIF ()
+
+  IF (TD_SYNC)
+    TARGET_LINK_LIBRARIES(taosd balance sync)
+  ENDIF ()
+
+  SET(PREPARE_ENV_CMD "prepare_env_cmd")
+  SET(PREPARE_ENV_TARGET "prepare_env_target")
+  ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
+      POST_BUILD
+      COMMAND echo "make test directory"
+      DEPENDS taosd
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
+      COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMENT "prepare taosd environment")
+  ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
+ENDIF ()
diff --git a/src/dnode/inc/dnodeCheck.h b/src/dnode/inc/dnodeCheck.h
new file mode 100644
index 0000000000000000000000000000000000000000..a4880b3c114342c8900337372bd1dfd07e7815b7
--- /dev/null
+++ b/src/dnode/inc/dnodeCheck.h
@@ -0,0 +1,30 @@
+/*
+ * 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_DNODE_CHECK_H
+#define TDENGINE_DNODE_CHECK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitCheck();
+void    dnodeCleanupCheck();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeInt.h b/src/dnode/inc/dnodeInt.h
new file mode 100644
index 0000000000000000000000000000000000000000..f4cbee1d1333e3f1ffc213f9e2ecdeb5f4c32d57
--- /dev/null
+++ b/src/dnode/inc/dnodeInt.h
@@ -0,0 +1,38 @@
+/*
+ * 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_DNODE_LOG_H
+#define TDENGINE_DNODE_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+
+extern int32_t dDebugFlag;
+
+#define dFatal(...) { if (dDebugFlag & DEBUG_FATAL) { taosPrintLog("DND FATAL ", 255, __VA_ARGS__); }}
+#define dError(...) { if (dDebugFlag & DEBUG_ERROR) { taosPrintLog("DND ERROR ", 255, __VA_ARGS__); }}
+#define dWarn(...)  { if (dDebugFlag & DEBUG_WARN)  { taosPrintLog("DND WARN ", 255, __VA_ARGS__); }}
+#define dInfo(...)  { if (dDebugFlag & DEBUG_INFO)  { taosPrintLog("DND ", 255, __VA_ARGS__); }}
+#define dDebug(...) { if (dDebugFlag & DEBUG_DEBUG) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
+#define dTrace(...) { if (dDebugFlag & DEBUG_TRACE) { taosPrintLog("DND ", dDebugFlag, __VA_ARGS__); }}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeMPeer.h b/src/dnode/inc/dnodeMPeer.h
new file mode 100644
index 0000000000000000000000000000000000000000..9a48703110c389f10ac623ccaeaa85420a32817f
--- /dev/null
+++ b/src/dnode/inc/dnodeMPeer.h
@@ -0,0 +1,33 @@
+/*
+ * 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_DNODE_MPEER_H
+#define TDENGINE_DNODE_MPEER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitMnodePeer();
+void    dnodeCleanupMnodePeer();
+int32_t dnodeAllocateMnodePqueue();
+void    dnodeFreeMnodePqueue();
+void    dnodeDispatchToMnodePeerQueue(SRpcMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeMRead.h b/src/dnode/inc/dnodeMRead.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e93838b7998850e1bec79f017fdfbd28f286a11
--- /dev/null
+++ b/src/dnode/inc/dnodeMRead.h
@@ -0,0 +1,33 @@
+/*
+ * 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_DNODE_MREAD_H
+#define TDENGINE_DNODE_MREAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitMnodeRead();
+void    dnodeCleanupMnodeRead();
+int32_t dnodeAllocateMnodeRqueue();
+void    dnodeFreeMnodeRqueue();
+void    dnodeDispatchToMnodeReadQueue(SRpcMsg *rpcMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeMWrite.h b/src/dnode/inc/dnodeMWrite.h
new file mode 100644
index 0000000000000000000000000000000000000000..498fea81c59329b4d30874d36d10182b6e3ae54f
--- /dev/null
+++ b/src/dnode/inc/dnodeMWrite.h
@@ -0,0 +1,33 @@
+/*
+ * 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_DNODE_MWRITE_H
+#define TDENGINE_DNODE_MWRITE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitMnodeWrite();
+void    dnodeCleanupMnodeWrite();
+int32_t dnodeAllocateMnodeWqueue();
+void    dnodeFreeMnodeWqueue();
+void    dnodeDispatchToMnodeWriteQueue(SRpcMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeMain.h b/src/dnode/inc/dnodeMain.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1480407bde0bbcf7aada20f90084b96fc380a73
--- /dev/null
+++ b/src/dnode/inc/dnodeMain.h
@@ -0,0 +1,30 @@
+/*
+ * 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_DNODE_MAIN_H
+#define TDENGINE_DNODE_MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitSystem();
+void    dnodeCleanUpSystem();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeMgmt.h b/src/dnode/inc/dnodeMgmt.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8f4a0823f3cc9846b85804d323e73a8cfc0476e
--- /dev/null
+++ b/src/dnode/inc/dnodeMgmt.h
@@ -0,0 +1,45 @@
+/*
+ * 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_DNODE_MGMT_H
+#define TDENGINE_DNODE_MGMT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitMgmt();
+void    dnodeCleanupMgmt();
+int32_t dnodeInitMgmtTimer();
+void    dnodeCleanupMgmtTimer();
+void    dnodeDispatchToMgmtQueue(SRpcMsg *rpcMsg);
+
+void*   dnodeGetVnode(int32_t vgId);
+int32_t dnodeGetVnodeStatus(void *pVnode);
+void*   dnodeGetVnodeRworker(void *pVnode);
+void*   dnodeGetVnodeWworker(void *pVnode);
+void*   dnodeGetVnodeWal(void *pVnode);
+void*   dnodeGetVnodeTsdb(void *pVnode);
+void    dnodeReleaseVnode(void *pVnode);
+
+void    dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell);
+void    dnodeGetMnodeEpSetForPeer(void *epSet);
+void    dnodeGetMnodeEpSetForShell(void *epSet);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeModule.h b/src/dnode/inc/dnodeModule.h
new file mode 100644
index 0000000000000000000000000000000000000000..8618de324446ca3f2504d15a6422bcca3a4b51b0
--- /dev/null
+++ b/src/dnode/inc/dnodeModule.h
@@ -0,0 +1,32 @@
+/*
+ * 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_DNODE_MODULE_H
+#define TDENGINE_DNODE_MODULE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitModules();
+void    dnodeStartModules();
+void    dnodeCleanupModules();
+void    dnodeProcessModuleStatus(uint32_t moduleStatus);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodePeer.h b/src/dnode/inc/dnodePeer.h
new file mode 100644
index 0000000000000000000000000000000000000000..0dcf48f2322be91de792148165b2a127fa983196
--- /dev/null
+++ b/src/dnode/inc/dnodePeer.h
@@ -0,0 +1,32 @@
+/*
+ * 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_DNODE_PEER_H
+#define TDENGINE_DNODE_PEER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitServer();
+void    dnodeCleanupServer();
+int32_t dnodeInitClient();
+void    dnodeCleanupClient();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeShell.h b/src/dnode/inc/dnodeShell.h
new file mode 100644
index 0000000000000000000000000000000000000000..300c86c5999553b2332b3224fc6c65ef019dc5af
--- /dev/null
+++ b/src/dnode/inc/dnodeShell.h
@@ -0,0 +1,30 @@
+/*
+ * 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_DNODE_SHELL_H
+#define TDENGINE_DNODE_SHELL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitShell();
+void    dnodeCleanupShell();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeTelemetry.h b/src/dnode/inc/dnodeTelemetry.h
new file mode 100644
index 0000000000000000000000000000000000000000..6fb62556ae50ec3759c7dc2260d16f36d1daf025
--- /dev/null
+++ b/src/dnode/inc/dnodeTelemetry.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 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_DNODE_TELEMETRY_H
+#define TDENGINE_DNODE_TELEMETRY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitTelemetry();
+void    dnodeCleanupTelemetry();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeVRead.h b/src/dnode/inc/dnodeVRead.h
new file mode 100644
index 0000000000000000000000000000000000000000..a1035200475259bd91757f934d35a0dd5a69b1fe
--- /dev/null
+++ b/src/dnode/inc/dnodeVRead.h
@@ -0,0 +1,31 @@
+/*
+ * 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_DNODE_VREAD_H
+#define TDENGINE_DNODE_VREAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitVnodeRead();
+void    dnodeCleanupVnodeRead();
+void    dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/inc/dnodeVWrite.h b/src/dnode/inc/dnodeVWrite.h
new file mode 100644
index 0000000000000000000000000000000000000000..7da701a8e270239ee2f48e090138f048cc81f880
--- /dev/null
+++ b/src/dnode/inc/dnodeVWrite.h
@@ -0,0 +1,31 @@
+/*
+ * 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_DNODE_VWRITE_H
+#define TDENGINE_DNODE_VWRITE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t dnodeInitVnodeWrite();
+void    dnodeCleanupVnodeWrite();
+void    dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/dnode/src/dnodeCheck.c b/src/dnode/src/dnodeCheck.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b68fc1f6c7a4db266eeb36cc20459bc71870739
--- /dev/null
+++ b/src/dnode/src/dnodeCheck.c
@@ -0,0 +1,271 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnodeInt.h"
+#include "dnodeCheck.h"
+
+typedef struct {
+  bool      enable;
+  char *    name;
+  int32_t (*initFp)();
+  int32_t (*startFp)();
+  void    (*cleanUpFp)();
+  void    (*stopFp)();
+} SCheckItem;
+
+static    SCheckItem  tsCheckItem[TSDB_CHECK_ITEM_MAX] = {{0}};
+int64_t   tsMinFreeMemSizeForStart = 0;
+
+static int bindTcpPort(int port) {
+  int    serverSocket;
+  struct sockaddr_in server_addr;
+
+  if ((serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+    dError("socket() fail: %s", strerror(errno));
+    return -1;
+  }
+
+  bzero(&server_addr, sizeof(server_addr));
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port = htons(port);
+  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+    dError("port:%d tcp bind() fail: %s", port, strerror(errno));
+    close(serverSocket);
+    return -1;
+  }
+
+  if (listen(serverSocket, 5) < 0) {
+    dError("port:%d listen() fail: %s", port, strerror(errno));
+    close(serverSocket);
+    return -1;
+  }
+
+  close(serverSocket);
+  return 0;
+}
+
+static int bindUdpPort(int port) {
+  int    serverSocket;
+  struct sockaddr_in server_addr;
+    
+  if ((serverSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+    dError("socket() fail: %s", strerror(errno));
+    return -1;
+  }
+
+  bzero(&server_addr, sizeof(server_addr));
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port = htons(port);
+  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+    dError("port:%d udp bind() fail: %s", port, strerror(errno));
+    close(serverSocket);
+    return -1;
+  }
+
+  close(serverSocket);
+  return 0;
+}
+
+static int dnodeCheckNetwork() {
+  int ret;
+  int startPort = tsServerPort;
+
+  for (int port = startPort; port < startPort + 12; port++) {
+    ret = bindTcpPort(port);
+    if (0 != ret) {
+      dError("failed to tcp bind port %d, quit", port);
+      return -1;
+    }
+    ret = bindUdpPort(port);
+    if (0 != ret) {
+      dError("failed to udp bind port %d, quit", port);
+      return -1;
+    }    
+  } 
+
+  return 0;
+}
+
+static int dnodeCheckMem() {
+  float  memoryUsedMB;
+  float  memoryAvailMB;
+  if (true != taosGetSysMemory(&memoryUsedMB)) {
+    dError("failed to get system mem infomation, errno:%u, reason:%s", errno, strerror(errno));
+    return -1;
+  }
+
+  memoryAvailMB = (float)tsTotalMemoryMB - memoryUsedMB;
+
+  if (memoryAvailMB < tsMinFreeMemSizeForStart) {
+    dError("free mem %f too little, quit", memoryAvailMB);
+    return -1;
+  }
+
+  return 0;  
+}
+
+static int dnodeCheckCpu() {
+  // TODO:  
+  return 0;
+}
+
+static int dnodeCheckDisk() {
+  taosGetDisk();
+
+  if (tsAvailDataDirGB < tsMinimalDataDirGB) {
+    dError("free disk size: %f GB, too little, quit", tsAvailDataDirGB);
+    return -1;
+  }
+
+  if (tsAvailLogDirGB < tsMinimalLogDirGB) {
+    dError("free disk size: %f GB, too little, quit", tsAvailLogDirGB);
+    return -1;
+  }
+
+  if (tsAvailTmpDirectorySpace < tsReservedTmpDirectorySpace) {
+    dError("free disk size: %f GB, too little, quit", tsAvailTmpDirectorySpace);
+    return -1;
+  }
+
+  return 0;
+}
+
+static int dnodeCheckOs() {
+  // TODO:
+
+  return 0;
+}
+static int dnodeCheckAccess() {
+  // TODO:
+
+  return 0;
+}
+
+static int dnodeCheckVersion() {
+  // TODO:
+
+  return 0;
+}
+
+static int dnodeCheckDatafile() {
+  // TODO:
+
+  return 0;
+}
+
+static void dnodeAllocCheckItem() {
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].enable       = false;
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].name         = "network";
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].startFp      = dnodeCheckNetwork;
+  tsCheckItem[TSDB_CHECK_ITEM_NETWORK].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].name         = "mem";
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].startFp      = dnodeCheckMem;
+  tsCheckItem[TSDB_CHECK_ITEM_MEM].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].name         = "cpu";
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].startFp      = dnodeCheckCpu;
+  tsCheckItem[TSDB_CHECK_ITEM_CPU].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].name         = "disk";
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].startFp      = dnodeCheckDisk;
+  tsCheckItem[TSDB_CHECK_ITEM_DISK].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_OS].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_OS].name         = "os";
+  tsCheckItem[TSDB_CHECK_ITEM_OS].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_OS].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_OS].startFp      = dnodeCheckOs;
+  tsCheckItem[TSDB_CHECK_ITEM_OS].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].name         = "access";
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].startFp      = dnodeCheckAccess;
+  tsCheckItem[TSDB_CHECK_ITEM_ACCESS].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].name         = "version";
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].startFp      = dnodeCheckVersion;
+  tsCheckItem[TSDB_CHECK_ITEM_VERSION].stopFp       = NULL;
+
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].enable       = true;
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].name         = "datafile";
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].initFp       = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].cleanUpFp    = NULL;
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].startFp      = dnodeCheckDatafile;
+  tsCheckItem[TSDB_CHECK_ITEM_DATAFILE].stopFp       = NULL;
+}
+
+void dnodeCleanupCheck() {
+  for (ECheckItemType index = 0; index < TSDB_CHECK_ITEM_MAX; ++index) {
+    if (tsCheckItem[index].enable && tsCheckItem[index].stopFp) {
+      (*tsCheckItem[index].stopFp)();
+    }
+    if (tsCheckItem[index].cleanUpFp) {
+      (*tsCheckItem[index].cleanUpFp)();
+    }
+  }
+}
+
+int32_t dnodeInitCheck() {
+  dnodeAllocCheckItem();
+
+  for (ECheckItemType index = 0; index < TSDB_CHECK_ITEM_MAX; ++index) {
+    if (tsCheckItem[index].initFp) {
+      if ((*tsCheckItem[index].initFp)() != 0) {
+        dError("failed to init check item:%s", tsCheckItem[index].name);
+        return -1;
+      }
+    }
+  }
+
+  for (ECheckItemType index = 0; index < TSDB_CHECK_ITEM_MAX; ++index) {
+    if (tsCheckItem[index].enable && tsCheckItem[index].startFp) {
+      if ((*tsCheckItem[index].startFp)() != 0) {
+        dError("failed to check item:%s", tsCheckItem[index].name);
+        exit(-1);
+      }
+    }
+  }
+
+  return 0;
+}
+
+
+
diff --git a/src/dnode/src/dnodeMPeer.c b/src/dnode/src/dnodeMPeer.c
new file mode 100644
index 0000000000000000000000000000000000000000..82ed7dd1793882c15929aa0899e04357a99359bb
--- /dev/null
+++ b/src/dnode/src/dnodeMPeer.c
@@ -0,0 +1,161 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tutil.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeMWrite.h"
+
+typedef struct {
+  pthread_t thread;
+  int32_t   workerId;
+} SMPeerWorker;
+
+typedef struct {
+  int32_t       num;
+  SMPeerWorker *peerWorker;
+} SMPeerWorkerPool;
+
+static SMPeerWorkerPool tsMPeerPool;
+static taos_qset        tsMPeerQset;
+static taos_queue       tsMPeerQueue;
+
+static void *dnodeProcessMnodePeerQueue(void *param);
+
+int32_t dnodeInitMnodePeer() {
+  tsMPeerQset = taosOpenQset();
+  
+  tsMPeerPool.num = 1;
+  tsMPeerPool.peerWorker = (SMPeerWorker *)calloc(sizeof(SMPeerWorker), tsMPeerPool.num);
+
+  if (tsMPeerPool.peerWorker == NULL) return -1;
+  for (int32_t i = 0; i < tsMPeerPool.num; ++i) {
+    SMPeerWorker *pWorker = tsMPeerPool.peerWorker + i;
+    pWorker->workerId = i;
+  }
+
+  dInfo("dnode mpeer is opened");
+  return 0;
+}
+
+void dnodeCleanupMnodePeer() {
+  for (int32_t i = 0; i < tsMPeerPool.num; ++i) {
+    SMPeerWorker *pWorker = tsMPeerPool.peerWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(tsMPeerQset);
+    }
+  }
+
+  for (int32_t i = 0; i < tsMPeerPool.num; ++i) {
+    SMPeerWorker *pWorker = tsMPeerPool.peerWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  taosCloseQset(tsMPeerQset);
+  taosTFree(tsMPeerPool.peerWorker);
+  dInfo("dnode mpeer is closed");
+}
+
+int32_t dnodeAllocateMnodePqueue() {
+  tsMPeerQueue = taosOpenQueue();
+  if (tsMPeerQueue == NULL) return TSDB_CODE_DND_OUT_OF_MEMORY;
+
+  taosAddIntoQset(tsMPeerQset, tsMPeerQueue, NULL);
+
+  for (int32_t i = 0; i < tsMPeerPool.num; ++i) {
+    SMPeerWorker *pWorker = tsMPeerPool.peerWorker + i;
+    pWorker->workerId = i;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessMnodePeerQueue, pWorker) != 0) {
+      dError("failed to create thread to process mpeer queue, reason:%s", strerror(errno));
+    }
+
+    pthread_attr_destroy(&thAttr);
+    dDebug("dnode mpeer worker:%d is launched, total:%d", pWorker->workerId, tsMPeerPool.num);
+  }
+
+  dDebug("dnode mpeer queue:%p is allocated", tsMPeerQueue);
+  return TSDB_CODE_SUCCESS;
+}
+
+void dnodeFreeMnodePqueue() {
+  taosCloseQueue(tsMPeerQueue);
+  tsMPeerQueue = NULL;
+}
+
+void dnodeDispatchToMnodePeerQueue(SRpcMsg *pMsg) {
+  if (!mnodeIsRunning() || tsMPeerQueue == NULL) {
+    dnodeSendRedirectMsg(pMsg, false);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+
+  SMnodeMsg *pPeer = (SMnodeMsg *)taosAllocateQitem(sizeof(SMnodeMsg));
+  mnodeCreateMsg(pPeer, pMsg);
+  taosWriteQitem(tsMPeerQueue, TAOS_QTYPE_RPC, pPeer);
+}
+
+static void dnodeFreeMnodePeerMsg(SMnodeMsg *pPeer) {
+  mnodeCleanupMsg(pPeer);
+  taosFreeQitem(pPeer);
+}
+
+static void dnodeSendRpcMnodePeerRsp(SMnodeMsg *pPeer, int32_t code) {
+  if (code == TSDB_CODE_MND_ACTION_IN_PROGRESS) return;
+
+  SRpcMsg rpcRsp = {
+    .handle  = pPeer->rpcMsg.handle,
+    .pCont   = pPeer->rpcRsp.rsp,
+    .contLen = pPeer->rpcRsp.len,
+    .code    = code,
+  };
+
+  rpcSendResponse(&rpcRsp);
+  dnodeFreeMnodePeerMsg(pPeer);
+}
+
+static void *dnodeProcessMnodePeerQueue(void *param) {
+  SMnodeMsg *pPeerMsg;
+  int32_t    type;
+  void *     unUsed;
+  
+  while (1) {
+    if (taosReadQitemFromQset(tsMPeerQset, &type, (void **)&pPeerMsg, &unUsed) == 0) {
+      dDebug("dnodeProcessMnodePeerQueue: got no message from qset, exiting...");
+      break;
+    }
+
+    dDebug("msg:%s will be processed in mpeer queue", taosMsg[pPeerMsg->rpcMsg.msgType]);    
+    int32_t code = mnodeProcessPeerReq(pPeerMsg);    
+    dnodeSendRpcMnodePeerRsp(pPeerMsg, code);    
+  }
+
+  return NULL;
+}
diff --git a/src/dnode/src/dnodeMRead.c b/src/dnode/src/dnodeMRead.c
new file mode 100644
index 0000000000000000000000000000000000000000..6e610d8498ad4776d0eb02098129d6b87992ec0a
--- /dev/null
+++ b/src/dnode/src/dnodeMRead.c
@@ -0,0 +1,169 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tutil.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeMRead.h"
+
+typedef struct {
+  pthread_t thread;
+  int32_t   workerId;
+} SMReadWorker;
+
+typedef struct {
+  int32_t       num;
+  SMReadWorker *readWorker;
+} SMReadWorkerPool;
+
+static SMReadWorkerPool tsMReadPool;
+static taos_qset        tsMReadQset;
+static taos_queue       tsMReadQueue;
+
+static void *dnodeProcessMnodeReadQueue(void *param);
+
+int32_t dnodeInitMnodeRead() {
+  tsMReadQset = taosOpenQset();
+
+  tsMReadPool.num = tsNumOfCores * tsNumOfThreadsPerCore / 2;
+  tsMReadPool.num = MAX(2, tsMReadPool.num);
+  tsMReadPool.num = MIN(4, tsMReadPool.num);
+  tsMReadPool.readWorker = (SMReadWorker *)calloc(sizeof(SMReadWorker), tsMReadPool.num);
+
+  if (tsMReadPool.readWorker == NULL) return -1;
+  for (int32_t i = 0; i < tsMReadPool.num; ++i) {
+    SMReadWorker *pWorker = tsMReadPool.readWorker + i;
+    pWorker->workerId = i;
+  }
+
+  dInfo("dnode mread is opened");
+  return 0;
+}
+
+void dnodeCleanupMnodeRead() {
+  for (int32_t i = 0; i < tsMReadPool.num; ++i) {
+    SMReadWorker *pWorker = tsMReadPool.readWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(tsMReadQset);
+    }
+  }
+
+  for (int32_t i = 0; i < tsMReadPool.num; ++i) {
+    SMReadWorker *pWorker = tsMReadPool.readWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  taosCloseQset(tsMReadQset);
+  free(tsMReadPool.readWorker);
+
+  dInfo("dnode mread is closed");
+}
+
+int32_t dnodeAllocateMnodeRqueue() {
+  tsMReadQueue = taosOpenQueue();
+  if (tsMReadQueue == NULL) return TSDB_CODE_DND_OUT_OF_MEMORY;
+
+  taosAddIntoQset(tsMReadQset, tsMReadQueue, NULL);
+
+  for (int32_t i = 0; i < tsMReadPool.num; ++i) {
+    SMReadWorker *pWorker = tsMReadPool.readWorker + i;
+    pWorker->workerId = i;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessMnodeReadQueue, pWorker) != 0) {
+      dError("failed to create thread to process mread queue, reason:%s", strerror(errno));
+    }
+
+    pthread_attr_destroy(&thAttr);
+    dDebug("dnode mread worker:%d is launched, total:%d", pWorker->workerId, tsMReadPool.num);
+  }
+
+  dDebug("dnode mread queue:%p is allocated", tsMReadQueue);
+  return TSDB_CODE_SUCCESS;
+}
+
+void dnodeFreeMnodeRqueue() {
+  taosCloseQueue(tsMReadQueue);
+  tsMReadQueue = NULL;
+}
+
+void dnodeDispatchToMnodeReadQueue(SRpcMsg *pMsg) {
+  if (!mnodeIsRunning() || tsMReadQueue == NULL) {
+    dnodeSendRedirectMsg(pMsg, true);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+
+  SMnodeMsg *pRead = (SMnodeMsg *)taosAllocateQitem(sizeof(SMnodeMsg));
+  mnodeCreateMsg(pRead, pMsg);
+  taosWriteQitem(tsMReadQueue, TAOS_QTYPE_RPC, pRead);
+}
+
+static void dnodeFreeMnodeReadMsg(SMnodeMsg *pRead) {
+  mnodeCleanupMsg(pRead);
+  taosFreeQitem(pRead);
+}
+
+static void dnodeSendRpcMnodeReadRsp(SMnodeMsg *pRead, int32_t code) {
+  if (code == TSDB_CODE_MND_ACTION_IN_PROGRESS) return;
+  if (code == TSDB_CODE_MND_ACTION_NEED_REPROCESSED) {
+    // may be a auto create req, should put into write queue
+    dnodeReprocessMnodeWriteMsg(pRead);
+    return;
+  }
+
+  SRpcMsg rpcRsp = {
+    .handle  = pRead->rpcMsg.handle,
+    .pCont   = pRead->rpcRsp.rsp,
+    .contLen = pRead->rpcRsp.len,
+    .code    = code,
+  };
+
+  rpcSendResponse(&rpcRsp);
+  dnodeFreeMnodeReadMsg(pRead);
+}
+
+static void *dnodeProcessMnodeReadQueue(void *param) {
+  SMnodeMsg *pReadMsg;
+  int32_t    type;
+  void *     unUsed;
+  
+  while (1) {
+    if (taosReadQitemFromQset(tsMReadQset, &type, (void **)&pReadMsg, &unUsed) == 0) {
+      dDebug("dnodeProcessMnodeReadQueue: got no message from qset, exiting...");
+      break;
+    }
+
+    dDebug("%p, msg:%s will be processed in mread queue", pReadMsg->rpcMsg.ahandle, taosMsg[pReadMsg->rpcMsg.msgType]);    
+    int32_t code = mnodeProcessRead(pReadMsg);    
+    dnodeSendRpcMnodeReadRsp(pReadMsg, code);   
+  }
+
+  return NULL;
+}
diff --git a/src/dnode/src/dnodeMWrite.c b/src/dnode/src/dnodeMWrite.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a305b5598161447bd1e94f0d8c7202389a2f724
--- /dev/null
+++ b/src/dnode/src/dnodeMWrite.c
@@ -0,0 +1,200 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeMWrite.h"
+
+typedef struct {
+  pthread_t thread;
+  int32_t   workerId;
+} SMWriteWorker;
+
+typedef struct {
+  int32_t        num;
+  SMWriteWorker *writeWorker;
+} SMWriteWorkerPool;
+
+static SMWriteWorkerPool tsMWritePool;
+static taos_qset         tsMWriteQset;
+static taos_queue        tsMWriteQueue;
+extern void *            tsDnodeTmr;
+
+static void *dnodeProcessMnodeWriteQueue(void *param);
+
+int32_t dnodeInitMnodeWrite() {
+  tsMWriteQset = taosOpenQset();
+  
+  tsMWritePool.num = 1;
+  tsMWritePool.writeWorker = (SMWriteWorker *)calloc(sizeof(SMWriteWorker), tsMWritePool.num);
+
+  if (tsMWritePool.writeWorker == NULL) return -1;
+  for (int32_t i = 0; i < tsMWritePool.num; ++i) {
+    SMWriteWorker *pWorker = tsMWritePool.writeWorker + i;
+    pWorker->workerId = i;
+  }
+
+  dInfo("dnode mwrite is opened");
+  return 0;
+}
+
+void dnodeCleanupMnodeWrite() {
+  for (int32_t i = 0; i < tsMWritePool.num; ++i) {
+    SMWriteWorker *pWorker = tsMWritePool.writeWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(tsMWriteQset);
+    }
+  }
+
+  for (int32_t i = 0; i < tsMWritePool.num; ++i) {
+    SMWriteWorker *pWorker = tsMWritePool.writeWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  taosCloseQset(tsMWriteQset);
+  taosTFree(tsMWritePool.writeWorker);
+  dInfo("dnode mwrite is closed");
+}
+
+int32_t dnodeAllocateMnodeWqueue() {
+  tsMWriteQueue = taosOpenQueue();
+  if (tsMWriteQueue == NULL) return TSDB_CODE_DND_OUT_OF_MEMORY;
+
+  taosAddIntoQset(tsMWriteQset, tsMWriteQueue, NULL);
+
+  for (int32_t i = 0; i < tsMWritePool.num; ++i) {
+    SMWriteWorker *pWorker = tsMWritePool.writeWorker + i;
+    pWorker->workerId = i;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessMnodeWriteQueue, pWorker) != 0) {
+      dError("failed to create thread to process mwrite queue, reason:%s", strerror(errno));
+    }
+
+    pthread_attr_destroy(&thAttr);
+    dDebug("dnode mwrite worker:%d is launched, total:%d", pWorker->workerId, tsMWritePool.num);
+  }
+
+  dDebug("dnode mwrite queue:%p is allocated", tsMWriteQueue);
+  return TSDB_CODE_SUCCESS;
+}
+
+void dnodeFreeMnodeWqueue() {
+  taosCloseQueue(tsMWriteQueue);
+  tsMWriteQueue = NULL;
+}
+
+void dnodeDispatchToMnodeWriteQueue(SRpcMsg *pMsg) {
+  if (!mnodeIsRunning() || tsMWriteQueue == NULL) {
+    dnodeSendRedirectMsg(pMsg, true);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+
+  SMnodeMsg *pWrite = (SMnodeMsg *)taosAllocateQitem(sizeof(SMnodeMsg));
+  mnodeCreateMsg(pWrite, pMsg);
+
+  dDebug("app:%p:%p, msg:%s is put into mwrite queue", pWrite->rpcMsg.ahandle, pWrite, taosMsg[pWrite->rpcMsg.msgType]);
+  taosWriteQitem(tsMWriteQueue, TAOS_QTYPE_RPC, pWrite);
+}
+
+static void dnodeFreeMnodeWriteMsg(SMnodeMsg *pWrite) {
+  mnodeCleanupMsg(pWrite);
+  taosFreeQitem(pWrite);
+}
+
+void dnodeSendRpcMnodeWriteRsp(void *pMsg, int32_t code) {
+  SMnodeMsg *pWrite = pMsg;
+  if (pWrite == NULL) return;
+  if (code == TSDB_CODE_MND_ACTION_IN_PROGRESS) return;
+  if (code == TSDB_CODE_MND_ACTION_NEED_REPROCESSED) {
+    dnodeReprocessMnodeWriteMsg(pWrite);
+    return;
+  }
+
+  SRpcMsg rpcRsp = {
+    .handle  = pWrite->rpcMsg.handle,
+    .pCont   = pWrite->rpcRsp.rsp,
+    .contLen = pWrite->rpcRsp.len,
+    .code    = code,
+  };
+
+  rpcSendResponse(&rpcRsp);
+  dnodeFreeMnodeWriteMsg(pWrite);
+}
+
+static void *dnodeProcessMnodeWriteQueue(void *param) {
+  SMnodeMsg *pWrite;
+  int32_t    type;
+  void *     unUsed;
+  
+  while (1) {
+    if (taosReadQitemFromQset(tsMWriteQset, &type, (void **)&pWrite, &unUsed) == 0) {
+      dDebug("dnodeProcessMnodeWriteQueue: got no message from qset, exiting...");
+      break;
+    }
+
+    dDebug("app:%p:%p, msg:%s will be processed in mwrite queue", pWrite->rpcMsg.ahandle, pWrite,
+           taosMsg[pWrite->rpcMsg.msgType]);
+
+    int32_t code = mnodeProcessWrite(pWrite);
+    dnodeSendRpcMnodeWriteRsp(pWrite, code);
+  }
+
+  return NULL;
+}
+
+void dnodeReprocessMnodeWriteMsg(void *pMsg) {
+  SMnodeMsg *pWrite = pMsg;
+
+  if (!mnodeIsRunning() || tsMWriteQueue == NULL) {
+    dDebug("app:%p:%p, msg:%s is redirected for mnode not running, retry times:%d", pWrite->rpcMsg.ahandle, pWrite,
+           taosMsg[pWrite->rpcMsg.msgType], pWrite->retry);
+
+    dnodeSendRedirectMsg(pMsg, true);
+    dnodeFreeMnodeWriteMsg(pWrite);
+  } else {
+    dDebug("app:%p:%p, msg:%s is reput into mwrite queue, retry times:%d", pWrite->rpcMsg.ahandle, pWrite,
+           taosMsg[pWrite->rpcMsg.msgType], pWrite->retry);
+
+    taosWriteQitem(tsMWriteQueue, TAOS_QTYPE_RPC, pWrite);
+  }
+}
+
+static void dnodeDoDelayReprocessMnodeWriteMsg(void *param, void *tmrId) {
+  dnodeReprocessMnodeWriteMsg(param);
+}
+
+void dnodeDelayReprocessMnodeWriteMsg(void *pMsg) {
+  SMnodeMsg *mnodeMsg = pMsg;
+  void *unUsed = NULL;
+  taosTmrReset(dnodeDoDelayReprocessMnodeWriteMsg, 300, mnodeMsg, tsDnodeTmr, &unUsed);
+}
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..97e6f2ce6debe7ffc273ca103e3f55576da0eb31
--- /dev/null
+++ b/src/dnode/src/dnodeMain.c
@@ -0,0 +1,209 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tutil.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodePeer.h"
+#include "dnodeModule.h"
+#include "dnodeCheck.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
+#include "dnodeMRead.h"
+#include "dnodeMWrite.h"
+#include "dnodeMPeer.h"
+#include "dnodeShell.h"
+#include "dnodeTelemetry.h"
+
+static int32_t dnodeInitStorage();
+static void dnodeCleanupStorage();
+static void dnodeSetRunStatus(SDnodeRunStatus status);
+static void dnodeCheckDataDirOpenned(char *dir);
+static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
+static int32_t dnodeInitComponents();
+static void dnodeCleanupComponents(int32_t stepId);
+static int dnodeCreateDir(const char *dir);
+
+typedef struct {
+  const char *const name;
+  int               (*init)();
+  void              (*cleanup)();
+} SDnodeComponent;
+
+static const SDnodeComponent tsDnodeComponents[] = {
+  {"storage",   dnodeInitStorage,    dnodeCleanupStorage},
+  {"check",     dnodeInitCheck,      dnodeCleanupCheck},     // NOTES: dnodeInitCheck must be behind the dnodeinitStorage component !!!
+  {"vread",     dnodeInitVnodeRead,  dnodeCleanupVnodeRead},
+  {"vwrite",    dnodeInitVnodeWrite, dnodeCleanupVnodeWrite},
+  {"mread",     dnodeInitMnodeRead,  dnodeCleanupMnodeRead},
+  {"mwrite",    dnodeInitMnodeWrite, dnodeCleanupMnodeWrite},
+  {"mpeer",     dnodeInitMnodePeer,  dnodeCleanupMnodePeer},  
+  {"client",    dnodeInitClient,     dnodeCleanupClient},
+  {"server",    dnodeInitServer,     dnodeCleanupServer},
+  {"mgmt",      dnodeInitMgmt,       dnodeCleanupMgmt},
+  {"modules",   dnodeInitModules,    dnodeCleanupModules},
+  {"mgmt-tmr",  dnodeInitMgmtTimer,  dnodeCleanupMgmtTimer},
+  {"shell",     dnodeInitShell,      dnodeCleanupShell},
+  {"telemetry", dnodeInitTelemetry,  dnodeCleanupTelemetry},
+};
+
+static int dnodeCreateDir(const char *dir) {
+  if (mkdir(dir, 0755) != 0 && errno != EEXIST) {
+    return -1;
+  }
+  
+  return 0;
+}
+
+static void dnodeCleanupComponents(int32_t stepId) {
+  for (int32_t i = stepId; i >= 0; i--) {
+    tsDnodeComponents[i].cleanup();
+  }
+}
+
+static int32_t dnodeInitComponents() {
+  int32_t code = 0;
+  for (int32_t i = 0; i < sizeof(tsDnodeComponents) / sizeof(tsDnodeComponents[0]); i++) {
+    if (tsDnodeComponents[i].init() != 0) {
+      dnodeCleanupComponents(i);
+      code = -1;
+      break;
+    }
+  }
+  return code;
+}
+
+int32_t dnodeInitSystem() {
+  dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_INITIALIZE);
+  tscEmbedded  = 1;
+  taosBlockSIGPIPE();
+  taosResolveCRC();
+  taosInitGlobalCfg();
+  taosReadGlobalLogCfg();
+  taosSetCoreDump();
+  signal(SIGPIPE, SIG_IGN);
+
+  if (dnodeCreateDir(tsLogDir) < 0) {
+   printf("failed to create dir: %s, reason: %s\n", tsLogDir, strerror(errno));
+   return -1;
+  }
+
+  char temp[TSDB_FILENAME_LEN];
+  sprintf(temp, "%s/taosdlog", tsLogDir);
+  if (taosInitLog(temp, tsNumOfLogLines, 1) < 0) {
+    printf("failed to init log file\n");
+  }
+
+  if (!taosReadGlobalCfg() || !taosCheckGlobalCfg()) {
+    taosPrintGlobalCfg();
+    dError("TDengine read global config failed");
+    return -1;
+  }
+  taosPrintGlobalCfg();
+
+  dInfo("start to initialize TDengine on %s", tsLocalEp);
+
+  if (dnodeInitComponents() != 0) {
+    return -1;
+  }
+
+  dnodeStartModules();
+  dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_RUNING);
+
+  dInfo("TDengine is initialized successfully");
+
+  return 0;
+}
+
+void dnodeCleanUpSystem() {
+  if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) {
+    dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED);
+    dnodeCleanupComponents(sizeof(tsDnodeComponents) / sizeof(tsDnodeComponents[0]) - 1);
+    taos_cleanup();
+    taosCloseLog();
+  }
+}
+
+SDnodeRunStatus dnodeGetRunStatus() {
+  return tsDnodeRunStatus;
+}
+
+static void dnodeSetRunStatus(SDnodeRunStatus status) {
+  tsDnodeRunStatus = status;
+}
+
+static void dnodeCheckDataDirOpenned(char *dir) {
+  char filepath[256] = {0};
+  sprintf(filepath, "%s/.running", dir);
+
+  int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+  if (fd < 0) {
+    dError("failed to open lock file:%s, reason: %s, quit", filepath, strerror(errno));
+    exit(0);
+  }
+  int32_t ret = flock(fd, LOCK_EX | LOCK_NB);
+  if (ret != 0) {
+    dError("failed to lock file:%s ret:%d[%s], database may be running, quit", filepath, ret, strerror(errno));
+    close(fd);
+    exit(0);
+  }
+}
+
+static int32_t dnodeInitStorage() {
+  if (dnodeCreateDir(tsDataDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsDataDir, strerror(errno));
+   return -1;
+  }
+  sprintf(tsMnodeDir, "%s/mnode", tsDataDir);
+  sprintf(tsVnodeDir, "%s/vnode", tsDataDir);
+  sprintf(tsDnodeDir, "%s/dnode", tsDataDir);
+  sprintf(tsVnodeBakDir, "%s/vnode_bak", tsDataDir);
+
+  //TODO(dengyihao): no need to init here 
+  if (dnodeCreateDir(tsMnodeDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsMnodeDir, strerror(errno));
+   return -1;
+  } 
+  //TODO(dengyihao): no need to init here
+  if (dnodeCreateDir(tsVnodeDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsVnodeDir, strerror(errno));
+   return -1;
+  }
+  if (dnodeCreateDir(tsDnodeDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsDnodeDir, strerror(errno));
+   return -1;
+  } 
+  if (dnodeCreateDir(tsVnodeBakDir) < 0) {
+   dError("failed to create dir: %s, reason: %s", tsVnodeBakDir, strerror(errno));
+   return -1;
+  }
+
+  dnodeCheckDataDirOpenned(tsDnodeDir);
+
+  dInfo("storage directory is initialized");
+  return 0;
+}
+
+static void dnodeCleanupStorage() {}
+
+bool  dnodeIsFirstDeploy() {
+  return strcmp(tsFirst, tsLocalEp) == 0;
+}
diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
new file mode 100644
index 0000000000000000000000000000000000000000..c968246a68e0f8db8c55f8964a9332b17a30fdcc
--- /dev/null
+++ b/src/dnode/src/dnodeMgmt.c
@@ -0,0 +1,859 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "cJSON.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "ttimer.h"
+#include "tsdb.h"
+#include "twal.h"
+#include "tqueue.h"
+#include "tsync.h"
+#include "ttimer.h"
+#include "tbalance.h"
+#include "tglobal.h"
+#include "dnode.h"
+#include "vnode.h"
+#include "mnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
+#include "dnodeModule.h"
+
+#define MPEER_CONTENT_LEN 2000
+
+typedef struct {
+  pthread_t thread;
+  int32_t   threadIndex;
+  int32_t   failed;
+  int32_t   opened;
+  int32_t   vnodeNum;
+  int32_t * vnodeList;
+} SOpenVnodeThread;
+
+void *          tsDnodeTmr = NULL;
+static void *   tsStatusTimer = NULL;
+static uint32_t tsRebootTime;
+
+static SRpcEpSet     tsDMnodeEpSet = {0};
+static SDMMnodeInfos tsDMnodeInfos = {0};
+static SDMDnodeCfg   tsDnodeCfg = {0};
+static taos_qset     tsMgmtQset = NULL;
+static taos_queue    tsMgmtQueue = NULL;
+static pthread_t     tsQthread;
+
+static void   dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes);
+static bool   dnodeReadMnodeInfos();
+static void   dnodeSaveMnodeInfos();
+static void   dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg);
+static bool   dnodeReadDnodeCfg();
+static void   dnodeSaveDnodeCfg();
+static void   dnodeProcessStatusRsp(SRpcMsg *pMsg);
+static void   dnodeSendStatusMsg(void *handle, void *tmrId);
+static void  *dnodeProcessMgmtQueue(void *param);
+
+static int32_t  dnodeOpenVnodes();
+static void     dnodeCloseVnodes();
+static int32_t  dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg);
+static int32_t  dnodeProcessAlterVnodeMsg(SRpcMsg *pMsg);
+static int32_t  dnodeProcessDropVnodeMsg(SRpcMsg *pMsg);
+static int32_t  dnodeProcessAlterStreamMsg(SRpcMsg *pMsg);
+static int32_t  dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg);
+static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg);
+
+int32_t dnodeInitMgmt() {
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeProcessCreateVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE] = dnodeProcessAlterVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE]   = dnodeProcessDropVnodeMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeProcessAlterStreamMsg;
+  dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeProcessConfigDnodeMsg;
+
+  dnodeAddClientRspHandle(TSDB_MSG_TYPE_DM_STATUS_RSP,  dnodeProcessStatusRsp);
+  dnodeReadDnodeCfg();
+  tsRebootTime = taosGetTimestampSec();
+
+  if (!dnodeReadMnodeInfos()) {
+    memset(&tsDMnodeEpSet, 0, sizeof(SRpcEpSet));
+    memset(&tsDMnodeInfos, 0, sizeof(SDMMnodeInfos));
+
+    tsDMnodeEpSet.numOfEps = 1;
+    taosGetFqdnPortFromEp(tsFirst, tsDMnodeEpSet.fqdn[0], &tsDMnodeEpSet.port[0]);
+    
+    if (strcmp(tsSecond, tsFirst) != 0) {
+      tsDMnodeEpSet.numOfEps = 2;
+      taosGetFqdnPortFromEp(tsSecond, tsDMnodeEpSet.fqdn[1], &tsDMnodeEpSet.port[1]);
+    }
+  } else {
+    tsDMnodeEpSet.inUse = tsDMnodeInfos.inUse;
+    tsDMnodeEpSet.numOfEps = tsDMnodeInfos.nodeNum;
+    for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
+      taosGetFqdnPortFromEp(tsDMnodeInfos.nodeInfos[i].nodeEp, tsDMnodeEpSet.fqdn[i], &tsDMnodeEpSet.port[i]);
+    }
+  }
+
+  int32_t code = vnodeInitResources();
+  if (code != TSDB_CODE_SUCCESS) {
+    dnodeCleanupMgmt();
+    return -1;
+  }
+
+  // create the queue and thread to handle the message 
+  tsMgmtQset = taosOpenQset();
+  if (tsMgmtQset == NULL) {
+    dError("failed to create the mgmt queue set");
+    dnodeCleanupMgmt();
+    return -1;
+  }
+
+  tsMgmtQueue = taosOpenQueue();
+  if (tsMgmtQueue == NULL) {
+    dError("failed to create the mgmt queue");
+    dnodeCleanupMgmt();
+    return -1;
+  }
+
+  taosAddIntoQset(tsMgmtQset, tsMgmtQueue, NULL);
+
+  pthread_attr_t thAttr;
+  pthread_attr_init(&thAttr);
+  pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+  code = pthread_create(&tsQthread, &thAttr, dnodeProcessMgmtQueue, NULL);
+  pthread_attr_destroy(&thAttr);
+  if (code != 0) {
+    dError("failed to create thread to process mgmt queue, reason:%s", strerror(errno));
+    dnodeCleanupMgmt();
+    return -1; 
+  }
+
+  code = dnodeOpenVnodes();
+  if (code != TSDB_CODE_SUCCESS) {
+    dnodeCleanupMgmt();
+    return -1;
+  }
+
+  dInfo("dnode mgmt is initialized");
+ 
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t dnodeInitMgmtTimer() {
+  tsDnodeTmr = taosTmrInit(100, 200, 60000, "DND-DM");
+  if (tsDnodeTmr == NULL) {
+    dError("failed to init dnode timer");
+    dnodeCleanupMgmt();
+    return -1;
+  }
+
+  taosTmrReset(dnodeSendStatusMsg, 500, NULL, tsDnodeTmr, &tsStatusTimer);
+  dInfo("dnode mgmt timer is initialized");
+  return TSDB_CODE_SUCCESS;
+}
+
+void dnodeSendStatusMsgToMnode() {
+  if (tsDnodeTmr != NULL && tsStatusTimer != NULL) {
+    dInfo("force send status msg to mnode");
+    taosTmrReset(dnodeSendStatusMsg, 3, NULL, tsDnodeTmr, &tsStatusTimer);
+  }
+}
+
+void dnodeCleanupMgmtTimer() {
+  if (tsStatusTimer != NULL) {
+    taosTmrStopA(&tsStatusTimer);
+    tsStatusTimer = NULL;
+  }
+
+  if (tsDnodeTmr != NULL) {
+    taosTmrCleanUp(tsDnodeTmr);
+    tsDnodeTmr = NULL;
+  }
+}
+
+void dnodeCleanupMgmt() {
+  dnodeCleanupMgmtTimer();
+  dnodeCloseVnodes();
+
+  if (tsMgmtQset) taosQsetThreadResume(tsMgmtQset);
+  if (tsQthread) pthread_join(tsQthread, NULL);
+
+  if (tsMgmtQueue) taosCloseQueue(tsMgmtQueue);
+  if (tsMgmtQset) taosCloseQset(tsMgmtQset);
+  tsMgmtQset = NULL;
+  tsMgmtQueue = NULL;
+
+  vnodeCleanupResources();
+}
+
+void dnodeDispatchToMgmtQueue(SRpcMsg *pMsg) {
+  void *item;
+
+  item = taosAllocateQitem(sizeof(SRpcMsg));
+  if (item) {
+    memcpy(item, pMsg, sizeof(SRpcMsg));
+    taosWriteQitem(tsMgmtQueue, 1, item);
+  } else {
+    SRpcMsg rsp = {
+      .handle = pMsg->handle,
+      .pCont  = NULL,
+      .code   = TSDB_CODE_DND_OUT_OF_MEMORY
+    };
+    
+    rpcSendResponse(&rsp);
+    rpcFreeCont(pMsg->pCont);
+  }
+}
+
+static void *dnodeProcessMgmtQueue(void *param) {
+  SRpcMsg *pMsg;
+  SRpcMsg  rsp = {0};
+  int      type;
+  void *   handle;
+
+  while (1) {
+    if (taosReadQitemFromQset(tsMgmtQset, &type, (void **) &pMsg, &handle) == 0) {
+      dDebug("dnode mgmt got no message from qset, exit ...");
+      break;
+    }
+
+    dDebug("%p, msg:%s will be processed", pMsg->ahandle, taosMsg[pMsg->msgType]);    
+    if (dnodeProcessMgmtMsgFp[pMsg->msgType]) {
+      rsp.code = (*dnodeProcessMgmtMsgFp[pMsg->msgType])(pMsg);
+    } else {
+      rsp.code = TSDB_CODE_DND_MSG_NOT_PROCESSED;
+    }
+
+    rsp.handle = pMsg->handle;
+    rsp.pCont  = NULL;
+    rpcSendResponse(&rsp);
+
+    rpcFreeCont(pMsg->pCont);
+    taosFreeQitem(pMsg);
+  }
+
+  return NULL;
+}
+
+static int32_t dnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes) {
+  DIR *dir = opendir(tsVnodeDir);
+  if (dir == NULL) {
+    return TSDB_CODE_DND_NO_WRITE_ACCESS;
+  }
+
+  *numOfVnodes = 0;
+  struct dirent *de = NULL;
+  while ((de = readdir(dir)) != NULL) {
+    if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
+    if (de->d_type & DT_DIR) {
+      if (strncmp("vnode", de->d_name, 5) != 0) continue;
+      int32_t vnode = atoi(de->d_name + 5);
+      if (vnode == 0) continue;
+
+      (*numOfVnodes)++;
+
+      if (*numOfVnodes >= TSDB_MAX_VNODES) {
+        dError("vgId:%d, too many vnode directory in disk, exist:%d max:%d", vnode, *numOfVnodes, TSDB_MAX_VNODES);
+        continue;
+      } else {
+        vnodeList[*numOfVnodes - 1] = vnode;
+      }
+    }
+  }
+  closedir(dir);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void *dnodeOpenVnode(void *param) {
+  SOpenVnodeThread *pThread = param;
+  char vnodeDir[TSDB_FILENAME_LEN * 3];
+
+  dDebug("thread:%d, start to open %d vnodes", pThread->threadIndex, pThread->vnodeNum);
+
+  for (int32_t v = 0; v < pThread->vnodeNum; ++v) {
+    int32_t vgId = pThread->vnodeList[v];
+    snprintf(vnodeDir, TSDB_FILENAME_LEN * 3, "%s/vnode%d", tsVnodeDir, vgId);
+    if (vnodeOpen(vgId, vnodeDir) < 0) {
+      dError("vgId:%d, failed to open vnode by thread:%d", vgId, pThread->threadIndex);
+      pThread->failed++;
+    } else {
+      dDebug("vgId:%d, is openned by thread:%d", vgId, pThread->threadIndex);
+      pThread->opened++;
+    }
+  }
+
+  dDebug("thread:%d, total vnodes:%d, openned:%d failed:%d", pThread->threadIndex, pThread->vnodeNum, pThread->opened,
+         pThread->failed);
+  return NULL;
+}
+
+static int32_t dnodeOpenVnodes() {
+  int32_t vnodeList[TSDB_MAX_VNODES] = {0};
+  int32_t numOfVnodes = 0;
+  int32_t status = dnodeGetVnodeList(vnodeList, &numOfVnodes);
+
+  if (status != TSDB_CODE_SUCCESS) {
+    dInfo("get dnode list failed");
+    return status;
+  }
+
+  int32_t threadNum = tsNumOfCores;
+  int32_t vnodesPerThread = numOfVnodes / threadNum + 1;
+  SOpenVnodeThread *threads = calloc(threadNum, sizeof(SOpenVnodeThread));
+  for (int32_t t = 0; t < threadNum; ++t) {
+    threads[t].threadIndex = t;
+    threads[t].vnodeList = calloc(vnodesPerThread, sizeof(int32_t));
+  }
+
+  for (int32_t v = 0; v < numOfVnodes; ++v) {
+    int32_t t = v % threadNum;
+    SOpenVnodeThread *pThread = &threads[t];
+    pThread->vnodeList[pThread->vnodeNum++] = vnodeList[v];
+  }
+
+  dDebug("start %d threads to open %d vnodes", threadNum, numOfVnodes);
+
+  for (int32_t t = 0; t < threadNum; ++t) {
+    SOpenVnodeThread *pThread = &threads[t];
+    if (pThread->vnodeNum == 0) continue;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+    if (pthread_create(&pThread->thread, &thAttr, dnodeOpenVnode, pThread) != 0) {
+      dError("thread:%d, failed to create thread to open vnode, reason:%s", pThread->threadIndex, strerror(errno));
+    }
+
+    pthread_attr_destroy(&thAttr);
+  }
+
+  int32_t openVnodes = 0;
+  int32_t failedVnodes = 0;
+  for (int32_t t = 0; t < threadNum; ++t) {
+    SOpenVnodeThread *pThread = &threads[t];
+    if (pThread->vnodeNum > 0 && pThread->thread) {
+      pthread_join(pThread->thread, NULL);
+    }
+    openVnodes += pThread->opened;
+    failedVnodes += pThread->failed;
+    free(pThread->vnodeList);
+  }
+
+  free(threads);
+  dInfo("there are total vnodes:%d, openned:%d failed:%d", numOfVnodes, openVnodes, failedVnodes);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void dnodeCloseVnodes() {
+  int32_t vnodeList[TSDB_MAX_VNODES]= {0};
+  int32_t numOfVnodes = 0;
+  int32_t status;
+
+  status = vnodeGetVnodeList(vnodeList, &numOfVnodes);
+
+  if (status != TSDB_CODE_SUCCESS) {
+    dInfo("get dnode list failed");
+    return;
+  }
+
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    vnodeClose(vnodeList[i]);
+  }
+
+  dInfo("total vnodes:%d are all closed", numOfVnodes);
+}
+
+static void* dnodeParseVnodeMsg(SRpcMsg *rpcMsg) {
+  SMDCreateVnodeMsg *pCreate = rpcMsg->pCont;
+  pCreate->cfg.vgId                = htonl(pCreate->cfg.vgId);
+  pCreate->cfg.cfgVersion          = htonl(pCreate->cfg.cfgVersion);
+  pCreate->cfg.maxTables           = htonl(pCreate->cfg.maxTables);
+  pCreate->cfg.cacheBlockSize      = htonl(pCreate->cfg.cacheBlockSize);
+  pCreate->cfg.totalBlocks         = htonl(pCreate->cfg.totalBlocks);
+  pCreate->cfg.daysPerFile         = htonl(pCreate->cfg.daysPerFile);
+  pCreate->cfg.daysToKeep1         = htonl(pCreate->cfg.daysToKeep1);
+  pCreate->cfg.daysToKeep2         = htonl(pCreate->cfg.daysToKeep2);
+  pCreate->cfg.daysToKeep          = htonl(pCreate->cfg.daysToKeep);
+  pCreate->cfg.minRowsPerFileBlock = htonl(pCreate->cfg.minRowsPerFileBlock);
+  pCreate->cfg.maxRowsPerFileBlock = htonl(pCreate->cfg.maxRowsPerFileBlock);
+  pCreate->cfg.fsyncPeriod         = htonl(pCreate->cfg.fsyncPeriod);
+  pCreate->cfg.commitTime          = htonl(pCreate->cfg.commitTime);
+
+  for (int32_t j = 0; j < pCreate->cfg.replications; ++j) {
+    pCreate->nodes[j].nodeId = htonl(pCreate->nodes[j].nodeId);
+  }
+
+  return pCreate;
+}
+
+static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
+  SMDCreateVnodeMsg *pCreate = dnodeParseVnodeMsg(rpcMsg);
+
+  void *pVnode = vnodeAcquire(pCreate->cfg.vgId);
+  if (pVnode != NULL) {
+    dDebug("vgId:%d, already exist, return success", pCreate->cfg.vgId);
+    vnodeRelease(pVnode);
+    return TSDB_CODE_SUCCESS;
+  } else {
+    dDebug("vgId:%d, create vnode msg is received", pCreate->cfg.vgId);
+    return vnodeCreate(pCreate);
+  }
+}
+
+static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
+  SMDAlterVnodeMsg *pAlter = dnodeParseVnodeMsg(rpcMsg);
+
+  void *pVnode = vnodeAcquire(pAlter->cfg.vgId);
+  if (pVnode != NULL) {
+    dDebug("vgId:%d, alter vnode msg is received", pAlter->cfg.vgId);
+    int32_t code = vnodeAlter(pVnode, pAlter);
+    vnodeRelease(pVnode);
+    return code;
+  } else {
+    dError("vgId:%d, vnode not exist, can't alter it", pAlter->cfg.vgId);
+    return TSDB_CODE_VND_INVALID_VGROUP_ID;
+  }
+}
+
+static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) {
+  SMDDropVnodeMsg *pDrop = rpcMsg->pCont;
+  pDrop->vgId = htonl(pDrop->vgId);
+
+  return vnodeDrop(pDrop->vgId);
+}
+
+static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg) {
+//  SMDAlterStreamMsg *pStream = pCont;
+//  pStream->uid    = htobe64(pStream->uid);
+//  pStream->stime  = htobe64(pStream->stime);
+//  pStream->vnode  = htonl(pStream->vnode);
+//  pStream->sid    = htonl(pStream->sid);
+//  pStream->status = htonl(pStream->status);
+//
+//  int32_t code = dnodeCreateStream(pStream);
+
+  return 0;
+}
+
+static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg) {
+  SMDCfgDnodeMsg *pCfg = (SMDCfgDnodeMsg *)pMsg->pCont;
+  return taosCfgDynamicOptions(pCfg->config);
+}
+
+void dnodeUpdateMnodeEpSetForPeer(SRpcEpSet *pEpSet) {
+  if (pEpSet->numOfEps <= 0) {
+    dError("mnode EP list for peer is changed, but content is invalid, discard it");
+    return;
+  }
+
+  dInfo("mnode EP list for peer is changed, numOfEps:%d inUse:%d", pEpSet->numOfEps, pEpSet->inUse);
+  for (int i = 0; i < pEpSet->numOfEps; ++i) {
+    pEpSet->port[i] -= TSDB_PORT_DNODEDNODE;
+    dInfo("mnode index:%d %s:%u", i, pEpSet->fqdn[i], pEpSet->port[i])
+  }
+
+  tsDMnodeEpSet = *pEpSet;
+}
+
+void dnodeGetMnodeEpSetForPeer(void *epSetRaw) {
+  SRpcEpSet *epSet = epSetRaw;
+  *epSet = tsDMnodeEpSet;
+
+  for (int i=0; i<epSet->numOfEps; ++i) 
+    epSet->port[i] += TSDB_PORT_DNODEDNODE;
+}
+
+void dnodeGetMnodeEpSetForShell(void *epSetRaw) {
+  SRpcEpSet *epSet = epSetRaw;
+  *epSet = tsDMnodeEpSet;
+}
+
+static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
+  if (pMsg->code != TSDB_CODE_SUCCESS) {
+    dError("status rsp is received, error:%s", tstrerror(pMsg->code));
+    taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
+    return;
+  }
+
+  SDMStatusRsp *pStatusRsp = pMsg->pCont;
+  SDMMnodeInfos *pMnodes = &pStatusRsp->mnodes;
+  if (pMnodes->nodeNum <= 0) {
+    dError("status msg is invalid, num of ips is %d", pMnodes->nodeNum);
+    taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
+    return;
+  }
+
+  SDMDnodeCfg *pCfg = &pStatusRsp->dnodeCfg;
+  pCfg->numOfVnodes  = htonl(pCfg->numOfVnodes);
+  pCfg->moduleStatus = htonl(pCfg->moduleStatus);
+  pCfg->dnodeId = htonl(pCfg->dnodeId);
+
+  for (int32_t i = 0; i < pMnodes->nodeNum; ++i) {
+    SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i];
+    pMnodeInfo->nodeId   = htonl(pMnodeInfo->nodeId);
+  }
+
+  vnodeSetAccess(pStatusRsp->vgAccess, pCfg->numOfVnodes);
+  dnodeProcessModuleStatus(pCfg->moduleStatus);
+  dnodeUpdateDnodeCfg(pCfg);
+
+  dnodeUpdateMnodeInfos(pMnodes);
+  taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
+}
+
+static bool dnodeCheckMnodeInfos(SDMMnodeInfos *pMnodes) {
+  if (pMnodes->nodeNum <= 0 || pMnodes->nodeNum > 3) {
+    dError("invalid mnode infos, num:%d", pMnodes->nodeNum);
+    return false;
+  }
+
+  for (int32_t i = 0; i < pMnodes->nodeNum; ++i) {
+    SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i];
+    if (pMnodeInfo->nodeId <= 0 || strlen(pMnodeInfo->nodeEp) <= 5) {
+      dError("invalid mnode info:%d, nodeId:%d nodeEp:%s", i, pMnodeInfo->nodeId, pMnodeInfo->nodeEp);
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes) {
+  bool mnodesChanged = (memcmp(&tsDMnodeInfos, pMnodes, sizeof(SDMMnodeInfos)) != 0);
+  bool mnodesNotInit = (tsDMnodeInfos.nodeNum == 0);
+  if (!(mnodesChanged || mnodesNotInit)) return;
+
+  if (!dnodeCheckMnodeInfos(pMnodes)) return;
+
+  memcpy(&tsDMnodeInfos, pMnodes, sizeof(SDMMnodeInfos));
+  dInfo("mnode infos is changed, nodeNum:%d inUse:%d", tsDMnodeInfos.nodeNum, tsDMnodeInfos.inUse);
+  for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
+    dInfo("mnode index:%d, %s", tsDMnodeInfos.nodeInfos[i].nodeId, tsDMnodeInfos.nodeInfos[i].nodeEp);
+  }
+
+  tsDMnodeEpSet.inUse = tsDMnodeInfos.inUse;
+  tsDMnodeEpSet.numOfEps = tsDMnodeInfos.nodeNum;
+  for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
+    taosGetFqdnPortFromEp(tsDMnodeInfos.nodeInfos[i].nodeEp, tsDMnodeEpSet.fqdn[i], &tsDMnodeEpSet.port[i]);
+  }
+
+  dnodeSaveMnodeInfos();
+  sdbUpdateSync();
+}
+
+static bool dnodeReadMnodeInfos() {
+  char ipFile[TSDB_FILENAME_LEN*2] = {0};
+  
+  sprintf(ipFile, "%s/mnodeEpSet.json", tsDnodeDir);
+  FILE *fp = fopen(ipFile, "r");
+  if (!fp) {
+    dDebug("failed to read mnodeEpSet.json, file not exist");
+    return false;
+  }
+
+  bool  ret = false;
+  int   maxLen = 2000;
+  char *content = calloc(1, maxLen + 1);
+  int   len = fread(content, 1, maxLen, fp);
+  if (len <= 0) {
+    free(content);
+    fclose(fp);
+    dError("failed to read mnodeEpSet.json, content is null");
+    return false;
+  }
+
+  content[len] = 0;
+  cJSON* root = cJSON_Parse(content);
+  if (root == NULL) {
+    dError("failed to read mnodeEpSet.json, invalid json format");
+    goto PARSE_OVER;
+  }
+
+  cJSON* inUse = cJSON_GetObjectItem(root, "inUse");
+  if (!inUse || inUse->type != cJSON_Number) {
+    dError("failed to read mnodeEpSet.json, inUse not found");
+    goto PARSE_OVER;
+  }
+  tsDMnodeInfos.inUse = inUse->valueint;
+
+  cJSON* nodeNum = cJSON_GetObjectItem(root, "nodeNum");
+  if (!nodeNum || nodeNum->type != cJSON_Number) {
+    dError("failed to read mnodeEpSet.json, nodeNum not found");
+    goto PARSE_OVER;
+  }
+  tsDMnodeInfos.nodeNum = nodeNum->valueint;
+
+  cJSON* nodeInfos = cJSON_GetObjectItem(root, "nodeInfos");
+  if (!nodeInfos || nodeInfos->type != cJSON_Array) {
+    dError("failed to read mnodeEpSet.json, nodeInfos not found");
+    goto PARSE_OVER;
+  }
+
+  int size = cJSON_GetArraySize(nodeInfos);
+  if (size != tsDMnodeInfos.nodeNum) {
+    dError("failed to read mnodeEpSet.json, nodeInfos size not matched");
+    goto PARSE_OVER;
+  }
+
+  for (int i = 0; i < size; ++i) {
+    cJSON *nodeInfo = cJSON_GetArrayItem(nodeInfos, i);
+    if (nodeInfo == NULL) continue;
+
+    cJSON *nodeId = cJSON_GetObjectItem(nodeInfo, "nodeId");
+    if (!nodeId || nodeId->type != cJSON_Number) {
+      dError("failed to read mnodeEpSet.json, nodeId not found");
+      goto PARSE_OVER;
+    }
+    tsDMnodeInfos.nodeInfos[i].nodeId = nodeId->valueint;
+
+    cJSON *nodeEp = cJSON_GetObjectItem(nodeInfo, "nodeEp");
+    if (!nodeEp || nodeEp->type != cJSON_String || nodeEp->valuestring == NULL) {
+      dError("failed to read mnodeEpSet.json, nodeName not found");
+      goto PARSE_OVER;
+    }
+    strncpy(tsDMnodeInfos.nodeInfos[i].nodeEp, nodeEp->valuestring, TSDB_EP_LEN);
+  }
+
+  ret = true;
+
+  dInfo("read mnode epSet successed, numOfEps:%d inUse:%d", tsDMnodeInfos.nodeNum, tsDMnodeInfos.inUse);
+  for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
+    dInfo("mnode:%d, %s", tsDMnodeInfos.nodeInfos[i].nodeId, tsDMnodeInfos.nodeInfos[i].nodeEp);
+  }
+
+PARSE_OVER:
+  free(content);
+  cJSON_Delete(root);
+  fclose(fp);
+  return ret;
+}
+
+static void dnodeSaveMnodeInfos() {
+  char ipFile[TSDB_FILENAME_LEN] = {0};
+  sprintf(ipFile, "%s/mnodeEpSet.json", tsDnodeDir);
+  FILE *fp = fopen(ipFile, "w");
+  if (!fp) return;
+
+  int32_t len = 0;
+  int32_t maxLen = 2000;
+  char *  content = calloc(1, maxLen + 1);
+
+  len += snprintf(content + len, maxLen - len, "{\n");
+  len += snprintf(content + len, maxLen - len, "  \"inUse\": %d,\n", tsDMnodeInfos.inUse);
+  len += snprintf(content + len, maxLen - len, "  \"nodeNum\": %d,\n", tsDMnodeInfos.nodeNum);
+  len += snprintf(content + len, maxLen - len, "  \"nodeInfos\": [{\n");
+  for (int32_t i = 0; i < tsDMnodeInfos.nodeNum; i++) {
+    len += snprintf(content + len, maxLen - len, "    \"nodeId\": %d,\n", tsDMnodeInfos.nodeInfos[i].nodeId);
+    len += snprintf(content + len, maxLen - len, "    \"nodeEp\": \"%s\"\n", tsDMnodeInfos.nodeInfos[i].nodeEp);
+    if (i < tsDMnodeInfos.nodeNum -1) {
+      len += snprintf(content + len, maxLen - len, "  },{\n");  
+    } else {
+      len += snprintf(content + len, maxLen - len, "  }]\n");  
+    }
+  }
+  len += snprintf(content + len, maxLen - len, "}\n"); 
+
+  fwrite(content, 1, len, fp);
+  fflush(fp);
+  fclose(fp);
+  free(content);
+  
+  dInfo("save mnode epSet successed");
+}
+
+char *dnodeGetMnodeMasterEp() {
+  return tsDMnodeInfos.nodeInfos[tsDMnodeEpSet.inUse].nodeEp;
+}
+
+void* dnodeGetMnodeInfos() {
+  return &tsDMnodeInfos;
+}
+
+static void dnodeSendStatusMsg(void *handle, void *tmrId) {
+  if (tsDnodeTmr == NULL) {
+    dError("dnode timer is already released");
+    return;
+  }
+
+  if (tsStatusTimer == NULL) {
+    taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
+    dError("failed to start status timer");
+    return;
+  }
+
+  int32_t contLen = sizeof(SDMStatusMsg) + TSDB_MAX_VNODES * sizeof(SVnodeLoad);
+  SDMStatusMsg *pStatus = rpcMallocCont(contLen);
+  if (pStatus == NULL) {
+    taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
+    dError("failed to malloc status message");
+    return;
+  }
+
+  //strcpy(pStatus->dnodeName, tsDnodeName);
+  pStatus->version          = htonl(tsVersion);
+  pStatus->dnodeId          = htonl(tsDnodeCfg.dnodeId);
+  pStatus->lastReboot       = htonl(tsRebootTime);
+  pStatus->numOfCores       = htons((uint16_t) tsNumOfCores);
+  pStatus->diskAvailable    = tsAvailDataDirGB;
+  pStatus->alternativeRole  = (uint8_t) tsAlternativeRole;
+  tstrncpy(pStatus->clusterId, tsDnodeCfg.clusterId, TSDB_CLUSTER_ID_LEN);
+  tstrncpy(pStatus->dnodeEp, tsLocalEp, TSDB_EP_LEN);
+
+  // fill cluster cfg parameters
+  pStatus->clusterCfg.numOfMnodes        = htonl(tsNumOfMnodes);
+  pStatus->clusterCfg.enableBalance      = htonl(tsEnableBalance);
+  pStatus->clusterCfg.mnodeEqualVnodeNum = htonl(tsMnodeEqualVnodeNum);
+  pStatus->clusterCfg.offlineThreshold   = htonl(tsOfflineThreshold);
+  pStatus->clusterCfg.statusInterval     = htonl(tsStatusInterval);
+  pStatus->clusterCfg.maxtablesPerVnode  = htonl(tsMaxTablePerVnode);
+  pStatus->clusterCfg.maxVgroupsPerDb    = htonl(tsMaxVgroupsPerDb);
+  tstrncpy(pStatus->clusterCfg.arbitrator, tsArbitrator, TSDB_EP_LEN);
+  tstrncpy(pStatus->clusterCfg.timezone, tsTimezone, 64);
+  pStatus->clusterCfg.checkTime = 0;
+  char timestr[32] = "1970-01-01 00:00:00.00";
+  (void)taosParseTime(timestr, &pStatus->clusterCfg.checkTime, strlen(timestr), TSDB_TIME_PRECISION_MILLI, 0);
+  tstrncpy(pStatus->clusterCfg.locale, tsLocale, TSDB_LOCALE_LEN);
+  tstrncpy(pStatus->clusterCfg.charset, tsCharset, TSDB_LOCALE_LEN);  
+  
+  vnodeBuildStatusMsg(pStatus);
+  contLen = sizeof(SDMStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad);
+  pStatus->openVnodes = htons(pStatus->openVnodes);
+  
+  SRpcMsg rpcMsg = {
+    .pCont   = pStatus,
+    .contLen = contLen,
+    .msgType = TSDB_MSG_TYPE_DM_STATUS
+  };
+
+  SRpcEpSet epSet;
+  dnodeGetMnodeEpSetForPeer(&epSet);
+  dnodeSendMsgToDnode(&epSet, &rpcMsg);
+}
+
+static bool dnodeReadDnodeCfg() {
+  char dnodeCfgFile[TSDB_FILENAME_LEN*2] = {0};
+  
+  sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
+
+  FILE *fp = fopen(dnodeCfgFile, "r");
+  if (!fp) {
+    dDebug("failed to read dnodeCfg.json, file not exist");
+    return false;
+  }
+
+  bool  ret = false;
+  int   maxLen = 100;
+  char *content = calloc(1, maxLen + 1);
+  int   len = fread(content, 1, maxLen, fp);
+  if (len <= 0) {
+    free(content);
+    fclose(fp);
+    dError("failed to read dnodeCfg.json, content is null");
+    return false;
+  }
+
+  content[len] = 0;
+  cJSON* root = cJSON_Parse(content);
+  if (root == NULL) {
+    dError("failed to read dnodeCfg.json, invalid json format");
+    goto PARSE_CFG_OVER;
+  }
+
+  cJSON* dnodeId = cJSON_GetObjectItem(root, "dnodeId");
+  if (!dnodeId || dnodeId->type != cJSON_Number) {
+    dError("failed to read dnodeCfg.json, dnodeId not found");
+    goto PARSE_CFG_OVER;
+  }
+  tsDnodeCfg.dnodeId = dnodeId->valueint;
+
+  cJSON* clusterId = cJSON_GetObjectItem(root, "clusterId");
+  if (!clusterId || clusterId->type != cJSON_String) {
+    dError("failed to read dnodeCfg.json, clusterId not found");
+    goto PARSE_CFG_OVER;
+  }
+  tstrncpy(tsDnodeCfg.clusterId, clusterId->valuestring, TSDB_CLUSTER_ID_LEN);
+
+  ret = true;
+
+  dInfo("read numOfVnodes successed, dnodeId:%d", tsDnodeCfg.dnodeId);
+
+PARSE_CFG_OVER:
+  free(content);
+  cJSON_Delete(root);
+  fclose(fp);
+  return ret;
+}
+
+static void dnodeSaveDnodeCfg() {
+  char dnodeCfgFile[TSDB_FILENAME_LEN] = {0};
+  sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
+
+  FILE *fp = fopen(dnodeCfgFile, "w");
+  if (!fp) return;
+
+  int32_t len = 0;
+  int32_t maxLen = 200;
+  char *  content = calloc(1, maxLen + 1);
+
+  len += snprintf(content + len, maxLen - len, "{\n");
+  len += snprintf(content + len, maxLen - len, "  \"dnodeId\": %d,\n", tsDnodeCfg.dnodeId);
+  len += snprintf(content + len, maxLen - len, "  \"clusterId\": \"%s\"\n", tsDnodeCfg.clusterId);
+  len += snprintf(content + len, maxLen - len, "}\n");
+
+  fwrite(content, 1, len, fp);
+  fflush(fp);
+  fclose(fp);
+  free(content);
+  
+  dInfo("save dnodeId successed");
+}
+
+void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg) {
+  if (tsDnodeCfg.dnodeId == 0) {
+    dInfo("dnodeId is set to %d, clusterId is set to %s", pCfg->dnodeId, pCfg->clusterId);  
+    tsDnodeCfg.dnodeId = pCfg->dnodeId;
+    tstrncpy(tsDnodeCfg.clusterId, pCfg->clusterId, TSDB_CLUSTER_ID_LEN);
+    dnodeSaveDnodeCfg();
+  }
+}
+
+int32_t dnodeGetDnodeId() {
+  return tsDnodeCfg.dnodeId;
+}
+
+void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
+  SRpcConnInfo connInfo = {0};
+  rpcGetConnInfo(rpcMsg->handle, &connInfo);
+
+  SRpcEpSet epSet = {0};
+  if (forShell) {
+    dnodeGetMnodeEpSetForShell(&epSet);
+  } else {
+    dnodeGetMnodeEpSetForPeer(&epSet);
+  }
+  
+  dDebug("msg:%s will be redirected, dnodeIp:%s user:%s, numOfEps:%d inUse:%d", taosMsg[rpcMsg->msgType],
+         taosIpStr(connInfo.clientIp), connInfo.user, epSet.numOfEps, epSet.inUse);
+
+  for (int i = 0; i < epSet.numOfEps; ++i) {
+    dDebug("mnode index:%d %s:%d", i, epSet.fqdn[i], epSet.port[i]);
+    epSet.port[i] = htons(epSet.port[i]);
+  }
+
+  rpcSendRedirectRsp(rpcMsg->handle, &epSet);
+}
diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..18a293d41588033a27c4f1bf88e3af0d1d527eec
--- /dev/null
+++ b/src/dnode/src/dnodeModule.c
@@ -0,0 +1,164 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "http.h"
+#include "tmqtt.h"
+#include "monitor.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeModule.h"
+
+typedef struct {
+  bool      enable;
+  char *    name;
+  int32_t (*initFp)();
+  int32_t (*startFp)();
+  void    (*cleanUpFp)();
+  void    (*stopFp)();
+} SModule;
+
+static SModule  tsModule[TSDB_MOD_MAX] = {{0}};
+static uint32_t tsModuleStatus = 0;
+
+static void dnodeSetModuleStatus(int32_t module) {
+  tsModuleStatus |= (1 << module);
+}
+
+static void dnodeUnSetModuleStatus(int32_t module) {
+  tsModuleStatus &= ~(1 << module);
+}
+
+static void dnodeAllocModules() {
+  tsModule[TSDB_MOD_MNODE].enable       = false;
+  tsModule[TSDB_MOD_MNODE].name         = "mnode";
+  tsModule[TSDB_MOD_MNODE].initFp       = mnodeInitSystem;
+  tsModule[TSDB_MOD_MNODE].cleanUpFp    = mnodeCleanupSystem;
+  tsModule[TSDB_MOD_MNODE].startFp      = mnodeStartSystem;
+  tsModule[TSDB_MOD_MNODE].stopFp       = mnodeStopSystem;
+
+  tsModule[TSDB_MOD_HTTP].enable       = (tsEnableHttpModule == 1);
+  tsModule[TSDB_MOD_HTTP].name         = "http";
+  tsModule[TSDB_MOD_HTTP].initFp       = httpInitSystem;
+  tsModule[TSDB_MOD_HTTP].cleanUpFp    = httpCleanUpSystem;
+  tsModule[TSDB_MOD_HTTP].startFp      = httpStartSystem;
+  tsModule[TSDB_MOD_HTTP].stopFp       = httpStopSystem;
+  if (tsEnableHttpModule) {
+    dnodeSetModuleStatus(TSDB_MOD_HTTP);
+  }
+
+#ifdef _MQTT
+  tsModule[TSDB_MOD_MQTT].enable = (tsEnableMqttModule == 1);
+  tsModule[TSDB_MOD_MQTT].name = "mqtt";
+  tsModule[TSDB_MOD_MQTT].initFp = mqttInitSystem;
+  tsModule[TSDB_MOD_MQTT].cleanUpFp = mqttCleanUpSystem;
+  tsModule[TSDB_MOD_MQTT].startFp = mqttStartSystem;
+  tsModule[TSDB_MOD_MQTT].stopFp = mqttStopSystem;
+  if (tsEnableMqttModule) {
+    dnodeSetModuleStatus(TSDB_MOD_MQTT);
+  }
+#endif  
+
+  tsModule[TSDB_MOD_MONITOR].enable    = (tsEnableMonitorModule == 1);
+  tsModule[TSDB_MOD_MONITOR].name      = "monitor";
+  tsModule[TSDB_MOD_MONITOR].initFp    = monitorInitSystem;
+  tsModule[TSDB_MOD_MONITOR].cleanUpFp = monitorCleanUpSystem;
+  tsModule[TSDB_MOD_MONITOR].startFp   = monitorStartSystem;
+  tsModule[TSDB_MOD_MONITOR].stopFp    = monitorStopSystem;
+  if (tsEnableMonitorModule) {
+    dnodeSetModuleStatus(TSDB_MOD_MONITOR);
+  }
+}
+
+void dnodeCleanupModules() {
+  for (EModuleType module = 1; module < TSDB_MOD_MAX; ++module) {
+    if (tsModule[module].enable && tsModule[module].stopFp) {
+      (*tsModule[module].stopFp)();
+    }
+    if (tsModule[module].cleanUpFp) {
+      (*tsModule[module].cleanUpFp)();
+    }
+  }
+
+  if (tsModule[TSDB_MOD_MNODE].enable && tsModule[TSDB_MOD_MNODE].cleanUpFp) {
+    (*tsModule[TSDB_MOD_MNODE].cleanUpFp)();
+  }
+}
+
+int32_t dnodeInitModules() {
+  dnodeAllocModules();
+
+  for (EModuleType module = 0; module < TSDB_MOD_MAX; ++module) {
+    if (tsModule[module].initFp) {
+      if ((*tsModule[module].initFp)() != 0) {
+        dError("failed to init module:%s", tsModule[module].name);
+        return -1;
+      }
+    }
+  }
+
+  return 0;
+}
+
+void dnodeStartModules() {
+  for (EModuleType module = 1; module < TSDB_MOD_MAX; ++module) {
+    if (tsModule[module].enable && tsModule[module].startFp) {
+      if ((*tsModule[module].startFp)() != 0) {
+        dError("failed to start module:%s", tsModule[module].name);
+      }
+    }
+  }
+}
+
+void dnodeProcessModuleStatus(uint32_t moduleStatus) {
+  for (int32_t module = TSDB_MOD_MNODE; module < TSDB_MOD_HTTP; ++module) {
+    bool enableModule = moduleStatus & (1 << module);
+    if (!tsModule[module].enable && enableModule) {
+      dInfo("module status:%u is set, start %s module", moduleStatus, tsModule[module].name);
+      tsModule[module].enable = true;
+      dnodeSetModuleStatus(module);
+      (*tsModule[module].startFp)();
+    }
+
+    if (tsModule[module].enable && !enableModule) {
+      dInfo("module status:%u is set, stop %s module", moduleStatus, tsModule[module].name);
+      tsModule[module].enable = false;
+      dnodeUnSetModuleStatus(module);
+      (*tsModule[module].stopFp)();
+    }
+  }
+}
+
+bool dnodeCheckMnodeStarting() {
+  if (tsModuleStatus & (1 << TSDB_MOD_MNODE)) return false;
+
+  SDMMnodeInfos *mnodes = dnodeGetMnodeInfos();
+  for (int32_t i = 0; i < mnodes->nodeNum; ++i) {
+    SDMMnodeInfo *node = &mnodes->nodeInfos[i];
+    if (node->nodeId == dnodeGetDnodeId()) {
+      uint32_t moduleStatus = tsModuleStatus | (1 << TSDB_MOD_MNODE);
+      dInfo("start mnode module, module status:%d, new status:%d", tsModuleStatus, moduleStatus);
+      dnodeProcessModuleStatus(moduleStatus);
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/src/dnode/src/dnodePeer.c b/src/dnode/src/dnodePeer.c
new file mode 100644
index 0000000000000000000000000000000000000000..c09d7422396b4525945ae0bb1f32d77d82ac9903
--- /dev/null
+++ b/src/dnode/src/dnodePeer.c
@@ -0,0 +1,177 @@
+/*
+ * 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/>.
+ */
+
+/* this file is mainly responsible for the communication between DNODEs. Each 
+ * dnode works as both server and client. Dnode may send status, grant, config
+ * messages to mnode, mnode may send create/alter/drop table/vnode messages 
+ * to dnode. All theses messages are handled from here
+ */
+
+#include "os.h"
+#include "taosmsg.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeVWrite.h"
+#include "dnodeMPeer.h"
+
+extern void dnodeUpdateMnodeEpSetForPeer(SRpcEpSet *pEpSet);
+static void (*dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
+static void dnodeProcessReqMsgFromDnode(SRpcMsg *pMsg, SRpcEpSet *);
+static void (*dnodeProcessRspMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *rpcMsg);
+static void dnodeProcessRspFromDnode(SRpcMsg *pMsg, SRpcEpSet *pEpSet);
+static void *tsDnodeServerRpc = NULL;
+static void *tsDnodeClientRpc = NULL;
+
+int32_t dnodeInitServer() {
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE]   = dnodeDispatchToVnodeWriteQueue; 
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_TABLE]  = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE]  = dnodeDispatchToVnodeWriteQueue;
+
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeDispatchToMgmtQueue; 
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE]  = dnodeDispatchToMgmtQueue; 
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE]   = dnodeDispatchToMgmtQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeDispatchToMgmtQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeDispatchToMgmtQueue;
+
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_TABLE] = dnodeDispatchToMnodePeerQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_VNODE] = dnodeDispatchToMnodePeerQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_AUTH]         = dnodeDispatchToMnodePeerQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_GRANT]        = dnodeDispatchToMnodePeerQueue;
+  dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_STATUS]       = dnodeDispatchToMnodePeerQueue;
+  
+  SRpcInit rpcInit;
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort    = tsDnodeDnodePort;
+  rpcInit.label        = "DND-S";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = dnodeProcessReqMsgFromDnode;
+  rpcInit.sessions     = TSDB_MAX_VNODES;
+  rpcInit.connType     = TAOS_CONN_SERVER;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
+
+  tsDnodeServerRpc = rpcOpen(&rpcInit);
+  if (tsDnodeServerRpc == NULL) {
+    dError("failed to init inter-dnodes RPC server");
+    return -1;
+  }
+
+  dInfo("inter-dnodes RPC server is opened");
+  return 0;
+}
+
+void dnodeCleanupServer() {
+  if (tsDnodeServerRpc) {
+    rpcClose(tsDnodeServerRpc);
+    tsDnodeServerRpc = NULL;
+    dInfo("inter-dnodes RPC server is closed");
+  }
+}
+
+static void dnodeProcessReqMsgFromDnode(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SRpcMsg rspMsg = {
+    .handle  = pMsg->handle,
+    .pCont   = NULL,
+    .contLen = 0
+  };
+  
+  if (pMsg->pCont == NULL) return;
+
+  if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) {
+    rspMsg.code = TSDB_CODE_APP_NOT_READY;
+    rpcSendResponse(&rspMsg);
+    rpcFreeCont(pMsg->pCont);
+    dDebug("RPC %p, msg:%s is ignored since dnode not running", pMsg->handle, taosMsg[pMsg->msgType]);
+    return;
+  }
+
+  if (pMsg->pCont == NULL) {
+    rspMsg.code = TSDB_CODE_DND_INVALID_MSG_LEN;
+    rpcSendResponse(&rspMsg);
+    return;
+  }
+
+  if (dnodeProcessReqMsgFp[pMsg->msgType]) {
+    (*dnodeProcessReqMsgFp[pMsg->msgType])(pMsg);
+  } else {
+    dDebug("RPC %p, message:%s not processed", pMsg->handle, taosMsg[pMsg->msgType]);
+    rspMsg.code = TSDB_CODE_DND_MSG_NOT_PROCESSED;
+    rpcSendResponse(&rspMsg);
+    rpcFreeCont(pMsg->pCont);
+  }
+}
+
+int32_t dnodeInitClient() {
+  char secret[TSDB_KEY_LEN] = "secret";
+  SRpcInit rpcInit;
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.label        = "DND-C";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = dnodeProcessRspFromDnode;
+  rpcInit.sessions     = TSDB_MAX_VNODES;
+  rpcInit.connType     = TAOS_CONN_CLIENT;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
+  rpcInit.user         = "t";
+  rpcInit.ckey         = "key";
+  rpcInit.secret       = secret;
+
+  tsDnodeClientRpc = rpcOpen(&rpcInit);
+  if (tsDnodeClientRpc == NULL) {
+    dError("failed to init mnode rpc client");
+    return -1;
+  }
+
+  dInfo("inter-dnodes rpc client is opened");
+  return 0;
+}
+
+void dnodeCleanupClient() {
+  if (tsDnodeClientRpc) {
+    rpcClose(tsDnodeClientRpc);
+    tsDnodeClientRpc = NULL;
+    dInfo("inter-dnodes rpc client is closed");
+  }
+}
+
+static void dnodeProcessRspFromDnode(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  if (pMsg->msgType == TSDB_MSG_TYPE_DM_STATUS_RSP && pEpSet) {
+    dnodeUpdateMnodeEpSetForPeer(pEpSet);
+  }
+
+  if (dnodeProcessRspMsgFp[pMsg->msgType]) {    
+    (*dnodeProcessRspMsgFp[pMsg->msgType])(pMsg);
+  } else {
+    mnodeProcessPeerRsp(pMsg);
+  }
+
+  rpcFreeCont(pMsg->pCont);
+}
+
+void dnodeAddClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) {
+  dnodeProcessRspMsgFp[msgType] = fp;
+}
+
+void dnodeSendMsgToDnode(SRpcEpSet *epSet, SRpcMsg *rpcMsg) {
+  rpcSendRequest(tsDnodeClientRpc, epSet, rpcMsg);
+}
+
+void dnodeSendMsgToDnodeRecv(SRpcMsg *rpcMsg, SRpcMsg *rpcRsp) {
+  SRpcEpSet epSet = {0};
+  dnodeGetMnodeEpSetForPeer(&epSet);
+  rpcSendRecv(tsDnodeClientRpc, &epSet, rpcMsg, rpcRsp);
+}
diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a1d337824e3a7879c651b8db3a3465e526c9299
--- /dev/null
+++ b/src/dnode/src/dnodeShell.c
@@ -0,0 +1,223 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tglobal.h"
+#include "tutil.h"
+#include "http.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeVRead.h"
+#include "dnodeVWrite.h"
+#include "dnodeMRead.h"
+#include "dnodeMWrite.h"
+#include "dnodeShell.h"
+
+static void  (*dnodeProcessShellMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
+static void    dnodeProcessMsgFromShell(SRpcMsg *pMsg, SRpcEpSet *);
+static int     dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char *secret, char *ckey);
+static void  * tsDnodeShellRpc = NULL;
+static int32_t tsDnodeQueryReqNum  = 0;
+static int32_t tsDnodeSubmitReqNum = 0;
+
+int32_t dnodeInitShell() {
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_SUBMIT]         = dnodeDispatchToVnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY]          = dnodeDispatchToVnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_FETCH]          = dnodeDispatchToVnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_UPDATE_TAG_VAL] = dnodeDispatchToVnodeWriteQueue;
+  
+  // the following message shall be treated as mnode write
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_ACCT] = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_ACCT]  = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_DROP_ACCT]   = dnodeDispatchToMnodeWriteQueue; 
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_USER] = dnodeDispatchToMnodeWriteQueue; 
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_USER]  = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_DROP_USER]   = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_DNODE]= dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_DROP_DNODE]  = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_DB]   = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_DROP_DB]     = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_DB]    = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_TABLE]= dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_DROP_TABLE]  = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_TABLE] = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_STREAM]= dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_KILL_QUERY]  = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_KILL_STREAM] = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_KILL_CONN]   = dnodeDispatchToMnodeWriteQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CONFIG_DNODE]= dnodeDispatchToMnodeWriteQueue;
+  
+  // the following message shall be treated as mnode query 
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_HEARTBEAT]   = dnodeDispatchToMnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CONNECT]     = dnodeDispatchToMnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_USE_DB]      = dnodeDispatchToMnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_TABLE_META]  = dnodeDispatchToMnodeReadQueue; 
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_STABLE_VGROUP]= dnodeDispatchToMnodeReadQueue;   
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_TABLES_META] = dnodeDispatchToMnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_SHOW]        = dnodeDispatchToMnodeReadQueue;
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_RETRIEVE]    = dnodeDispatchToMnodeReadQueue;
+
+  int32_t numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore;
+  numOfThreads = (int32_t) ((1.0 - tsRatioOfQueryThreads) * numOfThreads / 2.0);
+  if (numOfThreads < 1) {
+    numOfThreads = 1;
+  }
+
+  SRpcInit rpcInit;
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort    = tsDnodeShellPort;
+  rpcInit.label        = "SHELL";
+  rpcInit.numOfThreads = numOfThreads;
+  rpcInit.cfp          = dnodeProcessMsgFromShell;
+  rpcInit.sessions     = tsMaxShellConns;
+  rpcInit.connType     = TAOS_CONN_SERVER;
+  rpcInit.idleTime     = tsShellActivityTimer * 1000;
+  rpcInit.afp          = dnodeRetrieveUserAuthInfo;
+
+  tsDnodeShellRpc = rpcOpen(&rpcInit);
+  if (tsDnodeShellRpc == NULL) {
+    dError("failed to init shell rpc server");
+    return -1;
+  }
+
+  dInfo("shell rpc server is opened");
+  return 0;
+}
+
+void dnodeCleanupShell() {
+  if (tsDnodeShellRpc) {
+    rpcClose(tsDnodeShellRpc);
+    tsDnodeShellRpc = NULL;
+  }
+}
+
+void dnodeProcessMsgFromShell(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SRpcMsg rpcMsg = {
+    .handle  = pMsg->handle,
+    .pCont   = NULL,
+    .contLen = 0
+  };
+
+  if (pMsg->pCont == NULL) return;
+
+  if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) {
+    dError("RPC %p, shell msg:%s is ignored since dnode not running", pMsg->handle, taosMsg[pMsg->msgType]);
+    rpcMsg.code = TSDB_CODE_APP_NOT_READY;
+    rpcSendResponse(&rpcMsg);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+
+  if (pMsg->msgType == TSDB_MSG_TYPE_QUERY) {
+    atomic_fetch_add_32(&tsDnodeQueryReqNum, 1);
+  } else if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT) {
+    atomic_fetch_add_32(&tsDnodeSubmitReqNum, 1);
+  } else {}
+
+  if ( dnodeProcessShellMsgFp[pMsg->msgType] ) {
+    (*dnodeProcessShellMsgFp[pMsg->msgType])(pMsg);
+  } else {
+    dError("RPC %p, shell msg:%s is not processed", pMsg->handle, taosMsg[pMsg->msgType]);
+    rpcMsg.code = TSDB_CODE_DND_MSG_NOT_PROCESSED;
+    rpcSendResponse(&rpcMsg);
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+}
+
+static int dnodeRetrieveUserAuthInfo(char *user, char *spi, char *encrypt, char *secret, char *ckey) {
+  int code = mnodeRetriveAuth(user, spi, encrypt, secret, ckey);
+  if (code != TSDB_CODE_APP_NOT_READY) return code;
+
+  SDMAuthMsg *pMsg = rpcMallocCont(sizeof(SDMAuthMsg));
+  tstrncpy(pMsg->user, user, sizeof(pMsg->user));
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pMsg;
+  rpcMsg.contLen = sizeof(SDMAuthMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_DM_AUTH;
+  
+  dDebug("user:%s, send auth msg to mnodes", user);
+  SRpcMsg rpcRsp = {0};
+  dnodeSendMsgToDnodeRecv(&rpcMsg, &rpcRsp);
+
+  if (rpcRsp.code != 0) {
+    dError("user:%s, auth msg received from mnodes, error:%s", user, tstrerror(rpcRsp.code));
+  } else {
+    SDMAuthRsp *pRsp = rpcRsp.pCont;
+    dDebug("user:%s, auth msg received from mnodes", user);
+    memcpy(secret, pRsp->secret, TSDB_KEY_LEN);
+    memcpy(ckey, pRsp->ckey, TSDB_KEY_LEN);
+    *spi = pRsp->spi;
+    *encrypt = pRsp->encrypt;
+  }
+
+  rpcFreeCont(rpcRsp.pCont);
+  return rpcRsp.code;
+}
+
+void *dnodeSendCfgTableToRecv(int32_t vgId, int32_t sid) {
+  dDebug("vgId:%d, sid:%d send config table msg to mnode", vgId, sid);
+
+  int32_t contLen = sizeof(SDMConfigTableMsg);
+  SDMConfigTableMsg *pMsg = rpcMallocCont(contLen);
+
+  pMsg->dnodeId = htonl(dnodeGetDnodeId());
+  pMsg->vgId = htonl(vgId);
+  pMsg->sid = htonl(sid);
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pMsg;
+  rpcMsg.contLen = contLen;
+  rpcMsg.msgType = TSDB_MSG_TYPE_DM_CONFIG_TABLE;
+
+  SRpcMsg rpcRsp = {0};
+  dnodeSendMsgToDnodeRecv(&rpcMsg, &rpcRsp);
+  terrno = rpcRsp.code;
+  
+  if (rpcRsp.code != 0) {
+    rpcFreeCont(rpcRsp.pCont);
+    dError("vgId:%d, sid:%d failed to config table from mnode", vgId, sid);
+    return NULL;
+  } else {
+    dInfo("vgId:%d, sid:%d config table msg is received", vgId, sid);
+    
+    // delete this after debug finished
+    SMDCreateTableMsg *pTable = rpcRsp.pCont;
+    int16_t   numOfColumns = htons(pTable->numOfColumns);
+    int16_t   numOfTags = htons(pTable->numOfTags);
+    int32_t   sid = htonl(pTable->sid);
+    uint64_t  uid = htobe64(pTable->uid);
+    dInfo("table:%s, numOfColumns:%d numOfTags:%d sid:%d uid:%" PRIu64, pTable->tableId, numOfColumns, numOfTags, sid, uid);
+
+    return rpcRsp.pCont;
+  }
+}
+
+SDnodeStatisInfo dnodeGetStatisInfo() {
+  SDnodeStatisInfo info = {0};
+  if (dnodeGetRunStatus() == TSDB_DNODE_RUN_STATUS_RUNING) {
+    info.httpReqNum   = httpGetReqCount();
+    info.queryReqNum  = atomic_exchange_32(&tsDnodeQueryReqNum, 0);
+    info.submitReqNum = atomic_exchange_32(&tsDnodeSubmitReqNum, 0);
+  }
+
+  return info;
+}
diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..56316e9619344243ab2e5fa46e0acfc6e0331e8a
--- /dev/null
+++ b/src/dnode/src/dnodeSystem.c
@@ -0,0 +1,160 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tgrant.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "dnodeInt.h"
+#include "dnodeMain.h"
+
+static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
+static tsem_t exitSem;
+
+int32_t main(int32_t argc, char *argv[]) {
+  // Set global configuration file
+  for (int32_t i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-c") == 0) {
+      if (i < argc - 1) {        
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
+          printf("config file path overflow");
+          exit(EXIT_FAILURE);
+        }
+        tstrncpy(configDir, argv[i], TSDB_FILENAME_LEN);
+      } else {
+        printf("'-c' requires a parameter, default:%s\n", configDir);
+        exit(EXIT_FAILURE);
+      }
+    } else if (strcmp(argv[i], "-V") == 0) {
+#ifdef _ACCT
+      char *versionStr = "enterprise";
+#else
+      char *versionStr = "community";
+#endif
+      printf("%s version: %s compatible_version: %s\n", versionStr, version, compatible_version);
+      printf("gitinfo: %s\n", gitinfo);
+      printf("gitinfoI: %s\n", gitinfoOfInternal);
+      printf("buildinfo: %s\n", buildinfo);
+      exit(EXIT_SUCCESS);
+    } else if (strcmp(argv[i], "-k") == 0) {
+      grantParseParameter();
+      exit(EXIT_SUCCESS);
+    } else if (strcmp(argv[i], "-A") == 0) {
+      tsPrintAuth = 1;
+    }
+#ifdef TAOS_MEM_CHECK
+    else if (strcmp(argv[i], "--alloc-random-fail") == 0) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
+        taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, argv[++i], true);
+      } else {
+        taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, NULL, true);
+      }
+    } else if (strcmp(argv[i], "--detect-mem-leak") == 0) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
+        taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, argv[++i], true);
+      } else {
+        taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, NULL, true);
+      }
+    }
+#endif
+#ifdef TAOS_RANDOM_FILE_FAIL
+    else if (strcmp(argv[i], "--random-file-fail-output") == 0) {
+      if ((i < argc - 1) && (argv[i + 1][0] != '-')) {
+        taosSetRandomFileFailOutput(argv[++i]);
+      } else {
+        taosSetRandomFileFailOutput(NULL);
+      }
+    } else if (strcmp(argv[i], "--random-file-fail-factor") == 0) {
+      if ( (i+1) < argc ) {
+        int factor = atoi(argv[i+1]);
+        printf("The factor of random failure is %d\n", factor);
+        taosSetRandomFileFailFactor(factor);
+      } else {
+        printf("Please specify a number for random failure factor!");
+        exit(EXIT_FAILURE);
+      }
+    }
+#endif
+  }
+
+  if (tsem_init(&exitSem, 0, 0) != 0) {
+    printf("failed to create exit semphore\n");
+    exit(EXIT_FAILURE);
+  }
+
+  /* Set termination handler. */
+  struct sigaction act = {{0}};
+  act.sa_flags = SA_SIGINFO;
+  act.sa_sigaction = signal_handler;
+  sigaction(SIGTERM, &act, NULL);
+  sigaction(SIGHUP, &act, NULL);
+  sigaction(SIGINT, &act, NULL);
+  sigaction(SIGUSR1, &act, NULL);
+  sigaction(SIGUSR2, &act, NULL);
+
+  // Open /var/log/syslog file to record information.
+  openlog("TDengine:", LOG_PID | LOG_CONS | LOG_NDELAY, LOG_LOCAL1);
+  syslog(LOG_INFO, "Starting TDengine service...");
+
+  // Initialize the system
+  if (dnodeInitSystem() < 0) {
+    syslog(LOG_ERR, "Error initialize TDengine system");
+    dInfo("Failed to start TDengine, please check the log at:%s", tsLogDir);
+    closelog();
+    exit(EXIT_FAILURE);
+  }
+
+  syslog(LOG_INFO, "Started TDengine service successfully.");
+
+  if (tsem_wait(&exitSem) != 0) {
+    syslog(LOG_ERR, "failed to wait exit semphore: %s", strerror(errno));
+  }
+
+  dnodeCleanUpSystem();
+  // close the syslog
+  syslog(LOG_INFO, "Shut down TDengine service successfully");
+  dInfo("TDengine is shut down!");
+  closelog();
+  return EXIT_SUCCESS;
+}
+
+static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
+  if (signum == SIGUSR1) {
+    taosCfgDynamicOptions("debugFlag 143");
+    return;
+  }
+  if (signum == SIGUSR2) {
+    taosCfgDynamicOptions("resetlog");
+    return;
+  }
+
+  syslog(LOG_INFO, "Shut down signal is %d", signum);
+  syslog(LOG_INFO, "Shutting down TDengine service...");
+  // clean the system.
+  dInfo("shut down signal is %d, sender PID:%d", signum, sigInfo->si_pid);
+
+  // protect the application from receive another signal
+  struct sigaction act = {{0}};
+  act.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &act, NULL);
+  sigaction(SIGHUP, &act, NULL);
+  sigaction(SIGINT, &act, NULL);
+  sigaction(SIGUSR1, &act, NULL);
+  sigaction(SIGUSR2, &act, NULL);
+
+  // inform main thread to exit
+  tsem_post(&exitSem);
+}
diff --git a/src/dnode/src/dnodeTelemetry.c b/src/dnode/src/dnodeTelemetry.c
new file mode 100644
index 0000000000000000000000000000000000000000..8ed4a9518b6c8a80bf79e0c7f326da54fa7d9e83
--- /dev/null
+++ b/src/dnode/src/dnodeTelemetry.c
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2020 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tglobal.h"
+#include "tutil.h"
+#include "osTime.h"
+#include "tsocket.h"
+#include "tbuffer.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeCluster.h"
+#include "mnodeDnode.h"
+#include "mnodeVgroup.h"
+#include "mnodeMnode.h"
+#include "mnodeTable.h"
+#include "mnodeSdb.h"
+#include "mnodeAcct.h"
+#include "dnode.h"
+#include "dnodeInt.h"
+#include "dnodeTelemetry.h"
+
+static tsem_t tsExitSem;
+static pthread_t tsTelemetryThread;
+
+#define TELEMETRY_SERVER "telemetry.taosdata.com"
+#define TELEMETRY_PORT 80
+#define REPORT_INTERVAL 86400 
+
+static void beginObject(SBufferWriter* bw) {
+  tbufWriteChar(bw, '{');
+}
+
+static void closeObject(SBufferWriter* bw) {
+  size_t len = tbufTell(bw);
+  if (tbufGetData(bw, false)[len - 1] == ',') {
+    tbufWriteCharAt(bw, len - 1, '}');
+  } else {
+    tbufWriteChar(bw, '}');
+  }
+  tbufWriteChar(bw, ',');
+}
+
+#if 0
+static void beginArray(SBufferWriter* bw) {
+  tbufWriteChar(bw, '[');
+}
+
+static void closeArray(SBufferWriter* bw) {
+  size_t len = tbufTell(bw);
+  if (tbufGetData(bw, false)[len - 1] == ',') {
+    tbufWriteCharAt(bw, len - 1, ']');
+  } else {
+    tbufWriteChar(bw, ']');
+  }
+  tbufWriteChar(bw, ',');
+}
+#endif
+
+static void writeString(SBufferWriter* bw, const char* str) {
+  tbufWriteChar(bw, '"');
+  tbufWrite(bw, str, strlen(str));
+  tbufWriteChar(bw, '"');
+}
+
+static void addIntField(SBufferWriter* bw, const char* k, int64_t v) {
+  writeString(bw, k);
+  tbufWriteChar(bw, ':');
+  char buf[32];
+  sprintf(buf, "%" PRId64, v);
+  tbufWrite(bw, buf, strlen(buf));
+  tbufWriteChar(bw, ',');
+}
+
+static void addStringField(SBufferWriter* bw, const char* k, const char* v) {
+  writeString(bw, k);
+  tbufWriteChar(bw, ':');
+  writeString(bw, v);
+  tbufWriteChar(bw, ',');
+}
+
+static void addCpuInfo(SBufferWriter* bw) {
+  char * line = NULL;
+  size_t size = 0;
+  int done = 0;
+
+  FILE* fp = fopen("/proc/cpuinfo", "r");
+  if (fp == NULL) {
+    return;
+  }
+
+  while (done != 3 && (size = getline(&line, &size, fp)) != -1) {
+    line[size - 1] = '\0';
+    if (((done&1) == 0) && strncmp(line, "model name", 10) == 0) {
+      const char* v = strchr(line, ':') + 2;
+      addStringField(bw, "cpuModel", v);
+      done |= 1;
+    } else if (((done&2)==0) && strncmp(line, "cpu cores", 9) == 0) {
+      const char* v = strchr(line, ':') + 2;
+      writeString(bw, "numOfCpu");
+      tbufWriteChar(bw, ':');
+      tbufWrite(bw, v, strlen(v));
+      tbufWriteChar(bw, ',');
+      done |= 2;
+    }
+  }
+
+  free(line);
+  fclose(fp);
+}
+
+static void addOsInfo(SBufferWriter* bw) {
+  char * line = NULL;
+  size_t size = 0;
+
+  FILE* fp = fopen("/etc/os-release", "r");
+  if (fp == NULL) {
+    return;
+  }
+
+  while ((size = getline(&line, &size, fp)) != -1) {
+    line[size - 1] = '\0';
+    if (strncmp(line, "PRETTY_NAME", 11) == 0) {
+      const char* p = strchr(line, '=') + 1;
+      if (*p == '"') {
+        p++;
+        line[size - 2] = 0;
+      }
+      addStringField(bw, "os", p);
+      break;
+    }
+  }
+
+  free(line);
+  fclose(fp);
+}
+
+static void addMemoryInfo(SBufferWriter* bw) {
+  char * line = NULL;
+  size_t size = 0;
+
+  FILE* fp = fopen("/proc/meminfo", "r");
+  if (fp == NULL) {
+    return;
+  }
+
+  while ((size = getline(&line, &size, fp)) != -1) {
+    line[size - 1] = '\0';
+    if (strncmp(line, "MemTotal", 8) == 0) {
+      const char* p = strchr(line, ':') + 1;
+      while (*p == ' ') p++;
+      addStringField(bw, "memory", p);
+      break;
+    }
+  }
+
+  free(line);
+  fclose(fp);
+}
+
+static void addVersionInfo(SBufferWriter* bw) {
+  addStringField(bw, "version", version);
+  addStringField(bw, "buildInfo", buildinfo);
+  addStringField(bw, "gitInfo", gitinfo);
+}
+
+static void addRuntimeInfo(SBufferWriter* bw) {
+  addIntField(bw, "numOfDnode", mnodeGetDnodesNum());
+  addIntField(bw, "numOfMnode", mnodeGetMnodesNum());
+  addIntField(bw, "numOfVgroup", mnodeGetVgroupNum());
+  addIntField(bw, "numOfDatabase", mnodeGetDbNum());
+  addIntField(bw, "numOfSuperTable", mnodeGetSuperTableNum());
+  addIntField(bw, "numOfChildTable", mnodeGetChildTableNum());
+
+  SAcctInfo info;
+  mnodeGetStatOfAllAcct(&info);
+  addIntField(bw, "numOfColumn", info.numOfTimeSeries);
+  addIntField(bw, "numOfPoint", info.totalPoints);
+  addIntField(bw, "totalStorage", info.totalStorage);
+  addIntField(bw, "compStorage", info.compStorage);
+  // addStringField(bw, "installTime", "2020-08-01T00:00:00Z");
+}
+
+static void sendTelemetryReport() {
+  char buf[128];
+  uint32_t ip = taosGetIpFromFqdn(TELEMETRY_SERVER);
+  if (ip == 0xffffffff) {
+    dTrace("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno));
+    return;
+  }
+  int fd = taosOpenTcpClientSocket(ip, TELEMETRY_PORT, 0);
+  if (fd < 0) {
+    dTrace("failed to create socket for telemetry, reason:%s", strerror(errno));
+    return;
+  }
+
+  SBufferWriter bw = tbufInitWriter(NULL, false);
+  beginObject(&bw);
+  addStringField(&bw, "instanceId", mnodeGetClusterId());
+  addIntField(&bw, "reportVersion", 1);
+  addOsInfo(&bw);
+  addCpuInfo(&bw);
+  addMemoryInfo(&bw);
+  addVersionInfo(&bw);
+  addRuntimeInfo(&bw);
+  closeObject(&bw);
+
+  const char* header = "POST /report HTTP/1.1\n"
+    "Host: " TELEMETRY_SERVER "\n"
+    "Content-Type: application/json\n"
+    "Content-Length: ";
+
+  taosWriteSocket(fd, header, strlen(header));
+  int contLen = tbufTell(&bw) - 1;
+  sprintf(buf, "%d\n\n", contLen);
+  taosWriteSocket(fd, buf, strlen(buf));
+  taosWriteSocket(fd, tbufGetData(&bw, false), contLen);
+  tbufCloseWriter(&bw);
+
+  // read something to avoid nginx error 499
+  if (taosReadSocket(fd, buf, 10) < 0) {
+    dTrace("failed to receive response, reason:%s", strerror(errno));
+  }
+  taosCloseSocket(fd);
+}
+
+static void* telemetryThread(void* param) {
+  struct timespec end = {0};
+  clock_gettime(CLOCK_REALTIME, &end);
+  end.tv_sec += 300; // wait 5 minutes before send first report
+
+  while (1) {
+    if (sem_timedwait(&tsExitSem, &end) == 0) {
+      break;
+    } else if (errno != ETIMEDOUT) {
+      continue;
+    }
+
+    if (sdbIsMaster()) {
+      sendTelemetryReport();
+    }
+    end.tv_sec += REPORT_INTERVAL;
+  }
+
+  return NULL;
+}
+
+int32_t dnodeInitTelemetry() {
+  if (!tsEnableTelemetryReporting) {
+    return 0;
+  }
+
+  if (tsem_init(&tsExitSem, 0, 0) == -1) {
+    // just log the error, it is ok for telemetry to fail
+    dTrace("failed to create semaphore for telemetry, reason:%s", strerror(errno));
+    return 0;
+  }
+
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+
+  int32_t code = pthread_create(&tsTelemetryThread, &attr, telemetryThread, NULL);
+  pthread_attr_destroy(&attr);
+  if (code != 0) {
+    dTrace("failed to create telemetry thread, reason:%s", strerror(errno));
+  }
+
+  return 0;
+}
+
+void dnodeCleanupTelemetry() {
+  if (!tsEnableTelemetryReporting) {
+    return;
+  }
+
+  if (tsTelemetryThread) {
+    tsem_post(&tsExitSem);
+    pthread_join(tsTelemetryThread, NULL);
+    tsem_destroy(&tsExitSem);
+  }
+}
diff --git a/src/dnode/src/dnodeVRead.c b/src/dnode/src/dnodeVRead.c
new file mode 100644
index 0000000000000000000000000000000000000000..d66ebf9772bcf702490b5c780de3223cd1b6a833
--- /dev/null
+++ b/src/dnode/src/dnodeVRead.c
@@ -0,0 +1,240 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tutil.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tglobal.h"
+#include "dnodeInt.h"
+#include "dnodeMgmt.h"
+#include "dnodeVRead.h"
+#include "vnode.h"
+
+typedef struct {
+  pthread_t  thread;    // thread
+  int32_t    workerId;  // worker ID
+} SReadWorker;
+
+typedef struct {
+  int32_t    max;       // max number of workers
+  int32_t    min;       // min number of workers
+  int32_t    num;       // current number of workers
+  SReadWorker *readWorker;
+  pthread_mutex_t mutex;
+} SReadWorkerPool;
+
+static void *dnodeProcessReadQueue(void *param);
+static void  dnodeHandleIdleReadWorker(SReadWorker *);
+
+// module global variable
+static SReadWorkerPool readPool;
+static taos_qset       readQset;
+
+int32_t dnodeInitVnodeRead() {
+  readQset = taosOpenQset();
+
+  readPool.min = tsNumOfCores;
+  readPool.max = tsNumOfCores * tsNumOfThreadsPerCore;
+  if (readPool.max <= readPool.min * 2) readPool.max = 2 * readPool.min;
+  readPool.readWorker = (SReadWorker *)calloc(sizeof(SReadWorker), readPool.max);
+  pthread_mutex_init(&readPool.mutex, NULL);
+
+  if (readPool.readWorker == NULL) return -1;
+  for (int i = 0; i < readPool.max; ++i) {
+    SReadWorker *pWorker = readPool.readWorker + i;
+    pWorker->workerId = i;
+  }
+
+  dInfo("dnode read is opened, min worker:%d max worker:%d", readPool.min, readPool.max);
+  return 0;
+}
+
+void dnodeCleanupVnodeRead() {
+  for (int i = 0; i < readPool.max; ++i) {
+    SReadWorker *pWorker = readPool.readWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(readQset);
+    }
+  }
+
+  for (int i = 0; i < readPool.max; ++i) {
+    SReadWorker *pWorker = readPool.readWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  free(readPool.readWorker);
+  taosCloseQset(readQset);
+  pthread_mutex_destroy(&readPool.mutex);
+
+  dInfo("dnode read is closed");
+}
+
+void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) {
+  int32_t     queuedMsgNum = 0;
+  int32_t     leftLen      = pMsg->contLen;
+  char        *pCont       = (char *) pMsg->pCont;
+
+  while (leftLen > 0) {
+    SMsgHead *pHead = (SMsgHead *) pCont;
+    pHead->vgId    = htonl(pHead->vgId);
+    pHead->contLen = htonl(pHead->contLen);
+
+    taos_queue queue = vnodeAcquireRqueue(pHead->vgId);
+
+    if (queue == NULL) {
+      leftLen -= pHead->contLen;
+      pCont -= pHead->contLen;
+      continue;
+    }
+
+    // put message into queue
+    SReadMsg *pRead = (SReadMsg *)taosAllocateQitem(sizeof(SReadMsg));
+    pRead->rpcMsg      = *pMsg;
+    pRead->pCont       = pCont;
+    pRead->contLen     = pHead->contLen;
+
+    // next vnode
+    leftLen -= pHead->contLen;
+    pCont -= pHead->contLen;
+    queuedMsgNum++;
+
+    taosWriteQitem(queue, TAOS_QTYPE_RPC, pRead);
+  }
+
+  if (queuedMsgNum == 0) {
+    SRpcMsg rpcRsp = {
+        .handle  = pMsg->handle,
+        .pCont   = NULL,
+        .contLen = 0,
+        .code    = TSDB_CODE_VND_INVALID_VGROUP_ID,
+        .msgType = 0
+    };
+    rpcSendResponse(&rpcRsp);
+    rpcFreeCont(pMsg->pCont);
+  }
+}
+
+void *dnodeAllocateVnodeRqueue(void *pVnode) {
+  pthread_mutex_lock(&readPool.mutex);
+  taos_queue queue = taosOpenQueue();
+  if (queue == NULL) {
+    pthread_mutex_unlock(&readPool.mutex);
+    return NULL;
+  }
+
+  taosAddIntoQset(readQset, queue, pVnode);
+
+  // spawn a thread to process queue
+  if (readPool.num < readPool.max) {
+    do {
+      SReadWorker *pWorker = readPool.readWorker + readPool.num;
+
+      pthread_attr_t thAttr;
+      pthread_attr_init(&thAttr);
+      pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+      if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessReadQueue, pWorker) != 0) {
+        dError("failed to create thread to process read queue, reason:%s", strerror(errno));
+      }
+
+      pthread_attr_destroy(&thAttr);
+      readPool.num++;
+      dDebug("read worker:%d is launched, total:%d", pWorker->workerId, readPool.num);
+    } while (readPool.num < readPool.min);
+  }
+
+  pthread_mutex_unlock(&readPool.mutex);
+  dDebug("pVnode:%p, read queue:%p is allocated", pVnode, queue);
+
+  return queue;
+}
+
+void dnodeFreeVnodeRqueue(void *rqueue) {
+  taosCloseQueue(rqueue);
+
+  // dynamically adjust the number of threads
+}
+
+void dnodeSendRpcReadRsp(void *pVnode, SReadMsg *pRead, int32_t code) {
+  SRpcMsg rpcRsp = {
+    .handle  = pRead->rpcMsg.handle,
+    .pCont   = pRead->rspRet.rsp,
+    .contLen = pRead->rspRet.len,
+    .code    = code,
+  };
+
+  rpcSendResponse(&rpcRsp);
+  rpcFreeCont(pRead->rpcMsg.pCont);
+  vnodeRelease(pVnode);
+}
+
+void dnodeDispatchNonRspMsg(void *pVnode, SReadMsg *pRead, int32_t code) {
+  vnodeRelease(pVnode);
+  return;
+}
+
+static void *dnodeProcessReadQueue(void *param) {
+  SReadMsg    *pReadMsg;
+  int          type;
+  void        *pVnode;
+
+  while (1) {
+    if (taosReadQitemFromQset(readQset, &type, (void **)&pReadMsg, &pVnode) == 0) {
+      dDebug("dnodeProcessReadQueee: got no message from qset, exiting...");
+      break;
+    }
+
+    dDebug("%p, msg:%s will be processed in vread queue, qtype:%d, msg:%p", pReadMsg->rpcMsg.ahandle,
+           taosMsg[pReadMsg->rpcMsg.msgType], type, pReadMsg);
+
+    int32_t code = vnodeProcessRead(pVnode, pReadMsg);
+
+    if (type == TAOS_QTYPE_RPC && code != TSDB_CODE_QRY_NOT_READY) {
+      dnodeSendRpcReadRsp(pVnode, pReadMsg, code);
+    } else {
+      if (code == TSDB_CODE_QRY_HAS_RSP) {
+        dnodeSendRpcReadRsp(pVnode, pReadMsg, pReadMsg->rpcMsg.code);
+      } else { // code == TSDB_CODE_NOT_READY, do not return msg to client
+        dnodeDispatchNonRspMsg(pVnode, pReadMsg, code);
+      }
+    }
+
+    taosFreeQitem(pReadMsg);
+  }
+
+  return NULL;
+}
+
+
+UNUSED_FUNC
+static void dnodeHandleIdleReadWorker(SReadWorker *pWorker) {
+  int32_t num = taosGetQueueNumber(readQset);
+
+  if (num == 0 || (num <= readPool.min && readPool.num > readPool.min)) {
+    readPool.num--;
+    dDebug("read worker:%d is released, total:%d", pWorker->workerId, readPool.num);
+    pthread_exit(NULL);
+  } else {
+    usleep(30000);
+    sched_yield();
+  }
+}
+
diff --git a/src/dnode/src/dnodeVWrite.c b/src/dnode/src/dnodeVWrite.c
new file mode 100644
index 0000000000000000000000000000000000000000..51bc8890fcd98b6f5dee4c88d2858990e68bc2a3
--- /dev/null
+++ b/src/dnode/src/dnodeVWrite.c
@@ -0,0 +1,291 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "tutil.h"
+#include "tqueue.h"
+#include "trpc.h"
+#include "tsdb.h"
+#include "twal.h"
+#include "tdataformat.h"
+#include "tglobal.h"
+#include "vnode.h"
+#include "dnodeInt.h"
+#include "dnodeVWrite.h"
+#include "dnodeMgmt.h"
+
+typedef struct {
+  taos_qall  qall;
+  taos_qset  qset;      // queue set
+  pthread_t  thread;    // thread
+  int32_t    workerId;  // worker ID
+} SWriteWorker;
+
+typedef struct {
+  SRspRet  rspRet;
+  int32_t  processedCount;
+  int32_t  code;
+  void    *pCont;
+  int32_t  contLen;
+  SRpcMsg  rpcMsg;
+} SWriteMsg;
+
+typedef struct {
+  int32_t        max;        // max number of workers
+  int32_t        nextId;     // from 0 to max-1, cyclic
+  SWriteWorker  *writeWorker;
+  pthread_mutex_t mutex;
+} SWriteWorkerPool;
+
+static void *dnodeProcessWriteQueue(void *param);
+static void  dnodeHandleIdleWorker(SWriteWorker *pWorker);
+
+SWriteWorkerPool wWorkerPool;
+
+int32_t dnodeInitVnodeWrite() {
+  wWorkerPool.max = tsNumOfCores;
+  wWorkerPool.writeWorker = (SWriteWorker *)calloc(sizeof(SWriteWorker), wWorkerPool.max);
+  if (wWorkerPool.writeWorker == NULL) return -1;
+  pthread_mutex_init(&wWorkerPool.mutex, NULL);
+
+  for (int32_t i = 0; i < wWorkerPool.max; ++i) {
+    wWorkerPool.writeWorker[i].workerId = i;
+  }
+
+  dInfo("dnode write is opened, max worker %d", wWorkerPool.max);
+  return 0;
+}
+
+void dnodeCleanupVnodeWrite() {
+  for (int32_t i = 0; i < wWorkerPool.max; ++i) {
+    SWriteWorker *pWorker = wWorkerPool.writeWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(pWorker->qset);
+    }
+  }
+
+  for (int32_t i = 0; i < wWorkerPool.max; ++i) {
+    SWriteWorker *pWorker = wWorkerPool.writeWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+      taosFreeQall(pWorker->qall);
+      taosCloseQset(pWorker->qset);
+    }
+  }
+
+  pthread_mutex_destroy(&wWorkerPool.mutex);
+  free(wWorkerPool.writeWorker);
+  dInfo("dnode write is closed");
+}
+
+void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
+  char *pCont = (char *)pMsg->pCont;
+
+  if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT) {
+    SMsgDesc *pDesc = (SMsgDesc *)pCont;
+    pDesc->numOfVnodes = htonl(pDesc->numOfVnodes);
+    pCont += sizeof(SMsgDesc);
+  }
+
+  SMsgHead *pHead = (SMsgHead *) pCont;
+  pHead->vgId     = htonl(pHead->vgId);
+  pHead->contLen  = htonl(pHead->contLen);
+
+  taos_queue queue = vnodeAcquireWqueue(pHead->vgId);
+  if (queue) {
+    // put message into queue
+    SWriteMsg *pWrite = (SWriteMsg *)taosAllocateQitem(sizeof(SWriteMsg));
+    pWrite->rpcMsg    = *pMsg;
+    pWrite->pCont     = pCont;
+    pWrite->contLen   = pHead->contLen;
+
+    taosWriteQitem(queue, TAOS_QTYPE_RPC, pWrite);
+  } else {
+    SRpcMsg rpcRsp = {
+      .handle  = pMsg->handle,
+      .pCont   = NULL,
+      .contLen = 0,
+      .code    = TSDB_CODE_VND_INVALID_VGROUP_ID,
+      .msgType = 0
+    };
+    rpcSendResponse(&rpcRsp);
+    rpcFreeCont(pMsg->pCont);
+  }
+}
+
+void *dnodeAllocateVnodeWqueue(void *pVnode) {
+  pthread_mutex_lock(&wWorkerPool.mutex);
+  SWriteWorker *pWorker = wWorkerPool.writeWorker + wWorkerPool.nextId;
+  void *queue = taosOpenQueue();
+  if (queue == NULL) {
+    pthread_mutex_unlock(&wWorkerPool.mutex);
+    return NULL;
+  }
+
+  if (pWorker->qset == NULL) {
+    pWorker->qset = taosOpenQset();
+    if (pWorker->qset == NULL) {
+      taosCloseQueue(queue);
+      pthread_mutex_unlock(&wWorkerPool.mutex);
+      return NULL;
+    }
+
+    taosAddIntoQset(pWorker->qset, queue, pVnode);
+    pWorker->qall = taosAllocateQall();
+    if (pWorker->qall == NULL) {
+      taosCloseQset(pWorker->qset);
+      taosCloseQueue(queue);
+      pthread_mutex_unlock(&wWorkerPool.mutex);
+      return NULL;
+    }
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessWriteQueue, pWorker) != 0) {
+      dError("failed to create thread to process read queue, reason:%s", strerror(errno));
+      taosFreeQall(pWorker->qall);
+      taosCloseQset(pWorker->qset);
+      taosCloseQueue(queue);
+      queue = NULL;
+    } else {
+      dDebug("write worker:%d is launched", pWorker->workerId);
+      wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
+    }
+
+    pthread_attr_destroy(&thAttr);
+  } else {
+    taosAddIntoQset(pWorker->qset, queue, pVnode);
+    wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
+  }
+
+  pthread_mutex_unlock(&wWorkerPool.mutex);
+  dDebug("pVnode:%p, write queue:%p is allocated", pVnode, queue);
+
+  return queue;
+}
+
+void dnodeFreeVnodeWqueue(void *wqueue) {
+  taosCloseQueue(wqueue);
+
+  // dynamically adjust the number of threads
+}
+
+void dnodeSendRpcVnodeWriteRsp(void *pVnode, void *param, int32_t code) {
+  SWriteMsg *pWrite = (SWriteMsg *)param;
+
+  if (code < 0) pWrite->code = code;
+  int32_t count = atomic_add_fetch_32(&pWrite->processedCount, 1);
+
+  if (count <= 1) return;
+
+  SRpcMsg rpcRsp = {
+    .handle  = pWrite->rpcMsg.handle,
+    .pCont   = pWrite->rspRet.rsp,
+    .contLen = pWrite->rspRet.len,
+    .code    = pWrite->code,
+  };
+
+  rpcSendResponse(&rpcRsp);
+  rpcFreeCont(pWrite->rpcMsg.pCont);
+  taosFreeQitem(pWrite);
+
+  vnodeRelease(pVnode);
+}
+
+static void *dnodeProcessWriteQueue(void *param) {
+  SWriteWorker *pWorker = (SWriteWorker *)param;
+  SWriteMsg    *pWrite;
+  SWalHead     *pHead;
+  int32_t       numOfMsgs;
+  int           type;
+  void         *pVnode, *item;
+  SRspRet      *pRspRet;
+
+  dDebug("write worker:%d is running", pWorker->workerId);
+
+  while (1) {
+    numOfMsgs = taosReadAllQitemsFromQset(pWorker->qset, pWorker->qall, &pVnode);
+    if (numOfMsgs == 0) {
+      dDebug("dnodeProcessWriteQueee: got no message from qset, exiting...");
+      break;
+    }
+
+    for (int32_t i = 0; i < numOfMsgs; ++i) {
+      pWrite = NULL;
+      pRspRet = NULL;
+      taosGetQitem(pWorker->qall, &type, &item);
+      if (type == TAOS_QTYPE_RPC) {
+        pWrite = (SWriteMsg *)item;
+        pRspRet = &pWrite->rspRet;
+        pHead = (SWalHead *)(pWrite->pCont - sizeof(SWalHead));
+        pHead->msgType = pWrite->rpcMsg.msgType;
+        pHead->version = 0;
+        pHead->len = pWrite->contLen;
+        dDebug("%p, rpc msg:%s will be processed in vwrite queue", pWrite->rpcMsg.ahandle, taosMsg[pWrite->rpcMsg.msgType]);
+      } else {
+        pHead = (SWalHead *)item;
+        dTrace("%p, wal msg:%s will be processed in vwrite queue, version:%" PRIu64, pHead, taosMsg[pHead->msgType], pHead->version);
+      }
+
+      int32_t code = vnodeProcessWrite(pVnode, type, pHead, pRspRet);
+      if (pWrite) { 
+        pWrite->rpcMsg.code = code;
+        if (code <= 0) pWrite->processedCount = 1; 
+      }
+    }
+
+    walFsync(vnodeGetWal(pVnode));
+
+    // browse all items, and process them one by one
+    taosResetQitems(pWorker->qall);
+    for (int32_t i = 0; i < numOfMsgs; ++i) {
+      taosGetQitem(pWorker->qall, &type, &item);
+      if (type == TAOS_QTYPE_RPC) {
+        pWrite = (SWriteMsg *)item;
+        dnodeSendRpcVnodeWriteRsp(pVnode, item, pWrite->rpcMsg.code); 
+      } else if (type == TAOS_QTYPE_FWD) {
+        pHead = (SWalHead *)item;
+        vnodeConfirmForward(pVnode, pHead->version, 0);
+        taosFreeQitem(item);
+        vnodeRelease(pVnode);
+      } else {
+        taosFreeQitem(item);
+        vnodeRelease(pVnode);
+      }
+    }
+  }
+
+  return NULL;
+}
+
+UNUSED_FUNC
+static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
+  int32_t num = taosGetQueueNumber(pWorker->qset);
+
+  if (num > 0) {
+     usleep(30000);
+     sched_yield();
+  } else {
+     taosFreeQall(pWorker->qall);
+     taosCloseQset(pWorker->qset);
+     pWorker->qset = NULL;
+     dDebug("write worker:%d is released", pWorker->workerId);
+     pthread_exit(NULL);
+  }
+}
diff --git a/src/inc/dnode.h b/src/inc/dnode.h
new file mode 100644
index 0000000000000000000000000000000000000000..fda9c1c1ddd928ccf02bd6fd8a1480b30769bb6b
--- /dev/null
+++ b/src/inc/dnode.h
@@ -0,0 +1,75 @@
+/*
+ * 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_DNODE_H
+#define TDENGINE_DNODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "trpc.h"
+
+typedef struct {
+  int32_t queryReqNum;
+  int32_t submitReqNum;
+  int32_t httpReqNum;
+} SDnodeStatisInfo;
+
+typedef enum {
+  TSDB_DNODE_RUN_STATUS_INITIALIZE,
+  TSDB_DNODE_RUN_STATUS_RUNING,
+  TSDB_DNODE_RUN_STATUS_STOPPED
+} SDnodeRunStatus;
+
+SDnodeRunStatus dnodeGetRunStatus();
+SDnodeStatisInfo dnodeGetStatisInfo();
+
+bool    dnodeIsFirstDeploy();
+char *  dnodeGetMnodeMasterEp();
+void    dnodeGetMnodeEpSetForPeer(void *epSet);
+void    dnodeGetMnodeEpSetForShell(void *epSet);
+void *  dnodeGetMnodeInfos();
+int32_t dnodeGetDnodeId();
+bool    dnodeCheckMnodeStarting();
+
+void  dnodeAddClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
+void  dnodeSendMsgToDnode(SRpcEpSet *epSet, SRpcMsg *rpcMsg);
+void  dnodeSendMsgToDnodeRecv(SRpcMsg *rpcMsg, SRpcMsg *rpcRsp);
+void *dnodeSendCfgTableToRecv(int32_t vgId, int32_t sid);
+
+void *dnodeAllocateVnodeWqueue(void *pVnode);
+void  dnodeFreeVnodeWqueue(void *queue);
+void *dnodeAllocateVnodeRqueue(void *pVnode);
+void  dnodeFreeVnodeRqueue(void *rqueue);
+void  dnodeSendRpcVnodeWriteRsp(void *pVnode, void *param, int32_t code);
+
+int32_t dnodeAllocateMnodePqueue();
+void    dnodeFreeMnodePqueue();
+int32_t dnodeAllocateMnodeRqueue();
+void    dnodeFreeMnodeRqueue();
+int32_t dnodeAllocateMnodeWqueue();
+void    dnodeFreeMnodeWqueue();
+void    dnodeSendRpcMnodeWriteRsp(void *pMsg, int32_t code);
+void    dnodeReprocessMnodeWriteMsg(void *pMsg);
+void    dnodeDelayReprocessMnodeWriteMsg(void *pMsg);
+
+void    dnodeSendStatusMsgToMnode();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/hash.h b/src/inc/hash.h
deleted file mode 100644
index 54a43fb6ebc3f692c642e1270a948016b4244194..0000000000000000000000000000000000000000
--- a/src/inc/hash.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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_HASH_H
-#define TDENGINE_HASH_H
-
-#include "hashutil.h"
-
-#define HASH_MAX_CAPACITY (1024 * 1024 * 16)
-#define HASH_VALUE_IN_TRASH (-1)
-#define HASH_DEFAULT_LOAD_FACTOR (0.75)
-#define HASH_INDEX(v, c) ((v) & ((c)-1))
-
-typedef struct SHashNode {
-  char *key;  // null-terminated string
-  union {
-    struct SHashNode * prev;
-    struct SHashEntry *prev1;
-  };
-
-  struct SHashNode *next;
-  uint32_t          hashVal;  // the hash value of key, if hashVal == HASH_VALUE_IN_TRASH, this node is moved to trash
-  uint32_t          keyLen;   // length of the key
-  char              data[];
-} SHashNode;
-
-typedef struct SHashEntry {
-  SHashNode *next;
-  uint32_t   num;
-} SHashEntry;
-
-typedef struct HashObj {
-  SHashEntry **hashList;
-  uint32_t     capacity;
-  int          size;
-  _hash_fn_t   hashFp;
-  bool         multithreadSafe;  // enable lock
-
-#if defined LINUX
-  pthread_rwlock_t lock;
-#else
-  pthread_mutex_t lock;
-#endif
-
-} HashObj;
-
-void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe);
-
-int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void *data, uint32_t size);
-void    taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen);
-
-char *taosGetDataFromHash(HashObj *pObj, const char *key, uint32_t keyLen);
-
-void taosCleanUpHashTable(void *handle);
-
-int32_t taosGetHashMaxOverflowLength(HashObj *pObj);
-
-int32_t taosCheckHashTable(HashObj *pObj);
-
-#endif  // TDENGINE_HASH_H
diff --git a/src/inc/http.h b/src/inc/http.h
new file mode 100644
index 0000000000000000000000000000000000000000..0d4c386cbf1e784834019c5d75847ab20b7ce8e9
--- /dev/null
+++ b/src/inc/http.h
@@ -0,0 +1,35 @@
+/*
+ * 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_HTTP_H
+#define TDENGINE_HTTP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+int32_t httpGetReqCount();
+int32_t httpInitSystem();
+int32_t httpStartSystem();
+void httpStopSystem();
+void httpCleanUpSystem();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/ihash.h b/src/inc/ihash.h
deleted file mode 100644
index 9623f95bbd8b65ad4b2dbcae2f26112eb6beb1e1..0000000000000000000000000000000000000000
--- a/src/inc/ihash.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_IHASH_H
-#define TDENGINE_IHASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-void *taosInitIntHash(int32_t maxSessions, int32_t dataSize, int32_t (*fp)(void *, uint64_t));
-
-void taosCleanUpIntHash(void *handle);
-
-char *taosGetIntHashData(void *handle, uint64_t key);
-
-void taosDeleteIntHash(void *handle, uint64_t key);
-
-char *taosAddIntHash(void *handle, uint64_t key, char *pData);
-
-int32_t taosHashInt(void *handle, uint64_t key);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_IHASH_H
diff --git a/src/inc/mnode.h b/src/inc/mnode.h
new file mode 100644
index 0000000000000000000000000000000000000000..03a25e0f92b881b6b1b9bcfcf6605257b776ae1b
--- /dev/null
+++ b/src/inc/mnode.h
@@ -0,0 +1,75 @@
+/*
+ * 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_MNODE_H
+#define TDENGINE_MNODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "trpc.h"
+
+struct SAcctObj;
+struct SDnodeObj;
+struct SUserObj;
+struct SDbObj;
+struct SVgObj;
+struct STableObj;
+
+typedef struct {
+  int32_t len;
+  void *  rsp;
+} SMnodeRsp;
+
+typedef struct SMnodeMsg {
+  SRpcMsg   rpcMsg;
+  SMnodeRsp rpcRsp;
+  int8_t    received;
+  int8_t    successed;
+  int8_t    expected;
+  int8_t    retry;
+  int32_t   code;
+  void *    pObj;
+  struct SAcctObj * pAcct;
+  struct SDnodeObj *pDnode;
+  struct SUserObj * pUser;
+  struct SDbObj *   pDb;
+  struct SVgObj *   pVgroup;
+  struct STableObj *pTable;
+  struct SSuperTableObj *pSTable;
+} SMnodeMsg;
+
+void    mnodeCreateMsg(SMnodeMsg *pMsg, SRpcMsg *rpcMsg);
+int32_t mnodeInitMsg(SMnodeMsg *pMsg);
+void    mnodeCleanupMsg(SMnodeMsg *pMsg);
+
+int32_t mnodeInitSystem();
+int32_t mnodeStartSystem();
+void    mnodeCleanupSystem();
+void    mnodeStopSystem();
+void    sdbUpdateSync();
+bool    mnodeIsRunning();
+int32_t mnodeProcessRead(SMnodeMsg *pMsg);
+int32_t mnodeProcessWrite(SMnodeMsg *pMsg);
+int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg);
+void    mnodeProcessPeerRsp(SRpcMsg *pMsg);
+int32_t mnodeRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/monitor.h b/src/inc/monitor.h
new file mode 100644
index 0000000000000000000000000000000000000000..b1229cca6b1fc18ac9bef4d6ea506c9a0ef59627
--- /dev/null
+++ b/src/inc/monitor.h
@@ -0,0 +1,62 @@
+/*
+ * 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_MONITOR_H
+#define TDENGINE_MONITOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+typedef struct {
+  char *  acctId;
+  int64_t currentPointsPerSecond;
+  int64_t maxPointsPerSecond;
+  int64_t totalTimeSeries;
+  int64_t maxTimeSeries;
+  int64_t totalStorage;
+  int64_t maxStorage;
+  int64_t totalQueryTime;
+  int64_t maxQueryTime;
+  int64_t totalInbound;
+  int64_t maxInbound;
+  int64_t totalOutbound;
+  int64_t maxOutbound;
+  int64_t totalDbs;
+  int64_t maxDbs;
+  int64_t totalUsers;
+  int64_t maxUsers;
+  int64_t totalStreams;
+  int64_t maxStreams;
+  int64_t totalConns;
+  int64_t maxConns;
+  int8_t  accessState;
+} SAcctMonitorObj;
+
+int32_t monitorInitSystem();
+int32_t monitorStartSystem();
+void    monitorStopSystem();
+void    monitorCleanUpSystem();
+void    monitorSaveAcctLog(SAcctMonitorObj *pMonObj);
+void    monitorSaveLog(int32_t level, const char *const format, ...);
+void    monitorExecuteSQL(char *sql);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/query.h b/src/inc/query.h
new file mode 100644
index 0000000000000000000000000000000000000000..0c18f85dc31bae5e77bae7228d5390a8d32df07a
--- /dev/null
+++ b/src/inc/query.h
@@ -0,0 +1,99 @@
+/*
+ * 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_QUERY_H
+#define TDENGINE_QUERY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void* qinfo_t;
+
+/**
+ * create the qinfo object according to QueryTableMsg
+ * @param tsdb
+ * @param pQueryTableMsg
+ * @param qinfo
+ * @return
+ */
+int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryTableMsg, qinfo_t* qinfo);
+
+
+/**
+ * the main query execution function, including query on both table and multitables,
+ * which are decided according to the tag or table name query conditions
+ *
+ * @param qinfo
+ * @return
+ */
+bool qTableQuery(qinfo_t qinfo);
+
+/**
+ * Retrieve the produced results information, if current query is not paused or completed,
+ * this function will be blocked to wait for the query execution completed or paused,
+ * in which case enough results have been produced already.
+ *
+ * @param qinfo
+ * @return
+ */
+int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContext);
+
+/**
+ *
+ * Retrieve the actual results to fill the response message payload.
+ * Note that this function must be executed after qRetrieveQueryResultInfo is invoked.
+ *
+ * @param qinfo  qinfo object
+ * @param pRsp    response message
+ * @param contLen payload length
+ * @return
+ */
+int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
+
+/**
+ *
+ * @param qinfo
+ * @return
+ */
+void* qGetResultRetrieveMsg(qinfo_t qinfo);
+
+/**
+ * kill current ongoing query and free query handle automatically
+ * @param qinfo  qhandle
+ * @return
+ */
+int32_t qKillQuery(qinfo_t qinfo);
+
+int32_t qQueryCompleted(qinfo_t qinfo);
+
+
+/**
+ * destroy query info structure
+ * @param qHandle
+ */
+void qDestroyQueryInfo(qinfo_t qHandle);
+
+void* qOpenQueryMgmt(int32_t vgId);
+void  qQueryMgmtNotifyClosed(void* pExecutor);
+void  qCleanupQueryMgmt(void* pExecutor);
+void** qRegisterQInfo(void* pMgmt, uint64_t qInfo);
+void** qAcquireQInfo(void* pMgmt, uint64_t key);
+void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QUERY_H
diff --git a/src/inc/sdb.h b/src/inc/sdb.h
deleted file mode 100644
index a0e0a1b2f2e8815f5425a65f6f793fad4b0bc847..0000000000000000000000000000000000000000
--- a/src/inc/sdb.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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_SDB_H
-#define TDENGINE_SDB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "taosmsg.h"
-#include "tsdb.h"
-
-extern uint16_t    tsMgmtMgmtPort;
-extern uint16_t    tsMgmtSyncPort;
-extern int      sdbMaxNodes;
-extern int      tsMgmtPeerHBTimer;  // seconds
-extern char     sdbZone[];
-extern char     sdbMasterIp[];
-extern char     sdbPrivateIp[];
-extern char *   sdbStatusStr[];
-extern char *   sdbRoleStr[];
-extern void *   mnodeSdb;
-extern int      sdbExtConns;
-extern int      sdbMaster;
-extern uint32_t sdbPublicIp;
-extern uint32_t sdbMasterStartTime;
-extern SIpList *pSdbIpList;
-extern SIpList *pSdbPublicIpList;
-
-extern void (*sdbWorkAsMasterCallback)();  // this function pointer will be set by taosd
-
-enum _keytype {
-  SDB_KEYTYPE_STRING, SDB_KEYTYPE_UINT32, SDB_KEYTYPE_AUTO, SDB_KEYTYPE_RECYCLE, SDB_KEYTYPE_MAX
-};
-
-#define SDB_ROLE_UNAPPROVED 0
-#define SDB_ROLE_UNDECIDED  1
-#define SDB_ROLE_MASTER     2
-#define SDB_ROLE_SLAVE      3
-
-#define SDB_STATUS_OFFLINE  0
-#define SDB_STATUS_UNSYNCED 1
-#define SDB_STATUS_SYNCING  2
-#define SDB_STATUS_SERVING  3
-#define SDB_STATUS_DELETED  4
-
-enum _sdbaction {
-  SDB_TYPE_INSERT,
-  SDB_TYPE_DELETE,
-  SDB_TYPE_UPDATE,
-  SDB_TYPE_DECODE,
-  SDB_TYPE_ENCODE,
-  SDB_TYPE_BEFORE_BATCH_UPDATE,
-  SDB_TYPE_BATCH_UPDATE,
-  SDB_TYPE_AFTER_BATCH_UPDATE,
-  SDB_TYPE_RESET,
-  SDB_TYPE_DESTROY,
-  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, uint8_t keyType, char *directory,
-                   void *(*appTool)(char, void *, char *, int, int *));
-
-void *sdbGetRow(void *handle, void *key);
-
-int64_t sdbInsertRow(void *handle, void *row, int rowSize);
-
-int sdbDeleteRow(void *handle, void *key);
-
-int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated);
-
-void *sdbFetchRow(void *handle, void *pNode, void **ppRow);
-
-int sdbBatchUpdateRow(void *handle, void *row, int rowSize);
-
-int64_t sdbGetId(void *handle);
-
-int64_t sdbGetNumOfRows(void *handle);
-
-void sdbSaveSnapShot(void *handle);
-
-void sdbCloseTable(void *handle);
-
-int sdbRemovePeerByIp(uint32_t ip);
-
-int sdbInitPeers(char *directory);
-
-void sdbCleanUpPeers();
-
-int sdbCfgNode(char *cont);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_SDB_H
diff --git a/src/inc/shash.h b/src/inc/shash.h
deleted file mode 100644
index 2651a6b349eb5a577fbf46ee11df6ebe695983a8..0000000000000000000000000000000000000000
--- a/src/inc/shash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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_TSHASH_H
-#define TDENGINE_TSHASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-void *taosInitStrHash(uint32_t maxSessions, uint32_t dataSize, uint32_t (*fp)(void *, char *));
-
-void taosCleanUpStrHash(void *handle);
-
-void *taosGetStrHashData(void *handle, char *string);
-
-void taosDeleteStrHash(void *handle, char *string);
-
-void taosDeleteStrHashNode(void *handle, char *string, void *pDeleteNode);
-
-void *taosAddStrHash(void *handle, char *string, char *pData);
-
-void *taosAddStrHashWithSize(void *handle, char *string, char *pData, int dataSize);
-
-uint32_t taosHashString(void *handle, char *string);
-
-uint32_t taosHashStringStep1(void *handle, char *string);
-
-char *taosVisitStrHashWithFp(void *handle, int (*fp)(char *));
-
-void taosCleanUpStrHashWithFp(void *handle, void (*fp)(char *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSHASH_H
diff --git a/src/inc/sql.y b/src/inc/sql.y
deleted file mode 100644
index 2b7e0b628cb0cf951db287722036523749e0fdd8..0000000000000000000000000000000000000000
--- a/src/inc/sql.y
+++ /dev/null
@@ -1,657 +0,0 @@
-//lemon parser file to generate sql parse by using finite-state-machine code used to parse sql
-//usage: lemon sql.y
-%token_prefix TK_
-
-%token_type {SSQLToken}
-%default_type {SSQLToken}
-%extra_argument {SSqlInfo* pInfo}
-
-%fallback ID BOOL TINYINT SMALLINT INTEGER BIGINT FLOAT DOUBLE STRING TIMESTAMP BINARY NCHAR.
-
-%left OR.
-%left AND.
-%right NOT.
-%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN.
-%left GT GE LT LE.
-%left BITAND BITOR LSHIFT RSHIFT.
-%left PLUS MINUS.
-%left DIVIDE TIMES.
-%left STAR SLASH REM.
-%left CONCAT.
-%right UMINUS UPLUS BITNOT.
-
-%include {
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
-#include "tscSQLParser.h"
-#include "tutil.h"
-}
-
-%syntax_error {
-  pInfo->valid = false;
-  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
-  int32_t len = 0;
-
-  if(TOKEN.z) {
-    char msg[] = "syntax error near \"%s\"";
-    int32_t sqlLen = strlen(&TOKEN.z[0]);
-
-    if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
-        char tmpstr[128] = {0};
-        memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
-        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
-    } else {
-        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
-    }
-
-  } else {
-    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
-  }
-
-  assert(len <= outputBufLen);
-}
-
-%parse_accept       {}
-
-program ::= cmd.    {}
-
-//////////////////////////////////THE SHOW STATEMENT///////////////////////////////////////////
-cmd ::= SHOW DATABASES.  { setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);}
-cmd ::= SHOW MNODES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);}
-cmd ::= SHOW DNODES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);}
-cmd ::= SHOW ACCOUNTS.   { setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);}
-cmd ::= SHOW USERS.      { setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);}
-
-cmd ::= SHOW MODULES.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0);  }
-cmd ::= SHOW QUERIES.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0);  }
-cmd ::= SHOW CONNECTIONS.{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);}
-cmd ::= SHOW STREAMS.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0);  }
-cmd ::= SHOW CONFIGS.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_CONFIGS, 0, 0);  }
-cmd ::= SHOW SCORES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0);   }
-cmd ::= SHOW GRANTS.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0);   }
-
-cmd ::= SHOW VNODES.                { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); }
-cmd ::= SHOW VNODES IPTOKEN(X).     { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &X, 0); }
-
-%type dbPrefix {SSQLToken}
-dbPrefix(A) ::=.                   {A.n = 0; A.type = 0;}
-dbPrefix(A) ::= ids(X) DOT.        {A = X;  }
-
-%type cpxName {SSQLToken}
-cpxName(A) ::= .             {A.n = 0;  }
-cpxName(A) ::= DOT ids(Y).   {A = Y; A.n += 1;    }
-
-cmd ::= SHOW dbPrefix(X) TABLES.         {
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, 0);
-}
-
-cmd ::= SHOW dbPrefix(X) TABLES LIKE ids(Y).         {
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, &Y);
-}
-
-cmd ::= SHOW dbPrefix(X) STABLES.      {
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &X, 0);
-}
-
-cmd ::= SHOW dbPrefix(X) STABLES LIKE ids(Y).      {
-    SSQLToken token;
-    setDBName(&token, &X);
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &Y);
-}
-
-cmd ::= SHOW dbPrefix(X) VGROUPS.    {
-    SSQLToken token;
-    setDBName(&token, &X);
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
-}
-
-cmd ::= SHOW dbPrefix(X) VGROUPS ids(Y).    {
-    SSQLToken token;
-    setDBName(&token, &X);    
-    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &Y);
-}
-
-//drop configure for tables
-cmd ::= DROP TABLE ifexists(Y) ids(X) cpxName(Z).   {
-    X.n += Z.n;
-    setDropDBTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &X, &Y);
-}
-
-cmd ::= DROP DATABASE ifexists(Y) ids(X).    { setDropDBTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y); }
-cmd ::= DROP DNODE IPTOKEN(X).        { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X);    }
-cmd ::= DROP USER ids(X).        { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &X);     }
-cmd ::= DROP ACCOUNT ids(X).     { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X);  }
-
-/////////////////////////////////THE USE STATEMENT//////////////////////////////////////////
-cmd ::= USE ids(X).              { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &X);}
-
-/////////////////////////////////THE DESCRIBE STATEMENT/////////////////////////////////////
-cmd ::= DESCRIBE ids(X) cpxName(Y). {
-    X.n += Y.n;
-    setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &X);
-}
-
-/////////////////////////////////THE ALTER STATEMENT////////////////////////////////////////
-cmd ::= ALTER USER ids(X) PASS ids(Y).          { setAlterUserSQL(pInfo, TSDB_ALTER_USER_PASSWD, &X, &Y, NULL);    }
-cmd ::= ALTER USER ids(X) PRIVILEGE ids(Y).     { setAlterUserSQL(pInfo, TSDB_ALTER_USER_PRIVILEGES, &X, NULL, &Y);}
-cmd ::= ALTER DNODE IPTOKEN(X) ids(Y).               { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &X, &Y);          }
-cmd ::= ALTER DNODE IPTOKEN(X) ids(Y) ids(Z).        { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &X, &Y, &Z);      }
-cmd ::= ALTER LOCAL ids(X).                     { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &X);              }
-cmd ::= ALTER LOCAL ids(X) ids(Y).              { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &X, &Y);          }
-cmd ::= ALTER DATABASE ids(X) alter_db_optr(Y). { SSQLToken t = {0};  setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);}
-
-cmd ::= ALTER ACCOUNT ids(X) acct_optr(Z).      { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &X, NULL, &Z);}
-cmd ::= ALTER ACCOUNT ids(X) PASS ids(Y) acct_optr(Z).      { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &X, &Y, &Z);}
-
-// An IDENTIFIER can be a generic identifier, or one of several keywords.
-// Any non-standard keyword can also be an identifier.
-// And "ids" is an identifer-or-string.
-%type ids {SSQLToken}
-ids(A) ::= ID(X).        {A = X; }
-ids(A) ::= STRING(X).    {A = X; }
-
-%type ifexists {SSQLToken}
-ifexists(X) ::= IF EXISTS.          {X.n = 1;}
-ifexists(X) ::= .                   {X.n = 0;}
-
-%type ifnotexists {SSQLToken}
-ifnotexists(X) ::= IF NOT EXISTS.   {X.n = 1;}
-ifnotexists(X) ::= .                {X.n = 0;}
-
-/////////////////////////////////THE CREATE STATEMENT///////////////////////////////////////
-//create option for dnode/db/user/account
-cmd ::= CREATE DNODE IPTOKEN(X).     { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);}
-cmd ::= CREATE ACCOUNT ids(X) PASS ids(Y) acct_optr(Z).
-                                { setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &X, &Y, &Z);}
-cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y).  { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);}
-cmd ::= CREATE USER ids(X) PASS ids(Y).     { setCreateUserSQL(pInfo, &X, &Y);}
-
-pps(Y) ::= .                                {Y.n = 0;   }
-pps(Y) ::= PPS INTEGER(X).                  {Y = X;     }
-
-tseries(Y) ::= .                            {Y.n = 0;   }
-tseries(Y) ::= TSERIES INTEGER(X).          {Y = X;     }
-
-dbs(Y) ::= .                                {Y.n = 0;   }
-dbs(Y) ::= DBS INTEGER(X).                  {Y = X;     }
-
-streams(Y) ::= .                            {Y.n = 0;   }
-streams(Y) ::= STREAMS INTEGER(X).          {Y = X;     }
-
-storage(Y) ::= .                            {Y.n = 0;   }
-storage(Y) ::= STORAGE INTEGER(X).          {Y = X;     }
-
-qtime(Y) ::= .                              {Y.n = 0;   }
-qtime(Y) ::= QTIME INTEGER(X).              {Y = X;     }
-
-users(Y) ::= .                              {Y.n = 0;   }
-users(Y) ::= USERS INTEGER(X).              {Y = X;     }
-
-conns(Y) ::= .                              {Y.n = 0;   }
-conns(Y) ::= CONNS INTEGER(X).              {Y = X;     }
-
-state(Y) ::= .                              {Y.n = 0;   }
-state(Y) ::= STATE ids(X).                  {Y = X;     }
-
-%type acct_optr {SCreateAcctSQL}
-acct_optr(Y) ::= pps(C) tseries(D) storage(P) streams(F) qtime(Q) dbs(E) users(K) conns(L) state(M). {
-    Y.maxUsers   = (K.n>0)?atoi(K.z):-1;
-    Y.maxDbs     = (E.n>0)?atoi(E.z):-1;
-    Y.maxTimeSeries = (D.n>0)?atoi(D.z):-1;
-    Y.maxStreams = (F.n>0)?atoi(F.z):-1;
-    Y.maxPointsPerSecond     = (C.n>0)?atoi(C.z):-1;
-    Y.maxStorage = (P.n>0)?strtoll(P.z, NULL, 10):-1;
-    Y.maxQueryTime   = (Q.n>0)?strtoll(Q.z, NULL, 10):-1;
-    Y.maxConnections   = (L.n>0)?atoi(L.z):-1;
-    Y.stat    = M;
-}
-
-%type keep {tVariantList*}
-%destructor keep {tVariantListDestroy($$);}
-keep(Y)    ::= KEEP tagitemlist(X).           { Y = X; }
-
-tables(Y)  ::= TABLES INTEGER(X).             { Y = X; }
-cache(Y)   ::= CACHE INTEGER(X).              { Y = X; }
-replica(Y) ::= REPLICA INTEGER(X).            { Y = X; }
-days(Y)    ::= DAYS INTEGER(X).               { Y = X; }
-rows(Y)    ::= ROWS INTEGER(X).               { Y = X; }
-
-ablocks(Y) ::= ABLOCKS ID(X).                 { Y = X; }
-tblocks(Y) ::= TBLOCKS INTEGER(X).            { Y = X; }
-ctime(Y)   ::= CTIME INTEGER(X).              { Y = X; }
-clog(Y)    ::= CLOG INTEGER(X).               { Y = X; }
-comp(Y)    ::= COMP INTEGER(X).               { Y = X; }
-prec(Y)    ::= PRECISION STRING(X).           { Y = X; }
-
-%type db_optr {SCreateDBInfo}
-db_optr(Y) ::= . {setDefaultCreateDbOption(&Y);}
-
-db_optr(Y) ::= db_optr(Z) tables(X).         { Y = Z; Y.tablesPerVnode = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) cache(X).          { Y = Z; Y.cacheBlockSize = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) replica(X).        { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) days(X).           { Y = Z; Y.daysPerFile = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) rows(X).           { Y = Z; Y.rowPerFileBlock = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) ablocks(X).        { Y = Z; Y.numOfAvgCacheBlocks = strtod(X.z, NULL); }
-db_optr(Y) ::= db_optr(Z) tblocks(X).        { Y = Z; Y.numOfBlocksPerTable = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) ctime(X).          { Y = Z; Y.commitTime = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) clog(X).           { Y = Z; Y.commitLog = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) comp(X).           { Y = Z; Y.compressionLevel = strtol(X.z, NULL, 10); }
-db_optr(Y) ::= db_optr(Z) prec(X).           { Y = Z; Y.precision = X; }
-db_optr(Y) ::= db_optr(Z) keep(X).           { Y = Z; Y.keep = X; }
-
-%type alter_db_optr {SCreateDBInfo}
-alter_db_optr(Y) ::= . { setDefaultCreateDbOption(&Y);}
-
-alter_db_optr(Y) ::= alter_db_optr(Z) replica(X).     { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
-alter_db_optr(Y) ::= alter_db_optr(Z) tables(X).      { Y = Z; Y.tablesPerVnode = strtol(X.z, NULL, 10); }
-
-%type typename {TAOS_FIELD}
-typename(A) ::= ids(X).              { tSQLSetColumnType (&A, &X); }
-
-//define binary type, e.g., binary(10), nchar(10)
-typename(A) ::= ids(X) LP signed(Y) RP.    {
-    X.type = -Y;          // negative value of name length
-    tSQLSetColumnType(&A, &X);
-}
-
-%type signed {int64_t}
-signed(A) ::= INTEGER(X).         { A = strtol(X.z, NULL, 10); }
-signed(A) ::= PLUS INTEGER(X).    { A = strtol(X.z, NULL, 10); }
-signed(A) ::= MINUS INTEGER(X).   { A = -strtol(X.z, NULL, 10);}
-
-////////////////////////////////// The CREATE TABLE statement ///////////////////////////////
-cmd ::= CREATE TABLE ifnotexists(Y) ids(X) cpxName(Z) create_table_args.  {
-    X.n += Z.n;
-    setCreatedMeterName(pInfo, &X, &Y);
-}
-
-%type create_table_args{SCreateTableSQL*}
-create_table_args(A) ::= LP columnlist(X) RP. {
-    A = tSetCreateSQLElems(X, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE);
-    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
-}
-
-// create super table
-create_table_args(A) ::= LP columnlist(X) RP TAGS LP columnlist(Y) RP. {
-    A = tSetCreateSQLElems(X, Y, NULL, NULL, NULL, TSQL_CREATE_STABLE);
-    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
-}
-
-// create table by using super table
-// create table table_name using super_table_name tags(tag_values1, tag_values2)
-create_table_args(A) ::= USING ids(X) cpxName(F) TAGS LP tagitemlist(Y) RP.  {
-    X.n += F.n;
-    A = tSetCreateSQLElems(NULL, NULL, &X, Y, NULL, TSQL_CREATE_TABLE_FROM_STABLE);
-    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
-}
-
-// create stream
-// create table table_name as select count(*) from super_table_name interval(time)
-create_table_args(A) ::= AS select(S). {
-    A = tSetCreateSQLElems(NULL, NULL, NULL, NULL, S, TSQL_CREATE_STREAM);
-    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
-}
-
-%type column{TAOS_FIELD}
-%type columnlist{tFieldList*}
-%destructor columnlist {tFieldListDestroy($$);}
-columnlist(A) ::= columnlist(X) COMMA column(Y).  {A = tFieldListAppend(X, &Y);   }
-columnlist(A) ::= column(X).                      {A = tFieldListAppend(NULL, &X);}
-
-// The information used for a column is the name and type of column:
-// tinyint smallint int bigint float double bool timestamp binary(x) nchar(x)
-column(A) ::= ids(X) typename(Y).          {
-    tSQLSetColumnInfo(&A, &X, &Y);
-}
-
-%type tagitemlist {tVariantList*}
-%destructor tagitemlist {tVariantListDestroy($$);}
-
-%type tagitem {tVariant}
-tagitemlist(A) ::= tagitemlist(X) COMMA tagitem(Y). { A = tVariantListAppend(X, &Y, -1);    }
-tagitemlist(A) ::= tagitem(X).                      { A = tVariantListAppend(NULL, &X, -1); }
-
-tagitem(A) ::= INTEGER(X).      {toTSDBType(X.type); tVariantCreate(&A, &X); }
-tagitem(A) ::= FLOAT(X).        {toTSDBType(X.type); tVariantCreate(&A, &X); }
-tagitem(A) ::= STRING(X).       {toTSDBType(X.type); tVariantCreate(&A, &X); }
-tagitem(A) ::= BOOL(X).         {toTSDBType(X.type); tVariantCreate(&A, &X); }
-tagitem(A) ::= NULL(X).         { X.type = 0; tVariantCreate(&A, &X); }
-
-tagitem(A) ::= MINUS(X) INTEGER(Y).{
-    X.n += Y.n;
-    X.type = Y.type;
-    toTSDBType(X.type);
-    tVariantCreate(&A, &X);
-}
-
-tagitem(A) ::= MINUS(X) FLOAT(Y).  {
-    X.n += Y.n;
-    X.type = Y.type;
-    toTSDBType(X.type);
-    tVariantCreate(&A, &X);
-}
-
-tagitem(A) ::= PLUS(X) INTEGER(Y). {
-    X.n += Y.n;
-    X.type = Y.type;
-    toTSDBType(X.type);
-    tVariantCreate(&A, &X);
-}
-
-tagitem(A) ::= PLUS(X) FLOAT(Y).  {
-    X.n += Y.n;
-    X.type = Y.type;
-    toTSDBType(X.type);
-    tVariantCreate(&A, &X);
-}
-
-//////////////////////// The SELECT statement /////////////////////////////////
-%type select {SQuerySQL*}
-%destructor select {doDestroyQuerySql($$);}
-select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). {
-  A = tSetQuerySQLElems(&T, W, X, Y, P, Z, &K, &S, F, &L, &G);
-}
-
-%type union {SSubclauseInfo*}
-%destructor union {destroyAllSelectClause($$);}
-
-union(Y) ::= select(X). { Y = setSubclause(NULL, X); }
-union(Y) ::= LP union(X) RP. { Y = X; }
-union(Y) ::= union(Z) UNION ALL select(X). { Y = appendSelectClause(Z, X); }
-union(Y) ::= union(Z) UNION ALL LP select(X) RP. { Y = appendSelectClause(Z, X); }
-
-cmd ::= union(X). { setSQLInfo(pInfo, X, NULL, TSDB_SQL_SELECT); }
-
-// Support for the SQL exprssion without from & where subclauses, e.g.,
-// select current_database(),
-// select server_version(), select client_version(),
-// select server_state();
-select(A) ::= SELECT(T) selcollist(W). {
-  A = tSetQuerySQLElems(&T, W, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-}
-
-// selcollist is a list of expressions that are to become the return
-// values of the SELECT statement.  The "*" in statements like
-// "SELECT * FROM ..." is encoded as a special expression with an opcode of TK_ALL.
-%type selcollist {tSQLExprList*}
-%destructor selcollist {tSQLExprListDestroy($$);}
-
-%type sclp {tSQLExprList*}
-%destructor sclp {tSQLExprListDestroy($$);}
-sclp(A) ::= selcollist(X) COMMA.             {A = X;}
-sclp(A) ::= .                                {A = 0;}
-selcollist(A) ::= sclp(P) expr(X) as(Y).     {
-   A = tSQLExprListAppend(P, X, Y.n?&Y:0);
-}
-
-selcollist(A) ::= sclp(P) STAR. {
-   tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL);
-   A = tSQLExprListAppend(P, pNode, 0);
-}
-
-// An option "AS <id>" phrase that can follow one of the expressions that
-// define the result set, or one of the tables in the FROM clause.
-//
-%type as {SSQLToken}
-as(X) ::= AS ids(Y).    { X = Y;    }
-as(X) ::= ids(Y).       { X = Y;    }
-as(X) ::= .             { X.n = 0;  }
-
-// A complete FROM clause.
-%type from {tVariantList*}
-// current not support query from no-table
-from(A) ::= FROM tablelist(X).                 {A = X;}
-
-%type tablelist {tVariantList*}
-tablelist(A) ::= ids(X) cpxName(Y).                     { toTSDBType(X.type); X.n += Y.n; A = tVariantListAppendToken(NULL, &X, -1);}
-tablelist(A) ::= tablelist(Y) COMMA ids(X) cpxName(Z).  { toTSDBType(X.type); X.n += Z.n; A = tVariantListAppendToken(Y, &X, -1);   }
-
-// The value of interval should be the form of "number+[a,s,m,h,d,n,y]" or "now"
-%type tmvar {SSQLToken}
-tmvar(A) ::= VARIABLE(X).   {A = X;}
-
-%type interval_opt {SSQLToken}
-interval_opt(N) ::= INTERVAL LP tmvar(E) RP.    {N = E;     }
-interval_opt(N) ::= .                           {N.n = 0; N.z = NULL; N.type = 0;   }
-
-%type fill_opt {tVariantList*}
-%destructor fill_opt {tVariantListDestroy($$);}
-fill_opt(N) ::= .                               {N = 0;     }
-fill_opt(N) ::= FILL LP ID(Y) COMMA tagitemlist(X) RP.      {
-    tVariant A = {0};
-    toTSDBType(Y.type);
-    tVariantCreate(&A, &Y);
-
-    tVariantListInsert(X, &A, -1, 0);
-    N = X;
-}
-
-fill_opt(N) ::= FILL LP ID(Y) RP.               {
-    toTSDBType(Y.type);
-    N = tVariantListAppendToken(NULL, &Y, -1);
-}
-
-%type sliding_opt {SSQLToken}
-sliding_opt(K) ::= SLIDING LP tmvar(E) RP.      {K = E;     }
-sliding_opt(K) ::= .                            {K.n = 0; K.z = NULL; K.type = 0;   }
-
-%type orderby_opt {tVariantList*}
-%destructor orderby_opt {tVariantListDestroy($$);}
-
-%type sortlist {tVariantList*}
-%destructor sortlist {tVariantListDestroy($$);}
-
-%type sortitem {tVariant}
-%destructor sortitem {tVariantDestroy(&$$);}
-
-orderby_opt(A) ::= .                          {A = 0;}
-orderby_opt(A) ::= ORDER BY sortlist(X).      {A = X;}
-
-sortlist(A) ::= sortlist(X) COMMA item(Y) sortorder(Z). {
-    A = tVariantListAppend(X, &Y, Z);
-}
-
-sortlist(A) ::= item(Y) sortorder(Z). {
-  A = tVariantListAppend(NULL, &Y, Z);
-}
-
-%type item {tVariant}
-item(A) ::= ids(X) cpxName(Y).   {
-  toTSDBType(X.type);
-  X.n += Y.n;
-
-  tVariantCreate(&A, &X);
-}
-
-%type sortorder {int}
-sortorder(A) ::= ASC.           {A = TSQL_SO_ASC; }
-sortorder(A) ::= DESC.          {A = TSQL_SO_DESC;}
-sortorder(A) ::= .              {A = TSQL_SO_ASC;}  //default is descend order
-
-//group by clause
-%type groupby_opt {tVariantList*}
-%destructor groupby_opt {tVariantListDestroy($$);}
-%type grouplist {tVariantList*}
-%destructor grouplist {tVariantListDestroy($$);}
-
-groupby_opt(A) ::= .                       {A = 0;}
-groupby_opt(A) ::= GROUP BY grouplist(X).  {A = X;}
-
-grouplist(A) ::= grouplist(X) COMMA item(Y).    {
-  A = tVariantListAppend(X, &Y, -1);
-}
-
-grouplist(A) ::= item(X).                       {
-  A = tVariantListAppend(NULL, &X, -1);
-}
-
-//having clause, ignore the input condition in having
-%type having_opt {tSQLExpr*}
-%destructor having_opt {tSQLExprDestroy($$);}
-having_opt(A) ::=.                  {A = 0;}
-having_opt(A) ::= HAVING expr(X).   {A = X;}
-
-//limit-offset subclause
-%type limit_opt {SLimitVal}
-limit_opt(A) ::= .                     {A.limit = -1; A.offset = 0;}
-limit_opt(A) ::= LIMIT signed(X).      {A.limit = X;  A.offset = 0;}
-limit_opt(A) ::= LIMIT signed(X) OFFSET signed(Y).
-                                       {A.limit = X;  A.offset = Y;}
-limit_opt(A) ::= LIMIT signed(X) COMMA signed(Y).
-                                       {A.limit = Y;  A.offset = X;}
-
-%type slimit_opt {SLimitVal}
-slimit_opt(A) ::= .                    {A.limit = -1; A.offset = 0;}
-slimit_opt(A) ::= SLIMIT signed(X).    {A.limit = X;  A.offset = 0;}
-slimit_opt(A) ::= SLIMIT signed(X) SOFFSET signed(Y).
-                                       {A.limit = X;  A.offset = Y;}
-slimit_opt(A) ::= SLIMIT signed(X) COMMA  signed(Y).
-                                       {A.limit = Y;  A.offset = X;}
-
-%type where_opt {tSQLExpr*}
-%destructor where_opt {tSQLExprDestroy($$);}
-
-where_opt(A) ::= .                    {A = 0;}
-where_opt(A) ::= WHERE expr(X).       {A = X;}
-
-/////////////////////////// Expression Processing /////////////////////////////
-//
-%type expr {tSQLExpr*}
-%destructor expr {tSQLExprDestroy($$);}
-
-expr(A) ::= LP expr(X) RP.   {A = X; }
-
-expr(A) ::= ID(X).           {A = tSQLExprIdValueCreate(&X, TK_ID);}
-expr(A) ::= ID(X) DOT ID(Y). {X.n += (1+Y.n); A = tSQLExprIdValueCreate(&X, TK_ID);}
-expr(A) ::= ID(X) DOT STAR(Y). {X.n += (1+Y.n); A = tSQLExprIdValueCreate(&X, TK_ALL);}
-
-expr(A) ::= INTEGER(X).      {A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= MINUS(X) INTEGER(Y). {X.n += Y.n; X.type = TK_INTEGER; A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= PLUS(X)  INTEGER(Y). {X.n += Y.n; X.type = TK_INTEGER; A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
-expr(A) ::= FLOAT(X).        {A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= MINUS(X) FLOAT(Y).       {X.n += Y.n; X.type = TK_FLOAT; A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= PLUS(X) FLOAT(Y).        {X.n += Y.n; X.type = TK_FLOAT; A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
-expr(A) ::= STRING(X).       {A = tSQLExprIdValueCreate(&X, TK_STRING);}
-expr(A) ::= NOW(X).          {A = tSQLExprIdValueCreate(&X, TK_NOW); }
-expr(A) ::= VARIABLE(X).     {A = tSQLExprIdValueCreate(&X, TK_VARIABLE);}
-expr(A) ::= BOOL(X).         {A = tSQLExprIdValueCreate(&X, TK_BOOL);}
-// normal functions: min(x)
-expr(A) ::= ID(X) LP exprlist(Y) RP(E). {
-  A = tSQLExprCreateFunction(Y, &X, &E, X.type);
-}
-
-// this is for: count(*)/first(*)/last(*) operation
-expr(A) ::= ID(X) LP STAR RP(Y). {
-  A = tSQLExprCreateFunction(NULL, &X, &Y, X.type);
-}
-
-//binary expression: a+2, b+3
-expr(A) ::= expr(X) AND expr(Y).   {A = tSQLExprCreate(X, Y, TK_AND);}
-expr(A) ::= expr(X) OR  expr(Y).   {A = tSQLExprCreate(X, Y, TK_OR); }
-
-//binary relational expression
-expr(A) ::= expr(X) LT expr(Y).    {A = tSQLExprCreate(X, Y, TK_LT);}
-expr(A) ::= expr(X) GT expr(Y).    {A = tSQLExprCreate(X, Y, TK_GT);}
-expr(A) ::= expr(X) LE expr(Y).    {A = tSQLExprCreate(X, Y, TK_LE);}
-expr(A) ::= expr(X) GE expr(Y).    {A = tSQLExprCreate(X, Y, TK_GE);}
-expr(A) ::= expr(X) NE expr(Y).    {A = tSQLExprCreate(X, Y, TK_NE);}
-expr(A) ::= expr(X) EQ expr(Y).    {A = tSQLExprCreate(X, Y, TK_EQ);}
-
-//binary arithmetic expression
-expr(A) ::= expr(X) PLUS  expr(Y).   {A = tSQLExprCreate(X, Y, TK_PLUS);  }
-expr(A) ::= expr(X) MINUS expr(Y).   {A = tSQLExprCreate(X, Y, TK_MINUS); }
-expr(A) ::= expr(X) STAR  expr(Y).   {A = tSQLExprCreate(X, Y, TK_STAR);  }
-expr(A) ::= expr(X) SLASH expr(Y).   {A = tSQLExprCreate(X, Y, TK_DIVIDE);}
-expr(A) ::= expr(X) REM   expr(Y).   {A = tSQLExprCreate(X, Y, TK_REM);   }
-
-//like expression
-expr(A) ::= expr(X) LIKE  expr(Y).   {A = tSQLExprCreate(X, Y, TK_LIKE);  }
-
-//in expression
-expr(A) ::= expr(X) IN LP exprlist(Y) RP.   {A = tSQLExprCreate(X, (tSQLExpr*)Y, TK_IN); }
-
-%type exprlist {tSQLExprList*}
-%destructor exprlist {tSQLExprListDestroy($$);}
-
-%type expritem {tSQLExpr*}
-%destructor expritem {tSQLExprDestroy($$);}
-
-exprlist(A) ::= exprlist(X) COMMA expritem(Y). {A = tSQLExprListAppend(X,Y,0);}
-exprlist(A) ::= expritem(X).            {A = tSQLExprListAppend(0,X,0);}
-expritem(A) ::= expr(X).                {A = X;}
-expritem(A) ::= .                       {A = 0;}
-
-///////////////////////////////////reset query cache//////////////////////////////////////
-cmd ::= RESET QUERY CACHE.  { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
-
-///////////////////////////////////ALTER TABLE statement//////////////////////////////////
-cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
-    X.n += F.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-
-cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
-    X.n += F.n;
-
-    toTSDBType(A.type);
-    tVariantList* K = tVariantListAppendToken(NULL, &A, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-
-//////////////////////////////////ALTER TAGS statement/////////////////////////////////////
-cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A).        {
-    X.n += Y.n;
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
-    X.n += Z.n;
-
-    toTSDBType(Y.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-
-cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
-    X.n += F.n;
-
-    toTSDBType(Y.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
-
-    toTSDBType(Z.type);
-    A = tVariantListAppendToken(A, &Z, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-
-cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
-    X.n += F.n;
-
-    toTSDBType(Y.type);
-    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
-    A = tVariantListAppend(A, &Z, -1);
-
-    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
-    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
-}
-
-////////////////////////////////////////kill statement///////////////////////////////////////
-cmd ::= KILL CONNECTION IPTOKEN(X) COLON(Z) INTEGER(Y).   {X.n += (Z.n + Y.n); setKillSQL(pInfo, TSDB_SQL_KILL_CONNECTION, &X);}
-cmd ::= KILL STREAM IPTOKEN(X) COLON(Z) INTEGER(Y) COLON(K) INTEGER(F).       {X.n += (Z.n + Y.n + K.n + F.n); setKillSQL(pInfo, TSDB_SQL_KILL_STREAM, &X);}
-cmd ::= KILL QUERY IPTOKEN(X) COLON(Z) INTEGER(Y) COLON(K) INTEGER(F).        {X.n += (Z.n + Y.n + K.n + F.n); setKillSQL(pInfo, TSDB_SQL_KILL_QUERY, &X);}
-
-%fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED
-  DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
-  LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
-  COUNT SUM AVG MIN MAX FIRST LAST TOP BOTTOM STDDEV PERCENTILE APERCENTILE LEASTSQUARES HISTOGRAM DIFF
-  SPREAD TWA INTERP LAST_ROW RATE IRATE SUM_RATE SUM_IRATE AVG_RATE AVG_IRATE NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT
-  METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO VALUES.
diff --git a/src/inc/tacct.h b/src/inc/tacct.h
new file mode 100644
index 0000000000000000000000000000000000000000..52215fac526f91355efafaf9edb2fb1366dd46fb
--- /dev/null
+++ b/src/inc/tacct.h
@@ -0,0 +1,37 @@
+/*
+ * 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_ACCT_H
+#define TDENGINE_ACCT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+  ACCT_GRANT_USER,
+  ACCT_GRANT_DB,
+  ACCT_GRANT_TABLE
+} EAcctGrantType;
+
+int32_t acctInit();
+void    acctCleanUp();
+int32_t acctCheck(void *pAcct, EAcctGrantType type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/tadmin.h b/src/inc/tadmin.h
new file mode 100644
index 0000000000000000000000000000000000000000..b7de33576a3e73ea481bb75d01f1005b3bd942f6
--- /dev/null
+++ b/src/inc/tadmin.h
@@ -0,0 +1,32 @@
+/*
+ * 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_ADMIN_H
+#define TDENGINE_ADMIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct HttpServer;
+
+void adminInitHandle(struct HttpServer* pServer);
+void opInitHandle(struct HttpServer* pServer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/taos.h b/src/inc/taos.h
index d9db79fbcb74e6935ab052c702b72129cd4cc132..7e8f174b7c3737463f7e66dfdc6d5cd906791ee3 100644
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@@ -29,7 +29,8 @@ typedef void    TAOS_SUB;
 typedef void    TAOS_STREAM;
 typedef void    TAOS_STMT;
 
-#define TSDB_DATA_TYPE_NULL       0
+// Data type definition
+#define TSDB_DATA_TYPE_NULL       0     // 1 bytes
 #define TSDB_DATA_TYPE_BOOL       1     // 1 bytes
 #define TSDB_DATA_TYPE_TINYINT    2     // 1 byte
 #define TSDB_DATA_TYPE_SMALLINT   3     // 2 bytes
@@ -39,7 +40,7 @@ typedef void    TAOS_STMT;
 #define TSDB_DATA_TYPE_DOUBLE     7     // 8 bytes
 #define TSDB_DATA_TYPE_BINARY     8     // string
 #define TSDB_DATA_TYPE_TIMESTAMP  9     // 8 bytes
-#define TSDB_DATA_TYPE_NCHAR      10    // multibyte string
+#define TSDB_DATA_TYPE_NCHAR      10    // unicode string
 
 typedef enum {
   TSDB_OPTION_LOCALE,
@@ -47,14 +48,13 @@ typedef enum {
   TSDB_OPTION_TIMEZONE,
   TSDB_OPTION_CONFIGDIR,
   TSDB_OPTION_SHELL_ACTIVITY_TIMER,
-  TSDB_OPTION_SOCKET_TYPE,
   TSDB_MAX_OPTIONS
 } TSDB_OPTION;
 
 typedef struct taosField {
-  char  name[64];
-  short bytes;
-  char  type;
+  char     name[65];
+  uint8_t  type;
+  int16_t  bytes;
 } TAOS_FIELD;
 
 #ifdef _TD_GO_DLL_
@@ -64,6 +64,7 @@ typedef struct taosField {
 #endif
 
 DLL_EXPORT void  taos_init();
+DLL_EXPORT void  taos_cleanup();
 DLL_EXPORT int   taos_options(TSDB_OPTION option, const void *arg, ...);
 DLL_EXPORT TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port);
 DLL_EXPORT void  taos_close(TAOS *taos);
@@ -71,8 +72,8 @@ DLL_EXPORT void  taos_close(TAOS *taos);
 typedef struct TAOS_BIND {
   int            buffer_type;
   void *         buffer;
-  unsigned long  buffer_length;  // unused
-  unsigned long *length;
+  uintptr_t      buffer_length;  // unused
+  uintptr_t      *length;
   int *          is_null;
   int            is_unsigned;  // unused
   int *          error;        // unused
@@ -86,14 +87,13 @@ int        taos_stmt_execute(TAOS_STMT *stmt);
 TAOS_RES * taos_stmt_use_result(TAOS_STMT *stmt);
 int        taos_stmt_close(TAOS_STMT *stmt);
 
-DLL_EXPORT int taos_query(TAOS *taos, const char *sql);
-DLL_EXPORT TAOS_RES *taos_use_result(TAOS *taos);
+DLL_EXPORT TAOS_RES *taos_query(TAOS *taos, const char *sql);
 DLL_EXPORT TAOS_ROW taos_fetch_row(TAOS_RES *res);
 DLL_EXPORT int taos_result_precision(TAOS_RES *res);  // get the time precision of result
 DLL_EXPORT void taos_free_result(TAOS_RES *res);
-DLL_EXPORT int taos_field_count(TAOS *taos);
+DLL_EXPORT int taos_field_count(TAOS_RES *tres);
 DLL_EXPORT int taos_num_fields(TAOS_RES *res);
-DLL_EXPORT int taos_affected_rows(TAOS *taos);
+DLL_EXPORT int taos_affected_rows(TAOS_RES *res);
 DLL_EXPORT TAOS_FIELD *taos_fetch_fields(TAOS_RES *res);
 DLL_EXPORT int taos_select_db(TAOS *taos, const char *db);
 DLL_EXPORT int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields);
@@ -102,15 +102,17 @@ DLL_EXPORT void taos_stop_query(TAOS_RES *res);
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows);
 int taos_validate_sql(TAOS *taos, const char *sql);
 
+int* taos_fetch_lengths(TAOS_RES *res);
+
 // TAOS_RES   *taos_list_tables(TAOS *mysql, const char *wild);
 // TAOS_RES   *taos_list_dbs(TAOS *mysql, const char *wild);
 
 // TODO: the return value should be `const`
 DLL_EXPORT char *taos_get_server_info(TAOS *taos);
 DLL_EXPORT char *taos_get_client_info();
-DLL_EXPORT char *taos_errstr(TAOS *taos);
+DLL_EXPORT char *taos_errstr(TAOS_RES *tres);
 
-DLL_EXPORT int taos_errno(TAOS *taos);
+DLL_EXPORT int taos_errno(TAOS_RES *tres);
 
 DLL_EXPORT void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);
 DLL_EXPORT void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
new file mode 100644
index 0000000000000000000000000000000000000000..228aba2a5e57cc362ffb3af54a81093328e047b5
--- /dev/null
+++ b/src/inc/taosdef.h
@@ -0,0 +1,457 @@
+/*
+ * 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_TAOS_DEF_H
+#define TDENGINE_TAOS_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "osDef.h"
+#include "taos.h"
+
+#define TSDB__packed
+
+#ifdef TSKEY32
+#define TSKEY int32_t;
+#else
+#define TSKEY int64_t
+#endif
+
+#define TSWINDOW_INITIALIZER ((STimeWindow) {INT64_MIN, INT64_MAX})
+#define TSKEY_INITIAL_VAL    INT64_MIN
+
+// ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR
+typedef int32_t VarDataOffsetT;
+typedef int16_t VarDataLenT;
+
+typedef struct tstr {
+  VarDataLenT len;
+  char        data[];
+} tstr;
+
+#define VARSTR_HEADER_SIZE  sizeof(VarDataLenT)
+
+#define varDataLen(v)       ((VarDataLenT *)(v))[0]
+#define varDataTLen(v)      (sizeof(VarDataLenT) + varDataLen(v))
+#define varDataVal(v)       ((void *)((char *)v + VARSTR_HEADER_SIZE))
+#define varDataCopy(dst, v) memcpy((dst), (void*) (v), varDataTLen(v))
+#define varDataLenByData(v) (*(VarDataLenT *)(((char*)(v)) - VARSTR_HEADER_SIZE))
+#define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT) (_len))
+#define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_BINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
+
+// this data type is internally used only in 'in' query to hold the values
+#define TSDB_DATA_TYPE_ARRAY      (TSDB_DATA_TYPE_NCHAR + 1)
+
+
+// Bytes for each type.
+extern const int32_t TYPE_BYTES[11];
+// TODO: replace and remove code below
+#define CHAR_BYTES   sizeof(char)
+#define SHORT_BYTES  sizeof(int16_t)
+#define INT_BYTES    sizeof(int)
+#define LONG_BYTES   sizeof(int64_t)
+#define FLOAT_BYTES  sizeof(float)
+#define DOUBLE_BYTES sizeof(double)
+
+// NULL definition
+#define TSDB_DATA_BOOL_NULL             0x02
+#define TSDB_DATA_TINYINT_NULL          0x80
+#define TSDB_DATA_SMALLINT_NULL         0x8000
+#define TSDB_DATA_INT_NULL              0x80000000
+#define TSDB_DATA_BIGINT_NULL           0x8000000000000000L
+
+#define TSDB_DATA_FLOAT_NULL            0x7FF00000              // it is an NAN
+#define TSDB_DATA_DOUBLE_NULL           0x7FFFFF0000000000L     // an NAN
+#define TSDB_DATA_NCHAR_NULL            0xFFFFFFFF
+#define TSDB_DATA_BINARY_NULL           0xFF
+
+#define TSDB_DATA_NULL_STR              "NULL"
+#define TSDB_DATA_NULL_STR_L            "null"
+
+#define TSDB_DEFAULT_USER               "root"
+#ifdef _TD_POWER_
+#define TSDB_DEFAULT_PASS               "powerdb"
+#else
+#define TSDB_DEFAULT_PASS               "taosdata"
+#endif
+
+#define TSDB_TRUE   1
+#define TSDB_FALSE  0
+#define TSDB_OK     0
+#define TSDB_ERR   -1
+
+#define TS_PATH_DELIMITER "."
+
+#define TSDB_TIME_PRECISION_MILLI 0
+#define TSDB_TIME_PRECISION_MICRO 1
+#define TSDB_TIME_PRECISION_NANO  2
+#define TSDB_TICK_PER_SECOND(precision) ((precision)==TSDB_TIME_PRECISION_MILLI ? 1e3L : ((precision)==TSDB_TIME_PRECISION_MICRO ? 1e6L : 1e9L))
+
+#define TSDB_TIME_PRECISION_MILLI_STR "ms"
+#define TSDB_TIME_PRECISION_MICRO_STR "us"
+
+#define T_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
+#define T_APPEND_MEMBER(dst, ptr, type, member) \
+do {\
+  memcpy((void *)(dst), (void *)(&((ptr)->member)), T_MEMBER_SIZE(type, member));\
+  dst = (void *)((char *)(dst) + T_MEMBER_SIZE(type, member));\
+} while(0)
+#define T_READ_MEMBER(src, type, target) \
+do { \
+  (target) = *(type *)(src); \
+  (src) = (void *)((char *)src + sizeof(type));\
+} while(0)
+
+#define TSDB_KEYSIZE              sizeof(TSKEY)
+
+#if LINUX
+  #define TSDB_NCHAR_SIZE         sizeof(wchar_t)
+#else
+  #define TSDB_NCHAR_SIZE         4
+#endif
+//#define TSDB_CHAR_TERMINATED_SPACE 1
+
+#define GET_INT8_VAL(x)   (*(int8_t *)(x))
+#define GET_INT16_VAL(x)  (*(int16_t *)(x))
+#define GET_INT32_VAL(x)  (*(int32_t *)(x))
+#define GET_INT64_VAL(x)  (*(int64_t *)(x))
+#ifdef _TD_ARM_32_
+  #define GET_FLOAT_VAL(x)  taos_align_get_float(x)
+  #define GET_DOUBLE_VAL(x) taos_align_get_double(x)
+
+  float  taos_align_get_float(const char* pBuf);
+  double taos_align_get_double(const char* pBuf);
+
+  //#define __float_align_declear()  float __underlyFloat = 0.0;
+  //#define __float_align_declear()
+  //#define GET_FLOAT_VAL_ALIGN(x) (*(int32_t*)&(__underlyFloat) = *(int32_t*)(x); __underlyFloat);
+  // notes: src must be float or double type variable !!!
+  #define SET_FLOAT_VAL_ALIGN(dst, src) (*(int32_t*) dst = *(int32_t*)src);
+  #define SET_DOUBLE_VAL_ALIGN(dst, src) (*(int64_t*) dst = *(int64_t*)src);
+#else
+  #define GET_FLOAT_VAL(x)  (*(float *)(x))
+  #define GET_DOUBLE_VAL(x) (*(double *)(x))
+#endif
+
+typedef struct tDataTypeDescriptor {
+  int16_t nType;
+  int16_t nameLen;
+  int32_t nSize;
+  char *  aName;
+  int (*compFunc)(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                  char algorithm, char *const buffer, int bufferSize);
+  int (*decompFunc)(const char *const input, int compressedSize, const int nelements, char *const output,
+                    int outputSize, char algorithm, char *const buffer, int bufferSize);
+  void (*getStatisFunc)(const TSKEY *primaryKey, const void *pData, int32_t numofrow, int64_t *min, int64_t *max,
+                         int64_t *sum, int16_t *minindex, int16_t *maxindex, int16_t *numofnull);
+} tDataTypeDescriptor;
+
+extern tDataTypeDescriptor tDataTypeDesc[11];
+#define POINTER_BYTES sizeof(void *)  // 8 by default  assert(sizeof(ptrdiff_t) == sizseof(void*)
+
+bool isValidDataType(int32_t type);
+//bool isNull(const char *val, int32_t type);
+static FORCE_INLINE bool isNull(const char *val, int32_t type) {
+  switch (type) {
+    case TSDB_DATA_TYPE_BOOL:
+      return *(uint8_t *)val == TSDB_DATA_BOOL_NULL;
+    case TSDB_DATA_TYPE_TINYINT:
+      return *(uint8_t *)val == TSDB_DATA_TINYINT_NULL;
+    case TSDB_DATA_TYPE_SMALLINT:
+      return *(uint16_t *)val == TSDB_DATA_SMALLINT_NULL;
+    case TSDB_DATA_TYPE_INT:
+      return *(uint32_t *)val == TSDB_DATA_INT_NULL;
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      return *(uint64_t *)val == TSDB_DATA_BIGINT_NULL;
+    case TSDB_DATA_TYPE_FLOAT:
+      return *(uint32_t *)val == TSDB_DATA_FLOAT_NULL;
+    case TSDB_DATA_TYPE_DOUBLE:
+      return *(uint64_t *)val == TSDB_DATA_DOUBLE_NULL;
+    case TSDB_DATA_TYPE_NCHAR:
+      return *(uint32_t*) varDataVal(val) == TSDB_DATA_NCHAR_NULL;
+    case TSDB_DATA_TYPE_BINARY:
+      return *(uint8_t *) varDataVal(val) == TSDB_DATA_BINARY_NULL;
+    default:
+      return false;
+  };
+}
+
+void setVardataNull(char* val, int32_t type);
+void setNull(char *val, int32_t type, int32_t bytes);
+void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems);
+void* getNullValue(int32_t type);
+
+void assignVal(char *val, const char *src, int32_t len, int32_t type);
+void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf);
+
+// TODO: check if below is necessary
+#define TSDB_RELATION_INVALID     0
+#define TSDB_RELATION_LESS        1
+#define TSDB_RELATION_GREATER     2
+#define TSDB_RELATION_EQUAL       3
+#define TSDB_RELATION_LESS_EQUAL  4
+#define TSDB_RELATION_GREATER_EQUAL 5
+#define TSDB_RELATION_NOT_EQUAL   6
+#define TSDB_RELATION_LIKE        7
+#define TSDB_RELATION_ISNULL      8
+#define TSDB_RELATION_NOTNULL     9
+#define TSDB_RELATION_IN          10
+
+#define TSDB_RELATION_AND         11
+#define TSDB_RELATION_OR          12
+#define TSDB_RELATION_NOT         13
+
+#define TSDB_BINARY_OP_ADD        30
+#define TSDB_BINARY_OP_SUBTRACT   31
+#define TSDB_BINARY_OP_MULTIPLY   32
+#define TSDB_BINARY_OP_DIVIDE     33
+#define TSDB_BINARY_OP_REMAINDER  34
+#define TS_PATH_DELIMITER_LEN     1
+
+#define TSDB_UNI_LEN              24
+#define TSDB_USER_LEN             TSDB_UNI_LEN
+
+// ACCOUNT is a 32 bit positive integer
+// this is the length of its string representation
+// including the terminator zero
+#define TSDB_ACCT_LEN             11
+#define TSDB_PASSWORD_LEN         TSDB_UNI_LEN
+
+#define TSDB_MAX_COLUMNS          1024
+#define TSDB_MIN_COLUMNS          2       //PRIMARY COLUMN(timestamp) + other columns
+
+#define TSDB_NODE_NAME_LEN        64
+#define TSDB_TABLE_NAME_LEN       193     // it is a null-terminated string
+#define TSDB_DB_NAME_LEN          33
+#define TSDB_TABLE_FNAME_LEN      (TSDB_ACCT_LEN + TSDB_DB_NAME_LEN + TSDB_TABLE_NAME_LEN)
+#define TSDB_COL_NAME_LEN         65
+#define TSDB_MAX_SAVED_SQL_LEN    TSDB_MAX_COLUMNS * 64
+#define TSDB_MAX_SQL_LEN          TSDB_PAYLOAD_SIZE
+#define TSDB_MAX_SQL_SHOW_LEN     256
+#define TSDB_MAX_ALLOWED_SQL_LEN  (1*1024*1024U)          // sql length should be less than 8mb
+
+#define TSDB_MAX_BYTES_PER_ROW    16384
+#define TSDB_MAX_TAGS_LEN         16384
+#define TSDB_MAX_TAGS             128
+#define TSDB_MAX_TAG_CONDITIONS   1024
+
+#define TSDB_AUTH_LEN             16
+#define TSDB_KEY_LEN              16
+#define TSDB_VERSION_LEN          12
+#define TSDB_STREET_LEN           64
+#define TSDB_CITY_LEN             20
+#define TSDB_STATE_LEN            20
+#define TSDB_COUNTRY_LEN          20
+#define TSDB_LOCALE_LEN           64
+#define TSDB_TIMEZONE_LEN         96
+#define TSDB_LABEL_LEN            8 
+
+#define TSDB_CLUSTER_ID_LEN       40
+#define TSDB_FQDN_LEN             128
+#define TSDB_EP_LEN               (TSDB_FQDN_LEN+6)
+#define TSDB_IPv4ADDR_LEN      	  16
+#define TSDB_FILENAME_LEN         128
+#define TSDB_METER_VNODE_BITS     20
+#define TSDB_METER_SID_MASK       0xFFFFF
+#define TSDB_SHELL_VNODE_BITS     24
+#define TSDB_SHELL_SID_MASK       0xFF
+#define TSDB_HTTP_TOKEN_LEN       20
+#define TSDB_SHOW_SQL_LEN         64
+#define TSDB_SLOW_QUERY_SQL_LEN   512
+
+#define TSDB_MQTT_HOSTNAME_LEN    64
+#define TSDB_MQTT_PORT_LEN        8
+#define TSDB_MQTT_USER_LEN        24
+#define TSDB_MQTT_PASS_LEN        24
+#define TSDB_MQTT_TOPIC_LEN       64
+#define TSDB_MQTT_CLIENT_ID_LEN   32
+
+#define TSDB_METER_STATE_OFFLINE  0
+#define TSDB_METER_STATE_ONLLINE  1
+
+#define TSDB_DEFAULT_PKT_SIZE     65480  //same as RPC_MAX_UDP_SIZE
+
+#define TSDB_PAYLOAD_SIZE         TSDB_DEFAULT_PKT_SIZE
+#define TSDB_DEFAULT_PAYLOAD_SIZE 5120   // default payload size, greater than PATH_MAX value
+#define TSDB_EXTRA_PAYLOAD_SIZE   128    // extra bytes for auth
+#define TSDB_CQ_SQL_SIZE          1024
+#define TSDB_MIN_VNODES           64
+#define TSDB_MAX_VNODES           2048
+#define TSDB_MIN_VNODES_PER_DB    2
+#define TSDB_MAX_VNODES_PER_DB    16
+
+#define TSDB_DNODE_ROLE_ANY       0
+#define TSDB_DNODE_ROLE_MGMT      1
+#define TSDB_DNODE_ROLE_VNODE     2
+
+#define TSDB_MAX_REPLICA          5
+
+#define TSDB_TBNAME_COLUMN_INDEX        (-1)
+#define TSDB_UD_COLUMN_INDEX            (-100)
+#define TSDB_MULTI_METERMETA_MAX_NUM    100000  // maximum batch size allowed to load metermeta
+
+#define TSDB_MIN_CACHE_BLOCK_SIZE       1
+#define TSDB_MAX_CACHE_BLOCK_SIZE       128     // 128MB for each vnode
+#define TSDB_DEFAULT_CACHE_BLOCK_SIZE   16
+
+#define TSDB_MIN_TOTAL_BLOCKS           3
+#define TSDB_MAX_TOTAL_BLOCKS           10000
+#define TSDB_DEFAULT_TOTAL_BLOCKS       6
+
+#define TSDB_MIN_TABLES                 4
+#define TSDB_MAX_TABLES                 10000000
+#define TSDB_DEFAULT_TABLES             1000000
+#define TSDB_TABLES_STEP                1000
+
+#define TSDB_MIN_DAYS_PER_FILE          1
+#define TSDB_MAX_DAYS_PER_FILE          3650 
+#define TSDB_DEFAULT_DAYS_PER_FILE      2 
+
+#define TSDB_MIN_KEEP                   1        // data in db to be reserved.
+#define TSDB_MAX_KEEP                   365000   // data in db to be reserved.
+#define TSDB_DEFAULT_KEEP               3650     // ten years
+
+#define TSDB_DEFAULT_MIN_ROW_FBLOCK     100
+#define TSDB_MIN_MIN_ROW_FBLOCK         10
+#define TSDB_MAX_MIN_ROW_FBLOCK         1000
+
+#define TSDB_DEFAULT_MAX_ROW_FBLOCK     4096
+#define TSDB_MIN_MAX_ROW_FBLOCK         200
+#define TSDB_MAX_MAX_ROW_FBLOCK         10000
+
+#define TSDB_MIN_COMMIT_TIME            30
+#define TSDB_MAX_COMMIT_TIME            40960
+#define TSDB_DEFAULT_COMMIT_TIME        3600
+
+#define TSDB_MIN_PRECISION              TSDB_TIME_PRECISION_MILLI
+#define TSDB_MAX_PRECISION              TSDB_TIME_PRECISION_NANO
+#define TSDB_DEFAULT_PRECISION          TSDB_TIME_PRECISION_MILLI
+
+#define TSDB_MIN_COMP_LEVEL             0
+#define TSDB_MAX_COMP_LEVEL             2
+#define TSDB_DEFAULT_COMP_LEVEL         2
+
+#define TSDB_MIN_WAL_LEVEL              1
+#define TSDB_MAX_WAL_LEVEL              2
+#define TSDB_DEFAULT_WAL_LEVEL          1
+
+#define TSDB_MIN_FSYNC_PERIOD           0
+#define TSDB_MAX_FSYNC_PERIOD           180000   // millisecond
+#define TSDB_DEFAULT_FSYNC_PERIOD       3000     // three second
+
+#define TSDB_MIN_DB_REPLICA_OPTION      1
+#define TSDB_MAX_DB_REPLICA_OPTION      3
+#define TSDB_DEFAULT_DB_REPLICA_OPTION  1
+#define TSDB_DEFAULT_DB_QUORUM_OPTION   1
+
+#define TSDB_MAX_JOIN_TABLE_NUM         5
+#define TSDB_MAX_UNION_CLAUSE           5
+
+#define TSDB_MAX_BINARY_LEN            (TSDB_MAX_BYTES_PER_ROW-TSDB_KEYSIZE)
+#define TSDB_MAX_NCHAR_LEN             (TSDB_MAX_BYTES_PER_ROW-TSDB_KEYSIZE)
+#define PRIMARYKEY_TIMESTAMP_COL_INDEX  0
+
+#define TSDB_MAX_RPC_THREADS            5
+
+#define TSDB_QUERY_TYPE_NON_TYPE                       0x00u     // none type
+#define TSDB_QUERY_TYPE_FREE_RESOURCE                  0x01u     // free qhandle at vnode
+
+/*
+ * 1. ordinary sub query for select * from super_table
+ * 2. all sqlobj generated by createSubqueryObj with this flag
+ */
+#define TSDB_QUERY_TYPE_SUBQUERY                       0x02u
+#define TSDB_QUERY_TYPE_STABLE_SUBQUERY                0x04u     // two-stage subquery for super table
+
+#define TSDB_QUERY_TYPE_TABLE_QUERY                    0x08u    // query ordinary table; below only apply to client side
+#define TSDB_QUERY_TYPE_STABLE_QUERY                   0x10u    // query on super table
+#define TSDB_QUERY_TYPE_JOIN_QUERY                     0x20u    // join query
+#define TSDB_QUERY_TYPE_PROJECTION_QUERY               0x40u    // select *,columns... query
+#define TSDB_QUERY_TYPE_JOIN_SEC_STAGE                 0x80u    // join sub query at the second stage
+
+#define TSDB_QUERY_TYPE_TAG_FILTER_QUERY              0x400u
+#define TSDB_QUERY_TYPE_INSERT                        0x100u    // insert type
+#define TSDB_QUERY_TYPE_MULTITABLE_QUERY              0x200u
+#define TSDB_QUERY_TYPE_STMT_INSERT                   0x800u    // stmt insert type
+
+#define TSDB_QUERY_HAS_TYPE(x, _type)         (((x) & (_type)) != 0)
+#define TSDB_QUERY_SET_TYPE(x, _type)         ((x) |= (_type))
+#define TSDB_QUERY_CLEAR_TYPE(x, _type)       ((x) &= (~_type))
+#define TSDB_QUERY_RESET_TYPE(x)              ((x) = TSDB_QUERY_TYPE_NON_TYPE)
+
+#define TSDB_ORDER_ASC   1
+#define TSDB_ORDER_DESC  2
+
+#define TSDB_DEFAULT_CLUSTER_HASH_SIZE  1
+#define TSDB_DEFAULT_MNODES_HASH_SIZE   5
+#define TSDB_DEFAULT_DNODES_HASH_SIZE   10
+#define TSDB_DEFAULT_ACCOUNTS_HASH_SIZE 10
+#define TSDB_DEFAULT_USERS_HASH_SIZE    20
+#define TSDB_DEFAULT_DBS_HASH_SIZE      100
+#define TSDB_DEFAULT_VGROUPS_HASH_SIZE  100
+#define TSDB_DEFAULT_STABLES_HASH_SIZE  100
+#define TSDB_DEFAULT_CTABLES_HASH_SIZE  20000
+
+#define TSDB_PORT_DNODESHELL 0 
+#define TSDB_PORT_DNODEDNODE 5 
+#define TSDB_PORT_SYNC       10 
+#define TSDB_PORT_HTTP       11 
+#define TSDB_PORT_ARBITRATOR 12 
+
+#define TAOS_QTYPE_RPC      0
+#define TAOS_QTYPE_FWD      1
+#define TAOS_QTYPE_WAL      2 
+#define TAOS_QTYPE_CQ       3
+#define TAOS_QTYPE_QUERY    4
+
+typedef enum {
+  TSDB_SUPER_TABLE        = 0,  // super table
+  TSDB_CHILD_TABLE        = 1,  // table created from super table
+  TSDB_NORMAL_TABLE       = 2,  // ordinary table
+  TSDB_STREAM_TABLE       = 3,  // table created from stream computing
+  TSDB_TABLE_MAX          = 4
+} ETableType;
+
+typedef enum {
+  TSDB_MOD_MNODE,
+  TSDB_MOD_HTTP,
+  TSDB_MOD_MONITOR,
+  TSDB_MOD_MQTT,
+  TSDB_MOD_MAX
+} EModuleType;
+
+  typedef enum {
+    TSDB_CHECK_ITEM_NETWORK,
+    TSDB_CHECK_ITEM_MEM,
+    TSDB_CHECK_ITEM_CPU,
+    TSDB_CHECK_ITEM_DISK,
+    TSDB_CHECK_ITEM_OS,    
+    TSDB_CHECK_ITEM_ACCESS,    
+    TSDB_CHECK_ITEM_VERSION,
+    TSDB_CHECK_ITEM_DATAFILE,
+    TSDB_CHECK_ITEM_MAX
+  } ECheckItemType;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index edf0ab24a169c0a24ab1f8e554e7c0282c92a47f..67e2d43c98c11a24e348b5102377367024fa0286 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -20,126 +20,337 @@
 extern "C" {
 #endif
 
-#define TSDB_CODE_SUCCESS                    0
-#define TSDB_CODE_ACTION_IN_PROGRESS         1
-
-#define TSDB_CODE_LAST_SESSION_NOT_FINISHED  5
-#define TSDB_CODE_INVALID_SESSION_ID         6
-#define TSDB_CODE_INVALID_TRAN_ID            7
-#define TSDB_CODE_INVALID_MSG_TYPE           8
-#define TSDB_CODE_ALREADY_PROCESSED          9
-#define TSDB_CODE_AUTH_FAILURE               10
-#define TSDB_CODE_WRONG_MSG_SIZE             11
-#define TSDB_CODE_UNEXPECTED_RESPONSE        12
-#define TSDB_CODE_INVALID_RESPONSE_TYPE      13
-#define TSDB_CODE_NO_RESOURCE                14
-#define TSDB_CODE_INVALID_TIME_STAMP         15
-#define TSDB_CODE_MISMATCHED_METER_ID        16
-#define TSDB_CODE_ACTION_TRANS_NOT_FINISHED  17
-#define TSDB_CODE_ACTION_NOT_ONLINE          18
-#define TSDB_CODE_ACTION_SEND_FAILD          19
-#define TSDB_CODE_NOT_ACTIVE_SESSION         20
-#define TSDB_CODE_INVALID_VNODE_ID           21
-#define TSDB_CODE_APP_ERROR                  22
-#define TSDB_CODE_INVALID_IE                 23
-#define TSDB_CODE_INVALID_VALUE              24
-#define TSDB_CODE_REDIRECT                   25
-#define TSDB_CODE_ALREADY_THERE              26
-#define TSDB_CODE_INVALID_METER_ID           27
-#define TSDB_CODE_INVALID_SQL                28
-#define TSDB_CODE_NETWORK_UNAVAIL            29
-#define TSDB_CODE_INVALID_MSG_LEN            30
-#define TSDB_CODE_INVALID_DB                 31
-#define TSDB_CODE_INVALID_TABLE              32
-#define TSDB_CODE_DB_ALREADY_EXIST           33
-#define TSDB_CODE_TABLE_ALREADY_EXIST        34
-#define TSDB_CODE_INVALID_USER               35
-#define TSDB_CODE_INVALID_ACCT               36
-#define TSDB_CODE_INVALID_PASS               37
-#define TSDB_CODE_DB_NOT_SELECTED            38
-#define TSDB_CODE_MEMORY_CORRUPTED           39
-#define TSDB_CODE_USER_ALREADY_EXIST         40
-#define TSDB_CODE_NO_RIGHTS                  41
-#define TSDB_CODE_DISCONNECTED               42
-#define TSDB_CODE_NO_MASTER                  43
-#define TSDB_CODE_NOT_CONFIGURED             44
-#define TSDB_CODE_INVALID_OPTION             45
-#define TSDB_CODE_NODE_OFFLINE               46
-#define TSDB_CODE_SYNC_REQUIRED              47
-#define TSDB_CODE_NO_ENOUGH_DNODES           48
-#define TSDB_CODE_UNSYNCED                   49
-#define TSDB_CODE_TOO_SLOW                   50
-#define TSDB_CODE_OTHERS                     51
-#define TSDB_CODE_NO_REMOVE_MASTER           52
-#define TSDB_CODE_WRONG_SCHEMA               53
-#define TSDB_CODE_NOT_ACTIVE_VNODE           54
-#define TSDB_CODE_TOO_MANY_USERS             55
-#define TSDB_CODE_TOO_MANY_DATABSES          56
-#define TSDB_CODE_TOO_MANY_TABLES            57
-#define TSDB_CODE_TOO_MANY_DNODES            58
-#define TSDB_CODE_TOO_MANY_ACCTS             59
-#define TSDB_CODE_ACCT_ALREADY_EXIST         60
-#define TSDB_CODE_DNODE_ALREADY_EXIST        61
-#define TSDB_CODE_SDB_ERROR                  62
-#define TSDB_CODE_METRICMETA_EXPIRED         63    // local cached metric-meta expired causes error in metric query
-#define TSDB_CODE_NOT_READY                  64    // peer is not ready to process data
-#define TSDB_CODE_MAX_SESSIONS               65    // too many sessions
-#define TSDB_CODE_MAX_CONNECTIONS            66    // too many connections
-#define TSDB_CODE_SESSION_ALREADY_EXIST      67
-#define TSDB_CODE_NO_QSUMMARY                68
-#define TSDB_CODE_SERV_OUT_OF_MEMORY         69
-#define TSDB_CODE_INVALID_QHANDLE            70
-#define TSDB_CODE_RELATED_TABLES_EXIST       71
-#define TSDB_CODE_MONITOR_DB_FORBEIDDEN      72
-#define TSDB_CODE_NO_DISK_PERMISSIONS        73
-#define TSDB_CODE_VG_INIT_FAILED             74
-#define TSDB_CODE_DATA_ALREADY_IMPORTED      75
-#define TSDB_CODE_OPS_NOT_SUPPORT            76
-#define TSDB_CODE_INVALID_QUERY_ID           77
-#define TSDB_CODE_INVALID_STREAM_ID          78
-#define TSDB_CODE_INVALID_CONNECTION         79
-#define TSDB_CODE_ACTION_NOT_BALANCED        80
-#define TSDB_CODE_CLI_OUT_OF_MEMORY          81
-#define TSDB_CODE_DATA_OVERFLOW              82
-#define TSDB_CODE_QUERY_CANCELLED            83
-#define TSDB_CODE_GRANT_TIMESERIES_LIMITED   84
-#define TSDB_CODE_GRANT_EXPIRED              85
-#define TSDB_CODE_CLI_NO_DISKSPACE           86
-#define TSDB_CODE_FILE_CORRUPTED             87
-#define TSDB_CODE_INVALID_CLIENT_VERSION     88
-#define TSDB_CODE_INVALID_ACCT_PARAMETER     89
-#define TSDB_CODE_NOT_ENOUGH_TIME_SERIES     90
-#define TSDB_CODE_NO_WRITE_ACCESS            91
-#define TSDB_CODE_NO_READ_ACCESS             92
-#define TSDB_CODE_GRANT_DB_LIMITED           93
-#define TSDB_CODE_GRANT_USER_LIMITED         94
-#define TSDB_CODE_GRANT_CONN_LIMITED         95
-#define TSDB_CODE_GRANT_STREAM_LIMITED       96
-#define TSDB_CODE_GRANT_SPEED_LIMITED        97
-#define TSDB_CODE_GRANT_STORAGE_LIMITED      98
-#define TSDB_CODE_GRANT_QUERYTIME_LIMITED    99
-#define TSDB_CODE_GRANT_ACCT_LIMITED         100
-#define TSDB_CODE_GRANT_DNODE_LIMITED        101
-#define TSDB_CODE_GRANT_CPU_LIMITED          102
-#define TSDB_CODE_SESSION_NOT_READY          103      // table NOT in ready state
-#define TSDB_CODE_BATCH_SIZE_TOO_BIG         104
-#define TSDB_CODE_TIMESTAMP_OUT_OF_RANGE     105
-#define TSDB_CODE_INVALID_QUERY_MSG          106      // failed to validate the sql expression msg by vnode
-#define TSDB_CODE_SORTED_RES_TOO_MANY        107      // too many result for ordered super table projection query
-#define TSDB_CODE_FILE_BLOCK_TS_DISORDERED   108      // time stamp in file block is disordered
-#define TSDB_CODE_INVALID_COMMIT_LOG         109      // commit log init failed
-#define TSDB_CODE_SERV_NO_DISKSPACE          110
-#define TSDB_CODE_NOT_SUPER_TABLE            111      // operation only available for super table
-#define TSDB_CODE_DUPLICATE_TAGS             112      // tags value for join not unique
-#define TSDB_CODE_INVALID_SUBMIT_MSG         113
-#define TSDB_CODE_NOT_ACTIVE_TABLE           114
-#define TSDB_CODE_INVALID_TABLE_ID           115
-#define TSDB_CODE_INVALID_VNODE_STATUS       116
-#define TSDB_CODE_FAILED_TO_LOCK_RESOURCES   117
-#define TSDB_CODE_TABLE_ID_MISMATCH          118
-#define TSDB_CODE_QUERY_CACHE_ERASED         119
-
-#define TSDB_CODE_MAX_ERROR_CODE             120
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef TAOS_ERROR_C
+#define TAOS_DEFINE_ERROR(name, mod, code, msg) {.val = (0x80000000 | ((mod)<<16) | (code)), .str=(msg)},
+#else
+#define TAOS_DEFINE_ERROR(name, mod, code, msg) static const int32_t name = (0x80000000 | ((mod)<<16) | (code));
+#endif
+ 
+#define TAOS_SYSTEM_ERROR(code)             (0x80ff0000 | (code))
+#define TAOS_SUCCEEDED(err)                 ((err) >= 0)
+#define TAOS_FAILED(err)                    ((err) < 0)
+
+const char* tstrerror(int32_t err);
+
+int32_t* taosGetErrno();
+#define terrno                              (*taosGetErrno())
+ 
+#define TSDB_CODE_SUCCESS                   0
+
+#ifdef TAOS_ERROR_C
+static STaosError errors[] = {
+    {.val = 0, .str = "success"},
+#endif
+
+// rpc
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_ACTION_IN_PROGRESS,       0, 0x0001, "Action in progress")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_AUTH_REQUIRED,            0, 0x0002, "Authentication required")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_AUTH_FAILURE,             0, 0x0003, "Authentication failure")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_REDIRECT,                 0, 0x0004, "Redirect")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_NOT_READY,                0, 0x0005, "System not ready")    // peer is not ready to process data
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_ALREADY_PROCESSED,        0, 0x0006, "Message already processed")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_LAST_SESSION_NOT_FINISHED,0, 0x0007, "Last session not finished")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_MISMATCHED_LINK_ID,       0, 0x0008, "Mismatched meter id")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_TOO_SLOW,                 0, 0x0009, "Processing of request timed out")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_MAX_SESSIONS,             0, 0x000A, "Number of sessions reached limit")    // too many sessions
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_NETWORK_UNAVAIL,          0, 0x000B, "Unable to establish connection")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_APP_ERROR,                0, 0x000C, "Unexpected generic error in RPC")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_UNEXPECTED_RESPONSE,      0, 0x000D, "Unexpected response")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_VALUE,            0, 0x000E, "Invalid value")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_TRAN_ID,          0, 0x000F, "Invalid transaction id")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_SESSION_ID,       0, 0x0010, "Invalid session id")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_MSG_TYPE,         0, 0x0011, "Invalid message type")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_RESPONSE_TYPE,    0, 0x0012, "Invalid response type")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_TIME_STAMP,       0, 0x0013, "Invalid timestamp")
+TAOS_DEFINE_ERROR(TSDB_CODE_APP_NOT_READY,                0, 0x0014, "Database not ready")
+TAOS_DEFINE_ERROR(TSDB_CODE_RPC_FQDN_ERROR,               0, 0x0015, "Unable to resolve FQDN")
+
+//common & util
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_OPS_NOT_SUPPORT,          0, 0x0100, "Operation not supported")
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_MEMORY_CORRUPTED,         0, 0x0101, "Memory corrupted")
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_OUT_OF_MEMORY,            0, 0x0102, "Out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_INVALID_CFG_MSG,          0, 0x0103, "Invalid config message")
+TAOS_DEFINE_ERROR(TSDB_CODE_COM_FILE_CORRUPTED,           0, 0x0104, "Data file corrupted")
+
+//client
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_SQL,              0, 0x0200, "Invalid SQL statement")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_QHANDLE,          0, 0x0201, "Invalid qhandle")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_TIME_STAMP,       0, 0x0202, "Invalid combination of client/service time")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_VALUE,            0, 0x0203, "Invalid value in client")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_VERSION,          0, 0x0204, "Invalid client version")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_IE,               0, 0x0205, "Invalid client ie")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_FQDN,             0, 0x0206, "Invalid host name")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_USER_LENGTH,      0, 0x0207, "Invalid user name")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_PASS_LENGTH,      0, 0x0208, "Invalid password")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_DB_LENGTH,        0, 0x0209, "Database name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH,  0, 0x020A, "Table name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_CONNECTION,       0, 0x020B, "Invalid connection")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_OUT_OF_MEMORY,            0, 0x020C, "System out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_DISKSPACE,             0, 0x020D, "System out of disk space")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_QUERY_CACHE_ERASED,       0, 0x020E, "Query cache erased")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_QUERY_CANCELLED,          0, 0x020F, "Query terminated")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_SORTED_RES_TOO_MANY,      0, 0x0210, "Result set too large to be sorted")      // too many result for ordered super table projection query
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_APP_ERROR,                0, 0x0211, "Application error")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_ACTION_IN_PROGRESS,       0, 0x0212, "Action in progress")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_DISCONNECTED,             0, 0x0213, "Disconnected from service")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_NO_WRITE_AUTH,            0, 0x0214, "No write permission")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_CONN_KILLED,              0, 0x0215, "Connection killed")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSC_SQL_SYNTAX_ERROR,         0, 0x0216, "Syntax errr in SQL")
+
+// mnode
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_MSG_NOT_PROCESSED,        0, 0x0300, "Message not processed")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_ACTION_IN_PROGRESS,       0, 0x0301, "Message is progressing")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_ACTION_NEED_REPROCESSED,  0, 0x0302, "Messag need to be reprocessed")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_RIGHTS,                0, 0x0303, "Insufficient privilege for operation")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_APP_ERROR,                0, 0x0304, "Unexpected generic error in mnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_CONNECTION,       0, 0x0305, "Invalid message connection")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_MSG_VERSION,      0, 0x0306, "Incompatible protocol version")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_MSG_LEN,          0, 0x0307, "Invalid message length")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_MSG_TYPE,         0, 0x0308, "Invalid message type")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_SHELL_CONNS,     0, 0x0309, "Too many connections")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_OUT_OF_MEMORY,            0, 0x030A, "Out of memory in mnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_SHOWOBJ,          0, 0x030B, "Data expired")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_QUERY_ID,         0, 0x030C, "Invalid query id")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_STREAM_ID,        0, 0x030D, "Invalid stream id")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_CONN_ID,          0, 0x030E, "Invalid connection id")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE,    0, 0x0320, "Object already there")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_ERROR,                0, 0x0321, "Unexpected generic error in sdb")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE,   0, 0x0322, "Invalid table type")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_OBJ_NOT_THERE,        0, 0x0323, "Object not there")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_INVAID_META_ROW,      0, 0x0324, "Invalid meta row")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_SDB_INVAID_KEY_TYPE,      0, 0x0325, "Invalid key type")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DNODE_ALREADY_EXIST,      0, 0x0330, "DNode already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DNODE_NOT_EXIST,          0, 0x0331, "DNode does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_NOT_EXIST,         0, 0x0332, "VGroup does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_REMOVE_MASTER,         0, 0x0333, "Master DNode cannot be removed")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_ENOUGH_DNODES,         0, 0x0334, "Out of DNodes")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_CLUSTER_CFG_INCONSISTENT, 0, 0x0335, "Cluster cfg inconsistent")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DNODE_CFG_OPTION, 0, 0x0336, "Invalid dnode cfg option")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_BALANCE_ENABLED,          0, 0x0337, "Balance already enabled")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_NOT_IN_DNODE,      0, 0x0338, "Vgroup not in dnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_VGROUP_ALREADY_IN_DNODE,  0, 0x0339, "Vgroup already in dnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DNODE_NOT_FREE,           0, 0x033A, "Dnode not avaliable")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_CLUSTER_ID,       0, 0x033B, "Cluster id not match")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NOT_READY,                0, 0x033C, "Cluster not ready")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_ACCT_ALREADY_EXIST,       0, 0x0340, "Account already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_ACCT,             0, 0x0341, "Invalid account")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_ACCT_OPTION,      0, 0x0342, "Invalid account options")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_ACCT_EXPIRED,             0, 0x0343, "Account authorization has expired")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_USER_ALREADY_EXIST,       0, 0x0350, "User already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_USER,             0, 0x0351, "Invalid user")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_USER_FORMAT,      0, 0x0352, "Invalid user format")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_PASS_FORMAT,      0, 0x0353, "Invalid password format")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_USER_FROM_CONN,        0, 0x0354, "Can not get user from conn")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_USERS,           0, 0x0355, "Too many users")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TABLE_ALREADY_EXIST,      0, 0x0360, "Table already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TABLE_ID,         0, 0x0361, "Table name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TABLE_NAME,       0, 0x0362, "Table does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TABLE_TYPE,       0, 0x0363, "Invalid table type in tsdb")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_TAGS,            0, 0x0364, "Too many tags")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_TIMESERIES,      0, 0x0366, "Too many time series")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_NOT_SUPER_TABLE,          0, 0x0367, "Not super table")           // operation only available for super table
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_COL_NAME_TOO_LONG,        0, 0x0368, "Tag name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TAG_ALREAY_EXIST,         0, 0x0369, "Tag already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TAG_NOT_EXIST,            0, 0x036A, "Tag does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_ALREAY_EXIST,       0, 0x036B, "Field already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_NOT_EXIST,          0, 0x036C, "Field does not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_STABLE_NAME,      0, 0x036D, "Super table does not exist")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_NOT_SELECTED,          0, 0x0380, "Database not specified or available")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_ALREADY_EXIST,         0, 0x0381, "Database already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB_OPTION,        0, 0x0382, "Invalid database options")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_DB,               0, 0x0383, "Invalid database name")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_MONITOR_DB_FORBIDDEN,     0, 0x0384, "Cannot delete monitor database")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOO_MANY_DATABASES,       0, 0x0385, "Too many databases for account")
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_DB_IN_DROPPING,           0, 0x0386, "Database not available")
+
+// dnode
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_MSG_NOT_PROCESSED,        0, 0x0400, "Message not processed")
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_OUT_OF_MEMORY,            0, 0x0401, "Dnode out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_NO_WRITE_ACCESS,          0, 0x0402, "No permission for disk files in dnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_INVALID_MSG_LEN,          0, 0x0403, "Invalid message length")
+
+// vnode 
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_ACTION_IN_PROGRESS,       0, 0x0500, "Action in progress")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_MSG_NOT_PROCESSED,        0, 0x0501, "Message not processed")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_ACTION_NEED_REPROCESSED,  0, 0x0502, "Action need to be reprocessed")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_INVALID_VGROUP_ID,        0, 0x0503, "Invalid Vgroup ID")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_INIT_FAILED,              0, 0x0504, "Vnode initialization failed")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_DISKSPACE,             0, 0x0505, "System out of disk space")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_DISK_PERMISSIONS,      0, 0x0506, "No write permission for disk files")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR,      0, 0x0507, "Missing data file")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_OUT_OF_MEMORY,            0, 0x0508, "Out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_APP_ERROR,                0, 0x0509, "Unexpected generic error in vnode")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_NOT_SYNCED,               0, 0x0511, "Database suspended")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_WRITE_AUTH,            0, 0x0512, "Write operation denied")
+
+// tsdb
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_TABLE_ID,         0, 0x0600, "Invalid table ID")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_TABLE_TYPE,       0, 0x0601, "Invalid table type")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION,    0, 0x0602, "Invalid table schema version")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TABLE_ALREADY_EXIST,      0, 0x0603, "Table already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_CONFIG,           0, 0x0604, "Invalid configuration")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INIT_FAILED,              0, 0x0605, "Tsdb init failed")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_DISKSPACE,             0, 0x0606, "No diskspace for tsdb")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_DISK_PERMISSIONS,      0, 0x0607, "No permission for disk files")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_FILE_CORRUPTED,           0, 0x0608, "Data file(s) corrupted")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_OUT_OF_MEMORY,            0, 0x0609, "Out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE,      0, 0x060A, "Tag too old")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE,   0, 0x060B, "Timestamp data out of range")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP,      0, 0x060C, "Submit message is messed up")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_ACTION,           0, 0x060D, "Invalid operation")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_CREATE_TB_MSG,    0, 0x060E, "Invalid creation of table")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_TABLE_DATA_IN_MEM,     0, 0x060F, "No table data in memory skiplist")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_FILE_ALREADY_EXISTS,      0, 0x0610, "File already exists")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TABLE_RECONFIGURE,        0, 0x0611, "Need to reconfigure table")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO,    0, 0x0612, "Invalid information to create table")
+
+// query
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_QHANDLE,          0, 0x0700, "Invalid handle")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_MSG,              0, 0x0701, "Invalid message")    // failed to validate the sql expression msg by vnode
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_NO_DISKSPACE,             0, 0x0702, "No diskspace for query")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_OUT_OF_MEMORY,            0, 0x0703, "System out of memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_APP_ERROR,                0, 0x0704, "Unexpected generic error in query")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_DUP_JOIN_KEY,             0, 0x0705, "Duplicated join key")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_EXCEED_TAGS_LIMIT,        0, 0x0706, "Tag conditon too many")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_NOT_READY,                0, 0x0707, "Query not ready")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_HAS_RSP,                  0, 0x0708, "Query should response")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_IN_EXEC,                  0, 0x0709, "Multiple retrieval of this query")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW,      0, 0x070A, "Too many time window in query")
+
+// grant
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED,                0, 0x0800, "License expired")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DNODE_LIMITED,          0, 0x0801, "DNode creation limited by licence")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_ACCT_LIMITED,           0, 0x0802, "Account creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_TIMESERIES_LIMITED,     0, 0x0803, "Table creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DB_LIMITED,             0, 0x0804, "DB creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_USER_LIMITED,           0, 0x0805, "User creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CONN_LIMITED,           0, 0x0806, "Conn creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STREAM_LIMITED,         0, 0x0807, "Stream creation limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_SPEED_LIMITED,          0, 0x0808, "Write speed limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STORAGE_LIMITED,        0, 0x0809, "Storage capacity limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_QUERYTIME_LIMITED,      0, 0x080A, "Query time limited by license")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CPU_LIMITED,            0, 0x080B, "CPU cores limited by license")
+
+// sync
+TAOS_DEFINE_ERROR(TSDB_CODE_SYN_INVALID_CONFIG,           0, 0x0900, "Invalid Sync Configuration")
+TAOS_DEFINE_ERROR(TSDB_CODE_SYN_NOT_ENABLED,              0, 0x0901, "Sync module not enabled")
+
+// wal
+TAOS_DEFINE_ERROR(TSDB_CODE_WAL_APP_ERROR,                0, 0x1000, "Unexpected generic error in wal")
+
+// http
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_SERVER_OFFLINE,          0, 0x1100, "http server is not onlin")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_UNSUPPORT_URL,           0, 0x1101, "url is not support")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVLALID_URL,            0, 0x1102, "invalid url format")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_NO_ENOUGH_MEMORY,        0, 0x1103, "no enough memory")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_REQUSET_TOO_BIG,         0, 0x1104, "request size is too big")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_NO_AUTH_INFO,            0, 0x1105, "no auth info input")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_NO_MSG_INPUT,            0, 0x1106, "request is empty")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_NO_SQL_INPUT,            0, 0x1107, "no sql input")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_NO_EXEC_USEDB,           0, 0x1108, "no need to execute use db cmd")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_SESSION_FULL,            0, 0x1109, "session list was full")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_GEN_TAOSD_TOKEN_ERR,     0, 0x110A, "generate taosd token error")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_MULTI_REQUEST,   0, 0x110B, "size of multi request is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_CREATE_GZIP_FAILED,      0, 0x110C, "failed to create gzip")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_FINISH_GZIP_FAILED,      0, 0x110D, "failed to finish gzip")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_LOGIN_FAILED,            0, 0x110E, "failed to login")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_VERSION,         0, 0x1120, "invalid http version")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_CONTENT_LENGTH,  0, 0x1121, "invalid content length")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_AUTH_TYPE,       0, 0x1122, "invalid type of Authorization")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_AUTH_FORMAT,     0, 0x1123, "invalid format of Authorization")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_BASIC_AUTH,      0, 0x1124, "invalid basic Authorization")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_INVALID_TAOSD_AUTH,      0, 0x1125, "invalid taosd Authorization")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_METHOD_FAILED,     0, 0x1126, "failed to parse method")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_TARGET_FAILED,     0, 0x1127, "failed to parse target")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_VERSION_FAILED,    0, 0x1128, "failed to parse http version")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_SP_FAILED,         0, 0x1129, "failed to parse sp")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_STATUS_FAILED,     0, 0x112A, "failed to parse status")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_PHRASE_FAILED,     0, 0x112B, "failed to parse phrase")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_CRLF_FAILED,       0, 0x112C, "failed to parse crlf")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_HEADER_FAILED,     0, 0x112D, "failed to parse header")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_HEADER_KEY_FAILED, 0, 0x112E, "failed to parse header key")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_HEADER_VAL_FAILED, 0, 0x112F, "failed to parse header val")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_CHUNK_SIZE_FAILED, 0, 0x1130, "failed to parse chunk size")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_CHUNK_FAILED,      0, 0x1131, "failed to parse chunk")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_END_FAILED,        0, 0x1132, "failed to parse end section")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_INVALID_STATE,     0, 0x1134, "invalid parse state")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_PARSE_ERROR_STATE,       0, 0x1135, "failed to parse error section")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_GC_QUERY_NULL,           0, 0x1150, "query size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_GC_QUERY_SIZE,           0, 0x1151, "query size can not more than 100")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_GC_REQ_PARSE_ERROR,      0, 0x1152, "parse grafana json error")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_DB_NOT_INPUT,         0, 0x1160, "database name can not be null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_DB_TOO_LONG,          0, 0x1161, "database name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_INVALID_JSON,         0, 0x1162, "invalid telegraf json fromat")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRICS_NULL,         0, 0x1163, "metrics size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRICS_SIZE,         0, 0x1164, "metrics size can not more than 1K")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRIC_NULL,          0, 0x1165, "metric name not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRIC_TYPE,          0, 0x1166, "metric name type should be string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRIC_NAME_NULL,     0, 0x1167, "metric name length is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_METRIC_NAME_LONG,     0, 0x1168, "metric name length too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TIMESTAMP_NULL,       0, 0x1169, "timestamp not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TIMESTAMP_TYPE,       0, 0x116A, "timestamp type should be integer")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TIMESTAMP_VAL_NULL,   0, 0x116B, "timestamp value smaller than 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAGS_NULL,            0, 0x116C, "tags not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAGS_SIZE_0,          0, 0x116D, "tags size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAGS_SIZE_LONG,       0, 0x116E, "tags size too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAG_NULL,             0, 0x116F, "tag is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAG_NAME_NULL,        0, 0x1170, "tag name is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAG_NAME_SIZE,        0, 0x1171, "tag name length too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAG_VALUE_TYPE,       0, 0x1172, "tag value type should be number or string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TAG_VALUE_NULL,       0, 0x1173, "tag value is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TABLE_NULL,           0, 0x1174, "table is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_TABLE_SIZE,           0, 0x1175, "table name length too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELDS_NULL,          0, 0x1176, "fields not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELDS_SIZE_0,        0, 0x1177, "fields size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELDS_SIZE_LONG,     0, 0x1178, "fields size too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELD_NULL,           0, 0x1179, "field is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELD_NAME_NULL,      0, 0x117A, "field name is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELD_NAME_SIZE,      0, 0x117B, "field name length too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELD_VALUE_TYPE,     0, 0x117C, "field value type should be number or string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_FIELD_VALUE_NULL,     0, 0x117D, "field value is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_HOST_NOT_STRING,      0, 0x117E, "host type should be string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_TG_STABLE_NOT_EXIST,     0, 0x117F, "stable not exist")
+
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_DB_NOT_INPUT,         0, 0x1190, "database name can not be null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_DB_TOO_LONG,          0, 0x1191, "database name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_INVALID_JSON,         0, 0x1192, "invalid opentsdb json fromat")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRICS_NULL,         0, 0x1193, "metrics size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRICS_SIZE,         0, 0x1194, "metrics size can not more than 10K")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRIC_NULL,          0, 0x1195, "metric name not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRIC_TYPE,          0, 0x1196, "metric name type should be string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRIC_NAME_NULL,     0, 0x1197, "metric name length is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_METRIC_NAME_LONG,     0, 0x1198, "metric name length can not more than 22")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TIMESTAMP_NULL,       0, 0x1199, "timestamp not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TIMESTAMP_TYPE,       0, 0x119A, "timestamp type should be integer")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TIMESTAMP_VAL_NULL,   0, 0x119B, "timestamp value smaller than 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAGS_NULL,            0, 0x119C, "tags not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAGS_SIZE_0,          0, 0x119D, "tags size is 0")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAGS_SIZE_LONG,       0, 0x119E, "tags size too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_NULL,             0, 0x119F, "tag is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_NAME_NULL,        0, 0x11A0, "tag name is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_NAME_SIZE,        0, 0x11A1, "tag name length too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_VALUE_TYPE,       0, 0x11A2, "tag value type should be boolean, number or string")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_VALUE_NULL,       0, 0x11A3, "tag value is null")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_TAG_VALUE_TOO_LONG,   0, 0x11A4, "tag value can not more than 64")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_VALUE_NULL,           0, 0x11A5, "value not find")
+TAOS_DEFINE_ERROR(TSDB_CODE_HTTP_OP_VALUE_TYPE,           0, 0x11A6, "value type should be boolean, number or string")
+
+#ifdef TAOS_ERROR_C
+};
+#endif
+
 
 #ifdef __cplusplus
 }
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 883906b617053af79dd7292246a315a5fe13f8b7..50b31a86ccd743b0e56c85e50628f9574bfc8c8e 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -20,127 +20,106 @@
 extern "C" {
 #endif
 
-#include "tsdb.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "taosdef.h"
 #include "taoserror.h"
+#include "trpc.h"
+#include "tdataformat.h"
 
 // message type
-#define TSDB_MSG_TYPE_REG              1
-#define TSDB_MSG_TYPE_REG_RSP          2
-#define TSDB_MSG_TYPE_SUBMIT           3
-#define TSDB_MSG_TYPE_SUBMIT_RSP       4
-#define TSDB_MSG_TYPE_NWCHANGE         5
-#define TSDB_MSG_TYPE_NWCHANGE_RSP     6
-#define TSDB_MSG_TYPE_DELIVER          7
-#define TSDB_MSG_TYPE_DELIVER_RSP      8
-
-#define TSDB_MSG_TYPE_CREATE           9
-#define TSDB_MSG_TYPE_CREATE_RSP       10
-#define TSDB_MSG_TYPE_REMOVE           11
-#define TSDB_MSG_TYPE_REMOVE_RSP       12
-#define TSDB_MSG_TYPE_VPEERS           13
-#define TSDB_MSG_TYPE_VPEERS_RSP       14
-#define TSDB_MSG_TYPE_FREE_VNODE       15
-#define TSDB_MSG_TYPE_FREE_VNODE_RSP   16
-#define TSDB_MSG_TYPE_VPEER_CFG        17
-#define TSDB_MSG_TYPE_VPEER_CFG_RSP    18
-#define TSDB_MSG_TYPE_METER_CFG        19
-#define TSDB_MSG_TYPE_METER_CFG_RSP    20
-
-#define TSDB_MSG_TYPE_VPEER_FWD        21
-#define TSDB_MSG_TYPE_VPEER_FWD_RSP    22
-#define TSDB_MSG_TYPE_SYNC             23
-#define TSDB_MSG_TYPE_SYNC_RSP         24
-
-#define TSDB_MSG_TYPE_INSERT           25
-#define TSDB_MSG_TYPE_INSERT_RSP       26
-#define TSDB_MSG_TYPE_QUERY            27
-#define TSDB_MSG_TYPE_QUERY_RSP        28
-#define TSDB_MSG_TYPE_RETRIEVE         29
-#define TSDB_MSG_TYPE_RETRIEVE_RSP     30
-
-#define TSDB_MSG_TYPE_CONNECT          31
-#define TSDB_MSG_TYPE_CONNECT_RSP      32
-#define TSDB_MSG_TYPE_CREATE_ACCT      33
-#define TSDB_MSG_TYPE_CREATE_ACCT_RSP  34
-#define TSDB_MSG_TYPE_CREATE_USER      35
-#define TSDB_MSG_TYPE_CREATE_USER_RSP  36
-#define TSDB_MSG_TYPE_DROP_ACCT        37
-#define TSDB_MSG_TYPE_DROP_ACCT_RSP    38
-#define TSDB_MSG_TYPE_DROP_USER        39
-#define TSDB_MSG_TYPE_DROP_USER_RSP    40
-#define TSDB_MSG_TYPE_ALTER_USER       41
-#define TSDB_MSG_TYPE_ALTER_USER_RSP   42
-#define TSDB_MSG_TYPE_CREATE_MNODE     43
-#define TSDB_MSG_TYPE_CREATE_MNODE_RSP 44
-#define TSDB_MSG_TYPE_DROP_MNODE       45
-#define TSDB_MSG_TYPE_DROP_MNODE_RSP   46
-#define TSDB_MSG_TYPE_CREATE_DNODE     47
-#define TSDB_MSG_TYPE_CREATE_DNODE_RSP 48
-#define TSDB_MSG_TYPE_DROP_DNODE       49
-#define TSDB_MSG_TYPE_DROP_DNODE_RSP   50
-#define TSDB_MSG_TYPE_CREATE_DB        51
-#define TSDB_MSG_TYPE_CREATE_DB_RSP    52
-#define TSDB_MSG_TYPE_DROP_DB          53
-#define TSDB_MSG_TYPE_DROP_DB_RSP      54
-#define TSDB_MSG_TYPE_USE_DB           55
-#define TSDB_MSG_TYPE_USE_DB_RSP       56
-#define TSDB_MSG_TYPE_CREATE_TABLE     57
-#define TSDB_MSG_TYPE_CREATE_TABLE_RSP 58
-
-#define TSDB_MSG_TYPE_DROP_TABLE       59
-#define TSDB_MSG_TYPE_DROP_TABLE_RSP   60
-#define TSDB_MSG_TYPE_METERINFO        61
-#define TSDB_MSG_TYPE_METERINFO_RSP    62
-#define TSDB_MSG_TYPE_METRIC_META      63
-#define TSDB_MSG_TYPE_METRIC_META_RSP  64
-#define TSDB_MSG_TYPE_SHOW             65
-#define TSDB_MSG_TYPE_SHOW_RSP         66
-
-#define TSDB_MSG_TYPE_FORWARD          67
-#define TSDB_MSG_TYPE_FORWARD_RSP      68
-
-#define TSDB_MSG_TYPE_CFG_PNODE        69
-#define TSDB_MSG_TYPE_CFG_PNODE_RSP    70
-#define TSDB_MSG_TYPE_CFG_MNODE        71
-#define TSDB_MSG_TYPE_CFG_MNODE_RSP    72
-
-#define TSDB_MSG_TYPE_KILL_QUERY       73
-#define TSDB_MSG_TYPE_KILL_QUERY_RSP   74
-#define TSDB_MSG_TYPE_KILL_STREAM      75
-#define TSDB_MSG_TYPE_KILL_STREAM_RSP  76
-#define TSDB_MSG_TYPE_KILL_CONNECTION  77
-#define TSDB_MSG_TYPE_KILL_CONNECTION_RSP 78
-
-#define TSDB_MSG_TYPE_ALTER_STREAM     79
-#define TSDB_MSG_TYPE_ALTER_STREAM_RSP 80
-#define TSDB_MSG_TYPE_ALTER_TABLE      81
-#define TSDB_MSG_TYPE_ALTER_TABLE_RSP  82
-#define TSDB_MSG_TYPE_ALTER_DB         83
-#define TSDB_MSG_TYPE_ALTER_DB_RSP     84
-
-#define TSDB_MSG_TYPE_MULTI_METERINFO  85
-#define TSDB_MSG_TYPE_MULTI_METERINFO_RSP 86
-
-#define TSDB_MSG_TYPE_HEARTBEAT        91
-#define TSDB_MSG_TYPE_HEARTBEAT_RSP    92
-#define TSDB_MSG_TYPE_STATUS           93
-#define TSDB_MSG_TYPE_STATUS_RSP       94
-#define TSDB_MSG_TYPE_GRANT            95
-#define TSDB_MSG_TYPE_GRANT_RSP        96
-
-#define TSDB_MSG_TYPE_ALTER_ACCT       97
-#define TSDB_MSG_TYPE_ALTER_ACCT_RSP   98
-
-#define TSDB_MSG_TYPE_MAX              101
+
+#ifdef TAOS_MESSAGE_C
+#define TAOS_DEFINE_MESSAGE_TYPE( name, msg ) msg, msg "-rsp",
+char *taosMsg[] = {
+  "null",
+#else
+#define TAOS_DEFINE_MESSAGE_TYPE( name, msg ) name, name##_RSP,
+enum {
+  TSDB_MESSAGE_NULL = 0,
+#endif
+
+// message from client to dnode
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_SUBMIT, "submit" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_QUERY, "query" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_FETCH, "fetch" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_UPDATE_TAG_VAL, "update-tag-val" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY1, "dummy1" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY2, "dummy2" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY3, "dummy3" )
+
+// message from mnode to dnode
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_CREATE_TABLE, "create-table" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_DROP_TABLE, "drop-table" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_ALTER_TABLE, "alter-table" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_CREATE_VNODE, "create-vnode" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_DROP_VNODE, "drop-vnode" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_DROP_STABLE, "drop-stable" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_ALTER_STREAM, "alter-stream" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_CONFIG_DNODE, "config-dnode" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_ALTER_VNODE, "alter-vnode" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY5, "dummy5" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY6, "dummy6" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY7, "dummy7" )
+
+// message from client to mnode
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CONNECT, "connect" )	 
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_ACCT, "create-acct" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_ACCT, "alter-acct" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_ACCT, "drop-acct" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_USER, "create-user" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_USER, "alter-user" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_USER, "drop-user" ) 
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_DNODE, "create-dnode" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_DNODE, "drop-dnode" )   
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_DB, "create-db" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_DB, "drop-db" )	  
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_USE_DB, "use-db" )	 
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_DB, "alter-db" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_TABLE, "create-table" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_TABLE, "drop-table" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_TABLE, "alter-table" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_TABLE_META, "table-meta" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_STABLE_VGROUP, "stable-vgroup" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_TABLES_META, "tables-meta" )	  
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_STREAM, "alter-stream" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_SHOW, "show" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_RETRIEVE, "retrieve" )     
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_KILL_QUERY, "kill-query" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_KILL_STREAM, "kill-stream" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_KILL_CONN, "kill-conn" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CONFIG_DNODE, "cm-config-dnode" ) 
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_HEARTBEAT, "heartbeat" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY8, "dummy8" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY9, "dummy9" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY10, "dummy10" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY11, "dummy11" )
+
+// message from dnode to mnode
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DM_CONFIG_TABLE, "config-table" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DM_CONFIG_VNODE, "config-vnode" )	
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DM_STATUS, "status" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DM_GRANT, "grant" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DM_AUTH, "auth" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY12, "dummy12" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY13, "dummy13" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY14, "dummy14" )
+
+#ifndef TAOS_MESSAGE_C
+  TSDB_MSG_TYPE_MAX  // 105
+#endif
+
+};
 
 // IE type
-#define TSDB_IE_TYPE_SEC               1
-#define TSDB_IE_TYPE_META              2
-#define TSDB_IE_TYPE_MGMT_IP           3
-#define TSDB_IE_TYPE_DNODE_CFG         4
-#define TSDB_IE_TYPE_NEW_VERSION       5
-#define TSDB_IE_TYPE_DNODE_EXT         6
-#define TSDB_IE_TYPE_DNODE_STATE       7
+#define TSDB_IE_TYPE_SEC 1
+#define TSDB_IE_TYPE_META 2
+#define TSDB_IE_TYPE_MGMT_IP 3
+#define TSDB_IE_TYPE_DNODE_CFG 4
+#define TSDB_IE_TYPE_NEW_VERSION 5
+#define TSDB_IE_TYPE_DNODE_EXT 6
+#define TSDB_IE_TYPE_DNODE_STATE 7
 
 enum _mgmt_table {
   TSDB_MGMT_TABLE_ACCT,
@@ -154,206 +133,190 @@ enum _mgmt_table {
   TSDB_MGMT_TABLE_MODULE,
   TSDB_MGMT_TABLE_QUERIES,
   TSDB_MGMT_TABLE_STREAMS,
-  TSDB_MGMT_TABLE_CONFIGS,
+  TSDB_MGMT_TABLE_VARIABLES,
   TSDB_MGMT_TABLE_CONNS,
   TSDB_MGMT_TABLE_SCORES,
   TSDB_MGMT_TABLE_GRANTS,
   TSDB_MGMT_TABLE_VNODES,
+  TSDB_MGMT_TABLE_STREAMTABLES,
+  TSDB_MGMT_TABLE_CLUSTER,
   TSDB_MGMT_TABLE_MAX,
 };
 
-#define TSDB_ALTER_TABLE_ADD_TAG_COLUMN     1
-#define TSDB_ALTER_TABLE_DROP_TAG_COLUMN    2
-#define TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN  3
-#define TSDB_ALTER_TABLE_UPDATE_TAG_VAL     4
+#define TSDB_ALTER_TABLE_ADD_TAG_COLUMN    1
+#define TSDB_ALTER_TABLE_DROP_TAG_COLUMN   2
+#define TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN 3
+#define TSDB_ALTER_TABLE_UPDATE_TAG_VAL    4
 
-#define TSDB_ALTER_TABLE_ADD_COLUMN         5
-#define TSDB_ALTER_TABLE_DROP_COLUMN        6
+#define TSDB_ALTER_TABLE_ADD_COLUMN        5
+#define TSDB_ALTER_TABLE_DROP_COLUMN       6
+#define TSDB_ALTER_TABLE_CHANGE_COLUMN     7
 
-#define TSDB_INTERPO_NONE              0
-#define TSDB_INTERPO_NULL              1
-#define TSDB_INTERPO_SET_VALUE         2
-#define TSDB_INTERPO_LINEAR            3
-#define TSDB_INTERPO_PREV              4
+#define TSDB_FILL_NONE      0
+#define TSDB_FILL_NULL      1
+#define TSDB_FILL_SET_VALUE 2
+#define TSDB_FILL_LINEAR    3
+#define TSDB_FILL_PREV      4
 
-#define TSDB_ALTER_USER_PASSWD         0x1
-#define TSDB_ALTER_USER_PRIVILEGES     0x2
+#define TSDB_ALTER_USER_PASSWD 0x1
+#define TSDB_ALTER_USER_PRIVILEGES 0x2
 
-#define TSDB_KILL_MSG_LEN              30
+#define TSDB_KILL_MSG_LEN 30
 
-#define TSDB_METER_METRIC              0  // metric
-#define TSDB_METER_MTABLE              1  // table created from metric
-#define TSDB_METER_OTABLE              2  // ordinary table
-#define TSDB_METER_STABLE              3  // table created from stream computing
-#define TSDB_MAX_METER_TYPES           4
-
-#define TSDB_VN_READ_ACCCESS  ((char)0x1)
+#define TSDB_VN_READ_ACCCESS ((char)0x1)
 #define TSDB_VN_WRITE_ACCCESS ((char)0x2)
 #define TSDB_VN_ALL_ACCCESS (TSDB_VN_READ_ACCCESS | TSDB_VN_WRITE_ACCCESS)
 
-#define TSDB_COL_NORMAL                0x0U
-#define TSDB_COL_TAG                   0x1U
-#define TSDB_COL_JOIN                  0x2U
-
-extern char *taosMsg[];
-extern char *tsError[];
+#define TSDB_COL_NORMAL          0x0u    // the normal column of the table
+#define TSDB_COL_TAG             0x1u    // the tag column type
+#define TSDB_COL_UDC             0x2u    // the user specified normal string column, it is a dummy column
+#define TSDB_COL_NULL            0x4u    // the column filter NULL or not
 
-#pragma pack(push, 1)
+#define TSDB_COL_IS_TAG(f)    (((f&(~(TSDB_COL_NULL)))&TSDB_COL_TAG) != 0)
+#define TSDB_COL_IS_NORMAL_COL(f)    ((f&(~(TSDB_COL_NULL))) == TSDB_COL_NORMAL)
+#define TSDB_COL_IS_UD_COL(f)   ((f&(~(TSDB_COL_NULL))) == TSDB_COL_UDC)
+#define TSDB_COL_REQ_NULL(f) (((f)&TSDB_COL_NULL) != 0)
 
-typedef struct {
-  char     numOfIps;
-  uint32_t ip[];
-} SIpList;
-
-typedef struct {
-  char     numOfIps;
-  uint32_t ip[TSDB_MAX_MGMT_IPS];
-} SMgmtIpList;
 
-typedef struct {
-  char     version : 4;
-  char     comp : 4;
-  char     tcp : 2;
-  char     spi : 3;
-  char     encrypt : 3;
-  uint16_t tranId;
-  uint32_t uid;  // for unique ID inside a client
-  uint32_t sourceId;
-
-  // internal part
-  uint32_t destId;
-  uint32_t destIp;
-  char     meterId[TSDB_UNI_LEN];
-  uint16_t port;  // for UDP only
-  char     empty[1];
-  uint8_t  msgType;
-  int32_t  msgLen;
-  uint8_t  content[0];
-} STaosHeader;
-
-typedef struct {
-  uint32_t timeStamp;
-  uint8_t  auth[TSDB_AUTH_LEN];
-} STaosDigest;
-
-typedef struct {
-  unsigned char code;
-  char          more[];
-} STaosRsp, SMsgReply;
+extern char *taosMsg[];
 
-typedef struct {
-  uint32_t customerId;
-  uint32_t osId;
-  uint32_t appId;
-  char     hwId[TSDB_UNI_LEN];
-  char     hwVersion[TSDB_VERSION_LEN];
-  char     osVersion[TSDB_VERSION_LEN];
-  char     appVersion[TSDB_VERSION_LEN];
-  char     sdkVersion[TSDB_VERSION_LEN];
-  char     name[TSDB_UNI_LEN];
-  char     street[TSDB_STREET_LEN];
-  char     city[TSDB_CITY_LEN];
-  char     state[TSDB_STATE_LEN];
-  char     country[TSDB_COUNTRY_LEN];
-  uint32_t longitude;
-  uint32_t latitude;
-} SRegMsg;
+#pragma pack(push, 1)
 
 typedef struct {
-  short numOfRows;
-  char  payLoad[];
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+} SEpAddr;
+
+typedef struct {
+  int32_t numOfVnodes;
+} SMsgDesc;
+
+typedef struct SMsgHead {
+  int32_t contLen;
+  int32_t vgId;
+} SMsgHead;
+
+// Submit message for one table
+typedef struct SSubmitBlk {
+  uint64_t uid;        // table unique id
+  int32_t  tid;        // table id
+  int32_t  padding;    // TODO just for padding here
+  int32_t  sversion;   // data schema version
+  int32_t  dataLen;    // data part length, not including the SSubmitBlk head
+  int32_t  schemaLen;  // schema length, if length is 0, no schema exists
+  int16_t  numOfRows;  // total number of rows in current submit block
+  char     data[];
+} SSubmitBlk;
+
+// Submit message for this TSDB
+typedef struct SSubmitMsg {
+  SMsgHead   header;
+  int32_t    length;
+  int32_t    numOfBlocks;
+  char       blocks[];
 } SSubmitMsg;
 
 typedef struct {
-  int32_t  sid;
-  int32_t  sversion;
-  uint64_t uid;
-  short    numOfRows;
-  char     payLoad[];
-} SShellSubmitBlock;
+  int32_t index;  // index of failed block in submit blocks
+  int32_t vnode;  // vnode index of failed block
+  int32_t sid;    // table index of failed block
+  int32_t code;   // errorcode while write data to vnode, such as not created, dropped, no space, invalid table
+} SShellSubmitRspBlock;
 
 typedef struct {
-  short   import;
-  short   vnode;
-  int32_t numOfSid; /* total number of sid */
-  char    blks[];   /* numOfSid blocks, each blocks for one meter */
-} SShellSubmitMsg;
+  int32_t              code;          // 0-success, > 0 error code
+  int32_t              numOfRows;     // number of records the client is trying to write
+  int32_t              affectedRows;  // number of records actually written
+  int32_t              failedRows;    // number of failed records (exclude duplicate records)
+  int32_t              numOfFailedBlocks;
+  SShellSubmitRspBlock failedBlocks[];
+} SShellSubmitRspMsg;
 
 typedef struct SSchema {
-  uint8_t  type;
-  char  name[TSDB_COL_NAME_LEN];
-  short colId;
-  short bytes;
+  uint8_t type;
+  char    name[TSDB_COL_NAME_LEN];
+  int16_t colId;
+  int16_t bytes;
 } SSchema;
 
-typedef struct SMColumn {
-  char  type;
-  short colId;
-  short bytes;
-} SMColumn;
-
 typedef struct {
-  short    vnode;
+  int32_t  contLen;
+  int32_t  vgId;
+  int8_t   tableType;
+  int16_t  numOfColumns;
+  int16_t  numOfTags;
   int32_t  sid;
-  uint64_t uid;
-  char     spi;
-  char     encrypt;
-  char     meterId[TSDB_METER_ID_LEN];
-  char     secret[TSDB_KEY_LEN];
-  char     cipheringKey[TSDB_KEY_LEN];
-  uint64_t timeStamp;
-  uint64_t lastCreate;
-  short    numOfColumns;
-  short    sqlLen;  // SQL string is after schema
-  char     reserved[16];
   int32_t  sversion;
-  SMColumn schema[];
-} SCreateMsg;
-
-typedef struct {
-  char  db[TSDB_METER_ID_LEN];
-  uint8_t ignoreNotExists;
-} SDropDbMsg, SUseDbMsg;
-
-typedef struct {
-  char user[TSDB_USER_LEN];
-} SDropUserMsg, SDropAcctMsg;
+  int32_t  tversion;
+  int32_t  tagDataLen;
+  int32_t  sqlDataLen;
+  uint64_t uid;
+  uint64_t superTableUid;
+  uint64_t createdTime;
+  char     tableId[TSDB_TABLE_FNAME_LEN];
+  char     superTableId[TSDB_TABLE_FNAME_LEN];
+  char     data[];
+} SMDCreateTableMsg;
+
+typedef struct {
+  char    tableId[TSDB_TABLE_FNAME_LEN];
+  char    db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  int8_t  igExists;
+  int8_t  getMeta;
+  int16_t numOfTags;
+  int16_t numOfColumns;
+  int16_t sqlLen;  // the length of SQL, it starts after schema , sql is a null-terminated string
+  int32_t contLen;
+  int8_t  reserved[16];
+  char    schema[];
+} SCMCreateTableMsg;
 
 typedef struct {
-  char db[TSDB_DB_NAME_LEN];
-} SShowTableMsg;
+  char   tableId[TSDB_TABLE_FNAME_LEN];
+  int8_t igNotExists;
+} SCMDropTableMsg;
 
 typedef struct {
-  char meterId[TSDB_METER_ID_LEN];
-  char igExists;
-
-  short numOfTags;
-
-  short numOfColumns;
-  short sqlLen;  // the length of SQL, it starts after schema , sql is a
-  // null-terminated string
-  char reserved[16];
-
+  char    tableId[TSDB_TABLE_FNAME_LEN];
+  char    db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  int16_t type; /* operation type   */
+  int16_t numOfCols; /* number of schema */
+  int32_t tagValLen;
   SSchema schema[];
-} SCreateTableMsg;
+  // tagVal is padded after schema
+  // char    tagVal[];
+} SCMAlterTableMsg;
 
 typedef struct {
-  char meterId[TSDB_METER_ID_LEN];
-  char igNotExists;
-} SDropTableMsg;
+  SMsgHead  head;
+  int64_t   uid;
+  int32_t   tid;
+  int16_t   tversion;
+  int16_t   colId;
+  int8_t    type;
+  int16_t   bytes;
+  int32_t   tagValLen;
+  int16_t   numOfTags;
+  int32_t   schemaLen;
+  char      data[];
+} SUpdateTableTagValMsg;
 
 typedef struct {
-  char    meterId[TSDB_METER_ID_LEN];
-  short   type; /* operation type   */
-  char    tagVal[TSDB_MAX_BYTES_PER_ROW];
-  short   numOfCols; /* number of schema */
-  SSchema schema[];
-} SAlterTableMsg;
+  char clientVersion[TSDB_VERSION_LEN];
+  char msgVersion[TSDB_VERSION_LEN];
+  char db[TSDB_TABLE_FNAME_LEN];
+} SCMConnectMsg;
 
 typedef struct {
-  char clientVersion[TSDB_VERSION_LEN];
-  char db[TSDB_METER_ID_LEN];
-} SConnectMsg;
+  char      acctId[TSDB_ACCT_LEN];
+  char      serverVersion[TSDB_VERSION_LEN];
+  int8_t    writeAuth;
+  int8_t    superAuth;
+  int8_t    reserved1;
+  int8_t    reserved2;
+  int32_t   connId;
+  SRpcEpSet epSet;
+} SCMConnectRsp;
 
 typedef struct {
   int32_t maxUsers;
@@ -366,66 +329,59 @@ typedef struct {
   int64_t maxQueryTime;  // In unit of hour
   int64_t maxInbound;
   int64_t maxOutbound;
-  char    accessState;  // Configured only by command
+  int8_t  accessState;  // Configured only by command
 } SAcctCfg;
 
 typedef struct {
   char     user[TSDB_USER_LEN];
   char     pass[TSDB_KEY_LEN];
   SAcctCfg cfg;
-} SCreateAcctMsg, SAlterAcctMsg;
+} SCMCreateAcctMsg, SCMAlterAcctMsg;
 
 typedef struct {
   char user[TSDB_USER_LEN];
-  char pass[TSDB_KEY_LEN];
-  char privilege;
-  char flag;
-} SCreateUserMsg, SAlterUserMsg;
+} SCMDropUserMsg, SCMDropAcctMsg;
 
 typedef struct {
-  char db[TSDB_METER_ID_LEN];
-} SMgmtHead;
+  char   user[TSDB_USER_LEN];
+  char   pass[TSDB_KEY_LEN];
+  int8_t privilege;
+  int8_t flag;
+} SCMCreateUserMsg, SCMAlterUserMsg;
 
 typedef struct {
-  char acctId[TSDB_ACCT_LEN];
-  char version[TSDB_VERSION_LEN];
-  char writeAuth;
-  char superAuth;
-} SConnectRsp;
+  int32_t  contLen;
+  int32_t  vgId;
+  int32_t  sid;
+  uint64_t uid;
+  char     tableId[TSDB_TABLE_FNAME_LEN];
+} SMDDropTableMsg;
 
 typedef struct {
-  short    vnode;
-  int32_t  sid;
+  int32_t  contLen;
+  int32_t  vgId;
   uint64_t uid;
-  char     meterId[TSDB_METER_ID_LEN];
-} SRemoveMeterMsg;
+  char    tableId[TSDB_TABLE_FNAME_LEN];
+} SMDDropSTableMsg;
 
 typedef struct {
-  short vnode;
-} SFreeVnodeMsg;
+  int32_t vgId;
+} SMDDropVnodeMsg;
 
-typedef struct SColIndexEx {
-  int16_t colId;
-  /*
-   * colIdx is the index of column in latest schema of table
-   * it is available in the client side. Also used to determine
-   * whether current meter schema is up-to-date.
-   *
-   * colIdxInBuf is used to denote the index of column in pQuery->colList,
-   * this value is invalid in client side, as well as in cache block of vnode either.
-   */
-  int16_t  colIdx;
-  int16_t  colIdxInBuf;
-  uint16_t flag;         // denote if it is a tag or not
-} SColIndexEx;
+typedef struct SColIndex {
+  int16_t  colId;      // column id
+  int16_t  colIndex;   // column index in colList if it is a normal column or index in tagColList if a tag
+  uint16_t flag;       // denote if it is a tag or a normal column
+  char     name[TSDB_COL_NAME_LEN];
+} SColIndex;
 
 /* sql function msg, to describe the message to vnode about sql function
  * operations in select clause */
-typedef struct SSqlFuncExprMsg {
+typedef struct SSqlFuncMsg {
   int16_t functionId;
   int16_t numOfParams;
 
-  SColIndexEx colInfo;
+  SColIndex colInfo;
   struct ArgElem {
     int16_t argType;
     int16_t argBytes;
@@ -435,26 +391,20 @@ typedef struct SSqlFuncExprMsg {
       char *  pz;
     } argValue;
   } arg[3];
-} SSqlFuncExprMsg;
-
-typedef struct SSqlBinaryExprInfo {
-  struct tSQLBinaryExpr *pBinExpr;    /*  for binary expression */
-  int32_t                numOfCols;   /*  binary expression involves the readed number of columns*/
-  SColIndexEx *          pReqColumns; /*  source column list */
-} SSqlBinaryExprInfo;
-
-typedef struct SSqlFunctionExpr {
-  SSqlFuncExprMsg    pBase;
-  SSqlBinaryExprInfo pBinExprInfo;
-  int16_t            resBytes;
-  int16_t            resType;
-  int16_t            interResBytes;
-} SSqlFunctionExpr;
+} SSqlFuncMsg;
+
+typedef struct SExprInfo {
+  SSqlFuncMsg base;
+  struct tExprNode* pExpr;
+  int16_t     bytes;
+  int16_t     type;
+  int32_t     interBytes;
+} SExprInfo;
 
 typedef struct SColumnFilterInfo {
   int16_t lowerRelOptr;
   int16_t upperRelOptr;
-  int16_t filterOnBinary; /* denote if current column is binary   */
+  int16_t filterstr;   // denote if current column is char(binary/nchar)
 
   union {
     struct {
@@ -481,154 +431,112 @@ typedef struct SColumnInfo {
   int16_t            type;
   int16_t            bytes;
   int16_t            numOfFilters;
-  SColumnFilterInfo *filters;
+  union{
+    int64_t placeholder;
+    SColumnFilterInfo *filters;
+  };
 } SColumnInfo;
 
-/*
- * enable vnode to understand how to group several tables with different tag;
- */
-typedef struct SMeterSidExtInfo {
-  int32_t sid;
-  int64_t uid;
-  TSKEY   key;   // key for subscription
-  char    tags[];
-} SMeterSidExtInfo;
+typedef struct STableIdInfo {
+  uint64_t uid;
+  int32_t  tid;
+  TSKEY    key;  // last accessed ts, for subscription
+} STableIdInfo;
+
+typedef struct STimeWindow {
+  TSKEY skey;
+  TSKEY ekey;
+} STimeWindow;
 
 /*
  * the outputCols is equalled to or larger than numOfCols
- * e.g., select min(colName), max(colName), avg(colName) from meter_name
+ * e.g., select min(colName), max(colName), avg(colName) from table
  * the outputCols will be 3 while the numOfCols is 1.
  */
 typedef struct {
-  int16_t  vnode;
-  int32_t  numOfSids;
-  uint64_t pSidExtInfo;  // meter id & tag info ptr, in windows pointer may
-
-  uint64_t uid;
-  TSKEY    skey;
-  TSKEY    ekey;
-
-  int16_t order;
-  int16_t orderColId;
-
-  int16_t numOfCols;         // the number of columns will be load from vnode
-  char    intervalTimeUnit;  // time interval type, for revisement of interval(1d)
-
-  int64_t nAggTimeInterval;  // time interval for aggregation, in million second
-  int64_t slidingTime;       // value for sliding window
-  
-  // tag schema, used to parse tag information in pSidExtInfo
-  uint64_t pTagSchema;
-
-  int16_t numOfTagsCols;  // required number of tags
-  int16_t tagLength;      // tag length in current query
-
-  int16_t  numOfGroupCols;  // num of group by columns
-  int16_t  orderByIdx;
-  int16_t  orderType;  // used in group by xx order by xxx
-  uint64_t groupbyTagIds;
-
-  int64_t limit;
-  int64_t offset;
-
-  int16_t queryType;        // denote another query process
-  int16_t numOfOutputCols;  // final output columns numbers
-
-  int16_t  interpoType;  // interpolate type
-  uint64_t defaultVal;   // default value array list
-
-  int32_t colNameLen;
-  int64_t colNameList;
-
-  int64_t pSqlFuncExprs;
-
+  SMsgHead    head;
+  STimeWindow window;
+  int32_t     numOfTables;
+  int16_t     order;
+  int16_t     orderColId;
+  int16_t     numOfCols;        // the number of columns will be load from vnode
+  SInterval   interval;
+  uint16_t    tagCondLen;       // tag length in current query
+  int16_t     numOfGroupCols;   // num of group by columns
+  int16_t     orderByIdx;
+  int16_t     orderType;        // used in group by xx order by xxx
+  int64_t     limit;
+  int64_t     offset;
+  uint32_t    queryType;        // denote another query process
+  int16_t     numOfOutput;  // final output columns numbers
+  int16_t     tagNameRelType;   // relation of tag criteria and tbname criteria
+  int16_t     fillType;      // interpolate type
+  uint64_t    fillVal;       // default value array list
   int32_t     tsOffset;       // offset value in current msg body, NOTE: ts list is compressed
   int32_t     tsLen;          // total length of ts comp block
   int32_t     tsNumOfBlocks;  // ts comp block numbers
   int32_t     tsOrder;        // ts comp block order
+  int32_t     numOfTags;      // number of tags columns involved
   SColumnInfo colList[];
-} SQueryMeterMsg;
+} SQueryTableMsg;
 
 typedef struct {
-  char     code;
-  uint64_t qhandle;
-} SQueryMeterRsp;
-
-typedef struct {
-  TSKEY   skey;
-  TSKEY   ekey;
-  int32_t num;
-  short   order;
-  short   numOfCols;
-  short   colList[];
-} SQueryMsg;
+  int32_t  code;
+  uint64_t qhandle; // query handle
+} SQueryTableRsp;
 
 typedef struct {
+  SMsgHead header;
   uint64_t qhandle;
   uint16_t free;
-} SRetrieveMeterMsg;
+} SRetrieveTableMsg;
 
-typedef struct {
+typedef struct SRetrieveTableRsp {
   int32_t numOfRows;
+  int8_t  completed;  // all results are returned to client
   int16_t precision;
-  int64_t offset;  // updated offset value for multi-vnode projection query
+  int64_t offset;     // updated offset value for multi-vnode projection query
   int64_t useconds;
   char    data[];
-} SRetrieveMeterRsp;
-
-typedef struct {
-  uint32_t vnode;
-  uint32_t vgId;
-  uint8_t  status;
-  uint8_t  dropStatus;
-  uint8_t  accessState;
-  int64_t  totalStorage;
-  int64_t  compStorage;
-  int64_t  pointsWritten;
-  uint8_t  syncStatus;
-  uint8_t  reserved[15];
+} SRetrieveTableRsp;
+
+typedef struct {
+  int32_t vgId;
+  int32_t cfgVersion;
+  int64_t totalStorage;
+  int64_t compStorage;
+  int64_t pointsWritten;
+  uint8_t status;
+  uint8_t role;
+  uint8_t replica;
+  uint8_t reserved[5];
 } SVnodeLoad;
 
 typedef struct {
-  uint32_t vnode;
-  char     accessState;
-} SVnodeAccess;
-
-// NOTE: sizeof(SVnodeCfg) < TSDB_FILE_HEADER_LEN/4
-typedef struct {
-  char     acct[TSDB_USER_LEN];
-  /*
-   * the message is too large, so it may will overwrite the cfg information in meterobj.v*
-   * recover to origin codes
-   */
-  //char     db[TSDB_METER_ID_LEN+2]; // 8bytes align
-  char     db[TSDB_DB_NAME_LEN];
-  uint32_t vgId;
-  int32_t  maxSessions;
-  int32_t  cacheBlockSize;
-  union {
-    int32_t totalBlocks;
-    float   fraction;
-  } cacheNumOfBlocks;
-  int32_t daysPerFile;
-
-  int32_t daysToKeep1;
-  int32_t daysToKeep2;
-  int32_t daysToKeep;
-
-  int32_t commitTime;
-  int32_t rowsInFileBlock;
-  int16_t blocksPerMeter;
-  char    compression;
-  char    commitLog;
-  char    replications;
-
-  char repStrategy;
-  char loadLatest;  // load into mem or not
-  uint8_t precision;   // time resolution
-
-  char reserved[16];
-} SVnodeCfg, SCreateDbMsg, SDbCfg, SAlterDbMsg;
+  char     db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  int32_t  cacheBlockSize; //MB
+  int32_t  totalBlocks;
+  int32_t  maxTables;
+  int32_t  daysPerFile;
+  int32_t  daysToKeep;
+  int32_t  daysToKeep1;
+  int32_t  daysToKeep2;
+  int32_t  minRowsPerFileBlock;
+  int32_t  maxRowsPerFileBlock;
+  int32_t  commitTime;
+  int32_t  fsyncPeriod;
+  uint8_t  precision;   // time resolution
+  int8_t   compression;
+  int8_t   walLevel;
+  int8_t   replications;
+  int8_t   quorum;
+  int8_t   ignoreExist;
+} SCMCreateDbMsg, SCMAlterDbMsg;
+
+typedef struct {
+  char    db[TSDB_TABLE_FNAME_LEN];
+  uint8_t ignoreNotExists;
+} SCMDropDbMsg, SCMUseDbMsg;
 
 // IMPORTANT: sizeof(SVnodeStatisticInfo) should not exceed
 // TSDB_FILE_HEADER_LEN/4 - TSDB_FILE_HEADER_VERSION_SIZE
@@ -641,136 +549,153 @@ typedef struct {
 } SVnodeStatisticInfo;
 
 typedef struct {
-  uint32_t   version;
-  uint32_t   publicIp;
-  uint32_t   lastReboot;  // time stamp for last reboot
-  uint16_t   numOfCores;
-  uint8_t    alternativeRole;
-  uint8_t    reserve;
-  uint16_t   numOfTotalVnodes;  // from config file
-  uint16_t   unused;
-  float      diskAvailable;  // GB
-  uint32_t   openVnodes;
-  char       reserved[16];
-  SVnodeLoad load[];
-} SStatusMsg;
+  int32_t  vgId;
+  int8_t   accessState;
+} SDMVgroupAccess;
 
 typedef struct {
+  int32_t  dnodeId;
   uint32_t moduleStatus;
-  uint32_t createdTime;
   uint32_t numOfVnodes;
-  uint32_t reserved;
-} SDnodeState;
-
-// internal message
-typedef struct {
-  uint32_t destId;
-  uint32_t destIp;
-  char     meterId[TSDB_UNI_LEN];
-  char     empty[3];
-  uint8_t  msgType;
-  int32_t  msgLen;
-  uint8_t  content[0];
-} SIntMsg;
-
-typedef struct {
-  char spi;
-  char encrypt;
-  char secret[TSDB_KEY_LEN];  // key is changed if updated
-  char cipheringKey[TSDB_KEY_LEN];
-} SSecIe;
-
-typedef struct {
-  uint32_t ip;
-  uint32_t vnode;
-} SVPeerDesc;
-
-typedef struct {
-  int32_t    vnode;
-  SVnodeCfg  cfg;
-  SVPeerDesc vpeerDesc[];
-} SVPeersMsg;
-
-typedef struct {
-  char  meterId[TSDB_METER_ID_LEN];
-  short createFlag;
-  char  tags[];
-} SMeterInfoMsg;
-
-typedef struct {
-  int32_t numOfMeters;
-  char    meterId[];
-} SMultiMeterInfoMsg;
-
-typedef struct {
-  int16_t elemLen;
-
-  char    meterId[TSDB_METER_ID_LEN];
-  int16_t orderIndex;
-  int16_t orderType;  // used in group by xx order by xxx
-
-  int16_t rel;  // denotes the relation between condition and table list
-
-  int32_t tableCond;  // offset value of table name condition
-  int32_t tableCondLen;
-
-  int32_t cond;  // offset of column query condition
-  int32_t condLen;
-
-  int16_t tagCols[TSDB_MAX_TAGS + 1];  // required tag columns, plus one is for table name
-  int16_t numOfTags;                   // required number of tags
-
-  int16_t numOfGroupCols;  // num of group by columns
-  int32_t groupbyTagColumnList;
-} SMetricMetaElemMsg;
-
-typedef struct {
-  int32_t numOfMeters;
-  int32_t join;
-  int32_t joinCondLen;  // for join condition
-  int32_t metaElem[TSDB_MAX_JOIN_TABLE_NUM];
-} SMetricMetaMsg;
-
-typedef struct {
-  SVPeerDesc vpeerDesc[TSDB_VNODES_SUPPORT];
-  int16_t    index;  // used locally
-  int32_t    numOfSids;
-  int32_t    pSidExtInfoList[];  // offset value of SMeterSidExtInfo
-} SVnodeSidList;
-
-typedef struct {
-  int32_t  numOfMeters;
-  int32_t  numOfVnodes;
-  uint16_t tagLen; /* tag value length */
-  int32_t  list[]; /* offset of SVnodeSidList, compared to the SMetricMeta struct */
-} SMetricMeta;
-
-typedef struct SMeterMeta {
-  uint8_t numOfTags : 6;
-  uint8_t precision : 2;
-  uint8_t meterType : 4;
-  uint8_t index : 4;  // used locally
-
-  int16_t numOfColumns;
-
-  int16_t rowSize;  // used locally, calculated in client
-  int16_t sversion;
-
-  SVPeerDesc vpeerDesc[TSDB_VNODES_SUPPORT];
-
-  int32_t  sid;
-  int32_t  vgid;
-  uint64_t uid;
-} SMeterMeta;
-
-typedef struct SMultiMeterMeta {
-  char       meterId[TSDB_METER_ID_LEN];  // note: This field must be at the front
-  SMeterMeta meta;
-} SMultiMeterMeta;
+  char     clusterId[TSDB_CLUSTER_ID_LEN];
+  char     reserved[16];
+} SDMDnodeCfg;
+
+typedef struct {
+  int32_t   nodeId;
+  char      nodeEp[TSDB_EP_LEN];
+} SDMMnodeInfo;
+
+typedef struct {
+  int8_t       inUse;
+  int8_t       nodeNum;
+  SDMMnodeInfo nodeInfos[TSDB_MAX_REPLICA];
+} SDMMnodeInfos;
+
+typedef struct {
+  int32_t  numOfMnodes;               // tsNumOfMnodes
+  int32_t  enableBalance;             // tsEnableBalance
+  int32_t  mnodeEqualVnodeNum;        // tsMnodeEqualVnodeNum
+  int32_t  offlineThreshold;          // tsOfflineThreshold
+  int32_t  statusInterval;            // tsStatusInterval
+  int32_t  maxtablesPerVnode;
+  int32_t  maxVgroupsPerDb;
+  char     arbitrator[TSDB_EP_LEN];   // tsArbitrator
+  char     timezone[64];              // tsTimezone
+  int64_t  checkTime;                 // 1970-01-01 00:00:00.000
+  char     locale[TSDB_LOCALE_LEN];   // tsLocale
+  char     charset[TSDB_LOCALE_LEN];  // tsCharset
+} SClusterCfg;
+
+typedef struct {
+  uint32_t    version;
+  int32_t     dnodeId;
+  char        dnodeEp[TSDB_EP_LEN];
+  uint32_t    moduleStatus;
+  uint32_t    lastReboot;        // time stamp for last reboot
+  uint16_t    reserve1;          // from config file
+  uint16_t    openVnodes;
+  uint16_t    numOfCores;
+  float       diskAvailable;  // GB
+  char        clusterId[TSDB_CLUSTER_ID_LEN];
+  uint8_t     alternativeRole;
+  uint8_t     reserve2[15];
+  SClusterCfg clusterCfg;
+  SVnodeLoad  load[];
+} SDMStatusMsg;
+
+typedef struct {
+  SDMMnodeInfos    mnodes;
+  SDMDnodeCfg      dnodeCfg;
+  SDMVgroupAccess  vgAccess[];
+} SDMStatusRsp;
 
 typedef struct {
-  char name[TSDB_METER_ID_LEN];
-  char data[TSDB_MAX_TAGS_LEN];
+  uint32_t vgId;
+  int32_t  cfgVersion;
+  int32_t  maxTables;
+  int32_t  cacheBlockSize;
+  int32_t  totalBlocks;
+  int32_t  daysPerFile;
+  int32_t  daysToKeep;
+  int32_t  daysToKeep1;
+  int32_t  daysToKeep2;
+  int32_t  minRowsPerFileBlock;
+  int32_t  maxRowsPerFileBlock;
+  int32_t  commitTime;
+  int32_t  fsyncPeriod;
+  int8_t   precision;
+  int8_t   compression;
+  int8_t   walLevel;
+  int8_t   replications;
+  int8_t   wals;
+  int8_t   quorum;
+  int8_t   reserved[16];
+} SMDVnodeCfg;
+
+typedef struct {
+  int32_t  nodeId;
+  char     nodeEp[TSDB_EP_LEN];
+} SMDVnodeDesc;
+
+typedef struct {
+  char db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  SMDVnodeCfg  cfg;
+  SMDVnodeDesc nodes[TSDB_MAX_REPLICA];
+} SMDCreateVnodeMsg, SMDAlterVnodeMsg;
+
+typedef struct {
+  char    tableId[TSDB_TABLE_FNAME_LEN];
+  int16_t createFlag;
+  char    tags[];
+} SCMTableInfoMsg;
+
+typedef struct {
+  int32_t numOfTables;
+  char    tableIds[];
+} SCMMultiTableInfoMsg;
+
+typedef struct SCMSTableVgroupMsg {
+  int32_t numOfTables;
+} SCMSTableVgroupMsg, SCMSTableVgroupRspMsg;
+
+typedef struct {
+  int32_t   vgId;
+  int8_t    numOfEps;
+  SEpAddr   epAddr[TSDB_MAX_REPLICA];
+} SCMVgroupInfo;
+
+typedef struct {
+  int32_t numOfVgroups;
+  SCMVgroupInfo vgroups[];
+} SVgroupsInfo;
+
+typedef struct STableMetaMsg {
+  int32_t       contLen;
+  char          tableId[TSDB_TABLE_FNAME_LEN];   // table id
+  char          sTableId[TSDB_TABLE_FNAME_LEN];
+  uint8_t       numOfTags;
+  uint8_t       precision;
+  uint8_t       tableType;
+  int16_t       numOfColumns;
+  int16_t       sversion;
+  int16_t       tversion;
+  int32_t       sid;
+  uint64_t      uid;
+  SCMVgroupInfo vgroup;
+  SSchema       schema[];
+} STableMetaMsg;
+
+typedef struct SMultiTableMeta {
+  int32_t       numOfTables;
+  int32_t       contLen;
+  char          metas[];
+} SMultiTableMeta;
+
+typedef struct {
+  int32_t dataLen;
+  char name[TSDB_TABLE_FNAME_LEN];
+  char data[TSDB_MAX_TAGS_LEN + TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * TSDB_MAX_TAGS];
 } STagData;
 
 /*
@@ -779,47 +704,43 @@ typedef struct {
  * payloadLen is the length of payload
  */
 typedef struct {
-  char     type;
+  int8_t   type;
+  char     db[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
   uint16_t payloadLen;
   char     payload[];
-} SShowMsg;
+} SCMShowMsg;
 
-typedef struct {
-  char ip[20];
-} SCreateMnodeMsg, SDropMnodeMsg, SCreateDnodeMsg, SDropDnodeMsg;
+typedef struct SCMShowRsp {
+  uint64_t      qhandle;
+  STableMetaMsg tableMeta;
+} SCMShowRsp;
 
 typedef struct {
-  uint64_t   qhandle;
-  SMeterMeta meterMeta;
-} SShowRspMsg;
+  char     ep[TSDB_EP_LEN];  // end point, hostname:port
+} SCMCreateDnodeMsg, SCMDropDnodeMsg;
 
 typedef struct {
-  int32_t vnode;
+  int32_t dnodeId;
+  int32_t vgId;
   int32_t sid;
-} SMeterCfgMsg;
+} SDMConfigTableMsg;
 
 typedef struct {
-  int32_t vnode;
-} SVpeerCfgMsg;
+  uint32_t dnodeId;
+  int32_t  vgId;
+} SDMConfigVnodeMsg;
 
 typedef struct {
-  char ip[20];
-  char config[60];
-} SCfgMsg;
-
-typedef struct {
-  uint32_t queryId;
-  uint32_t streamId;
-  char     killConnection;
-  SIpList  ipList;
-} SHeartBeatRsp;
+  char ep[TSDB_EP_LEN];  // end point, hostname:port
+  char config[64];
+} SMDCfgDnodeMsg, SCMCfgDnodeMsg;
 
 typedef struct {
   char     sql[TSDB_SHOW_SQL_LEN];
   uint32_t queryId;
   int64_t  useconds;
   int64_t  stime;
-} SQDesc;
+} SQueryDesc;
 
 typedef struct {
   char     sql[TSDB_SHOW_SQL_LEN];
@@ -830,30 +751,45 @@ typedef struct {
   int64_t  stime;
   int64_t  slidingTime;
   int64_t  interval;
-} SSDesc;
+} SStreamDesc;
 
 typedef struct {
-  int32_t numOfQueries;
-  SQDesc  qdesc[];
-} SQList;
+  uint32_t connId;
+  int32_t  numOfQueries;
+  int32_t  numOfStreams;
+  char     pData[];
+} SCMHeartBeatMsg;
 
 typedef struct {
-  int32_t numOfStreams;
-  SSDesc  sdesc[];
-} SSList;
+  uint32_t  queryId;
+  uint32_t  streamId;
+  uint32_t  totalDnodes;
+  uint32_t  onlineDnodes;
+  uint32_t  connId;
+  int8_t    killConnection;
+  SRpcEpSet epSet;
+} SCMHeartBeatRsp;
 
 typedef struct {
-  uint64_t handle;
-  char     queryId[TSDB_KILL_MSG_LEN];
-} SKillQuery, SKillStream, SKillConnection;
+  char queryId[TSDB_KILL_MSG_LEN + 1];
+} SCMKillQueryMsg, SCMKillStreamMsg, SCMKillConnMsg;
 
 typedef struct {
-  short    vnode;
+  int32_t  vnode;
   int32_t  sid;
   uint64_t uid;
   uint64_t stime;  // stream starting time
-  char     status;
-} SAlterStreamMsg;
+  int32_t  status;
+  char     tableId[TSDB_TABLE_FNAME_LEN];
+} SMDAlterStreamMsg;
+
+typedef struct {
+  char user[TSDB_USER_LEN];
+  char spi;
+  char encrypt;
+  char secret[TSDB_KEY_LEN];
+  char ckey[TSDB_KEY_LEN];
+} SDMAuthMsg, SDMAuthRsp;
 
 #pragma pack(pop)
 
diff --git a/src/inc/tast.h b/src/inc/tast.h
deleted file mode 100644
index d7950b54f6536258d9c5c64ed54a209e04305be7..0000000000000000000000000000000000000000
--- a/src/inc/tast.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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_TAST_H
-#define TDENGINE_TAST_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "taosmsg.h"
-#include "ttypes.h"
-
-struct tSQLBinaryExpr;
-struct SSchema;
-struct tSkipList;
-struct tSkipListNode;
-
-enum {
-  TSQL_NODE_EXPR = 0x1,
-  TSQL_NODE_COL = 0x2,
-  TSQL_NODE_VALUE = 0x4,
-};
-
-typedef bool (*__result_filter_fn_t)(const void *, void *);
-typedef void (*__do_filter_suppl_fn_t)(void *, void *);
-
-/**
- * this structure is used to filter data in tags, so the offset of filtered tag column in tagdata string is required
- *
- */
-typedef struct tQueryInfo {
-  int32_t       offset;   // offset value in tags
-  int32_t       colIdx;   // index of column in schema
-  uint8_t       optr;     // expression operator
-  SSchema       sch;      // schema of tags
-  tVariant      q;        // query condition value on the specific schema, filter expression
-  __compar_fn_t compare;  // filter function
-} tQueryInfo;
-
-typedef struct SBinaryFilterSupp {
-  __result_filter_fn_t   fp;
-  __do_filter_suppl_fn_t setupInfoFn;
-  void *                 pExtInfo;
-} SBinaryFilterSupp;
-
-typedef struct tSQLSyntaxNode {
-  uint8_t nodeType;
-  int16_t colId;  // for schema, the id of column
-  union {
-    struct tSQLBinaryExpr *pExpr;
-    struct SSchema *       pSchema;
-    tVariant *             pVal;
-  };
-} tSQLSyntaxNode;
-
-typedef struct tSQLBinaryExpr {
-  uint8_t         nSQLBinaryOptr;      // filter operator
-  uint8_t         filterOnPrimaryKey;  // 0: do not contain primary filter, 1: contain
-
-  /*
-   * provide the information to support filter operation on this expression
-   * only available for leaf node
-   */
-  void *          info;
-  tSQLSyntaxNode *pLeft;               // left child pointer
-  tSQLSyntaxNode *pRight;              // right child pointer
-} tSQLBinaryExpr;
-
-typedef struct tQueryResultset {
-  void ** pRes;
-  int64_t num;
-} tQueryResultset;
-
-void tSQLBinaryExprFromString(tSQLBinaryExpr **pExpr, SSchema *pSchema, int32_t numOfCols, char *src, int32_t len);
-
-void tSQLBinaryExprToString(tSQLBinaryExpr *pExpr, char *dst, int32_t *len);
-
-void tSQLBinaryExprDestroy(tSQLBinaryExpr **pExprs, void (*fp)(void*));
-
-void tSQLBinaryExprTraverse(tSQLBinaryExpr *pExprs, struct tSkipList *pSkipList, tQueryResultset *result,
-                            SBinaryFilterSupp *param);
-
-void tSQLBinaryExprCalcTraverse(tSQLBinaryExpr *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,
-                                char *(*cb)(void *, char *, int32_t));
-
-void tSQLBinaryExprTrv(tSQLBinaryExpr *pExprs, int32_t *val, int16_t *ids);
-void tQueryResultClean(tQueryResultset *pRes);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TAST_H
diff --git a/src/inc/tbalance.h b/src/inc/tbalance.h
new file mode 100644
index 0000000000000000000000000000000000000000..f0da4a37476157e235993ef8c2c32baedabc2a1e
--- /dev/null
+++ b/src/inc/tbalance.h
@@ -0,0 +1,39 @@
+/*
+ * 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_BALANCE_H
+#define TDENGINE_BALANCE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SVgObj;
+struct SDnodeObj;
+
+int32_t balanceInit();
+void    balanceCleanUp();
+void    balanceAsyncNotify();
+void    balanceSyncNotify();
+void    balanceReset();
+int32_t balanceAllocVnodes(struct SVgObj *pVgroup);
+int32_t balanceAlterDnode(struct SDnodeObj *pDnode, int32_t vnodeId, int32_t dnodeId);
+int32_t balanceDropDnode(struct SDnodeObj *pDnode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/tcache.h b/src/inc/tcache.h
deleted file mode 100644
index b577c53ea8dbcdc9f069288b94d0244907e77f12..0000000000000000000000000000000000000000
--- a/src/inc/tcache.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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_TCACHE_H
-#define TDENGINE_TCACHE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-
-/**
- *
- * @param maxSessions       maximum slots available for hash elements
- * @param tmrCtrl           timer ctrl
- * @param refreshTime       refresh operation interval time, the maximum survival time when one element is expired and
- *                          not referenced by other objects
- * @return
- */
-void *taosInitDataCache(int maxSessions, void *tmrCtrl, int64_t refreshTimeInSeconds);
-
-/**
- * add data into cache
- *
- * @param handle        cache object
- * @param key           key
- * @param pData         cached data
- * @param dataSize      data size
- * @param keepTime      survival time in second
- * @return              cached element
- */
-void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, int keepTimeInSeconds);
-
-/**
- * remove data in cache, the data will not be removed immediately.
- * if it is referenced by other object, it will be remain in cache
- * @param handle    cache object
- * @param data      not the key, actually referenced data
- * @param _remove   force model, reduce the ref count and move the data into
- * pTrash
- */
-void taosRemoveDataFromCache(void *handle, void **data, bool _remove);
-
-/**
- * update data in cache
- * @param handle hash object handle(pointer)
- * @param key    key for hash
- * @param pData  actually data
- * @param size   length of data
- * @param duration  survival time of this object in cache
- * @return       new referenced data
- */
-void *taosUpdateDataFromCache(void *handle, char *key, char *pData, int size, int duration);
-
-/**
- * get data from cache
- * @param handle        cache object
- * @param key           key
- * @return              cached data or NULL
- */
-void *taosGetDataFromCache(void *handle, char *key);
-
-/**
- * release all allocated memory and destroy the cache object
- *
- * @param handle
- */
-void taosCleanUpDataCache(void *handle);
-
-/**
- *  move all data node into trash,clear node in trash can if it is not referenced by client
- * @param handle
- */
-void taosClearDataCache(void *handle);
-
-/**
- * Add one reference count for the exist data, and assign this data for a new owner.
- * The new owner needs to invoke the taosRemoveDataFromCache when it does not need this data anymore.
- * This procedure is a faster version of taosGetDataFromCache function, which avoids the sideeffect of the problem of the
- * data is moved to trash, and taosGetDataFromCache will fail to retrieve it again.
- *
- * @param handle
- * @param data
- * @return
- */
-void* taosGetDataFromExists(void* handle, void* data);
-
-/**
- * transfer the ownership of data in cache to another object without increasing reference count.
- * @param handle
- * @param data
- * @return
- */
-void* taosTransferDataInCache(void* handle, void** data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TCACHE_H
diff --git a/src/inc/tchecksum.h b/src/inc/tchecksum.h
deleted file mode 100644
index 493c993c2554ba7574ee308edd099b25f9e82f37..0000000000000000000000000000000000000000
--- a/src/inc/tchecksum.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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_TCHECKSUM_H
-#define TDENGINE_TCHECKSUM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "tcrc32c.h"
-#include "tutil.h"
-
-typedef uint32_t TSCKSUM;
-
-static FORCE_INLINE TSCKSUM taosCalcChecksum(TSCKSUM csi, const uint8_t *stream, uint32_t ssize) {
-  assert(ssize >= 0 && stream != NULL);
-
-  return (*crc32c)(csi, stream, (size_t)ssize);
-}
-
-static FORCE_INLINE int taosCalcChecksumAppend(TSCKSUM csi, uint8_t *stream, uint32_t ssize) {
-  if (ssize < sizeof(TSCKSUM)) return -1;
-
-  *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) = (*crc32c)(csi, stream, (size_t)(ssize - sizeof(TSCKSUM)));
-
-  return 0;
-}
-
-static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize, TSCKSUM checksum) {
-  if (ssize < 0) return 0;
-  return (checksum == (*crc32c)(0, stream, (size_t)ssize));
-}
-
-static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) {
-  if (ssize < sizeof(TSCKSUM)) return 0;
-  return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM)));
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TCHECKSUM_H
diff --git a/src/inc/tcq.h b/src/inc/tcq.h
new file mode 100644
index 0000000000000000000000000000000000000000..32b75674c3278b3273fd4b98dd645f4168543155
--- /dev/null
+++ b/src/inc/tcq.h
@@ -0,0 +1,57 @@
+/*
+ * 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 _TD_CQ_H_
+#define _TD_CQ_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tdataformat.h"
+
+typedef int (*FCqWrite)(void *ahandle, void *pHead, int type);
+
+typedef struct {
+  int      vgId;
+  char     user[TSDB_USER_LEN];
+  char     pass[TSDB_PASSWORD_LEN];
+  char     db[TSDB_DB_NAME_LEN];
+  FCqWrite cqWrite;
+} SCqCfg;
+
+// the following API shall be called by vnode
+void *cqOpen(void *ahandle, const SCqCfg *pCfg);
+void  cqClose(void *handle);
+
+// if vnode is master, vnode call this API to start CQ
+void  cqStart(void *handle);
+
+// if vnode is slave/unsynced, vnode shall call this API to stop CQ
+void  cqStop(void *handle);
+
+// cqCreate is called by TSDB to start an instance of CQ 
+void *cqCreate(void *handle, uint64_t uid, int sid, char *sqlStr, STSchema *pSchema);
+
+// cqDrop is called by TSDB to stop an instance of CQ, handle is the return value of cqCreate
+void  cqDrop(void *handle);
+
+extern int cqDebugFlag;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _TD_CQ_H_
diff --git a/src/inc/textbuffer.h b/src/inc/textbuffer.h
deleted file mode 100644
index c7de20bd746d5889cc9d2c6407743ecace557bae..0000000000000000000000000000000000000000
--- a/src/inc/textbuffer.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * 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_TEXTBUFFER_H
-#define TDENGINE_TEXTBUFFER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tutil.h"
-#include "taosmsg.h"
-
-#define DEFAULT_PAGE_SIZE               16384  // 16k larger than the SHistoInfo
-#define MIN_BUFFER_SIZE                 (1 << 19)
-#define MAX_TMPFILE_PATH_LENGTH         PATH_MAX
-#define INITIAL_ALLOCATION_BUFFER_SIZE  64
-
-// forward declare
-struct tTagSchema;
-
-typedef enum EXT_BUFFER_FLUSH_MODEL {
-  /*
-   * all data that have been flushed to disk is belonged to the same group
-   * which means, all data in disk are sorted, or order is not matter in this case
-   */
-  SINGLE_APPEND_MODEL,
-
-  /*
-   * each flush operation to disk is completely independant to any other flush operation
-   * we simply merge several set of data in one file, to reduce the count of flat files
-   * in disk. So in this case, we need to keep the flush-out information in tFlushoutInfo
-   * structure.
-   */
-  MULTIPLE_APPEND_MODEL,
-} EXT_BUFFER_FLUSH_MODEL;
-
-typedef struct tFlushoutInfo {
-  uint32_t startPageId;
-  uint32_t numOfPages;
-} tFlushoutInfo;
-
-typedef struct tFlushoutData {
-  uint32_t       nAllocSize;
-  uint32_t       nLength;
-  tFlushoutInfo *pFlushoutInfo;
-} tFlushoutData;
-
-typedef struct tFileMeta {
-  uint32_t      nFileSize;  // in pages
-  uint32_t      nPageSize;
-  uint32_t      numOfElemsInFile;
-  tFlushoutData flushoutData;
-} tFileMeta;
-
-typedef struct tFilePage {
-  uint64_t numOfElems;
-  char     data[];
-} tFilePage;
-
-typedef struct tFilePagesItem {
-  struct tFilePagesItem *pNext;
-  tFilePage              item;
-} tFilePagesItem;
-
-typedef struct tColModel {
-  int32_t         maxCapacity;
-  int32_t         numOfCols;
-  int16_t *       colOffset;
-  struct SSchema *pFields;
-} tColModel;
-
-typedef struct tOrderIdx {
-  int32_t numOfOrderedCols;
-  int16_t pData[];
-} tOrderIdx;
-
-typedef struct tOrderDescriptor {
-  union {
-    struct tTagSchema *pTagSchema;
-    tColModel *        pSchema;
-  };
-  int32_t   tsOrder;  // timestamp order type if exists
-  tOrderIdx orderIdx;
-} tOrderDescriptor;
-
-typedef struct tExtMemBuffer {
-  int32_t nMaxSizeInPages;
-
-  int32_t nElemSize;
-  int32_t nPageSize;
-
-  int32_t numOfAllElems;
-  int32_t numOfElemsInBuffer;
-  int32_t numOfElemsPerPage;
-
-  int16_t         numOfPagesInMem;
-  tFilePagesItem *pHead;
-  tFilePagesItem *pTail;
-
-  tFileMeta fileMeta;
-
-  char  dataFilePath[MAX_TMPFILE_PATH_LENGTH];
-  FILE *dataFile;
-
-  tColModel *pColModel;
-
-  EXT_BUFFER_FLUSH_MODEL flushModel;
-} tExtMemBuffer;
-
-void getTmpfilePath(const char *fileNamePattern, char *dstPath);
-
-/*
- * create ext-memory buffer
- */
-void tExtMemBufferCreate(tExtMemBuffer **pMemBuffer, int32_t numOfBufferSize, int32_t elemSize,
-                         const char *tmpDataFilePath, tColModel *pModel);
-
-/*
- * destroy ext-memory buffer
- */
-void tExtMemBufferDestroy(tExtMemBuffer **pMemBuffer);
-
-/*
- * @param pMemBuffer
- * @param data       input data pointer
- * @param numOfRows  number of rows in data
- * @param pModel     column format model
- * @return           number of pages in memory
- */
-int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRows);
-
-/*
- * flush all data into disk and release all in-memory buffer
- */
-bool tExtMemBufferFlush(tExtMemBuffer *pMemBuffer);
-
-/*
- * remove all data that has been put into buffer, including in buffer or
- * ext-buffer(disk)
- */
-void tExtMemBufferClear(tExtMemBuffer *pMemBuffer);
-
-/*
- * this function should be removed.
- * since the flush to disk operation is transparent to client this structure should provide stream operation for data,
- * and there is an internal cursor point to the data.
- */
-bool tExtMemBufferLoadData(tExtMemBuffer *pMemBuffer, tFilePage *pFilePage, int32_t flushIdx, int32_t pageIdx);
-
-bool tExtMemBufferIsAllDataInMem(tExtMemBuffer *pMemBuffer);
-
-tColModel *tColModelCreate(SSchema *field, int32_t numOfCols, int32_t maxCapacity);
-
-void tColModelDestroy(tColModel *pModel);
-
-typedef struct SSrcColumnInfo {
-  int32_t functionId;
-  int32_t type;
-} SSrcColumnInfo;
-
-/*
- * display data in column format model for debug purpose only
- */
-void tColModelDisplay(tColModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount);
-
-void tColModelDisplayEx(tColModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount, SSrcColumnInfo *pInfo);
-
-/*
- * compress data into consecutive block without hole in data
- */
-void tColModelCompact(tColModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity);
-
-void tColModelErase(tColModel *pModel, tFilePage *inputBuffer, int32_t maxCapacity, int32_t s, int32_t e);
-
-tOrderDescriptor *tOrderDesCreate(int32_t *orderColIdx, int32_t numOfOrderCols, tColModel *pModel, int32_t tsOrderType);
-
-void tOrderDescDestroy(tOrderDescriptor *pDesc);
-
-void tColModelAppend(tColModel *dstModel, tFilePage *dstPage, void *srcData, int32_t srcStartRows,
-                     int32_t numOfRowsToWrite, int32_t srcCapacity);
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct MinMaxEntry {
-  union {
-    double  dMinVal;
-    int32_t iMinVal;
-    int64_t i64MinVal;
-  };
-  union {
-    double  dMaxVal;
-    int32_t iMaxVal;
-    int64_t i64MaxVal;
-  };
-} MinMaxEntry;
-
-typedef struct tMemBucketSegment {
-  int32_t         numOfSlots;
-  MinMaxEntry *   pBoundingEntries;
-  tExtMemBuffer **pBuffer;
-} tMemBucketSegment;
-
-typedef struct tMemBucket {
-  int16_t numOfSegs;
-  int16_t nTotalSlots;
-  int16_t nSlotsOfSeg;
-  int16_t dataType;
-
-  int16_t nElemSize;
-  int32_t numOfElems;
-
-  int32_t nTotalBufferSize;
-  int32_t maxElemsCapacity;
-
-  int16_t nPageSize;
-  int16_t numOfTotalPages;
-  int16_t numOfAvailPages; /* remain available buffer pages */
-
-  tMemBucketSegment *pSegs;
-  tOrderDescriptor * pOrderDesc;
-
-  MinMaxEntry nRange;
-
-  void (*HashFunc)(struct tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-} tMemBucket;
-
-typedef int (*__col_compar_fn_t)(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
-
-void tColDataQSort(tOrderDescriptor *, int32_t numOfRows, int32_t start, int32_t end, char *data, int32_t orderType);
-
-int32_t compare_sa(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
-
-int32_t compare_sd(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
-
-int32_t compare_a(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1, int32_t numOfRow2, int32_t s2,
-                  char *data2);
-
-int32_t compare_d(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1, int32_t numOfRow2, int32_t s2,
-                  char *data2);
-
-tMemBucket* tMemBucketCreate(int32_t totalSlots, int32_t nBufferSize, int16_t nElemSize,
-                      int16_t dataType, tOrderDescriptor *pDesc);
-
-void tMemBucketDestroy(tMemBucket *pBucket);
-
-void tMemBucketPut(tMemBucket *pBucket, void *data, int32_t numOfRows);
-
-double getPercentile(tMemBucket *pMemBucket, double percent);
-
-void tBucketIntHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-
-void tBucketDoubleHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TBASE_SORT_H
diff --git a/src/inc/tglobalcfg.h b/src/inc/tglobalcfg.h
deleted file mode 100644
index 35cf6a42443ef40135c3937867339c6634c32140..0000000000000000000000000000000000000000
--- a/src/inc/tglobalcfg.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * 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_TGLOBALCFG_H
-#define TDENGINE_TGLOBALCFG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-#include "tsdb.h"
-
-extern int  (*startMonitor)();
-extern void (*stopMonitor)();
-
-// system info
-extern int64_t tsPageSize;
-extern int64_t tsOpenMax;
-extern int64_t tsStreamMax;
-extern int32_t tsNumOfCores;
-extern int32_t tsAlternativeRole;
-extern float   tsTotalLogDirGB;
-extern float   tsTotalTmpDirGB;
-extern float   tsTotalDataDirGB;
-extern float   tsAvailLogDirGB;
-extern float   tsAvailTmpDirGB;
-extern float   tsAvailDataDirGB;
-extern float   tsMinimalLogDirGB;
-extern float   tsMinimalTmpDirGB;
-extern float   tsMinimalDataDirGB;
-extern int32_t tsTotalMemoryMB;
-extern int32_t tsVersion;
-
-extern int tscEmbedded;
-
-extern int64_t tsMsPerDay[2];
-
-extern char configDir[];
-extern char tsDirectory[];
-extern char dataDir[];
-extern char logDir[];
-extern char scriptDir[];
-extern char osName[];
-
-extern char  tsMasterIp[];
-extern char  tsSecondIp[];
-extern uint16_t tsMgmtVnodePort;
-extern uint16_t tsMgmtShellPort;
-extern uint16_t tsVnodeShellPort;
-extern uint16_t tsVnodeVnodePort;
-extern uint16_t tsMgmtMgmtPort;
-extern uint16_t tsMgmtSyncPort;
-
-extern int tsStatusInterval;
-extern int tsShellActivityTimer;
-extern int tsVnodePeerHBTimer;
-extern int tsMgmtPeerHBTimer;
-extern int tsMeterMetaKeepTimer;
-extern int tsMetricMetaKeepTimer;
-
-extern float tsNumOfThreadsPerCore;
-extern float tsRatioOfQueryThreads;
-extern char  tsPublicIp[];
-extern char  tsPrivateIp[];
-extern short tsNumOfVnodesPerCore;
-extern short tsNumOfTotalVnodes;
-extern short tsCheckHeaderFile;
-extern uint32_t tsPublicIpInt;
-extern short tsAffectedRowsMod;
-
-extern int tsSessionsPerVnode;
-extern int tsAverageCacheBlocks;
-extern int tsCacheBlockSize;
-
-extern int   tsRowsInFileBlock;
-extern float tsFileBlockMinPercent;
-
-extern short tsNumOfBlocksPerMeter;
-extern short tsCommitTime;  // seconds
-extern short tsCommitLog;
-extern short tsAsyncLog;
-extern short tsCompression;
-extern short tsDaysPerFile;
-extern int   tsDaysToKeep;
-extern int   tsReplications;
-
-extern int  tsNumOfMPeers;
-extern int  tsMaxShellConns;
-extern int  tsMaxAccounts;
-extern int  tsMaxUsers;
-extern int  tsMaxDbs;
-extern int  tsMaxTables;
-extern int  tsMaxDnodes;
-extern int  tsMaxVGroups;
-extern char tsMgmtZone[];
-
-extern char tsLocalIp[];
-extern char tsDefaultDB[];
-extern char tsDefaultUser[];
-extern char tsDefaultPass[];
-extern int  tsMaxMeterConnections;
-extern int  tsMaxVnodeConnections;
-extern int  tsMaxMgmtConnections;
-
-extern int tsBalanceMonitorInterval;
-extern int tsBalanceStartInterval;
-extern int tsBalancePolicy;
-extern int tsOfflineThreshold;
-extern int tsMgmtEqualVnodeNum;
-
-extern int tsEnableHttpModule;
-extern int tsEnableMonitorModule;
-extern int tsRestRowLimit;
-extern int tsCompressMsgSize;
-extern int tsMaxSQLStringLen;
-extern int tsMaxNumOfOrderedResults;
-
-extern char tsSocketType[4];
-
-extern int tsTimePrecision;
-extern int tsMinSlidingTime;
-extern int tsMinIntervalTime;
-extern int tsMaxStreamComputDelay;
-extern int tsStreamCompStartDelay;
-extern int tsStreamCompRetryDelay;
-extern float tsStreamComputDelayRatio;   // the delayed computing ration of the whole time window
-
-extern int     tsProjectExecInterval;
-extern int64_t tsMaxRetentWindow;
-
-extern char  tsHttpIp[];
-extern uint16_t tsHttpPort;
-extern int   tsHttpCacheSessions;
-extern int   tsHttpSessionExpire;
-extern int   tsHttpMaxThreads;
-extern int   tsHttpEnableCompress;
-extern int   tsHttpEnableRecordSql;
-extern int   tsTelegrafUseFieldNum;
-
-extern int   tsTscEnableRecordSql;
-extern int   tsAnyIp;
-extern int   tsIsCluster;
-
-extern char tsMonitorDbName[];
-extern char tsInternalPass[];
-extern int  tsMonitorInterval;
-
-extern int tsNumOfLogLines;
-extern uint32_t ddebugFlag;
-extern uint32_t mdebugFlag;
-extern uint32_t cdebugFlag;
-extern uint32_t jnidebugFlag;
-extern uint32_t tmrDebugFlag;
-extern uint32_t sdbDebugFlag;
-extern uint32_t httpDebugFlag;
-extern uint32_t monitorDebugFlag;
-extern uint32_t uDebugFlag;
-extern uint32_t rpcDebugFlag;
-extern uint32_t debugFlag;
-extern uint32_t odbcdebugFlag;
-extern uint32_t qdebugFlag;
-
-extern uint32_t taosMaxTmrCtrl;
-
-extern int  tsRpcTimer;
-extern int  tsRpcMaxTime;
-extern int  tsUdpDelay;
-extern char version[];
-extern char compatible_version[];
-extern char gitinfo[];
-extern char gitinfoOfInternal[];
-extern char buildinfo[];
-
-extern char tsTimezone[64];
-extern char tsLocale[64];
-extern char tsCharset[64];  // default encode string
-
-//
-void tsReadGlobalLogConfig();
-bool tsReadGlobalConfig();
-bool tsReadGlobalConfigSpec();
-int tsCfgDynamicOptions(char *msg);
-void tsPrintGlobalConfig();
-void tsPrintGlobalConfigSpec();
-void tsSetAllDebugFlag();
-void tsSetTimeZone();
-void tsSetLocale();
-void tsInitGlobalConfig();
-void tsExpandFilePath(char* option_name, char* input_value);
-
-#define TSDB_CFG_CTYPE_B_CONFIG    1U   // can be configured from file
-#define TSDB_CFG_CTYPE_B_SHOW      2U   // can displayed by "show configs" commands
-#define TSDB_CFG_CTYPE_B_LOG       4U   // is a log type configuration
-#define TSDB_CFG_CTYPE_B_CLIENT    8U   // can be displayed in the client log
-#define TSDB_CFG_CTYPE_B_OPTION    16U  // can be configured by taos_options function
-#define TSDB_CFG_CTYPE_B_NOT_PRINT 32U  // such as password
-#define TSDB_CFG_CTYPE_B_LITE      64U  // is a lite type configuration
-#define TSDB_CFG_CTYPE_B_CLUSTER   128U // is a cluster type configuration
-
-#define TSDB_CFG_CSTATUS_NONE      0    // not configured
-#define TSDB_CFG_CSTATUS_DEFAULT   1    // use system default value
-#define TSDB_CFG_CSTATUS_FILE      2    // configured from file
-#define TSDB_CFG_CSTATUS_OPTION    3    // configured by taos_options function
-#define TSDB_CFG_CSTATUS_ARG       4    // configured by program argument
-
-enum {
-  TSDB_CFG_VTYPE_SHORT,
-  TSDB_CFG_VTYPE_INT,
-  TSDB_CFG_VTYPE_UINT,
-  TSDB_CFG_VTYPE_FLOAT,
-  TSDB_CFG_VTYPE_STRING,
-  TSDB_CFG_VTYPE_IPSTR,
-  TSDB_CFG_VTYPE_DIRECTORY,
-};
-
-enum {
-  TSDB_CFG_UTYPE_NONE,
-  TSDB_CFG_UTYPE_PERCENT,
-  TSDB_CFG_UTYPE_GB,
-  TSDB_CFG_UTYPE_MB,
-  TSDB_CFG_UTYPE_Mb,
-  TSDB_CFG_UTYPE_BYTE,
-  TSDB_CFG_UTYPE_SECOND,
-  TSDB_CFG_UTYPE_MS
-};
-
-typedef struct {
-  char *   option;
-  void *   ptr;
-  float    minValue;
-  float    maxValue;
-  int8_t   cfgType;
-  int8_t   cfgStatus;
-  int8_t   unitType;
-  int8_t   valType;
-  uint32_t ptrLength;
-} SGlobalConfig;
-
-extern SGlobalConfig *tsGlobalConfig;
-extern int            tsGlobalConfigNum;
-extern char *         tsCfgStatusStr[];
-SGlobalConfig *tsGetConfigOption(const char *option);
-
-#define TSDB_CFG_MAX_NUM    110
-#define TSDB_CFG_PRINT_LEN  23
-#define TSDB_CFG_OPTION_LEN 24
-#define TSDB_CFG_VALUE_LEN  41
-
-#define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TGLOBALCFG_H
diff --git a/src/inc/tgrant.h b/src/inc/tgrant.h
new file mode 100644
index 0000000000000000000000000000000000000000..f62a521b6cd157074ab18a4bf1a1a18f9120ac97
--- /dev/null
+++ b/src/inc/tgrant.h
@@ -0,0 +1,51 @@
+/*
+ * 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_GTANT_H
+#define TDENGINE_GTANT_H
+
+#ifdef __cplusplus
+"C" {
+#endif
+
+typedef enum {
+  TSDB_GRANT_ALL,
+  TSDB_GRANT_TIME,
+  TSDB_GRANT_USER,
+  TSDB_GRANT_DB,
+  TSDB_GRANT_TIMESERIES,
+  TSDB_GRANT_DNODE,
+  TSDB_GRANT_ACCT,
+  TSDB_GRANT_STORAGE,
+  TSDB_GRANT_SPEED,
+  TSDB_GRANT_QUERY_TIME,
+  TSDB_GRANT_CONNS,
+  TSDB_GRANT_STREAMS,
+  TSDB_GRANT_CPU_CORES,
+} EGrantType;
+
+int32_t grantInit();
+void    grantCleanUp();
+void    grantParseParameter();
+int32_t grantCheck(EGrantType grant);
+void    grantReset(EGrantType grant, uint64_t value);
+void    grantAdd(EGrantType grant, uint64_t value);
+void    grantRestore(EGrantType grant, uint64_t value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/thash.h b/src/inc/thash.h
deleted file mode 100644
index 592db62fe5e1e122fe2183c18350e5d86ac30a04..0000000000000000000000000000000000000000
--- a/src/inc/thash.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_THASH_H
-#define TDENGINE_THASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *taosOpenHash(int maxSessions, int (*fp)(void *, uint64_t));
-
-void taosCloseHash(void *handle);
-
-int taosAddHash(void *handle, uint64_t, uint32_t id);
-
-void taosDeleteHash(void *handle, uint64_t);
-
-int32_t taosGetIdFromHash(void *handle, uint64_t);
-
-int taosHashLong(void *, uint64_t ip);
-
-uint64_t taosHashUInt64(uint64_t handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_THASH_H
diff --git a/src/inc/thistogram.h b/src/inc/thistogram.h
deleted file mode 100644
index 7e5b1ccac6c9f1c882e9690398b6526340cf9fde..0000000000000000000000000000000000000000
--- a/src/inc/thistogram.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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_HISTOGRAM_H
-#define TDENGINE_HISTOGRAM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "tskiplist.h"
-
-#define USE_ARRAYLIST
-
-#define MAX_HISTOGRAM_BIN 500
-
-typedef struct SHistBin {
-  double  val;
-  int64_t num;
-
-#if !defined(USE_ARRAYLIST)
-  double  delta;
-  int32_t index;  // index in min-heap list
-#endif
-} SHistBin;
-
-typedef struct SHeapEntry {
-  void*  pData;
-  double val;
-} SHeapEntry;
-
-typedef struct SHistogramInfo {
-  int32_t numOfElems;
-  int32_t numOfEntries;
-  int32_t maxEntries;
-
-#if defined(USE_ARRAYLIST)
-  SHistBin* elems;
-#else
-  tSkipList*      pList;
-  SLoserTreeInfo* pLoserTree;
-  int32_t         maxIndex;
-  bool            ordered;
-#endif
-
-  double min;
-  double max;
-} SHistogramInfo;
-
-SHistogramInfo* tHistogramCreate(int32_t numOfBins);
-SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins);
-
-int32_t tHistogramAdd(SHistogramInfo** pHisto, double val);
-int64_t tHistogramSum(SHistogramInfo* pHisto, double v);
-
-double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num);
-SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries);
-void tHistogramDestroy(SHistogramInfo** pHisto);
-
-void tHistogramPrint(SHistogramInfo* pHisto);
-
-int32_t vnodeHistobinarySearch(SHistBin* pEntry, int32_t len, double val);
-
-SHeapEntry* tHeapCreate(int32_t numOfEntries);
-void tHeapSort(SHeapEntry* pEntry, int32_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_HISTOGRAM_H
diff --git a/src/inc/tidpool.h b/src/inc/tidpool.h
deleted file mode 100644
index 08f9d364671a5d126e699c26cb92e74365be0c78..0000000000000000000000000000000000000000
--- a/src/inc/tidpool.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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_TIDPOOL_H
-#define TDENGINE_TIDPOOL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void *taosInitIdPool(int maxId);
-
-int taosUpdateIdPool(void *handle, int maxId);
-
-int taosIdPoolMaxSize(void *handle);
-
-int taosAllocateId(void *handle);
-
-void taosFreeId(void *handle, int id);
-
-void taosIdPoolCleanUp(void *handle);
-
-int taosIdPoolNumOfUsed(void *handle);
-
-void taosIdPoolReinit(void *handle);
-
-void taosIdPoolMarkStatus(void *handle, int id, int status);
-
-void taosIdPoolSetFreeList(void *handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/inc/tinterpolation.h b/src/inc/tinterpolation.h
deleted file mode 100644
index 22b4ceb4f06799e826c2711c7317b1ebd3197e9d..0000000000000000000000000000000000000000
--- a/src/inc/tinterpolation.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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_TINTERPOLATION_H
-#define TDENGINE_TINTERPOLATION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct SInterpolationInfo {
-  int64_t startTimestamp;
-  int32_t order;                // order [asc/desc]
-  int32_t numOfRawDataInRows;   // number of points in pQuery->sdata
-  int32_t rowIdx;               // rowIdx in pQuery->sdata
-  int32_t numOfTotalInterpo;    // number of interpolated rows in one round
-  int32_t numOfCurrentInterpo;  // number of interpolated rows in current results
-  char *  prevValues;           // previous row of data
-  char *  nextValues;           // next row of data
-  int32_t numOfTags;
-  char ** pTags;  // tags value for current interoplation
-} SInterpolationInfo;
-
-typedef struct SPoint {
-  int64_t key;
-  void *  val;
-} SPoint;
-
-int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t timeRange, char intervalTimeUnit, int16_t precision);
-
-void taosInitInterpoInfo(SInterpolationInfo *pInterpoInfo, int32_t order, int64_t startTimeStamp, int32_t numOfTags,
-                         int32_t rowSize);
-
-void taosDestoryInterpoInfo(SInterpolationInfo *pInterpoInfo);
-
-void taosInterpoSetStartInfo(SInterpolationInfo *pInterpoInfo, int32_t numOfRawDataInRows, int32_t type);
-
-TSKEY taosGetRevisedEndKey(TSKEY ekey, int32_t order, int32_t timeInterval, int8_t intervalTimeUnit, int8_t precision);
-
-/**
- *
- * @param pInterpoInfo
- * @param pPrimaryKeyArray
- * @param numOfRows
- * @param nInterval
- * @param ekey
- * @param maxNumOfRows
- * @return
- */
-int32_t taosGetNumOfResultWithInterpo(SInterpolationInfo *pInterpoInfo, int64_t *pPrimaryKeyArray, int32_t numOfRows,
-                                      int64_t nInterval, int64_t ekey, int32_t maxNumOfRows);
-
-int32_t taosGetNumOfResWithoutLimit(SInterpolationInfo *pInterpoInfo, int64_t *pPrimaryKeyArray,
-                                    int32_t numOfRawDataInRows, int64_t nInterval, int64_t ekey);
-/**
- *
- * @param pInterpoInfo
- * @return
- */
-bool taosHasRemainsDataForInterpolation(SInterpolationInfo *pInterpoInfo);
-
-int32_t taosNumOfRemainPoints(SInterpolationInfo *pInterpoInfo);
-
-/**
- *
- */
-int32_t taosDoInterpoResult(SInterpolationInfo *pInterpoInfo, int16_t interpoType, tFilePage **data,
-                            int32_t numOfRawDataInRows, int32_t outputRows, int64_t nInterval,
-                            const int64_t *pPrimaryKeyArray, tColModel *pModel, char **srcData, int64_t *defaultVal,
-                            const int32_t *functionIDs, int32_t bufSize);
-
-int taosDoLinearInterpolation(int32_t type, SPoint *point1, SPoint *point2, SPoint *point);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TINTERPOLATION_H
diff --git a/src/inc/tkey.h b/src/inc/tkey.h
deleted file mode 100644
index c8b3c87f5e9c6549c23ff1918348c34393bdf63b..0000000000000000000000000000000000000000
--- a/src/inc/tkey.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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_TKEY_H
-#define TDENGINE_TKEY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-#include "tlog.h"
-#include "tmd5.h"
-#include "tutil.h"
-
-unsigned char *base64_decode(const char *value, int inlen, int *outlen);
-char *base64_encode(const unsigned char *value, int vlen);
-char *taosDesEncode(int64_t key, char *src, int len);
-char *taosDesDecode(int64_t key, char *src, int len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
\ No newline at end of file
diff --git a/src/inc/tlog.h b/src/inc/tlog.h
deleted file mode 100644
index 7556cc50a1ff23d24ef8eafdcd677f65577c8713..0000000000000000000000000000000000000000
--- a/src/inc/tlog.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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_TLOG_H
-#define TDENGINE_TLOG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "tglobalcfg.h"
-
-#define DEBUG_ERROR 1U
-#define DEBUG_WARN  2U
-#define DEBUG_TRACE 4U
-#define DEBUG_DUMP  8U
-
-#define DEBUG_FILE   0x80
-#define DEBUG_SCREEN 0x40
-
-extern void (*taosLogFp)(int level, const char *const format, ...);
-
-extern void (*taosLogSqlFp)(char *sql);
-
-extern void (*taosLogAcctFp)(char *acctId, int64_t currentPointsPerSecond, int64_t maxPointsPerSecond,
-                             int64_t totalTimeSeries, int64_t maxTimeSeries, int64_t totalStorage, int64_t maxStorage,
-                             int64_t totalQueryTime, int64_t maxQueryTime, int64_t totalInbound, int64_t maxInbound,
-                             int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs,
-                             int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams,
-                             int64_t totalConns, int64_t maxConns, int8_t accessState);
-
-int taosInitLog(char *logName, int numOfLogLines, int maxFiles);
-
-void taosCloseLogger();
-
-void taosDumpData(unsigned char *msg, int len);
-
-int taosOpenLogFile(char *fn);
-
-void tprintf(const char *const flags, int dflag, const char *const format, ...);
-
-void taosPrintLongString(const char *const flags, int dflag, const char *const format, ...);
-
-int taosOpenLogFileWithMaxLines(char *fn, int maxLines, int maxFileNum);
-
-void taosCloseLog();
-
-void taosResetLogFile();
-
-#define taosLogError(...)         \
-  if (taosLogFp) {                \
-    (*taosLogFp)(2, __VA_ARGS__); \
-  }
-#define taosLogWarn(...)          \
-  if (taosLogFp) {                \
-    (*taosLogFp)(1, __VA_ARGS__); \
-  }
-#define taosLogPrint(...)         \
-  if (taosLogFp) {                \
-    (*taosLogFp)(0, __VA_ARGS__); \
-  }
-
-// utility log function
-#define pError(...)                          \
-  if (uDebugFlag & DEBUG_ERROR) {            \
-    tprintf("ERROR UTL ", 255, __VA_ARGS__); \
-  }
-#define pWarn(...)                                  \
-  if (uDebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  UTL ", uDebugFlag, __VA_ARGS__); \
-  }
-#define pTrace(...)                           \
-  if (uDebugFlag & DEBUG_TRACE) {             \
-    tprintf("UTL ", uDebugFlag, __VA_ARGS__); \
-  }
-#define pDump(x, y)              \
-  if (uDebugFlag & DEBUG_DUMP) { \
-    taosDumpData(x, y);          \
-  }
-
-#define pPrint(...) \
-  { tprintf("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
-
-// client log function
-extern uint32_t cdebugFlag;
-
-#define tscError(...)                               \
-  if (cdebugFlag & DEBUG_ERROR) {                   \
-    tprintf("ERROR TSC ", cdebugFlag, __VA_ARGS__); \
-  }
-#define tscWarn(...)                                \
-  if (cdebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  TSC ", cdebugFlag, __VA_ARGS__); \
-  }
-#define tscTrace(...)                         \
-  if (cdebugFlag & DEBUG_TRACE) {             \
-    tprintf("TSC ", cdebugFlag, __VA_ARGS__); \
-  }
-#define tscPrint(...) \
-  { tprintf("TSC ", 255, __VA_ARGS__); }
-#define tscDump(...)                                        \
-    if (cdebugFlag & DEBUG_TRACE) {                         \
-      taosPrintLongString("TSC ", cdebugFlag, __VA_ARGS__); \
-    }
-#define jniError(...)                                 \
-  if (jnidebugFlag & DEBUG_ERROR) {                   \
-    tprintf("ERROR JNI ", jnidebugFlag, __VA_ARGS__); \
-  }
-#define jniWarn(...)                                  \
-  if (jnidebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  JNI ", jnidebugFlag, __VA_ARGS__); \
-  }
-#define jniTrace(...)                           \
-  if (jnidebugFlag & DEBUG_TRACE) {             \
-    tprintf("JNI ", jnidebugFlag, __VA_ARGS__); \
-  }
-#define jniPrint(...) \
-  { tprintf("JNI ", 255, __VA_ARGS__); }
-
-// rpc log function
-#define tError(...)                                    \
-  if (rpcDebugFlag & DEBUG_ERROR) {                   \
-    tprintf("ERROR RPC ", rpcDebugFlag, __VA_ARGS__); \
-  }
-#define tWarn(...)                                     \
-  if (rpcDebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  RPC ", rpcDebugFlag, __VA_ARGS__); \
-  }
-#define tTrace(...)                              \
-  if (rpcDebugFlag & DEBUG_TRACE) {             \
-    tprintf("RPC ", rpcDebugFlag, __VA_ARGS__); \
-  }
-#define tPrint(...) \
-  { tprintf("RPC ", 255, __VA_ARGS__); }
-#define tDump(x, y)                      \
-  if (rpcDebugFlag & DEBUG_DUMP) {      \
-    taosDumpData((unsigned char *)x, y); \
-  }
-
-// dnode log function
-#define dError(...)                          \
-  if (ddebugFlag & DEBUG_ERROR) {            \
-    tprintf("ERROR DND ", 255, __VA_ARGS__); \
-  }
-#define dWarn(...)                                  \
-  if (ddebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  DND ", ddebugFlag, __VA_ARGS__); \
-  }
-#define dTrace(...)                           \
-  if (ddebugFlag & DEBUG_TRACE) {             \
-    tprintf("DND ", ddebugFlag, __VA_ARGS__); \
-  }
-#define dPrint(...) \
-  { tprintf("DND ", 255, __VA_ARGS__); }
-
-#define dLError(...) taosLogError(__VA_ARGS__) dError(__VA_ARGS__)
-#define dLWarn(...) taosLogWarn(__VA_ARGS__) dWarn(__VA_ARGS__)
-#define dLPrint(...) taosLogPrint(__VA_ARGS__) dPrint(__VA_ARGS__)
-
-#define qTrace(...)                               \
-  if (qdebugFlag & DEBUG_TRACE) {                 \
-    tprintf("DND QRY ", qdebugFlag, __VA_ARGS__); \
-  }
-
-// mnode log function
-#define mError(...)                          \
-  if (mdebugFlag & DEBUG_ERROR) {            \
-    tprintf("ERROR MND ", 255, __VA_ARGS__); \
-  }
-#define mWarn(...)                                  \
-  if (mdebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  MND ", mdebugFlag, __VA_ARGS__); \
-  }
-#define mTrace(...)                           \
-  if (mdebugFlag & DEBUG_TRACE) {             \
-    tprintf("MND ", mdebugFlag, __VA_ARGS__); \
-  }
-#define mPrint(...) \
-  { tprintf("MND ", 255, __VA_ARGS__); }
-
-#define mLError(...) taosLogError(__VA_ARGS__) mError(__VA_ARGS__)
-#define mLWarn(...) taosLogWarn(__VA_ARGS__) mWarn(__VA_ARGS__)
-#define mLPrint(...) taosLogPrint(__VA_ARGS__) mPrint(__VA_ARGS__)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/inc/tlosertree.h b/src/inc/tlosertree.h
deleted file mode 100644
index fb64fd2ee43528192f4eff0c0f8e9fbd526a6354..0000000000000000000000000000000000000000
--- a/src/inc/tlosertree.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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_TLOSERTREE_H
-#define TDENGINE_TLOSERTREE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-typedef int (*__merge_compare_fn_t)(const void *, const void *, void *param);
-
-typedef struct SLoserTreeNode {
-  int32_t index;
-  void *  pData;
-} SLoserTreeNode;
-
-typedef struct SLoserTreeInfo {
-  int32_t              numOfEntries;
-  int32_t              totalEntries;
-  __merge_compare_fn_t comparaFn;
-  void *               param;
-
-  SLoserTreeNode *pNode;
-} SLoserTreeInfo;
-
-uint8_t tLoserTreeCreate(SLoserTreeInfo **pTree, int32_t numOfEntries, void *param, __merge_compare_fn_t compareFn);
-
-void tLoserTreeInit(SLoserTreeInfo *pTree);
-
-void tLoserTreeAdjust(SLoserTreeInfo *pTree, int32_t idx);
-
-void tLoserTreeRebuild(SLoserTreeInfo *pTree);
-
-void tLoserTreeDisplay(SLoserTreeInfo *pTree);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TLOSERTREE_H
diff --git a/src/inc/tmodule.h b/src/inc/tmodule.h
deleted file mode 100644
index cfce5b38efbf2f56c634406468edae094c3ef494..0000000000000000000000000000000000000000
--- a/src/inc/tmodule.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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_TMODULE_H
-#define TDENGINE_TMODULE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <pthread.h>
-#include <semaphore.h>
-#include "os.h"
-
-typedef struct _msg_header {
-  int mid; /* message ID */
-  int cid; /* call ID */
-  int tid; /* transaction ID */
-  //  int   len;           /* length of msg */
-  char *msg; /* content holder */
-} msg_header_t, msg_t;
-
-typedef struct {
-  char *          name;   /* module name */
-  pthread_t       thread; /* thread ID */
-  tsem_t          emptySem;
-  tsem_t          fullSem;
-  int             fullSlot;
-  int             emptySlot;
-  int             debugFlag;
-  int             queueSize;
-  int             msgSize;
-  pthread_mutex_t queueMutex;
-  pthread_mutex_t stmMutex;
-  msg_t *         queue;
-
-  int (*processMsg)(msg_t *);
-
-  int (*init)();
-
-  void (*cleanUp)();
-} module_t;
-
-typedef struct {
-  short         len;
-  unsigned char data[0];
-} sim_data_t;
-
-extern int      maxCid;
-extern module_t moduleObj[];
-extern char *   msgName[];
-
-extern int taosSendMsgToModule(module_t *mod_p, int cid, int mid, int tid, char *msg);
-
-extern char *taosDisplayModuleStatus(int moduleNum);
-
-extern int taosInitModule(module_t *);
-
-extern void taosCleanUpModule(module_t *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/inc/tmqtt.h b/src/inc/tmqtt.h
new file mode 100644
index 0000000000000000000000000000000000000000..256e61fbae897cd77c1e7cc780c4c4c587293e28
--- /dev/null
+++ b/src/inc/tmqtt.h
@@ -0,0 +1,32 @@
+/*
+ * 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_MQTT_H
+#define TDENGINE_MQTT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t mqttInitSystem();
+int32_t mqttStartSystem();
+void    mqttStopSystem();
+void    mqttCleanUpSystem();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/inc/tnote.h b/src/inc/tnote.h
deleted file mode 100644
index 4f86736be4b1075d3a6a897ce1d996b136c11b70..0000000000000000000000000000000000000000
--- a/src/inc/tnote.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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_TNOTE_H
-#define TDENGINE_TNOTE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-#include "tutil.h"
-#include "tglobalcfg.h"
-
-#define MAX_NOTE_LINE_SIZE 66000
-#define NOTE_FILE_NAME_LEN 300
-  
-typedef struct _taosNoteInfo {
-  int  taosNoteFileNum ;
-  int  taosNoteMaxLines;
-  int  taosNoteLines;
-  char taosNoteName[NOTE_FILE_NAME_LEN];
-  int  taosNoteFlag;
-  int  taosNoteFd;
-  int  taosNoteOpenInProgress;
-  pthread_mutex_t taosNoteMutex;
-}taosNoteInfo;
-  
-void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...);
-
-extern taosNoteInfo  m_HttpNote;
-extern taosNoteInfo  m_TscNote;
-
-extern int   tsHttpEnableRecordSql;
-extern int   tsTscEnableRecordSql;
-
-#define taosNotePrintHttp(...)               \
-  if (tsHttpEnableRecordSql) {               \
-    taosNotePrint(&m_HttpNote, __VA_ARGS__); \
-  }
-    
-#define taosNotePrintTsc(...)                 \
-    if (tsTscEnableRecordSql) {               \
-      taosNotePrint(&m_TscNote, __VA_ARGS__); \
-    }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/inc/trpc.h b/src/inc/trpc.h
index 97a0c905f8c3584fee0de46b064f79a78db19f15..bdee917b5e8203743a79ca27d8fbc987569c35ab 100644
--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
@@ -19,97 +19,77 @@
 extern "C" {
 #endif
 
-#include "taosmsg.h"
-#include "tsched.h"
-#include "tglobalcfg.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include "taosdef.h"
 
-#define TAOS_CONN_UDPS     0
-#define TAOS_CONN_UDPC     1
-#define TAOS_CONN_TCPS     2
-#define TAOS_CONN_TCPC     3
-#define TAOS_CONN_HTTPS    4
-#define TAOS_CONN_HTTPC    5
-
-#define TAOS_SOCKET_TYPE_NAME_TCP  "tcp"
-#define TAOS_SOCKET_TYPE_NAME_UDP  "udp"
-
-#define TAOS_ID_ASSIGNED   0
-#define TAOS_ID_FREE       1
-#define TAOS_ID_REALLOCATE 2
-
-#define TAOS_CONN_SOCKET_TYPE_S()  ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDPS:TAOS_CONN_TCPS)
-#define TAOS_CONN_SOCKET_TYPE_C()  ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDPC:TAOS_CONN_TCPC)
-
-#define taosSendMsgToPeer(x, y, z) taosSendMsgToPeerH(x, y, z, NULL)
-#define taosOpenRpcChann(x, y, z) taosOpenRpcChannWithQ(x,y,z,NULL)
-#define taosBuildReqMsg(x, y) taosBuildReqMsgWithSize(x, y, 512)
-#define taosBuildRspMsg(x, y) taosBuildRspMsgWithSize(x, y, 512)
-
-typedef struct {
-  char *localIp;                        // local IP used
-  uint16_t localPort;                      // local port
-  char *label;                          // for debug purpose
-  int   numOfThreads;                   // number of threads to handle connections
-  void *(*fp)(char *, void *, void *);  // function to process the incoming msg
-  void *qhandle;                        // queue handle
-  int   bits;                           // number of bits for sessionId
-  int   numOfChanns;                    // number of channels
-  int   sessionsPerChann;               // number of sessions per channel
-  int   idMgmt;                         // TAOS_ID_ASSIGNED, TAOS_ID_FREE
-  int   connType;                       // TAOS_CONN_UDP, TAOS_CONN_TCPC, TAOS_CONN_TCPS
-  int   idleTime;                       // milliseconds, 0 means idle timer is disabled
-  int   noFree;                         // not free buffer
-  void (*efp)(int cid);                 // call back function to process not activated chann
-  int (*afp)(char *meterId, char *spi, char *encrypt, uint8_t *secret,
-             uint8_t *ckey);  // call back to retrieve auth info
-} SRpcInit;
-
-typedef struct {
-  int      cid;       // channel ID
-  int      sid;       // session ID
-  char *   meterId;   // meter ID
-  uint32_t peerId;    // peer link ID
-  void *   shandle;   // pointer returned by taosOpenRpc
-  void *   ahandle;   // handle provided by app
-  char *   peerIp;    // peer IP string
-  uint16_t    peerPort;  // peer port
-  char     spi;       // security parameter index
-  char     encrypt;   // encrypt algorithm
-  char *   secret;    // key for authentication
-  char *   ckey;      // ciphering key
-} SRpcConnInit;
+#define TAOS_CONN_SERVER   0
+#define TAOS_CONN_CLIENT   1
 
 extern int tsRpcHeadSize;
 
-void *taosOpenRpc(SRpcInit *pRpc);
-
-void taosCloseRpc(void *);
-
-int taosOpenRpcChannWithQ(void *handle, int cid, int sessions, void *qhandle);
-
-void taosCloseRpcChann(void *handle, int cid);
-
-void *taosOpenRpcConn(SRpcConnInit *pInit, uint8_t *code);
-
-void taosCloseRpcConn(void *thandle);
-
-void taosStopRpcConn(void *thandle);
-
-int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle);
-
-char *taosBuildReqHeader(void *param, char type, char *msg);
-
-char *taosBuildReqMsgWithSize(void *, char type, int size);
-
-char *taosBuildRspMsgWithSize(void *, char type, int size);
-
-int taosSendSimpleRsp(void *thandle, char rsptype, char code);
-
-int taosSetSecurityInfo(int cid, int sid, char *id, int spi, int encrypt, char *secret, char *ckey);
-
-void taosGetRpcConnInfo(void *thandle, uint32_t *peerId, uint32_t *peerIp, uint16_t *peerPort, int *cid, int *sid);
+typedef struct SRpcEpSet {
+  int8_t    inUse; 
+  int8_t    numOfEps;
+  uint16_t  port[TSDB_MAX_REPLICA];
+  char      fqdn[TSDB_MAX_REPLICA][TSDB_FQDN_LEN];
+} SRpcEpSet;
+
+typedef struct SRpcCorEpSet {
+  int32_t version; 
+  SRpcEpSet epSet; 
+} SRpcCorEpSet;
+
+typedef struct SRpcConnInfo {
+  uint32_t  clientIp;
+  uint16_t  clientPort;
+  uint32_t  serverIp;
+  char      user[TSDB_USER_LEN];
+} SRpcConnInfo;
+
+typedef struct SRpcMsg {
+  uint8_t msgType;
+  void   *pCont;
+  int     contLen;
+  int32_t code;
+  void   *handle;   // rpc handle returned to app
+  void   *ahandle;  // app handle set by client
+} SRpcMsg;
+
+typedef struct SRpcInit {
+  uint16_t localPort; // local port
+  char  *label;        // for debug purpose
+  int    numOfThreads; // number of threads to handle connections
+  int    sessions;     // number of sessions allowed
+  int8_t connType;     // TAOS_CONN_UDP, TAOS_CONN_TCPC, TAOS_CONN_TCPS
+  int    idleTime;     // milliseconds, 0 means idle timer is disabled
+
+  // the following is for client app ecurity only
+  char *user;         // user name
+  char  spi;          // security parameter index
+  char  encrypt;      // encrypt algorithm
+  char *secret;       // key for authentication
+  char *ckey;         // ciphering key
+
+  // call back to process incoming msg, code shall be ignored by server app
+  void (*cfp)(SRpcMsg *, SRpcEpSet *);  
+
+  // call back to retrieve the client auth info, for server app only 
+  int  (*afp)(char *tableId, char *spi, char *encrypt, char *secret, char *ckey);
+} SRpcInit;
 
-int taosGetOutType(void *thandle);
+void *rpcOpen(const SRpcInit *pRpc);
+void  rpcClose(void *);
+void *rpcMallocCont(int contLen);
+void  rpcFreeCont(void *pCont);
+void *rpcReallocCont(void *ptr, int contLen);
+void  rpcSendRequest(void *thandle, const SRpcEpSet *pEpSet, SRpcMsg *pMsg);
+void  rpcSendResponse(const SRpcMsg *pMsg);
+void  rpcSendRedirectRsp(void *pConn, const SRpcEpSet *pEpSet); 
+int   rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
+void  rpcSendRecv(void *shandle, SRpcEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
+int   rpcReportProgress(void *pConn, char *pCont, int contLen);
+void  rpcCancelRequest(void *pContext);
 
 #ifdef __cplusplus
 }
diff --git a/src/inc/tsched.h b/src/inc/tsched.h
deleted file mode 100644
index 827ecbbb421b78c7d5140efc5c3be6e1edca4578..0000000000000000000000000000000000000000
--- a/src/inc/tsched.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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_TSCHED_H
-#define TDENGINE_TSCHED_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _sched_msg {
-  void (*fp)(struct _sched_msg *);
-
-  void (*tfp)(void *, void *);
-
-  char *msg;
-  void *ahandle;
-  void *thandle;
-} SSchedMsg;
-
-void *taosInitScheduler(int queueSize, int numOfThreads, const char *label);
-
-void *taosInitSchedulerWithInfo(int queueSize, int numOfThreads, const char *label, void *tmrCtrl);
-
-int taosScheduleTask(void *qhandle, SSchedMsg *pMsg);
-
-void taosCleanUpScheduler(void *param);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSCHED_H
diff --git a/src/inc/tschemautil.h b/src/inc/tschemautil.h
deleted file mode 100644
index 0031b4fa2590496ca59b02e877f755f273591d08..0000000000000000000000000000000000000000
--- a/src/inc/tschemautil.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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_TSCHEMAUTIL_H
-#define TDENGINE_TSCHEMAUTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include "taosmsg.h"
-#include "tstoken.h"
-
-#define VALIDNUMOFCOLS(x) ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS)
-
-struct SSchema;
-
-/**
- * check if the schema is valid or not, including following aspects:
- * 1. number of columns
- * 2. column types
- * 3. column length
- * 4. column names
- * 5. total length
- *
- * @param pSchema
- * @param numOfCols
- * @return
- */
-bool isValidSchema(struct SSchema *pSchema, int32_t numOfCols);
-
-struct SSchema *tsGetSchema(SMeterMeta *pMeta);
-
-struct SSchema *tsGetTagSchema(SMeterMeta *pMeta);
-
-struct SSchema *tsGetColumnSchema(SMeterMeta *pMeta, int32_t startCol);
-struct SSchema tsGetTbnameColumnSchema();
-
-char *tsGetTagsValue(SMeterMeta *pMeta);
-
-bool tsMeterMetaIdentical(SMeterMeta *p1, SMeterMeta *p2);
-
-void extractTableName(char *meterId, char *name);
-
-SSQLToken extractDBName(char *meterId, char *name);
-
-void extractTableNameFromToken(SSQLToken *pToken, SSQLToken* pTable);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSCHEMAUTIL_H
diff --git a/src/inc/tscompression.h b/src/inc/tscompression.h
deleted file mode 100644
index 71c25eed3f6ce1b114e58ec664117ec8af0ae6e4..0000000000000000000000000000000000000000
--- a/src/inc/tscompression.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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_TSCOMPRESSION_H
-#define TDENGINE_TSCOMPRESSION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "tsdb.h"
-
-#define BITS_PER_BYTE 8
-// Masks
-#define INT64MASK(_x) ((1ul << _x) - 1)
-#define INT32MASK(_x) (((uint32_t)1 << _x) - 1)
-#define INT8MASK(_x) (((uint8_t)1 << _x) - 1)
-// Compression algorithm
-#define NO_COMPRESSION 0
-#define ONE_STAGE_COMP 1
-#define TWO_STAGE_COMP 2
-
-int tsCompressTinyint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm,
-                      char* const buffer, int bufferSize);
-int tsCompressSmallint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                       char* const buffer, int bufferSize);
-int tsCompressInt(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                  char* const buffer, int bufferSize);
-int tsCompressBigint(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                     char* const buffer, int bufferSize);
-int tsCompressBool(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorithm,
-                   char* const buffer, int bufferSize);
-int tsCompressString(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                     char* const buffer, int bufferSize);
-int tsCompressFloat(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                    char* const buffer, int bufferSize);
-int tsCompressDouble(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                     char* const buffer, int bufferSize);
-int tsCompressTimestamp(const char* const input, int inputSize, const int nelements, char* const output, int outputSize, char algorith,
-                        char* const buffer, int bufferSize);
-
-int tsDecompressTinyint(const char* const input, int compressedSize, const int nelements, char* const output,
-                        int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressSmallint(const char* const input, int compressedSize, const int nelements, char* const output,
-                         int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressInt(const char* const input, int compressedSize, const int nelements, char* const output, int outputSize,
-                    char algorithm, char* const buffer, int bufferSize);
-int tsDecompressBigint(const char* const input, int compressedSize, const int nelements, char* const output,
-                       int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressBool(const char* const input, int compressedSize, const int nelements, char* const output,
-                     int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressString(const char* const input, int compressedSize, const int nelements, char* const output,
-                       int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressFloat(const char* const input, int compressedSize, const int nelements, char* const output,
-                      int outputSize, char algorithm, char* const buffer, int bufferSize);
-int tsDecompressDouble(const char* const input, int compressedSize, const int nelements, char* const output,
-                       int outputSize, char algorith, char* const buffer, int bufferSize);
-int tsDecompressTimestamp(const char* const input, int compressedSize, const int nelements, char* const output,
-                          int outputSize, char algorithm, char* const buffer, int bufferSize);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSCOMPRESSION_H
\ No newline at end of file
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index aa712ab62296c806b530cea14bacba525530d93d..85f9b3bdc7f1cf806309f597ffad6955151b4c36 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -12,234 +12,310 @@
  * 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 _TD_TSDB_H_
+#define _TD_TSDB_H_
 
-#ifndef _tsdb_global_header_
-#define _tsdb_global_header_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include <pthread.h>
+#include <stdbool.h>
 #include <stdint.h>
-#include "tglobalcfg.h"
 
-#define TSDB__packed
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tarray.h"
+#include "tdataformat.h"
+#include "tname.h"
+#include "hash.h"
 
-#ifdef TSKEY32
-#define TSKEY int32_t;
-#else
-#define TSKEY int64_t
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-#define TSDB_TRUE 1
-#define TSDB_FALSE 0
-#define TSDB_OK 0
-#define TSDB_ERR -1
-
-#define TS_PATH_DELIMITER "."
-
-#define TSDB_TIME_PRECISION_MILLI 0
-#define TSDB_TIME_PRECISION_MICRO 1
-
-#define TSDB_TIME_PRECISION_MILLI_STR "ms"
-#define TSDB_TIME_PRECISION_MICRO_STR "us"
-
-#define TSDB_DATA_TYPE_BOOL       1     // 1 bytes
-#define TSDB_DATA_TYPE_TINYINT    2     // 1 byte
-#define TSDB_DATA_TYPE_SMALLINT   3     // 2 bytes
-#define TSDB_DATA_TYPE_INT        4     // 4 bytes
-#define TSDB_DATA_TYPE_BIGINT     5     // 8 bytes
-#define TSDB_DATA_TYPE_FLOAT      6     // 4 bytes
-#define TSDB_DATA_TYPE_DOUBLE     7     // 8 bytes
-#define TSDB_DATA_TYPE_BINARY     8     // string
-#define TSDB_DATA_TYPE_TIMESTAMP  9     // 8 bytes
-#define TSDB_DATA_TYPE_NCHAR      10    // unicode string
-
-#define TSDB_KEYSIZE              sizeof(TSKEY)
-
-#if LINUX
-  #define TSDB_NCHAR_SIZE         sizeof(wchar_t)
-#else
-  #define TSDB_NCHAR_SIZE         4
-#endif
-//#define TSDB_CHAR_TERMINATED_SPACE 1
-
-#define TSDB_RELATION_INVALID     0
-#define TSDB_RELATION_LESS        1
-#define TSDB_RELATION_LARGE       2
-#define TSDB_RELATION_EQUAL       3
-#define TSDB_RELATION_LESS_EQUAL  4
-#define TSDB_RELATION_LARGE_EQUAL 5
-#define TSDB_RELATION_NOT_EQUAL   6
-#define TSDB_RELATION_LIKE        7
-
-#define TSDB_RELATION_AND         8
-#define TSDB_RELATION_OR          9
-#define TSDB_RELATION_NOT         10
-
-#define TSDB_BINARY_OP_ADD        11
-#define TSDB_BINARY_OP_SUBTRACT   12
-#define TSDB_BINARY_OP_MULTIPLY   13
-#define TSDB_BINARY_OP_DIVIDE     14
-#define TSDB_BINARY_OP_REMAINDER  15
-#define TSDB_USERID_LEN           9
-#define TS_PATH_DELIMITER_LEN     1
-
-#define TSDB_METER_ID_LEN_MARGIN  10
-#define TSDB_METER_ID_LEN         (TSDB_DB_NAME_LEN+TSDB_METER_NAME_LEN+2*TS_PATH_DELIMITER_LEN+TSDB_USERID_LEN+TSDB_METER_ID_LEN_MARGIN) //TSDB_DB_NAME_LEN+TSDB_METER_NAME_LEN+2*strlen(TS_PATH_DELIMITER)+strlen(USERID)
-#define TSDB_UNI_LEN              24
-#define TSDB_USER_LEN             TSDB_UNI_LEN
-#define TSDB_ACCT_LEN             TSDB_UNI_LEN
-#define TSDB_PASSWORD_LEN         TSDB_UNI_LEN
-
-#define TSDB_MAX_COLUMNS          256
-#define TSDB_MIN_COLUMNS          2       //PRIMARY COLUMN(timestamp) + other columns
-
-#define TSDB_METER_NAME_LEN       64
-#define TSDB_DB_NAME_LEN          32
-#define TSDB_COL_NAME_LEN         64
-#define TSDB_MAX_SAVED_SQL_LEN    TSDB_MAX_COLUMNS * 16
-#define TSDB_MAX_SQL_LEN          TSDB_PAYLOAD_SIZE
-#define TSDB_MAX_ALLOWED_SQL_LEN  (8*1024*1024U)          // sql length should be less than 6mb
-
-#define TSDB_MAX_BYTES_PER_ROW    TSDB_MAX_COLUMNS * 16
-#define TSDB_MAX_TAGS_LEN         512
-#define TSDB_MAX_TAGS             32
-
-#define TSDB_AUTH_LEN             16
-#define TSDB_KEY_LEN              16
-#define TSDB_VERSION_LEN          12
-#define TSDB_STREET_LEN           64
-#define TSDB_CITY_LEN             20
-#define TSDB_STATE_LEN            20
-#define TSDB_COUNTRY_LEN          20
-#define TSDB_VNODES_SUPPORT       6
-#define TSDB_MGMT_SUPPORT         4
-#define TSDB_LOCALE_LEN           64
-#define TSDB_TIMEZONE_LEN         64
-
-#define TSDB_IPv4ADDR_LEN      	  16
-#define TSDB_FILENAME_LEN         128
-#define TSDB_METER_VNODE_BITS     20
-#define TSDB_METER_SID_MASK       0xFFFFF
-#define TSDB_SHELL_VNODE_BITS     24
-#define TSDB_SHELL_SID_MASK       0xFF
-#define TSDB_HTTP_TOKEN_LEN       20
-#define TSDB_SHOW_SQL_LEN         32
-
-#define TSDB_METER_STATE_OFFLINE  0
-#define TSDB_METER_STATE_ONLLINE  1
-
-#define TSDB_DEFAULT_PKT_SIZE     65480  //same as RPC_MAX_UDP_SIZE
-
-#define TSDB_PAYLOAD_SIZE         (TSDB_DEFAULT_PKT_SIZE - 100)
-#define TSDB_DEFAULT_PAYLOAD_SIZE 1024   // default payload size
-#define TSDB_EXTRA_PAYLOAD_SIZE   128    // extra bytes for auth
-#define TSDB_SQLCMD_SIZE          1024
-#define TSDB_MAX_VNODES           256
-#define TSDB_MIN_VNODES           50
-#define TSDB_INVALID_VNODE_NUM    0
-
-#define TSDB_DNODE_ROLE_ANY       0
-#define TSDB_DNODE_ROLE_MGMT      1
-#define TSDB_DNODE_ROLE_VNODE     2
-
-#define TSDB_MAX_MPEERS           5
-#define TSDB_MAX_MGMT_IPS         (TSDB_MAX_MPEERS+1)
-
-#define TSDB_REPLICA_MIN_NUM      1
-/*
- * this is defined in CMakeList.txt
+#define TSDB_VERSION_MAJOR 1
+#define TSDB_VERSION_MINOR 0
+
+#define TSDB_INVALID_SUPER_TABLE_ID -1
+
+#define TSDB_STATUS_COMMIT_START 1
+#define TSDB_STATUS_COMMIT_OVER 2
+
+// TSDB STATE DEFINITION
+#define TSDB_STATE_OK 0x0
+#define TSDB_STATE_BAD_FILE 0x1
+
+// --------- TSDB APPLICATION HANDLE DEFINITION
+typedef struct {
+  void *appH;
+  void *cqH;
+  int (*notifyStatus)(void *, int status);
+  int (*eventCallBack)(void *);
+  void *(*cqCreateFunc)(void *handle, uint64_t uid, int sid, char *sqlStr, STSchema *pSchema);
+  void (*cqDropFunc)(void *handle);
+} STsdbAppH;
+
+// --------- TSDB REPOSITORY CONFIGURATION DEFINITION
+typedef struct {
+  int32_t tsdbId;
+  int32_t cacheBlockSize;
+  int32_t totalBlocks;
+  int32_t daysPerFile;  // day per file sharding policy
+  int32_t keep;         // day of data to keep
+  int32_t keep1;
+  int32_t keep2;
+  int32_t minRowsPerFileBlock;  // minimum rows per file block
+  int32_t maxRowsPerFileBlock;  // maximum rows per file block
+  int8_t  precision;
+  int8_t  compression;
+} STsdbCfg;
+
+// --------- TSDB REPOSITORY USAGE STATISTICS
+typedef struct {
+  int64_t totalStorage;  // total bytes occupie
+  int64_t compStorage;
+  int64_t pointsWritten;  // total data points written
+} STsdbStat;
+
+typedef void TSDB_REPO_T;  // use void to hide implementation details from outside
+
+STsdbCfg *tsdbGetCfg(const TSDB_REPO_T *repo);
+
+// --------- TSDB REPOSITORY DEFINITION
+int          tsdbCreateRepo(char *rootDir, STsdbCfg *pCfg);
+int32_t      tsdbDropRepo(char *rootDir);
+TSDB_REPO_T *tsdbOpenRepo(char *rootDir, STsdbAppH *pAppH);
+void         tsdbCloseRepo(TSDB_REPO_T *repo, int toCommit);
+int32_t      tsdbConfigRepo(TSDB_REPO_T *repo, STsdbCfg *pCfg);
+int          tsdbGetState(TSDB_REPO_T *repo);
+
+// --------- TSDB TABLE DEFINITION
+typedef struct {
+  uint64_t uid;  // the unique table ID
+  int32_t  tid;  // the table ID in the repository.
+} STableId;
+
+// --------- TSDB TABLE configuration
+typedef struct {
+  ETableType type;
+  char *     name;
+  STableId   tableId;
+  int32_t    sversion;
+  char *     sname;  // super table name
+  uint64_t   superUid;
+  STSchema * schema;
+  STSchema * tagSchema;
+  SDataRow   tagValues;
+  char *     sql;
+} STableCfg;
+
+void tsdbClearTableCfg(STableCfg *config);
+
+void* tsdbGetTableTagVal(const void* pTable, int32_t colId, int16_t type, int16_t bytes);
+char* tsdbGetTableName(void *pTable);
+
+#define TSDB_TABLEID(_table) ((STableId*) (_table))
+
+STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg);
+
+int   tsdbCreateTable(TSDB_REPO_T *repo, STableCfg *pCfg);
+int   tsdbDropTable(TSDB_REPO_T *pRepo, STableId tableId);
+int   tsdbUpdateTableTagValue(TSDB_REPO_T *repo, SUpdateTableTagValMsg *pMsg);
+TSKEY tsdbGetTableLastKey(TSDB_REPO_T *repo, uint64_t uid);
+
+uint32_t tsdbGetFileInfo(TSDB_REPO_T *repo, char *name, uint32_t *index, uint32_t eindex, int64_t *size);
+
+// the TSDB repository info
+typedef struct STsdbRepoInfo {
+  STsdbCfg tsdbCfg;
+  int64_t  version;            // version of the repository
+  int64_t  tsdbTotalDataSize;  // the original inserted data size
+  int64_t  tsdbTotalDiskSize;  // the total disk size taken by this TSDB repository
+  // TODO: Other informations to add
+} STsdbRepoInfo;
+STsdbRepoInfo *tsdbGetStatus(TSDB_REPO_T *pRepo);
+
+// the meter information report structure
+typedef struct {
+  STableCfg tableCfg;
+  int64_t   version;
+  int64_t   tableTotalDataSize;  // In bytes
+  int64_t   tableTotalDiskSize;  // In bytes
+} STableInfo;
+STableInfo *tsdbGetTableInfo(TSDB_REPO_T *pRepo, STableId tid);
+
+// -- FOR INSERT DATA
+/**
+ * Insert data to a table in a repository
+ * @param pRepo the TSDB repository handle
+ * @param pData the data to insert (will give a more specific description)
+ *
+ * @return the number of points inserted, -1 for failure and the error number is set
  */
-//#define TSDB_REPLICA_MAX_NUM      3
-
-#define TSDB_TBNAME_COLUMN_INDEX       (-1)
-#define TSDB_MULTI_METERMETA_MAX_NUM    100000  // maximum batch size allowed to load metermeta
-
-//default value == 10
-#define TSDB_FILE_MIN_PARTITION_RANGE   1         //minimum partition range of vnode file in days
-#define TSDB_FILE_MAX_PARTITION_RANGE   3650      //max partition range of vnode file in days
-
-#define TSDB_DATA_MIN_RESERVE_DAY       1        // data in db to be reserved.
-#define TSDB_DATA_DEFAULT_RESERVE_DAY   3650     // ten years
-
-#define TSDB_MIN_COMPRESSION_LEVEL      0
-#define TSDB_MAX_COMPRESSION_LEVEL      2
-
-#define TSDB_MIN_COMMIT_TIME_INTERVAL   30
-#define TSDB_MAX_COMMIT_TIME_INTERVAL   40960
-
-#define TSDB_MIN_ROWS_IN_FILEBLOCK      200
-#define TSDB_MAX_ROWS_IN_FILEBLOCK      500000
-
-#define TSDB_MIN_CACHE_BLOCK_SIZE       100
-#define TSDB_MAX_CACHE_BLOCK_SIZE       104857600
-
-#define TSDB_MIN_CACHE_BLOCKS           100
-#define TSDB_MAX_CACHE_BLOCKS           409600
-
-#define TSDB_MIN_AVG_BLOCKS             2
-#define TSDB_MAX_AVG_BLOCKS             2048
-#define TSDB_DEFAULT_AVG_BLOCKS         4
-
-/*
- * There is a bug in function taosAllocateId.
- * When "create database tables 1" is executed, the wrong sid is assigned, so the minimum value is set to 2.
+int32_t tsdbInsertData(TSDB_REPO_T *repo, SSubmitMsg *pMsg, SShellSubmitRspMsg *pRsp);
+
+// -- FOR QUERY TIME SERIES DATA
+
+typedef void *TsdbQueryHandleT;  // Use void to hide implementation details
+
+// query condition to build vnode iterator
+typedef struct STsdbQueryCond {
+  STimeWindow  twindow;
+  int32_t      order;  // desc|asc order to iterate the data block
+  int32_t      numOfCols;
+  SColumnInfo *colList;
+} STsdbQueryCond;
+
+typedef struct SDataBlockInfo {
+  STimeWindow window;
+  int32_t     rows;
+  int32_t     numOfCols;
+  int64_t     uid;
+  int32_t     tid;
+} SDataBlockInfo;
+
+typedef struct {
+  void  *pTable;
+  TSKEY  lastKey;
+} STableKeyInfo;
+
+typedef struct {
+  size_t    numOfTables;
+  SArray   *pGroupList;
+  SHashObj *map;         // speedup acquire the tableQueryInfo by table uid
+} STableGroupInfo;
+
+/**
+ * Get the data block iterator, starting from position according to the query condition
+ *
+ * @param tsdb       tsdb handle
+ * @param pCond      query condition, including time window, result set order, and basic required columns for each block
+ * @param tableInfoGroup  table object list in the form of set, grouped into different sets according to the
+ *                        group by condition
+ * @param qinfo      query info handle from query processor
+ * @return
  */
-#define TSDB_MIN_TABLES_PER_VNODE       2
-#define TSDB_MAX_TABLES_PER_VNODE       220000
+TsdbQueryHandleT *tsdbQueryTables(TSDB_REPO_T *tsdb, STsdbQueryCond *pCond, STableGroupInfo *tableInfoGroup, void *qinfo);
 
-#define TSDB_MAX_JOIN_TABLE_NUM         5
-#define TSDB_MAX_UNION_CLAUSE           5
+/**
+ * Get the last row of the given query time window for all the tables in STableGroupInfo object.
+ * Note that only one data block with only row will be returned while invoking retrieve data block function for
+ * all tables in this group.
+ *
+ * @param tsdb   tsdb handle
+ * @param pCond  query condition, including time window, result set order, and basic required columns for each block
+ * @param tableInfo  table list.
+ * @return
+ */
+TsdbQueryHandleT tsdbQueryLastRow(TSDB_REPO_T *tsdb, STsdbQueryCond *pCond, STableGroupInfo *tableInfo, void *qinfo);
 
-#define TSDB_MAX_BINARY_LEN            (TSDB_MAX_BYTES_PER_ROW-TSDB_KEYSIZE)
-#define TSDB_MAX_NCHAR_LEN             (TSDB_MAX_BYTES_PER_ROW-TSDB_KEYSIZE)
-#define PRIMARYKEY_TIMESTAMP_COL_INDEX  0
+/**
+ * get the queried table object list
+ * @param pHandle
+ * @return
+ */
+SArray* tsdbGetQueriedTableList(TsdbQueryHandleT *pHandle);
+
+/**
+ * get the group list according to table id from client
+ * @param tsdb
+ * @param pCond
+ * @param groupList
+ * @param qinfo
+ * @return
+ */
+TsdbQueryHandleT tsdbQueryRowsInExternalWindow(TSDB_REPO_T *tsdb, STsdbQueryCond *pCond, STableGroupInfo *groupList,
+                                               void *qinfo);
 
-#define TSDB_DATA_BOOL_NULL             0x02
-#define TSDB_DATA_TINYINT_NULL          0x80
-#define TSDB_DATA_SMALLINT_NULL         0x8000
-#define TSDB_DATA_INT_NULL              0x80000000
-#define TSDB_DATA_BIGINT_NULL           0x8000000000000000L
+/**
+ * move to next block if exists
+ *
+ * @param pQueryHandle
+ * @return
+ */
+bool tsdbNextDataBlock(TsdbQueryHandleT *pQueryHandle);
 
-#define TSDB_DATA_FLOAT_NULL            0x7FF00000              // it is an NAN
-#define TSDB_DATA_DOUBLE_NULL           0x7FFFFF0000000000L     // an NAN
-#define TSDB_DATA_NCHAR_NULL            0xFFFFFFFF
-#define TSDB_DATA_BINARY_NULL           0xFF
+/**
+ * Get current data block information
+ *
+ * @param pQueryHandle
+ * @param pBlockInfo
+ * @return
+ */
+void tsdbRetrieveDataBlockInfo(TsdbQueryHandleT *pQueryHandle, SDataBlockInfo* pBlockInfo);
 
-#define TSDB_DATA_NULL_STR              "NULL"
-#define TSDB_DATA_NULL_STR_L            "null"
+/**
+ *
+ * Get the pre-calculated information w.r.t. current data block.
+ *
+ * In case of data block in cache, the pBlockStatis will always be NULL.
+ * If a block is not completed loaded from disk, the pBlockStatis will be NULL.
 
-#define TSDB_MAX_RPC_THREADS            5
+ * @pBlockStatis the pre-calculated value for current data blocks. if the block is a cache block, always return 0
+ * @return
+ */
+int32_t tsdbRetrieveDataBlockStatisInfo(TsdbQueryHandleT *pQueryHandle, SDataStatis **pBlockStatis);
 
-#define TSDB_QUERY_TYPE_NON_TYPE                       0x00U     // none type
-#define TSDB_QUERY_TYPE_FREE_RESOURCE                  0x01U     // free qhandle at vnode
+/**
+ *
+ * The query condition with primary timestamp is passed to iterator during its constructor function,
+ * the returned data block must be satisfied with the time window condition in any cases,
+ * which means the SData data block is not actually the completed disk data blocks.
+ *
+ * @param pQueryHandle      query handle
+ * @param pColumnIdList     required data columns id list
+ * @return
+ */
+SArray *tsdbRetrieveDataBlock(TsdbQueryHandleT *pQueryHandle, SArray *pColumnIdList);
 
-/*
- * 1. ordinary sub query for select * from super_table
- * 2. all sqlobj generated by createSubqueryObj with this flag
+/**
+ * Get the qualified table id for a super table according to the tag query expression.
+ * @param stableid. super table sid
+ * @param pTagCond. tag query condition
  */
-#define TSDB_QUERY_TYPE_SUBQUERY                       0x02U
-#define TSDB_QUERY_TYPE_STABLE_SUBQUERY                0x04U     // two-stage subquery for super table
+int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T *tsdb, uint64_t uid, TSKEY key, const char *pTagCond, size_t len,
+                                 int16_t tagNameRelType, const char *tbnameCond, STableGroupInfo *pGroupList,
+                                 SColIndex *pColIndex, int32_t numOfCols);
 
-#define TSDB_QUERY_TYPE_TABLE_QUERY                    0x08U     // query ordinary table; below only apply to client side
-#define TSDB_QUERY_TYPE_STABLE_QUERY                   0x10U    // query on super table
-#define TSDB_QUERY_TYPE_JOIN_QUERY                     0x20U    // join query
-#define TSDB_QUERY_TYPE_PROJECTION_QUERY               0x40U    // select *,columns... query
-#define TSDB_QUERY_TYPE_JOIN_SEC_STAGE                 0x80U    // join sub query at the second stage
+/**
+ * destory the created table group list, which is generated by tag query
+ * @param pGroupList
+ */
+void tsdbDestroyTableGroup(STableGroupInfo *pGroupList);
 
-#define TSDB_QUERY_TYPE_INSERT                        0x100U    // insert type
-#define TSDB_QUERY_TYPE_IMPORT                        0x200U    // import data
+/**
+ * create the table group result including only one table, used to handle the normal table query
+ *
+ * @param tsdb        tsdbHandle
+ * @param uid         table uid
+ * @param pGroupInfo  the generated result
+ * @return
+ */
+int32_t tsdbGetOneTableGroup(TSDB_REPO_T *tsdb, uint64_t uid, TSKEY startKey, STableGroupInfo *pGroupInfo);
 
-#define TSDB_QUERY_HAS_TYPE(x, _type)         (((x) & (_type)) != 0)
-#define TSDB_QUERY_SET_TYPE(x, _type)         ((x) |= (_type))
-#define TSDB_QUERY_RESET_TYPE(x)              ((x) = TSDB_QUERY_TYPE_NON_TYPE)
+/**
+ *
+ * @param tsdb
+ * @param pTableIdList
+ * @param pGroupInfo
+ * @return
+ */
+int32_t tsdbGetTableGroupFromIdList(TSDB_REPO_T* tsdb, SArray* pTableIdList, STableGroupInfo* pGroupInfo);
 
-#define TSQL_SO_ASC   1
-#define TSQL_SO_DESC  0
+/**
+ * clean up the query handle
+ * @param queryHandle
+ */
+void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle);
+
+/**
+ * get the statistics of repo usage
+ * @param repo. point to the tsdbrepo
+ * @param totalPoints. total data point written
+ * @param totalStorage. total bytes took by the tsdb
+ * @param compStorage. total bytes took by the tsdb after compressed
+ */
+void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int64_t *compStorage);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif  // _TD_TSDB_H_
diff --git a/src/inc/tskiplist.h b/src/inc/tskiplist.h
deleted file mode 100644
index d6cdd77c117762f8e561d2dff72857ce4305dcdf..0000000000000000000000000000000000000000
--- a/src/inc/tskiplist.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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 TBASE_TSKIPLIST_H
-#define TBASE_TSKIPLIST_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAX_SKIP_LIST_LEVEL 20
-
-#include <pthread.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "os.h"
-#include "ttypes.h"
-
-/*
- * key of each node
- * todo move to as the global structure in all search codes...
- */
-
-const static size_t SKIP_LIST_STR_KEY_LENGTH_THRESHOLD = 15;
-typedef tVariant    tSkipListKey;
-
-typedef enum tSkipListPointQueryType {
-  INCLUDE_POINT_QUERY,
-  EXCLUDE_POINT_QUERY,
-} tSkipListPointQueryType;
-
-typedef struct tSkipListNode {
-  uint16_t nLevel;
-  char *   pData;
-
-  struct tSkipListNode **pForward;
-  struct tSkipListNode **pBackward;
-
-  tSkipListKey key;
-} tSkipListNode;
-
-/*
- * @version 0.2
- * @date   2017/11/12
- * the simple version of SkipList.
- * for multi-thread safe purpose, we employ pthread_rwlock_t to guarantee to generate
- * deterministic result. Later, we will remove the lock in SkipList to further
- * enhance the performance. In this case, one should use the concurrent skip list (by
- * using michael-scott algorithm) instead of this simple version in a multi-thread
- * environment, to achieve higher performance of read/write operations.
- *
- * Note: Duplicated primary key situation.
- * In case of duplicated primary key, two ways can be employed to handle this situation:
- * 1. add as normal insertion with out special process.
- * 2. add an overflow pointer at each list node, all nodes with the same key will be added
- *    in the overflow pointer. In this case, the total steps of each search will be reduced significantly.
- *    Currently, we implement the skip list in a line with the first means, maybe refactor it soon.
- *
- *    Memory consumption: the memory alignment causes many memory wasted. So, employ a memory
- *    pool will significantly reduce the total memory consumption, as well as the calloc/malloc operation costs.
- *
- * 3. use the iterator pattern to refactor all routines to make it more clean
- */
-
-// state struct, record following information:
-// number of links in each level.
-// avg search steps, for latest 1000 queries
-// avg search rsp time, for latest 1000 queries
-// total memory size
-typedef struct tSkipListState {
-  // in bytes, sizeof(tSkipList)+sizeof(tSkipListNode)*tSkipList->nSize
-  uint64_t nTotalMemSize;
-  uint64_t nLevelNodeCnt[MAX_SKIP_LIST_LEVEL];
-  uint64_t queryCount;  // total query count
-
-  /*
-   * only record latest 1000 queries
-   * when the value==1000, = 0,
-   * nTotalStepsForQueries = 0,
-   * nTotalElapsedTimeForQueries = 0
-   */
-  uint64_t nRecQueries;
-  uint16_t nTotalStepsForQueries;
-  uint64_t nTotalElapsedTimeForQueries;
-
-  uint16_t nInsertObjs;
-  uint16_t nTotalStepsForInsert;
-  uint64_t nTotalElapsedTimeForInsert;
-} tSkipListState;
-
-typedef struct tSkipList {
-  tSkipListNode pHead;
-  uint64_t      nSize;
-  uint16_t      nMaxLevel;
-  uint16_t      nLevel;
-  uint16_t      keyType;
-  uint16_t      nMaxKeyLen;
-
-  __compar_fn_t    comparator;
-  pthread_rwlock_t lock;   // will be removed soon
-  tSkipListState   state;  // skiplist state
-} tSkipList;
-
-/*
- * iterate the skiplist
- * this will cause the multi-thread problem, when the skiplist is destroyed, the iterate may
- * continue iterating the skiplist, so add the reference count for skiplist
- * TODO add the ref for skiplist when one iterator is created
- */
-typedef struct SSkipListIterator {
-  tSkipList *    pSkipList;
-  tSkipListNode *cur;
-  int64_t        num;
-} SSkipListIterator;
-
-/*
- * query condition structure to denote the range query
- * todo merge the point query cond with range query condition
- */
-typedef struct tSKipListQueryCond {
-  // when the upper bounding == lower bounding, it is a point query
-  tSkipListKey lowerBnd;
-  tSkipListKey upperBnd;
-  int32_t      lowerBndRelOptr;  // relation operator to denote if lower bound is
-  int32_t      upperBndRelOptr;  // included or not
-} tSKipListQueryCond;
-
-tSkipList *tSkipListCreate(int16_t nMaxLevel, int16_t keyType, int16_t nMaxKeyLen);
-
-void *tSkipListDestroy(tSkipList *pSkipList);
-
-// create skip list key
-tSkipListKey tSkipListCreateKey(int32_t type, char *val, size_t keyLength);
-
-// destroy skip list key
-void tSkipListDestroyKey(tSkipListKey *pKey);
-
-// put data into skiplist
-tSkipListNode *tSkipListPut(tSkipList *pSkipList, void *pData, tSkipListKey *pKey, int32_t insertIdenticalKey);
-
-/*
- * get only *one* node of which key is equalled to pKey, even there are more
- * than one nodes are of the same key
- */
-tSkipListNode *tSkipListGetOne(tSkipList *pSkipList, tSkipListKey *pKey);
-
-/*
- * get all data with the same keys
- */
-int32_t tSkipListGets(tSkipList *pSkipList, tSkipListKey *pKey, tSkipListNode ***pRes);
-
-int32_t tSkipListIterateList(tSkipList *pSkipList, tSkipListNode ***pRes, bool (*fp)(tSkipListNode *, void *),
-                             void *param);
-
-/*
- * remove only one node of the pKey value.
- * If more than one node has the same value, any one will be removed
- *
- * @Return
- * true: one node has been removed
- * false: no node has been removed
- */
-bool tSkipListRemove(tSkipList *pSkipList, tSkipListKey *pKey);
-
-/*
- * remove the specified node in parameters
- */
-void tSkipListRemoveNode(tSkipList *pSkipList, tSkipListNode *pNode);
-
-// for debug purpose only
-void tSkipListPrint(tSkipList *pSkipList, int16_t nlevel);
-
-/*
- * range query & single point query function
- */
-int32_t tSkipListQuery(tSkipList *pSkipList, tSKipListQueryCond *pQueryCond, tSkipListNode ***pResult);
-
-/*
- * include/exclude point query
- */
-int32_t tSkipListPointQuery(tSkipList *pSkipList, tSkipListKey *pKey, int32_t numOfKey, tSkipListPointQueryType type,
-                            tSkipListNode ***pResult);
-
-int32_t tSkipListIteratorReset(tSkipList *pSkipList, SSkipListIterator *iter);
-bool tSkipListIteratorNext(SSkipListIterator *iter);
-tSkipListNode *tSkipListIteratorGet(SSkipListIterator *iter);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TBASE_TSKIPLIST_H
diff --git a/src/inc/tsocket.h b/src/inc/tsocket.h
deleted file mode 100644
index 9eb4c26464538fc3ea9d6f088cfb209192636493..0000000000000000000000000000000000000000
--- a/src/inc/tsocket.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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_TSOCKET_H
-#define TDENGINE_TSOCKET_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-int taosNonblockwrite(int fd, char *ptr, int nbytes);
-
-int taosReadn(int sock, char *buffer, int len);
-
-int taosWriteMsg(int fd, void *ptr, int nbytes);
-
-int taosReadMsg(int fd, void *ptr, int nbytes);
-
-int taosOpenUdpSocket(char *ip, uint16_t port);
-
-int taosOpenTcpClientSocket(char *ip, uint16_t port, char *localIp);
-
-int taosOpenTcpServerSocket(char *ip, uint16_t port);
-
-int taosKeepTcpAlive(int sockFd);
-
-void taosCloseTcpSocket(int sockFd);
-
-int taosOpenUDServerSocket(char *ip, uint16_t port);
-
-int taosOpenUDClientSocket(char *ip, uint16_t port);
-
-int taosOpenRawSocket(char *ip);
-
-int taosCopyFds(int sfd, int dfd, int64_t len);
-
-int taosGetPublicIp(char *const ip);
-
-int taosGetPrivateIp(char *const ip);
-
-void tinet_ntoa(char *ipstr, unsigned int ip);
-
-int taosSetNonblocking(int sock, int on);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSOCKET_H
diff --git a/src/inc/tsqldef.h b/src/inc/tsqldef.h
deleted file mode 100644
index 182860e67cf8df81401e8c065700b9d9fd6fa387..0000000000000000000000000000000000000000
--- a/src/inc/tsqldef.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * 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_TSQLDEF_H
-#define TDENGINE_TSQLDEF_H
-
-#define TK_ID                               1
-#define TK_BOOL                             2
-#define TK_TINYINT                          3
-#define TK_SMALLINT                         4
-#define TK_INTEGER                          5
-#define TK_BIGINT                           6
-#define TK_FLOAT                            7
-#define TK_DOUBLE                           8
-#define TK_STRING                           9
-#define TK_TIMESTAMP                       10
-#define TK_BINARY                          11
-#define TK_NCHAR                           12
-#define TK_OR                              13
-#define TK_AND                             14
-#define TK_NOT                             15
-#define TK_EQ                              16
-#define TK_NE                              17
-#define TK_ISNULL                          18
-#define TK_NOTNULL                         19
-#define TK_IS                              20
-#define TK_LIKE                            21
-#define TK_GLOB                            22
-#define TK_BETWEEN                         23
-#define TK_IN                              24
-#define TK_GT                              25
-#define TK_GE                              26
-#define TK_LT                              27
-#define TK_LE                              28
-#define TK_BITAND                          29
-#define TK_BITOR                           30
-#define TK_LSHIFT                          31
-#define TK_RSHIFT                          32
-#define TK_PLUS                            33
-#define TK_MINUS                           34
-#define TK_DIVIDE                          35
-#define TK_TIMES                           36
-#define TK_STAR                            37
-#define TK_SLASH                           38
-#define TK_REM                             39
-#define TK_CONCAT                          40
-#define TK_UMINUS                          41
-#define TK_UPLUS                           42
-#define TK_BITNOT                          43
-#define TK_SHOW                            44
-#define TK_DATABASES                       45
-#define TK_MNODES                          46
-#define TK_DNODES                          47
-#define TK_ACCOUNTS                        48
-#define TK_USERS                           49
-#define TK_MODULES                         50
-#define TK_QUERIES                         51
-#define TK_CONNECTIONS                     52
-#define TK_STREAMS                         53
-#define TK_CONFIGS                         54
-#define TK_SCORES                          55
-#define TK_GRANTS                          56
-#define TK_VNODES                          57
-#define TK_IPTOKEN                         58
-#define TK_DOT                             59
-#define TK_TABLES                          60
-#define TK_STABLES                         61
-#define TK_VGROUPS                         62
-#define TK_DROP                            63
-#define TK_TABLE                           64
-#define TK_DATABASE                        65
-#define TK_DNODE                           66
-#define TK_USER                            67
-#define TK_ACCOUNT                         68
-#define TK_USE                             69
-#define TK_DESCRIBE                        70
-#define TK_ALTER                           71
-#define TK_PASS                            72
-#define TK_PRIVILEGE                       73
-#define TK_LOCAL                           74
-#define TK_IF                              75
-#define TK_EXISTS                          76
-#define TK_CREATE                          77
-#define TK_PPS                             78
-#define TK_TSERIES                         79
-#define TK_DBS                             80
-#define TK_STORAGE                         81
-#define TK_QTIME                           82
-#define TK_CONNS                           83
-#define TK_STATE                           84
-#define TK_KEEP                            85
-#define TK_CACHE                           86
-#define TK_REPLICA                         87
-#define TK_DAYS                            88
-#define TK_ROWS                            89
-#define TK_ABLOCKS                         90
-#define TK_TBLOCKS                         91
-#define TK_CTIME                           92
-#define TK_CLOG                            93
-#define TK_COMP                            94
-#define TK_PRECISION                       95
-#define TK_LP                              96
-#define TK_RP                              97
-#define TK_TAGS                            98
-#define TK_USING                           99
-#define TK_AS                             100
-#define TK_COMMA                          101
-#define TK_NULL                           102
-#define TK_SELECT                         103
-#define TK_UNION                          104
-#define TK_ALL                            105
-#define TK_FROM                           106
-#define TK_VARIABLE                       107
-#define TK_INTERVAL                       108
-#define TK_FILL                           109
-#define TK_SLIDING                        110
-#define TK_ORDER                          111
-#define TK_BY                             112
-#define TK_ASC                            113
-#define TK_DESC                           114
-#define TK_GROUP                          115
-#define TK_HAVING                         116
-#define TK_LIMIT                          117
-#define TK_OFFSET                         118
-#define TK_SLIMIT                         119
-#define TK_SOFFSET                        120
-#define TK_WHERE                          121
-#define TK_NOW                            122
-#define TK_RESET                          123
-#define TK_QUERY                          124
-#define TK_ADD                            125
-#define TK_COLUMN                         126
-#define TK_TAG                            127
-#define TK_CHANGE                         128
-#define TK_SET                            129
-#define TK_KILL                           130
-#define TK_CONNECTION                     131
-#define TK_COLON                          132
-#define TK_STREAM                         133
-#define TK_ABORT                          134
-#define TK_AFTER                          135
-#define TK_ATTACH                         136
-#define TK_BEFORE                         137
-#define TK_BEGIN                          138
-#define TK_CASCADE                        139
-#define TK_CLUSTER                        140
-#define TK_CONFLICT                       141
-#define TK_COPY                           142
-#define TK_DEFERRED                       143
-#define TK_DELIMITERS                     144
-#define TK_DETACH                         145
-#define TK_EACH                           146
-#define TK_END                            147
-#define TK_EXPLAIN                        148
-#define TK_FAIL                           149
-#define TK_FOR                            150
-#define TK_IGNORE                         151
-#define TK_IMMEDIATE                      152
-#define TK_INITIALLY                      153
-#define TK_INSTEAD                        154
-#define TK_MATCH                          155
-#define TK_KEY                            156
-#define TK_OF                             157
-#define TK_RAISE                          158
-#define TK_REPLACE                        159
-#define TK_RESTRICT                       160
-#define TK_ROW                            161
-#define TK_STATEMENT                      162
-#define TK_TRIGGER                        163
-#define TK_VIEW                           164
-#define TK_COUNT                          165
-#define TK_SUM                            166
-#define TK_AVG                            167
-#define TK_MIN                            168
-#define TK_MAX                            169
-#define TK_FIRST                          170
-#define TK_LAST                           171
-#define TK_TOP                            172
-#define TK_BOTTOM                         173
-#define TK_STDDEV                         174
-#define TK_PERCENTILE                     175
-#define TK_APERCENTILE                    176
-#define TK_LEASTSQUARES                   177
-#define TK_HISTOGRAM                      178
-#define TK_DIFF                           179
-#define TK_SPREAD                         180
-#define TK_TWA                            181
-#define TK_INTERP                         182
-#define TK_LAST_ROW                       183
-#define TK_RATE                           184
-#define TK_IRATE                          185
-#define TK_SUM_RATE                       186
-#define TK_SUM_IRATE                      187
-#define TK_AVG_RATE                       188
-#define TK_AVG_IRATE                      189
-#define TK_SEMI                           190
-#define TK_NONE                           191
-#define TK_PREV                           192
-#define TK_LINEAR                         193
-#define TK_IMPORT                         194
-#define TK_METRIC                         195
-#define TK_TBNAME                         196
-#define TK_JOIN                           197
-#define TK_METRICS                        198
-#define TK_STABLE                         199
-#define TK_INSERT                         200
-#define TK_INTO                           201
-#define TK_VALUES                         202
-
-#endif
-
-
diff --git a/src/inc/tsqlfunction.h b/src/inc/tsqlfunction.h
deleted file mode 100644
index 93f50cf4f3862e7d2747c10399858c3be0562072..0000000000000000000000000000000000000000
--- a/src/inc/tsqlfunction.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * 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_TSQLFUNCTION_H
-#define TDENGINE_TSQLFUNCTION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "trpc.h"
-#include "ttypes.h"
-
-#define TSDB_FUNC_INVALID_ID  -1
-#define TSDB_FUNC_COUNT        0
-#define TSDB_FUNC_SUM          1
-#define TSDB_FUNC_AVG          2
-#define TSDB_FUNC_MIN          3
-#define TSDB_FUNC_MAX          4
-#define TSDB_FUNC_STDDEV       5
-#define TSDB_FUNC_PERCT        6
-#define TSDB_FUNC_APERCT       7
-#define TSDB_FUNC_FIRST        8
-#define TSDB_FUNC_LAST         9
-#define TSDB_FUNC_LAST_ROW     10
-#define TSDB_FUNC_TOP          11
-#define TSDB_FUNC_BOTTOM       12
-#define TSDB_FUNC_SPREAD       13
-#define TSDB_FUNC_TWA          14
-#define TSDB_FUNC_LEASTSQR     15
-
-#define TSDB_FUNC_TS           16
-#define TSDB_FUNC_TS_DUMMY     17
-#define TSDB_FUNC_TAG_DUMMY    18
-#define TSDB_FUNC_TS_COMP      19
-
-#define TSDB_FUNC_TAG          20
-#define TSDB_FUNC_PRJ          21
-
-#define TSDB_FUNC_TAGPRJ       22
-#define TSDB_FUNC_ARITHM       23
-#define TSDB_FUNC_DIFF         24
-
-#define TSDB_FUNC_FIRST_DST    25
-#define TSDB_FUNC_LAST_DST     26
-#define TSDB_FUNC_INTERP       27
-
-#define TSDB_FUNCSTATE_SO           0x1U    // single output
-#define TSDB_FUNCSTATE_MO           0x2U    // dynamic number of output, not multinumber of output e.g., TOP/BOTTOM
-#define TSDB_FUNCSTATE_STREAM       0x4U    // function avail for stream
-#define TSDB_FUNCSTATE_METRIC       0x8U    // function avail for metric
-#define TSDB_FUNCSTATE_OF           0x10U   // outer forward
-#define TSDB_FUNCSTATE_NEED_TS      0x20U   // timestamp is required during query processing
-#define TSDB_FUNCSTATE_SELECTIVITY  0x40U   // selectivity functions, can exists along with tag columns
-
-#define TSDB_BASE_FUNC_SO TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_OF
-#define TSDB_BASE_FUNC_MO TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_METRIC | TSDB_FUNCSTATE_OF
-
-#define TSDB_PATTERN_MATCH            0
-#define TSDB_PATTERN_NOMATCH          1
-#define TSDB_PATTERN_NOWILDCARDMATCH  2
-#define TSDB_PATTERN_STRING_MAX_LEN   20
-
-#define TSDB_FUNCTIONS_NAME_MAX_LENGTH 16
-#define TSDB_AVG_FUNCTION_INTER_BUFFER_SIZE 50
-
-#define PATTERN_COMPARE_INFO_INITIALIZER \
-  { '%', '_' }
-
-#define DATA_SET_FLAG ','  // to denote the output area has data, not null value
-#define DATA_SET_FLAG_SIZE sizeof(DATA_SET_FLAG)
-
-#define QUERY_COND_REL_PREFIX_IN "IN|"
-#define QUERY_COND_REL_PREFIX_LIKE "LIKE|"
-
-#define QUERY_COND_REL_PREFIX_IN_LEN 3
-#define QUERY_COND_REL_PREFIX_LIKE_LEN 5
-
-#define QUERY_ASC_FORWARD_STEP 1
-#define QUERY_DESC_FORWARD_STEP -1
-
-#define GET_FORWARD_DIRECTION_FACTOR(ord) (((ord) == TSQL_SO_ASC) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP)
-
-#define MAX_RETRIEVE_ROWS_IN_INTERVAL_QUERY 10000000
-#define TOP_BOTTOM_QUERY_LIMIT 100
-
-enum {
-  MASTER_SCAN           = 0x0,
-  SUPPLEMENTARY_SCAN    = 0x1,
-  FIRST_STAGE_MERGE     = 0x10,
-  SECONDARY_STAGE_MERGE = 0x20,
-};
-
-#define QUERY_IS_STABLE_QUERY(type) (((type)&TSDB_QUERY_TYPE_STABLE_QUERY) != 0)
-#define QUERY_IS_JOIN_QUERY(type) (((type)&TSDB_QUERY_TYPE_JOIN_QUERY) != 0)
-#define QUERY_IS_PROJECTION_QUERY(type) (((type)&TSDB_QUERY_TYPE_PROJECTION_QUERY) != 0)
-#define QUERY_IS_FREE_RESOURCE(type) (((type)&TSDB_QUERY_TYPE_FREE_RESOURCE) != 0)
-
-typedef struct SArithmeticSupport {
-  SSqlFunctionExpr *pExpr;
-  int32_t           elemSize[TSDB_MAX_COLUMNS];
-  int32_t           numOfCols;
-  int32_t           offset;
-  char *            data[TSDB_MAX_COLUMNS];
-} SArithmeticSupport;
-
-typedef struct SQLPreAggVal {
-  bool    isSet;
-  int32_t numOfNull;
-  int64_t sum;
-  int64_t max;
-  int64_t min;
-  int16_t maxIndex;
-  int16_t minIndex;
-} SQLPreAggVal;
-
-typedef struct SInterpInfoDetail {
-  TSKEY  ts;  // interp specified timestamp
-  int8_t hasResult;
-  int8_t type;
-  int8_t primaryCol;
-} SInterpInfoDetail;
-
-typedef struct SInterpInfo { SInterpInfoDetail *pInterpDetail; } SInterpInfo;
-
-typedef struct SResultInfo {
-  int8_t  hasResult;       // result generated, not NULL value
-  bool    initialized;     // output buffer has been initialized
-  bool    complete;        // query has completed
-  bool    superTableQ;     // is super table query
-  int32_t numOfRes;        // num of output result in current buffer
-  int32_t bufLen;          // buffer size
-  void *  interResultBuf;  // output result buffer
-} SResultInfo;
-
-struct SQLFunctionCtx;
-
-/**
- * for selectivity query, the corresponding tag value is assigned if the data is qualified
- */
-typedef struct SExtTagsInfo {
-  int16_t                 tagsLen;      // keep the tags data for top/bottom query result
-  int16_t                 numOfTagCols;
-  struct SQLFunctionCtx **pTagCtxList;
-} SExtTagsInfo;
-
-// sql function runtime context
-typedef struct SQLFunctionCtx {
-  int32_t startOffset;
-  int32_t size;      // number of rows
-  int32_t order;     // asc|desc
-  int32_t scanFlag;  // TODO merge with currentStage
-
-  int16_t inputType;
-  int16_t inputBytes;
-
-  int16_t  outputType;
-  int16_t  outputBytes;  // size of results, determined by function and input column data type
-  bool     hasNull;      // null value exist in current block
-  int16_t  functionId;   // function id
-  int32_t  blockStatus;  // Indicate if data is loaded, it is first/last/internal block. Only for file blocks
-  void *   aInputElemBuf;
-  char *   aOutputBuf;            // final result output buffer, point to sdata->data
-  uint8_t  currentStage;          // record current running step, default: 0
-  int64_t  nStartQueryTimestamp;  // timestamp range of current query when function is executed on a specific data block
-  int32_t  numOfParams;
-  tVariant param[4];      // input parameter, e.g., top(k, 20), the number of results for top query is kept in param */
-  int64_t *ptsList;       // corresponding timestamp array list
-  void *   ptsOutputBuf;  // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
-  SQLPreAggVal preAggVals;
-  tVariant     tag;
-  SResultInfo *resultInfo;
-
-  SExtTagsInfo tagInfo;
-} SQLFunctionCtx;
-
-typedef struct SQLAggFuncElem {
-  char aName[TSDB_FUNCTIONS_NAME_MAX_LENGTH];
-
-  uint8_t  nAggIdx;       // index of function in aAggs
-  int8_t   stableFuncId;  // transfer function for super table query
-  uint16_t nStatus;
-
-  bool (*init)(SQLFunctionCtx *pCtx);  // setup the execute environment
-
-  void (*xFunction)(SQLFunctionCtx *pCtx);                     // blocks version function
-  void (*xFunctionF)(SQLFunctionCtx *pCtx, int32_t position);  // single-row function version
-
-  // some sql function require scan data twice or more, e.g.,stddev
-  void (*xNextStep)(SQLFunctionCtx *pCtx);
-
-  /*
-   * finalizer must be called after all xFunction has been executed to
-   * generated final result. Otherwise, the value in aOutputBuf is a intern result.
-   */
-  void (*xFinalize)(SQLFunctionCtx *pCtx);
-
-  void (*distMergeFunc)(SQLFunctionCtx *pCtx);
-
-  void (*distSecondaryMergeFunc)(SQLFunctionCtx *pCtx);
-
-  int32_t (*dataReqFunc)(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId, int32_t blockStatus);
-} SQLAggFuncElem;
-
-typedef struct SPatternCompareInfo {
-  char matchAll;  // symbol for match all wildcard, default: '%'
-  char matchOne;  // symbol for match one wildcard, default: '_'
-} SPatternCompareInfo;
-
-#define GET_RES_INFO(ctx) ((ctx)->resultInfo)
-
-int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, int16_t *type,
-                          int16_t *len, int16_t *interResBytes, int16_t extLength, bool isSuperTable);
-
-int patternMatch(const char *zPattern, const char *zString, size_t size, const SPatternCompareInfo *pInfo);
-
-int WCSPatternMatch(const wchar_t *zPattern, const wchar_t *zString, size_t size, const SPatternCompareInfo *pInfo);
-
-#define IS_STREAM_QUERY_VALID(x)  (((x)&TSDB_FUNCSTATE_STREAM) != 0)
-#define IS_MULTIOUTPUT(x)         (((x)&TSDB_FUNCSTATE_MO) != 0)
-#define IS_SINGLEOUTPUT(x)        (((x)&TSDB_FUNCSTATE_SO) != 0)
-#define IS_OUTER_FORWARD(x)       (((x)&TSDB_FUNCSTATE_OF) != 0)
-
-/*
- * the status of one block, used in metric query. all blocks are mixed together,
- * we need the status to decide if one block is a first/end/inter block of one meter
- */
-enum {
-  BLK_FILE_BLOCK = 0x1,
-  BLK_BLOCK_LOADED = 0x2,
-  BLK_CACHE_BLOCK = 0x4,  // in case of cache block, block must be loaded
-};
-
-/* determine the real data need to calculated the result */
-enum {
-  BLK_DATA_NO_NEEDED = 0x0,
-  BLK_DATA_FILEDS_NEEDED = 0x1,
-  BLK_DATA_ALL_NEEDED = 0x3,
-};
-
-#define IS_FILE_BLOCK(x) (((x)&BLK_FILE_BLOCK) != 0)
-
-#define SET_FILE_BLOCK_FLAG(x) \
-  do {                         \
-    (x) &= (~BLK_CACHE_BLOCK); \
-    (x) |= BLK_FILE_BLOCK;     \
-  } while (0);
-
-#define SET_CACHE_BLOCK_FLAG(x) ((x) = BLK_CACHE_BLOCK | BLK_BLOCK_LOADED);
-
-#define SET_DATA_BLOCK_NOT_LOADED(x) ((x) &= (~BLK_BLOCK_LOADED));
-
-#define SET_DATA_BLOCK_LOADED(x) ((x) |= BLK_BLOCK_LOADED);
-#define IS_DATA_BLOCK_LOADED(x) (((x)&BLK_BLOCK_LOADED) != 0)
-
-typedef struct STwaInfo {
-  TSKEY   lastKey;
-  int8_t  hasResult;  // flag to denote has value
-  int16_t type;       // source data type
-  TSKEY   SKey;
-  TSKEY   EKey;
-
-  union {
-    double  dOutput;
-    int64_t iOutput;
-  };
-
-  union {
-    double  dLastValue;
-    int64_t iLastValue;
-  };
-} STwaInfo;
-
-/* global sql function array */
-extern struct SQLAggFuncElem aAggs[28];
-
-/* compatible check array list */
-extern int32_t funcCompatDefList[28];
-
-void getStatistics(char *priData, char *data, int32_t size, int32_t numOfRow, int32_t type, int64_t *min, int64_t *max,
-                   int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull);
-
-bool top_bot_datablock_filter(SQLFunctionCtx *pCtx, int32_t functionId, char *minval, char *maxval);
-
-void resetResultInfo(SResultInfo *pResInfo);
-void initResultInfo(SResultInfo *pResInfo);
-void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSQLFUNCTION_H
diff --git a/src/inc/tstoken.h b/src/inc/tstoken.h
deleted file mode 100644
index 3ecf28aa2af6717e751c2c7cf11956468c642df5..0000000000000000000000000000000000000000
--- a/src/inc/tstoken.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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_TTOKEN_H
-#define TDENGINE_TTOKEN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-
-#define TK_SPACE      200
-#define TK_COMMENT    201
-#define TK_ILLEGAL    202
-#define TK_HEX        203   // hex number  0x123
-#define TK_OCT        204   // oct number
-#define TK_BIN        205   // bin format data 0b111
-#define TK_FILE       206
-#define TK_QUESTION   207   // denoting the placeholder of "?",when invoking statement bind query
-
-#define TSQL_TBNAME "TBNAME"
-#define TSQL_TBNAME_L "tbname"
-
-// used to denote the minimum unite in sql parsing
-typedef struct SSQLToken {
-  uint32_t n;
-  uint32_t type;
-  char *   z;
-} SSQLToken;
-
-/**
- * tokenizer for sql string
- * @param z
- * @param tokenType
- * @return
- */
-uint32_t tSQLGetToken(char *z, uint32_t *tokenType);
-
-/**
- * enhanced tokenizer for sql string.
- *
- * @param str
- * @param i
- * @param isPrevOptr
- * @param numOfIgnoreToken
- * @param ignoreTokenTypes
- * @return
- */
-SSQLToken tStrGetToken(char *str, int32_t *i, bool isPrevOptr, uint32_t numOfIgnoreToken, uint32_t *ignoreTokenTypes);
-
-/**
- * check if it is a keyword or not
- * @param z
- * @param len
- * @return
- */
-bool isKeyWord(const char *z, int32_t len);
-
-/**
- * check if it is a number or not
- * @param pToken
- * @return
- */
-bool isNumber(const SSQLToken *pToken);
-
-/**
- * check if it is a token or not
- * @param pToken
- * @return       token type, if it is not a number, TK_ILLEGAL will return
- */
-int32_t isValidNumber(const SSQLToken* pToken);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TTOKEN_H
diff --git a/src/inc/tsync.h b/src/inc/tsync.h
new file mode 100644
index 0000000000000000000000000000000000000000..ca0f70d104d603d176d89dd5b92979433f390466
--- /dev/null
+++ b/src/inc/tsync.h
@@ -0,0 +1,133 @@
+/*
+ * 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_SYNC_H
+#define TDENGINE_SYNC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TAOS_SYNC_MAX_REPLICA 5
+#define TAOS_SYNC_MAX_INDEX   0x7FFFFFFF
+
+typedef enum _TAOS_SYNC_ROLE {
+  TAOS_SYNC_ROLE_OFFLINE,
+  TAOS_SYNC_ROLE_UNSYNCED,
+  TAOS_SYNC_ROLE_SYNCING,
+  TAOS_SYNC_ROLE_SLAVE,
+  TAOS_SYNC_ROLE_MASTER,
+} ESyncRole;
+
+typedef enum _TAOS_SYNC_STATUS {
+  TAOS_SYNC_STATUS_INIT,
+  TAOS_SYNC_STATUS_START,
+  TAOS_SYNC_STATUS_FILE,
+  TAOS_SYNC_STATUS_CACHE,
+} ESyncStatus;
+
+typedef struct {
+  uint32_t  nodeId;    // node ID assigned by TDengine
+  uint16_t  nodePort;  // node sync Port
+  char      nodeFqdn[TSDB_FQDN_LEN]; // node FQDN  
+} SNodeInfo;
+
+typedef struct {
+  int8_t     quorum;    // number of confirms required, >=1 
+  int8_t     replica;   // number of replications, >=1
+  SNodeInfo  nodeInfo[TAOS_SYNC_MAX_REPLICA];
+} SSyncCfg;
+
+typedef struct {
+  int       selfIndex;
+  uint32_t  nodeId[TAOS_SYNC_MAX_REPLICA];
+  int       role[TAOS_SYNC_MAX_REPLICA];  
+} SNodesRole;
+
+/* 
+  if name is empty(name[0] is zero), get the file from index or after, but not larger than eindex. If a file
+  is found between index and eindex, index shall be updated, name shall be set, size shall be set to 
+  file size, and file magic number shall be returned. 
+
+  if name is provided(name[0] is not zero), get the named file at the specified index. If not there, return
+  zero. If it is there, set the size to file size, and return file magic number. Index shall not be updated.
+*/
+typedef uint32_t (*FGetFileInfo)(void *ahandle, char *name, uint32_t *index, uint32_t eindex, int64_t *size, uint64_t *fversion); 
+
+// get the wal file from index or after
+// return value, -1: error, 1:more wal files, 0:last WAL. if name[0]==0, no WAL file
+typedef int      (*FGetWalInfo)(void *ahandle, char *name, uint32_t *index); 
+ 
+// when a forward pkt is received, call this to handle data 
+typedef int      (*FWriteToCache)(void *ahandle, void *pHead, int type);
+
+// when forward is confirmed by peer, master call this API to notify app
+typedef void     (*FConfirmForward)(void *ahandle, void *mhandle, int32_t code);
+
+// when role is changed, call this to notify app
+typedef void     (*FNotifyRole)(void *ahandle, int8_t role);
+
+// if a number of retrieving data failed, call this to start flow control 
+typedef void     (*FNotifyFlowCtrl)(void *ahandle, int32_t mseconds);
+
+// when data file is synced successfully, notity app
+typedef int      (*FNotifyFileSynced)(void *ahandle, uint64_t fversion);
+
+typedef struct {
+  int32_t    vgId;      // vgroup ID
+  uint64_t   version;   // initial version
+  SSyncCfg   syncCfg;   // configuration from mgmt
+  char       path[128]; // path to the file
+ 
+  void      *ahandle;   // handle provided by APP 
+  FGetFileInfo    getFileInfo;
+  FGetWalInfo     getWalInfo;
+  FWriteToCache   writeToCache;
+  FConfirmForward confirmForward;
+  FNotifyRole     notifyRole;
+  FNotifyFlowCtrl notifyFlowCtrl;
+  FNotifyFileSynced notifyFileSynced;
+} SSyncInfo;
+
+typedef void* tsync_h;
+
+int32_t syncInit();
+void    syncCleanUp();
+
+tsync_h syncStart(const SSyncInfo *);
+void    syncStop(tsync_h shandle);
+int32_t syncReconfig(tsync_h shandle, const SSyncCfg *);
+int32_t syncForwardToPeer(tsync_h shandle, void *pHead, void *mhandle, int qtype);
+void    syncConfirmForward(tsync_h shandle, uint64_t version, int32_t code);
+void    syncRecover(tsync_h shandle);      // recover from other nodes:
+int     syncGetNodesRole(tsync_h shandle, SNodesRole *);
+
+extern  char *syncRole[];
+
+//global configurable parameters
+extern  int   tsMaxSyncNum;
+extern  int   tsSyncTcpThreads;
+extern  int   tsMaxWatchFiles;
+extern  int   tsSyncTimer;
+extern  int   tsMaxFwdInfo; 
+extern  int   sDebugFlag;
+extern  char  tsArbitrator[];
+extern  uint16_t tsSyncPort;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_SYNC_H
diff --git a/src/inc/tsystem.h b/src/inc/tsystem.h
deleted file mode 100644
index 9261261e1b860f51d731a8ba911ce07e3bcaa5a3..0000000000000000000000000000000000000000
--- a/src/inc/tsystem.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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_TSYSTEM_H
-#define TDENGINE_TSYSTEM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-
-extern char dataDir[TSDB_FILENAME_LEN];
-
-bool taosGetSysMemory(float *memoryUsedMB);
-
-bool taosGetProcMemory(float *memoryUsedMB);
-
-bool taosGetDisk();
-
-bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage);
-
-bool taosGetBandSpeed(float *bandSpeedKb);
-
-bool taosGetProcIO(float *readKB, float *writeKB);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/inc/ttime.h b/src/inc/ttime.h
deleted file mode 100644
index 34c241cbc0f22afc511660cee475c82d08466599..0000000000000000000000000000000000000000
--- a/src/inc/ttime.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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_TTIME_H
-#define TDENGINE_TTIME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <time.h>
-
-//@return timestamp in second
-int32_t taosGetTimestampSec();
-
-//@return timestamp in millisecond
-int64_t taosGetTimestampMs();
-
-//@return timestamp in microsecond
-int64_t taosGetTimestampUs();
-
-/*
- * @return timestamp decided by global conf variable, tsTimePrecision
- * if precision == TSDB_TIME_PRECISION_MICRO, it returns timestamp in microsecond.
- *    precision == TSDB_TIME_PRECISION_MILLI, it returns timestamp in millisecond.
- */
-int64_t taosGetTimestamp(int32_t precision);
-
-int32_t getTimestampInUsFromStr(char* token, int32_t tokenlen, int64_t* ts);
-
-int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec);
-void deltaToUtcInitOnce();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TTIME_H
diff --git a/src/inc/ttimer.h b/src/inc/ttimer.h
deleted file mode 100644
index b9bbbb04dd5a22252a8d9e587977324c7c51221e..0000000000000000000000000000000000000000
--- a/src/inc/ttimer.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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_TTIMER_H
-#define TDENGINE_TTIMER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void *tmr_h;
-typedef void (*TAOS_TMR_CALLBACK)(void *, void *);
-
-extern uint32_t tmrDebugFlag;
-extern int      taosTmrThreads;
-extern uint32_t taosMaxTmrCtrl;
-
-#define tmrError(...)                                 \
-  do { if (tmrDebugFlag & DEBUG_ERROR) {              \
-    tprintf("ERROR TMR ", tmrDebugFlag, __VA_ARGS__); \
-  } } while(0)
-
-#define tmrWarn(...)                                  \
-  do { if (tmrDebugFlag & DEBUG_WARN) {               \
-    tprintf("WARN  TMR ", tmrDebugFlag, __VA_ARGS__); \
-  } } while(0)
-
-#define tmrTrace(...)                           \
-  do { if (tmrDebugFlag & DEBUG_TRACE) {        \
-    tprintf("TMR ", tmrDebugFlag, __VA_ARGS__); \
-  } } while(0)
-
-#define MSECONDS_PER_TICK 5
-
-void *taosTmrInit(int maxTmr, int resoultion, int longest, const char *label);
-
-tmr_h taosTmrStart(TAOS_TMR_CALLBACK fp, int mseconds, void *param, void *handle);
-
-bool taosTmrStop(tmr_h tmrId);
-
-bool taosTmrStopA(tmr_h *timerId);
-
-bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void *param, void *handle, tmr_h *pTmrId);
-
-void taosTmrCleanUp(void *handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TTIMER_H
diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h
new file mode 100644
index 0000000000000000000000000000000000000000..a94cdaad15a5c2abe35b7a02502ff8ae95102cd9
--- /dev/null
+++ b/src/inc/ttokendef.h
@@ -0,0 +1,237 @@
+/*
+ * 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_TTOKENDEF_H
+#define TDENGINE_TTOKENDEF_H
+
+
+#define TK_ID                               1
+#define TK_BOOL                             2
+#define TK_TINYINT                          3
+#define TK_SMALLINT                         4
+#define TK_INTEGER                          5
+#define TK_BIGINT                           6
+#define TK_FLOAT                            7
+#define TK_DOUBLE                           8
+#define TK_STRING                           9
+#define TK_TIMESTAMP                       10
+#define TK_BINARY                          11
+#define TK_NCHAR                           12
+#define TK_OR                              13
+#define TK_AND                             14
+#define TK_NOT                             15
+#define TK_EQ                              16
+#define TK_NE                              17
+#define TK_ISNULL                          18
+#define TK_NOTNULL                         19
+#define TK_IS                              20
+#define TK_LIKE                            21
+#define TK_GLOB                            22
+#define TK_BETWEEN                         23
+#define TK_IN                              24
+#define TK_GT                              25
+#define TK_GE                              26
+#define TK_LT                              27
+#define TK_LE                              28
+#define TK_BITAND                          29
+#define TK_BITOR                           30
+#define TK_LSHIFT                          31
+#define TK_RSHIFT                          32
+#define TK_PLUS                            33
+#define TK_MINUS                           34
+#define TK_DIVIDE                          35
+#define TK_TIMES                           36
+#define TK_STAR                            37
+#define TK_SLASH                           38
+#define TK_REM                             39
+#define TK_CONCAT                          40
+#define TK_UMINUS                          41
+#define TK_UPLUS                           42
+#define TK_BITNOT                          43
+#define TK_SHOW                            44
+#define TK_DATABASES                       45
+#define TK_MNODES                          46
+#define TK_DNODES                          47
+#define TK_ACCOUNTS                        48
+#define TK_USERS                           49
+#define TK_MODULES                         50
+#define TK_QUERIES                         51
+#define TK_CONNECTIONS                     52
+#define TK_STREAMS                         53
+#define TK_VARIABLES                       54
+#define TK_SCORES                          55
+#define TK_GRANTS                          56
+#define TK_VNODES                          57
+#define TK_IPTOKEN                         58
+#define TK_DOT                             59
+#define TK_CREATE                          60
+#define TK_TABLE                           61
+#define TK_DATABASE                        62
+#define TK_TABLES                          63
+#define TK_STABLES                         64
+#define TK_VGROUPS                         65
+#define TK_DROP                            66
+#define TK_DNODE                           67
+#define TK_USER                            68
+#define TK_ACCOUNT                         69
+#define TK_USE                             70
+#define TK_DESCRIBE                        71
+#define TK_ALTER                           72
+#define TK_PASS                            73
+#define TK_PRIVILEGE                       74
+#define TK_LOCAL                           75
+#define TK_IF                              76
+#define TK_EXISTS                          77
+#define TK_PPS                             78
+#define TK_TSERIES                         79
+#define TK_DBS                             80
+#define TK_STORAGE                         81
+#define TK_QTIME                           82
+#define TK_CONNS                           83
+#define TK_STATE                           84
+#define TK_KEEP                            85
+#define TK_CACHE                           86
+#define TK_REPLICA                         87
+#define TK_QUORUM                          88
+#define TK_DAYS                            89
+#define TK_MINROWS                         90
+#define TK_MAXROWS                         91
+#define TK_BLOCKS                          92
+#define TK_CTIME                           93
+#define TK_WAL                             94
+#define TK_FSYNC                           95
+#define TK_COMP                            96
+#define TK_PRECISION                       97
+#define TK_LP                              98
+#define TK_RP                              99
+#define TK_TAGS                           100
+#define TK_USING                          101
+#define TK_AS                             102
+#define TK_COMMA                          103
+#define TK_NULL                           104
+#define TK_SELECT                         105
+#define TK_UNION                          106
+#define TK_ALL                            107
+#define TK_FROM                           108
+#define TK_VARIABLE                       109
+#define TK_INTERVAL                       110
+#define TK_FILL                           111
+#define TK_SLIDING                        112
+#define TK_ORDER                          113
+#define TK_BY                             114
+#define TK_ASC                            115
+#define TK_DESC                           116
+#define TK_GROUP                          117
+#define TK_HAVING                         118
+#define TK_LIMIT                          119
+#define TK_OFFSET                         120
+#define TK_SLIMIT                         121
+#define TK_SOFFSET                        122
+#define TK_WHERE                          123
+#define TK_NOW                            124
+#define TK_RESET                          125
+#define TK_QUERY                          126
+#define TK_ADD                            127
+#define TK_COLUMN                         128
+#define TK_TAG                            129
+#define TK_CHANGE                         130
+#define TK_SET                            131
+#define TK_KILL                           132
+#define TK_CONNECTION                     133
+#define TK_STREAM                         134
+#define TK_COLON                          135
+#define TK_ABORT                          136
+#define TK_AFTER                          137
+#define TK_ATTACH                         138
+#define TK_BEFORE                         139
+#define TK_BEGIN                          140
+#define TK_CASCADE                        141
+#define TK_CLUSTER                        142
+#define TK_CONFLICT                       143
+#define TK_COPY                           144
+#define TK_DEFERRED                       145
+#define TK_DELIMITERS                     146
+#define TK_DETACH                         147
+#define TK_EACH                           148
+#define TK_END                            149
+#define TK_EXPLAIN                        150
+#define TK_FAIL                           151
+#define TK_FOR                            152
+#define TK_IGNORE                         153
+#define TK_IMMEDIATE                      154
+#define TK_INITIALLY                      155
+#define TK_INSTEAD                        156
+#define TK_MATCH                          157
+#define TK_KEY                            158
+#define TK_OF                             159
+#define TK_RAISE                          160
+#define TK_REPLACE                        161
+#define TK_RESTRICT                       162
+#define TK_ROW                            163
+#define TK_STATEMENT                      164
+#define TK_TRIGGER                        165
+#define TK_VIEW                           166
+#define TK_COUNT                          167
+#define TK_SUM                            168
+#define TK_AVG                            169
+#define TK_MIN                            170
+#define TK_MAX                            171
+#define TK_FIRST                          172
+#define TK_LAST                           173
+#define TK_TOP                            174
+#define TK_BOTTOM                         175
+#define TK_STDDEV                         176
+#define TK_PERCENTILE                     177
+#define TK_APERCENTILE                    178
+#define TK_LEASTSQUARES                   179
+#define TK_HISTOGRAM                      180
+#define TK_DIFF                           181
+#define TK_SPREAD                         182
+#define TK_TWA                            183
+#define TK_INTERP                         184
+#define TK_LAST_ROW                       185
+#define TK_RATE                           186
+#define TK_IRATE                          187
+#define TK_SUM_RATE                       188
+#define TK_SUM_IRATE                      189
+#define TK_AVG_RATE                       190
+#define TK_AVG_IRATE                      191
+#define TK_TBID                           192
+#define TK_SEMI                           193
+#define TK_NONE                           194
+#define TK_PREV                           195
+#define TK_LINEAR                         196
+#define TK_IMPORT                         197
+#define TK_METRIC                         198
+#define TK_TBNAME                         199
+#define TK_JOIN                           200
+#define TK_METRICS                        201
+#define TK_STABLE                         202
+#define TK_INSERT                         203
+#define TK_INTO                           204
+#define TK_VALUES                         205
+
+#define TK_SPACE                          300
+#define TK_COMMENT                        301
+#define TK_ILLEGAL                        302
+#define TK_HEX                            303   // hex number  0x123
+#define TK_OCT                            304   // oct number
+#define TK_BIN                            305   // bin format data 0b111
+#define TK_FILE                           306
+#define TK_QUESTION                       307   // denoting the placeholder of "?",when invoking statement bind query
+
+#endif
+
+
diff --git a/src/inc/ttypes.h b/src/inc/ttypes.h
deleted file mode 100644
index db6490f8404f2b9c0be4f83ce0391ec4dad39a81..0000000000000000000000000000000000000000
--- a/src/inc/ttypes.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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_TTYPES_H
-#define TDENGINE_TTYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include "tstoken.h"
-
-// Bytes for each type.
-#define CHAR_BYTES   sizeof(char)
-#define SHORT_BYTES  sizeof(short)
-#define INT_BYTES    sizeof(int)
-#define LONG_BYTES   sizeof(int64_t)
-#define FLOAT_BYTES  sizeof(float)
-#define DOUBLE_BYTES sizeof(double)
-
-#define POINTER_BYTES sizeof(void *)  // 8 by default  assert(sizeof(ptrdiff_t) == sizseof(void*)
-
-typedef struct tDataDescriptor {
-  int16_t nType;
-  int16_t nameLen;
-  int32_t nSize;
-  char *  aName;
-} tDataDescriptor;
-
-extern tDataDescriptor tDataTypeDesc[11];
-
-bool isValidDataType(int32_t type, int32_t length);
-bool isNull(const char *val, int32_t type);
-
-void setNull(char *val, int32_t type, int32_t bytes);
-void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems);
-
-void assignVal(char *val, const char *src, int32_t len, int32_t type);
-void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
-
-// variant, each number/string/field_id has a corresponding struct during parsing sql
-typedef struct tVariant {
-  uint32_t nType;
-  int32_t  nLen;  // only used for string, for number, it is useless
-  union {
-    int64_t  i64Key;
-    double   dKey;
-    char *   pz;
-    wchar_t *wpz;
-  };
-} tVariant;
-
-void tVariantCreate(tVariant *pVar, SSQLToken *token);
-
-void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
-
-void tVariantCreateFromBinary(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
-
-void tVariantDestroy(tVariant *pV);
-
-void tVariantAssign(tVariant *pDst, const tVariant *pSrc);
-
-int32_t tVariantToString(tVariant *pVar, char *dst);
-
-int32_t tVariantDump(tVariant *pVariant, char *payload, char type);
-
-int32_t tVariantTypeSetType(tVariant *pVariant, char type);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TTYPES_H
diff --git a/src/inc/tutil.h b/src/inc/tutil.h
deleted file mode 100644
index b66da286973521c1e6cd29db2b2923cfc371be58..0000000000000000000000000000000000000000
--- a/src/inc/tutil.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * 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_TUTIL_H
-#define TDENGINE_TUTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-#include "tmd5.h"
-#include "tcrc32c.h"
-#include "tsdb.h"
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO (2)
-#endif
-
-#define FD_VALID(x) ((x) > STDERR_FILENO)
-#define FD_INITIALIZER  ((int32_t)-1)
-
-#define WCHAR wchar_t
-
-#define tfree(x) \
-  {              \
-    if (x) {     \
-      free((void*)(x));   \
-      x = 0;  \
-    }            \
-  }
-
-#define tclose(x) taosCloseSocket(x)
-
-#ifdef ASSERTION
-#define ASSERT(x) assert(x)
-#else
-#define ASSERT(x)
-#endif
-
-#ifdef UNUSED
-#undefine UNUSED
-#endif
-#define UNUSED(x) ((void)(x))
-
-#ifdef UNUSED_FUNC
-#undefine UNUSED_FUNC
-#endif
-
-#ifdef UNUSED_PARAM
-#undef UNUSED_PARAM
-#endif
-
-#if defined(__GNUC__)
-#define UNUSED_PARAM(x) _UNUSED##x __attribute__((unused))
-#define UNUSED_FUNC __attribute__((unused))
-#else
-#define UNUSED_PARAM(x) x
-#define UNUSED_FUNC
-#endif
-
-#ifdef tListLen
-#undefine tListLen
-#endif
-#define tListLen(x) (sizeof(x) / sizeof((x)[0]))
-
-#if defined(__GNUC__)
-#define FORCE_INLINE inline __attribute__((always_inline))
-#else
-#define FORCE_INLINE
-#endif
-
-#define DEFAULT_UNICODE_ENCODEC "UCS-4LE"
-  
-#define DEFAULT_COMP(x, y)       \
-  do {                           \
-    if ((x) == (y)) {            \
-      return 0;                  \
-    } else {                     \
-      return (x) < (y) ? -1 : 1; \
-    }                            \
-  } while (0)
-
-#define GET_INT8_VAL(x)   (*(int8_t *)(x))
-#define GET_INT16_VAL(x)  (*(int16_t *)(x))
-#define GET_INT32_VAL(x)  (*(int32_t *)(x))
-#define GET_INT64_VAL(x)  (*(int64_t *)(x))
-
-#ifdef _TD_ARM_32_
-  #define GET_FLOAT_VAL(x)  taos_align_get_float(x)
-  #define GET_DOUBLE_VAL(x) taos_align_get_double(x)
-
-  float  taos_align_get_float(const char* pBuf);
-  double taos_align_get_double(const char* pBuf);
-
-  //#define __float_align_declear()  float __underlyFloat = 0.0;
-  //#define __float_align_declear()
-  //#define GET_FLOAT_VAL_ALIGN(x) (*(int32_t*)&(__underlyFloat) = *(int32_t*)(x); __underlyFloat);
-  // notes: src must be float or double type variable !!!
-  #define SET_FLOAT_VAL_ALIGN(dst, src) (*(int32_t*) dst = *(int32_t*)src);
-  #define SET_DOUBLE_VAL_ALIGN(dst, src) (*(int64_t*) dst = *(int64_t*)src);
-#else
-  #define GET_FLOAT_VAL(x)  (*(float *)(x))
-  #define GET_DOUBLE_VAL(x) (*(double *)(x))
-#endif
-
-#define ALIGN_NUM(n, align) (((n) + ((align)-1)) & (~((align)-1)))
-
-// align to 8bytes
-#define ALIGN8(n) ALIGN_NUM(n, 8)
-
-#define MILLISECOND_PER_MINUTE (MILLISECOND_PER_SECOND * 60)
-#define MILLISECOND_PER_HOUR   (MILLISECOND_PER_MINUTE * 60)
-#define MILLISECOND_PER_DAY    (MILLISECOND_PER_HOUR * 24)
-#define MILLISECOND_PER_WEEK   (MILLISECOND_PER_DAY * 7)
-#define MILLISECOND_PER_MONTH  (MILLISECOND_PER_DAY * 30)
-#define MILLISECOND_PER_YEAR   (MILLISECOND_PER_DAY * 365)
-
-#define POW2(x) ((x) * (x))
-
-int32_t strdequote(char *src);
-
-void strtrim(char *src);
-
-char *strnchr(char *haystack, char needle, int32_t len, bool skipquote);
-
-char **strsplit(char *src, const char *delim, int32_t *num);
-
-char* strtolower(char *dst, const char *src);
-
-int64_t strnatoi(char *num, int32_t len);
-
-char* strreplace(const char* str, const char* pattern, const char* rep);
-
-#define POW2(x) ((x) * (x))
-
-int32_t strdequote(char *src);
-
-char *paGetToken(char *src, char **token, int32_t *tokenLen);
-
-void taosMsleep(int32_t mseconds);
-
-int32_t taosByteArrayToHexStr(char bytes[], int32_t len, char hexstr[]);
-
-int32_t taosHexStrToByteArray(char hexstr[], char bytes[]);
-
-int64_t str2int64(char *str);
-
-int32_t taosFileRename(char *fullPath, char *suffix, char delimiter, char **dstPath);
-
-int32_t taosInitTimer(void (*callback)(int), int32_t ms);
-
-bool taosMbsToUcs4(char *mbs, int32_t mbs_len, char *ucs4, int32_t ucs4_max_len);
-
-int tasoUcs4Compare(void* f1_ucs4, void *f2_ucs4, int bytes);
-
-bool taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs);
-
-bool taosValidateEncodec(const char *encodec);
-
-bool taosGetVersionNumber(char *versionStr, int *versionNubmer);
-
-static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, unsigned int inLen, char *target) {
-  MD5_CTX context;
-  MD5Init(&context);
-  MD5Update(&context, inBuf, inLen);
-  MD5Final(&context);
-  memcpy(target, context.digest, TSDB_KEY_LEN);
-}
-
-int taosCheckVersion(char *input_client_version, char *input_server_version, int compared_segments);
-
-char *taosIpStr(uint32_t ipInt);
-
-uint32_t ip2uint(const char *const ip_addr);
-
-#define TAOS_ALLOC_MODE_DEFAULT 0
-#define TAOS_ALLOC_MODE_RANDOM_FAIL 1
-#define TAOS_ALLOC_MODE_DETECT_LEAK 2
-void taosSetAllocMode(int mode, const char* path, bool autoDump);
-void taosDumpMemoryLeak();
-
-#ifdef TAOS_MEM_CHECK
-
-void *  taos_malloc(size_t size, const char *file, uint32_t line);
-void *  taos_calloc(size_t num, size_t size, const char *file, uint32_t line);
-void *  taos_realloc(void *ptr, size_t size, const char *file, uint32_t line);
-void    taos_free(void *ptr, const char *file, uint32_t line);
-char *  taos_strdup(const char *str, const char *file, uint32_t line);
-char *  taos_strndup(const char *str, size_t size, const char *file, uint32_t line);
-ssize_t taos_getline(char **lineptr, size_t *n, FILE *stream, const char *file, uint32_t line);
-
-#ifndef TAOS_MEM_CHECK_IMPL
-
-#define malloc(size) taos_malloc(size, __FILE__, __LINE__)
-#define calloc(num, size) taos_calloc(num, size, __FILE__, __LINE__)
-#define realloc(ptr, size) taos_realloc(ptr, size, __FILE__, __LINE__)
-#define free(ptr) taos_free(ptr, __FILE__, __LINE__)
-#define strdup(str) taos_strdup(str, __FILE__, __LINE__)
-#define strndup(str, size) taos_strndup(str, size, __FILE__, __LINE__)
-#define getline(lineptr, n, stream) taos_getline(lineptr, n, stream, __FILE__, __LINE__)
-
-#endif  // TAOS_MEM_CHECK_IMPL
-
-#endif // TAOS_MEM_CHECK
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TUTIL_H
diff --git a/src/inc/twal.h b/src/inc/twal.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf570aefdc50f26944706f4eddb1d44364986bca
--- /dev/null
+++ b/src/inc/twal.h
@@ -0,0 +1,62 @@
+/*
+ * 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 _TD_WAL_H_
+#define _TD_WAL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TAOS_WAL_NOLOG   0
+#define TAOS_WAL_WRITE   1
+#define TAOS_WAL_FSYNC   2
+ 
+typedef struct {
+  int8_t    msgType;
+  int8_t    reserved[3];
+  int32_t   len;
+  uint64_t  version;
+  uint32_t  signature;
+  uint32_t  cksum;
+  char      cont[];
+} SWalHead;
+
+typedef struct {
+  int8_t    walLevel;  // wal level
+  int32_t   fsyncPeriod; // millisecond
+  int8_t    wals;      // number of WAL files;
+  int8_t    keep;      // keep the wal file when closed
+} SWalCfg;
+
+typedef void* twalh;  // WAL HANDLE
+typedef int (*FWalWrite)(void *ahandle, void *pHead, int type);
+
+twalh   walOpen(const char *path, const SWalCfg *pCfg);
+int     walAlter(twalh pWal, const SWalCfg *pCfg);
+void    walClose(twalh);
+int     walRenew(twalh);
+int     walWrite(twalh, SWalHead *);
+void    walFsync(twalh);
+int     walRestore(twalh, void *pVnode, FWalWrite writeFp);
+int     walGetWalFile(twalh, char *name, uint32_t *index);
+
+extern int wDebugFlag;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // _TD_WAL_H_
diff --git a/src/inc/vnode.h b/src/inc/vnode.h
new file mode 100644
index 0000000000000000000000000000000000000000..15ddb6afee7c3ac2914df8133df24f6ef80a0a8a
--- /dev/null
+++ b/src/inc/vnode.h
@@ -0,0 +1,71 @@
+/*
+ * 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_VNODE_H
+#define TDENGINE_VNODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum _VN_STATUS {
+  TAOS_VN_STATUS_INIT,
+  TAOS_VN_STATUS_READY,
+  TAOS_VN_STATUS_CLOSING,
+  TAOS_VN_STATUS_UPDATING,
+  TAOS_VN_STATUS_RESET,
+} EVnStatus;
+
+typedef struct {
+  int   len;
+  void *rsp;
+  void *qhandle; //used by query and retrieve msg
+} SRspRet;
+
+typedef struct {
+  SRspRet  rspRet;
+  void    *pCont;
+  int32_t  contLen;
+  SRpcMsg  rpcMsg;
+} SReadMsg;
+
+int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg);
+int32_t vnodeDrop(int32_t vgId);
+int32_t vnodeOpen(int32_t vgId, char *rootDir);
+int32_t vnodeAlter(void *pVnode, SMDCreateVnodeMsg *pVnodeCfg);
+int32_t vnodeClose(int32_t vgId);
+
+void*   vnodeAcquire(int32_t vgId);        // add refcount
+void*   vnodeAcquireRqueue(int32_t vgId);  // add refCount, get read queue 
+void*   vnodeAcquireWqueue(int32_t vgId);  // add recCount, get write queue
+void    vnodeRelease(void *pVnode);        // dec refCount
+void*   vnodeGetWal(void *pVnode);
+
+int32_t vnodeProcessWrite(void *pVnode, int qtype, void *pHead, void *item);
+int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes);
+void    vnodeBuildStatusMsg(void *param);
+void    vnodeConfirmForward(void *param, uint64_t version, int32_t code);
+void    vnodeSetAccess(SDMVgroupAccess *pAccess, int32_t numOfVnodes);
+
+int32_t vnodeInitResources();
+void    vnodeCleanupResources();
+
+int32_t vnodeProcessRead(void *pVnode, SReadMsg *pReadMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/kit/CMakeLists.txt b/src/kit/CMakeLists.txt
index 66e8cf73988ab25db7544b9a52215d2279630c63..77db79e22003d04701bf7417cc9ebc06b202533e 100644
--- a/src/kit/CMakeLists.txt
+++ b/src/kit/CMakeLists.txt
@@ -3,4 +3,3 @@ PROJECT(TDengine)
 
 ADD_SUBDIRECTORY(shell)
 ADD_SUBDIRECTORY(taosdemo)
-ADD_SUBDIRECTORY(taosdump)
diff --git a/src/kit/shell/CMakeLists.txt b/src/kit/shell/CMakeLists.txt
index 244eafb44ff2b187b0397eda241e5290dad53cd6..c86cac281c0283aac691555927d679b0ef4f4f64 100644
--- a/src/kit/shell/CMakeLists.txt
+++ b/src/kit/shell/CMakeLists.txt
@@ -1,28 +1,36 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+IF (TD_LINUX)
   AUX_SOURCE_DIRECTORY(./src SRC)
   LIST(REMOVE_ITEM SRC ./src/shellWindows.c)
   LIST(REMOVE_ITEM SRC ./src/shellDarwin.c)
   ADD_EXECUTABLE(shell ${SRC})  
-  TARGET_LINK_LIBRARIES(shell taos_static)
+  
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(shell taos_static)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(shell taos)
+  ENDIF ()
+  
   SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-ELSEIF (TD_WINDOWS_64)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
+ELSEIF (TD_WINDOWS)
   LIST(APPEND SRC ./src/shellEngine.c)
   LIST(APPEND SRC ./src/shellMain.c)
   LIST(APPEND SRC ./src/shellWindows.c)
   ADD_EXECUTABLE(shell ${SRC})
   TARGET_LINK_LIBRARIES(shell taos_static)
-  SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-ELSEIF (TD_DARWIN_64)
+
+  IF (TD_POWER)
+    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME power)
+  ELSE ()   
+    SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
+  ENDIF ()
+ELSEIF (TD_DARWIN)
   LIST(APPEND SRC ./src/shellEngine.c)
   LIST(APPEND SRC ./src/shellMain.c)
   LIST(APPEND SRC ./src/shellDarwin.c)
diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h
index 0c8153e3ab615b2ecc33bbc815cc38552967c393..dd62df170a7c87f127eb7c52c1f580b7f460b445 100644
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
@@ -18,8 +18,7 @@
 
 #include "stdbool.h"
 #include "taos.h"
-#include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "stdbool.h"
 
 #define MAX_USERNAME_SIZE      64
@@ -30,29 +29,17 @@
 #define MAX_COMMAND_SIZE       65536
 #define HISTORY_FILE           ".taos_history"
 
-#define BOOL_OUTPUT_LENGTH     6
-#define TINYINT_OUTPUT_LENGTH  6
-#define SMALLINT_OUTPUT_LENGTH 7
-#define INT_OUTPUT_LENGTH      11
-#define BIGINT_OUTPUT_LENGTH   21
-#define FLOAT_OUTPUT_LENGTH    20
-#define DOUBLE_OUTPUT_LENGTH   25
-#define BINARY_OUTPUT_LENGTH   20
-
-// dynamic config timestamp width according to maximum time precision
-extern int32_t TIMESTAMP_OUTPUT_LENGTH;
-
-typedef struct History History;
-struct History {
+typedef struct SShellHistory {
   char* hist[MAX_HISTORY_SIZE];
   int   hstart;
   int   hend;
-};
+} SShellHistory;
 
-struct arguments {
+typedef struct SShellArguments {
   char* host;
   char* password;
   char* user;
+  char* auth;
   char* database;
   char* timezone;
   bool  is_raw_time;
@@ -62,26 +49,29 @@ struct arguments {
   int   threadNum;
   char* commands;
   int   abort;
-};
+  int   port;
+  int   endPort;
+  int   pktLen;
+  char* netTestRole;
+} SShellArguments;
 
 /**************** Function declarations ****************/
-extern void shellParseArgument(int argc, char* argv[], struct arguments* arguments);
-extern TAOS* shellInit(struct arguments* args);
+extern void shellParseArgument(int argc, char* argv[], SShellArguments* arguments);
+extern TAOS* shellInit(SShellArguments* args);
 extern void* shellLoopQuery(void* arg);
 extern void taos_error(TAOS* con);
 extern int regex_match(const char* s, const char* reg, int cflags);
 void shellReadCommand(TAOS* con, char command[]);
-void shellRunCommand(TAOS* con, char* command);
+int32_t shellRunCommand(TAOS* con, char* command);
 void shellRunCommandOnServer(TAOS* con, char command[]);
 void read_history();
 void write_history();
 void source_file(TAOS* con, char* fptr);
-void source_dir(TAOS* con, struct arguments* args);
+void source_dir(TAOS* con, SShellArguments* args);
 void get_history_path(char* history);
 void cleanup_handler(void* arg);
 void exitShell();
 int shellDumpResult(TAOS* con, char* fname, int* error_no, bool printMode);
-void shellPrintNChar(char* str, int width, bool printMode);
 void shellGetGrantInfo(void *con);
 int isCommentLine(char *line);
 
@@ -89,12 +79,12 @@ int isCommentLine(char *line);
 extern char           PROMPT_HEADER[];
 extern char           CONTINUE_PROMPT[];
 extern int            prompt_size;
-extern History        history;
+extern SShellHistory  history;
 extern struct termios oldtio;
 extern void           set_terminal_mode();
 extern int get_old_terminal_mode(struct termios* tio);
-extern void             reset_terminal_mode();
-extern struct arguments args;
-extern TAOS_RES*        result;
+extern void            reset_terminal_mode();
+extern SShellArguments args;
+extern TAOS_RES*       result;
 
 #endif
diff --git a/src/kit/shell/src/shellDarwin.c b/src/kit/shell/src/shellDarwin.c
index b624f5ee68535026580af25aa962a8f6a79f963e..ffe537dd91834247460f04c47efff5ebe8687d7e 100644
--- a/src/kit/shell/src/shellDarwin.c
+++ b/src/kit/shell/src/shellDarwin.c
@@ -32,16 +32,16 @@ void insertChar(Command *cmd, char *c, int size);
 
 void printHelp() {
   char indent[10] = "        ";
-  printf("taos shell is used to test the TDEngine database\n");
+  printf("taos shell is used to test the TDengine database\n");
 
   printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDEngine server IP address to connect. The default host is localhost.");
+  printf("%s%s%s\n", indent, indent, "TDengine server IP address to connect. The default host is localhost.");
   printf("%s%s\n", indent, "-p");
   printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
   printf("%s%s\n", indent, "-P");
   printf("%s%s%s\n", indent, indent, "The TCP/IP port number to use for the connection");
   printf("%s%s\n", indent, "-u");
-  printf("%s%s%s\n", indent, indent, "The TDEngine user name to use when connecting to the server.");
+  printf("%s%s%s\n", indent, indent, "The user name to use when connecting to the server.");
   printf("%s%s\n", indent, "-c");
   printf("%s%s%s\n", indent, indent, "Configuration directory.");
   printf("%s%s\n", indent, "-s");
@@ -62,7 +62,7 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
-void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
+void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   wordexp_t full_path;
   for (int i = 1; i < argc; i++) {
     // for host
@@ -81,7 +81,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
       // for management port
     else if (strcmp(argv[i], "-P") == 0) {
       if (i < argc - 1) {
-        tsMgmtShellPort = atoi(argv[++i]);
+        arguments->port = atoi(argv[++i]);
       } else {
         fprintf(stderr, "option -P requires an argument\n");
         exit(EXIT_FAILURE);
@@ -96,8 +96,12 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {
-        strcpy(configDir, argv[++i]);
+      if (i < argc - 1) { 
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
+          fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
+          exit(EXIT_FAILURE);
+        }
+        strcpy(configDir, argv[i]);
       } else {
         fprintf(stderr, "Option -c requires an argument\n");
         exit(EXIT_FAILURE);
@@ -225,8 +229,8 @@ void shellReadCommand(TAOS *con, char *command) {
           printf("\n");
           if (isReadyGo(&cmd)) {
             sprintf(command, "%s%s", cmd.buffer, cmd.command);
-            tfree(cmd.buffer);
-            tfree(cmd.command);
+            taosTFree(cmd.buffer);
+            taosTFree(cmd.command);
             return;
           } else {
             updateBuffer(&cmd);
@@ -335,54 +339,20 @@ void *shellLoopQuery(void *arg) {
       tscError("failed to malloc command");
       return NULL;
     }
-    while (1) {
-      // Read command from shell.
 
+    do {
+      // Read command from shell.
       memset(command, 0, MAX_COMMAND_SIZE);
       set_terminal_mode();
       shellReadCommand(con, command);
       reset_terminal_mode();
-
-      // Run the command
-      shellRunCommand(con, command);
-    }
+    } while (shellRunCommand(con, command) == 0);
 
   pthread_cleanup_pop(1);
 
   return NULL;
 }
 
-void shellPrintNChar(char *str, int width, bool printMode) {
-  int col_left = width;
-  wchar_t wc;
-  while (col_left > 0) {
-    if (*str == '\0') break;
-    char *tstr = str;
-    int byte_width = mbtowc(&wc, tstr, MB_CUR_MAX);
-    if (byte_width <= 0) break;
-    int col_width = wcwidth(wc);
-    if (col_width <= 0) {
-      str += byte_width;
-      continue;
-    }
-    if (col_left < col_width) break;
-    printf("%lc", wc);
-    str += byte_width;
-    col_left -= col_width;
-  }
-
-  while (col_left > 0) {
-    printf(" ");
-    col_left--;
-  }
-
-  if (!printMode) {
-    printf("|");
-  } else {
-    printf("\n");
-  }
-}
-
 int get_old_terminal_mode(struct termios *tio) {
   /* Make sure stdin is a terminal. */
   if (!isatty(STDIN_FILENO)) {
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 27a4aaaa0cd24d84b46003ec3195f130d3ee8c85..1d1ca1c42bbb921adef67b63511d4c70be8ccf2e 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -13,33 +13,52 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _BSD_SOURCE
+#define _GNU_SOURCE
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
 #include "os.h"
 #include "shell.h"
 #include "shellCommand.h"
-#include "ttime.h"
 #include "tutil.h"
+#include "taosdef.h"
 #include "taoserror.h"
+#include "tglobal.h"
+#include "tsclient.h"
 
 #include <regex.h>
 
 /**************** Global variables ****************/
+#ifdef _TD_POWER_
+char      CLIENT_VERSION[] = "Welcome to the PowerDB shell from %s, Client Version:%s\n"
+                             "Copyright (c) 2017 by PowerDB, Inc. All rights reserved.\n\n";
+char      PROMPT_HEADER[] = "power> ";
+
+char      CONTINUE_PROMPT[] = "    -> ";
+int       prompt_size = 7;
+#else
 char      CLIENT_VERSION[] = "Welcome to the TDengine shell from %s, Client Version:%s\n"
                              "Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.\n\n";
 char      PROMPT_HEADER[] = "taos> ";
+
 char      CONTINUE_PROMPT[] = "   -> ";
 int       prompt_size = 6;
+#endif
+
 TAOS_RES *result = NULL;
-History   history;
+SShellHistory   history;
+
+#define DEFAULT_MAX_BINARY_DISPLAY_WIDTH 30
+extern int32_t tsMaxBinaryDisplayWidth;
+extern TAOS *taos_connect_auth(const char *ip, const char *user, const char *auth, const char *db, uint16_t port);
 
 /*
  * FUNCTION: Initialize the shell.
  */
-TAOS *shellInit(struct arguments *args) {
+TAOS *shellInit(SShellArguments *args) {
   printf("\n");
-  printf(CLIENT_VERSION, osName, taos_get_client_info());
+  printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
   fflush(stdout);
 
   // set options before initializing
@@ -50,25 +69,26 @@ TAOS *shellInit(struct arguments *args) {
   if (args->is_use_passwd) {
     if (args->password == NULL) args->password = getpass("Enter password: ");
   } else {
-    args->password = tsDefaultPass;
+    args->password = TSDB_DEFAULT_PASS;
   }
 
   if (args->user == NULL) {
-    args->user = tsDefaultUser;
+    args->user = TSDB_DEFAULT_USER;
   }
 
   taos_init();
-  /*
-   * set tsMetricMetaKeepTimer = 3000ms
-   * set tsMeterMetaKeepTimer = 3000ms
-   * means not save cache in shell
-   */
-  tsMetricMetaKeepTimer = 3;
-  tsMeterMetaKeepTimer = 3000;
 
   // Connect to the database.
-  TAOS *con = taos_connect(args->host, args->user, args->password, args->database, tsMgmtShellPort);
+  TAOS *con = NULL;
+  if (args->auth == NULL) {
+    con = taos_connect(args->host, args->user, args->password, args->database, args->port);
+  } else {
+    con = taos_connect_auth(args->host, args->user, args->auth, args->database, args->port);
+  }
+
   if (con == NULL) {
+    printf("taos connect failed, reason: %s.\n\n", tstrerror(terrno));
+    fflush(stdout);
     return con;
   }
 
@@ -78,20 +98,15 @@ TAOS *shellInit(struct arguments *args) {
   // Check if it is temperory run
   if (args->commands != NULL || args->file[0] != 0) {
     if (args->commands != NULL) {
-      char *token;
-      token = strtok(args->commands, ";");
-      while (token != NULL) {
-        printf("%s%s\n", PROMPT_HEADER, token);
-        shellRunCommand(con, token);
-        token = strtok(NULL, ";");
-      }
+      printf("%s%s\n", PROMPT_HEADER, args->commands);
+      shellRunCommand(con, args->commands);
     }
 
     if (args->file[0] != 0) {
       source_file(con, args->file);
     }
-    taos_close(con);
 
+    taos_close(con);
     write_history();
     exit(EXIT_SUCCESS);
   }
@@ -107,68 +122,70 @@ TAOS *shellInit(struct arguments *args) {
   return con;
 }
 
-void shellReplaceCtrlChar(char *str) {
-  _Bool ctrlOn = false;
-  char *pstr = NULL;
-  char  quote = 0;
 
-  for (pstr = str; *str != '\0'; ++str) {
-    if (ctrlOn) {
-      switch (*str) {
-        case 'n':
-          *pstr = '\n';
-          pstr++;
-          break;
-        case 'r':
-          *pstr = '\r';
-          pstr++;
-          break;
-        case 't':
-          *pstr = '\t';
-          pstr++;
-          break;
-        case 'G':
-          *pstr++ = '\\';
-          *pstr++ = *str;
-          break;
-        case '\\':
-          *pstr = '\\';
-          pstr++;
-          break;
-        case '\'':
-        case '"':
-          if (quote) {
-            *pstr++ = '\\';
-            *pstr++ = *str;
-          }
-          break;
-        default:
-          *pstr = *str;
-          pstr++;
-          break;
-      }
-      ctrlOn = false;
+static bool isEmptyCommand(const char* cmd) {
+  for (char c = *cmd++; c != 0; c = *cmd++) {
+    if (c != ' ' && c != '\t' && c != ';') {
+      return false;
+    }
+  }
+  return true;
+}
+
+
+static int32_t shellRunSingleCommand(TAOS *con, char *command) {
+  /* If command is empty just return */
+  if (isEmptyCommand(command)) {
+    return 0;
+  }
+
+  // Analyse the command.
+  if (regex_match(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+    taos_close(con);
+    write_history();
+#ifdef WINDOWS
+    exit(EXIT_SUCCESS);
+#endif
+    return -1;
+  }
+
+  if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+    // If clear the screen.
+    system("clear");
+    return 0;
+  }
+  
+  if (regex_match(command, "^[\t ]*set[ \t]+max_binary_display_width[ \t]+(default|[1-9][0-9]*)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+    strtok(command, " \t");
+    strtok(NULL, " \t");
+    char* p = strtok(NULL, " \t");
+    if (strcasecmp(p, "default") == 0) {
+      tsMaxBinaryDisplayWidth = DEFAULT_MAX_BINARY_DISPLAY_WIDTH;
     } else {
-      if (*str == '\\') {
-        ctrlOn = true;
-      } else {
-        if (quote == *str) {
-          quote = 0;
-        } else if (*str == '\'' || *str == '"') {
-          quote = *str;
-        }
-        *pstr = *str;
-        pstr++;
-      }
+      tsMaxBinaryDisplayWidth = atoi(p);
     }
+    return 0;
+  }
+  
+  if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
+    /* If source file. */
+    char *c_ptr = strtok(command, " ;");
+    assert(c_ptr != NULL);
+    c_ptr = strtok(NULL, " ;");
+    assert(c_ptr != NULL);
+    source_file(con, c_ptr);
+    return 0;
   }
-  *pstr = '\0';
+
+  shellRunCommandOnServer(con, command);
+  return 0;
 }
 
-void shellRunCommand(TAOS *con, char *command) {
+
+int32_t shellRunCommand(TAOS* con, char* command) {
   /* If command is empty just return */
-  if (regex_match(command, "^[ \t;]*$", REG_EXTENDED)) {
-    return;
+  if (isEmptyCommand(command)) {
+    return 0;
   }
 
   /* Update the history vector. */
@@ -176,7 +193,7 @@ void shellRunCommand(TAOS *con, char *command) {
       history.hist[(history.hend + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE] == NULL ||
       strcmp(command, history.hist[(history.hend + MAX_HISTORY_SIZE - 1) % MAX_HISTORY_SIZE]) != 0) {
     if (history.hist[history.hend] != NULL) {
-      tfree(history.hist[history.hend]);
+      taosTFree(history.hist[history.hend]);
     }
     history.hist[history.hend] = strdup(command);
 
@@ -186,30 +203,63 @@ void shellRunCommand(TAOS *con, char *command) {
     }
   }
 
-  shellReplaceCtrlChar(command);
+  bool esc = false;
+  char quote = 0, *cmd = command, *p = command;
+  for (char c = *command++; c != 0; c = *command++) {
+    if (esc) {
+      switch (c) {
+        case 'n':
+          c = '\n';
+          break;
+        case 'r':
+          c = '\r';
+          break;
+        case 't':
+          c = '\t';
+          break;
+        case 'G':
+          *p++ = '\\';
+          break;
+        case '\'':
+        case '"':
+          if (quote) {
+            *p++ = '\\';
+          }
+          break;
+      }
+      *p++ = c;
+      esc = false;
+      continue;
+    }
+    
+    if (c == '\\') {
+      esc = true;
+      continue;
+    }
 
-  // Analyse the command.
-  if (regex_match(command, "^[ \t]*(quit|q|exit)[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
-    taos_close(con);
-    write_history();
-    exitShell();
-  } else if (regex_match(command, "^[\t ]*clear[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
-    // If clear the screen.
-    system("clear");
-    return;
-  } else if (regex_match(command, "^[ \t]*source[\t ]+[^ ]+[ \t;]*$", REG_EXTENDED | REG_ICASE)) {
-    /* If source file. */
-    char *c_ptr = strtok(command, " ;");
-    assert(c_ptr != NULL);
-    c_ptr = strtok(NULL, " ;");
-    assert(c_ptr != NULL);
+    if (quote == c) {
+      quote = 0;
+    } else if (c == '\'' || c == '"') {
+      quote = c;
+    }
 
-    source_file(con, c_ptr);
-  } else {
-    shellRunCommandOnServer(con, command);
+    *p++ = c;
+    if (c == ';') {
+      c = *p;
+      *p = 0;
+      if (shellRunSingleCommand(con, cmd) < 0) {
+        return -1;
+      }
+      *p = c;
+      p = cmd;
+    }
   }
+
+  *p = 0;
+  return shellRunSingleCommand(con, cmd);
 }
 
+
 void shellRunCommandOnServer(TAOS *con, char command[]) {
   int64_t   st, et;
   wordexp_t full_path;
@@ -244,31 +294,40 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
   st = taosGetTimestampUs();
 
-  if (taos_query(con, command)) {
-    taos_error(con);
+  TAOS_RES* pSql = taos_query(con, command);
+  atomic_store_ptr(&result, pSql);  // set the global TAOS_RES pointer
+
+  if (taos_errno(pSql)) {
+    taos_error(pSql);
     return;
   }
 
   if (regex_match(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
     fprintf(stdout, "Database changed.\n\n");
     fflush(stdout);
+
+    atomic_store_ptr(&result, 0);
+    taos_free_result(pSql);
     return;
   }
 
-  int num_fields = taos_field_count(con);
-  if (num_fields != 0) {  // select and show kinds of commands
+  if (!tscIsUpdateQuery(pSql)) {  // select and show kinds of commands
     int error_no = 0;
-    int numOfRows = shellDumpResult(con, fname, &error_no, printMode);
-    if (numOfRows < 0) return;
+    int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
+    if (numOfRows < 0) {
+      atomic_store_ptr(&result, 0);
+      taos_free_result(pSql);
+      return;
+    }
 
     et = taosGetTimestampUs();
     if (error_no == 0) {
       printf("Query OK, %d row(s) in set (%.6fs)\n", numOfRows, (et - st) / 1E6);
     } else {
-      printf("Query interrupted (%s), %d row(s) in set (%.6fs)\n", taos_errstr(con), numOfRows, (et - st) / 1E6);
+      printf("Query interrupted (%s), %d row(s) in set (%.6fs)\n", taos_errstr(pSql), numOfRows, (et - st) / 1E6);
     }
   } else {
-    int num_rows_affacted = taos_affected_rows(con);
+    int num_rows_affacted = taos_affected_rows(pSql);
     et = taosGetTimestampUs();
     printf("Query OK, %d row(s) affected (%.6fs)\n", num_rows_affacted, (et - st) / 1E6);
   }
@@ -278,12 +337,15 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   if (fname != NULL) {
     wordfree(&full_path);
   }
+
+  atomic_store_ptr(&result, 0);
+  taos_free_result(pSql);
 }
 
 /* Function to do regular expression check */
 int regex_match(const char *s, const char *reg, int cflags) {
   regex_t regex;
-  char    msgbuf[100];
+  char    msgbuf[100] = {0};
 
   /* Compile regular expression */
   if (regcomp(&regex, reg, cflags) != 0) {
@@ -309,357 +371,385 @@ int regex_match(const char *s, const char *reg, int cflags) {
   return 0;
 }
 
-int shellDumpResult(TAOS *con, char *fname, int *error_no, bool printMode) {
-  TAOS_ROW   row = NULL;
-  int        numOfRows = 0;
-  time_t     tt;
-  char       buf[25] = "\0";
-  struct tm *ptm;
-  int        output_bytes = 0;
-  FILE *     fp = NULL;
-  int        num_fields = taos_field_count(con);
-  wordexp_t  full_path;
-
-  assert(num_fields != 0);
-
-  result = taos_use_result(con);
-  if (result == NULL) {
-    taos_error(con);
+
+static char* formatTimestamp(char* buf, int64_t val, int precision) {
+  if (args.is_raw_time) {
+    sprintf(buf, "%" PRId64, val);
+    return buf;
+  }
+
+  time_t tt;
+  if (precision == TSDB_TIME_PRECISION_MICRO) {
+    tt = (time_t)(val / 1000000);
+  } else {
+    tt = (time_t)(val / 1000);
+  }
+
+/* comment out as it make testcases like select_with_tags.sim fail.
+  but in windows, this may cause the call to localtime crash if tt < 0,
+  need to find a better solution.
+  if (tt < 0) {
+    tt = 0;
+  }
+  */
+
+#ifdef WINDOWS
+  if (tt < 0) tt = 0;
+#endif
+
+  struct tm* ptm = localtime(&tt);
+  size_t pos = strftime(buf, 32, "%Y-%m-%d %H:%M:%S", ptm);
+
+  if (precision == TSDB_TIME_PRECISION_MICRO) {
+    sprintf(buf + pos, ".%06d", (int)(val % 1000000));
+  } else {
+    sprintf(buf + pos, ".%03d", (int)(val % 1000));
+  }
+
+  return buf;
+}
+
+
+static void dumpFieldToFile(FILE* fp, const char* val, TAOS_FIELD* field, int32_t length, int precision) {
+  if (val == NULL) {
+    fprintf(fp, "%s", TSDB_DATA_NULL_STR);
+    return;
+  }
+
+  char buf[TSDB_MAX_BYTES_PER_ROW];
+  switch (field->type) {
+    case TSDB_DATA_TYPE_BOOL:
+      fprintf(fp, "%d", ((((int)(*((char *)val))) == 1) ? 1 : 0));
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      fprintf(fp, "%d", (int)(*((char *)val)));
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      fprintf(fp, "%d", (int)(*((short *)val)));
+      break;
+    case TSDB_DATA_TYPE_INT:
+      fprintf(fp, "%d", *((int *)val));
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+      fprintf(fp, "%" PRId64, *((int64_t *)val));
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      fprintf(fp, "%.5f", GET_FLOAT_VAL(val));
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      fprintf(fp, "%.9f", GET_DOUBLE_VAL(val));
+      break;
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      memcpy(buf, val, length);
+      buf[length] = 0;
+      fprintf(fp, "\'%s\'", buf);
+      break;
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      formatTimestamp(buf, *(int64_t*)val, precision);
+      fprintf(fp, "'%s'", buf);
+      break;
+    default:
+      break;
+  }
+}
+
+static int dumpResultToFile(const char* fname, TAOS_RES* tres) {
+  TAOS_ROW row = taos_fetch_row(tres);
+  if (row == NULL) {
+    return 0;
+  }
+
+  wordexp_t full_path;
+
+  if (wordexp(fname, &full_path, 0) != 0) {
+    fprintf(stderr, "ERROR: invalid file name: %s\n", fname);
     return -1;
   }
 
-  if (fname != NULL) {
-    if (wordexp(fname, &full_path, 0) != 0) {
-      fprintf(stderr, "ERROR: invalid file name: %s\n", fname);
-      return -1;
+  FILE* fp = fopen(full_path.we_wordv[0], "w");
+  if (fp == NULL) {
+    fprintf(stderr, "ERROR: failed to open file: %s\n", full_path.we_wordv[0]);
+    wordfree(&full_path);
+    return -1;
+  }
+
+  wordfree(&full_path);
+
+  int num_fields = taos_num_fields(tres);
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+  int precision = taos_result_precision(tres);
+
+  for (int col = 0; col < num_fields; col++) {
+    if (col > 0) {
+      fprintf(fp, ",");
     }
+    fprintf(fp, "%s", fields[col].name);
+  }
+  fputc('\n', fp);
+  
+  int numOfRows = 0;
+  do {
+    int32_t* length = taos_fetch_lengths(tres);
+    for (int i = 0; i < num_fields; i++) {
+      if (i > 0) {
+        fputc(',', fp);
+      }
+      dumpFieldToFile(fp, row[i], fields +i, length[i], precision);
+    }
+    fputc('\n', fp);
+
+    numOfRows++;
+    row = taos_fetch_row(tres);
+  } while( row != NULL);
 
-    fp = fopen(full_path.we_wordv[0], "w");
-    if (fp == NULL) {
-      fprintf(stderr, "ERROR: failed to open file: %s\n", full_path.we_wordv[0]);
-      wordfree(&full_path);
-      return -1;
+  result = NULL;
+  fclose(fp);
+
+  return numOfRows;
+}
+
+
+static void shellPrintNChar(const char *str, int length, int width) {
+  int pos = 0, cols = 0;
+  while (pos < length) {
+    wchar_t wc;
+    int bytes = mbtowc(&wc, str + pos, MB_CUR_MAX);
+    if (bytes == 0) {
+      break;
+    }
+    pos += bytes;
+    if (pos > length) {
+      break;
     }
 
-    wordfree(&full_path);
+#ifdef WINDOWS
+    int w = bytes;
+#else
+    int w = wcwidth(wc);
+#endif
+    if (w > 0) {
+      if (width > 0 && cols + w > width) {
+        break;
+      }
+      printf("%lc", wc);
+      cols += w;
+    }
   }
 
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  row = taos_fetch_row(result);
-  char t_str[TSDB_MAX_BYTES_PER_ROW] = "\0";
-  int  l[TSDB_MAX_COLUMNS] = {0};
-  int  maxLenColumnName = 0;
-
-  if (row) {
-    // Print the header indicator
-    if (fname == NULL) {  // print to standard output
-      if (!printMode) {
-        for (int col = 0; col < num_fields; col++) {
-          switch (fields[col].type) {
-            case TSDB_DATA_TYPE_BOOL:
-              l[col] = MAX(BOOL_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_TINYINT:
-              l[col] = MAX(TINYINT_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_SMALLINT:
-              l[col] = MAX(SMALLINT_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_INT:
-              l[col] = MAX(INT_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_BIGINT:
-              l[col] = MAX(BIGINT_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_FLOAT:
-              l[col] = MAX(FLOAT_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_DOUBLE:
-              l[col] = MAX(DOUBLE_OUTPUT_LENGTH, strlen(fields[col].name));
-              break;
-            case TSDB_DATA_TYPE_BINARY:
-            case TSDB_DATA_TYPE_NCHAR:
-              l[col] = MAX(fields[col].bytes, strlen(fields[col].name));
-              /* l[col] = max(BINARY_OUTPUT_LENGTH, strlen(fields[col].name)); */
-              break;
-            case TSDB_DATA_TYPE_TIMESTAMP: {
-              int32_t defaultWidth = TIMESTAMP_OUTPUT_LENGTH;
-              if (args.is_raw_time) {
-                defaultWidth = 14;
-              }
-              if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                defaultWidth += 3;
-              }
-              l[col] = MAX(defaultWidth, strlen(fields[col].name));
-
-              break;
-            }
-            default:
-              break;
-          }
+  for (; cols < width; cols++) {
+    putchar(' ');
+  }
+}
+
+
+static void printField(const char* val, TAOS_FIELD* field, int width, int32_t length, int precision) {
+  if (val == NULL) {
+    int w = width;
+    if (field->type < TSDB_DATA_TYPE_TINYINT || field->type > TSDB_DATA_TYPE_DOUBLE) {
+      w = 0;
+    }
+    w = printf("%*s", w, TSDB_DATA_NULL_STR);
+    for (; w < width; w++) {
+      putchar(' ');
+    }
+    return;
+  }
+
+  char buf[TSDB_MAX_BYTES_PER_ROW];
+  switch (field->type) {
+    case TSDB_DATA_TYPE_BOOL:
+      printf("%*s", width, ((((int)(*((char *)val))) == 1) ? "true" : "false"));
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      printf("%*d", width, (int)(*((char *)val)));
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      printf("%*d", width, (int)(*((short *)val)));
+      break;
+    case TSDB_DATA_TYPE_INT:
+      printf("%*d", width, *((int *)val));
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+      printf("%*" PRId64, width, *((int64_t *)val));
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      printf("%*.5f", width, GET_FLOAT_VAL(val));
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      printf("%*.9f", width, GET_DOUBLE_VAL(val));
+      break;
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      shellPrintNChar(val, length, width);
+      break;
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      formatTimestamp(buf, *(int64_t*)val, precision);
+      printf("%s", buf);
+      break;
+    default:
+      break;
+  }
+}
+
+
+static int verticalPrintResult(TAOS_RES* tres) {
+  TAOS_ROW row = taos_fetch_row(tres);
+  if (row == NULL) {
+    return 0;
+  }
+
+  int num_fields = taos_num_fields(tres);
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+  int precision = taos_result_precision(tres);
+
+  int maxColNameLen = 0;
+  for (int col = 0; col < num_fields; col++) {
+    int len = (int)strlen(fields[col].name);
+    if (len > maxColNameLen) {
+      maxColNameLen = len;
+    }
+  }
+
+  int numOfRows = 0;
+  do {
+    printf("*************************** %d.row ***************************\n", numOfRows + 1);
+    int32_t* length = taos_fetch_lengths(tres);
+    for (int i = 0; i < num_fields; i++) {
+      TAOS_FIELD* field = fields + i;
+
+      int padding = (int)(maxColNameLen - strlen(field->name));
+      printf("%*.s%s: ", padding, " ", field->name);
+
+      printField(row[i], field, 0, length[i], precision);
+      putchar('\n');
+    }
+
+    numOfRows++;
+    row = taos_fetch_row(tres);
+  } while(row != NULL);
+
+  return numOfRows;
+}
+
+static int calcColWidth(TAOS_FIELD* field, int precision) {
+  int width = (int)strlen(field->name);
+
+  switch (field->type) {
+    case TSDB_DATA_TYPE_BOOL:
+      return MAX(5, width); // 'false'
+
+    case TSDB_DATA_TYPE_TINYINT:
+      return MAX(4, width); // '-127'
+
+    case TSDB_DATA_TYPE_SMALLINT:
+      return MAX(6, width); // '-32767'
+
+    case TSDB_DATA_TYPE_INT:
+      return MAX(11, width); // '-2147483648'
+
+    case TSDB_DATA_TYPE_BIGINT:
+      return MAX(21, width); // '-9223372036854775807'
+
+    case TSDB_DATA_TYPE_FLOAT:
+      return MAX(20, width);
 
-          int spaces = (int)(l[col] - strlen(fields[col].name));
-          int left_space = spaces / 2;
-          int right_space = (spaces % 2 ? left_space + 1 : left_space);
-          printf("%*.s%s%*.s|", left_space, " ", fields[col].name, right_space, " ");
-          output_bytes += (l[col] + 1);
-        }
-        printf("\n");
-        for (int k = 0; k < output_bytes; k++) printf("=");
-        printf("\n");
+    case TSDB_DATA_TYPE_DOUBLE:
+      return MAX(25, width);
+
+    case TSDB_DATA_TYPE_BINARY:
+    case TSDB_DATA_TYPE_NCHAR:
+      if (field->bytes > tsMaxBinaryDisplayWidth) {
+        return MAX(tsMaxBinaryDisplayWidth, width);
       } else {
-        for (int col = 0; col < num_fields; col++) {
-          if (strlen(fields[col].name) > maxLenColumnName) maxLenColumnName = strlen(fields[col].name);
-        }
+        return MAX(field->bytes, width);
       }
 
-      // print the elements
-      do {
-        if (!printMode) {
-          for (int i = 0; i < num_fields; i++) {
-            if (row[i] == NULL) {
-              printf("%*s|", l[i], TSDB_DATA_NULL_STR);
-              continue;
-            }
-
-            switch (fields[i].type) {
-              case TSDB_DATA_TYPE_BOOL:
-                printf("%*s|", l[i], ((((int)(*((char *)row[i]))) == 1) ? "true" : "false"));
-                break;
-              case TSDB_DATA_TYPE_TINYINT:
-                printf("%*d|", l[i], (int)(*((char *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_SMALLINT:
-                printf("%*d|", l[i], (int)(*((short *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_INT:
-                printf("%*d|", l[i], *((int *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_BIGINT:
-                printf("%*" PRId64 "|", l[i], *((int64_t *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_FLOAT: {
-                float fv = 0;
-                fv = GET_FLOAT_VAL(row[i]);
-                printf("%*.5f|", l[i], fv);
-              }              
-                break;
-              case TSDB_DATA_TYPE_DOUBLE: {
-                double dv = 0;
-                dv = GET_DOUBLE_VAL(row[i]);
-                printf("%*.9f|", l[i], dv);
-              }
-                break;
-              case TSDB_DATA_TYPE_BINARY:
-              case TSDB_DATA_TYPE_NCHAR:
-                memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW);
-                memcpy(t_str, row[i], fields[i].bytes);
-                /* printf("%-*s|",max(fields[i].bytes, strlen(fields[i].name)),
-                 * t_str); */
-                /* printf("%-*s|", l[i], t_str); */
-                shellPrintNChar(t_str, l[i], printMode);
-                break;
-              case TSDB_DATA_TYPE_TIMESTAMP:
-                if (args.is_raw_time) {
-                  printf(" %" PRId64 "|", *(int64_t *)row[i]);
-                } else {
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000000);
-                  } else {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000);
-                  }
-
-                  ptm = localtime(&tt);
-                  strftime(buf, 64, "%y-%m-%d %H:%M:%S", ptm);
-
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    printf(" %s.%06d|", buf, (int)(*(int64_t *)row[i] % 1000000));
-                  } else {
-                    printf(" %s.%03d|", buf, (int)(*(int64_t *)row[i] % 1000));
-                  }
-                }
-                break;
-              default:
-                break;
-            }
-          }
-          printf("\n");
-        } else {
-          printf("*************************** %d.row ***************************\n", numOfRows + 1);
-          for (int i = 0; i < num_fields; i++) {
-            // 1. print column name
-            int left_space = (int)(maxLenColumnName - strlen(fields[i].name));
-            printf("%*.s%s: ", left_space, " ", fields[i].name);
-
-            // 2. print column value
-            if (row[i] == NULL) {
-              printf("%s\n", TSDB_DATA_NULL_STR);
-              continue;
-            }
-
-            switch (fields[i].type) {
-              case TSDB_DATA_TYPE_BOOL:
-                printf("%s\n", ((((int)(*((char *)row[i]))) == 1) ? "true" : "false"));
-                break;
-              case TSDB_DATA_TYPE_TINYINT:
-                printf("%d\n", (int)(*((char *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_SMALLINT:
-                printf("%d\n", (int)(*((short *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_INT:
-                printf("%d\n", *((int *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_BIGINT:
-                printf("%" PRId64 "\n", *((int64_t *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_FLOAT: {
-                float fv = 0;
-                fv = GET_FLOAT_VAL(row[i]);
-                printf("%.5f\n", fv);
-              }              
-                break;
-              case TSDB_DATA_TYPE_DOUBLE: {
-                double dv = 0;
-                dv = GET_DOUBLE_VAL(row[i]);
-                printf("%.9f\n", dv);
-              }
-                break;
-              case TSDB_DATA_TYPE_BINARY:
-              case TSDB_DATA_TYPE_NCHAR:
-                memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW);
-                memcpy(t_str, row[i], fields[i].bytes);
-                l[i] = MAX(fields[i].bytes, strlen(fields[i].name));
-                shellPrintNChar(t_str, l[i], printMode);
-                break;
-              case TSDB_DATA_TYPE_TIMESTAMP:
-                if (args.is_raw_time) {
-                  printf("%" PRId64 "\n", *(int64_t *)row[i]);
-                } else {
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000000);
-                  } else {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000);
-                  }
-
-                  ptm = localtime(&tt);
-                  strftime(buf, 64, "%y-%m-%d %H:%M:%S", ptm);
-
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    printf("%s.%06d\n", buf, (int)(*(int64_t *)row[i] % 1000000));
-                  } else {
-                    printf("%s.%03d\n", buf, (int)(*(int64_t *)row[i] % 1000));
-                  }
-                }
-                break;
-              default:
-                break;
-            }
-          }
-        }
-
-        numOfRows++;
-      } while ((row = taos_fetch_row(result)));
-
-    } else {  // dump to file
-      // first write column
-      for (int col = 0; col < num_fields; col++) {
-        fprintf(fp, "%s", fields[col].name);
-        if (col < num_fields - 1) {
-          fprintf(fp, ",");
-        } else {
-          fprintf(fp, "\n");
-        }
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      if (args.is_raw_time) {
+        return MAX(14, width);
+      } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+        return MAX(26, width); // '2020-01-01 00:00:00.000000'
+      } else {
+        return MAX(23, width); // '2020-01-01 00:00:00.000'
       }
-      
-      do {
-        for (int i = 0; i < num_fields; i++) {
-          if (row[i]) {
-            switch (fields[i].type) {
-              case TSDB_DATA_TYPE_BOOL:
-                fprintf(fp, "%d", ((((int)(*((char *)row[i]))) == 1) ? 1 : 0));
-                break;
-              case TSDB_DATA_TYPE_TINYINT:
-                fprintf(fp, "%d", (int)(*((char *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_SMALLINT:
-                fprintf(fp, "%d", (int)(*((short *)row[i])));
-                break;
-              case TSDB_DATA_TYPE_INT:
-                fprintf(fp, "%d", *((int *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_BIGINT:
-                fprintf(fp, "%" PRId64, *((int64_t *)row[i]));
-                break;
-              case TSDB_DATA_TYPE_FLOAT: {
-                float fv = 0;
-                fv = GET_FLOAT_VAL(row[i]);
-                fprintf(fp, "%.5f", fv);
-              }              
-                break;
-              case TSDB_DATA_TYPE_DOUBLE: {
-                double dv = 0;
-                dv = GET_DOUBLE_VAL(row[i]);
-                fprintf(fp, "%.9f", dv);
-              }
-                break;
-              case TSDB_DATA_TYPE_BINARY:
-              case TSDB_DATA_TYPE_NCHAR:
-                memset(t_str, 0, TSDB_MAX_BYTES_PER_ROW);
-                memcpy(t_str, row[i], fields[i].bytes);
-                fprintf(fp, "\'%s\'", t_str);
-                break;
-              case TSDB_DATA_TYPE_TIMESTAMP:
-                if (args.is_raw_time) {
-                  fprintf(fp, "%" PRId64, *(int64_t *)row[i]);
-                } else {
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000000);
-                  } else {
-                    tt = (time_t)((*(int64_t *)row[i]) / 1000);
-                  }
-
-                  ptm = localtime(&tt);
-                  strftime(buf, 64, "%Y-%m-%d %H:%M:%S", ptm);
-
-                  if (taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO) {
-                    fprintf(fp, "\'%s.%06d\'", buf, (int)(*(int64_t *)row[i] % 1000000));
-                  } else {
-                    fprintf(fp, "\'%s.%03d\'", buf, (int)(*(int64_t *)row[i] % 1000));
-                  }
-                }
-                break;
-              default:
-                break;
-            }
-          } else {
-            fprintf(fp, "%s", TSDB_DATA_NULL_STR);
-          }
-          if (i < num_fields - 1) {
-            fprintf(fp, ",");
-          } else {
-            fprintf(fp, "\n");
-          }
-        }
 
-        numOfRows++;
-      } while ((row = taos_fetch_row(result)));
-    }
+    default:
+      assert(false);
   }
 
-  *error_no = taos_errno(con);
+  return 0;
+}
 
-  taos_free_result(result);
-  result = NULL;
 
+static void printHeader(TAOS_FIELD* fields, int* width, int num_fields) {
+  int rowWidth = 0;
+  for (int col = 0; col < num_fields; col++) {
+    TAOS_FIELD* field = fields + col;
+    int padding = (int)(width[col] - strlen(field->name));
+    int left = padding / 2;
+    printf(" %*.s%s%*.s |", left, " ", field->name, padding - left, " ");
+    rowWidth += width[col] + 3;
+  }
+
+  putchar('\n');
+  for (int i = 0; i < rowWidth; i++) {
+    putchar('=');
+  }
+  putchar('\n');
+}
+
+
+static int horizontalPrintResult(TAOS_RES* tres) {
+  TAOS_ROW row = taos_fetch_row(tres);
+  if (row == NULL) {
+    return 0;
+  }
+
+  int num_fields = taos_num_fields(tres);
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+  int precision = taos_result_precision(tres);
+
+  int width[TSDB_MAX_COLUMNS];
+  for (int col = 0; col < num_fields; col++) {
+    width[col] = calcColWidth(fields + col, precision);
+  }
+
+  printHeader(fields, width, num_fields);
+
+  int numOfRows = 0;
+  do {
+    int32_t* length = taos_fetch_lengths(tres);
+    for (int i = 0; i < num_fields; i++) {
+      putchar(' ');
+      printField(row[i], fields + i, width[i], length[i], precision);
+      putchar(' ');
+      putchar('|');
+    }
+    putchar('\n');
+    numOfRows++;
+    row = taos_fetch_row(tres);
+  } while(row != NULL);
+
+  return numOfRows;
+}
+
+
+int shellDumpResult(TAOS_RES *tres, char *fname, int *error_no, bool vertical) {
+  int numOfRows = 0;
   if (fname != NULL) {
-    fclose(fp);
+    numOfRows = dumpResultToFile(fname, tres);
+  } else if(vertical) {
+    numOfRows = verticalPrintResult(tres);
+  } else {
+    numOfRows = horizontalPrintResult(tres);
   }
 
+  *error_no = taos_errno(tres);
   return numOfRows;
 }
 
+
 void read_history() {
   // Initialize history
   memset(history.hist, 0, sizeof(char *) * MAX_HISTORY_SIZE);
@@ -672,17 +762,17 @@ void read_history() {
   char f_history[TSDB_FILENAME_LEN];
   get_history_path(f_history);
 
-  if (access(f_history, R_OK) == -1) {
-    return;
-  }
-
   FILE *f = fopen(f_history, "r");
   if (f == NULL) {
-    fprintf(stderr, "Opening file %s\n", f_history);
+#ifndef WINDOWS
+    if (errno != ENOENT) {
+      fprintf(stderr, "Failed to open file %s, reason:%s\n", f_history, strerror(errno));
+    }
+#endif    
     return;
   }
 
-  while ((read_size = getline(&line, &line_size, f)) != -1) {
+  while ((read_size = taosGetline(&line, &line_size, f)) != -1) {
     line[read_size - 1] = '\0';
     history.hist[history.hend] = strdup(line);
 
@@ -698,31 +788,31 @@ void read_history() {
 }
 
 void write_history() {
-  char f_history[128];
+  char f_history[TSDB_FILENAME_LEN];
   get_history_path(f_history);
 
   FILE *f = fopen(f_history, "w");
   if (f == NULL) {
-    fprintf(stderr, "Opening file %s\n", f_history);
+#ifndef WINDOWS    
+    fprintf(stderr, "Failed to open file %s for write, reason:%s\n", f_history, strerror(errno));
+#endif    
     return;
   }
 
   for (int i = history.hstart; i != history.hend;) {
     if (history.hist[i] != NULL) {
       fprintf(f, "%s\n", history.hist[i]);
-      tfree(history.hist[i]);
+      taosTFree(history.hist[i]);
     }
     i = (i + 1) % MAX_HISTORY_SIZE;
   }
   fclose(f);
 }
 
-void taos_error(TAOS *con) {
-  fprintf(stderr, "\nDB error: %s\n", taos_errstr(con));
-
-  /* free local resouce: allocated memory/metric-meta refcnt */
-  TAOS_RES *pRes = taos_use_result(con);
-  taos_free_result(pRes);
+void taos_error(TAOS_RES *tres) {
+  atomic_store_ptr(&result, 0);
+  fprintf(stderr, "\nDB error: %s\n", taos_errstr(tres));
+  taos_free_result(tres);
 }
 
 int isCommentLine(char *line) {
@@ -734,7 +824,7 @@ int isCommentLine(char *line) {
 void source_file(TAOS *con, char *fptr) {
   wordexp_t full_path;
   int       read_len = 0;
-  char *    cmd = calloc(1, MAX_COMMAND_SIZE);
+  char *    cmd = calloc(1, tsMaxSQLStringLen+1);
   size_t    cmd_len = 0;
   char *    line = NULL;
   size_t    line_len = 0;
@@ -747,6 +837,7 @@ void source_file(TAOS *con, char *fptr) {
 
   char *fname = full_path.we_wordv[0];
 
+  /*
   if (access(fname, F_OK) != 0) {
     fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
     
@@ -754,15 +845,8 @@ void source_file(TAOS *con, char *fptr) {
     free(cmd);
     return;
   }
+  */
   
-  if (access(fname, R_OK) != 0) {
-    fprintf(stderr, "ERROR: file %s is not readable\n", fptr);
-  
-    wordfree(&full_path);
-    free(cmd);
-    return;
-  }
-
   FILE *f = fopen(fname, "r");
   if (f == NULL) {
     fprintf(stderr, "ERROR: failed to open file %s\n", fname);
@@ -771,8 +855,8 @@ void source_file(TAOS *con, char *fptr) {
     return;
   }
 
-  while ((read_len = getline(&line, &line_len, f)) != -1) {
-    if (read_len >= MAX_COMMAND_SIZE) continue;
+  while ((read_len = taosGetline(&line, &line_len, f)) != -1) {
+    if (read_len >= tsMaxSQLStringLen) continue;
     line[--read_len] = '\0';
 
     if (read_len == 0 || isCommentLine(line)) {  // line starts with #
@@ -789,7 +873,7 @@ void source_file(TAOS *con, char *fptr) {
     memcpy(cmd + cmd_len, line, read_len);
     printf("%s%s\n", PROMPT_HEADER, cmd);
     shellRunCommand(con, cmd);
-    memset(cmd, 0, MAX_COMMAND_SIZE);
+    memset(cmd, 0, tsMaxSQLStringLen);
     cmd_len = 0;
   }
 
@@ -800,12 +884,15 @@ void source_file(TAOS *con, char *fptr) {
 }
 
 void shellGetGrantInfo(void *con) {
+  return;
+#if 0
   char sql[] = "show grants";
 
-  int code = taos_query(con, sql);
+  TAOS_RES* tres = taos_query(con, sql);
 
+  int code = taos_errno(tres);
   if (code != TSDB_CODE_SUCCESS) {
-    if (code == TSDB_CODE_OPS_NOT_SUPPORT) {
+    if (code == TSDB_CODE_COM_OPS_NOT_SUPPORT) {
       fprintf(stdout, "Server is Community Edition, version is %s\n\n", taos_get_server_info(con));
     } else {
       fprintf(stderr, "Failed to check Server Edition, Reason:%d:%s\n\n", taos_errno(con), taos_errstr(con));
@@ -813,19 +900,18 @@ void shellGetGrantInfo(void *con) {
     return;
   }
 
-  int num_fields = taos_field_count(con);
+  int num_fields = taos_field_count(tres);
   if (num_fields == 0) {
     fprintf(stderr, "\nInvalid grant information.\n");
     exit(0);
   } else {
-    result = taos_use_result(con);
-    if (result == NULL) {
+    if (tres == NULL) {
       fprintf(stderr, "\nGrant information is null.\n");
       exit(0);
     }
 
-    TAOS_FIELD *fields = taos_fetch_fields(result);
-    TAOS_ROW row = taos_fetch_row(result);
+    TAOS_FIELD *fields = taos_fetch_fields(tres);
+    TAOS_ROW row = taos_fetch_row(tres);
     if (row == NULL) {
       fprintf(stderr, "\nFailed to get grant information from server. Abort.\n");
       exit(0);
@@ -845,9 +931,10 @@ void shellGetGrantInfo(void *con) {
       fprintf(stdout, "Server is Enterprise %s Edition, version is %s and will expire at %s.\n", serverVersion, taos_get_server_info(con), expiretime);
     }
 
-    taos_free_result(result);
     result = NULL;
+    taos_free_result(tres);
   }
 
   fprintf(stdout, "\n");
+  #endif
 }
diff --git a/src/kit/shell/src/shellImport.c b/src/kit/shell/src/shellImport.c
index dd04f935e7a30f6a8775b831c3ec726855f520f4..ee0a90757bb51a98dd2bf535319afc215dbc04a8 100644
--- a/src/kit/shell/src/shellImport.c
+++ b/src/kit/shell/src/shellImport.c
@@ -13,13 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _GNU_SOURCE
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
 #include "os.h"
 #include "shell.h"
 #include "shellCommand.h"
-#include "ttime.h"
+#include "tglobal.h"
 #include "tutil.h"
 
 static char **shellSQLFiles = NULL;
@@ -71,7 +72,7 @@ static void shellParseDirectory(const char *directoryName, const char *prefix, c
   }
 
   int fileNum = 0;
-  while (fscanf(fp, "%s", fileArray[fileNum++])) {
+  while (fscanf(fp, "%128s", fileArray[fileNum++])) {
     if (strcmp(fileArray[fileNum-1], shellTablesSQLFile) == 0) {
       fileNum--;
     }
@@ -134,18 +135,25 @@ static void shellGetDirectoryFileList(char *inputDir)
 static void shellSourceFile(TAOS *con, char *fptr) {
   wordexp_t full_path;
   int       read_len = 0;
-  char *    cmd = malloc(MAX_COMMAND_SIZE);
+  char *    cmd = malloc(tsMaxSQLStringLen);
   size_t    cmd_len = 0;
   char *    line = NULL;
   size_t    line_len = 0;
 
   if (wordexp(fptr, &full_path, 0) != 0) {
     fprintf(stderr, "ERROR: illegal file name\n");
+    free(cmd);
     return;
   }
 
   char *fname = full_path.we_wordv[0];
-  
+  if (fname == NULL) {
+    fprintf(stderr, "ERROR: invalid filename\n");
+    free(cmd);
+    return;
+  }
+
+  /*
   if (access(fname, F_OK) != 0) {
     fprintf(stderr, "ERROR: file %s is not exist\n", fptr);
     
@@ -161,11 +169,13 @@ static void shellSourceFile(TAOS *con, char *fptr) {
     free(cmd);
     return;
   }
+  */
 
   FILE *f = fopen(fname, "r");
   if (f == NULL) {
     fprintf(stderr, "ERROR: failed to open file %s\n", fname);
     wordfree(&full_path);
+    free(cmd);
     return;
   }
 
@@ -174,7 +184,7 @@ static void shellSourceFile(TAOS *con, char *fptr) {
   int lineNo = 0;
   while ((read_len = getline(&line, &line_len, f)) != -1) {
     ++lineNo;
-    if (read_len >= MAX_COMMAND_SIZE) continue;
+    if (read_len >= tsMaxSQLStringLen) continue;
     line[--read_len] = '\0';
 
     if (read_len == 0 || isCommentLine(line)) {  // line starts with #
@@ -189,12 +199,16 @@ static void shellSourceFile(TAOS *con, char *fptr) {
     }
 
     memcpy(cmd + cmd_len, line, read_len);
-    if (taos_query(con, cmd)) {
+    
+    TAOS_RES* pSql = taos_query(con, cmd);
+    int32_t code = taos_errno(pSql);
+    
+    if (code != 0) {
       fprintf(stderr, "DB error: %s: %s (%d)\n", taos_errstr(con), fname, lineNo);
-      /* free local resouce: allocated memory/metric-meta refcnt */
-      TAOS_RES *pRes = taos_use_result(con);
-      taos_free_result(pRes);
     }
+    
+    /* free local resouce: allocated memory/metric-meta refcnt */
+    taos_free_result(pSql);
 
     memset(cmd, 0, MAX_COMMAND_SIZE);
     cmd_len = 0;
@@ -219,7 +233,7 @@ void* shellImportThreadFp(void *arg)
   return NULL;
 }
 
-static void shellRunImportThreads(struct arguments* args)
+static void shellRunImportThreads(SShellArguments* args)
 {
   pthread_attr_t thattr;
   ShellThreadObj *threadObj = (ShellThreadObj *)calloc(args->threadNum, sizeof(ShellThreadObj));
@@ -227,7 +241,7 @@ static void shellRunImportThreads(struct arguments* args)
     ShellThreadObj *pThread = threadObj + t;
     pThread->threadIndex = t;
     pThread->totalThreads = args->threadNum;
-    pThread->taos = taos_connect(args->host, args->user, args->password, args->database, tsMgmtShellPort);
+    pThread->taos = taos_connect(args->host, args->user, args->password, args->database, tsDnodeShellPort);
     if (pThread->taos == NULL) {
       fprintf(stderr, "ERROR: thread:%d failed connect to TDengine, error:%s\n", pThread->threadIndex, taos_errstr(pThread->taos));
       exit(0);
@@ -252,7 +266,7 @@ static void shellRunImportThreads(struct arguments* args)
   free(threadObj);
 }
 
-void source_dir(TAOS* con, struct arguments* args) {
+void source_dir(TAOS* con, SShellArguments* args) {
   shellGetDirectoryFileList(args->dir);
   int64_t start = taosGetTimestampMs();
 
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 081b9eae319f3570ab11b67e075292648dd76161..6f5ea33d79f09219f49ee4094de2c377648b2290 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -14,12 +14,12 @@
  */
 
 #define __USE_XOPEN
-
 #include "os.h"
-
+#include "tglobal.h"
 #include "shell.h"
 #include "shellCommand.h"
 #include "tkey.h"
+#include "tulog.h"
 
 #define OPT_ABORT 1 /* �Cabort */
 
@@ -33,10 +33,11 @@ const char *argp_program_bug_address = "<support@taosdata.com>";
 static char doc[] = "";
 static char args_doc[] = "";
 static struct argp_option options[] = {
-  {"host",       'h', "HOST",       0,                   "TDEngine server IP address to connect. The default host is localhost."},
+  {"host",       'h', "HOST",       0,                   "TDengine server IP address to connect. The default host is localhost."},
   {"password",   'p', "PASSWORD",   OPTION_ARG_OPTIONAL, "The password to use when connecting to the server."},
   {"port",       'P', "PORT",       0,                   "The TCP/IP port number to use for the connection."},
-  {"user",       'u', "USER",       0,                   "The TDEngine user name to use when connecting to the server."},
+  {"user",       'u', "USER",       0,                   "The user name to use when connecting to the server."},
+  {"user",       'A', "Auth",       0,                   "The user auth to use when connecting to the server."},
   {"config-dir", 'c', "CONFIG_DIR", 0,                   "Configuration directory."},
   {"commands",   's', "COMMANDS",   0,                   "Commands to run without enter the shell."},
   {"raw-time",   'r', 0,            0,                   "Output time as uint64_t."},
@@ -45,12 +46,15 @@ static struct argp_option options[] = {
   {"thread",     'T', "THREADNUM",  0,                   "Number of threads when using multi-thread to import data."},
   {"database",   'd', "DATABASE",   0,                   "Database to use when connecting to the server."},
   {"timezone",   't', "TIMEZONE",   0,                   "Time zone of the shell, default is local."},
+  {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is NULL, valid option: client | server."},
+  {"endport",    'e', "ENDPORT",    0,                   "Net test end port, default is 6042."},
+  {"pktlen",     'l', "PKTLEN",     0,                   "Packet length used for net test, default is 1000 bytes."},
   {0}};
 
 static error_t parse_opt(int key, char *arg, struct argp_state *state) {
   /* Get the input argument from argp_parse, which we
   know is a pointer to our arguments structure. */
-  struct arguments *arguments = state->input;
+  SShellArguments *arguments = state->input;
   wordexp_t full_path;
 
   switch (key) {
@@ -62,7 +66,14 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
       if (arg) arguments->password = arg;
       break;
     case 'P':
-      tsMgmtShellPort = atoi(arg);
+      if (arg) {
+        tsDnodeShellPort = atoi(arg);
+        arguments->port  = atoi(arg);
+      } else {
+        fprintf(stderr, "Invalid port\n");
+        return -1;
+      }
+
       break;
     case 't':
       arguments->timezone = arg;
@@ -70,12 +81,20 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
     case 'u':
       arguments->user = arg;
       break;
+    case 'A':
+      arguments->auth = arg;
+      break;
     case 'c':
       if (wordexp(arg, &full_path, 0) != 0) {
         fprintf(stderr, "Invalid path %s\n", arg);
         return -1;
       }
-      strcpy(configDir, full_path.we_wordv[0]);
+      if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
+        fprintf(stderr, "config file path: %s overflow max len %d\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
+        wordfree(&full_path);
+        return -1;
+      }
+      tstrncpy(configDir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
       wordfree(&full_path);
       break;
     case 's':
@@ -89,7 +108,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
         fprintf(stderr, "Invalid path %s\n", arg);
         return -1;
       }
-      strcpy(arguments->file, full_path.we_wordv[0]);
+      tstrncpy(arguments->file, full_path.we_wordv[0], TSDB_FILENAME_LEN);
       wordfree(&full_path);
       break;
     case 'D':
@@ -97,15 +116,43 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
         fprintf(stderr, "Invalid path %s\n", arg);
         return -1;
       }
-      strcpy(arguments->dir, full_path.we_wordv[0]);
+      tstrncpy(arguments->dir, full_path.we_wordv[0], TSDB_FILENAME_LEN);
       wordfree(&full_path);
       break;
     case 'T':
-      arguments->threadNum = atoi(arg);
+      if (arg) {
+        arguments->threadNum = atoi(arg);
+      } else {
+        fprintf(stderr, "Invalid number of threads\n");
+        return -1;
+      }
       break;
     case 'd':
       arguments->database = arg;
       break;
+
+    case 'n':
+      arguments->netTestRole = arg;
+      break;
+
+    case 'e':
+      if (arg) {
+        arguments->endPort = atoi(arg);
+      } else {
+        fprintf(stderr, "Invalid end port\n");
+        return -1;
+      }
+      break;
+
+    case 'l':
+      if (arg) {
+        arguments->pktLen = atoi(arg);
+      } else {
+        fprintf(stderr, "Invalid packet length\n");
+        return -1;
+      }
+      break;
+      
     case OPT_ABORT:
       arguments->abort = 1;
       break;
@@ -118,7 +165,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
 /* Our argp parser. */
 static struct argp argp = {options, parse_opt, args_doc, doc};
 
-void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
+void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   static char verType[32] = {0};
   sprintf(verType, "version: %s\n", version);
 
@@ -146,13 +193,13 @@ void shellReadCommand(TAOS *con, char *command) {
   // Read input.
   char c;
   while (1) {
-    c = getchar();
+    c = (char)getchar(); // getchar() return an 'int' value
 
     if (c < 0) {  // For UTF-8
       int count = countPrefixOnes(c);
       utf8_array[0] = c;
       for (int k = 1; k < count; k++) {
-        c = getchar();
+        c = (char)getchar();
         utf8_array[k] = c;
       }
       insertChar(&cmd, utf8_array, count);
@@ -185,8 +232,8 @@ void shellReadCommand(TAOS *con, char *command) {
           printf("\n");
           if (isReadyGo(&cmd)) {
             sprintf(command, "%s%s", cmd.buffer, cmd.command);
-            tfree(cmd.buffer);
-            tfree(cmd.command);
+            taosTFree(cmd.buffer);
+            taosTFree(cmd.command);
             return;
           } else {
             updateBuffer(&cmd);
@@ -198,10 +245,10 @@ void shellReadCommand(TAOS *con, char *command) {
           break;
       }
     } else if (c == '\033') {
-      c = getchar();
+      c = (char)getchar();
       switch (c) {
         case '[':
-          c = getchar();
+          c = (char)getchar();
           switch (c) {
             case 'A':  // Up arrow
               if (hist_counter != history.hstart) {
@@ -228,35 +275,35 @@ void shellReadCommand(TAOS *con, char *command) {
               moveCursorLeft(&cmd);
               break;
             case '1':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // Home key
                 positionCursorHome(&cmd);
               }
               break;
             case '2':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // Insert key
               }
               break;
             case '3':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // Delete key
                 deleteChar(&cmd);
               }
               break;
             case '4':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // End key
                 positionCursorEnd(&cmd);
               }
               break;
             case '5':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // Page up key
               }
               break;
             case '6':
-              if ((c = getchar()) == '~') {
+              if ((c = (char)getchar()) == '~') {
                 // Page down key
               }
               break;
@@ -292,57 +339,26 @@ void *shellLoopQuery(void *arg) {
 
   char *command = malloc(MAX_COMMAND_SIZE);
   if (command == NULL){
-    tscError("failed to malloc command");
+    uError("failed to malloc command");
     return NULL;
   }
-  while (1) {
+  
+  do {
     // Read command from shell.
-
     memset(command, 0, MAX_COMMAND_SIZE);
     set_terminal_mode();
     shellReadCommand(con, command);
     reset_terminal_mode();
-
-    // Run the command
-    shellRunCommand(con, command);
-  }
+  } while (shellRunCommand(con, command) == 0);
+  
+  taosTFree(command);
+  exitShell();
 
   pthread_cleanup_pop(1);
-
+  
   return NULL;
 }
 
-void shellPrintNChar(char *str, int width, bool printMode) {
-  int col_left = width;
-  wchar_t wc;
-  while (col_left > 0) {
-    if (*str == '\0') break;
-    char *tstr = str;
-    int byte_width = mbtowc(&wc, tstr, MB_CUR_MAX);
-    if (byte_width <= 0) break;
-    int col_width = wcwidth(wc);
-    if (col_width <= 0) {
-      str += byte_width;
-      continue;
-    }
-    if (col_left < col_width) break;
-    printf("%lc", wc);
-    str += byte_width;
-    col_left -= col_width;
-  }
-
-  while (col_left > 0) {
-    printf(" ");
-    col_left--;
-  }
-
-  if (!printMode) {
-    printf("|");
-  } else {
-    printf("\n");
-  }
-}
-
 int get_old_terminal_mode(struct termios *tio) {
   /* Make sure stdin is a terminal. */
   if (!isatty(STDIN_FILENO)) {
@@ -393,7 +409,7 @@ void set_terminal_mode() {
   }
 }
 
-void get_history_path(char *history) { sprintf(history, "%s/%s", getpwuid(getuid())->pw_dir, HISTORY_FILE); }
+void get_history_path(char *history) { snprintf(history, TSDB_FILENAME_LEN, "%s/%s", getenv("HOME"), HISTORY_FILE); }
 
 void clearScreen(int ecmd_pos, int cursor_pos) {
   struct winsize w;
@@ -487,6 +503,7 @@ void showOnScreen(Command *cmd) {
 void cleanup_handler(void *arg) { tcsetattr(0, TCSANOW, &oldtio); }
 
 void exitShell() {
-  tcsetattr(0, TCSANOW, &oldtio);
+  /*int32_t ret =*/ tcsetattr(STDIN_FILENO, TCSANOW, &oldtio);
+  taos_cleanup();
   exit(EXIT_SUCCESS);
 }
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index a7b7e8383bafab2f76682488d131c0d2bfbe65d3..6cb7c669cc7a08434b2558588067d007b51b3595 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -15,26 +15,14 @@
 
 #include "os.h"
 #include "shell.h"
-#include "tsclient.h"
-#include "tutil.h"
+#include "tnettest.h"
 
-TAOS*     con;
 pthread_t pid;
-int32_t   TIMESTAMP_OUTPUT_LENGTH = 22;
 
-// TODO: IMPLEMENT INTERRUPT HANDLER.
-void interruptHandler(int signum) {
+void shellQueryInterruptHandler(int signum) {
 #ifdef LINUX
-  TAOS_RES* res = taos_use_result(con);
-  taos_stop_query(res);
-  if (res != NULL) {
-    /*
-     * we need to free result in async model, in order to avoid free
-     * results while the master thread is waiting for server response.
-     */
-    tscQueueAsyncFreeResult(res);
-  }
-  result = NULL;
+  void* pResHandle = atomic_val_compare_exchange_64(&result, result, 0);
+  taos_stop_query(pResHandle);
 #else
   printf("\nReceive ctrl+c or other signal, quit shell.\n");
   exit(0);
@@ -62,7 +50,7 @@ int checkVersion() {
 }
 
 // Global configurations
-struct arguments args = {
+SShellArguments args = {
   .host = NULL,
   .password = NULL,
   .user = NULL,
@@ -73,7 +61,10 @@ struct arguments args = {
   .file = "\0",
   .dir = "\0",
   .threadNum = 5,
-  .commands = NULL
+  .commands = NULL,  
+  .endPort = 6042,
+  .pktLen = 1000,
+  .netTestRole = NULL
 };
 
 /*
@@ -88,16 +79,22 @@ int main(int argc, char* argv[]) {
 
   shellParseArgument(argc, argv, &args);
 
+  if (args.netTestRole && args.netTestRole[0] != 0) {
+    taosNetTest(args.host, (uint16_t)args.port, (uint16_t)args.endPort, args.pktLen, args.netTestRole);
+    exit(0);
+  }
+
   /* Initialize the shell */
-  con = shellInit(&args);
+  TAOS* con = shellInit(&args);
   if (con == NULL) {
-    taos_error(con);
     exit(EXIT_FAILURE);
   }
 
-  /* Interupt handler. */
+  /* Interrupt handler. */
   struct sigaction act;
-  act.sa_handler = interruptHandler;
+  memset(&act, 0, sizeof(struct sigaction));
+  
+  act.sa_handler = shellQueryInterruptHandler;
   sigaction(SIGTERM, &act, NULL);
   sigaction(SIGINT, &act, NULL);
 
@@ -109,5 +106,4 @@ int main(int argc, char* argv[]) {
     pthread_create(&pid, NULL, shellLoopQuery, con);
     pthread_join(pid, NULL);
   }
-  return 0;
 }
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 61e6bcaf30b887a445134b28b0af022127b3e8ab..67174827d4ce005ad579fbb9ab3c72f1828ad095 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -9,24 +9,30 @@
 *
 * ****************************************************************/
 
-#include "shell.h"
 #include <assert.h>
 #include <regex.h>
 #include <stdio.h>
+#include "os.h"
+#include "shell.h"
+#include "taos.h"
 #include "shellCommand.h"
 
+extern char configDir[];
+
 void printHelp() {
   char indent[10] = "        ";
-  printf("taos shell is used to test the TDEngine database\n");
+  printf("taos shell is used to test the TDengine database\n");
 
   printf("%s%s\n", indent, "-h");
-  printf("%s%s%s\n", indent, indent, "TDEngine server IP address to connect. The default host is localhost.");
+  printf("%s%s%s\n", indent, indent, "TDengine server IP address to connect. The default host is localhost.");
   printf("%s%s\n", indent, "-p");
   printf("%s%s%s\n", indent, indent, "The password to use when connecting to the server.");
   printf("%s%s\n", indent, "-P");
   printf("%s%s%s\n", indent, indent, "The TCP/IP port number to use for the connection");
   printf("%s%s\n", indent, "-u");
-  printf("%s%s%s\n", indent, indent, "The TDEngine user name to use when connecting to the server.");
+  printf("%s%s%s\n", indent, indent, "The user name to use when connecting to the server.");
+  printf("%s%s\n", indent, "-A");
+  printf("%s%s%s\n", indent, indent, "The user auth to use when connecting to the server.");
   printf("%s%s\n", indent, "-c");
   printf("%s%s%s\n", indent, indent, "Configuration directory.");
   printf("%s%s\n", indent, "-s");
@@ -43,7 +49,7 @@ void printHelp() {
   exit(EXIT_SUCCESS);
 }
 
-void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
+void shellParseArgument(int argc, char *argv[], SShellArguments *arguments) {
   for (int i = 1; i < argc; i++) {
     // for host
     if (strcmp(argv[i], "-h") == 0) {
@@ -61,7 +67,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
     // for management port
     else if (strcmp(argv[i], "-P") == 0) {
       if (i < argc - 1) {
-        tsMgmtShellPort = atoi(argv[++i]);
+        arguments->port = atoi(argv[++i]);
       } else {
         fprintf(stderr, "option -P requires an argument\n");
         exit(EXIT_FAILURE);
@@ -75,8 +81,19 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
         fprintf(stderr, "option -u requires an argument\n");
         exit(EXIT_FAILURE);
       }
-    } else if (strcmp(argv[i], "-c") == 0) {
+    } else if (strcmp(argv[i], "-A") == 0) {
       if (i < argc - 1) {
+        arguments->auth = argv[++i];
+      } else {
+        fprintf(stderr, "option -A requires an argument\n");
+        exit(EXIT_FAILURE);
+      }
+    } else if (strcmp(argv[i], "-c") == 0) {
+      if (i < argc - 1) {   
+        if (strlen(argv[++i]) >= TSDB_FILENAME_LEN) {
+          fprintf(stderr, "config file path: %s overflow max len %d\n", argv[i], TSDB_FILENAME_LEN - 1);
+          exit(EXIT_FAILURE);
+        }
         strcpy(configDir, argv[++i]);
       } else {
         fprintf(stderr, "Option -c requires an argument\n");
@@ -203,46 +220,17 @@ void *shellLoopQuery(void *arg) {
   char *command = malloc(MAX_COMMAND_SIZE);
   if (command == NULL) return NULL;
 
-  while (1) {
+  do {
     memset(command, 0, MAX_COMMAND_SIZE);
     shellPrintPrompt();
 
     // Read command from shell.
     shellReadCommand(con, command);
-
-    // Run the command
-    shellRunCommand(con, command);
-  }
+  } while (shellRunCommand(con, command) == 0);
 
   return NULL;
 }
 
-void shellPrintNChar(char *str, int width, bool printMode) {
-  int     col_left = width;
-  wchar_t wc;
-  while (col_left > 0) {
-    if (*str == '\0') break;
-    char *tstr = str;
-    int   byte_width = mbtowc(&wc, tstr, MB_CUR_MAX);
-    int   col_width = byte_width;
-    if (col_left < col_width) break;
-    printf("%lc", wc);
-    str += byte_width;
-    col_left -= col_width;
-  }
-
-  while (col_left > 0) {
-    printf(" ");
-    col_left--;
-  }
-  
-  if (!printMode) {
-    printf("|");
-  } else {
-    printf("\n");
-  }
-}
-
-void get_history_path(char *history) { sprintf(history, "%s/%s", ".", HISTORY_FILE); }
+void get_history_path(char *history) { sprintf(history, "C:/TDengine/%s", HISTORY_FILE); }
 
 void exitShell() { exit(EXIT_SUCCESS); }
diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index 599875fa6086276e0b7ea80b97da1e3791a4f73e..ab02bdb64d1338ae2cf92a9784eddf9453a4e849 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -1,12 +1,19 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+IF (TD_LINUX)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taosdemo ${SRC})
+  
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(taosdemo taos_static)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(taosdemo taos)
+  ENDIF ()
+ELSEIF (TD_WINDOWS)
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosdemo ${SRC})
   TARGET_LINK_LIBRARIES(taosdemo taos_static)
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 24855ab8b51a87aed91ac10e8278941fe60bfee1..699e96428e201e998c1a4bb9cb8cd3c835e61364 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
  * This program is free software: you can use, redistribute, and/or modify
@@ -15,189 +15,436 @@
 
 #define _GNU_SOURCE
 
-#include <argp.h>
-#include <assert.h>
-#include <inttypes.h>
-
-#ifndef _ALPINE
-#include <error.h>
-#endif
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include <wordexp.h>
+#ifdef LINUX
+  #include "os.h"
+  #include <argp.h>
+  #include <assert.h>
+  #include <inttypes.h>
+  #ifndef _ALPINE
+    #include <error.h>
+  #endif
+  #include <pthread.h>
+  #include <semaphore.h>
+  #include <stdbool.h>
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+  #include <sys/time.h>
+  #include <time.h>
+  #include <unistd.h>
+  #include <wordexp.h>
+  #include <regex.h>
+#else  
+  #include <assert.h>
+  #include <regex.h>
+  #include <stdio.h>
+  #include "os.h"
+#endif  
 
 #include "taos.h"
+#include "tutil.h"
 
 extern char configDir[];
 
 #define BUFFER_SIZE      65536
 #define MAX_DB_NAME_SIZE 64
 #define MAX_TB_NAME_SIZE 64
-#define MAX_DATA_SIZE    1024
-#define MAX_NUM_DATATYPE 8
+#define MAX_DATA_SIZE    16000
+#define MAX_NUM_DATATYPE 10
 #define OPT_ABORT        1 /* –abort */
-
-/* The options we understand. */
-static struct argp_option options[] = {
-  {0, 'h', "host",                     0, "The host to connect to TDEngine. Default is localhost.",                                                           0},
-  {0, 'p', "port",                     0, "The TCP/IP port number to use for the connection. Default is 0.",                                                  1},
-  {0, 'u', "user",                     0, "The TDEngine user name to use when connecting to the server. Default is 'root'.",                                  2},
-  {0, 'a', "password",                 0, "The password to use when connecting to the server. Default is 'taosdata'.",                                        3},
-  {0, 'd', "database",                 0, "Destination database. Default is 'test'.",                                                                         3},
-  {0, 'm', "table_prefix",             0, "Table prefix name. Default is 't'.",                                                                               3},
-  {0, 'M', 0,                          0, "Use metric flag.",                                                                                                 13},
-  {0, 'o', "outputfile",               0, "Direct output to the named file. Default is './output.txt'.",                                                      14},
-  {0, 'q', "query_mode",               0, "Query mode--0: SYNC, 1: ASYNC. Default is SYNC.",                                                                  6},
-  {0, 'b', "type_of_cols",             0, "The data_type of columns: 'INT', 'TINYINT', 'SMALLINT', 'BIGINT', 'FLOAT', 'DOUBLE', 'BINARY'. Default is 'INT'.", 7},
-  {0, 'w', "length_of_binary",         0, "The length of data_type 'BINARY'. Only applicable when type of cols is 'BINARY'. Default is 8",                    8},
-  {0, 'l', "num_of_cols_per_record",   0, "The number of columns per record. Default is 3.",                                                                  8},
-  {0, 'c', "num_of_conns",             0, "The number of connections. Default is 10.",                                                                        9},
-  {0, 'r', "num_of_records_per_req",   0, "The number of records per request. Default is 1000.",                                                              10},
-  {0, 't', "num_of_tables",            0, "The number of tables. Default is 10000.",                                                                          11},
-  {0, 'n', "num_of_records_per_table", 0, "The number of records per table. Default is 100000.",                                                              12},
-  {0, 'f', "config_directory",         0, "Configuration directory. Default is '/etc/taos/'.",                                                                14},
-  {0, 'x', 0,                          0, "Insert only flag.",                                                                                                13},
-  {0}};
+#define STRING_LEN       60000
+#define MAX_PREPARED_RAND 1000000
 
 /* Used by main to communicate with parse_opt. */
-struct arguments {
-  char  *host;
-  uint16_t    port;
-  char  *user;
-  char  *password;
-  char  *database;
-  char  *tb_prefix;
-  bool   use_metric;
-  bool   insert_only;
-  char  *output_file;
-  int    mode;
-  char  *datatype[MAX_NUM_DATATYPE];
-  int    len_of_binary;
-  int    num_of_CPR;
-  int    num_of_connections;
-  int    num_of_RPR;
-  int    num_of_tables;
-  int    num_of_DPT;
-  int    abort;
-  char **arg_list;
-};
-
-/* Parse a single option. */
-static error_t parse_opt(int key, char *arg, struct argp_state *state) {
-  /* Get the input argument from argp_parse, which we
-     know is a pointer to our arguments structure. */
-  struct arguments *arguments = state->input;
-  wordexp_t full_path;
-  char **sptr;
-  switch (key) {
-    case 'h':
-      arguments->host = arg;
-      break;
-    case 'p':
-      arguments->port = atoi(arg);
-      break;
-    case 'u':
-      arguments->user = arg;
-      break;
-    case 'a':
-      arguments->password = arg;
-      break;
-    case 'o':
-      arguments->output_file = arg;
-      break;
-    case 'q':
-      arguments->mode = atoi(arg);
-      break;
-    case 'c':
-      arguments->num_of_connections = atoi(arg);
-      break;
-    case 'r':
-      arguments->num_of_RPR = atoi(arg);
-      break;
-    case 't':
-      arguments->num_of_tables = atoi(arg);
-      break;
-    case 'n':
-      arguments->num_of_DPT = atoi(arg);
-      break;
-    case 'd':
-      arguments->database = arg;
-      break;
-    case 'l':
-      arguments->num_of_CPR = atoi(arg);
-      break;
-    case 'b':
-      sptr = arguments->datatype;
-      if (strstr(arg, ",") == NULL) {
-        if (strcasecmp(arg, "INT") != 0 && strcasecmp(arg, "FLOAT") != 0 &&
-            strcasecmp(arg, "TINYINT") != 0 && strcasecmp(arg, "BOOL") != 0 &&
-            strcasecmp(arg, "SMALLINT") != 0 &&
-            strcasecmp(arg, "BIGINT") != 0 && strcasecmp(arg, "DOUBLE") != 0 &&
-            strcasecmp(arg, "BINARY")) {
-          argp_error(state, "Invalid data_type!");
-        }
-        sptr[0] = arg;
-      } else {
-        int index = 0;
-        char *dupstr = strdup(arg);
-        char *running = dupstr;
-        char *token = strsep(&running, ",");
-        while (token != NULL) {
-          if (strcasecmp(token, "INT") != 0 &&
-              strcasecmp(token, "FLOAT") != 0 &&
-              strcasecmp(token, "TINYINT") != 0 &&
-              strcasecmp(token, "BOOL") != 0 &&
-              strcasecmp(token, "SMALLINT") != 0 &&
-              strcasecmp(token, "BIGINT") != 0 &&
-              strcasecmp(token, "DOUBLE") != 0 && strcasecmp(token, "BINARY")) {
+typedef struct DemoArguments {
+  char *   host;
+  uint16_t port;
+  char *   user;
+  char *   password;
+  char *   database;
+  int      replica;
+  char *   tb_prefix;
+  char *   sqlFile;
+  bool     use_metric;
+  bool     insert_only;
+  char *   output_file;
+  int      mode;
+  char *   datatype[MAX_NUM_DATATYPE + 1];
+  int      len_of_binary;
+  int      num_of_CPR;
+  int      num_of_threads;
+  int      num_of_RPR;
+  int      num_of_tables;
+  int      num_of_DPT;
+  int      abort;
+  int      order;
+  int      rate;
+  int      method_of_delete;
+  char **  arg_list;
+} SDemoArguments;
+
+#ifdef LINUX
+  /* The options we understand. */
+  static struct argp_option options[] = {
+    {0, 'h', "host",                     0, "The host to connect to TDengine. Default is localhost.",                                                           0},
+    {0, 'p', "port",                     0, "The TCP/IP port number to use for the connection. Default is 0.",                                                  1},
+    {0, 'u', "user",                     0, "The TDengine user name to use when connecting to the server. Default is 'root'.",                                  2},
+    #ifdef _TD_POWER_    
+    {0, 'P', "password",                 0, "The password to use when connecting to the server. Default is 'powerdb'.",                                         3},
+    #else
+    {0, 'P', "password",                 0, "The password to use when connecting to the server. Default is 'taosdata'.",                                        3},
+    #endif
+    {0, 'd', "database",                 0, "Destination database. Default is 'test'.",                                                                         3},
+    {0, 'a', "replica",                  0, "Set the replica parameters of the database, Default 1, min: 1, max: 3.",                                              3},
+    {0, 'm', "table_prefix",             0, "Table prefix name. Default is 't'.",                                                                               3},
+    {0, 's', "sql file",                 0, "The select sql file.",                                                                                             3},
+    {0, 'M', 0,                          0, "Use metric flag.",                                                                                                 13},
+    {0, 'o', "outputfile",               0, "Direct output to the named file. Default is './output.txt'.",                                                      14},
+    {0, 'q', "query_mode",               0, "Query mode--0: SYNC, 1: ASYNC. Default is SYNC.",                                                                  6},
+    {0, 'b', "type_of_cols",             0, "The data_type of columns: 'INT', 'TINYINT', 'SMALLINT', 'BIGINT', 'FLOAT', 'DOUBLE', 'BINARY'. Default is 'INT'.", 7},
+    {0, 'w', "length_of_binary",         0, "The length of data_type 'BINARY'. Only applicable when type of cols is 'BINARY'. Default is 8",                    8},
+    {0, 'l', "num_of_cols_per_record",   0, "The number of columns per record. Default is 3.",                                                                  8},
+    {0, 'T', "num_of_threads",           0, "The number of threads. Default is 10.",                                                                            9},
+    {0, 'r', "num_of_records_per_req",   0, "The number of records per request. Default is 1000.",                                                              10},
+    {0, 't', "num_of_tables",            0, "The number of tables. Default is 10000.",                                                                          11},
+    {0, 'n', "num_of_records_per_table", 0, "The number of records per table. Default is 100000.",                                                              12},
+    #ifdef _TD_POWER_
+    {0, 'c', "config_directory",         0, "Configuration directory. Default is '/etc/power/'.",                                                               14},
+    #else
+    {0, 'c', "config_directory",         0, "Configuration directory. Default is '/etc/taos/'.",                                                                14},
+    #endif
+    {0, 'x', 0,                          0, "Insert only flag.",                                                                                                13},
+    {0, 'O', "order",                    0, "Insert mode--0: In order, 1: Out of order. Default is in order.",                                                  14},
+    {0, 'R', "rate",                     0, "Out of order data's rate--if order=1 Default 10, min: 0, max: 50.",                                                14},
+    {0, 'D', "delete table",             0, "Delete data methods——0: don't delete, 1: delete by table, 2: delete by stable, 3: delete by database",             14},
+    {0}};
+
+  /* Parse a single option. */
+  static error_t parse_opt(int key, char *arg, struct argp_state *state) {
+    /* Get the input argument from argp_parse, which we
+      know is a pointer to our arguments structure. */
+    SDemoArguments *arguments = state->input;
+    wordexp_t full_path;
+    char **sptr;
+    switch (key) {
+      case 'h':
+        arguments->host = arg;
+        break;
+      case 'p':
+        arguments->port = atoi(arg);
+        break;
+      case 'u':
+        arguments->user = arg;
+        break;
+      case 'P':
+        arguments->password = arg;
+        break;
+      case 'o':
+        arguments->output_file = arg;
+        break;
+      case 's':
+        arguments->sqlFile = arg;
+        break;
+      case 'q':
+        arguments->mode = atoi(arg);
+        break;
+      case 'T':
+        arguments->num_of_threads = atoi(arg);
+        break;
+      case 'r':
+        arguments->num_of_RPR = atoi(arg);
+        break;
+      case 't':
+        arguments->num_of_tables = atoi(arg);
+        break;
+      case 'n':
+        arguments->num_of_DPT = atoi(arg);
+        break;
+      case 'd':
+        arguments->database = arg;
+        break;
+      case 'l':
+        arguments->num_of_CPR = atoi(arg);
+        break;
+      case 'b':
+        sptr = arguments->datatype;
+        if (strstr(arg, ",") == NULL) {
+          if (strcasecmp(arg, "INT") != 0 && strcasecmp(arg, "FLOAT") != 0 &&
+              strcasecmp(arg, "TINYINT") != 0 && strcasecmp(arg, "BOOL") != 0 &&
+              strcasecmp(arg, "SMALLINT") != 0 &&
+              strcasecmp(arg, "BIGINT") != 0 && strcasecmp(arg, "DOUBLE") != 0 &&
+              strcasecmp(arg, "BINARY") && strcasecmp(arg, "NCHAR")) {
             argp_error(state, "Invalid data_type!");
           }
-          sptr[index++] = token;
-          token = strsep(&running, ", ");
+          sptr[0] = arg;
+        } else {
+          int index = 0;
+          char *dupstr = strdup(arg);
+          char *running = dupstr;
+          char *token = strsep(&running, ",");
+          while (token != NULL) {
+            if (strcasecmp(token, "INT") != 0 &&
+                strcasecmp(token, "FLOAT") != 0 &&
+                strcasecmp(token, "TINYINT") != 0 &&
+                strcasecmp(token, "BOOL") != 0 &&
+                strcasecmp(token, "SMALLINT") != 0 &&
+                strcasecmp(token, "BIGINT") != 0 &&
+                strcasecmp(token, "DOUBLE") != 0 && strcasecmp(token, "BINARY") && strcasecmp(token, "NCHAR")) {
+              argp_error(state, "Invalid data_type!");
+            }
+            sptr[index++] = token;
+            token = strsep(&running, ",");
+            if (index >= MAX_NUM_DATATYPE) break;
+          }
         }
-      }
-      break;
-    case 'w':
-      arguments->len_of_binary = atoi(arg);
-      break;
-    case 'm':
-      arguments->tb_prefix = arg;
-      break;
-    case 'M':
-      arguments->use_metric = true;
-      break;
-    case 'x':
-      arguments->insert_only = true;
-      break;
-    case 'f':
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      taos_options(TSDB_OPTION_CONFIGDIR, full_path.we_wordv[0]);
-      wordfree(&full_path);
-      break;
-    case OPT_ABORT:
-      arguments->abort = 1;
-      break;
-    case ARGP_KEY_ARG:
-      /*arguments->arg_list = &state->argv[state->next-1];
-      state->next = state->argc;*/
-      argp_usage(state);
-      break;
+        break;
+      case 'w':
+        arguments->len_of_binary = atoi(arg);
+        break;
+      case 'm':
+        arguments->tb_prefix = arg;
+        break;
+      case 'M':
+        arguments->use_metric = false;
+        break;
+      case 'x':
+        arguments->insert_only = false;
+        break;
+      case 'c':
+        if (wordexp(arg, &full_path, 0) != 0) {
+          fprintf(stderr, "Invalid path %s\n", arg);
+          return -1;
+        }
+        taos_options(TSDB_OPTION_CONFIGDIR, full_path.we_wordv[0]);
+        wordfree(&full_path);
+        break;
+      case 'O':
+        arguments->order = atoi(arg);
+        if (arguments->order > 1 || arguments->order < 0)
+        {
+          arguments->order = 0;
+        } else if (arguments->order == 1)
+        {
+          arguments->rate = 10;
+        }
+        break;
+      case 'R':
+        arguments->rate = atoi(arg);
+        if (arguments->order == 1 && (arguments->rate > 50 || arguments->rate <= 0))
+        {
+          arguments->rate = 10;
+        }
+        break;
+      case 'a':
+        arguments->replica = atoi(arg);
+        if (arguments->replica > 3 || arguments->replica < 1)
+        {
+          arguments->replica = 1;
+        }
+        break;
+      case 'D':
+        arguments->method_of_delete = atoi(arg);
+        if (arguments->method_of_delete < 0 || arguments->method_of_delete > 3)
+        {
+          arguments->method_of_delete = 0;
+        }
+        break;
+      case OPT_ABORT:
+        arguments->abort = 1;
+        break;
+      case ARGP_KEY_ARG:
+        /*arguments->arg_list = &state->argv[state->next-1];
+        state->next = state->argc;*/
+        argp_usage(state);
+        break;
+
+      default:
+        return ARGP_ERR_UNKNOWN;
+    }
+    return 0;
+  }
 
-    default:
-      return ARGP_ERR_UNKNOWN;
+  static struct argp argp = {options, parse_opt, 0, 0};
+
+  void parse_args(int argc, char *argv[], SDemoArguments *arguments) {
+    argp_parse(&argp, argc, argv, 0, 0, arguments);
+    if (arguments->abort) {
+      #ifndef _ALPINE
+        error(10, 0, "ABORTED");
+      #else
+        abort();
+      #endif
+    }
+  }
+
+#else
+  void printHelp() {
+    char indent[10] = "        ";
+    printf("%s%s\n", indent, "-h");
+    printf("%s%s%s\n", indent, indent, "host, The host to connect to TDengine. Default is localhost.");
+    printf("%s%s\n", indent, "-p");
+    printf("%s%s%s\n", indent, indent, "port, The TCP/IP port number to use for the connection. Default is 0.");
+    printf("%s%s\n", indent, "-u");
+    printf("%s%s%s\n", indent, indent, "user, The user name to use when connecting to the server. Default is 'root'.");
+    printf("%s%s\n", indent, "-p");
+    #ifdef _TD_POWER_    
+    printf("%s%s%s\n", indent, indent, "password, The password to use when connecting to the server. Default is 'powerdb'.");
+    #else
+    printf("%s%s%s\n", indent, indent, "password, The password to use when connecting to the server. Default is 'taosdata'.");
+    #endif
+    printf("%s%s\n", indent, "-d");
+    printf("%s%s%s\n", indent, indent, "database, Destination database. Default is 'test'.");
+    printf("%s%s\n", indent, "-a");
+    printf("%s%s%s\n", indent, indent, "replica, Set the replica parameters of the database, Default 1, min: 1, max: 3.");
+    printf("%s%s\n", indent, "-m");
+    printf("%s%s%s\n", indent, indent, "table_prefix, Table prefix name. Default is 't'.");
+    printf("%s%s\n", indent, "-s");
+    printf("%s%s%s\n", indent, indent, "sql file, The select sql file.");
+    printf("%s%s\n", indent, "-M");
+    printf("%s%s%s\n", indent, indent, "meteric, Use metric flag.");
+    printf("%s%s\n", indent, "-o");
+    printf("%s%s%s\n", indent, indent, "outputfile, Direct output to the named file. Default is './output.txt'.");
+    printf("%s%s\n", indent, "-q");
+    printf("%s%s%s\n", indent, indent, "query_mode, Query mode--0: SYNC, 1: ASYNC. Default is SYNC.");
+    printf("%s%s\n", indent, "-b");
+    printf("%s%s%s\n", indent, indent, "type_of_cols, data_type of columns: 'INT', 'TINYINT', 'SMALLINT', 'BIGINT', 'FLOAT', 'DOUBLE', 'BINARY'. Default is 'INT'.");
+    printf("%s%s\n", indent, "-w");
+    printf("%s%s%s\n", indent, indent, "length_of_binary, The length of data_type 'BINARY'. Only applicable when type of cols is 'BINARY'. Default is 8");
+    printf("%s%s\n", indent, "-l");
+    printf("%s%s%s\n", indent, indent, "num_of_cols_per_record, The number of columns per record. Default is 3.");
+    printf("%s%s\n", indent, "-T");
+    printf("%s%s%s\n", indent, indent, "num_of_threads, The number of threads. Default is 10.");
+    printf("%s%s\n", indent, "-r");
+    printf("%s%s%s\n", indent, indent, "num_of_records_per_req, The number of records per request. Default is 1000.");
+    printf("%s%s\n", indent, "-t");
+    printf("%s%s%s\n", indent, indent, "num_of_tables, The number of tables. Default is 10000.");
+    printf("%s%s\n", indent, "-n");
+    printf("%s%s%s\n", indent, indent, "num_of_records_per_table, The number of records per table. Default is 100000.");
+    printf("%s%s\n", indent, "-c");
+    #ifdef _TD_POWER_
+    printf("%s%s%s\n", indent, indent, "config_directory, Configuration directory. Default is '/etc/power/'.");
+    #else
+    printf("%s%s%s\n", indent, indent, "config_directory, Configuration directory. Default is '/etc/taos/'.");
+    #endif
+    printf("%s%s\n", indent, "-x");
+    printf("%s%s%s\n", indent, indent, "flag, Insert only flag.");
+    printf("%s%s\n", indent, "-O");
+    printf("%s%s%s\n", indent, indent, "order, Insert mode--0: In order, 1: Out of order. Default is in order.");
+    printf("%s%s\n", indent, "-R");
+    printf("%s%s%s\n", indent, indent, "rate, Out of order data's rate--if order=1 Default 10, min: 0, max: 50.");
+    printf("%s%s\n", indent, "-D");
+    printf("%s%s%s\n", indent, indent, "Delete data methods 0: don't delete, 1: delete by table, 2: delete by stable, 3: delete by database.");
+  }
+
+  void parse_args(int argc, char *argv[], SDemoArguments *arguments) {
+    char **sptr;
+    for (int i = 1; i < argc; i++) {
+      if (strcmp(argv[i], "-h") == 0) {
+        arguments->host = argv[++i];
+      } else if (strcmp(argv[i], "-p") == 0) {
+        arguments->port = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-u") == 0) {
+        arguments->user = argv[++i];
+      } else if (strcmp(argv[i], "-P") == 0) {
+        arguments->password = argv[++i];
+      } else if (strcmp(argv[i], "-o") == 0) {
+        arguments->output_file = argv[++i];
+      } else if (strcmp(argv[i], "-s") == 0) {
+        arguments->sqlFile = argv[++i];
+      } else if (strcmp(argv[i], "-q") == 0) {
+        arguments->mode = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-T") == 0) {
+        arguments->num_of_threads = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-r") == 0) {
+        arguments->num_of_RPR = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-t") == 0) {
+        arguments->num_of_tables = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-n") == 0) {
+        arguments->num_of_DPT = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-d") == 0) {
+        arguments->database = argv[++i];
+      } else if (strcmp(argv[i], "-l") == 0) {
+        arguments->num_of_CPR = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-b") == 0) {
+        sptr = arguments->datatype;
+        ++i;
+        if (strstr(argv[i], ",") == NULL) {
+          if (strcasecmp(argv[i], "INT") != 0 && strcasecmp(argv[i], "FLOAT") != 0 &&
+              strcasecmp(argv[i], "TINYINT") != 0 && strcasecmp(argv[i], "BOOL") != 0 &&
+              strcasecmp(argv[i], "SMALLINT") != 0 &&
+              strcasecmp(argv[i], "BIGINT") != 0 && strcasecmp(argv[i], "DOUBLE") != 0 &&
+              strcasecmp(argv[i], "BINARY") && strcasecmp(argv[i], "NCHAR")) {
+            fprintf(stderr, "Invalid data_type!\n");
+            printHelp();
+            exit(EXIT_FAILURE);
+          }
+          sptr[0] = argv[i];
+        } else {
+          int index = 0;
+          char *dupstr = strdup(argv[i]);
+          char *running = dupstr;
+          char *token = strsep(&running, ",");
+          while (token != NULL) {
+            if (strcasecmp(token, "INT") != 0 &&
+                strcasecmp(token, "FLOAT") != 0 &&
+                strcasecmp(token, "TINYINT") != 0 &&
+                strcasecmp(token, "BOOL") != 0 &&
+                strcasecmp(token, "SMALLINT") != 0 &&
+                strcasecmp(token, "BIGINT") != 0 &&
+                strcasecmp(token, "DOUBLE") != 0 && strcasecmp(token, "BINARY") && strcasecmp(token, "NCHAR")) {
+              fprintf(stderr, "Invalid data_type!\n");
+              printHelp();
+              exit(EXIT_FAILURE);
+            }
+            sptr[index++] = token;
+            token = strsep(&running, ",");
+            if (index >= MAX_NUM_DATATYPE) break;
+          }
+        }
+      } else if (strcmp(argv[i], "-w") == 0) {
+        arguments->len_of_binary = atoi(argv[++i]);
+      } else if (strcmp(argv[i], "-m") == 0) {
+        arguments->tb_prefix = argv[++i];
+      } else if (strcmp(argv[i], "-M") == 0) {
+        arguments->use_metric = false;
+      } else if (strcmp(argv[i], "-x") == 0) {
+        arguments->insert_only = false;
+      } else if (strcmp(argv[i], "-c") == 0) {
+        strcpy(configDir, argv[++i]);
+      } else if (strcmp(argv[i], "-O") == 0) {
+        arguments->order = atoi(argv[++i]);
+        if (arguments->order > 1 || arguments->order < 0) {
+          arguments->order = 0;
+        } else if (arguments->order == 1) {
+          arguments->rate = 10;
+        }
+      } else if (strcmp(argv[i], "-R") == 0) {
+        arguments->rate = atoi(argv[++i]);
+        if (arguments->order == 1 && (arguments->rate > 50 || arguments->rate <= 0)) {
+          arguments->rate = 10;
+        }
+      } else if (strcmp(argv[i], "-a") == 0) {
+        arguments->replica = atoi(argv[++i]);
+        if (arguments->rate > 3 || arguments->rate < 1) {
+          arguments->rate = 1;
+        }
+      } else if (strcmp(argv[i], "-D") == 0) {
+        arguments->method_of_delete = atoi(argv[++i]);
+        if (arguments->method_of_delete < 0 || arguments->method_of_delete > 3) {
+          arguments->method_of_delete = 0;
+        }
+      } else if (strcmp(argv[i], "--help") == 0) {
+        printHelp();
+        exit(EXIT_FAILURE);
+      } else {
+        fprintf(stderr, "wrong options\n");
+        printHelp();
+        exit(EXIT_FAILURE);
+      }
+    }
   }
-  return 0;
-}
+
+#endif
 
 /* ******************************* Structure
  * definition*******************************  */
@@ -217,12 +464,17 @@ typedef struct {
   int ncols_per_record;
   int nrecords_per_table;
   int nrecords_per_request;
+  int data_of_order;
+  int data_of_rate;
   int64_t start_time;
   bool do_aggreFunc;
+  
+  char* cols;  
+  bool  use_metric;
 
-  sem_t mutex_sem;
+  tsem_t mutex_sem;
   int notFinished;
-  sem_t lock_sem;
+  tsem_t lock_sem;
 } info;
 
 typedef struct {
@@ -236,19 +488,18 @@ typedef struct {
   int    ncols_per_record;
   char **data_type;
   int    len_of_binary;
+  int data_of_order;
+  int data_of_rate;
 
-  sem_t *mutex_sem;
-  int   *notFinished;
-  sem_t *lock_sem;
+  tsem_t *mutex_sem;
+  int    *notFinished;
+  tsem_t *lock_sem;
 } sTable;
 
 /* ******************************* Global
  * variables*******************************  */
 char *aggreFunc[] = {"*", "count(*)", "avg(f1)", "sum(f1)", "max(f1)", "min(f1)", "first(f1)", "last(f1)"};
 
-/* ******************************* Global
- * functions*******************************  */
-static struct argp argp = {options, parse_opt, 0, 0};
 
 void queryDB(TAOS *taos, char *command);
 
@@ -258,44 +509,59 @@ void *readMetric(void *sarg);
 
 void *syncWrite(void *sarg);
 
+void *deleteTable();
+
 void *asyncWrite(void *sarg);
 
-void generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary);
+int generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary);
 
 void rand_string(char *str, int size);
 
+void init_rand_data();
+
 double getCurrentTime();
 
 void callBack(void *param, TAOS_RES *res, int code);
+void multiThreadCreateTable(char* cols, bool use_metric, int threads, int ntables, char* db_name, char* tb_prefix, char *ip_addr, uint16_t port, char *user, char *pass);
+void querySqlFile(TAOS* taos, char* sqlFile);
 
 int main(int argc, char *argv[]) {
-  struct arguments arguments = {NULL,            // host
+  SDemoArguments arguments = {  NULL,            // host
                                 0,               // port
                                 "root",          // user
+                                #ifdef _TD_POWER_ 
+                                "powerdb",      // password
+                                #else
                                 "taosdata",      // password
+                                #endif
                                 "test",          // database
+                                1,               // replica
                                 "t",             // tb_prefix
+                                NULL,
                                 false,           // use_metric
                                 false,           // insert_only
                                 "./output.txt",  // output_file
                                 0,               // mode
                                 {
                                 "int",           // datatype
-                                "",
-                                "",
-                                "",
-                                "",
-                                "",
-                                "",
-                                ""
+                                "int",
+                                "int",
+                                "int",
+                                "int",
+                                "int",
+                                "int",
+                                "float"
                                 },
                                 8,               // len_of_binary
                                 1,               // num_of_CPR
-                                1,               // num_of_connections
+                                1,               // num_of_connections/thread
                                 1,               // num_of_RPR
                                 1,               // num_of_tables
                                 50000,           // num_of_DPT
                                 0,               // abort
+                                0,               // order
+                                0,               // rate
+                                0,               // method_of_delete
                                 NULL             // arg_list
                                 };
 
@@ -304,23 +570,15 @@ int main(int argc, char *argv[]) {
   // For demo use, change default values for some parameters;
   arguments.num_of_tables = 10000;
   arguments.num_of_CPR = 3; 
-  arguments.num_of_connections = 10;
+  arguments.num_of_threads = 10;
   arguments.num_of_DPT = 100000;
   arguments.num_of_RPR = 1000;
   arguments.use_metric = true;
   arguments.insert_only = true;
   // end change
 
-  argp_parse(&argp, argc, argv, 0, 0, &arguments);
+  parse_args(argc, argv, &arguments);
 
-  if (arguments.abort) {
-    #ifndef _ALPINE
-      error(10, 0, "ABORTED");
-    #else
-      abort();
-    #endif
-  }
-  
   enum MODE query_mode = arguments.mode;
   char *ip_addr = arguments.host;
   uint16_t port = arguments.port;
@@ -330,25 +588,41 @@ int main(int argc, char *argv[]) {
   char *tb_prefix = arguments.tb_prefix;
   int len_of_binary = arguments.len_of_binary;
   int ncols_per_record = arguments.num_of_CPR;
+  int order = arguments.order;
+  int rate = arguments.rate;
+  int method_of_delete = arguments.method_of_delete;
   int ntables = arguments.num_of_tables;
-  int nconnections = arguments.num_of_connections;
+  int threads = arguments.num_of_threads;
   int nrecords_per_table = arguments.num_of_DPT;
   int nrecords_per_request = arguments.num_of_RPR;
   bool use_metric = arguments.use_metric;
   bool insert_only = arguments.insert_only;
   char **data_type = arguments.datatype;
   int count_data_type = 0;
-  char dataString[512];
+  char dataString[STRING_LEN];
   bool do_aggreFunc = true;
-  if (strcasecmp(data_type[0], "BINARY") == 0 || strcasecmp(data_type[0], "BOOL") == 0) {
+  int replica = arguments.replica;
+
+  if (NULL != arguments.sqlFile) {
+    TAOS* qtaos = taos_connect(ip_addr, user, pass, db_name, port);
+    querySqlFile(qtaos, arguments.sqlFile);  
+    taos_close(qtaos);
+    return 0;
+  }
+  init_rand_data();
+
+  memset(dataString, 0, STRING_LEN);
+  int len = 0;
+
+  if (strcasecmp(data_type[0], "BINARY") == 0 || strcasecmp(data_type[0], "BOOL") == 0 || strcasecmp(data_type[0], "NCHAR") == 0 ) {
     do_aggreFunc = false;
   }
   for (; count_data_type <= MAX_NUM_DATATYPE; count_data_type++) {
-    if (strcasecmp(data_type[count_data_type], "") == 0) {
+    if (data_type[count_data_type] == NULL) {
       break;
     }
-    strcat(dataString, data_type[count_data_type]);
-    strcat(dataString, " ");
+
+    len += snprintf(dataString + len, STRING_LEN - len, "%s ", data_type[count_data_type]);
   }
 
   FILE *fp = fopen(arguments.output_file, "a");
@@ -359,6 +633,33 @@ int main(int argc, char *argv[]) {
   
   time_t tTime = time(NULL);
   struct tm tm = *localtime(&tTime);
+  printf("###################################################################\n");
+  printf("# Server IP:                         %s:%hu\n", ip_addr == NULL ? "localhost" : ip_addr, port);
+  printf("# User:                              %s\n", user);
+  printf("# Password:                          %s\n", pass);
+  printf("# Use metric:                        %s\n", use_metric ? "true" : "false");
+  printf("# Datatype of Columns:               %s\n", dataString);
+  printf("# Binary Length(If applicable):      %d\n",
+         (strncasecmp(dataString, "BINARY", 6) == 0 || strncasecmp(dataString, "NCHAR", 5) == 0) ? len_of_binary : -1);
+  printf("# Number of Columns per record:      %d\n", ncols_per_record);
+  printf("# Number of Threads:                 %d\n", threads);
+  printf("# Number of Tables:                  %d\n", ntables);
+  printf("# Number of Data per Table:          %d\n", nrecords_per_table);
+  printf("# Records/Request:                   %d\n", nrecords_per_request);
+  printf("# Database name:                     %s\n", db_name);
+  printf("# Table prefix:                      %s\n", tb_prefix);
+  if (order == 1)
+  {
+    printf("# Data order:                        %d\n", order);
+    printf("# Data out of order rate:            %d\n", rate);
+
+  }
+  printf("# Delete method:                     %d\n", method_of_delete);
+  printf("# Test time:                         %d-%02d-%02d %02d:%02d:%02d\n", tm.tm_year + 1900, tm.tm_mon + 1,
+          tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+  printf("###################################################################\n\n");
+  printf("Press enter key to continue");
+  (void)getchar();
 
   fprintf(fp, "###################################################################\n");
   fprintf(fp, "# Server IP:                         %s:%hu\n", ip_addr == NULL ? "localhost" : ip_addr, port);
@@ -367,14 +668,20 @@ int main(int argc, char *argv[]) {
   fprintf(fp, "# Use metric:                        %s\n", use_metric ? "true" : "false");
   fprintf(fp, "# Datatype of Columns:               %s\n", dataString);
   fprintf(fp, "# Binary Length(If applicable):      %d\n",
-          (strcasestr(dataString, "BINARY") != NULL) ? len_of_binary : -1);
+         (strncasecmp(dataString, "BINARY", 6) == 0 || strncasecmp(dataString, "NCHAR", 5) == 0) ? len_of_binary : -1);
   fprintf(fp, "# Number of Columns per record:      %d\n", ncols_per_record);
-  fprintf(fp, "# Number of Connections:             %d\n", nconnections);
+  fprintf(fp, "# Number of Threads:                 %d\n", threads);
   fprintf(fp, "# Number of Tables:                  %d\n", ntables);
   fprintf(fp, "# Number of Data per Table:          %d\n", nrecords_per_table);
   fprintf(fp, "# Records/Request:                   %d\n", nrecords_per_request);
   fprintf(fp, "# Database name:                     %s\n", db_name);
   fprintf(fp, "# Table prefix:                      %s\n", tb_prefix);
+  if (order == 1)
+  {
+    printf("# Data order:                        %d\n", order);
+    printf("# Data out of order rate:            %d\n", rate);
+
+  }
   fprintf(fp, "# Test time:                         %d-%02d-%02d %02d:%02d:%02d\n", tm.tm_year + 1900, tm.tm_mon + 1,
           tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
   fprintf(fp, "###################################################################\n\n");
@@ -383,99 +690,70 @@ int main(int argc, char *argv[]) {
   taos_init();
   TAOS *taos = taos_connect(ip_addr, user, pass, NULL, port);
   if (taos == NULL) {
-    fprintf(stderr, "Failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
-    taos_close(taos);
+    fprintf(stderr, "Failed to connect to TDengine, reason:%s\n", taos_errstr(NULL));
     return 1;
   }
   char command[BUFFER_SIZE] = "\0";
 
   sprintf(command, "drop database %s;", db_name);
-  taos_query(taos, command);
-  sleep(3);
+  TAOS_RES* res = taos_query(taos, command);
+  taos_free_result(res);
 
-  sprintf(command, "create database %s;", db_name);
-  taos_query(taos, command);
+  sprintf(command, "create database %s replica %d;", db_name, replica);
+  res = taos_query(taos, command);
+  taos_free_result(res);
 
-  char cols[512] = "\0";
+  char cols[STRING_LEN] = "\0";
   int colIndex = 0;
+  len = 0;
 
   for (; colIndex < ncols_per_record - 1; colIndex++) {
-    if (strcasecmp(data_type[colIndex % count_data_type], "BINARY") != 0) {
-      sprintf(command, ",f%d %s", colIndex + 1, data_type[colIndex % count_data_type]);
-      strcat(cols, command);
+    if (strcasecmp(data_type[colIndex % count_data_type], "BINARY") != 0 && strcasecmp(data_type[colIndex % count_data_type], "NCHAR") != 0) {
+      len += snprintf(cols + len, STRING_LEN - len, ",f%d %s", colIndex + 1, data_type[colIndex % count_data_type]);
     } else {
-      sprintf(command, ",f%d %s(%d)", colIndex + 1, data_type[colIndex % count_data_type], len_of_binary);
-      strcat(cols, command);
+      len += snprintf(cols + len, STRING_LEN - len, ",f%d %s(%d)", colIndex + 1, data_type[colIndex % count_data_type], len_of_binary);
     }
   }
 
-  if (strcasecmp(data_type[colIndex % count_data_type], "BINARY") != 0) {
-    sprintf(command, ",f%d %s)", colIndex + 1, data_type[colIndex % count_data_type]);
+  if (strcasecmp(data_type[colIndex % count_data_type], "BINARY") != 0 && strcasecmp(data_type[colIndex % count_data_type], "NCHAR") != 0){
+    len += snprintf(cols + len, STRING_LEN - len, ",f%d %s", colIndex + 1, data_type[colIndex % count_data_type]);
   } else {
-    sprintf(command, ",f%d %s(%d))", colIndex + 1, data_type[colIndex % count_data_type], len_of_binary);
+    len += snprintf(cols + len, STRING_LEN - len, ",f%d %s(%d)", colIndex + 1, data_type[colIndex % count_data_type], len_of_binary);
   }
 
-  strcat(cols, command);
-
-  if (!use_metric) {
-    /* Create all the tables; */
-    printf("Creating %d table(s)......\n", ntables);
-    for (int i = 0; i < ntables; i++) {
-      sprintf(command, "create table %s.%s%d (ts timestamp%s;", db_name, tb_prefix, i, cols);
-      queryDB(taos, command);
-    }
-
-    printf("Table(s) created!\n");
-    taos_close(taos);
-
-  } else {
+  if (use_metric) {
     /* Create metric table */
     printf("Creating meters super table...\n");
-    sprintf(command, "create table %s.meters (ts timestamp%s tags (areaid int, loc binary(10))", db_name, cols);
+    snprintf(command, BUFFER_SIZE, "create table if not exists %s.meters (ts timestamp%s) tags (areaid int, loc binary(10))", db_name, cols);
     queryDB(taos, command);
     printf("meters created!\n");
-
-    /* Create all the tables; */
-    printf("Creating %d table(s)......\n", ntables);
-    for (int i = 0; i < ntables; i++) {
-      int j;
-      if (i % 10 == 0) {
-        j = 10;
-      } else {
-        j = i % 10;
-      }
-    if (j % 2 == 0) {
-       sprintf(command, "create table %s.%s%d using %s.meters tags (%d,\"%s\");", db_name, tb_prefix, i, db_name, j,"shanghai");
-      } else {
-       sprintf(command, "create table %s.%s%d using %s.meters tags (%d,\"%s\");", db_name, tb_prefix, i, db_name, j,"beijing");
-      }
-      queryDB(taos, command);
-    }
-
-    printf("Table(s) created!\n");
-    taos_close(taos);
   }
+  taos_close(taos);
+  
   /* Wait for table to create  */
-  sleep(5);
-
+  multiThreadCreateTable(cols, use_metric, threads, ntables, db_name, tb_prefix, ip_addr, port, user, pass);
+  
   /* Insert data */
   double ts = getCurrentTime();
   printf("Inserting data......\n");
-  pthread_t *pids = malloc(nconnections * sizeof(pthread_t));
-  info *infos = malloc(nconnections * sizeof(info));
+  pthread_t *pids = malloc(threads * sizeof(pthread_t));
+  info *infos = malloc(threads * sizeof(info));
 
-  int a = ntables / nconnections;
+  int a = ntables / threads;
   if (a < 1) {
-    nconnections = ntables;
+    threads = ntables;
     a = 1;
   }
-  int b = ntables % nconnections;
+
+  int b = 0;
+  if (threads != 0)
+    b = ntables % threads;
   int last = 0;
-  for (int i = 0; i < nconnections; i++) {
+  for (int i = 0; i < threads; i++) {
     info *t_info = infos + i;
     t_info->threadID = i;
-    strcpy(t_info->db_name, db_name);
-    strcpy(t_info->tb_prefix, tb_prefix);
+    tstrncpy(t_info->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(t_info->tb_prefix, tb_prefix, MAX_TB_NAME_SIZE);
     t_info->datatype = data_type;
     t_info->ncols_per_record = ncols_per_record;
     t_info->nrecords_per_table = nrecords_per_table;
@@ -484,12 +762,14 @@ int main(int argc, char *argv[]) {
     t_info->len_of_binary = len_of_binary;
     t_info->nrecords_per_request = nrecords_per_request;
     t_info->start_table_id = last;
+    t_info->data_of_order = order;
+    t_info->data_of_rate = rate;
     t_info->end_table_id = i < b ? last + a : last + a - 1;
     last = t_info->end_table_id + 1;
 
-    sem_init(&(t_info->mutex_sem), 0, 1);
+    tsem_init(&(t_info->mutex_sem), 0, 1);
     t_info->notFinished = t_info->end_table_id - t_info->start_table_id + 1;
-    sem_init(&(t_info->lock_sem), 0, 0);
+    tsem_init(&(t_info->lock_sem), 0, 0);
 
     if (query_mode == SYNC) {
       pthread_create(pids + i, NULL, syncWrite, t_info);
@@ -497,15 +777,15 @@ int main(int argc, char *argv[]) {
       pthread_create(pids + i, NULL, asyncWrite, t_info);
     }
   }
-  for (int i = 0; i < nconnections; i++) {
+  for (int i = 0; i < threads; i++) {
     pthread_join(pids[i], NULL);
   }
 
   double t = getCurrentTime() - ts;
   if (query_mode == SYNC) {
-    printf("SYNC Insert with %d connections:\n", nconnections);
+    printf("SYNC Insert with %d connections:\n", threads);
   } else {
-    printf("ASYNC Insert with %d connections:\n", nconnections);
+    printf("ASYNC Insert with %d connections:\n", threads);
   }
 
   fprintf(fp, "|%10.d  |  %10.2f    |  %10.2f     |  %10.4f   |\n\n",
@@ -517,17 +797,66 @@ int main(int argc, char *argv[]) {
          t, ntables * nrecords_per_table, nrecords_per_request,
          ntables * nrecords_per_table / t);
 
-  for (int i = 0; i < nconnections; i++) {
+  for (int i = 0; i < threads; i++) {
     info *t_info = infos + i;
     taos_close(t_info->taos);
-    sem_destroy(&(t_info->mutex_sem));
-    sem_destroy(&(t_info->lock_sem));
+    tsem_destroy(&(t_info->mutex_sem));
+    tsem_destroy(&(t_info->lock_sem));
   }
 
   free(pids);
   free(infos);
   fclose(fp);
 
+  if (method_of_delete != 0)
+  {
+    TAOS *dtaos = taos_connect(ip_addr, user, pass, db_name, port);
+    double dts = getCurrentTime();
+    printf("Deleteing %d table(s)......\n", ntables);
+
+    switch (method_of_delete)
+    {
+    case 1:
+      // delete by table
+      /* Create all the tables; */
+      for (int i = 0; i < ntables; i++) {
+        sprintf(command, "drop table %s.%s%d;", db_name, tb_prefix, i);
+        queryDB(dtaos, command);
+      }
+      break;
+    case 2:
+      // delete by stable
+      if (!use_metric) {
+        break;
+      }
+      else
+      {
+        sprintf(command, "drop table %s.meters;", db_name);
+        queryDB(dtaos, command);
+      }
+      break;
+    case 3:
+      // delete by database
+      sprintf(command, "drop database %s;", db_name);
+      queryDB(dtaos, command);
+      break;
+    default:
+      break;
+    }
+
+    printf("Table(s) droped!\n");
+    taos_close(dtaos);
+
+    double dt = getCurrentTime() - dts;
+    printf("Spent %.4f seconds to drop %d tables\n", dt, ntables);
+
+    FILE *fp = fopen(arguments.output_file, "a");
+    fprintf(fp, "Spent %.4f seconds to drop %d tables\n", dt, ntables);
+    fclose(fp);
+
+  }
+  
+
   if (!insert_only) {
     // query data
     pthread_t read_id;
@@ -553,6 +882,193 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 
+#define MAX_SQL_SIZE       65536
+void selectSql(TAOS* taos, char* sqlcmd)
+{    
+  TAOS_RES *pSql = taos_query(taos, sqlcmd);
+  int32_t code = taos_errno(pSql);
+  
+  if (code != 0) {
+    printf("Failed to sqlcmd:%s, reason:%s\n", sqlcmd, taos_errstr(pSql));
+    taos_free_result(pSql);
+    exit(1);
+  }
+  
+  int count = 0;
+  while (taos_fetch_row(pSql) != NULL) {
+    count++;
+  }
+  
+  taos_free_result(pSql);
+  return;
+}
+
+
+/* Function to do regular expression check */
+static int regexMatch(const char *s, const char *reg, int cflags) {
+  regex_t regex;
+  char    msgbuf[100] = {0};
+
+  /* Compile regular expression */
+  if (regcomp(&regex, reg, cflags) != 0) {
+    printf("Fail to compile regex\n");
+    exit(-1);
+  }
+
+  /* Execute regular expression */
+  int reti = regexec(&regex, s, 0, NULL, 0);
+  if (!reti) {
+    regfree(&regex);
+    return 1;
+  } else if (reti == REG_NOMATCH) {
+    regfree(&regex);
+    return 0;
+  } else {
+    regerror(reti, &regex, msgbuf, sizeof(msgbuf));
+    printf("Regex match failed: %s\n", msgbuf);
+    regfree(&regex);
+    exit(-1);
+  }
+
+  return 0;
+}
+
+static int isCommentLine(char *line) {
+  if (line == NULL) return 1;
+
+  return regexMatch(line, "^\\s*#.*", REG_EXTENDED);
+}
+
+void querySqlFile(TAOS* taos, char* sqlFile)
+{
+  FILE *fp = fopen(sqlFile, "r");
+  if (fp == NULL) {
+    printf("failed to open file %s, reason:%s\n", sqlFile, strerror(errno));
+    exit(-1);
+  }
+  
+  int       read_len = 0;
+  char *    cmd = calloc(1, MAX_SQL_SIZE);
+  size_t    cmd_len = 0;
+  char *    line = NULL;
+  size_t    line_len = 0;
+
+  double t = getCurrentTime();
+  
+  while ((read_len = taosGetline(&line, &line_len, fp)) != -1) {
+    if (read_len >= MAX_SQL_SIZE) continue;
+    line[--read_len] = '\0';
+
+    if (read_len == 0 || isCommentLine(line)) {  // line starts with #
+      continue;
+    }
+
+    if (line[read_len - 1] == '\\') {
+      line[read_len - 1] = ' ';
+      memcpy(cmd + cmd_len, line, read_len);
+      cmd_len += read_len;
+      continue;
+    }
+
+    memcpy(cmd + cmd_len, line, read_len);
+    selectSql(taos, cmd);    
+    memset(cmd, 0, MAX_SQL_SIZE);
+    cmd_len = 0;
+  }
+
+  t = getCurrentTime() - t;
+  printf("run %s took %.6f second(s)\n\n", sqlFile, t);
+
+  free(cmd);
+  if (line) free(line);
+  fclose(fp);
+  return;
+}
+
+void * createTable(void *sarg) 
+{
+  char command[BUFFER_SIZE] = "\0";
+  
+  info *winfo = (info *)sarg;  
+
+  if (!winfo->use_metric) {
+    /* Create all the tables; */
+    printf("Creating table from %d to %d\n", winfo->start_table_id, winfo->end_table_id);
+    for (int i = winfo->start_table_id; i <= winfo->end_table_id; i++) {
+      snprintf(command, BUFFER_SIZE, "create table if not exists %s.%s%d (ts timestamp%s;", winfo->db_name, winfo->tb_prefix, i, winfo->cols);
+      queryDB(winfo->taos, command);
+    }
+  } else {
+    /* Create all the tables; */
+    printf("Creating table from %d to %d\n", winfo->start_table_id, winfo->end_table_id);
+    for (int i = winfo->start_table_id; i <= winfo->end_table_id; i++) {
+      int j;
+      if (i % 10 == 0) {
+        j = 10;
+      } else {
+        j = i % 10;
+      }
+    if (j % 2 == 0) {
+      snprintf(command, BUFFER_SIZE, "create table if not exists %s.%s%d using %s.meters tags (%d,\"%s\");", winfo->db_name, winfo->tb_prefix, i, winfo->db_name, j, "shanghai");
+    } else {
+      snprintf(command, BUFFER_SIZE, "create table if not exists %s.%s%d using %s.meters tags (%d,\"%s\");", winfo->db_name, winfo->tb_prefix, i, winfo->db_name, j, "beijing");
+    }
+      queryDB(winfo->taos, command);
+    }
+  }
+
+  return NULL;
+}
+
+void multiThreadCreateTable(char* cols, bool use_metric, int threads, int ntables, char* db_name, char* tb_prefix, char *ip_addr, uint16_t port, char *user, char *pass) {
+  double ts = getCurrentTime();
+  printf("create table......\n");
+  pthread_t *pids = malloc(threads * sizeof(pthread_t));
+  info *infos = malloc(threads * sizeof(info));
+
+  int a = ntables / threads;
+  if (a < 1) {
+    threads = ntables;
+    a = 1;
+  }
+
+  int b = 0;
+  if (threads != 0)
+    b = ntables % threads;
+  int last = 0;
+  for (int i = 0; i < threads; i++) {
+    info *t_info = infos + i;
+    t_info->threadID = i;
+    tstrncpy(t_info->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(t_info->tb_prefix, tb_prefix, MAX_TB_NAME_SIZE);
+    t_info->taos = taos_connect(ip_addr, user, pass, db_name, port);
+    t_info->start_table_id = last;
+    t_info->end_table_id = i < b ? last + a : last + a - 1;
+    last = t_info->end_table_id + 1;
+    t_info->use_metric = use_metric;
+    t_info->cols = cols;
+    pthread_create(pids + i, NULL, createTable, t_info);
+  }
+  
+  for (int i = 0; i < threads; i++) {
+    pthread_join(pids[i], NULL);
+  }
+
+  double t = getCurrentTime() - ts;
+  printf("Spent %.4f seconds to create %d tables with %d connections\n", t, ntables, threads);
+
+  for (int i = 0; i < threads; i++) {
+    info *t_info = infos + i;
+    tsem_destroy(&(t_info->mutex_sem));
+    tsem_destroy(&(t_info->lock_sem));
+  }
+
+  free(pids);
+  free(infos);  
+
+  return ;
+}
+
 void *readTable(void *sarg) {
   info *rinfo = (info *)sarg;
   TAOS *taos = rinfo->taos;
@@ -560,6 +1076,11 @@ void *readTable(void *sarg) {
   int64_t sTime = rinfo->start_time;
   char *tb_prefix = rinfo->tb_prefix;
   FILE *fp = fopen(rinfo->fp, "a");
+  if (NULL == fp) {
+    printf("fopen %s fail, reason:%s.\n", rinfo->fp, strerror(errno));
+    return NULL;
+  }
+  
   int num_of_DPT = rinfo->nrecords_per_table;
   int num_of_tables = rinfo->end_table_id - rinfo->start_table_id + 1;
   int totalData = num_of_DPT * num_of_tables;
@@ -579,27 +1100,24 @@ void *readTable(void *sarg) {
       sprintf(command, "select %s from %s%d where ts>= %" PRId64, aggreFunc[j], tb_prefix, i, sTime);
 
       double t = getCurrentTime();
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
-        taos_close(taos);
-        exit(EXIT_FAILURE);
-      }
+      TAOS_RES *pSql = taos_query(taos, command);
+      int32_t code = taos_errno(pSql);
 
-      TAOS_RES *result = taos_use_result(taos);
-      if (result == NULL) {
-        fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
+      if (code != 0) {
+        fprintf(stderr, "Failed to query:%s\n", taos_errstr(pSql));
+        taos_free_result(pSql);
         taos_close(taos);
-        exit(1);
+        exit(EXIT_FAILURE);
       }
 
-      while (taos_fetch_row(result) != NULL) {
+      while (taos_fetch_row(pSql) != NULL) {
         count++;
       }
 
       t = getCurrentTime() - t;
       totalT += t;
 
-      taos_free_result(result);
+      taos_free_result(pSql);
     }
 
     fprintf(fp, "|%10s  |   %10d   |  %12.2f   |   %10.2f  |\n",
@@ -618,6 +1136,11 @@ void *readMetric(void *sarg) {
   TAOS *taos = rinfo->taos;
   char command[BUFFER_SIZE] = "\0";
   FILE *fp = fopen(rinfo->fp, "a");
+  if (NULL == fp) {
+    printf("fopen %s fail, reason:%s.\n", rinfo->fp, strerror(errno));
+    return NULL;
+  }
+  
   int num_of_DPT = rinfo->nrecords_per_table;
   int num_of_tables = rinfo->end_table_id - rinfo->start_table_id + 1;
   int totalData = num_of_DPT * num_of_tables;
@@ -631,39 +1154,37 @@ void *readMetric(void *sarg) {
   fprintf(fp, "Querying On %d records:\n", totalData);
 
   for (int j = 0; j < n; j++) {
-    char condition[BUFFER_SIZE] = "\0";
-    char tempS[BUFFER_SIZE] = "\0";
+    char condition[BUFFER_SIZE - 30] = "\0";
+    char tempS[64] = "\0";
 
     int m = 10 < num_of_tables ? 10 : num_of_tables;
 
     for (int i = 1; i <= m; i++) {
       if (i == 1) {
-        sprintf(tempS, "index = %d", i);
+        sprintf(tempS, "areaid = %d", i);
       } else {
-        sprintf(tempS, " or index = %d ", i);
+        sprintf(tempS, " or areaid = %d ", i);
       }
       strcat(condition, tempS);
 
-      sprintf(command, "select %s from m1 where %s", aggreFunc[j], condition);
+      sprintf(command, "select %s from meters where %s", aggreFunc[j], condition);
 
       printf("Where condition: %s\n", condition);
       fprintf(fp, "%s\n", command);
 
       double t = getCurrentTime();
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
-        taos_close(taos);
-        exit(EXIT_FAILURE);
-      }
 
-      TAOS_RES *result = taos_use_result(taos);
-      if (result == NULL) {
-        fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
+      TAOS_RES *pSql = taos_query(taos, command);
+      int32_t code = taos_errno(pSql);
+
+      if (code != 0) {
+        fprintf(stderr, "Failed to query:%s\n", taos_errstr(pSql));
+        taos_free_result(pSql);
         taos_close(taos);
         exit(1);
       }
       int count = 0;
-      while (taos_fetch_row(result) != NULL) {
+      while (taos_fetch_row(pSql) != NULL) {
         count++;
       }
       t = getCurrentTime() - t;
@@ -671,7 +1192,7 @@ void *readMetric(void *sarg) {
       fprintf(fp, "| Speed: %12.2f(per s) | Latency: %.4f(ms) |\n", num_of_tables * num_of_DPT / t, t * 1000);
       printf("select %10s took %.6f second(s)\n\n", aggreFunc[j], t);
 
-      taos_free_result(result);
+      taos_free_result(pSql);
     }
     fprintf(fp, "\n");
   }
@@ -681,16 +1202,31 @@ void *readMetric(void *sarg) {
 }
 
 void queryDB(TAOS *taos, char *command) {
-  int i = 5;
-  while (i > 0) {
-    if (taos_query(taos, command) == 0) break;
-    i--; 
+  int i;
+  TAOS_RES *pSql = NULL;
+  int32_t   code = -1;
+
+  for (i = 0; i < 5; i++) {
+    if (NULL != pSql) {
+      taos_free_result(pSql);
+      pSql = NULL;
+    }
+    
+    pSql = taos_query(taos, command);
+    code = taos_errno(pSql);
+    if (0 == code) {
+      break;
+    }    
   }
-  if (i == 0) {
-    fprintf(stderr, "Failed to run %s, reason: %s\n", command, taos_errstr(taos));
+
+  if (code != 0) {
+    fprintf(stderr, "Failed to run %s, reason: %s\n", command, taos_errstr(pSql));
+    taos_free_result(pSql);
     taos_close(taos);
     exit(EXIT_FAILURE);
   }
+
+  taos_free_result(pSql);
 }
 
 // sync insertion
@@ -701,7 +1237,7 @@ void *syncWrite(void *sarg) {
   char **data_type = winfo->datatype;
   int len_of_binary = winfo->len_of_binary;
   int ncols_per_record = winfo->ncols_per_record;
-  srand(time(NULL));
+  srand((uint32_t)time(NULL));
   int64_t time_counter = winfo->start_time;
   for (int i = 0; i < winfo->nrecords_per_table;) {
     for (int tID = winfo->start_table_id; tID <= winfo->end_table_id; tID++) {
@@ -712,7 +1248,20 @@ void *syncWrite(void *sarg) {
       pstr += sprintf(pstr, "insert into %s.%s%d values", winfo->db_name, winfo->tb_prefix, tID);
       int k;
       for (k = 0; k < winfo->nrecords_per_request;) {
-        generateData(data, data_type, ncols_per_record, tmp_time++, len_of_binary);
+        int rand_num = rand() % 100;
+        int len = -1;
+        if (winfo->data_of_order ==1 && rand_num < winfo->data_of_rate) {
+          int64_t d = tmp_time - rand() % 1000000 + rand_num;
+          len = generateData(data, data_type, ncols_per_record, d, len_of_binary);
+        } else {
+          len = generateData(data, data_type, ncols_per_record, tmp_time += 1000, len_of_binary);
+        }
+
+        //assert(len + pstr - buffer < BUFFER_SIZE);
+        if (len + pstr - buffer >= BUFFER_SIZE) { // too long
+          break;
+        }
+
         pstr += sprintf(pstr, " %s", data);
         inserted++;
         k++;
@@ -751,6 +1300,8 @@ void *asyncWrite(void *sarg) {
     tb_info->mutex_sem = &(winfo->mutex_sem);
     tb_info->notFinished = &(winfo->notFinished);
     tb_info->lock_sem = &(winfo->lock_sem);
+    tb_info->data_of_order = winfo->data_of_order;
+    tb_info->data_of_rate = winfo->data_of_rate;
 
     /* char buff[BUFFER_SIZE] = "\0"; */
     /* sprintf(buff, "insert into %s values (0, 0)", tb_info->tb_name); */
@@ -759,7 +1310,7 @@ void *asyncWrite(void *sarg) {
     taos_query_a(winfo->taos, "show databases", callBack, tb_info);
   }
 
-  sem_wait(&(winfo->lock_sem));
+  tsem_wait(&(winfo->lock_sem));
   free(tb_infos);
 
   return NULL;
@@ -773,16 +1324,16 @@ void callBack(void *param, TAOS_RES *res, int code) {
   int64_t tmp_time = tb_info->timestamp;
 
   if (code < 0) {
-    fprintf(stderr, "failed to insert data %d:reason; %s\n", code, taos_errstr(tb_info->taos));
+    fprintf(stderr, "failed to insert data %d:reason; %s\n", code, taos_errstr(res));
     exit(EXIT_FAILURE);
   }
 
   // If finished;
   if (tb_info->counter >= tb_info->target) {
-    sem_wait(tb_info->mutex_sem);
+    tsem_wait(tb_info->mutex_sem);
     (*(tb_info->notFinished))--;
-    if (*(tb_info->notFinished) == 0) sem_post(tb_info->lock_sem);
-    sem_post(tb_info->mutex_sem);
+    if (*(tb_info->notFinished) == 0) tsem_post(tb_info->lock_sem);
+    tsem_post(tb_info->mutex_sem);
     return;
   }
 
@@ -792,7 +1343,15 @@ void callBack(void *param, TAOS_RES *res, int code) {
   pstr += sprintf(pstr, "insert into %s values", tb_info->tb_name);
 
   for (int i = 0; i < tb_info->nrecords_per_request; i++) {
-    generateData(data, datatype, ncols_per_record, tmp_time++, len_of_binary);
+    int rand_num = rand() % 100;
+    if (tb_info->data_of_order ==1 && rand_num < tb_info->data_of_rate)
+    {
+      int64_t d = tmp_time - rand() % 1000000 + rand_num;
+      generateData(data, datatype, ncols_per_record, d, len_of_binary);
+    } else 
+    {
+      generateData(data, datatype, ncols_per_record, tmp_time += 1000, len_of_binary);
+    }
     pstr += sprintf(pstr, "%s", data);
     tb_info->counter++;
 
@@ -800,6 +1359,7 @@ void callBack(void *param, TAOS_RES *res, int code) {
       break;
     }
   }
+   tb_info->timestamp = tmp_time;
 
   taos_query_a(tb_info->taos, buffer, callBack, tb_info);
 
@@ -816,54 +1376,133 @@ double getCurrentTime() {
   return tv.tv_sec + tv.tv_usec / 1E6;
 }
 
-void generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary) {
+int32_t  randint[MAX_PREPARED_RAND];
+int64_t  randbigint[MAX_PREPARED_RAND];
+float  randfloat[MAX_PREPARED_RAND];
+double  randdouble[MAX_PREPARED_RAND];
+
+int32_t rand_tinyint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor] % 128;
+
+}
+
+int32_t rand_smallint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor] % 32767;
+}
+
+int32_t rand_int(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randint[cursor];
+}
+
+int64_t rand_bigint(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randbigint[cursor];
+  
+}
+
+float rand_float(){
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randfloat[cursor];  
+  
+}
+
+double rand_double() {
+  static int cursor;
+  cursor++;
+  cursor = cursor % MAX_PREPARED_RAND;
+  return randdouble[cursor];
+
+}
+
+void init_rand_data(){
+  for (int i = 0; i < MAX_PREPARED_RAND; i++){
+    randint[i] = (int)(rand() % 10);
+    randbigint[i] = (int64_t)(rand() % 2147483648);
+    randfloat[i] = (float)(rand() / 1000.0);
+    randdouble[i] = (double)(rand() / 1000000.0);
+  }
+}
+
+int32_t generateData(char *res, char **data_type, int num_of_cols, int64_t timestamp, int len_of_binary) {
   memset(res, 0, MAX_DATA_SIZE);
   char *pstr = res;
   pstr += sprintf(pstr, "(%" PRId64, timestamp);
   int c = 0;
 
   for (; c < MAX_NUM_DATATYPE; c++) {
-    if (strcasecmp(data_type[c], "") == 0) {
+    if (data_type[c] == NULL) {
       break;
     }
   }
 
+  if (0 == c) {
+    perror("data type error!");
+    exit(-1);
+  }
+
   for (int i = 0; i < num_of_cols; i++) {
     if (strcasecmp(data_type[i % c], "tinyint") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 128));
+      pstr += sprintf(pstr, ", %d", rand_tinyint() );
     } else if (strcasecmp(data_type[i % c], "smallint") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 32767));
+      pstr += sprintf(pstr, ", %d", rand_smallint());
     } else if (strcasecmp(data_type[i % c], "int") == 0) {
-      pstr += sprintf(pstr, ", %d", (int)(rand() % 10)); 
+      pstr += sprintf(pstr, ", %d", rand_int()); 
     } else if (strcasecmp(data_type[i % c], "bigint") == 0) {
-      pstr += sprintf(pstr, ", %" PRId64, rand() % 2147483648);
+      pstr += sprintf(pstr, ", %" PRId64, rand_bigint());
     } else if (strcasecmp(data_type[i % c], "float") == 0) {
-      pstr += sprintf(pstr, ", %10.4f", (float)(rand() / 1000));
+      pstr += sprintf(pstr, ", %10.4f", rand_float());
     } else if (strcasecmp(data_type[i % c], "double") == 0) {
-      double t = (double)(rand() / 1000000);
+      double t = rand_double();
       pstr += sprintf(pstr, ", %20.8f", t);
     } else if (strcasecmp(data_type[i % c], "bool") == 0) {
       bool b = rand() & 1;
       pstr += sprintf(pstr, ", %s", b ? "true" : "false");
     } else if (strcasecmp(data_type[i % c], "binary") == 0) {
-      char s[len_of_binary];
+      char *s = malloc(len_of_binary);
+      rand_string(s, len_of_binary);
+      pstr += sprintf(pstr, ", \"%s\"", s);
+      free(s);
+    }else if (strcasecmp(data_type[i % c], "nchar") == 0) {
+      char *s = malloc(len_of_binary);
       rand_string(s, len_of_binary);
       pstr += sprintf(pstr, ", \"%s\"", s);
+      free(s);
+    }
+
+    if (pstr - res > MAX_DATA_SIZE) {
+      perror("column length too long, abort");
+      exit(-1);
     }
   }
 
   pstr += sprintf(pstr, ")");
+
+  return (int32_t)(pstr - res);
 }
 
+static const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJK1234567890";
 void rand_string(char *str, int size) {
-  memset(str, 0, size);
-  const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJK1234567890";
-  char *sptr = str;
-  if (size) {
+  str[0] = 0;
+  if (size > 0) {
     --size;
-    for (size_t n = 0; n < size; n++) {
+    int n;
+    for (n = 0; n < size; n++) {
       int key = rand() % (int)(sizeof charset - 1);
-      sptr += sprintf(sptr, "%c", charset[key]);
+      str[n] = charset[key];
     }
+    str[n] = 0;
   }
 }
diff --git a/src/kit/taosdump/CMakeLists.txt b/src/kit/taosdump/CMakeLists.txt
deleted file mode 100644
index 76b40d1c2d278bd8f13829a719e23c67402bec2e..0000000000000000000000000000000000000000
--- a/src/kit/taosdump/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-INCLUDE_DIRECTORIES(inc)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  AUX_SOURCE_DIRECTORY(. SRC)
-  ADD_EXECUTABLE(taosdump ${SRC})
-  TARGET_LINK_LIBRARIES(taosdump taos_static)
-ENDIF ()
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
deleted file mode 100644
index 8cf015b342649ff4e099a51a2c4b7fe841da3db3..0000000000000000000000000000000000000000
--- a/src/kit/taosdump/taosdump.c
+++ /dev/null
@@ -1,1333 +0,0 @@
-/*
- * 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 <argp.h>
-#include <assert.h>
-#ifndef _ALPINE
-  #include <error.h>
-#endif
-#include <fcntl.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <wordexp.h>
-#include <iconv.h>
-
-#include "taos.h"
-#include "taosmsg.h"
-#include "tglobalcfg.h"
-#include "tsclient.h"
-#include "tsdb.h"
-#include "tutil.h"
-
-#define COMMAND_SIZE 65536
-#define DEFAULT_DUMP_FILE "taosdump.sql"
-
-int  converStringToReadable(char *str, int size, char *buf, int bufsize);
-int  convertNCharToReadable(char *str, int size, char *buf, int bufsize);
-void taosDumpCharset(FILE *fp);
-void taosLoadFileCharset(FILE *fp, char *fcharset);
-
-typedef struct {
-  short bytes;
-  int8_t type;
-} SOColInfo;
-
-// -------------------------- SHOW DATABASE INTERFACE-----------------------
-enum _show_db_index {
-  TSDB_SHOW_DB_NAME_INDEX,
-  TSDB_SHOW_DB_CREATED_TIME_INDEX,
-  TSDB_SHOW_DB_VGROUPS_INDEX,
-  TSDB_SHOW_DB_NTABLES_INDEX,
-  TSDB_SHOW_DB_REPLICA_INDEX,
-  TSDB_SHOW_DB_DAYS_INDEX,
-  TSDB_SHOW_DB_KEEP_INDEX,
-  TSDB_SHOW_DB_TABLES_INDEX,
-  TSDB_SHOW_DB_ROWS_INDEX,
-  TSDB_SHOW_DB_CACHE_INDEX,
-  TSDB_SHOW_DB_ABLOCKS_INDEX,
-  TSDB_SHOW_DB_TBLOCKS_INDEX,
-  TSDB_SHOW_DB_CTIME_INDEX,
-  TSDB_SHOW_DB_CLOG_INDEX,
-  TSDB_SHOW_DB_COMP_INDEX,
-  TSDB_MAX_SHOW_DB
-};
-
-// -----------------------------------------SHOW TABLES CONFIGURE -------------------------------------
-enum _show_tables_index {
-  TSDB_SHOW_TABLES_NAME_INDEX,
-  TSDB_SHOW_TABLES_CREATED_TIME_INDEX,
-  TSDB_SHOW_TABLES_COLUMNS_INDEX,
-  TSDB_SHOW_TABLES_METRIC_INDEX,
-  TSDB_MAX_SHOW_TABLES
-};
-
-// ---------------------------------- DESCRIBE METRIC CONFIGURE ------------------------------
-enum _describe_table_index {
-  TSDB_DESCRIBE_METRIC_FIELD_INDEX,
-  TSDB_DESCRIBE_METRIC_TYPE_INDEX,
-  TSDB_DESCRIBE_METRIC_LENGTH_INDEX,
-  TSDB_DESCRIBE_METRIC_NOTE_INDEX,
-  TSDB_MAX_DESCRIBE_METRIC
-};
-
-typedef struct {
-  char field[TSDB_COL_NAME_LEN + 1];
-  char type[16];
-  int length;
-  char note[128];
-} SColDes;
-
-typedef struct {
-  char name[TSDB_COL_NAME_LEN + 1];
-  SColDes cols[];
-} STableDef;
-
-extern char version[];
-
-typedef struct {
-  char name[TSDB_DB_NAME_LEN + 1];
-  int32_t replica;
-  int32_t days;
-  int32_t keep;
-  int32_t tables;
-  int32_t rows;
-  int32_t cache;
-  int32_t ablocks;
-  int32_t tblocks;
-  int32_t ctime;
-  int32_t clog;
-  int32_t comp;
-} SDbInfo;
-
-typedef struct {
-  char name[TSDB_METER_NAME_LEN + 1];
-  char metric[TSDB_METER_NAME_LEN + 1];
-} STableRecord;
-
-typedef struct {
-  bool isMetric;
-  STableRecord tableRecord;
-} STableRecordInfo;
-
-SDbInfo **dbInfos = NULL;
-
-const char *argp_program_version = version;
-const char *argp_program_bug_address = "<support@taosdata.com>";
-
-/* Program documentation. */
-static char doc[] = "";
-/* "Argp example #4 -- a program with somewhat more complicated\ */
-/*         options\ */
-/*         \vThis part of the documentation comes *after* the options;\ */
-/*         note that the text is automatically filled, but it's possible\ */
-/*         to force a line-break, e.g.\n<-- here."; */
-
-/* A description of the arguments we accept. */
-static char args_doc[] = "dbname [tbname ...]\n--databases dbname ...\n--all-databases\n-i input_file";
-
-/* Keys for options without short-options. */
-#define OPT_ABORT 1 /* –abort */
-
-/* The options we understand. */
-static struct argp_option options[] = {
-  // connection option
-  {"host",          'h', "HOST",       0, "Server host dumping data from. Default is localhost.",     0},
-  {"user",          'u', "USER",       0, "User name used to connect to server. Default is root.",    0},
-  {"password",      'p', "PASSWORD",   0, "User password to connect to server. Default is taosdata.", 0},
-  {"port",          'P', "PORT",       0, "Port to connect",                                          0},
-  // input/output file
-  {"output",        'o', "OUTPUT",     0, "Output file name.",                                        1},
-  {"input",         'i', "INPUT",      0, "Input file name.",                                         1},
-  {"config",        'c', "CONFIG_DIR", 0, "Configure directory. Default is /etc/taos/taos.cfg.",      1},
-  {"encode", 'e', "ENCODE", 0, "Input file encoding.", 1},
-  // dump unit options
-  {"all-databases", 'A', 0,            0, "Dump all databases.",                                      2},
-  {"databases",     'B', 0,            0, "Dump assigned databases",                                  2},
-  // dump format options
-  {"schemaonly",    's', 0,            0, "Only dump schema.",                                        3},
-  {"with-property", 'M', 0,            0, "Dump schema with properties.",                             3},
-  {"start-time",    'S', "START_TIME", 0, "Start time to dump.",                                      3},
-  {"end-time",      'E', "END_TIME",   0, "End time to dump.",                                        3},
-  {"data-batch",    'N', "DATA_BATCH", 0, "Number of data point per insert statement. Default is 1.", 3},
-  {"allow-sys",     'a', 0,            0, "Allow to dump sys database",                               3},
-  {0}};
-
-/* Used by main to communicate with parse_opt. */
-struct arguments {
-  // connection option
-  char *host;
-  char *user;
-  char *password;
-  uint16_t port;
-  // output file
-  char output[TSDB_FILENAME_LEN + 1];
-  char input[TSDB_FILENAME_LEN + 1];
-  char *encode;
-  // dump unit option
-  bool all_databases;
-  bool databases;
-  // dump format option
-  bool schemaonly;
-  bool with_property;
-  int64_t start_time;
-  int64_t end_time;
-  int data_batch;
-  bool allow_sys;
-  // other options
-  int abort;
-  char **arg_list;
-  int arg_list_len;
-  bool isDumpIn;
-};
-
-/* Parse a single option. */
-static error_t parse_opt(int key, char *arg, struct argp_state *state) {
-  /* Get the input argument from argp_parse, which we
-     know is a pointer to our arguments structure. */
-  struct arguments *arguments = state->input;
-  wordexp_t full_path;
-
-  switch (key) {
-    // connection option
-    case 'a':
-      arguments->allow_sys = true;
-      break;
-    case 'h':
-      arguments->host = arg;
-      break;
-    case 'u':
-      arguments->user = arg;
-      break;
-    case 'p':
-      arguments->password = arg;
-      break;
-    case 'P':
-      arguments->port = atoi(arg);
-      break;
-    // output file
-    case 'o':
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      strcpy(arguments->output, full_path.we_wordv[0]);
-      wordfree(&full_path);
-      break;
-    case 'i':
-      arguments->isDumpIn = true;
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      strcpy(arguments->input, full_path.we_wordv[0]);
-      wordfree(&full_path);
-      break;
-    case 'c':
-      if (wordexp(arg, &full_path, 0) != 0) {
-        fprintf(stderr, "Invalid path %s\n", arg);
-        return -1;
-      }
-      strcpy(configDir, full_path.we_wordv[0]);
-      wordfree(&full_path);
-      break;
-    case 'e':
-      arguments->encode = arg;
-      break;
-    // dump unit option
-    case 'A':
-      arguments->all_databases = true;
-      break;
-    case 'B':
-      arguments->databases = true;
-      break;
-    // dump format option
-    case 's':
-      arguments->schemaonly = true;
-      break;
-    case 'M':
-      arguments->with_property = true;
-      break;
-    case 'S':
-      // parse time here.
-      arguments->start_time = atol(arg);
-      break;
-    case 'E':
-      arguments->end_time = atol(arg);
-      break;
-    case 'N':
-      arguments->data_batch = atoi(arg);
-      break;
-    case OPT_ABORT:
-      arguments->abort = 1;
-      break;
-    case ARGP_KEY_ARG:
-      arguments->arg_list = &state->argv[state->next - 1];
-      arguments->arg_list_len = state->argc - state->next + 1;
-      state->next = state->argc;
-      break;
-
-    default:
-      return ARGP_ERR_UNKNOWN;
-  }
-  return 0;
-}
-
-/* Our argp parser. */
-static struct argp argp = {options, parse_opt, args_doc, doc};
-
-TAOS *taos = NULL;
-TAOS_RES *result = NULL;
-char *command = NULL;
-char *lcommand = NULL;
-char *buffer = NULL;
-
-int taosDumpOut(struct arguments *arguments);
-
-int taosDumpIn(struct arguments *arguments);
-
-void taosDumpCreateDbClause(SDbInfo *dbInfo, bool isDumpProperty, FILE *fp);
-
-int taosDumpDb(SDbInfo *dbInfo, struct arguments *arguments, FILE *fp);
-
-void taosDumpCreateTableClause(STableDef *tableDes, int numOfCols, struct arguments *arguments, FILE *fp);
-
-void taosDumpCreateMTableClause(STableDef *tableDes, char *metric, int numOfCols, struct arguments *arguments,
-                                   FILE *fp);
-
-int32_t taosDumpTable(char *table, char *metric, struct arguments *arguments, FILE *fp);
-
-int32_t taosDumpMetric(char *metric, struct arguments *arguments, FILE *fp);
-
-int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments);
-
-int taosCheckParam(struct arguments *arguments);
-
-void taosFreeDbInfos();
-
-int main(int argc, char *argv[]) {
-  struct arguments arguments = {
-    // connection option
-    NULL, "root", "taosdata", 0,
-    // output file
-    DEFAULT_DUMP_FILE, DEFAULT_DUMP_FILE, NULL,
-    // dump unit option
-    false, false,
-    // dump format option
-    false, false, 0, INT64_MAX, 1, false,
-    // other options
-    0, NULL, 0, false};
-
-  /* Parse our arguments; every option seen by parse_opt will be
-     reflected in arguments. */
-  argp_parse(&argp, argc, argv, 0, 0, &arguments);
-
-  if (arguments.abort) {
-    #ifndef _ALPINE
-      error(10, 0, "ABORTED");
-    #else
-      abort();
-    #endif
-  }
-
-  if (taosCheckParam(&arguments) < 0) {
-    exit(EXIT_FAILURE);
-  }
-
-  if (arguments.isDumpIn) {
-    if (taosDumpIn(&arguments) < 0) return -1;
-  } else {
-    if (taosDumpOut(&arguments) < 0) return -1;
-  }
-
-  return 0;
-}
-
-void taosFreeDbInfos() {
-  if (dbInfos == NULL) return;
-  for (int i = 0; i < tsMaxDbs; i++) tfree(dbInfos[i]);
-  tfree(dbInfos);
-}
-
-int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo) {
-  TAOS_ROW row = NULL;
-  bool isSet = false;
-
-  memset(pTableRecordInfo, 0, sizeof(STableRecordInfo));
-
-  sprintf(command, "show tables like %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    isSet = true;
-    pTableRecordInfo->isMetric = false;
-    strncpy(pTableRecordInfo->tableRecord.name, (char *)row[TSDB_SHOW_TABLES_NAME_INDEX],
-            fields[TSDB_SHOW_TABLES_NAME_INDEX].bytes);
-    strncpy(pTableRecordInfo->tableRecord.metric, (char *)row[TSDB_SHOW_TABLES_METRIC_INDEX],
-            fields[TSDB_SHOW_TABLES_METRIC_INDEX].bytes);
-    break;
-  }
-
-  taos_free_result(result);
-  result = NULL;
-
-  if (isSet) return 0;
-
-  sprintf(command, "show stables like %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    isSet = true;
-    pTableRecordInfo->isMetric = true;
-    strcpy(pTableRecordInfo->tableRecord.metric, table);
-    break;
-  }
-
-  taos_free_result(result);
-  result = NULL;
-
-  if (isSet) return 0;
-
-  fprintf(stderr, "invalid table/metric %s\n", table);
-  return -1;
-}
-
-int taosDumpOut(struct arguments *arguments) {
-  TAOS_ROW row;
-  char *temp = NULL;
-  FILE *fp = NULL;
-  int count = 0;
-  STableRecordInfo tableRecordInfo;
-
-  fp = fopen(arguments->output, "w");
-  if (fp == NULL) {
-    fprintf(stderr, "failed to open file %s\n", arguments->output);
-    return -1;
-  }
-
-  dbInfos = (SDbInfo **)calloc(tsMaxDbs, sizeof(SDbInfo *));
-  if (dbInfos == NULL) {
-    fprintf(stderr, "failed to allocate memory\n");
-    goto _exit_failure;
-  }
-
-  temp = (char *)malloc(2 * COMMAND_SIZE);
-  if (temp == NULL) {
-    fprintf(stderr, "failed to allocate memory\n");
-    goto _exit_failure;
-  }
-
-  command = temp;
-  buffer = command + COMMAND_SIZE;
-
-  /* Connect to server */
-  taos = taos_connect(arguments->host, arguments->user, arguments->password, NULL, arguments->port);
-  if (taos == NULL) {
-    fprintf(stderr, "failed to connect to TDengine server\n");
-    goto _exit_failure;
-  }
-
-  /* --------------------------------- Main Code -------------------------------- */
-  /* if (arguments->databases || arguments->all_databases) { // dump part of databases or all databases */
-  /*  */
-  taosDumpCharset(fp);
-
-  sprintf(command, "show databases");
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command: %s, reason: %s\n", command, taos_errstr(taos));
-    goto _exit_failure;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    goto _exit_failure;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    if (strncasecmp(row[TSDB_SHOW_DB_NAME_INDEX], "monitor", fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0 &&
-        (!arguments->allow_sys))
-      continue;
-
-    if (arguments->databases) {
-      for (int i = 0; arguments->arg_list[i]; i++) {
-        if (strncasecmp(arguments->arg_list[i], (char *)row[TSDB_SHOW_DB_NAME_INDEX],
-                        fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0)
-          goto _dump_db_point;
-      }
-      continue;
-    } else if (!arguments->all_databases) {
-      if (strncasecmp(arguments->arg_list[0], (char *)row[TSDB_SHOW_DB_NAME_INDEX],
-                      fields[TSDB_SHOW_DB_NAME_INDEX].bytes) == 0)
-        goto _dump_db_point;
-      else
-        continue;
-    }
-
-  _dump_db_point:
-
-    dbInfos[count] = (SDbInfo *)calloc(1, sizeof(SDbInfo));
-    if (dbInfos[count] == NULL) {
-      fprintf(stderr, "failed to allocate memory\n");
-      goto _exit_failure;
-    }
-
-    strncpy(dbInfos[count]->name, (char *)row[TSDB_SHOW_DB_NAME_INDEX], fields[TSDB_SHOW_DB_NAME_INDEX].bytes);
-    if (strcmp(arguments->user, "root") == 0) {
-      dbInfos[count]->replica = (int)(*((int16_t *)row[TSDB_SHOW_DB_REPLICA_INDEX]));
-      dbInfos[count]->days = (int)(*((int16_t *)row[TSDB_SHOW_DB_DAYS_INDEX]));
-      dbInfos[count]->keep = *((int *)row[TSDB_SHOW_DB_KEEP_INDEX]);
-      dbInfos[count]->tables = *((int *)row[TSDB_SHOW_DB_TABLES_INDEX]);
-      dbInfos[count]->rows = *((int *)row[TSDB_SHOW_DB_ROWS_INDEX]);
-      dbInfos[count]->cache = *((int *)row[TSDB_SHOW_DB_CACHE_INDEX]);
-      dbInfos[count]->ablocks = *((int *)row[TSDB_SHOW_DB_ABLOCKS_INDEX]);
-      dbInfos[count]->tblocks = (int)(*((int16_t *)row[TSDB_SHOW_DB_TBLOCKS_INDEX]));
-      dbInfos[count]->ctime = *((int *)row[TSDB_SHOW_DB_CTIME_INDEX]);
-      dbInfos[count]->clog = (int)(*((int8_t *)row[TSDB_SHOW_DB_CLOG_INDEX]));
-      dbInfos[count]->comp = (int)(*((int8_t *)row[TSDB_SHOW_DB_COMP_INDEX]));
-    }
-
-    count++;
-
-    if (arguments->databases) {
-      if (count > arguments->arg_list_len) break;
-
-    } else if (!arguments->all_databases) {
-      if (count >= 1) break;
-    }
-  }
-
-  taos_free_result(result);
-
-  if (count == 0) {
-    fprintf(stderr, "No databases valid to dump\n");
-    goto _exit_failure;
-  }
-
-  if (arguments->databases || arguments->all_databases) {
-    for (int i = 0; i < count; i++) {
-      taosDumpDb(dbInfos[i], arguments, fp);
-    }
-  } else {
-    if (arguments->arg_list_len == 1) {
-      taosDumpDb(dbInfos[0], arguments, fp);
-    } else {
-      taosDumpCreateDbClause(dbInfos[0], arguments->with_property, fp);
-
-      sprintf(command, "use %s", dbInfos[0]->name);
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "invalid database %s\n", dbInfos[0]->name);
-        goto _exit_failure;
-      }
-
-      fprintf(fp, "USE %s;\n\n", dbInfos[0]->name);
-
-      for (int i = 1; arguments->arg_list[i]; i++) {
-        if (taosGetTableRecordInfo(arguments->arg_list[i], &tableRecordInfo) < 0) {
-          fprintf(stderr, "invalide table %s\n", arguments->arg_list[i]);
-          continue;
-        }
-
-        if (tableRecordInfo.isMetric) {  // dump whole metric
-          taosDumpMetric(tableRecordInfo.tableRecord.metric, arguments, fp);
-        } else {  // dump MTable and NTable
-          taosDumpTable(tableRecordInfo.tableRecord.name, tableRecordInfo.tableRecord.metric, arguments, fp);
-        }
-      }
-    }
-  }
-
-  /* Close the handle and return */
-  fclose(fp);
-  taos_close(taos);
-  taos_free_result(result);
-  free(temp);
-  taosFreeDbInfos();
-  return 0;
-
-_exit_failure:
-  fclose(fp);
-  taos_close(taos);
-  taos_free_result(result);
-  free(temp);
-  taosFreeDbInfos();
-  return -1;
-}
-
-void taosDumpCreateDbClause(SDbInfo *dbInfo, bool isDumpProperty, FILE *fp) {
-  char *pstr = buffer;
-
-  pstr += sprintf(pstr, "CREATE DATABASE IF NOT EXISTS %s", dbInfo->name);
-  if (isDumpProperty) {
-    pstr += sprintf(pstr,
-        " REPLICA %d DAYS %d KEEP %d TABLES %d ROWS %d CACHE %d ABLOCKS %d TBLOCKS %d CTIME %d CLOG %d COMP %d",
-        dbInfo->replica, dbInfo->days, dbInfo->keep, dbInfo->tables, dbInfo->rows, dbInfo->cache,
-        dbInfo->ablocks, dbInfo->tblocks, dbInfo->ctime, dbInfo->clog, dbInfo->comp);
-  }
-
-  fprintf(fp, "%s\n\n", buffer);
-}
-
-int taosDumpDb(SDbInfo *dbInfo, struct arguments *arguments, FILE *fp) {
-  TAOS_ROW row;
-  int fd = -1;
-  STableRecord tableRecord;
-
-  taosDumpCreateDbClause(dbInfo, arguments->with_property, fp);
-
-  sprintf(command, "use %s", dbInfo->name);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "invalid database %s\n", dbInfo->name);
-    return -1;
-  }
-
-  fprintf(fp, "USE %s\n\n", dbInfo->name);
-
-  sprintf(command, "show tables");
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  fd = open(".table.tmp", O_RDWR | O_CREAT, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH);
-  if (fd == -1) {
-    fprintf(stderr, "failed to open temp file\n");
-    taos_free_result(result);
-    return -1;
-  }
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    memset(&tableRecord, 0, sizeof(STableRecord));
-    strncpy(tableRecord.name, (char *)row[TSDB_SHOW_TABLES_NAME_INDEX], fields[TSDB_SHOW_TABLES_NAME_INDEX].bytes);
-    strncpy(tableRecord.metric, (char *)row[TSDB_SHOW_TABLES_METRIC_INDEX], fields[TSDB_SHOW_TABLES_METRIC_INDEX].bytes);
-
-    twrite(fd, &tableRecord, sizeof(STableRecord));
-  }
-
-  taos_free_result(result);
-
-  lseek(fd, 0, SEEK_SET);
-
-  while (read(fd, &tableRecord, sizeof(STableRecord)) > 0) {
-    taosDumpTable(tableRecord.name, tableRecord.metric, arguments, fp);
-  }
-
-  tclose(fd);
-  remove(".table.tmp");
-
-  return 0;
-}
-
-void taosDumpCreateTableClause(STableDef *tableDes, int numOfCols, struct arguments *arguments, FILE *fp) {
-  char *pstr = NULL;
-  pstr = buffer;
-  int counter = 0;
-  int count_temp = 0;
-
-  pstr += sprintf(buffer, "CREATE TABLE IF NOT EXISTS %s", tableDes->name);
-
-  for (; counter < numOfCols; counter++) {
-    if (tableDes->cols[counter].note[0] != '\0') break;
-
-    if (counter == 0) {
-      pstr += sprintf(pstr, " (%s %s", tableDes->cols[counter].field, tableDes->cols[counter].type);
-    } else {
-      pstr += sprintf(pstr, ", %s %s", tableDes->cols[counter].field, tableDes->cols[counter].type);
-    }
-
-    if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 ||
-        strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
-      pstr += sprintf(pstr, "(%d)", tableDes->cols[counter].length);
-    }
-  }
-
-  count_temp = counter;
-
-  for (; counter < numOfCols; counter++) {
-    if (counter == count_temp) {
-      pstr += sprintf(pstr, ") TAGS (%s %s", tableDes->cols[counter].field, tableDes->cols[counter].type);
-    } else {
-      pstr += sprintf(pstr, ", %s %s", tableDes->cols[counter].field, tableDes->cols[counter].type);
-    }
-
-    if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 ||
-        strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
-      pstr += sprintf(pstr, "(%d)", tableDes->cols[counter].length);
-    }
-  }
-
-  pstr += sprintf(pstr, ")");
-
-  fprintf(fp, "%s\n\n", buffer);
-}
-
-void taosDumpCreateMTableClause(STableDef *tableDes, char *metric, int numOfCols, struct arguments *arguments,
-                                FILE *fp) {
-  char *pstr = NULL;
-  pstr = buffer;
-  int counter = 0;
-  int count_temp = 0;
-
-  pstr += sprintf(buffer, "CREATE TABLE IF NOT EXISTS %s USING %s TAGS (", tableDes->name, metric);
-
-  for (; counter < numOfCols; counter++) {
-    if (tableDes->cols[counter].note[0] != '\0') break;
-  }
-
-  assert(counter < numOfCols);
-  count_temp = counter;
-
-  for (; counter < numOfCols; counter++) {
-    if (counter != count_temp) {
-      if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 ||
-          strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
-        pstr += sprintf(pstr, ", \'%s\'", tableDes->cols[counter].note);
-      } else {
-        pstr += sprintf(pstr, ", %s", tableDes->cols[counter].note);
-      }
-    } else {
-      if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 ||
-          strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
-        pstr += sprintf(pstr, "\'%s\'", tableDes->cols[counter].note);
-      } else {
-        pstr += sprintf(pstr, "%s", tableDes->cols[counter].note);
-      }
-      /* pstr += sprintf(pstr, "%s", tableDes->cols[counter].note); */
-    }
-
-    /* if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 || strcasecmp(tableDes->cols[counter].type, "nchar")
-     * == 0) { */
-    /*     pstr += sprintf(pstr, "(%d)", tableDes->cols[counter].length); */
-    /* } */
-  }
-
-  pstr += sprintf(pstr, ")");
-
-  fprintf(fp, "%s\n\n", buffer);
-}
-
-int taosGetTableDes(char *table, STableDef *tableDes) {
-  TAOS_ROW row = NULL;
-  int count = 0;
-
-  sprintf(command, "describe %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  strcpy(tableDes->name, table);
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    strncpy(tableDes->cols[count].field, (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
-            fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
-    strncpy(tableDes->cols[count].type, (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
-            fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
-    tableDes->cols[count].length = *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
-    strncpy(tableDes->cols[count].note, (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
-            fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);
-
-    count++;
-  }
-
-  taos_free_result(result);
-  result = NULL;
-
-  return count;
-}
-
-int32_t taosDumpTable(char *table, char *metric, struct arguments *arguments, FILE *fp) {
-  int count = 0;
-
-  STableDef *tableDes = (STableDef *)calloc(1, sizeof(STableDef) + sizeof(SColDes) * TSDB_MAX_COLUMNS);
-
-  if (metric != NULL && metric[0] != '\0') {  // dump metric definition
-    count = taosGetTableDes(metric, tableDes);
-
-    if (count < 0) {
-      free(tableDes);
-      return -1;
-    }
-
-    taosDumpCreateTableClause(tableDes, count, arguments, fp);
-
-    memset(tableDes, 0, sizeof(STableDef) + sizeof(SColDes) * TSDB_MAX_COLUMNS);
-
-    count = taosGetTableDes(table, tableDes);
-
-    if (count < 0) {
-      free(tableDes);
-      return -1;
-    }
-
-    taosDumpCreateMTableClause(tableDes, metric, count, arguments, fp);
-
-  } else {  // dump table definition
-    count = taosGetTableDes(table, tableDes);
-
-    if (count < 0) {
-      free(tableDes);
-      return -1;
-    }
-
-    taosDumpCreateTableClause(tableDes, count, arguments, fp);
-  }
-
-  free(tableDes);
-
-  return taosDumpTableData(fp, table, arguments);
-}
-
-int32_t taosDumpMetric(char *metric, struct arguments *arguments, FILE *fp) {
-  TAOS_ROW row = NULL;
-  int fd = -1;
-  STableRecord tableRecord;
-
-  strcpy(tableRecord.metric, metric);
-
-  sprintf(command, "select tbname from %s", metric);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  fd = open(".table.tmp", O_RDWR | O_CREAT, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH);
-  if (fd < 0) {
-    fprintf(stderr, "failed to open temp file");
-    return -1;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  while ((row = taos_fetch_row(result)) != NULL) {
-    memset(&tableRecord, 0, sizeof(STableRecord));
-    strncpy(tableRecord.name, (char *)row[0], fields[0].bytes);
-    strcpy(tableRecord.metric, metric);
-    twrite(fd, &tableRecord, sizeof(STableRecord));
-  }
-
-  taos_free_result(result);
-  result = NULL;
-
-  lseek(fd, 0, SEEK_SET);
-
-  while (read(fd, &tableRecord, sizeof(STableRecord)) > 0) {
-    taosDumpTable(tableRecord.name, tableRecord.metric, arguments, fp);
-  }
-
-  tclose(fd);
-  remove(".table.tmp");
-
-  return 0;
-}
-
-int taosDumpTableData(FILE *fp, char *tbname, struct arguments *arguments) {
-  /* char       temp[MAX_COMMAND_SIZE] = "\0"; */
-  int count = 0;
-  char *pstr = NULL;
-  TAOS_ROW row = NULL;
-  int numFields = 0;
-  char *tbuf = NULL;
-
-  if (arguments->schemaonly) return 0;
-
-  sprintf(command, "select * from %s where _c0 >= %" PRId64 " and _c0 <= %" PRId64 " order by _c0 asc", tbname, arguments->start_time,
-          arguments->end_time);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(taos));
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  numFields = taos_field_count(taos);
-  assert(numFields > 0);
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  tbuf = (char *)malloc(COMMAND_SIZE);
-  if (tbuf == NULL) {
-    fprintf(stderr, "No enough memory\n");
-    return -1;
-  }
-
-  count = 0;
-  while ((row = taos_fetch_row(result)) != NULL) {
-    pstr = buffer;
-
-    if (count == 0) {
-      pstr += sprintf(pstr, "INSERT INTO %s VALUES (", tbname);
-    } else {
-      pstr += sprintf(pstr, "(");
-    }
-
-    for (int col = 0; col < numFields; col++) {
-      if (col != 0) pstr += sprintf(pstr, ", ");
-
-      if (row[col] == NULL) {
-        pstr += sprintf(pstr, "NULL");
-        continue;
-      }
-
-      switch (fields[col].type) {
-        case TSDB_DATA_TYPE_BOOL:
-          pstr += sprintf(pstr, "%d", ((((int)(*((char *)row[col]))) == 1) ? 1 : 0));
-          break;
-        case TSDB_DATA_TYPE_TINYINT:
-          pstr += sprintf(pstr, "%d", (int)(*((char *)row[col])));
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          pstr += sprintf(pstr, "%d", (int)(*((short *)row[col])));
-          break;
-        case TSDB_DATA_TYPE_INT:
-          pstr += sprintf(pstr, "%d", *((int *)row[col]));
-          break;
-        case TSDB_DATA_TYPE_BIGINT:
-          pstr += sprintf(pstr, "%" PRId64 "", *((int64_t *)row[col]));
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          pstr += sprintf(pstr, "%f", GET_FLOAT_VAL(row[col]));
-          break;
-        case TSDB_DATA_TYPE_DOUBLE:
-          pstr += sprintf(pstr, "%f", GET_DOUBLE_VAL(row[col]));
-          break;
-        case TSDB_DATA_TYPE_BINARY:
-          *(pstr++) = '\'';
-          converStringToReadable((char *)row[col], fields[col].bytes, tbuf, COMMAND_SIZE);
-          pstr = stpcpy(pstr, tbuf);
-          *(pstr++) = '\'';
-          break;
-        case TSDB_DATA_TYPE_NCHAR:
-          convertNCharToReadable((char *)row[col], fields[col].bytes, tbuf, COMMAND_SIZE);
-          pstr += sprintf(pstr, "\'%s\'", tbuf);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          pstr += sprintf(pstr, "%" PRId64 "", *(int64_t *)row[col]);
-          break;
-        default:
-          break;
-      }
-    }
-    pstr += sprintf(pstr, ")");
-
-    count++;
-    fprintf(fp, "%s", buffer);
-
-    if (count >= arguments->data_batch) {
-      fprintf(fp, "\n");
-      count = 0;
-    } else {
-      fprintf(fp, "\\\n");
-    }
-  }
-
-  fprintf(fp, "\n");
-
-  if (tbuf) free(tbuf);
-  taos_free_result(result);
-  result = NULL;
-  return 0;
-}
-
-int taosCheckParam(struct arguments *arguments) {
-  if (arguments->all_databases && arguments->databases) {
-    fprintf(stderr, "conflict option --all-databases and --databases\n");
-    return -1;
-  }
-
-  if (arguments->start_time > arguments->end_time) {
-    fprintf(stderr, "start time is larger than end time\n");
-    return -1;
-  }
-  if (arguments->arg_list_len == 0) {
-    if ((!arguments->all_databases) && (!arguments->isDumpIn)) {
-      fprintf(stderr, "taosdump requires parameters\n");
-      return -1;
-    }
-  }
-
-  if (arguments->isDumpIn && (strcmp(arguments->output, DEFAULT_DUMP_FILE) != 0)) {
-    fprintf(stderr, "duplicate parameter input and output file\n");
-    return -1;
-  }
-
-  if (!arguments->isDumpIn && arguments->encode != NULL) {
-    fprintf(stderr, "invalid option in dump out\n");
-    return -1;
-  }
-
-  return 0;
-}
-
-bool isEmptyCommand(char *cmd) {
-  char *pchar = cmd;
-
-  while (*pchar != '\0') {
-    if (*pchar != ' ') return false;
-    pchar++;
-  }
-
-  return true;
-}
-
-void taosReplaceCtrlChar(char *str) {
-  _Bool ctrlOn = false;
-  char *pstr = NULL;
-
-  for (pstr = str; *str != '\0'; ++str) {
-    if (ctrlOn) {
-      switch (*str) {
-        case 'n':
-          *pstr = '\n';
-          pstr++;
-          break;
-        case 'r':
-          *pstr = '\r';
-          pstr++;
-          break;
-        case 't':
-          *pstr = '\t';
-          pstr++;
-          break;
-        case '\\':
-          *pstr = '\\';
-          pstr++;
-          break;
-        case '\'':
-          *pstr = '\'';
-          pstr++;
-          break;
-        default:
-          break;
-      }
-      ctrlOn = false;
-    } else {
-      if (*str == '\\') {
-        ctrlOn = true;
-      } else {
-        *pstr = *str;
-        pstr++;
-      }
-    }
-  }
-
-  *pstr = '\0';
-}
-
-int taosDumpIn(struct arguments *arguments) {
-  assert(arguments->isDumpIn);
-
-  int     tsize = 0;
-  FILE *  fp = NULL;
-  char *  line = NULL;
-  _Bool   isRun = true;
-  size_t  line_size = 0;
-  char *  pstr = NULL, *lstr = NULL;
-  iconv_t cd = (iconv_t)-1;
-  size_t  inbytesleft = 0;
-  size_t  outbytesleft = COMMAND_SIZE;
-  char    fcharset[64];
-  char *  tcommand = NULL;
-
-  fp = fopen(arguments->input, "r");
-  if (fp == NULL) {
-    fprintf(stderr, "failed to open input file %s\n", arguments->input);
-    return -1;
-  }
-
-  taosLoadFileCharset(fp, fcharset);
-
-  taos = taos_connect(arguments->host, arguments->user, arguments->password, NULL, arguments->port);
-  if (taos == NULL) {
-    fprintf(stderr, "failed to connect to TDengine server\n");
-    goto _dumpin_exit_failure;
-  }
-
-  command = (char *)malloc(COMMAND_SIZE);
-  lcommand = (char *)malloc(COMMAND_SIZE);
-  if (command == NULL || lcommand == NULL) {
-    fprintf(stderr, "failed to connect to allocate memory\n");
-    goto _dumpin_exit_failure;
-  }
-
-  // Resolve locale
-  if (*fcharset != '\0') {
-    arguments->encode = fcharset;
-  }
-
-  if (arguments->encode != NULL && strcasecmp(tsCharset, arguments->encode) != 0) {
-    cd = iconv_open(tsCharset, arguments->encode);
-    if (cd == (iconv_t)-1) {
-      fprintf(stderr, "Failed to open iconv handle\n");
-      goto _dumpin_exit_failure;
-    }
-  }
-
-  pstr = command;
-  int64_t linenu = 0;
-  while (1) {
-    ssize_t size = getline(&line, &line_size, fp);
-    linenu++;
-    if (size <= 0) break;
-    if (size == 1) {
-      if (pstr != command) {
-        inbytesleft = pstr - command;
-        memset(lcommand, 0, COMMAND_SIZE);
-        pstr = command;
-        lstr = lcommand;
-        outbytesleft = COMMAND_SIZE;
-        if (cd != (iconv_t)-1) {
-          iconv(cd, &pstr, &inbytesleft, &lstr, &outbytesleft);
-          tcommand = lcommand;
-        } else {
-          tcommand = command;
-        }
-        taosReplaceCtrlChar(tcommand);
-        if (taos_query(taos, tcommand) != 0)
-          fprintf(stderr, "linenu: %" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
-                  taos_errstr(taos));
-
-        pstr = command;
-        pstr[0] = '\0';
-        tsize = 0;
-        isRun = true;
-      }
-
-      continue;
-    }
-
-    /* if (line[0] == '-' && line[1] == '-') continue; */
-
-    line[size - 1] = 0;
-
-    if (tsize + size - 1 > COMMAND_SIZE) {
-      fprintf(stderr, "command is too long\n");
-      goto _dumpin_exit_failure;
-    }
-
-    if (line[size - 2] == '\\') {
-      line[size - 2] = ' ';
-      isRun = false;
-    } else {
-      isRun = true;
-    }
-
-    memcpy(pstr, line, size - 1);
-    pstr += (size - 1);
-    *pstr = '\0';
-
-    if (!isRun) continue;
-
-    if (command != pstr && !isEmptyCommand(command)) {
-      inbytesleft = pstr - command;
-      memset(lcommand, 0, COMMAND_SIZE);
-      pstr = command;
-      lstr = lcommand;
-      outbytesleft = COMMAND_SIZE;
-      if (cd != (iconv_t)-1) {
-        iconv(cd, &pstr, &inbytesleft, &lstr, &outbytesleft);
-        tcommand = lcommand;
-      } else {
-        tcommand = command;
-      }
-      taosReplaceCtrlChar(tcommand);
-      if (taos_query(taos, tcommand) != 0)
-        fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason: %s \ncontinue...\n", linenu, command,
-                taos_errstr(taos));
-    }
-
-    pstr = command;
-    *pstr = '\0';
-    tsize = 0;
-  }
-
-  if (pstr != command) {
-    inbytesleft = pstr - command;
-    memset(lcommand, 0, COMMAND_SIZE);
-    pstr = command;
-    lstr = lcommand;
-    outbytesleft = COMMAND_SIZE;
-    if (cd != (iconv_t)-1) {
-      iconv(cd, &pstr, &inbytesleft, &lstr, &outbytesleft);
-      tcommand = lcommand;
-    } else {
-      tcommand = command;
-    }
-    taosReplaceCtrlChar(lcommand);
-    if (taos_query(taos, tcommand) != 0)
-      fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
-              taos_errstr(taos));
-  }
-
-  if (cd != (iconv_t)-1) iconv_close(cd);
-  tfree(line);
-  tfree(command);
-  tfree(lcommand);
-  taos_close(taos);
-  fclose(fp);
-  return 0;
-
-_dumpin_exit_failure:
-  if (cd != (iconv_t)-1) iconv_close(cd);
-  tfree(command);
-  tfree(lcommand);
-  taos_close(taos);
-  fclose(fp);
-  return -1;
-}
-
-char *ascii_literal_list[] = {
-    "\\x00", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\x07", "\\x08", "\\t",   "\\n",   "\\x0b", "\\x0c",
-    "\\r",   "\\x0e", "\\x0f", "\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17", "\\x18", "\\x19",
-    "\\x1a", "\\x1b", "\\x1c", "\\x1d", "\\x1e", "\\x1f", " ",     "!",     "\\\"",  "#",     "$",     "%",     "&",
-    "\\'",   "(",     ")",     "*",     "+",     ",",     "-",     ".",     "/",     "0",     "1",     "2",     "3",
-    "4",     "5",     "6",     "7",     "8",     "9",     ":",     ";",     "<",     "=",     ">",     "?",     "@",
-    "A",     "B",     "C",     "D",     "E",     "F",     "G",     "H",     "I",     "J",     "K",     "L",     "M",
-    "N",     "O",     "P",     "Q",     "R",     "S",     "T",     "U",     "V",     "W",     "X",     "Y",     "Z",
-    "[",     "\\\\",  "]",     "^",     "_",     "`",     "a",     "b",     "c",     "d",     "e",     "f",     "g",
-    "h",     "i",     "j",     "k",     "l",     "m",     "n",     "o",     "p",     "q",     "r",     "s",     "t",
-    "u",     "v",     "w",     "x",     "y",     "z",     "{",     "|",     "}",     "~",     "\\x7f", "\\x80", "\\x81",
-    "\\x82", "\\x83", "\\x84", "\\x85", "\\x86", "\\x87", "\\x88", "\\x89", "\\x8a", "\\x8b", "\\x8c", "\\x8d", "\\x8e",
-    "\\x8f", "\\x90", "\\x91", "\\x92", "\\x93", "\\x94", "\\x95", "\\x96", "\\x97", "\\x98", "\\x99", "\\x9a", "\\x9b",
-    "\\x9c", "\\x9d", "\\x9e", "\\x9f", "\\xa0", "\\xa1", "\\xa2", "\\xa3", "\\xa4", "\\xa5", "\\xa6", "\\xa7", "\\xa8",
-    "\\xa9", "\\xaa", "\\xab", "\\xac", "\\xad", "\\xae", "\\xaf", "\\xb0", "\\xb1", "\\xb2", "\\xb3", "\\xb4", "\\xb5",
-    "\\xb6", "\\xb7", "\\xb8", "\\xb9", "\\xba", "\\xbb", "\\xbc", "\\xbd", "\\xbe", "\\xbf", "\\xc0", "\\xc1", "\\xc2",
-    "\\xc3", "\\xc4", "\\xc5", "\\xc6", "\\xc7", "\\xc8", "\\xc9", "\\xca", "\\xcb", "\\xcc", "\\xcd", "\\xce", "\\xcf",
-    "\\xd0", "\\xd1", "\\xd2", "\\xd3", "\\xd4", "\\xd5", "\\xd6", "\\xd7", "\\xd8", "\\xd9", "\\xda", "\\xdb", "\\xdc",
-    "\\xdd", "\\xde", "\\xdf", "\\xe0", "\\xe1", "\\xe2", "\\xe3", "\\xe4", "\\xe5", "\\xe6", "\\xe7", "\\xe8", "\\xe9",
-    "\\xea", "\\xeb", "\\xec", "\\xed", "\\xee", "\\xef", "\\xf0", "\\xf1", "\\xf2", "\\xf3", "\\xf4", "\\xf5", "\\xf6",
-    "\\xf7", "\\xf8", "\\xf9", "\\xfa", "\\xfb", "\\xfc", "\\xfd", "\\xfe", "\\xff"};
-
-int converStringToReadable(char *str, int size, char *buf, int bufsize) {
-  char *pstr = str;
-  char *pbuf = buf;
-  while (size > 0) {
-    if (*pstr == '\0') break;
-    pbuf = stpcpy(pbuf, ascii_literal_list[((uint8_t)(*pstr))]);
-    pstr++;
-    size--;
-  }
-  *pbuf = '\0';
-  return 0;
-}
-
-int convertNCharToReadable(char *str, int size, char *buf, int bufsize) {
-  char *pstr = str;
-  char *pbuf = buf;
-  // TODO
-  wchar_t wc;
-  while (size > 0) {
-    if (*pstr == '\0') break;
-    int byte_width = mbtowc(&wc, pstr, MB_CUR_MAX);
-
-    if ((int)wc < 256) {
-      pbuf = stpcpy(pbuf, ascii_literal_list[(int)wc]);
-    } else {
-      memcpy(pbuf, pstr, byte_width);
-      pbuf += byte_width;
-    }
-    pstr += byte_width;
-  }
-
-  *pbuf = '\0';
-
-  return 0;
-}
-
-void taosDumpCharset(FILE *fp) {
-  char charsetline[256];
-
-  fseek(fp, 0, SEEK_SET);
-  sprintf(charsetline, "#!%s\n", tsCharset);
-  fwrite(charsetline, strlen(charsetline), 1, fp);
-}
-
-void taosLoadFileCharset(FILE *fp, char *fcharset) {
-  char * line = NULL;
-  size_t line_size = 0;
-
-  fseek(fp, 0, SEEK_SET);
-  ssize_t size = getline(&line, &line_size, fp);
-  if (size <= 2) {
-    goto _exit_no_charset;
-  }
-
-  if (strncmp(line, "#!", 2) != 0) {
-    goto _exit_no_charset;
-  }
-  if (line[size - 1] == '\n') {
-    line[size - 1] = '\0';
-    size--;
-  }
-  strcpy(fcharset, line + 2);
-
-  tfree(line);
-  return;
-
-_exit_no_charset:
-  fseek(fp, 0, SEEK_SET);
-  *fcharset = '\0';
-  tfree(line);
-  return;
-}
\ No newline at end of file
diff --git a/src/mnode/CMakeLists.txt b/src/mnode/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ff5c9335b654edbdb7bbf6c081b38b265923d645
--- /dev/null
+++ b/src/mnode/CMakeLists.txt
@@ -0,0 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_LINUX)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
+
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
+
+  ADD_LIBRARY(mnode ${SRC})
+ENDIF ()
\ No newline at end of file
diff --git a/src/mnode/inc/mnodeAcct.h b/src/mnode/inc/mnodeAcct.h
new file mode 100644
index 0000000000000000000000000000000000000000..744a62f948dae7174eb782fa788c2276c99efd01
--- /dev/null
+++ b/src/mnode/inc/mnodeAcct.h
@@ -0,0 +1,41 @@
+/*
+ * 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_MNODE_ACCT_H
+#define TDENGINE_MNODE_ACCT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tacct.h"
+
+int32_t mnodeInitAccts();
+void    mnodeCleanupAccts();
+void    mnodeGetStatOfAllAcct(SAcctInfo* pAcctInfo);
+void *  mnodeGetAcct(char *acctName);
+void *  mnodeGetNextAcct(void *pIter, SAcctObj **pAcct);
+void    mnodeIncAcctRef(SAcctObj *pAcct);
+void    mnodeDecAcctRef(SAcctObj *pAcct);
+void    mnodeAddDbToAcct(SAcctObj *pAcct, SDbObj *pDb);
+void    mnodeDropDbFromAcct(SAcctObj *pAcct, SDbObj *pDb);
+void    mnodeAddUserToAcct(SAcctObj *pAcct, SUserObj *pUser);
+void    mnodeDropUserFromAcct(SAcctObj *pAcct, SUserObj *pUser);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeCluster.h b/src/mnode/inc/mnodeCluster.h
new file mode 100644
index 0000000000000000000000000000000000000000..a5af544dc289c085f34c4864e1529ecd7cd7a2bd
--- /dev/null
+++ b/src/mnode/inc/mnodeCluster.h
@@ -0,0 +1,32 @@
+/*
+ * 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_MNODE_CLUSTER_H
+#define TDENGINE_MNODE_CLUSTER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t mnodeInitCluster();
+void    mnodeCleanupCluster();
+void    mnodeUpdateClusterId();
+const char* mnodeGetClusterId();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeDb.h b/src/mnode/inc/mnodeDb.h
new file mode 100644
index 0000000000000000000000000000000000000000..7cbd08ed92bc42e165469d60e3fb25e724415981
--- /dev/null
+++ b/src/mnode/inc/mnodeDb.h
@@ -0,0 +1,54 @@
+/*
+ * 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_MNODE_DB_H
+#define TDENGINE_MNODE_DB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mnodeDef.h"
+
+enum _TSDB_DB_STATUS {
+  TSDB_DB_STATUS_READY,
+  TSDB_DB_STATUS_DROPPING
+};
+
+// api
+int32_t mnodeInitDbs();
+void    mnodeCleanupDbs();
+int64_t mnodeGetDbNum();
+SDbObj *mnodeGetDb(char *db);
+SDbObj *mnodeGetDbByTableId(char *db);
+void *  mnodeGetNextDb(void *pIter, SDbObj **pDb);
+void    mnodeIncDbRef(SDbObj *pDb);
+void    mnodeDecDbRef(SDbObj *pDb);
+bool    mnodeCheckIsMonitorDB(char *db, char *monitordb);
+void    mnodeDropAllDbs(SAcctObj *pAcct);
+
+// util func
+void mnodeAddSuperTableIntoDb(SDbObj *pDb);
+void mnodeRemoveSuperTableFromDb(SDbObj *pDb);
+void mnodeAddTableIntoDb(SDbObj *pDb);
+void mnodeRemoveTableFromDb(SDbObj *pDb);
+void mnodeAddVgroupIntoDb(SVgObj *pVgroup);
+void mnodeRemoveVgroupFromDb(SVgObj *pVgroup);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeDef.h b/src/mnode/inc/mnodeDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..8a2947dd180218dfd2ddc91d52b2825ccb011eae
--- /dev/null
+++ b/src/mnode/inc/mnodeDef.h
@@ -0,0 +1,268 @@
+/*
+ * 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_MNODE_DEF_H
+#define TDENGINE_MNODE_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taosdef.h"
+#include "taosmsg.h"
+
+struct SVgObj;
+struct SDbObj;
+struct SAcctObj;
+struct SUserObj;
+struct SMnodeObj;
+
+/*
+struct define notes:
+1. The first field must be the xxxxId field or name field , e.g. 'int32_t dnodeId', 'int32_t mnodeId', 'char name[]', 'char user[]', ...
+2. From the dnodeId field to the updataEnd field, these information will be falled disc;
+3. The fields behind the updataEnd field can be changed;
+*/
+
+typedef struct SClusterObj {
+  char    uid[TSDB_CLUSTER_ID_LEN];
+  int64_t createdTime;
+  int8_t  reserved[12];
+  int8_t  updateEnd[4];
+  int32_t refCount;
+} SClusterObj;
+
+typedef struct SDnodeObj {
+  int32_t    dnodeId;
+  int32_t    openVnodes;
+  int64_t    createdTime;
+  int32_t    resever0;         // from dnode status msg, config information
+  int32_t    customScore;      // config by user
+  uint32_t   lastAccess;
+  uint16_t   numOfCores;       // from dnode status msg
+  uint16_t   dnodePort;
+  char       dnodeFqdn[TSDB_FQDN_LEN];
+  char       dnodeEp[TSDB_EP_LEN];
+  int8_t     alternativeRole;  // from dnode status msg, 0-any, 1-mgmt, 2-dnode
+  int8_t     status;           // set in balance function
+  int8_t     isMgmt;
+  int8_t     reserve1[11];  
+  int8_t     updateEnd[4];
+  int32_t    refCount;
+  uint32_t   moduleStatus;
+  uint32_t   lastReboot;       // time stamp for last reboot
+  float      score;            // calc in balance function
+  float      diskAvailable;    // from dnode status msg
+  int16_t    diskAvgUsage;     // calc from sys.disk
+  int16_t    cpuAvgUsage;      // calc from sys.cpu
+  int16_t    memoryAvgUsage;   // calc from sys.mem
+  int16_t    bandwidthUsage;   // calc from sys.band
+  int8_t     offlineReason;
+  int8_t     reserved2[1];
+} SDnodeObj;
+
+typedef struct SMnodeObj {
+  int32_t    mnodeId;
+  int8_t     reserved0[4];
+  int64_t    createdTime;
+  int8_t     reserved1[4];
+  int8_t     updateEnd[4];
+  int32_t    refCount;
+  int8_t     role;
+  int8_t     reserved2[3];
+} SMnodeObj;
+
+typedef struct STableObj {
+  char  *tableId;
+  int8_t type;
+} STableObj;
+
+typedef struct SSuperTableObj {
+  STableObj  info; 
+  int8_t     reserved0[9]; // for fill struct STableObj to 4byte align
+  int16_t    nextColId;
+  int32_t    sversion;
+  uint64_t   uid;
+  int64_t    createdTime;
+  int32_t    tversion;
+  int32_t    numOfColumns;
+  int32_t    numOfTags;
+  int8_t     updateEnd[4];
+  int32_t    refCount;
+  int32_t    numOfTables;
+  SSchema *  schema;
+  void *     vgHash;
+} SSuperTableObj;
+
+typedef struct {
+  STableObj  info;  
+  int8_t     reserved0[9]; // for fill struct STableObj to 4byte align
+  int16_t    nextColId;    //used by normal table
+  int32_t    sversion;     //used by normal table  
+  uint64_t   uid;
+  uint64_t   suid;
+  int64_t    createdTime;
+  int32_t    numOfColumns; //used by normal table
+  int32_t    sid;
+  int32_t    vgId;
+  int32_t    sqlLen;
+  int8_t     updateEnd[4];
+  int32_t    refCount;
+  char*      sql;          //used by normal table
+  SSchema*   schema;       //used by normal table
+  SSuperTableObj *superTable;
+} SChildTableObj;
+
+typedef struct {
+  int32_t    dnodeId;
+  int8_t     role;
+  int8_t     reserved[3];
+  SDnodeObj* pDnode;
+} SVnodeGid;
+
+typedef struct SVgObj {
+  uint32_t       vgId;
+  int32_t        numOfVnodes;
+  int64_t        createdTime;
+  int32_t        lbDnodeId;
+  int32_t        lbTime;
+  char           dbName[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  int8_t         inUse;
+  int8_t         accessState;
+  int8_t         status;
+  int8_t         reserved0[4];
+  SVnodeGid      vnodeGid[TSDB_MAX_REPLICA];
+  int8_t         reserved1[12];
+  int8_t         updateEnd[4];
+  int32_t        refCount;
+  int32_t        numOfTables;
+  int64_t        totalStorage;
+  int64_t        compStorage;
+  int64_t        pointsWritten;
+  struct SDbObj *pDb;
+  void *         idPool;
+} SVgObj;
+
+typedef struct {
+  int32_t cacheBlockSize;
+  int32_t totalBlocks;
+  int32_t maxTables;
+  int32_t daysPerFile;
+  int32_t daysToKeep;
+  int32_t daysToKeep1;
+  int32_t daysToKeep2;
+  int32_t minRowsPerFileBlock;
+  int32_t maxRowsPerFileBlock;
+  int32_t commitTime;
+  int32_t fsyncPeriod;
+  int8_t  precision;
+  int8_t  compression;
+  int8_t  walLevel;
+  int8_t  replications;
+  int8_t  quorum;
+  int8_t  reserved[12];
+} SDbCfg;
+
+typedef struct SDbObj {
+  char    name[TSDB_ACCT_LEN + TSDB_DB_NAME_LEN];
+  int8_t  reserved0[4];
+  char    acct[TSDB_USER_LEN];
+  int64_t createdTime;
+  int32_t cfgVersion;
+  SDbCfg  cfg;
+  int8_t  status;
+  int8_t  reserved1[11];
+  int8_t  updateEnd[4];
+  int32_t refCount;
+  int32_t numOfVgroups;
+  int32_t numOfTables;
+  int32_t numOfSuperTables;
+  int32_t vgListSize; 
+  int32_t vgListIndex;
+  SVgObj **vgList;
+  struct SAcctObj *pAcct;
+  pthread_mutex_t  mutex;
+} SDbObj;
+
+typedef struct SUserObj {
+  char              user[TSDB_USER_LEN];
+  char              pass[TSDB_KEY_LEN];
+  char              acct[TSDB_USER_LEN];
+  int64_t           createdTime;
+  int8_t            superAuth;
+  int8_t            writeAuth;
+  int8_t            reserved[10];
+  int8_t            updateEnd[4];
+  int32_t           refCount;
+  struct SAcctObj * pAcct;
+} SUserObj;
+
+typedef struct {
+  int64_t totalStorage;  // Total storage wrtten from this account
+  int64_t compStorage;   // Compressed storage on disk
+  int64_t queryTime;
+  int64_t totalPoints;
+  int64_t inblound;
+  int64_t outbound;
+  int64_t sKey;
+  int32_t numOfUsers;
+  int32_t numOfDbs;
+  int32_t numOfTimeSeries;
+  int32_t numOfPointsPerSecond;
+  int32_t numOfConns;
+  int32_t numOfQueries;
+  int32_t numOfStreams;
+  int8_t  accessState;   // Checked by mgmt heartbeat message
+  int8_t  reserved[3];
+} SAcctInfo;
+
+typedef struct SAcctObj {
+  char      user[TSDB_USER_LEN];
+  char      pass[TSDB_KEY_LEN];
+  SAcctCfg  cfg;
+  int64_t   createdTime;
+  int32_t   acctId;
+  int8_t    status;
+  int8_t    reserved0[7];
+  int8_t    updateEnd[4];
+  int32_t   refCount;
+  int8_t    reserved1[4];
+  SAcctInfo acctInfo;
+  pthread_mutex_t  mutex;
+} SAcctObj;
+
+typedef struct {
+  char     db[TSDB_DB_NAME_LEN];
+  int8_t   type;
+  int16_t  numOfColumns;
+  int32_t  index;
+  int32_t  rowSize;
+  int32_t  numOfRows;
+  void *   pIter;
+  void **  ppShow;
+  int16_t  offset[TSDB_MAX_COLUMNS];
+  int16_t  bytes[TSDB_MAX_COLUMNS];
+  int32_t  numOfReads;
+  int8_t   maxReplica;
+  int8_t   reserved0[0];
+  uint16_t payloadLen;
+  char     payload[];
+} SShowObj;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeDnode.h b/src/mnode/inc/mnodeDnode.h
new file mode 100644
index 0000000000000000000000000000000000000000..b6ddb7a9bf27252bb9dc97d8c6645245354a6428
--- /dev/null
+++ b/src/mnode/inc/mnodeDnode.h
@@ -0,0 +1,81 @@
+/*
+ * 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_MNODE_DNODE_H
+#define TDENGINE_MNODE_DNODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+  TAOS_DN_STATUS_OFFLINE,
+  TAOS_DN_STATUS_DROPPING,
+  TAOS_DN_STATUS_BALANCING,
+  TAOS_DN_STATUS_READY
+} EDnodeStatus;
+
+typedef enum {
+  TAOS_DN_ALTERNATIVE_ROLE_ANY,
+  TAOS_DN_ALTERNATIVE_ROLE_MNODE,
+  TAOS_DN_ALTERNATIVE_ROLE_VNODE
+} EDnodeAlternativeRole;
+
+typedef enum EDnodeOfflineReason {
+  TAOS_DN_OFF_ONLINE = 0,
+  TAOS_DN_OFF_STATUS_MSG_TIMEOUT,
+  TAOS_DN_OFF_STATUS_NOT_RECEIVED,
+  TAOS_DN_OFF_RESET_BY_MNODE,
+  TAOS_DN_OFF_VERSION_NOT_MATCH,
+  TAOS_DN_OFF_DNODE_ID_NOT_MATCH,
+  TAOS_DN_OFF_CLUSTER_ID_NOT_MATCH,
+  TAOS_DN_OFF_NUM_OF_MNODES_NOT_MATCH,
+  TAOS_DN_OFF_ENABLE_BALANCE_NOT_MATCH,
+  TAOS_DN_OFF_MN_EQUAL_VN_NOT_MATCH,
+  TAOS_DN_OFF_OFFLINE_THRESHOLD_NOT_MATCH,
+  TAOS_DN_OFF_STATUS_INTERVAL_NOT_MATCH,
+  TAOS_DN_OFF_MAX_TAB_PER_VN_NOT_MATCH,
+  TAOS_DN_OFF_MAX_VG_PER_DB_NOT_MATCH,
+  TAOS_DN_OFF_ARBITRATOR_NOT_MATCH,
+  TAOS_DN_OFF_TIME_ZONE_NOT_MATCH,
+  TAOS_DN_OFF_LOCALE_NOT_MATCH,
+  TAOS_DN_OFF_CHARSET_NOT_MATCH,
+  TAOS_DN_OFF_OTHERS
+} EDnodeOfflineReason;
+
+int32_t mnodeInitDnodes();
+void    mnodeCleanupDnodes();
+
+char*   mnodeGetDnodeStatusStr(int32_t dnodeStatus);
+void    mgmtMonitorDnodeModule();
+
+int32_t mnodeGetDnodesNum();
+int32_t mnodeGetOnlinDnodesCpuCoreNum();
+int32_t mnodeGetOnlineDnodesNum();
+void *  mnodeGetNextDnode(void *pIter, SDnodeObj **pDnode);
+void    mnodeIncDnodeRef(SDnodeObj *pDnode);
+void    mnodeDecDnodeRef(SDnodeObj *pDnode);
+void *  mnodeGetDnode(int32_t dnodeId);
+void *  mnodeGetDnodeByEp(char *ep);
+void    mnodeUpdateDnode(SDnodeObj *pDnode);
+int32_t mnodeDropDnode(SDnodeObj *pDnode, void *pMsg);
+
+extern int32_t tsAccessSquence;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeInt.h b/src/mnode/inc/mnodeInt.h
new file mode 100644
index 0000000000000000000000000000000000000000..44626fd1672d5cf7e216e3fb256d434a4c27ca27
--- /dev/null
+++ b/src/mnode/inc/mnodeInt.h
@@ -0,0 +1,52 @@
+/*
+ * 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_MNODE_LOG_H
+#define TDENGINE_MNODE_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+#include "monitor.h"
+
+extern int32_t mDebugFlag;
+extern int32_t sdbDebugFlag;
+
+// mnode log function
+#define mFatal(...) { if (mDebugFlag & DEBUG_FATAL) { taosPrintLog("MND FATAL ", 255, __VA_ARGS__); }}
+#define mError(...) { if (mDebugFlag & DEBUG_ERROR) { taosPrintLog("MND ERROR ", 255, __VA_ARGS__); }}
+#define mWarn(...)  { if (mDebugFlag & DEBUG_WARN)  { taosPrintLog("MND WARN ", 255, __VA_ARGS__); }}
+#define mInfo(...)  { if (mDebugFlag & DEBUG_INFO)  { taosPrintLog("MND ", 255, __VA_ARGS__); }}
+#define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
+#define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", mDebugFlag, __VA_ARGS__); }}
+
+#define sdbFatal(...) { if (sdbDebugFlag & DEBUG_FATAL) { taosPrintLog("SDB FATAL ", 255, __VA_ARGS__); }}
+#define sdbError(...) { if (sdbDebugFlag & DEBUG_ERROR) { taosPrintLog("SDB ERROR ", 255, __VA_ARGS__); }}
+#define sdbWarn(...)  { if (sdbDebugFlag & DEBUG_WARN)  { taosPrintLog("SDB WARN ", 255, __VA_ARGS__); }}
+#define sdbInfo(...)  { if (sdbDebugFlag & DEBUG_INFO)  { taosPrintLog("SDB ", 255, __VA_ARGS__); }}
+#define sdbDebug(...) { if (sdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("SDB ", sdbDebugFlag, __VA_ARGS__); }}
+#define sdbTrace(...) { if (sdbDebugFlag & DEBUG_TRACE) { taosPrintLog("SDB ", sdbDebugFlag, __VA_ARGS__); }}
+
+#define mLError(...) { monitorSaveLog(2, __VA_ARGS__); mError(__VA_ARGS__) }
+#define mLWarn(...)  { monitorSaveLog(1, __VA_ARGS__); mWarn(__VA_ARGS__)  }
+#define mLInfo(...)  { monitorSaveLog(0, __VA_ARGS__); mInfo(__VA_ARGS__) }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeMnode.h b/src/mnode/inc/mnodeMnode.h
new file mode 100644
index 0000000000000000000000000000000000000000..0976ea8acd74e511a6cda374dc6ad5501b503482
--- /dev/null
+++ b/src/mnode/inc/mnodeMnode.h
@@ -0,0 +1,56 @@
+/*
+ * 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_MNODE_MNODE_H
+#define TDENGINE_MNODE_MNODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SMnodeObj;
+
+typedef enum {
+  TAOS_MN_STATUS_OFFLINE,
+  TAOS_MN_STATUS_DROPPING,
+  TAOS_MN_STATUS_READY
+} EMnodeStatus;
+
+int32_t mnodeInitMnodes();
+void    mnodeCleanupMnodes();
+
+int32_t mnodeAddMnode(int32_t dnodeId);
+int32_t mnodeDropMnode(int32_t dnodeId);
+void    mnodeDropMnodeLocal(int32_t dnodeId);
+
+void *  mnodeGetMnode(int32_t mnodeId);
+int32_t mnodeGetMnodesNum();
+void *  mnodeGetNextMnode(void *pIter, struct SMnodeObj **pMnode);
+void    mnodeIncMnodeRef(struct SMnodeObj *pMnode);
+void    mnodeDecMnodeRef(struct SMnodeObj *pMnode);
+
+char *  mnodeGetMnodeRoleStr();
+void    mnodeGetMnodeEpSetForPeer(SRpcEpSet *epSet);
+void    mnodeGetMnodeEpSetForShell(SRpcEpSet *epSet);
+char*   mnodeGetMnodeMasterEp();
+
+void    mnodeGetMnodeInfos(void *mnodes);
+void    mnodeUpdateMnodeEpSet();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodePeer.h b/src/mnode/inc/mnodePeer.h
new file mode 100644
index 0000000000000000000000000000000000000000..e409d90de96c4e6f0e37ca48ce212ec38efb5706
--- /dev/null
+++ b/src/mnode/inc/mnodePeer.h
@@ -0,0 +1,33 @@
+/*
+ * 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_MNODE_PEER_H
+#define TDENGINE_MNODE_PEER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+void    mnodeAddPeerRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
+void    mnodeAddPeerMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg));
+int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg);
+void    mnodeProcessPeerRsp(SRpcMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeProfile.h b/src/mnode/inc/mnodeProfile.h
new file mode 100644
index 0000000000000000000000000000000000000000..e39496ec9cacf431e2fefd737018d54a56e27f88
--- /dev/null
+++ b/src/mnode/inc/mnodeProfile.h
@@ -0,0 +1,52 @@
+/*
+ * 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_MNODE_PROFILE_H
+#define TDENGINE_MNODE_PROFILE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+typedef struct {
+  char     user[TSDB_USER_LEN];
+  int8_t   killed;
+  uint16_t port;
+  uint32_t ip;
+  uint32_t connId;
+  uint64_t stime;
+  uint64_t lastAccess;
+  uint32_t queryId;
+  uint32_t streamId;
+  int32_t  numOfQueries;
+  int32_t  numOfStreams;
+  SStreamDesc *pStreams;
+  SQueryDesc * pQueries;
+} SConnObj;
+
+int32_t mnodeInitProfile();
+void    mnodeCleanupProfile();
+
+SConnObj *mnodeCreateConn(char *user, uint32_t ip, uint16_t port);
+SConnObj *mnodeAccquireConn(int32_t connId, char *user, uint32_t ip, uint16_t port);
+void      mnodeReleaseConn(SConnObj *pConn);
+int32_t   mnodeSaveQueryStreamList(SConnObj *pConn, SCMHeartBeatMsg *pHBMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/mnode/inc/mnodeRead.h b/src/mnode/inc/mnodeRead.h
new file mode 100644
index 0000000000000000000000000000000000000000..5e7131f585a9ef62c64bac7462d12cde7c093173
--- /dev/null
+++ b/src/mnode/inc/mnodeRead.h
@@ -0,0 +1,31 @@
+/*
+ * 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_MNODE_READ_H
+#define TDENGINE_MNODE_READ_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+void    mnodeAddReadMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg));
+int32_t mnodeProcessRead(SMnodeMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeSdb.h b/src/mnode/inc/mnodeSdb.h
new file mode 100644
index 0000000000000000000000000000000000000000..f4854f69a0f315d06d402eef3a125b2a3e45ab0e
--- /dev/null
+++ b/src/mnode/inc/mnodeSdb.h
@@ -0,0 +1,106 @@
+/*
+ * 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_MNODE_SDB_H
+#define TDENGINE_MNODE_SDB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SMnodeMsg;
+
+typedef enum {
+  SDB_TABLE_CLUSTER = 0,
+  SDB_TABLE_DNODE   = 1,
+  SDB_TABLE_MNODE   = 2,
+  SDB_TABLE_ACCOUNT = 3,
+  SDB_TABLE_USER    = 4,
+  SDB_TABLE_DB      = 5,
+  SDB_TABLE_VGROUP  = 6,
+  SDB_TABLE_STABLE  = 7,
+  SDB_TABLE_CTABLE  = 8,
+  SDB_TABLE_MAX     = 9
+} ESdbTable;
+
+typedef enum {
+  SDB_KEY_STRING, 
+  SDB_KEY_INT,
+  SDB_KEY_AUTO,
+  SDB_KEY_VAR_STRING,
+} ESdbKey;
+
+typedef enum {
+  SDB_OPER_GLOBAL,
+  SDB_OPER_LOCAL
+} ESdbOper;
+
+typedef struct SSdbOper {
+  ESdbOper type;
+  int32_t  rowSize;
+  int32_t  retCode; // for callback in sdb queue
+  int32_t  processedCount; // for sync fwd callback
+  int32_t  (*reqFp)(struct SMnodeMsg *pMsg);
+  int32_t  (*writeCb)(struct SMnodeMsg *pMsg, int32_t code);
+  void *   table;
+  void *   pObj;
+  void *   rowData;
+  struct SMnodeMsg *pMsg;
+} SSdbOper;
+
+typedef struct {
+  char   *tableName;
+  int32_t hashSessions;
+  int32_t maxRowSize;
+  int32_t refCountPos;
+  ESdbTable tableId;
+  ESdbKey   keyType;
+  int32_t (*insertFp)(SSdbOper *pOper);
+  int32_t (*deleteFp)(SSdbOper *pOper);
+  int32_t (*updateFp)(SSdbOper *pOper);
+  int32_t (*encodeFp)(SSdbOper *pOper);
+  int32_t (*decodeFp)(SSdbOper *pDesc);  
+  int32_t (*destroyFp)(SSdbOper *pDesc);
+  int32_t (*restoredFp)();
+} SSdbTableDesc;
+
+int32_t sdbInit();
+void    sdbCleanUp();
+void *  sdbOpenTable(SSdbTableDesc *desc);
+void    sdbCloseTable(void *handle);
+bool    sdbIsMaster();
+bool    sdbIsServing();
+void    sdbUpdateMnodeRoles();
+
+int32_t sdbInsertRow(SSdbOper *pOper);
+int32_t sdbDeleteRow(SSdbOper *pOper);
+int32_t sdbUpdateRow(SSdbOper *pOper);
+int32_t sdbInsertRowImp(SSdbOper *pOper);
+
+void    *sdbGetRow(void *handle, void *key);
+void    *sdbFetchRow(void *handle, void *pIter, void **ppRow);
+void     sdbFreeIter(void *pIter);
+void     sdbIncRef(void *thandle, void *pRow);
+void     sdbDecRef(void *thandle, void *pRow);
+int64_t  sdbGetNumOfRows(void *handle);
+int32_t  sdbGetId(void *handle);
+uint64_t sdbGetVersion();
+bool     sdbCheckRowDeleted(void *thandle, void *pRow);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/mnode/inc/mnodeShow.h b/src/mnode/inc/mnodeShow.h
new file mode 100644
index 0000000000000000000000000000000000000000..da66e7167822d0077a8b5cad99489868eab7485d
--- /dev/null
+++ b/src/mnode/inc/mnodeShow.h
@@ -0,0 +1,37 @@
+/*
+ * 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_MNODE_SHELL_H
+#define TDENGINE_MNODE_SHELL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+int32_t mnodeInitShow();
+void    mnodeCleanUpShow();
+
+typedef int32_t (*SShowMetaFp)(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+typedef int32_t (*SShowRetrieveFp)(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+void mnodeAddShowMetaHandle(uint8_t showType, SShowMetaFp fp);
+void mnodeAddShowRetrieveHandle(uint8_t showType, SShowRetrieveFp fp);
+void mnodeVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capacity, SShowObj *pShow);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeTable.h b/src/mnode/inc/mnodeTable.h
new file mode 100644
index 0000000000000000000000000000000000000000..ed0dbe4ecfc4b344052c70487c3b740d81eaa0f3
--- /dev/null
+++ b/src/mnode/inc/mnodeTable.h
@@ -0,0 +1,42 @@
+/*
+ * 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 TBASE_MNODE_TABLE_H
+#define TBASE_MNODE_TABLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mnodeDef.h"
+
+int32_t mnodeInitTables();
+void    mnodeCleanupTables();
+int64_t mnodeGetSuperTableNum();
+int64_t mnodeGetChildTableNum();
+void *  mnodeGetTable(char *tableId);
+void    mnodeIncTableRef(void *pTable);
+void    mnodeDecTableRef(void *pTable);
+void *  mnodeGetNextChildTable(void *pIter, SChildTableObj **pTable);
+void *  mnodeGetNextSuperTable(void *pIter, SSuperTableObj **pTable);
+void    mnodeDropAllChildTables(SDbObj *pDropDb);
+void    mnodeDropAllSuperTables(SDbObj *pDropDb);
+void    mnodeDropAllChildTablesInVgroups(SVgObj *pVgroup);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeUser.h b/src/mnode/inc/mnodeUser.h
new file mode 100644
index 0000000000000000000000000000000000000000..073460f9d3621c7ec1f1eb57fd7da15791753b9e
--- /dev/null
+++ b/src/mnode/inc/mnodeUser.h
@@ -0,0 +1,39 @@
+/*
+ * 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_MNODE_USER_H
+#define TDENGINE_MNODE_USER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+int32_t   mnodeInitUsers();
+void      mnodeCleanupUsers();
+SUserObj *mnodeGetUser(char *name);
+void *    mnodeGetNextUser(void *pIter, SUserObj **pUser);
+void      mnodeIncUserRef(SUserObj *pUser);
+void      mnodeDecUserRef(SUserObj *pUser);
+SUserObj *mnodeGetUserFromConn(void *pConn);
+char *    mnodeGetUserFromMsg(void *pMnodeMsg);
+int32_t   mnodeCreateUser(SAcctObj *pAcct, char *name, char *pass, void *pMsg);
+void      mnodeDropAllUsers(SAcctObj *pAcct);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeVgroup.h b/src/mnode/inc/mnodeVgroup.h
new file mode 100644
index 0000000000000000000000000000000000000000..7aa662b81cc08c90d6453ff5c73191ad81416073
--- /dev/null
+++ b/src/mnode/inc/mnodeVgroup.h
@@ -0,0 +1,59 @@
+/*
+ * 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_MNODE_VGROUP_H
+#define TDENGINE_MNODE_VGROUP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct SMnodeMsg;
+
+int32_t mnodeInitVgroups();
+void    mnodeCleanupVgroups();
+int64_t mnodeGetVgroupNum();
+SVgObj *mnodeGetVgroup(int32_t vgId);
+void    mnodeIncVgroupRef(SVgObj *pVgroup);
+void    mnodeDecVgroupRef(SVgObj *pVgroup);
+void    mnodeDropAllDbVgroups(SDbObj *pDropDb);
+void    mnodeSendDropAllDbVgroupsMsg(SDbObj *pDropDb);
+void    mnodeDropAllDnodeVgroups(SDnodeObj *pDropDnode);
+//void  mnodeUpdateAllDbVgroups(SDbObj *pAlterDb);
+
+void *  mnodeGetNextVgroup(void *pIter, SVgObj **pVgroup);
+void    mnodeUpdateVgroup(SVgObj *pVgroup);
+void    mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVload);
+void    mnodeCheckUnCreatedVgroup(SDnodeObj *pDnode, SVnodeLoad *pVloads, int32_t openVnodes);
+
+int32_t mnodeCreateVgroup(struct SMnodeMsg *pMsg);
+void    mnodeDropVgroup(SVgObj *pVgroup, void *ahandle);
+void    mnodeAlterVgroup(SVgObj *pVgroup, void *ahandle);
+int32_t mnodeGetAvailableVgroup(struct SMnodeMsg *pMsg, SVgObj **pVgroup, int32_t *sid);
+
+void    mnodeAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable);
+void    mnodeRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable);
+void    mnodeSendDropVnodeMsg(int32_t vgId, SRpcEpSet *epSet, void *ahandle);
+void    mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
+void    mnodeSendAlterVgroupMsg(SVgObj *pVgroup);
+
+SRpcEpSet mnodeGetEpSetFromVgroup(SVgObj *pVgroup);
+SRpcEpSet mnodeGetEpSetFromIp(char *ep);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/inc/mnodeWrite.h b/src/mnode/inc/mnodeWrite.h
new file mode 100644
index 0000000000000000000000000000000000000000..ced8eeb7c053bacbf786ad4bcf765f8c6b7e21b3
--- /dev/null
+++ b/src/mnode/inc/mnodeWrite.h
@@ -0,0 +1,31 @@
+/*
+ * 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_MNODE_WRITE_H
+#define TDENGINE_MNODE_WRITE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "mnodeDef.h"
+
+void    mnodeAddWriteMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg));
+int32_t mnodeProcessRead(SMnodeMsg *pMsg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/mnode/src/mnodeAcct.c b/src/mnode/src/mnodeAcct.c
new file mode 100644
index 0000000000000000000000000000000000000000..e161940a2b1a07572d9beff5222b8eb8d3829075
--- /dev/null
+++ b/src/mnode/src/mnodeAcct.c
@@ -0,0 +1,244 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDb.h"
+#include "mnodeSdb.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+
+#include "tglobal.h"
+
+void *  tsAcctSdb = NULL;
+static int32_t tsAcctUpdateSize;
+static int32_t mnodeCreateRootAcct();
+
+static int32_t mnodeAcctActionDestroy(SSdbOper *pOper) {
+  SAcctObj *pAcct = pOper->pObj;
+  pthread_mutex_destroy(&pAcct->mutex);
+  taosTFree(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionInsert(SSdbOper *pOper) {
+  SAcctObj *pAcct = pOper->pObj;
+  memset(&pAcct->acctInfo, 0, sizeof(SAcctInfo));
+  pAcct->acctInfo.accessState = TSDB_VN_ALL_ACCCESS;
+  pthread_mutex_init(&pAcct->mutex, NULL);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionDelete(SSdbOper *pOper) {
+  SAcctObj *pAcct = pOper->pObj;
+  mnodeDropAllUsers(pAcct);
+  mnodeDropAllDbs(pAcct);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionUpdate(SSdbOper *pOper) {
+  SAcctObj *pAcct = pOper->pObj;
+  SAcctObj *pSaved = mnodeGetAcct(pAcct->user);
+  if (pAcct != pSaved) {
+    memcpy(pSaved, pAcct, tsAcctUpdateSize);
+    free(pAcct);
+  }
+  mnodeDecAcctRef(pSaved);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionEncode(SSdbOper *pOper) {
+  SAcctObj *pAcct = pOper->pObj;
+  memcpy(pOper->rowData, pAcct, tsAcctUpdateSize);
+  pOper->rowSize = tsAcctUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionDecode(SSdbOper *pOper) {
+  SAcctObj *pAcct = (SAcctObj *) calloc(1, sizeof(SAcctObj));
+  if (pAcct == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pAcct, pOper->rowData, tsAcctUpdateSize);
+  pOper->pObj = pAcct;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAcctActionRestored() {
+  int32_t numOfRows = sdbGetNumOfRows(tsAcctSdb);
+  if (numOfRows <= 0 && dnodeIsFirstDeploy()) {
+    mInfo("dnode first deploy, create root acct");
+    int32_t code = mnodeCreateRootAcct();
+    if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      mError("failed to create root account, reason:%s", tstrerror(code));
+      return code;
+    }
+  }
+
+  acctInit();
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeInitAccts() {
+  SAcctObj tObj;
+  tsAcctUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_ACCOUNT,
+    .tableName    = "accounts",
+    .hashSessions = TSDB_DEFAULT_ACCOUNTS_HASH_SIZE,
+    .maxRowSize   = tsAcctUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_STRING,
+    .insertFp     = mnodeAcctActionInsert,
+    .deleteFp     = mnodeAcctActionDelete,
+    .updateFp     = mnodeAcctActionUpdate,
+    .encodeFp     = mnodeAcctActionEncode,
+    .decodeFp     = mnodeAcctActionDecode,
+    .destroyFp    = mnodeAcctActionDestroy,
+    .restoredFp   = mnodeAcctActionRestored
+  };
+
+  tsAcctSdb = sdbOpenTable(&tableDesc);
+  if (tsAcctSdb == NULL) {
+    mError("table:%s, failed to create hash", tableDesc.tableName);
+    return -1;
+  }
+
+  mDebug("table:%s, hash is created", tableDesc.tableName);
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeCleanupAccts() {
+  acctCleanUp();
+  sdbCloseTable(tsAcctSdb);
+  tsAcctSdb = NULL;
+}
+
+void mnodeGetStatOfAllAcct(SAcctInfo* pAcctInfo) {
+  memset(pAcctInfo, 0, sizeof(*pAcctInfo));
+
+  void   *pIter = NULL;
+  SAcctObj *pAcct = NULL;
+  while (1) {
+    pIter = mnodeGetNextAcct(pIter, &pAcct);
+    if (pAcct == NULL) {
+      break;
+    }
+    pAcctInfo->numOfDbs += pAcct->acctInfo.numOfDbs;
+    pAcctInfo->numOfTimeSeries += pAcct->acctInfo.numOfTimeSeries;
+    mnodeDecAcctRef(pAcct);
+  }
+  sdbFreeIter(pIter);
+
+  SVgObj *pVgroup = NULL;
+  pIter = NULL;
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) {
+       break;
+    }
+    pAcctInfo->totalStorage += pVgroup->totalStorage;
+    pAcctInfo->compStorage += pVgroup->compStorage;
+    pAcctInfo->totalPoints += pVgroup->pointsWritten;
+    mnodeDecVgroupRef(pVgroup);
+  }
+  sdbFreeIter(pIter);
+}
+
+void *mnodeGetAcct(char *name) {
+  return sdbGetRow(tsAcctSdb, name);
+}
+
+void *mnodeGetNextAcct(void *pIter, SAcctObj **pAcct) {
+  return sdbFetchRow(tsAcctSdb, pIter, (void **)pAcct); 
+}
+
+void mnodeIncAcctRef(SAcctObj *pAcct) {
+  sdbIncRef(tsAcctSdb, pAcct);
+}
+
+void mnodeDecAcctRef(SAcctObj *pAcct) {
+  sdbDecRef(tsAcctSdb, pAcct);
+}
+
+void mnodeAddDbToAcct(SAcctObj *pAcct, SDbObj *pDb) {
+  atomic_add_fetch_32(&pAcct->acctInfo.numOfDbs, 1);
+  pDb->pAcct = pAcct;
+  mnodeIncAcctRef(pAcct);
+}
+
+void mnodeDropDbFromAcct(SAcctObj *pAcct, SDbObj *pDb) {
+  atomic_sub_fetch_32(&pAcct->acctInfo.numOfDbs, 1);
+  pDb->pAcct = NULL;
+  mnodeDecAcctRef(pAcct);
+}
+
+void mnodeAddUserToAcct(SAcctObj *pAcct, SUserObj *pUser) {
+  atomic_add_fetch_32(&pAcct->acctInfo.numOfUsers, 1);
+  pUser->pAcct = pAcct;
+  mnodeIncAcctRef(pAcct);
+}
+
+void mnodeDropUserFromAcct(SAcctObj *pAcct, SUserObj *pUser) {
+  atomic_sub_fetch_32(&pAcct->acctInfo.numOfUsers, 1);
+  pUser->pAcct = NULL;
+  mnodeDecAcctRef(pAcct);
+}
+
+static int32_t mnodeCreateRootAcct() {
+  int32_t numOfAccts = sdbGetNumOfRows(tsAcctSdb);
+  if (numOfAccts != 0) return TSDB_CODE_SUCCESS;
+
+  SAcctObj *pAcct = malloc(sizeof(SAcctObj));
+  memset(pAcct, 0, sizeof(SAcctObj));
+  strcpy(pAcct->user, TSDB_DEFAULT_USER);
+  taosEncryptPass((uint8_t *)TSDB_DEFAULT_PASS, strlen(TSDB_DEFAULT_PASS), pAcct->pass);
+  pAcct->cfg = (SAcctCfg){
+    .maxUsers           = 128,
+    .maxDbs             = 128,
+    .maxTimeSeries      = INT32_MAX,
+    .maxConnections     = 1024,
+    .maxStreams         = 1000,
+    .maxPointsPerSecond = 10000000,
+    .maxStorage         = INT64_MAX,
+    .maxQueryTime       = INT64_MAX,
+    .maxInbound         = 0,
+    .maxOutbound        = 0,
+    .accessState        = TSDB_VN_ALL_ACCCESS
+  };
+  pAcct->acctId = sdbGetId(tsAcctSdb);
+  pAcct->createdTime = taosGetTimestampMs();
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsAcctSdb,
+    .pObj = pAcct,
+  };
+
+  return sdbInsertRow(&oper);
+}
+
+#ifndef _ACCT
+
+int32_t acctInit() { return TSDB_CODE_SUCCESS; }
+void    acctCleanUp() {}
+int32_t acctCheck(void *pAcct, EAcctGrantType type) { return TSDB_CODE_SUCCESS; }
+
+#endif
diff --git a/src/mnode/src/mnodeCluster.c b/src/mnode/src/mnodeCluster.c
new file mode 100644
index 0000000000000000000000000000000000000000..69614f77d6876f86c44e42fbfa12ce95e93c452a
--- /dev/null
+++ b/src/mnode/src/mnodeCluster.c
@@ -0,0 +1,230 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeCluster.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "tglobal.h"
+
+static void *  tsClusterSdb = NULL;
+static int32_t tsClusterUpdateSize;
+static char    tsClusterId[TSDB_CLUSTER_ID_LEN];
+static int32_t mnodeCreateCluster();
+
+static int32_t mnodeGetClusterMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveClusters(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+
+static int32_t mnodeClusterActionDestroy(SSdbOper *pOper) {
+  taosTFree(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionInsert(SSdbOper *pOper) {
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionDelete(SSdbOper *pOper) {
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionUpdate(SSdbOper *pOper) {
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionEncode(SSdbOper *pOper) {
+  SClusterObj *pCluster = pOper->pObj;
+  memcpy(pOper->rowData, pCluster, tsClusterUpdateSize);
+  pOper->rowSize = tsClusterUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionDecode(SSdbOper *pOper) {
+  SClusterObj *pCluster = (SClusterObj *) calloc(1, sizeof(SClusterObj));
+  if (pCluster == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pCluster, pOper->rowData, tsClusterUpdateSize);
+  pOper->pObj = pCluster;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeClusterActionRestored() {
+  int32_t numOfRows = sdbGetNumOfRows(tsClusterSdb);
+  if (numOfRows <= 0 && dnodeIsFirstDeploy()) {
+    mInfo("dnode first deploy, create cluster");
+    int32_t code = mnodeCreateCluster();
+    if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      mError("failed to create cluster, reason:%s", tstrerror(code));
+      return code;
+    }
+  }
+
+  mnodeUpdateClusterId();
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeInitCluster() {
+  SClusterObj tObj;
+  tsClusterUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_CLUSTER,
+    .tableName    = "cluster",
+    .hashSessions = TSDB_DEFAULT_CLUSTER_HASH_SIZE,
+    .maxRowSize   = tsClusterUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_STRING,
+    .insertFp     = mnodeClusterActionInsert,
+    .deleteFp     = mnodeClusterActionDelete,
+    .updateFp     = mnodeClusterActionUpdate,
+    .encodeFp     = mnodeClusterActionEncode,
+    .decodeFp     = mnodeClusterActionDecode,
+    .destroyFp    = mnodeClusterActionDestroy,
+    .restoredFp   = mnodeClusterActionRestored
+  };
+
+  tsClusterSdb = sdbOpenTable(&tableDesc);
+  if (tsClusterSdb == NULL) {
+    mError("table:%s, failed to create hash", tableDesc.tableName);
+    return -1;
+  }
+
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_CLUSTER, mnodeGetClusterMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_CLUSTER, mnodeRetrieveClusters);
+
+  mDebug("table:%s, hash is created", tableDesc.tableName);
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeCleanupCluster() {
+  sdbCloseTable(tsClusterSdb);
+  tsClusterSdb = NULL;
+}
+
+void *mnodeGetNextCluster(void *pIter, SClusterObj **pCluster) {
+  return sdbFetchRow(tsClusterSdb, pIter, (void **)pCluster); 
+}
+
+void mnodeIncClusterRef(SClusterObj *pCluster) {
+  sdbIncRef(tsClusterSdb, pCluster);
+}
+
+void mnodeDecClusterRef(SClusterObj *pCluster) {
+  sdbDecRef(tsClusterSdb, pCluster);
+}
+
+static int32_t mnodeCreateCluster() {
+  int32_t numOfClusters = sdbGetNumOfRows(tsClusterSdb);
+  if (numOfClusters != 0) return TSDB_CODE_SUCCESS;
+
+  SClusterObj *pCluster = malloc(sizeof(SClusterObj));
+  memset(pCluster, 0, sizeof(SClusterObj));
+  pCluster->createdTime = taosGetTimestampMs();
+  bool getuid = taosGetSystemUid(pCluster->uid);
+  if (!getuid) {
+    strcpy(pCluster->uid, "tdengine2.0");
+    mError("failed to get uid from system, set to default val %s", pCluster->uid);
+  } else {
+    mDebug("uid is %s", pCluster->uid);
+  }
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsClusterSdb,
+    .pObj = pCluster,
+  };
+
+  return sdbInsertRow(&oper);
+}
+
+const char* mnodeGetClusterId() {
+  return tsClusterId;
+}
+
+void mnodeUpdateClusterId() {
+  SClusterObj *pCluster = NULL;
+  void *pIter = mnodeGetNextCluster(NULL, &pCluster);
+  if (pCluster != NULL) {
+    tstrncpy(tsClusterId, pCluster->uid, TSDB_CLUSTER_ID_LEN);
+    mInfo("cluster id is set to %s", tsClusterId);
+  }
+
+  mnodeDecClusterRef(pCluster);
+  sdbFreeIter(pIter);
+}
+
+static int32_t mnodeGetClusterMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "clusterId");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "create_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  strcpy(pMeta->tableId, "show cluster");
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = 1;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveClusters(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t numOfRows = 0;
+  int32_t cols = 0;
+  char *  pWrite;
+  SClusterObj *pCluster = NULL;
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextCluster(pShow->pIter, &pCluster);
+    if (pCluster == NULL) break;
+    
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pCluster->uid, TSDB_CLUSTER_ID_LEN);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *) pWrite = pCluster->createdTime;
+    cols++;
+
+    mnodeDecClusterRef(pCluster);
+    numOfRows++;
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c
new file mode 100644
index 0000000000000000000000000000000000000000..8558350950de3892e30fac80514177ed3f76f886
--- /dev/null
+++ b/src/mnode/src/mnodeDb.c
@@ -0,0 +1,1118 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tutil.h"
+#include "tgrant.h"
+#include "tglobal.h"
+#include "tname.h"
+#include "tbalance.h"
+#include "tdataformat.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeWrite.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+
+#define VG_LIST_SIZE 8
+static void *  tsDbSdb = NULL;
+static int32_t tsDbUpdateSize;
+
+static int32_t mnodeCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate, SMnodeMsg *pMsg);
+static int32_t mnodeDropDb(SMnodeMsg *newMsg);
+static int32_t mnodeSetDbDropping(SDbObj *pDb);
+static int32_t mnodeGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessAlterDbMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessDropDbMsg(SMnodeMsg *pMsg);
+
+static void mnodeDestroyDb(SDbObj *pDb) {
+  pthread_mutex_destroy(&pDb->mutex);
+  taosTFree(pDb->vgList);
+  taosTFree(pDb);
+}
+
+static int32_t mnodeDbActionDestroy(SSdbOper *pOper) {
+  mnodeDestroyDb(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+int64_t mnodeGetDbNum() {
+  return sdbGetNumOfRows(tsDbSdb);
+}
+
+static int32_t mnodeDbActionInsert(SSdbOper *pOper) {
+  SDbObj *pDb = pOper->pObj;
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+
+  pthread_mutex_init(&pDb->mutex, NULL);
+  pthread_mutex_lock(&pDb->mutex);
+  pDb->vgListSize = VG_LIST_SIZE;
+  pDb->vgList = calloc(pDb->vgListSize, sizeof(SVgObj *));
+  pDb->numOfVgroups = 0;
+  pthread_mutex_unlock(&pDb->mutex);
+
+  pDb->numOfTables = 0;
+  pDb->numOfSuperTables = 0;
+
+  if (pAcct != NULL) {
+    mnodeAddDbToAcct(pAcct, pDb);
+    mnodeDecAcctRef(pAcct);
+  }
+  else {
+    mError("db:%s, acct:%s info not exist in sdb", pDb->name, pDb->acct);
+    return TSDB_CODE_MND_INVALID_ACCT;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDbActionDelete(SSdbOper *pOper) {
+  SDbObj *pDb = pOper->pObj;
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+
+  mnodeDropAllChildTables(pDb);
+  mnodeDropAllSuperTables(pDb);
+  mnodeDropAllDbVgroups(pDb);
+
+  if (pAcct) {
+    mnodeDropDbFromAcct(pAcct, pDb);
+    mnodeDecAcctRef(pAcct);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDbActionUpdate(SSdbOper *pOper) {
+  SDbObj *pNew = pOper->pObj;
+  SDbObj *pDb = mnodeGetDb(pNew->name);
+  if (pDb != NULL && pNew != pDb) {
+    memcpy(pDb, pNew, pOper->rowSize);
+    free(pNew->vgList);
+    free(pNew);
+  }
+  //mnodeUpdateAllDbVgroups(pDb);
+  mnodeDecDbRef(pDb);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDbActionEncode(SSdbOper *pOper) {
+  SDbObj *pDb = pOper->pObj;
+  memcpy(pOper->rowData, pDb, tsDbUpdateSize);
+  pOper->rowSize = tsDbUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDbActionDecode(SSdbOper *pOper) {
+  SDbObj *pDb = (SDbObj *) calloc(1, sizeof(SDbObj));
+  if (pDb == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+  
+  memcpy(pDb, pOper->rowData, tsDbUpdateSize);
+  pOper->pObj = pDb;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDbActionRestored() {
+  return 0;
+}
+
+int32_t mnodeInitDbs() {
+  SDbObj tObj;
+  tsDbUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_DB,
+    .tableName    = "dbs",
+    .hashSessions = TSDB_DEFAULT_DBS_HASH_SIZE,
+    .maxRowSize   = tsDbUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_STRING,
+    .insertFp     = mnodeDbActionInsert,
+    .deleteFp     = mnodeDbActionDelete,
+    .updateFp     = mnodeDbActionUpdate,
+    .encodeFp     = mnodeDbActionEncode,
+    .decodeFp     = mnodeDbActionDecode,
+    .destroyFp    = mnodeDbActionDestroy,
+    .restoredFp   = mnodeDbActionRestored
+  };
+
+  tsDbSdb = sdbOpenTable(&tableDesc);
+  if (tsDbSdb == NULL) {
+    mError("failed to init db data");
+    return -1;
+  }
+
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_CREATE_DB, mnodeProcessCreateDbMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_ALTER_DB, mnodeProcessAlterDbMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_DROP_DB, mnodeProcessDropDbMsg);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_DB, mnodeGetDbMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_DB, mnodeRetrieveDbs);
+  
+  mDebug("table:dbs table is created");
+  return 0;
+}
+
+void *mnodeGetNextDb(void *pIter, SDbObj **pDb) {
+  return sdbFetchRow(tsDbSdb, pIter, (void **)pDb);
+}
+
+SDbObj *mnodeGetDb(char *db) {
+  return (SDbObj *)sdbGetRow(tsDbSdb, db);
+}
+
+void mnodeIncDbRef(SDbObj *pDb) {
+  return sdbIncRef(tsDbSdb, pDb); 
+}
+
+void mnodeDecDbRef(SDbObj *pDb) { 
+  return sdbDecRef(tsDbSdb, pDb); 
+}
+
+SDbObj *mnodeGetDbByTableId(char *tableId) {
+  char db[TSDB_TABLE_FNAME_LEN], *pos;
+ 
+  // tableId format should be :  acct.db.table
+  pos = strstr(tableId, TS_PATH_DELIMITER);
+  assert(NULL != pos);
+
+  pos = strstr(pos + 1, TS_PATH_DELIMITER);
+  assert(NULL != pos);
+
+  memset(db, 0, sizeof(db));
+  strncpy(db, tableId, pos - tableId);
+
+  return mnodeGetDb(db);
+}
+
+static int32_t mnodeCheckDbCfg(SDbCfg *pCfg) {
+  if (pCfg->cacheBlockSize < TSDB_MIN_CACHE_BLOCK_SIZE || pCfg->cacheBlockSize > TSDB_MAX_CACHE_BLOCK_SIZE) {
+    mError("invalid db option cacheBlockSize:%d valid range: [%d, %d]", pCfg->cacheBlockSize, TSDB_MIN_CACHE_BLOCK_SIZE,
+           TSDB_MAX_CACHE_BLOCK_SIZE);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->totalBlocks < TSDB_MIN_TOTAL_BLOCKS || pCfg->totalBlocks > TSDB_MAX_TOTAL_BLOCKS) {
+    mError("invalid db option totalBlocks:%d valid range: [%d, %d]", pCfg->totalBlocks, TSDB_MIN_TOTAL_BLOCKS,
+           TSDB_MAX_TOTAL_BLOCKS);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->maxTables < TSDB_MIN_TABLES || pCfg->maxTables > TSDB_MAX_TABLES) {
+    mError("invalid db option maxTables:%d valid range: [%d, %d]", pCfg->maxTables, TSDB_MIN_TABLES, TSDB_MAX_TABLES);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->daysPerFile < TSDB_MIN_DAYS_PER_FILE || pCfg->daysPerFile > TSDB_MAX_DAYS_PER_FILE) {
+    mError("invalid db option daysPerFile:%d valid range: [%d, %d]", pCfg->daysPerFile, TSDB_MIN_DAYS_PER_FILE,
+           TSDB_MAX_DAYS_PER_FILE);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->daysToKeep < TSDB_MIN_KEEP || pCfg->daysToKeep > TSDB_MAX_KEEP) {
+    mError("invalid db option daysToKeep:%d valid range: [%d, %d]", pCfg->daysToKeep, TSDB_MIN_KEEP, TSDB_MAX_KEEP);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->daysToKeep < pCfg->daysPerFile) {
+    mError("invalid db option daysToKeep:%d should larger than daysPerFile:%d", pCfg->daysToKeep, pCfg->daysPerFile);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+#if 0
+  if (pCfg->daysToKeep2 < TSDB_MIN_KEEP || pCfg->daysToKeep2 > pCfg->daysToKeep) {
+    mError("invalid db option daysToKeep2:%d valid range: [%d, %d]", pCfg->daysToKeep, TSDB_MIN_KEEP, pCfg->daysToKeep);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->daysToKeep1 < TSDB_MIN_KEEP || pCfg->daysToKeep1 > pCfg->daysToKeep2) {
+    mError("invalid db option daysToKeep1:%d valid range: [%d, %d]", pCfg->daysToKeep1, TSDB_MIN_KEEP, pCfg->daysToKeep2);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+#endif
+
+  if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK) {
+    mError("invalid db option maxRowsPerFileBlock:%d valid range: [%d, %d]", pCfg->maxRowsPerFileBlock,
+           TSDB_MIN_MAX_ROW_FBLOCK, TSDB_MAX_MAX_ROW_FBLOCK);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK) {
+    mError("invalid db option minRowsPerFileBlock:%d valid range: [%d, %d]", pCfg->minRowsPerFileBlock,
+           TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->minRowsPerFileBlock > pCfg->maxRowsPerFileBlock) {
+    mError("invalid db option minRowsPerFileBlock:%d should smaller than maxRowsPerFileBlock:%d",
+           pCfg->minRowsPerFileBlock, pCfg->maxRowsPerFileBlock);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->commitTime < TSDB_MIN_COMMIT_TIME || pCfg->commitTime > TSDB_MAX_COMMIT_TIME) {
+    mError("invalid db option commitTime:%d valid range: [%d, %d]", pCfg->commitTime, TSDB_MIN_COMMIT_TIME,
+           TSDB_MAX_COMMIT_TIME);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->precision < TSDB_MIN_PRECISION && pCfg->precision > TSDB_MAX_PRECISION) {
+    mError("invalid db option timePrecision:%d valid value: [%d, %d]", pCfg->precision, TSDB_MIN_PRECISION,
+           TSDB_MAX_PRECISION);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->compression < TSDB_MIN_COMP_LEVEL || pCfg->compression > TSDB_MAX_COMP_LEVEL) {
+    mError("invalid db option compression:%d valid range: [%d, %d]", pCfg->compression, TSDB_MIN_COMP_LEVEL,
+           TSDB_MAX_COMP_LEVEL);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->walLevel < TSDB_MIN_WAL_LEVEL || pCfg->walLevel > TSDB_MAX_WAL_LEVEL) {
+    mError("invalid db option walLevel:%d, valid range: [%d, %d]", pCfg->walLevel, TSDB_MIN_WAL_LEVEL, TSDB_MAX_WAL_LEVEL);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->fsyncPeriod < TSDB_MIN_FSYNC_PERIOD || pCfg->fsyncPeriod > TSDB_MAX_FSYNC_PERIOD) {
+    mError("invalid db option fsyncPeriod:%d, valid range: [%d, %d]", pCfg->fsyncPeriod, TSDB_MIN_FSYNC_PERIOD, TSDB_MAX_FSYNC_PERIOD);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->replications < TSDB_MIN_DB_REPLICA_OPTION || pCfg->replications > TSDB_MAX_DB_REPLICA_OPTION) {
+    mError("invalid db option replications:%d valid range: [%d, %d]", pCfg->replications, TSDB_MIN_DB_REPLICA_OPTION,
+           TSDB_MAX_DB_REPLICA_OPTION);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (pCfg->quorum < TSDB_MIN_DB_REPLICA_OPTION || pCfg->quorum > TSDB_MAX_DB_REPLICA_OPTION) {
+    mError("invalid db option quorum:%d valid range: [%d, %d]", pCfg->quorum, TSDB_MIN_DB_REPLICA_OPTION,
+           TSDB_MAX_DB_REPLICA_OPTION);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+#ifndef _SYNC
+  if (pCfg->replications != 1) {
+    mError("invalid db option replications:%d can only be 1 in this version", pCfg->replications);
+    return TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+#endif
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void mnodeSetDefaultDbCfg(SDbCfg *pCfg) {
+  if (pCfg->cacheBlockSize < 0) pCfg->cacheBlockSize = tsCacheBlockSize;
+  if (pCfg->totalBlocks < 0) pCfg->totalBlocks = tsBlocksPerVnode;
+  if (pCfg->maxTables < 0) pCfg->maxTables = tsMaxTablePerVnode;
+  if (pCfg->daysPerFile < 0) pCfg->daysPerFile = tsDaysPerFile;
+  if (pCfg->daysToKeep < 0) pCfg->daysToKeep = tsDaysToKeep;
+  if (pCfg->daysToKeep1 < 0) pCfg->daysToKeep1 = pCfg->daysToKeep;
+  if (pCfg->daysToKeep2 < 0) pCfg->daysToKeep2 = pCfg->daysToKeep;
+  if (pCfg->minRowsPerFileBlock < 0) pCfg->minRowsPerFileBlock = tsMinRowsInFileBlock;
+  if (pCfg->maxRowsPerFileBlock < 0) pCfg->maxRowsPerFileBlock = tsMaxRowsInFileBlock;
+  if (pCfg->fsyncPeriod <0) pCfg->fsyncPeriod = tsFsyncPeriod;
+  if (pCfg->commitTime < 0) pCfg->commitTime = tsCommitTime;
+  if (pCfg->precision < 0) pCfg->precision = tsTimePrecision;
+  if (pCfg->compression < 0) pCfg->compression = tsCompression;
+  if (pCfg->walLevel < 0) pCfg->walLevel = tsWAL;
+  if (pCfg->replications < 0) pCfg->replications = tsReplications;
+  if (pCfg->quorum < 0) pCfg->quorum = tsQuorum;
+}
+
+static int32_t mnodeCreateDbCb(SMnodeMsg *pMsg, int32_t code) {
+  SDbObj *pDb = pMsg->pDb;
+  if (code == TSDB_CODE_SUCCESS) {
+    mLInfo("db:%s, is created by %s", pDb->name, mnodeGetUserFromMsg(pMsg));
+  } else {
+    mError("db:%s, failed to create by %s, reason:%s", pDb->name, mnodeGetUserFromMsg(pMsg), tstrerror(code));
+  }
+
+  return code;
+}
+
+static int32_t mnodeCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate, SMnodeMsg *pMsg) {
+  int32_t code = acctCheck(pAcct, ACCT_GRANT_DB);
+  if (code != 0) return code;
+
+  SDbObj *pDb = mnodeGetDb(pCreate->db);
+  if (pDb != NULL) {
+    mnodeDecDbRef(pDb); 
+    if (pCreate->ignoreExist) {
+      mDebug("db:%s, already exist, ignore exist is set", pCreate->db);
+      return TSDB_CODE_SUCCESS;
+    } else {
+      mError("db:%s, already exist, ignore exist not set", pCreate->db);
+      return TSDB_CODE_MND_DB_ALREADY_EXIST;
+    }
+  }
+
+  code = grantCheck(TSDB_GRANT_DB);
+  if (code != 0) return code;
+
+  pDb = calloc(1, sizeof(SDbObj));
+  tstrncpy(pDb->name, pCreate->db, sizeof(pDb->name));
+  tstrncpy(pDb->acct, pAcct->user, sizeof(pDb->acct)); 
+  pDb->createdTime = taosGetTimestampMs(); 
+  pDb->cfg = (SDbCfg) {
+    .cacheBlockSize      = pCreate->cacheBlockSize,
+    .totalBlocks         = pCreate->totalBlocks,
+    .maxTables           = pCreate->maxTables,
+    .daysPerFile         = pCreate->daysPerFile,
+    .daysToKeep          = pCreate->daysToKeep,
+    .daysToKeep1         = pCreate->daysToKeep1,
+    .daysToKeep2         = pCreate->daysToKeep2,
+    .minRowsPerFileBlock = pCreate->minRowsPerFileBlock,
+    .maxRowsPerFileBlock = pCreate->maxRowsPerFileBlock,
+    .fsyncPeriod         = pCreate->fsyncPeriod,
+    .commitTime          = pCreate->commitTime,
+    .precision           = pCreate->precision,
+    .compression         = pCreate->compression,
+    .walLevel            = pCreate->walLevel,
+    .replications        = pCreate->replications,
+    .quorum              = pCreate->quorum
+  };
+
+  mnodeSetDefaultDbCfg(&pDb->cfg);
+
+  code = mnodeCheckDbCfg(&pDb->cfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    taosTFree(pDb);
+    return code;
+  }
+
+  pMsg->pDb = pDb;
+  mnodeIncDbRef(pDb);
+
+  SSdbOper oper = {
+    .type    = SDB_OPER_GLOBAL,
+    .table   = tsDbSdb,
+    .pObj    = pDb,
+    .rowSize = sizeof(SDbObj),
+    .pMsg    = pMsg,
+    .writeCb = mnodeCreateDbCb
+  };
+
+  code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("db:%s, failed to create, reason:%s", pDb->name, tstrerror(code));
+    pMsg->pDb = NULL;
+    mnodeDestroyDb(pDb);
+  }
+
+  return code;
+}
+
+bool mnodeCheckIsMonitorDB(char *db, char *monitordb) {
+  char dbName[TSDB_DB_NAME_LEN] = {0};
+  extractDBName(db, dbName);
+
+  size_t len = strlen(dbName);
+  return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb));
+}
+
+#if 0
+void mnodePrintVgroups(SDbObj *pDb, char *oper) {
+  mInfo("db:%s, vgroup link from head, oper:%s", pDb->name, oper);  
+  SVgObj *pVgroup = pDb->pHead;
+  while (pVgroup != NULL) {
+    mInfo("vgId:%d", pVgroup->vgId);
+    pVgroup = pVgroup->next;
+  }
+
+  mInfo("db:%s, vgroup link from tail", pDb->name, pDb->numOfVgroups);
+  pVgroup = pDb->pTail;
+  while (pVgroup != NULL) {
+    mInfo("vgId:%d", pVgroup->vgId);
+    pVgroup = pVgroup->prev;
+  }
+}
+#endif
+
+void mnodeAddVgroupIntoDb(SVgObj *pVgroup) {
+  SDbObj *pDb = pVgroup->pDb;
+
+  pthread_mutex_lock(&pDb->mutex);
+  int32_t vgPos = pDb->numOfVgroups++;
+  if (vgPos >= pDb->vgListSize) {
+    pDb->vgList = realloc(pDb->vgList, pDb->vgListSize * 2 * sizeof(SVgObj *));
+    memset(pDb->vgList + pDb->vgListSize, 0, pDb->vgListSize * sizeof(SVgObj *));
+    pDb->vgListSize *= 2;
+  }
+
+  pDb->vgList[vgPos] = pVgroup;
+  pthread_mutex_unlock(&pDb->mutex);
+}
+
+void mnodeRemoveVgroupFromDb(SVgObj *pVgroup) {
+  SDbObj *pDb = pVgroup->pDb;
+
+  pthread_mutex_lock(&pDb->mutex);
+  for (int32_t v1 = 0; v1 < pDb->numOfVgroups; ++v1) {
+    if (pDb->vgList[v1] == pVgroup) {
+      for (int32_t v2 = v1; v2 < pDb->numOfVgroups - 1; ++v2) {
+        pDb->vgList[v2] = pDb->vgList[v2 + 1];
+      }
+      pDb->numOfVgroups--;
+      pDb->vgList[pDb->numOfVgroups] = NULL;
+      break;
+    }
+  }
+
+  pthread_mutex_unlock(&pDb->mutex);
+}
+
+void mnodeCleanupDbs() {
+  sdbCloseTable(tsDbSdb);
+  tsDbSdb = NULL;
+}
+
+static int32_t mnodeGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  int32_t cols = 0;
+
+  SSchema *pSchema = pMeta->schema;
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  pShow->bytes[cols] = (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "ntables");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+#ifndef __CLOUD_VERSION__
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "vgroups");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+#ifndef __CLOUD_VERSION__
+  }
+#endif
+
+#ifndef __CLOUD_VERSION__
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+    pShow->bytes[cols] = 2;
+    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+    strcpy(pSchema[cols].name, "replica");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 2;
+    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+    strcpy(pSchema[cols].name, "quorum");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 2;
+    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+    strcpy(pSchema[cols].name, "days");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+#ifndef __CLOUD_VERSION__
+  }
+#endif
+
+  pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "keep1,keep2,keep(D)");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+#ifndef __CLOUD_VERSION__
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "cache(MB)");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+    
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "blocks");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+    
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "minrows");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "maxrows");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 1;
+    pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
+    strcpy(pSchema[cols].name, "wallevel");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 4;
+    pSchema[cols].type = TSDB_DATA_TYPE_INT;
+    strcpy(pSchema[cols].name, "fsync");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 1;
+    pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
+    strcpy(pSchema[cols].name, "comp");
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+#ifndef __CLOUD_VERSION__
+  }
+#endif
+
+  pShow->bytes[cols] = 3 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "precision");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 10 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->numOfRows = pUser->pAcct->acctInfo.numOfDbs;
+
+  mnodeDecUserRef(pUser);
+  return 0;
+}
+
+static char *mnodeGetDbStr(char *src) {
+  char *pos = strstr(src, TS_PATH_DELIMITER);
+  if (pos != NULL) ++pos;
+
+  return pos;
+}
+
+static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t numOfRows = 0;
+  SDbObj *pDb = NULL;
+  char *  pWrite;
+  int32_t cols = 0;
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextDb(pShow->pIter, &pDb);
+    if (pDb == NULL) break;
+    if (pDb->pAcct != pUser->pAcct) continue;
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  
+    char* name = mnodeGetDbStr(pDb->name);
+    if (name != NULL) {
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, name, pShow->bytes[cols]);
+    } else {
+      STR_TO_VARSTR(pWrite, "NULL");
+    }
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pDb->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = pDb->numOfTables;
+    cols++;
+
+#ifndef __CLOUD_VERSION__
+    if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->numOfVgroups;
+      cols++;
+#ifndef __CLOUD_VERSION__
+    }
+#endif
+
+#ifndef __CLOUD_VERSION__
+    if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int16_t *)pWrite = pDb->cfg.replications;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int16_t *)pWrite = pDb->cfg.quorum;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int16_t *)pWrite = pDb->cfg.daysPerFile;
+      cols++;
+#ifndef __CLOUD_VERSION__
+    }
+#endif
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    
+    char tmp[128] = {0};
+    sprintf(tmp, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep);
+    STR_WITH_SIZE_TO_VARSTR(pWrite, tmp, strlen(tmp));
+    cols++;
+
+#ifndef __CLOUD_VERSION__
+    if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+#endif
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->cfg.cacheBlockSize;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->cfg.totalBlocks;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->cfg.minRowsPerFileBlock;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->cfg.maxRowsPerFileBlock;
+      cols++;
+      
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int8_t *)pWrite = pDb->cfg.walLevel;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = pDb->cfg.fsyncPeriod;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int8_t *)pWrite = pDb->cfg.compression;
+      cols++;
+#ifndef __CLOUD_VERSION__
+    }
+#endif
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    char *prec = (pDb->cfg.precision == TSDB_TIME_PRECISION_MILLI) ? TSDB_TIME_PRECISION_MILLI_STR
+                                                                   : TSDB_TIME_PRECISION_MICRO_STR;
+    STR_WITH_SIZE_TO_VARSTR(pWrite, prec, 2);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    if (pDb->status == TSDB_DB_STATUS_READY) {
+      const char *src = "ready";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
+    } else {
+      const char *src = "dropping";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
+    }
+    cols++;
+
+    numOfRows++;
+    mnodeDecDbRef(pDb);
+  }
+
+  pShow->numOfReads += numOfRows;
+  mnodeDecUserRef(pUser);
+  return numOfRows;
+}
+
+void mnodeAddSuperTableIntoDb(SDbObj *pDb) {
+  atomic_add_fetch_32(&pDb->numOfSuperTables, 1);
+}
+
+void mnodeRemoveSuperTableFromDb(SDbObj *pDb) {
+  atomic_add_fetch_32(&pDb->numOfSuperTables, -1);
+}
+
+void mnodeAddTableIntoDb(SDbObj *pDb) {
+  atomic_add_fetch_32(&pDb->numOfTables, 1);
+}
+
+void mnodeRemoveTableFromDb(SDbObj *pDb) {
+  atomic_add_fetch_32(&pDb->numOfTables, -1);
+}
+
+static int32_t mnodeSetDbDropping(SDbObj *pDb) {
+  if (pDb->status) return TSDB_CODE_SUCCESS;
+
+  pDb->status = true;
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsDbSdb,
+    .pObj = pDb
+  };
+
+  int32_t code = sdbUpdateRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("db:%s, failed to set dropping state, reason:%s", pDb->name, tstrerror(code));
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg) {
+  SCMCreateDbMsg *pCreate  = pMsg->rpcMsg.pCont;  
+  pCreate->maxTables       = htonl(pCreate->maxTables);
+  pCreate->cacheBlockSize  = htonl(pCreate->cacheBlockSize);
+  pCreate->totalBlocks     = htonl(pCreate->totalBlocks);
+  pCreate->daysPerFile     = htonl(pCreate->daysPerFile);
+  pCreate->daysToKeep      = htonl(pCreate->daysToKeep);
+  pCreate->daysToKeep1     = htonl(pCreate->daysToKeep1);
+  pCreate->daysToKeep2     = htonl(pCreate->daysToKeep2);
+  pCreate->commitTime      = htonl(pCreate->commitTime);
+  pCreate->fsyncPeriod     = htonl(pCreate->fsyncPeriod);
+  pCreate->minRowsPerFileBlock = htonl(pCreate->minRowsPerFileBlock);
+  pCreate->maxRowsPerFileBlock = htonl(pCreate->maxRowsPerFileBlock);
+  
+  int32_t code;
+  if (grantCheck(TSDB_GRANT_TIME) != TSDB_CODE_SUCCESS) {
+    code = TSDB_CODE_GRANT_EXPIRED;
+  } else if (!pMsg->pUser->writeAuth) {
+    code = TSDB_CODE_MND_NO_RIGHTS;
+  } else {
+    code = mnodeCreateDb(pMsg->pUser->pAcct, pCreate, pMsg);
+  }
+
+  return code;
+}
+
+static SDbCfg mnodeGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
+  SDbCfg  newCfg = pDb->cfg;
+  int32_t maxTables      = htonl(pAlter->maxTables);
+  int32_t cacheBlockSize = htonl(pAlter->cacheBlockSize);
+  int32_t totalBlocks    = htonl(pAlter->totalBlocks);
+  int32_t daysPerFile    = htonl(pAlter->daysPerFile);
+  int32_t daysToKeep     = htonl(pAlter->daysToKeep);
+  int32_t daysToKeep1    = htonl(pAlter->daysToKeep1);
+  int32_t daysToKeep2    = htonl(pAlter->daysToKeep2);
+  int32_t minRows        = htonl(pAlter->minRowsPerFileBlock);
+  int32_t maxRows        = htonl(pAlter->maxRowsPerFileBlock);
+  int32_t commitTime     = htonl(pAlter->commitTime);
+  int32_t fsyncPeriod    = htonl(pAlter->fsyncPeriod);
+  int8_t  compression    = pAlter->compression;
+  int8_t  walLevel       = pAlter->walLevel;
+  int8_t  replications   = pAlter->replications;
+  int8_t  quorum         = pAlter->quorum;
+  int8_t  precision      = pAlter->precision;
+  
+  terrno = TSDB_CODE_SUCCESS;
+
+  if (cacheBlockSize > 0 && cacheBlockSize != pDb->cfg.cacheBlockSize) {
+    mError("db:%s, can't alter cache option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (totalBlocks > 0 && totalBlocks != pDb->cfg.totalBlocks) {
+    mInfo("db:%s, blocks:%d change to %d", pDb->name, pDb->cfg.totalBlocks, totalBlocks);
+    newCfg.totalBlocks = totalBlocks;
+  }
+
+  if (maxTables > 0) {
+    mInfo("db:%s, maxTables:%d change to %d", pDb->name, pDb->cfg.maxTables, maxTables);
+    newCfg.maxTables = maxTables;
+    if (newCfg.maxTables < pDb->cfg.maxTables) {
+      mError("db:%s, tables:%d should larger than origin:%d", pDb->name, newCfg.maxTables, pDb->cfg.maxTables);
+      terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+    }
+  }
+
+  if (daysPerFile > 0 && daysPerFile != pDb->cfg.daysPerFile) {
+    mError("db:%s, can't alter days option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (daysToKeep > 0 && daysToKeep != pDb->cfg.daysToKeep) {
+    mDebug("db:%s, daysToKeep:%d change to %d", pDb->name, pDb->cfg.daysToKeep, daysToKeep);
+    newCfg.daysToKeep = daysToKeep;
+  }
+
+  if (daysToKeep1 > 0 && daysToKeep1 != pDb->cfg.daysToKeep1) {
+    mDebug("db:%s, daysToKeep1:%d change to %d", pDb->name, pDb->cfg.daysToKeep1, daysToKeep1);
+    newCfg.daysToKeep1 = daysToKeep1;
+  }
+
+  if (daysToKeep2 > 0 && daysToKeep2 != pDb->cfg.daysToKeep2) {
+    mDebug("db:%s, daysToKeep2:%d change to %d", pDb->name, pDb->cfg.daysToKeep2, daysToKeep2);
+    newCfg.daysToKeep2 = daysToKeep2;
+  }
+
+  if (minRows > 0 && minRows != pDb->cfg.minRowsPerFileBlock) {
+    mError("db:%s, can't alter minRows option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (maxRows > 0 && maxRows != pDb->cfg.maxRowsPerFileBlock) {
+    mError("db:%s, can't alter maxRows option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (commitTime > 0 && commitTime != pDb->cfg.commitTime) {
+    mError("db:%s, can't alter commitTime option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (precision > 0 && precision != pDb->cfg.precision) {
+    mError("db:%s, can't alter precision option", pDb->name);
+    terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+  }
+
+  if (compression >= 0 && compression != pDb->cfg.compression) {
+    mDebug("db:%s, compression:%d change to %d", pDb->name, pDb->cfg.compression, compression);
+    newCfg.compression = compression;
+  }
+
+  if (walLevel > 0 && walLevel != pDb->cfg.walLevel) {
+    mDebug("db:%s, walLevel:%d change to %d", pDb->name, pDb->cfg.walLevel, walLevel);
+    newCfg.walLevel = walLevel;
+  }
+
+  if (fsyncPeriod >= 0 && fsyncPeriod != pDb->cfg.fsyncPeriod) {
+    mDebug("db:%s, fsyncPeriod:%d change to %d", pDb->name, pDb->cfg.fsyncPeriod, fsyncPeriod);
+    newCfg.fsyncPeriod = fsyncPeriod;
+  }
+
+  if (replications > 0 && replications != pDb->cfg.replications) {
+    mDebug("db:%s, replications:%d change to %d", pDb->name, pDb->cfg.replications, replications);
+    newCfg.replications = replications;
+
+    if (pDb->cfg.walLevel < TSDB_MIN_WAL_LEVEL) {
+      mError("db:%s, walLevel:%d must be greater than 0", pDb->name, pDb->cfg.walLevel);
+      terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+    }
+
+    if (replications > mnodeGetDnodesNum()) {
+      mError("db:%s, no enough dnode to change replica:%d", pDb->name, replications);
+      terrno = TSDB_CODE_MND_NO_ENOUGH_DNODES;
+    }
+
+    if (pDb->cfg.replications - replications >= 2) {
+      mError("db:%s, replica number can't change from %d to %d", pDb->name, pDb->cfg.replications, replications);
+      terrno = TSDB_CODE_MND_INVALID_DB_OPTION;
+    }
+  }
+
+  if (quorum >= 0 && quorum != pDb->cfg.quorum) {
+    mDebug("db:%s, quorum:%d change to %d", pDb->name, pDb->cfg.quorum, quorum);
+    newCfg.quorum = quorum;
+  }
+
+  return newCfg;
+}
+
+static int32_t mnodeAlterDbCb(SMnodeMsg *pMsg, int32_t code) {
+  if (code != TSDB_CODE_SUCCESS) return code;
+  SDbObj *pDb = pMsg->pDb;
+
+  void *pIter = NULL;
+  while (1) {
+    SVgObj *pVgroup = NULL;
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+    if (pVgroup->pDb == pDb) {
+      mnodeSendAlterVgroupMsg(pVgroup);
+    }
+    mnodeDecVgroupRef(pVgroup);
+  }
+  sdbFreeIter(pIter);
+
+  mDebug("db:%s, all vgroups is altered", pDb->name);
+  mLInfo("db:%s, is alterd by %s", pDb->name, mnodeGetUserFromMsg(pMsg));
+
+  balanceAsyncNotify();
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAlterDb(SDbObj *pDb, SCMAlterDbMsg *pAlter, void *pMsg) {
+  SDbCfg newCfg = mnodeGetAlterDbOption(pDb, pAlter);
+  if (terrno != TSDB_CODE_SUCCESS) {
+    return terrno;
+  }
+
+  int32_t code = mnodeCheckDbCfg(&newCfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  if (memcmp(&newCfg, &pDb->cfg, sizeof(SDbCfg)) != 0) {
+    pDb->cfg = newCfg;
+    pDb->cfgVersion++;
+    SSdbOper oper = {
+      .type  = SDB_OPER_GLOBAL,
+      .table = tsDbSdb,
+      .pObj  = pDb,
+      .pMsg  = pMsg,
+      .writeCb = mnodeAlterDbCb
+    };
+
+    code = sdbUpdateRow(&oper);
+    if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      mError("db:%s, failed to alter, reason:%s", pDb->name, tstrerror(code));
+    }
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessAlterDbMsg(SMnodeMsg *pMsg) {
+  SCMAlterDbMsg *pAlter = pMsg->rpcMsg.pCont;
+  mDebug("db:%s, alter db msg is received from thandle:%p", pAlter->db, pMsg->rpcMsg.handle);
+
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pAlter->db);
+  if (pMsg->pDb == NULL) {
+    mError("db:%s, failed to alter, invalid db", pAlter->db);
+    return TSDB_CODE_MND_INVALID_DB;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pAlter->db, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  return mnodeAlterDb(pMsg->pDb, pAlter, pMsg);
+}
+
+static int32_t mnodeDropDbCb(SMnodeMsg *pMsg, int32_t code) {
+  SDbObj *pDb = pMsg->pDb;
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("db:%s, failed to drop from sdb, reason:%s", pDb->name, tstrerror(code));
+  } else {
+    mLInfo("db:%s, is dropped by %s", pDb->name, mnodeGetUserFromMsg(pMsg));
+  }
+
+  return code;
+}
+
+static int32_t mnodeDropDb(SMnodeMsg *pMsg) {
+  if (pMsg == NULL) return TSDB_CODE_MND_APP_ERROR;
+  
+  SDbObj *pDb = pMsg->pDb;
+  mInfo("db:%s, drop db from sdb", pDb->name);
+
+  SSdbOper oper = {
+    .type   = SDB_OPER_GLOBAL,
+    .table  = tsDbSdb,
+    .pObj   = pDb,
+    .pMsg   = pMsg,
+    .writeCb = mnodeDropDbCb
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("db:%s, failed to drop, reason:%s", pDb->name, tstrerror(code));
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessDropDbMsg(SMnodeMsg *pMsg) {
+  SCMDropDbMsg *pDrop = pMsg->rpcMsg.pCont;
+  mDebug("db:%s, drop db msg is received from thandle:%p", pDrop->db, pMsg->rpcMsg.handle);
+
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pDrop->db);
+  if (pMsg->pDb == NULL) {
+    if (pDrop->ignoreNotExists) {
+      mDebug("db:%s, db is not exist, treat as success", pDrop->db);
+      return TSDB_CODE_SUCCESS;
+    } else {
+      mError("db:%s, failed to drop, invalid db", pDrop->db);
+      return TSDB_CODE_MND_INVALID_DB;
+    }
+  }
+
+#if 0
+  if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
+    mError("db:%s, can't drop monitor database", pDrop->db);
+    return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
+  }
+#endif   
+
+  int32_t code = mnodeSetDbDropping(pMsg->pDb);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("db:%s, failed to drop, reason:%s", pDrop->db, tstrerror(code));
+    return code;
+  }
+
+  mnodeSendDropAllDbVgroupsMsg(pMsg->pDb);
+
+  mDebug("db:%s, all vgroups is dropped", pMsg->pDb->name);
+  return mnodeDropDb(pMsg);
+}
+
+void  mnodeDropAllDbs(SAcctObj *pAcct)  {
+  int32_t numOfDbs = 0;
+  SDbObj *pDb = NULL;
+  void *  pIter = NULL;
+
+  mInfo("acct:%s, all dbs will be dropped from sdb", pAcct->user);
+
+  while (1) {
+    pIter = mnodeGetNextDb(pIter, &pDb);
+    if (pDb == NULL) break;
+
+    if (pDb->pAcct == pAcct) {
+      mInfo("db:%s, drop db from sdb for acct:%s is dropped", pDb->name, pAcct->user);
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsDbSdb,
+        .pObj = pDb
+      };
+      
+      sdbDeleteRow(&oper);
+      numOfDbs++;
+    }
+    mnodeDecDbRef(pDb);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("acct:%s, all dbs:%d is dropped from sdb", pAcct->user, numOfDbs);
+}
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
new file mode 100644
index 0000000000000000000000000000000000000000..61c1d4113fea5170dd02e3d46d5f7a579788f326
--- /dev/null
+++ b/src/mnode/src/mnodeDnode.c
@@ -0,0 +1,1163 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tgrant.h"
+#include "tbalance.h"
+#include "tglobal.h"
+#include "tconfig.h"
+#include "tutil.h"
+#include "tsocket.h"
+#include "tbalance.h"
+#include "tsync.h"
+#include "tdataformat.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+#include "mnodeWrite.h"
+#include "mnodePeer.h"
+#include "mnodeCluster.h"
+
+int32_t tsAccessSquence = 0;
+static void   *tsDnodeSdb = NULL;
+static int32_t tsDnodeUpdateSize = 0;
+extern void *  tsMnodeSdb;
+extern void *  tsVgroupSdb;
+
+static int32_t mnodeCreateDnode(char *ep, SMnodeMsg *pMsg);
+static int32_t mnodeProcessCreateDnodeMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessDropDnodeMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessCfgDnodeMsg(SMnodeMsg *pMsg);
+static void    mnodeProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) ;
+static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg);
+static int32_t mnodeGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static char*   mnodeGetDnodeAlternativeRoleStr(int32_t alternativeRole);
+
+static char* offlineReason[] = {
+  "",
+  "status msg timeout",
+  "status not received",
+  "status reset by mnode",
+  "version not match",
+  "dnodeId not match",
+  "clusterId not match",
+  "numOfMnodes not match",
+  "balance not match",
+  "mnEqualVn not match",
+  "offThreshold not match",
+  "interval not match",
+  "maxTabPerVn not match",
+  "maxVgPerDb not match",
+  "arbitrator not match",
+  "timezone not match",
+  "locale not match",
+  "charset not match",
+  "unknown",
+};
+
+static int32_t mnodeDnodeActionDestroy(SSdbOper *pOper) {
+  taosTFree(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionInsert(SSdbOper *pOper) {
+  SDnodeObj *pDnode = pOper->pObj;
+  if (pDnode->status != TAOS_DN_STATUS_DROPPING) {
+    pDnode->status = TAOS_DN_STATUS_OFFLINE;
+    pDnode->lastAccess = tsAccessSquence;
+    pDnode->offlineReason = TAOS_DN_OFF_STATUS_NOT_RECEIVED;
+  }
+
+  mInfo("dnode:%d, fqdn:%s ep:%s port:%d, do insert action", pDnode->dnodeId, pDnode->dnodeFqdn, pDnode->dnodeEp, pDnode->dnodePort);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionDelete(SSdbOper *pOper) {
+  SDnodeObj *pDnode = pOper->pObj;
+ 
+#ifndef _SYNC 
+  mnodeDropAllDnodeVgroups(pDnode);
+#endif  
+  mnodeDropMnodeLocal(pDnode->dnodeId);
+  balanceAsyncNotify();
+
+  mDebug("dnode:%d, all vgroups is dropped from sdb", pDnode->dnodeId);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionUpdate(SSdbOper *pOper) {
+  SDnodeObj *pNew = pOper->pObj;
+  SDnodeObj *pDnode = mnodeGetDnode(pNew->dnodeId);
+  if (pDnode != NULL && pNew != pDnode) {
+    memcpy(pDnode, pNew, pOper->rowSize);
+    free(pNew);
+  }
+  mnodeDecDnodeRef(pDnode);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionEncode(SSdbOper *pOper) {
+  SDnodeObj *pDnode = pOper->pObj;
+  memcpy(pOper->rowData, pDnode, tsDnodeUpdateSize);
+  pOper->rowSize = tsDnodeUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionDecode(SSdbOper *pOper) {
+  SDnodeObj *pDnode = (SDnodeObj *) calloc(1, sizeof(SDnodeObj));
+  if (pDnode == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pDnode, pOper->rowData, tsDnodeUpdateSize);
+  pOper->pObj = pDnode;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeDnodeActionRestored() {
+  int32_t numOfRows = sdbGetNumOfRows(tsDnodeSdb);
+  if (numOfRows <= 0 && dnodeIsFirstDeploy()) {
+    mInfo("dnode first deploy, create dnode:%s", tsLocalEp);
+    mnodeCreateDnode(tsLocalEp, NULL);
+    SDnodeObj *pDnode = mnodeGetDnodeByEp(tsLocalEp);
+    if (pDnode != NULL) {
+      mnodeAddMnode(pDnode->dnodeId);
+      mnodeDecDnodeRef(pDnode);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeInitDnodes() {
+  SDnodeObj tObj;
+  tsDnodeUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_DNODE,
+    .tableName    = "dnodes",
+    .hashSessions = TSDB_DEFAULT_DNODES_HASH_SIZE,
+    .maxRowSize   = tsDnodeUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_AUTO,
+    .insertFp     = mnodeDnodeActionInsert,
+    .deleteFp     = mnodeDnodeActionDelete,
+    .updateFp     = mnodeDnodeActionUpdate,
+    .encodeFp     = mnodeDnodeActionEncode,
+    .decodeFp     = mnodeDnodeActionDecode,
+    .destroyFp    = mnodeDnodeActionDestroy,
+    .restoredFp   = mnodeDnodeActionRestored
+  };
+
+  tsDnodeSdb = sdbOpenTable(&tableDesc);
+  if (tsDnodeSdb == NULL) {
+    mError("failed to init dnodes data");
+    return -1;
+  }
+
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_CREATE_DNODE, mnodeProcessCreateDnodeMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_DROP_DNODE, mnodeProcessDropDnodeMsg); 
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_CONFIG_DNODE, mnodeProcessCfgDnodeMsg);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP, mnodeProcessCfgDnodeMsgRsp);
+  mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_STATUS, mnodeProcessDnodeStatusMsg);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_MODULE, mnodeGetModuleMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_MODULE, mnodeRetrieveModules);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_VARIABLES, mnodeGetConfigMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_VARIABLES, mnodeRetrieveConfigs);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_VNODES, mnodeGetVnodeMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_VNODES, mnodeRetrieveVnodes);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_DNODE, mnodeGetDnodeMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_DNODE, mnodeRetrieveDnodes);
+ 
+  mDebug("table:dnodes table is created");
+  return 0;
+}
+
+void mnodeCleanupDnodes() {
+  sdbCloseTable(tsDnodeSdb);
+  tsDnodeSdb = NULL;
+}
+
+void *mnodeGetNextDnode(void *pIter, SDnodeObj **pDnode) { 
+  return sdbFetchRow(tsDnodeSdb, pIter, (void **)pDnode); 
+}
+
+int32_t mnodeGetDnodesNum() {
+  return sdbGetNumOfRows(tsDnodeSdb);
+}
+
+int32_t mnodeGetOnlinDnodesCpuCoreNum() {
+  SDnodeObj *pDnode = NULL;
+  void *     pIter = NULL;
+  int32_t    cpuCores = 0;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (pDnode->status != TAOS_DN_STATUS_OFFLINE) {
+      cpuCores += pDnode->numOfCores;
+    }
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  if (cpuCores < 2) cpuCores = 2;
+  return cpuCores;
+}
+
+int32_t mnodeGetOnlineDnodesNum() {
+  SDnodeObj *pDnode = NULL;
+  void *     pIter = NULL;
+  int32_t    onlineDnodes = 0;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (pDnode->status != TAOS_DN_STATUS_OFFLINE) onlineDnodes++;
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  return onlineDnodes;
+}
+
+void *mnodeGetDnode(int32_t dnodeId) {
+  return sdbGetRow(tsDnodeSdb, &dnodeId);
+}
+
+void *mnodeGetDnodeByEp(char *ep) {
+  SDnodeObj *pDnode = NULL;
+  void *     pIter = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (strcmp(ep, pDnode->dnodeEp) == 0) {
+      sdbFreeIter(pIter);
+      return pDnode;
+    }
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  return NULL;
+}
+
+void mnodeIncDnodeRef(SDnodeObj *pDnode) {
+  sdbIncRef(tsDnodeSdb, pDnode);
+}
+
+void mnodeDecDnodeRef(SDnodeObj *pDnode) {
+  sdbDecRef(tsDnodeSdb, pDnode);
+}
+
+void mnodeUpdateDnode(SDnodeObj *pDnode) {
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsDnodeSdb,
+    .pObj = pDnode
+  };
+
+  int32_t code = sdbUpdateRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("dnodeId:%d, failed update", pDnode->dnodeId);
+  }
+}
+
+static int32_t mnodeProcessCfgDnodeMsg(SMnodeMsg *pMsg) {
+  if (strcmp(pMsg->pUser->user, TSDB_DEFAULT_USER) != 0) {
+    mError("failed to cfg dnode, no rights");
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+  
+  SCMCfgDnodeMsg *pCmCfgDnode = pMsg->rpcMsg.pCont;
+  if (pCmCfgDnode->ep[0] == 0) {
+    tstrncpy(pCmCfgDnode->ep, tsLocalEp, TSDB_EP_LEN);
+  }
+
+  SDnodeObj *pDnode = mnodeGetDnodeByEp(pCmCfgDnode->ep);
+  if (pDnode == NULL) {
+    int32_t dnodeId = strtol(pCmCfgDnode->ep, NULL, 10);
+    if (dnodeId <= 0 || dnodeId > 65536) {
+      mError("failed to cfg dnode, invalid dnodeEp:%s", pCmCfgDnode->ep);
+      return TSDB_CODE_MND_DNODE_NOT_EXIST;
+    }
+
+    pDnode = mnodeGetDnode(dnodeId);
+    if (pDnode == NULL) {
+      mError("failed to cfg dnode, invalid dnodeId:%d", dnodeId);
+      return TSDB_CODE_MND_DNODE_NOT_EXIST;
+    }
+  }
+
+  SRpcEpSet epSet = mnodeGetEpSetFromIp(pDnode->dnodeEp);
+
+  if (strncasecmp(pCmCfgDnode->config, "balance", 7) == 0) {
+    int32_t vnodeId = 0;
+    int32_t dnodeId = 0;
+    bool parseOk = taosCheckBalanceCfgOptions(pCmCfgDnode->config + 8, &vnodeId, &dnodeId);
+    if (!parseOk) {
+      mnodeDecDnodeRef(pDnode);
+      return TSDB_CODE_MND_INVALID_DNODE_CFG_OPTION;
+    }
+
+    int32_t code = balanceAlterDnode(pDnode, vnodeId, dnodeId);
+    mnodeDecDnodeRef(pDnode);
+    return code;
+  } else {
+    SMDCfgDnodeMsg *pMdCfgDnode = rpcMallocCont(sizeof(SMDCfgDnodeMsg));
+    strcpy(pMdCfgDnode->ep, pCmCfgDnode->ep);
+    strcpy(pMdCfgDnode->config, pCmCfgDnode->config);
+
+    SRpcMsg rpcMdCfgDnodeMsg = {
+      .ahandle = 0,
+      .code = 0,
+      .msgType = TSDB_MSG_TYPE_MD_CONFIG_DNODE,
+      .pCont = pMdCfgDnode,
+      .contLen = sizeof(SMDCfgDnodeMsg)
+    };
+
+    mInfo("dnode:%s, is configured by %s", pCmCfgDnode->ep, pMsg->pUser->user);
+    dnodeSendMsgToDnode(&epSet, &rpcMdCfgDnodeMsg);
+    mnodeDecDnodeRef(pDnode);
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static void mnodeProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) {
+  mInfo("cfg dnode rsp is received");
+}
+
+static int32_t mnodeCheckClusterCfgPara(const SClusterCfg *clusterCfg) {
+  if (clusterCfg->numOfMnodes != htonl(tsNumOfMnodes)) {
+    mError("\"numOfMnodes\"[%d - %d] cfg parameters inconsistent", clusterCfg->numOfMnodes, htonl(tsNumOfMnodes));
+    return TAOS_DN_OFF_NUM_OF_MNODES_NOT_MATCH;
+  }
+  if (clusterCfg->enableBalance != htonl(tsEnableBalance)) {
+    mError("\"balance\"[%d - %d] cfg parameters inconsistent", clusterCfg->enableBalance, htonl(tsEnableBalance));
+    return TAOS_DN_OFF_ENABLE_BALANCE_NOT_MATCH;
+  }
+  if (clusterCfg->mnodeEqualVnodeNum != htonl(tsMnodeEqualVnodeNum)) {
+    mError("\"mnodeEqualVnodeNum\"[%d - %d] cfg parameters inconsistent", clusterCfg->mnodeEqualVnodeNum,
+           htonl(tsMnodeEqualVnodeNum));
+    return TAOS_DN_OFF_MN_EQUAL_VN_NOT_MATCH;
+  }
+  if (clusterCfg->offlineThreshold != htonl(tsOfflineThreshold)) {
+    mError("\"offlineThreshold\"[%d - %d] cfg parameters inconsistent", clusterCfg->offlineThreshold,
+           htonl(tsOfflineThreshold));
+    return TAOS_DN_OFF_OFFLINE_THRESHOLD_NOT_MATCH;
+  }
+  if (clusterCfg->statusInterval != htonl(tsStatusInterval)) {
+    mError("\"statusInterval\"[%d - %d] cfg parameters inconsistent", clusterCfg->statusInterval,
+           htonl(tsStatusInterval));
+    return TAOS_DN_OFF_STATUS_INTERVAL_NOT_MATCH;
+  }
+  if (clusterCfg->maxtablesPerVnode != htonl(tsMaxTablePerVnode)) {
+    mError("\"maxTablesPerVnode\"[%d - %d] cfg parameters inconsistent", clusterCfg->maxtablesPerVnode,
+           htonl(tsMaxTablePerVnode));
+    return TAOS_DN_OFF_MAX_TAB_PER_VN_NOT_MATCH;
+  }
+  if (clusterCfg->maxVgroupsPerDb != htonl(tsMaxVgroupsPerDb)) {
+    mError("\"maxVgroupsPerDb\"[%d - %d]  cfg parameters inconsistent", clusterCfg->maxVgroupsPerDb,
+           htonl(tsMaxVgroupsPerDb));
+    return TAOS_DN_OFF_MAX_VG_PER_DB_NOT_MATCH;
+  }
+  if (0 != strncasecmp(clusterCfg->arbitrator, tsArbitrator, strlen(tsArbitrator))) {
+    mError("\"arbitrator\"[%s - %s]  cfg parameters inconsistent", clusterCfg->arbitrator, tsArbitrator);
+    return TAOS_DN_OFF_ARBITRATOR_NOT_MATCH;
+  }
+
+  int64_t checkTime = 0;
+  char    timestr[32] = "1970-01-01 00:00:00.00";
+  (void)taosParseTime(timestr, &checkTime, strlen(timestr), TSDB_TIME_PRECISION_MILLI, 0);
+  if ((0 != strncasecmp(clusterCfg->timezone, tsTimezone, strlen(tsTimezone))) &&
+      (checkTime != clusterCfg->checkTime)) {
+    mError("\"timezone\"[%s - %s] [%" PRId64 " - %" PRId64 "] cfg parameters inconsistent", clusterCfg->timezone,
+           tsTimezone, clusterCfg->checkTime, checkTime);
+    return TAOS_DN_OFF_TIME_ZONE_NOT_MATCH;
+  }
+
+  if (0 != strncasecmp(clusterCfg->locale, tsLocale, strlen(tsLocale))) {
+    mError("\"locale\"[%s - %s]  cfg parameters inconsistent", clusterCfg->locale, tsLocale);
+    return TAOS_DN_OFF_LOCALE_NOT_MATCH;
+  }
+  if (0 != strncasecmp(clusterCfg->charset, tsCharset, strlen(tsCharset))) {
+    mError("\"charset\"[%s - %s] cfg parameters inconsistent.", clusterCfg->charset, tsCharset);
+    return TAOS_DN_OFF_CHARSET_NOT_MATCH;
+  }
+
+  return 0;
+}
+
+static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
+  SDnodeObj *pDnode     = NULL;
+  SDMStatusMsg *pStatus = pMsg->rpcMsg.pCont;
+  pStatus->dnodeId      = htonl(pStatus->dnodeId);
+  pStatus->moduleStatus = htonl(pStatus->moduleStatus);
+  pStatus->lastReboot   = htonl(pStatus->lastReboot);
+  pStatus->numOfCores   = htons(pStatus->numOfCores);
+
+  uint32_t version = htonl(pStatus->version);
+  if (version != tsVersion) {
+    pDnode = mnodeGetDnodeByEp(pStatus->dnodeEp);
+    if (pDnode != NULL && pDnode->status != TAOS_DN_STATUS_READY) {
+      pDnode->offlineReason = TAOS_DN_OFF_VERSION_NOT_MATCH;
+    }
+    mError("dnode:%d, status msg version:%d not equal with cluster:%d", pStatus->dnodeId, version, tsVersion);
+    return TSDB_CODE_MND_INVALID_MSG_VERSION;
+  }
+
+  if (pStatus->dnodeId == 0) {
+    pDnode = mnodeGetDnodeByEp(pStatus->dnodeEp);
+    if (pDnode == NULL) {
+      mDebug("dnode %s not created", pStatus->dnodeEp);
+      return TSDB_CODE_MND_DNODE_NOT_EXIST;
+    }
+  } else {
+    pDnode = mnodeGetDnode(pStatus->dnodeId);
+    if (pDnode == NULL) {
+      pDnode = mnodeGetDnodeByEp(pStatus->dnodeEp);
+      if (pDnode != NULL && pDnode->status != TAOS_DN_STATUS_READY) {
+        pDnode->offlineReason = TAOS_DN_OFF_DNODE_ID_NOT_MATCH;
+      }
+      mError("dnode:%d, %s not exist", pStatus->dnodeId, pStatus->dnodeEp);
+      return TSDB_CODE_MND_DNODE_NOT_EXIST;
+    }
+  }
+
+  pDnode->lastReboot       = pStatus->lastReboot;
+  pDnode->numOfCores       = pStatus->numOfCores;
+  pDnode->diskAvailable    = pStatus->diskAvailable;
+  pDnode->alternativeRole  = pStatus->alternativeRole;
+  pDnode->moduleStatus     = pStatus->moduleStatus;
+
+  if (pStatus->dnodeId == 0) {
+    mDebug("dnode:%d %s, first access, set clusterId %s", pDnode->dnodeId, pDnode->dnodeEp, mnodeGetClusterId());
+  } else {
+    if (strncmp(pStatus->clusterId, mnodeGetClusterId(), TSDB_CLUSTER_ID_LEN - 1) != 0) {
+      if (pDnode != NULL && pDnode->status != TAOS_DN_STATUS_READY) {
+        pDnode->offlineReason = TAOS_DN_OFF_CLUSTER_ID_NOT_MATCH;
+      }
+      mError("dnode:%d, input clusterId %s not match with exist %s", pDnode->dnodeId, pStatus->clusterId,
+             mnodeGetClusterId());
+      return TSDB_CODE_MND_INVALID_CLUSTER_ID;
+    } else {
+      mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess);
+    }
+  }
+
+  int32_t openVnodes = htons(pStatus->openVnodes);
+  int32_t contLen = sizeof(SDMStatusRsp) + openVnodes * sizeof(SDMVgroupAccess);
+  SDMStatusRsp *pRsp = rpcMallocCont(contLen);
+  if (pRsp == NULL) {
+    mnodeDecDnodeRef(pDnode);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  pRsp->dnodeCfg.dnodeId = htonl(pDnode->dnodeId);
+  pRsp->dnodeCfg.moduleStatus = htonl((int32_t)pDnode->isMgmt);
+  pRsp->dnodeCfg.numOfVnodes = htonl(openVnodes);
+  tstrncpy(pRsp->dnodeCfg.clusterId, mnodeGetClusterId(), TSDB_CLUSTER_ID_LEN);
+  SDMVgroupAccess *pAccess = (SDMVgroupAccess *)((char *)pRsp + sizeof(SDMStatusRsp));
+
+  for (int32_t j = 0; j < openVnodes; ++j) {
+    SVnodeLoad *pVload = &pStatus->load[j];
+    pVload->vgId = htonl(pVload->vgId);
+    pVload->cfgVersion = htonl(pVload->cfgVersion);
+
+    SVgObj *pVgroup = mnodeGetVgroup(pVload->vgId);
+    if (pVgroup == NULL) {
+      SRpcEpSet epSet = mnodeGetEpSetFromIp(pDnode->dnodeEp);
+      mInfo("dnode:%d, vgId:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId);
+      mnodeSendDropVnodeMsg(pVload->vgId, &epSet, NULL);
+    } else {
+      mnodeUpdateVgroupStatus(pVgroup, pDnode, pVload);
+      pAccess->vgId = htonl(pVload->vgId);
+      pAccess->accessState = pVgroup->accessState;
+      pAccess++;
+      mnodeDecVgroupRef(pVgroup);
+    }
+  }
+
+  if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+    // Verify whether the cluster parameters are consistent when status change from offline to ready
+    int32_t ret = mnodeCheckClusterCfgPara(&(pStatus->clusterCfg));
+    if (0 != ret) {
+      pDnode->offlineReason = ret;
+      mnodeDecDnodeRef(pDnode);
+      rpcFreeCont(pRsp);
+      mError("dnode:%d, %s cluster cfg parameters inconsistent, reason:%s", pDnode->dnodeId, pStatus->dnodeEp,
+             offlineReason[ret]);
+      return TSDB_CODE_MND_CLUSTER_CFG_INCONSISTENT;
+    }
+
+    mDebug("dnode:%d, from offline to online", pDnode->dnodeId);
+    pDnode->status = TAOS_DN_STATUS_READY;
+    pDnode->offlineReason = TAOS_DN_OFF_ONLINE;
+    balanceSyncNotify();
+    balanceAsyncNotify();
+  }
+
+  if (openVnodes != pDnode->openVnodes) {
+    mnodeCheckUnCreatedVgroup(pDnode, pStatus->load, openVnodes);
+  }
+
+  pDnode->lastAccess = tsAccessSquence;
+
+  //this func should be called after sdb replica changed
+  mnodeGetMnodeInfos(&pRsp->mnodes);
+  
+  mnodeDecDnodeRef(pDnode);
+
+  pMsg->rpcRsp.len = contLen;
+  pMsg->rpcRsp.rsp =  pRsp;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeCreateDnode(char *ep, SMnodeMsg *pMsg) {
+  int32_t grantCode = grantCheck(TSDB_GRANT_DNODE);
+  if (grantCode != TSDB_CODE_SUCCESS) {
+    return grantCode;
+  }
+
+  char dnodeEp[TSDB_EP_LEN] = {0};
+  tstrncpy(dnodeEp, ep, TSDB_EP_LEN);
+  strtrim(dnodeEp);
+
+  char *temp = strchr(dnodeEp, ':');
+  if (!temp) {
+    int len = strlen(dnodeEp);
+    if (dnodeEp[len - 1] == ';') dnodeEp[len - 1] = 0;
+    len = strlen(dnodeEp);
+    snprintf(dnodeEp + len, TSDB_EP_LEN - len, ":%d", tsServerPort);
+  }
+  ep = dnodeEp;
+
+  SDnodeObj *pDnode = mnodeGetDnodeByEp(ep);
+  if (pDnode != NULL) {
+    mnodeDecDnodeRef(pDnode);
+    mError("dnode:%d, already exist, %s:%d", pDnode->dnodeId, pDnode->dnodeFqdn, pDnode->dnodePort);
+    return TSDB_CODE_MND_DNODE_ALREADY_EXIST;
+  }
+
+  pDnode = (SDnodeObj *) calloc(1, sizeof(SDnodeObj));
+  pDnode->createdTime = taosGetTimestampMs();
+  pDnode->status = TAOS_DN_STATUS_OFFLINE; 
+  pDnode->offlineReason = TAOS_DN_OFF_STATUS_NOT_RECEIVED;
+  tstrncpy(pDnode->dnodeEp, ep, TSDB_EP_LEN);
+  taosGetFqdnPortFromEp(ep, pDnode->dnodeFqdn, &pDnode->dnodePort);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsDnodeSdb,
+    .pObj = pDnode,
+    .rowSize = sizeof(SDnodeObj),
+    .pMsg = pMsg
+  };
+
+  int32_t code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    int dnodeId = pDnode->dnodeId;
+    taosTFree(pDnode);
+    mError("failed to create dnode:%d, reason:%s", dnodeId, tstrerror(code));
+  } else {
+    mLInfo("dnode:%d is created", pDnode->dnodeId);
+  }
+
+  return code;
+}
+
+int32_t mnodeDropDnode(SDnodeObj *pDnode, void *pMsg) {
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsDnodeSdb,
+    .pObj = pDnode,
+    .pMsg = pMsg
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("dnode:%d, failed to drop from cluster, result:%s", pDnode->dnodeId, tstrerror(code));
+  } else {
+    mLInfo("dnode:%d, is dropped from cluster", pDnode->dnodeId);
+  }
+
+  return code;
+}
+
+static int32_t mnodeDropDnodeByEp(char *ep, SMnodeMsg *pMsg) {
+  SDnodeObj *pDnode = mnodeGetDnodeByEp(ep);
+  if (pDnode == NULL) {
+    int32_t dnodeId = (int32_t)strtol(ep, NULL, 10);
+    pDnode = mnodeGetDnode(dnodeId);
+    if (pDnode == NULL) {
+      mError("dnode:%s, is not exist", ep);
+      return TSDB_CODE_MND_DNODE_NOT_EXIST;
+    }
+  }
+
+  if (strcmp(pDnode->dnodeEp, mnodeGetMnodeMasterEp()) == 0) {
+    mError("dnode:%d, can't drop dnode:%s which is master", pDnode->dnodeId, ep);
+    mnodeDecDnodeRef(pDnode);
+    return TSDB_CODE_MND_NO_REMOVE_MASTER;
+  }
+
+  mInfo("dnode:%d, start to drop it", pDnode->dnodeId);
+
+#ifndef _SYNC
+  int32_t code = mnodeDropDnode(pDnode, pMsg);
+#else
+  int32_t code = balanceDropDnode(pDnode);
+#endif  
+  mnodeDecDnodeRef(pDnode);
+  return code;
+}
+
+static int32_t mnodeProcessCreateDnodeMsg(SMnodeMsg *pMsg) {
+  SCMCreateDnodeMsg *pCreate = pMsg->rpcMsg.pCont;
+
+  if (strcmp(pMsg->pUser->user, TSDB_DEFAULT_USER) != 0) {
+    return TSDB_CODE_MND_NO_RIGHTS;
+  } else {
+    return mnodeCreateDnode(pCreate->ep, pMsg);
+  }
+}
+
+static int32_t mnodeProcessDropDnodeMsg(SMnodeMsg *pMsg) {
+  SCMDropDnodeMsg *pDrop = pMsg->rpcMsg.pCont;
+
+  if (strcmp(pMsg->pUser->user, TSDB_DEFAULT_USER) != 0) {
+    return TSDB_CODE_MND_NO_RIGHTS;
+  } else {
+    return mnodeDropDnodeByEp(pDrop->ep, pMsg);
+  }
+}
+
+static int32_t mnodeGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  if (strcmp(pUser->pAcct->user, TSDB_DEFAULT_USER) != 0) {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  int32_t  cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "end_point");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "vnodes");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "cores");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 10 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 5 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "role");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "create_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "offline reason");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = mnodeGetDnodesNum();
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = NULL;
+
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t    numOfRows = 0;
+  int32_t    cols      = 0;
+  SDnodeObj *pDnode   = NULL;
+  char      *pWrite;
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextDnode(pShow->pIter, &pDnode);
+    if (pDnode == NULL) break;
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pDnode->dnodeId;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDnode->dnodeEp, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pDnode->openVnodes;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pDnode->numOfCores;
+    cols++;
+    
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  
+    char* status = mnodeGetDnodeStatusStr(pDnode->status);
+    STR_TO_VARSTR(pWrite, status);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  
+    char* role = mnodeGetDnodeAlternativeRoleStr(pDnode->alternativeRole);
+    STR_TO_VARSTR(pWrite, role);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pDnode->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_TO_VARSTR(pWrite, offlineReason[pDnode->offlineReason]);
+    cols++;
+
+     numOfRows++;
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+static bool mnodeCheckModuleInDnode(SDnodeObj *pDnode, int32_t moduleType) {
+  uint32_t status = pDnode->moduleStatus & (1u << moduleType);
+  return status > 0;
+}
+
+static int32_t mnodeGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  int32_t cols = 0;
+
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0)  {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "end_point");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "module");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = mnodeGetDnodesNum() * TSDB_MOD_MAX;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = NULL;
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+int32_t mnodeRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t numOfRows = 0;
+
+  char* pWrite;
+  char* moduleName[5] = { "MNODE", "HTTP", "MONITOR", "MQTT", "UNKNOWN" };
+
+  while (numOfRows < rows) {
+    SDnodeObj *pDnode = NULL;
+    pShow->pIter = mnodeGetNextDnode(pShow->pIter, (SDnodeObj **)&pDnode);
+    if (pDnode == NULL) break;
+
+    for (int32_t moduleType = 0; moduleType < TSDB_MOD_MAX; ++moduleType) {
+      int32_t cols = 0;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int16_t *)pWrite = pDnode->dnodeId;
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDnode->dnodeEp, pShow->bytes[cols] - 1);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, moduleName[moduleType], pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      bool enable = mnodeCheckModuleInDnode(pDnode, moduleType);
+
+      char* v = enable? "enable":"disable";
+      STR_TO_VARSTR(pWrite, v);
+      cols++;
+
+      numOfRows++;
+    }
+
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+static bool mnodeCheckConfigShow(SGlobalCfg *cfg) {
+  if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_SHOW))
+    return false;
+  return true;
+}
+
+static int32_t mnodeGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  int32_t cols = 0;
+
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0)  {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = TSDB_CFG_OPTION_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  tstrncpy(pSchema[cols].name, "name", sizeof(pSchema[cols].name));
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_CFG_VALUE_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  tstrncpy(pSchema[cols].name, "value", sizeof(pSchema[cols].name));
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+
+  pShow->numOfRows = 0;
+  for (int32_t i = tsGlobalConfigNum - 1; i >= 0; --i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (!mnodeCheckConfigShow(cfg)) continue;
+    pShow->numOfRows++;
+  }
+
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = NULL;
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t numOfRows = 0;
+
+  for (int32_t i = tsGlobalConfigNum - 1; i >= 0 && numOfRows < rows; --i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (!mnodeCheckConfigShow(cfg)) continue;
+
+    char *pWrite;
+    int32_t   cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, cfg->option, TSDB_CFG_OPTION_LEN);
+
+    cols++;
+    int32_t t = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    switch (cfg->valType) {
+      case TAOS_CFG_VTYPE_INT16:
+        t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%d", *((int16_t *)cfg->ptr));
+        varDataSetLen(pWrite, t);
+        numOfRows++;
+        break;
+      case TAOS_CFG_VTYPE_INT32:
+        t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%d", *((int32_t *)cfg->ptr));
+        varDataSetLen(pWrite, t);
+        numOfRows++;
+        break;
+      case TAOS_CFG_VTYPE_FLOAT:
+        t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%f", *((float *)cfg->ptr));
+        varDataSetLen(pWrite, t);
+        numOfRows++;
+        break;
+      case TAOS_CFG_VTYPE_STRING:
+      case TAOS_CFG_VTYPE_IPSTR:
+      case TAOS_CFG_VTYPE_DIRECTORY:
+        STR_WITH_MAXSIZE_TO_VARSTR(pWrite, cfg->ptr, TSDB_CFG_VALUE_LEN);
+        numOfRows++;
+        break;
+      default:
+        break;
+    }
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+static int32_t mnodeGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  int32_t cols = 0;
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+  
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0)  {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "vnode");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+
+  SDnodeObj *pDnode = NULL;
+  if (pShow->payloadLen > 0 ) {
+    pDnode = mnodeGetDnodeByEp(pShow->payload);
+  } else {
+    void *pIter = mnodeGetNextDnode(NULL, (SDnodeObj **)&pDnode);
+    sdbFreeIter(pIter);
+  }
+
+  if (pDnode != NULL) {
+    pShow->numOfRows += pDnode->openVnodes;
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = pDnode;
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t    numOfRows = 0;
+  SDnodeObj *pDnode = NULL;
+  char *     pWrite;
+  int32_t    cols = 0;
+
+  if (0 == rows) return 0;
+
+  pDnode = (SDnodeObj *)(pShow->pIter);
+  if (pDnode != NULL) {
+    void *pIter = NULL;
+    SVgObj *pVgroup;
+    while (1) {
+      pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+      if (pVgroup == NULL) break;
+
+      for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+        SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
+        if (pVgid->pDnode == pDnode) {
+          cols = 0;
+
+          pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+          *(uint32_t *)pWrite = pVgroup->vgId;
+          cols++;
+
+          pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+          strcpy(pWrite, mnodeGetMnodeRoleStr(pVgid->role));
+          cols++;
+        }
+      }
+
+      mnodeDecVgroupRef(pVgroup);
+    }
+    sdbFreeIter(pIter);
+  } else {
+    numOfRows = 0;
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+char* mnodeGetDnodeStatusStr(int32_t dnodeStatus) {
+  switch (dnodeStatus) {
+    case TAOS_DN_STATUS_OFFLINE:   return "offline";
+    case TAOS_DN_STATUS_DROPPING:  return "dropping";
+    case TAOS_DN_STATUS_BALANCING: return "balancing";
+    case TAOS_DN_STATUS_READY:     return "ready";
+    default:                       return "undefined";
+  }
+}
+
+static char* mnodeGetDnodeAlternativeRoleStr(int32_t alternativeRole) {
+  switch (alternativeRole) {
+    case TAOS_DN_ALTERNATIVE_ROLE_ANY: return "any";
+    case TAOS_DN_ALTERNATIVE_ROLE_MNODE: return "mnode";
+    case TAOS_DN_ALTERNATIVE_ROLE_VNODE: return "vnode";
+    default:return "any";
+  }
+}
+
+#ifndef _SYNC
+
+int32_t balanceInit() { return TSDB_CODE_SUCCESS; }
+void    balanceCleanUp() {}
+void    balanceAsyncNotify() {}
+void    balanceSyncNotify() {}
+void    balanceReset() {}
+int32_t balanceAlterDnode(struct SDnodeObj *pDnode, int32_t vnodeId, int32_t dnodeId) { return TSDB_CODE_SYN_NOT_ENABLED; }
+
+char* syncRole[] = {
+  "offline",
+  "unsynced",
+  "syncing",
+  "slave",
+  "master"
+};
+
+int32_t balanceAllocVnodes(SVgObj *pVgroup) {
+  void *     pIter = NULL;
+  SDnodeObj *pDnode = NULL;
+  SDnodeObj *pSelDnode = NULL;
+  float      vnodeUsage = 1000.0;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+
+    if (pDnode->numOfCores > 0 && pDnode->openVnodes < TSDB_MAX_VNODES) {
+      float openVnodes = pDnode->openVnodes;
+      if (pDnode->isMgmt) openVnodes += tsMnodeEqualVnodeNum;
+
+      float usage = openVnodes / pDnode->numOfCores;
+      if (usage <= vnodeUsage) {
+        pSelDnode = pDnode;
+        vnodeUsage = usage;
+      }
+    }
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  sdbFreeIter(pIter);
+
+  if (pSelDnode == NULL) {
+    mError("failed to alloc vnode to vgroup");
+    return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+  }
+
+  pVgroup->vnodeGid[0].dnodeId = pSelDnode->dnodeId;
+  pVgroup->vnodeGid[0].pDnode = pSelDnode;
+
+  mDebug("dnode:%d, alloc one vnode to vgroup, openVnodes:%d", pSelDnode->dnodeId, pSelDnode->openVnodes);
+  return TSDB_CODE_SUCCESS;
+}
+
+#endif 
+
diff --git a/src/mnode/src/mnodeGrant.c b/src/mnode/src/mnodeGrant.c
new file mode 100644
index 0000000000000000000000000000000000000000..7329629ef92f61d29794807bd868cda354270548
--- /dev/null
+++ b/src/mnode/src/mnodeGrant.c
@@ -0,0 +1,31 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#ifndef _GRANT
+#include "os.h"
+#include "taoserror.h"
+#include "tgrant.h"
+#include "mnodeInt.h"
+
+int32_t grantInit() { return TSDB_CODE_SUCCESS; }
+void    grantCleanUp() {}
+void    grantParseParameter() { mError("can't parsed parameter k"); }
+int32_t grantCheck(EGrantType grant) { return TSDB_CODE_SUCCESS; }
+void    grantReset(EGrantType grant, uint64_t value) {}
+void    grantAdd(EGrantType grant, uint64_t value) {}
+void    grantRestore(EGrantType grant, uint64_t value) {}
+
+#endif
\ No newline at end of file
diff --git a/src/mnode/src/mnodeInt.c b/src/mnode/src/mnodeInt.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb1b8741a9f8895c579ad0e549dc8f3c15f7618c
--- /dev/null
+++ b/src/mnode/src/mnodeInt.c
@@ -0,0 +1,66 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "trpc.h"
+#include "tcache.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+
+void mnodeCreateMsg(SMnodeMsg *pMsg, SRpcMsg *rpcMsg) {
+  pMsg->rpcMsg = *rpcMsg;
+}
+
+int32_t mnodeInitMsg(SMnodeMsg *pMsg) {
+  if (pMsg->pUser != NULL) {
+    mDebug("app:%p:%p, user info already inited", pMsg->rpcMsg.ahandle, pMsg);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  pMsg->pUser = mnodeGetUserFromConn(pMsg->rpcMsg.handle);
+  if (pMsg->pUser == NULL) {
+    return TSDB_CODE_MND_INVALID_USER;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeCleanupMsg(SMnodeMsg *pMsg) {
+  if (pMsg != NULL) {
+    if (pMsg->rpcMsg.pCont) rpcFreeCont(pMsg->rpcMsg.pCont);
+    if (pMsg->pUser) mnodeDecUserRef(pMsg->pUser);
+    if (pMsg->pDb) mnodeDecDbRef(pMsg->pDb);
+    if (pMsg->pVgroup) mnodeDecVgroupRef(pMsg->pVgroup);
+    if (pMsg->pTable) mnodeDecTableRef(pMsg->pTable);
+    if (pMsg->pSTable) mnodeDecTableRef(pMsg->pSTable);
+    if (pMsg->pAcct) mnodeDecAcctRef(pMsg->pAcct);
+    if (pMsg->pDnode) mnodeDecDnodeRef(pMsg->pDnode);
+  }
+}
diff --git a/src/mnode/src/mnodeMain.c b/src/mnode/src/mnodeMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..d63a5758686f5db46926e1b3c1bc97becd53d8ae
--- /dev/null
+++ b/src/mnode/src/mnodeMain.c
@@ -0,0 +1,185 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tsched.h"
+#include "tbalance.h"
+#include "tgrant.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeDb.h"
+#include "mnodeSdb.h"
+#include "mnodeVgroup.h"
+#include "mnodeUser.h"
+#include "mnodeTable.h"
+#include "mnodeCluster.h"
+#include "mnodeShow.h"
+#include "mnodeProfile.h"
+
+typedef struct {
+  const char *const name;
+  int               (*init)();
+  void              (*cleanup)();
+} SMnodeComponent;
+
+void *tsMnodeTmr = NULL;
+static bool tsMgmtIsRunning = false;
+
+static const SMnodeComponent tsMnodeComponents[] = {
+  {"profile", mnodeInitProfile, mnodeCleanupProfile},
+  {"cluster", mnodeInitCluster, mnodeCleanupCluster},
+  {"accts",   mnodeInitAccts,   mnodeCleanupAccts},
+  {"users",   mnodeInitUsers,   mnodeCleanupUsers},
+  {"dnodes",  mnodeInitDnodes,  mnodeCleanupDnodes},
+  {"dbs",     mnodeInitDbs,     mnodeCleanupDbs},
+  {"vgroups", mnodeInitVgroups, mnodeCleanupVgroups},
+  {"tables",  mnodeInitTables,  mnodeCleanupTables},  
+  {"mnodes",  mnodeInitMnodes,  mnodeCleanupMnodes},
+  {"sdb",     sdbInit,          sdbCleanUp},
+  {"balance", balanceInit,      balanceCleanUp},
+  {"grant",   grantInit,        grantCleanUp},
+  {"show",    mnodeInitShow,    mnodeCleanUpShow}
+};
+
+static void mnodeInitTimer();
+static void mnodeCleanupTimer();
+static bool mnodeNeedStart() ;
+
+static void mnodeCleanupComponents(int32_t stepId) {
+  for (int32_t i = stepId; i >= 0; i--) {
+    tsMnodeComponents[i].cleanup();
+  }
+}
+
+static int32_t mnodeInitComponents() {
+  int32_t code = 0;
+  for (int32_t i = 0; i < sizeof(tsMnodeComponents) / sizeof(tsMnodeComponents[0]); i++) {
+    if (tsMnodeComponents[i].init() != 0) {
+      mnodeCleanupComponents(i);
+      code = -1;
+      break;
+    }
+  }
+  return code;
+}
+
+int32_t mnodeStartSystem() {
+  if (tsMgmtIsRunning) {
+    mInfo("mnode module already started...");
+    return 0;
+  }
+
+  mInfo("starting to initialize mnode ...");
+  if (mkdir(tsMnodeDir, 0755) != 0 && errno != EEXIST) {
+    mError("failed to init mnode dir:%s, reason:%s", tsMnodeDir, strerror(errno));
+    return -1;
+  }
+
+  dnodeAllocateMnodeWqueue();
+  dnodeAllocateMnodeRqueue();
+  dnodeAllocateMnodePqueue();
+
+  if (mnodeInitComponents() != 0) {
+    return -1;
+  }
+
+  grantReset(TSDB_GRANT_ALL, 0);
+  tsMgmtIsRunning = true;
+
+  mInfo("mnode is initialized successfully");
+
+  sdbUpdateSync();
+
+  return 0;
+}
+
+int32_t mnodeInitSystem() {
+  mnodeInitTimer();
+  if (mnodeNeedStart()) {
+    return mnodeStartSystem();
+  }
+  return 0;
+}
+
+void mnodeCleanupSystem() {
+  mInfo("starting to clean up mnode");
+  tsMgmtIsRunning = false;
+
+  dnodeFreeMnodeWqueue();
+  dnodeFreeMnodeRqueue();
+  dnodeFreeMnodePqueue();
+  mnodeCleanupTimer();
+  mnodeCleanupComponents(sizeof(tsMnodeComponents) / sizeof(tsMnodeComponents[0]) - 1);
+  
+  mInfo("mnode is cleaned up");
+}
+
+void mnodeStopSystem() {
+  if (sdbIsMaster()) {
+    mDebug("it is a master mnode, it could not be stopped");
+    return;
+  }
+  
+  mnodeCleanupSystem();
+
+  if (remove(tsMnodeDir) != 0) {
+    mInfo("failed to remove mnode file, reason:%s", strerror(errno));
+  } else {
+    mInfo("mnode file is removed");
+  }
+}
+
+static void mnodeInitTimer() {
+  if (tsMnodeTmr == NULL) {
+    tsMnodeTmr = taosTmrInit(tsMaxShellConns, 200, 3600000, "MND");
+  }
+}
+
+static void mnodeCleanupTimer() {
+  if (tsMnodeTmr != NULL) {
+    taosTmrCleanUp(tsMnodeTmr);
+    tsMnodeTmr = NULL;
+  }
+}
+
+static bool mnodeNeedStart() {
+  struct stat dirstat;
+  char mnodeFileName[TSDB_FILENAME_LEN * 2] = {0};
+  sprintf(mnodeFileName, "%s/wal/wal0", tsMnodeDir);
+
+  bool fileExist = (stat(mnodeFileName, &dirstat) == 0);
+  bool asMaster = (strcmp(tsFirst, tsLocalEp) == 0);
+
+  if (asMaster || fileExist) {
+    mDebug("mnode module start, asMaster:%d fileExist:%d", asMaster, fileExist);
+    return true;
+  } else {
+    mDebug("mnode module won't start, asMaster:%d fileExist:%d", asMaster, fileExist);
+    return false;
+  }
+}
+
+bool mnodeIsRunning() {
+  return tsMgmtIsRunning;
+}
diff --git a/src/mnode/src/mnodeMnode.c b/src/mnode/src/mnodeMnode.c
new file mode 100644
index 0000000000000000000000000000000000000000..bff84d8041cd1bb4ededbd48704a888763453059
--- /dev/null
+++ b/src/mnode/src/mnodeMnode.c
@@ -0,0 +1,420 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tglobal.h"
+#include "trpc.h"
+#include "tsync.h"
+#include "tbalance.h"
+#include "tutil.h"
+#include "tsocket.h"
+#include "tdataformat.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeMnode.h"
+#include "mnodeDnode.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeUser.h"
+
+static void *        tsMnodeSdb = NULL;
+static int32_t       tsMnodeUpdateSize = 0;
+static SRpcEpSet     tsMnodeEpSetForShell;
+static SRpcEpSet     tsMnodeEpSetForPeer;
+static SDMMnodeInfos tsMnodeInfos;
+static int32_t mnodeGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+
+#if defined(LINUX)
+  static pthread_rwlock_t         tsMnodeLock;
+  #define mnodeMnodeWrLock()      pthread_rwlock_wrlock(&tsMnodeLock)
+  #define mnodeMnodeRdLock()      pthread_rwlock_rdlock(&tsMnodeLock)
+  #define mnodeMnodeUnLock()      pthread_rwlock_unlock(&tsMnodeLock)
+  #define mnodeMnodeInitLock()    pthread_rwlock_init(&tsMnodeLock, NULL)
+  #define mnodeMnodeDestroyLock() pthread_rwlock_destroy(&tsMnodeLock)
+#else
+  static pthread_mutex_t          tsMnodeLock;
+  #define mnodeMnodeWrLock()      pthread_mutex_lock(&tsMnodeLock)
+  #define mnodeMnodeRdLock()      pthread_mutex_lock(&tsMnodeLock)
+  #define mnodeMnodeUnLock()      pthread_mutex_unlock(&tsMnodeLock)
+  #define mnodeMnodeInitLock()    pthread_mutex_init(&tsMnodeLock, NULL)
+  #define mnodeMnodeDestroyLock() pthread_mutex_destroy(&tsMnodeLock)
+#endif
+
+static int32_t mnodeMnodeActionDestroy(SSdbOper *pOper) {
+  taosTFree(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionInsert(SSdbOper *pOper) {
+  SMnodeObj *pMnode = pOper->pObj;
+  SDnodeObj *pDnode = mnodeGetDnode(pMnode->mnodeId);
+  if (pDnode == NULL) return TSDB_CODE_MND_DNODE_NOT_EXIST;
+
+  pDnode->isMgmt = true;
+  mnodeDecDnodeRef(pDnode);
+  
+  mInfo("mnode:%d, fqdn:%s ep:%s port:%d, do insert action", pMnode->mnodeId, pDnode->dnodeFqdn, pDnode->dnodeEp, pDnode->dnodePort);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionDelete(SSdbOper *pOper) {
+  SMnodeObj *pMnode = pOper->pObj;
+
+  SDnodeObj *pDnode = mnodeGetDnode(pMnode->mnodeId);
+  if (pDnode == NULL) return TSDB_CODE_MND_DNODE_NOT_EXIST;
+  pDnode->isMgmt = false;
+  mnodeDecDnodeRef(pDnode);
+
+  mDebug("mnode:%d, is dropped from sdb", pMnode->mnodeId);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionUpdate(SSdbOper *pOper) {
+  SMnodeObj *pMnode = pOper->pObj;
+  SMnodeObj *pSaved = mnodeGetMnode(pMnode->mnodeId);
+  if (pMnode != pSaved) {
+    memcpy(pSaved, pMnode, pOper->rowSize);
+    free(pMnode);
+  }
+  mnodeDecMnodeRef(pSaved);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionEncode(SSdbOper *pOper) {
+  SMnodeObj *pMnode = pOper->pObj;
+  memcpy(pOper->rowData, pMnode, tsMnodeUpdateSize);
+  pOper->rowSize = tsMnodeUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionDecode(SSdbOper *pOper) {
+  SMnodeObj *pMnode = calloc(1, sizeof(SMnodeObj));
+  if (pMnode == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pMnode, pOper->rowData, tsMnodeUpdateSize);
+  pOper->pObj = pMnode;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeMnodeActionRestored() {
+  if (mnodeGetMnodesNum() == 1) {
+    SMnodeObj *pMnode = NULL;
+    void *pIter = mnodeGetNextMnode(NULL, &pMnode);
+    if (pMnode != NULL) {
+      pMnode->role = TAOS_SYNC_ROLE_MASTER;
+      mnodeDecMnodeRef(pMnode);
+    }
+    sdbFreeIter(pIter);
+  }
+
+  mnodeUpdateMnodeEpSet();
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeInitMnodes() {
+  mnodeMnodeInitLock();
+
+  SMnodeObj tObj;
+  tsMnodeUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_MNODE,
+    .tableName    = "mnodes",
+    .hashSessions = TSDB_DEFAULT_MNODES_HASH_SIZE,
+    .maxRowSize   = tsMnodeUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_INT,
+    .insertFp     = mnodeMnodeActionInsert,
+    .deleteFp     = mnodeMnodeActionDelete,
+    .updateFp     = mnodeMnodeActionUpdate,
+    .encodeFp     = mnodeMnodeActionEncode,
+    .decodeFp     = mnodeMnodeActionDecode,
+    .destroyFp    = mnodeMnodeActionDestroy,
+    .restoredFp   = mnodeMnodeActionRestored
+  };
+
+  tsMnodeSdb = sdbOpenTable(&tableDesc);
+  if (tsMnodeSdb == NULL) {
+    mError("failed to init mnodes data");
+    return -1;
+  }
+
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_MNODE, mnodeGetMnodeMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_MNODE, mnodeRetrieveMnodes);
+
+  mDebug("table:mnodes table is created");
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeCleanupMnodes() {
+  sdbCloseTable(tsMnodeSdb);
+  tsMnodeSdb = NULL;
+  mnodeMnodeDestroyLock();
+}
+
+int32_t mnodeGetMnodesNum() { 
+  return sdbGetNumOfRows(tsMnodeSdb); 
+}
+
+void *mnodeGetMnode(int32_t mnodeId) {
+  return sdbGetRow(tsMnodeSdb, &mnodeId);
+}
+
+void mnodeIncMnodeRef(SMnodeObj *pMnode) {
+  sdbIncRef(tsMnodeSdb, pMnode);
+}
+
+void mnodeDecMnodeRef(SMnodeObj *pMnode) {
+  sdbDecRef(tsMnodeSdb, pMnode);
+}
+
+void *mnodeGetNextMnode(void *pIter, SMnodeObj **pMnode) { 
+  return sdbFetchRow(tsMnodeSdb, pIter, (void **)pMnode); 
+}
+
+char *mnodeGetMnodeRoleStr(int32_t role) {
+  return syncRole[role];
+}
+
+void mnodeUpdateMnodeEpSet() {
+  mInfo("update mnodes epSet, numOfEps:%d ", mnodeGetMnodesNum());
+
+  mnodeMnodeWrLock();
+
+  memset(&tsMnodeEpSetForShell, 0, sizeof(SRpcEpSet));
+  memset(&tsMnodeEpSetForPeer, 0, sizeof(SRpcEpSet));
+  memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos));
+
+  int32_t index = 0;
+  void *  pIter = NULL;
+  while (1) {
+    SMnodeObj *pMnode = NULL;
+    pIter = mnodeGetNextMnode(pIter, &pMnode);
+    if (pMnode == NULL) break;
+
+    SDnodeObj *pDnode = mnodeGetDnode(pMnode->mnodeId);
+    if (pDnode != NULL) {
+      strcpy(tsMnodeEpSetForShell.fqdn[index], pDnode->dnodeFqdn);
+      tsMnodeEpSetForShell.port[index] = htons(pDnode->dnodePort);
+      mDebug("mnode:%d, for shell fqdn:%s %d", pDnode->dnodeId, tsMnodeEpSetForShell.fqdn[index], htons(tsMnodeEpSetForShell.port[index]));      
+
+      strcpy(tsMnodeEpSetForPeer.fqdn[index], pDnode->dnodeFqdn);
+      tsMnodeEpSetForPeer.port[index] = htons(pDnode->dnodePort + TSDB_PORT_DNODEDNODE);
+      mDebug("mnode:%d, for peer fqdn:%s %d", pDnode->dnodeId, tsMnodeEpSetForPeer.fqdn[index], htons(tsMnodeEpSetForPeer.port[index]));
+
+      tsMnodeInfos.nodeInfos[index].nodeId = htonl(pMnode->mnodeId);
+      strcpy(tsMnodeInfos.nodeInfos[index].nodeEp, pDnode->dnodeEp);
+
+      if (pMnode->role == TAOS_SYNC_ROLE_MASTER) {
+        tsMnodeEpSetForShell.inUse = index;
+        tsMnodeEpSetForPeer.inUse = index;
+        tsMnodeInfos.inUse = index;
+      }
+
+      mInfo("mnode:%d, ep:%s %s", pDnode->dnodeId, pDnode->dnodeEp, pMnode->role == TAOS_SYNC_ROLE_MASTER ? "master" : "");
+      index++;
+    }
+
+    mnodeDecDnodeRef(pDnode);
+    mnodeDecMnodeRef(pMnode);
+  }
+
+  tsMnodeInfos.nodeNum = index;
+  tsMnodeEpSetForShell.numOfEps = index;
+  tsMnodeEpSetForPeer.numOfEps = index;
+
+  sdbFreeIter(pIter);
+
+  mnodeMnodeUnLock();
+}
+
+void mnodeGetMnodeEpSetForPeer(SRpcEpSet *epSet) {
+  mnodeMnodeRdLock();
+  *epSet = tsMnodeEpSetForPeer;
+  mnodeMnodeUnLock();
+}
+
+void mnodeGetMnodeEpSetForShell(SRpcEpSet *epSet) {
+  mnodeMnodeRdLock();
+  *epSet = tsMnodeEpSetForShell;
+  mnodeMnodeUnLock();
+}
+
+char* mnodeGetMnodeMasterEp() {
+  return tsMnodeInfos.nodeInfos[tsMnodeInfos.inUse].nodeEp;
+}
+
+void mnodeGetMnodeInfos(void *mnodeInfos) {
+  mnodeMnodeRdLock();
+  *(SDMMnodeInfos *)mnodeInfos = tsMnodeInfos;
+  mnodeMnodeUnLock();
+}
+
+int32_t mnodeAddMnode(int32_t dnodeId) {
+  SMnodeObj *pMnode = calloc(1, sizeof(SMnodeObj));
+  pMnode->mnodeId = dnodeId;
+  pMnode->createdTime = taosGetTimestampMs();
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsMnodeSdb,
+    .pObj = pMnode,
+  };
+
+  int32_t code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    taosTFree(pMnode);
+  }
+
+  mnodeUpdateMnodeEpSet();
+
+  return code;
+}
+
+void mnodeDropMnodeLocal(int32_t dnodeId) {
+  SMnodeObj *pMnode = mnodeGetMnode(dnodeId);
+  if (pMnode != NULL) {
+    SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode};
+    sdbDeleteRow(&oper);
+    mnodeDecMnodeRef(pMnode);
+  }
+
+  mnodeUpdateMnodeEpSet();
+}
+
+int32_t mnodeDropMnode(int32_t dnodeId) {
+  SMnodeObj *pMnode = mnodeGetMnode(dnodeId);
+  if (pMnode == NULL) {
+    return TSDB_CODE_MND_DNODE_NOT_EXIST;
+  }
+  
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsMnodeSdb,
+    .pObj = pMnode
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+
+  sdbDecRef(tsMnodeSdb, pMnode);
+
+  mnodeUpdateMnodeEpSet();
+
+  return code;
+}
+
+static int32_t mnodeGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  sdbUpdateMnodeRoles();
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+
+  if (strcmp(pUser->pAcct->user, TSDB_DEFAULT_USER) != 0)  {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  int32_t  cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "end_point");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "role");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+  
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "create_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = mnodeGetMnodesNum();
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+  pShow->pIter = NULL;
+  mnodeDecUserRef(pUser);
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t    numOfRows = 0;
+  int32_t    cols      = 0;
+  SMnodeObj *pMnode   = NULL;
+  char      *pWrite;
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextMnode(pShow->pIter, &pMnode);
+    if (pMnode == NULL) break;
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pMnode->mnodeId;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    
+    SDnodeObj *pDnode = mnodeGetDnode(pMnode->mnodeId);
+    if (pDnode != NULL) {
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDnode->dnodeEp, pShow->bytes[cols]);
+    } else {
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, "invalid ep", pShow->bytes[cols]);
+    }
+    mnodeDecDnodeRef(pDnode);
+
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    char* roles = mnodeGetMnodeRoleStr(pMnode->role);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, roles, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pMnode->createdTime;
+    cols++;
+    
+    numOfRows++;
+
+    mnodeDecMnodeRef(pMnode);
+  }
+
+  pShow->numOfReads += numOfRows;
+
+  return numOfRows;
+}
diff --git a/src/mnode/src/mnodePeer.c b/src/mnode/src/mnodePeer.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b368a33f4c7336178fcd949b729ca81fa660b4a
--- /dev/null
+++ b/src/mnode/src/mnodePeer.c
@@ -0,0 +1,89 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tsched.h"
+#include "tsystem.h"
+#include "tutil.h"
+#include "tgrant.h"
+#include "tbalance.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeDb.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeShow.h"
+#include "mnodeSdb.h"
+#include "mnodeTable.h"
+#include "mnodeVgroup.h"
+
+static int32_t (*tsMnodeProcessPeerMsgFp[TSDB_MSG_TYPE_MAX])(SMnodeMsg *);
+static void (*tsMnodeProcessPeerRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
+
+void mnodeAddPeerMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg)) {
+  tsMnodeProcessPeerMsgFp[msgType] = fp;
+}
+
+void mnodeAddPeerRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) {
+  tsMnodeProcessPeerRspFp[msgType] = fp;
+}
+
+int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg) {
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("%p, msg:%s in mpeer queue, content is null", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_INVALID_MSG_LEN;
+  }
+
+  if (!sdbIsMaster()) {
+    SMnodeRsp *rpcRsp = &pMsg->rpcRsp;
+    SRpcEpSet *epSet = rpcMallocCont(sizeof(SRpcEpSet));
+    mnodeGetMnodeEpSetForPeer(epSet);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SRpcEpSet);
+
+    mDebug("%p, msg:%s in mpeer queue, will be redireced, numOfEps:%d inUse:%d", pMsg->rpcMsg.ahandle,
+           taosMsg[pMsg->rpcMsg.msgType], epSet->numOfEps, epSet->inUse);
+    for (int32_t i = 0; i < epSet->numOfEps; ++i) {
+      mDebug("mnode index:%d ep:%s:%d", i, epSet->fqdn[i], htons(epSet->port[i]));
+    }
+
+    return TSDB_CODE_RPC_REDIRECT;
+  }
+
+  if (tsMnodeProcessPeerMsgFp[pMsg->rpcMsg.msgType] == NULL) {
+    mError("%p, msg:%s in mpeer queue, not processed", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_MSG_NOT_PROCESSED;
+  }
+
+  return (*tsMnodeProcessPeerMsgFp[pMsg->rpcMsg.msgType])(pMsg);
+}
+
+void mnodeProcessPeerRsp(SRpcMsg *pMsg) {
+  if (!sdbIsMaster()) {
+    mError("%p, msg:%s is not processed for it is not master", pMsg->ahandle, taosMsg[pMsg->msgType]);
+    return;
+  }
+
+  if (tsMnodeProcessPeerRspFp[pMsg->msgType]) {
+    (*tsMnodeProcessPeerRspFp[pMsg->msgType])(pMsg);
+  } else {
+    mError("%p, msg:%s is not processed", pMsg->ahandle, taosMsg[pMsg->msgType]);
+  }
+}
diff --git a/src/mnode/src/mnodeProfile.c b/src/mnode/src/mnodeProfile.c
new file mode 100644
index 0000000000000000000000000000000000000000..26f38dde034788fb440a785ce6c90e8aedf8ddca
--- /dev/null
+++ b/src/mnode/src/mnodeProfile.c
@@ -0,0 +1,608 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "tutil.h"
+#include "tcache.h"
+#include "tglobal.h"
+#include "tdataformat.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDnode.h"
+#include "mnodeDb.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+#include "mnodeWrite.h"
+
+#define CONN_KEEP_TIME  (tsShellActivityTimer * 3)
+#define CONN_CHECK_TIME (tsShellActivityTimer * 2)
+#define QUERY_ID_SIZE   20
+#define QUERY_STREAM_SAVE_SIZE 20
+
+extern void *tsMnodeTmr;
+static SCacheObj *tsMnodeConnCache = NULL;
+static int32_t tsConnIndex = 0;
+
+static int32_t mnodeGetQueryMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetConnsMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetStreamMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static void    mnodeFreeConn(void *data);
+static int32_t mnodeProcessKillQueryMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessKillStreamMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessKillConnectionMsg(SMnodeMsg *pMsg);
+
+int32_t mnodeInitProfile() {
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_QUERIES, mnodeGetQueryMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_QUERIES, mnodeRetrieveQueries);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_CONNS, mnodeGetConnsMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_CONNS, mnodeRetrieveConns);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_STREAMS, mnodeGetStreamMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_STREAMS, mnodeRetrieveStreams);
+
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_KILL_QUERY, mnodeProcessKillQueryMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_KILL_STREAM, mnodeProcessKillStreamMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_KILL_CONN, mnodeProcessKillConnectionMsg);
+
+  tsMnodeConnCache = taosCacheInit(TSDB_DATA_TYPE_INT, CONN_CHECK_TIME, true, mnodeFreeConn, "conn");
+  return 0;
+}
+
+void mnodeCleanupProfile() {
+  if (tsMnodeConnCache != NULL) {
+    taosCacheCleanup(tsMnodeConnCache);
+    tsMnodeConnCache = NULL;
+  }
+}
+
+SConnObj *mnodeCreateConn(char *user, uint32_t ip, uint16_t port) {
+#if 0
+  int32_t connSize = taosHashGetSize(tsMnodeConnCache->pHashTable);
+  if (connSize > tsMaxShellConns) {
+    mError("failed to create conn for user:%s ip:%s:%u, conns:%d larger than maxShellConns:%d, ", user, taosIpStr(ip),
+           port, connSize, tsMaxShellConns);
+    terrno = TSDB_CODE_MND_TOO_MANY_SHELL_CONNS;
+    return NULL;
+  }
+#endif  
+
+  int32_t connId = atomic_add_fetch_32(&tsConnIndex, 1);
+  if (connId == 0) atomic_add_fetch_32(&tsConnIndex, 1);
+
+  SConnObj connObj = {
+    .ip     = ip,
+    .port   = port,
+    .connId = connId,
+    .stime  = taosGetTimestampMs()
+  };
+
+  tstrncpy(connObj.user, user, sizeof(connObj.user));
+  connObj.lastAccess = connObj.stime;
+
+  SConnObj *pConn = taosCachePut(tsMnodeConnCache, &connId, sizeof(int32_t), &connObj, sizeof(connObj), CONN_KEEP_TIME * 1000);
+
+  mDebug("connId:%d, is created, user:%s ip:%s:%u", connId, user, taosIpStr(ip), port);
+  return pConn;
+}
+
+void mnodeReleaseConn(SConnObj *pConn) {
+  if (pConn == NULL) return;
+  taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+}
+
+SConnObj *mnodeAccquireConn(int32_t connId, char *user, uint32_t ip, uint16_t port) {
+  uint64_t expireTime = CONN_KEEP_TIME * 1000 + (uint64_t)taosGetTimestampMs();
+  SConnObj *pConn = taosCacheAcquireByKey(tsMnodeConnCache, &connId, sizeof(int32_t));
+  if (pConn == NULL) {
+    mDebug("connId:%d, is already destroyed, user:%s ip:%s:%u", connId, user, taosIpStr(ip), port);
+    return NULL;
+  }
+
+  if (/* pConn->ip != ip || */ pConn->port != port /* || strcmp(pConn->user, user) != 0 */) {
+    mDebug("connId:%d, incoming conn user:%s ip:%s:%u, not match exist conn user:%s ip:%s:%u", connId, user,
+           taosIpStr(ip), port, pConn->user, taosIpStr(pConn->ip), pConn->port);
+    taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+    return NULL;
+  }
+
+  // mDebug("connId:%d, is incoming, user:%s ip:%s:%u", connId, pConn->user, taosIpStr(pConn->ip), pConn->port);
+  pConn->lastAccess = expireTime;
+  return pConn;
+}
+
+static void mnodeFreeConn(void *data) {
+  SConnObj *pConn = data;
+  taosTFree(pConn->pQueries);
+  taosTFree(pConn->pStreams);
+
+  mDebug("connId:%d, is destroyed", pConn->connId);
+}
+
+static void *mnodeGetNextConn(SHashMutableIterator *pIter, SConnObj **pConn) {
+  *pConn = NULL;
+
+  if (pIter == NULL) {
+    pIter = taosHashCreateIter(tsMnodeConnCache->pHashTable);
+  }
+
+  if (!taosHashIterNext(pIter)) {
+    taosHashDestroyIter(pIter);
+    return NULL;
+  }
+
+  SCacheDataNode **pNode = taosHashIterGet(pIter);
+  if (pNode == NULL || *pNode == NULL) {
+    taosHashDestroyIter(pIter);
+    return NULL;
+  }
+
+  *pConn = (SConnObj*)((*pNode)->data);
+  return pIter;
+}
+
+static int32_t mnodeGetConnsMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+  
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "connId");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "user");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "ip:port");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "login time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "last access");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = taosHashGetSize(tsMnodeConnCache->pHashTable);
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveConns(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t   numOfRows = 0;
+  SConnObj *pConnObj = NULL;
+  int32_t   cols = 0;
+  char *    pWrite;
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
+    if (pConnObj == NULL) break;
+    
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *) pWrite = pConnObj->connId;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pConnObj->stime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    if (pConnObj->lastAccess < pConnObj->stime) pConnObj->lastAccess = pConnObj->stime;
+    *(int64_t *)pWrite = pConnObj->lastAccess;
+    cols++;
+
+    numOfRows++;
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 5;
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  
+  return numOfRows;
+}
+
+// not thread safe, need optimized
+int32_t mnodeSaveQueryStreamList(SConnObj *pConn, SCMHeartBeatMsg *pHBMsg) {
+  pConn->numOfQueries = htonl(pHBMsg->numOfQueries);
+  if (pConn->numOfQueries > 0) {
+    if (pConn->pQueries == NULL) {
+      pConn->pQueries = calloc(sizeof(SQueryDesc), QUERY_STREAM_SAVE_SIZE);
+    }
+
+    int32_t saveSize = MIN(QUERY_STREAM_SAVE_SIZE, pConn->numOfQueries) * sizeof(SQueryDesc);
+    if (saveSize > 0 && pConn->pQueries != NULL) {
+      memcpy(pConn->pQueries, pHBMsg->pData, saveSize);
+    }
+  }
+
+  pConn->numOfStreams = htonl(pHBMsg->numOfStreams);
+  if (pConn->numOfStreams > 0) {
+    if (pConn->pStreams == NULL) {
+      pConn->pStreams = calloc(sizeof(SStreamDesc), QUERY_STREAM_SAVE_SIZE);
+    }
+
+    int32_t saveSize = MIN(QUERY_STREAM_SAVE_SIZE, pConn->numOfStreams) * sizeof(SStreamDesc);
+    if (saveSize > 0 && pConn->pStreams != NULL) {
+      memcpy(pConn->pStreams, pHBMsg->pData + pConn->numOfQueries * sizeof(SQueryDesc), saveSize);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeGetQueryMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = QUERY_ID_SIZE + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "queryId");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "user");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "ip:port");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_BIGINT;
+  strcpy(pSchema[cols].name, "time(us)");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "sql");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = 1000000;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveQueries(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t   numOfRows = 0;
+  SConnObj *pConnObj = NULL;
+  int32_t   cols = 0;
+  char *    pWrite;
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
+    if (pConnObj == NULL) break;
+
+    for (int32_t i = 0; i < pConnObj->numOfQueries; ++i) {
+      SQueryDesc *pDesc = pConnObj->pQueries + i;
+      cols = 0;
+
+      snprintf(ipStr, QUERY_ID_SIZE + 1, "%u:%u", pConnObj->connId, htonl(pDesc->queryId));
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->stime);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->useconds);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDesc->sql, pShow->bytes[cols]);
+      cols++;
+
+      numOfRows++;
+    }
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 6;
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  return numOfRows;
+}
+
+static int32_t mnodeGetStreamMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) return 0;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = QUERY_ID_SIZE + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "streamId");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "user");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "ip:port");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "exec time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_BIGINT;
+  strcpy(pSchema[cols].name, "time(us)");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "sql");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "cycles");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = 1000000;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  return 0;
+}
+
+static int32_t mnodeRetrieveStreams(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t   numOfRows = 0;
+  SConnObj *pConnObj = NULL;
+  int32_t   cols = 0;
+  char *    pWrite;
+  char      ipStr[TSDB_IPv4ADDR_LEN + 6];
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextConn(pShow->pIter, &pConnObj);
+    if (pConnObj == NULL) break;
+
+    for (int32_t i = 0; i < pConnObj->numOfStreams; ++i) {
+      SStreamDesc *pDesc = pConnObj->pStreams + i;
+      cols = 0;
+
+      snprintf(ipStr, QUERY_ID_SIZE + 1, "%u:%u", pConnObj->connId, htonl(pDesc->streamId));
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pConnObj->user, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      snprintf(ipStr, sizeof(ipStr), "%s:%u", taosIpStr(pConnObj->ip), pConnObj->port);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, ipStr, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->ctime);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->stime);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int64_t *)pWrite = htobe64(pDesc->useconds);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pDesc->sql, pShow->bytes[cols]);
+      cols++;
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int32_t *)pWrite = (int32_t)htobe64(pDesc->num);
+      cols++;
+
+      numOfRows++;
+    }
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 8;
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  return numOfRows;
+}
+
+static int32_t mnodeProcessKillQueryMsg(SMnodeMsg *pMsg) {
+  SUserObj *pUser = pMsg->pUser;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+
+  SCMKillQueryMsg *pKill = pMsg->rpcMsg.pCont;
+  mInfo("kill query msg is received, queryId:%s", pKill->queryId);
+
+  const char delim = ':';
+  char* connIdStr = strtok(pKill->queryId, &delim);
+  char* queryIdStr = strtok(NULL, &delim);
+
+  if (queryIdStr == NULL || connIdStr == NULL) {
+    mInfo("failed to kill query, queryId:%s", pKill->queryId);
+   return TSDB_CODE_MND_INVALID_QUERY_ID;
+  }
+
+  int32_t queryId = (int32_t)strtol(queryIdStr, NULL, 10);
+
+  int32_t connId = atoi(connIdStr);
+  SConnObj *pConn = taosCacheAcquireByKey(tsMnodeConnCache, &connId, sizeof(int32_t));
+  if (pConn == NULL) {
+    mError("connId:%s, failed to kill queryId:%d, conn not exist", connIdStr, queryId);
+    return TSDB_CODE_MND_INVALID_CONN_ID;
+  } else {
+    mInfo("connId:%s, queryId:%d is killed by user:%s", connIdStr, queryId, pUser->user);
+    pConn->queryId = queryId;
+    taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static int32_t mnodeProcessKillStreamMsg(SMnodeMsg *pMsg) {
+  SUserObj *pUser = pMsg->pUser;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+
+  SCMKillQueryMsg *pKill = pMsg->rpcMsg.pCont;
+  mInfo("kill stream msg is received, streamId:%s", pKill->queryId);
+
+  const char delim = ':';
+  char* connIdStr = strtok(pKill->queryId, &delim);
+  char* streamIdStr = strtok(NULL, &delim);
+
+  if (streamIdStr == NULL || connIdStr == NULL) {
+    mInfo("failed to kill stream, streamId:%s", pKill->queryId);
+   return TSDB_CODE_MND_INVALID_STREAM_ID;
+  }
+
+  int32_t streamId = (int32_t)strtol(streamIdStr, NULL, 10);
+  int32_t connId = atoi(connIdStr);
+
+  SConnObj *pConn = taosCacheAcquireByKey(tsMnodeConnCache, &connId, sizeof(int32_t));
+  if (pConn == NULL) {
+    mError("connId:%s, failed to kill streamId:%d, conn not exist", connIdStr, streamId);
+    return TSDB_CODE_MND_INVALID_CONN_ID;
+  } else {
+    mInfo("connId:%s, streamId:%d is killed by user:%s", connIdStr, streamId, pUser->user);
+    pConn->streamId = streamId;
+    taosCacheRelease(tsMnodeConnCache, (void **)&pConn, false);
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static int32_t mnodeProcessKillConnectionMsg(SMnodeMsg *pMsg) {
+  SUserObj *pUser = pMsg->pUser;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) != 0) return TSDB_CODE_MND_NO_RIGHTS;
+
+  SCMKillConnMsg *pKill = pMsg->rpcMsg.pCont;
+  int32_t connId = atoi(pKill->queryId);
+  SConnObj *      pConn = taosCacheAcquireByKey(tsMnodeConnCache, &connId, sizeof(int32_t));
+  if (pConn == NULL) {
+    mError("connId:%s, failed to kill, conn not exist", pKill->queryId);
+    return TSDB_CODE_MND_INVALID_CONN_ID;
+  } else {
+    mInfo("connId:%s, is killed by user:%s", pKill->queryId, pUser->user);
+    pConn->killed = 1;
+    taosCacheRelease(tsMnodeConnCache, (void**)&pConn, false);
+    return TSDB_CODE_SUCCESS;
+  }
+}
diff --git a/src/mnode/src/mnodeRead.c b/src/mnode/src/mnodeRead.c
new file mode 100644
index 0000000000000000000000000000000000000000..af2fed3408ab726b5a819f6717fab497fcba1136
--- /dev/null
+++ b/src/mnode/src/mnodeRead.c
@@ -0,0 +1,77 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tsched.h"
+#include "tbalance.h"
+#include "tgrant.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeDb.h"
+#include "mnodeSdb.h"
+#include "mnodeVgroup.h"
+#include "mnodeUser.h"
+#include "mnodeTable.h"
+#include "mnodeShow.h"
+
+static int32_t (*tsMnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SMnodeMsg *);
+
+void mnodeAddReadMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *pMsg)) {
+  tsMnodeProcessReadMsgFp[msgType] = fp;
+}
+
+int32_t mnodeProcessRead(SMnodeMsg *pMsg) {
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("%p, msg:%s in mread queue, content is null", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_INVALID_MSG_LEN;
+  }
+
+  if (!sdbIsMaster()) {
+    SMnodeRsp *rpcRsp = &pMsg->rpcRsp;
+    SRpcEpSet *epSet = rpcMallocCont(sizeof(SRpcEpSet));
+    mnodeGetMnodeEpSetForShell(epSet);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SRpcEpSet);
+
+    mDebug("%p, msg:%s in mread queue, will be redireced, inUse:%d", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType], epSet->inUse);
+    for (int32_t i = 0; i < epSet->numOfEps; ++i) {
+      mDebug("mnode index:%d ep:%s:%d", i, epSet->fqdn[i], htons(epSet->port[i]));
+    }
+
+    return TSDB_CODE_RPC_REDIRECT;
+  }
+
+  if (tsMnodeProcessReadMsgFp[pMsg->rpcMsg.msgType] == NULL) {
+    mError("%p, msg:%s in mread queue, not processed", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_MSG_NOT_PROCESSED;
+  }
+
+  int32_t code = mnodeInitMsg(pMsg);
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("%p, msg:%s in mread queue, not processed reason:%s", pMsg->rpcMsg.ahandle, taosMsg[pMsg->rpcMsg.msgType], tstrerror(code));
+    return code;
+  }
+
+  return (*tsMnodeProcessReadMsgFp[pMsg->rpcMsg.msgType])(pMsg);
+}
diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c
new file mode 100644
index 0000000000000000000000000000000000000000..646c17b2b8b64344afb7c5117f2bd83b3da89dab
--- /dev/null
+++ b/src/mnode/src/mnodeSdb.c
@@ -0,0 +1,1092 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "hash.h"
+#include "tutil.h"
+#include "tbalance.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tsync.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "dnode.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeMnode.h"
+#include "mnodeDnode.h"
+#include "mnodeCluster.h"
+#include "mnodeSdb.h"
+
+#define SDB_TABLE_LEN 12
+#define SDB_SYNC_HACK 16
+
+typedef enum {
+  SDB_ACTION_INSERT,
+  SDB_ACTION_DELETE,
+  SDB_ACTION_UPDATE
+} ESdbAction;
+
+typedef enum {
+  SDB_STATUS_OFFLINE,
+  SDB_STATUS_SERVING,
+  SDB_STATUS_CLOSING
+} ESdbStatus;
+
+typedef struct _SSdbTable {
+  char      tableName[SDB_TABLE_LEN];
+  ESdbTable tableId;
+  ESdbKey   keyType;
+  int32_t   hashSessions;
+  int32_t   maxRowSize;
+  int32_t   refCountPos;
+  int32_t   autoIndex;
+  int64_t   numOfRows;
+  void *    iHandle;
+  int32_t (*insertFp)(SSdbOper *pDesc);
+  int32_t (*deleteFp)(SSdbOper *pOper);
+  int32_t (*updateFp)(SSdbOper *pOper);
+  int32_t (*decodeFp)(SSdbOper *pOper);
+  int32_t (*encodeFp)(SSdbOper *pOper);
+  int32_t (*destroyFp)(SSdbOper *pOper);
+  int32_t (*restoredFp)();
+  pthread_mutex_t mutex;
+} SSdbTable;
+
+typedef struct {
+  ESyncRole  role;
+  ESdbStatus status;
+  int64_t    version;
+  void *     sync;
+  void *     wal;
+  SSyncCfg   cfg;
+  int32_t    numOfTables;
+  SSdbTable *tableList[SDB_TABLE_MAX];
+  pthread_mutex_t mutex;
+} SSdbObject;
+
+typedef struct {
+  pthread_t thread;
+  int32_t   workerId;
+} SSdbWriteWorker;
+
+typedef struct {
+  int32_t num;
+  SSdbWriteWorker *writeWorker;
+} SSdbWriteWorkerPool;
+
+extern void *     tsMnodeTmr;
+static void *     tsUpdateSyncTmr;
+static SSdbObject tsSdbObj = {0};
+static taos_qset  tsSdbWriteQset;
+static taos_qall  tsSdbWriteQall;
+static taos_queue tsSdbWriteQueue;
+static SSdbWriteWorkerPool tsSdbPool;
+
+static int     sdbWrite(void *param, void *data, int type);
+static int     sdbWriteToQueue(void *param, void *data, int type);
+static void *  sdbWorkerFp(void *param);
+static int32_t sdbInitWriteWorker();
+static void    sdbCleanupWriteWorker();
+static int32_t sdbAllocWriteQueue();
+static void    sdbFreeWritequeue();
+static int32_t sdbUpdateRowImp(SSdbOper *pOper);
+static int32_t sdbDeleteRowImp(SSdbOper *pOper);
+static int32_t sdbInsertHash(SSdbTable *pTable, SSdbOper *pOper);
+static int32_t sdbUpdateHash(SSdbTable *pTable, SSdbOper *pOper);
+static int32_t sdbDeleteHash(SSdbTable *pTable, SSdbOper *pOper);
+
+int32_t sdbGetId(void *handle) {
+  return ((SSdbTable *)handle)->autoIndex;
+}
+
+int64_t sdbGetNumOfRows(void *handle) {
+  return ((SSdbTable *)handle)->numOfRows;
+}
+
+uint64_t sdbGetVersion() {
+  return tsSdbObj.version;
+}
+
+bool sdbIsMaster() { 
+  return tsSdbObj.role == TAOS_SYNC_ROLE_MASTER; 
+}
+
+bool sdbIsServing() {
+  return tsSdbObj.status == SDB_STATUS_SERVING; 
+}
+
+static void *sdbGetObjKey(SSdbTable *pTable, void *key) {
+  if (pTable->keyType == SDB_KEY_VAR_STRING) {
+    return *(char **)key;
+  }
+
+  return key;
+}
+
+static char *sdbGetActionStr(int32_t action) {
+  switch (action) {
+    case SDB_ACTION_INSERT:
+      return "insert";
+    case SDB_ACTION_DELETE:
+      return "delete";
+    case SDB_ACTION_UPDATE:
+      return "update";
+  }
+  return "invalid";
+}
+
+static char *sdbGetKeyStr(SSdbTable *pTable, void *key) {
+  static char str[16];
+  switch (pTable->keyType) {
+    case SDB_KEY_STRING:
+    case SDB_KEY_VAR_STRING:
+      return (char *)key;
+    case SDB_KEY_INT:
+    case SDB_KEY_AUTO:
+      sprintf(str, "%d", *(int32_t *)key);
+      return str;
+    default:
+      return "invalid";
+  }
+}
+
+static char *sdbGetKeyStrFromObj(SSdbTable *pTable, void *key) {
+  return sdbGetKeyStr(pTable, sdbGetObjKey(pTable, key));
+}
+
+static void *sdbGetTableFromId(int32_t tableId) {
+  return tsSdbObj.tableList[tableId];
+}
+
+static int32_t sdbInitWal() {
+  SWalCfg walCfg = {.walLevel = 2, .wals = 2, .keep = 1, .fsyncPeriod = 0};
+  char temp[TSDB_FILENAME_LEN];
+  sprintf(temp, "%s/wal", tsMnodeDir);
+  tsSdbObj.wal = walOpen(temp, &walCfg);
+  if (tsSdbObj.wal == NULL) {
+    sdbError("failed to open sdb wal in %s", tsMnodeDir);
+    return -1;
+  }
+
+  sdbInfo("open sdb wal for restore");
+  walRestore(tsSdbObj.wal, NULL, sdbWrite);
+  return 0;
+}
+
+static void sdbRestoreTables() {
+  int32_t totalRows = 0;
+  int32_t numOfTables = 0;
+  for (int32_t tableId = 0; tableId < SDB_TABLE_MAX; ++tableId) {
+    SSdbTable *pTable = sdbGetTableFromId(tableId);
+    if (pTable == NULL) continue;
+    if (pTable->restoredFp) {
+      (*pTable->restoredFp)();
+    }
+
+    totalRows += pTable->numOfRows;
+    numOfTables++;
+    sdbDebug("table:%s, is restored, numOfRows:%" PRId64, pTable->tableName, pTable->numOfRows);
+  }
+
+  sdbInfo("sdb is restored, ver:%" PRId64 " totalRows:%d numOfTables:%d", tsSdbObj.version, totalRows, numOfTables);
+}
+
+void sdbUpdateMnodeRoles() {
+  if (tsSdbObj.sync == NULL) return;
+
+  SNodesRole roles = {0};
+  syncGetNodesRole(tsSdbObj.sync, &roles);
+
+  sdbInfo("update mnodes sync roles, total:%d", tsSdbObj.cfg.replica);
+  for (int32_t i = 0; i < tsSdbObj.cfg.replica; ++i) {
+    SMnodeObj *pMnode = mnodeGetMnode(roles.nodeId[i]);
+    if (pMnode != NULL) {
+      pMnode->role = roles.role[i];
+      sdbInfo("mnode:%d, role:%s", pMnode->mnodeId, mnodeGetMnodeRoleStr(pMnode->role));
+      if (pMnode->mnodeId == dnodeGetDnodeId()) tsSdbObj.role = pMnode->role;
+      mnodeDecMnodeRef(pMnode);
+    }
+  }
+
+  mnodeUpdateClusterId();
+  mnodeUpdateMnodeEpSet();
+}
+
+static uint32_t sdbGetFileInfo(void *ahandle, char *name, uint32_t *index, uint32_t eindex, int64_t *size, uint64_t *fversion) {
+  sdbUpdateMnodeRoles();
+  return 0;
+}
+
+static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) {
+  return walGetWalFile(tsSdbObj.wal, name, index);
+}
+
+static void sdbNotifyRole(void *ahandle, int8_t role) {
+  sdbInfo("mnode role changed from %s to %s", mnodeGetMnodeRoleStr(tsSdbObj.role), mnodeGetMnodeRoleStr(role));
+
+  if (role == TAOS_SYNC_ROLE_MASTER && tsSdbObj.role != TAOS_SYNC_ROLE_MASTER) {
+    balanceReset();
+  }
+  tsSdbObj.role = role;
+
+  sdbUpdateMnodeRoles();
+}
+
+FORCE_INLINE
+static void sdbConfirmForward(void *ahandle, void *param, int32_t code) {
+  assert(param);
+  SSdbOper * pOper = param;
+  SMnodeMsg *pMsg = pOper->pMsg;
+  if (code <= 0) pOper->retCode = code;
+
+  int32_t processedCount = atomic_add_fetch_32(&pOper->processedCount, 1);
+  if (processedCount <= 1) {
+    if (pMsg != NULL) {
+      sdbDebug("app:%p:%p, waiting for confirm this operation, count:%d result:%s", pMsg->rpcMsg.ahandle, pMsg,
+               processedCount, tstrerror(code));
+    }
+    return;
+  }
+
+  if (pMsg != NULL) {
+    sdbDebug("app:%p:%p, is confirmed and will do callback func, result:%s", pMsg->rpcMsg.ahandle, pMsg,
+             tstrerror(code));
+  }
+
+  // failed to forward, need revert insert
+  if (pOper->retCode != TSDB_CODE_SUCCESS) {
+    SWalHead *pHead = (void *)pOper + sizeof(SSdbOper) + SDB_SYNC_HACK;
+    int32_t   action = pHead->msgType % 10;
+    sdbError("table:%s record:%p:%s ver:%" PRIu64 ", action:%d failed to foward reason:%s",
+             ((SSdbTable *)pOper->table)->tableName, pOper->pObj, sdbGetKeyStr(pOper->table, pHead->cont),
+             pHead->version, action, tstrerror(pOper->retCode));
+    if (action == SDB_ACTION_INSERT) {
+      sdbDeleteHash(pOper->table, pOper);
+    }
+  }
+
+  if (pOper->writeCb != NULL) {
+    pOper->retCode = (*pOper->writeCb)(pMsg, pOper->retCode);
+  }
+  dnodeSendRpcMnodeWriteRsp(pMsg, pOper->retCode);
+
+  // if ahandle, means this func is called by sdb write
+  if (ahandle == NULL) {
+    sdbDecRef(pOper->table, pOper->pObj);
+  }
+
+  taosFreeQitem(pOper);
+}
+
+static void sdbUpdateSyncTmrFp(void *param, void *tmrId) { sdbUpdateSync(); }
+
+void sdbUpdateSync() {
+  if (!mnodeIsRunning()) {
+    mDebug("mnode not start yet, update sync info later");
+    if (dnodeCheckMnodeStarting()) {
+      taosTmrReset(sdbUpdateSyncTmrFp, 1000, NULL, tsMnodeTmr, &tsUpdateSyncTmr);
+    }
+    return;
+  }
+  mDebug("update sync info in sdb");
+
+  SSyncCfg syncCfg = {0};
+  int32_t  index = 0;
+
+  SDMMnodeInfos *mnodes = dnodeGetMnodeInfos();
+  for (int32_t i = 0; i < mnodes->nodeNum; ++i) {
+    SDMMnodeInfo *node = &mnodes->nodeInfos[i];
+    syncCfg.nodeInfo[i].nodeId = node->nodeId;
+    taosGetFqdnPortFromEp(node->nodeEp, syncCfg.nodeInfo[i].nodeFqdn, &syncCfg.nodeInfo[i].nodePort);
+    syncCfg.nodeInfo[i].nodePort += TSDB_PORT_SYNC;
+    index++;
+  }
+
+  if (index == 0) {
+    void *pIter = NULL;
+    while (1) {
+      SMnodeObj *pMnode = NULL;
+      pIter = mnodeGetNextMnode(pIter, &pMnode);
+      if (pMnode == NULL) break;
+
+      syncCfg.nodeInfo[index].nodeId = pMnode->mnodeId;
+
+      SDnodeObj *pDnode = mnodeGetDnode(pMnode->mnodeId);
+      if (pDnode != NULL) {
+        syncCfg.nodeInfo[index].nodePort = pDnode->dnodePort + TSDB_PORT_SYNC;
+        tstrncpy(syncCfg.nodeInfo[index].nodeFqdn, pDnode->dnodeFqdn, TSDB_FQDN_LEN);
+        index++;
+      }
+
+      mnodeDecDnodeRef(pDnode);
+      mnodeDecMnodeRef(pMnode);
+    }
+    sdbFreeIter(pIter);
+  }
+
+  syncCfg.replica = index;
+  syncCfg.quorum = (syncCfg.replica == 1) ? 1 : 2;
+
+  bool hasThisDnode = false;
+  for (int32_t i = 0; i < syncCfg.replica; ++i) {
+    if (syncCfg.nodeInfo[i].nodeId == dnodeGetDnodeId()) {
+      hasThisDnode = true;
+      break;
+    }
+  }
+
+  if (!hasThisDnode) return;
+  if (memcmp(&syncCfg, &tsSdbObj.cfg, sizeof(SSyncCfg)) == 0) return;
+
+  sdbInfo("work as mnode, replica:%d", syncCfg.replica);
+  for (int32_t i = 0; i < syncCfg.replica; ++i) {
+    sdbInfo("mnode:%d, %s:%d", syncCfg.nodeInfo[i].nodeId, syncCfg.nodeInfo[i].nodeFqdn, syncCfg.nodeInfo[i].nodePort);
+  }
+
+  SSyncInfo syncInfo = {0};
+  syncInfo.vgId = 1;
+  syncInfo.version = sdbGetVersion();
+  syncInfo.syncCfg = syncCfg;
+  sprintf(syncInfo.path, "%s", tsMnodeDir);
+  syncInfo.ahandle = NULL;
+  syncInfo.getWalInfo = sdbGetWalInfo;
+  syncInfo.getFileInfo = sdbGetFileInfo;
+  syncInfo.writeToCache = sdbWriteToQueue;
+  syncInfo.confirmForward = sdbConfirmForward;
+  syncInfo.notifyRole = sdbNotifyRole;
+  tsSdbObj.cfg = syncCfg;
+
+  if (tsSdbObj.sync) {
+    syncReconfig(tsSdbObj.sync, &syncCfg);
+  } else {
+    tsSdbObj.sync = syncStart(&syncInfo);
+  }
+  sdbUpdateMnodeRoles();
+}
+
+int32_t sdbInit() {
+  pthread_mutex_init(&tsSdbObj.mutex, NULL);
+
+  if (sdbInitWriteWorker() != 0) {
+    return -1;
+  }
+
+  if (sdbInitWal() != 0) {
+    return -1;
+  }
+
+  sdbRestoreTables();
+
+  if (mnodeGetMnodesNum() == 1) {
+    tsSdbObj.role = TAOS_SYNC_ROLE_MASTER;
+  }
+
+  tsSdbObj.status = SDB_STATUS_SERVING;
+  return TSDB_CODE_SUCCESS;
+}
+
+void sdbCleanUp() {
+  if (tsSdbObj.status != SDB_STATUS_SERVING) return;
+
+  tsSdbObj.status = SDB_STATUS_CLOSING;
+  
+  sdbCleanupWriteWorker();
+  sdbDebug("sdb will be closed, ver:%" PRId64, tsSdbObj.version);
+
+  if (tsSdbObj.sync) {
+    syncStop(tsSdbObj.sync);
+    tsSdbObj.sync = NULL;
+  }
+
+  if (tsSdbObj.wal) {
+    walClose(tsSdbObj.wal);
+    tsSdbObj.wal = NULL;
+  }
+  
+  pthread_mutex_destroy(&tsSdbObj.mutex);
+}
+
+void sdbIncRef(void *handle, void *pObj) {
+  if (pObj == NULL || handle == NULL) return;
+
+  SSdbTable *pTable = handle;
+  int32_t *  pRefCount = (int32_t *)(pObj + pTable->refCountPos);
+  int32_t    refCount = atomic_add_fetch_32(pRefCount, 1);
+  sdbTrace("add ref to table:%s record:%p:%s:%d", pTable->tableName, pObj, sdbGetKeyStrFromObj(pTable, pObj), refCount);
+}
+
+void sdbDecRef(void *handle, void *pObj) {
+  if (pObj == NULL || handle == NULL) return;
+
+  SSdbTable *pTable = handle;
+  int32_t *  pRefCount = (int32_t *)(pObj + pTable->refCountPos);
+  int32_t    refCount = atomic_sub_fetch_32(pRefCount, 1);
+  sdbTrace("def ref of table:%s record:%p:%s:%d", pTable->tableName, pObj, sdbGetKeyStrFromObj(pTable, pObj), refCount);
+
+  int32_t *updateEnd = pObj + pTable->refCountPos - 4;
+  if (refCount <= 0 && *updateEnd) {
+    sdbTrace("table:%s, record:%p:%s:%d is destroyed", pTable->tableName, pObj, sdbGetKeyStrFromObj(pTable, pObj), refCount);
+    SSdbOper oper = {.pObj = pObj};
+    (*pTable->destroyFp)(&oper);
+  }
+}
+
+static void *sdbGetRowMeta(SSdbTable *pTable, void *key) {
+  if (pTable == NULL) return NULL;
+
+  int32_t keySize = sizeof(int32_t);
+  if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
+    keySize = strlen((char *)key);
+  }
+
+  void **ppRow = (void **)taosHashGet(pTable->iHandle, key, keySize);
+  if (ppRow != NULL) return *ppRow;
+
+  return NULL;
+}
+
+static void *sdbGetRowMetaFromObj(SSdbTable *pTable, void *key) {
+  return sdbGetRowMeta(pTable, sdbGetObjKey(pTable, key));
+}
+
+void *sdbGetRow(void *handle, void *key) {
+  SSdbTable *pTable = handle;
+
+  pthread_mutex_lock(&pTable->mutex);
+  void *pRow = sdbGetRowMeta(handle, key);
+  if (pRow) sdbIncRef(handle, pRow);
+  pthread_mutex_unlock(&pTable->mutex);
+
+  return pRow;
+}
+
+static void *sdbGetRowFromObj(SSdbTable *pTable, void *key) {
+  return sdbGetRow(pTable, sdbGetObjKey(pTable, key));
+}
+
+static int32_t sdbInsertHash(SSdbTable *pTable, SSdbOper *pOper) {
+  void *  key = sdbGetObjKey(pTable, pOper->pObj);
+  int32_t keySize = sizeof(int32_t);
+
+  if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
+    keySize = strlen((char *)key);
+  }
+
+  pthread_mutex_lock(&pTable->mutex);
+  taosHashPut(pTable->iHandle, key, keySize, &pOper->pObj, sizeof(int64_t));
+  pthread_mutex_unlock(&pTable->mutex);
+
+  sdbIncRef(pTable, pOper->pObj);
+  atomic_add_fetch_32(&pTable->numOfRows, 1);
+
+  if (pTable->keyType == SDB_KEY_AUTO) {
+    pTable->autoIndex = MAX(pTable->autoIndex, *((uint32_t *)pOper->pObj));
+  } else {
+    atomic_add_fetch_32(&pTable->autoIndex, 1);
+  }
+
+  sdbDebug("table:%s, insert record:%s to hash, rowSize:%d numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pOper->rowSize, pTable->numOfRows, pOper->pMsg);
+
+  int32_t code = (*pTable->insertFp)(pOper);
+  if (code != TSDB_CODE_SUCCESS) {
+    sdbError("table:%s, failed to insert record:%s to hash, remove it", pTable->tableName,
+             sdbGetKeyStrFromObj(pTable, pOper->pObj));
+    sdbDeleteHash(pTable, pOper);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sdbDeleteHash(SSdbTable *pTable, SSdbOper *pOper) {
+  int32_t *updateEnd = pOper->pObj + pTable->refCountPos - 4;
+  bool set = atomic_val_compare_exchange_32(updateEnd, 0, 1) == 0;
+  if (!set) {
+    sdbError("table:%s, failed to delete record:%s from hash, for it already removed", pTable->tableName,
+             sdbGetKeyStrFromObj(pTable, pOper->pObj));
+    return TSDB_CODE_MND_SDB_OBJ_NOT_THERE;
+  }
+
+  (*pTable->deleteFp)(pOper);
+  
+  void *  key = sdbGetObjKey(pTable, pOper->pObj);
+  int32_t keySize = sizeof(int32_t);
+  if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
+    keySize = strlen((char *)key);
+  }
+
+  pthread_mutex_lock(&pTable->mutex);
+  taosHashRemove(pTable->iHandle, key, keySize);
+  pthread_mutex_unlock(&pTable->mutex);
+
+  atomic_sub_fetch_32(&pTable->numOfRows, 1);
+  
+  sdbDebug("table:%s, delete record:%s from hash, numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, pOper->pMsg);
+
+  sdbDecRef(pTable, pOper->pObj);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sdbUpdateHash(SSdbTable *pTable, SSdbOper *pOper) {
+  sdbDebug("table:%s, update record:%s in hash, numOfRows:%" PRId64 ", msg:%p", pTable->tableName,
+           sdbGetKeyStrFromObj(pTable, pOper->pObj), pTable->numOfRows, pOper->pMsg);
+
+  (*pTable->updateFp)(pOper);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int sdbWrite(void *param, void *data, int type) {
+  SSdbOper *pOper = param;
+  SWalHead *pHead = data;
+  int32_t tableId = pHead->msgType / 10;
+  int32_t action = pHead->msgType % 10;
+
+  SSdbTable *pTable = sdbGetTableFromId(tableId);
+  assert(pTable != NULL);
+
+  pthread_mutex_lock(&tsSdbObj.mutex);
+  
+  if (pHead->version == 0) {
+    // assign version
+    tsSdbObj.version++;
+    pHead->version = tsSdbObj.version;
+  } else {
+    // for data from WAL or forward, version may be smaller
+    if (pHead->version <= tsSdbObj.version) {
+      pthread_mutex_unlock(&tsSdbObj.mutex);
+      sdbDebug("table:%s, failed to restore %s record:%s from source(%d), ver:%" PRId64 " too large, sdb ver:%" PRId64,
+               pTable->tableName, sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), type, pHead->version, tsSdbObj.version);
+      return TSDB_CODE_SUCCESS;
+    } else if (pHead->version != tsSdbObj.version + 1) {
+      pthread_mutex_unlock(&tsSdbObj.mutex);
+      sdbError("table:%s, failed to restore %s record:%s from source(%d), ver:%" PRId64 " too large, sdb ver:%" PRId64,
+               pTable->tableName, sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), type, pHead->version, tsSdbObj.version);
+      return TSDB_CODE_MND_APP_ERROR;
+    } else {
+      tsSdbObj.version = pHead->version;
+    }
+  }
+
+  int32_t code = walWrite(tsSdbObj.wal, pHead);
+  if (code < 0) {
+    pthread_mutex_unlock(&tsSdbObj.mutex);
+    return code;
+  }
+
+  pthread_mutex_unlock(&tsSdbObj.mutex);
+
+  // from app, oper is created
+  if (pOper != NULL) {
+    // forward to peers
+    pOper->processedCount = 0;
+    int32_t syncCode = syncForwardToPeer(tsSdbObj.sync, pHead, pOper, TAOS_QTYPE_RPC);
+    if (syncCode <= 0) pOper->processedCount = 1;
+
+    if (syncCode < 0) {
+      sdbError("table:%s, failed to forward request, result:%s action:%s record:%s ver:%" PRId64 ", msg:%p", pTable->tableName,
+               tstrerror(syncCode), sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), pHead->version, pOper->pMsg);
+    } else if (syncCode > 0) {
+      sdbDebug("table:%s, forward request is sent, action:%s record:%s ver:%" PRId64 ", msg:%p", pTable->tableName,
+               sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), pHead->version, pOper->pMsg);
+    } else {
+      sdbTrace("table:%s, no need to send fwd request, action:%s record:%s ver:%" PRId64 ", msg:%p", pTable->tableName,
+               sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), pHead->version, pOper->pMsg);
+    }
+    return syncCode;
+  }
+
+  sdbDebug("table:%s, record from wal/fwd is disposed, action:%s record:%s ver:%" PRId64, pTable->tableName,
+           sdbGetActionStr(action), sdbGetKeyStr(pTable, pHead->cont), pHead->version);
+
+  // even it is WAL/FWD, it shall be called to update version in sync
+  syncForwardToPeer(tsSdbObj.sync, pHead, pOper, TAOS_QTYPE_RPC);
+
+  // from wal or forward msg, oper not created, should add into hash
+  if (action == SDB_ACTION_INSERT) {
+    SSdbOper oper = {.rowSize = pHead->len, .rowData = pHead->cont, .table = pTable};
+    code = (*pTable->decodeFp)(&oper);
+    return sdbInsertHash(pTable, &oper);
+  } else if (action == SDB_ACTION_DELETE) {
+    void *pRow = sdbGetRowMeta(pTable, pHead->cont);
+    if (pRow == NULL) {
+      sdbDebug("table:%s, object:%s not exist in hash, ignore delete action", pTable->tableName,
+               sdbGetKeyStr(pTable, pHead->cont));
+      return TSDB_CODE_SUCCESS;
+    }
+    SSdbOper oper = {.table = pTable, .pObj = pRow};
+    return sdbDeleteHash(pTable, &oper);
+  } else if (action == SDB_ACTION_UPDATE) {
+    void *pRow = sdbGetRowMeta(pTable, pHead->cont);
+    if (pRow == NULL) {
+      sdbDebug("table:%s, object:%s not exist in hash, ignore update action", pTable->tableName,
+               sdbGetKeyStr(pTable, pHead->cont));
+      return TSDB_CODE_SUCCESS;
+    }
+    SSdbOper oper = {.rowSize = pHead->len, .rowData = pHead->cont, .table = pTable};
+    code = (*pTable->decodeFp)(&oper);
+    return sdbUpdateHash(pTable, &oper);
+  } else {
+    return TSDB_CODE_MND_INVALID_MSG_TYPE;
+  }
+}
+
+int32_t sdbInsertRow(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  if (sdbGetRowFromObj(pTable, pOper->pObj)) {
+    sdbError("table:%s, failed to insert record:%s, already exist", pTable->tableName,
+             sdbGetKeyStrFromObj(pTable, pOper->pObj));
+    sdbDecRef(pTable, pOper->pObj);
+    return TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE;
+  }
+
+  if (pTable->keyType == SDB_KEY_AUTO) {
+    *((uint32_t *)pOper->pObj) = atomic_add_fetch_32(&pTable->autoIndex, 1);
+
+    // let vgId increase from 2
+    if (pTable->autoIndex == 1 && strcmp(pTable->tableName, "vgroups") == 0) {
+      *((uint32_t *)pOper->pObj) = atomic_add_fetch_32(&pTable->autoIndex, 1);
+    }
+  }
+
+  int32_t code = sdbInsertHash(pTable, pOper);
+  if (code != TSDB_CODE_SUCCESS) {
+    sdbError("table:%s, failed to insert into hash", pTable->tableName);
+    return code;
+  }
+
+  // just insert data into memory
+  if (pOper->type != SDB_OPER_GLOBAL) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (pOper->reqFp) {
+    return (*pOper->reqFp)(pOper->pMsg);
+  } else {
+    return sdbInsertRowImp(pOper);
+  }
+}
+
+int32_t sdbInsertRowImp(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  int32_t size = sizeof(SSdbOper) + sizeof(SWalHead) + pTable->maxRowSize + SDB_SYNC_HACK;
+  SSdbOper *pNewOper = taosAllocateQitem(size);
+
+  SWalHead *pHead = (void *)pNewOper + sizeof(SSdbOper) + SDB_SYNC_HACK;
+  pHead->version = 0;
+  pHead->len = pOper->rowSize;
+  pHead->msgType = pTable->tableId * 10 + SDB_ACTION_INSERT;
+
+  pOper->rowData = pHead->cont;
+  (*pTable->encodeFp)(pOper);
+  pHead->len = pOper->rowSize;
+
+  memcpy(pNewOper, pOper, sizeof(SSdbOper));
+
+  if (pNewOper->pMsg != NULL) {
+    sdbDebug("app:%p:%p, table:%s record:%p:%s, insert action is add to sdb queue", pNewOper->pMsg->rpcMsg.ahandle,
+             pNewOper->pMsg, pTable->tableName, pOper->pObj, sdbGetKeyStrFromObj(pTable, pOper->pObj));
+  }
+
+  sdbIncRef(pNewOper->table, pNewOper->pObj);
+  taosWriteQitem(tsSdbWriteQueue, TAOS_QTYPE_RPC, pNewOper);
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+bool sdbCheckRowDeleted(void *pTableInput, void *pRow) {
+  SSdbTable *pTable = pTableInput;
+  if (pTable == NULL) return false;
+
+  int32_t *updateEnd = pRow + pTable->refCountPos - 4;
+  return atomic_val_compare_exchange_32(updateEnd, 1, 1) == 1;
+}
+
+int32_t sdbDeleteRow(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  void *pRow = sdbGetRowMetaFromObj(pTable, pOper->pObj);
+  if (pRow == NULL) {
+    sdbDebug("table:%s, record is not there, delete failed", pTable->tableName);
+    return TSDB_CODE_MND_SDB_OBJ_NOT_THERE;
+  }
+
+  sdbIncRef(pTable, pOper->pObj);
+
+  int32_t code = sdbDeleteHash(pTable, pOper);
+  if (code != TSDB_CODE_SUCCESS) {
+    sdbError("table:%s, failed to delete from hash", pTable->tableName);
+    sdbDecRef(pTable, pOper->pObj);
+    return code;
+  }
+
+  // just delete data from memory
+  if (pOper->type != SDB_OPER_GLOBAL) {
+    sdbDecRef(pTable, pOper->pObj);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (pOper->reqFp) {
+    return (*pOper->reqFp)(pOper->pMsg);
+  } else {
+    return sdbDeleteRowImp(pOper);
+  }
+}
+
+int32_t sdbDeleteRowImp(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  int32_t size = sizeof(SSdbOper) + sizeof(SWalHead) + pTable->maxRowSize + SDB_SYNC_HACK;
+  SSdbOper *pNewOper = taosAllocateQitem(size);
+
+  SWalHead *pHead = (void *)pNewOper + sizeof(SSdbOper) + SDB_SYNC_HACK;
+  pHead->version = 0;
+  pHead->msgType = pTable->tableId * 10 + SDB_ACTION_DELETE;
+
+  pOper->rowData = pHead->cont;
+  (*pTable->encodeFp)(pOper);
+  pHead->len = pOper->rowSize;
+
+  memcpy(pNewOper, pOper, sizeof(SSdbOper));
+
+  if (pNewOper->pMsg != NULL) {
+    sdbDebug("app:%p:%p, table:%s record:%p:%s, delete action is add to sdb queue", pNewOper->pMsg->rpcMsg.ahandle,
+             pNewOper->pMsg, pTable->tableName, pOper->pObj, sdbGetKeyStrFromObj(pTable, pOper->pObj));
+  }
+
+  taosWriteQitem(tsSdbWriteQueue, TAOS_QTYPE_RPC, pNewOper);
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+int32_t sdbUpdateRow(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  void *pRow = sdbGetRowMetaFromObj(pTable, pOper->pObj);
+  if (pRow == NULL) {
+    sdbDebug("table:%s, record is not there, update failed", pTable->tableName);
+    return TSDB_CODE_MND_SDB_OBJ_NOT_THERE;
+  }
+
+  int32_t code = sdbUpdateHash(pTable, pOper);
+  if (code != TSDB_CODE_SUCCESS) {
+    sdbError("table:%s, failed to update hash", pTable->tableName);
+    return code;
+  }
+
+  // just update data in memory
+  if (pOper->type != SDB_OPER_GLOBAL) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (pOper->reqFp) {
+    return (*pOper->reqFp)(pOper->pMsg);
+  } else {
+    return sdbUpdateRowImp(pOper);
+  }
+}
+
+int32_t sdbUpdateRowImp(SSdbOper *pOper) {
+  SSdbTable *pTable = (SSdbTable *)pOper->table;
+  if (pTable == NULL) return TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE;
+
+  int32_t size = sizeof(SSdbOper) + sizeof(SWalHead) + pTable->maxRowSize + SDB_SYNC_HACK;
+  SSdbOper *pNewOper = taosAllocateQitem(size);
+
+  SWalHead *pHead = (void *)pNewOper + sizeof(SSdbOper) + SDB_SYNC_HACK;
+  pHead->version = 0;
+  pHead->msgType = pTable->tableId * 10 + SDB_ACTION_UPDATE;
+
+  pOper->rowData = pHead->cont;
+  (*pTable->encodeFp)(pOper);
+  pHead->len = pOper->rowSize;
+
+  memcpy(pNewOper, pOper, sizeof(SSdbOper));
+
+  if (pNewOper->pMsg != NULL) {
+    sdbDebug("app:%p:%p, table:%s record:%p:%s, update action is add to sdb queue", pNewOper->pMsg->rpcMsg.ahandle,
+             pNewOper->pMsg, pTable->tableName, pOper->pObj, sdbGetKeyStrFromObj(pTable, pOper->pObj));
+  }
+
+  sdbIncRef(pNewOper->table, pNewOper->pObj);
+  taosWriteQitem(tsSdbWriteQueue, TAOS_QTYPE_RPC, pNewOper);
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+void *sdbFetchRow(void *handle, void *pNode, void **ppRow) {
+  SSdbTable *pTable = (SSdbTable *)handle;
+  *ppRow = NULL;
+  if (pTable == NULL) return NULL;
+
+  SHashMutableIterator *pIter = pNode;
+  if (pIter == NULL) {
+    pIter = taosHashCreateIter(pTable->iHandle);
+  }
+
+  if (!taosHashIterNext(pIter)) {
+    taosHashDestroyIter(pIter);
+    return NULL;
+  }
+
+  void **ppMetaRow = taosHashIterGet(pIter);
+  if (ppMetaRow == NULL) {
+    taosHashDestroyIter(pIter);
+    return NULL;
+  }
+
+  *ppRow = *ppMetaRow;
+  sdbIncRef(handle, *ppMetaRow);
+
+  return pIter;
+}
+
+void sdbFreeIter(void *pIter) {
+  if (pIter != NULL) {
+    taosHashDestroyIter(pIter);
+  }
+}
+
+void *sdbOpenTable(SSdbTableDesc *pDesc) {
+  SSdbTable *pTable = (SSdbTable *)calloc(1, sizeof(SSdbTable));
+  
+  if (pTable == NULL) return NULL;
+
+  pthread_mutex_init(&pTable->mutex, NULL);
+  tstrncpy(pTable->tableName, pDesc->tableName, SDB_TABLE_LEN);
+  pTable->keyType      = pDesc->keyType;
+  pTable->tableId      = pDesc->tableId;
+  pTable->hashSessions = pDesc->hashSessions;
+  pTable->maxRowSize   = pDesc->maxRowSize;
+  pTable->refCountPos  = pDesc->refCountPos;
+  pTable->insertFp     = pDesc->insertFp;
+  pTable->deleteFp     = pDesc->deleteFp;
+  pTable->updateFp     = pDesc->updateFp;
+  pTable->encodeFp     = pDesc->encodeFp;
+  pTable->decodeFp     = pDesc->decodeFp;
+  pTable->destroyFp    = pDesc->destroyFp;
+  pTable->restoredFp   = pDesc->restoredFp;
+
+  _hash_fn_t hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT);
+  if (pTable->keyType == SDB_KEY_STRING || pTable->keyType == SDB_KEY_VAR_STRING) {
+    hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+  }
+  pTable->iHandle = taosHashInit(pTable->hashSessions, hashFp, true, true);
+
+  tsSdbObj.numOfTables++;
+  tsSdbObj.tableList[pTable->tableId] = pTable;
+  return pTable;
+}
+
+void sdbCloseTable(void *handle) {
+  SSdbTable *pTable = (SSdbTable *)handle;
+  if (pTable == NULL) return;
+  
+  tsSdbObj.numOfTables--;
+  tsSdbObj.tableList[pTable->tableId] = NULL;
+
+  SHashMutableIterator *pIter = taosHashCreateIter(pTable->iHandle);
+  while (taosHashIterNext(pIter)) {
+    void **ppRow = taosHashIterGet(pIter);
+    if (ppRow == NULL) continue;
+
+    SSdbOper oper = {
+      .pObj = *ppRow,
+      .table = pTable,
+    };
+
+    (*pTable->destroyFp)(&oper);
+  }
+
+  taosHashDestroyIter(pIter);
+  taosHashCleanup(pTable->iHandle);
+  pthread_mutex_destroy(&pTable->mutex);
+
+  sdbDebug("table:%s, is closed, numOfTables:%d", pTable->tableName, tsSdbObj.numOfTables);
+  free(pTable);
+}
+
+int32_t sdbInitWriteWorker() {
+  tsSdbPool.num = 1;
+  tsSdbPool.writeWorker = (SSdbWriteWorker *)calloc(sizeof(SSdbWriteWorker), tsSdbPool.num);
+
+  if (tsSdbPool.writeWorker == NULL) return -1;
+  for (int32_t i = 0; i < tsSdbPool.num; ++i) {
+    SSdbWriteWorker *pWorker = tsSdbPool.writeWorker + i;
+    pWorker->workerId = i;
+  }
+
+  sdbAllocWriteQueue();
+  
+  mInfo("sdb write is opened");
+  return 0;
+}
+
+void sdbCleanupWriteWorker() {
+  for (int32_t i = 0; i < tsSdbPool.num; ++i) {
+    SSdbWriteWorker *pWorker = tsSdbPool.writeWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(tsSdbWriteQset);
+    }
+  }
+
+  for (int32_t i = 0; i < tsSdbPool.num; ++i) {
+    SSdbWriteWorker *pWorker = tsSdbPool.writeWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  sdbFreeWritequeue();
+  taosTFree(tsSdbPool.writeWorker);
+
+  mInfo("sdb write is closed");
+}
+
+int32_t sdbAllocWriteQueue() {
+  tsSdbWriteQueue = taosOpenQueue();
+  if (tsSdbWriteQueue == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  tsSdbWriteQset = taosOpenQset();
+  if (tsSdbWriteQset == NULL) {
+    taosCloseQueue(tsSdbWriteQueue);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+  taosAddIntoQset(tsSdbWriteQset, tsSdbWriteQueue, NULL);
+
+  tsSdbWriteQall = taosAllocateQall();
+  if (tsSdbWriteQall == NULL) {
+    taosCloseQset(tsSdbWriteQset);
+    taosCloseQueue(tsSdbWriteQueue);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+  
+  for (int32_t i = 0; i < tsSdbPool.num; ++i) {
+    SSdbWriteWorker *pWorker = tsSdbPool.writeWorker + i;
+    pWorker->workerId = i;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, sdbWorkerFp, pWorker) != 0) {
+      mError("failed to create thread to process sdb write queue, reason:%s", strerror(errno));
+      taosFreeQall(tsSdbWriteQall);
+      taosCloseQset(tsSdbWriteQset);
+      taosCloseQueue(tsSdbWriteQueue);
+      return TSDB_CODE_MND_OUT_OF_MEMORY;
+    }
+
+    pthread_attr_destroy(&thAttr);
+    mDebug("sdb write worker:%d is launched, total:%d", pWorker->workerId, tsSdbPool.num);
+  }
+
+  mDebug("sdb write queue:%p is allocated", tsSdbWriteQueue);
+  return TSDB_CODE_SUCCESS;
+}
+
+void sdbFreeWritequeue() {
+  taosCloseQueue(tsSdbWriteQueue);
+  taosFreeQall(tsSdbWriteQall);
+  taosCloseQset(tsSdbWriteQset);
+  tsSdbWriteQall = NULL;
+  tsSdbWriteQset = NULL;
+  tsSdbWriteQueue = NULL;
+}
+
+int sdbWriteToQueue(void *param, void *data, int type) {
+  SWalHead *pHead = data;
+  int size = sizeof(SWalHead) + pHead->len;
+  SWalHead *pWal = (SWalHead *)taosAllocateQitem(size);
+  memcpy(pWal, pHead, size);
+
+  taosWriteQitem(tsSdbWriteQueue, type, pWal);
+  return 0;
+}
+
+static void *sdbWorkerFp(void *param) {
+  SWalHead *pHead;
+  SSdbOper *pOper;
+  int32_t   type;
+  int32_t   numOfMsgs;
+  void *    item;
+  void *    unUsed;
+
+  while (1) {
+    numOfMsgs = taosReadAllQitemsFromQset(tsSdbWriteQset, tsSdbWriteQall, &unUsed);
+    if (numOfMsgs == 0) {
+      sdbDebug("sdbWorkerFp: got no message from qset, exiting...");
+      break;
+    }
+
+    for (int32_t i = 0; i < numOfMsgs; ++i) {
+      taosGetQitem(tsSdbWriteQall, &type, &item);
+      if (type == TAOS_QTYPE_RPC) {
+        pOper = (SSdbOper *)item;
+        pOper->processedCount = 1;
+        pHead = (void *)pOper + sizeof(SSdbOper) + SDB_SYNC_HACK;
+        if (pOper->pMsg != NULL) {
+          sdbDebug("app:%p:%p, table:%s record:%p:%s ver:%" PRIu64 ", will be processed in sdb queue",
+                   pOper->pMsg->rpcMsg.ahandle, pOper->pMsg, ((SSdbTable *)pOper->table)->tableName, pOper->pObj,
+                   sdbGetKeyStr(pOper->table, pHead->cont), pHead->version);
+        }
+      } else {
+        pHead = (SWalHead *)item;
+        pOper = NULL;
+      }
+
+      int32_t code = sdbWrite(pOper, pHead, type);
+      if (code > 0) code = 0;
+      if (pOper) {
+        pOper->retCode = code;
+      } else {
+        pHead->len = code;  // hackway
+      }
+    }
+
+    walFsync(tsSdbObj.wal);
+
+    // browse all items, and process them one by one
+    taosResetQitems(tsSdbWriteQall);
+    for (int32_t i = 0; i < numOfMsgs; ++i) {
+      taosGetQitem(tsSdbWriteQall, &type, &item);
+
+      if (type == TAOS_QTYPE_RPC) {
+        pOper = (SSdbOper *)item;
+        sdbConfirmForward(NULL, pOper, pOper->retCode);
+      } else if (type == TAOS_QTYPE_FWD) {
+        pHead = (SWalHead *)item;
+        syncConfirmForward(tsSdbObj.sync, pHead->version, pHead->len);
+        taosFreeQitem(item);
+      } else {
+        taosFreeQitem(item);
+      }
+    }
+  }
+
+  return NULL;
+}
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
new file mode 100644
index 0000000000000000000000000000000000000000..f2caf30564439c0a93e6a333df08dab261cb6143
--- /dev/null
+++ b/src/mnode/src/mnodeShow.c
@@ -0,0 +1,428 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "tsched.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tgrant.h"
+#include "tglobal.h"
+#include "tcache.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+#include "mnodeWrite.h"
+#include "mnodeRead.h"
+
+static int32_t mnodeProcessShowMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessConnectMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessUseMsg(SMnodeMsg *mnodeMsg);
+
+static void  mnodeFreeShowObj(void *data);
+static bool  mnodeAccquireShowObj(SShowObj *pShow);
+static bool  mnodeCheckShowFinished(SShowObj *pShow);
+static void *mnodePutShowObj(SShowObj *pShow);
+static void  mnodeReleaseShowObj(SShowObj *pShow, bool forceRemove);
+
+extern void *tsMnodeTmr;
+static void *tsMnodeShowCache = NULL;
+static int32_t tsShowObjIndex = 0;
+static SShowMetaFp     tsMnodeShowMetaFp[TSDB_MGMT_TABLE_MAX]     = {0};
+static SShowRetrieveFp tsMnodeShowRetrieveFp[TSDB_MGMT_TABLE_MAX] = {0};
+
+int32_t mnodeInitShow() {
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_SHOW, mnodeProcessShowMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_RETRIEVE, mnodeProcessRetrieveMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_HEARTBEAT, mnodeProcessHeartBeatMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_CONNECT, mnodeProcessConnectMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_USE_DB, mnodeProcessUseMsg);
+  
+  tsMnodeShowCache = taosCacheInit(TSDB_DATA_TYPE_BIGINT, 5, true, mnodeFreeShowObj, "show");
+  return 0;
+}
+
+void mnodeCleanUpShow() {
+  if (tsMnodeShowCache != NULL) {
+    mInfo("show cache is cleanup");
+    taosCacheCleanup(tsMnodeShowCache);
+    tsMnodeShowCache = NULL;
+  }
+}
+
+void mnodeAddShowMetaHandle(uint8_t showType, SShowMetaFp fp) {
+  tsMnodeShowMetaFp[showType] = fp;
+}
+
+void mnodeAddShowRetrieveHandle(uint8_t msgType, SShowRetrieveFp fp) {
+  tsMnodeShowRetrieveFp[msgType] = fp;
+}
+
+static char *mnodeGetShowType(int32_t showType) {
+  switch (showType) {
+    case TSDB_MGMT_TABLE_ACCT:    return "show accounts";
+    case TSDB_MGMT_TABLE_USER:    return "show users";
+    case TSDB_MGMT_TABLE_DB:      return "show databases";
+    case TSDB_MGMT_TABLE_TABLE:   return "show tables";
+    case TSDB_MGMT_TABLE_DNODE:   return "show dnodes";
+    case TSDB_MGMT_TABLE_MNODE:   return "show mnodes";
+    case TSDB_MGMT_TABLE_VGROUP:  return "show vgroups";
+    case TSDB_MGMT_TABLE_METRIC:  return "show stables";
+    case TSDB_MGMT_TABLE_MODULE:  return "show modules";
+    case TSDB_MGMT_TABLE_QUERIES: return "show queries";
+    case TSDB_MGMT_TABLE_STREAMS: return "show streams";
+    case TSDB_MGMT_TABLE_VARIABLES: return "show configs";
+    case TSDB_MGMT_TABLE_CONNS:   return "show connections";
+    case TSDB_MGMT_TABLE_SCORES:  return "show scores";
+    case TSDB_MGMT_TABLE_GRANTS:  return "show grants";
+    case TSDB_MGMT_TABLE_VNODES:  return "show vnodes";
+    case TSDB_MGMT_TABLE_CLUSTER: return "show clusters";
+    case TSDB_MGMT_TABLE_STREAMTABLES : return "show streamtables";
+    default:                      return "undefined";
+  }
+}
+
+static int32_t mnodeProcessShowMsg(SMnodeMsg *pMsg) {
+  SCMShowMsg *pShowMsg = pMsg->rpcMsg.pCont;
+  if (pShowMsg->type >= TSDB_MGMT_TABLE_MAX) {
+    return TSDB_CODE_MND_INVALID_MSG_TYPE;
+  }
+
+  if (!tsMnodeShowMetaFp[pShowMsg->type] || !tsMnodeShowRetrieveFp[pShowMsg->type]) {
+    mError("show type:%s is not support", mnodeGetShowType(pShowMsg->type));
+    return TSDB_CODE_COM_OPS_NOT_SUPPORT;
+  }
+
+  int32_t showObjSize = sizeof(SShowObj) + htons(pShowMsg->payloadLen);
+  SShowObj *pShow = calloc(1, showObjSize);
+  pShow->type       = pShowMsg->type;
+  pShow->payloadLen = htons(pShowMsg->payloadLen);
+  tstrncpy(pShow->db, pShowMsg->db, TSDB_DB_NAME_LEN);
+  memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen);
+
+  pShow = mnodePutShowObj(pShow);
+  if (pShow == NULL) {    
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  int32_t size = sizeof(SCMShowRsp) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_EXTRA_PAYLOAD_SIZE;
+  SCMShowRsp *pShowRsp = rpcMallocCont(size);
+  if (pShowRsp == NULL) {
+    mnodeReleaseShowObj(pShow, true);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+  pShowRsp->qhandle = htobe64((uint64_t) pShow);
+
+  int32_t code = (*tsMnodeShowMetaFp[pShowMsg->type])(&pShowRsp->tableMeta, pShow, pMsg->rpcMsg.handle);
+  mDebug("%p, show type:%s index:%d, get meta finished, numOfRows:%d cols:%d result:%s", pShow,
+         mnodeGetShowType(pShowMsg->type), pShow->index, pShow->numOfRows, pShow->numOfColumns, tstrerror(code));
+
+  if (code == TSDB_CODE_SUCCESS) {
+    pMsg->rpcRsp.rsp = pShowRsp;
+    pMsg->rpcRsp.len = sizeof(SCMShowRsp) + sizeof(SSchema) * pShow->numOfColumns;
+    mnodeReleaseShowObj(pShow, false);
+    return TSDB_CODE_SUCCESS;
+  } else {
+    rpcFreeCont(pShowRsp);
+    mnodeReleaseShowObj(pShow, true);
+    return code;
+  }
+}
+
+static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
+  int32_t rowsToRead = 0;
+  int32_t size = 0;
+  int32_t rowsRead = 0;
+  SRetrieveTableMsg *pRetrieve = pMsg->rpcMsg.pCont;
+  pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
+
+  SShowObj *pShow = (SShowObj *)pRetrieve->qhandle;
+  
+  /*
+   * in case of server restart, apps may hold qhandle created by server before
+   * restart, which is actually invalid, therefore, signature check is required.
+   */
+  if (!mnodeAccquireShowObj(pShow)) {
+    mError("%p, show is invalid", pShow);
+    return TSDB_CODE_MND_INVALID_SHOWOBJ;
+  }
+
+  mDebug("%p, show type:%s index:%d, start retrieve data, numOfReads:%d numOfRows:%d", pShow,
+         mnodeGetShowType(pShow->type), pShow->index, pShow->numOfReads, pShow->numOfRows);
+
+  if (mnodeCheckShowFinished(pShow)) {
+    mDebug("%p, show is already read finished, numOfReads:%d numOfRows:%d", pShow, pShow->numOfReads, pShow->numOfRows);
+    pShow->numOfReads = pShow->numOfRows;
+  }
+  
+  if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) {
+    rowsToRead = pShow->numOfRows - pShow->numOfReads;
+  }
+
+  /* return no more than 100 meters in one round trip */
+  if (rowsToRead > 100) rowsToRead = 100;
+
+  /*
+   * the actual number of table may be larger than the value of pShow->numOfRows, if a query is
+   * issued during a continuous create table operation. Therefore, rowToRead may be less than 0.
+   */
+  if (rowsToRead < 0) rowsToRead = 0;
+  size = pShow->rowSize * rowsToRead;
+
+  size += 100;
+  SRetrieveTableRsp *pRsp = rpcMallocCont(size);
+
+  // if free flag is set, client wants to clean the resources
+  if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
+    rowsRead = (*tsMnodeShowRetrieveFp[pShow->type])(pShow, pRsp->data, rowsToRead, pMsg->rpcMsg.handle);
+
+  mDebug("%p, show type:%s index:%d, stop retrieve data, rowsRead:%d rowsToRead:%d", pShow,
+         mnodeGetShowType(pShow->type), pShow->index, rowsRead, rowsToRead);
+
+  if (rowsRead < 0) {
+    rpcFreeCont(pRsp);
+    mnodeReleaseShowObj(pShow, false);
+    assert(false);
+    return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+  }
+
+  pRsp->numOfRows = htonl(rowsRead);
+  pRsp->precision = htonl(TSDB_TIME_PRECISION_MILLI);  // millisecond time precision
+
+  pMsg->rpcRsp.rsp = pRsp;
+  pMsg->rpcRsp.len = size;
+
+  if (rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows == pShow->numOfReads)) {
+    pRsp->completed = 1;
+    mDebug("%p, retrieve completed", pShow);
+    mnodeReleaseShowObj(pShow, true);
+  } else {
+    mDebug("%p, retrieve not completed yet", pShow);
+    mnodeReleaseShowObj(pShow, false);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
+  SCMHeartBeatRsp *pHBRsp = (SCMHeartBeatRsp *) rpcMallocCont(sizeof(SCMHeartBeatRsp));
+  if (pHBRsp == NULL) {
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  SCMHeartBeatMsg *pHBMsg = pMsg->rpcMsg.pCont;
+  SRpcConnInfo connInfo = {0};
+  rpcGetConnInfo(pMsg->rpcMsg.handle, &connInfo);
+    
+  int32_t connId = htonl(pHBMsg->connId);
+  SConnObj *pConn = mnodeAccquireConn(connId, connInfo.user, connInfo.clientIp, connInfo.clientPort);
+  if (pConn == NULL) {
+    pConn = mnodeCreateConn(connInfo.user, connInfo.clientIp, connInfo.clientPort);
+  }
+
+  if (pConn == NULL) {
+    // do not close existing links, otherwise
+    // mError("failed to create connId, close connect");
+    // pHBRsp->killConnection = 1;
+  } else {
+    pHBRsp->connId = htonl(pConn->connId);
+    mnodeSaveQueryStreamList(pConn, pHBMsg);
+    
+    if (pConn->killed != 0) {
+      pHBRsp->killConnection = 1;
+    }
+
+    if (pConn->streamId != 0) {
+      pHBRsp->streamId = htonl(pConn->streamId);
+      pConn->streamId = 0;
+    }
+
+    if (pConn->queryId != 0) {
+      pHBRsp->queryId = htonl(pConn->queryId);
+      pConn->queryId = 0;
+    }
+  }
+
+  pHBRsp->onlineDnodes = htonl(mnodeGetOnlineDnodesNum());
+  pHBRsp->totalDnodes = htonl(mnodeGetDnodesNum());
+  mnodeGetMnodeEpSetForShell(&pHBRsp->epSet);
+
+  pMsg->rpcRsp.rsp = pHBRsp;
+  pMsg->rpcRsp.len = sizeof(SCMHeartBeatRsp);
+  
+  mnodeReleaseConn(pConn);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
+  SCMConnectMsg *pConnectMsg = pMsg->rpcMsg.pCont;
+  SCMConnectRsp *pConnectRsp = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  SRpcConnInfo connInfo = {0};
+  if (rpcGetConnInfo(pMsg->rpcMsg.handle, &connInfo) != 0) {
+    mError("thandle:%p is already released while process connect msg", pMsg->rpcMsg.handle);
+    code = TSDB_CODE_MND_INVALID_CONNECTION;
+    goto connect_over;
+  }
+
+  code = taosCheckVersion(pConnectMsg->clientVersion, version, 3);
+  if (code != TSDB_CODE_SUCCESS) {
+    goto connect_over;
+  }
+
+  SUserObj *pUser = pMsg->pUser;
+  SAcctObj *pAcct = pUser->pAcct;
+
+  if (pConnectMsg->db[0]) {
+    char dbName[TSDB_TABLE_FNAME_LEN * 3] = {0};
+    sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db);
+    SDbObj *pDb = mnodeGetDb(dbName);
+    if (pDb == NULL) {
+      code = TSDB_CODE_MND_INVALID_DB;
+      goto connect_over;
+    }
+    
+    if (pDb->status != TSDB_DB_STATUS_READY) {
+      mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+      code = TSDB_CODE_MND_DB_IN_DROPPING;
+      mnodeDecDbRef(pDb);
+      goto connect_over;
+    }
+    mnodeDecDbRef(pDb);
+  }
+
+  pConnectRsp = rpcMallocCont(sizeof(SCMConnectRsp));
+  if (pConnectRsp == NULL) {
+    code = TSDB_CODE_MND_OUT_OF_MEMORY;
+    goto connect_over;
+  }
+
+  SConnObj *pConn = mnodeCreateConn(connInfo.user, connInfo.clientIp, connInfo.clientPort);
+  if (pConn == NULL) {
+    code = terrno;
+  } else {
+    pConnectRsp->connId = htonl(pConn->connId);
+    mnodeReleaseConn(pConn);
+  }
+
+  sprintf(pConnectRsp->acctId, "%x", pAcct->acctId);
+  memcpy(pConnectRsp->serverVersion, version, TSDB_VERSION_LEN);
+  pConnectRsp->writeAuth = pUser->writeAuth;
+  pConnectRsp->superAuth = pUser->superAuth;
+  
+  mnodeGetMnodeEpSetForShell(&pConnectRsp->epSet);
+
+connect_over:
+  if (code != TSDB_CODE_SUCCESS) {
+    if (pConnectRsp) rpcFreeCont(pConnectRsp);
+    mLError("user:%s login from %s, result:%s", connInfo.user, taosIpStr(connInfo.clientIp), tstrerror(code));
+  } else {
+    mLInfo("user:%s login from %s, result:%s", connInfo.user, taosIpStr(connInfo.clientIp), tstrerror(code));
+    pMsg->rpcRsp.rsp = pConnectRsp;
+    pMsg->rpcRsp.len = sizeof(SCMConnectRsp);
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessUseMsg(SMnodeMsg *pMsg) {
+  SCMUseDbMsg *pUseDbMsg = pMsg->rpcMsg.pCont;
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pUseDbMsg->db);
+  if (pMsg->pDb == NULL) {
+    return TSDB_CODE_MND_INVALID_DB;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  return code;
+}
+
+static bool mnodeCheckShowFinished(SShowObj *pShow) {
+  if (pShow->pIter == NULL && pShow->numOfReads != 0) {
+    return true;
+  } 
+  return false;
+}
+
+static bool mnodeAccquireShowObj(SShowObj *pShow) {
+  uint64_t handleVal = (uint64_t)pShow;
+  SShowObj **ppShow = taosCacheAcquireByKey(tsMnodeShowCache, &handleVal, sizeof(int64_t));
+  if (ppShow) {
+    mDebug("%p, show is accquired from cache, data:%p, index:%d", pShow, ppShow, pShow->index);
+    return true;
+  }
+
+  return false;
+}
+
+static void* mnodePutShowObj(SShowObj *pShow) {
+  const int32_t DEFAULT_SHOWHANDLE_LIFE_SPAN = tsShellActivityTimer * 6 * 1000;
+
+  if (tsMnodeShowCache != NULL) {
+    pShow->index = atomic_add_fetch_32(&tsShowObjIndex, 1);
+    uint64_t handleVal = (uint64_t)pShow;
+    SShowObj **ppShow = taosCachePut(tsMnodeShowCache, &handleVal, sizeof(int64_t), &pShow, sizeof(int64_t), DEFAULT_SHOWHANDLE_LIFE_SPAN);
+    pShow->ppShow = (void**)ppShow;
+    mDebug("%p, show is put into cache, data:%p index:%d", pShow, ppShow, pShow->index);
+    return pShow;
+  }
+
+  return NULL;
+}
+
+static void mnodeFreeShowObj(void *data) {
+  SShowObj *pShow = *(SShowObj **)data;
+  sdbFreeIter(pShow->pIter);
+
+  mDebug("%p, show is destroyed, data:%p index:%d", pShow, data, pShow->index);
+  taosTFree(pShow);
+}
+
+static void mnodeReleaseShowObj(SShowObj *pShow, bool forceRemove) {
+  SShowObj **ppShow = (SShowObj **)pShow->ppShow;
+  mDebug("%p, show is released, force:%s data:%p index:%d", pShow, forceRemove ? "true" : "false", ppShow,
+         pShow->index);
+
+  taosCacheRelease(tsMnodeShowCache, (void **)(&ppShow), forceRemove);
+}
+
+void mnodeVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capacity, SShowObj *pShow) {
+  if (rows < capacity) {
+    for (int32_t i = 0; i < numOfCols; ++i) {
+      memmove(data + pShow->offset[i] * rows, data + pShow->offset[i] * capacity, pShow->bytes[i] * rows);
+    }
+  }
+}
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
new file mode 100644
index 0000000000000000000000000000000000000000..1bc328800e1924879d5af18ab4f6c876238e0ae0
--- /dev/null
+++ b/src/mnode/src/mnodeTable.c
@@ -0,0 +1,2852 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "tutil.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tscompression.h"
+#include "tname.h"
+#include "tidpool.h"
+#include "tglobal.h"
+#include "tcompare.h"
+#include "tdataformat.h"
+#include "tgrant.h"
+#include "hash.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+#include "mnodeWrite.h"
+#include "mnodeRead.h"
+#include "mnodePeer.h"
+
+static void *  tsChildTableSdb;
+static void *  tsSuperTableSdb;
+static int32_t tsChildTableUpdateSize;
+static int32_t tsSuperTableUpdateSize;
+static void *  mnodeGetChildTable(char *tableId);
+static void *  mnodeGetSuperTable(char *tableId);
+static void *  mnodeGetSuperTableByUid(uint64_t uid);
+static void    mnodeDropAllChildTablesInStable(SSuperTableObj *pStable);
+static void    mnodeAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCtable);
+static void    mnodeRemoveTableFromStable(SSuperTableObj *pStable, SChildTableObj *pCtable);
+
+static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetShowSuperTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveStreamTables(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+ 
+static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg);
+static void    mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg);
+
+static int32_t mnodeProcessDropTableMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessDropSuperTableMsg(SMnodeMsg *pMsg);
+static void    mnodeProcessDropSuperTableRsp(SRpcMsg *rpcMsg);
+static int32_t mnodeProcessDropChildTableMsg(SMnodeMsg *pMsg);
+static void    mnodeProcessDropChildTableRsp(SRpcMsg *rpcMsg);
+
+static int32_t mnodeProcessSuperTableVgroupMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeProcessTableCfgMsg(SMnodeMsg *mnodeMsg);
+
+static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *mnodeMsg);
+static int32_t mnodeGetSuperTableMeta(SMnodeMsg *pMsg);
+static int32_t mnodeGetChildTableMeta(SMnodeMsg *pMsg);
+static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg);
+
+static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *mnodeMsg);
+static void    mnodeProcessAlterTableRsp(SRpcMsg *rpcMsg);
+
+static int32_t mnodeFindSuperTableColumnIndex(SSuperTableObj *pStable, char *colName);
+
+static void mnodeDestroyChildTable(SChildTableObj *pTable) {
+  taosTFree(pTable->info.tableId);
+  taosTFree(pTable->schema);
+  taosTFree(pTable->sql);
+  taosTFree(pTable);
+}
+
+static int32_t mnodeChildTableActionDestroy(SSdbOper *pOper) {
+  mnodeDestroyChildTable(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionInsert(SSdbOper *pOper) {
+  SChildTableObj *pTable = pOper->pObj;
+
+  SVgObj *pVgroup = mnodeGetVgroup(pTable->vgId);
+  if (pVgroup == NULL) {
+    mError("ctable:%s, not in vgId:%d", pTable->info.tableId, pTable->vgId);
+  }
+
+  SDbObj *pDb = NULL;
+  if (pVgroup != NULL) {
+    pDb = mnodeGetDb(pVgroup->dbName);
+    if (pDb == NULL) {
+      mError("ctable:%s, vgId:%d not in db:%s", pTable->info.tableId, pVgroup->vgId, pVgroup->dbName);
+    }
+  }
+
+  SAcctObj *pAcct = NULL;
+  if (pDb != NULL) {
+    pAcct = mnodeGetAcct(pDb->acct);
+    if (pAcct == NULL) {
+      mError("ctable:%s, acct:%s not exists", pTable->info.tableId, pDb->acct);
+    }
+  }
+
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    // add ref
+    pTable->superTable = mnodeGetSuperTableByUid(pTable->suid);
+    if (pTable->superTable != NULL) {
+      mnodeAddTableIntoStable(pTable->superTable, pTable);
+      grantAdd(TSDB_GRANT_TIMESERIES, pTable->superTable->numOfColumns - 1);
+      if (pAcct) pAcct->acctInfo.numOfTimeSeries += (pTable->superTable->numOfColumns - 1);
+    }
+  } else {
+    grantAdd(TSDB_GRANT_TIMESERIES, pTable->numOfColumns - 1);
+    if (pAcct) pAcct->acctInfo.numOfTimeSeries += (pTable->numOfColumns - 1);
+  }
+
+  if (pDb) mnodeAddTableIntoDb(pDb);
+  if (pVgroup) mnodeAddTableIntoVgroup(pVgroup, pTable);
+
+  mnodeDecVgroupRef(pVgroup);
+  mnodeDecDbRef(pDb);
+  mnodeDecAcctRef(pAcct);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionDelete(SSdbOper *pOper) {
+  SChildTableObj *pTable = pOper->pObj;
+  if (pTable->vgId == 0) {
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  SVgObj *pVgroup = NULL;
+  SDbObj *pDb = NULL;
+  SAcctObj *pAcct = NULL;
+  
+  pVgroup = mnodeGetVgroup(pTable->vgId);
+  if (pVgroup != NULL) pDb = mnodeGetDb(pVgroup->dbName);
+  if (pDb != NULL) pAcct = mnodeGetAcct(pDb->acct);
+
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    if (pTable->superTable) {
+      grantRestore(TSDB_GRANT_TIMESERIES, pTable->superTable->numOfColumns - 1);
+      if (pAcct != NULL) pAcct->acctInfo.numOfTimeSeries -= (pTable->superTable->numOfColumns - 1);
+      mnodeRemoveTableFromStable(pTable->superTable, pTable);
+      mnodeDecTableRef(pTable->superTable);
+    }
+  } else {
+    grantRestore(TSDB_GRANT_TIMESERIES, pTable->numOfColumns - 1);
+    if (pAcct != NULL) pAcct->acctInfo.numOfTimeSeries -= (pTable->numOfColumns - 1);
+  }
+  
+  if (pDb != NULL) mnodeRemoveTableFromDb(pDb);
+  if (pVgroup != NULL) mnodeRemoveTableFromVgroup(pVgroup, pTable);
+
+  mnodeDecVgroupRef(pVgroup);
+  mnodeDecDbRef(pDb);
+  mnodeDecAcctRef(pAcct);
+ 
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionUpdate(SSdbOper *pOper) {
+  SChildTableObj *pNew = pOper->pObj;
+  SChildTableObj *pTable = mnodeGetChildTable(pNew->info.tableId);
+  if (pTable != pNew) {
+    void *oldTableId = pTable->info.tableId;    
+    void *oldSql = pTable->sql;
+    void *oldSchema = pTable->schema;
+    void *oldSTable = pTable->superTable;
+    int32_t oldRefCount = pTable->refCount;
+    
+    memcpy(pTable, pNew, sizeof(SChildTableObj));
+    
+    pTable->refCount = oldRefCount;
+    pTable->sql = pNew->sql;
+    pTable->schema = pNew->schema;
+    pTable->superTable = oldSTable;
+    
+    free(pNew);
+    free(oldSql);
+    free(oldSchema);
+    free(oldTableId);
+  }
+  mnodeDecTableRef(pTable);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionEncode(SSdbOper *pOper) {
+  SChildTableObj *pTable = pOper->pObj;
+  assert(pTable != NULL && pOper->rowData != NULL);
+
+  int32_t len = strlen(pTable->info.tableId);
+  if (len >= TSDB_TABLE_FNAME_LEN) return TSDB_CODE_MND_INVALID_TABLE_ID;
+
+  memcpy(pOper->rowData, pTable->info.tableId, len);
+  memset(pOper->rowData + len, 0, 1);
+  len++;
+
+  memcpy(pOper->rowData + len, (char*)pTable + sizeof(char *), tsChildTableUpdateSize);
+  len += tsChildTableUpdateSize;
+
+  if (pTable->info.type != TSDB_CHILD_TABLE) {
+    int32_t schemaSize = pTable->numOfColumns * sizeof(SSchema);
+    memcpy(pOper->rowData + len, pTable->schema, schemaSize);
+    len += schemaSize;
+
+    if (pTable->sqlLen != 0) {
+      memcpy(pOper->rowData + len, pTable->sql, pTable->sqlLen);
+      len += pTable->sqlLen;
+    }
+  }
+
+  pOper->rowSize = len;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionDecode(SSdbOper *pOper) {
+  assert(pOper->rowData != NULL);
+  SChildTableObj *pTable = calloc(1, sizeof(SChildTableObj));
+  if (pTable == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  int32_t len = strlen(pOper->rowData);
+  if (len >= TSDB_TABLE_FNAME_LEN) {
+    free(pTable);
+    return TSDB_CODE_MND_INVALID_TABLE_ID;
+  }
+  pTable->info.tableId = strdup(pOper->rowData);
+  len++;
+
+  memcpy((char*)pTable + sizeof(char *), pOper->rowData + len, tsChildTableUpdateSize);
+  len += tsChildTableUpdateSize;
+
+  if (pTable->info.type != TSDB_CHILD_TABLE) {
+    int32_t schemaSize = pTable->numOfColumns * sizeof(SSchema);
+    pTable->schema = (SSchema *)malloc(schemaSize);
+    if (pTable->schema == NULL) {
+      mnodeDestroyChildTable(pTable);
+      return TSDB_CODE_MND_INVALID_TABLE_TYPE;
+    }
+    memcpy(pTable->schema, pOper->rowData + len, schemaSize);
+    len += schemaSize;
+
+    if (pTable->sqlLen != 0) {
+      pTable->sql = malloc(pTable->sqlLen);
+      if (pTable->sql == NULL) {
+        mnodeDestroyChildTable(pTable);
+        return TSDB_CODE_MND_OUT_OF_MEMORY;
+      }
+      memcpy(pTable->sql, pOper->rowData + len, pTable->sqlLen);
+    }
+  }
+
+  pOper->pObj = pTable;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeChildTableActionRestored() {
+  void *pIter = NULL;
+  SChildTableObj *pTable = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextChildTable(pIter, &pTable);
+    if (pTable == NULL) break;
+
+    SDbObj *pDb = mnodeGetDbByTableId(pTable->info.tableId);
+    if (pDb == NULL || pDb->status != TSDB_DB_STATUS_READY) {
+      mError("ctable:%s, failed to get db or db in dropping, discard it", pTable->info.tableId);
+      SSdbOper desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .table = tsChildTableSdb};
+      sdbDeleteRow(&desc);
+      mnodeDecTableRef(pTable);
+      mnodeDecDbRef(pDb);
+      continue;
+    }
+    mnodeDecDbRef(pDb);
+
+    SVgObj *pVgroup = mnodeGetVgroup(pTable->vgId);
+    if (pVgroup == NULL) {
+      mError("ctable:%s, failed to get vgId:%d sid:%d, discard it", pTable->info.tableId, pTable->vgId, pTable->sid);
+      pTable->vgId = 0;
+      SSdbOper desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .table = tsChildTableSdb};
+      sdbDeleteRow(&desc);
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+    mnodeDecVgroupRef(pVgroup);
+
+    if (strcmp(pVgroup->dbName, pDb->name) != 0) {
+      mError("ctable:%s, db:%s not match with vgId:%d db:%s sid:%d, discard it",
+             pTable->info.tableId, pDb->name, pTable->vgId, pVgroup->dbName, pTable->sid);
+      pTable->vgId = 0;
+      SSdbOper desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .table = tsChildTableSdb};
+      sdbDeleteRow(&desc);
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    if (pTable->info.type == TSDB_CHILD_TABLE) {
+      SSuperTableObj *pSuperTable = mnodeGetSuperTableByUid(pTable->suid);
+      if (pSuperTable == NULL) {
+        mError("ctable:%s, stable:%" PRIu64 " not exist", pTable->info.tableId, pTable->suid);
+        pTable->vgId = 0;
+        SSdbOper desc = {.type = SDB_OPER_LOCAL, .pObj = pTable, .table = tsChildTableSdb};
+        sdbDeleteRow(&desc);
+        mnodeDecTableRef(pTable);
+        continue;
+      }
+      mnodeDecTableRef(pSuperTable);
+    }
+
+    mnodeDecTableRef(pTable);
+  }
+
+  sdbFreeIter(pIter);
+
+  return 0;
+}
+
+static int32_t mnodeInitChildTables() {
+  SChildTableObj tObj;
+  tsChildTableUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj.info.type;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_CTABLE,
+    .tableName    = "ctables",
+    .hashSessions = TSDB_DEFAULT_CTABLES_HASH_SIZE,
+    .maxRowSize   = sizeof(SChildTableObj) + sizeof(SSchema) * (TSDB_MAX_TAGS + TSDB_MAX_COLUMNS + 16) + TSDB_TABLE_FNAME_LEN + TSDB_CQ_SQL_SIZE,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_VAR_STRING,
+    .insertFp     = mnodeChildTableActionInsert,
+    .deleteFp     = mnodeChildTableActionDelete,
+    .updateFp     = mnodeChildTableActionUpdate,
+    .encodeFp     = mnodeChildTableActionEncode,
+    .decodeFp     = mnodeChildTableActionDecode,
+    .destroyFp    = mnodeChildTableActionDestroy,
+    .restoredFp   = mnodeChildTableActionRestored
+  };
+
+  tsChildTableSdb = sdbOpenTable(&tableDesc);
+  if (tsChildTableSdb == NULL) {
+    mError("failed to init child table data");
+    return -1;
+  }
+
+  mDebug("table:ctables is created");
+  return 0;
+}
+
+static void mnodeCleanupChildTables() {
+  sdbCloseTable(tsChildTableSdb);
+  tsChildTableSdb = NULL;
+}
+
+int64_t mnodeGetSuperTableNum() {
+  return sdbGetNumOfRows(tsSuperTableSdb);
+}
+
+int64_t mnodeGetChildTableNum() {
+  return sdbGetNumOfRows(tsChildTableSdb);
+}
+
+static void mnodeAddTableIntoStable(SSuperTableObj *pStable, SChildTableObj *pCtable) {
+  atomic_add_fetch_32(&pStable->numOfTables, 1);
+
+  if (pStable->vgHash == NULL) {
+    pStable->vgHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false);
+  }
+
+  if (pStable->vgHash != NULL) {
+    if (taosHashGet(pStable->vgHash, &pCtable->vgId, sizeof(pCtable->vgId)) == NULL) {
+      taosHashPut(pStable->vgHash, &pCtable->vgId, sizeof(pCtable->vgId), &pCtable->vgId, sizeof(pCtable->vgId));
+      mDebug("table:%s, vgId:%d is put into stable vgList, sizeOfVgList:%d", pStable->info.tableId, pCtable->vgId,
+             (int32_t)taosHashGetSize(pStable->vgHash));
+    }
+  }
+}
+
+static void mnodeRemoveTableFromStable(SSuperTableObj *pStable, SChildTableObj *pCtable) {
+  atomic_sub_fetch_32(&pStable->numOfTables, 1);
+
+  if (pStable->vgHash == NULL) return;
+
+  SVgObj *pVgroup = mnodeGetVgroup(pCtable->vgId);
+  if (pVgroup == NULL) {
+    taosHashRemove(pStable->vgHash, (char *)&pCtable->vgId, sizeof(pCtable->vgId));
+    mDebug("table:%s, vgId:%d is remove from stable vgList, sizeOfVgList:%d", pStable->info.tableId, pCtable->vgId,
+           (int32_t)taosHashGetSize(pStable->vgHash));
+  }
+  mnodeDecVgroupRef(pVgroup);
+}
+
+static void mnodeDestroySuperTable(SSuperTableObj *pStable) {
+  if (pStable->vgHash != NULL) {
+    taosHashCleanup(pStable->vgHash);
+    pStable->vgHash = NULL;
+  }
+  taosTFree(pStable->info.tableId);
+  taosTFree(pStable->schema);
+  taosTFree(pStable);
+}
+
+static int32_t mnodeSuperTableActionDestroy(SSdbOper *pOper) {
+  mnodeDestroySuperTable(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionInsert(SSdbOper *pOper) {
+  SSuperTableObj *pStable = pOper->pObj;
+  SDbObj *pDb = mnodeGetDbByTableId(pStable->info.tableId);
+  if (pDb != NULL && pDb->status == TSDB_DB_STATUS_READY) {
+    mnodeAddSuperTableIntoDb(pDb);
+  }
+  mnodeDecDbRef(pDb);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionDelete(SSdbOper *pOper) {
+  SSuperTableObj *pStable = pOper->pObj;
+  SDbObj *pDb = mnodeGetDbByTableId(pStable->info.tableId);
+  if (pDb != NULL) {
+    mnodeRemoveSuperTableFromDb(pDb);
+    mnodeDropAllChildTablesInStable((SSuperTableObj *)pStable);
+  }
+  mnodeDecDbRef(pDb);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionUpdate(SSdbOper *pOper) {
+  SSuperTableObj *pNew = pOper->pObj;
+  SSuperTableObj *pTable = mnodeGetSuperTable(pNew->info.tableId);
+  if (pTable != NULL && pTable != pNew) {
+    void *oldTableId = pTable->info.tableId;
+    void *oldSchema = pTable->schema;
+    void *oldVgHash = pTable->vgHash;
+    int32_t oldRefCount = pTable->refCount;
+
+    memcpy(pTable, pNew, sizeof(SSuperTableObj));
+
+    pTable->vgHash = oldVgHash;
+    pTable->refCount = oldRefCount;
+    pTable->schema = pNew->schema;
+    free(pNew);
+    free(oldTableId);
+    free(oldSchema);
+  }
+
+  mnodeDecTableRef(pTable);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionEncode(SSdbOper *pOper) {
+  SSuperTableObj *pStable = pOper->pObj;
+  assert(pOper->pObj != NULL && pOper->rowData != NULL);
+
+  int32_t len = strlen(pStable->info.tableId);
+  if (len >= TSDB_TABLE_FNAME_LEN) len = TSDB_CODE_MND_INVALID_TABLE_ID;
+
+  memcpy(pOper->rowData, pStable->info.tableId, len);
+  memset(pOper->rowData + len, 0, 1);
+  len++;
+
+  memcpy(pOper->rowData + len, (char*)pStable + sizeof(char *), tsSuperTableUpdateSize);
+  len += tsSuperTableUpdateSize;
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags);
+  memcpy(pOper->rowData + len, pStable->schema, schemaSize);
+  len += schemaSize;
+
+  pOper->rowSize = len;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionDecode(SSdbOper *pOper) {
+  assert(pOper->rowData != NULL);
+  SSuperTableObj *pStable = (SSuperTableObj *) calloc(1, sizeof(SSuperTableObj));
+  if (pStable == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  int32_t len = strlen(pOper->rowData);
+  if (len >= TSDB_TABLE_FNAME_LEN){
+    free(pStable);
+    return TSDB_CODE_MND_INVALID_TABLE_ID;
+  }
+  pStable->info.tableId = strdup(pOper->rowData);
+  len++;
+
+  memcpy((char*)pStable + sizeof(char *), pOper->rowData + len, tsSuperTableUpdateSize);
+  len += tsSuperTableUpdateSize;
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags);
+  pStable->schema = malloc(schemaSize);
+  if (pStable->schema == NULL) {
+    mnodeDestroySuperTable(pStable);
+    return TSDB_CODE_MND_NOT_SUPER_TABLE;
+  }
+
+  memcpy(pStable->schema, pOper->rowData + len, schemaSize);
+  
+  pOper->pObj = pStable;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeSuperTableActionRestored() {
+  return 0;
+}
+
+static int32_t mnodeInitSuperTables() {
+  SSuperTableObj tObj;
+  tsSuperTableUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj.info.type;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_STABLE,
+    .tableName    = "stables",
+    .hashSessions = TSDB_DEFAULT_STABLES_HASH_SIZE,
+    .maxRowSize   = sizeof(SSuperTableObj) + sizeof(SSchema) * (TSDB_MAX_TAGS + TSDB_MAX_COLUMNS + 16) + TSDB_TABLE_FNAME_LEN,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_VAR_STRING,
+    .insertFp     = mnodeSuperTableActionInsert,
+    .deleteFp     = mnodeSuperTableActionDelete,
+    .updateFp     = mnodeSuperTableActionUpdate,
+    .encodeFp     = mnodeSuperTableActionEncode,
+    .decodeFp     = mnodeSuperTableActionDecode,
+    .destroyFp    = mnodeSuperTableActionDestroy,
+    .restoredFp   = mnodeSuperTableActionRestored
+  };
+
+  tsSuperTableSdb = sdbOpenTable(&tableDesc);
+  if (tsSuperTableSdb == NULL) {
+    mError("failed to init stables data");
+    return -1;
+  }
+
+  mDebug("table:stables is created");
+  return 0;
+}
+
+static void mnodeCleanupSuperTables() {
+  sdbCloseTable(tsSuperTableSdb);
+  tsSuperTableSdb = NULL;
+}
+
+int32_t mnodeInitTables() {
+  int32_t code = mnodeInitSuperTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  code = mnodeInitChildTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_TABLES_META, mnodeProcessMultiTableMetaMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_CREATE_TABLE, mnodeProcessCreateTableMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_DROP_TABLE, mnodeProcessDropTableMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_ALTER_TABLE, mnodeProcessAlterTableMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_TABLE_META, mnodeProcessTableMetaMsg);
+  mnodeAddReadMsgHandle(TSDB_MSG_TYPE_CM_STABLE_VGROUP, mnodeProcessSuperTableVgroupMsg);
+  
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CREATE_TABLE_RSP, mnodeProcessCreateChildTableRsp);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_DROP_TABLE_RSP, mnodeProcessDropChildTableRsp);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_DROP_STABLE_RSP, mnodeProcessDropSuperTableRsp);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_TABLE_RSP, mnodeProcessAlterTableRsp);
+
+  mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_CONFIG_TABLE, mnodeProcessTableCfgMsg);
+
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_TABLE, mnodeGetShowTableMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_TABLE, mnodeRetrieveShowTables);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_METRIC, mnodeGetShowSuperTableMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_METRIC, mnodeRetrieveShowSuperTables);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_STREAMTABLES, mnodeGetStreamTableMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_STREAMTABLES, mnodeRetrieveStreamTables);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void *mnodeGetChildTable(char *tableId) {
+  return sdbGetRow(tsChildTableSdb, tableId);
+}
+
+static void *mnodeGetSuperTable(char *tableId) {
+  return sdbGetRow(tsSuperTableSdb, tableId);
+}
+
+static void *mnodeGetSuperTableByUid(uint64_t uid) {
+  SSuperTableObj *pStable = NULL;
+  void *pIter = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextSuperTable(pIter, &pStable);
+    if (pStable == NULL) break;
+    if (pStable->uid == uid) {
+      sdbFreeIter(pIter);
+      return pStable;
+    }
+    mnodeDecTableRef(pStable);
+  }
+
+  sdbFreeIter(pIter);
+
+  return NULL;
+}
+
+void *mnodeGetTable(char *tableId) {
+  void *pTable = mnodeGetSuperTable(tableId);
+  if (pTable != NULL) {
+    return pTable;
+  }
+
+  pTable = mnodeGetChildTable(tableId);
+  if (pTable != NULL) {
+    return pTable;
+  }
+
+  return NULL;
+}
+
+void *mnodeGetNextChildTable(void *pIter, SChildTableObj **pTable) {
+  return sdbFetchRow(tsChildTableSdb, pIter, (void **)pTable);
+}
+
+void *mnodeGetNextSuperTable(void *pIter, SSuperTableObj **pTable) {
+  return sdbFetchRow(tsSuperTableSdb, pIter, (void **)pTable);
+}
+
+void mnodeIncTableRef(void *p1) {
+  STableObj *pTable = (STableObj *)p1;
+  if (pTable->type == TSDB_SUPER_TABLE) {
+    sdbIncRef(tsSuperTableSdb, pTable);
+  } else {
+    sdbIncRef(tsChildTableSdb, pTable);
+  }
+}
+
+void mnodeDecTableRef(void *p1) {
+  if (p1 == NULL) return;
+
+  STableObj *pTable = (STableObj *)p1;
+  if (pTable->type == TSDB_SUPER_TABLE) {
+    sdbDecRef(tsSuperTableSdb, pTable);
+  } else {
+    sdbDecRef(tsChildTableSdb, pTable);
+  }
+}
+
+void mnodeCleanupTables() {
+  mnodeCleanupChildTables();
+  mnodeCleanupSuperTables();
+}
+
+// todo move to name.h, add length of table name
+static void mnodeExtractTableName(char* tableId, char* name) {
+  int pos = -1;
+  int num = 0;
+  for (pos = 0; tableId[pos] != 0; ++pos) {
+    if (tableId[pos] == '.') num++;
+    if (num == 2) break;
+  }
+
+  if (num == 2) {
+    strcpy(name, tableId + pos + 1);
+  }
+}
+
+static int32_t mnodeProcessCreateTableMsg(SMnodeMsg *pMsg) {
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pCreate->db);
+  if (pMsg->pDb == NULL) {
+    mError("app:%p:%p, table:%s, failed to create, db not selected", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreate->tableId);
+  if (pMsg->pTable != NULL && pMsg->retry == 0) {
+    if (pCreate->getMeta) {
+      mDebug("app:%p:%p, table:%s, continue to get meta", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+      return mnodeGetChildTableMeta(pMsg);
+    } else if (pCreate->igExists) {
+      mDebug("app:%p:%p, table:%s, is already exist", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+      return TSDB_CODE_SUCCESS;
+    } else {
+      mError("app:%p:%p, table:%s, failed to create, table already exist", pMsg->rpcMsg.ahandle, pMsg,
+             pCreate->tableId);
+      return TSDB_CODE_MND_TABLE_ALREADY_EXIST;
+    }
+  }
+
+  if (pCreate->numOfTags != 0) {
+    mDebug("app:%p:%p, table:%s, create stable msg is received from thandle:%p", pMsg->rpcMsg.ahandle, pMsg,
+           pCreate->tableId, pMsg->rpcMsg.handle);
+    return mnodeProcessCreateSuperTableMsg(pMsg);
+  } else {
+    mDebug("app:%p:%p, table:%s, create ctable msg is received from thandle:%p", pMsg->rpcMsg.ahandle, pMsg,
+           pCreate->tableId, pMsg->rpcMsg.handle);
+    return mnodeProcessCreateChildTableMsg(pMsg);
+  }
+}
+
+static int32_t mnodeProcessDropTableMsg(SMnodeMsg *pMsg) {
+  SCMDropTableMsg *pDrop = pMsg->rpcMsg.pCont;
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pDrop->tableId);
+  if (pMsg->pDb == NULL) {
+    mError("app:%p:%p, table:%s, failed to drop table, db not selected or db in dropping", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
+    mError("app:%p:%p, table:%s, failed to drop table, in monitor database", pMsg->rpcMsg.ahandle, pMsg,
+           pDrop->tableId);
+    return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
+  }
+
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pDrop->tableId);
+  if (pMsg->pTable == NULL) {
+    if (pDrop->igNotExists) {
+      mDebug("app:%p:%p, table:%s, table is not exist, treat as success", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
+      return TSDB_CODE_SUCCESS;
+    } else {
+      mError("app:%p:%p, table:%s, failed to drop table, table not exist", pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId);
+      return TSDB_CODE_MND_INVALID_TABLE_NAME;
+    }
+  }
+
+  if (pMsg->pTable->type == TSDB_SUPER_TABLE) {
+    SSuperTableObj *pSTable = (SSuperTableObj *)pMsg->pTable;
+    mInfo("app:%p:%p, table:%s, start to drop stable, uid:%" PRIu64 ", numOfChildTables:%d, sizeOfVgList:%d",
+          pMsg->rpcMsg.ahandle, pMsg, pDrop->tableId, pSTable->uid, pSTable->numOfTables, (int32_t)taosHashGetSize(pSTable->vgHash));
+    return mnodeProcessDropSuperTableMsg(pMsg);
+  } else {
+    SChildTableObj *pCTable = (SChildTableObj *)pMsg->pTable;
+    mInfo("app:%p:%p, table:%s, start to drop ctable, vgId:%d sid:%d uid:%" PRIu64, pMsg->rpcMsg.ahandle, pMsg,
+          pDrop->tableId, pCTable->vgId, pCTable->sid, pCTable->uid);
+    return mnodeProcessDropChildTableMsg(pMsg);
+  }
+}
+
+static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *pMsg) {
+  SCMTableInfoMsg *pInfo = pMsg->rpcMsg.pCont;
+  pInfo->createFlag = htons(pInfo->createFlag);
+  mDebug("app:%p:%p, table:%s, table meta msg is received from thandle:%p, createFlag:%d", pMsg->rpcMsg.ahandle, pMsg,
+         pInfo->tableId, pMsg->rpcMsg.handle, pInfo->createFlag);
+
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pInfo->tableId);
+  if (pMsg->pDb == NULL) {
+    mError("app:%p:%p, table:%s, failed to get table meta, db not selected", pMsg->rpcMsg.ahandle, pMsg,
+           pInfo->tableId);
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pInfo->tableId);
+  if (pMsg->pTable == NULL) {
+    if (!pInfo->createFlag) {
+      mError("app:%p:%p, table:%s, failed to get table meta, table not exist", pMsg->rpcMsg.ahandle, pMsg,
+             pInfo->tableId);
+      return TSDB_CODE_MND_INVALID_TABLE_NAME;
+    } else {
+      mDebug("app:%p:%p, table:%s, failed to get table meta, start auto create table ", pMsg->rpcMsg.ahandle, pMsg,
+             pInfo->tableId);
+      return mnodeAutoCreateChildTable(pMsg);
+    }
+  } else {
+    if (pMsg->pTable->type != TSDB_SUPER_TABLE) {
+      return mnodeGetChildTableMeta(pMsg);
+    } else {
+      return mnodeGetSuperTableMeta(pMsg);
+    }
+  }
+}
+
+static int32_t mnodeCreateSuperTableCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pTable = (SSuperTableObj *)pMsg->pTable;
+  assert(pTable);
+
+  if (code == TSDB_CODE_SUCCESS) {
+    mLInfo("stable:%s, is created in sdb, uid:%" PRIu64, pTable->info.tableId, pTable->uid);
+  } else {
+    mError("app:%p:%p, stable:%s, failed to create in sdb, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+           tstrerror(code));
+    SSdbOper desc = {.type = SDB_OPER_GLOBAL, .pObj = pTable, .table = tsSuperTableSdb};
+    sdbDeleteRow(&desc);
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
+  if (pMsg == NULL) return TSDB_CODE_MND_APP_ERROR;
+
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  SSuperTableObj *   pStable = calloc(1, sizeof(SSuperTableObj));
+  if (pStable == NULL) {
+    mError("app:%p:%p, table:%s, failed to create, no enough memory", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  pStable->info.tableId = strdup(pCreate->tableId);
+  pStable->info.type    = TSDB_SUPER_TABLE;
+  pStable->createdTime  = taosGetTimestampMs();
+  pStable->uid          = (((uint64_t) pStable->createdTime) << 16) + (sdbGetVersion() & ((1ul << 16) - 1ul));
+  pStable->sversion     = 0;
+  pStable->tversion     = 0;
+  pStable->numOfColumns = htons(pCreate->numOfColumns);
+  pStable->numOfTags    = htons(pCreate->numOfTags);
+
+  int32_t numOfCols = pStable->numOfColumns + pStable->numOfTags;
+  int32_t schemaSize = numOfCols * sizeof(SSchema);
+  pStable->schema = (SSchema *)calloc(1, schemaSize);
+  if (pStable->schema == NULL) {
+    free(pStable);
+    mError("app:%p:%p, table:%s, failed to create, no schema input", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+    return TSDB_CODE_MND_INVALID_TABLE_NAME;
+  }
+  memcpy(pStable->schema, pCreate->schema, numOfCols * sizeof(SSchema));
+
+  pStable->nextColId = 0;
+  for (int32_t col = 0; col < numOfCols; col++) {
+    SSchema *tschema = pStable->schema;
+    tschema[col].colId = pStable->nextColId++;
+    tschema[col].bytes = htons(tschema[col].bytes);
+    
+    // todo 1. check the length of each column; 2. check the total length of all columns
+    assert(tschema[col].type >= TSDB_DATA_TYPE_BOOL && tschema[col].type <= TSDB_DATA_TYPE_NCHAR);
+  }
+
+  pMsg->pTable = (STableObj *)pStable;
+  mnodeIncTableRef(pMsg->pTable);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .rowSize = sizeof(SSuperTableObj) + schemaSize,
+    .pMsg = pMsg,
+    .writeCb = mnodeCreateSuperTableCb
+  };
+
+  int32_t code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mnodeDestroySuperTable(pStable);
+    pMsg->pTable = NULL;
+    mError("app:%p:%p, table:%s, failed to create, sdb error", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+  }
+
+  return code;
+}
+
+static int32_t mnodeDropSuperTableCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pTable = (SSuperTableObj *)pMsg->pTable;
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, stable:%s, failed to drop, sdb error", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId);
+  } else {
+    mLInfo("app:%p:%p, stable:%s, is dropped from sdb", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId);
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessDropSuperTableMsg(SMnodeMsg *pMsg) {
+  if (pMsg == NULL) return TSDB_CODE_MND_APP_ERROR;
+
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+   if (pStable->vgHash != NULL /*pStable->numOfTables != 0*/) {
+    SHashMutableIterator *pIter = taosHashCreateIter(pStable->vgHash);
+    while (taosHashIterNext(pIter)) {
+      int32_t *pVgId = taosHashIterGet(pIter);
+      SVgObj *pVgroup = mnodeGetVgroup(*pVgId);
+      if (pVgroup == NULL) break;
+
+      SMDDropSTableMsg *pDrop = rpcMallocCont(sizeof(SMDDropSTableMsg));
+      pDrop->contLen = htonl(sizeof(SMDDropSTableMsg));
+      pDrop->vgId = htonl(pVgroup->vgId);
+      pDrop->uid = htobe64(pStable->uid);
+      mnodeExtractTableName(pStable->info.tableId, pDrop->tableId);
+
+      mInfo("app:%p:%p, stable:%s, send drop stable msg to vgId:%d", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+             pVgroup->vgId);
+      SRpcEpSet epSet = mnodeGetEpSetFromVgroup(pVgroup);
+      SRpcMsg   rpcMsg = {.pCont = pDrop, .contLen = sizeof(SMDDropSTableMsg), .msgType = TSDB_MSG_TYPE_MD_DROP_STABLE};
+      dnodeSendMsgToDnode(&epSet, &rpcMsg);
+      mnodeDecVgroupRef(pVgroup);
+    }
+    taosHashDestroyIter(pIter);
+
+    mnodeDropAllChildTablesInStable(pStable);
+  } 
+  
+  SSdbOper oper = {
+    .type  = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj  = pStable,
+    .pMsg  = pMsg,
+    .writeCb = mnodeDropSuperTableCb
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("app:%p:%p, table:%s, failed to drop, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+           tstrerror(code));
+  }
+
+  return code;
+}
+
+static int32_t mnodeFindSuperTableTagIndex(SSuperTableObj *pStable, const char *tagName) {
+  SSchema *schema = (SSchema *) pStable->schema;
+  for (int32_t tag = 0; tag < pStable->numOfTags; tag++) {
+    if (strcasecmp(schema[pStable->numOfColumns + tag].name, tagName) == 0) {
+      return tag;
+    }
+  }
+
+  return -1;
+}
+
+static int32_t mnodeAddSuperTableTagCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, add tag result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+          tstrerror(code));
+
+  return code;
+}
+
+static int32_t mnodeAddSuperTableTag(SMnodeMsg *pMsg, SSchema schema[], int32_t ntags) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  if (pStable->numOfTags + ntags > TSDB_MAX_TAGS) {
+    mError("app:%p:%p, stable:%s, add tag, too many tags", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId);
+    return TSDB_CODE_MND_TOO_MANY_TAGS;
+  }
+
+  for (int32_t i = 0; i < ntags; i++) {
+    if (mnodeFindSuperTableColumnIndex(pStable, schema[i].name) > 0) {
+      mError("app:%p:%p, stable:%s, add tag, column:%s already exist", pMsg->rpcMsg.ahandle, pMsg,
+             pStable->info.tableId, schema[i].name);
+      return TSDB_CODE_MND_TAG_ALREAY_EXIST;
+    }
+
+    if (mnodeFindSuperTableTagIndex(pStable, schema[i].name) > 0) {
+      mError("app:%p:%p, stable:%s, add tag, tag:%s already exist", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+             schema[i].name);
+      return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
+    }
+  }
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ntags);
+
+  memcpy(pStable->schema + pStable->numOfColumns + pStable->numOfTags, schema, sizeof(SSchema) * ntags);
+
+  SSchema *tschema = (SSchema *)(pStable->schema + pStable->numOfColumns + pStable->numOfTags);
+  for (int32_t i = 0; i < ntags; i++) {
+    tschema[i].colId = pStable->nextColId++;
+  }
+
+  pStable->numOfTags += ntags;
+  pStable->tversion++;
+
+  mInfo("app:%p:%p, stable %s, start to add tag %s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         schema[0].name);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeAddSuperTableTagCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeDropSuperTableTagCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, drop tag result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+          tstrerror(code));
+  return code;
+}
+
+static int32_t mnodeDropSuperTableTag(SMnodeMsg *pMsg, char *tagName) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindSuperTableTagIndex(pStable, tagName);
+  if (col < 0) {
+    mError("app:%p:%p, stable:%s, drop tag, tag:%s not exist", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+           tagName);
+    return TSDB_CODE_MND_TAG_NOT_EXIST;
+  }
+
+  memmove(pStable->schema + pStable->numOfColumns + col, pStable->schema + pStable->numOfColumns + col + 1,
+          sizeof(SSchema) * (pStable->numOfTags - col - 1));
+  pStable->numOfTags--;
+  pStable->tversion++;
+
+  mInfo("app:%p:%p, stable %s, start to drop tag %s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId, tagName);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeDropSuperTableTagCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeModifySuperTableTagNameCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, modify tag result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         tstrerror(code));
+  return code;
+}
+
+static int32_t mnodeModifySuperTableTagName(SMnodeMsg *pMsg, char *oldTagName, char *newTagName) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindSuperTableTagIndex(pStable, oldTagName);
+  if (col < 0) {
+    mError("app:%p:%p, stable:%s, failed to modify table tag, oldName: %s, newName: %s", pMsg->rpcMsg.ahandle, pMsg,
+           pStable->info.tableId, oldTagName, newTagName);
+    return TSDB_CODE_MND_TAG_NOT_EXIST;
+  }
+
+  // int32_t  rowSize = 0;
+  uint32_t len = strlen(newTagName);
+  if (len >= TSDB_COL_NAME_LEN) {
+    return TSDB_CODE_MND_COL_NAME_TOO_LONG;
+  }
+
+  if (mnodeFindSuperTableTagIndex(pStable, newTagName) >= 0) {
+    return TSDB_CODE_MND_TAG_ALREAY_EXIST;
+  }
+  
+  // update
+  SSchema *schema = (SSchema *) (pStable->schema + pStable->numOfColumns + col);
+  tstrncpy(schema->name, newTagName, sizeof(schema->name));
+
+  mInfo("app:%p:%p, stable %s, start to modify tag %s to %s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         oldTagName, newTagName);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeModifySuperTableTagNameCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeFindSuperTableColumnIndex(SSuperTableObj *pStable, char *colName) {
+  SSchema *schema = (SSchema *) pStable->schema;
+  for (int32_t col = 0; col < pStable->numOfColumns; col++) {
+    if (strcasecmp(schema[col].name, colName) == 0) {
+      return col;
+    }
+  }
+
+  return -1;
+}
+
+static int32_t mnodeAddSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, add column result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+          tstrerror(code));
+  return code;
+}
+
+static int32_t mnodeAddSuperTableColumn(SMnodeMsg *pMsg, SSchema schema[], int32_t ncols) {
+  SDbObj *pDb = pMsg->pDb;
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  if (ncols <= 0) {
+    mError("app:%p:%p, stable:%s, add column, ncols:%d <= 0", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId, ncols);
+    return TSDB_CODE_MND_APP_ERROR;
+  }
+
+  for (int32_t i = 0; i < ncols; i++) {
+    if (mnodeFindSuperTableColumnIndex(pStable, schema[i].name) > 0) {
+      mError("app:%p:%p, stable:%s, add column, column:%s already exist", pMsg->rpcMsg.ahandle, pMsg,
+             pStable->info.tableId, schema[i].name);
+      return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
+    }
+
+    if (mnodeFindSuperTableTagIndex(pStable, schema[i].name) > 0) {
+      mError("app:%p:%p, stable:%s, add column, tag:%s already exist", pMsg->rpcMsg.ahandle, pMsg,
+             pStable->info.tableId, schema[i].name);
+      return TSDB_CODE_MND_TAG_ALREAY_EXIST;
+    }
+  }
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize + sizeof(SSchema) * ncols);
+
+  memmove(pStable->schema + pStable->numOfColumns + ncols, pStable->schema + pStable->numOfColumns,
+          sizeof(SSchema) * pStable->numOfTags);
+  memcpy(pStable->schema + pStable->numOfColumns, schema, sizeof(SSchema) * ncols);
+
+  SSchema *tschema = (SSchema *) (pStable->schema + pStable->numOfColumns);
+  for (int32_t i = 0; i < ncols; i++) {
+    tschema[i].colId = pStable->nextColId++;
+  }
+
+  pStable->numOfColumns += ncols;
+  pStable->sversion++;
+
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+  if (pAcct != NULL) {
+    pAcct->acctInfo.numOfTimeSeries += (ncols * pStable->numOfTables);
+    mnodeDecAcctRef(pAcct);
+  }
+
+  mInfo("app:%p:%p, stable %s, start to add column", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeAddSuperTableColumnCb
+  };
+
+ return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeDropSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, delete column result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         tstrerror(code));
+  return code;
+}
+
+static int32_t mnodeDropSuperTableColumn(SMnodeMsg *pMsg, char *colName) {
+  SDbObj *pDb = pMsg->pDb;
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindSuperTableColumnIndex(pStable, colName);
+  if (col <= 0) {
+    mError("app:%p:%p, stable:%s, drop column, column:%s not exist", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+           colName);
+    return TSDB_CODE_MND_FIELD_NOT_EXIST;
+  }
+
+  memmove(pStable->schema + col, pStable->schema + col + 1,
+          sizeof(SSchema) * (pStable->numOfColumns + pStable->numOfTags - col - 1));
+
+  pStable->numOfColumns--;
+  pStable->sversion++;
+
+  int32_t schemaSize = sizeof(SSchema) * (pStable->numOfTags + pStable->numOfColumns);
+  pStable->schema = realloc(pStable->schema, schemaSize);
+
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+  if (pAcct != NULL) {
+    pAcct->acctInfo.numOfTimeSeries -= pStable->numOfTables;
+    mnodeDecAcctRef(pAcct);
+  }
+
+  mInfo("app:%p:%p, stable %s, start to delete column", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeDropSuperTableColumnCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeChangeSuperTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, stable %s, change column result:%s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         tstrerror(code));
+  return code;
+}
+
+static int32_t mnodeChangeSuperTableColumn(SMnodeMsg *pMsg, char *oldName, char *newName) {
+  SSuperTableObj *pStable = (SSuperTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindSuperTableColumnIndex(pStable, oldName);
+  if (col < 0) {
+    mError("app:%p:%p, stable:%s, change column, oldName: %s, newName: %s", pMsg->rpcMsg.ahandle, pMsg,
+           pStable->info.tableId, oldName, newName);
+    return TSDB_CODE_MND_FIELD_NOT_EXIST;
+  }
+
+  // int32_t  rowSize = 0;
+  uint32_t len = strlen(newName);
+  if (len >= TSDB_COL_NAME_LEN) {
+    return TSDB_CODE_MND_COL_NAME_TOO_LONG;
+  }
+
+  if (mnodeFindSuperTableColumnIndex(pStable, newName) >= 0) {
+    return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
+  }
+  
+  // update
+  SSchema *schema = (SSchema *) (pStable->schema + col);
+  tstrncpy(schema->name, newName, sizeof(schema->name));
+
+  mInfo("app:%p:%p, stable %s, start to modify column %s to %s", pMsg->rpcMsg.ahandle, pMsg, pStable->info.tableId,
+         oldName, newName);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsSuperTableSdb,
+    .pObj = pStable,
+    .pMsg = pMsg,
+    .writeCb = mnodeChangeSuperTableColumnCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+// show super tables
+static int32_t mnodeGetShowSuperTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+    
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  SSchema tbnameSchema = tGetTableNameColumnSchema();
+  pShow->bytes[cols] = tbnameSchema.bytes;
+  pSchema[cols].type = tbnameSchema.type;
+  strcpy(pSchema[cols].name, "name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "columns");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "tags");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "tables");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+
+  pShow->numOfRows = pDb->numOfSuperTables;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  mnodeDecDbRef(pDb);
+  return 0;
+}
+
+// retrieve super tables
+int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t         numOfRows = 0;
+  char *          pWrite;
+  int32_t         cols = 0;
+  SSuperTableObj *pTable = NULL;
+  char            prefix[64] = {0};
+  int32_t         prefixLen;
+
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return 0;
+  }
+
+  tstrncpy(prefix, pDb->name, 64);
+  strcat(prefix, TS_PATH_DELIMITER);
+  prefixLen = strlen(prefix);
+
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+  char stableName[TSDB_TABLE_NAME_LEN] = {0};
+
+  while (numOfRows < rows) {    
+    pShow->pIter = mnodeGetNextSuperTable(pShow->pIter, &pTable);
+    if (pTable == NULL) break;
+    if (strncmp(pTable->info.tableId, prefix, prefixLen)) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    memset(stableName, 0, tListLen(stableName));
+    mnodeExtractTableName(pTable->info.tableId, stableName);
+
+    if (pShow->payloadLen > 0 && patternMatch(pShow->payload, stableName, sizeof(stableName) - 1, &info) != TSDB_PATTERN_MATCH) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+  
+    int16_t len = strnlen(stableName, TSDB_TABLE_NAME_LEN - 1);
+    *(int16_t*) pWrite = len;
+    pWrite += sizeof(int16_t); // todo refactor
+  
+    strncpy(pWrite, stableName, len);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pTable->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pTable->numOfColumns;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pTable->numOfTags;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = pTable->numOfTables;
+    cols++;
+
+    numOfRows++;
+    mnodeDecTableRef(pTable);
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 5;
+
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  mnodeDecDbRef(pDb);
+
+  return numOfRows;
+}
+
+void mnodeDropAllSuperTables(SDbObj *pDropDb) {
+  void *  pIter= NULL;
+  int32_t numOfTables = 0;
+  int32_t dbNameLen = strlen(pDropDb->name);
+  SSuperTableObj *pTable = NULL;
+
+  mInfo("db:%s, all super tables will be dropped from sdb", pDropDb->name);
+
+  while (1) {
+    pIter = mnodeGetNextSuperTable(pIter, &pTable);
+    if (pTable == NULL) break;
+
+    if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsSuperTableSdb,
+        .pObj = pTable,
+      };
+      sdbDeleteRow(&oper);
+      numOfTables ++;
+    }
+
+    mnodeDecTableRef(pTable);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("db:%s, all super tables:%d is dropped from sdb", pDropDb->name, numOfTables);
+}
+
+static int32_t mnodeSetSchemaFromSuperTable(SSchema *pSchema, SSuperTableObj *pTable) {
+  int32_t numOfCols = pTable->numOfColumns + pTable->numOfTags;
+  assert(numOfCols <= TSDB_MAX_COLUMNS);
+  
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    tstrncpy(pSchema->name, pTable->schema[i].name, sizeof(pSchema->name));
+    pSchema->type  = pTable->schema[i].type;
+    pSchema->bytes = htons(pTable->schema[i].bytes);
+    pSchema->colId = htons(pTable->schema[i].colId);
+    pSchema++;
+  }
+
+  return (pTable->numOfColumns + pTable->numOfTags) * sizeof(SSchema);
+}
+
+static int32_t mnodeGetSuperTableMeta(SMnodeMsg *pMsg) {
+  SSuperTableObj *pTable = (SSuperTableObj *)pMsg->pTable;
+  STableMetaMsg *pMeta   = rpcMallocCont(sizeof(STableMetaMsg) + sizeof(SSchema) * (TSDB_MAX_TAGS + TSDB_MAX_COLUMNS + 16));
+  if (pMeta == NULL) {
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+  pMeta->uid          = htobe64(pTable->uid);
+  pMeta->sversion     = htons(pTable->sversion);
+  pMeta->tversion     = htons(pTable->tversion);
+  pMeta->precision    = pMsg->pDb->cfg.precision;
+  pMeta->numOfTags    = (uint8_t)pTable->numOfTags;
+  pMeta->numOfColumns = htons((int16_t)pTable->numOfColumns);
+  pMeta->tableType    = pTable->info.type;
+  pMeta->contLen      = sizeof(STableMetaMsg) + mnodeSetSchemaFromSuperTable(pMeta->schema, pTable);
+  tstrncpy(pMeta->tableId, pTable->info.tableId, sizeof(pMeta->tableId));
+
+  pMsg->rpcRsp.len = pMeta->contLen;
+  pMeta->contLen = htons(pMeta->contLen);
+
+  pMsg->rpcRsp.rsp = pMeta;
+
+  mDebug("app:%p:%p, stable:%s, uid:%" PRIu64 " table meta is retrieved", pMsg->rpcMsg.ahandle, pMsg,
+         pTable->info.tableId, pTable->uid);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeProcessSuperTableVgroupMsg(SMnodeMsg *pMsg) {
+  SCMSTableVgroupMsg *pInfo = pMsg->rpcMsg.pCont;
+  int32_t numOfTable = htonl(pInfo->numOfTables);
+
+  // reserve space
+  int32_t contLen = sizeof(SCMSTableVgroupRspMsg) + 32 * sizeof(SCMVgroupInfo) + sizeof(SVgroupsInfo); 
+  for (int32_t i = 0; i < numOfTable; ++i) {
+    char *stableName = (char*)pInfo + sizeof(SCMSTableVgroupMsg) + (TSDB_TABLE_FNAME_LEN) * i;
+    SSuperTableObj *pTable = mnodeGetSuperTable(stableName);
+    if (pTable != NULL && pTable->vgHash != NULL) {
+      contLen += (taosHashGetSize(pTable->vgHash) * sizeof(SCMVgroupInfo) + sizeof(SVgroupsInfo));
+    } 
+    mnodeDecTableRef(pTable);
+  }
+
+  SCMSTableVgroupRspMsg *pRsp = rpcMallocCont(contLen);
+  if (pRsp == NULL) {
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  pRsp->numOfTables = 0;
+  char *msg = (char *)pRsp + sizeof(SCMSTableVgroupRspMsg);
+
+  for (int32_t i = 0; i < numOfTable; ++i) {
+    char *          stableName = (char *)pInfo + sizeof(SCMSTableVgroupMsg) + (TSDB_TABLE_FNAME_LEN)*i;
+    SSuperTableObj *pTable = mnodeGetSuperTable(stableName);
+    if (pTable == NULL) {
+      mError("app:%p:%p, stable:%s, not exist while get stable vgroup info", pMsg->rpcMsg.ahandle, pMsg, stableName);
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+    if (pTable->vgHash == NULL) {
+      mError("app:%p:%p, stable:%s, no vgroup exist while get stable vgroup info", pMsg->rpcMsg.ahandle, pMsg,
+             stableName);
+      mnodeDecTableRef(pTable);
+
+      // even this super table has no corresponding table, still return
+      pRsp->numOfTables++;
+
+      SVgroupsInfo *pVgroupInfo = (SVgroupsInfo *)msg;
+      pVgroupInfo->numOfVgroups = 0;
+      
+      msg += sizeof(SVgroupsInfo);
+    } else {
+      SVgroupsInfo *pVgroupInfo = (SVgroupsInfo *)msg;
+
+      SHashMutableIterator *pIter = taosHashCreateIter(pTable->vgHash);
+      int32_t               vgSize = 0;
+      while (taosHashIterNext(pIter)) {
+        int32_t *pVgId = taosHashIterGet(pIter);
+        SVgObj * pVgroup = mnodeGetVgroup(*pVgId);
+        if (pVgroup == NULL) continue;
+
+        pVgroupInfo->vgroups[vgSize].vgId = htonl(pVgroup->vgId);
+        for (int32_t vn = 0; vn < pVgroup->numOfVnodes; ++vn) {
+          SDnodeObj *pDnode = pVgroup->vnodeGid[vn].pDnode;
+          if (pDnode == NULL) break;
+
+          tstrncpy(pVgroupInfo->vgroups[vgSize].epAddr[vn].fqdn, pDnode->dnodeFqdn, TSDB_FQDN_LEN);
+          pVgroupInfo->vgroups[vgSize].epAddr[vn].port = htons(pDnode->dnodePort);
+
+          pVgroupInfo->vgroups[vgSize].numOfEps++;
+        }
+
+        vgSize++;
+        mnodeDecVgroupRef(pVgroup);
+      }
+
+      taosHashDestroyIter(pIter);
+      mnodeDecTableRef(pTable);
+
+      pVgroupInfo->numOfVgroups = htonl(vgSize);
+
+      // one table is done, try the next table
+      msg += sizeof(SVgroupsInfo) + vgSize * sizeof(SCMVgroupInfo);
+      pRsp->numOfTables++;
+    }
+  }
+
+  if (pRsp->numOfTables != numOfTable) {
+    rpcFreeCont(pRsp);
+    return TSDB_CODE_MND_INVALID_TABLE_NAME;
+  } else {
+    pRsp->numOfTables = htonl(pRsp->numOfTables);
+    pMsg->rpcRsp.rsp = pRsp;
+    pMsg->rpcRsp.len = msg - (char *)pRsp;
+
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static void mnodeProcessDropSuperTableRsp(SRpcMsg *rpcMsg) {
+  mInfo("drop stable rsp received, result:%s", tstrerror(rpcMsg->code));
+}
+
+static void *mnodeBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableObj *pTable) {
+  STagData *  pTagData = NULL;
+  int32_t tagDataLen = 0;
+  int32_t totalCols = 0;
+  int32_t contLen = 0;
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    totalCols = pTable->superTable->numOfColumns + pTable->superTable->numOfTags;
+    contLen = sizeof(SMDCreateTableMsg) + totalCols * sizeof(SSchema) + pTable->sqlLen;
+    if (pMsg != NULL) {
+      pTagData = (STagData *)pMsg->schema;
+      tagDataLen = htonl(pTagData->dataLen);
+      contLen += tagDataLen;
+    }
+  } else {
+    totalCols = pTable->numOfColumns;
+    contLen = sizeof(SMDCreateTableMsg) + totalCols * sizeof(SSchema) + pTable->sqlLen;
+  }
+
+  SMDCreateTableMsg *pCreate = rpcMallocCont(contLen);
+  if (pCreate == NULL) {
+    terrno = TSDB_CODE_MND_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  mnodeExtractTableName(pTable->info.tableId, pCreate->tableId);
+  pCreate->contLen       = htonl(contLen);
+  pCreate->vgId          = htonl(pTable->vgId);
+  pCreate->tableType     = pTable->info.type;
+  pCreate->createdTime   = htobe64(pTable->createdTime);
+  pCreate->sid           = htonl(pTable->sid);
+  pCreate->sqlDataLen    = htonl(pTable->sqlLen);
+  pCreate->uid           = htobe64(pTable->uid);
+  
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    mnodeExtractTableName(pTable->superTable->info.tableId, pCreate->superTableId);
+    pCreate->numOfColumns  = htons(pTable->superTable->numOfColumns);
+    pCreate->numOfTags     = htons(pTable->superTable->numOfTags);
+    pCreate->sversion      = htonl(pTable->superTable->sversion);
+    pCreate->tversion      = htonl(pTable->superTable->tversion);
+    pCreate->tagDataLen    = htonl(tagDataLen);
+    pCreate->superTableUid = htobe64(pTable->superTable->uid);
+  } else {
+    pCreate->numOfColumns  = htons(pTable->numOfColumns);
+    pCreate->numOfTags     = 0;
+    pCreate->sversion      = htonl(pTable->sversion);
+    pCreate->tversion      = 0;
+    pCreate->tagDataLen    = 0;
+    pCreate->superTableUid = 0;
+  }
+ 
+  SSchema *pSchema = (SSchema *) pCreate->data;
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    memcpy(pSchema, pTable->superTable->schema, totalCols * sizeof(SSchema));
+  } else {
+    memcpy(pSchema, pTable->schema, totalCols * sizeof(SSchema));
+  }
+  for (int32_t col = 0; col < totalCols; ++col) {
+    pSchema->bytes = htons(pSchema->bytes);
+    pSchema->colId = htons(pSchema->colId);
+    pSchema++;
+  }
+
+  if (pTable->info.type == TSDB_CHILD_TABLE && pMsg != NULL) {
+    memcpy(pCreate->data + totalCols * sizeof(SSchema), pTagData->data, tagDataLen);
+  }
+
+  if (pTable->info.type == TSDB_STREAM_TABLE) {
+    memcpy(pCreate->data + totalCols * sizeof(SSchema), pTable->sql, pTable->sqlLen);
+  }
+
+  return pCreate;
+}
+
+static int32_t mnodeDoCreateChildTableFp(SMnodeMsg *pMsg) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  assert(pTable);
+
+  mDebug("app:%p:%p, table:%s, created in mnode, vgId:%d sid:%d, uid:%" PRIu64, pMsg->rpcMsg.ahandle, pMsg,
+         pTable->info.tableId, pTable->vgId, pTable->sid, pTable->uid);
+
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  SMDCreateTableMsg *pMDCreate = mnodeBuildCreateChildTableMsg(pCreate, pTable);
+  if (pMDCreate == NULL) {
+    return terrno;
+  }
+
+  SRpcEpSet epSet = mnodeGetEpSetFromVgroup(pMsg->pVgroup);
+  SRpcMsg rpcMsg = {
+      .ahandle = pMsg,
+      .pCont   = pMDCreate,
+      .contLen = htonl(pMDCreate->contLen),
+      .code    = 0,
+      .msgType = TSDB_MSG_TYPE_MD_CREATE_TABLE
+  };
+
+  dnodeSendMsgToDnode(&epSet, &rpcMsg);
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+static int32_t mnodeDoCreateChildTableCb(SMnodeMsg *pMsg, int32_t code) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  assert(pTable);
+
+  if (code == TSDB_CODE_SUCCESS) {
+    if (pCreate->getMeta) {
+      mDebug("app:%p:%p, table:%s, created in dnode and continue to get meta, thandle:%p", pMsg->rpcMsg.ahandle, pMsg,
+             pTable->info.tableId, pMsg->rpcMsg.handle);
+
+      pMsg->retry = 0;
+      dnodeReprocessMnodeWriteMsg(pMsg);
+    } else {
+      mDebug("app:%p:%p, table:%s, created in dnode, thandle:%p", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+             pMsg->rpcMsg.handle);
+
+      dnodeSendRpcMnodeWriteRsp(pMsg, TSDB_CODE_SUCCESS);
+    }
+    return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+  } else {
+    mError("app:%p:%p, table:%s, failed to create table sid:%d, uid:%" PRIu64 ", reason:%s", pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId, pTable->sid, pTable->uid, tstrerror(code));
+    SSdbOper desc = {.type = SDB_OPER_GLOBAL, .pObj = pTable, .table = tsChildTableSdb};
+    sdbDeleteRow(&desc);
+    return code;
+  }
+}
+
+static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
+  SVgObj *pVgroup = pMsg->pVgroup;
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  SChildTableObj *pTable = calloc(1, sizeof(SChildTableObj));
+  if (pTable == NULL) {
+    mError("app:%p:%p, table:%s, failed to alloc memory", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  if (pCreate->numOfColumns == 0) {
+    pTable->info.type = TSDB_CHILD_TABLE;
+  } else {
+    pTable->info.type = TSDB_NORMAL_TABLE;
+  }
+
+  pTable->info.tableId = strdup(pCreate->tableId);  
+  pTable->createdTime  = taosGetTimestampMs();
+  pTable->sid          = tid;
+  pTable->vgId         = pVgroup->vgId;
+    
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
+    STagData *pTagData = (STagData *) pCreate->schema;  // it is a tag key
+    if (pMsg->pSTable == NULL) pMsg->pSTable = mnodeGetSuperTable(pTagData->name);
+    if (pMsg->pSTable == NULL) {
+      mError("app:%p:%p, table:%s, corresponding super table:%s does not exist", pMsg->rpcMsg.ahandle, pMsg,
+             pCreate->tableId, pTagData->name);
+      mnodeDestroyChildTable(pTable);
+      return TSDB_CODE_MND_INVALID_TABLE_NAME;
+    }
+
+    pTable->suid = pMsg->pSTable->uid;
+    pTable->uid = (((uint64_t)pTable->vgId) << 48) + ((((uint64_t)pTable->sid) & ((1ul << 24) - 1ul)) << 24) +
+                  ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
+    pTable->superTable = pMsg->pSTable;
+  } else {
+    if (pTable->info.type == TSDB_SUPER_TABLE) {
+      int64_t us = taosGetTimestampUs();
+      pTable->uid = (us << 24) + ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
+    } else {
+      pTable->uid = (((uint64_t)pTable->vgId) << 48) + ((((uint64_t)pTable->sid) & ((1ul << 24) - 1ul)) << 24) +
+                    ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
+    }
+
+    pTable->sversion     = 0;
+    pTable->numOfColumns = htons(pCreate->numOfColumns);
+    pTable->sqlLen       = htons(pCreate->sqlLen);
+
+    int32_t numOfCols  = pTable->numOfColumns;
+    int32_t schemaSize = numOfCols * sizeof(SSchema);
+    pTable->schema     = (SSchema *) calloc(1, schemaSize);
+    if (pTable->schema == NULL) {
+      free(pTable);
+      return TSDB_CODE_MND_OUT_OF_MEMORY;
+    }
+    memcpy(pTable->schema, pCreate->schema, numOfCols * sizeof(SSchema));
+
+    pTable->nextColId = 0;
+    for (int32_t col = 0; col < numOfCols; col++) {
+      SSchema *tschema   = pTable->schema;
+      tschema[col].colId = pTable->nextColId++;
+      tschema[col].bytes = htons(tschema[col].bytes);
+    }
+
+    if (pTable->sqlLen != 0) {
+      pTable->info.type = TSDB_STREAM_TABLE;
+      pTable->sql = calloc(1, pTable->sqlLen);
+      if (pTable->sql == NULL) {
+        free(pTable);
+        return TSDB_CODE_MND_OUT_OF_MEMORY;
+      }
+      memcpy(pTable->sql, (char *) (pCreate->schema) + numOfCols * sizeof(SSchema), pTable->sqlLen);
+      pTable->sql[pTable->sqlLen - 1] = 0;
+      mDebug("app:%p:%p, table:%s, stream sql len:%d sql:%s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+             pTable->sqlLen, pTable->sql);
+    }
+  }
+
+  pMsg->pTable = (STableObj *)pTable;
+  mnodeIncTableRef(pMsg->pTable);
+
+  SSdbOper desc = {
+    .type  = SDB_OPER_GLOBAL,
+    .pObj  = pTable,
+    .table = tsChildTableSdb,
+    .pMsg  = pMsg,
+    .reqFp = mnodeDoCreateChildTableFp
+  };
+  
+  int32_t code = sdbInsertRow(&desc);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mnodeDestroyChildTable(pTable);
+    pMsg->pTable = NULL;
+    mError("app:%p:%p, table:%s, failed to create, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId,
+           tstrerror(code));
+  } else {
+    mDebug("app:%p:%p, table:%s, allocated in vgroup, vgId:%d sid:%d uid:%" PRIu64, pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId, pVgroup->vgId, pTable->sid, pTable->uid);
+  }
+
+  return code;
+}
+
+static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
+  SCMCreateTableMsg *pCreate = pMsg->rpcMsg.pCont;
+  int32_t code = grantCheck(TSDB_GRANT_TIMESERIES);
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, table:%s, failed to create, grant timeseries failed", pMsg->rpcMsg.ahandle, pMsg,
+           pCreate->tableId);
+    return code;
+  }
+
+  if (pMsg->retry == 0) {
+    if (pMsg->pTable == NULL) {
+      SVgObj *pVgroup = NULL;
+      int32_t sid = 0;
+      code = mnodeGetAvailableVgroup(pMsg, &pVgroup, &sid);
+      if (code != TSDB_CODE_SUCCESS) {
+        mDebug("app:%p:%p, table:%s, failed to get available vgroup, reason:%s", pMsg->rpcMsg.ahandle, pMsg,
+               pCreate->tableId, tstrerror(code));
+        return code;
+      }
+
+      if (pMsg->pVgroup != NULL) {
+        mnodeDecVgroupRef(pMsg->pVgroup);
+      }
+
+      pMsg->pVgroup = pVgroup;
+      mnodeIncVgroupRef(pVgroup);
+
+      return mnodeDoCreateChildTable(pMsg, sid);
+    }
+  } else {
+    if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pCreate->tableId);
+  }
+
+  if (pMsg->pTable == NULL) {
+    mError("app:%p:%p, table:%s, object not found, retry:%d reason:%s", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId, pMsg->retry,
+           tstrerror(terrno));
+    return terrno;
+  } else {
+    mDebug("app:%p:%p, table:%s, send create msg to vnode again", pMsg->rpcMsg.ahandle, pMsg, pCreate->tableId);
+    return mnodeDoCreateChildTableFp(pMsg);
+  }
+}
+
+static int32_t mnodeSendDropChildTableMsg(SMnodeMsg *pMsg, bool needReturn) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  mLInfo("app:%p:%p, ctable:%s, is dropped from sdb", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId);
+
+  SMDDropTableMsg *pDrop = rpcMallocCont(sizeof(SMDDropTableMsg));
+  if (pDrop == NULL) {
+    mError("app:%p:%p, ctable:%s, failed to drop ctable, no enough memory", pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  tstrncpy(pDrop->tableId, pTable->info.tableId, TSDB_TABLE_FNAME_LEN);
+  pDrop->vgId    = htonl(pTable->vgId);
+  pDrop->contLen = htonl(sizeof(SMDDropTableMsg));
+  pDrop->sid     = htonl(pTable->sid);
+  pDrop->uid     = htobe64(pTable->uid);
+
+  SRpcEpSet epSet = mnodeGetEpSetFromVgroup(pMsg->pVgroup);
+
+  mInfo("app:%p:%p, ctable:%s, send drop ctable msg, vgId:%d sid:%d uid:%" PRIu64, pMsg->rpcMsg.ahandle, pMsg,
+        pDrop->tableId, pTable->vgId, pTable->sid, pTable->uid);
+
+  SRpcMsg rpcMsg = {
+    .ahandle = pMsg,
+    .pCont   = pDrop,
+    .contLen = sizeof(SMDDropTableMsg),
+    .code    = 0,
+    .msgType = TSDB_MSG_TYPE_MD_DROP_TABLE
+  };
+
+  if (!needReturn) rpcMsg.ahandle = NULL;
+
+  dnodeSendMsgToDnode(&epSet, &rpcMsg);
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+static int32_t mnodeDropChildTableCb(SMnodeMsg *pMsg, int32_t code) {
+  if (code != TSDB_CODE_SUCCESS) {
+    SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+    mError("app:%p:%p, ctable:%s, failed to drop, sdb error", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId);
+    return code;
+  } 
+
+  return mnodeSendDropChildTableMsg(pMsg, true);
+}
+
+static int32_t mnodeProcessDropChildTableMsg(SMnodeMsg *pMsg) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  if (pMsg->pVgroup == NULL) pMsg->pVgroup = mnodeGetVgroup(pTable->vgId);
+  if (pMsg->pVgroup == NULL) {
+    mError("app:%p:%p, table:%s, failed to drop ctable, vgroup not exist", pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId);
+    return TSDB_CODE_MND_APP_ERROR;
+  }
+
+  SSdbOper oper = {
+    .type  = SDB_OPER_GLOBAL,
+    .table = tsChildTableSdb,
+    .pObj  = pTable,
+    .pMsg  = pMsg,
+    .writeCb = mnodeDropChildTableCb
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("app:%p:%p, ctable:%s, failed to drop, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+           tstrerror(code));
+  }
+
+  return code;
+}
+
+static int32_t mnodeFindNormalTableColumnIndex(SChildTableObj *pTable, char *colName) {
+  SSchema *schema = (SSchema *) pTable->schema;
+  for (int32_t col = 0; col < pTable->numOfColumns; col++) {
+    if (strcasecmp(schema[col].name, colName) == 0) {
+      return col;
+    }
+  }
+
+  return -1;
+}
+
+static int32_t mnodeAlterNormalTableColumnCb(SMnodeMsg *pMsg, int32_t code) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, ctable %s, failed to alter column, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+           tstrerror(code));
+    return code;
+  }
+
+  SMDCreateTableMsg *pMDCreate = mnodeBuildCreateChildTableMsg(NULL, pTable);
+  if (pMDCreate == NULL) {
+    return terrno;
+  }
+
+  if (pMsg->pVgroup == NULL) {
+    pMsg->pVgroup = mnodeGetVgroup(pTable->vgId);
+    if (pMsg->pVgroup == NULL) {
+      rpcFreeCont(pMDCreate);
+      mError("app:%p:%p, ctable %s, vgId:%d not exist in mnode", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+             pTable->vgId);
+      return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+    }
+  }
+
+  SRpcEpSet epSet = mnodeGetEpSetFromVgroup(pMsg->pVgroup);
+  SRpcMsg rpcMsg = {
+      .ahandle = pMsg,
+      .pCont   = pMDCreate,
+      .contLen = htonl(pMDCreate->contLen),
+      .code    = 0,
+      .msgType = TSDB_MSG_TYPE_MD_ALTER_TABLE
+  };
+
+  mDebug("app:%p:%p, ctable %s, send alter column msg to vgId:%d", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+         pMsg->pVgroup->vgId);
+
+  dnodeSendMsgToDnode(&epSet, &rpcMsg);
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+static int32_t mnodeAddNormalTableColumn(SMnodeMsg *pMsg, SSchema schema[], int32_t ncols) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  SDbObj *pDb = pMsg->pDb;
+  if (ncols <= 0) {
+    mError("app:%p:%p, ctable:%s, add column, ncols:%d <= 0", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId, ncols);
+    return TSDB_CODE_MND_APP_ERROR;
+  }
+
+  for (int32_t i = 0; i < ncols; i++) {
+    if (mnodeFindNormalTableColumnIndex(pTable, schema[i].name) > 0) {
+      mError("app:%p:%p, ctable:%s, add column, column:%s already exist", pMsg->rpcMsg.ahandle, pMsg,
+             pTable->info.tableId, schema[i].name);
+      return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
+    }
+  }
+
+  int32_t schemaSize = pTable->numOfColumns * sizeof(SSchema);
+  pTable->schema = realloc(pTable->schema, schemaSize + sizeof(SSchema) * ncols);
+
+  memcpy(pTable->schema + pTable->numOfColumns, schema, sizeof(SSchema) * ncols);
+
+  SSchema *tschema = (SSchema *) (pTable->schema + pTable->numOfColumns);
+  for (int32_t i = 0; i < ncols; i++) {
+    tschema[i].colId = pTable->nextColId++;
+  }
+
+  pTable->numOfColumns += ncols;
+  pTable->sversion++;
+  
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+  if (pAcct != NULL) {
+    pAcct->acctInfo.numOfTimeSeries += ncols;
+    mnodeDecAcctRef(pAcct);
+  }
+
+  mInfo("app:%p:%p, ctable %s, start to add column", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsChildTableSdb,
+    .pObj = pTable,
+    .pMsg = pMsg,
+    .writeCb = mnodeAlterNormalTableColumnCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeDropNormalTableColumn(SMnodeMsg *pMsg, char *colName) {
+  SDbObj *pDb = pMsg->pDb;
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindNormalTableColumnIndex(pTable, colName);
+  if (col <= 0) {
+    mError("app:%p:%p, ctable:%s, drop column, column:%s not exist", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+           colName);
+    return TSDB_CODE_MND_FIELD_NOT_EXIST;
+  }
+
+  memmove(pTable->schema + col, pTable->schema + col + 1, sizeof(SSchema) * (pTable->numOfColumns - col - 1));
+  pTable->numOfColumns--;
+  pTable->sversion++;
+
+  SAcctObj *pAcct = mnodeGetAcct(pDb->acct);
+  if (pAcct != NULL) {
+    pAcct->acctInfo.numOfTimeSeries--;
+    mnodeDecAcctRef(pAcct);
+  }
+
+  mInfo("app:%p:%p, ctable %s, start to drop column %s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId, colName);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsChildTableSdb,
+    .pObj = pTable,
+    .pMsg = pMsg,
+    .writeCb = mnodeAlterNormalTableColumnCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeChangeNormalTableColumn(SMnodeMsg *pMsg, char *oldName, char *newName) {
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+  int32_t col = mnodeFindNormalTableColumnIndex(pTable, oldName);
+  if (col < 0) {
+    mError("app:%p:%p, ctable:%s, change column, oldName: %s, newName: %s", pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId, oldName, newName);
+    return TSDB_CODE_MND_FIELD_NOT_EXIST;
+  }
+
+  // int32_t  rowSize = 0;
+  uint32_t len = strlen(newName);
+  if (len >= TSDB_COL_NAME_LEN) {
+    return TSDB_CODE_MND_COL_NAME_TOO_LONG;
+  }
+
+  if (mnodeFindNormalTableColumnIndex(pTable, newName) >= 0) {
+    return TSDB_CODE_MND_FIELD_ALREAY_EXIST;
+  }
+  
+  // update
+  SSchema *schema = (SSchema *) (pTable->schema + col);
+  tstrncpy(schema->name, newName, sizeof(schema->name));
+
+  mInfo("app:%p:%p, ctable %s, start to modify column %s to %s", pMsg->rpcMsg.ahandle, pMsg, pTable->info.tableId,
+         oldName, newName);
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsChildTableSdb,
+    .pObj = pTable,
+    .pMsg = pMsg,
+    .writeCb = mnodeAlterNormalTableColumnCb
+  };
+
+  return sdbUpdateRow(&oper);
+}
+
+static int32_t mnodeSetSchemaFromNormalTable(SSchema *pSchema, SChildTableObj *pTable) {
+  int32_t numOfCols = pTable->numOfColumns;
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    strcpy(pSchema->name, pTable->schema[i].name);
+    pSchema->type  = pTable->schema[i].type;
+    pSchema->bytes = htons(pTable->schema[i].bytes);
+    pSchema->colId = htons(pTable->schema[i].colId);
+    pSchema++;
+  }
+
+  return numOfCols * sizeof(SSchema);
+}
+
+static int32_t mnodeDoGetChildTableMeta(SMnodeMsg *pMsg, STableMetaMsg *pMeta) {
+  SDbObj *pDb = pMsg->pDb;
+  SChildTableObj *pTable = (SChildTableObj *)pMsg->pTable;
+
+  pMeta->uid       = htobe64(pTable->uid);
+  pMeta->sid       = htonl(pTable->sid);
+  pMeta->precision = pDb->cfg.precision;
+  pMeta->tableType = pTable->info.type;
+  tstrncpy(pMeta->tableId, pTable->info.tableId, TSDB_TABLE_FNAME_LEN);
+  if (pTable->superTable != NULL) {
+    tstrncpy(pMeta->sTableId, pTable->superTable->info.tableId, TSDB_TABLE_FNAME_LEN);
+  }
+
+  if (pTable->info.type == TSDB_CHILD_TABLE && pTable->superTable != NULL) {
+    pMeta->sversion     = htons(pTable->superTable->sversion);
+    pMeta->tversion     = htons(pTable->superTable->tversion);
+    pMeta->numOfTags    = (int8_t)pTable->superTable->numOfTags;
+    pMeta->numOfColumns = htons((int16_t)pTable->superTable->numOfColumns);
+    pMeta->contLen      = sizeof(STableMetaMsg) + mnodeSetSchemaFromSuperTable(pMeta->schema, pTable->superTable);
+  } else {
+    pMeta->sversion     = htons(pTable->sversion);
+    pMeta->tversion     = 0;
+    pMeta->numOfTags    = 0;
+    pMeta->numOfColumns = htons((int16_t)pTable->numOfColumns);
+    pMeta->contLen      = sizeof(STableMetaMsg) + mnodeSetSchemaFromNormalTable(pMeta->schema, pTable); 
+  }
+
+  if (pMsg->pVgroup == NULL) pMsg->pVgroup = mnodeGetVgroup(pTable->vgId);
+  if (pMsg->pVgroup == NULL) {
+    mError("app:%p:%p, table:%s, failed to get table meta, vgroup not exist", pMsg->rpcMsg.ahandle, pMsg,
+           pTable->info.tableId);
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  for (int32_t i = 0; i < pMsg->pVgroup->numOfVnodes; ++i) {
+    SDnodeObj *pDnode = mnodeGetDnode(pMsg->pVgroup->vnodeGid[i].dnodeId);
+    if (pDnode == NULL) break;
+    strcpy(pMeta->vgroup.epAddr[i].fqdn, pDnode->dnodeFqdn);
+    pMeta->vgroup.epAddr[i].port = htons(pDnode->dnodePort + TSDB_PORT_DNODESHELL);
+    pMeta->vgroup.numOfEps++;
+    mnodeDecDnodeRef(pDnode);
+  }
+  pMeta->vgroup.vgId = htonl(pMsg->pVgroup->vgId);
+
+  mDebug("app:%p:%p, table:%s, uid:%" PRIu64 " table meta is retrieved, vgId:%d sid:%d", pMsg->rpcMsg.ahandle, pMsg,
+         pTable->info.tableId, pTable->uid, pTable->vgId, pTable->sid);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
+  SCMTableInfoMsg *pInfo = pMsg->rpcMsg.pCont;
+  STagData *pTags = (STagData *)pInfo->tags;
+  int32_t tagLen = htonl(pTags->dataLen);
+  if (pTags->name[0] == 0) {
+    mError("app:%p:%p, table:%s, failed to create table on demand for stable is empty, tagLen:%d", pMsg->rpcMsg.ahandle,
+           pMsg, pInfo->tableId, tagLen);
+    return TSDB_CODE_MND_INVALID_STABLE_NAME; 
+  }
+
+  int32_t contLen = sizeof(SCMCreateTableMsg) + offsetof(STagData, data) + tagLen;
+  SCMCreateTableMsg *pCreateMsg = rpcMallocCont(contLen);
+  if (pCreateMsg == NULL) {
+    mError("app:%p:%p, table:%s, failed to create table while get meta info, no enough memory", pMsg->rpcMsg.ahandle,
+           pMsg, pInfo->tableId);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  size_t size = sizeof(pInfo->tableId);
+  tstrncpy(pCreateMsg->tableId, pInfo->tableId, size);
+  tstrncpy(pCreateMsg->db, pMsg->pDb->name, sizeof(pCreateMsg->db));
+  pCreateMsg->igExists = 1;
+  pCreateMsg->getMeta = 1;
+  pCreateMsg->contLen = htonl(contLen);
+
+  memcpy(pCreateMsg->schema, pTags, contLen - sizeof(SCMCreateTableMsg));
+  mDebug("app:%p:%p, table:%s, start to create on demand, tagLen:%d stable:%s",
+         pMsg->rpcMsg.ahandle, pMsg, pInfo->tableId, tagLen, pTags->name);
+
+  rpcFreeCont(pMsg->rpcMsg.pCont);
+  pMsg->rpcMsg.msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE;
+  pMsg->rpcMsg.pCont = pCreateMsg;
+  pMsg->rpcMsg.contLen = contLen;
+  
+  return TSDB_CODE_MND_ACTION_NEED_REPROCESSED;
+}
+
+static int32_t mnodeGetChildTableMeta(SMnodeMsg *pMsg) {
+  STableMetaMsg *pMeta =
+      rpcMallocCont(sizeof(STableMetaMsg) + sizeof(SSchema) * (TSDB_MAX_TAGS + TSDB_MAX_COLUMNS + 16));
+  if (pMeta == NULL) {
+    mError("app:%p:%p, table:%s, failed to get table meta, no enough memory", pMsg->rpcMsg.ahandle, pMsg,
+           pMsg->pTable->tableId);
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  mnodeDoGetChildTableMeta(pMsg, pMeta);
+
+  pMsg->rpcRsp.len = pMeta->contLen;
+  pMsg->rpcRsp.rsp = pMeta;
+  pMeta->contLen = htons(pMeta->contLen);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeDropAllChildTablesInVgroups(SVgObj *pVgroup) {
+  void *  pIter = NULL;
+  int32_t numOfTables = 0;
+  SChildTableObj *pTable = NULL;
+
+  mInfo("vgId:%d, all child tables will be dropped from sdb", pVgroup->vgId);
+
+  while (1) {
+    pIter = mnodeGetNextChildTable(pIter, &pTable);
+    if (pTable == NULL) break;
+
+    if (pTable->vgId == pVgroup->vgId) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsChildTableSdb,
+        .pObj = pTable,
+      };
+      sdbDeleteRow(&oper);
+      numOfTables++;
+    }
+    mnodeDecTableRef(pTable);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("vgId:%d, all child tables is dropped from sdb", pVgroup->vgId);
+}
+
+void mnodeDropAllChildTables(SDbObj *pDropDb) {
+  void *  pIter = NULL;
+  int32_t numOfTables = 0;
+  int32_t dbNameLen = strlen(pDropDb->name);
+  SChildTableObj *pTable = NULL;
+
+  mInfo("db:%s, all child tables will be dropped from sdb", pDropDb->name);
+
+  while (1) {
+    pIter = mnodeGetNextChildTable(pIter, &pTable);
+    if (pTable == NULL) break;
+
+    if (strncmp(pDropDb->name, pTable->info.tableId, dbNameLen) == 0) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsChildTableSdb,
+        .pObj = pTable,
+      };
+      sdbDeleteRow(&oper);
+      numOfTables++;
+    }
+    mnodeDecTableRef(pTable);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("db:%s, all child tables:%d is dropped from sdb", pDropDb->name, numOfTables);
+}
+
+static void mnodeDropAllChildTablesInStable(SSuperTableObj *pStable) {
+  void *  pIter = NULL;
+  int32_t numOfTables = 0;
+  SChildTableObj *pTable = NULL;
+
+  mInfo("stable:%s, all child tables:%d will dropped from sdb", pStable->info.tableId, pStable->numOfTables);
+
+  while (1) {
+    pIter = mnodeGetNextChildTable(pIter, &pTable);
+    if (pTable == NULL) break;
+
+    if (pTable->superTable == pStable) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsChildTableSdb,
+        .pObj = pTable,
+      };
+      sdbDeleteRow(&oper);
+      numOfTables++;
+    }
+
+    mnodeDecTableRef(pTable);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("stable:%s, all child tables:%d is dropped from sdb", pStable->info.tableId, numOfTables);
+}
+
+#if 0
+static SChildTableObj* mnodeGetTableByPos(int32_t vnode, int32_t sid) {
+  SVgObj *pVgroup = mnodeGetVgroup(vnode);
+  if (pVgroup == NULL) return NULL;
+
+  SChildTableObj *pTable = pVgroup->tableList[sid - 1];
+  mnodeIncTableRef((STableObj *)pTable);
+
+  mnodeDecVgroupRef(pVgroup);
+  return pTable;
+}
+#endif
+
+static int32_t mnodeProcessTableCfgMsg(SMnodeMsg *pMsg) {
+  return TSDB_CODE_COM_OPS_NOT_SUPPORT;
+#if 0  
+  SDMConfigTableMsg *pCfg = pMsg->rpcMsg.pCont;
+  pCfg->dnodeId = htonl(pCfg->dnodeId);
+  pCfg->vgId = htonl(pCfg->vgId);
+  pCfg->sid = htonl(pCfg->sid);
+  mDebug("app:%p:%p, dnode:%d, vgId:%d sid:%d, receive table config msg", pMsg->rpcMsg.ahandle, pMsg, pCfg->dnodeId,
+         pCfg->vgId, pCfg->sid);
+
+  SChildTableObj *pTable = mnodeGetTableByPos(pCfg->vgId, pCfg->sid);
+  if (pTable == NULL) {
+    mError("app:%p:%p, dnode:%d, vgId:%d sid:%d, table not found", pMsg->rpcMsg.ahandle, pMsg, pCfg->dnodeId,
+           pCfg->vgId, pCfg->sid);
+    return TSDB_CODE_MND_INVALID_TABLE_ID;
+  }
+
+  SMDCreateTableMsg *pCreate = NULL;
+  pCreate = mnodeBuildCreateChildTableMsg(NULL, (SChildTableObj *)pTable);
+  mnodeDecTableRef(pTable);
+    
+  if (pCreate == NULL) return terrno;
+  
+  pMsg->rpcRsp.rsp = pCreate;
+  pMsg->rpcRsp.len = htonl(pCreate->contLen);
+  return TSDB_CODE_SUCCESS;
+#endif  
+}
+
+// handle drop child response
+static void mnodeProcessDropChildTableRsp(SRpcMsg *rpcMsg) {
+  if (rpcMsg->ahandle == NULL) return;
+
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  mnodeMsg->received++;
+
+  SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
+  assert(pTable);
+
+  mInfo("app:%p:%p, table:%s, drop table rsp received, vgId:%d sid:%d uid:%" PRIu64 ", thandle:%p result:%s",
+        mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId, pTable->vgId, pTable->sid, pTable->uid,
+        mnodeMsg->rpcMsg.handle, tstrerror(rpcMsg->code));
+
+  if (rpcMsg->code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, table:%s, failed to drop in dnode, vgId:%d sid:%d uid:%" PRIu64 ", reason:%s",
+           mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId, pTable->vgId, pTable->sid, pTable->uid,
+           tstrerror(rpcMsg->code));
+    dnodeSendRpcMnodeWriteRsp(mnodeMsg, rpcMsg->code);
+    return;
+  }
+
+  if (mnodeMsg->pVgroup == NULL) mnodeMsg->pVgroup = mnodeGetVgroup(pTable->vgId);
+  if (mnodeMsg->pVgroup == NULL) {
+    mError("app:%p:%p, table:%s, failed to get vgroup", mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId);
+    dnodeSendRpcMnodeWriteRsp(mnodeMsg, TSDB_CODE_MND_VGROUP_NOT_EXIST);
+    return;
+  }
+
+  if (mnodeMsg->pVgroup->numOfTables <= 0) {
+    mInfo("app:%p:%p, vgId:%d, all tables is dropped, drop vgroup", mnodeMsg->rpcMsg.ahandle, mnodeMsg,
+           mnodeMsg->pVgroup->vgId);
+    mnodeDropVgroup(mnodeMsg->pVgroup, NULL);
+  }
+
+  dnodeSendRpcMnodeWriteRsp(mnodeMsg, TSDB_CODE_SUCCESS);
+}
+
+/*
+ * handle create table response from dnode
+ *   if failed, drop the table cached
+ */
+static void mnodeProcessCreateChildTableRsp(SRpcMsg *rpcMsg) {
+  if (rpcMsg->ahandle == NULL) return;
+
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  mnodeMsg->received++;
+
+  SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
+  assert(pTable);
+
+  // If the table is deleted by another thread during creation, stop creating and send drop msg to vnode
+  if (sdbCheckRowDeleted(tsChildTableSdb, pTable)) {
+    mDebug("app:%p:%p, table:%s, create table rsp received, but a deleting opertion incoming, vgId:%d sid:%d uid:%" PRIu64,
+           mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId, pTable->vgId, pTable->sid, pTable->uid);
+
+    // if the vgroup is already dropped from hash, it can't be accquired by pTable->vgId
+    // so the refCount of vgroup can not be decreased
+    // SVgObj *pVgroup = mnodeGetVgroup(pTable->vgId);
+    // if (pVgroup == NULL) {
+    //   mnodeRemoveTableFromVgroup(mnodeMsg->pVgroup, pTable);
+    // }
+    // mnodeDecVgroupRef(pVgroup);
+
+    mnodeSendDropChildTableMsg(mnodeMsg, false);
+    rpcMsg->code = TSDB_CODE_SUCCESS;
+    dnodeSendRpcMnodeWriteRsp(mnodeMsg, rpcMsg->code);
+    return;
+  }
+
+  if (rpcMsg->code == TSDB_CODE_SUCCESS || rpcMsg->code == TSDB_CODE_TDB_TABLE_ALREADY_EXIST) {
+     SSdbOper desc = {
+      .type  = SDB_OPER_GLOBAL,
+      .pObj  = pTable,
+      .table = tsChildTableSdb,
+      .pMsg  = mnodeMsg,
+      .writeCb = mnodeDoCreateChildTableCb
+    };
+    
+    int32_t code = sdbInsertRowImp(&desc);
+    if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      mnodeMsg->pTable = NULL;
+      mnodeDestroyChildTable(pTable);
+      dnodeSendRpcMnodeWriteRsp(mnodeMsg, code);
+    }
+  } else {
+    if (mnodeMsg->retry++ < 10) {
+      mDebug("app:%p:%p, table:%s, create table rsp received, need retry, times:%d result:%s thandle:%p",
+             mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId, mnodeMsg->retry, tstrerror(rpcMsg->code),
+             mnodeMsg->rpcMsg.handle);
+
+      dnodeDelayReprocessMnodeWriteMsg(mnodeMsg);
+    } else {
+      mError("app:%p:%p, table:%s, failed to create in dnode, result:%s thandle:%p", mnodeMsg->rpcMsg.ahandle, mnodeMsg,
+             pTable->info.tableId, tstrerror(rpcMsg->code), mnodeMsg->rpcMsg.handle);
+
+      SSdbOper oper = {.type = SDB_OPER_GLOBAL, .table = tsChildTableSdb, .pObj = pTable};
+      sdbDeleteRow(&oper);
+
+      dnodeSendRpcMnodeWriteRsp(mnodeMsg, rpcMsg->code);
+    }
+  }
+}
+
+static void mnodeProcessAlterTableRsp(SRpcMsg *rpcMsg) {
+  if (rpcMsg->ahandle == NULL) return;
+
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  mnodeMsg->received++;
+
+  SChildTableObj *pTable = (SChildTableObj *)mnodeMsg->pTable;
+  assert(pTable);
+
+  if (rpcMsg->code == TSDB_CODE_SUCCESS || rpcMsg->code == TSDB_CODE_TDB_TABLE_ALREADY_EXIST) {
+    mDebug("app:%p:%p, ctable:%s, altered in dnode, thandle:%p result:%s", mnodeMsg->rpcMsg.ahandle, mnodeMsg,
+           pTable->info.tableId, mnodeMsg->rpcMsg.handle, tstrerror(rpcMsg->code));
+
+    dnodeSendRpcMnodeWriteRsp(mnodeMsg, TSDB_CODE_SUCCESS);
+  } else {
+    if (mnodeMsg->retry++ < 3) {
+      mDebug("app:%p:%p, table:%s, alter table rsp received, need retry, times:%d result:%s thandle:%p",
+             mnodeMsg->rpcMsg.ahandle, mnodeMsg, pTable->info.tableId, mnodeMsg->retry, tstrerror(rpcMsg->code),
+             mnodeMsg->rpcMsg.handle);
+
+      dnodeDelayReprocessMnodeWriteMsg(mnodeMsg);
+    } else {
+      mError("app:%p:%p, table:%s, failed to alter in dnode, result:%s thandle:%p", mnodeMsg->rpcMsg.ahandle, mnodeMsg,
+             pTable->info.tableId, tstrerror(rpcMsg->code), mnodeMsg->rpcMsg.handle);
+      dnodeSendRpcMnodeWriteRsp(mnodeMsg, rpcMsg->code);
+    }
+  }
+}
+
+static int32_t mnodeProcessMultiTableMetaMsg(SMnodeMsg *pMsg) {
+  SCMMultiTableInfoMsg *pInfo = pMsg->rpcMsg.pCont;
+  pInfo->numOfTables = htonl(pInfo->numOfTables);
+
+  int32_t totalMallocLen = 4 * 1024 * 1024;  // first malloc 4 MB, subsequent reallocation as twice
+  SMultiTableMeta *pMultiMeta = rpcMallocCont(totalMallocLen);
+  if (pMultiMeta == NULL) {
+    return TSDB_CODE_MND_OUT_OF_MEMORY;
+  }
+
+  pMultiMeta->contLen = sizeof(SMultiTableMeta);
+  pMultiMeta->numOfTables = 0;
+
+  for (int32_t t = 0; t < pInfo->numOfTables; ++t) {
+    char * tableId = (char *)(pInfo->tableIds + t * TSDB_TABLE_FNAME_LEN);
+    SChildTableObj *pTable = mnodeGetChildTable(tableId);
+    if (pTable == NULL) continue;
+
+    if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(tableId);
+    if (pMsg->pDb == NULL || pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    int availLen = totalMallocLen - pMultiMeta->contLen;
+    if (availLen <= sizeof(STableMetaMsg) + sizeof(SSchema) * (TSDB_MAX_TAGS + TSDB_MAX_COLUMNS + 16)) {
+      totalMallocLen *= 2;
+      pMultiMeta = rpcReallocCont(pMultiMeta, totalMallocLen);
+      if (pMultiMeta == NULL) {
+        mnodeDecTableRef(pTable);
+        return TSDB_CODE_MND_OUT_OF_MEMORY;
+      } else {
+        t--;
+        mnodeDecTableRef(pTable);
+        continue;
+      }
+    }
+
+    STableMetaMsg *pMeta = (STableMetaMsg *)(pMultiMeta->metas + pMultiMeta->contLen);
+    int32_t code = mnodeDoGetChildTableMeta(pMsg, pMeta);
+    if (code == TSDB_CODE_SUCCESS) {
+      pMultiMeta->numOfTables ++;
+      pMultiMeta->contLen += pMeta->contLen;
+    }
+
+    mnodeDecTableRef(pTable);
+  }
+
+  pMsg->rpcRsp.rsp = pMultiMeta;
+  pMsg->rpcRsp.len = pMultiMeta->contLen;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  SSchema s = tGetTableNameColumnSchema();
+  pShow->bytes[cols] = s.bytes;
+  pSchema[cols].type = s.type;
+  strcpy(pSchema[cols].name, "table_name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "columns");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  SSchema tbCol = tGetTableNameColumnSchema();
+  pShow->bytes[cols] = tbCol.bytes + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = tbCol.type;
+  strcpy(pSchema[cols].name, "stable_name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = pDb->numOfTables;
+  pShow->rowSize   = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  mnodeDecDbRef(pDb);
+  return 0;
+}
+
+static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return 0;
+  }
+
+  int32_t numOfRows  = 0;
+  SChildTableObj *pTable = NULL;
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+
+  char prefix[64] = {0};
+  tstrncpy(prefix, pDb->name, 64);
+  strcat(prefix, TS_PATH_DELIMITER);
+  int32_t prefixLen = strlen(prefix);
+
+  char* pattern = NULL;
+  if (pShow->payloadLen > 0) {
+    pattern = (char*)malloc(pShow->payloadLen + 1);
+    if (pattern == NULL) {
+      terrno = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      return 0;
+    }
+    memcpy(pattern, pShow->payload, pShow->payloadLen);
+    pattern[pShow->payloadLen] = 0;
+  }
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextChildTable(pShow->pIter, &pTable);
+    if (pTable == NULL) break;
+
+    // not belong to current db
+    if (strncmp(pTable->info.tableId, prefix, prefixLen)) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    char tableName[TSDB_TABLE_NAME_LEN] = {0};
+    
+    // pattern compare for table name
+    mnodeExtractTableName(pTable->info.tableId, tableName);
+
+    if (pattern != NULL && patternMatch(pattern, tableName, sizeof(tableName) - 1, &info) != TSDB_PATTERN_MATCH) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    int32_t cols = 0;
+
+    char *pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, tableName, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *) pWrite = pTable->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    if (pTable->info.type == TSDB_CHILD_TABLE) {
+      *(int16_t *)pWrite = pTable->superTable->numOfColumns;
+    } else {
+      *(int16_t *)pWrite = pTable->numOfColumns;
+    }
+
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    
+    memset(tableName, 0, sizeof(tableName));
+    if (pTable->info.type == TSDB_CHILD_TABLE) {
+      mnodeExtractTableName(pTable->superTable->info.tableId, tableName);
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, tableName, pShow->bytes[cols]);
+    }
+    
+    cols++;
+
+    numOfRows++;
+    mnodeDecTableRef(pTable);
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 4;
+
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  mnodeDecDbRef(pDb);
+  free(pattern);
+
+  return numOfRows;
+}
+
+static int32_t mnodeProcessAlterTableMsg(SMnodeMsg *pMsg) {
+  SCMAlterTableMsg *pAlter = pMsg->rpcMsg.pCont;
+  mDebug("app:%p:%p, table:%s, alter table msg is received from thandle:%p", pMsg->rpcMsg.ahandle, pMsg,
+         pAlter->tableId, pMsg->rpcMsg.handle);
+
+  if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDbByTableId(pAlter->tableId);
+  if (pMsg->pDb == NULL) {
+    mError("app:%p:%p, table:%s, failed to alter table, db not selected", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
+  }
+  
+  if (pMsg->pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pMsg->pDb->name, pMsg->pDb->status);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  if (mnodeCheckIsMonitorDB(pMsg->pDb->name, tsMonitorDbName)) {
+    mError("app:%p:%p, table:%s, failed to alter table, its log db", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
+    return TSDB_CODE_MND_MONITOR_DB_FORBIDDEN;
+  }
+
+  if (pMsg->pTable == NULL) pMsg->pTable = mnodeGetTable(pAlter->tableId);
+  if (pMsg->pTable == NULL) {
+    mError("app:%p:%p, table:%s, failed to alter table, table not exist", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
+    return TSDB_CODE_MND_INVALID_TABLE_NAME;
+  }
+
+  pAlter->type = htons(pAlter->type);
+  pAlter->numOfCols = htons(pAlter->numOfCols);
+  pAlter->tagValLen = htonl(pAlter->tagValLen);
+
+  if (pAlter->numOfCols > 2) {
+    mError("app:%p:%p, table:%s, error numOfCols:%d in alter table", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId,
+           pAlter->numOfCols);
+    return TSDB_CODE_MND_APP_ERROR;
+  }
+
+  for (int32_t i = 0; i < pAlter->numOfCols; ++i) {
+    pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes);
+  }
+
+  int32_t code = TSDB_CODE_COM_OPS_NOT_SUPPORT;
+  if (pMsg->pTable->type == TSDB_SUPER_TABLE) {
+    mDebug("app:%p:%p, table:%s, start to alter stable", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
+    if (pAlter->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
+      code = mnodeAddSuperTableTag(pMsg, pAlter->schema, 1);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN) {
+      code = mnodeDropSuperTableTag(pMsg, pAlter->schema[0].name);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
+      code = mnodeModifySuperTableTagName(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_ADD_COLUMN) {
+      code = mnodeAddSuperTableColumn(pMsg, pAlter->schema, 1);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
+      code = mnodeDropSuperTableColumn(pMsg, pAlter->schema[0].name);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
+      code = mnodeChangeSuperTableColumn(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+    } else {
+    }
+  } else {
+    mDebug("app:%p:%p, table:%s, start to alter ctable", pMsg->rpcMsg.ahandle, pMsg, pAlter->tableId);
+    if (pAlter->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
+      return TSDB_CODE_COM_OPS_NOT_SUPPORT;
+    } else if (pAlter->type == TSDB_ALTER_TABLE_ADD_COLUMN) {
+      code = mnodeAddNormalTableColumn(pMsg, pAlter->schema, 1);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
+      code = mnodeDropNormalTableColumn(pMsg, pAlter->schema[0].name);
+    } else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_COLUMN) {
+      code = mnodeChangeNormalTableColumn(pMsg, pAlter->schema[0].name, pAlter->schema[1].name);
+    } else {
+    }
+  }
+
+ return code;
+}
+
+static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  SSchema tbnameColSchema = tGetTableNameColumnSchema();
+  pShow->bytes[cols] = tbnameColSchema.bytes;
+  pSchema[cols].type = tbnameColSchema.type;
+  strcpy(pSchema[cols].name, "table_name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "created_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 2;
+  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+  strcpy(pSchema[cols].name, "columns");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_MAX_SQL_SHOW_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "sql");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = pDb->numOfTables;
+  pShow->rowSize   = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  mnodeDecDbRef(pDb);
+  return 0;
+}
+
+static int32_t mnodeRetrieveStreamTables(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return 0;
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return 0;
+  }
+  
+  int32_t numOfRows  = 0;
+  SChildTableObj *pTable = NULL;
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+
+  char prefix[64] = {0};
+  tstrncpy(prefix, pDb->name, 64);
+  strcat(prefix, TS_PATH_DELIMITER);
+  int32_t prefixLen = strlen(prefix);
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextChildTable(pShow->pIter, &pTable);
+    if (pTable == NULL) break;
+    
+    // not belong to current db
+    if (strncmp(pTable->info.tableId, prefix, prefixLen) || pTable->info.type != TSDB_STREAM_TABLE) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    char tableName[TSDB_TABLE_NAME_LEN] = {0};
+    
+    // pattern compare for table name
+    mnodeExtractTableName(pTable->info.tableId, tableName);
+
+    if (pShow->payloadLen > 0 && patternMatch(pShow->payload, tableName, sizeof(tableName) - 1, &info) != TSDB_PATTERN_MATCH) {
+      mnodeDecTableRef(pTable);
+      continue;
+    }
+
+    int32_t cols = 0;
+
+    char *pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, tableName, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *) pWrite = pTable->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int16_t *)pWrite = pTable->numOfColumns;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pTable->sql, pShow->bytes[cols]);    
+    cols++;
+
+    numOfRows++;
+    mnodeDecTableRef(pTable);
+  }
+
+  pShow->numOfReads += numOfRows;
+  const int32_t NUM_OF_COLUMNS = 4;
+
+  mnodeVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
+  mnodeDecDbRef(pDb);
+
+  return numOfRows;
+}
diff --git a/src/mnode/src/mnodeUser.c b/src/mnode/src/mnodeUser.c
new file mode 100644
index 0000000000000000000000000000000000000000..c03ff688d2282f931706e80331a884439d78ee04
--- /dev/null
+++ b/src/mnode/src/mnodeUser.c
@@ -0,0 +1,613 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "trpc.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "tgrant.h"
+#include "tdataformat.h"
+#include "tkey.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeMnode.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeUser.h"
+#include "mnodeWrite.h"
+#include "mnodePeer.h"
+
+static void *  tsUserSdb = NULL;
+static int32_t tsUserUpdateSize = 0;
+static int32_t mnodeGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static int32_t mnodeProcessCreateUserMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessAlterUserMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessDropUserMsg(SMnodeMsg *pMsg);
+static int32_t mnodeProcessAuthMsg(SMnodeMsg *pMsg);
+
+static int32_t mnodeUserActionDestroy(SSdbOper *pOper) {
+  taosTFree(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeUserActionInsert(SSdbOper *pOper) {
+  SUserObj *pUser = pOper->pObj;
+  SAcctObj *pAcct = mnodeGetAcct(pUser->acct);
+
+  if (pAcct != NULL) {
+    mnodeAddUserToAcct(pAcct, pUser);
+    mnodeDecAcctRef(pAcct);
+  } else {
+    mError("user:%s, acct:%s info not exist in sdb", pUser->user, pUser->acct);
+    return TSDB_CODE_MND_INVALID_ACCT;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeUserActionDelete(SSdbOper *pOper) {
+  SUserObj *pUser = pOper->pObj;
+  SAcctObj *pAcct = mnodeGetAcct(pUser->acct);
+
+  if (pAcct != NULL) {
+    mnodeDropUserFromAcct(pAcct, pUser);
+    mnodeDecAcctRef(pAcct);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeUserActionUpdate(SSdbOper *pOper) {
+  SUserObj *pUser = pOper->pObj;
+  SUserObj *pSaved = mnodeGetUser(pUser->user);
+  if (pUser != pSaved) {
+    memcpy(pSaved, pUser, tsUserUpdateSize);
+    free(pUser);
+  }
+  mnodeDecUserRef(pSaved);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeUserActionEncode(SSdbOper *pOper) {
+  SUserObj *pUser = pOper->pObj;
+  memcpy(pOper->rowData, pUser, tsUserUpdateSize);
+  pOper->rowSize = tsUserUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeUserActionDecode(SSdbOper *pOper) {
+  SUserObj *pUser = (SUserObj *)calloc(1, sizeof(SUserObj));
+  if (pUser == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pUser, pOper->rowData, tsUserUpdateSize);
+  pOper->pObj = pUser;
+  return TSDB_CODE_SUCCESS;
+}
+
+static void mnodePrintUserAuth() {
+  FILE *fp = fopen("auth.txt", "w");
+  if (!fp) {
+    mDebug("failed to auth.txt for write");
+    return;
+  }
+  
+  void *    pIter = NULL;
+  SUserObj *pUser = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextUser(pIter, &pUser);
+    if (pUser == NULL) break;
+
+    char *base64 = base64_encode((const unsigned char *)pUser->pass, TSDB_KEY_LEN * 2);
+    fprintf(fp, "user:%24s auth:%s\n", pUser->user, base64);
+    free(base64);
+
+    mnodeDecUserRef(pUser);
+  }
+
+  fflush(fp);
+  sdbFreeIter(pIter);
+  fclose(fp);
+}
+
+static int32_t mnodeUserActionRestored() {
+  int32_t numOfRows = sdbGetNumOfRows(tsUserSdb);
+  if (numOfRows <= 0 && dnodeIsFirstDeploy()) {
+    mInfo("dnode first deploy, create root user");
+    SAcctObj *pAcct = mnodeGetAcct(TSDB_DEFAULT_USER);
+    mnodeCreateUser(pAcct, TSDB_DEFAULT_USER, TSDB_DEFAULT_PASS, NULL);
+    mnodeCreateUser(pAcct, "monitor", tsInternalPass, NULL);
+    mnodeCreateUser(pAcct, "_"TSDB_DEFAULT_USER, tsInternalPass, NULL);
+    mnodeDecAcctRef(pAcct);
+  }
+
+  if (tsPrintAuth != 0) {
+    mInfo("print user auth, for -A parameter is set");
+    mnodePrintUserAuth();
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeInitUsers() {
+  SUserObj tObj;
+  tsUserUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_USER,
+    .tableName    = "users",
+    .hashSessions = TSDB_DEFAULT_USERS_HASH_SIZE,
+    .maxRowSize   = tsUserUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_STRING,
+    .insertFp     = mnodeUserActionInsert,
+    .deleteFp     = mnodeUserActionDelete,
+    .updateFp     = mnodeUserActionUpdate,
+    .encodeFp     = mnodeUserActionEncode,
+    .decodeFp     = mnodeUserActionDecode,
+    .destroyFp    = mnodeUserActionDestroy,
+    .restoredFp   = mnodeUserActionRestored
+  };
+
+  tsUserSdb = sdbOpenTable(&tableDesc);
+  if (tsUserSdb == NULL) {
+    mError("table:%s, failed to create hash", tableDesc.tableName);
+    return -1;
+  }
+
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_CREATE_USER, mnodeProcessCreateUserMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_ALTER_USER, mnodeProcessAlterUserMsg);
+  mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_DROP_USER, mnodeProcessDropUserMsg);
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_USER, mnodeGetUserMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_USER, mnodeRetrieveUsers);
+  mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_AUTH, mnodeProcessAuthMsg);
+   
+  mDebug("table:%s, hash is created", tableDesc.tableName);
+  return 0;
+}
+
+void mnodeCleanupUsers() {
+  sdbCloseTable(tsUserSdb);
+  tsUserSdb = NULL;
+}
+
+SUserObj *mnodeGetUser(char *name) {
+  return (SUserObj *)sdbGetRow(tsUserSdb, name);
+}
+
+void *mnodeGetNextUser(void *pIter, SUserObj **pUser) { 
+  return sdbFetchRow(tsUserSdb, pIter, (void **)pUser); 
+}
+
+void mnodeIncUserRef(SUserObj *pUser) { 
+  return sdbIncRef(tsUserSdb, pUser); 
+}
+
+void mnodeDecUserRef(SUserObj *pUser) { 
+  return sdbDecRef(tsUserSdb, pUser); 
+}
+
+static int32_t mnodeUpdateUser(SUserObj *pUser, void *pMsg) {
+  SSdbOper oper = {
+    .type  = SDB_OPER_GLOBAL,
+    .table = tsUserSdb,
+    .pObj  = pUser,
+    .pMsg  = pMsg
+  };
+
+  int32_t code = sdbUpdateRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("user:%s, failed to alter by %s, reason:%s", pUser->user, mnodeGetUserFromMsg(pMsg), tstrerror(code));
+  } else {
+    mLInfo("user:%s, is altered by %s", pUser->user, mnodeGetUserFromMsg(pMsg));
+  }
+
+  return code;
+}
+
+int32_t mnodeCreateUser(SAcctObj *pAcct, char *name, char *pass, void *pMsg) {
+  int32_t code = acctCheck(pAcct, ACCT_GRANT_USER);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  if (name[0] == 0) {
+    return TSDB_CODE_MND_INVALID_USER_FORMAT;
+  }
+
+  if (pass[0] == 0) {
+    return TSDB_CODE_MND_INVALID_PASS_FORMAT;
+  }
+
+  SUserObj *pUser = mnodeGetUser(name);
+  if (pUser != NULL) {
+    mDebug("user:%s, is already there", name);
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_USER_ALREADY_EXIST;
+  }
+
+  code = grantCheck(TSDB_GRANT_USER);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  pUser = calloc(1, sizeof(SUserObj));
+  tstrncpy(pUser->user, name, TSDB_USER_LEN);
+  taosEncryptPass((uint8_t*) pass, strlen(pass), pUser->pass);
+  strcpy(pUser->acct, pAcct->user);
+  pUser->createdTime = taosGetTimestampMs();
+  pUser->superAuth = 0;
+  pUser->writeAuth = 1;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0 || strcmp(pUser->user, pUser->acct) == 0) {
+    pUser->superAuth = 1;
+  }
+
+  SSdbOper oper = {
+    .type    = SDB_OPER_GLOBAL,
+    .table   = tsUserSdb,
+    .pObj    = pUser,
+    .rowSize = sizeof(SUserObj),
+    .pMsg    = pMsg
+  };
+
+  code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("user:%s, failed to create by %s, reason:%s", pUser->user, mnodeGetUserFromMsg(pMsg), tstrerror(code));
+    taosTFree(pUser);
+  } else {
+    mLInfo("user:%s, is created by %s", pUser->user, mnodeGetUserFromMsg(pMsg));
+  }
+
+  return code;
+}
+
+static int32_t mnodeDropUser(SUserObj *pUser, void *pMsg) {
+  SSdbOper oper = {
+    .type  = SDB_OPER_GLOBAL,
+    .table = tsUserSdb,
+    .pObj  = pUser,
+    .pMsg  = pMsg
+  };
+
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("user:%s, failed to drop by %s, reason:%s", pUser->user, mnodeGetUserFromMsg(pMsg), tstrerror(code));
+  } else {
+    mLInfo("user:%s, is dropped by %s", pUser->user, mnodeGetUserFromMsg(pMsg));
+  }
+
+  return code;
+}
+
+static int32_t mnodeGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SUserObj *pUser = mnodeGetUserFromConn(pConn);
+  if (pUser == NULL) {
+    return TSDB_CODE_MND_NO_USER_FROM_CONN;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "privilege");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "create_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "account");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  strcpy(pMeta->tableId, "show users");
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = pUser->pAcct->acctInfo.numOfUsers;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  mnodeDecUserRef(pUser);
+  return 0;
+}
+
+static int32_t mnodeRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t  numOfRows = 0;
+  SUserObj *pUser    = NULL;
+  int32_t  cols      = 0;
+  char     *pWrite;
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextUser(pShow->pIter, &pUser);
+    if (pUser == NULL) break;
+    
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->user, pShow->bytes[cols]);
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    if (pUser->superAuth) {
+      const char *src = "super";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
+    } else if (pUser->writeAuth) {
+      const char *src = "writable";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
+    } else {
+      const char *src = "readable";
+      STR_WITH_SIZE_TO_VARSTR(pWrite, src, strlen(src));
+    }
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pUser->createdTime;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->acct, pShow->bytes[cols]);
+    cols++;
+
+    numOfRows++;
+    mnodeDecUserRef(pUser);
+  }
+
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
+}
+
+SUserObj *mnodeGetUserFromConn(void *pConn) {
+  SRpcConnInfo connInfo = {0};
+  if (rpcGetConnInfo(pConn, &connInfo) == 0) {
+    return mnodeGetUser(connInfo.user);
+  } else {
+    mError("can not get user from conn:%p", pConn);
+    return NULL;
+  }
+}
+
+char *mnodeGetUserFromMsg(void *pMsg) {
+  SMnodeMsg *pMnodeMsg = pMsg;
+  if (pMnodeMsg != NULL && pMnodeMsg->pUser != NULL) {
+    return pMnodeMsg->pUser->user;
+  } else {
+    return "system";
+  }
+}
+
+static int32_t mnodeProcessCreateUserMsg(SMnodeMsg *pMsg) {
+  SUserObj *pOperUser = pMsg->pUser;
+  
+  if (pOperUser->superAuth) {
+    SCMCreateUserMsg *pCreate = pMsg->rpcMsg.pCont;
+    return mnodeCreateUser(pOperUser->pAcct, pCreate->user, pCreate->pass, pMsg);
+  } else {
+    mError("user:%s, no rights to create user", pOperUser->user);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+}
+
+static int32_t mnodeProcessAlterUserMsg(SMnodeMsg *pMsg) {
+  int32_t code;
+  SUserObj *pOperUser = pMsg->pUser;
+  
+  SCMAlterUserMsg *pAlter = pMsg->rpcMsg.pCont;
+  SUserObj *pUser = mnodeGetUser(pAlter->user);
+  if (pUser == NULL) {
+    return TSDB_CODE_MND_INVALID_USER;
+  }
+
+  if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) {
+    bool hasRight = false;
+    if (strcmp(pOperUser->user, TSDB_DEFAULT_USER) == 0) {
+      hasRight = true;
+    } else if (strcmp(pUser->user, pOperUser->user) == 0) {
+      hasRight = true;
+    } else if (pOperUser->superAuth) {
+      if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+        hasRight = false;
+      } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
+        hasRight = false;
+      } else {
+        hasRight = true;
+      }
+    }
+
+    if (hasRight) {
+      memset(pUser->pass, 0, sizeof(pUser->pass));
+      taosEncryptPass((uint8_t*)pAlter->pass, strlen(pAlter->pass), pUser->pass);
+      code = mnodeUpdateUser(pUser, pMsg);
+    } else {
+      mError("user:%s, no rights to alter user", pOperUser->user);
+      code = TSDB_CODE_MND_NO_RIGHTS;
+    }
+  } else if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) {
+    bool hasRight = false;
+
+    if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+      hasRight = false;
+    } else if (strcmp(pUser->user, pUser->acct) == 0) {
+      hasRight = false;
+    } else if (strcmp(pOperUser->user, TSDB_DEFAULT_USER) == 0) {
+      hasRight = true;
+    } else if (strcmp(pUser->user, pOperUser->user) == 0) {
+      hasRight = false;
+    } else if (pOperUser->superAuth) {
+      if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+        hasRight = false;
+      } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
+        hasRight = false;
+      } else {
+        hasRight = true;
+      }
+    }
+
+    if (pAlter->privilege == 1) { // super
+      hasRight = false;
+    }
+
+    if (hasRight) {
+      if (pAlter->privilege == 2) {  // read
+        pUser->superAuth = 0;
+        pUser->writeAuth = 0;
+      }
+      if (pAlter->privilege == 3) {  // write
+        pUser->superAuth = 0;
+        pUser->writeAuth = 1;
+      }
+
+      code = mnodeUpdateUser(pUser, pMsg);
+    } else {
+      mError("user:%s, no rights to alter user", pOperUser->user);
+      code = TSDB_CODE_MND_NO_RIGHTS;
+    }
+  } else {
+    mError("user:%s, no rights to alter user", pOperUser->user);
+    code = TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  mnodeDecUserRef(pUser);
+  return code;
+}
+
+static int32_t mnodeProcessDropUserMsg(SMnodeMsg *pMsg) {
+  int32_t code;
+  SUserObj *pOperUser = pMsg->pUser;
+
+  SCMDropUserMsg *pDrop = pMsg->rpcMsg.pCont;
+  SUserObj *pUser = mnodeGetUser(pDrop->user);
+  if (pUser == NULL) {
+    return TSDB_CODE_MND_INVALID_USER;
+  }
+
+  if (strcmp(pUser->user, "monitor") == 0 || strcmp(pUser->user, pUser->acct) == 0 ||
+    (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
+    mnodeDecUserRef(pUser);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  bool hasRight = false;
+  if (strcmp(pUser->user, TSDB_DEFAULT_USER) == 0) {
+    hasRight = false;
+  } else if (strcmp(pOperUser->user, TSDB_DEFAULT_USER) == 0) {
+    hasRight = true;
+  } else if (strcmp(pUser->user, pOperUser->user) == 0) {
+    hasRight = false;
+  } else if (pOperUser->superAuth) {
+    if (strcmp(pOperUser->acct, pUser->acct) != 0) {
+      hasRight = false;
+    } else {
+      hasRight = true;
+    }
+  }
+
+  if (hasRight) {
+    code = mnodeDropUser(pUser, pMsg);
+  } else {
+    code = TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  mnodeDecUserRef(pUser);
+  return code;
+}
+
+void mnodeDropAllUsers(SAcctObj *pAcct)  {
+  void *    pIter = NULL;
+  int32_t   numOfUsers = 0;
+  int32_t   acctNameLen = strlen(pAcct->user);
+  SUserObj *pUser = NULL;
+
+  while (1) {
+    pIter = mnodeGetNextUser(pIter, &pUser);
+    if (pUser == NULL) break;
+
+    if (strncmp(pUser->acct, pAcct->user, acctNameLen) == 0) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsUserSdb,
+        .pObj = pUser,
+      };
+      sdbDeleteRow(&oper);
+      numOfUsers++;
+    }
+
+    mnodeDecUserRef(pUser);
+  }
+
+  sdbFreeIter(pIter);
+
+  mDebug("acct:%s, all users:%d is dropped from sdb", pAcct->user, numOfUsers);
+}
+
+int32_t mnodeRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey) {
+  if (!sdbIsMaster()) {
+    *secret = 0;
+    mDebug("user:%s, failed to auth user, mnode is not master", user);
+    return TSDB_CODE_APP_NOT_READY;
+  }
+
+  SUserObj *pUser = mnodeGetUser(user);
+  if (pUser == NULL) {
+    *secret = 0;
+    mError("user:%s, failed to auth user, reason:%s", user, tstrerror(TSDB_CODE_MND_INVALID_USER));
+    return TSDB_CODE_MND_INVALID_USER;
+  } else {
+    *spi = 1;
+    *encrypt = 0;
+    *ckey = 0;
+
+    memcpy(secret, pUser->pass, TSDB_KEY_LEN);
+    mnodeDecUserRef(pUser);
+    mDebug("user:%s, auth info is returned", user);
+    return TSDB_CODE_SUCCESS;
+  }
+}
+
+static int32_t mnodeProcessAuthMsg(SMnodeMsg *pMsg) {
+  SDMAuthMsg *pAuthMsg = pMsg->rpcMsg.pCont;
+  SDMAuthRsp *pAuthRsp = rpcMallocCont(sizeof(SDMAuthRsp));
+  
+  pMsg->rpcRsp.rsp = pAuthRsp;
+  pMsg->rpcRsp.len = sizeof(SDMAuthRsp);
+  
+  return mnodeRetriveAuth(pAuthMsg->user, &pAuthRsp->spi, &pAuthRsp->encrypt, pAuthRsp->secret, pAuthRsp->ckey);
+}
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
new file mode 100644
index 0000000000000000000000000000000000000000..7dbf605405f1dc393c46be871651f0dab57c8f16
--- /dev/null
+++ b/src/mnode/src/mnodeVgroup.c
@@ -0,0 +1,1163 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tutil.h"
+#include "tsocket.h"
+#include "tidpool.h"
+#include "tsync.h"
+#include "tbalance.h"
+#include "tglobal.h"
+#include "tdataformat.h"
+#include "dnode.h"
+#include "mnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeProfile.h"
+#include "mnodeSdb.h"
+#include "mnodeShow.h"
+#include "mnodeTable.h"
+#include "mnodeVgroup.h"
+#include "mnodePeer.h"
+
+typedef enum {
+  TAOS_VG_STATUS_READY,
+  TAOS_VG_STATUS_DROPPING,
+  TAOS_VG_STATUS_CREATING,
+  TAOS_VG_STATUS_UPDATING,
+} EVgroupStatus;
+
+char* vgroupStatus[] = {
+  "ready",
+  "dropping",
+  "creating",
+  "updating"
+};
+
+static void   *tsVgroupSdb = NULL;
+static int32_t tsVgUpdateSize = 0;
+
+static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup);
+static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
+static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn);
+static void    mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg);
+static void    mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg);
+static void    mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg);
+static int32_t mnodeProcessVnodeCfgMsg(SMnodeMsg *pMsg) ;
+static void    mnodeSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle);
+
+static void mnodeDestroyVgroup(SVgObj *pVgroup) {
+  if (pVgroup->idPool) {
+    taosIdPoolCleanUp(pVgroup->idPool);
+    pVgroup->idPool = NULL;
+  }
+
+  taosTFree(pVgroup);
+}
+
+static int32_t mnodeVgroupActionDestroy(SSdbOper *pOper) {
+  mnodeDestroyVgroup(pOper->pObj);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionInsert(SSdbOper *pOper) {
+  SVgObj *pVgroup = pOper->pObj;
+
+  // refer to db
+  SDbObj *pDb = mnodeGetDb(pVgroup->dbName);
+  if (pDb == NULL) {
+    mError("vgId:%d, db:%s is not exist while insert into hash", pVgroup->vgId, pVgroup->dbName);
+    return TSDB_CODE_MND_INVALID_DB;
+  }
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("vgId:%d, db:%s status:%d, in dropping", pVgroup->vgId, pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  pVgroup->pDb = pDb;
+  pVgroup->status = TAOS_VG_STATUS_CREATING;
+  pVgroup->accessState = TSDB_VN_ALL_ACCCESS;
+  if (mnodeAllocVgroupIdPool(pVgroup) < 0) {
+    mError("vgId:%d, failed to init idpool for vgroups", pVgroup->vgId);
+    return -1;
+  }
+
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SDnodeObj *pDnode = mnodeGetDnode(pVgroup->vnodeGid[i].dnodeId);
+    if (pDnode != NULL) {
+      pVgroup->vnodeGid[i].pDnode = pDnode;
+      atomic_add_fetch_32(&pDnode->openVnodes, 1);
+      mnodeDecDnodeRef(pDnode);
+    }
+  }
+
+  mnodeAddVgroupIntoDb(pVgroup);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionDelete(SSdbOper *pOper) {
+  SVgObj *pVgroup = pOper->pObj;
+
+  if (pVgroup->pDb == NULL) {
+    mError("vgId:%d, db:%s is not exist while insert into hash", pVgroup->vgId, pVgroup->dbName);
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  mnodeRemoveVgroupFromDb(pVgroup);
+  mnodeDecDbRef(pVgroup->pDb);
+
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SDnodeObj *pDnode = mnodeGetDnode(pVgroup->vnodeGid[i].dnodeId);
+    if (pDnode != NULL) {
+      atomic_sub_fetch_32(&pDnode->openVnodes, 1);
+    }
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionUpdate(SSdbOper *pOper) {
+  SVgObj *pNew = pOper->pObj;
+  SVgObj *pVgroup = mnodeGetVgroup(pNew->vgId);
+
+  if (pVgroup != pNew) {
+    for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+      SDnodeObj *pDnode = pVgroup->vnodeGid[i].pDnode;
+      if (pDnode != NULL) {
+        atomic_sub_fetch_32(&pDnode->openVnodes, 1);
+      }
+    }
+
+    memcpy(pVgroup, pNew, tsVgUpdateSize);
+
+    for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+      SDnodeObj *pDnode = mnodeGetDnode(pVgroup->vnodeGid[i].dnodeId);
+      pVgroup->vnodeGid[i].pDnode = pDnode;
+      if (pDnode != NULL) {
+        atomic_add_fetch_32(&pDnode->openVnodes, 1);
+      }
+      mnodeDecDnodeRef(pDnode);
+    }
+
+    free(pNew);
+  }
+
+
+  // reset vgid status on vgroup changed
+  mDebug("vgId:%d, reset sync status to offline", pVgroup->vgId);
+  for (int32_t v = 0; v < pVgroup->numOfVnodes; ++v) {
+    pVgroup->vnodeGid[v].role = TAOS_SYNC_ROLE_OFFLINE;
+  }
+
+  mnodeDecVgroupRef(pVgroup);
+
+  mDebug("vgId:%d, is updated, numOfVnode:%d", pVgroup->vgId, pVgroup->numOfVnodes);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionEncode(SSdbOper *pOper) {
+  SVgObj *pVgroup = pOper->pObj;
+  memcpy(pOper->rowData, pVgroup, tsVgUpdateSize);
+  SVgObj *pTmpVgroup = pOper->rowData;
+  for (int32_t i = 0; i < TSDB_MAX_REPLICA; ++i) {
+    pTmpVgroup->vnodeGid[i].pDnode = NULL;
+    pTmpVgroup->vnodeGid[i].role = 0;
+  }
+
+  pOper->rowSize = tsVgUpdateSize;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionDecode(SSdbOper *pOper) {
+  SVgObj *pVgroup = (SVgObj *) calloc(1, sizeof(SVgObj));
+  if (pVgroup == NULL) return TSDB_CODE_MND_OUT_OF_MEMORY;
+
+  memcpy(pVgroup, pOper->rowData, tsVgUpdateSize);
+  pOper->pObj = pVgroup;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t mnodeVgroupActionRestored() {
+  return 0;
+}
+
+int32_t mnodeInitVgroups() {
+  SVgObj tObj;
+  tsVgUpdateSize = (int8_t *)tObj.updateEnd - (int8_t *)&tObj;
+
+  SSdbTableDesc tableDesc = {
+    .tableId      = SDB_TABLE_VGROUP,
+    .tableName    = "vgroups",
+    .hashSessions = TSDB_DEFAULT_VGROUPS_HASH_SIZE,
+    .maxRowSize   = tsVgUpdateSize,
+    .refCountPos  = (int8_t *)(&tObj.refCount) - (int8_t *)&tObj,
+    .keyType      = SDB_KEY_AUTO,
+    .insertFp     = mnodeVgroupActionInsert,
+    .deleteFp     = mnodeVgroupActionDelete,
+    .updateFp     = mnodeVgroupActionUpdate,
+    .encodeFp     = mnodeVgroupActionEncode,
+    .decodeFp     = mnodeVgroupActionDecode,
+    .destroyFp    = mnodeVgroupActionDestroy,
+    .restoredFp   = mnodeVgroupActionRestored,
+  };
+
+  tsVgroupSdb = sdbOpenTable(&tableDesc);
+  if (tsVgroupSdb == NULL) {
+    mError("failed to init vgroups data");
+    return -1;
+  }
+
+  mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_VGROUP, mnodeGetVgroupMeta);
+  mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_VGROUP, mnodeRetrieveVgroups);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP, mnodeProcessCreateVnodeRsp);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessAlterVnodeRsp);
+  mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_DROP_VNODE_RSP, mnodeProcessDropVnodeRsp);
+  mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_CONFIG_VNODE, mnodeProcessVnodeCfgMsg);
+
+  mDebug("table:vgroups is created");
+  
+  return 0;
+}
+
+void mnodeIncVgroupRef(SVgObj *pVgroup) {
+  return sdbIncRef(tsVgroupSdb, pVgroup); 
+}
+
+void mnodeDecVgroupRef(SVgObj *pVgroup) { 
+  return sdbDecRef(tsVgroupSdb, pVgroup); 
+}
+
+SVgObj *mnodeGetVgroup(int32_t vgId) {
+  return (SVgObj *)sdbGetRow(tsVgroupSdb, &vgId);
+}
+
+void mnodeUpdateVgroup(SVgObj *pVgroup) {
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsVgroupSdb,
+    .pObj = pVgroup
+  };
+
+  int32_t code = sdbUpdateRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    mError("vgId:%d, failed to update vgroup", pVgroup->vgId);
+  }
+  mnodeSendAlterVgroupMsg(pVgroup);
+}
+
+/*
+  Traverse all vgroups on mnode, if there no such vgId on a dnode, so send msg to this dnode for re-creating this vgId/vnode 
+*/
+void mnodeCheckUnCreatedVgroup(SDnodeObj *pDnode, SVnodeLoad *pVloads, int32_t openVnodes) {
+  SVnodeLoad *pNextV = NULL;
+
+  void *pIter = NULL;
+  while (1) {
+    SVgObj *pVgroup;
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    pNextV = pVloads;
+    int32_t i;
+    for (i = 0; i < openVnodes; ++i) {
+      if ((pVgroup->vnodeGid[i].pDnode == pDnode) && (pVgroup->vgId == pNextV->vgId)) {
+        break;
+      }
+      pNextV++;
+    }
+
+    if (i == openVnodes) {
+      if (pVgroup->status == TAOS_VG_STATUS_CREATING || pVgroup->status == TAOS_VG_STATUS_DROPPING) {
+        mDebug("vgId:%d, not exist in dnode:%d and status is %s, do nothing", pVgroup->vgId, pDnode->dnodeId,
+               vgroupStatus[pVgroup->status]);
+      } else {
+        mDebug("vgId:%d, not exist in dnode:%d and status is %s, send create msg", pVgroup->vgId, pDnode->dnodeId,
+               vgroupStatus[pVgroup->status]);
+        mnodeSendCreateVgroupMsg(pVgroup, NULL);
+      }
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+  }
+
+  sdbFreeIter(pIter);
+  return;
+}
+
+void mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVload) {
+  bool dnodeExist = false;
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
+    if (pVgid->pDnode == pDnode) {
+      mTrace("dnode:%d, receive status from dnode, vgId:%d status is %d", pDnode->dnodeId, pVgroup->vgId, pVgid->role);
+      pVgid->role = pVload->role;
+      if (pVload->role == TAOS_SYNC_ROLE_MASTER) {
+        pVgroup->inUse = i;
+      }
+      dnodeExist = true;
+      break;
+    }
+  }
+
+  if (!dnodeExist) {
+    SRpcEpSet epSet = mnodeGetEpSetFromIp(pDnode->dnodeEp);
+    mError("vgId:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId);
+    mnodeSendDropVnodeMsg(pVload->vgId, &epSet, NULL);
+    return;
+  }
+
+  if (pVload->role == TAOS_SYNC_ROLE_MASTER) {
+    pVgroup->totalStorage = htobe64(pVload->totalStorage);
+    pVgroup->compStorage = htobe64(pVload->compStorage);
+    pVgroup->pointsWritten = htobe64(pVload->pointsWritten);
+  }
+
+  if (pVload->cfgVersion != pVgroup->pDb->cfgVersion || pVload->replica != pVgroup->numOfVnodes) {
+    mError("dnode:%d, vgId:%d, vnode cfgVersion:%d repica:%d not match with mnode cfgVersion:%d replica:%d",
+           pDnode->dnodeId, pVload->vgId, pVload->cfgVersion, pVload->replica, pVgroup->pDb->cfgVersion,
+           pVgroup->numOfVnodes);
+    mnodeSendAlterVgroupMsg(pVgroup);
+  }
+}
+
+static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) {
+  SDbObj *pDb = pInputVgroup->pDb;
+  if (pDb == NULL) return TSDB_CODE_MND_APP_ERROR;
+
+  int32_t minIdPoolSize = TSDB_MAX_TABLES;
+  int32_t maxIdPoolSize = tsMinTablePerVnode;
+  for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
+    SVgObj *pVgroup = pDb->vgList[v];
+    if (pVgroup == NULL) continue;
+
+    int32_t idPoolSize = taosIdPoolMaxSize(pVgroup->idPool);
+    minIdPoolSize = MIN(minIdPoolSize, idPoolSize);
+    maxIdPoolSize = MAX(maxIdPoolSize, idPoolSize);
+  }
+
+  // new vgroup
+  if (pInputVgroup->idPool == NULL) {
+    pInputVgroup->idPool = taosInitIdPool(maxIdPoolSize);
+    if (pInputVgroup->idPool == NULL) {
+      mError("vgId:%d, failed to init idPool for vgroup, size:%d", pInputVgroup->vgId, maxIdPoolSize);
+      return TSDB_CODE_MND_OUT_OF_MEMORY;
+    } else {
+      mDebug("vgId:%d, init idPool for vgroup, size:%d", pInputVgroup->vgId, maxIdPoolSize);
+      return TSDB_CODE_SUCCESS;
+    }
+  }
+
+  // realloc all vgroups in db
+  int32_t newIdPoolSize;
+  if (minIdPoolSize * 4 < tsTableIncStepPerVnode) {
+    newIdPoolSize = minIdPoolSize * 4;
+  } else {
+    newIdPoolSize = ((minIdPoolSize / tsTableIncStepPerVnode) + 1) * tsTableIncStepPerVnode;
+  }
+
+  if (newIdPoolSize > tsMaxTablePerVnode) {
+    if (minIdPoolSize >= tsMaxTablePerVnode) {
+      mError("db:%s, minIdPoolSize:%d newIdPoolSize:%d larger than maxTablesPerVnode:%d", pDb->name, minIdPoolSize, newIdPoolSize,
+             tsMaxTablePerVnode);
+      return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+    } else {
+      newIdPoolSize = tsMaxTablePerVnode;
+    }
+  }
+
+  for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
+    SVgObj *pVgroup = pDb->vgList[v];
+    if (pVgroup == NULL) continue;
+
+    int32_t oldIdPoolSize = taosIdPoolMaxSize(pVgroup->idPool);
+    if (newIdPoolSize == oldIdPoolSize) continue;
+
+    if (taosUpdateIdPool(pVgroup->idPool, newIdPoolSize) < 0) {
+      mError("vgId:%d, failed to update idPoolSize from %d to %d", pVgroup->vgId, oldIdPoolSize, newIdPoolSize);
+      return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+    } else {
+      mDebug("vgId:%d, idPoolSize update from %d to %d", pVgroup->vgId, oldIdPoolSize, newIdPoolSize);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSid) {
+  SDbObj *pDb = pMsg->pDb;
+  pthread_mutex_lock(&pDb->mutex);
+  
+  for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
+    int vgIndex = (v + pDb->vgListIndex) % pDb->numOfVgroups;
+    SVgObj *pVgroup = pDb->vgList[vgIndex];
+    if (pVgroup == NULL) {
+      mError("db:%s, index:%d vgroup is null", pDb->name, vgIndex);
+      pthread_mutex_unlock(&pDb->mutex);
+      return TSDB_CODE_MND_APP_ERROR;
+    }
+
+    int32_t sid = taosAllocateId(pVgroup->idPool);
+    if (sid <= 0) {
+      mDebug("app:%p:%p, db:%s, no enough sid in vgId:%d", pMsg->rpcMsg.ahandle, pMsg, pDb->name, pVgroup->vgId);
+      continue;
+    }
+
+    *pSid = sid;
+    *ppVgroup = pVgroup;
+    pDb->vgListIndex = vgIndex;
+
+    pthread_mutex_unlock(&pDb->mutex);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  int maxVgroupsPerDb = tsMaxVgroupsPerDb;
+  if (maxVgroupsPerDb <= 0) {
+    maxVgroupsPerDb = mnodeGetOnlinDnodesCpuCoreNum();
+    maxVgroupsPerDb = MAX(maxVgroupsPerDb, TSDB_MIN_VNODES_PER_DB);
+    maxVgroupsPerDb = MIN(maxVgroupsPerDb, TSDB_MAX_VNODES_PER_DB);
+  }
+
+  int32_t code = TSDB_CODE_MND_NO_ENOUGH_DNODES;
+  if (pDb->numOfVgroups < maxVgroupsPerDb) {
+    mDebug("app:%p:%p, db:%s, try to create a new vgroup, numOfVgroups:%d maxVgroupsPerDb:%d", pMsg->rpcMsg.ahandle,
+           pMsg, pDb->name, pDb->numOfVgroups, maxVgroupsPerDb);
+    pthread_mutex_unlock(&pDb->mutex);
+    code = mnodeCreateVgroup(pMsg);
+    if (code == TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      return code;
+    } else {
+      pthread_mutex_lock(&pDb->mutex);
+    }
+  }
+
+  if (pDb->numOfVgroups < 1) {
+    pthread_mutex_unlock(&pDb->mutex);
+    mDebug("app:%p:%p, db:%s, failed create new vgroup since:%s, numOfVgroups:%d maxVgroupsPerDb:%d ",
+           pMsg->rpcMsg.ahandle, pMsg, pDb->name, tstrerror(code), pDb->numOfVgroups, maxVgroupsPerDb);
+    return code;
+  }
+
+  SVgObj *pVgroup = pDb->vgList[0];
+  if (pVgroup == NULL) {
+    pthread_mutex_unlock(&pDb->mutex);
+    return code;
+  }
+
+  code = mnodeAllocVgroupIdPool(pVgroup);
+  if (code != TSDB_CODE_SUCCESS) {
+    pthread_mutex_unlock(&pDb->mutex);
+    return code;
+  }
+
+  int32_t sid = taosAllocateId(pVgroup->idPool);
+  if (sid <= 0) {
+    mError("app:%p:%p, db:%s, no enough sid in vgId:%d", pMsg->rpcMsg.ahandle, pMsg, pDb->name, pVgroup->vgId);
+    pthread_mutex_unlock(&pDb->mutex);
+    return TSDB_CODE_MND_NO_ENOUGH_DNODES;
+  }
+
+  *pSid = sid;
+  *ppVgroup = pVgroup;
+  pDb->vgListIndex = 0;
+  pthread_mutex_unlock(&pDb->mutex);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void *mnodeGetNextVgroup(void *pIter, SVgObj **pVgroup) { 
+  return sdbFetchRow(tsVgroupSdb, pIter, (void **)pVgroup); 
+}
+
+static int32_t mnodeCreateVgroupFp(SMnodeMsg *pMsg) {
+  SVgObj *pVgroup = pMsg->pVgroup;
+  SDbObj *pDb = pMsg->pDb;
+  assert(pVgroup);
+
+  mInfo("app:%p:%p, vgId:%d, is created in mnode, db:%s replica:%d", pMsg->rpcMsg.ahandle, pMsg, pVgroup->vgId,
+        pDb->name, pVgroup->numOfVnodes);
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    mInfo("app:%p:%p, vgId:%d, index:%d, dnode:%d", pMsg->rpcMsg.ahandle, pMsg, pVgroup->vgId, i,
+          pVgroup->vnodeGid[i].dnodeId);
+  }
+
+  pMsg->expected = pVgroup->numOfVnodes;
+  pMsg->successed = 0;
+  pMsg->received = 0;
+  mnodeSendCreateVgroupMsg(pVgroup, pMsg);
+
+  return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+}
+
+static int32_t mnodeCreateVgroupCb(SMnodeMsg *pMsg, int32_t code) {
+  SVgObj *pVgroup = pMsg->pVgroup;
+  SDbObj *pDb = pMsg->pDb;
+  assert(pVgroup);
+
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, vgId:%d, failed to create in sdb, reason:%s", pMsg->rpcMsg.ahandle, pMsg, pVgroup->vgId,
+           tstrerror(code));
+    SSdbOper desc = {.type = SDB_OPER_GLOBAL, .pObj = pVgroup, .table = tsVgroupSdb};
+    sdbDeleteRow(&desc);
+    return code;
+  } else {
+    mInfo("app:%p:%p, vgId:%d, is created in sdb, db:%s replica:%d", pMsg->rpcMsg.ahandle, pMsg, pVgroup->vgId,
+        pDb->name, pVgroup->numOfVnodes);
+    pVgroup->status = TAOS_VG_STATUS_READY;
+    SSdbOper desc = {.type = SDB_OPER_GLOBAL, .pObj = pVgroup, .table = tsVgroupSdb};
+    (void)sdbUpdateRow(&desc);
+
+    dnodeReprocessMnodeWriteMsg(pMsg);
+    return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+    // if (pVgroup->status == TAOS_VG_STATUS_CREATING || pVgroup->status == TAOS_VG_STATUS_READY) {
+    //   mInfo("app:%p:%p, vgId:%d, is created in sdb, db:%s replica:%d", pMsg->rpcMsg.ahandle, pMsg, pVgroup->vgId,
+    //         pDb->name, pVgroup->numOfVnodes);
+    //   pVgroup->status = TAOS_VG_STATUS_READY;
+    //   SSdbOper desc = {.type = SDB_OPER_GLOBAL, .pObj = pVgroup, .table = tsVgroupSdb};
+    //   (void)sdbUpdateRow(&desc);
+    //   dnodeReprocessMnodeWriteMsg(pMsg);
+    //   return TSDB_CODE_MND_ACTION_IN_PROGRESS;
+    // } else {
+    //   mError("app:%p:%p, vgId:%d, is created in sdb, db:%s replica:%d, but vgroup is dropping", pMsg->rpcMsg.ahandle,
+    //          pMsg, pVgroup->vgId, pDb->name, pVgroup->numOfVnodes);
+    //   return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+    // }
+  }
+}
+
+int32_t mnodeCreateVgroup(SMnodeMsg *pMsg) {
+  if (pMsg == NULL) return TSDB_CODE_MND_APP_ERROR;
+  SDbObj *pDb = pMsg->pDb;
+
+  SVgObj *pVgroup = (SVgObj *)calloc(1, sizeof(SVgObj));
+  tstrncpy(pVgroup->dbName, pDb->name, TSDB_ACCT_LEN + TSDB_DB_NAME_LEN);
+  pVgroup->numOfVnodes = pDb->cfg.replications;
+  pVgroup->createdTime = taosGetTimestampMs();
+  pVgroup->accessState = TSDB_VN_ALL_ACCCESS;
+  int32_t code = balanceAllocVnodes(pVgroup);
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("db:%s, no enough dnode to alloc %d vnodes to vgroup, reason:%s", pDb->name, pVgroup->numOfVnodes,
+           tstrerror(code));
+    free(pVgroup);
+    return code;
+  }
+
+  if (pMsg->pVgroup != NULL) {
+    mnodeDecVgroupRef(pMsg->pVgroup);
+  }
+
+  pMsg->pVgroup = pVgroup;
+  mnodeIncVgroupRef(pVgroup);
+
+  SSdbOper oper = {
+    .type    = SDB_OPER_GLOBAL,
+    .table   = tsVgroupSdb,
+    .pObj    = pVgroup,
+    .rowSize = sizeof(SVgObj),
+    .pMsg    = pMsg,
+    .reqFp   = mnodeCreateVgroupFp
+  };
+
+  code = sdbInsertRow(&oper);
+  if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+    pMsg->pVgroup = NULL;
+    mnodeDestroyVgroup(pVgroup);
+  }
+
+  return code;
+}
+
+void mnodeDropVgroup(SVgObj *pVgroup, void *ahandle) {
+  if (ahandle != NULL) {
+    mnodeSendDropVgroupMsg(pVgroup, ahandle);
+  } else {
+    mDebug("vgId:%d, replica:%d is deleting from sdb", pVgroup->vgId, pVgroup->numOfVnodes);
+    mnodeSendDropVgroupMsg(pVgroup, NULL);
+    SSdbOper oper = {
+      .type = SDB_OPER_GLOBAL,
+      .table = tsVgroupSdb,
+      .pObj = pVgroup
+    };
+    sdbDeleteRow(&oper);
+  }
+}
+
+void mnodeCleanupVgroups() {
+  sdbCloseTable(tsVgroupSdb);
+  tsVgroupSdb = NULL;
+}
+
+int64_t mnodeGetVgroupNum() {
+  return sdbGetNumOfRows(tsVgroupSdb);
+}
+
+static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) {
+    return TSDB_CODE_MND_DB_NOT_SELECTED;
+  }
+  
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return TSDB_CODE_MND_DB_IN_DROPPING;
+  }
+
+  int32_t cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "vgId");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "tables");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "onlineVnodes");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->maxReplica = 1;
+  for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
+    SVgObj *pVgroup = pDb->vgList[v];
+    if (pVgroup != NULL) {
+      pShow->maxReplica = pVgroup->numOfVnodes > pShow->maxReplica ? pVgroup->numOfVnodes : pShow->maxReplica;
+    }
+  }
+
+  for (int32_t i = 0; i < pShow->maxReplica; ++i) {
+    pShow->bytes[cols] = 2;
+    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
+    snprintf(pSchema[cols].name, TSDB_COL_NAME_LEN, "dnode%d", i + 1);
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+
+    pShow->bytes[cols] = 9 + VARSTR_HEADER_SIZE;
+    pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+    snprintf(pSchema[cols].name, TSDB_COL_NAME_LEN, "v%dstatus", i + 1);
+    pSchema[cols].bytes = htons(pShow->bytes[cols]);
+    cols++;
+  }
+
+  pMeta->numOfColumns = htons(cols);
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
+
+  pShow->numOfRows = pDb->numOfVgroups;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
+
+  mnodeDecDbRef(pDb);
+  return 0;
+}
+
+static bool mnodeFilterVgroups(SVgObj *pVgroup, STableObj *pTable) {
+  if (NULL == pTable || pTable->type == TSDB_SUPER_TABLE) {
+    return true;
+  }
+
+  SChildTableObj *pCTable = (SChildTableObj *)pTable;
+  if (pVgroup->vgId == pCTable->vgId) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
+  int32_t numOfRows = 0;
+  SVgObj *pVgroup = NULL;
+  int32_t cols = 0;
+  char *  pWrite;
+
+  SDbObj *pDb = mnodeGetDb(pShow->db);
+  if (pDb == NULL) return 0;
+
+  if (pDb->status != TSDB_DB_STATUS_READY) {
+    mError("db:%s, status:%d, in dropping", pDb->name, pDb->status);
+    mnodeDecDbRef(pDb);
+    return 0;
+  }
+
+  STableObj *pTable = NULL;
+  if (pShow->payloadLen > 0 ) {
+    pTable = mnodeGetTable(pShow->payload);
+  }
+
+  while (numOfRows < rows) {
+    pShow->pIter = mnodeGetNextVgroup(pShow->pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+    if (pVgroup->pDb != pDb) continue;
+    if (!mnodeFilterVgroups(pVgroup, pTable)) continue;
+
+    cols = 0;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *) pWrite = pVgroup->vgId;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *) pWrite = pVgroup->numOfTables;
+    cols++;
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  
+    char* status = vgroupStatus[pVgroup->status];
+    STR_TO_VARSTR(pWrite, status);
+    cols++;
+
+    int32_t onlineVnodes = 0;
+    for (int32_t i = 0; i < pShow->maxReplica; ++i) {
+      if (pVgroup->vnodeGid[i].role == TAOS_SYNC_ROLE_SLAVE || pVgroup->vnodeGid[i].role == TAOS_SYNC_ROLE_MASTER) {
+        onlineVnodes++;
+      }
+    }
+
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = onlineVnodes;
+    cols++;
+
+    for (int32_t i = 0; i < pShow->maxReplica; ++i) {
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      *(int16_t *) pWrite = pVgroup->vnodeGid[i].dnodeId;
+      cols++;
+
+      SDnodeObj * pDnode = pVgroup->vnodeGid[i].pDnode;
+      const char *role = "NULL";
+      if (pDnode != NULL) {
+        role = mnodeGetMnodeRoleStr(pVgroup->vnodeGid[i].role);
+      }
+
+      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+      STR_WITH_MAXSIZE_TO_VARSTR(pWrite, role, pShow->bytes[cols]);
+      cols++;
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+    numOfRows++;
+  }
+
+  pShow->numOfReads += numOfRows;
+  mnodeDecTableRef(pTable);
+  mnodeDecDbRef(pDb);
+
+  return numOfRows;
+}
+
+void mnodeAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
+  int32_t idPoolSize = taosIdPoolMaxSize(pVgroup->idPool);
+  if (pTable->sid > idPoolSize) {
+    mnodeAllocVgroupIdPool(pVgroup);
+  }
+
+  if (pTable->sid >= 1) {
+    taosIdPoolMarkStatus(pVgroup->idPool, pTable->sid);
+    pVgroup->numOfTables++;
+    // The create vgroup message may be received later than the create table message
+    // and the writing order in sdb is therefore uncertain
+    // which will cause the reference count of the vgroup to be incorrect when restarting
+    // mnodeIncVgroupRef(pVgroup);
+  }
+}
+
+void mnodeRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
+  if (pTable->sid >= 1) {
+    taosFreeId(pVgroup->idPool, pTable->sid);
+    pVgroup->numOfTables--;
+    // The create vgroup message may be received later than the create table message
+    // and the writing order in sdb is therefore uncertain
+    // which will cause the reference count of the vgroup to be incorrect when restarting
+    // mnodeDecVgroupRef(pVgroup);
+  }
+}
+
+static SMDCreateVnodeMsg *mnodeBuildVnodeMsg(SVgObj *pVgroup) {
+  SDbObj *pDb = pVgroup->pDb;
+  if (pDb == NULL) return NULL;
+
+  SMDCreateVnodeMsg *pVnode = rpcMallocCont(sizeof(SMDCreateVnodeMsg));
+  if (pVnode == NULL) return NULL;
+
+  strcpy(pVnode->db, pVgroup->dbName);
+  int32_t maxTables = taosIdPoolMaxSize(pVgroup->idPool);
+  //TODO: dynamic alloc tables in tsdb
+  maxTables = MAX(10000, tsMaxTablePerVnode);
+
+  SMDVnodeCfg *pCfg = &pVnode->cfg;
+  pCfg->vgId                = htonl(pVgroup->vgId);
+  pCfg->cfgVersion          = htonl(pDb->cfgVersion);
+  pCfg->cacheBlockSize      = htonl(pDb->cfg.cacheBlockSize);
+  pCfg->totalBlocks         = htonl(pDb->cfg.totalBlocks);
+  pCfg->maxTables           = htonl(maxTables + 1);
+  pCfg->daysPerFile         = htonl(pDb->cfg.daysPerFile);
+  pCfg->daysToKeep          = htonl(pDb->cfg.daysToKeep);
+  pCfg->daysToKeep1         = htonl(pDb->cfg.daysToKeep1);
+  pCfg->daysToKeep2         = htonl(pDb->cfg.daysToKeep2);  
+  pCfg->minRowsPerFileBlock = htonl(pDb->cfg.minRowsPerFileBlock);
+  pCfg->maxRowsPerFileBlock = htonl(pDb->cfg.maxRowsPerFileBlock);
+  pCfg->fsyncPeriod         = htonl(pDb->cfg.fsyncPeriod);
+  pCfg->commitTime          = htonl(pDb->cfg.commitTime);
+  pCfg->precision           = pDb->cfg.precision;
+  pCfg->compression         = pDb->cfg.compression;
+  pCfg->walLevel            = pDb->cfg.walLevel;
+  pCfg->replications        = (int8_t) pVgroup->numOfVnodes;
+  pCfg->wals                = 3;
+  pCfg->quorum              = pDb->cfg.quorum;
+  
+  SMDVnodeDesc *pNodes = pVnode->nodes;
+  for (int32_t j = 0; j < pVgroup->numOfVnodes; ++j) {
+    SDnodeObj *pDnode = pVgroup->vnodeGid[j].pDnode;
+    if (pDnode != NULL) {
+      pNodes[j].nodeId = htonl(pDnode->dnodeId);
+      strcpy(pNodes[j].nodeEp, pDnode->dnodeEp);
+    }
+  }
+
+  return pVnode;
+}
+
+SRpcEpSet mnodeGetEpSetFromVgroup(SVgObj *pVgroup) {
+  SRpcEpSet epSet = {
+    .numOfEps = pVgroup->numOfVnodes,
+    .inUse = pVgroup->inUse,
+  };
+  for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
+    strcpy(epSet.fqdn[i], pVgroup->vnodeGid[i].pDnode->dnodeFqdn);
+    epSet.port[i] = pVgroup->vnodeGid[i].pDnode->dnodePort + TSDB_PORT_DNODEDNODE;
+  }
+  return epSet;
+}
+
+SRpcEpSet mnodeGetEpSetFromIp(char *ep) {
+  SRpcEpSet epSet;
+
+  epSet.numOfEps = 1;
+  epSet.inUse = 0;
+  taosGetFqdnPortFromEp(ep, epSet.fqdn[0], &epSet.port[0]);
+  epSet.port[0] += TSDB_PORT_DNODEDNODE;
+  return epSet;
+}
+
+static void mnodeSendAlterVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) {
+  SMDAlterVnodeMsg *pAlter = mnodeBuildVnodeMsg(pVgroup);
+  SRpcMsg rpcMsg = {
+    .ahandle = NULL,
+    .pCont   = pAlter,
+    .contLen = pAlter ? sizeof(SMDAlterVnodeMsg) : 0,
+    .code    = 0,
+    .msgType = TSDB_MSG_TYPE_MD_ALTER_VNODE
+  };
+  dnodeSendMsgToDnode(epSet, &rpcMsg);
+}
+
+void mnodeSendAlterVgroupMsg(SVgObj *pVgroup) {
+  mDebug("vgId:%d, send alter all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes,
+         pVgroup->dbName);
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp);
+    mDebug("vgId:%d, index:%d, send alter vnode msg to dnode %s", pVgroup->vgId, i,
+           pVgroup->vnodeGid[i].pDnode->dnodeEp);
+    mnodeSendAlterVnodeMsg(pVgroup, &epSet);
+  }
+}
+
+static void mnodeSendCreateVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet, void *ahandle) {
+  SMDCreateVnodeMsg *pCreate = mnodeBuildVnodeMsg(pVgroup);
+  SRpcMsg rpcMsg = {
+    .ahandle = ahandle,
+    .pCont   = pCreate,
+    .contLen = pCreate ? sizeof(SMDCreateVnodeMsg) : 0,
+    .code    = 0,
+    .msgType = TSDB_MSG_TYPE_MD_CREATE_VNODE
+  };
+  dnodeSendMsgToDnode(epSet, &rpcMsg);
+}
+
+void mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
+  mDebug("vgId:%d, send create all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes,
+         pVgroup->dbName);
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp);
+    mDebug("vgId:%d, index:%d, send create vnode msg to dnode %s, ahandle:%p", pVgroup->vgId,
+           i, pVgroup->vnodeGid[i].pDnode->dnodeEp, ahandle);
+    mnodeSendCreateVnodeMsg(pVgroup, &epSet, ahandle);
+  }
+}
+
+static void mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg) {
+  mDebug("alter vnode rsp received");
+}
+
+static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
+  if (rpcMsg->ahandle == NULL) return;
+
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  atomic_add_fetch_8(&mnodeMsg->received, 1);
+  if (rpcMsg->code == TSDB_CODE_SUCCESS) {
+    atomic_add_fetch_8(&mnodeMsg->successed, 1);
+  } else {
+    mnodeMsg->code = rpcMsg->code;
+  }
+
+  SVgObj *pVgroup = mnodeMsg->pVgroup;
+  mDebug("vgId:%d, create vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p",
+         pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
+         mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
+
+  assert(mnodeMsg->received <= mnodeMsg->expected);
+
+  if (mnodeMsg->received != mnodeMsg->expected) return;
+
+  if (mnodeMsg->received == mnodeMsg->successed) {
+     SSdbOper oper = {
+      .type    = SDB_OPER_GLOBAL,
+      .table   = tsVgroupSdb,
+      .pObj    = pVgroup,
+      .rowSize = sizeof(SVgObj),
+      .pMsg    = mnodeMsg,
+      .writeCb = mnodeCreateVgroupCb
+    };
+
+    int32_t code = sdbInsertRowImp(&oper);
+    if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
+      mnodeMsg->pVgroup = NULL;
+      mnodeDestroyVgroup(pVgroup);
+      dnodeSendRpcMnodeWriteRsp(mnodeMsg, code);
+    }
+  } else {
+    SSdbOper oper = {
+      .type = SDB_OPER_GLOBAL,
+      .table = tsVgroupSdb,
+      .pObj = pVgroup
+    };
+    sdbDeleteRow(&oper);
+    dnodeSendRpcMnodeWriteRsp(mnodeMsg, mnodeMsg->code);
+  }
+}
+
+static SMDDropVnodeMsg *mnodeBuildDropVnodeMsg(int32_t vgId) {
+  SMDDropVnodeMsg *pDrop = rpcMallocCont(sizeof(SMDDropVnodeMsg));
+  if (pDrop == NULL) return NULL;
+
+  pDrop->vgId = htonl(vgId);
+  return pDrop;
+}
+
+void mnodeSendDropVnodeMsg(int32_t vgId, SRpcEpSet *epSet, void *ahandle) {
+  SMDDropVnodeMsg *pDrop = mnodeBuildDropVnodeMsg(vgId);
+  SRpcMsg rpcMsg = {
+      .ahandle = ahandle,
+      .pCont   = pDrop,
+      .contLen = pDrop ? sizeof(SMDDropVnodeMsg) : 0,
+      .code    = 0,
+      .msgType = TSDB_MSG_TYPE_MD_DROP_VNODE
+  };
+  dnodeSendMsgToDnode(epSet, &rpcMsg);
+}
+
+static void mnodeSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) {
+  pVgroup->status = TAOS_VG_STATUS_DROPPING; // deleting
+  mDebug("vgId:%d, send drop all vnodes msg, ahandle:%p db:%s", pVgroup->vgId, ahandle, pVgroup->dbName);
+  for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
+    SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp);
+    mDebug("vgId:%d, send drop vnode msg to dnode:%d, ahandle:%p", pVgroup->vgId, pVgroup->vnodeGid[i].dnodeId, ahandle);
+    mnodeSendDropVnodeMsg(pVgroup->vgId, &epSet, ahandle);
+  }
+}
+
+static void mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg) {
+  mDebug("drop vnode rsp is received, handle:%p", rpcMsg->ahandle);
+  if (rpcMsg->ahandle == NULL) return;
+
+  SMnodeMsg *mnodeMsg = rpcMsg->ahandle;
+  mnodeMsg->received++;
+  if (rpcMsg->code == TSDB_CODE_SUCCESS) {
+    mnodeMsg->code = rpcMsg->code;
+    mnodeMsg->successed++;
+  }
+
+  SVgObj *pVgroup = mnodeMsg->pVgroup;
+  mDebug("vgId:%d, drop vnode rsp received, result:%s received:%d successed:%d expected:%d, thandle:%p ahandle:%p",
+         pVgroup->vgId, tstrerror(rpcMsg->code), mnodeMsg->received, mnodeMsg->successed, mnodeMsg->expected,
+         mnodeMsg->rpcMsg.handle, rpcMsg->ahandle);
+
+  if (mnodeMsg->received != mnodeMsg->expected) return;
+
+  SSdbOper oper = {
+    .type = SDB_OPER_GLOBAL,
+    .table = tsVgroupSdb,
+    .pObj = pVgroup
+  };
+  int32_t code = sdbDeleteRow(&oper);
+  if (code != 0) {
+    code = TSDB_CODE_MND_SDB_ERROR;
+  }
+
+  dnodeReprocessMnodeWriteMsg(mnodeMsg);
+}
+
+static int32_t mnodeProcessVnodeCfgMsg(SMnodeMsg *pMsg) {
+  SDMConfigVnodeMsg *pCfg = pMsg->rpcMsg.pCont;
+  pCfg->dnodeId = htonl(pCfg->dnodeId);
+  pCfg->vgId    = htonl(pCfg->vgId);
+
+  SDnodeObj *pDnode = mnodeGetDnode(pCfg->dnodeId);
+  if (pDnode == NULL) {
+    mDebug("dnode:%s, vgId:%d, invalid dnode", taosIpStr(pCfg->dnodeId), pCfg->vgId);
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  SVgObj *pVgroup = mnodeGetVgroup(pCfg->vgId);
+  if (pVgroup == NULL) {
+    mDebug("dnode:%s, vgId:%d, no vgroup info", taosIpStr(pCfg->dnodeId), pCfg->vgId);
+    mnodeDecDnodeRef(pDnode);
+    return TSDB_CODE_MND_VGROUP_NOT_EXIST;
+  }
+
+  mDebug("vgId:%d, send create vnode msg to dnode %s for vnode cfg msg", pVgroup->vgId, pDnode->dnodeEp);
+  SRpcEpSet epSet = mnodeGetEpSetFromIp(pDnode->dnodeEp);
+  mnodeSendCreateVnodeMsg(pVgroup, &epSet, NULL);
+
+  mnodeDecDnodeRef(pDnode);
+  mnodeDecVgroupRef(pVgroup);
+  return TSDB_CODE_SUCCESS;
+}
+
+void mnodeDropAllDnodeVgroups(SDnodeObj *pDropDnode) {
+  void *  pIter = NULL;
+  SVgObj *pVgroup = NULL;
+  int32_t numOfVgroups = 0;
+
+  mInfo("dnode:%d, all vgroups will be dropped from sdb", pDropDnode->dnodeId);
+
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    if (pVgroup->vnodeGid[0].dnodeId == pDropDnode->dnodeId) {
+      mnodeDropAllChildTablesInVgroups(pVgroup);
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsVgroupSdb,
+        .pObj = pVgroup,
+      };
+      sdbDeleteRow(&oper);
+      numOfVgroups++;
+    }
+    mnodeDecVgroupRef(pVgroup);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("dnode:%d, all vgroups:%d is dropped from sdb", pDropDnode->dnodeId, numOfVgroups);
+}
+
+#if 0
+void mnodeUpdateAllDbVgroups(SDbObj *pAlterDb) {
+  void *  pIter = NULL;
+  SVgObj *pVgroup = NULL;
+
+  mInfo("db:%s, all vgroups will be update in sdb", pAlterDb->name);
+
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    if (pVgroup->pDb == pAlterDb) {
+      mnodeVgroupUpdateIdPool(pVgroup);
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("db:%s, all vgroups is updated in sdb", pAlterDb->name);
+}
+#endif
+
+void mnodeDropAllDbVgroups(SDbObj *pDropDb) {
+  void *  pIter = NULL;
+  int32_t numOfVgroups = 0;
+  SVgObj *pVgroup = NULL;
+
+  mInfo("db:%s, all vgroups will be dropped from sdb", pDropDb->name);
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    if (pVgroup->pDb == pDropDb) {
+      SSdbOper oper = {
+        .type = SDB_OPER_LOCAL,
+        .table = tsVgroupSdb,
+        .pObj = pVgroup,
+      };
+      sdbDeleteRow(&oper);
+      numOfVgroups++;
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("db:%s, all vgroups:%d is dropped from sdb", pDropDb->name, numOfVgroups);
+}
+
+void mnodeSendDropAllDbVgroupsMsg(SDbObj *pDropDb) {
+  void *  pIter = NULL;
+  int32_t numOfVgroups = 0;
+  SVgObj *pVgroup = NULL;
+
+  mInfo("db:%s, all vgroups will be dropped in dnode", pDropDb->name);
+  while (1) {
+    pIter = mnodeGetNextVgroup(pIter, &pVgroup);
+    if (pVgroup == NULL) break;
+
+    if (pVgroup->pDb == pDropDb) {
+      mnodeSendDropVgroupMsg(pVgroup, NULL);
+    }
+
+    mnodeDecVgroupRef(pVgroup);
+    numOfVgroups++;
+  }
+
+  sdbFreeIter(pIter);
+
+  mInfo("db:%s, all vgroups:%d drop msg is sent to dnode", pDropDb->name, numOfVgroups);
+}
diff --git a/src/mnode/src/mnodeWrite.c b/src/mnode/src/mnodeWrite.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab3cfa2dad179628a9ee74d578ff0d4d06ead127
--- /dev/null
+++ b/src/mnode/src/mnodeWrite.c
@@ -0,0 +1,86 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tsched.h"
+#include "tbalance.h"
+#include "tgrant.h"
+#include "tglobal.h"
+#include "trpc.h"
+#include "mnode.h"
+#include "dnode.h"
+#include "mnodeDef.h"
+#include "mnodeInt.h"
+#include "mnodeAcct.h"
+#include "mnodeDnode.h"
+#include "mnodeMnode.h"
+#include "mnodeDb.h"
+#include "mnodeSdb.h"
+#include "mnodeVgroup.h"
+#include "mnodeUser.h"
+#include "mnodeTable.h"
+#include "mnodeShow.h"
+
+static int32_t (*tsMnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MAX])(SMnodeMsg *);
+
+void mnodeAddWriteMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg)) {
+  tsMnodeProcessWriteMsgFp[msgType] = fp;
+}
+
+int32_t mnodeProcessWrite(SMnodeMsg *pMsg) {
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("app:%p:%p, msg:%s content is null", pMsg->rpcMsg.ahandle, pMsg, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_INVALID_MSG_LEN;
+  }
+
+  if (!sdbIsMaster()) {
+    SMnodeRsp *rpcRsp = &pMsg->rpcRsp;
+    SRpcEpSet *epSet = rpcMallocCont(sizeof(SRpcEpSet));
+    mnodeGetMnodeEpSetForShell(epSet);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SRpcEpSet);
+
+    mDebug("app:%p:%p, msg:%s will be redireced inUse:%d", pMsg->rpcMsg.ahandle, pMsg, taosMsg[pMsg->rpcMsg.msgType],
+           epSet->inUse);
+    for (int32_t i = 0; i < epSet->numOfEps; ++i) {
+      mDebug("app:%p:%p, mnode index:%d ep:%s:%d", pMsg->rpcMsg.ahandle, pMsg, i, epSet->fqdn[i],
+             htons(epSet->port[i]));
+    }
+
+    return TSDB_CODE_RPC_REDIRECT;
+  }
+
+  if (tsMnodeProcessWriteMsgFp[pMsg->rpcMsg.msgType] == NULL) {
+    mError("app:%p:%p, msg:%s not processed", pMsg->rpcMsg.ahandle, pMsg, taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_MSG_NOT_PROCESSED;
+  }
+
+  int32_t code = mnodeInitMsg(pMsg);
+  if (code != TSDB_CODE_SUCCESS) {
+    mError("app:%p:%p, msg:%s not processed, reason:%s", pMsg->rpcMsg.ahandle, pMsg, taosMsg[pMsg->rpcMsg.msgType],
+           tstrerror(code));
+    return code;
+  }
+
+  if (!pMsg->pUser->writeAuth) {
+    mError("app:%p:%p, msg:%s not processed, no write auth", pMsg->rpcMsg.ahandle, pMsg,
+           taosMsg[pMsg->rpcMsg.msgType]);
+    return TSDB_CODE_MND_NO_RIGHTS;
+  }
+
+  return (*tsMnodeProcessWriteMsgFp[pMsg->rpcMsg.msgType])(pMsg);
+}
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
deleted file mode 100644
index 562de724105ae934fb804fb7c6f9844ddfbe5e17..0000000000000000000000000000000000000000
--- a/src/modules/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-ADD_SUBDIRECTORY(monitor)
-ADD_SUBDIRECTORY(http)
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
deleted file mode 100644
index d8dccb526affec580adf5d69d7b10c033b51d0ad..0000000000000000000000000000000000000000
--- a/src/modules/http/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(http ${SRC})
-  TARGET_LINK_LIBRARIES(http taos_static z)
-
-  IF (TD_CLUSTER)
-    TARGET_LINK_LIBRARIES(http http_admin)
-  ENDIF ()
-ENDIF ()
diff --git a/src/modules/http/inc/cJSON.h b/src/modules/http/inc/cJSON.h
deleted file mode 100644
index 31c6d19e7856ba5b0557d3df67a3568514120e23..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/cJSON.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#ifndef cJSON__h
-#define cJSON__h
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* project version */
-#define CJSON_VERSION_MAJOR 1
-#define CJSON_VERSION_MINOR 5
-#define CJSON_VERSION_PATCH 9
-
-#include <stddef.h>
-#include <stdint.h>
-
-/* cJSON Types: */
-#define cJSON_Invalid (0)
-#define cJSON_False  (1 << 0)
-#define cJSON_True   (1 << 1)
-#define cJSON_NULL   (1 << 2)
-#define cJSON_Number (1 << 3)
-#define cJSON_String (1 << 4)
-#define cJSON_Array  (1 << 5)
-#define cJSON_Object (1 << 6)
-#define cJSON_Raw    (1 << 7) /* raw json */
-
-#define cJSON_IsReference 256
-#define cJSON_StringIsConst 512
-
-/* The cJSON structure: */
-typedef struct cJSON
-{
-    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
-    struct cJSON *next;
-    struct cJSON *prev;
-    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
-    struct cJSON *child;
-
-    /* The type of the item, as above. */
-    int type;
-
-    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
-    char *valuestring;
-    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
-    int64_t valueint;
-    /* The item's number, if type==cJSON_Number */
-    double valuedouble;
-
-    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
-    char *string;
-} cJSON;
-
-typedef struct cJSON_Hooks
-{
-      void *(*malloc_fn)(size_t sz);
-      void (*free_fn)(void *ptr);
-} cJSON_Hooks;
-
-typedef int cJSON_bool;
-
-#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
-#define __WINDOWS__
-#endif
-#ifdef __WINDOWS__
-
-/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 2 define options:
-
-CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
-CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
-CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
-
-For *nix builds that support visibility attribute, you can define similar behavior by
-
-setting default visibility to hidden by adding
--fvisibility=hidden (for gcc)
-or
--xldscope=hidden (for sun cc)
-to CFLAGS
-
-then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
-
-*/
-
-/* export symbols by default, this is necessary for copy pasting the C and header file */
-#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_EXPORT_SYMBOLS
-#endif
-
-#if defined(CJSON_HIDE_SYMBOLS)
-#define CJSON_PUBLIC(type)   type __stdcall
-#elif defined(CJSON_EXPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllexport) type __stdcall
-#elif defined(CJSON_IMPORT_SYMBOLS)
-#define CJSON_PUBLIC(type)   __declspec(dllimport) type __stdcall
-#endif
-#else /* !WIN32 */
-#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
-#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
-#else
-#define CJSON_PUBLIC(type) type
-#endif
-#endif
-
-/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
- * This is to prevent stack overflows. */
-#ifndef CJSON_NESTING_LIMIT
-#define CJSON_NESTING_LIMIT 1000
-#endif
-
-/* returns the version of cJSON as a string */
-CJSON_PUBLIC(const char*) cJSON_Version(void);
-
-/* Supply malloc, realloc and free functions to cJSON */
-CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
-
-/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
-/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
-CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
-/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
-CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
-
-/* Render a cJSON entity to text for transfer/storage. */
-CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any formatting. */
-CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
-/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
-CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
-/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
-/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
-CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
-/* Delete a cJSON entity and all subentities. */
-CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
-
-/* Returns the number of items in an array (or object). */
-CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
-/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
-CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
-/* Get item "string" from object. Case insensitive. */
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
-CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
-/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
-CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
-
-/* These functions check the type of an item */
-CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
-CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
-
-/* These calls create a cJSON item of the appropriate type. */
-CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
-CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
-CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
-/* raw json */
-CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
-CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
-CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
-
-/* These utilities create an Array of count items. */
-CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
-
-/* Append item to the specified array/object. */
-CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
-/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
- * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
- * writing to `item->string` */
-CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
-/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
-
-/* Remove/Detatch items from Arrays/Objects. */
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
-
-/* Update array items. */
-CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
-CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
-
-/* Duplicate a cJSON item */
-CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
-/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
-need to be released. With recurse!=0, it will duplicate any children connected to the item.
-The item->next and ->prev pointers are always zero on return from Duplicate. */
-/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
- * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
-CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
-
-
-CJSON_PUBLIC(void) cJSON_Minify(char *json);
-
-/* Macros for creating things quickly. */
-#define cJSON_AddNullToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateNull())
-#define cJSON_AddTrueToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
-#define cJSON_AddFalseToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
-#define cJSON_AddBoolToObject(object,name,b) cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
-#define cJSON_AddNumberToObject(object,name,n) cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
-#define cJSON_AddStringToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
-#define cJSON_AddRawToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateRaw(s))
-
-/* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
-/* helper for the cJSON_SetNumberValue macro */
-CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
-#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
-
-/* Macro for iterating over an array or object */
-#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
-
-/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
-CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
-CJSON_PUBLIC(void) cJSON_free(void *object);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/modules/http/inc/gcHandle.h b/src/modules/http/inc/gcHandle.h
deleted file mode 100644
index ed1e9302eb078226c494eeb32bffa5fe90c4e888..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/gcHandle.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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_GC_HANDLE_H
-#define TDENGINE_GC_HANDLE_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#define GC_ROOT_URL_POS   0
-#define GC_ACTION_URL_POS 1
-#define GC_USER_URL_POS   2
-#define GC_PASS_URL_POS   3
-
-void gcInitHandle(HttpServer* pServer);
-bool gcProcessRequest(struct HttpContext* pContext);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/gcJson.h b/src/modules/http/inc/gcJson.h
deleted file mode 100644
index 609bb9b95e6255a6fdf215320b24bbc9292e87e2..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/gcJson.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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_GC_JSON_H
-#define TDENGINE_GC_JSON_H
-#include "httpHandle.h"
-#include "httpJson.h"
-#include "taos.h"
-
-void gcInitQueryJson(HttpContext *pContext);
-void gcCleanQueryJson(HttpContext *pContext);
-
-void gcStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
-void gcStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd);
-bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows);
-
-void gcSendHeartBeatResp(HttpContext *pContext, HttpSqlCmd *cmd);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/http.h b/src/modules/http/inc/http.h
deleted file mode 100644
index ea209f082c82c271b059e4352a5689371d1cd43f..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/http.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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_HTTP_H
-#define TDENGINE_HTTP_H
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-
-#define httpError(...)                       \
-  if (httpDebugFlag & DEBUG_ERROR) {         \
-    tprintf("ERROR HTP ", 255, __VA_ARGS__); \
-  }
-#define httpWarn(...)                                  \
-  if (httpDebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  HTP ", httpDebugFlag, __VA_ARGS__); \
-  }
-#define httpTrace(...)                           \
-  if (httpDebugFlag & DEBUG_TRACE) {             \
-    tprintf("HTP ", httpDebugFlag, __VA_ARGS__); \
-  }
-#define httpDump(...)                                        \
-  if (httpDebugFlag & DEBUG_TRACE) {                         \
-    taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); \
-  }
-#define httpPrint(...) \
-  { tprintf("HTP ", 255, __VA_ARGS__); }
-
-#define httpLError(...) taosLogError(__VA_ARGS__) httpError(__VA_ARGS__)
-#define httpLWarn(...) taosLogWarn(__VA_ARGS__) httpWarn(__VA_ARGS__)
-#define httpLPrint(...) taosLogPrint(__VA_ARGS__) httpPrint(__VA_ARGS__)
-
-#endif
diff --git a/src/modules/http/inc/httpCode.h b/src/modules/http/inc/httpCode.h
deleted file mode 100644
index 0235040139b504077c98a4b1e2c6c8cfa31bcbbf..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/httpCode.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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_HTTP_CODE_H
-#define TDENGINE_HTTP_CODE_H
-
-//for fixed msg info
-#define HTTP_SUCCESS                  0
-#define HTTP_SERVER_OFFLINE           1
-#define HTTP_UNSUPPORT_URL            2
-#define HTTP_PARSE_HTTP_METHOD_ERROR  3
-#define HTTP_PARSE_HTTP_VERSION_ERROR 4
-#define HTTP_PARSE_HEAD_ERROR         5
-#define HTTP_REQUSET_TOO_BIG          6
-#define HTTP_PARSE_BODY_ERROR         7
-#define HTTP_PARSE_CHUNKED_BODY_ERROR 8
-#define HTTP_PARSE_URL_ERROR          9
-#define HTTP_INVALID_AUTH_TOKEN       10
-#define HTTP_PARSE_USR_ERROR          11
-#define HTTP_NO_SQL_INPUT             12  
-#define HTTP_SESSION_FULL             13
-#define HTTP_NO_ENOUGH_MEMORY         14
-#define HTTP_GEN_TAOSD_TOKEN_ERR      15
-#define HTTP_INVALID_DB_TABLE         16
-#define HTTP_NO_EXEC_USEDB            17
-#define HTTP_PARSE_GC_REQ_ERROR       18
-#define HTTP_INVALID_MULTI_REQUEST    19
-#define HTTP_NO_MSG_INPUT             20
-#define HTTP_NO_ENOUGH_SESSIONS       21
-
-//telegraf
-#define HTTP_TG_DB_NOT_INPUT          22
-#define HTTP_TG_DB_TOO_LONG           23
-#define HTTP_TG_INVALID_JSON          24
-#define HTTP_TG_METRICS_NULL          25
-#define HTTP_TG_METRICS_SIZE          26
-#define HTTP_TG_METRIC_NULL           27
-#define HTTP_TG_METRIC_TYPE           28
-#define HTTP_TG_METRIC_NAME_NULL      29
-#define HTTP_TG_METRIC_NAME_LONG      30
-#define HTTP_TG_TIMESTAMP_NULL        31
-#define HTTP_TG_TIMESTAMP_TYPE        32
-#define HTTP_TG_TIMESTAMP_VAL_NULL    33
-#define HTTP_TG_TAGS_NULL             34
-#define HTTP_TG_TAGS_SIZE_0           35
-#define HTTP_TG_TAGS_SIZE_LONG        36
-#define HTTP_TG_TAG_NULL              37
-#define HTTP_TG_TAG_NAME_NULL         38
-#define HTTP_TG_TAG_NAME_SIZE         39
-#define HTTP_TG_TAG_VALUE_TYPE        40
-#define HTTP_TG_TAG_VALUE_NULL        41
-#define HTTP_TG_TABLE_NULL            42
-#define HTTP_TG_TABLE_SIZE            43
-#define HTTP_TG_FIELDS_NULL           44
-#define HTTP_TG_FIELDS_SIZE_0         45
-#define HTTP_TG_FIELDS_SIZE_LONG      46
-#define HTTP_TG_FIELD_NULL            47
-#define HTTP_TG_FIELD_NAME_NULL       48
-#define HTTP_TG_FIELD_NAME_SIZE       49
-#define HTTP_TG_FIELD_VALUE_TYPE      50
-#define HTTP_TG_FIELD_VALUE_NULL      51
-#define HTTP_INVALID_BASIC_AUTH_TOKEN 52
-#define HTTP_INVALID_TAOSD_AUTH_TOKEN 53
-#define HTTP_TG_HOST_NOT_STRING       54
-
-//grafana
-#define HTTP_GC_QUERY_NULL            55
-#define HTTP_GC_QUERY_SIZE            56
-
-//opentsdb
-#define HTTP_OP_DB_NOT_INPUT          57
-#define HTTP_OP_DB_TOO_LONG           58
-#define HTTP_OP_INVALID_JSON          59
-#define HTTP_OP_METRICS_NULL          60
-#define HTTP_OP_METRICS_SIZE          61
-#define HTTP_OP_METRIC_NULL           62
-#define HTTP_OP_METRIC_TYPE           63
-#define HTTP_OP_METRIC_NAME_NULL      64
-#define HTTP_OP_METRIC_NAME_LONG      65
-#define HTTP_OP_TIMESTAMP_NULL        66
-#define HTTP_OP_TIMESTAMP_TYPE        67
-#define HTTP_OP_TIMESTAMP_VAL_NULL    68
-#define HTTP_OP_TAGS_NULL             69
-#define HTTP_OP_TAGS_SIZE_0           70
-#define HTTP_OP_TAGS_SIZE_LONG        71
-#define HTTP_OP_TAG_NULL              72
-#define HTTP_OP_TAG_NAME_NULL         73
-#define HTTP_OP_TAG_NAME_SIZE         74
-#define HTTP_OP_TAG_VALUE_TYPE        75
-#define HTTP_OP_TAG_VALUE_NULL        76
-#define HTTP_OP_TAG_VALUE_TOO_LONG    77
-#define HTTP_OP_VALUE_NULL            78
-#define HTTP_OP_VALUE_TYPE            79
-
-//tgf
-#define HTTP_TG_STABLE_NOT_EXIST     80
-
-extern char *httpMsg[];
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/httpHandle.h b/src/modules/http/inc/httpHandle.h
deleted file mode 100644
index 1b746e15200e1dfa7f0b5dcfc0054120c94aee56..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/httpHandle.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * 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_HTTP_SERVER_H
-#define TDENGINE_HTTP_SERVER_H
-
-#include <stdbool.h>
-#include "pthread.h"
-#include "semaphore.h"
-#include "tmempool.h"
-#include "tsdb.h"
-#include "tutil.h"
-#include "zlib.h"
-
-#include "http.h"
-#include "httpJson.h"
-
-#define HTTP_MAX_CMD_SIZE           1024
-#define HTTP_MAX_BUFFER_SIZE        1024*1024
-
-#define HTTP_LABEL_SIZE             8
-#define HTTP_MAX_EVENTS             10
-#define HTTP_BUFFER_SIZE            1024*65 //65k
-#define HTTP_DECOMPRESS_BUF_SIZE    1024*64
-#define HTTP_STEP_SIZE              1024    //http message get process step by step
-#define HTTP_MAX_URL                5       //http url stack size
-#define HTTP_METHOD_SCANNER_SIZE    7       //http method fp size
-#define HTTP_GC_TARGET_SIZE         128
-
-#define HTTP_VERSION_10             0
-#define HTTP_VERSION_11             1
-//#define HTTP_VERSION_12           2
-
-#define HTTP_UNCUNKED               0
-#define HTTP_CHUNKED                1
-
-#define HTTP_KEEPALIVE_NO_INPUT     0
-#define HTTP_KEEPALIVE_ENABLE       1
-#define HTTP_KEEPALIVE_DISABLE      2
-
-#define HTTP_REQTYPE_OTHERS         0
-#define HTTP_REQTYPE_LOGIN          1
-#define HTTP_REQTYPE_HEARTBEAT      2
-#define HTTP_REQTYPE_SINGLE_SQL     3
-#define HTTP_REQTYPE_MULTI_SQL      4
-
-#define HTTP_CHECK_BODY_ERROR      -1
-#define HTTP_CHECK_BODY_CONTINUE    0
-#define HTTP_CHECK_BODY_SUCCESS     1
-
-#define HTTP_WRITE_RETRY_TIMES      500
-#define HTTP_WRITE_WAIT_TIME_MS     5
-#define HTTP_EXPIRED_TIME           60000
-#define HTTP_DELAY_CLOSE_TIME_MS    500
-
-#define HTTP_COMPRESS_IDENTITY      0
-#define HTTP_COMPRESS_GZIP          2
-
-#define HTTP_SESSION_ID_LEN         (TSDB_USER_LEN * 2 + 1)
-
-typedef enum {
-    HTTP_CONTEXT_STATE_READY,
-    HTTP_CONTEXT_STATE_HANDLING,
-    HTTP_CONTEXT_STATE_DROPPING,
-    HTTP_CONTEXT_STATE_CLOSED
-} HttpContextState;
-
-struct HttpContext;
-struct HttpThread;
-
-typedef struct {
-  void *signature;
-  int   expire;
-  int   access;
-  void *taos;
-  char  id[HTTP_SESSION_ID_LEN + 1];
-} HttpSession;
-
-typedef enum {
-  HTTP_CMD_TYPE_UN_SPECIFIED,
-  HTTP_CMD_TYPE_CREATE_DB,
-  HTTP_CMD_TYPE_CREATE_STBALE,
-  HTTP_CMD_TYPE_INSERT
-} HttpSqlCmdType;
-
-typedef enum { HTTP_CMD_STATE_NOT_RUN_YET, HTTP_CMD_STATE_RUN_FINISHED } HttpSqlCmdState;
-
-typedef enum { HTTP_CMD_RETURN_TYPE_WITH_RETURN, HTTP_CMD_RETURN_TYPE_NO_RETURN } HttpSqlCmdReturnType;
-
-typedef struct {
-  // used by single cmd
-  char   *nativSql;
-  int32_t numOfRows;
-  int32_t code;
-
-  // these are the locations in the buffer
-  int32_t tagNames[TSDB_MAX_TAGS];
-  int32_t tagValues[TSDB_MAX_TAGS];
-  int32_t timestamp;
-  int32_t metric;
-  int32_t stable;
-  int32_t table;
-  int32_t values;
-  int32_t sql;
-
-  // used by multi-cmd
-  int8_t cmdType;
-  int8_t cmdReturnType;
-  int8_t cmdState;
-  int8_t tagNum;
-} HttpSqlCmd;
-
-typedef struct {
-  HttpSqlCmd *cmds;
-  int16_t     pos;
-  int16_t     size;
-  int16_t     maxSize;
-  int32_t     bufferPos;
-  int32_t     bufferSize;
-  char *      buffer;
-} HttpSqlCmds;
-
-typedef struct {
-  char *module;
-  bool (*decodeFp)(struct HttpContext *pContext);
-} HttpDecodeMethod;
-
-typedef struct {
-  void (*startJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, void *result);
-  void (*stopJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd);
-  bool (*buildQueryJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, void *result, int numOfRows);
-  void (*buildAffectRowJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int affectRows);
-  void (*initJsonFp)(struct HttpContext *pContext);
-  void (*cleanJsonFp)(struct HttpContext *pContext);
-  bool (*checkFinishedFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
-  void (*setNextCmdFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
-} HttpEncodeMethod;
-
-typedef struct {
-  char   *pos;
-  int32_t len;
-} HttpBuf;
-
-typedef struct {
-  char              buffer[HTTP_BUFFER_SIZE];
-  int               bufsize;
-  char             *pLast;
-  char             *pCur;
-  HttpBuf           method;
-  HttpBuf           path[HTTP_MAX_URL];  // url: dbname/meter/query
-  HttpBuf           data;                // body content
-  HttpBuf           token;               // auth token
-  HttpDecodeMethod *pMethod;
-} HttpParser;
-
-typedef struct HttpContext {
-  void *       signature;
-  int          fd;
-  uint32_t     accessTimes;
-  uint32_t     lastAccessTime;
-  uint8_t      httpVersion;
-  uint8_t      httpChunked;
-  uint8_t      httpKeepAlive;  // http1.0 and not keep-alive, close connection immediately
-  uint8_t      fromMemPool;
-  uint8_t      acceptEncoding;
-  uint8_t      contentEncoding;
-  uint8_t      reqType;
-  uint8_t      parsed;
-  int32_t      state;
-  char         ipstr[22];
-  char         user[TSDB_USER_LEN];  // parsed from auth token or login message
-  char         pass[TSDB_PASSWORD_LEN];
-  void        *taos;
-  HttpSession *session;
-  z_stream     gzipStream;
-  HttpEncodeMethod   *encodeMethod;
-  HttpSqlCmd          singleCmd;
-  HttpSqlCmds        *multiCmds;
-  JsonBuf            *jsonBuf;
-  HttpParser          parser;
-  void               *timer;
-  struct HttpThread  *pThread;
-  struct HttpContext *prev;
-  struct HttpContext *next;
-} HttpContext;
-
-typedef struct HttpThread {
-  pthread_t       thread;
-  HttpContext *   pHead;
-  pthread_mutex_t threadMutex;
-  pthread_cond_t  fdReady;
-  int             pollFd;
-  int             numOfFds;
-  int             threadId;
-  char            label[HTTP_LABEL_SIZE];
-  bool (*processData)(HttpContext *pContext);
-  struct _http_server_obj_ *pServer;  // handle passed by upper layer during pServer initialization
-} HttpThread;
-
-typedef struct _http_server_obj_ {
-  char              label[HTTP_LABEL_SIZE];
-  char              serverIp[16];
-  uint16_t          serverPort;
-  int               cacheContext;
-  int               sessionExpire;
-  int               numOfThreads;
-  HttpDecodeMethod *methodScanner[HTTP_METHOD_SCANNER_SIZE];
-  int               methodScannerLen;
-  pthread_mutex_t   serverMutex;
-  void             *pSessionHash;
-  void             *pContextPool;
-  void             *expireTimer;
-  HttpThread       *pThreads;
-  pthread_t         thread;
-  bool            (*processData)(HttpContext *pContext);
-  int               requestNum;
-  void             *timerHandle;
-  bool              online;
-} HttpServer;
-
-// http util method
-bool httpCheckUsedbSql(char *sql);
-void httpTimeToString(time_t t, char *buf, int buflen);
-
-// http init method
-void *httpInitServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
-void httpCleanUpServer(HttpServer *pServer);
-
-// http server connection
-void httpCleanUpConnect(HttpServer *pServer);
-bool httpInitConnect(HttpServer *pServer);
-
-// http context for each client connection
-HttpContext *httpCreateContext(HttpServer *pServer);
-bool httpInitContext(HttpContext *pContext);
-void httpCloseContextByApp(HttpContext *pContext);
-void httpCloseContextByServer(HttpThread *pThread, HttpContext *pContext);
-
-// http session method
-void httpCreateSession(HttpContext *pContext, void *taos);
-void httpAccessSession(HttpContext *pContext);
-void httpFetchSession(HttpContext *pContext);
-void httpRestoreSession(HttpContext *pContext);
-void httpRemoveExpireSessions(HttpServer *pServer);
-bool httpInitAllSessions(HttpServer *pServer);
-void httpRemoveAllSessions(HttpServer *pServer);
-void httpProcessSessionExpire(void *handle, void *tmrId);
-
-// http request parser
-void httpAddMethod(HttpServer *pServer, HttpDecodeMethod *pMethod);
-
-// http token method
-bool httpParseBasicAuthToken(HttpContext *pContext, char *token, int len);
-bool httpParseTaosdAuthToken(HttpContext *pContext, char *token, int len);
-bool httpGenTaosdAuthToken(HttpContext *pContext, char *token, int maxLen);
-
-// util
-bool httpUrlMatch(HttpContext *pContext, int pos, char *cmp);
-bool httpProcessData(HttpContext *pContext);
-bool httpReadDataImp(HttpContext *pContext);
-bool httpParseRequest(HttpContext* pContext);
-int  httpCheckReadCompleted(HttpContext* pContext);
-void httpReadDirtyData(HttpContext *pContext);
-
-// http request handler
-void httpProcessRequest(HttpContext *pContext);
-
-// http json printer
-JsonBuf *httpMallocJsonBuf(HttpContext *pContext);
-void httpFreeJsonBuf(HttpContext *pContext);
-
-// http multicmds util
-
-int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...);
-int32_t httpAddToSqlCmdBufferNoTerminal(HttpContext *pContext, const char *const format, ...);
-int32_t httpAddToSqlCmdBufferWithSize(HttpContext *pContext, int mallocSize);
-int32_t httpAddToSqlCmdBufferTerminal(HttpContext *pContext);
-
-bool httpMallocMultiCmds(HttpContext *pContext, int cmdSize, int bufferSize);
-bool httpReMallocMultiCmdsSize(HttpContext *pContext, int cmdSize);
-bool httpReMallocMultiCmdsBuffer(HttpContext *pContext, int bufferSize);
-void httpFreeMultiCmds(HttpContext *pContext);
-
-HttpSqlCmd *httpNewSqlCmd(HttpContext *pContext);
-HttpSqlCmd *httpCurrSqlCmd(HttpContext *pContext);
-int httpCurSqlCmdPos(HttpContext *pContext);
-
-void httpTrimTableName(char *name);
-int httpShrinkTableName(HttpContext *pContext, int pos, char *name);
-char *httpGetCmdsString(HttpContext *pContext, int pos);
-
-int httpGzipDeCompress(char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData);
-int httpGzipCompressInit(HttpContext *pContext);
-int httpGzipCompress(HttpContext *pContext, char *inSrcData, int32_t inSrcDataLen,
-                     char *outDestData, int32_t *outDestDataLen, bool isTheLast);
-
-extern const char *httpKeepAliveStr[];
-extern const char *httpVersionStr[];
-const char* httpContextStateStr(HttpContextState state);
-
-bool httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState);
-void httpRemoveContextFromEpoll(HttpThread *pThread, HttpContext *pContext);
-
-#endif
diff --git a/src/modules/http/inc/httpJson.h b/src/modules/http/inc/httpJson.h
deleted file mode 100644
index 403c20b083934755e8f32d83a394e79eecd80725..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/httpJson.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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_HTTP_JSON_H
-#define TDENGINE_HTTP_JSON_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#define JSON_BUFFER_SIZE 10240
-struct HttpContext;
-
-enum { JsonNumber, JsonString, JsonBoolean, JsonArray, JsonObject, JsonNull };
-
-extern char JsonItmTkn;
-extern char JsonObjStt;
-extern char JsonObjEnd;
-extern char JsonArrStt;
-extern char JsonArrEnd;
-extern char JsonStrStt;
-extern char JsonStrEnd;
-extern char JsonPairTkn;
-extern char JsonNulTkn[];
-extern char JsonTrueTkn[];
-extern char JsonFalseTkn[];
-
-typedef struct {
-  int                 size;
-  int                 total;
-  char*               lst;
-  char                buf[JSON_BUFFER_SIZE];
-  struct HttpContext* pContext;
-} JsonBuf;
-
-// http response
-int httpWriteBuf(struct HttpContext* pContext, const char* buf, int sz);
-int httpWriteBufNoTrace(struct HttpContext* pContext, const char* buf, int sz);
-int httpWriteBufByFd(struct HttpContext* pContext, const char* buf, int sz);
-
-// builder callback
-typedef void (*httpJsonBuilder)(JsonBuf* buf, void* jsnHandle);
-
-// buffer
-void httpInitJsonBuf(JsonBuf* buf, struct HttpContext* pContext);
-void httpWriteJsonBufHead(JsonBuf* buf);
-int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast);
-void httpWriteJsonBufEnd(JsonBuf* buf);
-
-// value
-void httpJsonString(JsonBuf* buf, char* sVal, int len);
-void httpJsonOriginString(JsonBuf* buf, char* sVal, int len);
-void httpJsonStringForTransMean(JsonBuf* buf, char* SVal, int maxLen);
-void httpJsonInt64(JsonBuf* buf, int64_t num);
-void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us);
-void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us);
-void httpJsonInt(JsonBuf* buf, int num);
-void httpJsonFloat(JsonBuf* buf, float num);
-void httpJsonDouble(JsonBuf* buf, double num);
-void httpJsonNull(JsonBuf* buf);
-void httpJsonBool(JsonBuf* buf, int val);
-
-// pair
-void httpJsonPair(JsonBuf* buf, char* name, int nameLen, char* sVal, int valLen);
-void httpJsonPairOriginString(JsonBuf* buf, char* name, int nameLen, char* sVal, int valLen);
-void httpJsonPairHead(JsonBuf* buf, char* name, int len);
-void httpJsonPairIntVal(JsonBuf* buf, char* name, int nNameLen, int num);
-void httpJsonPairInt64Val(JsonBuf* buf, char* name, int nNameLen, int64_t num);
-void httpJsonPairBoolVal(JsonBuf* buf, char* name, int nNameLen, int num);
-void httpJsonPairFloatVal(JsonBuf* buf, char* name, int nNameLen, float num);
-void httpJsonPairDoubleVal(JsonBuf* buf, char* name, int nNameLen, double num);
-void httpJsonPairNullVal(JsonBuf* buf, char* name, int nNameLen);
-
-// object
-void httpJsonPairArray(JsonBuf* buf, char* name, int nLen, httpJsonBuilder builder, void* dsHandle);
-void httpJsonPairObject(JsonBuf* buf, char* name, int nLen, httpJsonBuilder builder, void* dsHandle);
-void httpJsonObject(JsonBuf* buf, httpJsonBuilder fnBuilder, void* dsHandle);
-void httpJsonArray(JsonBuf* buf, httpJsonBuilder fnBuidler, void* jsonHandle);
-
-// print
-void httpJsonTestBuf(JsonBuf* buf, int safety);
-void httpJsonToken(JsonBuf* buf, char c);
-void httpJsonItemToken(JsonBuf* buf);
-void httpJsonPrint(JsonBuf* buf, const char* json, int len);
-
-// quick
-void httpJsonPairStatus(JsonBuf* buf, int code);
-
-#endif
diff --git a/src/modules/http/inc/httpResp.h b/src/modules/http/inc/httpResp.h
deleted file mode 100644
index 4868d4c68894b92ea6f4ac3345efde2faeb5556a..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/httpResp.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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_HTTP_RESP_H
-#define TDENGINE_HTTP_RESP_H
-
-#include "httpHandle.h"
-
-enum _httpRespTempl {
-  HTTP_RESPONSE_JSON_OK,
-  HTTP_RESPONSE_JSON_ERROR,
-  HTTP_RESPONSE_OK,
-  HTTP_RESPONSE_ERROR,
-  HTTP_RESPONSE_CHUNKED_UN_COMPRESS,
-  HTTP_RESPONSE_CHUNKED_COMPRESS,
-  HTTP_RESPONSE_OPTIONS,
-  HTTP_RESPONSE_GRAFANA,
-  HTTP_RESP_END
-};
-
-extern const char *httpRespTemplate[];
-
-void httpSendErrorResp(HttpContext *pContext, int errNo);
-void httpSendErrorRespWithDesc(HttpContext *pContext, int errNo, char *desc);
-void httpSendTaosdErrorResp(HttpContext *pContext, int errCode);
-void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char* errMsg);
-void httpSendSuccResp(HttpContext *pContext, char *desc);
-void httpSendOptionResp(HttpContext *pContext, char *desc);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/httpSystem.h b/src/modules/http/inc/httpSystem.h
deleted file mode 100644
index 0a09c3f7629ee2876117b232c041d9bd015aa2a4..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/httpSystem.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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_HTTP_SYSTEM_H
-#define TDENGINE_HTTP_SYSTEM_H
-
-int  httpInitSystem();
-int  httpStartSystem();
-void httpStopSystem();
-void httpCleanUpSystem();
-void httpGetReqCount(int32_t *httpConns);
-
-#endif
diff --git a/src/modules/http/inc/restHandle.h b/src/modules/http/inc/restHandle.h
deleted file mode 100644
index 48ad040c538318d41061a97ab4caa79c8da67fa4..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/restHandle.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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_REST_HANDLE_H
-#define TDENGINE_REST_HANDLE_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#define REST_ROOT_URL_POS   0
-#define REST_ACTION_URL_POS 1
-#define REST_USER_URL_POS   2
-#define REST_PASS_URL_POS   3
-
-void restInitHandle(HttpServer* pServer);
-bool restProcessRequest(struct HttpContext* pContext);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/restJson.h b/src/modules/http/inc/restJson.h
deleted file mode 100644
index 7cff21d190b389361887582c9422bd9e59da35bc..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/restJson.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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_REST_JSON_H
-#define TDENGINE_REST_JSON_H
-#include <stdbool.h>
-#include "httpHandle.h"
-#include "httpJson.h"
-#include "taos.h"
-
-#define REST_JSON_SUCCESS        "succ"
-#define REST_JSON_SUCCESS_LEN    4
-#define REST_JSON_FAILURE        "error"
-#define REST_JSON_FAILURE_LEN    5
-#define REST_JSON_STATUS         "status"
-#define REST_JSON_STATUS_LEN     6
-#define REST_JSON_CODE           "code"
-#define REST_JSON_CODE_LEN       4
-#define REST_JSON_DESC           "desc"
-#define REST_JSON_DESC_LEN       4
-#define REST_JSON_DATA           "data"
-#define REST_JSON_DATA_LEN       4
-#define REST_JSON_HEAD           "head"
-#define REST_JSON_HEAD_LEN       4
-#define REST_JSON_ROWS           "rows"
-#define REST_JSON_ROWS_LEN       4
-#define REST_JSON_AFFECT_ROWS    "affected_rows"
-#define REST_JSON_AFFECT_ROWS_LEN 13
-
-#define REST_TIMESTAMP_FMT_LOCAL_STRING 0
-#define REST_TIMESTAMP_FMT_TIMESTAMP    1
-#define REST_TIMESTAMP_FMT_UTC_STRING   2
-
-void restBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int affect_rows);
-
-void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
-bool restBuildSqlTimestampJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows);
-bool restBuildSqlLocalTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows);
-bool restBuildSqlUtcTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows);
-void restStopSqlJson(HttpContext *pContext, HttpSqlCmd *cmd);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/tgHandle.h b/src/modules/http/inc/tgHandle.h
deleted file mode 100644
index 5b8c49900f335a8244d88660111c08906a3402d4..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/tgHandle.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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_TG_HANDLE_H
-#define TDENGINE_TG_HANDLE_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "cJSON.h"
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#define TG_ROOT_URL_POS   0
-#define TG_DB_URL_POS     1
-#define TG_USER_URL_POS   2
-#define TG_PASS_URL_POS   3
-
-void tgInitHandle(HttpServer *pServer);
-
-bool tgProcessRquest(struct HttpContext *pContext);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/inc/tgJson.h b/src/modules/http/inc/tgJson.h
deleted file mode 100644
index bf3aa093ae9132bba67ea2dff7b233c7457ccccd..0000000000000000000000000000000000000000
--- a/src/modules/http/inc/tgJson.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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_TG_JSON_H
-#define TDENGINE_TG_JSON_H
-
-#include "httpHandle.h"
-#include "httpJson.h"
-#include "taos.h"
-
-void tgInitQueryJson(HttpContext *pContext);
-void tgCleanQueryJson(HttpContext *pContext);
-void tgStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
-void tgStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd);
-void tgBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int affect_rows);
-bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
-void tgSetNextCmd(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/http/src/cJSON.c b/src/modules/http/src/cJSON.c
deleted file mode 100644
index fa836f98711d99ef57eecf1fa314286a41b5c2c1..0000000000000000000000000000000000000000
--- a/src/modules/http/src/cJSON.c
+++ /dev/null
@@ -1,2699 +0,0 @@
-/*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-/* cJSON */
-/* JSON parser in C. */
-
-#ifdef __GNUC__
-#pragma GCC visibility push(default)
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <float.h>
-#include <limits.h>
-#include <ctype.h>
-#include <locale.h>
-
-#ifdef __GNUC__
-#pragma GCC visibility pop
-#endif
-
-#include "cJSON.h"
-
-/* define our own boolean type */
-#define true ((cJSON_bool)1)
-#define false ((cJSON_bool)0)
-
-typedef struct {
-    const unsigned char *json;
-    size_t position;
-} error;
-static error global_error = { NULL, 0 };
-
-CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
-{
-    return (const char*) (global_error.json + global_error.position);
-}
-
-/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
-#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 9)
-    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
-#endif
-
-CJSON_PUBLIC(const char*) cJSON_Version(void)
-{
-    static char version[15];
-    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
-
-    return version;
-}
-
-/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
-static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
-{
-    if ((string1 == NULL) || (string2 == NULL))
-    {
-        return 1;
-    }
-
-    if (string1 == string2)
-    {
-        return 0;
-    }
-
-    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
-    {
-        if (*string1 == '\0')
-        {
-            return 0;
-        }
-    }
-
-    return tolower(*string1) - tolower(*string2);
-}
-
-typedef struct internal_hooks
-{
-    void *(*allocate)(size_t size);
-    void (*deallocate)(void *pointer);
-    void *(*reallocate)(void *pointer, size_t size);
-} internal_hooks;
-
-static internal_hooks global_hooks = { malloc, free, realloc };
-
-static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
-{
-    size_t length = 0;
-    unsigned char *copy = NULL;
-
-    if (string == NULL)
-    {
-        return NULL;
-    }
-
-    length = strlen((const char*)string) + sizeof("");
-    if (!(copy = (unsigned char*)hooks->allocate(length)))
-    {
-        return NULL;
-    }
-    memcpy(copy, string, length);
-
-    return copy;
-}
-
-CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
-{
-    if (hooks == NULL)
-    {
-        /* Reset hooks */
-        global_hooks.allocate = malloc;
-        global_hooks.deallocate = free;
-        global_hooks.reallocate = realloc;
-        return;
-    }
-
-    global_hooks.allocate = malloc;
-    if (hooks->malloc_fn != NULL)
-    {
-        global_hooks.allocate = hooks->malloc_fn;
-    }
-
-    global_hooks.deallocate = free;
-    if (hooks->free_fn != NULL)
-    {
-        global_hooks.deallocate = hooks->free_fn;
-    }
-
-    /* use realloc only if both free and malloc are used */
-    global_hooks.reallocate = NULL;
-    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
-    {
-        global_hooks.reallocate = realloc;
-    }
-}
-
-/* Internal constructor. */
-static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
-{
-    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
-    if (node)
-    {
-        memset(node, '\0', sizeof(cJSON));
-    }
-
-    return node;
-}
-
-/* Delete a cJSON structure. */
-CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
-{
-    cJSON *next = NULL;
-    while (item != NULL)
-    {
-        next = item->next;
-        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
-        {
-            cJSON_Delete(item->child);
-        }
-        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
-        {
-            global_hooks.deallocate(item->valuestring);
-        }
-        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
-        {
-            global_hooks.deallocate(item->string);
-        }
-        global_hooks.deallocate(item);
-        item = next;
-    }
-}
-
-/* get the decimal point character of the current locale */
-static unsigned char get_decimal_point(void)
-{
-    struct lconv *lconv = localeconv();
-    return (unsigned char) lconv->decimal_point[0];
-}
-
-typedef struct
-{
-    const unsigned char *content;
-    size_t length;
-    size_t offset;
-    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
-    internal_hooks hooks;
-} parse_buffer;
-
-/* check if the given size is left to read in a given parse buffer (starting with 1) */
-#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
-#define cannot_read(buffer, size) (!can_read(buffer, size))
-/* check if the buffer can be accessed at the given index (starting with 0) */
-#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
-#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
-/* get a pointer to the buffer at the position */
-#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
-
-/* Parse the input text to generate a number, and populate the result into item. */
-static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
-{
-    double number = 0;
-    unsigned char *after_end = NULL;
-    unsigned char number_c_string[64];
-    unsigned char decimal_point = get_decimal_point();
-    size_t i = 0;
-
-    if ((input_buffer == NULL) || (input_buffer->content == NULL))
-    {
-        return false;
-    }
-
-    /* copy the number into a temporary buffer and replace '.' with the decimal point
-     * of the current locale (for strtod)
-     * This also takes care of '\0' not necessarily being available for marking the end of the input */
-    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
-    {
-        switch (buffer_at_offset(input_buffer)[i])
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            case '+':
-            case '-':
-            case 'e':
-            case 'E':
-                number_c_string[i] = buffer_at_offset(input_buffer)[i];
-                break;
-
-            case '.':
-                number_c_string[i] = decimal_point;
-                break;
-
-            default:
-                goto loop_end;
-        }
-    }
-loop_end:
-    number_c_string[i] = '\0';
-
-    number = strtod((const char*)number_c_string, (char**)&after_end);
-    if (number_c_string == after_end)
-    {
-        return false; /* parse_error */
-    }
-
-    item->valuedouble = number;
-
-    /* use saturation in case of overflow */
-    if (number >= LLONG_MAX)
-    {
-        item->valueint = LLONG_MAX;
-    }
-    else if (number <= LLONG_MIN)
-    {
-        item->valueint = LLONG_MIN;
-    }
-    else
-    {
-        item->valueint = (int64_t)number;
-    }
-
-    item->type = cJSON_Number;
-
-    input_buffer->offset += (size_t)(after_end - number_c_string);
-    return true;
-}
-
-/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
-CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
-{
-    if (number >= LLONG_MAX)
-    {
-        object->valueint = LLONG_MAX;
-    }
-    else if (number <= LLONG_MIN)
-    {
-        object->valueint = LLONG_MIN;
-    }
-    else
-    {
-        object->valueint = (int64_t)number;
-    }
-
-    return object->valuedouble = number;
-}
-
-typedef struct
-{
-    unsigned char *buffer;
-    size_t length;
-    size_t offset;
-    size_t depth; /* current nesting depth (for formatted printing) */
-    cJSON_bool noalloc;
-    cJSON_bool format; /* is this print a formatted print */
-    internal_hooks hooks;
-} printbuffer;
-
-/* realloc printbuffer if necessary to have at least "needed" bytes more */
-static unsigned char* ensure(printbuffer * const p, size_t needed)
-{
-    unsigned char *newbuffer = NULL;
-    size_t newsize = 0;
-
-    if ((p == NULL) || (p->buffer == NULL))
-    {
-        return NULL;
-    }
-
-    if ((p->length > 0) && (p->offset >= p->length))
-    {
-        /* make sure that offset is valid */
-        return NULL;
-    }
-
-    if (needed > LLONG_MAX)
-    {
-        /* sizes bigger than LLONG_MAX are currently not supported */
-        return NULL;
-    }
-
-    needed += p->offset + 1;
-    if (needed <= p->length)
-    {
-        return p->buffer + p->offset;
-    }
-
-    if (p->noalloc) {
-        return NULL;
-    }
-
-    /* calculate new buffer size */
-    if (needed > (LLONG_MAX / 2))
-    {
-        /* overflow of int, use LLONG_MAX if possible */
-        if (needed <= LLONG_MAX)
-        {
-            newsize = LLONG_MAX;
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        newsize = needed * 2;
-    }
-
-    if (p->hooks.reallocate != NULL)
-    {
-        /* reallocate with realloc if available */
-        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
-        if (newbuffer == NULL)
-        {
-            p->hooks.deallocate(p->buffer);
-            p->length = 0;
-            p->buffer = NULL;
-
-            return NULL;
-        }
-    }
-    else
-    {
-        /* otherwise reallocate manually */
-        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
-        if (!newbuffer)
-        {
-            p->hooks.deallocate(p->buffer);
-            p->length = 0;
-            p->buffer = NULL;
-
-            return NULL;
-        }
-        if (newbuffer)
-        {
-            memcpy(newbuffer, p->buffer, p->offset + 1);
-        }
-        p->hooks.deallocate(p->buffer);
-    }
-    p->length = newsize;
-    p->buffer = newbuffer;
-
-    return newbuffer + p->offset;
-}
-
-/* calculate the new length of the string in a printbuffer and update the offset */
-static void update_offset(printbuffer * const buffer)
-{
-    const unsigned char *buffer_pointer = NULL;
-    if ((buffer == NULL) || (buffer->buffer == NULL))
-    {
-        return;
-    }
-    buffer_pointer = buffer->buffer + buffer->offset;
-
-    buffer->offset += strlen((const char*)buffer_pointer);
-}
-
-/* Render the number nicely from the given item into a string. */
-static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    double d = item->valuedouble;
-    int length = 0;
-    size_t i = 0;
-    unsigned char number_buffer[26]; /* temporary buffer to print the number into */
-    unsigned char decimal_point = get_decimal_point();
-    double test;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* This checks for NaN and Infinity */
-    if ((d * 0) != 0)
-    {
-        length = sprintf((char*)number_buffer, "null");
-    }
-    else
-    {
-        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
-        length = sprintf((char*)number_buffer, "%1.15g", d);
-
-        /* Check whether the original double can be recovered */
-        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || ((double)test != d))
-        {
-            /* If not, print with 17 decimal places of precision */
-            length = sprintf((char*)number_buffer, "%1.17g", d);
-        }
-    }
-
-    /* sprintf failed or buffer overrun occured */
-    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
-    {
-        return false;
-    }
-
-    /* reserve appropriate space in the output */
-    output_pointer = ensure(output_buffer, (size_t)length);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    /* copy the printed number to the output and replace locale
-     * dependent decimal point with '.' */
-    for (i = 0; i < ((size_t)length); i++)
-    {
-        if (number_buffer[i] == decimal_point)
-        {
-            output_pointer[i] = '.';
-            continue;
-        }
-
-        output_pointer[i] = number_buffer[i];
-    }
-    output_pointer[i] = '\0';
-
-    output_buffer->offset += (size_t)length;
-
-    return true;
-}
-
-/* parse 4 digit hexadecimal number */
-static unsigned parse_hex4(const unsigned char * const input)
-{
-    unsigned int h = 0;
-    size_t i = 0;
-
-    for (i = 0; i < 4; i++)
-    {
-        /* parse digit */
-        if ((input[i] >= '0') && (input[i] <= '9'))
-        {
-            h += (unsigned int) input[i] - '0';
-        }
-        else if ((input[i] >= 'A') && (input[i] <= 'F'))
-        {
-            h += (unsigned int) 10 + input[i] - 'A';
-        }
-        else if ((input[i] >= 'a') && (input[i] <= 'f'))
-        {
-            h += (unsigned int) 10 + input[i] - 'a';
-        }
-        else /* invalid */
-        {
-            return 0;
-        }
-
-        if (i < 3)
-        {
-            /* shift left to make place for the next nibble */
-            h = h << 4;
-        }
-    }
-
-    return h;
-}
-
-/* converts a UTF-16 literal to UTF-8
- * A literal can be one or two sequences of the form \uXXXX */
-static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
-{
-    uint64_t codepoint = 0;
-    unsigned int first_code = 0;
-    const unsigned char *first_sequence = input_pointer;
-    unsigned char utf8_length = 0;
-    unsigned char utf8_position = 0;
-    unsigned char sequence_length = 0;
-    unsigned char first_byte_mark = 0;
-
-    if ((input_end - first_sequence) < 6)
-    {
-        /* input ends unexpectedly */
-        goto fail;
-    }
-
-    /* get the first utf16 sequence */
-    first_code = parse_hex4(first_sequence + 2);
-
-    /* check that the code is valid */
-    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
-    {
-        goto fail;
-    }
-
-    /* UTF16 surrogate pair */
-    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
-    {
-        const unsigned char *second_sequence = first_sequence + 6;
-        unsigned int second_code = 0;
-        sequence_length = 12; /* \uXXXX\uXXXX */
-
-        if ((input_end - second_sequence) < 6)
-        {
-            /* input ends unexpectedly */
-            goto fail;
-        }
-
-        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
-        {
-            /* missing second half of the surrogate pair */
-            goto fail;
-        }
-
-        /* get the second utf16 sequence */
-        second_code = parse_hex4(second_sequence + 2);
-        /* check that the code is valid */
-        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
-        {
-            /* invalid second half of the surrogate pair */
-            goto fail;
-        }
-
-
-        /* calculate the unicode codepoint from the surrogate pair */
-        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
-    }
-    else
-    {
-        sequence_length = 6; /* \uXXXX */
-        codepoint = first_code;
-    }
-
-    /* encode as UTF-8
-     * takes at maximum 4 bytes to encode:
-     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
-    if (codepoint < 0x80)
-    {
-        /* normal ascii, encoding 0xxxxxxx */
-        utf8_length = 1;
-    }
-    else if (codepoint < 0x800)
-    {
-        /* two bytes, encoding 110xxxxx 10xxxxxx */
-        utf8_length = 2;
-        first_byte_mark = 0xC0; /* 11000000 */
-    }
-    else if (codepoint < 0x10000)
-    {
-        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
-        utf8_length = 3;
-        first_byte_mark = 0xE0; /* 11100000 */
-    }
-    else if (codepoint <= 0x10FFFF)
-    {
-        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
-        utf8_length = 4;
-        first_byte_mark = 0xF0; /* 11110000 */
-    }
-    else
-    {
-        /* invalid unicode codepoint */
-        goto fail;
-    }
-
-    /* encode as utf8 */
-    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
-    {
-        /* 10xxxxxx */
-        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
-        codepoint >>= 6;
-    }
-    /* encode first byte */
-    if (utf8_length > 1)
-    {
-        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
-    }
-    else
-    {
-        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
-    }
-
-    *output_pointer += utf8_length;
-
-    return sequence_length;
-
-fail:
-    return 0;
-}
-
-/* Parse the input text into an unescaped cinput, and populate item. */
-static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
-{
-    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
-    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
-    unsigned char *output_pointer = NULL;
-    unsigned char *output = NULL;
-
-    /* not a string */
-    if (buffer_at_offset(input_buffer)[0] != '\"')
-    {
-        goto fail;
-    }
-
-    {
-        /* calculate approximate size of the output (overestimate) */
-        size_t allocation_length = 0;
-        size_t skipped_bytes = 0;
-        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
-        {
-            /* is escape sequence */
-            if (input_end[0] == '\\')
-            {
-                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
-                {
-                    /* prevent buffer overflow when last input character is a backslash */
-                    goto fail;
-                }
-                skipped_bytes++;
-                input_end++;
-            }
-            input_end++;
-        }
-        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
-        {
-            goto fail; /* string ended unexpectedly */
-        }
-
-        /* This is at most how much we need for the output */
-        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
-        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
-        if (output == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-    }
-
-    output_pointer = output;
-    /* loop through the string literal */
-    while (input_pointer < input_end)
-    {
-        if (*input_pointer != '\\')
-        {
-            *output_pointer++ = *input_pointer++;
-        }
-        /* escape sequence */
-        else
-        {
-            unsigned char sequence_length = 2;
-            if ((input_end - input_pointer) < 1)
-            {
-                goto fail;
-            }
-
-            switch (input_pointer[1])
-            {
-                case 'b':
-                    *output_pointer++ = '\b';
-                    break;
-                case 'f':
-                    *output_pointer++ = '\f';
-                    break;
-                case 'n':
-                    *output_pointer++ = '\n';
-                    break;
-                case 'r':
-                    *output_pointer++ = '\r';
-                    break;
-                case 't':
-                    *output_pointer++ = '\t';
-                    break;
-                case '\"':
-                case '\\':
-                case '/':
-                    *output_pointer++ = input_pointer[1];
-                    break;
-
-                /* UTF-16 literal */
-                case 'u':
-                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
-                    if (sequence_length == 0)
-                    {
-                        /* failed to convert UTF16-literal to UTF-8 */
-                        goto fail;
-                    }
-                    break;
-
-                default:
-                    goto fail;
-            }
-            input_pointer += sequence_length;
-        }
-    }
-
-    /* zero terminate the output */
-    *output_pointer = '\0';
-
-    item->type = cJSON_String;
-    item->valuestring = (char*)output;
-
-    input_buffer->offset = (size_t) (input_end - input_buffer->content);
-    input_buffer->offset++;
-
-    return true;
-
-fail:
-    if (output != NULL)
-    {
-        input_buffer->hooks.deallocate(output);
-    }
-
-    if (input_pointer != NULL)
-    {
-        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
-    }
-
-    return false;
-}
-
-/* Render the cstring provided to an escaped version that can be printed. */
-static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
-{
-    const unsigned char *input_pointer = NULL;
-    unsigned char *output = NULL;
-    unsigned char *output_pointer = NULL;
-    size_t output_length = 0;
-    /* numbers of additional characters needed for escaping */
-    size_t escape_characters = 0;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* empty string */
-    if (input == NULL)
-    {
-        output = ensure(output_buffer, sizeof("\"\""));
-        if (output == NULL)
-        {
-            return false;
-        }
-        strcpy((char*)output, "\"\"");
-
-        return true;
-    }
-
-    /* set "flag" to 1 if something needs to be escaped */
-    for (input_pointer = input; *input_pointer; input_pointer++)
-    {
-        switch (*input_pointer)
-        {
-            case '\"':
-            case '\\':
-            case '\b':
-            case '\f':
-            case '\n':
-            case '\r':
-            case '\t':
-                /* one character escape sequence */
-                escape_characters++;
-                break;
-            default:
-                if (*input_pointer < 32)
-                {
-                    /* UTF-16 escape sequence uXXXX */
-                    escape_characters += 5;
-                }
-                break;
-        }
-    }
-    output_length = (size_t)(input_pointer - input) + escape_characters;
-
-    output = ensure(output_buffer, output_length + sizeof("\"\""));
-    if (output == NULL)
-    {
-        return false;
-    }
-
-    /* no characters have to be escaped */
-    if (escape_characters == 0)
-    {
-        output[0] = '\"';
-        memcpy(output + 1, input, output_length);
-        output[output_length + 1] = '\"';
-        output[output_length + 2] = '\0';
-
-        return true;
-    }
-
-    output[0] = '\"';
-    output_pointer = output + 1;
-    /* copy the string */
-    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
-    {
-        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
-        {
-            /* normal character, copy */
-            *output_pointer = *input_pointer;
-        }
-        else
-        {
-            /* character needs to be escaped */
-            *output_pointer++ = '\\';
-            switch (*input_pointer)
-            {
-                case '\\':
-                    *output_pointer = '\\';
-                    break;
-                case '\"':
-                    *output_pointer = '\"';
-                    break;
-                case '\b':
-                    *output_pointer = 'b';
-                    break;
-                case '\f':
-                    *output_pointer = 'f';
-                    break;
-                case '\n':
-                    *output_pointer = 'n';
-                    break;
-                case '\r':
-                    *output_pointer = 'r';
-                    break;
-                case '\t':
-                    *output_pointer = 't';
-                    break;
-                default:
-                    /* escape and print as unicode codepoint */
-                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
-                    output_pointer += 4;
-                    break;
-            }
-        }
-    }
-    output[output_length + 1] = '\"';
-    output[output_length + 2] = '\0';
-
-    return true;
-}
-
-/* Invoke print_string_ptr (which is useful) on an item. */
-static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
-{
-    return print_string_ptr((unsigned char*)item->valuestring, p);
-}
-
-/* Predeclare these prototypes. */
-static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
-static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
-static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
-static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
-
-/* Utility to jump whitespace and cr/lf */
-static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
-{
-    if ((buffer == NULL) || (buffer->content == NULL))
-    {
-        return NULL;
-    }
-
-    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
-    {
-       buffer->offset++;
-    }
-
-    if (buffer->offset == buffer->length)
-    {
-        buffer->offset--;
-    }
-
-    return buffer;
-}
-
-/* Parse an object - create a new root, and populate. */
-CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
-{
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    cJSON *item = NULL;
-
-    /* reset error position */
-    global_error.json = NULL;
-    global_error.position = 0;
-
-    if (value == NULL)
-    {
-        goto fail;
-    }
-
-    buffer.content = (const unsigned char*)value;
-    buffer.length = strlen((const char*)value) + sizeof("");
-    buffer.offset = 0;
-    buffer.hooks = global_hooks;
-
-    item = cJSON_New_Item(&global_hooks);
-    if (item == NULL) /* memory fail */
-    {
-        goto fail;
-    }
-
-    if (!parse_value(item, buffer_skip_whitespace(&buffer)))
-    {
-        /* parse failure. ep is set. */
-        goto fail;
-    }
-
-    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
-    if (require_null_terminated)
-    {
-        buffer_skip_whitespace(&buffer);
-        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
-        {
-            goto fail;
-        }
-    }
-    if (return_parse_end)
-    {
-        *return_parse_end = (const char*)buffer_at_offset(&buffer);
-    }
-
-    return item;
-
-fail:
-    if (item != NULL)
-    {
-        cJSON_Delete(item);
-    }
-
-    if (value != NULL)
-    {
-        error local_error;
-        local_error.json = (const unsigned char*)value;
-        local_error.position = 0;
-
-        if (buffer.offset < buffer.length)
-        {
-            local_error.position = buffer.offset;
-        }
-        else if (buffer.length > 0)
-        {
-            local_error.position = buffer.length - 1;
-        }
-
-        if (return_parse_end != NULL)
-        {
-            *return_parse_end = (const char*)local_error.json + local_error.position;
-        }
- 
-        global_error = local_error;
-    }
-
-    return NULL;
-}
-
-/* Default options for cJSON_Parse */
-CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
-{
-    return cJSON_ParseWithOpts(value, 0, 0);
-}
-
-#define cjson_min(a, b) ((a < b) ? a : b)
-
-static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
-{
-    printbuffer buffer[1];
-    unsigned char *printed = NULL;
-
-    memset(buffer, 0, sizeof(buffer));
-
-    /* create buffer */
-    buffer->buffer = (unsigned char*) hooks->allocate(256);
-    buffer->format = format;
-    buffer->hooks = *hooks;
-    if (buffer->buffer == NULL)
-    {
-        goto fail;
-    }
-
-    /* print the value */
-    if (!print_value(item, buffer))
-    {
-        goto fail;
-    }
-    update_offset(buffer);
-
-    /* check if reallocate is available */
-    if (hooks->reallocate != NULL)
-    {
-        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->length);
-        buffer->buffer = NULL;
-        if (printed == NULL) {
-            goto fail;
-        }
-    }
-    else /* otherwise copy the JSON over to a new buffer */
-    {
-        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
-        if (printed == NULL)
-        {
-            goto fail;
-        }
-        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
-        printed[buffer->offset] = '\0'; /* just to be sure */
-
-        /* free the buffer */
-        hooks->deallocate(buffer->buffer);
-    }
-
-    return printed;
-
-fail:
-    if (buffer->buffer != NULL)
-    {
-        hooks->deallocate(buffer->buffer);
-    }
-
-    if (printed != NULL)
-    {
-        hooks->deallocate(printed);
-    }
-
-    return NULL;
-}
-
-/* Render a cJSON item/entity/structure to text. */
-CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
-{
-    return (char*)print(item, true, &global_hooks);
-}
-
-CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
-{
-    return (char*)print(item, false, &global_hooks);
-}
-
-CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
-{
-    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-
-    if (prebuffer < 0)
-    {
-        return NULL;
-    }
-
-    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
-    if (!p.buffer)
-    {
-        return NULL;
-    }
-
-    p.length = (size_t)prebuffer;
-    p.offset = 0;
-    p.noalloc = false;
-    p.format = fmt;
-    p.hooks = global_hooks;
-
-    if (!print_value(item, &p))
-    {
-        global_hooks.deallocate(p.buffer);
-        return NULL;
-    }
-
-    return (char*)p.buffer;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const int len, const cJSON_bool fmt)
-{
-    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
-
-    if ((len < 0) || (buf == NULL))
-    {
-        return false;
-    }
-
-    p.buffer = (unsigned char*)buf;
-    p.length = (size_t)len;
-    p.offset = 0;
-    p.noalloc = true;
-    p.format = fmt;
-    p.hooks = global_hooks;
-
-    return print_value(item, &p);
-}
-
-/* Parser core - when encountering text, process appropriately. */
-static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
-{
-    if ((input_buffer == NULL) || (input_buffer->content == NULL))
-    {
-        return false; /* no input */
-    }
-
-    /* parse the different types of values */
-    /* null */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
-    {
-        item->type = cJSON_NULL;
-        input_buffer->offset += 4;
-        return true;
-    }
-    /* false */
-    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
-    {
-        item->type = cJSON_False;
-        input_buffer->offset += 5;
-        return true;
-    }
-    /* true */
-    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
-    {
-        item->type = cJSON_True;
-        item->valueint = 1;
-        input_buffer->offset += 4;
-        return true;
-    }
-    /* string */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
-    {
-        return parse_string(item, input_buffer);
-    }
-    /* number */
-    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
-    {
-        return parse_number(item, input_buffer);
-    }
-    /* array */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
-    {
-        return parse_array(item, input_buffer);
-    }
-    /* object */
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
-    {
-        return parse_object(item, input_buffer);
-    }
-
-
-    return false;
-}
-
-/* Render a value to text. */
-static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output = NULL;
-
-    if ((item == NULL) || (output_buffer == NULL))
-    {
-        return false;
-    }
-
-    switch ((item->type) & 0xFF)
-    {
-        case cJSON_NULL:
-            output = ensure(output_buffer, 5);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "null");
-            return true;
-
-        case cJSON_False:
-            output = ensure(output_buffer, 6);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "false");
-            return true;
-
-        case cJSON_True:
-            output = ensure(output_buffer, 5);
-            if (output == NULL)
-            {
-                return false;
-            }
-            strcpy((char*)output, "true");
-            return true;
-
-        case cJSON_Number:
-            return print_number(item, output_buffer);
-
-        case cJSON_Raw:
-        {
-            size_t raw_length = 0;
-            if (item->valuestring == NULL)
-            {
-                if (!output_buffer->noalloc)
-                {
-                    output_buffer->hooks.deallocate(output_buffer->buffer);
-                }
-                return false;
-            }
-
-            raw_length = strlen(item->valuestring) + sizeof("");
-            output = ensure(output_buffer, raw_length);
-            if (output == NULL)
-            {
-                return false;
-            }
-            memcpy(output, item->valuestring, raw_length);
-            return true;
-        }
-
-        case cJSON_String:
-            return print_string(item, output_buffer);
-
-        case cJSON_Array:
-            return print_array(item, output_buffer);
-
-        case cJSON_Object:
-            return print_object(item, output_buffer);
-
-        default:
-            return false;
-    }
-}
-
-/* Build an array from input text. */
-static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
-{
-    cJSON *head = NULL; /* head of the linked list */
-    cJSON *current_item = NULL;
-
-    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
-    {
-        return false; /* to deeply nested */
-    }
-    input_buffer->depth++;
-
-    if (buffer_at_offset(input_buffer)[0] != '[')
-    {
-        /* not an array */
-        goto fail;
-    }
-
-    input_buffer->offset++;
-    buffer_skip_whitespace(input_buffer);
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
-    {
-        /* empty array */
-        goto success;
-    }
-
-    /* check if we skipped to the end of the buffer */
-    if (cannot_access_at_index(input_buffer, 0))
-    {
-        input_buffer->offset--;
-        goto fail;
-    }
-
-    /* step back to character in front of the first element */
-    input_buffer->offset--;
-    /* loop through the comma separated array elements */
-    do
-    {
-        /* allocate next item */
-        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
-        if (new_item == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-
-        /* attach next item to list */
-        if (head == NULL)
-        {
-            /* start the linked list */
-            current_item = head = new_item;
-        }
-        else
-        {
-            /* add to the end and advance */
-            current_item->next = new_item;
-            new_item->prev = current_item;
-            current_item = new_item;
-        }
-
-        /* parse next value */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_value(current_item, input_buffer))
-        {
-            goto fail; /* failed to parse value */
-        }
-        buffer_skip_whitespace(input_buffer);
-    }
-    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
-
-    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
-    {
-        goto fail; /* expected end of array */
-    }
-
-success:
-    input_buffer->depth--;
-
-    item->type = cJSON_Array;
-    item->child = head;
-
-    input_buffer->offset++;
-
-    return true;
-
-fail:
-    if (head != NULL)
-    {
-        cJSON_Delete(head);
-    }
-
-    return false;
-}
-
-/* Render an array to text */
-static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    size_t length = 0;
-    cJSON *current_element = item->child;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* Compose the output array. */
-    /* opening square bracket */
-    output_pointer = ensure(output_buffer, 1);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    *output_pointer = '[';
-    output_buffer->offset++;
-    output_buffer->depth++;
-
-    while (current_element != NULL)
-    {
-        if (!print_value(current_element, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-        if (current_element->next)
-        {
-            length = (size_t) (output_buffer->format ? 2 : 1);
-            output_pointer = ensure(output_buffer, length + 1);
-            if (output_pointer == NULL)
-            {
-                return false;
-            }
-            *output_pointer++ = ',';
-            if(output_buffer->format)
-            {
-                *output_pointer++ = ' ';
-            }
-            *output_pointer = '\0';
-            output_buffer->offset += length;
-        }
-        current_element = current_element->next;
-    }
-
-    output_pointer = ensure(output_buffer, 2);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-    *output_pointer++ = ']';
-    *output_pointer = '\0';
-    output_buffer->depth--;
-
-    return true;
-}
-
-/* Build an object from the text. */
-static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
-{
-    cJSON *head = NULL; /* linked list head */
-    cJSON *current_item = NULL;
-
-    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
-    {
-        return false; /* to deeply nested */
-    }
-    input_buffer->depth++;
-
-    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
-    {
-        goto fail; /* not an object */
-    }
-
-    input_buffer->offset++;
-    buffer_skip_whitespace(input_buffer);
-    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
-    {
-        goto success; /* empty object */
-    }
-
-    /* check if we skipped to the end of the buffer */
-    if (cannot_access_at_index(input_buffer, 0))
-    {
-        input_buffer->offset--;
-        goto fail;
-    }
-
-    /* step back to character in front of the first element */
-    input_buffer->offset--;
-    /* loop through the comma separated array elements */
-    do
-    {
-        /* allocate next item */
-        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
-        if (new_item == NULL)
-        {
-            goto fail; /* allocation failure */
-        }
-
-        /* attach next item to list */
-        if (head == NULL)
-        {
-            /* start the linked list */
-            current_item = head = new_item;
-        }
-        else
-        {
-            /* add to the end and advance */
-            current_item->next = new_item;
-            new_item->prev = current_item;
-            current_item = new_item;
-        }
-
-        /* parse the name of the child */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_string(current_item, input_buffer))
-        {
-            goto fail; /* faile to parse name */
-        }
-        buffer_skip_whitespace(input_buffer);
-
-        /* swap valuestring and string, because we parsed the name */
-        current_item->string = current_item->valuestring;
-        current_item->valuestring = NULL;
-
-        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
-        {
-            goto fail; /* invalid object */
-        }
-
-        /* parse the value */
-        input_buffer->offset++;
-        buffer_skip_whitespace(input_buffer);
-        if (!parse_value(current_item, input_buffer))
-        {
-            goto fail; /* failed to parse value */
-        }
-        buffer_skip_whitespace(input_buffer);
-    }
-    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
-
-    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
-    {
-        goto fail; /* expected end of object */
-    }
-
-success:
-    input_buffer->depth--;
-
-    item->type = cJSON_Object;
-    item->child = head;
-
-    input_buffer->offset++;
-    return true;
-
-fail:
-    if (head != NULL)
-    {
-        cJSON_Delete(head);
-    }
-
-    return false;
-}
-
-/* Render an object to text. */
-static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
-{
-    unsigned char *output_pointer = NULL;
-    size_t length = 0;
-    cJSON *current_item = item->child;
-
-    if (output_buffer == NULL)
-    {
-        return false;
-    }
-
-    /* Compose the output: */
-    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
-    output_pointer = ensure(output_buffer, length + 1);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-
-    *output_pointer++ = '{';
-    output_buffer->depth++;
-    if (output_buffer->format)
-    {
-        *output_pointer++ = '\n';
-    }
-    output_buffer->offset += length;
-
-    while (current_item)
-    {
-        if (output_buffer->format)
-        {
-            size_t i;
-            output_pointer = ensure(output_buffer, output_buffer->depth);
-            if (output_pointer == NULL)
-            {
-                return false;
-            }
-            for (i = 0; i < output_buffer->depth; i++)
-            {
-                *output_pointer++ = '\t';
-            }
-            output_buffer->offset += output_buffer->depth;
-        }
-
-        /* print key */
-        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-
-        length = (size_t) (output_buffer->format ? 2 : 1);
-        output_pointer = ensure(output_buffer, length);
-        if (output_pointer == NULL)
-        {
-            return false;
-        }
-        *output_pointer++ = ':';
-        if (output_buffer->format)
-        {
-            *output_pointer++ = '\t';
-        }
-        output_buffer->offset += length;
-
-        /* print value */
-        if (!print_value(current_item, output_buffer))
-        {
-            return false;
-        }
-        update_offset(output_buffer);
-
-        /* print comma if not last */
-        length = (size_t) ((output_buffer->format ? 1 : 0) + (current_item->next ? 1 : 0));
-        output_pointer = ensure(output_buffer, length + 1);
-        if (output_pointer == NULL)
-        {
-            return false;
-        }
-        if (current_item->next)
-        {
-            *output_pointer++ = ',';
-        }
-
-        if (output_buffer->format)
-        {
-            *output_pointer++ = '\n';
-        }
-        *output_pointer = '\0';
-        output_buffer->offset += length;
-
-        current_item = current_item->next;
-    }
-
-    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
-    if (output_pointer == NULL)
-    {
-        return false;
-    }
-    if (output_buffer->format)
-    {
-        size_t i;
-        for (i = 0; i < (output_buffer->depth - 1); i++)
-        {
-            *output_pointer++ = '\t';
-        }
-    }
-    *output_pointer++ = '}';
-    *output_pointer = '\0';
-    output_buffer->depth--;
-
-    return true;
-}
-
-/* Get Array size/item / object item. */
-CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
-{
-    cJSON *child = NULL;
-    size_t size = 0;
-
-    if (array == NULL)
-    {
-        return 0;
-    }
-
-    child = array->child;
-
-    while(child != NULL)
-    {
-        size++;
-        child = child->next;
-    }
-
-    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
-
-    return (int)size;
-}
-
-static cJSON* get_array_item(const cJSON *array, size_t index)
-{
-    cJSON *current_child = NULL;
-
-    if (array == NULL)
-    {
-        return NULL;
-    }
-
-    current_child = array->child;
-    while ((current_child != NULL) && (index > 0))
-    {
-        index--;
-        current_child = current_child->next;
-    }
-
-    return current_child;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
-{
-    if (index < 0)
-    {
-        return NULL;
-    }
-
-    return get_array_item(array, (size_t)index);
-}
-
-static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
-{
-    cJSON *current_element = NULL;
-
-    if ((object == NULL) || (name == NULL))
-    {
-        return NULL;
-    }
-
-    current_element = object->child;
-    if (case_sensitive)
-    {
-        while ((current_element != NULL) && (strcmp(name, current_element->string) != 0))
-        {
-            current_element = current_element->next;
-        }
-    }
-    else
-    {
-        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
-        {
-            current_element = current_element->next;
-        }
-    }
-
-    return current_element;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
-{
-    return get_object_item(object, string, false);
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
-{
-    return get_object_item(object, string, true);
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
-{
-    return cJSON_GetObjectItem(object, string) ? 1 : 0;
-}
-
-/* Utility for array list handling. */
-static void suffix_object(cJSON *prev, cJSON *item)
-{
-    prev->next = item;
-    item->prev = prev;
-}
-
-/* Utility for handling references. */
-static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
-{
-    cJSON *reference = NULL;
-    if (item == NULL)
-    {
-        return NULL;
-    }
-
-    reference = cJSON_New_Item(hooks);
-    if (reference == NULL)
-    {
-        return NULL;
-    }
-
-    memcpy(reference, item, sizeof(cJSON));
-    reference->string = NULL;
-    reference->type |= cJSON_IsReference;
-    reference->next = reference->prev = NULL;
-    return reference;
-}
-
-/* Add item to array/object. */
-CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item)
-{
-    cJSON *child = NULL;
-
-    if ((item == NULL) || (array == NULL))
-    {
-        return;
-    }
-
-    child = array->child;
-
-    if (child == NULL)
-    {
-        /* list is empty, start new one */
-        array->child = item;
-    }
-    else
-    {
-        /* append to the end */
-        while (child->next)
-        {
-            child = child->next;
-        }
-        suffix_object(child, item);
-    }
-}
-
-CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
-{
-    if (item == NULL)
-    {
-        return;
-    }
-
-    /* call cJSON_AddItemToObjectCS for code reuse */
-    cJSON_AddItemToObjectCS(object, (char*)cJSON_strdup((const unsigned char*)string, &global_hooks), item);
-    /* remove cJSON_StringIsConst flag */
-    item->type &= ~cJSON_StringIsConst;
-}
-
-#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
-    #pragma GCC diagnostic push
-#endif
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
-/* Add an item to an object with constant string as key */
-CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
-{
-    if ((item == NULL) || (string == NULL))
-    {
-        return;
-    }
-    if (!(item->type & cJSON_StringIsConst) && item->string)
-    {
-        global_hooks.deallocate(item->string);
-    }
-    item->string = (char*)string;
-    item->type |= cJSON_StringIsConst;
-    cJSON_AddItemToArray(object, item);
-}
-#if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
-    #pragma GCC diagnostic pop
-#endif
-
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
-{
-    if (array == NULL)
-    {
-        return;
-    }
-
-    cJSON_AddItemToArray(array, create_reference(item, &global_hooks));
-}
-
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
-{
-    if ((object == NULL) || (string == NULL))
-    {
-        return;
-    }
-
-    cJSON_AddItemToObject(object, string, create_reference(item, &global_hooks));
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
-{
-    if ((parent == NULL) || (item == NULL))
-    {
-        return NULL;
-    }
-
-    if (item->prev != NULL)
-    {
-        /* not the first element */
-        item->prev->next = item->next;
-    }
-    if (item->next != NULL)
-    {
-        /* not the last element */
-        item->next->prev = item->prev;
-    }
-
-    if (item == parent->child)
-    {
-        /* first element */
-        parent->child = item->next;
-    }
-    /* make sure the detached item doesn't point anywhere anymore */
-    item->prev = NULL;
-    item->next = NULL;
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
-{
-    if (which < 0)
-    {
-        return NULL;
-    }
-
-    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
-{
-    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
-{
-    cJSON *to_detach = cJSON_GetObjectItem(object, string);
-
-    return cJSON_DetachItemViaPointer(object, to_detach);
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
-{
-    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
-
-    return cJSON_DetachItemViaPointer(object, to_detach);
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
-{
-    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
-}
-
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
-{
-    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
-}
-
-/* Replace array/object items with new ones. */
-CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
-{
-    cJSON *after_inserted = NULL;
-
-    if (which < 0)
-    {
-        return;
-    }
-
-    after_inserted = get_array_item(array, (size_t)which);
-    if (after_inserted == NULL)
-    {
-        cJSON_AddItemToArray(array, newitem);
-        return;
-    }
-
-    newitem->next = after_inserted;
-    newitem->prev = after_inserted->prev;
-    after_inserted->prev = newitem;
-    if (after_inserted == array->child)
-    {
-        array->child = newitem;
-    }
-    else
-    {
-        newitem->prev->next = newitem;
-    }
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
-{
-    if ((parent == NULL) || (replacement == NULL) || (item == NULL))
-    {
-        return false;
-    }
-
-    if (replacement == item)
-    {
-        return true;
-    }
-
-    replacement->next = item->next;
-    replacement->prev = item->prev;
-
-    if (replacement->next != NULL)
-    {
-        replacement->next->prev = replacement;
-    }
-    if (replacement->prev != NULL)
-    {
-        replacement->prev->next = replacement;
-    }
-    if (parent->child == item)
-    {
-        parent->child = replacement;
-    }
-
-    item->next = NULL;
-    item->prev = NULL;
-    cJSON_Delete(item);
-
-    return true;
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
-{
-    if (which < 0)
-    {
-        return;
-    }
-
-    cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
-}
-
-static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
-{
-    if ((replacement == NULL) || (string == NULL))
-    {
-        return false;
-    }
-
-    /* replace the name in the replacement */
-    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
-    {
-        cJSON_free(replacement->string);
-    }
-    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
-    replacement->type &= ~cJSON_StringIsConst;
-
-    cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
-
-    return true;
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
-{
-    replace_item_in_object(object, string, newitem, false);
-}
-
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
-{
-    replace_item_in_object(object, string, newitem, true);
-}
-
-/* Create basic types: */
-CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_NULL;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_True;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_False;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool b)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = b ? cJSON_True : cJSON_False;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_Number;
-        item->valuedouble = num;
-
-        /* use saturation in case of overflow */
-        if (num >= LLONG_MAX)
-        {
-            item->valueint = LLONG_MAX;
-        }
-        else if (num <= LLONG_MIN)
-        {
-            item->valueint = LLONG_MIN;
-        }
-        else
-        {
-            item->valueint = (int64_t)num;
-        }
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_String;
-        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
-        if(!item->valuestring)
-        {
-            cJSON_Delete(item);
-            return NULL;
-        }
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type = cJSON_Raw;
-        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
-        if(!item->valuestring)
-        {
-            cJSON_Delete(item);
-            return NULL;
-        }
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if(item)
-    {
-        item->type=cJSON_Array;
-    }
-
-    return item;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
-{
-    cJSON *item = cJSON_New_Item(&global_hooks);
-    if (item)
-    {
-        item->type = cJSON_Object;
-    }
-
-    return item;
-}
-
-/* Create Arrays: */
-CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-    for(i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber(numbers[i]);
-        if (!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for(i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber((double)numbers[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (numbers == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for(i = 0;a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateNumber(numbers[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p, n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count)
-{
-    size_t i = 0;
-    cJSON *n = NULL;
-    cJSON *p = NULL;
-    cJSON *a = NULL;
-
-    if ((count < 0) || (strings == NULL))
-    {
-        return NULL;
-    }
-
-    a = cJSON_CreateArray();
-
-    for (i = 0; a && (i < (size_t)count); i++)
-    {
-        n = cJSON_CreateString(strings[i]);
-        if(!n)
-        {
-            cJSON_Delete(a);
-            return NULL;
-        }
-        if(!i)
-        {
-            a->child = n;
-        }
-        else
-        {
-            suffix_object(p,n);
-        }
-        p = n;
-    }
-
-    return a;
-}
-
-/* Duplication */
-CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
-{
-    cJSON *newitem = NULL;
-    cJSON *child = NULL;
-    cJSON *next = NULL;
-    cJSON *newchild = NULL;
-
-    /* Bail on bad ptr */
-    if (!item)
-    {
-        goto fail;
-    }
-    /* Create new item */
-    newitem = cJSON_New_Item(&global_hooks);
-    if (!newitem)
-    {
-        goto fail;
-    }
-    /* Copy over all vars */
-    newitem->type = item->type & (~cJSON_IsReference);
-    newitem->valueint = item->valueint;
-    newitem->valuedouble = item->valuedouble;
-    if (item->valuestring)
-    {
-        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
-        if (!newitem->valuestring)
-        {
-            goto fail;
-        }
-    }
-    if (item->string)
-    {
-        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
-        if (!newitem->string)
-        {
-            goto fail;
-        }
-    }
-    /* If non-recursive, then we're done! */
-    if (!recurse)
-    {
-        return newitem;
-    }
-    /* Walk the ->next chain for the child. */
-    child = item->child;
-    while (child != NULL)
-    {
-        newchild = cJSON_Duplicate(child, true); /* Duplicate (with recurse) each item in the ->next chain */
-        if (!newchild)
-        {
-            goto fail;
-        }
-        if (next != NULL)
-        {
-            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
-            next->next = newchild;
-            newchild->prev = next;
-            next = newchild;
-        }
-        else
-        {
-            /* Set newitem->child and move to it */
-            newitem->child = newchild;
-            next = newchild;
-        }
-        child = child->next;
-    }
-
-    return newitem;
-
-fail:
-    if (newitem != NULL)
-    {
-        cJSON_Delete(newitem);
-    }
-
-    return NULL;
-}
-
-CJSON_PUBLIC(void) cJSON_Minify(char *json)
-{
-    unsigned char *into = (unsigned char*)json;
-
-    if (json == NULL)
-    {
-        return;
-    }
-
-    while (*json)
-    {
-        if (*json == ' ')
-        {
-            json++;
-        }
-        else if (*json == '\t')
-        {
-            /* Whitespace characters. */
-            json++;
-        }
-        else if (*json == '\r')
-        {
-            json++;
-        }
-        else if (*json=='\n')
-        {
-            json++;
-        }
-        else if ((*json == '/') && (json[1] == '/'))
-        {
-            /* double-slash comments, to end of line. */
-            while (*json && (*json != '\n'))
-            {
-                json++;
-            }
-        }
-        else if ((*json == '/') && (json[1] == '*'))
-        {
-            /* multiline comments. */
-            while (*json && !((*json == '*') && (json[1] == '/')))
-            {
-                json++;
-            }
-            json += 2;
-        }
-        else if (*json == '\"')
-        {
-            /* string literals, which are \" sensitive. */
-            *into++ = (unsigned char)*json++;
-            while (*json && (*json != '\"'))
-            {
-                if (*json == '\\')
-                {
-                    *into++ = (unsigned char)*json++;
-                }
-                *into++ = (unsigned char)*json++;
-            }
-            *into++ = (unsigned char)*json++;
-        }
-        else
-        {
-            /* All other characters. */
-            *into++ = (unsigned char)*json++;
-        }
-    }
-
-    /* and null-terminate. */
-    *into = '\0';
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Invalid;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_False;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xff) == cJSON_True;
-}
-
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & (cJSON_True | cJSON_False)) != 0;
-}
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_NULL;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Number;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_String;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Array;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Object;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
-{
-    if (item == NULL)
-    {
-        return false;
-    }
-
-    return (item->type & 0xFF) == cJSON_Raw;
-}
-
-CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
-{
-    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)) || cJSON_IsInvalid(a))
-    {
-        return false;
-    }
-
-    /* check if type is valid */
-    switch (a->type & 0xFF)
-    {
-        case cJSON_False:
-        case cJSON_True:
-        case cJSON_NULL:
-        case cJSON_Number:
-        case cJSON_String:
-        case cJSON_Raw:
-        case cJSON_Array:
-        case cJSON_Object:
-            break;
-
-        default:
-            return false;
-    }
-
-    /* identical objects are equal */
-    if (a == b)
-    {
-        return true;
-    }
-
-    switch (a->type & 0xFF)
-    {
-        /* in these cases and equal type is enough */
-        case cJSON_False:
-        case cJSON_True:
-        case cJSON_NULL:
-            return true;
-
-        case cJSON_Number:
-            if (a->valuedouble == b->valuedouble)
-            {
-                return true;
-            }
-            return false;
-
-        case cJSON_String:
-        case cJSON_Raw:
-            if ((a->valuestring == NULL) || (b->valuestring == NULL))
-            {
-                return false;
-            }
-            if (strcmp(a->valuestring, b->valuestring) == 0)
-            {
-                return true;
-            }
-
-            return false;
-
-        case cJSON_Array:
-        {
-            cJSON *a_element = a->child;
-            cJSON *b_element = b->child;
-
-            for (; (a_element != NULL) && (b_element != NULL);)
-            {
-                if (!cJSON_Compare(a_element, b_element, case_sensitive))
-                {
-                    return false;
-                }
-
-                a_element = a_element->next;
-                b_element = b_element->next;
-            }
-
-            /* one of the arrays is longer than the other */
-            if (a_element != b_element) {
-                return false;
-            }
-
-            return true;
-        }
-
-        case cJSON_Object:
-        {
-            cJSON *a_element = NULL;
-            cJSON *b_element = NULL;
-            cJSON_ArrayForEach(a_element, a)
-            {
-                /* TODO This has O(n^2) runtime, which is horrible! */
-                b_element = get_object_item(b, a_element->string, case_sensitive);
-                if (b_element == NULL)
-                {
-                    return false;
-                }
-
-                if (!cJSON_Compare(a_element, b_element, case_sensitive))
-                {
-                    return false;
-                }
-            }
-
-            /* doing this twice, once on a and b to prevent true comparison if a subset of b
-             * TODO: Do this the proper way, this is just a fix for now */
-            cJSON_ArrayForEach(b_element, b)
-            {
-                a_element = get_object_item(a, b_element->string, case_sensitive);
-                if (a_element == NULL)
-                {
-                    return false;
-                }
-
-                if (!cJSON_Compare(b_element, a_element, case_sensitive))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        default:
-            return false;
-    }
-}
-
-CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
-{
-    return global_hooks.allocate(size);
-}
-
-CJSON_PUBLIC(void) cJSON_free(void *object)
-{
-    global_hooks.deallocate(object);
-}
diff --git a/src/modules/http/src/gcHandle.c b/src/modules/http/src/gcHandle.c
deleted file mode 100644
index eb0c6223a7f8c6d0ae1e980646695a074959730b..0000000000000000000000000000000000000000
--- a/src/modules/http/src/gcHandle.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * 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 "gcHandle.h"
-#include "cJSON.h"
-#include "gcJson.h"
-#include "tsdb.h"
-
-static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
-static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};
-static HttpEncodeMethod gcQueryMethod = {
-    NULL, gcStopQueryJson, gcBuildQueryJson, NULL, gcInitQueryJson, gcCleanQueryJson, NULL, NULL};
-
-void gcInitHandle(HttpServer* pServer) { httpAddMethod(pServer, &gcDecodeMethod); }
-
-bool gcGetUserFromUrl(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (pParser->path[GC_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[GC_USER_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->user, pParser->path[GC_USER_URL_POS].pos);
-  return true;
-}
-
-bool gcGetPassFromUrl(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (pParser->path[GC_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[GC_PASS_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->pass, pParser->path[GC_PASS_URL_POS].pos);
-  return true;
-}
-
-bool gcProcessLoginRequest(HttpContext* pContext) {
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, process grafana login msg", pContext, pContext->fd, pContext->ipstr,
-            pContext->user);
-  pContext->reqType = HTTP_REQTYPE_LOGIN;
-  return true;
-}
-
-/**
- * Process the query request
- * @param fd for http send back
- * @param context is taos conn
- * @param filter, the request format is json, such as
- */
-
-// https://github.com/grafana/grafana/blob/master/docs/sources/plugins/developing/datasources.md
-// input
-//[{
-//  "refId": "A",
-//  "alias" : "taosd",
-//  "sql" : "select first(taosd) from sys.mem where ts > now-6h and ts < now interval(20000a)"
-//},
-//{
-//  "refId": "B",
-//  "alias" : "system",
-//  "sql" : "select first(taosd) from sys.mem where ts > now-6h and ts < now interval(20000a)"
-//}]
-// output
-//[{
-//  "datapoints": [[339.386719,
-//    1537873132000],
-//    [339.656250,
-//    1537873162400],
-//    [339.656250,
-//    1537873192600],
-//    [339.656250,
-//    1537873222800],
-//    [339.589844,
-//    1537873253200],
-//    [339.964844,
-//    1537873283400],
-//    [340.093750,
-//    1537873313800],
-//    [340.093750,
-//    1537873344000],
-//    [340.093750,
-//    1537873374200],
-//    [340.093750,
-//    1537873404600]],
-//    "refId": "A",
-//    "target" : "taosd"
-//},
-//{
-//  "datapoints": [[339.386719,
-//  1537873132000],
-//  [339.656250,
-//  1537873162400],
-//  [339.656250,
-//  1537873192600],
-//  [339.656250,
-//  1537873222800],
-//  [339.589844,
-//  1537873253200],
-//  [339.964844,
-//  1537873283400],
-//  [340.093750,
-//  1537873313800],
-//  [340.093750,
-//  1537873344000],
-//  [340.093750,
-//  1537873374200],
-//  [340.093750,
-//  1537873404600]],
-//  "refId": "B",
-//  "target" : "system"
-//}]
-
-bool gcProcessQueryRequest(HttpContext* pContext) {
-  httpTrace("context:%p, fd:%d, ip:%s, process grafana query msg", pContext, pContext->fd, pContext->ipstr);
-
-  HttpParser* pParser = &pContext->parser;
-  char*       filter = pParser->data.pos;
-  if (filter == NULL) {
-    httpSendErrorResp(pContext, HTTP_NO_MSG_INPUT);
-    return false;
-  }
-
-  cJSON* root = cJSON_Parse(filter);
-  if (root == NULL) {
-    httpSendErrorResp(pContext, HTTP_PARSE_GC_REQ_ERROR);
-    return false;
-  }
-
-  int size = cJSON_GetArraySize(root);
-  if (size <= 0) {
-    httpSendErrorResp(pContext, HTTP_GC_QUERY_NULL);
-    cJSON_Delete(root);
-    return false;
-  }
-
-  if (size > 100) {
-    httpSendErrorResp(pContext, HTTP_GC_QUERY_SIZE);
-    cJSON_Delete(root);
-    return false;
-  }
-
-  if (!httpMallocMultiCmds(pContext, size, HTTP_BUFFER_SIZE)) {
-    httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-    cJSON_Delete(root);
-    return false;
-  }
-
-  for (int i = 0; i < size; ++i) {
-    cJSON* query = cJSON_GetArrayItem(root, i);
-    if (query == NULL) continue;
-
-    cJSON* refId = cJSON_GetObjectItem(query, "refId");
-    if (refId == NULL || refId->valuestring == NULL || strlen(refId->valuestring) == 0) {
-      httpTrace("context:%p, fd:%d, ip:%s, user:%s, refId is null", pContext, pContext->fd, pContext->ipstr,
-                pContext->user);
-      continue;
-    }
-
-    int refIdBuffer = httpAddToSqlCmdBuffer(pContext, refId->valuestring);
-    if (refIdBuffer == -1) {
-      httpWarn("context:%p, fd:%d, ip:%s, user:%s, refId buffer is full", pContext, pContext->fd, pContext->ipstr,
-               pContext->user);
-      break;
-    }
-
-    cJSON* alias = cJSON_GetObjectItem(query, "alias");
-    int    aliasBuffer = -1;
-    if (!(alias == NULL || alias->valuestring == NULL || strlen(alias->valuestring) == 0)) {
-      aliasBuffer = httpAddToSqlCmdBuffer(pContext, alias->valuestring);
-      if (aliasBuffer == -1) {
-        httpWarn("context:%p, fd:%d, ip:%s, user:%s, alias buffer is full", pContext, pContext->fd, pContext->ipstr,
-                 pContext->user);
-        break;
-      }
-    }
-    if (aliasBuffer == -1) {
-      aliasBuffer = httpAddToSqlCmdBuffer(pContext, "");
-    }
-
-    cJSON* sql = cJSON_GetObjectItem(query, "sql");
-    if (sql == NULL || sql->valuestring == NULL || strlen(sql->valuestring) == 0) {
-      httpTrace("context:%p, fd:%d, ip:%s, user:%s, sql is null", pContext, pContext->fd, pContext->ipstr,
-                pContext->user);
-      continue;
-    }
-
-    int sqlBuffer = httpAddToSqlCmdBuffer(pContext, sql->valuestring);
-    if (sqlBuffer == -1) {
-      httpWarn("context:%p, fd:%d, ip:%s, user:%s, sql buffer is full", pContext, pContext->fd, pContext->ipstr,
-               pContext->user);
-      break;
-    }
-
-    HttpSqlCmd* cmd = httpNewSqlCmd(pContext);
-    if (cmd == NULL) {
-      httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-      cJSON_Delete(root);
-      return false;
-    }
-
-    cmd->sql = sqlBuffer;
-    cmd->values = refIdBuffer;
-    cmd->table = aliasBuffer;
-    cmd->numOfRows = 0;                                                                 // hack way as target flags
-    cmd->timestamp = httpAddToSqlCmdBufferWithSize(pContext, HTTP_GC_TARGET_SIZE + 1);  // hack way
-
-    if (cmd->timestamp == -1) {
-      httpWarn("context:%p, fd:%d, ip:%s, user:%s, cant't malloc target size, sql buffer is full",
-               pContext, pContext->fd, pContext->ipstr, pContext->user);
-      break;
-    }
-  }
-
-  pContext->reqType = HTTP_REQTYPE_MULTI_SQL;
-  pContext->encodeMethod = &gcQueryMethod;
-  pContext->multiCmds->pos = 0;
-
-  return true;
-}
-
-bool gcProcessHeartbeatRequest(HttpContext* pContext) {
-  httpTrace("context:%p, fd:%d, ip:%s, process grafana heartbeat msg", pContext, pContext->fd, pContext->ipstr);
-  pContext->reqType = HTTP_REQTYPE_HEARTBEAT;
-  pContext->encodeMethod = &gcHeartBeatMethod;
-  return true;
-}
-
-/**
- * Process get/post/options msg, such as login and logout
- */
-bool gcProcessRequest(struct HttpContext* pContext) {
-  if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "login")) {
-    gcGetUserFromUrl(pContext);
-    gcGetPassFromUrl(pContext);
-  }
-
-  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
-    httpSendErrorResp(pContext, HTTP_PARSE_USR_ERROR);
-    return false;
-  }
-
-  if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "query")) {
-    return gcProcessQueryRequest(pContext);
-  } else if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "heartbeat")) {
-    return gcProcessHeartbeatRequest(pContext);
-  } else if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "login")) {
-    return gcProcessLoginRequest(pContext);
-  } else {
-    return gcProcessHeartbeatRequest(pContext);
-  }
-}
diff --git a/src/modules/http/src/gcJson.c b/src/modules/http/src/gcJson.c
deleted file mode 100644
index 1a86c5d24f23ec62bb1c51aabdd0639940edc54a..0000000000000000000000000000000000000000
--- a/src/modules/http/src/gcJson.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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 <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "gcHandle.h"
-#include "gcJson.h"
-#include "httpJson.h"
-#include "httpResp.h"
-
-unsigned char *base64_decode(const char *value, int inlen, int *outlen);
-
-void gcInitQueryJson(HttpContext *pContext) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  httpInitJsonBuf(jsonBuf, pContext);
-  httpWriteJsonBufHead(jsonBuf);
-
-  // data array begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonArrStt);
-}
-
-void gcCleanQueryJson(HttpContext *pContext) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-
-  httpWriteJsonBufEnd(jsonBuf);
-}
-
-void gcWriteTargetStartJson(JsonBuf *jsonBuf, char *refId, char *target) {
-  if (strlen(target) == 0) {
-    target = refId;
-  }
-
-  // object begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonObjStt);
-
-  // target section
-  httpJsonPair(jsonBuf, "refId", 5, refId, (int)strlen(refId));
-  httpJsonPair(jsonBuf, "target", 6, target, (int)strlen(target));
-
-  // data begin
-  httpJsonPairHead(jsonBuf, "datapoints", 10);
-
-  // data array begin
-  httpJsonToken(jsonBuf, JsonArrStt);
-}
-
-void gcWriteTargetEndJson(JsonBuf *jsonBuf) {
-  // data array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-
-  // object end
-  httpJsonToken(jsonBuf, JsonObjEnd);
-}
-
-void gcStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // write end of target
-  if (cmd->numOfRows != 0) {
-    gcWriteTargetEndJson(jsonBuf);
-  }
-}
-
-bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return false;
-
-  int         num_fields = taos_num_fields(result);
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  if (num_fields == 0) {
-    return false;
-  }
-
-  int precision = taos_result_precision(result);
-
-  // such as select count(*) from sys.cpu
-  // such as select count(*) from sys.cpu group by ipaddr
-  // such as select count(*) from sys.cpu interval(1d)
-  // such as select count(*) from sys.cpu interval(1d) group by ipaddr
-  // such as select count(*) count(*) from sys.cpu group by ipaddr interval(1d)
-  int  dataFields = -1;
-  int  groupFields = -1;
-  bool hasTimestamp = fields[0].type == TSDB_DATA_TYPE_TIMESTAMP;
-  if (hasTimestamp) {
-    dataFields = 1;
-    if (num_fields > 2) groupFields = num_fields - 1;
-  } else {
-    dataFields = 0;
-    if (num_fields > 1) groupFields = num_fields - 1;
-  }
-
-  char *refIdBuffer = httpGetCmdsString(pContext, cmd->values);
-  char *aliasBuffer = httpGetCmdsString(pContext, cmd->table);
-  char *targetBuffer = httpGetCmdsString(pContext, cmd->timestamp);
-
-  if (groupFields == -1 && cmd->numOfRows == 0) {
-    gcWriteTargetStartJson(jsonBuf, refIdBuffer, aliasBuffer);
-  }
-  cmd->numOfRows += numOfRows;
-
-  for (int k = 0; k < numOfRows; ++k) {
-    TAOS_ROW row = taos_fetch_row(result);
-
-    // for group by
-    if (groupFields != -1) {
-      char target[HTTP_GC_TARGET_SIZE];
-
-      switch (fields[groupFields].type) {
-        case TSDB_DATA_TYPE_BOOL:
-        case TSDB_DATA_TYPE_TINYINT:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%d", aliasBuffer, *((int8_t *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%d", aliasBuffer, *((int16_t *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_INT:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%d", aliasBuffer, *((int32_t *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_BIGINT:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%ld", aliasBuffer, *((int64_t *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%.5f", aliasBuffer, *((float *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_DOUBLE:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%.9f", aliasBuffer, *((double *)row[groupFields]));
-          break;
-        case TSDB_DATA_TYPE_BINARY:
-        case TSDB_DATA_TYPE_NCHAR:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%s", aliasBuffer, (char *)row[groupFields]);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          if (precision == TSDB_TIME_PRECISION_MILLI) {
-            snprintf(target, HTTP_GC_TARGET_SIZE, "%s%ld", aliasBuffer, *((int64_t *) row[groupFields]));
-          } else {
-            snprintf(target, HTTP_GC_TARGET_SIZE, "%s%ld", aliasBuffer, *((int64_t *) row[groupFields]) / 1000);
-          }
-          break;
-        default:
-          snprintf(target, HTTP_GC_TARGET_SIZE, "%s%s", aliasBuffer, "-");
-          break;
-      }
-
-      if (strcmp(target, targetBuffer) != 0) {
-        // first target not write this section
-        if (strlen(targetBuffer) != 0) {
-          gcWriteTargetEndJson(jsonBuf);
-        }
-
-        // start new target
-        gcWriteTargetStartJson(jsonBuf, refIdBuffer, target);
-        strncpy(targetBuffer, target, HTTP_GC_TARGET_SIZE);
-      }
-    }  // end of group by
-
-    // data row array begin
-    httpJsonItemToken(jsonBuf);
-    httpJsonToken(jsonBuf, JsonArrStt);
-
-    for (int i = dataFields; i >= 0; i--) {
-      httpJsonItemToken(jsonBuf);
-      if (row[i] == NULL) {
-        httpJsonOriginString(jsonBuf, "null", 4);
-        continue;
-      }
-
-      switch (fields[i].type) {
-        case TSDB_DATA_TYPE_BOOL:
-        case TSDB_DATA_TYPE_TINYINT:
-          httpJsonInt(jsonBuf, *((int8_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          httpJsonInt(jsonBuf, *((int16_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_INT:
-          httpJsonInt(jsonBuf, *((int32_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_BIGINT:
-          httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          httpJsonFloat(jsonBuf, *((float *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_DOUBLE:
-          httpJsonDouble(jsonBuf, *((double *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_BINARY:
-        case TSDB_DATA_TYPE_NCHAR:
-          httpJsonStringForTransMean(jsonBuf, row[i], fields[i].bytes);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          if (precision == TSDB_TIME_PRECISION_MILLI) { //ms
-            httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
-          } else {
-            httpJsonInt64(jsonBuf, *((int64_t *)row[i]) / 1000);
-          }
-          break;
-        default:
-          httpJsonString(jsonBuf, "-", 1);
-          break;
-      }
-    }
-
-    if (dataFields == 0) {
-      httpJsonItemToken(jsonBuf);
-      httpJsonString(jsonBuf, "-", 1);
-    }
-
-    // data row array end
-    httpJsonToken(jsonBuf, JsonArrEnd);
-  }
-
-  return true;
-}
-
-void gcSendHeartBeatResp(HttpContext *pContext, HttpSqlCmd *cmd) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  char *desc = "Grafana server receive a quest from you!";
-
-  httpInitJsonBuf(jsonBuf, pContext);
-
-  httpJsonToken(jsonBuf, JsonObjStt);
-  httpJsonPair(jsonBuf, "message", (int)strlen("message"), desc, (int)strlen(desc));
-  httpJsonToken(jsonBuf, JsonObjEnd);
-
-  char head[1024];
-
-  int hLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_GRAFANA], httpVersionStr[pContext->httpVersion],
-                     httpKeepAliveStr[pContext->httpKeepAlive], (jsonBuf->lst - jsonBuf->buf));
-  httpWriteBuf(pContext, head, hLen);
-  httpWriteBuf(pContext, jsonBuf->buf, (int)(jsonBuf->lst - jsonBuf->buf));
-}
diff --git a/src/modules/http/src/httpAuth.c b/src/modules/http/src/httpAuth.c
deleted file mode 100644
index 4503accc0acdc74f1035b91bb2b85a344eb143fe..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpAuth.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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 <arpa/inet.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-#include "tutil.h"
-
-#include "http.h"
-#include "httpHandle.h"
-#include "tkey.h"
-#define KEY_DES_4 4971256377704625728L
-
-bool httpParseBasicAuthToken(HttpContext *pContext, char *token, int len) {
-  token[len] = '\0';
-  int   outlen = 0;
-  char *base64 = (char *)base64_decode(token, len, &outlen);
-  if (base64 == NULL || outlen == 0) {
-    httpError("context:%p, fd:%d, ip:%s, basic token:%s parsed error", pContext, pContext->fd, pContext->ipstr, token);
-    return false;
-  }
-
-  char *user = strstr(base64, ":");
-  if (user == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, basic token:%s invalid format", pContext, pContext->fd, pContext->ipstr,
-              token);
-    free(base64);
-    return false;
-  }
-
-  int user_len = (int)(user - base64);
-  if (user_len < 1 || user_len >= TSDB_USER_LEN) {
-    httpError("context:%p, fd:%d, ip:%s, basic token:%s parse user error", pContext, pContext->fd, pContext->ipstr,
-              token);
-    free(base64);
-    return false;
-  }
-  strncpy(pContext->user, base64, (size_t)user_len);
-  pContext->user[user_len] = 0;
-
-  char *password = user + 1;
-  int   pass_len = (int)((base64 + outlen) - password);
-  if (pass_len < 1 || pass_len >= TSDB_PASSWORD_LEN) {
-    httpError("context:%p, fd:%d, ip:%s, basic token:%s parse password error", pContext, pContext->fd, pContext->ipstr,
-              token);
-    free(base64);
-    return false;
-  }
-  strncpy(pContext->pass, password, (size_t)pass_len);
-  pContext->pass[pass_len] = 0;
-
-  free(base64);
-  httpTrace("context:%p, fd:%d, ip:%s, basic token parsed success, user:%s", pContext, pContext->fd, pContext->ipstr,
-            pContext->user);
-  return true;
-}
-
-bool httpParseTaosdAuthToken(HttpContext *pContext, char *token, int len) {
-  token[len] = '\0';
-  int            outlen = 0;
-  unsigned char *base64 = base64_decode(token, len, &outlen);
-  if (base64 == NULL || outlen == 0) {
-    httpError("context:%p, fd:%d, ip:%s, taosd token:%s parsed error", pContext, pContext->fd, pContext->ipstr, token);
-    return false;
-  }
-  if (outlen != (TSDB_USER_LEN + TSDB_PASSWORD_LEN)) {
-    httpError("context:%p, fd:%d, ip:%s, taosd token:%s length error", pContext, pContext->fd, pContext->ipstr, token);
-    free(base64);
-    return false;
-  }
-
-  char *descrypt = taosDesDecode(KEY_DES_4, (char *)base64, outlen);
-  if (descrypt == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, taosd token:%s descrypt error", pContext, pContext->fd, pContext->ipstr,
-              token);
-    free(base64);
-    return false;
-  } else {
-    strncpy(pContext->user, descrypt, TSDB_USER_LEN);
-    strncpy(pContext->pass, descrypt + TSDB_USER_LEN, TSDB_PASSWORD_LEN);
-
-    httpTrace("context:%p, fd:%d, ip:%s, taosd token:%s parsed success, user:%s", pContext, pContext->fd,
-              pContext->ipstr, token, pContext->user);
-    free(base64);
-    free(descrypt);
-    return true;
-  }
-}
-
-bool httpGenTaosdAuthToken(HttpContext *pContext, char *token, int maxLen) {
-  char buffer[TSDB_USER_LEN + TSDB_PASSWORD_LEN] = {0};
-  strncpy(buffer, pContext->user, TSDB_USER_LEN);
-  strncpy(buffer + TSDB_USER_LEN, pContext->pass, TSDB_PASSWORD_LEN);
-
-  char *encrypt = taosDesEncode(KEY_DES_4, buffer, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
-  char *base64 = base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
-
-  strncpy(token, base64, (size_t)strlen(base64));
-  free(encrypt);
-  free(base64);
-
-  httpTrace("context:%p, fd:%d, ip:%s, gen taosd token:%s", pContext, pContext->fd, pContext->ipstr, token);
-
-  return true;
-}
diff --git a/src/modules/http/src/httpCode.c b/src/modules/http/src/httpCode.c
deleted file mode 100644
index 230c0de2e09046eb9384817498b13adea4ddb42c..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpCode.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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/>.
- */
-
-char* httpMsg[] = {
-    "success",                                 // 0
-    "http server is not online",               // 1
-    "http url is not support",                 // 2
-    "http method parse error",                 // 3
-    "http version should be 1.0, 1.1 or 1.2",  // 4
-    "http head parse error",                   // 5
-    "request size is too big",
-    "http body size invalid",
-    "http chunked body parse error",           // 8
-    "http url parse error",                    // 9
-    "invalid type of Authorization",
-    "no auth info input",
-    "no sql input",
-    "session list was full",
-    "no enough memory to alloc sqls",
-    "generate taosd token error",
-    "db and table can not be null",
-    "no need to execute use db cmd",
-    "parse grafana json error",
-    "size of multi request is 0",              // 19
-    "request is empty",                        // 20
-    "no enough connections for http",          // 21
-
-    // telegraf
-    "database name can not be null",           // 22
-    "database name too long",
-    "invalid telegraf json fromat",
-    "metrics size is 0",
-    "metrics size can not more than 1K",       // 26
-    "metric name not find",
-    "metric name type should be string",
-    "metric name length is 0",
-    "metric name length too long",
-    "timestamp not find",                      // 31
-    "timestamp type should be integer",
-    "timestamp value smaller than 0",
-    "tags not find",
-    "tags size is 0",
-    "tags size too long",                      // 36
-    "tag is null",
-    "tag name is null",
-    "tag name length too long",                // 39
-    "tag value type should be number or string",
-    "tag value is null",
-    "table is null",                           // 42
-    "table name length too long",
-    "fields not find",                         // 44
-    "fields size is 0",
-    "fields size too long",
-    "field is null",                           // 47
-    "field name is null",
-    "field name length too long",              // 49
-    "field value type should be number or string",
-    "field value is null",                     // 51
-    "parse basic auth token error",
-    "parse http auth token error",
-    "host type should be string",
-
-    // grafana
-    "query size is 0",                        // 55
-    "query size can not more than 100",
-
-    // opentsdb
-    "database name can not be null",          // 57
-    "database name too long",
-    "invalid opentsdb json fromat",           // 59
-    "metrics size is 0",
-    "metrics size can not more than 10K",     // 61
-    "metric name not find",
-    "metric name type should be string",
-    "metric name length is 0",
-    "metric name length can not more than 22",
-    "timestamp not find",
-    "timestamp type should be integer",
-    "timestamp value smaller than 0",
-    "tags not find",
-    "tags size is 0",
-    "tags size too long",                    // 71
-    "tag is null",
-    "tag name is null",
-    "tag name length too long",              // 74
-    "tag value type should be boolean, number or string",
-    "tag value is null",
-    "tag value can not more than 64",        // 77
-    "value not find",
-    "value type should be boolean, number or string",
-    "stable not exist",
-
-};
diff --git a/src/modules/http/src/httpHandle.c b/src/modules/http/src/httpHandle.c
deleted file mode 100644
index b46fa11cde6cdf93bba737ccbc223f0f9de910be..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpHandle.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * 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 <arpa/inet.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-#include "shash.h"
-#include "taos.h"
-#include "tglobalcfg.h"
-#include "tsocket.h"
-#include "ttimer.h"
-
-void httpToLowerUrl(char* url) {
-  /*ignore case */
-  while (*url) {
-    if (*url >= 'A' && *url <= 'Z') {
-      *url = *url | 0x20;
-    }
-    url++;
-  }
-}
-
-bool httpUrlMatch(HttpContext* pContext, int pos, char* cmp) {
-  HttpParser* pParser = &pContext->parser;
-
-  if (pos < 0 || pos >= HTTP_MAX_URL) {
-    return false;
-  }
-
-  if (pParser->path[pos].len <= 0) {
-    return false;
-  }
-
-  if (strcmp(pParser->path[pos].pos, cmp) != 0) {
-    return false;
-  }
-
-  return true;
-}
-
-// /account/db/meter HTTP/1.1\r\nHost
-bool httpParseURL(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  char* pSeek;
-  char* pEnd = strchr(pParser->pLast, ' ');
-  if (*pParser->pLast != '/') {
-    httpSendErrorResp(pContext, HTTP_UNSUPPORT_URL);
-    return false;
-  }
-  pParser->pLast++;
-
-  for (int i = 0; i < HTTP_MAX_URL; i++) {
-    pSeek = strchr(pParser->pLast, '/');
-    if (pSeek == NULL) {
-      break;
-    }
-    pParser->path[i].pos = pParser->pLast;
-    if (pSeek <= pEnd) {
-      pParser->path[i].len = (int16_t)(pSeek - pParser->pLast);
-      pParser->path[i].pos[pParser->path[i].len] = 0;
-      httpToLowerUrl(pParser->path[i].pos);
-      pParser->pLast = pSeek + 1;
-    } else {
-      pParser->path[i].len = (int16_t)(pEnd - pParser->pLast);
-      pParser->path[i].pos[pParser->path[i].len] = 0;
-      httpToLowerUrl(pParser->path[i].pos);
-      pParser->pLast = pEnd + 1;
-      break;
-    }
-  }
-  pParser->pLast = pEnd + 1;
-
-  if (pParser->path[0].len == 0) {
-    httpSendErrorResp(pContext, HTTP_UNSUPPORT_URL);
-    return false;
-  }
-
-  return true;
-}
-
-bool httpParseHttpVersion(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  char* pEnd = strchr(pParser->pLast, '1');
-  if (pEnd == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, can't find http version at position:%s", pContext, pContext->fd,
-              pContext->ipstr, pParser->pLast);
-    httpSendErrorResp(pContext, HTTP_PARSE_HTTP_VERSION_ERROR);
-    return false;
-  }
-
-  if (*(pEnd + 1) != '.') {
-    httpError("context:%p, fd:%d, ip:%s, can't find http version at position:%s", pContext, pContext->fd,
-              pContext->ipstr, pParser->pLast);
-    httpSendErrorResp(pContext, HTTP_PARSE_HTTP_VERSION_ERROR);
-    return false;
-  }
-
-  if (*(pEnd + 2) == '0')
-    pContext->httpVersion = HTTP_VERSION_10;
-  else if (*(pEnd + 2) == '1')
-    pContext->httpVersion = HTTP_VERSION_11;
-  else if (*(pEnd + 2) == '2')
-    pContext->httpVersion = HTTP_VERSION_11;
-  else
-    pContext->httpVersion = HTTP_VERSION_10;
-
-  httpTrace("context:%p, fd:%d, ip:%s, httpVersion:1.%d", pContext, pContext->fd, pContext->ipstr,
-            pContext->httpVersion);
-  return true;
-}
-
-bool httpGetNextLine(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  while (pParser->buffer + pParser->bufsize - pParser->pCur++ > 0) {
-    if (*(pParser->pCur) == '\n' && *(pParser->pCur - 1) == '\r') {
-      // cut the string
-      *pParser->pCur = 0;
-      return true;
-    }
-  }
-
-  httpSendErrorResp(pContext, HTTP_PARSE_HEAD_ERROR);
-
-  return false;
-}
-
-bool httpGetHttpMethod(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-
-  char*       pSeek = strchr(pParser->pLast, ' ');
-  if (pSeek == NULL) {
-    httpSendErrorResp(pContext, HTTP_PARSE_HTTP_METHOD_ERROR);
-    return false;
-  }
-  pParser->method.pos = pParser->pLast;
-  pParser->method.len = (int16_t)(pSeek - pParser->pLast);
-  pParser->method.pos[pParser->method.len] = 0;
-  pParser->pLast = pSeek + 1;
-
-  httpTrace("context:%p, fd:%d, ip:%s, httpMethod:%s", pContext, pContext->fd, pContext->ipstr, pParser->method.pos);
-  return true;
-}
-
-bool httpGetDecodeMethod(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-
-  HttpServer* pServer = pContext->pThread->pServer;
-  int         methodLen = pServer->methodScannerLen;
-  for (int i = 0; i < methodLen; i++) {
-    HttpDecodeMethod* method = pServer->methodScanner[i];
-    if (strcmp(method->module, pParser->path[0].pos) != 0) {
-      continue;
-    }
-    pParser->pMethod = method;
-    return true;
-  }
-
-  httpError("context:%p, fd:%d, ip:%s, error:the url is not support, method:%s, path:%s",
-            pContext, pContext->fd, pContext->ipstr, pParser->method.pos, pParser->path[0].pos);
-  httpSendErrorResp(pContext, HTTP_UNSUPPORT_URL);
-
-  return false;
-}
-
-bool httpParseHead(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (strncasecmp(pParser->pLast, "Content-Length: ", 16) == 0) {
-    pParser->data.len = (int32_t)atoi(pParser->pLast + 16);
-    httpTrace("context:%p, fd:%d, ip:%s, Content-Length:%d", pContext, pContext->fd, pContext->ipstr,
-              pParser->data.len);
-  } else if (strncasecmp(pParser->pLast, "Accept-Encoding: ", 17) == 0) {
-    if (tsHttpEnableCompress && strstr(pParser->pLast + 17, "gzip") != NULL) {
-      pContext->acceptEncoding = HTTP_COMPRESS_GZIP;
-      httpTrace("context:%p, fd:%d, ip:%s, Accept-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
-    } else {
-      pContext->acceptEncoding = HTTP_COMPRESS_IDENTITY;
-      httpTrace("context:%p, fd:%d, ip:%s, Accept-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
-    }
-  } else if (strncasecmp(pParser->pLast, "Content-Encoding: ", 18) == 0) {
-    if (strstr(pParser->pLast + 18, "gzip") != NULL) {
-      pContext->contentEncoding = HTTP_COMPRESS_GZIP;
-      httpTrace("context:%p, fd:%d, ip:%s, Content-Encoding:gzip", pContext, pContext->fd, pContext->ipstr);
-    } else {
-      pContext->contentEncoding = HTTP_COMPRESS_IDENTITY;
-      httpTrace("context:%p, fd:%d, ip:%s, Content-Encoding:identity", pContext, pContext->fd, pContext->ipstr);
-    }
-  } else if (strncasecmp(pParser->pLast, "Connection: ", 12) == 0) {
-    if (strncasecmp(pParser->pLast + 12, "Keep-Alive", 10) == 0) {
-      pContext->httpKeepAlive = HTTP_KEEPALIVE_ENABLE;
-    } else {
-      pContext->httpKeepAlive = HTTP_KEEPALIVE_DISABLE;
-    }
-    httpTrace("context:%p, fd:%d, ip:%s, keepAlive:%d", pContext, pContext->fd, pContext->ipstr,
-              pContext->httpKeepAlive);
-  } else if (strncasecmp(pParser->pLast, "Transfer-Encoding: ", 19) == 0) {
-    if (strncasecmp(pParser->pLast + 19, "chunked", 7) == 0) {
-      pContext->httpChunked = HTTP_CHUNKED;
-    }
-  } else if (strncasecmp(pParser->pLast, "Authorization: ", 15) == 0) {
-    if (strncasecmp(pParser->pLast + 15, "Basic ", 6) == 0) {
-      pParser->token.pos = pParser->pLast + 21;
-      pParser->token.len = (int16_t)(pParser->pCur - pParser->token.pos - 1);
-      bool parsed = httpParseBasicAuthToken(pContext, pParser->token.pos, pParser->token.len);
-      if (!parsed) {
-        httpSendErrorResp(pContext, HTTP_INVALID_BASIC_AUTH_TOKEN);
-        return false;
-      }
-    } else if (strncasecmp(pParser->pLast + 15, "Taosd ", 6) == 0) {
-      pParser->token.pos = pParser->pLast + 21;
-      pParser->token.len = (int16_t)(pParser->pCur - pParser->token.pos - 1);
-      bool parsed = httpParseTaosdAuthToken(pContext, pParser->token.pos, pParser->token.len);
-      if (!parsed) {
-        httpSendErrorResp(pContext, HTTP_INVALID_TAOSD_AUTH_TOKEN);
-        return false;
-      }
-    } else {
-      httpSendErrorResp(pContext, HTTP_INVALID_AUTH_TOKEN);
-      return false;
-    }
-  } else {
-  }
-
-  return true;
-}
-
-bool httpParseChunkedBody(HttpContext* pContext, HttpParser* pParser, bool test) {
-  char*  pEnd = pParser->buffer + pParser->bufsize;
-  char*  pRet = pParser->data.pos;
-  char*  pSize = pParser->data.pos;
-  size_t size = strtoul(pSize, NULL, 16);
-  if (size <= 0) return false;
-
-  while (size > 0) {
-    char* pData = strstr(pSize, "\r\n");
-    if (pData == NULL || pData >= pEnd) return false;
-    pData += 2;
-
-    pSize = strstr(pData, "\r\n");
-    if (pSize == NULL || pSize >= pEnd) return false;
-    if ((size_t)(pSize - pData) != size) return false;
-    pSize += 2;
-
-    if (!test) {
-      memmove(pRet, pData, size);
-      pRet += size;
-    }
-
-    size = strtoul(pSize, NULL, 16);
-  }
-
-  if (!test) {
-    *pRet = '\0';
-  }
-
-  return true;
-}
-
-bool httpReadChunkedBody(HttpContext* pContext, HttpParser* pParser) {
-  bool parsedOk = httpParseChunkedBody(pContext, pParser, true);
-  if (parsedOk) {
-    httpParseChunkedBody(pContext, pParser, false);
-    return HTTP_CHECK_BODY_SUCCESS;
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, chunked body not finished, continue read", pContext, pContext->fd, pContext->ipstr);
-    if (!httpReadDataImp(pContext)) {
-      httpError("context:%p, fd:%d, ip:%s, read chunked request error", pContext, pContext->fd, pContext->ipstr);
-      return HTTP_CHECK_BODY_ERROR;
-    } else {
-      return HTTP_CHECK_BODY_CONTINUE;
-    }
-  }
-}
-
-int httpReadUnChunkedBody(HttpContext* pContext, HttpParser* pParser) {
-  int dataReadLen = pParser->bufsize - (int)(pParser->data.pos - pParser->buffer);
-  if (dataReadLen > pParser->data.len) {
-    httpError("context:%p, fd:%d, ip:%s, un-chunked body length invalid, read size:%d dataReadLen:%d > pContext->data.len:%d",
-              pContext, pContext->fd, pContext->ipstr, pContext->parser.bufsize, dataReadLen, pParser->data.len);
-    httpSendErrorResp(pContext, HTTP_PARSE_BODY_ERROR);
-    return HTTP_CHECK_BODY_ERROR;
-  } else if (dataReadLen < pParser->data.len) {
-    httpTrace("context:%p, fd:%d, ip:%s, un-chunked body not finished, read size:%d dataReadLen:%d < pContext->data.len:%d, continue read",
-              pContext, pContext->fd, pContext->ipstr, pContext->parser.bufsize, dataReadLen, pParser->data.len);
-    return HTTP_CHECK_BODY_CONTINUE;
-  } else {
-    return HTTP_CHECK_BODY_SUCCESS;
-  }
-}
-
-bool httpParseRequest(HttpContext* pContext) {
-  HttpParser *pParser = &pContext->parser;
-  if (pContext->parsed) {
-    return true;
-  }
-
-  httpTrace("context:%p, fd:%d, ip:%s, thread:%s, numOfFds:%d, read size:%d, raw data:\n%s",
-           pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, pContext->pThread->numOfFds,
-           pContext->parser.bufsize, pContext->parser.buffer);
-
-  if (!httpGetHttpMethod(pContext)) {
-    return false;
-  }
-
-  if (!httpParseURL(pContext)) {
-    return false;
-  }
-
-  if (!httpParseHttpVersion(pContext)) {
-    return false;
-  }
-
-  if (!httpGetDecodeMethod(pContext)) {
-    return false;
-  }
-
-  do {
-    if (!httpGetNextLine(pContext)) {
-      return false;
-    }
-
-    // Empty line, end of the HTTP HEAD
-    if (pParser->pCur - pParser->pLast == 1) {
-      pParser->data.pos = ++pParser->pCur;
-      break;
-    }
-
-    if (!httpParseHead(pContext)) {
-      return false;
-    }
-
-    pParser->pLast = ++pParser->pCur;
-  } while (1);
-
-  httpTrace("context:%p, fd:%d, ip:%s, parse http head ok", pContext, pContext->fd, pContext->ipstr);
-
-  pContext->parsed = true;
-  return true;
-}
-
-int httpCheckReadCompleted(HttpContext* pContext) {
-  HttpParser *pParser = &pContext->parser;
-  if (pContext->httpChunked == HTTP_UNCUNKED) {
-    int ret = httpReadUnChunkedBody(pContext, pParser);
-    if (ret != HTTP_CHECK_BODY_SUCCESS) {
-      return ret;
-    }
-  } else {
-    int ret = httpReadChunkedBody(pContext, pParser);
-    if (ret != HTTP_CHECK_BODY_SUCCESS) {
-      return ret;
-    }
-  }
-
-  return HTTP_CHECK_BODY_SUCCESS;
-}
-
-bool httpDecodeRequest(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (pParser->pMethod->decodeFp == NULL) {
-    return false;
-  }
-
-  return (*pParser->pMethod->decodeFp)(pContext);
-}
-
-/**
- * Process the request from http pServer
- */
-bool httpProcessData(HttpContext* pContext) {
-
-  if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_HANDLING)) {
-    httpTrace("context:%p, fd:%d, ip:%s, state:%s not in ready state, stop process request",
-            pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state));
-    httpCloseContextByApp(pContext);
-    return false;
-  }
-
-  // handle Cross-domain request
-  if (strcmp(pContext->parser.method.pos, "OPTIONS") == 0) {
-    httpTrace("context:%p, fd:%d, ip:%s, process options request", pContext, pContext->fd, pContext->ipstr);
-    httpSendOptionResp(pContext, "process options request success");
-  } else {
-    if (!httpDecodeRequest(pContext)) {
-      /*
-       * httpCloseContextByApp has been called when parsing the error
-       */
-      //httpCloseContextByApp(pContext);
-    } else {
-      httpProcessRequest(pContext);
-    }
-  }
-
-  return true;
-}
diff --git a/src/modules/http/src/httpJson.c b/src/modules/http/src/httpJson.c
deleted file mode 100644
index 5d5d29f4e0fae91c8e30bfb3aaa78fb440b8a188..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpJson.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * 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 <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpJson.h"
-#include "httpResp.h"
-#include "taosmsg.h"
-
-#define MAX_NUM_STR_SZ 25
-
-char JsonItmTkn = ',';
-char JsonObjStt = '{';
-char JsonObjEnd = '}';
-char JsonArrStt = '[';
-char JsonArrEnd = ']';
-char JsonStrStt = '\"';
-char JsonStrEnd = '\"';
-char JsonPairTkn = ':';
-char JsonNulTkn[] = "null";
-char JsonTrueTkn[] = "true";
-char JsonFalseTkn[] = "false";
-
-int httpWriteBufByFd(struct HttpContext* pContext, const char* buf, int sz) {
-  int       len;
-  int       countWait = 0;
-  int       writeLen = 0;
-
-  do {
-    if (pContext->fd > 2){
-      len = (int)send(pContext->fd, buf + writeLen, (size_t)(sz - writeLen), MSG_NOSIGNAL);
-    }
-    else {
-      return sz;
-    }
-
-    if (len < 0) {
-      httpTrace("context:%p, fd:%d, ip:%s, socket write errno:%d, times:%d",
-                pContext, pContext->fd, pContext->ipstr, errno, countWait);
-      if (++countWait > HTTP_WRITE_RETRY_TIMES) break;
-      taosMsleep(HTTP_WRITE_WAIT_TIME_MS);
-      continue;
-    } else if (len == 0) {
-      httpTrace("context:%p, fd:%d, ip:%s, socket write errno:%d, connect already closed",
-                pContext, pContext->fd, pContext->ipstr, errno);
-      break;
-    } else {
-      countWait = 0;
-      writeLen += len;
-    }
-  } while (writeLen < sz);
-
-  return writeLen;
-}
-
-int httpWriteBuf(struct HttpContext *pContext, const char *buf, int sz) {
-  int writeSz = httpWriteBufByFd(pContext, buf, sz);
-  if (writeSz != sz) {
-    httpError("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, failed to send response:\n%s",
-              pContext, pContext->fd, pContext->ipstr, sz, writeSz, buf);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, response:\n%s",
-              pContext, pContext->fd, pContext->ipstr, sz, writeSz, buf);
-  }
-
-  return writeSz;
-}
-
-int httpWriteBufNoTrace(struct HttpContext *pContext, const char *buf, int sz) {
-  int writeSz = httpWriteBufByFd(pContext, buf, sz);
-  if (writeSz != sz) {
-    httpError("context:%p, fd:%d, ip:%s, dataSize:%d, writeSize:%d, failed to send response",
-              pContext, pContext->fd, pContext->ipstr, sz, writeSz);
-  }
-
-  return writeSz;
-}
-
-int httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
-  int remain = 0;
-  char sLen[24];
-  uint64_t srcLen = (uint64_t) (buf->lst - buf->buf);
-
-  if (buf->pContext->fd <= 0) {
-    httpTrace("context:%p, fd:%d, ip:%s, write json body error", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
-    buf->pContext->fd = -1;
-  }
-
-  /*
-   * HTTP servers often use compression to optimize transmission, for example
-   * with Content-Encoding: gzip or Content-Encoding: deflate.
-   * If both compression and chunked encoding are enabled, then the content stream is first compressed, then chunked;
-   * so the chunk encoding itself is not compressed, and the data in each chunk is not compressed individually.
-   * The remote endpoint then decodes the stream by concatenating the chunks and uncompressing the result.
-   */
-
-  if (buf->pContext->acceptEncoding == HTTP_COMPRESS_IDENTITY) {
-    if (buf->lst == buf->buf) {
-      httpTrace("context:%p, fd:%d, ip:%s, no data need dump", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
-      return 0;  // there is no data to dump.
-    } else {
-      int len = sprintf(sLen, "%lx\r\n", srcLen);
-      httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", response:\n%s",
-                buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, buf->buf);
-      httpWriteBufNoTrace(buf->pContext, sLen, len);
-      remain = httpWriteBufNoTrace(buf->pContext, buf->buf, (int) srcLen);
-    }
-  } else {
-    char compressBuf[JSON_BUFFER_SIZE] = {0};
-    int32_t compressBufLen = JSON_BUFFER_SIZE;
-    int ret = httpGzipCompress(buf->pContext, buf->buf, srcLen, compressBuf, &compressBufLen, isTheLast);
-    if (ret == 0) {
-      if (compressBufLen > 0) {
-        int len = sprintf(sLen, "%x\r\n", compressBufLen);
-        httpTrace("context:%p, fd:%d, ip:%s, write body, chunkSize:%" PRIu64 ", compressSize:%d, last:%d, response:\n%s",
-                  buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, compressBufLen, isTheLast, buf->buf);
-        httpWriteBufNoTrace(buf->pContext, sLen, len);
-        remain = httpWriteBufNoTrace(buf->pContext, (const char *) compressBuf, (int) compressBufLen);
-      } else {
-        httpTrace("context:%p, fd:%d, ip:%s, last:%d, compress already dumped, response:\n%s",
-                buf->pContext, buf->pContext->fd, buf->pContext->ipstr, isTheLast, buf->buf);
-        return 0;  // there is no data to dump.
-      }
-    } else {
-      httpError("context:%p, fd:%d, ip:%s, failed to compress data, chunkSize:%d, last:%d, error:%d, response:\n%s",
-                buf->pContext, buf->pContext->fd, buf->pContext->ipstr, srcLen, isTheLast, ret, buf->buf);
-      return 0;
-    }
-  }
-
-  httpWriteBufNoTrace(buf->pContext, "\r\n", 2);
-  buf->total += (int) (buf->lst - buf->buf);
-  buf->lst = buf->buf;
-  memset(buf->buf, 0, (size_t) buf->size);
-  return remain;
-}
-
-void httpWriteJsonBufHead(JsonBuf* buf) {
-  if (buf->pContext->fd <= 0) {
-    buf->pContext->fd = -1;
-  }
-
-  char msg[1024] = {0};
-  int  len = -1;
-
-  if (buf->pContext->acceptEncoding == HTTP_COMPRESS_IDENTITY) {
-    len = sprintf(msg, httpRespTemplate[HTTP_RESPONSE_CHUNKED_UN_COMPRESS], httpVersionStr[buf->pContext->httpVersion],
-                  httpKeepAliveStr[buf->pContext->httpKeepAlive]);
-  } else {
-    len = sprintf(msg, httpRespTemplate[HTTP_RESPONSE_CHUNKED_COMPRESS], httpVersionStr[buf->pContext->httpVersion],
-                  httpKeepAliveStr[buf->pContext->httpKeepAlive]);
-  }
-
-  httpWriteBuf(buf->pContext, (const char*)msg, len);
-}
-
-void httpWriteJsonBufEnd(JsonBuf* buf) {
-  if (buf->pContext->fd <= 0) {
-    httpTrace("context:%p, fd:%d, ip:%s, json buf fd is 0", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
-    buf->pContext->fd = -1;
-  }
-
-  httpWriteJsonBufBody(buf, true);
-  httpWriteBufNoTrace(buf->pContext, "0\r\n\r\n", 5);  // end of chunked resp
-}
-
-void httpInitJsonBuf(JsonBuf* buf, struct HttpContext* pContext) {
-  buf->lst = buf->buf;
-  buf->total = 0;
-  buf->size = JSON_BUFFER_SIZE;  // option setting
-  buf->pContext = pContext;
-  memset(buf->lst, 0, JSON_BUFFER_SIZE);
-
-  if (pContext->acceptEncoding == HTTP_COMPRESS_GZIP) {
-    httpGzipCompressInit(buf->pContext);
-  }
-
-  httpTrace("context:%p, fd:%d, ip:%s, json buffer initialized", buf->pContext, buf->pContext->fd, buf->pContext->ipstr);
-}
-
-void httpJsonItemToken(JsonBuf* buf) {
-  char c = *(buf->lst - 1);
-  if (c == JsonArrStt || c == JsonObjStt || c == JsonPairTkn || c == JsonItmTkn) {
-    return;
-  }
-  if (buf->lst > buf->buf) httpJsonToken(buf, JsonItmTkn);
-}
-
-void httpJsonString(JsonBuf* buf, char* sVal, int len) {
-  httpJsonItemToken(buf);
-  httpJsonToken(buf, JsonStrStt);
-  httpJsonPrint(buf, sVal, len);
-  httpJsonToken(buf, JsonStrEnd);
-}
-
-void httpJsonOriginString(JsonBuf* buf, char* sVal, int len) {
-  httpJsonItemToken(buf);
-  httpJsonPrint(buf, sVal, len);
-}
-
-void httpJsonStringForTransMean(JsonBuf* buf, char* sVal, int maxLen) {
-  httpJsonItemToken(buf);
-  httpJsonToken(buf, JsonStrStt);
-
-  if (sVal != NULL) {
-    // dispose transferred meaning byte
-    char* lastPos = sVal;
-    char* curPos = sVal;
-
-    for (int i = 0; i < maxLen; ++i) {
-      if (*curPos == 0) {
-        break;
-      }
-
-      if (*curPos == '\"') {
-        httpJsonPrint(buf, lastPos, (int)(curPos - lastPos));
-        curPos++;
-        lastPos = curPos;
-        httpJsonPrint(buf, "\\\"", 2);
-      } else if (*curPos == '\\') {
-        httpJsonPrint(buf, lastPos, (int)(curPos - lastPos));
-        curPos++;
-        lastPos = curPos;
-        httpJsonPrint(buf, "\\\\", 2);
-      } else {
-        curPos++;
-      }
-    }
-
-    if (*lastPos) {
-      httpJsonPrint(buf, lastPos, (int)(curPos - lastPos));
-    }
-  }
-
-  httpJsonToken(buf, JsonStrEnd);
-}
-
-void httpJsonInt64(JsonBuf* buf, int64_t num) {
-  httpJsonItemToken(buf);
-  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
-  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRId64, num);
-}
-
-void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
-  char ts[35] = {0};
-  struct tm *ptm;
-  int precision = 1000;
-  if (us) {
-    precision = 1000000;
-  }
-
-  time_t tt = t / precision;
-  ptm = localtime(&tt);
-  int length = (int) strftime(ts, 35, "%Y-%m-%d %H:%M:%S", ptm);
-  if (us) {
-    length += snprintf(ts + length, 8, ".%06ld", t % precision);
-  } else {
-    length += snprintf(ts + length, 5, ".%03ld", t % precision);
-  }
-
-  httpJsonString(buf, ts, length);
-}
-
-void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us) {
-  char ts[40] = {0};
-  struct tm *ptm;
-  int precision = 1000;
-  if (us) {
-    precision = 1000000;
-  }
-
-  time_t tt = t / precision;
-  ptm = localtime(&tt);
-  int length = (int) strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", ptm);
-  if (us) {
-    length += snprintf(ts + length, 8, ".%06ld", t % precision);
-  } else {
-    length += snprintf(ts + length, 5, ".%03ld", t % precision);
-  }
-  length += (int) strftime(ts + length, 40 - length, "%z", ptm);
-
-  httpJsonString(buf, ts, length);
-}
-
-void httpJsonInt(JsonBuf* buf, int num) {
-  httpJsonItemToken(buf);
-  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
-  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%d", num);
-}
-
-void httpJsonFloat(JsonBuf* buf, float num) {
-  httpJsonItemToken(buf);
-  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
-  if (isinf(num) || isnan(num)) {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
-  } else if (num > 1E10 || num < -1E10) {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5e", num);
-  } else {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5f", num);
-  }
-}
-
-void httpJsonDouble(JsonBuf* buf, double num) {
-  httpJsonItemToken(buf);
-  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
-  if (isinf(num) || isnan(num)) {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
-  } else if (num > 1E10 || num < -1E10) {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9e", num);
-  } else {
-    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9f", num);
-  }
-}
-
-void httpJsonNull(JsonBuf* buf) { httpJsonString(buf, "null", 4); }
-
-void httpJsonBool(JsonBuf* buf, int val) {
-  if (val == 0)
-    httpJsonPrint(buf, JsonFalseTkn, sizeof(JsonFalseTkn));
-  else
-    httpJsonPrint(buf, JsonTrueTkn, sizeof(JsonTrueTkn));
-}
-
-void httpJsonPairHead(JsonBuf* buf, char* name, int len) {
-  httpJsonItemToken(buf);
-  httpJsonString(buf, name, len);
-  httpJsonToken(buf, JsonPairTkn);
-}
-
-void httpJsonPair(JsonBuf* buf, char* name, int nameLen, char* sVal, int valLen) {
-  httpJsonPairHead(buf, name, nameLen);
-  httpJsonString(buf, sVal, valLen);
-}
-
-void httpJsonPairOriginString(JsonBuf* buf, char* name, int nameLen, char* sVal, int valLen) {
-  httpJsonPairHead(buf, name, nameLen);
-  httpJsonOriginString(buf, sVal, valLen);
-}
-
-void httpJsonPairIntVal(JsonBuf* buf, char* name, int nNameLen, int num) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonInt(buf, num);
-}
-
-void httpJsonPairInt64Val(JsonBuf* buf, char* name, int nNameLen, int64_t num) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonInt64(buf, num);
-}
-
-void httpJsonPairBoolVal(JsonBuf* buf, char* name, int nNameLen, int num) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonBool(buf, num);
-}
-
-void httpJsonPairFloatVal(JsonBuf* buf, char* name, int nNameLen, float num) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonFloat(buf, num);
-}
-
-void httpJsonPairDoubleVal(JsonBuf* buf, char* name, int nNameLen, double num) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonDouble(buf, num);
-}
-
-void httpJsonPairNullVal(JsonBuf* buf, char* name, int nNameLen) {
-  httpJsonPairHead(buf, name, nNameLen);
-  httpJsonNull(buf);
-}
-
-void httpJsonPairArray(JsonBuf* buf, char* name, int len, httpJsonBuilder fnBuilder, void* dsHandle) {
-  httpJsonPairHead(buf, name, len);
-  httpJsonArray(buf, fnBuilder, dsHandle);
-}
-
-void httpJsonPairObject(JsonBuf* buf, char* name, int len, httpJsonBuilder fnBuilder, void* dsHandle) {
-  httpJsonPairHead(buf, name, len);
-  httpJsonObject(buf, fnBuilder, dsHandle);
-}
-
-void httpJsonObject(JsonBuf* buf, httpJsonBuilder fnBuilder, void* dsHandle) {
-  httpJsonItemToken(buf);
-  httpJsonToken(buf, JsonObjStt);
-  (*fnBuilder)(buf, dsHandle);
-  httpJsonToken(buf, JsonObjEnd);
-}
-
-void httpJsonArray(JsonBuf* buf, httpJsonBuilder fnBuilder, void* jsonHandle) {
-  httpJsonItemToken(buf);
-  httpJsonToken(buf, JsonArrStt);
-  (*fnBuilder)(buf, jsonHandle);
-  httpJsonToken(buf, JsonArrEnd);
-}
-
-void httpJsonTestBuf(JsonBuf* buf, int safety) {
-  if ((buf->lst - buf->buf + safety) < buf->size) return;
-  // buf->slot = *buf->lst;
-  httpWriteJsonBufBody(buf, false);
-}
-
-void httpJsonToken(JsonBuf* buf, char c) {
-  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);  // maybe object stack
-  *buf->lst++ = c;
-}
-
-void httpJsonPrint(JsonBuf* buf, const char* json, int len) {
-  if (len == 0 || len >= JSON_BUFFER_SIZE) {
-    return;
-  }
-
-  if (len > buf->size) {
-    httpWriteJsonBufBody(buf, false);
-    httpJsonPrint(buf, json, len);
-    // buf->slot = json[len - 1];
-    return;
-  }
-  httpJsonTestBuf(buf, len + 2);
-  memcpy(buf->lst, json, (size_t)len);
-  buf->lst += len;
-}
-
-void httpJsonPairStatus(JsonBuf* buf, int code) {
-  if (code == 0) {
-    httpJsonPair(buf, "status", 6, "succ", 4);
-  } else {
-    httpJsonPair(buf, "status", 6, "error", 5);
-    httpJsonItemToken(buf);
-    httpJsonPairIntVal(buf, "code", 4, code);
-    if (code >= 0) {
-      httpJsonItemToken(buf);
-      if (code == TSDB_CODE_DB_NOT_SELECTED) {
-        httpJsonPair(buf, "desc", 4, "failed to create database", 23);
-      } else if (code == TSDB_CODE_INVALID_TABLE) {
-        httpJsonPair(buf, "desc", 4, "failed to create table", 22);
-      } else
-        httpJsonPair(buf, "desc", 4, tsError[code], (int)strlen(tsError[code]));
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/modules/http/src/httpResp.c b/src/modules/http/src/httpResp.c
deleted file mode 100644
index ce339df2bdca645bda2d7684f29966e638744e14..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpResp.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * 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 "httpResp.h"
-#include <stdio.h>
-#include <string.h>
-#include "httpCode.h"
-#include "httpJson.h"
-#include "taosmsg.h"
-
-extern char *tsError[];
-
-const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
-
-const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/1.2"};
-
-const char *httpRespTemplate[] = {
-    // HTTP_RESPONSE_JSON_OK
-    // HTTP_RESPONSE_JSON_ERROR
-    "{\"status\":\"succ\",\"code\":%d,\"desc\":\"%s\"}",
-    "{\"status\":\"error\",\"code\":%d,\"desc\":\"%s\"}",
-    // HTTP_RESPONSE_OK
-    // HTTP_RESPONSE_ERROR
-    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n",
-    "%s %d %s\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n",
-    // HTTP_RESPONSE_CHUNKED_UN_COMPRESS, HTTP_RESPONSE_CHUNKED_COMPRESS
-    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nTransfer-Encoding: chunked\r\n\r\n",
-    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Encoding: gzip\r\nTransfer-Encoding: chunked\r\n\r\n",
-    // HTTP_RESPONSE_OPTIONS
-    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\nAccess-Control-Allow-Methods: *\r\nAccess-Control-Max-Age: 3600\r\nAccess-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, authorization\r\n\r\n",
-    // HTTP_RESPONSE_GRAFANA
-    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sAccess-Control-Allow-Methods:POST, GET, OPTIONS, DELETE, PUT\r\nAccess-Control-Allow-Headers:Accept, Content-Type\r\nContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n"
-};
-
-void httpSendErrorRespImp(HttpContext *pContext, int httpCode, char *httpCodeStr, int errNo, char *desc) {
-  httpError("context:%p, fd:%d, ip:%s, code:%d, error:%d:%s", pContext, pContext->fd, pContext->ipstr, httpCode, errNo,
-            desc);
-
-  char head[512] = {0};
-  char body[512] = {0};
-
-  int bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_ERROR], errNo, desc);
-  int headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_ERROR], httpVersionStr[pContext->httpVersion], httpCode,
-                        httpCodeStr, httpKeepAliveStr[pContext->httpKeepAlive], bodyLen);
-
-  httpWriteBuf(pContext, head, headLen);
-  httpWriteBuf(pContext, body, bodyLen);
-  httpCloseContextByApp(pContext);
-}
-
-void httpSendErrorRespWithDesc(HttpContext *pContext, int errNo, char *desc) {
-  int   httpCode = 500;
-  char *httpCodeStr = "Internal Server Error";
-  switch (errNo) {
-    case HTTP_SUCCESS:
-      httpCode = 200;
-      httpCodeStr = "OK";
-      break;
-    case HTTP_SERVER_OFFLINE:
-    case HTTP_UNSUPPORT_URL:
-      httpCode = 404;
-      httpCodeStr = "Not Found";
-      break;
-    case HTTP_PARSE_HTTP_METHOD_ERROR:
-      httpCode = 405;
-      httpCodeStr = "Method Not Allowed";
-      break;
-    case HTTP_PARSE_HTTP_VERSION_ERROR:
-      httpCode = 505;
-      httpCodeStr = "HTTP Version Not Supported";
-      break;
-    case HTTP_PARSE_HEAD_ERROR:
-      httpCode = 406;
-      httpCodeStr = "Not Acceptable";
-      break;
-    case HTTP_REQUSET_TOO_BIG:
-      httpCode = 413;
-      httpCodeStr = "Request Entity Too Large";
-      break;
-    case HTTP_PARSE_BODY_ERROR:
-    case HTTP_PARSE_CHUNKED_BODY_ERROR:
-      httpCode = 409;
-      httpCodeStr = "Conflict";
-      break;
-    case HTTP_PARSE_URL_ERROR:
-      httpCode = 414;
-      httpCodeStr = "Request-URI Invalid";
-      break;
-    case HTTP_INVALID_AUTH_TOKEN:
-    case HTTP_PARSE_USR_ERROR:
-      httpCode = 401;
-      httpCodeStr = "Unauthorized";
-      break;
-    case HTTP_NO_SQL_INPUT:
-      httpCode = 400;
-      httpCodeStr = "Bad Request";
-      break;
-    case HTTP_SESSION_FULL:
-      httpCode = 421;
-      httpCodeStr = "Too many connections";
-      break;
-    case HTTP_NO_ENOUGH_MEMORY:
-    case HTTP_GEN_TAOSD_TOKEN_ERR:
-      httpCode = 507;
-      httpCodeStr = "Insufficient Storage";
-      break;
-    case HTTP_INVALID_DB_TABLE:
-    case HTTP_NO_EXEC_USEDB:
-    case HTTP_PARSE_GC_REQ_ERROR:
-    case HTTP_INVALID_MULTI_REQUEST:
-    case HTTP_NO_MSG_INPUT:
-      httpCode = 400;
-      httpCodeStr = "Bad Request";
-      break;
-    case HTTP_NO_ENOUGH_SESSIONS:
-      httpCode = 421;
-      httpCodeStr = "Too many connections";
-      break;
-    // telegraf
-    case HTTP_TG_DB_NOT_INPUT:
-    case HTTP_TG_DB_TOO_LONG:
-    case HTTP_TG_INVALID_JSON:
-    case HTTP_TG_METRICS_NULL:
-    case HTTP_TG_METRICS_SIZE:
-    case HTTP_TG_METRIC_NULL:
-    case HTTP_TG_METRIC_TYPE:
-    case HTTP_TG_METRIC_NAME_NULL:
-    case HTTP_TG_METRIC_NAME_LONG:
-    case HTTP_TG_TIMESTAMP_NULL:
-    case HTTP_TG_TIMESTAMP_TYPE:
-    case HTTP_TG_TIMESTAMP_VAL_NULL:
-    case HTTP_TG_TAGS_NULL:
-    case HTTP_TG_TAGS_SIZE_0:
-    case HTTP_TG_TAGS_SIZE_LONG:
-    case HTTP_TG_TAG_NULL:
-    case HTTP_TG_TAG_NAME_NULL:
-    case HTTP_TG_TAG_NAME_SIZE:
-    case HTTP_TG_TAG_VALUE_TYPE:
-    case HTTP_TG_TAG_VALUE_NULL:
-    case HTTP_TG_TABLE_NULL:
-    case HTTP_TG_TABLE_SIZE:
-    case HTTP_TG_FIELDS_NULL:
-    case HTTP_TG_FIELDS_SIZE_0:
-    case HTTP_TG_FIELDS_SIZE_LONG:
-    case HTTP_TG_FIELD_NULL:
-    case HTTP_TG_FIELD_NAME_NULL:
-    case HTTP_TG_FIELD_NAME_SIZE:
-    case HTTP_TG_FIELD_VALUE_TYPE:
-    case HTTP_TG_FIELD_VALUE_NULL:
-    case HTTP_INVALID_BASIC_AUTH_TOKEN:
-    case HTTP_INVALID_TAOSD_AUTH_TOKEN:
-    case HTTP_TG_HOST_NOT_STRING:
-    // grafana
-    case HTTP_GC_QUERY_NULL:
-    case HTTP_GC_QUERY_SIZE:
-      httpCode = 400;
-      httpCodeStr = "Bad Request";
-      break;
-    default:
-      httpError("context:%p, fd:%d, ip:%s, error:%d not recognized", pContext, pContext->fd, pContext->ipstr, errNo);
-      break;
-  }
-
-  if (desc == NULL) {
-    httpSendErrorRespImp(pContext, httpCode, httpCodeStr, errNo + 1000, httpMsg[errNo]);
-  } else {
-    httpSendErrorRespImp(pContext, httpCode, httpCodeStr, errNo + 1000, desc);
-  }
-}
-
-void httpSendErrorResp(HttpContext *pContext, int errNo) { httpSendErrorRespWithDesc(pContext, errNo, NULL); }
-
-void httpSendTaosdErrorResp(HttpContext *pContext, int errCode) {
-  int httpCode = 400;
-  httpSendErrorRespImp(pContext, httpCode, "Bad Request", errCode, tsError[errCode]);
-}
-
-void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char* errMsg) {
-  int httpCode = 400;
-  char temp[512] = {0};
-  int len = sprintf(temp, "invalid SQL: %s", errMsg);
-
-  for (int i = 0; i < len; ++i) {
-    if (temp[i] == '\"') {
-      temp[i] = '\'';
-    } else if (temp[i] == '\n') {
-        temp[i] = ' ';
-    } else {}
-  }
-
-  httpSendErrorRespImp(pContext, httpCode, "Bad Request", TSDB_CODE_INVALID_SQL, temp);
-}
-
-void httpSendSuccResp(HttpContext *pContext, char *desc) {
-  char head[1024] = {0};
-  char body[1024] = {0};
-
-  int bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_OK], HTTP_SUCCESS, desc);
-  int headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_OK], httpVersionStr[pContext->httpVersion],
-                        httpKeepAliveStr[pContext->httpKeepAlive], bodyLen);
-
-  httpWriteBuf(pContext, head, headLen);
-  httpWriteBuf(pContext, body, bodyLen);
-  httpCloseContextByApp(pContext);
-}
-
-void httpSendOptionResp(HttpContext *pContext, char *desc) {
-  char head[1024] = {0};
-  char body[1024] = {0};
-
-  int bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_OK], HTTP_SUCCESS, desc);
-  int headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_OPTIONS], httpVersionStr[pContext->httpVersion],
-                        httpKeepAliveStr[pContext->httpKeepAlive], bodyLen);
-
-  httpWriteBuf(pContext, head, headLen);
-  httpWriteBuf(pContext, body, bodyLen);
-  httpCloseContextByApp(pContext);
-}
diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c
deleted file mode 100644
index 171f811b7d4f07d6ad2a5836669e9c3782ec0e41..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpServer.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * 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 "os.h"
-
-#include "taosmsg.h"
-#include "tlog.h"
-#include "tlog.h"
-#include "tsocket.h"
-#include "tutil.h"
-#include "ttime.h"
-#include "ttimer.h"
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#ifndef EPOLLWAKEUP
- #define EPOLLWAKEUP (1u << 29)
-#endif
-
-const char* httpContextStateStr(HttpContextState state) {
-  switch (state) {
-    case HTTP_CONTEXT_STATE_READY:
-      return "ready";
-    case HTTP_CONTEXT_STATE_HANDLING:
-      return "handling";
-    case HTTP_CONTEXT_STATE_DROPPING:
-      return "dropping";
-    case HTTP_CONTEXT_STATE_CLOSED:
-      return "closed";
-    default:
-      return "unknown";
-  }
-}
-
-void httpRemoveContextFromEpoll(HttpThread *pThread, HttpContext *pContext) {
-  if (pContext->fd >= 0) {
-    epoll_ctl(pThread->pollFd, EPOLL_CTL_DEL, pContext->fd, NULL);
-    taosCloseSocket(pContext->fd);
-    pContext->fd = -1;
-  }
-}
-
-bool httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState) {
-  return (atomic_val_compare_exchange_32(&pContext->state, srcState, destState) == srcState);
-}
-
-void httpFreeContext(HttpServer *pServer, HttpContext *pContext);
-
-/**
- * context will be reused while connection exist
- * multiCmds and jsonBuf will be malloc after taos_query_a called
- * and won't be freed until connection closed
- */
-HttpContext *httpCreateContext(HttpServer *pServer) {
-  HttpContext *pContext = (HttpContext *)taosMemPoolMalloc(pServer->pContextPool);
-  if (pContext != NULL) {
-    pContext->fromMemPool = 1;
-    httpTrace("context:%p, is malloced from mempool", pContext);
-  } else {
-    pContext = (HttpContext *)malloc(sizeof(HttpContext));
-    if (pContext == NULL) {
-      return NULL;
-    } else {
-      memset(pContext, 0, sizeof(HttpContext));
-    }
-    httpTrace("context:%p, is malloced from raw memory", pContext);
-  }
-
-  pContext->signature = pContext;
-  pContext->httpVersion = HTTP_VERSION_10;
-  pContext->lastAccessTime = taosGetTimestampSec();
-  pContext->state = HTTP_CONTEXT_STATE_READY;
-  return pContext;
-}
-
-void httpFreeContext(HttpServer *pServer, HttpContext *pContext) {
-  if (pContext->fromMemPool) {
-    httpTrace("context:%p, is freed from mempool", pContext);
-    taosMemPoolFree(pServer->pContextPool, (char *)pContext);
-  } else {
-    httpTrace("context:%p, is freed from raw memory", pContext);
-    tfree(pContext);
-  }
-}
-
-void httpCleanUpContextTimer(HttpContext *pContext) {
-  if (pContext->timer != NULL) {
-    taosTmrStopA(&pContext->timer);
-    //httpTrace("context:%p, ip:%s, close timer:%p", pContext, pContext->ipstr, pContext->timer);
-    pContext->timer = NULL;
-  }
-}
-
-void httpCleanUpContext(HttpContext *pContext, void *unused) {
-  httpTrace("context:%p, start the clean up operation, sig:%p", pContext, pContext->signature);
-  void *sig = atomic_val_compare_exchange_ptr(&pContext->signature, pContext, 0);
-  if (sig == NULL) {
-    httpTrace("context:%p is freed by another thread.", pContext);
-    return;
-  }
-
-  HttpThread *pThread = pContext->pThread;
-
-  httpCleanUpContextTimer(pContext);
-
-  httpRemoveContextFromEpoll(pThread, pContext);
-
-  httpRestoreSession(pContext);
-
-  pthread_mutex_lock(&pThread->threadMutex);
-
-  pThread->numOfFds--;
-  if (pThread->numOfFds < 0) {
-    httpError("context:%p, ip:%s, thread:%s, number of FDs:%d shall never be negative",
-              pContext, pContext->ipstr, pThread->label, pThread->numOfFds);
-    pThread->numOfFds = 0;
-  }
-
-  // remove from the link list
-  if (pContext->prev) {
-    (pContext->prev)->next = pContext->next;
-  } else {
-    pThread->pHead = pContext->next;
-  }
-
-  if (pContext->next) {
-    (pContext->next)->prev = pContext->prev;
-  }
-
-  pthread_mutex_unlock(&pThread->threadMutex);
-
-  httpTrace("context:%p, ip:%s, thread:%s, numOfFds:%d, context is cleaned up", pContext, pContext->ipstr,
-            pThread->label, pThread->numOfFds);
-
-  pContext->signature = 0;
-  pContext->fd = -1;
-  pContext->pThread = 0;
-  pContext->prev = 0;
-  pContext->next = 0;
-  pContext->state = HTTP_CONTEXT_STATE_READY;
-
-  // avoid double free
-  httpFreeJsonBuf(pContext);
-  httpFreeMultiCmds(pContext);
-  httpFreeContext(pThread->pServer, pContext);
-}
-
-bool httpInitContext(HttpContext *pContext) {
-  pContext->accessTimes++;
-  pContext->lastAccessTime = taosGetTimestampSec();
-  pContext->httpVersion = HTTP_VERSION_10;
-  pContext->httpKeepAlive = HTTP_KEEPALIVE_NO_INPUT;
-  pContext->httpChunked = HTTP_UNCUNKED;
-  pContext->acceptEncoding = HTTP_COMPRESS_IDENTITY;
-  pContext->contentEncoding = HTTP_COMPRESS_IDENTITY;
-  pContext->reqType = HTTP_REQTYPE_OTHERS;
-  pContext->encodeMethod = NULL;
-  pContext->timer = NULL;
-  memset(&pContext->singleCmd, 0, sizeof(HttpSqlCmd));
-
-  HttpParser *pParser = &pContext->parser;
-  memset(pParser, 0, sizeof(HttpParser));
-  pParser->pCur = pParser->pLast = pParser->buffer;
-
-  httpTrace("context:%p, fd:%d, ip:%s, thread:%s, accessTimes:%d, parsed:%d",
-          pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, pContext->accessTimes, pContext->parsed);
-  return true;
-}
-
-
-void httpCloseContext(HttpThread *pThread, HttpContext *pContext) {
-  taosTmrReset((TAOS_TMR_CALLBACK)httpCleanUpContext, HTTP_DELAY_CLOSE_TIME_MS, pContext, pThread->pServer->timerHandle, &pContext->timer);
-  httpTrace("context:%p, fd:%d, ip:%s, state:%s will be closed after:%d ms, timer:%p",
-          pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), HTTP_DELAY_CLOSE_TIME_MS, pContext->timer);
-}
-
-void httpCloseContextByApp(HttpContext *pContext) {
-  HttpThread *pThread = pContext->pThread;
-  pContext->parsed = false;
-
-  bool keepAlive = true;
-  if (pContext->httpVersion == HTTP_VERSION_10 && pContext->httpKeepAlive != HTTP_KEEPALIVE_ENABLE) {
-    keepAlive = false;
-  } else if (pContext->httpVersion != HTTP_VERSION_10 && pContext->httpKeepAlive == HTTP_KEEPALIVE_DISABLE) {
-    keepAlive = false;
-  } else {}
-
-  if (keepAlive) {
-    if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_HANDLING, HTTP_CONTEXT_STATE_READY)) {
-      httpTrace("context:%p, fd:%d, ip:%s, last state:handling, keepAlive:true, reuse connect",
-              pContext, pContext->fd, pContext->ipstr);
-    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_DROPPING, HTTP_CONTEXT_STATE_CLOSED)) {
-      httpRemoveContextFromEpoll(pThread, pContext);
-      httpTrace("context:%p, fd:%d, ip:%s, last state:dropping, keepAlive:true, close connect",
-              pContext, pContext->fd, pContext->ipstr);
-      httpCloseContext(pThread, pContext);
-    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_READY)) {
-      httpTrace("context:%p, fd:%d, ip:%s, last state:ready, keepAlive:true, reuse connect",
-              pContext, pContext->fd, pContext->ipstr);
-    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_CLOSED, HTTP_CONTEXT_STATE_CLOSED)) {
-      httpRemoveContextFromEpoll(pThread, pContext);
-      httpTrace("context:%p, fd:%d, ip:%s, last state:ready, keepAlive:true, close connect",
-                pContext, pContext->fd, pContext->ipstr);
-      httpCloseContext(pThread, pContext);
-    } else {
-      httpRemoveContextFromEpoll(pThread, pContext);
-      httpError("context:%p, fd:%d, ip:%s, last state:%s:%d, keepAlive:true, close connect",
-              pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->state);
-      httpCloseContext(pThread, pContext);
-    }
-  } else {
-    httpRemoveContextFromEpoll(pThread, pContext);
-    httpTrace("context:%p, fd:%d, ip:%s, last state:%s:%d, keepAlive:false, close connect",
-              pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->state);
-    httpCloseContext(pThread, pContext);
-  }
-}
-
-void httpCloseContextByServer(HttpThread *pThread, HttpContext *pContext) {
-  httpRemoveContextFromEpoll(pThread, pContext);
-  pContext->parsed = false;
-  
-  if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_HANDLING, HTTP_CONTEXT_STATE_DROPPING)) {
-    httpTrace("context:%p, fd:%d, ip:%s, epoll finished, still used by app", pContext, pContext->fd, pContext->ipstr);
-  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_DROPPING, HTTP_CONTEXT_STATE_DROPPING)) {
-    httpTrace("context:%p, fd:%d, ip:%s, epoll already finished, wait app finished", pContext, pContext->fd, pContext->ipstr);
-  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_CLOSED)) {
-    httpTrace("context:%p, fd:%d, ip:%s, epoll finished, close context", pContext, pContext->fd, pContext->ipstr);
-    httpCloseContext(pThread, pContext);
-  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_CLOSED, HTTP_CONTEXT_STATE_CLOSED)) {
-    httpTrace("context:%p, fd:%d, ip:%s, epoll finished, will be closed soon", pContext, pContext->fd, pContext->ipstr);
-    httpCloseContext(pThread, pContext);
-  } else {
-    httpError("context:%p, fd:%d, ip:%s, unknown state:%d", pContext, pContext->fd, pContext->ipstr, pContext->state);
-    httpCloseContext(pThread, pContext);
-  }
-}
-
-void httpCloseContextByServerForExpired(void *param, void *tmrId) {
-  HttpContext *pContext = (HttpContext *)param;
-  httpRemoveContextFromEpoll(pContext->pThread, pContext);
-  httpError("context:%p, fd:%d, ip:%s, read http body error, time expired, timer:%p", pContext, pContext->fd, pContext->ipstr, tmrId);
-  httpSendErrorResp(pContext, HTTP_PARSE_BODY_ERROR);
-  httpCloseContextByServer(pContext->pThread, pContext);
-}
-
-void httpCleanUpConnect(HttpServer *pServer) {
-  int         i;
-  HttpThread *pThread;
-
-  if (pServer == NULL) return;
-
-  pthread_cancel(pServer->thread);
-  pthread_join(pServer->thread, NULL);
-
-  for (i = 0; i < pServer->numOfThreads; ++i) {
-    pThread = pServer->pThreads + i;
-    taosCloseSocket(pThread->pollFd);
-
-    while (pThread->pHead) {
-      httpCleanUpContext(pThread->pHead, 0);
-    }
-
-    pthread_cancel(pThread->thread);
-    pthread_join(pThread->thread, NULL);
-    pthread_cond_destroy(&(pThread->fdReady));
-    pthread_mutex_destroy(&(pThread->threadMutex));
-  }
-
-  tfree(pServer->pThreads);
-  httpTrace("http server:%s is cleaned up", pServer->label);
-}
-
-// read all the data, then just discard it
-void httpReadDirtyData(HttpContext *pContext) {
-  int fd = pContext->fd;
-  char data[1024] = {0};
-  int  len = (int)taosReadSocket(fd, data, 1024);
-  while (len >= sizeof(data)) {
-    len = (int)taosReadSocket(fd, data, 1024);
-  }
-}
-
-bool httpReadDataImp(HttpContext *pContext) {
-  HttpParser *pParser = &pContext->parser;
-
-  while (pParser->bufsize <= (HTTP_BUFFER_SIZE - HTTP_STEP_SIZE)) {
-    int nread = (int)taosReadSocket(pContext->fd, pParser->buffer + pParser->bufsize, HTTP_STEP_SIZE);
-    if (nread >= 0 && nread < HTTP_STEP_SIZE) {
-      pParser->bufsize += nread;
-      break;
-    } else if (nread < 0) {
-      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
-        httpTrace("context:%p, fd:%d, ip:%s, read from socket error:%d, wait another event",
-                  pContext, pContext->fd, pContext->ipstr, errno);
-        break;
-      } else {
-        httpError("context:%p, fd:%d, ip:%s, read from socket error:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, errno);
-        return false;
-      }
-    } else {
-      pParser->bufsize += nread;
-    }
-
-    if (pParser->bufsize >= (HTTP_BUFFER_SIZE - HTTP_STEP_SIZE)) {
-      httpReadDirtyData(pContext);
-      httpError("context:%p, fd:%d, ip:%s, thread:%s, request big than:%d",
-                pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, HTTP_BUFFER_SIZE);
-      httpRemoveContextFromEpoll(pContext->pThread, pContext);
-      httpSendErrorResp(pContext, HTTP_REQUSET_TOO_BIG);
-      return false;
-    }
-  }
-
-  pParser->buffer[pParser->bufsize] = 0;
-
-  return true;
-}
-
-bool httpDecompressData(HttpContext *pContext) {
-  if (pContext->contentEncoding != HTTP_COMPRESS_GZIP) {
-    httpDump("context:%p, fd:%d, ip:%s, content:%s", pContext, pContext->fd, pContext->ipstr, pContext->parser.data.pos);
-    return true;
-  }
-
-  char   *decompressBuf = calloc(HTTP_DECOMPRESS_BUF_SIZE, 1);
-  int32_t decompressBufLen = HTTP_DECOMPRESS_BUF_SIZE;
-  size_t  bufsize = sizeof(pContext->parser.buffer) - (pContext->parser.data.pos - pContext->parser.buffer) - 1;
-  if (decompressBufLen > (int)bufsize) {
-    decompressBufLen = (int)bufsize;
-  }
-
-  int ret = httpGzipDeCompress(pContext->parser.data.pos, pContext->parser.data.len, decompressBuf, &decompressBufLen);
-
-  if (ret == 0) {
-    memcpy(pContext->parser.data.pos, decompressBuf, decompressBufLen);
-    pContext->parser.data.pos[decompressBufLen] = 0;
-    httpDump("context:%p, fd:%d, ip:%s, rawSize:%d, decompressSize:%d, content:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->parser.data.len, decompressBufLen,  decompressBuf);
-    pContext->parser.data.len = decompressBufLen;
-  } else {
-    httpError("context:%p, fd:%d, ip:%s, failed to decompress data, rawSize:%d, error:%d",
-              pContext, pContext->fd, pContext->ipstr, pContext->parser.data.len, ret);
-  }
-
-  free(decompressBuf);
-  return ret == 0;
-}
-
-bool httpReadData(HttpThread *pThread, HttpContext *pContext) {
-  if (!pContext->parsed) {
-    httpInitContext(pContext);
-  }
-
-  if (!httpReadDataImp(pContext)) {
-    httpCloseContextByServer(pThread, pContext);
-    return false;
-  }
-
-  if (!httpParseRequest(pContext)) {
-    httpCloseContextByServer(pThread, pContext);
-    return false;
-  }
-
-  int ret = httpCheckReadCompleted(pContext);
-  if (ret == HTTP_CHECK_BODY_CONTINUE) {
-    taosTmrReset(httpCloseContextByServerForExpired, HTTP_EXPIRED_TIME, pContext, pThread->pServer->timerHandle, &pContext->timer);
-    //httpTrace("context:%p, fd:%d, ip:%s, not finished yet, try another times, timer:%p", pContext, pContext->fd, pContext->ipstr, pContext->timer);
-    return false;
-  } else if (ret == HTTP_CHECK_BODY_SUCCESS){
-    httpCleanUpContextTimer(pContext);
-    httpTrace("context:%p, fd:%d, ip:%s, thread:%s, read size:%d, dataLen:%d",
-              pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, pContext->parser.bufsize, pContext->parser.data.len);
-    if (httpDecompressData(pContext)) {
-      return true;
-    } else {
-      httpCloseContextByServer(pThread, pContext);
-      return false;
-    }
-  } else {
-    httpCleanUpContextTimer(pContext);
-    httpError("context:%p, fd:%d, ip:%s, failed to read http body, close connect", pContext, pContext->fd, pContext->ipstr);
-    httpCloseContextByServer(pThread, pContext);
-    return false;
-  }
-}
-
-void httpProcessHttpData(void *param) {
-  HttpThread  *pThread = (HttpThread *)param;
-  HttpContext *pContext;
-  int          fdNum;
-
-  sigset_t set;
-  sigemptyset(&set);
-  sigaddset(&set, SIGPIPE);
-  pthread_sigmask(SIG_SETMASK, &set, NULL);
-
-  while (1) {
-    pthread_mutex_lock(&pThread->threadMutex);
-    if (pThread->numOfFds < 1) {
-      pthread_cond_wait(&pThread->fdReady, &pThread->threadMutex);
-    }
-    pthread_mutex_unlock(&pThread->threadMutex);
-
-    struct epoll_event events[HTTP_MAX_EVENTS];
-    //-1 means uncertainty, 0-nowait, 1-wait 1 ms, set it from -1 to 1
-    fdNum = epoll_wait(pThread->pollFd, events, HTTP_MAX_EVENTS, 1);
-    if (fdNum <= 0) continue;
-
-    for (int i = 0; i < fdNum; ++i) {
-      pContext = events[i].data.ptr;
-      if (pContext->signature != pContext || pContext->pThread != pThread || pContext->fd <= 0) {
-        continue;
-      }
-
-      if (events[i].events & EPOLLPRI) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, EPOLLPRI events occured, accessed:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->accessTimes);
-        httpRemoveContextFromEpoll(pThread, pContext);
-        httpCloseContextByServer(pThread, pContext);
-        continue;
-      }
-
-      if (events[i].events & EPOLLRDHUP) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, EPOLLRDHUP events occured, accessed:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->accessTimes);
-        httpRemoveContextFromEpoll(pThread, pContext);
-        httpCloseContextByServer(pThread, pContext);
-        continue;
-      }
-
-      if (events[i].events & EPOLLERR) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, EPOLLERR events occured, accessed:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->accessTimes);
-        httpRemoveContextFromEpoll(pThread, pContext);
-        httpCloseContextByServer(pThread, pContext);
-        continue;
-      }
-
-      if (events[i].events & EPOLLHUP) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, EPOLLHUP events occured, accessed:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->accessTimes);
-        httpRemoveContextFromEpoll(pThread, pContext);
-        httpCloseContextByServer(pThread, pContext);
-        continue;
-      }
-
-      if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_READY)) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, not in ready state, ignore read events",
-                pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state));
-        continue;
-      }
-
-      if (!pContext->pThread->pServer->online) {
-        httpTrace("context:%p, fd:%d, ip:%s, state:%s, server is not online, accessed:%d, close connect",
-                  pContext, pContext->fd, pContext->ipstr, httpContextStateStr(pContext->state), pContext->accessTimes);
-        httpRemoveContextFromEpoll(pThread, pContext);
-        httpReadDirtyData(pContext);
-        httpSendErrorResp(pContext, HTTP_SERVER_OFFLINE);
-        httpCloseContextByServer(pThread, pContext);
-        continue;
-      } else {
-        if (httpReadData(pThread, pContext)) {
-          (*(pThread->processData))(pContext);
-          atomic_fetch_add_32(&pThread->pServer->requestNum, 1);
-        }
-      }
-    }
-  }
-}
-
-void httpAcceptHttpConnection(void *arg) {
-  int                connFd = -1;
-  struct sockaddr_in clientAddr;
-  int                sockFd;
-  int                threadId = 0;
-  HttpThread *       pThread;
-  HttpServer *       pServer;
-  HttpContext *      pContext;
-  int                totalFds;
-
-  pServer = (HttpServer *)arg;
-
-  sigset_t set;
-  sigemptyset(&set);
-  sigaddset(&set, SIGPIPE);
-  pthread_sigmask(SIG_SETMASK, &set, NULL);
-
-  sockFd = taosOpenTcpServerSocket(pServer->serverIp, pServer->serverPort);
-
-  if (sockFd < 0) {
-    httpError("http server:%s, failed to open http socket, ip:%s:%u", pServer->label, pServer->serverIp,
-              pServer->serverPort);
-    return;
-  } else {
-    httpPrint("http service init success at ip:%s:%u", pServer->serverIp, pServer->serverPort);
-    pServer->online = true;
-  }
-
-  while (1) {
-    socklen_t addrlen = sizeof(clientAddr);
-    connFd = (int)accept(sockFd, (struct sockaddr *)&clientAddr, &addrlen);
-
-    if (connFd < 3) {
-      httpError("http server:%s, accept connect failure, errno:%d, reason:%s", pServer->label, errno, strerror(errno));
-      continue;
-    }
-
-    totalFds = 1;
-    for (int i = 0; i < pServer->numOfThreads; ++i) {
-      totalFds += pServer->pThreads[i].numOfFds;
-    }
-
-    if (totalFds > tsHttpCacheSessions * 100) {
-      httpError("fd:%d, ip:%s:%u, totalFds:%d larger than httpCacheSessions:%d*100, refuse connection",
-              connFd, inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port), totalFds, tsHttpCacheSessions);
-      taosCloseSocket(connFd);
-      continue;
-    }
-
-    taosKeepTcpAlive(connFd);
-    taosSetNonblocking(connFd, 1);
-
-    // pick up the thread to handle this connection
-    pThread = pServer->pThreads + threadId;
-
-    pContext = httpCreateContext(pServer);
-    if (pContext == NULL) {
-      httpError("fd:%d, ip:%s:%u, no enough resource to allocate http context", connFd, inet_ntoa(clientAddr.sin_addr),
-                htons(clientAddr.sin_port));
-      taosCloseSocket(connFd);
-      continue;
-    }
-
-    httpTrace("context:%p, fd:%d, ip:%s:%u, thread:%s, numOfFds:%d, totalFds:%d, accept a new connection",
-            pContext, connFd, inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port), pThread->label,
-            pThread->numOfFds, totalFds);
-
-    pContext->fd = connFd;
-    sprintf(pContext->ipstr, "%s:%d", inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port));
-    pContext->pThread = pThread;
-
-    struct epoll_event event;
-    event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
-
-    event.data.ptr = pContext;
-    if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {
-      httpError("context:%p, fd:%d, ip:%s:%u, thread:%s, failed to add http fd for epoll, error:%s",
-                pContext, connFd, inet_ntoa(clientAddr.sin_addr), htons(clientAddr.sin_port), pThread->label,
-                strerror(errno));
-      httpFreeContext(pThread->pServer, pContext);
-      tclose(connFd);
-      continue;
-    }
-
-    // notify the data process, add into the FdObj list
-    pthread_mutex_lock(&(pThread->threadMutex));
-
-    pContext->next = pThread->pHead;
-
-    if (pThread->pHead) (pThread->pHead)->prev = pContext;
-
-    pThread->pHead = pContext;
-
-    pThread->numOfFds++;
-    pthread_cond_signal(&pThread->fdReady);
-
-    pthread_mutex_unlock(&(pThread->threadMutex));
-
-    // pick up next thread for next connection
-    threadId++;
-    threadId = threadId % pServer->numOfThreads;
-  }
-}
-
-bool httpInitConnect(HttpServer *pServer) {
-  int            i;
-  pthread_attr_t thattr;
-  HttpThread *   pThread;
-
-  pServer->pThreads = (HttpThread *)malloc(sizeof(HttpThread) * (size_t)pServer->numOfThreads);
-  if (pServer->pThreads == NULL) {
-    httpError("init error no enough memory");
-    return false;
-  }
-  memset(pServer->pThreads, 0, sizeof(HttpThread) * (size_t)pServer->numOfThreads);
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
-  pThread = pServer->pThreads;
-  for (i = 0; i < pServer->numOfThreads; ++i) {
-    sprintf(pThread->label, "%s%d", pServer->label, i);
-    pThread->pServer = pServer;
-    pThread->processData = pServer->processData;
-    pThread->threadId = i;
-
-    if (pthread_mutex_init(&(pThread->threadMutex), NULL) < 0) {
-      httpError("http thread:%s, failed to init HTTP process data mutex, reason:%s", pThread->label, strerror(errno));
-      return false;
-    }
-
-    if (pthread_cond_init(&(pThread->fdReady), NULL) != 0) {
-      httpError("http thread:%s, init HTTP condition variable failed, reason:%s", pThread->label, strerror(errno));
-      return false;
-    }
-
-    pThread->pollFd = epoll_create(HTTP_MAX_EVENTS);  // size does not matter
-    if (pThread->pollFd < 0) {
-      httpError("http thread:%s, failed to create HTTP epoll", pThread->label);
-      return false;
-    }
-
-    if (pthread_create(&(pThread->thread), &thattr, (void *)httpProcessHttpData, (void *)(pThread)) != 0) {
-      httpError("http thread:%s, failed to create HTTP process data thread, reason:%s",
-                pThread->label, strerror(errno));
-      return false;
-    }
-
-    httpTrace("http thread:%p:%s, initialized", pThread, pThread->label);
-    pThread++;
-  }
-
-  if (pthread_create(&(pServer->thread), &thattr, (void *)httpAcceptHttpConnection, (void *)(pServer)) != 0) {
-    httpError("http server:%s, failed to create Http accept thread, reason:%s", pServer->label, strerror(errno));
-    return false;
-  }
-
-  pthread_attr_destroy(&thattr);
-
-  httpTrace("http server:%s, initialized, ip:%s:%u, numOfThreads:%d", pServer->label, pServer->serverIp,
-            pServer->serverPort, pServer->numOfThreads);
-  return true;
-}
diff --git a/src/modules/http/src/httpSession.c b/src/modules/http/src/httpSession.c
deleted file mode 100644
index 568936ede64c24250c16f590afd5a54378979ed3..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpSession.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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 <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#include "shash.h"
-#include "taos.h"
-#include "ttime.h"
-#include "ttimer.h"
-
-void httpAccessSession(HttpContext *pContext) {
-  HttpServer *server = pContext->pThread->pServer;
-  pthread_mutex_lock(&server->serverMutex);
-  if (pContext->session == pContext->session->signature) {
-    pContext->session->expire = (int) taosGetTimestampSec() + pContext->pThread->pServer->sessionExpire;
-  }
-  pthread_mutex_unlock(&server->serverMutex);
-}
-
-void httpCreateSession(HttpContext *pContext, void *taos) {
-  HttpServer *server = pContext->pThread->pServer;
-  pthread_mutex_lock(&server->serverMutex);
-
-  if (pContext->session != NULL && pContext->session == pContext->session->signature) {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, set exist session:%p:%p expired", pContext, pContext->fd,
-              pContext->ipstr, pContext->user, pContext->session, pContext->session->taos);
-    pContext->session->expire = 0;
-    pContext->session->access--;
-  }
-
-  HttpSession session;
-  session.taos = taos;
-  session.expire = (int)taosGetTimestampSec() + server->sessionExpire;
-  session.access = 1;
-  snprintf(session.id, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
-  pContext->session = (HttpSession *)taosAddStrHash(server->pSessionHash, session.id, (char *)(&session));
-  if (pContext->session == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, error:%s", pContext, pContext->fd, pContext->ipstr, pContext->user,
-              httpMsg[HTTP_SESSION_FULL]);
-    taos_close(taos);
-    pthread_mutex_unlock(&server->serverMutex);
-    return;
-  }
-
-  pContext->session->signature = pContext->session;
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, create a new session:%p:%p", pContext, pContext->fd, pContext->ipstr,
-            pContext->user, pContext->session, pContext->session->taos);
-  pthread_mutex_unlock(&server->serverMutex);
-}
-
-void httpFetchSessionImp(HttpContext *pContext) {
-  HttpServer *server = pContext->pThread->pServer;
-  pthread_mutex_lock(&server->serverMutex);
-
-  char sessionId[HTTP_SESSION_ID_LEN];
-  snprintf(sessionId, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
-
-  pContext->session = (HttpSession *)taosGetStrHashData(server->pSessionHash, sessionId);
-  if (pContext->session != NULL && pContext->session == pContext->session->signature) {
-    pContext->session->access++;
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, find an exist session:%p:%p, access:%d, expire:%d",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, pContext->session,
-              pContext->session->taos, pContext->session->access, pContext->session->expire);
-    pContext->session->expire = (int)taosGetTimestampSec() + server->sessionExpire;
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, session not found", pContext, pContext->fd, pContext->ipstr,
-              pContext->user);
-  }
-
-  pthread_mutex_unlock(&server->serverMutex);
-}
-
-void httpFetchSession(HttpContext *pContext) {
-  if (pContext->session == NULL) {
-    httpFetchSessionImp(pContext);
-  } else {
-    char sessionId[HTTP_SESSION_ID_LEN];
-    snprintf(sessionId, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
-    if (strcmp(pContext->session->id, sessionId) != 0) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, password may be changed", pContext, pContext->fd, pContext->ipstr, pContext->user);
-      httpRestoreSession(pContext);
-      httpFetchSessionImp(pContext);
-    }
-  }
-}
-
-void httpRestoreSession(HttpContext *pContext) {
-  HttpServer * server = pContext->pThread->pServer;
-
-  // all access to the session is via serverMutex
-  pthread_mutex_lock(&server->serverMutex);
-  HttpSession *session = pContext->session;
-  if (session == NULL || session != session->signature) {
-    pthread_mutex_unlock(&server->serverMutex);
-    return;
-  }
-  session->access--;
-  httpTrace("context:%p, ip:%s, user:%s, restore session:%p:%p, access:%d, expire:%d",
-            pContext, pContext->ipstr, pContext->user, session, session->taos,
-            session->access, pContext->session->expire);
-  pContext->session = NULL;
-  pthread_mutex_unlock(&server->serverMutex);
-}
-
-void httpResetSession(char *session) {
-  HttpSession *pSession = (HttpSession *)session;
-  httpTrace("close session:%p:%p", pSession, pSession->taos);
-  if (pSession->taos != NULL) {
-    taos_close(pSession->taos);
-    pSession->taos = NULL;
-  }
-  pSession->signature = NULL;
-}
-
-void httpRemoveAllSessions(HttpServer *pServer) {
-  if (pServer->pSessionHash != NULL) {
-    taosCleanUpStrHashWithFp(pServer->pSessionHash, httpResetSession);
-    pServer->pSessionHash = NULL;
-  }
-}
-
-bool httpInitAllSessions(HttpServer *pServer) {
-  if (pServer->pSessionHash == NULL) {
-    pServer->pSessionHash = taosInitStrHash(100, sizeof(HttpSession), taosHashStringStep1);
-  }
-  if (pServer->pSessionHash == NULL) {
-    httpError("http init session pool failed");
-    return false;
-  }
-  if (pServer->expireTimer == NULL) {
-    taosTmrReset(httpProcessSessionExpire, 50000, pServer, pServer->timerHandle, &pServer->expireTimer);
-  }
-
-  return true;
-}
-
-int httpSessionExpired(char *session) {
-  HttpSession *pSession = (HttpSession *)session;
-  time_t       cur = taosGetTimestampSec();
-
-  if (pSession->taos != NULL) {
-    if (pSession->expire > cur) {
-      return 0;  // un-expired, so return false
-    }
-    if (pSession->access > 0) {
-      httpTrace("session:%p:%p is expired, but still access:%d", pSession, pSession->taos,
-                pSession->access);
-      return 0;  // still used, so return false
-    }
-    httpTrace("need close session:%p:%p for it expired, cur:%d, expire:%d, invertal:%d",
-              pSession, pSession->taos, cur, pSession->expire, cur - pSession->expire);
-  }
-
-  return 1;
-}
-
-void httpRemoveExpireSessions(HttpServer *pServer) {
-  int expiredNum = 0;
-  do {
-    pthread_mutex_lock(&pServer->serverMutex);
-
-    HttpSession *pSession = (HttpSession *)taosVisitStrHashWithFp(pServer->pSessionHash, httpSessionExpired);
-    if (pSession == NULL) {
-      pthread_mutex_unlock(&pServer->serverMutex);
-      break;
-    }
-
-    httpResetSession((char *)pSession);
-    taosDeleteStrHashNode(pServer->pSessionHash, pSession->id, pSession);
-
-    pthread_mutex_unlock(&pServer->serverMutex);
-
-    if (++expiredNum > 10) {
-      break;
-    }
-  } while (true);
-}
-
-void httpProcessSessionExpire(void *handle, void *tmrId) {
-  HttpServer *pServer = (HttpServer *)handle;
-  httpRemoveExpireSessions(pServer);
-  taosTmrReset(httpProcessSessionExpire, 60000, pServer, pServer->timerHandle, &pServer->expireTimer);
-}
\ No newline at end of file
diff --git a/src/modules/http/src/httpSql.c b/src/modules/http/src/httpSql.c
deleted file mode 100644
index 4696e80dc785112a8345e6a74f42dd86e0295fa7..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpSql.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * 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 <arpa/inet.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-#include "taos.h"
-#include "tsclient.h"
-#include "tnote.h"
-
-void *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 httpProcessMultiSql(HttpContext *pContext);
-
-void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows) {
-  HttpContext *pContext = (HttpContext *)param;
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  HttpSqlCmds *     multiCmds = pContext->multiCmds;
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-
-  HttpSqlCmd *singleCmd = multiCmds->cmds + multiCmds->pos;
-  char *      sql = httpGetCmdsString(pContext, singleCmd->sql);
-
-  bool isContinue = false;
-
-  if (numOfRows > 0) {
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->buildQueryJsonFp) {
-      isContinue = (encode->buildQueryJsonFp)(pContext, singleCmd, result, numOfRows);
-    }
-  }
-
-  if (isContinue) {
-    // retrieve next batch of rows
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, continue retrieve, numOfRows:%d, sql:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, numOfRows, sql);
-    taos_fetch_rows_a(result, httpProcessMultiSqlRetrieveCallBack, param);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, stop retrieve, numOfRows:%d, sql:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, numOfRows, sql);
-
-    if (numOfRows < 0) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, retrieve failed code:%d, sql:%s",
-                pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, -numOfRows, sql);
-    } else {
-      taos_free_result(result);
-    }
-
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->stopJsonFp) {
-      (encode->stopJsonFp)(pContext, singleCmd);
-    }
-    multiCmds->pos++;
-    httpProcessMultiSql(pContext);
-  }
-}
-
-void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
-  HttpContext *pContext = (HttpContext *)param;
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  HttpSqlCmds *     multiCmds = pContext->multiCmds;
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-
-  HttpSqlCmd *singleCmd = multiCmds->cmds + multiCmds->pos;
-  char *      sql = httpGetCmdsString(pContext, singleCmd->sql);
-
-  if (-code == TSDB_CODE_ACTION_IN_PROGRESS) {
-    httpWarn("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, code:%d:inprogress, sql:%s",
-             pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, -code, sql);
-    return;
-  }
-
-  if (code < 0) {
-    if (encode->checkFinishedFp != NULL && !encode->checkFinishedFp(pContext, singleCmd, code >= 0 ? 0 : -code)) {
-      singleCmd->code = -code;
-      httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos jump to:%d, last code:%d, last sql:%s",
-                pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos + 1, -code, sql);
-    } else {
-      singleCmd->code = -code;
-      httpError("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, error code:%d, sql:%s",
-                pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, -code, sql);
-
-      if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN) {
-        if (encode->startJsonFp) (encode->startJsonFp)(pContext, singleCmd, result);
-        if (encode->stopJsonFp) (encode->stopJsonFp)(pContext, singleCmd);
-      }
-    }
-    multiCmds->pos++;
-    httpProcessMultiSql(pContext);
-    return;
-  }
-
-  if (result == NULL) {
-    // not select or show commands
-    int affectRows = code;
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, affect rows:%d, sql:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, affectRows, sql);
-
-    singleCmd->code = 0;
-
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->startJsonFp) {
-      (encode->startJsonFp)(pContext, singleCmd, result);
-    }
-
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->buildAffectRowJsonFp) {
-      (encode->buildAffectRowJsonFp)(pContext, singleCmd, affectRows);
-    }
-
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->stopJsonFp) {
-      (encode->stopJsonFp)(pContext, singleCmd);
-    }
-
-    if (encode->setNextCmdFp) {
-      (encode->setNextCmdFp)(pContext, singleCmd, code);
-    } else {
-      multiCmds->pos++;
-    }
-
-    httpProcessMultiSql(pContext);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, start retrieve, sql:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, sql);
-
-    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->startJsonFp) {
-      (encode->startJsonFp)(pContext, singleCmd, result);
-    }
-    taos_fetch_rows_a(result, httpProcessMultiSqlRetrieveCallBack, pContext);
-  }
-}
-
-void httpProcessMultiSql(HttpContext *pContext) {
-  HttpSqlCmds *     multiCmds = pContext->multiCmds;
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-
-  if (multiCmds->pos >= multiCmds->size) {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, size:%d, stop mulit-querys",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, multiCmds->size);
-    if (encode->cleanJsonFp) {
-      (encode->cleanJsonFp)(pContext);
-    }
-    httpCloseContextByApp(pContext);
-    return;
-  }
-
-  HttpSqlCmd *cmd = multiCmds->cmds + multiCmds->pos;
-
-  char *sql = httpGetCmdsString(pContext, cmd->sql);
-  httpDump("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, start query, sql:%s", pContext, pContext->fd,
-           pContext->ipstr, pContext->user, multiCmds->pos, sql);
-  taosNotePrintHttp(sql);
-  taos_query_a(pContext->session->taos, sql, httpProcessMultiSqlCallBack, (void *)pContext);
-}
-
-void httpProcessMultiSqlCmd(HttpContext *pContext) {
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  if (multiCmds == NULL || multiCmds->size <= 0 || multiCmds->pos >= multiCmds->size || multiCmds->pos < 0) {
-    httpSendErrorResp(pContext, HTTP_INVALID_MULTI_REQUEST);
-    return;
-  }
-
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, start multi-querys pos:%d, size:%d", pContext, pContext->fd,
-            pContext->ipstr, pContext->user, multiCmds->pos, multiCmds->size);
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-  if (encode->initJsonFp) {
-    (encode->initJsonFp)(pContext);
-  }
-
-  httpProcessMultiSql(pContext);
-}
-
-void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows) {
-  HttpContext *pContext = (HttpContext *)param;
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-
-  bool isContinue = false;
-
-  if (numOfRows > 0) {
-    if (encode->buildQueryJsonFp) {
-      isContinue = (encode->buildQueryJsonFp)(pContext, &pContext->singleCmd, result, numOfRows);
-    }
-  }
-
-  if (isContinue) {
-    // retrieve next batch of rows
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, continue retrieve, numOfRows:%d", pContext, pContext->fd,
-              pContext->ipstr, pContext->user, numOfRows);
-    taos_fetch_rows_a(result, httpProcessSingleSqlRetrieveCallBack, param);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, stop retrieve, numOfRows:%d", pContext, pContext->fd, pContext->ipstr,
-              pContext->user, numOfRows);
-
-    if (numOfRows < 0) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, retrieve failed, code:%d", pContext, pContext->fd, pContext->ipstr,
-                pContext->user, -numOfRows);
-    } else {
-      taos_free_result(result);
-    }
-
-    if (encode->stopJsonFp) {
-      (encode->stopJsonFp)(pContext, &pContext->singleCmd);
-    }
-
-    httpCloseContextByApp(pContext);
-  }
-}
-
-void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
-  HttpContext *pContext = (HttpContext *)param;
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-
-  if (-code == TSDB_CODE_ACTION_IN_PROGRESS) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%d:inprogress, sqlObj:%p",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, pContext->session->taos, -code, (SSqlObj *)result);
-    return;
-  }
-
-  if (code < 0) {
-    SSqlObj *pObj = (SSqlObj *)result;
-    if (-code == TSDB_CODE_INVALID_SQL) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%d:invalidsql, sqlObj:%p, error:%s",
-                pContext, pContext->fd, pContext->ipstr, pContext->user, pContext->session->taos, -code, pObj, pObj->cmd.payload);
-      httpSendTaosdInvalidSqlErrorResp(pContext, pObj->cmd.payload);
-    } else {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, query error, taos:%p, code:%d, sqlObj:%p",
-                pContext, pContext->fd, pContext->ipstr, pContext->user, pContext->session->taos, -code, pObj);
-      httpSendTaosdErrorResp(pContext, -code);
-    }
-    return;
-  }
-
-  if (result == NULL) {
-    // not select or show commands
-    int affectRows = code;
-
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, affect rows:%d, stop query, sqlObj:%p",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, affectRows, result);
-
-    if (encode->startJsonFp) {
-      (encode->startJsonFp)(pContext, &pContext->singleCmd, result);
-    }
-
-    if (encode->buildAffectRowJsonFp) {
-      (encode->buildAffectRowJsonFp)(pContext, &pContext->singleCmd, affectRows);
-    }
-
-    if (encode->stopJsonFp) {
-      (encode->stopJsonFp)(pContext, &pContext->singleCmd);
-    }
-
-    httpCloseContextByApp(pContext);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, start retrieve", pContext, pContext->fd, pContext->ipstr,
-              pContext->user);
-
-    if (encode->startJsonFp) {
-      (encode->startJsonFp)(pContext, &pContext->singleCmd, result);
-    }
-
-    taos_fetch_rows_a(result, httpProcessSingleSqlRetrieveCallBack, pContext);
-  }
-}
-
-void httpProcessSingleSqlCmd(HttpContext *pContext) {
-  HttpSqlCmd * cmd = &pContext->singleCmd;
-  char *       sql = cmd->nativSql;
-  HttpSession *pSession = pContext->session;
-
-  if (sql == NULL || sql[0] == 0) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, error:no sql input", pContext, pContext->fd, pContext->ipstr,
-              pContext->user);
-    httpSendErrorResp(pContext, HTTP_NO_SQL_INPUT);
-    return;
-  }
-
-  httpDump("context:%p, fd:%d, ip:%s, user:%s, start query, sql:%s", pContext, pContext->fd, pContext->ipstr,
-           pContext->user, sql);
-  taosNotePrintHttp(sql);
-  taos_query_a(pSession->taos, sql, httpProcessSingleSqlCallBack, (void *)pContext);
-}
-
-void httpProcessLoginCmd(HttpContext *pContext) {
-  char token[128] = {0};
-  if (!httpGenTaosdAuthToken(pContext, token, 128)) {
-    httpSendErrorResp(pContext, HTTP_GEN_TAOSD_TOKEN_ERR);
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, login via http, return token:%s",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, token);
-    httpSendSuccResp(pContext, token);
-  }
-}
-
-void httpProcessHeartBeatCmd(HttpContext *pContext) {
-  HttpEncodeMethod *encode = pContext->encodeMethod;
-  if (encode->startJsonFp) {
-    (encode->startJsonFp)(pContext, &pContext->singleCmd, NULL);
-  }
-  if (encode->stopJsonFp) {
-    (encode->stopJsonFp)(pContext, &pContext->singleCmd);
-  }
-  httpCloseContextByApp(pContext);
-}
-
-void httpExecCmd(HttpContext *pContext) {
-  switch (pContext->reqType) {
-    case HTTP_REQTYPE_LOGIN:
-      httpProcessLoginCmd(pContext);
-      break;
-    case HTTP_REQTYPE_SINGLE_SQL:
-      httpProcessSingleSqlCmd(pContext);
-      break;
-    case HTTP_REQTYPE_MULTI_SQL:
-      httpProcessMultiSqlCmd(pContext);
-      break;
-    case HTTP_REQTYPE_HEARTBEAT:
-      httpProcessHeartBeatCmd(pContext);
-      break;
-    case HTTP_REQTYPE_OTHERS:
-      httpCloseContextByApp(pContext);
-      break;
-    default:
-      httpCloseContextByApp(pContext);
-      break;
-  }
-}
-
-void httpProcessRequestCb(void *param, TAOS_RES *result, int code) {
-  HttpContext *pContext = param;
-  if (pContext == NULL || pContext->signature != pContext) return;
-
-  if (code < 0) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, login error, code:%d", pContext, pContext->fd, pContext->ipstr,
-              pContext->user, -code);
-    httpSendTaosdErrorResp(pContext, -code);
-    return;
-  }
-
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, connect tdengine success, taos:%p", pContext, pContext->fd,
-            pContext->ipstr, pContext->user, pContext->taos);
-  if (pContext->taos == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, login error, taos is empty", pContext, pContext->fd, pContext->ipstr,
-              pContext->user);
-    httpSendErrorResp(pContext, HTTP_NO_ENOUGH_SESSIONS);
-    return;
-  }
-
-  httpCreateSession(pContext, pContext->taos);
-
-  if (pContext->session == NULL) {
-    httpSendErrorResp(pContext, HTTP_SESSION_FULL);
-    httpCloseContextByApp(pContext);
-  } else {
-    httpExecCmd(pContext);
-  }
-}
-
-void httpProcessRequest(HttpContext *pContext) {
-  httpFetchSession(pContext);
-
-  if (pContext->session == NULL || pContext->session != pContext->session->signature ||
-      pContext->reqType == HTTP_REQTYPE_LOGIN) {
-    taos_connect_a(NULL, pContext->user, pContext->pass, "", 0, httpProcessRequestCb, (void *)pContext,
-                   &(pContext->taos));
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, try connect tdengine, taos:%p", pContext, pContext->fd,
-              pContext->ipstr, pContext->user, pContext->taos);
-  } else {
-    httpAccessSession(pContext);
-    httpExecCmd(pContext);
-  }
-}
diff --git a/src/modules/http/src/httpSystem.c b/src/modules/http/src/httpSystem.c
deleted file mode 100644
index efc24c15dd68fbd6105f896bf07ea48ed1db95c4..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpSystem.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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 <arpa/inet.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-#include "shash.h"
-#include "taos.h"
-#include "tglobalcfg.h"
-#include "tsocket.h"
-#include "ttimer.h"
-
-#include "gcHandle.h"
-#include "httpHandle.h"
-#include "restHandle.h"
-#include "tgHandle.h"
-
-#ifdef CLUSTER
-  void adminInitHandle(HttpServer* pServer);
-  void opInitHandle(HttpServer* pServer);
-#else
-  void adminInitHandle(HttpServer* pServer) {}
-  void opInitHandle(HttpServer* pServer) {}
-#endif
-
-static HttpServer *httpServer = NULL;
-void taosInitNote(int numOfNoteLines, int maxNotes, char* lable);
-
-int httpInitSystem() {
-  taos_init();
-
-  httpServer = (HttpServer *)malloc(sizeof(HttpServer));
-  memset(httpServer, 0, sizeof(HttpServer));
-
-  strcpy(httpServer->label, "rest");
-  strcpy(httpServer->serverIp, tsHttpIp);
-  httpServer->serverPort = tsHttpPort;
-  httpServer->cacheContext = tsHttpCacheSessions;
-  httpServer->sessionExpire = tsHttpSessionExpire;
-  httpServer->numOfThreads = tsHttpMaxThreads;
-  httpServer->processData = httpProcessData;
-
-  pthread_mutex_init(&httpServer->serverMutex, NULL);
-
-  if (tsHttpEnableRecordSql != 0) {
-    taosInitNote(tsNumOfLogLines / 10, 1, (char*)"http_note");
-  }
-  restInitHandle(httpServer);
-  adminInitHandle(httpServer);
-  gcInitHandle(httpServer);
-  tgInitHandle(httpServer);
-  opInitHandle(httpServer);
-
-  return 0;
-}
-
-int httpStartSystem() {
-  httpPrint("starting to initialize http service ...");
-
-  if (httpServer == NULL) {
-    httpError("http server is null");
-    httpInitSystem();
-  }
-
-  if (httpServer->pContextPool == NULL) {
-    httpServer->pContextPool = taosMemPoolInit(httpServer->cacheContext, sizeof(HttpContext));
-  }
-  if (httpServer->pContextPool == NULL) {
-    httpError("http init context pool failed");
-    return -1;
-  }
-
-  if (httpServer->timerHandle == NULL) {
-    httpServer->timerHandle = taosTmrInit(tsHttpCacheSessions * 100 + 100, 200, 60000, "http");
-  }
-  if (httpServer->timerHandle == NULL) {
-    httpError("http init timer failed");
-    return -1;
-  }
-
-  if (!httpInitAllSessions(httpServer)) {
-    httpError("http init session failed");
-    return -1;
-  }
-
-  if (!httpInitConnect(httpServer)) {
-    httpError("http init server failed");
-    return -1;
-  }
-
-  return 0;
-}
-
-void httpStopSystem() {
-  if (httpServer != NULL) {
-    httpServer->online = false;
-  }
-}
-
-void httpCleanUpSystem() {
-  httpPrint("http service cleanup");
-  httpStopSystem();
-#if 0
-  if (httpServer == NULL) {
-    return;
-  }
-
-  if (httpServer->expireTimer != NULL) {
-    taosTmrStopA(&(httpServer->expireTimer));
-  }
-
-  if (httpServer->timerHandle != NULL) {
-    taosTmrCleanUp(httpServer->timerHandle);
-    httpServer->timerHandle = NULL;
-  }
-
-  httpCleanUpConnect(httpServer);
-  httpRemoveAllSessions(httpServer);
-
-  if (httpServer->pContextPool != NULL) {
-    taosMemPoolCleanUp(httpServer->pContextPool);
-    httpServer->pContextPool = NULL;
-  }
-
-  pthread_mutex_destroy(&httpServer->serverMutex);
-
-  tfree(httpServer);
-#endif
-}
-
-void httpGetReqCount(int32_t *httpReqestNum) {
-  if (httpServer != NULL) {
-    *httpReqestNum = atomic_exchange_32(&httpServer->requestNum, 0);
-  } else {
-    *httpReqestNum = 0;
-  }
-}
diff --git a/src/modules/http/src/httpUtil.c b/src/modules/http/src/httpUtil.c
deleted file mode 100644
index b0f8b1eb0b37cc292da510fe2a87d79b5db264f2..0000000000000000000000000000000000000000
--- a/src/modules/http/src/httpUtil.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * 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 <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include "tmd5.h"
-
-#include "http.h"
-#include "httpCode.h"
-#include "httpHandle.h"
-#include "httpResp.h"
-
-#include "shash.h"
-#include "taos.h"
-
-bool httpCheckUsedbSql(char *sql) {
-  if (strstr(sql, "use ") != NULL) {
-    return true;
-  }
-  return false;
-}
-
-void httpTimeToString(time_t t, char *buf, int buflen) {
-  memset(buf, 0, (size_t)buflen);
-  char ts[30] = {0};
-
-  struct tm *ptm;
-  time_t     tt = t / 1000;
-  ptm = localtime(&tt);
-  strftime(ts, 64, "%Y-%m-%d %H:%M:%S", ptm);
-  sprintf(buf, "%s.%03ld", ts, t % 1000);
-}
-
-int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) {
-  HttpSqlCmds *cmd = pContext->multiCmds;
-  if (cmd->buffer == NULL) return -1;
-
-  int remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  char *buffer = cmd->buffer + cmd->bufferPos;
-  int   len = 0;
-
-  va_list argpointer;
-  va_start(argpointer, format);
-  len += vsnprintf(buffer, (size_t)remainLength, format, argpointer);
-  va_end(argpointer);
-
-  if (cmd->bufferPos + len + 1 >= cmd->bufferSize) {
-    return -1;
-  }
-
-  cmd->buffer[cmd->bufferPos + len] = 0;
-  cmd->bufferPos = cmd->bufferPos + len + 1;
-
-  remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  return (int32_t)(buffer - cmd->buffer);
-}
-
-int32_t httpAddToSqlCmdBufferNoTerminal(HttpContext *pContext, const char *const format, ...) {
-  HttpSqlCmds *cmd = pContext->multiCmds;
-  if (cmd->buffer == NULL) return -1;
-
-  int remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  char *buffer = cmd->buffer + cmd->bufferPos;
-  int   len = 0;
-
-  va_list argpointer;
-  va_start(argpointer, format);
-  len += vsnprintf(buffer, (size_t)remainLength, format, argpointer);
-  va_end(argpointer);
-
-  if (cmd->bufferPos + len + 1 >= cmd->bufferSize) {
-    return -1;
-  }
-
-  cmd->bufferPos = cmd->bufferPos + len;
-
-  remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  return (int32_t)(buffer - cmd->buffer);
-}
-
-int32_t httpAddToSqlCmdBufferTerminal(HttpContext *pContext) {
-  HttpSqlCmds *cmd = pContext->multiCmds;
-  if (cmd->buffer == NULL) return -1;
-
-  int remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  char *buffer = cmd->buffer + cmd->bufferPos;
-  *buffer = 0;
-  cmd->bufferPos = cmd->bufferPos + 1;
-
-  remainLength = cmd->bufferSize - cmd->bufferPos;
-  if (remainLength < 4096) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  return (int32_t)(buffer - cmd->buffer);
-}
-
-int32_t httpAddToSqlCmdBufferWithSize(HttpContext *pContext, int mallocSize) {
-  HttpSqlCmds *cmd = pContext->multiCmds;
-  if (cmd->buffer == NULL) return -1;
-
-  if (cmd->bufferPos + mallocSize >= cmd->bufferSize) {
-    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
-  }
-
-  char *buffer = cmd->buffer + cmd->bufferPos;
-  memset(cmd->buffer + cmd->bufferPos, 0, (size_t)mallocSize);
-  cmd->bufferPos = cmd->bufferPos + mallocSize;
-
-  return (int32_t)(buffer - cmd->buffer);
-}
-
-bool httpMallocMultiCmds(HttpContext *pContext, int cmdSize, int bufferSize) {
-  if (cmdSize > HTTP_MAX_CMD_SIZE) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd,
-              pContext->ipstr, pContext->user, cmdSize, HTTP_MAX_CMD_SIZE);
-    return false;
-  }
-
-  if (pContext->multiCmds == NULL) {
-    pContext->multiCmds = (HttpSqlCmds *)malloc(sizeof(HttpSqlCmds));
-    if (pContext->multiCmds == NULL) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, malloc multiCmds error", pContext, pContext->fd, pContext->ipstr,
-                pContext->user);
-      return false;
-    }
-    memset(pContext->multiCmds, 0, sizeof(HttpSqlCmds));
-  }
-
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  if (multiCmds->cmds == NULL || cmdSize > multiCmds->maxSize) {
-    free(multiCmds->cmds);
-    multiCmds->cmds = (HttpSqlCmd *)malloc((size_t)cmdSize * sizeof(HttpSqlCmd));
-    if (multiCmds->cmds == NULL) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, malloc cmds:%d error", pContext, pContext->fd, pContext->ipstr,
-                pContext->user, cmdSize);
-      return false;
-    }
-    multiCmds->maxSize = (int16_t)cmdSize;
-  }
-
-  if (multiCmds->buffer == NULL || bufferSize > multiCmds->bufferSize) {
-    free(multiCmds->buffer);
-    multiCmds->buffer = (char *)malloc((size_t)bufferSize);
-    if (multiCmds->buffer == NULL) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, malloc buffer:%d error", pContext, pContext->fd, pContext->ipstr,
-                pContext->user, bufferSize);
-      return false;
-    }
-    multiCmds->bufferSize = bufferSize;
-  }
-
-  multiCmds->pos = 0;
-  multiCmds->size = 0;
-  multiCmds->bufferPos = 0;
-  memset(multiCmds->cmds, 0, (size_t)multiCmds->maxSize * sizeof(HttpSqlCmd));
-
-  return true;
-}
-
-bool httpReMallocMultiCmdsSize(HttpContext *pContext, int cmdSize) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-
-  if (cmdSize > HTTP_MAX_CMD_SIZE) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd,
-              pContext->ipstr, pContext->user, cmdSize, HTTP_MAX_CMD_SIZE);
-    return false;
-  }
-
-  multiCmds->cmds = (HttpSqlCmd *)realloc(multiCmds->cmds, (size_t)cmdSize * sizeof(HttpSqlCmd));
-  if (multiCmds->cmds == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, malloc cmds:%d error", pContext, pContext->fd, pContext->ipstr,
-              pContext->user, cmdSize);
-    return false;
-  }
-  memset(multiCmds->cmds + multiCmds->maxSize * (int16_t)sizeof(HttpSqlCmd), 0,
-         (size_t)(cmdSize - multiCmds->maxSize) * sizeof(HttpSqlCmd));
-  multiCmds->maxSize = (int16_t)cmdSize;
-
-  return true;
-}
-
-bool httpReMallocMultiCmdsBuffer(HttpContext *pContext, int bufferSize) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-
-  if (bufferSize > HTTP_MAX_BUFFER_SIZE) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, mulitcmd buffer size:%d large then %d",
-              pContext, pContext->fd, pContext->ipstr, pContext->user, bufferSize, HTTP_MAX_BUFFER_SIZE);
-    return false;
-  }
-
-  multiCmds->buffer = (char *)realloc(multiCmds->buffer, (size_t)bufferSize);
-  if (multiCmds->buffer == NULL) {
-    httpError("context:%p, fd:%d, ip:%s, user:%s, malloc buffer:%d error", pContext, pContext->fd, pContext->ipstr,
-              pContext->user, bufferSize);
-    return false;
-  }
-  memset(multiCmds->buffer + multiCmds->bufferSize, 0, (size_t)(bufferSize - multiCmds->bufferSize));
-  multiCmds->bufferSize = bufferSize;
-
-  return true;
-}
-
-void httpFreeMultiCmds(HttpContext *pContext) {
-  if (pContext->multiCmds != NULL) {
-    if (pContext->multiCmds->buffer != NULL) free(pContext->multiCmds->buffer);
-    if (pContext->multiCmds->cmds != NULL) free(pContext->multiCmds->cmds);
-    free(pContext->multiCmds);
-    pContext->multiCmds = NULL;
-  }
-}
-
-JsonBuf *httpMallocJsonBuf(HttpContext *pContext) {
-  if (pContext->jsonBuf == NULL) {
-    pContext->jsonBuf = (JsonBuf *)malloc(sizeof(JsonBuf));
-  }
-
-  return pContext->jsonBuf;
-}
-
-void httpFreeJsonBuf(HttpContext *pContext) {
-  if (pContext->jsonBuf != NULL) {
-    free(pContext->jsonBuf);
-    pContext->jsonBuf = 0;
-  }
-}
-
-bool httpCompareMethod(HttpDecodeMethod *pSrc, HttpDecodeMethod *pCmp) {
-  if (strcmp(pSrc->module, pCmp->module) != 0) {
-    return false;
-  }
-  return true;
-}
-
-void httpAddMethod(HttpServer *pServer, HttpDecodeMethod *pMethod) {
-  int pos = 0;
-  for (pos = 0; pos < pServer->methodScannerLen; ++pos) {
-    if (httpCompareMethod(pServer->methodScanner[pos], pMethod)) {
-      break;
-    }
-  }
-
-  if (pos == pServer->methodScannerLen && pServer->methodScannerLen < HTTP_METHOD_SCANNER_SIZE) {
-    pServer->methodScanner[pos] = pMethod;
-    pServer->methodScannerLen++;
-  }
-}
-
-HttpSqlCmd *httpNewSqlCmd(HttpContext *pContext) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  if (multiCmds->size >= multiCmds->maxSize) {
-    if (!httpReMallocMultiCmdsSize(pContext, 2 * multiCmds->maxSize)) return NULL;
-  }
-
-  HttpSqlCmd *cmd = multiCmds->cmds + multiCmds->size++;
-  cmd->cmdType = HTTP_CMD_TYPE_UN_SPECIFIED;
-  cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_WITH_RETURN;
-  cmd->cmdState = HTTP_CMD_STATE_NOT_RUN_YET;
-
-  return cmd;
-}
-
-HttpSqlCmd *httpCurrSqlCmd(HttpContext *pContext) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  if (multiCmds->size == 0) return NULL;
-  if (multiCmds->size > multiCmds->maxSize) return NULL;
-
-  return multiCmds->cmds + multiCmds->size - 1;
-}
-
-int httpNextSqlCmdPos(HttpContext *pContext) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  return multiCmds->size;
-}
-
-void httpTrimTableName(char *name) {
-  for (int i = 0; name[i] != 0; i++) {
-    if (name[i] == ' ' || name[i] == ':' || name[i] == '.' || name[i] == '-' || name[i] == '/' || name[i] == '\'')
-      name[i] = '_';
-    if (i == TSDB_METER_NAME_LEN + 1) {
-      name[i] = 0;
-      break;
-    }
-  }
-}
-
-int httpShrinkTableName(HttpContext *pContext, int pos, char *name) {
-  int len = 0;
-  for (int i = 0; name[i] != 0; i++) {
-    if (name[i] == ' ' || name[i] == ':' || name[i] == '.' || name[i] == '-' || name[i] == '/' || name[i] == '\'' ||
-        name[i] == '\"')
-      name[i] = '_';
-    len++;
-  }
-
-  if (len < TSDB_METER_NAME_LEN) {
-    return pos;
-  }
-
-  MD5_CTX context;
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)name, (uint32_t)len);
-  MD5Final(&context);
-
-  int table_name = httpAddToSqlCmdBuffer(
-      pContext, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
-      context.digest[1], context.digest[2], context.digest[3], context.digest[4], context.digest[5], context.digest[6],
-      context.digest[7], context.digest[8], context.digest[9], context.digest[10], context.digest[11],
-      context.digest[12], context.digest[13], context.digest[14], context.digest[15]);
-
-  if (table_name != -1) {
-    httpGetCmdsString(pContext, table_name)[0] = 't';
-  }
-
-  return table_name;
-}
-
-char *httpGetCmdsString(HttpContext *pContext, int pos) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  if (pos < 0 || pos >= multiCmds->bufferSize) {
-    return "";
-  }
-
-  return multiCmds->buffer + pos;
-}
-
-int httpGzipDeCompress(char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData) {
-  int err = 0;
-  z_stream gzipStream = {0};
-
-  static char dummyHead[2] = {
-          0x8 + 0x7 * 0x10,
-          (((0x8 + 0x7 * 0x10) * 0x100 + 30) / 31 * 31) & 0xFF,
-  };
-
-  gzipStream.zalloc = (alloc_func) 0;
-  gzipStream.zfree = (free_func) 0;
-  gzipStream.opaque = (voidpf) 0;
-  gzipStream.next_in = (Bytef *) srcData;
-  gzipStream.avail_in = 0;
-  gzipStream.next_out = (Bytef *) destData;
-  if (inflateInit2(&gzipStream, 47) != Z_OK) {
-    return -1;
-  }
-
-  while (gzipStream.total_out < *nDestData && gzipStream.total_in < nSrcData) {
-    gzipStream.avail_in = gzipStream.avail_out = nSrcData;  //1
-    if ((err = inflate(&gzipStream, Z_NO_FLUSH)) == Z_STREAM_END) {
-      break;
-    }
-
-    if (err != Z_OK) {
-      if (err == Z_DATA_ERROR) {
-        gzipStream.next_in = (Bytef *) dummyHead;
-        gzipStream.avail_in = sizeof(dummyHead);
-        if ((err = inflate(&gzipStream, Z_NO_FLUSH)) != Z_OK) {
-          return -2;
-        }
-      } else return -3;
-    }
-  }
-
-  if (inflateEnd(&gzipStream) != Z_OK) {
-    return -4;
-  }
-  *nDestData = gzipStream.total_out;
-
-  return 0;
-}
-
-int httpGzipCompressInit(HttpContext *pContext) {
-  pContext->gzipStream.zalloc = (alloc_func) 0;
-  pContext->gzipStream.zfree = (free_func) 0;
-  pContext->gzipStream.opaque = (voidpf) 0;
-  if (deflateInit2(&pContext->gzipStream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int httpGzipCompress(HttpContext *pContext, char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData, bool isTheLast) {
-  int err = 0;
-  pContext->gzipStream.next_in = (Bytef *) srcData;
-  pContext->gzipStream.avail_in = (uLong) nSrcData;
-  pContext->gzipStream.next_out = (Bytef *) destData;
-  pContext->gzipStream.avail_out = (uLong) (*nDestData);
-
-  while (pContext->gzipStream.avail_in != 0 && pContext->gzipStream.total_out < (uLong) (*nDestData)) {
-    if (deflate(&pContext->gzipStream, Z_FULL_FLUSH) != Z_OK) {
-      return -1;
-    }
-  }
-
-  if (pContext->gzipStream.avail_in != 0) {
-    return pContext->gzipStream.avail_in;
-  }
-
-  if (isTheLast) {
-    for (;;) {
-      if ((err = deflate(&pContext->gzipStream, Z_FINISH)) == Z_STREAM_END) {
-        break;
-      }
-      if (err != Z_OK) {
-        return -2;
-      }
-    }
-
-    if (deflateEnd(&pContext->gzipStream) != Z_OK) {
-      return -3;
-    }
-  }
-
-  *nDestData = (int32_t) (pContext->gzipStream.total_out);
-  return 0;
-}
diff --git a/src/modules/http/src/restHandle.c b/src/modules/http/src/restHandle.c
deleted file mode 100644
index a3077008661590e9813b6f3ec91b6c15d9e42902..0000000000000000000000000000000000000000
--- a/src/modules/http/src/restHandle.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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 "restHandle.h"
-#include "restJson.h"
-
-static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest};
-static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest};
-static HttpEncodeMethod restEncodeSqlTimestampMethod = {
-    restStartSqlJson, restStopSqlJson, restBuildSqlTimestampJson, restBuildSqlAffectRowsJson, NULL, NULL, NULL, NULL};
-static HttpEncodeMethod restEncodeSqlLocalTimeStringMethod = {
-    restStartSqlJson, restStopSqlJson, restBuildSqlLocalTimeStringJson, restBuildSqlAffectRowsJson, NULL, NULL, NULL, NULL};
-static HttpEncodeMethod restEncodeSqlUtcTimeStringMethod = {
-    restStartSqlJson, restStopSqlJson, restBuildSqlUtcTimeStringJson, restBuildSqlAffectRowsJson, NULL, NULL, NULL, NULL};
-
-void restInitHandle(HttpServer* pServer) {
-  httpAddMethod(pServer, &restDecodeMethod);
-  httpAddMethod(pServer, &restDecodeMethod2);
-}
-
-bool restGetUserFromUrl(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (pParser->path[REST_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[REST_USER_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->user, pParser->path[REST_USER_URL_POS].pos);
-  return true;
-}
-
-bool restGetPassFromUrl(HttpContext* pContext) {
-  HttpParser* pParser = &pContext->parser;
-  if (pParser->path[REST_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[REST_PASS_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->pass, pParser->path[REST_PASS_URL_POS].pos);
-  return true;
-}
-
-bool restProcessLoginRequest(HttpContext* pContext) {
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, process restful login msg", pContext, pContext->fd, pContext->ipstr,
-            pContext->user);
-  pContext->reqType = HTTP_REQTYPE_LOGIN;
-  return true;
-}
-
-bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
-  httpTrace("context:%p, fd:%d, ip:%s, user:%s, process restful sql msg", pContext, pContext->fd, pContext->ipstr,
-            pContext->user);
-
-  char* sql = pContext->parser.data.pos;
-  if (sql == NULL) {
-    httpSendErrorResp(pContext, HTTP_NO_SQL_INPUT);
-    return false;
-  }
-
-
-  /*
-   * for async test
-   * /
-  /*
-  if (httpCheckUsedbSql(sql)) {
-    httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
-    return false;
-  }
-  */
-
-  HttpSqlCmd* cmd = &(pContext->singleCmd);
-  cmd->nativSql = sql;
-
-  pContext->reqType = HTTP_REQTYPE_SINGLE_SQL;
-  if (timestampFmt == REST_TIMESTAMP_FMT_LOCAL_STRING) {
-    pContext->encodeMethod = &restEncodeSqlLocalTimeStringMethod;
-  } else if (timestampFmt == REST_TIMESTAMP_FMT_TIMESTAMP) {
-    pContext->encodeMethod = &restEncodeSqlTimestampMethod;
-  } else if (timestampFmt == REST_TIMESTAMP_FMT_UTC_STRING) {
-    pContext->encodeMethod = &restEncodeSqlUtcTimeStringMethod;
-  }
-
-  return true;
-}
-
-bool restProcessRequest(struct HttpContext* pContext) {
-  if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "login")) {
-    restGetUserFromUrl(pContext);
-    restGetPassFromUrl(pContext);
-  }
-
-  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
-    httpSendErrorResp(pContext, HTTP_PARSE_USR_ERROR);
-    return false;
-  }
-
-  if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sql")) {
-    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_LOCAL_STRING);
-  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sqlt")) {
-    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_TIMESTAMP);
-  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sqlutc")) {
-    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_UTC_STRING);
-  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "login")) {
-    return restProcessLoginRequest(pContext);
-  } else {
-  }
-
-  httpSendErrorResp(pContext, HTTP_PARSE_URL_ERROR);
-  return false;
-}
diff --git a/src/modules/http/src/restJson.c b/src/modules/http/src/restJson.c
deleted file mode 100644
index 7e98472d538b2f3b8733936d98ce182162336a91..0000000000000000000000000000000000000000
--- a/src/modules/http/src/restJson.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * 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 <stdint.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "httpJson.h"
-#include "restHandle.h"
-#include "restJson.h"
-
-void restBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int affect_rows) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // data row array begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonArrStt);
-
-  httpJsonItemToken(jsonBuf);
-  httpJsonInt(jsonBuf, affect_rows);
-
-  // data row array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-
-  cmd->numOfRows = affect_rows;
-}
-
-void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  int         num_fields = taos_num_fields(result);
-
-  httpInitJsonBuf(jsonBuf, pContext);
-  httpWriteJsonBufHead(jsonBuf);
-
-  // object begin
-  httpJsonToken(jsonBuf, JsonObjStt);
-
-  // status, and data
-  httpJsonItemToken(jsonBuf);
-  httpJsonPair(jsonBuf, REST_JSON_STATUS, REST_JSON_STATUS_LEN, REST_JSON_SUCCESS, REST_JSON_SUCCESS_LEN);
-
-  // head begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonPairHead(jsonBuf, REST_JSON_HEAD, REST_JSON_HEAD_LEN);
-  // head array begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonArrStt);
-
-  if (num_fields == 0) {
-    httpJsonItemToken(jsonBuf);
-    httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
-  } else {
-    for (int i = 0; i < num_fields; ++i) {
-      httpJsonItemToken(jsonBuf);
-      httpJsonString(jsonBuf, fields[i].name, (int)strlen(fields[i].name));
-    }
-  }
-
-  // head array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-
-  // data begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonPairHead(jsonBuf, REST_JSON_DATA, REST_JSON_DATA_LEN);
-  // data array begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonArrStt);
-}
-
-bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows, int timestampFormat) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return false;
-
-  cmd->numOfRows += numOfRows;
-
-  int         num_fields = taos_num_fields(result);
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-
-  for (int k = 0; k < numOfRows; ++k) {
-    TAOS_ROW row = taos_fetch_row(result);
-
-    // data row array begin
-    httpJsonItemToken(jsonBuf);
-    httpJsonToken(jsonBuf, JsonArrStt);
-
-    for (int i = 0; i < num_fields; i++) {
-      httpJsonItemToken(jsonBuf);
-
-      if (row[i] == NULL) {
-        httpJsonOriginString(jsonBuf, "null", 4);
-        continue;
-      }
-
-      switch (fields[i].type) {
-        case TSDB_DATA_TYPE_BOOL:
-        case TSDB_DATA_TYPE_TINYINT:
-          httpJsonInt(jsonBuf, *((int8_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          httpJsonInt(jsonBuf, *((int16_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_INT:
-          httpJsonInt(jsonBuf, *((int32_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_BIGINT:
-          httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          httpJsonFloat(jsonBuf, *((float *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_DOUBLE:
-          httpJsonDouble(jsonBuf, *((double *)row[i]));
-          break;
-        case TSDB_DATA_TYPE_BINARY:
-        case TSDB_DATA_TYPE_NCHAR:
-          httpJsonStringForTransMean(jsonBuf, row[i], fields[i].bytes);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          if (timestampFormat == REST_TIMESTAMP_FMT_LOCAL_STRING) {
-            httpJsonTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
-          } else if (timestampFormat == REST_TIMESTAMP_FMT_TIMESTAMP) {
-            httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
-          } else {
-            httpJsonUtcTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
-          }
-          break;
-        default:
-          break;
-      }
-    }
-
-    // data row array end
-    httpJsonToken(jsonBuf, JsonArrEnd);
-  }
-
-  if (cmd->numOfRows >= tsRestRowLimit) {
-    httpTrace("context:%p, fd:%d, ip:%s, user:%s, retrieve rows:%d larger than limit:%d, abort retrieve", pContext,
-              pContext->fd, pContext->ipstr, pContext->user, cmd->numOfRows, tsRestRowLimit);
-    return false;
-  }
-  else {
-    if (pContext->fd <= 0) {
-      httpError("context:%p, fd:%d, ip:%s, user:%s, connection is closed, abort retrieve", pContext, pContext->fd,
-                pContext->ipstr, pContext->user);
-      return false;
-    }
-    else {
-      httpTrace("context:%p, fd:%d, ip:%s, user:%s, total rows:%d retrieved", pContext, pContext->fd, pContext->ipstr,
-                pContext->user, cmd->numOfRows);
-      return true;
-    }
-  }
-}
-
-bool restBuildSqlTimestampJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows) {
-  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_TIMESTAMP);
-}
-
-bool restBuildSqlLocalTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows) {
-  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_LOCAL_STRING);
-}
-
-bool restBuildSqlUtcTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int numOfRows) {
-  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_UTC_STRING);
-}
-
-void restStopSqlJson(HttpContext *pContext, HttpSqlCmd *cmd) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // data array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-
-  // rows
-  httpJsonItemToken(jsonBuf);
-  httpJsonPairHead(jsonBuf, REST_JSON_ROWS, REST_JSON_ROWS_LEN);
-  httpJsonInt64(jsonBuf, cmd->numOfRows);
-
-  // object end
-  httpJsonToken(jsonBuf, JsonObjEnd);
-
-  httpWriteJsonBufEnd(jsonBuf);
-}
\ No newline at end of file
diff --git a/src/modules/http/src/tgHandle.c b/src/modules/http/src/tgHandle.c
deleted file mode 100644
index b9adf5416274d8f380d8b00a033f2d83fa249084..0000000000000000000000000000000000000000
--- a/src/modules/http/src/tgHandle.c
+++ /dev/null
@@ -1,884 +0,0 @@
-/*
- * 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 "tgHandle.h"
-#include "shash.h"
-#include "taosmsg.h"
-#include "tgJson.h"
-#include "tsdb.h"
-
-/*
- * taos.telegraf.cfg formats like
- {
-  "metrics": [
-    {
-      "name" : "system",
-      "tbname" : "system_uptime",
-      "fields": [
-        "uptime"
-      ]
-    },
-    {
-      "name": "system",
-      "tbname" : "system_uptime_format",
-      "fields": [
-        "uptime_format"
-      ]
-    },
-    {
-      "name": "swap",
-      "tbname" : "swap_in",
-      "fields": [
-        "in"
-      ]
-    },
-    {
-      "name": "cpu",
-      "tbname" : "cpu_usage",
-      "fields": [
-        "usage_active",
-        "usage_guest"
-      ]
-    }
-    ]
-  }
- */
-
-#define TG_MAX_SORT_TAG_SIZE 20
-
-static HttpDecodeMethod tgDecodeMethod = {"telegraf", tgProcessRquest};
-static HttpEncodeMethod tgQueryMethod = {tgStartQueryJson,         tgStopQueryJson, NULL,
-                                         tgBuildSqlAffectRowsJson, tgInitQueryJson, tgCleanQueryJson,
-                                         tgCheckFinished,          tgSetNextCmd};
-
-static const char DEFAULT_TELEGRAF_CFG[] =
-        "{\"metrics\":["
-        "{\"name\":\"system\",\"tbname\":\"system_uptime\",\"fields\":[\"uptime\"]},"
-        "{\"name\":\"system\",\"tbname\":\"system_uptime_format\",\"fields\":[\"uptime_format\"]},"
-        "{\"name\":\"swap\",\"tbname\":\"swap_in\",\"fields\":[\"in\"]},"
-        "{\"name\":\"cpu\",\"tbname\":\"cpu_usage\",\"fields\":[\"usage_guest\"]}"
-        "]}";
-
-typedef struct {
-  char  *name;
-  char  *tbName;
-  char **fields;
-  int    fieldNum;
-} STgSchema;
-
-typedef struct {
-  STgSchema *schemas;
-  int        size;
-  int        pos;
-} STgSchemas;
-
-static STgSchemas tgSchemas = {0};
-
-void tgFreeSchema(STgSchema *schema) {
-  if (schema->name != NULL) {
-    free(schema->name);
-    schema->name = NULL;
-  }
-  if (schema->tbName != NULL) {
-    free(schema->tbName);
-    schema->tbName = NULL;
-  }
-  if (schema->fields != NULL) {
-    for (int f = 0; f < schema->fieldNum; ++f) {
-      if (schema->fields[f] != NULL) {
-        free(schema->fields[f]);
-        schema->fields[f] = NULL;
-      }
-    }
-    free(schema->fields);
-    schema->fields = NULL;
-    schema->fieldNum = 0;
-  }
-}
-
-void tgFreeSchemas() {
-  if (tgSchemas.schemas != NULL) {
-    for (int s = 0; s < tgSchemas.size; ++s) {
-      tgFreeSchema(&tgSchemas.schemas[s]);
-    }
-    free(tgSchemas.schemas);
-    tgSchemas.size = 0;
-  }
-}
-
-void tgInitSchemas(int size) {
-  tgFreeSchemas();
-  tgSchemas.schemas = calloc(sizeof(STgSchema), size);
-  tgSchemas.size = 0;
-}
-
-void tgParseSchemaMetric(cJSON *metric) {
-  STgSchema  schema = {0};
-  bool       parsedOk = true;
-
-  // name
-  cJSON *name = cJSON_GetObjectItem(metric, "name");
-  if (name == NULL) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  if (name->type != cJSON_String) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  if (name->valuestring == NULL) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  int nameLen = (int)strlen(name->valuestring);
-  if (nameLen == 0) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-
-  schema.name = calloc(nameLen + 1, 1);
-  strcpy(schema.name, name->valuestring);
-
-  // tbname
-  cJSON *tbname = cJSON_GetObjectItem(metric, "tbname");
-  if (tbname == NULL) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  if (tbname->type != cJSON_String) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  if (tbname->valuestring == NULL) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-  int tbnameLen = (int)strlen(tbname->valuestring);
-  if (tbnameLen == 0) {
-    parsedOk = false;
-    goto ParseEnd;
-  }
-
-  schema.tbName = calloc(tbnameLen + 1, 1);
-  strcpy(schema.tbName, tbname->valuestring);
-
-    // fields
-  cJSON *fields = cJSON_GetObjectItem(metric, "fields");
-  if (fields == NULL) {
-    goto ParseEnd;
-  }
-  int fieldSize = cJSON_GetArraySize(fields);
-  if (fieldSize <= 0 || fieldSize > TSDB_MAX_COLUMNS) {
-    goto ParseEnd;
-  }
-
-  if (fieldSize > 0) {
-    schema.fields = calloc(sizeof(STgSchema), (size_t)fieldSize);
-    schema.fieldNum = fieldSize;
-    for (int i = 0; i < fieldSize; i++) {
-      cJSON *field = cJSON_GetArrayItem(fields, i);
-      if (field == NULL) {
-        parsedOk = false;
-        goto ParseEnd;
-      }
-      if (field->valuestring == NULL) {
-        parsedOk = false;
-        goto ParseEnd;
-      }
-      int nameLen = (int)strlen(field->valuestring);
-      if (nameLen == 0 || nameLen > TSDB_METER_NAME_LEN) {
-        parsedOk = false;
-        goto ParseEnd;
-      }
-      schema.fields[i] = calloc(nameLen + 1, 1);
-      strcpy(schema.fields[i], field->valuestring);
-    }
-  }
-
-ParseEnd:
-  if (parsedOk) {
-    tgSchemas.schemas[tgSchemas.size++] = schema;
-  } else {
-    tgFreeSchema(&schema);
-  }
-}
-
-int tgParseSchema(const char *content, char*fileName) {
-  cJSON *root = cJSON_Parse(content);
-  if (root == NULL) {
-    httpError("failed to parse telegraf schema file:%s, invalid json format, content:%s", fileName, content);
-    return -1;
-  }
-  int size = 0;
-  cJSON *metrics = cJSON_GetObjectItem(root, "metrics");
-  if (metrics != NULL) {
-    size = cJSON_GetArraySize(metrics);
-    if (size <= 0) {
-      httpError("failed to parse telegraf schema file:%s, metrics size is 0", fileName);
-      cJSON_Delete(root);
-      return -1;
-    }
-
-    tgInitSchemas(size);
-    for (int i = 0; i < size; i++) {
-      cJSON *metric = cJSON_GetArrayItem(metrics, i);
-      if (metric != NULL) {
-        tgParseSchemaMetric(metric);
-      }
-    }
-  } else {
-    size = 1;
-    tgInitSchemas(size);
-    tgParseSchemaMetric(root);
-  }
-
-  cJSON_Delete(root);
-  return size;
-}
-
-int tgReadSchema(char *fileName) {
-  FILE *fp = fopen(fileName, "r");
-  if (fp == NULL) {
-    return -1;
-  }
-
-  httpPrint("open telegraf schema file:%s success", fileName);
-  fseek(fp, 0, SEEK_END);
-  size_t contentSize = (size_t)ftell(fp);
-  rewind(fp);
-  char *content = (char *)calloc(contentSize * sizeof(char) + 1, 1);
-  size_t result = fread(content, 1, contentSize, fp);
-  if (result != contentSize) {
-    httpError("failed to read telegraf schema file:%s", fileName);
-    fclose(fp);
-    free(content);
-    return -1;
-  }
-
-  int schemaNum = tgParseSchema(content, fileName);
-
-  free(content);
-  fclose(fp);
-  httpPrint("parse telegraf schema file:%s, schema size:%d", fileName, schemaNum);
-
-  return schemaNum;
-}
-
-void tgInitHandle(HttpServer *pServer) {
-  char fileName[256] = {0};
-  sprintf(fileName, "%s/taos.telegraf.cfg", configDir);
-  if (tgReadSchema(fileName) <= 0) {
-    tgFreeSchemas();
-    if (tgParseSchema(DEFAULT_TELEGRAF_CFG, "default") <= 0) {
-      tgFreeSchemas();
-    }
-  }
-
-  httpAddMethod(pServer, &tgDecodeMethod);
-}
-
-bool tgGetUserFromUrl(HttpContext *pContext) {
-  HttpParser *pParser = &pContext->parser;
-  if (pParser->path[TG_USER_URL_POS].len > TSDB_USER_LEN - 1 || pParser->path[TG_USER_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->user, pParser->path[TG_USER_URL_POS].pos);
-  return true;
-}
-
-bool tgGetPassFromUrl(HttpContext *pContext) {
-  HttpParser *pParser = &pContext->parser;
-  if (pParser->path[TG_PASS_URL_POS].len > TSDB_PASSWORD_LEN - 1 || pParser->path[TG_PASS_URL_POS].len <= 0) {
-    return false;
-  }
-
-  strcpy(pContext->pass, pParser->path[TG_PASS_URL_POS].pos);
-  return true;
-}
-
-char *tgGetDbFromUrl(HttpContext *pContext) {
-  HttpParser *pParser = &pContext->parser;
-  if (pParser->path[TG_DB_URL_POS].len <= 0) {
-    httpSendErrorResp(pContext, HTTP_TG_DB_NOT_INPUT);
-    return NULL;
-  }
-
-  if (pParser->path[TG_DB_URL_POS].len >= TSDB_DB_NAME_LEN) {
-    httpSendErrorResp(pContext, HTTP_TG_DB_TOO_LONG);
-    return NULL;
-  }
-
-  return pParser->path[TG_DB_URL_POS].pos;
-}
-
-char *tgGetStableName(char *stname, cJSON *fields, int fieldsSize) {
-  for (int s = 0; s < tgSchemas.size; ++s) {
-    STgSchema *schema = &tgSchemas.schemas[s];
-    if (strcasecmp(schema->name, stname) != 0) {
-      continue;
-    }
-
-    bool schemaMatched = true;
-    for (int f = 0; f < schema->fieldNum; ++f) {
-      char *fieldName = schema->fields[f];
-      bool fieldMatched = false;
-
-      for (int i = 0; i < fieldsSize; i++) {
-        cJSON *field = cJSON_GetArrayItem(fields, i);
-        if (strcasecmp(field->string, fieldName) == 0) {
-          fieldMatched = true;
-          break;
-        }
-      }
-
-      if (!fieldMatched) {
-        schemaMatched = false;
-        break;
-      }
-    }
-
-    if (schemaMatched) {
-      return schema->tbName;
-    }
-  }
-
-  return stname;
-}
-
-/*
- * parse single metric
- {
-   "fields": {
-     "field_1": 30,
-     "field_2": 4,
-     "field_N": 59,
-     "n_images": 660
-   },
-   "name": "docker",
-   "tags": {
-     "host": "raynor"
-   },
-   "timestamp": 1458229140
- }
- */
-bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
-  // metric name
-  cJSON *name = cJSON_GetObjectItem(metric, "name");
-  if (name == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_METRIC_NULL);
-    return false;
-  }
-  if (name->type != cJSON_String) {
-    httpSendErrorResp(pContext, HTTP_TG_METRIC_TYPE);
-    return false;
-  }
-  if (name->valuestring == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_METRIC_NAME_NULL);
-    return false;
-  }
-  int nameLen = (int)strlen(name->valuestring);
-  if (nameLen == 0) {
-    httpSendErrorResp(pContext, HTTP_TG_METRIC_NAME_NULL);
-    return false;
-  }
-  if (nameLen >= TSDB_METER_NAME_LEN - 7) {
-    httpSendErrorResp(pContext, HTTP_TG_METRIC_NAME_LONG);
-    return false;
-  }
-
-  // timestamp
-  cJSON *timestamp = cJSON_GetObjectItem(metric, "timestamp");
-  if (timestamp == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_TIMESTAMP_NULL);
-    return false;
-  }
-  if (timestamp->type != cJSON_Number) {
-    httpSendErrorResp(pContext, HTTP_TG_TIMESTAMP_TYPE);
-    return false;
-  }
-  if (timestamp->valueint <= 0) {
-    httpSendErrorResp(pContext, HTTP_TG_TIMESTAMP_VAL_NULL);
-    return false;
-  }
-
-  // tags
-  cJSON *tags = cJSON_GetObjectItem(metric, "tags");
-  if (tags == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_TAGS_NULL);
-    return false;
-  }
-
-  int tagsSize = cJSON_GetArraySize(tags);
-  if (tagsSize <= 0) {
-    httpSendErrorResp(pContext, HTTP_TG_TAGS_SIZE_0);
-    return false;
-  }
-
-  if (tagsSize > TG_MAX_SORT_TAG_SIZE) {
-    httpSendErrorResp(pContext, HTTP_TG_TAGS_SIZE_LONG);
-    return false;
-  }
-
-  cJSON *host = NULL;
-
-  for (int i = 0; i < tagsSize; i++) {
-    cJSON *tag = cJSON_GetArrayItem(tags, i);
-    if (tag == NULL) {
-      httpSendErrorResp(pContext, HTTP_TG_TAG_NULL);
-      return false;
-    }
-    if (tag->string == NULL || strlen(tag->string) == 0) {
-      httpSendErrorResp(pContext, HTTP_TG_TAG_NAME_NULL);
-      return false;
-    }
-
-    /*
-    * tag size may be larget than TSDB_COL_NAME_LEN
-    * we keep the first TSDB_COL_NAME_LEN bytes
-    */
-    if (0) {
-      if (strlen(tag->string) >= TSDB_COL_NAME_LEN) {
-        httpSendErrorResp(pContext, HTTP_TG_TAG_NAME_SIZE);
-        return false;
-      }
-    }
-
-    if (tag->type != cJSON_Number && tag->type != cJSON_String) {
-      httpSendErrorResp(pContext, HTTP_TG_TAG_VALUE_TYPE);
-      return false;
-    }
-
-    if (tag->type == cJSON_String) {
-      if (tag->valuestring == NULL || strlen(tag->valuestring) == 0) {
-        httpSendErrorResp(pContext, HTTP_TG_TAG_VALUE_NULL);
-        return false;
-      }
-    }
-
-    if (strcasecmp(tag->string, "host") == 0) {
-      host = tag;
-    }
-  }
-
-  if (host == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_TABLE_NULL);
-    return false;
-  }
-
-  if (host->type != cJSON_String) {
-    httpSendErrorResp(pContext, HTTP_TG_HOST_NOT_STRING);
-    return false;
-  }
-
-  if (strlen(host->valuestring) >= TSDB_METER_NAME_LEN) {
-    httpSendErrorResp(pContext, HTTP_TG_TABLE_SIZE);
-    return false;
-  }
-
-  // fields
-  cJSON *fields = cJSON_GetObjectItem(metric, "fields");
-  if (fields == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_FIELDS_NULL);
-    return false;
-  }
-
-  int fieldsSize = cJSON_GetArraySize(fields);
-  if (fieldsSize <= 0) {
-    httpSendErrorResp(pContext, HTTP_TG_FIELDS_SIZE_0);
-    return false;
-  }
-
-  if (fieldsSize > (TSDB_MAX_COLUMNS - TSDB_MAX_TAGS - 1)) {
-    httpSendErrorResp(pContext, HTTP_TG_FIELDS_SIZE_LONG);
-    return false;
-  }
-
-  for (int i = 0; i < fieldsSize; i++) {
-    cJSON *field = cJSON_GetArrayItem(fields, i);
-    if (field == NULL) {
-      httpSendErrorResp(pContext, HTTP_TG_FIELD_NULL);
-      return false;
-    }
-    if (field->string == NULL || strlen(field->string) == 0) {
-      httpSendErrorResp(pContext, HTTP_TG_FIELD_NAME_NULL);
-      return false;
-    }
-    /*
-    * tag size may be larget than TSDB_COL_NAME_LEN
-    * we keep the first TSDB_COL_NAME_LEN bytes
-    */
-    if (0) {
-      if (strlen(field->string) >= TSDB_COL_NAME_LEN) {
-        httpSendErrorResp(pContext, HTTP_TG_FIELD_NAME_SIZE);
-        return false;
-      }
-    }
-    if (field->type != cJSON_Number && field->type != cJSON_String) {
-      httpSendErrorResp(pContext, HTTP_TG_FIELD_VALUE_TYPE);
-      return false;
-    }
-    if (field->type == cJSON_String) {
-      if (field->valuestring == NULL || strlen(field->valuestring) == 0) {
-        httpSendErrorResp(pContext, HTTP_TG_FIELD_VALUE_NULL);
-        return false;
-      }
-    }
-  }
-
-  // assembling cmds
-  HttpSqlCmd *stable_cmd = httpNewSqlCmd(pContext);
-  if (stable_cmd == NULL) {
-    httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-    return false;
-  }
-  stable_cmd->cmdType = HTTP_CMD_TYPE_CREATE_STBALE;
-  stable_cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
-
-  HttpSqlCmd *table_cmd = httpNewSqlCmd(pContext);
-  if (table_cmd == NULL) {
-    httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-    return false;
-  }
-  table_cmd->cmdType = HTTP_CMD_TYPE_INSERT;
-
-  // order by tag name
-  cJSON *orderedTags[TG_MAX_SORT_TAG_SIZE] = {0};
-  int    orderTagsLen = 0;
-  for (int i = 0; i < tagsSize; ++i) {
-    cJSON *tag = cJSON_GetArrayItem(tags, i);
-    orderedTags[orderTagsLen++] = tag;
-    for (int j = orderTagsLen - 1; j >= 1; --j) {
-      cJSON *tag1 = orderedTags[j];
-      cJSON *tag2 = orderedTags[j - 1];
-      if (strcasecmp(tag1->string, "host") == 0 || strcmp(tag1->string, tag2->string) < 0) {
-        orderedTags[j] = tag2;
-        orderedTags[j - 1] = tag1;
-      }
-    }
-  }
-  orderTagsLen = orderTagsLen < TSDB_MAX_TAGS ? orderTagsLen : TSDB_MAX_TAGS;
-
-  table_cmd->tagNum = stable_cmd->tagNum = (int8_t)orderTagsLen;
-  table_cmd->timestamp = stable_cmd->timestamp = httpAddToSqlCmdBuffer(pContext, "%" PRId64, timestamp->valueint);
-
-  // stable name
-  char *stname = tgGetStableName(name->valuestring, fields, fieldsSize);
-  table_cmd->metric = stable_cmd->metric = httpAddToSqlCmdBuffer(pContext, "%s", stname);
-  if (tsTelegrafUseFieldNum == 0) {
-    table_cmd->stable = stable_cmd->stable = httpAddToSqlCmdBuffer(pContext, "%s", stname);
-  } else {
-    table_cmd->stable = stable_cmd->stable = httpAddToSqlCmdBuffer(pContext, "%s_%d_%d", stname, fieldsSize, orderTagsLen);
-  }
-  table_cmd->stable = stable_cmd->stable =
-      httpShrinkTableName(pContext, table_cmd->stable, httpGetCmdsString(pContext, table_cmd->stable));
-
-  // stable tag for detail
-  for (int i = 0; i < orderTagsLen; ++i) {
-    cJSON *tag = orderedTags[i];
-    stable_cmd->tagNames[i] = table_cmd->tagNames[i] = httpAddToSqlCmdBuffer(pContext, tag->string);
-
-    if (tag->type == cJSON_String)
-      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "'%s'", tag->valuestring);
-    else if (tag->type == cJSON_Number)
-      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "%" PRId64, tag->valueint);
-    else if (tag->type == cJSON_True)
-      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "1");
-    else if (tag->type == cJSON_False)
-      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "0");
-    else
-      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "NULL");
-  }
-
-  // table name
-  if (tsTelegrafUseFieldNum == 0) {
-    table_cmd->table = stable_cmd->table = httpAddToSqlCmdBufferNoTerminal(pContext, "%s_%s", stname, host->valuestring);
-  } else {
-    table_cmd->table = stable_cmd->table = httpAddToSqlCmdBufferNoTerminal(pContext, "%s_%d_%d_%s", stname, fieldsSize, orderTagsLen, host->valuestring);
-  }
-  for (int i = 0; i < orderTagsLen; ++i) {
-    cJSON *tag = orderedTags[i];
-    if (tag == host) continue;
-    if (tag->type == cJSON_String)
-      httpAddToSqlCmdBufferNoTerminal(pContext, "_%s", tag->valuestring);
-    else if (tag->type == cJSON_Number)
-      httpAddToSqlCmdBufferNoTerminal(pContext, "_%" PRId64, tag->valueint);
-    else if (tag->type == cJSON_False)
-      httpAddToSqlCmdBufferNoTerminal(pContext, "_0");
-    else if (tag->type == cJSON_True)
-      httpAddToSqlCmdBufferNoTerminal(pContext, "_1");
-    else
-      httpAddToSqlCmdBufferNoTerminal(pContext, "_n");
-  }
-  httpAddToSqlCmdBuffer(pContext, "");
-
-  table_cmd->table = stable_cmd->table =
-      httpShrinkTableName(pContext, table_cmd->table, httpGetCmdsString(pContext, table_cmd->table));
-
-  // assembling create stable sql
-  stable_cmd->sql = httpAddToSqlCmdBufferNoTerminal(pContext, "create table if not exists %s.%s(ts timestamp", db,
-                                                    httpGetCmdsString(pContext, table_cmd->stable));
-  for (int i = 0; i < fieldsSize; ++i) {
-    cJSON *field = cJSON_GetArrayItem(fields, i);
-    char * field_type = "double";
-    if (field->type == cJSON_String)
-      field_type = "binary(32)";
-    else if (field->type == cJSON_False || field->type == cJSON_True)
-      field_type = "tinyint";
-    else {
-    }
-
-    char *field_name = field->string;
-    httpAddToSqlCmdBufferNoTerminal(pContext, ",f_%s %s", field_name, field_type);
-  }
-  httpAddToSqlCmdBufferNoTerminal(pContext, ") tags(");
-
-  for (int i = 0; i < orderTagsLen; ++i) {
-    cJSON *tag = orderedTags[i];
-    char * tag_type = "bigint";
-    if (tag->type == cJSON_String)
-      tag_type = "binary(32)";
-    else if (tag->type == cJSON_False || tag->type == cJSON_True)
-      tag_type = "tinyint";
-    else {
-    }
-
-    char *tag_name = tag->string;
-    if (i != orderTagsLen - 1)
-      httpAddToSqlCmdBufferNoTerminal(pContext, "t_%s %s,", tag_name, tag_type);
-    else
-      httpAddToSqlCmdBuffer(pContext, "t_%s %s)", tag_name, tag_type);
-  }
-
-  // assembling insert sql
-  table_cmd->sql = httpAddToSqlCmdBufferNoTerminal(pContext, "import into %s.%s using %s.%s tags(", db,
-                                                   httpGetCmdsString(pContext, table_cmd->table), db,
-                                                   httpGetCmdsString(pContext, table_cmd->stable));
-  for (int i = 0; i < orderTagsLen; ++i) {
-    cJSON *tag = orderedTags[i];
-    if (i != orderTagsLen - 1) {
-      if (tag->type == cJSON_Number)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ",", tag->valueint);
-      else if (tag->type == cJSON_String)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", tag->valuestring);
-      else if (tag->type == cJSON_False)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "0,");
-      else if (tag->type == cJSON_True)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "1,");
-      else {
-        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL,");
-      }
-    } else {
-      if (tag->type == cJSON_Number)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ")", tag->valueint);
-      else if (tag->type == cJSON_String)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s')", tag->valuestring);
-      else if (tag->type == cJSON_False)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "0)");
-      else if (tag->type == cJSON_True)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "1)");
-      else {
-        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL)");
-      }
-    }
-  }
-
-  httpAddToSqlCmdBufferNoTerminal(pContext, " values(%" PRId64 ",", timestamp->valueint);
-  for (int i = 0; i < fieldsSize; ++i) {
-    cJSON *field = cJSON_GetArrayItem(fields, i);
-    if (i != fieldsSize - 1) {
-      if (field->type == cJSON_Number)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "%lf,", field->valuedouble);
-      else if (field->type == cJSON_String)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", field->valuestring);
-      else if (field->type == cJSON_False)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "0,");
-      else if (field->type == cJSON_True)
-        httpAddToSqlCmdBufferNoTerminal(pContext, "1,");
-      else {
-        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL,");
-      }
-    } else {
-      if (field->type == cJSON_Number)
-        httpAddToSqlCmdBuffer(pContext, "%lf)", field->valuedouble);
-      else if (field->type == cJSON_String)
-        httpAddToSqlCmdBuffer(pContext, "'%s')", field->valuestring);
-      else if (field->type == cJSON_False)
-        httpAddToSqlCmdBuffer(pContext, "0)");
-      else if (field->type == cJSON_True)
-        httpAddToSqlCmdBuffer(pContext, "1)");
-      else {
-        httpAddToSqlCmdBuffer(pContext, "NULL)");
-      }
-    }
-  }
-
-  return true;
-}
-
-/**
- * request from telegraf 1.7.0
- * single request:
- {
-    "fields": {
-        "field_1": 30,
-        "field_2": 4,
-        "field_N": 59,
-        "n_images": 660
-    },
-    "name": "docker",
-    "tags": {
-        "host": "raynor"
-    },
-    "timestamp": 1458229140
- }
- * multiple request:
- {
-    "metrics": [
-        {
-            "fields": {
-                "field_1": 30,
-                "field_2": 4,
-                "field_N": 59,
-                "n_images": 660
-            },
-            "name": "docker",
-            "tags": {
-                "host": "raynor"
-            },
-            "timestamp": 1458229140
-        },
-        {
-            "fields": {
-                "field_1": 30,
-                "field_2": 4,
-                "field_N": 59,
-                "n_images": 660
-            },
-            "name": "docker",
-            "tags": {
-                "host": "raynor"
-            },orderTagsLen
-            "timestamp": 1458229140
-        }
-    ]
- }
- */
-bool tgProcessQueryRequest(HttpContext *pContext, char *db) {
-  httpTrace("context:%p, fd:%d, ip:%s, process telegraf query msg", pContext, pContext->fd, pContext->ipstr);
-
-  HttpParser *pParser = &pContext->parser;
-  char *      filter = pParser->data.pos;
-  if (filter == NULL) {
-    httpSendErrorResp(pContext, HTTP_NO_MSG_INPUT);
-    return false;
-  }
-
-  cJSON *root = cJSON_Parse(filter);
-  if (root == NULL) {
-    httpSendErrorResp(pContext, HTTP_TG_INVALID_JSON);
-    return false;
-  }
-
-  cJSON *metrics = cJSON_GetObjectItem(root, "metrics");
-  if (metrics != NULL) {
-    int size = cJSON_GetArraySize(metrics);
-    httpTrace("context:%p, fd:%d, ip:%s, multiple metrics:%d at one time", pContext, pContext->fd, pContext->ipstr,
-              size);
-    if (size <= 0) {
-      httpSendErrorResp(pContext, HTTP_TG_METRICS_NULL);
-      cJSON_Delete(root);
-      return false;
-    }
-
-    int cmdSize = size * 2 + 1;
-    if (cmdSize > HTTP_MAX_CMD_SIZE) {
-      httpSendErrorResp(pContext, HTTP_TG_METRICS_SIZE);
-      cJSON_Delete(root);
-      return false;
-    }
-
-    if (!httpMallocMultiCmds(pContext, cmdSize, HTTP_BUFFER_SIZE)) {
-      httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-      cJSON_Delete(root);
-      return false;
-    }
-
-    HttpSqlCmd *cmd = httpNewSqlCmd(pContext);
-    if (cmd == NULL) {
-      httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-      cJSON_Delete(root);
-      return false;
-    }
-    cmd->cmdType = HTTP_CMD_TYPE_CREATE_DB;
-    cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
-    cmd->sql = httpAddToSqlCmdBuffer(pContext, "create database if not exists %s", db);
-
-    for (int i = 0; i < size; i++) {
-      cJSON *metric = cJSON_GetArrayItem(metrics, i);
-      if (metric != NULL) {
-        if (!tgProcessSingleMetric(pContext, metric, db)) {
-          cJSON_Delete(root);
-          return false;
-        }
-      }
-    }
-  } else {
-    httpTrace("context:%p, fd:%d, ip:%s, single metric", pContext, pContext->fd, pContext->ipstr);
-
-    if (!httpMallocMultiCmds(pContext, 3, HTTP_BUFFER_SIZE)) {
-      httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-      cJSON_Delete(root);
-      return false;
-    }
-
-    HttpSqlCmd *cmd = httpNewSqlCmd(pContext);
-    if (cmd == NULL) {
-      httpSendErrorResp(pContext, HTTP_NO_ENOUGH_MEMORY);
-      cJSON_Delete(root);
-      return false;
-    }
-    cmd->cmdType = HTTP_CMD_TYPE_CREATE_DB;
-    cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
-    cmd->sql = httpAddToSqlCmdBuffer(pContext, "create database if not exists %s", db);
-
-    if (!tgProcessSingleMetric(pContext, root, db)) {
-      cJSON_Delete(root);
-      return false;
-    }
-  }
-
-  cJSON_Delete(root);
-
-  pContext->reqType = HTTP_REQTYPE_MULTI_SQL;
-  pContext->encodeMethod = &tgQueryMethod;
-  pContext->multiCmds->pos = 2;
-
-  return true;
-}
-
-bool tgProcessRquest(struct HttpContext *pContext) {
-  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
-    httpSendErrorResp(pContext, HTTP_PARSE_USR_ERROR);
-    return false;
-  }
-
-  char *db = tgGetDbFromUrl(pContext);
-  if (db == NULL) {
-    return false;
-  }
-
-  return tgProcessQueryRequest(pContext, db);
-}
diff --git a/src/modules/http/src/tgJson.c b/src/modules/http/src/tgJson.c
deleted file mode 100644
index f706a56bd90d575f1e6491e005bd982043ee657c..0000000000000000000000000000000000000000
--- a/src/modules/http/src/tgJson.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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 <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "httpJson.h"
-#include "httpResp.h"
-#include "taosmsg.h"
-#include "tgHandle.h"
-#include "tgJson.h"
-
-void tgInitQueryJson(HttpContext *pContext) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  httpInitJsonBuf(jsonBuf, pContext);
-  httpWriteJsonBufHead(jsonBuf);
-
-  // array begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonObjStt);
-
-  httpJsonPairHead(jsonBuf, "metrics", 7);
-
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonArrStt);
-}
-
-void tgCleanQueryJson(HttpContext *pContext) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // array end
-  httpJsonToken(jsonBuf, JsonArrEnd);
-  httpJsonToken(jsonBuf, JsonObjEnd);
-
-  httpWriteJsonBufEnd(jsonBuf);
-}
-
-void tgStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // object begin
-  httpJsonItemToken(jsonBuf);
-  httpJsonToken(jsonBuf, JsonObjStt);
-
-  // data
-  httpJsonItemToken(jsonBuf);
-  httpJsonPair(jsonBuf, "metric", 6, httpGetCmdsString(pContext, cmd->stable),
-               (int)strlen(httpGetCmdsString(pContext, cmd->metric)));
-
-  httpJsonItemToken(jsonBuf);
-  httpJsonPair(jsonBuf, "stable", 6, httpGetCmdsString(pContext, cmd->stable),
-               (int)strlen(httpGetCmdsString(pContext, cmd->stable)));
-
-  httpJsonItemToken(jsonBuf);
-  httpJsonPair(jsonBuf, "table", 5, httpGetCmdsString(pContext, cmd->table),
-               (int)strlen(httpGetCmdsString(pContext, cmd->table)));
-
-  httpJsonItemToken(jsonBuf);
-  httpJsonPair(jsonBuf, "timestamp", 9, httpGetCmdsString(pContext, cmd->timestamp),
-               (int)strlen(httpGetCmdsString(pContext, cmd->timestamp)));  // hack way
-}
-
-void tgStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // data
-  httpJsonItemToken(jsonBuf);
-  httpJsonPairStatus(jsonBuf, cmd->code);
-
-  // object end
-  httpJsonToken(jsonBuf, JsonObjEnd);
-}
-
-void tgBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int affect_rows) {
-  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
-  if (jsonBuf == NULL) return;
-
-  // data
-  httpJsonPairIntVal(jsonBuf, "affected_rows", 13, affect_rows);
-}
-
-bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int code) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  httpTrace("context:%p, fd:%d, ip:%s, check telegraf command, code:%d, state:%d, type:%d, rettype:%d, tags:%d",
-            pContext, pContext->fd, pContext->ipstr, code, cmd->cmdState, cmd->cmdType, cmd->cmdReturnType, cmd->tagNum);
-
-  if (cmd->cmdType == HTTP_CMD_TYPE_INSERT) {
-    if (cmd->cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
-      if (code == TSDB_CODE_DB_NOT_SELECTED || code == TSDB_CODE_INVALID_DB) {
-        cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
-        if (multiCmds->cmds[0].cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
-          multiCmds->pos = (int16_t)-1;
-          httpTrace("context:%p, fd:%d, ip:%s, import failed, try create database", pContext, pContext->fd,
-                    pContext->ipstr);
-          return false;
-        }
-      } else if (code == TSDB_CODE_INVALID_TABLE) {
-        cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
-        if (multiCmds->cmds[multiCmds->pos - 1].cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
-          multiCmds->pos = (int16_t)(multiCmds->pos - 2);
-          httpTrace("context:%p, fd:%d, ip:%s, import failed, try create stable", pContext, pContext->fd,
-                    pContext->ipstr);
-          return false;
-        }
-      } else {
-      }
-    } else {
-    }
-  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_DB) {
-    cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
-    httpTrace("context:%p, fd:%d, ip:%s, code:%d, create database failed", pContext, pContext->fd, pContext->ipstr,
-              code);
-  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_STBALE) {
-    cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
-    httpTrace("context:%p, fd:%d, ip:%s, code:%d, create stable failed", pContext, pContext->fd, pContext->ipstr, code);
-  } else {
-  }
-
-  return true;
-}
-
-void tgSetNextCmd(struct HttpContext *pContext, HttpSqlCmd *cmd, int code) {
-  HttpSqlCmds *multiCmds = pContext->multiCmds;
-  httpTrace("context:%p, fd:%d, ip:%s, get telegraf next command, pos:%d, code:%d, state:%d, type:%d, rettype:%d, tags:%d",
-            pContext, pContext->fd, pContext->ipstr, multiCmds->pos, code, cmd->cmdState, cmd->cmdType,
-            cmd->cmdReturnType, cmd->tagNum);
-
-  if (cmd->cmdType == HTTP_CMD_TYPE_INSERT) {
-    multiCmds->pos = (int16_t)(multiCmds->pos + 2);
-  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_DB) {
-    multiCmds->pos++;
-  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_STBALE) {
-    multiCmds->pos++;
-  } else {
-    multiCmds->pos++;
-  }
-}
\ No newline at end of file
diff --git a/src/modules/monitor/CMakeLists.txt b/src/modules/monitor/CMakeLists.txt
deleted file mode 100644
index 44ac8aae0b6d9e72c6e5a824d874c38972e93348..0000000000000000000000000000000000000000
--- a/src/modules/monitor/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  ADD_LIBRARY(monitor ${SRC})
-  TARGET_LINK_LIBRARIES(monitor taos_static)
-ENDIF ()  
diff --git a/src/modules/monitor/inc/monitor.h b/src/modules/monitor/inc/monitor.h
deleted file mode 100644
index 954f4898b195cb90fcb28fb4290af7e24c1a6fbd..0000000000000000000000000000000000000000
--- a/src/modules/monitor/inc/monitor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 __MONITOR_H__
-#define __MONITOR_H__
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-
-#define monitorError(...)                    \
-  if (monitorDebugFlag & DEBUG_ERROR) {      \
-    tprintf("ERROR MON ", 255, __VA_ARGS__); \
-  }
-#define monitorWarn(...)                                  \
-  if (monitorDebugFlag & DEBUG_WARN) {                    \
-    tprintf("WARN  MON ", monitorDebugFlag, __VA_ARGS__); \
-  }
-#define monitorTrace(...)                           \
-  if (monitorDebugFlag & DEBUG_TRACE) {             \
-    tprintf("MON ", monitorDebugFlag, __VA_ARGS__); \
-  }
-#define monitorPrint(...) \
-  { tprintf("MON ", 255, __VA_ARGS__); }
-
-#define monitorLError(...) taosLogError(__VA_ARGS__) monitorError(__VA_ARGS__)
-#define monitorLWarn(...) taosLogWarn(__VA_ARGS__) monitorWarn(__VA_ARGS__)
-#define monitorLPrint(...) taosLogPrint(__VA_ARGS__) monitorPrint(__VA_ARGS__)
-
-#endif
\ No newline at end of file
diff --git a/src/modules/monitor/inc/monitorSystem.h b/src/modules/monitor/inc/monitorSystem.h
deleted file mode 100644
index 339f2795b1fb1e7e2501be4cc52bb9f2c8656378..0000000000000000000000000000000000000000
--- a/src/modules/monitor/inc/monitorSystem.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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 __MONITOR_SYSTEM_H__
-#define __MONITOR_SYSTEM_H__
-
-#include <stdbool.h>
-
-int  monitorInitSystem();
-int  monitorStartSystem();
-void monitorStopSystem();
-void monitorCleanUpSystem();
-
-typedef struct {
-  int selectReqNum;
-  int insertReqNum;
-  int httpReqNum;
-} SCountInfo;
-
-extern void (*monitorCountReqFp)(SCountInfo *info);
-
-#endif
\ No newline at end of file
diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c
deleted file mode 100644
index f403a272935b67db3f8cdded152b41be19f22fd5..0000000000000000000000000000000000000000
--- a/src/modules/monitor/src/monitorSystem.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * 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 "monitor.h"
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "monitorSystem.h"
-#include "tsclient.h"
-#include "tsdb.h"
-#include "tsystem.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tutil.h"
-
-#define SQL_LENGTH     1024
-#define LOG_LEN_STR    80
-#define IP_LEN_STR     15
-#define CHECK_INTERVAL 1000
-
-typedef enum {
-  MONITOR_CMD_CREATE_DB,
-  MONITOR_CMD_CREATE_TB_LOG,
-  MONITOR_CMD_CREATE_MT_DN,
-  MONITOR_CMD_CREATE_MT_ACCT,
-  MONITOR_CMD_CREATE_TB_DN,
-  MONITOR_CMD_CREATE_TB_ACCT_ROOT,
-  MONITOR_CMD_CREATE_TB_SLOWQUERY,
-  MONITOR_CMD_MAX
-} MonitorCommand;
-
-typedef enum {
-  MONITOR_STATE_UN_INIT,
-  MONITOR_STATE_INITIALIZING,
-  MONITOR_STATE_INITIALIZED,
-  MONITOR_STATE_STOPPED
-} MonitorState;
-
-typedef struct {
-  void * conn;
-  void * timer;
-  char   privateIpStr[TSDB_IPv4ADDR_LEN];
-  int8_t cmdIndex;
-  int8_t state;
-  char   sql[SQL_LENGTH];
-  void * initTimer;
-  void * diskTimer;
-} MonitorConn;
-
-MonitorConn *monitor = NULL;
-
-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 monitorInitConn(void *para, void *unused);
-void monitorInitConnCb(void *param, TAOS_RES *result, int code);
-void monitorInitDatabase();
-void monitorInitDatabaseCb(void *param, TAOS_RES *result, int code);
-void monitorStartTimer();
-void monitorSaveSystemInfo();
-void monitorSaveLog(int level, const char *const format, ...);
-void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t maxPointsPerSecond,
-                        int64_t totalTimeSeries, int64_t maxTimeSeries, int64_t totalStorage, int64_t maxStorage,
-                        int64_t totalQueryTime, int64_t maxQueryTime, int64_t totalInbound, int64_t maxInbound,
-                        int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs,
-                        int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams,
-                        int64_t totalConns, int64_t maxConns, int8_t accessState);
-void (*monitorCountReqFp)(SCountInfo *info) = NULL;
-void monitorExecuteSQL(char *sql);
-
-void monitorCheckDiskUsage(void *para, void *unused) {
-  taosGetDisk();
-  taosTmrReset(monitorCheckDiskUsage, CHECK_INTERVAL, NULL, tscTmr, &monitor->diskTimer);
-}
-
-int monitorInitSystem() {
-  monitor = (MonitorConn *)malloc(sizeof(MonitorConn));
-  memset(monitor, 0, sizeof(MonitorConn));
-  taosTmrReset(monitorCheckDiskUsage, CHECK_INTERVAL, NULL, tscTmr, &monitor->diskTimer);
-
-  startMonitor = monitorStartSystem;
-  stopMonitor  = monitorStopSystem;
-  return 0;
-}
-
-int monitorStartSystem() {
-  if (monitor == NULL) {
-    monitorInitSystem();
-  }
-  taosTmrReset(monitorInitConn, 10, NULL, tscTmr, &monitor->initTimer);
-  return 0;
-}
-
-void monitorStartSystemRetry() {
-  if (monitor->initTimer != NULL) {
-    taosTmrReset(monitorInitConn, 3000, NULL, tscTmr, &monitor->initTimer);
-  }
-}
-
-void monitorInitConn(void *para, void *unused) {
-  monitorPrint("starting to initialize monitor service ..");
-  monitor->state = MONITOR_STATE_INITIALIZING;
-
-  if (monitor->privateIpStr[0] == 0) {
-    strcpy(monitor->privateIpStr, tsPrivateIp);
-    for (int i = 0; i < TSDB_IPv4ADDR_LEN; ++i) {
-      if (monitor->privateIpStr[i] == '.') {
-        monitor->privateIpStr[i] = '_';
-      }
-    }
-  }
-
-  if (monitor->conn == NULL) {
-    taos_connect_a(NULL, "monitor", tsInternalPass, "", 0, monitorInitConnCb, monitor, &(monitor->conn));
-  } else {
-    monitorInitDatabase();
-  }
-}
-
-void monitorInitConnCb(void *param, TAOS_RES *result, int code) {
-  if (code < 0) {
-    monitorError("monitor:%p, connect to database failed, code:%d", monitor->conn, code);
-    taos_close(monitor->conn);
-    monitor->conn = NULL;
-    monitor->state = MONITOR_STATE_UN_INIT;
-    monitorStartSystemRetry();
-    return;
-  }
-
-  monitorTrace("monitor:%p, connect to database success, code:%d", monitor->conn, code);
-  monitorInitDatabase();
-}
-
-void dnodeBuildMonitorSql(char *sql, int cmd) {
-  memset(sql, 0, SQL_LENGTH);
-
-  if (cmd == MONITOR_CMD_CREATE_DB) {
-    snprintf(sql, SQL_LENGTH,
-             "create database if not exists %s replica 1 days 10 keep 30 rows 1024 cache 2048 "
-             "ablocks 2 tblocks 32 tables 32 precision 'us'",
-             tsMonitorDbName);
-  } else if (cmd == MONITOR_CMD_CREATE_MT_DN) {
-    snprintf(sql, SQL_LENGTH,
-             "create table if not exists %s.dn(ts timestamp"
-             ", cpu_taosd float, cpu_system float, cpu_cores int"
-             ", mem_taosd float, mem_system float, mem_total int"
-             ", disk_used float, disk_total int"
-             ", band_speed float"
-             ", io_read float, io_write float"
-             ", req_http int, req_select int, req_insert int"
-             ") tags (ipaddr binary(%d))",
-             tsMonitorDbName, IP_LEN_STR + 1);
-  } else if (cmd == MONITOR_CMD_CREATE_TB_DN) {
-    snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn_%s using %s.dn tags('%s')", tsMonitorDbName,
-             monitor->privateIpStr, tsMonitorDbName, tsPrivateIp);
-  } else if (cmd == MONITOR_CMD_CREATE_MT_ACCT) {
-    snprintf(sql, SQL_LENGTH,
-             "create table if not exists %s.acct(ts timestamp "
-             ", currentPointsPerSecond bigint, maxPointsPerSecond bigint"
-             ", totalTimeSeries bigint, maxTimeSeries bigint"
-             ", totalStorage bigint, maxStorage bigint"
-             ", totalQueryTime bigint, maxQueryTime bigint"
-             ", totalInbound bigint, maxInbound bigint"
-             ", totalOutbound bigint, maxOutbound bigint"
-             ", totalDbs smallint, maxDbs smallint"
-             ", totalUsers smallint, maxUsers smallint"
-             ", totalStreams smallint, maxStreams smallint"
-             ", totalConns smallint, maxConns smallint"
-             ", accessState smallint"
-             ") tags (acctId binary(%d))",
-             tsMonitorDbName, TSDB_USER_LEN + 1);
-  } else if (cmd == MONITOR_CMD_CREATE_TB_ACCT_ROOT) {
-    snprintf(sql, SQL_LENGTH, "create table if not exists %s.acct_%s using %s.acct tags('%s')", tsMonitorDbName, "root",
-             tsMonitorDbName, "root");
-  } else if (cmd == MONITOR_CMD_CREATE_TB_SLOWQUERY) {
-    snprintf(sql, SQL_LENGTH,
-             "create table if not exists %s.slowquery(ts timestamp, username "
-             "binary(%d), created_time timestamp, time bigint, sql binary(%d))",
-             tsMonitorDbName, TSDB_METER_ID_LEN, TSDB_SHOW_SQL_LEN);
-  } else if (cmd == MONITOR_CMD_CREATE_TB_LOG) {
-    snprintf(sql, SQL_LENGTH,
-             "create table if not exists %s.log(ts timestamp, level tinyint, "
-             "content binary(%d), ipaddr binary(%d))",
-             tsMonitorDbName, LOG_LEN_STR, IP_LEN_STR);
-  }
-
-  sql[SQL_LENGTH] = 0;
-}
-
-void monitorInitDatabase() {
-  if (monitor->cmdIndex < MONITOR_CMD_MAX) {
-    dnodeBuildMonitorSql(monitor->sql, monitor->cmdIndex);
-    taos_query_a(monitor->conn, monitor->sql, monitorInitDatabaseCb, NULL);
-  } else {
-    monitor->state = MONITOR_STATE_INITIALIZED;
-    monitorPrint("monitor service init success");
-
-    monitorStartTimer();
-  }
-}
-
-void monitorInitDatabaseCb(void *param, TAOS_RES *result, int code) {
-  if (-code == TSDB_CODE_TABLE_ALREADY_EXIST || -code == TSDB_CODE_DB_ALREADY_EXIST || code >= 0) {
-    monitorTrace("monitor:%p, sql success, code:%d, %s", monitor->conn, code, monitor->sql);
-    if (monitor->cmdIndex == MONITOR_CMD_CREATE_TB_LOG) {
-      taosLogFp = monitorSaveLog;
-      taosLogSqlFp = monitorExecuteSQL;
-      taosLogAcctFp = monitorSaveAcctLog;
-      monitorLPrint("dnode:%s is started", tsPrivateIp);
-    }
-    monitor->cmdIndex++;
-    monitorInitDatabase();
-  } else {
-    monitorError("monitor:%p, sql failed, code:%d, %s", monitor->conn, code, monitor->sql);
-    monitor->state = MONITOR_STATE_UN_INIT;
-    monitorStartSystemRetry();
-  }
-}
-
-void monitorStopSystem() {
-  if (monitor == NULL) {
-    return;
-  }
-
-  monitorLPrint("dnode:%s monitor module is stopped", tsPrivateIp);
-  monitor->state = MONITOR_STATE_STOPPED;
-  taosLogFp = NULL;
-  if (monitor->initTimer != NULL) {
-    taosTmrStopA(&(monitor->initTimer));
-  }
-  if (monitor->timer != NULL) {
-    taosTmrStopA(&(monitor->timer));
-  }
-}
-
-void monitorCleanUpSystem() {
-  monitorPrint("monitor service cleanup");
-  monitorStopSystem();
-}
-
-void monitorStartTimer() {
-  taosTmrReset(monitorSaveSystemInfo, tsMonitorInterval * 1000, NULL, tscTmr, &monitor->timer);
-}
-
-void dnodeMontiorInsertAcctCallback(void *param, TAOS_RES *result, int code) {
-  if (code < 0) {
-    monitorError("monitor:%p, save account info failed, code:%d", monitor->conn, code);
-  } else if (code == 0) {
-    monitorError("monitor:%p, save account info failed, affect rows:%d", monitor->conn, code);
-  } else {
-    monitorTrace("monitor:%p, save account info success, code:%d", monitor->conn, code);
-  }
-}
-
-void dnodeMontiorInsertSysCallback(void *param, TAOS_RES *result, int code) {
-  if (code < 0) {
-    monitorError("monitor:%p, save system info failed, code:%d %s", monitor->conn, code, monitor->sql);
-  } else if (code == 0) {
-    monitorError("monitor:%p, save system info failed, affect rows:%d %s", monitor->conn, code, monitor->sql);
-  } else {
-    monitorTrace("monitor:%p, save system info success, code:%d %s", monitor->conn, code, monitor->sql);
-  }
-}
-
-void dnodeMontiorInsertLogCallback(void *param, TAOS_RES *result, int code) {
-  if (code < 0) {
-    monitorError("monitor:%p, save log failed, code:%d", monitor->conn, code);
-  } else if (code == 0) {
-    monitorError("monitor:%p, save log failed, affect rows:%d", monitor->conn, code);
-  } else {
-    monitorTrace("monitor:%p, save log info success, code:%d", monitor->conn, code);
-  }
-}
-
-// unit is MB
-int monitorBuildMemorySql(char *sql) {
-  float sysMemoryUsedMB = 0;
-  bool  suc = taosGetSysMemory(&sysMemoryUsedMB);
-  if (!suc) {
-    monitorError("monitor:%p, get sys memory info failed.", monitor->conn);
-  }
-
-  float procMemoryUsedMB = 0;
-  suc = taosGetProcMemory(&procMemoryUsedMB);
-  if (!suc) {
-    monitorError("monitor:%p, get proc memory info failed.", monitor->conn);
-  }
-
-  return sprintf(sql, ", %f, %f, %d", procMemoryUsedMB, sysMemoryUsedMB, tsTotalMemoryMB);
-}
-
-// unit is %
-int monitorBuildCpuSql(char *sql) {
-  float sysCpuUsage = 0, procCpuUsage = 0;
-  bool  suc = taosGetCpuUsage(&sysCpuUsage, &procCpuUsage);
-  if (!suc) {
-    monitorError("monitor:%p, get cpu usage failed.", monitor->conn);
-  }
-
-  if (sysCpuUsage <= procCpuUsage) {
-    sysCpuUsage = procCpuUsage + (float)0.1;
-  }
-
-  return sprintf(sql, ", %f, %f, %d", procCpuUsage, sysCpuUsage, tsNumOfCores);
-}
-
-// unit is GB
-int monitorBuildDiskSql(char *sql) {
-  return sprintf(sql, ", %f, %d", (tsTotalDataDirGB - tsAvailDataDirGB), (int32_t)tsTotalDataDirGB);
-}
-
-// unit is Kb
-int monitorBuildBandSql(char *sql) {
-  float bandSpeedKb = 0;
-  bool  suc = taosGetBandSpeed(&bandSpeedKb);
-  if (!suc) {
-    monitorError("monitor:%p, get bandwidth speed failed.", monitor->conn);
-  }
-
-  return sprintf(sql, ", %f", bandSpeedKb);
-}
-
-int monitorBuildReqSql(char *sql) {
-  SCountInfo info;
-  info.httpReqNum = info.insertReqNum = info.selectReqNum = 0;
-  (*monitorCountReqFp)(&info);
-
-  return sprintf(sql, ", %d, %d, %d)", info.httpReqNum, info.selectReqNum, info.insertReqNum);
-}
-
-int monitorBuildIoSql(char *sql) {
-  float readKB = 0, writeKB = 0;
-  bool  suc = taosGetProcIO(&readKB, &writeKB);
-  if (!suc) {
-    monitorError("monitor:%p, get io info failed.", monitor->conn);
-  }
-
-  return sprintf(sql, ", %f, %f", readKB, writeKB);
-}
-
-void monitorSaveSystemInfo() {
-  if (monitor->state != MONITOR_STATE_INITIALIZED) {
-    return;
-  }
-
-  if (monitorCountReqFp == NULL) {
-    return;
-  }
-
-  int64_t ts = taosGetTimestampUs();
-  char *  sql = monitor->sql;
-  int pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn_%s values(%" PRId64, tsMonitorDbName, monitor->privateIpStr, ts);
-
-  pos += monitorBuildCpuSql(sql + pos);
-  pos += monitorBuildMemorySql(sql + pos);
-  pos += monitorBuildDiskSql(sql + pos);
-  pos += monitorBuildBandSql(sql + pos);
-  pos += monitorBuildIoSql(sql + pos);
-  pos += monitorBuildReqSql(sql + pos);
-
-  monitorTrace("monitor:%p, save system info, sql:%s", monitor->conn, sql);
-  taos_query_a(monitor->conn, sql, dnodeMontiorInsertSysCallback, "log");
-
-  if (monitor->timer != NULL && monitor->state != MONITOR_STATE_STOPPED) {
-    monitorStartTimer();
-  }
-}
-
-void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t maxPointsPerSecond,
-                        int64_t totalTimeSeries, int64_t maxTimeSeries, int64_t totalStorage, int64_t maxStorage,
-                        int64_t totalQueryTime, int64_t maxQueryTime, int64_t totalInbound, int64_t maxInbound,
-                        int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs,
-                        int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams,
-                        int64_t totalConns, int64_t maxConns, int8_t accessState) {
-  char sql[1024] = {0};
-  sprintf(sql,
-          "insert into %s.acct_%s using %s.acct tags('%s') values(now"
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-	      ", %" PRId64 ", %" PRId64
-          ", %d)",
-          tsMonitorDbName, acctId, tsMonitorDbName, acctId,
-          currentPointsPerSecond, maxPointsPerSecond,
-          totalTimeSeries, maxTimeSeries,
-          totalStorage, maxStorage,
-          totalQueryTime, maxQueryTime,
-          totalInbound, maxInbound,
-          totalOutbound, maxOutbound,
-          totalDbs, maxDbs,
-          totalUsers, maxUsers,
-          totalStreams, maxStreams,
-          totalConns, maxConns,
-          accessState);
-
-  monitorTrace("monitor:%p, save account info, sql %s", monitor->conn, sql);
-  taos_query_a(monitor->conn, sql, dnodeMontiorInsertAcctCallback, "account");
-}
-
-void monitorSaveLog(int level, const char *const format, ...) {
-  va_list argpointer;
-  char    sql[SQL_LENGTH] = {0};
-  int     max_length = SQL_LENGTH - 30;
-
-  if (monitor->state != MONITOR_STATE_INITIALIZED) {
-    return;
-  }
-
-  int len = snprintf(sql, (size_t)max_length, "import into %s.log values(%" PRId64 ", %d,'", tsMonitorDbName,
-                     taosGetTimestampUs(), level);
-
-  va_start(argpointer, format);
-  len += vsnprintf(sql + len, (size_t)(max_length - len), format, argpointer);
-  va_end(argpointer);
-  if (len > max_length) len = max_length;
-
-  len += sprintf(sql + len, "', '%s')", tsPrivateIp);
-  sql[len++] = 0;
-
-  monitorTrace("monitor:%p, save log, sql: %s", monitor->conn, sql);
-  taos_query_a(monitor->conn, sql, dnodeMontiorInsertLogCallback, "log");
-}
-
-void monitorExecuteSQL(char *sql) {
-  monitorTrace("monitor:%p, execute sql: %s", monitor->conn, sql);
-  taos_query_a(monitor->conn, sql, NULL, NULL);
-}
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index f88209ad9bee533ac24a25f653f80c8b796bfd2f..4e44d29a025eee1eb8b850494b235dc48e9c050a 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -1,6 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-ADD_SUBDIRECTORY(linux)
-ADD_SUBDIRECTORY(windows)
-ADD_SUBDIRECTORY(darwin)
+IF (TD_LINUX)
+  ADD_SUBDIRECTORY(src/linux)
+ELSEIF (TD_DARWIN)
+  ADD_SUBDIRECTORY(src/darwin)  
+ELSEIF (TD_WINDOWS)
+  ADD_SUBDIRECTORY(src/windows)
+ENDIF ()
+
+ADD_SUBDIRECTORY(src/detail)
diff --git a/src/os/darwin/CMakeLists.txt b/src/os/darwin/CMakeLists.txt
deleted file mode 100644
index 116d0ec8c0c7198bc836d6d2dc741daba3d97137..0000000000000000000000000000000000000000
--- a/src/os/darwin/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF (TD_DARWIN_64)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(os ${SRC})
-ENDIF ()
diff --git a/src/os/darwin/inc/os.h b/src/os/darwin/inc/os.h
deleted file mode 100644
index 1aececeec9ad3f3447fe46bb03dc61ddfb9ec8f2..0000000000000000000000000000000000000000
--- a/src/os/darwin/inc/os.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * 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_PLATFORM_LINUX_H
-#define TDENGINE_PLATFORM_LINUX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <dispatch/dispatch.h>
-
-#define htobe64 htonll
-
-#define taosCloseSocket(x) \
-  {                        \
-    if (FD_VALID(x)) {     \
-      close(x);            \
-      x = FD_INITIALIZER;  \
-    }                      \
-  }
-  
-#define taosWriteSocket(fd, buf, len) write(fd, buf, len)
-#define taosReadSocket(fd, buf, len) read(fd, buf, len)
-
-#define atomic_load_8(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_16(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_32(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_64(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_ptr(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-
-#define atomic_store_8(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_16(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_32(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_64(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_ptr(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_exchange_8(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_16(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_32(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_64(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_ptr(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_16 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_32 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_64 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
-
-#define atomic_add_fetch_8(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_16(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_32(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_64(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_ptr(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_add_8(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_16(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_32(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_64(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_ptr(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_sub_fetch_8(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_16(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_32(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_64(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_ptr(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_sub_8(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_16(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_32(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_64(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_ptr(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_and_fetch_8(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_16(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_32(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_64(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_ptr(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_and_8(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_16(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_32(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_64(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_ptr(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_or_fetch_8(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_16(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_32(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_64(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_ptr(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_or_8(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_16(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_32(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_64(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_ptr(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_xor_fetch_8(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_16(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_32(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_64(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_ptr(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_xor_8(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_16(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_32(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_64(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_ptr(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define SWAP(a, b, c)      \
-  do {                     \
-    typeof(a) __tmp = (a); \
-    (a) = (b);             \
-    (b) = __tmp;           \
-  } while (0)
-
-#define MAX(a, b)            \
-  ({                         \
-    typeof(a) __a = (a);     \
-    typeof(b) __b = (b);     \
-    (__a > __b) ? __a : __b; \
-  })
-
-#define MIN(a, b)            \
-  ({                         \
-    typeof(a) __a = (a);     \
-    typeof(b) __b = (b);     \
-    (__a < __b) ? __a : __b; \
-  })
-
-#define MILLISECOND_PER_SECOND ((int64_t)1000L)
-
-#define tsem_t dispatch_semaphore_t
-
-int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value);
-int tsem_wait(dispatch_semaphore_t *sem);
-int tsem_post(dispatch_semaphore_t *sem);
-int tsem_destroy(dispatch_semaphore_t *sem);
-
-ssize_t twrite(int fd, void *buf, size_t n);
-
-char *taosCharsetReplace(char *charsetstr);
-
-bool taosCheckPthreadValid(pthread_t thread);
-
-void taosResetPthread(pthread_t *thread);
-
-int64_t taosGetPthreadId();
-
-int taosSetNonblocking(int sock, int on);
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen);
-
-void tsPrintOsInfo();
-
-char *taosCharsetReplace(char *charsetstr);
-
-void tsPrintOsInfo();
-
-void taosGetSystemInfo();
-
-void taosKillSystem();
-
-bool taosSkipSocketCheck();
-
-bool taosGetDisk();
-
-int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count);
-
-void taosSetCoreDump();
-
-typedef int(*__compar_fn_t)(const void *, const void *);
-
-// for send function in tsocket.c
-#define MSG_NOSIGNAL             0
-#define SO_NO_CHECK              0x1234
-#define SOL_TCP                  0x1234
-#define TCP_KEEPIDLE             0x1234
-
-#ifndef PTHREAD_MUTEX_RECURSIVE_NP
-  #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-#endif
-
-#ifndef _TD_ARM_32_
-#define BUILDIN_CLZL(val) __builtin_clzl(val)
-#define BUILDIN_CTZL(val) __builtin_ctzl(val)
-#else
-#define BUILDIN_CLZL(val) __builtin_clzll(val)
-#define BUILDIN_CTZL(val) __builtin_ctzll(val)
-#endif
-#define BUILDIN_CLZ(val)  __builtin_clz(val)
-#define BUILDIN_CTZ(val)  __builtin_ctz(val)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/os/darwin/src/tdarwin.c b/src/os/darwin/src/tdarwin.c
deleted file mode 100644
index af3b1bd8a50d9f52d5f81f4dd42f483c510866c9..0000000000000000000000000000000000000000
--- a/src/os/darwin/src/tdarwin.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * 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 <errno.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdint.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tsdb.h"
-#include "tutil.h"
-
-char configDir[TSDB_FILENAME_LEN] = "/etc/taos";
-char tsDirectory[TSDB_FILENAME_LEN] = "/var/lib/taos";
-char dataDir[TSDB_FILENAME_LEN] = "/var/lib/taos";
-char logDir[TSDB_FILENAME_LEN] = "~/TDengineLog";
-char scriptDir[TSDB_FILENAME_LEN] = "/etc/taos";
-char osName[] = "Darwin";
-
-int64_t str2int64(char *str) {
-  char *endptr = NULL;
-  return strtoll(str, &endptr, 10);
-}
-
-/*
-  to make taosMsleep work,
-   signal SIGALRM shall be blocked in the calling thread,
-
-  sigset_t set;
-  sigemptyset(&set);
-  sigaddset(&set, SIGALRM);
-  pthread_sigmask(SIG_BLOCK, &set, NULL);
-*/
-void taosMsleep(int mseconds) {
-  struct timeval timeout;
-  int            seconds, useconds;
-
-  seconds = mseconds / 1000;
-  useconds = (mseconds % 1000) * 1000;
-  timeout.tv_sec = seconds;
-  timeout.tv_usec = useconds;
-
-  /* sigset_t set; */
-  /* sigemptyset(&set); */
-  /* sigaddset(&set, SIGALRM); */
-  /* pthread_sigmask(SIG_BLOCK, &set, NULL); */
-
-  select(0, NULL, NULL, NULL, &timeout);
-
-  /* pthread_sigmask(SIG_UNBLOCK, &set, NULL); */
-}
-
-bool taosCheckPthreadValid(pthread_t thread) { return thread != 0; }
-
-void taosResetPthread(pthread_t *thread) { *thread = 0; }
-
-int64_t taosGetPthreadId() { return (int64_t)pthread_self(); }
-
-/*
-* Function to get the private ip address of current machine. If get IP
-* successfully, return 0, else, return -1. The return values is ip.
-*
-* Use:
-* if (taosGetPrivateIp(ip) != 0) {
-*     perror("Fail to get private IP address\n");
-*     exit(EXIT_FAILURE);
-* }
-*/
-int taosGetPrivateIp(char *const ip) {
-  bool hasLoCard = false;
-
-  struct ifaddrs *ifaddr, *ifa;
-  int             family, s;
-  char            host[NI_MAXHOST];
-
-  if (getifaddrs(&ifaddr) == -1) {
-    return -1;
-  }
-
-  /* Walk through linked list, maintaining head pointer so we can free list later */
-  int flag = 0;
-  for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr == NULL) continue;
-
-    family = ifa->ifa_addr->sa_family;
-    if (strcmp("lo", ifa->ifa_name) == 0) {
-      hasLoCard = true;
-      continue;
-    }
-
-    if (family == AF_INET) {
-      /* printf("%-8s", ifa->ifa_name); */
-      s = getnameinfo(ifa->ifa_addr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6),
-                      host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-      if (s != 0) {
-        freeifaddrs(ifaddr);
-        return -1;
-      }
-
-      strcpy(ip, host);
-      flag = 1;
-      break;
-    }
-  }
-
-  freeifaddrs(ifaddr);
-  if (flag) {
-    return 0;
-  } else {
-    if (hasLoCard) {
-      pPrint("no net card was found, use lo:127.0.0.1 as default");
-      strcpy(ip, "127.0.0.1");
-      return 0;
-    }
-    return -1;
-  }
-}
-
-int taosSetNonblocking(int sock, int on) {
-  int flags = 0;
-  if ((flags = fcntl(sock, F_GETFL, 0)) < 0) {
-    pError("fcntl(F_GETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-
-  if (on)
-    flags |= O_NONBLOCK;
-  else
-    flags &= ~O_NONBLOCK;
-
-  if ((flags = fcntl(sock, F_SETFL, flags)) < 0) {
-    pError("fcntl(F_SETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-
-  return 0;
-}
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) {
-  if (level == SOL_SOCKET && optname == SO_SNDBUF) {
-    return 0;
-  }
-
-  if (level == SOL_SOCKET && optname == SO_RCVBUF) {
-    return 0;
-  }
-
-  return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen);
-}
-
-int taosOpenUDClientSocket(char *ip, uint16_t port) {
-  int                sockFd = 0;
-  struct sockaddr_un serverAddr;
-  int                ret;
-  char               name[128];
-  sprintf(name, "%s.%hu", ip, port);
-
-  sockFd = socket(AF_UNIX, SOCK_STREAM, 0);
-
-  if (sockFd < 0) {
-    pError("failed to open the UD socket:%s, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  memset((char *)&serverAddr, 0, sizeof(serverAddr));
-  serverAddr.sun_family = AF_UNIX;
-  strcpy(serverAddr.sun_path + 1, name);
-
-  ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
-
-  if (ret != 0) {
-    pError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno));
-    sockFd = -1;
-  }
-
-  return sockFd;
-}
-
-int taosOpenUDServerSocket(char *ip, uint16_t port) {
-  struct sockaddr_un serverAdd;
-  int                sockFd;
-  char               name[128];
-
-  pTrace("open ud socket:%s", name);
-  sprintf(name, "%s.%hu", ip, port);
-
-  bzero((char *)&serverAdd, sizeof(serverAdd));
-  serverAdd.sun_family = AF_UNIX;
-  strcpy(serverAdd.sun_path + 1, name);
-  unlink(name);
-
-  if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-    pError("failed to open UD socket:%s, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  /* bind socket to server address */
-  if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) {
-    pError("bind socket:%s failed, reason:%s", name, strerror(errno));
-    tclose(sockFd);
-    return -1;
-  }
-
-  if (listen(sockFd, 10) < 0) {
-    pError("listen socket:%s failed, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  return sockFd;
-}
-
-int taosInitTimer(void (*callback)(int), int ms) {
-  signal(SIGALRM, callback);
-
-  struct itimerval tv;
-  tv.it_interval.tv_sec = 0;  /* my timer resolution */
-  tv.it_interval.tv_usec = 1000 * ms;  // resolution is in msecond
-  tv.it_value = tv.it_interval;
-
-  return setitimer(ITIMER_REAL, &tv, NULL);
-}
-
-void taosGetSystemTimezone() {
-  // get and set default timezone
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  if (cfg_timezone && cfg_timezone->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    char *tz = getenv("TZ");
-    if (tz == NULL || strlen(tz) == 0) {
-      strcpy(tsTimezone, "not configured");
-    }
-    else {
-      strcpy(tsTimezone, tz);
-    }
-    cfg_timezone->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-    pPrint("timezone not configured, use default");
-  }
-}
-
-void taosGetSystemLocale() {
-  // get and set default locale
-  SGlobalConfig *cfg_locale = tsGetConfigOption("locale");
-  if (cfg_locale && cfg_locale->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    char *locale = setlocale(LC_CTYPE, "chs");
-    if (locale != NULL) {
-      strncpy(tsLocale, locale, sizeof(tsLocale) / sizeof(tsLocale[0]));
-      cfg_locale->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-      pPrint("locale not configured, set to default:%s", tsLocale);
-    }
-  }
-
-  SGlobalConfig *cfg_charset = tsGetConfigOption("charset");
-  if (cfg_charset && cfg_charset->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    strcpy(tsCharset, "cp936");
-    cfg_charset->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-    pPrint("charset not configured, set to default:%s", tsCharset);
-  }
-}
-
-
-void tsPrintOsInfo() {}
-
-void taosKillSystem() {
-  tError("function taosKillSystem, exit!");
-  exit(0);
-}
-
-bool taosGetDisk() {
-  return true;
-}
-
-void taosGetSystemInfo() {
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
-}
-
-void *taosInitTcpClient(char *ip, uint16_t port, char *flabel, int num, void *fp, void *shandle) {
-  tError("function taosInitTcpClient is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosCloseTcpClientConnection(void *chandle) {
-  tError("function taosCloseTcpClientConnection is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port) {
-  tError("function taosOpenTcpClientConnection is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-int taosSendTcpClientData(unsigned int ip, uint16_t port, char *data, int len, void *chandle) {
-  tError("function taosSendTcpClientData is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosCleanUpTcpClient(void *chandle) {
-  tError("function taosCleanUpTcpClient is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosCloseTcpServerConnection(void *chandle) {
-  tError("function taosCloseTcpServerConnection is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosCleanUpTcpServer(void *handle) {
-  tError("function taosCleanUpTcpServer is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) {
-  tError("function taosInitTcpServer is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-int taosSendTcpServerData(unsigned int ip, uint16_t port, char *data, int len, void *chandle) {
-  tError("function taosSendTcpServerData is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosFreeMsgHdr(void *hdr) {
-  tError("function taosFreeMsgHdr is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-int taosMsgHdrSize(void *hdr) {
-  tError("function taosMsgHdrSize is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosSendMsgHdr(void *hdr, int fd) {
-  tError("function taosSendMsgHdr is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosInitMsgHdr(void **hdr, void *dest, int maxPkts) {
-  tError("function taosInitMsgHdr is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-void taosSetMsgHdrData(void *hdr, char *data, int dataLen) {
-  tError("function taosSetMsgHdrData is not implemented in darwin system, exit!");
-  exit(0);
-}
-
-ssize_t twrite(int fd, void *buf, size_t n) {
-  size_t nleft = n; 
-  ssize_t nwritten = 0;
-  char *tbuf = (char *)buf;
-
-  while (nleft > 0) {
-    nwritten = write(fd, (void *)tbuf, nleft);
-    if (nwritten < 0) {
-      if (errno == EINTR) {
-        continue;
-      }
-      return -1;
-    }
-    nleft -= nwritten;
-    tbuf += nwritten;
-  }
-
-  return n;
-}
-
-bool taosSkipSocketCheck() {
-  return true;
-}
-
-int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value) {
-  *sem = dispatch_semaphore_create(value);
-  if (*sem == NULL) {
-    return -1;
-  } else {
-    return 0;
-  }
-}
-
-int tsem_wait(dispatch_semaphore_t *sem) {
-  dispatch_semaphore_wait(*sem, DISPATCH_TIME_FOREVER);
-  return 0;
-}
-
-int tsem_post(dispatch_semaphore_t *sem) {
-  dispatch_semaphore_signal(*sem);
-  return 0;
-}
-
-int tsem_destroy(dispatch_semaphore_t *sem) {
-  return 0;
-}
-
-int32_t __sync_val_load_32(int32_t *ptr) {
-  return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
-}
-
-void __sync_val_restore_32(int32_t *ptr, int32_t newval) {
-  __atomic_store_n(ptr, newval, __ATOMIC_RELEASE);
-}
-
-#define _SEND_FILE_STEP_ 1000
-
-int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
-  fseek(in_file, (int32_t)(*offset), 0);
-  int writeLen = 0;
-  uint8_t buffer[_SEND_FILE_STEP_] = { 0 };
-
-  for (int len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
-    size_t rlen = fread(buffer, 1, _SEND_FILE_STEP_, in_file);
-    if (rlen <= 0) {
-      return writeLen;
-    }
-    else if (rlen < _SEND_FILE_STEP_) {
-      fwrite(buffer, 1, rlen, out_file);
-      return (int)(writeLen + rlen);
-    }
-    else {
-      fwrite(buffer, 1, _SEND_FILE_STEP_, in_file);
-      writeLen += _SEND_FILE_STEP_;
-    }
-  }
-
-  int remain = count - writeLen;
-  if (remain > 0) {
-    size_t rlen = fread(buffer, 1, remain, in_file);
-    if (rlen <= 0) {
-      return writeLen;
-    }
-    else {
-      fwrite(buffer, 1, remain, out_file);
-      writeLen += remain;
-    }
-  }
-
-  return writeLen;
-}
-
-void taosSetCoreDump() {}
\ No newline at end of file
diff --git a/src/os/inc/os.h b/src/os/inc/os.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4b71173a07fe2c36ee1479bc94bbf274b8dd6b6
--- /dev/null
+++ b/src/os/inc/os.h
@@ -0,0 +1,73 @@
+/*
+ * 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_OS_H
+#define TDENGINE_OS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _TD_DARWIN_64
+#include "osDarwin.h"
+#endif
+
+#ifdef _TD_ARM_64_
+#include "osArm64.h"
+#endif
+
+#ifdef _TD_LINUX_64
+#include "osLinux64.h"
+#endif
+
+#ifdef _TD_LINUX_32
+#include "osLinux32.h"
+#endif
+
+#ifdef _ALPINE
+#include "osAlpine.h"
+#endif
+
+#ifdef _TD_NINGSI_60_
+#include "osNingsi.h"
+#endif
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+#include "osWindows.h"
+#endif
+
+#include "osAtomic.h"
+#include "osCommon.h"
+#include "osDef.h"
+#include "osDir.h"
+#include "osFile.h"
+#include "osLz4.h"
+#include "osMath.h"
+#include "osMemory.h"
+#include "osRand.h"
+#include "osSemphone.h"
+#include "osSocket.h"
+#include "osString.h"
+#include "osSysinfo.h"
+#include "osTime.h"
+#include "osTimer.h"
+
+void osInit();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osAlpine.h b/src/os/inc/osAlpine.h
new file mode 100644
index 0000000000000000000000000000000000000000..d939adfb6dafb5251f936187225857660842e54e
--- /dev/null
+++ b/src/os/inc/osAlpine.h
@@ -0,0 +1,91 @@
+/*
+ * 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_OS_ALPINE_H
+#define TDENGINE_OS_ALPINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <argp.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <float.h>
+#include <ifaddrs.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wordexp.h>
+#include <wctype.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+#include <sys/resource.h>
+#include <linux/sysctl.h>
+
+typedef int(*__compar_fn_t)(const void *, const void *);
+void  error (int, int, const char *);
+#ifndef PTHREAD_MUTEX_RECURSIVE_NP
+  #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osArm64.h b/src/os/inc/osArm64.h
new file mode 100644
index 0000000000000000000000000000000000000000..3ae08b45f49c588315ce014e092d452e2fad303e
--- /dev/null
+++ b/src/os/inc/osArm64.h
@@ -0,0 +1,85 @@
+/*
+ * 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_OS_ARM64_H
+#define TDENGINE_OS_ARM64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <argp.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <float.h>
+#include <ifaddrs.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wordexp.h>
+#include <wctype.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+#include <sys/resource.h>
+#include <error.h>
+#include <linux/sysctl.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osAtomic.h b/src/os/inc/osAtomic.h
new file mode 100644
index 0000000000000000000000000000000000000000..803c351400905971ff7343b255bd1873bb0c5d94
--- /dev/null
+++ b/src/os/inc/osAtomic.h
@@ -0,0 +1,113 @@
+/*
+ * 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_OS_ATOMIC_H
+#define TDENGINE_OS_ATOMIC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_FUNC_ATOMIC
+  #define atomic_load_8(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
+  #define atomic_load_16(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
+  #define atomic_load_32(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
+  #define atomic_load_64(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
+  #define atomic_load_ptr(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
+
+  #define atomic_store_8(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_store_16(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_store_32(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_store_64(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_store_ptr(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_exchange_8(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_exchange_16(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_exchange_32(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_exchange_64(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_exchange_ptr(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
+  #define atomic_val_compare_exchange_16 __sync_val_compare_and_swap
+  #define atomic_val_compare_exchange_32 __sync_val_compare_and_swap
+  #define atomic_val_compare_exchange_64 __sync_val_compare_and_swap
+  #define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
+
+  #define atomic_add_fetch_8(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_add_fetch_16(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_add_fetch_32(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_add_fetch_64(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_add_fetch_ptr(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_fetch_add_8(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_add_16(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_add_32(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_add_64(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_add_ptr(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_sub_fetch_8(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_sub_fetch_16(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_sub_fetch_32(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_sub_fetch_64(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_sub_fetch_ptr(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_fetch_sub_8(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_sub_16(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_sub_32(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_sub_64(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_sub_ptr(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_and_fetch_8(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_and_fetch_16(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_and_fetch_32(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_and_fetch_64(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_and_fetch_ptr(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_fetch_and_8(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_and_16(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_and_32(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_and_64(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_and_ptr(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_or_fetch_8(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_or_fetch_16(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_or_fetch_32(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_or_fetch_64(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_or_fetch_ptr(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_fetch_or_8(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_or_16(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_or_32(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_or_64(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_or_ptr(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_xor_fetch_8(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_xor_fetch_16(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_xor_fetch_32(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_xor_fetch_64(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_xor_fetch_ptr(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
+
+  #define atomic_fetch_xor_8(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_xor_16(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_xor_32(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_xor_64(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+  #define atomic_fetch_xor_ptr(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osCommon.h b/src/os/inc/osCommon.h
new file mode 100644
index 0000000000000000000000000000000000000000..70d2b2c0c243cd13d5309e4c5e25c4bed3bae277
--- /dev/null
+++ b/src/os/inc/osCommon.h
@@ -0,0 +1,31 @@
+/*
+ * 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_OS_COMMON_H
+#define TDENGINE_OS_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_DEF_ZU
+  #define PRIzu "zu"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osDarwin.h b/src/os/inc/osDarwin.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1a950fbe6375b14e3cf25277eb933b96e518f10
--- /dev/null
+++ b/src/os/inc/osDarwin.h
@@ -0,0 +1,108 @@
+/*
+ * 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_OS_DARWIN_H
+#define TDENGINE_OS_DARWIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <float.h>
+#include <ifaddrs.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wordexp.h>
+#include <wctype.h>
+#include <inttypes.h>
+#include <dispatch/dispatch.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+
+#define TAOS_OS_FUNC_FILE_SENDIFLE
+  #define taosFSendFile(outfile, infile, offset, count) taosFSendFileImp(outfile, infile, offset, size)
+  #define taosTSendFile(dfd, sfd, offset, size) taosTSendFileImp(dfd, sfd, offset, size)
+
+#define TAOS_OS_FUNC_SEMPHONE
+  #define tsem_t dispatch_semaphore_t
+  int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value);
+  int tsem_wait(dispatch_semaphore_t *sem);
+  int tsem_post(dispatch_semaphore_t *sem);
+  int tsem_destroy(dispatch_semaphore_t *sem);
+
+#define TAOS_OS_FUNC_SOCKET_SETSOCKETOPT
+#define TAOS_OS_FUNC_STRING_STR2INT64
+#define TAOS_OS_FUNC_SYSINFO
+#define TAOS_OS_FUNC_TIMER
+
+// specific
+#define htobe64 htonll
+typedef int(*__compar_fn_t)(const void *, const void *);
+
+// for send function in tsocket.c
+#define MSG_NOSIGNAL             0
+#define SO_NO_CHECK              0x1234
+#define SOL_TCP                  0x1234
+#define TCP_KEEPIDLE             0x1234
+
+#ifndef PTHREAD_MUTEX_RECURSIVE_NP
+  #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osDef.h b/src/os/inc/osDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..81c70a58fdf01e405d2e665b5a017a4696d76e91
--- /dev/null
+++ b/src/os/inc/osDef.h
@@ -0,0 +1,104 @@
+/*
+ * 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_OS_DEF_H
+#define TDENGINE_OS_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO (2)
+#endif
+
+#define FD_VALID(x) ((x) > STDERR_FILENO)
+#define FD_INITIALIZER  ((int32_t)-1)
+
+#define WCHAR wchar_t
+
+#define POINTER_SHIFT(p, b) ((void *)((char *)(p) + (b)))
+#define POINTER_DISTANCE(p1, p2) ((char *)(p1) - (char *)(p2)) 
+
+#ifndef NDEBUG
+#define ASSERT(x) assert(x)
+#else
+#define ASSERT(x)
+#endif
+
+#ifdef UNUSED
+#undefine UNUSED
+#endif
+#define UNUSED(x) ((void)(x))
+
+#ifdef UNUSED_FUNC
+#undefine UNUSED_FUNC
+#endif
+
+#ifdef UNUSED_PARAM
+#undef UNUSED_PARAM
+#endif
+
+#if defined(__GNUC__)
+#define UNUSED_PARAM(x) _UNUSED##x __attribute__((unused))
+#define UNUSED_FUNC __attribute__((unused))
+#else
+#define UNUSED_PARAM(x) x
+#define UNUSED_FUNC
+#endif
+
+#ifdef tListLen
+#undefine tListLen
+#endif
+#define tListLen(x) (sizeof(x) / sizeof((x)[0]))
+
+#if defined(__GNUC__)
+#define FORCE_INLINE inline __attribute__((always_inline))
+#else
+#define FORCE_INLINE
+#endif
+
+#define DEFAULT_UNICODE_ENCODEC "UCS-4LE"
+
+#define DEFAULT_COMP(x, y)       \
+  do {                           \
+    if ((x) == (y)) {            \
+      return 0;                  \
+    } else {                     \
+      return (x) < (y) ? -1 : 1; \
+    }                            \
+  } while (0)
+
+#define ALIGN_NUM(n, align) (((n) + ((align)-1)) & (~((align)-1)))
+
+// align to 8bytes
+#define ALIGN8(n) ALIGN_NUM(n, 8)
+
+#undef threadlocal
+#ifdef _ISOC11_SOURCE
+  #define threadlocal _Thread_local
+#elif defined(__APPLE__)
+  #define threadlocal
+#elif defined(__GNUC__) && !defined(threadlocal)
+  #define threadlocal __thread
+#else
+  #define threadlocal
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osDir.h b/src/os/inc/osDir.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a522dadb590bdeebe130850ad4bd73cfc37bb8d
--- /dev/null
+++ b/src/os/inc/osDir.h
@@ -0,0 +1,34 @@
+/*
+ * 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_OS_DIR_H
+#define TDENGINE_OS_DIR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TAOS_OS_FUNC_DIR
+void taosRemoveDir(char *rootDir);
+int  taosMkDir(const char *pathname, mode_t mode); 
+void taosRename(char* oldName, char *newName);
+void taosRemoveOldLogFiles(char *rootDir, int32_t keepDays);
+int32_t taosCompressFile(char *srcFileName, char *destFileName);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osFile.h b/src/os/inc/osFile.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc19c8177c62307ca110486c130f6a6b56047ef4
--- /dev/null
+++ b/src/os/inc/osFile.h
@@ -0,0 +1,67 @@
+/*
+ * 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_OS_FILE_H
+#define TDENGINE_OS_FILE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ssize_t taosTReadImp(int fd, void *buf, size_t count);
+ssize_t taosTWriteImp(int fd, void *buf, size_t count);
+
+ssize_t taosTSendFileImp(int dfd, int sfd, off_t *offset, size_t size);
+int     taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count);
+
+#ifndef TAOS_OS_FUNC_FILE_SENDIFLE
+  #define taosTSendFile(dfd, sfd, offset, size) taosTSendFileImp(dfd, sfd, offset, size)
+  #define taosFSendFile(outfile, infile, offset, count) taosTSendFileImp(fileno(outfile), fileno(infile), offset, size)
+#endif
+
+#define taosTRead(fd, buf, count) taosTReadImp(fd, buf, count)
+#define taosTWrite(fd, buf, count) taosTWriteImp(fd, buf, count)
+#define taosLSeek(fd, offset, whence) lseek(fd, offset, whence)
+
+#ifdef TAOS_RANDOM_FILE_FAIL
+  void taosSetRandomFileFailFactor(int factor);
+  void taosSetRandomFileFailOutput(const char *path);
+  #ifdef TAOS_RANDOM_FILE_FAIL_TEST
+    ssize_t taosReadFileRandomFail(int fd, void *buf, size_t count, const char *file, uint32_t line);
+    ssize_t taosWriteFileRandomFail(int fd, void *buf, size_t count, const char *file, uint32_t line);
+    off_t taosLSeekRandomFail(int fd, off_t offset, int whence, const char *file, uint32_t line);
+    #undef taosTRead
+    #undef taosTWrite
+    #undef taosLSeek
+    #define taosTRead(fd, buf, count) taosReadFileRandomFail(fd, buf, count, __FILE__, __LINE__)
+    #define taosTWrite(fd, buf, count) taosWriteFileRandomFail(fd, buf, count, __FILE__, __LINE__)
+    #define taosLSeek(fd, offset, whence) taosLSeekRandomFail(fd, offset, whence, __FILE__, __LINE__)
+  #endif  
+#endif 
+
+int32_t taosFileRename(char *fullPath, char *suffix, char delimiter, char **dstPath);
+
+// TAOS_OS_FUNC_FILE_GETTMPFILEPATH
+void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath);
+
+#ifndef TAOS_OS_FUNC_FILE_FTRUNCATE
+  #define taosFtruncate ftruncate
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osLinux32.h b/src/os/inc/osLinux32.h
new file mode 100644
index 0000000000000000000000000000000000000000..93e917e797a60c9704726ea44d585d33d4ec102a
--- /dev/null
+++ b/src/os/inc/osLinux32.h
@@ -0,0 +1,90 @@
+/*
+ * 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_OS_LINUX32_H
+#define TDENGINE_OS_LINUX32_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <argp.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <float.h>
+#include <ifaddrs.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wordexp.h>
+#include <wctype.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+#include <sys/resource.h>
+#include <error.h>
+
+#define TAOS_OS_FUNC_LZ4
+#define BUILDIN_CLZL(val) __builtin_clzll(val)
+#define BUILDIN_CTZL(val) __builtin_ctzll(val)
+#define BUILDIN_CLZ(val) __builtin_clz(val)
+#define BUILDIN_CTZ(val) __builtin_ctz(val)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osLinux64.h b/src/os/inc/osLinux64.h
new file mode 100644
index 0000000000000000000000000000000000000000..c0841c41bde7ab848bcae2b9cbd037675407afbf
--- /dev/null
+++ b/src/os/inc/osLinux64.h
@@ -0,0 +1,87 @@
+/*
+ * 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_OS_LINUX64_H
+#define TDENGINE_OS_LINUX64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <argp.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <endian.h>
+#include <errno.h>
+#include <float.h>
+#include <ifaddrs.h>
+#include <libgen.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <regex.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/sendfile.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wordexp.h>
+#include <wctype.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+#include <sys/resource.h>
+#ifndef _ALPINE
+#include <error.h>
+#endif
+#include <linux/sysctl.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osLz4.h b/src/os/inc/osLz4.h
new file mode 100644
index 0000000000000000000000000000000000000000..a944892c482470a60c17a13f693c19801bde2081
--- /dev/null
+++ b/src/os/inc/osLz4.h
@@ -0,0 +1,34 @@
+/*
+ * 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_OS_LZ4_H
+#define TDENGINE_OS_LZ4_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_FUNC_LZ4
+  #define BUILDIN_CLZL(val) __builtin_clzl(val)
+  #define BUILDIN_CTZL(val) __builtin_ctzl(val)
+  #define BUILDIN_CLZ(val) __builtin_clz(val)
+  #define BUILDIN_CTZ(val) __builtin_ctz(val)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osMath.h b/src/os/inc/osMath.h
new file mode 100644
index 0000000000000000000000000000000000000000..9935f94d39ef0431b7c9b1a524b956e6fafe9f4f
--- /dev/null
+++ b/src/os/inc/osMath.h
@@ -0,0 +1,53 @@
+/*
+ * 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_OS_MATH_H
+#define TDENGINE_OS_MATH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define POW2(x) ((x) * (x))
+#define ABS(x) ((x) > 0 ? (x) : -(x))
+
+#ifndef TAOS_OS_FUNC_MATH
+  #define SWAP(a, b, c)        \
+    do {                       \
+        typeof(a) __tmp = (a); \
+        (a) = (b);             \
+        (b) = __tmp;           \
+    } while (0)
+
+  #define MAX(a, b)              \
+    ({                           \
+        typeof(a) __a = (a);     \
+        typeof(b) __b = (b);     \
+        (__a > __b) ? __a : __b; \
+    })
+
+  #define MIN(a, b)              \
+    ({                           \
+        typeof(a) __a = (a);     \
+        typeof(b) __b = (b);     \
+        (__a < __b) ? __a : __b; \
+    })
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osMemory.h b/src/os/inc/osMemory.h
new file mode 100644
index 0000000000000000000000000000000000000000..37d9dc9828ec1f51f36542e6c297ec3df8709f7e
--- /dev/null
+++ b/src/os/inc/osMemory.h
@@ -0,0 +1,87 @@
+/*
+ * 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_OS_MEMORY_H
+#define TDENGINE_OS_MEMORY_H
+
+#include "osString.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+  TAOS_ALLOC_MODE_DEFAULT = 0,
+  TAOS_ALLOC_MODE_RANDOM_FAIL = 1,
+  TAOS_ALLOC_MODE_DETECT_LEAK = 2
+} ETaosMemoryAllocMode;
+
+void   taosSetAllocMode(int mode, const char *path, bool autoDump);
+void   taosDumpMemoryLeak();
+
+void * taosTMalloc(size_t size);
+void * taosTCalloc(size_t nmemb, size_t size);
+void * taosTRealloc(void *ptr, size_t size);
+void   taosTZfree(void *ptr);
+size_t taosTSizeof(void *ptr);
+void   taosTMemset(void *ptr, int c);
+
+#define taosTFree(x)     \
+  do {                   \
+    if (x) {             \
+      free((void *)(x)); \
+      x = 0;             \
+    }                    \
+  } while (0);
+
+#define taosMalloc(size) malloc(size)
+#define taosCalloc(num, size) calloc(num, size)
+#define taosRealloc(ptr, size) realloc(ptr, size)
+#define taosFree(ptr) free(ptr)
+#define taosStrdup(str) taosStrdupImp(str)
+#define taosStrndup(str, size) taosStrndupImp(str, size)
+#define taosGetline(lineptr, n, stream) taosGetlineImp(lineptr, n, stream)
+
+#ifdef TAOS_MEM_CHECK
+  #ifdef TAOS_MEM_CHECK_TEST
+    void *  taos_malloc(size_t size, const char *file, uint32_t line);
+    void *  taos_calloc(size_t num, size_t size, const char *file, uint32_t line);
+    void *  taos_realloc(void *ptr, size_t size, const char *file, uint32_t line);
+    void    taos_free(void *ptr, const char *file, uint32_t line);
+    char *  taos_strdup(const char *str, const char *file, uint32_t line);
+    char *  taos_strndup(const char *str, size_t size, const char *file, uint32_t line);
+    ssize_t taos_getline(char **lineptr, size_t *n, FILE *stream, const char *file, uint32_t line);
+    #undef taosMalloc
+    #undef taosCalloc
+    #undef taosRealloc
+    #undef taosFree
+    #undef taosStrdup
+    #undef taosStrndup
+    #undef taosGetline
+    #define taosMalloc(size) taos_malloc(size, __FILE__, __LINE__)
+    #define taosCalloc(num, size) taos_calloc(num, size, __FILE__, __LINE__)
+    #define taosRealloc(ptr, size) taos_realloc(ptr, size, __FILE__, __LINE__)
+    #define taosFree(ptr) taos_free(ptr, __FILE__, __LINE__)
+    //#define taosStrdup(str) taos_strdup(str, __FILE__, __LINE__)
+    //#define taosStrndup(str, size) taos_strndup(str, size, __FILE__, __LINE__)
+    //#define taosGetline(lineptr, n, stream) taos_getline(lineptr, n, stream, __FILE__, __LINE__)
+  #endif  
+#endif 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osNingsi.h b/src/os/inc/osNingsi.h
new file mode 100644
index 0000000000000000000000000000000000000000..da7f796b595cf9303d6e178da46368f552030edd
--- /dev/null
+++ b/src/os/inc/osNingsi.h
@@ -0,0 +1,138 @@
+/*
+ * 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_OS_NINGSI_H
+#define TDENGINE_OS_NINGSI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define  TAOS_OS_FUNC_ATOMIC
+/*
+ * type __sync_fetch_and_add (type *ptr, type value);
+ * type __sync_fetch_and_sub (type *ptr, type value);
+ * type __sync_fetch_and_or (type *ptr, type value);
+ * type __sync_fetch_and_and (type *ptr, type value);
+ * type __sync_fetch_and_xor (type *ptr, type value);
+ * type __sync_fetch_and_nand (type *ptr, type value);
+ * type __sync_add_and_fetch (type *ptr, type value);
+ * type __sync_sub_and_fetch (type *ptr, type value);
+ * type __sync_or_and_fetch (type *ptr, type value);
+ * type __sync_and_and_fetch (type *ptr, type value);
+ * type __sync_xor_and_fetch (type *ptr, type value);
+ * type __sync_nand_and_fetch (type *ptr, type value);
+ *
+ * bool __sync_bool_compare_and_swap (type*ptr, type oldval, type newval, ...)
+ * type __sync_val_compare_and_swap (type *ptr, type oldval, ?type newval, ...)
+ * */
+
+#define atomic_load_8(ptr)   __sync_fetch_and_add((ptr), 0)
+#define atomic_load_16(ptr)  __sync_fetch_and_add((ptr), 0)
+#define atomic_load_32(ptr)  __sync_fetch_and_add((ptr), 0)
+#define atomic_load_64(ptr)  __sync_fetch_and_add((ptr), 0)
+#define atomic_load_ptr(ptr) __sync_fetch_and_add((ptr), 0)
+  
+#define atomic_store_8(ptr, val)   (*(ptr)=(val))
+#define atomic_store_16(ptr, val)  (*(ptr)=(val))
+#define atomic_store_32(ptr, val)  (*(ptr)=(val))
+#define atomic_store_64(ptr, val)  (*(ptr)=(val))
+#define atomic_store_ptr(ptr, val) (*(ptr)=(val))
+
+int8_t  atomic_exchange_8_impl(int8_t* ptr, int8_t val );
+int16_t atomic_exchange_16_impl(int16_t* ptr, int16_t val );
+int32_t atomic_exchange_32_impl(int32_t* ptr, int32_t val );
+int64_t atomic_exchange_64_impl(int64_t* ptr, int64_t val );
+void*   atomic_exchange_ptr_impl( void **ptr, void *val );
+
+#define atomic_exchange_8(ptr, val)   atomic_exchange_8_impl((int8_t*)ptr, (int8_t)val)
+#define atomic_exchange_16(ptr, val)  atomic_exchange_16_impl((int16_t*)ptr, (int16_t)val)
+#define atomic_exchange_32(ptr, val)  atomic_exchange_32_impl((int32_t*)ptr, (int32_t)val)
+#define atomic_exchange_64(ptr, val)  atomic_exchange_64_impl((int64_t*)ptr, (int64_t)val)
+#define atomic_exchange_ptr(ptr, val) atomic_exchange_ptr_impl((void **)ptr, (void*)val)
+    
+#define atomic_val_compare_exchange_8   __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_16  __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_32  __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_64  __sync_val_compare_and_swap
+#define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
+  
+#define atomic_add_fetch_8(ptr, val) __sync_add_and_fetch((ptr), (val))
+#define atomic_add_fetch_16(ptr, val) __sync_add_and_fetch((ptr), (val))
+#define atomic_add_fetch_32(ptr, val) __sync_add_and_fetch((ptr), (val))
+#define atomic_add_fetch_64(ptr, val) __sync_add_and_fetch((ptr), (val))
+#define atomic_add_fetch_ptr(ptr, val) __sync_add_and_fetch((ptr), (val))
+  
+#define atomic_fetch_add_8(ptr, val) __sync_fetch_and_add((ptr), (val))
+#define atomic_fetch_add_16(ptr, val) __sync_fetch_and_add((ptr), (val))
+#define atomic_fetch_add_32(ptr, val) __sync_fetch_and_add((ptr), (val))
+#define atomic_fetch_add_64(ptr, val) __sync_fetch_and_add((ptr), (val))
+#define atomic_fetch_add_ptr(ptr, val) __sync_fetch_and_add((ptr), (val))
+  
+#define atomic_sub_fetch_8(ptr, val) __sync_sub_and_fetch((ptr), (val))
+#define atomic_sub_fetch_16(ptr, val) __sync_sub_and_fetch((ptr), (val))
+#define atomic_sub_fetch_32(ptr, val) __sync_sub_and_fetch((ptr), (val))
+#define atomic_sub_fetch_64(ptr, val) __sync_sub_and_fetch((ptr), (val))
+#define atomic_sub_fetch_ptr(ptr, val) __sync_sub_and_fetch((ptr), (val))
+  
+#define atomic_fetch_sub_8(ptr, val) __sync_fetch_and_sub((ptr), (val))
+#define atomic_fetch_sub_16(ptr, val) __sync_fetch_and_sub((ptr), (val))
+#define atomic_fetch_sub_32(ptr, val) __sync_fetch_and_sub((ptr), (val))
+#define atomic_fetch_sub_64(ptr, val) __sync_fetch_and_sub((ptr), (val))
+#define atomic_fetch_sub_ptr(ptr, val) __sync_fetch_and_sub((ptr), (val))
+  
+#define atomic_and_fetch_8(ptr, val) __sync_and_and_fetch((ptr), (val))
+#define atomic_and_fetch_16(ptr, val) __sync_and_and_fetch((ptr), (val))
+#define atomic_and_fetch_32(ptr, val) __sync_and_and_fetch((ptr), (val))
+#define atomic_and_fetch_64(ptr, val) __sync_and_and_fetch((ptr), (val))
+#define atomic_and_fetch_ptr(ptr, val) __sync_and_and_fetch((ptr), (val))
+  
+#define atomic_fetch_and_8(ptr, val) __sync_fetch_and_and((ptr), (val))
+#define atomic_fetch_and_16(ptr, val) __sync_fetch_and_and((ptr), (val))
+#define atomic_fetch_and_32(ptr, val) __sync_fetch_and_and((ptr), (val))
+#define atomic_fetch_and_64(ptr, val) __sync_fetch_and_and((ptr), (val))
+#define atomic_fetch_and_ptr(ptr, val) __sync_fetch_and_and((ptr), (val))
+  
+#define atomic_or_fetch_8(ptr, val) __sync_or_and_fetch((ptr), (val))
+#define atomic_or_fetch_16(ptr, val) __sync_or_and_fetch((ptr), (val))
+#define atomic_or_fetch_32(ptr, val) __sync_or_and_fetch((ptr), (val))
+#define atomic_or_fetch_64(ptr, val) __sync_or_and_fetch((ptr), (val))
+#define atomic_or_fetch_ptr(ptr, val) __sync_or_and_fetch((ptr), (val))
+  
+#define atomic_fetch_or_8(ptr, val) __sync_fetch_and_or((ptr), (val))
+#define atomic_fetch_or_16(ptr, val) __sync_fetch_and_or((ptr), (val))
+#define atomic_fetch_or_32(ptr, val) __sync_fetch_and_or((ptr), (val))
+#define atomic_fetch_or_64(ptr, val) __sync_fetch_and_or((ptr), (val))
+#define atomic_fetch_or_ptr(ptr, val) __sync_fetch_and_or((ptr), (val))
+  
+#define atomic_xor_fetch_8(ptr, val) __sync_xor_and_fetch((ptr), (val))
+#define atomic_xor_fetch_16(ptr, val) __sync_xor_and_fetch((ptr), (val))
+#define atomic_xor_fetch_32(ptr, val) __sync_xor_and_fetch((ptr), (val))
+#define atomic_xor_fetch_64(ptr, val) __sync_xor_and_fetch((ptr), (val))
+#define atomic_xor_fetch_ptr(ptr, val) __sync_xor_and_fetch((ptr), (val))
+  
+#define atomic_fetch_xor_8(ptr, val) __sync_fetch_and_xor((ptr), (val))
+#define atomic_fetch_xor_16(ptr, val) __sync_fetch_and_xor((ptr), (val))
+#define atomic_fetch_xor_32(ptr, val) __sync_fetch_and_xor((ptr), (val))
+#define atomic_fetch_xor_64(ptr, val) __sync_fetch_and_xor((ptr), (val))
+#define atomic_fetch_xor_ptr(ptr, val) __sync_fetch_and_xor((ptr), (val))
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osRand.h b/src/os/inc/osRand.h
new file mode 100644
index 0000000000000000000000000000000000000000..803c0688bb4a9c5fab117d8548206e70b5f152db
--- /dev/null
+++ b/src/os/inc/osRand.h
@@ -0,0 +1,32 @@
+/*
+ * 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_OS_RAND_H
+#define TDENGINE_OS_RAND_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TAOS_OS_FUNC_RAND
+uint32_t taosRand(void);
+void taosRandStr(char* str, int32_t size);
+uint32_t taosSafeRand(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osSemphone.h b/src/os/inc/osSemphone.h
new file mode 100644
index 0000000000000000000000000000000000000000..4280b458a65b23b3aa680c6ed46f61beb5c48948
--- /dev/null
+++ b/src/os/inc/osSemphone.h
@@ -0,0 +1,41 @@
+/*
+ * 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_OS_SEMPHONE_H
+#define TDENGINE_OS_SEMPHONE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_FUNC_SEMPHONE
+  #define tsem_t sem_t
+  #define tsem_init sem_init
+  int tsem_wait(tsem_t* sem);
+  #define tsem_post sem_post
+  #define tsem_destroy sem_destroy
+#endif
+
+// TAOS_OS_FUNC_SEMPHONE_PTHREAD
+bool taosCheckPthreadValid(pthread_t thread);
+int64_t taosGetPthreadId();
+void taosResetPthread(pthread_t *thread);
+bool taosComparePthread(pthread_t first, pthread_t second);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osSocket.h b/src/os/inc/osSocket.h
new file mode 100644
index 0000000000000000000000000000000000000000..0ab3ff0fcafa43a404533f145a0bb1595bb29061
--- /dev/null
+++ b/src/os/inc/osSocket.h
@@ -0,0 +1,77 @@
+/*
+ * 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_OS_SOCKET_H
+#define TDENGINE_OS_SOCKET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_FUNC_SOCKET_OP
+  #define taosSend(sockfd, buf, len, flags) send(sockfd, buf, len, flags)
+  #define taosSendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto(sockfd, buf, len, flags, dest_addr, addrlen)
+  #define taosReadSocket(fd, buf, len) read(fd, buf, len)
+  #define taosWriteSocket(fd, buf, len) write(fd, buf, len)
+  #define taosCloseSocketNoCheck(x) close(x)
+  #define taosCloseSocket(x) \
+    {                        \
+      if (FD_VALID(x)) {     \
+        close(x);            \
+        x = FD_INITIALIZER;  \
+      }                      \
+    }
+  typedef int SOCKET;
+#endif
+
+#ifndef TAOS_OS_DEF_EPOLL
+  #define TAOS_EPOLL_WAIT_TIME -1
+#endif  
+
+#define taosClose(x) taosCloseSocket(x)
+
+#ifdef TAOS_RANDOM_NETWORK_FAIL
+  #ifdef TAOS_RANDOM_NETWORK_FAIL_TEST
+    ssize_t taosSendRandomFail(int sockfd, const void *buf, size_t len, int flags);
+    ssize_t taosSendToRandomFail(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen);
+    ssize_t taosReadSocketRandomFail(int fd, void *buf, size_t count);
+    ssize_t taosWriteSocketRandomFail(int fd, const void *buf, size_t count);
+    #undef taosSend
+    #undef taosSendto
+    #undef taosReadSocket
+    #undef taosWriteSocket
+    #define taosSend(sockfd, buf, len, flags) taosSendRandomFail(sockfd, buf, len, flags)
+    #define taosSendto(sockfd, buf, len, flags, dest_addr, addrlen) taosSendToRandomFail(sockfd, buf, len, flags, dest_addr, addrlen)
+    #define taosReadSocket(fd, buf, len) taosReadSocketRandomFail(fd, buf, len)
+    #define taosWriteSocket(fd, buf, len) taosWriteSocketRandomFail(fd, buf, len)
+  #endif  
+#endif
+
+// TAOS_OS_FUNC_SOCKET
+int taosSetNonblocking(SOCKET sock, int on);
+void taosBlockSIGPIPE();
+
+// TAOS_OS_FUNC_SOCKET_SETSOCKETOPT
+int taosSetSockOpt(SOCKET socketfd, int level, int optname, void *optval, int optlen);
+
+// TAOS_OS_FUNC_SOCKET_INET
+uint32_t taosInetAddr(char *ipAddr);
+const char *taosInetNtoa(struct in_addr ipInt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osString.h b/src/os/inc/osString.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2846a31bccfc61865d5729d93d48a484e0eb9b7
--- /dev/null
+++ b/src/os/inc/osString.h
@@ -0,0 +1,59 @@
+/*
+ * 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_OS_STRING_H
+#define TDENGINE_OS_STRING_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef TAOS_OS_FUNC_STRING_STRDUP
+  #define taosStrdupImp(str) strdup(str)
+  #define taosStrndupImp(str, size) strndup(str, size)
+#endif
+
+#ifndef TAOS_OS_FUNC_STRING_GETLINE
+  #define taosGetlineImp(lineptr, n, stream) getline(lineptr, n , stream)
+#else 
+  int taosGetlineImp(char **lineptr, size_t *n, FILE *stream);
+#endif
+
+#ifndef TAOS_OS_FUNC_STRING_WCHAR
+  #define twcslen wcslen
+#endif  
+
+#define tstrncpy(dst, src, size)   \
+  do {                             \
+    strncpy((dst), (src), (size)); \
+    (dst)[(size)-1] = 0;           \
+  } while (0);
+
+#ifndef TAOS_OS_FUNC_STRING_STR2INT64
+  int64_t tsosStr2int64(char *str);
+#endif  
+
+// USE_LIBICONV
+int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs);
+bool    taosMbsToUcs4(char *mbs, size_t mbs_len, char *ucs4, int32_t ucs4_max_len, size_t *len);
+int     tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int bytes);
+bool    taosValidateEncodec(const char *encodec);
+char *  taosCharsetReplace(char *charsetstr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osSysinfo.h b/src/os/inc/osSysinfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..2b98f8b4bfa36e2bb5f8c5a3d2a595df2aba74ea
--- /dev/null
+++ b/src/os/inc/osSysinfo.h
@@ -0,0 +1,43 @@
+/*
+ * 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_OS_SYSINFO_H
+#define TDENGINE_OS_SYSINFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TAOS_OS_FUNC_SYSINFO
+void taosGetSystemInfo();
+bool taosGetProcIO(float *readKB, float *writeKB);
+bool taosGetBandSpeed(float *bandSpeedKb);
+bool taosGetDisk();
+bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) ;
+bool taosGetProcMemory(float *memoryUsedMB) ;
+bool taosGetSysMemory(float *memoryUsedMB);
+void taosPrintOsInfo();
+int  taosSystem(const char * cmd) ;
+void taosKillSystem();
+bool taosGetSystemUid(char *uid);
+
+// TAOS_OS_FUNC_SYSINFO_CORE
+void taosSetCoreDump();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osTime.h b/src/os/inc/osTime.h
new file mode 100644
index 0000000000000000000000000000000000000000..99f7586f721acbc64b1c9e3e70bf2e33a6092fc8
--- /dev/null
+++ b/src/os/inc/osTime.h
@@ -0,0 +1,88 @@
+/*
+ * 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_OS_TIME_H
+#define TDENGINE_OS_TIME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "taosdef.h"
+
+#ifndef TAOS_OS_FUNC_TIME_DEF
+  #define MILLISECOND_PER_SECOND ((int64_t)1000L)
+#endif
+#define MILLISECOND_PER_MINUTE (MILLISECOND_PER_SECOND * 60)
+#define MILLISECOND_PER_HOUR   (MILLISECOND_PER_MINUTE * 60)
+#define MILLISECOND_PER_DAY    (MILLISECOND_PER_HOUR * 24)
+#define MILLISECOND_PER_WEEK   (MILLISECOND_PER_DAY * 7)
+
+//@return timestamp in second
+int32_t taosGetTimestampSec();
+
+//@return timestamp in millisecond
+static FORCE_INLINE int64_t taosGetTimestampMs() {
+  struct timeval systemTime;
+  gettimeofday(&systemTime, NULL);
+  return (int64_t)systemTime.tv_sec * 1000L + (uint64_t)systemTime.tv_usec / 1000;
+}
+
+//@return timestamp in microsecond
+static FORCE_INLINE int64_t taosGetTimestampUs() {
+  struct timeval systemTime;
+  gettimeofday(&systemTime, NULL);
+  return (int64_t)systemTime.tv_sec * 1000000L + (uint64_t)systemTime.tv_usec;
+}
+
+/*
+ * @return timestamp decided by global conf variable, tsTimePrecision
+ * if precision == TSDB_TIME_PRECISION_MICRO, it returns timestamp in microsecond.
+ *    precision == TSDB_TIME_PRECISION_MILLI, it returns timestamp in millisecond.
+ */
+static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) {
+  if (precision == TSDB_TIME_PRECISION_MICRO) {
+    return taosGetTimestampUs();
+  } else {
+    return taosGetTimestampMs();
+  }
+}
+
+
+typedef struct SInterval {
+  char intervalUnit;
+  char slidingUnit;
+  char offsetUnit;
+  int64_t interval;
+  int64_t sliding;
+  int64_t offset;
+} SInterval;
+
+int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision);
+int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision);
+int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision);
+
+int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* ts);
+int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit);
+
+int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t dayligth);
+void deltaToUtcInitOnce();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TTIME_H
diff --git a/src/os/inc/osTimer.h b/src/os/inc/osTimer.h
new file mode 100644
index 0000000000000000000000000000000000000000..d6deae2a6d1a7f6a76e4c04c53f8b6c3fa229192
--- /dev/null
+++ b/src/os/inc/osTimer.h
@@ -0,0 +1,32 @@
+/*
+ * 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_OS_TIMER_H
+#define TDENGINE_OS_TIMER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TAOS_OS_FUNC_TIMER
+void taosMsleep(int mseconds);
+int taosInitTimer(void (*callback)(int), int ms);
+void taosUninitTimer();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/os/inc/osWindows.h b/src/os/inc/osWindows.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4f3d6d2afd94bcfd2527af9927bf188ba4bf0de
--- /dev/null
+++ b/src/os/inc/osWindows.h
@@ -0,0 +1,354 @@
+/*
+* 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_OS_WINDOWS_H
+#define TDENGINE_OS_WINDOWS_H
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <float.h>
+#include <locale.h>
+#include <intrin.h>
+#include <io.h>
+#include <math.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include "winsock2.h"
+#include <WS2tcpip.h>
+#include <winbase.h>
+#include <Winsock2.h>
+#include <time.h>
+#include <inttypes.h>
+#include <conio.h>
+#include "msvcProcess.h"
+#include "msvcDirect.h"
+#include "msvcFcntl.h"
+#include "msvcStdio.h"
+#include "sys/msvcStat.h"
+#include "sys/msvcTypes.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TAOS_OS_FUNC_ATOMIC
+
+#define TAOS_OS_FUNC_LZ4
+  int32_t BUILDIN_CLZL(uint64_t val);
+  int32_t BUILDIN_CLZ(uint32_t val);
+  int32_t BUILDIN_CTZL(uint64_t val);
+  int32_t BUILDIN_CTZ(uint32_t val);
+
+#define TAOS_OS_FUNC_FILE
+#define TAOS_OS_FUNC_FILE_ISREG
+#define TAOS_OS_FUNC_FILE_ISDIR
+#define TAOS_OS_FUNC_FILE_ISLNK
+#define TAOS_OS_FUNC_FILE_SENDIFLE
+  #define taosFSendFile(outfile, infile, offset, count) taosFSendFileImp(outfile, infile, offset, size)
+  #define taosTSendFile(dfd, sfd, offset, size) taosTSendFileImp(dfd, sfd, offset, size)
+#define TAOS_OS_FUNC_FILE_GETTMPFILEPATH
+#define TAOS_OS_FUNC_FILE_FTRUNCATE
+  extern int taosFtruncate(int fd, int64_t length); 
+
+#define TAOS_OS_FUNC_MATH
+  #define SWAP(a, b, c)      \
+    do {                     \
+      c __tmp = (c)(a);      \
+      (a) = (c)(b);          \
+      (b) = __tmp;           \
+    } while (0)
+  #define MAX(a,b)  (((a)>(b))?(a):(b))
+  #define MIN(a,b)  (((a)<(b))?(a):(b))
+
+#define TAOS_OS_FUNC_SEMPHONE_PTHREAD
+
+#define TAOS_OS_FUNC_SOCKET
+#define TAOS_OS_FUNC_SOCKET_SETSOCKETOPT
+#define TAOS_OS_FUNC_SOCKET_OP
+  #define taosSend(sockfd, buf, len, flags) send((SOCKET)sockfd, buf, len, flags)
+  #define taosSendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto((SOCKET)sockfd, buf, len, flags, dest_addr, addrlen)
+  #define taosWriteSocket(fd, buf, len) send((SOCKET)fd, buf, len, 0)
+  #define taosReadSocket(fd, buf, len) recv((SOCKET)fd, buf, len, 0)
+  #define taosCloseSocketNoCheck(fd) closesocket((SOCKET)fd)
+  #define taosCloseSocket(fd) closesocket((SOCKET)fd)
+typedef SOCKET eventfd_t; 
+#define eventfd(a, b) -1
+
+#define TAOS_OS_DEF_EPOLL
+  #define TAOS_EPOLL_WAIT_TIME 100
+
+#define TAOS_OS_DEF_ZU
+  #define PRIzu "ld"  
+
+#define TAOS_OS_FUNC_STRING_WCHAR
+  int twcslen(const wchar_t *wcs);
+#define TAOS_OS_FUNC_STRING_GETLINE
+#define TAOS_OS_FUNC_STRING_STR2INT64
+  #ifdef _TD_GO_DLL_
+    int64_t tsosStr2int64(char *str);
+    uint64_t htonll(uint64_t val);
+  #else
+    #define tsosStr2int64 _atoi64
+  #endif
+#define TAOS_OS_FUNC_STRING_STRDUP
+  #define taosStrdupImp(str) _strdup(str)
+  #define taosStrndupImp(str, size) _strndup(str, size)  
+
+char *stpcpy (char *dest, const char *src);
+char *stpncpy (char *dest, const char *src, size_t n);
+
+#define TAOS_OS_FUNC_SYSINFO
+
+#define TAOS_OS_FUNC_TIME_DEF
+  #ifdef _TD_GO_DLL_
+    #define MILLISECOND_PER_SECOND (1000LL)
+  #else
+    #define MILLISECOND_PER_SECOND (1000i64)
+  #endif
+
+#define TAOS_OS_FUNC_TIMER_SLEEP
+#define TAOS_OS_FUNC_TIMER
+
+// specific
+typedef int (*__compar_fn_t)(const void *, const void *);
+#define ssize_t int
+#define bzero(ptr, size) memset((ptr), 0, (size))
+#define strcasecmp  _stricmp
+#define strncasecmp _strnicmp
+#define wcsncasecmp _wcsnicmp
+#define strtok_r strtok_s
+#define snprintf _snprintf
+#define in_addr_t unsigned long
+#define socklen_t int
+#define htobe64 htonll
+#define twrite write
+#define getpid _getpid
+
+struct tm *localtime_r(const time_t *timep, struct tm *result);
+char *     strptime(const char *buf, const char *fmt, struct tm *tm);
+char *     strsep(char **stringp, const char *delim);
+char *     getpass(const char *prefix);
+int        flock(int fd, int option);
+int        fsync(int filedes);
+char *     strndup(const char *s, size_t n);
+char *     dirname(char *pszPathname);
+int        gettimeofday(struct timeval *ptv, void *pTimeZone);
+
+// for access function in io.h
+#define F_OK 00  //Existence only
+#define W_OK 02  //Write - only
+#define R_OK 04  //Read - only
+#define X_OK 06  //Read and write
+
+// for send function in tsocket.c
+#define MSG_NOSIGNAL             0
+#define SO_NO_CHECK              0x1234
+#define SOL_TCP                  0x1234
+
+#ifndef TCP_KEEPCNT
+  #define TCP_KEEPCNT              0x1234
+#endif
+
+#ifndef TCP_KEEPIDLE
+  #define TCP_KEEPIDLE             0x1234
+#endif
+
+#ifndef TCP_KEEPINTVL
+  #define TCP_KEEPINTVL            0x1234
+#endif
+
+#ifdef _MSC_VER
+//#if _MSC_VER >= 1900
+  #define TAOS_OS_FUNC_SOCKET_INET
+//#endif
+#endif
+
+#define SHUT_RDWR                SD_BOTH
+#define SHUT_RD                  SD_RECEIVE
+#define SHUT_WR                  SD_SEND
+
+#define LOCK_EX 1
+#define LOCK_NB 2
+#define LOCK_UN 3
+
+#ifndef PATH_MAX
+  #define PATH_MAX 256
+#endif
+
+//for signal, not dispose
+#define SIGALRM 1234
+typedef int sigset_t;
+struct sigaction {
+  void (*sa_handler)(int);
+};
+int sigaction(int, struct sigaction *, void *);
+
+typedef struct {
+  int    we_wordc;
+  char **we_wordv;
+  int    we_offs;
+  char   wordPos[20];
+} wordexp_t;
+int  wordexp(const char *words, wordexp_t *pwordexp, int flags);
+void wordfree(wordexp_t *pwordexp);
+
+#define TAOS_OS_FUNC_ATOMIC
+  #define atomic_load_8(ptr) (*(char volatile*)(ptr))
+  #define atomic_load_16(ptr) (*(short volatile*)(ptr))
+  #define atomic_load_32(ptr) (*(long volatile*)(ptr))
+  #define atomic_load_64(ptr) (*(__int64 volatile*)(ptr))
+  #define atomic_load_ptr(ptr) (*(void* volatile*)(ptr))
+
+  #define atomic_store_8(ptr, val) ((*(char volatile*)(ptr)) = (char)(val))
+  #define atomic_store_16(ptr, val) ((*(short volatile*)(ptr)) = (short)(val))
+  #define atomic_store_32(ptr, val) ((*(long volatile*)(ptr)) = (long)(val))
+  #define atomic_store_64(ptr, val) ((*(__int64 volatile*)(ptr)) = (__int64)(val))
+  #define atomic_store_ptr(ptr, val) ((*(void* volatile*)(ptr)) = (void*)(val))
+
+  #define atomic_exchange_8(ptr, val) _InterlockedExchange8((char volatile*)(ptr), (char)(val))
+  #define atomic_exchange_16(ptr, val) _InterlockedExchange16((short volatile*)(ptr), (short)(val))
+  #define atomic_exchange_32(ptr, val) _InterlockedExchange((long volatile*)(ptr), (long)(val))
+  #define atomic_exchange_64(ptr, val) _InterlockedExchange64((__int64 volatile*)(ptr), (__int64)(val))
+  #ifdef _WIN64 
+    #define atomic_exchange_ptr(ptr, val) _InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val)) 
+  #else
+    #define atomic_exchange_ptr(ptr, val) _InlineInterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
+  #endif
+  
+  #ifdef _TD_GO_DLL_
+    #define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
+  #else
+    #define atomic_val_compare_exchange_8(ptr, oldval, newval) _InterlockedCompareExchange8((char volatile*)(ptr), (char)(newval), (char)(oldval))
+  #endif
+  #define atomic_val_compare_exchange_16(ptr, oldval, newval) _InterlockedCompareExchange16((short volatile*)(ptr), (short)(newval), (short)(oldval))
+  #define atomic_val_compare_exchange_32(ptr, oldval, newval) _InterlockedCompareExchange((long volatile*)(ptr), (long)(newval), (long)(oldval))
+  #define atomic_val_compare_exchange_64(ptr, oldval, newval) _InterlockedCompareExchange64((__int64 volatile*)(ptr), (__int64)(newval), (__int64)(oldval))
+  #define atomic_val_compare_exchange_ptr(ptr, oldval, newval) _InterlockedCompareExchangePointer((void* volatile*)(ptr), (void*)(newval), (void*)(oldval))
+
+  char    interlocked_add_fetch_8(char volatile *ptr, char val);
+  short   interlocked_add_fetch_16(short volatile *ptr, short val);
+  long    interlocked_add_fetch_32(long volatile *ptr, long val);
+  __int64 interlocked_add_fetch_64(__int64 volatile *ptr, __int64 val);
+
+  char interlocked_and_fetch_8(char volatile* ptr, char val);
+  short interlocked_and_fetch_16(short volatile* ptr, short val);
+  long interlocked_and_fetch_32(long volatile* ptr, long val);
+  __int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val);
+
+  __int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val);
+
+  char interlocked_or_fetch_8(char volatile* ptr, char val);
+  short interlocked_or_fetch_16(short volatile* ptr, short val);
+  long interlocked_or_fetch_32(long volatile* ptr, long val);
+  __int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val);
+
+  char interlocked_xor_fetch_8(char volatile* ptr, char val);
+  short interlocked_xor_fetch_16(short volatile* ptr, short val);
+  long interlocked_xor_fetch_32(long volatile* ptr, long val);
+  __int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val);
+
+  __int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val);
+
+  #define atomic_add_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), (char)(val))
+  #define atomic_add_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), (short)(val))
+  #define atomic_add_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), (long)(val))
+  #define atomic_add_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+  #ifdef _TD_GO_DLL_
+    #define atomic_fetch_add_8 __sync_fetch_and_ad
+    #define atomic_fetch_add_16 __sync_fetch_and_add
+  #else
+    #define atomic_fetch_add_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), (char)(val))
+    #define atomic_fetch_add_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), (short)(val))
+  #endif  
+  #define atomic_fetch_add_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), (char)(val))
+  #define atomic_fetch_add_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), (short)(val))
+  #define atomic_fetch_add_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), (long)(val))
+  #define atomic_fetch_add_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), (__int64)(val))
+  
+  #define atomic_sub_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), -(char)(val))
+  #define atomic_sub_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), -(short)(val))
+  #define atomic_sub_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), -(long)(val))
+  #define atomic_sub_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), -(__int64)(val))
+
+  #define atomic_fetch_sub_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), -(char)(val))
+  #define atomic_fetch_sub_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), -(short)(val))
+  #define atomic_fetch_sub_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), -(long)(val))
+  #define atomic_fetch_sub_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), -(__int64)(val))
+
+  #define atomic_and_fetch_8(ptr, val) interlocked_and_fetch_8((char volatile*)(ptr), (char)(val))
+  #define atomic_and_fetch_16(ptr, val) interlocked_and_fetch_16((short volatile*)(ptr), (short)(val))
+  #define atomic_and_fetch_32(ptr, val) interlocked_and_fetch_32((long volatile*)(ptr), (long)(val))
+  #define atomic_and_fetch_64(ptr, val) interlocked_and_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #define atomic_fetch_and_8(ptr, val) _InterlockedAnd8((char volatile*)(ptr), (char)(val))
+  #define atomic_fetch_and_16(ptr, val) _InterlockedAnd16((short volatile*)(ptr), (short)(val))
+  #define atomic_fetch_and_32(ptr, val) _InterlockedAnd((long volatile*)(ptr), (long)(val))
+  #define atomic_fetch_and_64(ptr, val) interlocked_fetch_and_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #define atomic_or_fetch_8(ptr, val) interlocked_or_fetch_8((char volatile*)(ptr), (char)(val))
+  #define atomic_or_fetch_16(ptr, val) interlocked_or_fetch_16((short volatile*)(ptr), (short)(val))
+  #define atomic_or_fetch_32(ptr, val) interlocked_or_fetch_32((long volatile*)(ptr), (long)(val))
+  #define atomic_or_fetch_64(ptr, val) interlocked_or_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #define atomic_fetch_or_8(ptr, val) _InterlockedOr8((char volatile*)(ptr), (char)(val))
+  #define atomic_fetch_or_16(ptr, val) _InterlockedOr16((short volatile*)(ptr), (short)(val))
+  #define atomic_fetch_or_32(ptr, val) _InterlockedOr((long volatile*)(ptr), (long)(val))
+  #define atomic_fetch_or_64(ptr, val) interlocked_fetch_or_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #define atomic_xor_fetch_8(ptr, val) interlocked_xor_fetch_8((char volatile*)(ptr), (char)(val))
+  #define atomic_xor_fetch_16(ptr, val) interlocked_xor_fetch_16((short volatile*)(ptr), (short)(val))
+  #define atomic_xor_fetch_32(ptr, val) interlocked_xor_fetch_32((long volatile*)(ptr), (long)(val))
+  #define atomic_xor_fetch_64(ptr, val) interlocked_xor_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #define atomic_fetch_xor_8(ptr, val) _InterlockedXor8((char volatile*)(ptr), (char)(val))
+  #define atomic_fetch_xor_16(ptr, val) _InterlockedXor16((short volatile*)(ptr), (short)(val))
+  #define atomic_fetch_xor_32(ptr, val) _InterlockedXor((long volatile*)(ptr), (long)(val))
+  #define atomic_fetch_xor_64(ptr, val) interlocked_fetch_xor_64((__int64 volatile*)(ptr), (__int64)(val))
+
+  #ifdef _WIN64
+    #define atomic_add_fetch_ptr atomic_add_fetch_64
+    #define atomic_fetch_add_ptr atomic_fetch_add_64
+    #define atomic_sub_fetch_ptr atomic_sub_fetch_64
+    #define atomic_fetch_sub_ptr atomic_fetch_sub_64
+    #define atomic_and_fetch_ptr atomic_and_fetch_64
+    #define atomic_fetch_and_ptr atomic_fetch_and_64
+    #define atomic_or_fetch_ptr  atomic_or_fetch_64
+    #define atomic_fetch_or_ptr  atomic_fetch_or_64
+    #define atomic_xor_fetch_ptr atomic_xor_fetch_64
+    #define atomic_fetch_xor_ptr atomic_fetch_xor_64
+  #else
+    #define atomic_add_fetch_ptr atomic_add_fetch_32
+    #define atomic_fetch_add_ptr atomic_fetch_add_32
+    #define atomic_sub_fetch_ptr atomic_sub_fetch_32
+    #define atomic_fetch_sub_ptr atomic_fetch_sub_32
+    #define atomic_and_fetch_ptr atomic_and_fetch_32
+    #define atomic_fetch_and_ptr atomic_fetch_and_32
+    #define atomic_or_fetch_ptr  atomic_or_fetch_32
+    #define atomic_fetch_or_ptr  atomic_fetch_or_32
+    #define atomic_xor_fetch_ptr atomic_xor_fetch_32
+    #define atomic_fetch_xor_ptr atomic_fetch_xor_32
+  #endif
+#ifdef __cplusplus
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/src/os/linux/CMakeLists.txt b/src/os/linux/CMakeLists.txt
deleted file mode 100644
index a702cac759a3dea135da05689118b763631e83f9..0000000000000000000000000000000000000000
--- a/src/os/linux/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(os ${SRC})
-  TARGET_LINK_LIBRARIES(os m rt)
-ENDIF ()
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
deleted file mode 100644
index aa54a3563ec08b2c83d7dd34db427399cfa93a3e..0000000000000000000000000000000000000000
--- a/src/os/linux/inc/os.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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_PLATFORM_LINUX_H
-#define TDENGINE_PLATFORM_LINUX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef _ALPINE
-  #include <error.h>
-#endif
-
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-
-
-#define taosCloseSocket(x) \
-  {                        \
-    if (FD_VALID(x)) {     \
-      close(x);            \
-      x = FD_INITIALIZER;  \
-    }                      \
-  }
-  
-#define taosWriteSocket(fd, buf, len) write(fd, buf, len)
-#define taosReadSocket(fd, buf, len) read(fd, buf, len)
-
-#define atomic_load_8(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_16(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_32(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_64(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-#define atomic_load_ptr(ptr) __atomic_load_n((ptr), __ATOMIC_SEQ_CST)
-
-#define atomic_store_8(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_16(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_32(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_64(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_store_ptr(ptr, val) __atomic_store_n((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_exchange_8(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_16(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_32(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_64(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_exchange_ptr(ptr, val) __atomic_exchange_n((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_16 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_32 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_64 __sync_val_compare_and_swap
-#define atomic_val_compare_exchange_ptr __sync_val_compare_and_swap
-
-#define atomic_add_fetch_8(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_16(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_32(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_64(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_add_fetch_ptr(ptr, val) __atomic_add_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_add_8(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_16(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_32(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_64(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_add_ptr(ptr, val) __atomic_fetch_add((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_sub_fetch_8(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_16(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_32(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_64(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_sub_fetch_ptr(ptr, val) __atomic_sub_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_sub_8(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_16(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_32(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_64(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_sub_ptr(ptr, val) __atomic_fetch_sub((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_and_fetch_8(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_16(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_32(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_64(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_and_fetch_ptr(ptr, val) __atomic_and_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_and_8(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_16(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_32(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_64(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_and_ptr(ptr, val) __atomic_fetch_and((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_or_fetch_8(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_16(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_32(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_64(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_or_fetch_ptr(ptr, val) __atomic_or_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_or_8(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_16(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_32(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_64(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_or_ptr(ptr, val) __atomic_fetch_or((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_xor_fetch_8(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_16(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_32(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_64(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_xor_fetch_ptr(ptr, val) __atomic_xor_fetch((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define atomic_fetch_xor_8(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_16(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_32(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_64(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-#define atomic_fetch_xor_ptr(ptr, val) __atomic_fetch_xor((ptr), (val), __ATOMIC_SEQ_CST)
-
-#define SWAP(a, b, c)      \
-  do {                     \
-    typeof(a) __tmp = (a); \
-    (a) = (b);             \
-    (b) = __tmp;           \
-  } while (0)
-
-#define MAX(a, b)            \
-  ({                         \
-    typeof(a) __a = (a);     \
-    typeof(b) __b = (b);     \
-    (__a > __b) ? __a : __b; \
-  })
-
-#define MIN(a, b)            \
-  ({                         \
-    typeof(a) __a = (a);     \
-    typeof(b) __b = (b);     \
-    (__a < __b) ? __a : __b; \
-  })
-
-#define MILLISECOND_PER_SECOND ((int64_t)1000L)
-
-#define tsem_t sem_t
-#define tsem_init sem_init
-#define tsem_wait sem_wait
-#define tsem_post sem_post
-#define tsem_destroy sem_destroy
-
-ssize_t tsendfile(int dfd, int sfd, off_t *offset, size_t size);
-
-ssize_t twrite(int fd, void *buf, size_t n);
-
-bool taosCheckPthreadValid(pthread_t thread);
-
-void taosResetPthread(pthread_t *thread);
-
-int64_t taosGetPthreadId();
-
-int taosSetNonblocking(int sock, int on);
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen);
-
-void tsPrintOsInfo();
-
-char *taosCharsetReplace(char *charsetstr);
-
-void taosGetSystemInfo();
-
-void taosKillSystem();
-
-bool taosSkipSocketCheck();
-
-int64_t str2int64(char *str);
-
-void taosSetCoreDump();
-
-void taosBlockSIGPIPE();
-
-#ifdef _ALPINE
-  typedef int(*__compar_fn_t)(const void *, const void *);
-  void  error (int, int, const char *);
-  #ifndef PTHREAD_MUTEX_RECURSIVE_NP
-    #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-  #endif
-#endif
-
-#ifndef _TD_ARM_32_
-#define BUILDIN_CLZL(val) __builtin_clzl(val)
-#define BUILDIN_CTZL(val) __builtin_ctzl(val)
-#else
-#define BUILDIN_CLZL(val) __builtin_clzll(val)
-#define BUILDIN_CTZL(val) __builtin_ctzll(val)
-#endif
-#define BUILDIN_CLZ(val) __builtin_clz(val)
-#define BUILDIN_CTZ(val) __builtin_ctz(val)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/os/linux/src/tlinux.c b/src/os/linux/src/tlinux.c
deleted file mode 100644
index b81b98a5f7fb9cea96879c570a05fbca8e4e74b5..0000000000000000000000000000000000000000
--- a/src/os/linux/src/tlinux.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * 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 <errno.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdint.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tsdb.h"
-#include "tutil.h"
-#include "ttimer.h"
-
-char configDir[TSDB_FILENAME_LEN] = "/etc/taos";
-char tsDirectory[TSDB_FILENAME_LEN] = "/var/lib/taos";
-char dataDir[TSDB_FILENAME_LEN] = "/var/lib/taos";
-char logDir[TSDB_FILENAME_LEN] = "/var/log/taos";
-char scriptDir[TSDB_FILENAME_LEN] = "/etc/taos";
-char osName[] = "Linux";
-
-int64_t str2int64(char *str) {
-  char *endptr = NULL;
-  return strtoll(str, &endptr, 10);
-}
-
-/*
-  to make taosMsleep work,
-   signal SIGALRM shall be blocked in the calling thread,
-
-  sigset_t set;
-  sigemptyset(&set);
-  sigaddset(&set, SIGALRM);
-  pthread_sigmask(SIG_BLOCK, &set, NULL);
-*/
-void taosMsleep(int mseconds) {
-  struct timeval timeout;
-  int            seconds, useconds;
-
-  seconds = mseconds / 1000;
-  useconds = (mseconds % 1000) * 1000;
-  timeout.tv_sec = seconds;
-  timeout.tv_usec = useconds;
-
-  /* sigset_t set; */
-  /* sigemptyset(&set); */
-  /* sigaddset(&set, SIGALRM); */
-  /* pthread_sigmask(SIG_BLOCK, &set, NULL); */
-
-  select(0, NULL, NULL, NULL, &timeout);
-
-  /* pthread_sigmask(SIG_UNBLOCK, &set, NULL); */
-}
-
-bool taosCheckPthreadValid(pthread_t thread) { return thread != 0; }
-
-void taosResetPthread(pthread_t *thread) { *thread = 0; }
-
-int64_t taosGetPthreadId() { return (int64_t)pthread_self(); }
-
-/*
-* Function to get the private ip address of current machine. If get IP
-* successfully, return 0, else, return -1. The return values is ip.
-*
-* Use:
-* if (taosGetPrivateIp(ip) != 0) {
-*     perror("Fail to get private IP address\n");
-*     exit(EXIT_FAILURE);
-* }
-*/
-int taosGetPrivateIp(char *const ip) {
-  bool hasLoCard = false;
-
-  struct ifaddrs *ifaddr, *ifa;
-  int             family, s;
-  char            host[NI_MAXHOST];
-
-  if (getifaddrs(&ifaddr) == -1) {
-    return -1;
-  }
-
-  /* Walk through linked list, maintaining head pointer so we can free list later */
-  int flag = 0;
-  for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr == NULL) continue;
-
-    family = ifa->ifa_addr->sa_family;
-    if (strcmp("lo", ifa->ifa_name) == 0) {
-      hasLoCard = true;
-      continue;
-    }
-
-    if (family == AF_INET) {
-      /* printf("%-8s", ifa->ifa_name); */
-      s = getnameinfo(ifa->ifa_addr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6),
-                      host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-      if (s != 0) {
-        freeifaddrs(ifaddr);
-        return -1;
-      }
-
-      strcpy(ip, host);
-      flag = 1;
-      break;
-    }
-  }
-
-  freeifaddrs(ifaddr);
-  if (flag) {
-    return 0;
-  } else {
-    if (hasLoCard) {
-      pPrint("no net card was found, use lo:127.0.0.1 as default");
-      strcpy(ip, "127.0.0.1");
-      return 0;
-    }
-    return -1;
-  }
-}
-
-int taosSetNonblocking(int sock, int on) {
-  int flags = 0;
-  if ((flags = fcntl(sock, F_GETFL, 0)) < 0) {
-    pError("fcntl(F_GETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-
-  if (on)
-    flags |= O_NONBLOCK;
-  else
-    flags &= ~O_NONBLOCK;
-
-  if ((flags = fcntl(sock, F_SETFL, flags)) < 0) {
-    pError("fcntl(F_SETFL) error: %d (%s)\n", errno, strerror(errno));
-    return 1;
-  }
-
-  return 0;
-}
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) {
-  return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen);
-}
-
-int taosOpenUDClientSocket(char *ip, uint16_t port) {
-  int                sockFd = 0;
-  struct sockaddr_un serverAddr;
-  int                ret;
-  char               name[128];
-  sprintf(name, "%s.%hu", ip, port);
-
-  sockFd = socket(AF_UNIX, SOCK_STREAM, 0);
-
-  if (sockFd < 0) {
-    pError("failed to open the UD socket:%s, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  memset((char *)&serverAddr, 0, sizeof(serverAddr));
-  serverAddr.sun_family = AF_UNIX;
-  strcpy(serverAddr.sun_path + 1, name);
-
-  ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
-
-  if (ret != 0) {
-    pError("failed to connect UD socket, name:%d, reason: %s", name, strerror(errno));
-    sockFd = -1;
-  }
-
-  return sockFd;
-}
-
-int taosOpenUDServerSocket(char *ip, uint16_t port) {
-  struct sockaddr_un serverAdd;
-  int                sockFd;
-  char               name[128];
-
-  pTrace("open ud socket:%s", name);
-  sprintf(name, "%s.%hu", ip, port);
-
-  bzero((char *)&serverAdd, sizeof(serverAdd));
-  serverAdd.sun_family = AF_UNIX;
-  strcpy(serverAdd.sun_path + 1, name);
-  unlink(name);
-
-  if ((sockFd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-    pError("failed to open UD socket:%s, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  /* bind socket to server address */
-  if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) {
-    pError("bind socket:%s failed, reason:%s", name, strerror(errno));
-    tclose(sockFd);
-    return -1;
-  }
-
-  if (listen(sockFd, 10) < 0) {
-    pError("listen socket:%s failed, reason:%s", name, strerror(errno));
-    return -1;
-  }
-
-  return sockFd;
-}
-
-void *taosProcessAlarmSignal(void *tharg) {
-  // Block the signal
-  sigset_t sigset;
-  sigemptyset(&sigset);
-  sigaddset(&sigset, SIGALRM);
-  sigprocmask(SIG_BLOCK, &sigset, NULL);
-  void (*callback)(int) = tharg;
-
-  timer_t         timerId;
-  struct sigevent sevent;
-
-  #ifdef _ALPINE
-    sevent.sigev_notify = SIGEV_THREAD;
-    sevent.sigev_value.sival_int = syscall(__NR_gettid);
-  #else
-    sevent.sigev_notify = SIGEV_THREAD_ID;
-    sevent._sigev_un._tid = syscall(__NR_gettid);
-  #endif
-  
-  sevent.sigev_signo = SIGALRM;
-
-  if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) {
-    tmrError("Failed to create timer");
-  }
-
-  struct itimerspec ts;
-  ts.it_value.tv_sec = 0;
-  ts.it_value.tv_nsec = 1000000 * MSECONDS_PER_TICK;
-  ts.it_interval.tv_sec = 0;
-  ts.it_interval.tv_nsec = 1000000 * MSECONDS_PER_TICK;
-
-  if (timer_settime(timerId, 0, &ts, NULL)) {
-    tmrError("Failed to init timer");
-    return NULL;
-  }
-
-  int signo;
-  while (1) {
-    if (sigwait(&sigset, &signo)) {
-      tmrError("Failed to wait signal: number %d", signo);
-      continue;
-    }
-    /* printf("Signal handling: number %d ......\n", signo); */
-
-    callback(0);
-  }
-
-  return NULL;
-}
-
-int taosInitTimer(void (*callback)(int), int ms) {
-  pthread_t      thread;
-  pthread_attr_t tattr;
-  pthread_attr_init(&tattr);
-  pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
-  if (pthread_create(&thread, &tattr, taosProcessAlarmSignal, callback) != 0) {
-    tmrError("failed to create timer thread");
-    return -1;
-  }
-
-  pthread_attr_destroy(&tattr);
-  return 0;
-}
-
-ssize_t tsendfile(int dfd, int sfd, off_t *offset, size_t size) {
-  size_t  leftbytes = size;
-  ssize_t sentbytes;
-
-  while (leftbytes > 0) {
-    /*
-     * TODO : Think to check if file is larger than 1GB
-     */
-    //if (leftbytes > 1000000000) leftbytes = 1000000000;
-    sentbytes = sendfile(dfd, sfd, offset, leftbytes);
-    if (sentbytes == -1) {
-      if (errno == EINTR) {
-        continue;
-      }
-      else {
-        return -1;
-      }
-    }
-
-    leftbytes -= sentbytes;
-  }
-
-  return size;
-}
-
-ssize_t twrite(int fd, void *buf, size_t n) {
-  size_t nleft = n; 
-  ssize_t nwritten = 0;
-  char *tbuf = (char *)buf;
-
-  while (nleft > 0) {
-    nwritten = write(fd, (void *)tbuf, nleft);
-    if (nwritten < 0) {
-      if (errno == EINTR) {
-        continue;
-      }
-      return -1;
-    }
-    nleft -= nwritten;
-    tbuf += nwritten;
-  }
-
-  return n;
-}
-
-bool taosSkipSocketCheck() {
-  struct utsname buf;
-  if (uname(&buf)) {
-    pPrint("can't fetch os info");
-    return false;
-  }
-
-  if (strstr(buf.release, "Microsoft") != 0) {
-    pPrint("using WSLv1");
-    return true;
-  }
-
-  return false;
-}
-
-void taosBlockSIGPIPE() {
-  sigset_t signal_mask;
-  sigemptyset(&signal_mask);
-  sigaddset(&signal_mask, SIGPIPE);
-  int rc = pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
-  if (rc != 0) {
-    pError("failed to block SIGPIPE");
-  }
-}
diff --git a/src/os/linux/src/tsystem.c b/src/os/linux/src/tsystem.c
deleted file mode 100644
index 8cd0e6943616f4ecb1f69ed100ca6535968005ae..0000000000000000000000000000000000000000
--- a/src/os/linux/src/tsystem.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*
- * 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 <inttypes.h>
-#include <ifaddrs.h>
-#include <locale.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <sys/statvfs.h>
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/resource.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef _ALPINE
-#include <linux/sysctl.h>
-#else
-#include <sys/sysctl.h>
-#endif
-
-#include "tglobalcfg.h"
-#include "tlog.h"
-#include "tsystem.h"
-#include "tutil.h"
-
-#define PROCESS_ITEM 12
-extern char dataDir[TSDB_FILENAME_LEN];
-
-typedef struct {
-  uint64_t user;
-  uint64_t nice;
-  uint64_t system;
-  uint64_t idle;
-} SysCpuInfo;
-
-typedef struct {
-  uint64_t utime;   // user time
-  uint64_t stime;   // kernel time
-  uint64_t cutime;  // all user time
-  uint64_t cstime;  // all dead time
-} ProcCpuInfo;
-
-static pid_t tsProcId;
-static char  tsSysNetFile[] = "/proc/net/dev";
-static char  tsSysCpuFile[] = "/proc/stat";
-static char  tsProcCpuFile[25] = {0};
-static char  tsProcMemFile[25] = {0};
-static char  tsProcIOFile[25] = {0};
-static float tsPageSizeKB = 0;
-
-bool taosGetSysMemory(float *memoryUsedMB) {
-  float memoryAvailMB = (float)sysconf(_SC_AVPHYS_PAGES) * tsPageSizeKB / 1024;
-  *memoryUsedMB = (float)tsTotalMemoryMB - memoryAvailMB;
-  return true;
-}
-
-bool taosGetProcMemory(float *memoryUsedMB) {
-  FILE *fp = fopen(tsProcMemFile, "r");
-  if (fp == NULL) {
-    pError("open file:%s failed", tsProcMemFile);
-    return false;
-  }
-
-  size_t len;
-  char * line = NULL;
-  while (!feof(fp)) {
-    tfree(line);
-    len = 0;
-    getline(&line, &len, fp);
-    if (line == NULL) {
-      break;
-    }
-    if (strstr(line, "VmRSS:") != NULL) {
-      break;
-    }
-  }
-
-  if (line == NULL) {
-    pError("read file:%s failed", tsProcMemFile);
-    fclose(fp);
-    return false;
-  }
-
-  int64_t memKB = 0;
-  char    tmp[10];
-  sscanf(line, "%s %" PRId64, tmp, &memKB);
-  *memoryUsedMB = (float)((double)memKB / 1024);
-
-  tfree(line);
-  fclose(fp);
-  return true;
-}
-
-bool taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
-  FILE *fp = fopen(tsSysCpuFile, "r");
-  if (fp == NULL) {
-    pError("open file:%s failed", tsSysCpuFile);
-    return false;
-  }
-
-  size_t len;
-  char * line = NULL;
-  getline(&line, &len, fp);
-  if (line == NULL) {
-    pError("read file:%s failed", tsSysCpuFile);
-    fclose(fp);
-    return false;
-  }
-
-  char cpu[10] = {0};
-  sscanf(line, "%s %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
-
-  tfree(line);
-  fclose(fp);
-  return true;
-}
-
-bool taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
-  FILE *fp = fopen(tsProcCpuFile, "r");
-  if (fp == NULL) {
-    pError("open file:%s failed", tsProcCpuFile);
-    return false;
-  }
-
-  size_t len = 0;
-  char * line = NULL;
-  getline(&line, &len, fp);
-  if (line == NULL) {
-    pError("read file:%s failed", tsProcCpuFile);
-    fclose(fp);
-    return false;
-  }
-
-  for (int i = 0, blank = 0; line[i] != 0; ++i) {
-    if (line[i] == ' ') blank++;
-    if (blank == PROCESS_ITEM) {
-      sscanf(line + i + 1, "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
-      break;
-    }
-  }
-
-  tfree(line);
-  fclose(fp);
-  return true;
-}
-
-void taosGetSystemTimezone() {
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  if (cfg_timezone == NULL) return;
-  if (cfg_timezone->cfgStatus >= TSDB_CFG_CSTATUS_DEFAULT) {
-    return;
-  }
-
-  /*
-   * NOTE: do not remove it.
-   * Enforce set the correct daylight saving time(DST) flag according
-   * to current time
-   */
-  time_t    tx1 = time(NULL);
-  struct tm tm1;
-  localtime_r(&tx1, &tm1);
-
-  /* load time zone string from /etc/timezone */
-  FILE *f = fopen("/etc/timezone", "r");
-  char  buf[64] = {0};
-  if (f != NULL) {
-    fread(buf, 64, 1, f);
-    fclose(f);
-  }
-
-  char *lineEnd = strstr(buf, "\n");
-  if (lineEnd != NULL) {
-    *lineEnd = 0;
-  }
-
-  // for CentOS system, /etc/timezone does not exist. Ignore the TZ environment variables
-  if (strlen(buf) > 0) {
-    setenv("TZ", buf, 1);
-  }
-
-  // get and set default timezone
-  tzset();
-
-  /*
-   * get CURRENT time zone.
-   * system current time zone is affected by daylight saving time(DST)
-   *
-   * e.g., the local time zone of London in DST is GMT+01:00,
-   * otherwise is GMT+00:00
-   */
-  int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
-  tz += daylight;
-
-  /*
-   * format example:
-   *
-   * Asia/Shanghai   (CST, +0800)
-   * Europe/London   (BST, +0100)
-   */
-  sprintf(tsTimezone, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
-
-  cfg_timezone->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-  pPrint("timezone not configured, set to system default:%s", tsTimezone);
-}
-
-/*
- * POSIX format locale string:
- * (Language Strings)_(Country/Region Strings).(code_page)
- *
- * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
- *
- * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
- *
- * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
- * for libiconv that is employed to convert string in this system. This program will automatically use
- * UTF-8 instead as the charset.
- *
- * In case of windows client, the locale string is not valid POSIX format, user needs to set the
- * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
- * CP936, CP437 for English charset.
- *
- */
-void taosGetSystemLocale() {  // get and set default locale
-  char  sep = '.';
-  char *locale = NULL;
-
-  SGlobalConfig *cfg_locale = tsGetConfigOption("locale");
-  if (cfg_locale && cfg_locale->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    locale = setlocale(LC_CTYPE, "");
-    if (locale == NULL) {
-      pError("can't get locale from system");
-    } else {
-      strncpy(tsLocale, locale, tListLen(tsLocale));
-      pPrint("locale not configured, set to system default:%s", tsLocale);
-    }
-  }
-
-  /* if user does not specify the charset, extract it from locale */
-  SGlobalConfig *cfg_charset = tsGetConfigOption("charset");
-  if (cfg_charset && cfg_charset->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    char *str = strrchr(tsLocale, sep);
-    if (str != NULL) {
-      str++;
-
-      char *revisedCharset = taosCharsetReplace(str);
-      strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
-
-      free(revisedCharset);
-      pPrint("charset not configured, set to system default:%s", tsCharset);
-    }
-  }
-}
-
-bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
-  static uint64_t lastSysUsed = 0;
-  static uint64_t lastSysTotal = 0;
-  static uint64_t lastProcTotal = 0;
-
-  SysCpuInfo  sysCpu;
-  ProcCpuInfo procCpu;
-  if (!taosGetSysCpuInfo(&sysCpu)) {
-    return false;
-  }
-  if (!taosGetProcCpuInfo(&procCpu)) {
-    return false;
-  }
-
-  uint64_t curSysUsed = sysCpu.user + sysCpu.nice + sysCpu.system;
-  uint64_t curSysTotal = curSysUsed + sysCpu.idle;
-  uint64_t curProcTotal = procCpu.utime + procCpu.stime + procCpu.cutime + procCpu.cstime;
-
-  if (lastSysUsed == 0 || lastSysTotal == 0 || lastProcTotal == 0) {
-    lastSysUsed = curSysUsed > 1 ? curSysUsed : 1;
-    lastSysTotal = curSysTotal > 1 ? curSysTotal : 1;
-    lastProcTotal = curProcTotal > 1 ? curProcTotal : 1;
-    return false;
-  }
-
-  if (curSysTotal == lastSysTotal) {
-    return false;
-  }
-
-  *sysCpuUsage = (float)((double)(curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100);
-  *procCpuUsage = (float)((double)(curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100);
-
-  lastSysUsed = curSysUsed;
-  lastSysTotal = curSysTotal;
-  lastProcTotal = curProcTotal;
-
-  return true;
-}
-
-bool taosGetDisk() {
-  struct statvfs info;
-  const double   unit = 1024 * 1024 * 1024;
-
-  if (tscEmbedded) {
-    if (statvfs(dataDir, &info)) {
-      tsTotalDataDirGB = 0;
-      tsAvailDataDirGB = 0;
-      return false;
-    } else {
-      tsTotalDataDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
-      tsAvailDataDirGB = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
-    }
-  }
-
-  if (statvfs(logDir, &info)) {
-    tsTotalLogDirGB = 0;
-    tsAvailLogDirGB = 0;
-    return false;
-  } else {
-    tsTotalLogDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
-    tsAvailLogDirGB = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
-  }
-
-  if (statvfs("/tmp", &info)) {
-    tsTotalTmpDirGB = 0;
-    tsAvailTmpDirGB = 0;
-    return false;
-  } else {
-    tsTotalTmpDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
-    tsAvailTmpDirGB = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
-  }
-
-  return true;
-}
-
-bool taosGetCardName(char *ip, char *name) {
-  struct ifaddrs *ifaddr, *ifa;
-  int             family, s;
-  char            host[NI_MAXHOST];
-  bool            ret = false;
-
-  if (getifaddrs(&ifaddr) == -1) {
-    return false;
-  }
-
-  /* Walk through linked list, maintaining head pointer so we can free list
-   * later */
-  for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-    if (ifa->ifa_addr == NULL) continue;
-
-    family = ifa->ifa_addr->sa_family;
-    if (family != AF_INET) {
-      continue;
-    }
-
-    s = getnameinfo(ifa->ifa_addr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host,
-                    NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-    if (s != 0) {
-      break;
-    }
-
-    if (strcmp(host, ip) == 0) {
-      strcpy(name, ifa->ifa_name);
-      ret = true;
-    }
-  }
-
-  freeifaddrs(ifaddr);
-  return ret;
-}
-
-bool taosGetCardInfo(int64_t *bytes) {
-  static char tsPublicCard[1000] = {0};
-  if (tsPublicCard[0] == 0) {
-    if (!taosGetCardName(tsPrivateIp, tsPublicCard)) {
-      pError("can't get card name from ip:%s", tsPrivateIp);
-      return false;
-    }
-    int cardNameLen = (int)strlen(tsPublicCard);
-    for (int i = 0; i < cardNameLen; ++i) {
-      if (tsPublicCard[i] == ':') {
-        tsPublicCard[i] = 0;
-        break;
-      }
-    }
-    // pTrace("card name of public ip:%s is %s", tsPublicIp, tsPublicCard);
-  }
-
-  FILE *fp = fopen(tsSysNetFile, "r");
-  if (fp == NULL) {
-    pError("open file:%s failed", tsSysNetFile);
-    return false;
-  }
-
-  int64_t rbytes, rpackts, tbytes, tpackets;
-  int64_t nouse1, nouse2, nouse3, nouse4, nouse5, nouse6;
-  char    nouse0[200] = {0};
-
-  size_t len;
-  char * line = NULL;
-
-  while (!feof(fp)) {
-    tfree(line);
-    len = 0;
-    getline(&line, &len, fp);
-    if (line == NULL) {
-      break;
-    }
-    if (strstr(line, tsPublicCard) != NULL) {
-      break;
-    }
-  }
-  if (line != NULL) {
-    sscanf(line, "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64, nouse0, &rbytes, &rpackts, &nouse1, &nouse2, &nouse3,
-           &nouse4, &nouse5, &nouse6, &tbytes, &tpackets);
-    *bytes = rbytes + tbytes;
-    tfree(line);
-    fclose(fp);
-    return true;
-  } else {
-    pWarn("can't get card:%s info from device:%s", tsPublicCard, tsSysNetFile);
-    *bytes = 0;
-    fclose(fp);
-    return false;
-  }
-}
-
-bool taosGetBandSpeed(float *bandSpeedKb) {
-  static int64_t lastBytes = 0;
-  static time_t  lastTime = 0;
-  int64_t        curBytes = 0;
-  time_t         curTime = time(NULL);
-
-  if (!taosGetCardInfo(&curBytes)) {
-    return false;
-  }
-
-  if (lastTime == 0 || lastBytes == 0) {
-    lastTime = curTime;
-    lastBytes = curBytes;
-    return false;
-  }
-
-  if (lastTime >= curTime || lastBytes > curBytes) {
-    lastTime = curTime;
-    lastBytes = curBytes;
-    return false;
-  }
-
-  double totalBytes = (double)(curBytes - lastBytes) / 1024 * 8;  // Kb
-  *bandSpeedKb = (float)(totalBytes / (double)(curTime - lastTime));
-
-  // pPrint("bandwidth lastBytes:%ld, lastTime:%ld, curBytes:%ld, curTime:%ld,
-  // speed:%f", lastBytes, lastTime, curBytes, curTime, *bandSpeed);
-
-  lastTime = curTime;
-  lastBytes = curBytes;
-
-  return true;
-}
-
-bool taosReadProcIO(int64_t *readbyte, int64_t *writebyte) {
-  FILE *fp = fopen(tsProcIOFile, "r");
-  if (fp == NULL) {
-    pError("open file:%s failed", tsProcIOFile);
-    return false;
-  }
-
-  size_t len;
-  char * line = NULL;
-  char   tmp[10];
-  int    readIndex = 0;
-
-  while (!feof(fp)) {
-    tfree(line);
-    len = 0;
-    getline(&line, &len, fp);
-    if (line == NULL) {
-      break;
-    }
-    if (strstr(line, "rchar:") != NULL) {
-      sscanf(line, "%s %" PRId64, tmp, readbyte);
-      readIndex++;
-    } else if (strstr(line, "wchar:") != NULL) {
-      sscanf(line, "%s %" PRId64, tmp, writebyte);
-      readIndex++;
-    } else {
-    }
-
-    if (readIndex >= 2) break;
-  }
-
-  tfree(line);
-  fclose(fp);
-
-  if (readIndex < 2) {
-    pError("read file:%s failed", tsProcIOFile);
-    return false;
-  }
-
-  return true;
-}
-
-bool taosGetProcIO(float *readKB, float *writeKB) {
-  static int64_t lastReadbyte = -1;
-  static int64_t lastWritebyte = -1;
-
-  int64_t curReadbyte  = 0;
-  int64_t curWritebyte = 0;
-
-  if (!taosReadProcIO(&curReadbyte, &curWritebyte)) {
-    return false;
-  }
-
-  if (lastReadbyte == -1 || lastWritebyte == -1) {
-    lastReadbyte = curReadbyte;
-    lastWritebyte = curWritebyte;
-    return false;
-  }
-
-  *readKB = (float)((double)(curReadbyte - lastReadbyte) / 1024);
-  *writeKB = (float)((double)(curWritebyte - lastWritebyte) / 1024);
-  if (*readKB < 0) *readKB = 0;
-  if (*writeKB < 0) *writeKB = 0;
-
-  lastReadbyte = curReadbyte;
-  lastWritebyte = curWritebyte;
-
-  return true;
-}
-
-void taosGetSystemInfo() {
-  tsNumOfCores = (int32_t)sysconf(_SC_NPROCESSORS_ONLN);
-  tsPageSize = sysconf(_SC_PAGESIZE);
-  tsOpenMax = sysconf(_SC_OPEN_MAX);
-  tsStreamMax = sysconf(_SC_STREAM_MAX);
-
-  tsProcId = (pid_t)syscall(SYS_gettid);
-  tsPageSizeKB = (float)(sysconf(_SC_PAGESIZE)) / 1024;
-  tsTotalMemoryMB = (int32_t)((float)sysconf(_SC_PHYS_PAGES) * tsPageSizeKB / 1024);
-
-  snprintf(tsProcMemFile, 25, "/proc/%d/status", tsProcId);
-  snprintf(tsProcCpuFile, 25, "/proc/%d/stat", tsProcId);
-  snprintf(tsProcIOFile, 25, "/proc/%d/io", tsProcId);
-
-  float tmp1, tmp2;
-  taosGetSysMemory(&tmp1);
-  taosGetProcMemory(&tmp2);
-  taosGetDisk();
-  taosGetBandSpeed(&tmp1);
-  taosGetCpuUsage(&tmp1, &tmp2);
-  taosGetProcIO(&tmp1, &tmp2);
-
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
-}
-
-void tsPrintOsInfo() {
-  pPrint(" os pageSize:            %" PRId64 "(KB)", tsPageSize);
-  pPrint(" os openMax:             %" PRId64, tsOpenMax);
-  pPrint(" os streamMax:           %" PRId64, tsStreamMax);
-  pPrint(" os numOfCores:          %d", tsNumOfCores);
-  pPrint(" os totalDisk:           %f(GB)", tsTotalDataDirGB);
-  pPrint(" os totalMemory:         %d(MB)", tsTotalMemoryMB);
-
-  struct utsname buf;
-  if (uname(&buf)) {
-    pPrint(" can't fetch os info");
-    return;
-  }
-  pPrint(" os sysname:             %s", buf.sysname);
-  pPrint(" os nodename:            %s", buf.nodename);
-  pPrint(" os release:             %s", buf.release);
-  pPrint(" os version:             %s", buf.version);
-  pPrint(" os machine:             %s", buf.machine);
-}
-
-void taosKillSystem() {
-  // SIGINT
-  pPrint("taosd will shut down soon");
-  kill(tsProcId, 2);
-}
-
-extern int   tsEnableCoreFile;
-int _sysctl(struct __sysctl_args *args );
-void taosSetCoreDump() {
-  if (0 == tsEnableCoreFile) {
-    return;
-  }
-  
-  // 1. set ulimit -c unlimited
-  struct rlimit rlim;
-  struct rlimit rlim_new;
-  if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
-    pPrint("the old unlimited para: rlim_cur=%d, rlim_max=%d", rlim.rlim_cur, rlim.rlim_max);
-    rlim_new.rlim_cur = RLIM_INFINITY;
-    rlim_new.rlim_max = RLIM_INFINITY;
-    if (setrlimit(RLIMIT_CORE, &rlim_new) != 0) {
-      pPrint("set unlimited fail, error: %s", strerror(errno));
-      rlim_new.rlim_cur = rlim.rlim_max;
-      rlim_new.rlim_max = rlim.rlim_max;
-      (void)setrlimit(RLIMIT_CORE, &rlim_new);
-    }
-  }
-
-  if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
-    pPrint("the new unlimited para: rlim_cur=%d, rlim_max=%d", rlim.rlim_cur, rlim.rlim_max);
-  }
-
-#ifndef _TD_ARM_
-  // 2. set the path for saving core file
-  struct __sysctl_args args;
-  int     old_usespid = 0;
-  size_t  old_len     = 0;
-  int     new_usespid = 1;
-  size_t  new_len     = sizeof(new_usespid);
-  
-  int name[] = {CTL_KERN, KERN_CORE_USES_PID};
-  
-  memset(&args, 0, sizeof(struct __sysctl_args));
-  args.name    = name;
-  args.nlen    = sizeof(name)/sizeof(name[0]);
-  args.oldval  = &old_usespid;
-  args.oldlenp = &old_len;
-  args.newval  = &new_usespid;
-  args.newlen  = new_len;
-  
-  old_len = sizeof(old_usespid);
-  
-  if (syscall(SYS__sysctl, &args) == -1) {
-      pPrint("_sysctl(kern_core_uses_pid) set fail: %s", strerror(errno));
-  }
-  
-  pPrint("The old core_uses_pid[%d]: %d", old_len, old_usespid);
-
-
-  old_usespid = 0;
-  old_len     = 0;
-  memset(&args, 0, sizeof(struct __sysctl_args));
-  args.name    = name;
-  args.nlen    = sizeof(name)/sizeof(name[0]);
-  args.oldval  = &old_usespid;
-  args.oldlenp = &old_len;
-  
-  old_len = sizeof(old_usespid);
-  
-  if (syscall(SYS__sysctl, &args) == -1) {
-      pPrint("_sysctl(kern_core_uses_pid) get fail: %s", strerror(errno));
-  }
-  
-  pPrint("The new core_uses_pid[%d]: %d", old_len, old_usespid);
-#endif
-  
-#if 0
-  // 3. create the path for saving core file
-  int status; 
-  char coredump_dir[32] = "/var/log/taosdump";
-  if (opendir(coredump_dir) == NULL) {
-    status = mkdir(coredump_dir, S_IRWXU | S_IRWXG | S_IRWXO); 
-    if (status) {
-      pPrint("mkdir fail, error: %s\n", strerror(errno));
-    }
-  }
-
-  // 4. set kernel.core_pattern
-   struct __sysctl_args args;
-   char    old_corefile[128];
-   size_t  old_len;
-   char    new_corefile[128] = "/var/log/taosdump/core-%e-%p";
-   size_t  new_len = sizeof(new_corefile);
-   
-   int name[] = {CTL_KERN, KERN_CORE_PATTERN};
-
-   memset(&args, 0, sizeof(struct __sysctl_args));
-   args.name    = name;
-   args.nlen    = sizeof(name)/sizeof(name[0]);
-   args.oldval  = old_corefile;
-   args.oldlenp = &old_len;
-   args.newval  = new_corefile;
-   args.newlen  = new_len;
-
-   old_len = sizeof(old_corefile);
-
-   if (syscall(SYS__sysctl, &args) == -1) {
-       pPrint("_sysctl(kern_core_pattern) set fail: %s", strerror(errno));
-   }
-   
-   pPrint("The old kern_core_pattern: %*s\n", old_len, old_corefile);
-
-
-   memset(&args, 0, sizeof(struct __sysctl_args));
-   args.name    = name;
-   args.nlen    = sizeof(name)/sizeof(name[0]);
-   args.oldval  = old_corefile;
-   args.oldlenp = &old_len;
-   
-   old_len = sizeof(old_corefile);
-
-   if (syscall(SYS__sysctl, &args) == -1) {
-       pPrint("_sysctl(kern_core_pattern) get fail: %s", strerror(errno));
-   }
-   
-   pPrint("The new kern_core_pattern: %*s\n", old_len, old_corefile);
-#endif
-  
-}
-
diff --git a/src/os/src/alpine/CMakeLists.txt b/src/os/src/alpine/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b5e739c24ce7ec3ef3ffc537ca8769706f7b56de
--- /dev/null
+++ b/src/os/src/alpine/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+AUX_SOURCE_DIRECTORY(. SRC)
+ADD_LIBRARY(os ${SRC})
+TARGET_LINK_LIBRARIES(os m rt)
+
diff --git a/src/os/src/alpine/alpineEnv.c b/src/os/src/alpine/alpineEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..811d98ad7f8c34851e70ccbd190a13b74d865703
--- /dev/null
+++ b/src/os/src/alpine/alpineEnv.c
@@ -0,0 +1,32 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+
+void osInit() {
+  if (configDir[0] == 0) {
+    strcpy(configDir, "/etc/taos");
+  }
+
+  strcpy(tsVnodeDir, "");
+  strcpy(tsDnodeDir, "");
+  strcpy(tsMnodeDir, "");
+  strcpy(tsDataDir, "/var/lib/taos");
+  strcpy(tsLogDir, "/var/log/taos");
+  strcpy(tsScriptDir, "/etc/taos");
+  strcpy(tsOsName, "Linux");
+}
\ No newline at end of file
diff --git a/src/os/src/darwin/CMakeLists.txt b/src/os/src/darwin/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c4cb28aa05e4716ca98c2687ce41d436b1300bb2
--- /dev/null
+++ b/src/os/src/darwin/CMakeLists.txt
@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+AUX_SOURCE_DIRECTORY(. SRC)
+ADD_LIBRARY(os ${SRC})
diff --git a/src/os/src/darwin/darwinEnv.c b/src/os/src/darwin/darwinEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..6adebabec01ae378a4c5f3d82389508334210972
--- /dev/null
+++ b/src/os/src/darwin/darwinEnv.c
@@ -0,0 +1,32 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+
+void osInit() {
+  if (configDir[0] == 0) {
+    strcpy(configDir, "~/TDengine/cfg");
+  }
+
+  strcpy(tsVnodeDir, "");
+  strcpy(tsDnodeDir, "");
+  strcpy(tsMnodeDir, "");
+  strcpy(tsDataDir, "~/TDengine/data");
+  strcpy(tsLogDir, "~/TDengine/log");
+  strcpy(tsScriptDir, "~/TDengine/cfg");
+  strcpy(tsOsName, "Darwin");
+}
diff --git a/src/os/src/darwin/darwinFile.c b/src/os/src/darwin/darwinFile.c
new file mode 100644
index 0000000000000000000000000000000000000000..66bdb5b939d77ab03b30f024466fe3e3ff4e9388
--- /dev/null
+++ b/src/os/src/darwin/darwinFile.c
@@ -0,0 +1,60 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+
+#define _SEND_FILE_STEP_ 1000
+
+int taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
+  fseek(in_file, (int32_t)(*offset), 0);
+  int writeLen = 0;
+  uint8_t buffer[_SEND_FILE_STEP_] = { 0 };
+
+  for (int len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
+    size_t rlen = fread(buffer, 1, _SEND_FILE_STEP_, in_file);
+    if (rlen <= 0) {
+      return writeLen;
+    }
+    else if (rlen < _SEND_FILE_STEP_) {
+      fwrite(buffer, 1, rlen, out_file);
+      return (int)(writeLen + rlen);
+    }
+    else {
+      fwrite(buffer, 1, _SEND_FILE_STEP_, in_file);
+      writeLen += _SEND_FILE_STEP_;
+    }
+  }
+
+  int remain = count - writeLen;
+  if (remain > 0) {
+    size_t rlen = fread(buffer, 1, remain, in_file);
+    if (rlen <= 0) {
+      return writeLen;
+    }
+    else {
+      fwrite(buffer, 1, remain, out_file);
+      writeLen += remain;
+    }
+  }
+
+  return writeLen;
+}
+
+ssize_t taosTSendFileImp(int dfd, int sfd, off_t *offset, size_t size) {
+  uError("not implemented yet");
+  return -1;
+}
\ No newline at end of file
diff --git a/src/os/src/darwin/darwinSemphone.c b/src/os/src/darwin/darwinSemphone.c
new file mode 100644
index 0000000000000000000000000000000000000000..97ff5437895c3715bbe3eeaf2abe178ffbd5d733
--- /dev/null
+++ b/src/os/src/darwin/darwinSemphone.c
@@ -0,0 +1,40 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value) {
+  *sem = dispatch_semaphore_create(value);
+  if (*sem == NULL) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+int tsem_wait(dispatch_semaphore_t *sem) {
+  dispatch_semaphore_wait(*sem, DISPATCH_TIME_FOREVER);
+  return 0;
+}
+
+int tsem_post(dispatch_semaphore_t *sem) {
+  dispatch_semaphore_signal(*sem);
+  return 0;
+}
+
+int tsem_destroy(dispatch_semaphore_t *sem) {
+  return 0;
+}
diff --git a/src/os/src/darwin/darwinSocket.c b/src/os/src/darwin/darwinSocket.c
new file mode 100644
index 0000000000000000000000000000000000000000..69a4666d34394ef71da1d18559f8ba2f8f9cb290
--- /dev/null
+++ b/src/os/src/darwin/darwinSocket.c
@@ -0,0 +1,29 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+int taosSetSockOpt(SOCKET socketfd, int level, int optname, void *optval, int optlen) {
+  if (level == SOL_SOCKET && optname == SO_SNDBUF) {
+    return 0;
+  }
+
+  if (level == SOL_SOCKET && optname == SO_RCVBUF) {
+    return 0;
+  }
+
+  return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen);
+}
diff --git a/src/os/src/darwin/darwinString.c b/src/os/src/darwin/darwinString.c
new file mode 100644
index 0000000000000000000000000000000000000000..3042e78666c45a97236a45ea20eaf19706104f92
--- /dev/null
+++ b/src/os/src/darwin/darwinString.c
@@ -0,0 +1,22 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+int64_t tsosStr2int64(char *str) {
+  char *endptr = NULL;
+  return strtoll(str, &endptr, 10);
+}
diff --git a/src/os/src/darwin/darwinSysInfo.c b/src/os/src/darwin/darwinSysInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8aa02dcffd14e2def6339ccb507b9f9ab2489d1
--- /dev/null
+++ b/src/os/src/darwin/darwinSysInfo.c
@@ -0,0 +1,104 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+
+static void taosGetSystemTimezone() {
+  // get and set default timezone
+  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
+  if (cfg_timezone && cfg_timezone->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    char *tz = getenv("TZ");
+    if (tz == NULL || strlen(tz) == 0) {
+      strcpy(tsTimezone, "not configured");
+    }
+    else {
+      strcpy(tsTimezone, tz);
+    }
+    cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+    uInfo("timezone not configured, use default");
+  }
+}
+
+static void taosGetSystemLocale() {
+  // get and set default locale
+  SGlobalCfg *cfg_locale = taosGetConfigOption("locale");
+  if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    char *locale = setlocale(LC_CTYPE, "chs");
+    if (locale != NULL) {
+      tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
+      cfg_locale->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+      uInfo("locale not configured, set to default:%s", tsLocale);
+    }
+  }
+
+  SGlobalCfg *cfg_charset = taosGetConfigOption("charset");
+  if (cfg_charset && cfg_charset->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    strcpy(tsCharset, "cp936");
+    cfg_charset->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+    uInfo("charset not configured, set to default:%s", tsCharset);
+  }
+}
+
+void taosPrintOsInfo() {}
+
+void taosKillSystem() {
+  uError("function taosKillSystem, exit!");
+  exit(0);
+}
+
+void taosGetSystemInfo() {
+  taosGetSystemTimezone();
+  taosGetSystemLocale();
+}
+
+bool taosGetDisk() { return true; }
+
+bool taosGetProcIO(float *readKB, float *writeKB) {
+  *readKB = 0;
+  *writeKB = 0;
+  return true;
+}
+
+bool taosGetBandSpeed(float *bandSpeedKb) {
+  *bandSpeedKb = 0;
+  return true;
+}
+
+bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
+  *sysCpuUsage = 0;
+  *procCpuUsage = 0;
+  return true;
+}
+
+bool taosGetProcMemory(float *memoryUsedMB) {
+  *memoryUsedMB = 0;
+  return true;
+}
+
+bool taosGetSysMemory(float *memoryUsedMB) {
+  *memoryUsedMB = 0;
+  return true;
+}
+
+int taosSystem(const char *cmd) {
+  uError("un support funtion");
+  return -1;
+}
+
+void taosSetCoreDump() {}
\ No newline at end of file
diff --git a/src/os/src/darwin/darwinTimer.c b/src/os/src/darwin/darwinTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..5fe65fb99ed72357d88ecbf5d4699bcbb42360c6
--- /dev/null
+++ b/src/os/src/darwin/darwinTimer.c
@@ -0,0 +1,36 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+int taosInitTimer(void (*callback)(int), int ms) {
+  signal(SIGALRM, callback);
+
+  struct itimerval tv;
+  tv.it_interval.tv_sec = 0;  /* my timer resolution */
+  tv.it_interval.tv_usec = 1000 * ms;  // resolution is in msecond
+  tv.it_value = tv.it_interval;
+
+  setitimer(ITIMER_REAL, &tv, NULL);
+
+  return 0;
+}
+
+void taosUninitTimer() {
+  struct itimerval tv = { 0 };
+  setitimer(ITIMER_REAL, &tv, NULL);
+}
+
diff --git a/src/os/src/detail/CMakeLists.txt b/src/os/src/detail/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..afb89354536f03d4a467fa16e20a7fe25794ade2
--- /dev/null
+++ b/src/os/src/detail/CMakeLists.txt
@@ -0,0 +1,11 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(.)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
+AUX_SOURCE_DIRECTORY(. SRC)
+SET_SOURCE_FILES_PROPERTIES(osSysinfo.c PROPERTIES COMPILE_FLAGS -w)
+SET_SOURCE_FILES_PROPERTIES(osCoredump.c PROPERTIES COMPILE_FLAGS -w)
+
+ADD_LIBRARY(osdetail ${SRC})
+TARGET_LINK_LIBRARIES(osdetail os)
diff --git a/src/os/src/detail/osDir.c b/src/os/src/detail/osDir.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3f0fda1a5c8535226eedbac6d5d88a1352e3c6e
--- /dev/null
+++ b/src/os/src/detail/osDir.c
@@ -0,0 +1,148 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "zlib.h"
+
+#define COMPRESS_STEP_SIZE 163840
+
+void taosRemoveDir(char *rootDir) {
+  DIR *dir = opendir(rootDir);
+  if (dir == NULL) return;
+
+  struct dirent *de = NULL;
+  while ((de = readdir(dir)) != NULL) {
+    if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
+     
+    char filename[1024];
+    snprintf(filename, 1023, "%s/%s", rootDir, de->d_name);
+    if (de->d_type & DT_DIR) {
+      taosRemoveDir(filename);
+    } else {
+      (void)remove(filename);
+      uInfo("file:%s is removed", filename);
+    }
+  }
+
+  closedir(dir);
+  rmdir(rootDir);
+
+  uInfo("dir:%s is removed", rootDir);
+}
+
+int taosMkDir(const char *path, mode_t mode) {
+  int code = mkdir(path, 0755);
+  if (code < 0 && errno == EEXIST) code = 0;
+  return code;
+}
+
+void taosRename(char* oldName, char *newName) {
+  // if newName in not empty, rename return fail. 
+  // the newName must be empty or does not exist
+  if (rename(oldName, newName)) {
+    uError("failed to rename file %s to %s, reason:%s", oldName, newName, strerror(errno));
+  } else {
+    uInfo("successfully to rename file %s to %s", oldName, newName);
+  }
+}
+
+void taosRemoveOldLogFiles(char *rootDir, int32_t keepDays) {
+  DIR *dir = opendir(rootDir);
+  if (dir == NULL) return;
+
+  int64_t sec = taosGetTimestampSec();
+  struct dirent *de = NULL;
+
+  while ((de = readdir(dir)) != NULL) {
+    if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
+
+    char filename[1024];
+    snprintf(filename, 1023, "%s/%s", rootDir, de->d_name);
+    if (de->d_type & DT_DIR) {
+      continue;
+    } else {
+      int32_t len = (int32_t)strlen(filename);
+      if (len > 3 && strcmp(filename + len - 3, ".gz") == 0) {
+        len -= 3;
+      }
+
+      int64_t fileSec = 0;
+      for (int i = len - 1; i >= 0; i--) {
+        if (filename[i] == '.') {
+          fileSec = atoll(filename + i + 1);
+          break;
+        }
+      }
+
+      if (fileSec <= 100) continue;
+      int32_t days = (int32_t)(ABS(sec - fileSec) / 86400 + 1);
+      if (days > keepDays) {
+        (void)remove(filename);
+        uInfo("file:%s is removed, days:%d keepDays:%d", filename, days, keepDays);
+      } else {
+        uTrace("file:%s won't be removed, days:%d keepDays:%d", filename, days, keepDays);
+      }
+    }
+  }
+
+  closedir(dir);
+  rmdir(rootDir);
+}
+
+int32_t taosCompressFile(char *srcFileName, char *destFileName) {
+  int32_t ret = 0;
+  int32_t len = 0;
+  char *  data = malloc(COMPRESS_STEP_SIZE);
+  FILE *  srcFp = NULL;
+  gzFile  dstFp = NULL;
+
+  srcFp = fopen(srcFileName, "r");
+  if (srcFp == NULL) {
+    ret = -1;
+    goto cmp_end;
+  }
+
+  int32_t fd = open(destFileName, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+  if (fd < 0) {
+    ret = -2;
+    goto cmp_end;
+  }
+
+  dstFp = gzdopen(fd, "wb6f");
+  if (dstFp == NULL) {
+    ret = -3;
+    close(fd);
+    goto cmp_end;
+  }
+
+  while (!feof(srcFp)) {
+    len = (int32_t)fread(data, 1, COMPRESS_STEP_SIZE, srcFp);
+    (void)gzwrite(dstFp, data, len);
+  }
+
+cmp_end:
+  if (srcFp) {
+    fclose(srcFp);
+  }
+  if (dstFp) {
+    gzclose(dstFp);
+  }
+  free(data);
+
+  return ret;
+}
diff --git a/src/os/src/detail/osFail.c b/src/os/src/detail/osFail.c
new file mode 100644
index 0000000000000000000000000000000000000000..e0eb200851f976e1c9dad47afbc152bfb021e4e5
--- /dev/null
+++ b/src/os/src/detail/osFail.c
@@ -0,0 +1,141 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#define RANDOM_NETWORK_FAIL_FACTOR  20
+
+#ifdef TAOS_RANDOM_NETWORK_FAIL
+
+ssize_t taosSendRandomFail(int sockfd, const void *buf, size_t len, int flags) {
+  if (rand() % RANDOM_NETWORK_FAIL_FACTOR == 0) {
+    errno = ECONNRESET;
+    return -1;
+  }
+
+  return send(sockfd, buf, len, flags);
+}
+
+ssize_t taosSendToRandomFail(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr,
+                           socklen_t addrlen) {
+  if (rand() % RANDOM_NETWORK_FAIL_FACTOR == 0) {
+    errno = ECONNRESET;
+    return -1;
+  }
+
+  return sendto(sockfd, buf, len, flags, dest_addr, addrlen);
+}
+
+ssize_t taosReadSocketRandomFail(int fd, void *buf, size_t count) {
+  if (rand() % RANDOM_NETWORK_FAIL_FACTOR == 0) {
+    errno = ECONNRESET;
+    return -1;
+  }
+
+  return read(fd, buf, count);
+}
+
+ssize_t taosWriteSocketRandomFail(int fd, const void *buf, size_t count) {
+  if (rand() % RANDOM_NETWORK_FAIL_FACTOR == 0) {
+    errno = EINTR;
+    return -1;
+  }
+
+  return write(fd, buf, count);
+}
+
+#endif //TAOS_RANDOM_NETWORK_FAIL
+
+#ifdef TAOS_RANDOM_FILE_FAIL
+
+static int random_file_fail_factor = 20;
+static FILE *fpRandomFileFailOutput = NULL;
+
+void taosSetRandomFileFailFactor(int factor) { 
+  random_file_fail_factor = factor;
+}
+
+static void close_random_file_fail_output() {
+  if (fpRandomFileFailOutput != NULL) {
+    if (fpRandomFileFailOutput != stdout) {
+      fclose(fpRandomFileFailOutput);
+    }
+    fpRandomFileFailOutput = NULL;
+  }
+}
+
+static void random_file_fail_output_sig(int sig) {
+  fprintf(fpRandomFileFailOutput, "signal %d received.\n", sig);
+
+  struct sigaction act = {0};
+  act.sa_handler = SIG_DFL;
+  sigaction(sig, &act, NULL);
+
+  close_random_file_fail_output();
+  exit(EXIT_FAILURE);
+}
+
+void taosSetRandomFileFailOutput(const char *path) {
+  if (path == NULL) {
+    fpRandomFileFailOutput = stdout;
+  } else if ((fpRandomFileFailOutput = fopen(path, "w")) != NULL) {
+    atexit(close_random_file_fail_output);
+  } else {
+    printf("failed to open random file fail log file '%s', errno=%d\n", path, errno);
+    return;
+  }
+
+  struct sigaction act = {0};
+  act.sa_handler = random_file_fail_output_sig;
+  sigaction(SIGFPE, &act, NULL);
+  sigaction(SIGSEGV, &act, NULL);
+  sigaction(SIGILL, &act, NULL);
+}
+
+ssize_t taosReadFileRandomFail(int fd, void *buf, size_t count, const char *file, uint32_t line) {
+  if (random_file_fail_factor > 0) {
+    if (rand() % random_file_fail_factor == 0) {
+      errno = EIO;
+      return -1;
+    }
+  }
+
+  return taosTReadImp(fd, buf, count);
+}
+
+ssize_t taosWriteFileRandomFail(int fd, void *buf, size_t count, const char *file, uint32_t line) {
+  if (random_file_fail_factor > 0) {
+    if (rand() % random_file_fail_factor == 0) {
+      errno = EIO;
+      return -1;
+    }
+  }
+
+  return taosTWriteImp(fd, buf, count);
+}
+
+off_t taosLSeekRandomFail(int fd, off_t offset, int whence, const char *file, uint32_t line) {
+  if (random_file_fail_factor > 0) {
+    if (rand() % random_file_fail_factor == 0) {
+      errno = EIO;
+      return -1;
+    }
+  }
+
+  return lseek(fd, offset, whence);
+}
+
+#endif //TAOS_RANDOM_FILE_FAIL
diff --git a/src/os/src/detail/osFile.c b/src/os/src/detail/osFile.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f055dd8129f340f267e64cdd905505a7b675a2d
--- /dev/null
+++ b/src/os/src/detail/osFile.c
@@ -0,0 +1,137 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#ifndef TAOS_OS_FUNC_FILE_GETTMPFILEPATH
+void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
+  const char *tdengineTmpFileNamePrefix = "tdengine-";
+
+  char  tmpPath[PATH_MAX];
+  char *tmpDir = "/tmp/";
+
+  strcpy(tmpPath, tmpDir);
+  strcat(tmpPath, tdengineTmpFileNamePrefix);
+  if (strlen(tmpPath) + strlen(fileNamePrefix) + strlen("-%d-%s") < PATH_MAX) {
+    strcat(tmpPath, fileNamePrefix);
+    strcat(tmpPath, "-%d-%s");
+  }
+
+  char rand[8] = {0};
+  taosRandStr(rand, tListLen(rand) - 1);
+  snprintf(dstPath, PATH_MAX, tmpPath, getpid(), rand);
+}
+#endif
+
+// rename file name
+int32_t taosFileRename(char *fullPath, char *suffix, char delimiter, char **dstPath) {
+  int32_t ts = taosGetTimestampSec();
+
+  char fname[PATH_MAX] = {0};  // max file name length must be less than 255
+
+  char *delimiterPos = strrchr(fullPath, delimiter);
+  if (delimiterPos == NULL) return -1;
+
+  int32_t fileNameLen = 0;
+  if (suffix)
+    fileNameLen = snprintf(fname, PATH_MAX, "%s.%d.%s", delimiterPos + 1, ts, suffix);
+  else
+    fileNameLen = snprintf(fname, PATH_MAX, "%s.%d", delimiterPos + 1, ts);
+
+  size_t len = (size_t)((delimiterPos - fullPath) + fileNameLen + 1);
+  if (*dstPath == NULL) {
+    *dstPath = calloc(1, len + 1);
+    if (*dstPath == NULL) return -1;
+  }
+
+  strncpy(*dstPath, fullPath, (size_t)(delimiterPos - fullPath + 1));
+  strncat(*dstPath, fname, (size_t)fileNameLen);
+  (*dstPath)[len] = 0;
+
+  return rename(fullPath, *dstPath);
+}
+
+ssize_t taosTReadImp(int fd, void *buf, size_t count) {
+  size_t  leftbytes = count;
+  ssize_t readbytes;
+  char *  tbuf = (char *)buf;
+
+  while (leftbytes > 0) {
+    readbytes = read(fd, (void *)tbuf, (uint32_t)leftbytes);
+    if (readbytes < 0) {
+      if (errno == EINTR) {
+        continue;
+      } else {
+        return -1;
+      }
+    } else if (readbytes == 0) {
+      return (ssize_t)(count - leftbytes);
+    }
+
+    leftbytes -= readbytes;
+    tbuf += readbytes;
+  }
+
+  return (ssize_t)count;
+}
+
+ssize_t taosTWriteImp(int fd, void *buf, size_t n) {
+  size_t  nleft = n;
+  ssize_t nwritten = 0;
+  char *  tbuf = (char *)buf;
+
+  while (nleft > 0) {
+    nwritten = write(fd, (void *)tbuf, (uint32_t)nleft);
+    if (nwritten < 0) {
+      if (errno == EINTR) {
+        continue;
+      }
+      return -1;
+    }
+    nleft -= nwritten;
+    tbuf += nwritten;
+  }
+
+  return (ssize_t)n;
+}
+
+#ifndef TAOS_OS_FUNC_FILE_SENDIFLE
+ssize_t taosTSendFileImp(int dfd, int sfd, off_t *offset, size_t size) {
+  size_t  leftbytes = size;
+  ssize_t sentbytes;
+
+  while (leftbytes > 0) {
+    /*
+     * TODO : Think to check if file is larger than 1GB
+     */
+    // if (leftbytes > 1000000000) leftbytes = 1000000000;
+    sentbytes = sendfile(dfd, sfd, offset, leftbytes);
+    if (sentbytes == -1) {
+      if (errno == EINTR) {
+        continue;
+      } else {
+        return -1;
+      }
+    } else if (sentbytes == 0) {
+      return (ssize_t)(size - leftbytes);
+    }
+
+    leftbytes -= sentbytes;
+  }
+
+  return size;
+}
+#endif
\ No newline at end of file
diff --git a/src/os/src/detail/osMemory.c b/src/os/src/detail/osMemory.c
new file mode 100644
index 0000000000000000000000000000000000000000..dfd320be89a75a4700a4918f68d56ee66faa3135
--- /dev/null
+++ b/src/os/src/detail/osMemory.c
@@ -0,0 +1,519 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+
+#ifdef TAOS_MEM_CHECK
+
+static ETaosMemoryAllocMode allocMode = TAOS_ALLOC_MODE_DEFAULT;
+static FILE* fpAllocLog = NULL;
+
+////////////////////////////////////////////////////////////////////////////////
+// memory allocator which fails randomly
+
+extern int32_t taosGetTimestampSec();
+static int32_t startTime = INT32_MAX;
+
+static bool random_alloc_fail(size_t size, const char* file, uint32_t line) {
+  if (taosGetTimestampSec() < startTime) {
+    return false;
+  }
+
+  if (size < 100 * (size_t)1024) {
+    return false;
+  }
+
+  if (rand() % 20 != 0) {
+    return false;
+  }
+
+  if (fpAllocLog != NULL) {
+    fprintf(fpAllocLog, "%s:%d: memory allocation of %" PRIzu " bytes will fail.\n", file, line, size);
+  }
+
+  return true;
+}
+
+static void* malloc_random(size_t size, const char* file, uint32_t line) {
+  return random_alloc_fail(size, file, line) ? NULL : malloc(size);
+}
+
+static void* calloc_random(size_t num, size_t size, const char* file, uint32_t line) {
+  return random_alloc_fail(num * size, file, line) ? NULL : calloc(num, size);
+}
+
+static void* realloc_random(void* ptr, size_t size, const char* file, uint32_t line) {
+  return random_alloc_fail(size, file, line) ? NULL : realloc(ptr, size);
+}
+
+static char* strdup_random(const char* str, const char* file, uint32_t line) {
+  size_t len = strlen(str);
+  return random_alloc_fail(len + 1, file, line) ? NULL : taosStrdupImp(str);
+}
+
+static char* strndup_random(const char* str, size_t size, const char* file, uint32_t line) {
+  size_t len = strlen(str);
+  if (len > size) {
+    len = size;
+  }
+  return random_alloc_fail(len + 1, file, line) ? NULL : taosStrndupImp(str, len);
+}
+
+static ssize_t getline_random(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
+  return random_alloc_fail(*n, file, line) ? -1 : taosGetlineImp(lineptr, n, stream);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// memory allocator with leak detection
+
+#define MEMBLK_MAGIC 0x55AA
+
+typedef struct SMemBlock {
+  const char* file;
+  uint16_t line;
+  uint16_t magic;
+  uint32_t size;
+  struct SMemBlock* prev;
+  struct SMemBlock* next;
+  // TODO: need pading in 32bit platform
+  char data[0];
+} SMemBlock;
+
+static SMemBlock *blocks = NULL;
+static uintptr_t lock = 0;
+
+static void add_mem_block(SMemBlock* blk) {
+  blk->prev = NULL;
+  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
+  blk->next = blocks;
+  if (blocks != NULL) {
+    blocks->prev = blk;
+  }
+  blocks = blk;
+  atomic_store_ptr(&lock, 0);
+}
+
+static void remove_mem_block(SMemBlock* blk) {
+  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
+
+  if (blocks == blk) {
+    blocks = blk->next;
+  }
+  if (blk->prev != NULL) {
+    blk->prev->next = blk->next;
+  }
+  if (blk->next != NULL) {
+    blk->next->prev = blk->prev;
+  }
+
+  atomic_store_ptr(&lock, 0);
+
+  blk->prev = NULL;
+  blk->next = NULL;
+}
+
+static void free_detect_leak(void* ptr, const char* file, uint32_t line) {
+  if (ptr == NULL) {
+    return;
+  }
+
+  SMemBlock* blk = (SMemBlock*)(((char*)ptr) - sizeof(SMemBlock));
+  if (blk->magic != MEMBLK_MAGIC) {
+    if (fpAllocLog != NULL) {
+      fprintf(fpAllocLog, "%s:%d: memory is allocated by default allocator.\n", file, line);
+    }
+    free(ptr);
+    return;
+  }
+
+  remove_mem_block(blk);
+  free(blk);
+}
+
+static void* malloc_detect_leak(size_t size, const char* file, uint32_t line) {
+  if (size == 0) {
+    return NULL;
+  }
+
+  SMemBlock *blk = (SMemBlock*)malloc(size + sizeof(SMemBlock));
+  if (blk == NULL) {
+    return NULL;
+  }
+
+  if (line > UINT16_MAX && fpAllocLog != NULL) {
+    fprintf(fpAllocLog, "%s:%d: line number too large.\n", file, line);
+  }
+
+  if (size > UINT32_MAX && fpAllocLog != NULL) {
+    fprintf(fpAllocLog, "%s:%d: size too large: %" PRIzu ".\n", file, line, size);
+  }
+
+  blk->file = file;
+  blk->line = (uint16_t)line;
+  blk->magic = MEMBLK_MAGIC;
+  blk->size = size;
+  add_mem_block(blk);
+
+  return blk->data;
+}
+
+static void* calloc_detect_leak(size_t num, size_t size, const char* file, uint32_t line) {
+  size *= num;
+  void* p = malloc_detect_leak(size, file, line);
+  if (p != NULL) {
+    memset(p, 0, size);
+  }
+  return p;
+}
+
+static void* realloc_detect_leak(void* ptr, size_t size, const char* file, uint32_t line) {
+  if (size == 0) {
+    free_detect_leak(ptr, file, line);
+    return NULL;
+  }
+
+  if (ptr == NULL) {
+    return malloc_detect_leak(size, file, line);
+  }
+
+  SMemBlock* blk = (SMemBlock *)((char*)ptr) - sizeof(SMemBlock);
+  if (blk->magic != MEMBLK_MAGIC) {
+    if (fpAllocLog != NULL) {
+      fprintf(fpAllocLog, "%s:%d: memory is allocated by default allocator.\n", file, line);
+    }
+    return realloc(ptr, size);
+  }
+
+  remove_mem_block(blk);
+
+  void* p = realloc(blk, size + sizeof(SMemBlock));
+  if (p == NULL) {
+    add_mem_block(blk);
+    return NULL;
+  }
+
+  if (size > UINT32_MAX && fpAllocLog != NULL) {
+    fprintf(fpAllocLog, "%s:%d: size too large: %" PRIzu ".\n", file, line, size);
+  }
+
+  blk = (SMemBlock*)p;
+  blk->size = size;
+  add_mem_block(blk);
+  return blk->data;
+}
+
+static char* strdup_detect_leak(const char* str, const char* file, uint32_t line) {
+  size_t len = strlen(str);
+  char *p = malloc_detect_leak(len + 1, file, line);
+  if (p != NULL) {
+    memcpy(p, str, len);
+    p[len] = 0;
+  }
+  return p;
+}
+
+static char* strndup_detect_leak(const char* str, size_t size, const char* file, uint32_t line) {
+  size_t len = strlen(str);
+  if (len > size) {
+    len = size;
+  }
+  char *p = malloc_detect_leak(len + 1, file, line);
+  if (p != NULL) {
+    memcpy(p, str, len);
+    p[len] = 0;
+  }
+  return p;
+}
+
+static ssize_t getline_detect_leak(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
+  char* buf = NULL;
+  size_t bufSize = 0;
+  ssize_t size = taosGetlineImp(&buf, &bufSize, stream);
+  if (size != -1) {
+    if (*n < size + 1) {
+      void* p = realloc_detect_leak(*lineptr, size + 1, file, line);
+      if (p == NULL) {
+        free(buf);
+        return -1;
+      }
+      *lineptr = (char*)p;
+      *n = size + 1;
+    }
+    memcpy(*lineptr, buf, size + 1);
+  }
+
+  free(buf);
+  return size;
+}
+
+static void dump_memory_leak() {
+  const char* hex = "0123456789ABCDEF";
+  const char* fmt = ":%d: addr=%p, size=%d, content(first 16 bytes)=";
+  size_t numOfBlk = 0, totalSize = 0;
+
+  if (fpAllocLog == NULL) {
+    return;
+  }
+
+  fputs("memory blocks allocated but not freed before exit:\n", fpAllocLog);
+
+  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
+
+  for (SMemBlock* blk = blocks; blk != NULL; blk = blk->next) {
+    ++numOfBlk;
+    totalSize += blk->size;
+
+    fputs(blk->file, fpAllocLog);
+    fprintf(fpAllocLog, fmt, blk->line, blk->data, blk->size);
+
+    char sep = '\'';
+    size_t size = blk->size > 16 ? 16 : blk->size;
+    for (size_t i = 0; i < size; ++i) {
+      uint8_t c = (uint8_t)(blk->data[i]);
+      fputc(sep, fpAllocLog);
+      sep = ' ';
+      fputc(hex[c >> 4], fpAllocLog);
+      fputc(hex[c & 0x0f], fpAllocLog);
+    }
+
+    fputs("'\n", fpAllocLog);
+  }
+
+  atomic_store_ptr(&lock, 0);
+
+  fprintf(fpAllocLog, "\nnumber of blocks: %" PRIzu ", total bytes: %" PRIzu "\n", numOfBlk, totalSize);
+  fflush(fpAllocLog);
+}
+
+static void dump_memory_leak_on_sig(int sig) {
+  fprintf(fpAllocLog, "signal %d received.\n", sig);
+
+  // restore default signal handler
+  struct sigaction act = {0};
+  act.sa_handler = SIG_DFL;
+  sigaction(sig, &act, NULL);
+
+  dump_memory_leak();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// interface functions
+
+void* taos_malloc(size_t size, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return malloc(size);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return malloc_random(size, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return malloc_detect_leak(size, file, line);
+  }
+  return malloc(size);
+}
+
+void* taos_calloc(size_t num, size_t size, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return calloc(num, size);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return calloc_random(num, size, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return calloc_detect_leak(num, size, file, line);
+  }
+  return calloc(num, size);
+}
+
+void* taos_realloc(void* ptr, size_t size, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return realloc(ptr, size);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return realloc_random(ptr, size, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return realloc_detect_leak(ptr, size, file, line);
+  }
+  return realloc(ptr, size);
+}
+
+void  taos_free(void* ptr, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return free(ptr);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return free(ptr);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return free_detect_leak(ptr, file, line);
+  }
+  return free(ptr);
+}
+
+char* taos_strdup(const char* str, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return taosStrdupImp(str);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return strdup_random(str, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return strdup_detect_leak(str, file, line);
+  }
+  return taosStrdupImp(str);
+}
+
+char* taos_strndup(const char* str, size_t size, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return taosStrndupImp(str, size);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return strndup_random(str, size, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return strndup_detect_leak(str, size, file, line);
+  }
+  return taosStrndupImp(str, size);
+}
+
+ssize_t taos_getline(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
+  switch (allocMode) {
+    case TAOS_ALLOC_MODE_DEFAULT:
+      return taosGetlineImp(lineptr, n, stream);
+
+    case TAOS_ALLOC_MODE_RANDOM_FAIL:
+      return getline_random(lineptr, n, stream, file, line);
+
+    case TAOS_ALLOC_MODE_DETECT_LEAK:
+      return getline_detect_leak(lineptr, n, stream, file, line);
+  }
+  return taosGetlineImp(lineptr, n, stream);
+}
+
+static void close_alloc_log() {
+  if (fpAllocLog != NULL) {
+    if (fpAllocLog != stdout) {
+      fclose(fpAllocLog);
+    }
+    fpAllocLog = NULL;
+  }
+}
+
+void taosSetAllocMode(int mode, const char* path, bool autoDump) {
+  assert(mode >= TAOS_ALLOC_MODE_DEFAULT);
+  assert(mode <= TAOS_ALLOC_MODE_DETECT_LEAK);
+
+  if (fpAllocLog != NULL || allocMode != TAOS_ALLOC_MODE_DEFAULT) {
+    printf("memory allocation mode can only be set once.\n");
+    return;
+  }
+
+  if (path == NULL || path[0] == 0) {
+    fpAllocLog = stdout;
+  } else if ((fpAllocLog = fopen(path, "w")) != NULL) {
+    atexit(close_alloc_log);
+  } else {
+    printf("failed to open memory allocation log file '%s', errno=%d\n", path, errno);
+    return;
+  }
+
+  allocMode = mode;
+
+  if (mode == TAOS_ALLOC_MODE_RANDOM_FAIL) {
+    startTime = taosGetTimestampSec() + 10;
+    return;
+  }
+
+  if (autoDump && mode == TAOS_ALLOC_MODE_DETECT_LEAK) {
+    atexit(dump_memory_leak);
+
+    struct sigaction act = {0};
+    act.sa_handler = dump_memory_leak_on_sig;
+    sigaction(SIGFPE, &act, NULL);
+    sigaction(SIGSEGV, &act, NULL);
+    sigaction(SIGILL, &act, NULL);
+  }
+}
+
+void taosDumpMemoryLeak() {
+  dump_memory_leak();
+  close_alloc_log();
+}
+
+#else // 'TAOS_MEM_CHECK' not defined
+
+void taosSetAllocMode(int mode, const char* path, bool autoDump) {
+  // do nothing
+}
+
+void taosDumpMemoryLeak() {
+  // do nothing
+}
+
+#endif // TAOS_MEM_CHECK
+
+void *taosTMalloc(size_t size) {
+  if (size <= 0) return NULL;
+
+  void *ret = malloc(size + sizeof(size_t));
+  if (ret == NULL) return NULL;
+
+  *(size_t *)ret = size;
+
+  return (void *)((char *)ret + sizeof(size_t));
+}
+
+void *taosTCalloc(size_t nmemb, size_t size) {
+  size_t tsize = nmemb * size;
+  void * ret = taosTMalloc(tsize);
+  if (ret == NULL) return NULL;
+
+  taosTMemset(ret, 0);
+  return ret;
+}
+
+size_t taosTSizeof(void *ptr) { return (ptr) ? (*(size_t *)((char *)ptr - sizeof(size_t))) : 0; }
+
+void taosTMemset(void *ptr, int c) { memset(ptr, c, taosTSizeof(ptr)); }
+
+void * taosTRealloc(void *ptr, size_t size) {
+  if (ptr == NULL) return taosTMalloc(size);
+
+  if (size <= taosTSizeof(ptr)) return ptr;
+
+  void * tptr = (void *)((char *)ptr - sizeof(size_t));
+  size_t tsize = size + sizeof(size_t);
+  tptr = realloc(tptr, tsize);
+  if (tptr == NULL) return NULL;
+
+  *(size_t *)tptr = size;
+
+  return (void *)((char *)tptr + sizeof(size_t));
+}
+
+void taosTZfree(void *ptr) {
+  if (ptr) {
+    free((void *)((char *)ptr - sizeof(size_t)));
+  }
+}
\ No newline at end of file
diff --git a/src/os/src/detail/osRand.c b/src/os/src/detail/osRand.c
new file mode 100644
index 0000000000000000000000000000000000000000..b322a88684e63776b432d2f4025b3d16fc614861
--- /dev/null
+++ b/src/os/src/detail/osRand.c
@@ -0,0 +1,50 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#ifndef TAOS_OS_FUNC_RAND
+
+uint32_t taosRand(void) { return rand(); }
+
+uint32_t taosSafeRand(void) {
+  int fd;
+  int seed;
+
+  fd = open("/dev/urandom", 0);
+  if (fd < 0) {
+    seed = (int)time(0);
+  } else {
+    int len = read(fd, &seed, sizeof(seed));
+    if (len < 0) {
+      seed = (int)time(0);
+    }
+    close(fd);
+  }
+
+  return (uint32_t)seed;
+}
+
+#endif
+
+void taosRandStr(char* str, int32_t size) {
+  const char* set = "abcdefghijklmnopqrstuvwxyz0123456789-_.";
+  int32_t     len = 39;
+
+  for (int32_t i = 0; i < size; ++i) {
+    str[i] = set[taosRand() % len];
+  }
+}
\ No newline at end of file
diff --git a/src/os/src/detail/osSemphone.c b/src/os/src/detail/osSemphone.c
new file mode 100644
index 0000000000000000000000000000000000000000..b91888845edd9e98315994eaada9eca245aacb24
--- /dev/null
+++ b/src/os/src/detail/osSemphone.c
@@ -0,0 +1,38 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#ifndef TAOS_OS_FUNC_SEMPHONE
+
+int tsem_wait(tsem_t* sem) {
+  int ret = 0;
+  do {
+    ret = sem_wait(sem);
+  } while (ret != 0 && errno == EINTR);
+  return ret;
+}
+
+#endif
+
+#ifndef TAOS_OS_FUNC_SEMPHONE_PTHREAD
+
+bool    taosCheckPthreadValid(pthread_t thread) { return thread != 0; }
+int64_t taosGetPthreadId() { return (int64_t)pthread_self(); }
+void    taosResetPthread(pthread_t *thread) { *thread = 0; }
+bool    taosComparePthread(pthread_t first, pthread_t second) { return first == second; }
+
+#endif
\ No newline at end of file
diff --git a/src/os/src/detail/osSocket.c b/src/os/src/detail/osSocket.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a51c389e9f2efdcf3eaad97d434269ff3c0061f
--- /dev/null
+++ b/src/os/src/detail/osSocket.c
@@ -0,0 +1,72 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+
+#ifndef TAOS_OS_FUNC_SOCKET
+
+int taosSetNonblocking(SOCKET sock, int on) {
+  int flags = 0;
+  if ((flags = fcntl(sock, F_GETFL, 0)) < 0) {
+    uError("fcntl(F_GETFL) error: %d (%s)\n", errno, strerror(errno));
+    return 1;
+  }
+
+  if (on)
+    flags |= O_NONBLOCK;
+  else
+    flags &= ~O_NONBLOCK;
+
+  if ((flags = fcntl(sock, F_SETFL, flags)) < 0) {
+    uError("fcntl(F_SETFL) error: %d (%s)\n", errno, strerror(errno));
+    return 1;
+  }
+
+  return 0;
+}
+
+void taosBlockSIGPIPE() {
+  sigset_t signal_mask;
+  sigemptyset(&signal_mask);
+  sigaddset(&signal_mask, SIGPIPE);
+  int rc = pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
+  if (rc != 0) {
+    uError("failed to block SIGPIPE");
+  }
+}
+
+#endif
+
+#ifndef TAOS_OS_FUNC_SOCKET_SETSOCKETOPT
+
+int taosSetSockOpt(SOCKET socketfd, int level, int optname, void *optval, int optlen) {
+  return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen);
+}
+
+#endif
+
+#ifndef TAOS_OS_FUNC_SOCKET_INET
+
+uint32_t taosInetAddr(char *ipAddr) {
+  return inet_addr(ipAddr);
+}
+
+const char *taosInetNtoa(struct in_addr ipInt) {
+  return inet_ntoa(ipInt);
+}
+
+#endif
\ No newline at end of file
diff --git a/src/os/src/detail/osString.c b/src/os/src/detail/osString.c
new file mode 100644
index 0000000000000000000000000000000000000000..31ffd6b87cf3a63b8663c87514699f5579ffc061
--- /dev/null
+++ b/src/os/src/detail/osString.c
@@ -0,0 +1,127 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+
+#ifndef TAOS_OS_FUNC_STRING_STR2INT64
+int64_t tsosStr2int64(char *str) {
+  char *endptr = NULL;
+  return strtoll(str, &endptr, 10);
+}
+#endif
+
+#ifndef TAOS_OS_FUNC_STRING_WCHAR
+int tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int bytes) {
+  return wcsncmp((wchar_t *)f1_ucs4, (wchar_t *)f2_ucs4, bytes / TSDB_NCHAR_SIZE);
+}
+#endif
+
+#ifdef USE_LIBICONV
+#include "iconv.h"
+
+int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs) {
+  iconv_t cd = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
+  size_t  ucs4_input_len = ucs4_max_len;
+  size_t  outLen = ucs4_max_len;
+  if (iconv(cd, (char **)&ucs4, &ucs4_input_len, &mbs, &outLen) == -1) {
+    iconv_close(cd);
+    return -1;
+  }
+
+  iconv_close(cd);
+  return (int32_t)(ucs4_max_len - outLen);
+}
+
+bool taosMbsToUcs4(char *mbs, size_t mbsLength, char *ucs4, int32_t ucs4_max_len, size_t *len) {
+  memset(ucs4, 0, ucs4_max_len);
+  iconv_t cd = iconv_open(DEFAULT_UNICODE_ENCODEC, tsCharset);
+  size_t  ucs4_input_len = mbsLength;
+  size_t  outLeft = ucs4_max_len;
+  if (iconv(cd, &mbs, &ucs4_input_len, &ucs4, &outLeft) == -1) {
+    iconv_close(cd);
+    return false;
+  }
+
+  iconv_close(cd);
+  if (len != NULL) {
+    *len = ucs4_max_len - outLeft;
+  }
+
+  return true;
+}
+
+bool taosValidateEncodec(const char *encodec) {
+  iconv_t cd = iconv_open(encodec, DEFAULT_UNICODE_ENCODEC);
+  if (cd == (iconv_t)(-1)) {
+    return false;
+  }
+
+  iconv_close(cd);
+  return true;
+}
+
+#else
+
+int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs) {
+  mbstate_t state = {0};
+  int32_t   len = (int32_t)wcsnrtombs(NULL, (const wchar_t **)&ucs4, ucs4_max_len / 4, 0, &state);
+  if (len < 0) {
+    return -1;
+  }
+
+  memset(&state, 0, sizeof(state));
+  len = wcsnrtombs(mbs, (const wchar_t **)&ucs4, ucs4_max_len / 4, (size_t)len, &state);
+  if (len < 0) {
+    return -1;
+  }
+
+  return len;
+}
+
+bool taosMbsToUcs4(char *mbs, size_t mbsLength, char *ucs4, int32_t ucs4_max_len, size_t *len) {
+  memset(ucs4, 0, ucs4_max_len);
+  mbstate_t state = {0};
+  int32_t retlen = mbsnrtowcs((wchar_t *)ucs4, (const char **)&mbs, mbsLength, ucs4_max_len / 4, &state);
+  *len = retlen;
+
+  return retlen >= 0;
+}
+
+bool taosValidateEncodec(const char *encodec) {
+  return true;
+}
+
+#endif
+
+typedef struct CharsetPair {
+  char *oldCharset;
+  char *newCharset;
+} CharsetPair;
+
+char *taosCharsetReplace(char *charsetstr) {
+  CharsetPair charsetRep[] = {
+      { "utf8", "UTF-8" }, { "936", "CP936" },
+  };
+
+  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
+    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
+      return strdup(charsetRep[i].newCharset);
+    }
+  }
+
+  return strdup(charsetstr);
+}
diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..83ecd8580946db628e7a785b5becca87db23118c
--- /dev/null
+++ b/src/os/src/detail/osSysinfo.c
@@ -0,0 +1,670 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tulog.h"
+
+#ifndef TAOS_OS_FUNC_SYSINFO
+
+#define PROCESS_ITEM 12
+
+typedef struct {
+  uint64_t user;
+  uint64_t nice;
+  uint64_t system;
+  uint64_t idle;
+} SysCpuInfo;
+
+typedef struct {
+  uint64_t utime;   // user time
+  uint64_t stime;   // kernel time
+  uint64_t cutime;  // all user time
+  uint64_t cstime;  // all dead time
+} ProcCpuInfo;
+
+static pid_t tsProcId;
+static char  tsSysNetFile[] = "/proc/net/dev";
+static char  tsSysCpuFile[] = "/proc/stat";
+static char  tsProcCpuFile[25] = {0};
+static char  tsProcMemFile[25] = {0};
+static char  tsProcIOFile[25] = {0};
+static float tsPageSizeKB = 0;
+
+bool taosGetSysMemory(float *memoryUsedMB) {
+  float memoryAvailMB = (float)sysconf(_SC_AVPHYS_PAGES) * tsPageSizeKB / 1024;
+  *memoryUsedMB = (float)tsTotalMemoryMB - memoryAvailMB;
+  return true;
+}
+
+bool taosGetProcMemory(float *memoryUsedMB) {
+  FILE *fp = fopen(tsProcMemFile, "r");
+  if (fp == NULL) {
+    uError("open file:%s failed", tsProcMemFile);
+    return false;
+  }
+
+  size_t len;
+  char * line = NULL;
+  while (!feof(fp)) {
+    taosTFree(line);
+    len = 0;
+    getline(&line, &len, fp);
+    if (line == NULL) {
+      break;
+    }
+    if (strstr(line, "VmRSS:") != NULL) {
+      break;
+    }
+  }
+
+  if (line == NULL) {
+    uError("read file:%s failed", tsProcMemFile);
+    fclose(fp);
+    return false;
+  }
+
+  int64_t memKB = 0;
+  char    tmp[10];
+  sscanf(line, "%s %" PRId64, tmp, &memKB);
+  *memoryUsedMB = (float)((double)memKB / 1024);
+
+  taosTFree(line);
+  fclose(fp);
+  return true;
+}
+
+static bool taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
+  FILE *fp = fopen(tsSysCpuFile, "r");
+  if (fp == NULL) {
+    uError("open file:%s failed", tsSysCpuFile);
+    return false;
+  }
+
+  size_t len;
+  char * line = NULL;
+  getline(&line, &len, fp);
+  if (line == NULL) {
+    uError("read file:%s failed", tsSysCpuFile);
+    fclose(fp);
+    return false;
+  }
+
+  char cpu[10] = {0};
+  sscanf(line, "%s %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, cpu, &cpuInfo->user, &cpuInfo->nice, &cpuInfo->system, &cpuInfo->idle);
+
+  taosTFree(line);
+  fclose(fp);
+  return true;
+}
+
+static bool taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
+  FILE *fp = fopen(tsProcCpuFile, "r");
+  if (fp == NULL) {
+    uError("open file:%s failed", tsProcCpuFile);
+    return false;
+  }
+
+  size_t len = 0;
+  char * line = NULL;
+  getline(&line, &len, fp);
+  if (line == NULL) {
+    uError("read file:%s failed", tsProcCpuFile);
+    fclose(fp);
+    return false;
+  }
+
+  for (int i = 0, blank = 0; line[i] != 0; ++i) {
+    if (line[i] == ' ') blank++;
+    if (blank == PROCESS_ITEM) {
+      sscanf(line + i + 1, "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, &cpuInfo->utime, &cpuInfo->stime, &cpuInfo->cutime, &cpuInfo->cstime);
+      break;
+    }
+  }
+
+  taosTFree(line);
+  fclose(fp);
+  return true;
+}
+
+static void taosGetSystemTimezone() {
+  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
+  if (cfg_timezone == NULL) return;
+  if (cfg_timezone->cfgStatus >= TAOS_CFG_CSTATUS_DEFAULT) {
+    return;
+  }
+
+  /*
+   * NOTE: do not remove it.
+   * Enforce set the correct daylight saving time(DST) flag according
+   * to current time
+   */
+  time_t    tx1 = time(NULL);
+  struct tm tm1;
+  localtime_r(&tx1, &tm1);
+
+  /* load time zone string from /etc/timezone */
+  FILE *f = fopen("/etc/timezone", "r");
+  char  buf[68] = {0};
+  if (f != NULL) {
+    int len = fread(buf, 64, 1, f);
+    if(len < 64 && ferror(f)) {
+      fclose(f);
+      uError("read /etc/timezone error, reason:%s", strerror(errno));
+      return;
+    }
+    
+    fclose(f);
+
+    buf[sizeof(buf) - 1] = 0;
+    char *lineEnd = strstr(buf, "\n");
+    if (lineEnd != NULL) {
+      *lineEnd = 0;
+    }
+
+    // for CentOS system, /etc/timezone does not exist. Ignore the TZ environment variables
+    if (strlen(buf) > 0) {
+      setenv("TZ", buf, 1);
+    }
+  }
+  // get and set default timezone
+  tzset();
+
+  /*
+   * get CURRENT time zone.
+   * system current time zone is affected by daylight saving time(DST)
+   *
+   * e.g., the local time zone of London in DST is GMT+01:00,
+   * otherwise is GMT+00:00
+   */
+  int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
+  tz += daylight;
+
+  /*
+   * format example:
+   *
+   * Asia/Shanghai   (CST, +0800)
+   * Europe/London   (BST, +0100)
+   */
+  snprintf(tsTimezone, TSDB_TIMEZONE_LEN, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+
+  // cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+  uInfo("timezone not configured, set to system default:%s", tsTimezone);
+}
+
+/*
+ * POSIX format locale string:
+ * (Language Strings)_(Country/Region Strings).(code_page)
+ *
+ * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
+ *
+ * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
+ *
+ * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
+ * for libiconv that is employed to convert string in this system. This program will automatically use
+ * UTF-8 instead as the charset.
+ *
+ * In case of windows client, the locale string is not valid POSIX format, user needs to set the
+ * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
+ * CP936, CP437 for English charset.
+ *
+ */
+static void taosGetSystemLocale() {  // get and set default locale
+  char  sep = '.';
+  char *locale = NULL;
+
+  SGlobalCfg *cfg_locale = taosGetConfigOption("locale");
+  if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    locale = setlocale(LC_CTYPE, "");
+    if (locale == NULL) {
+      uError("can't get locale from system, set it to en_US.UTF-8");
+      strcpy(tsLocale, "en_US.UTF-8");
+    } else {
+      tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
+      uError("locale not configured, set to system default:%s", tsLocale);
+    }
+  }
+
+  /* if user does not specify the charset, extract it from locale */
+  SGlobalCfg *cfg_charset = taosGetConfigOption("charset");
+  if (cfg_charset && cfg_charset->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    char *str = strrchr(tsLocale, sep);
+    if (str != NULL) {
+      str++;
+
+      char *revisedCharset = taosCharsetReplace(str);
+      tstrncpy(tsCharset, revisedCharset, TSDB_LOCALE_LEN);
+
+      free(revisedCharset);
+      uWarn("charset not configured, set to system default:%s", tsCharset);
+    } else {
+      strcpy(tsCharset, "UTF-8");
+      uWarn("can't get locale and charset from system, set it to UTF-8");
+    }
+  }
+}
+
+bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
+  static uint64_t lastSysUsed = 0;
+  static uint64_t lastSysTotal = 0;
+  static uint64_t lastProcTotal = 0;
+
+  SysCpuInfo  sysCpu;
+  ProcCpuInfo procCpu;
+  if (!taosGetSysCpuInfo(&sysCpu)) {
+    return false;
+  }
+  if (!taosGetProcCpuInfo(&procCpu)) {
+    return false;
+  }
+
+  uint64_t curSysUsed = sysCpu.user + sysCpu.nice + sysCpu.system;
+  uint64_t curSysTotal = curSysUsed + sysCpu.idle;
+  uint64_t curProcTotal = procCpu.utime + procCpu.stime + procCpu.cutime + procCpu.cstime;
+
+  if (lastSysUsed == 0 || lastSysTotal == 0 || lastProcTotal == 0) {
+    lastSysUsed = curSysUsed > 1 ? curSysUsed : 1;
+    lastSysTotal = curSysTotal > 1 ? curSysTotal : 1;
+    lastProcTotal = curProcTotal > 1 ? curProcTotal : 1;
+    return false;
+  }
+
+  if (curSysTotal == lastSysTotal) {
+    return false;
+  }
+
+  *sysCpuUsage = (float)((double)(curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100);
+  *procCpuUsage = (float)((double)(curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100);
+
+  lastSysUsed = curSysUsed;
+  lastSysTotal = curSysTotal;
+  lastProcTotal = curProcTotal;
+
+  return true;
+}
+
+bool taosGetDisk() {
+  struct statvfs info;
+  const double   unit = 1024 * 1024 * 1024;
+  
+  if (tscEmbedded) {
+    if (statvfs(tsDataDir, &info)) {
+      //tsTotalDataDirGB = 0;
+      //tsAvailDataDirGB = 0;
+      uError("failed to get disk size, dataDir:%s errno:%s", tsDataDir, strerror(errno));
+      return false;
+    } else {
+      tsTotalDataDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
+      tsAvailDataDirGB = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
+    }
+  }
+
+  if (statvfs(tsLogDir, &info)) {
+    //tsTotalLogDirGB = 0;
+    //tsAvailLogDirGB = 0;
+    uError("failed to get disk size, logDir:%s errno:%s", tsLogDir, strerror(errno));
+    return false;
+  } else {
+    tsTotalLogDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
+    tsAvailLogDirGB = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
+  }
+
+  if (statvfs("/tmp", &info)) {
+    //tsTotalTmpDirGB = 0;
+    //tsAvailTmpDirectorySpace = 0;
+    uError("failed to get disk size, tmpDir:/tmp errno:%s", strerror(errno));
+    return false;
+  } else {
+    tsTotalTmpDirGB = (float)((double)info.f_blocks * (double)info.f_frsize / unit);
+    tsAvailTmpDirectorySpace = (float)((double)info.f_bavail * (double)info.f_frsize / unit);
+  }
+
+  return true;
+}
+
+static bool taosGetCardInfo(int64_t *bytes) {
+  *bytes = 0;
+  FILE *fp = fopen(tsSysNetFile, "r");
+  if (fp == NULL) {
+    uError("open file:%s failed", tsSysNetFile);
+    return false;
+  }
+
+
+  size_t len = 2048;
+  char * line = calloc(1, len);
+
+  while (!feof(fp)) {
+    memset(line, 0, len);
+    
+    int64_t rbytes = 0;
+    int64_t rpackts = 0;
+    int64_t tbytes = 0;
+    int64_t tpackets = 0;
+    int64_t nouse1 = 0;
+    int64_t nouse2 = 0;
+    int64_t nouse3 = 0;
+    int64_t nouse4 = 0;
+    int64_t nouse5 = 0;
+    int64_t nouse6 = 0;
+    char    nouse0[200] = {0};
+
+    getline(&line, &len, fp);
+    line[len - 1] = 0;
+
+    if (strstr(line, "lo:") != NULL) {
+      continue;
+    }
+
+    sscanf(line,
+           "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64
+           " %" PRId64,
+           nouse0, &rbytes, &rpackts, &nouse1, &nouse2, &nouse3, &nouse4, &nouse5, &nouse6, &tbytes, &tpackets);
+    *bytes += (rbytes + tbytes);
+  }
+
+  taosTFree(line);
+  fclose(fp);
+
+  return true;
+}
+
+bool taosGetBandSpeed(float *bandSpeedKb) {
+  static int64_t lastBytes = 0;
+  static time_t  lastTime = 0;
+  int64_t        curBytes = 0;
+  time_t         curTime = time(NULL);
+
+  if (!taosGetCardInfo(&curBytes)) {
+    return false;
+  }
+
+  if (lastTime == 0 || lastBytes == 0) {
+    lastTime = curTime;
+    lastBytes = curBytes;
+    *bandSpeedKb = 0;
+    return true;
+  }
+
+  if (lastTime >= curTime || lastBytes > curBytes) {
+    lastTime = curTime;
+    lastBytes = curBytes;
+    *bandSpeedKb = 0;
+    return true;
+  }
+
+  double totalBytes = (double)(curBytes - lastBytes) / 1024 * 8;  // Kb
+  *bandSpeedKb = (float)(totalBytes / (double)(curTime - lastTime));
+
+  // uInfo("bandwidth lastBytes:%ld, lastTime:%ld, curBytes:%ld, curTime:%ld,
+  // speed:%f", lastBytes, lastTime, curBytes, curTime, *bandSpeed);
+
+  lastTime = curTime;
+  lastBytes = curBytes;
+
+  return true;
+}
+
+static bool taosReadProcIO(int64_t *readbyte, int64_t *writebyte) {
+  FILE *fp = fopen(tsProcIOFile, "r");
+  if (fp == NULL) {
+    uError("open file:%s failed", tsProcIOFile);
+    return false;
+  }
+
+  size_t len;
+  char * line = NULL;
+  char   tmp[10];
+  int    readIndex = 0;
+
+  while (!feof(fp)) {
+    taosTFree(line);
+    len = 0;
+    getline(&line, &len, fp);
+    if (line == NULL) {
+      break;
+    }
+    if (strstr(line, "rchar:") != NULL) {
+      sscanf(line, "%s %" PRId64, tmp, readbyte);
+      readIndex++;
+    } else if (strstr(line, "wchar:") != NULL) {
+      sscanf(line, "%s %" PRId64, tmp, writebyte);
+      readIndex++;
+    } else {
+    }
+
+    if (readIndex >= 2) break;
+  }
+
+  taosTFree(line);
+  fclose(fp);
+
+  if (readIndex < 2) {
+    uError("read file:%s failed", tsProcIOFile);
+    return false;
+  }
+
+  return true;
+}
+
+bool taosGetProcIO(float *readKB, float *writeKB) {
+  static int64_t lastReadbyte = -1;
+  static int64_t lastWritebyte = -1;
+
+  int64_t curReadbyte  = 0;
+  int64_t curWritebyte = 0;
+
+  if (!taosReadProcIO(&curReadbyte, &curWritebyte)) {
+    return false;
+  }
+
+  if (lastReadbyte == -1 || lastWritebyte == -1) {
+    lastReadbyte = curReadbyte;
+    lastWritebyte = curWritebyte;
+    return false;
+  }
+
+  *readKB = (float)((double)(curReadbyte - lastReadbyte) / 1024);
+  *writeKB = (float)((double)(curWritebyte - lastWritebyte) / 1024);
+  if (*readKB < 0) *readKB = 0;
+  if (*writeKB < 0) *writeKB = 0;
+
+  lastReadbyte = curReadbyte;
+  lastWritebyte = curWritebyte;
+
+  return true;
+}
+
+void taosGetSystemInfo() {
+  tsNumOfCores = (int32_t)sysconf(_SC_NPROCESSORS_ONLN);
+  tsPageSize = sysconf(_SC_PAGESIZE);
+  tsOpenMax = sysconf(_SC_OPEN_MAX);
+  tsStreamMax = sysconf(_SC_STREAM_MAX);
+
+  tsProcId = (pid_t)syscall(SYS_gettid);
+  tsPageSizeKB = (float)(sysconf(_SC_PAGESIZE)) / 1024;
+  tsTotalMemoryMB = (int32_t)((float)sysconf(_SC_PHYS_PAGES) * tsPageSizeKB / 1024);
+
+  snprintf(tsProcMemFile, 25, "/proc/%d/status", tsProcId);
+  snprintf(tsProcCpuFile, 25, "/proc/%d/stat", tsProcId);
+  snprintf(tsProcIOFile, 25, "/proc/%d/io", tsProcId);
+
+  float tmp1, tmp2;
+  taosGetSysMemory(&tmp1);
+  taosGetProcMemory(&tmp2);
+  taosGetDisk();
+  taosGetBandSpeed(&tmp1);
+  taosGetCpuUsage(&tmp1, &tmp2);
+  taosGetProcIO(&tmp1, &tmp2);
+
+  taosGetSystemTimezone();
+  taosGetSystemLocale();
+}
+
+void taosPrintOsInfo() {
+  uInfo(" os pageSize:            %" PRId64 "(KB)", tsPageSize);
+  uInfo(" os openMax:             %" PRId64, tsOpenMax);
+  uInfo(" os streamMax:           %" PRId64, tsStreamMax);
+  uInfo(" os numOfCores:          %d", tsNumOfCores);
+  uInfo(" os totalDisk:           %f(GB)", tsTotalDataDirGB);
+  uInfo(" os totalMemory:         %d(MB)", tsTotalMemoryMB);
+
+  struct utsname buf;
+  if (uname(&buf)) {
+    uInfo(" can't fetch os info");
+    return;
+  }
+  uInfo(" os sysname:             %s", buf.sysname);
+  uInfo(" os nodename:            %s", buf.nodename);
+  uInfo(" os release:             %s", buf.release);
+  uInfo(" os version:             %s", buf.version);
+  uInfo(" os machine:             %s", buf.machine);
+  uInfo("==================================");
+}
+
+void taosKillSystem() {
+  // SIGINT
+  uInfo("taosd will shut down soon");
+  kill(tsProcId, 2);
+}
+
+int taosSystem(const char *cmd) {
+  FILE *fp;
+  int   res;
+  char  buf[1024];
+  if (cmd == NULL) {
+    uError("taosSystem cmd is NULL!");
+    return -1;
+  }
+
+  if ((fp = popen(cmd, "r")) == NULL) {
+    uError("popen cmd:%s error: %s", cmd, strerror(errno));
+    return -1;
+  } else {
+    while (fgets(buf, sizeof(buf), fp)) {
+      uDebug("popen result:%s", buf);
+    }
+
+    if ((res = pclose(fp)) == -1) {
+      uError("close popen file pointer fp error!");
+    } else {
+      uDebug("popen res is :%d", res);
+    }
+
+    return res;
+  }
+}
+
+int _sysctl(struct __sysctl_args *args );
+void taosSetCoreDump() {
+  if (0 == tsEnableCoreFile) {
+    return;
+  }
+  
+  // 1. set ulimit -c unlimited
+  struct rlimit rlim;
+  struct rlimit rlim_new;
+  if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
+    #ifndef _ALPINE
+    uInfo("the old unlimited para: rlim_cur=%" PRIu64 ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max);
+    #else
+    uInfo("the old unlimited para: rlim_cur=%llu, rlim_max=%llu", rlim.rlim_cur, rlim.rlim_max);
+    #endif
+    rlim_new.rlim_cur = RLIM_INFINITY;
+    rlim_new.rlim_max = RLIM_INFINITY;
+    if (setrlimit(RLIMIT_CORE, &rlim_new) != 0) {
+      uInfo("set unlimited fail, error: %s", strerror(errno));
+      rlim_new.rlim_cur = rlim.rlim_max;
+      rlim_new.rlim_max = rlim.rlim_max;
+      (void)setrlimit(RLIMIT_CORE, &rlim_new);
+    }
+  }
+
+  if (getrlimit(RLIMIT_CORE, &rlim) == 0) {
+    #ifndef _ALPINE
+    uInfo("the new unlimited para: rlim_cur=%" PRIu64 ", rlim_max=%" PRIu64, rlim.rlim_cur, rlim.rlim_max);
+    #else
+    uInfo("the new unlimited para: rlim_cur=%llu, rlim_max=%llu", rlim.rlim_cur, rlim.rlim_max);
+    #endif
+  }
+
+#ifndef _TD_ARM_
+  // 2. set the path for saving core file
+  struct __sysctl_args args;
+  int     old_usespid = 0;
+  size_t  old_len     = 0;
+  int     new_usespid = 1;
+  size_t  new_len     = sizeof(new_usespid);
+  
+  int name[] = {CTL_KERN, KERN_CORE_USES_PID};
+  
+  memset(&args, 0, sizeof(struct __sysctl_args));
+  args.name    = name;
+  args.nlen    = sizeof(name)/sizeof(name[0]);
+  args.oldval  = &old_usespid;
+  args.oldlenp = &old_len;
+  args.newval  = &new_usespid;
+  args.newlen  = new_len;
+  
+  old_len = sizeof(old_usespid);
+  
+  if (syscall(SYS__sysctl, &args) == -1) {
+      uInfo("_sysctl(kern_core_uses_pid) set fail: %s", strerror(errno));
+  }
+  
+  uInfo("The old core_uses_pid[%" PRIu64 "]: %d", old_len, old_usespid);
+
+
+  old_usespid = 0;
+  old_len     = 0;
+  memset(&args, 0, sizeof(struct __sysctl_args));
+  args.name    = name;
+  args.nlen    = sizeof(name)/sizeof(name[0]);
+  args.oldval  = &old_usespid;
+  args.oldlenp = &old_len;
+  
+  old_len = sizeof(old_usespid);
+  
+  if (syscall(SYS__sysctl, &args) == -1) {
+      uInfo("_sysctl(kern_core_uses_pid) get fail: %s", strerror(errno));
+  }
+  
+  uInfo("The new core_uses_pid[%" PRIu64 "]: %d", old_len, old_usespid);
+#endif
+
+}
+
+bool taosGetSystemUid(char *uid) {
+  int fd;
+  int len = 0;
+
+  fd = open("/proc/sys/kernel/random/uuid", 0);
+  if (fd < 0) {
+    return false;
+  } else {
+    len = read(fd, uid, TSDB_CLUSTER_ID_LEN);
+    close(fd);
+  }
+
+  if (len >= 36) {
+    uid[36] = 0;
+    return true;
+  }
+  return false;
+}
+
+#endif
diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd4dc24554b26d0b4aae2cf8e82c02ee3fbba4b9
--- /dev/null
+++ b/src/os/src/detail/osTime.c
@@ -0,0 +1,562 @@
+/*
+ * 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/>.
+ */
+
+#define _BSD_SOURCE
+#define _XOPEN_SOURCE
+#define _DEFAULT_SOURCE
+
+#include "os.h"
+#include "taosdef.h"
+#include "tutil.h"
+
+/*
+ * mktime64 - Converts date to seconds.
+ * Converts Gregorian date to seconds since 1970-01-01 00:00:00.
+ * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
+ * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
+ *
+ * [For the Julian calendar (which was used in Russia before 1917,
+ * Britain & colonies before 1752, anywhere else before 1582,
+ * and is still in use by some communities) leave out the
+ * -year/100+year/400 terms, and add 10.]
+ *
+ * This algorithm was first published by Gauss (I think).
+ *
+ * A leap second can be indicated by calling this function with sec as
+ * 60 (allowable under ISO 8601).  The leap second is treated the same
+ * as the following second since they don't exist in UNIX time.
+ *
+ * An encoding of midnight at the end of the day as 24:00:00 - ie. midnight
+ * tomorrow - (allowable under ISO 8601) is supported.
+ */
+int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
+		const unsigned int day, const unsigned int hour,
+		const unsigned int min, const unsigned int sec)
+{
+  unsigned int mon = mon0, year = year0;
+
+  /* 1..12 -> 11,12,1..10 */
+  if (0 >= (int) (mon -= 2)) {
+    mon += 12;	/* Puts Feb last since it has leap day */
+    year -= 1;
+  }
+
+  //int64_t res = (((((int64_t) (year/4 - year/100 + year/400 + 367*mon/12 + day) +
+  //               year*365 - 719499)*24 + hour)*60 + min)*60 + sec);
+  int64_t res;
+  res  = 367*((int64_t)mon)/12;
+  res += year/4 - year/100 + year/400 + day + ((int64_t)year)*365 - 719499;
+  res  = res*24;
+  res  = ((res + hour) * 60 + min) * 60 + sec;
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+  int64_t timezone = _timezone;
+#endif
+#endif
+
+  return (res + timezone);
+}
+
+// ==== mktime() kernel code =================//
+static int64_t m_deltaUtc = 0;
+void deltaToUtcInitOnce() {  
+  struct tm tm = {0};
+  
+  (void)strptime("1970-01-01 00:00:00", (const char *)("%Y-%m-%d %H:%M:%S"), &tm);
+  m_deltaUtc = (int64_t)mktime(&tm);
+  //printf("====delta:%lld\n\n", seconds);	
+  return;
+}
+
+static int64_t parseFraction(char* str, char** end, int32_t timePrec);
+static int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec);
+static int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec);
+static int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec);
+
+static int32_t (*parseLocaltimeFp[]) (char* timestr, int64_t* time, int32_t timePrec) = {
+  parseLocaltime,
+  parseLocaltimeWithDst
+}; 
+
+int32_t taosGetTimestampSec() { return (int32_t)time(NULL); }
+
+int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec, int8_t daylight) {
+  /* parse datatime string in with tz */
+  if (strnchr(timestr, 'T', len, false) != NULL) {
+    return parseTimeWithTz(timestr, time, timePrec);
+  } else {
+    return (*parseLocaltimeFp[daylight])(timestr, time, timePrec);
+  }
+}
+
+char* forwardToTimeStringEnd(char* str) {
+  int32_t i = 0;
+  int32_t numOfSep = 0;
+
+  while (str[i] != 0 && numOfSep < 2) {
+    if (str[i++] == ':') {
+      numOfSep++;
+    }
+  }
+
+  while (str[i] >= '0' && str[i] <= '9') {
+    i++;
+  }
+
+  return &str[i];
+}
+
+int64_t parseFraction(char* str, char** end, int32_t timePrec) {
+  int32_t i = 0;
+  int64_t fraction = 0;
+
+  const int32_t MILLI_SEC_FRACTION_LEN = 3;
+  const int32_t MICRO_SEC_FRACTION_LEN = 6;
+
+  int32_t factor[6] = {1, 10, 100, 1000, 10000, 100000};
+  int32_t times = 1;
+
+  while (str[i] >= '0' && str[i] <= '9') {
+    i++;
+  }
+
+  int32_t totalLen = i;
+  if (totalLen <= 0) {
+    return -1;
+  }
+
+  /* parse the fraction */
+  if (timePrec == TSDB_TIME_PRECISION_MILLI) {
+    /* only use the initial 3 bits */
+    if (i >= MILLI_SEC_FRACTION_LEN) {
+      i = MILLI_SEC_FRACTION_LEN;
+    }
+
+    times = MILLI_SEC_FRACTION_LEN - i;
+  } else {
+    assert(timePrec == TSDB_TIME_PRECISION_MICRO);
+    if (i >= MICRO_SEC_FRACTION_LEN) {
+      i = MICRO_SEC_FRACTION_LEN;
+    }
+    times = MICRO_SEC_FRACTION_LEN - i;
+  }
+
+  fraction = strnatoi(str, i) * factor[times];
+  *end = str + totalLen;
+
+  return fraction;
+}
+
+int32_t parseTimezone(char* str, int64_t* tzOffset) {
+  int64_t hour = 0;
+
+  int32_t i = 0;
+  if (str[i] != '+' && str[i] != '-') {
+    return -1;
+  }
+
+  i++;
+
+  char* sep = strchr(&str[i], ':');
+  if (sep != NULL) {
+    int32_t len = (int32_t)(sep - &str[i]);
+
+    hour = strnatoi(&str[i], len);
+    i += len + 1;
+  } else {
+    hour = strnatoi(&str[i], 2);
+    i += 2;
+  }
+
+  int64_t minute = strnatoi(&str[i], 2);
+  if (minute > 59) {
+    return -1;
+  }
+
+  if (str[0] == '+') {
+    *tzOffset = -(hour * 3600 + minute * 60);
+  } else {
+    *tzOffset = hour * 3600 + minute * 60;
+  }
+
+  return 0;
+}
+
+/*
+ * rfc3339 format:
+ * 2013-04-12T15:52:01+08:00
+ * 2013-04-12T15:52:01.123+08:00
+ *
+ * 2013-04-12T15:52:01Z
+ * 2013-04-12T15:52:01.123Z
+ *
+ * iso-8601 format:
+ * 2013-04-12T15:52:01+0800
+ * 2013-04-12T15:52:01.123+0800
+ */
+int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec) {
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+  int64_t tzOffset = 0;
+
+  struct tm tm = {0};
+  char*     str = strptime(timestr, "%Y-%m-%dT%H:%M:%S", &tm);
+  if (str == NULL) {
+    return -1;
+  }
+
+/* mktime will be affected by TZ, set by using taos_options */
+#ifdef WINDOWS
+  int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+  //int64_t seconds = gmtime(&tm); 
+#else
+  int64_t seconds = timegm(&tm);
+#endif
+
+  int64_t fraction = 0;
+  str = forwardToTimeStringEnd(timestr);
+
+  if (str[0] == 'Z' || str[0] == 'z') {
+    /* utc time, no millisecond, return directly*/
+    *time = seconds * factor;
+  } else if (str[0] == '.') {
+    str += 1;
+    if ((fraction = parseFraction(str, &str, timePrec)) < 0) {
+      return -1;
+    }
+
+    *time = seconds * factor + fraction;
+
+    char seg = str[0];
+    if (seg != 'Z' && seg != 'z' && seg != '+' && seg != '-') {
+      return -1;
+    } else if (seg == '+' || seg == '-') {
+      // parse the timezone
+      if (parseTimezone(str, &tzOffset) == -1) {
+        return -1;
+      }
+
+      *time += tzOffset * factor;
+    }
+
+  } else if (str[0] == '+' || str[0] == '-') {
+    *time = seconds * factor + fraction;
+
+    // parse the timezone
+    if (parseTimezone(str, &tzOffset) == -1) {
+      return -1;
+    }
+
+    *time += tzOffset * factor;
+  } else {
+    return -1;
+  }
+
+  return 0;
+}
+
+int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
+  *time = 0;
+  struct tm tm = {0};
+
+  char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
+  if (str == NULL) {
+    return -1;
+  }
+
+  int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+  
+  int64_t fraction = 0;
+
+  if (*str == '.') {
+    /* parse the second fraction part */
+    if ((fraction = parseFraction(str + 1, &str, timePrec)) < 0) {
+      return -1;
+    }
+  }
+
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+  *time = factor * seconds + fraction;
+
+  return 0;
+}
+
+int32_t parseLocaltimeWithDst(char* timestr, int64_t* time, int32_t timePrec) {
+  *time = 0;
+  struct tm tm = {0};
+  tm.tm_isdst = -1;
+
+  char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
+  if (str == NULL) {
+    return -1;
+  }
+
+  /* mktime will be affected by TZ, set by using taos_options */
+  int64_t seconds = mktime(&tm);
+  
+  int64_t fraction = 0;
+
+  if (*str == '.') {
+    /* parse the second fraction part */
+    if ((fraction = parseFraction(str + 1, &str, timePrec)) < 0) {
+      return -1;
+    }
+  }
+
+  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
+  *time = factor * seconds + fraction;
+  return 0;
+}
+
+
+static int32_t getDurationInUs(int64_t val, char unit, int64_t* result) {
+  *result = val;
+
+  int64_t factor = 1000L;
+
+  switch (unit) {
+    case 's':
+      (*result) *= MILLISECOND_PER_SECOND*factor;
+      break;
+    case 'm':
+      (*result) *= MILLISECOND_PER_MINUTE*factor;
+      break;
+    case 'h':
+      (*result) *= MILLISECOND_PER_HOUR*factor;
+      break;
+    case 'd':
+      (*result) *= MILLISECOND_PER_DAY*factor;
+      break;
+    case 'w':
+      (*result) *= MILLISECOND_PER_WEEK*factor;
+      break;
+    case 'a':
+      (*result) *= factor;
+      break;
+    case 'u':
+      break;
+    default: {
+      return -1;
+    }
+  }
+
+  /* get the value in microsecond */
+  return 0;
+}
+
+/*
+ * a - Millionseconds
+ * s - Seconds
+ * m - Minutes
+ * h - Hours
+ * d - Days (24 hours)
+ * w - Weeks (7 days)
+ * n - Months (30 days)
+ * y - Years (365 days)
+ */
+int32_t parseAbsoluteDuration(char* token, int32_t tokenlen, int64_t* duration) {
+  errno = 0;
+  char* endPtr = NULL;
+
+  /* get the basic numeric value */
+  int64_t timestamp = strtoll(token, &endPtr, 10);
+  if (errno != 0) {
+    return -1;
+  }
+
+  /* natual month/year are not allowed in absolute duration */
+  char unit = token[tokenlen - 1];
+  if (unit == 'n' || unit == 'y') {
+    return -1;
+  }
+
+  return getDurationInUs(timestamp, unit, duration);
+}
+
+int32_t parseNatualDuration(const char* token, int32_t tokenLen, int64_t* duration, char* unit) {
+  errno = 0;
+
+  /* get the basic numeric value */
+  *duration = strtoll(token, NULL, 10);
+  if (errno != 0) {
+    return -1;
+  }
+
+  *unit = token[tokenLen - 1];
+  if (*unit == 'n' || *unit == 'y') {
+    return 0;
+  }
+
+  return getDurationInUs(*duration, *unit, duration);
+}
+
+int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
+  if (duration == 0) {
+    return t;
+  }
+  if (unit == 'y') {
+    duration *= 12;
+  } else if (unit != 'n') {
+    return t + duration;
+  }
+
+  struct tm tm;
+  time_t tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision));
+  localtime_r(&tt, &tm);
+  int mon = tm.tm_year * 12 + tm.tm_mon + (int)duration;
+  tm.tm_year = mon / 12;
+  tm.tm_mon = mon % 12;
+
+  return (int64_t)(mktime(&tm) * TSDB_TICK_PER_SECOND(precision));
+}
+
+int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision) {
+  if (ekey < skey) {
+    int64_t tmp = ekey;
+    ekey = skey;
+    skey = tmp;
+  }
+  if (unit != 'n' && unit != 'y') {
+    return (int32_t)((ekey - skey) / interval);
+  }
+
+  skey /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
+  ekey /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
+
+  struct tm tm;
+  time_t t = (time_t)skey;
+  localtime_r(&t, &tm);
+  int smon = tm.tm_year * 12 + tm.tm_mon;
+
+  t = (time_t)ekey;
+  localtime_r(&t, &tm);
+  int emon = tm.tm_year * 12 + tm.tm_mon;
+
+  if (unit == 'y') {
+    interval *= 12;
+  }
+
+  return (emon - smon) / (int32_t)interval;
+}
+
+int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision) {
+  if (pInterval->sliding == 0) {
+    assert(pInterval->interval == 0);
+    return t;
+  }
+
+  int64_t start = t;
+  if (pInterval->slidingUnit == 'n' || pInterval->slidingUnit == 'y') {
+    start /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
+    struct tm tm;
+    time_t tt = (time_t)start;
+    localtime_r(&tt, &tm);
+    tm.tm_sec = 0;
+    tm.tm_min = 0;
+    tm.tm_hour = 0;
+    tm.tm_mday = 1;
+
+    if (pInterval->slidingUnit == 'y') {
+      tm.tm_mon = 0;
+      tm.tm_year = (int)(tm.tm_year / pInterval->sliding * pInterval->sliding);
+    } else {
+      int mon = tm.tm_year * 12 + tm.tm_mon;
+      mon = (int)(mon / pInterval->sliding * pInterval->sliding);
+      tm.tm_year = mon / 12;
+      tm.tm_mon = mon % 12;
+    }
+
+    start = (int64_t)(mktime(&tm) * TSDB_TICK_PER_SECOND(precision));
+  } else {
+    int64_t delta = t - pInterval->interval;
+    int32_t factor = delta > 0 ? 1 : -1;
+
+    start = (delta / pInterval->sliding + factor) * pInterval->sliding;
+
+    if (pInterval->intervalUnit == 'd' || pInterval->intervalUnit == 'w') {
+      /*
+      * here we revised the start time of day according to the local time zone,
+      * but in case of DST, the start time of one day need to be dynamically decided.
+      */
+      // todo refactor to extract function that is available for Linux/Windows/Mac platform
+  #if defined(WINDOWS) && _MSC_VER >= 1900
+      // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
+      int64_t timezone = _timezone;
+      int32_t daylight = _daylight;
+      char**  tzname = _tzname;
+  #endif
+
+      start += (int64_t)(timezone * TSDB_TICK_PER_SECOND(precision));
+    }
+
+    int64_t end = start + pInterval->interval - 1;
+    if (end < t) {
+      start += pInterval->sliding;
+    }
+  }
+
+  if (pInterval->offset > 0) {
+    start = taosTimeAdd(start, pInterval->offset, pInterval->offsetUnit, precision);
+    if (start > t) {
+      start = taosTimeAdd(start, -pInterval->interval, pInterval->intervalUnit, precision);
+    }
+  }
+  return start;
+}
+
+// internal function, when program is paused in debugger,
+// one can call this function from debugger to print a
+// timestamp as human readable string, for example (gdb):
+//     p fmtts(1593769722)
+// outputs:
+//     2020-07-03 17:48:42
+// and the parameter can also be a variable.
+const char* fmtts(int64_t ts) {
+  static char buf[96];
+  size_t pos = 0;
+  struct tm tm;
+
+  if (ts > -62135625943 && ts < 32503651200) {
+    time_t t = (time_t)ts;
+    localtime_r(&t, &tm);
+    pos += strftime(buf + pos, sizeof(buf), "s=%Y-%m-%d %H:%M:%S", &tm);
+  }
+
+  if (ts > -62135625943000 && ts < 32503651200000) {
+    time_t t = (time_t)(ts / 1000);
+    localtime_r(&t, &tm);
+    if (pos > 0) {
+      buf[pos++] = ' ';
+      buf[pos++] = '|';
+      buf[pos++] = ' ';
+    }
+    pos += strftime(buf + pos, sizeof(buf), "ms=%Y-%m-%d %H:%M:%S", &tm);
+    pos += sprintf(buf + pos, ".%03d", (int)(ts % 1000));
+  }
+
+  {
+    time_t t = (time_t)(ts / 1000000);
+    localtime_r(&t, &tm);
+    if (pos > 0) {
+      buf[pos++] = ' ';
+      buf[pos++] = '|';
+      buf[pos++] = ' ';
+    }
+    pos += strftime(buf + pos, sizeof(buf), "us=%Y-%m-%d %H:%M:%S", &tm);
+    pos += sprintf(buf + pos, ".%06d", (int)(ts % 1000000));
+  }
+
+  return buf;
+}
\ No newline at end of file
diff --git a/src/os/src/detail/osTimer.c b/src/os/src/detail/osTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..22f7b94c3aea55432b3e59c4ad8664cb3ef6020e
--- /dev/null
+++ b/src/os/src/detail/osTimer.c
@@ -0,0 +1,132 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "ttimer.h"
+#include "tulog.h"
+
+#ifndef TAOS_OS_FUNC_TIMER
+
+static void taosDeleteTimer(void *tharg) {
+  timer_t *pTimer = tharg;
+  timer_delete(*pTimer);
+}
+
+static pthread_t timerThread;
+static timer_t         timerId;
+static volatile bool stopTimer = false;
+static void *taosProcessAlarmSignal(void *tharg) {
+  // Block the signal
+  sigset_t sigset;
+  sigemptyset(&sigset);
+  sigaddset(&sigset, SIGALRM);
+  sigprocmask(SIG_BLOCK, &sigset, NULL);
+  void (*callback)(int) = tharg;
+
+  struct sigevent sevent = {{0}};
+
+  #ifdef _ALPINE
+    sevent.sigev_notify = SIGEV_THREAD;
+    sevent.sigev_value.sival_int = syscall(__NR_gettid);
+  #else
+    sevent.sigev_notify = SIGEV_THREAD_ID;
+    sevent._sigev_un._tid = syscall(__NR_gettid);
+  #endif
+  
+  sevent.sigev_signo = SIGALRM;
+
+  if (timer_create(CLOCK_REALTIME, &sevent, &timerId) == -1) {
+    uError("Failed to create timer");
+  }
+
+  pthread_cleanup_push(taosDeleteTimer, &timerId);
+
+  struct itimerspec ts;
+  ts.it_value.tv_sec = 0;
+  ts.it_value.tv_nsec = 1000000 * MSECONDS_PER_TICK;
+  ts.it_interval.tv_sec = 0;
+  ts.it_interval.tv_nsec = 1000000 * MSECONDS_PER_TICK;
+
+  if (timer_settime(timerId, 0, &ts, NULL)) {
+    uError("Failed to init timer");
+    return NULL;
+  }
+
+  int signo;
+  while (!stopTimer) {
+    if (sigwait(&sigset, &signo)) {
+      uError("Failed to wait signal: number %d", signo);
+      continue;
+    }
+    /* printf("Signal handling: number %d ......\n", signo); */
+
+    callback(0);
+  }
+  
+  pthread_cleanup_pop(1);
+
+  return NULL;
+}
+
+int taosInitTimer(void (*callback)(int), int ms) {
+  pthread_attr_t tattr;
+  pthread_attr_init(&tattr);
+  int code = pthread_create(&timerThread, &tattr, taosProcessAlarmSignal, callback);
+  pthread_attr_destroy(&tattr);
+  if (code != 0) {
+    uError("failed to create timer thread");
+    return -1;
+  }
+  return 0;
+}
+
+void taosUninitTimer() {
+  stopTimer = true;
+  pthread_join(timerThread, NULL);
+}
+
+#endif
+
+#ifndef TAOS_OS_FUNC_TIMER_SLEEP
+/*
+  to make taosMsleep work,
+   signal SIGALRM shall be blocked in the calling thread,
+
+  sigset_t set;
+  sigemptyset(&set);
+  sigaddset(&set, SIGALRM);
+  pthread_sigmask(SIG_BLOCK, &set, NULL);
+*/
+void taosMsleep(int mseconds) {
+  struct timeval timeout;
+  int            seconds, useconds;
+
+  seconds = mseconds / 1000;
+  useconds = (mseconds % 1000) * 1000;
+  timeout.tv_sec = seconds;
+  timeout.tv_usec = useconds;
+
+  /* sigset_t set; */
+  /* sigemptyset(&set); */
+  /* sigaddset(&set, SIGALRM); */
+  /* pthread_sigmask(SIG_BLOCK, &set, NULL); */
+
+  select(0, NULL, NULL, NULL, &timeout);
+
+  /* pthread_sigmask(SIG_UNBLOCK, &set, NULL); */
+}
+
+#endif
\ No newline at end of file
diff --git a/src/os/src/linux/CMakeLists.txt b/src/os/src/linux/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..752326cc1de74550afac386ad5ac84f6d2f48990
--- /dev/null
+++ b/src/os/src/linux/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+AUX_SOURCE_DIRECTORY(. SRC)
+
+ADD_LIBRARY(os ${SRC})
+TARGET_LINK_LIBRARIES(os m rt)
diff --git a/src/os/src/linux/linuxEnv.c b/src/os/src/linux/linuxEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..14b40a1f1857ca7789829cb64f596ff349b7c997
--- /dev/null
+++ b/src/os/src/linux/linuxEnv.c
@@ -0,0 +1,42 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+
+void osInit() {
+
+#ifdef _TD_POWER_
+  if (configDir[0] == 0) {
+    strcpy(configDir, "/etc/power");
+  }
+  strcpy(tsDataDir, "/var/lib/power");
+  strcpy(tsLogDir, "/var/log/power");
+  strcpy(tsScriptDir, "/etc/power");
+#else
+  if (configDir[0] == 0) {
+    strcpy(configDir, "/etc/taos");
+  }
+  strcpy(tsDataDir, "/var/lib/taos");
+  strcpy(tsLogDir, "/var/log/taos");
+  strcpy(tsScriptDir, "/etc/taos");
+#endif
+
+  strcpy(tsVnodeDir, "");
+  strcpy(tsDnodeDir, "");
+  strcpy(tsMnodeDir, "");
+  strcpy(tsOsName, "Linux");
+}
\ No newline at end of file
diff --git a/src/os/src/linux/ningsi.c b/src/os/src/linux/ningsi.c
new file mode 100644
index 0000000000000000000000000000000000000000..793ccac84adc05988c9fbb0b6b1d13170752c76a
--- /dev/null
+++ b/src/os/src/linux/ningsi.c
@@ -0,0 +1,56 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#ifdef _TD_NINGSI_60_
+void* atomic_exchange_ptr_impl(void** ptr, void* val ) {
+  void *old;
+  do {
+    old = *ptr;
+  } while( !__sync_bool_compare_and_swap(ptr, old, val) );
+  return old;
+}
+int8_t atomic_exchange_8_impl(int8_t* ptr, int8_t val ) {
+  int8_t old;
+  do {
+    old = *ptr;
+  } while( !__sync_bool_compare_and_swap(ptr, old, val) );
+  return old;
+}
+int16_t atomic_exchange_16_impl(int16_t* ptr, int16_t val ) {
+  int16_t old;
+  do {
+    old = *ptr;
+  } while( !__sync_bool_compare_and_swap(ptr, old, val) );
+  return old;
+}
+int32_t atomic_exchange_32_impl(int32_t* ptr, int32_t val ) {
+  int32_t old;
+  do {
+    old = *ptr;
+  } while( !__sync_bool_compare_and_swap(ptr, old, val) );
+  return old;
+}
+int64_t atomic_exchange_64_impl(int64_t* ptr, int64_t val ) {
+  int64_t old;
+  do {
+    old = *ptr;
+  } while( !__sync_bool_compare_and_swap(ptr, old, val) );
+  return old;
+}
+#endif
+
diff --git a/src/os/src/windows/CMakeLists.txt b/src/os/src/windows/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9dcc9e7e6d93ff200b7571d98724f898712658eb
--- /dev/null
+++ b/src/os/src/windows/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+AUX_SOURCE_DIRECTORY(. SRC)
+ADD_LIBRARY(os ${SRC})
+
+TARGET_LINK_LIBRARIES(os winmm IPHLPAPI ws2_32 MsvcLibXw)
diff --git a/src/os/src/windows/wAtomic.c b/src/os/src/windows/wAtomic.c
new file mode 100644
index 0000000000000000000000000000000000000000..a025cb8f0e67ff65ceb0cfadd420fd10cb99891b
--- /dev/null
+++ b/src/os/src/windows/wAtomic.c
@@ -0,0 +1,164 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+// add
+char interlocked_add_fetch_8(char volatile* ptr, char val) {
+#ifdef _TD_GO_DLL_
+  return __sync_fetch_and_add(ptr, val) + val;
+#else
+  return _InterlockedExchangeAdd8(ptr, val) + val;
+#endif
+}
+
+short interlocked_add_fetch_16(short volatile* ptr, short val) {
+#ifdef _TD_GO_DLL_
+  return __sync_fetch_and_add(ptr, val) + val;
+#else
+  return _InterlockedExchangeAdd16(ptr, val) + val;
+#endif
+}
+
+long interlocked_add_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedExchangeAdd(ptr, val) + val;
+}
+
+__int64 interlocked_add_fetch_64(__int64 volatile* ptr, __int64 val) {
+//#ifdef _WIN64
+  return _InterlockedExchangeAdd64(ptr, val) + val;
+//#else
+//  return _InterlockedExchangeAdd(ptr, val) + val;
+//#endif
+}
+
+char interlocked_and_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedAnd8(ptr, val) & val;
+}
+
+short interlocked_and_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedAnd16(ptr, val) & val;
+}
+
+long interlocked_and_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedAnd(ptr, val) & val;
+}
+
+
+__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val) {
+#ifndef _M_IX86
+  return _InterlockedAnd64(ptr, val) & val;
+#else
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old & val;
+  } while (_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+#endif
+}
+
+__int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _M_IX86
+  __int64 old;
+  do {
+    old = *ptr;
+  } while (_InterlockedCompareExchange64(ptr, old & val, old) != old);
+  return old;
+#else
+  return _InterlockedAnd64((__int64 volatile*)(ptr), (__int64)(val));
+#endif
+}
+
+char interlocked_or_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedOr8(ptr, val) | val;
+}
+
+short interlocked_or_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedOr16(ptr, val) | val;
+}
+
+long interlocked_or_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedOr(ptr, val) | val;
+}
+
+__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _M_IX86
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old | val;
+  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+#else
+  return _InterlockedOr64(ptr, val) & val;
+#endif
+}
+
+__int64 interlocked_fetch_or_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _M_IX86
+  __int64 old;
+  do {
+    old = *ptr;
+  } while(_InterlockedCompareExchange64(ptr, old | val, old) != old);
+  return old;
+#else
+  return _InterlockedOr64((__int64 volatile*)(ptr), (__int64)(val));
+#endif
+}
+
+char interlocked_xor_fetch_8(char volatile* ptr, char val) {
+  return _InterlockedXor8(ptr, val) ^ val;
+}
+
+short interlocked_xor_fetch_16(short volatile* ptr, short val) {
+  return _InterlockedXor16(ptr, val) ^ val;
+}
+
+long interlocked_xor_fetch_32(long volatile* ptr, long val) {
+  return _InterlockedXor(ptr, val) ^ val;
+}
+
+__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _M_IX86
+  __int64 old, res;
+  do {
+    old = *ptr;
+    res = old ^ val;
+  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
+  return res;
+#else
+  return _InterlockedXor64(ptr, val) ^ val;
+#endif
+}
+
+__int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _M_IX86
+  __int64 old;
+  do {
+    old = *ptr;
+  } while (_InterlockedCompareExchange64(ptr, old ^ val, old) != old);
+  return old;
+#else
+  return _InterlockedXor64((__int64 volatile*)(ptr), (__int64)(val));
+#endif
+}
+
diff --git a/src/os/src/windows/wEnv.c b/src/os/src/windows/wEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..8110a194904bbbc1166ac57de187de284db34a6b
--- /dev/null
+++ b/src/os/src/windows/wEnv.c
@@ -0,0 +1,50 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "tulog.h"
+
+extern void taosWinSocketInit();
+
+void osInit() {
+  taosSetCoreDump();
+#ifdef _TD_POWER_
+  if (configDir[0] == 0) {
+    strcpy(configDir, "C:/PowerDB/cfg");
+  }
+
+  strcpy(tsVnodeDir, "C:/PowerDB/data");
+  strcpy(tsDataDir, "C:/PowerDB/data");
+  strcpy(tsLogDir, "C:/PowerDB/log");
+  strcpy(tsScriptDir, "C:/PowerDB/script");
+
+#else
+  if (configDir[0] == 0) {
+    strcpy(configDir, "C:/TDengine/cfg");
+  }
+
+  strcpy(tsVnodeDir, "C:/TDengine/data");
+  strcpy(tsDataDir, "C:/TDengine/data");
+  strcpy(tsLogDir, "C:/TDengine/log");
+  strcpy(tsScriptDir, "C:/TDengine/script");
+#endif
+
+  strcpy(tsDnodeDir, "");
+  strcpy(tsMnodeDir, "");  
+  strcpy(tsOsName, "Windows");
+  taosWinSocketInit();
+}
diff --git a/src/os/src/windows/wFile.c b/src/os/src/windows/wFile.c
new file mode 100644
index 0000000000000000000000000000000000000000..5549c078a5220d3e493ce21e2c19e38fb9611cbb
--- /dev/null
+++ b/src/os/src/windows/wFile.c
@@ -0,0 +1,86 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tulog.h"
+
+void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath) {
+  const char* tdengineTmpFileNamePrefix = "tdengine-";
+    char tmpPath[PATH_MAX];
+
+  char *tmpDir = getenv("tmp");
+  if (tmpDir == NULL) {
+    tmpDir = "";
+  }
+  
+  strcpy(tmpPath, tmpDir);
+  strcat(tmpPath, tdengineTmpFileNamePrefix);
+  if (strlen(tmpPath) + strlen(fileNamePrefix) + strlen("-%d-%s") < PATH_MAX) {
+    strcat(tmpPath, fileNamePrefix);
+    strcat(tmpPath, "-%d-%s");
+  }
+  
+  char rand[8] = {0};
+  taosRandStr(rand, tListLen(rand) - 1);
+  snprintf(dstPath, PATH_MAX, tmpPath, getpid(), rand);
+}
+
+#define _SEND_FILE_STEP_ 1000
+
+int taosFSendFileImp(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
+  fseek(in_file, (int32_t)(*offset), 0);
+  int writeLen = 0;
+  uint8_t buffer[_SEND_FILE_STEP_] = { 0 };
+  
+  for (int len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
+    size_t rlen = fread(buffer, 1, _SEND_FILE_STEP_, in_file);
+    if (rlen <= 0) {
+      return writeLen;
+    }
+    else if (rlen < _SEND_FILE_STEP_) {
+      fwrite(buffer, 1, rlen, out_file);
+      return (int)(writeLen + rlen);
+    }
+    else {
+      fwrite(buffer, 1, _SEND_FILE_STEP_, in_file);
+      writeLen += _SEND_FILE_STEP_;
+    }
+  }
+
+  int remain = count - writeLen;
+  if (remain > 0) {
+    size_t rlen = fread(buffer, 1, remain, in_file);
+    if (rlen <= 0) {
+      return writeLen;
+    }
+    else {
+      fwrite(buffer, 1, remain, out_file);
+      writeLen += remain;
+    }
+  }
+
+  return writeLen;
+}
+
+ssize_t taosTSendFileImp(int dfd, int sfd, off_t *offset, size_t size) {
+  uError("taosTSendFileImp no implemented yet");
+  return 0;
+}
+
+int taosFtruncate(int fd, int64_t length) {
+  uError("taosFtruncate no implemented yet");
+  return 0;
+}
\ No newline at end of file
diff --git a/src/os/src/windows/wGetline.c b/src/os/src/windows/wGetline.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e8701e19b3ee420648bec984874416410cd14f1
--- /dev/null
+++ b/src/os/src/windows/wGetline.c
@@ -0,0 +1,124 @@
+/* getline.c -- Replacement for GNU C library function getline
+
+Copyright (C) 1993 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+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.  See the GNU
+General Public License for more details.  */
+
+/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#else
+char *malloc(), *realloc();
+#endif
+
+/* Always add at least this many bytes when extending the buffer.  */
+#define MIN_CHUNK 64
+
+/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
++ OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
+malloc (or NULL), pointing to *N characters of space.  It is realloc'd
+as necessary.  Return the number of characters read (not including the
+null terminator), or -1 on error or EOF.  On a -1 return, the caller
+should check feof(), if not then errno has been set to indicate
+the error.  */
+
+int getstr(char **lineptr, size_t *n, FILE *stream, char terminator, int offset) {
+  int   nchars_avail; /* Allocated but unused chars in *LINEPTR.  */
+  char *read_pos;     /* Where we're reading into *LINEPTR. */
+  int   ret;
+
+  if (!lineptr || !n || !stream) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (!*lineptr) {
+    *n = MIN_CHUNK;
+    *lineptr = malloc(*n);
+    if (!*lineptr) {
+      errno = ENOMEM;
+      return -1;
+    }
+  }
+
+  nchars_avail = (int)(*n - offset);
+  read_pos = *lineptr + offset;
+
+  for (;;) {
+    int          save_errno;
+    register int c = getc(stream);
+
+    save_errno = errno;
+
+    /* We always want at least one char left in the buffer, since we
+    always (unless we get an error while reading the first char)
+    NUL-terminate the line buffer.  */
+
+    assert((*lineptr + *n) == (read_pos + nchars_avail));
+    if (nchars_avail < 2) {
+      if (*n > MIN_CHUNK)
+        *n *= 2;
+      else
+        *n += MIN_CHUNK;
+
+      nchars_avail = (int)(*n + *lineptr - read_pos);
+      *lineptr = realloc(*lineptr, *n);
+      if (!*lineptr) {
+        errno = ENOMEM;
+        return -1;
+      }
+      read_pos = *n - nchars_avail + *lineptr;
+      assert((*lineptr + *n) == (read_pos + nchars_avail));
+    }
+
+    if (ferror(stream)) {
+      /* Might like to return partial line, but there is no
+      place for us to store errno.  And we don't want to just
+      lose errno.  */
+      errno = save_errno;
+      return -1;
+    }
+
+    if (c == EOF) {
+      /* Return partial line, if any.  */
+      if (read_pos == *lineptr)
+        return -1;
+      else
+        break;
+    }
+
+    *read_pos++ = c;
+    nchars_avail--;
+
+    if (c == terminator) /* Return the line.  */
+      break;
+  }
+
+  /* Done - NUL terminate and return the number of chars read.  */
+  *read_pos = '\0';
+
+  ret = (int)(read_pos - (*lineptr + offset));
+  return ret;
+}
+
+int taosGetlineImp(char **lineptr, size_t *n, FILE *stream) { 
+  return getstr(lineptr, n, stream, '\n', 0);
+}
\ No newline at end of file
diff --git a/src/os/src/windows/wGodll.c b/src/os/src/windows/wGodll.c
new file mode 100644
index 0000000000000000000000000000000000000000..b270dab2f4364c014c0a0b8b28993d0299d11847
--- /dev/null
+++ b/src/os/src/windows/wGodll.c
@@ -0,0 +1,33 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+#ifdef _TD_GO_DLL_
+int64_t tsosStr2int64(char *str) {
+  char *endptr = NULL;
+  return strtoll(str, &endptr, 10);
+}
+
+uint64_t htonll(uint64_t val) {
+  return (((uint64_t) htonl(val)) << 32) + htonl(val >> 32);
+}
+#endif
diff --git a/src/os/src/windows/wLz4.c b/src/os/src/windows/wLz4.c
new file mode 100644
index 0000000000000000000000000000000000000000..631a22e5727695499febffd0ff212532f88413e1
--- /dev/null
+++ b/src/os/src/windows/wLz4.c
@@ -0,0 +1,70 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+unsigned char _MyBitScanForward64(unsigned long *ret, uint64_t x) {
+  unsigned long x0 = (unsigned long)x, top, bottom;
+  _BitScanForward(&top, (unsigned long)(x >> 32));
+  _BitScanForward(&bottom, x0);
+  *ret = x0 ? bottom : 32 + top;
+  return x != 0;
+}
+
+unsigned char _MyBitScanReverse64(unsigned long *ret, uint64_t x) {
+  unsigned long x1 = (unsigned long)(x >> 32), top, bottom;
+  _BitScanReverse(&top, x1);
+  _BitScanReverse(&bottom, (unsigned long)x);
+  *ret = x1 ? top + 32 : bottom;
+  return x != 0;
+}
+
+int32_t BUILDIN_CLZL(uint64_t val) {
+  unsigned long r = 0;
+#ifdef _WIN64
+  _BitScanReverse64(&r, val);
+#else
+  _MyBitScanReverse64(&r, val);
+#endif
+  return (int)(r >> 3);
+}
+
+int32_t BUILDIN_CLZ(uint32_t val) {
+  unsigned long r = 0;
+  _BitScanReverse(&r, val);
+  return (int)(r >> 3);
+}
+
+int32_t BUILDIN_CTZL(uint64_t val) {
+  unsigned long r = 0;
+#ifdef _WIN64
+  _BitScanForward64(&r, val);
+#else
+  _MyBitScanForward64(&r, val);
+#endif
+  return (int)(r >> 3);
+}
+
+int32_t BUILDIN_CTZ(uint32_t val) {
+  unsigned long r = 0;
+  _BitScanForward(&r, val);
+  return (int)(r >> 3);
+}
\ No newline at end of file
diff --git a/src/os/src/windows/wSemphone.c b/src/os/src/windows/wSemphone.c
new file mode 100644
index 0000000000000000000000000000000000000000..ded7e418430be2674b82761771579c7b84a65007
--- /dev/null
+++ b/src/os/src/windows/wSemphone.c
@@ -0,0 +1,38 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+bool taosCheckPthreadValid(pthread_t thread) { return thread.p != NULL; }
+
+void taosResetPthread(pthread_t *thread) { thread->p = 0; }
+
+int64_t taosGetPthreadId() {
+#ifdef PTW32_VERSION
+  return pthread_getw32threadid_np(pthread_self());
+#else
+  return (int64_t)pthread_self();
+#endif
+}
+
+bool taosComparePthread(pthread_t first, pthread_t second) {
+  return first.p == second.p;
+}
diff --git a/src/os/src/windows/wSocket.c b/src/os/src/windows/wSocket.c
new file mode 100644
index 0000000000000000000000000000000000000000..da9242d6a3bff471c4e749f0faf7c95b6c3a9d8c
--- /dev/null
+++ b/src/os/src/windows/wSocket.c
@@ -0,0 +1,89 @@
+/*
+ * 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 "os.h"
+#include <WS2tcpip.h>  
+#include <IPHlpApi.h>  
+#include <winsock2.h>  
+#include <stdio.h>
+#include <string.h>
+#include <ws2def.h>
+#include <tchar.h>
+
+void taosWinSocketInit() {
+  static char flag = 0;
+  if (flag == 0) {
+    WORD    wVersionRequested;
+    WSADATA wsaData;
+    wVersionRequested = MAKEWORD(1, 1);
+    if (WSAStartup(wVersionRequested, &wsaData) == 0) {
+      flag = 1;
+    }
+  }
+}
+
+int taosSetNonblocking(SOCKET sock, int on) {
+  u_long mode;
+  if (on) {
+    mode = 1;
+    ioctlsocket(sock, FIONBIO, &mode);
+  } else {
+    mode = 0;
+    ioctlsocket(sock, FIONBIO, &mode);
+  }
+  return 0;
+}
+
+void taosBlockSIGPIPE() {}
+
+int taosSetSockOpt(SOCKET socketfd, int level, int optname, void *optval, int optlen) {
+  if (level == SOL_SOCKET && optname == TCP_KEEPCNT) {
+    return 0;
+  }
+
+  if (level == SOL_TCP && optname == TCP_KEEPIDLE) {
+    return 0;
+  }
+
+  if (level == SOL_TCP && optname == TCP_KEEPINTVL) {
+    return 0;
+  }
+
+   if (level == SOL_TCP && optname == TCP_KEEPCNT) {
+    return 0;
+  }
+
+  return setsockopt(socketfd, level, optname, optval, optlen);
+}
+
+#ifdef TAOS_OS_FUNC_SOCKET_INET
+
+uint32_t taosInetAddr(char *ipAddr) {
+  uint32_t value;
+  int ret = inet_pton(AF_INET, ipAddr, &value);
+  if (ret <= 0) {
+    return INADDR_NONE;
+  } else {
+    return value;
+  }
+}
+
+const char *taosInetNtoa(struct in_addr ipInt) {
+  // not thread safe, only for debug usage while print log
+  static char tmpDstStr[16];
+  return inet_ntop(AF_INET, &ipInt, tmpDstStr, INET6_ADDRSTRLEN);
+}
+
+#endif
\ No newline at end of file
diff --git a/src/os/src/windows/wString.c b/src/os/src/windows/wString.c
new file mode 100644
index 0000000000000000000000000000000000000000..1fb235a00575529be660cea18c1401f1d075a49b
--- /dev/null
+++ b/src/os/src/windows/wString.c
@@ -0,0 +1,165 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+/*
+ * Get next token from string *stringp, where tokens are possibly-empty
+ * strings separated by characters from delim.
+ *
+ * Writes NULs into the string at *stringp to end tokens.
+ * delim need not remain constant from call to call.
+ * On return, *stringp points past the last NUL written (if there might
+ * be further tokens), or is NULL (if there are definitely no moretokens).
+ *
+ * If *stringp is NULL, strsep returns NULL.
+ */
+char *strsep(char **stringp, const char *delim) {
+  char *s;
+  const char *spanp;
+  int c, sc;
+  char *tok;
+  if ((s = *stringp) == NULL)
+    return (NULL);
+  for (tok = s;;) {
+    c = *s++;
+    spanp = delim;
+    do {
+      if ((sc = *spanp++) == c) {
+        if (c == 0)
+          s = NULL;
+        else
+          s[-1] = 0;
+        *stringp = s;
+        return (tok);
+      }
+    } while (sc != 0);
+  }
+  /* NOTREACHED */
+}
+
+char *getpass(const char *prefix) {
+  static char passwd[TSDB_KEY_LEN] = {0};
+  memset(passwd, 0, TSDB_KEY_LEN);
+  printf("%s", prefix);
+
+  int32_t index = 0;
+  char    ch;
+  while (index < TSDB_KEY_LEN) {
+    ch = getch();
+    if (ch == '\n' || ch == '\r') {
+      break;
+    } else {
+      passwd[index++] = ch;
+    }
+  }
+
+  return passwd;
+}
+
+char *strndup(const char *s, size_t n) {
+  size_t len = strlen(s);
+  if (len >= n) {
+    len = n;
+  }
+
+  char *r = calloc(len + 1, 1);
+  memcpy(r, s, len);
+  r[len] = 0;
+  return r;
+}
+
+int twcslen(const wchar_t *wcs) {
+  int *wstr = (int *)wcs;
+  if (NULL == wstr) {
+    return 0;
+  }
+
+  int n = 0;
+  while (1) {
+    if (0 == *wstr++) {
+      break;
+    }
+    n++;
+  }
+
+  return n;
+}
+
+int tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int bytes) {
+  for (int i = 0; i < bytes; ++i) {
+    int32_t f1 = *(int32_t *)((char *)f1_ucs4 + i * 4);
+    int32_t f2 = *(int32_t *)((char *)f2_ucs4 + i * 4);
+
+    if ((f1 == 0 && f2 != 0) || (f1 != 0 && f2 == 0)) {
+      return f1 - f2;
+    } else if (f1 == 0 && f2 == 0) {
+      return 0;
+    }
+
+    if (f1 != f2) {
+      return f1 - f2;
+    }
+  }
+
+  return 0;
+
+#if 0
+  int32_t ucs4_max_len = bytes + 4;
+  char *f1_mbs = calloc(bytes, 1);
+  char *f2_mbs = calloc(bytes, 1);
+  if (taosUcs4ToMbs(f1_ucs4, ucs4_max_len, f1_mbs) < 0) {
+    return -1;
+  }
+  if (taosUcs4ToMbs(f2_ucs4, ucs4_max_len, f2_mbs) < 0) {
+    return -1;
+  }
+  int32_t ret = strcmp(f1_mbs, f2_mbs);
+  free(f1_mbs);
+  free(f2_mbs);
+  return ret;
+#endif
+}
+
+
+/* Copy memory to memory until the specified number of bytes
+has been copied, return pointer to following byte.
+Overlap is NOT handled correctly. */
+void *mempcpy(void *dest, const void *src, size_t len) {
+  return (char*)memcpy(dest, src, len) + len;
+}
+
+/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
+char *stpcpy (char *dest, const char *src) {
+  size_t len = strlen (src);
+  return (char*)memcpy(dest, src, len + 1) + len;
+}
+
+/* Copy no more than N characters of SRC to DEST, returning the address of
+   the terminating '\0' in DEST, if any, or else DEST + N.  */
+char *stpncpy (char *dest, const char *src, size_t n) {
+  size_t size = strnlen (src, n);
+  memcpy (dest, src, size);
+  dest += size;
+  if (size == n)
+    return dest;
+  return memset (dest, '\0', n - size);
+}
\ No newline at end of file
diff --git a/src/os/windows/src/twinstrptime.c b/src/os/src/windows/wStrptime.c
similarity index 100%
rename from src/os/windows/src/twinstrptime.c
rename to src/os/src/windows/wStrptime.c
diff --git a/src/os/src/windows/wSysinfo.c b/src/os/src/windows/wSysinfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..61adc3ee14ed4a815117d306559970f67a961ea8
--- /dev/null
+++ b/src/os/src/windows/wSysinfo.c
@@ -0,0 +1,235 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+#if (_WIN64)
+#include <iphlpapi.h>
+#include <mswsock.h>
+#include <psapi.h>
+#include <stdio.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#pragma comment(lib, "Mswsock.lib ")
+#endif
+
+#include <DbgHelp.h>
+
+static void taosGetSystemTimezone() {
+  // get and set default timezone
+  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
+  if (cfg_timezone && cfg_timezone->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    char *tz = getenv("TZ");
+    if (tz == NULL || strlen(tz) == 0) {
+      strcpy(tsTimezone, "not configured");
+    } else {
+      strcpy(tsTimezone, tz);
+    }
+    cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+    uInfo("timezone not configured, use default");
+  }
+}
+
+static void taosGetSystemLocale() {
+  // get and set default locale
+  SGlobalCfg *cfg_locale = taosGetConfigOption("locale");
+  if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    char *locale = setlocale(LC_CTYPE, "chs");
+    if (locale != NULL) {
+      tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
+      cfg_locale->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+      uInfo("locale not configured, set to default:%s", tsLocale);
+    }
+  }
+
+  SGlobalCfg *cfg_charset = taosGetConfigOption("charset");
+  if (cfg_charset && cfg_charset->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
+    strcpy(tsCharset, "cp936");
+    cfg_charset->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
+    uInfo("charset not configured, set to default:%s", tsCharset);
+  }
+}
+
+void taosPrintOsInfo() {}
+
+void taosKillSystem() {
+  uError("function taosKillSystem, exit!");
+  exit(0);
+}
+
+void taosGetSystemInfo() {
+  taosGetSystemTimezone();
+  taosGetSystemLocale();
+}
+
+bool taosGetDisk() {
+  const double    unit = 1024 * 1024 * 1024;
+  BOOL            fResult;
+  unsigned _int64 i64FreeBytesToCaller;
+  unsigned _int64 i64TotalBytes;
+  unsigned _int64 i64FreeBytes;
+  char            dir[4] = {'C', ':', '\\', '\0'};
+  int             drive_type;
+
+  if (tscEmbedded) {
+    drive_type = GetDriveTypeA(dir);
+    if (drive_type == DRIVE_FIXED) {
+      fResult = GetDiskFreeSpaceExA(dir, (PULARGE_INTEGER)&i64FreeBytesToCaller, (PULARGE_INTEGER)&i64TotalBytes,
+                                    (PULARGE_INTEGER)&i64FreeBytes);
+      if (fResult) {
+        tsTotalDataDirGB = tsTotalLogDirGB = tsTotalTmpDirGB = (float)(i64TotalBytes / unit);
+        tsAvailDataDirGB = tsAvailLogDirGB = tsAvailTmpDirectorySpace = (float)(i64FreeBytes / unit);
+      }
+    }
+  }
+  return true;
+}
+
+bool taosReadProcIO(int64_t *readbyte, int64_t *writebyte) {
+  IO_COUNTERS io_counter;
+  if (GetProcessIoCounters(GetCurrentProcess(), &io_counter)) {
+    if (readbyte) *readbyte = io_counter.ReadTransferCount;
+    if (writebyte) *writebyte = io_counter.WriteTransferCount;
+    return true;
+  }
+  return false;
+}
+
+bool taosGetProcIO(float *readKB, float *writeKB) {
+  static int64_t lastReadbyte = -1;
+  static int64_t lastWritebyte = -1;
+
+  int64_t curReadbyte = 0;
+  int64_t curWritebyte = 0;
+
+  if (!taosReadProcIO(&curReadbyte, &curWritebyte)) {
+    return false;
+  }
+
+  if (lastReadbyte == -1 || lastWritebyte == -1) {
+    lastReadbyte = curReadbyte;
+    lastWritebyte = curWritebyte;
+    return false;
+  }
+
+  *readKB = (float)((double)(curReadbyte - lastReadbyte) / 1024);
+  *writeKB = (float)((double)(curWritebyte - lastWritebyte) / 1024);
+  if (*readKB < 0) *readKB = 0;
+  if (*writeKB < 0) *writeKB = 0;
+
+  lastReadbyte = curReadbyte;
+  lastWritebyte = curWritebyte;
+
+  return true;
+}
+
+bool taosGetBandSpeed(float *bandSpeedKb) {
+  *bandSpeedKb = 0;
+  return true;
+}
+
+bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
+  *sysCpuUsage = 0;
+  *procCpuUsage = 0;
+  return true;
+}
+
+bool taosGetProcMemory(float *memoryUsedMB) {
+  unsigned bytes_used = 0;
+#if 0
+#if defined(_WIN32) && defined(_MSC_VER)
+   PROCESS_MEMORY_COUNTERS pmc;
+   HANDLE                  cur_proc = GetCurrentProcess();
+
+   if (GetProcessMemoryInfo(cur_proc, &pmc, sizeof(pmc))) {
+     bytes_used = (unsigned)(pmc.WorkingSetSize + pmc.PagefileUsage);
+   }
+#endif
+#endif
+
+  *memoryUsedMB = (float)bytes_used / 1024 / 1024;
+
+  return true;
+}
+
+bool taosGetSysMemory(float *memoryUsedMB) {
+  MEMORYSTATUSEX memsStat;
+  float          nMemFree;
+  float          nMemTotal;
+
+  memsStat.dwLength = sizeof(memsStat);
+  if (!GlobalMemoryStatusEx(&memsStat)) {
+    return false;
+  }
+  nMemFree = memsStat.ullAvailPhys / (1024.0f * 1024.0f);
+  nMemTotal = memsStat.ullTotalPhys / (1024.0f * 1024.0f);
+  *memoryUsedMB = nMemTotal - nMemFree;
+  return true;
+}
+
+int taosSystem(const char *cmd) {
+  uError("taosSystem not support");
+  return -1;
+}
+
+int flock(int fd, int option) { return 0; }
+
+int fsync(int filedes) { return 0; }
+
+int sigaction(int sig, struct sigaction *d, void *p) { return 0; }
+
+LONG WINAPI FlCrashDump(PEXCEPTION_POINTERS ep) {
+  typedef BOOL(WINAPI * FxMiniDumpWriteDump)(IN HANDLE hProcess, IN DWORD ProcessId, IN HANDLE hFile,
+                                             IN MINIDUMP_TYPE                           DumpType,
+                                             IN CONST PMINIDUMP_EXCEPTION_INFORMATION   ExceptionParam,
+                                             IN CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+                                             IN CONST PMINIDUMP_CALLBACK_INFORMATION    CallbackParam);
+
+  HMODULE dll = LoadLibrary("dbghelp.dll");
+  if (dll == NULL) return EXCEPTION_CONTINUE_SEARCH;
+  FxMiniDumpWriteDump mdwd = (FxMiniDumpWriteDump)(GetProcAddress(dll, "MiniDumpWriteDump"));
+  if (mdwd == NULL) {
+    FreeLibrary(dll);
+    return EXCEPTION_CONTINUE_SEARCH;
+  }
+
+  TCHAR path[MAX_PATH];
+  DWORD len = GetModuleFileName(NULL, path, _countof(path));
+  path[len - 3] = 'd';
+  path[len - 2] = 'm';
+  path[len - 1] = 'p';
+
+  HANDLE file = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+
+  MINIDUMP_EXCEPTION_INFORMATION mei;
+  mei.ThreadId = GetCurrentThreadId();
+  mei.ExceptionPointers = ep;
+  mei.ClientPointers = FALSE;
+
+  (*mdwd)(GetCurrentProcess(), GetCurrentProcessId(), file, MiniDumpWithHandleData, &mei, NULL, NULL);
+
+  CloseHandle(file);
+  FreeLibrary(dll);
+
+  return EXCEPTION_CONTINUE_SEARCH;
+}
+
+void taosSetCoreDump() { SetUnhandledExceptionFilter(&FlCrashDump); }
\ No newline at end of file
diff --git a/src/os/windows/src/twintime.c b/src/os/src/windows/wTime.c
similarity index 100%
rename from src/os/windows/src/twintime.c
rename to src/os/src/windows/wTime.c
diff --git a/src/os/src/windows/wTimer.c b/src/os/src/windows/wTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..32e04746f190b835d3cbc1837d5cd110a8709983
--- /dev/null
+++ b/src/os/src/windows/wTimer.c
@@ -0,0 +1,49 @@
+/*
+ * 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 <Windows.h>
+#include <Mmsystem.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#pragma warning( disable : 4244 )
+
+typedef void (*win_timer_f)(int signo);
+
+void WINAPI taosWinOnTimer(UINT wTimerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dwl, DWORD_PTR dw2) {
+  win_timer_f callback = *((win_timer_f *)&dwUser);
+  if (callback != NULL) {
+    callback(0);
+  }
+}
+
+static MMRESULT timerId;
+int taosInitTimer(win_timer_f callback, int ms) {
+  DWORD_PTR param = *((int64_t *) & callback);
+
+  timerId = timeSetEvent(ms, 1, (LPTIMECALLBACK)taosWinOnTimer, param, TIME_PERIODIC);
+  if (timerId == 0) {
+    return -1;
+  }
+  return 0;
+}
+
+void taosUninitTimer() {
+  timeKillEvent(timerId);
+}
+
+void taosMsleep(int mseconds) {
+  Sleep(mseconds);
+}
diff --git a/src/os/src/windows/wWordexp.c b/src/os/src/windows/wWordexp.c
new file mode 100644
index 0000000000000000000000000000000000000000..bb9acde25a5de6c334f512fc8994edffdf5c59a3
--- /dev/null
+++ b/src/os/src/windows/wWordexp.c
@@ -0,0 +1,33 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tulog.h"
+#include "tutil.h"
+
+int wordexp(const char *words, wordexp_t *pwordexp, int flags) {
+  pwordexp->we_offs = 0;
+  pwordexp->we_wordc = 1;
+  pwordexp->we_wordv = (char **)(pwordexp->wordPos);
+  pwordexp->we_wordv[0] = (char *)words;
+  return 0;
+}
+
+void wordfree(wordexp_t *pwordexp) {}
+
diff --git a/src/os/windows/CMakeLists.txt b/src/os/windows/CMakeLists.txt
deleted file mode 100644
index dc60b736ea2ca1d223f1f9bbb4206195c63a08ff..0000000000000000000000000000000000000000
--- a/src/os/windows/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF (TD_WINDOWS_64)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(os ${SRC})
-  TARGET_LINK_LIBRARIES(os winmm IPHLPAPI ws2_32)
-ENDIF ()
diff --git a/src/os/windows/inc/os.h b/src/os/windows/inc/os.h
deleted file mode 100644
index 3f957e8abd489abdbe7bb009b3d4fa47aadb4467..0000000000000000000000000000000000000000
--- a/src/os/windows/inc/os.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-* 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_PLATFORM_WINDOWS_H
-#define TDENGINE_PLATFORM_WINDOWS_H
-
-#include <assert.h>
-#include <ctype.h>
-#include <direct.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <float.h>
-#include <locale.h>
-#include <intrin.h>
-#include <io.h>
-#include <math.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <inttypes.h>
-#include "winsock2.h"
-#include <WS2tcpip.h>
-
-#include <winbase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// for function open in stat.h 
-#define S_IRWXU                  _S_IREAD
-#define S_IRWXG                  _S_IWRITE
-#define S_IRWXO                  _S_IWRITE
-
-// for access function in io.h
-#define F_OK 00  //Existence only
-#define W_OK 02  //Write - only
-#define R_OK 04  //Read - only
-#define X_OK 06  //Read and write
-
-// for send function in tsocket.c
-#define MSG_NOSIGNAL             0
-#define SO_NO_CHECK              0x1234
-#define SOL_TCP                  0x1234
-#define TCP_KEEPCNT              0x1234
-#define TCP_KEEPIDLE             0x1234
-#define TCP_KEEPINTVL            0x1234
-
-#define LOCK_EX 1
-#define LOCK_NB 2
-#define LOCK_UN 3
-
-#define bzero(ptr, size) memset((ptr), 0, (size))
-#define mkdir(pathname, mode) _mkdir(pathname)
-#define strcasecmp  _stricmp
-#define strncasecmp _strnicmp
-#define wcsncasecmp _wcsnicmp
-#define strtok_r strtok_s
-#ifdef _TD_GO_DLL_
-  int64_t str2int64(char *str);
-  uint64_t htonll(uint64_t val);
-#else
-  #define str2int64 _atoi64
-#endif
-
-#define snprintf _snprintf
-#define in_addr_t unsigned long
-#define socklen_t int
-#define htobe64 htonll
-#define twrite write
-
-#ifndef PATH_MAX
-  #define PATH_MAX 256
-#endif
-
-#define taosCloseSocket(fd) closesocket(fd)
-#define taosWriteSocket(fd, buf, len) send(fd, buf, len, 0)
-#define taosReadSocket(fd, buf, len) recv(fd, buf, len, 0)
-
-#if defined(_M_ARM) || defined(_M_ARM64)
-
-/* the '__iso_volatile' functions does not use a memory fence, so these
- * definitions are incorrect, comment out as we don't support Windows on
- * ARM at present.
-
-#define atomic_load_8(ptr) __iso_volatile_load8((const volatile __int8*)(ptr))
-#define atomic_load_16(ptr) __iso_volatile_load16((const volatile __int16*)(ptr))
-#define atomic_load_32(ptr) __iso_volatile_load32((const volatile __int32*)(ptr))
-#define atomic_load_64(ptr) __iso_volatile_load64((const volatile __int64*)(ptr))
-
-#define atomic_store_8(ptr, val) __iso_volatile_store8((volatile __int8*)(ptr), (__int8)(val))
-#define atomic_store_16(ptr, val) __iso_volatile_store16((volatile __int16*)(ptr), (__int16)(val))
-#define atomic_store_32(ptr, val) __iso_volatile_store32((volatile __int32*)(ptr), (__int32)(val))
-#define atomic_store_64(ptr, val) __iso_volatile_store64((volatile __int64*)(ptr), (__int64)(val))
-
-#ifdef _M_ARM64
-#define atomic_load_ptr atomic_load_64
-#define atomic_store_ptr atomic_store_64
-#else
-#define atomic_load_ptr atomic_load_32
-#define atomic_store_ptr atomic_store_32
-#endif
-*/
-#else
-
-#define atomic_load_8(ptr) (*(char volatile*)(ptr))
-#define atomic_load_16(ptr) (*(short volatile*)(ptr))
-#define atomic_load_32(ptr) (*(long volatile*)(ptr))
-#define atomic_load_64(ptr) (*(__int64 volatile*)(ptr))
-#define atomic_load_ptr(ptr) (*(void* volatile*)(ptr))
-
-#define atomic_store_8(ptr, val) ((*(char volatile*)(ptr)) = (char)(val))
-#define atomic_store_16(ptr, val) ((*(short volatile*)(ptr)) = (short)(val))
-#define atomic_store_32(ptr, val) ((*(long volatile*)(ptr)) = (long)(val))
-#define atomic_store_64(ptr, val) ((*(__int64 volatile*)(ptr)) = (__int64)(val))
-#define atomic_store_ptr(ptr, val) ((*(void* volatile*)(ptr)) = (void*)(val))
-
-#endif
-
-#define atomic_exchange_8(ptr, val) _InterlockedExchange8((char volatile*)(ptr), (char)(val))
-#define atomic_exchange_16(ptr, val) _InterlockedExchange16((short volatile*)(ptr), (short)(val))
-#define atomic_exchange_32(ptr, val) _InterlockedExchange((long volatile*)(ptr), (long)(val))
-#define atomic_exchange_64(ptr, val) _InterlockedExchange64((__int64 volatile*)(ptr), (__int64)(val))
-#define atomic_exchange_ptr(ptr, val) _InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
-
-#ifdef _TD_GO_DLL_
-  #define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
-#else
-  #define atomic_val_compare_exchange_8(ptr, oldval, newval) _InterlockedCompareExchange8((char volatile*)(ptr), (char)(newval), (char)(oldval))
-#endif
-
-#define atomic_val_compare_exchange_16(ptr, oldval, newval) _InterlockedCompareExchange16((short volatile*)(ptr), (short)(newval), (short)(oldval))
-#define atomic_val_compare_exchange_32(ptr, oldval, newval) _InterlockedCompareExchange((long volatile*)(ptr), (long)(newval), (long)(oldval))
-#define atomic_val_compare_exchange_64(ptr, oldval, newval) _InterlockedCompareExchange64((__int64 volatile*)(ptr), (__int64)(newval), (__int64)(oldval))
-#define atomic_val_compare_exchange_ptr(ptr, oldval, newval) _InterlockedCompareExchangePointer((void* volatile*)(ptr), (void*)(newval), (void*)(oldval))
-
-char    interlocked_add_fetch_8(char volatile *ptr, char val);
-short   interlocked_add_fetch_16(short volatile *ptr, short val);
-long    interlocked_add_fetch_32(long volatile *ptr, long val);
-__int64 interlocked_add_fetch_64(__int64 volatile *ptr, __int64 val);
-
-#define atomic_add_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), (char)(val))
-#define atomic_add_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), (short)(val))
-#define atomic_add_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), (long)(val))
-#define atomic_add_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
-#ifdef _WIN64
-  #define atomic_add_fetch_ptr atomic_add_fetch_64
-#else
-  #define atomic_add_fetch_ptr atomic_add_fetch_32
-#endif
-#ifdef _TD_GO_DLL_
-  #define atomic_fetch_add_8 __sync_fetch_and_ad
-  #define atomic_fetch_add_16 __sync_fetch_and_add
-#else
-  #define atomic_fetch_add_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), (char)(val))
-  #define atomic_fetch_add_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), (short)(val))
-#endif
-
-#define atomic_fetch_add_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), (long)(val))
-#define atomic_fetch_add_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), (__int64)(val))
-#ifdef _WIN64
-  #define atomic_fetch_add_ptr atomic_fetch_add_64
-#else
-  #define atomic_fetch_add_ptr atomic_fetch_add_32
-#endif
-
-#define atomic_sub_fetch_8(ptr, val) interlocked_add_fetch_8((char volatile*)(ptr), -(char)(val))
-#define atomic_sub_fetch_16(ptr, val) interlocked_add_fetch_16((short volatile*)(ptr), -(short)(val))
-#define atomic_sub_fetch_32(ptr, val) interlocked_add_fetch_32((long volatile*)(ptr), -(long)(val))
-#define atomic_sub_fetch_64(ptr, val) interlocked_add_fetch_64((__int64 volatile*)(ptr), -(__int64)(val))
-#ifdef _WIN64
-  #define atomic_sub_fetch_ptr atomic_sub_fetch_64
-#else
-  #define atomic_sub_fetch_ptr atomic_sub_fetch_32
-#endif
-
-#define atomic_fetch_sub_8(ptr, val) _InterlockedExchangeAdd8((char volatile*)(ptr), -(char)(val))
-#define atomic_fetch_sub_16(ptr, val) _InterlockedExchangeAdd16((short volatile*)(ptr), -(short)(val))
-#define atomic_fetch_sub_32(ptr, val) _InterlockedExchangeAdd((long volatile*)(ptr), -(long)(val))
-#define atomic_fetch_sub_64(ptr, val) _InterlockedExchangeAdd64((__int64 volatile*)(ptr), -(__int64)(val))
-#ifdef _WIN64
-  #define atomic_fetch_sub_ptr atomic_fetch_sub_64
-#else
-  #define atomic_fetch_sub_ptr atomic_fetch_sub_32
-#endif
-#ifndef _TD_GO_DLL_
- char interlocked_and_fetch_8(char volatile* ptr, char val);
- short interlocked_and_fetch_16(short volatile* ptr, short val);
-#endif
-long interlocked_and_fetch_32(long volatile* ptr, long val);
-__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val);
-
-#ifndef _TD_GO_DLL_
-  #define atomic_and_fetch_8(ptr, val) interlocked_and_fetch_8((char volatile*)(ptr), (char)(val))
-  #define atomic_and_fetch_16(ptr, val) interlocked_and_fetch_16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_and_fetch_32(ptr, val) interlocked_and_fetch_32((long volatile*)(ptr), (long)(val))
-#define atomic_and_fetch_64(ptr, val) interlocked_and_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
-#ifdef _WIN64
-  #define atomic_and_fetch_ptr atomic_and_fetch_64
-#else
-  #define atomic_and_fetch_ptr atomic_and_fetch_32
-#endif
-#ifndef _TD_GO_DLL_
-  #define atomic_fetch_and_8(ptr, val) _InterlockedAnd8((char volatile*)(ptr), (char)(val))
-  #define atomic_fetch_and_16(ptr, val) _InterlockedAnd16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_fetch_and_32(ptr, val) _InterlockedAnd((long volatile*)(ptr), (long)(val))
-
-#ifdef _M_IX86
-  __int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val);
-  #define atomic_fetch_and_64(ptr, val) interlocked_fetch_and_64((__int64 volatile*)(ptr), (__int64)(val))
-#else
-  #define atomic_fetch_and_64(ptr, val) _InterlockedAnd64((__int64 volatile*)(ptr), (__int64)(val))
-#endif
-
-#ifdef _WIN64
-  #define atomic_fetch_and_ptr atomic_fetch_and_64
-#else
-  #define atomic_fetch_and_ptr atomic_fetch_and_32
-#endif
-#ifndef _TD_GO_DLL_
-  char interlocked_or_fetch_8(char volatile* ptr, char val);
-  short interlocked_or_fetch_16(short volatile* ptr, short val);
-#endif
-long interlocked_or_fetch_32(long volatile* ptr, long val);
-__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val);
-
-#ifndef _TD_GO_DLL_
-  #define atomic_or_fetch_8(ptr, val) interlocked_or_fetch_8((char volatile*)(ptr), (char)(val))
-  #define atomic_or_fetch_16(ptr, val) interlocked_or_fetch_16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_or_fetch_32(ptr, val) interlocked_or_fetch_32((long volatile*)(ptr), (long)(val))
-#define atomic_or_fetch_64(ptr, val) interlocked_or_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
-#ifdef _WIN64
-  #define atomic_or_fetch_ptr atomic_or_fetch_64
-#else
-  #define atomic_or_fetch_ptr atomic_or_fetch_32
-#endif
-#ifndef _TD_GO_DLL_
-  #define atomic_fetch_or_8(ptr, val) _InterlockedOr8((char volatile*)(ptr), (char)(val))
-  #define atomic_fetch_or_16(ptr, val) _InterlockedOr16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_fetch_or_32(ptr, val) _InterlockedOr((long volatile*)(ptr), (long)(val))
-
-#ifdef _M_IX86
-  __int64 interlocked_fetch_or_64(__int64 volatile* ptr, __int64 val);
-  #define atomic_fetch_or_64(ptr, val) interlocked_fetch_or_64((__int64 volatile*)(ptr), (__int64)(val))
-#else
-  #define atomic_fetch_or_64(ptr, val) _InterlockedOr64((__int64 volatile*)(ptr), (__int64)(val))
-#endif
-
-#ifdef _WIN64
-  #define atomic_fetch_or_ptr atomic_fetch_or_64
-#else
-  #define atomic_fetch_or_ptr atomic_fetch_or_32
-#endif
-
-#ifndef _TD_GO_DLL_
-  char interlocked_xor_fetch_8(char volatile* ptr, char val);
-  short interlocked_xor_fetch_16(short volatile* ptr, short val);
-#endif
-long interlocked_xor_fetch_32(long volatile* ptr, long val);
-__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val);
-
-#ifndef _TD_GO_DLL_
-  #define atomic_xor_fetch_8(ptr, val) interlocked_xor_fetch_8((char volatile*)(ptr), (char)(val))
-  #define atomic_xor_fetch_16(ptr, val) interlocked_xor_fetch_16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_xor_fetch_32(ptr, val) interlocked_xor_fetch_32((long volatile*)(ptr), (long)(val))
-#define atomic_xor_fetch_64(ptr, val) interlocked_xor_fetch_64((__int64 volatile*)(ptr), (__int64)(val))
-#ifdef _WIN64
-  #define atomic_xor_fetch_ptr atomic_xor_fetch_64
-#else
-  #define atomic_xor_fetch_ptr atomic_xor_fetch_32
-#endif
-
-#ifndef _TD_GO_DLL_
-  #define atomic_fetch_xor_8(ptr, val) _InterlockedXor8((char volatile*)(ptr), (char)(val))
-  #define atomic_fetch_xor_16(ptr, val) _InterlockedXor16((short volatile*)(ptr), (short)(val))
-#endif
-#define atomic_fetch_xor_32(ptr, val) _InterlockedXor((long volatile*)(ptr), (long)(val))
-
-#ifdef _M_IX86
-  __int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val);
-  #define atomic_fetch_xor_64(ptr, val) interlocked_fetch_xor_64((__int64 volatile*)(ptr), (__int64)(val))
-#else
-  #define atomic_fetch_xor_64(ptr, val) _InterlockedXor64((__int64 volatile*)(ptr), (__int64)(val))
-#endif
-
-#ifdef _WIN64
-  #define atomic_fetch_xor_ptr atomic_fetch_xor_64
-#else
-  #define atomic_fetch_xor_ptr atomic_fetch_xor_32
-#endif
-
-#define SWAP(a, b, c)      \
-  do {                     \
-    c __tmp = (c)(a);      \
-    (a) = (c)(b);          \
-    (b) = __tmp;           \
-  } while (0)
-
-#define MAX(a,b)  (((a)>(b))?(a):(b))
-#define MIN(a,b)  (((a)<(b))?(a):(b))
-
-#ifdef _TD_GO_DLL_
-  #define MILLISECOND_PER_SECOND (1000LL)
-#else
-  #define MILLISECOND_PER_SECOND (1000i64)
-#endif
-
-#define tsem_t sem_t
-#define tsem_init sem_init
-#define tsem_wait sem_wait
-#define tsem_post sem_post
-#define tsem_destroy sem_destroy
-
-int getline(char **lineptr, size_t *n, FILE *stream);
-
-int taosWinSetTimer(int ms, void(*callback)(int));
-
-int gettimeofday(struct timeval *tv, struct timezone *tz);
-
-struct tm *localtime_r(const time_t *timep, struct tm *result);
-
-char *strptime(const char *buf, const char *fmt, struct tm *tm);
-
-bool taosCheckPthreadValid(pthread_t thread);
-
-void taosResetPthread(pthread_t *thread);
-
-int64_t taosGetPthreadId();
-
-int taosSetNonblocking(int sock, int on);
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen);
-
-char *taosCharsetReplace(char *charsetstr);
-
-void tsPrintOsInfo();
-
-void taosGetSystemInfo();
-
-void taosKillSystem();
-
-int32_t BUILDIN_CLZL(uint64_t val);
-int32_t BUILDIN_CLZ(uint32_t val);
-int32_t BUILDIN_CTZL(uint64_t val);
-int32_t BUILDIN_CTZ(uint32_t val);
-
-//for signal, not dispose
-#define SIGALRM 1234
-typedef int sigset_t;
-
-struct sigaction {
-  void (*sa_handler)(int);
-};
-
-typedef struct {
-  int we_wordc;
-  char **we_wordv;
-  int we_offs;
-  char wordPos[20];
-} wordexp_t;
-
-int wordexp(const char *words, wordexp_t *pwordexp, int flags);
-
-void wordfree(wordexp_t *pwordexp);
-
-int flock(int fd, int option);
-
-int fsync(int filedes);
-
-char *getpass(const char *prefix);
-
-char *strsep(char **stringp, const char *delim);
-
-typedef int(*__compar_fn_t)(const void *, const void *);
-
-int sigaction(int, struct sigaction *, void *);
-
-void sleep(int mseconds);
-
-bool taosSkipSocketCheck();
-
-int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count);
-
-#define ssize_t int
-
-#define strdup _strdup
-
-char *strndup(const char *s, size_t n);
-
-void taosSetCoreDump();
-
-#ifdef __cplusplus
-}
-#endif
-#endif
\ No newline at end of file
diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c
deleted file mode 100644
index 30973165dfd03f6179f4fc36a83c4b4a32ed3e55..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twindows.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include <locale.h>
-
-#include "os.h"
-#include "tlog.h"
-#include "tsdb.h"
-#include "tglobalcfg.h"
-
-#include <intrin.h>
-#include <winbase.h>
-#include <Winsock2.h>
-
-char configDir[TSDB_FILENAME_LEN] = "C:/TDengine/cfg";
-char tsDirectory[TSDB_FILENAME_LEN] = "C:/TDengine/data";
-char logDir[TSDB_FILENAME_LEN] = "C:/TDengine/log";
-char dataDir[TSDB_FILENAME_LEN] = "C:/TDengine/data";
-char scriptDir[TSDB_FILENAME_LEN] = "C:/TDengine/script";
-char osName[] = "Windows";
-
-bool taosCheckPthreadValid(pthread_t thread) {
-  return thread.p != NULL;
-}
-
-void taosResetPthread(pthread_t *thread) {
-  thread->p = 0;
-}
-
-int64_t taosGetPthreadId() {
-#ifdef PTW32_VERSION
-  return pthread_getw32threadid_np(pthread_self());
-#else
-  return (int64_t)pthread_self();
-#endif
-}
-
-int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) {
-  if (level == SOL_SOCKET && optname == TCP_KEEPCNT) {
-    return 0;
-  }
-
-  if (level == SOL_TCP && optname == TCP_KEEPIDLE) {
-    return 0;
-  }
-
-  if (level == SOL_TCP && optname == TCP_KEEPINTVL) {
-    return 0;
-  }
-
-  return setsockopt(socketfd, level, optname, optval, optlen);
-}
-
-// add
-char interlocked_add_fetch_8(char volatile* ptr, char val) {
-  #ifdef _TD_GO_DLL_
-    return __sync_fetch_and_add(ptr, val) + val;
-  #else
-    return _InterlockedExchangeAdd8(ptr, val) + val;
-  #endif
-}
-
-short interlocked_add_fetch_16(short volatile* ptr, short val) {
-  #ifdef _TD_GO_DLL_
-    return __sync_fetch_and_add(ptr, val) + val;
-  #else
-    return _InterlockedExchangeAdd16(ptr, val) + val;
-  #endif
-}
-
-long interlocked_add_fetch_32(long volatile* ptr, long val) {
-  return _InterlockedExchangeAdd(ptr, val) + val;
-}
-
-__int64 interlocked_add_fetch_64(__int64 volatile* ptr, __int64 val) {
-  return _InterlockedExchangeAdd64(ptr, val) + val;
-}
-
-// and
-#ifndef _TD_GO_DLL_
-char interlocked_and_fetch_8(char volatile* ptr, char val) {
-  return _InterlockedAnd8(ptr, val) & val;
-}
-
-short interlocked_and_fetch_16(short volatile* ptr, short val) {
-  return _InterlockedAnd16(ptr, val) & val;
-}
-#endif
-
-long interlocked_and_fetch_32(long volatile* ptr, long val) {
-  return _InterlockedAnd(ptr, val) & val;
-}
-
-#ifndef _M_IX86
-
-__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val) {
-  return _InterlockedAnd64(ptr, val) & val;
-}
-
-#else
-
-__int64 interlocked_and_fetch_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old, res;
-  do {
-    old = *ptr;
-    res = old & val;
-  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
-  return res;
-}
-
-__int64 interlocked_fetch_and_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old;
-  do {
-    old = *ptr;
-  } while(_InterlockedCompareExchange64(ptr, old & val, old) != old);
-  return old;
-}
-
-#endif
-
-// or
-#ifndef _TD_GO_DLL_
-char interlocked_or_fetch_8(char volatile* ptr, char val) {
-  return _InterlockedOr8(ptr, val) | val;
-}
-
-short interlocked_or_fetch_16(short volatile* ptr, short val) {
-  return _InterlockedOr16(ptr, val) | val;
-}
-#endif
-long interlocked_or_fetch_32(long volatile* ptr, long val) {
-  return _InterlockedOr(ptr, val) | val;
-}
-
-#ifndef _M_IX86
-
-__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val) {
-  return _InterlockedOr64(ptr, val) & val;
-}
-
-#else
-
-__int64 interlocked_or_fetch_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old, res;
-  do {
-    old = *ptr;
-    res = old | val;
-  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
-  return res;
-}
-
-__int64 interlocked_fetch_or_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old;
-  do {
-    old = *ptr;
-  } while(_InterlockedCompareExchange64(ptr, old | val, old) != old);
-  return old;
-}
-
-#endif
-
-// xor
-#ifndef _TD_GO_DLL_
-char interlocked_xor_fetch_8(char volatile* ptr, char val) {
-  return _InterlockedXor8(ptr, val) ^ val;
-}
-
-short interlocked_xor_fetch_16(short volatile* ptr, short val) {
-  return _InterlockedXor16(ptr, val) ^ val;
-}
-#endif
-long interlocked_xor_fetch_32(long volatile* ptr, long val) {
-  return _InterlockedXor(ptr, val) ^ val;
-}
-
-#ifndef _M_IX86
-
-__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val) {
-  return _InterlockedXor64(ptr, val) ^ val;
-}
-
-#else
-
-__int64 interlocked_xor_fetch_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old, res;
-  do {
-    old = *ptr;
-    res = old ^ val;
-  } while(_InterlockedCompareExchange64(ptr, res, old) != old);
-  return res;
-}
-
-__int64 interlocked_fetch_xor_64(__int64 volatile* ptr, __int64 val) {
-  __int64 old;
-  do {
-    old = *ptr;
-  } while(_InterlockedCompareExchange64(ptr, old ^ val, old) != old);
-  return old;
-}
-
-#endif
-
-void tsPrintOsInfo() {}
-
-void taosGetSystemTimezone() {
-  // get and set default timezone
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  if (cfg_timezone && cfg_timezone->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    char *tz = getenv("TZ");
-    if (tz == NULL || strlen(tz) == 0) {
-      strcpy(tsTimezone, "not configured");
-    }
-    else {
-      strcpy(tsTimezone, tz);
-    }
-    cfg_timezone->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-    pPrint("timezone not configured, use default");
-  }
-}
-
-void taosGetSystemLocale() {
-  // get and set default locale
-  SGlobalConfig *cfg_locale = tsGetConfigOption("locale");
-  if (cfg_locale && cfg_locale->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    char *locale = setlocale(LC_CTYPE, "chs");
-    if (locale != NULL) {
-      strncpy(tsLocale, locale, sizeof(tsLocale) / sizeof(tsLocale[0]));
-      cfg_locale->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-      pPrint("locale not configured, set to default:%s", tsLocale);
-    }
-  }
-
-  SGlobalConfig *cfg_charset = tsGetConfigOption("charset");
-  if (cfg_charset && cfg_charset->cfgStatus < TSDB_CFG_CSTATUS_DEFAULT) {
-    strcpy(tsCharset, "cp936");
-    cfg_charset->cfgStatus = TSDB_CFG_CSTATUS_DEFAULT;
-    pPrint("charset not configured, set to default:%s", tsCharset);
-  }
-}
-
-void taosGetSystemInfo() {
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
-}
-
-void taosKillSystem() {
-  exit(0);
-}
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no moretokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *strsep(char **stringp, const char *delim) {
-  char *s;
-  const char *spanp;
-  int c, sc;
-  char *tok;
-  if ((s = *stringp) == NULL)
-    return (NULL);
-  for (tok = s;;) {
-    c = *s++;
-    spanp = delim;
-    do {
-      if ((sc = *spanp++) == c) {
-        if (c == 0)
-          s = NULL;
-        else
-          s[-1] = 0;
-        *stringp = s;
-        return (tok);
-      }
-    } while (sc != 0);
-  }
-  /* NOTREACHED */
-}
-
-char *getpass(const char *prefix) {
-  static char passwd[TSDB_KEY_LEN] = {0};
-
-  printf("%s", prefix);
-  scanf("%s", passwd);
-
-  char n = getchar();
-  return passwd;
-}
-
-int flock(int fd, int option) {
-  return 0;
-}
-
-int fsync(int filedes) {
-  return 0;
-}
-
-int sigaction(int sig, struct sigaction *d, void *p) {
-  return 0;
-}
-
-int wordexp(const char *words, wordexp_t *pwordexp, int flags) {
-  pwordexp->we_offs = 0;
-  pwordexp->we_wordc = 1;
-  pwordexp->we_wordv = (char **)(pwordexp->wordPos);
-  pwordexp->we_wordv[0] = (char *)words;
-  return 0;
-}
-
-void wordfree(wordexp_t *pwordexp) {}
-
-void taosGetDisk() {}
-
-bool taosSkipSocketCheck() {
-  return false;
-}
-
-#define _SEND_FILE_STEP_ 1000
-
-int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
-  fseek(in_file, (int32_t)(*offset), 0);
-  int writeLen = 0;
-  uint8_t buffer[_SEND_FILE_STEP_] = { 0 };
-  
-  for (int len = 0; len < (count - _SEND_FILE_STEP_); len += _SEND_FILE_STEP_) {
-    size_t rlen = fread(buffer, 1, _SEND_FILE_STEP_, in_file);
-    if (rlen <= 0) {
-      return writeLen;
-    }
-    else if (rlen < _SEND_FILE_STEP_) {
-      fwrite(buffer, 1, rlen, out_file);
-      return (int)(writeLen + rlen);
-    }
-    else {
-      fwrite(buffer, 1, _SEND_FILE_STEP_, in_file);
-      writeLen += _SEND_FILE_STEP_;
-    }
-  }
-
-  int remain = count - writeLen;
-  if (remain > 0) {
-    size_t rlen = fread(buffer, 1, remain, in_file);
-    if (rlen <= 0) {
-      return writeLen;
-    }
-    else {
-      fwrite(buffer, 1, remain, out_file);
-      writeLen += remain;
-    }
-  }
-
-  return writeLen;
-}
-
-int32_t BUILDIN_CLZL(uint64_t val) {
-  unsigned long r = 0;
-  _BitScanReverse64(&r, val);
-  return (int)(r >> 3);
-}
-
-int32_t BUILDIN_CLZ(uint32_t val) {
-  unsigned long r = 0;
-  _BitScanReverse(&r, val);
-  return (int)(r >> 3);
-}
-
-int32_t BUILDIN_CTZL(uint64_t val) {
-  unsigned long r = 0;
-  _BitScanForward64(&r, val);
-  return (int)(r >> 3);
-}
-
-int32_t BUILDIN_CTZ(uint32_t val) {
-  unsigned long r = 0;
-  _BitScanForward(&r, val);
-  return (int)(r >> 3);
-}
-
-char *strndup(const char *s, size_t n) {
-  int len = strlen(s);
-  if (len >= n) {
-    len = n;
-  }
-
-  char *r = calloc(len + 1, 1);
-  memcpy(r, s, len);
-  r[len] = 0;
-  return r;
-}
-
-void taosSetCoreDump() {}
-
-#ifdef _TD_GO_DLL_
-int64_t str2int64(char *str) {
-  char *endptr = NULL;
-  return strtoll(str, &endptr, 10);
-}
-
-uint64_t htonll(uint64_t val)
-{
-    return (((uint64_t) htonl(val)) << 32) + htonl(val >> 32);
-}
-#endif
\ No newline at end of file
diff --git a/src/os/windows/src/twingetline.c b/src/os/windows/src/twingetline.c
deleted file mode 100644
index 1dd56fd54781d709255637764e2779d7f039c984..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twingetline.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* getline.c -- Replacement for GNU C library function getline
-
-Copyright (C) 1993 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-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.  See the GNU
-General Public License for more details.  */
-
-/* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-
-#if STDC_HEADERS
-#include <stdlib.h>
-#else
-char *malloc(), *realloc();
-#endif
-
-/* Always add at least this many bytes when extending the buffer.  */
-#define MIN_CHUNK 64
-
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-+ OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
-malloc (or NULL), pointing to *N characters of space.  It is realloc'd
-as necessary.  Return the number of characters read (not including the
-null terminator), or -1 on error or EOF.  On a -1 return, the caller
-should check feof(), if not then errno has been set to indicate
-the error.  */
-
-int
-getstr(lineptr, n, stream, terminator, offset)
-char **lineptr;
-size_t *n;
-FILE *stream;
-char terminator;
-int offset;
-{
-    int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
-    char *read_pos;		/* Where we're reading into *LINEPTR. */
-    int ret;
-
-    if (!lineptr || !n || !stream)
-    {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (!*lineptr)
-    {
-        *n = MIN_CHUNK;
-        *lineptr = malloc(*n);
-        if (!*lineptr)
-        {
-            errno = ENOMEM;
-            return -1;
-        }
-    }
-
-    nchars_avail = (int)(*n - offset);
-    read_pos = *lineptr + offset;
-
-    for (;;)
-    {
-        int save_errno;
-        register int c = getc(stream);
-
-        save_errno = errno;
-
-        /* We always want at least one char left in the buffer, since we
-        always (unless we get an error while reading the first char)
-        NUL-terminate the line buffer.  */
-
-        assert((*lineptr + *n) == (read_pos + nchars_avail));
-        if (nchars_avail < 2)
-        {
-            if (*n > MIN_CHUNK)
-                *n *= 2;
-            else
-                *n += MIN_CHUNK;
-
-            nchars_avail = (int)(*n + *lineptr - read_pos);
-            *lineptr = realloc(*lineptr, *n);
-            if (!*lineptr)
-            {
-                errno = ENOMEM;
-                return -1;
-            }
-            read_pos = *n - nchars_avail + *lineptr;
-            assert((*lineptr + *n) == (read_pos + nchars_avail));
-        }
-
-        if (ferror(stream))
-        {
-            /* Might like to return partial line, but there is no
-            place for us to store errno.  And we don't want to just
-            lose errno.  */
-            errno = save_errno;
-            return -1;
-        }
-
-        if (c == EOF)
-        {
-            /* Return partial line, if any.  */
-            if (read_pos == *lineptr)
-                return -1;
-            else
-                break;
-        }
-
-        *read_pos++ = c;
-        nchars_avail--;
-
-        if (c == terminator)
-            /* Return the line.  */
-            break;
-    }
-
-    /* Done - NUL terminate and return the number of chars read.  */
-    *read_pos = '\0';
-
-    ret = (int)(read_pos - (*lineptr + offset));
-    return ret;
-}
-
-int
-getline(lineptr, n, stream)
-char **lineptr;
-size_t *n;
-FILE *stream;
-{
-    return getstr(lineptr, n, stream, '\n', 0);
-}
\ No newline at end of file
diff --git a/src/os/windows/src/twinmsghdr.c b/src/os/windows/src/twinmsghdr.c
deleted file mode 100644
index 9f35d3ec62eb9b54c26226c584143f3ed774e5a5..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twinmsghdr.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 <winsock2.h>
-
-void taosFreeMsgHdr(void *hdr) {
-    WSAMSG *msgHdr = (WSAMSG *)hdr;
-    free(msgHdr->lpBuffers);
-}
-
-int taosMsgHdrSize(void *hdr) {
-    WSAMSG *msgHdr = (WSAMSG *)hdr;
-    return msgHdr->dwBufferCount;
-}
-
-void taosSendMsgHdr(void *hdr, int fd) {
-    WSAMSG *msgHdr = (WSAMSG *)hdr;
-    DWORD len;
-
-    WSASendMsg(fd, msgHdr, 0, &len, 0, 0);
-    msgHdr->dwBufferCount = 0;
-}
-
-void taosInitMsgHdr(void **hdr, void *dest, int maxPkts) {
-    WSAMSG *msgHdr = (WSAMSG *)malloc(sizeof(WSAMSG));
-    memset(msgHdr, 0, sizeof(WSAMSG));
-    *hdr = msgHdr;
-
-    // see ws2def.h
-    // the size of LPSOCKADDR and sockaddr_in * is same, so it's safe
-    msgHdr->name = (LPSOCKADDR)dest;
-    msgHdr->namelen = sizeof(struct sockaddr_in);
-    int size = sizeof(WSABUF) * maxPkts;
-    msgHdr->lpBuffers = (LPWSABUF)malloc(size);
-    memset(msgHdr->lpBuffers, 0, size);
-    msgHdr->dwBufferCount = 0;
-}
-
-void taosSetMsgHdrData(void *hdr, char *data, int dataLen) {
-    WSAMSG *msgHdr = (WSAMSG *)hdr;
-    msgHdr->lpBuffers[msgHdr->dwBufferCount].buf = data;
-    msgHdr->lpBuffers[msgHdr->dwBufferCount].len = dataLen;
-    msgHdr->dwBufferCount++;
-}
-
diff --git a/src/os/windows/src/twinsocket.c b/src/os/windows/src/twinsocket.c
deleted file mode 100644
index 0690a4ceb11c697271ecf8f6e28fef8dd39c5eee..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twinsocket.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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 <WS2tcpip.h>  
-#include <IPHlpApi.h>  
-#include <winsock2.h>  
-#include <stdio.h>
-#include <string.h>
-#include <ws2def.h>
-#include <tchar.h>
-
-void taosWinSocketInit() {
-    static char flag = 0;
-    if (flag == 0) {
-        WORD wVersionRequested;
-        WSADATA wsaData;
-        wVersionRequested = MAKEWORD(1, 1);
-        if (WSAStartup(wVersionRequested, &wsaData) == 0) {
-            flag = 1;
-        }
-    }
-}
-
-int taosSetNonblocking(SOCKET sock, int on) {
-    u_long mode;
-    if (on) {
-        mode = 1;
-        ioctlsocket(sock, FIONBIO, &mode);
-    }
-    else {
-        mode = 0;
-        ioctlsocket(sock, FIONBIO, &mode);
-    }
-    return 0;
-}
-
-int taosGetPrivateIp(char *const ip) {
-    PIP_ADAPTER_ADDRESSES pAddresses = 0;
-    IP_ADAPTER_DNS_SERVER_ADDRESS *pDnServer = 0;
-    ULONG outBufLen = 0;
-    DWORD dwRetVal = 0;
-    char buff[100];
-    DWORD bufflen = 100;
-    int i;
-    int flag = -1;
-
-    taosWinSocketInit();
-    GetAdaptersAddresses(AF_UNSPEC, 0, NULL, pAddresses, &outBufLen);
-    pAddresses = (IP_ADAPTER_ADDRESSES *)malloc(outBufLen);
-    if ((dwRetVal = GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_ANYCAST, NULL, pAddresses, &outBufLen)) == NO_ERROR) {
-        while (pAddresses) {
-            if (wcsstr(pAddresses->FriendlyName, L"Loopback") != 0) {
-                pAddresses = pAddresses->Next;
-                continue;
-            }
-            if (pAddresses->OperStatus == IfOperStatusUp) {
-                //printf("%s, Status: active\n", pAddresses->FriendlyName);
-            }
-            else {
-                //printf("%s, Status: deactive\n", pAddresses->FriendlyName);
-                pAddresses = pAddresses->Next;
-                continue;
-            }
-
-            PIP_ADAPTER_UNICAST_ADDRESS pUnicast = pAddresses->FirstUnicastAddress;
-            for (i = 0; pUnicast != NULL; i++) {
-                if (pUnicast->Address.lpSockaddr->sa_family == AF_INET) {
-                    struct sockaddr_in *sa_in = (struct sockaddr_in *)pUnicast->Address.lpSockaddr;
-                    strcpy(ip, inet_ntop(AF_INET, &(sa_in->sin_addr), buff, bufflen));
-                    flag = 0;
-                    //printf("%s\n", ip);
-                }
-                else if (pUnicast->Address.lpSockaddr->sa_family == AF_INET6) {
-                    struct sockaddr_in6 *sa_in6 = (struct sockaddr_in6 *)pUnicast->Address.lpSockaddr;
-                    strcpy(ip, inet_ntop(AF_INET6, &(sa_in6->sin6_addr), buff, bufflen));
-                    flag = 0;
-                    //printf("%s\n", ip);
-                }
-                else {
-                }
-                pUnicast = pUnicast->Next;
-            }
-            pAddresses = pAddresses->Next;
-        }
-    }
-    else {
-        LPVOID lpMsgBuf;
-        printf("Call to GetAdaptersAddresses failed.\n");
-        if (FormatMessage(
-          FORMAT_MESSAGE_ALLOCATE_BUFFER |
-          FORMAT_MESSAGE_FROM_SYSTEM |
-          FORMAT_MESSAGE_IGNORE_INSERTS,
-          NULL,
-          dwRetVal,
-          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-          (LPTSTR) & lpMsgBuf,
-          0,
-          NULL)) {
-            printf("\tError: %s", lpMsgBuf);
-        }
-        LocalFree(lpMsgBuf);
-    }
-    free(pAddresses);
-    return flag;
-}
diff --git a/src/os/windows/src/twintcpclient.c b/src/os/windows/src/twintcpclient.c
deleted file mode 100644
index 9f40dae434b0dba2c511cf9b837a53a8a8910250..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twintcpclient.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 "tlog.h"
-
-void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle) {
-  tError("InitTcpClient not support in windows");
-  return 0;
-}
-
-void taosCloseTcpClientConnection(void *chandle) {
-  tError("CloseTcpClientConnection not support in windows");
-}
-
-void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port) {
-  tError("OpenTcpClientConnection not support in windows");
-  return 0;
-}
-
-int taosSendTcpClientData(unsigned int ip, uint16_t port, char *data, int len, void *chandle) {
-  tError("SendTcpClientData not support in windows");
-  return 0;
-}
-
-void taosCleanUpTcpClient(void *chandle) {
-  tError("SendTcpClientData not support in windows");
-}
diff --git a/src/os/windows/src/twintcpserver.c b/src/os/windows/src/twintcpserver.c
deleted file mode 100644
index d5e25693d0b591eddf0a5da2469e86972bb5be00..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twintcpserver.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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 "tlog.h"
-
-void taosCloseTcpServerConnection(void *chandle) {
-  tError("CloseTcpServerConnection not support in windows");
-}
-
-void taosCleanUpTcpServer(void *handle) {
-  tError("CleanUpTcpServer not support in windows");
-}
-
-void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) {
-  tError("InitTcpServer not support in windows");
-  return 0;
-}
-
-int taosSendTcpServerData(unsigned int ip, uint16_t port, char *data, int len, void *chandle) {
-  tError("SendTcpServerData not support in windows");
-  return 0;
-}
diff --git a/src/os/windows/src/twintimer.c b/src/os/windows/src/twintimer.c
deleted file mode 100644
index 68899bea51e936678abfbe6004e8fdb2713ce11a..0000000000000000000000000000000000000000
--- a/src/os/windows/src/twintimer.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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 <Windows.h>
-#include <Mmsystem.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#pragma warning( disable : 4244 )
-
-typedef void (*win_timer_f)(int signo);
-
-void WINAPI taosWinOnTimer(UINT wTimerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dwl, DWORD_PTR dw2)
-{
-  win_timer_f callback = *((win_timer_f *)&dwUser);
-  if (callback != NULL) {
-    callback(0);
-  }
-}
-
-int taosInitTimer(win_timer_f callback, int ms) {
-  MMRESULT timerId;
-  DWORD_PTR param = *((int64_t *) & callback);
-
-  timerId = timeSetEvent(ms, 1, (LPTIMECALLBACK)taosWinOnTimer, param, TIME_PERIODIC);
-  if (timerId == 0) {
-    return -1;
-  }
-  return 0;
-}
-
-void taosMsleep(int mseconds) {
-  Sleep(mseconds);
-}
-
-void sleep(int mseconds) {
-  taosMsleep(mseconds);
-}
\ No newline at end of file
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..742235894a8781e4dcfa09cb86985c73df74d046
--- /dev/null
+++ b/src/plugins/CMakeLists.txt
@@ -0,0 +1,8 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+ADD_SUBDIRECTORY(monitor)
+ADD_SUBDIRECTORY(http)
+IF (TD_MQTT)
+  ADD_SUBDIRECTORY(mqtt)
+ENDIF ()
\ No newline at end of file
diff --git a/src/plugins/http/CMakeLists.txt b/src/plugins/http/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5d8b52986a6bb1cc451dac10cd92c8c37a352c4b
--- /dev/null
+++ b/src/plugins/http/CMakeLists.txt
@@ -0,0 +1,25 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/lz4/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+  
+IF (TD_LINUX)
+  ADD_LIBRARY(http ${SRC})
+  TARGET_LINK_LIBRARIES(http z)
+
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(http taos_static)
+  ELSE ()  
+    TARGET_LINK_LIBRARIES(http taos)
+  ENDIF ()
+
+  IF (TD_ADMIN)
+    TARGET_LINK_LIBRARIES(http admin)
+  ENDIF ()
+ENDIF ()
diff --git a/src/plugins/http/inc/httpAuth.h b/src/plugins/http/inc/httpAuth.h
new file mode 100644
index 0000000000000000000000000000000000000000..2ce9725d4bb57c9d24e3eddffb54707b0129b1cf
--- /dev/null
+++ b/src/plugins/http/inc/httpAuth.h
@@ -0,0 +1,23 @@
+/*
+ * 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_HTTP_TOKEN_H
+#define TDENGINE_HTTP_TOKEN_H
+
+int32_t httpParseBasicAuthToken(HttpContext *pContext, char *token, int32_t len);
+int32_t httpParseTaosdAuthToken(HttpContext *pContext, char *token, int32_t len);
+int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpContext.h b/src/plugins/http/inc/httpContext.h
new file mode 100644
index 0000000000000000000000000000000000000000..260858c5cc22aa10dc49a61743879d768907c8fe
--- /dev/null
+++ b/src/plugins/http/inc/httpContext.h
@@ -0,0 +1,34 @@
+/*
+ * 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_HTTP_CONTEXT_H
+#define TDENGINE_HTTP_CONTEXT_H
+
+#include "httpInt.h"
+
+bool        httpInitContexts();
+void        httpCleanupContexts();
+const char *httpContextStateStr(HttpContextState state);
+
+HttpContext *httpCreateContext(int32_t fd);
+bool         httpInitContext(HttpContext *pContext);
+HttpContext *httpGetContext(void * pContext);
+void         httpReleaseContext(HttpContext *pContext, bool clearRes);
+void         httpCloseContextByServer(HttpContext *pContext);
+void         httpCloseContextByApp(HttpContext *pContext);
+void         httpNotifyContextClose(HttpContext *pContext);
+bool         httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState);
+
+#endif
diff --git a/src/plugins/http/inc/httpGcHandle.h b/src/plugins/http/inc/httpGcHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..a3688c6c386e5d73c5084a54ad887ba305e425ea
--- /dev/null
+++ b/src/plugins/http/inc/httpGcHandle.h
@@ -0,0 +1,33 @@
+/*
+ * 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_GC_HANDLE_H
+#define TDENGINE_GC_HANDLE_H
+
+#include "http.h"
+#include "httpInt.h"
+#include "httpUtil.h"
+#include "httpResp.h"
+#include "httpSql.h"
+
+#define GC_ROOT_URL_POS   0
+#define GC_ACTION_URL_POS 1
+#define GC_USER_URL_POS   2
+#define GC_PASS_URL_POS   3
+
+void gcInitHandle(HttpServer* pServer);
+bool gcProcessRequest(struct HttpContext* pContext);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpGcJson.h b/src/plugins/http/inc/httpGcJson.h
new file mode 100644
index 0000000000000000000000000000000000000000..0ba860687dfe370d5b418a7c6d7aa28d128d7a5d
--- /dev/null
+++ b/src/plugins/http/inc/httpGcJson.h
@@ -0,0 +1,31 @@
+/*
+ * 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_GC_JSON_H
+#define TDENGINE_GC_JSON_H
+#include "httpHandle.h"
+#include "httpJson.h"
+#include "taos.h"
+
+void gcInitQueryJson(HttpContext *pContext);
+void gcCleanQueryJson(HttpContext *pContext);
+
+void gcStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
+void gcStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd);
+bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows);
+
+void gcSendHeartBeatResp(HttpContext *pContext, HttpSqlCmd *cmd);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpGzip.h b/src/plugins/http/inc/httpGzip.h
new file mode 100644
index 0000000000000000000000000000000000000000..aeac79c9759078efb64669037c54122b2900d132
--- /dev/null
+++ b/src/plugins/http/inc/httpGzip.h
@@ -0,0 +1,43 @@
+/*
+ * 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 HTTP_GZIP_H
+#define HTTP_GZIP_H
+
+#define EHTTP_GZIP_CHUNK_SIZE_DEFAULT      (1024*16)
+
+typedef struct ehttp_gzip_s              ehttp_gzip_t;
+
+typedef struct ehttp_gzip_callbacks_s    ehttp_gzip_callbacks_t;
+typedef struct ehttp_gzip_conf_s         ehttp_gzip_conf_t;
+
+struct ehttp_gzip_callbacks_s {
+  void (*on_data)(ehttp_gzip_t *gzip, void *arg, const char *buf, int32_t len);
+};
+
+struct ehttp_gzip_conf_s {
+  int32_t     get_header:2; // 0: not fetching header info
+  int32_t     chunk_size;   // 0: fallback to default: EHTTP_GZIP_CHUNK_SIZE_DEFAULT
+};
+
+ehttp_gzip_t* ehttp_gzip_create_decompressor(ehttp_gzip_conf_t conf, ehttp_gzip_callbacks_t callbacks, void *arg);
+ehttp_gzip_t* ehttp_gzip_create_compressor(ehttp_gzip_conf_t conf, ehttp_gzip_callbacks_t callbacks, void *arg);
+void          ehttp_gzip_destroy(ehttp_gzip_t *gzip);
+
+int32_t       ehttp_gzip_write(ehttp_gzip_t *gzip, const char *buf, int32_t len);
+int32_t       ehttp_gzip_finish(ehttp_gzip_t *gzip);
+
+#endif // _ehttp_gzip_h_9196791b_ac2a_4d73_9979_f4b41abbc4c0_
+
diff --git a/src/plugins/http/inc/httpHandle.h b/src/plugins/http/inc/httpHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..3e6356d8053e5b953235a8134ee607c34789edbb
--- /dev/null
+++ b/src/plugins/http/inc/httpHandle.h
@@ -0,0 +1,23 @@
+/*
+ * 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_HTTP_HANDLE_H
+#define TDENGINE_HTTP_HANDLE_H
+
+// http request handler
+void httpProcessRequest(HttpContext *pContext);
+bool httpProcessData(HttpContext *pContext);
+
+#endif
diff --git a/src/plugins/http/inc/httpInt.h b/src/plugins/http/inc/httpInt.h
new file mode 100644
index 0000000000000000000000000000000000000000..36a022159f4e8b58ca4179e9ae73d5ad7dd793d2
--- /dev/null
+++ b/src/plugins/http/inc/httpInt.h
@@ -0,0 +1,198 @@
+/*
+ * 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_HTTP_INT_H
+#define TDENGINE_HTTP_INT_H
+
+#include <stdbool.h>
+#include "pthread.h"
+#include "semaphore.h"
+#include "tmempool.h"
+#include "taosdef.h"
+#include "tutil.h"
+#include "zlib.h"
+#include "http.h"
+#include "httpLog.h"
+#include "httpJson.h"
+#include "httpParser.h"
+
+#define HTTP_MAX_CMD_SIZE           1024
+#define HTTP_MAX_BUFFER_SIZE        1024*1024*8
+#define HTTP_LABEL_SIZE             8
+#define HTTP_MAX_EVENTS             10
+#define HTTP_BUFFER_INIT            4096
+#define HTTP_BUFFER_SIZE            8388608
+#define HTTP_STEP_SIZE              4096    //http message get process step by step
+#define HTTP_METHOD_SCANNER_SIZE    7       //http method fp size
+#define HTTP_GC_TARGET_SIZE         512
+#define HTTP_WRITE_RETRY_TIMES      500
+#define HTTP_WRITE_WAIT_TIME_MS     5
+#define HTTP_SESSION_ID_LEN         (TSDB_USER_LEN + TSDB_PASSWORD_LEN)
+
+typedef enum HttpReqType {
+  HTTP_REQTYPE_OTHERS = 0,
+  HTTP_REQTYPE_LOGIN = 1,
+  HTTP_REQTYPE_HEARTBEAT = 2,
+  HTTP_REQTYPE_SINGLE_SQL = 3,
+  HTTP_REQTYPE_MULTI_SQL = 4
+} HttpReqType;
+
+typedef enum {
+  HTTP_SERVER_INIT,
+  HTTP_SERVER_RUNNING,
+  HTTP_SERVER_CLOSING,
+  HTTP_SERVER_CLOSED
+} HttpServerStatus;
+
+typedef enum {
+  HTTP_CONTEXT_STATE_READY,
+  HTTP_CONTEXT_STATE_HANDLING,
+  HTTP_CONTEXT_STATE_DROPPING,
+  HTTP_CONTEXT_STATE_CLOSED
+} HttpContextState;
+
+typedef enum {
+  HTTP_CMD_TYPE_UN_SPECIFIED,
+  HTTP_CMD_TYPE_CREATE_DB,
+  HTTP_CMD_TYPE_CREATE_STBALE,
+  HTTP_CMD_TYPE_INSERT
+} HttpSqlCmdType;
+
+typedef enum { HTTP_CMD_STATE_NOT_RUN_YET, HTTP_CMD_STATE_RUN_FINISHED } HttpSqlCmdState;
+
+typedef enum { HTTP_CMD_RETURN_TYPE_WITH_RETURN, HTTP_CMD_RETURN_TYPE_NO_RETURN } HttpSqlCmdReturnType;
+
+struct HttpContext;
+struct HttpThread;
+
+typedef struct {
+  char    id[HTTP_SESSION_ID_LEN];
+  int32_t refCount;
+  void *  taos;
+} HttpSession;
+
+typedef struct {
+  // used by single cmd
+  char   *nativSql;
+  int32_t numOfRows;
+  int32_t code;
+
+  // these are the locations in the buffer
+  int32_t tagNames[TSDB_MAX_TAGS];
+  int32_t tagValues[TSDB_MAX_TAGS];
+  int32_t timestamp;
+  int32_t metric;
+  int32_t stable;
+  int32_t table;
+  int32_t values;
+  int32_t sql;
+
+  // used by multi-cmd
+  int8_t cmdType;
+  int8_t cmdReturnType;
+  int8_t cmdState;
+  int8_t tagNum;
+} HttpSqlCmd;
+
+typedef struct {
+  HttpSqlCmd *cmds;
+  int16_t     pos;
+  int16_t     size;
+  int16_t     maxSize;
+  int32_t     bufferPos;
+  int32_t     bufferSize;
+  char *      buffer;
+} HttpSqlCmds;
+
+typedef struct {
+  char *module;
+  bool (*decodeFp)(struct HttpContext *pContext);
+} HttpDecodeMethod;
+
+typedef struct {
+  void (*startJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, void *result);
+  void (*stopJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd);
+  bool (*buildQueryJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, void *result, int numOfRows);
+  void (*buildAffectRowJsonFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int affectRows);
+  void (*initJsonFp)(struct HttpContext *pContext);
+  void (*cleanJsonFp)(struct HttpContext *pContext);
+  bool (*checkFinishedFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
+  void (*setNextCmdFp)(struct HttpContext *pContext, HttpSqlCmd *cmd, int code);
+} HttpEncodeMethod;
+
+typedef enum {
+  EHTTP_CONTEXT_PROCESS_FAILED = 0x01,
+  EHTTP_CONTEXT_PARSER_FAILED  = 0x02
+} EHTTP_CONTEXT_FAILED_CAUSE;
+
+typedef struct HttpContext {
+  int32_t      refCount;
+  int32_t      fd;
+  uint32_t     accessTimes;
+  uint32_t     lastAccessTime;
+  int32_t      state;
+  uint8_t      reqType;
+  uint8_t      parsed;
+  char         ipstr[22];
+  char         user[TSDB_USER_LEN];  // parsed from auth token or login message
+  char         pass[TSDB_PASSWORD_LEN];
+  void *       taos;
+  void *       ppContext;
+  HttpSession *session;
+  z_stream     gzipStream;
+  HttpParser  *parser;
+  HttpSqlCmd   singleCmd;
+  HttpSqlCmds *multiCmds;
+  JsonBuf *    jsonBuf;
+  HttpEncodeMethod *encodeMethod;
+  HttpDecodeMethod *decodeMethod;
+  struct HttpThread *pThread;
+} HttpContext;
+
+typedef struct HttpThread {
+  pthread_t       thread;
+  HttpContext *   pHead;
+  pthread_mutex_t threadMutex;
+  bool            stop;
+  int32_t         pollFd;
+  int32_t         numOfContexts;
+  int32_t         threadId;
+  char            label[HTTP_LABEL_SIZE];
+  bool (*processData)(HttpContext *pContext);
+} HttpThread;
+
+typedef struct HttpServer {
+  char              label[HTTP_LABEL_SIZE];
+  uint32_t          serverIp;
+  uint16_t          serverPort;
+  int32_t           fd;
+  int32_t           numOfThreads;
+  int32_t           methodScannerLen;
+  int32_t           requestNum;
+  int32_t           status;
+  pthread_t         thread;
+  HttpThread *      pThreads;
+  void *            contextCache;
+  void *            sessionCache;
+  pthread_mutex_t   serverMutex;
+  HttpDecodeMethod *methodScanner[HTTP_METHOD_SCANNER_SIZE];
+  bool (*processData)(HttpContext *pContext);
+} HttpServer;
+
+extern const char *httpKeepAliveStr[];
+extern const char *httpVersionStr[];
+extern HttpServer  tsHttpServer;
+
+#endif
diff --git a/src/plugins/http/inc/httpJson.h b/src/plugins/http/inc/httpJson.h
new file mode 100644
index 0000000000000000000000000000000000000000..fcb74253b99c0cd8921d981e3ba7a4a027bf2b31
--- /dev/null
+++ b/src/plugins/http/inc/httpJson.h
@@ -0,0 +1,104 @@
+/*
+ * 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_HTTP_JSON_H
+#define TDENGINE_HTTP_JSON_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define JSON_BUFFER_SIZE 16384
+struct HttpContext;
+
+enum { JsonNumber, JsonString, JsonBoolean, JsonArray, JsonObject, JsonNull };
+
+extern char JsonItmTkn;
+extern char JsonObjStt;
+extern char JsonObjEnd;
+extern char JsonArrStt;
+extern char JsonArrEnd;
+extern char JsonStrStt;
+extern char JsonStrEnd;
+extern char JsonPairTkn;
+extern char JsonNulTkn[];
+extern char JsonTrueTkn[];
+extern char JsonFalseTkn[];
+
+typedef struct {
+  int32_t size;
+  int32_t total;
+  char*   lst;
+  char    buf[JSON_BUFFER_SIZE];
+  struct  HttpContext* pContext;
+} JsonBuf;
+
+// http response
+int32_t httpWriteBuf(struct HttpContext* pContext, const char* buf, int32_t sz);
+int32_t httpWriteBufNoTrace(struct HttpContext* pContext, const char* buf, int32_t sz);
+int32_t httpWriteBufByFd(struct HttpContext* pContext, const char* buf, int32_t sz);
+
+// builder callback
+typedef void (*httpJsonBuilder)(JsonBuf* buf, void* jsnHandle);
+
+// buffer
+void    httpInitJsonBuf(JsonBuf* buf, struct HttpContext* pContext);
+void    httpWriteJsonBufHead(JsonBuf* buf);
+int32_t httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast);
+void    httpWriteJsonBufEnd(JsonBuf* buf);
+
+// value
+void httpJsonString(JsonBuf* buf, char* sVal, int32_t len);
+void httpJsonOriginString(JsonBuf* buf, char* sVal, int32_t len);
+void httpJsonStringForTransMean(JsonBuf* buf, char* SVal, int32_t maxLen);
+void httpJsonInt64(JsonBuf* buf, int64_t num);
+void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us);
+void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us);
+void httpJsonInt(JsonBuf* buf, int32_t num);
+void httpJsonFloat(JsonBuf* buf, float num);
+void httpJsonDouble(JsonBuf* buf, double num);
+void httpJsonNull(JsonBuf* buf);
+void httpJsonBool(JsonBuf* buf, int32_t val);
+
+// pair
+void httpJsonPair(JsonBuf* buf, char* name, int32_t nameLen, char* sVal, int32_t valLen);
+void httpJsonPairOriginString(JsonBuf* buf, char* name, int32_t nameLen, char* sVal, int32_t valLen);
+void httpJsonPairHead(JsonBuf* buf, char* name, int32_t len);
+void httpJsonPairIntVal(JsonBuf* buf, char* name, int32_t nNameLen, int32_t num);
+void httpJsonPairInt64Val(JsonBuf* buf, char* name, int32_t nNameLen, int64_t num);
+void httpJsonPairBoolVal(JsonBuf* buf, char* name, int32_t nNameLen, int32_t num);
+void httpJsonPairFloatVal(JsonBuf* buf, char* name, int32_t nNameLen, float num);
+void httpJsonPairDoubleVal(JsonBuf* buf, char* name, int32_t nNameLen, double num);
+void httpJsonPairNullVal(JsonBuf* buf, char* name, int32_t nNameLen);
+
+// object
+void httpJsonPairArray(JsonBuf* buf, char* name, int32_t nLen, httpJsonBuilder builder, void* dsHandle);
+void httpJsonPairObject(JsonBuf* buf, char* name, int32_t nLen, httpJsonBuilder builder, void* dsHandle);
+void httpJsonObject(JsonBuf* buf, httpJsonBuilder fnBuilder, void* dsHandle);
+void httpJsonArray(JsonBuf* buf, httpJsonBuilder fnBuidler, void* jsonHandle);
+
+// print
+void httpJsonTestBuf(JsonBuf* buf, int32_t safety);
+void httpJsonToken(JsonBuf* buf, char c);
+void httpJsonItemToken(JsonBuf* buf);
+void httpJsonPrint(JsonBuf* buf, const char* json, int32_t len);
+
+// quick
+void httpJsonPairStatus(JsonBuf* buf, int32_t code);
+
+// http json printer
+JsonBuf* httpMallocJsonBuf(struct HttpContext* pContext);
+void     httpFreeJsonBuf(struct HttpContext* pContext);
+
+#endif
diff --git a/src/plugins/http/inc/httpLog.h b/src/plugins/http/inc/httpLog.h
new file mode 100644
index 0000000000000000000000000000000000000000..9c145a43e81629781ca43f0e9af48612f8011a22
--- /dev/null
+++ b/src/plugins/http/inc/httpLog.h
@@ -0,0 +1,31 @@
+/*
+ * 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_HTTP_LOG_H
+#define TDENGINE_HTTP_LOG_H
+
+#include "tlog.h"
+
+extern int32_t httpDebugFlag;
+
+#define httpFatal(...) { if (httpDebugFlag & DEBUG_FATAL) { taosPrintLog("HTP FATAL ", 255, __VA_ARGS__); }}
+#define httpError(...) { if (httpDebugFlag & DEBUG_ERROR) { taosPrintLog("HTP ERROR ", 255, __VA_ARGS__); }}
+#define httpWarn(...)  { if (httpDebugFlag & DEBUG_WARN)  { taosPrintLog("HTP WARN ", 255, __VA_ARGS__); }}
+#define httpInfo(...)  { if (httpDebugFlag & DEBUG_INFO)  { taosPrintLog("HTP ", 255, __VA_ARGS__); }}
+#define httpDebug(...) { if (httpDebugFlag & DEBUG_DEBUG) { taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); }}
+#define httpTrace(...) { if (httpDebugFlag & DEBUG_TRACE) { taosPrintLog("HTP ", httpDebugFlag, __VA_ARGS__); }}
+#define httpTraceL(...){ if (httpDebugFlag & DEBUG_TRACE) { taosPrintLongString("HTP ", httpDebugFlag, __VA_ARGS__); }}
+
+#endif
diff --git a/src/plugins/http/inc/httpParser.h b/src/plugins/http/inc/httpParser.h
new file mode 100644
index 0000000000000000000000000000000000000000..85ba843716cbfbdf2d87457456464d2b49869457
--- /dev/null
+++ b/src/plugins/http/inc/httpParser.h
@@ -0,0 +1,119 @@
+/*
+ * 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 HTTP_PARSER_H
+#define HTTP_PARSER_H
+#include "httpGzip.h"
+
+#define HTTP_MAX_URL 5  // http url stack size
+
+typedef enum HTTP_PARSER_STATE {
+  HTTP_PARSER_BEGIN,
+  HTTP_PARSER_REQUEST_OR_RESPONSE,
+  HTTP_PARSER_METHOD,
+  HTTP_PARSER_TARGET,
+  HTTP_PARSER_HTTP_VERSION,
+  HTTP_PARSER_SP,
+  HTTP_PARSER_STATUS_CODE,
+  HTTP_PARSER_REASON_PHRASE,
+  HTTP_PARSER_CRLF,
+  HTTP_PARSER_HEADER,
+  HTTP_PARSER_HEADER_KEY,
+  HTTP_PARSER_HEADER_VAL,
+  HTTP_PARSER_CHUNK_SIZE,
+  HTTP_PARSER_CHUNK,
+  HTTP_PARSER_END,
+  HTTP_PARSER_ERROR,
+} HTTP_PARSER_STATE;
+
+typedef enum HTTP_AUTH_TYPE {
+  HTTP_INVALID_AUTH,
+  HTTP_BASIC_AUTH,
+  HTTP_TAOSD_AUTH
+} HTTP_AUTH_TYPE;
+
+typedef enum HTTP_VERSION {
+  HTTP_VERSION_10 = 0,
+  HTTP_VERSION_11 = 1,
+  HTTP_VERSION_12 = 2,
+  HTTP_INVALID_VERSION
+} HTTP_VERSION;
+
+typedef enum HTTP_KEEPALIVE {
+  HTTP_KEEPALIVE_NO_INPUT = 0,
+  HTTP_KEEPALIVE_ENABLE = 1,
+  HTTP_KEEPALIVE_DISABLE = 2
+} HTTP_KEEPALIVE;
+
+typedef struct HttpString {
+  char *  str;
+  int32_t pos;
+  int32_t size;
+} HttpString;
+
+typedef struct HttpStatus {
+  int32_t code;
+  char *  desc;
+} HttpStatus;
+
+typedef struct HttpStack{
+  int8_t *stacks;
+  int32_t pos;
+  int32_t size;
+} HttpStack;
+
+struct HttpContext;
+typedef struct HttpParser {
+  struct HttpContext *pContext;
+  ehttp_gzip_t *gzip;
+  HttpStack     stacks;
+  HttpString    str;
+  HttpString    body;
+  HttpString    path[HTTP_MAX_URL];
+  char *  method;
+  char *  target;
+  char *  version;
+  char *  reasonPhrase;
+  char *  key;
+  char *  val;
+  char *  authContent;
+  int8_t  httpVersion;
+  int8_t  acceptEncodingGzip;
+  int8_t  acceptEncodingChunked;
+  int8_t  contentLengthSpecified;
+  int8_t  contentChunked;
+  int8_t  transferGzip;
+  int8_t  transferChunked;
+  int8_t  keepAlive;
+  int8_t  authType;
+  int32_t contentLength;
+  int32_t chunkSize;
+  int32_t receivedChunkSize;
+  int32_t receivedSize;
+  int32_t statusCode;
+  int8_t  inited;
+  int8_t  parsed;
+  int16_t httpCode;
+  int32_t parseCode;
+} HttpParser;
+
+void        httpInitParser(HttpParser *parser);
+HttpParser *httpCreateParser(struct HttpContext *pContext);
+void        httpClearParser(HttpParser *parser);
+void        httpDestroyParser(HttpParser *parser);
+int32_t     httpParseBuf(HttpParser *parser, const char *buf, int32_t len);
+char *      httpGetStatusDesc(int32_t statusCode);
+
+#endif
diff --git a/src/plugins/http/inc/httpQueue.h b/src/plugins/http/inc/httpQueue.h
new file mode 100644
index 0000000000000000000000000000000000000000..a4590719ff24d48eee875b2f2c4ff2f28a0a31f6
--- /dev/null
+++ b/src/plugins/http/inc/httpQueue.h
@@ -0,0 +1,33 @@
+/*
+ * 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_HTTP_QUEUE_H
+#define TDENGINE_HTTP_QUEUE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+bool httpInitResultQueue();
+void httpCleanupResultQueue();
+void httpDispatchToResultQueue();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/plugins/http/inc/httpResp.h b/src/plugins/http/inc/httpResp.h
new file mode 100644
index 0000000000000000000000000000000000000000..a528bcc39e6e23f47ecc9bc2557a3e12d7cf335f
--- /dev/null
+++ b/src/plugins/http/inc/httpResp.h
@@ -0,0 +1,40 @@
+/*
+ * 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_HTTP_RESP_H
+#define TDENGINE_HTTP_RESP_H
+
+#include "httpInt.h"
+
+enum _httpRespTempl {
+  HTTP_RESPONSE_JSON_OK,
+  HTTP_RESPONSE_JSON_ERROR,
+  HTTP_RESPONSE_OK,
+  HTTP_RESPONSE_ERROR,
+  HTTP_RESPONSE_CHUNKED_UN_COMPRESS,
+  HTTP_RESPONSE_CHUNKED_COMPRESS,
+  HTTP_RESPONSE_OPTIONS,
+  HTTP_RESPONSE_GRAFANA,
+  HTTP_RESP_END
+};
+
+extern const char *httpRespTemplate[];
+
+void httpSendErrorResp(HttpContext *pContext, int32_t errNo);
+void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char* errMsg);
+void httpSendSuccResp(HttpContext *pContext, char *desc);
+void httpSendOptionResp(HttpContext *pContext, char *desc);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpRestHandle.h b/src/plugins/http/inc/httpRestHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..632a1dc64739e39d1e9671fd41f9c224597eff07
--- /dev/null
+++ b/src/plugins/http/inc/httpRestHandle.h
@@ -0,0 +1,33 @@
+/*
+ * 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_REST_HANDLE_H
+#define TDENGINE_REST_HANDLE_H
+
+#include "http.h"
+#include "httpInt.h"
+#include "httpUtil.h"
+#include "httpResp.h"
+#include "httpSql.h"
+
+#define REST_ROOT_URL_POS   0
+#define REST_ACTION_URL_POS 1
+#define REST_USER_URL_POS   2
+#define REST_PASS_URL_POS   3
+
+void restInitHandle(HttpServer* pServer);
+bool restProcessRequest(struct HttpContext* pContext);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpRestJson.h b/src/plugins/http/inc/httpRestJson.h
new file mode 100644
index 0000000000000000000000000000000000000000..112e845f369c6ae3f0df76d880f84de5aeff5d8d
--- /dev/null
+++ b/src/plugins/http/inc/httpRestJson.h
@@ -0,0 +1,54 @@
+/*
+ * 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_REST_JSON_H
+#define TDENGINE_REST_JSON_H
+#include <stdbool.h>
+#include "httpHandle.h"
+#include "httpJson.h"
+#include "taos.h"
+
+#define REST_JSON_SUCCESS        "succ"
+#define REST_JSON_SUCCESS_LEN    4
+#define REST_JSON_FAILURE        "error"
+#define REST_JSON_FAILURE_LEN    5
+#define REST_JSON_STATUS         "status"
+#define REST_JSON_STATUS_LEN     6
+#define REST_JSON_CODE           "code"
+#define REST_JSON_CODE_LEN       4
+#define REST_JSON_DESC           "desc"
+#define REST_JSON_DESC_LEN       4
+#define REST_JSON_DATA           "data"
+#define REST_JSON_DATA_LEN       4
+#define REST_JSON_HEAD           "head"
+#define REST_JSON_HEAD_LEN       4
+#define REST_JSON_ROWS           "rows"
+#define REST_JSON_ROWS_LEN       4
+#define REST_JSON_AFFECT_ROWS    "affected_rows"
+#define REST_JSON_AFFECT_ROWS_LEN 13
+
+#define REST_TIMESTAMP_FMT_LOCAL_STRING 0
+#define REST_TIMESTAMP_FMT_TIMESTAMP    1
+#define REST_TIMESTAMP_FMT_UTC_STRING   2
+
+void restBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int32_t affect_rows);
+
+void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
+bool restBuildSqlTimestampJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows);
+bool restBuildSqlLocalTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows);
+bool restBuildSqlUtcTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows);
+void restStopSqlJson(HttpContext *pContext, HttpSqlCmd *cmd);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpServer.h b/src/plugins/http/inc/httpServer.h
new file mode 100644
index 0000000000000000000000000000000000000000..58ed3545f35e9d832a330c142d398f2316291aa6
--- /dev/null
+++ b/src/plugins/http/inc/httpServer.h
@@ -0,0 +1,27 @@
+/*
+ * 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_HTTP_SERVER_H
+#define TDENGINE_HTTP_SERVER_H
+
+#include "httpInt.h"
+
+bool httpInitConnect();
+void httpCleanUpConnect();
+
+void *httpInitServer(char *ip, uint16_t port, char *label, int32_t numOfThreads, void *fp, void *shandle);
+void  httpCleanUpServer(HttpServer *pServer);
+
+#endif
diff --git a/src/plugins/http/inc/httpSession.h b/src/plugins/http/inc/httpSession.h
new file mode 100644
index 0000000000000000000000000000000000000000..393e720f69c899cd9b78babdd0c550f14132a014
--- /dev/null
+++ b/src/plugins/http/inc/httpSession.h
@@ -0,0 +1,27 @@
+/*
+ * 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_HTTP_SESSION_H
+#define TDENGINE_HTTP_SESSION_H
+
+bool httpInitSessions();
+void httpCleanUpSessions();
+
+// http session method
+void httpCreateSession(HttpContext *pContext, void *taos);
+void httpGetSession(HttpContext *pContext);
+void httpReleaseSession(HttpContext *pContext);
+
+#endif
diff --git a/src/plugins/http/inc/httpSql.h b/src/plugins/http/inc/httpSql.h
new file mode 100644
index 0000000000000000000000000000000000000000..db3e3a3b163a249aa675839f30db4d14411eb6d6
--- /dev/null
+++ b/src/plugins/http/inc/httpSql.h
@@ -0,0 +1,38 @@
+/*
+ * 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_HTTP_SQL_H
+#define TDENGINE_HTTP_SQL_H
+
+
+int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...);
+int32_t httpAddToSqlCmdBufferNoTerminal(HttpContext *pContext, const char *const format, ...);
+int32_t httpAddToSqlCmdBufferWithSize(HttpContext *pContext, int32_t mallocSize);
+int32_t httpAddToSqlCmdBufferTerminal(HttpContext *pContext);
+
+bool httpMallocMultiCmds(HttpContext *pContext, int32_t cmdSize, int32_t bufferSize);
+bool httpReMallocMultiCmdsSize(HttpContext *pContext, int32_t cmdSize);
+bool httpReMallocMultiCmdsBuffer(HttpContext *pContext, int32_t bufferSize);
+void httpFreeMultiCmds(HttpContext *pContext);
+
+HttpSqlCmd *httpNewSqlCmd(HttpContext *pContext);
+HttpSqlCmd *httpCurrSqlCmd(HttpContext *pContext);
+int32_t     httpCurSqlCmdPos(HttpContext *pContext);
+
+void    httpTrimTableName(char *name);
+int32_t httpShrinkTableName(HttpContext *pContext, int32_t pos, char *name);
+char *  httpGetCmdsString(HttpContext *pContext, int32_t pos);
+
+#endif
diff --git a/src/plugins/http/inc/httpSystem.h b/src/plugins/http/inc/httpSystem.h
new file mode 100644
index 0000000000000000000000000000000000000000..afe49edb2f76a907ae869aa85a05ab41625a5531
--- /dev/null
+++ b/src/plugins/http/inc/httpSystem.h
@@ -0,0 +1,34 @@
+/*
+ * 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_HTTP_SYSTEM_H
+#define TDENGINE_HTTP_SYSTEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+int32_t httpInitSystem();
+int32_t httpStartSystem();
+void httpStopSystem();
+void httpCleanUpSystem();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/plugins/http/inc/httpTgHandle.h b/src/plugins/http/inc/httpTgHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..6a3a7bfa4a450da1dab035a094093a143d8736c8
--- /dev/null
+++ b/src/plugins/http/inc/httpTgHandle.h
@@ -0,0 +1,35 @@
+/*
+ * 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_TG_HANDLE_H
+#define TDENGINE_TG_HANDLE_H
+
+#include "http.h"
+#include "httpInt.h"
+#include "httpUtil.h"
+#include "httpResp.h"
+#include "httpSql.h"
+
+#define TG_ROOT_URL_POS   0
+#define TG_DB_URL_POS     1
+#define TG_USER_URL_POS   2
+#define TG_PASS_URL_POS   3
+
+void tgInitHandle(HttpServer *pServer);
+void tgCleanupHandle();
+
+bool tgProcessRquest(struct HttpContext *pContext);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpTgJson.h b/src/plugins/http/inc/httpTgJson.h
new file mode 100644
index 0000000000000000000000000000000000000000..6b7d0681b601fea07aa6d15c8a8a4dbd675b9b34
--- /dev/null
+++ b/src/plugins/http/inc/httpTgJson.h
@@ -0,0 +1,31 @@
+/*
+ * 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_TG_JSON_H
+#define TDENGINE_TG_JSON_H
+
+#include "httpHandle.h"
+#include "httpJson.h"
+#include "taos.h"
+
+void tgInitQueryJson(HttpContext *pContext);
+void tgCleanQueryJson(HttpContext *pContext);
+void tgStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result);
+void tgStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd);
+void tgBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int32_t affect_rows);
+bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int32_t code);
+void tgSetNextCmd(struct HttpContext *pContext, HttpSqlCmd *cmd, int32_t code);
+
+#endif
\ No newline at end of file
diff --git a/src/plugins/http/inc/httpUtil.h b/src/plugins/http/inc/httpUtil.h
new file mode 100644
index 0000000000000000000000000000000000000000..61cd50a77a29ad8b9a2058f4ad569493b18618ac
--- /dev/null
+++ b/src/plugins/http/inc/httpUtil.h
@@ -0,0 +1,35 @@
+/*
+ * 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_HTTP_UTIL_H
+#define TDENGINE_HTTP_UTIL_H
+
+bool httpCheckUsedbSql(char *sql);
+void httpTimeToString(time_t t, char *buf, int32_t buflen);
+
+bool    httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
+bool    httpParseRequest(HttpContext *pContext);
+int32_t httpCheckReadCompleted(HttpContext *pContext);
+void    httpReadDirtyData(HttpContext *pContext);
+
+int32_t httpGzipDeCompress(char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData);
+int32_t httpGzipCompressInit(HttpContext *pContext);
+int32_t httpGzipCompress(HttpContext *pContext, char *inSrcData, int32_t inSrcDataLen,
+                     char *outDestData, int32_t *outDestDataLen, bool isTheLast);
+
+// http request parser
+void httpAddMethod(HttpServer *pServer, HttpDecodeMethod *pMethod);
+
+#endif
diff --git a/src/plugins/http/src/httpAuth.c b/src/plugins/http/src/httpAuth.c
new file mode 100644
index 0000000000000000000000000000000000000000..8beef7c042ba6f0194d814753e15387e3d2b4a2b
--- /dev/null
+++ b/src/plugins/http/src/httpAuth.c
@@ -0,0 +1,117 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tkey.h"
+#include "tutil.h"
+#include "http.h"
+#include "httpInt.h"
+#include "httpAuth.h"
+
+#define KEY_DES_4 4971256377704625728L
+
+int32_t httpParseBasicAuthToken(HttpContext *pContext, char *token, int32_t len) {
+  token[len] = '\0';
+  int32_t outlen = 0;
+  char *base64 = (char *)base64_decode(token, len, &outlen);
+  if (base64 == NULL || outlen == 0) {
+    httpError("context:%p, fd:%d, basic token:%s parsed error", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  }
+
+  char *user = strstr(base64, ":");
+  if (user == NULL) {
+    httpError("context:%p, fd:%d, basic token:%s invalid format", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  }
+
+  int32_t user_len = (int32_t)(user - base64);
+  if (user_len < 1 || user_len >= TSDB_USER_LEN) {
+    httpError("context:%p, fd:%d, basic token:%s parse user error", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  }
+  strncpy(pContext->user, base64, (size_t)user_len);
+  pContext->user[user_len] = 0;
+
+  char *password = user + 1;
+  int32_t pass_len = (int32_t)((base64 + outlen) - password);
+  if (pass_len < 1 || pass_len >= TSDB_PASSWORD_LEN) {
+    httpError("context:%p, fd:%d, basic token:%s parse password error", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  }
+  strncpy(pContext->pass, password, (size_t)pass_len);
+  pContext->pass[pass_len] = 0;
+
+  free(base64);
+  httpDebug("context:%p, fd:%d, basic token parsed success, user:%s", pContext, pContext->fd, pContext->user);
+  return 0;
+}
+
+int32_t httpParseTaosdAuthToken(HttpContext *pContext, char *token, int32_t len) {
+  token[len] = '\0';
+  int32_t outlen = 0;
+  unsigned char *base64 = base64_decode(token, len, &outlen);
+  if (base64 == NULL || outlen == 0) {
+    httpError("context:%p, fd:%d, taosd token:%s parsed error", pContext, pContext->fd, token);
+    if (base64) free(base64);
+    return 01;
+  }
+  if (outlen != (TSDB_USER_LEN + TSDB_PASSWORD_LEN)) {
+    httpError("context:%p, fd:%d, taosd token:%s length error", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  }
+
+  char *descrypt = taosDesDecode(KEY_DES_4, (char *)base64, outlen);
+  if (descrypt == NULL) {
+    httpError("context:%p, fd:%d, taosd token:%s descrypt error", pContext, pContext->fd, token);
+    free(base64);
+    return -1;
+  } else {
+    tstrncpy(pContext->user, descrypt, sizeof(pContext->user));
+    tstrncpy(pContext->pass, descrypt + TSDB_USER_LEN, sizeof(pContext->pass));
+
+    httpDebug("context:%p, fd:%d, taosd token:%s parsed success, user:%s", pContext, pContext->fd, token,
+              pContext->user);
+    free(base64);
+    free(descrypt);
+    return 0;
+  }
+}
+
+int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen) {
+  char buffer[sizeof(pContext->user) + sizeof(pContext->pass)] = {0};
+  size_t size = sizeof(pContext->user);
+  tstrncpy(buffer, pContext->user, size);
+  size = sizeof(pContext->pass);
+  tstrncpy(buffer + sizeof(pContext->user), pContext->pass, size);
+
+  char *encrypt = taosDesEncode(KEY_DES_4, buffer, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
+  char *base64 = base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + TSDB_PASSWORD_LEN);
+
+  size_t len = strlen(base64);
+  tstrncpy(token, base64, len + 1);
+  free(encrypt);
+  free(base64);
+
+  httpDebug("context:%p, fd:%d, generate taosd token:%s", pContext, pContext->fd, token);
+
+  return 0;
+}
diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c
new file mode 100644
index 0000000000000000000000000000000000000000..6abd382f8e5a3ff75c1296cd5c4e2bea533ec53f
--- /dev/null
+++ b/src/plugins/http/src/httpContext.c
@@ -0,0 +1,234 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "tsocket.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "tcache.h"
+#include "hash.h"
+#include "httpInt.h"
+#include "httpResp.h"
+#include "httpSql.h"
+#include "httpSession.h"
+#include "httpContext.h"
+#include "httpParser.h"
+
+static void httpDestroyContext(void *data);
+
+static void httpRemoveContextFromEpoll(HttpContext *pContext) {
+  HttpThread *pThread = pContext->pThread;
+  if (pContext->fd >= 0) {
+    epoll_ctl(pThread->pollFd, EPOLL_CTL_DEL, pContext->fd, NULL);
+    int32_t fd = atomic_val_compare_exchange_32(&pContext->fd, pContext->fd, -1);
+    taosCloseSocket(fd);
+  }
+}
+
+static void httpDestroyContext(void *data) {
+  HttpContext *pContext = *(HttpContext **)data;
+  if (pContext->fd > 0) taosClose(pContext->fd);
+
+  HttpThread *pThread = pContext->pThread;
+  httpRemoveContextFromEpoll(pContext);
+  httpReleaseSession(pContext);
+  atomic_sub_fetch_32(&pThread->numOfContexts, 1);
+  
+  httpDebug("context:%p, is destroyed, refCount:%d data:%p thread:%s numOfContexts:%d", pContext, pContext->refCount,
+            data, pContext->pThread->label, pContext->pThread->numOfContexts);
+  pContext->pThread = 0;
+  pContext->state = HTTP_CONTEXT_STATE_CLOSED;
+
+  // avoid double free
+  httpFreeJsonBuf(pContext);
+  httpFreeMultiCmds(pContext);
+
+  if (pContext->parser) {
+    httpDestroyParser(pContext->parser);
+    pContext->parser = NULL;
+  }
+
+  taosTFree(pContext);
+}
+
+bool httpInitContexts() {
+  tsHttpServer.contextCache = taosCacheInit(TSDB_DATA_TYPE_BIGINT, 2, true, httpDestroyContext, "restc");
+  if (tsHttpServer.contextCache == NULL) {
+    httpError("failed to init context cache");
+    return false;
+  }
+
+  return true;
+}
+
+void httpCleanupContexts() {
+  if (tsHttpServer.contextCache != NULL) {
+    SCacheObj *cache = tsHttpServer.contextCache;
+    httpInfo("context cache is cleanuping, size:%" PRIzu "", taosHashGetSize(cache->pHashTable));
+    taosCacheCleanup(tsHttpServer.contextCache);
+    tsHttpServer.contextCache = NULL;
+  }
+}
+
+const char *httpContextStateStr(HttpContextState state) {
+  switch (state) {
+    case HTTP_CONTEXT_STATE_READY:
+      return "ready";
+    case HTTP_CONTEXT_STATE_HANDLING:
+      return "handling";
+    case HTTP_CONTEXT_STATE_DROPPING:
+      return "dropping";
+    case HTTP_CONTEXT_STATE_CLOSED:
+      return "closed";
+    default:
+      return "unknown";
+  }
+}
+
+void httpNotifyContextClose(HttpContext *pContext) { 
+  shutdown(pContext->fd, SHUT_WR); 
+}
+
+bool httpAlterContextState(HttpContext *pContext, HttpContextState srcState, HttpContextState destState) {
+  return (atomic_val_compare_exchange_32(&pContext->state, srcState, destState) == srcState);
+}
+
+HttpContext *httpCreateContext(int32_t fd) {
+  HttpContext *pContext = calloc(1, sizeof(HttpContext));
+  if (pContext == NULL) return NULL;
+
+  pContext->fd = fd;
+  pContext->lastAccessTime = taosGetTimestampSec();
+  pContext->state = HTTP_CONTEXT_STATE_READY;
+  pContext->parser = httpCreateParser(pContext);
+
+  uint64_t handleVal = (uint64_t)pContext;
+  HttpContext **ppContext = taosCachePut(tsHttpServer.contextCache, &handleVal, sizeof(int64_t), &pContext, sizeof(int64_t), 3000);
+  pContext->ppContext = ppContext;
+  httpDebug("context:%p, fd:%d, is created, data:%p", pContext, fd, ppContext);
+
+  // set the ref to 0 
+  taosCacheRelease(tsHttpServer.contextCache, (void**)&ppContext, false);
+
+  return pContext;
+}
+
+HttpContext *httpGetContext(void *ptr) {
+  uint64_t handleVal = (uint64_t)ptr;
+  HttpContext **ppContext = taosCacheAcquireByKey(tsHttpServer.contextCache, &handleVal, sizeof(HttpContext *));
+
+  if (ppContext) {
+    HttpContext *pContext = *ppContext;
+    if (pContext) {
+      int32_t refCount = atomic_add_fetch_32(&pContext->refCount, 1);
+      httpTrace("context:%p, fd:%d, is accquired, data:%p refCount:%d", pContext, pContext->fd, ppContext, refCount);
+      return pContext;
+    }
+  }
+  return NULL;
+}
+
+void httpReleaseContext(HttpContext *pContext, bool clearRes) {
+  int32_t refCount = atomic_sub_fetch_32(&pContext->refCount, 1);
+  if (refCount < 0) {
+    httpError("context:%p, is already released, refCount:%d", pContext, refCount);
+    return;
+  }
+
+  if (clearRes) {
+    httpClearParser(pContext->parser);
+  }
+
+  HttpContext **ppContext = pContext->ppContext;
+  httpTrace("context:%p, is released, data:%p refCount:%d", pContext, ppContext, refCount);
+
+  if (tsHttpServer.contextCache != NULL) {
+    taosCacheRelease(tsHttpServer.contextCache, (void **)(&ppContext), false);
+  } else {
+    httpDebug("context:%p, won't be destroyed for cache is already released", pContext);
+    // httpDestroyContext((void **)(&ppContext));
+  }
+}
+
+bool httpInitContext(HttpContext *pContext) {
+  pContext->accessTimes++;
+  pContext->lastAccessTime = taosGetTimestampSec();
+
+  pContext->reqType = HTTP_REQTYPE_OTHERS;
+  pContext->encodeMethod = NULL;
+  memset(&pContext->singleCmd, 0, sizeof(HttpSqlCmd));
+
+
+  httpTrace("context:%p, fd:%d, parsed:%d", pContext, pContext->fd, pContext->parsed);
+  return true;
+}
+
+void httpCloseContextByApp(HttpContext *pContext) {
+  HttpParser *parser = pContext->parser;
+  pContext->parsed = false;
+  bool keepAlive = true;
+
+  if (parser->httpVersion == HTTP_VERSION_10 && parser->keepAlive != HTTP_KEEPALIVE_ENABLE) {
+    keepAlive = false;
+  } else if (parser->httpVersion != HTTP_VERSION_10 && parser->keepAlive == HTTP_KEEPALIVE_DISABLE) {
+    keepAlive = false;
+  } else {
+  }
+
+  if (keepAlive) {
+    if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_HANDLING, HTTP_CONTEXT_STATE_READY)) {
+      httpTrace("context:%p, fd:%d, last state:handling, keepAlive:true, reuse context", pContext, pContext->fd);
+    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_DROPPING, HTTP_CONTEXT_STATE_CLOSED)) {
+      httpRemoveContextFromEpoll(pContext);
+      httpTrace("context:%p, fd:%d, ast state:dropping, keepAlive:true, close connect", pContext, pContext->fd);
+    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_READY)) {
+      httpTrace("context:%p, fd:%d, last state:ready, keepAlive:true, reuse context", pContext, pContext->fd);
+    } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_CLOSED, HTTP_CONTEXT_STATE_CLOSED)) {
+      httpRemoveContextFromEpoll(pContext);
+      httpTrace("context:%p, fd:%d, last state:ready, keepAlive:true, close connect", pContext, pContext->fd);
+    } else {
+      httpRemoveContextFromEpoll(pContext);
+      httpError("context:%p, fd:%d, last state:%s:%d, keepAlive:true, close connect", pContext, pContext->fd,
+                httpContextStateStr(pContext->state), pContext->state);
+    }
+  } else {
+    httpRemoveContextFromEpoll(pContext);
+    httpTrace("context:%p, fd:%d, ilast state:%s:%d, keepAlive:false, close context", pContext, pContext->fd,
+              httpContextStateStr(pContext->state), pContext->state);
+  }
+
+  httpReleaseContext(pContext, true);
+}
+
+void httpCloseContextByServer(HttpContext *pContext) {
+  if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_HANDLING, HTTP_CONTEXT_STATE_DROPPING)) {
+    httpTrace("context:%p, fd:%d, epoll finished, still used by app", pContext, pContext->fd);
+  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_DROPPING, HTTP_CONTEXT_STATE_DROPPING)) {
+    httpTrace("context:%p, fd:%d, epoll already finished, wait app finished", pContext, pContext->fd);
+  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_CLOSED)) {
+    httpTrace("context:%p, fd:%d, epoll finished, close connect", pContext, pContext->fd);
+  } else if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_CLOSED, HTTP_CONTEXT_STATE_CLOSED)) {
+    httpTrace("context:%p, fd:%d, epoll finished, will be closed soon", pContext, pContext->fd);
+  } else {
+    httpError("context:%p, fd:%d, unknown state:%d", pContext, pContext->fd, pContext->state);
+  }
+
+  pContext->parsed = false;
+  httpRemoveContextFromEpoll(pContext);
+  httpReleaseContext(pContext, true);
+}
diff --git a/src/plugins/http/src/httpGcHandle.c b/src/plugins/http/src/httpGcHandle.c
new file mode 100644
index 0000000000000000000000000000000000000000..5d4cb0c6809d063107cb37ccaac1200f2c87ee9d
--- /dev/null
+++ b/src/plugins/http/src/httpGcHandle.c
@@ -0,0 +1,277 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "cJSON.h"
+#include "httpLog.h"
+#include "httpGcHandle.h"
+#include "httpGcJson.h"
+
+static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
+static HttpEncodeMethod gcHeartBeatMethod = {
+  .startJsonFp          = NULL,         
+  .stopJsonFp           = gcSendHeartBeatResp, 
+  .buildQueryJsonFp     = NULL,
+  .buildAffectRowJsonFp = NULL, 
+  .initJsonFp           = NULL, 
+  .cleanJsonFp          = NULL,
+  .checkFinishedFp      = NULL,
+  .setNextCmdFp         = NULL
+};
+
+static HttpEncodeMethod gcQueryMethod = {
+  .startJsonFp          = NULL,         
+  .stopJsonFp           = gcStopQueryJson, 
+  .buildQueryJsonFp     = gcBuildQueryJson,
+  .buildAffectRowJsonFp = NULL, 
+  .initJsonFp           = gcInitQueryJson, 
+  .cleanJsonFp          = gcCleanQueryJson,
+  .checkFinishedFp      = NULL,
+  .setNextCmdFp         = NULL
+};
+
+void gcInitHandle(HttpServer* pServer) { httpAddMethod(pServer, &gcDecodeMethod); }
+
+bool gcGetUserFromUrl(HttpContext* pContext) {
+  HttpParser* pParser = pContext->parser;
+  if (pParser->path[GC_USER_URL_POS].pos >= TSDB_USER_LEN || pParser->path[GC_USER_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->user, pParser->path[GC_USER_URL_POS].str, TSDB_USER_LEN);
+  return true;
+}
+
+bool gcGetPassFromUrl(HttpContext* pContext) {
+  HttpParser* pParser = pContext->parser;
+  if (pParser->path[GC_PASS_URL_POS].pos >= TSDB_PASSWORD_LEN || pParser->path[GC_PASS_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->pass, pParser->path[GC_PASS_URL_POS].str, TSDB_PASSWORD_LEN);
+  return true;
+}
+
+bool gcProcessLoginRequest(HttpContext* pContext) {
+  httpDebug("context:%p, fd:%d, user:%s, process grafana login msg", pContext, pContext->fd, pContext->user);
+  pContext->reqType = HTTP_REQTYPE_LOGIN;
+  return true;
+}
+
+/**
+ * Process the query request
+ * @param fd for http send back
+ * @param context is taos conn
+ * @param filter, the request format is json, such as
+ */
+
+// https://github.com/grafana/grafana/blob/master/docs/sources/plugins/developing/datasources.md
+// input
+//[{
+//  "refId": "A",
+//  "alias" : "taosd",
+//  "sql" : "select first(taosd) from sys.mem where ts > now-6h and ts < now interval(20000a)"
+//},
+//{
+//  "refId": "B",
+//  "alias" : "system",
+//  "sql" : "select first(taosd) from sys.mem where ts > now-6h and ts < now interval(20000a)"
+//}]
+// output
+//[{
+//  "datapoints": [[339.386719,
+//    1537873132000],
+//    [339.656250,
+//    1537873162400],
+//    [339.656250,
+//    1537873192600],
+//    [339.656250,
+//    1537873222800],
+//    [339.589844,
+//    1537873253200],
+//    [339.964844,
+//    1537873283400],
+//    [340.093750,
+//    1537873313800],
+//    [340.093750,
+//    1537873344000],
+//    [340.093750,
+//    1537873374200],
+//    [340.093750,
+//    1537873404600]],
+//    "refId": "A",
+//    "target" : "taosd"
+//},
+//{
+//  "datapoints": [[339.386719,
+//  1537873132000],
+//  [339.656250,
+//  1537873162400],
+//  [339.656250,
+//  1537873192600],
+//  [339.656250,
+//  1537873222800],
+//  [339.589844,
+//  1537873253200],
+//  [339.964844,
+//  1537873283400],
+//  [340.093750,
+//  1537873313800],
+//  [340.093750,
+//  1537873344000],
+//  [340.093750,
+//  1537873374200],
+//  [340.093750,
+//  1537873404600]],
+//  "refId": "B",
+//  "target" : "system"
+//}]
+
+bool gcProcessQueryRequest(HttpContext* pContext) {
+  httpDebug("context:%p, fd:%d, process grafana query msg", pContext, pContext->fd);
+
+  char* filter = pContext->parser->body.str;
+  if (filter == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_MSG_INPUT);
+    return false;
+  }
+
+  cJSON* root = cJSON_Parse(filter);
+  if (root == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_GC_REQ_PARSE_ERROR);
+    return false;
+  }
+
+  int32_t size = cJSON_GetArraySize(root);
+  if (size <= 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_GC_QUERY_NULL);
+    cJSON_Delete(root);
+    return false;
+  }
+
+  if (size > 100) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_GC_QUERY_SIZE);
+    cJSON_Delete(root);
+    return false;
+  }
+
+  if (!httpMallocMultiCmds(pContext, size, HTTP_BUFFER_SIZE)) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+    cJSON_Delete(root);
+    return false;
+  }
+
+  for (int32_t i = 0; i < size; ++i) {
+    cJSON* query = cJSON_GetArrayItem(root, i);
+    if (query == NULL) continue;
+
+    cJSON* refId = cJSON_GetObjectItem(query, "refId");
+    if (refId == NULL || refId->valuestring == NULL || strlen(refId->valuestring) == 0) {
+      httpDebug("context:%p, fd:%d, user:%s, refId is null", pContext, pContext->fd, pContext->user);
+      continue;
+    }
+
+    int32_t refIdBuffer = httpAddToSqlCmdBuffer(pContext, refId->valuestring);
+    if (refIdBuffer == -1) {
+      httpWarn("context:%p, fd:%d, user:%s, refId buffer is full", pContext, pContext->fd, pContext->user);
+      break;
+    }
+
+    cJSON* alias = cJSON_GetObjectItem(query, "alias");
+    int32_t aliasBuffer = -1;
+    if (!(alias == NULL || alias->valuestring == NULL || strlen(alias->valuestring) == 0)) {
+      aliasBuffer = httpAddToSqlCmdBuffer(pContext, alias->valuestring);
+      if (aliasBuffer == -1) {
+        httpWarn("context:%p, fd:%d, user:%s, alias buffer is full", pContext, pContext->fd, pContext->user);
+        break;
+      }
+    }
+    if (aliasBuffer == -1) {
+      aliasBuffer = httpAddToSqlCmdBuffer(pContext, "");
+    }
+
+    cJSON* sql = cJSON_GetObjectItem(query, "sql");
+    if (sql == NULL || sql->valuestring == NULL || strlen(sql->valuestring) == 0) {
+      httpDebug("context:%p, fd:%d, user:%s, sql is null", pContext, pContext->fd, pContext->user);
+      continue;
+    }
+
+    int32_t sqlBuffer = httpAddToSqlCmdBuffer(pContext, sql->valuestring);
+    if (sqlBuffer == -1) {
+      httpWarn("context:%p, fd:%d, user:%s, sql buffer is full", pContext, pContext->fd, pContext->user);
+      break;
+    }
+
+    HttpSqlCmd* cmd = httpNewSqlCmd(pContext);
+    if (cmd == NULL) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      cJSON_Delete(root);
+      return false;
+    }
+
+    cmd->sql = sqlBuffer;
+    cmd->values = refIdBuffer;
+    cmd->table = aliasBuffer;
+    cmd->numOfRows = 0;                                                                 // hack way as target flags
+    cmd->timestamp = httpAddToSqlCmdBufferWithSize(pContext, HTTP_GC_TARGET_SIZE + 1);  // hack way
+
+    if (cmd->timestamp == -1) {
+      httpWarn("context:%p, fd:%d, user:%s, cant't malloc target size, sql buffer is full", pContext, pContext->fd,
+               pContext->user);
+      break;
+    }
+  }
+
+  pContext->reqType = HTTP_REQTYPE_MULTI_SQL;
+  pContext->encodeMethod = &gcQueryMethod;
+  pContext->multiCmds->pos = 0;
+
+  return true;
+}
+
+bool gcProcessHeartbeatRequest(HttpContext* pContext) {
+  httpDebug("context:%p, fd:%d, process grafana heartbeat msg", pContext, pContext->fd);
+  pContext->reqType = HTTP_REQTYPE_HEARTBEAT;
+  pContext->encodeMethod = &gcHeartBeatMethod;
+  return true;
+}
+
+/**
+ * Process get/post/options msg, such as login and logout
+ */
+bool gcProcessRequest(struct HttpContext* pContext) {
+  if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "login")) {
+    gcGetUserFromUrl(pContext);
+    gcGetPassFromUrl(pContext);
+  }
+
+  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_AUTH_INFO);
+    return false;
+  }
+
+  if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "query")) {
+    return gcProcessQueryRequest(pContext);
+  } else if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "heartbeat")) {
+    return gcProcessHeartbeatRequest(pContext);
+  } else if (httpUrlMatch(pContext, GC_ACTION_URL_POS, "login")) {
+    return gcProcessLoginRequest(pContext);
+  } else {
+    return gcProcessHeartbeatRequest(pContext);
+  }
+}
diff --git a/src/plugins/http/src/httpGcJson.c b/src/plugins/http/src/httpGcJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..a291641dc376c6d581a137403a1ac623ce9dd5ec
--- /dev/null
+++ b/src/plugins/http/src/httpGcJson.c
@@ -0,0 +1,265 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "httpGcHandle.h"
+#include "httpGcJson.h"
+#include "httpJson.h"
+#include "httpResp.h"
+
+unsigned char *base64_decode(const char *value, int inlen, int *outlen);
+
+void gcInitQueryJson(HttpContext *pContext) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  httpInitJsonBuf(jsonBuf, pContext);
+  httpWriteJsonBufHead(jsonBuf);
+
+  // data array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+}
+
+void gcCleanQueryJson(HttpContext *pContext) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
+  httpWriteJsonBufEnd(jsonBuf);
+}
+
+void gcWriteTargetStartJson(JsonBuf *jsonBuf, char *refId, char *target) {
+  if (strlen(target) == 0) {
+    target = refId;
+  }
+
+  // object begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonObjStt);
+
+  // target section
+  httpJsonPair(jsonBuf, "refId", 5, refId, (int32_t)strlen(refId));
+  httpJsonPair(jsonBuf, "target", 6, target, (int32_t)strlen(target));
+
+  // data begin
+  httpJsonPairHead(jsonBuf, "datapoints", 10);
+
+  // data array begin
+  httpJsonToken(jsonBuf, JsonArrStt);
+}
+
+void gcWriteTargetEndJson(JsonBuf *jsonBuf) {
+  // data array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
+  // object end
+  httpJsonToken(jsonBuf, JsonObjEnd);
+}
+
+void gcStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // write end of target
+  if (cmd->numOfRows != 0) {
+    gcWriteTargetEndJson(jsonBuf);
+  }
+}
+
+bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return false;
+
+  int32_t  num_fields = taos_num_fields(result);
+  TAOS_FIELD *fields = taos_fetch_fields(result);
+  if (num_fields == 0) {
+    return false;
+  }
+
+  int32_t precision = taos_result_precision(result);
+
+  // such as select count(*) from sys.cpu
+  // such as select count(*) from sys.cpu group by ipaddr
+  // such as select count(*) from sys.cpu interval(1d)
+  // such as select count(*) from sys.cpu interval(1d) group by ipaddr
+  // such as select count(*) count(*) from sys.cpu group by ipaddr interval(1d)
+  int32_t dataFields = -1;
+  int32_t groupFields = -1;
+  bool hasTimestamp = fields[0].type == TSDB_DATA_TYPE_TIMESTAMP;
+  if (hasTimestamp) {
+    dataFields = 1;
+    if (num_fields > 2) groupFields = num_fields - 1;
+  } else {
+    dataFields = 0;
+    if (num_fields > 1) groupFields = num_fields - 1;
+  }
+
+  char *refIdBuffer = httpGetCmdsString(pContext, cmd->values);
+  char *aliasBuffer = httpGetCmdsString(pContext, cmd->table);
+  char *targetBuffer = httpGetCmdsString(pContext, cmd->timestamp);
+
+  if (groupFields == -1 && cmd->numOfRows == 0) {
+    gcWriteTargetStartJson(jsonBuf, refIdBuffer, aliasBuffer);
+  }
+  cmd->numOfRows += numOfRows;
+
+  for (int32_t k = 0; k < numOfRows; ++k) {
+    TAOS_ROW row = taos_fetch_row(result);
+    if (row == NULL) {
+      cmd->numOfRows--;
+      continue;
+    }
+    int32_t* length = taos_fetch_lengths(result);
+
+    // for group by
+    if (groupFields != -1) {
+      char target[HTTP_GC_TARGET_SIZE] = {0};
+      int32_t len;
+      len = snprintf(target,HTTP_GC_TARGET_SIZE,"%s{",aliasBuffer);
+      for (int32_t i = dataFields + 1; i<num_fields; i++){
+          switch (fields[i].type) {
+          case TSDB_DATA_TYPE_BOOL:
+          case TSDB_DATA_TYPE_TINYINT:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%d", fields[i].name, *((int8_t *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_SMALLINT:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%d", fields[i].name, *((int16_t *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_INT:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%d,", fields[i].name, *((int32_t *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_BIGINT:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%ld", fields[i].name, *((int64_t *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_FLOAT:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%.5f", fields[i].name, *((float *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_DOUBLE:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%.9f", fields[i].name, *((double *)row[i]));
+            break;
+          case TSDB_DATA_TYPE_BINARY:
+          case TSDB_DATA_TYPE_NCHAR:
+            if (row[i]!= NULL){            
+              len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:", fields[i].name);
+              memcpy(target + len, (char *) row[i], length[i]);
+              len = strlen(target);
+            }
+            break;
+          default:
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "%s:%s", fields[i].name, "-");
+            break;
+        }
+        if(i < num_fields - 1 ){
+            len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, ", ");
+        }
+
+      }
+      len += snprintf(target + len, HTTP_GC_TARGET_SIZE - len, "}");
+
+      if (strcmp(target, targetBuffer) != 0) {
+        // first target not write this section
+        if (strlen(targetBuffer) != 0) {
+          gcWriteTargetEndJson(jsonBuf);
+        }
+
+        // start new target
+        gcWriteTargetStartJson(jsonBuf, refIdBuffer, target);
+        strncpy(targetBuffer, target, HTTP_GC_TARGET_SIZE);
+      }
+    }  // end of group by
+
+    // data row array begin
+    httpJsonItemToken(jsonBuf);
+    httpJsonToken(jsonBuf, JsonArrStt);
+
+    for (int32_t i = dataFields; i >= 0; i--) {
+      httpJsonItemToken(jsonBuf);
+      if (row[i] == NULL) {
+        httpJsonOriginString(jsonBuf, "null", 4);
+        continue;
+      }
+
+      switch (fields[i].type) {
+        case TSDB_DATA_TYPE_BOOL:
+        case TSDB_DATA_TYPE_TINYINT:
+          httpJsonInt(jsonBuf, *((int8_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_SMALLINT:
+          httpJsonInt(jsonBuf, *((int16_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_INT:
+          httpJsonInt(jsonBuf, *((int32_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_BIGINT:
+          httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_FLOAT:
+          httpJsonFloat(jsonBuf, *((float *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_DOUBLE:
+          httpJsonDouble(jsonBuf, *((double *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_BINARY:
+        case TSDB_DATA_TYPE_NCHAR:
+          httpJsonStringForTransMean(jsonBuf, row[i], fields[i].bytes);
+          break;
+        case TSDB_DATA_TYPE_TIMESTAMP:
+          if (precision == TSDB_TIME_PRECISION_MILLI) { //ms
+            httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
+          } else {
+            httpJsonInt64(jsonBuf, *((int64_t *)row[i]) / 1000);
+          }
+          break;
+        default:
+          httpJsonString(jsonBuf, "-", 1);
+          break;
+      }
+    }
+
+    if (dataFields == 0) {
+      httpJsonItemToken(jsonBuf);
+      httpJsonString(jsonBuf, "-", 1);
+    }
+
+    // data row array end
+    httpJsonToken(jsonBuf, JsonArrEnd);
+  }
+
+  return true;
+}
+
+void gcSendHeartBeatResp(HttpContext *pContext, HttpSqlCmd *cmd) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  char *desc = "Grafana server receive a quest from you!";
+
+  httpInitJsonBuf(jsonBuf, pContext);
+
+  httpJsonToken(jsonBuf, JsonObjStt);
+  httpJsonPair(jsonBuf, "message", (int32_t)strlen("message"), desc, (int32_t)strlen(desc));
+  httpJsonToken(jsonBuf, JsonObjEnd);
+
+  char head[1024];
+
+  int32_t hLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_GRAFANA], httpVersionStr[pContext->parser->httpVersion],
+                         httpKeepAliveStr[pContext->parser->keepAlive], (jsonBuf->lst - jsonBuf->buf));
+  httpWriteBuf(pContext, head, hLen);
+  httpWriteBuf(pContext, jsonBuf->buf, (int32_t)(jsonBuf->lst - jsonBuf->buf));
+}
diff --git a/src/plugins/http/src/httpGzip.c b/src/plugins/http/src/httpGzip.c
new file mode 100644
index 0000000000000000000000000000000000000000..54f900c7551d225c4c1c0b72bfa661969af14afa
--- /dev/null
+++ b/src/plugins/http/src/httpGzip.c
@@ -0,0 +1,167 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "zlib.h"
+#include "httpGzip.h"
+
+typedef enum {
+  EHTTP_GZIP_INITING,
+  EHTTP_GZIP_READY,
+  EHTTP_GZIP_CLOSED,
+} EHTTP_GZIP_STATE;
+
+struct ehttp_gzip_s {
+  ehttp_gzip_conf_t       conf;
+  ehttp_gzip_callbacks_t  callbacks;
+  void                   *arg;
+  z_stream               *gzip;
+  gz_header              *header;
+  char                   *chunk;
+
+  int32_t                 state;
+};
+
+static void dummy_on_data(ehttp_gzip_t *gzip, void *arg, const char *buf, int32_t len) {
+}
+
+static void ehttp_gzip_cleanup(ehttp_gzip_t *gzip) {
+  switch(gzip->state) {
+    case EHTTP_GZIP_READY: {
+      inflateEnd(gzip->gzip);
+    } break;
+    default: break;
+  }
+  if (gzip->gzip) {
+    free(gzip->gzip);
+    gzip->gzip = NULL;
+  }
+  if (gzip->header) {
+    free(gzip->header);
+    gzip->header = NULL;
+  }
+  if (gzip->chunk) {
+    free(gzip->chunk);
+    gzip->chunk = NULL;
+  }
+  gzip->state = EHTTP_GZIP_CLOSED;
+}
+
+ehttp_gzip_t* ehttp_gzip_create_decompressor(ehttp_gzip_conf_t conf, ehttp_gzip_callbacks_t callbacks, void *arg) {
+  ehttp_gzip_t *gzip = (ehttp_gzip_t*)calloc(1, sizeof(*gzip));
+  if (!gzip) return NULL;
+
+  do {
+    gzip->conf                = conf;
+    gzip->callbacks           = callbacks;
+    gzip->arg                 = arg;
+    if (gzip->callbacks.on_data == NULL) gzip->callbacks.on_data = dummy_on_data;
+    gzip->gzip                = (z_stream*)calloc(1, sizeof(*gzip->gzip));
+    if (gzip->conf.get_header) {
+      gzip->header            = (gz_header*)calloc(1, sizeof(*gzip->header));
+    }
+    if (gzip->conf.chunk_size<=0) gzip->conf.chunk_size = EHTTP_GZIP_CHUNK_SIZE_DEFAULT;
+    gzip->chunk                 = (char*)malloc(gzip->conf.chunk_size);
+    if (!gzip->gzip || (gzip->conf.get_header && !gzip->header) || !gzip->chunk) break;
+    gzip->gzip->zalloc      = Z_NULL;
+    gzip->gzip->zfree       = Z_NULL;
+    gzip->gzip->opaque      = Z_NULL;
+
+  // 863      windowBits can also be greater than 15 for optional gzip decoding.  Add
+  // 864    32 to windowBits to enable zlib and gzip decoding with automatic header
+  // 865    detection, or add 16 to decode only the gzip format (the zlib format will
+  // 866    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+  // 867    CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+  // 868    below), inflate() will not automatically decode concatenated gzip streams.
+  // 869    inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+  // 870    would need to be reset to continue decoding a subsequent gzip stream.
+    int32_t ret = inflateInit2(gzip->gzip, 32); // 32/16? 32/16 + MAX_WBITS
+    if (ret != Z_OK) break;
+    if (gzip->header) {
+      ret = inflateGetHeader(gzip->gzip, gzip->header);
+    }
+    if (ret != Z_OK) break;
+
+    gzip->gzip->next_out           = (z_const Bytef*)gzip->chunk;
+    gzip->gzip->avail_out          = gzip->conf.chunk_size;
+    gzip->state = EHTTP_GZIP_READY;
+    return gzip;
+  } while (0);
+
+  ehttp_gzip_destroy(gzip);
+  return NULL;
+}
+
+ehttp_gzip_t* ehttp_gzip_create_compressor(ehttp_gzip_conf_t conf, ehttp_gzip_callbacks_t callbacks, void *arg);
+
+void ehttp_gzip_destroy(ehttp_gzip_t *gzip) {
+  ehttp_gzip_cleanup(gzip);
+
+  free(gzip);
+}
+
+int32_t ehttp_gzip_write(ehttp_gzip_t *gzip, const char *buf, int32_t len) {
+  if (gzip->state != EHTTP_GZIP_READY) return -1;
+  if (len <= 0) return 0;
+
+  gzip->gzip->next_in        = (z_const Bytef*)buf;
+  gzip->gzip->avail_in       = len;
+
+  while (gzip->gzip->avail_in) {
+    int32_t ret;
+    if (gzip->header) {
+      ret = inflate(gzip->gzip, Z_BLOCK);
+    } else {
+      ret = inflate(gzip->gzip, Z_SYNC_FLUSH);
+    }
+    if (ret != Z_OK && ret != Z_STREAM_END) return -1;
+
+    if (gzip->gzip->avail_out>0) {
+      if (ret!=Z_STREAM_END) continue;
+    }
+
+    int32_t len = gzip->gzip->next_out - (z_const Bytef*)gzip->chunk;
+
+    gzip->gzip->next_out[0] = '\0';
+    gzip->callbacks.on_data(gzip, gzip->arg, gzip->chunk, len);
+    gzip->gzip->next_out       = (z_const Bytef*)gzip->chunk;
+    gzip->gzip->avail_out      = gzip->conf.chunk_size;
+  }
+
+  return 0;
+}
+
+int32_t ehttp_gzip_finish(ehttp_gzip_t *gzip) {
+  if (gzip->state != EHTTP_GZIP_READY) return -1;
+
+  gzip->gzip->next_in        = NULL;
+  gzip->gzip->avail_in       = 0;
+
+  int32_t ret;
+  ret = inflate(gzip->gzip, Z_FINISH);
+
+  if (ret != Z_STREAM_END) return -1;
+
+  int32_t len = gzip->gzip->next_out - (z_const Bytef*)gzip->chunk;
+
+  gzip->gzip->next_out[0] = '\0';
+  gzip->callbacks.on_data(gzip, gzip->arg, gzip->chunk, len);
+  gzip->gzip->next_out       = NULL;
+  gzip->gzip->avail_out      = 0;
+
+  return 0;
+}
+
diff --git a/src/plugins/http/src/httpHandle.c b/src/plugins/http/src/httpHandle.c
new file mode 100644
index 0000000000000000000000000000000000000000..b50217cfc4bffe0835de8a744a78997426db6d3b
--- /dev/null
+++ b/src/plugins/http/src/httpHandle.c
@@ -0,0 +1,58 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "httpInt.h"
+#include "httpResp.h"
+#include "httpContext.h"
+#include "httpHandle.h"
+
+bool httpDecodeRequest(HttpContext* pContext) {
+  if (pContext->decodeMethod->decodeFp == NULL) {
+    return false;
+  }
+
+  return (*pContext->decodeMethod->decodeFp)(pContext);
+}
+
+/**
+ * Process the request from http pServer
+ */
+bool httpProcessData(HttpContext* pContext) {
+  if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_HANDLING)) {
+    httpTrace("context:%p, fd:%d, state:%s not in ready state, stop process request", pContext, pContext->fd,
+              httpContextStateStr(pContext->state));
+    httpCloseContextByApp(pContext);
+    return false;
+  }
+
+  // handle Cross-domain request
+  if (strcmp(pContext->parser->method, "OPTIONS") == 0) {
+    httpTrace("context:%p, fd:%d, process options request", pContext, pContext->fd);
+    httpSendOptionResp(pContext, "process options request success");
+  } else {
+    if (!httpDecodeRequest(pContext)) {
+      /*
+       * httpCloseContextByApp has been called when parsing the error
+       */
+      //httpCloseContextByApp(pContext);
+    } else {
+      httpProcessRequest(pContext);
+    }
+  }
+
+  return true;
+}
diff --git a/src/plugins/http/src/httpJson.c b/src/plugins/http/src/httpJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..7600fb3e43af236c59a5afea0a4ad981019b2b32
--- /dev/null
+++ b/src/plugins/http/src/httpJson.c
@@ -0,0 +1,451 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "tglobal.h"
+#include "http.h"
+#include "httpLog.h"
+#include "httpJson.h"
+#include "httpResp.h"
+#include "httpUtil.h"
+
+#define MAX_NUM_STR_SZ 25
+
+char JsonItmTkn = ',';
+char JsonObjStt = '{';
+char JsonObjEnd = '}';
+char JsonArrStt = '[';
+char JsonArrEnd = ']';
+char JsonStrStt = '\"';
+char JsonStrEnd = '\"';
+char JsonPairTkn = ':';
+char JsonNulTkn[] = "null";
+char JsonTrueTkn[] = "true";
+char JsonFalseTkn[] = "false";
+
+int32_t httpWriteBufByFd(struct HttpContext* pContext, const char* buf, int32_t sz) {
+  int32_t len;
+  int32_t countWait = 0;
+  int32_t writeLen = 0;
+
+  do {
+    if (pContext->fd > 2){
+      len = (int32_t)taosSend(pContext->fd, buf + writeLen, (size_t)(sz - writeLen), MSG_NOSIGNAL);
+    }
+    else {
+      return sz;
+    }
+
+    if (len < 0) {
+      httpDebug("context:%p, fd:%d, socket write errno:%d:%s, times:%d", pContext, pContext->fd, errno, strerror(errno), countWait);
+      if (++countWait > HTTP_WRITE_RETRY_TIMES) break;
+      taosMsleep(HTTP_WRITE_WAIT_TIME_MS);
+      continue;
+    } else if (len == 0) {
+      httpDebug("context:%p, fd:%d, socket write errno:%d:%s, connect already closed", pContext, pContext->fd, errno, strerror(errno));
+      break;
+    } else {
+      countWait = 0;
+      writeLen += len;
+    }
+  } while (writeLen < sz);
+
+  return writeLen;
+}
+
+int32_t httpWriteBuf(struct HttpContext* pContext, const char* buf, int32_t sz) {
+  int32_t writeSz = httpWriteBufByFd(pContext, buf, sz);
+  if (writeSz != sz) {
+    httpError("context:%p, fd:%d, dataSize:%d, writeSize:%d, failed to send response:\n%s", pContext, pContext->fd, sz,
+              writeSz, buf);
+  } else {
+    httpTrace("context:%p, fd:%d, dataSize:%d, writeSize:%d, response:\n%s", pContext, pContext->fd, sz, writeSz, buf);
+  }
+
+  return writeSz;
+}
+
+int32_t httpWriteBufNoTrace(struct HttpContext *pContext, const char *buf, int32_t sz) {
+  int32_t writeSz = httpWriteBufByFd(pContext, buf, sz);
+  if (writeSz != sz) {
+    httpError("context:%p, fd:%d, dataSize:%d, writeSize:%d, failed to send response", pContext, pContext->fd, sz,
+              writeSz);
+  }
+
+  return writeSz;
+}
+
+int32_t httpWriteJsonBufBody(JsonBuf* buf, bool isTheLast) {
+  int32_t remain = 0;
+  char sLen[24];
+  uint64_t srcLen = (uint64_t) (buf->lst - buf->buf);
+
+  if (buf->pContext->fd <= 0) {
+    httpTrace("context:%p, fd:%d, write json body error", buf->pContext, buf->pContext->fd);
+    buf->pContext->fd = -1;
+  }
+
+  /*
+   * HTTP servers often use compression to optimize transmission, for example
+   * with Content-Encoding: gzip or Content-Encoding: deflate.
+   * If both compression and chunked encoding are enabled, then the content stream is first compressed, then chunked;
+   * so the chunk encoding itself is not compressed, and the data in each chunk is not compressed individually.
+   * The remote endpoint then decodes the stream by concatenating the chunks and uncompressing the result.
+   */
+
+  if (buf->pContext->parser->acceptEncodingGzip == 0 || !tsHttpEnableCompress) {
+    if (buf->lst == buf->buf) {
+      httpTrace("context:%p, fd:%d, no data need dump", buf->pContext, buf->pContext->fd);
+      return 0;  // there is no data to dump.
+    } else {
+      int32_t len = sprintf(sLen, "%lx\r\n", srcLen);
+      httpTrace("context:%p, fd:%d, write body, chunkSize:%" PRIu64 ", response:\n%s", buf->pContext, buf->pContext->fd,
+                srcLen, buf->buf);
+      httpWriteBufNoTrace(buf->pContext, sLen, len);
+      remain = httpWriteBufNoTrace(buf->pContext, buf->buf, (int32_t)srcLen);
+    }
+  } else {
+    char compressBuf[JSON_BUFFER_SIZE] = {0};
+    int32_t compressBufLen = JSON_BUFFER_SIZE;
+    int32_t ret = httpGzipCompress(buf->pContext, buf->buf, srcLen, compressBuf, &compressBufLen, isTheLast);
+    if (ret == 0) {
+      if (compressBufLen > 0) {
+        int32_t len = sprintf(sLen, "%x\r\n", compressBufLen);
+        httpTrace("context:%p, fd:%d, write body, chunkSize:%" PRIu64 ", compressSize:%d, last:%d, response:\n%s",
+                  buf->pContext, buf->pContext->fd, srcLen, compressBufLen, isTheLast, buf->buf);
+        httpWriteBufNoTrace(buf->pContext, sLen, len);
+        remain = httpWriteBufNoTrace(buf->pContext, (const char*)compressBuf, compressBufLen);
+      } else {
+        httpDebug("context:%p, fd:%d, last:%d, compress already dumped, response:\n%s", buf->pContext,
+                  buf->pContext->fd, isTheLast, buf->buf);
+        remain = 0;  // there is no data to dump.
+      }
+    } else {
+      httpError("context:%p, fd:%d, failed to compress data, chunkSize:%" PRIu64 ", last:%d, error:%d, response:\n%s",
+                buf->pContext, buf->pContext->fd, srcLen, isTheLast, ret, buf->buf);
+      remain = 0;
+    }
+  }
+
+  httpWriteBufNoTrace(buf->pContext, "\r\n", 2);
+  buf->total += (int32_t)(buf->lst - buf->buf);
+  buf->lst = buf->buf;
+  memset(buf->buf, 0, (size_t)buf->size);
+  return remain;
+}
+
+void httpWriteJsonBufHead(JsonBuf* buf) {
+  if (buf->pContext->fd <= 0) {
+    buf->pContext->fd = -1;
+  }
+
+  char msg[1024] = {0};
+  int32_t  len = -1;
+
+  if (buf->pContext->parser->acceptEncodingGzip == 0 || !tsHttpEnableCompress) {
+    len = sprintf(msg, httpRespTemplate[HTTP_RESPONSE_CHUNKED_UN_COMPRESS], httpVersionStr[buf->pContext->parser->httpVersion],
+                  httpKeepAliveStr[buf->pContext->parser->keepAlive]);
+  } else {
+    len = sprintf(msg, httpRespTemplate[HTTP_RESPONSE_CHUNKED_COMPRESS], httpVersionStr[buf->pContext->parser->httpVersion],
+                  httpKeepAliveStr[buf->pContext->parser->keepAlive]);
+  }
+
+  httpWriteBuf(buf->pContext, (const char*)msg, len);
+}
+
+void httpWriteJsonBufEnd(JsonBuf* buf) {
+  if (buf->pContext->fd <= 0) {
+    httpTrace("context:%p, fd:%d, json buf fd is 0", buf->pContext, buf->pContext->fd);
+    buf->pContext->fd = -1;
+  }
+
+  httpWriteJsonBufBody(buf, true);
+  httpWriteBufNoTrace(buf->pContext, "0\r\n\r\n", 5);  // end of chunked resp
+}
+
+void httpInitJsonBuf(JsonBuf* buf, struct HttpContext* pContext) {
+  buf->lst = buf->buf;
+  buf->total = 0;
+  buf->size = JSON_BUFFER_SIZE;  // option setting
+  buf->pContext = pContext;
+  memset(buf->lst, 0, JSON_BUFFER_SIZE);
+
+  if (pContext->parser->acceptEncodingGzip == 1 && tsHttpEnableCompress) {
+    httpGzipCompressInit(buf->pContext);
+  }
+
+  httpTrace("context:%p, fd:%d, json buffer initialized", buf->pContext, buf->pContext->fd);
+}
+
+void httpJsonItemToken(JsonBuf* buf) {
+  char c = *(buf->lst - 1);
+  if (c == JsonArrStt || c == JsonObjStt || c == JsonPairTkn || c == JsonItmTkn) {
+    return;
+  }
+  if (buf->lst > buf->buf) httpJsonToken(buf, JsonItmTkn);
+}
+
+void httpJsonString(JsonBuf* buf, char* sVal, int32_t len) {
+  httpJsonItemToken(buf);
+  httpJsonToken(buf, JsonStrStt);
+  httpJsonPrint(buf, sVal, len);
+  httpJsonToken(buf, JsonStrEnd);
+}
+
+void httpJsonOriginString(JsonBuf* buf, char* sVal, int32_t len) {
+  httpJsonItemToken(buf);
+  httpJsonPrint(buf, sVal, len);
+}
+
+void httpJsonStringForTransMean(JsonBuf* buf, char* sVal, int32_t maxLen) {
+  httpJsonItemToken(buf);
+  httpJsonToken(buf, JsonStrStt);
+
+  if (sVal != NULL) {
+    // dispose transferred meaning byte
+    char* lastPos = sVal;
+    char* curPos = sVal;
+
+    for (int32_t i = 0; i < maxLen; ++i) {
+      if (*curPos == 0) {
+        break;
+      }
+
+      if (*curPos == '\"') {
+        httpJsonPrint(buf, lastPos, (int32_t)(curPos - lastPos));
+        curPos++;
+        lastPos = curPos;
+        httpJsonPrint(buf, "\\\"", 2);
+      } else if (*curPos == '\\') {
+        httpJsonPrint(buf, lastPos, (int32_t)(curPos - lastPos));
+        curPos++;
+        lastPos = curPos;
+        httpJsonPrint(buf, "\\\\", 2);
+      } else {
+        curPos++;
+      }
+    }
+
+    if (*lastPos) {
+      httpJsonPrint(buf, lastPos, (int32_t)(curPos - lastPos));
+    }
+  }
+
+  httpJsonToken(buf, JsonStrEnd);
+}
+
+void httpJsonInt64(JsonBuf* buf, int64_t num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%" PRId64, num);
+}
+
+void httpJsonTimestamp(JsonBuf* buf, int64_t t, bool us) {
+  char ts[35] = {0};
+  struct tm *ptm;
+  int32_t precision = 1000;
+  if (us) {
+    precision = 1000000;
+  }
+
+  time_t tt = t / precision;
+  ptm = localtime(&tt);
+  int32_t length = (int32_t) strftime(ts, 35, "%Y-%m-%d %H:%M:%S", ptm);
+  if (us) {
+    length += snprintf(ts + length, 8, ".%06ld", t % precision);
+  } else {
+    length += snprintf(ts + length, 5, ".%03ld", t % precision);
+  }
+
+  httpJsonString(buf, ts, length);
+}
+
+void httpJsonUtcTimestamp(JsonBuf* buf, int64_t t, bool us) {
+  char ts[40] = {0};
+  struct tm *ptm;
+  int32_t precision = 1000;
+  if (us) {
+    precision = 1000000;
+  }
+
+  time_t tt = t / precision;
+  ptm = localtime(&tt);
+  int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", ptm);
+  if (us) {
+    length += snprintf(ts + length, 8, ".%06ld", t % precision);
+  } else {
+    length += snprintf(ts + length, 5, ".%03ld", t % precision);
+  }
+  length += (int32_t)strftime(ts + length, 40 - length, "%z", ptm);
+
+  httpJsonString(buf, ts, length);
+}
+
+void httpJsonInt(JsonBuf* buf, int32_t num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%d", num);
+}
+
+void httpJsonFloat(JsonBuf* buf, float num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  if (isinf(num) || isnan(num)) {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
+  } else if (num > 1E10 || num < -1E10) {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5e", num);
+  } else {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.5f", num);
+  }
+}
+
+void httpJsonDouble(JsonBuf* buf, double num) {
+  httpJsonItemToken(buf);
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);
+  if (isinf(num) || isnan(num)) {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "null");
+  } else if (num > 1E10 || num < -1E10) {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9e", num);
+  } else {
+    buf->lst += snprintf(buf->lst, MAX_NUM_STR_SZ, "%.9f", num);
+  }
+}
+
+void httpJsonNull(JsonBuf* buf) { httpJsonString(buf, "null", 4); }
+
+void httpJsonBool(JsonBuf* buf, int32_t val) {
+  if (val == 0)
+    httpJsonPrint(buf, JsonFalseTkn, sizeof(JsonFalseTkn));
+  else
+    httpJsonPrint(buf, JsonTrueTkn, sizeof(JsonTrueTkn));
+}
+
+void httpJsonPairHead(JsonBuf* buf, char* name, int32_t len) {
+  httpJsonItemToken(buf);
+  httpJsonString(buf, name, len);
+  httpJsonToken(buf, JsonPairTkn);
+}
+
+void httpJsonPair(JsonBuf* buf, char* name, int32_t nameLen, char* sVal, int32_t valLen) {
+  httpJsonPairHead(buf, name, nameLen);
+  httpJsonString(buf, sVal, valLen);
+}
+
+void httpJsonPairOriginString(JsonBuf* buf, char* name, int32_t nameLen, char* sVal, int32_t valLen) {
+  httpJsonPairHead(buf, name, nameLen);
+  httpJsonOriginString(buf, sVal, valLen);
+}
+
+void httpJsonPairIntVal(JsonBuf* buf, char* name, int32_t nNameLen, int32_t num) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonInt(buf, num);
+}
+
+void httpJsonPairInt64Val(JsonBuf* buf, char* name, int32_t nNameLen, int64_t num) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonInt64(buf, num);
+}
+
+void httpJsonPairBoolVal(JsonBuf* buf, char* name, int32_t nNameLen, int32_t num) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonBool(buf, num);
+}
+
+void httpJsonPairFloatVal(JsonBuf* buf, char* name, int32_t nNameLen, float num) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonFloat(buf, num);
+}
+
+void httpJsonPairDoubleVal(JsonBuf* buf, char* name, int32_t nNameLen, double num) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonDouble(buf, num);
+}
+
+void httpJsonPairNullVal(JsonBuf* buf, char* name, int32_t nNameLen) {
+  httpJsonPairHead(buf, name, nNameLen);
+  httpJsonNull(buf);
+}
+
+void httpJsonPairArray(JsonBuf* buf, char* name, int32_t len, httpJsonBuilder fnBuilder, void* dsHandle) {
+  httpJsonPairHead(buf, name, len);
+  httpJsonArray(buf, fnBuilder, dsHandle);
+}
+
+void httpJsonPairObject(JsonBuf* buf, char* name, int32_t len, httpJsonBuilder fnBuilder, void* dsHandle) {
+  httpJsonPairHead(buf, name, len);
+  httpJsonObject(buf, fnBuilder, dsHandle);
+}
+
+void httpJsonObject(JsonBuf* buf, httpJsonBuilder fnBuilder, void* dsHandle) {
+  httpJsonItemToken(buf);
+  httpJsonToken(buf, JsonObjStt);
+  (*fnBuilder)(buf, dsHandle);
+  httpJsonToken(buf, JsonObjEnd);
+}
+
+void httpJsonArray(JsonBuf* buf, httpJsonBuilder fnBuilder, void* jsonHandle) {
+  httpJsonItemToken(buf);
+  httpJsonToken(buf, JsonArrStt);
+  (*fnBuilder)(buf, jsonHandle);
+  httpJsonToken(buf, JsonArrEnd);
+}
+
+void httpJsonTestBuf(JsonBuf* buf, int32_t safety) {
+  if ((buf->lst - buf->buf + safety) < buf->size) return;
+  // buf->slot = *buf->lst;
+  httpWriteJsonBufBody(buf, false);
+}
+
+void httpJsonToken(JsonBuf* buf, char c) {
+  httpJsonTestBuf(buf, MAX_NUM_STR_SZ);  // maybe object stack
+  *buf->lst++ = c;
+}
+
+void httpJsonPrint(JsonBuf* buf, const char* json, int32_t len) {
+  if (len == 0 || len >= JSON_BUFFER_SIZE) {
+    return;
+  }
+
+  if (len > buf->size) {
+    httpWriteJsonBufBody(buf, false);
+    httpJsonPrint(buf, json, len);
+    // buf->slot = json[len - 1];
+    return;
+  }
+  httpJsonTestBuf(buf, len + 2);
+  memcpy(buf->lst, json, (size_t)len);
+  buf->lst += len;
+}
+
+void httpJsonPairStatus(JsonBuf* buf, int32_t code) {
+  if (code == 0) {
+    httpJsonPair(buf, "status", 6, "succ", 4);
+  } else {
+    httpJsonPair(buf, "status", 6, "error", 5);
+    httpJsonItemToken(buf);
+    httpJsonPairIntVal(buf, "code", 4, code & 0XFFFF);
+    httpJsonItemToken(buf);
+    if (code == TSDB_CODE_MND_DB_NOT_SELECTED) {
+      httpJsonPair(buf, "desc", 4, "failed to create database", 23);
+    } else if (code == TSDB_CODE_MND_INVALID_TABLE_NAME) {
+      httpJsonPair(buf, "desc", 4, "failed to create table", 22);
+    } else {
+      httpJsonPair(buf, "desc", 4, (char*)tstrerror(code), (int32_t)strlen(tstrerror(code)));
+    }
+  }
+}
diff --git a/src/plugins/http/src/httpParser.c b/src/plugins/http/src/httpParser.c
new file mode 100644
index 0000000000000000000000000000000000000000..b84483453736aac7693c9ec671ec5a27c4178072
--- /dev/null
+++ b/src/plugins/http/src/httpParser.c
@@ -0,0 +1,1139 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "httpLog.h"
+#include "httpContext.h"
+#include "httpParser.h"
+#include "httpGzip.h"
+#include "httpAuth.h"
+
+static void httpOnData(ehttp_gzip_t *gzip, void *arg, const char *buf, int32_t len);
+
+static HttpStatus httpStatusCodes[] = {
+  {100, "Continue"},
+  {101, "Switching Protocol"},
+  {102, "Processing (WebDAV)"},
+  {103, "Early Hints"},
+  {200, "OK"},
+  {201, "Created"},
+  {202, "Accepted"},
+  {203, "Non-Authoritative Information"},
+  {204, "No Content"},
+  {205, "Reset Content"},
+  {206, "Partial Content"},
+  {207, "Multi-Status (WebDAV)"},
+  {208, "Already Reported (WebDAV)"},
+  {226, "IM Used (HTTP Delta encoding)"},
+  {300, "Multiple Choice"},
+  {301, "Moved Permanently"},
+  {302, "Found"},
+  {303, "See Other"},
+  {304, "Not Modified"},
+  {305, "Use Proxy"},
+  {306, "unused"},
+  {307, "Temporary Redirect"},
+  {308, "Permanent Redirect"},
+  {400, "Bad Request"},
+  {401, "Unauthorized"},
+  {402, "Payment Required"},
+  {403, "Forbidden"},
+  {404, "Not Found"},
+  {405, "Method Not Allowed"},
+  {406, "Not Acceptable"},
+  {407, "Proxy Authentication Required"},
+  {408, "Request Timeout"},
+  {409, "Conflict"},
+  {410, "Gone"},
+  {411, "Length Required"},
+  {412, "Precondition Failed"},
+  {413, "Payload Too Large"},
+  {414, "URI Too Long"},
+  {415, "Unsupported Media Type"},
+  {416, "Range Not Satisfiable"},
+  {417, "Expectation Failed"},
+  {418, "I'm a teapot"},
+  {421, "Misdirected Request"},
+  {422, "Unprocessable Entity (WebDAV)"},
+  {423, "Locked (WebDAV)"},
+  {424, "Failed Dependency (WebDAV)"},
+  {425, "Too Early"},
+  {426, "Upgrade Required"},
+  {428, "Precondition Required"},
+  {429, "Too Many Requests"},
+  {431, "Request Header Fields Too Large"},
+  {451, "Unavailable For Legal Reasons"},
+  {500, "Internal Server Error"},
+  {501, "Not Implemented"},
+  {502, "Bad Gateway"},
+  {503, "Service Unavailable"},
+  {504, "Gateway Timeout"},
+  {505, "HTTP Version Not Supported"},
+  {506, "Variant Also Negotiates"},
+  {507, "Insufficient Storage"},
+  {508, "Loop Detected (WebDAV)"},
+  {510, "Not Extended"},
+  {511, "Network Authentication Required"},
+  {0,   NULL}
+};
+
+char *httpGetStatusDesc(int32_t statusCode) {
+  HttpStatus *p = httpStatusCodes;
+  while (p->code != 0) {
+    if (p->code == statusCode) return p->desc;
+    ++p;
+  }
+  return "Unknow status code";
+}
+
+static void httpCleanupString(HttpString *str) {
+  free(str->str);
+  str->str = NULL;
+  str->pos = 0;
+  str->size = 0;
+}
+
+static int32_t httpAppendString(HttpString *str, const char *s, int32_t len) {
+  if (str->size == 0) {
+    str->pos = 0;
+    str->size = 64;
+    str->str = malloc(str->size);
+  } else if (str->pos + len + 1 >= str->size) {
+    str->size += len;
+    str->size *= 4;
+    str->str = realloc(str->str, str->size);
+  } else {
+  }
+
+  if (str->str == NULL) return -1;
+
+  memcpy(str->str + str->pos, s, len);
+  str->pos += len;
+  str->str[str->pos] = 0;
+  return 0;
+}
+
+static void httpClearString(HttpString *str) {
+  if (str->str) {
+    str->str[0] = '\0';
+    str->pos    = 0;
+  }
+}
+
+static int32_t httpOnError(HttpParser *parser, int32_t httpCode, int32_t parseCode) {
+  HttpContext *pContext = parser->pContext;
+  if (httpCode != 0) parser->httpCode = httpCode;
+  if (parseCode != 0) parser->parseCode = parseCode;
+
+  httpError("context:%p, fd:%d, parse failed, httpCode:%d parseCode:%d reason:%s", pContext, pContext->fd, httpCode,
+            parseCode & 0XFFFF, tstrerror(parseCode));
+  return 0;
+}
+
+static int32_t httpOnRequestLine(HttpParser *pParser, char *method, char *target, char *version) {
+  HttpContext *pContext = pParser->pContext;
+  httpDebug("context:%p, fd:%d, method:%s target:%s version:%s", pContext, pContext->fd, method, target, version);
+
+  // parse url
+  char *pStart = target + 1;
+  for (int32_t i = 0; i < HTTP_MAX_URL; i++) {
+    char *pSeek = strchr(pStart, '/');
+    if (pSeek == NULL) {
+      (void)httpAppendString(pParser->path + i, pStart, strlen(pStart));
+      break;
+    } else {
+      (void)httpAppendString(pParser->path + i, pStart, (int32_t)(pSeek - pStart));
+    }
+    pStart = pSeek + 1;
+  }
+
+  // parse decode method
+  for (int32_t i = 0; i < tsHttpServer.methodScannerLen; i++) {
+    HttpDecodeMethod *method = tsHttpServer.methodScanner[i];
+    if (strcmp(method->module, pParser->path[0].str) == 0) {
+      pContext->decodeMethod = method;
+      break;
+    }
+  }
+
+  if (pContext->decodeMethod != NULL) {
+    httpTrace("context:%p, fd:%d, decode method is %s", pContext, pContext->fd, pContext->decodeMethod->module);
+  } else {
+    httpError("context:%p, fd:%d, the url is not support, target:%s", pContext, pContext->fd, target);
+    httpOnError(pParser, 0, TSDB_CODE_HTTP_UNSUPPORT_URL);
+    return -1;
+  }
+
+  // parse version
+  if (pParser->httpVersion < HTTP_VERSION_10 || pParser->httpVersion > HTTP_VERSION_12) {
+    httpError("context:%p, fd:%d, unsupport httpVersion %d", pContext, pContext->fd, pParser->httpVersion);
+    httpOnError(pParser, 0, TSDB_CODE_HTTP_INVALID_VERSION);
+  } else {
+    httpTrace("context:%p, fd:%d, httpVersion:1.%d", pContext, pContext->fd, pParser->httpVersion);
+  }
+
+  return 0;
+}
+
+static int32_t httpOnStatusLine(HttpParser *pParser, int32_t code, const char *reason) {
+  HttpContext *pContext = pParser->pContext;
+  httpError("context:%p, fd:%d, status line, code:%d reason:%s", pContext, pContext->fd, code, reason);
+  return 0;
+}
+
+static int32_t httpOnParseHeaderField(HttpParser *parser, const char *key, const char *val) {
+  HttpContext *pContext = parser->pContext;
+  httpTrace("context:%p, fd:%d, key:%s val:%s", pContext, pContext->fd, key, val);
+
+  if (0 == strcasecmp(key, "Content-Length")) {
+    int32_t len = 0;
+    int32_t bytes = 0;
+    int32_t n = sscanf(val, "%d%n", &len, &bytes);
+    if (n == 1 && bytes == strlen(val)) {
+      parser->contentLength = len;
+      parser->chunkSize = len;
+      parser->contentLengthSpecified = 1;
+      httpTrace("context:%p, fd:%d, contentLength:%d chunkSize:%d contentLengthSpecified:%d", pContext, pContext->fd,
+                parser->contentLength, parser->chunkSize, parser->contentLengthSpecified);
+      return 0;
+    } else {
+      httpError("context:%p, fd:%d, failed to parser %s:%s", pContext, pContext->fd, key, val);
+      httpOnError(parser, 0, TSDB_CODE_HTTP_INVALID_CONTENT_LENGTH);
+      return -1;
+    }
+  }
+
+  else if (0 == strcasecmp(key, "Accept-Encoding")) {
+    if (strstr(val, "gzip")) {
+      parser->acceptEncodingGzip = 1;
+      httpTrace("context:%p, fd:%d, acceptEncodingGzip:%d", pContext, pContext->fd, parser->acceptEncodingGzip);
+    }
+    if (strstr(val, "chunked")) {
+      parser->acceptEncodingChunked = 1;
+      httpTrace("context:%p, fd:%d, acceptEncodingChunked:%d", pContext, pContext->fd, parser->acceptEncodingChunked);
+    }
+    return 0;
+  }
+
+  else if (strncasecmp(key, "Connection: ", 12) == 0) {
+    if (strncasecmp(val, "Keep-Alive", 10) == 0) {
+      parser->keepAlive = HTTP_KEEPALIVE_ENABLE;
+    } else {
+      parser->keepAlive = HTTP_KEEPALIVE_DISABLE;
+    }
+    httpTrace("context:%p, fd:%d, keepAlive:%d", pContext, pContext->fd, pContext->parser->keepAlive);
+  }
+
+#if 0
+  else if (0 == strcasecmp(key, "Content-Encoding")) {
+    if (0 == strcmp(val, "gzip")) {
+      parser->contentChunked = 1;
+      httpTrace("context:%p, fd:%d, contentChunked:%d", pContext, pContext->fd, parser->contentChunked);
+    }
+    return 0;
+  }
+  #endif
+
+  else if (0 == strcasecmp(key, "Transfer-Encoding") || 0 == strcasecmp(key, "Content-Encoding")) {
+    if (strstr(val, "gzip")) {
+      parser->transferGzip = 1;
+      ehttp_gzip_conf_t      conf = {0};
+      ehttp_gzip_callbacks_t callbacks = {0};
+
+      callbacks.on_data = httpOnData;
+
+      parser->gzip = ehttp_gzip_create_decompressor(conf, callbacks, parser);
+
+      if (!parser->gzip) {
+        httpError("context:%p, fd:%d, failed to create gzip decompressor", pContext, pContext->fd);
+        httpOnError(parser, 0, TSDB_CODE_HTTP_CREATE_GZIP_FAILED);
+        return -1;
+      }
+    }
+    if (strstr(val, "chunked")) {
+      parser->transferChunked = 1;
+      httpTrace("context:%p, fd:%d, transferChunked:%d", pContext, pContext->fd, parser->transferChunked);
+    }
+    return 0;
+  }
+
+  else if (0 == strcasecmp(key, "Authorization")) {
+    char *  t = NULL;
+    char *  s = NULL;
+    int32_t bytes = 0;
+    int32_t n = sscanf(val, "%ms %ms%n", &t, &s, &bytes);
+    if (n == 2 && t && s && bytes == strlen(val)) {
+      if (strcmp(t, "Basic") == 0) {
+        free(parser->authContent);
+        parser->authContent = s;
+        parser->authType = HTTP_BASIC_AUTH;
+        s = NULL;
+        free(t);
+        free(s);
+        httpTrace("context:%p, fd:%d, basic auth:%s", pContext, pContext->fd, parser->authContent);
+        int32_t ok = httpParseBasicAuthToken(pContext, parser->authContent, strlen(parser->authContent));
+        if (ok != 0) {
+          httpOnError(parser, 0, TSDB_CODE_HTTP_INVALID_BASIC_AUTH);
+          return -1;
+        }
+        return 0;
+      } else if (strcmp(t, "Taosd") == 0) {
+        free(parser->authContent);
+        parser->authContent = s;
+        parser->authType = HTTP_TAOSD_AUTH;
+        s = NULL;
+        free(t);
+        free(s);
+        httpTrace("context:%p, fd:%d, taosd auth:%s", pContext, pContext->fd, parser->authContent);
+        int32_t ok = httpParseTaosdAuthToken(pContext, parser->authContent, strlen(parser->authContent));
+        if (ok != 0) {
+          httpOnError(parser, 0, TSDB_CODE_HTTP_INVALID_TAOSD_AUTH);
+          return -1;
+        }
+        return 0;
+      } else {
+        parser->authType = HTTP_INVALID_AUTH;
+        httpError("context:%p, fd:%d, invalid auth, t:%s s:%s", pContext, pContext->fd, t, s);
+        httpOnError(parser, 0, TSDB_CODE_HTTP_INVALID_AUTH_TYPE);
+        free(t);
+        free(s);
+        return -1;
+      }
+    } else {
+      parser->authType = HTTP_INVALID_AUTH;
+      httpError("context:%p, fd:%d, parse auth failed, t:%s s:%s", pContext, pContext->fd, t, s);
+      httpOnError(parser, 0, TSDB_CODE_HTTP_INVALID_AUTH_FORMAT);
+      free(t);
+      free(s);
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+static int32_t httpOnBody(HttpParser *parser, const char *chunk, int32_t len) {
+  HttpContext *pContext = parser->pContext;
+  HttpString * buf = &parser->body;
+  if (parser->parseCode != TSDB_CODE_SUCCESS) return -1;
+
+  if (buf->size <= 0) {
+    buf->size = MIN(len + 2, HTTP_BUFFER_SIZE);
+    buf->str = malloc(buf->size);
+  }
+
+  int32_t newSize = buf->pos + len + 1;
+  if (newSize >= buf->size) {
+    if (buf->size >= HTTP_BUFFER_SIZE) {
+      httpError("context:%p, fd:%d, failed parse body, exceeding buffer size %d", pContext, pContext->fd, buf->size);
+      httpOnError(parser, 0, TSDB_CODE_HTTP_REQUSET_TOO_BIG);
+      return -1;
+    }
+
+    newSize = MAX(newSize, HTTP_BUFFER_INIT);
+    newSize *= 4;
+    newSize = MIN(newSize, HTTP_BUFFER_SIZE);
+    buf->str = realloc(buf->str, newSize);
+    buf->size = newSize;
+    
+    if (buf->str == NULL) {
+      httpError("context:%p, fd:%d, failed parse body, realloc %d failed", pContext, pContext->fd, buf->size);
+      httpOnError(parser, 0, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      return -1;
+    }
+  }
+
+  memcpy(buf->str + buf->pos, chunk, len);
+  buf->pos += len;
+  buf->str[buf->pos] = 0;
+
+  return 0;
+}
+
+static int32_t httpOnEnd(HttpParser *parser) {
+  HttpContext *pContext = parser->pContext;
+  parser->parsed = true;
+
+  if (parser->parseCode != TSDB_CODE_SUCCESS) {
+    return -1;
+  }
+
+  httpTrace("context:%p, fd:%d, parse success", pContext, pContext->fd);
+  return 0;
+}
+
+static HTTP_PARSER_STATE httpTopStack(HttpParser *parser) {
+  HttpStack *stack = &parser->stacks;
+  ASSERT(stack->pos >= 1);
+
+  return stack->stacks[stack->pos - 1];
+}
+
+static int32_t httpPushStack(HttpParser *parser, HTTP_PARSER_STATE state) {
+  HttpStack *stack = &parser->stacks;
+  if (stack->size == 0) {
+    stack->pos = 0;
+    stack->size = 32;
+    stack->stacks = malloc(stack->size * sizeof(int8_t));
+  } else if (stack->pos + 1 > stack->size) {
+    stack->size *= 2;
+    stack->stacks = realloc(stack->stacks, stack->size * sizeof(int8_t));
+  } else {
+  }
+
+  if (stack->stacks == NULL) return -1;
+
+  stack->stacks[stack->pos] = state;
+  stack->pos++;
+
+  return 0;
+}
+
+static int32_t httpPopStack(HttpParser *parser) {
+  HttpStack *stack = &parser->stacks;
+  ASSERT(stack->pos >= 1);
+  stack->pos--;
+  return 0;
+}
+
+static void httpClearStack(HttpStack *stack) {
+  stack->pos = 0;
+}
+
+static int32_t httpCleanupStack(HttpStack *stack) {
+  free(stack->stacks);
+  memset(stack, 0, sizeof(HttpStack));
+
+  return 0;
+}
+
+void httpInitParser(HttpParser *parser) {
+  HttpContext *pContext = parser->pContext;
+  httpTrace("context:%p, fd:%d, init parser", pContext, pContext->fd);
+
+  parser->parsed = false;
+  parser->inited = 1;
+  parser->httpVersion = 0;
+  parser->acceptEncodingGzip = 0;
+  parser->acceptEncodingChunked = 0;
+  parser->contentLengthSpecified = 0;
+  parser->contentChunked = 0;
+  parser->transferGzip = 0;
+  parser->transferChunked = 0;
+  parser->keepAlive = 0;
+  parser->authType = 0;
+  parser->contentLength = 0;
+  parser->chunkSize = 0;
+  parser->receivedChunkSize = 0;
+  parser->receivedSize = 0;
+  parser->statusCode = 0;
+  parser->httpCode = 0;
+  parser->parseCode = 0;
+
+  free(parser->method);         parser->method          = NULL;
+  free(parser->target);         parser->target          = NULL;
+  free(parser->version);        parser->version         = NULL;
+  free(parser->reasonPhrase);   parser->reasonPhrase    = NULL;
+  free(parser->key);            parser->key             = NULL;
+  free(parser->val);            parser->val             = NULL;
+  free(parser->authContent);    parser->authContent     = NULL;
+  
+  httpClearStack(&parser->stacks);
+  httpClearString(&parser->str);
+  httpClearString(&parser->body);
+  for (int32_t i = 0; i < HTTP_MAX_URL; ++i) {
+    httpClearString(&parser->path[i]);
+  }
+
+  if (parser->gzip != NULL) {
+    ehttp_gzip_destroy(parser->gzip);
+    parser->gzip = NULL;
+  }
+
+  httpPushStack(parser, HTTP_PARSER_BEGIN);
+}
+
+HttpParser *httpCreateParser(HttpContext *pContext) {
+  HttpParser *parser = calloc(1, sizeof(HttpParser));
+  if (!parser) return NULL;
+  httpTrace("context:%p, fd:%d, create parser", pContext, pContext->fd);
+
+  parser->pContext = pContext;
+  return parser;
+}
+
+void httpClearParser(HttpParser *parser) {
+  HttpContext *pContext = parser->pContext;
+  httpTrace("context:%p, fd:%d, clear parser", pContext, pContext->fd);
+
+  pContext->parser->inited = 0;
+  pContext->parser->parsed = false;
+}
+
+void httpDestroyParser(HttpParser *parser) {
+  if (!parser) return;
+
+  HttpContext *pContext = parser->pContext;
+  httpTrace("context:%p, fd:%d, destroy parser", pContext, pContext->fd);
+
+  free(parser->method);         parser->method          = NULL;
+  free(parser->target);         parser->target          = NULL;
+  free(parser->version);        parser->version         = NULL;
+  free(parser->reasonPhrase);   parser->reasonPhrase    = NULL;
+  free(parser->key);            parser->key             = NULL;
+  free(parser->val);            parser->val             = NULL;
+  free(parser->authContent);    parser->authContent     = NULL;
+  
+  httpCleanupStack(&parser->stacks);
+  httpCleanupString(&parser->str);
+  httpCleanupString(&parser->body);
+  for (int32_t i = 0; i < HTTP_MAX_URL; ++i) {
+    httpCleanupString(&parser->path[i]);
+  }
+
+  if (parser->gzip != NULL) {
+    ehttp_gzip_destroy(parser->gzip);
+    parser->gzip = NULL;
+  }
+
+  free(parser);
+}
+
+#define is_token(c)      (strchr("!#$%&'*+-.^_`|~", c) || isdigit(c) || isalpha(c))
+
+char *httpDecodeUrl(const char *enc) {
+  int32_t ok = 1;
+  HttpString str = {0};
+  while (*enc) {
+    char *p = strchr(enc, '%');
+    if (!p) break;
+    int32_t hex, cnt;
+    int32_t n = sscanf(p+1, "%2x%n", &hex, &cnt);
+    if (n!=1 && cnt !=2) { ok = 0; break; }
+    if (httpAppendString(&str, enc, p-enc)) { ok = 0; break; }
+    char c = (char)hex;
+    if (httpAppendString(&str, &c, 1)) { ok = 0; break; }
+    enc    = p+3;
+  }
+  char *dec = NULL;
+  if (ok && *enc) {
+    if (httpAppendString(&str, enc, strlen(enc))) { ok = 0; }
+  }
+  if (ok) {
+    dec = str.str;
+    str.str = NULL;
+  }
+  httpCleanupString(&str);
+  return dec;
+}
+
+static void httpOnData(ehttp_gzip_t *gzip, void *arg, const char *buf, int32_t len) {
+  HttpParser *parser = (HttpParser*)arg;
+  httpOnBody(parser, buf, len);
+}
+
+static int32_t httpParserOnBegin(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (c == 'G' || c == 'P' || c == 'H' || c == 'D' || c == 'C' || c == 'O' || c == 'T') {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_METHOD_FAILED);
+        break;
+      }
+      httpPopStack(parser);
+      httpPushStack(parser, HTTP_PARSER_REQUEST_OR_RESPONSE);
+      break;
+    }
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_METHOD_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnRquestOrResponse(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (parser->str.pos == 1) {
+      if (c == 'T' && parser->str.str[0] == 'H') {
+        httpPopStack(parser);
+        httpPushStack(parser, HTTP_PARSER_END);
+        httpPushStack(parser, HTTP_PARSER_HEADER);
+        httpPushStack(parser, HTTP_PARSER_CRLF);
+        httpPushStack(parser, HTTP_PARSER_REASON_PHRASE);
+        httpPushStack(parser, HTTP_PARSER_SP);
+        httpPushStack(parser, HTTP_PARSER_STATUS_CODE);
+        httpPushStack(parser, HTTP_PARSER_SP);
+        httpPushStack(parser, HTTP_PARSER_HTTP_VERSION);
+        *again = 1;
+        break;
+      }
+      httpPopStack(parser);
+      httpPushStack(parser, HTTP_PARSER_END);
+      httpPushStack(parser, HTTP_PARSER_HEADER);
+      httpPushStack(parser, HTTP_PARSER_CRLF);
+      httpPushStack(parser, HTTP_PARSER_HTTP_VERSION);
+      httpPushStack(parser, HTTP_PARSER_SP);
+      httpPushStack(parser, HTTP_PARSER_TARGET);
+      httpPushStack(parser, HTTP_PARSER_SP);
+      httpPushStack(parser, HTTP_PARSER_METHOD);
+      *again = 1;
+      break;
+    }
+
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_METHOD_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnMethod(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (isalnum(c) || strchr("!#$%&'*+-.^_`|~", c)) {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_METHOD_FAILED);
+        break;
+      }
+      break;
+    }
+    parser->method = strdup(parser->str.str);
+    if (!parser->method) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_METHOD_FAILED);
+      break;
+    } else {
+      httpTrace("context:%p, fd:%d, httpMethod:%s", pContext, pContext->fd, parser->method);
+    }
+    httpClearString(&parser->str);
+    httpPopStack(parser);
+    *again = 1;
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnTarget(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (!isspace(c) && c != '\r' && c != '\n') {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_TARGET_FAILED);
+        break;
+      }
+      break;
+    }
+    parser->target = strdup(parser->str.str);
+    if (!parser->target) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_TARGET_FAILED);
+      break;
+    }
+    httpClearString(&parser->str);
+    httpPopStack(parser);
+    *again = 1;
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnVersion(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    const char *prefix = "HTTP/1.";
+    int32_t     len = strlen(prefix);
+    if (parser->str.pos < len) {
+      if (prefix[parser->str.pos] != c) {
+        httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_VERSION_FAILED);
+        break;
+      }
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_VERSION_FAILED);
+        break;
+      }
+      break;
+    }
+
+    if (c != '0' && c != '1' && c != '2') {
+      httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_VERSION_FAILED);
+      break;
+    }
+
+    if (httpAppendString(&parser->str, &c, 1)) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_VERSION_FAILED);
+      break;
+    }
+
+    if (c == '0')
+      parser->httpVersion = HTTP_VERSION_10;
+    else if (c == '1')
+      parser->httpVersion = HTTP_VERSION_11;
+    else if (c == '2')
+      parser->httpVersion = HTTP_VERSION_12;
+    else {
+    }
+
+    parser->version = strdup(parser->str.str);
+    if (!parser->version) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_VERSION_FAILED);
+      break;
+    }
+
+    if (parser->method) {
+      ok = httpOnRequestLine(parser, parser->method, parser->target, parser->version);
+    }
+
+    httpClearString(&parser->str);
+    httpPopStack(parser);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnSp(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (c == ' ') {
+      httpPopStack(parser);
+      break;
+    }
+    httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_SP_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnStatusCode(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (isdigit(c)) {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_STATUS_FAILED);
+        break;
+      }
+      if (parser->str.pos < 3) break;
+
+      sscanf(parser->str.str, "%d", &parser->statusCode);
+      httpClearString(&parser->str);
+      httpPopStack(parser);
+      break;
+    }
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_STATUS_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnReasonPhrase(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (c == '\r') {
+      parser->reasonPhrase = strdup(parser->str.str);
+      if (!parser->reasonPhrase) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_PHRASE_FAILED);
+        break;
+      }
+      ok = httpOnStatusLine(parser, parser->statusCode, parser->reasonPhrase);
+      httpClearString(&parser->str);
+      httpPopStack(parser);
+      *again = 1;
+      break;
+    }
+    if (httpAppendString(&parser->str, &c, 1)) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_PHRASE_FAILED);
+      break;
+    }
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserPostProcess(HttpParser *parser) {
+  HttpContext *pContext = parser->pContext;
+  if (parser->gzip) {
+    if (ehttp_gzip_finish(parser->gzip)) {
+      httpError("context:%p, fd:%d, gzip failed", pContext, pContext->fd);
+      httpOnError(parser, 507, TSDB_CODE_HTTP_FINISH_GZIP_FAILED);
+      return -1;
+    }
+  }
+  httpOnEnd(parser);
+  return 0;
+}
+
+static int32_t httpParserOnCrlf(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    const char *s   = "\r\n";
+    int32_t   len   = strlen(s);
+    if (s[parser->str.pos] != c) {
+      httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_CRLF_FAILED);
+      break;
+    }
+    if (httpAppendString(&parser->str, &c, 1)) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_CRLF_FAILED);
+      break;
+    }
+    if (parser->str.pos == len) {
+      httpClearString(&parser->str);
+      httpPopStack(parser);
+      if (httpTopStack(parser) == HTTP_PARSER_END) {
+        ok = httpParserPostProcess(parser);
+      }
+    }
+    break;
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnHeader(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (c == '\r') {
+      httpPopStack(parser);
+      if (parser->transferChunked) {
+        httpPushStack(parser, HTTP_PARSER_CHUNK_SIZE);
+        httpPushStack(parser, HTTP_PARSER_CRLF);
+      } else {
+        if (parser->contentLength > 0) {
+          httpPushStack(parser, HTTP_PARSER_CHUNK);
+        }
+        httpPushStack(parser, HTTP_PARSER_CRLF);
+      }
+      *again = 1;
+      break;
+    }
+    if (c != ' ' && c != '\t' && c != ':') {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_HEADER_FAILED);
+        break;
+      }
+      httpPushStack(parser, HTTP_PARSER_CRLF);
+      httpPushStack(parser, HTTP_PARSER_HEADER_VAL);
+      httpPushStack(parser, HTTP_PARSER_SP);
+      httpPushStack(parser, HTTP_PARSER_HEADER_KEY);
+      break;
+    }
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_HEADER_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnHeaderKey(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (isalnum(c) || strchr("!#$%&'*+-.^_`|~", c)) {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_HEADER_KEY_FAILED);
+        break;
+      }
+      break;
+    }
+    if (c == ':') {
+      parser->key        = strdup(parser->str.str);
+      if (!parser->key) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_HEADER_KEY_FAILED);
+        break;
+      }
+      httpClearString(&parser->str);
+      httpPopStack(parser);
+      break;
+    }
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_HEADER_KEY_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnHeaderVal(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (c != '\r' && c != '\n' && (!isspace(c) || parser->str.pos > 0)) {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        parser->parseCode = TSDB_CODE_HTTP_PARSE_HEADER_VAL_FAILED;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_HEADER_VAL_FAILED);
+        break;
+      }
+      break;
+    }
+    const char *val = parser->str.str;
+    ok = httpOnParseHeaderField(parser, parser->key, val);
+    free(parser->key);
+    parser->key = NULL;
+    val = NULL;
+    if (ok == -1) break;
+    httpClearString(&parser->str);
+    httpPopStack(parser);
+    *again = 1;
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnChunkSize(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  int32_t bytes;
+  int32_t len;
+  int32_t n;
+  do {
+    if (isxdigit(c)) {
+      if (httpAppendString(&parser->str, &c, 1)) {
+        httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_CHUNK_SIZE_FAILED);
+        break;
+      }
+      break;
+    }
+    if (c == '\r') {
+      n = sscanf(parser->str.str, "%x%n", &len, &bytes);
+      if (n == 1 && bytes == strlen(parser->str.str) && len >= 0) {
+        if (len == 0) {
+          if (parser->contentLengthSpecified == 0 || parser->receivedSize == parser->contentLength) {
+            httpClearString(&parser->str);
+            httpPopStack(parser);
+            httpPushStack(parser, HTTP_PARSER_CRLF);
+            httpPushStack(parser, HTTP_PARSER_CRLF);
+            *again = 1;
+            break;
+          }
+        } else {
+          if (parser->contentLengthSpecified == 0 || parser->receivedSize + len <= parser->contentLength) {
+            parser->chunkSize = len;
+            httpClearString(&parser->str);
+            httpPopStack(parser);
+            httpPushStack(parser, HTTP_PARSER_CHUNK_SIZE);
+            httpPushStack(parser, HTTP_PARSER_CRLF);
+            httpPushStack(parser, HTTP_PARSER_CHUNK);
+            httpPushStack(parser, HTTP_PARSER_CRLF);
+            *again = 1;
+            break;
+          }
+        }
+      }
+    }
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    ok = -1;
+    httpOnError(parser, 400, TSDB_CODE_HTTP_PARSE_CHUNK_SIZE_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnChunk(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    if (httpAppendString(&parser->str, &c, 1)) {
+      httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
+      ok = -1;
+      httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_CHUNK_FAILED);
+      break;
+    }
+    ++parser->receivedSize;
+    ++parser->receivedChunkSize;
+    if (parser->receivedChunkSize < parser->chunkSize) break;
+
+    if (parser->gzip) {
+      if (ehttp_gzip_write(parser->gzip, parser->str.str, parser->str.pos)) {
+        httpError("context:%p, fd:%d, gzip failed", pContext, pContext->fd);
+        ok = -1;
+        httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_CHUNK_FAILED);
+        break;
+      }
+    } else {
+      httpOnBody(parser, parser->str.str, parser->str.pos);
+    }
+    parser->receivedChunkSize = 0;
+    httpClearString(&parser->str);
+    httpPopStack(parser);
+    if (httpTopStack(parser) == HTTP_PARSER_END) {
+      ok = httpParserPostProcess(parser);
+    }
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParserOnEnd(HttpParser *parser, HTTP_PARSER_STATE state, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  do {
+    ok = -1;
+    httpError("context:%p, fd:%d, parser state:%d, unexpected char:[%c]%02x", pContext, pContext->fd, state, c, c);
+    httpOnError(parser, 507, TSDB_CODE_HTTP_PARSE_END_FAILED);
+  } while (0);
+  return ok;
+}
+
+static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
+  HttpContext *pContext = parser->pContext;
+  int32_t ok = 0;
+  HTTP_PARSER_STATE state = httpTopStack(parser);
+  do {
+    if (state == HTTP_PARSER_BEGIN) {
+      ok = httpParserOnBegin(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_REQUEST_OR_RESPONSE) {
+      ok = httpParserOnRquestOrResponse(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_METHOD) {
+      ok = httpParserOnMethod(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_TARGET) {
+      ok = httpParserOnTarget(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_HTTP_VERSION) {
+      ok = httpParserOnVersion(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_SP) {
+      ok = httpParserOnSp(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_STATUS_CODE) {
+      ok = httpParserOnStatusCode(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_REASON_PHRASE) {
+      ok = httpParserOnReasonPhrase(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_CRLF) {
+      ok = httpParserOnCrlf(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_HEADER) {
+      ok = httpParserOnHeader(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_HEADER_KEY) {
+      ok = httpParserOnHeaderKey(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_HEADER_VAL) {
+      ok = httpParserOnHeaderVal(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_CHUNK_SIZE) {
+      ok = httpParserOnChunkSize(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_CHUNK) {
+      ok = httpParserOnChunk(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_END) {
+      ok = httpParserOnEnd(parser, state, c, again);
+      break;
+    }
+    if (state == HTTP_PARSER_ERROR) {
+      ok = -2;
+      break;
+    }
+
+    ok = -1;
+    httpError("context:%p, fd:%d, unknown parse state:%d", pContext, pContext->fd, state);
+    httpOnError(parser, 500, TSDB_CODE_HTTP_PARSE_INVALID_STATE);
+  } while (0);
+
+  if (ok == -1) {
+    httpError("context:%p, fd:%d, failed to parse, state:%d", pContext, pContext->fd, state);
+    httpPushStack(parser, HTTP_PARSER_ERROR);
+  }
+
+  if (ok == -2) {
+    ok = -1;
+    httpError("context:%p, fd:%d, failed to parse, invalid state", pContext, pContext->fd);
+    httpOnError(parser, 500, TSDB_CODE_HTTP_PARSE_ERROR_STATE);
+  }
+
+  return ok;
+}
+
+int32_t httpParseBuf(HttpParser *parser, const char *buf, int32_t len) {
+  HttpContext *pContext = parser->pContext;
+  const char *p = buf;
+  int32_t     ret = 0;
+  int32_t     i = 0;
+
+  while (i < len) {
+    int32_t again = 0;
+    ret = httpParseChar(parser, *p, &again);
+    if (ret != 0) {
+      httpError("context:%p, fd:%d, parse failed, ret:%d i:%d len:%d buf:%s", pContext, pContext->fd, ret, i, len, buf);
+      break;
+    }
+    if (again) continue;
+    ++p;
+    ++i;
+  }
+
+  return ret;
+}
diff --git a/src/plugins/http/src/httpQueue.c b/src/plugins/http/src/httpQueue.c
new file mode 100644
index 0000000000000000000000000000000000000000..86a97a6abe251e1fa99219b9fb63a525ba89f7d4
--- /dev/null
+++ b/src/plugins/http/src/httpQueue.c
@@ -0,0 +1,149 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tqueue.h"
+#include "tnote.h"
+#include "taos.h"
+#include "tsclient.h"
+#include "httpInt.h"
+#include "httpContext.h"
+#include "httpSql.h"
+#include "httpResp.h"
+#include "httpAuth.h"
+#include "httpSession.h"
+
+typedef struct {
+  pthread_t thread;
+  int32_t   workerId;
+} SHttpWorker;
+
+typedef struct {
+  int32_t      num;
+  SHttpWorker *httpWorker;
+} SHttpWorkerPool;
+
+typedef struct {
+  void *param;
+  void *result;
+  int32_t numOfRows;
+  void (*fp)(void *param, void *result, int32_t numOfRows);
+} SHttpResult;
+
+static SHttpWorkerPool tsHttpPool;
+static taos_qset tsHttpQset;
+static taos_queue tsHttpQueue;
+
+void httpDispatchToResultQueue(void *param, TAOS_RES *result, int32_t numOfRows, void (*fp)(void *param, void *result, int32_t numOfRows)) {
+  if (tsHttpQueue != NULL) {
+    SHttpResult *pMsg = (SHttpResult *)taosAllocateQitem(sizeof(SHttpResult));
+    pMsg->param = param;
+    pMsg->result = result;
+    pMsg->numOfRows = numOfRows;
+    pMsg->fp = fp;
+    taosWriteQitem(tsHttpQueue, TAOS_QTYPE_RPC, pMsg);
+  } else {
+    (*fp)(param, result, numOfRows);
+  }
+}
+
+static void *httpProcessResultQueue(void *param) {
+  SHttpResult *pMsg;
+  int32_t type;
+  void *unUsed;
+  
+  while (1) {
+    if (taosReadQitemFromQset(tsHttpQset, &type, (void **)&pMsg, &unUsed) == 0) {
+      httpDebug("httpResultQueue: got no message from qset, exiting...");
+      break;
+    }
+
+    httpTrace("context:%p, res:%p will be processed in result queue", pMsg->param, pMsg->result);    
+    (*pMsg->fp)(pMsg->param, pMsg->result, pMsg->numOfRows);  
+    taosFreeQitem(pMsg);
+  }
+
+  return NULL;
+}
+
+static bool httpAllocateResultQueue() {
+  tsHttpQueue = taosOpenQueue();
+  if (tsHttpQueue == NULL) return false;
+
+  taosAddIntoQset(tsHttpQset, tsHttpQueue, NULL);
+
+  for (int32_t i = 0; i < tsHttpPool.num; ++i) {
+    SHttpWorker *pWorker = tsHttpPool.httpWorker + i;
+    pWorker->workerId = i;
+
+    pthread_attr_t thAttr;
+    pthread_attr_init(&thAttr);
+    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+    if (pthread_create(&pWorker->thread, &thAttr, httpProcessResultQueue, pWorker) != 0) {
+      httpError("failed to create thread to process http result queue, reason:%s", strerror(errno));
+    }
+
+    pthread_attr_destroy(&thAttr);
+    httpDebug("http result worker:%d is launched, total:%d", pWorker->workerId, tsHttpPool.num);
+  }
+
+   httpInfo("http result queue is opened");
+  return true;
+}
+
+static void httpFreeResultQueue() {
+  taosCloseQueue(tsHttpQueue);
+  tsHttpQueue = NULL;
+}
+
+bool httpInitResultQueue() {
+  tsHttpQset = taosOpenQset();
+
+  tsHttpPool.num = tsHttpMaxThreads;
+  tsHttpPool.httpWorker = (SHttpWorker *)calloc(sizeof(SHttpWorker), tsHttpPool.num);
+
+  if (tsHttpPool.httpWorker == NULL) return -1;
+  for (int32_t i = 0; i < tsHttpPool.num; ++i) {
+    SHttpWorker *pWorker = tsHttpPool.httpWorker + i;
+    pWorker->workerId = i;
+  }
+
+  return httpAllocateResultQueue();
+}
+
+void httpCleanupResultQueue() {
+  httpFreeResultQueue();
+
+  for (int32_t i = 0; i < tsHttpPool.num; ++i) {
+    SHttpWorker *pWorker = tsHttpPool.httpWorker + i;
+    if (pWorker->thread) {
+      taosQsetThreadResume(tsHttpQset);
+    }
+  }
+
+  for (int32_t i = 0; i < tsHttpPool.num; ++i) {
+    SHttpWorker *pWorker = tsHttpPool.httpWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
+
+  taosCloseQset(tsHttpQset);
+  free(tsHttpPool.httpWorker);
+
+  httpInfo("http result queue is closed");
+}
diff --git a/src/plugins/http/src/httpResp.c b/src/plugins/http/src/httpResp.c
new file mode 100644
index 0000000000000000000000000000000000000000..755dad2d850c24192f5eee35c49492378ba8fb73
--- /dev/null
+++ b/src/plugins/http/src/httpResp.c
@@ -0,0 +1,187 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "httpLog.h"
+#include "httpResp.h"
+#include "httpJson.h"
+#include "httpContext.h"
+
+const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
+
+const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/1.2"};
+
+const char *httpRespTemplate[] = {
+    // HTTP_RESPONSE_JSON_OK
+    // HTTP_RESPONSE_JSON_ERROR
+    "{\"status\":\"succ\",\"code\":%d,\"desc\":\"%s\"}",
+    "{\"status\":\"error\",\"code\":%d,\"desc\":\"%s\"}",
+    // HTTP_RESPONSE_OK
+    // HTTP_RESPONSE_ERROR
+    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n",
+    "%s %d %s\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n",
+    // HTTP_RESPONSE_CHUNKED_UN_COMPRESS, HTTP_RESPONSE_CHUNKED_COMPRESS
+    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nTransfer-Encoding: chunked\r\n\r\n",
+    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Encoding: gzip\r\nTransfer-Encoding: chunked\r\n\r\n",
+    // HTTP_RESPONSE_OPTIONS
+    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\nAccess-Control-Allow-Methods: *\r\nAccess-Control-Max-Age: 3600\r\nAccess-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, authorization\r\n\r\n",
+    // HTTP_RESPONSE_GRAFANA
+    "%s 200 OK\r\nAccess-Control-Allow-Origin:*\r\n%sAccess-Control-Allow-Methods:POST, GET, OPTIONS, DELETE, PUT\r\nAccess-Control-Allow-Headers:Accept, Content-Type\r\nContent-Type: application/json;charset=utf-8\r\nContent-Length: %d\r\n\r\n"
+};
+
+static void httpSendErrorRespImp(HttpContext *pContext, int32_t httpCode, char *httpCodeStr, int32_t errNo, const char *desc) {
+  httpError("context:%p, fd:%d, code:%d, error:%s", pContext, pContext->fd, httpCode, desc);
+
+  char head[512] = {0};
+  char body[512] = {0};
+
+  int32_t bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_ERROR], errNo, desc);
+  int32_t headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_ERROR], httpVersionStr[pContext->parser->httpVersion],
+                            httpCode, httpCodeStr, httpKeepAliveStr[pContext->parser->keepAlive], bodyLen);
+
+  httpWriteBuf(pContext, head, headLen);
+  httpWriteBuf(pContext, body, bodyLen);
+  httpCloseContextByApp(pContext);
+}
+
+void httpSendErrorResp(HttpContext *pContext, int32_t errNo) {
+  int32_t httpCode = 500;
+  if (errNo == TSDB_CODE_SUCCESS)
+    httpCode = 200;
+  else if (errNo == TSDB_CODE_HTTP_SERVER_OFFLINE)
+    httpCode = 404;
+  else if (errNo == TSDB_CODE_HTTP_UNSUPPORT_URL)
+    httpCode = 404;
+  else if (errNo == TSDB_CODE_HTTP_INVLALID_URL)
+    httpCode = 404;
+  else if (errNo == TSDB_CODE_HTTP_NO_ENOUGH_MEMORY)
+    httpCode = 507;
+  else if (errNo == TSDB_CODE_HTTP_REQUSET_TOO_BIG)
+    httpCode = 413;
+  else if (errNo == TSDB_CODE_HTTP_NO_AUTH_INFO)
+    httpCode = 401;
+  else if (errNo == TSDB_CODE_HTTP_NO_MSG_INPUT)
+    httpCode = 400;
+  else if (errNo == TSDB_CODE_HTTP_NO_SQL_INPUT)
+    httpCode = 400;
+  else if (errNo == TSDB_CODE_HTTP_NO_EXEC_USEDB)
+    httpCode = 400;
+  else if (errNo == TSDB_CODE_HTTP_SESSION_FULL)
+    httpCode = 421;
+  else if (errNo == TSDB_CODE_HTTP_GEN_TAOSD_TOKEN_ERR)
+    httpCode = 507;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_MULTI_REQUEST)
+    httpCode = 400;
+  else if (errNo == TSDB_CODE_HTTP_CREATE_GZIP_FAILED)
+    httpCode = 507;
+  else if (errNo == TSDB_CODE_HTTP_FINISH_GZIP_FAILED)
+    httpCode = 507;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_VERSION)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_CONTENT_LENGTH)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_AUTH_TYPE)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_AUTH_FORMAT)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_BASIC_AUTH)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_INVALID_TAOSD_AUTH)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_METHOD_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_TARGET_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_VERSION_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_SP_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_STATUS_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_PHRASE_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_CRLF_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_HEADER_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_HEADER_KEY_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_HEADER_VAL_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_CHUNK_SIZE_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_CHUNK_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_END_FAILED)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_INVALID_STATE)
+    httpCode = 406;
+  else if (errNo == TSDB_CODE_HTTP_PARSE_ERROR_STATE)
+    httpCode = 406;
+  else
+    httpCode = 400;
+
+  if (pContext->parser->httpCode != 0) {
+    httpCode = pContext->parser->httpCode;
+  }
+
+  char *httpCodeStr = httpGetStatusDesc(httpCode);
+  httpSendErrorRespImp(pContext, httpCode, httpCodeStr, errNo & 0XFFFF, tstrerror(errNo));
+}
+
+void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char *errMsg) {
+  int32_t httpCode = 400;
+  char    temp[512] = {0};
+  int32_t len = sprintf(temp, "invalid SQL: %s", errMsg);
+
+  for (int32_t i = 0; i < len; ++i) {
+    if (temp[i] == '\"') {
+      temp[i] = '\'';
+    } else if (temp[i] == '\n') {
+        temp[i] = ' ';
+    } else {}
+  }
+
+  httpSendErrorRespImp(pContext, httpCode, "Bad Request", TSDB_CODE_TSC_INVALID_SQL & 0XFFFF, temp);
+}
+
+void httpSendSuccResp(HttpContext *pContext, char *desc) {
+  char head[1024] = {0};
+  char body[1024] = {0};
+
+  int32_t bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_OK], TSDB_CODE_SUCCESS, desc);
+  int32_t headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_OK], httpVersionStr[pContext->parser->httpVersion],
+                            httpKeepAliveStr[pContext->parser->keepAlive], bodyLen);
+
+  httpWriteBuf(pContext, head, headLen);
+  httpWriteBuf(pContext, body, bodyLen);
+  httpCloseContextByApp(pContext);
+}
+
+void httpSendOptionResp(HttpContext *pContext, char *desc) {
+  char head[1024] = {0};
+  char body[1024] = {0};
+
+  int32_t bodyLen = sprintf(body, httpRespTemplate[HTTP_RESPONSE_JSON_OK], TSDB_CODE_SUCCESS, desc);
+  int32_t headLen = sprintf(head, httpRespTemplate[HTTP_RESPONSE_OPTIONS], httpVersionStr[pContext->parser->httpVersion],
+                            httpKeepAliveStr[pContext->parser->keepAlive], bodyLen);
+
+  httpWriteBuf(pContext, head, headLen);
+  httpWriteBuf(pContext, body, bodyLen);
+  httpCloseContextByApp(pContext);
+}
diff --git a/src/plugins/http/src/httpRestHandle.c b/src/plugins/http/src/httpRestHandle.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a28c431ef313d36bd54b686e583e0dfb2313c0f
--- /dev/null
+++ b/src/plugins/http/src/httpRestHandle.c
@@ -0,0 +1,147 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "httpLog.h"
+#include "httpRestHandle.h"
+#include "httpRestJson.h"
+
+static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest};
+static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest};
+static HttpEncodeMethod restEncodeSqlTimestampMethod = {
+  .startJsonFp          = restStartSqlJson,         
+  .stopJsonFp           = restStopSqlJson, 
+  .buildQueryJsonFp     = restBuildSqlTimestampJson,
+  .buildAffectRowJsonFp = restBuildSqlAffectRowsJson, 
+  .initJsonFp           = NULL, 
+  .cleanJsonFp          = NULL,
+  .checkFinishedFp      = NULL,
+  .setNextCmdFp         = NULL
+};
+
+static HttpEncodeMethod restEncodeSqlLocalTimeStringMethod = {
+  .startJsonFp          = restStartSqlJson,         
+  .stopJsonFp           = restStopSqlJson, 
+  .buildQueryJsonFp     = restBuildSqlLocalTimeStringJson,
+  .buildAffectRowJsonFp = restBuildSqlAffectRowsJson, 
+  .initJsonFp           = NULL, 
+  .cleanJsonFp          = NULL,
+  .checkFinishedFp      = NULL,
+  .setNextCmdFp         = NULL
+};
+
+static HttpEncodeMethod restEncodeSqlUtcTimeStringMethod = {
+  .startJsonFp          = restStartSqlJson,         
+  .stopJsonFp           = restStopSqlJson, 
+  .buildQueryJsonFp     = restBuildSqlUtcTimeStringJson,
+  .buildAffectRowJsonFp = restBuildSqlAffectRowsJson, 
+  .initJsonFp           = NULL, 
+  .cleanJsonFp          = NULL,
+  .checkFinishedFp      = NULL,
+  .setNextCmdFp         = NULL
+};
+
+void restInitHandle(HttpServer* pServer) {
+  httpAddMethod(pServer, &restDecodeMethod);
+  httpAddMethod(pServer, &restDecodeMethod2);
+}
+
+bool restGetUserFromUrl(HttpContext* pContext) {
+  HttpParser* pParser = pContext->parser;
+  if (pParser->path[REST_USER_URL_POS].pos >= TSDB_USER_LEN || pParser->path[REST_USER_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->user, pParser->path[REST_USER_URL_POS].str, TSDB_USER_LEN);
+  return true;
+}
+
+bool restGetPassFromUrl(HttpContext* pContext) {
+  HttpParser* pParser = pContext->parser;
+  if (pParser->path[REST_PASS_URL_POS].pos >= TSDB_PASSWORD_LEN || pParser->path[REST_PASS_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->pass, pParser->path[REST_PASS_URL_POS].str, TSDB_PASSWORD_LEN);
+  return true;
+}
+
+bool restProcessLoginRequest(HttpContext* pContext) {
+  httpDebug("context:%p, fd:%d, user:%s, process restful login msg", pContext, pContext->fd, pContext->user);
+  pContext->reqType = HTTP_REQTYPE_LOGIN;
+  return true;
+}
+
+bool restProcessSqlRequest(HttpContext* pContext, int32_t timestampFmt) {
+  httpDebug("context:%p, fd:%d, user:%s, process restful sql msg", pContext, pContext->fd, pContext->user);
+
+  char* sql = pContext->parser->body.str;
+  if (sql == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_SQL_INPUT);
+    return false;
+  }
+
+
+  /*
+   * for async test
+   *
+  if (httpCheckUsedbSql(sql)) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_EXEC_USEDB);
+    return false;
+  }
+  */
+
+  HttpSqlCmd* cmd = &(pContext->singleCmd);
+  cmd->nativSql = sql;
+
+  pContext->reqType = HTTP_REQTYPE_SINGLE_SQL;
+  if (timestampFmt == REST_TIMESTAMP_FMT_LOCAL_STRING) {
+    pContext->encodeMethod = &restEncodeSqlLocalTimeStringMethod;
+  } else if (timestampFmt == REST_TIMESTAMP_FMT_TIMESTAMP) {
+    pContext->encodeMethod = &restEncodeSqlTimestampMethod;
+  } else if (timestampFmt == REST_TIMESTAMP_FMT_UTC_STRING) {
+    pContext->encodeMethod = &restEncodeSqlUtcTimeStringMethod;
+  }
+
+  return true;
+}
+
+bool restProcessRequest(struct HttpContext* pContext) {
+  if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "login")) {
+    restGetUserFromUrl(pContext);
+    restGetPassFromUrl(pContext);
+  }
+
+  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_AUTH_INFO);
+    return false;
+  }
+
+  if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sql")) {
+    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_LOCAL_STRING);
+  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sqlt")) {
+    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_TIMESTAMP);
+  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "sqlutc")) {
+    return restProcessSqlRequest(pContext, REST_TIMESTAMP_FMT_UTC_STRING);
+  } else if (httpUrlMatch(pContext, REST_ACTION_URL_POS, "login")) {
+    return restProcessLoginRequest(pContext);
+  } else {
+  }
+
+  httpSendErrorResp(pContext, TSDB_CODE_HTTP_INVLALID_URL);
+  return false;
+}
diff --git a/src/plugins/http/src/httpRestJson.c b/src/plugins/http/src/httpRestJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8912331a367d2f5fe0e5b659bd6b4a4ad1f43ae
--- /dev/null
+++ b/src/plugins/http/src/httpRestJson.c
@@ -0,0 +1,198 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "httpLog.h"
+#include "httpJson.h"
+#include "httpRestHandle.h"
+#include "httpRestJson.h"
+
+void restBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int32_t affect_rows) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // data row array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+
+  httpJsonItemToken(jsonBuf);
+  httpJsonInt(jsonBuf, affect_rows);
+
+  // data row array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
+  cmd->numOfRows = affect_rows;
+}
+
+void restStartSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  TAOS_FIELD *fields = taos_fetch_fields(result);
+  int32_t     num_fields = taos_num_fields(result);
+
+  httpInitJsonBuf(jsonBuf, pContext);
+  httpWriteJsonBufHead(jsonBuf);
+
+  // object begin
+  httpJsonToken(jsonBuf, JsonObjStt);
+
+  // status, and data
+  httpJsonItemToken(jsonBuf);
+  httpJsonPair(jsonBuf, REST_JSON_STATUS, REST_JSON_STATUS_LEN, REST_JSON_SUCCESS, REST_JSON_SUCCESS_LEN);
+
+  // head begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonPairHead(jsonBuf, REST_JSON_HEAD, REST_JSON_HEAD_LEN);
+  // head array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+
+  if (num_fields == 0) {
+    httpJsonItemToken(jsonBuf);
+    httpJsonString(jsonBuf, REST_JSON_AFFECT_ROWS, REST_JSON_AFFECT_ROWS_LEN);
+  } else {
+    for (int32_t i = 0; i < num_fields; ++i) {
+      httpJsonItemToken(jsonBuf);
+      httpJsonString(jsonBuf, fields[i].name, (int32_t)strlen(fields[i].name));
+    }
+  }
+
+  // head array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
+  // data begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonPairHead(jsonBuf, REST_JSON_DATA, REST_JSON_DATA_LEN);
+  // data array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+}
+
+bool restBuildSqlJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows, int32_t timestampFormat) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return false;
+
+  int32_t     num_fields = taos_num_fields(result);
+  TAOS_FIELD *fields = taos_fetch_fields(result);
+
+  for (int32_t k = 0; k < numOfRows; ++k) {
+    TAOS_ROW row = taos_fetch_row(result);
+    if (row == NULL) {
+      continue;
+    }
+    int32_t* length = taos_fetch_lengths(result);
+
+    // data row array begin
+    httpJsonItemToken(jsonBuf);
+    httpJsonToken(jsonBuf, JsonArrStt);
+
+    for (int32_t i = 0; i < num_fields; i++) {
+      httpJsonItemToken(jsonBuf);
+
+      if (row[i] == NULL) {
+        httpJsonOriginString(jsonBuf, "null", 4);
+        continue;
+      }
+
+      switch (fields[i].type) {
+        case TSDB_DATA_TYPE_BOOL:
+        case TSDB_DATA_TYPE_TINYINT:
+          httpJsonInt(jsonBuf, *((int8_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_SMALLINT:
+          httpJsonInt(jsonBuf, *((int16_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_INT:
+          httpJsonInt(jsonBuf, *((int32_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_BIGINT:
+          httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_FLOAT:
+          httpJsonFloat(jsonBuf, *((float *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_DOUBLE:
+          httpJsonDouble(jsonBuf, *((double *)row[i]));
+          break;
+        case TSDB_DATA_TYPE_BINARY:
+        case TSDB_DATA_TYPE_NCHAR:
+          httpJsonStringForTransMean(jsonBuf, row[i], length[i]);
+          break;
+        case TSDB_DATA_TYPE_TIMESTAMP:
+          if (timestampFormat == REST_TIMESTAMP_FMT_LOCAL_STRING) {
+            httpJsonTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
+          } else if (timestampFormat == REST_TIMESTAMP_FMT_TIMESTAMP) {
+            httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
+          } else {
+            httpJsonUtcTimestamp(jsonBuf, *((int64_t *)row[i]), taos_result_precision(result) == TSDB_TIME_PRECISION_MICRO);
+          }
+          break;
+        default:
+          break;
+      }
+    }
+
+    // data row array end
+    httpJsonToken(jsonBuf, JsonArrEnd);   
+    cmd->numOfRows ++;
+
+    if (pContext->fd <= 0) {
+      httpError("context:%p, fd:%d, user:%s, conn closed, abort retrieve", pContext, pContext->fd, pContext->user);
+      return false;
+    }
+
+    if (cmd->numOfRows >= tsRestRowLimit) {
+      httpDebug("context:%p, fd:%d, user:%s, retrieve rows:%d larger than limit:%d, abort retrieve", pContext,
+                pContext->fd, pContext->user, cmd->numOfRows, tsRestRowLimit);
+      return false;
+    }
+  }
+
+  httpDebug("context:%p, fd:%d, user:%s, retrieved row:%d", pContext, pContext->fd, pContext->user, cmd->numOfRows);
+  return true;
+}
+
+bool restBuildSqlTimestampJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows) {
+  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_TIMESTAMP);
+}
+
+bool restBuildSqlLocalTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows) {
+  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_LOCAL_STRING);
+}
+
+bool restBuildSqlUtcTimeStringJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result, int32_t numOfRows) {
+  return restBuildSqlJson(pContext,cmd, result, numOfRows, REST_TIMESTAMP_FMT_UTC_STRING);
+}
+
+void restStopSqlJson(HttpContext *pContext, HttpSqlCmd *cmd) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // data array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+
+  // rows
+  httpJsonItemToken(jsonBuf);
+  httpJsonPairHead(jsonBuf, REST_JSON_ROWS, REST_JSON_ROWS_LEN);
+  httpJsonInt64(jsonBuf, cmd->numOfRows);
+
+  // object end
+  httpJsonToken(jsonBuf, JsonObjEnd);
+
+  httpWriteJsonBufEnd(jsonBuf);
+}
\ No newline at end of file
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0a7249b512d2c9161592abe91822aefba786c20
--- /dev/null
+++ b/src/plugins/http/src/httpServer.c
@@ -0,0 +1,362 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "tsocket.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tglobal.h"
+#include "httpInt.h"
+#include "httpContext.h"
+#include "httpResp.h"
+#include "httpUtil.h"
+
+#ifndef EPOLLWAKEUP
+ #define EPOLLWAKEUP (1u << 29)
+#endif
+
+static bool httpReadData(HttpContext *pContext);
+
+static void httpStopThread(HttpThread* pThread) {
+  pThread->stop = true;
+
+  // signal the thread to stop, try graceful method first,
+  // and use pthread_cancel when failed
+  struct epoll_event event = { .events = EPOLLIN };
+  eventfd_t fd = eventfd(1, 0);
+  if (fd == -1) {
+    httpError("%s, failed to create eventfd, will call pthread_cancel instead, which may result in data corruption: %s", pThread->label, strerror(errno));
+    pThread->stop = true;
+    pthread_cancel(pThread->thread);
+  } else if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
+    httpError("%s, failed to call epoll_ctl, will call pthread_cancel instead, which may result in data corruption: %s", pThread->label, strerror(errno));
+    pthread_cancel(pThread->thread);
+  }
+
+  pthread_join(pThread->thread, NULL);
+  if (fd != -1) {
+    close(fd);
+  }
+
+  close(pThread->pollFd);
+  pthread_mutex_destroy(&(pThread->threadMutex));
+}
+
+void httpCleanUpConnect() {
+  HttpServer *pServer = &tsHttpServer;
+  if (pServer->pThreads == NULL) return;
+
+  pthread_join(pServer->thread, NULL);
+  for (int32_t i = 0; i < pServer->numOfThreads; ++i) {
+    HttpThread* pThread = pServer->pThreads + i;
+    if (pThread != NULL) {
+      httpStopThread(pThread);
+    }
+  }
+
+  httpDebug("http server:%s is cleaned up", pServer->label);
+}
+
+static void httpProcessHttpData(void *param) {
+  HttpServer  *pServer = &tsHttpServer;
+  HttpThread  *pThread = (HttpThread *)param;
+  HttpContext *pContext;
+  int32_t      fdNum;
+
+  sigset_t set;
+  sigemptyset(&set);
+  sigaddset(&set, SIGPIPE);
+  pthread_sigmask(SIG_SETMASK, &set, NULL);
+
+  while (1) {
+    struct epoll_event events[HTTP_MAX_EVENTS];
+    //-1 means uncertainty, 0-nowait, 1-wait 1 ms, set it from -1 to 1
+    fdNum = epoll_wait(pThread->pollFd, events, HTTP_MAX_EVENTS, 1);
+    if (pThread->stop) {
+      httpDebug("%p, http thread get stop event, exiting...", pThread);
+      break;
+    }
+    if (fdNum <= 0) continue;
+
+    for (int32_t i = 0; i < fdNum; ++i) {
+      pContext = httpGetContext(events[i].data.ptr);
+      if (pContext == NULL) {
+        httpError("context:%p, is already released, close connect", events[i].data.ptr);
+        //epoll_ctl(pThread->pollFd, EPOLL_CTL_DEL, events[i].data.fd, NULL);
+        //taosClose(events[i].data.fd);
+        continue;
+      }
+
+      if (events[i].events & EPOLLPRI) {
+        httpDebug("context:%p, fd:%d, state:%s, EPOLLPRI events occured, accessed:%d, close connect", pContext,
+                  pContext->fd, httpContextStateStr(pContext->state), pContext->accessTimes);
+        httpCloseContextByServer(pContext);
+        continue;
+      }
+
+      if (events[i].events & EPOLLRDHUP) {
+        httpDebug("context:%p, fd:%d, state:%s, EPOLLRDHUP events occured, accessed:%d, close connect", pContext,
+                  pContext->fd, httpContextStateStr(pContext->state), pContext->accessTimes);
+        httpCloseContextByServer(pContext);
+        continue;
+      }
+
+      if (events[i].events & EPOLLERR) {
+        httpDebug("context:%p, fd:%d, state:%s, EPOLLERR events occured, accessed:%d, close connect", pContext,
+                  pContext->fd, httpContextStateStr(pContext->state), pContext->accessTimes);
+        httpCloseContextByServer(pContext);
+        continue;
+      }
+
+      if (events[i].events & EPOLLHUP) {
+        httpDebug("context:%p, fd:%d, state:%s, EPOLLHUP events occured, accessed:%d, close connect", pContext,
+                  pContext->fd, httpContextStateStr(pContext->state), pContext->accessTimes);
+        httpCloseContextByServer(pContext);
+        continue;
+      }
+
+      if (!httpAlterContextState(pContext, HTTP_CONTEXT_STATE_READY, HTTP_CONTEXT_STATE_READY)) {
+        httpDebug("context:%p, fd:%d, state:%s, not in ready state, ignore read events", pContext, pContext->fd,
+                  httpContextStateStr(pContext->state));
+        httpReleaseContext(pContext, true);
+        continue;
+      }
+
+      if (pServer->status != HTTP_SERVER_RUNNING) {
+        httpDebug("context:%p, fd:%d, state:%s, server is not running, accessed:%d, close connect", pContext,
+                  pContext->fd, httpContextStateStr(pContext->state), pContext->accessTimes);
+        httpSendErrorResp(pContext, TSDB_CODE_HTTP_SERVER_OFFLINE);
+        httpNotifyContextClose(pContext);
+      } else {
+        if (httpReadData(pContext)) {
+          (*(pThread->processData))(pContext);
+          atomic_fetch_add_32(&pServer->requestNum, 1);
+        } else {
+          httpReleaseContext(pContext, false);
+        }
+      }
+    }
+  }
+}
+
+static void *httpAcceptHttpConnection(void *arg) {
+  int32_t            connFd = -1;
+  struct sockaddr_in clientAddr;
+  int32_t            threadId = 0;
+  HttpServer *       pServer = &tsHttpServer;
+  HttpThread *       pThread = NULL;
+  HttpContext *      pContext = NULL;
+  int32_t            totalFds = 0;
+
+  sigset_t set;
+  sigemptyset(&set);
+  sigaddset(&set, SIGPIPE);
+  pthread_sigmask(SIG_SETMASK, &set, NULL);
+
+  pServer->fd = taosOpenTcpServerSocket(pServer->serverIp, pServer->serverPort);
+
+  if (pServer->fd < 0) {
+    httpError("http server:%s, failed to open http socket, ip:%s:%u error:%s", pServer->label,
+              taosIpStr(pServer->serverIp), pServer->serverPort, strerror(errno));
+    return NULL;
+  } else {
+    httpInfo("http server init success at %u", pServer->serverPort);
+    pServer->status = HTTP_SERVER_RUNNING;
+  }
+
+  while (1) {
+    socklen_t addrlen = sizeof(clientAddr);
+    connFd = (int32_t)accept(pServer->fd, (struct sockaddr *)&clientAddr, &addrlen);
+    if (connFd == -1) {
+      if (errno == EINVAL) {
+        httpDebug("http server:%s socket was shutdown, exiting...", pServer->label);
+        break;
+      }
+      httpError("http server:%s, accept connect failure, errno:%d reason:%s", pServer->label, errno, strerror(errno));
+      continue;
+    }
+
+    totalFds = 1;
+    for (int32_t i = 0; i < pServer->numOfThreads; ++i) {
+      totalFds += pServer->pThreads[i].numOfContexts;
+    }
+
+#if 0
+    if (totalFds > tsHttpCacheSessions * 100) {
+      httpError("fd:%d, ip:%s:%u, totalFds:%d larger than httpCacheSessions:%d*100, refuse connection", connFd,
+                taosInetNtoa(clientAddr.sin_addr), htons(clientAddr.sin_port), totalFds, tsHttpCacheSessions);
+      taosCloseSocket(connFd);
+      continue;
+    }
+#endif    
+
+    taosKeepTcpAlive(connFd);
+    taosSetNonblocking(connFd, 1);
+
+    // pick up the thread to handle this connection
+    pThread = pServer->pThreads + threadId;
+
+    pContext = httpCreateContext(connFd);
+    if (pContext == NULL) {
+      httpError("fd:%d, ip:%s:%u, no enough resource to allocate http context", connFd, taosInetNtoa(clientAddr.sin_addr),
+                htons(clientAddr.sin_port));
+      taosCloseSocket(connFd);
+      continue;
+    }
+
+    pContext->pThread = pThread;
+    sprintf(pContext->ipstr, "%s:%u", taosInetNtoa(clientAddr.sin_addr), htons(clientAddr.sin_port));
+    
+    struct epoll_event event;
+    event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP | EPOLLERR | EPOLLHUP | EPOLLRDHUP;
+    event.data.ptr = pContext;
+    if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {
+      httpError("context:%p, fd:%d, ip:%s, thread:%s, failed to add http fd for epoll, error:%s", pContext, connFd,
+                pContext->ipstr, pThread->label, strerror(errno));
+      taosClose(pContext->fd);
+      httpReleaseContext(pContext, true);
+      continue;
+    }
+
+    // notify the data process, add into the FdObj list
+    atomic_add_fetch_32(&pThread->numOfContexts, 1);
+    httpDebug("context:%p, fd:%d, ip:%s, thread:%s numOfContexts:%d totalContext:%d, accept a new connection", pContext,
+              connFd, pContext->ipstr, pThread->label, pThread->numOfContexts, totalFds);
+
+    // pick up next thread for next connection
+    threadId++;
+    threadId = threadId % pServer->numOfThreads;
+  }
+
+  close(pServer->fd);
+  return NULL;
+}
+
+bool httpInitConnect() {
+  HttpServer *pServer = &tsHttpServer;
+  pServer->pThreads = calloc(pServer->numOfThreads, sizeof(HttpThread));
+  if (pServer->pThreads == NULL) {
+    httpError("init error no enough memory");
+    return false;
+  }
+
+  HttpThread *pThread = pServer->pThreads;
+  for (int32_t i = 0; i < pServer->numOfThreads; ++i) {
+    sprintf(pThread->label, "%s%d", pServer->label, i);
+    pThread->processData = pServer->processData;
+    pThread->threadId = i;
+
+    if (pthread_mutex_init(&(pThread->threadMutex), NULL) < 0) {
+      httpError("http thread:%s, failed to init HTTP process data mutex, reason:%s", pThread->label, strerror(errno));
+      return false;
+    }
+
+    pThread->pollFd = epoll_create(HTTP_MAX_EVENTS);  // size does not matter
+    if (pThread->pollFd < 0) {
+      httpError("http thread:%s, failed to create HTTP epoll", pThread->label);
+      pthread_mutex_destroy(&(pThread->threadMutex));
+      return false;
+    }
+
+    pthread_attr_t thattr;
+    pthread_attr_init(&thattr);
+    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+    if (pthread_create(&(pThread->thread), &thattr, (void *)httpProcessHttpData, (void *)(pThread)) != 0) {
+      httpError("http thread:%s, failed to create HTTP process data thread, reason:%s", pThread->label,
+                strerror(errno));
+      pthread_mutex_destroy(&(pThread->threadMutex));        
+      return false;
+    }
+    pthread_attr_destroy(&thattr);
+
+    httpDebug("http thread:%p:%s, initialized", pThread, pThread->label);
+    pThread++;
+  }
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  if (pthread_create(&(pServer->thread), &thattr, (void *)httpAcceptHttpConnection, (void *)(pServer)) != 0) {
+    httpError("http server:%s, failed to create Http accept thread, reason:%s", pServer->label, strerror(errno));
+    httpCleanUpConnect();
+    return false;
+  }
+  pthread_attr_destroy(&thattr);
+
+  httpDebug("http server:%s, initialized, ip:%s:%u, numOfThreads:%d", pServer->label, taosIpStr(pServer->serverIp),
+            pServer->serverPort, pServer->numOfThreads);
+  return true;
+}
+
+static bool httpReadData(HttpContext *pContext) {
+  HttpParser *pParser = pContext->parser;
+  if (!pParser->inited) {
+    httpInitParser(pParser);
+  }
+
+  if (pParser->parsed) {
+    httpDebug("context:%p, fd:%d, not in ready state, parsed:%d", pContext, pContext->fd, pParser->parsed);    
+    return false;
+  }
+
+  pContext->accessTimes++;
+  pContext->lastAccessTime = taosGetTimestampSec();
+  char buf[HTTP_STEP_SIZE + 1] = {0};
+
+  while (1) {
+    int32_t nread = (int32_t)taosReadSocket(pContext->fd, buf, HTTP_STEP_SIZE);
+    if (nread > 0) {
+      buf[nread] = '\0';
+      httpTraceL("context:%p, fd:%d, nread:%d content:%s", pContext, pContext->fd, nread, buf);
+      int32_t ok = httpParseBuf(pParser, buf, nread);
+
+      if (ok) {
+        httpError("context:%p, fd:%d, parse failed, ret:%d code:%d close connect", pContext, pContext->fd, ok,
+                  pParser->parseCode);
+        httpSendErrorResp(pContext, pParser->parseCode);
+        httpNotifyContextClose(pContext);
+        return false;
+      }
+
+      if (pParser->parseCode) {
+        httpError("context:%p, fd:%d, parse failed, code:%d close connect", pContext, pContext->fd, pParser->parseCode);
+        httpSendErrorResp(pContext, pParser->parseCode);
+        httpNotifyContextClose(pContext);
+        return false;
+      }
+
+      if (!pParser->parsed) {
+        httpTrace("context:%p, fd:%d, read not finished", pContext, pContext->fd);
+        continue;
+      } else {
+        httpDebug("context:%p, fd:%d, bodyLen:%d", pContext, pContext->fd, pParser->body.pos);
+        return true;
+      }
+    } else if (nread < 0) {
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
+        httpDebug("context:%p, fd:%d, read from socket error:%d, wait another event", pContext, pContext->fd, errno);
+        return false;  // later again
+      } else {
+        httpError("context:%p, fd:%d, read from socket error:%d, close connect", pContext, pContext->fd, errno);
+        return false;
+      }
+    } else {
+      httpError("context:%p, fd:%d, nread:%d, wait another event", pContext, pContext->fd, nread);
+      return false;
+    }
+  }
+}
diff --git a/src/plugins/http/src/httpSession.c b/src/plugins/http/src/httpSession.c
new file mode 100644
index 0000000000000000000000000000000000000000..a96e4433b065885a18b8c0b4f35e2a1925125fc3
--- /dev/null
+++ b/src/plugins/http/src/httpSession.c
@@ -0,0 +1,124 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "taoserror.h"
+#include "tglobal.h"
+#include "tcache.h"
+#include "httpInt.h"
+#include "httpContext.h"
+#include "httpSession.h"
+
+void httpCreateSession(HttpContext *pContext, void *taos) {
+  HttpServer *server = &tsHttpServer;
+  httpReleaseSession(pContext);
+
+  pthread_mutex_lock(&server->serverMutex);
+
+  HttpSession session;
+  memset(&session, 0, sizeof(HttpSession));
+  session.taos = taos;
+  session.refCount = 1;
+  int32_t len = snprintf(session.id, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
+
+  pContext->session = taosCachePut(server->sessionCache, session.id, len, &session, sizeof(HttpSession), tsHttpSessionExpire * 1000);
+  // void *temp = pContext->session;
+  // taosCacheRelease(server->sessionCache, (void **)&temp, false);
+
+  if (pContext->session == NULL) {
+    httpError("context:%p, fd:%d, user:%s, error:%s", pContext, pContext->fd, pContext->user,
+              tstrerror(TSDB_CODE_HTTP_SESSION_FULL));
+    taos_close(taos);
+    pthread_mutex_unlock(&server->serverMutex);
+    return;
+  }
+
+  httpDebug("context:%p, fd:%d, user:%s, create a new session:%p:%p sessionRef:%d", pContext, pContext->fd,
+            pContext->user, pContext->session, pContext->session->taos, pContext->session->refCount);
+  pthread_mutex_unlock(&server->serverMutex);
+}
+
+static void httpFetchSessionImp(HttpContext *pContext) {
+  HttpServer *server = &tsHttpServer;
+  pthread_mutex_lock(&server->serverMutex);
+
+  char sessionId[HTTP_SESSION_ID_LEN];
+  int32_t len = snprintf(sessionId, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
+
+  pContext->session = taosCacheAcquireByKey(server->sessionCache, sessionId, len);
+  if (pContext->session != NULL) {
+    atomic_add_fetch_32(&pContext->session->refCount, 1);
+    httpDebug("context:%p, fd:%d, user:%s, find an exist session:%p:%p, sessionRef:%d", pContext, pContext->fd,
+              pContext->user, pContext->session, pContext->session->taos, pContext->session->refCount);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, session not found", pContext, pContext->fd, pContext->user);
+  }
+
+  pthread_mutex_unlock(&server->serverMutex);
+}
+
+void httpGetSession(HttpContext *pContext) {
+  if (pContext->session == NULL) {
+    httpFetchSessionImp(pContext);
+  } else {
+    char sessionId[HTTP_SESSION_ID_LEN];
+    snprintf(sessionId, HTTP_SESSION_ID_LEN, "%s.%s", pContext->user, pContext->pass);
+    httpReleaseSession(pContext);
+    httpFetchSessionImp(pContext);
+  }
+}
+
+void httpReleaseSession(HttpContext *pContext) {
+  if (pContext == NULL || pContext->session == NULL) return;
+
+  int32_t refCount = atomic_sub_fetch_32(&pContext->session->refCount, 1);
+  assert(refCount >= 0);
+  httpDebug("context:%p, release session:%p:%p, sessionRef:%d", pContext, pContext->session, pContext->session->taos,
+            pContext->session->refCount);
+
+  taosCacheRelease(tsHttpServer.sessionCache, (void **)&pContext->session, false);
+  pContext->session = NULL;
+}
+
+static void httpDestroySession(void *data) {
+  HttpSession *session = data;
+  httpDebug("session:%p:%p, is destroyed, sessionRef:%d", session, session->taos, session->refCount);
+
+  if (session->taos != NULL) {
+    taos_close(session->taos);
+    session->taos = NULL;
+  }
+}
+
+void httpCleanUpSessions() {
+  if (tsHttpServer.sessionCache != NULL) {
+    SCacheObj *cache = tsHttpServer.sessionCache;
+    httpInfo("session cache is cleanuping, size:%" PRIzu "", taosHashGetSize(cache->pHashTable));
+    taosCacheCleanup(tsHttpServer.sessionCache);
+    tsHttpServer.sessionCache = NULL;
+  }
+}
+
+bool httpInitSessions() {
+  tsHttpServer.sessionCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, 5, false, httpDestroySession, "rests");
+  if (tsHttpServer.sessionCache == NULL) {
+    httpError("failed to init session cache");
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
new file mode 100644
index 0000000000000000000000000000000000000000..883fa574ff19958591051512e717a9b512f3e0ce
--- /dev/null
+++ b/src/plugins/http/src/httpSql.c
@@ -0,0 +1,420 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tnote.h"
+#include "taos.h"
+#include "taoserror.h"
+#include "tsclient.h"
+#include "httpInt.h"
+#include "httpContext.h"
+#include "httpSql.h"
+#include "httpResp.h"
+#include "httpAuth.h"
+#include "httpSession.h"
+#include "httpQueue.h"
+
+void *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 httpProcessMultiSql(HttpContext *pContext);
+
+void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows);
+
+void httpProcessMultiSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int numOfRows) {
+  HttpContext *pContext = (HttpContext *)param;
+  if (pContext == NULL) return;
+
+  HttpSqlCmds *     multiCmds = pContext->multiCmds;
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+
+  HttpSqlCmd *singleCmd = multiCmds->cmds + multiCmds->pos;
+  char *      sql = httpGetCmdsString(pContext, singleCmd->sql);
+
+  bool isContinue = false;
+
+  if (numOfRows > 0) {
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->buildQueryJsonFp) {
+      isContinue = (encode->buildQueryJsonFp)(pContext, singleCmd, result, numOfRows);
+    }
+  }
+
+  if (isContinue) {
+    // retrieve next batch of rows
+    httpDebug("context:%p, fd:%d, user:%s, process pos:%d, continue retrieve, numOfRows:%d, sql:%s", pContext,
+              pContext->fd, pContext->user, multiCmds->pos, numOfRows, sql);
+    taos_fetch_rows_a(result, httpProcessMultiSqlRetrieveCallBack, param);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, process pos:%d, stop retrieve, numOfRows:%d, sql:%s", pContext, pContext->fd,
+              pContext->user, multiCmds->pos, numOfRows, sql);
+
+    if (numOfRows < 0) {
+      httpError("context:%p, fd:%d, user:%s, process pos:%d, retrieve failed code:%s, sql:%s", pContext, pContext->fd,
+                pContext->user, multiCmds->pos, tstrerror(numOfRows), sql);
+    }
+
+    taos_free_result(result);
+    
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->stopJsonFp) {
+      (encode->stopJsonFp)(pContext, singleCmd);
+    }
+    multiCmds->pos++;
+    httpProcessMultiSql(pContext);
+  }
+}
+
+void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows) {
+  httpDispatchToResultQueue(param, result, numOfRows, httpProcessMultiSqlRetrieveCallBackImp);
+}
+
+void httpProcessMultiSqlCallBackImp(void *param, TAOS_RES *result, int code) {
+  HttpContext *pContext = (HttpContext *)param;
+  if (pContext == NULL) return;
+
+  code = taos_errno(result);  
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+
+  HttpSqlCmd *singleCmd = multiCmds->cmds + multiCmds->pos;
+  char *      sql = httpGetCmdsString(pContext, singleCmd->sql);
+
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    httpWarn("context:%p, fd:%d, user:%s, process pos:%d, code:%s:inprogress, sql:%s", pContext, pContext->fd,
+             pContext->user, multiCmds->pos, tstrerror(code), sql);
+    return;
+  }
+
+  if (code < 0) {
+    if (encode->checkFinishedFp != NULL && !encode->checkFinishedFp(pContext, singleCmd, code)) {
+      singleCmd->code = code;
+      httpDebug("context:%p, fd:%d, user:%s, process pos jump to:%d, last code:%s, last sql:%s", pContext, pContext->fd,
+                pContext->user, multiCmds->pos + 1, tstrerror(code), sql);
+    } else {
+      singleCmd->code = code;
+      httpError("context:%p, fd:%d, user:%s, process pos:%d, error code:%s, sql:%s", pContext, pContext->fd,
+                pContext->user, multiCmds->pos, tstrerror(code), sql);
+
+      if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN) {
+        if (encode->startJsonFp) (encode->startJsonFp)(pContext, singleCmd, result);
+        if (encode->stopJsonFp) (encode->stopJsonFp)(pContext, singleCmd);
+      }
+    }
+    multiCmds->pos++;
+    httpProcessMultiSql(pContext);
+
+    taos_free_result(result);
+    return;
+  }
+
+  bool isUpdate = tscIsUpdateQuery(result);
+  if (isUpdate) {
+    // not select or show commands
+    int affectRows = taos_affected_rows(result);
+    httpDebug("context:%p, fd:%d, user:%s, process pos:%d, affect rows:%d, sql:%s", pContext, pContext->fd,
+              pContext->user, multiCmds->pos, affectRows, sql);
+
+    singleCmd->code = 0;
+
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->startJsonFp) {
+      (encode->startJsonFp)(pContext, singleCmd, result);
+    }
+
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->buildAffectRowJsonFp) {
+      (encode->buildAffectRowJsonFp)(pContext, singleCmd, affectRows);
+    }
+
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->stopJsonFp) {
+      (encode->stopJsonFp)(pContext, singleCmd);
+    }
+
+    if (encode->setNextCmdFp) {
+      (encode->setNextCmdFp)(pContext, singleCmd, code);
+    } else {
+      multiCmds->pos++;
+    }
+
+    taos_free_result(result);
+    httpProcessMultiSql(pContext);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, process pos:%d, start retrieve, sql:%s", pContext, pContext->fd,
+              pContext->user, multiCmds->pos, sql);
+
+    if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->startJsonFp) {
+      (encode->startJsonFp)(pContext, singleCmd, result);
+    }
+    taos_fetch_rows_a(result, httpProcessMultiSqlRetrieveCallBack, pContext);
+  }
+}
+
+void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int unUsedCode) {
+  httpDispatchToResultQueue(param, result, unUsedCode, httpProcessMultiSqlCallBackImp);
+}
+
+void httpProcessMultiSql(HttpContext *pContext) {
+  HttpSqlCmds *     multiCmds = pContext->multiCmds;
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+
+  if (multiCmds->pos >= multiCmds->size) {
+    httpDebug("context:%p, fd:%d, user:%s, process pos:%d, size:%d, stop mulit-querys", pContext, pContext->fd,
+              pContext->user, multiCmds->pos, multiCmds->size);
+    if (encode->cleanJsonFp) {
+      (encode->cleanJsonFp)(pContext);
+    }
+    httpCloseContextByApp(pContext);
+    return;
+  }
+
+  HttpSqlCmd *cmd = multiCmds->cmds + multiCmds->pos;
+
+  char *sql = httpGetCmdsString(pContext, cmd->sql);
+  httpTraceL("context:%p, fd:%d, user:%s, process pos:%d, start query, sql:%s", pContext, pContext->fd, pContext->user,
+             multiCmds->pos, sql);
+  taosNotePrintHttp(sql);
+  taos_query_a(pContext->session->taos, sql, httpProcessMultiSqlCallBack, (void *)pContext);
+}
+
+void httpProcessMultiSqlCmd(HttpContext *pContext) {
+  if (pContext == NULL) return;
+
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  if (multiCmds == NULL || multiCmds->size <= 0 || multiCmds->pos >= multiCmds->size || multiCmds->pos < 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_INVALID_MULTI_REQUEST);
+    return;
+  }
+
+  httpDebug("context:%p, fd:%d, user:%s, start multi-querys pos:%d, size:%d", pContext, pContext->fd, pContext->user,
+            multiCmds->pos, multiCmds->size);
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+  if (encode->initJsonFp) {
+    (encode->initJsonFp)(pContext);
+  }
+
+  httpProcessMultiSql(pContext);
+}
+
+void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows);
+
+void httpProcessSingleSqlRetrieveCallBackImp(void *param, TAOS_RES *result, int numOfRows) {
+  HttpContext *pContext = (HttpContext *)param;
+  if (pContext == NULL) return;
+
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+
+  bool isContinue = false;
+
+  if (numOfRows > 0) {
+    if (encode->buildQueryJsonFp) {
+      isContinue = (encode->buildQueryJsonFp)(pContext, &pContext->singleCmd, result, numOfRows);
+    }
+  }
+
+  if (isContinue) {
+    // retrieve next batch of rows
+    httpDebug("context:%p, fd:%d, user:%s, continue retrieve, numOfRows:%d", pContext, pContext->fd, pContext->user,
+              numOfRows);
+    taos_fetch_rows_a(result, httpProcessSingleSqlRetrieveCallBack, param);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, stop retrieve, numOfRows:%d", pContext, pContext->fd, pContext->user,
+              numOfRows);
+
+    if (numOfRows < 0) {
+      httpError("context:%p, fd:%d, user:%s, retrieve failed, code:%s", pContext, pContext->fd, pContext->user,
+                tstrerror(numOfRows));
+    }
+
+    taos_free_result(result);
+
+    if (encode->stopJsonFp) {
+      (encode->stopJsonFp)(pContext, &pContext->singleCmd);
+    }
+
+    httpCloseContextByApp(pContext);
+  }
+}
+
+void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int numOfRows) {
+  httpDispatchToResultQueue(param, result, numOfRows, httpProcessSingleSqlRetrieveCallBackImp);
+}
+
+void httpProcessSingleSqlCallBackImp(void *param, TAOS_RES *result, int unUsedCode) {
+  HttpContext *pContext = (HttpContext *)param;
+  if (pContext == NULL) return;
+
+  int32_t code = taos_errno(result);
+
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+
+  if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) {
+    httpError("context:%p, fd:%d, user:%s, query error, code:%s:inprogress, sqlObj:%p", pContext, pContext->fd,
+              pContext->user, tstrerror(code), (SSqlObj *)result);
+    return;
+  }
+
+  if (code < 0) {
+    SSqlObj *pObj = (SSqlObj *)result;
+    if (code == TSDB_CODE_TSC_INVALID_SQL) {
+      httpError("context:%p, fd:%d, user:%s, query error, code:%s, sqlObj:%p, error:%s", pContext,
+                pContext->fd, pContext->user, tstrerror(code), pObj, pObj->cmd.payload);
+      httpSendTaosdInvalidSqlErrorResp(pContext, pObj->cmd.payload);
+    } else {
+      httpError("context:%p, fd:%d, user:%s, query error, code:%s, sqlObj:%p", pContext, pContext->fd,
+                pContext->user, tstrerror(code), pObj);
+      httpSendErrorResp(pContext, code);
+    }
+    taos_free_result(result);
+    return;
+  }
+
+  bool isUpdate = tscIsUpdateQuery(result);
+  if (isUpdate) {
+    // not select or show commands
+    int affectRows = taos_affected_rows(result);
+
+    httpDebug("context:%p, fd:%d, user:%s, affect rows:%d, stop query, sqlObj:%p", pContext, pContext->fd,
+              pContext->user, affectRows, result);
+
+    if (encode->startJsonFp) {
+      (encode->startJsonFp)(pContext, &pContext->singleCmd, result);
+    }
+
+    if (encode->buildAffectRowJsonFp) {
+      (encode->buildAffectRowJsonFp)(pContext, &pContext->singleCmd, affectRows);
+    }
+
+    if (encode->stopJsonFp) {
+      (encode->stopJsonFp)(pContext, &pContext->singleCmd);
+    }
+
+    taos_free_result(result);
+    httpCloseContextByApp(pContext);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, start retrieve", pContext, pContext->fd, pContext->user);
+
+    if (encode->startJsonFp) {
+      (encode->startJsonFp)(pContext, &pContext->singleCmd, result);
+    }
+
+    taos_fetch_rows_a(result, httpProcessSingleSqlRetrieveCallBack, pContext);
+  }
+}
+
+void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int unUsedCode) {
+  httpDispatchToResultQueue(param, result, unUsedCode, httpProcessSingleSqlCallBackImp);
+}
+
+void httpProcessSingleSqlCmd(HttpContext *pContext) {
+  HttpSqlCmd * cmd = &pContext->singleCmd;
+  char *       sql = cmd->nativSql;
+  HttpSession *pSession = pContext->session;
+
+  if (sql == NULL || sql[0] == 0) {
+    httpError("context:%p, fd:%d, user:%s, error:no sql input", pContext, pContext->fd, pContext->user);
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_SQL_INPUT);
+    return;
+  }
+
+  httpTraceL("context:%p, fd:%d, user:%s, start query, sql:%s", pContext, pContext->fd, pContext->user, sql);
+  taosNotePrintHttp(sql);
+  taos_query_a(pSession->taos, sql, httpProcessSingleSqlCallBack, (void *)pContext);
+}
+
+void httpProcessLoginCmd(HttpContext *pContext) {
+  char token[128] = {0};
+  if (httpGenTaosdAuthToken(pContext, token, 128) != 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_GEN_TAOSD_TOKEN_ERR);
+  } else {
+    httpDebug("context:%p, fd:%d, user:%s, login via http, return token:%s", pContext, pContext->fd, pContext->user,
+              token);
+    httpSendSuccResp(pContext, token);
+  }
+}
+
+void httpProcessHeartBeatCmd(HttpContext *pContext) {
+  HttpEncodeMethod *encode = pContext->encodeMethod;
+  if (encode->startJsonFp) {
+    (encode->startJsonFp)(pContext, &pContext->singleCmd, NULL);
+  }
+  if (encode->stopJsonFp) {
+    (encode->stopJsonFp)(pContext, &pContext->singleCmd);
+  }
+  httpCloseContextByApp(pContext);
+}
+
+void httpExecCmd(HttpContext *pContext) {
+  switch (pContext->reqType) {
+    case HTTP_REQTYPE_LOGIN:
+      httpProcessLoginCmd(pContext);
+      break;
+    case HTTP_REQTYPE_SINGLE_SQL:
+      httpProcessSingleSqlCmd(pContext);
+      break;
+    case HTTP_REQTYPE_MULTI_SQL:
+      httpProcessMultiSqlCmd(pContext);
+      break;
+    case HTTP_REQTYPE_HEARTBEAT:
+      httpProcessHeartBeatCmd(pContext);
+      break;
+    case HTTP_REQTYPE_OTHERS:
+      httpCloseContextByApp(pContext);
+      break;
+    default:
+      httpCloseContextByApp(pContext);
+      break;
+  }
+}
+
+void httpProcessRequestCb(void *param, TAOS_RES *result, int code) {
+  HttpContext *pContext = param;
+  taos_free_result(result);
+  
+  if (pContext == NULL) return;
+
+  if (code < 0) {
+    httpError("context:%p, fd:%d, user:%s, login error, code:%s", pContext, pContext->fd, pContext->user,
+              tstrerror(code));
+    httpSendErrorResp(pContext, code);
+    return;
+  }
+
+  httpDebug("context:%p, fd:%d, user:%s, connect tdengine success, taos:%p", pContext, pContext->fd, pContext->user,
+            pContext->taos);
+  if (pContext->taos == NULL) {
+    httpError("context:%p, fd:%d, user:%s, login error, taos is empty", pContext, pContext->fd, pContext->user);
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_LOGIN_FAILED);
+    return;
+  }
+
+  httpCreateSession(pContext, pContext->taos);
+
+  if (pContext->session == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_SESSION_FULL);
+    httpCloseContextByApp(pContext);
+  } else {
+    httpExecCmd(pContext);
+  }
+}
+
+void httpProcessRequest(HttpContext *pContext) {
+  httpGetSession(pContext);
+
+  if (pContext->session == NULL || pContext->reqType == HTTP_REQTYPE_LOGIN) {
+    taos_connect_a(NULL, pContext->user, pContext->pass, "", 0, httpProcessRequestCb, (void *)pContext,
+                   &(pContext->taos));
+    httpDebug("context:%p, fd:%d, user:%s, try connect tdengine, taos:%p", pContext, pContext->fd, pContext->user,
+              pContext->taos);
+  } else {
+    httpExecCmd(pContext);
+  }
+}
diff --git a/src/plugins/http/src/httpSystem.c b/src/plugins/http/src/httpSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..8993b233dd1dde9283679d337845d42f5d649715
--- /dev/null
+++ b/src/plugins/http/src/httpSystem.c
@@ -0,0 +1,118 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tglobal.h"
+#include "tsocket.h"
+#include "ttimer.h"
+#include "tadmin.h"
+#include "httpInt.h"
+#include "httpContext.h"
+#include "httpSession.h"
+#include "httpServer.h"
+#include "httpResp.h"
+#include "httpHandle.h"
+#include "httpQueue.h"
+#include "httpGcHandle.h"
+#include "httpRestHandle.h"
+#include "httpTgHandle.h"
+
+#ifndef _ADMIN
+void adminInitHandle(HttpServer* pServer) {}
+void opInitHandle(HttpServer* pServer) {}
+#endif
+
+HttpServer tsHttpServer;
+void taosInitNote(int32_t numOfNoteLines, int32_t maxNotes, char* lable);
+
+int32_t httpInitSystem() {
+  strcpy(tsHttpServer.label, "rest");
+  tsHttpServer.serverIp = 0;
+  tsHttpServer.serverPort = tsHttpPort;
+  tsHttpServer.numOfThreads = tsHttpMaxThreads;
+  tsHttpServer.processData = httpProcessData;
+
+  pthread_mutex_init(&tsHttpServer.serverMutex, NULL);
+
+  if (tsHttpEnableRecordSql != 0) {
+    taosInitNote(tsNumOfLogLines / 10, 1, (char*)"http_note");
+  }
+  restInitHandle(&tsHttpServer);
+  adminInitHandle(&tsHttpServer);
+  gcInitHandle(&tsHttpServer);
+  tgInitHandle(&tsHttpServer);
+  opInitHandle(&tsHttpServer);
+
+  return 0;
+}
+
+int32_t httpStartSystem() {
+  httpInfo("start http server ...");
+
+  if (tsHttpServer.status != HTTP_SERVER_INIT) {
+    httpError("http server is already started");
+    return -1;
+  }
+
+  if (!httpInitResultQueue()) {
+    httpError("http init result queue failed");
+    return -1;
+  }
+
+  if (!httpInitContexts()) {
+    httpError("http init contexts failed");
+    return -1;
+  }
+
+  if (!httpInitSessions()) {
+    httpError("http init session failed");
+    return -1;
+  }
+
+  if (!httpInitConnect()) {
+    httpError("http init server failed");
+    return -1;
+  }
+
+  return 0;
+}
+
+void httpStopSystem() {
+  tsHttpServer.status = HTTP_SERVER_CLOSING;
+  shutdown(tsHttpServer.fd, SHUT_RD);
+  tgCleanupHandle();
+}
+
+void httpCleanUpSystem() {
+  httpInfo("http server cleanup");
+  httpStopSystem();
+
+  httpCleanUpConnect();
+  httpCleanupContexts();
+  httpCleanUpSessions();
+  httpCleanupResultQueue();
+
+  pthread_mutex_destroy(&tsHttpServer.serverMutex);
+  taosTFree(tsHttpServer.pThreads);
+  tsHttpServer.pThreads = NULL;
+  
+  tsHttpServer.status = HTTP_SERVER_CLOSED;
+}
+
+int32_t httpGetReqCount() {
+  return atomic_exchange_32(&tsHttpServer.requestNum, 0);
+}
diff --git a/src/plugins/http/src/httpTgHandle.c b/src/plugins/http/src/httpTgHandle.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2b57b87bb3a10ee50edbf55ae2590289f940bf6
--- /dev/null
+++ b/src/plugins/http/src/httpTgHandle.c
@@ -0,0 +1,905 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "httpInt.h"
+#include "httpTgHandle.h"
+#include "httpTgJson.h"
+#include "cJSON.h"
+
+/*
+ * taos.telegraf.cfg formats like
+ {
+  "metrics": [
+    {
+      "name" : "system",
+      "tbname" : "system_uptime",
+      "fields": [
+        "uptime"
+      ]
+    },
+    {
+      "name": "system",
+      "tbname" : "system_uptime_format",
+      "fields": [
+        "uptime_format"
+      ]
+    },
+    {
+      "name": "swap",
+      "tbname" : "swap_in",
+      "fields": [
+        "in"
+      ]
+    },
+    {
+      "name": "cpu",
+      "tbname" : "cpu_usage",
+      "fields": [
+        "usage_active",
+        "usage_guest"
+      ]
+    }
+    ]
+  }
+ */
+
+#define TG_MAX_SORT_TAG_SIZE 20
+
+static HttpDecodeMethod tgDecodeMethod = {"telegraf", tgProcessRquest};
+static HttpEncodeMethod tgQueryMethod = {
+  .startJsonFp          = tgStartQueryJson,         
+  .stopJsonFp           = tgStopQueryJson, 
+  .buildQueryJsonFp     = NULL,
+  .buildAffectRowJsonFp = tgBuildSqlAffectRowsJson, 
+  .initJsonFp           = tgInitQueryJson, 
+  .cleanJsonFp          = tgCleanQueryJson,
+  .checkFinishedFp      = tgCheckFinished,
+  .setNextCmdFp         = tgSetNextCmd
+};
+
+static const char DEFAULT_TELEGRAF_CFG[] =
+        "{\"metrics\":["
+        "{\"name\":\"system\",\"tbname\":\"system_uptime\",\"fields\":[\"uptime\"]},"
+        "{\"name\":\"system\",\"tbname\":\"system_uptime_format\",\"fields\":[\"uptime_format\"]},"
+        "{\"name\":\"swap\",\"tbname\":\"swap_in\",\"fields\":[\"in\"]},"
+        "{\"name\":\"cpu\",\"tbname\":\"cpu_usage\",\"fields\":[\"usage_guest\"]}"
+        "]}";
+
+typedef struct {
+  char *  name;
+  char *  tbName;
+  char ** fields;
+  int32_t fieldNum;
+} STgSchema;
+
+typedef struct {
+  STgSchema *schemas;
+  int32_t    size;
+  int32_t    pos;
+} STgSchemas;
+
+static STgSchemas tgSchemas = {0};
+
+void tgFreeSchema(STgSchema *schema) {
+  if (schema->name != NULL) {
+    free(schema->name);
+    schema->name = NULL;
+  }
+  if (schema->tbName != NULL) {
+    free(schema->tbName);
+    schema->tbName = NULL;
+  }
+  if (schema->fields != NULL) {
+    for (int32_t f = 0; f < schema->fieldNum; ++f) {
+      if (schema->fields[f] != NULL) {
+        free(schema->fields[f]);
+        schema->fields[f] = NULL;
+      }
+    }
+    free(schema->fields);
+    schema->fields = NULL;
+    schema->fieldNum = 0;
+  }
+}
+
+void tgFreeSchemas() {
+  if (tgSchemas.schemas != NULL) {
+    for (int32_t s = 0; s < tgSchemas.size; ++s) {
+      tgFreeSchema(&tgSchemas.schemas[s]);
+    }
+    free(tgSchemas.schemas);
+    tgSchemas.size = 0;
+    tgSchemas.schemas = NULL;
+  }
+}
+
+void tgInitSchemas(int32_t size) {
+  tgFreeSchemas();
+  tgSchemas.schemas = calloc(sizeof(STgSchema), size);
+  tgSchemas.size = 0;
+}
+
+void tgParseSchemaMetric(cJSON *metric) {
+  STgSchema  schema = {0};
+  bool       parsedOk = true;
+
+  // name
+  cJSON *name = cJSON_GetObjectItem(metric, "name");
+  if (name == NULL) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  if (name->type != cJSON_String) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  if (name->valuestring == NULL) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  int32_t nameLen = (int32_t)strlen(name->valuestring);
+  if (nameLen == 0) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+
+  schema.name = calloc(nameLen + 1, 1);
+  strcpy(schema.name, name->valuestring);
+
+  // tbname
+  cJSON *tbname = cJSON_GetObjectItem(metric, "tbname");
+  if (tbname == NULL) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  if (tbname->type != cJSON_String) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  if (tbname->valuestring == NULL) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+  int32_t tbnameLen = (int32_t)strlen(tbname->valuestring);
+  if (tbnameLen == 0) {
+    parsedOk = false;
+    goto ParseEnd;
+  }
+
+  schema.tbName = calloc(tbnameLen + 1, 1);
+  strcpy(schema.tbName, tbname->valuestring);
+
+    // fields
+  cJSON *fields = cJSON_GetObjectItem(metric, "fields");
+  if (fields == NULL) {
+    goto ParseEnd;
+  }
+  int32_t fieldSize = cJSON_GetArraySize(fields);
+  if (fieldSize <= 0 || fieldSize > TSDB_MAX_COLUMNS) {
+    goto ParseEnd;
+  }
+
+  if (fieldSize > 0) {
+    schema.fields = calloc(sizeof(STgSchema), (size_t)fieldSize);
+    schema.fieldNum = fieldSize;
+    for (int32_t i = 0; i < fieldSize; i++) {
+      cJSON *field = cJSON_GetArrayItem(fields, i);
+      if (field == NULL) {
+        parsedOk = false;
+        goto ParseEnd;
+      }
+      if (field->valuestring == NULL) {
+        parsedOk = false;
+        goto ParseEnd;
+      }
+      int32_t nameLen = (int32_t)strlen(field->valuestring);
+      if (nameLen == 0 || nameLen >= TSDB_TABLE_NAME_LEN) {
+        parsedOk = false;
+        goto ParseEnd;
+      }
+      schema.fields[i] = calloc(nameLen + 1, 1);
+      strcpy(schema.fields[i], field->valuestring);
+    }
+  }
+
+ParseEnd:
+  if (parsedOk) {
+    tgSchemas.schemas[tgSchemas.size++] = schema;
+  } else {
+    tgFreeSchema(&schema);
+  }
+}
+
+int32_t tgParseSchema(const char *content, char*fileName) {
+  cJSON *root = cJSON_Parse(content);
+  if (root == NULL) {
+    httpError("failed to parse telegraf schema file:%s, invalid json format, content:%s", fileName, content);
+    return -1;
+  }
+  int32_t size = 0;
+  cJSON *metrics = cJSON_GetObjectItem(root, "metrics");
+  if (metrics != NULL) {
+    size = cJSON_GetArraySize(metrics);
+    if (size <= 0) {
+      httpError("failed to parse telegraf schema file:%s, metrics size is 0", fileName);
+      cJSON_Delete(root);
+      return -1;
+    }
+
+    tgInitSchemas(size);
+    for (int32_t i = 0; i < size; i++) {
+      cJSON *metric = cJSON_GetArrayItem(metrics, i);
+      if (metric != NULL) {
+        tgParseSchemaMetric(metric);
+      }
+    }
+  } else {
+    size = 1;
+    tgInitSchemas(size);
+    tgParseSchemaMetric(root);
+  }
+
+  cJSON_Delete(root);
+  return size;
+}
+
+int32_t tgReadSchema(char *fileName) {
+  FILE *fp = fopen(fileName, "r");
+  if (fp == NULL) {
+    return -1;
+  }
+
+  httpInfo("open telegraf schema file:%s success", fileName);
+  fseek(fp, 0, SEEK_END);
+  int32_t contentSize = (int32_t)ftell(fp);
+  if (contentSize <= 0) {
+    fclose(fp);
+    return 0;
+  }
+
+  rewind(fp);
+  char *  content = (char *)calloc(contentSize + 1, 1);
+  int32_t result = fread(content, 1, contentSize, fp);
+  
+  if (result != contentSize) {
+    httpError("failed to read telegraf schema file:%s", fileName);
+    fclose(fp);
+    free(content);
+    return 0;
+  }
+
+  content[contentSize] = 0;
+  int32_t schemaNum = tgParseSchema(content, fileName);
+
+  free(content);
+  fclose(fp);
+  httpInfo("parse telegraf schema file:%s, schema size:%d", fileName, schemaNum);
+
+  return schemaNum;
+}
+
+void tgInitHandle(HttpServer *pServer) {
+  char fileName[TSDB_FILENAME_LEN*2] = {0};
+  sprintf(fileName, "%s/taos.telegraf.cfg", configDir);
+  if (tgReadSchema(fileName) <= 0) {
+    tgFreeSchemas();
+    if (tgParseSchema(DEFAULT_TELEGRAF_CFG, "default") <= 0) {
+      tgFreeSchemas();
+    }
+  }
+
+  httpAddMethod(pServer, &tgDecodeMethod);
+}
+
+void tgCleanupHandle() {
+  tgFreeSchemas();
+}
+
+bool tgGetUserFromUrl(HttpContext *pContext) {
+  HttpParser *pParser = pContext->parser;
+  if (pParser->path[TG_USER_URL_POS].pos >= TSDB_USER_LEN || pParser->path[TG_USER_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->user, pParser->path[TG_USER_URL_POS].str, sizeof(pContext->user));
+  return true;
+}
+
+bool tgGetPassFromUrl(HttpContext *pContext) {
+  HttpParser *pParser = pContext->parser;
+  if (pParser->path[TG_PASS_URL_POS].pos >= TSDB_PASSWORD_LEN || pParser->path[TG_PASS_URL_POS].pos <= 0) {
+    return false;
+  }
+
+  tstrncpy(pContext->pass, pParser->path[TG_PASS_URL_POS].str, sizeof(pContext->pass));
+  return true;
+}
+
+char *tgGetDbFromUrl(HttpContext *pContext) {
+  HttpParser *pParser = pContext->parser;
+  if (pParser->path[TG_DB_URL_POS].pos <= 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_DB_NOT_INPUT);
+    return NULL;
+  }
+
+  if (pParser->path[TG_DB_URL_POS].pos >= TSDB_DB_NAME_LEN) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_DB_TOO_LONG);
+    return NULL;
+  }
+
+  return pParser->path[TG_DB_URL_POS].str;
+}
+
+char *tgGetStableName(char *stname, cJSON *fields, int32_t fieldsSize) {
+  for (int32_t s = 0; s < tgSchemas.size; ++s) {
+    STgSchema *schema = &tgSchemas.schemas[s];
+    if (strcasecmp(schema->name, stname) != 0) {
+      continue;
+    }
+
+    bool schemaMatched = true;
+    for (int32_t f = 0; f < schema->fieldNum; ++f) {
+      char *fieldName = schema->fields[f];
+      bool fieldMatched = false;
+
+      for (int32_t i = 0; i < fieldsSize; i++) {
+        cJSON *field = cJSON_GetArrayItem(fields, i);
+        if (strcasecmp(field->string, fieldName) == 0) {
+          fieldMatched = true;
+          break;
+        }
+      }
+
+      if (!fieldMatched) {
+        schemaMatched = false;
+        break;
+      }
+    }
+
+    if (schemaMatched) {
+      return schema->tbName;
+    }
+  }
+
+  return stname;
+}
+
+/*
+ * parse single metric
+ {
+   "fields": {
+     "field_1": 30,
+     "field_2": 4,
+     "field_N": 59,
+     "n_images": 660
+   },
+   "name": "docker",
+   "tags": {
+     "host": "raynor"
+   },
+   "timestamp": 1458229140
+ }
+ */
+bool tgProcessSingleMetric(HttpContext *pContext, cJSON *metric, char *db) {
+  // metric name
+  cJSON *name = cJSON_GetObjectItem(metric, "name");
+  if (name == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRIC_NULL);
+    return false;
+  }
+  if (name->type != cJSON_String) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRIC_TYPE);
+    return false;
+  }
+  if (name->valuestring == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRIC_NAME_NULL);
+    return false;
+  }
+  int32_t nameLen = (int32_t)strlen(name->valuestring);
+  if (nameLen == 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRIC_NAME_NULL);
+    return false;
+  }
+  if (nameLen >= TSDB_TABLE_NAME_LEN - 8) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRIC_NAME_LONG);
+    return false;
+  }
+
+  // timestamp
+  cJSON *timestamp = cJSON_GetObjectItem(metric, "timestamp");
+  if (timestamp == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TIMESTAMP_NULL);
+    return false;
+  }
+  if (timestamp->type != cJSON_Number) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TIMESTAMP_TYPE);
+    return false;
+  }
+  if (timestamp->valueint <= 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TIMESTAMP_VAL_NULL);
+    return false;
+  }
+
+  // tags
+  cJSON *tags = cJSON_GetObjectItem(metric, "tags");
+  if (tags == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAGS_NULL);
+    return false;
+  }
+
+  int32_t tagsSize = cJSON_GetArraySize(tags);
+  if (tagsSize <= 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAGS_SIZE_0);
+    return false;
+  }
+
+  if (tagsSize > TG_MAX_SORT_TAG_SIZE) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAGS_SIZE_LONG);
+    return false;
+  }
+
+  cJSON *host = NULL;
+
+  for (int32_t i = 0; i < tagsSize; i++) {
+    cJSON *tag = cJSON_GetArrayItem(tags, i);
+    if (tag == NULL) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAG_NULL);
+      return false;
+    }
+    if (tag->string == NULL || strlen(tag->string) == 0) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAG_NAME_NULL);
+      return false;
+    }
+
+    /*
+    * tag size may be larget than TSDB_COL_NAME_LEN
+    * we keep the first TSDB_COL_NAME_LEN bytes
+    */
+    if (0) {
+      if (strlen(tag->string) >= TSDB_COL_NAME_LEN) {
+        httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAG_NAME_SIZE);
+        return false;
+      }
+    }
+
+    if (tag->type != cJSON_Number && tag->type != cJSON_String) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAG_VALUE_TYPE);
+      return false;
+    }
+
+    if (tag->type == cJSON_String) {
+      if (tag->valuestring == NULL || strlen(tag->valuestring) == 0) {
+        httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TAG_VALUE_NULL);
+        return false;
+      }
+    }
+
+    if (strcasecmp(tag->string, "host") == 0) {
+      host = tag;
+    }
+  }
+
+  if (host == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TABLE_NULL);
+    return false;
+  }
+
+  if (host->type != cJSON_String) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_HOST_NOT_STRING);
+    return false;
+  }
+
+  if (strlen(host->valuestring) >= TSDB_TABLE_NAME_LEN - 1) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_TABLE_SIZE);
+    return false;
+  }
+
+  // fields
+  cJSON *fields = cJSON_GetObjectItem(metric, "fields");
+  if (fields == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELDS_NULL);
+    return false;
+  }
+
+  int32_t fieldsSize = cJSON_GetArraySize(fields);
+  if (fieldsSize <= 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELDS_SIZE_0);
+    return false;
+  }
+
+  if (fieldsSize > (TSDB_MAX_COLUMNS - TSDB_MAX_TAGS - 1)) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELDS_SIZE_LONG);
+    return false;
+  }
+
+  for (int32_t i = 0; i < fieldsSize; i++) {
+    cJSON *field = cJSON_GetArrayItem(fields, i);
+    if (field == NULL) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELD_NULL);
+      return false;
+    }
+    if (field->string == NULL || strlen(field->string) == 0) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELD_NAME_NULL);
+      return false;
+    }
+    /*
+    * tag size may be larget than TSDB_COL_NAME_LEN
+    * we keep the first TSDB_COL_NAME_LEN bytes
+    */
+    if (0) {
+      if (strlen(field->string) >= TSDB_COL_NAME_LEN) {
+        httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELD_NAME_SIZE);
+        return false;
+      }
+    }
+    if (field->type != cJSON_Number && field->type != cJSON_String) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELD_VALUE_TYPE);
+      return false;
+    }
+    if (field->type == cJSON_String) {
+      if (field->valuestring == NULL || strlen(field->valuestring) == 0) {
+        httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_FIELD_VALUE_NULL);
+        return false;
+      }
+    }
+  }
+
+  // assembling cmds
+  HttpSqlCmd *stable_cmd = httpNewSqlCmd(pContext);
+  if (stable_cmd == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+    return false;
+  }
+  stable_cmd->cmdType = HTTP_CMD_TYPE_CREATE_STBALE;
+  stable_cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
+
+  HttpSqlCmd *table_cmd = httpNewSqlCmd(pContext);
+  if (table_cmd == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+    return false;
+  }
+  table_cmd->cmdType = HTTP_CMD_TYPE_INSERT;
+
+  // order by tag name
+  cJSON *orderedTags[TG_MAX_SORT_TAG_SIZE] = {0};
+  int32_t    orderTagsLen = 0;
+  for (int32_t i = 0; i < tagsSize; ++i) {
+    cJSON *tag = cJSON_GetArrayItem(tags, i);
+    orderedTags[orderTagsLen++] = tag;
+    for (int32_t j = orderTagsLen - 1; j >= 1; --j) {
+      cJSON *tag1 = orderedTags[j];
+      cJSON *tag2 = orderedTags[j - 1];
+      if (strcasecmp(tag1->string, "host") == 0 || strcmp(tag1->string, tag2->string) < 0) {
+        orderedTags[j] = tag2;
+        orderedTags[j - 1] = tag1;
+      }
+    }
+  }
+  orderTagsLen = orderTagsLen < TSDB_MAX_TAGS ? orderTagsLen : TSDB_MAX_TAGS;
+
+  table_cmd->tagNum = stable_cmd->tagNum = (int8_t)orderTagsLen;
+  table_cmd->timestamp = stable_cmd->timestamp = httpAddToSqlCmdBuffer(pContext, "%" PRId64, timestamp->valueint);
+
+  // stable name
+  char *stname = tgGetStableName(name->valuestring, fields, fieldsSize);
+  table_cmd->metric = stable_cmd->metric = httpAddToSqlCmdBuffer(pContext, "%s", stname);
+  if (tsTelegrafUseFieldNum == 0) {
+    table_cmd->stable = stable_cmd->stable = httpAddToSqlCmdBuffer(pContext, "%s", stname);
+  } else {
+    table_cmd->stable = stable_cmd->stable = httpAddToSqlCmdBuffer(pContext, "%s_%d_%d", stname, fieldsSize, orderTagsLen);
+  }
+  table_cmd->stable = stable_cmd->stable =
+      httpShrinkTableName(pContext, table_cmd->stable, httpGetCmdsString(pContext, table_cmd->stable));
+
+  // stable tag for detail
+  for (int32_t i = 0; i < orderTagsLen; ++i) {
+    cJSON *tag = orderedTags[i];
+    stable_cmd->tagNames[i] = table_cmd->tagNames[i] = httpAddToSqlCmdBuffer(pContext, tag->string);
+
+    if (tag->type == cJSON_String)
+      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "'%s'", tag->valuestring);
+    else if (tag->type == cJSON_Number)
+      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "%" PRId64, tag->valueint);
+    else if (tag->type == cJSON_True)
+      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "1");
+    else if (tag->type == cJSON_False)
+      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "0");
+    else
+      stable_cmd->tagValues[i] = table_cmd->tagValues[i] = httpAddToSqlCmdBuffer(pContext, "NULL");
+  }
+
+  // table name
+  if (tsTelegrafUseFieldNum == 0) {
+    table_cmd->table = stable_cmd->table = httpAddToSqlCmdBufferNoTerminal(pContext, "%s_%s", stname, host->valuestring);
+  } else {
+    table_cmd->table = stable_cmd->table = httpAddToSqlCmdBufferNoTerminal(pContext, "%s_%d_%d_%s", stname, fieldsSize, orderTagsLen, host->valuestring);
+  }
+  for (int32_t i = 0; i < orderTagsLen; ++i) {
+    cJSON *tag = orderedTags[i];
+    if (tag == host) continue;
+    if (tag->type == cJSON_String)
+      httpAddToSqlCmdBufferNoTerminal(pContext, "_%s", tag->valuestring);
+    else if (tag->type == cJSON_Number)
+      httpAddToSqlCmdBufferNoTerminal(pContext, "_%" PRId64, tag->valueint);
+    else if (tag->type == cJSON_False)
+      httpAddToSqlCmdBufferNoTerminal(pContext, "_0");
+    else if (tag->type == cJSON_True)
+      httpAddToSqlCmdBufferNoTerminal(pContext, "_1");
+    else
+      httpAddToSqlCmdBufferNoTerminal(pContext, "_n");
+  }
+  httpAddToSqlCmdBuffer(pContext, "");
+
+  table_cmd->table = stable_cmd->table =
+      httpShrinkTableName(pContext, table_cmd->table, httpGetCmdsString(pContext, table_cmd->table));
+
+  // assembling create stable sql
+  stable_cmd->sql = httpAddToSqlCmdBufferNoTerminal(pContext, "create table if not exists %s.%s(ts timestamp", db,
+                                                    httpGetCmdsString(pContext, table_cmd->stable));
+  for (int32_t i = 0; i < fieldsSize; ++i) {
+    cJSON *field = cJSON_GetArrayItem(fields, i);
+    char * field_type = "double";
+    if (field->type == cJSON_String)
+      field_type = "binary(32)";
+    else if (field->type == cJSON_False || field->type == cJSON_True)
+      field_type = "tinyint";
+    else {
+    }
+
+    char *field_name = field->string;
+    httpAddToSqlCmdBufferNoTerminal(pContext, ",f_%s %s", field_name, field_type);
+  }
+  httpAddToSqlCmdBufferNoTerminal(pContext, ") tags(");
+
+  for (int32_t i = 0; i < orderTagsLen; ++i) {
+    cJSON *tag = orderedTags[i];
+    char * tag_type = "bigint";
+    if (tag->type == cJSON_String)
+      tag_type = "binary(32)";
+    else if (tag->type == cJSON_False || tag->type == cJSON_True)
+      tag_type = "tinyint";
+    else {
+    }
+
+    char *tag_name = tag->string;
+    if (i != orderTagsLen - 1)
+      httpAddToSqlCmdBufferNoTerminal(pContext, "t_%s %s,", tag_name, tag_type);
+    else
+      httpAddToSqlCmdBuffer(pContext, "t_%s %s)", tag_name, tag_type);
+  }
+
+  // assembling insert sql
+  table_cmd->sql = httpAddToSqlCmdBufferNoTerminal(pContext, "import into %s.%s using %s.%s tags(", db,
+                                                   httpGetCmdsString(pContext, table_cmd->table), db,
+                                                   httpGetCmdsString(pContext, table_cmd->stable));
+  for (int32_t i = 0; i < orderTagsLen; ++i) {
+    cJSON *tag = orderedTags[i];
+    if (i != orderTagsLen - 1) {
+      if (tag->type == cJSON_Number)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ",", tag->valueint);
+      else if (tag->type == cJSON_String)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", tag->valuestring);
+      else if (tag->type == cJSON_False)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "0,");
+      else if (tag->type == cJSON_True)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "1,");
+      else {
+        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL,");
+      }
+    } else {
+      if (tag->type == cJSON_Number)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "%" PRId64 ")", tag->valueint);
+      else if (tag->type == cJSON_String)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s')", tag->valuestring);
+      else if (tag->type == cJSON_False)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "0)");
+      else if (tag->type == cJSON_True)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "1)");
+      else {
+        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL)");
+      }
+    }
+  }
+
+  httpAddToSqlCmdBufferNoTerminal(pContext, " values(%" PRId64 ",", timestamp->valueint);
+  for (int32_t i = 0; i < fieldsSize; ++i) {
+    cJSON *field = cJSON_GetArrayItem(fields, i);
+    if (i != fieldsSize - 1) {
+      if (field->type == cJSON_Number)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "%lf,", field->valuedouble);
+      else if (field->type == cJSON_String)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "'%s',", field->valuestring);
+      else if (field->type == cJSON_False)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "0,");
+      else if (field->type == cJSON_True)
+        httpAddToSqlCmdBufferNoTerminal(pContext, "1,");
+      else {
+        httpAddToSqlCmdBufferNoTerminal(pContext, "NULL,");
+      }
+    } else {
+      if (field->type == cJSON_Number)
+        httpAddToSqlCmdBuffer(pContext, "%lf)", field->valuedouble);
+      else if (field->type == cJSON_String)
+        httpAddToSqlCmdBuffer(pContext, "'%s')", field->valuestring);
+      else if (field->type == cJSON_False)
+        httpAddToSqlCmdBuffer(pContext, "0)");
+      else if (field->type == cJSON_True)
+        httpAddToSqlCmdBuffer(pContext, "1)");
+      else {
+        httpAddToSqlCmdBuffer(pContext, "NULL)");
+      }
+    }
+  }
+
+  return true;
+}
+
+/**
+ * request from telegraf 1.7.0
+ * single request:
+ {
+    "fields": {
+        "field_1": 30,
+        "field_2": 4,
+        "field_N": 59,
+        "n_images": 660
+    },
+    "name": "docker",
+    "tags": {
+        "host": "raynor"
+    },
+    "timestamp": 1458229140
+ }
+ * multiple request:
+ {
+    "metrics": [
+        {
+            "fields": {
+                "field_1": 30,
+                "field_2": 4,
+                "field_N": 59,
+                "n_images": 660
+            },
+            "name": "docker",
+            "tags": {
+                "host": "raynor"
+            },
+            "timestamp": 1458229140
+        },
+        {
+            "fields": {
+                "field_1": 30,
+                "field_2": 4,
+                "field_N": 59,
+                "n_images": 660
+            },
+            "name": "docker",
+            "tags": {
+                "host": "raynor"
+            },orderTagsLen
+            "timestamp": 1458229140
+        }
+    ]
+ }
+ */
+bool tgProcessQueryRequest(HttpContext *pContext, char *db) {
+  httpDebug("context:%p, fd:%d, process telegraf query msg", pContext, pContext->fd);
+
+  char *filter = pContext->parser->body.str;
+  if (filter == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_MSG_INPUT);
+    return false;
+  }
+
+  cJSON *root = cJSON_Parse(filter);
+  if (root == NULL) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_INVALID_JSON);
+    return false;
+  }
+
+  cJSON *metrics = cJSON_GetObjectItem(root, "metrics");
+  if (metrics != NULL) {
+    int32_t size = cJSON_GetArraySize(metrics);
+    httpDebug("context:%p, fd:%d, multiple metrics:%d at one time", pContext, pContext->fd, size);
+    if (size <= 0) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRICS_NULL);
+      cJSON_Delete(root);
+      return false;
+    }
+
+    int32_t cmdSize = size * 2 + 1;
+    if (cmdSize > HTTP_MAX_CMD_SIZE) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_TG_METRICS_SIZE);
+      cJSON_Delete(root);
+      return false;
+    }
+
+    if (!httpMallocMultiCmds(pContext, cmdSize, HTTP_BUFFER_SIZE)) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      cJSON_Delete(root);
+      return false;
+    }
+
+    HttpSqlCmd *cmd = httpNewSqlCmd(pContext);
+    if (cmd == NULL) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      cJSON_Delete(root);
+      return false;
+    }
+    cmd->cmdType = HTTP_CMD_TYPE_CREATE_DB;
+    cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
+    cmd->sql = httpAddToSqlCmdBuffer(pContext, "create database if not exists %s", db);
+
+    for (int32_t i = 0; i < size; i++) {
+      cJSON *metric = cJSON_GetArrayItem(metrics, i);
+      if (metric != NULL) {
+        if (!tgProcessSingleMetric(pContext, metric, db)) {
+          cJSON_Delete(root);
+          return false;
+        }
+      }
+    }
+  } else {
+    httpDebug("context:%p, fd:%d, single metric", pContext, pContext->fd);
+
+    if (!httpMallocMultiCmds(pContext, 3, HTTP_BUFFER_SIZE)) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      cJSON_Delete(root);
+      return false;
+    }
+
+    HttpSqlCmd *cmd = httpNewSqlCmd(pContext);
+    if (cmd == NULL) {
+      httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_ENOUGH_MEMORY);
+      cJSON_Delete(root);
+      return false;
+    }
+    cmd->cmdType = HTTP_CMD_TYPE_CREATE_DB;
+    cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_NO_RETURN;
+    cmd->sql = httpAddToSqlCmdBuffer(pContext, "create database if not exists %s", db);
+
+    if (!tgProcessSingleMetric(pContext, root, db)) {
+      cJSON_Delete(root);
+      return false;
+    }
+  }
+
+  cJSON_Delete(root);
+
+  pContext->reqType = HTTP_REQTYPE_MULTI_SQL;
+  pContext->encodeMethod = &tgQueryMethod;
+  pContext->multiCmds->pos = 2;
+
+  return true;
+}
+
+bool tgProcessRquest(struct HttpContext *pContext) {
+  if (strlen(pContext->user) == 0 || strlen(pContext->pass) == 0) {
+    httpSendErrorResp(pContext, TSDB_CODE_HTTP_NO_AUTH_INFO);
+    return false;
+  }
+
+  char *db = tgGetDbFromUrl(pContext);
+  if (db == NULL) {
+    return false;
+  }
+
+  return tgProcessQueryRequest(pContext, db);
+}
diff --git a/src/plugins/http/src/httpTgJson.c b/src/plugins/http/src/httpTgJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..603092f09df96ae9bc9be2c0c4445d3d3f795ea1
--- /dev/null
+++ b/src/plugins/http/src/httpTgJson.c
@@ -0,0 +1,151 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "httpLog.h"
+#include "httpJson.h"
+#include "httpResp.h"
+#include "httpTgHandle.h"
+#include "httpTgJson.h"
+
+void tgInitQueryJson(HttpContext *pContext) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  httpInitJsonBuf(jsonBuf, pContext);
+  httpWriteJsonBufHead(jsonBuf);
+
+  // array begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonObjStt);
+
+  httpJsonPairHead(jsonBuf, "metrics", 7);
+
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonArrStt);
+}
+
+void tgCleanQueryJson(HttpContext *pContext) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // array end
+  httpJsonToken(jsonBuf, JsonArrEnd);
+  httpJsonToken(jsonBuf, JsonObjEnd);
+
+  httpWriteJsonBufEnd(jsonBuf);
+}
+
+void tgStartQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // object begin
+  httpJsonItemToken(jsonBuf);
+  httpJsonToken(jsonBuf, JsonObjStt);
+
+  // data
+  httpJsonItemToken(jsonBuf);
+  httpJsonPair(jsonBuf, "metric", 6, httpGetCmdsString(pContext, cmd->stable),
+               (int32_t)strlen(httpGetCmdsString(pContext, cmd->metric)));
+
+  httpJsonItemToken(jsonBuf);
+  httpJsonPair(jsonBuf, "stable", 6, httpGetCmdsString(pContext, cmd->stable),
+               (int32_t)strlen(httpGetCmdsString(pContext, cmd->stable)));
+
+  httpJsonItemToken(jsonBuf);
+  httpJsonPair(jsonBuf, "table", 5, httpGetCmdsString(pContext, cmd->table),
+               (int32_t)strlen(httpGetCmdsString(pContext, cmd->table)));
+
+  httpJsonItemToken(jsonBuf);
+  httpJsonPair(jsonBuf, "timestamp", 9, httpGetCmdsString(pContext, cmd->timestamp),
+               (int32_t)strlen(httpGetCmdsString(pContext, cmd->timestamp)));  // hack way
+}
+
+void tgStopQueryJson(HttpContext *pContext, HttpSqlCmd *cmd) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // data
+  httpJsonItemToken(jsonBuf);
+  httpJsonPairStatus(jsonBuf, cmd->code);
+
+  // object end
+  httpJsonToken(jsonBuf, JsonObjEnd);
+}
+
+void tgBuildSqlAffectRowsJson(HttpContext *pContext, HttpSqlCmd *cmd, int32_t affect_rows) {
+  JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
+  if (jsonBuf == NULL) return;
+
+  // data
+  httpJsonPairIntVal(jsonBuf, "affected_rows", 13, affect_rows);
+}
+
+bool tgCheckFinished(struct HttpContext *pContext, HttpSqlCmd *cmd, int32_t code) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  httpDebug("context:%p, fd:%d, check telegraf command, code:%s, state:%d, type:%d, rettype:%d, tags:%d", pContext,
+            pContext->fd, tstrerror(code), cmd->cmdState, cmd->cmdType, cmd->cmdReturnType, cmd->tagNum);
+
+  if (cmd->cmdType == HTTP_CMD_TYPE_INSERT) {
+    if (cmd->cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
+      if (code == TSDB_CODE_MND_DB_NOT_SELECTED || code == TSDB_CODE_MND_INVALID_DB) {
+        cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
+        if (multiCmds->cmds[0].cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
+          multiCmds->pos = (int16_t)-1;
+          httpDebug("context:%p, fd:%d, import failed, try create database", pContext, pContext->fd);
+          return false;
+        }
+      } else if (code == TSDB_CODE_MND_INVALID_TABLE_NAME) {
+        cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
+        if (multiCmds->cmds[multiCmds->pos - 1].cmdState == HTTP_CMD_STATE_NOT_RUN_YET) {
+          multiCmds->pos = (int16_t)(multiCmds->pos - 2);
+          httpDebug("context:%p, fd:%d, import failed, try create stable", pContext, pContext->fd);
+          return false;
+        }
+      } else {
+      }
+    } else {
+    }
+  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_DB) {
+    cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
+    httpDebug("context:%p, fd:%d, code:%s, create database failed", pContext, pContext->fd, tstrerror(code));
+  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_STBALE) {
+    cmd->cmdState = HTTP_CMD_STATE_RUN_FINISHED;
+    httpDebug("context:%p, fd:%d, code:%s, create stable failed", pContext, pContext->fd, tstrerror(code));
+  } else {
+  }
+
+  return true;
+}
+
+void tgSetNextCmd(struct HttpContext *pContext, HttpSqlCmd *cmd, int32_t code) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  httpDebug("context:%p, fd:%d, get telegraf next command, pos:%d, code:%s, state:%d, type:%d, rettype:%d, tags:%d",
+            pContext, pContext->fd, multiCmds->pos, tstrerror(code), cmd->cmdState, cmd->cmdType, cmd->cmdReturnType,
+            cmd->tagNum);
+
+  if (cmd->cmdType == HTTP_CMD_TYPE_INSERT) {
+    multiCmds->pos = (int16_t)(multiCmds->pos + 2);
+  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_DB) {
+    multiCmds->pos++;
+  } else if (cmd->cmdType == HTTP_CMD_TYPE_CREATE_STBALE) {
+    multiCmds->pos++;
+  } else {
+    multiCmds->pos++;
+  }
+}
diff --git a/src/plugins/http/src/httpUtil.c b/src/plugins/http/src/httpUtil.c
new file mode 100644
index 0000000000000000000000000000000000000000..39168ee96dc0ef83dc329614f63543d2c6c7fdfa
--- /dev/null
+++ b/src/plugins/http/src/httpUtil.c
@@ -0,0 +1,465 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tmd5.h"
+#include "taos.h"
+#include "httpInt.h"
+#include "httpResp.h"
+#include "httpSql.h"
+#include "httpUtil.h"
+
+bool httpCheckUsedbSql(char *sql) {
+  if (strstr(sql, "use ") != NULL) {
+    return true;
+  }
+  return false;
+}
+
+void httpTimeToString(time_t t, char *buf, int32_t buflen) {
+  memset(buf, 0, (size_t)buflen);
+  char ts[32] = {0};
+
+  struct tm *ptm;
+  time_t     tt = t / 1000;
+  ptm = localtime(&tt);
+  strftime(ts, 31, "%Y-%m-%d %H:%M:%S", ptm);
+  sprintf(buf, "%s.%03ld", ts, t % 1000);
+}
+
+int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) {
+  HttpSqlCmds *cmd = pContext->multiCmds;
+  if (cmd->buffer == NULL) return -1;
+
+  int32_t remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  char *  buffer = cmd->buffer + cmd->bufferPos;
+  int32_t len = 0;
+
+  va_list argpointer;
+  va_start(argpointer, format);
+  len += vsnprintf(buffer, (size_t)remainLength, format, argpointer);
+  va_end(argpointer);
+
+  if (cmd->bufferPos + len + 1 >= cmd->bufferSize) {
+    return -1;
+  }
+
+  cmd->buffer[cmd->bufferPos + len] = 0;
+  cmd->bufferPos = cmd->bufferPos + len + 1;
+
+  remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  return (int32_t)(buffer - cmd->buffer);
+}
+
+int32_t httpAddToSqlCmdBufferNoTerminal(HttpContext *pContext, const char *const format, ...) {
+  HttpSqlCmds *cmd = pContext->multiCmds;
+  if (cmd->buffer == NULL) return -1;
+
+  int32_t remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  char *  buffer = cmd->buffer + cmd->bufferPos;
+  int32_t len = 0;
+
+  va_list argpointer;
+  va_start(argpointer, format);
+  len += vsnprintf(buffer, (size_t)remainLength, format, argpointer);
+  va_end(argpointer);
+
+  if (cmd->bufferPos + len + 1 >= cmd->bufferSize) {
+    return -1;
+  }
+
+  cmd->bufferPos = cmd->bufferPos + len;
+
+  remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  return (int32_t)(buffer - cmd->buffer);
+}
+
+int32_t httpAddToSqlCmdBufferTerminal(HttpContext *pContext) {
+  HttpSqlCmds *cmd = pContext->multiCmds;
+  if (cmd->buffer == NULL) return -1;
+
+  int32_t remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  char *buffer = cmd->buffer + cmd->bufferPos;
+  *buffer = 0;
+  cmd->bufferPos = cmd->bufferPos + 1;
+
+  remainLength = cmd->bufferSize - cmd->bufferPos;
+  if (remainLength < 4096) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  return (int32_t)(buffer - cmd->buffer);
+}
+
+int32_t httpAddToSqlCmdBufferWithSize(HttpContext *pContext, int32_t mallocSize) {
+  HttpSqlCmds *cmd = pContext->multiCmds;
+  if (cmd->buffer == NULL) return -1;
+
+  if (cmd->bufferPos + mallocSize >= cmd->bufferSize) {
+    if (!httpReMallocMultiCmdsBuffer(pContext, cmd->bufferSize * 2)) return -1;
+  }
+
+  char *buffer = cmd->buffer + cmd->bufferPos;
+  memset(cmd->buffer + cmd->bufferPos, 0, (size_t)mallocSize);
+  cmd->bufferPos = cmd->bufferPos + mallocSize;
+
+  return (int32_t)(buffer - cmd->buffer);
+}
+
+bool httpMallocMultiCmds(HttpContext *pContext, int32_t cmdSize, int32_t bufferSize) {
+  if (cmdSize > HTTP_MAX_CMD_SIZE) {
+    httpError("context:%p, fd:%d, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd, pContext->user,
+              cmdSize, HTTP_MAX_CMD_SIZE);
+    return false;
+  }
+
+  if (pContext->multiCmds == NULL) {
+    pContext->multiCmds = (HttpSqlCmds *)malloc(sizeof(HttpSqlCmds));
+    if (pContext->multiCmds == NULL) {
+      httpError("context:%p, fd:%d, user:%s, malloc multiCmds error", pContext, pContext->fd, pContext->user);
+      return false;
+    }
+    memset(pContext->multiCmds, 0, sizeof(HttpSqlCmds));
+  }
+
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  if (multiCmds->cmds == NULL || cmdSize > multiCmds->maxSize) {
+    free(multiCmds->cmds);
+    multiCmds->cmds = (HttpSqlCmd *)malloc((size_t)cmdSize * sizeof(HttpSqlCmd));
+    if (multiCmds->cmds == NULL) {
+      httpError("context:%p, fd:%d, user:%s, malloc cmds:%d error", pContext, pContext->fd,
+                pContext->user, cmdSize);
+      return false;
+    }
+    multiCmds->maxSize = (int16_t)cmdSize;
+  }
+
+  if (multiCmds->buffer == NULL || bufferSize > multiCmds->bufferSize) {
+    free(multiCmds->buffer);
+    multiCmds->buffer = (char *)malloc((size_t)bufferSize);
+    if (multiCmds->buffer == NULL) {
+      httpError("context:%p, fd:%d, user:%s, malloc buffer:%d error", pContext, pContext->fd, pContext->user,
+                bufferSize);
+      return false;
+    }
+    multiCmds->bufferSize = bufferSize;
+  }
+
+  multiCmds->pos = 0;
+  multiCmds->size = 0;
+  multiCmds->bufferPos = 0;
+  memset(multiCmds->cmds, 0, (size_t)multiCmds->maxSize * sizeof(HttpSqlCmd));
+
+  return true;
+}
+
+bool httpReMallocMultiCmdsSize(HttpContext *pContext, int32_t cmdSize) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+
+  if (cmdSize > HTTP_MAX_CMD_SIZE) {
+    httpError("context:%p, fd:%d, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd, pContext->user,
+              cmdSize, HTTP_MAX_CMD_SIZE);
+    return false;
+  }
+
+  multiCmds->cmds = (HttpSqlCmd *)realloc(multiCmds->cmds, (size_t)cmdSize * sizeof(HttpSqlCmd));
+  if (multiCmds->cmds == NULL) {
+    httpError("context:%p, fd:%d, user:%s, malloc cmds:%d error", pContext, pContext->fd, pContext->user, cmdSize);
+    return false;
+  }
+  memset(multiCmds->cmds + multiCmds->maxSize, 0, (size_t)(cmdSize - multiCmds->maxSize) * sizeof(HttpSqlCmd));
+  multiCmds->maxSize = (int16_t)cmdSize;
+
+  return true;
+}
+
+bool httpReMallocMultiCmdsBuffer(HttpContext *pContext, int32_t bufferSize) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+
+  if (bufferSize > HTTP_MAX_BUFFER_SIZE) {
+    httpError("context:%p, fd:%d, user:%s, mulitcmd buffer size:%d large then %d", pContext, pContext->fd,
+              pContext->user, bufferSize, HTTP_MAX_BUFFER_SIZE);
+    return false;
+  }
+
+  multiCmds->buffer = (char *)realloc(multiCmds->buffer, (size_t)bufferSize);
+  if (multiCmds->buffer == NULL) {
+    httpError("context:%p, fd:%d, user:%s, malloc buffer:%d error", pContext, pContext->fd, pContext->user, bufferSize);
+    return false;
+  }
+  memset(multiCmds->buffer + multiCmds->bufferSize, 0, (size_t)(bufferSize - multiCmds->bufferSize));
+  multiCmds->bufferSize = bufferSize;
+
+  return true;
+}
+
+void httpFreeMultiCmds(HttpContext *pContext) {
+  if (pContext->multiCmds != NULL) {
+    if (pContext->multiCmds->buffer != NULL) free(pContext->multiCmds->buffer);
+    if (pContext->multiCmds->cmds != NULL) free(pContext->multiCmds->cmds);
+    free(pContext->multiCmds);
+    pContext->multiCmds = NULL;
+  }
+}
+
+JsonBuf *httpMallocJsonBuf(HttpContext *pContext) {
+  if (pContext->jsonBuf == NULL) {
+    pContext->jsonBuf = (JsonBuf *)malloc(sizeof(JsonBuf));
+  }
+
+  return pContext->jsonBuf;
+}
+
+void httpFreeJsonBuf(HttpContext *pContext) {
+  if (pContext->jsonBuf != NULL) {
+    free(pContext->jsonBuf);
+    pContext->jsonBuf = 0;
+  }
+}
+
+bool httpCompareMethod(HttpDecodeMethod *pSrc, HttpDecodeMethod *pCmp) {
+  if (strcmp(pSrc->module, pCmp->module) != 0) {
+    return false;
+  }
+  return true;
+}
+
+void httpAddMethod(HttpServer *pServer, HttpDecodeMethod *pMethod) {
+  int32_t pos = 0;
+  for (pos = 0; pos < pServer->methodScannerLen; ++pos) {
+    if (httpCompareMethod(pServer->methodScanner[pos], pMethod)) {
+      break;
+    }
+  }
+
+  if (pos == pServer->methodScannerLen && pServer->methodScannerLen < HTTP_METHOD_SCANNER_SIZE) {
+    pServer->methodScanner[pos] = pMethod;
+    pServer->methodScannerLen++;
+  }
+}
+
+HttpSqlCmd *httpNewSqlCmd(HttpContext *pContext) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  if (multiCmds->size >= multiCmds->maxSize) {
+    if (!httpReMallocMultiCmdsSize(pContext, 2 * multiCmds->maxSize)) return NULL;
+  }
+
+  HttpSqlCmd *cmd = multiCmds->cmds + multiCmds->size++;
+  cmd->cmdType = HTTP_CMD_TYPE_UN_SPECIFIED;
+  cmd->cmdReturnType = HTTP_CMD_RETURN_TYPE_WITH_RETURN;
+  cmd->cmdState = HTTP_CMD_STATE_NOT_RUN_YET;
+
+  return cmd;
+}
+
+HttpSqlCmd *httpCurrSqlCmd(HttpContext *pContext) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  if (multiCmds->size == 0) return NULL;
+  if (multiCmds->size > multiCmds->maxSize) return NULL;
+
+  return multiCmds->cmds + multiCmds->size - 1;
+}
+
+int32_t httpNextSqlCmdPos(HttpContext *pContext) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  return multiCmds->size;
+}
+
+void httpTrimTableName(char *name) {
+  for (int32_t i = 0; name[i] != 0; i++) {
+    if (name[i] == ' ' || name[i] == ':' || name[i] == '.' || name[i] == '-' || name[i] == '/' || name[i] == '\'')
+      name[i] = '_';
+    if (i == TSDB_TABLE_NAME_LEN) {
+      name[i] = 0;
+      break;
+    }
+  }
+}
+
+int32_t httpShrinkTableName(HttpContext *pContext, int32_t pos, char *name) {
+  int32_t len = 0;
+  for (int32_t i = 0; name[i] != 0; i++) {
+    if (name[i] == ' ' || name[i] == ':' || name[i] == '.' || name[i] == '-' || name[i] == '/' || name[i] == '\'' ||
+        name[i] == '\"')
+      name[i] = '_';
+    len++;
+  }
+
+  if (len < TSDB_TABLE_NAME_LEN - 1) {
+    return pos;
+  }
+
+  MD5_CTX context;
+  MD5Init(&context);
+  MD5Update(&context, (uint8_t *)name, (uint32_t)len);
+  MD5Final(&context);
+
+  int32_t table_name = httpAddToSqlCmdBuffer(
+      pContext, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
+      context.digest[1], context.digest[2], context.digest[3], context.digest[4], context.digest[5], context.digest[6],
+      context.digest[7], context.digest[8], context.digest[9], context.digest[10], context.digest[11],
+      context.digest[12], context.digest[13], context.digest[14], context.digest[15]);
+
+  if (table_name != -1) {
+    httpGetCmdsString(pContext, table_name)[0] = 't';
+  }
+
+  return table_name;
+}
+
+char *httpGetCmdsString(HttpContext *pContext, int32_t pos) {
+  HttpSqlCmds *multiCmds = pContext->multiCmds;
+  if (pos < 0 || pos >= multiCmds->bufferSize) {
+    return "";
+  }
+
+  return multiCmds->buffer + pos;
+}
+
+int32_t httpGzipDeCompress(char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData) {
+  int32_t err = 0;
+  z_stream gzipStream = {0};
+
+  static char dummyHead[2] = {
+          0x8 + 0x7 * 0x10,
+          (((0x8 + 0x7 * 0x10) * 0x100 + 30) / 31 * 31) & 0xFF,
+  };
+
+  gzipStream.zalloc = (alloc_func) 0;
+  gzipStream.zfree = (free_func) 0;
+  gzipStream.opaque = (voidpf) 0;
+  gzipStream.next_in = (Bytef *) srcData;
+  gzipStream.avail_in = 0;
+  gzipStream.next_out = (Bytef *) destData;
+  if (inflateInit2(&gzipStream, 47) != Z_OK) {
+    return -1;
+  }
+
+  while (gzipStream.total_out < *nDestData && gzipStream.total_in < nSrcData) {
+    gzipStream.avail_in = gzipStream.avail_out = nSrcData;  //1
+    if ((err = inflate(&gzipStream, Z_NO_FLUSH)) == Z_STREAM_END) {
+      break;
+    }
+
+    if (err != Z_OK) {
+      if (err == Z_DATA_ERROR) {
+        gzipStream.next_in = (Bytef *) dummyHead;
+        gzipStream.avail_in = sizeof(dummyHead);
+        if ((err = inflate(&gzipStream, Z_NO_FLUSH)) != Z_OK) {
+          return -2;
+        }
+      } else return -3;
+    }
+  }
+
+  if (inflateEnd(&gzipStream) != Z_OK) {
+    return -4;
+  }
+  *nDestData = gzipStream.total_out;
+
+  return 0;
+}
+
+int32_t httpGzipCompressInit(HttpContext *pContext) {
+  pContext->gzipStream.zalloc = (alloc_func) 0;
+  pContext->gzipStream.zfree = (free_func) 0;
+  pContext->gzipStream.opaque = (voidpf) 0;
+  if (deflateInit2(&pContext->gzipStream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS + 16, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
+    return -1;
+  }
+
+  return 0;
+}
+
+int32_t httpGzipCompress(HttpContext *pContext, char *srcData, int32_t nSrcData, char *destData, int32_t *nDestData, bool isTheLast) {
+  int32_t err = 0;
+  int32_t lastTotalLen = (int32_t) (pContext->gzipStream.total_out);
+  pContext->gzipStream.next_in = (Bytef *) srcData;
+  pContext->gzipStream.avail_in = (uLong) nSrcData;
+  pContext->gzipStream.next_out = (Bytef *) destData;
+  pContext->gzipStream.avail_out = (uLong) (*nDestData);
+
+  while (pContext->gzipStream.avail_in != 0) {
+    if (deflate(&pContext->gzipStream, Z_FULL_FLUSH) != Z_OK) {
+      return -1;
+    }
+
+    int32_t cacheLen = pContext->gzipStream.total_out - lastTotalLen;
+    if (cacheLen >= *nDestData) {
+      return -2;
+    }
+  }
+
+  if (pContext->gzipStream.avail_in != 0) {
+    return pContext->gzipStream.avail_in;
+  }
+
+  if (isTheLast) {
+    for (;;) {
+      if ((err = deflate(&pContext->gzipStream, Z_FINISH)) == Z_STREAM_END) {
+        break;
+      }
+      if (err != Z_OK) {
+        return -3;
+      }
+    }
+
+    if (deflateEnd(&pContext->gzipStream) != Z_OK) {
+      return -4;
+    }
+  }
+
+  *nDestData = (int32_t) (pContext->gzipStream.total_out) - lastTotalLen;
+  return 0;
+}
+
+bool httpUrlMatch(HttpContext* pContext, int32_t pos, char* cmp) {
+  HttpParser* pParser = pContext->parser;
+
+  if (pos < 0 || pos >= HTTP_MAX_URL) {
+    return false;
+  }
+
+  if (pParser->path[pos].pos <= 0) {
+    return false;
+  }
+
+  if (strcmp(pParser->path[pos].str, cmp) != 0) {
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/plugins/monitor/CMakeLists.txt b/src/plugins/monitor/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..edea2187ea23caa5d809346a43d14f6ffaf8a309
--- /dev/null
+++ b/src/plugins/monitor/CMakeLists.txt
@@ -0,0 +1,17 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+AUX_SOURCE_DIRECTORY(./src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(monitor ${SRC})
+  
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(monitor taos_static)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(monitor taos)
+  ENDIF ()
+ENDIF ()  
diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..048f839b728fd7ed2a74d59744ebff5d1223cc33
--- /dev/null
+++ b/src/plugins/monitor/src/monitorMain.c
@@ -0,0 +1,413 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tlog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tsystem.h"
+#include "tscUtil.h"
+#include "tsclient.h"
+#include "dnode.h"
+#include "monitor.h"
+#include "taoserror.h"
+
+#define monitorFatal(...) { if (monitorDebugFlag & DEBUG_FATAL) { taosPrintLog("MON FATAL ", 255, __VA_ARGS__); }}
+#define monitorError(...) { if (monitorDebugFlag & DEBUG_ERROR) { taosPrintLog("MON ERROR ", 255, __VA_ARGS__); }}
+#define monitorWarn(...)  { if (monitorDebugFlag & DEBUG_WARN)  { taosPrintLog("MON WARN ", 255, __VA_ARGS__); }}
+#define monitorInfo(...)  { if (monitorDebugFlag & DEBUG_INFO)  { taosPrintLog("MON ", 255, __VA_ARGS__); }}
+#define monitorDebug(...) { if (monitorDebugFlag & DEBUG_DEBUG) { taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); }}
+#define monitorTrace(...) { if (monitorDebugFlag & DEBUG_TRACE) { taosPrintLog("MON ", monitorDebugFlag, __VA_ARGS__); }}
+
+#define SQL_LENGTH     1030
+#define LOG_LEN_STR    100
+#define IP_LEN_STR     TSDB_EP_LEN
+#define CHECK_INTERVAL 1000
+
+typedef enum {
+  MON_CMD_CREATE_DB,
+  MON_CMD_CREATE_TB_LOG,
+  MON_CMD_CREATE_MT_DN,
+  MON_CMD_CREATE_MT_ACCT,
+  MON_CMD_CREATE_TB_DN,
+  MON_CMD_CREATE_TB_ACCT_ROOT,
+  MON_CMD_CREATE_TB_SLOWQUERY,
+  MON_CMD_MAX
+} EMonitorCommand;
+
+typedef enum {
+  MON_STATE_NOT_INIT,
+  MON_STATE_INITED
+} EMonitorState;
+
+typedef struct {
+  pthread_t thread;
+  void *    conn;
+  char      ep[TSDB_EP_LEN];
+  int8_t    cmdIndex;
+  int8_t    state;
+  int8_t    start;   // enable/disable by mnode
+  int8_t    quiting; // taosd is quiting 
+  char      sql[SQL_LENGTH + 1];
+} SMonitorConn;
+
+static SMonitorConn tsMonitor = {0};
+static void  monitorSaveSystemInfo();
+static void *monitorThreadFunc(void *param);
+static void  monitorBuildMonitorSql(char *sql, int32_t cmd);
+extern int32_t (*monitorStartSystemFp)();
+extern void    (*monitorStopSystemFp)();
+extern void    (*monitorExecuteSQLFp)(char *sql);
+
+int32_t monitorInitSystem() {
+  if (tsMonitor.ep[0] == 0) {
+    strcpy(tsMonitor.ep, tsLocalEp);
+  }
+
+  int len = strlen(tsMonitor.ep);
+  for (int i = 0; i < len; ++i) {
+    if (tsMonitor.ep[i] == ':' || tsMonitor.ep[i] == '-' || tsMonitor.ep[i] == '.') {
+      tsMonitor.ep[i] = '_';
+    }
+  }
+
+  pthread_attr_t thAttr;
+  pthread_attr_init(&thAttr);
+  pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+  if (pthread_create(&tsMonitor.thread, &thAttr, monitorThreadFunc, NULL)) {
+    monitorError("failed to create thread to for monitor module, reason:%s", strerror(errno));
+    return -1;
+  }
+
+  pthread_attr_destroy(&thAttr);
+  monitorDebug("monitor thread is launched");
+
+  monitorStartSystemFp = monitorStartSystem;
+  monitorStopSystemFp = monitorStopSystem;
+  return 0;
+}
+
+int32_t monitorStartSystem() {
+  taos_init();
+  tsMonitor.start = 1;
+  monitorExecuteSQLFp = monitorExecuteSQL;
+  monitorInfo("monitor module start");
+  return 0;
+}
+
+static void *monitorThreadFunc(void *param) {
+  monitorDebug("starting to initialize monitor module ...");
+
+  while (1) {
+    static int32_t accessTimes = 0;
+    accessTimes++;
+    taosMsleep(1000);
+
+    if (tsMonitor.quiting) {
+      tsMonitor.state = MON_STATE_NOT_INIT;
+      monitorInfo("monitor thread will quit, for taosd is quiting");
+      break;
+    } else {
+      taosGetDisk();
+    }
+
+    if (tsMonitor.start == 0) {
+      continue;
+    }
+    
+    if (dnodeGetDnodeId() <= 0) {
+      monitorDebug("dnode not initialized, waiting for 3000 ms to start monitor module");
+      continue;
+    }
+
+    if (tsMonitor.conn == NULL) {
+      tsMonitor.state = MON_STATE_NOT_INIT;
+      tsMonitor.conn = taos_connect(NULL, "monitor", tsInternalPass, "", 0);
+      if (tsMonitor.conn == NULL) {
+        monitorError("failed to connect to database, reason:%s", tstrerror(terrno));
+        continue;
+      } else {
+        monitorDebug("connect to database success");
+      }
+    }
+
+    if (tsMonitor.state == MON_STATE_NOT_INIT) {
+      for (; tsMonitor.cmdIndex < MON_CMD_MAX; ++tsMonitor.cmdIndex) {
+        monitorBuildMonitorSql(tsMonitor.sql, tsMonitor.cmdIndex);
+        void *res = taos_query(tsMonitor.conn, tsMonitor.sql);
+        int   code = taos_errno(res);
+        taos_free_result(res);
+
+        if (code != 0) {
+          monitorError("failed to exec sql:%s, reason:%s", tsMonitor.sql, tstrerror(code));
+          break;
+        } else {
+          monitorDebug("successfully to exec sql:%s", tsMonitor.sql);
+        }
+      }
+
+      if (tsMonitor.start) {
+        tsMonitor.state = MON_STATE_INITED;
+      }
+    }
+
+    if (tsMonitor.state == MON_STATE_INITED) {
+      if (accessTimes % tsMonitorInterval == 0) {
+        monitorSaveSystemInfo();
+      }
+    }
+  }
+
+  monitorInfo("monitor thread is stopped");
+  return NULL;
+}
+
+static void monitorBuildMonitorSql(char *sql, int32_t cmd) {
+  memset(sql, 0, SQL_LENGTH);
+
+  if (cmd == MON_CMD_CREATE_DB) {
+    snprintf(sql, SQL_LENGTH,
+             "create database if not exists %s replica 1 days 10 keep 30 cache %d "
+             "blocks %d precision 'us'",
+             tsMonitorDbName, TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MIN_TOTAL_BLOCKS);
+  } else if (cmd == MON_CMD_CREATE_MT_DN) {
+    snprintf(sql, SQL_LENGTH,
+             "create table if not exists %s.dn(ts timestamp"
+             ", cpu_taosd float, cpu_system float, cpu_cores int"
+             ", mem_taosd float, mem_system float, mem_total int"
+             ", disk_used float, disk_total int"
+             ", band_speed float"
+             ", io_read float, io_write float"
+             ", req_http int, req_select int, req_insert int"
+             ") tags (dnodeid int, fqdn binary(%d))",
+             tsMonitorDbName, TSDB_FQDN_LEN);
+  } else if (cmd == MON_CMD_CREATE_TB_DN) {
+    snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn%d using %s.dn tags(%d, '%s')", tsMonitorDbName,
+             dnodeGetDnodeId(), tsMonitorDbName, dnodeGetDnodeId(), tsLocalEp);
+  } else if (cmd == MON_CMD_CREATE_MT_ACCT) {
+    snprintf(sql, SQL_LENGTH,
+             "create table if not exists %s.acct(ts timestamp "
+             ", currentPointsPerSecond bigint, maxPointsPerSecond bigint"
+             ", totalTimeSeries bigint, maxTimeSeries bigint"
+             ", totalStorage bigint, maxStorage bigint"
+             ", totalQueryTime bigint, maxQueryTime bigint"
+             ", totalInbound bigint, maxInbound bigint"
+             ", totalOutbound bigint, maxOutbound bigint"
+             ", totalDbs smallint, maxDbs smallint"
+             ", totalUsers smallint, maxUsers smallint"
+             ", totalStreams smallint, maxStreams smallint"
+             ", totalConns smallint, maxConns smallint"
+             ", accessState smallint"
+             ") tags (acctId binary(%d))",
+             tsMonitorDbName, TSDB_USER_LEN);
+  } else if (cmd == MON_CMD_CREATE_TB_ACCT_ROOT) {
+    snprintf(sql, SQL_LENGTH, "create table if not exists %s.acct_%s using %s.acct tags('%s')", tsMonitorDbName, TSDB_DEFAULT_USER,
+             tsMonitorDbName, TSDB_DEFAULT_USER);
+  } else if (cmd == MON_CMD_CREATE_TB_SLOWQUERY) {
+    snprintf(sql, SQL_LENGTH,
+             "create table if not exists %s.slowquery(ts timestamp, username "
+             "binary(%d), created_time timestamp, time bigint, sql binary(%d))",
+             tsMonitorDbName, TSDB_TABLE_FNAME_LEN - 1, TSDB_SLOW_QUERY_SQL_LEN);
+  } else if (cmd == MON_CMD_CREATE_TB_LOG) {
+    snprintf(sql, SQL_LENGTH,
+             "create table if not exists %s.log(ts timestamp, level tinyint, "
+             "content binary(%d), ipaddr binary(%d))",
+             tsMonitorDbName, LOG_LEN_STR, IP_LEN_STR);
+  }
+
+  sql[SQL_LENGTH] = 0;
+}
+
+void monitorStopSystem() {
+  tsMonitor.start = 0;
+  tsMonitor.state = MON_STATE_NOT_INIT;
+  monitorExecuteSQLFp = NULL;
+  monitorInfo("monitor module stopped");
+}
+
+void monitorCleanUpSystem() {
+  tsMonitor.quiting = 1;
+  monitorStopSystem();
+  pthread_join(tsMonitor.thread, NULL);
+  if (tsMonitor.conn != NULL) {
+    taos_close(tsMonitor.conn);
+    tsMonitor.conn = NULL;
+  }
+  monitorInfo("monitor module is cleaned up");
+}
+
+// unit is MB
+static int32_t monitorBuildMemorySql(char *sql) {
+  float sysMemoryUsedMB = 0;
+  bool  suc = taosGetSysMemory(&sysMemoryUsedMB);
+  if (!suc) {
+    monitorDebug("failed to get sys memory info");
+  }
+
+  float procMemoryUsedMB = 0;
+  suc = taosGetProcMemory(&procMemoryUsedMB);
+  if (!suc) {
+    monitorDebug("failed to get proc memory info");
+  }
+
+  return sprintf(sql, ", %f, %f, %d", procMemoryUsedMB, sysMemoryUsedMB, tsTotalMemoryMB);
+}
+
+// unit is %
+static int32_t monitorBuildCpuSql(char *sql) {
+  float sysCpuUsage = 0, procCpuUsage = 0;
+  bool  suc = taosGetCpuUsage(&sysCpuUsage, &procCpuUsage);
+  if (!suc) {
+    monitorDebug("failed to get cpu usage");
+  }
+
+  if (sysCpuUsage <= procCpuUsage) {
+    sysCpuUsage = procCpuUsage + 0.1f;
+  }
+
+  return sprintf(sql, ", %f, %f, %d", procCpuUsage, sysCpuUsage, tsNumOfCores);
+}
+
+// unit is GB
+static int32_t monitorBuildDiskSql(char *sql) {
+  return sprintf(sql, ", %f, %d", (tsTotalDataDirGB - tsAvailDataDirGB), (int32_t)tsTotalDataDirGB);
+}
+
+// unit is Kb
+static int32_t monitorBuildBandSql(char *sql) {
+  float bandSpeedKb = 0;
+  bool  suc = taosGetBandSpeed(&bandSpeedKb);
+  if (!suc) {
+    monitorDebug("failed to get bandwidth speed");
+  }
+
+  return sprintf(sql, ", %f", bandSpeedKb);
+}
+
+static int32_t monitorBuildReqSql(char *sql) {
+  SDnodeStatisInfo info = dnodeGetStatisInfo();
+  return sprintf(sql, ", %d, %d, %d)", info.httpReqNum, info.queryReqNum, info.submitReqNum);
+}
+
+static int32_t monitorBuildIoSql(char *sql) {
+  float readKB = 0, writeKB = 0;
+  bool  suc = taosGetProcIO(&readKB, &writeKB);
+  if (!suc) {
+    monitorDebug("failed to get io info");
+  }
+
+  return sprintf(sql, ", %f, %f", readKB, writeKB);
+}
+
+static void monitorSaveSystemInfo() {
+  int64_t ts = taosGetTimestampUs();
+  char *  sql = tsMonitor.sql;
+  int32_t pos = snprintf(sql, SQL_LENGTH, "insert into %s.dn%d values(%" PRId64, tsMonitorDbName, dnodeGetDnodeId(), ts);
+
+  pos += monitorBuildCpuSql(sql + pos);
+  pos += monitorBuildMemorySql(sql + pos);
+  pos += monitorBuildDiskSql(sql + pos);
+  pos += monitorBuildBandSql(sql + pos);
+  pos += monitorBuildIoSql(sql + pos);
+  pos += monitorBuildReqSql(sql + pos);
+
+  void *res = taos_query(tsMonitor.conn, tsMonitor.sql);
+  int   code = taos_errno(res);
+  taos_free_result(res);
+
+  if (code != 0) {
+    monitorError("failed to save system info, reason:%s, sql:%s", tstrerror(code), tsMonitor.sql);
+  } else {
+    monitorDebug("successfully to save system info, sql:%s", tsMonitor.sql);
+  }
+}
+
+static void montiorExecSqlCb(void *param, TAOS_RES *result, int32_t code) {
+  int32_t c = taos_errno(result);
+  if (c != TSDB_CODE_SUCCESS) {
+    monitorError("save %s failed, reason:%s", (char *)param, tstrerror(c));
+  } else {
+    int32_t rows = taos_affected_rows(result);
+    monitorDebug("save %s succ, rows:%d", (char *)param, rows);
+  }
+
+  taos_free_result(result);
+}
+
+void monitorSaveAcctLog(SAcctMonitorObj *pMon) {
+  if (tsMonitor.state != MON_STATE_INITED) return;
+
+  char sql[1024] = {0};
+  sprintf(sql,
+          "insert into %s.acct_%s using %s.acct tags('%s') values(now"
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %" PRId64 ", %" PRId64
+          ", %d)",
+          tsMonitorDbName, pMon->acctId, tsMonitorDbName, pMon->acctId,
+          pMon->currentPointsPerSecond, pMon->maxPointsPerSecond,
+          pMon->totalTimeSeries, pMon->maxTimeSeries,
+          pMon->totalStorage, pMon->maxStorage,
+          pMon->totalQueryTime, pMon->maxQueryTime,
+          pMon->totalInbound, pMon->maxInbound,
+          pMon->totalOutbound, pMon->maxOutbound,
+          pMon->totalDbs, pMon->maxDbs,
+          pMon->totalUsers, pMon->maxUsers,
+          pMon->totalStreams, pMon->maxStreams,
+          pMon->totalConns, pMon->maxConns,
+          pMon->accessState);
+
+  monitorDebug("save account info, sql:%s", sql);
+  taos_query_a(tsMonitor.conn, sql, montiorExecSqlCb, "account info");
+}
+
+void monitorSaveLog(int32_t level, const char *const format, ...) {
+  if (tsMonitor.state != MON_STATE_INITED) return;
+
+  va_list argpointer;
+  char    sql[SQL_LENGTH] = {0};
+  int32_t max_length = SQL_LENGTH - 30;
+  int32_t len = snprintf(sql, (size_t)max_length, "insert into %s.log values(%" PRId64 ", %d,'", tsMonitorDbName,
+                         taosGetTimestampUs(), level);
+
+  va_start(argpointer, format);
+  len += vsnprintf(sql + len, (size_t)(max_length - len), format, argpointer);
+  va_end(argpointer);
+  if (len > max_length) len = max_length;
+
+  len += sprintf(sql + len, "', '%s')", tsLocalEp);
+  sql[len++] = 0;
+
+  monitorDebug("save log, sql: %s", sql);
+  taos_query_a(tsMonitor.conn, sql, montiorExecSqlCb, "log");
+}
+
+void monitorExecuteSQL(char *sql) {
+  if (tsMonitor.state != MON_STATE_INITED) return;
+
+  monitorDebug("execute sql:%s", sql);
+  taos_query_a(tsMonitor.conn, sql, montiorExecSqlCb, "sql");
+}
diff --git a/src/plugins/mqtt/CMakeLists.txt b/src/plugins/mqtt/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cf5729d6087065bd38a5bed140ec01b1b531f454
--- /dev/null
+++ b/src/plugins/mqtt/CMakeLists.txt
@@ -0,0 +1,20 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/include)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/MQTT-C/examples/templates)
+AUX_SOURCE_DIRECTORY(src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(mqtt ${SRC})
+  TARGET_LINK_LIBRARIES(mqtt cJson mqttc)
+
+  IF (TD_SOMODE_STATIC)
+    TARGET_LINK_LIBRARIES(mqtt taos_static)
+  ELSE ()
+    TARGET_LINK_LIBRARIES(mqtt taos)
+  ENDIF ()
+ENDIF ()
diff --git a/src/plugins/mqtt/inc/mqttInit.h b/src/plugins/mqtt/inc/mqttInit.h
new file mode 100644
index 0000000000000000000000000000000000000000..81a9a39a2ce04c66934c4bd25ed67bdb51c77ba3
--- /dev/null
+++ b/src/plugins/mqtt/inc/mqttInit.h
@@ -0,0 +1,77 @@
+/*
+ * 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_MQTT_INIT_H
+#define TDENGINE_MQTT_INIT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file
+ * A simple subscriber program that performs automatic reconnections.
+ */
+#include "mqtt.h"
+
+#define QOS                1
+#define TIMEOUT            10000L
+#define MQTT_SEND_BUF_SIZE 102400
+#define MQTT_RECV_BUF_SIZE 102400
+
+/**
+ * @brief A structure that I will use to keep track of some data needed
+ *        to setup the connection to the broker.
+ *
+ * An instance of this struct will be created in my \c main(). Then, whenever
+ * \ref mqttReconnectClient is called, this instance will be passed.
+ */
+typedef struct SMqttReconnectState {
+  uint8_t* sendbuf;
+  size_t   sendbufsz;
+  uint8_t* recvbuf;
+  size_t   recvbufsz;
+} SMqttReconnectState;
+
+/**
+ * @brief My reconnect callback. It will reestablish the connection whenever
+ *        an error occurs.
+ */
+void mqttReconnectClient(struct mqtt_client* client, void** reconnect_state_vptr);
+
+/**
+ * @brief The function will be called whenever a PUBLISH message is received.
+ */
+void mqttPublishCallback(void** unused, struct mqtt_response_publish* published);
+
+/**
+ * @brief The client's refresher. This function triggers back-end routines to
+ *        handle ingress/egress traffic to the broker.
+ *
+ * @note All this function needs to do is call \ref __mqtt_recv and
+ *       \ref __mqtt_send every so often. I've picked 100 ms meaning that
+ *       client ingress/egress traffic will be handled every 100 ms.
+ */
+void* mqttClientRefresher(void* client);
+
+/**
+ * @brief Safelty closes the \p sockfd and cancels the \p client_daemon before \c exit.
+ */
+void mqttCleanupRes(int status, int sockfd, pthread_t* client_daemon);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/plugins/mqtt/inc/mqttLog.h b/src/plugins/mqtt/inc/mqttLog.h
new file mode 100644
index 0000000000000000000000000000000000000000..e186b8111220bd83f2f6833d84d1fdc19f744520
--- /dev/null
+++ b/src/plugins/mqtt/inc/mqttLog.h
@@ -0,0 +1,30 @@
+/*
+ * 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 <mqtt://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_MQTT_LOG_H
+#define TDENGINE_MQTT_LOG_H
+
+#include "tlog.h"
+
+extern int32_t mqttDebugFlag;
+
+#define mqttFatal(...) { if (mqttDebugFlag & DEBUG_FATAL) { taosPrintLog("MQT FATAL ", 255, __VA_ARGS__); }}
+#define mqttError(...) { if (mqttDebugFlag & DEBUG_ERROR) { taosPrintLog("MQT ERROR ", 255, __VA_ARGS__); }}
+#define mqttWarn(...)  { if (mqttDebugFlag & DEBUG_WARN)  { taosPrintLog("MQT WARN ", 255, __VA_ARGS__); }}
+#define mqttInfo(...)  { if (mqttDebugFlag & DEBUG_INFO)  { taosPrintLog("MQT ", 255, __VA_ARGS__); }}
+#define mqttDebug(...) { if (mqttDebugFlag & DEBUG_DEBUG) { taosPrintLog("MQT ", mqttDebugFlag, __VA_ARGS__); }}
+#define mqttTrace(...) { if (mqttDebugFlag & DEBUG_TRACE) { taosPrintLog("MQT ", mqttDebugFlag, __VA_ARGS__); }}
+
+#endif
diff --git a/src/plugins/mqtt/inc/mqttPayload.h b/src/plugins/mqtt/inc/mqttPayload.h
new file mode 100644
index 0000000000000000000000000000000000000000..12a714afac52d1814f3cbf82ade610ec8af07953
--- /dev/null
+++ b/src/plugins/mqtt/inc/mqttPayload.h
@@ -0,0 +1,29 @@
+/*
+ * 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_MQTT_PLYLOAD_H
+#define TDENGINE_MQTT_PLYLOAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char* mqttConverJsonToSql(char* json, int maxSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/plugins/mqtt/src/mqttPayload.c b/src/plugins/mqtt/src/mqttPayload.c
new file mode 100644
index 0000000000000000000000000000000000000000..1af8b02fad7492da5664628b534b890732acbe3a
--- /dev/null
+++ b/src/plugins/mqtt/src/mqttPayload.c
@@ -0,0 +1,159 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "cJSON.h"
+#include "mqttLog.h"
+#include "mqttPayload.h"
+
+// subscribe message like this
+
+/*
+/test {
+    "timestamp": 1599121290,
+    "gateway": {
+        "name": "AcuLink 810 Gateway",
+        "model": "AcuLink810-868",
+        "serial": "S8P20200207"
+    },
+    "device": {
+        "name": "Acuvim L V3 .221",
+        "model": "Acuvim-L-V3",
+        "serial": "221",
+        "online": true,
+        "readings": [
+            {
+                "param": "Freq_Hz",
+                "value": "59.977539",
+                "unit": "Hz"
+            },
+            {
+                "param": "Va_V",
+                "value": "122.002907",
+                "unit": "V"
+            },
+            {
+                "param": "DI4",
+                "value": "5.000000",
+                "unit": ""
+            }
+        ]
+    }
+}
+*/
+
+// send msg cmd
+// mosquitto_pub -h test.mosquitto.org  -t "/test" -m '{"timestamp": 1599121290,"gateway": {"name": "AcuLink 810 Gateway","model": "AcuLink810-868","serial": "S8P20200207"},"device": {"name": "Acuvim L V3 .221","model": "Acuvim-L-V3","serial": "221","online": true,"readings": [{"param": "Freq_Hz","value": "59.977539","unit": "Hz"},{"param": "Va_V","value": "122.002907","unit": "V"},{"param": "DI4","value": "5.000000","unit": ""}]}}'
+
+/*
+ * This is an example, this function needs to be implemented in order to parse the json file into a sql statement
+ * Note that you need to create a super table and database before writing data
+ * In this case:
+ *   create database mqttdb;
+ *   create table mqttdb.devices(ts timestamp, value bigint) tags(name binary(32), model binary(32), serial binary(16), param binary(16), unit binary(16));
+ */
+
+char* mqttConverJsonToSql(char* json, int maxSize) {
+  // const int32_t maxSize = 10240;
+  maxSize *= 5;
+  char* sql = malloc(maxSize);
+
+  cJSON* root = cJSON_Parse(json);
+  if (root == NULL) {
+    mqttError("failed to parse msg, invalid json format");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* timestamp = cJSON_GetObjectItem(root, "timestamp");
+  if (!timestamp || timestamp->type != cJSON_Number) {
+    mqttError("failed to parse msg, timestamp not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* device = cJSON_GetObjectItem(root, "device");
+  if (!device) {
+    mqttError("failed to parse msg, device not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* name = cJSON_GetObjectItem(device, "name");
+  if (!name || name->type != cJSON_String) {
+    mqttError("failed to parse msg, name not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* model = cJSON_GetObjectItem(device, "model");
+  if (!model || model->type != cJSON_String) {
+    mqttError("failed to parse msg, model not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* serial = cJSON_GetObjectItem(device, "serial");
+  if (!serial || serial->type != cJSON_String) {
+    mqttError("failed to parse msg, serial not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  cJSON* readings = cJSON_GetObjectItem(device, "readings");
+  if (!readings || readings->type != cJSON_Array) {
+    mqttError("failed to parse msg, readings not found");
+    goto MQTT_PARSE_OVER;
+  }
+
+  int count = cJSON_GetArraySize(readings);
+  if (count <= 0) {
+    mqttError("failed to parse msg, readings size smaller than 0");
+    goto MQTT_PARSE_OVER;
+  }
+
+  int len = snprintf(sql, maxSize, "insert into");
+
+  for (int i = 0; i < count; ++i) {
+    cJSON* reading = cJSON_GetArrayItem(readings, i);
+    if (reading == NULL) continue;
+
+    cJSON* param = cJSON_GetObjectItem(reading, "param");
+    if (!param || param->type != cJSON_String) {
+      mqttError("failed to parse msg, param not found");
+      goto MQTT_PARSE_OVER;
+    }
+
+    cJSON* value = cJSON_GetObjectItem(reading, "value");
+    if (!value || value->type != cJSON_String) {
+      mqttError("failed to parse msg, value not found");
+      goto MQTT_PARSE_OVER;
+    }
+
+    cJSON* unit = cJSON_GetObjectItem(reading, "unit");
+    if (!unit || unit->type != cJSON_String) {
+      mqttError("failed to parse msg, unit not found");
+      goto MQTT_PARSE_OVER;
+    }
+
+    len += snprintf(sql + len, maxSize - len,
+        " mqttdb.serial_%s_%s using mqttdb.devices tags('%s', '%s', '%s', '%s', '%s') values(%" PRId64 ", %s)",
+        serial->valuestring, param->valuestring, name->valuestring, model->valuestring, serial->valuestring,
+        param->valuestring, unit->valuestring, timestamp->valueint * 1000, value->valuestring);
+  }
+
+  cJSON_free(root);
+  return sql;
+
+MQTT_PARSE_OVER:
+  cJSON_free(root);
+  free(sql);
+  return NULL;
+}
\ No newline at end of file
diff --git a/src/plugins/mqtt/src/mqttSystem.c b/src/plugins/mqtt/src/mqttSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..eacc3b1f74cdfc0d00bb53a38beb8c85b164e200
--- /dev/null
+++ b/src/plugins/mqtt/src/mqttSystem.c
@@ -0,0 +1,144 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "mqtt.h"
+#include "mqttInit.h"
+#include "mqttLog.h"
+#include "mqttPayload.h"
+#include "tmqtt.h"
+#include "posix_sockets.h"
+#include "taos.h"
+#include "tglobal.h"
+#include "taoserror.h"
+
+struct SMqttReconnectState tsMqttStatus = {0};
+struct mqtt_client tsMqttClient = {0};
+static pthread_t   tsMqttClientDaemonThread = {0};
+static void*       tsMqttConnect = NULL;
+static bool        tsMqttIsRuning = false;
+
+int32_t mqttInitSystem() { return 0; }
+
+int32_t mqttStartSystem() {
+  tsMqttStatus.sendbufsz = MQTT_SEND_BUF_SIZE;
+  tsMqttStatus.recvbufsz = MQTT_RECV_BUF_SIZE;
+  tsMqttStatus.sendbuf = malloc(MQTT_SEND_BUF_SIZE);
+  tsMqttStatus.recvbuf = malloc(MQTT_RECV_BUF_SIZE);
+  tsMqttIsRuning = true;
+
+  mqtt_init_reconnect(&tsMqttClient, mqttReconnectClient, &tsMqttStatus, mqttPublishCallback);
+  if (pthread_create(&tsMqttClientDaemonThread, NULL, mqttClientRefresher, &tsMqttClient)) {
+    mqttError("mqtt failed to start daemon.");
+    mqttCleanupRes(EXIT_FAILURE, -1, NULL);
+    return -1;
+  }
+
+  mqttInfo("mqtt listening for topic:%s messages", tsMqttTopic);
+  return 0;
+}
+
+void mqttStopSystem() {
+  if (tsMqttIsRuning) {
+    tsMqttIsRuning = false;
+    tsMqttClient.error = MQTT_ERROR_SOCKET_ERROR;
+
+    taosMsleep(300);
+    mqttCleanupRes(EXIT_SUCCESS, tsMqttClient.socketfd, &tsMqttClientDaemonThread);
+
+    mqttInfo("mqtt is stopped");
+  }
+}
+
+void mqttCleanUpSystem() {
+  mqttStopSystem();
+  mqttInfo("mqtt is cleaned up");
+}
+
+void mqttPublishCallback(void** unused, struct mqtt_response_publish* published) {
+  const char* content = published->application_message;
+  mqttDebug("receive mqtt message, size:%d", (int)published->application_message_size);
+
+  if (tsMqttConnect == NULL) {
+    tsMqttConnect = taos_connect(NULL, "_root", tsInternalPass, "", 0);
+    if (tsMqttConnect == NULL) {
+      mqttError("failed to connect to tdengine, reason:%s", tstrerror(terrno));
+      return;
+    } else {
+      mqttInfo("successfully connected to the tdengine");
+    }
+  }
+
+  mqttTrace("receive mqtt message, content:%s", content);
+
+  char* sql = mqttConverJsonToSql((char*)content, (int)published->application_message_size);
+  if (sql != NULL) {
+    void* res = taos_query(tsMqttConnect, sql);
+    int   code = taos_errno(res);
+    if (code != 0) {
+      mqttError("failed to exec sql, reason:%s sql:%s", tstrerror(code), sql);
+    } else {
+      mqttTrace("successfully to exec sql:%s", sql);
+    }
+    taos_free_result(res);
+  } else {
+    mqttError("failed to parse mqtt message");
+  }
+}
+
+void* mqttClientRefresher(void* client) {
+  while (tsMqttIsRuning) {
+    mqtt_sync((struct mqtt_client*)client);
+    taosMsleep(100);
+  }
+
+  mqttDebug("mqtt quit refresher");
+  return NULL;
+}
+
+void mqttCleanupRes(int status, int sockfd, pthread_t* client_daemon) {
+  mqttInfo("clean up mqtt module");
+  if (sockfd != -1) {
+    close(sockfd);
+  }
+
+  if (client_daemon != NULL) {
+    pthread_cancel(*client_daemon);
+  }
+}
+
+void mqttReconnectClient(struct mqtt_client* client, void** unused) {
+  mqttInfo("mqtt tries to connect to the mqtt server");
+
+  if (client->error != MQTT_ERROR_INITIAL_RECONNECT) {
+    close(client->socketfd);
+  }
+
+  if (client->error != MQTT_ERROR_INITIAL_RECONNECT) {
+    mqttError("mqtt client was in error state %s", mqtt_error_str(client->error));
+  }
+
+  int sockfd = open_nb_socket(tsMqttHostName, tsMqttPort);
+  if (sockfd < 0) {
+    mqttError("mqtt client failed to open socket %s:%s", tsMqttHostName, tsMqttPort);
+    //mqttCleanupRes(EXIT_FAILURE, sockfd, NULL);
+    return;
+  }
+
+  mqtt_reinit(client, sockfd, tsMqttStatus.sendbuf, tsMqttStatus.sendbufsz, tsMqttStatus.recvbuf, tsMqttStatus.recvbufsz);
+  mqtt_connect(client, tsMqttClientId, NULL, NULL, 0, tsMqttUser, tsMqttPass, MQTT_CONNECT_CLEAN_SESSION, 400);
+  mqtt_subscribe(client, tsMqttTopic, 0);
+}
\ No newline at end of file
diff --git a/src/query/CMakeLists.txt b/src/query/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c1024f008095be76dba0d8dd59447a489c015772
--- /dev/null
+++ b/src/query/CMakeLists.txt
@@ -0,0 +1,16 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(inc)
+
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_LIBRARY(query ${SRC})
+SET_SOURCE_FILES_PROPERTIES(src/sql.c PROPERTIES COMPILE_FLAGS -w)
+TARGET_LINK_LIBRARIES(query tsdb tutil)
+
+IF (TD_LINUX)
+  TARGET_LINK_LIBRARIES(query m rt)
+  ADD_SUBDIRECTORY(tests)
+ENDIF ()
diff --git a/src/query/inc/qAst.h b/src/query/inc/qAst.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3e60c21dc376e6a1e88f959fbf4b43bf47ab4b0
--- /dev/null
+++ b/src/query/inc/qAst.h
@@ -0,0 +1,96 @@
+/*
+ * 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_TAST_H
+#define TDENGINE_TAST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+
+#include "taosmsg.h"
+#include "taosdef.h"
+#include "tskiplist.h"
+#include "tbuffer.h"
+#include "tvariant.h"
+
+struct tExprNode;
+struct SSchema;
+
+enum {
+  TSQL_NODE_DUMMY = 0x0,
+  TSQL_NODE_EXPR  = 0x1,
+  TSQL_NODE_COL   = 0x2,
+  TSQL_NODE_VALUE = 0x4,
+};
+
+typedef bool (*__result_filter_fn_t)(const void *, void *);
+typedef void (*__do_filter_suppl_fn_t)(void *, void *);
+
+/**
+ * this structure is used to filter data in tags, so the offset of filtered tag column in tagdata string is required
+ */
+typedef struct tQueryInfo {
+  uint8_t       optr;     // expression operator
+  SSchema       sch;      // schema of tags
+  char*         q;
+  __compar_fn_t compare;  // filter function
+  bool          indexed;  // indexed columns
+} tQueryInfo;
+
+typedef struct SExprTraverseSupp {
+  __result_filter_fn_t   nodeFilterFn;
+  __do_filter_suppl_fn_t setupInfoFn;
+  void *                 pExtInfo;
+} SExprTraverseSupp;
+
+typedef struct tExprNode {
+  uint8_t nodeType;
+  union {
+    struct {
+      uint8_t optr;             // filter operator
+      uint8_t hasPK;            // 0: do not contain primary filter, 1: contain
+      void *  info;             // support filter operation on this expression only available for leaf node
+      
+      struct tExprNode *pLeft;  // left child pointer
+      struct tExprNode *pRight; // right child pointer
+    } _node;
+    struct SSchema *pSchema;
+    tVariant *      pVal;
+  };
+} tExprNode;
+
+void tExprTreeDestroy(tExprNode **pExprs, void (*fp)(void*));
+
+void tExprTreeTraverse(tExprNode *pExpr, SSkipList *pSkipList, SArray *result, SExprTraverseSupp *param);
+
+void tExprTreeCalcTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,
+                                char *(*cb)(void *, const char*, int32_t));
+
+uint8_t getBinaryExprOptr(SStrToken *pToken);
+
+void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *));
+void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
+
+tExprNode* exprTreeFromBinary(const void* data, size_t size);
+tExprNode* exprTreeFromTableName(const char* tbnameCond);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TAST_H
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
new file mode 100644
index 0000000000000000000000000000000000000000..5d570821cb6608fb382398e146766eb1f8aff284
--- /dev/null
+++ b/src/query/inc/qExecutor.h
@@ -0,0 +1,213 @@
+/*
+ * 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_QUERYEXECUTOR_H
+#define TDENGINE_QUERYEXECUTOR_H
+
+#include "os.h"
+
+#include "hash.h"
+#include "qFill.h"
+#include "qResultbuf.h"
+#include "qSqlparser.h"
+#include "qTsbuf.h"
+#include "query.h"
+#include "taosdef.h"
+#include "tarray.h"
+#include "tlockfree.h"
+#include "tsdb.h"
+#include "tsqlfunction.h"
+
+struct SColumnFilterElem;
+typedef bool (*__filter_func_t)(struct SColumnFilterElem* pFilter, char* val1, char* val2);
+typedef int32_t (*__block_search_fn_t)(char* data, int32_t num, int64_t key, int32_t order);
+
+typedef struct SPosInfo {
+  int32_t pageId:20;
+  int32_t rowId:12;
+} SPosInfo;
+
+typedef struct SGroupResInfo {
+  int32_t  groupId;
+  int32_t  numOfDataPages;
+  SPosInfo pos;
+} SGroupResInfo;
+
+typedef struct SSqlGroupbyExpr {
+  int16_t tableIndex;
+  SArray* columnInfo;  // SArray<SColIndex>, group by columns information
+  int16_t numOfGroupCols;
+  int16_t orderIndex;  // order by column index
+  int16_t orderType;   // order by type: asc/desc
+} SSqlGroupbyExpr;
+
+typedef struct SWindowResult {
+  SPosInfo      pos;         // Position of current result in disk-based output buffer
+  uint16_t      numOfRows;   // number of rows of current time window
+  bool          closed;      // this result status: closed or opened
+  SResultInfo*  resultInfo;  // For each result column, there is a resultInfo
+  union {STimeWindow win; char* key;};  // start key of current time window
+} SWindowResult;
+
+/**
+ * If the number of generated results is greater than this value,
+ * query query will be halt and return results to client immediate.
+ */
+typedef struct SResultRec {
+  int64_t total;      // total generated result size in rows
+  int64_t rows;       // current result set size in rows
+  int64_t capacity;   // capacity of current result output buffer
+  int32_t threshold;  // result size threshold in rows.
+} SResultRec;
+
+typedef struct SWindowResInfo {
+  SWindowResult* pResult;    // result list
+  SHashObj*      hashList;   // hash list for quick access
+  int16_t        type;       // data type for hash key
+  int32_t        capacity;   // max capacity
+  int32_t        curIndex;   // current start active index
+  int32_t        size;       // number of result set
+  int64_t        startTime;  // start time of the first time window for sliding query
+  int64_t        prevSKey;   // previous (not completed) sliding window start key
+  int64_t        threshold;  // threshold to halt query and return the generated results.
+  int64_t        interval;   // time window interval
+} SWindowResInfo;
+
+typedef struct SColumnFilterElem {
+  int16_t           bytes;  // column length
+  __filter_func_t   fp;
+  SColumnFilterInfo filterInfo;
+} SColumnFilterElem;
+
+typedef struct SSingleColumnFilterInfo {
+  void*              pData;
+  int32_t            numOfFilters;
+  SColumnInfo        info;
+  SColumnFilterElem* pFilters;
+} SSingleColumnFilterInfo;
+
+typedef struct STableQueryInfo {  // todo merge with the STableQueryInfo struct
+  TSKEY       lastKey;
+  int32_t     groupIndex;     // group id in table list
+  int16_t     queryRangeSet;  // denote if the query range is set, only available for interval query
+  tVariant    tag;
+  STimeWindow win;
+  STSCursor   cur;
+  void*       pTable;         // for retrieve the page id list
+  SWindowResInfo windowResInfo;
+} STableQueryInfo;
+
+typedef struct SQueryCostInfo {
+  uint64_t loadStatisTime;
+  uint64_t loadFileBlockTime;
+  uint64_t loadDataInCacheTime;
+  uint64_t loadStatisSize;
+  uint64_t loadFileBlockSize;
+  uint64_t loadDataInCacheSize;
+  
+  uint64_t loadDataTime;
+  uint64_t totalRows;
+  uint64_t totalCheckedRows;
+  uint32_t totalBlocks;
+  uint32_t loadBlocks;
+  uint32_t loadBlockStatis;
+  uint32_t discardBlocks;
+  uint64_t elapsedTime;
+  uint64_t firstStageMergeTime;
+  uint64_t internalSupSize;
+  uint64_t numOfTimeWindows;
+} SQueryCostInfo;
+
+typedef struct SQuery {
+  int16_t          numOfCols;
+  int16_t          numOfTags;
+  SOrderVal        order;
+  STimeWindow      window;
+  SInterval        interval;
+  int16_t          precision;
+  int16_t          numOfOutput;
+  int16_t          fillType;
+  int16_t          checkBuffer;  // check if the buffer is full during scan each block
+  SLimitVal        limit;
+  int32_t          rowSize;
+  SSqlGroupbyExpr* pGroupbyExpr;
+  SExprInfo*       pSelectExpr;
+  SColumnInfo*     colList;
+  SColumnInfo*     tagColList;
+  int32_t          numOfFilterCols;
+  int64_t*         fillVal;
+  uint32_t         status;  // query status
+  SResultRec       rec;
+  int32_t          pos;
+  tFilePage**      sdata;
+  STableQueryInfo* current;
+
+  SSingleColumnFilterInfo* pFilterInfo;
+} SQuery;
+
+typedef struct SQueryRuntimeEnv {
+  jmp_buf              env;
+  SResultInfo*         resultInfo;       // todo refactor to merge with SWindowResInfo
+  SQuery*              pQuery;
+  SQLFunctionCtx*      pCtx;
+  int32_t              numOfRowsPerPage;
+  int16_t              offset[TSDB_MAX_COLUMNS];
+  uint16_t             scanFlag;         // denotes reversed scan of data or not
+  SFillInfo*           pFillInfo;
+  SWindowResInfo       windowResInfo;
+  STSBuf*              pTSBuf;
+  STSCursor            cur;
+  SQueryCostInfo       summary;
+  void*                pQueryHandle;
+  void*                pSecQueryHandle;  // another thread for
+  bool                 stableQuery;      // super table query or not
+  bool                 topBotQuery;      // false
+  bool                 groupbyNormalCol; // denote if this is a groupby normal column query
+  bool                 hasTagResults;    // if there are tag values in final result or not
+  int32_t              interBufSize;     // intermediate buffer sizse
+  int32_t              prevGroupId;      // previous executed group id
+  SDiskbasedResultBuf* pResultBuf;       // query result buffer based on blocked-wised disk file
+} SQueryRuntimeEnv;
+
+enum {
+  QUERY_RESULT_NOT_READY = 1,
+  QUERY_RESULT_READY     = 2,
+};
+
+typedef struct SQInfo {
+  void*            signature;
+  int32_t          code;   // error code to returned to client
+  int64_t          owner; // if it is in execution
+  void*            tsdb;
+  int32_t          vgId;
+  STableGroupInfo  tableGroupInfo;       // table <tid, last_key> list  SArray<STableKeyInfo>
+  STableGroupInfo  tableqinfoGroupInfo;  // this is a group array list, including SArray<STableQueryInfo*> structure
+  SQueryRuntimeEnv runtimeEnv;
+  SArray*          arrTableIdInfo;
+  int32_t          groupIndex;
+
+  /*
+   * the query is executed position on which meter of the whole list.
+   * when the index reaches the last one of the list, it means the query is completed.
+   */
+  int32_t          tableIndex;
+  SGroupResInfo    groupResInfo;
+  void*            pBuf;        // allocated buffer for STableQueryInfo, sizeof(STableQueryInfo)*numOfTables;
+
+  pthread_mutex_t  lock;        // used to synchronize the rsp/query threads
+  int32_t          dataReady;   // denote if query result is ready or not
+  void*            rspContext;  // response context
+} SQInfo;
+
+#endif  // TDENGINE_QUERYEXECUTOR_H
diff --git a/src/query/inc/qExtbuffer.h b/src/query/inc/qExtbuffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..0bdcf5c45ef6d9ce283d36ccd9d7b6296fc67472
--- /dev/null
+++ b/src/query/inc/qExtbuffer.h
@@ -0,0 +1,244 @@
+/*
+ * 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_TEXTBUFFER_H
+#define TDENGINE_TEXTBUFFER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "taosmsg.h"
+
+#include "tarray.h"
+#include "tutil.h"
+#include "tdataformat.h"
+#include "talgo.h"
+
+#define MAX_TMPFILE_PATH_LENGTH        PATH_MAX
+#define INITIAL_ALLOCATION_BUFFER_SIZE 64
+#define DEFAULT_PAGE_SIZE              (1024L)  // 16k larger than the SHistoInfo
+
+typedef enum EXT_BUFFER_FLUSH_MODEL {
+  /*
+   * all data that have been flushed to disk is belonged to the same group
+   * which means, all data in disk are sorted, or order is not matter in this case
+   */
+  SINGLE_APPEND_MODEL,
+
+  /*
+   * each flush operation to disk is completely independant to any other flush operation
+   * we simply merge several set of data in one file, to reduce the count of flat files
+   * in disk. So in this case, we need to keep the flush-out information in tFlushoutInfo
+   * structure.
+   */
+  MULTIPLE_APPEND_MODEL,
+} EXT_BUFFER_FLUSH_MODEL;
+
+typedef struct tFlushoutInfo {
+  uint32_t startPageId;
+  uint32_t numOfPages;
+} tFlushoutInfo;
+
+typedef struct tFlushoutData {
+  uint32_t       nAllocSize;
+  uint32_t       nLength;
+  tFlushoutInfo *pFlushoutInfo;
+} tFlushoutData;
+
+typedef struct SExtFileInfo {
+  uint32_t      nFileSize;  // in pages
+  uint32_t      pageSize;
+  uint32_t      numOfElemsInFile;
+  tFlushoutData flushoutData;
+} SExtFileInfo;
+
+typedef struct tFilePage {
+  uint64_t num;
+  char     data[];
+} tFilePage;
+
+typedef struct tFilePagesItem {
+  struct tFilePagesItem *pNext;
+  tFilePage              item;
+} tFilePagesItem;
+
+typedef struct SSchemaEx {
+  struct SSchema field;
+  int16_t        offset;
+} SSchemaEx;
+
+typedef struct SColumnModel {
+  int32_t    capacity;
+  int32_t    numOfCols;
+  int16_t    rowSize;
+  SSchemaEx *pFields;
+} SColumnModel;
+
+typedef struct SColumnOrderInfo {
+  int32_t numOfCols;
+  int16_t pData[];
+} SColumnOrderInfo;
+
+typedef struct tOrderDescriptor {
+  SColumnModel *   pColumnModel;
+  int32_t          tsOrder;  // timestamp order type if exists
+  SColumnOrderInfo orderInfo;
+} tOrderDescriptor;
+
+typedef struct tExtMemBuffer {
+  int32_t inMemCapacity;
+  int32_t nElemSize;
+  int32_t pageSize;
+  int32_t numOfTotalElems;
+  int32_t numOfElemsInBuffer;
+  int32_t numOfElemsPerPage;
+  int16_t numOfInMemPages;
+
+  tFilePagesItem *pHead;
+  tFilePagesItem *pTail;
+
+  char *    path;
+  FILE *    file;
+  SExtFileInfo fileMeta;
+
+  SColumnModel *         pColumnModel;
+  EXT_BUFFER_FLUSH_MODEL flushModel;
+} tExtMemBuffer;
+
+/**
+ *
+ * @param inMemSize
+ * @param elemSize
+ * @param pModel
+ * @return
+ */
+tExtMemBuffer *createExtMemBuffer(int32_t inMemSize, int32_t elemSize, int32_t pagesize, SColumnModel *pModel);
+
+/**
+ *
+ * @param pMemBuffer
+ * @return
+ */
+void *destoryExtMemBuffer(tExtMemBuffer *pMemBuffer);
+
+/**
+ * @param pMemBuffer
+ * @param data       input data pointer
+ * @param numOfRows  number of rows in data
+ * @param pModel     column format model
+ * @return           number of pages in memory
+ */
+int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRows);
+
+/**
+ *
+ * @param pMemBuffer
+ * @return
+ */
+int32_t tExtMemBufferFlush(tExtMemBuffer *pMemBuffer);
+
+/**
+ *
+ * remove all data that has been put into buffer, including in buffer or
+ * ext-buffer(disk)
+ */
+void tExtMemBufferClear(tExtMemBuffer *pMemBuffer);
+
+/*
+ * this function should be removed.
+ * since the flush to disk operation is transparent to client this structure should provide stream operation for data,
+ * and there is an internal cursor point to the data.
+ */
+bool tExtMemBufferLoadData(tExtMemBuffer *pMemBuffer, tFilePage *pFilePage, int32_t flushIdx, int32_t pageIdx);
+
+/**
+ *
+ * @param pMemBuffer
+ * @return
+ */
+bool tExtMemBufferIsAllDataInMem(tExtMemBuffer *pMemBuffer);
+
+/**
+ *
+ * @param fields
+ * @param numOfCols
+ * @param blockCapacity
+ * @return
+ */
+SColumnModel *createColumnModel(SSchema *fields, int32_t numOfCols, int32_t blockCapacity);
+
+/**
+ *
+ * @param pSrc
+ * @return
+ */
+SColumnModel *cloneColumnModel(SColumnModel *pSrc);
+
+/**
+ *
+ * @param pModel
+ */
+void destroyColumnModel(SColumnModel *pModel);
+
+/*
+ * compress data into consecutive block without hole in data
+ */
+void tColModelCompact(SColumnModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity);
+
+void     tColModelErase(SColumnModel *pModel, tFilePage *inputBuffer, int32_t maxCapacity, int32_t s, int32_t e);
+SSchema *getColumnModelSchema(SColumnModel *pColumnModel, int32_t index);
+
+int16_t getColumnModelOffset(SColumnModel *pColumnModel, int32_t index);
+
+typedef struct SSrcColumnInfo {
+  int32_t functionId;
+  int32_t type;
+} SSrcColumnInfo;
+
+/*
+ * display data in column format model for debug purpose only
+ */
+void tColModelDisplay(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount);
+
+void tColModelDisplayEx(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t maxCount, SSrcColumnInfo *pInfo);
+
+tOrderDescriptor *tOrderDesCreate(const int32_t *orderColIdx, int32_t numOfOrderCols, SColumnModel *pModel,
+                                  int32_t tsOrderType);
+
+void tOrderDescDestroy(tOrderDescriptor *pDesc);
+
+void tColModelAppend(SColumnModel *dstModel, tFilePage *dstPage, void *srcData, int32_t srcStartRows,
+                     int32_t numOfRowsToWrite, int32_t srcCapacity);
+
+typedef int (*__col_compar_fn_t)(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
+
+void tColDataQSort(tOrderDescriptor *, int32_t numOfRows, int32_t start, int32_t end, char *data, int32_t orderType);
+
+int32_t compare_sa(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
+
+int32_t compare_sd(tOrderDescriptor *, int32_t numOfRows, int32_t idx1, int32_t idx2, char *data);
+
+int32_t compare_a(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1, int32_t numOfRow2, int32_t s2,
+                  char *data2);
+
+int32_t compare_d(tOrderDescriptor *, int32_t numOfRow1, int32_t s1, char *data1, int32_t numOfRow2, int32_t s2,
+                  char *data2);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TBASE_SORT_H
diff --git a/src/query/inc/qFill.h b/src/query/inc/qFill.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d44fee09557fa8b8d73527677a2c7b238ecb42c
--- /dev/null
+++ b/src/query/inc/qFill.h
@@ -0,0 +1,94 @@
+/*
+ * 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_QFILL_H
+#define TDENGINE_QFILL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "qExtbuffer.h"
+#include "taosdef.h"
+
+typedef struct {
+  STColumn col;             // column info
+  int16_t  functionId;      // sql function id
+  int16_t  flag;            // column flag: TAG COLUMN|NORMAL COLUMN
+  union {int64_t i; double d;} fillVal;
+} SFillColInfo;
+
+typedef struct {
+  SSchema col;
+  char*   tagVal;
+} SFillTagColInfo;
+  
+typedef struct SFillInfo {
+  TSKEY   start;                // start timestamp
+  TSKEY   endKey;               // endKey for fill
+  int32_t order;                // order [TSDB_ORDER_ASC|TSDB_ORDER_DESC]
+  int32_t fillType;             // fill type
+  int32_t numOfRows;            // number of rows in the input data block
+  int32_t rowIdx;               // rowIdx
+  int32_t numOfTotal;           // number of filled rows in one round
+  int32_t numOfCurrent;         // number of filled rows in current results
+
+  int32_t numOfTags;            // number of tags
+  int32_t numOfCols;            // number of columns, including the tags columns
+  int32_t rowSize;              // size of each row
+//  char ** pTags;                // tags value for current interpolation
+  SFillTagColInfo* pTags;       // tags value for filling gap
+  SInterval interval;
+  char *  prevValues;           // previous row of data, to generate the interpolation results
+  char *  nextValues;           // next row of data
+  char**  pData;                // original result data block involved in filling data
+  int32_t capacityInRows;       // data buffer size in rows
+  int8_t  precision;            // time resoluation
+  SFillColInfo* pFillCol;       // column info for fill operations
+} SFillInfo;
+
+typedef struct SPoint {
+  int64_t key;
+  void *  val;
+} SPoint;
+
+SFillInfo* taosInitFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols,
+                            int64_t slidingTime, int8_t slidingUnit, int8_t precision, int32_t fillType,
+                            SFillColInfo* pFillCol);
+
+void taosResetFillInfo(SFillInfo* pFillInfo, TSKEY startTimestamp);
+
+void* taosDestoryFillInfo(SFillInfo *pFillInfo);
+
+void taosFillSetStartInfo(SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey);
+
+void taosFillCopyInputDataFromFilePage(SFillInfo* pFillInfo, tFilePage** pInput);
+
+void taosFillCopyInputDataFromOneFilePage(SFillInfo* pFillInfo, tFilePage* pInput);
+
+int64_t getFilledNumOfRes(SFillInfo* pFillInfo, int64_t ekey, int32_t maxNumOfRows);
+
+int32_t taosNumOfRemainRows(SFillInfo *pFillInfo);
+
+int taosDoLinearInterpolation(int32_t type, SPoint *point1, SPoint *point2, SPoint *point);
+
+int64_t taosGenerateDataBlock(SFillInfo* pFillInfo, tFilePage** output, int32_t capacity);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QFILL_H
diff --git a/src/query/inc/qHistogram.h b/src/query/inc/qHistogram.h
new file mode 100644
index 0000000000000000000000000000000000000000..bb058449e806c8270dbf141ca3a81103f63c6e5c
--- /dev/null
+++ b/src/query/inc/qHistogram.h
@@ -0,0 +1,81 @@
+/*
+ * 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_HISTOGRAM_H
+#define TDENGINE_HISTOGRAM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define USE_ARRAYLIST
+
+#define MAX_HISTOGRAM_BIN 500
+
+typedef struct SHistBin {
+  double  val;
+  int64_t num;
+
+#if !defined(USE_ARRAYLIST)
+  double  delta;
+  int32_t index;  // index in min-heap list
+#endif
+} SHistBin;
+
+typedef struct SHeapEntry {
+  void*  pData;
+  double val;
+} SHeapEntry;
+
+typedef struct SHistogramInfo {
+  int32_t numOfElems;
+  int32_t numOfEntries;
+  int32_t maxEntries;
+
+#if defined(USE_ARRAYLIST)
+  SHistBin* elems;
+#else
+  tSkipList*      pList;
+  SLoserTreeInfo* pLoserTree;
+  int32_t         maxIndex;
+  bool            ordered;
+#endif
+
+  double min;
+  double max;
+} SHistogramInfo;
+
+SHistogramInfo* tHistogramCreate(int32_t numOfBins);
+SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins);
+
+int32_t tHistogramAdd(SHistogramInfo** pHisto, double val);
+int64_t tHistogramSum(SHistogramInfo* pHisto, double v);
+
+double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num);
+SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries);
+void tHistogramDestroy(SHistogramInfo** pHisto);
+
+void tHistogramPrint(SHistogramInfo* pHisto);
+
+int32_t vnodeHistobinarySearch(SHistBin* pEntry, int32_t len, double val);
+
+SHeapEntry* tHeapCreate(int32_t numOfEntries);
+void tHeapSort(SHeapEntry* pEntry, int32_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_HISTOGRAM_H
diff --git a/src/query/inc/qPercentile.h b/src/query/inc/qPercentile.h
new file mode 100644
index 0000000000000000000000000000000000000000..c34c24c5b2883391f94d87db4f778907cc13d62c
--- /dev/null
+++ b/src/query/inc/qPercentile.h
@@ -0,0 +1,75 @@
+/*
+ * 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_QPERCENTILE_H
+#define TDENGINE_QPERCENTILE_H
+
+#include "qExtbuffer.h"
+#include "qResultbuf.h"
+#include "qTsbuf.h"
+
+typedef struct MinMaxEntry {
+  union {
+    double  dMinVal;
+    int32_t iMinVal;
+    int64_t i64MinVal;
+  };
+  union {
+    double  dMaxVal;
+    int32_t iMaxVal;
+    int64_t i64MaxVal;
+  };
+} MinMaxEntry;
+
+typedef struct {
+  int32_t   size;
+  int32_t   pageId;
+  tFilePage *data;
+} SSlotInfo;
+
+typedef struct tMemBucketSlot {
+  SSlotInfo      info;
+  MinMaxEntry    range;
+} tMemBucketSlot;
+
+struct tMemBucket;
+typedef int32_t (*__perc_hash_func_t)(struct tMemBucket *pBucket, const void *value);
+
+typedef struct tMemBucket {
+  int16_t       numOfSlots;
+  int16_t       type;
+  int16_t       bytes;
+  int32_t       total;
+  int32_t       elemPerPage;   // number of elements for each object
+  int32_t       maxCapacity;   // maximum allowed number of elements that can be sort directly to get the result
+  int32_t       bufPageSize;   // disk page size
+  MinMaxEntry   range;           // value range
+  int32_t       times;         // count that has been checked for deciding the correct data value buckets.
+  __compar_fn_t comparFn;
+
+  tMemBucketSlot *pSlots;
+  SDiskbasedResultBuf *pBuffer;
+  __perc_hash_func_t hashFunc;
+} tMemBucket;
+
+tMemBucket *tMemBucketCreate(int16_t nElemSize, int16_t dataType, double minval, double maxval);
+
+void tMemBucketDestroy(tMemBucket *pBucket);
+
+int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size);
+
+double getPercentile(tMemBucket *pMemBucket, double percent);
+
+#endif  // TDENGINE_QPERCENTILE_H
diff --git a/src/query/inc/qResultbuf.h b/src/query/inc/qResultbuf.h
new file mode 100644
index 0000000000000000000000000000000000000000..704df9f3f29cc0653c353ed194e02e72cb4c5fb2
--- /dev/null
+++ b/src/query/inc/qResultbuf.h
@@ -0,0 +1,173 @@
+/*
+ * 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_QRESULTBUF_H
+#define TDENGINE_QRESULTBUF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <tlist.h>
+#include "hash.h"
+#include "os.h"
+#include "qExtbuffer.h"
+#include "tlockfree.h"
+
+typedef struct SArray* SIDList;
+
+typedef struct SPageDiskInfo {
+  int32_t offset;
+  int32_t length;
+} SPageDiskInfo;
+
+typedef struct SPageInfo {
+  SListNode*    pn;       // point to list node
+  int32_t       pageId;
+  SPageDiskInfo info;
+  void*         pData;
+  bool          used;     // set current page is in used
+} SPageInfo;
+
+typedef struct SFreeListItem {
+  int32_t offset;
+  int32_t len;
+} SFreeListItem;
+
+typedef struct SResultBufStatis {
+  int32_t flushBytes;
+  int32_t loadBytes;
+  int32_t getPages;
+  int32_t releasePages;
+  int32_t flushPages;
+} SResultBufStatis;
+
+typedef struct SDiskbasedResultBuf {
+  int32_t   numOfRowsPerPage;
+  int32_t   numOfPages;
+  int64_t   totalBufSize;
+  int64_t   fileSize;            // disk file size
+  FILE*     file;
+  int32_t   allocateId;          // allocated page id
+  char*     path;                // file path
+  int32_t   pageSize;            // current used page size
+  int32_t   inMemPages;          // numOfPages that are allocated in memory
+  SHashObj* groupSet;            // id hash table
+  SHashObj* all;
+  SList*    lruList;
+  void*     emptyDummyIdList;    // dummy id list
+  void*     assistBuf;           // assistant buffer for compress/decompress data
+  SArray*   pFree;               // free area in file
+  bool      comp;                // compressed before flushed to disk
+  int32_t   nextPos;             // next page flush position
+
+  const void*      handle;       // for debug purpose
+  SResultBufStatis statis;
+} SDiskbasedResultBuf;
+
+#define DEFAULT_INTERN_BUF_PAGE_SIZE  (256L)                          // in bytes
+#define PAGE_INFO_INITIALIZER         (SPageDiskInfo){-1, -1}
+
+/**
+ * create disk-based result buffer
+ * @param pResultBuf
+ * @param rowSize
+ * @param pagesize
+ * @param inMemPages
+ * @param handle
+ * @return
+ */
+int32_t createDiskbasedResultBuffer(SDiskbasedResultBuf** pResultBuf, int32_t rowSize, int32_t pagesize,
+                                    int32_t inMemBufSize, const void* handle);
+
+/**
+ *
+ * @param pResultBuf
+ * @param groupId
+ * @param pageId
+ * @return
+ */
+tFilePage* getNewDataBuf(SDiskbasedResultBuf* pResultBuf, int32_t groupId, int32_t* pageId);
+
+/**
+ *
+ * @param pResultBuf
+ * @return
+ */
+size_t getNumOfRowsPerPage(const SDiskbasedResultBuf* pResultBuf);
+
+/**
+ *
+ * @param pResultBuf
+ * @param groupId
+ * @return
+ */
+SIDList getDataBufPagesIdList(SDiskbasedResultBuf* pResultBuf, int32_t groupId);
+
+/**
+ * get the specified buffer page by id
+ * @param pResultBuf
+ * @param id
+ * @return
+ */
+tFilePage* getResBufPage(SDiskbasedResultBuf* pResultBuf, int32_t id);
+
+/**
+ * release the referenced buf pages
+ * @param pResultBuf
+ * @param page
+ */
+void releaseResBufPage(SDiskbasedResultBuf* pResultBuf, void* page);
+
+/**
+ *
+ * @param pResultBuf
+ * @param pi
+ */
+void releaseResBufPageInfo(SDiskbasedResultBuf* pResultBuf, SPageInfo* pi);
+
+
+/**
+ * get the total buffer size in the format of disk file
+ * @param pResultBuf
+ * @return
+ */
+size_t getResBufSize(const SDiskbasedResultBuf* pResultBuf);
+
+/**
+ * get the number of groups in the result buffer
+ * @param pResultBuf
+ * @return
+ */
+size_t getNumOfResultBufGroupId(const SDiskbasedResultBuf* pResultBuf);
+
+/**
+ * destroy result buffer
+ * @param pResultBuf
+ */
+void destroyResultBuf(SDiskbasedResultBuf* pResultBuf);
+
+/**
+ *
+ * @param pList
+ * @return
+ */
+SPageInfo* getLastPageInfo(SIDList pList);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QRESULTBUF_H
diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h
new file mode 100644
index 0000000000000000000000000000000000000000..d6664577a377bb619db2f0bab04471642aa10e20
--- /dev/null
+++ b/src/query/inc/qSqlparser.h
@@ -0,0 +1,340 @@
+/*
+ * 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_QSQLPARSER_H
+#define TDENGINE_QSQLPARSER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <tstrbuild.h>
+#include "taos.h"
+#include "taosmsg.h"
+#include "tstoken.h"
+#include "tvariant.h"
+
+#define ParseTOKENTYPE SStrToken
+extern char tTokenTypeSwitcher[13];
+
+#define toTSDBType(x)                          \
+  do {                                         \
+    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
+      (x) = TSDB_DATA_TYPE_BINARY;             \
+    } else {                                   \
+      (x) = tTokenTypeSwitcher[(x)];           \
+    }                                          \
+  } while (0)
+  
+typedef struct tFieldList {
+  int32_t     nField;
+  int32_t     nAlloc;
+  TAOS_FIELD *p;
+} tFieldList;
+
+typedef struct SLimitVal {
+  int64_t limit;
+  int64_t offset;
+} SLimitVal;
+
+typedef struct SOrderVal {
+  uint32_t order;
+  int32_t orderColId;
+} SOrderVal;
+
+typedef struct tVariantListItem {
+  tVariant pVar;
+  uint8_t  sortOrder;
+} tVariantListItem;
+
+typedef struct tVariantList {
+  int32_t           nExpr;  /* Number of expressions on the list */
+  int32_t           nAlloc; /* Number of entries allocated below */
+  tVariantListItem *a;      /* One entry for each expression */
+} tVariantList;
+
+typedef struct SIntervalVal {
+  SStrToken interval;
+  SStrToken offset;
+} SIntervalVal;
+
+typedef struct SQuerySQL {
+  struct tSQLExprList *pSelection;   // select clause
+  tVariantList *       from;         // from clause
+  struct tSQLExpr *    pWhere;       // where clause [optional]
+  tVariantList *       pGroupby;     // groupby clause, only for tags[optional]
+  tVariantList *       pSortOrder;   // orderby [optional]
+  SStrToken            interval;     // interval [optional]
+  SStrToken            offset;       // offset window [optional]
+  SStrToken            sliding;      // sliding window [optional]
+  SLimitVal            limit;        // limit offset [optional]
+  SLimitVal            slimit;       // group limit offset [optional]
+  tVariantList *       fillType;     // fill type[optional]
+  SStrToken            selectToken;  // sql string
+} SQuerySQL;
+
+typedef struct SCreateTableSQL {
+  struct SStrToken name;  // meter name, create table [meterName] xxx
+  bool             existCheck;
+  
+  int8_t           type; // create normal table/from super table/ stream
+  struct {
+    tFieldList *pTagColumns;  // for normal table, pTagColumns = NULL;
+    tFieldList *pColumns;
+  } colInfo;
+  
+  struct {
+    SStrToken     stableName;  // super table name, for using clause
+    tVariantList *pTagVals;    // create by using metric, tag value
+    STagData      tagdata;
+  } usingInfo;
+  
+  SQuerySQL *pSelect;
+} SCreateTableSQL;
+
+typedef struct SAlterTableSQL {
+  SStrToken     name;
+  int16_t       type;
+  STagData      tagData;
+  
+  tFieldList *  pAddColumns;
+  tVariantList *varList;  // set t=val or: change src dst
+} SAlterTableSQL;
+
+typedef struct SCreateDBInfo {
+  SStrToken dbname;
+  int32_t   replica;
+  int32_t   cacheBlockSize;
+  int32_t   maxTablesPerVnode;
+  int32_t   numOfBlocks;
+  int32_t   daysPerFile;
+  int32_t   minRowsPerBlock;
+  int32_t   maxRowsPerBlock;
+  int32_t   fsyncPeriod;
+  int64_t   commitTime;
+  int32_t   walLevel;
+  int32_t   quorum;
+  int32_t   compressionLevel;
+  SStrToken precision;
+  bool      ignoreExists;
+  
+  tVariantList *keep;
+} SCreateDBInfo;
+
+typedef struct SCreateAcctSQL {
+  int32_t   maxUsers;
+  int32_t   maxDbs;
+  int32_t   maxTimeSeries;
+  int32_t   maxStreams;
+  int32_t   maxPointsPerSecond;
+  int64_t   maxStorage;
+  int64_t   maxQueryTime;
+  int32_t   maxConnections;
+  SStrToken stat;
+} SCreateAcctSQL;
+
+typedef struct SShowInfo {
+  uint8_t showType;
+  SStrToken prefix;
+  SStrToken pattern;
+} SShowInfo;
+
+typedef struct SUserInfo {
+  SStrToken user;
+  SStrToken passwd;
+  SStrToken privilege;
+  int16_t   type;
+} SUserInfo;
+
+typedef struct tDCLSQL {
+  int32_t    nTokens; /* Number of expressions on the list */
+  int32_t    nAlloc;  /* Number of entries allocated below */
+  SStrToken *a;       /* one entry for element */
+  bool  existsCheck;
+  
+  union {
+    SCreateDBInfo  dbOpt;
+    SCreateAcctSQL acctOpt;
+    SShowInfo      showOpt;
+    SStrToken ip;
+  };
+  
+  SUserInfo user;
+  
+} tDCLSQL;
+
+typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
+  SQuerySQL **pClause;
+  int32_t     numOfClause;
+} SSubclauseInfo;
+
+typedef struct SSqlInfo {
+  int32_t type;
+  bool    valid;
+  
+  union {
+    SCreateTableSQL *pCreateTableInfo;
+    SAlterTableSQL * pAlterInfo;
+    tDCLSQL *        pDCLInfo;
+  };
+  
+  SSubclauseInfo subclauseInfo;
+  char           pzErrMsg[256];
+} SSqlInfo;
+
+typedef struct tSQLExpr {
+  // TK_FUNCTION: sql function, TK_LE: less than(binary expr)
+  uint32_t nSQLOptr;
+  
+  // the full sql string of function(col, param), which is actually the raw
+  // field name, since the function name is kept in nSQLOptr already
+  SStrToken operand;
+  SStrToken colInfo;            // field id
+  tVariant  val;                // value only for string, float, int
+  
+  struct tSQLExpr *pLeft;       // left child
+  struct tSQLExpr *pRight;      // right child
+  struct tSQLExprList *pParam;  // function parameters
+  SStrToken token;              // original sql expr string
+} tSQLExpr;
+
+// used in select clause. select <tSQLExprList> from xxx
+typedef struct tSQLExprItem {
+  tSQLExpr *pNode;      // The list of expressions
+  char *    aliasName;  // alias name, null-terminated string
+} tSQLExprItem;
+
+// todo refactor by using SArray
+typedef struct tSQLExprList {
+  int32_t       nExpr;  /* Number of expressions on the list */
+  int32_t       nAlloc; /* Number of entries allocated below */
+  tSQLExprItem *a;      /* One entry for each expression */
+} tSQLExprList;
+
+typedef struct tSQLExprListList {
+  int32_t        nList;  /* Number of expressions on the list */
+  int32_t        nAlloc; /* Number of entries allocated below */
+  tSQLExprList **a;      /* one entry for each row */
+} tSQLExprListList;
+
+
+/**
+ *
+ * @param yyp      The parser
+ * @param yymajor  The major token code number
+ * @param yyminor  The value for the token
+ */
+void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
+
+/**
+ *
+ * @param p         The parser to be deleted
+ * @param freeProc  Function used to reclaim memory
+ */
+void ParseFree(void *p, void (*freeProc)(void *));
+
+tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder);
+
+tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
+
+tVariantList *tVariantListAppendToken(tVariantList *pList, SStrToken *pAliasToken, uint8_t sortOrder);
+void          tVariantListDestroy(tVariantList *pList);
+
+tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField);
+
+void tFieldListDestroy(tFieldList *pList);
+
+tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optType);
+
+void tSQLExprDestroy(tSQLExpr *);
+
+tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pToken);
+
+void tSQLExprListDestroy(tSQLExprList *pList);
+
+SQuerySQL *tSetQuerySQLElems(SStrToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
+                             tVariantList *pGroupby, tVariantList *pSortOrder, SIntervalVal *pInterval,
+                             SStrToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit);
+
+SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SStrToken *pMetricName,
+                                    tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type);
+
+void      tSQLExprNodeDestroy(tSQLExpr *pExpr);
+tSQLExpr *tSQLExprNodeClone(tSQLExpr *pExpr);
+
+SAlterTableSQL *tAlterTableSQLElems(SStrToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type);
+
+tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList);
+
+void destroyAllSelectClause(SSubclauseInfo *pSql);
+void doDestroyQuerySql(SQuerySQL *pSql);
+
+SSqlInfo *      setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pMeterName, int32_t type);
+SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
+
+SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
+
+void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pMeterName, SStrToken *pIfNotExists);
+
+void SQLInfoDestroy(SSqlInfo *pInfo);
+
+void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
+void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck);
+void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns);
+
+tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken);
+
+void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDBInfo *pDB, SStrToken *pIgExists);
+
+void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctSQL *pAcctInfo);
+void setCreateUserSQL(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd);
+void setKillSQL(SSqlInfo *pInfo, int32_t type, SStrToken *ip);
+void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege);
+
+void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
+
+// prefix show db.tables;
+void setDBName(SStrToken *pCpxName, SStrToken *pDB);
+
+tSQLExpr *tSQLExprIdValueCreate(SStrToken *pToken, int32_t optType);
+
+tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType);
+
+void tSQLSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType);
+
+void tSQLSetColumnType(TAOS_FIELD *pField, SStrToken *pToken);
+
+void *ParseAlloc(void *(*mallocProc)(size_t));
+
+// convert the sql filter expression into binary data
+int32_t tSQLExprToBinary(tSQLExpr* pExpr, SStringBuilder* sb);
+
+enum {
+  TSQL_NODE_TYPE_EXPR  = 0x1,
+  TSQL_NODE_TYPE_ID    = 0x2,
+  TSQL_NODE_TYPE_VALUE = 0x4,
+};
+
+#define NON_ARITHMEIC_EXPR 0
+#define NORMAL_ARITHMETIC  1
+#define AGG_ARIGHTMEIC     2
+
+SSqlInfo qSQLParse(const char *str);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QSQLPARSER_H
diff --git a/src/client/inc/tscSyntaxtreefunction.h b/src/query/inc/qSyntaxtreefunction.h
similarity index 100%
rename from src/client/inc/tscSyntaxtreefunction.h
rename to src/query/inc/qSyntaxtreefunction.h
diff --git a/src/query/inc/qTsbuf.h b/src/query/inc/qTsbuf.h
new file mode 100644
index 0000000000000000000000000000000000000000..46e6f79014f32c9b3052824bdb702556f5c4f060
--- /dev/null
+++ b/src/query/inc/qTsbuf.h
@@ -0,0 +1,143 @@
+/*
+ * 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_STSBUF_H
+#define TDENGINE_STSBUF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "taosdef.h"
+#include "tvariant.h"
+
+#define MEM_BUF_SIZE (1 << 20)
+#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;
+  tVariant  tag;
+  int32_t   vnode;
+} STSElem;
+
+typedef struct STSCursor {
+  int32_t  vgroupIndex;
+  int32_t  blockIndex;
+  int32_t  tsIndex;
+  uint32_t order;
+} STSCursor;
+
+typedef struct STSBlock {
+  tVariant 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;
+
+/*
+ * The size of buffer file should not be greater than 2G,
+ * and the offset of int32_t type is enough
+ */
+typedef struct STSVnodeBlockInfo {
+  int32_t vnode;       // vnode id
+  int32_t offset;      // offset set value in file
+  int32_t numOfBlocks; // number of total blocks
+  int32_t compLen;     // compressed size
+} 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;
+  uint32_t             numOfAlloc;
+  uint32_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
+  int32_t  tsOrder;     // timestamp order in current file
+} STSBufFileHeader;
+
+STSBuf* tsBufCreate(bool autoDelete, int32_t order);
+STSBuf* tsBufCreateFromFile(const char* path, bool autoDelete);
+STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_t len, int32_t tsOrder);
+
+void* tsBufDestroy(STSBuf* pTSBuf);
+
+void    tsBufAppend(STSBuf* pTSBuf, int32_t vnodeId, tVariant* tag, const char* pData, int32_t len);
+int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf, int32_t vnodeIdx);
+
+STSBuf* tsBufClone(STSBuf* pTSBuf);
+
+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, tVariant* tag);
+
+STSCursor tsBufGetCursor(STSBuf* pTSBuf);
+void      tsBufSetTraverseOrder(STSBuf* pTSBuf, int32_t order);
+
+void tsBufSetCursor(STSBuf* pTSBuf, STSCursor* pCur);
+
+/**
+ * display all data in comp block file, for debug purpose only
+ * @param pTSBuf
+ */
+void tsBufDisplay(STSBuf* pTSBuf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_STSBUF_H
diff --git a/src/query/inc/qUtil.h b/src/query/inc/qUtil.h
new file mode 100644
index 0000000000000000000000000000000000000000..5320e5622e70a93c06edb4a1e5a3fe568498ef21
--- /dev/null
+++ b/src/query/inc/qUtil.h
@@ -0,0 +1,65 @@
+/*
+ * 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_QUERYUTIL_H
+#define TDENGINE_QUERYUTIL_H
+
+int32_t getOutputInterResultBufSize(SQuery* pQuery);
+
+void clearTimeWindowResBuf(SQueryRuntimeEnv* pRuntimeEnv, SWindowResult* pOneOutputRes);
+void copyTimeWindowResBuf(SQueryRuntimeEnv* pRuntimeEnv, SWindowResult* dst, const SWindowResult* src);
+
+int32_t initWindowResInfo(SWindowResInfo* pWindowResInfo, SQueryRuntimeEnv* pRuntimeEnv, int32_t size,
+                          int32_t threshold, int16_t type);
+
+void    cleanupTimeWindowInfo(SWindowResInfo* pWindowResInfo);
+void    resetTimeWindowInfo(SQueryRuntimeEnv* pRuntimeEnv, SWindowResInfo* pWindowResInfo);
+void    clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num);
+
+void    clearClosedTimeWindow(SQueryRuntimeEnv* pRuntimeEnv);
+int32_t numOfClosedTimeWindow(SWindowResInfo* pWindowResInfo);
+void    closeTimeWindow(SWindowResInfo* pWindowResInfo, int32_t slot);
+void    closeAllTimeWindow(SWindowResInfo* pWindowResInfo);
+void    removeRedundantWindow(SWindowResInfo *pWindowResInfo, TSKEY lastKey, int32_t order);
+
+static FORCE_INLINE SWindowResult *getWindowResult(SWindowResInfo *pWindowResInfo, int32_t slot) {
+  assert(pWindowResInfo != NULL && slot >= 0 && slot < pWindowResInfo->size);
+  return &pWindowResInfo->pResult[slot];
+}
+
+#define curTimeWindowIndex(_winres)        ((_winres)->curIndex)
+#define GET_ROW_PARAM_FOR_MULTIOUTPUT(_q, tbq, sq) (((tbq) && (!sq))? (_q)->pSelectExpr[1].base.arg->argValue.i64:1)
+
+bool isWindowResClosed(SWindowResInfo *pWindowResInfo, int32_t slot);
+
+int32_t createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, size_t interBufSize);
+
+static FORCE_INLINE char *getPosInResultPage(SQueryRuntimeEnv *pRuntimeEnv, int32_t columnIndex, SWindowResult *pResult,
+    tFilePage* page) {
+  assert(pResult != NULL && pRuntimeEnv != NULL);
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  int32_t realRowId = (int32_t)(pResult->pos.rowId * GET_ROW_PARAM_FOR_MULTIOUTPUT(pQuery, pRuntimeEnv->topBotQuery, pRuntimeEnv->stableQuery));
+  return ((char *)page->data) + pRuntimeEnv->offset[columnIndex] * pRuntimeEnv->numOfRowsPerPage +
+      pQuery->pSelectExpr[columnIndex].bytes * realRowId;
+}
+
+bool isNull_filter(SColumnFilterElem *pFilter, char* minval, char* maxval);
+bool notNull_filter(SColumnFilterElem *pFilter, char* minval, char* maxval);
+
+__filter_func_t *getRangeFilterFuncArray(int32_t type);
+__filter_func_t *getValueFilterFuncArray(int32_t type);
+
+#endif  // TDENGINE_QUERYUTIL_H
diff --git a/src/query/inc/queryLog.h b/src/query/inc/queryLog.h
new file mode 100644
index 0000000000000000000000000000000000000000..a1c447a6eb6a5f14d3b5913203a9412acce3b5c4
--- /dev/null
+++ b/src/query/inc/queryLog.h
@@ -0,0 +1,39 @@
+/*
+ * 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_QUERY_LOG_H
+#define TDENGINE_QUERY_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+
+extern int32_t qDebugFlag;
+extern int32_t tscEmbedded;
+
+#define qFatal(...) { if (qDebugFlag & DEBUG_FATAL) { taosPrintLog("QRY FATAL ", 255, __VA_ARGS__); }}
+#define qError(...) { if (qDebugFlag & DEBUG_ERROR) { taosPrintLog("QRY ERROR ", 255, __VA_ARGS__); }}
+#define qWarn(...)  { if (qDebugFlag & DEBUG_WARN)  { taosPrintLog("QRY WARN ", 255, __VA_ARGS__); }}
+#define qInfo(...)  { if (qDebugFlag & DEBUG_INFO)  { taosPrintLog("QRY ", 255, __VA_ARGS__); }}
+#define qDebug(...) { if (qDebugFlag & DEBUG_DEBUG) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }}
+#define qTrace(...) { if (qDebugFlag & DEBUG_TRACE) { taosPrintLog("QRY ", qDebugFlag, __VA_ARGS__); }}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QUERY_LOG_H
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
new file mode 100644
index 0000000000000000000000000000000000000000..e5d1185330a47b79fec1becd74a01ed779db8c80
--- /dev/null
+++ b/src/query/inc/sql.y
@@ -0,0 +1,713 @@
+//lemon parser file to generate sql parse by using finite-state-machine code used to parse sql
+//usage: lemon sql.y
+%token_prefix TK_
+
+%token_type {SStrToken}
+%default_type {SStrToken}
+%extra_argument {SSqlInfo* pInfo}
+
+%fallback ID BOOL TINYINT SMALLINT INTEGER BIGINT FLOAT DOUBLE STRING TIMESTAMP BINARY NCHAR.
+
+%left OR.
+%left AND.
+%right NOT.
+%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN.
+%left GT GE LT LE.
+%left BITAND BITOR LSHIFT RSHIFT.
+%left PLUS MINUS.
+%left DIVIDE TIMES.
+%left STAR SLASH REM.
+%left CONCAT.
+%right UMINUS UPLUS BITNOT.
+
+%include {
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdbool.h>
+#include "qSqlparser.h"
+#include "tcmdtype.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tutil.h"
+#include "tvariant.h"
+}
+
+%syntax_error {
+  pInfo->valid = false;
+  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
+  int32_t len = 0;
+
+  if(TOKEN.z) {
+    char msg[] = "syntax error near \"%s\"";
+    int32_t sqlLen = strlen(&TOKEN.z[0]);
+
+    if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
+        char tmpstr[128] = {0};
+        memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
+        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
+    } else {
+        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
+    }
+
+  } else {
+    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
+  }
+
+  assert(len <= outputBufLen);
+}
+
+%parse_accept       {}
+
+program ::= cmd.    {}
+
+//////////////////////////////////THE SHOW STATEMENT///////////////////////////////////////////
+cmd ::= SHOW DATABASES.  { setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);}
+cmd ::= SHOW MNODES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);}
+cmd ::= SHOW DNODES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);}
+cmd ::= SHOW ACCOUNTS.   { setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);}
+cmd ::= SHOW USERS.      { setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);}
+
+cmd ::= SHOW MODULES.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0);  }
+cmd ::= SHOW QUERIES.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0);  }
+cmd ::= SHOW CONNECTIONS.{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);}
+cmd ::= SHOW STREAMS.    { setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0);  }
+cmd ::= SHOW VARIABLES.  { setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0);  }
+cmd ::= SHOW SCORES.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0);   }
+cmd ::= SHOW GRANTS.     { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0);   }
+
+cmd ::= SHOW VNODES.                { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); }
+cmd ::= SHOW VNODES IPTOKEN(X).     { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &X, 0); }
+
+
+%type dbPrefix {SStrToken}
+dbPrefix(A) ::=.                   {A.n = 0; A.type = 0;}
+dbPrefix(A) ::= ids(X) DOT.        {A = X;  }
+
+%type cpxName {SStrToken}
+cpxName(A) ::= .             {A.n = 0;  }
+cpxName(A) ::= DOT ids(Y).   {A = Y; A.n += 1;    }
+
+cmd ::= SHOW CREATE TABLE ids(X) cpxName(Y).    {
+   X.n += Y.n;
+   setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &X);
+}    
+
+cmd ::= SHOW CREATE DATABASE ids(X). {
+  setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &X);
+} 
+
+cmd ::= SHOW dbPrefix(X) TABLES.         {
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, 0);
+}
+
+cmd ::= SHOW dbPrefix(X) TABLES LIKE ids(Y).         {
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &X, &Y);
+}
+
+cmd ::= SHOW dbPrefix(X) STABLES.      {
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &X, 0);
+}
+
+cmd ::= SHOW dbPrefix(X) STABLES LIKE ids(Y).      {
+    SStrToken token;
+    setDBName(&token, &X);
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &Y);
+}
+
+cmd ::= SHOW dbPrefix(X) VGROUPS.    {
+    SStrToken token;
+    setDBName(&token, &X);
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
+}
+
+cmd ::= SHOW dbPrefix(X) VGROUPS ids(Y).    {
+    SStrToken token;
+    setDBName(&token, &X);    
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &Y);
+}
+
+//drop configure for tables
+cmd ::= DROP TABLE ifexists(Y) ids(X) cpxName(Z).   {
+    X.n += Z.n;
+    setDropDBTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &X, &Y);
+}
+
+cmd ::= DROP DATABASE ifexists(Y) ids(X).    { setDropDBTableInfo(pInfo, TSDB_SQL_DROP_DB, &X, &Y); }
+cmd ::= DROP DNODE ids(X).       { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &X);    }
+cmd ::= DROP USER ids(X).        { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &X);     }
+cmd ::= DROP ACCOUNT ids(X).     { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &X);  }
+
+/////////////////////////////////THE USE STATEMENT//////////////////////////////////////////
+cmd ::= USE ids(X).              { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &X);}
+
+/////////////////////////////////THE DESCRIBE STATEMENT/////////////////////////////////////
+cmd ::= DESCRIBE ids(X) cpxName(Y). {
+    X.n += Y.n;
+    setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &X);
+}
+
+/////////////////////////////////THE ALTER STATEMENT////////////////////////////////////////
+cmd ::= ALTER USER ids(X) PASS ids(Y).          { setAlterUserSQL(pInfo, TSDB_ALTER_USER_PASSWD, &X, &Y, NULL);    }
+cmd ::= ALTER USER ids(X) PRIVILEGE ids(Y).     { setAlterUserSQL(pInfo, TSDB_ALTER_USER_PRIVILEGES, &X, NULL, &Y);}
+cmd ::= ALTER DNODE ids(X) ids(Y).              { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &X, &Y);          }
+cmd ::= ALTER DNODE ids(X) ids(Y) ids(Z).       { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &X, &Y, &Z);      }
+cmd ::= ALTER LOCAL ids(X).                     { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &X);              }
+cmd ::= ALTER LOCAL ids(X) ids(Y).              { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &X, &Y);          }
+cmd ::= ALTER DATABASE ids(X) alter_db_optr(Y). { SStrToken t = {0};  setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);}
+
+cmd ::= ALTER ACCOUNT ids(X) acct_optr(Z).      { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &X, NULL, &Z);}
+cmd ::= ALTER ACCOUNT ids(X) PASS ids(Y) acct_optr(Z).      { setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &X, &Y, &Z);}
+
+// An IDENTIFIER can be a generic identifier, or one of several keywords.
+// Any non-standard keyword can also be an identifier.
+// And "ids" is an identifer-or-string.
+%type ids {SStrToken}
+ids(A) ::= ID(X).        {A = X; }
+ids(A) ::= STRING(X).    {A = X; }
+
+%type ifexists {SStrToken}
+ifexists(X) ::= IF EXISTS.          {X.n = 1;}
+ifexists(X) ::= .                   {X.n = 0;}
+
+%type ifnotexists {SStrToken}
+ifnotexists(X) ::= IF NOT EXISTS.   {X.n = 1;}
+ifnotexists(X) ::= .                {X.n = 0;}
+
+/////////////////////////////////THE CREATE STATEMENT///////////////////////////////////////
+//create option for dnode/db/user/account
+cmd ::= CREATE DNODE   ids(X).     { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);}
+cmd ::= CREATE ACCOUNT ids(X) PASS ids(Y) acct_optr(Z).
+                                { setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &X, &Y, &Z);}
+cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y).  { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);}
+cmd ::= CREATE USER ids(X) PASS ids(Y).     { setCreateUserSQL(pInfo, &X, &Y);}
+
+pps(Y) ::= .                                {Y.n = 0;   }
+pps(Y) ::= PPS INTEGER(X).                  {Y = X;     }
+
+tseries(Y) ::= .                            {Y.n = 0;   }
+tseries(Y) ::= TSERIES INTEGER(X).          {Y = X;     }
+
+dbs(Y) ::= .                                {Y.n = 0;   }
+dbs(Y) ::= DBS INTEGER(X).                  {Y = X;     }
+
+streams(Y) ::= .                            {Y.n = 0;   }
+streams(Y) ::= STREAMS INTEGER(X).          {Y = X;     }
+
+storage(Y) ::= .                            {Y.n = 0;   }
+storage(Y) ::= STORAGE INTEGER(X).          {Y = X;     }
+
+qtime(Y) ::= .                              {Y.n = 0;   }
+qtime(Y) ::= QTIME INTEGER(X).              {Y = X;     }
+
+users(Y) ::= .                              {Y.n = 0;   }
+users(Y) ::= USERS INTEGER(X).              {Y = X;     }
+
+conns(Y) ::= .                              {Y.n = 0;   }
+conns(Y) ::= CONNS INTEGER(X).              {Y = X;     }
+
+state(Y) ::= .                              {Y.n = 0;   }
+state(Y) ::= STATE ids(X).                  {Y = X;     }
+
+%type acct_optr {SCreateAcctSQL}
+acct_optr(Y) ::= pps(C) tseries(D) storage(P) streams(F) qtime(Q) dbs(E) users(K) conns(L) state(M). {
+    Y.maxUsers   = (K.n>0)?atoi(K.z):-1;
+    Y.maxDbs     = (E.n>0)?atoi(E.z):-1;
+    Y.maxTimeSeries = (D.n>0)?atoi(D.z):-1;
+    Y.maxStreams = (F.n>0)?atoi(F.z):-1;
+    Y.maxPointsPerSecond     = (C.n>0)?atoi(C.z):-1;
+    Y.maxStorage = (P.n>0)?strtoll(P.z, NULL, 10):-1;
+    Y.maxQueryTime   = (Q.n>0)?strtoll(Q.z, NULL, 10):-1;
+    Y.maxConnections   = (L.n>0)?atoi(L.z):-1;
+    Y.stat    = M;
+}
+
+%type keep {tVariantList*}
+%destructor keep {tVariantListDestroy($$);}
+keep(Y)    ::= KEEP tagitemlist(X).           { Y = X; }
+
+cache(Y)   ::= CACHE INTEGER(X).              { Y = X; }
+replica(Y) ::= REPLICA INTEGER(X).            { Y = X; }
+quorum(Y)  ::= QUORUM INTEGER(X).             { Y = X; }
+days(Y)    ::= DAYS INTEGER(X).               { Y = X; }
+minrows(Y) ::= MINROWS INTEGER(X).            { Y = X; }
+maxrows(Y) ::= MAXROWS INTEGER(X).            { Y = X; }
+blocks(Y)  ::= BLOCKS INTEGER(X).             { Y = X; }
+ctime(Y)   ::= CTIME INTEGER(X).              { Y = X; }
+wal(Y)     ::= WAL INTEGER(X).                { Y = X; }
+fsync(Y)   ::= FSYNC INTEGER(X).              { Y = X; }
+comp(Y)    ::= COMP INTEGER(X).               { Y = X; }
+prec(Y)    ::= PRECISION STRING(X).           { Y = X; }
+
+%type db_optr {SCreateDBInfo}
+db_optr(Y) ::= . {setDefaultCreateDbOption(&Y);}
+
+db_optr(Y) ::= db_optr(Z) cache(X).          { Y = Z; Y.cacheBlockSize = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) replica(X).        { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) quorum(X).         { Y = Z; Y.quorum = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) days(X).           { Y = Z; Y.daysPerFile = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) minrows(X).        { Y = Z; Y.minRowsPerBlock = strtod(X.z, NULL); }
+db_optr(Y) ::= db_optr(Z) maxrows(X).        { Y = Z; Y.maxRowsPerBlock = strtod(X.z, NULL); }
+db_optr(Y) ::= db_optr(Z) blocks(X).         { Y = Z; Y.numOfBlocks = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) ctime(X).          { Y = Z; Y.commitTime = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) wal(X).            { Y = Z; Y.walLevel = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) fsync(X).          { Y = Z; Y.fsyncPeriod = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) comp(X).           { Y = Z; Y.compressionLevel = strtol(X.z, NULL, 10); }
+db_optr(Y) ::= db_optr(Z) prec(X).           { Y = Z; Y.precision = X; }
+db_optr(Y) ::= db_optr(Z) keep(X).           { Y = Z; Y.keep = X; }
+
+%type alter_db_optr {SCreateDBInfo}
+alter_db_optr(Y) ::= . { setDefaultCreateDbOption(&Y);}
+
+alter_db_optr(Y) ::= alter_db_optr(Z) replica(X).     { Y = Z; Y.replica = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) quorum(X).      { Y = Z; Y.quorum = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) keep(X).        { Y = Z; Y.keep = X; }
+alter_db_optr(Y) ::= alter_db_optr(Z) blocks(X).      { Y = Z; Y.numOfBlocks = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) comp(X).        { Y = Z; Y.compressionLevel = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) wal(X).         { Y = Z; Y.walLevel = strtol(X.z, NULL, 10); }
+alter_db_optr(Y) ::= alter_db_optr(Z) fsync(X).       { Y = Z; Y.fsyncPeriod = strtol(X.z, NULL, 10); }
+
+%type typename {TAOS_FIELD}
+typename(A) ::= ids(X). { 
+  X.type = 0;
+  tSQLSetColumnType (&A, &X); 
+}
+
+//define binary type, e.g., binary(10), nchar(10)
+typename(A) ::= ids(X) LP signed(Y) RP.    {
+    if (Y <= 0) {
+      X.type = 0;
+      tSQLSetColumnType(&A, &X);
+    } else {
+      X.type = -Y;          // negative value of name length
+      tSQLSetColumnType(&A, &X);
+    }
+}
+
+%type signed {int64_t}
+signed(A) ::= INTEGER(X).         { A = strtol(X.z, NULL, 10); }
+signed(A) ::= PLUS INTEGER(X).    { A = strtol(X.z, NULL, 10); }
+signed(A) ::= MINUS INTEGER(X).   { A = -strtol(X.z, NULL, 10);}
+
+////////////////////////////////// The CREATE TABLE statement ///////////////////////////////
+cmd ::= CREATE TABLE ifnotexists(Y) ids(X) cpxName(Z) create_table_args.  {
+    X.n += Z.n;
+    setCreatedTableName(pInfo, &X, &Y);
+}
+
+%type create_table_args{SCreateTableSQL*}
+create_table_args(A) ::= LP columnlist(X) RP. {
+    A = tSetCreateSQLElems(X, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE);
+    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
+}
+
+// create super table
+create_table_args(A) ::= LP columnlist(X) RP TAGS LP columnlist(Y) RP. {
+    A = tSetCreateSQLElems(X, Y, NULL, NULL, NULL, TSQL_CREATE_STABLE);
+    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
+}
+
+// create table by using super table
+// create table table_name using super_table_name tags(tag_values1, tag_values2)
+create_table_args(A) ::= USING ids(X) cpxName(F) TAGS LP tagitemlist(Y) RP.  {
+    X.n += F.n;
+    A = tSetCreateSQLElems(NULL, NULL, &X, Y, NULL, TSQL_CREATE_TABLE_FROM_STABLE);
+    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
+}
+
+// create stream
+// create table table_name as select count(*) from super_table_name interval(time)
+create_table_args(A) ::= AS select(S). {
+    A = tSetCreateSQLElems(NULL, NULL, NULL, NULL, S, TSQL_CREATE_STREAM);
+    setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
+}
+
+%type column{TAOS_FIELD}
+%type columnlist{tFieldList*}
+%destructor columnlist {tFieldListDestroy($$);}
+columnlist(A) ::= columnlist(X) COMMA column(Y).  {A = tFieldListAppend(X, &Y);   }
+columnlist(A) ::= column(X).                      {A = tFieldListAppend(NULL, &X);}
+
+// The information used for a column is the name and type of column:
+// tinyint smallint int bigint float double bool timestamp binary(x) nchar(x)
+column(A) ::= ids(X) typename(Y).          {
+    tSQLSetColumnInfo(&A, &X, &Y);
+}
+
+%type tagitemlist {tVariantList*}
+%destructor tagitemlist {tVariantListDestroy($$);}
+
+%type tagitem {tVariant}
+tagitemlist(A) ::= tagitemlist(X) COMMA tagitem(Y). { A = tVariantListAppend(X, &Y, -1);    }
+tagitemlist(A) ::= tagitem(X).                      { A = tVariantListAppend(NULL, &X, -1); }
+
+tagitem(A) ::= INTEGER(X).      {toTSDBType(X.type); tVariantCreate(&A, &X); }
+tagitem(A) ::= FLOAT(X).        {toTSDBType(X.type); tVariantCreate(&A, &X); }
+tagitem(A) ::= STRING(X).       {toTSDBType(X.type); tVariantCreate(&A, &X); }
+tagitem(A) ::= BOOL(X).         {toTSDBType(X.type); tVariantCreate(&A, &X); }
+tagitem(A) ::= NULL(X).         { X.type = 0; tVariantCreate(&A, &X); }
+
+tagitem(A) ::= MINUS(X) INTEGER(Y).{
+    X.n += Y.n;
+    X.type = Y.type;
+    toTSDBType(X.type);
+    tVariantCreate(&A, &X);
+}
+
+tagitem(A) ::= MINUS(X) FLOAT(Y).  {
+    X.n += Y.n;
+    X.type = Y.type;
+    toTSDBType(X.type);
+    tVariantCreate(&A, &X);
+}
+
+tagitem(A) ::= PLUS(X) INTEGER(Y). {
+    X.n += Y.n;
+    X.type = Y.type;
+    toTSDBType(X.type);
+    tVariantCreate(&A, &X);
+}
+
+tagitem(A) ::= PLUS(X) FLOAT(Y).  {
+    X.n += Y.n;
+    X.type = Y.type;
+    toTSDBType(X.type);
+    tVariantCreate(&A, &X);
+}
+
+//////////////////////// The SELECT statement /////////////////////////////////
+%type select {SQuerySQL*}
+%destructor select {doDestroyQuerySql($$);}
+select(A) ::= SELECT(T) selcollist(W) from(X) where_opt(Y) interval_opt(K) fill_opt(F) sliding_opt(S) groupby_opt(P) orderby_opt(Z) having_opt(N) slimit_opt(G) limit_opt(L). {
+  A = tSetQuerySQLElems(&T, W, X, Y, P, Z, &K, &S, F, &L, &G);
+}
+
+%type union {SSubclauseInfo*}
+%destructor union {destroyAllSelectClause($$);}
+
+union(Y) ::= select(X). { Y = setSubclause(NULL, X); }
+union(Y) ::= LP union(X) RP. { Y = X; }
+union(Y) ::= union(Z) UNION ALL select(X). { Y = appendSelectClause(Z, X); }
+union(Y) ::= union(Z) UNION ALL LP select(X) RP. { Y = appendSelectClause(Z, X); }
+
+cmd ::= union(X). { setSQLInfo(pInfo, X, NULL, TSDB_SQL_SELECT); }
+
+// Support for the SQL exprssion without from & where subclauses, e.g.,
+// select current_database(),
+// select server_version(), select client_version(),
+// select server_state();
+select(A) ::= SELECT(T) selcollist(W). {
+  A = tSetQuerySQLElems(&T, W, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
+// selcollist is a list of expressions that are to become the return
+// values of the SELECT statement.  The "*" in statements like
+// "SELECT * FROM ..." is encoded as a special expression with an opcode of TK_ALL.
+%type selcollist {tSQLExprList*}
+%destructor selcollist {tSQLExprListDestroy($$);}
+
+%type sclp {tSQLExprList*}
+%destructor sclp {tSQLExprListDestroy($$);}
+sclp(A) ::= selcollist(X) COMMA.             {A = X;}
+sclp(A) ::= .                                {A = 0;}
+selcollist(A) ::= sclp(P) expr(X) as(Y).     {
+   A = tSQLExprListAppend(P, X, Y.n?&Y:0);
+}
+
+selcollist(A) ::= sclp(P) STAR. {
+   tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL);
+   A = tSQLExprListAppend(P, pNode, 0);
+}
+
+// An option "AS <id>" phrase that can follow one of the expressions that
+// define the result set, or one of the tables in the FROM clause.
+//
+%type as {SStrToken}
+as(X) ::= AS ids(Y).    { X = Y;    }
+as(X) ::= ids(Y).       { X = Y;    }
+as(X) ::= .             { X.n = 0;  }
+
+// A complete FROM clause.
+%type from {tVariantList*}
+// current not support query from no-table
+from(A) ::= FROM tablelist(X).                 {A = X;}
+
+%type tablelist {tVariantList*}
+tablelist(A) ::= ids(X) cpxName(Y).                     {
+  toTSDBType(X.type);
+  X.n += Y.n;
+  A = tVariantListAppendToken(NULL, &X, -1);
+  A = tVariantListAppendToken(A, &X, -1);  // table alias name
+}
+
+tablelist(A) ::= ids(X) cpxName(Y) ids(Z).             {
+   toTSDBType(X.type);
+   toTSDBType(Z.type);
+   X.n += Y.n;
+   A = tVariantListAppendToken(NULL, &X, -1);
+   A = tVariantListAppendToken(A, &Z, -1);
+}
+
+tablelist(A) ::= tablelist(Y) COMMA ids(X) cpxName(Z).  {
+  toTSDBType(X.type);
+  X.n += Z.n;
+  A = tVariantListAppendToken(Y, &X, -1);
+  A = tVariantListAppendToken(A, &X, -1);
+}
+
+tablelist(A) ::= tablelist(Y) COMMA ids(X) cpxName(Z) ids(F). {
+   toTSDBType(X.type);
+   toTSDBType(F.type);
+   X.n += Z.n;
+   A = tVariantListAppendToken(Y, &X, -1);
+   A = tVariantListAppendToken(A, &F, -1);
+}
+
+// The value of interval should be the form of "number+[a,s,m,h,d,n,y]" or "now"
+%type tmvar {SStrToken}
+tmvar(A) ::= VARIABLE(X).   {A = X;}
+
+%type interval_opt {SIntervalVal}
+interval_opt(N) ::= INTERVAL LP tmvar(E) RP.    {N.interval = E; N.offset.n = 0; N.offset.z = NULL; N.offset.type = 0;}
+interval_opt(N) ::= INTERVAL LP tmvar(E) COMMA tmvar(O) RP.    {N.interval = E; N.offset = O;}
+interval_opt(N) ::= .                           {memset(&N, 0, sizeof(N));}
+
+%type fill_opt {tVariantList*}
+%destructor fill_opt {tVariantListDestroy($$);}
+fill_opt(N) ::= .                               {N = 0;     }
+fill_opt(N) ::= FILL LP ID(Y) COMMA tagitemlist(X) RP.      {
+    tVariant A = {0};
+    toTSDBType(Y.type);
+    tVariantCreate(&A, &Y);
+
+    tVariantListInsert(X, &A, -1, 0);
+    N = X;
+}
+
+fill_opt(N) ::= FILL LP ID(Y) RP.               {
+    toTSDBType(Y.type);
+    N = tVariantListAppendToken(NULL, &Y, -1);
+}
+
+%type sliding_opt {SStrToken}
+sliding_opt(K) ::= SLIDING LP tmvar(E) RP.      {K = E;     }
+sliding_opt(K) ::= .                            {K.n = 0; K.z = NULL; K.type = 0;   }
+
+%type orderby_opt {tVariantList*}
+%destructor orderby_opt {tVariantListDestroy($$);}
+
+%type sortlist {tVariantList*}
+%destructor sortlist {tVariantListDestroy($$);}
+
+%type sortitem {tVariant}
+%destructor sortitem {tVariantDestroy(&$$);}
+
+orderby_opt(A) ::= .                          {A = 0;}
+orderby_opt(A) ::= ORDER BY sortlist(X).      {A = X;}
+
+sortlist(A) ::= sortlist(X) COMMA item(Y) sortorder(Z). {
+    A = tVariantListAppend(X, &Y, Z);
+}
+
+sortlist(A) ::= item(Y) sortorder(Z). {
+  A = tVariantListAppend(NULL, &Y, Z);
+}
+
+%type item {tVariant}
+item(A) ::= ids(X) cpxName(Y).   {
+  toTSDBType(X.type);
+  X.n += Y.n;
+
+  tVariantCreate(&A, &X);
+}
+
+%type sortorder {int}
+sortorder(A) ::= ASC.           {A = TSDB_ORDER_ASC; }
+sortorder(A) ::= DESC.          {A = TSDB_ORDER_DESC;}
+sortorder(A) ::= .              {A = TSDB_ORDER_ASC;}  //default is descend order
+
+//group by clause
+%type groupby_opt {tVariantList*}
+%destructor groupby_opt {tVariantListDestroy($$);}
+%type grouplist {tVariantList*}
+%destructor grouplist {tVariantListDestroy($$);}
+
+groupby_opt(A) ::= .                       {A = 0;}
+groupby_opt(A) ::= GROUP BY grouplist(X).  {A = X;}
+
+grouplist(A) ::= grouplist(X) COMMA item(Y).    {
+  A = tVariantListAppend(X, &Y, -1);
+}
+
+grouplist(A) ::= item(X).                       {
+  A = tVariantListAppend(NULL, &X, -1);
+}
+
+//having clause, ignore the input condition in having
+%type having_opt {tSQLExpr*}
+%destructor having_opt {tSQLExprDestroy($$);}
+having_opt(A) ::=.                  {A = 0;}
+having_opt(A) ::= HAVING expr(X).   {A = X;}
+
+//limit-offset subclause
+%type limit_opt {SLimitVal}
+limit_opt(A) ::= .                     {A.limit = -1; A.offset = 0;}
+limit_opt(A) ::= LIMIT signed(X).      {A.limit = X;  A.offset = 0;}
+limit_opt(A) ::= LIMIT signed(X) OFFSET signed(Y).
+                                       {A.limit = X;  A.offset = Y;}
+limit_opt(A) ::= LIMIT signed(X) COMMA signed(Y).
+                                       {A.limit = Y;  A.offset = X;}
+
+%type slimit_opt {SLimitVal}
+slimit_opt(A) ::= .                    {A.limit = -1; A.offset = 0;}
+slimit_opt(A) ::= SLIMIT signed(X).    {A.limit = X;  A.offset = 0;}
+slimit_opt(A) ::= SLIMIT signed(X) SOFFSET signed(Y).
+                                       {A.limit = X;  A.offset = Y;}
+slimit_opt(A) ::= SLIMIT signed(X) COMMA  signed(Y).
+                                       {A.limit = Y;  A.offset = X;}
+
+%type where_opt {tSQLExpr*}
+%destructor where_opt {tSQLExprDestroy($$);}
+
+where_opt(A) ::= .                    {A = 0;}
+where_opt(A) ::= WHERE expr(X).       {A = X;}
+
+/////////////////////////// Expression Processing /////////////////////////////
+//
+%type expr {tSQLExpr*}
+%destructor expr {tSQLExprDestroy($$);}
+
+expr(A) ::= LP expr(X) RP.       {A = X; }
+
+expr(A) ::= ID(X).               {A = tSQLExprIdValueCreate(&X, TK_ID);}
+expr(A) ::= ID(X) DOT ID(Y).     {X.n += (1+Y.n); A = tSQLExprIdValueCreate(&X, TK_ID);}
+expr(A) ::= ID(X) DOT STAR(Y).   {X.n += (1+Y.n); A = tSQLExprIdValueCreate(&X, TK_ALL);}
+
+expr(A) ::= INTEGER(X).          {A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
+expr(A) ::= MINUS(X) INTEGER(Y). {X.n += Y.n; X.type = TK_INTEGER; A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
+expr(A) ::= PLUS(X)  INTEGER(Y). {X.n += Y.n; X.type = TK_INTEGER; A = tSQLExprIdValueCreate(&X, TK_INTEGER);}
+expr(A) ::= FLOAT(X).            {A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
+expr(A) ::= MINUS(X) FLOAT(Y).   {X.n += Y.n; X.type = TK_FLOAT; A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
+expr(A) ::= PLUS(X) FLOAT(Y).    {X.n += Y.n; X.type = TK_FLOAT; A = tSQLExprIdValueCreate(&X, TK_FLOAT);}
+expr(A) ::= STRING(X).           {A = tSQLExprIdValueCreate(&X, TK_STRING);}
+expr(A) ::= NOW(X).              {A = tSQLExprIdValueCreate(&X, TK_NOW); }
+expr(A) ::= VARIABLE(X).         {A = tSQLExprIdValueCreate(&X, TK_VARIABLE);}
+expr(A) ::= BOOL(X).             {A = tSQLExprIdValueCreate(&X, TK_BOOL);}
+
+// ordinary functions: min(x), max(x), top(k, 20)
+expr(A) ::= ID(X) LP exprlist(Y) RP(E). { A = tSQLExprCreateFunction(Y, &X, &E, X.type); }
+
+// for parsing sql functions with wildcard for parameters. e.g., count(*)/first(*)/last(*) operation
+expr(A) ::= ID(X) LP STAR RP(Y).     { A = tSQLExprCreateFunction(NULL, &X, &Y, X.type); }
+
+// is (not) null expression
+expr(A) ::= expr(X) IS NULL.           {A = tSQLExprCreate(X, NULL, TK_ISNULL);}
+expr(A) ::= expr(X) IS NOT NULL.       {A = tSQLExprCreate(X, NULL, TK_NOTNULL);}
+
+// relational expression
+expr(A) ::= expr(X) LT expr(Y).      {A = tSQLExprCreate(X, Y, TK_LT);}
+expr(A) ::= expr(X) GT expr(Y).      {A = tSQLExprCreate(X, Y, TK_GT);}
+expr(A) ::= expr(X) LE expr(Y).      {A = tSQLExprCreate(X, Y, TK_LE);}
+expr(A) ::= expr(X) GE expr(Y).      {A = tSQLExprCreate(X, Y, TK_GE);}
+expr(A) ::= expr(X) NE expr(Y).      {A = tSQLExprCreate(X, Y, TK_NE);}
+expr(A) ::= expr(X) EQ expr(Y).      {A = tSQLExprCreate(X, Y, TK_EQ);}
+
+expr(A) ::= expr(X) AND expr(Y).     {A = tSQLExprCreate(X, Y, TK_AND);}
+expr(A) ::= expr(X) OR  expr(Y).     {A = tSQLExprCreate(X, Y, TK_OR); }
+
+// binary arithmetic expression
+expr(A) ::= expr(X) PLUS  expr(Y).   {A = tSQLExprCreate(X, Y, TK_PLUS);  }
+expr(A) ::= expr(X) MINUS expr(Y).   {A = tSQLExprCreate(X, Y, TK_MINUS); }
+expr(A) ::= expr(X) STAR  expr(Y).   {A = tSQLExprCreate(X, Y, TK_STAR);  }
+expr(A) ::= expr(X) SLASH expr(Y).   {A = tSQLExprCreate(X, Y, TK_DIVIDE);}
+expr(A) ::= expr(X) REM   expr(Y).   {A = tSQLExprCreate(X, Y, TK_REM);   }
+
+// like expression
+expr(A) ::= expr(X) LIKE expr(Y).    {A = tSQLExprCreate(X, Y, TK_LIKE);  }
+
+//in expression
+expr(A) ::= expr(X) IN LP exprlist(Y) RP.   {A = tSQLExprCreate(X, (tSQLExpr*)Y, TK_IN); }
+
+%type exprlist {tSQLExprList*}
+%destructor exprlist {tSQLExprListDestroy($$);}
+
+%type expritem {tSQLExpr*}
+%destructor expritem {tSQLExprDestroy($$);}
+
+exprlist(A) ::= exprlist(X) COMMA expritem(Y). {A = tSQLExprListAppend(X,Y,0);}
+exprlist(A) ::= expritem(X).                   {A = tSQLExprListAppend(0,X,0);}
+expritem(A) ::= expr(X).                       {A = X;}
+expritem(A) ::= .                              {A = 0;}
+
+///////////////////////////////////reset query cache//////////////////////////////////////
+cmd ::= RESET QUERY CACHE.  { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
+
+///////////////////////////////////ALTER TABLE statement//////////////////////////////////
+cmd ::= ALTER TABLE ids(X) cpxName(F) ADD COLUMN columnlist(A).     {
+    X.n += F.n;
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+cmd ::= ALTER TABLE ids(X) cpxName(F) DROP COLUMN ids(A).     {
+    X.n += F.n;
+
+    toTSDBType(A.type);
+    tVariantList* K = tVariantListAppendToken(NULL, &A, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+//////////////////////////////////ALTER TAGS statement/////////////////////////////////////
+cmd ::= ALTER TABLE ids(X) cpxName(Y) ADD TAG columnlist(A).        {
+    X.n += Y.n;
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, A, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+cmd ::= ALTER TABLE ids(X) cpxName(Z) DROP TAG ids(Y).          {
+    X.n += Z.n;
+
+    toTSDBType(Y.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+cmd ::= ALTER TABLE ids(X) cpxName(F) CHANGE TAG ids(Y) ids(Z). {
+    X.n += F.n;
+
+    toTSDBType(Y.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
+
+    toTSDBType(Z.type);
+    A = tVariantListAppendToken(A, &Z, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+cmd ::= ALTER TABLE ids(X) cpxName(F) SET TAG ids(Y) EQ tagitem(Z).     {
+    X.n += F.n;
+
+    toTSDBType(Y.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &Y, -1);
+    A = tVariantListAppend(A, &Z, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&X, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+
+////////////////////////////////////////kill statement///////////////////////////////////////
+cmd ::= KILL CONNECTION INTEGER(Y).   {setKillSQL(pInfo, TSDB_SQL_KILL_CONNECTION, &Y);}
+cmd ::= KILL STREAM INTEGER(X) COLON(Z) INTEGER(Y).       {X.n += (Z.n + Y.n); setKillSQL(pInfo, TSDB_SQL_KILL_STREAM, &X);}
+cmd ::= KILL QUERY INTEGER(X) COLON(Z) INTEGER(Y).        {X.n += (Z.n + Y.n); setKillSQL(pInfo, TSDB_SQL_KILL_QUERY, &X);}
+
+%fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED
+  DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
+  LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
+  COUNT SUM AVG MIN MAX FIRST LAST TOP BOTTOM STDDEV PERCENTILE APERCENTILE LEASTSQUARES HISTOGRAM DIFF
+  SPREAD TWA INTERP LAST_ROW RATE IRATE SUM_RATE SUM_IRATE AVG_RATE AVG_IRATE TBID NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT
+  METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO VALUES.
diff --git a/src/query/inc/tsqlfunction.h b/src/query/inc/tsqlfunction.h
new file mode 100644
index 0000000000000000000000000000000000000000..28b9a60102d41a11fa02fee1ca51cbf8e263bf3b
--- /dev/null
+++ b/src/query/inc/tsqlfunction.h
@@ -0,0 +1,293 @@
+/*
+ * 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_TSQLFUNCTION_H
+#define TDENGINE_TSQLFUNCTION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+
+#include "tname.h"
+#include "taosdef.h"
+#include "trpc.h"
+#include "tvariant.h"
+
+#define TSDB_FUNC_INVALID_ID  -1
+#define TSDB_FUNC_COUNT        0
+#define TSDB_FUNC_SUM          1
+#define TSDB_FUNC_AVG          2
+#define TSDB_FUNC_MIN          3
+#define TSDB_FUNC_MAX          4
+#define TSDB_FUNC_STDDEV       5
+#define TSDB_FUNC_PERCT        6
+#define TSDB_FUNC_APERCT       7
+#define TSDB_FUNC_FIRST        8
+#define TSDB_FUNC_LAST         9
+#define TSDB_FUNC_LAST_ROW     10
+#define TSDB_FUNC_TOP          11
+#define TSDB_FUNC_BOTTOM       12
+#define TSDB_FUNC_SPREAD       13
+#define TSDB_FUNC_TWA          14
+#define TSDB_FUNC_LEASTSQR     15
+
+#define TSDB_FUNC_TS           16
+#define TSDB_FUNC_TS_DUMMY     17
+#define TSDB_FUNC_TAG_DUMMY    18
+#define TSDB_FUNC_TS_COMP      19
+
+#define TSDB_FUNC_TAG          20
+#define TSDB_FUNC_PRJ          21
+
+#define TSDB_FUNC_TAGPRJ       22
+#define TSDB_FUNC_ARITHM       23
+#define TSDB_FUNC_DIFF         24
+
+#define TSDB_FUNC_FIRST_DST    25
+#define TSDB_FUNC_LAST_DST     26
+#define TSDB_FUNC_INTERP       27
+
+#define TSDB_FUNC_RATE         28
+#define TSDB_FUNC_IRATE        29
+#define TSDB_FUNC_SUM_RATE     30
+#define TSDB_FUNC_SUM_IRATE    31
+#define TSDB_FUNC_AVG_RATE     32
+#define TSDB_FUNC_AVG_IRATE    33
+
+#define TSDB_FUNC_TID_TAG      34
+#define TSDB_FUNC_HISTOGRAM    35
+#define TSDB_FUNC_HLL          36
+#define TSDB_FUNC_MODE         37
+#define TSDB_FUNC_SAMPLE       38
+#define TSDB_FUNC_CEIL         39
+#define TSDB_FUNC_FLOOR        40
+#define TSDB_FUNC_ROUND        41
+#define TSDB_FUNC_MAVG         42
+#define TSDB_FUNC_CSUM         43
+
+#define TSDB_FUNCSTATE_SO           0x1u    // single output
+#define TSDB_FUNCSTATE_MO           0x2u    // dynamic number of output, not multinumber of output e.g., TOP/BOTTOM
+#define TSDB_FUNCSTATE_STREAM       0x4u    // function avail for stream
+#define TSDB_FUNCSTATE_STABLE       0x8u    // function avail for metric
+#define TSDB_FUNCSTATE_OF           0x10u   // outer forward
+#define TSDB_FUNCSTATE_NEED_TS      0x20u   // timestamp is required during query processing
+#define TSDB_FUNCSTATE_SELECTIVITY  0x40u   // selectivity functions, can exists along with tag columns
+
+#define TSDB_BASE_FUNC_SO TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF
+#define TSDB_BASE_FUNC_MO TSDB_FUNCSTATE_MO | TSDB_FUNCSTATE_STREAM | TSDB_FUNCSTATE_STABLE | TSDB_FUNCSTATE_OF
+
+
+#define TSDB_FUNCTIONS_NAME_MAX_LENGTH 16
+#define TSDB_AVG_FUNCTION_INTER_BUFFER_SIZE 50
+
+#define DATA_SET_FLAG ','  // to denote the output area has data, not null value
+#define DATA_SET_FLAG_SIZE sizeof(DATA_SET_FLAG)
+
+#define QUERY_COND_REL_PREFIX_IN "IN|"
+#define QUERY_COND_REL_PREFIX_LIKE "LIKE|"
+
+#define QUERY_COND_REL_PREFIX_IN_LEN   3
+#define QUERY_COND_REL_PREFIX_LIKE_LEN 5
+
+#define QUERY_ASC_FORWARD_STEP   1
+#define QUERY_DESC_FORWARD_STEP -1
+
+#define GET_FORWARD_DIRECTION_FACTOR(ord) (((ord) == TSDB_ORDER_ASC) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP)
+
+#define MAX_INTERVAL_TIME_WINDOW 1000000  // maximum allowed time windows in final results
+#define TOP_BOTTOM_QUERY_LIMIT   100
+
+enum {
+  MASTER_SCAN           = 0x0u,
+  REVERSE_SCAN          = 0x1u,
+  REPEAT_SCAN           = 0x2u,  //repeat scan belongs to the master scan
+  FIRST_STAGE_MERGE     = 0x10u,
+  SECONDARY_STAGE_MERGE = 0x20u,
+};
+
+#define QUERY_IS_STABLE_QUERY(type)      (((type)&TSDB_QUERY_TYPE_STABLE_QUERY) != 0)
+#define QUERY_IS_JOIN_QUERY(type)        (TSDB_QUERY_HAS_TYPE(type, TSDB_QUERY_TYPE_JOIN_QUERY))
+#define QUERY_IS_PROJECTION_QUERY(type)  (((type)&TSDB_QUERY_TYPE_PROJECTION_QUERY) != 0)
+#define QUERY_IS_FREE_RESOURCE(type)     (((type)&TSDB_QUERY_TYPE_FREE_RESOURCE) != 0)
+
+typedef struct SArithmeticSupport {
+  SExprInfo   *pArithExpr;
+  int32_t      numOfCols;
+  SColumnInfo *colList;
+  SArray*      exprList;   // client side used
+  int32_t      offset;
+  char**       data;
+} SArithmeticSupport;
+
+typedef struct SQLPreAggVal {
+  bool        isSet;             // statistics info set or not
+  bool        dataBlockLoaded;   // data block is loaded or not
+  SDataStatis statis;
+} SQLPreAggVal;
+
+typedef struct SInterpInfoDetail {
+  TSKEY  ts;  // interp specified timestamp
+  int8_t type;
+  int8_t primaryCol;
+} SInterpInfoDetail;
+
+typedef struct SResultInfo {
+  int8_t   hasResult;       // result generated, not NULL value
+  bool     initialized;   // output buffer has been initialized
+  bool     complete;      // query has completed
+  bool     superTableQ;   // is super table query
+  uint32_t bufLen;       // buffer size
+  uint64_t numOfRes;        // num of output result in current buffer
+  void*    interResultBuf;  // output result buffer
+} SResultInfo;
+
+struct SQLFunctionCtx;
+
+/**
+ * for selectivity query, the corresponding tag value is assigned if the data is qualified
+ */
+typedef struct SExtTagsInfo {
+  int16_t                 tagsLen;      // keep the tags data for top/bottom query result
+  int16_t                 numOfTagCols;
+  struct SQLFunctionCtx **pTagCtxList;
+} SExtTagsInfo;
+
+// sql function runtime context
+typedef struct SQLFunctionCtx {
+  int32_t      startOffset;
+  int32_t      size;      // number of rows
+  uint32_t     order;     // asc|desc
+  int16_t      inputType;
+  int16_t      inputBytes;
+  
+  int16_t      outputType;
+  int16_t      outputBytes;  // size of results, determined by function and input column data type
+  bool         hasNull;      // null value exist in current block
+  bool         requireNull;  // require null in some function
+  int16_t      functionId;   // function id
+  void *       aInputElemBuf;
+  char *       aOutputBuf;            // final result output buffer, point to sdata->data
+  uint8_t      currentStage;          // record current running step, default: 0
+  int64_t      nStartQueryTimestamp;  // timestamp range of current query when function is executed on a specific data block
+  int32_t      numOfParams;
+  tVariant     param[4];      // input parameter, e.g., top(k, 20), the number of results for top query is kept in param */
+  int64_t *    ptsList;       // corresponding timestamp array list
+  void *       ptsOutputBuf;  // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
+  SQLPreAggVal preAggVals;
+  tVariant     tag;
+  SResultInfo *resultInfo;
+
+  SExtTagsInfo tagInfo;
+} SQLFunctionCtx;
+
+typedef struct SQLAggFuncElem {
+  char     aName[TSDB_FUNCTIONS_NAME_MAX_LENGTH];
+
+  uint8_t  nAggIdx;       // index of function in aAggs
+  int8_t   stableFuncId;  // transfer function for super table query
+  uint16_t nStatus;
+
+  bool (*init)(SQLFunctionCtx *pCtx);  // setup the execute environment
+
+  void (*xFunction)(SQLFunctionCtx *pCtx);                     // blocks version function
+  void (*xFunctionF)(SQLFunctionCtx *pCtx, int32_t position);  // single-row function version
+
+  // some sql function require scan data twice or more, e.g.,stddev
+  void (*xNextStep)(SQLFunctionCtx *pCtx);
+
+  /*
+   * finalizer must be called after all xFunction has been executed to
+   * generated final result. Otherwise, the value in aOutputBuf is a intern result.
+   */
+  void (*xFinalize)(SQLFunctionCtx *pCtx);
+
+  void (*distMergeFunc)(SQLFunctionCtx *pCtx);
+
+  void (*distSecondaryMergeFunc)(SQLFunctionCtx *pCtx);
+
+  int32_t (*dataReqFunc)(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId);
+} SQLAggFuncElem;
+
+#define GET_RES_INFO(ctx) ((ctx)->resultInfo)
+
+int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, int16_t *type,
+                          int16_t *len, int32_t *interBytes, int16_t extLength, bool isSuperTable);
+
+#define IS_STREAM_QUERY_VALID(x)  (((x)&TSDB_FUNCSTATE_STREAM) != 0)
+#define IS_MULTIOUTPUT(x)         (((x)&TSDB_FUNCSTATE_MO) != 0)
+#define IS_SINGLEOUTPUT(x)        (((x)&TSDB_FUNCSTATE_SO) != 0)
+#define IS_OUTER_FORWARD(x)       (((x)&TSDB_FUNCSTATE_OF) != 0)
+
+/* determine the real data need to calculated the result */
+enum {
+  BLK_DATA_NO_NEEDED     = 0x0,
+  BLK_DATA_STATIS_NEEDED = 0x1,
+  BLK_DATA_ALL_NEEDED    = 0x3,
+  BLK_DATA_DISCARD       = 0x4,   // discard current data block since it is not qualified for filter
+};
+
+typedef struct STwaInfo {
+  TSKEY   lastKey;
+  int8_t  hasResult;  // flag to denote has value
+  int16_t type;       // source data type
+  TSKEY   SKey;
+  TSKEY   EKey;
+
+  union {
+    double  dOutput;
+    int64_t iOutput;
+  };
+
+  union {
+    double  dLastValue;
+    int64_t iLastValue;
+  };
+} STwaInfo;
+
+/* global sql function array */
+extern struct SQLAggFuncElem aAggs[];
+
+extern int32_t functionCompatList[]; // compatible check array list
+
+bool topbot_datablock_filter(SQLFunctionCtx *pCtx, int32_t functionId, const char *minval, const char *maxval);
+
+/**
+ * the numOfRes should be kept, since it may be used later
+ * and allow the ResultInfo to be re initialized
+ */
+#define RESET_RESULT_INFO(_r)  \
+  do {                         \
+    (_r)->initialized = false; \
+  } while (0)
+
+void setResultInfoBuf(SResultInfo *pResInfo, int32_t size, bool superTable, char* buf);
+
+static FORCE_INLINE void initResultInfo(SResultInfo *pResInfo) {
+  pResInfo->initialized = true;  // the this struct has been initialized flag
+  
+  pResInfo->complete = false;
+  pResInfo->hasResult = false;
+  pResInfo->numOfRes = 0;
+  
+  memset(pResInfo->interResultBuf, 0, (size_t)pResInfo->bufLen);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSQLFUNCTION_H
diff --git a/src/query/src/qAst.c b/src/query/src/qAst.c
new file mode 100644
index 0000000000000000000000000000000000000000..63411aaf3f9085d3912b923ac419cd1552239583
--- /dev/null
+++ b/src/query/src/qAst.c
@@ -0,0 +1,1091 @@
+/*
+ * 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 "os.h"
+
+#include "exception.h"
+#include "qAst.h"
+#include "qSqlparser.h"
+#include "qSyntaxtreefunction.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tarray.h"
+#include "tbuffer.h"
+#include "tcompare.h"
+#include "tname.h"
+#include "tsdb.h"
+#include "tskiplist.h"
+#include "tsqlfunction.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tulog.h"
+#include "tutil.h"
+
+/*
+ *
+ * @date 2018-2-15
+ * @version 0.2  operation for column filter
+ *
+ * @Description parse tag query expression to build ast
+ * ver 0.2, filter the result on first column with high priority to limit the candidate set
+ * ver 0.3, pipeline filter in the form of: (a+2)/9 > 14
+ *
+ */
+static tExprNode *tExprNodeCreate(SSchema *pSchema, int32_t numOfCols, SStrToken *pToken);
+
+static tExprNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *str, int32_t *i);
+static void       destroySyntaxTree(tExprNode *);
+
+static uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tExprNode *pLeft, const tExprNode *pRight);
+
+/*
+ * Check the filter value type on the right hand side based on the column id on the left hand side,
+ * the filter value type must be identical to field type for relational operation
+ * As for binary arithmetic operation, it is not necessary to do so.
+ */
+static void reviseBinaryExprIfNecessary(tExprNode **pLeft, tExprNode **pRight, uint8_t *optr) {
+  if (*optr >= TSDB_RELATION_LESS && *optr <= TSDB_RELATION_LIKE) {
+    // make sure that the type of data on both sides of relational comparision are identical
+    if ((*pLeft)->nodeType == TSQL_NODE_VALUE) {
+      tVariantTypeSetType((*pLeft)->pVal, (*pRight)->pSchema->type);
+    } else if ((*pRight)->nodeType == TSQL_NODE_VALUE) {
+      tVariantTypeSetType((*pRight)->pVal, (*pLeft)->pSchema->type);
+    }
+
+  } else if (*optr >= TSDB_BINARY_OP_ADD && *optr <= TSDB_BINARY_OP_REMAINDER) {
+    if ((*pLeft)->nodeType == TSQL_NODE_VALUE) {
+      /* convert to int/bigint may cause the precision loss */
+      tVariantTypeSetType((*pLeft)->pVal, TSDB_DATA_TYPE_DOUBLE);
+    } else if ((*pRight)->nodeType == TSQL_NODE_VALUE) {
+      /* convert to int/bigint may cause the precision loss */
+      tVariantTypeSetType((*pRight)->pVal, TSDB_DATA_TYPE_DOUBLE);
+    }
+  }
+
+  /*
+   * 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) {
+    if (*optr >= TSDB_RELATION_GREATER && *optr <= TSDB_RELATION_GREATER_EQUAL && *optr != TSDB_RELATION_EQUAL) {
+      SWAP(*pLeft, *pRight, tExprNode *);
+    }
+
+    switch (*optr) {
+      case TSDB_RELATION_GREATER:
+        (*optr) = TSDB_RELATION_LESS;
+        break;
+      case TSDB_RELATION_LESS:
+        (*optr) = TSDB_RELATION_GREATER;
+        break;
+      case TSDB_RELATION_GREATER_EQUAL:
+        (*optr) = TSDB_RELATION_LESS_EQUAL;
+        break;
+      case TSDB_RELATION_LESS_EQUAL:
+        (*optr) = TSDB_RELATION_GREATER_EQUAL;
+        break;
+      default:;
+        // for other type of operations, do nothing
+    }
+  }
+}
+
+static tExprNode *tExprNodeCreate(SSchema *pSchema, int32_t numOfCols, SStrToken *pToken) {
+  /* if the token is not a value, return false */
+  if (pToken->type == TK_RP || (pToken->type != TK_INTEGER && pToken->type != TK_FLOAT && pToken->type != TK_ID &&
+                                pToken->type != TK_TBNAME && pToken->type != TK_STRING && pToken->type != TK_BOOL)) {
+    return NULL;
+  }
+
+  size_t nodeSize = sizeof(tExprNode);
+  tExprNode *pNode = NULL;
+
+  if (pToken->type == TK_ID || pToken->type == TK_TBNAME) {
+    int32_t i = 0;
+    if (pToken->type == TK_ID) {
+      do {
+        SStrToken tableToken = {0};
+        extractTableNameFromToken(pToken, &tableToken);
+
+        size_t len = strlen(pSchema[i].name);
+        if (strncmp(pToken->z, pSchema[i].name, pToken->n) == 0 && pToken->n == len) break;
+      } while (++i < numOfCols);
+
+      if (i == numOfCols) {  // column name is not valid, parse the expression failed
+        return NULL;
+      }
+    }
+
+    nodeSize += sizeof(SSchema);
+
+    pNode = calloc(1, nodeSize);
+    pNode->pSchema = (struct SSchema *)((char *)pNode + sizeof(tExprNode));
+    pNode->nodeType = TSQL_NODE_COL;
+
+    if (pToken->type == TK_ID) {
+      memcpy(pNode->pSchema, &pSchema[i], sizeof(SSchema));
+    } else {
+      pNode->pSchema->type = TSDB_DATA_TYPE_BINARY;
+      pNode->pSchema->bytes = TSDB_TABLE_NAME_LEN - 1;
+      strcpy(pNode->pSchema->name, TSQL_TBNAME_L);
+      pNode->pSchema->colId = -1;
+    }
+
+  } else {
+    nodeSize += sizeof(tVariant);
+    pNode = calloc(1, nodeSize);
+    pNode->pVal = (tVariant *)((char *)pNode + sizeof(tExprNode));
+
+    toTSDBType(pToken->type);
+    tVariantCreate(pNode->pVal, pToken);
+    pNode->nodeType = TSQL_NODE_VALUE;
+  }
+
+  return pNode;
+}
+
+uint8_t getBinaryExprOptr(SStrToken *pToken) {
+  switch (pToken->type) {
+    case TK_LT:
+      return TSDB_RELATION_LESS;
+    case TK_LE:
+      return TSDB_RELATION_LESS_EQUAL;
+    case TK_GT:
+      return TSDB_RELATION_GREATER;
+    case TK_GE:
+      return TSDB_RELATION_GREATER_EQUAL;
+    case TK_NE:
+      return TSDB_RELATION_NOT_EQUAL;
+    case TK_AND:
+      return TSDB_RELATION_AND;
+    case TK_OR:
+      return TSDB_RELATION_OR;
+    case TK_EQ:
+      return TSDB_RELATION_EQUAL;
+    case TK_PLUS:
+      return TSDB_BINARY_OP_ADD;
+    case TK_MINUS:
+      return TSDB_BINARY_OP_SUBTRACT;
+    case TK_STAR:
+      return TSDB_BINARY_OP_MULTIPLY;
+    case TK_SLASH:
+    case TK_DIVIDE:
+      return TSDB_BINARY_OP_DIVIDE;
+    case TK_REM:
+      return TSDB_BINARY_OP_REMAINDER;
+    case TK_LIKE:
+      return TSDB_RELATION_LIKE;
+    case TK_ISNULL:
+      return TSDB_RELATION_ISNULL;
+    case TK_NOTNULL:
+      return TSDB_RELATION_NOTNULL;
+    default: { return 0; }
+  }
+}
+
+// previous generated expr is reduced as the left child
+static tExprNode *parseRemainStr(char *pstr, tExprNode *pExpr, SSchema *pSchema, int32_t optr,
+                                      int32_t numOfCols, int32_t *i) {
+  // set the previous generated node as the left child of new root
+  pExpr->nodeType = TSQL_NODE_EXPR;
+
+  // remain is the right child
+  tExprNode *pRight = createSyntaxTree(pSchema, numOfCols, pstr, i);
+  if (pRight == NULL || (pRight->nodeType == TSQL_NODE_COL && pExpr->nodeType != TSQL_NODE_VALUE) ||
+      (pExpr->nodeType == TSQL_NODE_VALUE && pRight->nodeType != TSQL_NODE_COL)) {
+    tExprNodeDestroy(pExpr, NULL);
+    tExprNodeDestroy(pRight, NULL);
+    return NULL;
+  }
+
+  tExprNode *pNewExpr = (tExprNode *)calloc(1, sizeof(tExprNode));
+  uint8_t         k = optr;
+  reviseBinaryExprIfNecessary(&pExpr, &pRight, &k);
+  pNewExpr->_node.pLeft = pExpr;
+  pNewExpr->_node.pRight = pRight;
+  pNewExpr->_node.optr = k;
+
+  pNewExpr->_node.hasPK = isQueryOnPrimaryKey(pSchema[0].name, pExpr, pRight);
+  pNewExpr->nodeType = TSQL_NODE_EXPR;
+
+  return pNewExpr;
+}
+
+uint8_t isQueryOnPrimaryKey(const char *primaryColumnName, const tExprNode *pLeft, const tExprNode *pRight) {
+  if (pLeft->nodeType == TSQL_NODE_COL) {
+    // 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 this value
+    return ((pLeft->nodeType == TSQL_NODE_EXPR && pLeft->_node.hasPK == 1) ||
+            (pRight->nodeType == TSQL_NODE_EXPR && pRight->_node.hasPK == 1)) == true
+               ? 1
+               : 0;
+  }
+}
+
+static tExprNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, char *str, int32_t *i) {
+  SStrToken t0 = tStrGetToken(str, i, false, 0, NULL);
+  if (t0.n == 0) {
+    return NULL;
+  }
+
+  tExprNode *pLeft = NULL;
+  if (t0.type == TK_LP) {  // start new left child branch
+    pLeft = createSyntaxTree(pSchema, numOfCols, str, i);
+  } else {
+    if (t0.type == TK_RP) {
+      return NULL;
+    }
+    
+    pLeft = tExprNodeCreate(pSchema, numOfCols, &t0);
+  }
+
+  if (pLeft == NULL) {
+    return NULL;
+  }
+
+  t0 = tStrGetToken(str, i, false, 0, NULL);
+  if (t0.n == 0 || t0.type == TK_RP) {
+    if (pLeft->nodeType != TSQL_NODE_EXPR) {  // if left is not the expr, it is not a legal expr
+      tExprNodeDestroy(pLeft, NULL);
+      return NULL;
+    }
+
+    return pLeft;
+  }
+
+  // get the operator of expr
+  uint8_t optr = getBinaryExprOptr(&t0);
+  if (optr == 0) {
+    uError("not support binary operator:%d", t0.type);
+    tExprNodeDestroy(pLeft, NULL);
+    return NULL;
+  }
+
+  assert(pLeft != NULL);
+  tExprNode *pRight = NULL;
+
+  if (t0.type == TK_AND || t0.type == TK_OR || t0.type == TK_LP) {
+    pRight = createSyntaxTree(pSchema, numOfCols, str, i);
+  } else {
+    /*
+     * In case that pLeft is a field identification,
+     * we parse the value in expression according to queried field type,
+     * 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.
+     */
+    t0 = tStrGetToken(str, i, true, 0, NULL);
+    if (t0.n == 0) {
+      tExprNodeDestroy(pLeft, NULL);  // illegal expression
+      return NULL;
+    }
+
+    if (t0.type == TK_LP) {
+      pRight = createSyntaxTree(pSchema, numOfCols, str, i);
+    } else {
+      pRight = tExprNodeCreate(pSchema, numOfCols, &t0);
+    }
+  }
+
+  if (pRight == NULL) {
+    tExprNodeDestroy(pLeft, NULL);
+    return NULL;
+  }
+
+  /* create binary expr as the child of new parent node */
+  tExprNode *pExpr = (tExprNode *)calloc(1, sizeof(tExprNode));
+  reviseBinaryExprIfNecessary(&pLeft, &pRight, &optr);
+
+  pExpr->_node.hasPK = isQueryOnPrimaryKey(pSchema[0].name, pLeft, pRight);
+  pExpr->_node.pLeft = pLeft;
+  pExpr->_node.pRight = pRight;
+  pExpr->_node.optr = optr;
+
+  t0 = tStrGetToken(str, i, true, 0, NULL);
+
+  if (t0.n == 0 || t0.type == TK_RP) {
+    pExpr->nodeType = TSQL_NODE_EXPR;
+    return pExpr;
+  } else {
+    uint8_t localOptr = getBinaryExprOptr(&t0);
+    if (localOptr == 0) {
+      uError("not support binary operator:%d", t0.type);
+      free(pExpr);
+      return NULL;
+    }
+
+    return parseRemainStr(str, pExpr, pSchema, localOptr, numOfCols, i);
+  }
+}
+
+static void UNUSED_FUNC destroySyntaxTree(tExprNode *pNode) { tExprNodeDestroy(pNode, NULL); }
+
+void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *)) {
+  if (pNode == NULL) {
+    return;
+  }
+
+  if (pNode->nodeType == TSQL_NODE_EXPR) {
+    tExprTreeDestroy(&pNode, fp);
+  } else if (pNode->nodeType == TSQL_NODE_VALUE) {
+    tVariantDestroy(pNode->pVal);
+  } else if (pNode->nodeType == TSQL_NODE_COL) {
+    free(pNode->pSchema);
+  }
+
+  free(pNode);
+}
+
+void tExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) {
+  if (*pExpr == NULL) {
+    return;
+  }
+  
+  if ((*pExpr)->nodeType == TSQL_NODE_EXPR) {
+    tExprTreeDestroy(&(*pExpr)->_node.pLeft, fp);
+    tExprTreeDestroy(&(*pExpr)->_node.pRight, fp);
+  
+    if (fp != NULL) {
+      fp((*pExpr)->_node.info);
+    }
+  } else if ((*pExpr)->nodeType == TSQL_NODE_VALUE) {
+    tVariantDestroy((*pExpr)->pVal);
+    free((*pExpr)->pVal);
+  } else if ((*pExpr)->nodeType == TSQL_NODE_COL) {
+    free((*pExpr)->pSchema);
+  }
+
+  free(*pExpr);
+  *pExpr = NULL;
+}
+
+typedef struct {
+  char*    v;
+  int32_t  optr;
+} SEndPoint;
+
+typedef struct {
+  SEndPoint* start;
+  SEndPoint* end;
+} SQueryCond;
+
+// todo check for malloc failure
+static int32_t setQueryCond(tQueryInfo *queryColInfo, SQueryCond* pCond) {
+  int32_t optr = queryColInfo->optr;
+  
+  if (optr == TSDB_RELATION_GREATER || optr == TSDB_RELATION_GREATER_EQUAL ||
+      optr == TSDB_RELATION_EQUAL || optr == TSDB_RELATION_NOT_EQUAL) {
+    pCond->start = calloc(1, sizeof(SEndPoint));
+    pCond->start->optr = queryColInfo->optr;
+    pCond->start->v = queryColInfo->q;
+  } else if (optr == TSDB_RELATION_LESS || optr == TSDB_RELATION_LESS_EQUAL) {
+    pCond->end = calloc(1, sizeof(SEndPoint));
+    pCond->end->optr = queryColInfo->optr;
+    pCond->end->v = queryColInfo->q;
+  } else if (optr == TSDB_RELATION_IN) {
+    printf("relation is in\n");
+    assert(0);
+  } else if (optr == TSDB_RELATION_LIKE) {
+    printf("relation is like\n");
+    assert(0);
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+static void tQueryIndexColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* result) {
+  SSkipListIterator* iter = NULL;
+  
+  SQueryCond cond = {0};
+  if (setQueryCond(pQueryInfo, &cond) != TSDB_CODE_SUCCESS) {
+    //todo handle error
+  }
+
+  if (cond.start != NULL) {
+    iter = tSkipListCreateIterFromVal(pSkipList, (char*) cond.start->v, pSkipList->keyInfo.type, TSDB_ORDER_ASC);
+  } else {
+    iter = tSkipListCreateIterFromVal(pSkipList, (char*)(cond.end ? cond.end->v: NULL), pSkipList->keyInfo.type, TSDB_ORDER_DESC);
+  }
+  
+  if (cond.start != NULL) {
+    int32_t optr = cond.start->optr;
+    
+    if (optr == TSDB_RELATION_EQUAL) {   // equals
+      while(tSkipListIterNext(iter)) {
+        SSkipListNode* pNode = tSkipListIterGet(iter);
+
+        int32_t ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v);
+        if (ret != 0) {
+          break;
+        }
+
+        STableKeyInfo info = {.pTable = *(void**)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+        taosArrayPush(result, &info);
+      }
+    } else if (optr == TSDB_RELATION_GREATER || optr == TSDB_RELATION_GREATER_EQUAL) { // greater equal
+      bool comp = true;
+      int32_t ret = 0;
+      
+      while(tSkipListIterNext(iter)) {
+        SSkipListNode* pNode = tSkipListIterGet(iter);
+    
+        if (comp) {
+          ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v);
+          assert(ret >= 0);
+        }
+        
+        if (ret == 0 && optr == TSDB_RELATION_GREATER) {
+          continue;
+        } else {
+          STableKeyInfo info = {.pTable = *(void**)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+          taosArrayPush(result, &info);
+          comp = false;
+        }
+      }
+    } else if (optr == TSDB_RELATION_NOT_EQUAL) {   // not equal
+      bool comp = true;
+      
+      while(tSkipListIterNext(iter)) {
+        SSkipListNode* pNode = tSkipListIterGet(iter);
+        comp = comp && (pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v) == 0);
+        if (comp) {
+          continue;
+        }
+
+        STableKeyInfo info = {.pTable = *(void**)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+        taosArrayPush(result, &info);
+      }
+      
+      tSkipListDestroyIter(iter);
+  
+      comp = true;
+      iter = tSkipListCreateIterFromVal(pSkipList, (char*) cond.start->v, pSkipList->keyInfo.type, TSDB_ORDER_DESC);
+      while(tSkipListIterNext(iter)) {
+        SSkipListNode* pNode = tSkipListIterGet(iter);
+        comp = comp && (pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.start->v) == 0);
+        if (comp) {
+          continue;
+        }
+
+        STableKeyInfo info = {.pTable = *(void**)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+        taosArrayPush(result, &info);
+      }
+  
+    } else {
+      assert(0);
+    }
+  } else {
+    int32_t optr = cond.end ? cond.end->optr : TSDB_RELATION_INVALID;
+    if (optr == TSDB_RELATION_LESS || optr == TSDB_RELATION_LESS_EQUAL) {
+      bool    comp = true;
+      int32_t ret = 0;
+
+      while (tSkipListIterNext(iter)) {
+        SSkipListNode *pNode = tSkipListIterGet(iter);
+
+        if (comp) {
+          ret = pQueryInfo->compare(SL_GET_NODE_KEY(pSkipList, pNode), cond.end->v);
+          assert(ret <= 0);
+        }
+
+        if (ret == 0 && optr == TSDB_RELATION_LESS) {
+          continue;
+        } else {
+          STableKeyInfo info = {.pTable = *(void **)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+          taosArrayPush(result, &info);
+          comp = false;  // no need to compare anymore
+        }
+      }
+    } else {
+      assert(pQueryInfo->optr == TSDB_RELATION_ISNULL || pQueryInfo->optr == TSDB_RELATION_NOTNULL);
+
+      while (tSkipListIterNext(iter)) {
+        SSkipListNode *pNode = tSkipListIterGet(iter);
+
+        bool isnull = isNull(SL_GET_NODE_KEY(pSkipList, pNode), pQueryInfo->sch.type);
+        if ((pQueryInfo->optr == TSDB_RELATION_ISNULL && isnull) ||
+            (pQueryInfo->optr == TSDB_RELATION_NOTNULL && (!isnull))) {
+          STableKeyInfo info = {.pTable = *(void **)SL_GET_NODE_DATA(pNode), .lastKey = TSKEY_INITIAL_VAL};
+          taosArrayPush(result, &info);
+        }
+      }
+    }
+  }
+
+  free(cond.start);
+  free(cond.end);
+  tSkipListDestroyIter(iter);
+}
+
+int32_t merge(SArray *pLeft, SArray *pRight, SArray *pFinalRes) {
+//  assert(pFinalRes->pRes == 0);
+//
+//  pFinalRes->pRes = calloc((size_t)(pLeft->num + pRight->num), POINTER_BYTES);
+//  pFinalRes->num = 0;
+//
+//  // sort according to address
+//  tSkipListNode **pLeftNodes = (tSkipListNode **)pLeft->pRes;
+//  qsort(pLeftNodes, pLeft->num, sizeof(pLeft->pRes[0]), compareByAddr);
+//
+//  tSkipListNode **pRightNodes = (tSkipListNode **)pRight->pRes;
+//  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];
+//
+//    if (ret < 0) {
+//      pFinalRes->pRes[pFinalRes->num++] = pLeftNodes[i++];
+//    } else if (ret > 0) {
+//      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
+//    } else {  // pNode->key > pkey[i]
+//      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
+//      i++;
+//    }
+//  }
+//
+//  while (i < pLeft->num) {
+//    pFinalRes->pRes[pFinalRes->num++] = pLeftNodes[i++];
+//  }
+//
+//  while (j < pRight->num) {
+//    pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j++];
+//  }
+//
+//  return pFinalRes->num;
+  return 0;
+}
+
+int32_t intersect(SArray *pLeft, SArray *pRight, SArray *pFinalRes) {
+//  int64_t num = MIN(pLeft->num, pRight->num);
+//
+//  assert(pFinalRes->pRes == 0);
+//
+//  pFinalRes->pRes = calloc(num, POINTER_BYTES);
+//  pFinalRes->num = 0;
+//
+//  // sort according to address
+//  tSkipListNode **pLeftNodes = (tSkipListNode **)pLeft->pRes;
+//  qsort(pLeftNodes, pLeft->num, sizeof(pLeft->pRes[0]), compareByAddr);
+//
+//  tSkipListNode **pRightNodes = (tSkipListNode **)pRight->pRes;
+//  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];
+//
+//    if (ret < 0) {
+//      i++;
+//    } else if (ret > 0) {
+//      j++;
+//    } else {  // pNode->key > pkey[i]
+//      pFinalRes->pRes[pFinalRes->num++] = pRightNodes[j];
+//      i++;
+//      j++;
+//    }
+//  }
+//
+//  return pFinalRes->num;
+ return 0;
+}
+
+/*
+ * traverse the result and apply the function to each item to check if the item is qualified or not
+ */
+static void tArrayTraverse(tExprNode *pExpr, __result_filter_fn_t fp, SArray *pResult) {
+  assert(pExpr->_node.pLeft->nodeType == TSQL_NODE_COL && pExpr->_node.pRight->nodeType == TSQL_NODE_VALUE && fp != NULL);
+
+  //  scan the result array list and check for each item in the list
+  for (int32_t i = 0; i < taosArrayGetSize(pResult); ++i) {
+    void* item = taosArrayGet(pResult, i);
+    if (fp(item, pExpr->_node.info)) {
+      i++;
+    } else {
+      taosArrayRemove(pResult, i);
+    }
+  }
+}
+
+static bool filterItem(tExprNode *pExpr, const void *pItem, SExprTraverseSupp *param) {
+  tExprNode *pLeft = pExpr->_node.pLeft;
+  tExprNode *pRight = pExpr->_node.pRight;
+
+  //non-leaf nodes, recursively traverse the expression tree in the post-root order
+  if (pLeft->nodeType == TSQL_NODE_EXPR && pRight->nodeType == TSQL_NODE_EXPR) {
+    if (pExpr->_node.optr == TSDB_RELATION_OR) {  // or
+      if (filterItem(pLeft, pItem, param)) {
+        return true;
+      }
+
+      // left child does not satisfy the query condition, try right child
+      return filterItem(pRight, pItem, param);
+    } else {  // and
+      if (!filterItem(pLeft, pItem, param)) {
+        return false;
+      }
+
+      return filterItem(pRight, pItem, param);
+    }
+  }
+
+  // handle the leaf node
+  assert(pLeft->nodeType == TSQL_NODE_COL && pRight->nodeType == TSQL_NODE_VALUE);
+  param->setupInfoFn(pExpr, param->pExtInfo);
+
+  return param->nodeFilterFn(pItem, pExpr->_node.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 exprTreeTraverseImpl(tExprNode *pExpr, SArray *pResult, SExprTraverseSupp *param) {
+  size_t size = taosArrayGetSize(pResult);
+  
+  SArray* array = taosArrayInit(size, POINTER_BYTES);
+  for (int32_t i = 0; i < size; ++i) {
+    void *pItem = taosArrayGetP(pResult, i);
+
+    if (filterItem(pExpr, pItem, param)) {
+      taosArrayPush(array, &pItem);
+    }
+  }
+  
+  taosArrayCopy(pResult, array);
+  taosArrayDestroy(array);
+}
+
+static void tSQLBinaryTraverseOnSkipList(tExprNode *pExpr, SArray *pResult, SSkipList *pSkipList, SExprTraverseSupp *param ) {
+  SSkipListIterator* iter = tSkipListCreateIter(pSkipList);
+
+  while (tSkipListIterNext(iter)) {
+    SSkipListNode *pNode = tSkipListIterGet(iter);
+    if (filterItem(pExpr, pNode, param)) {
+      taosArrayPush(pResult, SL_GET_NODE_DATA(pNode));
+    }
+  }
+  tSkipListDestroyIter(iter);
+}
+
+static void tQueryIndexlessColumn(SSkipList* pSkipList, tQueryInfo* pQueryInfo, SArray* res, __result_filter_fn_t filterFp) {
+  SSkipListIterator* iter = tSkipListCreateIter(pSkipList);
+
+  while (tSkipListIterNext(iter)) {
+    bool addToResult = false;
+
+    SSkipListNode *pNode = tSkipListIterGet(iter);
+    char *         pData = SL_GET_NODE_DATA(pNode);
+
+    tstr *name = (tstr*) tsdbGetTableName(*(void**) pData);
+
+    // todo speed up by using hash
+    if (pQueryInfo->sch.colId == TSDB_TBNAME_COLUMN_INDEX) {
+      if (pQueryInfo->optr == TSDB_RELATION_IN) {
+        addToResult = pQueryInfo->compare(name, pQueryInfo->q);
+      } else if (pQueryInfo->optr == TSDB_RELATION_LIKE) {
+        addToResult = !pQueryInfo->compare(name, pQueryInfo->q);
+      }
+    } else {
+      addToResult = filterFp(pNode, pQueryInfo);
+    }
+
+    if (addToResult) {
+      STableKeyInfo info = {.pTable = *(void**)pData, .lastKey = TSKEY_INITIAL_VAL};
+      taosArrayPush(res, &info);
+    }
+  }
+
+  tSkipListDestroyIter(iter);
+}
+
+// post-root order traverse syntax tree
+void tExprTreeTraverse(tExprNode *pExpr, SSkipList *pSkipList, SArray *result, SExprTraverseSupp *param) {
+  if (pExpr == NULL) {
+    return;
+  }
+
+  tExprNode *pLeft  = pExpr->_node.pLeft;
+  tExprNode *pRight = pExpr->_node.pRight;
+
+  // column project
+  if (pLeft->nodeType != TSQL_NODE_EXPR && pRight->nodeType != TSQL_NODE_EXPR) {
+    assert(pLeft->nodeType == TSQL_NODE_COL && (pRight->nodeType == TSQL_NODE_VALUE || pRight->nodeType == TSQL_NODE_DUMMY));
+
+    param->setupInfoFn(pExpr, param->pExtInfo);
+    if (pSkipList == NULL) {
+      tArrayTraverse(pExpr, param->nodeFilterFn, result);
+      return;
+    }
+
+    tQueryInfo *pQueryInfo = pExpr->_node.info;
+    if (pQueryInfo->indexed && pQueryInfo->optr != TSDB_RELATION_LIKE) {
+      tQueryIndexColumn(pSkipList, pQueryInfo, result);
+    } else {
+      tQueryIndexlessColumn(pSkipList, pQueryInfo, result, param->nodeFilterFn);
+    }
+
+    return;
+  }
+
+  // recursive traverse left child branch
+  uint8_t weight = pLeft->_node.hasPK + pRight->_node.hasPK;
+
+  if (weight == 0 ) {
+    if (taosArrayGetSize(result) > 0 && pSkipList == NULL) {
+    /**
+     * Perform the filter operation based on the initial filter result, which is obtained from filtering from index.
+     * Since no index presented, the filter operation is done by scan all elements in the result set.
+     *
+     * if the query is a high selectivity filter, only small portion of meters are retrieved.
+     */
+      exprTreeTraverseImpl(pExpr, result, param);
+    } else {
+      /**
+       * apply the hierarchical expression to every node in skiplist for find the qualified nodes
+       */
+      assert(taosArrayGetSize(result) == 0);
+      tSQLBinaryTraverseOnSkipList(pExpr, result, pSkipList, param);
+    }
+    return;
+  }
+  
+  if (weight == 2 || (weight == 1 && pExpr->_node.optr == TSDB_RELATION_OR)) {
+    SArray* rLeft  = taosArrayInit(10, POINTER_BYTES);
+    SArray* rRight = taosArrayInit(10, POINTER_BYTES);
+
+    tExprTreeTraverse(pLeft, pSkipList, rLeft, param);
+    tExprTreeTraverse(pRight, pSkipList, rRight, param);
+
+    if (pExpr->_node.optr == TSDB_RELATION_AND) {  // CROSS
+      intersect(rLeft, rRight, result);
+    } else if (pExpr->_node.optr == TSDB_RELATION_OR) {  // or
+      merge(rLeft, rRight, result);
+    } else {
+      assert(false);
+    }
+
+    taosArrayDestroy(rLeft);
+    taosArrayDestroy(rRight);
+    return;
+  }
+
+  /*
+    * (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.
+    */
+  assert(pExpr->_node.optr == TSDB_RELATION_AND);
+
+  tExprNode *pFirst = NULL;
+  tExprNode *pSecond = NULL;
+  if (pLeft->_node.hasPK == 1) {
+    pFirst = pLeft;
+    pSecond = pRight;
+  } else {
+    pFirst = pRight;
+    pSecond = pLeft;
+  }
+
+  assert(pFirst != pSecond && pFirst != NULL && pSecond != NULL);
+
+  // we filter the result based on the skiplist index in the first place
+  tExprTreeTraverse(pFirst, pSkipList, result, param);
+
+  /*
+    * recursively perform the filter operation based on the initial results,
+    * So, we do not set the skip list index as a parameter
+    */
+  tExprTreeTraverse(pSecond, NULL, result, param);
+}
+
+void tExprTreeCalcTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order,
+                                char *(*getSourceDataBlock)(void *, const char*, int32_t)) {
+  if (pExprs == NULL) {
+    return;
+  }
+
+  tExprNode *pLeft = pExprs->_node.pLeft;
+  tExprNode *pRight = pExprs->_node.pRight;
+
+  /* the left output has result from the left child syntax tree */
+  char *pLeftOutput = (char*)malloc(sizeof(int64_t) * numOfRows);
+  if (pLeft->nodeType == TSQL_NODE_EXPR) {
+    tExprTreeCalcTraverse(pLeft, numOfRows, pLeftOutput, param, order, getSourceDataBlock);
+  }
+
+  /* the right output has result from the right child syntax tree */
+  char *pRightOutput = malloc(sizeof(int64_t) * numOfRows);
+  if (pRight->nodeType == TSQL_NODE_EXPR) {
+    tExprTreeCalcTraverse(pRight, numOfRows, pRightOutput, param, order, getSourceDataBlock);
+  }
+
+  if (pLeft->nodeType == TSQL_NODE_EXPR) {
+    if (pRight->nodeType == TSQL_NODE_EXPR) {
+      /*
+       * 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->_node.optr);
+      fp(pLeftOutput, pRightOutput, numOfRows, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_COL) {  // exprLeft + columnRight
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(TSDB_DATA_TYPE_DOUBLE, pRight->pSchema->type, pExprs->_node.optr);
+      // set input buffer
+      char *pInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->pSchema->colId);
+      fp(pLeftOutput, pInputData, numOfRows, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // exprLeft + 12
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(TSDB_DATA_TYPE_DOUBLE, pRight->pVal->nType, pExprs->_node.optr);
+      fp(pLeftOutput, &pRight->pVal->i64Key, numOfRows, 1, pOutput, order);
+    }
+  } else if (pLeft->nodeType == TSQL_NODE_COL) {
+    // column data specified on left-hand-side
+    char *pLeftInputData = getSourceDataBlock(param, pLeft->pSchema->name, pLeft->pSchema->colId);
+    if (pRight->nodeType == TSQL_NODE_EXPR) {  // columnLeft + expr2
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, TSDB_DATA_TYPE_DOUBLE, pExprs->_node.optr);
+      fp(pLeftInputData, pRightOutput, numOfRows, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_COL) {  // columnLeft + columnRight
+      // column data specified on right-hand-side
+      char *pRightInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->pSchema->colId);
+
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pSchema->type, pExprs->_node.optr);
+      fp(pLeftInputData, pRightInputData, numOfRows, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // columnLeft + 12
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pSchema->type, pRight->pVal->nType, pExprs->_node.optr);
+      fp(pLeftInputData, &pRight->pVal->i64Key, numOfRows, 1, pOutput, order);
+    }
+  } else {
+    // column data specified on left-hand-side
+    if (pRight->nodeType == TSQL_NODE_EXPR) {  // 12 + expr2
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, TSDB_DATA_TYPE_DOUBLE, pExprs->_node.optr);
+      fp(&pLeft->pVal->i64Key, pRightOutput, 1, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_COL) {  // 12 + columnRight
+      // column data specified on right-hand-side
+      char *pRightInputData = getSourceDataBlock(param, pRight->pSchema->name, pRight->pSchema->colId);
+      
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, pRight->pSchema->type, pExprs->_node.optr);
+      fp(&pLeft->pVal->i64Key, pRightInputData, 1, numOfRows, pOutput, order);
+
+    } else if (pRight->nodeType == TSQL_NODE_VALUE) {  // 12 + 12
+      _bi_consumer_fn_t fp = tGetBiConsumerFn(pLeft->pVal->nType, pRight->pVal->nType, pExprs->_node.optr);
+      fp(&pLeft->pVal->i64Key, &pRight->pVal->i64Key, 1, 1, pOutput, order);
+    }
+  }
+
+  free(pLeftOutput);
+  free(pRightOutput);
+}
+
+static void exprTreeToBinaryImpl(SBufferWriter* bw, tExprNode* expr) {
+  tbufWriteUint8(bw, expr->nodeType);
+  
+  if (expr->nodeType == TSQL_NODE_VALUE) {
+    tVariant* pVal = expr->pVal;
+    
+    tbufWriteUint32(bw, pVal->nType);
+    if (pVal->nType == TSDB_DATA_TYPE_BINARY) {
+      tbufWriteInt32(bw, pVal->nLen);
+      tbufWrite(bw, pVal->pz, pVal->nLen);
+    } else {
+      tbufWriteInt64(bw, pVal->i64Key);
+    }
+    
+  } else if (expr->nodeType == TSQL_NODE_COL) {
+    SSchema* pSchema = expr->pSchema;
+    tbufWriteInt16(bw, pSchema->colId);
+    tbufWriteInt16(bw, pSchema->bytes);
+    tbufWriteUint8(bw, pSchema->type);
+    tbufWriteString(bw, pSchema->name);
+    
+  } else if (expr->nodeType == TSQL_NODE_EXPR) {
+    tbufWriteUint8(bw, expr->_node.optr);
+    tbufWriteUint8(bw, expr->_node.hasPK);
+    exprTreeToBinaryImpl(bw, expr->_node.pLeft);
+    exprTreeToBinaryImpl(bw, expr->_node.pRight);
+  }
+}
+
+void exprTreeToBinary(SBufferWriter* bw, tExprNode* expr) {
+  if (expr != NULL) {
+    exprTreeToBinaryImpl(bw, expr);
+  }
+}
+
+// TODO: these three functions should be made global
+static void* exception_calloc(size_t nmemb, size_t size) {
+  void* p = calloc(nmemb, size);
+  if (p == NULL) {
+    THROW(TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+  return p;
+}
+
+static void* exception_malloc(size_t size) {
+  void* p = malloc(size);
+  if (p == NULL) {
+    THROW(TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+  return p;
+}
+
+static UNUSED_FUNC char* exception_strdup(const char* str) {
+  char* p = strdup(str);
+  if (p == NULL) {
+    THROW(TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+  return p;
+}
+
+static tExprNode* exprTreeFromBinaryImpl(SBufferReader* br) {
+  int32_t anchor = CLEANUP_GET_ANCHOR();
+  if (CLEANUP_EXCEED_LIMIT()) {
+    THROW(TSDB_CODE_QRY_EXCEED_TAGS_LIMIT);
+    return NULL;
+  }
+
+  tExprNode* pExpr = exception_calloc(1, sizeof(tExprNode));
+  CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, pExpr, NULL);
+  pExpr->nodeType = tbufReadUint8(br);
+  
+  if (pExpr->nodeType == TSQL_NODE_VALUE) {
+    tVariant* pVal = exception_calloc(1, sizeof(tVariant));
+    pExpr->pVal = pVal;
+  
+    pVal->nType = tbufReadUint32(br);
+    if (pVal->nType == TSDB_DATA_TYPE_BINARY) {
+      tbufReadToBuffer(br, &pVal->nLen, sizeof(pVal->nLen));
+      pVal->pz = calloc(1, pVal->nLen + 1);
+      tbufReadToBuffer(br, pVal->pz, pVal->nLen);
+    } else {
+      pVal->i64Key = tbufReadInt64(br);
+    }
+    
+  } else if (pExpr->nodeType == TSQL_NODE_COL) {
+    SSchema* pSchema = exception_calloc(1, sizeof(SSchema));
+    pExpr->pSchema = pSchema;
+
+    pSchema->colId = tbufReadInt16(br);
+    pSchema->bytes = tbufReadInt16(br);
+    pSchema->type = tbufReadUint8(br);
+    tbufReadToString(br, pSchema->name, TSDB_COL_NAME_LEN);
+    
+  } else if (pExpr->nodeType == TSQL_NODE_EXPR) {
+    pExpr->_node.optr = tbufReadUint8(br);
+    pExpr->_node.hasPK = tbufReadUint8(br);
+    pExpr->_node.pLeft = exprTreeFromBinaryImpl(br);
+    pExpr->_node.pRight = exprTreeFromBinaryImpl(br);
+    assert(pExpr->_node.pLeft != NULL && pExpr->_node.pRight != NULL);
+  }
+  
+  CLEANUP_EXECUTE_TO(anchor, false);
+  return pExpr;
+}
+
+tExprNode* exprTreeFromBinary(const void* data, size_t size) {
+  if (size == 0) {
+    return NULL;
+  }
+  SBufferReader br = tbufInitReader(data, size, false);
+  return exprTreeFromBinaryImpl(&br);
+}
+
+tExprNode* exprTreeFromTableName(const char* tbnameCond) {
+  if (!tbnameCond) {
+    return NULL;
+  }
+
+  int32_t anchor = CLEANUP_GET_ANCHOR();
+
+  tExprNode* expr = exception_calloc(1, sizeof(tExprNode));
+  CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, expr, NULL);
+
+  expr->nodeType = TSQL_NODE_EXPR;
+
+  tExprNode* left = exception_calloc(1, sizeof(tExprNode));
+  expr->_node.pLeft = left;
+
+  left->nodeType = TSQL_NODE_COL;
+  SSchema* pSchema = exception_calloc(1, sizeof(SSchema));
+  left->pSchema = pSchema;
+
+  pSchema->type = TSDB_DATA_TYPE_BINARY;
+  pSchema->bytes = TSDB_TABLE_NAME_LEN - 1;
+  strcpy(pSchema->name, TSQL_TBNAME_L);
+  pSchema->colId = -1;
+
+  tExprNode* right = exception_calloc(1, sizeof(tExprNode));
+  expr->_node.pRight = right;
+
+  if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN) == 0) {
+    right->nodeType = TSQL_NODE_VALUE;
+    expr->_node.optr = TSDB_RELATION_LIKE;
+    tVariant* pVal = exception_calloc(1, sizeof(tVariant));
+    right->pVal = pVal;
+    size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN) + 1;
+    pVal->pz = exception_malloc(len);
+    memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN, len);
+    pVal->nType = TSDB_DATA_TYPE_BINARY;
+    pVal->nLen = (int32_t)len;
+
+  } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN) == 0) {
+    right->nodeType = TSQL_NODE_VALUE;
+    expr->_node.optr = TSDB_RELATION_IN;
+    tVariant* pVal = exception_calloc(1, sizeof(tVariant));
+    right->pVal = pVal;
+    pVal->nType = TSDB_DATA_TYPE_ARRAY;
+    pVal->arr = taosArrayInit(2, POINTER_BYTES);
+
+    const char* cond = tbnameCond + QUERY_COND_REL_PREFIX_IN_LEN;
+    for (const char *e = cond; *e != 0; e++) {
+      if (*e == TS_PATH_DELIMITER[0]) {
+        cond = e + 1;
+      } else if (*e == ',') {
+        size_t len = e - cond;
+        char* p = exception_malloc(len + VARSTR_HEADER_SIZE);
+        STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)len);
+        cond += len;
+        taosArrayPush(pVal->arr, &p);
+      }
+    }
+
+    if (*cond != 0) {
+      size_t len = strlen(cond) + VARSTR_HEADER_SIZE;
+      
+      char* p = exception_malloc(len);
+      STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)(len - VARSTR_HEADER_SIZE));
+      taosArrayPush(pVal->arr, &p);
+    }
+
+    taosArraySortString(pVal->arr, taosArrayCompareString);
+  }
+
+  CLEANUP_EXECUTE_TO(anchor, false);
+  return expr;
+}
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
new file mode 100644
index 0000000000000000000000000000000000000000..f2d324e376390e27252c22af0d8c07b5e587b20a
--- /dev/null
+++ b/src/query/src/qExecutor.c
@@ -0,0 +1,7138 @@
+/*
+ * 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 "os.h"
+#include "qFill.h"
+#include "taosmsg.h"
+#include "tcache.h"
+#include "tglobal.h"
+
+#include "exception.h"
+#include "hash.h"
+#include "qAst.h"
+#include "qExecutor.h"
+#include "qResultbuf.h"
+#include "qUtil.h"
+#include "query.h"
+#include "queryLog.h"
+#include "tlosertree.h"
+
+#define MAX_ROWS_PER_RESBUF_PAGE  ((1u<<12) - 1)
+
+/**
+ * check if the primary column is load by default, otherwise, the program will
+ * forced to load primary column explicitly.
+ */
+#define Q_STATUS_EQUAL(p, s)  (((p) & (s)) != 0)
+#define QUERY_IS_ASC_QUERY(q) (GET_FORWARD_DIRECTION_FACTOR((q)->order.order) == QUERY_ASC_FORWARD_STEP)
+
+#define IS_MASTER_SCAN(runtime)        ((runtime)->scanFlag == MASTER_SCAN)
+#define IS_REVERSE_SCAN(runtime)       ((runtime)->scanFlag == REVERSE_SCAN)
+#define SET_MASTER_SCAN_FLAG(runtime)  ((runtime)->scanFlag = MASTER_SCAN)
+#define SET_REVERSE_SCAN_FLAG(runtime) ((runtime)->scanFlag = REVERSE_SCAN)
+
+#define GET_QINFO_ADDR(x) ((SQInfo *)((char *)(x)-offsetof(SQInfo, runtimeEnv)))
+
+#define GET_COL_DATA_POS(query, index, step) ((query)->pos + (index) * (step))
+#define SWITCH_ORDER(n) (((n) = ((n) == TSDB_ORDER_ASC) ? TSDB_ORDER_DESC : TSDB_ORDER_ASC))
+
+#define SDATA_BLOCK_INITIALIZER (SDataBlockInfo) {{0}, 0}
+
+#define TIME_WINDOW_COPY(_dst, _src)  do {\
+   _dst.skey = _src.skey;\
+   _dst.ekey = _src.ekey;\
+} while (0);
+
+enum {
+  // when query starts to execute, this status will set
+  QUERY_NOT_COMPLETED = 0x1u,
+
+  /* result output buffer is full, current query is paused.
+   * this status is only exist in group-by clause and diff/add/division/multiply/ query.
+   */
+  QUERY_RESBUF_FULL = 0x2u,
+
+  /* query is over
+   * 1. this status is used in one row result query process, e.g., count/sum/first/last/ avg...etc.
+   * 2. when all data within queried time window, it is also denoted as query_completed
+   */
+  QUERY_COMPLETED = 0x4u,
+
+  /* when the result is not completed return to client, this status will be
+   * usually used in case of interval query with interpolation option
+   */
+  QUERY_OVER = 0x8u,
+};
+
+enum {
+  TS_JOIN_TS_EQUAL       = 0,
+  TS_JOIN_TS_NOT_EQUALS  = 1,
+  TS_JOIN_TAG_NOT_EQUALS = 2,
+};
+
+typedef struct {
+  int32_t     status;       // query status
+  TSKEY       lastKey;      // the lastKey value before query executed
+  STimeWindow w;            // whole query time window
+  STimeWindow curWindow;    // current query window
+  int32_t     windowIndex;  // index of active time window result for interval query
+  STSCursor   cur;
+} SQueryStatusInfo;
+
+#if 0
+static UNUSED_FUNC void *u_malloc (size_t __size) {
+  uint32_t v = rand();
+
+  if (v % 1000 <= 0) {
+    return NULL;
+  } else {
+    return malloc(__size);
+  }
+}
+
+static UNUSED_FUNC void* u_calloc(size_t num, size_t __size) {
+  uint32_t v = rand();
+  if (v % 1000 <= 0) {
+    return NULL;
+  } else {
+    return calloc(num, __size);
+  }
+}
+
+static UNUSED_FUNC void* u_realloc(void* p, size_t __size) {
+  uint32_t v = rand();
+  if (v % 5 <= 1) {
+    return NULL;
+  } else {
+    return realloc(p, __size);
+  }
+}
+
+#define calloc  u_calloc
+#define malloc  u_malloc
+#define realloc u_realloc
+#endif
+
+#define CLEAR_QUERY_STATUS(q, st)   ((q)->status &= (~(st)))
+#define GET_NUM_OF_TABLEGROUP(q)    taosArrayGetSize((q)->tableqinfoGroupInfo.pGroupList)
+#define GET_TABLEGROUP(q, _index)   ((SArray*) taosArrayGetP((q)->tableqinfoGroupInfo.pGroupList, (_index)))
+
+static void setQueryStatus(SQuery *pQuery, int8_t status);
+static void finalizeQueryResult(SQueryRuntimeEnv *pRuntimeEnv);
+
+#define QUERY_IS_INTERVAL_QUERY(_q) ((_q)->interval.interval > 0)
+
+static void getNextTimeWindow(SQuery* pQuery, STimeWindow* tw) {
+  int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+  if (pQuery->interval.intervalUnit != 'n' && pQuery->interval.intervalUnit != 'y') {
+    tw->skey += pQuery->interval.sliding * factor;
+    tw->ekey = tw->skey + pQuery->interval.interval - 1;
+    return;
+  }
+
+  int64_t key = tw->skey / 1000, interval = pQuery->interval.interval;
+  if (pQuery->precision == TSDB_TIME_PRECISION_MICRO) {
+    key /= 1000;
+  }
+  if (pQuery->interval.intervalUnit == 'y') {
+    interval *= 12;
+  }
+
+  struct tm tm;
+  time_t t = (time_t)key;
+  localtime_r(&t, &tm);
+
+  int mon = (int)(tm.tm_year * 12 + tm.tm_mon + interval * factor);
+  tm.tm_year = mon / 12;
+  tm.tm_mon = mon % 12;
+  tw->skey = mktime(&tm) * 1000L;
+
+  mon = (int)(mon + interval);
+  tm.tm_year = mon / 12;
+  tm.tm_mon = mon % 12;
+  tw->ekey = mktime(&tm) * 1000L;
+
+  if (pQuery->precision == TSDB_TIME_PRECISION_MICRO) {
+    tw->skey *= 1000L;
+    tw->ekey *= 1000L;
+  }
+  tw->ekey -= 1;
+}
+
+#define GET_NEXT_TIMEWINDOW(_q, tw) getNextTimeWindow((_q), (tw))
+
+#define SET_STABLE_QUERY_OVER(_q) ((_q)->tableIndex = (int32_t)((_q)->tableqinfoGroupInfo.numOfTables))
+#define IS_STASBLE_QUERY_OVER(_q) ((_q)->tableIndex >= (int32_t)((_q)->tableqinfoGroupInfo.numOfTables))
+
+// todo move to utility
+static int32_t mergeIntoGroupResultImpl(SQInfo *pQInfo, SArray *group);
+
+static void setWindowResOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pResult);
+static void setWindowResOutputBufInitCtx(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pResult);
+static void resetMergeResultBuf(SQuery *pQuery, SQLFunctionCtx *pCtx, SResultInfo *pResultInfo);
+static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId);
+
+static void setExecParams(SQuery *pQuery, SQLFunctionCtx *pCtx, void* inputData, TSKEY *tsCol, SDataBlockInfo* pBlockInfo,
+                          SDataStatis *pStatis, void *param, int32_t colIndex);
+
+static void initCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv);
+static void destroyTableQueryInfoImpl(STableQueryInfo *pTableQueryInfo);
+static void resetCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv);
+static bool hasMainOutput(SQuery *pQuery);
+static void buildTagQueryResult(SQInfo *pQInfo);
+
+static int32_t setAdditionalInfo(SQInfo *pQInfo, void *pTable, STableQueryInfo *pTableQueryInfo);
+static int32_t flushFromResultBuf(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGroupResInfo);
+
+bool doFilterData(SQuery *pQuery, int32_t elemPos) {
+  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
+    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
+
+    char *pElem = (char*)pFilterInfo->pData + pFilterInfo->info.bytes * elemPos;
+
+    bool qualified = false;
+    for (int32_t j = 0; j < pFilterInfo->numOfFilters; ++j) {
+      SColumnFilterElem *pFilterElem = &pFilterInfo->pFilters[j];
+
+      bool isnull = isNull(pElem, pFilterInfo->info.type);
+      if (isnull) {
+        if (pFilterElem->fp == isNull_filter) {
+          qualified = true;
+          break;
+        } else {
+          continue;
+        }
+      } else {
+        if (pFilterElem->fp == notNull_filter) {
+          qualified = true;
+          break;
+        } else if (pFilterElem->fp == isNull_filter) {
+          continue;
+        }
+      }
+
+      if (pFilterElem->fp(pFilterElem, pElem, pElem)) {
+        qualified = true;
+        break;
+      }
+    }
+
+    if (!qualified) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+int64_t getNumOfResult(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  bool    hasMainFunction = hasMainOutput(pQuery);
+
+  int64_t maxOutput = 0;
+  for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+    int32_t functionId = pQuery->pSelectExpr[j].base.functionId;
+
+    /*
+     * ts, tag, tagprj function can not decide the output number of current query
+     * the number of output result is decided by main output
+     */
+    if (hasMainFunction &&
+        (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ)) {
+      continue;
+    }
+
+    SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
+    if (pResInfo != NULL && maxOutput < pResInfo->numOfRes) {
+      maxOutput = pResInfo->numOfRes;
+    }
+  }
+
+  assert(maxOutput >= 0);
+  return maxOutput;
+}
+
+/*
+ * the value of number of result needs to be update due to offset value upated.
+ */
+void updateNumOfResult(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOfRes) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+    SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
+
+    int16_t functionId = pRuntimeEnv->pCtx[j].functionId;
+    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ ||
+        functionId == TSDB_FUNC_TS_DUMMY) {
+      continue;
+    }
+
+    assert(pResInfo->numOfRes > numOfRes);
+    pResInfo->numOfRes = numOfRes;
+  }
+}
+
+static UNUSED_FUNC int32_t getGroupResultId(int32_t groupIndex) {
+  int32_t base = 20000000;
+  return base + (groupIndex * 10000);
+}
+
+bool isGroupbyNormalCol(SSqlGroupbyExpr *pGroupbyExpr) {
+  if (pGroupbyExpr == NULL || pGroupbyExpr->numOfGroupCols == 0) {
+    return false;
+  }
+
+  for (int32_t i = 0; i < pGroupbyExpr->numOfGroupCols; ++i) {
+    SColIndex *pColIndex = taosArrayGet(pGroupbyExpr->columnInfo, i);
+    if (TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) {
+      //make sure the normal column locates at the second position if tbname exists in group by clause
+      if (pGroupbyExpr->numOfGroupCols > 1) {
+        assert(pColIndex->colIndex > 0);
+      }
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+int16_t getGroupbyColumnType(SQuery *pQuery, SSqlGroupbyExpr *pGroupbyExpr) {
+  assert(pGroupbyExpr != NULL);
+
+  int32_t colId = -2;
+  int16_t type = TSDB_DATA_TYPE_NULL;
+
+  for (int32_t i = 0; i < pGroupbyExpr->numOfGroupCols; ++i) {
+    SColIndex *pColIndex = taosArrayGet(pGroupbyExpr->columnInfo, i);
+    if (TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) {
+      colId = pColIndex->colId;
+      break;
+    }
+  }
+
+  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
+    if (colId == pQuery->colList[i].colId) {
+      type = pQuery->colList[i].type;
+      break;
+    }
+  }
+
+  return type;
+}
+
+bool isSelectivityWithTagsQuery(SQuery *pQuery) {
+  bool    hasTags = false;
+  int32_t numOfSelectivity = 0;
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functId = pQuery->pSelectExpr[i].base.functionId;
+    if (functId == TSDB_FUNC_TAG_DUMMY || functId == TSDB_FUNC_TS_DUMMY) {
+      hasTags = true;
+      continue;
+    }
+
+    if ((aAggs[functId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+      numOfSelectivity++;
+    }
+  }
+
+  if (numOfSelectivity > 0 && hasTags) {
+    return true;
+  }
+
+  return false;
+}
+
+bool isProjQuery(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functId = pQuery->pSelectExpr[i].base.functionId;
+    if (functId != TSDB_FUNC_PRJ && functId != TSDB_FUNC_TAGPRJ) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool isTSCompQuery(SQuery *pQuery) { return pQuery->pSelectExpr[0].base.functionId == TSDB_FUNC_TS_COMP; }
+
+static bool limitResults(SQueryRuntimeEnv* pRuntimeEnv) {
+  SQInfo* pQInfo = GET_QINFO_ADDR(pRuntimeEnv);
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+
+  if ((pQuery->limit.limit > 0) && (pQuery->rec.total + pQuery->rec.rows > pQuery->limit.limit)) {
+    pQuery->rec.rows = pQuery->limit.limit - pQuery->rec.total;
+
+    qDebug("QInfo:%p discard remain data due to result limitation, limit:%"PRId64", current return:%" PRId64 ", total:%"PRId64,
+        pQInfo, pQuery->limit.limit, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
+    assert(pQuery->rec.rows >= 0);
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+    return true;
+  }
+
+  return false;
+}
+
+static bool isTopBottomQuery(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TS) {
+      continue;
+    }
+
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static bool hasTagValOutput(SQuery* pQuery) {
+  SExprInfo *pExprInfo = &pQuery->pSelectExpr[0];
+  if (pQuery->numOfOutput == 1 && pExprInfo->base.functionId == TSDB_FUNC_TS_COMP) {
+    return true;
+  } else {  // set tag value, by which the results are aggregated.
+    for (int32_t idx = 0; idx < pQuery->numOfOutput; ++idx) {
+      SExprInfo *pLocalExprInfo = &pQuery->pSelectExpr[idx];
+
+      // ts_comp column required the tag value for join filter
+      if (TSDB_COL_IS_TAG(pLocalExprInfo->base.colInfo.flag)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+/**
+ * @param pQuery
+ * @param col
+ * @param pDataBlockInfo
+ * @param pStatis
+ * @param pColStatis
+ * @return
+ */
+static bool hasNullValue(SColIndex* pColIndex, SDataStatis *pStatis, SDataStatis **pColStatis) {
+  if (pStatis != NULL && TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) {
+    *pColStatis = &pStatis[pColIndex->colIndex];
+    assert((*pColStatis)->colId == pColIndex->colId);
+  } else {
+    *pColStatis = NULL;
+  }
+
+  if (TSDB_COL_IS_TAG(pColIndex->flag) || TSDB_COL_IS_UD_COL(pColIndex->flag) || pColIndex->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+    return false;
+  }
+
+  if ((*pColStatis) != NULL && (*pColStatis)->numOfNull == 0) {
+    return false;
+  }
+
+  return true;
+}
+
+static SWindowResult *doSetTimeWindowFromKey(SQueryRuntimeEnv *pRuntimeEnv, SWindowResInfo *pWindowResInfo, char *pData,
+                                             int16_t bytes, bool masterscan) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  int32_t *p1 = (int32_t *) taosHashGet(pWindowResInfo->hashList, pData, bytes);
+  if (p1 != NULL) {
+    pWindowResInfo->curIndex = *p1;
+  } else {
+    if (!masterscan) {  // not master scan, do not add new timewindow
+      return NULL;
+    }
+
+    // more than the capacity, reallocate the resources
+    if (pWindowResInfo->size >= pWindowResInfo->capacity) {
+      int64_t newCap = 0;
+      if (pWindowResInfo->capacity > 10000) {
+        newCap = (int64_t)(pWindowResInfo->capacity * 1.25);
+      } else {
+        newCap = (int64_t)(pWindowResInfo->capacity * 1.5);
+      }
+
+      char *t = realloc(pWindowResInfo->pResult, (size_t)(newCap * sizeof(SWindowResult)));
+      pRuntimeEnv->summary.internalSupSize += (newCap - pWindowResInfo->capacity) * sizeof(SWindowResult);
+      pRuntimeEnv->summary.numOfTimeWindows += (newCap - pWindowResInfo->capacity);
+
+      if (t == NULL) {
+        longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+      }
+
+      pWindowResInfo->pResult = (SWindowResult *)t;
+
+      int32_t inc = (int32_t)newCap - pWindowResInfo->capacity;
+      memset(&pWindowResInfo->pResult[pWindowResInfo->capacity], 0, sizeof(SWindowResult) * inc);
+
+      pRuntimeEnv->summary.internalSupSize += (pQuery->numOfOutput * sizeof(SResultInfo) + pRuntimeEnv->interBufSize) * inc;
+
+      for (int32_t i = pWindowResInfo->capacity; i < newCap; ++i) {
+        int32_t ret = createQueryResultInfo(pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, pRuntimeEnv->interBufSize);
+        if (ret != TSDB_CODE_SUCCESS) {
+          longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+        }
+      }
+
+      pWindowResInfo->capacity = (int32_t)newCap;
+    }
+
+    // add a new result set for a new group
+    pWindowResInfo->curIndex = pWindowResInfo->size++;
+    taosHashPut(pWindowResInfo->hashList, pData, bytes, (char *)&pWindowResInfo->curIndex, sizeof(int32_t));
+  }
+
+  // too many time window in query
+  if (pWindowResInfo->size > MAX_INTERVAL_TIME_WINDOW) {
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_TOO_MANY_TIMEWINDOW);
+  }
+
+  return getWindowResult(pWindowResInfo, pWindowResInfo->curIndex);
+}
+
+// get the correct time window according to the handled timestamp
+static STimeWindow getActiveTimeWindow(SWindowResInfo *pWindowResInfo, int64_t ts, SQuery *pQuery) {
+  STimeWindow w = {0};
+
+ if (pWindowResInfo->curIndex == -1) {  // the first window, from the previous stored value
+    w.skey = pWindowResInfo->prevSKey;
+    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+      w.ekey = taosTimeAdd(w.skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision);
+    } else {
+      w.ekey = w.skey + pQuery->interval.interval - 1;
+    }
+  } else {
+    int32_t slot = curTimeWindowIndex(pWindowResInfo);
+    SWindowResult* pWindowRes = getWindowResult(pWindowResInfo, slot);
+    w = pWindowRes->win;
+  }
+
+  if (w.skey > ts || w.ekey < ts) {
+    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+      w.skey = taosTimeTruncate(ts, &pQuery->interval, pQuery->precision);
+      w.ekey = taosTimeAdd(w.skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+    } else {
+      int64_t st = w.skey;
+
+      if (st > ts) {
+        st -= ((st - ts + pQuery->interval.sliding - 1) / pQuery->interval.sliding) * pQuery->interval.sliding;
+      }
+
+      int64_t et = st + pQuery->interval.interval - 1;
+      if (et < ts) {
+        st += ((ts - et + pQuery->interval.sliding - 1) / pQuery->interval.sliding) * pQuery->interval.sliding;
+      }
+
+      w.skey = st;
+      w.ekey = w.skey + pQuery->interval.interval - 1;
+    }
+  }
+
+  /*
+   * query border check, skey should not be bounded by the query time range, since the value skey will
+   * be used as the time window index value. So we only change ekey of time window accordingly.
+   */
+  if (w.ekey > pQuery->window.ekey && QUERY_IS_ASC_QUERY(pQuery)) {
+    w.ekey = pQuery->window.ekey;
+  }
+
+  return w;
+}
+
+static int32_t addNewWindowResultBuf(SWindowResult *pWindowRes, SDiskbasedResultBuf *pResultBuf, int32_t sid,
+                                     int32_t numOfRowsPerPage) {
+  if (pWindowRes->pos.pageId != -1) {
+    return 0;
+  }
+
+  tFilePage *pData = NULL;
+
+  // in the first scan, new space needed for results
+  int32_t pageId = -1;
+  SIDList list = getDataBufPagesIdList(pResultBuf, sid);
+
+  if (taosArrayGetSize(list) == 0) {
+    pData = getNewDataBuf(pResultBuf, sid, &pageId);
+  } else {
+    SPageInfo* pi = getLastPageInfo(list);
+    pData = getResBufPage(pResultBuf, pi->pageId);
+    pageId = pi->pageId;
+
+    if (pData->num >= numOfRowsPerPage) {
+      // release current page first, and prepare the next one
+      releaseResBufPageInfo(pResultBuf, pi);
+
+      pData = getNewDataBuf(pResultBuf, sid, &pageId);
+      if (pData != NULL) {
+        assert(pData->num == 0);  // number of elements must be 0 for new allocated buffer
+      }
+    }
+  }
+
+  if (pData == NULL) {
+    return -1;
+  }
+
+  // set the number of rows in current disk page
+  if (pWindowRes->pos.pageId == -1) {  // not allocated yet, allocate new buffer
+    pWindowRes->pos.pageId = pageId;
+    pWindowRes->pos.rowId = (int32_t)(pData->num++);
+
+    assert(pWindowRes->pos.pageId >= 0);
+  }
+
+  return 0;
+}
+
+static int32_t setWindowOutputBufByKey(SQueryRuntimeEnv *pRuntimeEnv, SWindowResInfo *pWindowResInfo, int32_t sid,
+                                       STimeWindow *win, bool masterscan, bool* newWind) {
+  assert(win->skey <= win->ekey);
+  SDiskbasedResultBuf *pResultBuf = pRuntimeEnv->pResultBuf;
+
+  SWindowResult *pWindowRes = doSetTimeWindowFromKey(pRuntimeEnv, pWindowResInfo, (char *)&win->skey,
+      TSDB_KEYSIZE, masterscan);
+  if (pWindowRes == NULL) {
+    *newWind = false;
+
+    return masterscan? -1:0;
+  }
+
+  *newWind = true;
+
+  // not assign result buffer yet, add new result buffer
+  if (pWindowRes->pos.pageId == -1) {
+    int32_t ret = addNewWindowResultBuf(pWindowRes, pResultBuf, sid, pRuntimeEnv->numOfRowsPerPage);
+    if (ret != TSDB_CODE_SUCCESS) {
+      return -1;
+    }
+  }
+
+  // set time window for current result
+  pWindowRes->win = (*win);
+
+  setWindowResOutputBufInitCtx(pRuntimeEnv, pWindowRes);
+  return TSDB_CODE_SUCCESS;
+}
+
+static bool getTimeWindowResStatus(SWindowResInfo *pWindowResInfo, int32_t slot) {
+  assert(slot >= 0 && slot < pWindowResInfo->size);
+  return pWindowResInfo->pResult[slot].closed;
+}
+
+static FORCE_INLINE int32_t getForwardStepsInBlock(int32_t numOfRows, __block_search_fn_t searchFn, TSKEY ekey, int16_t pos,
+                                      int16_t order, int64_t *pData) {
+  int32_t forwardStep = 0;
+
+  if (order == TSDB_ORDER_ASC) {
+    int32_t end = searchFn((char*) &pData[pos], numOfRows - pos, ekey, order);
+    if (end >= 0) {
+      forwardStep = end;
+
+      if (pData[end + pos] == ekey) {
+        forwardStep += 1;
+      }
+    }
+  } else {
+    int32_t end = searchFn((char *)pData, pos + 1, ekey, order);
+    if (end >= 0) {
+      forwardStep = pos - end;
+
+      if (pData[end] == ekey) {
+        forwardStep += 1;
+      }
+    }
+  }
+
+  assert(forwardStep > 0);
+  return forwardStep;
+}
+
+/**
+ * NOTE: the query status only set for the first scan of master scan.
+ */
+static int32_t doCheckQueryCompleted(SQueryRuntimeEnv *pRuntimeEnv, TSKEY lastKey, SWindowResInfo *pWindowResInfo) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  if (pRuntimeEnv->scanFlag != MASTER_SCAN || (!QUERY_IS_INTERVAL_QUERY(pQuery))) {
+    return pWindowResInfo->size;
+  }
+
+  // no qualified results exist, abort check
+  int32_t numOfClosed = 0;
+
+  if (pWindowResInfo->size == 0) {
+    return pWindowResInfo->size;
+  }
+
+  // query completed
+  if ((lastKey >= pQuery->current->win.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+      (lastKey <= pQuery->current->win.ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
+    closeAllTimeWindow(pWindowResInfo);
+
+    pWindowResInfo->curIndex = pWindowResInfo->size - 1;
+    setQueryStatus(pQuery, QUERY_COMPLETED | QUERY_RESBUF_FULL);
+  } else {  // set the current index to be the last unclosed window
+    int32_t i = 0;
+    int64_t skey = TSKEY_INITIAL_VAL;
+
+    for (i = 0; i < pWindowResInfo->size; ++i) {
+      SWindowResult *pResult = &pWindowResInfo->pResult[i];
+      if (pResult->closed) {
+        numOfClosed += 1;
+        continue;
+      }
+
+      TSKEY ekey = pResult->win.ekey;
+      if ((ekey <= lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
+          (pResult->win.skey >= lastKey && !QUERY_IS_ASC_QUERY(pQuery))) {
+        closeTimeWindow(pWindowResInfo, i);
+      } else {
+        skey = pResult->win.skey;
+        break;
+      }
+    }
+
+    // all windows are closed, set the last one to be the skey
+    if (skey == TSKEY_INITIAL_VAL) {
+      assert(i == pWindowResInfo->size);
+      pWindowResInfo->curIndex = pWindowResInfo->size - 1;
+    } else {
+      pWindowResInfo->curIndex = i;
+    }
+
+    pWindowResInfo->prevSKey = pWindowResInfo->pResult[pWindowResInfo->curIndex].win.skey;
+
+    // the number of completed slots are larger than the threshold, return current generated results to client.
+    if (numOfClosed > pWindowResInfo->threshold) {
+      qDebug("QInfo:%p total result window:%d closed:%d, reached the output threshold %d, return",
+          GET_QINFO_ADDR(pRuntimeEnv), pWindowResInfo->size, numOfClosed, pQuery->rec.threshold);
+
+      setQueryStatus(pQuery, QUERY_RESBUF_FULL);
+    } else {
+      qDebug("QInfo:%p total result window:%d already closed:%d", GET_QINFO_ADDR(pRuntimeEnv), pWindowResInfo->size,
+             numOfClosed);
+    }
+  }
+
+  // output has reached the limitation, set query completed
+  if (pQuery->limit.limit > 0 && (pQuery->limit.limit + pQuery->limit.offset) <= numOfClosed &&
+      pRuntimeEnv->scanFlag == MASTER_SCAN) {
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+  }
+
+  assert(pWindowResInfo->prevSKey != TSKEY_INITIAL_VAL);
+  return numOfClosed;
+}
+
+static int32_t getNumOfRowsInTimeWindow(SQuery *pQuery, SDataBlockInfo *pDataBlockInfo, TSKEY *pPrimaryColumn,
+                                        int32_t startPos, TSKEY ekey, __block_search_fn_t searchFn, bool updateLastKey) {
+  assert(startPos >= 0 && startPos < pDataBlockInfo->rows);
+
+  int32_t num   = -1;
+  int32_t order = pQuery->order.order;
+  int32_t step  = GET_FORWARD_DIRECTION_FACTOR(order);
+
+  STableQueryInfo* item = pQuery->current;
+
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    if (ekey < pDataBlockInfo->window.ekey) {
+      num = getForwardStepsInBlock(pDataBlockInfo->rows, searchFn, ekey, startPos, order, pPrimaryColumn);
+      if (updateLastKey) { // update the last key
+        item->lastKey = pPrimaryColumn[startPos + (num - 1)] + step;
+      }
+    } else {
+      num = pDataBlockInfo->rows - startPos;
+      if (updateLastKey) {
+        item->lastKey = pDataBlockInfo->window.ekey + step;
+      }
+    }
+  } else {  // desc
+    if (ekey > pDataBlockInfo->window.skey) {
+      num = getForwardStepsInBlock(pDataBlockInfo->rows, searchFn, ekey, startPos, order, pPrimaryColumn);
+      if (updateLastKey) {  // update the last key
+        item->lastKey = pPrimaryColumn[startPos - (num - 1)] + step;
+      }
+    } else {
+      num = startPos + 1;
+      if (updateLastKey) {
+        item->lastKey = pDataBlockInfo->window.skey + step;
+      }
+    }
+  }
+
+  assert(num > 0);
+  return num;
+}
+
+static void doBlockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, bool closed, STimeWindow *pWin, int32_t offset,
+                                      int32_t forwardStep, TSKEY *tsCol, int32_t numOfTotal) {
+  SQuery *        pQuery = pRuntimeEnv->pQuery;
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+
+  bool hasPrev = pCtx[0].preAggVals.isSet;
+
+  if (IS_MASTER_SCAN(pRuntimeEnv) || closed) {
+    for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+      pCtx[k].nStartQueryTimestamp = pWin->skey;
+      pCtx[k].size = forwardStep;
+      pCtx[k].startOffset = (QUERY_IS_ASC_QUERY(pQuery)) ? offset : offset - (forwardStep - 1);
+
+      int32_t functionId = pQuery->pSelectExpr[k].base.functionId;
+      if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+        pCtx[k].ptsList = &tsCol[pCtx[k].startOffset];
+      }
+
+      // not a whole block involved in query processing, statistics data can not be used
+      // NOTE: the original value of isSet have been changed here
+      if (pCtx[k].preAggVals.isSet && forwardStep < numOfTotal) {
+        pCtx[k].preAggVals.isSet = false;
+      }
+
+      if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
+        aAggs[functionId].xFunction(&pCtx[k]);
+      }
+
+      // restore it
+      pCtx[k].preAggVals.isSet = hasPrev;
+    }
+  }
+}
+
+static void doRowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, bool closed, STimeWindow *pWin, int32_t offset) {
+  SQuery *        pQuery = pRuntimeEnv->pQuery;
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+
+  if (IS_MASTER_SCAN(pRuntimeEnv) || closed) {
+    for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+      pCtx[k].nStartQueryTimestamp = pWin->skey;
+
+      int32_t functionId = pQuery->pSelectExpr[k].base.functionId;
+      if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
+        aAggs[functionId].xFunctionF(&pCtx[k], offset);
+      }
+    }
+  }
+}
+
+static int32_t getNextQualifiedWindow(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow *pNext, SDataBlockInfo *pDataBlockInfo,
+    TSKEY *primaryKeys, __block_search_fn_t searchFn, int32_t prevPosition) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  GET_NEXT_TIMEWINDOW(pQuery, pNext);
+
+  // next time window is not in current block
+  if ((pNext->skey > pDataBlockInfo->window.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+      (pNext->ekey < pDataBlockInfo->window.skey && !QUERY_IS_ASC_QUERY(pQuery))) {
+    return -1;
+  }
+
+  TSKEY startKey = -1;
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    startKey = pNext->skey;
+    if (startKey < pQuery->window.skey) {
+      startKey = pQuery->window.skey;
+    }
+  } else {
+    startKey = pNext->ekey;
+    if (startKey > pQuery->window.skey) {
+      startKey = pQuery->window.skey;
+    }
+  }
+
+  int32_t startPos = 0;
+  // tumbling time window query, a special case of sliding time window query
+  if (pQuery->interval.sliding == pQuery->interval.interval && prevPosition != -1) {
+    int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+    startPos = prevPosition + factor;
+  } else {
+    startPos = searchFn((char *)primaryKeys, pDataBlockInfo->rows, startKey, pQuery->order.order);
+  }
+
+  /*
+   * This time window does not cover any data, try next time window,
+   * this case may happen when the time window is too small
+   */
+  if (QUERY_IS_ASC_QUERY(pQuery) && primaryKeys[startPos] > pNext->ekey) {
+    TSKEY next = primaryKeys[startPos];
+    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+      pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
+      pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+    } else {
+      pNext->ekey += ((next - pNext->ekey + pQuery->interval.sliding - 1)/pQuery->interval.sliding) * pQuery->interval.sliding;
+      pNext->skey = pNext->ekey - pQuery->interval.interval + 1;
+    }
+  } else if ((!QUERY_IS_ASC_QUERY(pQuery)) && primaryKeys[startPos] < pNext->skey) {
+    TSKEY next = primaryKeys[startPos];
+    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+      pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
+      pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+    } else {
+      pNext->skey -= ((pNext->skey - next + pQuery->interval.sliding - 1) / pQuery->interval.sliding) * pQuery->interval.sliding;
+      pNext->ekey = pNext->skey + pQuery->interval.interval - 1;
+    }
+  }
+
+  return startPos;
+}
+
+static FORCE_INLINE TSKEY reviseWindowEkey(SQuery *pQuery, STimeWindow *pWindow) {
+  TSKEY ekey = -1;
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    ekey = pWindow->ekey;
+    if (ekey > pQuery->window.ekey) {
+      ekey = pQuery->window.ekey;
+    }
+  } else {
+    ekey = pWindow->skey;
+    if (ekey < pQuery->window.ekey) {
+      ekey = pQuery->window.ekey;
+    }
+  }
+
+  return ekey;
+}
+
+//todo binary search
+static void* getDataBlockImpl(SArray* pDataBlock, int32_t colId) {
+  int32_t numOfCols = (int32_t)taosArrayGetSize(pDataBlock);
+
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumnInfoData *p = taosArrayGet(pDataBlock, i);
+    if (colId == p->info.colId) {
+      return p->pData;
+    }
+  }
+
+  return NULL;
+}
+
+static char *getDataBlock(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int32_t col, int32_t size,
+                    SArray *pDataBlock) {
+  if (pDataBlock == NULL) {
+    return NULL;
+  }
+
+  char *dataBlock = NULL;
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  int32_t functionId = pQuery->pSelectExpr[col].base.functionId;
+  if (functionId == TSDB_FUNC_ARITHM) {
+    sas->pArithExpr = &pQuery->pSelectExpr[col];
+
+    sas->offset  = 0;
+    sas->colList = pQuery->colList;
+    sas->numOfCols = pQuery->numOfCols;
+    sas->data    = calloc(pQuery->numOfCols, POINTER_BYTES);
+
+    if (sas->data == NULL) {
+      finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+    }
+
+    // here the pQuery->colList and sas->colList are identical
+    int32_t numOfCols = (int32_t)taosArrayGetSize(pDataBlock);
+    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
+      SColumnInfo *pColMsg = &pQuery->colList[i];
+
+      dataBlock = NULL;
+      for (int32_t k = 0; k < numOfCols; ++k) {  //todo refactor
+        SColumnInfoData *p = taosArrayGet(pDataBlock, k);
+        if (pColMsg->colId == p->info.colId) {
+          dataBlock = p->pData;
+          break;
+        }
+      }
+
+      assert(dataBlock != NULL);
+      sas->data[i] = dataBlock;  // start from the offset
+    }
+
+  } else {  // other type of query function
+    SColIndex *pCol = &pQuery->pSelectExpr[col].base.colInfo;
+    if (TSDB_COL_IS_NORMAL_COL(pCol->flag)) {
+      SColIndex* pColIndex = &pQuery->pSelectExpr[col].base.colInfo;
+      SColumnInfoData *p = taosArrayGet(pDataBlock, pColIndex->colIndex);
+      assert(p->info.colId == pColIndex->colId);
+
+      dataBlock = p->pData;
+    } else {
+      dataBlock = NULL;
+    }
+  }
+
+  return dataBlock;
+}
+
+/**
+ * todo set the last value for pQueryTableInfo as in rowwiseapplyfunctions
+ * @param pRuntimeEnv
+ * @param forwardStep
+ * @param tsCols
+ * @param pFields
+ * @param isDiskFileBlock
+ * @return                  the incremental number of output value, so it maybe 0 for fixed number of query,
+ *                          such as count/min/max etc.
+ */
+static void blockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pStatis,
+                                       SDataBlockInfo *pDataBlockInfo, SWindowResInfo *pWindowResInfo,
+                                       __block_search_fn_t searchFn, SArray *pDataBlock) {
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+  bool masterScan = IS_MASTER_SCAN(pRuntimeEnv);
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  TSKEY  *tsCols = NULL;
+  if (pDataBlock != NULL) {
+    SColumnInfoData* pColInfo = taosArrayGet(pDataBlock, 0);
+    tsCols = (TSKEY *)(pColInfo->pData);
+  }
+
+  SArithmeticSupport *sasArray = calloc((size_t)pQuery->numOfOutput, sizeof(SArithmeticSupport));
+  if (sasArray == NULL) {
+    finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
+  for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+    char *dataBlock = getDataBlock(pRuntimeEnv, &sasArray[k], k, pDataBlockInfo->rows, pDataBlock);
+    setExecParams(pQuery, &pCtx[k], dataBlock, tsCols, pDataBlockInfo, pStatis, &sasArray[k], k);
+  }
+
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    TSKEY ts = TSKEY_INITIAL_VAL;
+
+    if (tsCols == NULL) {
+      ts = QUERY_IS_ASC_QUERY(pQuery)? pDataBlockInfo->window.skey:pDataBlockInfo->window.ekey;
+    } else {
+      int32_t offset = GET_COL_DATA_POS(pQuery, 0, step);
+      ts = tsCols[offset];
+    }
+
+    bool        hasTimeWindow = false;
+    STimeWindow win = getActiveTimeWindow(pWindowResInfo, ts, pQuery);
+    if (setWindowOutputBufByKey(pRuntimeEnv, pWindowResInfo, pDataBlockInfo->tid, &win, masterScan, &hasTimeWindow) !=
+        TSDB_CODE_SUCCESS) {
+      taosTFree(sasArray);
+      return;
+    }
+
+    int32_t forwardStep = 0;
+    int32_t startPos = pQuery->pos;
+
+    if (hasTimeWindow) {
+      TSKEY ekey = reviseWindowEkey(pQuery, &win);
+      forwardStep = getNumOfRowsInTimeWindow(pQuery, pDataBlockInfo, tsCols, pQuery->pos, ekey, searchFn, true);
+
+      bool pStatus = getTimeWindowResStatus(pWindowResInfo, curTimeWindowIndex(pWindowResInfo));
+      doBlockwiseApplyFunctions(pRuntimeEnv, pStatus, &win, startPos, forwardStep, tsCols, pDataBlockInfo->rows);
+    }
+
+    int32_t     index = pWindowResInfo->curIndex;
+    STimeWindow nextWin = win;
+
+    while (1) {
+      int32_t prevEndPos = (forwardStep - 1) * step + startPos;
+      startPos = getNextQualifiedWindow(pRuntimeEnv, &nextWin, pDataBlockInfo, tsCols, searchFn, prevEndPos);
+      if (startPos < 0) {
+        break;
+      }
+
+      // null data, failed to allocate more memory buffer
+      hasTimeWindow = false;
+      if (setWindowOutputBufByKey(pRuntimeEnv, pWindowResInfo, pDataBlockInfo->tid, &nextWin, masterScan,
+                                  &hasTimeWindow) != TSDB_CODE_SUCCESS) {
+        break;
+      }
+
+      if (!hasTimeWindow) {
+        continue;
+      }
+
+      TSKEY ekey = reviseWindowEkey(pQuery, &nextWin);
+      forwardStep = getNumOfRowsInTimeWindow(pQuery, pDataBlockInfo, tsCols, startPos, ekey, searchFn, true);
+
+      bool closed = getTimeWindowResStatus(pWindowResInfo, curTimeWindowIndex(pWindowResInfo));
+      doBlockwiseApplyFunctions(pRuntimeEnv, closed, &nextWin, startPos, forwardStep, tsCols, pDataBlockInfo->rows);
+    }
+
+    pWindowResInfo->curIndex = index;
+  } else {
+    /*
+     * the sqlfunctionCtx parameters should be set done before all functions are invoked,
+     * since the selectivity + tag_prj query needs all parameters been set done.
+     * tag_prj function are changed to be TSDB_FUNC_TAG_DUMMY
+     */
+    for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+      int32_t functionId = pQuery->pSelectExpr[k].base.functionId;
+      if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
+        aAggs[functionId].xFunction(&pCtx[k]);
+      }
+    }
+  }
+
+  for(int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    if (pQuery->pSelectExpr[i].base.functionId != TSDB_FUNC_ARITHM) {
+      continue;
+    }
+
+    taosTFree(sasArray[i].data);
+  }
+
+  taosTFree(sasArray);
+}
+
+static int32_t setGroupResultOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, char *pData, int16_t type, int16_t bytes) {
+  if (isNull(pData, type)) {  // ignore the null value
+    return -1;
+  }
+
+  int32_t GROUPRESULTID = 1;
+
+  SDiskbasedResultBuf *pResultBuf = pRuntimeEnv->pResultBuf;
+
+  // not assign result buffer yet, add new result buffer
+  char* d = pData;
+  int16_t len = bytes;
+  if (type == TSDB_DATA_TYPE_BINARY||type == TSDB_DATA_TYPE_NCHAR) {
+    d = varDataVal(pData);
+    len = varDataLen(pData);
+  } else if (type == TSDB_DATA_TYPE_FLOAT || type == TSDB_DATA_TYPE_DOUBLE) {
+    SQInfo* pQInfo = GET_QINFO_ADDR(pRuntimeEnv);
+    qError("QInfo:%p group by not supported on double/float/binary/nchar columns, abort", pQInfo);
+
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
+  }
+
+  SWindowResult *pWindowRes = doSetTimeWindowFromKey(pRuntimeEnv, &pRuntimeEnv->windowResInfo, d, len, true);
+  if (pWindowRes == NULL) {
+    return -1;
+  }
+
+  int64_t v = -1;
+  switch(type) {
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT:  v = GET_INT8_VAL(pData);  break;
+    case TSDB_DATA_TYPE_SMALLINT: v = GET_INT16_VAL(pData); break;
+    case TSDB_DATA_TYPE_INT:      v = GET_INT32_VAL(pData); break;
+    case TSDB_DATA_TYPE_BIGINT:   v = GET_INT64_VAL(pData); break;
+  }
+
+  if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+    pWindowRes->key = malloc(varDataTLen(pData));
+    varDataCopy(pWindowRes->key, pData);
+  } else {
+    pWindowRes->win.skey = v;
+    pWindowRes->win.ekey = v;
+  }
+
+  assert(pRuntimeEnv->windowResInfo.interval == 0);
+
+  if (pWindowRes->pos.pageId == -1) {
+    int32_t ret = addNewWindowResultBuf(pWindowRes, pResultBuf, GROUPRESULTID, pRuntimeEnv->numOfRowsPerPage);
+    if (ret != 0) {
+      return -1;
+    }
+  }
+
+  setWindowResOutputBuf(pRuntimeEnv, pWindowRes);
+  initCtxOutputBuf(pRuntimeEnv);
+  return TSDB_CODE_SUCCESS;
+}
+
+static char *getGroupbyColumnData(SQuery *pQuery, int16_t *type, int16_t *bytes, SArray* pDataBlock) {
+  SSqlGroupbyExpr *pGroupbyExpr = pQuery->pGroupbyExpr;
+
+  for (int32_t k = 0; k < pGroupbyExpr->numOfGroupCols; ++k) {
+    SColIndex* pColIndex = taosArrayGet(pGroupbyExpr->columnInfo, k);
+    if (TSDB_COL_IS_TAG(pColIndex->flag)) {
+      continue;
+    }
+
+    int16_t colIndex = -1;
+    int32_t colId = pColIndex->colId;
+
+    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
+      if (pQuery->colList[i].colId == colId) {
+        colIndex = i;
+        break;
+      }
+    }
+
+    assert(colIndex >= 0 && colIndex < pQuery->numOfCols);
+
+    *type = pQuery->colList[colIndex].type;
+    *bytes = pQuery->colList[colIndex].bytes;
+    /*
+     *  the colIndex is acquired from the first tables of all qualified tables in this vnode during query prepare
+     * stage, the remain tables may not have the required column in cache actually. So, the validation of required
+     * column in cache with the corresponding schema is reinforced.
+     */
+    int32_t numOfCols = (int32_t)taosArrayGetSize(pDataBlock);
+
+    for (int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData *p = taosArrayGet(pDataBlock, i);
+      if (pColIndex->colId == p->info.colId) {
+        return p->pData;
+      }
+    }
+  }
+
+  return NULL;
+}
+
+static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  STSElem         elem = tsBufGetElem(pRuntimeEnv->pTSBuf);
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+
+  // compare tag first
+  if (tVariantCompare(&pCtx[0].tag, &elem.tag) != 0) {
+    return TS_JOIN_TAG_NOT_EQUALS;
+  }
+
+  TSKEY key = *(TSKEY *)((char*)pCtx[0].aInputElemBuf + TSDB_KEYSIZE * offset);
+
+#if defined(_DEBUG_VIEW)
+  printf("elem in comp ts file:%" PRId64 ", key:%" PRId64 ", tag:%"PRIu64", query order:%d, ts order:%d, traverse:%d, index:%d\n",
+         elem.ts, key, elem.tag.i64Key, pQuery->order.order, pRuntimeEnv->pTSBuf->tsOrder,
+         pRuntimeEnv->pTSBuf->cur.order, pRuntimeEnv->pTSBuf->cur.tsIndex);
+#endif
+
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    if (key < elem.ts) {
+      return TS_JOIN_TS_NOT_EQUALS;
+    } else if (key > elem.ts) {
+      assert(false);
+    }
+  } else {
+    if (key > elem.ts) {
+      return TS_JOIN_TS_NOT_EQUALS;
+    } else if (key < elem.ts) {
+      assert(false);
+    }
+  }
+
+  return TS_JOIN_TS_EQUAL;
+}
+
+static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId) {
+  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+
+  // in case of timestamp column, always generated results.
+  if (functionId == TSDB_FUNC_TS) {
+    return true;
+  }
+
+  if (pResInfo->complete || functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TS_DUMMY) {
+    return false;
+  }
+
+  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_FIRST) {
+    return QUERY_IS_ASC_QUERY(pQuery);
+  }
+
+  // todo add comments
+  if ((functionId == TSDB_FUNC_LAST_DST || functionId == TSDB_FUNC_LAST)) {
+    return pCtx->param[0].i64Key == pQuery->order.order;
+  }
+
+  // in the supplementary scan, only the following functions need to be executed
+  if (IS_REVERSE_SCAN(pRuntimeEnv)) {
+    return false;
+  }
+
+  return true;
+}
+
+static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pStatis, SDataBlockInfo *pDataBlockInfo,
+    SWindowResInfo *pWindowResInfo, SArray *pDataBlock) {
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+  bool masterScan = IS_MASTER_SCAN(pRuntimeEnv);
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* item = pQuery->current;
+
+  SColumnInfoData* pColumnInfoData = (SColumnInfoData *)taosArrayGet(pDataBlock, 0);
+
+  TSKEY  *tsCols = (pColumnInfoData->info.type == TSDB_DATA_TYPE_TIMESTAMP)? (TSKEY*) pColumnInfoData->pData:NULL;
+  bool    groupbyColumnValue = pRuntimeEnv->groupbyNormalCol;
+
+  SArithmeticSupport *sasArray = calloc((size_t)pQuery->numOfOutput, sizeof(SArithmeticSupport));
+  if (sasArray == NULL) {
+    finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
+  int16_t type = 0;
+  int16_t bytes = 0;
+
+  char *groupbyColumnData = NULL;
+  if (groupbyColumnValue) {
+    groupbyColumnData = getGroupbyColumnData(pQuery, &type, &bytes, pDataBlock);
+  }
+
+  for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+    char *dataBlock = getDataBlock(pRuntimeEnv, &sasArray[k], k, pDataBlockInfo->rows, pDataBlock);
+    setExecParams(pQuery, &pCtx[k], dataBlock, tsCols, pDataBlockInfo, pStatis, &sasArray[k], k);
+  }
+
+  // set the input column data
+  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
+    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
+    pFilterInfo->pData = getDataBlockImpl(pDataBlock, pFilterInfo->info.colId);
+    assert(pFilterInfo->pData != NULL);
+  }
+
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  // from top to bottom in desc
+  // from bottom to top in asc order
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pRuntimeEnv);
+    qDebug("QInfo:%p process data rows, numOfRows:%d, query order:%d, ts comp order:%d", pQInfo, pDataBlockInfo->rows,
+           pQuery->order.order, pRuntimeEnv->pTSBuf->cur.order);
+  }
+
+  int32_t j = 0;
+  int32_t offset = -1;
+
+  for (j = 0; j < pDataBlockInfo->rows; ++j) {
+    offset = GET_COL_DATA_POS(pQuery, j, step);
+
+    if (pRuntimeEnv->pTSBuf != NULL) {
+      int32_t r = doTSJoinFilter(pRuntimeEnv, offset);
+      if (r == TS_JOIN_TAG_NOT_EQUALS) {
+        break;
+      } else if (r == TS_JOIN_TS_NOT_EQUALS) {
+        continue;
+      } else {
+        assert(r == TS_JOIN_TS_EQUAL);
+      }
+    }
+
+    if (pQuery->numOfFilterCols > 0 && (!doFilterData(pQuery, offset))) {
+      continue;
+    }
+
+    // interval window query, decide the time window according to the primary timestamp
+    if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+      int64_t     ts = tsCols[offset];
+      STimeWindow win = getActiveTimeWindow(pWindowResInfo, ts, pQuery);
+
+      bool hasTimeWindow = false;
+      int32_t ret = setWindowOutputBufByKey(pRuntimeEnv, pWindowResInfo, pDataBlockInfo->tid, &win, masterScan, &hasTimeWindow);
+      if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
+        continue;
+      }
+
+      if (!hasTimeWindow) {
+        continue;
+      }
+
+      bool closed = getTimeWindowResStatus(pWindowResInfo, curTimeWindowIndex(pWindowResInfo));
+      doRowwiseApplyFunctions(pRuntimeEnv, closed, &win, offset);
+
+      STimeWindow nextWin = win;
+      int32_t     index = pWindowResInfo->curIndex;
+
+      while (1) {
+        GET_NEXT_TIMEWINDOW(pQuery, &nextWin);
+        if ((nextWin.skey > pQuery->window.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+            (nextWin.skey < pQuery->window.ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
+          break;
+        }
+
+        if (ts < nextWin.skey || ts > nextWin.ekey) {
+          break;
+        }
+
+        // null data, failed to allocate more memory buffer
+        hasTimeWindow = false;
+        if (setWindowOutputBufByKey(pRuntimeEnv, pWindowResInfo, pDataBlockInfo->tid, &nextWin, masterScan, &hasTimeWindow) != TSDB_CODE_SUCCESS) {
+          break;
+        }
+
+        if (hasTimeWindow) {
+          closed = getTimeWindowResStatus(pWindowResInfo, curTimeWindowIndex(pWindowResInfo));
+          doRowwiseApplyFunctions(pRuntimeEnv, closed, &nextWin, offset);
+        }
+      }
+
+      pWindowResInfo->curIndex = index;
+    } else {  // other queries
+      // decide which group this rows belongs to according to current state value
+      if (groupbyColumnValue) {
+        char *val = groupbyColumnData + bytes * offset;
+
+        int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, val, type, bytes);
+        if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
+          continue;
+        }
+      }
+
+      for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+        int32_t functionId = pQuery->pSelectExpr[k].base.functionId;
+        if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
+          aAggs[functionId].xFunctionF(&pCtx[k], offset);
+        }
+      }
+    }
+
+    if (pRuntimeEnv->pTSBuf != NULL) {
+      // if timestamp filter list is empty, quit current query
+      if (!tsBufNextPos(pRuntimeEnv->pTSBuf)) {
+        setQueryStatus(pQuery, QUERY_COMPLETED);
+        break;
+      }
+    }
+  }
+
+  assert(offset >= 0);
+  if (tsCols != NULL) {
+    item->lastKey = tsCols[offset] + step;
+  } else {
+    item->lastKey = (QUERY_IS_ASC_QUERY(pQuery)? pDataBlockInfo->window.ekey:pDataBlockInfo->window.skey) + step;
+  }
+
+  // todo refactor: extract method
+  for(int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    if (pQuery->pSelectExpr[i].base.functionId != TSDB_FUNC_ARITHM) {
+      continue;
+    }
+
+    taosTFree(sasArray[i].data);
+  }
+
+  free(sasArray);
+}
+
+static int32_t tableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBlockInfo *pDataBlockInfo,
+                                          SDataStatis *pStatis, __block_search_fn_t searchFn, SArray *pDataBlock) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  STableQueryInfo* pTableQInfo = pQuery->current;
+  SWindowResInfo*  pWindowResInfo = &pRuntimeEnv->windowResInfo;
+
+  if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL || pRuntimeEnv->groupbyNormalCol) {
+    rowwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, pDataBlock);
+  } else {
+    blockwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, searchFn, pDataBlock);
+  }
+
+  // update the lastkey of current table
+  TSKEY lastKey = QUERY_IS_ASC_QUERY(pQuery) ? pDataBlockInfo->window.ekey : pDataBlockInfo->window.skey;
+  pTableQInfo->lastKey = lastKey + GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  // interval query with limit applied
+  int32_t numOfRes = 0;
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    numOfRes = doCheckQueryCompleted(pRuntimeEnv, lastKey, pWindowResInfo);
+  } else {
+    numOfRes = (int32_t)getNumOfResult(pRuntimeEnv);
+
+    // update the number of output result
+    if (numOfRes > 0 && pQuery->checkBuffer == 1) {
+      assert(numOfRes >= pQuery->rec.rows);
+      pQuery->rec.rows = numOfRes;
+
+      if (numOfRes >= pQuery->rec.threshold) {
+        setQueryStatus(pQuery, QUERY_RESBUF_FULL);
+      }
+
+      if ((pQuery->limit.limit >= 0) && (pQuery->limit.limit + pQuery->limit.offset) <= numOfRes) {
+        setQueryStatus(pQuery, QUERY_COMPLETED);
+      }
+
+      if (((pTableQInfo->lastKey > pTableQInfo->win.ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
+          ((pTableQInfo->lastKey < pTableQInfo->win.ekey) && (!QUERY_IS_ASC_QUERY(pQuery)))) {
+        setQueryStatus(pQuery, QUERY_COMPLETED);
+      }
+    }
+  }
+
+  return numOfRes;
+}
+
+void setExecParams(SQuery *pQuery, SQLFunctionCtx *pCtx, void* inputData, TSKEY *tsCol, SDataBlockInfo* pBlockInfo,
+                   SDataStatis *pStatis, void *param, int32_t colIndex) {
+
+  int32_t functionId = pQuery->pSelectExpr[colIndex].base.functionId;
+  int32_t colId = pQuery->pSelectExpr[colIndex].base.colInfo.colId;
+
+  SDataStatis *tpField = NULL;
+  pCtx->hasNull = hasNullValue(&pQuery->pSelectExpr[colIndex].base.colInfo, pStatis, &tpField);
+  pCtx->aInputElemBuf = inputData;
+
+  if (tpField != NULL) {
+    pCtx->preAggVals.isSet  = true;
+    pCtx->preAggVals.statis = *tpField;
+    assert(pCtx->preAggVals.statis.numOfNull <= pBlockInfo->rows);
+  } else {
+    pCtx->preAggVals.isSet = false;
+  }
+
+  pCtx->preAggVals.dataBlockLoaded = (inputData != NULL);
+
+  // limit/offset query will affect this value
+  pCtx->size = QUERY_IS_ASC_QUERY(pQuery) ? pBlockInfo->rows - pQuery->pos : pQuery->pos + 1;
+
+  // minimum value no matter ascending/descending order query
+  pCtx->startOffset = QUERY_IS_ASC_QUERY(pQuery) ? pQuery->pos: (pQuery->pos - pCtx->size + 1);
+  assert(pCtx->startOffset >= 0);
+
+  uint32_t status = aAggs[functionId].nStatus;
+  if (((status & (TSDB_FUNCSTATE_SELECTIVITY | TSDB_FUNCSTATE_NEED_TS)) != 0) && (tsCol != NULL)) {
+    pCtx->ptsList = &tsCol[pCtx->startOffset];
+  }
+
+  if (functionId >= TSDB_FUNC_FIRST_DST && functionId <= TSDB_FUNC_LAST_DST) {
+    // last_dist or first_dist function
+    // store the first&last timestamp into the intermediate buffer [1], the true
+    // value may be null but timestamp will never be null
+  } else if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_TWA ||
+             functionId == TSDB_FUNC_DIFF || (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE)) {
+    /*
+     * least squares function needs two columns of input, currently, the x value of linear equation is set to
+     * timestamp column, and the y-value is the column specified in pQuery->pSelectExpr[i].colIdxInBuffer
+     *
+     * top/bottom function needs timestamp to indicate when the
+     * top/bottom values emerge, so does diff function
+     */
+    if (functionId == TSDB_FUNC_TWA) {
+      STwaInfo *pTWAInfo = GET_RES_INFO(pCtx)->interResultBuf;
+      pTWAInfo->SKey = pQuery->window.skey;
+      pTWAInfo->EKey = pQuery->window.ekey;
+    }
+
+  } else if (functionId == TSDB_FUNC_ARITHM) {
+    pCtx->param[1].pz = param;
+  } else if (functionId == TSDB_FUNC_SPREAD) {  // set the statistics data for primary time stamp column
+    if (colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      pCtx->preAggVals.isSet  = true;
+      pCtx->preAggVals.statis.min = pBlockInfo->window.skey;
+      pCtx->preAggVals.statis.max = pBlockInfo->window.ekey;
+    }
+  } else if (functionId == TSDB_FUNC_INTERP) {
+    SInterpInfoDetail *pInterpInfo = GET_RES_INFO(pCtx)->interResultBuf;
+    pInterpInfo->type = (int8_t)pQuery->fillType;
+    pInterpInfo->ts = pQuery->window.skey;
+    pInterpInfo->primaryCol = (colId == PRIMARYKEY_TIMESTAMP_COL_INDEX);
+
+    if (pQuery->fillVal != NULL) {
+      if (isNull((const char*) &pQuery->fillVal[colIndex], pCtx->inputType)) {
+        pCtx->param[1].nType = TSDB_DATA_TYPE_NULL;
+      } else { // todo refactor, tVariantCreateFromBinary should handle the NULL value
+        tVariantCreateFromBinary(&pCtx->param[1], (char*) &pQuery->fillVal[colIndex], pCtx->inputBytes, pCtx->inputType);
+      }
+    }
+  }
+
+#if defined(_DEBUG_VIEW)
+  //  int64_t *tsList = (int64_t *)primaryColumnData;
+//  int64_t  s = tsList[0];
+//  int64_t  e = tsList[size - 1];
+
+//    if (IS_DATA_BLOCK_LOADED(blockStatus)) {
+//        qDebug("QInfo:%p query ts:%lld-%lld, offset:%d, rows:%d, bstatus:%d,
+//        functId:%d", GET_QINFO_ADDR(pQuery),
+//               s, e, startOffset, size, blockStatus, functionId);
+//    } else {
+//        qDebug("QInfo:%p block not loaded, bstatus:%d",
+//        GET_QINFO_ADDR(pQuery), blockStatus);
+//    }
+#endif
+}
+
+// set the output buffer for the selectivity + tag query
+static int32_t setCtxTagColumnInfo(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+
+  if (isSelectivityWithTagsQuery(pQuery)) {
+    int32_t num = 0;
+    int16_t tagLen = 0;
+
+    SQLFunctionCtx *p = NULL;
+    SQLFunctionCtx **pTagCtx = calloc(pQuery->numOfOutput, POINTER_BYTES);
+    if (pTagCtx == NULL) {
+      return TSDB_CODE_QRY_OUT_OF_MEMORY;
+    }
+
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      SSqlFuncMsg *pSqlFuncMsg = &pQuery->pSelectExpr[i].base;
+
+      if (pSqlFuncMsg->functionId == TSDB_FUNC_TAG_DUMMY || pSqlFuncMsg->functionId == TSDB_FUNC_TS_DUMMY) {
+        tagLen += pCtx[i].outputBytes;
+        pTagCtx[num++] = &pCtx[i];
+      } else if ((aAggs[pSqlFuncMsg->functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+        p = &pCtx[i];
+      } else if (pSqlFuncMsg->functionId == TSDB_FUNC_TS || pSqlFuncMsg->functionId == TSDB_FUNC_TAG) {
+        // tag function may be the group by tag column
+        // ts may be the required primary timestamp column
+        continue;
+      } else {
+        // the column may be the normal column, group by normal_column, the functionId is TSDB_FUNC_PRJ
+      }
+    }
+    if (p != NULL) {
+      p->tagInfo.pTagCtxList = pTagCtx;
+      p->tagInfo.numOfTagCols = num;
+      p->tagInfo.tagsLen = tagLen;
+    } else {
+      taosTFree(pTagCtx);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static FORCE_INLINE void setWindowResultInfo(SResultInfo *pResultInfo, SQuery *pQuery, bool isStableQuery, char* buf) {
+  char* p = buf;
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t size = pQuery->pSelectExpr[i].interBytes;
+    setResultInfoBuf(&pResultInfo[i], size, isStableQuery, p);
+
+    p += size;
+  }
+}
+
+static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order) {
+  qDebug("QInfo:%p setup runtime env", GET_QINFO_ADDR(pRuntimeEnv));
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  size_t size = pRuntimeEnv->interBufSize + pQuery->numOfOutput * sizeof(SResultInfo);
+
+  pRuntimeEnv->resultInfo = calloc(1, size);
+  pRuntimeEnv->pCtx = (SQLFunctionCtx *)calloc(pQuery->numOfOutput, sizeof(SQLFunctionCtx));
+
+  if (pRuntimeEnv->resultInfo == NULL || pRuntimeEnv->pCtx == NULL) {
+    goto _clean;
+  }
+
+  pRuntimeEnv->offset[0] = 0;
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SSqlFuncMsg *pSqlFuncMsg = &pQuery->pSelectExpr[i].base;
+
+    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
+    SColIndex* pIndex = &pSqlFuncMsg->colInfo;
+
+    if (TSDB_COL_REQ_NULL(pIndex->flag)) {
+      pCtx->requireNull = true;
+      pIndex->flag &= ~(TSDB_COL_NULL);
+    } else {
+      pCtx->requireNull = false;
+    }
+
+    int32_t index = pSqlFuncMsg->colInfo.colIndex;
+    if (TSDB_COL_IS_TAG(pIndex->flag)) {
+      if (pIndex->colId == TSDB_TBNAME_COLUMN_INDEX) {  // todo refactor
+        SSchema s = tGetTableNameColumnSchema();
+
+        pCtx->inputBytes = s.bytes;
+        pCtx->inputType = s.type;
+      } else {
+        pCtx->inputBytes = pQuery->tagColList[index].bytes;
+        pCtx->inputType = pQuery->tagColList[index].type;
+      }
+    } else if (TSDB_COL_IS_UD_COL(pIndex->flag)) {
+      pCtx->inputBytes = pSqlFuncMsg->arg[0].argBytes;
+      pCtx->inputType = pSqlFuncMsg->arg[0].argType;
+    } else {
+      pCtx->inputBytes = pQuery->colList[index].bytes;
+      pCtx->inputType = pQuery->colList[index].type;
+    }
+
+
+    assert(isValidDataType(pCtx->inputType));
+    pCtx->ptsOutputBuf = NULL;
+
+    pCtx->outputBytes = pQuery->pSelectExpr[i].bytes;
+    pCtx->outputType = pQuery->pSelectExpr[i].type;
+
+    pCtx->order = pQuery->order.order;
+    pCtx->functionId = pSqlFuncMsg->functionId;
+
+    pCtx->numOfParams = pSqlFuncMsg->numOfParams;
+    for (int32_t j = 0; j < pCtx->numOfParams; ++j) {
+      int16_t type = pSqlFuncMsg->arg[j].argType;
+      int16_t bytes = pSqlFuncMsg->arg[j].argBytes;
+      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+        tVariantCreateFromBinary(&pCtx->param[j], pSqlFuncMsg->arg[j].argValue.pz, bytes, type);
+      } else {
+        tVariantCreateFromBinary(&pCtx->param[j], (char *)&pSqlFuncMsg->arg[j].argValue.i64, bytes, type);
+      }
+    }
+
+    // set the order information for top/bottom query
+    int32_t functionId = pCtx->functionId;
+
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
+      int32_t f = pQuery->pSelectExpr[0].base.functionId;
+      assert(f == TSDB_FUNC_TS || f == TSDB_FUNC_TS_DUMMY);
+
+      pCtx->param[2].i64Key = order;
+      pCtx->param[2].nType = TSDB_DATA_TYPE_BIGINT;
+      pCtx->param[3].i64Key = functionId;
+      pCtx->param[3].nType = TSDB_DATA_TYPE_BIGINT;
+
+      pCtx->param[1].i64Key = pQuery->order.orderColId;
+    }
+
+    if (i > 0) {
+      pRuntimeEnv->offset[i] = pRuntimeEnv->offset[i - 1] + pRuntimeEnv->pCtx[i - 1].outputBytes;
+    }
+  }
+
+  char* buf = (char*) pRuntimeEnv->resultInfo + sizeof(SResultInfo) * pQuery->numOfOutput;
+
+  // set the intermediate result output buffer
+  setWindowResultInfo(pRuntimeEnv->resultInfo, pQuery, pRuntimeEnv->stableQuery, buf);
+
+  // if it is group by normal column, do not set output buffer, the output buffer is pResult
+  if (!pRuntimeEnv->groupbyNormalCol && !pRuntimeEnv->stableQuery) {
+    resetCtxOutputBuf(pRuntimeEnv);
+  }
+
+  if (setCtxTagColumnInfo(pRuntimeEnv, pRuntimeEnv->pCtx) != TSDB_CODE_SUCCESS) {
+    goto _clean;
+  }
+
+  qDebug("QInfo:%p init runtime completed", GET_QINFO_ADDR(pRuntimeEnv));
+  return TSDB_CODE_SUCCESS;
+
+_clean:
+  taosTFree(pRuntimeEnv->resultInfo);
+  taosTFree(pRuntimeEnv->pCtx);
+
+  return TSDB_CODE_QRY_OUT_OF_MEMORY;
+}
+
+static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
+  if (pRuntimeEnv->pQuery == NULL) {
+    return;
+  }
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  SQInfo* pQInfo = (SQInfo*) GET_QINFO_ADDR(pRuntimeEnv);
+
+  qDebug("QInfo:%p teardown runtime env", pQInfo);
+  cleanupTimeWindowInfo(&pRuntimeEnv->windowResInfo);
+
+  if (pRuntimeEnv->pCtx != NULL) {
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
+
+      for (int32_t j = 0; j < pCtx->numOfParams; ++j) {
+        tVariantDestroy(&pCtx->param[j]);
+      }
+
+      tVariantDestroy(&pCtx->tag);
+      taosTFree(pCtx->tagInfo.pTagCtxList);
+    }
+
+    taosTFree(pRuntimeEnv->resultInfo);
+    taosTFree(pRuntimeEnv->pCtx);
+  }
+
+  pRuntimeEnv->pFillInfo = taosDestoryFillInfo(pRuntimeEnv->pFillInfo);
+
+  destroyResultBuf(pRuntimeEnv->pResultBuf);
+  tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
+  tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
+
+  pRuntimeEnv->pTSBuf = tsBufDestroy(pRuntimeEnv->pTSBuf);
+}
+
+#define IS_QUERY_KILLED(_q) ((_q)->code == TSDB_CODE_TSC_QUERY_CANCELLED)
+
+static void setQueryKilled(SQInfo *pQInfo) { pQInfo->code = TSDB_CODE_TSC_QUERY_CANCELLED;}
+
+static bool isFixedOutputQuery(SQueryRuntimeEnv* pRuntimeEnv) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    return false;
+  }
+
+  // Note:top/bottom query is fixed output query
+  if (pRuntimeEnv->topBotQuery || pRuntimeEnv->groupbyNormalCol) {
+    return true;
+  }
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SSqlFuncMsg *pExprMsg = &pQuery->pSelectExpr[i].base;
+
+    // ignore the ts_comp function
+    if (i == 0 && pExprMsg->functionId == TSDB_FUNC_PRJ && pExprMsg->numOfParams == 1 &&
+        pExprMsg->colInfo.colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      continue;
+    }
+
+    if (pExprMsg->functionId == TSDB_FUNC_TS || pExprMsg->functionId == TSDB_FUNC_TS_DUMMY) {
+      continue;
+    }
+
+    if (!IS_MULTIOUTPUT(aAggs[pExprMsg->functionId].nStatus)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// todo refactor with isLastRowQuery
+static bool isPointInterpoQuery(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionID = pQuery->pSelectExpr[i].base.functionId;
+    if (functionID == TSDB_FUNC_INTERP) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// TODO REFACTOR:MERGE WITH CLIENT-SIDE FUNCTION
+static bool isSumAvgRateQuery(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TS) {
+      continue;
+    }
+
+    if (functionId == TSDB_FUNC_SUM_RATE || functionId == TSDB_FUNC_SUM_IRATE || functionId == TSDB_FUNC_AVG_RATE ||
+        functionId == TSDB_FUNC_AVG_IRATE) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static bool isFirstLastRowQuery(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionID = pQuery->pSelectExpr[i].base.functionId;
+    if (functionID == TSDB_FUNC_LAST_ROW) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static bool needReverseScan(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG) {
+      continue;
+    }
+
+    if ((functionId == TSDB_FUNC_FIRST || functionId == TSDB_FUNC_FIRST_DST) && !QUERY_IS_ASC_QUERY(pQuery)) {
+      return true;
+    }
+
+    if (functionId == TSDB_FUNC_LAST || functionId == TSDB_FUNC_LAST_DST) {
+      int32_t order = (int32_t)pQuery->pSelectExpr[i].base.arg->argValue.i64;
+      return order != pQuery->order.order;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * The following 4 kinds of query are treated as the tags query
+ * tagprj, tid_tag query, count(tbname), 'abc' (user defined constant value column) query
+ */
+static bool onlyQueryTags(SQuery* pQuery) {
+  for(int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SExprInfo* pExprInfo = &pQuery->pSelectExpr[i];
+
+    int32_t functionId = pExprInfo->base.functionId;
+
+    if (functionId != TSDB_FUNC_TAGPRJ &&
+        functionId != TSDB_FUNC_TID_TAG &&
+        (!(functionId == TSDB_FUNC_COUNT && pExprInfo->base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX)) &&
+        (!(functionId == TSDB_FUNC_PRJ && TSDB_COL_IS_UD_COL(pExprInfo->base.colInfo.flag)))) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+void getAlignQueryTimeWindow(SQuery *pQuery, int64_t key, int64_t keyFirst, int64_t keyLast, STimeWindow *win) {
+  assert(key >= keyFirst && key <= keyLast && pQuery->interval.sliding <= pQuery->interval.interval);
+  win->skey = taosTimeTruncate(key, &pQuery->interval, pQuery->precision);
+
+  /*
+   * if the realSkey > INT64_MAX - pQuery->interval.interval, the query duration between
+   * realSkey and realEkey must be less than one interval.Therefore, no need to adjust the query ranges.
+   */
+  if (keyFirst > (INT64_MAX - pQuery->interval.interval)) {
+    assert(keyLast - keyFirst < pQuery->interval.interval);
+    win->ekey = INT64_MAX;
+  } else if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+    win->ekey = taosTimeAdd(win->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+  } else {
+    win->ekey = win->skey + pQuery->interval.interval - 1;
+  }
+}
+
+static void setScanLimitationByResultBuffer(SQuery *pQuery) {
+  if (isTopBottomQuery(pQuery)) {
+    pQuery->checkBuffer = 0;
+  } else if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
+    pQuery->checkBuffer = 0;
+  } else {
+    bool hasMultioutput = false;
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      SSqlFuncMsg *pExprMsg = &pQuery->pSelectExpr[i].base;
+      if (pExprMsg->functionId == TSDB_FUNC_TS || pExprMsg->functionId == TSDB_FUNC_TS_DUMMY) {
+        continue;
+      }
+
+      hasMultioutput = IS_MULTIOUTPUT(aAggs[pExprMsg->functionId].nStatus);
+      if (!hasMultioutput) {
+        break;
+      }
+    }
+
+    pQuery->checkBuffer = hasMultioutput ? 1 : 0;
+  }
+}
+
+/*
+ * todo add more parameters to check soon..
+ */
+bool colIdCheck(SQuery *pQuery) {
+  // load data column information is incorrect
+  for (int32_t i = 0; i < pQuery->numOfCols - 1; ++i) {
+    if (pQuery->colList[i].colId == pQuery->colList[i + 1].colId) {
+      qError("QInfo:%p invalid data load column for query", GET_QINFO_ADDR(pQuery));
+      return false;
+    }
+  }
+
+  return true;
+}
+
+// todo ignore the avg/sum/min/max/count/stddev/top/bottom functions, of which
+// the scan order is not matter
+static bool onlyOneQueryType(SQuery *pQuery, int32_t functId, int32_t functIdDst) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+
+    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG ||
+        functionId == TSDB_FUNC_TAG_DUMMY) {
+      continue;
+    }
+
+    if (functionId != functId && functionId != functIdDst) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static bool onlyFirstQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB_FUNC_FIRST, TSDB_FUNC_FIRST_DST); }
+
+static bool onlyLastQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB_FUNC_LAST, TSDB_FUNC_LAST_DST); }
+
+// todo refactor, add iterator
+static void doExchangeTimeWindow(SQInfo* pQInfo, STimeWindow* win) {
+  size_t t = taosArrayGetSize(pQInfo->tableGroupInfo.pGroupList);
+  for(int32_t i = 0; i < t; ++i) {
+    SArray* p1 = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, i);
+
+    size_t len = taosArrayGetSize(p1);
+    for(int32_t j = 0; j < len; ++j) {
+      STableKeyInfo* pInfo = taosArrayGet(p1, j);
+
+      // update the new lastkey if it is equalled to the value of the old skey
+      if (pInfo->lastKey == win->ekey) {
+        pInfo->lastKey = win->skey;
+      }
+    }
+  }
+}
+
+static void changeExecuteScanOrder(SQInfo *pQInfo, SQueryTableMsg* pQueryMsg, bool stableQuery) {
+  SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
+
+  // in case of point-interpolation query, use asc order scan
+  char msg[] = "QInfo:%p scan order changed for %s query, old:%d, new:%d, qrange exchanged, old qrange:%" PRId64
+               "-%" PRId64 ", new qrange:%" PRId64 "-%" PRId64;
+
+  // todo handle the case the the order irrelevant query type mixed up with order critical query type
+  // descending order query for last_row query
+  if (isFirstLastRowQuery(pQuery)) {
+    qDebug("QInfo:%p scan order changed for last_row query, old:%d, new:%d", pQInfo, pQuery->order.order, TSDB_ORDER_ASC);
+
+    pQuery->order.order = TSDB_ORDER_ASC;
+    if (pQuery->window.skey > pQuery->window.ekey) {
+      SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+    }
+
+    return;
+  }
+
+  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) && pQuery->order.order == TSDB_ORDER_DESC) {
+    pQuery->order.order = TSDB_ORDER_ASC;
+    if (pQuery->window.skey > pQuery->window.ekey) {
+      SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+    }
+
+    doExchangeTimeWindow(pQInfo, &pQuery->window);
+    return;
+  }
+
+  if (isPointInterpoQuery(pQuery) && pQuery->interval.interval == 0) {
+    if (!QUERY_IS_ASC_QUERY(pQuery)) {
+      qDebug(msg, GET_QINFO_ADDR(pQuery), "interp", pQuery->order.order, TSDB_ORDER_ASC, pQuery->window.skey,
+             pQuery->window.ekey, pQuery->window.ekey, pQuery->window.skey);
+      SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+    }
+
+    pQuery->order.order = TSDB_ORDER_ASC;
+    return;
+  }
+
+  if (pQuery->interval.interval == 0) {
+    if (onlyFirstQuery(pQuery)) {
+      if (!QUERY_IS_ASC_QUERY(pQuery)) {
+        qDebug(msg, GET_QINFO_ADDR(pQuery), "only-first", pQuery->order.order, TSDB_ORDER_ASC, pQuery->window.skey,
+               pQuery->window.ekey, pQuery->window.ekey, pQuery->window.skey);
+
+        SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+        doExchangeTimeWindow(pQInfo, &pQuery->window);
+      }
+
+      pQuery->order.order = TSDB_ORDER_ASC;
+    } else if (onlyLastQuery(pQuery)) {
+      if (QUERY_IS_ASC_QUERY(pQuery)) {
+        qDebug(msg, GET_QINFO_ADDR(pQuery), "only-last", pQuery->order.order, TSDB_ORDER_DESC, pQuery->window.skey,
+               pQuery->window.ekey, pQuery->window.ekey, pQuery->window.skey);
+
+        SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+        doExchangeTimeWindow(pQInfo, &pQuery->window);
+      }
+
+      pQuery->order.order = TSDB_ORDER_DESC;
+    }
+
+  } else {  // interval query
+    if (stableQuery) {
+      if (onlyFirstQuery(pQuery)) {
+        if (!QUERY_IS_ASC_QUERY(pQuery)) {
+          qDebug(msg, GET_QINFO_ADDR(pQuery), "only-first stable", pQuery->order.order, TSDB_ORDER_ASC,
+                 pQuery->window.skey, pQuery->window.ekey, pQuery->window.ekey, pQuery->window.skey);
+
+          SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+          doExchangeTimeWindow(pQInfo, &pQuery->window);
+        }
+
+        pQuery->order.order = TSDB_ORDER_ASC;
+      } else if (onlyLastQuery(pQuery)) {
+        if (QUERY_IS_ASC_QUERY(pQuery)) {
+          qDebug(msg, GET_QINFO_ADDR(pQuery), "only-last stable", pQuery->order.order, TSDB_ORDER_DESC,
+                 pQuery->window.skey, pQuery->window.ekey, pQuery->window.ekey, pQuery->window.skey);
+
+          SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+          doExchangeTimeWindow(pQInfo, &pQuery->window);
+        }
+
+        pQuery->order.order = TSDB_ORDER_DESC;
+      }
+    }
+  }
+}
+
+static int32_t getInitialPageNum(SQInfo *pQInfo) {
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+  int32_t INITIAL_RESULT_ROWS_VALUE = 16;
+
+  int32_t num = 0;
+
+  if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
+    num = 128;
+  } else if (QUERY_IS_INTERVAL_QUERY(pQuery)) {  // time window query, allocate one page for each table
+    size_t s = pQInfo->tableqinfoGroupInfo.numOfTables;
+    num = (int32_t)(MAX(s, INITIAL_RESULT_ROWS_VALUE));
+  } else {    // for super table query, one page for each subset
+    num = 1;  // pQInfo->pSidSet->numOfSubSet;
+  }
+
+  assert(num > 0);
+  return num;
+}
+
+static void getIntermediateBufInfo(SQueryRuntimeEnv* pRuntimeEnv, int32_t* ps, int32_t* rowsize) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  int32_t MIN_ROWS_PER_PAGE = 4;
+
+  *rowsize = (int32_t)(pQuery->rowSize * GET_ROW_PARAM_FOR_MULTIOUTPUT(pQuery, pRuntimeEnv->topBotQuery, pRuntimeEnv->stableQuery));
+  int32_t overhead = sizeof(tFilePage);
+
+  // one page contains at least two rows
+  *ps = DEFAULT_INTERN_BUF_PAGE_SIZE;
+  while(((*rowsize) * MIN_ROWS_PER_PAGE) > (*ps) - overhead) {
+    *ps = (*ps << 1u);
+  }
+
+  pRuntimeEnv->numOfRowsPerPage = ((*ps) - sizeof(tFilePage)) / (*rowsize);
+  assert(pRuntimeEnv->numOfRowsPerPage <= MAX_ROWS_PER_RESBUF_PAGE);
+}
+
+#define IS_PREFILTER_TYPE(_t) ((_t) != TSDB_DATA_TYPE_BINARY && (_t) != TSDB_DATA_TYPE_NCHAR)
+
+static bool needToLoadDataBlock(SQueryRuntimeEnv* pRuntimeEnv, SDataStatis *pDataStatis, SQLFunctionCtx *pCtx,
+    int32_t numOfRows) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  if (pDataStatis == NULL || (pQuery->numOfFilterCols == 0 && (!pRuntimeEnv->topBotQuery))) {
+    return true;
+  }
+
+  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
+    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
+
+    int32_t index = -1;
+    for(int32_t i = 0; i < pQuery->numOfCols; ++i) {
+      if (pDataStatis[i].colId == pFilterInfo->info.colId) {
+        index = i;
+        break;
+      }
+    }
+
+    // no statistics data, load the true data block
+    if (index == -1) {
+      return true;
+    }
+
+    // not support pre-filter operation on binary/nchar data type
+    if (!IS_PREFILTER_TYPE(pFilterInfo->info.type)) {
+      return true;
+    }
+
+    // all data in current column are NULL, no need to check its boundary value
+    if (pDataStatis[index].numOfNull == numOfRows) {
+
+      // if isNULL query exists, load the null data column
+      for (int32_t j = 0; j < pFilterInfo->numOfFilters; ++j) {
+        SColumnFilterElem *pFilterElem = &pFilterInfo->pFilters[j];
+        if (pFilterElem->fp == isNull_filter) {
+          return true;
+        }
+      }
+
+      continue;
+    }
+
+    SDataStatis* pDataBlockst = &pDataStatis[index];
+
+    if (pFilterInfo->info.type == TSDB_DATA_TYPE_FLOAT) {
+      float minval = (float)(*(double *)(&pDataBlockst->min));
+      float maxval = (float)(*(double *)(&pDataBlockst->max));
+
+      for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
+        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&minval, (char *)&maxval)) {
+          return true;
+        }
+      }
+    } else {
+      for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
+        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&pDataBlockst->min, (char *)&pDataBlockst->max)) {
+          return true;
+        }
+      }
+    }
+  }
+
+  if (pRuntimeEnv->topBotQuery) {
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+      if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+        return topbot_datablock_filter(&pCtx[i], functionId, (char *)&pDataStatis[i].min, (char *)&pDataStatis[i].max);
+      }
+    }
+  }
+
+  return false;
+}
+
+static bool overlapWithTimeWindow(SQuery* pQuery, SDataBlockInfo* pBlockInfo) {
+  STimeWindow w = {0};
+
+  TSKEY sk = MIN(pQuery->window.skey, pQuery->window.ekey);
+  TSKEY ek = MAX(pQuery->window.skey, pQuery->window.ekey);
+
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    getAlignQueryTimeWindow(pQuery, pBlockInfo->window.skey, sk, ek, &w);
+    assert(w.ekey >= pBlockInfo->window.skey);
+
+    if (w.ekey < pBlockInfo->window.ekey) {
+      return true;
+    }
+
+    while(1) {
+      GET_NEXT_TIMEWINDOW(pQuery, &w);
+      if (w.skey > pBlockInfo->window.ekey) {
+        break;
+      }
+
+      assert(w.ekey > pBlockInfo->window.ekey);
+      if (w.skey <= pBlockInfo->window.ekey && w.skey > pBlockInfo->window.skey) {
+        return true;
+      }
+    }
+  } else {
+    getAlignQueryTimeWindow(pQuery, pBlockInfo->window.ekey, sk, ek, &w);
+    assert(w.skey <= pBlockInfo->window.ekey);
+
+    if (w.skey > pBlockInfo->window.skey) {
+      return true;
+    }
+
+    while(1) {
+      GET_NEXT_TIMEWINDOW(pQuery, &w);
+      if (w.ekey < pBlockInfo->window.skey) {
+        break;
+      }
+
+      assert(w.skey < pBlockInfo->window.skey);
+      if (w.ekey < pBlockInfo->window.ekey && w.ekey >= pBlockInfo->window.skey) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+int32_t loadDataBlockOnDemand(SQueryRuntimeEnv *pRuntimeEnv, void* pQueryHandle, SDataBlockInfo* pBlockInfo, SDataStatis **pStatis, SArray** pDataBlock, uint32_t* status) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  *status = 0;
+  if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf > 0) {
+    *status = BLK_DATA_ALL_NEEDED;
+  } else { // check if this data block is required to load
+
+    // Calculate all time windows that are overlapping or contain current data block.
+    // If current data block is contained by all possible time window, do not load current data block.
+    if (QUERY_IS_INTERVAL_QUERY(pQuery) && overlapWithTimeWindow(pQuery, pBlockInfo)) {
+      *status = BLK_DATA_ALL_NEEDED;
+    }
+
+    if ((*status) != BLK_DATA_ALL_NEEDED) {
+      for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+        SSqlFuncMsg* pSqlFunc = &pQuery->pSelectExpr[i].base;
+
+        int32_t functionId = pSqlFunc->functionId;
+        int32_t colId = pSqlFunc->colInfo.colId;
+
+        (*status) |= aAggs[functionId].dataReqFunc(&pRuntimeEnv->pCtx[i], pBlockInfo->window.skey, pBlockInfo->window.ekey, colId);
+        if (((*status) & BLK_DATA_ALL_NEEDED) == BLK_DATA_ALL_NEEDED) {
+          break;
+        }
+      }
+    }
+  }
+
+  if ((*status) == BLK_DATA_NO_NEEDED) {
+    qDebug("QInfo:%p data block discard, brange:%"PRId64 "-%"PRId64", rows:%d", GET_QINFO_ADDR(pRuntimeEnv),
+           pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
+    pRuntimeEnv->summary.discardBlocks += 1;
+  } else if ((*status) == BLK_DATA_STATIS_NEEDED) {
+
+    // this function never returns error?
+    tsdbRetrieveDataBlockStatisInfo(pQueryHandle, pStatis);
+
+    pRuntimeEnv->summary.loadBlockStatis += 1;
+
+    if (*pStatis == NULL) { // data block statistics does not exist, load data block
+      *pDataBlock = tsdbRetrieveDataBlock(pQueryHandle, NULL);
+      pRuntimeEnv->summary.totalCheckedRows += pBlockInfo->rows;
+    }
+  } else {
+    assert((*status) == BLK_DATA_ALL_NEEDED);
+
+    // load the data block statistics to perform further filter
+    pRuntimeEnv->summary.loadBlockStatis += 1;
+    tsdbRetrieveDataBlockStatisInfo(pQueryHandle, pStatis);
+
+    if (!needToLoadDataBlock(pRuntimeEnv, *pStatis, pRuntimeEnv->pCtx, pBlockInfo->rows)) {
+      // current block has been discard due to filter applied
+      pRuntimeEnv->summary.discardBlocks += 1;
+      qDebug("QInfo:%p data block discard, brange:%"PRId64 "-%"PRId64", rows:%d", GET_QINFO_ADDR(pRuntimeEnv),
+          pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
+      (*status) = BLK_DATA_DISCARD;
+    }
+
+    pRuntimeEnv->summary.totalCheckedRows += pBlockInfo->rows;
+    pRuntimeEnv->summary.loadBlocks += 1;
+    *pDataBlock = tsdbRetrieveDataBlock(pQueryHandle, NULL);
+    if (*pDataBlock == NULL) {
+      return terrno;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t binarySearchForKey(char *pValue, int num, TSKEY key, int order) {
+  int32_t midPos = -1;
+  int32_t numOfRows;
+
+  if (num <= 0) {
+    return -1;
+  }
+
+  assert(order == TSDB_ORDER_ASC || order == TSDB_ORDER_DESC);
+
+  TSKEY * keyList = (TSKEY *)pValue;
+  int32_t firstPos = 0;
+  int32_t lastPos = num - 1;
+
+  if (order == TSDB_ORDER_DESC) {
+    // find the first position which is smaller than the key
+    while (1) {
+      if (key >= keyList[lastPos]) return lastPos;
+      if (key == keyList[firstPos]) return firstPos;
+      if (key < keyList[firstPos]) return firstPos - 1;
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+
+  } else {
+    // find the first position which is bigger than the key
+    while (1) {
+      if (key <= keyList[firstPos]) return firstPos;
+      if (key == keyList[lastPos]) return lastPos;
+
+      if (key > keyList[lastPos]) {
+        lastPos = lastPos + 1;
+        if (lastPos >= num)
+          return -1;
+        else
+          return lastPos;
+      }
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+  }
+
+  return midPos;
+}
+
+static void ensureOutputBufferSimple(SQueryRuntimeEnv* pRuntimeEnv, int32_t capacity) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+
+  if (capacity < pQuery->rec.capacity) {
+    return;
+  }
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t bytes = pQuery->pSelectExpr[i].bytes;
+    assert(bytes > 0 && capacity > 0);
+
+    char *tmp = realloc(pQuery->sdata[i], bytes * capacity + sizeof(tFilePage));
+    if (tmp == NULL) {  // todo handle the oom
+      longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+    } else {
+      pQuery->sdata[i] = (tFilePage *)tmp;
+    }
+
+    // set the pCtx output buffer position
+    pRuntimeEnv->pCtx[i].aOutputBuf = pQuery->sdata[i]->data;
+  }
+
+  qDebug("QInfo:%p realloc output buffer to inc output buffer from: %" PRId64 " rows to:%d rows", GET_QINFO_ADDR(pRuntimeEnv),
+         pQuery->rec.capacity, capacity);
+
+  pQuery->rec.capacity = capacity;
+}
+
+static void ensureOutputBuffer(SQueryRuntimeEnv* pRuntimeEnv, SDataBlockInfo* pBlockInfo) {
+  // in case of prj/diff query, ensure the output buffer is sufficient to accommodate the results of current block
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  if (!QUERY_IS_INTERVAL_QUERY(pQuery) && !pRuntimeEnv->groupbyNormalCol && !isFixedOutputQuery(pRuntimeEnv) && !isTSCompQuery(pQuery)) {
+    SResultRec *pRec = &pQuery->rec;
+
+    if (pQuery->rec.capacity - pQuery->rec.rows < pBlockInfo->rows) {
+      int32_t remain = (int32_t)(pRec->capacity - pRec->rows);
+      int32_t newSize = (int32_t)(pRec->capacity + (pBlockInfo->rows - remain));
+
+      for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+        int32_t bytes = pQuery->pSelectExpr[i].bytes;
+        assert(bytes > 0 && newSize > 0);
+
+        char *tmp = realloc(pQuery->sdata[i], bytes * newSize + sizeof(tFilePage));
+        if (tmp == NULL) {  // todo handle the oom
+          longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+        } else {
+          memset(tmp + sizeof(tFilePage) + bytes * pRec->rows, 0, (size_t)((newSize - pRec->rows) * bytes));
+          pQuery->sdata[i] = (tFilePage *)tmp;
+        }
+
+        // set the pCtx output buffer position
+        pRuntimeEnv->pCtx[i].aOutputBuf = pQuery->sdata[i]->data + pRec->rows * bytes;
+
+        int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+        if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
+          pRuntimeEnv->pCtx[i].ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
+        }
+      }
+
+      qDebug("QInfo:%p realloc output buffer, new size: %d rows, old:%" PRId64 ", remain:%" PRId64, GET_QINFO_ADDR(pRuntimeEnv),
+             newSize, pRec->capacity, newSize - pRec->rows);
+
+      pRec->capacity = newSize;
+    }
+  }
+}
+
+static void doSetInitialTimewindow(SQueryRuntimeEnv* pRuntimeEnv, SDataBlockInfo* pBlockInfo) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) && pRuntimeEnv->windowResInfo.prevSKey == TSKEY_INITIAL_VAL) {
+    STimeWindow w = TSWINDOW_INITIALIZER;
+    SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+
+    if (QUERY_IS_ASC_QUERY(pQuery)) {
+      getAlignQueryTimeWindow(pQuery, pBlockInfo->window.skey, pBlockInfo->window.skey, pQuery->window.ekey, &w);
+      pWindowResInfo->startTime = w.skey;
+      pWindowResInfo->prevSKey = w.skey;
+    } else {
+      // the start position of the first time window in the endpoint that spreads beyond the queried last timestamp
+      getAlignQueryTimeWindow(pQuery, pBlockInfo->window.ekey, pQuery->window.ekey, pBlockInfo->window.ekey, &w);
+
+      pWindowResInfo->startTime = pQuery->window.skey;
+      pWindowResInfo->prevSKey = w.skey;
+    }
+  }
+}
+
+static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+  SQueryCostInfo*  summary  = &pRuntimeEnv->summary;
+
+  qDebug("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", lastkey:%" PRId64 ", order:%d",
+         GET_QINFO_ADDR(pRuntimeEnv), pTableQueryInfo->win.skey, pTableQueryInfo->win.ekey, pTableQueryInfo->lastKey,
+         pQuery->order.order);
+
+  TsdbQueryHandleT pQueryHandle = IS_MASTER_SCAN(pRuntimeEnv)? pRuntimeEnv->pQueryHandle : pRuntimeEnv->pSecQueryHandle;
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER;
+  while (tsdbNextDataBlock(pQueryHandle)) {
+    summary->totalBlocks += 1;
+
+    if (IS_QUERY_KILLED(GET_QINFO_ADDR(pRuntimeEnv))) {
+      longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+    }
+
+    tsdbRetrieveDataBlockInfo(pQueryHandle, &blockInfo);
+    doSetInitialTimewindow(pRuntimeEnv, &blockInfo);
+
+    // in case of prj/diff query, ensure the output buffer is sufficient to accommodate the results of current block
+    ensureOutputBuffer(pRuntimeEnv, &blockInfo);
+
+    SDataStatis *pStatis = NULL;
+    SArray *     pDataBlock = NULL;
+    uint32_t     status = 0;
+
+    int32_t ret = loadDataBlockOnDemand(pRuntimeEnv, pQueryHandle, &blockInfo, &pStatis, &pDataBlock, &status);
+    if (ret != TSDB_CODE_SUCCESS) {
+      break;
+    }
+
+    if (status == BLK_DATA_DISCARD) {
+      pQuery->current->lastKey =
+              QUERY_IS_ASC_QUERY(pQuery) ? blockInfo.window.ekey + step : blockInfo.window.skey + step;
+      continue;
+    }
+
+    // query start position can not move into tableApplyFunctionsOnBlock due to limit/offset condition
+    pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : blockInfo.rows - 1;
+    int32_t numOfRes = tableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, pStatis, binarySearchForKey, pDataBlock);
+
+    summary->totalRows += blockInfo.rows;
+    qDebug("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, numOfRes:%d, lastKey:%"PRId64, GET_QINFO_ADDR(pRuntimeEnv),
+           blockInfo.window.skey, blockInfo.window.ekey, blockInfo.rows, numOfRes, pQuery->current->lastKey);
+
+    // while the output buffer is full or limit/offset is applied, query may be paused here
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL | QUERY_COMPLETED)) {
+      break;
+    }
+  }
+
+  if (terrno != TSDB_CODE_SUCCESS) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+
+  // if the result buffer is not full, set the query complete
+  if (!Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL)) {
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+  }
+
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) && IS_MASTER_SCAN(pRuntimeEnv)) {
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+      closeAllTimeWindow(&pRuntimeEnv->windowResInfo);
+      pRuntimeEnv->windowResInfo.curIndex = pRuntimeEnv->windowResInfo.size - 1;  // point to the last time window
+    } else {
+      assert(Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL));
+    }
+  }
+
+  return 0;
+}
+
+/*
+ * set tag value in SQLFunctionCtx
+ * e.g.,tag information into input buffer
+ */
+static void doSetTagValueInParam(void *tsdb, void* pTable, int32_t tagColId, tVariant *tag, int16_t type, int16_t bytes) {
+  tVariantDestroy(tag);
+
+  if (tagColId == TSDB_TBNAME_COLUMN_INDEX) {
+    char* val = tsdbGetTableName(pTable);
+    assert(val != NULL);
+
+    tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), TSDB_DATA_TYPE_BINARY);
+  } else {
+    char* val = tsdbGetTableTagVal(pTable, tagColId, type, bytes);
+    if (val == NULL) {
+      tag->nType = TSDB_DATA_TYPE_NULL;
+      return;
+    }
+
+    if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+      if (isNull(val, type)) {
+        tag->nType = TSDB_DATA_TYPE_NULL;
+        return;
+      }
+
+      tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), type);
+    } else {
+      if (isNull(val, type)) {
+        tag->nType = TSDB_DATA_TYPE_NULL;
+        return;
+      }
+
+      tVariantCreateFromBinary(tag, val, bytes, type);
+    }
+  }
+}
+
+static SColumnInfo* doGetTagColumnInfoById(SColumnInfo* pTagColList, int32_t numOfTags, int16_t colId) {
+  assert(pTagColList != NULL && numOfTags > 0);
+
+  for(int32_t i = 0; i < numOfTags; ++i) {
+    if (pTagColList[i].colId == colId) {
+      return &pTagColList[i];
+    }
+  }
+
+  return NULL;
+}
+
+void setTagVal(SQueryRuntimeEnv *pRuntimeEnv, void *pTable, void *tsdb) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  SQInfo* pQInfo = GET_QINFO_ADDR(pRuntimeEnv);
+
+  SExprInfo *pExprInfo = &pQuery->pSelectExpr[0];
+  if (pQuery->numOfOutput == 1 && pExprInfo->base.functionId == TSDB_FUNC_TS_COMP) {
+    assert(pExprInfo->base.numOfParams == 1);
+
+    int16_t tagColId = (int16_t)pExprInfo->base.arg->argValue.i64;
+    SColumnInfo* pColInfo = doGetTagColumnInfoById(pQuery->tagColList, pQuery->numOfTags, tagColId);
+
+    doSetTagValueInParam(tsdb, pTable, tagColId, &pRuntimeEnv->pCtx[0].tag, pColInfo->type, pColInfo->bytes);
+  } else {
+    // set tag value, by which the results are aggregated.
+    for (int32_t idx = 0; idx < pQuery->numOfOutput; ++idx) {
+      SExprInfo* pLocalExprInfo = &pQuery->pSelectExpr[idx];
+
+      // ts_comp column required the tag value for join filter
+      if (!TSDB_COL_IS_TAG(pLocalExprInfo->base.colInfo.flag)) {
+        continue;
+      }
+
+      // todo use tag column index to optimize performance
+      doSetTagValueInParam(tsdb, pTable, pLocalExprInfo->base.colInfo.colId, &pRuntimeEnv->pCtx[idx].tag,
+                           pLocalExprInfo->type, pLocalExprInfo->bytes);
+    }
+
+    // set the join tag for first column
+    SSqlFuncMsg *pFuncMsg = &pExprInfo->base;
+    if ((pFuncMsg->functionId == TSDB_FUNC_TS || pFuncMsg->functionId == TSDB_FUNC_PRJ) && pRuntimeEnv->pTSBuf != NULL &&
+        pFuncMsg->colInfo.colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      assert(pFuncMsg->numOfParams == 1);
+
+      int16_t tagColId = (int16_t)pExprInfo->base.arg->argValue.i64;
+      SColumnInfo* pColInfo = doGetTagColumnInfoById(pQuery->tagColList, pQuery->numOfTags, tagColId);
+
+      doSetTagValueInParam(tsdb, pTable, tagColId, &pRuntimeEnv->pCtx[0].tag, pColInfo->type, pColInfo->bytes);
+      qDebug("QInfo:%p set tag value for join comparison, colId:%" PRId64 ", val:%"PRId64, pQInfo, pExprInfo->base.arg->argValue.i64,
+          pRuntimeEnv->pCtx[0].tag.i64Key)
+    }
+  }
+}
+
+static void doMerge(SQueryRuntimeEnv *pRuntimeEnv, int64_t timestamp, SWindowResult *pWindowRes, bool mergeFlag) {
+  SQuery *        pQuery = pRuntimeEnv->pQuery;
+  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
+
+  tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes->pos.pageId);
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (!mergeFlag) {
+      pCtx[i].aOutputBuf = pCtx[i].aOutputBuf + pCtx[i].outputBytes;
+      pCtx[i].currentStage = FIRST_STAGE_MERGE;
+
+      RESET_RESULT_INFO(pCtx[i].resultInfo);
+      aAggs[functionId].init(&pCtx[i]);
+    }
+
+    pCtx[i].hasNull = true;
+    pCtx[i].nStartQueryTimestamp = timestamp;
+    pCtx[i].aInputElemBuf = getPosInResultPage(pRuntimeEnv, i, pWindowRes, page);
+
+    // in case of tag column, the tag information should be extracted from input buffer
+    if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TAG) {
+      tVariantDestroy(&pCtx[i].tag);
+
+      int32_t type = pCtx[i].outputType;
+      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+        tVariantCreateFromBinary(&pCtx[i].tag, varDataVal(pCtx[i].aInputElemBuf), varDataLen(pCtx[i].aInputElemBuf), type);
+      } else {
+        tVariantCreateFromBinary(&pCtx[i].tag, pCtx[i].aInputElemBuf, pCtx[i].inputBytes, pCtx[i].inputType);
+      }
+
+    }
+  }
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TAG_DUMMY) {
+      continue;
+    }
+
+    aAggs[functionId].distMergeFunc(&pCtx[i]);
+  }
+}
+
+static UNUSED_FUNC void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) {
+  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) {
+    switch (srcDataType) {
+      case TSDB_DATA_TYPE_BINARY:
+        printf("%" PRId64 ",%s\t", *(TSKEY *)data, (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_TINYINT:
+      case TSDB_DATA_TYPE_BOOL:
+        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int8_t *)(data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int16_t *)(data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_BIGINT:
+      case TSDB_DATA_TYPE_TIMESTAMP:
+        printf("%" PRId64 ",%" PRId64 "\t", *(TSKEY *)data, *(TSKEY *)(data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_INT:
+        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int32_t *)(data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_FLOAT:
+        printf("%" PRId64 ",%f\t", *(TSKEY *)data, *(float *)(data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_DOUBLE:
+        printf("%" PRId64 ",%lf\t", *(TSKEY *)data, *(double *)(data + TSDB_KEYSIZE + 1));
+        break;
+    }
+  } else if (functionId == TSDB_FUNC_AVG) {
+    printf("%lf,%d\t", *(double *)data, *(int32_t *)(data + sizeof(double)));
+  } else if (functionId == TSDB_FUNC_SPREAD) {
+    printf("%lf,%lf\t", *(double *)data, *(double *)(data + sizeof(double)));
+  } else if (functionId == TSDB_FUNC_TWA) {
+    data += 1;
+    printf("%lf,%" PRId64 ",%" PRId64 ",%" PRId64 "\t", *(double *)data, *(int64_t *)(data + 8),
+           *(int64_t *)(data + 16), *(int64_t *)(data + 24));
+  } else if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) {
+    switch (srcDataType) {
+      case TSDB_DATA_TYPE_TINYINT:
+      case TSDB_DATA_TYPE_BOOL:
+        printf("%d\t", *(int8_t *)data);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        printf("%d\t", *(int16_t *)data);
+        break;
+      case TSDB_DATA_TYPE_BIGINT:
+      case TSDB_DATA_TYPE_TIMESTAMP:
+        printf("%" PRId64 "\t", *(int64_t *)data);
+        break;
+      case TSDB_DATA_TYPE_INT:
+        printf("%d\t", *(int *)data);
+        break;
+      case TSDB_DATA_TYPE_FLOAT:
+        printf("%f\t", *(float *)data);
+        break;
+      case TSDB_DATA_TYPE_DOUBLE:
+        printf("%f\t", *(float *)data);
+        break;
+    }
+  } else if (functionId == TSDB_FUNC_SUM) {
+    if (srcDataType == TSDB_DATA_TYPE_FLOAT || srcDataType == TSDB_DATA_TYPE_DOUBLE) {
+      printf("%lf\t", *(float *)data);
+    } else {
+      printf("%" PRId64 "\t", *(int64_t *)data);
+    }
+  } else {
+    printf("%s\t", data);
+  }
+}
+
+void UNUSED_FUNC displayInterResult(tFilePage **pdata, SQueryRuntimeEnv* pRuntimeEnv, int32_t numOfRows) {
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  int32_t numOfCols = pQuery->numOfOutput;
+  printf("super table query intermediate result, total:%d\n", numOfRows);
+
+  for (int32_t j = 0; j < numOfRows; ++j) {
+    for (int32_t i = 0; i < numOfCols; ++i) {
+
+      switch (pQuery->pSelectExpr[i].type) {
+        case TSDB_DATA_TYPE_BINARY: {
+          int32_t type = pQuery->pSelectExpr[i].type;
+          printBinaryData(pQuery->pSelectExpr[i].base.functionId, pdata[i]->data + pQuery->pSelectExpr[i].bytes * j,
+                          type);
+          break;
+        }
+        case TSDB_DATA_TYPE_TIMESTAMP:
+        case TSDB_DATA_TYPE_BIGINT:
+          printf("%" PRId64 "\t", *(int64_t *)(pdata[i]->data + pQuery->pSelectExpr[i].bytes * j));
+          break;
+        case TSDB_DATA_TYPE_INT:
+          printf("%d\t", *(int32_t *)(pdata[i]->data + pQuery->pSelectExpr[i].bytes * j));
+          break;
+        case TSDB_DATA_TYPE_FLOAT:
+          printf("%f\t", *(float *)(pdata[i]->data + pQuery->pSelectExpr[i].bytes * j));
+          break;
+        case TSDB_DATA_TYPE_DOUBLE:
+          printf("%lf\t", *(double *)(pdata[i]->data + pQuery->pSelectExpr[i].bytes * j));
+          break;
+      }
+    }
+    printf("\n");
+  }
+}
+
+typedef struct SCompSupporter {
+  STableQueryInfo **pTableQueryInfo;
+  int32_t *         position;
+  SQInfo *          pQInfo;
+} SCompSupporter;
+
+int32_t tableResultComparFn(const void *pLeft, const void *pRight, void *param) {
+  int32_t left = *(int32_t *)pLeft;
+  int32_t right = *(int32_t *)pRight;
+
+  SCompSupporter *  supporter = (SCompSupporter *)param;
+  SQueryRuntimeEnv *pRuntimeEnv = &supporter->pQInfo->runtimeEnv;
+
+  int32_t leftPos = supporter->position[left];
+  int32_t rightPos = supporter->position[right];
+
+  /* left source is exhausted */
+  if (leftPos == -1) {
+    return 1;
+  }
+
+  /* right source is exhausted*/
+  if (rightPos == -1) {
+    return -1;
+  }
+
+  SWindowResInfo *pWindowResInfo1 = &supporter->pTableQueryInfo[left]->windowResInfo;
+  SWindowResult * pWindowRes1 = getWindowResult(pWindowResInfo1, leftPos);
+  tFilePage *page1 = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes1->pos.pageId);
+
+  char *b1 = getPosInResultPage(pRuntimeEnv, PRIMARYKEY_TIMESTAMP_COL_INDEX, pWindowRes1, page1);
+  TSKEY leftTimestamp = GET_INT64_VAL(b1);
+
+  SWindowResInfo *pWindowResInfo2 = &supporter->pTableQueryInfo[right]->windowResInfo;
+  SWindowResult * pWindowRes2 = getWindowResult(pWindowResInfo2, rightPos);
+  tFilePage *page2 = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes2->pos.pageId);
+
+  char *b2 = getPosInResultPage(pRuntimeEnv, PRIMARYKEY_TIMESTAMP_COL_INDEX, pWindowRes2, page2);
+  TSKEY rightTimestamp = GET_INT64_VAL(b2);
+
+  if (leftTimestamp == rightTimestamp) {
+    return 0;
+  }
+
+  return leftTimestamp > rightTimestamp ? 1 : -1;
+}
+
+int32_t mergeIntoGroupResult(SQInfo *pQInfo) {
+  int64_t st = taosGetTimestampUs();
+  int32_t ret = TSDB_CODE_SUCCESS;
+
+  int32_t numOfGroups = (int32_t)(GET_NUM_OF_TABLEGROUP(pQInfo));
+
+  while (pQInfo->groupIndex < numOfGroups) {
+    SArray *group = GET_TABLEGROUP(pQInfo, pQInfo->groupIndex);
+    ret = mergeIntoGroupResultImpl(pQInfo, group);
+    if (ret < 0) {  // not enough disk space to save the data into disk
+      return -1;
+    }
+
+    pQInfo->groupIndex += 1;
+
+    // this group generates at least one result, return results
+    if (ret > 0) {
+      break;
+    }
+
+    assert(pQInfo->groupResInfo.numOfDataPages == 0);
+    qDebug("QInfo:%p no result in group %d, continue", pQInfo, pQInfo->groupIndex - 1);
+  }
+
+  SGroupResInfo* info = &pQInfo->groupResInfo;
+  if (pQInfo->groupIndex == numOfGroups && info->pos.pageId == info->numOfDataPages) {
+    SET_STABLE_QUERY_OVER(pQInfo);
+  }
+
+  int64_t elapsedTime = taosGetTimestampUs() - st;
+  qDebug("QInfo:%p merge res data into group, index:%d, total group:%d, elapsed time:%" PRId64 "us", pQInfo,
+         pQInfo->groupIndex - 1, numOfGroups, elapsedTime);
+
+  pQInfo->runtimeEnv.summary.firstStageMergeTime += elapsedTime;
+  return TSDB_CODE_SUCCESS;
+}
+
+void copyResToQueryResultBuf(SQInfo *pQInfo, SQuery *pQuery) {
+  SGroupResInfo* pGroupResInfo = &pQInfo->groupResInfo;
+
+  // all results have been return to client, try next group
+  if (pGroupResInfo->pos.pageId == pGroupResInfo->numOfDataPages) {
+    pGroupResInfo->numOfDataPages = 0;
+    pGroupResInfo->pos.pageId = 0;
+    pGroupResInfo->pos.rowId = 0;
+
+    // current results of group has been sent to client, try next group
+    if (mergeIntoGroupResult(pQInfo) != TSDB_CODE_SUCCESS) {
+      return;  // failed to save data in the disk
+    }
+
+    // check if all results has been sent to client
+    int32_t numOfGroup = (int32_t)(GET_NUM_OF_TABLEGROUP(pQInfo));
+    if (pGroupResInfo->numOfDataPages == 0 && pQInfo->groupIndex == numOfGroup) {
+      SET_STABLE_QUERY_OVER(pQInfo);
+      return;
+    }
+  }
+
+  SQueryRuntimeEnv *   pRuntimeEnv = &pQInfo->runtimeEnv;
+  SDiskbasedResultBuf *pResultBuf = pRuntimeEnv->pResultBuf;
+
+  int32_t id = pQInfo->groupResInfo.groupId;
+  SIDList list = getDataBufPagesIdList(pResultBuf, id);
+
+  int32_t offset = 0;
+  int32_t numOfCopiedRows = 0;
+
+  size_t size = taosArrayGetSize(list);
+  assert(size == pGroupResInfo->numOfDataPages);
+
+  bool done = false;
+  for (int32_t j = pGroupResInfo->pos.pageId; j < size; ++j) {
+    SPageInfo* pi = *(SPageInfo**) taosArrayGet(list, j);
+    tFilePage* pData = getResBufPage(pResultBuf, pi->pageId);
+
+    assert(pData->num > 0 && pData->num <= pRuntimeEnv->numOfRowsPerPage && pGroupResInfo->pos.rowId < pData->num);
+    int32_t numOfRes = (int32_t)(pData->num - pGroupResInfo->pos.rowId);
+
+    if (numOfRes > pQuery->rec.capacity - offset) {
+      numOfCopiedRows = (int32_t)(pQuery->rec.capacity - offset);
+      pGroupResInfo->pos.rowId += numOfCopiedRows;
+      done = true;
+    } else {
+      numOfCopiedRows = (int32_t)pData->num;
+
+      pGroupResInfo->pos.pageId += 1;
+      pGroupResInfo->pos.rowId = 0;
+    }
+
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      int32_t bytes = pRuntimeEnv->pCtx[i].outputBytes;
+      char *  pDest = pQuery->sdata[i]->data;
+
+      memcpy(pDest + offset * bytes, pData->data + pRuntimeEnv->offset[i] * pRuntimeEnv->numOfRowsPerPage,
+          (size_t)bytes * numOfCopiedRows);
+    }
+
+    offset += numOfCopiedRows;
+    if (done) {
+      break;
+    }
+  }
+
+  assert(pQuery->rec.rows == 0);
+  pQuery->rec.rows += offset;
+}
+
+int64_t getNumOfResultWindowRes(SQuery *pQuery, SWindowResult *pWindowRes) {
+  for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+    int32_t functionId = pQuery->pSelectExpr[j].base.functionId;
+
+    /*
+     * ts, tag, tagprj function can not decide the output number of current query
+     * the number of output result is decided by main output
+     */
+    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ) {
+      continue;
+    }
+
+    SResultInfo *pResultInfo = &pWindowRes->resultInfo[j];
+    assert(pResultInfo != NULL);
+
+    if (pResultInfo->numOfRes > 0) {
+      return pResultInfo->numOfRes;
+    }
+  }
+
+  return 0;
+}
+
+int32_t mergeIntoGroupResultImpl(SQInfo *pQInfo, SArray *pGroup) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  size_t size = taosArrayGetSize(pGroup);
+  tFilePage **buffer = pQuery->sdata;
+
+  int32_t *posList = calloc(size, sizeof(int32_t));
+  STableQueryInfo **pTableList = malloc(POINTER_BYTES * size);
+
+  if (pTableList == NULL || posList == NULL) {
+    taosTFree(posList);
+    taosTFree(pTableList);
+
+    qError("QInfo:%p failed alloc memory", pQInfo);
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
+  // todo opt for the case of one table per group
+  int32_t numOfTables = 0;
+  SIDList pageList = NULL;
+  int32_t tid = -1;
+
+  for (int32_t i = 0; i < size; ++i) {
+    STableQueryInfo *item = taosArrayGetP(pGroup, i);
+
+    SIDList list = getDataBufPagesIdList(pRuntimeEnv->pResultBuf, TSDB_TABLEID(item->pTable)->tid);
+    if (taosArrayGetSize(list) > 0 && item->windowResInfo.size > 0) {
+      pTableList[numOfTables++] = item;
+      tid = TSDB_TABLEID(item->pTable)->tid;
+      pageList = list;
+    }
+  }
+
+  // there is no data in current group
+  if (numOfTables == 0) {
+    taosTFree(posList);
+    taosTFree(pTableList);
+    return 0;
+  } else if (numOfTables == 1) { // no need to merge results since only one table in each group
+    taosTFree(posList);
+    taosTFree(pTableList);
+
+    SGroupResInfo* pGroupResInfo = &pQInfo->groupResInfo;
+
+    pGroupResInfo->numOfDataPages = (int32_t)taosArrayGetSize(pageList);
+    pGroupResInfo->groupId = tid;
+    pGroupResInfo->pos.pageId = 0;
+    pGroupResInfo->pos.rowId = 0;
+
+    return pGroupResInfo->numOfDataPages;
+  }
+
+  SCompSupporter cs = {pTableList, posList, pQInfo};
+
+  SLoserTreeInfo *pTree = NULL;
+  tLoserTreeCreate(&pTree, numOfTables, &cs, tableResultComparFn);
+
+  SResultInfo *pResultInfo = calloc(pQuery->numOfOutput, sizeof(SResultInfo));
+  if (pResultInfo == NULL) {
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
+  char* buf = calloc(1, pRuntimeEnv->interBufSize);
+  if (buf == NULL) {
+    longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
+  }
+
+  setWindowResultInfo(pResultInfo, pQuery, pRuntimeEnv->stableQuery, buf);
+  resetMergeResultBuf(pQuery, pRuntimeEnv->pCtx, pResultInfo);
+
+  pQInfo->groupResInfo.groupId = getGroupResultId(pQInfo->groupIndex);
+
+  // todo add windowRes iterator
+  int64_t lastTimestamp = -1;
+  int64_t startt = taosGetTimestampMs();
+
+  while (1) {
+    if (IS_QUERY_KILLED(pQInfo)) {
+      qDebug("QInfo:%p it is already killed, abort", pQInfo);
+
+      taosTFree(pTableList);
+      taosTFree(posList);
+      taosTFree(pTree);
+      taosTFree(pResultInfo);
+      taosTFree(buf);
+
+      longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+    }
+
+    int32_t pos = pTree->pNode[0].index;
+
+    SWindowResInfo *pWindowResInfo = &pTableList[pos]->windowResInfo;
+    SWindowResult  *pWindowRes = getWindowResult(pWindowResInfo, cs.position[pos]);
+    tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes->pos.pageId);
+
+    char *b = getPosInResultPage(pRuntimeEnv, PRIMARYKEY_TIMESTAMP_COL_INDEX, pWindowRes, page);
+    TSKEY ts = GET_INT64_VAL(b);
+
+    assert(ts == pWindowRes->win.skey);
+    int64_t num = getNumOfResultWindowRes(pQuery, pWindowRes);
+    if (num <= 0) {
+      cs.position[pos] += 1;
+
+      if (cs.position[pos] >= pWindowResInfo->size) {
+        cs.position[pos] = -1;
+
+        // all input sources are exhausted
+        if (--numOfTables == 0) {
+          break;
+        }
+      }
+    } else {
+      if (ts == lastTimestamp) {  // merge with the last one
+        doMerge(pRuntimeEnv, ts, pWindowRes, true);
+      } else {  // copy data to disk buffer
+        if (buffer[0]->num == pQuery->rec.capacity) {
+          if (flushFromResultBuf(pRuntimeEnv, &pQInfo->groupResInfo) != TSDB_CODE_SUCCESS) {
+            return -1;
+          }
+
+          resetMergeResultBuf(pQuery, pRuntimeEnv->pCtx, pResultInfo);
+        }
+
+        doMerge(pRuntimeEnv, ts, pWindowRes, false);
+        buffer[0]->num += 1;
+      }
+
+      lastTimestamp = ts;
+
+      // move to the next element of current entry
+      int32_t currentPageId = pWindowRes->pos.pageId;
+
+      cs.position[pos] += 1;
+      if (cs.position[pos] >= pWindowResInfo->size) {
+        cs.position[pos] = -1;
+
+        // all input sources are exhausted
+        if (--numOfTables == 0) {
+          break;
+        }
+      } else {
+        // current page is not needed anymore
+        SWindowResult  *pNextWindowRes = getWindowResult(pWindowResInfo, cs.position[pos]);
+        if (pNextWindowRes->pos.pageId != currentPageId) {
+          releaseResBufPage(pRuntimeEnv->pResultBuf, page);
+        }
+      }
+    }
+
+    tLoserTreeAdjust(pTree, pos + pTree->numOfEntries);
+  }
+
+  if (buffer[0]->num != 0) {  // there are data in buffer
+    if (flushFromResultBuf(pRuntimeEnv, &pQInfo->groupResInfo) != TSDB_CODE_SUCCESS) {
+      qError("QInfo:%p failed to flush data into temp file, abort query", pQInfo);
+
+      taosTFree(pTree);
+      taosTFree(pTableList);
+      taosTFree(posList);
+      taosTFree(pResultInfo);
+
+      return -1;
+    }
+  }
+
+  int64_t endt = taosGetTimestampMs();
+
+#ifdef _DEBUG_VIEW
+  displayInterResult(pQuery->sdata, pRuntimeEnv, pQuery->sdata[0]->num);
+#endif
+
+  qDebug("QInfo:%p result merge completed for group:%d, elapsed time:%" PRId64 " ms", pQInfo, pQInfo->groupIndex, endt - startt);
+
+  taosTFree(pTableList);
+  taosTFree(posList);
+  taosTFree(pTree);
+
+  taosTFree(pResultInfo);
+  taosTFree(buf);
+
+  return pQInfo->groupResInfo.numOfDataPages;
+}
+
+int32_t flushFromResultBuf(SQueryRuntimeEnv* pRuntimeEnv, SGroupResInfo* pGroupResInfo) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  SDiskbasedResultBuf *pResultBuf = pRuntimeEnv->pResultBuf;
+
+  // the base value for group result, since the maximum number of table for each vnode will not exceed 100,000.
+  int32_t pageId = -1;
+  int32_t capacity = pResultBuf->numOfRowsPerPage;
+
+  int32_t remain = (int32_t) pQuery->sdata[0]->num;
+  int32_t offset = 0;
+
+  while (remain > 0) {
+    int32_t rows = (remain > capacity)? capacity:remain;
+    assert(rows > 0);
+
+    // get the output buffer page
+    tFilePage *buf = getNewDataBuf(pResultBuf, pGroupResInfo->groupId, &pageId);
+    buf->num = rows;
+
+    // pagewisely copy to dest buffer
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      int32_t bytes = pRuntimeEnv->pCtx[i].outputBytes;
+
+      char* output = buf->data + pRuntimeEnv->offset[i] * pRuntimeEnv->numOfRowsPerPage;
+      char* src = ((char *) pQuery->sdata[i]->data) + offset * bytes;
+      memcpy(output, src, (size_t)(buf->num * bytes));
+    }
+
+    offset += rows;
+    remain -= rows;
+
+    pGroupResInfo->numOfDataPages += 1;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void resetMergeResultBuf(SQuery *pQuery, SQLFunctionCtx *pCtx, SResultInfo *pResultInfo) {
+  for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+    pCtx[k].aOutputBuf = pQuery->sdata[k]->data - pCtx[k].outputBytes;
+    pCtx[k].size = 1;
+    pCtx[k].startOffset = 0;
+    pCtx[k].resultInfo = &pResultInfo[k];
+
+    pQuery->sdata[k]->num = 0;
+  }
+}
+
+static void updateTableQueryInfoForReverseScan(SQuery *pQuery, STableQueryInfo *pTableQueryInfo) {
+  if (pTableQueryInfo == NULL) {
+    return;
+  }
+
+  // order has changed already
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  // TODO validate the assertion
+//  if (!QUERY_IS_ASC_QUERY(pQuery)) {
+//    assert(pTableQueryInfo->win.ekey >= pTableQueryInfo->lastKey + step);
+//  } else {
+//    assert(pTableQueryInfo->win.ekey <= pTableQueryInfo->lastKey + step);
+//  }
+
+  if (pTableQueryInfo->lastKey == pTableQueryInfo->win.skey) {
+    // do nothing, no results
+  } else {
+    pTableQueryInfo->win.ekey = pTableQueryInfo->lastKey + step;
+  }
+
+  SWAP(pTableQueryInfo->win.skey, pTableQueryInfo->win.ekey, TSKEY);
+  pTableQueryInfo->lastKey = pTableQueryInfo->win.skey;
+
+  SWITCH_ORDER(pTableQueryInfo->cur.order);
+  pTableQueryInfo->cur.vgroupIndex = -1;
+
+  // set the index at the end of time window
+  pTableQueryInfo->windowResInfo.curIndex = pTableQueryInfo->windowResInfo.size - 1;
+}
+
+static void disableFuncInReverseScanImpl(SQInfo* pQInfo, SWindowResInfo *pWindowResInfo, int32_t order) {
+  SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
+
+  for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+    bool closed = getTimeWindowResStatus(pWindowResInfo, i);
+    if (!closed) {
+      continue;
+    }
+
+    SWindowResult *buf = getWindowResult(pWindowResInfo, i);
+
+    // open/close the specified query for each group result
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+      int32_t functId = pQuery->pSelectExpr[j].base.functionId;
+
+      if (((functId == TSDB_FUNC_FIRST || functId == TSDB_FUNC_FIRST_DST) && order == TSDB_ORDER_ASC) ||
+          ((functId == TSDB_FUNC_LAST || functId == TSDB_FUNC_LAST_DST) && order == TSDB_ORDER_DESC)) {
+        buf->resultInfo[j].complete = false;
+      } else if (functId != TSDB_FUNC_TS && functId != TSDB_FUNC_TAG) {
+        buf->resultInfo[j].complete = true;
+      }
+    }
+  }
+}
+
+void disableFuncInReverseScan(SQInfo *pQInfo) {
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  int32_t order = pQuery->order.order;
+
+  // group by normal columns and interval query on normal table
+  SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+  if (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    disableFuncInReverseScanImpl(pQInfo, pWindowResInfo, order);
+  } else {  // for simple result of table query,
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {  // todo refactor
+      int32_t functId = pQuery->pSelectExpr[j].base.functionId;
+
+      SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[j];
+      if (pCtx->resultInfo == NULL) {
+        continue; // resultInfo is NULL, means no data checked in previous scan
+      }
+
+      if (((functId == TSDB_FUNC_FIRST || functId == TSDB_FUNC_FIRST_DST) && order == TSDB_ORDER_ASC) ||
+          ((functId == TSDB_FUNC_LAST || functId == TSDB_FUNC_LAST_DST) && order == TSDB_ORDER_DESC)) {
+        pCtx->resultInfo->complete = false;
+      } else if (functId != TSDB_FUNC_TS && functId != TSDB_FUNC_TAG) {
+        pCtx->resultInfo->complete = true;
+      }
+    }
+  }
+}
+
+static void setupQueryRangeForReverseScan(SQInfo* pQInfo) {
+  SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
+  int32_t numOfGroups = (int32_t)(GET_NUM_OF_TABLEGROUP(pQInfo));
+
+  for(int32_t i = 0; i < numOfGroups; ++i) {
+    SArray *group = GET_TABLEGROUP(pQInfo, i);
+    SArray *tableKeyGroup = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, i);
+
+    size_t t = taosArrayGetSize(group);
+    for (int32_t j = 0; j < t; ++j) {
+      STableQueryInfo *pCheckInfo = taosArrayGetP(group, j);
+      updateTableQueryInfoForReverseScan(pQuery, pCheckInfo);
+
+      // update the last key in tableKeyInfo list, the tableKeyInfo is used to build the tsdbQueryHandle and decide
+      // the start check timestamp of tsdbQueryHandle
+      STableKeyInfo *pTableKeyInfo = taosArrayGet(tableKeyGroup, j);
+      pTableKeyInfo->lastKey = pCheckInfo->lastKey;
+
+      assert(pCheckInfo->pTable == pTableKeyInfo->pTable);
+    }
+  }
+}
+
+void switchCtxOrder(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SWITCH_ORDER(pRuntimeEnv->pCtx[i].order);
+  }
+}
+
+int32_t createQueryResultInfo(SQuery *pQuery, SWindowResult *pResultRow, bool isSTableQuery, size_t interBufSize) {
+  int32_t numOfCols = pQuery->numOfOutput;
+
+  size_t size = numOfCols * sizeof(SResultInfo) + interBufSize;
+  pResultRow->resultInfo = calloc(1, size);
+  if (pResultRow->resultInfo == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  pResultRow->pos = (SPosInfo) {-1, -1};
+
+  char* buf = (char*) pResultRow->resultInfo + numOfCols * sizeof(SResultInfo);
+
+  // set the intermediate result output buffer
+  setWindowResultInfo(pResultRow->resultInfo, pQuery, isSTableQuery, buf);
+  return TSDB_CODE_SUCCESS;
+}
+
+void resetCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
+    pCtx->aOutputBuf = pQuery->sdata[i]->data;
+
+    /*
+     * set the output buffer information and intermediate buffer
+     * not all queries require the interResultBuf, such as COUNT/TAGPRJ/PRJ/TAG etc.
+     */
+    RESET_RESULT_INFO(&pRuntimeEnv->resultInfo[i]);
+    pCtx->resultInfo = &pRuntimeEnv->resultInfo[i];
+
+    // set the timestamp output buffer for top/bottom/diff query
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
+      pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
+    }
+
+    memset(pQuery->sdata[i]->data, 0, (size_t)(pQuery->pSelectExpr[i].bytes * pQuery->rec.capacity));
+  }
+
+  initCtxOutputBuf(pRuntimeEnv);
+}
+
+void forwardCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, int64_t output) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  // reset the execution contexts
+  for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+    int32_t functionId = pQuery->pSelectExpr[j].base.functionId;
+    assert(functionId != TSDB_FUNC_DIFF);
+
+    // set next output position
+    if (IS_OUTER_FORWARD(aAggs[functionId].nStatus)) {
+      pRuntimeEnv->pCtx[j].aOutputBuf += pRuntimeEnv->pCtx[j].outputBytes * output;
+    }
+
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+      /*
+       * NOTE: for top/bottom query, the value of first column of output (timestamp) are assigned
+       * in the procedure of top/bottom routine
+       * the output buffer in top/bottom routine is ptsOutputBuf, so we need to forward the output buffer
+       *
+       * diff function is handled in multi-output function
+       */
+      pRuntimeEnv->pCtx[j].ptsOutputBuf = (char*)pRuntimeEnv->pCtx[j].ptsOutputBuf + TSDB_KEYSIZE * output;
+    }
+
+    RESET_RESULT_INFO(pRuntimeEnv->pCtx[j].resultInfo);
+  }
+}
+
+void initCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+    int32_t functionId = pQuery->pSelectExpr[j].base.functionId;
+    pRuntimeEnv->pCtx[j].currentStage = 0;
+
+    SResultInfo* pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
+    if (pResInfo->initialized) {
+      continue;
+    }
+
+    aAggs[functionId].init(&pRuntimeEnv->pCtx[j]);
+  }
+}
+
+void skipResults(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  if (pQuery->rec.rows == 0 || pQuery->limit.offset == 0) {
+    return;
+  }
+
+  if (pQuery->rec.rows <= pQuery->limit.offset) {
+    qDebug("QInfo:%p skip rows:%" PRId64 ", new offset:%" PRIu64, GET_QINFO_ADDR(pRuntimeEnv), pQuery->rec.rows,
+        pQuery->limit.offset - pQuery->rec.rows);
+
+    pQuery->limit.offset -= pQuery->rec.rows;
+    pQuery->rec.rows = 0;
+
+    resetCtxOutputBuf(pRuntimeEnv);
+
+    // clear the buffer full flag if exists
+    CLEAR_QUERY_STATUS(pQuery, QUERY_RESBUF_FULL);
+  } else {
+    int64_t numOfSkip = pQuery->limit.offset;
+    pQuery->rec.rows -= numOfSkip;
+    pQuery->limit.offset = 0;
+
+    qDebug("QInfo:%p skip row:%"PRId64", new offset:%d, numOfRows remain:%" PRIu64, GET_QINFO_ADDR(pRuntimeEnv), numOfSkip,
+           0, pQuery->rec.rows);
+
+    for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+      int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+      int32_t bytes = pRuntimeEnv->pCtx[i].outputBytes;
+
+      memmove(pQuery->sdata[i]->data, (char*)pQuery->sdata[i]->data + bytes * numOfSkip, (size_t)(pQuery->rec.rows * bytes));
+      pRuntimeEnv->pCtx[i].aOutputBuf = ((char*) pQuery->sdata[i]->data) + pQuery->rec.rows * bytes;
+
+      if (functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
+        pRuntimeEnv->pCtx[i].ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
+      }
+    }
+
+    updateNumOfResult(pRuntimeEnv, (int32_t)pQuery->rec.rows);
+  }
+}
+
+void setQueryStatus(SQuery *pQuery, int8_t status) {
+  if (status == QUERY_NOT_COMPLETED) {
+    pQuery->status = status;
+  } else {
+    // QUERY_NOT_COMPLETED is not compatible with any other status, so clear its position first
+    CLEAR_QUERY_STATUS(pQuery, QUERY_NOT_COMPLETED);
+    pQuery->status |= status;
+  }
+}
+
+bool needScanDataBlocksAgain(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  bool toContinue = false;
+  if (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    // for each group result, call the finalize function for each column
+    SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+
+    for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+      SWindowResult *pResult = getWindowResult(pWindowResInfo, i);
+      if (!pResult->closed) {
+        continue;
+      }
+
+      setWindowResOutputBuf(pRuntimeEnv, pResult);
+
+      for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+        int16_t functId = pQuery->pSelectExpr[j].base.functionId;
+        if (functId == TSDB_FUNC_TS) {
+          continue;
+        }
+
+        aAggs[functId].xNextStep(&pRuntimeEnv->pCtx[j]);
+        SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
+
+        toContinue |= (!pResInfo->complete);
+      }
+    }
+  } else {
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+      int16_t functId = pQuery->pSelectExpr[j].base.functionId;
+      if (functId == TSDB_FUNC_TS) {
+        continue;
+      }
+
+      aAggs[functId].xNextStep(&pRuntimeEnv->pCtx[j]);
+      SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
+
+      toContinue |= (!pResInfo->complete);
+    }
+  }
+
+  return toContinue;
+}
+
+static SQueryStatusInfo getQueryStatusInfo(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+
+  assert((start <= pTableQueryInfo->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
+      (start >= pTableQueryInfo->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
+
+  SQueryStatusInfo info = {
+      .status      = pQuery->status,
+      .windowIndex = pRuntimeEnv->windowResInfo.curIndex,
+      .lastKey     = start,
+  };
+
+  TIME_WINDOW_COPY(info.w, pQuery->window);
+  TIME_WINDOW_COPY(info.curWindow, pTableQueryInfo->win);
+
+  info.curWindow.skey = start;
+
+  return info;
+}
+
+static void setEnvBeforeReverseScan(SQueryRuntimeEnv *pRuntimeEnv, SQueryStatusInfo *pStatus) {
+  SQInfo *pQInfo = GET_QINFO_ADDR(pRuntimeEnv);
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  pStatus->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);  // save the cursor
+  if (pRuntimeEnv->pTSBuf) {
+    SWITCH_ORDER(pRuntimeEnv->pTSBuf->cur.order);
+    bool ret = tsBufNextPos(pRuntimeEnv->pTSBuf);
+    assert(ret);
+  }
+
+  // reverse order time range
+  pQuery->window = pStatus->curWindow;
+  SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+
+  SWITCH_ORDER(pQuery->order.order);
+
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    assert(pQuery->window.skey <= pQuery->window.ekey);
+  } else {
+    assert(pQuery->window.skey >= pQuery->window.ekey);
+  }
+
+  SET_REVERSE_SCAN_FLAG(pRuntimeEnv);
+
+  STsdbQueryCond cond = {
+      .order   = pQuery->order.order,
+      .colList = pQuery->colList,
+      .numOfCols = pQuery->numOfCols,
+  };
+
+  TIME_WINDOW_COPY(cond.twindow, pQuery->window);
+
+  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+  switchCtxOrder(pRuntimeEnv);
+  disableFuncInReverseScan(pQInfo);
+  setupQueryRangeForReverseScan(pQInfo);
+
+  // clean unused handle
+  if (pRuntimeEnv->pSecQueryHandle != NULL) {
+    tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
+  }
+
+  pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+  if (pRuntimeEnv->pSecQueryHandle == NULL) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+}
+
+static void clearEnvAfterReverseScan(SQueryRuntimeEnv *pRuntimeEnv, SQueryStatusInfo *pStatus) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+
+  SWITCH_ORDER(pQuery->order.order);
+  switchCtxOrder(pRuntimeEnv);
+
+  tsBufSetCursor(pRuntimeEnv->pTSBuf, &pStatus->cur);
+  if (pRuntimeEnv->pTSBuf) {
+    pRuntimeEnv->pTSBuf->cur.order = pQuery->order.order;
+  }
+
+  SET_MASTER_SCAN_FLAG(pRuntimeEnv);
+
+  // update the pQuery->window.skey and pQuery->window.ekey to limit the scan scope of sliding query during reverse scan
+  pTableQueryInfo->lastKey = pStatus->lastKey;
+  pQuery->status = pStatus->status;
+
+  pTableQueryInfo->win = pStatus->w;
+  pQuery->window = pTableQueryInfo->win;
+}
+
+static void restoreTimeWindow(STableGroupInfo* pTableGroupInfo, STsdbQueryCond* pCond) {
+  assert(pTableGroupInfo->numOfTables == 1);
+  SArray* pTableKeyGroup = taosArrayGetP(pTableGroupInfo->pGroupList, 0);
+  STableKeyInfo* pKeyInfo = taosArrayGet(pTableKeyGroup, 0);
+  pKeyInfo->lastKey = pCond->twindow.skey;
+}
+
+void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
+  SQInfo *pQInfo = (SQInfo *) GET_QINFO_ADDR(pRuntimeEnv);
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo *pTableQueryInfo = pQuery->current;
+
+  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+
+  // store the start query position
+  SQueryStatusInfo qstatus = getQueryStatusInfo(pRuntimeEnv, start);
+
+  SET_MASTER_SCAN_FLAG(pRuntimeEnv);
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  while (1) {
+    doScanAllDataBlocks(pRuntimeEnv);
+
+    if (pRuntimeEnv->scanFlag == MASTER_SCAN) {
+      qstatus.status = pQuery->status;
+
+      // do nothing if no data blocks are found qualified during scan
+      if (qstatus.lastKey != pTableQueryInfo->lastKey) {
+        qstatus.curWindow.ekey = pTableQueryInfo->lastKey - step;
+      }
+
+      qstatus.lastKey = pTableQueryInfo->lastKey;
+    }
+
+    if (!needScanDataBlocksAgain(pRuntimeEnv)) {
+      // restore the status code and jump out of loop
+      if (pRuntimeEnv->scanFlag == REPEAT_SCAN) {
+        pQuery->status = qstatus.status;
+      }
+
+      break;
+    }
+
+    STsdbQueryCond cond = {
+        .order   = pQuery->order.order,
+        .colList = pQuery->colList,
+        .numOfCols = pQuery->numOfCols,
+    };
+
+    TIME_WINDOW_COPY(cond.twindow, qstatus.curWindow);
+
+    if (pRuntimeEnv->pSecQueryHandle != NULL) {
+      tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
+    }
+
+    restoreTimeWindow(&pQInfo->tableGroupInfo, &cond);
+    pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+    if (pRuntimeEnv->pSecQueryHandle == NULL) {
+      longjmp(pRuntimeEnv->env, terrno);
+    }
+
+    pRuntimeEnv->windowResInfo.curIndex = qstatus.windowIndex;
+    setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+    pRuntimeEnv->scanFlag = REPEAT_SCAN;
+
+    qDebug("QInfo:%p start to repeat scan data blocks due to query func required, qrange:%"PRId64"-%"PRId64, pQInfo,
+        cond.twindow.skey, cond.twindow.ekey);
+
+    // check if query is killed or not
+    if (IS_QUERY_KILLED(pQInfo)) {
+      finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+      longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+    }
+  }
+
+  if (!needReverseScan(pQuery)) {
+    return;
+  }
+
+  setEnvBeforeReverseScan(pRuntimeEnv, &qstatus);
+
+  // reverse scan from current position
+  qDebug("QInfo:%p start to reverse scan", pQInfo);
+  doScanAllDataBlocks(pRuntimeEnv);
+
+  clearEnvAfterReverseScan(pRuntimeEnv, &qstatus);
+}
+
+void finalizeQueryResult(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  if (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    // for each group result, call the finalize function for each column
+    SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+    if (pRuntimeEnv->groupbyNormalCol) {
+      closeAllTimeWindow(pWindowResInfo);
+    }
+
+    for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+      SWindowResult *buf = &pWindowResInfo->pResult[i];
+      if (!isWindowResClosed(pWindowResInfo, i)) {
+        continue;
+      }
+
+      setWindowResOutputBuf(pRuntimeEnv, buf);
+
+      for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+        aAggs[pQuery->pSelectExpr[j].base.functionId].xFinalize(&pRuntimeEnv->pCtx[j]);
+      }
+
+      /*
+       * set the number of output results for group by normal columns, the number of output rows usually is 1 except
+       * the top and bottom query
+       */
+      buf->numOfRows = (uint16_t)getNumOfResult(pRuntimeEnv);
+    }
+
+  } else {
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+      aAggs[pQuery->pSelectExpr[j].base.functionId].xFinalize(&pRuntimeEnv->pCtx[j]);
+    }
+  }
+}
+
+static bool hasMainOutput(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+
+    if (functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TAGPRJ) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static STableQueryInfo *createTableQueryInfo(SQueryRuntimeEnv *pRuntimeEnv, void* pTable, STimeWindow win, void* buf) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  STableQueryInfo *pTableQueryInfo = buf;
+
+  pTableQueryInfo->win = win;
+  pTableQueryInfo->lastKey = win.skey;
+
+  pTableQueryInfo->pTable = pTable;
+  pTableQueryInfo->cur.vgroupIndex = -1;
+
+  // set more initial size of interval/groupby query
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) || pRuntimeEnv->groupbyNormalCol) {
+    int32_t initialSize = 16;
+    int32_t initialThreshold = 100;
+    int32_t code = initWindowResInfo(&pTableQueryInfo->windowResInfo, pRuntimeEnv, initialSize, initialThreshold, TSDB_DATA_TYPE_INT);
+    if (code != TSDB_CODE_SUCCESS) {
+      return NULL;
+    }
+  } else { // in other aggregate query, do not initialize the windowResInfo
+  }
+
+  return pTableQueryInfo;
+}
+
+void destroyTableQueryInfoImpl(STableQueryInfo *pTableQueryInfo) {
+  if (pTableQueryInfo == NULL) {
+    return;
+  }
+
+  cleanupTimeWindowInfo(&pTableQueryInfo->windowResInfo);
+}
+
+/**
+ * set output buffer for different group
+ * @param pRuntimeEnv
+ * @param pDataBlockInfo
+ */
+void setExecutionContext(SQInfo *pQInfo, int32_t groupIndex, TSKEY nextKey) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  STableQueryInfo  *pTableQueryInfo = pRuntimeEnv->pQuery->current;
+  SWindowResInfo   *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+
+  // lastKey needs to be updated
+  pTableQueryInfo->lastKey = nextKey;
+
+  if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTSBuf != NULL) {
+    setAdditionalInfo(pQInfo, pTableQueryInfo->pTable, pTableQueryInfo);
+  }
+
+  if (pRuntimeEnv->prevGroupId != INT32_MIN && pRuntimeEnv->prevGroupId == groupIndex) {
+    return;
+  }
+
+  SWindowResult *pWindowRes = doSetTimeWindowFromKey(pRuntimeEnv, pWindowResInfo, (char *)&groupIndex,
+      sizeof(groupIndex), true);
+  if (pWindowRes == NULL) {
+    return;
+  }
+
+  /*
+   * not assign result buffer yet, add new result buffer
+   * all group belong to one result set, and each group result has different group id so set the id to be one
+   */
+  if (pWindowRes->pos.pageId == -1) {
+    if (addNewWindowResultBuf(pWindowRes, pRuntimeEnv->pResultBuf, groupIndex, pRuntimeEnv->numOfRowsPerPage) !=
+        TSDB_CODE_SUCCESS) {
+      return;
+    }
+  }
+
+  // record the current active group id
+  pRuntimeEnv->prevGroupId = groupIndex;
+  setWindowResOutputBuf(pRuntimeEnv, pWindowRes);
+  initCtxOutputBuf(pRuntimeEnv);
+}
+
+void setWindowResOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pResult) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  // Note: pResult->pos[i]->num == 0, there is only fixed number of results for each group
+  tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pResult->pos.pageId);
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
+    pCtx->aOutputBuf = getPosInResultPage(pRuntimeEnv, i, pResult, page);
+
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
+      pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
+    }
+
+    /*
+     * set the output buffer information and intermediate buffer
+     * not all queries require the interResultBuf, such as COUNT
+     */
+    pCtx->resultInfo = &pResult->resultInfo[i];
+
+    // set super table query flag
+    SResultInfo *pResInfo = GET_RES_INFO(pCtx);
+    pResInfo->superTableQ = pRuntimeEnv->stableQuery;
+  }
+}
+
+void setWindowResOutputBufInitCtx(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pResult) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  // Note: pResult->pos[i]->num == 0, there is only fixed number of results for each group
+  tFilePage* bufPage = getResBufPage(pRuntimeEnv->pResultBuf, pResult->pos.pageId);
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
+
+    pCtx->resultInfo = &pResult->resultInfo[i];
+    if (pCtx->resultInfo->initialized && pCtx->resultInfo->complete) {
+      continue;
+    }
+
+    pCtx->aOutputBuf = getPosInResultPage(pRuntimeEnv, i, pResult, bufPage);
+    pCtx->currentStage = 0;
+
+    int32_t functionId = pCtx->functionId;
+    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
+      pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
+    }
+
+    /*
+     * set the output buffer information and intermediate buffer
+     * not all queries require the interResultBuf, such as COUNT
+     */
+    pCtx->resultInfo->superTableQ = pRuntimeEnv->stableQuery;     // set super table query flag
+
+    if (!pCtx->resultInfo->initialized) {
+      aAggs[functionId].init(pCtx);
+    }
+  }
+}
+
+int32_t setAdditionalInfo(SQInfo *pQInfo, void* pTable, STableQueryInfo *pTableQueryInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+
+  setTagVal(pRuntimeEnv, pTable, pQInfo->tsdb);
+
+  // both the master and supplement scan needs to set the correct ts comp start position
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    if (pTableQueryInfo->cur.vgroupIndex == -1) {
+      tVariantAssign(&pTableQueryInfo->tag, &pRuntimeEnv->pCtx[0].tag);
+      tsBufGetElemStartPos(pRuntimeEnv->pTSBuf, 0, &pTableQueryInfo->tag);
+
+      // keep the cursor info of current meter
+      pTableQueryInfo->cur = pRuntimeEnv->pTSBuf->cur;
+    } else {
+      tsBufSetCursor(pRuntimeEnv->pTSBuf, &pTableQueryInfo->cur);
+    }
+  }
+
+  return 0;
+}
+
+/*
+ * There are two cases to handle:
+ *
+ * 1. Query range is not set yet (queryRangeSet = 0). we need to set the query range info, including pQuery->lastKey,
+ *    pQuery->window.skey, and pQuery->eKey.
+ * 2. Query range is set and query is in progress. There may be another result with the same query ranges to be
+ *    merged during merge stage. In this case, we need the pTableQueryInfo->lastResRows to decide if there
+ *    is a previous result generated or not.
+ */
+void setIntervalQueryRange(SQInfo *pQInfo, TSKEY key) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo *pTableQueryInfo = pQuery->current;
+
+  if (pTableQueryInfo->queryRangeSet) {
+    pTableQueryInfo->lastKey = key;
+  } else {
+    pTableQueryInfo->win.skey = key;
+    STimeWindow win = {.skey = key, .ekey = pQuery->window.ekey};
+
+    // for too small query range, no data in this interval.
+    if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->window.ekey < pQuery->window.skey)) ||
+        (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->window.skey < pQuery->window.ekey))) {
+      return;
+    }
+
+    /**
+     * In handling the both ascending and descending order super table query, we need to find the first qualified
+     * timestamp of this table, and then set the first qualified start timestamp.
+     * In ascending query, key is the first qualified timestamp. However, in the descending order query, additional
+     * operations involve.
+     */
+    STimeWindow     w = TSWINDOW_INITIALIZER;
+    SWindowResInfo *pWindowResInfo = &pTableQueryInfo->windowResInfo;
+
+    TSKEY sk = MIN(win.skey, win.ekey);
+    TSKEY ek = MAX(win.skey, win.ekey);
+    getAlignQueryTimeWindow(pQuery, win.skey, sk, ek, &w);
+    pWindowResInfo->startTime = pTableQueryInfo->win.skey;  // windowSKey may be 0 in case of 1970 timestamp
+
+    if (pWindowResInfo->prevSKey == TSKEY_INITIAL_VAL) {
+      if (!QUERY_IS_ASC_QUERY(pQuery)) {
+        assert(win.ekey == pQuery->window.ekey);
+      }
+
+      pWindowResInfo->prevSKey = w.skey;
+    }
+
+    pTableQueryInfo->queryRangeSet = 1;
+    pTableQueryInfo->lastKey = pTableQueryInfo->win.skey;
+  }
+}
+
+bool requireTimestamp(SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfOutput; i++) {
+    int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
+    if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_NEED_TS) != 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool needPrimaryTimestampCol(SQuery *pQuery, SDataBlockInfo *pDataBlockInfo) {
+  /*
+   * 1. if skey or ekey locates in this block, we need to load the timestamp column to decide the precise position
+   * 2. if there are top/bottom, first_dst/last_dst functions, we need to load timestamp column in any cases;
+   */
+  STimeWindow *w = &pDataBlockInfo->window;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+
+  bool loadPrimaryTS = (pTableQueryInfo->lastKey >= w->skey && pTableQueryInfo->lastKey <= w->ekey) ||
+                       (pQuery->window.ekey >= w->skey && pQuery->window.ekey <= w->ekey) || requireTimestamp(pQuery);
+
+  return loadPrimaryTS;
+}
+
+static int32_t doCopyToSData(SQInfo *pQInfo, SWindowResInfo *pResultInfo, int32_t orderType) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  int32_t numOfResult = 0;
+  int32_t startIdx = 0;
+  int32_t step = -1;
+
+  qDebug("QInfo:%p start to copy data from windowResInfo to query buf", pQInfo);
+  int32_t totalSet = numOfClosedTimeWindow(pResultInfo);
+  SWindowResult* result = pResultInfo->pResult;
+
+  if (orderType == TSDB_ORDER_ASC) {
+    startIdx = pQInfo->groupIndex;
+    step = 1;
+  } else {  // desc order copy all data
+    startIdx = totalSet - pQInfo->groupIndex - 1;
+    step = -1;
+  }
+
+  SGroupResInfo* pGroupResInfo = &pQInfo->groupResInfo;
+
+  for (int32_t i = startIdx; (i < totalSet) && (i >= 0); i += step) {
+    if (result[i].numOfRows == 0) {
+      pQInfo->groupIndex += 1;
+      pGroupResInfo->pos.rowId = 0;
+      continue;
+    }
+
+    int32_t numOfRowsToCopy = result[i].numOfRows - pGroupResInfo->pos.rowId;
+    int32_t oldOffset = pGroupResInfo->pos.rowId;
+
+    /*
+     * current output space is not enough to accommodate all data of this page, only partial results
+     * will be copied to SQuery object's result buffer
+     */
+    if (numOfRowsToCopy > pQuery->rec.capacity - numOfResult) {
+      numOfRowsToCopy = (int32_t) pQuery->rec.capacity - numOfResult;
+      pGroupResInfo->pos.rowId += numOfRowsToCopy;
+    } else {
+      pGroupResInfo->pos.rowId = 0;
+      pQInfo->groupIndex += 1;
+    }
+
+    tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, result[i].pos.pageId);
+
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+      int32_t size = pRuntimeEnv->pCtx[j].outputBytes;
+
+      char *out = pQuery->sdata[j]->data + numOfResult * size;
+      char *in = getPosInResultPage(pRuntimeEnv, j, &result[i], page);
+      memcpy(out, in + oldOffset * size, size * numOfRowsToCopy);
+    }
+
+    numOfResult += numOfRowsToCopy;
+    if (numOfResult == pQuery->rec.capacity) {
+      break;
+    }
+  }
+
+  qDebug("QInfo:%p copy data to query buf completed", pQInfo);
+
+#ifdef _DEBUG_VIEW
+  displayInterResult(pQuery->sdata, pRuntimeEnv, numOfResult);
+#endif
+  return numOfResult;
+}
+
+/**
+ * copyFromWindowResToSData support copy data in ascending/descending order
+ * For interval query of both super table and table, copy the data in ascending order, since the output results are
+ * ordered in SWindowResutl already. While handling the group by query for both table and super table,
+ * all group result are completed already.
+ *
+ * @param pQInfo
+ * @param result
+ */
+void copyFromWindowResToSData(SQInfo *pQInfo, SWindowResInfo *pResultInfo) {
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  int32_t orderType = (pQuery->pGroupbyExpr != NULL) ? pQuery->pGroupbyExpr->orderType : TSDB_ORDER_ASC;
+  int32_t numOfResult = doCopyToSData(pQInfo, pResultInfo, orderType);
+
+  pQuery->rec.rows += numOfResult;
+
+  assert(pQuery->rec.rows <= pQuery->rec.capacity);
+}
+
+static void updateWindowResNumOfRes(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  // update the number of result for each, only update the number of rows for the corresponding window result.
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    return;
+  }
+
+  for (int32_t i = 0; i < pRuntimeEnv->windowResInfo.size; ++i) {
+    SWindowResult *pResult = &pRuntimeEnv->windowResInfo.pResult[i];
+
+    for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+      int32_t functionId = pRuntimeEnv->pCtx[j].functionId;
+      if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ) {
+        continue;
+      }
+
+      pResult->numOfRows = (uint16_t)(MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes));
+    }
+  }
+}
+
+static void stableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBlockInfo *pDataBlockInfo, SDataStatis *pStatis,
+    SArray *pDataBlock, __block_search_fn_t searchFn) {
+  SQuery *         pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+
+  SWindowResInfo * pWindowResInfo = &pTableQueryInfo->windowResInfo;
+  pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : pDataBlockInfo->rows - 1;
+
+  if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL || pRuntimeEnv->groupbyNormalCol) {
+    rowwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, pDataBlock);
+  } else {
+    blockwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, searchFn, pDataBlock);
+  }
+}
+
+bool queryHasRemainResForTableQuery(SQueryRuntimeEnv* pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  SFillInfo *pFillInfo = pRuntimeEnv->pFillInfo;
+
+  if (pQuery->limit.limit > 0 && pQuery->rec.total >= pQuery->limit.limit) {
+    return false;
+  }
+
+  if (pQuery->fillType != TSDB_FILL_NONE && !isPointInterpoQuery(pQuery)) {
+    // There are results not returned to client yet, so filling applied to the remain result is required firstly.
+    int32_t remain = taosNumOfRemainRows(pFillInfo);
+    if (remain > 0) {
+      return true;
+    }
+
+    /*
+     * While the code reaches here, there are no results remains now.
+     * If query is not completed yet, the gaps between two results blocks need to be handled after next data block
+     * is retrieved from TSDB.
+     *
+     * NOTE: If the result set is not the first block, the gap in front of the result set will be filled. If the result
+     * set is the FIRST result block, the gap between the start time of query time window and the timestamp of the
+     * first result row in the actual result set will fill nothing.
+     */
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+      int32_t numOfTotal = (int32_t)getFilledNumOfRes(pFillInfo, pQuery->window.ekey, (int32_t)pQuery->rec.capacity);
+      return numOfTotal > 0;
+    }
+
+  } else {
+    // there are results waiting for returned to client.
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED) &&
+        (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) &&
+        (pRuntimeEnv->windowResInfo.size > 0)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static void doCopyQueryResultToMsg(SQInfo *pQInfo, int32_t numOfRows, char *data) {
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  for (int32_t col = 0; col < pQuery->numOfOutput; ++col) {
+    int32_t bytes = pQuery->pSelectExpr[col].bytes;
+
+    memmove(data, pQuery->sdata[col]->data, bytes * numOfRows);
+    data += bytes * numOfRows;
+  }
+
+  int32_t numOfTables = (int32_t)taosArrayGetSize(pQInfo->arrTableIdInfo);
+  *(int32_t*)data = htonl(numOfTables);
+  data += sizeof(int32_t);
+  for(int32_t i = 0; i < numOfTables; i++) {
+    STableIdInfo* pSrc = taosArrayGet(pQInfo->arrTableIdInfo, i);
+    STableIdInfo* pDst = (STableIdInfo*)data;
+    pDst->uid = htobe64(pSrc->uid);
+    pDst->tid = htonl(pSrc->tid);
+    pDst->key = htobe64(pSrc->key);
+    data += sizeof(STableIdInfo);
+  }
+
+  // Check if query is completed or not for stable query or normal table query respectively.
+  if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+    if (pQInfo->runtimeEnv.stableQuery) {
+      if (IS_STASBLE_QUERY_OVER(pQInfo)) {
+        setQueryStatus(pQuery, QUERY_OVER);
+      }
+    } else {
+      if (!queryHasRemainResForTableQuery(&pQInfo->runtimeEnv)) {
+        setQueryStatus(pQuery, QUERY_OVER);
+      }
+    }
+  }
+}
+
+int32_t doFillGapsInResults(SQueryRuntimeEnv* pRuntimeEnv, tFilePage **pDst, int32_t *numOfFilled) {
+  SQInfo* pQInfo = GET_QINFO_ADDR(pRuntimeEnv);
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  SFillInfo* pFillInfo = pRuntimeEnv->pFillInfo;
+
+  while (1) {
+    int32_t ret = (int32_t)taosGenerateDataBlock(pFillInfo, (tFilePage**)pQuery->sdata, (int32_t)pQuery->rec.capacity);
+
+    // todo apply limit output function
+    /* reached the start position of according to offset value, return immediately */
+    if (pQuery->limit.offset == 0) {
+      qDebug("QInfo:%p initial numOfRows:%d, generate filled result:%d rows", pQInfo, pFillInfo->numOfRows, ret);
+      return ret;
+    }
+
+    if (pQuery->limit.offset < ret) {
+      qDebug("QInfo:%p initial numOfRows:%d, generate filled result:%d rows, offset:%" PRId64 ". Discard due to offset, remain:%" PRId64 ", new offset:%d",
+             pQInfo, pFillInfo->numOfRows, ret, pQuery->limit.offset, ret - pQuery->limit.offset, 0);
+
+      ret -= (int32_t)pQuery->limit.offset;
+      // todo !!!!there exactly number of interpo is not valid.
+      // todo refactor move to the beginning of buffer
+      for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+        memmove(pDst[i]->data, pDst[i]->data + pQuery->pSelectExpr[i].bytes * pQuery->limit.offset,
+                ret * pQuery->pSelectExpr[i].bytes);
+      }
+
+      pQuery->limit.offset = 0;
+      return ret;
+    } else {
+      qDebug("QInfo:%p initial numOfRows:%d, generate filled result:%d rows, offset:%" PRId64 ". Discard due to offset, "
+             "remain:%d, new offset:%" PRId64, pQInfo, pFillInfo->numOfRows, ret, pQuery->limit.offset, 0,
+          pQuery->limit.offset - ret);
+
+      pQuery->limit.offset -= ret;
+      pQuery->rec.rows = 0;
+      ret = 0;
+    }
+
+    if (!queryHasRemainResForTableQuery(pRuntimeEnv)) {
+      return ret;
+    }
+  }
+}
+
+static void queryCostStatis(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQueryCostInfo *pSummary = &pRuntimeEnv->summary;
+
+  // add the merge time
+  pSummary->elapsedTime += pSummary->firstStageMergeTime;
+
+  qDebug("QInfo:%p :cost summary: elapsed time:%"PRId64" us, first merge:%"PRId64" us, total blocks:%d, "
+         "load block statis:%d, load data block:%d, total rows:%"PRId64 ", check rows:%"PRId64,
+         pQInfo, pSummary->elapsedTime, pSummary->firstStageMergeTime, pSummary->totalBlocks, pSummary->loadBlockStatis,
+         pSummary->loadBlocks, pSummary->totalRows, pSummary->totalCheckedRows);
+
+  qDebug("QInfo:%p :cost summary: internal size:%"PRId64"B, numOfWin:%"PRId64, pQInfo, pSummary->internalSupSize,
+      pSummary->numOfTimeWindows);
+}
+
+static void updateOffsetVal(SQueryRuntimeEnv *pRuntimeEnv, SDataBlockInfo *pBlockInfo) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  if (pQuery->limit.offset == pBlockInfo->rows) {  // current block will ignore completed
+    pTableQueryInfo->lastKey = QUERY_IS_ASC_QUERY(pQuery) ? pBlockInfo->window.ekey + step : pBlockInfo->window.skey + step;
+    pQuery->limit.offset = 0;
+    return;
+  }
+
+  if (QUERY_IS_ASC_QUERY(pQuery)) {
+    pQuery->pos = (int32_t)pQuery->limit.offset;
+  } else {
+    pQuery->pos = pBlockInfo->rows - (int32_t)pQuery->limit.offset - 1;
+  }
+
+  assert(pQuery->pos >= 0 && pQuery->pos <= pBlockInfo->rows - 1);
+
+  SArray *         pDataBlock = tsdbRetrieveDataBlock(pRuntimeEnv->pQueryHandle, NULL);
+  SColumnInfoData *pColInfoData = taosArrayGet(pDataBlock, 0);
+
+  // update the pQuery->limit.offset value, and pQuery->pos value
+  TSKEY *keys = (TSKEY *) pColInfoData->pData;
+
+  // update the offset value
+  pTableQueryInfo->lastKey = keys[pQuery->pos];
+  pQuery->limit.offset = 0;
+
+  int32_t numOfRes = tableApplyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, NULL, binarySearchForKey, pDataBlock);
+
+  qDebug("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, numOfRes:%d, lastKey:%"PRId64, GET_QINFO_ADDR(pRuntimeEnv),
+         pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows, numOfRes, pQuery->current->lastKey);
+}
+
+void skipBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  if (pQuery->limit.offset <= 0 || pQuery->numOfFilterCols > 0) {
+    return;
+  }
+
+  pQuery->pos = 0;
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+  TsdbQueryHandleT pQueryHandle = pRuntimeEnv->pQueryHandle;
+
+  SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER;
+  while (tsdbNextDataBlock(pQueryHandle)) {
+    if (IS_QUERY_KILLED(GET_QINFO_ADDR(pRuntimeEnv))) {
+      finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+      longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+    }
+
+    tsdbRetrieveDataBlockInfo(pQueryHandle, &blockInfo);
+
+    if (pQuery->limit.offset > blockInfo.rows) {
+      pQuery->limit.offset -= blockInfo.rows;
+      pTableQueryInfo->lastKey = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.window.ekey : blockInfo.window.skey;
+      pTableQueryInfo->lastKey += step;
+
+      qDebug("QInfo:%p skip rows:%d, offset:%" PRId64, GET_QINFO_ADDR(pRuntimeEnv), blockInfo.rows,
+             pQuery->limit.offset);
+    } else {  // find the appropriated start position in current block
+      updateOffsetVal(pRuntimeEnv, &blockInfo);
+      break;
+    }
+  }
+
+  if (terrno != TSDB_CODE_SUCCESS) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+}
+
+static bool skipTimeInterval(SQueryRuntimeEnv *pRuntimeEnv, TSKEY* start) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  *start = pQuery->current->lastKey;
+
+  // if queried with value filter, do NOT forward query start position
+  if (pQuery->limit.offset <= 0 || pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL || pRuntimeEnv->pFillInfo != NULL) {
+    return true;
+  }
+
+  /*
+   * 1. for interval without interpolation query we forward pQuery->interval.interval at a time for
+   *    pQuery->limit.offset times. Since hole exists, pQuery->interval.interval*pQuery->limit.offset value is
+   *    not valid. otherwise, we only forward pQuery->limit.offset number of points
+   */
+  assert(pRuntimeEnv->windowResInfo.prevSKey == TSKEY_INITIAL_VAL);
+
+  STimeWindow w = TSWINDOW_INITIALIZER;
+
+  SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+  STableQueryInfo *pTableQueryInfo = pQuery->current;
+
+  SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER;
+  while (tsdbNextDataBlock(pRuntimeEnv->pQueryHandle)) {
+    tsdbRetrieveDataBlockInfo(pRuntimeEnv->pQueryHandle, &blockInfo);
+
+    if (QUERY_IS_ASC_QUERY(pQuery)) {
+      if (pWindowResInfo->prevSKey == TSKEY_INITIAL_VAL) {
+        getAlignQueryTimeWindow(pQuery, blockInfo.window.skey, blockInfo.window.skey, pQuery->window.ekey, &w);
+        pWindowResInfo->startTime = w.skey;
+        pWindowResInfo->prevSKey = w.skey;
+      }
+    } else {
+      getAlignQueryTimeWindow(pQuery, blockInfo.window.ekey, pQuery->window.ekey, blockInfo.window.ekey, &w);
+
+      pWindowResInfo->startTime = pQuery->window.skey;
+      pWindowResInfo->prevSKey = w.skey;
+    }
+
+    // the first time window
+    STimeWindow win = getActiveTimeWindow(pWindowResInfo, pWindowResInfo->prevSKey, pQuery);
+
+    while (pQuery->limit.offset > 0) {
+      if ((win.ekey <= blockInfo.window.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+          (win.ekey >= blockInfo.window.skey && !QUERY_IS_ASC_QUERY(pQuery))) {
+        pQuery->limit.offset -= 1;
+        pWindowResInfo->prevSKey = win.skey;
+      }
+
+      STimeWindow tw = win;
+      GET_NEXT_TIMEWINDOW(pQuery, &tw);
+
+      if (pQuery->limit.offset == 0) {
+        if ((tw.skey <= blockInfo.window.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+            (tw.ekey >= blockInfo.window.skey && !QUERY_IS_ASC_QUERY(pQuery))) {
+          // load the data block and check data remaining in current data block
+          // TODO optimize performance
+          SArray *         pDataBlock = tsdbRetrieveDataBlock(pRuntimeEnv->pQueryHandle, NULL);
+          SColumnInfoData *pColInfoData = taosArrayGet(pDataBlock, 0);
+
+          tw = win;
+          int32_t startPos =
+              getNextQualifiedWindow(pRuntimeEnv, &tw, &blockInfo, pColInfoData->pData, binarySearchForKey, -1);
+          assert(startPos >= 0);
+
+          // set the abort info
+          pQuery->pos = startPos;
+
+          // reset the query start timestamp
+          pTableQueryInfo->win.skey = ((TSKEY *)pColInfoData->pData)[startPos];
+          pQuery->window.skey = pTableQueryInfo->win.skey;
+          *start = pTableQueryInfo->win.skey;
+
+          pWindowResInfo->prevSKey = tw.skey;
+          int32_t index = pRuntimeEnv->windowResInfo.curIndex;
+
+          int32_t numOfRes = tableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, NULL, binarySearchForKey, pDataBlock);
+          pRuntimeEnv->windowResInfo.curIndex = index;  // restore the window index
+
+          qDebug("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, numOfRes:%d, lastKey:%"PRId64,
+                 GET_QINFO_ADDR(pRuntimeEnv), blockInfo.window.skey, blockInfo.window.ekey, blockInfo.rows, numOfRes, pQuery->current->lastKey);
+
+          return true;
+        } else { // do nothing
+          *start = tw.skey;
+          pQuery->window.skey = tw.skey;
+          pWindowResInfo->prevSKey = tw.skey;
+          return true;
+        }
+      }
+
+      /*
+       * If the next time window still starts from current data block,
+       * load the primary timestamp column first, and then find the start position for the next queried time window.
+       * Note that only the primary timestamp column is required.
+       * TODO: Optimize for this cases. All data blocks are not needed to be loaded, only if the first actually required
+       * time window resides in current data block.
+       */
+      if ((tw.skey <= blockInfo.window.ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
+          (tw.ekey >= blockInfo.window.skey && !QUERY_IS_ASC_QUERY(pQuery))) {
+        SArray *         pDataBlock = tsdbRetrieveDataBlock(pRuntimeEnv->pQueryHandle, NULL);
+        SColumnInfoData *pColInfoData = taosArrayGet(pDataBlock, 0);
+
+        tw = win;
+        int32_t startPos =
+            getNextQualifiedWindow(pRuntimeEnv, &tw, &blockInfo, pColInfoData->pData, binarySearchForKey, -1);
+        assert(startPos >= 0);
+
+        // set the abort info
+        pQuery->pos = startPos;
+        pTableQueryInfo->lastKey = ((TSKEY *)pColInfoData->pData)[startPos];
+        pWindowResInfo->prevSKey = tw.skey;
+        win = tw;
+      } else {
+        break;  // offset is not 0, and next time window begins or ends in the next block.
+      }
+    }
+  }
+
+  // check for error
+  if (terrno != TSDB_CODE_SUCCESS) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+
+  return true;
+}
+
+static void doDestroyTableQueryInfo(STableGroupInfo* pTableqinfoGroupInfo);
+
+static int32_t setupQueryHandle(void* tsdb, SQInfo* pQInfo, bool isSTableQuery) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  if (onlyQueryTags(pQuery)) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (isSTableQuery && (!QUERY_IS_INTERVAL_QUERY(pQuery)) && (!isFixedOutputQuery(pRuntimeEnv))) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  STsdbQueryCond cond = {
+    .order   = pQuery->order.order,
+    .colList = pQuery->colList,
+    .numOfCols = pQuery->numOfCols,
+  };
+
+  TIME_WINDOW_COPY(cond.twindow, pQuery->window);
+
+  if (!isSTableQuery
+    && (pQInfo->tableqinfoGroupInfo.numOfTables == 1)
+    && (cond.order == TSDB_ORDER_ASC)
+    && (!QUERY_IS_INTERVAL_QUERY(pQuery))
+    && (!isGroupbyNormalCol(pQuery->pGroupbyExpr))
+    && (!isFixedOutputQuery(pRuntimeEnv))
+  ) {
+    SArray* pa = GET_TABLEGROUP(pQInfo, 0);
+    STableQueryInfo* pCheckInfo = taosArrayGetP(pa, 0);
+    cond.twindow = pCheckInfo->win;
+  }
+
+  terrno = TSDB_CODE_SUCCESS;
+  if (isFirstLastRowQuery(pQuery)) {
+    pRuntimeEnv->pQueryHandle = tsdbQueryLastRow(tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+
+    // update the query time window
+    pQuery->window = cond.twindow;
+
+    if (pQInfo->tableGroupInfo.numOfTables == 0) {
+      pQInfo->tableqinfoGroupInfo.numOfTables = 0;
+    } else {
+      size_t numOfGroups = GET_NUM_OF_TABLEGROUP(pQInfo);
+      for(int32_t i = 0; i < numOfGroups; ++i) {
+        SArray *group = GET_TABLEGROUP(pQInfo, i);
+
+        size_t t = taosArrayGetSize(group);
+        for (int32_t j = 0; j < t; ++j) {
+          STableQueryInfo *pCheckInfo = taosArrayGetP(group, j);
+
+          pCheckInfo->win = pQuery->window;
+          pCheckInfo->lastKey = pCheckInfo->win.skey;
+        }
+      }
+    }
+  } else if (isPointInterpoQuery(pQuery)) {
+    pRuntimeEnv->pQueryHandle = tsdbQueryRowsInExternalWindow(tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+  } else {
+    pRuntimeEnv->pQueryHandle = tsdbQueryTables(tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+  }
+
+  return terrno;
+}
+
+static SFillColInfo* taosCreateFillColInfo(SQuery* pQuery) {
+  int32_t numOfCols = pQuery->numOfOutput;
+  int32_t offset = 0;
+
+  SFillColInfo* pFillCol = calloc(numOfCols, sizeof(SFillColInfo));
+  if (pFillCol == NULL) {
+    return NULL;
+  }
+
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    SExprInfo* pExprInfo = &pQuery->pSelectExpr[i];
+
+    pFillCol[i].col.bytes  = pExprInfo->bytes;
+    pFillCol[i].col.type   = (int8_t)pExprInfo->type;
+    pFillCol[i].col.offset = offset;
+    pFillCol[i].flag       = TSDB_COL_NORMAL;    // always be ta normal column for table query
+    pFillCol[i].functionId = pExprInfo->base.functionId;
+    pFillCol[i].fillVal.i = pQuery->fillVal[i];
+
+    offset += pExprInfo->bytes;
+  }
+
+  return pFillCol;
+}
+
+int32_t doInitQInfo(SQInfo *pQInfo, STSBuf *pTsBuf, void *tsdb, int32_t vgId, bool isSTableQuery) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  pQuery->precision = tsdbGetCfg(tsdb)->precision;
+  pRuntimeEnv->topBotQuery = isTopBottomQuery(pQuery);
+  pRuntimeEnv->hasTagResults = hasTagValOutput(pQuery);
+
+  setScanLimitationByResultBuffer(pQuery);
+
+  code = setupQueryHandle(tsdb, pQInfo, isSTableQuery);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  pQInfo->tsdb = tsdb;
+  pQInfo->vgId = vgId;
+
+  pRuntimeEnv->pQuery = pQuery;
+  pRuntimeEnv->pTSBuf = pTsBuf;
+  pRuntimeEnv->cur.vgroupIndex = -1;
+  pRuntimeEnv->stableQuery = isSTableQuery;
+  pRuntimeEnv->prevGroupId = INT32_MIN;
+  pRuntimeEnv->groupbyNormalCol = isGroupbyNormalCol(pQuery->pGroupbyExpr);
+
+  if (pTsBuf != NULL) {
+    int16_t order = (pQuery->order.order == pRuntimeEnv->pTSBuf->tsOrder) ? TSDB_ORDER_ASC : TSDB_ORDER_DESC;
+    tsBufSetTraverseOrder(pRuntimeEnv->pTSBuf, order);
+  }
+
+  // create runtime environment
+  code = setupQueryRuntimeEnv(pRuntimeEnv, pQuery->order.order);
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
+
+  int32_t ps = DEFAULT_PAGE_SIZE;
+  int32_t rowsize = 0;
+  getIntermediateBufInfo(pRuntimeEnv, &ps, &rowsize);
+  int32_t TWOMB = 1024*1024*2;
+
+  if (isSTableQuery && !onlyQueryTags(pRuntimeEnv->pQuery)) {
+    code = createDiskbasedResultBuffer(&pRuntimeEnv->pResultBuf, rowsize, ps, TWOMB, pQInfo);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    if (!QUERY_IS_INTERVAL_QUERY(pQuery)) {
+      int16_t type = TSDB_DATA_TYPE_NULL;
+      int32_t threshold = 0;
+
+      if (pRuntimeEnv->groupbyNormalCol) {  // group by columns not tags;
+        type = getGroupbyColumnType(pQuery, pQuery->pGroupbyExpr);
+        threshold = 4000;
+      } else {
+        type = TSDB_DATA_TYPE_INT;  // group id
+        threshold = (int32_t)(GET_NUM_OF_TABLEGROUP(pQInfo));
+        if (threshold < 8) {
+          threshold = 8;
+        }
+      }
+
+      code = initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, 8, threshold, type);
+      if (code != TSDB_CODE_SUCCESS) {
+        return code;
+      }
+    }
+  } else if (pRuntimeEnv->groupbyNormalCol || QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    int32_t numOfResultRows = getInitialPageNum(pQInfo);
+    getIntermediateBufInfo(pRuntimeEnv, &ps, &rowsize);
+    code = createDiskbasedResultBuffer(&pRuntimeEnv->pResultBuf, rowsize, ps, TWOMB, pQInfo);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    int16_t type = TSDB_DATA_TYPE_NULL;
+    if (pRuntimeEnv->groupbyNormalCol) {
+      type = getGroupbyColumnType(pQuery, pQuery->pGroupbyExpr);
+    } else {
+      type = TSDB_DATA_TYPE_TIMESTAMP;
+    }
+
+    code = initWindowResInfo(&pRuntimeEnv->windowResInfo, pRuntimeEnv, numOfResultRows, 4096, type);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+  }
+
+  if (pQuery->fillType != TSDB_FILL_NONE && !isPointInterpoQuery(pQuery)) {
+    SFillColInfo* pColInfo = taosCreateFillColInfo(pQuery);
+    STimeWindow w = TSWINDOW_INITIALIZER;
+
+    TSKEY sk = MIN(pQuery->window.skey, pQuery->window.ekey);
+    TSKEY ek = MAX(pQuery->window.skey, pQuery->window.ekey);
+    getAlignQueryTimeWindow(pQuery, pQuery->window.skey, sk, ek, &w);
+
+    pRuntimeEnv->pFillInfo = taosInitFillInfo(pQuery->order.order, w.skey, 0, (int32_t)pQuery->rec.capacity, pQuery->numOfOutput,
+                                              pQuery->interval.sliding, pQuery->interval.slidingUnit, (int8_t)pQuery->precision,
+                                              pQuery->fillType, pColInfo);
+  }
+
+  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+  return TSDB_CODE_SUCCESS;
+}
+
+static void enableExecutionForNextTable(SQueryRuntimeEnv *pRuntimeEnv) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[i]);
+    if (pResInfo != NULL) {
+      pResInfo->complete = false;
+    }
+  }
+}
+
+static FORCE_INLINE void setEnvForEachBlock(SQInfo* pQInfo, STableQueryInfo* pTableQueryInfo, SDataBlockInfo* pBlockInfo) {
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  if (!QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    setExecutionContext(pQInfo, pTableQueryInfo->groupIndex, pBlockInfo->window.ekey + step);
+  } else {  // interval query
+    TSKEY nextKey = pBlockInfo->window.skey;
+    setIntervalQueryRange(pQInfo, nextKey);
+
+    if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTSBuf != NULL) {
+      setAdditionalInfo(pQInfo, pTableQueryInfo->pTable, pTableQueryInfo);
+    }
+  }
+}
+
+static int64_t scanMultiTableDataBlocks(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery*           pQuery = pRuntimeEnv->pQuery;
+  SQueryCostInfo*   summary  = &pRuntimeEnv->summary;
+
+  int64_t st = taosGetTimestampMs();
+
+  TsdbQueryHandleT pQueryHandle = IS_MASTER_SCAN(pRuntimeEnv)? pRuntimeEnv->pQueryHandle : pRuntimeEnv->pSecQueryHandle;
+  SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER;
+
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
+
+  while (tsdbNextDataBlock(pQueryHandle)) {
+    summary->totalBlocks += 1;
+
+    if (IS_QUERY_KILLED(pQInfo)) {
+      longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+    }
+
+    tsdbRetrieveDataBlockInfo(pQueryHandle, &blockInfo);
+    STableQueryInfo **pTableQueryInfo = (STableQueryInfo**) taosHashGet(pQInfo->tableqinfoGroupInfo.map, &blockInfo.tid, sizeof(blockInfo.tid));
+    if(pTableQueryInfo == NULL) {
+      break;
+    }
+
+    pQuery->current = *pTableQueryInfo;
+    if (QUERY_IS_ASC_QUERY(pQuery)) {
+      assert(
+          ((*pTableQueryInfo)->win.skey <= (*pTableQueryInfo)->win.ekey) &&
+          ((*pTableQueryInfo)->lastKey >= (*pTableQueryInfo)->win.skey) &&
+          ((*pTableQueryInfo)->win.skey >= pQuery->window.skey && (*pTableQueryInfo)->win.ekey <= pQuery->window.ekey));
+    } else {
+      assert(
+          ((*pTableQueryInfo)->win.skey >= (*pTableQueryInfo)->win.ekey) &&
+          ((*pTableQueryInfo)->lastKey <= (*pTableQueryInfo)->win.skey) &&
+          ((*pTableQueryInfo)->win.skey <= pQuery->window.skey && (*pTableQueryInfo)->win.ekey >= pQuery->window.ekey));
+    }
+
+    if (!pRuntimeEnv->groupbyNormalCol) {
+      setEnvForEachBlock(pQInfo, *pTableQueryInfo, &blockInfo);
+    }
+
+    SDataStatis *pStatis = NULL;
+    SArray *     pDataBlock = NULL;
+    uint32_t     status = 0;
+
+    int32_t ret = loadDataBlockOnDemand(pRuntimeEnv, pQueryHandle, &blockInfo, &pStatis, &pDataBlock, &status);
+    if (ret != TSDB_CODE_SUCCESS) {
+      break;
+    }
+
+    if (status == BLK_DATA_DISCARD) {
+      pQuery->current->lastKey =
+          QUERY_IS_ASC_QUERY(pQuery) ? blockInfo.window.ekey + step : blockInfo.window.skey + step;
+      continue;
+    }
+
+    summary->totalRows += blockInfo.rows;
+    stableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, pStatis, pDataBlock, binarySearchForKey);
+
+    qDebug("QInfo:%p check data block completed, uid:%"PRId64", tid:%d, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, "
+           "lastKey:%" PRId64,
+           pQInfo, blockInfo.uid, blockInfo.tid, blockInfo.window.skey, blockInfo.window.ekey, blockInfo.rows,
+           pQuery->current->lastKey);
+  }
+
+  if (terrno != TSDB_CODE_SUCCESS) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+
+  updateWindowResNumOfRes(pRuntimeEnv);
+
+  int64_t et = taosGetTimestampMs();
+  return et - st;
+}
+
+static bool multiTableMultioutputHelper(SQInfo *pQInfo, int32_t index) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+  SArray *group = GET_TABLEGROUP(pQInfo, 0);
+  STableQueryInfo* pCheckInfo = taosArrayGetP(group, index);
+
+  if (pRuntimeEnv->hasTagResults || pRuntimeEnv->pTSBuf != NULL) {
+    setTagVal(pRuntimeEnv, pCheckInfo->pTable, pQInfo->tsdb);
+  }
+
+  STableId* id = TSDB_TABLEID(pCheckInfo->pTable);
+  qDebug("QInfo:%p query on (%d): uid:%" PRIu64 ", tid:%d, qrange:%" PRId64 "-%" PRId64, pQInfo, index,
+         id->uid, id->tid, pCheckInfo->lastKey, pCheckInfo->win.ekey);
+
+  STsdbQueryCond cond = {
+      .twindow   = {pCheckInfo->lastKey, pCheckInfo->win.ekey},
+      .order     = pQuery->order.order,
+      .colList   = pQuery->colList,
+      .numOfCols = pQuery->numOfCols,
+  };
+
+  // todo refactor
+  SArray *g1 = taosArrayInit(1, POINTER_BYTES);
+  SArray *tx = taosArrayInit(1, sizeof(STableKeyInfo));
+
+  STableKeyInfo info = {.pTable = pCheckInfo->pTable, .lastKey = pCheckInfo->lastKey};
+  taosArrayPush(tx, &info);
+
+  taosArrayPush(g1, &tx);
+  STableGroupInfo gp = {.numOfTables = 1, .pGroupList = g1};
+
+  // include only current table
+  if (pRuntimeEnv->pQueryHandle != NULL) {
+    tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
+    pRuntimeEnv->pQueryHandle = NULL;
+  }
+
+  pRuntimeEnv->pQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &gp, pQInfo);
+  taosArrayDestroy(tx);
+  taosArrayDestroy(g1);
+  if (pRuntimeEnv->pQueryHandle == NULL) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    if (pRuntimeEnv->cur.vgroupIndex == -1) {
+      STSElem elem = tsBufGetElemStartPos(pRuntimeEnv->pTSBuf, 0, &pRuntimeEnv->pCtx[0].tag);
+
+      // failed to find data with the specified tag value
+      if (elem.vnode < 0) {
+        return false;
+      }
+    } else {
+      tsBufSetCursor(pRuntimeEnv->pTSBuf, &pRuntimeEnv->cur);
+    }
+  }
+
+  initCtxOutputBuf(pRuntimeEnv);
+  return true;
+}
+
+/**
+ * super table query handler
+ * 1. super table projection query, group-by on normal columns query, ts-comp query
+ * 2. point interpolation query, last row query
+ *
+ * @param pQInfo
+ */
+static void sequentialTableProcess(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+  setQueryStatus(pQuery, QUERY_COMPLETED);
+
+  size_t numOfGroups = GET_NUM_OF_TABLEGROUP(pQInfo);
+
+  if (isPointInterpoQuery(pQuery) || isFirstLastRowQuery(pQuery)) {
+    resetCtxOutputBuf(pRuntimeEnv);
+    assert(pQuery->limit.offset == 0 && pQuery->limit.limit != 0);
+
+    while (pQInfo->groupIndex < numOfGroups) {
+      SArray* group = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, pQInfo->groupIndex);
+
+      qDebug("QInfo:%p last_row query on group:%d, total group:%" PRIzu ", current group:%p", pQInfo, pQInfo->groupIndex,
+             numOfGroups, group);
+
+      STsdbQueryCond cond = {
+          .colList = pQuery->colList,
+          .order   = pQuery->order.order,
+          .numOfCols = pQuery->numOfCols,
+      };
+
+      TIME_WINDOW_COPY(cond.twindow, pQuery->window);
+
+      SArray *g1 = taosArrayInit(1, POINTER_BYTES);
+      SArray *tx = taosArrayClone(group);
+      taosArrayPush(g1, &tx);
+
+      STableGroupInfo gp = {.numOfTables = taosArrayGetSize(tx), .pGroupList = g1};
+
+      // include only current table
+      if (pRuntimeEnv->pQueryHandle != NULL) {
+        tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
+        pRuntimeEnv->pQueryHandle = NULL;
+      }
+
+      if (isFirstLastRowQuery(pQuery)) {
+        assert(0);  // last_row query switch to other routine to handle
+      } else {
+        pRuntimeEnv->pQueryHandle = tsdbQueryRowsInExternalWindow(pQInfo->tsdb, &cond, &gp, pQInfo);
+      }
+
+      taosArrayDestroy(tx);
+      taosArrayDestroy(g1);
+      if (pRuntimeEnv->pQueryHandle == NULL) {
+        longjmp(pRuntimeEnv->env, terrno);
+      }
+
+      initCtxOutputBuf(pRuntimeEnv);
+
+      SArray* s = tsdbGetQueriedTableList(pRuntimeEnv->pQueryHandle);
+      assert(taosArrayGetSize(s) >= 1);
+
+      setTagVal(pRuntimeEnv, taosArrayGetP(s, 0), pQInfo->tsdb);
+      if (isFirstLastRowQuery(pQuery)) {
+        assert(taosArrayGetSize(s) == 1);
+      }
+
+      taosArrayDestroy(s);
+
+      // here we simply set the first table as current table
+      SArray* first = GET_TABLEGROUP(pQInfo, pQInfo->groupIndex);
+      pQuery->current = taosArrayGetP(first, 0);
+
+      scanOneTableDataBlocks(pRuntimeEnv, pQuery->current->lastKey);
+
+      int64_t numOfRes = getNumOfResult(pRuntimeEnv);
+      if (numOfRes > 0) {
+        pQuery->rec.rows += numOfRes;
+        forwardCtxOutputBuf(pRuntimeEnv, numOfRes);
+      }
+
+      skipResults(pRuntimeEnv);
+      pQInfo->groupIndex += 1;
+
+      // enable execution for next table, when handling the projection query
+      enableExecutionForNextTable(pRuntimeEnv);
+
+      if (pQuery->rec.rows >= pQuery->rec.capacity) {
+        setQueryStatus(pQuery, QUERY_RESBUF_FULL);
+        break;
+      }
+    }
+  } else if (pRuntimeEnv->groupbyNormalCol) { // group-by on normal columns query
+    while (pQInfo->groupIndex < numOfGroups) {
+      SArray* group = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, pQInfo->groupIndex);
+
+      qDebug("QInfo:%p group by normal columns group:%d, total group:%" PRIzu "", pQInfo, pQInfo->groupIndex, numOfGroups);
+
+      STsdbQueryCond cond = {
+          .colList = pQuery->colList,
+          .order   = pQuery->order.order,
+          .numOfCols = pQuery->numOfCols,
+      };
+
+      TIME_WINDOW_COPY(cond.twindow, pQuery->window);
+
+      SArray *g1 = taosArrayInit(1, POINTER_BYTES);
+      SArray *tx = taosArrayClone(group);
+      taosArrayPush(g1, &tx);
+
+      STableGroupInfo gp = {.numOfTables = taosArrayGetSize(tx), .pGroupList = g1};
+
+      // include only current table
+      if (pRuntimeEnv->pQueryHandle != NULL) {
+        tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
+        pRuntimeEnv->pQueryHandle = NULL;
+      }
+
+      // no need to update the lastkey for each table
+      pRuntimeEnv->pQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &gp, pQInfo);
+
+      taosArrayDestroy(g1);
+      taosArrayDestroy(tx);
+      if (pRuntimeEnv->pQueryHandle == NULL) {
+        longjmp(pRuntimeEnv->env, terrno);
+      }
+
+      SArray* s = tsdbGetQueriedTableList(pRuntimeEnv->pQueryHandle);
+      assert(taosArrayGetSize(s) >= 1);
+
+      setTagVal(pRuntimeEnv, taosArrayGetP(s, 0), pQInfo->tsdb);
+
+      // here we simply set the first table as current table
+      scanMultiTableDataBlocks(pQInfo);
+      pQInfo->groupIndex += 1;
+
+      SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+
+        // no results generated for current group, continue to try the next group
+      taosArrayDestroy(s);
+      if (pWindowResInfo->size <= 0) {
+        continue;
+      }
+
+      for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+        pWindowResInfo->pResult[i].closed = true; // enable return all results for group by normal columns
+
+        SWindowResult *pResult = &pWindowResInfo->pResult[i];
+        for (int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+          pResult->numOfRows = (uint16_t)(MAX(pResult->numOfRows, pResult->resultInfo[j].numOfRes));
+        }
+      }
+
+      qDebug("QInfo:%p generated groupby columns results %d rows for group %d completed", pQInfo, pWindowResInfo->size,
+          pQInfo->groupIndex);
+      int32_t currentGroupIndex = pQInfo->groupIndex;
+
+      pQuery->rec.rows = 0;
+      pQInfo->groupIndex = 0;
+
+      ensureOutputBufferSimple(pRuntimeEnv, pWindowResInfo->size);
+      copyFromWindowResToSData(pQInfo, pWindowResInfo);
+
+      pQInfo->groupIndex = currentGroupIndex;  //restore the group index
+      assert(pQuery->rec.rows == pWindowResInfo->size);
+
+      clearClosedTimeWindow(pRuntimeEnv);
+      break;
+    }
+  } else {
+    /*
+     * 1. super table projection query, 2. ts-comp query
+     * if the subgroup index is larger than 0, results generated by group by tbname,k is existed.
+     * we need to return it to client in the first place.
+     */
+    if (pQInfo->groupIndex > 0) {
+      copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+      pQuery->rec.total += pQuery->rec.rows;
+
+      if (pQuery->rec.rows > 0) {
+        return;
+      }
+    }
+
+    // all data have returned already
+    if (pQInfo->tableIndex >= pQInfo->tableqinfoGroupInfo.numOfTables) {
+      return;
+    }
+
+    resetCtxOutputBuf(pRuntimeEnv);
+    resetTimeWindowInfo(pRuntimeEnv, &pRuntimeEnv->windowResInfo);
+
+    SArray *group = GET_TABLEGROUP(pQInfo, 0);
+    assert(taosArrayGetSize(group) == pQInfo->tableqinfoGroupInfo.numOfTables &&
+           1 == taosArrayGetSize(pQInfo->tableqinfoGroupInfo.pGroupList));
+
+    while (pQInfo->tableIndex < pQInfo->tableqinfoGroupInfo.numOfTables) {
+      if (IS_QUERY_KILLED(pQInfo)) {
+        longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+      }
+
+      pQuery->current = taosArrayGetP(group, pQInfo->tableIndex);
+      if (!multiTableMultioutputHelper(pQInfo, pQInfo->tableIndex)) {
+        pQInfo->tableIndex++;
+        continue;
+      }
+
+      // TODO handle the limit offset problem
+      if (pQuery->numOfFilterCols == 0 && pQuery->limit.offset > 0) {
+        if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+          pQInfo->tableIndex++;
+          continue;
+        }
+      }
+
+      scanOneTableDataBlocks(pRuntimeEnv, pQuery->current->lastKey);
+      skipResults(pRuntimeEnv);
+
+      // the limitation of output result is reached, set the query completed
+      if (limitResults(pRuntimeEnv)) {
+        SET_STABLE_QUERY_OVER(pQInfo);
+        break;
+      }
+
+      // enable execution for next table, when handling the projection query
+      enableExecutionForNextTable(pRuntimeEnv);
+
+      if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+        /*
+         * query range is identical in terms of all meters involved in query,
+         * so we need to restore them at the *beginning* of query on each meter,
+         * not the consecutive query on meter on which is aborted due to buffer limitation
+         * to ensure that, we can reset the query range once query on a meter is completed.
+         */
+        pQInfo->tableIndex++;
+
+        STableIdInfo tidInfo = {0};
+
+        STableId* id = TSDB_TABLEID(pQuery->current->pTable);
+        tidInfo.uid = id->uid;
+        tidInfo.tid = id->tid;
+        tidInfo.key = pQuery->current->lastKey;
+        taosArrayPush(pQInfo->arrTableIdInfo, &tidInfo);
+
+        // if the buffer is full or group by each table, we need to jump out of the loop
+        if (Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL)) {
+          break;
+        }
+
+      } else {
+        // all data in the result buffer are skipped due to the offset, continue to retrieve data from current meter
+        if (pQuery->rec.rows == 0) {
+          assert(!Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL));
+          continue;
+        } else {
+          // buffer is full, wait for the next round to retrieve data from current meter
+          assert(Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL));
+          break;
+        }
+      }
+    }
+
+    if (pQInfo->tableIndex >= pQInfo->tableqinfoGroupInfo.numOfTables) {
+      setQueryStatus(pQuery, QUERY_COMPLETED);
+    }
+  }
+
+  /*
+   * 1. super table projection query, group-by on normal columns query, ts-comp query
+   * 2. point interpolation query, last row query
+   *
+   * group-by on normal columns query and last_row query do NOT invoke the finalizer here,
+   * since the finalize stage will be done at the client side.
+   *
+   * projection query, point interpolation query do not need the finalizer.
+   *
+   * Only the ts-comp query requires the finalizer function to be executed here.
+   */
+  if (isTSCompQuery(pQuery)) {
+    finalizeQueryResult(pRuntimeEnv);
+  }
+
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    pRuntimeEnv->cur = pRuntimeEnv->pTSBuf->cur;
+  }
+
+  qDebug(
+      "QInfo %p numOfTables:%"PRIu64", index:%d, numOfGroups:%" PRIzu ", %"PRId64" points returned, total:%"PRId64", offset:%" PRId64,
+      pQInfo, pQInfo->tableqinfoGroupInfo.numOfTables, pQInfo->tableIndex, numOfGroups, pQuery->rec.rows, pQuery->rec.total,
+      pQuery->limit.offset);
+}
+
+static void doSaveContext(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  SET_REVERSE_SCAN_FLAG(pRuntimeEnv);
+  SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+  SWITCH_ORDER(pQuery->order.order);
+
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    pRuntimeEnv->pTSBuf->cur.order = pQuery->order.order;
+  }
+
+  STsdbQueryCond cond = {
+      .order   = pQuery->order.order,
+      .colList = pQuery->colList,
+      .numOfCols = pQuery->numOfCols,
+  };
+
+  TIME_WINDOW_COPY(cond.twindow, pQuery->window);
+
+  // clean unused handle
+  if (pRuntimeEnv->pSecQueryHandle != NULL) {
+    tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
+  }
+
+  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
+  switchCtxOrder(pRuntimeEnv);
+  disableFuncInReverseScan(pQInfo);
+  setupQueryRangeForReverseScan(pQInfo);
+
+  pRuntimeEnv->prevGroupId = INT32_MIN;
+  pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo);
+  if (pRuntimeEnv->pSecQueryHandle == NULL) {
+    longjmp(pRuntimeEnv->env, terrno);
+  }
+}
+
+static void doRestoreContext(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  SWAP(pQuery->window.skey, pQuery->window.ekey, TSKEY);
+
+  if (pRuntimeEnv->pTSBuf != NULL) {
+    SWITCH_ORDER(pRuntimeEnv->pTSBuf->cur.order);
+  }
+
+  switchCtxOrder(pRuntimeEnv);
+  SET_MASTER_SCAN_FLAG(pRuntimeEnv);
+}
+
+static void doCloseAllTimeWindowAfterScan(SQInfo *pQInfo) {
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+    size_t numOfGroup = GET_NUM_OF_TABLEGROUP(pQInfo);
+    for (int32_t i = 0; i < numOfGroup; ++i) {
+      SArray *group = GET_TABLEGROUP(pQInfo, i);
+
+      size_t num = taosArrayGetSize(group);
+      for (int32_t j = 0; j < num; ++j) {
+        STableQueryInfo* item = taosArrayGetP(group, j);
+        closeAllTimeWindow(&item->windowResInfo);
+      }
+    }
+  } else {  // close results for group result
+    closeAllTimeWindow(&pQInfo->runtimeEnv.windowResInfo);
+  }
+}
+
+static void multiTableQueryProcess(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  if (pQInfo->groupIndex > 0) {
+    /*
+     * if the groupIndex > 0, the query process must be completed yet, we only need to
+     * copy the data into output buffer
+     */
+    if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+      copyResToQueryResultBuf(pQInfo, pQuery);
+#ifdef _DEBUG_VIEW
+      displayInterResult(pQuery->sdata, pRuntimeEnv, pQuery->sdata[0]->num);
+#endif
+    } else {
+      copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+    }
+
+    qDebug("QInfo:%p current:%"PRId64", total:%"PRId64"", pQInfo, pQuery->rec.rows, pQuery->rec.total);
+    return;
+  }
+
+  qDebug("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", order:%d, forward scan start", pQInfo,
+         pQuery->window.skey, pQuery->window.ekey, pQuery->order.order);
+
+  // do check all qualified data blocks
+  int64_t el = scanMultiTableDataBlocks(pQInfo);
+  qDebug("QInfo:%p master scan completed, elapsed time: %" PRId64 "ms, reverse scan start", pQInfo, el);
+
+  // query error occurred or query is killed, abort current execution
+  if (pQInfo->code != TSDB_CODE_SUCCESS || IS_QUERY_KILLED(pQInfo)) {
+    qDebug("QInfo:%p query killed or error occurred, code:%s, abort", pQInfo, tstrerror(pQInfo->code));
+    finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+    longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+  }
+
+  // close all time window results
+  doCloseAllTimeWindowAfterScan(pQInfo);
+
+  if (needReverseScan(pQuery)) {
+    doSaveContext(pQInfo);
+
+    el = scanMultiTableDataBlocks(pQInfo);
+    qDebug("QInfo:%p reversed scan completed, elapsed time: %" PRId64 "ms", pQInfo, el);
+
+    doRestoreContext(pQInfo);
+  } else {
+    qDebug("QInfo:%p no need to do reversed scan, query completed", pQInfo);
+  }
+
+  setQueryStatus(pQuery, QUERY_COMPLETED);
+
+  if (pQInfo->code != TSDB_CODE_SUCCESS || IS_QUERY_KILLED(pQInfo)) {
+    qDebug("QInfo:%p query killed or error occurred, code:%s, abort", pQInfo, tstrerror(pQInfo->code));
+    finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+    longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+  }
+
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) || isSumAvgRateQuery(pQuery)) {
+    if (mergeIntoGroupResult(pQInfo) == TSDB_CODE_SUCCESS) {
+      copyResToQueryResultBuf(pQInfo, pQuery);
+
+#ifdef _DEBUG_VIEW
+      displayInterResult(pQuery->sdata, pRuntimeEnv, pQuery->sdata[0]->num);
+#endif
+    }
+  } else {  // not a interval query
+    copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+  }
+
+  // handle the limitation of output buffer
+  qDebug("QInfo:%p points returned:%" PRId64 ", total:%" PRId64, pQInfo, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
+}
+
+/*
+ * in each query, this function will be called only once, no retry for further result.
+ *
+ * select count(*)/top(field,k)/avg(field name) from table_name [where ts>now-1a];
+ * select count(*) from table_name group by status_column;
+ */
+static void tableFixedOutputProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  if (!pRuntimeEnv->topBotQuery && pQuery->limit.offset > 0) {  // no need to execute, since the output will be ignore.
+    return;
+  }
+
+  pQuery->current = pTableInfo;  // set current query table info
+
+  scanOneTableDataBlocks(pRuntimeEnv, pTableInfo->lastKey);
+  finalizeQueryResult(pRuntimeEnv);
+
+  if (IS_QUERY_KILLED(pQInfo)) {
+    finalizeQueryResult(pRuntimeEnv); // clean up allocated resource during query
+    longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED);
+  }
+
+  // since the numOfRows must be identical for all sql functions that are allowed to be executed simutaneously.
+  pQuery->rec.rows = getNumOfResult(pRuntimeEnv);
+
+  skipResults(pRuntimeEnv);
+  limitResults(pRuntimeEnv);
+}
+
+static void tableMultiOutputProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  pQuery->current = pTableInfo;
+
+  // for ts_comp query, re-initialized is not allowed
+  if (!isTSCompQuery(pQuery)) {
+    resetCtxOutputBuf(pRuntimeEnv);
+  }
+
+  // skip blocks without load the actual data block from file if no filter condition present
+  skipBlocks(&pQInfo->runtimeEnv);
+  if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0) {
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+    return;
+  }
+
+  while (1) {
+    scanOneTableDataBlocks(pRuntimeEnv, pQuery->current->lastKey);
+    finalizeQueryResult(pRuntimeEnv);
+
+    pQuery->rec.rows = getNumOfResult(pRuntimeEnv);
+    if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols > 0 && pQuery->rec.rows > 0) {
+      skipResults(pRuntimeEnv);
+    }
+
+    /*
+     * 1. if pQuery->size == 0, pQuery->limit.offset >= 0, still need to check data
+     * 2. if pQuery->size > 0, pQuery->limit.offset must be 0
+     */
+    if (pQuery->rec.rows > 0 || Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+      break;
+    }
+
+    qDebug("QInfo:%p skip current result, offset:%" PRId64 ", next qrange:%" PRId64 "-%" PRId64,
+           pQInfo, pQuery->limit.offset, pQuery->current->lastKey, pQuery->current->win.ekey);
+
+    resetCtxOutputBuf(pRuntimeEnv);
+  }
+
+  limitResults(pRuntimeEnv);
+  if (Q_STATUS_EQUAL(pQuery->status, QUERY_RESBUF_FULL)) {
+    qDebug("QInfo:%p query paused due to output limitation, next qrange:%" PRId64 "-%" PRId64, pQInfo,
+        pQuery->current->lastKey, pQuery->window.ekey);
+  } else if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+    STableIdInfo tidInfo;
+    STableId* id = TSDB_TABLEID(pQuery->current->pTable);
+
+    tidInfo.uid = id->uid;
+    tidInfo.tid = id->tid;
+    tidInfo.key = pQuery->current->lastKey;
+    taosArrayPush(pQInfo->arrTableIdInfo, &tidInfo);
+  }
+
+  if (!isTSCompQuery(pQuery)) {
+    assert(pQuery->rec.rows <= pQuery->rec.capacity);
+  }
+}
+
+static void tableIntervalProcessImpl(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+
+  while (1) {
+    scanOneTableDataBlocks(pRuntimeEnv, start);
+
+    assert(!Q_STATUS_EQUAL(pQuery->status, QUERY_NOT_COMPLETED));
+    finalizeQueryResult(pRuntimeEnv);
+
+    // here we can ignore the records in case of no interpolation
+    // todo handle offset, in case of top/bottom interval query
+    if ((pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL) && pQuery->limit.offset > 0 &&
+        pQuery->fillType == TSDB_FILL_NONE) {
+      // maxOutput <= 0, means current query does not generate any results
+      int32_t numOfClosed = numOfClosedTimeWindow(&pRuntimeEnv->windowResInfo);
+
+      int32_t c = (int32_t)(MIN(numOfClosed, pQuery->limit.offset));
+      clearFirstNTimeWindow(pRuntimeEnv, c);
+      pQuery->limit.offset -= c;
+    }
+
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED | QUERY_RESBUF_FULL)) {
+      break;
+    }
+  }
+}
+
+// handle time interval query on table
+static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &(pQInfo->runtimeEnv);
+
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  pQuery->current = pTableInfo;
+
+  int32_t numOfFilled = 0;
+  TSKEY newStartKey = TSKEY_INITIAL_VAL;
+
+  // skip blocks without load the actual data block from file if no filter condition present
+  skipTimeInterval(pRuntimeEnv, &newStartKey);
+  if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0 && pRuntimeEnv->pFillInfo == NULL) {
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+    return;
+  }
+
+  while (1) {
+    tableIntervalProcessImpl(pRuntimeEnv, newStartKey);
+
+    if (QUERY_IS_INTERVAL_QUERY(pQuery)) {
+      pQInfo->groupIndex = 0;  // always start from 0
+      pQuery->rec.rows = 0;
+      copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+
+      clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+    }
+
+    // the offset is handled at prepare stage if no interpolation involved
+    if (pQuery->fillType == TSDB_FILL_NONE || pQuery->rec.rows == 0) {
+      limitResults(pRuntimeEnv);
+      break;
+    } else {
+      taosFillSetStartInfo(pRuntimeEnv->pFillInfo, (int32_t)pQuery->rec.rows, pQuery->window.ekey);
+      taosFillCopyInputDataFromFilePage(pRuntimeEnv->pFillInfo, (tFilePage**) pQuery->sdata);
+      numOfFilled = 0;
+
+      pQuery->rec.rows = doFillGapsInResults(pRuntimeEnv, (tFilePage **)pQuery->sdata, &numOfFilled);
+      if (pQuery->rec.rows > 0 || Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+        limitResults(pRuntimeEnv);
+        break;
+      }
+
+      // no result generated yet, continue retrieve data
+      pQuery->rec.rows = 0;
+    }
+  }
+
+  // all data scanned, the group by normal column can return
+  if (pRuntimeEnv->groupbyNormalCol) {  // todo refactor with merge interval time result
+    pQInfo->groupIndex = 0;
+    pQuery->rec.rows = 0;
+    copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+    clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+  }
+}
+
+static void tableQueryImpl(SQInfo *pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  if (queryHasRemainResForTableQuery(pRuntimeEnv)) {
+
+    if (pQuery->fillType != TSDB_FILL_NONE) {
+      /*
+       * There are remain results that are not returned due to result interpolation
+       * So, we do keep in this procedure instead of launching retrieve procedure for next results.
+       */
+      int32_t numOfFilled = 0;
+      pQuery->rec.rows = doFillGapsInResults(pRuntimeEnv, (tFilePage **)pQuery->sdata, &numOfFilled);
+
+      if (pQuery->rec.rows > 0) {
+        limitResults(pRuntimeEnv);
+      }
+
+      qDebug("QInfo:%p current:%" PRId64 " returned, total:%" PRId64, pQInfo, pQuery->rec.rows, pQuery->rec.total);
+      return;
+    } else {
+      pQuery->rec.rows = 0;
+      pQInfo->groupIndex = 0;  // always start from 0
+
+      if (pRuntimeEnv->windowResInfo.size > 0) {
+        copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+        clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+
+        if (pQuery->rec.rows > 0) {
+          qDebug("QInfo:%p %"PRId64" rows returned from group results, total:%"PRId64"", pQInfo, pQuery->rec.rows, pQuery->rec.total);
+
+          // there are not data remains
+          if (pRuntimeEnv->windowResInfo.size <= 0) {
+            qDebug("QInfo:%p query over, %"PRId64" rows are returned", pQInfo, pQuery->rec.total);
+          }
+
+          return;
+        }
+      }
+    }
+  }
+
+  // number of points returned during this query
+  pQuery->rec.rows = 0;
+  int64_t st = taosGetTimestampUs();
+
+  assert(pQInfo->tableqinfoGroupInfo.numOfTables == 1);
+  SArray* g = GET_TABLEGROUP(pQInfo, 0);
+  STableQueryInfo* item = taosArrayGetP(g, 0);
+
+  // group by normal column, sliding window query, interval query are handled by interval query processor
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) || pRuntimeEnv->groupbyNormalCol) {  // interval (down sampling operation)
+    tableIntervalProcess(pQInfo, item);
+  } else if (isFixedOutputQuery(pRuntimeEnv)) {
+    tableFixedOutputProcess(pQInfo, item);
+  } else {  // diff/add/multiply/subtract/division
+    assert(pQuery->checkBuffer == 1);
+    tableMultiOutputProcess(pQInfo, item);
+  }
+
+  // record the total elapsed time
+  pRuntimeEnv->summary.elapsedTime += (taosGetTimestampUs() - st);
+  assert(pQInfo->tableqinfoGroupInfo.numOfTables == 1);
+}
+
+static void stableQueryImpl(SQInfo *pQInfo) {
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *pQuery = pRuntimeEnv->pQuery;
+  pQuery->rec.rows = 0;
+
+  int64_t st = taosGetTimestampUs();
+
+  if (QUERY_IS_INTERVAL_QUERY(pQuery) ||
+      (isFixedOutputQuery(pRuntimeEnv) && (!isPointInterpoQuery(pQuery)) && (!pRuntimeEnv->groupbyNormalCol))) {
+    multiTableQueryProcess(pQInfo);
+  } else {
+    assert((pQuery->checkBuffer == 1 && pQuery->interval.interval == 0) || isPointInterpoQuery(pQuery) ||
+            isFirstLastRowQuery(pQuery) || pRuntimeEnv->groupbyNormalCol);
+
+    sequentialTableProcess(pQInfo);
+  }
+
+  // record the total elapsed time
+  pQInfo->runtimeEnv.summary.elapsedTime += (taosGetTimestampUs() - st);
+}
+
+static int32_t getColumnIndexInSource(SQueryTableMsg *pQueryMsg, SSqlFuncMsg *pExprMsg, SColumnInfo* pTagCols) {
+  int32_t j = 0;
+
+  if (TSDB_COL_IS_TAG(pExprMsg->colInfo.flag)) {
+    if (pExprMsg->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
+      return TSDB_TBNAME_COLUMN_INDEX;
+    }
+
+    while(j < pQueryMsg->numOfTags) {
+      if (pExprMsg->colInfo.colId == pTagCols[j].colId) {
+        return j;
+      }
+
+      j += 1;
+    }
+
+  } else if (TSDB_COL_IS_UD_COL(pExprMsg->colInfo.flag)) {  // user specified column data
+    return TSDB_UD_COLUMN_INDEX;
+  } else {
+    while (j < pQueryMsg->numOfCols) {
+      if (pExprMsg->colInfo.colId == pQueryMsg->colList[j].colId) {
+        return j;
+      }
+
+      j += 1;
+    }
+  }
+  assert(0);
+  return -1;
+}
+
+bool validateExprColumnInfo(SQueryTableMsg *pQueryMsg, SSqlFuncMsg *pExprMsg, SColumnInfo* pTagCols) {
+  int32_t j = getColumnIndexInSource(pQueryMsg, pExprMsg, pTagCols);
+  return j < pQueryMsg->numOfCols || j < pQueryMsg->numOfTags;
+}
+
+static bool validateQueryMsg(SQueryTableMsg *pQueryMsg) {
+  if (pQueryMsg->interval.interval < 0) {
+    qError("qmsg:%p illegal value of interval time %" PRId64, pQueryMsg, pQueryMsg->interval.interval);
+    return false;
+  }
+
+  if (pQueryMsg->numOfTables <= 0) {
+    qError("qmsg:%p illegal value of numOfTables %d", pQueryMsg, pQueryMsg->numOfTables);
+    return false;
+  }
+
+  if (pQueryMsg->numOfGroupCols < 0) {
+    qError("qmsg:%p illegal value of numOfGroupbyCols %d", pQueryMsg, pQueryMsg->numOfGroupCols);
+    return false;
+  }
+
+  if (pQueryMsg->numOfOutput > TSDB_MAX_COLUMNS || pQueryMsg->numOfOutput <= 0) {
+    qError("qmsg:%p illegal value of output columns %d", pQueryMsg, pQueryMsg->numOfOutput);
+    return false;
+  }
+
+  return true;
+}
+
+static bool validateQuerySourceCols(SQueryTableMsg *pQueryMsg, SSqlFuncMsg** pExprMsg) {
+  int32_t numOfTotal = pQueryMsg->numOfCols + pQueryMsg->numOfTags;
+  if (pQueryMsg->numOfCols < 0 || pQueryMsg->numOfTags < 0 || numOfTotal > TSDB_MAX_COLUMNS) {
+    qError("qmsg:%p illegal value of numOfCols %d numOfTags:%d", pQueryMsg, pQueryMsg->numOfCols, pQueryMsg->numOfTags);
+    return false;
+  } else if (numOfTotal == 0) {
+    for(int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
+      SSqlFuncMsg* pFuncMsg = pExprMsg[i];
+
+      if ((pFuncMsg->functionId == TSDB_FUNC_TAGPRJ) ||
+          (pFuncMsg->functionId == TSDB_FUNC_TID_TAG && pFuncMsg->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) ||
+          (pFuncMsg->functionId == TSDB_FUNC_COUNT && pFuncMsg->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX)) {
+        continue;
+      }
+
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static char *createTableIdList(SQueryTableMsg *pQueryMsg, char *pMsg, SArray **pTableIdList) {
+  assert(pQueryMsg->numOfTables > 0);
+
+  *pTableIdList = taosArrayInit(pQueryMsg->numOfTables, sizeof(STableIdInfo));
+
+  for (int32_t j = 0; j < pQueryMsg->numOfTables; ++j) {
+    STableIdInfo* pTableIdInfo = (STableIdInfo *)pMsg;
+
+    pTableIdInfo->tid = htonl(pTableIdInfo->tid);
+    pTableIdInfo->uid = htobe64(pTableIdInfo->uid);
+    pTableIdInfo->key = htobe64(pTableIdInfo->key);
+
+    taosArrayPush(*pTableIdList, pTableIdInfo);
+    pMsg += sizeof(STableIdInfo);
+  }
+
+  return pMsg;
+}
+
+/**
+ * pQueryMsg->head has been converted before this function is called.
+ *
+ * @param pQueryMsg
+ * @param pTableIdList
+ * @param pExpr
+ * @return
+ */
+static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList, SSqlFuncMsg ***pExpr,
+                               char **tagCond, char** tbnameCond, SColIndex **groupbyCols, SColumnInfo** tagCols) {
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  pQueryMsg->numOfTables = htonl(pQueryMsg->numOfTables);
+
+  pQueryMsg->window.skey = htobe64(pQueryMsg->window.skey);
+  pQueryMsg->window.ekey = htobe64(pQueryMsg->window.ekey);
+  pQueryMsg->interval.interval = htobe64(pQueryMsg->interval.interval);
+  pQueryMsg->interval.sliding = htobe64(pQueryMsg->interval.sliding);
+  pQueryMsg->interval.offset = htobe64(pQueryMsg->interval.offset);
+  pQueryMsg->interval.intervalUnit = pQueryMsg->interval.intervalUnit;
+  pQueryMsg->interval.slidingUnit = pQueryMsg->interval.slidingUnit;
+  pQueryMsg->interval.offsetUnit = pQueryMsg->interval.offsetUnit;
+  pQueryMsg->limit = htobe64(pQueryMsg->limit);
+  pQueryMsg->offset = htobe64(pQueryMsg->offset);
+
+  pQueryMsg->order = htons(pQueryMsg->order);
+  pQueryMsg->orderColId = htons(pQueryMsg->orderColId);
+  pQueryMsg->queryType = htonl(pQueryMsg->queryType);
+  pQueryMsg->tagNameRelType = htons(pQueryMsg->tagNameRelType);
+
+  pQueryMsg->numOfCols = htons(pQueryMsg->numOfCols);
+  pQueryMsg->numOfOutput = htons(pQueryMsg->numOfOutput);
+  pQueryMsg->numOfGroupCols = htons(pQueryMsg->numOfGroupCols);
+  pQueryMsg->tagCondLen = htons(pQueryMsg->tagCondLen);
+  pQueryMsg->tsOffset = htonl(pQueryMsg->tsOffset);
+  pQueryMsg->tsLen = htonl(pQueryMsg->tsLen);
+  pQueryMsg->tsNumOfBlocks = htonl(pQueryMsg->tsNumOfBlocks);
+  pQueryMsg->tsOrder = htonl(pQueryMsg->tsOrder);
+  pQueryMsg->numOfTags = htonl(pQueryMsg->numOfTags);
+
+  // query msg safety check
+  if (!validateQueryMsg(pQueryMsg)) {
+    code = TSDB_CODE_QRY_INVALID_MSG;
+    goto _cleanup;
+  }
+
+  char *pMsg = (char *)(pQueryMsg->colList) + sizeof(SColumnInfo) * pQueryMsg->numOfCols;
+  for (int32_t col = 0; col < pQueryMsg->numOfCols; ++col) {
+    SColumnInfo *pColInfo = &pQueryMsg->colList[col];
+
+    pColInfo->colId = htons(pColInfo->colId);
+    pColInfo->type = htons(pColInfo->type);
+    pColInfo->bytes = htons(pColInfo->bytes);
+    pColInfo->numOfFilters = htons(pColInfo->numOfFilters);
+
+    assert(pColInfo->type >= TSDB_DATA_TYPE_BOOL && pColInfo->type <= TSDB_DATA_TYPE_NCHAR);
+
+    int32_t numOfFilters = pColInfo->numOfFilters;
+    if (numOfFilters > 0) {
+      pColInfo->filters = calloc(numOfFilters, sizeof(SColumnFilterInfo));
+      if (pColInfo->filters == NULL) {
+        code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+        goto _cleanup;
+      }
+    }
+
+    for (int32_t f = 0; f < numOfFilters; ++f) {
+      SColumnFilterInfo *pFilterMsg = (SColumnFilterInfo *)pMsg;
+
+      SColumnFilterInfo *pColFilter = &pColInfo->filters[f];
+      pColFilter->filterstr = htons(pFilterMsg->filterstr);
+
+      pMsg += sizeof(SColumnFilterInfo);
+
+      if (pColFilter->filterstr) {
+        pColFilter->len = htobe64(pFilterMsg->len);
+
+        pColFilter->pz = (int64_t)calloc(1, (size_t)(pColFilter->len + 1 * TSDB_NCHAR_SIZE)); // note: null-terminator
+        if (pColFilter->pz == 0) {
+          code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+          goto _cleanup;
+        }
+
+        memcpy((void *)pColFilter->pz, pMsg, (size_t)pColFilter->len);
+        pMsg += (pColFilter->len + 1);
+      } else {
+        pColFilter->lowerBndi = htobe64(pFilterMsg->lowerBndi);
+        pColFilter->upperBndi = htobe64(pFilterMsg->upperBndi);
+      }
+
+      pColFilter->lowerRelOptr = htons(pFilterMsg->lowerRelOptr);
+      pColFilter->upperRelOptr = htons(pFilterMsg->upperRelOptr);
+    }
+  }
+
+  *pExpr = calloc(pQueryMsg->numOfOutput, POINTER_BYTES);
+  if (*pExpr == NULL) {
+    code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+    goto _cleanup;
+  }
+
+  SSqlFuncMsg *pExprMsg = (SSqlFuncMsg *)pMsg;
+
+  for (int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
+    (*pExpr)[i] = pExprMsg;
+
+    pExprMsg->colInfo.colIndex = htons(pExprMsg->colInfo.colIndex);
+    pExprMsg->colInfo.colId = htons(pExprMsg->colInfo.colId);
+    pExprMsg->colInfo.flag = htons(pExprMsg->colInfo.flag);
+    pExprMsg->functionId = htons(pExprMsg->functionId);
+    pExprMsg->numOfParams = htons(pExprMsg->numOfParams);
+
+    pMsg += sizeof(SSqlFuncMsg);
+
+    for (int32_t j = 0; j < pExprMsg->numOfParams; ++j) {
+      pExprMsg->arg[j].argType = htons(pExprMsg->arg[j].argType);
+      pExprMsg->arg[j].argBytes = htons(pExprMsg->arg[j].argBytes);
+
+      if (pExprMsg->arg[j].argType == TSDB_DATA_TYPE_BINARY) {
+        pExprMsg->arg[j].argValue.pz = pMsg;
+        pMsg += pExprMsg->arg[j].argBytes;  // one more for the string terminated char.
+      } else {
+        pExprMsg->arg[j].argValue.i64 = htobe64(pExprMsg->arg[j].argValue.i64);
+      }
+    }
+
+    int16_t functionId = pExprMsg->functionId;
+    if (functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ || functionId == TSDB_FUNC_TAG_DUMMY) {
+      if (!TSDB_COL_IS_TAG(pExprMsg->colInfo.flag)) {  // ignore the column  index check for arithmetic expression.
+        code = TSDB_CODE_QRY_INVALID_MSG;
+        goto _cleanup;
+      }
+    } else {
+//      if (!validateExprColumnInfo(pQueryMsg, pExprMsg)) {
+//        return TSDB_CODE_QRY_INVALID_MSG;
+//      }
+    }
+
+    pExprMsg = (SSqlFuncMsg *)pMsg;
+  }
+
+  if (!validateQuerySourceCols(pQueryMsg, *pExpr)) {
+    code = TSDB_CODE_QRY_INVALID_MSG;
+    goto _cleanup;
+  }
+
+  pMsg = createTableIdList(pQueryMsg, pMsg, pTableIdList);
+
+  if (pQueryMsg->numOfGroupCols > 0) {  // group by tag columns
+    *groupbyCols = malloc(pQueryMsg->numOfGroupCols * sizeof(SColIndex));
+    if (*groupbyCols == NULL) {
+      code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      goto _cleanup;
+    }
+
+    for (int32_t i = 0; i < pQueryMsg->numOfGroupCols; ++i) {
+      (*groupbyCols)[i].colId = *(int16_t *)pMsg;
+      pMsg += sizeof((*groupbyCols)[i].colId);
+
+      (*groupbyCols)[i].colIndex = *(int16_t *)pMsg;
+      pMsg += sizeof((*groupbyCols)[i].colIndex);
+
+      (*groupbyCols)[i].flag = *(int16_t *)pMsg;
+      pMsg += sizeof((*groupbyCols)[i].flag);
+
+      memcpy((*groupbyCols)[i].name, pMsg, tListLen(groupbyCols[i]->name));
+      pMsg += tListLen((*groupbyCols)[i].name);
+    }
+
+    pQueryMsg->orderByIdx = htons(pQueryMsg->orderByIdx);
+    pQueryMsg->orderType = htons(pQueryMsg->orderType);
+  }
+
+  pQueryMsg->fillType = htons(pQueryMsg->fillType);
+  if (pQueryMsg->fillType != TSDB_FILL_NONE) {
+    pQueryMsg->fillVal = (uint64_t)(pMsg);
+
+    int64_t *v = (int64_t *)pMsg;
+    for (int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
+      v[i] = htobe64(v[i]);
+    }
+
+    pMsg += sizeof(int64_t) * pQueryMsg->numOfOutput;
+  }
+
+  if (pQueryMsg->numOfTags > 0) {
+    (*tagCols) = calloc(1, sizeof(SColumnInfo) * pQueryMsg->numOfTags);
+    if (*tagCols == NULL) {
+      code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      goto _cleanup;
+    }
+
+    for (int32_t i = 0; i < pQueryMsg->numOfTags; ++i) {
+      SColumnInfo* pTagCol = (SColumnInfo*) pMsg;
+
+      pTagCol->colId = htons(pTagCol->colId);
+      pTagCol->bytes = htons(pTagCol->bytes);
+      pTagCol->type  = htons(pTagCol->type);
+      pTagCol->numOfFilters = 0;
+
+      (*tagCols)[i] = *pTagCol;
+      pMsg += sizeof(SColumnInfo);
+    }
+  }
+
+  // the tag query condition expression string is located at the end of query msg
+  if (pQueryMsg->tagCondLen > 0) {
+    *tagCond = calloc(1, pQueryMsg->tagCondLen);
+
+    if (*tagCond == NULL) {
+      code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      goto _cleanup;
+
+    }
+    memcpy(*tagCond, pMsg, pQueryMsg->tagCondLen);
+    pMsg += pQueryMsg->tagCondLen;
+  }
+
+  if (*pMsg != 0) {
+    size_t len = strlen(pMsg) + 1;
+
+    *tbnameCond = malloc(len);
+    if (*tbnameCond == NULL) {
+      code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+      goto _cleanup;
+    }
+
+    strcpy(*tbnameCond, pMsg);
+    pMsg += len;
+  }
+
+  qDebug("qmsg:%p query %d tables, type:%d, qrange:%" PRId64 "-%" PRId64 ", numOfGroupbyTagCols:%d, order:%d, "
+         "outputCols:%d, numOfCols:%d, interval:%" PRId64 ", fillType:%d, comptsLen:%d, compNumOfBlocks:%d, limit:%" PRId64 ", offset:%" PRId64,
+         pQueryMsg, pQueryMsg->numOfTables, pQueryMsg->queryType, pQueryMsg->window.skey, pQueryMsg->window.ekey, pQueryMsg->numOfGroupCols,
+         pQueryMsg->order, pQueryMsg->numOfOutput, pQueryMsg->numOfCols, pQueryMsg->interval.interval,
+         pQueryMsg->fillType, pQueryMsg->tsLen, pQueryMsg->tsNumOfBlocks, pQueryMsg->limit, pQueryMsg->offset);
+
+  return TSDB_CODE_SUCCESS;
+
+_cleanup:
+  taosTFree(*pExpr);
+  taosArrayDestroy(*pTableIdList);
+  *pTableIdList = NULL;
+  taosTFree(*tbnameCond);
+  taosTFree(*groupbyCols);
+  taosTFree(*tagCols);
+  taosTFree(*tagCond);
+
+  return code;
+}
+
+static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTableMsg *pQueryMsg) {
+  qDebug("qmsg:%p create arithmetic expr from binary string: %s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz);
+
+  tExprNode* pExprNode = NULL;
+  TRY(TSDB_MAX_TAG_CONDITIONS) {
+    pExprNode = exprTreeFromBinary(pArithExprInfo->base.arg[0].argValue.pz, pArithExprInfo->base.arg[0].argBytes);
+  } CATCH( code ) {
+    CLEANUP_EXECUTE();
+    qError("qmsg:%p failed to create arithmetic expression string from:%s, reason: %s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz, tstrerror(code));
+    return code;
+  } END_TRY
+
+  if (pExprNode == NULL) {
+    qError("qmsg:%p failed to create arithmetic expression string from:%s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz);
+    return TSDB_CODE_QRY_APP_ERROR;
+  }
+
+  pArithExprInfo->pExpr = pExprNode;
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t createQFunctionExprFromMsg(SQueryTableMsg *pQueryMsg, SExprInfo **pExprInfo, SSqlFuncMsg **pExprMsg,
+    SColumnInfo* pTagCols) {
+  *pExprInfo = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  SExprInfo *pExprs = (SExprInfo *)calloc(pQueryMsg->numOfOutput, sizeof(SExprInfo));
+  if (pExprs == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  bool    isSuperTable = QUERY_IS_STABLE_QUERY(pQueryMsg->queryType);
+  int16_t tagLen = 0;
+
+  for (int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
+    pExprs[i].base = *pExprMsg[i];
+    pExprs[i].bytes = 0;
+
+    int16_t type = 0;
+    int16_t bytes = 0;
+
+    // parse the arithmetic expression
+    if (pExprs[i].base.functionId == TSDB_FUNC_ARITHM) {
+      code = buildAirthmeticExprFromMsg(&pExprs[i], pQueryMsg);
+
+      if (code != TSDB_CODE_SUCCESS) {
+        taosTFree(pExprs);
+        return code;
+      }
+
+      type  = TSDB_DATA_TYPE_DOUBLE;
+      bytes = tDataTypeDesc[type].nSize;
+    } else if (pExprs[i].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX && pExprs[i].base.functionId == TSDB_FUNC_TAGPRJ) {  // parse the normal column
+      SSchema s = tGetTableNameColumnSchema();
+      type = s.type;
+      bytes = s.bytes;
+    } else if (pExprs[i].base.colInfo.colId <= TSDB_UD_COLUMN_INDEX) {
+      // it is a user-defined constant value column
+      assert(pExprs[i].base.functionId == TSDB_FUNC_PRJ);
+
+      type = pExprs[i].base.arg[1].argType;
+      bytes = pExprs[i].base.arg[1].argBytes;
+
+      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+        bytes += VARSTR_HEADER_SIZE;
+      }
+    } else {
+      int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols);
+      assert(j < pQueryMsg->numOfCols || j < pQueryMsg->numOfTags);
+
+      if (pExprs[i].base.colInfo.colId != TSDB_TBNAME_COLUMN_INDEX && j >= 0) {
+        SColumnInfo* pCol = (TSDB_COL_IS_TAG(pExprs[i].base.colInfo.flag))? &pTagCols[j]:&pQueryMsg->colList[j];
+        type = pCol->type;
+        bytes = pCol->bytes;
+      } else {
+        SSchema s = tGetTableNameColumnSchema();
+
+        type  = s.type;
+        bytes = s.bytes;
+      }
+    }
+
+    int32_t param = (int32_t)pExprs[i].base.arg[0].argValue.i64;
+    if (getResultDataInfo(type, bytes, pExprs[i].base.functionId, param, &pExprs[i].type, &pExprs[i].bytes,
+                          &pExprs[i].interBytes, 0, isSuperTable) != TSDB_CODE_SUCCESS) {
+      taosTFree(pExprs);
+      return TSDB_CODE_QRY_INVALID_MSG;
+    }
+
+    if (pExprs[i].base.functionId == TSDB_FUNC_TAG_DUMMY || pExprs[i].base.functionId == TSDB_FUNC_TS_DUMMY) {
+      tagLen += pExprs[i].bytes;
+    }
+    assert(isValidDataType(pExprs[i].type));
+  }
+
+  // TODO refactor
+  for (int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
+    pExprs[i].base = *pExprMsg[i];
+    int16_t functId = pExprs[i].base.functionId;
+
+    if (functId == TSDB_FUNC_TOP || functId == TSDB_FUNC_BOTTOM) {
+      int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols);
+      if (j < 0 || j >= pQueryMsg->numOfCols) {
+        assert(0);
+      } else {
+        SColumnInfo *pCol = &pQueryMsg->colList[j];
+        int32_t ret =
+            getResultDataInfo(pCol->type, pCol->bytes, functId, (int32_t)pExprs[i].base.arg[0].argValue.i64,
+                              &pExprs[i].type, &pExprs[i].bytes, &pExprs[i].interBytes, tagLen, isSuperTable);
+        assert(ret == TSDB_CODE_SUCCESS);
+      }
+    }
+  }
+
+  *pExprInfo = pExprs;
+  return TSDB_CODE_SUCCESS;
+}
+
+static SSqlGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SColIndex *pColIndex, int32_t *code) {
+  if (pQueryMsg->numOfGroupCols == 0) {
+    return NULL;
+  }
+
+  // using group by tag columns
+  SSqlGroupbyExpr *pGroupbyExpr = (SSqlGroupbyExpr *)calloc(1, sizeof(SSqlGroupbyExpr));
+  if (pGroupbyExpr == NULL) {
+    *code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pGroupbyExpr->numOfGroupCols = pQueryMsg->numOfGroupCols;
+  pGroupbyExpr->orderType = pQueryMsg->orderType;
+  pGroupbyExpr->orderIndex = pQueryMsg->orderByIdx;
+
+  pGroupbyExpr->columnInfo = taosArrayInit(pQueryMsg->numOfGroupCols, sizeof(SColIndex));
+  for(int32_t i = 0; i < pQueryMsg->numOfGroupCols; ++i) {
+    taosArrayPush(pGroupbyExpr->columnInfo, &pColIndex[i]);
+  }
+
+  return pGroupbyExpr;
+}
+
+static int32_t createFilterInfo(void *pQInfo, SQuery *pQuery) {
+  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
+    if (pQuery->colList[i].numOfFilters > 0) {
+      pQuery->numOfFilterCols++;
+    }
+  }
+
+  if (pQuery->numOfFilterCols == 0) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  pQuery->pFilterInfo = calloc(1, sizeof(SSingleColumnFilterInfo) * pQuery->numOfFilterCols);
+  if (pQuery->pFilterInfo == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  for (int32_t i = 0, j = 0; i < pQuery->numOfCols; ++i) {
+    if (pQuery->colList[i].numOfFilters > 0) {
+      SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[j];
+
+      memcpy(&pFilterInfo->info, &pQuery->colList[i], sizeof(SColumnInfo));
+      pFilterInfo->info = pQuery->colList[i];
+
+      pFilterInfo->numOfFilters = pQuery->colList[i].numOfFilters;
+      pFilterInfo->pFilters = calloc(pFilterInfo->numOfFilters, sizeof(SColumnFilterElem));
+      if (pFilterInfo->pFilters == NULL) {
+        return TSDB_CODE_QRY_OUT_OF_MEMORY;
+      }
+
+      for (int32_t f = 0; f < pFilterInfo->numOfFilters; ++f) {
+        SColumnFilterElem *pSingleColFilter = &pFilterInfo->pFilters[f];
+        pSingleColFilter->filterInfo = pQuery->colList[i].filters[f];
+
+        int32_t lower = pSingleColFilter->filterInfo.lowerRelOptr;
+        int32_t upper = pSingleColFilter->filterInfo.upperRelOptr;
+
+        if (lower == TSDB_RELATION_INVALID && upper == TSDB_RELATION_INVALID) {
+          qError("QInfo:%p invalid filter info", pQInfo);
+          return TSDB_CODE_QRY_INVALID_MSG;
+        }
+
+        int16_t type  = pQuery->colList[i].type;
+        int16_t bytes = pQuery->colList[i].bytes;
+
+        // todo refactor
+        __filter_func_t *rangeFilterArray = getRangeFilterFuncArray(type);
+        __filter_func_t *filterArray = getValueFilterFuncArray(type);
+
+        if (rangeFilterArray == NULL && filterArray == NULL) {
+          qError("QInfo:%p failed to get filter function, invalid data type:%d", pQInfo, type);
+          return TSDB_CODE_QRY_INVALID_MSG;
+        }
+
+        if ((lower == TSDB_RELATION_GREATER_EQUAL || lower == TSDB_RELATION_GREATER) &&
+            (upper == TSDB_RELATION_LESS_EQUAL || upper == TSDB_RELATION_LESS)) {
+          assert(rangeFilterArray != NULL);
+          if (lower == TSDB_RELATION_GREATER_EQUAL) {
+            if (upper == TSDB_RELATION_LESS_EQUAL) {
+              pSingleColFilter->fp = rangeFilterArray[4];
+            } else {
+              pSingleColFilter->fp = rangeFilterArray[2];
+            }
+          } else {
+            if (upper == TSDB_RELATION_LESS_EQUAL) {
+              pSingleColFilter->fp = rangeFilterArray[3];
+            } else {
+              pSingleColFilter->fp = rangeFilterArray[1];
+            }
+          }
+        } else {  // set callback filter function
+          assert(filterArray != NULL);
+          if (lower != TSDB_RELATION_INVALID) {
+            pSingleColFilter->fp = filterArray[lower];
+
+            if (upper != TSDB_RELATION_INVALID) {
+              qError("pQInfo:%p failed to get filter function, invalid filter condition: %d", pQInfo, type);
+              return TSDB_CODE_QRY_INVALID_MSG;
+            }
+          } else {
+            pSingleColFilter->fp = filterArray[upper];
+          }
+        }
+        assert(pSingleColFilter->fp != NULL);
+        pSingleColFilter->bytes = bytes;
+      }
+
+      j++;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void doUpdateExprColumnIndex(SQuery *pQuery) {
+  assert(pQuery->pSelectExpr != NULL && pQuery != NULL);
+
+  for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
+    SSqlFuncMsg *pSqlExprMsg = &pQuery->pSelectExpr[k].base;
+    if (pSqlExprMsg->functionId == TSDB_FUNC_ARITHM) {
+      continue;
+    }
+
+    // todo opt performance
+    SColIndex *pColIndex = &pSqlExprMsg->colInfo;
+    if (TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) {
+      int32_t f = 0;
+      for (f = 0; f < pQuery->numOfCols; ++f) {
+        if (pColIndex->colId == pQuery->colList[f].colId) {
+          pColIndex->colIndex = f;
+          break;
+        }
+      }
+
+      assert(f < pQuery->numOfCols);
+    } else if (pColIndex->colId <= TSDB_UD_COLUMN_INDEX) {
+      // do nothing for user-defined constant value result columns
+    } else {
+      int32_t f = 0;
+      for (f = 0; f < pQuery->numOfTags; ++f) {
+        if (pColIndex->colId == pQuery->tagColList[f].colId) {
+          pColIndex->colIndex = f;
+          break;
+        }
+      }
+
+      assert(f < pQuery->numOfTags || pColIndex->colId == TSDB_TBNAME_COLUMN_INDEX);
+    }
+  }
+}
+
+static void freeQInfo(SQInfo *pQInfo);
+
+static void calResultBufSize(SQuery* pQuery) {
+  const int32_t RESULT_MSG_MIN_SIZE  = 1024 * (1024 + 512);  // bytes
+  const int32_t RESULT_MSG_MIN_ROWS  = 8192;
+  const float RESULT_THRESHOLD_RATIO = 0.85f;
+
+  if (isProjQuery(pQuery)) {
+    int32_t numOfRes = RESULT_MSG_MIN_SIZE / pQuery->rowSize;
+    if (numOfRes < RESULT_MSG_MIN_ROWS) {
+      numOfRes = RESULT_MSG_MIN_ROWS;
+    }
+
+    pQuery->rec.capacity  = numOfRes;
+    pQuery->rec.threshold = (int32_t)(numOfRes * RESULT_THRESHOLD_RATIO);
+  } else {  // in case of non-prj query, a smaller output buffer will be used.
+    pQuery->rec.capacity = 4096;
+    pQuery->rec.threshold = (int32_t)(pQuery->rec.capacity * RESULT_THRESHOLD_RATIO);
+  }
+}
+
+static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGroupbyExpr, SExprInfo *pExprs,
+                               STableGroupInfo *pTableGroupInfo, SColumnInfo* pTagCols, bool stableQuery) {
+  int16_t numOfCols = pQueryMsg->numOfCols;
+  int16_t numOfOutput = pQueryMsg->numOfOutput;
+
+  SQInfo *pQInfo = (SQInfo *)calloc(1, sizeof(SQInfo));
+  if (pQInfo == NULL) {
+    goto _cleanup_qinfo;
+  }
+
+  // to make sure third party won't overwrite this structure
+  pQInfo->signature = pQInfo;
+  pQInfo->tableGroupInfo = *pTableGroupInfo;
+
+  SQuery *pQuery = calloc(1, sizeof(SQuery));
+  if (pQuery == NULL) {
+    goto _cleanup_query;
+  }
+
+  pQInfo->runtimeEnv.pQuery = pQuery;
+
+  pQuery->numOfCols       = numOfCols;
+  pQuery->numOfOutput     = numOfOutput;
+  pQuery->limit.limit     = pQueryMsg->limit;
+  pQuery->limit.offset    = pQueryMsg->offset;
+  pQuery->order.order     = pQueryMsg->order;
+  pQuery->order.orderColId = pQueryMsg->orderColId;
+  pQuery->pSelectExpr     = pExprs;
+  pQuery->pGroupbyExpr    = pGroupbyExpr;
+  memcpy(&pQuery->interval, &pQueryMsg->interval, sizeof(pQuery->interval));
+  pQuery->fillType        = pQueryMsg->fillType;
+  pQuery->numOfTags       = pQueryMsg->numOfTags;
+  pQuery->tagColList      = pTagCols;
+
+  pQuery->colList = calloc(numOfCols, sizeof(SSingleColumnFilterInfo));
+  if (pQuery->colList == NULL) {
+    goto _cleanup;
+  }
+
+  for (int16_t i = 0; i < numOfCols; ++i) {
+    pQuery->colList[i] = pQueryMsg->colList[i];
+    pQuery->colList[i].filters = tscFilterInfoClone(pQueryMsg->colList[i].filters, pQuery->colList[i].numOfFilters);
+  }
+
+  // calculate the result row size
+  for (int16_t col = 0; col < numOfOutput; ++col) {
+    assert(pExprs[col].bytes > 0);
+    pQuery->rowSize += pExprs[col].bytes;
+  }
+
+  doUpdateExprColumnIndex(pQuery);
+
+  int32_t ret = createFilterInfo(pQInfo, pQuery);
+  if (ret != TSDB_CODE_SUCCESS) {
+    goto _cleanup;
+  }
+
+  // prepare the result buffer
+  pQuery->sdata = (tFilePage **)calloc(pQuery->numOfOutput, POINTER_BYTES);
+  if (pQuery->sdata == NULL) {
+    goto _cleanup;
+  }
+
+  calResultBufSize(pQuery);
+
+  for (int32_t col = 0; col < pQuery->numOfOutput; ++col) {
+    assert(pExprs[col].interBytes >= pExprs[col].bytes);
+
+    // allocate additional memory for interResults that are usually larger then final results
+    size_t size = (size_t)((pQuery->rec.capacity + 1) * pExprs[col].bytes + pExprs[col].interBytes + sizeof(tFilePage));
+    pQuery->sdata[col] = (tFilePage *)calloc(1, size);
+    if (pQuery->sdata[col] == NULL) {
+      goto _cleanup;
+    }
+  }
+
+  if (pQuery->fillType != TSDB_FILL_NONE) {
+    pQuery->fillVal = malloc(sizeof(int64_t) * pQuery->numOfOutput);
+    if (pQuery->fillVal == NULL) {
+      goto _cleanup;
+    }
+
+    // the first column is the timestamp
+    memcpy(pQuery->fillVal, (char *)pQueryMsg->fillVal, pQuery->numOfOutput * sizeof(int64_t));
+  }
+
+  size_t numOfGroups = 0;
+  if (pTableGroupInfo->pGroupList != NULL) {
+    numOfGroups = taosArrayGetSize(pTableGroupInfo->pGroupList);
+
+    pQInfo->tableqinfoGroupInfo.pGroupList = taosArrayInit(numOfGroups, POINTER_BYTES);
+    pQInfo->tableqinfoGroupInfo.numOfTables = pTableGroupInfo->numOfTables;
+    pQInfo->tableqinfoGroupInfo.map = taosHashInit(pTableGroupInfo->numOfTables,
+                                                   taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false);
+  }
+
+  int tableIndex = 0;
+
+  pQInfo->runtimeEnv.interBufSize = getOutputInterResultBufSize(pQuery);
+  pQInfo->pBuf = calloc(pTableGroupInfo->numOfTables, sizeof(STableQueryInfo));
+  if (pQInfo->pBuf == NULL) {
+    goto _cleanup;
+  }
+
+  // NOTE: pTableCheckInfo need to update the query time range and the lastKey info
+  pQInfo->arrTableIdInfo = taosArrayInit(tableIndex, sizeof(STableIdInfo));
+  pQInfo->dataReady = QUERY_RESULT_NOT_READY;
+  pthread_mutex_init(&pQInfo->lock, NULL);
+
+  pQuery->pos = -1;
+  pQuery->window = pQueryMsg->window;
+  changeExecuteScanOrder(pQInfo, pQueryMsg, stableQuery);
+
+  STimeWindow window = pQuery->window;
+
+  int32_t index = 0;
+
+  for(int32_t i = 0; i < numOfGroups; ++i) {
+    SArray* pa = taosArrayGetP(pQInfo->tableGroupInfo.pGroupList, i);
+
+    size_t s = taosArrayGetSize(pa);
+    SArray* p1 = taosArrayInit(s, POINTER_BYTES);
+    if (p1 == NULL) {
+      goto _cleanup;
+    }
+
+    taosArrayPush(pQInfo->tableqinfoGroupInfo.pGroupList, &p1);
+
+    for(int32_t j = 0; j < s; ++j) {
+      STableKeyInfo* info = taosArrayGet(pa, j);
+
+      void* buf = (char*)pQInfo->pBuf + index * sizeof(STableQueryInfo);
+
+      window.skey = info->lastKey;
+      STableQueryInfo* item = createTableQueryInfo(&pQInfo->runtimeEnv, info->pTable, window, buf);
+      if (item == NULL) {
+        goto _cleanup;
+      }
+
+      item->groupIndex = i;
+      taosArrayPush(p1, &item);
+
+      STableId* id = TSDB_TABLEID(info->pTable);
+      taosHashPut(pQInfo->tableqinfoGroupInfo.map, &id->tid, sizeof(id->tid), &item, POINTER_BYTES);
+      index += 1;
+    }
+  }
+
+  colIdCheck(pQuery);
+
+  qDebug("qmsg:%p QInfo:%p created", pQueryMsg, pQInfo);
+  return pQInfo;
+
+_cleanup_qinfo:
+  tsdbDestroyTableGroup(pTableGroupInfo);
+
+_cleanup_query:
+  if (pGroupbyExpr != NULL) {
+    taosArrayDestroy(pGroupbyExpr->columnInfo);
+    free(pGroupbyExpr);
+  }
+
+  taosTFree(pTagCols);
+  for (int32_t i = 0; i < numOfOutput; ++i) {
+    SExprInfo* pExprInfo = &pExprs[i];
+    if (pExprInfo->pExpr != NULL) {
+      tExprTreeDestroy(&pExprInfo->pExpr, NULL);
+    }
+  }
+
+  taosTFree(pExprs);
+
+_cleanup:
+  freeQInfo(pQInfo);
+  return NULL;
+}
+
+static bool isValidQInfo(void *param) {
+  SQInfo *pQInfo = (SQInfo *)param;
+  if (pQInfo == NULL) {
+    return false;
+  }
+
+  /*
+   * pQInfo->signature may be changed by another thread, so we assign value of signature
+   * into local variable, then compare by using local variable
+   */
+  uint64_t sig = (uint64_t)pQInfo->signature;
+  return (sig == (uint64_t)pQInfo);
+}
+
+static int32_t initQInfo(SQueryTableMsg *pQueryMsg, void *tsdb, int32_t vgId, SQInfo *pQInfo, bool isSTable) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  STSBuf *pTSBuf = NULL;
+  if (pQueryMsg->tsLen > 0) {  // open new file to save the result
+    char *tsBlock = (char *) pQueryMsg + pQueryMsg->tsOffset;
+    pTSBuf = tsBufCreateFromCompBlocks(tsBlock, pQueryMsg->tsNumOfBlocks, pQueryMsg->tsLen, pQueryMsg->tsOrder);
+
+    tsBufResetPos(pTSBuf);
+    bool ret = tsBufNextPos(pTSBuf);
+    UNUSED(ret);
+  }
+
+  if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->window.skey > pQuery->window.ekey)) ||
+      (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->window.ekey > pQuery->window.skey))) {
+    qDebug("QInfo:%p no result in time range %" PRId64 "-%" PRId64 ", order %d", pQInfo, pQuery->window.skey,
+           pQuery->window.ekey, pQuery->order.order);
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+    pQInfo->tableqinfoGroupInfo.numOfTables = 0;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (pQInfo->tableqinfoGroupInfo.numOfTables == 0) {
+    qDebug("QInfo:%p no table qualified for tag filter, abort query", pQInfo);
+    setQueryStatus(pQuery, QUERY_COMPLETED);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  // filter the qualified
+  if ((code = doInitQInfo(pQInfo, pTSBuf, tsdb, vgId, isSTable)) != TSDB_CODE_SUCCESS) {
+    goto _error;
+  }
+
+  return code;
+
+_error:
+  // table query ref will be decrease during error handling
+  freeQInfo(pQInfo);
+  return code;
+}
+
+static void freeColumnFilterInfo(SColumnFilterInfo* pFilter, int32_t numOfFilters) {
+    if (pFilter == NULL || numOfFilters == 0) {
+      return;
+    }
+
+    for (int32_t i = 0; i < numOfFilters; i++) {
+      if (pFilter[i].filterstr) {
+        free((void*)(pFilter[i].pz));
+      }
+    }
+
+    free(pFilter);
+}
+
+static void doDestroyTableQueryInfo(STableGroupInfo* pTableqinfoGroupInfo) {
+  if (pTableqinfoGroupInfo->pGroupList != NULL) {
+    int32_t numOfGroups = (int32_t) taosArrayGetSize(pTableqinfoGroupInfo->pGroupList);
+    for (int32_t i = 0; i < numOfGroups; ++i) {
+      SArray *p = taosArrayGetP(pTableqinfoGroupInfo->pGroupList, i);
+
+      size_t num = taosArrayGetSize(p);
+      for(int32_t j = 0; j < num; ++j) {
+        STableQueryInfo* item = taosArrayGetP(p, j);
+        destroyTableQueryInfoImpl(item);
+      }
+
+      taosArrayDestroy(p);
+    }
+  }
+
+  taosArrayDestroy(pTableqinfoGroupInfo->pGroupList);
+  taosHashCleanup(pTableqinfoGroupInfo->map);
+
+  pTableqinfoGroupInfo->pGroupList = NULL;
+  pTableqinfoGroupInfo->map = NULL;
+  pTableqinfoGroupInfo->numOfTables = 0;
+}
+
+static void freeQInfo(SQInfo *pQInfo) {
+  if (!isValidQInfo(pQInfo)) {
+    return;
+  }
+
+  qDebug("QInfo:%p start to free QInfo", pQInfo);
+
+  teardownQueryRuntimeEnv(&pQInfo->runtimeEnv);
+
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+  if (pQuery != NULL) {
+    if (pQuery->sdata != NULL) {
+      for (int32_t col = 0; col < pQuery->numOfOutput; ++col) {
+        taosTFree(pQuery->sdata[col]);
+      }
+      taosTFree(pQuery->sdata);
+    }
+
+    if (pQuery->fillVal != NULL) {
+      taosTFree(pQuery->fillVal);
+    }
+
+    for (int32_t i = 0; i < pQuery->numOfFilterCols; ++i) {
+      SSingleColumnFilterInfo *pColFilter = &pQuery->pFilterInfo[i];
+      if (pColFilter->numOfFilters > 0) {
+        taosTFree(pColFilter->pFilters);
+      }
+    }
+
+    if (pQuery->pSelectExpr != NULL) {
+      for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+        SExprInfo *pExprInfo = &pQuery->pSelectExpr[i];
+
+        if (pExprInfo->pExpr != NULL) {
+          tExprTreeDestroy(&pExprInfo->pExpr, NULL);
+        }
+      }
+
+      taosTFree(pQuery->pSelectExpr);
+    }
+
+    if (pQuery->pGroupbyExpr != NULL) {
+      taosArrayDestroy(pQuery->pGroupbyExpr->columnInfo);
+      taosTFree(pQuery->pGroupbyExpr);
+    }
+
+    taosTFree(pQuery->tagColList);
+    taosTFree(pQuery->pFilterInfo);
+
+    if (pQuery->colList != NULL) {
+      for (int32_t i = 0; i < pQuery->numOfCols; i++) {
+        SColumnInfo *column = pQuery->colList + i;
+        freeColumnFilterInfo(column->filters, column->numOfFilters);
+      }
+      taosTFree(pQuery->colList);
+    }
+
+    taosTFree(pQuery);
+  }
+
+  doDestroyTableQueryInfo(&pQInfo->tableqinfoGroupInfo);
+
+  taosTFree(pQInfo->pBuf);
+  tsdbDestroyTableGroup(&pQInfo->tableGroupInfo);
+  taosArrayDestroy(pQInfo->arrTableIdInfo);
+
+  pQInfo->signature = 0;
+
+  qDebug("QInfo:%p QInfo is freed", pQInfo);
+
+  taosTFree(pQInfo);
+}
+
+static size_t getResultSize(SQInfo *pQInfo, int64_t *numOfRows) {
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  /*
+   * get the file size and set the numOfRows to be the file size, since for tsComp query,
+   * the returned row size is equalled to 1
+   * TODO handle the case that the file is too large to send back one time
+   */
+  if (isTSCompQuery(pQuery) && (*numOfRows) > 0) {
+    struct stat fstat;
+    if (stat(pQuery->sdata[0]->data, &fstat) == 0) {
+      *numOfRows = fstat.st_size;
+      return fstat.st_size;
+    } else {
+      qError("QInfo:%p failed to get file info, path:%s, reason:%s", pQInfo, pQuery->sdata[0]->data, strerror(errno));
+      return 0;
+    }
+  } else {
+    return (size_t)(pQuery->rowSize * (*numOfRows));
+  }
+}
+
+static int32_t doDumpQueryResult(SQInfo *pQInfo, char *data) {
+  // the remained number of retrieved rows, not the interpolated result
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+
+  // load data from file to msg buffer
+  if (isTSCompQuery(pQuery)) {
+    int32_t fd = open(pQuery->sdata[0]->data, O_RDONLY, 0666);
+
+    // make sure file exist
+    if (FD_VALID(fd)) {
+      uint64_t s = lseek(fd, 0, SEEK_END);
+
+      qDebug("QInfo:%p ts comp data return, file:%s, size:%"PRId64, pQInfo, pQuery->sdata[0]->data, s);
+      if (lseek(fd, 0, SEEK_SET) >= 0) {
+        size_t sz = read(fd, data, (uint32_t)s);
+        if(sz < s) {  // todo handle error
+          assert(0);
+        }
+      } else {
+        UNUSED(s);
+      }
+
+      close(fd);
+      unlink(pQuery->sdata[0]->data);
+    } else {
+      // todo return the error code to client and handle invalid fd
+      qError("QInfo:%p failed to open tmp file to send ts-comp data to client, path:%s, reason:%s", pQInfo,
+             pQuery->sdata[0]->data, strerror(errno));
+      if (fd != -1) {
+        close(fd);
+      }
+    }
+
+    // all data returned, set query over
+    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
+      setQueryStatus(pQuery, QUERY_OVER);
+    }
+  } else {
+    doCopyQueryResultToMsg(pQInfo, (int32_t)pQuery->rec.rows, data);
+  }
+
+  pQuery->rec.total += pQuery->rec.rows;
+  qDebug("QInfo:%p current numOfRes rows:%" PRId64 ", total:%" PRId64, pQInfo, pQuery->rec.rows, pQuery->rec.total);
+
+  if (pQuery->limit.limit > 0 && pQuery->limit.limit == pQuery->rec.total) {
+    qDebug("QInfo:%p results limitation reached, limitation:%"PRId64, pQInfo, pQuery->limit.limit);
+    setQueryStatus(pQuery, QUERY_OVER);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+typedef struct SQueryMgmt {
+  SCacheObj      *qinfoPool;      // query handle pool
+  int32_t         vgId;
+  bool            closed;
+  pthread_mutex_t lock;
+} SQueryMgmt;
+
+int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableMsg* pQueryMsg, qinfo_t* pQInfo) {
+  assert(pQueryMsg != NULL && tsdb != NULL);
+
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  char            *tagCond  = NULL;
+  char            *tbnameCond = NULL;
+  SArray          *pTableIdList = NULL;
+  SSqlFuncMsg    **pExprMsg = NULL;
+  SExprInfo       *pExprs   = NULL;
+  SColIndex       *pGroupColIndex = NULL;
+  SColumnInfo     *pTagColumnInfo = NULL;
+  SSqlGroupbyExpr *pGroupbyExpr   = NULL;
+
+  code = convertQueryMsg(pQueryMsg, &pTableIdList, &pExprMsg, &tagCond, &tbnameCond, &pGroupColIndex, &pTagColumnInfo);
+  if (code != TSDB_CODE_SUCCESS) {
+    goto _over;
+  }
+
+  if (pQueryMsg->numOfTables <= 0) {
+    qError("Invalid number of tables to query, numOfTables:%d", pQueryMsg->numOfTables);
+    code = TSDB_CODE_QRY_INVALID_MSG;
+    goto _over;
+  }
+
+  if (pTableIdList == NULL || taosArrayGetSize(pTableIdList) == 0) {
+    qError("qmsg:%p, SQueryTableMsg wrong format", pQueryMsg);
+    code = TSDB_CODE_QRY_INVALID_MSG;
+    goto _over;
+  }
+
+  if ((code = createQFunctionExprFromMsg(pQueryMsg, &pExprs, pExprMsg, pTagColumnInfo)) != TSDB_CODE_SUCCESS) {
+    goto _over;
+  }
+
+  pGroupbyExpr = createGroupbyExprFromMsg(pQueryMsg, pGroupColIndex, &code);
+  if ((pGroupbyExpr == NULL && pQueryMsg->numOfGroupCols != 0) || code != TSDB_CODE_SUCCESS) {
+    goto _over;
+  }
+
+  bool isSTableQuery = false;
+  STableGroupInfo tableGroupInfo = {0};
+  int64_t st = taosGetTimestampUs();
+
+  if (TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_TABLE_QUERY)) {
+    STableIdInfo *id = taosArrayGet(pTableIdList, 0);
+
+    qDebug("qmsg:%p query normal table, uid:%"PRId64", tid:%d", pQueryMsg, id->uid, id->tid);
+    if ((code = tsdbGetOneTableGroup(tsdb, id->uid, pQueryMsg->window.skey, &tableGroupInfo)) != TSDB_CODE_SUCCESS) {
+      goto _over;
+    }
+  } else if (TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_MULTITABLE_QUERY|TSDB_QUERY_TYPE_STABLE_QUERY)) {
+    isSTableQuery = true;
+
+    // also note there's possibility that only one table in the super table
+    if (!TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_MULTITABLE_QUERY)) {
+      STableIdInfo *id = taosArrayGet(pTableIdList, 0);
+
+      // group by normal column, do not pass the group by condition to tsdb to group table into different group
+      int32_t numOfGroupByCols = pQueryMsg->numOfGroupCols;
+      if (pQueryMsg->numOfGroupCols == 1 && !TSDB_COL_IS_TAG(pGroupColIndex->flag)) {
+        numOfGroupByCols = 0;
+      }
+
+      qDebug("qmsg:%p query stable, uid:%"PRId64", tid:%d", pQueryMsg, id->uid, id->tid);
+      code = tsdbQuerySTableByTagCond(tsdb, id->uid, pQueryMsg->window.skey, tagCond, pQueryMsg->tagCondLen,
+          pQueryMsg->tagNameRelType, tbnameCond, &tableGroupInfo, pGroupColIndex, numOfGroupByCols);
+
+      if (code != TSDB_CODE_SUCCESS) {
+        qError("qmsg:%p failed to query stable, reason: %s", pQueryMsg, tstrerror(code));
+        goto _over;
+      }
+    } else {
+      code = tsdbGetTableGroupFromIdList(tsdb, pTableIdList, &tableGroupInfo);
+      if (code != TSDB_CODE_SUCCESS) {
+        goto _over;
+      }
+
+      qDebug("qmsg:%p query on %" PRIzu " tables in one group from client", pQueryMsg, tableGroupInfo.numOfTables);
+    }
+
+    int64_t el = taosGetTimestampUs() - st;
+    qDebug("qmsg:%p tag filter completed, numOfTables:%" PRIzu ", elapsed time:%"PRId64"us", pQueryMsg, tableGroupInfo.numOfTables, el);
+  } else {
+    assert(0);
+  }
+
+  (*pQInfo) = createQInfoImpl(pQueryMsg, pGroupbyExpr, pExprs, &tableGroupInfo, pTagColumnInfo, isSTableQuery);
+  pExprs = NULL;
+  pGroupbyExpr = NULL;
+  pTagColumnInfo = NULL;
+
+  if ((*pQInfo) == NULL) {
+    code = TSDB_CODE_QRY_OUT_OF_MEMORY;
+    goto _over;
+  }
+
+  code = initQInfo(pQueryMsg, tsdb, vgId, *pQInfo, isSTableQuery);
+
+_over:
+  free(tagCond);
+  free(tbnameCond);
+  free(pGroupColIndex);
+  if (pGroupbyExpr != NULL) {
+    taosArrayDestroy(pGroupbyExpr->columnInfo);
+    free(pGroupbyExpr);
+  }
+  free(pTagColumnInfo);
+  free(pExprs);
+  free(pExprMsg);
+  taosArrayDestroy(pTableIdList);
+
+  for (int32_t i = 0; i < pQueryMsg->numOfCols; i++) {
+    SColumnInfo* column = pQueryMsg->colList + i;
+    freeColumnFilterInfo(column->filters, column->numOfFilters);
+  }
+
+  //pQInfo already freed in initQInfo, but *pQInfo may not pointer to null;
+  if (code != TSDB_CODE_SUCCESS) {
+    *pQInfo = NULL;
+  }
+
+  // if failed to add ref for all tables in this query, abort current query
+  return code;
+}
+
+void qDestroyQueryInfo(qinfo_t qHandle) {
+  SQInfo* pQInfo = (SQInfo*) qHandle;
+  if (!isValidQInfo(pQInfo)) {
+    return;
+  }
+
+  qDebug("QInfo:%p query completed", pQInfo);
+  queryCostStatis(pQInfo);   // print the query cost summary
+  freeQInfo(pQInfo);
+}
+
+static bool doBuildResCheck(SQInfo* pQInfo) {
+  bool buildRes = false;
+
+  pthread_mutex_lock(&pQInfo->lock);
+
+  pQInfo->dataReady = QUERY_RESULT_READY;
+  buildRes = (pQInfo->rspContext != NULL);
+
+  pthread_mutex_unlock(&pQInfo->lock);
+
+  // clear qhandle owner
+  assert(pQInfo->owner == taosGetPthreadId());
+  pQInfo->owner = 0;
+
+  return buildRes;
+}
+
+bool qTableQuery(qinfo_t qinfo) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+  assert(pQInfo && pQInfo->signature == pQInfo);
+  int64_t threadId = taosGetPthreadId();
+
+  int64_t curOwner = 0;
+  if ((curOwner = atomic_val_compare_exchange_64(&pQInfo->owner, 0, threadId)) != 0) {
+    qError("QInfo:%p qhandle is now executed by thread:%p", pQInfo, (void*) curOwner);
+    pQInfo->code = TSDB_CODE_QRY_IN_EXEC;
+    return false;
+  }
+
+  if (IS_QUERY_KILLED(pQInfo)) {
+    qDebug("QInfo:%p it is already killed, abort", pQInfo);
+    return doBuildResCheck(pQInfo);
+  }
+
+  if (pQInfo->tableqinfoGroupInfo.numOfTables == 0) {
+    qDebug("QInfo:%p no table exists for query, abort", pQInfo);
+    setQueryStatus(pQInfo->runtimeEnv.pQuery, QUERY_COMPLETED);
+    return doBuildResCheck(pQInfo);
+  }
+
+  // error occurs, record the error code and return to client
+  int32_t ret = setjmp(pQInfo->runtimeEnv.env);
+  if (ret != TSDB_CODE_SUCCESS) {
+    pQInfo->code = ret;
+    qDebug("QInfo:%p query abort due to error/cancel occurs, code:%s", pQInfo, tstrerror(pQInfo->code));
+    return doBuildResCheck(pQInfo);
+  }
+
+  qDebug("QInfo:%p query task is launched", pQInfo);
+
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
+  if (onlyQueryTags(pQInfo->runtimeEnv.pQuery)) {
+    assert(pQInfo->runtimeEnv.pQueryHandle == NULL);
+    buildTagQueryResult(pQInfo);
+  } else if (pQInfo->runtimeEnv.stableQuery) {
+    stableQueryImpl(pQInfo);
+  } else {
+    tableQueryImpl(pQInfo);
+  }
+
+  SQuery* pQuery = pRuntimeEnv->pQuery;
+  if (IS_QUERY_KILLED(pQInfo)) {
+    qDebug("QInfo:%p query is killed", pQInfo);
+  } else if (pQuery->rec.rows == 0) {
+    qDebug("QInfo:%p over, %" PRIzu " tables queried, %"PRId64" rows are returned", pQInfo, pQInfo->tableqinfoGroupInfo.numOfTables, pQuery->rec.total);
+  } else {
+    qDebug("QInfo:%p query paused, %" PRId64 " rows returned, numOfTotal:%" PRId64 " rows",
+           pQInfo, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
+  }
+
+  return doBuildResCheck(pQInfo);
+}
+
+int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContext) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+
+  if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+    return TSDB_CODE_QRY_INVALID_QHANDLE;
+  }
+
+  *buildRes = false;
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+  if (IS_QUERY_KILLED(pQInfo)) {
+    qDebug("QInfo:%p query is killed, code:%d", pQInfo, pQInfo->code);
+    return pQInfo->code;
+  }
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  pthread_mutex_lock(&pQInfo->lock);
+  if (pQInfo->dataReady == QUERY_RESULT_READY) {
+    *buildRes = true;
+    qDebug("QInfo:%p retrieve result info, rowsize:%d, rows:%"PRId64", code:%d", pQInfo, pQuery->rowSize, pQuery->rec.rows,
+           pQInfo->code);
+  } else {
+    *buildRes = false;
+    qDebug("QInfo:%p retrieve req set query return result after paused", pQInfo);
+    pQInfo->rspContext = pRspContext;
+  }
+
+  code = pQInfo->code;
+  pthread_mutex_unlock(&pQInfo->lock);
+  return code;
+}
+
+int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *contLen, bool* continueExec) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+
+  if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+    return TSDB_CODE_QRY_INVALID_QHANDLE;
+  }
+
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
+  size_t  size = getResultSize(pQInfo, &pQuery->rec.rows);
+
+  size += sizeof(int32_t);
+  size += sizeof(STableIdInfo) * taosArrayGetSize(pQInfo->arrTableIdInfo);
+
+  *contLen = (int32_t)(size + sizeof(SRetrieveTableRsp));
+
+  // todo proper handle failed to allocate memory,
+  // current solution only avoid crash, but cannot return error code to client
+  *pRsp = (SRetrieveTableRsp *)rpcMallocCont(*contLen);
+  if (*pRsp == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  (*pRsp)->numOfRows = htonl((int32_t)pQuery->rec.rows);
+
+  if (pQInfo->code == TSDB_CODE_SUCCESS) {
+    (*pRsp)->offset   = htobe64(pQuery->limit.offset);
+    (*pRsp)->useconds = htobe64(pRuntimeEnv->summary.elapsedTime);
+  } else {
+    (*pRsp)->offset   = 0;
+    (*pRsp)->useconds = htobe64(pRuntimeEnv->summary.elapsedTime);
+  }
+
+  (*pRsp)->precision = htons(pQuery->precision);
+  if (pQuery->rec.rows > 0 && pQInfo->code == TSDB_CODE_SUCCESS) {
+    doDumpQueryResult(pQInfo, (*pRsp)->data);
+  } else {
+    setQueryStatus(pQuery, QUERY_OVER);
+  }
+
+  pQInfo->rspContext = NULL;
+  pQInfo->dataReady  = QUERY_RESULT_NOT_READY;
+
+  if (IS_QUERY_KILLED(pQInfo) || Q_STATUS_EQUAL(pQuery->status, QUERY_OVER)) {
+    *continueExec = false;
+    (*pRsp)->completed = 1;  // notify no more result to client
+  } else {
+    *continueExec = true;
+    qDebug("QInfo:%p has more results waits for client retrieve", pQInfo);
+  }
+
+  return pQInfo->code;
+}
+
+int32_t qQueryCompleted(qinfo_t qinfo) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+
+  if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+    return TSDB_CODE_QRY_INVALID_QHANDLE;
+  }
+
+  SQuery* pQuery = pQInfo->runtimeEnv.pQuery;
+  return IS_QUERY_KILLED(pQInfo) || Q_STATUS_EQUAL(pQuery->status, QUERY_OVER);
+}
+
+int32_t qKillQuery(qinfo_t qinfo) {
+  SQInfo *pQInfo = (SQInfo *)qinfo;
+
+  if (pQInfo == NULL || !isValidQInfo(pQInfo)) {
+    return TSDB_CODE_QRY_INVALID_QHANDLE;
+  }
+
+  setQueryKilled(pQInfo);
+
+  // Wait for the query executing thread being stopped/
+  // Once the query is stopped, the owner of qHandle will be cleared immediately.
+  while (pQInfo->owner != 0) {
+    taosMsleep(100);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static void doSetTagValueToResultBuf(char* output, const char* val, int16_t type, int16_t bytes) {
+  if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+    if (val == NULL) {
+      setVardataNull(output, type);
+    } else {
+      memcpy(output, val, varDataTLen(val));
+    }
+  } else {
+    if (val == NULL) {
+      setNull(output, type, bytes);
+    } else {  // todo here stop will cause client crash
+      memcpy(output, val, bytes);
+    }
+  }
+}
+
+static void buildTagQueryResult(SQInfo* pQInfo) {
+  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
+  SQuery *          pQuery = pRuntimeEnv->pQuery;
+
+  size_t numOfGroup = GET_NUM_OF_TABLEGROUP(pQInfo);
+  assert(numOfGroup == 0 || numOfGroup == 1);
+
+  if (numOfGroup == 0) {
+    return;
+  }
+
+  SArray* pa = GET_TABLEGROUP(pQInfo, 0);
+
+  size_t num = taosArrayGetSize(pa);
+  assert(num == pQInfo->tableqinfoGroupInfo.numOfTables);
+
+  int32_t count = 0;
+  int32_t functionId = pQuery->pSelectExpr[0].base.functionId;
+  if (functionId == TSDB_FUNC_TID_TAG) { // return the tags & table Id
+    assert(pQuery->numOfOutput == 1);
+
+    SExprInfo* pExprInfo = &pQuery->pSelectExpr[0];
+    int32_t rsize = pExprInfo->bytes;
+    count = 0;
+
+    int16_t bytes = pExprInfo->bytes;
+    int16_t type = pExprInfo->type;
+
+    for(int32_t i = 0; i < pQuery->numOfTags; ++i) {
+      if (pQuery->tagColList[i].colId == pExprInfo->base.colInfo.colId) {
+        bytes = pQuery->tagColList[i].bytes;
+        type = pQuery->tagColList[i].type;
+        break;
+      }
+    }
+
+    while(pQInfo->tableIndex < num && count < pQuery->rec.capacity) {
+      int32_t i = pQInfo->tableIndex++;
+      STableQueryInfo *item = taosArrayGetP(pa, i);
+
+      char *output = pQuery->sdata[0]->data + count * rsize;
+      varDataSetLen(output, rsize - VARSTR_HEADER_SIZE);
+
+      output = varDataVal(output);
+      STableId* id = TSDB_TABLEID(item->pTable);
+
+      *(int16_t *)output = 0;
+      output += sizeof(int16_t);
+
+      *(int64_t *)output = id->uid;  // memory align problem, todo serialize
+      output += sizeof(id->uid);
+
+      *(int32_t *)output = id->tid;
+      output += sizeof(id->tid);
+
+      *(int32_t *)output = pQInfo->vgId;
+      output += sizeof(pQInfo->vgId);
+
+      if (pExprInfo->base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
+        char* data = tsdbGetTableName(item->pTable);
+        memcpy(output, data, varDataTLen(data));
+      } else {
+        char* data = tsdbGetTableTagVal(item->pTable, pExprInfo->base.colInfo.colId, type, bytes);
+        doSetTagValueToResultBuf(output, data, type, bytes);
+      }
+
+      count += 1;
+    }
+
+    qDebug("QInfo:%p create (tableId, tag) info completed, rows:%d", pQInfo, count);
+
+  } else if (functionId == TSDB_FUNC_COUNT) {// handle the "count(tbname)" query
+    *(int64_t*) pQuery->sdata[0]->data = num;
+
+    count = 1;
+    SET_STABLE_QUERY_OVER(pQInfo);
+    qDebug("QInfo:%p create count(tbname) query, res:%d rows:1", pQInfo, count);
+  } else {  // return only the tags|table name etc.
+    count = 0;
+    SSchema tbnameSchema = tGetTableNameColumnSchema();
+
+    int32_t maxNumOfTables = (int32_t)pQuery->rec.capacity;
+    if (pQuery->limit.limit >= 0 && pQuery->limit.limit < pQuery->rec.capacity) {
+      maxNumOfTables = (int32_t)pQuery->limit.limit;
+    }
+
+    while(pQInfo->tableIndex < num && count < maxNumOfTables) {
+      int32_t i = pQInfo->tableIndex++;
+
+      // discard current result due to offset
+      if (pQuery->limit.offset > 0) {
+        pQuery->limit.offset -= 1;
+        continue;
+      }
+
+      SExprInfo* pExprInfo = pQuery->pSelectExpr;
+      STableQueryInfo* item = taosArrayGetP(pa, i);
+
+      char *data = NULL, *dst = NULL;
+      int16_t type = 0, bytes = 0;
+      for(int32_t j = 0; j < pQuery->numOfOutput; ++j) {
+        // not assign value in case of user defined constant output column
+        if (TSDB_COL_IS_UD_COL(pExprInfo[j].base.colInfo.flag)) {
+          continue;
+        }
+
+        if (pExprInfo[j].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
+          bytes = tbnameSchema.bytes;
+          type = tbnameSchema.type;
+
+          data = tsdbGetTableName(item->pTable);
+          dst = pQuery->sdata[j]->data + count * tbnameSchema.bytes;
+        } else {
+          type = pExprInfo[j].type;
+          bytes = pExprInfo[j].bytes;
+
+          data = tsdbGetTableTagVal(item->pTable, pExprInfo[j].base.colInfo.colId, type, bytes);
+          dst = pQuery->sdata[j]->data + count * pExprInfo[j].bytes;
+
+        }
+
+        doSetTagValueToResultBuf(dst, data, type, bytes);
+      }
+      count += 1;
+    }
+
+    qDebug("QInfo:%p create tag values results completed, rows:%d", pQInfo, count);
+  }
+
+  pQuery->rec.rows = count;
+  setQueryStatus(pQuery, QUERY_COMPLETED);
+}
+
+void* qGetResultRetrieveMsg(qinfo_t qinfo) {
+  SQInfo* pQInfo = (SQInfo*) qinfo;
+  assert(pQInfo != NULL);
+
+  return pQInfo->rspContext;
+}
+
+void freeqinfoFn(void *qhandle) {
+  void** handle = qhandle;
+  if (handle == NULL || *handle == NULL) {
+    return;
+  }
+
+  qKillQuery(*handle);
+  qDestroyQueryInfo(*handle);
+}
+
+void* qOpenQueryMgmt(int32_t vgId) {
+  const int32_t REFRESH_HANDLE_INTERVAL = 30; // every 30 seconds, refresh handle pool
+
+  char cacheName[128] = {0};
+  sprintf(cacheName, "qhandle_%d", vgId);
+
+  SQueryMgmt* pQueryMgmt = calloc(1, sizeof(SQueryMgmt));
+  if (pQueryMgmt == NULL) {
+    terrno = TSDB_CODE_QRY_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pQueryMgmt->qinfoPool = taosCacheInit(TSDB_DATA_TYPE_BIGINT, REFRESH_HANDLE_INTERVAL, true, freeqinfoFn, cacheName);
+  pQueryMgmt->closed    = false;
+  pQueryMgmt->vgId      = vgId;
+
+  pthread_mutex_init(&pQueryMgmt->lock, NULL);
+
+  qDebug("vgId:%d, open querymgmt success", vgId);
+  return pQueryMgmt;
+}
+
+static void queryMgmtKillQueryFn(void* handle) {
+  void** fp = (void**)handle;
+  qKillQuery(*fp);
+}
+
+void qQueryMgmtNotifyClosed(void* pQMgmt) {
+  if (pQMgmt == NULL) {
+    return;
+  }
+
+  SQueryMgmt* pQueryMgmt = pQMgmt;
+  qDebug("vgId:%d, set querymgmt closed, wait for all queries cancelled", pQueryMgmt->vgId);
+
+//  pthread_mutex_lock(&pQueryMgmt->lock);
+  pQueryMgmt->closed = true;
+//  pthread_mutex_unlock(&pQueryMgmt->lock);
+
+  taosCacheRefresh(pQueryMgmt->qinfoPool, queryMgmtKillQueryFn);
+}
+
+void qCleanupQueryMgmt(void* pQMgmt) {
+  if (pQMgmt == NULL) {
+    return;
+  }
+
+  SQueryMgmt* pQueryMgmt = pQMgmt;
+  int32_t vgId = pQueryMgmt->vgId;
+
+  assert(pQueryMgmt->closed);
+
+  SCacheObj* pqinfoPool = pQueryMgmt->qinfoPool;
+  pQueryMgmt->qinfoPool = NULL;
+
+  taosCacheCleanup(pqinfoPool);
+  pthread_mutex_destroy(&pQueryMgmt->lock);
+  taosTFree(pQueryMgmt);
+
+  qDebug("vgId:%d queryMgmt cleanup completed", vgId);
+}
+
+void** qRegisterQInfo(void* pMgmt, uint64_t qInfo) {
+  if (pMgmt == NULL) {
+    return NULL;
+  }
+
+  const int32_t DEFAULT_QHANDLE_LIFE_SPAN = tsShellActivityTimer * 2 * 1000;
+
+  SQueryMgmt *pQueryMgmt = pMgmt;
+  if (pQueryMgmt->qinfoPool == NULL) {
+    qError("QInfo:%p failed to add qhandle into qMgmt, since qMgmt is closed", (void *)qInfo);
+    return NULL;
+  }
+
+//  pthread_mutex_lock(&pQueryMgmt->lock);
+  if (pQueryMgmt->closed) {
+//    pthread_mutex_unlock(&pQueryMgmt->lock);
+    qError("QInfo:%p failed to add qhandle into cache, since qMgmt is colsing", (void *)qInfo);
+    return NULL;
+  } else {
+    uint64_t handleVal = (uint64_t) qInfo;
+
+    void** handle = taosCachePut(pQueryMgmt->qinfoPool, &handleVal, sizeof(int64_t), &qInfo, POINTER_BYTES, DEFAULT_QHANDLE_LIFE_SPAN);
+//    pthread_mutex_unlock(&pQueryMgmt->lock);
+
+    return handle;
+  }
+}
+
+void** qAcquireQInfo(void* pMgmt, uint64_t key) {
+  SQueryMgmt *pQueryMgmt = pMgmt;
+
+  if (pQueryMgmt->qinfoPool == NULL || pQueryMgmt->closed) {
+    return NULL;
+  }
+
+  void** handle = taosCacheAcquireByKey(pQueryMgmt->qinfoPool, &key, sizeof(uint64_t));
+  if (handle == NULL || *handle == NULL) {
+    return NULL;
+  } else {
+    return handle;
+  }
+}
+
+void** qReleaseQInfo(void* pMgmt, void* pQInfo, bool freeHandle) {
+  SQueryMgmt *pQueryMgmt = pMgmt;
+  if (pQueryMgmt->qinfoPool == NULL) {
+    return NULL;
+  }
+
+  taosCacheRelease(pQueryMgmt->qinfoPool, pQInfo, freeHandle);
+  return 0;
+}
+
+
diff --git a/src/query/src/qExtbuffer.c b/src/query/src/qExtbuffer.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d3120ead47852da3e3ec6bdcc6f92de9c52cb60
--- /dev/null
+++ b/src/query/src/qExtbuffer.c
@@ -0,0 +1,1091 @@
+/*
+ * 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 "os.h"
+#include "qExtbuffer.h"
+#include "queryLog.h"
+#include "taos.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tsqlfunction.h"
+#include "tulog.h"
+
+#define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
+  (data + (schema)->pFields[colId].offset * (allrow) + (rowId) * (schema)->pFields[colId].field.bytes)
+
+/*
+ * SColumnModel is deeply copy
+ */
+tExtMemBuffer* createExtMemBuffer(int32_t inMemSize, int32_t elemSize, int32_t pagesize, SColumnModel *pModel) {
+  tExtMemBuffer* pMemBuffer = (tExtMemBuffer *)calloc(1, sizeof(tExtMemBuffer));
+
+  pMemBuffer->pageSize = pagesize;
+  pMemBuffer->inMemCapacity = ALIGN8(inMemSize) / pMemBuffer->pageSize;
+  pMemBuffer->nElemSize = elemSize;
+
+  pMemBuffer->numOfElemsPerPage = (pMemBuffer->pageSize - sizeof(tFilePage)) / pMemBuffer->nElemSize;
+  
+  char name[MAX_TMPFILE_PATH_LENGTH] = {0};
+  taosGetTmpfilePath("extbuf", name);
+  
+  pMemBuffer->path = strdup(name);
+  uDebug("create tmp file:%s", pMemBuffer->path);
+  
+  SExtFileInfo *pFMeta = &pMemBuffer->fileMeta;
+
+  pFMeta->pageSize = DEFAULT_PAGE_SIZE;
+
+  pFMeta->flushoutData.nAllocSize = 4;
+  pFMeta->flushoutData.nLength = 0;
+  pFMeta->flushoutData.pFlushoutInfo = (tFlushoutInfo *)calloc(4, sizeof(tFlushoutInfo));
+
+  pMemBuffer->pColumnModel = cloneColumnModel(pModel);
+  pMemBuffer->pColumnModel->capacity = pMemBuffer->numOfElemsPerPage;
+  
+  return pMemBuffer;
+}
+
+void* destoryExtMemBuffer(tExtMemBuffer *pMemBuffer) {
+  if (pMemBuffer == NULL) {
+    return NULL;
+  }
+
+  // release flush out info link
+  SExtFileInfo *pFileMeta = &pMemBuffer->fileMeta;
+  if (pFileMeta->flushoutData.nAllocSize != 0 && pFileMeta->flushoutData.pFlushoutInfo != NULL) {
+    taosTFree(pFileMeta->flushoutData.pFlushoutInfo);
+  }
+
+  // release all in-memory buffer pages
+  tFilePagesItem *pFilePages = pMemBuffer->pHead;
+  while (pFilePages != NULL) {
+    tFilePagesItem *pTmp = pFilePages;
+    pFilePages = pFilePages->pNext;
+    taosTFree(pTmp);
+  }
+
+  // close temp file
+  if (pMemBuffer->file != 0) {
+    if (fclose(pMemBuffer->file) != 0) {
+      uError("failed to close file:%s, reason:%s", pMemBuffer->path, strerror(errno));
+    }
+    
+    uDebug("remove temp file:%s for external buffer", pMemBuffer->path);
+    unlink(pMemBuffer->path);
+  }
+
+  destroyColumnModel(pMemBuffer->pColumnModel);
+
+  taosTFree(pMemBuffer->path);
+  taosTFree(pMemBuffer);
+  
+  return NULL;
+}
+
+/*
+ * alloc more memory for flush out info entries.
+ */
+static bool allocFlushoutInfoEntries(SExtFileInfo *pFileMeta) {
+  pFileMeta->flushoutData.nAllocSize = pFileMeta->flushoutData.nAllocSize << 1;
+
+  tFlushoutInfo *tmp = (tFlushoutInfo *)realloc(pFileMeta->flushoutData.pFlushoutInfo,
+                                                sizeof(tFlushoutInfo) * pFileMeta->flushoutData.nAllocSize);
+  if (tmp == NULL) {
+    uError("out of memory!\n");
+    return false;
+  }
+
+  pFileMeta->flushoutData.pFlushoutInfo = tmp;
+  return true;
+}
+
+static bool tExtMemBufferAlloc(tExtMemBuffer *pMemBuffer) {
+  /*
+   * the in-mem buffer is full.
+   * To flush data to disk to accommodate more data
+   */
+  if (pMemBuffer->numOfInMemPages > 0 && pMemBuffer->numOfInMemPages == pMemBuffer->inMemCapacity) {
+    if (tExtMemBufferFlush(pMemBuffer) != 0) {
+      return false;
+    }
+  }
+
+  /*
+   * We do not recycle the file page structure. And in flush data operations, all
+   * file page that are full of data are destroyed after data being flushed to disk.
+   *
+   * The memory buffer pages may be recycle in order to avoid unnecessary memory
+   * allocation later.
+   */
+  tFilePagesItem *item = (tFilePagesItem *)calloc(1, pMemBuffer->pageSize + sizeof(tFilePagesItem));
+  if (item == NULL) {
+    return false;
+  }
+
+  item->pNext = NULL;
+  item->item.num = 0;
+
+  if (pMemBuffer->pTail != NULL) {
+    pMemBuffer->pTail->pNext = item;
+    pMemBuffer->pTail = item;
+  } else {
+    pMemBuffer->pTail = item;
+    pMemBuffer->pHead = item;
+  }
+
+  pMemBuffer->numOfInMemPages += 1;
+  return true;
+}
+
+/*
+ * put elements into buffer
+ */
+int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRows) {
+  if (numOfRows == 0) {
+    return pMemBuffer->numOfInMemPages;
+  }
+
+  tFilePagesItem *pLast = pMemBuffer->pTail;
+  if (pLast == NULL) {
+    if (!tExtMemBufferAlloc(pMemBuffer)) {
+      return -1;
+    }
+
+    pLast = pMemBuffer->pTail;
+  }
+
+  if (pLast->item.num + numOfRows <= pMemBuffer->numOfElemsPerPage) { // enough space for records
+    tColModelAppend(pMemBuffer->pColumnModel, &pLast->item, data, 0, numOfRows, numOfRows);
+    
+    pMemBuffer->numOfElemsInBuffer += numOfRows;
+    pMemBuffer->numOfTotalElems += numOfRows;
+  } else {
+    int32_t numOfRemainEntries = pMemBuffer->numOfElemsPerPage - (int32_t)pLast->item.num;
+    tColModelAppend(pMemBuffer->pColumnModel, &pLast->item, data, 0, numOfRemainEntries, numOfRows);
+
+    pMemBuffer->numOfElemsInBuffer += numOfRemainEntries;
+    pMemBuffer->numOfTotalElems += numOfRemainEntries;
+
+    int32_t hasWritten = numOfRemainEntries;
+    int32_t remain = numOfRows - numOfRemainEntries;
+
+    while (remain > 0) {
+      if (!tExtMemBufferAlloc(pMemBuffer)) { // failed to allocate memory buffer
+        return -1;
+      }
+
+      int32_t numOfWriteElems = 0;
+      if (remain > pMemBuffer->numOfElemsPerPage) {
+        numOfWriteElems = pMemBuffer->numOfElemsPerPage;
+      } else {
+        numOfWriteElems = remain;
+      }
+
+      pMemBuffer->numOfTotalElems += numOfWriteElems;
+
+      pLast = pMemBuffer->pTail;
+      tColModelAppend(pMemBuffer->pColumnModel, &pLast->item, data, hasWritten, numOfWriteElems, numOfRows);
+
+      remain -= numOfWriteElems;
+      pMemBuffer->numOfElemsInBuffer += numOfWriteElems;
+      hasWritten += numOfWriteElems;
+    }
+  }
+
+  return pMemBuffer->numOfInMemPages;
+}
+
+static bool tExtMemBufferUpdateFlushoutInfo(tExtMemBuffer *pMemBuffer) {
+  SExtFileInfo *pFileMeta = &pMemBuffer->fileMeta;
+
+  if (pMemBuffer->flushModel == MULTIPLE_APPEND_MODEL) {
+    if (pFileMeta->flushoutData.nLength == pFileMeta->flushoutData.nAllocSize && !allocFlushoutInfoEntries(pFileMeta)) {
+      return false;
+    }
+
+    tFlushoutInfo *pFlushoutInfo = &pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength];
+    if (pFileMeta->flushoutData.nLength == 0) {
+      pFlushoutInfo->startPageId = 0;
+    } else {
+      pFlushoutInfo->startPageId =
+          pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength - 1].startPageId +
+          pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength - 1].numOfPages;
+    }
+
+    // only the page still in buffer is flushed out to disk
+    pFlushoutInfo->numOfPages = pMemBuffer->numOfInMemPages;
+    pFileMeta->flushoutData.nLength += 1;
+  } else {
+    // always update the first flush out array in single_flush_model
+    pFileMeta->flushoutData.nLength = 1;
+    tFlushoutInfo *pFlushoutInfo = &pFileMeta->flushoutData.pFlushoutInfo[0];
+    pFlushoutInfo->numOfPages += pMemBuffer->numOfInMemPages;
+  }
+
+  return true;
+}
+
+static void tExtMemBufferClearFlushoutInfo(tExtMemBuffer *pMemBuffer) {
+  SExtFileInfo *pFileMeta = &pMemBuffer->fileMeta;
+
+  pFileMeta->flushoutData.nLength = 0;
+  memset(pFileMeta->flushoutData.pFlushoutInfo, 0, sizeof(tFlushoutInfo) * pFileMeta->flushoutData.nAllocSize);
+}
+
+int32_t tExtMemBufferFlush(tExtMemBuffer *pMemBuffer) {
+  int32_t ret = 0;
+  if (pMemBuffer->numOfTotalElems == 0) {
+    return ret;
+  }
+
+  if (pMemBuffer->file == NULL) {
+    if ((pMemBuffer->file = fopen(pMemBuffer->path, "wb+")) == NULL) {
+      ret = TAOS_SYSTEM_ERROR(errno);
+      return ret;
+    }
+  }
+
+  /* all data has been flushed to disk, ignore flush operation */
+  if (pMemBuffer->numOfElemsInBuffer == 0) {
+    return ret;
+  }
+
+  tFilePagesItem *first = pMemBuffer->pHead;
+  while (first != NULL) {
+    size_t retVal = fwrite((char *)&(first->item), pMemBuffer->pageSize, 1, pMemBuffer->file);
+    if (retVal <= 0) {  // failed to write to buffer, may be not enough space
+      ret = TAOS_SYSTEM_ERROR(errno);
+      return ret;
+    }
+
+    pMemBuffer->fileMeta.numOfElemsInFile += (uint32_t)first->item.num;
+    pMemBuffer->fileMeta.nFileSize += 1;
+
+    tFilePagesItem *ptmp = first;
+    first = first->pNext;
+
+    taosTFree(ptmp);  // release all data in memory buffer
+  }
+
+  fflush(pMemBuffer->file);  // flush to disk
+
+  tExtMemBufferUpdateFlushoutInfo(pMemBuffer);
+
+  pMemBuffer->numOfElemsInBuffer = 0;
+  pMemBuffer->numOfInMemPages = 0;
+  pMemBuffer->pHead = NULL;
+  pMemBuffer->pTail = NULL;
+
+  return ret;
+}
+
+void tExtMemBufferClear(tExtMemBuffer *pMemBuffer) {
+  if (pMemBuffer == NULL || pMemBuffer->numOfTotalElems == 0) {
+    return;
+  }
+
+  //release all data in memory buffer
+  tFilePagesItem *first = pMemBuffer->pHead;
+  while (first != NULL) {
+    tFilePagesItem *ptmp = first;
+    first = first->pNext;
+    taosTFree(ptmp);
+  }
+
+  pMemBuffer->fileMeta.numOfElemsInFile = 0;
+  pMemBuffer->fileMeta.nFileSize = 0;
+
+  pMemBuffer->numOfElemsInBuffer = 0;
+  pMemBuffer->numOfInMemPages = 0;
+  
+  pMemBuffer->pHead = NULL;
+  pMemBuffer->pTail = NULL;
+
+  tExtMemBufferClearFlushoutInfo(pMemBuffer);
+
+  // reset the write pointer to the header
+  if (pMemBuffer->file != NULL) {
+    fseek(pMemBuffer->file, 0, SEEK_SET);
+  }
+}
+
+bool tExtMemBufferLoadData(tExtMemBuffer *pMemBuffer, tFilePage *pFilePage, int32_t flushoutId, int32_t pageIdx) {
+  if (flushoutId < 0 || flushoutId > (int32_t)pMemBuffer->fileMeta.flushoutData.nLength) {
+    return false;
+  }
+
+  tFlushoutInfo *pInfo = &(pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[flushoutId]);
+  if (pageIdx > (int32_t)pInfo->numOfPages) {
+    return false;
+  }
+
+  size_t ret = fseek(pMemBuffer->file, (pInfo->startPageId + pageIdx) * pMemBuffer->pageSize, SEEK_SET);
+  ret = fread(pFilePage, pMemBuffer->pageSize, 1, pMemBuffer->file);
+
+  return (ret > 0);
+}
+
+bool tExtMemBufferIsAllDataInMem(tExtMemBuffer *pMemBuffer) { return (pMemBuffer->fileMeta.nFileSize == 0); }
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+static FORCE_INLINE int32_t primaryKeyComparator(int64_t f1, int64_t f2, int32_t colIdx, int32_t tsOrder) {
+  if (f1 == f2) {
+    return 0;
+  }
+  
+  if (colIdx == 0 && tsOrder == TSDB_ORDER_DESC) {  // primary column desc order
+    return (f1 < f2) ? 1 : -1;
+  } else {  // asc
+    return (f1 < f2) ? -1 : 1;
+  }
+}
+
+static FORCE_INLINE int32_t columnValueAscendingComparator(char *f1, char *f2, int32_t type, int32_t bytes) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT: {
+      int32_t first  = *(int32_t *) f1;
+      int32_t second = *(int32_t *) f2;
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_DOUBLE: {
+      double first  = GET_DOUBLE_VAL(f1);
+      double second = GET_DOUBLE_VAL(f2);
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_FLOAT: {
+      float first  = GET_FLOAT_VAL(f1);
+      float second = GET_FLOAT_VAL(f2);
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_BIGINT: {
+      int64_t first = *(int64_t *)f1;
+      int64_t second = *(int64_t *)f2;
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_SMALLINT: {
+      int16_t first = *(int16_t *)f1;
+      int16_t second = *(int16_t *)f2;
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT: {
+      int8_t first = *(int8_t *)f1;
+      int8_t second = *(int8_t *)f2;
+      if (first == second) {
+        return 0;
+      }
+      return (first < second) ? -1 : 1;
+    };
+    case TSDB_DATA_TYPE_BINARY: {
+      int32_t len1 = varDataLen(f1);
+      int32_t len2 = varDataLen(f2);
+      
+      if (len1 != len2) {
+        return len1 > len2? 1:-1;
+      } else {
+        int32_t ret = strncmp(varDataVal(f1), varDataVal(f2), len1);
+        if (ret == 0) {
+          return 0;
+        }
+        return (ret < 0) ? -1 : 1;
+      }
+
+    };
+    case TSDB_DATA_TYPE_NCHAR: { // todo handle the var string compare
+      int32_t ret = tasoUcs4Compare(f1, f2, bytes);
+      if (ret == 0) {
+        return 0;
+      }
+      return (ret < 0) ? -1 : 1;
+    };
+  }
+  
+  return 0;
+}
+
+int32_t compare_a(tOrderDescriptor *pDescriptor, int32_t numOfRows1, int32_t s1, char *data1, int32_t numOfRows2,
+                  int32_t s2, char *data2) {
+  assert(numOfRows1 == numOfRows2);
+
+  int32_t cmpCnt = pDescriptor->orderInfo.numOfCols;
+  for (int32_t i = 0; i < cmpCnt; ++i) {
+    int32_t colIdx = pDescriptor->orderInfo.pData[i];
+
+    char *f1 = COLMODEL_GET_VAL(data1, pDescriptor->pColumnModel, numOfRows1, s1, colIdx);
+    char *f2 = COLMODEL_GET_VAL(data2, pDescriptor->pColumnModel, numOfRows2, s2, colIdx);
+
+    if (pDescriptor->pColumnModel->pFields[colIdx].field.type == TSDB_DATA_TYPE_TIMESTAMP) {
+      int32_t ret = primaryKeyComparator(*(int64_t *)f1, *(int64_t *)f2, colIdx, pDescriptor->tsOrder);
+      if (ret == 0) {
+        continue;
+      } else {
+        return ret;
+      }
+    } else {
+      SSchemaEx *pSchema = &pDescriptor->pColumnModel->pFields[colIdx];
+      int32_t  ret = columnValueAscendingComparator(f1, f2, pSchema->field.type, pSchema->field.bytes);
+      if (ret == 0) {
+        continue;
+      } else {
+        return ret;
+      }
+    }
+  }
+
+  return 0;
+}
+
+int32_t compare_d(tOrderDescriptor *pDescriptor, int32_t numOfRows1, int32_t s1, char *data1, int32_t numOfRows2,
+                  int32_t s2, char *data2) {
+  assert(numOfRows1 == numOfRows2);
+
+  int32_t cmpCnt = pDescriptor->orderInfo.numOfCols;
+  for (int32_t i = 0; i < cmpCnt; ++i) {
+    int32_t colIdx = pDescriptor->orderInfo.pData[i];
+
+    char *f1 = COLMODEL_GET_VAL(data1, pDescriptor->pColumnModel, numOfRows1, s1, colIdx);
+    char *f2 = COLMODEL_GET_VAL(data2, pDescriptor->pColumnModel, numOfRows2, s2, colIdx);
+
+    if (pDescriptor->pColumnModel->pFields[colIdx].field.type == TSDB_DATA_TYPE_TIMESTAMP) {
+      int32_t ret = primaryKeyComparator(*(int64_t *)f1, *(int64_t *)f2, colIdx, pDescriptor->tsOrder);
+      if (ret == 0) {
+        continue;
+      } else {
+        return ret;
+      }
+    } else {
+      SSchemaEx *pSchema = &pDescriptor->pColumnModel->pFields[colIdx];
+      int32_t  ret = columnValueAscendingComparator(f1, f2, pSchema->field.type, pSchema->field.bytes);
+      if (ret == 0) {
+        continue;
+      } else {
+        return -ret;  // descending order
+      }
+    }
+  }
+
+  return 0;
+}
+FORCE_INLINE int32_t compare_sa(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t idx1, int32_t idx2,
+                                char *data) {
+  return compare_a(pDescriptor, numOfRows, idx1, data, numOfRows, idx2, data);
+}
+
+FORCE_INLINE int32_t compare_sd(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t idx1, int32_t idx2,
+                                char *data) {
+  return compare_d(pDescriptor, numOfRows, idx1, data, numOfRows, idx2, data);
+}
+
+static void swap(SColumnModel *pColumnModel, int32_t count, int32_t s1, char *data1, int32_t s2, void* buf) {
+  for (int32_t i = 0; i < pColumnModel->numOfCols; ++i) {
+    void *first = COLMODEL_GET_VAL(data1, pColumnModel, count, s1, i);
+    void *second = COLMODEL_GET_VAL(data1, pColumnModel, count, s2, i);
+
+    SSchema* pSchema = &pColumnModel->pFields[i].field;
+    tsDataSwap(first, second, pSchema->type, pSchema->bytes, buf);
+  }
+}
+
+static void tColDataInsertSort(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
+                               __col_compar_fn_t compareFn, void* buf) {
+  for (int32_t i = start + 1; i <= end; ++i) {
+    for (int32_t j = i; j > start; --j) {
+      if (compareFn(pDescriptor, numOfRows, j, j - 1, data) == -1) {
+        swap(pDescriptor->pColumnModel, numOfRows, j - 1, data, j, buf);
+      } else {
+        break;
+      }
+    }
+  }
+}
+
+static void UNUSED_FUNC tSortDataPrint(int32_t type, char *prefix, char *startx, char *midx, char *endx) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT:
+      printf("%s:(%d, %d, %d)\n", prefix, *(int32_t *)startx, *(int32_t *)midx, *(int32_t *)endx);
+      break;
+    case TSDB_DATA_TYPE_TINYINT:
+      printf("%s:(%d, %d, %d)\n", prefix, *(int8_t *)startx, *(int8_t *)midx, *(int8_t *)endx);
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      printf("%s:(%d, %d, %d)\n", prefix, *(int16_t *)startx, *(int16_t *)midx, *(int16_t *)endx);
+      break;
+    case TSDB_DATA_TYPE_TIMESTAMP:
+    case TSDB_DATA_TYPE_BIGINT:
+      printf("%s:(%" PRId64 ", %" PRId64 ", %" PRId64 ")\n", prefix, *(int64_t *)startx, *(int64_t *)midx, *(int64_t *)endx);
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      printf("%s:(%f, %f, %f)\n", prefix, *(float *)startx, *(float *)midx, *(float *)endx);
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      printf("%s:(%lf, %lf, %lf)\n", prefix, *(double *)startx, *(double *)midx, *(double *)endx);
+      break;
+    case TSDB_DATA_TYPE_BINARY:
+      printf("%s:(%s, %s, %s)\n", prefix, startx, midx, endx);
+      break;
+  }
+}
+
+static void median(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
+                   __col_compar_fn_t compareFn, void* buf) {
+  int32_t midIdx = ((end - start) >> 1) + start;
+
+#if defined(_DEBUG_VIEW)
+  int32_t f = pDescriptor->orderInfo.pData[0];
+
+  char *midx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, midIdx, f);
+  char *startx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, start, f);
+  char *endx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, end, f);
+
+  int32_t colIdx = pDescriptor->orderInfo.pData[0];
+  tSortDataPrint(pDescriptor->pColumnModel->pFields[colIdx].field.type, "before", startx, midx, endx);
+#endif
+
+  SColumnModel* pModel = pDescriptor->pColumnModel;
+  if (compareFn(pDescriptor, numOfRows, midIdx, start, data) == 1) {
+    swap(pModel, numOfRows, start, data, midIdx, buf);
+  }
+
+  if (compareFn(pDescriptor, numOfRows, midIdx, end, data) == 1) {
+    swap(pModel, numOfRows, midIdx, data, start, buf);
+    swap(pModel, numOfRows, midIdx, data, end, buf);
+  } else if (compareFn(pDescriptor, numOfRows, start, end, data) == 1) {
+    swap(pModel, numOfRows, start, data, end, buf);
+  }
+
+  assert(compareFn(pDescriptor, numOfRows, midIdx, start, data) <= 0 &&
+         compareFn(pDescriptor, numOfRows, start, end, data) <= 0);
+
+#if defined(_DEBUG_VIEW)
+  midx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, midIdx, f);
+  startx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, start, f);
+  endx = COLMODEL_GET_VAL(data, pDescriptor->pColumnModel, numOfRows, end, f);
+  tSortDataPrint(pDescriptor->pColumnModel->pFields[colIdx].field.type, "after", startx, midx, endx);
+#endif
+}
+
+static UNUSED_FUNC void tRowModelDisplay(tOrderDescriptor *pDescriptor, int32_t numOfRows, char *d, int32_t len) {
+  int32_t colIdx = pDescriptor->orderInfo.pData[0];
+
+  for (int32_t i = 0; i < len; ++i) {
+    char *startx = COLMODEL_GET_VAL(d, pDescriptor->pColumnModel, numOfRows, i, colIdx);
+
+    switch (pDescriptor->pColumnModel->pFields[colIdx].field.type) {
+      case TSDB_DATA_TYPE_DOUBLE:
+        printf("%lf\t", *(double *)startx);
+        break;
+      case TSDB_DATA_TYPE_FLOAT:
+        printf("%f\t", *(float *)startx);
+        break;
+      case TSDB_DATA_TYPE_INT:
+        printf("%d\t", *(int32_t *)startx);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        printf("%d\t", *(int16_t *)startx);
+        break;
+      case TSDB_DATA_TYPE_TINYINT:
+      case TSDB_DATA_TYPE_BOOL:
+        printf("%d\t", *(int8_t *)startx);
+        break;
+      case TSDB_DATA_TYPE_TIMESTAMP:
+      case TSDB_DATA_TYPE_BIGINT:
+        printf("%" PRId64 "\t", *(int64_t *)startx);
+        break;
+      case TSDB_DATA_TYPE_BINARY:
+        printf("%s\t", startx);
+        break;
+      default:
+        assert(false);
+    }
+  }
+  printf("\n");
+}
+
+static void columnwiseQSortImpl(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
+                                int32_t orderType, __col_compar_fn_t compareFn, void* buf) {
+#ifdef _DEBUG_VIEW
+  printf("before sort:\n");
+  tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
+#endif
+
+  int32_t s = start, e = end;
+  median(pDescriptor, numOfRows, start, end, data, compareFn, buf);
+
+#ifdef _DEBUG_VIEW
+  //  printf("%s called: %d\n", __FUNCTION__, qsort_call++);
+#endif
+
+  int32_t end_same = end;
+  int32_t start_same = start;
+
+  while (s < e) {
+    while (e > s) {
+      int32_t ret = compareFn(pDescriptor, numOfRows, e, s, data);
+      if (ret < 0) {
+        break;
+      }
+
+      if (ret == 0 && e != end_same) {
+        swap(pDescriptor->pColumnModel, numOfRows, e, data, end_same--, buf);
+      }
+      e--;
+    }
+
+    if (e != s) {
+      swap(pDescriptor->pColumnModel, numOfRows, s, data, e, buf);
+    }
+
+#ifdef _DEBUG_VIEW
+    //    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
+#endif
+
+    while (s < e) {
+      int32_t ret = compareFn(pDescriptor, numOfRows, s, e, data);
+      if (ret > 0) {
+        break;
+      }
+
+      if (ret == 0 && s != start_same) {
+        swap(pDescriptor->pColumnModel, numOfRows, s, data, start_same++, buf);
+      }
+      s++;
+    }
+
+    if (s != e) {
+      swap(pDescriptor->pColumnModel, numOfRows, s, data, e, buf);
+    }
+#ifdef _DEBUG_VIEW
+    //    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
+#endif
+  }
+
+  int32_t rightx = e + 1;
+  if (end_same != end && e < end) {  // move end data to around the pivotal
+    int32_t left = e + 1;
+    int32_t right = end;
+
+    while (right > end_same && left <= end_same) {
+      swap(pDescriptor->pColumnModel, numOfRows, left++, data, right--, buf);
+    }
+
+    // (pivotal+1) + steps of number that are identical pivotal
+    rightx += (end - end_same);
+
+#ifdef _DEBUG_VIEW
+    //    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
+#endif
+  }
+
+  int32_t leftx = e - 1;
+  if (start_same != start && s > start) {
+    int32_t left = start;
+    int32_t right = e - 1;
+
+    while (left < start_same && right >= start_same) {
+      swap(pDescriptor->pColumnModel, numOfRows, left++, data, right--, buf);
+    }
+
+    // (pivotal-1) - steps of number that are identical pivotal
+    leftx -= (start_same - start);
+
+#ifdef _DEBUG_VIEW
+    //    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
+#endif
+  }
+
+  if (leftx > start) {
+    columnwiseQSortImpl(pDescriptor, numOfRows, start, leftx, data, orderType, compareFn, buf);
+  }
+
+  if (rightx < end) {
+    columnwiseQSortImpl(pDescriptor, numOfRows, rightx, end, data, orderType, compareFn, buf);
+  }
+}
+
+void tColDataQSort(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data, int32_t order) {
+  // short array sort, incur another sort procedure instead of quick sort process
+  __col_compar_fn_t compareFn = (order == TSDB_ORDER_ASC) ? compare_sa : compare_sd;
+
+  SColumnModel* pModel = pDescriptor->pColumnModel;
+
+  size_t width = 0;
+  for(int32_t i = 0; i < pModel->numOfCols; ++i) {
+    SSchema* pSchema = &pModel->pFields[i].field;
+    if (width < pSchema->bytes) {
+      width = pSchema->bytes;
+    }
+  }
+
+  char* buf = malloc(width);
+  assert(width > 0 && buf != NULL);
+
+  if (end - start + 1 <= 8) {
+    tColDataInsertSort(pDescriptor, numOfRows, start, end, data, compareFn, buf);
+  } else {
+    columnwiseQSortImpl(pDescriptor, numOfRows, start, end, data, order, compareFn, buf);
+  }
+
+  free(buf);
+}
+
+/*
+ * deep copy of sschema
+ */
+SColumnModel *createColumnModel(SSchema *fields, int32_t numOfCols, int32_t blockCapacity) {
+  SColumnModel *pColumnModel = (SColumnModel *)calloc(1, sizeof(SColumnModel) + numOfCols * sizeof(SSchemaEx));
+  if (pColumnModel == NULL) {
+    return NULL;
+  }
+
+  pColumnModel->pFields = (SSchemaEx *)(&pColumnModel[1]);
+  
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    SSchemaEx* pSchemaEx = &pColumnModel->pFields[i];
+    pSchemaEx->field = fields[i];
+    pSchemaEx->offset = pColumnModel->rowSize;
+    
+    pColumnModel->rowSize += pSchemaEx->field.bytes;
+  }
+
+  pColumnModel->numOfCols = numOfCols;
+  pColumnModel->capacity = blockCapacity;
+
+  return pColumnModel;
+}
+
+SColumnModel *cloneColumnModel(SColumnModel *pSrc) {
+  if (pSrc == NULL) {
+    return NULL;
+  }
+  
+  SColumnModel *pColumnModel = (SColumnModel *)calloc(1, sizeof(SColumnModel) + pSrc->numOfCols * sizeof(SSchemaEx));
+  if (pColumnModel == NULL) {
+    return NULL;
+  }
+  
+  *pColumnModel = *pSrc;
+  
+  pColumnModel->pFields = (SSchemaEx*) (&pColumnModel[1]);
+  memcpy(pColumnModel->pFields, pSrc->pFields, pSrc->numOfCols * sizeof(SSchemaEx));
+  
+  return pColumnModel;
+}
+
+void destroyColumnModel(SColumnModel *pModel) {
+  if (pModel == NULL) {
+    return;
+  }
+
+  taosTFree(pModel);
+}
+
+static void printBinaryData(char *data, int32_t len) {
+  bool isCharString = true;
+  for (int32_t i = 0; i < len; ++i) {
+    if ((data[i] <= 'Z' && data[i] >= 'A') || (data[i] <= 'z' && data[i] >= 'a') ||
+        (data[i] >= '0' && data[i] <= '9')) {
+      continue;
+    } else if (data[i] == 0) {
+      break;
+    } else {
+      isCharString = false;
+      break;
+    }
+  }
+
+  if (len == 50) {  // probably the avg intermediate result
+    printf("%lf,%" PRId64 "\t", *(double *)data, *(int64_t *)(data + sizeof(double)));
+  } else if (data[8] == ',') {  // in TSDB_FUNC_FIRST_DST/TSDB_FUNC_LAST_DST,
+                                // the value is seperated by ','
+    //printf("%" PRId64 ",%0x\t", *(int64_t *)data, data + sizeof(int64_t) + 1);
+    printf("%" PRId64 ", HEX: ", *(int64_t *)data);
+    int32_t tmp_len = len - sizeof(int64_t) - 1;
+    for (int32_t i = 0; i < tmp_len; ++i) {
+      printf("%0x ", *(data + sizeof(int64_t) + 1 + i));
+    }
+    printf("\t");
+  } else if (isCharString) {
+    printf("%s\t", data);
+  }
+}
+
+// todo cast to struct to extract data
+static void printBinaryDataEx(char *data, int32_t len, SSrcColumnInfo *param) {
+  if (param->functionId == TSDB_FUNC_LAST_DST) {
+    switch (param->type) {
+      case TSDB_DATA_TYPE_TINYINT:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int8_t *) (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int16_t *) (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_TIMESTAMP:
+      case TSDB_DATA_TYPE_BIGINT:printf("%" PRId64 ",%" PRId64 "\t", *(int64_t *) data, *(int64_t *) (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_FLOAT:printf("%" PRId64 ",%f\t", *(int64_t *) data, *(float *) (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_DOUBLE:printf("%" PRId64 ",%f\t", *(int64_t *) data, *(double *) (data + TSDB_KEYSIZE + 1));
+        break;
+      case TSDB_DATA_TYPE_BINARY:printf("%" PRId64 ",%s\t", *(int64_t *) data, (data + TSDB_KEYSIZE + 1));
+        break;
+
+      case TSDB_DATA_TYPE_INT:
+      default:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int32_t *) (data + TSDB_KEYSIZE + 1));
+        break;
+    }
+  } else if (param->functionId == TSDB_FUNC_AVG) {
+      printf("%f,%" PRId64 "\t", *(double *) data, *(int64_t *) (data + sizeof(double) + 1));
+  } else {
+    // functionId == TSDB_FUNC_MAX_DST | TSDB_FUNC_TAG
+    switch (param->type) {
+      case TSDB_DATA_TYPE_TINYINT:
+        printf("%d\t", *(int8_t *)data);
+        break;
+      case TSDB_DATA_TYPE_SMALLINT:
+        printf("%d\t", *(int16_t *)data);
+        break;
+      case TSDB_DATA_TYPE_TIMESTAMP:
+      case TSDB_DATA_TYPE_BIGINT:
+        printf("%" PRId64 "\t", *(int64_t *)data);
+        break;
+      case TSDB_DATA_TYPE_FLOAT:
+        printf("%f\t", *(float *)data);
+        break;
+      case TSDB_DATA_TYPE_DOUBLE:
+        printf("%f\t", *(double *)data);
+        break;
+      case TSDB_DATA_TYPE_BINARY:
+        printf("%s\t", data);
+        break;
+
+      case TSDB_DATA_TYPE_INT:
+      default:
+        printf("%f\t", *(double *)data);
+        break;
+    }
+  }
+}
+
+void tColModelDisplay(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t totalCapacity) {
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    for (int32_t j = 0; j < pModel->numOfCols; ++j) {
+      char *val = COLMODEL_GET_VAL((char *)pData, pModel, totalCapacity, i, j);
+
+      int type = pModel->pFields[j].field.type;
+      printf("type:%d ", type);
+
+      switch (type) {
+        case TSDB_DATA_TYPE_BIGINT:
+          printf("%" PRId64 "\t", *(int64_t *)val);
+          break;
+        case TSDB_DATA_TYPE_INT:
+          printf("%d\t", *(int32_t *)val);
+          break;
+        case TSDB_DATA_TYPE_NCHAR: {
+          char buf[4096] = {0};
+          taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+          printf("%s\t", buf);
+          break;
+        }
+        case TSDB_DATA_TYPE_BINARY: {
+          printBinaryData(val, pModel->pFields[j].field.bytes);
+          break;
+        }
+        case TSDB_DATA_TYPE_DOUBLE:
+          printf("%lf\t", *(double *)val);
+          break;
+        case TSDB_DATA_TYPE_TIMESTAMP:
+          printf("%" PRId64 "\t", *(int64_t *)val);
+          break;
+        case TSDB_DATA_TYPE_TINYINT:
+          printf("%d\t", *(int8_t *)val);
+          break;
+        case TSDB_DATA_TYPE_SMALLINT:
+          printf("%d\t", *(int16_t *)val);
+          break;
+        case TSDB_DATA_TYPE_BOOL:
+          printf("%d\t", *(int8_t *)val);
+          break;
+        case TSDB_DATA_TYPE_FLOAT:
+          printf("%f\t", *(float *)val);
+          break;
+        default:
+          assert(false);
+      }
+    }
+    printf("\n");
+  }
+  printf("\n");
+}
+
+void tColModelDisplayEx(SColumnModel *pModel, void *pData, int32_t numOfRows, int32_t totalCapacity,
+                        SSrcColumnInfo *param) {
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    for (int32_t j = 0; j < pModel->numOfCols; ++j) {
+      char *val = COLMODEL_GET_VAL((char *)pData, pModel, totalCapacity, i, j);
+
+      printf("type:%d\t", pModel->pFields[j].field.type);
+
+      switch (pModel->pFields[j].field.type) {
+        case TSDB_DATA_TYPE_BIGINT:
+          printf("%" PRId64 "\t", *(int64_t *)val);
+          break;
+        case TSDB_DATA_TYPE_INT:
+          printf("%d\t", *(int32_t *)val);
+          break;
+        case TSDB_DATA_TYPE_NCHAR: {
+          char buf[128] = {0};
+          taosUcs4ToMbs(val, pModel->pFields[j].field.bytes, buf);
+          printf("%s\t", buf);
+          break;
+        }
+        case TSDB_DATA_TYPE_BINARY: {
+          printBinaryDataEx(val, pModel->pFields[j].field.bytes, &param[j]);
+          break;
+        }
+        case TSDB_DATA_TYPE_DOUBLE:
+          printf("%lf\t", *(double *)val);
+          break;
+        case TSDB_DATA_TYPE_TIMESTAMP:
+          printf("%" PRId64 "\t", *(int64_t *)val);
+          break;
+        case TSDB_DATA_TYPE_TINYINT:
+          printf("%d\t", *(int8_t *)val);
+          break;
+        case TSDB_DATA_TYPE_SMALLINT:
+          printf("%d\t", *(int16_t *)val);
+          break;
+        case TSDB_DATA_TYPE_BOOL:
+          printf("%d\t", *(int8_t *)val);
+          break;
+        case TSDB_DATA_TYPE_FLOAT:
+          printf("%f\t", *(float *)val);
+          break;
+        default:
+          assert(false);
+      }
+    }
+    printf("\n");
+  }
+  printf("\n");
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////
+void tColModelCompact(SColumnModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity) {
+  if (inputBuffer->num == 0 || maxElemsCapacity == inputBuffer->num) {
+    return;
+  }
+
+  /* start from the second column */
+  for (int32_t i = 1; i < pModel->numOfCols; ++i) {
+    SSchemaEx* pSchemaEx = &pModel->pFields[i];
+    memmove(inputBuffer->data + pSchemaEx->offset * inputBuffer->num,
+            inputBuffer->data + pSchemaEx->offset * maxElemsCapacity,
+            (size_t)(pSchemaEx->field.bytes * inputBuffer->num));
+  }
+}
+
+SSchema* getColumnModelSchema(SColumnModel *pColumnModel, int32_t index) {
+  assert(pColumnModel != NULL && index >= 0 && index < pColumnModel->numOfCols);
+  return &pColumnModel->pFields[index].field;
+}
+
+int16_t getColumnModelOffset(SColumnModel *pColumnModel, int32_t index) {
+  assert(pColumnModel != NULL && index >= 0 && index < pColumnModel->numOfCols);
+  return pColumnModel->pFields[index].offset;
+}
+
+void tColModelErase(SColumnModel *pModel, tFilePage *inputBuffer, int32_t blockCapacity, int32_t s, int32_t e) {
+  if (inputBuffer->num == 0 || (e - s + 1) <= 0) {
+    return;
+  }
+
+  int32_t removed = e - s + 1;
+  int32_t remain = (int32_t)inputBuffer->num - removed;
+  int32_t secPart = (int32_t)inputBuffer->num - e - 1;
+
+  /* start from the second column */
+  for (int32_t i = 0; i < pModel->numOfCols; ++i) {
+    int16_t offset = getColumnModelOffset(pModel, i);
+    SSchema* pSchema = getColumnModelSchema(pModel, i);
+    
+    char *startPos = inputBuffer->data + offset * blockCapacity + s * pSchema->bytes;
+    char *endPos = startPos + pSchema->bytes * removed;
+
+    memmove(startPos, endPos, pSchema->bytes * secPart);
+  }
+
+  inputBuffer->num = remain;
+}
+
+/*
+ * column format data block append function
+ * used in write record(s) to exist column-format block
+ *
+ * data in srcData must has the same schema as data in dstPage, that can be
+ * described by dstModel
+ */
+void tColModelAppend(SColumnModel *dstModel, tFilePage *dstPage, void *srcData, int32_t start, int32_t numOfRows,
+                     int32_t srcCapacity) {
+  assert(dstPage->num + numOfRows <= dstModel->capacity);
+
+  for (int32_t col = 0; col < dstModel->numOfCols; ++col) {
+    char *dst = COLMODEL_GET_VAL(dstPage->data, dstModel, dstModel->capacity, dstPage->num, col);
+    char *src = COLMODEL_GET_VAL((char *)srcData, dstModel, srcCapacity, start, col);
+
+    memmove(dst, src, dstModel->pFields[col].field.bytes * numOfRows);
+  }
+
+  dstPage->num += numOfRows;
+}
+
+tOrderDescriptor *tOrderDesCreate(const int32_t *orderColIdx, int32_t numOfOrderCols, SColumnModel *pModel,
+                                  int32_t tsOrderType) {
+  tOrderDescriptor *desc = (tOrderDescriptor *)calloc(1, sizeof(tOrderDescriptor) + sizeof(int32_t) * numOfOrderCols);
+  if (desc == NULL) {
+    return NULL;
+  }
+
+  desc->pColumnModel = pModel;
+  desc->tsOrder = tsOrderType;
+
+  desc->orderInfo.numOfCols = numOfOrderCols;
+  for (int32_t i = 0; i < numOfOrderCols; ++i) {
+    desc->orderInfo.pData[i] = orderColIdx[i];
+  }
+
+  return desc;
+}
+
+void tOrderDescDestroy(tOrderDescriptor *pDesc) {
+  if (pDesc == NULL) {
+    return;
+  }
+
+  destroyColumnModel(pDesc->pColumnModel);
+  taosTFree(pDesc);
+}
diff --git a/src/query/src/qFill.c b/src/query/src/qFill.c
new file mode 100644
index 0000000000000000000000000000000000000000..f186726c0120f2e2e34580fec0da00c2083e5da9
--- /dev/null
+++ b/src/query/src/qFill.c
@@ -0,0 +1,517 @@
+/*
+ * 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 "qFill.h"
+#include "os.h"
+#include "qExtbuffer.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tsqlfunction.h"
+
+#define FILL_IS_ASC_FILL(_f) ((_f)->order == TSDB_ORDER_ASC)
+
+SFillInfo* taosInitFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols,
+    int64_t slidingTime, int8_t slidingUnit, int8_t precision, int32_t fillType, SFillColInfo* pFillCol) {
+  if (fillType == TSDB_FILL_NONE) {
+    return NULL;
+  }
+  
+  SFillInfo* pFillInfo = calloc(1, sizeof(SFillInfo));
+  
+  taosResetFillInfo(pFillInfo, skey);
+  
+  pFillInfo->order     = order;
+  pFillInfo->fillType  = fillType;
+  pFillInfo->pFillCol  = pFillCol;
+  pFillInfo->numOfTags = numOfTags;
+  pFillInfo->numOfCols = numOfCols;
+  pFillInfo->precision = precision;
+
+  pFillInfo->interval.interval = slidingTime;
+  pFillInfo->interval.intervalUnit = slidingUnit;
+  pFillInfo->interval.sliding = slidingTime;
+  pFillInfo->interval.slidingUnit = slidingUnit;
+
+  pFillInfo->pData = malloc(POINTER_BYTES * numOfCols);
+  if (numOfTags > 0) {
+    pFillInfo->pTags = calloc(pFillInfo->numOfTags, sizeof(SFillTagColInfo));
+    for(int32_t i = 0; i < numOfTags; ++i) {
+      pFillInfo->pTags[i].col.colId = -2;
+    }
+  }
+
+  int32_t rowsize = 0;
+  int32_t k = 0;
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SFillColInfo* pColInfo = &pFillInfo->pFillCol[i];
+    pFillInfo->pData[i] = calloc(1, pColInfo->col.bytes * capacity);
+
+    if (TSDB_COL_IS_TAG(pColInfo->flag)) {
+      bool exists = false;
+      for(int32_t j = 0; j < k; ++j) {
+        if (pFillInfo->pTags[j].col.colId == pColInfo->col.colId) {
+          exists = true;
+          break;
+        }
+      }
+
+      if (!exists) {
+        pFillInfo->pTags[k].col.colId = pColInfo->col.colId;
+        pFillInfo->pTags[k].tagVal = calloc(1, pColInfo->col.bytes);
+
+        k += 1;
+      }
+    }
+    rowsize += pColInfo->col.bytes;
+  }
+
+  pFillInfo->rowSize = rowsize;
+  pFillInfo->capacityInRows = capacity;
+  
+  return pFillInfo;
+}
+
+void taosResetFillInfo(SFillInfo* pFillInfo, TSKEY startTimestamp) {
+  pFillInfo->start        = startTimestamp;
+  pFillInfo->rowIdx       = -1;
+  pFillInfo->numOfRows    = 0;
+  pFillInfo->numOfCurrent = 0;
+  pFillInfo->numOfTotal   = 0;
+}
+
+void* taosDestoryFillInfo(SFillInfo* pFillInfo) {
+  if (pFillInfo == NULL) {
+    return NULL;
+  }
+
+  taosTFree(pFillInfo->prevValues);
+  taosTFree(pFillInfo->nextValues);
+  taosTFree(pFillInfo->pTags);
+  
+  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+    taosTFree(pFillInfo->pData[i]);
+  }
+  
+  taosTFree(pFillInfo->pData);
+  taosTFree(pFillInfo->pFillCol);
+  
+  taosTFree(pFillInfo);
+  return NULL;
+}
+
+void taosFillSetStartInfo(SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey) {
+  if (pFillInfo->fillType == TSDB_FILL_NONE) {
+    return;
+  }
+
+  pFillInfo->endKey = endKey;
+  if (pFillInfo->order != TSDB_ORDER_ASC) {
+    pFillInfo->endKey = taosTimeTruncate(endKey, &pFillInfo->interval, pFillInfo->precision);
+  }
+
+  pFillInfo->rowIdx    = 0;
+  pFillInfo->numOfRows = numOfRows;
+  
+  // ensure the space
+  if (pFillInfo->capacityInRows < numOfRows) {
+    for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+      char* tmp = realloc(pFillInfo->pData[i], numOfRows*pFillInfo->pFillCol[i].col.bytes);
+      assert(tmp != NULL); // todo handle error
+      
+      memset(tmp, 0, numOfRows*pFillInfo->pFillCol[i].col.bytes);
+      pFillInfo->pData[i] = tmp;
+    }
+  }
+}
+
+void taosFillCopyInputDataFromFilePage(SFillInfo* pFillInfo, tFilePage** pInput) {
+  // copy the data into source data buffer
+  for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+    memcpy(pFillInfo->pData[i], pInput[i]->data, pFillInfo->numOfRows * pFillInfo->pFillCol[i].col.bytes);
+  }
+}
+
+void taosFillCopyInputDataFromOneFilePage(SFillInfo* pFillInfo, tFilePage* pInput) {
+  assert(pFillInfo->numOfRows == pInput->num);
+
+  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+    SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+
+    char* data = pInput->data + pCol->col.offset * pInput->num;
+    memcpy(pFillInfo->pData[i], data, (size_t)(pInput->num * pCol->col.bytes));
+
+    if (TSDB_COL_IS_TAG(pCol->flag)) {  // copy the tag value to tag value buffer
+      for (int32_t j = 0; j < pFillInfo->numOfTags; ++j) {
+        SFillTagColInfo* pTag = &pFillInfo->pTags[j];
+        if (pTag->col.colId == pCol->col.colId) {
+          memcpy(pTag->tagVal, data, pCol->col.bytes);
+          break;
+        }
+      }
+    }
+  }
+}
+
+int64_t getFilledNumOfRes(SFillInfo* pFillInfo, TSKEY ekey, int32_t maxNumOfRows) {
+  int64_t* tsList = (int64_t*) pFillInfo->pData[0];
+
+  int32_t numOfRows = taosNumOfRemainRows(pFillInfo);
+
+  TSKEY ekey1 = ekey;
+  if (pFillInfo->order != TSDB_ORDER_ASC) {
+    pFillInfo->endKey = taosTimeTruncate(ekey, &pFillInfo->interval, pFillInfo->precision);
+  }
+
+  int64_t numOfRes = -1;
+  if (numOfRows > 0) {  // still fill gap within current data block, not generating data after the result set.
+    TSKEY lastKey = tsList[pFillInfo->numOfRows - 1];
+    numOfRes = taosTimeCountInterval(
+      lastKey,
+      pFillInfo->start,
+      pFillInfo->interval.sliding,
+      pFillInfo->interval.slidingUnit,
+      pFillInfo->precision);
+    numOfRes += 1;
+    assert(numOfRes >= numOfRows);
+  } else { // reach the end of data
+    if ((ekey1 < pFillInfo->start && FILL_IS_ASC_FILL(pFillInfo)) ||
+        (ekey1 > pFillInfo->start && !FILL_IS_ASC_FILL(pFillInfo))) {
+      return 0;
+    }
+    numOfRes = taosTimeCountInterval(
+      ekey1,
+      pFillInfo->start,
+      pFillInfo->interval.sliding,
+      pFillInfo->interval.slidingUnit,
+      pFillInfo->precision);
+    numOfRes += 1;
+  }
+
+  return (numOfRes > maxNumOfRows) ? maxNumOfRows : numOfRes;
+}
+
+int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) {
+  if (pFillInfo->rowIdx == -1 || pFillInfo->numOfRows == 0) {
+    return 0;
+  }
+
+  return pFillInfo->numOfRows - pFillInfo->rowIdx;
+}
+
+// todo: refactor
+static double linearInterpolationImpl(double v1, double v2, double k1, double k2, double k) {
+  return v1 + (v2 - v1) * (k - k1) / (k2 - k1);
+}
+
+int taosDoLinearInterpolation(int32_t type, SPoint* point1, SPoint* point2, SPoint* point) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT: {
+      *(int32_t*)point->val = (int32_t)linearInterpolationImpl(*(int32_t*)point1->val, *(int32_t*)point2->val, (double)point1->key,
+                                                              (double)point2->key, (double)point->key);
+      break;
+    }
+    case TSDB_DATA_TYPE_FLOAT: {
+      *(float*)point->val = (float)
+        linearInterpolationImpl(*(float*)point1->val, *(float*)point2->val, (double)point1->key, (double)point2->key, (double)point->key);
+      break;
+    };
+    case TSDB_DATA_TYPE_DOUBLE: {
+      *(double*)point->val =
+        linearInterpolationImpl(*(double*)point1->val, *(double*)point2->val, (double)point1->key, (double)point2->key, (double)point->key);
+      break;
+    };
+    case TSDB_DATA_TYPE_TIMESTAMP:
+    case TSDB_DATA_TYPE_BIGINT: {
+      *(int64_t*)point->val = (int64_t)linearInterpolationImpl((double)(*(int64_t*)point1->val), (double)(*(int64_t*)point2->val), (double)point1->key,
+        (double)point2->key, (double)point->key);
+      break;
+    };
+    case TSDB_DATA_TYPE_SMALLINT: {
+      *(int16_t*)point->val = (int16_t)linearInterpolationImpl(*(int16_t*)point1->val, *(int16_t*)point2->val, (double)point1->key,
+        (double)point2->key, (double)point->key);
+      break;
+    };
+    case TSDB_DATA_TYPE_TINYINT: {
+      *(int8_t*) point->val = (int8_t)
+        linearInterpolationImpl(*(int8_t*)point1->val, *(int8_t*)point2->val, (double)point1->key, (double)point2->key, (double)point->key);
+      break;
+    };
+    default: {
+      // TODO: Deal with interpolation with bool and strings and timestamp
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+static void setTagsValue(SFillInfo* pFillInfo, tFilePage** data, int32_t num) {
+  for(int32_t j = 0; j < pFillInfo->numOfCols; ++j) {
+    SFillColInfo* pCol = &pFillInfo->pFillCol[j];
+    if (TSDB_COL_IS_NORMAL_COL(pCol->flag)) {
+      continue;
+    }
+
+    char* val1 = elePtrAt(data[j]->data, pCol->col.bytes, num);
+
+    for(int32_t i = 0; i < pFillInfo->numOfTags; ++i) {
+      SFillTagColInfo* pTag = &pFillInfo->pTags[i];
+      if (pTag->col.colId == pCol->col.colId) {
+        assignVal(val1, pTag->tagVal, pCol->col.bytes, pCol->col.type);
+        break;
+      }
+    }
+  }
+}
+
+static void doFillResultImpl(SFillInfo* pFillInfo, tFilePage** data, int32_t* num, char** srcData, int64_t ts,
+                             bool outOfBound) {
+  char* prevValues = pFillInfo->prevValues;
+  char* nextValues = pFillInfo->nextValues;
+
+  SPoint point1, point2, point;
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pFillInfo->order);
+
+  char* val = elePtrAt(data[0]->data, TSDB_KEYSIZE, *num);
+  *(TSKEY*) val = pFillInfo->start;
+
+  int32_t numOfValCols = pFillInfo->numOfCols - pFillInfo->numOfTags;
+
+  // set the other values
+  if (pFillInfo->fillType == TSDB_FILL_PREV) {
+    char* p = FILL_IS_ASC_FILL(pFillInfo) ? prevValues : nextValues;
+    
+    if (p != NULL) {
+      for (int32_t i = 1; i < numOfValCols; ++i) {
+        SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+        
+        char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, *num);
+        if (isNull(p + pCol->col.offset, pCol->col.type)) {
+          if (pCol->col.type == TSDB_DATA_TYPE_BINARY || pCol->col.type == TSDB_DATA_TYPE_NCHAR) {
+            setVardataNull(val1, pCol->col.type);
+          } else {
+            setNull(val1, pCol->col.type, pCol->col.bytes);
+          }
+        } else {
+          assignVal(val1, p + pCol->col.offset, pCol->col.bytes, pCol->col.type);
+        }
+      }
+    } else { // no prev value yet, set the value for NULL
+      for (int32_t i = 1; i < numOfValCols; ++i) {
+        SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+
+        char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, *num);
+        if (pCol->col.type == TSDB_DATA_TYPE_BINARY||pCol->col.type == TSDB_DATA_TYPE_NCHAR) {
+          setVardataNull(val1, pCol->col.type);
+        } else {
+          setNull(val1, pCol->col.type, pCol->col.bytes);
+        }
+      }
+    }
+
+    setTagsValue(pFillInfo, data, *num);
+  } else if (pFillInfo->fillType == TSDB_FILL_LINEAR) {
+    // TODO : linear interpolation supports NULL value
+    if (prevValues != NULL && !outOfBound) {
+      for (int32_t i = 1; i < numOfValCols; ++i) {
+        SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+        
+        int16_t type  = pCol->col.type;
+        int16_t bytes = pCol->col.bytes;
+        
+        char *val1 = elePtrAt(data[i]->data, pCol->col.bytes, *num);
+        if (type == TSDB_DATA_TYPE_BINARY|| type == TSDB_DATA_TYPE_NCHAR) {
+          setVardataNull(val1, pCol->col.type);
+          continue;
+        } else if (type == TSDB_DATA_TYPE_BOOL) {
+          setNull(val1, pCol->col.type, bytes);
+          continue;
+        }
+
+        point1 = (SPoint){.key = *(TSKEY*)(prevValues), .val = prevValues + pCol->col.offset};
+        point2 = (SPoint){.key = ts, .val = srcData[i] + pFillInfo->rowIdx * bytes};
+        point  = (SPoint){.key = pFillInfo->start, .val = val1};
+        taosDoLinearInterpolation(type, &point1, &point2, &point);
+      }
+
+      setTagsValue(pFillInfo, data, *num);
+
+    } else {
+      for (int32_t i = 1; i < numOfValCols; ++i) {
+        SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+  
+        char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, *num);
+  
+        if (pCol->col.type == TSDB_DATA_TYPE_BINARY || pCol->col.type == TSDB_DATA_TYPE_NCHAR) {
+          setVardataNull(val1, pCol->col.type);
+        } else {
+          setNull(val1, pCol->col.type, pCol->col.bytes);
+        }
+      }
+
+      setTagsValue(pFillInfo, data, *num);
+  
+    }
+  } else { /* fill the default value */
+    for (int32_t i = 1; i < numOfValCols; ++i) {
+      SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+      
+      char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, *num);
+      assignVal(val1, (char*)&pCol->fillVal.i, pCol->col.bytes, pCol->col.type);
+    }
+
+    setTagsValue(pFillInfo, data, *num);
+  }
+
+  pFillInfo->start = taosTimeAdd(pFillInfo->start, pFillInfo->interval.sliding * step, pFillInfo->interval.slidingUnit, pFillInfo->precision);
+  pFillInfo->numOfCurrent++;
+
+  (*num) += 1;
+}
+
+static void initBeforeAfterDataBuf(SFillInfo* pFillInfo, char** nextValues) {
+  if (*nextValues != NULL) {
+    return;
+  }
+  
+  *nextValues = calloc(1, pFillInfo->rowSize);
+  for (int i = 1; i < pFillInfo->numOfCols; i++) {
+    SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+  
+    if (pCol->col.type == TSDB_DATA_TYPE_BINARY||pCol->col.type == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(*nextValues + pCol->col.offset, pCol->col.type);
+    } else {
+      setNull(*nextValues + pCol->col.offset, pCol->col.type, pCol->col.bytes);
+    }
+  }
+}
+
+int32_t generateDataBlockImpl(SFillInfo* pFillInfo, tFilePage** data, int32_t numOfRows, int32_t outputRows, char** srcData) {
+  int32_t num = 0;
+  pFillInfo->numOfCurrent = 0;
+
+  char** prevValues = &pFillInfo->prevValues;
+  char** nextValues = &pFillInfo->nextValues;
+
+  int32_t numOfTags = pFillInfo->numOfTags;
+  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pFillInfo->order);
+  if (numOfRows == 0) {
+    /*
+     * These data are generated according to fill strategy, since the current timestamp is out of time window of
+     * real result set. Note that we need to keep the direct previous result rows, to generated the filled data.
+     */
+    while (num < outputRows) {
+      doFillResultImpl(pFillInfo, data, &num, srcData, pFillInfo->start, true);
+    }
+    
+    pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
+    return outputRows;
+
+  } else {
+    while (1) {
+      int64_t ts = ((int64_t*)pFillInfo->pData[0])[pFillInfo->rowIdx];
+
+      if ((pFillInfo->start < ts && FILL_IS_ASC_FILL(pFillInfo)) ||
+          (pFillInfo->start > ts && !FILL_IS_ASC_FILL(pFillInfo))) {
+        /* set the next value for interpolation */
+        initBeforeAfterDataBuf(pFillInfo, nextValues);
+        
+        int32_t offset = pFillInfo->rowIdx;
+        for (int32_t i = 0; i < pFillInfo->numOfCols - numOfTags; ++i) {
+          SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+          memcpy(*nextValues + pCol->col.offset, srcData[i] + offset * pCol->col.bytes, pCol->col.bytes);
+        }
+      }
+
+      if (((pFillInfo->start < ts && FILL_IS_ASC_FILL(pFillInfo)) ||
+           (pFillInfo->start > ts && !FILL_IS_ASC_FILL(pFillInfo))) && num < outputRows) {
+        
+        while (((pFillInfo->start < ts && FILL_IS_ASC_FILL(pFillInfo)) ||
+                (pFillInfo->start > ts && !FILL_IS_ASC_FILL(pFillInfo))) && num < outputRows) {
+          doFillResultImpl(pFillInfo, data, &num, srcData, ts, false);
+        }
+
+        /* output buffer is full, abort */
+        if ((num == outputRows && FILL_IS_ASC_FILL(pFillInfo)) || (num < 0 && !FILL_IS_ASC_FILL(pFillInfo))) {
+          pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
+          return outputRows;
+        }
+      } else {
+        assert(pFillInfo->start == ts);
+        initBeforeAfterDataBuf(pFillInfo, prevValues);
+        
+        // assign rows to dst buffer
+        for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+          SFillColInfo* pCol = &pFillInfo->pFillCol[i];
+          if (TSDB_COL_IS_TAG(pCol->flag)) {
+            continue;
+          }
+
+          char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, num);
+          char* src  = elePtrAt(srcData[i], pCol->col.bytes, pFillInfo->rowIdx);
+          
+          if (i == 0 ||
+              (pCol->functionId != TSDB_FUNC_COUNT && !isNull(src, pCol->col.type)) ||
+              (pCol->functionId == TSDB_FUNC_COUNT && GET_INT64_VAL(src) != 0)) {
+            assignVal(val1, src, pCol->col.bytes, pCol->col.type);
+            memcpy(*prevValues + pCol->col.offset, src, pCol->col.bytes);
+          } else {  // i > 0 and data is null , do interpolation
+            if (pFillInfo->fillType == TSDB_FILL_PREV) {
+              assignVal(val1, *prevValues + pCol->col.offset, pCol->col.bytes, pCol->col.type);
+            } else if (pFillInfo->fillType == TSDB_FILL_LINEAR) {
+              assignVal(val1, src, pCol->col.bytes, pCol->col.type);
+              memcpy(*prevValues + pCol->col.offset, src, pCol->col.bytes);
+            } else {
+              assignVal(val1, (char*) &pCol->fillVal.i, pCol->col.bytes, pCol->col.type);
+            }
+          }
+        }
+
+        // set the tag value for final result
+        setTagsValue(pFillInfo, data, num);
+
+        pFillInfo->start = taosTimeAdd(pFillInfo->start, pFillInfo->interval.sliding*step, pFillInfo->interval.slidingUnit, pFillInfo->precision);
+        pFillInfo->rowIdx += 1;
+
+        pFillInfo->numOfCurrent +=1;
+        num += 1;
+      }
+
+      if ((pFillInfo->rowIdx >= pFillInfo->numOfRows && FILL_IS_ASC_FILL(pFillInfo)) ||
+          (pFillInfo->rowIdx < 0 && !FILL_IS_ASC_FILL(pFillInfo)) || num >= outputRows) {
+        if (pFillInfo->rowIdx >= pFillInfo->numOfRows || pFillInfo->rowIdx < 0) {
+          pFillInfo->rowIdx = -1;
+          pFillInfo->numOfRows = 0;
+
+          /* the raw data block is exhausted, next value does not exists */
+          taosTFree(*nextValues);
+        }
+
+        pFillInfo->numOfTotal += pFillInfo->numOfCurrent;
+        return num;
+      }
+    }
+  }
+}
+
+int64_t taosGenerateDataBlock(SFillInfo* pFillInfo, tFilePage** output, int32_t capacity) {
+  int32_t remain = taosNumOfRemainRows(pFillInfo);  // todo use iterator?
+
+  int32_t rows = (int32_t)getFilledNumOfRes(pFillInfo, pFillInfo->endKey, capacity);
+  int32_t numOfRes = generateDataBlockImpl(pFillInfo, output, remain, rows, pFillInfo->pData);
+  assert(numOfRes == rows);
+  
+  return numOfRes;
+}
diff --git a/src/query/src/qFilterfunc.c b/src/query/src/qFilterfunc.c
new file mode 100644
index 0000000000000000000000000000000000000000..b6050dddd8fecc8f0a0b764313efcbe2a630113a
--- /dev/null
+++ b/src/query/src/qFilterfunc.c
@@ -0,0 +1,580 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#include "qExecutor.h"
+#include "taosmsg.h"
+#include "tcompare.h"
+#include "tsqlfunction.h"
+
+bool less_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval < pFilter->filterInfo.upperBndi);
+}
+
+bool less_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval < pFilter->filterInfo.upperBndi);
+}
+
+bool less_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval < pFilter->filterInfo.upperBndi);
+}
+
+bool less_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval < pFilter->filterInfo.upperBndi);
+}
+
+bool less_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval < pFilter->filterInfo.upperBndd);
+}
+
+bool less_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval < pFilter->filterInfo.upperBndd);
+}
+
+//////////////////////////////////////////////////////////////////
+bool large_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+bool large_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+bool large_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+bool large_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+bool large_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)maxval > pFilter->filterInfo.lowerBndd);
+}
+
+bool large_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)maxval > pFilter->filterInfo.lowerBndd);
+}
+/////////////////////////////////////////////////////////////////////
+
+bool lessEqual_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi);
+}
+
+bool lessEqual_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi);
+}
+
+bool lessEqual_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi);
+}
+
+bool lessEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi);
+}
+
+bool lessEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval <= pFilter->filterInfo.upperBndd);
+}
+
+bool lessEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval <= pFilter->filterInfo.upperBndd);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool largeEqual_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool largeEqual_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool largeEqual_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool largeEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool largeEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+bool largeEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+bool equal_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int8_t *)minval == *(int8_t *)maxval) {
+    return (*(int8_t *)minval == pFilter->filterInfo.lowerBndi);
+  } else { /* range filter */
+    assert(*(int8_t *)minval < *(int8_t *)maxval);
+
+    return *(int8_t *)minval <= pFilter->filterInfo.lowerBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi;
+  }
+}
+
+bool equal_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int16_t *)minval == *(int16_t *)maxval) {
+    return (*(int16_t *)minval == pFilter->filterInfo.lowerBndi);
+  } else { /* range filter */
+    assert(*(int16_t *)minval < *(int16_t *)maxval);
+
+    return *(int16_t *)minval <= pFilter->filterInfo.lowerBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi;
+  }
+}
+
+bool equal_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int32_t *)minval == *(int32_t *)maxval) {
+    return (*(int32_t *)minval == pFilter->filterInfo.lowerBndi);
+  } else { /* range filter */
+    assert(*(int32_t *)minval < *(int32_t *)maxval);
+
+    return *(int32_t *)minval <= pFilter->filterInfo.lowerBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi;
+  }
+}
+
+bool equal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int64_t *)minval == *(int64_t *)maxval) {
+    return (*(int64_t *)minval == pFilter->filterInfo.lowerBndi);
+  } else { /* range filter */
+    assert(*(int64_t *)minval < *(int64_t *)maxval);
+
+    return *(int64_t *)minval <= pFilter->filterInfo.lowerBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi;
+  }
+}
+
+bool equal_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(float *)minval == *(float *)maxval) {
+    return (fabs(*(float *)minval - pFilter->filterInfo.lowerBndd) <= FLT_EPSILON);
+  } else { /* range filter */
+    assert(*(float *)minval < *(float *)maxval);
+    return *(float *)minval <= pFilter->filterInfo.lowerBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd;
+  }
+}
+
+bool equal_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(double *)minval == *(double *)maxval) {
+    return (*(double *)minval == pFilter->filterInfo.lowerBndd);
+  } else { /* range filter */
+    assert(*(double *)minval < *(double *)maxval);
+
+    return *(double *)minval <= pFilter->filterInfo.lowerBndi && *(double *)maxval >= pFilter->filterInfo.lowerBndi;
+  }
+}
+
+bool equal_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  // query condition string is greater than the max length of string, not qualified data
+  if (pFilter->filterInfo.len != varDataLen(minval)) {
+    return false;
+  }
+
+  return strncmp((char *)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval)) == 0;
+}
+
+bool equal_nchar(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  // query condition string is greater than the max length of string, not qualified data
+  if (pFilter->filterInfo.len != varDataLen(minval)) {
+    return false;
+  }
+
+  return wcsncmp((wchar_t *)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval)/TSDB_NCHAR_SIZE) == 0;
+}
+
+////////////////////////////////////////////////////////////////
+bool like_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+
+  return patternMatch((char *)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval), &info) == TSDB_PATTERN_MATCH;
+}
+
+bool like_nchar(SColumnFilterElem* pFilter, char* minval, char *maxval) {
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+  
+  return WCSPatternMatch((wchar_t*)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval)/TSDB_NCHAR_SIZE, &info) == TSDB_PATTERN_MATCH;
+}
+
+////////////////////////////////////////////////////////////////
+/**
+ *  If minval equals to maxval, it may serve as the one element filter,
+ *  or all elements of an array are identical during pref-filter stage.
+ *  Otherwise, it must be pre-filter of array list of elements.
+ *
+ *  During pre-filter stage, if there is one element that locates in [minval, maxval],
+ *  the filter function will return true.
+ */
+bool nequal_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int8_t *)minval == *(int8_t *)maxval) {
+    return (*(int8_t *)minval != pFilter->filterInfo.lowerBndi);
+  }
+
+  return true;
+}
+
+bool nequal_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int16_t *)minval == *(int16_t *)maxval) {
+    return (*(int16_t *)minval != pFilter->filterInfo.lowerBndi);
+  }
+
+  return true;
+}
+
+bool nequal_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int32_t *)minval == *(int32_t *)maxval) {
+    return (*(int32_t *)minval != pFilter->filterInfo.lowerBndi);
+  }
+
+  return true;
+}
+
+bool nequal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(int64_t *)minval == *(int64_t *)maxval) {
+    return (*(int64_t *)minval != pFilter->filterInfo.lowerBndi);
+  }
+
+  return true;
+}
+
+bool nequal_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(float *)minval == *(float *)maxval) {
+    return (*(float *)minval != pFilter->filterInfo.lowerBndd);
+  }
+
+  return true;
+}
+
+bool nequal_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (*(double *)minval == *(double *)maxval) {
+    return (*(double *)minval != pFilter->filterInfo.lowerBndd);
+  }
+
+  return true;
+}
+
+bool nequal_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  if (pFilter->filterInfo.len != varDataLen(minval)) {
+    return true;
+  }
+
+  return strncmp((char *)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval)) != 0;
+}
+
+bool nequal_nchar(SColumnFilterElem *pFilter, char* minval, char *maxval) {
+  if (pFilter->filterInfo.len > pFilter->bytes) {
+    return true;
+  }
+
+  return wcsncmp((wchar_t *)pFilter->filterInfo.pz, varDataVal(minval), varDataLen(minval)/TSDB_NCHAR_SIZE) != 0;
+}
+////////////////////////////////////////////////////////////////
+bool isNull_filter(SColumnFilterElem *pFilter, char* minval, char* maxval) {
+  return true;
+}
+
+bool notNull_filter(SColumnFilterElem *pFilter, char* minval, char* maxval) {
+  return true;
+}
+
+////////////////////////////////////////////////////////////////
+
+bool rangeFilter_i32_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i32_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval<pFilter->filterInfo.upperBndi &&*(int32_t *)maxval> pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i32_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval < pFilter->filterInfo.upperBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i32_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi && *(int32_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+bool rangeFilter_i8_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i8_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval<pFilter->filterInfo.upperBndi &&*(int8_t *)maxval> pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i8_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval < pFilter->filterInfo.upperBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i8_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi && *(int8_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+bool rangeFilter_i16_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i16_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval<pFilter->filterInfo.upperBndi &&*(int16_t *)maxval> pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i16_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval < pFilter->filterInfo.upperBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i16_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi && *(int16_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+////////////////////////////////////////////////////////////////////////
+bool rangeFilter_i64_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i64_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval<pFilter->filterInfo.upperBndi &&*(int64_t *)maxval> pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i64_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval < pFilter->filterInfo.upperBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
+}
+
+bool rangeFilter_i64_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi && *(int64_t *)maxval > pFilter->filterInfo.lowerBndi);
+}
+
+////////////////////////////////////////////////////////////////////////
+bool rangeFilter_ds_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_ds_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval<pFilter->filterInfo.upperBndd &&*(float *)maxval> pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_ds_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval < pFilter->filterInfo.upperBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_ds_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval > pFilter->filterInfo.lowerBndd);
+}
+
+//////////////////////////////////////////////////////////////////////////
+bool rangeFilter_dd_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval <= pFilter->filterInfo.upperBndd && *(double *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_dd_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval<pFilter->filterInfo.upperBndd &&*(double *)maxval> pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_dd_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval < pFilter->filterInfo.upperBndd && *(double *)maxval >= pFilter->filterInfo.lowerBndd);
+}
+
+bool rangeFilter_dd_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
+  return (*(double *)minval <= pFilter->filterInfo.upperBndd && *(double *)maxval > pFilter->filterInfo.lowerBndd);
+}
+
+////////////////////////////////////////////////////////////////////////////
+bool (*filterFunc_i8[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_i8,
+  large_i8,
+  equal_i8,
+  lessEqual_i8,
+  largeEqual_i8,
+  nequal_i8,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_i16[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_i16,
+  large_i16,
+  equal_i16,
+  lessEqual_i16,
+  largeEqual_i16,
+  nequal_i16,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_i32[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_i32,
+  large_i32,
+  equal_i32,
+  lessEqual_i32,
+  largeEqual_i32,
+  nequal_i32,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_i64[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_i64,
+  large_i64,
+  equal_i64,
+  lessEqual_i64,
+  largeEqual_i64,
+  nequal_i64,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_ds[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_ds,
+  large_ds,
+  equal_ds,
+  lessEqual_ds,
+  largeEqual_ds,
+  nequal_ds,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_dd[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  less_dd,
+  large_dd,
+  equal_dd,
+  lessEqual_dd,
+  largeEqual_dd,
+  nequal_dd,
+  NULL,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_str[])(SColumnFilterElem* pFilter, char* minval, char *maxval) = {
+  NULL,
+  NULL,
+  NULL,
+  equal_str,
+  NULL,
+  NULL,
+  nequal_str,
+  like_str,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*filterFunc_nchar[])(SColumnFilterElem* pFitler, char* minval, char* maxval) = {
+  NULL,
+  NULL,
+  NULL,
+  equal_nchar,
+  NULL,
+  NULL,
+  nequal_nchar,
+  like_nchar,
+  isNull_filter,
+  notNull_filter,
+};
+
+bool (*rangeFilterFunc_i8[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_i8_ee,
+  rangeFilter_i8_ie,
+  rangeFilter_i8_ei,
+  rangeFilter_i8_ii,
+};
+
+bool (*rangeFilterFunc_i16[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_i16_ee,
+  rangeFilter_i16_ie,
+  rangeFilter_i16_ei,
+  rangeFilter_i16_ii,
+};
+
+bool (*rangeFilterFunc_i32[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_i32_ee,
+  rangeFilter_i32_ie,
+  rangeFilter_i32_ei,
+  rangeFilter_i32_ii,
+};
+
+bool (*rangeFilterFunc_i64[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_i64_ee,
+  rangeFilter_i64_ie,
+  rangeFilter_i64_ei,
+  rangeFilter_i64_ii,
+};
+
+bool (*rangeFilterFunc_ds[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_ds_ee,
+  rangeFilter_ds_ie,
+  rangeFilter_ds_ei,
+  rangeFilter_ds_ii,
+};
+
+bool (*rangeFilterFunc_dd[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
+  NULL,
+  rangeFilter_dd_ee,
+  rangeFilter_dd_ie,
+  rangeFilter_dd_ei,
+  rangeFilter_dd_ii,
+};
+
+__filter_func_t* getRangeFilterFuncArray(int32_t type) {
+  switch(type) {
+    case TSDB_DATA_TYPE_BOOL:       return rangeFilterFunc_i8;
+    case TSDB_DATA_TYPE_TINYINT:    return rangeFilterFunc_i8;
+    case TSDB_DATA_TYPE_SMALLINT:   return rangeFilterFunc_i16;
+    case TSDB_DATA_TYPE_INT:        return rangeFilterFunc_i32;
+    case TSDB_DATA_TYPE_TIMESTAMP:  //timestamp uses bigint filter
+    case TSDB_DATA_TYPE_BIGINT:     return rangeFilterFunc_i64;
+    case TSDB_DATA_TYPE_FLOAT:      return rangeFilterFunc_ds;
+    case TSDB_DATA_TYPE_DOUBLE:     return rangeFilterFunc_dd;
+    default:return NULL;
+  }
+}
+
+__filter_func_t* getValueFilterFuncArray(int32_t type) {
+  switch(type) {
+    case TSDB_DATA_TYPE_BOOL:       return filterFunc_i8;
+    case TSDB_DATA_TYPE_TINYINT:    return filterFunc_i8;
+    case TSDB_DATA_TYPE_SMALLINT:   return filterFunc_i16;
+    case TSDB_DATA_TYPE_INT:        return filterFunc_i32;
+    case TSDB_DATA_TYPE_TIMESTAMP:  //timestamp uses bigint filter
+    case TSDB_DATA_TYPE_BIGINT:     return filterFunc_i64;
+    case TSDB_DATA_TYPE_FLOAT:      return filterFunc_ds;
+    case TSDB_DATA_TYPE_DOUBLE:     return filterFunc_dd;
+    case TSDB_DATA_TYPE_BINARY:     return filterFunc_str;
+    case TSDB_DATA_TYPE_NCHAR:      return filterFunc_nchar;
+    default: return NULL;
+  }
+}
diff --git a/src/query/src/qHistogram.c b/src/query/src/qHistogram.c
new file mode 100644
index 0000000000000000000000000000000000000000..703ee2c52129a067d1070cfbe567087ec48a7a6e
--- /dev/null
+++ b/src/query/src/qHistogram.c
@@ -0,0 +1,664 @@
+/*
+ * 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 "os.h"
+
+#include "qHistogram.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tlosertree.h"
+
+/**
+ *
+ * implement the histogram and percentile_approx based on the paper:
+ * Yael Ben-Haim, Elad Tom-Tov. A Streaming Parallel Decision Tree Algorithm,
+ * The Journal of Machine Learning Research.Volume 11, 3/1/2010 pp.849-872
+ * https://dl.acm.org/citation.cfm?id=1756034
+ *
+ * @data 2018-12-14
+ * @version 0.1
+ *
+ */
+
+// SHeapEntry* tHeapCreate(int32_t numOfEntries) {
+//    SHeapEntry* pEntry = calloc(1, sizeof(SHeapEntry)*(numOfEntries + 1));
+//    return pEntry;
+//}
+//
+// int32_t tHeapPut(SHeapEntry* pEntry, int32_t maxSize, int32_t num, void*
+// pData, double v) {
+//    pEntry[num].val = v;
+//    pEntry[num].pData = pData;
+//
+//    return num;
+//}
+//
+////min heap
+// void tHeapAdjust(SHeapEntry* pEntry, int32_t index, int32_t len) {
+//    SHeapEntry* ptr = NULL;
+//
+//    int32_t end = len - 1;
+//
+//    SHeapEntry p1 = pEntry[index];
+//    int32_t next = index;
+//
+//    for(int32_t i=index; i<=(end-1)/2; ) {
+//        int32_t lc = (i<<1) + 1;
+//        int32_t rc = (i+1) << 1;
+//
+//        ptr = &pEntry[lc];
+//        next = lc;
+//
+//        if (rc < len && (pEntry[lc].val > pEntry[rc].val)) {
+//            ptr = &pEntry[rc];
+//            next = rc;
+//        }
+//
+//        if (p1.val < ptr->val) {
+//            next = i;
+//            break;
+//        }
+//        pEntry[i] = *ptr;
+//        tSkipListNode* pnode = (tSkipListNode*) pEntry[i].pData;
+//        if(pnode != NULL) {
+//            ((SHistBin*) pnode->pData)->index = i;
+//        }
+//
+//        i = next;
+//    }
+//
+//    pEntry[next] = p1;
+//
+//    tSkipListNode* pnode = (tSkipListNode*) p1.pData;
+//    if (pnode != NULL) {
+//        ((SHistBin*) pnode->pData)->index = next;
+//    }
+//}
+//
+// void tHeapSort(SHeapEntry* pEntry, int32_t len) {
+//    int32_t last = len/2 - 1;
+//
+//    for(int32_t i=last; i >= 0; --i) {
+//        tHeapAdjust(pEntry, i, len);
+//    }
+//}
+
+// typedef struct SInsertSupporter {
+//    int32_t         numOfEntries;
+//    tSkipList*      pSkipList;
+//    SLoserTreeInfo* pTree;
+//} SInsertSupporter;
+//
+// int32_t compare(const void* pleft, const void* pright, void* param) {
+//    SLoserTreeNode* left = (SLoserTreeNode*) pleft;
+//    SLoserTreeNode* right = (SLoserTreeNode *)pright;
+//
+//    SInsertSupporter* pss = (SInsertSupporter*) param;
+//
+//    tSkipListNode* pLeftNode = (tSkipListNode*) left->pData;
+//    tSkipListNode* pRightNode = (tSkipListNode*) right->pData;
+//
+//    SHistBin* pLeftBin = (SHistBin*)pLeftNode->pData;
+//    SHistBin* pRightBin = (SHistBin*)pRightNode->pData;
+//
+//    if (pLeftBin->delta == pRightBin->delta) {
+//        return 0;
+//    } else {
+//        return ((pLeftBin->delta < pRightBin->delta)? -1:1);
+//    }
+//}
+
+static int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val);
+
+SHistogramInfo* tHistogramCreate(int32_t numOfEntries) {
+  /* need one redundant slot */
+  SHistogramInfo* pHisto = malloc(sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfEntries + 1));
+
+#if !defined(USE_ARRAYLIST)
+  pHisto->pList = SSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
+  SInsertSupporter* pss = malloc(sizeof(SInsertSupporter));
+  pss->numOfEntries = pHisto->maxEntries;
+  pss->pSkipList = pHisto->pList;
+
+  int32_t ret = tLoserTreeCreate1(&pHisto->pLoserTree, numOfEntries, pss, compare);
+  pss->pTree = pHisto->pLoserTree;
+#endif
+
+  return tHistogramCreateFrom(pHisto, numOfEntries);
+}
+
+SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins) {
+  memset(pBuf, 0, sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfBins + 1));
+
+  SHistogramInfo* pHisto = (SHistogramInfo*)pBuf;
+  pHisto->elems = (SHistBin*)((char*)pBuf + sizeof(SHistogramInfo));
+
+  pHisto->maxEntries = numOfBins;
+
+  pHisto->min = DBL_MAX;
+  pHisto->max = -DBL_MAX;
+
+  return pBuf;
+}
+
+int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
+  if (*pHisto == NULL) {
+    *pHisto = tHistogramCreate(MAX_HISTOGRAM_BIN);
+  }
+
+#if defined(USE_ARRAYLIST)
+  int32_t idx = vnodeHistobinarySearch((*pHisto)->elems, (*pHisto)->numOfEntries, val);
+  assert(idx >= 0 && idx <= (*pHisto)->maxEntries);
+
+  if ((*pHisto)->elems[idx].val == val && idx >= 0) {
+    (*pHisto)->elems[idx].num += 1;
+
+    if ((*pHisto)->numOfEntries == 0) {
+      (*pHisto)->numOfEntries += 1;
+    }
+  } else { /* insert a new slot */
+    if ((*pHisto)->numOfElems > 1 && idx < (*pHisto)->numOfEntries) {
+      if (idx > 0) {
+        assert((*pHisto)->elems[idx - 1].val <= val);
+      }
+
+      assert((*pHisto)->elems[idx].val > val);
+    } else {
+      assert((*pHisto)->elems[(*pHisto)->numOfEntries].val < val);
+    }
+
+    histogramCreateBin(*pHisto, idx, val);
+  }
+#else
+  tSkipListKey key = tSkipListCreateKey(TSDB_DATA_TYPE_DOUBLE, &val, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+  SHistBin*    entry = calloc(1, sizeof(SHistBin));
+  entry->val = val;
+
+  tSkipListNode* pResNode = SSkipListPut((*pHisto)->pList, entry, &key, 0);
+
+  SHistBin* pEntry1 = (SHistBin*)pResNode->pData;
+  pEntry1->index = -1;
+
+  tSkipListNode* pLast = NULL;
+
+  if (pEntry1->num == 0) { /* it is a new node */
+    (*pHisto)->numOfEntries += 1;
+    pEntry1->num += 1;
+
+    /* number of entries reaches the upper limitation */
+    if (pResNode->pForward[0] != NULL) {
+      /* we need to update the last updated slot in loser tree*/
+      pEntry1->delta = ((SHistBin*)pResNode->pForward[0]->pData)->val - val;
+
+      if ((*pHisto)->ordered) {
+        int32_t         lastIndex = (*pHisto)->maxIndex;
+        SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
+
+        (*pHisto)->pLoserTree->pNode[lastIndex + pTree->numOfEntries].pData = pResNode;
+        pEntry1->index = (*pHisto)->pLoserTree->pNode[lastIndex + pTree->numOfEntries].index;
+
+        // update the loser tree
+        if ((*pHisto)->ordered) {
+          tLoserTreeAdjust(pTree, pEntry1->index + pTree->numOfEntries);
+        }
+
+        tSkipListKey kx =
+            tSkipListCreateKey(TSDB_DATA_TYPE_DOUBLE, &(*pHisto)->max, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        pLast = tSkipListGetOne((*pHisto)->pList, &kx);
+      }
+    } else {
+      /* this node located at the last position of the skiplist, we do not
+       * update the loser-tree */
+      pEntry1->delta = DBL_MAX;
+      pLast = pResNode;
+    }
+
+    if (pResNode->pBackward[0] != &(*pHisto)->pList->pHead) {
+      SHistBin* pPrevEntry = (SHistBin*)pResNode->pBackward[0]->pData;
+      pPrevEntry->delta = val - pPrevEntry->val;
+
+      SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
+      if ((*pHisto)->ordered) {
+        tLoserTreeAdjust(pTree, pPrevEntry->index + pTree->numOfEntries);
+        tLoserTreeDisplay(pTree);
+      }
+    }
+
+    if ((*pHisto)->numOfEntries >= (*pHisto)->maxEntries + 1) {
+      // set the right value for loser-tree
+      assert((*pHisto)->pLoserTree != NULL);
+      if (!(*pHisto)->ordered) {
+        SSkipListPrint((*pHisto)->pList, 1);
+
+        SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
+        tSkipListNode*  pHead = (*pHisto)->pList->pHead.pForward[0];
+
+        tSkipListNode* p1 = pHead;
+
+        printf("\n");
+        while (p1 != NULL) {
+          printf("%f\t", ((SHistBin*)(p1->pData))->delta);
+          p1 = p1->pForward[0];
+        }
+        printf("\n");
+
+        /* last one in skiplist is ignored */
+        for (int32_t i = pTree->numOfEntries; i < pTree->totalEntries; ++i) {
+          pTree->pNode[i].pData = pHead;
+          pTree->pNode[i].index = i - pTree->numOfEntries;
+          SHistBin* pBin = (SHistBin*)pHead->pData;
+          pBin->index = pTree->pNode[i].index;
+
+          pHead = pHead->pForward[0];
+        }
+
+        pLast = pHead;
+
+        for (int32_t i = 0; i < pTree->numOfEntries; ++i) {
+          pTree->pNode[i].index = -1;
+        }
+
+        tLoserTreeDisplay(pTree);
+
+        for (int32_t i = pTree->totalEntries - 1; i >= pTree->numOfEntries; i--) {
+          tLoserTreeAdjust(pTree, i);
+        }
+
+        tLoserTreeDisplay(pTree);
+        (*pHisto)->ordered = true;
+      }
+
+      printf("delta is:%lf\n", pEntry1->delta);
+
+      SSkipListPrint((*pHisto)->pList, 1);
+
+      /* the chosen node */
+      tSkipListNode* pNode = (*pHisto)->pLoserTree->pNode[0].pData;
+      SHistBin*      pEntry = (SHistBin*)pNode->pData;
+
+      tSkipListNode* pNext = pNode->pForward[0];
+      SHistBin*      pNextEntry = (SHistBin*)pNext->pData;
+      assert(pNextEntry->val - pEntry->val == pEntry->delta);
+
+      double newVal = (pEntry->val * pEntry->num + pNextEntry->val * pNextEntry->num) / (pEntry->num + pNextEntry->num);
+      pEntry->val = newVal;
+      pNode->key.dKey = newVal;
+      pEntry->num = pEntry->num + pNextEntry->num;
+
+      // update delta value in current node
+      pEntry->delta = (pNextEntry->delta + pNextEntry->val) - pEntry->val;
+
+      // reset delta value in the previous node
+      SHistBin* pPrevEntry = (SHistBin*)pNode->pBackward[0]->pData;
+      if (pPrevEntry) {
+        pPrevEntry->delta = pEntry->val - pPrevEntry->val;
+      }
+
+      SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
+      if (pNextEntry->index != -1) {
+        (*pHisto)->maxIndex = pNextEntry->index;
+
+        // set the last element in skiplist, of which delta is FLT_MAX;
+        pTree->pNode[pNextEntry->index + pTree->numOfEntries].pData = pLast;
+        ((SHistBin*)pLast->pData)->index = pNextEntry->index;
+        int32_t f = pTree->pNode[pNextEntry->index + pTree->numOfEntries].index;
+        printf("disappear index is:%d\n", f);
+      }
+
+      tLoserTreeAdjust(pTree, pEntry->index + pTree->numOfEntries);
+      // remove the next node in skiplist
+      tSkipListRemoveNode((*pHisto)->pList, pNext);
+      SSkipListPrint((*pHisto)->pList, 1);
+
+      tLoserTreeDisplay((*pHisto)->pLoserTree);
+    } else {  // add to heap
+      if (pResNode->pForward[0] != NULL) {
+        pEntry1->delta = ((SHistBin*)pResNode->pForward[0]->pData)->val - val;
+      } else {
+        pEntry1->delta = DBL_MAX;
+      }
+
+      if (pResNode->pBackward[0] != &(*pHisto)->pList->pHead) {
+        SHistBin* pPrevEntry = (SHistBin*)pResNode->pBackward[0]->pData;
+        pEntry1->delta = val - pPrevEntry->val;
+      }
+
+      printf("delta is:%9lf\n", pEntry1->delta);
+    }
+
+  } else {
+    SHistBin* pEntry = (SHistBin*)pResNode->pData;
+    assert(pEntry->val == val);
+    pEntry->num += 1;
+  }
+
+#endif
+  if (val > (*pHisto)->max) {
+    (*pHisto)->max = val;
+  }
+
+  if (val < (*pHisto)->min) {
+    (*pHisto)->min = val;
+  }
+
+  (*pHisto)->numOfElems += 1;
+  return 0;
+}
+
+int32_t vnodeHistobinarySearch(SHistBin* pEntry, int32_t len, double val) {
+  int32_t end = len - 1;
+  int32_t start = 0;
+
+  while (start <= end) {
+    int32_t mid = (end - start) / 2 + start;
+    if (pEntry[mid].val == val) {
+      return mid;
+    }
+
+    if (pEntry[mid].val < val) {
+      start = mid + 1;
+    } else {
+      end = mid - 1;
+    }
+  }
+
+  int32_t ret = start > end ? start : end;
+  if (ret < 0) {
+    return 0;
+  } else {
+    return ret;
+  }
+}
+
+static void histogramMergeImpl(SHistBin* pHistBin, int32_t* size) {
+#if defined(USE_ARRAYLIST)
+  int32_t oldSize = *size;
+
+  double  delta = DBL_MAX;
+  int32_t index = -1;
+  for (int32_t i = 1; i < oldSize; ++i) {
+    double d = pHistBin[i].val - pHistBin[i - 1].val;
+    if (d < delta) {
+      delta = d;
+      index = i - 1;
+    }
+  }
+
+  SHistBin* s1 = &pHistBin[index];
+  SHistBin* s2 = &pHistBin[index + 1];
+
+  double newVal = (s1->val * s1->num + s2->val * s2->num) / (s1->num + s2->num);
+  s1->val = newVal;
+  s1->num = s1->num + s2->num;
+
+  memmove(&pHistBin[index + 1], &pHistBin[index + 2], (oldSize - index - 2) * sizeof(SHistBin));
+  (*size) -= 1;
+#endif
+}
+
+/* optimize this procedure */
+int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
+#if defined(USE_ARRAYLIST)
+  int32_t remain = pHisto->numOfEntries - index;
+  if (remain > 0) {
+    memmove(&pHisto->elems[index + 1], &pHisto->elems[index], sizeof(SHistBin) * remain);
+  }
+
+  assert(index >= 0 && index <= pHisto->maxEntries);
+
+  pHisto->elems[index].num = 1;
+  pHisto->elems[index].val = val;
+  pHisto->numOfEntries += 1;
+
+  /* we need to merge the slot */
+  if (pHisto->numOfEntries == pHisto->maxEntries + 1) {
+    histogramMergeImpl(pHisto->elems, &pHisto->numOfEntries);
+
+    pHisto->elems[pHisto->maxEntries].val = 0;
+    pHisto->elems[pHisto->maxEntries].num = 0;
+  }
+#endif
+  assert(pHisto->numOfEntries <= pHisto->maxEntries);
+  return 0;
+}
+
+void tHistogramDestroy(SHistogramInfo** pHisto) {
+  if (*pHisto == NULL) {
+    return;
+  }
+
+  free(*pHisto);
+  *pHisto = NULL;
+}
+
+void tHistogramPrint(SHistogramInfo* pHisto) {
+  printf("total entries: %d, elements: %d\n", pHisto->numOfEntries, pHisto->numOfElems);
+#if defined(USE_ARRAYLIST)
+  for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
+    printf("%d: (%f, %" PRId64 ")\n", i + 1, pHisto->elems[i].val, pHisto->elems[i].num);
+  }
+#else
+  tSkipListNode* pNode = pHisto->pList->pHead.pForward[0];
+
+  for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
+    SHistBin* pEntry = (SHistBin*)pNode->pData;
+    printf("%d: (%f, %" PRId64 ")\n", i + 1, pEntry->val, pEntry->num);
+    pNode = pNode->pForward[0];
+  }
+#endif
+}
+
+/**
+ * Estimated number of points in the interval (−inf,b].
+ * @param pHisto
+ * @param v
+ */
+int64_t tHistogramSum(SHistogramInfo* pHisto, double v) {
+#if defined(USE_ARRAYLIST)
+  int32_t slotIdx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, v);
+  if (pHisto->elems[slotIdx].val != v) {
+    slotIdx -= 1;
+
+    if (slotIdx < 0) {
+      slotIdx = 0;
+      assert(v <= pHisto->elems[slotIdx].val);
+    } else {
+      assert(v >= pHisto->elems[slotIdx].val);
+
+      if (slotIdx + 1 < pHisto->numOfEntries) {
+        assert(v < pHisto->elems[slotIdx + 1].val);
+      }
+    }
+  }
+
+  double m1 = (double)pHisto->elems[slotIdx].num;
+  double v1 = pHisto->elems[slotIdx].val;
+
+  double m2 = (double)pHisto->elems[slotIdx + 1].num;
+  double v2 = pHisto->elems[slotIdx + 1].val;
+
+  double estNum = m1 + (m2 - m1) * (v - v1) / (v2 - v1);
+  double s1 = (m1 + estNum) * (v - v1) / (2 * (v2 - v1));
+
+  for (int32_t i = 0; i < slotIdx; ++i) {
+    s1 += pHisto->elems[i].num;
+  }
+
+  s1 = s1 + m1 / 2;
+
+  return (int64_t)s1;
+#endif
+}
+
+double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
+#if defined(USE_ARRAYLIST)
+  double* pVal = malloc(num * sizeof(double));
+
+  for (int32_t i = 0; i < num; ++i) {
+    double numOfElem = (ratio[i] / 100) * pHisto->numOfElems;
+
+    if (numOfElem == 0) {
+      pVal[i] = pHisto->min;
+      continue;
+    } else if (numOfElem <= pHisto->elems[0].num) {
+      pVal[i] = pHisto->elems[0].val;
+      continue;
+    } else if (numOfElem == pHisto->numOfElems) {
+      pVal[i] = pHisto->max;
+      continue;
+    }
+
+    int32_t j = 0;
+    int64_t total = 0;
+
+    while (j < pHisto->numOfEntries) {
+      total += pHisto->elems[j].num;
+      if (total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem) {
+        break;
+      }
+
+      j += 1;
+    }
+
+    assert(total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem);
+
+    double delta = numOfElem - total;
+    if (fabs(delta) < FLT_EPSILON) {
+      pVal[i] = pHisto->elems[j].val;
+    }
+
+    double start = (double)pHisto->elems[j].num;
+    double range = pHisto->elems[j + 1].num - start;
+
+    if (range == 0) {
+      pVal[i] = (pHisto->elems[j + 1].val - pHisto->elems[j].val) * delta / start + pHisto->elems[j].val;
+    } else {
+      double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
+      pVal[i] = pHisto->elems[j].val + (pHisto->elems[j + 1].val - pHisto->elems[j].val) * factor;
+    }
+  }
+#else
+  double* pVal = malloc(num * sizeof(double));
+
+  for (int32_t i = 0; i < num; ++i) {
+    double numOfElem = ratio[i] * pHisto->numOfElems;
+
+    tSkipListNode* pFirst = pHisto->pList->pHead.pForward[0];
+    SHistBin*      pEntry = (SHistBin*)pFirst->pData;
+    if (numOfElem == 0) {
+      pVal[i] = pHisto->min;
+      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
+      continue;
+    } else if (numOfElem <= pEntry->num) {
+      pVal[i] = pEntry->val;
+      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
+      continue;
+    } else if (numOfElem == pHisto->numOfElems) {
+      pVal[i] = pHisto->max;
+      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
+      continue;
+    }
+
+    int32_t   j = 0;
+    int64_t   total = 0;
+    SHistBin* pPrev = pEntry;
+
+    while (j < pHisto->numOfEntries) {
+      if (total <= numOfElem && total + pEntry->num > numOfElem) {
+        break;
+      }
+
+      total += pEntry->num;
+      pPrev = pEntry;
+
+      pFirst = pFirst->pForward[0];
+      pEntry = (SHistBin*)pFirst->pData;
+
+      j += 1;
+    }
+
+    assert(total <= numOfElem && total + pEntry->num > numOfElem);
+
+    double delta = numOfElem - total;
+    if (fabs(delta) < FLT_EPSILON) {
+      //                printf("i/numofSlot: %f, v:%f, %f\n",
+      //                (double)i/numOfSlots, numOfElem, pHisto->elems[j].val);
+      pVal[i] = pPrev->val;
+    }
+
+    double start = pPrev->num;
+    double range = pEntry->num - start;
+
+    if (range == 0) {
+      pVal[i] = (pEntry->val - pPrev->val) * delta / start + pPrev->val;
+    } else {
+      double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
+      pVal[i] = pPrev->val + (pEntry->val - pPrev->val) * factor;
+    }
+    //            printf("i/numofSlot: %f, v:%f, %f\n", (double)i/numOfSlots,
+    //            numOfElem, val);
+  }
+#endif
+  return pVal;
+}
+
+SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries) {
+  SHistogramInfo* pResHistogram = tHistogramCreate(numOfEntries);
+
+  // error in histogram info
+  if (pHisto1->numOfEntries > MAX_HISTOGRAM_BIN || pHisto2->numOfEntries > MAX_HISTOGRAM_BIN) {
+    return pResHistogram;
+  }
+
+  SHistBin* pHistoBins = calloc(1, sizeof(SHistBin) * (pHisto1->numOfEntries + pHisto2->numOfEntries));
+  int32_t i = 0, j = 0, k = 0;
+
+  while (i < pHisto1->numOfEntries && j < pHisto2->numOfEntries) {
+    if (pHisto1->elems[i].val < pHisto2->elems[j].val) {
+      pHistoBins[k++] = pHisto1->elems[i++];
+    } else if (pHisto1->elems[i].val > pHisto2->elems[j].val) {
+      pHistoBins[k++] = pHisto2->elems[j++];
+    } else {
+      pHistoBins[k] = pHisto1->elems[i++];
+      pHistoBins[k++].num += pHisto2->elems[j++].num;
+    }
+  }
+
+  if (i < pHisto1->numOfEntries) {
+    int32_t remain = pHisto1->numOfEntries - i;
+    memcpy(&pHistoBins[k], &pHisto1->elems[i], sizeof(SHistBin) * remain);
+    k += remain;
+  }
+
+  if (j < pHisto2->numOfEntries) {
+    int32_t remain = pHisto2->numOfEntries - j;
+    memcpy(&pHistoBins[k], &pHisto2->elems[j], sizeof(SHistBin) * remain);
+    k += remain;
+  }
+
+  /* update other information */
+  pResHistogram->numOfElems = pHisto1->numOfElems + pHisto2->numOfElems;
+  pResHistogram->min = (pHisto1->min < pHisto2->min) ? pHisto1->min : pHisto2->min;
+  pResHistogram->max = (pHisto1->max > pHisto2->max) ? pHisto1->max : pHisto2->max;
+
+  while (k > numOfEntries) {
+    histogramMergeImpl(pHistoBins, &k);
+  }
+
+  pResHistogram->numOfEntries = k;
+  memcpy(pResHistogram->elems, pHistoBins, sizeof(SHistBin) * k);
+
+  free(pHistoBins);
+  return pResHistogram;
+}
\ No newline at end of file
diff --git a/src/query/src/qParserImpl.c b/src/query/src/qParserImpl.c
new file mode 100644
index 0000000000000000000000000000000000000000..33237a58c2096f7c87b890863723318fe487ff32
--- /dev/null
+++ b/src/query/src/qParserImpl.c
@@ -0,0 +1,893 @@
+/*
+ * 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 "os.h"
+#include "qSqlparser.h"
+#include "queryLog.h"
+#include "taosdef.h"
+#include "taosmsg.h"
+#include "tcmdtype.h"
+#include "tglobal.h"
+#include "tstoken.h"
+#include "tstrbuild.h"
+#include "ttokendef.h"
+#include "tutil.h"
+
+SSqlInfo qSQLParse(const char *pStr) {
+  void *pParser = ParseAlloc(malloc);
+
+  SSqlInfo sqlInfo = {0};
+  sqlInfo.valid = true;
+
+  int32_t i = 0;
+  while (1) {
+    SStrToken t0 = {0};
+
+    if (pStr[i] == 0) {
+      Parse(pParser, 0, t0, &sqlInfo);
+      goto abort_parse;
+    }
+
+    t0.n = tSQLGetToken((char *)&pStr[i], &t0.type);
+    t0.z = (char *)(pStr + i);
+    i += t0.n;
+
+    switch (t0.type) {
+      case TK_SPACE:
+      case TK_COMMENT: {
+        break;
+      }
+      case TK_SEMI: {
+        Parse(pParser, 0, t0, &sqlInfo);
+        goto abort_parse;
+      }
+      
+      case TK_QUESTION:
+      case TK_ILLEGAL: {
+        snprintf(sqlInfo.pzErrMsg, tListLen(sqlInfo.pzErrMsg), "unrecognized token: \"%s\"", t0.z);
+        sqlInfo.valid = false;
+        goto abort_parse;
+      }
+      default:
+        Parse(pParser, t0.type, t0, &sqlInfo);
+        if (sqlInfo.valid == false) {
+          goto abort_parse;
+        }
+    }
+  }
+
+abort_parse:
+  ParseFree(pParser, free);
+  return sqlInfo;
+}
+
+tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pToken) {
+  if (pList == NULL) {
+    pList = calloc(1, sizeof(tSQLExprList));
+  }
+
+  if (pList->nAlloc <= pList->nExpr) {
+    pList->nAlloc = (pList->nAlloc << 1) + 4;
+    pList->a = realloc(pList->a, pList->nAlloc * sizeof(pList->a[0]));
+    if (pList->a == 0) {
+      pList->nExpr = pList->nAlloc = 0;
+      return pList;
+    }
+  }
+  assert(pList->a != 0);
+
+  if (pNode || pToken) {
+    struct tSQLExprItem *pItem = &pList->a[pList->nExpr++];
+    memset(pItem, 0, sizeof(*pItem));
+    pItem->pNode = pNode;
+    if (pToken) {  // set the as clause
+      pItem->aliasName = malloc(pToken->n + 1);
+      strncpy(pItem->aliasName, pToken->z, pToken->n);
+      pItem->aliasName[pToken->n] = 0;
+
+      strdequote(pItem->aliasName);
+    }
+  }
+  return pList;
+}
+
+void tSQLExprListDestroy(tSQLExprList *pList) {
+  if (pList == NULL) return;
+
+  for (int32_t i = 0; i < pList->nExpr; ++i) {
+    if (pList->a[i].aliasName != NULL) {
+      free(pList->a[i].aliasName);
+    }
+    tSQLExprDestroy(pList->a[i].pNode);
+  }
+
+  free(pList->a);
+  free(pList);
+}
+
+tSQLExpr *tSQLExprIdValueCreate(SStrToken *pToken, int32_t optrType) {
+  tSQLExpr *pSQLExpr = calloc(1, sizeof(tSQLExpr));
+
+  if (pToken != NULL) {
+    pSQLExpr->token = *pToken;
+  }
+
+  if (optrType == TK_INTEGER || optrType == TK_STRING || optrType == TK_FLOAT || optrType == TK_BOOL) {
+    toTSDBType(pToken->type);
+
+    tVariantCreate(&pSQLExpr->val, pToken);
+    pSQLExpr->nSQLOptr = optrType;
+  } else if (optrType == TK_NOW) {
+    // default use microsecond
+    pSQLExpr->val.i64Key = taosGetTimestamp(TSDB_TIME_PRECISION_MICRO);
+    pSQLExpr->val.nType = TSDB_DATA_TYPE_BIGINT;
+    pSQLExpr->nSQLOptr = TK_TIMESTAMP;  // TK_TIMESTAMP used to denote the time value is in microsecond
+  } else if (optrType == TK_VARIABLE) {
+    int32_t ret = parseAbsoluteDuration(pToken->z, pToken->n, &pSQLExpr->val.i64Key);
+    UNUSED(ret);
+
+    pSQLExpr->val.nType = TSDB_DATA_TYPE_BIGINT;
+    pSQLExpr->nSQLOptr = TK_TIMESTAMP;
+  } else {  // it must be the column name (tk_id) if it is not the number
+    assert(optrType == TK_ID || optrType == TK_ALL);
+    if (pToken != NULL) {
+      pSQLExpr->colInfo = *pToken;
+    }
+
+    pSQLExpr->nSQLOptr = optrType;
+  }
+  return pSQLExpr;
+}
+
+/*
+ * pList is the parameters for function with id(optType)
+ * function name is denoted by pFunctionToken
+ */
+tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SStrToken *pFuncToken, SStrToken *endToken, int32_t optType) {
+  if (pFuncToken == NULL) return NULL;
+
+  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+  pExpr->nSQLOptr = optType;
+  pExpr->pParam = pList;
+
+  int32_t len = (int32_t)((endToken->z + endToken->n) - pFuncToken->z);
+  pExpr->operand.z = pFuncToken->z;
+
+  pExpr->operand.n = len;  // raw field name
+  pExpr->operand.type = pFuncToken->type;
+
+  pExpr->token = pExpr->operand;
+  return pExpr;
+}
+
+/*
+ * create binary expression in this procedure
+ * if the expr is arithmetic, calculate the result and set it to tSQLExpr Object
+ */
+tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
+  tSQLExpr *pExpr = calloc(1, sizeof(tSQLExpr));
+
+  if (pLeft != NULL && pRight != NULL && (optrType != TK_IN)) {
+    char* endPos = pRight->token.z + pRight->token.n;
+    pExpr->token.z = pLeft->token.z;
+    pExpr->token.n = (uint32_t)(endPos - pExpr->token.z);
+    pExpr->token.type = pLeft->token.type;
+  }
+
+  if (optrType == TK_PLUS || optrType == TK_MINUS || optrType == TK_STAR || optrType == TK_DIVIDE || optrType == TK_REM) {
+    /*
+     * if a token is noted as the TK_TIMESTAMP, the time precision is microsecond
+     * Otherwise, the time precision is adaptive, determined by the time precision from databases.
+     */
+    if ((pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_INTEGER) ||
+        (pLeft->nSQLOptr == TK_TIMESTAMP && pRight->nSQLOptr == TK_TIMESTAMP)) {
+      pExpr->val.nType = TSDB_DATA_TYPE_BIGINT;
+      pExpr->nSQLOptr = pLeft->nSQLOptr;
+
+      switch (optrType) {
+        case TK_PLUS: {
+          pExpr->val.i64Key = pLeft->val.i64Key + pRight->val.i64Key;
+          break;
+        }
+        case TK_MINUS: {
+          pExpr->val.i64Key = pLeft->val.i64Key - pRight->val.i64Key;
+          break;
+        }
+        case TK_STAR: {
+          pExpr->val.i64Key = pLeft->val.i64Key * pRight->val.i64Key;
+          break;
+        }
+        case TK_DIVIDE: {
+          pExpr->nSQLOptr = TK_FLOAT;
+          pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
+          pExpr->val.dKey = (double)pLeft->val.i64Key / pRight->val.i64Key;
+          break;
+        }
+        case TK_REM: {
+          pExpr->val.i64Key = pLeft->val.i64Key % pRight->val.i64Key;
+          break;
+        }
+      }
+
+      tSQLExprDestroy(pLeft);
+      tSQLExprDestroy(pRight);
+
+    } else if ((pLeft->val.nType == TSDB_DATA_TYPE_DOUBLE && pRight->val.nType == TSDB_DATA_TYPE_BIGINT) ||
+               (pRight->val.nType == TSDB_DATA_TYPE_DOUBLE && pLeft->val.nType == TSDB_DATA_TYPE_BIGINT)) {
+      pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
+      pExpr->nSQLOptr = TK_FLOAT;
+
+      double left = pLeft->val.nType == TSDB_DATA_TYPE_DOUBLE ? pLeft->val.dKey : pLeft->val.i64Key;
+      double right = pRight->val.nType == TSDB_DATA_TYPE_DOUBLE ? pRight->val.dKey : pRight->val.i64Key;
+
+      switch (optrType) {
+        case TK_PLUS: {
+          pExpr->val.dKey = left + right;
+          break;
+        }
+        case TK_MINUS: {
+          pExpr->val.dKey = left - right;
+          break;
+        }
+        case TK_STAR: {
+          pExpr->val.dKey = left * right;
+          break;
+        }
+        case TK_DIVIDE: {
+          pExpr->val.dKey = left / right;
+          break;
+        }
+        case TK_REM: {
+          pExpr->val.dKey = left - ((int64_t)(left / right)) * right;
+          break;
+        }
+      }
+
+      tSQLExprDestroy(pLeft);
+      tSQLExprDestroy(pRight);
+
+    } else {
+      pExpr->nSQLOptr = optrType;
+      pExpr->pLeft = pLeft;
+      pExpr->pRight = pRight;
+    }
+  } else if (optrType == TK_IN) {
+    pExpr->nSQLOptr = optrType;
+    pExpr->pLeft = pLeft;
+
+    tSQLExpr *pRSub = calloc(1, sizeof(tSQLExpr));
+    pRSub->nSQLOptr = TK_SET;  // TODO refactor .....
+    pRSub->pParam = (tSQLExprList *)pRight;
+
+    pExpr->pRight = pRSub;
+  } else {
+    pExpr->nSQLOptr = optrType;
+    pExpr->pLeft = pLeft;
+
+    if (pRight == NULL) {
+      pRight = calloc(1, sizeof(tSQLExpr));
+    }
+
+    pExpr->pRight = pRight;
+  }
+
+  return pExpr;
+}
+
+void tSQLExprNodeDestroy(tSQLExpr *pExpr) {
+  if (pExpr == NULL) {
+    return;
+  }
+
+  if (pExpr->nSQLOptr == TK_STRING) {
+    tVariantDestroy(&pExpr->val);
+  }
+
+  tSQLExprListDestroy(pExpr->pParam);
+
+  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;
+
+    void *ptr = realloc(pList->a, newSize * sizeof(pList->a[0]));
+    if (ptr == 0) {
+      return NULL;
+    }
+
+    pList->nAlloc = newSize;
+    pList->a = ptr;
+  }
+
+  assert(pList->a != 0);
+  return pList;
+}
+
+tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder) {
+  if (pList == NULL) {
+    pList = calloc(1, sizeof(tVariantList));
+  }
+
+  if (tVariantListExpand(pList) == NULL) {
+    return pList;
+  }
+
+  if (pVar) {
+    tVariantListItem *pItem = &pList->a[pList->nExpr++];
+    /*
+     * Here we do not employ the assign function, since we need the pz attribute of structure
+     * , which is the point to char string, to free it!
+     *
+     * Otherwise, the original pointer may be lost, which causes memory leak.
+     */
+    memcpy(pItem, pVar, sizeof(tVariant));
+    pItem->sortOrder = sortOrder;
+  }
+  return pList;
+}
+
+tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index) {
+  if (pList == NULL || index >= pList->nExpr) {
+    return tVariantListAppend(NULL, pVar, sortOrder);
+  }
+
+  if (tVariantListExpand(pList) == NULL) {
+    return pList;
+  }
+
+  if (pVar) {
+    memmove(&pList->a[index + 1], &pList->a[index], sizeof(tVariantListItem) * (pList->nExpr - index));
+
+    tVariantListItem *pItem = &pList->a[index];
+    /*
+     * Here we do not employ the assign function, since we need the pz attribute of structure
+     * , which is the point to char string, to free it!
+     *
+     * Otherwise, the original pointer may be lost, which causes memory leak.
+     */
+    memcpy(pItem, pVar, sizeof(tVariant));
+    pItem->sortOrder = sortOrder;
+
+    pList->nExpr++;
+  }
+
+  return pList;
+}
+
+void tVariantListDestroy(tVariantList *pList) {
+  if (pList == NULL) return;
+
+  for (int32_t i = 0; i < pList->nExpr; ++i) {
+    tVariantDestroy(&pList->a[i].pVar);
+  }
+
+  free(pList->a);
+  free(pList);
+}
+
+tVariantList *tVariantListAppendToken(tVariantList *pList, SStrToken *pToken, uint8_t sortOrder) {
+  if (pList == NULL) {
+    pList = calloc(1, sizeof(tVariantList));
+  }
+
+  if (tVariantListExpand(pList) == NULL) {
+    return pList;
+  }
+
+  if (pToken) {
+    tVariant t = {0};
+    tVariantCreate(&t, pToken);
+
+    tVariantListItem *pItem = &pList->a[pList->nExpr++];
+    memcpy(pItem, &t, sizeof(tVariant));
+    pItem->sortOrder = sortOrder;
+  }
+  return pList;
+}
+
+tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField) {
+  if (pList == NULL) pList = calloc(1, sizeof(tFieldList));
+
+  if (pList->nAlloc <= pList->nField) {  //
+    pList->nAlloc = (pList->nAlloc << 1) + 4;
+    pList->p = realloc(pList->p, pList->nAlloc * sizeof(pList->p[0]));
+    if (pList->p == 0) {
+      pList->nField = pList->nAlloc = 0;
+      return pList;
+    }
+  }
+  assert(pList->p != 0);
+
+  if (pField) {
+    struct TAOS_FIELD *pItem = (struct TAOS_FIELD *)&pList->p[pList->nField++];
+    memcpy(pItem, pField, sizeof(TAOS_FIELD));
+  }
+  return pList;
+}
+
+void tFieldListDestroy(tFieldList *pList) {
+  if (pList == NULL) return;
+
+  free(pList->p);
+  free(pList);
+}
+
+void setDBName(SStrToken *pCpxName, SStrToken *pDB) {
+  pCpxName->type = pDB->type;
+  pCpxName->z = pDB->z;
+  pCpxName->n = pDB->n;
+}
+
+void tSQLSetColumnInfo(TAOS_FIELD *pField, SStrToken *pName, TAOS_FIELD *pType) {
+  int32_t maxLen = sizeof(pField->name) / sizeof(pField->name[0]);
+  
+  // truncate the column name
+  if ((int32_t)pName->n >= maxLen) {
+    pName->n = maxLen - 1;
+  }
+
+  strncpy(pField->name, pName->z, pName->n);
+  pField->name[pName->n] = 0;
+
+  pField->type = pType->type;
+  pField->bytes = pType->bytes;
+}
+
+void tSQLSetColumnType(TAOS_FIELD *pField, SStrToken *type) {
+  pField->type = -1;
+
+  int32_t LENGTH_SIZE_OF_STR = 2;  // in case of nchar and binary, there two bytes to keep the length of binary|nchar.
+  
+  for (int8_t i = 0; i < tListLen(tDataTypeDesc); ++i) {
+    if ((strncasecmp(type->z, tDataTypeDesc[i].aName, tDataTypeDesc[i].nameLen) == 0) &&
+        (type->n == tDataTypeDesc[i].nameLen)) {
+      pField->type = i;
+      pField->bytes = tDataTypeDesc[i].nSize;
+
+      if (i == TSDB_DATA_TYPE_NCHAR) {
+        /*
+         * for nchar, the TOKENTYPE is the number of character, so the length is the
+         * number of bytes in UCS-4 format, which is 4 times larger than the
+         * number of characters
+         */
+        if (type->type == 0) {
+          pField->bytes = 0;
+        } else {
+          pField->bytes = -(int32_t)type->type * TSDB_NCHAR_SIZE + LENGTH_SIZE_OF_STR;
+        }
+      } else if (i == TSDB_DATA_TYPE_BINARY) {
+        /* for binary, the TOKENTYPE is the length of binary */
+        if (type->type == 0) {
+          pField->bytes = 0;
+        } else {
+          pField->bytes = -(int32_t) type->type + LENGTH_SIZE_OF_STR;
+        } 
+      }
+      break;
+    }
+  }
+}
+
+/*
+ * extract the select info out of sql string
+ */
+SQuerySQL *tSetQuerySQLElems(SStrToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
+                             tVariantList *pGroupby, tVariantList *pSortOrder, SIntervalVal *pInterval,
+                             SStrToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit) {
+  assert(pSelection != NULL);
+
+  SQuerySQL *pQuery = calloc(1, sizeof(SQuerySQL));
+  pQuery->selectToken = *pSelectToken;
+  pQuery->selectToken.n = (uint32_t)strlen(pQuery->selectToken.z);  // all later sql string are belonged to the stream sql
+
+  pQuery->pSelection = pSelection;
+  pQuery->from = pFrom;
+  pQuery->pGroupby = pGroupby;
+  pQuery->pSortOrder = pSortOrder;
+  pQuery->pWhere = pWhere;
+
+  if (pLimit != NULL) {
+    pQuery->limit = *pLimit;
+  }
+
+  if (pGLimit != NULL) {
+    pQuery->slimit = *pGLimit;
+  }
+
+  if (pInterval != NULL) {
+    pQuery->interval = pInterval->interval;
+    pQuery->offset = pInterval->offset;
+  }
+
+  if (pSliding != NULL) {
+    pQuery->sliding = *pSliding;
+  }
+
+  pQuery->fillType = pFill;
+  return pQuery;
+}
+
+tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList) {
+  if (pList == NULL) pList = calloc(1, sizeof(tSQLExprListList));
+
+  if (pList->nAlloc <= pList->nList) {  //
+    pList->nAlloc = (pList->nAlloc << 1) + 4;
+    pList->a = realloc(pList->a, pList->nAlloc * sizeof(pList->a[0]));
+    if (pList->a == 0) {
+      pList->nList = pList->nAlloc = 0;
+      return pList;
+    }
+  }
+  assert(pList->a != 0);
+
+  if (pExprList) {
+    pList->a[pList->nList++] = pExprList;
+  }
+
+  return pList;
+}
+
+void doDestroyQuerySql(SQuerySQL *pQuerySql) {
+  if (pQuerySql == NULL) {
+    return;
+  }
+  
+  tSQLExprListDestroy(pQuerySql->pSelection);
+  
+  pQuerySql->pSelection = NULL;
+  
+  tSQLExprDestroy(pQuerySql->pWhere);
+  pQuerySql->pWhere = NULL;
+  
+  tVariantListDestroy(pQuerySql->pSortOrder);
+  pQuerySql->pSortOrder = NULL;
+  
+  tVariantListDestroy(pQuerySql->pGroupby);
+  pQuerySql->pGroupby = NULL;
+  
+  tVariantListDestroy(pQuerySql->from);
+  pQuerySql->from = NULL;
+  
+  tVariantListDestroy(pQuerySql->fillType);
+  
+  free(pQuerySql);
+}
+
+void destroyAllSelectClause(SSubclauseInfo *pClause) {
+  if (pClause == NULL || pClause->numOfClause == 0) {
+    return;
+  }
+
+  for(int32_t i = 0; i < pClause->numOfClause; ++i) {
+    SQuerySQL *pQuerySql = pClause->pClause[i];
+    doDestroyQuerySql(pQuerySql);
+  }
+  
+  taosTFree(pClause->pClause);
+}
+
+SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SStrToken *pStableName,
+                                    tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type) {
+  SCreateTableSQL *pCreate = calloc(1, sizeof(SCreateTableSQL));
+
+  switch (type) {
+    case TSQL_CREATE_TABLE: {
+      pCreate->colInfo.pColumns = pCols;
+      assert(pTagVals == NULL && pTags == NULL);
+      break;
+    }
+    case TSQL_CREATE_STABLE: {
+      pCreate->colInfo.pColumns = pCols;
+      pCreate->colInfo.pTagColumns = pTags;
+      assert(pTagVals == NULL && pTags != NULL && pCols != NULL);
+      break;
+    }
+    case TSQL_CREATE_TABLE_FROM_STABLE: {
+      pCreate->usingInfo.pTagVals = pTagVals;
+      pCreate->usingInfo.stableName = *pStableName;
+      break;
+    }
+    case TSQL_CREATE_STREAM: {
+      pCreate->pSelect = pSelect;
+      break;
+    }
+    default:
+      assert(false);
+  }
+
+  pCreate->type = type;
+  return pCreate;
+}
+
+SAlterTableSQL *tAlterTableSQLElems(SStrToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type) {
+  SAlterTableSQL *pAlterTable = calloc(1, sizeof(SAlterTableSQL));
+  
+  pAlterTable->name = *pMeterName;
+  pAlterTable->type = type;
+
+  if (type == TSDB_ALTER_TABLE_ADD_COLUMN || type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
+    pAlterTable->pAddColumns = pCols;
+    assert(pVals == NULL);
+  } else {
+    /*
+     * ALTER_TABLE_TAGS_CHG, ALTER_TABLE_TAGS_SET, ALTER_TABLE_TAGS_DROP,
+     * ALTER_TABLE_DROP_COLUMN
+     */
+    pAlterTable->varList = pVals;
+    assert(pCols == NULL);
+  }
+
+  return pAlterTable;
+}
+
+void SQLInfoDestroy(SSqlInfo *pInfo) {
+  if (pInfo == NULL) return;
+
+  if (pInfo->type == TSDB_SQL_SELECT) {
+    destroyAllSelectClause(&pInfo->subclauseInfo);
+  } else if (pInfo->type == TSDB_SQL_CREATE_TABLE) {
+    SCreateTableSQL *pCreateTableInfo = pInfo->pCreateTableInfo;
+    doDestroyQuerySql(pCreateTableInfo->pSelect);
+
+    tFieldListDestroy(pCreateTableInfo->colInfo.pColumns);
+    tFieldListDestroy(pCreateTableInfo->colInfo.pTagColumns);
+
+    tVariantListDestroy(pCreateTableInfo->usingInfo.pTagVals);
+    taosTFree(pInfo->pCreateTableInfo);
+  } else if (pInfo->type == TSDB_SQL_ALTER_TABLE) {
+    tVariantListDestroy(pInfo->pAlterInfo->varList);
+    tFieldListDestroy(pInfo->pAlterInfo->pAddColumns);
+    
+    taosTFree(pInfo->pAlterInfo);
+  } else {
+    if (pInfo->pDCLInfo != NULL && pInfo->pDCLInfo->nAlloc > 0) {
+      free(pInfo->pDCLInfo->a);
+    }
+
+    if (pInfo->pDCLInfo != NULL && pInfo->type == TSDB_SQL_CREATE_DB) {
+      tVariantListDestroy(pInfo->pDCLInfo->dbOpt.keep);
+    }
+
+    taosTFree(pInfo->pDCLInfo);
+  }
+}
+
+SSubclauseInfo* setSubclause(SSubclauseInfo* pSubclause, void *pSqlExprInfo) {
+  if (pSubclause == NULL) {
+    pSubclause = calloc(1, sizeof(SSubclauseInfo));
+  }
+  
+  int32_t newSize = pSubclause->numOfClause + 1;
+  char* tmp = realloc(pSubclause->pClause, newSize * POINTER_BYTES);
+  if (tmp == NULL) {
+    return pSubclause;
+  }
+  
+  pSubclause->pClause = (SQuerySQL**) tmp;
+  
+  pSubclause->pClause[newSize - 1] = pSqlExprInfo;
+  pSubclause->numOfClause++;
+  
+  return pSubclause;
+}
+
+SSqlInfo* setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SStrToken *pMeterName, int32_t type) {
+  pInfo->type = type;
+  
+  if (type == TSDB_SQL_SELECT) {
+    pInfo->subclauseInfo = *(SSubclauseInfo*) pSqlExprInfo;
+    free(pSqlExprInfo);
+  } else {
+    pInfo->pCreateTableInfo = pSqlExprInfo;
+  }
+  
+  if (pMeterName != NULL) {
+    pInfo->pCreateTableInfo->name = *pMeterName;
+  }
+  
+  return pInfo;
+}
+
+SSubclauseInfo* appendSelectClause(SSubclauseInfo *pQueryInfo, void *pSubclause) {
+  char* tmp = realloc(pQueryInfo->pClause, (pQueryInfo->numOfClause + 1) * POINTER_BYTES);
+  if (tmp == NULL) {  // out of memory
+    return pQueryInfo;
+  }
+  
+  pQueryInfo->pClause = (SQuerySQL**) tmp;
+  pQueryInfo->pClause[pQueryInfo->numOfClause++] = pSubclause;
+  
+  return pQueryInfo;
+}
+
+void setCreatedTableName(SSqlInfo *pInfo, SStrToken *pMeterName, SStrToken *pIfNotExists) {
+  pInfo->pCreateTableInfo->name = *pMeterName;
+  pInfo->pCreateTableInfo->existCheck = (pIfNotExists->n != 0);
+}
+
+void tTokenListBuyMoreSpace(tDCLSQL *pTokenList) {
+  if (pTokenList->nAlloc <= pTokenList->nTokens) {  //
+    pTokenList->nAlloc = (pTokenList->nAlloc << 1) + 4;
+    pTokenList->a = realloc(pTokenList->a, pTokenList->nAlloc * sizeof(pTokenList->a[0]));
+    if (pTokenList->a == 0) {
+      pTokenList->nTokens = pTokenList->nAlloc = 0;
+    }
+  }
+}
+
+tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SStrToken *pToken) {
+  if (pToken == NULL) return NULL;
+
+  if (pTokenList == NULL) pTokenList = calloc(1, sizeof(tDCLSQL));
+
+  tTokenListBuyMoreSpace(pTokenList);
+  pTokenList->a[pTokenList->nTokens++] = *pToken;
+
+  return pTokenList;
+}
+
+void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParam, ...) {
+  pInfo->type = type;
+
+  if (nParam == 0) return;
+  if (pInfo->pDCLInfo == NULL) pInfo->pDCLInfo = (tDCLSQL *)calloc(1, sizeof(tDCLSQL));
+
+  va_list va;
+  va_start(va, nParam);
+
+  while (nParam-- > 0) {
+    SStrToken *pToken = va_arg(va, SStrToken *);
+    pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken);
+  }
+  va_end(va);
+}
+
+void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SStrToken* pToken, SStrToken* existsCheck) {
+  pInfo->type = type;
+  pInfo->pDCLInfo = tTokenListAppend(pInfo->pDCLInfo, pToken);
+  pInfo->pDCLInfo->existsCheck = (existsCheck->n == 1);
+}
+
+void setShowOptions(SSqlInfo *pInfo, int32_t type, SStrToken* prefix, SStrToken* pPatterns) {
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+  
+  pInfo->type = TSDB_SQL_SHOW;
+  
+  SShowInfo* pShowInfo = &pInfo->pDCLInfo->showOpt;
+  pShowInfo->showType = type;
+  
+  if (prefix != NULL && prefix->type != 0) {
+    pShowInfo->prefix = *prefix;
+  } else {
+    pShowInfo->prefix.type = 0;
+  }
+  
+  if (pPatterns != NULL && pPatterns->type != 0) {
+    pShowInfo->pattern = *pPatterns;
+  } else {
+    pShowInfo->pattern.type = 0;
+  }
+}
+
+void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDBInfo *pDB, SStrToken *pIgExists) {
+  pInfo->type = type;
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+
+  pInfo->pDCLInfo->dbOpt = *pDB;
+  pInfo->pDCLInfo->dbOpt.dbname = *pToken;
+  pInfo->pDCLInfo->dbOpt.ignoreExists = pIgExists->n; // sql.y has: ifnotexists(X) ::= IF NOT EXISTS.   {X.n = 1;}
+}
+
+void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPwd, SCreateAcctSQL *pAcctInfo) {
+  pInfo->type = type;
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+
+  pInfo->pDCLInfo->acctOpt = *pAcctInfo;
+  
+  assert(pName != NULL);
+  pInfo->pDCLInfo->user.user = *pName;
+  
+  if (pPwd != NULL) {
+    pInfo->pDCLInfo->user.passwd = *pPwd;
+  }
+}
+
+void setCreateUserSQL(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd) {
+  pInfo->type = TSDB_SQL_CREATE_USER;
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+  
+  assert(pName != NULL && pPasswd != NULL);
+  
+  pInfo->pDCLInfo->user.user = *pName;
+  pInfo->pDCLInfo->user.passwd = *pPasswd;
+}
+
+void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege) {
+  pInfo->type = TSDB_SQL_ALTER_USER;
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+  
+  assert(pName != NULL);
+  
+  SUserInfo* pUser = &pInfo->pDCLInfo->user;
+  pUser->type = type;
+  pUser->user = *pName;
+  
+  if (pPwd != NULL) {
+    pUser->passwd = *pPwd;
+  } else {
+    pUser->passwd.type = TSDB_DATA_TYPE_NULL;
+  }
+  
+  if (pPrivilege != NULL) {
+    pUser->privilege = *pPrivilege;
+  } else {
+    pUser->privilege.type = TSDB_DATA_TYPE_NULL;
+  }
+}
+
+void setKillSQL(SSqlInfo *pInfo, int32_t type, SStrToken *ip) {
+  pInfo->type = type;
+  if (pInfo->pDCLInfo == NULL) {
+    pInfo->pDCLInfo = calloc(1, sizeof(tDCLSQL));
+  }
+  
+  assert(ip != NULL);
+  
+  pInfo->pDCLInfo->ip = *ip;
+}
+
+void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo) {
+  pDBInfo->compressionLevel = -1;
+
+  pDBInfo->walLevel = -1;
+  pDBInfo->fsyncPeriod = -1;
+  pDBInfo->commitTime = -1;
+  pDBInfo->maxTablesPerVnode = -1;
+
+  pDBInfo->cacheBlockSize = -1;
+  pDBInfo->numOfBlocks = -1;
+  pDBInfo->maxRowsPerBlock = -1;
+  pDBInfo->minRowsPerBlock = -1;
+  pDBInfo->daysPerFile = -1;
+
+  pDBInfo->replica = -1;
+  pDBInfo->quorum = -1;
+  pDBInfo->keep = NULL;
+
+  memset(&pDBInfo->precision, 0, sizeof(SStrToken));
+}
diff --git a/src/query/src/qPercentile.c b/src/query/src/qPercentile.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a8be781d5c9e7cfcb524e10b2d937a73ecb74ca
--- /dev/null
+++ b/src/query/src/qPercentile.c
@@ -0,0 +1,804 @@
+/*
+ * 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 "qPercentile.h"
+#include "qResultbuf.h"
+#include "os.h"
+#include "queryLog.h"
+#include "taosdef.h"
+#include "tulog.h"
+#include "tcompare.h"
+
+#define DEFAULT_NUM_OF_SLOT 1024
+
+int32_t getGroupId(int32_t numOfSlots, int32_t slotIndex, int32_t times) {
+  return (times * numOfSlots) + slotIndex;
+}
+
+static tFilePage *loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx) {
+  tFilePage *buffer = (tFilePage *)calloc(1, pMemBucket->bytes * pMemBucket->pSlots[slotIdx].info.size + sizeof(tFilePage));
+
+  int32_t groupId = getGroupId(pMemBucket->numOfSlots, slotIdx, pMemBucket->times);
+  SIDList list = getDataBufPagesIdList(pMemBucket->pBuffer, groupId);
+
+  int32_t offset = 0;
+  for(int32_t i = 0; i < list->size; ++i) {
+    SPageInfo* pgInfo = *(SPageInfo**) taosArrayGet(list, i);
+
+    tFilePage* pg = getResBufPage(pMemBucket->pBuffer, pgInfo->pageId);
+    memcpy(buffer->data + offset, pg->data, (size_t)(pg->num * pMemBucket->bytes));
+
+    offset += (int32_t)(pg->num * pMemBucket->bytes);
+  }
+
+  qsort(buffer->data, pMemBucket->pSlots[slotIdx].info.size, pMemBucket->bytes, pMemBucket->comparFn);
+  return buffer;
+}
+
+static void resetBoundingBox(MinMaxEntry* range, int32_t type) {
+  switch (type) {
+    case TSDB_DATA_TYPE_BIGINT: {
+      range->i64MaxVal = INT64_MIN;
+      range->i64MinVal = INT64_MAX;
+      break;
+    };
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_TINYINT: {
+      range->iMaxVal = INT32_MIN;
+      range->iMinVal = INT32_MAX;
+      break;
+    };
+    case TSDB_DATA_TYPE_DOUBLE:
+    case TSDB_DATA_TYPE_FLOAT: {
+      range->dMaxVal = -DBL_MAX;
+      range->dMinVal = DBL_MAX;
+      break;
+    }
+  }
+}
+
+static int32_t setBoundingBox(MinMaxEntry* range, int16_t type, double minval, double maxval) {
+  if (minval > maxval) {
+    return -1;
+  }
+
+  switch(type) {
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_INT:
+      range->iMinVal = (int32_t) minval;
+      range->iMaxVal = (int32_t) maxval;
+      break;
+
+    case TSDB_DATA_TYPE_BIGINT:
+      range->i64MinVal = (int64_t) minval;
+      range->i64MaxVal = (int64_t) maxval;
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE:
+      range->dMinVal = minval;
+      range->dMaxVal = maxval;
+      break;
+  }
+
+  return 0;
+}
+
+static void resetPosInfo(SSlotInfo* pInfo) {
+  pInfo->size   = 0;
+  pInfo->pageId = -1;
+  pInfo->data   = NULL;
+}
+
+double findOnlyResult(tMemBucket *pMemBucket) {
+  assert(pMemBucket->total == 1);
+
+  for (int32_t i = 0; i < pMemBucket->numOfSlots; ++i) {
+    tMemBucketSlot *pSlot = &pMemBucket->pSlots[i];
+    if (pSlot->info.size  == 0) {
+      continue;
+    }
+
+    int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times);
+    SIDList list = getDataBufPagesIdList(pMemBucket->pBuffer, groupId);
+    assert(list->size == 1);
+
+    SPageInfo* pgInfo = (SPageInfo*) taosArrayGetP(list, 0);
+    tFilePage* pPage = getResBufPage(pMemBucket->pBuffer, pgInfo->pageId);
+    assert(pPage->num == 1);
+
+    switch (pMemBucket->type) {
+      case TSDB_DATA_TYPE_INT:
+        return *(int32_t *)pPage->data;
+      case TSDB_DATA_TYPE_SMALLINT:
+        return *(int16_t *)pPage->data;
+      case TSDB_DATA_TYPE_TINYINT:
+        return *(int8_t *)pPage->data;
+      case TSDB_DATA_TYPE_BIGINT:
+        return (double)(*(int64_t *)pPage->data);
+      case TSDB_DATA_TYPE_DOUBLE: {
+        double dv = GET_DOUBLE_VAL(pPage->data);
+        return dv;
+      }
+      case TSDB_DATA_TYPE_FLOAT: {
+        float fv = GET_FLOAT_VAL(pPage->data);
+        return fv;
+      }
+      default:
+        return 0;
+    }
+  }
+
+  return 0;
+}
+
+int32_t tBucketBigIntHash(tMemBucket *pBucket, const void *value) {
+  int64_t v = *(int64_t *)value;
+  int32_t index = -1;
+
+  int32_t halfSlot = pBucket->numOfSlots >> 1;
+//  int32_t bits = 32;//bitsOfNumber(pBucket->numOfSlots) - 1;
+
+  if (pBucket->range.i64MaxVal == INT64_MIN) {
+    if (v >= 0) {
+      index = (v >> (64 - 9)) + halfSlot;
+    } else {  // v<0
+      index = ((-v) >> (64 - 9));
+      index = -index + (halfSlot - 1);
+    }
+
+    return index;
+  } else {
+    // out of range
+    if (v < pBucket->range.i64MinVal || v > pBucket->range.i64MaxVal) {
+      return -1;
+    }
+
+    // todo hash for bigint and float and double
+    int64_t span = pBucket->range.i64MaxVal - pBucket->range.i64MinVal;
+    if (span < pBucket->numOfSlots) {
+      int32_t delta = (int32_t)(v - pBucket->range.i64MinVal);
+      index = delta % pBucket->numOfSlots;
+    } else {
+      double slotSpan = (double)span / pBucket->numOfSlots;
+      index = (int32_t)((v - pBucket->range.i64MinVal) / slotSpan);
+      if (v == pBucket->range.i64MaxVal) {
+        index -= 1;
+      }
+    }
+
+    return index;
+  }
+}
+
+// todo refactor to more generic
+int32_t tBucketIntHash(tMemBucket *pBucket, const void *value) {
+  int32_t v = 0;
+  switch(pBucket->type) {
+    case TSDB_DATA_TYPE_SMALLINT: v = *(int16_t*) value; break;
+    case TSDB_DATA_TYPE_TINYINT: v = *(int8_t*) value; break;
+    default: v = *(int32_t*) value;break;
+  }
+
+  int32_t index = -1;
+  if (pBucket->range.iMaxVal == INT32_MIN) {
+    /*
+     * taking negative integer into consideration,
+     * there is only half of pBucket->segs available for non-negative integer
+     */
+    int32_t halfSlot = pBucket->numOfSlots >> 1;
+    int32_t bits = 32;//bitsOfNumber(pBucket->numOfSlots) - 1;
+
+    if (v >= 0) {
+      index = (v >> (bits - 9)) + halfSlot;
+    } else {  // v < 0
+      index = ((-v) >> (32 - 9));
+      index = -index + (halfSlot - 1);
+    }
+
+    return index;
+  } else {
+    // out of range
+    if (v < pBucket->range.iMinVal || v > pBucket->range.iMaxVal) {
+      return -1;
+    }
+
+    // divide a range of [iMinVal, iMaxVal] into 1024 buckets
+    int32_t span = pBucket->range.iMaxVal - pBucket->range.iMinVal;
+    if (span < pBucket->numOfSlots) {
+      int32_t delta = v - pBucket->range.iMinVal;
+      index = (delta % pBucket->numOfSlots);
+    } else {
+      double slotSpan = (double)span / pBucket->numOfSlots;
+      index = (int32_t)((v - pBucket->range.iMinVal) / slotSpan);
+      if (v == pBucket->range.iMaxVal) {
+        index -= 1;
+      }
+    }
+
+    return index;
+  }
+}
+
+int32_t tBucketDoubleHash(tMemBucket *pBucket, const void *value) {
+  double v = GET_DOUBLE_VAL(value);
+  int32_t index = -1;
+
+  if (pBucket->range.dMinVal == DBL_MAX) {
+    /*
+     * taking negative integer into consideration,
+     * there is only half of pBucket->segs available for non-negative integer
+     */
+    double x = DBL_MAX / (pBucket->numOfSlots >> 1);
+    double posx = (v + DBL_MAX) / x;
+    return ((int32_t)posx) % pBucket->numOfSlots;
+  } else {
+
+    // out of range
+    if (v < pBucket->range.dMinVal || v > pBucket->range.dMaxVal) {
+      return -1;
+    }
+
+    // divide a range of [dMinVal, dMaxVal] into 1024 buckets
+    double span = pBucket->range.dMaxVal - pBucket->range.dMinVal;
+    if (span < pBucket->numOfSlots) {
+      int32_t delta = (int32_t)(v - pBucket->range.dMinVal);
+      index = (delta % pBucket->numOfSlots);
+    } else {
+      double slotSpan = span / pBucket->numOfSlots;
+      index = (int32_t)((v - pBucket->range.dMinVal) / slotSpan);
+      if (v == pBucket->range.dMaxVal) {
+        index -= 1;
+      }
+    }
+
+    if (index < 0 || index > pBucket->numOfSlots) {
+      uError("error in hash process. slot id: %d", index);
+    }
+
+    return index;
+  }
+}
+
+static __perc_hash_func_t getHashFunc(int32_t type) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT:
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_TINYINT: {
+      return tBucketIntHash;
+    };
+
+    case TSDB_DATA_TYPE_DOUBLE:
+    case TSDB_DATA_TYPE_FLOAT: {
+      return tBucketDoubleHash;
+    };
+
+    case TSDB_DATA_TYPE_BIGINT: {
+      return tBucketBigIntHash;
+    };
+
+    default: {
+      return NULL;
+    }
+  }
+}
+
+static void resetSlotInfo(tMemBucket* pBucket) {
+  for (int32_t i = 0; i < pBucket->numOfSlots; ++i) {
+    tMemBucketSlot* pSlot = &pBucket->pSlots[i];
+
+    resetBoundingBox(&pSlot->range, pBucket->type);
+    resetPosInfo(&pSlot->info);
+  }
+}
+
+tMemBucket *tMemBucketCreate(int16_t nElemSize, int16_t dataType, double minval, double maxval) {
+  tMemBucket *pBucket = (tMemBucket *)calloc(1, sizeof(tMemBucket));
+  if (pBucket == NULL) {
+    return NULL;
+  }
+
+  pBucket->numOfSlots = DEFAULT_NUM_OF_SLOT;
+  pBucket->bufPageSize = DEFAULT_PAGE_SIZE * 4;   // 4k per page
+
+  pBucket->type  = dataType;
+  pBucket->bytes = nElemSize;
+  pBucket->total = 0;
+  pBucket->times = 1;
+
+  pBucket->maxCapacity = 200000;
+
+  if (setBoundingBox(&pBucket->range, pBucket->type, minval, maxval) != 0) {
+    uError("MemBucket:%p, invalid value range: %f-%f", pBucket, minval, maxval);
+    free(pBucket);
+    return NULL;
+  }
+
+  pBucket->elemPerPage = (pBucket->bufPageSize - sizeof(tFilePage))/pBucket->bytes;
+  pBucket->comparFn = getKeyComparFunc(pBucket->type);
+
+  pBucket->hashFunc = getHashFunc(pBucket->type);
+  if (pBucket->hashFunc == NULL) {
+    uError("MemBucket:%p, not support data type %d, failed", pBucket, pBucket->type);
+    free(pBucket);
+    return NULL;
+  }
+
+  pBucket->pSlots = (tMemBucketSlot *)calloc(pBucket->numOfSlots, sizeof(tMemBucketSlot));
+  if (pBucket->pSlots == NULL) {
+    free(pBucket);
+    return NULL;
+  }
+
+  resetSlotInfo(pBucket);
+
+  int32_t ret = createDiskbasedResultBuffer(&pBucket->pBuffer, pBucket->bytes, pBucket->bufPageSize, pBucket->bufPageSize * 512, NULL);
+  if (ret != TSDB_CODE_SUCCESS) {
+    tMemBucketDestroy(pBucket);
+    return NULL;
+  }
+  
+  uDebug("MemBucket:%p, elem size:%d", pBucket, pBucket->bytes);
+  return pBucket;
+}
+
+void tMemBucketDestroy(tMemBucket *pBucket) {
+  if (pBucket == NULL) {
+    return;
+  }
+
+  destroyResultBuf(pBucket->pBuffer);
+  taosTFree(pBucket->pSlots);
+  taosTFree(pBucket);
+}
+
+void tMemBucketUpdateBoundingBox(MinMaxEntry *r, char *data, int32_t dataType) {
+  switch (dataType) {
+    case TSDB_DATA_TYPE_INT: {
+      int32_t val = *(int32_t *)data;
+      if (r->iMinVal > val) {
+        r->iMinVal = val;
+      }
+
+      if (r->iMaxVal < val) {
+        r->iMaxVal = val;
+      }
+      break;
+    };
+    case TSDB_DATA_TYPE_BIGINT: {
+      int64_t val = *(int64_t *)data;
+      if (r->i64MinVal > val) {
+        r->i64MinVal = val;
+      }
+
+      if (r->i64MaxVal < val) {
+        r->i64MaxVal = val;
+      }
+      break;
+    };
+    case TSDB_DATA_TYPE_SMALLINT: {
+      int32_t val = *(int16_t *)data;
+      if (r->iMinVal > val) {
+        r->iMinVal = val;
+      }
+
+      if (r->iMaxVal < val) {
+        r->iMaxVal = val;
+      }
+      break;
+    };
+    case TSDB_DATA_TYPE_TINYINT: {
+      int32_t val = *(int8_t *)data;
+      if (r->iMinVal > val) {
+        r->iMinVal = val;
+      }
+
+      if (r->iMaxVal < val) {
+        r->iMaxVal = val;
+      }
+
+      break;
+    };
+    case TSDB_DATA_TYPE_DOUBLE: {
+      // double val = *(double *)data;
+      double val = GET_DOUBLE_VAL(data);
+      if (r->dMinVal > val) {
+        r->dMinVal = val;
+      }
+
+      if (r->dMaxVal < val) {
+        r->dMaxVal = val;
+      }
+      break;
+    };
+    case TSDB_DATA_TYPE_FLOAT: {
+      double val = GET_FLOAT_VAL(data);
+
+      if (r->dMinVal > val) {
+        r->dMinVal = val;
+      }
+
+      if (r->dMaxVal < val) {
+        r->dMaxVal = val;
+      }
+      break;
+    };
+    default: { assert(false); }
+  }
+}
+
+/*
+ * in memory bucket, we only accept data array list
+ */
+int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) {
+  assert(pBucket != NULL && data != NULL && size > 0);
+
+  pBucket->total += (int32_t)size;
+
+  int32_t bytes = pBucket->bytes;
+  for (int32_t i = 0; i < size; ++i) {
+    char *d = (char *) data + i * bytes;
+
+    int32_t index = (pBucket->hashFunc)(pBucket, d);
+    if (index == -1) {  // the value is out of range, do not add it into bucket
+      return -1;
+    }
+
+    tMemBucketSlot *pSlot = &pBucket->pSlots[index];
+    tMemBucketUpdateBoundingBox(&pSlot->range, d, pBucket->type);
+
+    // ensure available memory pages to allocate
+    int32_t groupId = getGroupId(pBucket->numOfSlots, index, pBucket->times);
+    int32_t pageId = -1;
+
+    if (pSlot->info.data == NULL || pSlot->info.data->num >= pBucket->elemPerPage) {
+      if (pSlot->info.data != NULL) {
+        assert(pSlot->info.data->num >= pBucket->elemPerPage && pSlot->info.size > 0);
+
+        // keep the pointer in memory
+        releaseResBufPage(pBucket->pBuffer, pSlot->info.data);
+        pSlot->info.data = NULL;
+      }
+
+      pSlot->info.data = getNewDataBuf(pBucket->pBuffer, groupId, &pageId);
+      pSlot->info.pageId = pageId;
+    }
+
+    memcpy(pSlot->info.data->data + pSlot->info.data->num * pBucket->bytes, d, pBucket->bytes);
+
+    pSlot->info.data->num += 1;
+    pSlot->info.size += 1;
+  }
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////
+static UNUSED_FUNC void findMaxMinValue(tMemBucket *pMemBucket, double *maxVal, double *minVal) {
+  *minVal = DBL_MAX;
+  *maxVal = -DBL_MAX;
+
+  for (int32_t i = 0; i < pMemBucket->numOfSlots; ++i) {
+    tMemBucketSlot *pSlot = &pMemBucket->pSlots[i];
+    if (pSlot->info.size == 0) {
+      continue;
+    }
+
+    switch (pMemBucket->type) {
+      case TSDB_DATA_TYPE_INT:
+      case TSDB_DATA_TYPE_SMALLINT:
+      case TSDB_DATA_TYPE_TINYINT: {
+        double minv = pSlot->range.iMinVal;
+        double maxv = pSlot->range.iMaxVal;
+
+        if (*minVal > minv) {
+          *minVal = minv;
+        }
+        if (*maxVal < maxv) {
+          *maxVal = maxv;
+        }
+        break;
+      }
+      case TSDB_DATA_TYPE_DOUBLE:
+      case TSDB_DATA_TYPE_FLOAT: {
+        double minv = pSlot->range.dMinVal;
+        double maxv = pSlot->range.dMaxVal;
+
+        if (*minVal > minv) {
+          *minVal = minv;
+        }
+        if (*maxVal < maxv) {
+          *maxVal = maxv;
+        }
+        break;
+      }
+      case TSDB_DATA_TYPE_BIGINT: {
+        double minv = (double)pSlot->range.i64MinVal;
+        double maxv = (double)pSlot->range.i64MaxVal;
+
+        if (*minVal > minv) {
+          *minVal = minv;
+        }
+        if (*maxVal < maxv) {
+          *maxVal = maxv;
+        }
+        break;
+      }
+    }
+  }
+}
+
+/*
+ *
+ * now, we need to find the minimum value of the next slot for
+ * interpolating the percentile value
+ * j is the last slot of current segment, we need to get the first
+ * slot of the next segment.
+ */
+static MinMaxEntry getMinMaxEntryOfNextSlotWithData(tMemBucket *pMemBucket, int32_t slotIdx) {
+    int32_t j = slotIdx + 1;
+    while (j < pMemBucket->numOfSlots && (pMemBucket->pSlots[j].info.size == 0)) {
+      ++j;
+    }
+
+    assert(j < pMemBucket->numOfSlots);
+    return pMemBucket->pSlots[j].range;
+}
+
+static bool isIdenticalData(tMemBucket *pMemBucket, int32_t index);
+char *getFirstElemOfMemBuffer(tMemBucketSlot *pSeg, int32_t slotIdx, tFilePage *pPage);
+
+static double getIdenticalDataVal(tMemBucket* pMemBucket, int32_t slotIndex) {
+  assert(isIdenticalData(pMemBucket, slotIndex));
+
+  tMemBucketSlot *pSlot = &pMemBucket->pSlots[slotIndex];
+
+  double finalResult = 0.0;
+  switch (pMemBucket->type) {
+    case TSDB_DATA_TYPE_SMALLINT:
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_INT: {
+      finalResult = pSlot->range.iMinVal;
+      break;
+    }
+
+    case TSDB_DATA_TYPE_FLOAT:
+    case TSDB_DATA_TYPE_DOUBLE: {
+      finalResult = pSlot->range.dMinVal;
+      break;
+    };
+
+    case TSDB_DATA_TYPE_BIGINT: {
+      finalResult = (double)pSlot->range.i64MinVal;
+      break;
+    }
+  }
+
+  return finalResult;
+}
+
+double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction) {
+  int32_t num = 0;
+
+  for (int32_t i = 0; i < pMemBucket->numOfSlots; ++i) {
+    tMemBucketSlot *pSlot = &pMemBucket->pSlots[i];
+    if (pSlot->info.size == 0) {
+      continue;
+    }
+
+    // required value in current slot
+    if (num < (count + 1) && num + pSlot->info.size >= (count + 1)) {
+      if (pSlot->info.size + num == (count + 1)) {
+        /*
+         * now, we need to find the minimum value of the next slot for interpolating the percentile value
+         * j is the last slot of current segment, we need to get the first slot of the next segment.
+         */
+        MinMaxEntry next = getMinMaxEntryOfNextSlotWithData(pMemBucket, i);
+
+        double maxOfThisSlot = 0;
+        double minOfNextSlot = 0;
+        switch (pMemBucket->type) {
+          case TSDB_DATA_TYPE_INT:
+          case TSDB_DATA_TYPE_SMALLINT:
+          case TSDB_DATA_TYPE_TINYINT: {
+            maxOfThisSlot = pSlot->range.iMaxVal;
+            minOfNextSlot = next.iMinVal;
+            break;
+          };
+          case TSDB_DATA_TYPE_FLOAT:
+          case TSDB_DATA_TYPE_DOUBLE: {
+            maxOfThisSlot = pSlot->range.dMaxVal;
+            minOfNextSlot = next.dMinVal;
+            break;
+          };
+          case TSDB_DATA_TYPE_BIGINT: {
+            maxOfThisSlot = (double)pSlot->range.i64MaxVal;
+            minOfNextSlot = (double)next.i64MinVal;
+            break;
+          }
+        };
+
+        assert(minOfNextSlot > maxOfThisSlot);
+
+        double val = (1 - fraction) * maxOfThisSlot + fraction * minOfNextSlot;
+        return val;
+      }
+
+      if (pSlot->info.size <= pMemBucket->maxCapacity) {
+        // data in buffer and file are merged together to be processed.
+        tFilePage *buffer = loadDataFromFilePage(pMemBucket, i);
+        int32_t    currentIdx = count - num;
+
+        char *thisVal = buffer->data + pMemBucket->bytes * currentIdx;
+        char *nextVal = thisVal + pMemBucket->bytes;
+
+        double td = 1.0, nd = 1.0;
+        switch (pMemBucket->type) {
+          case TSDB_DATA_TYPE_SMALLINT: {
+            td = *(int16_t *)thisVal;
+            nd = *(int16_t *)nextVal;
+            break;
+          }
+          case TSDB_DATA_TYPE_TINYINT: {
+            td = *(int8_t *)thisVal;
+            nd = *(int8_t *)nextVal;
+            break;
+          }
+          case TSDB_DATA_TYPE_INT: {
+            td = *(int32_t *)thisVal;
+            nd = *(int32_t *)nextVal;
+            break;
+          };
+          case TSDB_DATA_TYPE_FLOAT: {
+            td = GET_FLOAT_VAL(thisVal);
+            nd = GET_FLOAT_VAL(nextVal);
+            break;
+          }
+          case TSDB_DATA_TYPE_DOUBLE: {
+            td = GET_DOUBLE_VAL(thisVal);
+            nd = GET_DOUBLE_VAL(nextVal);
+            break;
+          }
+          case TSDB_DATA_TYPE_BIGINT: {
+            td = (double)*(int64_t *)thisVal;
+            nd = (double)*(int64_t *)nextVal;
+            break;
+          }
+        }
+
+        double val = (1 - fraction) * td + fraction * nd;
+        taosTFree(buffer);
+
+        return val;
+      } else {  // incur a second round bucket split
+       if (isIdenticalData(pMemBucket, i)) {
+         return getIdenticalDataVal(pMemBucket, i);
+       }
+
+       // try next round
+       pMemBucket->times += 1;
+       uDebug("MemBucket:%p, start next round data bucketing, time:%d", pMemBucket, pMemBucket->times);
+
+       pMemBucket->range = pSlot->range;
+       pMemBucket->total = 0;
+
+       resetSlotInfo(pMemBucket);
+
+       int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times - 1);
+       SIDList list = getDataBufPagesIdList(pMemBucket->pBuffer, groupId);
+       assert(list->size > 0);
+
+       for (int32_t f = 0; f < list->size; ++f) {
+         SPageInfo *pgInfo = *(SPageInfo **)taosArrayGet(list, f);
+         tFilePage *pg = getResBufPage(pMemBucket->pBuffer, pgInfo->pageId);
+
+         tMemBucketPut(pMemBucket, pg->data, (int32_t)pg->num);
+         releaseResBufPageInfo(pMemBucket->pBuffer, pgInfo);
+       }
+
+       return getPercentileImpl(pMemBucket, count - num, fraction);
+      }
+    } else {
+      num += pSlot->info.size;
+    }
+  }
+
+  return 0;
+}
+
+double getPercentile(tMemBucket *pMemBucket, double percent) {
+  if (pMemBucket->total == 0) {
+    return 0.0;
+  }
+
+  // if only one elements exists, return it
+  if (pMemBucket->total == 1) {
+    return findOnlyResult(pMemBucket);
+  }
+
+  percent = fabs(percent);
+
+  // find the min/max value, no need to scan all data in bucket
+  if (fabs(percent - 100.0) < DBL_EPSILON || (percent < DBL_EPSILON)) {
+    MinMaxEntry* pRange = &pMemBucket->range;
+
+    switch(pMemBucket->type) {
+      case TSDB_DATA_TYPE_TINYINT:
+      case TSDB_DATA_TYPE_SMALLINT:
+      case TSDB_DATA_TYPE_INT:
+        return fabs(percent - 100) < DBL_EPSILON? pRange->iMaxVal:pRange->iMinVal;
+      case TSDB_DATA_TYPE_BIGINT: {
+        double v = (double)(fabs(percent - 100) < DBL_EPSILON ? pRange->i64MaxVal : pRange->i64MinVal);
+        return v;
+      }
+      case TSDB_DATA_TYPE_FLOAT:
+      case TSDB_DATA_TYPE_DOUBLE:
+        return fabs(percent - 100) < DBL_EPSILON? pRange->dMaxVal:pRange->dMinVal;
+        default:
+        return -1;
+    }
+  }
+
+  double  percentVal = (percent * (pMemBucket->total - 1)) / ((double)100.0);
+
+  // do put data by using buckets
+  int32_t orderIdx = (int32_t)percentVal;
+  return getPercentileImpl(pMemBucket, orderIdx, percentVal - orderIdx);
+}
+
+/*
+ * check if data in one slot are all identical only need to compare with the bounding box
+ */
+bool isIdenticalData(tMemBucket *pMemBucket, int32_t index) {
+  tMemBucketSlot *pSeg = &pMemBucket->pSlots[index];
+
+  if (pMemBucket->type == TSDB_DATA_TYPE_INT || pMemBucket->type == TSDB_DATA_TYPE_BIGINT ||
+      pMemBucket->type == TSDB_DATA_TYPE_SMALLINT || pMemBucket->type == TSDB_DATA_TYPE_TINYINT) {
+    return pSeg->range.i64MinVal == pSeg->range.i64MaxVal;
+  }
+
+  if (pMemBucket->type == TSDB_DATA_TYPE_FLOAT || pMemBucket->type == TSDB_DATA_TYPE_DOUBLE) {
+    return fabs(pSeg->range.dMaxVal - pSeg->range.dMinVal) < DBL_EPSILON;
+  }
+
+  return false;
+}
+
+/*
+ * get the first element of one slot into memory.
+ * if no data of current slot in memory, load it from disk
+ */
+char *getFirstElemOfMemBuffer(tMemBucketSlot *pSeg, int32_t slotIdx, tFilePage *pPage) {
+//  STSBuf *pMemBuffer = pSeg->pBuffer[slotIdx];
+  char *thisVal = NULL;
+
+//  if (pSeg->pBuffer[slotIdx]->numOfTotal != 0) {
+////    thisVal = pSeg->pBuffer[slotIdx]->pHead->item.data;
+//  } else {
+//    /*
+//     * no data in memory, load one page into memory
+//     */
+//    tFlushoutInfo *pFlushInfo = &pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[0];
+//    assert(pFlushInfo->numOfPages == pMemBuffer->fileMeta.nFileSize);
+//    int32_t ret;
+//    ret = fseek(pMemBuffer->file, pFlushInfo->startPageId * pMemBuffer->pageSize, SEEK_SET);
+//    UNUSED(ret);
+//    size_t sz = fread(pPage, pMemBuffer->pageSize, 1, pMemBuffer->file);
+//    UNUSED(sz);
+//    thisVal = pPage->data;
+//  }
+  return thisVal;
+}
diff --git a/src/query/src/qResultbuf.c b/src/query/src/qResultbuf.c
new file mode 100644
index 0000000000000000000000000000000000000000..b3e97459d36c68d48c04447b159473bd179a5dbb
--- /dev/null
+++ b/src/query/src/qResultbuf.c
@@ -0,0 +1,451 @@
+#include "qResultbuf.h"
+#include "stddef.h"
+#include "tscompression.h"
+#include "hash.h"
+#include "qExtbuffer.h"
+#include "queryLog.h"
+#include "taoserror.h"
+
+#define GET_DATA_PAYLOAD(_p) ((char *)(_p)->pData + POINTER_BYTES)
+#define NO_IN_MEM_AVAILABLE_PAGES(_b) (listNEles((_b)->lruList) >= (_b)->inMemPages)
+
+int32_t createDiskbasedResultBuffer(SDiskbasedResultBuf** pResultBuf, int32_t rowSize, int32_t pagesize,
+                                    int32_t inMemBufSize, const void* handle) {
+  *pResultBuf = calloc(1, sizeof(SDiskbasedResultBuf));
+
+  SDiskbasedResultBuf* pResBuf = *pResultBuf;
+  if (pResBuf == NULL) {
+    return TSDB_CODE_COM_OUT_OF_MEMORY;  
+  }
+
+  pResBuf->pageSize     = pagesize;
+  pResBuf->numOfPages   = 0;                        // all pages are in buffer in the first place
+  pResBuf->totalBufSize = 0;
+  pResBuf->inMemPages   = inMemBufSize/pagesize;    // maximum allowed pages, it is a soft limit.
+  pResBuf->allocateId   = -1;
+  pResBuf->comp         = true;
+  pResBuf->file         = NULL;
+  pResBuf->handle       = handle;
+  pResBuf->fileSize     = 0;
+
+  // at least more than 2 pages must be in memory
+  assert(inMemBufSize >= pagesize * 2);
+
+  pResBuf->numOfRowsPerPage = (pagesize - sizeof(tFilePage)) / rowSize;
+  pResBuf->lruList = tdListNew(POINTER_BYTES);
+
+  // init id hash table
+  pResBuf->groupSet  = taosHashInit(10, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false);
+  pResBuf->assistBuf = malloc(pResBuf->pageSize + 2); // EXTRA BYTES
+  pResBuf->all = taosHashInit(10, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false);
+
+  char path[PATH_MAX] = {0};
+  taosGetTmpfilePath("qbuf", path);
+  pResBuf->path = strdup(path);
+
+  pResBuf->emptyDummyIdList = taosArrayInit(1, sizeof(int32_t));
+
+  qDebug("QInfo:%p create resBuf for output, page size:%d, inmem buf pages:%d, file:%s", handle, pResBuf->pageSize,
+         pResBuf->inMemPages, pResBuf->path);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t createDiskFile(SDiskbasedResultBuf* pResultBuf) {
+  pResultBuf->file = fopen(pResultBuf->path, "wb+");
+  if (pResultBuf->file == NULL) {
+    qError("failed to create tmp file: %s on disk. %s", pResultBuf->path, strerror(errno));
+    return TAOS_SYSTEM_ERROR(errno);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static char* doCompressData(void* data, int32_t srcSize, int32_t *dst, SDiskbasedResultBuf* pResultBuf) { // do nothing
+  if (!pResultBuf->comp) {
+    *dst = srcSize;
+    return data;
+  }
+
+  *dst = tsCompressString(data, srcSize, 1, pResultBuf->assistBuf, srcSize, ONE_STAGE_COMP, NULL, 0);
+
+  memcpy(data, pResultBuf->assistBuf, *dst);
+  return data;
+}
+
+static char* doDecompressData(void* data, int32_t srcSize, int32_t *dst, SDiskbasedResultBuf* pResultBuf) { // do nothing
+  if (!pResultBuf->comp) {
+    *dst = srcSize;
+    return data;
+  }
+
+  *dst = tsDecompressString(data, srcSize, 1, pResultBuf->assistBuf, pResultBuf->pageSize, ONE_STAGE_COMP, NULL, 0);
+
+  memcpy(data, pResultBuf->assistBuf, *dst);
+  return data;
+}
+
+static int32_t allocatePositionInFile(SDiskbasedResultBuf* pResultBuf, size_t size) {
+  if (pResultBuf->pFree == NULL) {
+    return pResultBuf->nextPos;
+  } else {
+    int32_t offset = -1;
+
+    size_t num = taosArrayGetSize(pResultBuf->pFree);
+    for(int32_t i = 0; i < num; ++i) {
+      SFreeListItem* pi = taosArrayGet(pResultBuf->pFree, i);
+      if (pi->len >= size) {
+        offset = pi->offset;
+        pi->offset += (int32_t)size;
+        pi->len -= (int32_t)size;
+
+        return offset;
+      }
+    }
+
+    // no available recycle space, allocate new area in file
+    return pResultBuf->nextPos;
+  }
+}
+
+static char* doFlushPageToDisk(SDiskbasedResultBuf* pResultBuf, SPageInfo* pg) {
+  assert(!pg->used && pg->pData != NULL);
+
+  int32_t size = -1;
+  char* t = doCompressData(GET_DATA_PAYLOAD(pg), pResultBuf->pageSize, &size, pResultBuf);
+
+  // this page is flushed to disk for the first time
+  if (pg->info.offset == -1) {
+    pg->info.offset = allocatePositionInFile(pResultBuf, size);
+    pResultBuf->nextPos += size;
+
+    fseek(pResultBuf->file, pg->info.offset, SEEK_SET);
+    /*int32_t ret =*/ fwrite(t, 1, size, pResultBuf->file);
+
+    if (pResultBuf->fileSize < pg->info.offset + pg->info.length) {
+      pResultBuf->fileSize = pg->info.offset + pg->info.length;
+    }
+  } else {
+    // length becomes greater, current space is not enough, allocate new place, otherwise, do nothing
+    if (pg->info.length < size) {
+      // 1. add current space to free list
+      taosArrayPush(pResultBuf->pFree, &pg->info);
+
+      // 2. allocate new position, and update the info
+      pg->info.offset = allocatePositionInFile(pResultBuf, size);
+      pResultBuf->nextPos += size;
+    }
+
+    //3. write to disk.
+    int32_t ret = fseek(pResultBuf->file, pg->info.offset, SEEK_SET);
+    if (ret != 0) {  // todo handle the error case
+
+    }
+
+    ret = (int32_t)fwrite(t, size, 1, pResultBuf->file);
+    if (ret != size) {  // todo handle the error case
+
+    }
+
+    if (pResultBuf->fileSize < pg->info.offset + pg->info.length) {
+      pResultBuf->fileSize = pg->info.offset + pg->info.length;
+    }
+  }
+
+  char* ret = pg->pData;
+  memset(ret, 0, pResultBuf->pageSize);
+
+  pg->pData = NULL;
+  pg->info.length = size;
+
+  pResultBuf->statis.flushBytes += pg->info.length;
+
+  return ret;
+}
+
+static char* flushPageToDisk(SDiskbasedResultBuf* pResultBuf, SPageInfo* pg) {
+  int32_t ret = TSDB_CODE_SUCCESS;
+  assert(pResultBuf->numOfPages * pResultBuf->pageSize == pResultBuf->totalBufSize && pResultBuf->numOfPages >= pResultBuf->inMemPages);
+
+  if (pResultBuf->file == NULL) {
+    if ((ret = createDiskFile(pResultBuf)) != TSDB_CODE_SUCCESS) {
+      terrno = ret;
+      return NULL;
+    }
+  }
+
+  return doFlushPageToDisk(pResultBuf, pg);
+}
+
+// load file block data in disk
+static char* loadPageFromDisk(SDiskbasedResultBuf* pResultBuf, SPageInfo* pg) {
+  int32_t ret = fseek(pResultBuf->file, pg->info.offset, SEEK_SET);
+  ret = (int32_t)fread(GET_DATA_PAYLOAD(pg), 1, pg->info.length, pResultBuf->file);
+  if (ret != pg->info.length) {
+    terrno = errno;
+    return NULL;
+  }
+
+  pResultBuf->statis.loadBytes += pg->info.length;
+
+  int32_t fullSize = 0;
+  doDecompressData(GET_DATA_PAYLOAD(pg), pg->info.length, &fullSize, pResultBuf);
+
+  return (char*)GET_DATA_PAYLOAD(pg);
+}
+
+static SIDList addNewGroup(SDiskbasedResultBuf* pResultBuf, int32_t groupId) {
+  assert(taosHashGet(pResultBuf->groupSet, (const char*) &groupId, sizeof(int32_t)) == NULL);
+
+  SArray* pa = taosArrayInit(1, POINTER_BYTES);
+  int32_t ret = taosHashPut(pResultBuf->groupSet, (const char*)&groupId, sizeof(int32_t), &pa, POINTER_BYTES);
+  assert(ret == 0);
+
+  return pa;
+}
+
+static SPageInfo* registerPage(SDiskbasedResultBuf* pResultBuf, int32_t groupId, int32_t pageId) {
+  SIDList list = NULL;
+
+  char** p = taosHashGet(pResultBuf->groupSet, (const char*)&groupId, sizeof(int32_t));
+  if (p == NULL) {  // it is a new group id
+    list = addNewGroup(pResultBuf, groupId);
+  } else {
+    list = (SIDList) (*p);
+  }
+
+  pResultBuf->numOfPages += 1;
+
+  SPageInfo* ppi = malloc(sizeof(SPageInfo));//{ .info = PAGE_INFO_INITIALIZER, .pageId = pageId, .pn = NULL};
+
+  ppi->pageId = pageId;
+  ppi->pData  = NULL;
+  ppi->info   = PAGE_INFO_INITIALIZER;
+  ppi->used   = true;
+  ppi->pn     = NULL;
+
+  return *(SPageInfo**) taosArrayPush(list, &ppi);
+}
+
+static SListNode* getEldestUnrefedPage(SDiskbasedResultBuf* pResultBuf) {
+  SListIter iter = {0};
+  tdListInitIter(pResultBuf->lruList, &iter, TD_LIST_BACKWARD);
+
+  SListNode* pn = NULL;
+  while((pn = tdListNext(&iter)) != NULL) {
+    assert(pn != NULL);
+
+    SPageInfo* pageInfo = *(SPageInfo**) pn->data;
+    assert(pageInfo->pageId >= 0 && pageInfo->pn == pn);
+
+    if (!pageInfo->used) {
+      break;
+    }
+  }
+
+  return pn;
+}
+
+static char* evicOneDataPage(SDiskbasedResultBuf* pResultBuf) {
+  char* bufPage = NULL;
+  SListNode* pn = getEldestUnrefedPage(pResultBuf);
+
+  // all pages are referenced by user, try to allocate new space
+  if (pn == NULL) {
+    int32_t prev = pResultBuf->inMemPages;
+
+    // increase by 50% of previous mem pages
+    pResultBuf->inMemPages = (int32_t)(pResultBuf->inMemPages * 1.5f);
+
+    qWarn("%p in memory buf page not sufficient, expand from %d to %d, page size:%d", pResultBuf, prev,
+          pResultBuf->inMemPages, pResultBuf->pageSize);
+  } else {
+    pResultBuf->statis.flushPages += 1;
+    tdListPopNode(pResultBuf->lruList, pn);
+
+    SPageInfo* d = *(SPageInfo**) pn->data;
+    assert(d->pn == pn);
+
+    d->pn = NULL;
+    taosTFree(pn);
+
+    bufPage = flushPageToDisk(pResultBuf, d);
+  }
+
+  return bufPage;
+}
+
+static void lruListPushFront(SList *pList, SPageInfo* pi) {
+  tdListPrepend(pList, &pi);
+  SListNode* front = tdListGetHead(pList);
+  pi->pn = front;
+}
+
+static void lruListMoveToFront(SList *pList, SPageInfo* pi) {
+  tdListPopNode(pList, pi->pn);
+  tdListPrependNode(pList, pi->pn);
+}
+
+tFilePage* getNewDataBuf(SDiskbasedResultBuf* pResultBuf, int32_t groupId, int32_t* pageId) {
+  pResultBuf->statis.getPages += 1;
+
+  char* availablePage = NULL;
+  if (NO_IN_MEM_AVAILABLE_PAGES(pResultBuf)) {
+    availablePage = evicOneDataPage(pResultBuf);
+  }
+
+  // register new id in this group
+  *pageId = (++pResultBuf->allocateId);
+
+  // register page id info
+  SPageInfo* pi = registerPage(pResultBuf, groupId, *pageId);
+
+  // add to LRU list
+  assert(listNEles(pResultBuf->lruList) < pResultBuf->inMemPages && pResultBuf->inMemPages > 0);
+
+  lruListPushFront(pResultBuf->lruList, pi);
+
+  // add to hash map
+  taosHashPut(pResultBuf->all, pageId, sizeof(int32_t), &pi, POINTER_BYTES);
+
+  // allocate buf
+  if (availablePage == NULL) {
+    pi->pData = calloc(1, pResultBuf->pageSize + POINTER_BYTES);
+  } else {
+    pi->pData = availablePage;
+  }
+
+  pResultBuf->totalBufSize += pResultBuf->pageSize;
+
+  ((void**)pi->pData)[0] = pi;
+  pi->used = true;
+
+  return (void *)(GET_DATA_PAYLOAD(pi));
+}
+
+tFilePage* getResBufPage(SDiskbasedResultBuf* pResultBuf, int32_t id) {
+  assert(pResultBuf != NULL && id >= 0);
+  pResultBuf->statis.getPages += 1;
+
+  SPageInfo** pi = taosHashGet(pResultBuf->all, &id, sizeof(int32_t));
+  assert(pi != NULL && *pi != NULL);
+
+  if ((*pi)->pData != NULL) { // it is in memory
+    // no need to update the LRU list if only one page exists
+    if (pResultBuf->numOfPages == 1) {
+      (*pi)->used = true;
+      return (void *)(GET_DATA_PAYLOAD(*pi));
+    }
+
+    SPageInfo** pInfo = (SPageInfo**) ((*pi)->pn->data);
+    assert(*pInfo == *pi);
+
+    lruListMoveToFront(pResultBuf->lruList, (*pi));
+    (*pi)->used = true;
+
+    return (void *)(GET_DATA_PAYLOAD(*pi));
+
+  } else { // not in memory
+    assert((*pi)->pData == NULL && (*pi)->pn == NULL && (*pi)->info.length >= 0 && (*pi)->info.offset >= 0);
+
+    char* availablePage = NULL;
+    if (NO_IN_MEM_AVAILABLE_PAGES(pResultBuf)) {
+      availablePage = evicOneDataPage(pResultBuf);
+    }
+
+    if (availablePage == NULL) {
+      (*pi)->pData = calloc(1, pResultBuf->pageSize + POINTER_BYTES);
+    } else {
+      (*pi)->pData = availablePage;
+    }
+
+    ((void**)((*pi)->pData))[0] = (*pi);
+
+    lruListPushFront(pResultBuf->lruList, *pi);
+    (*pi)->used = true;
+
+    loadPageFromDisk(pResultBuf, *pi);
+    return (void *)(GET_DATA_PAYLOAD(*pi));
+  }
+}
+
+void releaseResBufPage(SDiskbasedResultBuf* pResultBuf, void* page) {
+  assert(pResultBuf != NULL && page != NULL);
+  char* p = (char*) page - POINTER_BYTES;
+
+  SPageInfo* ppi = ((SPageInfo**) p)[0];
+  releaseResBufPageInfo(pResultBuf, ppi);
+}
+
+void releaseResBufPageInfo(SDiskbasedResultBuf* pResultBuf, SPageInfo* pi) {
+  assert(pi->pData != NULL && pi->used);
+
+  pi->used = false;
+  pResultBuf->statis.releasePages += 1;
+}
+
+size_t getNumOfRowsPerPage(const SDiskbasedResultBuf* pResultBuf) { return pResultBuf->numOfRowsPerPage; }
+
+size_t getNumOfResultBufGroupId(const SDiskbasedResultBuf* pResultBuf) { return taosHashGetSize(pResultBuf->groupSet); }
+
+size_t getResBufSize(const SDiskbasedResultBuf* pResultBuf) { return (size_t)pResultBuf->totalBufSize; }
+
+SIDList getDataBufPagesIdList(SDiskbasedResultBuf* pResultBuf, int32_t groupId) {
+  assert(pResultBuf != NULL);
+
+  char** p = taosHashGet(pResultBuf->groupSet, (const char*)&groupId, sizeof(int32_t));
+  if (p == NULL) {  // it is a new group id
+    return pResultBuf->emptyDummyIdList;
+  } else {
+    return (SArray*) (*p);
+  }
+}
+
+void destroyResultBuf(SDiskbasedResultBuf* pResultBuf) {
+  if (pResultBuf == NULL) {
+    return;
+  }
+
+  if (pResultBuf->file != NULL) {
+    qDebug("QInfo:%p res output buffer closed, total:%" PRId64 " bytes, inmem size:%dbytes, file size:%"PRId64" bytes",
+        pResultBuf->handle, pResultBuf->totalBufSize, listNEles(pResultBuf->lruList) * pResultBuf->pageSize,
+        pResultBuf->fileSize);
+
+    fclose(pResultBuf->file);
+  } else {
+    qDebug("QInfo:%p res output buffer closed, total:%" PRId64 " bytes, no file created", pResultBuf->handle,
+           pResultBuf->totalBufSize);
+  }
+
+  unlink(pResultBuf->path);
+  taosTFree(pResultBuf->path);
+
+  SHashMutableIterator* iter = taosHashCreateIter(pResultBuf->groupSet);
+  while(taosHashIterNext(iter)) {
+    SArray** p = (SArray**) taosHashIterGet(iter);
+    size_t n = taosArrayGetSize(*p);
+    for(int32_t i = 0; i < n; ++i) {
+      SPageInfo* pi = taosArrayGetP(*p, i);
+      taosTFree(pi->pData);
+      taosTFree(pi);
+    }
+
+    taosArrayDestroy(*p);
+  }
+
+  taosHashDestroyIter(iter);
+
+  tdListFree(pResultBuf->lruList);
+  taosArrayDestroy(pResultBuf->emptyDummyIdList);
+  taosHashCleanup(pResultBuf->groupSet);
+  taosHashCleanup(pResultBuf->all);
+
+  taosTFree(pResultBuf->assistBuf);
+  taosTFree(pResultBuf);
+}
+
+SPageInfo* getLastPageInfo(SIDList pList) {
+  size_t size = taosArrayGetSize(pList);
+  return (SPageInfo*) taosArrayGetP(pList, size - 1);
+}
+
diff --git a/src/query/src/qSyntaxtreefunction.c b/src/query/src/qSyntaxtreefunction.c
new file mode 100644
index 0000000000000000000000000000000000000000..2104edfd910bba1a1701800387545c4f58dfb625
--- /dev/null
+++ b/src/query/src/qSyntaxtreefunction.c
@@ -0,0 +1,1253 @@
+/*
+ * 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 "os.h"
+
+#include "qSyntaxtreefunction.h"
+#include "taosdef.h"
+#include "tutil.h"
+
+#define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord)     \
+  {                                                                                                   \
+    int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                    \
+    int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;                                                  \
+                                                                                                      \
+    if ((len1) == (len2)) {                                                                           \
+      for (; i < (len2) && i >= 0; i += step, (out) += 1) {                                        \
+        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)&((right)[i]), _right_type)) { \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[i] op(right)[i];                                                      \
+      }                                                                                               \
+    } else if ((len1) == 1) {                                                                         \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
+        if (isNull((char *)(left), _left_type) || isNull((char *)&(right)[i], _right_type)) {         \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[0] op(right)[i];                                                      \
+      }                                                                                               \
+    } else if ((len2) == 1) {                                                                         \
+      for (; i >= 0 && i < (len1); i += step, (out) += 1) {                                        \
+        if (isNull((char *)&(left)[i], _left_type) || isNull((char *)(right), _right_type)) {         \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[i] op(right)[0];                                                      \
+      }                                                                                               \
+    }                                                                                                 \
+  }
+
+#define ARRAY_LIST_OP_REM(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord) \
+  {                                                                                                   \
+    int32_t i = (_ord == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                      \
+    int32_t step = (_ord == TSDB_ORDER_ASC) ? 1 : -1;                                                    \
+                                                                                                      \
+    if (len1 == (len2)) {                                                                             \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
+        if (isNull((char *)&(left[i]), _left_type) || isNull((char *)&(right[i]), _right_type)) {     \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[i])) * (right)[i];      \
+      }                                                                                               \
+    } else if (len1 == 1) {                                                                           \
+      for (; i >= 0 && i < (len2); i += step, (out) += 1) {                                        \
+        if (isNull((char *)(left), _left_type) || isNull((char *)&((right)[i]), _right_type)) {       \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[0] - ((int64_t)(((double)(left)[0]) / (right)[i])) * (right)[i];      \
+      }                                                                                               \
+    } else if ((len2) == 1) {                                                                         \
+      for (; i >= 0 && i < len1; i += step, (out) += 1) {                                          \
+        if (isNull((char *)&((left)[i]), _left_type) || isNull((char *)(right), _right_type)) {       \
+          setNull((char *)(out), _res_type, tDataTypeDesc[_res_type].nSize);                          \
+          continue;                                                                                   \
+        }                                                                                             \
+        *(out) = (double)(left)[i] - ((int64_t)(((double)(left)[i]) / (right)[0])) * (right)[0];      \
+      }                                                                                               \
+    }                                                                                                 \
+  }
+
+#define ARRAY_LIST_ADD(left, right, _left_type, _right_type, len1, len2, out, _ord) \
+  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, +, TSDB_DATA_TYPE_DOUBLE, _ord)
+#define ARRAY_LIST_SUB(left, right, _left_type, _right_type, len1, len2, out, _ord) \
+  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, -, TSDB_DATA_TYPE_DOUBLE, _ord)
+#define ARRAY_LIST_MULTI(left, right, _left_type, _right_type, len1, len2, out, _ord) \
+  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, *, TSDB_DATA_TYPE_DOUBLE, _ord)
+#define ARRAY_LIST_DIV(left, right, _left_type, _right_type, len1, len2, out, _ord) \
+  ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, /, TSDB_DATA_TYPE_DOUBLE, _ord)
+#define ARRAY_LIST_REM(left, right, _left_type, _right_type, len1, len2, out, _ord) \
+  ARRAY_LIST_OP_REM(left, right, _left_type, _right_type, len1, len2, out, %, TSDB_DATA_TYPE_DOUBLE, _ord)
+
+#define TYPE_CONVERT_DOUBLE_RES(left, right, out, _type_left, _type_right, _type_res) \
+  _type_left * pLeft = (_type_left *)(left);                                          \
+  _type_right *pRight = (_type_right *)(right);                                       \
+  _type_res *  pOutput = (_type_res *)(out);
+
+#define TYPE_CONVERT(left, right, out, _type_left, _type_right) \
+  TYPE_CONVERT_DOUBLE_RES(left, right, out, _type_left, _type_right, double)
+
+void calc_fn_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  int32_t *pRight = (int32_t *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[i] + pRight[i];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[0] + pRight[i];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[i] + pRight[0];
+    }
+  }
+}
+
+void calc_fn_i32_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int8_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int16_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int64_t);
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, float)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int8_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int16_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i8_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i8_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int64_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, float)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_i16_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i16_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int16_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i16_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i16_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int64_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, float)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_i64_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_i64_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i64_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int64_t)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, float)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_f_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_f_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_f_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i64_f_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, float)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i8_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_d_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i16_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_d_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_d_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i64_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i64_d_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_f_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_f_d_add(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_d_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, double)
+  ARRAY_LIST_ADD(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+void calc_fn_i32_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  int32_t *pRight = (int32_t *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[i] - pRight[i];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[0] - pRight[i];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&pLeft[i], TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[i] - pRight[0];
+    }
+  }
+}
+
+void calc_fn_i32_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int32_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int32_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int32_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int32_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i8_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int8_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i16_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int16_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i32_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int32_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i64_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int64_t)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_f_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, float)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_d_sub(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, double)
+  ARRAY_LIST_SUB(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+void calc_fn_i32_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  int32_t *pRight = (int32_t *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[i] * pRight[i];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[0] * pRight[i];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[i] * pRight[0];
+    }
+  }
+}
+
+void calc_fn_i32_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int8_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int16_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int64_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, float)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int8_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int16_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i8_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i8_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int64_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, float)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_i16_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i16_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int16_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i16_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i16_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int64_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, float)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_i64_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_i64_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_i64_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_i64_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int64_t)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, float)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_f_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_f_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_f_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i64_f_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_f_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, float)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i8_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i8_d_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i16_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i16_d_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i32_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i32_d_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_i64_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_i64_d_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_f_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  calc_fn_f_d_multi(right, left, numRight, numLeft, output, order);
+}
+
+void calc_fn_d_d_multi(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, double)
+  ARRAY_LIST_MULTI(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void calc_fn_i32_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  int32_t *pRight = (int32_t *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)(pOutput), TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[i] / pRight[i];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+
+      *pOutput = (double)pLeft[0] / pRight[i];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        setNull((char *)pOutput, TSDB_DATA_TYPE_DOUBLE, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
+        continue;
+      }
+      *pOutput = (double)pLeft[i] / pRight[0];
+    }
+  }
+}
+
+void calc_fn_i32_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int32_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int32_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int32_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int32_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i8_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int8_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i16_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int16_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i32_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int32_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i64_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int64_t)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_f_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, float)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_d_div(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, double)
+  ARRAY_LIST_DIV(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void calc_fn_i32_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  int32_t *pRight = (int32_t *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  }
+}
+
+void calc_fn_i32_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int32_t, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_INT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i32_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  int32_t *pLeft = (int32_t *)left;
+  double * pRight = (double *)right;
+  double * pOutput = (double *)output;
+
+  int32_t i = (order == TSDB_ORDER_ASC) ? 0 : MAX(numLeft, numRight) - 1;
+  int32_t step = (order == TSDB_ORDER_ASC) ? 1 : -1;
+
+  if (numLeft == numRight) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  } else if (numLeft == 1) {
+    for (; i >= 0 && i < numRight; i += step, pOutput += 1) {
+      if (isNull((char *)(pLeft), TSDB_DATA_TYPE_INT) || isNull((char *)&(pRight[i]), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  } else if (numRight == 1) {
+    for (; i >= 0 && i < numLeft; i += step, pOutput += 1) {
+      if (isNull((char *)&(pLeft[i]), TSDB_DATA_TYPE_INT) || isNull((char *)(pRight), TSDB_DATA_TYPE_INT)) {
+        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];
+    }
+  }
+}
+
+void calc_fn_i8_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int32_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i8_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int8_t, double)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_TINYINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int32_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i16_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int16_t, double)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int32_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_i64_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, int64_t, double)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_BIGINT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int32_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_f_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, float, double)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_FLOAT, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i8_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int8_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_TINYINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i16_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int16_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_SMALLINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i32_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int32_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_INT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_i64_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, int64_t)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_BIGINT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_f_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, float)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_FLOAT, numLeft, numRight, pOutput, order);
+}
+
+void calc_fn_d_d_rem(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
+  TYPE_CONVERT(left, right, output, double, double)
+  ARRAY_LIST_REM(pLeft, pRight, TSDB_DATA_TYPE_DOUBLE, TSDB_DATA_TYPE_DOUBLE, numLeft, numRight, pOutput, order);
+}
+
+/*
+ * 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, 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, 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_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
+    {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, 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, 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_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
+    {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, 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, 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_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
+    {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, 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, 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_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
+    {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, 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, 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_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
+    {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
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+_bi_consumer_fn_t tGetBiConsumerFn(int32_t leftType, int32_t rightType, int32_t optr) {
+  switch (optr) {
+    case TSDB_BINARY_OP_ADD:
+      return add_function_arraylist[leftType][rightType];
+    case TSDB_BINARY_OP_SUBTRACT:
+      return sub_function_arraylist[leftType][rightType];
+    case TSDB_BINARY_OP_MULTIPLY:
+      return multi_function_arraylist[leftType][rightType];
+    case TSDB_BINARY_OP_DIVIDE:
+      return div_function_arraylist[leftType][rightType];
+    case TSDB_BINARY_OP_REMAINDER:
+      return rem_function_arraylist[leftType][rightType];
+    default:
+      return NULL;
+  }
+  return NULL;
+}
diff --git a/src/query/src/qTokenizer.c b/src/query/src/qTokenizer.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c9f92786fdf837e2453fe70f594c10e7a093421
--- /dev/null
+++ b/src/query/src/qTokenizer.c
@@ -0,0 +1,664 @@
+/*
+ * 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 "os.h"
+
+#include "hash.h"
+#include "hashfunc.h"
+#include "taosdef.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tutil.h"
+
+// All the keywords of the SQL language are stored in a hash table
+typedef struct SKeyword {
+  const char* name;  // The keyword name
+  uint16_t    type;  // type
+  uint8_t     len;   // length
+} SKeyword;
+
+// keywords in sql string
+static SKeyword keywordTable[] = {
+    {"ID",           TK_ID},
+    {"BOOL",         TK_BOOL},
+    {"TINYINT",      TK_TINYINT},
+    {"SMALLINT",     TK_SMALLINT},
+    {"INTEGER",      TK_INTEGER},
+    {"INT",          TK_INTEGER},
+    {"BIGINT",       TK_BIGINT},
+    {"FLOAT",        TK_FLOAT},
+    {"DOUBLE",       TK_DOUBLE},
+    {"STRING",       TK_STRING},
+    {"TIMESTAMP",    TK_TIMESTAMP},
+    {"BINARY",       TK_BINARY},
+    {"NCHAR",        TK_NCHAR},
+    {"OR",           TK_OR},
+    {"AND",          TK_AND},
+    {"NOT",          TK_NOT},
+    {"EQ",           TK_EQ},
+    {"NE",           TK_NE},
+    {"ISNULL",       TK_ISNULL},
+    {"NOTNULL",      TK_NOTNULL},
+    {"IS",           TK_IS},
+    {"LIKE",         TK_LIKE},
+    {"GLOB",         TK_GLOB},
+    {"BETWEEN",      TK_BETWEEN},
+    {"IN",           TK_IN},
+    {"GT",           TK_GT},
+    {"GE",           TK_GE},
+    {"LT",           TK_LT},
+    {"LE",           TK_LE},
+    {"BITAND",       TK_BITAND},
+    {"BITOR",        TK_BITOR},
+    {"LSHIFT",       TK_LSHIFT},
+    {"RSHIFT",       TK_RSHIFT},
+    {"PLUS",         TK_PLUS},
+    {"MINUS",        TK_MINUS},
+    {"DIVIDE",       TK_DIVIDE},
+    {"TIMES",        TK_TIMES},
+    {"STAR",         TK_STAR},
+    {"SLASH",        TK_SLASH},
+    {"REM ",         TK_REM},
+    {"CONCAT",       TK_CONCAT},
+    {"UMINUS",       TK_UMINUS},
+    {"UPLUS",        TK_UPLUS},
+    {"BITNOT",       TK_BITNOT},
+    {"SHOW",         TK_SHOW},
+    {"DATABASES",    TK_DATABASES},
+    {"MNODES",       TK_MNODES},
+    {"DNODES",       TK_DNODES},
+    {"ACCOUNTS",     TK_ACCOUNTS},
+    {"USERS",        TK_USERS},
+    {"MODULES",      TK_MODULES},
+    {"QUERIES",      TK_QUERIES},
+    {"CONNECTIONS",  TK_CONNECTIONS},
+    {"STREAMS",      TK_STREAMS},
+    {"VARIABLES",    TK_VARIABLES},
+    {"SCORES",       TK_SCORES},
+    {"GRANTS",       TK_GRANTS},
+    {"DOT",          TK_DOT},
+    {"TABLES",       TK_TABLES},
+    {"STABLES",      TK_STABLES},
+    {"VGROUPS",      TK_VGROUPS},
+    {"DROP",         TK_DROP},
+    {"TABLE",        TK_TABLE},
+    {"DATABASE",     TK_DATABASE},
+    {"DNODE",        TK_DNODE},
+    {"USER",         TK_USER},
+    {"ACCOUNT",      TK_ACCOUNT},
+    {"USE",          TK_USE},
+    {"DESCRIBE",     TK_DESCRIBE},
+    {"ALTER",        TK_ALTER},
+    {"PASS",         TK_PASS},
+    {"PRIVILEGE",    TK_PRIVILEGE},
+    {"LOCAL",        TK_LOCAL},
+    {"IF",           TK_IF},
+    {"EXISTS",       TK_EXISTS},
+    {"CREATE",       TK_CREATE},
+    {"PPS",          TK_PPS},
+    {"TSERIES",      TK_TSERIES},
+    {"DBS",          TK_DBS},
+    {"STORAGE",      TK_STORAGE},
+    {"QTIME",        TK_QTIME},
+    {"CONNS",        TK_CONNS},
+    {"STATE",        TK_STATE},
+    {"KEEP",         TK_KEEP},
+    {"REPLICA",      TK_REPLICA},
+    {"QUORUM",       TK_QUORUM},
+    {"DAYS",         TK_DAYS},
+    {"MINROWS",      TK_MINROWS},
+    {"MAXROWS",      TK_MAXROWS},
+    {"BLOCKS",       TK_BLOCKS},
+    {"CACHE",        TK_CACHE},
+    {"CTIME",        TK_CTIME},
+    {"WAL",          TK_WAL},
+    {"FSYNC",        TK_FSYNC},
+    {"COMP",         TK_COMP},
+    {"PRECISION",    TK_PRECISION},
+    {"LP",           TK_LP},
+    {"RP",           TK_RP},
+    {"TAGS",         TK_TAGS},
+    {"USING",        TK_USING},
+    {"AS",           TK_AS},
+    {"COMMA",        TK_COMMA},
+    {"NULL",         TK_NULL},
+    {"SELECT",       TK_SELECT},
+    {"FROM",         TK_FROM},
+    {"VARIABLE",     TK_VARIABLE},
+    {"INTERVAL",     TK_INTERVAL},
+    {"FILL",         TK_FILL},
+    {"SLIDING",      TK_SLIDING},
+    {"ORDER",        TK_ORDER},
+    {"BY",           TK_BY},
+    {"ASC",          TK_ASC},
+    {"DESC",         TK_DESC},
+    {"GROUP",        TK_GROUP},
+    {"HAVING",       TK_HAVING},
+    {"LIMIT",        TK_LIMIT},
+    {"OFFSET",       TK_OFFSET},
+    {"SLIMIT",       TK_SLIMIT},
+    {"SOFFSET",      TK_SOFFSET},
+    {"WHERE",        TK_WHERE},
+    {"NOW",          TK_NOW},
+    {"INSERT",       TK_INSERT},
+    {"INTO",         TK_INTO},
+    {"VALUES",       TK_VALUES},
+    {"RESET",        TK_RESET},
+    {"QUERY",        TK_QUERY},
+    {"ADD",          TK_ADD},
+    {"COLUMN",       TK_COLUMN},
+    {"TAG",          TK_TAG},
+    {"CHANGE",       TK_CHANGE},
+    {"SET",          TK_SET},
+    {"KILL",         TK_KILL},
+    {"CONNECTION",   TK_CONNECTION},
+    {"COLON",        TK_COLON},
+    {"STREAM",       TK_STREAM},
+    {"ABORT",        TK_ABORT},
+    {"AFTER",        TK_AFTER},
+    {"ATTACH",       TK_ATTACH},
+    {"BEFORE",       TK_BEFORE},
+    {"BEGIN",        TK_BEGIN},
+    {"CASCADE",      TK_CASCADE},
+    {"CLUSTER",      TK_CLUSTER},
+    {"CONFLICT",     TK_CONFLICT},
+    {"COPY",         TK_COPY},
+    {"DEFERRED",     TK_DEFERRED},
+    {"DELIMITERS",   TK_DELIMITERS},
+    {"DETACH",       TK_DETACH},
+    {"EACH",         TK_EACH},
+    {"END",          TK_END},
+    {"EXPLAIN",      TK_EXPLAIN},
+    {"FAIL",         TK_FAIL},
+    {"FOR",          TK_FOR},
+    {"IGNORE",       TK_IGNORE},
+    {"IMMEDIATE",    TK_IMMEDIATE},
+    {"INITIALLY",    TK_INITIALLY},
+    {"INSTEAD",      TK_INSTEAD},
+    {"MATCH",        TK_MATCH},
+    {"KEY",          TK_KEY},
+    {"OF",           TK_OF},
+    {"RAISE",        TK_RAISE},
+    {"REPLACE",      TK_REPLACE},
+    {"RESTRICT",     TK_RESTRICT},
+    {"ROW",          TK_ROW},
+    {"STATEMENT",    TK_STATEMENT},
+    {"TRIGGER",      TK_TRIGGER},
+    {"VIEW",         TK_VIEW},
+    {"ALL",          TK_ALL},
+    {"COUNT",        TK_COUNT},
+    {"SUM",          TK_SUM},
+    {"AVG",          TK_AVG},
+    {"MIN",          TK_MIN},
+    {"MAX",          TK_MAX},
+    {"FIRST",        TK_FIRST},
+    {"LAST",         TK_LAST},
+    {"TOP",          TK_TOP},
+    {"BOTTOM",       TK_BOTTOM},
+    {"STDDEV",       TK_STDDEV},
+    {"PERCENTILE",   TK_PERCENTILE},
+    {"APERCENTILE",  TK_APERCENTILE},
+    {"LEASTSQUARES", TK_LEASTSQUARES},
+    {"HISTOGRAM",    TK_HISTOGRAM},
+    {"DIFF",         TK_DIFF},
+    {"SPREAD",       TK_SPREAD},
+    {"TWA",          TK_TWA},
+    {"INTERP",       TK_INTERP},
+    {"LAST_ROW",     TK_LAST_ROW},
+    {"SEMI",         TK_SEMI},
+    {"NONE",         TK_NONE},
+    {"PREV",         TK_PREV},
+    {"LINEAR",       TK_LINEAR},
+    {"IMPORT",       TK_IMPORT},
+    {"METRIC",       TK_METRIC},
+    {"TBNAME",       TK_TBNAME},
+    {"JOIN",         TK_JOIN},
+    {"METRICS",      TK_METRICS},
+    {"TBID",         TK_TBID},
+    {"STABLE",       TK_STABLE},
+    {"FILE",         TK_FILE},
+    {"VNODES",       TK_VNODES},
+    {"UNION",        TK_UNION},
+    {"RATE",         TK_RATE},
+    {"IRATE",        TK_IRATE},
+    {"SUM_RATE",     TK_SUM_RATE},
+    {"SUM_IRATE",    TK_SUM_IRATE},
+    {"AVG_RATE",     TK_AVG_RATE},
+    {"AVG_IRATE",    TK_AVG_IRATE},
+};
+
+static const char isIdChar[] = {
+    /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1x */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */
+};
+
+static void* KeywordHashTable = NULL;
+
+static void doInitKeywordsTable(void) {
+  int numOfEntries = tListLen(keywordTable);
+  
+  KeywordHashTable = taosHashInit(numOfEntries, MurmurHash3_32, true, false);
+  for (int32_t i = 0; i < numOfEntries; i++) {
+    keywordTable[i].len = (uint8_t)strlen(keywordTable[i].name);
+    void* ptr = &keywordTable[i];
+    taosHashPut(KeywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES);
+  }
+}
+
+static pthread_once_t keywordsHashTableInit = PTHREAD_ONCE_INIT;
+
+int tSQLKeywordCode(const char* z, int n) {
+  pthread_once(&keywordsHashTableInit, doInitKeywordsTable);
+  
+  char key[512] = {0};
+  if (n > tListLen(key)) { // too long token, can not be any other token type
+    return TK_ID;
+  }
+  
+  for (int32_t j = 0; j < n; ++j) {
+    if (z[j] >= 'a' && z[j] <= 'z') {
+      key[j] = (char)(z[j] & 0xDF);  // to uppercase and set the null-terminated
+    } else {
+      key[j] = z[j];
+    }
+  }
+
+  SKeyword** pKey = (SKeyword**)taosHashGet(KeywordHashTable, key, n);
+  return (pKey != NULL)? (*pKey)->type:TK_ID;
+}
+
+/*
+ * Return the length of the token that begins at z[0].
+ * Store the token type in *type before returning.
+ */
+uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
+  uint32_t i;
+  switch (*z) {
+    case ' ':
+    case '\t':
+    case '\n':
+    case '\f':
+    case '\r': {
+      for (i = 1; isspace(z[i]); i++) {
+      }
+      *tokenType = TK_SPACE;
+      return i;
+    }
+    case ':': {
+      *tokenType = TK_COLON;
+      return 1;
+    }
+    case '-': {
+      if (z[1] == '-') {
+        for (i = 2; z[i] && z[i] != '\n'; i++) {
+        }
+        *tokenType = TK_COMMENT;
+        return i;
+      }
+      *tokenType = TK_MINUS;
+      return 1;
+    }
+    case '(': {
+      *tokenType = TK_LP;
+      return 1;
+    }
+    case ')': {
+      *tokenType = TK_RP;
+      return 1;
+    }
+    case ';': {
+      *tokenType = TK_SEMI;
+      return 1;
+    }
+    case '+': {
+      *tokenType = TK_PLUS;
+      return 1;
+    }
+    case '*': {
+      *tokenType = TK_STAR;
+      return 1;
+    }
+    case '/': {
+      if (z[1] != '*' || z[2] == 0) {
+        *tokenType = TK_SLASH;
+        return 1;
+      }
+      for (i = 3; z[i] && (z[i] != '/' || z[i - 1] != '*'); i++) {
+      }
+      if (z[i]) i++;
+      *tokenType = TK_COMMENT;
+      return i;
+    }
+    case '%': {
+      *tokenType = TK_REM;
+      return 1;
+    }
+    case '=': {
+      *tokenType = TK_EQ;
+      return 1 + (z[1] == '=');
+    }
+    case '<': {
+      if (z[1] == '=') {
+        *tokenType = TK_LE;
+        return 2;
+      } else if (z[1] == '>') {
+        *tokenType = TK_NE;
+        return 2;
+      } else if (z[1] == '<') {
+        *tokenType = TK_LSHIFT;
+        return 2;
+      } else {
+        *tokenType = TK_LT;
+        return 1;
+      }
+    }
+    case '>': {
+      if (z[1] == '=') {
+        *tokenType = TK_GE;
+        return 2;
+      } else if (z[1] == '>') {
+        *tokenType = TK_RSHIFT;
+        return 2;
+      } else {
+        *tokenType = TK_GT;
+        return 1;
+      }
+    }
+    case '!': {
+      if (z[1] != '=') {
+        *tokenType = TK_ILLEGAL;
+        return 2;
+      } else {
+        *tokenType = TK_NE;
+        return 2;
+      }
+    }
+    case '|': {
+      if (z[1] != '|') {
+        *tokenType = TK_BITOR;
+        return 1;
+      } else {
+        *tokenType = TK_CONCAT;
+        return 2;
+      }
+    }
+    case ',': {
+      *tokenType = TK_COMMA;
+      return 1;
+    }
+    case '&': {
+      *tokenType = TK_BITAND;
+      return 1;
+    }
+    case '~': {
+      *tokenType = TK_BITNOT;
+      return 1;
+    }
+    case '?': {
+      *tokenType = TK_QUESTION;
+      return 1;
+    }
+    case '\'':
+    case '"': {
+      int  delim = z[0];
+      bool strEnd = false;
+      for (i = 1; z[i]; i++) {
+        if (z[i] == '\\') { 
+          i++;
+          continue;
+        }
+        
+        if (z[i] == delim ) {
+          if (z[i + 1] == delim) {
+            i++;
+          } else {
+            strEnd = true;
+            break;
+          }
+        }
+      }
+      
+      if (z[i]) i++;
+
+      if (strEnd) {
+        *tokenType = TK_STRING;
+        return i;
+      }
+
+      break;
+    }
+    case '.': {
+      /*
+       * handle the the float number with out integer part
+       * .123
+       * .123e4
+       */
+      if (isdigit(z[1])) {
+        for (i = 2; isdigit(z[i]); i++) {
+        }
+
+        if ((z[i] == 'e' || z[i] == 'E') &&
+            (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
+          i += 2;
+          while (isdigit(z[i])) {
+            i++;
+          }
+        }
+
+        *tokenType = TK_FLOAT;
+        return i;
+      } else {
+        *tokenType = TK_DOT;
+        return 1;
+      }
+    }
+
+    case '0': {
+      char next = z[1];
+
+      if (next == 'b') { // bin number
+        *tokenType = TK_BIN;
+        for (i = 2; (z[i] == '0' || z[i] == '1'); ++i) {
+        }
+
+        if (i == 2) {
+          break;
+        }
+
+        return i;
+      } else if (next == 'x') {  //hex number
+        *tokenType = TK_HEX;
+        for (i = 2; isdigit(z[i]) || (z[i] >= 'a' && z[i] <= 'f') || (z[i] >= 'A' && z[i] <= 'F'); ++i) {
+        }
+
+        if (i == 2) {
+          break;
+        }
+
+        return i;
+      }
+    }
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9': {
+      *tokenType = TK_INTEGER;
+      for (i = 1; isdigit(z[i]); i++) {
+      }
+
+      /* here is the 1u/1a/2s/3m/9y */
+      if ((z[i] == 'u' || z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' ||
+           z[i] == 'y' || z[i] == 'w' ||
+           z[i] == 'U' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' ||
+           z[i] == 'Y' || z[i] == 'W') &&
+          (isIdChar[(uint8_t)z[i + 1]] == 0)) {
+        *tokenType = TK_VARIABLE;
+        i += 1;
+        return i;
+      }
+
+      int32_t seg = 1;
+      while (z[i] == '.' && isdigit(z[i + 1])) {
+        i += 2;
+        while (isdigit(z[i])) {
+          i++;
+        }
+        *tokenType = TK_FLOAT;
+        seg++;
+      }
+
+      if (seg == 4) {  // ip address
+        *tokenType = TK_IPTOKEN;
+        return i;
+      }
+
+      if ((z[i] == 'e' || z[i] == 'E') &&
+          (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
+        i += 2;
+        while (isdigit(z[i])) {
+          i++;
+        }
+        *tokenType = TK_FLOAT;
+      }
+      return i;
+    }
+    case '[': {
+      for (i = 1; z[i] && z[i - 1] != ']'; i++) {
+      }
+      *tokenType = TK_ID;
+      return i;
+    }
+    case 'T':
+    case 't':
+    case 'F':
+    case 'f': {
+      for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t) z[i]]; i++) {
+      }
+
+      if ((i == 4 && strncasecmp(z, "true", 4) == 0) || (i == 5 && strncasecmp(z, "false", 5) == 0)) {
+        *tokenType = TK_BOOL;
+        return i;
+      }
+    }
+    default: {
+      if (((*z & 0x80) != 0) || !isIdChar[(uint8_t) *z]) {
+        break;
+      }
+      for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t) z[i]]; i++) {
+      }
+      *tokenType = tSQLKeywordCode(z, i);
+      return i;
+    }
+  }
+
+  *tokenType = TK_ILLEGAL;
+  return 0;
+}
+
+SStrToken tStrGetToken(char* str, int32_t* i, bool isPrevOptr, uint32_t numOfIgnoreToken, uint32_t* ignoreTokenTypes) {
+  SStrToken t0 = {0};
+
+  // here we reach the end of sql string, null-terminated string
+  if (str[*i] == 0) {
+    t0.n = 0;
+    return t0;
+  }
+
+  // IGNORE TK_SPACE, TK_COMMA, and specified tokens
+  while (1) {
+    *i += t0.n;
+
+    int32_t numOfComma = 0;
+    char t = str[*i];
+    while (t == ' ' || t == '\n' || t == '\r' || t == '\t' || t == '\f' || t == ',') {
+      if (t == ',' && (++numOfComma > 1)) {  // comma only allowed once
+        t0.n = 0;
+        return t0;
+      }
+    
+      t = str[++(*i)];
+    }
+
+    t0.n = tSQLGetToken(&str[*i], &t0.type);
+
+    bool ignore = false;
+    for (uint32_t k = 0; k < numOfIgnoreToken; k++) {
+      if (t0.type == ignoreTokenTypes[k]) {
+        ignore = true;
+        break;
+      }
+    }
+
+    if (!ignore) {
+      break;
+    }
+  }
+
+  if (t0.type == TK_SEMI) {
+    t0.n = 0;
+    return t0;
+  }
+
+  uint32_t type = 0;
+  int32_t  len;
+
+  // support parse the 'db.tbl' format, notes: There should be no space on either side of the dot!
+  if ('.' == str[*i + t0.n]) {
+    len = tSQLGetToken(&str[*i + t0.n + 1], &type);
+
+    // only id and string are valid
+    if ((TK_STRING != t0.type) && (TK_ID != t0.type)) {
+      t0.type = TK_ILLEGAL;
+      t0.n = 0;
+
+      return t0;
+    }
+
+    t0.n += len + 1;
+
+  } else {
+    // support parse the -/+number format
+    if ((isPrevOptr) && (t0.type == TK_MINUS || t0.type == TK_PLUS)) {
+      len = tSQLGetToken(&str[*i + t0.n], &type);
+      if (type == TK_INTEGER || type == TK_FLOAT) {
+        t0.type = type;
+        t0.n += len;
+      }
+    }
+  }
+
+  t0.z = str + (*i);
+  *i += t0.n;
+
+  return t0;
+}
+
+bool isKeyWord(const char* z, int32_t len) { return (tSQLKeywordCode((char*)z, len) != TK_ID); }
+
+void taosCleanupKeywordsTable() {
+  taosHashCleanup(KeywordHashTable);
+}
\ No newline at end of file
diff --git a/src/query/src/qTsbuf.c b/src/query/src/qTsbuf.c
new file mode 100644
index 0000000000000000000000000000000000000000..b264f6cdc9d815a12cc5a3ab0e5c09c0d670bcdb
--- /dev/null
+++ b/src/query/src/qTsbuf.c
@@ -0,0 +1,971 @@
+#include "qTsbuf.h"
+#include "taoserror.h"
+#include "tscompression.h"
+#include "tutil.h"
+
+static int32_t getDataStartOffset();
+static void TSBufUpdateVnodeInfo(STSBuf* pTSBuf, int32_t index, STSVnodeBlockInfo* pBlockInfo);
+static STSBuf* allocResForTSBuf(STSBuf* pTSBuf);
+static int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader);
+
+/**
+ * todo error handling
+ * support auto closeable tmp file
+ * @param path
+ * @return
+ */
+STSBuf* tsBufCreate(bool autoDelete, int32_t order) {
+  STSBuf* pTSBuf = calloc(1, sizeof(STSBuf));
+  if (pTSBuf == NULL) {
+    return NULL;
+  }
+  
+  taosGetTmpfilePath("join", pTSBuf->path);
+  pTSBuf->f = fopen(pTSBuf->path, "w+");
+  if (pTSBuf->f == NULL) {
+    free(pTSBuf);
+    return NULL;
+  }
+  
+  if (NULL == allocResForTSBuf(pTSBuf)) {
+    return NULL;
+  }
+  
+  // update the header info
+  STSBufFileHeader header = {.magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = TSDB_ORDER_ASC};
+  STSBufUpdateHeader(pTSBuf, &header);
+  
+  tsBufResetPos(pTSBuf);
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
+  
+  pTSBuf->autoDelete = autoDelete;
+  pTSBuf->tsOrder = order;
+  
+  return pTSBuf;
+}
+
+STSBuf* tsBufCreateFromFile(const char* path, bool autoDelete) {
+  STSBuf* pTSBuf = calloc(1, sizeof(STSBuf));
+  if (pTSBuf == NULL) {
+    return NULL;
+  }
+  
+  tstrncpy(pTSBuf->path, path, sizeof(pTSBuf->path));
+  
+  pTSBuf->f = fopen(pTSBuf->path, "r+");
+  if (pTSBuf->f == NULL) {
+    free(pTSBuf);
+    return NULL;
+  }
+  
+  if (allocResForTSBuf(pTSBuf) == NULL) {
+    return NULL;
+  }
+  
+  // validate the file magic number
+  STSBufFileHeader header = {0};
+  int32_t ret = fseek(pTSBuf->f, 0, SEEK_SET);
+  UNUSED(ret);
+  size_t sz = fread(&header, 1, sizeof(STSBufFileHeader), pTSBuf->f);
+  UNUSED(sz);
+
+  // invalid file
+  if (header.magic != TS_COMP_FILE_MAGIC) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  if (header.numOfVnode > pTSBuf->numOfAlloc) {
+    pTSBuf->numOfAlloc = header.numOfVnode;
+    STSVnodeBlockInfoEx* tmp = realloc(pTSBuf->pData, sizeof(STSVnodeBlockInfoEx) * pTSBuf->numOfAlloc);
+    if (tmp == NULL) {
+      tsBufDestroy(pTSBuf);
+      return NULL;
+    }
+    
+    pTSBuf->pData = tmp;
+  }
+  
+  pTSBuf->numOfVnodes = header.numOfVnode;
+  
+  // check the ts order
+  pTSBuf->tsOrder = header.tsOrder;
+  if (pTSBuf->tsOrder != TSDB_ORDER_ASC && pTSBuf->tsOrder != TSDB_ORDER_DESC) {
+//    tscError("invalid order info in buf:%d", pTSBuf->tsOrder);
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  size_t infoSize = sizeof(STSVnodeBlockInfo) * pTSBuf->numOfVnodes;
+  
+  STSVnodeBlockInfo* buf = (STSVnodeBlockInfo*)calloc(1, infoSize);
+  if (buf == NULL) {
+    tsBufDestroy(pTSBuf);
+    return NULL; 
+  } 
+  
+  //int64_t pos = ftell(pTSBuf->f); //pos not used
+  sz = fread(buf, infoSize, 1, pTSBuf->f);
+  UNUSED(sz);
+  
+  // the length value for each vnode is not kept in file, so does not set the length value
+  for (int32_t i = 0; i < pTSBuf->numOfVnodes; ++i) {
+    STSVnodeBlockInfoEx* pBlockList = &pTSBuf->pData[i];
+    memcpy(&pBlockList->info, &buf[i], sizeof(STSVnodeBlockInfo));
+  }
+  free(buf);
+  
+  ret = fseek(pTSBuf->f, 0, SEEK_END);
+  UNUSED(ret);
+  
+  struct stat fileStat;
+  if (fstat(fileno(pTSBuf->f), &fileStat) != 0) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  pTSBuf->fileSize = (uint32_t)fileStat.st_size;
+  tsBufResetPos(pTSBuf);
+  
+  // ascending by default
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
+  pTSBuf->autoDelete = autoDelete;
+  
+//  tscDebug("create tsBuf from file:%s, fd:%d, size:%d, numOfVnode:%d, autoDelete:%d", pTSBuf->path, fileno(pTSBuf->f),
+//           pTSBuf->fileSize, pTSBuf->numOfVnodes, pTSBuf->autoDelete);
+  
+  return pTSBuf;
+}
+
+void* tsBufDestroy(STSBuf* pTSBuf) {
+  if (pTSBuf == NULL) {
+    return NULL;
+  }
+  
+  taosTFree(pTSBuf->assistBuf);
+  taosTFree(pTSBuf->tsData.rawBuf);
+  
+  taosTFree(pTSBuf->pData);
+  taosTFree(pTSBuf->block.payload);
+  
+  fclose(pTSBuf->f);
+  
+  if (pTSBuf->autoDelete) {
+//    ("tsBuf %p destroyed, delete tmp file:%s", pTSBuf, pTSBuf->path);
+    unlink(pTSBuf->path);
+  } else {
+//    tscDebug("tsBuf %p destroyed, tmp file:%s, remains", pTSBuf, pTSBuf->path);
+  }
+  
+  free(pTSBuf);
+  return NULL;
+}
+
+static STSVnodeBlockInfoEx* tsBufGetLastVnodeInfo(STSBuf* pTSBuf) {
+  int32_t last = pTSBuf->numOfVnodes - 1;
+  
+  assert(last >= 0);
+  return &pTSBuf->pData[last];
+}
+
+static STSVnodeBlockInfoEx* addOneVnodeInfo(STSBuf* pTSBuf, int32_t vnodeId) {
+  if (pTSBuf->numOfAlloc <= pTSBuf->numOfVnodes) {
+    uint32_t newSize = (uint32_t)(pTSBuf->numOfAlloc * 1.5);
+    assert((int32_t)newSize > pTSBuf->numOfAlloc);
+    
+    STSVnodeBlockInfoEx* tmp = (STSVnodeBlockInfoEx*)realloc(pTSBuf->pData, sizeof(STSVnodeBlockInfoEx) * newSize);
+    if (tmp == NULL) {
+      return NULL;
+    }
+    
+    pTSBuf->pData = tmp;
+    pTSBuf->numOfAlloc = newSize;
+    memset(&pTSBuf->pData[pTSBuf->numOfVnodes], 0, sizeof(STSVnodeBlockInfoEx) * (newSize - pTSBuf->numOfVnodes));
+  }
+  
+  if (pTSBuf->numOfVnodes > 0) {
+    STSVnodeBlockInfoEx* pPrevBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
+    
+    // update prev vnode length info in file
+    TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, &pPrevBlockInfoEx->info);
+  }
+  
+  // set initial value for vnode block
+  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[pTSBuf->numOfVnodes].info;
+  pBlockInfo->vnode = vnodeId;
+  pBlockInfo->offset = pTSBuf->fileSize;
+  assert(pBlockInfo->offset >= getDataStartOffset());
+  
+  // update vnode info in file
+  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes, pBlockInfo);
+  
+  // add one vnode info
+  pTSBuf->numOfVnodes += 1;
+  
+  // update the header info
+  STSBufFileHeader header = {
+      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
+  
+  STSBufUpdateHeader(pTSBuf, &header);
+  return tsBufGetLastVnodeInfo(pTSBuf);
+}
+
+static void shrinkBuffer(STSList* ptsData) {
+  // shrink tmp buffer size if it consumes too many memory compared to the pre-defined size
+  if (ptsData->allocSize >= ptsData->threshold * 2) {
+    ptsData->rawBuf = realloc(ptsData->rawBuf, MEM_BUF_SIZE);
+    ptsData->allocSize = MEM_BUF_SIZE;
+  }
+}
+
+static void writeDataToDisk(STSBuf* pTSBuf) {
+  if (pTSBuf->tsData.len == 0) {
+    return;
+  }
+  
+  STSBlock* pBlock = &pTSBuf->block;
+  STSList*  pTsData = &pTSBuf->tsData;
+
+  pBlock->numOfElem = pTsData->len / TSDB_KEYSIZE;
+  pBlock->compLen =
+      tsCompressTimestamp(pTsData->rawBuf, pTsData->len, pTsData->len/TSDB_KEYSIZE, pBlock->payload, pTsData->allocSize,
+          TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
+  
+  int64_t r = fseek(pTSBuf->f, pTSBuf->fileSize, SEEK_SET);
+  assert(r == 0);
+  
+  /*
+   * format for output data:
+   * 1. tags, number of ts, size after compressed, payload, size after compressed
+   * 2. tags, number of ts, size after compressed, payload, size after compressed
+   *
+   * both side has the compressed length is used to support load data forwards/backwords.
+   */
+  int32_t metaLen = 0;
+  metaLen += (int32_t)fwrite(&pBlock->tag.nType, 1, sizeof(pBlock->tag.nType), pTSBuf->f);
+  metaLen += (int32_t)fwrite(&pBlock->tag.nLen, 1, sizeof(pBlock->tag.nLen), pTSBuf->f);
+
+  if (pBlock->tag.nType == TSDB_DATA_TYPE_BINARY || pBlock->tag.nType == TSDB_DATA_TYPE_NCHAR) {
+    metaLen += (int32_t)fwrite(pBlock->tag.pz, 1, (size_t)pBlock->tag.nLen, pTSBuf->f);
+  } else if (pBlock->tag.nType != TSDB_DATA_TYPE_NULL) {
+    metaLen += (int32_t)fwrite(&pBlock->tag.i64Key, 1, sizeof(int64_t), pTSBuf->f);
+  }
+
+  fwrite(&pBlock->numOfElem, sizeof(pBlock->numOfElem), 1, pTSBuf->f);
+  fwrite(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
+  fwrite(pBlock->payload, (size_t)pBlock->compLen, 1, pTSBuf->f);
+  fwrite(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
+  
+  int32_t blockSize = metaLen + sizeof(pBlock->numOfElem) + sizeof(pBlock->compLen) * 2 + pBlock->compLen;
+  pTSBuf->fileSize += blockSize;
+  
+  pTSBuf->tsData.len = 0;
+  
+  STSVnodeBlockInfoEx* pVnodeBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
+  
+  pVnodeBlockInfoEx->info.compLen += blockSize;
+  pVnodeBlockInfoEx->info.numOfBlocks += 1;
+  
+  shrinkBuffer(&pTSBuf->tsData);
+}
+
+static void expandBuffer(STSList* ptsData, int32_t inputSize) {
+  if (ptsData->allocSize - ptsData->len < inputSize) {
+    int32_t newSize = inputSize + ptsData->len;
+    char*   tmp = realloc(ptsData->rawBuf, (size_t)newSize);
+    if (tmp == NULL) {
+      // todo
+    }
+    
+    ptsData->rawBuf = tmp;
+    ptsData->allocSize = newSize;
+  }
+}
+
+STSBlock* readDataFromDisk(STSBuf* pTSBuf, int32_t order, bool decomp) {
+  STSBlock* pBlock = &pTSBuf->block;
+  
+  // clear the memory buffer
+  void* tmp = pBlock->payload;
+  memset(pBlock, 0, sizeof(STSBlock));
+  pBlock->payload = tmp;
+  
+  if (order == TSDB_ORDER_DESC) {
+    /*
+     * set the right position for the reversed traverse, the reversed traverse is started from
+     * the end of each comp data block
+     */
+    int32_t ret = fseek(pTSBuf->f, -(int32_t)(sizeof(pBlock->padding)), SEEK_CUR);
+    size_t sz = fread(&pBlock->padding, sizeof(pBlock->padding), 1, pTSBuf->f);
+    UNUSED(sz); 
+    
+    pBlock->compLen = pBlock->padding;
+    int32_t offset = pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
+    ret = fseek(pTSBuf->f, -offset, SEEK_CUR);
+    UNUSED(ret);
+  }
+
+  fread(&pBlock->tag.nType, sizeof(pBlock->tag.nType), 1, pTSBuf->f);
+  fread(&pBlock->tag.nLen, sizeof(pBlock->tag.nLen), 1, pTSBuf->f);
+
+  // NOTE: mix types tags are not supported
+  size_t sz = 0;
+  if (pBlock->tag.nType == TSDB_DATA_TYPE_BINARY || pBlock->tag.nType == TSDB_DATA_TYPE_NCHAR) {
+    char* tp = realloc(pBlock->tag.pz, pBlock->tag.nLen + 1);
+    assert(tp != NULL);
+
+    memset(tp, 0, pBlock->tag.nLen + 1);
+    pBlock->tag.pz = tp;
+
+    sz = fread(pBlock->tag.pz, (size_t)pBlock->tag.nLen, 1, pTSBuf->f);
+  } else if (pBlock->tag.nType != TSDB_DATA_TYPE_NULL) {
+    sz = fread(&pBlock->tag.i64Key, sizeof(int64_t), 1, pTSBuf->f);
+  }
+
+  sz = fread(&pBlock->numOfElem, sizeof(pBlock->numOfElem), 1, pTSBuf->f);
+  UNUSED(sz);
+  sz = fread(&pBlock->compLen, sizeof(pBlock->compLen), 1, pTSBuf->f);
+  UNUSED(sz);
+  sz = fread(pBlock->payload, (size_t)pBlock->compLen, 1, pTSBuf->f);
+  UNUSED(sz);
+  
+  if (decomp) {
+    pTSBuf->tsData.len =
+        tsDecompressTimestamp(pBlock->payload, pBlock->compLen, pBlock->numOfElem, pTSBuf->tsData.rawBuf,
+                              pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
+  }
+  
+  // read the comp length at the length of comp block
+  sz = fread(&pBlock->padding, sizeof(pBlock->padding), 1, pTSBuf->f);
+  UNUSED(sz);
+  
+  // for backwards traverse, set the start position at the end of previous block
+  if (order == TSDB_ORDER_DESC) {
+    int32_t offset = pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
+    int32_t r = fseek(pTSBuf->f, -offset, SEEK_CUR);
+    UNUSED(r);
+  }
+  
+  return pBlock;
+}
+
+// set the order of ts buffer if the ts order has not been set yet
+static int32_t setCheckTSOrder(STSBuf* pTSBuf, const char* pData, int32_t len) {
+  STSList* ptsData = &pTSBuf->tsData;
+  
+  if (pTSBuf->tsOrder == -1) {
+    if (ptsData->len > 0) {
+      TSKEY lastKey = *(TSKEY*)(ptsData->rawBuf + ptsData->len - TSDB_KEYSIZE);
+      
+      if (lastKey > *(TSKEY*)pData) {
+        pTSBuf->tsOrder = TSDB_ORDER_DESC;
+      } else {
+        pTSBuf->tsOrder = TSDB_ORDER_ASC;
+      }
+    } else if (len > TSDB_KEYSIZE) {
+      // no data in current vnode, more than one ts is added, check the orders
+      TSKEY k1 = *(TSKEY*)(pData);
+      TSKEY k2 = *(TSKEY*)(pData + TSDB_KEYSIZE);
+      
+      if (k1 < k2) {
+        pTSBuf->tsOrder = TSDB_ORDER_ASC;
+      } else if (k1 > k2) {
+        pTSBuf->tsOrder = TSDB_ORDER_DESC;
+      } else {
+        // todo handle error
+      }
+    }
+  } else {
+    // todo the timestamp order is set, check the asc/desc order of appended data
+  }
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+void tsBufAppend(STSBuf* pTSBuf, int32_t vnodeId, tVariant* tag, const char* pData, int32_t len) {
+  STSVnodeBlockInfoEx* pBlockInfo = NULL;
+  STSList*             ptsData = &pTSBuf->tsData;
+  
+  if (pTSBuf->numOfVnodes == 0 || tsBufGetLastVnodeInfo(pTSBuf)->info.vnode != vnodeId) {
+    writeDataToDisk(pTSBuf);
+    shrinkBuffer(ptsData);
+    
+    pBlockInfo = addOneVnodeInfo(pTSBuf, vnodeId);
+  } else {
+    pBlockInfo = tsBufGetLastVnodeInfo(pTSBuf);
+  }
+  
+  assert(pBlockInfo->info.vnode == vnodeId);
+
+  if ((tVariantCompare(&pTSBuf->block.tag, tag) != 0) && ptsData->len > 0) {
+    // new arrived data with different tags value, save current value into disk first
+    writeDataToDisk(pTSBuf);
+  } else {
+    expandBuffer(ptsData, len);
+  }
+  
+  tVariantAssign(&pTSBuf->block.tag, tag);
+  memcpy(ptsData->rawBuf + ptsData->len, pData, (size_t)len);
+  
+  // todo check return value
+  setCheckTSOrder(pTSBuf, pData, len);
+  
+  ptsData->len += len;
+  pBlockInfo->len += len;
+  
+  pTSBuf->numOfTotal += len / TSDB_KEYSIZE;
+  
+  // the size of raw data exceeds the size of the default prepared buffer, so
+  // during getBufBlock, the output buffer needs to be large enough.
+  if (ptsData->len >= ptsData->threshold) {
+    writeDataToDisk(pTSBuf);
+    shrinkBuffer(ptsData);
+  }
+  
+  tsBufResetPos(pTSBuf);
+}
+
+void tsBufFlush(STSBuf* pTSBuf) {
+  if (pTSBuf->tsData.len <= 0) {
+    return;
+  }
+  
+  writeDataToDisk(pTSBuf);
+  shrinkBuffer(&pTSBuf->tsData);
+  
+  STSVnodeBlockInfoEx* pBlockInfoEx = tsBufGetLastVnodeInfo(pTSBuf);
+  
+  // update prev vnode length info in file
+  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, &pBlockInfoEx->info);
+  
+  // save the ts order into header
+  STSBufFileHeader header = {
+      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
+  STSBufUpdateHeader(pTSBuf, &header);
+  
+  fsync(fileno(pTSBuf->f));
+}
+
+static int32_t tsBufFindVnodeIndexFromId(STSVnodeBlockInfoEx* pVnodeInfoEx, int32_t numOfVnodes, int32_t vnodeId) {
+  int32_t j = -1;
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    if (pVnodeInfoEx[i].info.vnode == vnodeId) {
+      j = i;
+      break;
+    }
+  }
+  
+  return j;
+}
+
+// todo opt performance by cache blocks info
+static int32_t tsBufFindBlock(STSBuf* pTSBuf, STSVnodeBlockInfo* pBlockInfo, int32_t blockIndex) {
+  if (fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET) != 0) {
+    return -1;
+  }
+  
+  // sequentially read the compressed data blocks, start from the beginning of the comp data block of this vnode
+  int32_t i = 0;
+  bool    decomp = false;
+  
+  while ((i++) <= blockIndex) {
+    if (readDataFromDisk(pTSBuf, TSDB_ORDER_ASC, decomp) == NULL) {
+      return -1;
+    }
+  }
+  
+  // set the file position to be the end of previous comp block
+  if (pTSBuf->cur.order == TSDB_ORDER_DESC) {
+    STSBlock* pBlock = &pTSBuf->block;
+    int32_t   compBlockSize =
+        pBlock->compLen + sizeof(pBlock->compLen) * 2 + sizeof(pBlock->numOfElem) + sizeof(pBlock->tag);
+    int32_t ret = fseek(pTSBuf->f, -compBlockSize, SEEK_CUR);
+    UNUSED(ret);
+  }
+  
+  return 0;
+}
+
+static int32_t tsBufFindBlockByTag(STSBuf* pTSBuf, STSVnodeBlockInfo* pBlockInfo, tVariant* tag) {
+  bool decomp = false;
+  
+  int64_t offset = 0;
+  if (pTSBuf->cur.order == TSDB_ORDER_ASC) {
+    offset = pBlockInfo->offset;
+  } else {  // reversed traverse starts from the end of block
+    offset = pBlockInfo->offset + pBlockInfo->compLen;
+  }
+  
+  if (fseek(pTSBuf->f, (int32_t)offset, SEEK_SET) != 0) {
+    return -1;
+  }
+  
+  for (int32_t i = 0; i < pBlockInfo->numOfBlocks; ++i) {
+    if (readDataFromDisk(pTSBuf, pTSBuf->cur.order, decomp) == NULL) {
+      return -1;
+    }
+    
+    if (tVariantCompare(&pTSBuf->block.tag, tag) == 0) {
+      return i;
+    }
+  }
+  
+  return -1;
+}
+
+static void tsBufGetBlock(STSBuf* pTSBuf, int32_t vnodeIndex, int32_t blockIndex) {
+  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[vnodeIndex].info;
+  if (pBlockInfo->numOfBlocks <= blockIndex) {
+    assert(false);
+  }
+  
+  STSCursor* pCur = &pTSBuf->cur;
+  if (pCur->vgroupIndex == vnodeIndex && ((pCur->blockIndex <= blockIndex && pCur->order == TSDB_ORDER_ASC) ||
+      (pCur->blockIndex >= blockIndex && pCur->order == TSDB_ORDER_DESC))) {
+    int32_t i = 0;
+    bool    decomp = false;
+    int32_t step = abs(blockIndex - pCur->blockIndex);
+    
+    while ((++i) <= step) {
+      if (readDataFromDisk(pTSBuf, pCur->order, decomp) == NULL) {
+        return;
+      }
+    }
+  } else {
+    if (tsBufFindBlock(pTSBuf, pBlockInfo, blockIndex) == -1) {
+      assert(false);
+    }
+  }
+  
+  STSBlock* pBlock = &pTSBuf->block;
+  
+  size_t s = pBlock->numOfElem * TSDB_KEYSIZE;
+  
+  /*
+   * In order to accommodate all the qualified data, the actual buffer size for one block with identical tags value
+   * may exceed the maximum allowed size during *tsBufAppend* function by invoking expandBuffer function
+   */
+  if (s > pTSBuf->tsData.allocSize) {
+    expandBuffer(&pTSBuf->tsData, (int32_t)s);
+  }
+  
+  pTSBuf->tsData.len =
+      tsDecompressTimestamp(pBlock->payload, pBlock->compLen, pBlock->numOfElem, pTSBuf->tsData.rawBuf,
+                            pTSBuf->tsData.allocSize, TWO_STAGE_COMP, pTSBuf->assistBuf, pTSBuf->bufSize);
+  
+  assert((pTSBuf->tsData.len / TSDB_KEYSIZE == pBlock->numOfElem) && (pTSBuf->tsData.allocSize >= pTSBuf->tsData.len));
+  
+  pCur->vgroupIndex = vnodeIndex;
+  pCur->blockIndex = blockIndex;
+  
+  pCur->tsIndex = (pCur->order == TSDB_ORDER_ASC) ? 0 : pBlock->numOfElem - 1;
+}
+
+STSVnodeBlockInfo* tsBufGetVnodeBlockInfo(STSBuf* pTSBuf, int32_t vnodeId) {
+  int32_t j = tsBufFindVnodeIndexFromId(pTSBuf->pData, pTSBuf->numOfVnodes, vnodeId);
+  if (j == -1) {
+    return NULL;
+  }
+  
+  return &pTSBuf->pData[j].info;
+}
+
+int32_t STSBufUpdateHeader(STSBuf* pTSBuf, STSBufFileHeader* pHeader) {
+  if ((pTSBuf->f == NULL) || pHeader == NULL || pHeader->numOfVnode == 0 || pHeader->magic != TS_COMP_FILE_MAGIC) {
+    return -1;
+  }
+
+  assert(pHeader->tsOrder == TSDB_ORDER_ASC || pHeader->tsOrder == TSDB_ORDER_DESC);
+
+  int32_t r = fseek(pTSBuf->f, 0, SEEK_SET);
+  if (r != 0) {
+    return -1;
+  }
+  
+  fwrite(pHeader, sizeof(STSBufFileHeader), 1, pTSBuf->f);
+  return 0;
+}
+
+bool tsBufNextPos(STSBuf* pTSBuf) {
+  if (pTSBuf == NULL || pTSBuf->numOfVnodes == 0) {
+    return false;
+  }
+  
+  STSCursor* pCur = &pTSBuf->cur;
+  
+  // get the first/last position according to traverse order
+  if (pCur->vgroupIndex == -1) {
+    if (pCur->order == TSDB_ORDER_ASC) {
+      tsBufGetBlock(pTSBuf, 0, 0);
+      
+      if (pTSBuf->block.numOfElem == 0) {  // the whole list is empty, return
+        tsBufResetPos(pTSBuf);
+        return false;
+      } else {
+        return true;
+      }
+      
+    } else {  // get the last timestamp record in the last block of the last vnode
+      assert(pTSBuf->numOfVnodes > 0);
+      
+      int32_t vnodeIndex = pTSBuf->numOfVnodes - 1;
+      pCur->vgroupIndex = vnodeIndex;
+      
+      int32_t            vnodeId = pTSBuf->pData[pCur->vgroupIndex].info.vnode;
+      STSVnodeBlockInfo* pBlockInfo = tsBufGetVnodeBlockInfo(pTSBuf, vnodeId);
+      int32_t            blockIndex = pBlockInfo->numOfBlocks - 1;
+      
+      tsBufGetBlock(pTSBuf, vnodeIndex, blockIndex);
+      
+      pCur->tsIndex = pTSBuf->block.numOfElem - 1;
+      if (pTSBuf->block.numOfElem == 0) {
+        tsBufResetPos(pTSBuf);
+        return false;
+      } else {
+        return true;
+      }
+    }
+  }
+  
+  int32_t step = pCur->order == TSDB_ORDER_ASC ? 1 : -1;
+  
+  while (1) {
+    assert(pTSBuf->tsData.len == pTSBuf->block.numOfElem * TSDB_KEYSIZE);
+    
+    if ((pCur->order == TSDB_ORDER_ASC && pCur->tsIndex >= pTSBuf->block.numOfElem - 1) ||
+        (pCur->order == TSDB_ORDER_DESC && pCur->tsIndex <= 0)) {
+      int32_t vnodeId = pTSBuf->pData[pCur->vgroupIndex].info.vnode;
+      
+      STSVnodeBlockInfo* pBlockInfo = tsBufGetVnodeBlockInfo(pTSBuf, vnodeId);
+      if (pBlockInfo == NULL || (pCur->blockIndex >= pBlockInfo->numOfBlocks - 1 && pCur->order == TSDB_ORDER_ASC) ||
+          (pCur->blockIndex <= 0 && pCur->order == TSDB_ORDER_DESC)) {
+        if ((pCur->vgroupIndex >= pTSBuf->numOfVnodes - 1 && pCur->order == TSDB_ORDER_ASC) ||
+            (pCur->vgroupIndex <= 0 && pCur->order == TSDB_ORDER_DESC)) {
+          pCur->vgroupIndex = -1;
+          return false;
+        }
+        
+        if (pBlockInfo == NULL) {
+          return false;
+        }
+        
+        int32_t blockIndex = pCur->order == TSDB_ORDER_ASC ? 0 : pBlockInfo->numOfBlocks - 1;
+        tsBufGetBlock(pTSBuf, pCur->vgroupIndex + step, blockIndex);
+        break;
+        
+      } else {
+        tsBufGetBlock(pTSBuf, pCur->vgroupIndex, pCur->blockIndex + step);
+        break;
+      }
+    } else {
+      pCur->tsIndex += step;
+      break;
+    }
+  }
+  
+  return true;
+}
+
+void tsBufResetPos(STSBuf* pTSBuf) {
+  if (pTSBuf == NULL) {
+    return;
+  }
+  
+  pTSBuf->cur = (STSCursor){.tsIndex = -1, .blockIndex = -1, .vgroupIndex = -1, .order = pTSBuf->cur.order};
+}
+
+STSElem tsBufGetElem(STSBuf* pTSBuf) {
+  STSElem    elem1 = {.vnode = -1};
+  
+  if (pTSBuf == NULL) {
+    return elem1;
+  }
+  
+  STSCursor* pCur = &pTSBuf->cur;
+  if (pCur != NULL && pCur->vgroupIndex < 0) {
+    return elem1;
+  }
+
+  STSBlock* pBlock = &pTSBuf->block;
+  
+  elem1.vnode = pTSBuf->pData[pCur->vgroupIndex].info.vnode;
+  elem1.ts = *(TSKEY*)(pTSBuf->tsData.rawBuf + pCur->tsIndex * TSDB_KEYSIZE);
+  tVariantAssign(&elem1.tag, &pBlock->tag);
+
+  return elem1;
+}
+
+/**
+ * current only support ts comp data from two vnode merge
+ * @param pDestBuf
+ * @param pSrcBuf
+ * @param vnodeId
+ * @return
+ */
+int32_t tsBufMerge(STSBuf* pDestBuf, const STSBuf* pSrcBuf, int32_t vnodeId) {
+  if (pDestBuf == NULL || pSrcBuf == NULL || pSrcBuf->numOfVnodes <= 0) {
+    return 0;
+  }
+  
+  if (pDestBuf->numOfVnodes + pSrcBuf->numOfVnodes > TS_COMP_FILE_VNODE_MAX) {
+    return -1;
+  }
+  
+  // src can only have one vnode index
+  if (pSrcBuf->numOfVnodes > 1) {
+    return -1;
+  }
+  
+  // there are data in buffer, flush to disk first
+  tsBufFlush(pDestBuf);
+  
+  // compared with the last vnode id
+  if (vnodeId != tsBufGetLastVnodeInfo(pDestBuf)->info.vnode) {
+    int32_t oldSize = pDestBuf->numOfVnodes;
+    int32_t newSize = oldSize + pSrcBuf->numOfVnodes;
+    
+    if (pDestBuf->numOfAlloc < newSize) {
+      pDestBuf->numOfAlloc = newSize;
+      
+      STSVnodeBlockInfoEx* tmp = realloc(pDestBuf->pData, sizeof(STSVnodeBlockInfoEx) * newSize);
+      if (tmp == NULL) {
+        return -1;
+      }
+      
+      pDestBuf->pData = tmp;
+    }
+    
+    // directly copy the vnode index information
+    memcpy(&pDestBuf->pData[oldSize], pSrcBuf->pData, (size_t)pSrcBuf->numOfVnodes * sizeof(STSVnodeBlockInfoEx));
+    
+    // set the new offset value
+    for (int32_t i = 0; i < pSrcBuf->numOfVnodes; ++i) {
+      STSVnodeBlockInfoEx* pBlockInfoEx = &pDestBuf->pData[i + oldSize];
+      pBlockInfoEx->info.offset = (pSrcBuf->pData[i].info.offset - getDataStartOffset()) + pDestBuf->fileSize;
+      pBlockInfoEx->info.vnode = vnodeId;
+    }
+    
+    pDestBuf->numOfVnodes = newSize;
+  } else {
+    STSVnodeBlockInfoEx* pBlockInfoEx = tsBufGetLastVnodeInfo(pDestBuf);
+    
+    pBlockInfoEx->len += pSrcBuf->pData[0].len;
+    pBlockInfoEx->info.numOfBlocks += pSrcBuf->pData[0].info.numOfBlocks;
+    pBlockInfoEx->info.compLen += pSrcBuf->pData[0].info.compLen;
+    pBlockInfoEx->info.vnode = vnodeId;
+  }
+  
+  int32_t r = fseek(pDestBuf->f, 0, SEEK_END);
+  assert(r == 0);
+  
+  int64_t offset = getDataStartOffset();
+  int32_t size = (int32_t)pSrcBuf->fileSize - (int32_t)offset;
+
+  ssize_t rc = taosFSendFile(pDestBuf->f, pSrcBuf->f, &offset, size);
+  
+  if (rc == -1) {
+//    tscError("failed to merge tsBuf from:%s to %s, reason:%s\n", pSrcBuf->path, pDestBuf->path, strerror(errno));
+    return -1;
+  }
+  
+  if (rc != size) {
+//    tscError("failed to merge tsBuf from:%s to %s, reason:%s\n", pSrcBuf->path, pDestBuf->path, strerror(errno));
+    return -1;
+  }
+  
+  pDestBuf->numOfTotal += pSrcBuf->numOfTotal;
+  
+  int32_t oldSize = pDestBuf->fileSize;
+  
+  struct stat fileStat;
+  if (fstat(fileno(pDestBuf->f), &fileStat) != 0) {
+    return -1;  
+  }
+  pDestBuf->fileSize = (uint32_t)fileStat.st_size;
+  
+  assert(pDestBuf->fileSize == oldSize + size);
+  
+//  tscDebug("tsBuf merge success, %p, path:%s, fd:%d, file size:%d, numOfVnode:%d, autoDelete:%d", pDestBuf,
+//           pDestBuf->path, fileno(pDestBuf->f), pDestBuf->fileSize, pDestBuf->numOfVnodes, pDestBuf->autoDelete);
+  
+  return 0;
+}
+
+STSBuf* tsBufCreateFromCompBlocks(const char* pData, int32_t numOfBlocks, int32_t len, int32_t order) {
+  STSBuf* pTSBuf = tsBufCreate(true, order);
+  
+  STSVnodeBlockInfo* pBlockInfo = &(addOneVnodeInfo(pTSBuf, 0)->info);
+  pBlockInfo->numOfBlocks = numOfBlocks;
+  pBlockInfo->compLen = len;
+  pBlockInfo->offset = getDataStartOffset();
+  pBlockInfo->vnode = 0;
+  
+  // update prev vnode length info in file
+  TSBufUpdateVnodeInfo(pTSBuf, pTSBuf->numOfVnodes - 1, pBlockInfo);
+  
+  int32_t ret = fseek(pTSBuf->f, pBlockInfo->offset, SEEK_SET);
+  UNUSED(ret);
+  size_t sz = fwrite((void*)pData, 1, len, pTSBuf->f);
+  UNUSED(sz);
+  pTSBuf->fileSize += len;
+  
+  pTSBuf->tsOrder = order;
+  assert(order == TSDB_ORDER_ASC || order == TSDB_ORDER_DESC);
+  
+  STSBufFileHeader header = {
+      .magic = TS_COMP_FILE_MAGIC, .numOfVnode = pTSBuf->numOfVnodes, .tsOrder = pTSBuf->tsOrder};
+  STSBufUpdateHeader(pTSBuf, &header);
+  
+  fsync(fileno(pTSBuf->f));
+  
+  return pTSBuf;
+}
+
+STSElem tsBufGetElemStartPos(STSBuf* pTSBuf, int32_t vnodeId, tVariant* tag) {
+  STSElem elem = {.vnode = -1};
+  
+  if (pTSBuf == NULL) {
+    return elem;
+  }
+  
+  int32_t j = tsBufFindVnodeIndexFromId(pTSBuf->pData, pTSBuf->numOfVnodes, vnodeId);
+  if (j == -1) {
+    return elem;
+  }
+  
+  // for debug purpose
+  //  tsBufDisplay(pTSBuf);
+  
+  STSCursor*         pCur = &pTSBuf->cur;
+  STSVnodeBlockInfo* pBlockInfo = &pTSBuf->pData[j].info;
+  
+  int32_t blockIndex = tsBufFindBlockByTag(pTSBuf, pBlockInfo, tag);
+  if (blockIndex < 0) {
+    return elem;
+  }
+  
+  pCur->vgroupIndex = j;
+  pCur->blockIndex = blockIndex;
+  tsBufGetBlock(pTSBuf, j, blockIndex);
+  
+  return tsBufGetElem(pTSBuf);
+}
+
+STSCursor tsBufGetCursor(STSBuf* pTSBuf) {
+  STSCursor c = {.vgroupIndex = -1};
+  if (pTSBuf == NULL) {
+    return c;
+  }
+  
+  return pTSBuf->cur;
+}
+
+void tsBufSetCursor(STSBuf* pTSBuf, STSCursor* pCur) {
+  if (pTSBuf == NULL || pCur == NULL) {
+    return;
+  }
+  
+  //  assert(pCur->vgroupIndex != -1 && pCur->tsIndex >= 0 && pCur->blockIndex >= 0);
+  if (pCur->vgroupIndex != -1) {
+    tsBufGetBlock(pTSBuf, pCur->vgroupIndex, pCur->blockIndex);
+  }
+  
+  pTSBuf->cur = *pCur;
+}
+
+void tsBufSetTraverseOrder(STSBuf* pTSBuf, int32_t order) {
+  if (pTSBuf == NULL) {
+    return;
+  }
+  
+  pTSBuf->cur.order = order;
+}
+
+STSBuf* tsBufClone(STSBuf* pTSBuf) {
+  if (pTSBuf == NULL) {
+    return NULL;
+  }
+
+  tsBufFlush(pTSBuf);
+
+  return tsBufCreateFromFile(pTSBuf->path, false);
+}
+
+void tsBufDisplay(STSBuf* pTSBuf) {
+  printf("-------start of ts comp file-------\n");
+  printf("number of vnode:%d\n", pTSBuf->numOfVnodes);
+  
+  int32_t old = pTSBuf->cur.order;
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
+  
+  tsBufResetPos(pTSBuf);
+  
+  while (tsBufNextPos(pTSBuf)) {
+    STSElem elem = tsBufGetElem(pTSBuf);
+    if (elem.tag.nType == TSDB_DATA_TYPE_BIGINT) {
+      printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, elem.tag.i64Key, elem.ts);
+    }
+  }
+  
+  pTSBuf->cur.order = old;
+  printf("-------end of ts comp file-------\n");
+}
+
+static int32_t getDataStartOffset() {
+  return sizeof(STSBufFileHeader) + TS_COMP_FILE_VNODE_MAX * sizeof(STSVnodeBlockInfo);
+}
+
+static int32_t doUpdateVnodeInfo(STSBuf* pTSBuf, int64_t offset, STSVnodeBlockInfo* pVInfo) {
+  if (offset < 0 || offset >= getDataStartOffset()) {
+    return -1;
+  }
+  
+  if (fseek(pTSBuf->f, (int32_t)offset, SEEK_SET) != 0) {
+    return -1;
+  }
+  
+  fwrite(pVInfo, sizeof(STSVnodeBlockInfo), 1, pTSBuf->f);
+  return 0;
+}
+
+// update prev vnode length info in file
+static void TSBufUpdateVnodeInfo(STSBuf* pTSBuf, int32_t index, STSVnodeBlockInfo* pBlockInfo) {
+  int32_t offset = sizeof(STSBufFileHeader) + index * sizeof(STSVnodeBlockInfo);
+  doUpdateVnodeInfo(pTSBuf, offset, pBlockInfo);
+}
+
+static STSBuf* allocResForTSBuf(STSBuf* pTSBuf) {
+  const int32_t INITIAL_VNODEINFO_SIZE = 4;
+  
+  pTSBuf->numOfAlloc = INITIAL_VNODEINFO_SIZE;
+  pTSBuf->pData = calloc(pTSBuf->numOfAlloc, sizeof(STSVnodeBlockInfoEx));
+  if (pTSBuf->pData == NULL) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  pTSBuf->tsData.rawBuf = malloc(MEM_BUF_SIZE);
+  if (pTSBuf->tsData.rawBuf == NULL) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  pTSBuf->bufSize = MEM_BUF_SIZE;
+  pTSBuf->tsData.threshold = MEM_BUF_SIZE;
+  pTSBuf->tsData.allocSize = MEM_BUF_SIZE;
+  
+  pTSBuf->assistBuf = malloc(MEM_BUF_SIZE);
+  if (pTSBuf->assistBuf == NULL) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  pTSBuf->block.payload = malloc(MEM_BUF_SIZE);
+  if (pTSBuf->block.payload == NULL) {
+    tsBufDestroy(pTSBuf);
+    return NULL;
+  }
+  
+  pTSBuf->fileSize += getDataStartOffset();
+  return pTSBuf;
+}
diff --git a/src/query/src/qUtil.c b/src/query/src/qUtil.c
new file mode 100644
index 0000000000000000000000000000000000000000..2bd92c74a456c16fe946288968d25d797907a390
--- /dev/null
+++ b/src/query/src/qUtil.c
@@ -0,0 +1,321 @@
+/*
+ * 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 "os.h"
+#include "hash.h"
+#include "taosmsg.h"
+#include "qExecutor.h"
+#include "qUtil.h"
+
+int32_t getOutputInterResultBufSize(SQuery* pQuery) {
+  int32_t size = 0;
+
+  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
+    size += pQuery->pSelectExpr[i].interBytes;
+  }
+
+  assert(size > 0);
+  return size;
+}
+
+int32_t initWindowResInfo(SWindowResInfo *pWindowResInfo, SQueryRuntimeEnv *pRuntimeEnv, int32_t size,
+                          int32_t threshold, int16_t type) {
+  pWindowResInfo->capacity = size;
+  pWindowResInfo->threshold = threshold;
+  
+  pWindowResInfo->type = type;
+  _hash_fn_t fn = taosGetDefaultHashFunction(type);
+  pWindowResInfo->hashList = taosHashInit(threshold, fn, true, false);
+  if (pWindowResInfo->hashList == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+  
+  pWindowResInfo->curIndex = -1;
+  pWindowResInfo->size     = 0;
+  pWindowResInfo->prevSKey = TSKEY_INITIAL_VAL;
+
+  SQueryCostInfo* pSummary = &pRuntimeEnv->summary;
+
+  // use the pointer arraylist
+  pWindowResInfo->pResult = calloc(threshold, sizeof(SWindowResult));
+  if (pWindowResInfo->pResult == NULL) {
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  pWindowResInfo->interval = pRuntimeEnv->pQuery->interval.interval;
+
+  pSummary->internalSupSize += sizeof(SWindowResult) * threshold;
+  pSummary->internalSupSize += (pRuntimeEnv->pQuery->numOfOutput * sizeof(SResultInfo) + pRuntimeEnv->interBufSize) * pWindowResInfo->capacity;
+  pSummary->numOfTimeWindows = threshold;
+
+  for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
+    int32_t code = createQueryResultInfo(pRuntimeEnv->pQuery, &pWindowResInfo->pResult[i], pRuntimeEnv->stableQuery, pRuntimeEnv->interBufSize);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+  }
+  
+  return TSDB_CODE_SUCCESS;
+}
+
+void destroyTimeWindowRes(SWindowResult *pWindowRes) {
+  if (pWindowRes == NULL) {
+    return;
+  }
+
+  free(pWindowRes->resultInfo);
+}
+
+void cleanupTimeWindowInfo(SWindowResInfo *pWindowResInfo) {
+  if (pWindowResInfo == NULL) {
+    return;
+  }
+  if (pWindowResInfo->capacity == 0) {
+    assert(pWindowResInfo->hashList == NULL && pWindowResInfo->pResult == NULL);
+    return;
+  }
+  
+  if (pWindowResInfo->pResult != NULL) {
+    for (int32_t i = 0; i < pWindowResInfo->capacity; ++i) {
+      destroyTimeWindowRes(&pWindowResInfo->pResult[i]);
+    }
+  }
+  
+  taosHashCleanup(pWindowResInfo->hashList);
+  taosTFree(pWindowResInfo->pResult);
+}
+
+void resetTimeWindowInfo(SQueryRuntimeEnv *pRuntimeEnv, SWindowResInfo *pWindowResInfo) {
+  if (pWindowResInfo == NULL || pWindowResInfo->capacity == 0) {
+    return;
+  }
+  
+  for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+    SWindowResult *pWindowRes = &pWindowResInfo->pResult[i];
+    clearTimeWindowResBuf(pRuntimeEnv, pWindowRes);
+  }
+  
+  pWindowResInfo->curIndex = -1;
+  taosHashCleanup(pWindowResInfo->hashList);
+  pWindowResInfo->size = 0;
+  
+  _hash_fn_t fn = taosGetDefaultHashFunction(pWindowResInfo->type);
+  pWindowResInfo->hashList = taosHashInit(pWindowResInfo->capacity, fn, true, false);
+  
+  pWindowResInfo->startTime = TSKEY_INITIAL_VAL;
+  pWindowResInfo->prevSKey = TSKEY_INITIAL_VAL;
+}
+
+void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
+  SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+  if (pWindowResInfo == NULL || pWindowResInfo->capacity == 0 || pWindowResInfo->size == 0 || num == 0) {
+    return;
+  }
+  
+  int32_t numOfClosed = numOfClosedTimeWindow(pWindowResInfo);
+  assert(num >= 0 && num <= numOfClosed);
+
+  int16_t type = pWindowResInfo->type;
+
+  char *key = NULL;
+  int16_t bytes = -1;
+
+  for (int32_t i = 0; i < num; ++i) {
+    SWindowResult *pResult = &pWindowResInfo->pResult[i];
+    if (pResult->closed) {  // remove the window slot from hash table
+
+      // todo refactor
+      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+        key = varDataVal(pResult->key);
+        bytes = varDataLen(pResult->key);
+      } else {
+        key = (char*) &pResult->win.skey;
+        bytes = tDataTypeDesc[pWindowResInfo->type].nSize;
+      }
+
+      taosHashRemove(pWindowResInfo->hashList, (const char *)key, bytes);
+    } else {
+      break;
+    }
+  }
+  
+  int32_t remain = pWindowResInfo->size - num;
+  
+  // clear all the closed windows from the window list
+  for (int32_t k = 0; k < remain; ++k) {
+    copyTimeWindowResBuf(pRuntimeEnv, &pWindowResInfo->pResult[k], &pWindowResInfo->pResult[num + k]);
+  }
+  
+  // move the unclosed window in the front of the window list
+  for (int32_t k = remain; k < pWindowResInfo->size; ++k) {
+    SWindowResult *pWindowRes = &pWindowResInfo->pResult[k];
+    clearTimeWindowResBuf(pRuntimeEnv, pWindowRes);
+  }
+  
+  pWindowResInfo->size = remain;
+
+  for (int32_t k = 0; k < pWindowResInfo->size; ++k) {
+    SWindowResult *pResult = &pWindowResInfo->pResult[k];
+
+    if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+      key = varDataVal(pResult->key);
+      bytes = varDataLen(pResult->key);
+    } else {
+      key = (char*) &pResult->win.skey;
+      bytes = tDataTypeDesc[pWindowResInfo->type].nSize;
+    }
+
+    int32_t *p = (int32_t *)taosHashGet(pWindowResInfo->hashList, (const char *)key, bytes);
+    assert(p != NULL); 
+
+    int32_t  v = (*p - num);
+    assert(v >= 0 && v <= pWindowResInfo->size);
+    taosHashPut(pWindowResInfo->hashList, (char *)key, bytes, (char *)&v, sizeof(int32_t));
+  }
+  
+  pWindowResInfo->curIndex = -1;
+}
+
+void clearClosedTimeWindow(SQueryRuntimeEnv *pRuntimeEnv) {
+  SWindowResInfo *pWindowResInfo = &pRuntimeEnv->windowResInfo;
+  if (pWindowResInfo == NULL || pWindowResInfo->capacity == 0 || pWindowResInfo->size == 0) {
+    return;
+  }
+  
+  int32_t numOfClosed = numOfClosedTimeWindow(pWindowResInfo);
+  clearFirstNTimeWindow(pRuntimeEnv, numOfClosed);
+}
+
+int32_t numOfClosedTimeWindow(SWindowResInfo *pWindowResInfo) {
+  int32_t i = 0;
+  while (i < pWindowResInfo->size && pWindowResInfo->pResult[i].closed) {
+    ++i;
+  }
+  
+  return i;
+}
+
+void closeAllTimeWindow(SWindowResInfo *pWindowResInfo) {
+  assert(pWindowResInfo->size >= 0 && pWindowResInfo->capacity >= pWindowResInfo->size);
+  
+  for (int32_t i = 0; i < pWindowResInfo->size; ++i) {
+    if (pWindowResInfo->pResult[i].closed) {
+      continue;
+    }
+    
+    pWindowResInfo->pResult[i].closed = true;
+  }
+}
+
+/*
+ * remove the results that are not the FIRST time window that spreads beyond the
+ * the last qualified time stamp in case of sliding query, which the sliding time is not equalled to the interval time.
+ * NOTE: remove redundant, only when the result set order equals to traverse order
+ */
+void removeRedundantWindow(SWindowResInfo *pWindowResInfo, TSKEY lastKey, int32_t order) {
+  assert(pWindowResInfo->size >= 0 && pWindowResInfo->capacity >= pWindowResInfo->size);
+  if (pWindowResInfo->size <= 1) {
+    return;
+  }
+
+  // get the result order
+  int32_t resultOrder = (pWindowResInfo->pResult[0].win.skey < pWindowResInfo->pResult[1].win.skey)? 1:-1;
+  if (order != resultOrder) {
+    return;
+  }
+
+  int32_t i = 0;
+  if (order == QUERY_ASC_FORWARD_STEP) {
+    TSKEY ekey = pWindowResInfo->pResult[i].win.ekey;
+    while (i < pWindowResInfo->size && (ekey < lastKey)) {
+      ++i;
+    }
+  } else if (order == QUERY_DESC_FORWARD_STEP) {
+    while (i < pWindowResInfo->size && (pWindowResInfo->pResult[i].win.skey > lastKey)) {
+      ++i;
+    }
+  }
+
+  if (i < pWindowResInfo->size) {
+    pWindowResInfo->size = (i + 1);
+  }
+}
+
+bool isWindowResClosed(SWindowResInfo *pWindowResInfo, int32_t slot) {
+  return (getWindowResult(pWindowResInfo, slot)->closed == true);
+}
+
+void closeTimeWindow(SWindowResInfo *pWindowResInfo, int32_t slot) {
+  getWindowResult(pWindowResInfo, slot)->closed = true;
+}
+
+void clearTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *pWindowRes) {
+  if (pWindowRes == NULL) {
+    return;
+  }
+
+  tFilePage *page = getResBufPage(pRuntimeEnv->pResultBuf, pWindowRes->pos.pageId);
+
+  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutput; ++i) {
+    SResultInfo *pResultInfo = &pWindowRes->resultInfo[i];
+    
+    char * s = getPosInResultPage(pRuntimeEnv, i, pWindowRes, page);
+    size_t size = pRuntimeEnv->pQuery->pSelectExpr[i].bytes;
+    memset(s, 0, size);
+    
+    RESET_RESULT_INFO(pResultInfo);
+  }
+  
+  pWindowRes->numOfRows = 0;
+  pWindowRes->pos = (SPosInfo){-1, -1};
+  pWindowRes->closed = false;
+  pWindowRes->win = TSWINDOW_INITIALIZER;
+}
+
+/**
+ * The source window result pos attribution of the source window result does not assign to the destination,
+ * since the attribute of "Pos" is bound to each window result when the window result is created in the
+ * disk-based result buffer.
+ */
+void copyTimeWindowResBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *dst, const SWindowResult *src) {
+  dst->numOfRows = src->numOfRows;
+  dst->win   = src->win;
+  dst->closed = src->closed;
+  
+  int32_t nOutputCols = pRuntimeEnv->pQuery->numOfOutput;
+  
+  for (int32_t i = 0; i < nOutputCols; ++i) {
+    SResultInfo *pDst = &dst->resultInfo[i];
+    SResultInfo *pSrc = &src->resultInfo[i];
+    
+    char *buf = pDst->interResultBuf;
+    memcpy(pDst, pSrc, sizeof(SResultInfo));
+    pDst->interResultBuf = buf;  // restore the allocated buffer
+    
+    // copy the result info struct
+    memcpy(pDst->interResultBuf, pSrc->interResultBuf, pDst->bufLen);
+    
+    // copy the output buffer data from src to dst, the position info keep unchanged
+    tFilePage *dstpage = getResBufPage(pRuntimeEnv->pResultBuf, dst->pos.pageId);
+    char * dstBuf = getPosInResultPage(pRuntimeEnv, i, dst, dstpage);
+
+    tFilePage *srcpage = getResBufPage(pRuntimeEnv->pResultBuf, src->pos.pageId);
+    char * srcBuf = getPosInResultPage(pRuntimeEnv, i, (SWindowResult *)src, srcpage);
+    size_t s = pRuntimeEnv->pQuery->pSelectExpr[i].bytes;
+    
+    memcpy(dstBuf, srcBuf, s);
+  }
+}
+
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
new file mode 100644
index 0000000000000000000000000000000000000000..a18efdeb744ba039c685d5fc1067c95e3ca15d86
--- /dev/null
+++ b/src/query/src/sql.c
@@ -0,0 +1,3133 @@
+/*
+** 2000-05-29
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** Driver template for the LEMON parser generator.
+**
+** The "lemon" program processes an LALR(1) input grammar file, then uses
+** this template to construct a parser.  The "lemon" program inserts text
+** at each "%%" line.  Also, any "P-a-r-s-e" identifer prefix (without the
+** interstitial "-" characters) contained in this template is changed into
+** the value of the %name directive from the grammar.  Otherwise, the content
+** of this template is copied straight through into the generate parser
+** source file.
+**
+** The following is the concatenation of all %include directives from the
+** input grammar file:
+*/
+#include <stdio.h>
+/************ Begin %include sections from the grammar ************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdbool.h>
+#include "qSqlparser.h"
+#include "tcmdtype.h"
+#include "tstoken.h"
+#include "ttokendef.h"
+#include "tutil.h"
+#include "tvariant.h"
+/**************** End of %include directives **********************************/
+/* These constants specify the various numeric values for terminal symbols
+** in a format understandable to "makeheaders".  This section is blank unless
+** "lemon" is run with the "-m" command-line option.
+***************** Begin makeheaders token definitions *************************/
+/**************** End makeheaders token definitions ***************************/
+
+/* The next sections is a series of control #defines.
+** various aspects of the generated parser.
+**    YYCODETYPE         is the data type used to store the integer codes
+**                       that represent terminal and non-terminal symbols.
+**                       "unsigned char" is used if there are fewer than
+**                       256 symbols.  Larger types otherwise.
+**    YYNOCODE           is a number of type YYCODETYPE that is not used for
+**                       any terminal or nonterminal symbol.
+**    YYFALLBACK         If defined, this indicates that one or more tokens
+**                       (also known as: "terminal symbols") have fall-back
+**                       values which should be used if the original symbol
+**                       would not parse.  This permits keywords to sometimes
+**                       be used as identifiers, for example.
+**    YYACTIONTYPE       is the data type used for "action codes" - numbers
+**                       that indicate what to do in response to the next
+**                       token.
+**    ParseTOKENTYPE     is the data type used for minor type for terminal
+**                       symbols.  Background: A "minor type" is a semantic
+**                       value associated with a terminal or non-terminal
+**                       symbols.  For example, for an "ID" terminal symbol,
+**                       the minor type might be the name of the identifier.
+**                       Each non-terminal can have a different minor type.
+**                       Terminal symbols all have the same minor type, though.
+**                       This macros defines the minor type for terminal 
+**                       symbols.
+**    YYMINORTYPE        is the data type used for all minor types.
+**                       This is typically a union of many types, one of
+**                       which is ParseTOKENTYPE.  The entry in the union
+**                       for terminal symbols is called "yy0".
+**    YYSTACKDEPTH       is the maximum depth of the parser's stack.  If
+**                       zero the stack is dynamically sized using realloc()
+**    ParseARG_SDECL     A static variable declaration for the %extra_argument
+**    ParseARG_PDECL     A parameter declaration for the %extra_argument
+**    ParseARG_STORE     Code to store %extra_argument into yypParser
+**    ParseARG_FETCH     Code to extract %extra_argument from yypParser
+**    YYERRORSYMBOL      is the code number of the error symbol.  If not
+**                       defined, then do no error processing.
+**    YYNSTATE           the combined number of states.
+**    YYNRULE            the number of rules in the grammar
+**    YYNTOKEN           Number of terminal symbols
+**    YY_MAX_SHIFT       Maximum value for shift actions
+**    YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions
+**    YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions
+**    YY_ERROR_ACTION    The yy_action[] code for syntax error
+**    YY_ACCEPT_ACTION   The yy_action[] code for accept
+**    YY_NO_ACTION       The yy_action[] code for no-op
+**    YY_MIN_REDUCE      Minimum value for reduce actions
+**    YY_MAX_REDUCE      Maximum value for reduce actions
+*/
+#ifndef INTERFACE
+# define INTERFACE 1
+#endif
+/************* Begin control #defines *****************************************/
+#define YYCODETYPE unsigned short int
+#define YYNOCODE 272
+#define YYACTIONTYPE unsigned short int
+#define ParseTOKENTYPE SStrToken
+typedef union {
+  int yyinit;
+  ParseTOKENTYPE yy0;
+  SSubclauseInfo* yy25;
+  tSQLExpr* yy66;
+  SCreateAcctSQL yy73;
+  int yy82;
+  SQuerySQL* yy150;
+  SCreateDBInfo yy158;
+  TAOS_FIELD yy181;
+  SLimitVal yy188;
+  tSQLExprList* yy224;
+  int64_t yy271;
+  tVariant yy312;
+  SIntervalVal yy314;
+  SCreateTableSQL* yy374;
+  tFieldList* yy449;
+  tVariantList* yy494;
+} YYMINORTYPE;
+#ifndef YYSTACKDEPTH
+#define YYSTACKDEPTH 100
+#endif
+#define ParseARG_SDECL SSqlInfo* pInfo;
+#define ParseARG_PDECL ,SSqlInfo* pInfo
+#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
+#define ParseARG_STORE yypParser->pInfo = pInfo
+#define YYFALLBACK 1
+#define YYNSTATE             252
+#define YYNRULE              230
+#define YYNTOKEN             206
+#define YY_MAX_SHIFT         251
+#define YY_MIN_SHIFTREDUCE   416
+#define YY_MAX_SHIFTREDUCE   645
+#define YY_ERROR_ACTION      646
+#define YY_ACCEPT_ACTION     647
+#define YY_NO_ACTION         648
+#define YY_MIN_REDUCE        649
+#define YY_MAX_REDUCE        878
+/************* End control #defines *******************************************/
+
+/* Define the yytestcase() macro to be a no-op if is not already defined
+** otherwise.
+**
+** Applications can choose to define yytestcase() in the %include section
+** to a macro that can assist in verifying code coverage.  For production
+** code the yytestcase() macro should be turned off.  But it is useful
+** for testing.
+*/
+#ifndef yytestcase
+# define yytestcase(X)
+#endif
+
+
+/* Next are the tables used to determine what action to take based on the
+** current state and lookahead token.  These tables are used to implement
+** functions that take a state number and lookahead value and return an
+** action integer.  
+**
+** Suppose the action integer is N.  Then the action is determined as
+** follows
+**
+**   0 <= N <= YY_MAX_SHIFT             Shift N.  That is, push the lookahead
+**                                      token onto the stack and goto state N.
+**
+**   N between YY_MIN_SHIFTREDUCE       Shift to an arbitrary state then
+**     and YY_MAX_SHIFTREDUCE           reduce by rule N-YY_MIN_SHIFTREDUCE.
+**
+**   N == YY_ERROR_ACTION               A syntax error has occurred.
+**
+**   N == YY_ACCEPT_ACTION              The parser accepts its input.
+**
+**   N == YY_NO_ACTION                  No such action.  Denotes unused
+**                                      slots in the yy_action[] table.
+**
+**   N between YY_MIN_REDUCE            Reduce by rule N-YY_MIN_REDUCE
+**     and YY_MAX_REDUCE
+**
+** The action table is constructed as a single large table named yy_action[].
+** Given state S and lookahead X, the action is computed as either:
+**
+**    (A)   N = yy_action[ yy_shift_ofst[S] + X ]
+**    (B)   N = yy_default[S]
+**
+** The (A) formula is preferred.  The B formula is used instead if
+** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X.
+**
+** The formulas above are for computing the action when the lookahead is
+** a terminal symbol.  If the lookahead is a non-terminal (as occurs after
+** a reduce action) then the yy_reduce_ofst[] array is used in place of
+** the yy_shift_ofst[] array.
+**
+** The following are the tables generated in this section:
+**
+**  yy_action[]        A single table containing all actions.
+**  yy_lookahead[]     A table containing the lookahead for each entry in
+**                     yy_action.  Used to detect hash collisions.
+**  yy_shift_ofst[]    For each state, the offset into yy_action for
+**                     shifting terminals.
+**  yy_reduce_ofst[]   For each state, the offset into yy_action for
+**                     shifting non-terminals after a reduce.
+**  yy_default[]       Default action for each state.
+**
+*********** Begin parsing tables **********************************************/
+#define YY_ACTTAB_COUNT (566)
+static const YYACTIONTYPE yy_action[] = {
+ /*     0 */   751,  459,   11,  749,  750,  647,  251,  459,  752,  460,
+ /*    10 */   754,  755,  753,   35,   36,  460,   37,   38,  159,  249,
+ /*    20 */   170,   29,  141,  459,  206,   41,   39,   43,   40,  140,
+ /*    30 */   145,  460,  865,   34,   33,  862,  141,   32,   31,   30,
+ /*    40 */    35,   36,  781,   37,   38,  165,  866,  170,   29,  141,
+ /*    50 */    62,  206,   41,   39,   43,   40,  191,  525,  164,  866,
+ /*    60 */    34,   33,   27,   21,   32,   31,   30,  417,  418,  419,
+ /*    70 */   420,  421,  422,  423,  424,  425,  426,  427,  428,  250,
+ /*    80 */    35,   36,  181,   37,   38,  227,  226,  170,   29,  781,
+ /*    90 */   176,  206,   41,   39,   43,   40,  174,  162,  767,  792,
+ /*   100 */    34,   33,   56,  160,   32,   31,   30,   21,   36,    8,
+ /*   110 */    37,   38,   63,  118,  170,   29,  770,  108,  206,   41,
+ /*   120 */    39,   43,   40,   32,   31,   30,  599,   34,   33,   78,
+ /*   130 */   875,   32,   31,   30,  238,   37,   38,  108,  238,  170,
+ /*   140 */    29,  184,  766,  206,   41,   39,   43,   40,  188,  187,
+ /*   150 */   789,  177,   34,   33,  224,  223,   32,   31,   30,   16,
+ /*   160 */   218,  244,  243,  217,  216,  215,  242,  214,  241,  240,
+ /*   170 */   239,  213,  747,  818,  735,  736,  737,  738,  739,  740,
+ /*   180 */   741,  742,  743,  744,  745,  746,  169,  612,  103,   12,
+ /*   190 */   603,   17,  606,  819,  609,  201,  169,  612,   26,  108,
+ /*   200 */   603,  108,  606,  861,  609,  153,  169,  612,  173,  567,
+ /*   210 */   603,  154,  606,  105,  609,   90,   89,  148,  166,  167,
+ /*   220 */    34,   33,  205,  102,   32,   31,   30,  770,  166,  167,
+ /*   230 */    26,   21,  557,   41,   39,   43,   40,  549,  166,  167,
+ /*   240 */   194,   34,   33,   17,  193,   32,   31,   30,  860,   16,
+ /*   250 */    26,  244,  243,  203,   21,   60,  242,   61,  241,  240,
+ /*   260 */   239,  248,  247,   96,  175,  229,  767,   76,   80,  245,
+ /*   270 */   190,  554,   21,   85,   88,   79,   18,  156,  121,  122,
+ /*   280 */   605,   82,  608,   42,   70,   66,   69,  225,  770,  767,
+ /*   290 */   135,  133,  601,   42,  611,  768,   93,   92,   91,  690,
+ /*   300 */   168,  207,  131,   42,  611,  230,  545,  767,  546,  610,
+ /*   310 */   699,  157,  691,  131,  611,  131,  604,  541,  607,  610,
+ /*   320 */   538,  571,  539,   47,  540,   46,  580,  581,  602,  610,
+ /*   330 */   572,  631,  613,   50,   14,   13,   13,  531,  543,    3,
+ /*   340 */   544,   46,   48,  530,   75,   74,  811,   22,  178,  179,
+ /*   350 */    51,  211,   10,    9,  829,   22,   87,   86,  101,   99,
+ /*   360 */   158,  143,  144,  146,  147,  151,  152,  150,  139,  149,
+ /*   370 */   769,  142,  828,  171,  825,  824,  172,  791,  761,  796,
+ /*   380 */   228,  783,  798,  104,  810,  119,  120,  701,  117,  212,
+ /*   390 */   615,  137,   24,  221,  698,   26,  222,  192,  874,   72,
+ /*   400 */   873,  871,  123,  719,   25,  100,   23,  138,  566,  688,
+ /*   410 */    81,  686,   83,   84,  684,  195,  780,  683,  161,  542,
+ /*   420 */   180,  199,  132,  681,  680,  679,   52,   49,  678,  677,
+ /*   430 */   109,  134,   44,  675,  204,  673,  671,  669,  667,  202,
+ /*   440 */   200,  198,  196,   28,  136,  220,   57,   58,  812,   77,
+ /*   450 */   231,  232,  233,  234,  235,  236,  237,  246,  209,  645,
+ /*   460 */    53,  182,  183,  644,  110,   64,   67,  155,  186,  185,
+ /*   470 */   682,  643,   94,  636,  676,  189,  126,  125,  720,  124,
+ /*   480 */   127,  128,  130,  129,   95,  668,    1,  551,  193,  765,
+ /*   490 */     2,   55,  113,  111,  114,  112,  115,  116,   59,  568,
+ /*   500 */   163,  106,  197,    5,  573,  107,    6,   65,  614,   19,
+ /*   510 */     4,   20,   15,  208,  616,    7,  210,  500,  496,  494,
+ /*   520 */   493,  492,  489,  463,  219,   68,   45,   71,   73,   22,
+ /*   530 */   527,  526,  524,   54,  484,  482,  474,  480,  476,  478,
+ /*   540 */   472,  470,  499,  498,  497,  495,  491,  490,   46,  461,
+ /*   550 */   432,  430,  649,  648,  648,  648,  648,  648,  648,  648,
+ /*   560 */   648,  648,  648,  648,   97,   98,
+};
+static const YYCODETYPE yy_lookahead[] = {
+ /*     0 */   226,    1,  260,  229,  230,  207,  208,    1,  234,    9,
+ /*    10 */   236,  237,  238,   13,   14,    9,   16,   17,  209,  210,
+ /*    20 */    20,   21,  260,    1,   24,   25,   26,   27,   28,  260,
+ /*    30 */   260,    9,  270,   33,   34,  260,  260,   37,   38,   39,
+ /*    40 */    13,   14,  244,   16,   17,  269,  270,   20,   21,  260,
+ /*    50 */   247,   24,   25,   26,   27,   28,  258,    5,  269,  270,
+ /*    60 */    33,   34,  259,  210,   37,   38,   39,   45,   46,   47,
+ /*    70 */    48,   49,   50,   51,   52,   53,   54,   55,   56,   57,
+ /*    80 */    13,   14,   60,   16,   17,   33,   34,   20,   21,  244,
+ /*    90 */    66,   24,   25,   26,   27,   28,  243,  227,  245,  210,
+ /*   100 */    33,   34,  102,  258,   37,   38,   39,  210,   14,   98,
+ /*   110 */    16,   17,  101,  102,   20,   21,  246,  210,   24,   25,
+ /*   120 */    26,   27,   28,   37,   38,   39,   99,   33,   34,   73,
+ /*   130 */   246,   37,   38,   39,   78,   16,   17,  210,   78,   20,
+ /*   140 */    21,  126,  245,   24,   25,   26,   27,   28,  133,  134,
+ /*   150 */   261,  127,   33,   34,  130,  131,   37,   38,   39,   85,
+ /*   160 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   95,
+ /*   170 */    96,   97,  226,  266,  228,  229,  230,  231,  232,  233,
+ /*   180 */   234,  235,  236,  237,  238,  239,    1,    2,  210,   44,
+ /*   190 */     5,   98,    7,  266,    9,  268,    1,    2,  105,  210,
+ /*   200 */     5,  210,    7,  260,    9,   60,    1,    2,  227,   99,
+ /*   210 */     5,   66,    7,  103,    9,   70,   71,   72,   33,   34,
+ /*   220 */    33,   34,   37,   98,   37,   38,   39,  246,   33,   34,
+ /*   230 */   105,  210,   37,   25,   26,   27,   28,   99,   33,   34,
+ /*   240 */   262,   33,   34,   98,  106,   37,   38,   39,  260,   85,
+ /*   250 */   105,   87,   88,  264,  210,  266,   92,  266,   94,   95,
+ /*   260 */    96,   63,   64,   65,  243,  210,  245,   61,   62,  227,
+ /*   270 */   125,  103,  210,   67,   68,   69,  108,  132,   61,   62,
+ /*   280 */     5,   75,    7,   98,   67,   68,   69,  243,  246,  245,
+ /*   290 */    61,   62,    1,   98,  109,  240,   67,   68,   69,  214,
+ /*   300 */    59,   15,  217,   98,  109,  243,    5,  245,    7,  124,
+ /*   310 */   214,  260,  214,  217,  109,  217,    5,    2,    7,  124,
+ /*   320 */     5,   99,    7,  103,    9,  103,  115,  116,   37,  124,
+ /*   330 */    99,   99,   99,  103,  103,  103,  103,   99,    5,   98,
+ /*   340 */     7,  103,  122,   99,  128,  129,  267,  103,   33,   34,
+ /*   350 */   120,   99,  128,  129,  241,  103,   73,   74,   61,   62,
+ /*   360 */   260,  260,  260,  260,  260,  260,  260,  260,  260,  260,
+ /*   370 */   246,  260,  241,  241,  241,  241,  241,  210,  242,  210,
+ /*   380 */   241,  244,  210,  210,  267,  210,  210,  210,  248,  210,
+ /*   390 */   104,  210,  210,  210,  210,  105,  210,  244,  210,  210,
+ /*   400 */   210,  210,  210,  210,  210,   59,  210,  210,  109,  210,
+ /*   410 */   210,  210,  210,  210,  210,  263,  257,  210,  263,  104,
+ /*   420 */   210,  263,  210,  210,  210,  210,  119,  121,  210,  210,
+ /*   430 */   256,  210,  118,  210,  113,  210,  210,  210,  210,  117,
+ /*   440 */   112,  111,  110,  123,  210,   76,  211,  211,  211,   84,
+ /*   450 */    83,   49,   80,   82,   53,   81,   79,   76,  211,    5,
+ /*   460 */   211,  135,    5,    5,  255,  215,  215,  211,    5,  135,
+ /*   470 */   211,    5,  212,   86,  211,  126,  219,  223,  225,  224,
+ /*   480 */   222,  220,  218,  221,  212,  211,  216,   99,  106,  244,
+ /*   490 */   213,  107,  252,  254,  251,  253,  250,  249,  103,   99,
+ /*   500 */     1,   98,   98,  114,   99,   98,  114,   73,   99,  103,
+ /*   510 */    98,  103,   98,  100,  104,   98,  100,    9,    5,    5,
+ /*   520 */     5,    5,    5,   77,   15,   73,   16,  129,  129,  103,
+ /*   530 */     5,    5,   99,   98,    5,    5,    5,    5,    5,    5,
+ /*   540 */     5,    5,    5,    5,    5,    5,    5,    5,  103,   77,
+ /*   550 */    59,   58,    0,  271,  271,  271,  271,  271,  271,  271,
+ /*   560 */   271,  271,  271,  271,   21,   21,  271,  271,  271,  271,
+ /*   570 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   580 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   590 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   600 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   610 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   620 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   630 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   640 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   650 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   660 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   670 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   680 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   690 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   700 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   710 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   720 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   730 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   740 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   750 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   760 */   271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+ /*   770 */   271,  271,
+};
+#define YY_SHIFT_COUNT    (251)
+#define YY_SHIFT_MIN      (0)
+#define YY_SHIFT_MAX      (552)
+static const unsigned short int yy_shift_ofst[] = {
+ /*     0 */   145,   74,  164,  185,  205,    6,    6,    6,    6,    6,
+ /*    10 */     6,    0,   22,  205,  315,  315,  315,   93,    6,    6,
+ /*    20 */     6,    6,    6,   56,   60,   60,  566,  195,  205,  205,
+ /*    30 */   205,  205,  205,  205,  205,  205,  205,  205,  205,  205,
+ /*    40 */   205,  205,  205,  205,  205,  315,  315,   52,   52,   52,
+ /*    50 */    52,   52,   52,   11,   52,  125,    6,    6,    6,    6,
+ /*    60 */   211,  211,  168,    6,    6,    6,    6,    6,    6,    6,
+ /*    70 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*    80 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*    90 */     6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+ /*   100 */     6,    6,  290,  346,  346,  299,  299,  299,  346,  307,
+ /*   110 */   306,  314,  321,  322,  328,  330,  332,  320,  290,  346,
+ /*   120 */   346,  369,  369,  346,  365,  367,  402,  372,  371,  401,
+ /*   130 */   374,  377,  346,  381,  346,  381,  346,  566,  566,   27,
+ /*   140 */    67,   67,   67,   94,  119,  208,  208,  208,  206,  187,
+ /*   150 */   187,  187,  187,  217,  229,   24,   15,   86,   86,  198,
+ /*   160 */   138,  110,  222,  231,  232,  233,  275,  311,  291,  241,
+ /*   170 */   286,  220,  230,  238,  244,  252,  216,  224,  301,  333,
+ /*   180 */   283,  297,  454,  326,  457,  458,  334,  463,  466,  387,
+ /*   190 */   349,  382,  388,  384,  395,  400,  403,  499,  404,  405,
+ /*   200 */   407,  406,  389,  408,  392,  409,  412,  410,  414,  413,
+ /*   210 */   417,  416,  434,  508,  513,  514,  515,  516,  517,  446,
+ /*   220 */   509,  452,  510,  398,  399,  426,  525,  526,  433,  435,
+ /*   230 */   426,  529,  530,  531,  532,  533,  534,  535,  536,  537,
+ /*   240 */   538,  539,  540,  541,  542,  445,  472,  543,  544,  491,
+ /*   250 */   493,  552,
+};
+#define YY_REDUCE_COUNT (138)
+#define YY_REDUCE_MIN   (-258)
+#define YY_REDUCE_MAX   (277)
+static const short yy_reduce_ofst[] = {
+ /*     0 */  -202,  -54, -226, -224, -211,  -73,  -11, -147,   21,   44,
+ /*    10 */    62, -111, -191, -238, -130,  -19,   42, -155,  -22,  -93,
+ /*    20 */    -9,   55, -103,   85,   96,   98, -197, -258, -231, -230,
+ /*    30 */  -225,  -57,  -12,   51,  100,  101,  102,  103,  104,  105,
+ /*    40 */   106,  107,  108,  109,  111, -116,  124,  113,  131,  132,
+ /*    50 */   133,  134,  135,  136,  139,  137,  167,  169,  172,  173,
+ /*    60 */    79,  117,  140,  175,  176,  177,  179,  181,  182,  183,
+ /*    70 */   184,  186,  188,  189,  190,  191,  192,  193,  194,  196,
+ /*    80 */   197,  199,  200,  201,  202,  203,  204,  207,  210,  212,
+ /*    90 */   213,  214,  215,  218,  219,  221,  223,  225,  226,  227,
+ /*   100 */   228,  234,  153,  235,  236,  152,  155,  158,  237,  159,
+ /*   110 */   174,  209,  239,  242,  240,  243,  246,  248,  245,  247,
+ /*   120 */   249,  250,  251,  256,  253,  255,  254,  257,  258,  261,
+ /*   130 */   262,  264,  259,  260,  263,  272,  274,  270,  277,
+};
+static const YYACTIONTYPE yy_default[] = {
+ /*     0 */   646,  700,  689,  868,  868,  646,  646,  646,  646,  646,
+ /*    10 */   646,  793,  664,  868,  646,  646,  646,  646,  646,  646,
+ /*    20 */   646,  646,  646,  702,  702,  702,  788,  646,  646,  646,
+ /*    30 */   646,  646,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*    40 */   646,  646,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*    50 */   646,  646,  646,  646,  646,  646,  646,  795,  797,  646,
+ /*    60 */   815,  815,  786,  646,  646,  646,  646,  646,  646,  646,
+ /*    70 */   646,  646,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*    80 */   646,  687,  646,  685,  646,  646,  646,  646,  646,  646,
+ /*    90 */   646,  646,  646,  646,  646,  646,  674,  646,  646,  646,
+ /*   100 */   646,  646,  646,  666,  666,  646,  646,  646,  666,  822,
+ /*   110 */   826,  820,  808,  816,  807,  803,  802,  830,  646,  666,
+ /*   120 */   666,  697,  697,  666,  718,  716,  714,  706,  712,  708,
+ /*   130 */   710,  704,  666,  695,  666,  695,  666,  734,  748,  646,
+ /*   140 */   831,  867,  821,  857,  856,  863,  855,  854,  646,  850,
+ /*   150 */   851,  853,  852,  646,  646,  646,  646,  859,  858,  646,
+ /*   160 */   646,  646,  646,  646,  646,  646,  646,  646,  646,  833,
+ /*   170 */   646,  827,  823,  646,  646,  646,  646,  646,  646,  646,
+ /*   180 */   646,  646,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*   190 */   646,  785,  646,  646,  794,  646,  646,  646,  646,  646,
+ /*   200 */   646,  817,  646,  809,  646,  646,  646,  646,  646,  646,
+ /*   210 */   646,  762,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*   220 */   646,  646,  646,  646,  646,  872,  646,  646,  646,  756,
+ /*   230 */   870,  646,  646,  646,  646,  646,  646,  646,  646,  646,
+ /*   240 */   646,  646,  646,  646,  646,  721,  646,  672,  670,  646,
+ /*   250 */   662,  646,
+};
+/********** End of lemon-generated parsing tables *****************************/
+
+/* The next table maps tokens (terminal symbols) into fallback tokens.  
+** If a construct like the following:
+** 
+**      %fallback ID X Y Z.
+**
+** appears in the grammar, then ID becomes a fallback token for X, Y,
+** and Z.  Whenever one of the tokens X, Y, or Z is input to the parser
+** but it does not parse, the type of the token is changed to ID and
+** the parse is retried before an error is thrown.
+**
+** This feature can be used, for example, to cause some keywords in a language
+** to revert to identifiers if they keyword does not apply in the context where
+** it appears.
+*/
+#ifdef YYFALLBACK
+static const YYCODETYPE yyFallback[] = {
+    0,  /*          $ => nothing */
+    0,  /*         ID => nothing */
+    1,  /*       BOOL => ID */
+    1,  /*    TINYINT => ID */
+    1,  /*   SMALLINT => ID */
+    1,  /*    INTEGER => ID */
+    1,  /*     BIGINT => ID */
+    1,  /*      FLOAT => ID */
+    1,  /*     DOUBLE => ID */
+    1,  /*     STRING => ID */
+    1,  /*  TIMESTAMP => ID */
+    1,  /*     BINARY => ID */
+    1,  /*      NCHAR => ID */
+    0,  /*         OR => nothing */
+    0,  /*        AND => nothing */
+    0,  /*        NOT => nothing */
+    0,  /*         EQ => nothing */
+    0,  /*         NE => nothing */
+    0,  /*     ISNULL => nothing */
+    0,  /*    NOTNULL => nothing */
+    0,  /*         IS => nothing */
+    1,  /*       LIKE => ID */
+    1,  /*       GLOB => ID */
+    0,  /*    BETWEEN => nothing */
+    0,  /*         IN => nothing */
+    0,  /*         GT => nothing */
+    0,  /*         GE => nothing */
+    0,  /*         LT => nothing */
+    0,  /*         LE => nothing */
+    0,  /*     BITAND => nothing */
+    0,  /*      BITOR => nothing */
+    0,  /*     LSHIFT => nothing */
+    0,  /*     RSHIFT => nothing */
+    0,  /*       PLUS => nothing */
+    0,  /*      MINUS => nothing */
+    0,  /*     DIVIDE => nothing */
+    0,  /*      TIMES => nothing */
+    0,  /*       STAR => nothing */
+    0,  /*      SLASH => nothing */
+    0,  /*        REM => nothing */
+    0,  /*     CONCAT => nothing */
+    0,  /*     UMINUS => nothing */
+    0,  /*      UPLUS => nothing */
+    0,  /*     BITNOT => nothing */
+    0,  /*       SHOW => nothing */
+    0,  /*  DATABASES => nothing */
+    0,  /*     MNODES => nothing */
+    0,  /*     DNODES => nothing */
+    0,  /*   ACCOUNTS => nothing */
+    0,  /*      USERS => nothing */
+    0,  /*    MODULES => nothing */
+    0,  /*    QUERIES => nothing */
+    0,  /* CONNECTIONS => nothing */
+    0,  /*    STREAMS => nothing */
+    0,  /*  VARIABLES => nothing */
+    0,  /*     SCORES => nothing */
+    0,  /*     GRANTS => nothing */
+    0,  /*     VNODES => nothing */
+    1,  /*    IPTOKEN => ID */
+    0,  /*        DOT => nothing */
+    0,  /*     CREATE => nothing */
+    0,  /*      TABLE => nothing */
+    1,  /*   DATABASE => ID */
+    0,  /*     TABLES => nothing */
+    0,  /*    STABLES => nothing */
+    0,  /*    VGROUPS => nothing */
+    0,  /*       DROP => nothing */
+    0,  /*      DNODE => nothing */
+    0,  /*       USER => nothing */
+    0,  /*    ACCOUNT => nothing */
+    0,  /*        USE => nothing */
+    0,  /*   DESCRIBE => nothing */
+    0,  /*      ALTER => nothing */
+    0,  /*       PASS => nothing */
+    0,  /*  PRIVILEGE => nothing */
+    0,  /*      LOCAL => nothing */
+    0,  /*         IF => nothing */
+    0,  /*     EXISTS => nothing */
+    0,  /*        PPS => nothing */
+    0,  /*    TSERIES => nothing */
+    0,  /*        DBS => nothing */
+    0,  /*    STORAGE => nothing */
+    0,  /*      QTIME => nothing */
+    0,  /*      CONNS => nothing */
+    0,  /*      STATE => nothing */
+    0,  /*       KEEP => nothing */
+    0,  /*      CACHE => nothing */
+    0,  /*    REPLICA => nothing */
+    0,  /*     QUORUM => nothing */
+    0,  /*       DAYS => nothing */
+    0,  /*    MINROWS => nothing */
+    0,  /*    MAXROWS => nothing */
+    0,  /*     BLOCKS => nothing */
+    0,  /*      CTIME => nothing */
+    0,  /*        WAL => nothing */
+    0,  /*      FSYNC => nothing */
+    0,  /*       COMP => nothing */
+    0,  /*  PRECISION => nothing */
+    0,  /*         LP => nothing */
+    0,  /*         RP => nothing */
+    0,  /*       TAGS => nothing */
+    0,  /*      USING => nothing */
+    0,  /*         AS => nothing */
+    0,  /*      COMMA => nothing */
+    1,  /*       NULL => ID */
+    0,  /*     SELECT => nothing */
+    0,  /*      UNION => nothing */
+    1,  /*        ALL => ID */
+    0,  /*       FROM => nothing */
+    0,  /*   VARIABLE => nothing */
+    0,  /*   INTERVAL => nothing */
+    0,  /*       FILL => nothing */
+    0,  /*    SLIDING => nothing */
+    0,  /*      ORDER => nothing */
+    0,  /*         BY => nothing */
+    1,  /*        ASC => ID */
+    1,  /*       DESC => ID */
+    0,  /*      GROUP => nothing */
+    0,  /*     HAVING => nothing */
+    0,  /*      LIMIT => nothing */
+    1,  /*     OFFSET => ID */
+    0,  /*     SLIMIT => nothing */
+    0,  /*    SOFFSET => nothing */
+    0,  /*      WHERE => nothing */
+    1,  /*        NOW => ID */
+    0,  /*      RESET => nothing */
+    0,  /*      QUERY => nothing */
+    0,  /*        ADD => nothing */
+    0,  /*     COLUMN => nothing */
+    0,  /*        TAG => nothing */
+    0,  /*     CHANGE => nothing */
+    0,  /*        SET => nothing */
+    0,  /*       KILL => nothing */
+    0,  /* CONNECTION => nothing */
+    0,  /*     STREAM => nothing */
+    0,  /*      COLON => nothing */
+    1,  /*      ABORT => ID */
+    1,  /*      AFTER => ID */
+    1,  /*     ATTACH => ID */
+    1,  /*     BEFORE => ID */
+    1,  /*      BEGIN => ID */
+    1,  /*    CASCADE => ID */
+    1,  /*    CLUSTER => ID */
+    1,  /*   CONFLICT => ID */
+    1,  /*       COPY => ID */
+    1,  /*   DEFERRED => ID */
+    1,  /* DELIMITERS => ID */
+    1,  /*     DETACH => ID */
+    1,  /*       EACH => ID */
+    1,  /*        END => ID */
+    1,  /*    EXPLAIN => ID */
+    1,  /*       FAIL => ID */
+    1,  /*        FOR => ID */
+    1,  /*     IGNORE => ID */
+    1,  /*  IMMEDIATE => ID */
+    1,  /*  INITIALLY => ID */
+    1,  /*    INSTEAD => ID */
+    1,  /*      MATCH => ID */
+    1,  /*        KEY => ID */
+    1,  /*         OF => ID */
+    1,  /*      RAISE => ID */
+    1,  /*    REPLACE => ID */
+    1,  /*   RESTRICT => ID */
+    1,  /*        ROW => ID */
+    1,  /*  STATEMENT => ID */
+    1,  /*    TRIGGER => ID */
+    1,  /*       VIEW => ID */
+    1,  /*      COUNT => ID */
+    1,  /*        SUM => ID */
+    1,  /*        AVG => ID */
+    1,  /*        MIN => ID */
+    1,  /*        MAX => ID */
+    1,  /*      FIRST => ID */
+    1,  /*       LAST => ID */
+    1,  /*        TOP => ID */
+    1,  /*     BOTTOM => ID */
+    1,  /*     STDDEV => ID */
+    1,  /* PERCENTILE => ID */
+    1,  /* APERCENTILE => ID */
+    1,  /* LEASTSQUARES => ID */
+    1,  /*  HISTOGRAM => ID */
+    1,  /*       DIFF => ID */
+    1,  /*     SPREAD => ID */
+    1,  /*        TWA => ID */
+    1,  /*     INTERP => ID */
+    1,  /*   LAST_ROW => ID */
+    1,  /*       RATE => ID */
+    1,  /*      IRATE => ID */
+    1,  /*   SUM_RATE => ID */
+    1,  /*  SUM_IRATE => ID */
+    1,  /*   AVG_RATE => ID */
+    1,  /*  AVG_IRATE => ID */
+    1,  /*       TBID => ID */
+    1,  /*       SEMI => ID */
+    1,  /*       NONE => ID */
+    1,  /*       PREV => ID */
+    1,  /*     LINEAR => ID */
+    1,  /*     IMPORT => ID */
+    1,  /*     METRIC => ID */
+    1,  /*     TBNAME => ID */
+    1,  /*       JOIN => ID */
+    1,  /*    METRICS => ID */
+    1,  /*     STABLE => ID */
+    1,  /*     INSERT => ID */
+    1,  /*       INTO => ID */
+    1,  /*     VALUES => ID */
+};
+#endif /* YYFALLBACK */
+
+/* The following structure represents a single element of the
+** parser's stack.  Information stored includes:
+**
+**   +  The state number for the parser at this level of the stack.
+**
+**   +  The value of the token stored at this level of the stack.
+**      (In other words, the "major" token.)
+**
+**   +  The semantic value stored at this level of the stack.  This is
+**      the information used by the action routines in the grammar.
+**      It is sometimes called the "minor" token.
+**
+** After the "shift" half of a SHIFTREDUCE action, the stateno field
+** actually contains the reduce action for the second half of the
+** SHIFTREDUCE.
+*/
+struct yyStackEntry {
+  YYACTIONTYPE stateno;  /* The state-number, or reduce action in SHIFTREDUCE */
+  YYCODETYPE major;      /* The major token value.  This is the code
+                         ** number for the token at this stack level */
+  YYMINORTYPE minor;     /* The user-supplied minor token value.  This
+                         ** is the value of the token  */
+};
+typedef struct yyStackEntry yyStackEntry;
+
+/* The state of the parser is completely contained in an instance of
+** the following structure */
+struct yyParser {
+  yyStackEntry *yytos;          /* Pointer to top element of the stack */
+#ifdef YYTRACKMAXSTACKDEPTH
+  int yyhwm;                    /* High-water mark of the stack */
+#endif
+#ifndef YYNOERRORRECOVERY
+  int yyerrcnt;                 /* Shifts left before out of the error */
+#endif
+  ParseARG_SDECL                /* A place to hold %extra_argument */
+#if YYSTACKDEPTH<=0
+  int yystksz;                  /* Current side of the stack */
+  yyStackEntry *yystack;        /* The parser's stack */
+  yyStackEntry yystk0;          /* First stack entry */
+#else
+  yyStackEntry yystack[YYSTACKDEPTH];  /* The parser's stack */
+  yyStackEntry *yystackEnd;            /* Last entry in the stack */
+#endif
+};
+typedef struct yyParser yyParser;
+
+#ifndef NDEBUG
+#include <stdio.h>
+static FILE *yyTraceFILE = 0;
+static char *yyTracePrompt = 0;
+#endif /* NDEBUG */
+
+#ifndef NDEBUG
+/* 
+** Turn parser tracing on by giving a stream to which to write the trace
+** and a prompt to preface each trace message.  Tracing is turned off
+** by making either argument NULL 
+**
+** Inputs:
+** <ul>
+** <li> A FILE* to which trace output should be written.
+**      If NULL, then tracing is turned off.
+** <li> A prefix string written at the beginning of every
+**      line of trace output.  If NULL, then tracing is
+**      turned off.
+** </ul>
+**
+** Outputs:
+** None.
+*/
+void ParseTrace(FILE *TraceFILE, char *zTracePrompt){
+  yyTraceFILE = TraceFILE;
+  yyTracePrompt = zTracePrompt;
+  if( yyTraceFILE==0 ) yyTracePrompt = 0;
+  else if( yyTracePrompt==0 ) yyTraceFILE = 0;
+}
+#endif /* NDEBUG */
+
+#if defined(YYCOVERAGE) || !defined(NDEBUG)
+/* For tracing shifts, the names of all terminals and nonterminals
+** are required.  The following table supplies these names */
+static const char *const yyTokenName[] = { 
+  /*    0 */ "$",
+  /*    1 */ "ID",
+  /*    2 */ "BOOL",
+  /*    3 */ "TINYINT",
+  /*    4 */ "SMALLINT",
+  /*    5 */ "INTEGER",
+  /*    6 */ "BIGINT",
+  /*    7 */ "FLOAT",
+  /*    8 */ "DOUBLE",
+  /*    9 */ "STRING",
+  /*   10 */ "TIMESTAMP",
+  /*   11 */ "BINARY",
+  /*   12 */ "NCHAR",
+  /*   13 */ "OR",
+  /*   14 */ "AND",
+  /*   15 */ "NOT",
+  /*   16 */ "EQ",
+  /*   17 */ "NE",
+  /*   18 */ "ISNULL",
+  /*   19 */ "NOTNULL",
+  /*   20 */ "IS",
+  /*   21 */ "LIKE",
+  /*   22 */ "GLOB",
+  /*   23 */ "BETWEEN",
+  /*   24 */ "IN",
+  /*   25 */ "GT",
+  /*   26 */ "GE",
+  /*   27 */ "LT",
+  /*   28 */ "LE",
+  /*   29 */ "BITAND",
+  /*   30 */ "BITOR",
+  /*   31 */ "LSHIFT",
+  /*   32 */ "RSHIFT",
+  /*   33 */ "PLUS",
+  /*   34 */ "MINUS",
+  /*   35 */ "DIVIDE",
+  /*   36 */ "TIMES",
+  /*   37 */ "STAR",
+  /*   38 */ "SLASH",
+  /*   39 */ "REM",
+  /*   40 */ "CONCAT",
+  /*   41 */ "UMINUS",
+  /*   42 */ "UPLUS",
+  /*   43 */ "BITNOT",
+  /*   44 */ "SHOW",
+  /*   45 */ "DATABASES",
+  /*   46 */ "MNODES",
+  /*   47 */ "DNODES",
+  /*   48 */ "ACCOUNTS",
+  /*   49 */ "USERS",
+  /*   50 */ "MODULES",
+  /*   51 */ "QUERIES",
+  /*   52 */ "CONNECTIONS",
+  /*   53 */ "STREAMS",
+  /*   54 */ "VARIABLES",
+  /*   55 */ "SCORES",
+  /*   56 */ "GRANTS",
+  /*   57 */ "VNODES",
+  /*   58 */ "IPTOKEN",
+  /*   59 */ "DOT",
+  /*   60 */ "CREATE",
+  /*   61 */ "TABLE",
+  /*   62 */ "DATABASE",
+  /*   63 */ "TABLES",
+  /*   64 */ "STABLES",
+  /*   65 */ "VGROUPS",
+  /*   66 */ "DROP",
+  /*   67 */ "DNODE",
+  /*   68 */ "USER",
+  /*   69 */ "ACCOUNT",
+  /*   70 */ "USE",
+  /*   71 */ "DESCRIBE",
+  /*   72 */ "ALTER",
+  /*   73 */ "PASS",
+  /*   74 */ "PRIVILEGE",
+  /*   75 */ "LOCAL",
+  /*   76 */ "IF",
+  /*   77 */ "EXISTS",
+  /*   78 */ "PPS",
+  /*   79 */ "TSERIES",
+  /*   80 */ "DBS",
+  /*   81 */ "STORAGE",
+  /*   82 */ "QTIME",
+  /*   83 */ "CONNS",
+  /*   84 */ "STATE",
+  /*   85 */ "KEEP",
+  /*   86 */ "CACHE",
+  /*   87 */ "REPLICA",
+  /*   88 */ "QUORUM",
+  /*   89 */ "DAYS",
+  /*   90 */ "MINROWS",
+  /*   91 */ "MAXROWS",
+  /*   92 */ "BLOCKS",
+  /*   93 */ "CTIME",
+  /*   94 */ "WAL",
+  /*   95 */ "FSYNC",
+  /*   96 */ "COMP",
+  /*   97 */ "PRECISION",
+  /*   98 */ "LP",
+  /*   99 */ "RP",
+  /*  100 */ "TAGS",
+  /*  101 */ "USING",
+  /*  102 */ "AS",
+  /*  103 */ "COMMA",
+  /*  104 */ "NULL",
+  /*  105 */ "SELECT",
+  /*  106 */ "UNION",
+  /*  107 */ "ALL",
+  /*  108 */ "FROM",
+  /*  109 */ "VARIABLE",
+  /*  110 */ "INTERVAL",
+  /*  111 */ "FILL",
+  /*  112 */ "SLIDING",
+  /*  113 */ "ORDER",
+  /*  114 */ "BY",
+  /*  115 */ "ASC",
+  /*  116 */ "DESC",
+  /*  117 */ "GROUP",
+  /*  118 */ "HAVING",
+  /*  119 */ "LIMIT",
+  /*  120 */ "OFFSET",
+  /*  121 */ "SLIMIT",
+  /*  122 */ "SOFFSET",
+  /*  123 */ "WHERE",
+  /*  124 */ "NOW",
+  /*  125 */ "RESET",
+  /*  126 */ "QUERY",
+  /*  127 */ "ADD",
+  /*  128 */ "COLUMN",
+  /*  129 */ "TAG",
+  /*  130 */ "CHANGE",
+  /*  131 */ "SET",
+  /*  132 */ "KILL",
+  /*  133 */ "CONNECTION",
+  /*  134 */ "STREAM",
+  /*  135 */ "COLON",
+  /*  136 */ "ABORT",
+  /*  137 */ "AFTER",
+  /*  138 */ "ATTACH",
+  /*  139 */ "BEFORE",
+  /*  140 */ "BEGIN",
+  /*  141 */ "CASCADE",
+  /*  142 */ "CLUSTER",
+  /*  143 */ "CONFLICT",
+  /*  144 */ "COPY",
+  /*  145 */ "DEFERRED",
+  /*  146 */ "DELIMITERS",
+  /*  147 */ "DETACH",
+  /*  148 */ "EACH",
+  /*  149 */ "END",
+  /*  150 */ "EXPLAIN",
+  /*  151 */ "FAIL",
+  /*  152 */ "FOR",
+  /*  153 */ "IGNORE",
+  /*  154 */ "IMMEDIATE",
+  /*  155 */ "INITIALLY",
+  /*  156 */ "INSTEAD",
+  /*  157 */ "MATCH",
+  /*  158 */ "KEY",
+  /*  159 */ "OF",
+  /*  160 */ "RAISE",
+  /*  161 */ "REPLACE",
+  /*  162 */ "RESTRICT",
+  /*  163 */ "ROW",
+  /*  164 */ "STATEMENT",
+  /*  165 */ "TRIGGER",
+  /*  166 */ "VIEW",
+  /*  167 */ "COUNT",
+  /*  168 */ "SUM",
+  /*  169 */ "AVG",
+  /*  170 */ "MIN",
+  /*  171 */ "MAX",
+  /*  172 */ "FIRST",
+  /*  173 */ "LAST",
+  /*  174 */ "TOP",
+  /*  175 */ "BOTTOM",
+  /*  176 */ "STDDEV",
+  /*  177 */ "PERCENTILE",
+  /*  178 */ "APERCENTILE",
+  /*  179 */ "LEASTSQUARES",
+  /*  180 */ "HISTOGRAM",
+  /*  181 */ "DIFF",
+  /*  182 */ "SPREAD",
+  /*  183 */ "TWA",
+  /*  184 */ "INTERP",
+  /*  185 */ "LAST_ROW",
+  /*  186 */ "RATE",
+  /*  187 */ "IRATE",
+  /*  188 */ "SUM_RATE",
+  /*  189 */ "SUM_IRATE",
+  /*  190 */ "AVG_RATE",
+  /*  191 */ "AVG_IRATE",
+  /*  192 */ "TBID",
+  /*  193 */ "SEMI",
+  /*  194 */ "NONE",
+  /*  195 */ "PREV",
+  /*  196 */ "LINEAR",
+  /*  197 */ "IMPORT",
+  /*  198 */ "METRIC",
+  /*  199 */ "TBNAME",
+  /*  200 */ "JOIN",
+  /*  201 */ "METRICS",
+  /*  202 */ "STABLE",
+  /*  203 */ "INSERT",
+  /*  204 */ "INTO",
+  /*  205 */ "VALUES",
+  /*  206 */ "error",
+  /*  207 */ "program",
+  /*  208 */ "cmd",
+  /*  209 */ "dbPrefix",
+  /*  210 */ "ids",
+  /*  211 */ "cpxName",
+  /*  212 */ "ifexists",
+  /*  213 */ "alter_db_optr",
+  /*  214 */ "acct_optr",
+  /*  215 */ "ifnotexists",
+  /*  216 */ "db_optr",
+  /*  217 */ "pps",
+  /*  218 */ "tseries",
+  /*  219 */ "dbs",
+  /*  220 */ "streams",
+  /*  221 */ "storage",
+  /*  222 */ "qtime",
+  /*  223 */ "users",
+  /*  224 */ "conns",
+  /*  225 */ "state",
+  /*  226 */ "keep",
+  /*  227 */ "tagitemlist",
+  /*  228 */ "cache",
+  /*  229 */ "replica",
+  /*  230 */ "quorum",
+  /*  231 */ "days",
+  /*  232 */ "minrows",
+  /*  233 */ "maxrows",
+  /*  234 */ "blocks",
+  /*  235 */ "ctime",
+  /*  236 */ "wal",
+  /*  237 */ "fsync",
+  /*  238 */ "comp",
+  /*  239 */ "prec",
+  /*  240 */ "typename",
+  /*  241 */ "signed",
+  /*  242 */ "create_table_args",
+  /*  243 */ "columnlist",
+  /*  244 */ "select",
+  /*  245 */ "column",
+  /*  246 */ "tagitem",
+  /*  247 */ "selcollist",
+  /*  248 */ "from",
+  /*  249 */ "where_opt",
+  /*  250 */ "interval_opt",
+  /*  251 */ "fill_opt",
+  /*  252 */ "sliding_opt",
+  /*  253 */ "groupby_opt",
+  /*  254 */ "orderby_opt",
+  /*  255 */ "having_opt",
+  /*  256 */ "slimit_opt",
+  /*  257 */ "limit_opt",
+  /*  258 */ "union",
+  /*  259 */ "sclp",
+  /*  260 */ "expr",
+  /*  261 */ "as",
+  /*  262 */ "tablelist",
+  /*  263 */ "tmvar",
+  /*  264 */ "sortlist",
+  /*  265 */ "sortitem",
+  /*  266 */ "item",
+  /*  267 */ "sortorder",
+  /*  268 */ "grouplist",
+  /*  269 */ "exprlist",
+  /*  270 */ "expritem",
+};
+#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
+
+#ifndef NDEBUG
+/* For tracing reduce actions, the names of all rules are required.
+*/
+static const char *const yyRuleName[] = {
+ /*   0 */ "program ::= cmd",
+ /*   1 */ "cmd ::= SHOW DATABASES",
+ /*   2 */ "cmd ::= SHOW MNODES",
+ /*   3 */ "cmd ::= SHOW DNODES",
+ /*   4 */ "cmd ::= SHOW ACCOUNTS",
+ /*   5 */ "cmd ::= SHOW USERS",
+ /*   6 */ "cmd ::= SHOW MODULES",
+ /*   7 */ "cmd ::= SHOW QUERIES",
+ /*   8 */ "cmd ::= SHOW CONNECTIONS",
+ /*   9 */ "cmd ::= SHOW STREAMS",
+ /*  10 */ "cmd ::= SHOW VARIABLES",
+ /*  11 */ "cmd ::= SHOW SCORES",
+ /*  12 */ "cmd ::= SHOW GRANTS",
+ /*  13 */ "cmd ::= SHOW VNODES",
+ /*  14 */ "cmd ::= SHOW VNODES IPTOKEN",
+ /*  15 */ "dbPrefix ::=",
+ /*  16 */ "dbPrefix ::= ids DOT",
+ /*  17 */ "cpxName ::=",
+ /*  18 */ "cpxName ::= DOT ids",
+ /*  19 */ "cmd ::= SHOW CREATE TABLE ids cpxName",
+ /*  20 */ "cmd ::= SHOW CREATE DATABASE ids",
+ /*  21 */ "cmd ::= SHOW dbPrefix TABLES",
+ /*  22 */ "cmd ::= SHOW dbPrefix TABLES LIKE ids",
+ /*  23 */ "cmd ::= SHOW dbPrefix STABLES",
+ /*  24 */ "cmd ::= SHOW dbPrefix STABLES LIKE ids",
+ /*  25 */ "cmd ::= SHOW dbPrefix VGROUPS",
+ /*  26 */ "cmd ::= SHOW dbPrefix VGROUPS ids",
+ /*  27 */ "cmd ::= DROP TABLE ifexists ids cpxName",
+ /*  28 */ "cmd ::= DROP DATABASE ifexists ids",
+ /*  29 */ "cmd ::= DROP DNODE ids",
+ /*  30 */ "cmd ::= DROP USER ids",
+ /*  31 */ "cmd ::= DROP ACCOUNT ids",
+ /*  32 */ "cmd ::= USE ids",
+ /*  33 */ "cmd ::= DESCRIBE ids cpxName",
+ /*  34 */ "cmd ::= ALTER USER ids PASS ids",
+ /*  35 */ "cmd ::= ALTER USER ids PRIVILEGE ids",
+ /*  36 */ "cmd ::= ALTER DNODE ids ids",
+ /*  37 */ "cmd ::= ALTER DNODE ids ids ids",
+ /*  38 */ "cmd ::= ALTER LOCAL ids",
+ /*  39 */ "cmd ::= ALTER LOCAL ids ids",
+ /*  40 */ "cmd ::= ALTER DATABASE ids alter_db_optr",
+ /*  41 */ "cmd ::= ALTER ACCOUNT ids acct_optr",
+ /*  42 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr",
+ /*  43 */ "ids ::= ID",
+ /*  44 */ "ids ::= STRING",
+ /*  45 */ "ifexists ::= IF EXISTS",
+ /*  46 */ "ifexists ::=",
+ /*  47 */ "ifnotexists ::= IF NOT EXISTS",
+ /*  48 */ "ifnotexists ::=",
+ /*  49 */ "cmd ::= CREATE DNODE ids",
+ /*  50 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr",
+ /*  51 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr",
+ /*  52 */ "cmd ::= CREATE USER ids PASS ids",
+ /*  53 */ "pps ::=",
+ /*  54 */ "pps ::= PPS INTEGER",
+ /*  55 */ "tseries ::=",
+ /*  56 */ "tseries ::= TSERIES INTEGER",
+ /*  57 */ "dbs ::=",
+ /*  58 */ "dbs ::= DBS INTEGER",
+ /*  59 */ "streams ::=",
+ /*  60 */ "streams ::= STREAMS INTEGER",
+ /*  61 */ "storage ::=",
+ /*  62 */ "storage ::= STORAGE INTEGER",
+ /*  63 */ "qtime ::=",
+ /*  64 */ "qtime ::= QTIME INTEGER",
+ /*  65 */ "users ::=",
+ /*  66 */ "users ::= USERS INTEGER",
+ /*  67 */ "conns ::=",
+ /*  68 */ "conns ::= CONNS INTEGER",
+ /*  69 */ "state ::=",
+ /*  70 */ "state ::= STATE ids",
+ /*  71 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state",
+ /*  72 */ "keep ::= KEEP tagitemlist",
+ /*  73 */ "cache ::= CACHE INTEGER",
+ /*  74 */ "replica ::= REPLICA INTEGER",
+ /*  75 */ "quorum ::= QUORUM INTEGER",
+ /*  76 */ "days ::= DAYS INTEGER",
+ /*  77 */ "minrows ::= MINROWS INTEGER",
+ /*  78 */ "maxrows ::= MAXROWS INTEGER",
+ /*  79 */ "blocks ::= BLOCKS INTEGER",
+ /*  80 */ "ctime ::= CTIME INTEGER",
+ /*  81 */ "wal ::= WAL INTEGER",
+ /*  82 */ "fsync ::= FSYNC INTEGER",
+ /*  83 */ "comp ::= COMP INTEGER",
+ /*  84 */ "prec ::= PRECISION STRING",
+ /*  85 */ "db_optr ::=",
+ /*  86 */ "db_optr ::= db_optr cache",
+ /*  87 */ "db_optr ::= db_optr replica",
+ /*  88 */ "db_optr ::= db_optr quorum",
+ /*  89 */ "db_optr ::= db_optr days",
+ /*  90 */ "db_optr ::= db_optr minrows",
+ /*  91 */ "db_optr ::= db_optr maxrows",
+ /*  92 */ "db_optr ::= db_optr blocks",
+ /*  93 */ "db_optr ::= db_optr ctime",
+ /*  94 */ "db_optr ::= db_optr wal",
+ /*  95 */ "db_optr ::= db_optr fsync",
+ /*  96 */ "db_optr ::= db_optr comp",
+ /*  97 */ "db_optr ::= db_optr prec",
+ /*  98 */ "db_optr ::= db_optr keep",
+ /*  99 */ "alter_db_optr ::=",
+ /* 100 */ "alter_db_optr ::= alter_db_optr replica",
+ /* 101 */ "alter_db_optr ::= alter_db_optr quorum",
+ /* 102 */ "alter_db_optr ::= alter_db_optr keep",
+ /* 103 */ "alter_db_optr ::= alter_db_optr blocks",
+ /* 104 */ "alter_db_optr ::= alter_db_optr comp",
+ /* 105 */ "alter_db_optr ::= alter_db_optr wal",
+ /* 106 */ "alter_db_optr ::= alter_db_optr fsync",
+ /* 107 */ "typename ::= ids",
+ /* 108 */ "typename ::= ids LP signed RP",
+ /* 109 */ "signed ::= INTEGER",
+ /* 110 */ "signed ::= PLUS INTEGER",
+ /* 111 */ "signed ::= MINUS INTEGER",
+ /* 112 */ "cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args",
+ /* 113 */ "create_table_args ::= LP columnlist RP",
+ /* 114 */ "create_table_args ::= LP columnlist RP TAGS LP columnlist RP",
+ /* 115 */ "create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP",
+ /* 116 */ "create_table_args ::= AS select",
+ /* 117 */ "columnlist ::= columnlist COMMA column",
+ /* 118 */ "columnlist ::= column",
+ /* 119 */ "column ::= ids typename",
+ /* 120 */ "tagitemlist ::= tagitemlist COMMA tagitem",
+ /* 121 */ "tagitemlist ::= tagitem",
+ /* 122 */ "tagitem ::= INTEGER",
+ /* 123 */ "tagitem ::= FLOAT",
+ /* 124 */ "tagitem ::= STRING",
+ /* 125 */ "tagitem ::= BOOL",
+ /* 126 */ "tagitem ::= NULL",
+ /* 127 */ "tagitem ::= MINUS INTEGER",
+ /* 128 */ "tagitem ::= MINUS FLOAT",
+ /* 129 */ "tagitem ::= PLUS INTEGER",
+ /* 130 */ "tagitem ::= PLUS FLOAT",
+ /* 131 */ "select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt",
+ /* 132 */ "union ::= select",
+ /* 133 */ "union ::= LP union RP",
+ /* 134 */ "union ::= union UNION ALL select",
+ /* 135 */ "union ::= union UNION ALL LP select RP",
+ /* 136 */ "cmd ::= union",
+ /* 137 */ "select ::= SELECT selcollist",
+ /* 138 */ "sclp ::= selcollist COMMA",
+ /* 139 */ "sclp ::=",
+ /* 140 */ "selcollist ::= sclp expr as",
+ /* 141 */ "selcollist ::= sclp STAR",
+ /* 142 */ "as ::= AS ids",
+ /* 143 */ "as ::= ids",
+ /* 144 */ "as ::=",
+ /* 145 */ "from ::= FROM tablelist",
+ /* 146 */ "tablelist ::= ids cpxName",
+ /* 147 */ "tablelist ::= ids cpxName ids",
+ /* 148 */ "tablelist ::= tablelist COMMA ids cpxName",
+ /* 149 */ "tablelist ::= tablelist COMMA ids cpxName ids",
+ /* 150 */ "tmvar ::= VARIABLE",
+ /* 151 */ "interval_opt ::= INTERVAL LP tmvar RP",
+ /* 152 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP",
+ /* 153 */ "interval_opt ::=",
+ /* 154 */ "fill_opt ::=",
+ /* 155 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
+ /* 156 */ "fill_opt ::= FILL LP ID RP",
+ /* 157 */ "sliding_opt ::= SLIDING LP tmvar RP",
+ /* 158 */ "sliding_opt ::=",
+ /* 159 */ "orderby_opt ::=",
+ /* 160 */ "orderby_opt ::= ORDER BY sortlist",
+ /* 161 */ "sortlist ::= sortlist COMMA item sortorder",
+ /* 162 */ "sortlist ::= item sortorder",
+ /* 163 */ "item ::= ids cpxName",
+ /* 164 */ "sortorder ::= ASC",
+ /* 165 */ "sortorder ::= DESC",
+ /* 166 */ "sortorder ::=",
+ /* 167 */ "groupby_opt ::=",
+ /* 168 */ "groupby_opt ::= GROUP BY grouplist",
+ /* 169 */ "grouplist ::= grouplist COMMA item",
+ /* 170 */ "grouplist ::= item",
+ /* 171 */ "having_opt ::=",
+ /* 172 */ "having_opt ::= HAVING expr",
+ /* 173 */ "limit_opt ::=",
+ /* 174 */ "limit_opt ::= LIMIT signed",
+ /* 175 */ "limit_opt ::= LIMIT signed OFFSET signed",
+ /* 176 */ "limit_opt ::= LIMIT signed COMMA signed",
+ /* 177 */ "slimit_opt ::=",
+ /* 178 */ "slimit_opt ::= SLIMIT signed",
+ /* 179 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
+ /* 180 */ "slimit_opt ::= SLIMIT signed COMMA signed",
+ /* 181 */ "where_opt ::=",
+ /* 182 */ "where_opt ::= WHERE expr",
+ /* 183 */ "expr ::= LP expr RP",
+ /* 184 */ "expr ::= ID",
+ /* 185 */ "expr ::= ID DOT ID",
+ /* 186 */ "expr ::= ID DOT STAR",
+ /* 187 */ "expr ::= INTEGER",
+ /* 188 */ "expr ::= MINUS INTEGER",
+ /* 189 */ "expr ::= PLUS INTEGER",
+ /* 190 */ "expr ::= FLOAT",
+ /* 191 */ "expr ::= MINUS FLOAT",
+ /* 192 */ "expr ::= PLUS FLOAT",
+ /* 193 */ "expr ::= STRING",
+ /* 194 */ "expr ::= NOW",
+ /* 195 */ "expr ::= VARIABLE",
+ /* 196 */ "expr ::= BOOL",
+ /* 197 */ "expr ::= ID LP exprlist RP",
+ /* 198 */ "expr ::= ID LP STAR RP",
+ /* 199 */ "expr ::= expr IS NULL",
+ /* 200 */ "expr ::= expr IS NOT NULL",
+ /* 201 */ "expr ::= expr LT expr",
+ /* 202 */ "expr ::= expr GT expr",
+ /* 203 */ "expr ::= expr LE expr",
+ /* 204 */ "expr ::= expr GE expr",
+ /* 205 */ "expr ::= expr NE expr",
+ /* 206 */ "expr ::= expr EQ expr",
+ /* 207 */ "expr ::= expr AND expr",
+ /* 208 */ "expr ::= expr OR expr",
+ /* 209 */ "expr ::= expr PLUS expr",
+ /* 210 */ "expr ::= expr MINUS expr",
+ /* 211 */ "expr ::= expr STAR expr",
+ /* 212 */ "expr ::= expr SLASH expr",
+ /* 213 */ "expr ::= expr REM expr",
+ /* 214 */ "expr ::= expr LIKE expr",
+ /* 215 */ "expr ::= expr IN LP exprlist RP",
+ /* 216 */ "exprlist ::= exprlist COMMA expritem",
+ /* 217 */ "exprlist ::= expritem",
+ /* 218 */ "expritem ::= expr",
+ /* 219 */ "expritem ::=",
+ /* 220 */ "cmd ::= RESET QUERY CACHE",
+ /* 221 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
+ /* 222 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
+ /* 223 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
+ /* 224 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
+ /* 225 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
+ /* 226 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
+ /* 227 */ "cmd ::= KILL CONNECTION INTEGER",
+ /* 228 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
+ /* 229 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
+};
+#endif /* NDEBUG */
+
+
+#if YYSTACKDEPTH<=0
+/*
+** Try to increase the size of the parser stack.  Return the number
+** of errors.  Return 0 on success.
+*/
+static int yyGrowStack(yyParser *p){
+  int newSize;
+  int idx;
+  yyStackEntry *pNew;
+
+  newSize = p->yystksz*2 + 100;
+  idx = p->yytos ? (int)(p->yytos - p->yystack) : 0;
+  if( p->yystack==&p->yystk0 ){
+    pNew = malloc(newSize*sizeof(pNew[0]));
+    if( pNew ) pNew[0] = p->yystk0;
+  }else{
+    pNew = realloc(p->yystack, newSize*sizeof(pNew[0]));
+  }
+  if( pNew ){
+    p->yystack = pNew;
+    p->yytos = &p->yystack[idx];
+#ifndef NDEBUG
+    if( yyTraceFILE ){
+      fprintf(yyTraceFILE,"%sStack grows from %d to %d entries.\n",
+              yyTracePrompt, p->yystksz, newSize);
+    }
+#endif
+    p->yystksz = newSize;
+  }
+  return pNew==0; 
+}
+#endif
+
+/* Datatype of the argument to the memory allocated passed as the
+** second argument to ParseAlloc() below.  This can be changed by
+** putting an appropriate #define in the %include section of the input
+** grammar.
+*/
+#ifndef YYMALLOCARGTYPE
+# define YYMALLOCARGTYPE size_t
+#endif
+
+/* Initialize a new parser that has already been allocated.
+*/
+void ParseInit(void *yypParser){
+  yyParser *pParser = (yyParser*)yypParser;
+#ifdef YYTRACKMAXSTACKDEPTH
+  pParser->yyhwm = 0;
+#endif
+#if YYSTACKDEPTH<=0
+  pParser->yytos = NULL;
+  pParser->yystack = NULL;
+  pParser->yystksz = 0;
+  if( yyGrowStack(pParser) ){
+    pParser->yystack = &pParser->yystk0;
+    pParser->yystksz = 1;
+  }
+#endif
+#ifndef YYNOERRORRECOVERY
+  pParser->yyerrcnt = -1;
+#endif
+  pParser->yytos = pParser->yystack;
+  pParser->yystack[0].stateno = 0;
+  pParser->yystack[0].major = 0;
+#if YYSTACKDEPTH>0
+  pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1];
+#endif
+}
+
+#ifndef Parse_ENGINEALWAYSONSTACK
+/* 
+** This function allocates a new parser.
+** The only argument is a pointer to a function which works like
+** malloc.
+**
+** Inputs:
+** A pointer to the function used to allocate memory.
+**
+** Outputs:
+** A pointer to a parser.  This pointer is used in subsequent calls
+** to Parse and ParseFree.
+*/
+void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){
+  yyParser *pParser;
+  pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) );
+  if( pParser ) ParseInit(pParser);
+  return pParser;
+}
+#endif /* Parse_ENGINEALWAYSONSTACK */
+
+
+/* The following function deletes the "minor type" or semantic value
+** associated with a symbol.  The symbol can be either a terminal
+** or nonterminal. "yymajor" is the symbol code, and "yypminor" is
+** a pointer to the value to be deleted.  The code used to do the 
+** deletions is derived from the %destructor and/or %token_destructor
+** directives of the input grammar.
+*/
+static void yy_destructor(
+  yyParser *yypParser,    /* The parser */
+  YYCODETYPE yymajor,     /* Type code for object to destroy */
+  YYMINORTYPE *yypminor   /* The object to be destroyed */
+){
+  ParseARG_FETCH;
+  switch( yymajor ){
+    /* Here is inserted the actions which take place when a
+    ** terminal or non-terminal is destroyed.  This can happen
+    ** when the symbol is popped from the stack during a
+    ** reduce or during error processing or when a parser is 
+    ** being destroyed before it is finished parsing.
+    **
+    ** Note: during a reduce, the only symbols destroyed are those
+    ** which appear on the RHS of the rule, but which are *not* used
+    ** inside the C code.
+    */
+/********* Begin destructor definitions ***************************************/
+    case 226: /* keep */
+    case 227: /* tagitemlist */
+    case 251: /* fill_opt */
+    case 253: /* groupby_opt */
+    case 254: /* orderby_opt */
+    case 264: /* sortlist */
+    case 268: /* grouplist */
+{
+tVariantListDestroy((yypminor->yy494));
+}
+      break;
+    case 243: /* columnlist */
+{
+tFieldListDestroy((yypminor->yy449));
+}
+      break;
+    case 244: /* select */
+{
+doDestroyQuerySql((yypminor->yy150));
+}
+      break;
+    case 247: /* selcollist */
+    case 259: /* sclp */
+    case 269: /* exprlist */
+{
+tSQLExprListDestroy((yypminor->yy224));
+}
+      break;
+    case 249: /* where_opt */
+    case 255: /* having_opt */
+    case 260: /* expr */
+    case 270: /* expritem */
+{
+tSQLExprDestroy((yypminor->yy66));
+}
+      break;
+    case 258: /* union */
+{
+destroyAllSelectClause((yypminor->yy25));
+}
+      break;
+    case 265: /* sortitem */
+{
+tVariantDestroy(&(yypminor->yy312));
+}
+      break;
+/********* End destructor definitions *****************************************/
+    default:  break;   /* If no destructor action specified: do nothing */
+  }
+}
+
+/*
+** Pop the parser's stack once.
+**
+** If there is a destructor routine associated with the token which
+** is popped from the stack, then call it.
+*/
+static void yy_pop_parser_stack(yyParser *pParser){
+  yyStackEntry *yytos;
+  assert( pParser->yytos!=0 );
+  assert( pParser->yytos > pParser->yystack );
+  yytos = pParser->yytos--;
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sPopping %s\n",
+      yyTracePrompt,
+      yyTokenName[yytos->major]);
+  }
+#endif
+  yy_destructor(pParser, yytos->major, &yytos->minor);
+}
+
+/*
+** Clear all secondary memory allocations from the parser
+*/
+void ParseFinalize(void *p){
+  yyParser *pParser = (yyParser*)p;
+  while( pParser->yytos>pParser->yystack ) yy_pop_parser_stack(pParser);
+#if YYSTACKDEPTH<=0
+  if( pParser->yystack!=&pParser->yystk0 ) free(pParser->yystack);
+#endif
+}
+
+#ifndef Parse_ENGINEALWAYSONSTACK
+/* 
+** Deallocate and destroy a parser.  Destructors are called for
+** all stack elements before shutting the parser down.
+**
+** If the YYPARSEFREENEVERNULL macro exists (for example because it
+** is defined in a %include section of the input grammar) then it is
+** assumed that the input pointer is never NULL.
+*/
+void ParseFree(
+  void *p,                    /* The parser to be deleted */
+  void (*freeProc)(void*)     /* Function used to reclaim memory */
+){
+#ifndef YYPARSEFREENEVERNULL
+  if( p==0 ) return;
+#endif
+  ParseFinalize(p);
+  (*freeProc)(p);
+}
+#endif /* Parse_ENGINEALWAYSONSTACK */
+
+/*
+** Return the peak depth of the stack for a parser.
+*/
+#ifdef YYTRACKMAXSTACKDEPTH
+int ParseStackPeak(void *p){
+  yyParser *pParser = (yyParser*)p;
+  return pParser->yyhwm;
+}
+#endif
+
+/* This array of booleans keeps track of the parser statement
+** coverage.  The element yycoverage[X][Y] is set when the parser
+** is in state X and has a lookahead token Y.  In a well-tested
+** systems, every element of this matrix should end up being set.
+*/
+#if defined(YYCOVERAGE)
+static unsigned char yycoverage[YYNSTATE][YYNTOKEN];
+#endif
+
+/*
+** Write into out a description of every state/lookahead combination that
+**
+**   (1)  has not been used by the parser, and
+**   (2)  is not a syntax error.
+**
+** Return the number of missed state/lookahead combinations.
+*/
+#if defined(YYCOVERAGE)
+int ParseCoverage(FILE *out){
+  int stateno, iLookAhead, i;
+  int nMissed = 0;
+  for(stateno=0; stateno<YYNSTATE; stateno++){
+    i = yy_shift_ofst[stateno];
+    for(iLookAhead=0; iLookAhead<YYNTOKEN; iLookAhead++){
+      if( yy_lookahead[i+iLookAhead]!=iLookAhead ) continue;
+      if( yycoverage[stateno][iLookAhead]==0 ) nMissed++;
+      if( out ){
+        fprintf(out,"State %d lookahead %s %s\n", stateno,
+                yyTokenName[iLookAhead],
+                yycoverage[stateno][iLookAhead] ? "ok" : "missed");
+      }
+    }
+  }
+  return nMissed;
+}
+#endif
+
+/*
+** Find the appropriate action for a parser given the terminal
+** look-ahead token iLookAhead.
+*/
+static unsigned int yy_find_shift_action(
+  yyParser *pParser,        /* The parser */
+  YYCODETYPE iLookAhead     /* The look-ahead token */
+){
+  int i;
+  int stateno = pParser->yytos->stateno;
+ 
+  if( stateno>YY_MAX_SHIFT ) return stateno;
+  assert( stateno <= YY_SHIFT_COUNT );
+#if defined(YYCOVERAGE)
+  yycoverage[stateno][iLookAhead] = 1;
+#endif
+  do{
+    i = yy_shift_ofst[stateno];
+    assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) );
+    assert( iLookAhead!=YYNOCODE );
+    assert( iLookAhead < YYNTOKEN );
+    i += iLookAhead;
+    if( yy_lookahead[i]!=iLookAhead ){
+#ifdef YYFALLBACK
+      YYCODETYPE iFallback;            /* Fallback token */
+      if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0])
+             && (iFallback = yyFallback[iLookAhead])!=0 ){
+#ifndef NDEBUG
+        if( yyTraceFILE ){
+          fprintf(yyTraceFILE, "%sFALLBACK %s => %s\n",
+             yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]);
+        }
+#endif
+        assert( yyFallback[iFallback]==0 ); /* Fallback loop must terminate */
+        iLookAhead = iFallback;
+        continue;
+      }
+#endif
+#ifdef YYWILDCARD
+      {
+        int j = i - iLookAhead + YYWILDCARD;
+        if( 
+#if YY_SHIFT_MIN+YYWILDCARD<0
+          j>=0 &&
+#endif
+#if YY_SHIFT_MAX+YYWILDCARD>=YY_ACTTAB_COUNT
+          j<YY_ACTTAB_COUNT &&
+#endif
+          yy_lookahead[j]==YYWILDCARD && iLookAhead>0
+        ){
+#ifndef NDEBUG
+          if( yyTraceFILE ){
+            fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n",
+               yyTracePrompt, yyTokenName[iLookAhead],
+               yyTokenName[YYWILDCARD]);
+          }
+#endif /* NDEBUG */
+          return yy_action[j];
+        }
+      }
+#endif /* YYWILDCARD */
+      return yy_default[stateno];
+    }else{
+      return yy_action[i];
+    }
+  }while(1);
+}
+
+/*
+** Find the appropriate action for a parser given the non-terminal
+** look-ahead token iLookAhead.
+*/
+static int yy_find_reduce_action(
+  int stateno,              /* Current state number */
+  YYCODETYPE iLookAhead     /* The look-ahead token */
+){
+  int i;
+#ifdef YYERRORSYMBOL
+  if( stateno>YY_REDUCE_COUNT ){
+    return yy_default[stateno];
+  }
+#else
+  assert( stateno<=YY_REDUCE_COUNT );
+#endif
+  i = yy_reduce_ofst[stateno];
+  assert( iLookAhead!=YYNOCODE );
+  i += iLookAhead;
+#ifdef YYERRORSYMBOL
+  if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){
+    return yy_default[stateno];
+  }
+#else
+  assert( i>=0 && i<YY_ACTTAB_COUNT );
+  assert( yy_lookahead[i]==iLookAhead );
+#endif
+  return yy_action[i];
+}
+
+/*
+** The following routine is called if the stack overflows.
+*/
+static void yyStackOverflow(yyParser *yypParser){
+   ParseARG_FETCH;
+#ifndef NDEBUG
+   if( yyTraceFILE ){
+     fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt);
+   }
+#endif
+   while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
+   /* Here code is inserted which will execute if the parser
+   ** stack every overflows */
+/******** Begin %stack_overflow code ******************************************/
+/******** End %stack_overflow code ********************************************/
+   ParseARG_STORE; /* Suppress warning about unused %extra_argument var */
+}
+
+/*
+** Print tracing information for a SHIFT action
+*/
+#ifndef NDEBUG
+static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){
+  if( yyTraceFILE ){
+    if( yyNewState<YYNSTATE ){
+      fprintf(yyTraceFILE,"%s%s '%s', go to state %d\n",
+         yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major],
+         yyNewState);
+    }else{
+      fprintf(yyTraceFILE,"%s%s '%s', pending reduce %d\n",
+         yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major],
+         yyNewState - YY_MIN_REDUCE);
+    }
+  }
+}
+#else
+# define yyTraceShift(X,Y,Z)
+#endif
+
+/*
+** Perform a shift action.
+*/
+static void yy_shift(
+  yyParser *yypParser,          /* The parser to be shifted */
+  int yyNewState,               /* The new state to shift in */
+  int yyMajor,                  /* The major token to shift in */
+  ParseTOKENTYPE yyMinor        /* The minor token to shift in */
+){
+  yyStackEntry *yytos;
+  yypParser->yytos++;
+#ifdef YYTRACKMAXSTACKDEPTH
+  if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){
+    yypParser->yyhwm++;
+    assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack) );
+  }
+#endif
+#if YYSTACKDEPTH>0 
+  if( yypParser->yytos>yypParser->yystackEnd ){
+    yypParser->yytos--;
+    yyStackOverflow(yypParser);
+    return;
+  }
+#else
+  if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){
+    if( yyGrowStack(yypParser) ){
+      yypParser->yytos--;
+      yyStackOverflow(yypParser);
+      return;
+    }
+  }
+#endif
+  if( yyNewState > YY_MAX_SHIFT ){
+    yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE;
+  }
+  yytos = yypParser->yytos;
+  yytos->stateno = (YYACTIONTYPE)yyNewState;
+  yytos->major = (YYCODETYPE)yyMajor;
+  yytos->minor.yy0 = yyMinor;
+  yyTraceShift(yypParser, yyNewState, "Shift");
+}
+
+/* The following table contains information about every rule that
+** is used during the reduce.
+*/
+static const struct {
+  YYCODETYPE lhs;       /* Symbol on the left-hand side of the rule */
+  signed char nrhs;     /* Negative of the number of RHS symbols in the rule */
+} yyRuleInfo[] = {
+  {  207,   -1 }, /* (0) program ::= cmd */
+  {  208,   -2 }, /* (1) cmd ::= SHOW DATABASES */
+  {  208,   -2 }, /* (2) cmd ::= SHOW MNODES */
+  {  208,   -2 }, /* (3) cmd ::= SHOW DNODES */
+  {  208,   -2 }, /* (4) cmd ::= SHOW ACCOUNTS */
+  {  208,   -2 }, /* (5) cmd ::= SHOW USERS */
+  {  208,   -2 }, /* (6) cmd ::= SHOW MODULES */
+  {  208,   -2 }, /* (7) cmd ::= SHOW QUERIES */
+  {  208,   -2 }, /* (8) cmd ::= SHOW CONNECTIONS */
+  {  208,   -2 }, /* (9) cmd ::= SHOW STREAMS */
+  {  208,   -2 }, /* (10) cmd ::= SHOW VARIABLES */
+  {  208,   -2 }, /* (11) cmd ::= SHOW SCORES */
+  {  208,   -2 }, /* (12) cmd ::= SHOW GRANTS */
+  {  208,   -2 }, /* (13) cmd ::= SHOW VNODES */
+  {  208,   -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */
+  {  209,    0 }, /* (15) dbPrefix ::= */
+  {  209,   -2 }, /* (16) dbPrefix ::= ids DOT */
+  {  211,    0 }, /* (17) cpxName ::= */
+  {  211,   -2 }, /* (18) cpxName ::= DOT ids */
+  {  208,   -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */
+  {  208,   -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */
+  {  208,   -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */
+  {  208,   -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */
+  {  208,   -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */
+  {  208,   -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */
+  {  208,   -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */
+  {  208,   -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */
+  {  208,   -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */
+  {  208,   -4 }, /* (28) cmd ::= DROP DATABASE ifexists ids */
+  {  208,   -3 }, /* (29) cmd ::= DROP DNODE ids */
+  {  208,   -3 }, /* (30) cmd ::= DROP USER ids */
+  {  208,   -3 }, /* (31) cmd ::= DROP ACCOUNT ids */
+  {  208,   -2 }, /* (32) cmd ::= USE ids */
+  {  208,   -3 }, /* (33) cmd ::= DESCRIBE ids cpxName */
+  {  208,   -5 }, /* (34) cmd ::= ALTER USER ids PASS ids */
+  {  208,   -5 }, /* (35) cmd ::= ALTER USER ids PRIVILEGE ids */
+  {  208,   -4 }, /* (36) cmd ::= ALTER DNODE ids ids */
+  {  208,   -5 }, /* (37) cmd ::= ALTER DNODE ids ids ids */
+  {  208,   -3 }, /* (38) cmd ::= ALTER LOCAL ids */
+  {  208,   -4 }, /* (39) cmd ::= ALTER LOCAL ids ids */
+  {  208,   -4 }, /* (40) cmd ::= ALTER DATABASE ids alter_db_optr */
+  {  208,   -4 }, /* (41) cmd ::= ALTER ACCOUNT ids acct_optr */
+  {  208,   -6 }, /* (42) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+  {  210,   -1 }, /* (43) ids ::= ID */
+  {  210,   -1 }, /* (44) ids ::= STRING */
+  {  212,   -2 }, /* (45) ifexists ::= IF EXISTS */
+  {  212,    0 }, /* (46) ifexists ::= */
+  {  215,   -3 }, /* (47) ifnotexists ::= IF NOT EXISTS */
+  {  215,    0 }, /* (48) ifnotexists ::= */
+  {  208,   -3 }, /* (49) cmd ::= CREATE DNODE ids */
+  {  208,   -6 }, /* (50) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+  {  208,   -5 }, /* (51) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+  {  208,   -5 }, /* (52) cmd ::= CREATE USER ids PASS ids */
+  {  217,    0 }, /* (53) pps ::= */
+  {  217,   -2 }, /* (54) pps ::= PPS INTEGER */
+  {  218,    0 }, /* (55) tseries ::= */
+  {  218,   -2 }, /* (56) tseries ::= TSERIES INTEGER */
+  {  219,    0 }, /* (57) dbs ::= */
+  {  219,   -2 }, /* (58) dbs ::= DBS INTEGER */
+  {  220,    0 }, /* (59) streams ::= */
+  {  220,   -2 }, /* (60) streams ::= STREAMS INTEGER */
+  {  221,    0 }, /* (61) storage ::= */
+  {  221,   -2 }, /* (62) storage ::= STORAGE INTEGER */
+  {  222,    0 }, /* (63) qtime ::= */
+  {  222,   -2 }, /* (64) qtime ::= QTIME INTEGER */
+  {  223,    0 }, /* (65) users ::= */
+  {  223,   -2 }, /* (66) users ::= USERS INTEGER */
+  {  224,    0 }, /* (67) conns ::= */
+  {  224,   -2 }, /* (68) conns ::= CONNS INTEGER */
+  {  225,    0 }, /* (69) state ::= */
+  {  225,   -2 }, /* (70) state ::= STATE ids */
+  {  214,   -9 }, /* (71) acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+  {  226,   -2 }, /* (72) keep ::= KEEP tagitemlist */
+  {  228,   -2 }, /* (73) cache ::= CACHE INTEGER */
+  {  229,   -2 }, /* (74) replica ::= REPLICA INTEGER */
+  {  230,   -2 }, /* (75) quorum ::= QUORUM INTEGER */
+  {  231,   -2 }, /* (76) days ::= DAYS INTEGER */
+  {  232,   -2 }, /* (77) minrows ::= MINROWS INTEGER */
+  {  233,   -2 }, /* (78) maxrows ::= MAXROWS INTEGER */
+  {  234,   -2 }, /* (79) blocks ::= BLOCKS INTEGER */
+  {  235,   -2 }, /* (80) ctime ::= CTIME INTEGER */
+  {  236,   -2 }, /* (81) wal ::= WAL INTEGER */
+  {  237,   -2 }, /* (82) fsync ::= FSYNC INTEGER */
+  {  238,   -2 }, /* (83) comp ::= COMP INTEGER */
+  {  239,   -2 }, /* (84) prec ::= PRECISION STRING */
+  {  216,    0 }, /* (85) db_optr ::= */
+  {  216,   -2 }, /* (86) db_optr ::= db_optr cache */
+  {  216,   -2 }, /* (87) db_optr ::= db_optr replica */
+  {  216,   -2 }, /* (88) db_optr ::= db_optr quorum */
+  {  216,   -2 }, /* (89) db_optr ::= db_optr days */
+  {  216,   -2 }, /* (90) db_optr ::= db_optr minrows */
+  {  216,   -2 }, /* (91) db_optr ::= db_optr maxrows */
+  {  216,   -2 }, /* (92) db_optr ::= db_optr blocks */
+  {  216,   -2 }, /* (93) db_optr ::= db_optr ctime */
+  {  216,   -2 }, /* (94) db_optr ::= db_optr wal */
+  {  216,   -2 }, /* (95) db_optr ::= db_optr fsync */
+  {  216,   -2 }, /* (96) db_optr ::= db_optr comp */
+  {  216,   -2 }, /* (97) db_optr ::= db_optr prec */
+  {  216,   -2 }, /* (98) db_optr ::= db_optr keep */
+  {  213,    0 }, /* (99) alter_db_optr ::= */
+  {  213,   -2 }, /* (100) alter_db_optr ::= alter_db_optr replica */
+  {  213,   -2 }, /* (101) alter_db_optr ::= alter_db_optr quorum */
+  {  213,   -2 }, /* (102) alter_db_optr ::= alter_db_optr keep */
+  {  213,   -2 }, /* (103) alter_db_optr ::= alter_db_optr blocks */
+  {  213,   -2 }, /* (104) alter_db_optr ::= alter_db_optr comp */
+  {  213,   -2 }, /* (105) alter_db_optr ::= alter_db_optr wal */
+  {  213,   -2 }, /* (106) alter_db_optr ::= alter_db_optr fsync */
+  {  240,   -1 }, /* (107) typename ::= ids */
+  {  240,   -4 }, /* (108) typename ::= ids LP signed RP */
+  {  241,   -1 }, /* (109) signed ::= INTEGER */
+  {  241,   -2 }, /* (110) signed ::= PLUS INTEGER */
+  {  241,   -2 }, /* (111) signed ::= MINUS INTEGER */
+  {  208,   -6 }, /* (112) cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
+  {  242,   -3 }, /* (113) create_table_args ::= LP columnlist RP */
+  {  242,   -7 }, /* (114) create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
+  {  242,   -7 }, /* (115) create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
+  {  242,   -2 }, /* (116) create_table_args ::= AS select */
+  {  243,   -3 }, /* (117) columnlist ::= columnlist COMMA column */
+  {  243,   -1 }, /* (118) columnlist ::= column */
+  {  245,   -2 }, /* (119) column ::= ids typename */
+  {  227,   -3 }, /* (120) tagitemlist ::= tagitemlist COMMA tagitem */
+  {  227,   -1 }, /* (121) tagitemlist ::= tagitem */
+  {  246,   -1 }, /* (122) tagitem ::= INTEGER */
+  {  246,   -1 }, /* (123) tagitem ::= FLOAT */
+  {  246,   -1 }, /* (124) tagitem ::= STRING */
+  {  246,   -1 }, /* (125) tagitem ::= BOOL */
+  {  246,   -1 }, /* (126) tagitem ::= NULL */
+  {  246,   -2 }, /* (127) tagitem ::= MINUS INTEGER */
+  {  246,   -2 }, /* (128) tagitem ::= MINUS FLOAT */
+  {  246,   -2 }, /* (129) tagitem ::= PLUS INTEGER */
+  {  246,   -2 }, /* (130) tagitem ::= PLUS FLOAT */
+  {  244,  -12 }, /* (131) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+  {  258,   -1 }, /* (132) union ::= select */
+  {  258,   -3 }, /* (133) union ::= LP union RP */
+  {  258,   -4 }, /* (134) union ::= union UNION ALL select */
+  {  258,   -6 }, /* (135) union ::= union UNION ALL LP select RP */
+  {  208,   -1 }, /* (136) cmd ::= union */
+  {  244,   -2 }, /* (137) select ::= SELECT selcollist */
+  {  259,   -2 }, /* (138) sclp ::= selcollist COMMA */
+  {  259,    0 }, /* (139) sclp ::= */
+  {  247,   -3 }, /* (140) selcollist ::= sclp expr as */
+  {  247,   -2 }, /* (141) selcollist ::= sclp STAR */
+  {  261,   -2 }, /* (142) as ::= AS ids */
+  {  261,   -1 }, /* (143) as ::= ids */
+  {  261,    0 }, /* (144) as ::= */
+  {  248,   -2 }, /* (145) from ::= FROM tablelist */
+  {  262,   -2 }, /* (146) tablelist ::= ids cpxName */
+  {  262,   -3 }, /* (147) tablelist ::= ids cpxName ids */
+  {  262,   -4 }, /* (148) tablelist ::= tablelist COMMA ids cpxName */
+  {  262,   -5 }, /* (149) tablelist ::= tablelist COMMA ids cpxName ids */
+  {  263,   -1 }, /* (150) tmvar ::= VARIABLE */
+  {  250,   -4 }, /* (151) interval_opt ::= INTERVAL LP tmvar RP */
+  {  250,   -6 }, /* (152) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+  {  250,    0 }, /* (153) interval_opt ::= */
+  {  251,    0 }, /* (154) fill_opt ::= */
+  {  251,   -6 }, /* (155) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+  {  251,   -4 }, /* (156) fill_opt ::= FILL LP ID RP */
+  {  252,   -4 }, /* (157) sliding_opt ::= SLIDING LP tmvar RP */
+  {  252,    0 }, /* (158) sliding_opt ::= */
+  {  254,    0 }, /* (159) orderby_opt ::= */
+  {  254,   -3 }, /* (160) orderby_opt ::= ORDER BY sortlist */
+  {  264,   -4 }, /* (161) sortlist ::= sortlist COMMA item sortorder */
+  {  264,   -2 }, /* (162) sortlist ::= item sortorder */
+  {  266,   -2 }, /* (163) item ::= ids cpxName */
+  {  267,   -1 }, /* (164) sortorder ::= ASC */
+  {  267,   -1 }, /* (165) sortorder ::= DESC */
+  {  267,    0 }, /* (166) sortorder ::= */
+  {  253,    0 }, /* (167) groupby_opt ::= */
+  {  253,   -3 }, /* (168) groupby_opt ::= GROUP BY grouplist */
+  {  268,   -3 }, /* (169) grouplist ::= grouplist COMMA item */
+  {  268,   -1 }, /* (170) grouplist ::= item */
+  {  255,    0 }, /* (171) having_opt ::= */
+  {  255,   -2 }, /* (172) having_opt ::= HAVING expr */
+  {  257,    0 }, /* (173) limit_opt ::= */
+  {  257,   -2 }, /* (174) limit_opt ::= LIMIT signed */
+  {  257,   -4 }, /* (175) limit_opt ::= LIMIT signed OFFSET signed */
+  {  257,   -4 }, /* (176) limit_opt ::= LIMIT signed COMMA signed */
+  {  256,    0 }, /* (177) slimit_opt ::= */
+  {  256,   -2 }, /* (178) slimit_opt ::= SLIMIT signed */
+  {  256,   -4 }, /* (179) slimit_opt ::= SLIMIT signed SOFFSET signed */
+  {  256,   -4 }, /* (180) slimit_opt ::= SLIMIT signed COMMA signed */
+  {  249,    0 }, /* (181) where_opt ::= */
+  {  249,   -2 }, /* (182) where_opt ::= WHERE expr */
+  {  260,   -3 }, /* (183) expr ::= LP expr RP */
+  {  260,   -1 }, /* (184) expr ::= ID */
+  {  260,   -3 }, /* (185) expr ::= ID DOT ID */
+  {  260,   -3 }, /* (186) expr ::= ID DOT STAR */
+  {  260,   -1 }, /* (187) expr ::= INTEGER */
+  {  260,   -2 }, /* (188) expr ::= MINUS INTEGER */
+  {  260,   -2 }, /* (189) expr ::= PLUS INTEGER */
+  {  260,   -1 }, /* (190) expr ::= FLOAT */
+  {  260,   -2 }, /* (191) expr ::= MINUS FLOAT */
+  {  260,   -2 }, /* (192) expr ::= PLUS FLOAT */
+  {  260,   -1 }, /* (193) expr ::= STRING */
+  {  260,   -1 }, /* (194) expr ::= NOW */
+  {  260,   -1 }, /* (195) expr ::= VARIABLE */
+  {  260,   -1 }, /* (196) expr ::= BOOL */
+  {  260,   -4 }, /* (197) expr ::= ID LP exprlist RP */
+  {  260,   -4 }, /* (198) expr ::= ID LP STAR RP */
+  {  260,   -3 }, /* (199) expr ::= expr IS NULL */
+  {  260,   -4 }, /* (200) expr ::= expr IS NOT NULL */
+  {  260,   -3 }, /* (201) expr ::= expr LT expr */
+  {  260,   -3 }, /* (202) expr ::= expr GT expr */
+  {  260,   -3 }, /* (203) expr ::= expr LE expr */
+  {  260,   -3 }, /* (204) expr ::= expr GE expr */
+  {  260,   -3 }, /* (205) expr ::= expr NE expr */
+  {  260,   -3 }, /* (206) expr ::= expr EQ expr */
+  {  260,   -3 }, /* (207) expr ::= expr AND expr */
+  {  260,   -3 }, /* (208) expr ::= expr OR expr */
+  {  260,   -3 }, /* (209) expr ::= expr PLUS expr */
+  {  260,   -3 }, /* (210) expr ::= expr MINUS expr */
+  {  260,   -3 }, /* (211) expr ::= expr STAR expr */
+  {  260,   -3 }, /* (212) expr ::= expr SLASH expr */
+  {  260,   -3 }, /* (213) expr ::= expr REM expr */
+  {  260,   -3 }, /* (214) expr ::= expr LIKE expr */
+  {  260,   -5 }, /* (215) expr ::= expr IN LP exprlist RP */
+  {  269,   -3 }, /* (216) exprlist ::= exprlist COMMA expritem */
+  {  269,   -1 }, /* (217) exprlist ::= expritem */
+  {  270,   -1 }, /* (218) expritem ::= expr */
+  {  270,    0 }, /* (219) expritem ::= */
+  {  208,   -3 }, /* (220) cmd ::= RESET QUERY CACHE */
+  {  208,   -7 }, /* (221) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+  {  208,   -7 }, /* (222) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+  {  208,   -7 }, /* (223) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+  {  208,   -7 }, /* (224) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+  {  208,   -8 }, /* (225) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+  {  208,   -9 }, /* (226) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+  {  208,   -3 }, /* (227) cmd ::= KILL CONNECTION INTEGER */
+  {  208,   -5 }, /* (228) cmd ::= KILL STREAM INTEGER COLON INTEGER */
+  {  208,   -5 }, /* (229) cmd ::= KILL QUERY INTEGER COLON INTEGER */
+};
+
+static void yy_accept(yyParser*);  /* Forward Declaration */
+
+/*
+** Perform a reduce action and the shift that must immediately
+** follow the reduce.
+**
+** The yyLookahead and yyLookaheadToken parameters provide reduce actions
+** access to the lookahead token (if any).  The yyLookahead will be YYNOCODE
+** if the lookahead token has already been consumed.  As this procedure is
+** only called from one place, optimizing compilers will in-line it, which
+** means that the extra parameters have no performance impact.
+*/
+static void yy_reduce(
+  yyParser *yypParser,         /* The parser */
+  unsigned int yyruleno,       /* Number of the rule by which to reduce */
+  int yyLookahead,             /* Lookahead token, or YYNOCODE if none */
+  ParseTOKENTYPE yyLookaheadToken  /* Value of the lookahead token */
+){
+  int yygoto;                     /* The next state */
+  int yyact;                      /* The next action */
+  yyStackEntry *yymsp;            /* The top of the parser's stack */
+  int yysize;                     /* Amount to pop the stack */
+  ParseARG_FETCH;
+  (void)yyLookahead;
+  (void)yyLookaheadToken;
+  yymsp = yypParser->yytos;
+#ifndef NDEBUG
+  if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){
+    yysize = yyRuleInfo[yyruleno].nrhs;
+    if( yysize ){
+      fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n",
+        yyTracePrompt,
+        yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno);
+    }else{
+      fprintf(yyTraceFILE, "%sReduce %d [%s].\n",
+        yyTracePrompt, yyruleno, yyRuleName[yyruleno]);
+    }
+  }
+#endif /* NDEBUG */
+
+  /* Check that the stack is large enough to grow by a single entry
+  ** if the RHS of the rule is empty.  This ensures that there is room
+  ** enough on the stack to push the LHS value */
+  if( yyRuleInfo[yyruleno].nrhs==0 ){
+#ifdef YYTRACKMAXSTACKDEPTH
+    if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){
+      yypParser->yyhwm++;
+      assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack));
+    }
+#endif
+#if YYSTACKDEPTH>0 
+    if( yypParser->yytos>=yypParser->yystackEnd ){
+      yyStackOverflow(yypParser);
+      return;
+    }
+#else
+    if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){
+      if( yyGrowStack(yypParser) ){
+        yyStackOverflow(yypParser);
+        return;
+      }
+      yymsp = yypParser->yytos;
+    }
+#endif
+  }
+
+  switch( yyruleno ){
+  /* Beginning here are the reduction cases.  A typical example
+  ** follows:
+  **   case 0:
+  **  #line <lineno> <grammarfile>
+  **     { ... }           // User supplied code
+  **  #line <lineno> <thisfile>
+  **     break;
+  */
+/********** Begin reduce actions **********************************************/
+        YYMINORTYPE yylhsminor;
+      case 0: /* program ::= cmd */
+{}
+        break;
+      case 1: /* cmd ::= SHOW DATABASES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);}
+        break;
+      case 2: /* cmd ::= SHOW MNODES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);}
+        break;
+      case 3: /* cmd ::= SHOW DNODES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);}
+        break;
+      case 4: /* cmd ::= SHOW ACCOUNTS */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);}
+        break;
+      case 5: /* cmd ::= SHOW USERS */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);}
+        break;
+      case 6: /* cmd ::= SHOW MODULES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0);  }
+        break;
+      case 7: /* cmd ::= SHOW QUERIES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0);  }
+        break;
+      case 8: /* cmd ::= SHOW CONNECTIONS */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);}
+        break;
+      case 9: /* cmd ::= SHOW STREAMS */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0);  }
+        break;
+      case 10: /* cmd ::= SHOW VARIABLES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0);  }
+        break;
+      case 11: /* cmd ::= SHOW SCORES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0);   }
+        break;
+      case 12: /* cmd ::= SHOW GRANTS */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0);   }
+        break;
+      case 13: /* cmd ::= SHOW VNODES */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); }
+        break;
+      case 14: /* cmd ::= SHOW VNODES IPTOKEN */
+{ setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); }
+        break;
+      case 15: /* dbPrefix ::= */
+{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;}
+        break;
+      case 16: /* dbPrefix ::= ids DOT */
+{yylhsminor.yy0 = yymsp[-1].minor.yy0;  }
+  yymsp[-1].minor.yy0 = yylhsminor.yy0;
+        break;
+      case 17: /* cpxName ::= */
+{yymsp[1].minor.yy0.n = 0;  }
+        break;
+      case 18: /* cpxName ::= DOT ids */
+{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1;    }
+        break;
+      case 19: /* cmd ::= SHOW CREATE TABLE ids cpxName */
+{
+   yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+   setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &yymsp[-1].minor.yy0);
+}
+        break;
+      case 20: /* cmd ::= SHOW CREATE DATABASE ids */
+{
+  setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &yymsp[0].minor.yy0);
+}
+        break;
+      case 21: /* cmd ::= SHOW dbPrefix TABLES */
+{
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0);
+}
+        break;
+      case 22: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */
+{
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
+}
+        break;
+      case 23: /* cmd ::= SHOW dbPrefix STABLES */
+{
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0);
+}
+        break;
+      case 24: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */
+{
+    SStrToken token;
+    setDBName(&token, &yymsp[-3].minor.yy0);
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &yymsp[0].minor.yy0);
+}
+        break;
+      case 25: /* cmd ::= SHOW dbPrefix VGROUPS */
+{
+    SStrToken token;
+    setDBName(&token, &yymsp[-1].minor.yy0);
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0);
+}
+        break;
+      case 26: /* cmd ::= SHOW dbPrefix VGROUPS ids */
+{
+    SStrToken token;
+    setDBName(&token, &yymsp[-2].minor.yy0);    
+    setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &yymsp[0].minor.yy0);
+}
+        break;
+      case 27: /* cmd ::= DROP TABLE ifexists ids cpxName */
+{
+    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+    setDropDBTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0);
+}
+        break;
+      case 28: /* cmd ::= DROP DATABASE ifexists ids */
+{ setDropDBTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0); }
+        break;
+      case 29: /* cmd ::= DROP DNODE ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0);    }
+        break;
+      case 30: /* cmd ::= DROP USER ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0);     }
+        break;
+      case 31: /* cmd ::= DROP ACCOUNT ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0);  }
+        break;
+      case 32: /* cmd ::= USE ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);}
+        break;
+      case 33: /* cmd ::= DESCRIBE ids cpxName */
+{
+    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+    setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0);
+}
+        break;
+      case 34: /* cmd ::= ALTER USER ids PASS ids */
+{ setAlterUserSQL(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL);    }
+        break;
+      case 35: /* cmd ::= ALTER USER ids PRIVILEGE ids */
+{ setAlterUserSQL(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);}
+        break;
+      case 36: /* cmd ::= ALTER DNODE ids ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);          }
+        break;
+      case 37: /* cmd ::= ALTER DNODE ids ids ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);      }
+        break;
+      case 38: /* cmd ::= ALTER LOCAL ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0);              }
+        break;
+      case 39: /* cmd ::= ALTER LOCAL ids ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);          }
+        break;
+      case 40: /* cmd ::= ALTER DATABASE ids alter_db_optr */
+{ SStrToken t = {0};  setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy158, &t);}
+        break;
+      case 41: /* cmd ::= ALTER ACCOUNT ids acct_optr */
+{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy73);}
+        break;
+      case 42: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
+{ setCreateAcctSQL(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy73);}
+        break;
+      case 43: /* ids ::= ID */
+      case 44: /* ids ::= STRING */ yytestcase(yyruleno==44);
+{yylhsminor.yy0 = yymsp[0].minor.yy0; }
+  yymsp[0].minor.yy0 = yylhsminor.yy0;
+        break;
+      case 45: /* ifexists ::= IF EXISTS */
+{yymsp[-1].minor.yy0.n = 1;}
+        break;
+      case 46: /* ifexists ::= */
+      case 48: /* ifnotexists ::= */ yytestcase(yyruleno==48);
+{yymsp[1].minor.yy0.n = 0;}
+        break;
+      case 47: /* ifnotexists ::= IF NOT EXISTS */
+{yymsp[-2].minor.yy0.n = 1;}
+        break;
+      case 49: /* cmd ::= CREATE DNODE ids */
+{ setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
+        break;
+      case 50: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
+{ setCreateAcctSQL(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy73);}
+        break;
+      case 51: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
+{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy158, &yymsp[-2].minor.yy0);}
+        break;
+      case 52: /* cmd ::= CREATE USER ids PASS ids */
+{ setCreateUserSQL(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
+        break;
+      case 53: /* pps ::= */
+      case 55: /* tseries ::= */ yytestcase(yyruleno==55);
+      case 57: /* dbs ::= */ yytestcase(yyruleno==57);
+      case 59: /* streams ::= */ yytestcase(yyruleno==59);
+      case 61: /* storage ::= */ yytestcase(yyruleno==61);
+      case 63: /* qtime ::= */ yytestcase(yyruleno==63);
+      case 65: /* users ::= */ yytestcase(yyruleno==65);
+      case 67: /* conns ::= */ yytestcase(yyruleno==67);
+      case 69: /* state ::= */ yytestcase(yyruleno==69);
+{yymsp[1].minor.yy0.n = 0;   }
+        break;
+      case 54: /* pps ::= PPS INTEGER */
+      case 56: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==56);
+      case 58: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==58);
+      case 60: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==60);
+      case 62: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==62);
+      case 64: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==64);
+      case 66: /* users ::= USERS INTEGER */ yytestcase(yyruleno==66);
+      case 68: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==68);
+      case 70: /* state ::= STATE ids */ yytestcase(yyruleno==70);
+{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;     }
+        break;
+      case 71: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
+{
+    yylhsminor.yy73.maxUsers   = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
+    yylhsminor.yy73.maxDbs     = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
+    yylhsminor.yy73.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
+    yylhsminor.yy73.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
+    yylhsminor.yy73.maxPointsPerSecond     = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
+    yylhsminor.yy73.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
+    yylhsminor.yy73.maxQueryTime   = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
+    yylhsminor.yy73.maxConnections   = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
+    yylhsminor.yy73.stat    = yymsp[0].minor.yy0;
+}
+  yymsp[-8].minor.yy73 = yylhsminor.yy73;
+        break;
+      case 72: /* keep ::= KEEP tagitemlist */
+{ yymsp[-1].minor.yy494 = yymsp[0].minor.yy494; }
+        break;
+      case 73: /* cache ::= CACHE INTEGER */
+      case 74: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==74);
+      case 75: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==75);
+      case 76: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==76);
+      case 77: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==77);
+      case 78: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==78);
+      case 79: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==79);
+      case 80: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==80);
+      case 81: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==81);
+      case 82: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==82);
+      case 83: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==83);
+      case 84: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==84);
+{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
+        break;
+      case 85: /* db_optr ::= */
+{setDefaultCreateDbOption(&yymsp[1].minor.yy158);}
+        break;
+      case 86: /* db_optr ::= db_optr cache */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 87: /* db_optr ::= db_optr replica */
+      case 100: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==100);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 88: /* db_optr ::= db_optr quorum */
+      case 101: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==101);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 89: /* db_optr ::= db_optr days */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 90: /* db_optr ::= db_optr minrows */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 91: /* db_optr ::= db_optr maxrows */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 92: /* db_optr ::= db_optr blocks */
+      case 103: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==103);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 93: /* db_optr ::= db_optr ctime */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 94: /* db_optr ::= db_optr wal */
+      case 105: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==105);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 95: /* db_optr ::= db_optr fsync */
+      case 106: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==106);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 96: /* db_optr ::= db_optr comp */
+      case 104: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==104);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 97: /* db_optr ::= db_optr prec */
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.precision = yymsp[0].minor.yy0; }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 98: /* db_optr ::= db_optr keep */
+      case 102: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==102);
+{ yylhsminor.yy158 = yymsp[-1].minor.yy158; yylhsminor.yy158.keep = yymsp[0].minor.yy494; }
+  yymsp[-1].minor.yy158 = yylhsminor.yy158;
+        break;
+      case 99: /* alter_db_optr ::= */
+{ setDefaultCreateDbOption(&yymsp[1].minor.yy158);}
+        break;
+      case 107: /* typename ::= ids */
+{ 
+  yymsp[0].minor.yy0.type = 0;
+  tSQLSetColumnType (&yylhsminor.yy181, &yymsp[0].minor.yy0); 
+}
+  yymsp[0].minor.yy181 = yylhsminor.yy181;
+        break;
+      case 108: /* typename ::= ids LP signed RP */
+{
+    if (yymsp[-1].minor.yy271 <= 0) {
+      yymsp[-3].minor.yy0.type = 0;
+      tSQLSetColumnType(&yylhsminor.yy181, &yymsp[-3].minor.yy0);
+    } else {
+      yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy271;          // negative value of name length
+      tSQLSetColumnType(&yylhsminor.yy181, &yymsp[-3].minor.yy0);
+    }
+}
+  yymsp[-3].minor.yy181 = yylhsminor.yy181;
+        break;
+      case 109: /* signed ::= INTEGER */
+{ yylhsminor.yy271 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+  yymsp[0].minor.yy271 = yylhsminor.yy271;
+        break;
+      case 110: /* signed ::= PLUS INTEGER */
+{ yymsp[-1].minor.yy271 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+        break;
+      case 111: /* signed ::= MINUS INTEGER */
+{ yymsp[-1].minor.yy271 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
+        break;
+      case 112: /* cmd ::= CREATE TABLE ifnotexists ids cpxName create_table_args */
+{
+    yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
+    setCreatedTableName(pInfo, &yymsp[-2].minor.yy0, &yymsp[-3].minor.yy0);
+}
+        break;
+      case 113: /* create_table_args ::= LP columnlist RP */
+{
+    yymsp[-2].minor.yy374 = tSetCreateSQLElems(yymsp[-1].minor.yy449, NULL, NULL, NULL, NULL, TSQL_CREATE_TABLE);
+    setSQLInfo(pInfo, yymsp[-2].minor.yy374, NULL, TSDB_SQL_CREATE_TABLE);
+}
+        break;
+      case 114: /* create_table_args ::= LP columnlist RP TAGS LP columnlist RP */
+{
+    yymsp[-6].minor.yy374 = tSetCreateSQLElems(yymsp[-5].minor.yy449, yymsp[-1].minor.yy449, NULL, NULL, NULL, TSQL_CREATE_STABLE);
+    setSQLInfo(pInfo, yymsp[-6].minor.yy374, NULL, TSDB_SQL_CREATE_TABLE);
+}
+        break;
+      case 115: /* create_table_args ::= USING ids cpxName TAGS LP tagitemlist RP */
+{
+    yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
+    yymsp[-6].minor.yy374 = tSetCreateSQLElems(NULL, NULL, &yymsp[-5].minor.yy0, yymsp[-1].minor.yy494, NULL, TSQL_CREATE_TABLE_FROM_STABLE);
+    setSQLInfo(pInfo, yymsp[-6].minor.yy374, NULL, TSDB_SQL_CREATE_TABLE);
+}
+        break;
+      case 116: /* create_table_args ::= AS select */
+{
+    yymsp[-1].minor.yy374 = tSetCreateSQLElems(NULL, NULL, NULL, NULL, yymsp[0].minor.yy150, TSQL_CREATE_STREAM);
+    setSQLInfo(pInfo, yymsp[-1].minor.yy374, NULL, TSDB_SQL_CREATE_TABLE);
+}
+        break;
+      case 117: /* columnlist ::= columnlist COMMA column */
+{yylhsminor.yy449 = tFieldListAppend(yymsp[-2].minor.yy449, &yymsp[0].minor.yy181);   }
+  yymsp[-2].minor.yy449 = yylhsminor.yy449;
+        break;
+      case 118: /* columnlist ::= column */
+{yylhsminor.yy449 = tFieldListAppend(NULL, &yymsp[0].minor.yy181);}
+  yymsp[0].minor.yy449 = yylhsminor.yy449;
+        break;
+      case 119: /* column ::= ids typename */
+{
+    tSQLSetColumnInfo(&yylhsminor.yy181, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy181);
+}
+  yymsp[-1].minor.yy181 = yylhsminor.yy181;
+        break;
+      case 120: /* tagitemlist ::= tagitemlist COMMA tagitem */
+{ yylhsminor.yy494 = tVariantListAppend(yymsp[-2].minor.yy494, &yymsp[0].minor.yy312, -1);    }
+  yymsp[-2].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 121: /* tagitemlist ::= tagitem */
+{ yylhsminor.yy494 = tVariantListAppend(NULL, &yymsp[0].minor.yy312, -1); }
+  yymsp[0].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 122: /* tagitem ::= INTEGER */
+      case 123: /* tagitem ::= FLOAT */ yytestcase(yyruleno==123);
+      case 124: /* tagitem ::= STRING */ yytestcase(yyruleno==124);
+      case 125: /* tagitem ::= BOOL */ yytestcase(yyruleno==125);
+{toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy312, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy312 = yylhsminor.yy312;
+        break;
+      case 126: /* tagitem ::= NULL */
+{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy312, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy312 = yylhsminor.yy312;
+        break;
+      case 127: /* tagitem ::= MINUS INTEGER */
+      case 128: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==128);
+      case 129: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==129);
+      case 130: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==130);
+{
+    yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+    yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
+    toTSDBType(yymsp[-1].minor.yy0.type);
+    tVariantCreate(&yylhsminor.yy312, &yymsp[-1].minor.yy0);
+}
+  yymsp[-1].minor.yy312 = yylhsminor.yy312;
+        break;
+      case 131: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */
+{
+  yylhsminor.yy150 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy224, yymsp[-9].minor.yy494, yymsp[-8].minor.yy66, yymsp[-4].minor.yy494, yymsp[-3].minor.yy494, &yymsp[-7].minor.yy314, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy494, &yymsp[0].minor.yy188, &yymsp[-1].minor.yy188);
+}
+  yymsp[-11].minor.yy150 = yylhsminor.yy150;
+        break;
+      case 132: /* union ::= select */
+{ yylhsminor.yy25 = setSubclause(NULL, yymsp[0].minor.yy150); }
+  yymsp[0].minor.yy25 = yylhsminor.yy25;
+        break;
+      case 133: /* union ::= LP union RP */
+{ yymsp[-2].minor.yy25 = yymsp[-1].minor.yy25; }
+        break;
+      case 134: /* union ::= union UNION ALL select */
+{ yylhsminor.yy25 = appendSelectClause(yymsp[-3].minor.yy25, yymsp[0].minor.yy150); }
+  yymsp[-3].minor.yy25 = yylhsminor.yy25;
+        break;
+      case 135: /* union ::= union UNION ALL LP select RP */
+{ yylhsminor.yy25 = appendSelectClause(yymsp[-5].minor.yy25, yymsp[-1].minor.yy150); }
+  yymsp[-5].minor.yy25 = yylhsminor.yy25;
+        break;
+      case 136: /* cmd ::= union */
+{ setSQLInfo(pInfo, yymsp[0].minor.yy25, NULL, TSDB_SQL_SELECT); }
+        break;
+      case 137: /* select ::= SELECT selcollist */
+{
+  yylhsminor.yy150 = tSetQuerySQLElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy224, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+}
+  yymsp[-1].minor.yy150 = yylhsminor.yy150;
+        break;
+      case 138: /* sclp ::= selcollist COMMA */
+{yylhsminor.yy224 = yymsp[-1].minor.yy224;}
+  yymsp[-1].minor.yy224 = yylhsminor.yy224;
+        break;
+      case 139: /* sclp ::= */
+{yymsp[1].minor.yy224 = 0;}
+        break;
+      case 140: /* selcollist ::= sclp expr as */
+{
+   yylhsminor.yy224 = tSQLExprListAppend(yymsp[-2].minor.yy224, yymsp[-1].minor.yy66, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
+}
+  yymsp[-2].minor.yy224 = yylhsminor.yy224;
+        break;
+      case 141: /* selcollist ::= sclp STAR */
+{
+   tSQLExpr *pNode = tSQLExprIdValueCreate(NULL, TK_ALL);
+   yylhsminor.yy224 = tSQLExprListAppend(yymsp[-1].minor.yy224, pNode, 0);
+}
+  yymsp[-1].minor.yy224 = yylhsminor.yy224;
+        break;
+      case 142: /* as ::= AS ids */
+{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0;    }
+        break;
+      case 143: /* as ::= ids */
+{ yylhsminor.yy0 = yymsp[0].minor.yy0;    }
+  yymsp[0].minor.yy0 = yylhsminor.yy0;
+        break;
+      case 144: /* as ::= */
+{ yymsp[1].minor.yy0.n = 0;  }
+        break;
+      case 145: /* from ::= FROM tablelist */
+{yymsp[-1].minor.yy494 = yymsp[0].minor.yy494;}
+        break;
+      case 146: /* tablelist ::= ids cpxName */
+{
+  toTSDBType(yymsp[-1].minor.yy0.type);
+  yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+  yylhsminor.yy494 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+  yylhsminor.yy494 = tVariantListAppendToken(yylhsminor.yy494, &yymsp[-1].minor.yy0, -1);  // table alias name
+}
+  yymsp[-1].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 147: /* tablelist ::= ids cpxName ids */
+{
+   toTSDBType(yymsp[-2].minor.yy0.type);
+   toTSDBType(yymsp[0].minor.yy0.type);
+   yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
+   yylhsminor.yy494 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
+   yylhsminor.yy494 = tVariantListAppendToken(yylhsminor.yy494, &yymsp[0].minor.yy0, -1);
+}
+  yymsp[-2].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 148: /* tablelist ::= tablelist COMMA ids cpxName */
+{
+  toTSDBType(yymsp[-1].minor.yy0.type);
+  yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+  yylhsminor.yy494 = tVariantListAppendToken(yymsp[-3].minor.yy494, &yymsp[-1].minor.yy0, -1);
+  yylhsminor.yy494 = tVariantListAppendToken(yylhsminor.yy494, &yymsp[-1].minor.yy0, -1);
+}
+  yymsp[-3].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 149: /* tablelist ::= tablelist COMMA ids cpxName ids */
+{
+   toTSDBType(yymsp[-2].minor.yy0.type);
+   toTSDBType(yymsp[0].minor.yy0.type);
+   yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
+   yylhsminor.yy494 = tVariantListAppendToken(yymsp[-4].minor.yy494, &yymsp[-2].minor.yy0, -1);
+   yylhsminor.yy494 = tVariantListAppendToken(yylhsminor.yy494, &yymsp[0].minor.yy0, -1);
+}
+  yymsp[-4].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 150: /* tmvar ::= VARIABLE */
+{yylhsminor.yy0 = yymsp[0].minor.yy0;}
+  yymsp[0].minor.yy0 = yylhsminor.yy0;
+        break;
+      case 151: /* interval_opt ::= INTERVAL LP tmvar RP */
+{yymsp[-3].minor.yy314.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy314.offset.n = 0; yymsp[-3].minor.yy314.offset.z = NULL; yymsp[-3].minor.yy314.offset.type = 0;}
+        break;
+      case 152: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */
+{yymsp[-5].minor.yy314.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy314.offset = yymsp[-1].minor.yy0;}
+        break;
+      case 153: /* interval_opt ::= */
+{memset(&yymsp[1].minor.yy314, 0, sizeof(yymsp[1].minor.yy314));}
+        break;
+      case 154: /* fill_opt ::= */
+{yymsp[1].minor.yy494 = 0;     }
+        break;
+      case 155: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
+{
+    tVariant A = {0};
+    toTSDBType(yymsp[-3].minor.yy0.type);
+    tVariantCreate(&A, &yymsp[-3].minor.yy0);
+
+    tVariantListInsert(yymsp[-1].minor.yy494, &A, -1, 0);
+    yymsp[-5].minor.yy494 = yymsp[-1].minor.yy494;
+}
+        break;
+      case 156: /* fill_opt ::= FILL LP ID RP */
+{
+    toTSDBType(yymsp[-1].minor.yy0.type);
+    yymsp[-3].minor.yy494 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+}
+        break;
+      case 157: /* sliding_opt ::= SLIDING LP tmvar RP */
+{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0;     }
+        break;
+      case 158: /* sliding_opt ::= */
+{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0;   }
+        break;
+      case 159: /* orderby_opt ::= */
+      case 167: /* groupby_opt ::= */ yytestcase(yyruleno==167);
+{yymsp[1].minor.yy494 = 0;}
+        break;
+      case 160: /* orderby_opt ::= ORDER BY sortlist */
+      case 168: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==168);
+{yymsp[-2].minor.yy494 = yymsp[0].minor.yy494;}
+        break;
+      case 161: /* sortlist ::= sortlist COMMA item sortorder */
+{
+    yylhsminor.yy494 = tVariantListAppend(yymsp[-3].minor.yy494, &yymsp[-1].minor.yy312, yymsp[0].minor.yy82);
+}
+  yymsp[-3].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 162: /* sortlist ::= item sortorder */
+{
+  yylhsminor.yy494 = tVariantListAppend(NULL, &yymsp[-1].minor.yy312, yymsp[0].minor.yy82);
+}
+  yymsp[-1].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 163: /* item ::= ids cpxName */
+{
+  toTSDBType(yymsp[-1].minor.yy0.type);
+  yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
+
+  tVariantCreate(&yylhsminor.yy312, &yymsp[-1].minor.yy0);
+}
+  yymsp[-1].minor.yy312 = yylhsminor.yy312;
+        break;
+      case 164: /* sortorder ::= ASC */
+{yymsp[0].minor.yy82 = TSDB_ORDER_ASC; }
+        break;
+      case 165: /* sortorder ::= DESC */
+{yymsp[0].minor.yy82 = TSDB_ORDER_DESC;}
+        break;
+      case 166: /* sortorder ::= */
+{yymsp[1].minor.yy82 = TSDB_ORDER_ASC;}
+        break;
+      case 169: /* grouplist ::= grouplist COMMA item */
+{
+  yylhsminor.yy494 = tVariantListAppend(yymsp[-2].minor.yy494, &yymsp[0].minor.yy312, -1);
+}
+  yymsp[-2].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 170: /* grouplist ::= item */
+{
+  yylhsminor.yy494 = tVariantListAppend(NULL, &yymsp[0].minor.yy312, -1);
+}
+  yymsp[0].minor.yy494 = yylhsminor.yy494;
+        break;
+      case 171: /* having_opt ::= */
+      case 181: /* where_opt ::= */ yytestcase(yyruleno==181);
+      case 219: /* expritem ::= */ yytestcase(yyruleno==219);
+{yymsp[1].minor.yy66 = 0;}
+        break;
+      case 172: /* having_opt ::= HAVING expr */
+      case 182: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==182);
+{yymsp[-1].minor.yy66 = yymsp[0].minor.yy66;}
+        break;
+      case 173: /* limit_opt ::= */
+      case 177: /* slimit_opt ::= */ yytestcase(yyruleno==177);
+{yymsp[1].minor.yy188.limit = -1; yymsp[1].minor.yy188.offset = 0;}
+        break;
+      case 174: /* limit_opt ::= LIMIT signed */
+      case 178: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==178);
+{yymsp[-1].minor.yy188.limit = yymsp[0].minor.yy271;  yymsp[-1].minor.yy188.offset = 0;}
+        break;
+      case 175: /* limit_opt ::= LIMIT signed OFFSET signed */
+      case 179: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==179);
+{yymsp[-3].minor.yy188.limit = yymsp[-2].minor.yy271;  yymsp[-3].minor.yy188.offset = yymsp[0].minor.yy271;}
+        break;
+      case 176: /* limit_opt ::= LIMIT signed COMMA signed */
+      case 180: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==180);
+{yymsp[-3].minor.yy188.limit = yymsp[0].minor.yy271;  yymsp[-3].minor.yy188.offset = yymsp[-2].minor.yy271;}
+        break;
+      case 183: /* expr ::= LP expr RP */
+{yymsp[-2].minor.yy66 = yymsp[-1].minor.yy66; }
+        break;
+      case 184: /* expr ::= ID */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 185: /* expr ::= ID DOT ID */
+{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 186: /* expr ::= ID DOT STAR */
+{yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 187: /* expr ::= INTEGER */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 188: /* expr ::= MINUS INTEGER */
+      case 189: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==189);
+{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);}
+  yymsp[-1].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 190: /* expr ::= FLOAT */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 191: /* expr ::= MINUS FLOAT */
+      case 192: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==192);
+{yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);}
+  yymsp[-1].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 193: /* expr ::= STRING */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 194: /* expr ::= NOW */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); }
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 195: /* expr ::= VARIABLE */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 196: /* expr ::= BOOL */
+{yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 197: /* expr ::= ID LP exprlist RP */
+{ yylhsminor.yy66 = tSQLExprCreateFunction(yymsp[-1].minor.yy224, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+  yymsp[-3].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 198: /* expr ::= ID LP STAR RP */
+{ yylhsminor.yy66 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
+  yymsp[-3].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 199: /* expr ::= expr IS NULL */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, NULL, TK_ISNULL);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 200: /* expr ::= expr IS NOT NULL */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-3].minor.yy66, NULL, TK_NOTNULL);}
+  yymsp[-3].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 201: /* expr ::= expr LT expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LT);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 202: /* expr ::= expr GT expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_GT);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 203: /* expr ::= expr LE expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LE);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 204: /* expr ::= expr GE expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_GE);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 205: /* expr ::= expr NE expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_NE);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 206: /* expr ::= expr EQ expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_EQ);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 207: /* expr ::= expr AND expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_AND);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 208: /* expr ::= expr OR expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_OR); }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 209: /* expr ::= expr PLUS expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_PLUS);  }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 210: /* expr ::= expr MINUS expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_MINUS); }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 211: /* expr ::= expr STAR expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_STAR);  }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 212: /* expr ::= expr SLASH expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_DIVIDE);}
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 213: /* expr ::= expr REM expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_REM);   }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 214: /* expr ::= expr LIKE expr */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LIKE);  }
+  yymsp[-2].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 215: /* expr ::= expr IN LP exprlist RP */
+{yylhsminor.yy66 = tSQLExprCreate(yymsp[-4].minor.yy66, (tSQLExpr*)yymsp[-1].minor.yy224, TK_IN); }
+  yymsp[-4].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 216: /* exprlist ::= exprlist COMMA expritem */
+{yylhsminor.yy224 = tSQLExprListAppend(yymsp[-2].minor.yy224,yymsp[0].minor.yy66,0);}
+  yymsp[-2].minor.yy224 = yylhsminor.yy224;
+        break;
+      case 217: /* exprlist ::= expritem */
+{yylhsminor.yy224 = tSQLExprListAppend(0,yymsp[0].minor.yy66,0);}
+  yymsp[0].minor.yy224 = yylhsminor.yy224;
+        break;
+      case 218: /* expritem ::= expr */
+{yylhsminor.yy66 = yymsp[0].minor.yy66;}
+  yymsp[0].minor.yy66 = yylhsminor.yy66;
+        break;
+      case 220: /* cmd ::= RESET QUERY CACHE */
+{ setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
+        break;
+      case 221: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
+{
+    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy449, NULL, TSDB_ALTER_TABLE_ADD_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 222: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
+{
+    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+
+    toTSDBType(yymsp[0].minor.yy0.type);
+    tVariantList* K = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 223: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
+{
+    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy449, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 224: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
+{
+    yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
+
+    toTSDBType(yymsp[0].minor.yy0.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[0].minor.yy0, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 225: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
+{
+    yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
+
+    toTSDBType(yymsp[-1].minor.yy0.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
+
+    toTSDBType(yymsp[0].minor.yy0.type);
+    A = tVariantListAppendToken(A, &yymsp[0].minor.yy0, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 226: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
+{
+    yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
+
+    toTSDBType(yymsp[-2].minor.yy0.type);
+    tVariantList* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
+    A = tVariantListAppend(A, &yymsp[0].minor.yy312, -1);
+
+    SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL);
+    setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
+}
+        break;
+      case 227: /* cmd ::= KILL CONNECTION INTEGER */
+{setKillSQL(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
+        break;
+      case 228: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
+{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);}
+        break;
+      case 229: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
+{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);}
+        break;
+      default:
+        break;
+/********** End reduce actions ************************************************/
+  };
+  assert( yyruleno<sizeof(yyRuleInfo)/sizeof(yyRuleInfo[0]) );
+  yygoto = yyRuleInfo[yyruleno].lhs;
+  yysize = yyRuleInfo[yyruleno].nrhs;
+  yyact = yy_find_reduce_action(yymsp[yysize].stateno,(YYCODETYPE)yygoto);
+
+  /* There are no SHIFTREDUCE actions on nonterminals because the table
+  ** generator has simplified them to pure REDUCE actions. */
+  assert( !(yyact>YY_MAX_SHIFT && yyact<=YY_MAX_SHIFTREDUCE) );
+
+  /* It is not possible for a REDUCE to be followed by an error */
+  assert( yyact!=YY_ERROR_ACTION );
+
+  yymsp += yysize+1;
+  yypParser->yytos = yymsp;
+  yymsp->stateno = (YYACTIONTYPE)yyact;
+  yymsp->major = (YYCODETYPE)yygoto;
+  yyTraceShift(yypParser, yyact, "... then shift");
+}
+
+/*
+** The following code executes when the parse fails
+*/
+#ifndef YYNOERRORRECOVERY
+static void yy_parse_failed(
+  yyParser *yypParser           /* The parser */
+){
+  ParseARG_FETCH;
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt);
+  }
+#endif
+  while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
+  /* Here code is inserted which will be executed whenever the
+  ** parser fails */
+/************ Begin %parse_failure code ***************************************/
+/************ End %parse_failure code *****************************************/
+  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+#endif /* YYNOERRORRECOVERY */
+
+/*
+** The following code executes when a syntax error first occurs.
+*/
+static void yy_syntax_error(
+  yyParser *yypParser,           /* The parser */
+  int yymajor,                   /* The major type of the error token */
+  ParseTOKENTYPE yyminor         /* The minor type of the error token */
+){
+  ParseARG_FETCH;
+#define TOKEN yyminor
+/************ Begin %syntax_error code ****************************************/
+
+  pInfo->valid = false;
+  int32_t outputBufLen = tListLen(pInfo->pzErrMsg);
+  int32_t len = 0;
+
+  if(TOKEN.z) {
+    char msg[] = "syntax error near \"%s\"";
+    int32_t sqlLen = strlen(&TOKEN.z[0]);
+
+    if (sqlLen + sizeof(msg)/sizeof(msg[0]) + 1 > outputBufLen) {
+        char tmpstr[128] = {0};
+        memcpy(tmpstr, &TOKEN.z[0], sizeof(tmpstr)/sizeof(tmpstr[0]) - 1);
+        len = sprintf(pInfo->pzErrMsg, msg, tmpstr);
+    } else {
+        len = sprintf(pInfo->pzErrMsg, msg, &TOKEN.z[0]);
+    }
+
+  } else {
+    len = sprintf(pInfo->pzErrMsg, "Incomplete SQL statement");
+  }
+
+  assert(len <= outputBufLen);
+/************ End %syntax_error code ******************************************/
+  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+
+/*
+** The following is executed when the parser accepts
+*/
+static void yy_accept(
+  yyParser *yypParser           /* The parser */
+){
+  ParseARG_FETCH;
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt);
+  }
+#endif
+#ifndef YYNOERRORRECOVERY
+  yypParser->yyerrcnt = -1;
+#endif
+  assert( yypParser->yytos==yypParser->yystack );
+  /* Here code is inserted which will be executed whenever the
+  ** parser accepts */
+/*********** Begin %parse_accept code *****************************************/
+
+/*********** End %parse_accept code *******************************************/
+  ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
+}
+
+/* The main parser program.
+** The first argument is a pointer to a structure obtained from
+** "ParseAlloc" which describes the current state of the parser.
+** The second argument is the major token number.  The third is
+** the minor token.  The fourth optional argument is whatever the
+** user wants (and specified in the grammar) and is available for
+** use by the action routines.
+**
+** Inputs:
+** <ul>
+** <li> A pointer to the parser (an opaque structure.)
+** <li> The major token number.
+** <li> The minor token number.
+** <li> An option argument of a grammar-specified type.
+** </ul>
+**
+** Outputs:
+** None.
+*/
+void Parse(
+  void *yyp,                   /* The parser */
+  int yymajor,                 /* The major token code number */
+  ParseTOKENTYPE yyminor       /* The value for the token */
+  ParseARG_PDECL               /* Optional %extra_argument parameter */
+){
+  YYMINORTYPE yyminorunion;
+  unsigned int yyact;   /* The parser action. */
+#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
+  int yyendofinput;     /* True if we are at the end of input */
+#endif
+#ifdef YYERRORSYMBOL
+  int yyerrorhit = 0;   /* True if yymajor has invoked an error */
+#endif
+  yyParser *yypParser;  /* The parser */
+
+  yypParser = (yyParser*)yyp;
+  assert( yypParser->yytos!=0 );
+#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY)
+  yyendofinput = (yymajor==0);
+#endif
+  ParseARG_STORE;
+
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    int stateno = yypParser->yytos->stateno;
+    if( stateno < YY_MIN_REDUCE ){
+      fprintf(yyTraceFILE,"%sInput '%s' in state %d\n",
+              yyTracePrompt,yyTokenName[yymajor],stateno);
+    }else{
+      fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n",
+              yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE);
+    }
+  }
+#endif
+
+  do{
+    yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor);
+    if( yyact >= YY_MIN_REDUCE ){
+      yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor);
+    }else if( yyact <= YY_MAX_SHIFTREDUCE ){
+      yy_shift(yypParser,yyact,yymajor,yyminor);
+#ifndef YYNOERRORRECOVERY
+      yypParser->yyerrcnt--;
+#endif
+      yymajor = YYNOCODE;
+    }else if( yyact==YY_ACCEPT_ACTION ){
+      yypParser->yytos--;
+      yy_accept(yypParser);
+      return;
+    }else{
+      assert( yyact == YY_ERROR_ACTION );
+      yyminorunion.yy0 = yyminor;
+#ifdef YYERRORSYMBOL
+      int yymx;
+#endif
+#ifndef NDEBUG
+      if( yyTraceFILE ){
+        fprintf(yyTraceFILE,"%sSyntax Error!\n",yyTracePrompt);
+      }
+#endif
+#ifdef YYERRORSYMBOL
+      /* A syntax error has occurred.
+      ** The response to an error depends upon whether or not the
+      ** grammar defines an error token "ERROR".  
+      **
+      ** This is what we do if the grammar does define ERROR:
+      **
+      **  * Call the %syntax_error function.
+      **
+      **  * Begin popping the stack until we enter a state where
+      **    it is legal to shift the error symbol, then shift
+      **    the error symbol.
+      **
+      **  * Set the error count to three.
+      **
+      **  * Begin accepting and shifting new tokens.  No new error
+      **    processing will occur until three tokens have been
+      **    shifted successfully.
+      **
+      */
+      if( yypParser->yyerrcnt<0 ){
+        yy_syntax_error(yypParser,yymajor,yyminor);
+      }
+      yymx = yypParser->yytos->major;
+      if( yymx==YYERRORSYMBOL || yyerrorhit ){
+#ifndef NDEBUG
+        if( yyTraceFILE ){
+          fprintf(yyTraceFILE,"%sDiscard input token %s\n",
+             yyTracePrompt,yyTokenName[yymajor]);
+        }
+#endif
+        yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion);
+        yymajor = YYNOCODE;
+      }else{
+        while( yypParser->yytos >= yypParser->yystack
+            && yymx != YYERRORSYMBOL
+            && (yyact = yy_find_reduce_action(
+                        yypParser->yytos->stateno,
+                        YYERRORSYMBOL)) >= YY_MIN_REDUCE
+        ){
+          yy_pop_parser_stack(yypParser);
+        }
+        if( yypParser->yytos < yypParser->yystack || yymajor==0 ){
+          yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
+          yy_parse_failed(yypParser);
+#ifndef YYNOERRORRECOVERY
+          yypParser->yyerrcnt = -1;
+#endif
+          yymajor = YYNOCODE;
+        }else if( yymx!=YYERRORSYMBOL ){
+          yy_shift(yypParser,yyact,YYERRORSYMBOL,yyminor);
+        }
+      }
+      yypParser->yyerrcnt = 3;
+      yyerrorhit = 1;
+#elif defined(YYNOERRORRECOVERY)
+      /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to
+      ** do any kind of error recovery.  Instead, simply invoke the syntax
+      ** error routine and continue going as if nothing had happened.
+      **
+      ** Applications can set this macro (for example inside %include) if
+      ** they intend to abandon the parse upon the first syntax error seen.
+      */
+      yy_syntax_error(yypParser,yymajor, yyminor);
+      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
+      yymajor = YYNOCODE;
+      
+#else  /* YYERRORSYMBOL is not defined */
+      /* This is what we do if the grammar does not define ERROR:
+      **
+      **  * Report an error message, and throw away the input token.
+      **
+      **  * If the input token is $, then fail the parse.
+      **
+      ** As before, subsequent error messages are suppressed until
+      ** three input tokens have been successfully shifted.
+      */
+      if( yypParser->yyerrcnt<=0 ){
+        yy_syntax_error(yypParser,yymajor, yyminor);
+      }
+      yypParser->yyerrcnt = 3;
+      yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion);
+      if( yyendofinput ){
+        yy_parse_failed(yypParser);
+#ifndef YYNOERRORRECOVERY
+        yypParser->yyerrcnt = -1;
+#endif
+      }
+      yymajor = YYNOCODE;
+#endif
+    }
+  }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack );
+#ifndef NDEBUG
+  if( yyTraceFILE ){
+    yyStackEntry *i;
+    char cDiv = '[';
+    fprintf(yyTraceFILE,"%sReturn. Stack=",yyTracePrompt);
+    for(i=&yypParser->yystack[1]; i<=yypParser->yytos; i++){
+      fprintf(yyTraceFILE,"%c%s", cDiv, yyTokenName[i->major]);
+      cDiv = ' ';
+    }
+    fprintf(yyTraceFILE,"]\n");
+  }
+#endif
+  return;
+}
diff --git a/src/query/tests/CMakeLists.txt b/src/query/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1856223391ae719ef98492160da9810826b983a9
--- /dev/null
+++ b/src/query/tests/CMakeLists.txt
@@ -0,0 +1,15 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)
+FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib)
+
+IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
+    MESSAGE(STATUS "gTest library found, build unit test")
+
+    INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
+    AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+
+    ADD_EXECUTABLE(queryTest ${SOURCE_LIST})
+    TARGET_LINK_LIBRARIES(queryTest taos query gtest pthread gcov)
+ENDIF()
diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..99f03a7ff8185f8537ebb243e00bce77992db344
--- /dev/null
+++ b/src/query/tests/astTest.cpp
@@ -0,0 +1,634 @@
+#include <gtest/gtest.h>
+#include <sys/time.h>
+#include <cassert>
+#include <iostream>
+
+#include "qAst.h"
+#include "taosmsg.h"
+#include "tsdb.h"
+#include "tskiplist.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+
+typedef struct ResultObj {
+  int32_t numOfResult;
+  char *  resultName[64];
+} ResultObj;
+
+static void initSchema(SSchema *pSchema, int32_t numOfCols);
+
+static void initSchema_binary(SSchema *schema, int32_t numOfCols);
+
+static SSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags);
+static SSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags);
+
+static void dropMeter(SSkipList *pSkipList);
+
+static void Right2LeftTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
+
+static void Left2RightTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
+
+static void IllegalExprTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
+
+static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
+static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
+
+void setValue(ResultObj *pResult, int32_t num, char **val) {
+  pResult->numOfResult = num;
+  for (int32_t i = 0; i < num; ++i) {
+    pResult->resultName[i] = val[i];
+  }
+}
+
+static void initSchema_binary(SSchema *schema, int32_t numOfCols) {
+  schema[0].type = TSDB_DATA_TYPE_BINARY;
+  schema[0].bytes = 8;
+  strcpy(schema[0].name, "a");
+
+  schema[1].type = TSDB_DATA_TYPE_DOUBLE;
+  schema[1].bytes = 8;
+  strcpy(schema[1].name, "b");
+
+  schema[2].type = TSDB_DATA_TYPE_INT;
+  schema[2].bytes = 20;
+  strcpy(schema[2].name, "c");
+
+  schema[3].type = TSDB_DATA_TYPE_BIGINT;
+  schema[3].bytes = 8;
+  strcpy(schema[3].name, "d");
+
+  schema[4].type = TSDB_DATA_TYPE_SMALLINT;
+  schema[4].bytes = 2;
+  strcpy(schema[4].name, "e");
+
+  schema[5].type = TSDB_DATA_TYPE_TINYINT;
+  schema[5].bytes = 1;
+  strcpy(schema[5].name, "f");
+
+  schema[6].type = TSDB_DATA_TYPE_FLOAT;
+  schema[6].bytes = 4;
+  strcpy(schema[6].name, "g");
+
+  schema[7].type = TSDB_DATA_TYPE_BOOL;
+  schema[7].bytes = 1;
+  strcpy(schema[7].name, "h");
+}
+
+static void initSchema(SSchema *schema, int32_t numOfCols) {
+  schema[0].type = TSDB_DATA_TYPE_INT;
+  schema[0].bytes = 8;
+  strcpy(schema[0].name, "a");
+
+  schema[1].type = TSDB_DATA_TYPE_DOUBLE;
+  schema[1].bytes = 8;
+  strcpy(schema[1].name, "b");
+
+  schema[2].type = TSDB_DATA_TYPE_BINARY;
+  schema[2].bytes = 20;
+  strcpy(schema[2].name, "c");
+
+  schema[3].type = TSDB_DATA_TYPE_BIGINT;
+  schema[3].bytes = 8;
+  strcpy(schema[3].name, "d");
+
+  schema[4].type = TSDB_DATA_TYPE_SMALLINT;
+  schema[4].bytes = 2;
+  strcpy(schema[4].name, "e");
+
+  schema[5].type = TSDB_DATA_TYPE_TINYINT;
+  schema[5].bytes = 1;
+  strcpy(schema[5].name, "f");
+
+  schema[6].type = TSDB_DATA_TYPE_FLOAT;
+  schema[6].bytes = 4;
+  strcpy(schema[6].name, "g");
+
+  schema[7].type = TSDB_DATA_TYPE_BOOL;
+  schema[7].bytes = 1;
+  strcpy(schema[7].name, "h");
+}
+
+// static void addOneNode(SSchema *pSchema, int32_t tagsLen, SSkipList *pSkipList,
+//                       char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g,
+//                       bool h, int32_t numOfTags) {
+//  STabObj *pMeter = calloc(1, sizeof(STabObj));
+//  pMeter->numOfTags = numOfTags;
+//  pMeter->pTagData = calloc(1, tagsLen + TSDB_METER_ID_LEN);
+//  strcpy(pMeter->meterId, meterId);
+//
+//  char *tags = pMeter->pTagData + TSDB_METER_ID_LEN;
+//  int32_t offset = 0;
+//
+//  *(int32_t *) tags = a;
+//
+//  offset += pSchema[0].bytes;
+//  *(double *) (tags + offset) = b;
+//
+//  offset += pSchema[1].bytes;
+//  memcpy(tags + offset, c, 3);
+//
+//  offset += pSchema[2].bytes;
+//  *(int64_t *) (tags + offset) = d;
+//
+//  offset += pSchema[3].bytes;
+//  *(int16_t *) (tags + offset) = e;
+//
+//  offset += pSchema[4].bytes;
+//  *(int8_t *) (tags + offset) = f;
+//
+//  offset += pSchema[5].bytes;
+//  *(float *) (tags + offset) = g;
+//
+//  offset += pSchema[6].bytes;
+//  *(int8_t *) (tags + offset) = h ? 1 : 0;
+//
+//  SSkipListKey pKey = SSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes);
+//  SSkipListPut(pSkipList, pMeter, &pKey, 1);
+//}
+//
+// static void addOneNode_binary(SSchema *pSchema, int32_t tagsLen, SSkipList *pSkipList,
+//                              char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g,
+//                              bool h, int32_t numOfTags) {
+//  STabObj *pMeter = calloc(1, sizeof(STabObj));
+//  pMeter->numOfTags = numOfTags;
+//  pMeter->pTagData = calloc(1, tagsLen + TSDB_METER_ID_LEN);
+//  strcpy(pMeter->meterId, meterId);
+//
+//  char *tags = pMeter->pTagData + TSDB_METER_ID_LEN;
+//  int32_t offset = 0;
+//  memcpy(tags, c, pSchema[0].bytes);
+//
+//  offset += pSchema[0].bytes;
+//  *(double *) (tags + offset) = b;
+//
+//  offset += pSchema[1].bytes;
+//  *(int32_t *) (tags + offset) = a;
+//
+//  offset += pSchema[2].bytes;
+//  *(int64_t *) (tags + offset) = d;
+//
+//  offset += pSchema[3].bytes;
+//  *(int16_t *) (tags + offset) = e;
+//
+//  offset += pSchema[4].bytes;
+//  *(int8_t *) (tags + offset) = f;
+//
+//  offset += pSchema[5].bytes;
+//  *(float *) (tags + offset) = g;
+//
+//  offset += pSchema[6].bytes;
+//  *(int8_t *) (tags + offset) = h ? 1 : 0;
+//
+//  SSkipListKey pKey = SSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes);
+//  SSkipListPut(pSkipList, pMeter, &pKey, 1);
+//  SSkipListDestroyKey(&pKey);
+//}
+
+// static void dropMeter(SSkipList *pSkipList) {
+//  SSkipListNode **pRes = NULL;
+//  int32_t num = SSkipListIterateList(pSkipList, &pRes, NULL, NULL);
+//  for (int32_t i = 0; i < num; ++i) {
+//    SSkipListNode *pNode = pRes[i];
+//    STabObj *pMeter = (STabObj *) pNode->pData;
+//    free(pMeter->pTagData);
+//    free(pMeter);
+//    pNode->pData = NULL;
+//  }
+//  free(pRes);
+//}
+
+// static SSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags) {
+//  int32_t tagsLen = 0;
+//  for (int32_t i = 0; i < numOfTags; ++i) {
+//    tagsLen += pSchema[i].bytes;
+//  }
+//
+//  SSkipList *pSkipList = SSkipListCreate(10, pSchema[0].type, 4);
+//
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm2\0", 2, 30.5, "ghi", 1200, -11000, -40, 3.0, true, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm3\0", 3, 40.5, "jkl", 1300, -11500, -50, 4.0, false, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm4\0", 4, 50.5, "mno", 1400, -12000, -60, 5.0, true, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm5\0", 5, 60.5, "pqr", 1500, -12500, -70, 6.0, false, 8);
+//  addOneNode(pSchema, tagsLen, pSkipList, "tm6\0", 6, 70.5, "stu", 1600, -13000, -80, 7.0, true, 8);
+//
+//  return pSkipList;
+//}
+//
+// static SSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags) {
+//  int32_t tagsLen = 0;
+//  for (int32_t i = 0; i < numOfTags; ++i) {
+//    tagsLen += pSchema[i].bytes;
+//  }
+//
+//  SSkipList *pSkipList = SSkipListCreate(10, pSchema[0].type, 4);
+//
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm2\0", 2, 30.5, "ghi", 1200, -11000, -40, 3.0, true, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm3\0", 3, 40.5, "jkl", 1300, -11500, -50, 4.0, false, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm4\0", 4, 50.5, "mno", 1400, -12000, -60, 5.0, true, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm5\0", 5, 60.5, "pqr", 1500, -12500, -70, 6.0, false, 8);
+//  addOneNode_binary(pSchema, tagsLen, pSkipList, "tm6\0", 6, 70.5, "stu", 1600, -13000, -80, 7.0, true, 8);
+//
+//  return pSkipList;
+//}
+
+//static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, SSkipList *pSkipList, ResultObj *pResult) {
+//  tExprNode *pExpr = NULL;
+//  tSQLBinaryExprFromString(&pExpr, schema, numOfCols, sql, strlen(sql));
+//
+//  char    str[512] = {0};
+//  int32_t len = 0;
+//  if (pExpr == NULL) {
+//    printf("-----error in parse syntax:%s\n\n", sql);
+//    assert(pResult == NULL);
+//    return;
+//  }
+//
+//  tSQLBinaryExprToString(pExpr, str, &len);
+//  printf("expr is: %s\n", str);
+//
+//  SArray *result = NULL;
+//  //  tExprTreeTraverse(pExpr, pSkipList, result, SSkipListNodeFilterCallback, &result);
+//  //  printf("the result is:%lld\n", result.num);
+//  //
+//  //  bool findResult = false;
+//  //  for (int32_t i = 0; i < result.num; ++i) {
+//  //    STabObj *pm = (STabObj *)result.pRes[i];
+//  //    printf("meterid:%s,\t", pm->meterId);
+//  //
+//  //    for (int32_t j = 0; j < pResult->numOfResult; ++j) {
+//  //      if (strcmp(pm->meterId, pResult->resultName[j]) == 0) {
+//  //        findResult = true;
+//  //        break;
+//  //      }
+//  //    }
+//  //    assert(findResult == true);
+//  //    findResult = false;
+//  //  }
+//
+//  printf("\n\n");
+//  tExprTreeDestroy(&pExpr, NULL);
+//}
+
+#if 0
+static void Left2RightTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
+  char str[256] = {0};
+
+  char *t0[1] = {"tm0"};
+  char *t1[1] = {"tm1"};
+  char *sql = NULL;
+
+  ResultObj res = {1, {"tm1"}};
+  testQueryStr(schema, numOfCols, "a=1", pSkipList, &res);
+
+  char *tt[1] = {"tm6"};
+  setValue(&res, 1, tt);
+  testQueryStr(schema, numOfCols, "a>=6", pSkipList, &res);
+
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, "b<=10.6", pSkipList, &res);
+
+  strcpy(str, "c<>'pqr'");
+  char *t2[6] = {"tm0", "tm1", "tm2", "tm3", "tm4", "tm6"};
+  setValue(&res, 6, t2);
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  strcpy(str, "c='abc'");
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  char *t3[6] = {"tm1", "tm2", "tm3", "tm4", "tm5", "tm6"};
+  setValue(&res, 6, t3);
+  testQueryStr(schema, numOfCols, "d>1050", pSkipList, &res);
+
+  char *t4[3] = {"tm4", "tm5", "tm6"};
+  setValue(&res, 3, t4);
+  testQueryStr(schema, numOfCols, "g>4.5980765", pSkipList, &res);
+
+  char *t5[4] = {"tm0", "tm2", "tm4", "tm6"};
+  setValue(&res, 4, t5);
+  testQueryStr(schema, numOfCols, "h=true", pSkipList, &res);
+
+  char *t6[3] = {"tm1", "tm3", "tm5"};
+  setValue(&res, 3, t6);
+  testQueryStr(schema, numOfCols, "h=0", pSkipList, &res);
+
+  sql = "(((b<40)))\0";
+  char *t7[3] = {"tm0", "tm1", "tm2"};
+  setValue(&res, 3, t7);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+
+  sql = "((a=1) or (a=10)) or ((b=12))";
+  setValue(&res, 1, t1);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+
+  sql = "((((((a>0 and a<2))) or a=6) or a=3) or (b=50.5)) and h=0";
+  char *t8[2] = {"tm1", "tm3"};
+  setValue(&res, 2, t8);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+
+  char *tf[1] = {"tm6"};
+  setValue(&res, 1, tf);
+  testQueryStr(schema, numOfCols, "e = -13000", pSkipList, &res);
+
+  char *ft[5] = {"tm0", "tm1", "tm2", "tm3", "tm4"};
+  setValue(&res, 5, ft);
+  testQueryStr(schema, numOfCols, "f > -65", pSkipList, &res);
+}
+
+void Right2LeftTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
+  ResultObj res = {1, {"tm1"}};
+  testQueryStr(schema, numOfCols, "((1=a))", pSkipList, &res);
+
+  char *t9[2] = {"tm0", "tm1"};
+  setValue(&res, 2, t9);
+  testQueryStr(schema, numOfCols, "1>=a", pSkipList, &res);
+
+  char *t0[1] = {"tm0"};
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, "10.6>=b", pSkipList, &res);
+
+  char *t10[3] = {"tm1", "tm3", "tm5"};
+  setValue(&res, 3, t10);
+  testQueryStr(schema, numOfCols, "0=h", pSkipList, &res);
+}
+
+static void IllegalExprTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
+  testQueryStr(schema, numOfCols, "h=", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "h<", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "and or", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "and a = 1 or", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "(())", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "(", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "(a", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "(a)", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "())", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "a===1", pSkipList, NULL);
+  testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL);
+}
+
+static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
+  char  str[256] = {0};
+  char *sql = NULL;
+
+  char *t0[1] = {"tm0"};
+  char *t1[1] = {"tm1"};
+
+  ResultObj res = {1, {"tm0"}};
+  strcpy(str, "a='abc'");
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  char *tt[1] = {"tm6"};
+  setValue(&res, 1, tt);
+  testQueryStr(schema, numOfCols, "c>=6", pSkipList, &res);
+
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, "b<=10.6", pSkipList, &res);
+
+  strcpy(str, "a<>'pqr'");
+  char *t2[6] = {"tm0", "tm1", "tm2", "tm3", "tm4", "tm6"};
+  setValue(&res, 6, t2);
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  strcpy(str, "a='abc'");
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  char *t3[6] = {"tm1", "tm2", "tm3", "tm4", "tm5", "tm6"};
+  setValue(&res, 6, t3);
+  testQueryStr(schema, numOfCols, "d>1050", pSkipList, &res);
+
+  char *t4[3] = {"tm4", "tm5", "tm6"};
+  setValue(&res, 3, t4);
+  testQueryStr(schema, numOfCols, "g>4.5980765", pSkipList, &res);
+
+  char *t5[4] = {"tm0", "tm2", "tm4", "tm6"};
+  setValue(&res, 4, t5);
+  testQueryStr(schema, numOfCols, "h=true", pSkipList, &res);
+
+  char *t6[3] = {"tm1", "tm3", "tm5"};
+  setValue(&res, 3, t6);
+  testQueryStr(schema, numOfCols, "h=0", pSkipList, &res);
+
+  sql = "(((b<40)))\0";
+  char *t7[3] = {"tm0", "tm1", "tm2"};
+  setValue(&res, 3, t7);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+
+  sql = "((c=1) or (c=10)) or ((b=12))\0";
+  setValue(&res, 1, t1);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+
+  sql = "((((((c>0 and c<2))) or c=6) or c=3) or (b=50.5)) and h=false\0";
+  char *t8[2] = {"tm1", "tm3"};
+  setValue(&res, 2, t8);
+  testQueryStr(schema, numOfCols, sql, pSkipList, &res);
+}
+
+static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
+  char  str[256] = {0};
+  char *sql = NULL;
+
+  char *t0[1] = {"tm0"};
+  char *t1[1] = {"tm1"};
+
+  ResultObj res = {1, {"tm0"}};
+  strcpy(str, "'abc'=a");
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+
+  char *tt[1] = {"tm6"};
+  setValue(&res, 1, tt);
+  testQueryStr(schema, numOfCols, "6<=c", pSkipList, &res);
+
+  setValue(&res, 1, t0);
+  testQueryStr(schema, numOfCols, "10.6>=b", pSkipList, &res);
+
+  strcpy(str, "'pqr'<>a");
+  char *t2[6] = {"tm0", "tm1", "tm2", "tm3", "tm4", "tm6"};
+  setValue(&res, 6, t2);
+  testQueryStr(schema, numOfCols, str, pSkipList, &res);
+}
+
+namespace {
+// two level expression tree
+tExprNode *createExpr1() {
+  auto *pLeft = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pLeft->nodeType = TSQL_NODE_COL;
+  pLeft->pSchema = (SSchema*) calloc(1, sizeof(SSchema));
+  
+  strcpy(pLeft->pSchema->name, "col_a");
+  pLeft->pSchema->type = TSDB_DATA_TYPE_INT;
+  pLeft->pSchema->bytes = sizeof(int32_t);
+  pLeft->pSchema->colId = 1;
+  
+  auto *pRight = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pRight->nodeType = TSQL_NODE_VALUE;
+  pRight->pVal = (tVariant*) calloc(1, sizeof(tVariant));
+  
+  pRight->pVal->nType = TSDB_DATA_TYPE_INT;
+  pRight->pVal->i64Key = 12;
+  
+  auto *pRoot = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pRoot->nodeType = TSQL_NODE_EXPR;
+  
+  pRoot->_node.optr = TSDB_RELATION_EQUAL;
+  pRoot->_node.pLeft = pLeft;
+  pRoot->_node.pRight = pRight;
+  pRoot->_node.hasPK = true;
+  
+  return pRoot;
+}
+
+// thress level expression tree
+tExprNode* createExpr2() {
+  auto *pLeft2 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pLeft2->nodeType = TSQL_NODE_COL;
+  pLeft2->pSchema = (SSchema*) calloc(1, sizeof(SSchema));
+  
+  strcpy(pLeft2->pSchema->name, "col_a");
+  pLeft2->pSchema->type = TSDB_DATA_TYPE_BINARY;
+  pLeft2->pSchema->bytes = 20;
+  pLeft2->pSchema->colId = 1;
+  
+  auto *pRight2 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pRight2->nodeType = TSQL_NODE_VALUE;
+  pRight2->pVal = (tVariant*) calloc(1, sizeof(tVariant));
+  
+  pRight2->pVal->nType = TSDB_DATA_TYPE_BINARY;
+  const char* v = "hello world!";
+  pRight2->pVal->pz = strdup(v);
+  pRight2->pVal->nLen = strlen(v);
+  
+  auto *p1 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  p1->nodeType = TSQL_NODE_EXPR;
+  
+  p1->_node.optr = TSDB_RELATION_LIKE;
+  p1->_node.pLeft = pLeft2;
+  p1->_node.pRight = pRight2;
+  p1->_node.hasPK = false;
+  
+  auto *pLeft1 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pLeft1->nodeType = TSQL_NODE_COL;
+  pLeft1->pSchema = (SSchema*) calloc(1, sizeof(SSchema));
+  
+  strcpy(pLeft1->pSchema->name, "col_b");
+  pLeft1->pSchema->type = TSDB_DATA_TYPE_DOUBLE;
+  pLeft1->pSchema->bytes = 8;
+  pLeft1->pSchema->colId = 99;
+  
+  auto *pRight1 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pRight1->nodeType = TSQL_NODE_VALUE;
+  pRight1->pVal = (tVariant*) calloc(1, sizeof(tVariant));
+  
+  pRight1->pVal->nType = TSDB_DATA_TYPE_DOUBLE;
+  pRight1->pVal->dKey = 91.99;
+  
+  auto *p2 = (tExprNode*) calloc(1, sizeof(tExprNode));
+  p2->nodeType = TSQL_NODE_EXPR;
+  
+  p2->_node.optr = TSDB_RELATION_GREATER_EQUAL;
+  p2->_node.pLeft = pLeft1;
+  p2->_node.pRight = pRight1;
+  p2->_node.hasPK = false;
+  
+  auto *pRoot = (tExprNode*) calloc(1, sizeof(tExprNode));
+  pRoot->nodeType = TSQL_NODE_EXPR;
+  
+  pRoot->_node.optr = TSDB_RELATION_OR;
+  pRoot->_node.pLeft = p1;
+  pRoot->_node.pRight = p2;
+  pRoot->_node.hasPK = true;
+  return pRoot;
+}
+
+void exprSerializeTest1() {
+  tExprNode* p1 = createExpr1();
+  SBufferWriter bw = tbufInitWriter(NULL, false);
+  exprTreeToBinary(&bw, p1);
+  
+  size_t size = tbufTell(&bw);
+  ASSERT_TRUE(size > 0);
+  char* b = tbufGetData(&bw, false);
+  
+  tExprNode* p2 = exprTreeFromBinary(b, size);
+  ASSERT_EQ(p1->nodeType, p2->nodeType);
+  
+  ASSERT_EQ(p2->_node.optr, p1->_node.optr);
+  ASSERT_EQ(p2->_node.pLeft->nodeType, p1->_node.pLeft->nodeType);
+  ASSERT_EQ(p2->_node.pRight->nodeType, p1->_node.pRight->nodeType);
+  
+  SSchema* s1 = p1->_node.pLeft->pSchema;
+  SSchema* s2 = p2->_node.pLeft->pSchema;
+  
+  ASSERT_EQ(s2->colId, s1->colId);
+  ASSERT_EQ(s2->type, s1->type);
+  ASSERT_EQ(s2->bytes, s1->bytes);
+  ASSERT_STRCASEEQ(s2->name, s1->name);
+  
+  tVariant* v1 = p1->_node.pRight->pVal;
+  tVariant* v2 = p2->_node.pRight->pVal;
+  
+  ASSERT_EQ(v1->nType, v2->nType);
+  ASSERT_EQ(v1->i64Key, v2->i64Key);
+  ASSERT_EQ(p1->_node.hasPK, p2->_node.hasPK);
+  
+  tExprTreeDestroy(&p1, nullptr);
+  tExprTreeDestroy(&p2, nullptr);
+  
+  // tbufClose(&bw);
+}
+
+void exprSerializeTest2() {
+  tExprNode* p1 = createExpr2();
+  SBufferWriter bw = tbufInitWriter(NULL, false);
+  exprTreeToBinary(&bw, p1);
+  
+  size_t size = tbufTell(&bw);
+  ASSERT_TRUE(size > 0);
+  char* b = tbufGetData(&bw, false);
+  
+  tExprNode* p2 = exprTreeFromBinary(b, size);
+  ASSERT_EQ(p1->nodeType, p2->nodeType);
+  
+  ASSERT_EQ(p2->_node.optr, p1->_node.optr);
+  ASSERT_EQ(p2->_node.pLeft->nodeType, p1->_node.pLeft->nodeType);
+  ASSERT_EQ(p2->_node.pRight->nodeType, p1->_node.pRight->nodeType);
+  
+  tExprNode* c1Left = p1->_node.pLeft;
+  tExprNode* c2Left = p2->_node.pLeft;
+  
+  ASSERT_EQ(c1Left->nodeType, c2Left->nodeType);
+  
+  ASSERT_EQ(c2Left->nodeType, TSQL_NODE_EXPR);
+  ASSERT_EQ(c2Left->_node.optr, TSDB_RELATION_LIKE);
+  
+  ASSERT_STRCASEEQ(c2Left->_node.pLeft->pSchema->name, "col_a");
+  ASSERT_EQ(c2Left->_node.pRight->nodeType, TSQL_NODE_VALUE);
+  
+  ASSERT_STRCASEEQ(c2Left->_node.pRight->pVal->pz, "hello world!");
+  
+  tExprNode* c1Right = p1->_node.pRight;
+  tExprNode* c2Right = p2->_node.pRight;
+  
+  ASSERT_EQ(c1Right->nodeType, c2Right->nodeType);
+  ASSERT_EQ(c2Right->nodeType, TSQL_NODE_EXPR);
+  ASSERT_EQ(c2Right->_node.optr, TSDB_RELATION_GREATER_EQUAL);
+  ASSERT_EQ(c2Right->_node.pRight->pVal->dKey, 91.99);
+  
+  ASSERT_EQ(p2->_node.hasPK, true);
+  
+  tExprTreeDestroy(&p1, nullptr);
+  tExprTreeDestroy(&p2, nullptr);
+
+  // tbufClose(&bw);
+}
+}  // namespace
+TEST(testCase, astTest) {
+//  exprSerializeTest2();
+}
+#endif
\ No newline at end of file
diff --git a/src/query/tests/histogramTest.cpp b/src/query/tests/histogramTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4a5f7fbbbed18b0a2c2cd7fff7ad3101cfa11c41
--- /dev/null
+++ b/src/query/tests/histogramTest.cpp
@@ -0,0 +1,121 @@
+#include <gtest/gtest.h>
+#include <sys/time.h>
+#include <cassert>
+#include <iostream>
+
+#include "taos.h"
+#include "tsdb.h"
+
+#include "tstoken.h"
+#include "tutil.h"
+
+#include "qHistogram.h"
+
+/* test validate the names for table/database */
+TEST(testCase, histogram_binary_search) {
+  SHistogramInfo* pHisto = tHistogramCreate(MAX_HISTOGRAM_BIN);
+
+  pHisto->numOfEntries = 10;
+  for (int32_t i = 0; i < 10; ++i) {
+    pHisto->elems[i].num = 1;
+    pHisto->elems[i].val = i;
+  }
+
+  int32_t idx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, 1);
+  assert(idx == 1);
+
+  idx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, 9);
+  assert(idx == 9);
+
+  idx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, 20);
+  assert(idx == 10);
+
+  idx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, -1);
+  assert(idx == 0);
+
+  idx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, 3.9);
+  assert(idx == 4);
+
+  free(pHisto);
+}
+
+TEST(testCase, histogram_add) {
+  SHistogramInfo* pHisto = NULL;
+
+  /**
+   * use arrayList, elapsed time is:
+   * before:
+   * 10,000,000  45sec, bin:1000 (-O0) / 17sec. bin:1000, (-O3)
+   *
+   * after:
+   *
+   */
+  struct timeval systemTime;
+  gettimeofday(&systemTime, NULL);
+  int64_t st =
+      (int64_t)systemTime.tv_sec * 1000L + (uint64_t)systemTime.tv_usec / 1000;
+  for (int32_t i = 0; i < 10000; ++i) {
+    tHistogramAdd(&pHisto, i);
+    //        tHistogramPrint(pHisto);
+  }
+  //
+  gettimeofday(&systemTime, NULL);
+  int64_t et =
+      (int64_t)systemTime.tv_sec * 1000L + (uint64_t)systemTime.tv_usec / 1000;
+  printf("total elapsed time: %ld\n", et - st);
+
+  printf("elements: %d, slot:%d \n", pHisto->numOfElems, pHisto->numOfEntries);
+  tHistogramPrint(pHisto);
+
+  printf("%ld\n", tHistogramSum(pHisto, 1.5));
+  printf("%ld\n", tHistogramSum(pHisto, 2));
+  printf("%ld\n", tHistogramSum(pHisto, 3));
+  printf("%ld\n", tHistogramSum(pHisto, 4));
+  printf("%ld\n", tHistogramSum(pHisto, 5));
+  printf("%ld\n", tHistogramSum(pHisto, 6));
+
+  for (int32_t i = 399; i < 400; ++i) {
+    printf("val:%d, %ld\n", i, tHistogramSum(pHisto, i));
+  }
+
+  double ratio[] = {0 / 100, 20.0 / 100, 88.0 / 100, 100 / 100};
+  double* res = tHistogramUniform(pHisto, ratio, 4);
+  for (int32_t i = 0; i < 4; ++i) {
+    printf("%f\n", res[i]);
+  }
+
+  SHistogramInfo* pHisto1 = NULL;
+  for (int32_t i = (90000 - 1); i >= 80000; --i) {
+    tHistogramAdd(&pHisto1, i);
+  }
+  tHistogramPrint(pHisto1);
+
+  SHistogramInfo* pRes = tHistogramMerge(pHisto1, pHisto, MAX_HISTOGRAM_BIN);
+  assert(pRes->numOfElems == pHisto->numOfElems + pHisto1->numOfElems);
+  tHistogramPrint(pRes);
+
+  tHistogramDestroy(&pHisto);
+  tHistogramDestroy(&pHisto1);
+  tHistogramDestroy(&pRes);
+  free(res);
+}
+
+TEST(testCase, heapsort) {
+  //    int32_t num = 20;
+  //
+  //    SHeapEntry* pEntry = tHeapCreate(num);
+  //
+  //    for(int32_t i=0; i<num; ++i) {
+  //        pEntry[i].val = num - 1 - i;
+  //    }
+  //
+  //    tHeapSort(pEntry, num);
+  //
+  //    for(int32_t i=0; i<num; ++i) {
+  //        printf("%lf, ", pEntry[i].val);
+  //    }
+  //
+  //    printf("\n");
+  //
+  //    free(pEntry);
+}
diff --git a/src/query/tests/patternMatchTest.cpp b/src/query/tests/patternMatchTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fa2b58a10bd044491a2fabbaee6180c37320ae35
--- /dev/null
+++ b/src/query/tests/patternMatchTest.cpp
@@ -0,0 +1,83 @@
+#include <gtest/gtest.h>
+#include <sys/time.h>
+#include <cassert>
+#include <iostream>
+
+#include "tsqlfunction.h"
+#include "tcompare.h"
+
+TEST(testCase, patternMatchTest) {
+  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
+
+  const char* str = "abcdef";
+  int32_t ret = patternMatch("a%b%", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "tm01";
+  ret = patternMatch("tm__", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "tkm1";
+  ret = patternMatch("t%m1", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "tkm1";
+  ret = patternMatch("%m1", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "";
+  ret = patternMatch("%_", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH);
+
+  str = "1";
+  ret = patternMatch("%__", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH);
+
+  str = "";
+  ret = patternMatch("%", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = " ";
+  ret = patternMatch("_", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "!";
+  ret = patternMatch("%_", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "abcdefg";
+  ret = patternMatch("abc%fg", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("abc%fg", str, 7, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("abc%f_", str, 6, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("abc%f_", str, 1, &info);  // pattern string is longe than the size
+  EXPECT_EQ(ret, TSDB_PATTERN_NOMATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("ab", str, 2, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("a%", str, 2, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+
+  str = "abcdefgabcdeju";
+  ret = patternMatch("a__", str, 2, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_NOMATCH);
+  
+  str = "carzero";
+  ret = patternMatch("%o", str, strlen(str), &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+  
+  str = "19";
+  ret = patternMatch("%9", str, 2, &info);
+  EXPECT_EQ(ret, TSDB_PATTERN_MATCH);
+}
diff --git a/src/query/tests/resultBufferTest.cpp b/src/query/tests/resultBufferTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7b946d858913b14dfdbb71eb1b8a8c469e6d930c
--- /dev/null
+++ b/src/query/tests/resultBufferTest.cpp
@@ -0,0 +1,160 @@
+#include <gtest/gtest.h>
+#include <cassert>
+#include <iostream>
+
+#include "qResultbuf.h"
+#include "taos.h"
+#include "tsdb.h"
+
+namespace {
+// simple test
+void simpleTest() {
+  SDiskbasedResultBuf* pResultBuf = NULL;
+  int32_t ret = createDiskbasedResultBuffer(&pResultBuf, 64, 1024, 4096, NULL);
+  
+  int32_t pageId = 0;
+  int32_t groupId = 0;
+  
+  tFilePage* pBufPage = getNewDataBuf(pResultBuf, groupId, &pageId);
+  ASSERT_TRUE(pBufPage != NULL);
+  
+  ASSERT_EQ(getResBufSize(pResultBuf), 1024);
+  
+  SIDList list = getDataBufPagesIdList(pResultBuf, groupId);
+  ASSERT_EQ(taosArrayGetSize(list), 1);
+  ASSERT_EQ(getNumOfResultBufGroupId(pResultBuf), 1);
+
+  releaseResBufPage(pResultBuf, pBufPage);
+
+  tFilePage* pBufPage1 = getNewDataBuf(pResultBuf, groupId, &pageId);
+
+  tFilePage* t = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t == pBufPage1);
+
+  tFilePage* pBufPage2 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t1 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t1 == pBufPage2);
+
+  tFilePage* pBufPage3 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t2 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t2 == pBufPage3);
+
+  tFilePage* pBufPage4 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t3 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t3 == pBufPage4);
+
+  tFilePage* pBufPage5 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t4 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t4 == pBufPage5);
+
+  destroyResultBuf(pResultBuf);
+}
+
+void writeDownTest() {
+  SDiskbasedResultBuf* pResultBuf = NULL;
+  int32_t ret = createDiskbasedResultBuffer(&pResultBuf, 64, 1024, 4*1024, NULL);
+
+  int32_t pageId = 0;
+  int32_t writePageId = 0;
+  int32_t groupId = 0;
+  int32_t nx = 12345;
+
+  tFilePage* pBufPage = getNewDataBuf(pResultBuf, groupId, &pageId);
+  ASSERT_TRUE(pBufPage != NULL);
+
+  *(int32_t*)(pBufPage->data) = nx;
+  writePageId = pageId;
+  releaseResBufPage(pResultBuf, pBufPage);
+
+  tFilePage* pBufPage1 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t1 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t1 == pBufPage1);
+  ASSERT_TRUE(pageId == 1);
+
+  tFilePage* pBufPage2 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t2 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t2 == pBufPage2);
+  ASSERT_TRUE(pageId == 2);
+
+  tFilePage* pBufPage3 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t3 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t3 == pBufPage3);
+  ASSERT_TRUE(pageId == 3);
+
+  tFilePage* pBufPage4 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t4 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t4 == pBufPage4);
+  ASSERT_TRUE(pageId == 4);
+  releaseResBufPage(pResultBuf, t4);
+
+  // flush the written page to disk, and read it out again
+  tFilePage* pBufPagex = getResBufPage(pResultBuf, writePageId);
+  ASSERT_EQ(*(int32_t*)pBufPagex->data, nx);
+
+  SArray* pa = getDataBufPagesIdList(pResultBuf, groupId);
+  ASSERT_EQ(taosArrayGetSize(pa), 5);
+
+  destroyResultBuf(pResultBuf);
+}
+
+void recyclePageTest() {
+  SDiskbasedResultBuf* pResultBuf = NULL;
+  int32_t ret = createDiskbasedResultBuffer(&pResultBuf, 64, 1024, 4*1024, NULL);
+
+  int32_t pageId = 0;
+  int32_t writePageId = 0;
+  int32_t groupId = 0;
+  int32_t nx = 12345;
+
+  tFilePage* pBufPage = getNewDataBuf(pResultBuf, groupId, &pageId);
+  ASSERT_TRUE(pBufPage != NULL);
+  releaseResBufPage(pResultBuf, pBufPage);
+
+  tFilePage* pBufPage1 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t1 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t1 == pBufPage1);
+  ASSERT_TRUE(pageId == 1);
+
+  tFilePage* pBufPage2 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t2 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t2 == pBufPage2);
+  ASSERT_TRUE(pageId == 2);
+
+  tFilePage* pBufPage3 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t3 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t3 == pBufPage3);
+  ASSERT_TRUE(pageId == 3);
+
+  tFilePage* pBufPage4 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t4 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t4 == pBufPage4);
+  ASSERT_TRUE(pageId == 4);
+  releaseResBufPage(pResultBuf, t4);
+
+  tFilePage* pBufPage5 = getNewDataBuf(pResultBuf, groupId, &pageId);
+  tFilePage* t5 = getResBufPage(pResultBuf, pageId);
+  ASSERT_TRUE(t5 == pBufPage5);
+  ASSERT_TRUE(pageId == 5);
+
+  // flush the written page to disk, and read it out again
+  tFilePage* pBufPagex = getResBufPage(pResultBuf, writePageId);
+  *(int32_t*)(pBufPagex->data) = nx;
+  writePageId = pageId;   // update the data
+  releaseResBufPage(pResultBuf, pBufPagex);
+
+  tFilePage* pBufPagex1 = getResBufPage(pResultBuf, 1);
+
+  SArray* pa = getDataBufPagesIdList(pResultBuf, groupId);
+  ASSERT_EQ(taosArrayGetSize(pa), 6);
+
+  destroyResultBuf(pResultBuf);
+}
+} // namespace
+
+
+TEST(testCase, resultBufferTest) {
+  srand(time(NULL));
+  simpleTest();
+  writeDownTest();
+  recyclePageTest();
+}
diff --git a/src/query/tests/tsBufTest.cpp b/src/query/tests/tsBufTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b78c5314f243874e348748a6434d224592489528
--- /dev/null
+++ b/src/query/tests/tsBufTest.cpp
@@ -0,0 +1,506 @@
+#include "os.h"
+#include <gtest/gtest.h>
+#include <cassert>
+#include <iostream>
+
+#include "taos.h"
+#include "tsdb.h"
+#include "qTsbuf.h"
+#include "tstoken.h"
+#include "tutil.h"
+
+namespace {
+/**
+ *
+ * @param num  total number
+ * @param step gap between two consecutive ts
+ * @return
+ */
+int64_t* createTsList(int32_t num, int64_t start, int32_t step) {
+  int64_t* pList = (int64_t*)malloc(num * sizeof(int64_t));
+
+  for (int64_t i = 0; i < num; ++i) {
+    pList[i] = start + i * step;
+  }
+
+  return pList;
+}
+
+// simple test
+void simpleTest() {
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  // write 10 ts points
+  int32_t num = 10;
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+  t.i64Key = 1;
+
+  int64_t* list = createTsList(10, 10000000, 30);
+  tsBufAppend(pTSBuf, 0, &t, (const char*)list, num * sizeof(int64_t));
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
+
+  EXPECT_EQ(pTSBuf->tsData.len, sizeof(int64_t) * num);
+  EXPECT_EQ(tVariantCompare(&pTSBuf->block.tag, &t), 0);
+  EXPECT_EQ(pTSBuf->numOfVnodes, 1);
+
+  tsBufFlush(pTSBuf);
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(pTSBuf->block.numOfElem, num);
+
+  tsBufDestroy(pTSBuf);
+
+  free(list);
+}
+
+// one large list of ts, the ts list need to be split into several small blocks
+void largeTSTest() {
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  // write 10 ts points
+  int32_t num = 1000000;
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+  t.i64Key = 1;
+
+  int64_t* list = createTsList(num, 10000000, 30);
+  tsBufAppend(pTSBuf, 0, &t, (const char*)list, num * sizeof(int64_t));
+
+  // the data has been flush to disk, no data in cache
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(tVariantCompare(&pTSBuf->block.tag, &t), 0);
+  EXPECT_EQ(pTSBuf->numOfVnodes, 1);
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
+
+  tsBufFlush(pTSBuf);
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(pTSBuf->block.numOfElem, num);
+
+  tsBufDestroy(pTSBuf);
+  free(list);
+}
+
+void multiTagsTest() {
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  int32_t num = 10000;
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+
+  int64_t start = 10000000;
+  int32_t numOfTags = 50;
+  int32_t step = 30;
+
+  for (int32_t i = 0; i < numOfTags; ++i) {
+    int64_t* list = createTsList(num, start, step);
+    t.i64Key = i;
+
+    tsBufAppend(pTSBuf, 0, &t, (const char*)list, num * sizeof(int64_t));
+    free(list);
+
+    start += step * num;
+  }
+
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
+  EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
+
+  EXPECT_EQ(pTSBuf->block.tag.i64Key, numOfTags - 1);
+  EXPECT_EQ(pTSBuf->numOfVnodes, 1);
+
+  tsBufFlush(pTSBuf);
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(pTSBuf->block.numOfElem, num);
+
+  tsBufDestroy(pTSBuf);
+}
+
+void multiVnodeTagsTest() {
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  int32_t num = 10000;
+  int64_t start = 10000000;
+  int32_t numOfTags = 50;
+  int32_t step = 30;
+
+  // 2000 vnodes
+  for (int32_t j = 0; j < 20; ++j) {
+    // vnodeId:0
+    start = 10000000;
+    tVariant t = {0};
+    t.nType = TSDB_DATA_TYPE_BIGINT;
+
+    for (int32_t i = 0; i < numOfTags; ++i) {
+      int64_t* list = createTsList(num, start, step);
+      t.i64Key = i;
+
+      tsBufAppend(pTSBuf, j, &t, (const char*)list, num * sizeof(int64_t));
+      free(list);
+
+      start += step * num;
+    }
+
+    EXPECT_EQ(pTSBuf->numOfVnodes, j + 1);
+  }
+
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
+  EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
+  EXPECT_EQ(pTSBuf->block.tag.i64Key, numOfTags - 1);
+
+  EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
+
+  EXPECT_EQ(pTSBuf->block.tag.i64Key, numOfTags - 1);
+
+  tsBufFlush(pTSBuf);
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(pTSBuf->block.numOfElem, num);
+
+  tsBufDestroy(pTSBuf);
+}
+
+void loadDataTest() {
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  int32_t num = 10000;
+  int64_t oldStart = 10000000;
+  int32_t numOfTags = 50;
+  int32_t step = 30;
+  int32_t numOfVnode = 200;
+
+  // 10000 vnodes
+  for (int32_t j = 0; j < numOfVnode; ++j) {
+    // vnodeId:0
+    int64_t start = 10000000;
+    tVariant t = {0};
+    t.nType = TSDB_DATA_TYPE_BIGINT;
+
+    for (int32_t i = 0; i < numOfTags; ++i) {
+      int64_t* list = createTsList(num, start, step);
+      t.i64Key = i;
+
+      tsBufAppend(pTSBuf, j, &t, (const char*)list, num * sizeof(int64_t));
+      printf("%d - %" PRIu64 "\n", i, list[0]);
+
+      free(list);
+      start += step * num;
+    }
+
+    EXPECT_EQ(pTSBuf->numOfVnodes, j + 1);
+  }
+
+  EXPECT_EQ(pTSBuf->tsOrder, TSDB_ORDER_ASC);
+
+  EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
+  EXPECT_EQ(pTSBuf->block.tag.i64Key, numOfTags - 1);
+
+  EXPECT_EQ(pTSBuf->tsData.len, num * sizeof(int64_t));
+
+  EXPECT_EQ(pTSBuf->block.tag.i64Key, numOfTags - 1);
+
+  tsBufFlush(pTSBuf);
+  EXPECT_EQ(pTSBuf->tsData.len, 0);
+  EXPECT_EQ(pTSBuf->block.numOfElem, num);
+
+  // create from exists file
+  STSBuf* pNewBuf = tsBufCreateFromFile(pTSBuf->path, false);
+  EXPECT_EQ(pNewBuf->tsOrder, pTSBuf->tsOrder);
+  EXPECT_EQ(pNewBuf->numOfVnodes, numOfVnode);
+  EXPECT_EQ(pNewBuf->fileSize, pTSBuf->fileSize);
+
+  EXPECT_EQ(pNewBuf->pData[0].info.offset, pTSBuf->pData[0].info.offset);
+  EXPECT_EQ(pNewBuf->pData[0].info.numOfBlocks, pTSBuf->pData[0].info.numOfBlocks);
+  EXPECT_EQ(pNewBuf->pData[0].info.compLen, pTSBuf->pData[0].info.compLen);
+
+  EXPECT_STREQ(pNewBuf->path, pTSBuf->path);
+
+  tsBufResetPos(pNewBuf);
+
+  int64_t s = taosGetTimestampUs();
+  printf("start:%" PRIu64 "\n", s);
+
+  int32_t x = 0;
+  while (tsBufNextPos(pNewBuf)) {
+    STSElem elem = tsBufGetElem(pNewBuf);
+    if (++x == 100000000) {
+      break;
+    }
+
+    //    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag, elem.ts);
+  }
+
+  int64_t e = taosGetTimestampUs();
+  printf("end:%" PRIu64 ", elapsed:%" PRIu64 ", total obj:%d\n", e, e - s, x);
+  tsBufDestroy(pTSBuf);
+  tsBufDestroy(pNewBuf);
+}
+
+void randomIncTsTest() {}
+
+void TSTraverse() {
+  // 10000 vnodes
+  int32_t num = 200000;
+  int64_t oldStart = 10000000;
+  int32_t numOfTags = 3;
+  int32_t step = 30;
+  int32_t numOfVnode = 2;
+
+  STSBuf* pTSBuf = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  for (int32_t j = 0; j < numOfVnode; ++j) {
+    // vnodeId:0
+    int64_t start = 10000000;
+    tVariant t = {0};
+    t.nType = TSDB_DATA_TYPE_BIGINT;
+
+    for (int32_t i = 0; i < numOfTags; ++i) {
+      int64_t* list = createTsList(num, start, step);
+      t.i64Key = i;
+
+      tsBufAppend(pTSBuf, j, &t, (const char*)list, num * sizeof(int64_t));
+      printf("%d - %d - %" PRIu64 ", %" PRIu64 "\n", j, i, list[0], list[num - 1]);
+
+      free(list);
+      start += step * num;
+
+      list = createTsList(num, start, step);
+      tsBufAppend(pTSBuf, j, &t, (const char*)list, num * sizeof(int64_t));
+      printf("%d - %d - %" PRIu64 ", %" PRIu64 "\n", j, i, list[0], list[num - 1]);
+      free(list);
+
+      start += step * num;
+    }
+
+    EXPECT_EQ(pTSBuf->numOfVnodes, j + 1);
+  }
+
+  tsBufResetPos(pTSBuf);
+
+  ////////////////////////////////////////////////////////////////////////////////////////
+  // reverse traverse
+  int64_t s = taosGetTimestampUs();
+  printf("start:%" PRIu64 "\n", s);
+
+  pTSBuf->cur.order = TSDB_ORDER_DESC;
+
+  // complete reverse traverse
+  int32_t x = 0;
+  while (tsBufNextPos(pTSBuf)) {
+    STSElem elem = tsBufGetElem(pTSBuf);
+    //    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag, elem.ts);
+  }
+
+  // specify the data block with vnode and tags value
+  tsBufResetPos(pTSBuf);
+  pTSBuf->cur.order = TSDB_ORDER_DESC;
+
+  int32_t startVnode = 1;
+  int32_t startTag = 2;
+
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+  t.i64Key = startTag;
+
+  tsBufGetElemStartPos(pTSBuf, startVnode, &t);
+
+  int32_t totalOutput = 10;
+  while (1) {
+    STSElem elem = tsBufGetElem(pTSBuf);
+    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag.i64Key, elem.ts);
+
+    if (!tsBufNextPos(pTSBuf)) {
+      break;
+    }
+
+    if (--totalOutput <= 0) {
+      totalOutput = 10;
+
+      startTag -= 1;
+      t.i64Key = startTag;
+      tsBufGetElemStartPos(pTSBuf, startVnode, &t);
+
+      if (startTag == 0) {
+        startVnode -= 1;
+        startTag = 3;
+      }
+
+      if (startVnode < 0) {
+        break;
+      }
+    }
+  }
+
+  /////////////////////////////////////////////////////////////////////////////////
+  // traverse
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
+  tsBufResetPos(pTSBuf);
+
+  // complete forwards traverse
+  while (tsBufNextPos(pTSBuf)) {
+    STSElem elem = tsBufGetElem(pTSBuf);
+    //    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag, elem.ts);
+  }
+
+  // specify the data block with vnode and tags value
+  tsBufResetPos(pTSBuf);
+  pTSBuf->cur.order = TSDB_ORDER_ASC;
+
+  startVnode = 1;
+  startTag = 2;
+  t.i64Key = startTag;
+
+  tsBufGetElemStartPos(pTSBuf, startVnode, &t);
+
+  totalOutput = 10;
+  while (1) {
+    STSElem elem = tsBufGetElem(pTSBuf);
+    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag.i64Key, elem.ts);
+
+    if (!tsBufNextPos(pTSBuf)) {
+      break;
+    }
+
+    if (--totalOutput <= 0) {
+      totalOutput = 10;
+
+      startTag -= 1;
+      t.i64Key = startTag;
+      tsBufGetElemStartPos(pTSBuf, startVnode, &t);
+
+      if (startTag < 0) {
+        startVnode -= 1;
+        startTag = 3;
+      }
+
+      if (startVnode < 0) {
+        break;
+      }
+    }
+  }
+
+  tsBufDestroy(pTSBuf);
+}
+
+void performanceTest() {}
+
+void emptyTagTest() {}
+
+void invalidFileTest() {
+  const char* cmd = "touch /tmp/test";
+
+  // create empty file
+  system(cmd);
+
+  STSBuf* pNewBuf = tsBufCreateFromFile("/tmp/test", true);
+  EXPECT_TRUE(pNewBuf == NULL);
+  tsBufDestroy(pNewBuf);
+
+  pNewBuf = tsBufCreateFromFile("/tmp/911", true);
+  EXPECT_TRUE(pNewBuf == NULL);
+
+  tsBufDestroy(pNewBuf);
+}
+
+void mergeDiffVnodeBufferTest() {
+  STSBuf* pTSBuf1 = tsBufCreate(true, TSDB_ORDER_ASC);
+  STSBuf* pTSBuf2 = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  int32_t step = 30;
+  int32_t num = 1000;
+  int32_t numOfTags = 10;
+
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+
+  // vnodeId:0
+  int64_t start = 10000000;
+  for (int32_t i = 0; i < numOfTags; ++i) {
+    int64_t* list = createTsList(num, start, step);
+    t.i64Key = i;
+
+    tsBufAppend(pTSBuf1, 0, &t, (const char*)list, num * sizeof(int64_t));
+    tsBufAppend(pTSBuf2, 0, &t, (const char*)list, num * sizeof(int64_t));
+
+    free(list);
+
+    start += step * num;
+  }
+
+  tsBufFlush(pTSBuf2);
+
+  tsBufMerge(pTSBuf1, pTSBuf2, 9);
+  EXPECT_EQ(pTSBuf1->numOfVnodes, 2);
+  EXPECT_EQ(pTSBuf1->numOfTotal, numOfTags * 2 * num);
+
+  tsBufDisplay(pTSBuf1);
+
+  tsBufDestroy(pTSBuf2);
+  tsBufDestroy(pTSBuf1);
+}
+
+void mergeIdenticalVnodeBufferTest() {
+  STSBuf* pTSBuf1 = tsBufCreate(true, TSDB_ORDER_ASC);
+  STSBuf* pTSBuf2 = tsBufCreate(true, TSDB_ORDER_ASC);
+
+  tVariant t = {0};
+  t.nType = TSDB_DATA_TYPE_BIGINT;
+
+  int32_t step = 30;
+  int32_t num = 1000;
+  int32_t numOfTags = 10;
+
+  // vnodeId:0
+  int64_t start = 10000000;
+  for (int32_t i = 0; i < numOfTags; ++i) {
+    int64_t* list = createTsList(num, start, step);
+    t.i64Key = i;
+
+    tsBufAppend(pTSBuf1, 12, &t, (const char*)list, num * sizeof(int64_t));
+    free(list);
+
+    start += step * num;
+  }
+
+
+
+  for (int32_t i = numOfTags; i < numOfTags * 2; ++i) {
+    int64_t* list = createTsList(num, start, step);
+
+    t.i64Key = i;
+    tsBufAppend(pTSBuf2, 77, &t, (const char*)list, num * sizeof(int64_t));
+    free(list);
+
+    start += step * num;
+  }
+
+  tsBufFlush(pTSBuf2);
+
+  tsBufMerge(pTSBuf1, pTSBuf2, 12);
+  EXPECT_EQ(pTSBuf1->numOfVnodes, 1);
+  EXPECT_EQ(pTSBuf1->numOfTotal, numOfTags * 2 * num);
+
+  tsBufResetPos(pTSBuf1);
+  while (tsBufNextPos(pTSBuf1)) {
+    STSElem elem = tsBufGetElem(pTSBuf1);
+    EXPECT_EQ(elem.vnode, 12);
+
+    printf("%d-%" PRIu64 "-%" PRIu64 "\n", elem.vnode, elem.tag.i64Key, elem.ts);
+  }
+
+  tsBufDestroy(pTSBuf1);
+  tsBufDestroy(pTSBuf2);
+}
+}  // namespace
+
+
+//TODO add binary tag value test case
+TEST(testCase, tsBufTest) {
+  simpleTest();
+  largeTSTest();
+  multiTagsTest();
+  multiVnodeTagsTest();
+  loadDataTest();
+  invalidFileTest();
+//    randomIncTsTest();
+  TSTraverse();
+  mergeDiffVnodeBufferTest();
+  mergeIdenticalVnodeBufferTest();
+}
diff --git a/src/query/tests/unitTest.cpp b/src/query/tests/unitTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b6e1170d0ef989a7fe4bad43a29ccfb357005883
--- /dev/null
+++ b/src/query/tests/unitTest.cpp
@@ -0,0 +1,772 @@
+#include "os.h"
+#include <gtest/gtest.h>
+#include <cassert>
+#include <iostream>
+
+#include "taos.h"
+#include "tsdb.h"
+
+#include "../../client/inc/tscUtil.h"
+#include "tutil.h"
+#include "tvariant.h"
+#include "ttokendef.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+
+namespace {
+int32_t testValidateName(char* name) {
+  SStrToken token = {0};
+  token.z = name;
+  token.n = strlen(name);
+  token.type = 0;
+
+  tSQLGetToken(name, &token.type);
+  return tscValidateName(&token);
+}
+}
+
+static void _init_tvariant_bool(tVariant* t) {
+  t->i64Key = TSDB_FALSE;
+  t->nType = TSDB_DATA_TYPE_BOOL;
+}
+
+static void _init_tvariant_tinyint(tVariant* t) {
+  t->i64Key = -27;
+  t->nType = TSDB_DATA_TYPE_TINYINT;
+}
+
+static void _init_tvariant_int(tVariant* t) {
+  t->i64Key = -23997659;
+  t->nType = TSDB_DATA_TYPE_INT;
+}
+
+static void _init_tvariant_bigint(tVariant* t) {
+  t->i64Key = -3333333333333;
+  t->nType = TSDB_DATA_TYPE_BIGINT;
+}
+
+static void _init_tvariant_float(tVariant* t) {
+  t->dKey = -8991212199.8987878776;
+  t->nType = TSDB_DATA_TYPE_FLOAT;
+}
+
+static void _init_tvariant_binary(tVariant* t) {
+  tVariantDestroy(t);
+
+  t->pz = (char*)calloc(1, 20);  //"2e3");
+  t->nType = TSDB_DATA_TYPE_BINARY;
+  strcpy(t->pz, "2e5");
+  t->nLen = strlen(t->pz);
+}
+
+static void _init_tvariant_nchar(tVariant* t) {
+  tVariantDestroy(t);
+
+  t->wpz = (wchar_t*)calloc(1, 20 * TSDB_NCHAR_SIZE);
+  t->nType = TSDB_DATA_TYPE_NCHAR;
+  wcscpy(t->wpz, L"-2000000.8765");
+  t->nLen = twcslen(t->wpz);
+}
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+
+/* test validate the names for table/database */
+TEST(testCase, db_table_name) {
+
+  char t01[] = "abc";
+  EXPECT_EQ(testValidateName(t01), TSDB_CODE_SUCCESS);
+
+  char t02[] = "'abc'";
+  EXPECT_EQ(testValidateName(t02), TSDB_CODE_SUCCESS);
+
+  char t1[] = "abc.def";
+  EXPECT_EQ(testValidateName(t1), TSDB_CODE_SUCCESS);
+  printf("%s\n", t1);
+
+  char t2[] = "'abc.def'";
+  EXPECT_EQ(testValidateName(t2), TSDB_CODE_SUCCESS);
+  printf("%s\n", t2);
+
+  char t3[] = "'abc'.def";
+  EXPECT_EQ(testValidateName(t3), TSDB_CODE_SUCCESS);
+  printf("%s\n", t3);
+
+  char t4[] = "'abc'.'def'";
+  EXPECT_EQ(testValidateName(t4), TSDB_CODE_SUCCESS);
+
+  char t5[] = "table.'def'";
+  EXPECT_EQ(testValidateName(t5), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t6[] = "'table'.'def'";
+  EXPECT_EQ(testValidateName(t6), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t7[] = "'_ab1234'.'def'";
+  EXPECT_EQ(testValidateName(t7), TSDB_CODE_SUCCESS);
+  printf("%s\n", t7);
+
+  char t8[] = "'_ab&^%1234'.'def'";
+  EXPECT_EQ(testValidateName(t8), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t9[] = "'_123'.'gtest中文'";
+  EXPECT_EQ(testValidateName(t9), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t10[] = "abc.'gtest中文'";
+  EXPECT_EQ(testValidateName(t10), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t10_1[] = "abc.'中文gtest'";
+  EXPECT_EQ(testValidateName(t10_1), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t11[] = "'192.168.0.1'.abc";
+  EXPECT_EQ(testValidateName(t11), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t12[] = "192.168.0.1.abc";
+  EXPECT_EQ(testValidateName(t12), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t13[] = "abc.";
+  EXPECT_EQ(testValidateName(t13), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t14[] = ".abc";
+  EXPECT_EQ(testValidateName(t14), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t15[] = ".'abc'";
+  EXPECT_EQ(testValidateName(t15), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t16[] = ".abc'";
+  EXPECT_EQ(testValidateName(t16), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t17[] = "123a.\"abc\"";
+  EXPECT_EQ(testValidateName(t17), TSDB_CODE_TSC_INVALID_SQL);
+  printf("%s\n", t17);
+
+  char t18[] = "a.\"abc\"";
+  EXPECT_EQ(testValidateName(t18), TSDB_CODE_SUCCESS);
+  printf("%s\n", t18);
+
+  char t19[] = "'_ab1234'.'def'.'ab123'";
+  EXPECT_EQ(testValidateName(t19), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t20[] = "'_ab1234*&^'";
+  EXPECT_EQ(testValidateName(t20), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t21[] = "'1234_abc'";
+  EXPECT_EQ(testValidateName(t21), TSDB_CODE_TSC_INVALID_SQL);
+
+
+  // =======Containing capital letters=================
+  char t30[] = "ABC";
+  EXPECT_EQ(testValidateName(t30), TSDB_CODE_SUCCESS);
+
+  char t31[] = "'ABC'";
+  EXPECT_EQ(testValidateName(t31), TSDB_CODE_SUCCESS);
+
+  char t32[] = "ABC.def";
+  EXPECT_EQ(testValidateName(t32), TSDB_CODE_SUCCESS);
+
+  char t33[] = "'ABC.def";
+  EXPECT_EQ(testValidateName(t33), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t33_0[] = "abc.DEF'";
+  EXPECT_EQ(testValidateName(t33_0), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t34[] = "'ABC.def'";
+  //int32_t tmp0 = testValidateName(t34);
+  EXPECT_EQ(testValidateName(t34), TSDB_CODE_SUCCESS);
+
+  char t35[] = "'ABC'.def";
+  EXPECT_EQ(testValidateName(t35), TSDB_CODE_SUCCESS);
+
+  char t36[] = "'ABC'.'DEF'";
+  EXPECT_EQ(testValidateName(t36), TSDB_CODE_SUCCESS);
+
+  char t37[] = "abc.'DEF'";
+  EXPECT_EQ(testValidateName(t37), TSDB_CODE_SUCCESS);
+
+  char t37_1[] = "abc.'_123DEF'";
+  EXPECT_EQ(testValidateName(t37_1), TSDB_CODE_SUCCESS);
+
+  char t38[] = "'abc'.'DEF'";
+  EXPECT_EQ(testValidateName(t38), TSDB_CODE_SUCCESS);
+
+  // do not use key words 
+  char t39[] = "table.'DEF'";
+  EXPECT_EQ(testValidateName(t39), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t40[] = "'table'.'DEF'";
+  EXPECT_EQ(testValidateName(t40), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t41[] = "'_abXYZ1234'.'deFF'";
+  EXPECT_EQ(testValidateName(t41), TSDB_CODE_SUCCESS);
+
+  char t42[] = "'_abDEF&^%1234'.'DIef'";
+  EXPECT_EQ(testValidateName(t42), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t43[] = "'_123'.'Gtest中文'";
+  EXPECT_EQ(testValidateName(t43), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t44[] = "'aABC'.'Gtest中文'";
+  EXPECT_EQ(testValidateName(t44), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t45[] = "'ABC'.";
+  EXPECT_EQ(testValidateName(t45), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t46[] = ".'ABC'";
+  EXPECT_EQ(testValidateName(t46), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t47[] = "a.\"aTWc\"";
+  EXPECT_EQ(testValidateName(t47), TSDB_CODE_SUCCESS);
+
+ // ================has space =================
+  char t60[] = " ABC ";
+  EXPECT_EQ(testValidateName(t60), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t60_1[] = "   ABC ";
+  EXPECT_EQ(testValidateName(t60_1), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t61[] = "' ABC '";
+  EXPECT_EQ(testValidateName(t61), TSDB_CODE_SUCCESS);
+
+  char t61_1[] = "'  ABC '";
+  EXPECT_EQ(testValidateName(t61_1), TSDB_CODE_SUCCESS);
+
+  char t62[] = " ABC . def ";
+  EXPECT_EQ(testValidateName(t62), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t63[] = "' ABC . def ";
+  EXPECT_EQ(testValidateName(t63), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t63_0[] = "  abc . DEF ' ";
+  EXPECT_EQ(testValidateName(t63_0), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t64[] = " '  ABC .  def ' ";
+  //int32_t tmp1 = testValidateName(t64);
+  EXPECT_EQ(testValidateName(t64), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t65[] = " ' ABC  '. def ";
+  EXPECT_EQ(testValidateName(t65), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t66[] = "' ABC '.'  DEF '";
+  EXPECT_EQ(testValidateName(t66), TSDB_CODE_SUCCESS);
+
+  char t67[] = "abc . '  DEF  '";
+  EXPECT_EQ(testValidateName(t67), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t68[] = "'  abc '.'   DEF '";
+  EXPECT_EQ(testValidateName(t68), TSDB_CODE_SUCCESS);
+
+  // do not use key words 
+  char t69[] = "table.'DEF'";
+  EXPECT_EQ(testValidateName(t69), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t70[] = "'table'.'DEF'";
+  EXPECT_EQ(testValidateName(t70), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t71[] = "'_abXYZ1234  '.' deFF  '";
+  EXPECT_EQ(testValidateName(t71), TSDB_CODE_SUCCESS);
+
+  char t72[] = "'_abDEF&^%1234'.'  DIef'";
+  EXPECT_EQ(testValidateName(t72), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t73[] = "'_123'.'  Gtest中文'";
+  EXPECT_EQ(testValidateName(t73), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t74[] = "' aABC'.'Gtest中文'";
+  EXPECT_EQ(testValidateName(t74), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t75[] = "' ABC '.";
+  EXPECT_EQ(testValidateName(t75), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t76[] = ".' ABC'";
+  EXPECT_EQ(testValidateName(t76), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t77[] = " a . \"aTWc\" ";
+  EXPECT_EQ(testValidateName(t77), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t78[] = "  a.\"aTWc  \"";
+  EXPECT_EQ(testValidateName(t78), TSDB_CODE_TSC_INVALID_SQL);
+
+
+  // ===============muti string by space ===================
+  // There's no such case.
+  //char t160[] = "A BC";
+  //EXPECT_EQ(testValidateName(t160), TSDB_CODE_TSC_INVALID_SQL);
+  //printf("end:%s\n", t160);
+
+  // There's no such case.
+  //char t161[] = "' A BC '";
+  //EXPECT_EQ(testValidateName(t161), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t162[] = " AB C . de f ";
+  EXPECT_EQ(testValidateName(t162), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t163[] = "' AB C . de f ";
+  EXPECT_EQ(testValidateName(t163), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t163_0[] = "  ab c . DE F ' ";
+  EXPECT_EQ(testValidateName(t163_0), TSDB_CODE_TSC_INVALID_SQL);
+  
+  char t164[] = " '  AB C .  de f ' ";
+  //int32_t tmp2 = testValidateName(t164);
+  EXPECT_EQ(testValidateName(t164), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t165[] = " ' A BC  '. de f ";
+  EXPECT_EQ(testValidateName(t165), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t166[] = "' AB C '.'  DE  F '";
+  EXPECT_EQ(testValidateName(t166), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t167[] = "ab  c . '  D  EF  '";
+  EXPECT_EQ(testValidateName(t167), TSDB_CODE_TSC_INVALID_SQL);
+
+  char t168[] = "'  a bc '.'   DE  F '";
+  EXPECT_EQ(testValidateName(t168), TSDB_CODE_TSC_INVALID_SQL);
+  
+}
+
+/* test parse time function */
+TEST(testCase, parse_time) {
+  taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
+  char t1[] = "2018-1-1 1:1:1.952798";
+  char t13[] = "1970-1-1 0:0:0";
+
+  int64_t time = 0, time1 = 0;
+
+  taosParseTime(t1, &time, strlen(t1), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 1514739661952);
+
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, timezone * MILLISECOND_PER_SECOND);
+
+  char t2[] = "2018-1-1T1:1:1.952Z";
+  taosParseTime(t2, &time, strlen(t2), TSDB_TIME_PRECISION_MILLI, 0);
+
+  EXPECT_EQ(time, 1514739661952 + 28800000);
+
+  char t3[] = "2018-1-1 1:01:01.952";
+  taosParseTime(t3, &time, strlen(t3), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 1514739661952);
+
+  char t4[] = "2018-1-1 1:01:01.9";
+  char t5[] = "2018-1-1 1:01:1.900";
+  char t6[] = "2018-01-01 1:1:1.90";
+  char t7[] = "2018-01-01 01:01:01.9";
+  char t8[] = "2018-01-01 01:01:01.9007865";
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t5, &time1, strlen(t5), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t6, &time1, strlen(t6), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t4, &time, strlen(t4), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t7, &time1, strlen(t7), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taosParseTime(t5, &time, strlen(t5), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t8, &time1, strlen(t8), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t9[] = "2017-4-3 1:1:2.980";
+  char t10[] = "2017-4-3T2:1:2.98+9:00";
+  taosParseTime(t9, &time, strlen(t9), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t10, &time1, strlen(t10), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t11[] = "2017-4-3T2:1:2.98+09:00";
+  taosParseTime(t11, &time, strlen(t11), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t10, &time1, strlen(t10), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  char t12[] = "2017-4-3T2:1:2.98+0900";
+  taosParseTime(t11, &time, strlen(t11), TSDB_TIME_PRECISION_MILLI, 0);
+  taosParseTime(t12, &time1, strlen(t12), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, time1);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "UTC");
+  taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 0);
+
+  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Shanghai");
+  char t14[] = "1970-1-1T0:0:0Z";
+  taosParseTime(t14, &time, strlen(t14), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 0);
+
+  char t40[] = "1970-1-1 0:0:0.999999999";
+  taosParseTime(t40, &time, strlen(t40), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 999 + timezone * MILLISECOND_PER_SECOND);
+
+  char t41[] = "1997-1-1 0:0:0.999999999";
+  taosParseTime(t41, &time, strlen(t41), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 852048000999);
+
+  int64_t k = timezone;
+  char    t42[] = "1997-1-1T0:0:0.999999999Z";
+  taosParseTime(t42, &time, strlen(t42), TSDB_TIME_PRECISION_MILLI, 0);
+  EXPECT_EQ(time, 852048000999 - timezone * MILLISECOND_PER_SECOND);
+
+  ////////////////////////////////////////////////////////////////////
+  // illegal timestamp format
+  char t15[] = "2017-12-33 0:0:0";
+  EXPECT_EQ(taosParseTime(t15, &time, strlen(t15), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t16[] = "2017-12-31 99:0:0";
+  EXPECT_EQ(taosParseTime(t16, &time, strlen(t16), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t17[] = "2017-12-31T9:0:0";
+  EXPECT_EQ(taosParseTime(t17, &time, strlen(t17), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t18[] = "2017-12-31T9:0:0.Z";
+  EXPECT_EQ(taosParseTime(t18, &time, strlen(t18), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t19[] = "2017-12-31 9:0:0.-1";
+  EXPECT_EQ(taosParseTime(t19, &time, strlen(t19), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t20[] = "2017-12-31 9:0:0.1+12:99";
+  EXPECT_EQ(taosParseTime(t20, &time, strlen(t20), TSDB_TIME_PRECISION_MILLI, 0), 0);
+  EXPECT_EQ(time, 1514682000100);
+
+  char t21[] = "2017-12-31T9:0:0.1+12:99";
+  EXPECT_EQ(taosParseTime(t21, &time, strlen(t21), TSDB_TIME_PRECISION_MILLI, 0), -1);
+
+  char t22[] = "2017-12-31 9:0:0.1+13:1";
+  EXPECT_EQ(taosParseTime(t22, &time, strlen(t22), TSDB_TIME_PRECISION_MILLI, 0), 0);
+
+  char t23[] = "2017-12-31T9:0:0.1+13:1";
+  EXPECT_EQ(taosParseTime(t23, &time, strlen(t23), TSDB_TIME_PRECISION_MILLI, 0), 0);
+}
+
+TEST(testCase, tvariant_convert) {
+  // 1. bool data to all other data types
+  tVariant t = {0};
+  _init_tvariant_bool(&t);
+
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_TINYINT), 0);
+  EXPECT_EQ(t.i64Key, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_SMALLINT), 0);
+  EXPECT_EQ(t.i64Key, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_EQ(t.dKey, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_EQ(t.dKey, 0);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "FALSE");
+  tVariantDestroy(&t);
+
+  _init_tvariant_bool(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"FALSE");
+  tVariantDestroy(&t);
+
+  // 2. tinyint to other data types
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 1);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_TINYINT), 0);
+  EXPECT_EQ(t.i64Key, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_SMALLINT), 0);
+  EXPECT_EQ(t.i64Key, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_INT), 0);
+  EXPECT_EQ(t.i64Key, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_EQ(t.dKey, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_EQ(t.dKey, -27);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "-27");
+  tVariantDestroy(&t);
+
+  _init_tvariant_tinyint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"-27");
+  tVariantDestroy(&t);
+
+  // 3. int to other data
+  // types//////////////////////////////////////////////////////////////////
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 1);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_TINYINT), 0);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_SMALLINT), 0);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_INT), 0);
+  EXPECT_EQ(t.i64Key, -23997659);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, -23997659);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_EQ(t.dKey, -23997659);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_EQ(t.dKey, -23997659);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "-23997659");
+  tVariantDestroy(&t);
+
+  _init_tvariant_int(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"-23997659");
+  tVariantDestroy(&t);
+
+  // 4. bigint to other data
+  // type//////////////////////////////////////////////////////////////////////////////
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 1);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_TINYINT), 0);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_SMALLINT), 0);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_INT), 0);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, -3333333333333);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_EQ(t.dKey, -3333333333333);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_EQ(t.dKey, -3333333333333);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "-3333333333333");
+  tVariantDestroy(&t);
+
+  _init_tvariant_bigint(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"-3333333333333");
+  tVariantDestroy(&t);
+
+  // 5. float to other data
+  // types////////////////////////////////////////////////////////////////////////
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 1);
+
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, -8991212199);
+
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, -8991212199.8987885);
+
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, -8991212199.8987885);
+
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "-8991212199.898788");
+  tVariantDestroy(&t);
+
+  _init_tvariant_float(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"-8991212199.898788");
+  tVariantDestroy(&t);
+
+  // 6. binary to other data types
+  // //////////////////////////////////////////////////////////////////
+  t.pz = "true";
+  t.nLen = strlen(t.pz);
+  t.nType = TSDB_DATA_TYPE_BINARY;
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 1);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), -1);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, 200000);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, 200000);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, 200000);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "2e5");
+  tVariantDestroy(&t);
+
+  _init_tvariant_binary(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"2e5");
+  tVariantDestroy(&t);
+
+  // 7. nchar to other data types
+  // //////////////////////////////////////////////////////////////////
+  t.wpz = L"FALSE";
+  t.nLen = wcslen(t.wpz);
+  t.nType = TSDB_DATA_TYPE_NCHAR;
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+  EXPECT_EQ(t.i64Key, 0);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_LE(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BOOL), 0);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BIGINT), 0);
+  EXPECT_EQ(t.i64Key, -2000000);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_FLOAT), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, -2000000.8765);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_DOUBLE), 0);
+  EXPECT_DOUBLE_EQ(t.dKey, -2000000.8765);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_BINARY), 0);
+  EXPECT_STREQ(t.pz, "-2000000.8765");
+  tVariantDestroy(&t);
+
+  _init_tvariant_nchar(&t);
+  EXPECT_EQ(tVariantTypeSetType(&t, TSDB_DATA_TYPE_NCHAR), 0);
+  EXPECT_STREQ(t.wpz, L"-2000000.8765");
+  tVariantDestroy(&t);
+}
+
+TEST(testCase, tGetToken_Test) {
+  char* s = ".123 ";
+  uint32_t type = 0;
+
+  int32_t len = tSQLGetToken(s, &type);
+  EXPECT_EQ(type, TK_FLOAT);
+  EXPECT_EQ(len, strlen(s) - 1);
+
+  char s1[] = "1.123e10 ";
+  len = tSQLGetToken(s1, &type);
+  EXPECT_EQ(type, TK_FLOAT);
+  EXPECT_EQ(len, strlen(s1) - 1);
+
+  char s4[] = "0xff ";
+  len = tSQLGetToken(s4, &type);
+  EXPECT_EQ(type, TK_HEX);
+  EXPECT_EQ(len, strlen(s4) - 1);
+
+  // invalid data type
+  char s2[] = "e10 ";
+  len = tSQLGetToken(s2, &type);
+  EXPECT_FALSE(type == TK_FLOAT);
+
+  char s3[] = "1.1.1.1";
+  len = tSQLGetToken(s3, &type);
+  EXPECT_EQ(type, TK_IPTOKEN);
+  EXPECT_EQ(len, strlen(s3));
+
+  char s5[] = "0x ";
+  len = tSQLGetToken(s5, &type);
+  EXPECT_FALSE(type == TK_HEX);
+}
+
+static SStrToken createStrToken(char* s) {
+  SStrToken t = {0};//.type = TK_STRING, .z = s, .n = strlen(s)};
+  t.type = TK_STRING;
+  t.z = s;
+  t.n = strlen(s);
+
+  return t;
+}
+
+TEST(testCase, isValidNumber_test) {
+  SStrToken t1 = createStrToken("123abc");
+
+  EXPECT_EQ(isValidNumber(&t1), TK_ILLEGAL);
+
+  t1 = createStrToken("0xabc");
+  EXPECT_EQ(isValidNumber(&t1), TK_HEX);
+
+  t1 = createStrToken("0b11101");
+  EXPECT_EQ(isValidNumber(&t1), TK_BIN);
+
+  t1 = createStrToken(".134abc");
+  EXPECT_EQ(isValidNumber(&t1), TK_ILLEGAL);
+
+  t1 = createStrToken("1e1 ");
+  EXPECT_EQ(isValidNumber(&t1), TK_ILLEGAL);
+
+  t1 = createStrToken("1+2");
+  EXPECT_EQ(isValidNumber(&t1), TK_ILLEGAL);
+
+  t1 = createStrToken("-0x123");
+  EXPECT_EQ(isValidNumber(&t1), TK_HEX);
+
+  t1 = createStrToken("-1");
+  EXPECT_EQ(isValidNumber(&t1), TK_INTEGER);
+
+  t1 = createStrToken("-0b1110");
+  EXPECT_EQ(isValidNumber(&t1), TK_BIN);
+
+  t1 = createStrToken("-.234");
+  EXPECT_EQ(isValidNumber(&t1), TK_FLOAT);
+}
+
+TEST(testCase, getTempFilePath_test) {
+  char path[4096] = {0};
+  memset(path, 1, 4096);
+
+  taosGetTmpfilePath("new_tmp", path);
+  printf("%s\n", path);
+}
+
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index 8d54d5fda591acd790c4bfab751cec079762e561..f94b4aeb6d21277b6b845587cd35a2c98e0bc0b0 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -1,24 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  AUX_SOURCE_DIRECTORY(./src SRC)
-ELSEIF (TD_DARWIN_64)
-  LIST(APPEND SRC ./src/thaship.c)
-  LIST(APPEND SRC ./src/trpc.c)
-  LIST(APPEND SRC ./src/tstring.c)
-  LIST(APPEND SRC ./src/tudp.c)
-ELSEIF (TD_WINDOWS_64)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  LIST(APPEND SRC ./src/thaship.c)
-  LIST(APPEND SRC ./src/trpc.c)
-  LIST(APPEND SRC ./src/tstring.c)
-  LIST(APPEND SRC ./src/tudp.c)
-ENDIF ()
+AUX_SOURCE_DIRECTORY(src SRC)
 
 ADD_LIBRARY(trpc ${SRC})
-TARGET_LINK_LIBRARIES(trpc tutil)
+TARGET_LINK_LIBRARIES(trpc tutil lz4 common)
+
+ADD_SUBDIRECTORY(test)
diff --git a/src/rpc/inc/rpcCache.h b/src/rpc/inc/rpcCache.h
new file mode 100644
index 0000000000000000000000000000000000000000..3a996aab7ce6a5f76d8a3f8fefbf6eefbb917183
--- /dev/null
+++ b/src/rpc/inc/rpcCache.h
@@ -0,0 +1,32 @@
+/*
+ * 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_RPC_CACHE_H
+#define TDENGINE_RPC_CACHE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *rpcOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl, int64_t keepTimer);
+void  rpcCloseConnCache(void *handle);
+void  rpcAddConnIntoCache(void *handle, void *data, char *fqdn, uint16_t port, int8_t connType);
+void *rpcGetConnFromCache(void *handle, char *fqdn, uint16_t port, int8_t connType);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_RPC_CACHE_H
diff --git a/src/rpc/inc/rpcHead.h b/src/rpc/inc/rpcHead.h
new file mode 100644
index 0000000000000000000000000000000000000000..520edadc7dd072849720cad53c7f6f4ba605a06c
--- /dev/null
+++ b/src/rpc/inc/rpcHead.h
@@ -0,0 +1,83 @@
+/*
+ * 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_RPCHEAD_H
+#define TDENGINE_RPCHEAD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RPC_CONN_UDPS   0
+#define RPC_CONN_UDPC   1
+#define RPC_CONN_TCPS   2
+#define RPC_CONN_TCPC   3
+#define RPC_CONN_TCP    2
+
+extern int tsRpcOverhead;
+
+typedef struct {
+  void    *msg;
+  int      msgLen;
+  uint32_t ip; 
+  uint16_t port;
+  int      connType;
+  void    *shandle;
+  void    *thandle;
+  void    *chandle;
+} SRecvInfo;
+
+#pragma pack(push, 1)
+
+typedef struct {
+  char     version:4; // RPC version
+  char     comp:4;    // compression algorithm, 0:no compression 1:lz4
+  char     resflag:2; // reserved bits
+  char     spi:3;     // security parameter index
+  char     encrypt:3; // encrypt algorithm, 0: no encryption
+  uint16_t tranId;    // transcation ID
+  uint32_t linkUid;   // for unique connection ID assigned by client
+  uint64_t ahandle;   // ahandle assigned by client 
+  uint32_t sourceId;  // source ID, an index for connection list  
+  uint32_t destId;    // destination ID, an index for connection list
+  uint32_t destIp;    // destination IP address, for NAT scenario
+  char     user[TSDB_UNI_LEN]; // user ID 
+  uint16_t port;      // for UDP only, port may be changed
+  char     empty[1];  // reserved
+  uint8_t  msgType;   // message type  
+  int32_t  msgLen;    // message length including the header iteslf
+  int32_t  code;      // code in response message
+  uint8_t  content[0]; // message body starts from here
+} SRpcHead;
+
+typedef struct {
+  int32_t  reserved;
+  int32_t  contLen;
+} SRpcComp;
+
+typedef struct {
+  uint32_t timeStamp;
+  uint8_t  auth[TSDB_AUTH_LEN];
+} SRpcDigest;
+
+#pragma pack(pop)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_RPCHEAD_H
+
diff --git a/src/rpc/inc/rpcLog.h b/src/rpc/inc/rpcLog.h
new file mode 100644
index 0000000000000000000000000000000000000000..10e847669146251ff5b3b4a5185bd09625f6ba07
--- /dev/null
+++ b/src/rpc/inc/rpcLog.h
@@ -0,0 +1,40 @@
+/*
+ * 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_RPC_LOG_H
+#define TDENGINE_RPC_LOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+
+extern int32_t rpcDebugFlag;
+extern int32_t tscEmbedded;
+
+#define tFatal(...) { if (rpcDebugFlag & DEBUG_FATAL) { taosPrintLog("RPC FATAL ", tscEmbedded ? 255 : rpcDebugFlag, __VA_ARGS__); }}
+#define tError(...) { if (rpcDebugFlag & DEBUG_ERROR) { taosPrintLog("RPC ERROR ", tscEmbedded ? 255 : rpcDebugFlag, __VA_ARGS__); }}
+#define tWarn(...)  { if (rpcDebugFlag & DEBUG_WARN)  { taosPrintLog("RPC WARN ", tscEmbedded ? 255 : rpcDebugFlag, __VA_ARGS__); }}
+#define tInfo(...)  { if (rpcDebugFlag & DEBUG_INFO)  { taosPrintLog("RPC ", tscEmbedded ? 255 : rpcDebugFlag, __VA_ARGS__); }}
+#define tDebug(...) { if (rpcDebugFlag & DEBUG_DEBUG) { taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); }}
+#define tTrace(...) { if (rpcDebugFlag & DEBUG_TRACE) { taosPrintLog("RPC ", rpcDebugFlag, __VA_ARGS__); }}
+#define tDump(x, y) { if (rpcDebugFlag & DEBUG_DUMP)  { taosDumpData((unsigned char *)x, y); }}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_RPC_LOG_H
diff --git a/src/rpc/inc/rpcTcp.h b/src/rpc/inc/rpcTcp.h
new file mode 100644
index 0000000000000000000000000000000000000000..6ef8fc2d921a3379532bbc0efd2f226ef3389fc5
--- /dev/null
+++ b/src/rpc/inc/rpcTcp.h
@@ -0,0 +1,39 @@
+/*
+ * 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 _rpc_tcp_header_
+#define _rpc_tcp_header_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
+void taosStopTcpServer(void *param);
+void taosCleanUpTcpServer(void *param);
+
+void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *fp, void *shandle);
+void taosStopTcpClient(void *chandle);
+void taosCleanUpTcpClient(void *chandle);
+void *taosOpenTcpClientConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port);
+
+void taosCloseTcpConnection(void *chandle);
+int  taosSendTcpData(uint32_t ip, uint16_t port, void *data, int len, void *chandle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/rpc/inc/rpcUdp.h b/src/rpc/inc/rpcUdp.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1da6a92402367d23677eb5eb3753782248fb46e
--- /dev/null
+++ b/src/rpc/inc/rpcUdp.h
@@ -0,0 +1,41 @@
+/*
+ * 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 _rpc_udp_header_
+#define _rpc_udp_header_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taosdef.h"
+
+void *taosInitUdpConnection(uint32_t ip, uint16_t port, char *label, int, void *fp, void *shandle);
+void  taosStopUdpConnection(void *handle);
+void  taosCleanUpUdpConnection(void *handle);
+int   taosSendUdpData(uint32_t ip, uint16_t port, void *data, int dataLen, void *chandle);
+void *taosOpenUdpConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port);
+
+void  taosFreeMsgHdr(void *hdr);
+int   taosMsgHdrSize(void *hdr);
+void  taosSendMsgHdr(void *hdr, int fd);
+void  taosInitMsgHdr(void **hdr, void *dest, int maxPkts);
+void  taosSetMsgHdrData(void *hdr, char *data, int dataLen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/rpc/inc/thaship.h b/src/rpc/inc/thaship.h
deleted file mode 100644
index 4acf8b3fbbab14702b3f4e98dc40b0f68fa3a3e2..0000000000000000000000000000000000000000
--- a/src/rpc/inc/thaship.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 _rpc_hash_ip_header_
-#define _rpc_hash_ip_header_
-
-void *taosOpenIpHash(int maxSessions);
-void taosCloseIpHash(void *handle);
-void *taosAddIpHash(void *handle, void *pData, uint32_t ip, uint16_t port);
-void taosDeleteIpHash(void *handle, uint32_t ip, uint16_t port);
-void *taosGetIpHash(void *handle, uint32_t ip, uint16_t port);
-
-#endif
diff --git a/src/rpc/inc/ttcpclient.h b/src/rpc/inc/ttcpclient.h
deleted file mode 100644
index 8427c6f162fa0906af0c51e9ff49ad7e85c4b5a5..0000000000000000000000000000000000000000
--- a/src/rpc/inc/ttcpclient.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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 _taos_tcp_client_header_
-#define _taos_tcp_client_header_
-
-#include "tsdb.h"
-
-void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle);
-void taosCleanUpTcpClient(void *chandle);
-void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port);
-void taosCloseTcpClientConnection(void *chandle);
-int taosSendTcpClientData(uint32_t ip, uint16_t port, char *data, int len, void *chandle);
-
-#endif
diff --git a/src/rpc/inc/ttcpserver.h b/src/rpc/inc/ttcpserver.h
deleted file mode 100644
index ba3bd25719f05372ab97b1dc67a92d244e03ae64..0000000000000000000000000000000000000000
--- a/src/rpc/inc/ttcpserver.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 _taos_tcp_server_header_
-#define _taos_tcp_server_header_
-
-#include "tsdb.h"
-
-void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
-void taosCleanUpTcpServer(void *param);
-void taosCloseTcpServerConnection(void *param);
-int taosSendTcpServerData(uint32_t ip, uint16_t port, char *data, int len, void *chandle);
-
-#endif
diff --git a/src/rpc/inc/tudp.h b/src/rpc/inc/tudp.h
deleted file mode 100644
index 27c7593090d89d34b77ba34cf6c2f8b8366f2bd6..0000000000000000000000000000000000000000
--- a/src/rpc/inc/tudp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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 _taos_udp_header_
-#define _taos_udp_header_
-
-#include "tsdb.h"
-
-void *taosInitUdpServer(char *ip, uint16_t port, char *label, int, void *fp, void *shandle);
-void *taosInitUdpClient(char *ip, uint16_t port, char *label, int, void *fp, void *shandle);
-void taosCleanUpUdpConnection(void *handle);
-int taosSendUdpData(uint32_t ip, uint16_t port, char *data, int dataLen, void *chandle);
-void *taosOpenUdpConnection(void *shandle, void *thandle, char *ip, uint16_t port);
-
-void taosFreeMsgHdr(void *hdr);
-int taosMsgHdrSize(void *hdr);
-void taosSendMsgHdr(void *hdr, int fd);
-void taosInitMsgHdr(void **hdr, void *dest, int maxPkts);
-void taosSetMsgHdrData(void *hdr, char *data, int dataLen);
-
-#endif
diff --git a/src/rpc/src/rpcCache.c b/src/rpc/src/rpcCache.c
new file mode 100644
index 0000000000000000000000000000000000000000..751f03e52ac3d8b4cb1a36f7330bbd4c7faef328
--- /dev/null
+++ b/src/rpc/src/rpcCache.c
@@ -0,0 +1,288 @@
+/*
+ * 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 "os.h"
+#include "tglobal.h"
+#include "tmempool.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "rpcLog.h"
+#include "rpcCache.h"
+
+typedef struct SConnHash {
+  char              fqdn[TSDB_FQDN_LEN];
+  uint16_t          port;
+  char              connType;
+  struct SConnHash *prev;
+  struct SConnHash *next;
+  void             *data;
+  uint64_t          time;
+} SConnHash;
+
+typedef struct {
+  SConnHash     **connHashList;
+  mpool_h         connHashMemPool;
+  int             maxSessions;
+  int             total;
+  int *           count;
+  int64_t         keepTimer;
+  pthread_mutex_t mutex;
+  void          (*cleanFp)(void *);
+  void           *tmrCtrl;
+  void           *pTimer;
+  int64_t        *lockedBy;
+} SConnCache;
+
+static int  rpcHashConn(void *handle, char *fqdn, uint16_t port, int8_t connType);
+static void rpcLockCache(int64_t *lockedBy);
+static void rpcUnlockCache(int64_t *lockedBy);
+static void rpcCleanConnCache(void *handle, void *tmrId);
+static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash, uint64_t time);
+
+void *rpcOpenConnCache(int maxSessions, void (*cleanFp)(void *), void *tmrCtrl, int64_t keepTimer) {
+  SConnHash **connHashList;
+  mpool_h     connHashMemPool;
+  SConnCache *pCache;
+
+  connHashMemPool = taosMemPoolInit(maxSessions, sizeof(SConnHash));
+  if (connHashMemPool == 0) return NULL;
+
+  connHashList = calloc(sizeof(SConnHash *), maxSessions);
+  if (connHashList == 0) {
+    taosMemPoolCleanUp(connHashMemPool);
+    return NULL;
+  }
+
+  pCache = malloc(sizeof(SConnCache));
+  if (pCache == NULL) {
+    taosMemPoolCleanUp(connHashMemPool);
+    free(connHashList);
+    return NULL;
+  }
+  memset(pCache, 0, sizeof(SConnCache));
+
+  pCache->count = calloc(sizeof(int), maxSessions);
+  pCache->total = 0;
+  pCache->keepTimer = keepTimer;
+  pCache->maxSessions = maxSessions;
+  pCache->connHashMemPool = connHashMemPool;
+  pCache->connHashList = connHashList;
+  pCache->cleanFp = cleanFp;
+  pCache->tmrCtrl = tmrCtrl;
+  pCache->lockedBy = calloc(sizeof(int64_t), maxSessions);
+  taosTmrReset(rpcCleanConnCache, (int32_t)(pCache->keepTimer * 2), pCache, pCache->tmrCtrl, &pCache->pTimer);
+
+  pthread_mutex_init(&pCache->mutex, NULL);
+
+  return pCache;
+}
+
+void rpcCloseConnCache(void *handle) {
+  SConnCache *pCache;
+
+  pCache = (SConnCache *)handle;
+  if (pCache == NULL || pCache->maxSessions == 0) return;
+
+  pthread_mutex_lock(&pCache->mutex);
+
+  taosTmrStopA(&(pCache->pTimer));
+
+  if (pCache->connHashMemPool) taosMemPoolCleanUp(pCache->connHashMemPool);
+
+  taosTFree(pCache->connHashList);
+  taosTFree(pCache->count);
+  taosTFree(pCache->lockedBy);
+
+  pthread_mutex_unlock(&pCache->mutex);
+
+  pthread_mutex_destroy(&pCache->mutex);
+
+  memset(pCache, 0, sizeof(SConnCache));
+  free(pCache);
+}
+
+void rpcAddConnIntoCache(void *handle, void *data, char *fqdn, uint16_t port, int8_t connType) {
+  int         hash;
+  SConnHash * pNode;
+  SConnCache *pCache;
+
+  uint64_t time = taosGetTimestampMs();
+
+  pCache = (SConnCache *)handle;
+  assert(pCache); 
+  assert(data);
+
+  hash = rpcHashConn(pCache, fqdn, port, connType);
+  pNode = (SConnHash *)taosMemPoolMalloc(pCache->connHashMemPool);
+  tstrncpy(pNode->fqdn, fqdn, sizeof(pNode->fqdn));
+  pNode->port = port;
+  pNode->connType = connType;
+  pNode->data = data;
+  pNode->prev = NULL;
+  pNode->time = time;
+
+  rpcLockCache(pCache->lockedBy+hash);
+
+  pNode->next = pCache->connHashList[hash];
+  if (pCache->connHashList[hash] != NULL) (pCache->connHashList[hash])->prev = pNode;
+  pCache->connHashList[hash] = pNode;
+
+  pCache->count[hash]++;
+  rpcRemoveExpiredNodes(pCache, pNode->next, hash, time);
+
+  rpcUnlockCache(pCache->lockedBy+hash);
+
+  pCache->total++;
+  // tTrace("%p %s:%hu:%d:%d:%p added into cache, connections:%d", data, fqdn, port, connType, hash, pNode, pCache->count[hash]);
+
+  return;
+}
+
+void *rpcGetConnFromCache(void *handle, char *fqdn, uint16_t port, int8_t connType) {
+  int         hash;
+  SConnHash * pNode;
+  SConnCache *pCache;
+  void *      pData = NULL;
+
+  pCache = (SConnCache *)handle;
+  assert(pCache); 
+
+  uint64_t time = taosGetTimestampMs();
+
+  hash = rpcHashConn(pCache, fqdn, port, connType);
+  rpcLockCache(pCache->lockedBy+hash);
+
+  pNode = pCache->connHashList[hash];
+  while (pNode) {
+    if (time >= pCache->keepTimer + pNode->time) {
+      rpcRemoveExpiredNodes(pCache, pNode, hash, time);
+      pNode = NULL;
+      break;
+    }
+
+    if (strcmp(pNode->fqdn, fqdn) == 0 && pNode->port == port && pNode->connType == connType) break;
+
+    pNode = pNode->next;
+  }
+
+  if (pNode) {
+    rpcRemoveExpiredNodes(pCache, pNode->next, hash, time);
+
+    if (pNode->prev) {
+      pNode->prev->next = pNode->next;
+    } else {
+      pCache->connHashList[hash] = pNode->next;
+    }
+
+    if (pNode->next) {
+      pNode->next->prev = pNode->prev;
+    }
+
+    pData = pNode->data;
+    taosMemPoolFree(pCache->connHashMemPool, (char *)pNode);
+    pCache->total--;
+    pCache->count[hash]--;
+  }
+
+  rpcUnlockCache(pCache->lockedBy+hash);
+
+  if (pData) {
+    //tTrace("%p %s:%hu:%d:%d:%p retrieved from cache, connections:%d", pData, fqdn, port, connType, hash, pNode, pCache->count[hash]);
+  } else {
+    //tTrace("%s:%hu:%d:%d failed to retrieve conn from cache, connections:%d", fqdn, port, connType, hash, pCache->count[hash]);
+  }
+
+  return pData;
+}
+
+static void rpcCleanConnCache(void *handle, void *tmrId) {
+  int         hash;
+  SConnHash * pNode;
+  SConnCache *pCache;
+
+  pCache = (SConnCache *)handle;
+  if (pCache == NULL || pCache->maxSessions == 0) return;
+  if (pCache->pTimer != tmrId) return;
+
+  uint64_t time = taosGetTimestampMs();
+
+  for (hash = 0; hash < pCache->maxSessions; ++hash) {
+    rpcLockCache(pCache->lockedBy+hash);
+    pNode = pCache->connHashList[hash];
+    rpcRemoveExpiredNodes(pCache, pNode, hash, time);
+    rpcUnlockCache(pCache->lockedBy+hash);
+  }
+
+  // tTrace("timer, total connections in cache:%d", pCache->total);
+  taosTmrReset(rpcCleanConnCache, (int32_t)(pCache->keepTimer * 2), pCache, pCache->tmrCtrl, &pCache->pTimer);
+}
+
+static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash, uint64_t time) {
+  if (pNode == NULL || (time < pCache->keepTimer + pNode->time) ) return;
+
+  SConnHash *pPrev = pNode->prev, *pNext;
+
+  while (pNode) {
+    (*pCache->cleanFp)(pNode->data);
+    pNext = pNode->next;
+    pCache->total--;
+    pCache->count[hash]--;
+    //tTrace("%p %s:%hu:%d:%d:%p removed from cache, connections:%d", pNode->data, pNode->fqdn, pNode->port, pNode->connType, hash, pNode,
+    //         pCache->count[hash]);
+    taosMemPoolFree(pCache->connHashMemPool, (char *)pNode);
+    pNode = pNext;
+  }
+
+  if (pPrev)
+    pPrev->next = NULL;
+  else
+    pCache->connHashList[hash] = NULL;
+}
+
+static int rpcHashConn(void *handle, char *fqdn, uint16_t port, int8_t connType) {
+  SConnCache *pCache = (SConnCache *)handle;
+  int         hash = 0;
+  char       *temp = fqdn;
+
+  while (*temp) {
+    hash += *temp;
+    ++temp;
+  }
+
+  hash += port;
+  hash += connType;
+
+  hash = hash % pCache->maxSessions;
+
+  return hash;
+}
+
+static void rpcLockCache(int64_t *lockedBy) {
+  int64_t tid = taosGetPthreadId();
+  int     i = 0;
+  while (atomic_val_compare_exchange_64(lockedBy, 0, tid) != 0) {
+    if (++i % 100 == 0) {
+      sched_yield();
+    }
+  }
+}
+
+static void rpcUnlockCache(int64_t *lockedBy) {
+  int64_t tid = taosGetPthreadId();
+  if (atomic_val_compare_exchange_64(lockedBy, tid, 0) != tid) {
+    assert(false);
+  }
+}
+
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..50b1507a56f8923f507b225838717a62a1e8c9bd
--- /dev/null
+++ b/src/rpc/src/rpcMain.c
@@ -0,0 +1,1590 @@
+/*
+ * 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 "os.h"
+#include "tidpool.h"
+#include "tmd5.h"
+#include "tmempool.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "lz4.h"
+#include "taoserror.h"
+#include "tsocket.h"
+#include "tglobal.h"
+#include "taosmsg.h"
+#include "trpc.h"
+#include "hash.h"
+#include "rpcLog.h"
+#include "rpcUdp.h"
+#include "rpcCache.h"
+#include "rpcTcp.h"
+#include "rpcHead.h"
+
+#define RPC_MSG_OVERHEAD (sizeof(SRpcReqContext) + sizeof(SRpcHead) + sizeof(SRpcDigest)) 
+#define rpcHeadFromCont(cont) ((SRpcHead *) ((char*)cont - sizeof(SRpcHead)))
+#define rpcContFromHead(msg) (msg + sizeof(SRpcHead))
+#define rpcMsgLenFromCont(contLen) (contLen + sizeof(SRpcHead))
+#define rpcContLenFromMsg(msgLen) (msgLen - sizeof(SRpcHead))
+#define rpcIsReq(type) (type & 1U)
+
+typedef struct {
+  int      sessions;     // number of sessions allowed
+  int      numOfThreads; // number of threads to process incoming messages
+  int      idleTime;     // milliseconds;
+  uint16_t localPort;
+  int8_t   connType;
+  int      index;        // for UDP server only, round robin for multiple threads
+  char     label[TSDB_LABEL_LEN];
+
+  char     user[TSDB_UNI_LEN];   // meter ID
+  char     spi;                  // security parameter index
+  char     encrypt;              // encrypt algorithm
+  char     secret[TSDB_KEY_LEN]; // secret for the link
+  char     ckey[TSDB_KEY_LEN];   // ciphering key 
+
+  void   (*cfp)(SRpcMsg *, SRpcEpSet *);
+  int    (*afp)(char *user, char *spi, char *encrypt, char *secret, char *ckey); 
+
+  int32_t   refCount;
+  void     *idPool;   // handle to ID pool
+  void     *tmrCtrl;  // handle to timer
+  SHashObj *hash;     // handle returned by hash utility
+  void     *tcphandle;// returned handle from TCP initialization
+  void     *udphandle;// returned handle from UDP initialization
+  void     *pCache;   // connection cache
+  pthread_mutex_t  mutex;
+  struct SRpcConn *connList;  // connection list
+} SRpcInfo;
+
+typedef struct {
+  SRpcInfo *pRpc;       // associated SRpcInfo
+  SRpcEpSet epSet;      // ip list provided by app
+  void     *ahandle;    // handle provided by app
+  void     *signature;  // for validation
+  struct SRpcConn *pConn; // pConn allocated
+  char      msgType;    // message type
+  uint8_t  *pCont;      // content provided by app
+  int32_t   contLen;    // content length
+  int32_t   code;       // error code
+  int16_t   numOfTry;   // number of try for different servers
+  int8_t    oldInUse;   // server EP inUse passed by app
+  int8_t    redirect;   // flag to indicate redirect
+  int8_t    connType;   // connection type
+  SRpcMsg  *pRsp;       // for synchronous API
+  tsem_t   *pSem;       // for synchronous API
+  SRpcEpSet *pSet;      // for synchronous API 
+  char      msg[0];     // RpcHead starts from here
+} SRpcReqContext;
+
+typedef struct SRpcConn {
+  char      info[48];// debug info: label + pConn + ahandle
+  int       sid;     // session ID
+  uint32_t  ownId;   // own link ID
+  uint32_t  peerId;  // peer link ID
+  char      user[TSDB_UNI_LEN]; // user ID for the link
+  char      spi;     // security parameter index
+  char      encrypt; // encryption, 0:1 
+  char      secret[TSDB_KEY_LEN]; // secret for the link
+  char      ckey[TSDB_KEY_LEN];   // ciphering key 
+  char      secured;              // if set to 1, no authentication
+  uint16_t  localPort;      // for UDP only
+  uint32_t  linkUid;        // connection unique ID assigned by client
+  uint32_t  peerIp;         // peer IP
+  uint16_t  peerPort;       // peer port
+  char      peerFqdn[TSDB_FQDN_LEN]; // peer FQDN or ip string
+  uint16_t  tranId;         // outgoing transcation ID, for build message
+  uint16_t  outTranId;      // outgoing transcation ID
+  uint16_t  inTranId;       // transcation ID for incoming msg
+  uint8_t   outType;        // message type for outgoing request
+  uint8_t   inType;         // message type for incoming request  
+  void     *chandle;  // handle passed by TCP/UDP connection layer
+  void     *ahandle;  // handle provided by upper app layter
+  int       retry;    // number of retry for sending request
+  int       tretry;   // total retry
+  void     *pTimer;   // retry timer to monitor the response
+  void     *pIdleTimer; // idle timer
+  char     *pRspMsg;    // response message including header
+  int       rspMsgLen;  // response messag length
+  char     *pReqMsg;    // request message including header
+  int       reqMsgLen;  // request message length
+  SRpcInfo *pRpc;       // the associated SRpcInfo
+  int8_t    connType;   // connection type
+  int64_t   lockedBy;   // lock for connection
+  SRpcReqContext *pContext; // request context
+} SRpcConn;
+
+int tsRpcMaxUdpSize = 15000;  // bytes
+int tsProgressTimer = 100;
+// not configurable
+int tsRpcMaxRetry;
+int tsRpcHeadSize;
+int tsRpcOverhead;
+
+// server:0 client:1  tcp:2 udp:0
+#define RPC_CONN_UDPS   0
+#define RPC_CONN_UDPC   1
+#define RPC_CONN_TCPS   2
+#define RPC_CONN_TCPC   3
+#define RPC_CONN_TCP    2
+
+void *(*taosInitConn[])(uint32_t ip, uint16_t port, char *label, int threads, void *fp, void *shandle) = {
+    taosInitUdpConnection,
+    taosInitUdpConnection,
+    taosInitTcpServer, 
+    taosInitTcpClient
+};
+
+void (*taosCleanUpConn[])(void *thandle) = {
+    taosCleanUpUdpConnection, 
+    taosCleanUpUdpConnection, 
+    taosCleanUpTcpServer,
+    taosCleanUpTcpClient
+};
+
+void (*taosStopConn[])(void *thandle) = {
+    taosStopUdpConnection, 
+    taosStopUdpConnection, 
+    taosStopTcpServer,
+    taosStopTcpClient,
+};
+
+int (*taosSendData[])(uint32_t ip, uint16_t port, void *data, int len, void *chandle) = {
+    taosSendUdpData, 
+    taosSendUdpData, 
+    taosSendTcpData, 
+    taosSendTcpData
+};
+
+void *(*taosOpenConn[])(void *shandle, void *thandle, uint32_t ip, uint16_t port) = {
+    taosOpenUdpConnection,
+    taosOpenUdpConnection,
+    NULL,
+    taosOpenTcpClientConnection,
+};
+
+void (*taosCloseConn[])(void *chandle) = {
+    NULL, 
+    NULL, 
+    taosCloseTcpConnection, 
+    taosCloseTcpConnection
+};
+
+static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort, int8_t connType);
+static void      rpcCloseConn(void *thandle);
+static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext);
+static SRpcConn *rpcAllocateClientConn(SRpcInfo *pRpc);
+static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv);
+static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv);
+
+static void  rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext);
+static void  rpcSendQuickRsp(SRpcConn *pConn, int32_t code);
+static void  rpcSendErrorMsgToPeer(SRecvInfo *pRecv, int32_t code);
+static void  rpcSendMsgToPeer(SRpcConn *pConn, void *data, int dataLen);
+static void  rpcSendReqHead(SRpcConn *pConn);
+
+static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv);
+static void  rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead);
+static void  rpcProcessConnError(void *param, void *id);
+static void  rpcProcessRetryTimer(void *, void *);
+static void  rpcProcessIdleTimer(void *param, void *tmrId);
+static void  rpcProcessProgressTimer(void *param, void *tmrId);
+
+static void  rpcFreeMsg(void *msg);
+static int32_t rpcCompressRpcMsg(char* pCont, int32_t contLen);
+static SRpcHead *rpcDecompressRpcMsg(SRpcHead *pHead);
+static int   rpcAddAuthPart(SRpcConn *pConn, char *msg, int msgLen);
+static int   rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen);
+static void  rpcLockConn(SRpcConn *pConn);
+static void  rpcUnlockConn(SRpcConn *pConn);
+static void  rpcAddRef(SRpcInfo *pRpc);
+static void  rpcDecRef(SRpcInfo *pRpc);
+
+void *rpcOpen(const SRpcInit *pInit) {
+  SRpcInfo *pRpc;
+
+  tsProgressTimer = tsRpcTimer/2; 
+  tsRpcMaxRetry = tsRpcMaxTime * 1000/tsProgressTimer;
+  tsRpcHeadSize = RPC_MSG_OVERHEAD; 
+  tsRpcOverhead = sizeof(SRpcReqContext);
+
+  pRpc = (SRpcInfo *)calloc(1, sizeof(SRpcInfo));
+  if (pRpc == NULL) return NULL;
+
+  if(pInit->label) tstrncpy(pRpc->label, pInit->label, sizeof(pRpc->label));
+  pRpc->connType = pInit->connType;
+  pRpc->idleTime = pInit->idleTime;
+  pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads;
+  pRpc->localPort = pInit->localPort;
+  pRpc->afp = pInit->afp;
+  pRpc->sessions = pInit->sessions+1;
+  if (pInit->user) tstrncpy(pRpc->user, pInit->user, sizeof(pRpc->user));
+  if (pInit->secret) memcpy(pRpc->secret, pInit->secret, sizeof(pRpc->secret));
+  if (pInit->ckey) tstrncpy(pRpc->ckey, pInit->ckey, sizeof(pRpc->ckey));
+  pRpc->spi = pInit->spi;
+  pRpc->cfp = pInit->cfp;
+  pRpc->afp = pInit->afp;
+  pRpc->refCount = 1;
+
+  size_t size = sizeof(SRpcConn) * pRpc->sessions;
+  pRpc->connList = (SRpcConn *)calloc(1, size);
+  if (pRpc->connList == NULL) {
+    tError("%s failed to allocate memory for taos connections, size:%ld", pRpc->label, size);
+    rpcClose(pRpc);
+    return NULL;
+  }
+
+  pRpc->idPool = taosInitIdPool(pRpc->sessions-1);
+  if (pRpc->idPool == NULL) {
+    tError("%s failed to init ID pool", pRpc->label);
+    rpcClose(pRpc);
+    return NULL;
+  }
+
+  pRpc->tmrCtrl = taosTmrInit(pRpc->sessions*2 + 1, 50, 10000, pRpc->label);
+  if (pRpc->tmrCtrl == NULL) {
+    tError("%s failed to init timers", pRpc->label);
+    rpcClose(pRpc);
+    return NULL;
+  }
+
+  if (pRpc->connType == TAOS_CONN_SERVER) {
+    pRpc->hash = taosHashInit(pRpc->sessions, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, true);
+    if (pRpc->hash == NULL) {
+      tError("%s failed to init string hash", pRpc->label);
+      rpcClose(pRpc);
+      return NULL;
+    }
+  } else {
+    pRpc->pCache = rpcOpenConnCache(pRpc->sessions, rpcCloseConn, pRpc->tmrCtrl, pRpc->idleTime); 
+    if ( pRpc->pCache == NULL ) {
+      tError("%s failed to init connection cache", pRpc->label);
+      rpcClose(pRpc);
+      return NULL;
+    }
+  }
+
+  pthread_mutex_init(&pRpc->mutex, NULL);
+
+  pRpc->tcphandle = (*taosInitConn[pRpc->connType|RPC_CONN_TCP])(0, pRpc->localPort, pRpc->label, 
+                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
+  pRpc->udphandle = (*taosInitConn[pRpc->connType])(0, pRpc->localPort, pRpc->label, 
+                                                  pRpc->numOfThreads, rpcProcessMsgFromPeer, pRpc);
+
+  if (pRpc->tcphandle == NULL || pRpc->udphandle == NULL) {
+    tError("%s failed to init network, port:%d", pRpc->label, pRpc->localPort);
+    rpcClose(pRpc);
+    return NULL;
+  }
+
+  tDebug("%s rpc is openned, threads:%d sessions:%d", pRpc->label, pRpc->numOfThreads, pInit->sessions);
+
+  return pRpc;
+}
+
+void rpcClose(void *param) {
+  SRpcInfo *pRpc = (SRpcInfo *)param;
+
+  // stop connection to outside first
+  (*taosStopConn[pRpc->connType | RPC_CONN_TCP])(pRpc->tcphandle);
+  (*taosStopConn[pRpc->connType])(pRpc->udphandle);
+
+  // close all connections 
+  for (int i = 0; i < pRpc->sessions; ++i) {
+    if (pRpc->connList && pRpc->connList[i].user[0]) {
+      rpcCloseConn((void *)(pRpc->connList + i));
+    }
+  }
+
+  // clean up
+  (*taosCleanUpConn[pRpc->connType | RPC_CONN_TCP])(pRpc->tcphandle);
+  (*taosCleanUpConn[pRpc->connType])(pRpc->udphandle);
+
+  tDebug("%s rpc is closed", pRpc->label);
+  rpcDecRef(pRpc);
+}
+
+void *rpcMallocCont(int contLen) {
+  int size = contLen + RPC_MSG_OVERHEAD;
+
+  char *start = (char *)calloc(1, (size_t)size);
+  if (start == NULL) {
+    tError("failed to malloc msg, size:%d", size);
+    return NULL;
+  } else {
+    tDebug("malloc msg: %p", start);
+  }
+
+  return start + sizeof(SRpcReqContext) + sizeof(SRpcHead);
+}
+
+void rpcFreeCont(void *cont) {
+  if (cont) {
+    char *temp = ((char *)cont) - sizeof(SRpcHead) - sizeof(SRpcReqContext);
+    free(temp);
+    tDebug("free mem: %p", temp);
+  }
+}
+
+void *rpcReallocCont(void *ptr, int contLen) {
+  if (ptr == NULL) return rpcMallocCont(contLen);
+
+  char *start = ((char *)ptr) - sizeof(SRpcReqContext) - sizeof(SRpcHead);
+  if (contLen == 0 ) {
+    free(start); 
+    return NULL;
+  }
+
+  int size = contLen + RPC_MSG_OVERHEAD;
+  start = realloc(start, size);
+  if (start == NULL) {
+    tError("failed to realloc cont, size:%d", size);
+    return NULL;
+  } 
+
+  return start + sizeof(SRpcReqContext) + sizeof(SRpcHead);
+}
+
+void rpcSendRequest(void *shandle, const SRpcEpSet *pEpSet, SRpcMsg *pMsg) {
+  SRpcInfo       *pRpc = (SRpcInfo *)shandle;
+  SRpcReqContext *pContext;
+
+  int contLen = rpcCompressRpcMsg(pMsg->pCont, pMsg->contLen);
+  pContext = (SRpcReqContext *) ((char*)pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
+  pContext->ahandle = pMsg->ahandle;
+  pContext->signature = pContext;
+  pContext->pRpc = (SRpcInfo *)shandle;
+  pContext->epSet = *pEpSet;
+  pContext->contLen = contLen;
+  pContext->pCont = pMsg->pCont;
+  pContext->msgType = pMsg->msgType;
+  pContext->oldInUse = pEpSet->inUse;
+
+  pContext->connType = RPC_CONN_UDPC; 
+  if (contLen > tsRpcMaxUdpSize) pContext->connType = RPC_CONN_TCPC;
+
+  // connection type is application specific. 
+  // for TDengine, all the query, show commands shall have TCP connection
+  char type = pMsg->msgType;
+  if (type == TSDB_MSG_TYPE_QUERY || type == TSDB_MSG_TYPE_CM_RETRIEVE
+    || type == TSDB_MSG_TYPE_FETCH || type == TSDB_MSG_TYPE_CM_STABLE_VGROUP
+    || type == TSDB_MSG_TYPE_CM_TABLES_META || type == TSDB_MSG_TYPE_CM_TABLE_META
+    || type == TSDB_MSG_TYPE_CM_SHOW )
+    pContext->connType = RPC_CONN_TCPC;
+  
+  // set the handle to pContext, so app can cancel the request
+  if (pMsg->handle) *((void **)pMsg->handle) = pContext;
+
+  rpcSendReqToServer(pRpc, pContext);
+
+  return;
+}
+
+void rpcSendResponse(const SRpcMsg *pRsp) {
+  int        msgLen = 0;
+  SRpcConn  *pConn = (SRpcConn *)pRsp->handle;
+  SRpcMsg    rpcMsg = *pRsp;
+  SRpcMsg   *pMsg = &rpcMsg;
+  SRpcInfo  *pRpc = pConn->pRpc;
+
+  if ( pMsg->pCont == NULL ) {
+    pMsg->pCont = rpcMallocCont(0);
+    pMsg->contLen = 0;
+  }
+
+  SRpcHead  *pHead = rpcHeadFromCont(pMsg->pCont);
+  char      *msg = (char *)pHead;
+
+  pMsg->contLen = rpcCompressRpcMsg(pMsg->pCont, pMsg->contLen);
+  msgLen = rpcMsgLenFromCont(pMsg->contLen);
+
+  rpcLockConn(pConn);
+
+  if ( pConn->inType == 0 || pConn->user[0] == 0 ) {
+    tDebug("%s, connection is already released, rsp wont be sent", pConn->info);
+    rpcUnlockConn(pConn);
+    rpcFreeCont(pMsg->pCont);
+    rpcDecRef(pRpc);
+    return;
+  }
+
+  // set msg header
+  pHead->version = 1;
+  pHead->msgType = pConn->inType+1;
+  pHead->spi = pConn->spi;
+  pHead->encrypt = pConn->encrypt;
+  pHead->tranId = pConn->inTranId;
+  pHead->sourceId = pConn->ownId;
+  pHead->destId = pConn->peerId;
+  pHead->linkUid = pConn->linkUid;
+  pHead->port = htons(pConn->localPort);
+  pHead->code = htonl(pMsg->code);
+  pHead->ahandle = (uint64_t) pConn->ahandle;
+ 
+  // set pConn parameters
+  pConn->inType = 0;
+
+  // response message is released until new response is sent
+  rpcFreeMsg(pConn->pRspMsg); 
+  pConn->pRspMsg = msg;
+  pConn->rspMsgLen = msgLen;
+  if (pMsg->code == TSDB_CODE_RPC_ACTION_IN_PROGRESS) pConn->inTranId--;
+
+  // stop the progress timer
+  taosTmrStopA(&pConn->pTimer);
+
+  // set the idle timer to monitor the activity
+  taosTmrReset(rpcProcessIdleTimer, pRpc->idleTime, pConn, pRpc->tmrCtrl, &pConn->pIdleTimer);
+  rpcSendMsgToPeer(pConn, msg, msgLen);
+
+  // if not set to secured, set it expcet NOT_READY case, since client wont treat it as secured
+  if (pConn->secured == 0 && pMsg->code != TSDB_CODE_RPC_NOT_READY)
+    pConn->secured = 1; // connection shall be secured
+
+  if (pConn->pReqMsg) rpcFreeCont(pConn->pReqMsg);
+  pConn->pReqMsg = NULL;
+  pConn->reqMsgLen = 0;
+
+  rpcUnlockConn(pConn);
+  rpcDecRef(pRpc);    // decrease the referene count
+
+  return;
+}
+
+void rpcSendRedirectRsp(void *thandle, const SRpcEpSet *pEpSet) {
+  SRpcMsg  rpcMsg; 
+  memset(&rpcMsg, 0, sizeof(rpcMsg));
+  
+  rpcMsg.contLen = sizeof(SRpcEpSet);
+  rpcMsg.pCont = rpcMallocCont(rpcMsg.contLen);
+  if (rpcMsg.pCont == NULL) return;
+
+  memcpy(rpcMsg.pCont, pEpSet, sizeof(SRpcEpSet));
+
+  rpcMsg.code = TSDB_CODE_RPC_REDIRECT;
+  rpcMsg.handle = thandle;
+
+  rpcSendResponse(&rpcMsg);
+
+  return;
+}
+
+int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo) {
+  SRpcConn  *pConn = (SRpcConn *)thandle;
+  if (pConn->user[0] == 0) return -1;
+
+  pInfo->clientIp = pConn->peerIp;
+  pInfo->clientPort = pConn->peerPort;
+  // pInfo->serverIp = pConn->destIp;
+
+  tstrncpy(pInfo->user, pConn->user, sizeof(pInfo->user));
+  return 0;
+}
+
+void rpcSendRecv(void *shandle, SRpcEpSet *pEpSet, SRpcMsg *pMsg, SRpcMsg *pRsp) {
+  SRpcReqContext *pContext;
+  pContext = (SRpcReqContext *) ((char*)pMsg->pCont-sizeof(SRpcHead)-sizeof(SRpcReqContext));
+
+  memset(pRsp, 0, sizeof(SRpcMsg));
+  
+  tsem_t   sem;        
+  tsem_init(&sem, 0, 0);
+  pContext->pSem = &sem;
+  pContext->pRsp = pRsp;
+  pContext->pSet = pEpSet;
+
+  rpcSendRequest(shandle, pEpSet, pMsg);
+
+  tsem_wait(&sem);
+  tsem_destroy(&sem);
+
+  return;
+}
+
+// this API is used by server app to keep an APP context in case connection is broken
+int rpcReportProgress(void *handle, char *pCont, int contLen) {
+  SRpcConn *pConn = (SRpcConn *)handle;
+  int code = 0;
+
+  rpcLockConn(pConn);
+
+  if (pConn->user[0]) {
+    // pReqMsg and reqMsgLen is re-used to store the context from app server
+    pConn->pReqMsg = pCont;     
+    pConn->reqMsgLen = contLen;
+  } else {
+    tDebug("%s, rpc connection is already released", pConn->info);
+    rpcFreeCont(pCont);
+    code = -1;
+  }
+
+  rpcUnlockConn(pConn);
+  return code;
+}
+
+void rpcCancelRequest(void *handle) {
+  SRpcReqContext *pContext = handle;
+
+  // signature is used to check if pContext is freed. 
+  // pContext may have been released just before app calls the rpcCancelRequest 
+  if (pContext == NULL || pContext->signature != pContext) return;
+
+  if (pContext->pConn) {
+    tDebug("%s, app tries to cancel request", pContext->pConn->info);
+    pContext->pConn->pReqMsg = NULL;  
+    rpcCloseConn(pContext->pConn);
+    pContext->pConn = NULL;
+    rpcFreeCont(pContext->pCont);
+  }
+}
+
+static void rpcFreeMsg(void *msg) {
+  if ( msg ) {
+    char *temp = (char *)msg - sizeof(SRpcReqContext);
+    free(temp);
+    tDebug("free msg: %p", temp);
+  }
+}
+
+static SRpcConn *rpcOpenConn(SRpcInfo *pRpc, char *peerFqdn, uint16_t peerPort, int8_t connType) {
+  SRpcConn *pConn;
+
+  uint32_t peerIp = taosGetIpFromFqdn(peerFqdn);
+  if (peerIp == 0xFFFFFFFF) {
+    tError("%s, failed to resolve FQDN:%s", pRpc->label, peerFqdn); 
+    terrno = TSDB_CODE_RPC_FQDN_ERROR; 
+    return NULL;
+  }
+
+  pConn = rpcAllocateClientConn(pRpc); 
+
+  if (pConn) { 
+    tstrncpy(pConn->peerFqdn, peerFqdn, sizeof(pConn->peerFqdn));
+    pConn->peerIp = peerIp;
+    pConn->peerPort = peerPort;
+    tstrncpy(pConn->user, pRpc->user, sizeof(pConn->user));
+    pConn->connType = connType;
+
+    if (taosOpenConn[connType]) {
+      void *shandle = (connType & RPC_CONN_TCP)? pRpc->tcphandle:pRpc->udphandle;
+      pConn->chandle = (*taosOpenConn[connType])(shandle, pConn, pConn->peerIp, pConn->peerPort);
+      if (pConn->chandle == NULL) {
+        tError("failed to connect to:0x%x:%d", pConn->peerIp, pConn->peerPort);
+
+        terrno = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+        rpcCloseConn(pConn);
+        pConn = NULL;
+      }
+    }
+  }
+
+  return pConn;
+}
+
+static void rpcReleaseConn(SRpcConn *pConn) {
+  SRpcInfo *pRpc = pConn->pRpc;
+  if (pConn->user[0] == 0) return;
+
+  pConn->user[0] = 0;
+  if (taosCloseConn[pConn->connType]) (*taosCloseConn[pConn->connType])(pConn->chandle);
+
+  taosTmrStopA(&pConn->pTimer);
+  taosTmrStopA(&pConn->pIdleTimer);
+
+  if ( pRpc->connType == TAOS_CONN_SERVER) {
+    char hashstr[40] = {0};
+    size_t size = snprintf(hashstr, sizeof(hashstr), "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
+    taosHashRemove(pRpc->hash, hashstr, size);
+    rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
+    pConn->pRspMsg = NULL;
+  
+    // if server has ever reported progress, free content
+    if (pConn->pReqMsg) rpcFreeCont(pConn->pReqMsg);  // do not use rpcFreeMsg
+  } else {
+    // if there is an outgoing message, free it
+    if (pConn->outType && pConn->pReqMsg) 
+      rpcFreeMsg(pConn->pReqMsg);
+  }
+
+  // memset could not be used, since lockeBy can not be reset
+  pConn->inType = 0;
+  pConn->outType = 0;
+  pConn->inTranId = 0;
+  pConn->outTranId = 0;
+  pConn->secured = 0;
+  pConn->peerId = 0;
+  pConn->peerIp = 0;
+  pConn->peerPort = 0;
+  pConn->pReqMsg = NULL;
+  pConn->reqMsgLen = 0;
+  pConn->pContext = NULL;
+  pConn->chandle = NULL;
+
+  taosFreeId(pRpc->idPool, pConn->sid);
+  tDebug("%s, rpc connection is released", pConn->info);
+}
+
+static void rpcCloseConn(void *thandle) {
+  SRpcConn *pConn = (SRpcConn *)thandle;
+
+  rpcLockConn(pConn);
+
+  if (pConn->user[0])
+    rpcReleaseConn(pConn);
+
+  rpcUnlockConn(pConn);
+}
+
+static SRpcConn *rpcAllocateClientConn(SRpcInfo *pRpc) {
+  SRpcConn *pConn = NULL;
+
+  int sid = taosAllocateId(pRpc->idPool);
+  if (sid <= 0) {
+    tError("%s maximum number of sessions:%d is reached", pRpc->label, pRpc->sessions);
+    terrno = TSDB_CODE_RPC_MAX_SESSIONS;
+  } else {
+    pConn = pRpc->connList + sid;
+
+    pConn->pRpc = pRpc;
+    pConn->sid = sid;
+    pConn->tranId = (uint16_t)(taosRand() & 0xFFFF);
+    pConn->ownId = htonl(pConn->sid);
+    pConn->linkUid = (uint32_t)((int64_t)pConn + (int64_t)getpid() + (int64_t)pConn->tranId);
+    pConn->spi = pRpc->spi;
+    pConn->encrypt = pRpc->encrypt;
+    if (pConn->spi) memcpy(pConn->secret, pRpc->secret, TSDB_KEY_LEN);
+    tDebug("%s %p client connection is allocated, uid:0x%x", pRpc->label, pConn, pConn->linkUid);
+  }
+
+  return pConn;
+}
+
+static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
+  SRpcConn *pConn = NULL;
+  char      hashstr[40] = {0};
+  SRpcHead *pHead = (SRpcHead *)pRecv->msg;
+
+  size_t size = snprintf(hashstr, sizeof(hashstr), "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
+ 
+  // check if it is already allocated
+  SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size));
+  if (ppConn) pConn = *ppConn;
+  if (pConn) {
+    pConn->secured = 0;
+    return pConn;
+  }
+
+  // if code is not 0, it means it is simple reqhead, just ignore
+  if (pHead->code != 0) {
+    terrno = TSDB_CODE_RPC_ALREADY_PROCESSED;
+    return NULL;
+  }
+
+  int sid = taosAllocateId(pRpc->idPool);
+  if (sid <= 0) {
+    tError("%s maximum number of sessions:%d is reached", pRpc->label, pRpc->sessions);
+    terrno = TSDB_CODE_RPC_MAX_SESSIONS;
+  } else {
+    pConn = pRpc->connList + sid;
+    memcpy(pConn->user, pHead->user, tListLen(pConn->user));
+    pConn->pRpc = pRpc;
+    pConn->sid = sid;
+    pConn->tranId = (uint16_t)(rand() & 0xFFFF);
+    pConn->ownId = htonl(pConn->sid);
+    pConn->linkUid = pHead->linkUid;
+    if (pRpc->afp) {
+      if (pConn->user[0] == 0) {
+        terrno = TSDB_CODE_RPC_AUTH_REQUIRED;
+      } else {
+        terrno = (*pRpc->afp)(pConn->user, &pConn->spi, &pConn->encrypt, pConn->secret, pConn->ckey);
+      }
+
+      if (terrno != 0) {
+        taosFreeId(pRpc->idPool, sid);  // sid shall be released
+        pConn = NULL;
+      }
+    }
+  }
+
+  if (pConn) {
+    if (pRecv->connType == RPC_CONN_UDPS && pRpc->numOfThreads > 1) {
+      // UDP server, assign to new connection
+      pRpc->index = (pRpc->index + 1) % pRpc->numOfThreads;
+      pConn->localPort = (pRpc->localPort + pRpc->index);
+    }
+
+    taosHashPut(pRpc->hash, hashstr, size, (char *)&pConn, POINTER_BYTES);
+    tDebug("%s %p server connection is allocated, uid:0x%x sid:%d key:%s", pRpc->label, pConn, pConn->linkUid, sid, hashstr);
+  }
+
+  return pConn;
+}
+
+static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) {
+  SRpcConn *pConn = NULL;  
+  SRpcHead *pHead = (SRpcHead *)pRecv->msg;
+
+  if (sid) {
+    pConn = pRpc->connList + sid;
+    if (pConn->user[0] == 0) pConn = NULL;
+  } 
+
+  if (pConn == NULL) { 
+    if (pRpc->connType == TAOS_CONN_SERVER) {
+      pConn = rpcAllocateServerConn(pRpc, pRecv);
+    } else {
+      terrno = TSDB_CODE_RPC_UNEXPECTED_RESPONSE;
+    }
+  }
+
+  if (pConn) {
+    if (pConn->linkUid != pHead->linkUid) {
+      terrno = TSDB_CODE_RPC_MISMATCHED_LINK_ID;
+      tDebug("%s %p %p, linkUid:0x%x is not matched with received:0x%x", pRpc->label, pConn, (void *)pHead->ahandle,
+             pConn->linkUid, pHead->linkUid);
+      pConn = NULL;
+    }
+  }
+
+  return pConn;
+}
+
+static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
+  SRpcConn   *pConn;
+  SRpcInfo   *pRpc = pContext->pRpc;
+  SRpcEpSet  *pEpSet = &pContext->epSet;
+
+  pConn = rpcGetConnFromCache(pRpc->pCache, pEpSet->fqdn[pEpSet->inUse], pEpSet->port[pEpSet->inUse], pContext->connType);
+  if ( pConn == NULL || pConn->user[0] == 0) {
+    pConn = rpcOpenConn(pRpc, pEpSet->fqdn[pEpSet->inUse], pEpSet->port[pEpSet->inUse], pContext->connType);
+  } 
+
+  if (pConn) {
+    pConn->tretry = 0;
+    pConn->ahandle = pContext->ahandle;
+    snprintf(pConn->info, sizeof(pConn->info), "%s %p %p", pRpc->label, pConn, pConn->ahandle);
+    pConn->tretry = 0;
+  } else {
+    tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno));
+  }
+
+  return pConn;
+}
+
+static int rpcProcessReqHead(SRpcConn *pConn, SRpcHead *pHead) {
+
+    if (pConn->peerId == 0) {
+      pConn->peerId = pHead->sourceId;
+    } else {
+      if (pConn->peerId != pHead->sourceId) {
+        tDebug("%s, source Id is changed, old:0x%08x new:0x%08x", pConn->info, 
+               pConn->peerId, pHead->sourceId);
+        return TSDB_CODE_RPC_INVALID_VALUE;
+      }
+    }
+
+    if (pConn->inTranId == pHead->tranId) {
+      if (pConn->inType == pHead->msgType) {
+        if (pHead->code == 0) {
+          tDebug("%s, %s is retransmitted", pConn->info, taosMsg[pHead->msgType]);
+          rpcSendQuickRsp(pConn, TSDB_CODE_RPC_ACTION_IN_PROGRESS);
+        } else {
+          // do nothing, it is heart beat from client
+        }
+      } else if (pConn->inType == 0) {
+        tDebug("%s, %s is already processed, tranId:%d", pConn->info, taosMsg[pHead->msgType], pConn->inTranId);
+        rpcSendMsgToPeer(pConn, pConn->pRspMsg, pConn->rspMsgLen); // resend the response
+      } else {
+        tDebug("%s, mismatched message %s and tranId", pConn->info, taosMsg[pHead->msgType]);
+      }
+
+      // do not reply any message
+      return TSDB_CODE_RPC_ALREADY_PROCESSED;
+    }
+
+    if (pConn->inType != 0) {
+      tDebug("%s, last session is not finished, inTranId:%d tranId:%d", pConn->info, 
+              pConn->inTranId, pHead->tranId);
+      return TSDB_CODE_RPC_LAST_SESSION_NOT_FINISHED;
+    }
+
+    pConn->inTranId = pHead->tranId;
+    pConn->inType = pHead->msgType;
+
+    return 0;
+}
+
+static int rpcProcessRspHead(SRpcConn *pConn, SRpcHead *pHead) {
+  SRpcInfo *pRpc = pConn->pRpc;
+  pConn->peerId = pHead->sourceId;
+
+  if (pConn->outType == 0 || pConn->pContext == NULL) {
+    return TSDB_CODE_RPC_UNEXPECTED_RESPONSE;
+  }
+
+  if (pHead->tranId != pConn->outTranId) {
+    return TSDB_CODE_RPC_INVALID_TRAN_ID;
+  }
+
+  if (pHead->msgType != pConn->outType + 1) {
+    return TSDB_CODE_RPC_INVALID_RESPONSE_TYPE;
+  }
+
+  taosTmrStopA(&pConn->pTimer);
+  pConn->retry = 0;
+
+  if (pHead->code == TSDB_CODE_RPC_AUTH_REQUIRED && pRpc->spi) {
+    tDebug("%s, authentication shall be restarted", pConn->info);
+    pConn->secured = 0;
+    rpcSendMsgToPeer(pConn, pConn->pReqMsg, pConn->reqMsgLen);      
+    if (pConn->connType != RPC_CONN_TCPC)
+      pConn->pTimer = taosTmrStart(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl);
+    return TSDB_CODE_RPC_ALREADY_PROCESSED;
+  }
+
+  if (pHead->code == TSDB_CODE_RPC_MISMATCHED_LINK_ID) {
+    tDebug("%s, mismatched linkUid, link shall be restarted", pConn->info);
+    pConn->secured = 0;
+    ((SRpcHead *)pConn->pReqMsg)->destId = 0;
+    rpcSendMsgToPeer(pConn, pConn->pReqMsg, pConn->reqMsgLen);      
+    if (pConn->connType != RPC_CONN_TCPC)
+      pConn->pTimer = taosTmrStart(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl);
+    return TSDB_CODE_RPC_ALREADY_PROCESSED;
+  }
+
+  if (pHead->code == TSDB_CODE_RPC_ACTION_IN_PROGRESS) {
+    if (pConn->tretry <= tsRpcMaxRetry) {
+      tDebug("%s, peer is still processing the transaction, retry:%d", pConn->info, pConn->tretry);
+      pConn->tretry++;
+      rpcSendReqHead(pConn);
+      if (pConn->connType != RPC_CONN_TCPC)
+        pConn->pTimer = taosTmrStart(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl);
+      return TSDB_CODE_RPC_ALREADY_PROCESSED;
+    } else {
+      // peer still in processing, give up
+      tDebug("%s, server processing takes too long time, give up", pConn->info);
+      pHead->code = TSDB_CODE_RPC_TOO_SLOW;
+    }
+  }
+
+  pConn->outType = 0;
+  pConn->pReqMsg = NULL;
+  pConn->reqMsgLen = 0;
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
+  int32_t    sid;
+  SRpcConn  *pConn = NULL;
+
+  SRpcHead *pHead = (SRpcHead *)pRecv->msg;
+
+  sid = htonl(pHead->destId);
+
+  if (pHead->msgType >= TSDB_MSG_TYPE_MAX || pHead->msgType <= 0) {
+    tDebug("%s sid:%d, invalid message type:%d", pRpc->label, sid, pHead->msgType);
+    terrno = TSDB_CODE_RPC_INVALID_MSG_TYPE; return NULL;
+  }
+
+  if (sid < 0 || sid >= pRpc->sessions) {
+    tDebug("%s sid:%d, sid is out of range, max sid:%d, %s discarded", pRpc->label, sid,
+           pRpc->sessions, taosMsg[pHead->msgType]);
+    terrno = TSDB_CODE_RPC_INVALID_SESSION_ID; return NULL;
+  }
+
+  pConn = rpcGetConnObj(pRpc, sid, pRecv);
+  if (pConn == NULL) {
+    tDebug("%s %p, failed to get connection obj(%s)", pRpc->label, (void *)pHead->ahandle, tstrerror(terrno)); 
+    return NULL;
+  } 
+
+  rpcLockConn(pConn);
+
+  if (rpcIsReq(pHead->msgType)) {
+    pConn->ahandle = (void *)pHead->ahandle;
+    snprintf(pConn->info, sizeof(pConn->info), "%s %p %p", pRpc->label, pConn, pConn->ahandle);
+  }
+
+  sid = pConn->sid;
+  if (pConn->chandle == NULL) pConn->chandle = pRecv->chandle;
+  pConn->peerIp = pRecv->ip; 
+  pConn->peerPort = pRecv->port;
+  if (pHead->port) pConn->peerPort = htons(pHead->port); 
+
+  terrno = rpcCheckAuthentication(pConn, (char *)pHead, pRecv->msgLen);
+
+  // code can be transformed only after authentication
+  pHead->code = htonl(pHead->code);
+
+  if (terrno == 0) {
+    if (pHead->encrypt) {
+      // decrypt here
+    }
+
+    if ( rpcIsReq(pHead->msgType) ) {
+      terrno = rpcProcessReqHead(pConn, pHead);
+      pConn->connType = pRecv->connType;
+
+      // stop idle timer
+      taosTmrStopA(&pConn->pIdleTimer);  
+
+      // client shall send the request within tsRpcTime again for UDP, double it 
+      if (pConn->connType != RPC_CONN_TCPS)
+        pConn->pIdleTimer = taosTmrStart(rpcProcessIdleTimer, tsRpcTimer*2, pConn, pRpc->tmrCtrl);
+    } else {
+      terrno = rpcProcessRspHead(pConn, pHead);
+    }
+  }
+
+  rpcUnlockConn(pConn);
+
+  return pConn;
+}
+
+static void rpcReportBrokenLinkToServer(SRpcConn *pConn) {
+  SRpcInfo *pRpc = pConn->pRpc;
+  if (pConn->pReqMsg == NULL) return;
+
+  // if there are pending request, notify the app
+  rpcAddRef(pRpc);
+  tDebug("%s, notify the server app, connection is gone", pConn->info);
+
+  SRpcMsg rpcMsg;
+  rpcMsg.pCont = pConn->pReqMsg;     // pReqMsg is re-used to store the APP context from server
+  rpcMsg.contLen = pConn->reqMsgLen; // reqMsgLen is re-used to store the APP context length
+  rpcMsg.ahandle = pConn->ahandle;
+  rpcMsg.handle = pConn;
+  rpcMsg.msgType = pConn->inType;
+  rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; 
+  pConn->pReqMsg = NULL;
+  pConn->reqMsgLen = 0;
+  if (pRpc->cfp) (*(pRpc->cfp))(&rpcMsg, NULL);
+}
+
+static void rpcProcessBrokenLink(SRpcConn *pConn) {
+  if (pConn == NULL) return;
+  SRpcInfo *pRpc = pConn->pRpc;
+  tDebug("%s, link is broken", pConn->info);
+
+  rpcLockConn(pConn);
+
+  if (pConn->outType) {
+    SRpcReqContext *pContext = pConn->pContext;
+    pContext->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+    pConn->pReqMsg = NULL;
+    taosTmrStart(rpcProcessConnError, 0, pContext, pRpc->tmrCtrl);
+  }
+
+  if (pConn->inType) rpcReportBrokenLinkToServer(pConn); 
+
+  rpcReleaseConn(pConn);
+  rpcUnlockConn(pConn);
+}
+
+static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv) {
+  SRpcHead  *pHead = (SRpcHead *)pRecv->msg;
+  SRpcInfo  *pRpc = (SRpcInfo *)pRecv->shandle;
+  SRpcConn  *pConn = (SRpcConn *)pRecv->thandle;
+
+  tDump(pRecv->msg, pRecv->msgLen);
+
+  // underlying UDP layer does not know it is server or client
+  pRecv->connType = pRecv->connType | pRpc->connType;  
+
+  if (pRecv->msg == NULL) {
+    rpcProcessBrokenLink(pConn);
+    return NULL;
+  }
+
+  terrno = 0;
+  pConn = rpcProcessMsgHead(pRpc, pRecv);
+
+  if (pHead->msgType >= 1 && pHead->msgType < TSDB_MSG_TYPE_MAX) {
+    tDebug("%s %p %p, %s received from 0x%x:%hu, parse code:0x%x len:%d sig:0x%08x:0x%08x:%d code:0x%x", pRpc->label,
+           pConn, (void *)pHead->ahandle, taosMsg[pHead->msgType], pRecv->ip, pRecv->port, terrno, pRecv->msgLen,
+           pHead->sourceId, pHead->destId, pHead->tranId, pHead->code);
+  } else {
+    tDebug("%s %p %p, %d received from 0x%x:%hu, parse code:0x%x len:%d sig:0x%08x:0x%08x:%d code:0x%x", pRpc->label,
+           pConn, (void *)pHead->ahandle, pHead->msgType, pRecv->ip, pRecv->port, terrno, pRecv->msgLen,
+           pHead->sourceId, pHead->destId, pHead->tranId, pHead->code);
+  }
+
+  int32_t code = terrno;
+  if (code != TSDB_CODE_RPC_ALREADY_PROCESSED) {
+    if (code != 0) { // parsing error
+      if (rpcIsReq(pHead->msgType)) {
+        rpcSendErrorMsgToPeer(pRecv, code);
+        tDebug("%s %p %p, %s is sent with error code:0x%x", pRpc->label, pConn, (void *)pHead->ahandle, taosMsg[pHead->msgType+1], code);
+      } 
+    } else { // msg is passed to app only parsing is ok 
+      rpcProcessIncomingMsg(pConn, pHead);
+    }
+  }
+
+  if (code) rpcFreeMsg(pRecv->msg); // parsing failed, msg shall be freed
+  return pConn;
+}
+
+static void rpcNotifyClient(SRpcReqContext *pContext, SRpcMsg *pMsg) {
+  SRpcInfo       *pRpc = pContext->pRpc;
+
+  pContext->signature = NULL;
+  pContext->pConn = NULL;
+  if (pContext->pRsp) { 
+    // for synchronous API
+    memcpy(pContext->pSet, &pContext->epSet, sizeof(SRpcEpSet));
+    memcpy(pContext->pRsp, pMsg, sizeof(SRpcMsg));
+    tsem_post(pContext->pSem);
+  } else {
+    // for asynchronous API 
+    SRpcEpSet *pEpSet = NULL;
+    if (pContext->epSet.inUse != pContext->oldInUse || pContext->redirect) 
+      pEpSet = &pContext->epSet;  
+
+    (*pRpc->cfp)(pMsg, pEpSet);  
+  }
+
+  // free the request message
+  rpcFreeCont(pContext->pCont); 
+}
+
+static void rpcProcessIncomingMsg(SRpcConn *pConn, SRpcHead *pHead) {
+
+  SRpcInfo *pRpc = pConn->pRpc;
+  SRpcMsg   rpcMsg;
+
+  pHead = rpcDecompressRpcMsg(pHead);
+  rpcMsg.contLen = rpcContLenFromMsg(pHead->msgLen);
+  rpcMsg.pCont = pHead->content;
+  rpcMsg.msgType = pHead->msgType;
+  rpcMsg.code = pHead->code; 
+  rpcMsg.ahandle = pConn->ahandle;
+   
+  if ( rpcIsReq(pHead->msgType) ) {
+    if (rpcMsg.contLen > 0) {
+      rpcMsg.handle = pConn;
+      rpcAddRef(pRpc);  // add the refCount for requests
+
+      // start the progress timer to monitor the response from server app
+      if (pConn->connType != RPC_CONN_TCPS) 
+        pConn->pTimer = taosTmrStart(rpcProcessProgressTimer, tsProgressTimer, pConn, pRpc->tmrCtrl);
+ 
+      // notify the server app
+      (*(pRpc->cfp))(&rpcMsg, NULL);
+    } else {
+      tDebug("%s, message body is empty, ignore", pConn->info);
+      rpcFreeCont(rpcMsg.pCont);
+    }
+  } else {
+    // it's a response
+    SRpcReqContext *pContext = pConn->pContext;
+    rpcMsg.handle = pContext;
+    pConn->pContext = NULL;
+    pConn->pReqMsg = NULL;
+
+    // for UDP, port may be changed by server, the port in epSet shall be used for cache
+    if (pHead->code != TSDB_CODE_RPC_TOO_SLOW) {
+      rpcAddConnIntoCache(pRpc->pCache, pConn, pConn->peerFqdn, pContext->epSet.port[pContext->epSet.inUse], pConn->connType);    
+    } else {
+      rpcCloseConn(pConn);
+    }
+
+    if (pHead->code == TSDB_CODE_RPC_REDIRECT) { 
+      if (rpcMsg.contLen < sizeof(SRpcEpSet)) {
+        // if EpSet is not included in the msg, treat it as NOT_READY
+        pHead->code = TSDB_CODE_RPC_NOT_READY; 
+      } else {
+        pContext->redirect++;
+        if (pContext->redirect > TSDB_MAX_REPLICA) {
+          pHead->code = TSDB_CODE_RPC_NETWORK_UNAVAIL; 
+          tWarn("%s, too many redirects, quit", pConn->info);
+        }
+      }
+    }
+
+    if (pHead->code == TSDB_CODE_RPC_REDIRECT) {
+      pContext->numOfTry = 0;
+      SRpcEpSet *pEpSet = (SRpcEpSet*)pHead->content;
+      if (pEpSet->numOfEps > 0) {
+        memcpy(&pContext->epSet, pHead->content, sizeof(pContext->epSet));
+        tDebug("%s, redirect is received, numOfEps:%d", pConn->info, pContext->epSet.numOfEps);
+        for (int i=0; i<pContext->epSet.numOfEps; ++i) 
+          pContext->epSet.port[i] = htons(pContext->epSet.port[i]);
+      }
+      rpcSendReqToServer(pRpc, pContext);
+      rpcFreeCont(rpcMsg.pCont);
+    } else if (pHead->code == TSDB_CODE_RPC_NOT_READY || pHead->code == TSDB_CODE_APP_NOT_READY) {
+      pContext->code = pHead->code;
+      rpcProcessConnError(pContext, NULL);
+      rpcFreeCont(rpcMsg.pCont);
+    } else {
+      rpcNotifyClient(pContext, &rpcMsg);
+    }
+  }
+}
+
+static void rpcSendQuickRsp(SRpcConn *pConn, int32_t code) {
+  char       msg[RPC_MSG_OVERHEAD];
+  SRpcHead  *pHead;
+
+  // set msg header
+  memset(msg, 0, sizeof(SRpcHead));
+  pHead = (SRpcHead *)msg;
+  pHead->version = 1;
+  pHead->msgType = pConn->inType+1;
+  pHead->spi = pConn->spi;
+  pHead->encrypt = 0;
+  pHead->tranId = pConn->inTranId;
+  pHead->sourceId = pConn->ownId;
+  pHead->destId = pConn->peerId;
+  pHead->linkUid = pConn->linkUid;
+  pHead->ahandle = (uint64_t)pConn->ahandle;
+  memcpy(pHead->user, pConn->user, tListLen(pHead->user));
+  pHead->code = htonl(code);
+
+  rpcSendMsgToPeer(pConn, msg, sizeof(SRpcHead));
+  pConn->secured = 1; // connection shall be secured
+}
+
+static void rpcSendReqHead(SRpcConn *pConn) {
+  char       msg[RPC_MSG_OVERHEAD];
+  SRpcHead  *pHead;
+
+  // set msg header
+  memset(msg, 0, sizeof(SRpcHead));
+  pHead = (SRpcHead *)msg;
+  pHead->version = 1;
+  pHead->msgType = pConn->outType;
+  pHead->spi = pConn->spi;
+  pHead->encrypt = 0;
+  pHead->tranId = pConn->outTranId;
+  pHead->sourceId = pConn->ownId;
+  pHead->destId = pConn->peerId;
+  pHead->linkUid = pConn->linkUid;
+  pHead->ahandle = (uint64_t)pConn->ahandle;
+  memcpy(pHead->user, pConn->user, tListLen(pHead->user));
+  pHead->code = 1;
+
+  rpcSendMsgToPeer(pConn, msg, sizeof(SRpcHead));
+}
+
+static void rpcSendErrorMsgToPeer(SRecvInfo *pRecv, int32_t code) {
+  SRpcHead  *pRecvHead, *pReplyHead;
+  char       msg[sizeof(SRpcHead) + sizeof(SRpcDigest) + sizeof(uint32_t) ];
+  uint32_t   timeStamp;
+  int        msgLen;
+
+  pRecvHead = (SRpcHead *)pRecv->msg;
+  pReplyHead = (SRpcHead *)msg;
+
+  memset(msg, 0, sizeof(SRpcHead));
+  pReplyHead->version = pRecvHead->version;
+  pReplyHead->msgType = (char)(pRecvHead->msgType + 1);
+  pReplyHead->spi = 0;
+  pReplyHead->encrypt = pRecvHead->encrypt;
+  pReplyHead->tranId = pRecvHead->tranId;
+  pReplyHead->sourceId = pRecvHead->destId;
+  pReplyHead->destId = pRecvHead->sourceId;
+  pReplyHead->linkUid = pRecvHead->linkUid;
+  pReplyHead->ahandle = pRecvHead->ahandle;
+
+  pReplyHead->code = htonl(code);
+  msgLen = sizeof(SRpcHead);
+
+  if (code == TSDB_CODE_RPC_INVALID_TIME_STAMP) {
+    // include a time stamp if client's time is not synchronized well
+    uint8_t *pContent = pReplyHead->content;
+    timeStamp = htonl(taosGetTimestampSec());
+    memcpy(pContent, &timeStamp, sizeof(timeStamp));
+    msgLen += sizeof(timeStamp);
+  }
+
+  pReplyHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
+  (*taosSendData[pRecv->connType])(pRecv->ip, pRecv->port, msg, msgLen, pRecv->chandle);
+
+  return; 
+}
+
+static void rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext) {
+  SRpcHead  *pHead = rpcHeadFromCont(pContext->pCont);
+  char      *msg = (char *)pHead;
+  int        msgLen = rpcMsgLenFromCont(pContext->contLen);
+  char       msgType = pContext->msgType;
+
+  pContext->numOfTry++;
+  SRpcConn *pConn = rpcSetupConnToServer(pContext);
+  if (pConn == NULL) {
+    pContext->code = terrno;
+    taosTmrStart(rpcProcessConnError, 0, pContext, pRpc->tmrCtrl);
+    return;
+  }
+
+  pContext->pConn = pConn;
+  pConn->ahandle = pContext->ahandle;
+  rpcLockConn(pConn);
+
+  // set the message header  
+  pHead->version = 1;
+  pHead->msgType = msgType;
+  pHead->encrypt = 0;
+  pConn->tranId++;
+  if ( pConn->tranId == 0 ) pConn->tranId++;
+  pHead->tranId = pConn->tranId;
+  pHead->sourceId = pConn->ownId;
+  pHead->destId = pConn->peerId;
+  pHead->port = 0;
+  pHead->linkUid = pConn->linkUid;
+  pHead->ahandle = (uint64_t)pConn->ahandle;
+  memcpy(pHead->user, pConn->user, tListLen(pHead->user));
+
+  // set the connection parameters
+  pConn->outType = msgType;
+  pConn->outTranId = pHead->tranId;
+  pConn->pReqMsg = msg;
+  pConn->reqMsgLen = msgLen;
+  pConn->pContext = pContext;
+
+  rpcSendMsgToPeer(pConn, msg, msgLen);
+  if (pConn->connType != RPC_CONN_TCPC)
+    taosTmrReset(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl, &pConn->pTimer);
+
+  rpcUnlockConn(pConn);
+}
+
+static void rpcSendMsgToPeer(SRpcConn *pConn, void *msg, int msgLen) {
+  int        writtenLen = 0;
+  SRpcHead  *pHead = (SRpcHead *)msg;
+
+  msgLen = rpcAddAuthPart(pConn, msg, msgLen);
+
+  if ( rpcIsReq(pHead->msgType)) {
+    tDebug("%s, %s is sent to %s:%hu, len:%d sig:0x%08x:0x%08x:%d",
+           pConn->info, taosMsg[pHead->msgType], pConn->peerFqdn, pConn->peerPort, 
+           msgLen, pHead->sourceId, pHead->destId, pHead->tranId);
+  } else {
+    if (pHead->code == 0) pConn->secured = 1; // for success response, set link as secured
+    tDebug("%s, %s is sent to 0x%x:%hu, code:0x%x len:%d sig:0x%08x:0x%08x:%d",
+           pConn->info, taosMsg[pHead->msgType], pConn->peerIp, pConn->peerPort, 
+           htonl(pHead->code), msgLen, pHead->sourceId, pHead->destId, pHead->tranId);
+  }
+
+  //tTrace("connection type is: %d", pConn->connType);
+  writtenLen = (*taosSendData[pConn->connType])(pConn->peerIp, pConn->peerPort, pHead, msgLen, pConn->chandle);
+
+  if (writtenLen != msgLen) {
+    tError("%s, failed to send, msgLen:%d written:%d, reason:%s", pConn->info, msgLen, writtenLen, strerror(errno));
+  }
+ 
+  tDump(msg, msgLen);
+}
+
+static void rpcProcessConnError(void *param, void *id) {
+  SRpcReqContext *pContext = (SRpcReqContext *)param;
+  SRpcInfo       *pRpc = pContext->pRpc;
+  SRpcMsg         rpcMsg;
+ 
+  if (pRpc == NULL) {
+    return;
+  }
+  
+  tDebug("%s %p, connection error happens", pRpc->label, pContext->ahandle);
+
+  if (pContext->numOfTry >= pContext->epSet.numOfEps) {
+    rpcMsg.msgType = pContext->msgType+1;
+    rpcMsg.ahandle = pContext->ahandle;
+    rpcMsg.code = pContext->code;
+    rpcMsg.pCont = NULL;
+    rpcMsg.contLen = 0;
+
+    rpcNotifyClient(pContext, &rpcMsg);
+  } else {
+    // move to next IP 
+    pContext->epSet.inUse++;
+    pContext->epSet.inUse = pContext->epSet.inUse % pContext->epSet.numOfEps;
+    rpcSendReqToServer(pRpc, pContext);
+  }
+}
+
+static void rpcProcessRetryTimer(void *param, void *tmrId) {
+  SRpcConn *pConn = (SRpcConn *)param;
+  SRpcInfo *pRpc = pConn->pRpc;
+
+  rpcLockConn(pConn);
+
+  if (pConn->outType && pConn->user[0]) {
+    tDebug("%s, expected %s is not received", pConn->info, taosMsg[(int)pConn->outType + 1]);
+    pConn->pTimer = NULL;
+    pConn->retry++;
+
+    if (pConn->retry < 4) {
+      tDebug("%s, re-send msg:%s to %s:%hu", pConn->info, taosMsg[pConn->outType], pConn->peerFqdn, pConn->peerPort);
+      rpcSendMsgToPeer(pConn, pConn->pReqMsg, pConn->reqMsgLen);      
+      pConn->pTimer = taosTmrStart(rpcProcessRetryTimer, tsRpcTimer, pConn, pRpc->tmrCtrl);
+    } else {
+      // close the connection
+      tDebug("%s, failed to send msg:%s to %s:%hu", pConn->info, taosMsg[pConn->outType], pConn->peerFqdn, pConn->peerPort);
+      if (pConn->pContext) {
+        pConn->pContext->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+        pConn->pReqMsg = NULL;
+        taosTmrStart(rpcProcessConnError, 0, pConn->pContext, pRpc->tmrCtrl);
+        rpcReleaseConn(pConn);
+      }
+    }
+  } else {
+    tDebug("%s, retry timer not processed", pConn->info);
+  }
+
+  rpcUnlockConn(pConn);
+}
+
+static void rpcProcessIdleTimer(void *param, void *tmrId) {
+  SRpcConn *pConn = (SRpcConn *)param;
+
+  rpcLockConn(pConn);
+
+  if (pConn->user[0]) {
+    tDebug("%s, close the connection since no activity", pConn->info);
+    if (pConn->inType) rpcReportBrokenLinkToServer(pConn); 
+    rpcReleaseConn(pConn);
+  } else {
+    tDebug("%s, idle timer:%p not processed", pConn->info, tmrId);
+  }
+
+  rpcUnlockConn(pConn);
+}
+
+static void rpcProcessProgressTimer(void *param, void *tmrId) {
+  SRpcConn *pConn = (SRpcConn *)param;
+  SRpcInfo *pRpc = pConn->pRpc;
+
+  rpcLockConn(pConn);
+
+  if (pConn->inType && pConn->user[0]) {
+    tDebug("%s, progress timer expired, send progress", pConn->info);
+    rpcSendQuickRsp(pConn, TSDB_CODE_RPC_ACTION_IN_PROGRESS);
+    pConn->pTimer = taosTmrStart(rpcProcessProgressTimer, tsProgressTimer, pConn, pRpc->tmrCtrl);
+  } else {
+    tDebug("%s, progress timer:%p not processed", pConn->info, tmrId);
+  }
+
+  rpcUnlockConn(pConn);
+}
+
+static int32_t rpcCompressRpcMsg(char* pCont, int32_t contLen) {
+  SRpcHead  *pHead = rpcHeadFromCont(pCont);
+  int32_t    finalLen = 0;
+  int        overhead = sizeof(SRpcComp);
+  
+  if (!NEEDTO_COMPRESSS_MSG(contLen)) {
+    return contLen;
+  }
+  
+  char *buf = malloc (contLen + overhead + 8);  // 8 extra bytes
+  if (buf == NULL) {
+    tError("failed to allocate memory for rpc msg compression, contLen:%d", contLen);
+    return contLen;
+  }
+  
+  int32_t compLen = LZ4_compress_default(pCont, buf, contLen, contLen + overhead);
+  tDebug("compress rpc msg, before:%d, after:%d, overhead:%d", contLen, compLen, overhead);
+  
+  /*
+   * only the compressed size is less than the value of contLen - overhead, the compression is applied
+   * The first four bytes is set to 0, the second four bytes are utilized to keep the original length of message
+   */
+  if (compLen < contLen - overhead) {
+    SRpcComp *pComp = (SRpcComp *)pCont;
+    pComp->reserved = 0; 
+    pComp->contLen = htonl(contLen); 
+    memcpy(pCont + overhead, buf, compLen);
+    
+    pHead->comp = 1;
+    tDebug("compress rpc msg, before:%d, after:%d", contLen, compLen);
+    finalLen = compLen + overhead;
+  } else {
+    finalLen = contLen;
+  }
+
+  free(buf);
+  return finalLen;
+}
+
+static SRpcHead *rpcDecompressRpcMsg(SRpcHead *pHead) {
+  int overhead = sizeof(SRpcComp);
+  SRpcHead   *pNewHead = NULL;  
+  uint8_t    *pCont = pHead->content;
+  SRpcComp   *pComp = (SRpcComp *)pHead->content;
+
+  if (pHead->comp) {
+    // decompress the content
+    assert(pComp->reserved == 0);
+    int contLen = htonl(pComp->contLen);
+  
+    // prepare the temporary buffer to decompress message
+    char *temp = (char *)malloc(contLen + RPC_MSG_OVERHEAD);
+    pNewHead = (SRpcHead *)(temp + sizeof(SRpcReqContext)); // reserve SRpcReqContext
+  
+    if (pNewHead) {
+      int compLen = rpcContLenFromMsg(pHead->msgLen) - overhead;
+      int origLen = LZ4_decompress_safe((char*)(pCont + overhead), (char *)pNewHead->content, compLen, contLen);
+      assert(origLen == contLen);
+    
+      memcpy(pNewHead, pHead, sizeof(SRpcHead));
+      pNewHead->msgLen = rpcMsgLenFromCont(origLen);
+      rpcFreeMsg(pHead); // free the compressed message buffer
+      pHead = pNewHead; 
+      //tTrace("decompress rpc msg, compLen:%d, after:%d", compLen, contLen);
+    } else {
+      tError("failed to allocate memory to decompress msg, contLen:%d", contLen);
+    }
+  }
+
+  return pHead;
+}
+
+static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) {
+  MD5_CTX context;
+  int     ret = -1;
+
+  MD5Init(&context);
+  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  MD5Update(&context, (uint8_t *)pMsg, msgLen);
+  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  MD5Final(&context);
+
+  if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0;
+
+  return ret;
+}
+
+static void rpcBuildAuthHead(void *pMsg, int msgLen, void *pAuth, void *pKey) {
+  MD5_CTX context;
+
+  MD5Init(&context);
+  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  MD5Update(&context, (uint8_t *)pMsg, msgLen);
+  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  MD5Final(&context);
+
+  memcpy(pAuth, context.digest, sizeof(context.digest));
+}
+
+static int rpcAddAuthPart(SRpcConn *pConn, char *msg, int msgLen) {
+  SRpcHead *pHead = (SRpcHead *)msg;
+
+  if (pConn->spi && pConn->secured == 0) {
+    // add auth part
+    pHead->spi = pConn->spi;
+    SRpcDigest *pDigest = (SRpcDigest *)(msg + msgLen);
+    pDigest->timeStamp = htonl(taosGetTimestampSec());
+    msgLen += sizeof(SRpcDigest);
+    pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
+    rpcBuildAuthHead(pHead, msgLen - TSDB_AUTH_LEN, pDigest->auth, pConn->secret);
+  } else {
+    pHead->spi = 0;
+    pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
+  }
+
+  return msgLen;
+}
+
+static int rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen) {
+  SRpcHead *pHead = (SRpcHead *)msg;
+  int       code = 0;
+
+  if ((pConn->secured && pHead->spi == 0) || (pHead->spi == 0 && pConn->spi == 0)){
+    // secured link, or no authentication 
+    pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
+    // tTrace("%s, secured link, no auth is required", pConn->info);
+    return 0;
+  }
+
+  if ( !rpcIsReq(pHead->msgType) ) {
+    // for response, if code is auth failure, it shall bypass the auth process
+    code = htonl(pHead->code);
+    if (code == TSDB_CODE_RPC_INVALID_TIME_STAMP || code == TSDB_CODE_RPC_AUTH_FAILURE ||
+        code == TSDB_CODE_RPC_AUTH_REQUIRED || code == TSDB_CODE_MND_INVALID_USER || code == TSDB_CODE_RPC_NOT_READY) {
+      pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
+      // tTrace("%s, dont check authentication since code is:0x%x", pConn->info, code);
+      return 0;
+    }
+  }
+ 
+  code = 0;
+  if (pHead->spi == pConn->spi) {
+    // authentication
+    SRpcDigest *pDigest = (SRpcDigest *)((char *)pHead + msgLen - sizeof(SRpcDigest));
+
+    int32_t delta;
+    delta = (int32_t)htonl(pDigest->timeStamp);
+    delta -= (int32_t)taosGetTimestampSec();
+    if (abs(delta) > 900) {
+      tWarn("%s, time diff:%d is too big, msg discarded", pConn->info, delta);
+      code = TSDB_CODE_RPC_INVALID_TIME_STAMP;
+    } else {
+      if (rpcAuthenticateMsg(pHead, msgLen-TSDB_AUTH_LEN, pDigest->auth, pConn->secret) < 0) {
+        tDebug("%s, authentication failed, msg discarded", pConn->info);
+        code = TSDB_CODE_RPC_AUTH_FAILURE;
+      } else {
+        pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen) - sizeof(SRpcDigest);
+        if ( !rpcIsReq(pHead->msgType) ) pConn->secured = 1;  // link is secured for client
+        // tTrace("%s, message is authenticated", pConn->info);
+      }
+    }
+  } else {
+    tDebug("%s, auth spi:%d not matched with received:%d", pConn->info, pConn->spi, pHead->spi);
+    code = pHead->spi ? TSDB_CODE_RPC_AUTH_FAILURE : TSDB_CODE_RPC_AUTH_REQUIRED;
+  }
+
+  return code;
+}
+
+static void rpcLockConn(SRpcConn *pConn) {
+  int64_t tid = taosGetPthreadId();
+  int     i = 0;
+  while (atomic_val_compare_exchange_64(&(pConn->lockedBy), 0, tid) != 0) {
+    if (++i % 1000 == 0) {
+      sched_yield();
+    }
+  }
+}
+
+static void rpcUnlockConn(SRpcConn *pConn) {
+  int64_t tid = taosGetPthreadId();
+  if (atomic_val_compare_exchange_64(&(pConn->lockedBy), tid, 0) != tid) {
+    assert(false);
+  }
+}
+
+static void rpcAddRef(SRpcInfo *pRpc)
+{  
+   atomic_add_fetch_32(&pRpc->refCount, 1);
+}
+
+static void rpcDecRef(SRpcInfo *pRpc)
+{ 
+  if (atomic_sub_fetch_32(&pRpc->refCount, 1) == 0) {
+    rpcCloseConnCache(pRpc->pCache);
+    taosHashCleanup(pRpc->hash);
+    taosTmrCleanUp(pRpc->tmrCtrl);
+    taosIdPoolCleanUp(pRpc->idPool);
+
+    taosTFree(pRpc->connList);
+    pthread_mutex_destroy(&pRpc->mutex);
+    tDebug("%s rpc resources are released", pRpc->label);
+    taosTFree(pRpc);
+  }
+}
+
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a3facdb36c0b5ea71aa4b3140245f06404f8bea
--- /dev/null
+++ b/src/rpc/src/rpcTcp.c
@@ -0,0 +1,581 @@
+/*
+ * 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 "os.h"
+#include "tsocket.h"
+#include "tutil.h"
+#include "taosdef.h"
+#include "taoserror.h" 
+#include "rpcLog.h"
+#include "rpcHead.h"
+#include "rpcTcp.h"
+#ifdef WINDOWS
+#include "wepoll.h"
+#endif
+
+#ifndef EPOLLWAKEUP
+  #define EPOLLWAKEUP (1u << 29)
+#endif
+
+typedef struct SFdObj {
+  void              *signature;
+  SOCKET             fd;          // TCP socket FD
+  int                closedByApp; // 1: already closed by App
+  void              *thandle;     // handle from upper layer, like TAOS
+  uint32_t           ip;
+  uint16_t           port;
+  struct SThreadObj *pThreadObj;
+  struct SFdObj     *prev;
+  struct SFdObj     *next;
+} SFdObj;
+
+typedef struct SThreadObj {
+  pthread_t       thread;
+  SFdObj *        pHead;
+  pthread_mutex_t mutex;
+  uint32_t        ip;
+  bool            stop;
+  SOCKET          pollFd;
+  int             numOfFds;
+  int             threadId;
+  char            label[TSDB_LABEL_LEN];
+  void           *shandle;  // handle passed by upper layer during server initialization
+  void           *(*processData)(SRecvInfo *pPacket);
+} SThreadObj;
+
+typedef struct {
+  SOCKET      fd;
+  uint32_t    ip;
+  uint16_t    port;
+  char        label[TSDB_LABEL_LEN];
+  int         numOfThreads;
+  void *      shandle;
+  SThreadObj *pThreadObj;
+  pthread_t   thread;
+} SServerObj;
+
+static void   *taosProcessTcpData(void *param);
+static SFdObj *taosMallocFdObj(SThreadObj *pThreadObj, SOCKET fd);
+static void    taosFreeFdObj(SFdObj *pFdObj);
+static void    taosReportBrokenLink(SFdObj *pFdObj);
+static void   *taosAcceptTcpConnection(void *arg);
+
+void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) {
+  SServerObj *pServerObj;
+  SThreadObj *pThreadObj;
+
+  pServerObj = (SServerObj *)calloc(sizeof(SServerObj), 1);
+  if (pServerObj == NULL) {
+    tError("TCP:%s no enough memory", label);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    return NULL;
+  }
+
+  pServerObj->fd = -1;
+  taosResetPthread(&pServerObj->thread);
+  pServerObj->ip = ip;
+  pServerObj->port = port;
+  tstrncpy(pServerObj->label, label, sizeof(pServerObj->label));
+  pServerObj->numOfThreads = numOfThreads;
+
+  pServerObj->pThreadObj = (SThreadObj *)calloc(sizeof(SThreadObj), numOfThreads);
+  if (pServerObj->pThreadObj == NULL) {
+    tError("TCP:%s no enough memory", label);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    free(pServerObj);
+    return NULL;
+  }
+
+  int code = 0;
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+
+  // initialize parameters in case it may encounter error later 
+  pThreadObj = pServerObj->pThreadObj;
+  for (int i = 0; i < numOfThreads; ++i) {
+    pThreadObj->pollFd = -1;
+    taosResetPthread(&pThreadObj->thread);
+    pThreadObj->processData = fp;
+    tstrncpy(pThreadObj->label, label, sizeof(pThreadObj->label));
+    pThreadObj->shandle = shandle;
+    pThreadObj++;
+  }
+
+  // initialize mutex, thread, fd which may fail
+  pThreadObj = pServerObj->pThreadObj;
+  for (int i = 0; i < numOfThreads; ++i) {
+    code = pthread_mutex_init(&(pThreadObj->mutex), NULL);
+    if (code < 0) {
+      tError("%s failed to init TCP process data mutex(%s)", label, strerror(errno));
+      break;
+    }
+
+    pThreadObj->pollFd = (int64_t)epoll_create(10);  // size does not matter
+    if (pThreadObj->pollFd < 0) {
+      tError("%s failed to create TCP epoll", label);
+      code = -1;
+      break;
+    }
+
+    code = pthread_create(&(pThreadObj->thread), &thattr, taosProcessTcpData, (void *)(pThreadObj));
+    if (code != 0) {
+      tError("%s failed to create TCP process data thread(%s)", label, strerror(errno));
+      break;
+    }
+
+    pThreadObj->threadId = i;
+    pThreadObj++;
+  }
+
+  pServerObj->fd = taosOpenTcpServerSocket(pServerObj->ip, pServerObj->port);
+  if (pServerObj->fd < 0) code = -1; 
+
+  if (code == 0) { 
+    code = pthread_create(&pServerObj->thread, &thattr, taosAcceptTcpConnection, (void *)pServerObj);
+    if (code != 0) {
+      tError("%s failed to create TCP accept thread(%s)", label, strerror(errno));
+    }
+  }
+
+  if (code != 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    taosCleanUpTcpServer(pServerObj);
+    pServerObj = NULL;
+  } else {
+    tDebug("%s TCP server is initialized, ip:0x%x port:%hu numOfThreads:%d", label, ip, port, numOfThreads);
+  }
+
+  pthread_attr_destroy(&thattr);
+  return (void *)pServerObj;
+}
+
+static void taosStopTcpThread(SThreadObj* pThreadObj) {
+  pThreadObj->stop = true;
+  eventfd_t fd = -1;
+
+  if (taosCheckPthreadValid(pThreadObj->thread) && pThreadObj->pollFd >= 0) {
+    // signal the thread to stop, try graceful method first,
+    // and use pthread_cancel when failed
+    struct epoll_event event = { .events = EPOLLIN };
+    fd = eventfd(1, 0);
+    if (fd == -1) {
+      // failed to create eventfd, call pthread_cancel instead, which may result in data corruption:
+      tError("%s, failed to create eventfd(%s)", pThreadObj->label, strerror(errno));
+      pThreadObj->stop = true;
+      pthread_cancel(pThreadObj->thread);
+    } else if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
+      // failed to call epoll_ctl, call pthread_cancel instead, which may result in data corruption:
+      tError("%s, failed to call epoll_ctl(%s)", pThreadObj->label, strerror(errno));
+      pthread_cancel(pThreadObj->thread);
+    }
+  }
+
+  if (taosCheckPthreadValid(pThreadObj->thread)) pthread_join(pThreadObj->thread, NULL);
+  if (pThreadObj->pollFd >=0) taosCloseSocket(pThreadObj->pollFd);
+  if (fd != -1) taosCloseSocket(fd);
+
+  while (pThreadObj->pHead) {
+    SFdObj *pFdObj = pThreadObj->pHead;
+    pThreadObj->pHead = pFdObj->next;
+    taosFreeFdObj(pFdObj);
+  }
+}
+
+void taosStopTcpServer(void *handle) {
+  SServerObj *pServerObj = handle;
+
+  if (pServerObj == NULL) return;
+  if(pServerObj->fd >=0) shutdown(pServerObj->fd, SHUT_RD);
+  if (taosCheckPthreadValid(pServerObj->thread)) pthread_join(pServerObj->thread, NULL);
+
+  tDebug("%s TCP server is stopped", pServerObj->label);
+}
+
+void taosCleanUpTcpServer(void *handle) {
+  SServerObj *pServerObj = handle;
+  SThreadObj *pThreadObj;
+  if (pServerObj == NULL) return;
+
+  for (int i = 0; i < pServerObj->numOfThreads; ++i) {
+    pThreadObj = pServerObj->pThreadObj + i;
+    taosStopTcpThread(pThreadObj);
+    pthread_mutex_destroy(&(pThreadObj->mutex));
+  }
+
+  tDebug("%s TCP server is cleaned up", pServerObj->label);
+
+  taosTFree(pServerObj->pThreadObj);
+  taosTFree(pServerObj);
+}
+
+static void *taosAcceptTcpConnection(void *arg) {
+  SOCKET             connFd = -1;
+  struct sockaddr_in caddr;
+  int                threadId = 0;
+  SThreadObj        *pThreadObj;
+  SServerObj        *pServerObj;
+
+  pServerObj = (SServerObj *)arg;
+  tDebug("%s TCP server is ready, ip:0x%x:%hu", pServerObj->label, pServerObj->ip, pServerObj->port);
+
+  while (1) {
+    socklen_t addrlen = sizeof(caddr);
+    connFd = accept(pServerObj->fd, (struct sockaddr *)&caddr, &addrlen);
+    if (connFd == -1) {
+      if (errno == EINVAL) {
+        tDebug("%s TCP server stop accepting new connections, exiting", pServerObj->label);
+        break;
+      }
+
+      tError("%s TCP accept failure(%s)", pServerObj->label, strerror(errno));
+      continue;
+    }
+
+    taosKeepTcpAlive(connFd);
+    struct timeval to={1, 0};
+    taosSetSockOpt(connFd, SOL_SOCKET, SO_RCVTIMEO, &to, sizeof(to));
+
+    // pick up the thread to handle this connection
+    pThreadObj = pServerObj->pThreadObj + threadId;
+
+    SFdObj *pFdObj = taosMallocFdObj(pThreadObj, connFd);
+    if (pFdObj) {
+      pFdObj->ip = caddr.sin_addr.s_addr;
+      pFdObj->port = htons(caddr.sin_port);
+      tDebug("%s new TCP connection from %s:%hu, fd:%d FD:%p numOfFds:%d", pServerObj->label, 
+              taosInetNtoa(caddr.sin_addr), pFdObj->port, connFd, pFdObj, pThreadObj->numOfFds);
+    } else {
+      taosCloseSocket(connFd);
+      tError("%s failed to malloc FdObj(%s) for connection from:%s:%hu", pServerObj->label, strerror(errno),
+             taosInetNtoa(caddr.sin_addr), htons(caddr.sin_port));
+    }  
+
+    // pick up next thread for next connection
+    threadId++;
+    threadId = threadId % pServerObj->numOfThreads;
+  }
+
+  taosCloseSocket(pServerObj->fd);
+  return NULL;
+}
+
+void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *fp, void *shandle) {
+  SThreadObj    *pThreadObj;
+  pthread_attr_t thattr;
+
+  pThreadObj = (SThreadObj *)malloc(sizeof(SThreadObj));
+  memset(pThreadObj, 0, sizeof(SThreadObj));
+  tstrncpy(pThreadObj->label, label, sizeof(pThreadObj->label));
+  pThreadObj->ip = ip;
+  pThreadObj->shandle = shandle;
+
+  if (pthread_mutex_init(&(pThreadObj->mutex), NULL) < 0) {
+    tError("%s failed to init TCP client mutex(%s)", label, strerror(errno));
+    free(pThreadObj);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    return NULL;
+  }
+
+  pThreadObj->pollFd = (SOCKET)epoll_create(10);  // size does not matter
+  if (pThreadObj->pollFd < 0) {
+    tError("%s failed to create TCP client epoll", label);
+    free(pThreadObj);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    return NULL;
+  }
+
+  pThreadObj->processData = fp;
+
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  int code = pthread_create(&(pThreadObj->thread), &thattr, taosProcessTcpData, (void *)(pThreadObj));
+  pthread_attr_destroy(&thattr);
+  if (code != 0) {
+    taosCloseSocket(pThreadObj->pollFd);
+    free(pThreadObj);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    tError("%s failed to create TCP read data thread(%s)", label, strerror(errno));
+    return NULL;
+  }
+
+  tDebug("%s TCP client is initialized, ip:%u:%hu", label, ip, port);
+
+  return pThreadObj;
+}
+
+void taosStopTcpClient(void *chandle) {
+  SThreadObj *pThreadObj = chandle;
+  if (pThreadObj == NULL) return;
+
+  tDebug ("%s TCP client is stopped", pThreadObj->label);
+}
+
+void taosCleanUpTcpClient(void *chandle) {
+  SThreadObj *pThreadObj = chandle;
+  if (pThreadObj == NULL) return;
+
+  taosStopTcpThread(pThreadObj);
+  tDebug ("%s TCP client is cleaned up", pThreadObj->label);
+
+  taosTFree(pThreadObj);
+}
+
+void *taosOpenTcpClientConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port) {
+  SThreadObj *    pThreadObj = shandle;
+
+  SOCKET fd = taosOpenTcpClientSocket(ip, port, pThreadObj->ip);
+  if (fd < 0) return NULL;
+
+  struct sockaddr_in sin;
+  uint16_t localPort = 0;
+  unsigned int addrlen = sizeof(sin);
+  if (getsockname(fd, (struct sockaddr *)&sin, &addrlen) == 0 &&
+      sin.sin_family == AF_INET && addrlen == sizeof(sin)) {
+    localPort = (uint16_t)ntohs(sin.sin_port);
+  }
+
+  SFdObj *pFdObj = taosMallocFdObj(pThreadObj, fd);
+  
+  if (pFdObj) {
+    pFdObj->thandle = thandle;
+    pFdObj->port = port;
+    pFdObj->ip = ip;
+    tDebug("%s %p TCP connection to 0x%x:%hu is created, localPort:%hu FD:%p numOfFds:%d", 
+            pThreadObj->label, thandle, ip, port, localPort, pFdObj, pThreadObj->numOfFds);
+  } else {
+    taosCloseSocket(fd);
+    tError("%s failed to malloc client FdObj(%s)", pThreadObj->label, strerror(errno));
+  }
+
+  return pFdObj;
+}
+
+void taosCloseTcpConnection(void *chandle) {
+  SFdObj *pFdObj = chandle;
+  if (pFdObj == NULL) return;
+
+  SThreadObj *pThreadObj = pFdObj->pThreadObj;
+  tDebug("%s %p TCP connection will be closed, FD:%p", pThreadObj->label, pFdObj->thandle, pFdObj); 
+
+  // pFdObj->thandle = NULL;
+  pFdObj->closedByApp = 1;
+  shutdown(pFdObj->fd, SHUT_WR);
+}
+
+int taosSendTcpData(uint32_t ip, uint16_t port, void *data, int len, void *chandle) {
+  SFdObj *pFdObj = chandle;
+
+  if (chandle == NULL) return -1;
+
+  return taosWriteMsg(pFdObj->fd, data, len);
+}
+
+static void taosReportBrokenLink(SFdObj *pFdObj) {
+
+  SThreadObj *pThreadObj = pFdObj->pThreadObj;
+
+  // notify the upper layer, so it will clean the associated context
+  if (pFdObj->closedByApp == 0) {
+    shutdown(pFdObj->fd, SHUT_WR);
+
+    SRecvInfo recvInfo;
+    recvInfo.msg = NULL;
+    recvInfo.msgLen = 0;
+    recvInfo.ip = 0;
+    recvInfo.port = 0;
+    recvInfo.shandle = pThreadObj->shandle;
+    recvInfo.thandle = pFdObj->thandle;
+    recvInfo.chandle = NULL;
+    recvInfo.connType = RPC_CONN_TCP;
+    (*(pThreadObj->processData))(&recvInfo);
+  } 
+
+  taosFreeFdObj(pFdObj);
+}
+
+static int taosReadTcpData(SFdObj *pFdObj, SRecvInfo *pInfo) {
+  SRpcHead    rpcHead;
+  int32_t     msgLen, leftLen, retLen, headLen;
+  char       *buffer, *msg;
+
+  SThreadObj *pThreadObj = pFdObj->pThreadObj;
+
+  headLen = taosReadMsg(pFdObj->fd, &rpcHead, sizeof(SRpcHead));
+  if (headLen != sizeof(SRpcHead)) {
+    tDebug("%s %p read error, headLen:%d", pThreadObj->label, pFdObj->thandle, headLen);
+    return -1; 
+  }
+
+  msgLen = (int32_t)htonl((uint32_t)rpcHead.msgLen);
+  buffer = malloc(msgLen + tsRpcOverhead);
+  if (NULL == buffer) {
+    tError("%s %p TCP malloc(size:%d) fail", pThreadObj->label, pFdObj->thandle, msgLen);
+    return -1;
+  } else {
+    tDebug("TCP malloc mem: %p", buffer);
+  }
+
+  msg = buffer + tsRpcOverhead;
+  leftLen = msgLen - headLen;
+  retLen = taosReadMsg(pFdObj->fd, msg + headLen, leftLen);
+
+  if (leftLen != retLen) {
+    tError("%s %p read error, leftLen:%d retLen:%d FD:%p", 
+            pThreadObj->label, pFdObj->thandle, leftLen, retLen, pFdObj);
+    free(buffer);
+    return -1;
+  }
+
+  memcpy(msg, &rpcHead, sizeof(SRpcHead));
+  
+  pInfo->msg = msg;
+  pInfo->msgLen = msgLen;
+  pInfo->ip = pFdObj->ip;
+  pInfo->port = pFdObj->port;
+  pInfo->shandle = pThreadObj->shandle;
+  pInfo->thandle = pFdObj->thandle;
+  pInfo->chandle = pFdObj;
+  pInfo->connType = RPC_CONN_TCP;
+
+  if (pFdObj->closedByApp) {
+    free(buffer); 
+    return -1;
+  }
+
+  return 0;
+}
+
+#define maxEvents 10
+
+static void *taosProcessTcpData(void *param) {
+  SThreadObj        *pThreadObj = param;
+  SFdObj            *pFdObj;
+  struct epoll_event events[maxEvents];
+  SRecvInfo          recvInfo;
+ 
+  while (1) {
+    int fdNum = epoll_wait(pThreadObj->pollFd, events, maxEvents, TAOS_EPOLL_WAIT_TIME);
+    if (pThreadObj->stop) {
+      tDebug("%s TCP thread get stop event, exiting...", pThreadObj->label);
+      break;
+    }
+    if (fdNum < 0) continue;
+
+    for (int i = 0; i < fdNum; ++i) {
+      pFdObj = events[i].data.ptr;
+
+      if (events[i].events & EPOLLERR) {
+        tDebug("%s %p FD:%p epoll errors", pThreadObj->label, pFdObj->thandle, pFdObj);
+        taosReportBrokenLink(pFdObj);
+        continue;
+      }
+
+      if (events[i].events & EPOLLRDHUP) {
+        tDebug("%s %p FD:%p RD hang up", pThreadObj->label, pFdObj->thandle, pFdObj);
+        taosReportBrokenLink(pFdObj);
+        continue;
+      }
+
+      if (events[i].events & EPOLLHUP) {
+        tDebug("%s %p FD:%p hang up", pThreadObj->label, pFdObj->thandle, pFdObj);
+        taosReportBrokenLink(pFdObj);
+        continue;
+      }
+
+      if (taosReadTcpData(pFdObj, &recvInfo) < 0) {
+        shutdown(pFdObj->fd, SHUT_WR); 
+        continue;
+      }
+
+      pFdObj->thandle = (*(pThreadObj->processData))(&recvInfo);
+      if (pFdObj->thandle == NULL) taosFreeFdObj(pFdObj);
+    }
+  }
+
+  return NULL;
+}
+
+static SFdObj *taosMallocFdObj(SThreadObj *pThreadObj, SOCKET fd) {
+  struct epoll_event event;
+
+  SFdObj *pFdObj = (SFdObj *)calloc(sizeof(SFdObj), 1);
+  if (pFdObj == NULL) {
+    return NULL;
+  }
+
+  pFdObj->closedByApp = 0;
+  pFdObj->fd = fd;
+  pFdObj->pThreadObj = pThreadObj;
+  pFdObj->signature = pFdObj;
+
+  event.events = EPOLLIN | EPOLLRDHUP;
+  event.data.ptr = pFdObj;
+  if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
+    taosTFree(pFdObj);
+    terrno = TAOS_SYSTEM_ERROR(errno); 
+    return NULL;
+  }
+
+  // notify the data process, add into the FdObj list
+  pthread_mutex_lock(&(pThreadObj->mutex));
+  pFdObj->next = pThreadObj->pHead;
+  if (pThreadObj->pHead) (pThreadObj->pHead)->prev = pFdObj;
+  pThreadObj->pHead = pFdObj;
+  pThreadObj->numOfFds++;
+  pthread_mutex_unlock(&(pThreadObj->mutex));
+
+  return pFdObj;
+}
+
+static void taosFreeFdObj(SFdObj *pFdObj) {
+
+  if (pFdObj == NULL) return;
+  if (pFdObj->signature != pFdObj) return;
+
+  SThreadObj *pThreadObj = pFdObj->pThreadObj;
+  pthread_mutex_lock(&pThreadObj->mutex);
+
+  if (pFdObj->signature == NULL) {
+    pthread_mutex_unlock(&pThreadObj->mutex);
+    return;
+  }
+
+  pFdObj->signature = NULL;
+  epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
+  taosCloseSocket(pFdObj->fd);
+
+  pThreadObj->numOfFds--;
+  if (pThreadObj->numOfFds < 0)
+    tError("%s %p TCP thread:%d, number of FDs is negative!!!", 
+            pThreadObj->label, pFdObj->thandle, pThreadObj->threadId);
+
+  if (pFdObj->prev) {
+    (pFdObj->prev)->next = pFdObj->next;
+  } else {
+    pThreadObj->pHead = pFdObj->next;
+  }
+
+  if (pFdObj->next) {
+    (pFdObj->next)->prev = pFdObj->prev;
+  }
+
+  pthread_mutex_unlock(&pThreadObj->mutex);
+
+  tDebug("%s %p TCP connection is closed, FD:%p numOfFds:%d", 
+          pThreadObj->label, pFdObj->thandle, pFdObj, pThreadObj->numOfFds);
+
+  taosTFree(pFdObj);
+}
diff --git a/src/rpc/src/rpcUdp.c b/src/rpc/src/rpcUdp.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e24aed8f789f03ef324c05922c38ecefe747256
--- /dev/null
+++ b/src/rpc/src/rpcUdp.c
@@ -0,0 +1,251 @@
+/*
+ * 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 "os.h"
+#include "tsocket.h"
+#include "tsystem.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "rpcLog.h"
+#include "rpcUdp.h"
+#include "rpcHead.h"
+
+#define RPC_MAX_UDP_CONNS 256
+#define RPC_MAX_UDP_PKTS 1000
+#define RPC_UDP_BUF_TIME 5  // mseconds
+#define RPC_MAX_UDP_SIZE 65480
+
+typedef struct {
+  int             index;
+  SOCKET          fd;
+  uint16_t        port;       // peer port
+  uint16_t        localPort;  // local port
+  char            label[TSDB_LABEL_LEN];  // copy from udpConnSet;
+  pthread_t       thread;
+  void           *hash;
+  void           *shandle;  // handle passed by upper layer during server initialization
+  void           *pSet;
+  void         *(*processData)(SRecvInfo *pRecv);
+  char           *buffer;  // buffer to receive data
+} SUdpConn;
+
+typedef struct {
+  int       index;
+  int       server;
+  uint32_t  ip;       // local IP
+  uint16_t  port;     // local Port
+  void     *shandle;  // handle passed by upper layer during server initialization
+  int       threads;
+  char      label[TSDB_LABEL_LEN];
+  void     *(*fp)(SRecvInfo *pPacket);
+  SUdpConn  udpConn[];
+} SUdpConnSet;
+
+static void *taosRecvUdpData(void *param);
+
+void *taosInitUdpConnection(uint32_t ip, uint16_t port, char *label, int threads, void *fp, void *shandle) {
+  SUdpConn    *pConn;
+  SUdpConnSet *pSet;
+
+  int size = (int)sizeof(SUdpConnSet) + threads * (int)sizeof(SUdpConn);
+  pSet = (SUdpConnSet *)malloc((size_t)size);
+  if (pSet == NULL) {
+    tError("%s failed to allocate UdpConn", label);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  memset(pSet, 0, (size_t)size);
+  pSet->ip = ip;
+  pSet->port = port;
+  pSet->shandle = shandle;
+  pSet->fp = fp;
+  pSet->threads = threads;
+  tstrncpy(pSet->label, label, sizeof(pSet->label));
+
+  pthread_attr_t thAttr;
+  pthread_attr_init(&thAttr);
+  pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+
+  int i;
+  uint16_t ownPort;
+  for (i = 0; i < threads; ++i) {
+    pConn = pSet->udpConn + i;
+    ownPort = (port ? port + i : 0);
+    pConn->fd = taosOpenUdpSocket(ip, ownPort);
+    if (pConn->fd < 0) {
+      tError("%s failed to open UDP socket %x:%hu", label, ip, port);
+      break;
+    }
+
+    pConn->buffer = malloc(RPC_MAX_UDP_SIZE);
+    if (NULL == pConn->buffer) {
+      tError("%s failed to malloc recv buffer", label);
+      break;
+    }
+
+    struct sockaddr_in sin;
+    unsigned int addrlen = sizeof(sin);
+    if (getsockname(pConn->fd, (struct sockaddr *)&sin, &addrlen) == 0 && 
+        sin.sin_family == AF_INET && addrlen == sizeof(sin)) {
+      pConn->localPort = (uint16_t)ntohs(sin.sin_port);
+    }
+
+    tstrncpy(pConn->label, label, sizeof(pConn->label));
+    pConn->shandle = shandle;
+    pConn->processData = fp;
+    pConn->index = i;
+    pConn->pSet = pSet;
+
+    int code = pthread_create(&pConn->thread, &thAttr, taosRecvUdpData, pConn);
+    if (code != 0) {
+      tError("%s failed to create thread to process UDP data(%s)", label, strerror(errno));
+      break;
+    }
+  }
+
+  pthread_attr_destroy(&thAttr);
+
+  if (i != threads) { 
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    taosCleanUpUdpConnection(pSet);
+    return NULL;
+  }
+
+  tDebug("%s UDP connection is initialized, ip:%x:%hu threads:%d", label, ip, port, threads);
+  return pSet;
+}
+
+void taosStopUdpConnection(void *handle) {
+  SUdpConnSet *pSet = (SUdpConnSet *)handle;
+  SUdpConn    *pConn;
+
+  if (pSet == NULL) return;
+
+  for (int i = 0; i < pSet->threads; ++i) {
+    pConn = pSet->udpConn + i;
+    if (pConn->fd >=0) shutdown(pConn->fd, SHUT_RDWR);
+    if (pConn->fd >=0) taosCloseSocket(pConn->fd);
+  }
+
+  for (int i = 0; i < pSet->threads; ++i) {
+    pConn = pSet->udpConn + i;
+    if (taosCheckPthreadValid(pConn->thread)) {
+      pthread_join(pConn->thread, NULL);
+    }
+    taosTFree(pConn->buffer);
+    // tTrace("%s UDP thread is closed, index:%d", pConn->label, i);
+  }
+
+  tDebug("%s UDP is stopped", pSet->label);
+}
+
+void taosCleanUpUdpConnection(void *handle) {
+  SUdpConnSet *pSet = (SUdpConnSet *)handle;
+  SUdpConn    *pConn;
+
+  if (pSet == NULL) return;
+
+  for (int i = 0; i < pSet->threads; ++i) {
+    pConn = pSet->udpConn + i;
+    if (pConn->fd >=0) taosCloseSocket(pConn->fd);
+  }
+
+  tDebug("%s UDP is cleaned up", pSet->label);
+  taosTFree(pSet);
+}
+
+void *taosOpenUdpConnection(void *shandle, void *thandle, uint32_t ip, uint16_t port) {
+  SUdpConnSet *pSet = (SUdpConnSet *)shandle;
+
+  pSet->index = (pSet->index + 1) % pSet->threads;
+
+  SUdpConn *pConn = pSet->udpConn + pSet->index;
+  pConn->port = port;
+
+  tDebug("%s UDP connection is setup, ip:%x:%hu localPort:%hu", pConn->label, ip, port, pConn->localPort);
+
+  return pConn;
+}
+
+static void *taosRecvUdpData(void *param) {
+  SUdpConn          *pConn = param;
+  struct sockaddr_in sourceAdd;
+  ssize_t            dataLen;
+  unsigned int       addLen;
+  uint16_t           port;
+  SRecvInfo          recvInfo;
+
+  memset(&sourceAdd, 0, sizeof(sourceAdd));
+  addLen = sizeof(sourceAdd);
+  tDebug("%s UDP thread is created, index:%d", pConn->label, pConn->index);
+  char *msg = pConn->buffer;
+
+  while (1) {
+    dataLen = recvfrom(pConn->fd, pConn->buffer, RPC_MAX_UDP_SIZE, 0, (struct sockaddr *)&sourceAdd, &addLen);
+    if(dataLen <= 0) {
+      tDebug("%s UDP socket was closed, exiting(%s)", pConn->label, strerror(errno));
+      break;
+    }
+
+    port = ntohs(sourceAdd.sin_port);
+
+    if (dataLen < sizeof(SRpcHead)) {
+      tError("%s recvfrom failed(%s)", pConn->label, strerror(errno));
+      continue;
+    }
+
+    char *tmsg = malloc(dataLen + tsRpcOverhead);
+    if (NULL == tmsg) {
+      tError("%s failed to allocate memory, size:%ld", pConn->label, dataLen);
+      continue;
+    } else {
+      tDebug("UDP malloc mem: %p", tmsg);
+    }
+
+    tmsg += tsRpcOverhead;  // overhead for SRpcReqContext
+    memcpy(tmsg, msg, dataLen);
+    recvInfo.msg = tmsg;
+    recvInfo.msgLen = dataLen;
+    recvInfo.ip = sourceAdd.sin_addr.s_addr;
+    recvInfo.port = port;
+    recvInfo.shandle = pConn->shandle;
+    recvInfo.thandle = NULL;
+    recvInfo.chandle = pConn;
+    recvInfo.connType = 0;
+    (*(pConn->processData))(&recvInfo);
+  }
+
+  return NULL;
+}
+
+int taosSendUdpData(uint32_t ip, uint16_t port, void *data, int dataLen, void *chandle) {
+  SUdpConn *pConn = (SUdpConn *)chandle;
+
+  if (pConn == NULL) return -1;
+
+  struct sockaddr_in destAdd;
+  memset(&destAdd, 0, sizeof(destAdd));
+  destAdd.sin_family = AF_INET;
+  destAdd.sin_addr.s_addr = ip;
+  destAdd.sin_port = htons(port);
+
+  int ret = (int)taosSendto(pConn->fd, data, (size_t)dataLen, 0, (struct sockaddr *)&destAdd, sizeof(destAdd));
+
+  return ret;
+}
+
diff --git a/src/rpc/src/thaship.c b/src/rpc/src/thaship.c
deleted file mode 100644
index 6b76c4b59e236418c408fabaac5c717cbbafcc55..0000000000000000000000000000000000000000
--- a/src/rpc/src/thaship.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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 "os.h"
-#include "tlog.h"
-#include "tmempool.h"
-
-typedef struct _ip_hash_t {
-  uint32_t           ip;
-  uint16_t           port;
-  int                hash;
-  struct _ip_hash_t *prev;
-  struct _ip_hash_t *next;
-  void *             data;
-} SIpHash;
-
-typedef struct {
-  SIpHash **ipHashList;
-  mpool_h   ipHashMemPool;
-  int       maxSessions;
-} SHashObj;
-
-int taosHashIp(void *handle, uint32_t ip, uint16_t port) {
-  SHashObj *pObj = (SHashObj *)handle;
-  int       hash = 0;
-
-  hash = (int)(ip >> 16);
-  hash += (unsigned short)(ip & 0xFFFF);
-  hash += port;
-
-  hash = hash % pObj->maxSessions;
-
-  return hash;
-}
-
-void *taosAddIpHash(void *handle, void *data, uint32_t ip, uint16_t port) {
-  int       hash;
-  SIpHash * pNode;
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = taosHashIp(pObj, ip, port);
-  pNode = (SIpHash *)taosMemPoolMalloc(pObj->ipHashMemPool);
-  pNode->ip = ip;
-  pNode->port = port;
-  pNode->data = data;
-  pNode->prev = 0;
-  pNode->next = pObj->ipHashList[hash];
-  pNode->hash = hash;
-
-  if (pObj->ipHashList[hash] != 0) (pObj->ipHashList[hash])->prev = pNode;
-  pObj->ipHashList[hash] = pNode;
-
-  return pObj;
-}
-
-void taosDeleteIpHash(void *handle, uint32_t ip, uint16_t port) {
-  int       hash;
-  SIpHash * pNode;
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  hash = taosHashIp(pObj, ip, port);
-
-  pNode = pObj->ipHashList[hash];
-  while (pNode) {
-    if (pNode->ip == ip && pNode->port == port) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->ipHashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    taosMemPoolFree(pObj->ipHashMemPool, (char *)pNode);
-  }
-}
-
-void *taosGetIpHash(void *handle, uint32_t ip, uint16_t port) {
-  int       hash;
-  SIpHash * pNode;
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = taosHashIp(pObj, ip, port);
-  pNode = pObj->ipHashList[hash];
-
-  while (pNode) {
-    if (pNode->ip == ip && pNode->port == port) {
-      break;
-    }
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    return pNode->data;
-  }
-  return NULL;
-}
-
-void *taosOpenIpHash(int maxSessions) {
-  SIpHash **ipHashList;
-  mpool_h   ipHashMemPool;
-  SHashObj *pObj;
-
-  ipHashMemPool = taosMemPoolInit(maxSessions, sizeof(SIpHash));
-  if (ipHashMemPool == 0) return NULL;
-
-  ipHashList = calloc(sizeof(SIpHash *), (size_t)maxSessions);
-  if (ipHashList == 0) {
-    taosMemPoolCleanUp(ipHashMemPool);
-    return NULL;
-  }
-
-  pObj = malloc(sizeof(SHashObj));
-  if (pObj == NULL) {
-    taosMemPoolCleanUp(ipHashMemPool);
-    free(ipHashList);
-    return NULL;
-  }
-
-  pObj->maxSessions = maxSessions;
-  pObj->ipHashMemPool = ipHashMemPool;
-  pObj->ipHashList = ipHashList;
-
-  return pObj;
-}
-
-void taosCloseIpHash(void *handle) {
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  if (pObj->ipHashMemPool) taosMemPoolCleanUp(pObj->ipHashMemPool);
-
-  if (pObj->ipHashList) free(pObj->ipHashList);
-
-  memset(pObj, 0, sizeof(SHashObj));
-  free(pObj);
-}
diff --git a/src/rpc/src/tmsghdr.c b/src/rpc/src/tmsghdr.c
deleted file mode 100644
index a46f182b1d21b31e08c040b4990e74a27971b46e..0000000000000000000000000000000000000000
--- a/src/rpc/src/tmsghdr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 "os.h"
-
-void taosFreeMsgHdr(void *hdr) {
-  struct msghdr *msgHdr = (struct msghdr *)hdr;
-  free(msgHdr->msg_iov);
-}
-
-int taosMsgHdrSize(void *hdr) {
-  struct msghdr *msgHdr = (struct msghdr *)hdr;
-  return (int)msgHdr->msg_iovlen;
-}
-
-void taosSendMsgHdr(void *hdr, int fd) {
-  struct msghdr *msgHdr = (struct msghdr *)hdr;
-  sendmsg(fd, msgHdr, 0);
-  msgHdr->msg_iovlen = 0;
-}
-
-void taosInitMsgHdr(void **hdr, void *dest, int maxPkts) {
-  struct msghdr *msgHdr = (struct msghdr *)malloc(sizeof(struct msghdr));
-  memset(msgHdr, 0, sizeof(struct msghdr));
-  *hdr = msgHdr;
-  struct sockaddr_in *destAdd = (struct sockaddr_in *)dest;
-
-  msgHdr->msg_name = destAdd;
-  msgHdr->msg_namelen = sizeof(struct sockaddr_in);
-  int size = (int)sizeof(struct iovec) * maxPkts;
-  msgHdr->msg_iov = (struct iovec *)malloc((size_t)size);
-  memset(msgHdr->msg_iov, 0, (size_t)size);
-}
-
-void taosSetMsgHdrData(void *hdr, char *data, int dataLen) {
-  struct msghdr *msgHdr = (struct msghdr *)hdr;
-  msgHdr->msg_iov[msgHdr->msg_iovlen].iov_base = data;
-  msgHdr->msg_iov[msgHdr->msg_iovlen].iov_len = (size_t)dataLen;
-  msgHdr->msg_iovlen++;
-}
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
deleted file mode 100755
index 87506861b1a660fa7745012a45120942a2772ec4..0000000000000000000000000000000000000000
--- a/src/rpc/src/trpc.c
+++ /dev/null
@@ -1,1499 +0,0 @@
-/*
- * 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 "os.h"
-#include "shash.h"
-#include "taosmsg.h"
-#include "tidpool.h"
-#include "tlog.h"
-#include "tmd5.h"
-#include "tmempool.h"
-#include "trpc.h"
-#include "tsdb.h"
-#include "tsocket.h"
-#include "ttcpclient.h"
-#include "ttcpserver.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tudp.h"
-#include "tutil.h"
-#include "lz4.h"
-
-typedef struct _msg_node {
-  struct _msg_node *next;
-  void *            ahandle;
-  int               msgLen;
-} SMsgNode;
-
-typedef struct {
-  void *   signature;
-  int      chann;   // channel ID
-  int      sid;     // session ID
-  uint32_t ownId;   // own link ID
-  uint32_t peerId;  // peer link ID
-  char     meterId[TSDB_UNI_LEN];
-  char     spi;
-  char     encrypt;
-  uint8_t  secret[TSDB_KEY_LEN];
-  uint8_t  ckey[TSDB_KEY_LEN];
-  uint16_t           localPort;      // for UDP only
-  uint32_t           peerUid;
-  uint32_t           peerIp;         // peer IP
-  uint16_t           peerPort;       // peer port
-  char               peerIpstr[20];  // peer IP string
-  uint16_t           tranId;         // outgoing transcation ID, for build message
-  uint16_t           outTranId;      // outgoing transcation ID
-  uint16_t           inTranId;
-  uint8_t            outType;
-  char               inType;
-  char               closing;
-  char               rspReceived;
-  void *             chandle;  // handle passed by TCP/UDP connection layer
-  void *             ahandle;  // handle returned by upper app layter
-  int                retry;
-  int                tretry;   // total retry
-  void *             pTimer;
-  void *             pIdleTimer;
-  char *             pRspMsg;
-  char *             pQuickRsp;
-  int                rspMsgLen;
-  SMsgNode *         pMsgNode;
-  SMsgNode *         pHead, *pTail;
-  struct rpc_server *pServer;
-} SRpcConn;
-
-typedef struct {
-  int             sessions;
-  void *          qhandle; // for scheduler
-  SRpcConn *      connList;
-  void *          idPool;
-  void *          tmrCtrl;
-  void *          hash;
-  pthread_mutex_t mutex;
-} SRpcChann;
-
-typedef struct rpc_server {
-  void *shandle;  // returned handle from lower layer during initialization
-  void *qhandle;  // for scheduler
-  int   bits;     // number of bits for session ID
-  int   mask;
-  int   numOfChanns;
-  int   numOfThreads;
-  int   idMgmt;   // ID management method
-  int   type;
-  int   idleTime; // milliseconds;
-  int   noFree;   // do not free the request msg when rsp is received
-  int   index;    // for UDP server, next thread for new connection
-  uint16_t localPort;
-  char  label[12];
-  void *(*fp)(char *, void *ahandle, void *thandle);
-  void (*efp)(int);                                                                     // FP to report error
-  int (*afp)(char *meterId, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey);  // FP to retrieve auth info
-  SRpcChann *channList;
-} STaosRpc;
-
-int tsRpcProgressTime = 10;  // milliseocnds
-
-// not configurable
-int tsRpcMaxRetry;
-int tsRpcHeadSize;
-
-void *(*taosInitConn[])(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) = {
-    taosInitUdpServer, taosInitUdpClient, taosInitTcpServer, taosInitTcpClient};
-
-void (*taosCleanUpConn[])(void *thandle) = {taosCleanUpUdpConnection, taosCleanUpUdpConnection, taosCleanUpTcpServer,
-                                            taosCleanUpTcpClient};
-
-int (*taosSendData[])(uint32_t ip, uint16_t port, char *data, int len, void *chandle) = {
-    taosSendUdpData, taosSendUdpData, taosSendTcpServerData, taosSendTcpClientData};
-
-void *(*taosOpenConn[])(void *shandle, void *thandle, char *ip, uint16_t port) = {
-    taosOpenUdpConnection,
-    taosOpenUdpConnection,
-    NULL,
-    taosOpenTcpClientConnection,
-};
-
-void (*taosCloseConn[])(void *chandle) = {NULL, NULL, taosCloseTcpServerConnection, taosCloseTcpClientConnection};
-
-int   taosReSendRspToPeer(SRpcConn *pConn);
-void  taosProcessTaosTimer(void *, void *);
-void *taosProcessDataFromPeer(char *data, int dataLen, uint32_t ip, uint16_t port, void *shandle, void *thandle,
-                              void *chandle);
-int   taosSendDataToPeer(SRpcConn *pConn, char *data, int dataLen);
-void  taosProcessSchedMsg(SSchedMsg *pMsg);
-int   taosAuthenticateMsg(uint8_t *pMsg, int msgLen, uint8_t *pAuth, uint8_t *pKey);
-int   taosBuildAuthHeader(uint8_t *pMsg, int msgLen, uint8_t *pAuth, uint8_t *pKey);
-
-static int32_t taosCompressRpcMsg(char* pCont, int32_t contLen) {
-  STaosHeader* pHeader = (STaosHeader *)(pCont - sizeof(STaosHeader));
-  int32_t overhead = sizeof(int32_t) * 2;
-  int32_t finalLen = 0;
-  
-  if (!NEEDTO_COMPRESSS_MSG(contLen)) {
-    return contLen;
-  }
-  
-  char *buf = malloc (contLen + overhead + 8);  // 16 extra bytes
-  if (buf == NULL) {
-    tError("failed to allocate memory for rpc msg compression, contLen:%d, reason:%s", contLen, strerror(errno));
-    return contLen;
-  }
-  
-  int32_t compLen = LZ4_compress_default(pCont, buf, contLen, contLen + overhead);
-  
-  /*
-   * only the compressed size is less than the value of contLen - overhead, the compression is applied
-   * The first four bytes is set to 0, the second four bytes are utilized to keep the original length of message
-   */
-  if (compLen < contLen - overhead) {
-    //tDump(pCont, contLen);
-    int32_t *pLen = (int32_t *)pCont;
-    
-    *pLen = 0;    // first 4 bytes must be zero
-    pLen = (int32_t *)(pCont + sizeof(int32_t));
-    
-    *pLen = htonl(contLen); // contLen is encoded in second 4 bytes
-    memcpy(pCont + overhead, buf, compLen);
-    
-    pHeader->comp = 1;
-    tTrace("compress rpc msg, before:%d, after:%d", contLen, compLen);
-    
-    finalLen = compLen + overhead;
-    //tDump(pCont, contLen);
-  } else {
-    finalLen = contLen;
-  }
-
-  free(buf);
-  return finalLen;
-}
-
-static STaosHeader* taosDecompressRpcMsg(STaosHeader* pHeader, SSchedMsg* pSchedMsg, int32_t msgLen) {
-  int overhead = sizeof(int32_t) * 2;
-  
-  if (pHeader->comp == 0) {
-    pSchedMsg->msg = (char *)(&(pHeader->destId));
-    return pHeader;
-  }
-  
-  // decompress the content
-  assert(GET_INT32_VAL(pHeader->content) == 0);
-  
-  // contLen is original message length before compression applied
-  int contLen = htonl(GET_INT32_VAL(pHeader->content + sizeof(int32_t)));
-  
-  // prepare the temporary buffer to decompress message
-  char *buf = malloc(sizeof(STaosHeader) + contLen);
-  
-  //tDump(pHeader->content, msgLen);
-  
-  if (buf) {
-    int32_t originalLen = LZ4_decompress_safe((const char*)(pHeader->content + overhead), buf + sizeof(STaosHeader),
-        msgLen - overhead, contLen);
-    
-    memcpy(buf, pHeader, sizeof(STaosHeader));
-    free(pHeader); // free the compressed message buffer
-  
-    STaosHeader* pNewHeader = (STaosHeader *) buf;
-    pNewHeader->msgLen = originalLen + (int) sizeof(SIntMsg);
-    assert(originalLen == contLen);
-
-    pSchedMsg->msg = (char *)(&(pNewHeader->destId));
-    //tDump(pHeader->content, contLen);
-    return pNewHeader;
-  } else {
-    tError("failed to allocate memory to decompress msg, contLen:%d, reason:%s", contLen, strerror(errno));
-    pSchedMsg->msg = NULL;
-  }
-
-  return NULL;
-}
-
-char *taosBuildReqHeader(void *param, char type, char *msg) {
-  STaosHeader *pHeader;
-  SRpcConn *   pConn = (SRpcConn *)param;
-
-  if (pConn == NULL || pConn->signature != pConn) {
-    tError("pConn:%p, connection has to be openned first before building a message", pConn);
-    return NULL;
-  }
-
-  pHeader = (STaosHeader *)(msg + sizeof(SMsgNode));
-  memset(pHeader, 0, sizeof(STaosHeader));
-  pHeader->version = 1;
-  pHeader->comp = 0;
-  pHeader->msgType = type;
-  pHeader->spi = 0;
-  pHeader->tcp = 0;
-  pHeader->encrypt = 0;
-  pHeader->tranId = atomic_add_fetch_16(&pConn->tranId, 1);
-  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_16(&pConn->tranId, 1);
-
-  pHeader->sourceId = pConn->ownId;
-  pHeader->destId = pConn->peerId;
-  pHeader->port = 0;
-
-  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
-
-  memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
-
-  return (char *)pHeader->content;
-}
-
-char *taosBuildReqMsgWithSize(void *param, char type, int size) {
-  STaosHeader *pHeader;
-  char *       pMsg;
-  SRpcConn *   pConn = (SRpcConn *)param;
-
-  if (pConn == NULL || pConn->signature != pConn) {
-    tError("pConn:%p, connection has to be openned first before building a message", pConn);
-    return NULL;
-  }
-
-  size += sizeof(SMsgNode) + sizeof(STaosHeader) + sizeof(STaosDigest);
-  pMsg = (char *)malloc((size_t)size);
-  memset(pMsg, 0, (size_t)size);
-  pHeader = (STaosHeader *)(pMsg + sizeof(SMsgNode));
-  pHeader->version = 1;
-  pHeader->msgType = type;
-  pHeader->spi = 0;
-  pHeader->tcp = 0;
-  pHeader->encrypt = 0;
-  pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
-  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
-
-  pHeader->sourceId = pConn->ownId;
-  pHeader->destId = pConn->peerId;
-
-  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
-
-  memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
-
-  return (char *)pHeader->content;
-}
-
-char *taosBuildRspMsgWithSize(void *param, char type, int size) {
-  STaosHeader *pHeader;
-  char *       pMsg;
-  SRpcConn *   pConn = (SRpcConn *)param;
-
-  if (pConn == NULL || pConn->signature != pConn) {
-    tError("pConn:%p, connection has to be opened first before building a message", pConn);
-    return NULL;
-  }
-
-  size += sizeof(SMsgNode) + sizeof(STaosHeader) + sizeof(STaosDigest);
-  pMsg = (char *)malloc((size_t)size);
-  if (pMsg == NULL) {
-    tError("pConn:%p, malloc(%d) failed when building a type:%d message", pConn, size, type);
-    return NULL;
-  }
-
-  memset(pMsg, 0, (size_t)size);
-  pHeader = (STaosHeader *)pMsg;
-  pHeader->version = 1;
-  pHeader->msgType = type;
-  pHeader->spi = 0;
-  pHeader->tcp = 0;
-  pHeader->encrypt = 0;
-  pHeader->tranId = pConn->inTranId;
-  pHeader->sourceId = pConn->ownId;
-  pHeader->destId = pConn->peerId;
-  pHeader->uid = 0;
-  memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
-
-  return (char *)pHeader->content;
-}
-
-int taosSendSimpleRsp(void *thandle, char rsptype, char code) {
-  char *pMsg, *pStart;
-  int   msgLen;
-
-  if (thandle == NULL) {
-    tError("connection is gone, response could not be sent");
-    return -1;
-  }
-
-  pStart = taosBuildRspMsgWithSize(thandle, rsptype, 32);
-  if (pStart == NULL) {
-    tError("build rsp msg error, return null prt");
-    return -1;
-  }
-  pMsg = pStart;
-
-  *pMsg = code;
-  pMsg++;
-
-  msgLen = (int)(pMsg - pStart);
-  taosSendMsgToPeer(thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int taosSendQuickRsp(void *thandle, char rsptype, char code) {
-  char *       pCont;
-  int          contLen;
-  STaosHeader *pHeader;
-  char *       msg;
-  int          msgLen;
-  SRpcConn *   pConn = (SRpcConn *)thandle;
-
-  pCont = taosBuildRspMsgWithSize(thandle, rsptype, 32);
-  if (pCont == NULL) return 0;
-
-  *pCont = code;
-  contLen = 1;
-
-  pHeader = (STaosHeader *)(pCont - sizeof(STaosHeader));
-  msg = (char *)pHeader;
-  msgLen = contLen + (int32_t)sizeof(STaosHeader);
-
-  if (pConn->spi) {
-    // add auth part
-    pHeader->spi = pConn->spi;
-    STaosDigest *pDigest = (STaosDigest *)(pCont + contLen);
-    pDigest->timeStamp = htonl(taosGetTimestampSec());
-    msgLen += sizeof(STaosDigest);
-    pHeader->msgLen = (int32_t)htonl((uint32_t)msgLen);
-    taosBuildAuthHeader((uint8_t *)pHeader, msgLen - TSDB_AUTH_LEN, pDigest->auth, pConn->secret);
-  } else {
-    pHeader->msgLen = (int32_t)htonl((uint32_t)msgLen);
-  }
-
-  tfree(pConn->pQuickRsp);
-  pConn->pQuickRsp = msg;
-  taosSendDataToPeer(pConn, (char *)pHeader, msgLen);
-
-  return msgLen;
-}
-
-void *taosOpenRpc(SRpcInit *pRpc) {
-  STaosRpc *pServer;
-
-  tsRpcMaxRetry = tsRpcMaxTime * 1000 / tsRpcProgressTime;
-  tsRpcHeadSize = sizeof(STaosHeader) + sizeof(SMsgNode);
-
-  pServer = (STaosRpc *)malloc(sizeof(STaosRpc));
-  if (pServer == NULL) return NULL;
-  memset(pServer, 0, sizeof(STaosRpc));
-
-  pServer->bits = pRpc->bits;
-  pServer->mask = (1 << (pRpc->bits)) - 1;
-  pServer->numOfChanns = pRpc->numOfChanns;
-  strcpy(pServer->label, pRpc->label);
-  pServer->fp = pRpc->fp;
-  pServer->idMgmt = pRpc->idMgmt;
-  pServer->type = pRpc->connType;
-  pServer->idleTime = pRpc->idleTime;
-  pServer->noFree = pRpc->noFree;
-  pServer->numOfThreads = pRpc->numOfThreads;
-  if (pServer->numOfThreads > TSDB_MAX_RPC_THREADS) {
-    pServer->numOfThreads = TSDB_MAX_RPC_THREADS;
-    pRpc->numOfThreads = TSDB_MAX_RPC_THREADS;
-  }
-  pServer->localPort = pRpc->localPort;
-  pServer->qhandle = pRpc->qhandle;
-  pServer->efp = pRpc->efp;
-  pServer->afp = pRpc->afp;
-
-  int size = (int)sizeof(SRpcChann) * pRpc->numOfChanns;
-  pServer->channList = (SRpcChann *)malloc((size_t)size);
-  if (pServer->channList == NULL) {
-    tError("%s, failed to malloc channList", pRpc->label);
-    tfree(pServer);
-    return NULL;
-  }
-  memset(pServer->channList, 0, (size_t)size);
-
-  pServer->shandle = (*taosInitConn[pRpc->connType])(pRpc->localIp, pRpc->localPort, pRpc->label, pRpc->numOfThreads,
-                                                     taosProcessDataFromPeer, pServer);
-  if (pServer->shandle == NULL) {
-    tError("%s, failed to init network, %s:%d", pRpc->label, pRpc->localIp, pRpc->localPort);
-    taosCloseRpc(pServer);
-    return NULL;
-  }
-
-  if (pServer->numOfChanns == 1) {
-    int retVal = taosOpenRpcChann(pServer, 0, pRpc->sessionsPerChann);
-    if (0 != retVal) {
-      tError("%s, failed to open rpc chann", pRpc->label);
-      taosCloseRpc(pServer);
-      return NULL;
-    }
-  }
-
-  tTrace("%s RPC is openned, numOfThreads:%d", pRpc->label, pRpc->numOfThreads);
-
-  return pServer;
-}
-
-int taosOpenRpcChannWithQ(void *handle, int cid, int sessions, void *qhandle) {
-  STaosRpc * pServer = (STaosRpc *)handle;
-  SRpcChann *pChann;
-
-  tTrace("cid:%d, handle:%p open rpc chann", cid, handle);
-
-  if (pServer == NULL) return -1;
-  if (cid >= pServer->numOfChanns || cid < 0) {
-    tError("%s: cid:%d, chann is out of range, max:%d", pServer->label, cid, pServer->numOfChanns);
-    return -1;
-  }
-
-  pChann = pServer->channList + cid;
-  memset(pChann, 0, sizeof(SRpcChann));
-
-  size_t size = sizeof(SRpcConn) * sessions;
-  pChann->connList = (SRpcConn *)calloc(1, size);
-  if (pChann->connList == NULL) {
-    tError("%s cid:%d, failed to allocate memory for taos connections, size:%d", pServer->label, cid, size);
-    return -1;
-  }
-
-  if (pServer->idMgmt == TAOS_ID_FREE) {
-    pChann->idPool = taosInitIdPool(sessions);
-    if (pChann->idPool == NULL) {
-      tError("%s cid:%d, failed to init ID pool", pServer->label, cid);
-      return -1;
-    }
-  }
-
-  pChann->tmrCtrl = taosTmrInit(sessions * 2 + 1, 50, 10000, pServer->label);
-  if (pChann->tmrCtrl == NULL) {
-    tError("%s cid:%d, failed to init timers", pServer->label, cid);
-    return -1;
-  }
-
-  pChann->hash = taosInitStrHash(sessions, sizeof(pChann), taosHashString);
-  if (pChann->hash == NULL) {
-    tError("%s cid:%d, failed to init string hash", pServer->label, cid);
-    return -1;
-  }
-
-  pthread_mutex_init(&pChann->mutex, NULL);
-  pChann->sessions = sessions;
-
-  pChann->qhandle = qhandle ? qhandle : pServer->qhandle;
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void taosCloseRpcChann(void *handle, int cid) {
-  STaosRpc * pServer = (STaosRpc *)handle;
-  SRpcChann *pChann;
-
-  tTrace("cid:%d, handle:%p close rpc chann", cid, handle);
-
-  if (pServer == NULL) return;
-  if (cid >= pServer->numOfChanns || cid < 0) {
-    tError("%s cid:%d, chann is out of range, max:%d", pServer->label, cid, pServer->numOfChanns);
-    return;
-  }
-
-  pChann = pServer->channList + cid;
-
-  for (int i = 0; i < pChann->sessions; ++i) {
-    if (pChann->connList[i].signature != NULL) {
-      taosCloseRpcConn((void *)(pChann->connList + i));
-    }
-  }
-
-  taosCleanUpStrHash(pChann->hash);
-  taosTmrCleanUp(pChann->tmrCtrl);
-  taosIdPoolCleanUp(pChann->idPool);
-  tfree(pChann->connList);
-  pthread_mutex_destroy(&pChann->mutex);
-
-  memset(pChann, 0, sizeof(SRpcChann));
-}
-
-void taosCloseRpcConn(void *thandle) {
-  SRpcConn *pConn = (SRpcConn *)thandle;
-  if (pConn == NULL) return;
-
-  STaosRpc *pServer = pConn->pServer;
-  if (pConn->signature != thandle || pServer == NULL) return;
-  if (pConn->closing) return;
-  SRpcChann *pChann = pServer->channList + pConn->chann;
-
-  pthread_mutex_lock(&pChann->mutex);
-
-  pConn->closing = 1;
-  pConn->signature = NULL;
-
-  if (taosCloseConn[pServer->type]) (*taosCloseConn[pServer->type])(pConn->chandle);
-
-  taosTmrStopA(&pConn->pTimer);
-  taosTmrStopA(&pConn->pIdleTimer);
-  tfree(pConn->pRspMsg);
-
-  if (pServer->noFree == 0) free(pConn->pMsgNode);
-  pConn->pMsgNode = NULL;
-
-  tfree(pConn->pQuickRsp);
-
-  SMsgNode *pMsgNode;
-  while (pConn->pHead) {
-    pMsgNode = pConn->pHead;
-    pConn->pHead = pConn->pHead->next;
-    memset(pMsgNode, 0, sizeof(SMsgNode));
-    if (pServer->noFree == 0) free(pMsgNode);
-  }
-
-  char hashstr[40] = {0};
-  sprintf(hashstr, "%x:%x:%x", pConn->peerIp, pConn->peerUid, pConn->peerId);
-  taosDeleteStrHash(pChann->hash, hashstr);
-
-  tTrace("%s cid:%d sid:%d id:%s, TAOS connection closed, pConn:%p", pServer->label, pConn->chann, pConn->sid,
-         pConn->meterId, pConn);
-  int freeId = pConn->sid;
-  memset(pConn, 0, sizeof(SRpcConn));
-
-  if (pChann->idPool) taosFreeId(pChann->idPool, freeId);
-
-  pthread_mutex_unlock(&pChann->mutex);
-}
-
-int taosGetRpcConn(int chann, int sid, char *meterId, STaosRpc *pServer, SRpcConn **ppConn, char req, char *hashstr) {
-  SRpcConn * pConn = NULL;
-  SRpcChann *pChann;
-
-  if (pServer == NULL) return -1;
-  pChann = pServer->channList + chann;
-
-  if (pServer->idMgmt == TAOS_ID_FREE) {
-    if (sid == 0) {
-      if (req) {
-        int        osid = sid;
-        SRpcConn **ppConn = (SRpcConn **)taosGetStrHashData(pChann->hash, hashstr);
-        if (ppConn) pConn = *ppConn;
-        if (pConn == NULL) {
-          sid = taosAllocateId(pChann->idPool);
-          if (sid <= 0) {
-            tError("%s cid:%d, maximum number of sessions:%d is reached", pServer->label, chann, pChann->sessions);
-            return TSDB_CODE_MAX_SESSIONS;
-          } else {
-            tTrace("%s cid:%d sid:%d, ID allocated, used:%d, old id:%d", pServer->label, chann, sid,
-                   taosIdPoolNumOfUsed(pChann->idPool), osid);
-          }
-        } else {
-          sid = pConn->sid;
-          tTrace("%s cid:%d sid:%d id:%s, session is already there", pServer->label, pConn->chann, pConn->sid,
-                 pConn->meterId);
-        }
-      } else {
-        return TSDB_CODE_UNEXPECTED_RESPONSE;
-      }
-    } else {
-      if (pChann->connList[sid].signature == NULL) {
-        tError("%s cid:%d, sid:%d session is already released", pServer->label, chann, sid);
-        return TSDB_CODE_INVALID_VALUE;
-      }
-    } 
-  }
-
-  pConn = pChann->connList + sid;
-  if (pChann == NULL || pChann->connList == NULL) {
-    tTrace("%s cid:%d sid:%d, connlist is null, received:%s", pServer->label, chann, sid, meterId);
-    return TSDB_CODE_MISMATCHED_METER_ID;
-  }
-
-  if (pConn->signature == NULL) {
-    memset(pConn, 0, sizeof(SRpcConn));
-    pConn->signature = pConn;
-    memcpy(pConn->meterId, meterId, tListLen(pConn->meterId));
-    pConn->pServer = pServer;
-    pConn->chann = chann;
-    pConn->sid = sid;
-    pConn->tranId = (uint16_t)(rand() & 0xFFFF);
-    pConn->ownId = htonl((uint32_t)((pConn->chann << pServer->bits) + pConn->sid));
-    if (pServer->afp) {
-      int ret = (*pServer->afp)(meterId, &pConn->spi, &pConn->encrypt, pConn->secret, pConn->ckey);
-      if (ret != 0) {
-        tWarn("%s cid:%d sid:%d id:%s, meterId not there pConn:%p", pServer->label, chann, sid, pConn->meterId, pConn);
-        taosFreeId(pChann->idPool, sid);   // sid shall be released
-        memset(pConn, 0, sizeof(SRpcConn)); 
-        return ret;
-      }
-    }
-
-    if ((pServer->type == TAOS_CONN_UDPC || pServer->type == TAOS_CONN_UDPS) && pServer->numOfThreads > 1 &&
-        pServer->localPort) {
-      // UDP server, assign to new connection
-      pServer->index = (pServer->index + 1) % pServer->numOfThreads;
-      pConn->localPort = (int16_t)(pServer->localPort + pServer->index);
-    }
-
-    taosAddStrHash(pChann->hash, hashstr, (char *)&pConn);
-    tTrace("%s cid:%d sid:%d id:%s, TAOS connection is allocated, localPort:%d pConn:%p", pServer->label, chann, sid,
-           pConn->meterId, pConn->localPort, pConn);
-  } else {
-    if (memcmp(pConn->meterId, meterId, tListLen(pConn->meterId)) != 0) {
-      tTrace("%s cid:%d sid:%d id:%s, meterId is not matched, received:%s", pServer->label, chann, sid, pConn->meterId,
-             meterId);
-      return TSDB_CODE_MISMATCHED_METER_ID;
-    }
-  }
-
-  *ppConn = pConn;
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void *taosOpenRpcConn(SRpcConnInit *pInit, uint8_t *code) {
-  SRpcConn *pConn;
-  STaosRpc *pServer = (STaosRpc *)pInit->shandle;
-
-  *code = (uint8_t)(taosGetRpcConn(pInit->cid, pInit->sid, pInit->meterId, pServer, &pConn, 1, NULL));
-  if (*code == TSDB_CODE_MAX_SESSIONS) *code = TSDB_CODE_MAX_CONNECTIONS;
-  if (*code != TSDB_CODE_SUCCESS) return NULL;
-
-  if (pConn->peerId == 0) pConn->peerId = pInit->peerId;
-
-  strcpy(pConn->peerIpstr, pInit->peerIp);
-  pConn->peerIp = inet_addr(pInit->peerIp);
-  pConn->peerPort = pInit->peerPort;
-  pConn->ahandle = pInit->ahandle;
-  pConn->spi = pInit->spi;
-  pConn->encrypt = pInit->encrypt;
-  if (pConn->spi) memcpy(pConn->secret, pInit->secret, TSDB_KEY_LEN);
-
-  // if it is client, it shall set up connection first
-  if (taosOpenConn[pServer->type]) {
-    pConn->chandle = (*taosOpenConn[pServer->type])(pServer->shandle, pConn, pConn->peerIpstr, pConn->peerPort);
-    if (pConn->chandle) {
-      tTrace("%s cid:%d sid:%d id:%s, nw connection is set up, ip:%s:%hu localPort:%d pConn:%p", pServer->label,
-             pConn->chann, pConn->sid, pInit->meterId, pConn->peerIpstr, pConn->peerPort, pConn->localPort, pConn);
-    } else {
-      tError("%s cid:%d sid:%d id:%s, failed to set up nw connection to ip:%s:%hu", pServer->label, pConn->chann,
-             pConn->sid, pInit->meterId, pConn->peerIpstr, pConn->peerPort);
-      *code = TSDB_CODE_NETWORK_UNAVAIL;
-      taosCloseRpcConn(pConn);
-      pConn = NULL;
-    }
-  }
-
-  return pConn;
-}
-
-void taosCloseRpc(void *param) {
-  STaosRpc *pServer = (STaosRpc *)param;
-
-  (*taosCleanUpConn[pServer->type])(pServer->shandle);
-
-  for (int cid = 0; cid < pServer->numOfChanns; ++cid) taosCloseRpcChann(pServer, cid);
-
-  tfree(pServer->channList);
-  tfree(pServer);
-}
-
-int taosSetSecurityInfo(int chann, int sid, char *id, int spi, int encrypt, char *secret, char *ckey) {
-  /*
-    SRpcConn *pConn;
-
-    pConn = connList[chann*tsSessionsPerChann + sid];
-
-    if ( pConn == NULL ) {
-      pConn = (SRpcConn *)sizeof(SRpcConn);
-
-      if ( pConn == NULL ) {
-        tError("failed to allocate memory for taosConn");
-        return -1;
-      }
-
-      memset(pConn, 0, sizeof(SRpcConn));
-      pConn->chann = chann;
-      pConn->sid = sid;
-    }
-
-    pConn->spi = spi;
-    pConn->encrypt = encrypt;
-    memcpy(pConn->secret, pConn->secret, TSDB_KEY_LEN);
-    memcpy(pConn->cipheringKey, ckey, TSDB_KEY_LEN);
-    memcpy(pConn->meterId, id, TSDB_METER_ID_LEN);
-  */
-  return -1;
-}
-
-int taosSendDataToPeer(SRpcConn *pConn, char *data, int dataLen) {
-  int          writtenLen = 0;
-  STaosRpc *   pServer = pConn->pServer;
-  STaosHeader *pHeader = (STaosHeader *)data;
-
-  if (pConn->signature != pConn || pServer == NULL) return -1;
-
-  if (pHeader->msgType & 1) {
-    if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16))
-      tTrace("%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, len:%d source:0x%08x dest:0x%08x tranId:%d pConn:%p",
-             pServer->label, pConn->chann, pConn->sid, pConn->meterId, taosMsg[pHeader->msgType], pConn->peerIpstr,
-             pConn->peerPort, dataLen, pHeader->sourceId, pHeader->destId, pHeader->tranId, pConn);
-  } else {
-    if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16))
-      tTrace(
-          "%s cid:%d sid:%d id:%s, %s is sent to %s:%hu, code:%u len:%d source:0x%08x dest:0x%08x tranId:%d pConn:%p",
-          pServer->label, pConn->chann, pConn->sid, pConn->meterId, taosMsg[pHeader->msgType], pConn->peerIpstr,
-          pConn->peerPort, (uint8_t)pHeader->content[0], dataLen, pHeader->sourceId, pHeader->destId, pHeader->tranId,
-          pConn);
-  }
-
-  writtenLen = (*taosSendData[pServer->type])(pConn->peerIp, pConn->peerPort, (char *)pHeader, dataLen, pConn->chandle);
-
-  if (writtenLen != dataLen)
-    tError("%s cid:%d sid:%d id:%s, dataLen:%d writtenLen:%d, not good, reason:%s", pServer->label, pConn->chann,
-           pConn->sid, pConn->meterId, dataLen, writtenLen, strerror(errno));
-  // assert ( writtenLen == dataLen );
-  tDump(data, dataLen);
-
-  return 0;
-}
-
-void taosProcessResponse(SRpcConn *pConn) {
-  STaosHeader *pHeader;
-  char *       msg = NULL;
-  int          msgLen = 0;
-
-  if (pConn == NULL) return;
-  STaosRpc *pServer = pConn->pServer;
-  if (pConn->signature != pConn || pServer == NULL) return;
-  SRpcChann *pChann = pServer->channList + pConn->chann;
-
-  pthread_mutex_lock(&pChann->mutex);
-
-  pConn->outType = 0;
-  pConn->rspReceived = 0;
-  if (pServer->noFree == 0) tfree(pConn->pMsgNode);
-  pConn->pMsgNode = NULL;
-
-  if (pConn->pHead) {
-    SMsgNode *pMsgNode = pConn->pHead;
-    //      assert ( pMsgNode->msgLen >= sizeof(STaosHeader) && pMsgNode->msgLen < RPC_MAX_UDP_SIZE);
-    if (pMsgNode->msgLen >= sizeof(STaosHeader)) {
-      pConn->pMsgNode = pMsgNode;
-      pConn->pHead = pMsgNode->next;
-      if (pMsgNode->ahandle) pConn->ahandle = pMsgNode->ahandle;
-
-      pHeader = (STaosHeader *)((char *)pMsgNode + sizeof(SMsgNode));
-      pConn->outType = pHeader->msgType;
-      pConn->outTranId = pHeader->tranId;
-
-      msg = (char *)pHeader;
-      msgLen = pMsgNode->msgLen;
-
-    } else {
-      tError("%s cid:%d sid:%d id:%s, invalid msgLen:%d pConn:%p", pServer->label, pConn->chann, pConn->sid,
-             pConn->meterId, pMsgNode->msgLen, pConn);
-      pConn->pHead = NULL;
-    }
-
-    if (pConn->pHead == NULL) pConn->pTail = NULL;
-  }
-
-  if (msg) {
-    taosSendDataToPeer(pConn, msg, msgLen);
-    taosTmrReset(taosProcessTaosTimer, tsRpcTimer, pConn, pChann->tmrCtrl, &pConn->pTimer);
-  }
-
-  pthread_mutex_unlock(&pChann->mutex);
-
-}
-
-int taosProcessMsgHeader(STaosHeader *pHeader, SRpcConn **ppConn, STaosRpc *pServer, int dataLen, uint32_t ip,
-                         uint16_t port, void *chandle) {
-  int        chann, sid, code = 0;
-  SRpcConn * pConn = NULL;
-  SRpcChann *pChann;
-  int        msgLen;
-  char       hashstr[40] = {0};
-  // int        reSend = 0;
-
-  *ppConn = NULL;
-  uint32_t destId = htonl(pHeader->destId);
-  chann = destId >> pServer->bits;
-  sid = destId & pServer->mask;
-
-  if (pHeader->msgType >= TSDB_MSG_TYPE_MAX || pHeader->msgType <= 0) {
-    tTrace("%s cid:%d sid:%d, invalid message type:%d", pServer->label, chann, sid, pHeader->msgType);
-    return TSDB_CODE_INVALID_MSG_TYPE;
-  }
-
-  msgLen = (int32_t)htonl((uint32_t)pHeader->msgLen);
-  if (dataLen != msgLen) {
-    tTrace("%s cid:%d sid:%d, %s has invalid length, dataLen:%d, msgLen:%d", pServer->label, chann, sid,
-           taosMsg[pHeader->msgType], dataLen, msgLen);
-    return TSDB_CODE_INVALID_MSG_LEN;
-  }
-
-  if (chann < 0 || chann >= pServer->numOfChanns) {
-    tTrace("%s cid:%d sid:%d, chann is out of range, max:%d, %s discarded", pServer->label, chann, sid,
-           pServer->numOfChanns, taosMsg[pHeader->msgType]);
-    return TSDB_CODE_INVALID_SESSION_ID;
-  }
-
-  pChann = pServer->channList + chann;
-  if (pChann->sessions == 0) {
-    tTrace("%s cid:%d, chann is not activated yet, %s discarded", pServer->label, chann, taosMsg[pHeader->msgType]);
-    if (pServer->efp) (*(pServer->efp))(chann);
-    return TSDB_CODE_NOT_ACTIVE_SESSION;
-  }
-
-  if (sid < 0 || sid >= pChann->sessions) {
-    tTrace("%s cid:%d sid:%d, sid is out of range, max sid:%d, %s discarded", pServer->label, chann, sid,
-           pChann->sessions, taosMsg[pHeader->msgType]);
-    return TSDB_CODE_INVALID_SESSION_ID;
-  }
-
-  //  if ( pHeader->tcp ) return TSDB_CODE_ALREADY_PROCESSED;
-  if (sid == 0) sprintf(hashstr, "%x:%x:%x", ip, pHeader->uid, pHeader->sourceId);
-
-  pthread_mutex_lock(&pChann->mutex);
-
-  code = taosGetRpcConn(chann, sid, pHeader->meterId, pServer, &pConn, pHeader->msgType & 1, hashstr);
-  if (code != TSDB_CODE_SUCCESS) goto _exit;
-
-  *ppConn = pConn;
-  sid = pConn->sid;
-
-  if (pConn->peerIp != ip) {
-    pConn->peerIp = ip;
-    char ipstr[20] = {0};
-    tinet_ntoa(ipstr, ip);
-    strcpy(pConn->peerIpstr, ipstr);
-  }
-
-  if (pHeader->uid) pConn->peerUid = pHeader->uid;
-
-  if (port) pConn->peerPort = port;
-
-  if (pHeader->port)  // port maybe changed by the peer
-    pConn->peerPort = pHeader->port;
-
-  if (chandle) pConn->chandle = chandle;
-
-  if (pHeader->tcp) {
-    tTrace("%s cid:%d sid:%d id:%s, content will be transfered via TCP pConn:%p", pServer->label, chann, sid,
-           pConn->meterId, pConn);
-    if (pConn->outType) taosTmrReset(taosProcessTaosTimer, tsRpcTimer, pConn, pChann->tmrCtrl, &pConn->pTimer);
-    code = TSDB_CODE_ALREADY_PROCESSED;
-    goto _exit;
-  }
-
-  if (pConn->spi != 0) {
-    if (pHeader->spi == pConn->spi) {
-      // authentication
-      STaosDigest *pDigest = (STaosDigest *)((char *)pHeader + dataLen - sizeof(STaosDigest));
-
-      int32_t delta;
-      delta = (int32_t)htonl(pDigest->timeStamp);
-      delta -= (int32_t)taosGetTimestampSec();
-      if (abs(delta) > 900) {
-        tWarn("%s cid:%d sid:%d id:%s, time diff:%d is too big, msg discarded pConn:%p, timestamp:%d", pServer->label,
-              chann, sid, pConn->meterId, delta, pConn, htonl(pDigest->timeStamp));
-        // the requirement of goldwind, should not return error in this case
-        code = TSDB_CODE_INVALID_TIME_STAMP;
-        goto _exit;
-      }
-
-      if (taosAuthenticateMsg((uint8_t *)pHeader, dataLen - TSDB_AUTH_LEN, pDigest->auth, pConn->secret) < 0) {
-        char ipstr[24];
-        tinet_ntoa(ipstr, ip);
-        mLError("user:%s login from %s, authentication failed", pHeader->meterId, ipstr);
-        tError("%s cid:%d sid:%d id:%s, authentication failed, msg discarded pConn:%p", pServer->label, chann, sid,
-               pConn->meterId, pConn);
-        code = TSDB_CODE_AUTH_FAILURE;
-        goto _exit;
-      }
-    } else {
-      // if it is request or response with code 0, msg shall be discarded
-      if ((pHeader->msgType & 1) || (pHeader->content[0] == 0)) {
-        tTrace("%s cid:%d sid:%d id:%s, auth spi not matched, msg discarded pConn:%p", pServer->label, chann, sid,
-               pConn->meterId, pConn);
-        code = TSDB_CODE_AUTH_FAILURE;
-        goto _exit;
-      }
-    }
-  }
-
-  if (pHeader->msgType != TSDB_MSG_TYPE_REG && pHeader->encrypt) {
-    // decrypt here
-  }
-
-  pHeader->destId = pConn->ownId;  // destId maybe 0, it shall be changed
-
-  if (pHeader->msgType & 1) {
-    if (pConn->peerId == 0) {
-      pConn->peerId = pHeader->sourceId;
-    } else {
-      if (pConn->peerId != pHeader->sourceId) {
-        tTrace("%s cid:%d sid:%d id:%s, source Id is changed, old:0x%08x new:0x%08x pConn:%p", pServer->label, chann,
-               sid, pConn->meterId, pConn->peerId, pHeader->sourceId, pConn);
-        code = TSDB_CODE_INVALID_VALUE;
-        goto _exit;
-      }
-    }
-
-    if (pConn->inTranId == pHeader->tranId) {
-      if (pConn->inType == pHeader->msgType) {
-        tTrace("%s cid:%d sid:%d id:%s, %s is retransmitted, pConn:%p", pServer->label, chann, sid, pConn->meterId,
-               taosMsg[pHeader->msgType], pConn);
-        taosSendQuickRsp(pConn, (char)(pHeader->msgType + 1), TSDB_CODE_ACTION_IN_PROGRESS);
-      } else if (pConn->inType == 0) {
-        tTrace("%s cid:%d sid:%d id:%s, %s is already processed, tranId:%d pConn:%p", pServer->label, chann, sid,
-               pConn->meterId, taosMsg[pHeader->msgType], pConn->inTranId, pConn);
-        taosReSendRspToPeer(pConn);
-      } else {
-        tTrace("%s cid:%d sid:%d id:%s, mismatched message %s and tranId pConn:%p", pServer->label, chann, sid,
-               pConn->meterId, taosMsg[pHeader->msgType], pConn);
-      }
-
-      // do not reply any message
-      code = TSDB_CODE_ALREADY_PROCESSED;
-      goto _exit;
-    }
-
-    if (pConn->inType != 0) {
-      tTrace("%s cid:%d sid:%d id:%s, last session is not finished, inTranId:%d tranId:%d pConn:%p", pServer->label,
-             chann, sid, pConn->meterId, pConn->inTranId, pHeader->tranId, pConn);
-      code = TSDB_CODE_LAST_SESSION_NOT_FINISHED;
-      goto _exit;
-    }
-
-    pConn->inTranId = pHeader->tranId;
-    pConn->inType = pHeader->msgType;
-
-    if (sid == 0)  // send a response first
-      taosSendQuickRsp(pConn, (char)(pConn->inType + 1), TSDB_CODE_ACTION_IN_PROGRESS);
-
-  } else {
-    // response from taos
-    pConn->peerId = pHeader->sourceId;
-
-    if (pConn->outType == 0) {
-      code = TSDB_CODE_UNEXPECTED_RESPONSE;
-      goto _exit;
-    }
-
-    if (pHeader->tranId != pConn->outTranId) {
-      code = TSDB_CODE_INVALID_TRAN_ID;
-      goto _exit;
-    }
-
-    if (pHeader->msgType != pConn->outType + 1) {
-      code = TSDB_CODE_INVALID_RESPONSE_TYPE;
-      goto _exit;
-    }
-
-    if (*pHeader->content == TSDB_CODE_NOT_READY) {
-      code = TSDB_CODE_ALREADY_PROCESSED;
-      goto _exit;
-    }
-
-    taosTmrStopA(&pConn->pTimer);
-    pConn->retry = 0;
-
-    if (*pHeader->content == TSDB_CODE_ACTION_IN_PROGRESS || pHeader->tcp) {
-      if (pConn->tretry <= tsRpcMaxRetry) {
-        tTrace("%s cid:%d sid:%d id:%s, peer is still processing the transaction, pConn:%p", pServer->label, chann, sid,
-               pHeader->meterId, pConn);
-        pConn->tretry++;
-        taosTmrReset(taosProcessTaosTimer, tsRpcProgressTime, pConn, pChann->tmrCtrl, &pConn->pTimer);
-        code = TSDB_CODE_ALREADY_PROCESSED;
-        goto _exit;
-      } else {
-        // peer still in processing, give up
-        *pHeader->content = TSDB_CODE_TOO_SLOW;
-      }
-    }
-
-    pConn->tretry = 0;
-    if (pConn->rspReceived) {
-      code = TSDB_CODE_UNEXPECTED_RESPONSE;
-      goto _exit;
-    } else {
-      pConn->rspReceived = 1;
-    }
-  }
-
-_exit:
-  pthread_mutex_unlock(&pChann->mutex);
-
-  // if (reSend) taosReSendRspToPeer(pConn);
-
-  return code;
-}
-
-int taosBuildErrorMsgToPeer(char *pMsg, int code, char *pReply) {
-  STaosHeader *pRecvHeader, *pReplyHeader;
-  char *       pContent;
-  uint32_t     timeStamp;
-  int          msgLen;
-
-  pRecvHeader = (STaosHeader *)pMsg;
-  pReplyHeader = (STaosHeader *)pReply;
-
-  pReplyHeader->version = pRecvHeader->version;
-  pReplyHeader->msgType = (char)(pRecvHeader->msgType + 1);
-  pReplyHeader->tcp = 0;
-  pReplyHeader->spi = 0;
-  pReplyHeader->encrypt = 0;
-  pReplyHeader->tranId = pRecvHeader->tranId;
-  pReplyHeader->sourceId = 0;
-  pReplyHeader->destId = pRecvHeader->sourceId;
-  memcpy(pReplyHeader->meterId, pRecvHeader->meterId, tListLen(pReplyHeader->meterId));
-
-  pContent = (char *)pReplyHeader->content;
-  *pContent = (char)code;
-  pContent++;
-
-  if (code == TSDB_CODE_INVALID_TIME_STAMP) {
-    // include a time stamp if client's time is not synchronized well
-    timeStamp = taosGetTimestampSec();
-    memcpy(pContent, &timeStamp, sizeof(timeStamp));
-    pContent += sizeof(timeStamp);
-  }
-
-  msgLen = (int)(pContent - pReply);
-  pReplyHeader->msgLen = (int32_t)htonl((uint32_t)msgLen);
-
-  return msgLen;
-}
-
-void taosReportDisconnection(SRpcChann *pChann, SRpcConn *pConn)
-{
-    SSchedMsg schedMsg;
-    schedMsg.fp = taosProcessSchedMsg;
-    schedMsg.msg = NULL;
-    schedMsg.ahandle = pConn->ahandle;
-    schedMsg.thandle = pConn;
-    taosScheduleTask(pChann->qhandle, &schedMsg);
-}
-
-void taosProcessIdleTimer(void *param, void *tmrId) {
-  SRpcConn *pConn = (SRpcConn *)param;
-  if (pConn->signature != param) {
-    tError("idle timer pConn Signature:0x%x, pConn:0x%x not matched", pConn->signature, param);
-    return;
-  }
-
-  STaosRpc * pServer = pConn->pServer;
-  SRpcChann *pChann = pServer->channList + pConn->chann;
-  if (pConn->pIdleTimer != tmrId) {
-    tTrace("%s cid:%d sid:%d id:%s, idle timer:%p already processed pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, tmrId, pConn);
-    return;
-  }
-
-  int reportDisc = 0;
-
-  pthread_mutex_lock(&pChann->mutex);
-
-  tTrace("%s cid:%d sid:%d id:%s, close the connection since no activity pConn:%p", pServer->label, pConn->chann,
-         pConn->sid, pConn->meterId, pConn);
-  if (pConn->rspReceived == 0) {
-    pConn->rspReceived = 1;
-    reportDisc = 1;    
-  }
-
-  pthread_mutex_unlock(&pChann->mutex);
-
-  if (reportDisc) taosReportDisconnection(pChann, pConn);
-}
-
-void *taosProcessDataFromPeer(char *data, int dataLen, uint32_t ip, uint16_t port, void *shandle, void *thandle,
-                              void *chandle) {
-  STaosHeader *pHeader;
-  uint8_t      code;
-  SRpcConn *   pConn = (SRpcConn *)thandle;
-  STaosRpc *   pServer = (STaosRpc *)shandle;
-  int          msgLen;
-  char         pReply[128];
-  SSchedMsg    schedMsg;
-  int          chann, sid;
-  SRpcChann *  pChann = NULL;
-
-  tDump(data, dataLen);
-
-  if (ip == 0 && taosCloseConn[pServer->type]) {
-    // it means the connection is broken
-    if (pConn) {
-      pChann = pServer->channList + pConn->chann;
-      tTrace("%s cid:%d sid:%d id:%s, underlying link is gone pConn:%p", pServer->label, pConn->chann, pConn->sid,
-             pConn->meterId, pConn);
-      pConn->rspReceived = 1;
-      pConn->chandle = NULL;
-      taosReportDisconnection(pChann, pConn);
-    }
-    tfree(data);
-    return NULL;
-  }
-
-  pHeader = (STaosHeader *)data;
-  msgLen = (int32_t)htonl((uint32_t)pHeader->msgLen);
-
-  code = (uint8_t)taosProcessMsgHeader(pHeader, &pConn, pServer, dataLen, ip, port, chandle);
-
-  pHeader->destId = htonl(pHeader->destId);
-  chann = pHeader->destId >> pServer->bits;
-  sid = pHeader->destId & pServer->mask;
-
-  if (pConn && pServer->idleTime) {
-    SRpcChann *pChann = pServer->channList + pConn->chann;
-    taosTmrReset(taosProcessIdleTimer, pServer->idleTime, pConn, pChann->tmrCtrl, &pConn->pIdleTimer);
-  }
-
-  if (code == TSDB_CODE_ALREADY_PROCESSED) {
-    tTrace("%s cid:%d sid:%d id:%s, %s wont be processed, source:0x%08x dest:0x%08x tranId:%d pConn:%p", pServer->label,
-           chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], pHeader->sourceId, htonl(pHeader->destId),
-           pHeader->tranId, pConn);
-    free(data);
-    return pConn;
-  }
-
-  if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16)) {
-    tTrace(
-        "%s cid:%d sid:%d id:%s, %s received from 0x%x:%hu, parse code:%u, first:%u len:%d source:0x%08x dest:0x%08x "
-        "tranId:%d pConn:%p",
-        pServer->label, chann, sid, pHeader->meterId, taosMsg[pHeader->msgType], ip, port, code, pHeader->content[0],
-        dataLen, pHeader->sourceId, htonl(pHeader->destId), pHeader->tranId, pConn);
-  }
-
-  if (code != 0) {
-    // parsing error
-
-    if (pHeader->msgType & 1U) {
-      memset(pReply, 0, sizeof(pReply));
-      
-      msgLen = taosBuildErrorMsgToPeer(data, code, pReply);
-      (*taosSendData[pServer->type])(ip, port, pReply, msgLen, chandle);
-      tTrace("%s cid:%d sid:%d id:%s, %s is sent with error code:%u pConn:%p", pServer->label, chann, sid,
-             pHeader->meterId, taosMsg[pHeader->msgType + 1], code, pConn);
-    } else {
-      tTrace("%s cid:%d sid:%d id:%s, %s is received, parsing error:%u pConn:%p", pServer->label, chann, sid,
-             pHeader->meterId, taosMsg[pHeader->msgType], code, pConn);
-    }
-
-    free(data);
-  } else {
-    // parsing OK
-
-    // internal communication is based on TAOS protocol, a trick here to make it efficient
-    if (pHeader->spi) msgLen -= sizeof(STaosDigest);
-    msgLen -= (int)sizeof(STaosHeader);
-    pHeader->msgLen = msgLen + (int)sizeof(SIntMsg);
-
-    if ((pHeader->msgType & 1U) == 0 && (pHeader->content[0] == TSDB_CODE_INVALID_VALUE)) {
-      schedMsg.msg = NULL;  // connection shall be closed
-    } else {
-      pHeader = taosDecompressRpcMsg(pHeader, &schedMsg, msgLen);
-    }
-
-    if (pHeader->msgType < TSDB_MSG_TYPE_HEARTBEAT || (rpcDebugFlag & 16U)) {
-      tTrace("%s cid:%d sid:%d id:%s, %s is put into queue, msgLen:%d pConn:%p pTimer:%p", pServer->label, chann, sid,
-             pHeader->meterId, taosMsg[pHeader->msgType], pHeader->msgLen, pConn, pConn->pTimer);
-    }
-
-    pChann = pServer->channList + pConn->chann;
-    schedMsg.fp = taosProcessSchedMsg;
-    schedMsg.ahandle = pConn->ahandle;
-    schedMsg.thandle = pConn;
-    taosScheduleTask(pChann->qhandle, &schedMsg);
-  }
-
-  return pConn;
-}
-
-int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
-  STaosHeader *pHeader;
-  SMsgNode *   pMsgNode;
-  char *       msg;
-  int          msgLen = 0;
-  SRpcConn *   pConn = (SRpcConn *)thandle;
-  STaosRpc *   pServer;
-  SRpcChann *  pChann;
-  uint8_t      msgType;
-
-  if (pConn == NULL) return -1;
-  if (pConn->signature != pConn) return -1;
-
-  pServer = pConn->pServer;
-  pChann = pServer->channList + pConn->chann;
-  pHeader = (STaosHeader *)(pCont - sizeof(STaosHeader));
-  pHeader->destIp = pConn->peerIp;
-  msg = (char *)pHeader;
-
-  if ((pHeader->msgType & 1U) == 0 && pConn->localPort) pHeader->port = pConn->localPort;
-  
-  contLen = taosCompressRpcMsg(pCont, contLen);
-
-  msgLen = contLen + (int32_t)sizeof(STaosHeader);
-
-  if (pConn->spi) {
-    // add auth part
-    pHeader->spi = pConn->spi;
-    STaosDigest *pDigest = (STaosDigest *)(pCont + contLen);
-    pDigest->timeStamp = htonl(taosGetTimestampSec());
-    msgLen += sizeof(STaosDigest);
-    pHeader->msgLen = (int32_t)htonl((uint32_t)msgLen);
-    taosBuildAuthHeader((uint8_t *)pHeader, msgLen - TSDB_AUTH_LEN, pDigest->auth, pConn->secret);
-  } else {
-    pHeader->msgLen = (int32_t)htonl((uint32_t)msgLen);
-  }
-
-  pthread_mutex_lock(&pChann->mutex);
-  msgType = pHeader->msgType;
-
-  if ((msgType & 1U) == 0) {
-    // response
-    pConn->inType = 0;
-    tfree(pConn->pRspMsg);
-    pConn->pRspMsg = msg;
-    pConn->rspMsgLen = msgLen;
-
-    if (pHeader->content[0] == TSDB_CODE_ACTION_IN_PROGRESS) pConn->inTranId--;
-
-  } else {
-    // request
-    pMsgNode = (SMsgNode *)(pCont - sizeof(STaosHeader) - sizeof(SMsgNode));
-    pMsgNode->msgLen = msgLen;
-    pMsgNode->next = NULL;
-    pMsgNode->ahandle = ahandle;
-
-    if (pConn->outType) {
-      if (pConn->pTail) {
-        pConn->pTail->next = pMsgNode;
-        pConn->pTail = pMsgNode;
-      } else {
-        pConn->pTail = pMsgNode;
-        pConn->pHead = pMsgNode;
-      }
-
-      tTrace("%s cid:%d sid:%d id:%s, msg:%s is put into queue pConn:%p", pServer->label, pConn->chann, pConn->sid,
-             pConn->meterId, taosMsg[msgType], pConn);
-      msgLen = 0;
-
-    } else {
-      assert(pConn->pMsgNode == NULL);
-      if (pConn->pMsgNode) {
-        tError("%s cid:%d sid:%d id:%s, bug, there shall be no pengding req pConn:%p", pServer->label, pConn->chann,
-               pConn->sid, pConn->meterId, pConn);
-      }
-
-      pConn->outType = msgType;
-      pConn->outTranId = pHeader->tranId;
-      pConn->pMsgNode = pMsgNode;
-      pConn->rspReceived = 0;
-      if (pMsgNode->ahandle) pConn->ahandle = pMsgNode->ahandle;
-    }
-  }
-
-  if (msgLen) {
-    taosSendDataToPeer(pConn, (char *)pHeader, msgLen);
-    if (msgType & 1U) {
-      taosTmrReset(taosProcessTaosTimer, tsRpcTimer, pConn, pChann->tmrCtrl, &pConn->pTimer);
-    }
-  }
-
-  pthread_mutex_unlock(&pChann->mutex);
-
-  return contLen;
-}
-
-int taosReSendRspToPeer(SRpcConn *pConn) {
-  STaosHeader *pHeader;
-  int          writtenLen;
-  STaosRpc *   pServer = pConn->pServer;
-
-  if (pConn->pRspMsg == NULL || pConn->rspMsgLen <= 0) {
-    tError("%s cid:%d sid:%d id:%s, rsp is null", pServer->label, pConn->chann, pConn->sid, pConn->meterId);
-    return -1;
-  }
-
-  pHeader = (STaosHeader *)pConn->pRspMsg;
-  if (pHeader->msgLen <= sizeof(SIntMsg) + 1 || pHeader->msgType <= 0) {
-    tError("%s cid:%d sid:%d id:%s, rsp is null, rspLen:%d, msgType:%d", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, pHeader->msgLen, pHeader->msgType);
-    return -1;
-  }
-
-  writtenLen =
-      (*taosSendData[pServer->type])(pConn->peerIp, pConn->peerPort, pConn->pRspMsg, pConn->rspMsgLen, pConn->chandle);
-
-  if (writtenLen != pConn->rspMsgLen) {
-    tError("%s cid:%d sid:%d id:%s, failed to re-send %s, reason:%s pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, taosMsg[(int)pHeader->msgType], strerror(errno), pConn);
-  } else {
-    tTrace("%s cid:%d sid:%d id:%s, msg:%s is re-sent to %s:%hu, len:%d pConn:%p", pServer->label, pConn->chann,
-           pConn->sid, pConn->meterId, taosMsg[(int)pHeader->msgType], pConn->peerIpstr, pConn->peerPort,
-           pConn->rspMsgLen, pConn);
-  }
-
-  return 0;
-}
-
-void taosProcessTaosTimer(void *param, void *tmrId) {
-  STaosHeader *pHeader = NULL;
-  SRpcConn *   pConn = (SRpcConn *)param;
-  int          msgLen;
-  int          reportDisc = 0;
-
-  if (pConn->signature != param) {
-    tError("pConn Signature:0x%x, pConn:0x%x not matched", pConn->signature, param);
-    return;
-  }
-
-  STaosRpc * pServer = pConn->pServer;
-  SRpcChann *pChann = pServer->channList + pConn->chann;
-
-  if (pConn->pTimer != tmrId) {
-    tTrace("%s cid:%d sid:%d id:%s, timer:%p already processed pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, tmrId, pConn);
-    return;
-  }
-
-  pthread_mutex_lock(&pChann->mutex);
-
-  if (pConn->rspReceived) {
-    tTrace("%s cid:%d sid:%d id:%s, rsp just received, pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, pConn);
-  } else if (pConn->outType == 0) {
-    tTrace("%s cid:%d sid:%d id:%s, outtype is zero, pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, pConn);
-  } else {
-    tTrace("%s cid:%d sid:%d id:%s, expected %s is not received, pConn:%p", pServer->label, pConn->chann, pConn->sid,
-           pConn->meterId, taosMsg[(int)pConn->outType + 1], pConn);
-    pConn->pTimer = NULL;
-    pConn->retry++;
-
-    if (pConn->retry < 4) {
-      tTrace("%s cid:%d sid:%d id:%s, re-send msg:%s to %s:%hu pConn:%p", pServer->label, pConn->chann, pConn->sid,
-             pConn->meterId, taosMsg[pConn->outType], pConn->peerIpstr, pConn->peerPort, pConn);
-      if (pConn->pMsgNode && pConn->pMsgNode->msgLen > 0) {
-        pHeader = (STaosHeader *)((char *)pConn->pMsgNode + sizeof(SMsgNode));
-        pHeader->destId = pConn->peerId;
-        msgLen = pConn->pMsgNode->msgLen;
-        if (pConn->spi) {
-          STaosDigest *pDigest = (STaosDigest *)(((char *)pHeader) + pConn->pMsgNode->msgLen - sizeof(STaosDigest));
-          pDigest->timeStamp = htonl(taosGetTimestampSec());
-          taosBuildAuthHeader((uint8_t *)pHeader, pConn->pMsgNode->msgLen - TSDB_AUTH_LEN, pDigest->auth,
-                              pConn->secret);
-        }
-      }
-    } else {
-      // close the connection
-      tTrace("%s cid:%d sid:%d id:%s, failed to send msg:%s to %s:%hu pConn:%p", pServer->label, pConn->chann,
-             pConn->sid, pConn->meterId, taosMsg[pConn->outType], pConn->peerIpstr, pConn->peerPort, pConn);
-      if (pConn->rspReceived == 0) {
-        pConn->rspReceived = 1;
-        reportDisc = 1;
-      }
-    }
-  }
-
-  if (pHeader) {
-    (*taosSendData[pServer->type])(pConn->peerIp, pConn->peerPort, (char *)pHeader, msgLen, pConn->chandle);
-    taosTmrReset(taosProcessTaosTimer, tsRpcTimer<<pConn->retry, pConn, pChann->tmrCtrl, &pConn->pTimer);
-  }
-
-  pthread_mutex_unlock(&pChann->mutex);
-
-  if (reportDisc) taosReportDisconnection(pChann, pConn);
-}
-
-void taosGetRpcConnInfo(void *thandle, uint32_t *peerId, uint32_t *peerIp, uint16_t *peerPort, int *cid, int *sid) {
-  SRpcConn *pConn = (SRpcConn *)thandle;
-
-  *peerId = pConn->peerId;
-  *peerIp = pConn->peerIp;
-  *peerPort = pConn->peerPort;
-
-  *cid = pConn->chann;
-  *sid = pConn->sid;
-}
-
-int taosGetOutType(void *thandle) {
-  SRpcConn *pConn = (SRpcConn *)thandle;
-  if (pConn == NULL) return -1;
-
-  return pConn->outType;
-}
-
-void taosProcessSchedMsg(SSchedMsg *pMsg) {
-  SIntMsg * pHeader = (SIntMsg *)pMsg->msg;
-  SRpcConn *pConn = (SRpcConn *)pMsg->thandle;
-  if (pConn == NULL || pConn->signature != pMsg->thandle || pConn->pServer == NULL) return;
-  STaosRpc *pRpc = pConn->pServer;
-
-  void *ahandle = (*(pRpc->fp))(pMsg->msg, pMsg->ahandle, pMsg->thandle);
-
-  if (ahandle == NULL || pMsg->msg == NULL) {
-    taosCloseRpcConn(pConn);
-  } else {
-    pConn->ahandle = ahandle;
-    if (pHeader && ((pHeader->msgType & 1) == 0)) taosProcessResponse(pConn);
-  }
-
-  if (pMsg->msg) free(pMsg->msg - sizeof(STaosHeader) + sizeof(SIntMsg));
-}
-
-void taosStopRpcConn(void *thandle) {
-  SRpcConn * pConn = (SRpcConn *)thandle;
-  STaosRpc * pServer = pConn->pServer;
-  SRpcChann *pChann = pServer->channList + pConn->chann;
-
-  tTrace("%s cid:%d sid:%d id:%s, stop the connection pConn:%p", pServer->label, pConn->chann, pConn->sid,
-         pConn->meterId, pConn);
-
-  int reportDisc = 0;
-  pthread_mutex_lock(&pChann->mutex);
-
-  if (pConn->outType) {
-    pConn->rspReceived = 1;
-    reportDisc = 1;
-    pthread_mutex_unlock(&pChann->mutex);
-  } else {
-    pthread_mutex_unlock(&pChann->mutex);
-    taosCloseRpcConn(pConn);
-  }
-
-  if (reportDisc) taosReportDisconnection(pChann, pConn);
-}
-
-int taosAuthenticateMsg(uint8_t *pMsg, int msgLen, uint8_t *pAuth, uint8_t *pKey) {
-  MD5_CTX context;
-  int     ret = -1;
-
-  MD5Init(&context);
-  MD5Update(&context, pKey, TSDB_KEY_LEN);
-  MD5Update(&context, pMsg, msgLen);
-  MD5Update(&context, pKey, TSDB_KEY_LEN);
-  MD5Final(&context);
-
-  if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0;
-
-  return ret;
-}
-
-int taosBuildAuthHeader(uint8_t *pMsg, int msgLen, uint8_t *pAuth, uint8_t *pKey) {
-  MD5_CTX context;
-
-  MD5Init(&context);
-  MD5Update(&context, pKey, TSDB_KEY_LEN);
-  MD5Update(&context, (uint8_t *)pMsg, msgLen);
-  MD5Update(&context, pKey, TSDB_KEY_LEN);
-  MD5Final(&context);
-
-  memcpy(pAuth, context.digest, sizeof(context.digest));
-
-  return 0;
-}
diff --git a/src/rpc/src/tstring.c b/src/rpc/src/tstring.c
deleted file mode 100644
index a254ceecfd1f6ce13b1cc30f8c0c87b6b8edfca9..0000000000000000000000000000000000000000
--- a/src/rpc/src/tstring.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * 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/>.
- */
-
-char *taosMsg[] = {"null",
-                   "registration",
-                   "registration-rsp",
-                   "submit",
-                   "submit-rsp",
-                   "nw-change",
-                   "nw-change-rsp",
-                   "deliver",
-                   "deliver-rsp",
-
-                   "create",
-                   "create-rsp",
-                   "remove",
-                   "remove-rsp",
-                   "vpeers",
-                   "vpeers-rsp",
-                   "free-vnode",
-                   "free-vnode-rsp",
-                   "vpeer-cfg",
-                   "vpeer-cfg-rsp",
-                   "meter-cfg",
-                   "meter-cfg-rsp",
-
-                   "vpeer-fwd",
-                   "vpeer-fwd-rsp",
-                   "sync",
-                   "sync-rsp",
-
-                   "insert",
-                   "insert-rsp",
-                   "query",
-                   "query-rsp",
-                   "retrieve",
-                   "retrieve-rsp",
-
-                   "connect",
-                   "connect-rsp",
-                   "create-acct",
-                   "create-acct-rsp",
-                   "create-user",
-                   "create-user-rsp",
-                   "drop-acct",
-                   "drop-acct-rsp",
-                   "drop-user",
-                   "drop-user-rsp",
-                   "alter-user",
-                   "alter-user-rsp",
-                   "create-mnode",
-                   "create-mnode-rsp",
-                   "drop-mnode",
-                   "drop-mnode-rsp",
-                   "create-dnode",
-                   "create-dnode-rsp",
-                   "drop-dnode",
-                   "drop-dnode-rsp",
-                   "create-db",
-                   "create-db-rsp",
-                   "drop-db",
-                   "drop-db-rsp",
-                   "use-db",
-                   "use-db-rsp",
-                   "create-table",
-                   "create-table-rsp",
-                   "drop-table",
-                   "drop-table-rsp",
-                   "meter-info",
-                   "meter-info-rsp",
-                   "metric-meta",
-                   "metric-meta-rsp",
-                   "show",
-                   "show-rsp",
-
-                   "forward",
-                   "forward-rsp",
-
-                   "cfg-dnode",
-                   "cfg-dnode-rsp",
-                   "cfg-mnode",
-                   "cfg-mnode-rsp",
-
-                   "kill-query",
-                   "kill-query-rsp",
-                   "kill-stream",
-                   "kill-stream-rsp",
-                   "kill-connection",
-                   "kill-connectoin-rsp",  // 78
-                   "alter-stream",
-                   "alter-stream-rsp",
-                   "alter-table",
-                   "alter-table-rsp",
-
-                   "",
-                   "",
-                   "",
-                   "",
-                   "",
-                   "",
-                   "",
-                   "",
-
-                   "heart-beat",           // 91
-                   "heart-beat-rsp",
-                   "status",
-                   "status-rsp",
-                   "grant",
-                   "grant-rsp",
-                   "alter-acct",
-                   "alter-acct-rsp",
-                   "invalid"};
-
-char *tsError[] = {"success",
-                   "in progress",
-                   "",
-                   "",
-                   "",
-
-                   "last session not finished",  // 5
-                   "invalid session ID",
-                   "invalid tran ID",
-                   "invalid msg type",
-                   "alredy processed",
-                   "authentication failure",     // 10
-                   "wrong msg size",
-                   "unexpected response",
-                   "invalid response type",
-                   "no resource",
-                   "server-client date time unsynced",         // 15
-                   "mismatched meter ID",
-                   "transcation not finished",
-                   "not online",
-                   "send failed",
-                   "not active session",     // 20
-                   "invalid vnode id",
-                   "App error",
-                   "invalid IE",
-                   "invalid value",
-                   "service not available",  // 25
-                   "already there",
-                   "invalid meter ID",
-                   "invalid SQL",
-                   "failed to connect to server",
-                   "invalid msg len",        // 30
-                   "invalid DB",
-                   "invalid table",
-                   "DB already there",
-                   "table already there",
-                   "invalid user name",      // 35
-                   "invalid acct name",
-                   "invalid password",
-                   "DB not selected",
-                   "memory corrupted",
-                   "user name exists",       // 40
-                   "not authorized",
-                   "login disconnected, login again",
-                   "mgmt master node not available",
-                   "not configured",
-                   "invalid option",         // 45
-                   "node offline",
-                   "sync required",
-                   "more dnodes are needed",
-                   "node in unsynced state",
-                   "too slow",               // 50
-                   "others",
-                   "can't remove dnode which is master",
-                   "wrong schema",
-                   "vnode not active(not created yet or dropped already)",
-                   "num of users execeed maxUsers",   //55
-                   "num of databases execeed maxDbs",
-                   "num of tables execeed maxTables",
-                   "num of dnodes execeed maxDnodes",
-                   "num of accounts execeed maxAccts",
-                   "accout name exists",     // 60
-                   "dnode ip exists",
-                   "sdb error",
-                   "metric meta expired",
-                   "not ready",
-                   "too many sessions on server",  // 65
-                   "too many sessions from app",
-                   "session to dest is already there",
-                   "query list not there, please show again",
-                   "server out of memory",
-                   "invalid query handle",         // 70
-                   "tables related to metric exist",
-                   "can't drop monitor database or tables",
-                   "no disk permissions",
-                   "vgroup init failed",
-                   "data is already imported",     // 75
-                   "not supported operation",
-                   "invalid query id string",
-                   "invalid stream id string",
-                   "invalid connection string",
-                   "dnode not balanced",        // 80
-                   "client out of memory",
-                   "data value overflow",
-                   "query cancelled",
-                   "grant timeseries limited",
-                   "grant expired",             // 85
-                   "client no disk space",
-                   "DB file corrupted",
-                   "version of client and server not match",
-                   "invalid account parameter",
-                   "no enough available time series",  //90
-                   "storage credit is used up",
-                   "query credit is used up",
-                   "grant database limited",
-                   "grant user limited",
-                   "grant connection limited",      //95
-                   "grant stream limited",
-                   "grant writing speed limited",
-                   "grant storage limited",
-                   "grant query time limited",
-                   "grant account limited",      // 100
-                   "grant dnode limited",
-                   "grant cpu core limited",
-                   "session not ready",
-                   "batch size too big",
-                   "timestamp out of range",     //105
-                   "invalid query message",
-                   "too many results from vnodes for sort",
-                   "timestamp disordered in file block",
-                   "invalid commit log",
-                   "no disk space on server",    //110
-                   "only super table has metric meta info",
-                   "tags value not unique for join",
-                   "invalid submit message",
-                   "not active table(not created yet or dropped already)",
-                   "invalid table id",        // 115
-                   "invalid vnode status",
-                   "failed to lock resources",
-                   "table id/uid mismatch",
-                   "client query cache erased",     // 119
-};
diff --git a/src/rpc/src/ttcpclient.c b/src/rpc/src/ttcpclient.c
deleted file mode 100644
index 3d39be92fe4fd1c4476e35d56b88ed2fa5c9e474..0000000000000000000000000000000000000000
--- a/src/rpc/src/ttcpclient.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * 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 "os.h"
-#include "taosmsg.h"
-#include "tlog.h"
-#include "tsocket.h"
-#include "ttcpclient.h"
-#include "tutil.h"
-
-#ifndef EPOLLWAKEUP
-#define EPOLLWAKEUP (1u << 29)
-#endif
-
-typedef struct _tcp_fd {
-  void               *signature;
-  int                 fd;  // TCP socket FD
-  void *              thandle;
-  uint32_t            ip;
-  char                ipstr[20];
-  uint16_t            port;
-  struct _tcp_client *pTcp;
-  struct _tcp_fd *    prev, *next;
-} STcpFd;
-
-typedef struct _tcp_client {
-  pthread_t       thread;
-  STcpFd *        pHead;
-  pthread_mutex_t mutex;
-  pthread_cond_t  fdReady;
-  int             pollFd;
-  int             numOfFds;
-  char            label[12];
-  char            ipstr[20];
-  void *          shandle;  // handle passed by upper layer during server initialization
-  void *(*processData)(char *data, int dataLen, unsigned int ip, uint16_t port, void *shandle, void *thandle,
-                       void *chandle);
-  // char   buffer[128000];
-} STcpClient;
-
-#define maxTcpEvents 100
-
-static void taosCleanUpTcpFdObj(STcpFd *pFdObj) {
-  STcpClient *pTcp;
-
-  if (pFdObj == NULL) return;
-  if (pFdObj->signature != pFdObj) return;
-
-  pTcp = pFdObj->pTcp;
-  if (pTcp == NULL) {
-    tError("double free TcpFdObj!!!!");
-    return;
-  }
-
-  epoll_ctl(pTcp->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
-  close(pFdObj->fd);
-
-  pthread_mutex_lock(&pTcp->mutex);
-
-  pTcp->numOfFds--;
-
-  if (pTcp->numOfFds < 0) tError("%s number of TCP FDs shall never be negative", pTcp->label);
-
-  // remove from the FdObject list
-
-  if (pFdObj->prev) {
-    (pFdObj->prev)->next = pFdObj->next;
-  } else {
-    pTcp->pHead = pFdObj->next;
-  }
-
-  if (pFdObj->next) {
-    (pFdObj->next)->prev = pFdObj->prev;
-  }
-
-  pthread_mutex_unlock(&pTcp->mutex);
-
-  // notify the upper layer to clean the associated context
-  if (pFdObj->thandle) (*(pTcp->processData))(NULL, 0, 0, 0, pTcp->shandle, pFdObj->thandle, NULL);
-
-  tTrace("%s TCP FD is cleaned up, numOfFds:%d", pTcp->label, pTcp->numOfFds);
-
-  memset(pFdObj, 0, sizeof(STcpFd));
-
-  tfree(pFdObj);
-}
-
-void taosCleanUpTcpClient(void *chandle) {
-  STcpClient *pTcp = (STcpClient *)chandle;
-  if (pTcp == NULL) return;
-
-  while (pTcp->pHead) {
-    taosCleanUpTcpFdObj(pTcp->pHead);
-    pTcp->pHead = pTcp->pHead->next;
-  }
-
-  close(pTcp->pollFd);
-
-  pthread_cancel(pTcp->thread);
-  pthread_join(pTcp->thread, NULL);
-
-  // tTrace (":%s, all connections are cleaned up", pTcp->label);
-
-  tfree(pTcp);
-}
-
-static void *taosReadTcpData(void *param) {
-  STcpClient *       pTcp = (STcpClient *)param;
-  int                i, fdNum;
-  STcpFd *           pFdObj;
-  struct epoll_event events[maxTcpEvents];
-
-  while (1) {
-    pthread_mutex_lock(&pTcp->mutex);
-    if (pTcp->numOfFds < 1) pthread_cond_wait(&pTcp->fdReady, &pTcp->mutex);
-    pthread_mutex_unlock(&pTcp->mutex);
-
-    fdNum = epoll_wait(pTcp->pollFd, events, maxTcpEvents, -1);
-    if (fdNum < 0) continue;
-
-    for (i = 0; i < fdNum; ++i) {
-      pFdObj = events[i].data.ptr;
-
-      if (events[i].events & EPOLLERR) {
-        tTrace("%s TCP error happened on FD\n", pTcp->label);
-        taosCleanUpTcpFdObj(pFdObj);
-        continue;
-      }
-
-      if (events[i].events & EPOLLHUP) {
-        tTrace("%s TCP FD hang up\n", pTcp->label);
-        taosCleanUpTcpFdObj(pFdObj);
-        continue;
-      }
-
-      void *buffer = malloc(1024);
-      if (NULL == buffer) {
-        tTrace("%s TCP malloc(size:1024) fail\n", pTcp->label);
-        taosCleanUpTcpFdObj(pFdObj);
-        continue;
-      }
-
-      int headLen = taosReadMsg(pFdObj->fd, buffer, sizeof(STaosHeader));
-      if (headLen != sizeof(STaosHeader)) {
-        tError("%s read error, headLen:%d", pTcp->label, headLen);
-        tfree(buffer);
-        taosCleanUpTcpFdObj(pFdObj);
-        continue;
-      }
-
-      int dataLen = (int32_t)htonl((uint32_t)((STaosHeader *)buffer)->msgLen);
-      if (dataLen > 1024) {
-        void *b = realloc(buffer, (size_t)dataLen);
-        if (NULL == b) {
-          tTrace("%s TCP malloc(size:%d) fail\n", pTcp->label, dataLen);
-          tfree(buffer);
-          taosCleanUpTcpFdObj(pFdObj);
-          continue;
-        }
-        buffer = b;
-      }
-
-      int leftLen = dataLen - headLen;
-      int retLen = taosReadMsg(pFdObj->fd, buffer + headLen, leftLen);
-
-      // tTrace("%s TCP data is received, ip:%s port:%u len:%d", pTcp->label, pFdObj->ipstr, pFdObj->port, dataLen);
-
-      if (leftLen != retLen) {
-        tError("%s read error, leftLen:%d retLen:%d", pTcp->label, leftLen, retLen);
-        tfree(buffer);
-        taosCleanUpTcpFdObj(pFdObj);
-        continue;
-      }
-
-      pFdObj->thandle =
-          (*(pTcp->processData))(buffer, dataLen, pFdObj->ip, pFdObj->port, pTcp->shandle, pFdObj->thandle, pFdObj);
-
-      if (pFdObj->thandle == NULL) taosCleanUpTcpFdObj(pFdObj);
-    }
-  }
-
-  return NULL;
-}
-
-void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle) {
-  STcpClient *   pTcp;
-  pthread_attr_t thattr;
-
-  pTcp = (STcpClient *)malloc(sizeof(STcpClient));
-  memset(pTcp, 0, sizeof(STcpClient));
-  strcpy(pTcp->label, label);
-  strcpy(pTcp->ipstr, ip);
-  pTcp->shandle = shandle;
-
-  if (pthread_mutex_init(&(pTcp->mutex), NULL) < 0) {
-    tError("%s failed to init TCP mutex, reason:%s", label, strerror(errno));
-    return NULL;
-  }
-
-  if (pthread_cond_init(&(pTcp->fdReady), NULL) != 0) {
-    tError("%s init TCP condition variable failed, reason:%s\n", label, strerror(errno));
-    return NULL;
-  }
-
-  pTcp->pollFd = epoll_create(10);  // size does not matter
-  if (pTcp->pollFd < 0) {
-    tError("%s failed to create TCP epoll", label);
-    return NULL;
-  }
-
-  pTcp->processData = fp;
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
-  if (pthread_create(&(pTcp->thread), &thattr, taosReadTcpData, (void *)(pTcp)) != 0) {
-    tError("%s failed to create TCP read data thread, reason:%s", label, strerror(errno));
-    return NULL;
-  }
-
-  tTrace("%s TCP client is initialized, ip:%s port:%hu", label, ip, port);
-
-  return pTcp;
-}
-
-void taosCloseTcpClientConnection(void *chandle) {
-  STcpFd *pFdObj = (STcpFd *)chandle;
-
-  if (pFdObj == NULL) return;
-
-  taosCleanUpTcpFdObj(pFdObj);
-}
-
-void *taosOpenTcpClientConnection(void *shandle, void *thandle, char *ip, uint16_t port) {
-  STcpClient *       pTcp = (STcpClient *)shandle;
-  STcpFd *           pFdObj;
-  struct epoll_event event;
-  struct in_addr     destIp;
-  int                fd;
-
-  /*
-    if ( (strcmp(ip, "127.0.0.1") == 0 ) || (strcmp(ip, "localhost") == 0 ) ) {
-      fd = taosOpenUDClientSocket(ip, port);
-    } else {
-      fd = taosOpenTcpClientSocket(ip, port, pTcp->ipstr);
-    }
-  */
-
-  fd = taosOpenTcpClientSocket(ip, port, pTcp->ipstr);
-
-  if (fd <= 0) return NULL;
-
-  pFdObj = (STcpFd *)malloc(sizeof(STcpFd));
-  if (pFdObj == NULL) {
-    tError("%s no enough resource to allocate TCP FD IDs", pTcp->label);
-    tclose(fd);
-    return NULL;
-  }
-
-  memset(pFdObj, 0, sizeof(STcpFd));
-  pFdObj->fd = fd;
-  strcpy(pFdObj->ipstr, ip);
-  inet_aton(ip, &destIp);
-  pFdObj->ip = destIp.s_addr;
-  pFdObj->port = port;
-  pFdObj->pTcp = pTcp;
-  pFdObj->thandle = thandle;
-  pFdObj->signature = pFdObj;
-
-  event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
-  event.data.ptr = pFdObj;
-  if (epoll_ctl(pTcp->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
-    tError("%s failed to add TCP FD for epoll, error:%s", pTcp->label, strerror(errno));
-    tfree(pFdObj);
-    tclose(fd);
-    return NULL;
-  }
-
-  // notify the data process, add into the FdObj list
-  pthread_mutex_lock(&(pTcp->mutex));
-
-  pFdObj->next = pTcp->pHead;
-
-  if (pTcp->pHead) (pTcp->pHead)->prev = pFdObj;
-
-  pTcp->pHead = pFdObj;
-
-  pTcp->numOfFds++;
-  pthread_cond_signal(&pTcp->fdReady);
-
-  pthread_mutex_unlock(&(pTcp->mutex));
-
-  tTrace("%s TCP connection to ip:%s port:%hu is created, numOfFds:%d", pTcp->label, ip, port, pTcp->numOfFds);
-
-  return pFdObj;
-}
-
-int taosSendTcpClientData(uint32_t ip, uint16_t port, char *data, int len, void *chandle) {
-  STcpFd *pFdObj = (STcpFd *)chandle;
-
-  if (chandle == NULL) return -1;
-
-  return (int)send(pFdObj->fd, data, (size_t)len, 0);
-}
diff --git a/src/rpc/src/ttcpserver.c b/src/rpc/src/ttcpserver.c
deleted file mode 100644
index 663bfcdf8ee86008b0cfa4803725af1866a950bf..0000000000000000000000000000000000000000
--- a/src/rpc/src/ttcpserver.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * 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 "os.h"
-#include "taosmsg.h"
-#include "tlog.h"
-#include "tlog.h"
-#include "tsocket.h"
-#include "ttcpserver.h"
-#include "tutil.h"
-
-#define TAOS_IPv4ADDR_LEN 16
-#ifndef EPOLLWAKEUP
-  #define EPOLLWAKEUP (1u << 29)
-#endif
-
-typedef struct _fd_obj {
-  void               *signature;
-  int                 fd;       // TCP socket FD
-  void *              thandle;  // handle from upper layer, like TAOS
-  char                ipstr[TAOS_IPv4ADDR_LEN];
-  unsigned int        ip;
-  uint16_t            port;
-  struct _thread_obj *pThreadObj;
-  struct _fd_obj *    prev, *next;
-} SFdObj;
-
-typedef struct _thread_obj {
-  pthread_t       thread;
-  SFdObj *        pHead;
-  pthread_mutex_t threadMutex;
-  pthread_cond_t  fdReady;
-  int             pollFd;
-  int             numOfFds;
-  int             threadId;
-  char            label[12];
-  // char    buffer[128000];  // buffer to receive data
-  void *shandle;  // handle passed by upper layer during server initialization
-  void *(*processData)(char *data, int dataLen, unsigned int ip, uint16_t port, void *shandle, void *thandle,
-                       void *chandle);
-} SThreadObj;
-
-typedef struct {
-  char        ip[40];
-  uint16_t    port;
-  char        label[12];
-  int         numOfThreads;
-  void *      shandle;
-  SThreadObj *pThreadObj;
-  pthread_t   thread;
-} SServerObj;
-
-static void taosCleanUpFdObj(SFdObj *pFdObj) {
-  SThreadObj *pThreadObj;
-
-  if (pFdObj == NULL) return;
-  if (pFdObj->signature != pFdObj) return;
-
-  pThreadObj = pFdObj->pThreadObj;
-  if (pThreadObj == NULL) {
-    tError("FdObj double clean up!!!");
-    return;
-  }
-
-  epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
-  close(pFdObj->fd);
-
-  pthread_mutex_lock(&pThreadObj->threadMutex);
-
-  pThreadObj->numOfFds--;
-
-  if (pThreadObj->numOfFds < 0)
-    tError("%s TCP thread:%d, number of FDs shall never be negative", pThreadObj->label, pThreadObj->threadId);
-
-  // remove from the FdObject list
-
-  if (pFdObj->prev) {
-    (pFdObj->prev)->next = pFdObj->next;
-  } else {
-    pThreadObj->pHead = pFdObj->next;
-  }
-
-  if (pFdObj->next) {
-    (pFdObj->next)->prev = pFdObj->prev;
-  }
-
-  pthread_mutex_unlock(&pThreadObj->threadMutex);
-
-  // notify the upper layer, so it will clean the associated context
-  if (pFdObj->thandle) (*(pThreadObj->processData))(NULL, 0, 0, 0, pThreadObj->shandle, pFdObj->thandle, NULL);
-
-  tTrace("%s TCP thread:%d, FD is cleaned up, numOfFds:%d", pThreadObj->label, pThreadObj->threadId,
-         pThreadObj->numOfFds);
-
-  memset(pFdObj, 0, sizeof(SFdObj));
-
-  tfree(pFdObj);
-}
-
-void taosCloseTcpServerConnection(void *chandle) {
-  SFdObj *pFdObj = (SFdObj *)chandle;
-
-  if (pFdObj == NULL) return;
-
-  taosCleanUpFdObj(pFdObj);
-}
-
-void taosCleanUpTcpServer(void *handle) {
-  int         i;
-  SThreadObj *pThreadObj;
-  SServerObj *pServerObj = (SServerObj *)handle;
-
-  if (pServerObj == NULL) return;
-
-  pthread_cancel(pServerObj->thread);
-  pthread_join(pServerObj->thread, NULL);
-
-  for (i = 0; i < pServerObj->numOfThreads; ++i) {
-    pThreadObj = pServerObj->pThreadObj + i;
-
-    while (pThreadObj->pHead) {
-      taosCleanUpFdObj(pThreadObj->pHead);
-      pThreadObj->pHead = pThreadObj->pHead;
-    }
-
-    close(pThreadObj->pollFd);
-    pthread_cancel(pThreadObj->thread);
-    pthread_join(pThreadObj->thread, NULL);
-    pthread_cond_destroy(&(pThreadObj->fdReady));
-    pthread_mutex_destroy(&(pThreadObj->threadMutex));
-  }
-
-  tfree(pServerObj->pThreadObj);
-  tTrace("TCP:%s, TCP server is cleaned up", pServerObj->label);
-
-  tfree(pServerObj);
-}
-
-#define maxEvents 10
-
-static void taosProcessTcpData(void *param) {
-  SThreadObj *       pThreadObj;
-  int                i, fdNum;
-  SFdObj *           pFdObj;
-  struct epoll_event events[maxEvents];
-
-  pThreadObj = (SThreadObj *)param;
-
-  while (1) {
-    pthread_mutex_lock(&pThreadObj->threadMutex);
-    if (pThreadObj->numOfFds < 1) {
-      pthread_cond_wait(&pThreadObj->fdReady, &pThreadObj->threadMutex);
-    }
-    pthread_mutex_unlock(&pThreadObj->threadMutex);
-
-    fdNum = epoll_wait(pThreadObj->pollFd, events, maxEvents, -1);
-    if (fdNum < 0) continue;
-
-    for (i = 0; i < fdNum; ++i) {
-      pFdObj = events[i].data.ptr;
-
-      if (events[i].events & EPOLLERR) {
-        tTrace("%s TCP thread:%d, error happened on FD", pThreadObj->label, pThreadObj->threadId);
-        taosCleanUpFdObj(pFdObj);
-        continue;
-      }
-
-      if (events[i].events & EPOLLHUP) {
-        tTrace("%s TCP thread:%d, FD hang up", pThreadObj->label, pThreadObj->threadId);
-        taosCleanUpFdObj(pFdObj);
-        continue;
-      }
-
-      void *buffer = malloc(1024);
-      int   headLen = taosReadMsg(pFdObj->fd, buffer, sizeof(STaosHeader));
-
-      if (headLen != sizeof(STaosHeader)) {
-        tError("%s read error, headLen:%d, errno:%d", pThreadObj->label, headLen, errno);
-        taosCleanUpFdObj(pFdObj);
-        tfree(buffer);
-        continue;
-      }
-
-      int dataLen = (int32_t)htonl((uint32_t)((STaosHeader *)buffer)->msgLen);
-      if (dataLen > 1024) buffer = realloc(buffer, (size_t)dataLen);
-
-      int leftLen = dataLen - headLen;
-      int retLen = taosReadMsg(pFdObj->fd, buffer + headLen, leftLen);
-
-      // tTrace("%s TCP data is received, ip:%s port:%u len:%d",
-      // pThreadObj->label, pFdObj->ipstr, pFdObj->port, dataLen);
-
-      if (leftLen != retLen) {
-        tError("%s read error, leftLen:%d retLen:%d", pThreadObj->label, leftLen, retLen);
-        taosCleanUpFdObj(pFdObj);
-        tfree(buffer);
-        continue;
-      }
-
-      pFdObj->thandle = (*(pThreadObj->processData))(buffer, dataLen, pFdObj->ip, pFdObj->port,
-                                                     pThreadObj->shandle, pFdObj->thandle, pFdObj);
-
-      if (pFdObj->thandle == NULL) taosCleanUpFdObj(pFdObj);
-    }
-  }
-}
-
-void taosAcceptTcpConnection(void *arg) {
-  int                connFd = -1;
-  struct sockaddr_in clientAddr;
-  int                sockFd;
-  int                threadId = 0;
-  SThreadObj *       pThreadObj;
-  SServerObj *       pServerObj;
-  SFdObj *           pFdObj;
-  struct epoll_event event;
-
-  pServerObj = (SServerObj *)arg;
-
-  sockFd = taosOpenTcpServerSocket(pServerObj->ip, pServerObj->port);
-
-  if (sockFd < 0) {
-    tError("%s failed to open TCP socket, ip:%s, port:%hu", pServerObj->label, pServerObj->ip, pServerObj->port);
-    return;
-  } else {
-    tTrace("%s TCP server is ready, ip:%s, port:%hu", pServerObj->label, pServerObj->ip, pServerObj->port);
-  }
-
-  while (1) {
-    socklen_t addrlen = sizeof(clientAddr);
-    connFd = accept(sockFd, (struct sockaddr *)&clientAddr, &addrlen);
-
-    if (connFd < 0) {
-      tError("%s TCP accept failure, errno:%d, reason:%s", pServerObj->label, errno, strerror(errno));
-      continue;
-    }
-
-    tTrace("%s TCP connection from ip:%s port:%hu", pServerObj->label, inet_ntoa(clientAddr.sin_addr),
-           htons(clientAddr.sin_port));
-    taosKeepTcpAlive(connFd);
-
-    // pick up the thread to handle this connection
-    pThreadObj = pServerObj->pThreadObj + threadId;
-
-    pFdObj = (SFdObj *)malloc(sizeof(SFdObj));
-    if (pFdObj == NULL) {
-      tError("%s no enough resource to allocate TCP FD IDs", pServerObj->label);
-      close(connFd);
-      continue;
-    }
-
-    memset(pFdObj, 0, sizeof(SFdObj));
-    pFdObj->fd = connFd;
-    strcpy(pFdObj->ipstr, inet_ntoa(clientAddr.sin_addr));
-    pFdObj->ip = clientAddr.sin_addr.s_addr;
-    pFdObj->port = htons(clientAddr.sin_port);
-    pFdObj->pThreadObj = pThreadObj;
-    pFdObj->signature = pFdObj;
-
-    event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
-    event.data.ptr = pFdObj;
-    if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {
-      tError("%s failed to add TCP FD for epoll, error:%s", pServerObj->label, strerror(errno));
-      tfree(pFdObj);
-      close(connFd);
-      continue;
-    }
-
-    // notify the data process, add into the FdObj list
-    pthread_mutex_lock(&(pThreadObj->threadMutex));
-
-    pFdObj->next = pThreadObj->pHead;
-
-    if (pThreadObj->pHead) (pThreadObj->pHead)->prev = pFdObj;
-
-    pThreadObj->pHead = pFdObj;
-
-    pThreadObj->numOfFds++;
-    pthread_cond_signal(&pThreadObj->fdReady);
-
-    pthread_mutex_unlock(&(pThreadObj->threadMutex));
-
-    tTrace("%s TCP thread:%d, a new connection, ip:%s port:%hu, numOfFds:%d", pServerObj->label, pThreadObj->threadId,
-           pFdObj->ipstr, pFdObj->port, pThreadObj->numOfFds);
-
-    // pick up next thread for next connection
-    threadId++;
-    threadId = threadId % pServerObj->numOfThreads;
-  }
-}
-
-void taosAcceptUDConnection(void *arg) {
-  int                connFd = -1;
-  int                sockFd;
-  int                threadId = 0;
-  SThreadObj *       pThreadObj;
-  SServerObj *       pServerObj;
-  SFdObj *           pFdObj;
-  struct epoll_event event;
-
-  pServerObj = (SServerObj *)arg;
-  sockFd = taosOpenUDServerSocket(pServerObj->ip, pServerObj->port);
-
-  if (sockFd < 0) {
-    tError("%s failed to open UD socket, ip:%s, port:%hu", pServerObj->label, pServerObj->ip, pServerObj->port);
-    return;
-  } else {
-    tTrace("%s UD server is ready, ip:%s, port:%hu", pServerObj->label, pServerObj->ip, pServerObj->port);
-  }
-
-  while (1) {
-    connFd = accept(sockFd, NULL, NULL);
-
-    if (connFd < 0) {
-      tError("%s UD accept failure, errno:%d, reason:%s", pServerObj->label, errno, strerror(errno));
-      continue;
-    }
-
-    // pick up the thread to handle this connection
-    pThreadObj = pServerObj->pThreadObj + threadId;
-
-    pFdObj = (SFdObj *)malloc(sizeof(SFdObj));
-    if (pFdObj == NULL) {
-      tError("%s no enough resource to allocate TCP FD IDs", pServerObj->label);
-      close(connFd);
-      continue;
-    }
-
-    memset(pFdObj, 0, sizeof(SFdObj));
-    pFdObj->fd = connFd;
-    pFdObj->pThreadObj = pThreadObj;
-
-    event.events = EPOLLIN | EPOLLPRI | EPOLLWAKEUP;
-    event.data.ptr = pFdObj;
-    if (epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {
-      tError("%s failed to add UD FD for epoll, error:%s", pServerObj->label, strerror(errno));
-      tfree(pFdObj);
-      close(connFd);
-      continue;
-    }
-
-    // notify the data process, add into the FdObj list
-    pthread_mutex_lock(&(pThreadObj->threadMutex));
-
-    pFdObj->next = pThreadObj->pHead;
-
-    if (pThreadObj->pHead) (pThreadObj->pHead)->prev = pFdObj;
-
-    pThreadObj->pHead = pFdObj;
-
-    pThreadObj->numOfFds++;
-    pthread_cond_signal(&pThreadObj->fdReady);
-
-    pthread_mutex_unlock(&(pThreadObj->threadMutex));
-
-    tTrace("%s UD thread:%d, a new connection, numOfFds:%d", pServerObj->label, pThreadObj->threadId,
-           pThreadObj->numOfFds);
-
-    // pick up next thread for next connection
-    threadId++;
-    threadId = threadId % pServerObj->numOfThreads;
-  }
-}
-
-void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle) {
-  int            i;
-  SServerObj *   pServerObj;
-  pthread_attr_t thattr;
-  SThreadObj *   pThreadObj;
-
-  pServerObj = (SServerObj *)malloc(sizeof(SServerObj));
-  strcpy(pServerObj->ip, ip);
-  pServerObj->port = port;
-  strcpy(pServerObj->label, label);
-  pServerObj->numOfThreads = numOfThreads;
-
-  pServerObj->pThreadObj = (SThreadObj *)malloc(sizeof(SThreadObj) * (size_t)numOfThreads);
-  if (pServerObj->pThreadObj == NULL) {
-    tError("TCP:%s no enough memory", label);
-    return NULL;
-  }
-  memset(pServerObj->pThreadObj, 0, sizeof(SThreadObj) * (size_t)numOfThreads);
-
-  pThreadObj = pServerObj->pThreadObj;
-  for (i = 0; i < numOfThreads; ++i) {
-    pThreadObj->processData = fp;
-    strcpy(pThreadObj->label, label);
-    pThreadObj->shandle = shandle;
-
-    if (pthread_mutex_init(&(pThreadObj->threadMutex), NULL) < 0) {
-      tError("%s failed to init TCP process data mutex, reason:%s", label, strerror(errno));
-      return NULL;
-    }
-
-    if (pthread_cond_init(&(pThreadObj->fdReady), NULL) != 0) {
-      tError("%s init TCP condition variable failed, reason:%s\n", label, strerror(errno));
-      return NULL;
-    }
-
-    pThreadObj->pollFd = epoll_create(10);  // size does not matter
-    if (pThreadObj->pollFd < 0) {
-      tError("%s failed to create TCP epoll", label);
-      return NULL;
-    }
-
-    pthread_attr_init(&thattr);
-    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
-    if (pthread_create(&(pThreadObj->thread), &thattr, (void *)taosProcessTcpData, (void *)(pThreadObj)) != 0) {
-      tError("%s failed to create TCP process data thread, reason:%s", label, strerror(errno));
-      return NULL;
-    }
-
-    pThreadObj->threadId = i;
-    pThreadObj++;
-  }
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
-  if (pthread_create(&(pServerObj->thread), &thattr, (void *)taosAcceptTcpConnection, (void *)(pServerObj)) != 0) {
-    tError("%s failed to create TCP accept thread, reason:%s", label, strerror(errno));
-    return NULL;
-  }
-
-  /*
-    if ( pthread_create(&(pServerObj->thread), &thattr,
-    (void*)taosAcceptUDConnection, (void *)(pServerObj)) != 0 ) {
-      tError("%s failed to create UD accept thread, reason:%s", label,
-    strerror(errno));
-      return NULL;
-    }
-  */
-  pthread_attr_destroy(&thattr);
-  tTrace("%s TCP server is initialized, ip:%s port:%hu numOfThreads:%d", label, ip, port, numOfThreads);
-
-  return (void *)pServerObj;
-}
-
-#if 0
-void taosListTcpConnection(void *handle, char *buffer) {
-  SServerObj *pServerObj;
-  SThreadObj *pThreadObj;
-  SFdObj *    pFdObj;
-  int         i, numOfFds, numOfConns;
-  char *      msg;
-
-  pServerObj = (SServerObj *)handle;
-  buffer[0] = 0;
-  msg = buffer;
-  numOfConns = 0;
-
-  pThreadObj = pServerObj->pThreadObj;
-
-  for (i = 0; i < pServerObj->numOfThreads; ++i) {
-    numOfFds = 0;
-    sprintf(msg, "TCP:%s Thread:%d number of connections:%d\n", pServerObj->label, pThreadObj->threadId,
-            pThreadObj->numOfFds);
-    msg = msg + strlen(msg);
-    pFdObj = pThreadObj->pHead;
-    while (pFdObj) {
-      sprintf(msg, "   ip:%s port:%hu\n", pFdObj->ipstr, pFdObj->port);
-      msg = msg + strlen(msg);
-      numOfFds++;
-      numOfConns++;
-      pFdObj = pFdObj->next;
-    }
-
-    if (numOfFds != pThreadObj->numOfFds)
-      tError("TCP:%s thread:%d BIG error, numOfFds:%d actual numOfFds:%d", pServerObj->label, pThreadObj->threadId,
-             pThreadObj->numOfFds, numOfFds);
-
-    pThreadObj++;
-  }
-
-  sprintf(msg, "TCP:%s total connections:%d\n", pServerObj->label, numOfConns);
-
-  return;
-}
-#endif
-
-int taosSendTcpServerData(uint32_t ip, uint16_t port, char *data, int len, void *chandle) {
-  SFdObj *pFdObj = (SFdObj *)chandle;
-
-  if (chandle == NULL) return -1;
-
-  return (int)send(pFdObj->fd, data, (size_t)len, 0);
-}
diff --git a/src/rpc/src/tudp.c b/src/rpc/src/tudp.c
deleted file mode 100644
index db3e5e81c43754abe46cd907463737ceeb2b1116..0000000000000000000000000000000000000000
--- a/src/rpc/src/tudp.c
+++ /dev/null
@@ -1,788 +0,0 @@
-/*
- * 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 "os.h"
-#include "taosmsg.h"
-#include "thash.h"
-#include "thaship.h"
-#include "tlog.h"
-#include "tsocket.h"
-#include "tsystem.h"
-#include "ttimer.h"
-#include "tudp.h"
-#include "tutil.h"
-
-#define RPC_MAX_UDP_CONNS 256
-#define RPC_MAX_UDP_PKTS 1000
-#define RPC_UDP_BUF_TIME 5  // mseconds
-#define RPC_MAX_UDP_SIZE 65480
-
-int tsUdpDelay = 0;
-
-typedef struct {
-  void *          signature;
-  int             index;
-  int             fd;
-  uint16_t        port;       // peer port
-  uint16_t        localPort;  // local port
-  char            label[12];  // copy from udpConnSet;
-  pthread_t       thread;
-  pthread_mutex_t mutex;
-  void *          tmrCtrl;  // copy from UdpConnSet;
-  void *          hash;
-  void *          shandle;  // handle passed by upper layer during server initialization
-  void *          pSet;
-  void *(*processData)(char *data, int dataLen, unsigned int ip, uint16_t port, void *shandle, void *thandle,
-                       void *chandle);
-  char buffer[RPC_MAX_UDP_SIZE];  // buffer to receive data
-} SUdpConn;
-
-typedef struct {
-  int       index;
-  int       server;
-  char      ip[16];   // local IP
-  uint16_t  port;     // local Port
-  void *    shandle;  // handle passed by upper layer during server initialization
-  int       threads;
-  char      label[12];
-  void *    tmrCtrl;
-  pthread_t tcpThread;
-  int       tcpFd;
-  void *(*fp)(char *data, int dataLen, uint32_t ip, uint16_t port, void *shandle, void *thandle, void *chandle);
-  SUdpConn udpConn[];
-} SUdpConnSet;
-
-typedef struct {
-  void *             signature;
-  uint32_t           ip;    // dest IP
-  uint16_t           port;  // dest Port
-  SUdpConn *         pConn;
-  struct sockaddr_in destAdd;
-  void *             msgHdr;
-  int                totalLen;
-  void *             timer;
-  int                emptyNum;
-} SUdpBuf;
-
-typedef struct {
-  uint64_t handle;
-  uint16_t port;
-  int32_t  msgLen;
-} SPacketInfo;
-
-typedef struct {
-  int          fd;
-  uint32_t     ip;
-  uint16_t     port;
-  SUdpConnSet *pSet;
-} STransfer;
-
-typedef struct {
-  void *       pTimer;
-  SUdpConnSet *pSet;
-  SUdpConn *   pConn;
-  int          dataLen;
-  uint32_t     ip;
-  uint16_t     port;
-  char         data[96];
-} SMonitor;
-
-typedef struct {
-  uint64_t handle;
-  uint64_t hash;
-} SHandleViaTcp;
-
-bool taosCheckHandleViaTcpValid(SHandleViaTcp *handleViaTcp) {
-  return handleViaTcp->hash == taosHashUInt64(handleViaTcp->handle);
-}
-
-void taosInitHandleViaTcp(SHandleViaTcp *handleViaTcp, uint64_t handle) {
-  handleViaTcp->handle = handle;
-  handleViaTcp->hash = taosHashUInt64(handleViaTcp->handle);
-}
-
-void taosProcessMonitorTimer(void *param, void *tmrId) {
-  SMonitor *pMonitor = (SMonitor *)param;
-  if (pMonitor->pTimer != tmrId) return;
-
-  SUdpConnSet *pSet = pMonitor->pSet;
-  pMonitor->pTimer = NULL;
-
-  if (pSet) {
-    char *data = malloc((size_t)pMonitor->dataLen);
-    memcpy(data, pMonitor->data, (size_t)pMonitor->dataLen);
-
-    tTrace("%s monitor timer is expired, update the link status", pSet->label);
-    (*pSet->fp)(data, pMonitor->dataLen, pMonitor->ip, 0, pSet->shandle, NULL, NULL);
-    taosTmrReset(taosProcessMonitorTimer, 200, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer);
-  } else {
-    taosTmrStopA(&pMonitor->pTimer);
-    free(pMonitor);
-  }
-}
-
-void *taosReadTcpData(void *argv) {
-  SMonitor *   pMonitor = (SMonitor *)argv;
-  STaosHeader *pHead = (STaosHeader *)pMonitor->data;
-  SPacketInfo *pInfo = (SPacketInfo *)pHead->content;
-  SUdpConnSet *pSet = pMonitor->pSet;
-  int          retLen, fd;
-  char         ipstr[64];
-
-  pInfo->msgLen = (int32_t)htonl((uint32_t)pInfo->msgLen);
-
-  tinet_ntoa(ipstr, pMonitor->ip);
-  tTrace("%s receive packet via TCP:%s:%hu, msgLen:%d, handle:0x%x, source:0x%08x dest:0x%08x tranId:%d", pSet->label,
-         ipstr, pInfo->port, pInfo->msgLen, pInfo->handle, pHead->sourceId, pHead->destId, pHead->tranId);
-
-  fd = taosOpenTcpClientSocket(ipstr, (int16_t)pInfo->port, tsLocalIp);
-  if (fd < 0) {
-    tError("%s failed to open TCP client socket ip:%s:%hu", pSet->label, ipstr, pInfo->port);
-    pMonitor->pSet = NULL;
-    return NULL;
-  }
-
-  SHandleViaTcp handleViaTcp;
-  taosInitHandleViaTcp(&handleViaTcp, pInfo->handle);
-  retLen = (int)taosWriteSocket(fd, (char *)&handleViaTcp, sizeof(SHandleViaTcp));
-
-  if (retLen != (int)sizeof(SHandleViaTcp)) {
-    tError("%s failed to send handle:0x%x to server, retLen:%d", pSet->label, pInfo->handle, retLen);
-    pMonitor->pSet = NULL;
-  } else {
-    tTrace("%s handle:0x%x is sent to server", pSet->label, pInfo->handle);
-    char *buffer = malloc((size_t)pInfo->msgLen);
-    if (NULL == buffer) {
-      tError("%s failed to malloc(size:%d) for recv server data", pSet->label, pInfo->msgLen);
-      retLen = 0;
-      //taosCloseTcpSocket(fd);
-      //pMonitor->pSet = NULL;
-      //return NULL;
-    } else {
-      retLen = taosReadMsg(fd, buffer, pInfo->msgLen);
-    }
-    
-    pMonitor->pSet = NULL;
-
-    if (retLen != pInfo->msgLen) {
-      tError("%s failed to read data from server, msgLen:%d retLen:%d", pSet->label, pInfo->msgLen, retLen);
-      tfree(buffer);
-    } else {
-      (*pSet->fp)(buffer, pInfo->msgLen, pMonitor->ip, pInfo->port, pSet->shandle, NULL, pMonitor->pConn);
-    }
-  }
-
-  taosCloseTcpSocket(fd);
-
-  return NULL;
-}
-
-int taosReceivePacketViaTcp(uint32_t ip, STaosHeader *pHead, SUdpConn *pConn) {
-  SUdpConnSet *  pSet = pConn->pSet;
-  SPacketInfo *  pInfo = (SPacketInfo *)pHead->content;
-  int            code = 0;
-  pthread_attr_t thattr;
-  pthread_t      thread;
-
-  tTrace("%s receive packet via TCP, handle:0x%x, source:0x%08x dest:0x%08x tranId:%d", pSet->label, pInfo->handle,
-         pHead->sourceId, pHead->destId, pHead->tranId);
-
-  SMonitor *pMonitor = (SMonitor *)calloc(1, sizeof(SMonitor));
-  pMonitor->dataLen = sizeof(STaosHeader) + sizeof(SPacketInfo);
-  memcpy(pMonitor->data, pHead, (size_t)pMonitor->dataLen);
-  pMonitor->pSet = pSet;
-  pMonitor->ip = ip;
-  pMonitor->port = pInfo->port;
-  pMonitor->pConn = pConn;
-  taosTmrReset(taosProcessMonitorTimer, 0, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer);
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
-  code = pthread_create(&(thread), &thattr, taosReadTcpData, (void *)pMonitor);
-  if (code < 0) {
-    tTrace("%s failed to create thread to read tcp data, reason:%s", pSet->label, strerror(errno));
-    pMonitor->pSet = NULL;
-  }
-
-  pthread_attr_destroy(&thattr);
-  return code;
-}
-
-void *taosRecvUdpData(void *param) {
-  struct sockaddr_in sourceAdd;
-  unsigned int       addLen, dataLen;
-  SUdpConn *         pConn = (SUdpConn *)param;
-  uint16_t           port;
-  int                minSize = sizeof(STaosHeader);
-
-  memset(&sourceAdd, 0, sizeof(sourceAdd));
-  addLen = sizeof(sourceAdd);
-  tTrace("%s UDP thread is created, index:%d", pConn->label, pConn->index);
-
-  while (1) {
-    dataLen =
-        (uint32_t)recvfrom(pConn->fd, pConn->buffer, sizeof(pConn->buffer), 0, (struct sockaddr *)&sourceAdd, &addLen);
-    tTrace("%s msg is recv from 0x%x:%hu len:%d", pConn->label, sourceAdd.sin_addr.s_addr, ntohs(sourceAdd.sin_port),
-           dataLen);
-
-    if (dataLen < sizeof(STaosHeader)) {
-      tError("%s recvfrom failed, reason:%s\n", pConn->label, strerror(errno));
-      continue;
-    }
-
-    port = ntohs(sourceAdd.sin_port);
-
-    int   processedLen = 0, leftLen = 0;
-    int   msgLen = 0;
-    int   count = 0;
-    char *msg = pConn->buffer;
-    while (processedLen < (int)dataLen) {
-      leftLen = dataLen - processedLen;
-      STaosHeader *pHead = (STaosHeader *)msg;
-      msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
-      if (leftLen < minSize || msgLen > leftLen || msgLen < minSize) {
-        tError("%s msg is messed up, dataLen:%d processedLen:%d count:%d msgLen:%d", pConn->label, dataLen,
-               processedLen, count, msgLen);
-        break;
-      }
-
-      if (pHead->tcp == 1) {
-        taosReceivePacketViaTcp(sourceAdd.sin_addr.s_addr, (STaosHeader *)msg, pConn);
-      } else {
-        char *data = malloc((size_t)msgLen);
-        memcpy(data, msg, (size_t)msgLen);
-        (*(pConn->processData))(data, msgLen, sourceAdd.sin_addr.s_addr, port, pConn->shandle, NULL, pConn);
-      }
-
-      processedLen += msgLen;
-      msg += msgLen;
-      count++;
-    }
-
-    // tTrace("%s %d UDP packets are received together", pConn->label, count);
-  }
-
-  return NULL;
-}
-
-void *taosTransferDataViaTcp(void *argv) {
-  STransfer *  pTransfer = (STransfer *)argv;
-  int          connFd = pTransfer->fd;
-  int          msgLen, retLen, leftLen;
-  uint64_t     handle;
-  STaosHeader *pHeader = NULL, head;
-  SUdpConnSet *pSet = pTransfer->pSet;
-
-  SHandleViaTcp handleViaTcp;
-  retLen = taosReadMsg(connFd, &handleViaTcp, sizeof(SHandleViaTcp));
-
-  if (retLen != sizeof(SHandleViaTcp)) {
-    tError("%s UDP server failed to read handle, retLen:%d", pSet->label, retLen);
-    taosCloseSocket(connFd);
-    free(pTransfer);
-    return NULL;
-  }
-
-  if (!taosCheckHandleViaTcpValid(&handleViaTcp)) {
-    tError("%s UDP server read handle via tcp invalid, handle:%" PRIu64 ", hash:%" PRIu64, pSet->label, handleViaTcp.handle,
-           handleViaTcp.hash);
-    taosCloseSocket(connFd);
-    free(pTransfer);
-    return NULL;
-  }
-
-  handle = handleViaTcp.handle;
-
-  if (handle == 0) {
-    // receive a packet from client
-    tTrace("%s data will be received via TCP from 0x%x:%hu", pSet->label, pTransfer->ip, pTransfer->port);
-    retLen = taosReadMsg(connFd, &head, sizeof(STaosHeader));
-    if (retLen != (int)sizeof(STaosHeader)) {
-      tError("%s failed to read msg header, retLen:%d", pSet->label, retLen);
-    } else {
-      SMonitor *pMonitor = (SMonitor *)calloc(1, sizeof(SMonitor));
-      if (NULL == pMonitor) {
-        tError("%s malloc failed by TransferViaTcp from client", pSet->label);
-        taosCloseSocket(connFd);
-        free(pTransfer);
-        return NULL;
-      }
-      pMonitor->dataLen = sizeof(STaosHeader);
-      memcpy(pMonitor->data, &head, (size_t)pMonitor->dataLen);
-      ((STaosHeader *)pMonitor->data)->msgLen = (int32_t)htonl(sizeof(STaosHeader));
-      ((STaosHeader *)pMonitor->data)->tcp = 1;
-      pMonitor->ip = pTransfer->ip;
-      pMonitor->port = head.port;
-      pMonitor->pSet = pSet;
-      taosTmrReset(taosProcessMonitorTimer, 0, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer);
-
-      msgLen = (int32_t)htonl((uint32_t)head.msgLen);
-      char *buffer = malloc((size_t)msgLen);
-      if (NULL == buffer) {
-        tError("%s malloc failed for msg by TransferViaTcp", pSet->label);
-        taosCloseSocket(connFd);
-        free(pTransfer);
-        return NULL;
-      }
-
-      leftLen = msgLen - (int)sizeof(STaosHeader);
-      retLen = taosReadMsg(connFd, buffer + sizeof(STaosHeader), leftLen);
-      pMonitor->pSet = NULL;
-
-      if (retLen != leftLen) {
-        tError("%s failed to read data from client, leftLen:%d retLen:%d, error:%s", pSet->label, leftLen, retLen,
-               strerror(errno));
-      } else {
-        tTrace("%s data is received from client via TCP from 0x%x:%hu, msgLen:%d", pSet->label, pTransfer->ip,
-               pTransfer->port, msgLen);
-        pSet->index = (pSet->index + 1) % pSet->threads;
-        SUdpConn *pConn = pSet->udpConn + pSet->index;
-        memcpy(buffer, &head, sizeof(STaosHeader));
-        (*pSet->fp)(buffer, msgLen, pTransfer->ip, head.port, pSet->shandle, NULL, pConn);
-      }
-
-      taosWriteMsg(connFd, &handleViaTcp, sizeof(SHandleViaTcp));
-    }
-  } else {
-    // send a packet to client
-    tTrace("%s send packet to client via TCP, handle:0x%x", pSet->label, handle);
-    pHeader = (STaosHeader *)handle;
-    msgLen = (int32_t)htonl((uint32_t)pHeader->msgLen);
-
-    if (pHeader->tcp != 0 || msgLen < 1024) {
-      tError("%s invalid handle:%p, connection shall be closed", pSet->label, pHeader);
-    } else {
-      SMonitor *pMonitor = (SMonitor *)calloc(1, sizeof(SMonitor));
-      if (NULL == pMonitor) {
-        tError("%s malloc failed by TransferViaTcp to client", pSet->label);
-        taosCloseSocket(connFd);
-        free(pTransfer);
-        return NULL;
-      }
-      pMonitor->dataLen = sizeof(STaosHeader);
-      memcpy(pMonitor->data, (void *)handle, (size_t)pMonitor->dataLen);
-      STaosHeader *pThead = (STaosHeader *)pMonitor->data;
-      pThead->tcp = 1;
-      pThead->msgType = (char)(pHeader->msgType - 1);
-      pThead->msgLen = (int32_t)htonl(sizeof(STaosHeader));
-      uint32_t id = pThead->sourceId; pThead->sourceId = pThead->destId; pThead->destId = id;
-      pMonitor->ip = pTransfer->ip;
-      pMonitor->port = pTransfer->port;
-      pMonitor->pSet = pSet;
-      taosTmrReset(taosProcessMonitorTimer, 200, pMonitor, pSet->tmrCtrl, &pMonitor->pTimer);
-
-      retLen = taosWriteMsg(connFd, (void *)handle, msgLen);
-      pMonitor->pSet = NULL;
-
-      if (retLen != msgLen) {
-        tError("%s failed to send data to client, msgLen:%d retLen:%d", pSet->label, msgLen, retLen);
-      } else {
-        tTrace("%s data is sent to client successfully via TCP to 0x%x:%hu, size:%d", pSet->label, pTransfer->ip,
-               pTransfer->port, msgLen);
-      }
-    }
-  }
-
-  // retLen = taosReadMsg(connFd, &handleViaTcp, sizeof(handleViaTcp));
-  free(pTransfer);
-  taosCloseSocket(connFd);
-
-  return NULL;
-}
-
-void *taosUdpTcpConnection(void *argv) {
-  int                connFd = -1;
-  struct sockaddr_in clientAddr;
-  pthread_attr_t     thattr;
-  pthread_t          thread;
-  uint32_t           sourceIp;
-  char               ipstr[20];
-
-  SUdpConnSet *pSet = (SUdpConnSet *)argv;
-
-  pSet->tcpFd = taosOpenTcpServerSocket(pSet->ip, pSet->port);
-  if (pSet->tcpFd < 0) {
-    tPrint("%s failed to create TCP socket %s:%hu for UDP server, reason:%s", pSet->label, pSet->ip, pSet->port,
-           strerror(errno));
-    taosKillSystem();
-    return NULL;
-  }
-
-  tTrace("%s UDP server is created, ip:%s:%hu", pSet->label, pSet->ip, pSet->port);
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
-
-  while (1) {
-    if (pSet->tcpFd < 0) break;
-    socklen_t addrlen = sizeof(clientAddr);
-    connFd = accept(pSet->tcpFd, (struct sockaddr *)&clientAddr, &addrlen);
-
-    if (connFd < 0) {
-      tError("%s UDP server TCP accept failure, reason:%s", pSet->label, strerror(errno));
-      continue;
-    }
-
-    sourceIp = clientAddr.sin_addr.s_addr;
-    tinet_ntoa(ipstr, sourceIp);
-    tTrace("%s UDP server TCP connection from ip:%s:%u", pSet->label, ipstr, htons(clientAddr.sin_port));
-
-    STransfer *pTransfer = malloc(sizeof(STransfer));
-    pTransfer->fd = connFd;
-    pTransfer->ip = sourceIp;
-    pTransfer->port = clientAddr.sin_port;
-    pTransfer->pSet = pSet;
-
-    if (pthread_create(&(thread), &thattr, taosTransferDataViaTcp, (void *)pTransfer) < 0) {
-      tTrace("%s failed to create thread for UDP server, reason:%s", pSet->label, strerror(errno));
-      free(pTransfer);
-      taosCloseSocket(connFd);
-    }
-  }
-
-  pthread_attr_destroy(&thattr);
-  return NULL;
-}
-
-void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) {
-  pthread_attr_t thAttr;
-  SUdpConn *     pConn;
-  SUdpConnSet *  pSet;
-
-  int size = (int)sizeof(SUdpConnSet) + threads * (int)sizeof(SUdpConn);
-  pSet = (SUdpConnSet *)malloc((size_t)size);
-  if (pSet == NULL) {
-    tError("%s failed to allocate UdpConn", label);
-    return NULL;
-  }
-
-  memset(pSet, 0, (size_t)size);
-  strcpy(pSet->ip, ip);
-  pSet->port = port;
-  pSet->shandle = shandle;
-  pSet->fp = fp;
-  pSet->tcpFd = -1;
-  strcpy(pSet->label, label);
-
-  //  if ( tsUdpDelay ) {
-  char udplabel[12];
-  sprintf(udplabel, "%s.b", label);
-  pSet->tmrCtrl = taosTmrInit(RPC_MAX_UDP_CONNS * threads, 5, 5000, udplabel);
-  if (pSet->tmrCtrl == NULL) {
-    tError("%s failed to initialize tmrCtrl") taosCleanUpUdpConnection(pSet);
-    return NULL;
-  }
-  //  }
-
-  pthread_attr_init(&thAttr);
-  pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
-
-  uint16_t ownPort;
-  for (int i = 0; i < threads; ++i) {
-    pConn = pSet->udpConn + i;
-    ownPort = (port ? port + i : 0);
-    pConn->fd = taosOpenUdpSocket(ip, ownPort);
-    if (pConn->fd < 0) {
-      tError("%s failed to open UDP socket %s:%hu", label, ip, port);
-      taosCleanUpUdpConnection(pSet);
-      return NULL;
-    }
-
-    struct sockaddr_in sin;
-    unsigned int       addrlen = sizeof(sin);
-    if (getsockname(pConn->fd, (struct sockaddr *)&sin, &addrlen) == 0 && sin.sin_family == AF_INET &&
-        addrlen == sizeof(sin)) {
-      pConn->localPort = (int16_t)ntohs(sin.sin_port);
-    }
-
-    strcpy(pConn->label, label);
-
-    if (pthread_create(&pConn->thread, &thAttr, taosRecvUdpData, pConn) != 0) {
-      tError("%s failed to create thread to process UDP data, reason:%s", label, strerror(errno));
-      taosCloseSocket(pConn->fd);
-      taosCleanUpUdpConnection(pSet);
-      return NULL;
-    }
-
-    pConn->shandle = shandle;
-    pConn->processData = fp;
-    pConn->index = i;
-    pConn->pSet = pSet;
-    pConn->signature = pConn;
-    if (tsUdpDelay) {
-      pConn->hash = taosOpenIpHash(RPC_MAX_UDP_CONNS);
-      pthread_mutex_init(&pConn->mutex, NULL);
-      pConn->tmrCtrl = pSet->tmrCtrl;
-    }
-    ++pSet->threads;
-  }
-
-  pthread_attr_destroy(&thAttr);
-  tTrace("%s UDP connection is initialized, ip:%s port:%hu threads:%d", label, ip, port, threads);
-
-  return pSet;
-}
-
-void *taosInitUdpServer(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) {
-  SUdpConnSet *pSet;
-  pSet = taosInitUdpConnection(ip, port, label, threads, fp, shandle);
-  if (pSet == NULL) return NULL;
-
-  pSet->server = 1;
-  pSet->fp = fp;
-
-  pthread_attr_t thattr;
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
-
-  // not support by windows
-  // pthread_t thread;
-  // pSet->tcpThread = pthread_create(&(thread), &thattr, taosUdpTcpConnection, pSet);
-  pthread_create(&(pSet->tcpThread), &thattr, taosUdpTcpConnection, pSet);
-  pthread_attr_destroy(&thattr);
-
-  return pSet;
-}
-
-void *taosInitUdpClient(char *ip, uint16_t port, char *label, int threads, void *fp, void *shandle) {
-  return taosInitUdpConnection(ip, port, label, threads, fp, shandle);
-}
-
-void taosCleanUpUdpConnection(void *handle) {
-  SUdpConnSet *pSet = (SUdpConnSet *)handle;
-  SUdpConn *   pConn;
-
-  if (pSet == NULL) return;
-  if (pSet->server == 1) {
-    pthread_cancel(pSet->tcpThread);
-  }
-
-  for (int i = 0; i < pSet->threads; ++i) {
-    pConn = pSet->udpConn + i;
-    pConn->signature = NULL;
-    pthread_cancel(pConn->thread);
-    taosCloseSocket(pConn->fd);
-    if (pConn->hash) {
-      taosCloseIpHash(pConn->hash);
-      pthread_mutex_destroy(&pConn->mutex);
-    }
-  }
-
-  for (int i = 0; i < pSet->threads; ++i) {
-    pConn = pSet->udpConn + i;
-    pthread_join(pConn->thread, NULL);
-    tTrace("chandle:%p is closed", pConn);
-  }
-
-  if (pSet->tcpFd >= 0) taosCloseTcpSocket(pSet->tcpFd);
-  pSet->tcpFd = -1;
-  taosTmrCleanUp(pSet->tmrCtrl);
-  tfree(pSet);
-}
-
-void *taosOpenUdpConnection(void *shandle, void *thandle, char *ip, uint16_t port) {
-  SUdpConnSet *pSet = (SUdpConnSet *)shandle;
-
-  pSet->index = (pSet->index + 1) % pSet->threads;
-
-  SUdpConn *pConn = pSet->udpConn + pSet->index;
-  pConn->port = port;
-
-  tTrace("%s UDP connection is setup, ip: %s:%hu, local: %s:%d", pConn->label, ip, port, pSet->ip,
-         ntohs((uint16_t)pConn->localPort));
-
-  return pConn;
-}
-
-void taosRemoveUdpBuf(SUdpBuf *pBuf) {
-  taosTmrStopA(&pBuf->timer);
-  taosDeleteIpHash(pBuf->pConn->hash, pBuf->ip, pBuf->port);
-
-  // tTrace("%s UDP buffer to:0x%lld:%d is removed", pBuf->pConn->label,
-  // pBuf->ip, pBuf->port);
-
-  pBuf->signature = NULL;
-  taosFreeMsgHdr(pBuf->msgHdr);
-  free(pBuf);
-}
-
-void taosProcessUdpBufTimer(void *param, void *tmrId) {
-  SUdpBuf *pBuf = (SUdpBuf *)param;
-  if (pBuf->signature != param) return;
-  if (pBuf->timer != tmrId) return;
-
-  SUdpConn *pConn = pBuf->pConn;
-
-  pthread_mutex_lock(&pConn->mutex);
-
-  if (taosMsgHdrSize(pBuf->msgHdr) > 0) {
-    taosSendMsgHdr(pBuf->msgHdr, pConn->fd);
-    pBuf->totalLen = 0;
-    pBuf->emptyNum = 0;
-  } else {
-    pBuf->emptyNum++;
-    if (pBuf->emptyNum > 200) {
-      taosRemoveUdpBuf(pBuf);
-      pBuf = NULL;
-    }
-  }
-
-  pthread_mutex_unlock(&pConn->mutex);
-
-  if (pBuf) taosTmrReset(taosProcessUdpBufTimer, RPC_UDP_BUF_TIME, pBuf, pConn->tmrCtrl, &pBuf->timer);
-}
-
-SUdpBuf *taosCreateUdpBuf(SUdpConn *pConn, uint32_t ip, uint16_t port) {
-  SUdpBuf *pBuf = (SUdpBuf *)malloc(sizeof(SUdpBuf));
-  memset(pBuf, 0, sizeof(SUdpBuf));
-
-  pBuf->ip = ip;
-  pBuf->port = port;
-  pBuf->pConn = pConn;
-
-  pBuf->destAdd.sin_family = AF_INET;
-  pBuf->destAdd.sin_addr.s_addr = ip;
-  pBuf->destAdd.sin_port = (uint16_t)htons(port);
-  taosInitMsgHdr(&(pBuf->msgHdr), &(pBuf->destAdd), RPC_MAX_UDP_PKTS);
-  pBuf->signature = pBuf;
-  taosTmrReset(taosProcessUdpBufTimer, RPC_UDP_BUF_TIME, pBuf, pConn->tmrCtrl, &pBuf->timer);
-
-  // tTrace("%s UDP buffer to:0x%lld:%d is created", pBuf->pConn->label,
-  // pBuf->ip, pBuf->port);
-
-  return pBuf;
-}
-
-int taosSendPacketViaTcp(uint32_t ip, uint16_t port, char *data, int dataLen, void *chandle) {
-  SUdpConn *   pConn = (SUdpConn *)chandle;
-  SUdpConnSet *pSet = (SUdpConnSet *)pConn->pSet;
-  int          code = -1, retLen, msgLen;
-  char         ipstr[64];
-  char         buffer[128];
-  STaosHeader *pHead;
-
-  if (pSet->server) {
-    // send from server
-
-    pHead = (STaosHeader *)buffer;
-    memcpy(pHead, data, sizeof(STaosHeader));
-    pHead->tcp = 1;
-
-    SPacketInfo *pInfo = (SPacketInfo *)pHead->content;
-    pInfo->handle = (uint64_t)data;
-    pInfo->port   = pSet->port;
-    pInfo->msgLen = pHead->msgLen;
-
-    msgLen = sizeof(STaosHeader) + sizeof(SPacketInfo);
-    pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
-    code = taosSendUdpData(ip, port, buffer, msgLen, chandle);
-    tTrace("%s data from server will be sent via TCP:%hu, msgType:%d, length:%d, handle:0x%x", pSet->label, pInfo->port,
-           pHead->msgType, htonl((uint32_t)pInfo->msgLen), pInfo->handle);
-    if (code > 0) code = dataLen;
-  } else {
-    // send from client
-    tTrace("%s data will be sent via TCP from client", pSet->label);
-
-    // send a UDP header first to set up the connection
-    pHead = (STaosHeader *)buffer;
-    memcpy(pHead, data, sizeof(STaosHeader));
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wbitfield-constant-conversion"
-    pHead->tcp = 2;
-#pragma GCC diagnostic pop
-
-    msgLen = sizeof(STaosHeader);
-    pHead->msgLen = (int32_t)htonl(msgLen);
-    code = taosSendUdpData(ip, port, buffer, msgLen, chandle);
-
-    //pHead = (STaosHeader *)data;
-
-    tinet_ntoa(ipstr, ip);
-    int fd = taosOpenTcpClientSocket(ipstr, pConn->port, tsLocalIp);
-    if (fd < 0) {
-      tError("%s failed to open TCP socket to:%s:%hu to send packet", pSet->label, ipstr, pConn->port);
-    } else {
-      SHandleViaTcp handleViaTcp;
-      taosInitHandleViaTcp(&handleViaTcp, 0);
-      retLen = (int)taosWriteSocket(fd, (char *)&handleViaTcp, sizeof(SHandleViaTcp));
-
-      if (retLen != (int)sizeof(handleViaTcp)) {
-        tError("%s failed to send handle to server, retLen:%d", pSet->label, retLen);
-      } else {
-        retLen = taosWriteMsg(fd, data, dataLen);
-        if (retLen != dataLen) {
-          tError("%s failed to send data via TCP, dataLen:%d, retLen:%d, error:%s", pSet->label, dataLen, retLen,
-                 strerror(errno));
-        } else {
-          code = dataLen;
-          tTrace("%s data is sent via TCP successfully", pSet->label);
-        }
-      }
-
-      taosReadMsg(fd, (char *)&handleViaTcp, sizeof(SHandleViaTcp));
-
-      taosCloseTcpSocket(fd);
-    }
-  }
-
-  return code;
-}
-
-int taosSendUdpData(uint32_t ip, uint16_t port, char *data, int dataLen, void *chandle) {
-  SUdpConn *pConn = (SUdpConn *)chandle;
-  SUdpBuf * pBuf;
-
-  if (pConn == NULL || pConn->signature != pConn) return -1;
-
-  if (dataLen >= RPC_MAX_UDP_SIZE) return taosSendPacketViaTcp(ip, port, data, dataLen, chandle);
-
-  if (pConn->hash == NULL) {
-    struct sockaddr_in destAdd;
-    memset(&destAdd, 0, sizeof(destAdd));
-    destAdd.sin_family = AF_INET;
-    destAdd.sin_addr.s_addr = ip;
-    destAdd.sin_port = htons(port);
-
-    int ret = (int)sendto(pConn->fd, data, (size_t)dataLen, 0, (struct sockaddr *)&destAdd, sizeof(destAdd));
-    tTrace("%s msg is sent to 0x%x:%hu len:%d ret:%d localPort:%hu chandle:0x%x", pConn->label, destAdd.sin_addr.s_addr,
-           port, dataLen, ret, pConn->localPort, chandle);
-
-    return ret;
-  }
-
-  pthread_mutex_lock(&pConn->mutex);
-
-  pBuf = (SUdpBuf *)taosGetIpHash(pConn->hash, ip, port);
-  if (pBuf == NULL) {
-    pBuf = taosCreateUdpBuf(pConn, ip, port);
-    taosAddIpHash(pConn->hash, pBuf, ip, port);
-  }
-
-  if ((pBuf->totalLen + dataLen > RPC_MAX_UDP_SIZE) || (taosMsgHdrSize(pBuf->msgHdr) >= RPC_MAX_UDP_PKTS)) {
-    taosTmrReset(taosProcessUdpBufTimer, RPC_UDP_BUF_TIME, pBuf, pConn->tmrCtrl, &pBuf->timer);
-
-    taosSendMsgHdr(pBuf->msgHdr, pConn->fd);
-    pBuf->totalLen = 0;
-  }
-
-  taosSetMsgHdrData(pBuf->msgHdr, data, dataLen);
-
-  pBuf->totalLen += dataLen;
-
-  pthread_mutex_unlock(&pConn->mutex);
-
-  return dataLen;
-}
diff --git a/src/rpc/test/CMakeLists.txt b/src/rpc/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..383ce1b0f64cb218800211de3576af58056c6af1
--- /dev/null
+++ b/src/rpc/test/CMakeLists.txt
@@ -0,0 +1,18 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/rpc/inc)
+
+IF (TD_LINUX)
+  LIST(APPEND CLIENT_SRC ./rclient.c)
+  ADD_EXECUTABLE(rclient ${CLIENT_SRC})
+  TARGET_LINK_LIBRARIES(rclient trpc)
+
+  LIST(APPEND SCLIENT_SRC ./rsclient.c)
+  ADD_EXECUTABLE(rsclient ${SCLIENT_SRC})
+  TARGET_LINK_LIBRARIES(rsclient trpc)
+
+  LIST(APPEND SERVER_SRC ./rserver.c)
+  ADD_EXECUTABLE(rserver ${SERVER_SRC})
+  TARGET_LINK_LIBRARIES(rserver trpc)
+ENDIF ()
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a963e9ce47f7c89edc0204d6502d548dbdb40eb
--- /dev/null
+++ b/src/rpc/test/rclient.c
@@ -0,0 +1,198 @@
+/*
+ * 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 "os.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "rpcLog.h"
+#include "trpc.h"
+#include "taoserror.h"
+
+typedef struct {
+  int       index;
+  SRpcEpSet epSet;
+  int       num;
+  int       numOfReqs;
+  int       msgSize;
+  tsem_t    rspSem; 
+  tsem_t   *pOverSem; 
+  pthread_t thread;
+  void     *pRpc;
+} SInfo;
+
+static void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SInfo *pInfo = (SInfo *)pMsg->ahandle;
+  tDebug("thread:%d, response is received, type:%d contLen:%d code:0x%x", pInfo->index, pMsg->msgType, pMsg->contLen, pMsg->code);
+
+  if (pEpSet) pInfo->epSet = *pEpSet;
+
+  rpcFreeCont(pMsg->pCont);
+  tsem_post(&pInfo->rspSem); 
+}
+
+static int tcount = 0;
+
+static void *sendRequest(void *param) {
+  SInfo  *pInfo = (SInfo *)param;
+  SRpcMsg rpcMsg = {0}; 
+  
+  tDebug("thread:%d, start to send request", pInfo->index);
+
+  while ( pInfo->numOfReqs == 0 || pInfo->num < pInfo->numOfReqs) {
+    pInfo->num++;
+    rpcMsg.pCont = rpcMallocCont(pInfo->msgSize);
+    rpcMsg.contLen = pInfo->msgSize;
+    rpcMsg.ahandle = pInfo;
+    rpcMsg.msgType = 1;
+    tDebug("thread:%d, send request, contLen:%d num:%d", pInfo->index, pInfo->msgSize, pInfo->num);
+    rpcSendRequest(pInfo->pRpc, &pInfo->epSet, &rpcMsg);
+    if ( pInfo->num % 20000 == 0 ) 
+      tInfo("thread:%d, %d requests have been sent", pInfo->index, pInfo->num);
+    tsem_wait(&pInfo->rspSem);
+  }
+
+  tDebug("thread:%d, it is over", pInfo->index);
+  tcount++;
+
+  return NULL;
+}
+
+int main(int argc, char *argv[]) {
+  SRpcInit  rpcInit;
+  SRpcEpSet epSet;
+  int      msgSize = 128;
+  int      numOfReqs = 0;
+  int      appThreads = 1;
+  char     serverIp[40] = "127.0.0.1";
+  char     secret[TSDB_KEY_LEN] = "mypassword";
+  struct   timeval systemTime;
+  int64_t  startTime, endTime;
+  pthread_attr_t thattr;
+
+  // server info
+  epSet.numOfEps = 1;
+  epSet.inUse = 0;
+  epSet.port[0] = 7000;
+  epSet.port[1] = 7000;
+  strcpy(epSet.fqdn[0], serverIp);
+  strcpy(epSet.fqdn[1], "192.168.0.1");
+
+  // client info
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort    = 0;
+  rpcInit.label        = "APP";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = processResponse;
+  rpcInit.sessions     = 100;
+  rpcInit.idleTime     = tsShellActivityTimer*1000;
+  rpcInit.user         = "michael";
+  rpcInit.secret       = secret;
+  rpcInit.ckey         = "key";
+  rpcInit.spi          = 1;
+  rpcInit.connType     = TAOS_CONN_CLIENT;
+
+  for (int i=1; i<argc; ++i) { 
+    if (strcmp(argv[i], "-p")==0 && i < argc-1) {
+      epSet.port[0] = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-i") ==0 && i < argc-1) {
+      tstrncpy(epSet.fqdn[0], argv[++i], sizeof(epSet.fqdn[0])); 
+    } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
+      rpcInit.numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
+      msgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s")==0 && i < argc-1) {
+      rpcInit.sessions = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-n")==0 && i < argc-1) {
+      numOfReqs = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-a")==0 && i < argc-1) {
+      appThreads = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-o")==0 && i < argc-1) {
+      tsCompressMsgSize = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-u")==0 && i < argc-1) {
+      rpcInit.user = argv[++i];
+    } else if (strcmp(argv[i], "-k")==0 && i < argc-1) {
+      rpcInit.secret = argv[++i];
+    } else if (strcmp(argv[i], "-spi")==0 && i < argc-1) {
+      rpcInit.spi = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+      rpcDebugFlag = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-i ip]: first server IP address, default is:%s\n", serverIp);
+      printf("  [-p port]: server port number, default is:%d\n", epSet.port[0]);
+      printf("  [-t threads]: number of rpc threads, default is:%d\n", rpcInit.numOfThreads);
+      printf("  [-s sessions]: number of rpc sessions, default is:%d\n", rpcInit.sessions);
+      printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
+      printf("  [-a threads]: number of app threads, default is:%d\n", appThreads);
+      printf("  [-n requests]: number of requests per thread, default is:%d\n", numOfReqs);
+      printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
+      printf("  [-u user]: user name for the connection, default is:%s\n", rpcInit.user);
+      printf("  [-k secret]: password for the connection, default is:%s\n", rpcInit.secret);
+      printf("  [-spi SPI]: security parameter index, default is:%d\n", rpcInit.spi);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  }
+
+  taosInitLog("client.log", 100000, 10);
+
+  void *pRpc = rpcOpen(&rpcInit);
+  if (pRpc == NULL) {
+    tError("failed to initialize RPC");
+    return -1;
+  }
+
+  tInfo("client is initialized");
+  tInfo("threads:%d msgSize:%d requests:%d", appThreads, msgSize, numOfReqs);
+
+  gettimeofday(&systemTime, NULL);
+  startTime = systemTime.tv_sec*1000000 + systemTime.tv_usec;
+
+  SInfo *pInfo = (SInfo *)calloc(1, sizeof(SInfo)*appThreads);
+ 
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+
+  for (int i=0; i<appThreads; ++i) {
+    pInfo->index = i;
+    pInfo->epSet = epSet;
+    pInfo->numOfReqs = numOfReqs;
+    pInfo->msgSize = msgSize;
+    tsem_init(&pInfo->rspSem, 0, 0);
+    pInfo->pRpc = pRpc;
+    pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
+    pInfo++;
+  }
+
+  do {
+    usleep(1);
+  } while ( tcount < appThreads);
+
+  gettimeofday(&systemTime, NULL);
+  endTime = systemTime.tv_sec*1000000 + systemTime.tv_usec;  
+  float usedTime = (endTime - startTime)/1000.0f;  // mseconds
+
+  tInfo("it takes %.3f mseconds to send %d requests to server", usedTime, numOfReqs*appThreads);
+  tInfo("Performance: %.3f requests per second, msgSize:%d bytes", 1000.0*numOfReqs*appThreads/usedTime, msgSize);
+
+  getchar();
+
+  taosCloseLog();
+
+  return 0;
+}
+
+
diff --git a/src/rpc/test/rsclient.c b/src/rpc/test/rsclient.c
new file mode 100644
index 0000000000000000000000000000000000000000..a152d8e4a51502357530267acb924c74426c9509
--- /dev/null
+++ b/src/rpc/test/rsclient.c
@@ -0,0 +1,196 @@
+/*
+ * 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 "os.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "rpcLog.h"
+#include "trpc.h"
+#include "taoserror.h"
+
+typedef struct {
+  int       index;
+  SRpcEpSet epSet;
+  int       num;
+  int       numOfReqs;
+  int       msgSize;
+  tsem_t    rspSem; 
+  tsem_t   *pOverSem; 
+  pthread_t thread;
+  void     *pRpc;
+} SInfo;
+
+
+static int tcount = 0;
+static int terror = 0;
+
+static void *sendRequest(void *param) {
+  SInfo  *pInfo = (SInfo *)param;
+  SRpcMsg rpcMsg, rspMsg; 
+  
+  tDebug("thread:%d, start to send request", pInfo->index);
+
+  while ( pInfo->numOfReqs == 0 || pInfo->num < pInfo->numOfReqs) {
+    pInfo->num++;
+    rpcMsg.pCont = rpcMallocCont(pInfo->msgSize);
+    rpcMsg.contLen = pInfo->msgSize;
+    rpcMsg.handle = pInfo;
+    rpcMsg.msgType = 1;
+    tDebug("thread:%d, send request, contLen:%d num:%d", pInfo->index, pInfo->msgSize, pInfo->num);
+
+    rpcSendRecv(pInfo->pRpc, &pInfo->epSet, &rpcMsg, &rspMsg);
+    
+    // handle response
+    if (rspMsg.code != 0) terror++;
+
+    tDebug("thread:%d, rspLen:%d code:%d", pInfo->index, rspMsg.contLen, rspMsg.code);
+
+    rpcFreeCont(rspMsg.pCont);
+
+    if ( pInfo->num % 20000 == 0 ) 
+      tInfo("thread:%d, %d requests have been sent", pInfo->index, pInfo->num);
+  }
+
+  tDebug("thread:%d, it is over", pInfo->index);
+  tcount++;
+
+  return NULL;
+}
+
+int main(int argc, char *argv[]) {
+  SRpcInit  rpcInit;
+  SRpcEpSet epSet;
+  int      msgSize = 128;
+  int      numOfReqs = 0;
+  int      appThreads = 1;
+  char     serverIp[40] = "127.0.0.1";
+  char     secret[TSDB_KEY_LEN] = "mypassword";
+  struct   timeval systemTime;
+  int64_t  startTime, endTime;
+  pthread_attr_t thattr;
+
+  // server info
+  epSet.numOfEps = 1;
+  epSet.inUse = 0;
+  epSet.port[0] = 7000;
+  epSet.port[1] = 7000;
+  strcpy(epSet.fqdn[0], serverIp);
+  strcpy(epSet.fqdn[1], "192.168.0.1");
+
+  // client info
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  //rpcInit.localIp      = "0.0.0.0";
+  rpcInit.localPort    = 0;
+  rpcInit.label        = "APP";
+  rpcInit.numOfThreads = 1;
+  rpcInit.sessions     = 100;
+  rpcInit.idleTime     = tsShellActivityTimer*1000;
+  rpcInit.user         = "michael";
+  rpcInit.secret       = secret;
+  rpcInit.ckey         = "key";
+  rpcInit.spi          = 1;
+  rpcInit.connType     = TAOS_CONN_CLIENT;
+
+  for (int i=1; i<argc; ++i) { 
+    if (strcmp(argv[i], "-p")==0 && i < argc-1) {
+      epSet.port[0] = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-i") ==0 && i < argc-1) {
+      tstrncpy(epSet.fqdn[0], argv[++i], sizeof(epSet.fqdn[0])); 
+    } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
+      rpcInit.numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
+      msgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s")==0 && i < argc-1) {
+      rpcInit.sessions = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-n")==0 && i < argc-1) {
+      numOfReqs = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-a")==0 && i < argc-1) {
+      appThreads = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-o")==0 && i < argc-1) {
+      tsCompressMsgSize = atoi(argv[++i]); 
+    } else if (strcmp(argv[i], "-u")==0 && i < argc-1) {
+      rpcInit.user = argv[++i];
+    } else if (strcmp(argv[i], "-k")==0 && i < argc-1) {
+      rpcInit.secret = argv[++i];
+    } else if (strcmp(argv[i], "-spi")==0 && i < argc-1) {
+      rpcInit.spi = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+      rpcDebugFlag = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-i ip]: first server IP address, default is:%s\n", serverIp);
+      printf("  [-p port]: server port number, default is:%d\n", epSet.port[0]);
+      printf("  [-t threads]: number of rpc threads, default is:%d\n", rpcInit.numOfThreads);
+      printf("  [-s sessions]: number of rpc sessions, default is:%d\n", rpcInit.sessions);
+      printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
+      printf("  [-a threads]: number of app threads, default is:%d\n", appThreads);
+      printf("  [-n requests]: number of requests per thread, default is:%d\n", numOfReqs);
+      printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
+      printf("  [-u user]: user name for the connection, default is:%s\n", rpcInit.user);
+      printf("  [-k secret]: password for the connection, default is:%s\n", rpcInit.secret);
+      printf("  [-spi SPI]: security parameter index, default is:%d\n", rpcInit.spi);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  }
+
+  taosInitLog("client.log", 100000, 10);
+
+  void *pRpc = rpcOpen(&rpcInit);
+  if (pRpc == NULL) {
+    tError("failed to initialize RPC");
+    return -1;
+  }
+
+  tInfo("client is initialized");
+
+  gettimeofday(&systemTime, NULL);
+  startTime = systemTime.tv_sec*1000000 + systemTime.tv_usec;
+
+  SInfo *pInfo = (SInfo *)calloc(1, sizeof(SInfo)*appThreads);
+ 
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+
+  for (int i=0; i<appThreads; ++i) {
+    pInfo->index = i;
+    pInfo->epSet = epSet;
+    pInfo->numOfReqs = numOfReqs;
+    pInfo->msgSize = msgSize;
+    tsem_init(&pInfo->rspSem, 0, 0);
+    pInfo->pRpc = pRpc;
+    pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
+    pInfo++;
+  }
+
+  do {
+    usleep(1);
+  } while ( tcount < appThreads);
+
+  gettimeofday(&systemTime, NULL);
+  endTime = systemTime.tv_sec*1000000 + systemTime.tv_usec;  
+  float usedTime = (endTime - startTime)/1000.0;  // mseconds
+
+  tInfo("it takes %.3f mseconds to send %d requests to server, error num:%d", usedTime, numOfReqs*appThreads, terror);
+  tInfo("Performance: %.3f requests per second, msgSize:%d bytes", 1000.0*numOfReqs*appThreads/usedTime, msgSize);
+
+  taosCloseLog();
+
+  return 0;
+}
+
+
diff --git a/src/rpc/test/rserver.c b/src/rpc/test/rserver.c
new file mode 100644
index 0000000000000000000000000000000000000000..44c5cd6ab48810496c1c141ba8563e1dead1de15
--- /dev/null
+++ b/src/rpc/test/rserver.c
@@ -0,0 +1,192 @@
+/*
+ * 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/>.
+ */
+
+//#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "rpcLog.h"
+#include "trpc.h"
+#include "tqueue.h"
+
+int msgSize = 128;
+int commit = 0;
+int dataFd = -1;
+void *qhandle = NULL;
+void *qset = NULL;
+
+void processShellMsg() {
+  static int num = 0;
+  taos_qall  qall;
+  SRpcMsg   *pRpcMsg, rpcMsg;
+  int        type;
+  void      *pvnode;
+ 
+  qall = taosAllocateQall();
+
+  while (1) {
+    int numOfMsgs = taosReadAllQitemsFromQset(qset, qall, &pvnode);
+    tDebug("%d shell msgs are received", numOfMsgs);
+    if (numOfMsgs <= 0) break;
+
+    for (int i=0; i<numOfMsgs; ++i) {
+      taosGetQitem(qall, &type, (void **)&pRpcMsg);
+ 
+      if (dataFd >=0) {
+        if ( write(dataFd, pRpcMsg->pCont, pRpcMsg->contLen) <0 ) {
+          tInfo("failed to write data file, reason:%s", strerror(errno));
+        }
+      }
+    }
+
+    if (commit >=2) {
+      num += numOfMsgs;
+      if ( fsync(dataFd) < 0 ) {
+        tInfo("failed to flush data to file, reason:%s", strerror(errno));
+      }
+
+      if (num % 10000 == 0) {
+        tInfo("%d request have been written into disk", num);
+      }
+    }
+  
+    taosResetQitems(qall);
+    for (int i=0; i<numOfMsgs; ++i) {
+
+      taosGetQitem(qall, &type, (void **)&pRpcMsg);
+      rpcFreeCont(pRpcMsg->pCont);
+
+      memset(&rpcMsg, 0, sizeof(rpcMsg));
+      rpcMsg.pCont = rpcMallocCont(msgSize);
+      rpcMsg.contLen = msgSize;
+      rpcMsg.handle = pRpcMsg->handle;
+      rpcMsg.code = 0;
+      rpcSendResponse(&rpcMsg);
+
+      taosFreeQitem(pRpcMsg);
+    }
+
+  }
+
+  taosFreeQall(qall);
+
+}
+
+int retrieveAuthInfo(char *meterId, char *spi, char *encrypt, char *secret, char *ckey) {
+  // app shall retrieve the auth info based on meterID from DB or a data file
+  // demo code here only for simple demo
+  int ret = 0;
+
+  if (strcmp(meterId, "michael") == 0) {
+    *spi = 1;
+    *encrypt = 0;
+    strcpy(secret, "mypassword");
+    strcpy(ckey, "key");
+  } else if (strcmp(meterId, "jeff") == 0) {
+    *spi = 0;
+    *encrypt = 0;
+  } else {
+    ret = -1;  // user not there
+  }
+
+  return ret;
+}
+
+void processRequestMsg(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SRpcMsg *pTemp;
+ 
+  pTemp = taosAllocateQitem(sizeof(SRpcMsg));
+  memcpy(pTemp, pMsg, sizeof(SRpcMsg));
+
+  tDebug("request is received, type:%d, contLen:%d, item:%p", pMsg->msgType, pMsg->contLen, pTemp);
+  taosWriteQitem(qhandle, TAOS_QTYPE_RPC, pTemp); 
+}
+
+int main(int argc, char *argv[]) {
+  SRpcInit rpcInit;
+  char     dataName[20] = "server.data";
+
+  taosBlockSIGPIPE();
+
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort    = 7000;
+  rpcInit.label        = "SER";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = processRequestMsg;
+  rpcInit.sessions     = 1000;
+  rpcInit.idleTime     = tsShellActivityTimer*1500; 
+  rpcInit.afp          = retrieveAuthInfo;
+
+  for (int i=1; i<argc; ++i) {
+    if (strcmp(argv[i], "-p")==0 && i < argc-1) {
+      rpcInit.localPort = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
+      rpcInit.numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
+      msgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s")==0 && i < argc-1) {
+      rpcInit.sessions = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-o")==0 && i < argc-1) {
+      tsCompressMsgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-w")==0 && i < argc-1) {
+      commit = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+      rpcDebugFlag = atoi(argv[++i]);
+      dDebugFlag = rpcDebugFlag;
+      uDebugFlag = rpcDebugFlag;
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-p port]: server port number, default is:%d\n", rpcInit.localPort);
+      printf("  [-t threads]: number of rpc threads, default is:%d\n", rpcInit.numOfThreads);
+      printf("  [-s sessions]: number of sessions, default is:%d\n", rpcInit.sessions);
+      printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
+      printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
+      printf("  [-w write]: write received data to file(0, 1, 2), default is:%d\n", commit);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  } 
+
+  tsAsyncLog = 0;
+  rpcInit.connType = TAOS_CONN_SERVER;
+  taosInitLog("server.log", 100000, 10);
+
+  void *pRpc = rpcOpen(&rpcInit);
+  if (pRpc == NULL) {
+    tError("failed to start RPC server");
+    return -1;
+  }
+
+  tInfo("RPC server is running, ctrl-c to exit");
+
+  if (commit) {
+    dataFd = open(dataName, O_APPEND | O_CREAT | O_WRONLY, S_IRWXU | S_IRWXG | S_IRWXO);  
+    if (dataFd<0) 
+      tInfo("failed to open data file, reason:%s", strerror(errno));
+  }
+
+  qhandle = taosOpenQueue(sizeof(SRpcMsg));
+  qset = taosOpenQset();
+  taosAddIntoQset(qset, qhandle, NULL);
+
+  processShellMsg();
+
+  if (dataFd >= 0) {
+    close(dataFd);
+    remove(dataName);
+  }
+
+  return 0;
+}
diff --git a/src/sdb/CMakeLists.txt b/src/sdb/CMakeLists.txt
deleted file mode 100644
index 6b29eefde6c4792f691fae9f0d5c370751460c93..0000000000000000000000000000000000000000
--- a/src/sdb/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-INCLUDE_DIRECTORIES(inc)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-    AUX_SOURCE_DIRECTORY(src SRC)
-    ADD_LIBRARY(sdb ${SRC})
-    TARGET_LINK_LIBRARIES(sdb trpc)
-    IF (TD_CLUSTER)
-        TARGET_LINK_LIBRARIES(sdb sdb_cluster)
-    ENDIF ()
-ENDIF ()
diff --git a/src/sdb/inc/hashint.h b/src/sdb/inc/hashint.h
deleted file mode 100644
index 052689f337a07f127052e5a24815cf7ba76d5c2d..0000000000000000000000000000000000000000
--- a/src/sdb/inc/hashint.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 _sdb_int_hash_header_
-#define _sdb_int_hash_header_
-
-void *sdbOpenIntHash(int maxSessions, int dataSize);
-void sdbCloseIntHash(void *handle);
-void *sdbAddIntHash(void *handle, void *key, void *pData);
-void sdbDeleteIntHash(void *handle, void *key);
-void *sdbGetIntHashData(void *handle, void *key);
-void *sdbFetchIntHashData(void *handle, void *ptr, void **ppMeta);
-
-#endif
diff --git a/src/sdb/inc/hashstr.h b/src/sdb/inc/hashstr.h
deleted file mode 100644
index 66f6e88857deef1bc283a9b2fe7d5545ca8ff934..0000000000000000000000000000000000000000
--- a/src/sdb/inc/hashstr.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 _sdb_str_hash_header_
-#define _sdb_str_hash_header_
-
-void *sdbOpenStrHash(int maxSessions, int dataSize);
-void sdbCloseStrHash(void *handle);
-void *sdbAddStrHash(void *handle, void *key, void *pData);
-void sdbDeleteStrHash(void *handle, void *key);
-void *sdbGetStrHashData(void *handle, void *key);
-void *sdbFetchStrHashData(void *handle, void *ptr, void **ppMeta);
-
-#endif
diff --git a/src/sdb/inc/sdbint.h b/src/sdb/inc/sdbint.h
deleted file mode 100644
index c5b4f4e4aeccf6bd8664e067e7d74146e023b10b..0000000000000000000000000000000000000000
--- a/src/sdb/inc/sdbint.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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 _sdbint_header_
-#define _sdbint_header_
-
-#include <errno.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "hashint.h"
-#include "hashstr.h"
-#include "sdb.h"
-#include "tchecksum.h"
-#include "tlog.h"
-#include "trpc.h"
-#include "tutil.h"
-
-#define sdbError(...)                            \
-  if (sdbDebugFlag & DEBUG_ERROR) {              \
-    tprintf("ERROR MND-SDB ", 255, __VA_ARGS__); \
-  }
-#define sdbWarn(...)                                      \
-  if (sdbDebugFlag & DEBUG_WARN) {                        \
-    tprintf("WARN  MND-SDB ", sdbDebugFlag, __VA_ARGS__); \
-  }
-#define sdbTrace(...)                               \
-  if (sdbDebugFlag & DEBUG_TRACE) {                 \
-    tprintf("MND-SDB ", sdbDebugFlag, __VA_ARGS__); \
-  }
-#define sdbPrint(...) \
-  { tprintf("MND-SDB ", 255, __VA_ARGS__); }
-
-#define sdbLError(...) taosLogError(__VA_ARGS__) sdbError(__VA_ARGS__)
-#define sdbLWarn(...) taosLogWarn(__VA_ARGS__) sdbWarn(__VA_ARGS__)
-#define sdbLPrint(...) taosLogPrint(__VA_ARGS__) sdbPrint(__VA_ARGS__)
-
-#define SDB_MAX_PEERS 4
-#define SDB_DELIMITER 0xFFF00F00
-#define SDB_ENDCOMMIT 0xAFFFAAAF
-
-typedef struct {
-  uint64_t swVersion;
-  int16_t  sdbFileVersion;
-  char     reserved[6];
-  TSCKSUM  checkSum;
-} SSdbHeader;
-
-typedef struct {
-  char type;
-  // short  rowSize;
-  char *row;
-} SSdbUpdate;
-
-typedef struct {
-  char     numOfTables;
-  uint64_t version[];
-} SSdbSync;
-
-typedef struct {
-  SSdbHeader header;
-  int        maxRows;
-  int        dbId;
-  int32_t    maxRowSize;
-  char       name[TSDB_DB_NAME_LEN];
-  char       fn[128];
-  int        keyType;
-  uint32_t   autoIndex;
-  int64_t    numOfRows;
-  int64_t    id;
-  int64_t    size;
-  void *     iHandle;
-  int        fd;
-  void *(*appTool)(char, void *, char *, int, int *);
-  pthread_mutex_t mutex;
-  SSdbUpdate *    update;
-  int             numOfUpdates;
-  int             updatePos;
-} SSdbTable;
-
-typedef struct {
-  int64_t id;
-  int64_t offset;
-  int     rowSize;
-  void *  row;
-} SRowMeta;
-
-typedef struct {
-  int32_t delimiter;
-  int32_t rowSize;
-  int64_t id;
-  char    data[];
-} SRowHead;
-
-typedef struct {
-  char *          buffer;
-  char *          offset;
-  int             trans;
-  int             bufferSize;
-  pthread_mutex_t qmutex;
-} STranQueue;
-
-typedef struct {
-  char     status;
-  char     role;
-  char     numOfMnodes;
-  uint64_t dbVersion;
-  uint32_t numOfDnodes;
-  uint32_t publicIp;
-} SMnodeStatus;
-
-typedef struct {
-  uint8_t  dbId;
-  char     type;
-  uint64_t version;
-  short    dataLen;
-  char     data[];
-} SForwardMsg;
-
-extern SSdbTable *tableList[];
-extern int        sdbMaxPeers;
-extern int        sdbNumOfTables;
-extern int64_t    sdbVersion;
-
-int sdbForwardDbReqToPeer(SSdbTable *pTable, char type, char *data, int dataLen);
-int sdbRetrieveRows(int fd, SSdbTable *pTable, uint64_t version);
-void sdbResetTable(SSdbTable *pTable);
-extern const int16_t sdbFileVersion;
-
-#endif
diff --git a/src/sdb/src/hashint.c b/src/sdb/src/hashint.c
deleted file mode 100644
index c99a5aff737f8c08724358ab7e9ea43e480f40fd..0000000000000000000000000000000000000000
--- a/src/sdb/src/hashint.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * 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 <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "tmempool.h"
-#include "tsdb.h"
-
-typedef struct _long_hash_t {
-  uint32_t             key;
-  int                  hash;
-  struct _long_hash_t *prev;
-  struct _long_hash_t *next;
-  char                 data[];
-} SLongHash;
-
-typedef struct {
-  SLongHash **longHashList;
-  mpool_h     longHashMemPool;
-  int         maxSessions;
-  int         dataSize;
-} SHashObj;
-
-int sdbHashLong(void *handle, uint32_t ip) {
-  SHashObj *pObj = (SHashObj *)handle;
-  int       hash = 0;
-
-  hash = ip >> 16;
-  hash += (ip & 0xFFFF);
-
-  hash = hash % pObj->maxSessions;
-
-  return hash;
-}
-
-void *sdbAddIntHash(void *handle, void *pKey, void *data) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-  uint32_t   key = *((uint32_t *)pKey);
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = sdbHashLong(pObj, key);
-  pNode = (SLongHash *)taosMemPoolMalloc(pObj->longHashMemPool);
-  pNode->key = key;
-  memcpy(pNode->data, data, pObj->dataSize);
-  pNode->prev = 0;
-  pNode->next = pObj->longHashList[hash];
-  pNode->hash = hash;
-
-  if (pObj->longHashList[hash] != 0) (pObj->longHashList[hash])->prev = pNode;
-  pObj->longHashList[hash] = pNode;
-
-  return pObj;
-}
-
-void sdbDeleteIntHash(void *handle, void *pKey) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-  uint32_t   key = *((uint32_t *)pKey);
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  hash = sdbHashLong(pObj, key);
-
-  pNode = pObj->longHashList[hash];
-  while (pNode) {
-    if (pNode->key == key) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->longHashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    taosMemPoolFree(pObj->longHashMemPool, (char *)pNode);
-  }
-}
-
-void *sdbGetIntHashData(void *handle, void *pKey) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-  uint32_t   key = *((uint32_t *)pKey);
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = sdbHashLong(pObj, key);
-  pNode = pObj->longHashList[hash];
-
-  while (pNode) {
-    if (pNode->key == key) {
-      break;
-    }
-    pNode = pNode->next;
-  }
-
-  if (pNode) return pNode->data;
-
-  return NULL;
-}
-
-void *sdbOpenIntHash(int maxSessions, int dataSize) {
-  SLongHash **longHashList;
-  mpool_h     longHashMemPool;
-  SHashObj *  pObj;
-
-  longHashMemPool = taosMemPoolInit(maxSessions, sizeof(SLongHash) + dataSize);
-  if (longHashMemPool == 0) return NULL;
-
-  longHashList = calloc(sizeof(SLongHash *), maxSessions);
-  if (longHashList == 0) {
-    taosMemPoolCleanUp(longHashMemPool);
-    return NULL;
-  }
-
-  pObj = malloc(sizeof(SHashObj));
-  if (pObj == NULL) {
-    taosMemPoolCleanUp(longHashMemPool);
-    free(longHashList);
-    return NULL;
-  }
-
-  pObj->maxSessions = maxSessions;
-  pObj->longHashMemPool = longHashMemPool;
-  pObj->longHashList = longHashList;
-  pObj->dataSize = dataSize;
-
-  return pObj;
-}
-
-void sdbCloseIntHash(void *handle) {
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  if (pObj->longHashMemPool) taosMemPoolCleanUp(pObj->longHashMemPool);
-
-  if (pObj->longHashList) free(pObj->longHashList);
-
-  memset(pObj, 0, sizeof(SHashObj));
-  free(pObj);
-}
-
-void *sdbFetchIntHashData(void *handle, void *ptr, void **ppMeta) {
-  SHashObj * pObj = (SHashObj *)handle;
-  SLongHash *pNode = (SLongHash *)ptr;
-  int        hash = 0;
-
-  *ppMeta = NULL;
-  if (pObj == NULL || pObj->maxSessions <= 0) return NULL;
-  if (pObj->longHashList == NULL) return NULL;
-
-  if (pNode) {
-    hash = pNode->hash + 1;
-    pNode = pNode->next;
-  }
-
-  if (pNode == NULL) {
-    for (int i = hash; i < pObj->maxSessions; ++i) {
-      pNode = pObj->longHashList[i];
-      if (pNode) break;
-    }
-  }
-
-  if (pNode) *ppMeta = pNode->data;
-
-  return pNode;
-}
diff --git a/src/sdb/src/hashstr.c b/src/sdb/src/hashstr.c
deleted file mode 100644
index 4b9aa3392853424618e574b03a50b17a51f2b320..0000000000000000000000000000000000000000
--- a/src/sdb/src/hashstr.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * 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 "os.h"
-#include "tsdb.h"
-
-#define MAX_STR_LEN 40
-
-typedef struct _str_node_t {
-  char                string[TSDB_METER_ID_LEN];
-  int                 hash;
-  struct _str_node_t *prev;
-  struct _str_node_t *next;
-  char                data[];
-} SHashNode;
-
-typedef struct {
-  SHashNode **hashList;
-  int         maxSessions;
-  int         dataSize;
-} SHashObj;
-
-int sdbHashString(void *handle, char *string) {
-  SHashObj *   pObj = (SHashObj *)handle;
-  unsigned int hash = 0, hashv;
-  char *       c;
-  int          len = strlen(string);
-
-  c = string;
-
-  while (len >= 4) {
-    hash += *((int *)c);
-    c += 4;
-    len -= 4;
-  }
-
-  while (len > 0) {
-    hash += *c;
-    c++;
-    len--;
-  }
-
-  hashv = hash / pObj->maxSessions;
-  hash = (hashv + hash % pObj->maxSessions) % pObj->maxSessions;
-
-  return hash;
-}
-
-void *sdbAddStrHash(void *handle, void *key, void *pData) {
-  int        hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-  char *     string = (char *)key;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = sdbHashString(pObj, string);
-
-  int size = sizeof(SHashNode) + pObj->dataSize;
-  pNode = (SHashNode *)malloc(size);
-  memset(pNode, 0, size);
-  strcpy(pNode->string, string);
-  memcpy(pNode->data, pData, pObj->dataSize);
-  pNode->prev = 0;
-  pNode->next = pObj->hashList[hash];
-  pNode->hash = hash;
-
-  if (pObj->hashList[hash] != 0) (pObj->hashList[hash])->prev = pNode;
-  pObj->hashList[hash] = pNode;
-
-  return pNode->data;
-}
-
-void sdbDeleteStrHash(void *handle, void *key) {
-  int        hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-  char *     string = (char *)key;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  hash = sdbHashString(pObj, string);
-  pNode = pObj->hashList[hash];
-  while (pNode) {
-    if (strcmp(pNode->string, string) == 0) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->hashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    memset(pNode, 0, sizeof(SHashNode));
-    free(pNode);
-  }
-}
-
-void *sdbGetStrHashData(void *handle, void *key) {
-  int        hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-  char *     string = (char *)key;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = sdbHashString(pObj, string);
-  pNode = pObj->hashList[hash];
-
-  while (pNode) {
-    if (strcmp(pNode->string, string) == 0) {
-      break;
-    }
-    pNode = pNode->next;
-  }
-
-  if (pNode) return pNode->data;
-
-  return NULL;
-}
-
-void *sdbOpenStrHash(int maxSessions, int dataSize) {
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)malloc(sizeof(SHashObj));
-  if (pObj == NULL) {
-    return NULL;
-  }
-
-  memset(pObj, 0, sizeof(SHashObj));
-  pObj->maxSessions = maxSessions;
-  pObj->dataSize = dataSize;
-
-  pObj->hashList = (SHashNode **)malloc(sizeof(SHashNode *) * maxSessions);
-  if (pObj->hashList == NULL) {
-    free(pObj);
-    return NULL;
-  }
-  memset(pObj->hashList, 0, sizeof(SHashNode *) * maxSessions);
-
-  return (void *)pObj;
-}
-
-void sdbCloseStrHash(void *handle) {
-  SHashObj  *pObj;
-  SHashNode *pNode, *pNext;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions <= 0) return;
-
-  if (pObj->hashList) {
-    for (int i = 0; i < pObj->maxSessions; ++i) {
-      pNode = pObj->hashList[i];
-      while (pNode) {
-        pNext = pNode->next;
-        free(pNode);
-        pNode = pNext;
-      }
-    }
-
-    free(pObj->hashList);
-  }
-
-  memset(pObj, 0, sizeof(SHashObj));
-  free(pObj);
-}
-
-void *sdbFetchStrHashData(void *handle, void *ptr, void **ppMeta) {
-  SHashObj  *pObj = (SHashObj *)handle;
-  SHashNode *pNode = (SHashNode *)ptr;
-  int        hash = 0;
-
-  *ppMeta = NULL;
-  if (pObj == NULL || pObj->maxSessions <= 0) return NULL;
-  if (pObj->hashList == NULL) return NULL;
-
-  if (pNode) {
-    hash = pNode->hash + 1;
-    pNode = pNode->next;
-  }
-
-  if (pNode == NULL) {
-    for (int i = hash; i < pObj->maxSessions; ++i) {
-      pNode = pObj->hashList[i];
-      if (pNode) break;
-    }
-  }
-
-  if (pNode) *ppMeta = pNode->data;
-
-  return pNode;
-}
diff --git a/src/sdb/src/sdbEngine.c b/src/sdb/src/sdbEngine.c
deleted file mode 100644
index 77b6f6d958bce36163adac74550060862f5eb1ec..0000000000000000000000000000000000000000
--- a/src/sdb/src/sdbEngine.c
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
- * 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 "os.h"
-
-#include "sdb.h"
-#include "sdbint.h"
-#include "tutil.h"
-
-#define abs(x) (((x) < 0) ? -(x) : (x))
-
-extern char   version[];
-const int16_t sdbFileVersion = 0;
-int           sdbExtConns = 0;
-SIpList      *pSdbIpList = NULL;
-SIpList      *pSdbPublicIpList = NULL;
-
-#ifdef CLUSTER
-int           sdbMaster = 0;
-#else
-int           sdbMaster = 1;
-#endif
-
-void *(*sdbInitIndexFp[])(int maxRows, int dataSize) = {sdbOpenStrHash, sdbOpenIntHash, sdbOpenIntHash};
-
-void *(*sdbAddIndexFp[])(void *handle, void *key, void *data) = {sdbAddStrHash, sdbAddIntHash, sdbAddIntHash};
-
-void (*sdbDeleteIndexFp[])(void *handle, void *key) = {sdbDeleteStrHash, sdbDeleteIntHash, sdbDeleteIntHash};
-
-void *(*sdbGetIndexFp[])(void *handle, void *key) = {sdbGetStrHashData, sdbGetIntHashData, sdbGetIntHashData};
-
-void (*sdbCleanUpIndexFp[])(void *handle) = {
-    sdbCloseStrHash, sdbCloseIntHash, sdbCloseIntHash,
-};
-
-void *(*sdbFetchRowFp[])(void *handle, void *ptr, void **ppRow) = {
-    sdbFetchStrHashData, sdbFetchIntHashData, sdbFetchIntHashData,
-};
-
-SSdbTable *tableList[20];
-int        sdbNumOfTables;
-int64_t    sdbVersion;
-
-void sdbFinishCommit(void *handle) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  uint32_t   sdbEcommit = SDB_ENDCOMMIT;
-
-  off_t offset = lseek(pTable->fd, 0, SEEK_END);
-  assert(offset == pTable->size);
-  twrite(pTable->fd, &sdbEcommit, sizeof(sdbEcommit));
-  pTable->size += sizeof(sdbEcommit);
-}
-
-int sdbOpenSdbFile(SSdbTable *pTable) {
-  struct stat fstat, ofstat;
-  uint64_t    size;
-  char *      dirc = NULL;
-  char *      basec = NULL;
-  union {
-    char     cversion[64];
-    uint64_t iversion;
-  } swVersion;
-
-  memcpy(swVersion.cversion, version, sizeof(uint64_t));
-
-  // check sdb.db and .sdb.db status
-  char fn[128] = "\0";
-  dirc = strdup(pTable->fn);
-  basec = strdup(pTable->fn);
-  sprintf(fn, "%s/.%s", dirname(dirc), basename(basec));
-  tfree(dirc);
-  tfree(basec);
-  if (stat(fn, &ofstat) == 0) {  // .sdb.db file exists
-    if (stat(pTable->fn, &fstat) == 0) {
-      remove(fn);
-    } else {
-      remove(pTable->fn);
-      rename(fn, pTable->fn);
-    }
-  }
-
-  pTable->fd = open(pTable->fn, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (pTable->fd < 0) {
-    sdbError("failed to open file:%s", pTable->fn);
-    return -1;
-  }
-
-  pTable->size = 0;
-  stat(pTable->fn, &fstat);
-  size = sizeof(pTable->header);
-
-  if (fstat.st_size == 0) {
-    pTable->header.swVersion = swVersion.iversion;
-    pTable->header.sdbFileVersion = sdbFileVersion;
-    if (taosCalcChecksumAppend(0, (uint8_t *)(&pTable->header), size) < 0) {
-      sdbError("failed to get file header checksum, file:%s", pTable->fn);
-      tclose(pTable->fd);
-      return -1;
-    }
-    twrite(pTable->fd, &(pTable->header), size);
-    pTable->size += size;
-    sdbFinishCommit(pTable);
-  } else {
-    uint32_t sdbEcommit = 0;
-    off_t    offset = lseek(pTable->fd, -(sizeof(sdbEcommit)), SEEK_END);
-    while (offset > 0) {
-      read(pTable->fd, &sdbEcommit, sizeof(sdbEcommit));
-      if (sdbEcommit == SDB_ENDCOMMIT) {
-        ftruncate(pTable->fd, offset + sizeof(sdbEcommit));
-        break;
-      }
-      offset = lseek(pTable->fd, -(sizeof(sdbEcommit) + 1), SEEK_CUR);
-    }
-    lseek(pTable->fd, 0, SEEK_SET);
-
-    ssize_t tsize = read(pTable->fd, &(pTable->header), size);
-    if (tsize < size) {
-      sdbError("failed to read sdb file header, file:%s", pTable->fn);
-      tclose(pTable->fd);
-      return -1;
-    }
-
-    if (pTable->header.swVersion != swVersion.iversion) {
-      sdbWarn("sdb file:%s version not match software version", pTable->fn);
-    }
-
-    if (!taosCheckChecksumWhole((uint8_t *)(&pTable->header), size)) {
-      sdbError("sdb file header is broken since checksum mismatch, file:%s", pTable->fn);
-      tclose(pTable->fd);
-      return -1;
-    }
-
-    pTable->size += size;
-    // skip end commit symbol
-    lseek(pTable->fd, sizeof(sdbEcommit), SEEK_CUR);
-    pTable->size += sizeof(sdbEcommit);
-  }
-
-  pTable->numOfRows = 0;
-
-  return pTable->fd;
-}
-
-// TODO: Change here
-void sdbAddIntoUpdateList(SSdbTable *pTable, char type, char *row) {
-  pTable->numOfUpdates++;
-  pTable->updatePos = pTable->numOfUpdates % pTable->maxRows;
-
-  if (pTable->update[pTable->updatePos].type == SDB_TYPE_DELETE)
-    (*(pTable->appTool))(SDB_TYPE_DESTROY, pTable->update[pTable->updatePos].row, NULL, 0, NULL);
-
-  pTable->update[pTable->updatePos].type = type;
-  pTable->update[pTable->updatePos].row = row;
-}
-
-int sdbInitTableByFile(SSdbTable *pTable) {
-  SRowMeta rowMeta;
-  int      numOfDels = 0;
-  int      bytes = 0;
-  int64_t  oldId = 0;
-  void *   pMetaRow = NULL;
-  int      total_size = 0;
-  int      real_size = 0;
-  int      maxAutoIndex = 0;
-
-  oldId = pTable->id;
-  if (sdbOpenSdbFile(pTable) < 0) return -1;
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  SRowHead *rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory, sdb:%s", pTable->name);
-    return -1;
-  }
-
-  sdbTrace("open sdb file:%s for read", pTable->fn);
-
-  // Loop to read sdb file row by row
-  while (1) {
-    memset(rowHead, 0, total_size);
-
-    bytes = read(pTable->fd, rowHead, sizeof(SRowHead));
-    if (bytes < 0) {
-      sdbError("failed to read sdb file:%s", pTable->fn);
-      goto sdb_exit1;
-    }
-
-    if (bytes == 0) break;
-
-    if (bytes < sizeof(SRowHead) || rowHead->delimiter != SDB_DELIMITER) {
-      pTable->size++;
-      lseek(pTable->fd, -(bytes - 1), SEEK_CUR);
-      continue;
-    }
-
-    if (rowHead->rowSize < 0 || rowHead->rowSize > pTable->maxRowSize) {
-      sdbError("error row size in sdb file:%s, id:%d rowSize:%d maxRowSize:%d",
-              pTable->fn, rowHead->id, rowHead->rowSize, pTable->maxRowSize);
-      pTable->size += sizeof(SRowHead);
-      continue;
-    }
-
-    // sdbTrace("%s id:%ld rowSize:%d", pTable->name, rowHead->id,
-    // rowHead->rowSize);
-
-    bytes = read(pTable->fd, rowHead->data, rowHead->rowSize + sizeof(TSCKSUM));
-    if (bytes < rowHead->rowSize + sizeof(TSCKSUM)) {
-      // TODO: Here may cause pTable->size not end of the file
-      sdbError("failed to read sdb file:%s id:%d rowSize:%d", pTable->fn, rowHead->id, rowHead->rowSize);
-      break;
-    }
-
-    real_size = sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM);
-    if (!taosCheckChecksumWhole((uint8_t *)rowHead, real_size)) {
-      sdbError("error sdb checksum, sdb:%s  id:%d, skip", pTable->name, rowHead->id);
-      pTable->size += real_size;
-      continue;
-    }
-
-    // Check if the the object exists already
-
-    pMetaRow = sdbGetRow(pTable, rowHead->data);
-    if (pMetaRow == NULL) {  // New object
-      if (rowHead->id < 0) {
-        /* assert(0); */
-        sdbError("error sdb negative id:%d, sdb:%s, skip", rowHead->id, pTable->name);
-      } else {
-        rowMeta.id = rowHead->id;
-        // TODO: Get rid of the rowMeta.offset and rowSize
-        rowMeta.offset = pTable->size;
-        rowMeta.rowSize = rowHead->rowSize;
-        rowMeta.row = (*(pTable->appTool))(SDB_TYPE_DECODE, NULL, rowHead->data, rowHead->rowSize, NULL);
-        (*sdbAddIndexFp[pTable->keyType])(pTable->iHandle, rowMeta.row, &rowMeta);
-        if (pTable->keyType == SDB_KEYTYPE_AUTO) {
-          pTable->autoIndex++;
-          maxAutoIndex = MAX(maxAutoIndex, *(int32_t*)rowHead->data);
-        }
-        pTable->numOfRows++;
-      }
-    } else {                  // already exists
-      if (pTable->keyType == SDB_KEYTYPE_AUTO) {
-        pTable->autoIndex++;
-        maxAutoIndex = MAX(maxAutoIndex, *(int32_t *) rowHead->data);
-      }
-
-      if (rowHead->id < 0) {  // Delete the object
-        (*sdbDeleteIndexFp[pTable->keyType])(pTable->iHandle, rowHead->data);
-        (*(pTable->appTool))(SDB_TYPE_DESTROY, pMetaRow, NULL, 0, NULL);
-        pTable->numOfRows--;
-        numOfDels++;
-      } else {  // Reset the object TODO: is it possible to merge reset and
-                // update ??
-        (*(pTable->appTool))(SDB_TYPE_RESET, pMetaRow, rowHead->data, rowHead->rowSize, NULL);
-      }
-      numOfDels++;
-    }
-
-    pTable->size += real_size;
-    if (pTable->id < abs(rowHead->id)) pTable->id = abs(rowHead->id);
-  }
-
-  if (pTable->keyType == SDB_KEYTYPE_AUTO) {
-    pTable->autoIndex = maxAutoIndex;
-  }
-
-  sdbVersion += (pTable->id - oldId);
-  if (numOfDels > pTable->maxRows / 4) sdbSaveSnapShot(pTable);
-
-  pTable->numOfUpdates = 0;
-  pTable->updatePos = 0;
-
-  tfree(rowHead);
-  return 0;
-
-sdb_exit1:
-  tfree(rowHead);
-  return -1;
-}
-
-void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, uint8_t keyType, char *directory,
-                   void *(*appTool)(char, void *, char *, int, int *)) {
-  SSdbTable *pTable = (SSdbTable *)malloc(sizeof(SSdbTable));
-  if (pTable == NULL) return NULL;
-  memset(pTable, 0, sizeof(SSdbTable));
-
-  int size = sizeof(SSdbUpdate) * maxRows;
-  pTable->update = (SSdbUpdate *)malloc(size);
-  if (pTable->update == NULL) {
-    free(pTable);
-    return NULL;
-  };
-  memset(pTable->update, 0, size);
-
-  strcpy(pTable->name, name);
-  pTable->keyType = keyType;
-  pTable->maxRows = maxRows;
-  pTable->maxRowSize = maxRowSize;
-  pTable->appTool = appTool;
-  sprintf(pTable->fn, "%s/%s.db", directory, pTable->name);
-
-  if (sdbInitIndexFp[keyType] != NULL) pTable->iHandle = (*sdbInitIndexFp[keyType])(maxRows, sizeof(SRowMeta));
-
-  pthread_mutex_init(&pTable->mutex, NULL);
-
-  if (sdbInitTableByFile(pTable) < 0) return NULL;
-
-  pTable->dbId = sdbNumOfTables++;
-  tableList[pTable->dbId] = pTable;
-
-  sdbTrace("table:%s is initialized, numOfRows:%d, numOfTables:%d", pTable->name, pTable->numOfRows, sdbNumOfTables);
-
-  return pTable;
-}
-
-SRowMeta *sdbGetRowMeta(void *handle, void *key) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta;
-
-  if (handle == NULL) return NULL;
-
-  pMeta = (*sdbGetIndexFp[pTable->keyType])(pTable->iHandle, key);
-
-  return pMeta;
-}
-
-void *sdbGetRow(void *handle, void *key) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta;
-
-  if (handle == NULL) return NULL;
-
-  pthread_mutex_lock(&pTable->mutex);
-  pMeta = (*sdbGetIndexFp[pTable->keyType])(pTable->iHandle, key);
-  pthread_mutex_unlock(&pTable->mutex);
-
-  if (pMeta == NULL) return NULL;
-
-  return pMeta->row;
-}
-
-// row here must be encoded string (rowSize > 0) or the object it self (rowSize
-// = 0)
-int64_t sdbInsertRow(void *handle, void *row, int rowSize) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta   rowMeta;
-  int64_t    id = -1;
-  void *     pObj = NULL;
-  int        total_size = 0;
-  int        real_size = 0;
-  /* char       action = SDB_TYPE_INSERT; */
-
-  if (pTable == NULL) {
-    sdbError("sdb tables is null");
-    return -1;
-  }
-
-  if ((pTable->keyType != SDB_KEYTYPE_AUTO) || *((int64_t *)row))
-    if (sdbGetRow(handle, row)) {
-      if (strcmp(pTable->name, "mnode") == 0) {
-        /*
-         * The first mnode created when the system just start, so the insert action may failed
-         * see sdbPeer.c : sdbInitPeers
-         */
-        pTable->id++;
-        sdbVersion++;
-        sdbPrint("table:%s, record:%s already exist, think it successed, sdbVersion:%" PRId64 " id:%" PRId64,
-                pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id);
-        return 0;
-      } else {
-        switch (pTable->keyType) {
-          case SDB_KEYTYPE_STRING:
-            sdbError("table:%s, failed to insert record:%s sdbVersion:%" PRId64 " id:%" PRId64 , pTable->name, (char *)row, sdbVersion, pTable->id);
-            break;
-          case SDB_KEYTYPE_UINT32: //dnodes or mnodes
-            sdbError("table:%s, failed to insert record:%s sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id);
-            break;
-          case SDB_KEYTYPE_AUTO:
-            sdbError("table:%s, failed to insert record:%d sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, *(int32_t *)row, sdbVersion, pTable->id);
-            break;
-          default:
-            sdbError("table:%s, failed to insert record sdbVersion:%" PRId64 " id:%" PRId64, pTable->name, sdbVersion, pTable->id);
-            break;
-        }
-        return -1;
-      }
-    }
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  SRowHead *rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory, sdb: %s", pTable->name);
-    return -1;
-  }
-  memset(rowHead, 0, total_size);
-
-  if (rowSize == 0) {  // object is created already
-    pObj = row;
-  } else {  // encoded string, to create object
-    pObj = (*(pTable->appTool))(SDB_TYPE_DECODE, NULL, row, rowSize, NULL);
-  }
-  (*(pTable->appTool))(SDB_TYPE_ENCODE, pObj, rowHead->data, pTable->maxRowSize, &(rowHead->rowSize));
-  assert(rowHead->rowSize > 0 && rowHead->rowSize <= pTable->maxRowSize);
-
-  pthread_mutex_lock(&pTable->mutex);
-
-  if (sdbForwardDbReqToPeer(pTable, SDB_TYPE_INSERT, rowHead->data, rowHead->rowSize) == 0) {
-    pTable->id++;
-    sdbVersion++;
-    if (pTable->keyType == SDB_KEYTYPE_AUTO) {
-      // TODO:here need to change
-      *((uint32_t *)pObj) = ++pTable->autoIndex;
-      (*(pTable->appTool))(SDB_TYPE_ENCODE, pObj, rowHead->data, pTable->maxRowSize, &(rowHead->rowSize));
-    }
-
-    real_size = sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM);
-
-    rowHead->delimiter = SDB_DELIMITER;
-    rowHead->id = pTable->id;
-    if (taosCalcChecksumAppend(0, (uint8_t *)rowHead, real_size) < 0) {
-      sdbError("failed to get checksum while inserting, sdb:%s", pTable->name);
-      pthread_mutex_unlock(&pTable->mutex);
-      tfree(rowHead);
-      return -1;
-    }
-
-    // update in SDB layer
-    rowMeta.id = pTable->id;
-    rowMeta.offset = pTable->size;
-    rowMeta.rowSize = rowHead->rowSize;
-    rowMeta.row = pObj;
-    (*sdbAddIndexFp[pTable->keyType])(pTable->iHandle, pObj, &rowMeta);
-
-    /* Update the disk content */
-    /* write(pTable->fd, &action, sizeof(action)); */
-    /* pTable->size += sizeof(action); */
-    twrite(pTable->fd, rowHead, real_size);
-    pTable->size += real_size;
-    sdbFinishCommit(pTable);
-
-    sdbAddIntoUpdateList(pTable, SDB_TYPE_INSERT, rowMeta.row);
-
-    pTable->numOfRows++;
-    switch (pTable->keyType) {
-      case SDB_KEYTYPE_STRING:
-        sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
-                pTable->name, (char *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
-        break;
-      case SDB_KEYTYPE_UINT32: //dnodes or mnodes
-        sdbTrace("table:%s, a record is inserted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
-                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
-        break;
-      case SDB_KEYTYPE_AUTO:
-        sdbTrace("table:%s, a record is inserted:%d, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
-                pTable->name, *(int32_t *)row, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
-        break;
-      default:
-        sdbTrace("table:%s, a record is inserted, sdbVersion:%" PRId64 " id:%" PRId64 " rowSize:%d numOfRows:%d fileSize:%" PRId64,
-                pTable->name, sdbVersion, rowHead->id, rowHead->rowSize, pTable->numOfRows, pTable->size);
-        break;
-    }
-
-    id = rowMeta.id;
-  } else {
-    sdbError("table:%s, failed to insert record", pTable->name);
-  }
-
-  tfree(rowHead);
-
-  pthread_mutex_unlock(&pTable->mutex);
-
-  /* callback function to update the MGMT layer */
-  if (id >= 0 && pTable->appTool) (*pTable->appTool)(SDB_TYPE_INSERT, pObj, NULL, 0, NULL);
-
-  return id;
-}
-
-// row here can be object or null-terminated string
-int sdbDeleteRow(void *handle, void *row) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta = NULL;
-  int        code = -1;
-  void *     pMetaRow = NULL;
-  SRowHead * rowHead = NULL;
-  int        rowSize = 0;
-  int        total_size = 0;
-  /* char       action     = SDB_TYPE_DELETE; */
-
-  if (pTable == NULL) return -1;
-
-  pMeta = sdbGetRowMeta(handle, row);
-  if (pMeta == NULL) {
-    sdbTrace("table:%s, record is not there, delete failed", pTable->name);
-    return -1;
-  }
-
-  pMetaRow = pMeta->row;
-  assert(pMetaRow != NULL);
-
-  switch (pTable->keyType) {
-    case SDB_KEYTYPE_STRING:
-      rowSize = strlen((char *)row) + 1;
-      break;
-    case SDB_KEYTYPE_UINT32:
-      rowSize = sizeof(uint32_t);
-      break;
-    case SDB_KEYTYPE_AUTO:
-      rowSize = sizeof(uint64_t);
-      break;
-    default:
-      return -1;
-  }
-
-  total_size = sizeof(SRowHead) + rowSize + sizeof(TSCKSUM);
-  rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory, sdb:%s", pTable->name);
-    return -1;
-  }
-  memset(rowHead, 0, total_size);
-
-  pthread_mutex_lock(&pTable->mutex);
-
-  if (sdbForwardDbReqToPeer(pTable, SDB_TYPE_DELETE, (char *)row, rowSize) == 0) {
-    pTable->id++;
-    sdbVersion++;
-
-    rowHead->delimiter = SDB_DELIMITER;
-    rowHead->rowSize = rowSize;
-    rowHead->id = -(pTable->id);
-    memcpy(rowHead->data, row, rowSize);
-    if (taosCalcChecksumAppend(0, (uint8_t *)rowHead, total_size) < 0) {
-      sdbError("failed to get checksum while inserting, sdb:%s", pTable->name);
-      pthread_mutex_unlock(&pTable->mutex);
-      tfree(rowHead);
-      return -1;
-    }
-    /* write(pTable->fd, &action, sizeof(action)); */
-    /* pTable->size += sizeof(action); */
-    twrite(pTable->fd, rowHead, total_size);
-    pTable->size += total_size;
-    sdbFinishCommit(pTable);
-
-    pTable->numOfRows--;
-    // TODO:Change the update list here
-    sdbAddIntoUpdateList(pTable, SDB_TYPE_DELETE, pMetaRow);
-    switch (pTable->keyType) {
-      case SDB_KEYTYPE_STRING:
-        sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
-                pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      case SDB_KEYTYPE_UINT32:  //dnodes or mnodes
-        sdbTrace("table:%s, a record is deleted:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
-                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      case SDB_KEYTYPE_AUTO:
-        sdbTrace("table:%s, a record is deleted:%d, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
-                pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      default:
-        sdbTrace("table:%s, a record is deleted, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%d",
-                pTable->name, sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-    }
-
-    // Delete from current layer
-    (*sdbDeleteIndexFp[pTable->keyType])(pTable->iHandle, row);
-
-    code = 0;
-  }
-
-  pthread_mutex_unlock(&pTable->mutex);
-
-  tfree(rowHead);
-
-  // callback function of the delete
-  if (code == 0 && pTable->appTool) (*pTable->appTool)(SDB_TYPE_DELETE, pMetaRow, NULL, 0, NULL);
-
-  return code;
-}
-
-// row here can be the object or the string info (encoded string)
-int sdbUpdateRow(void *handle, void *row, int updateSize, char isUpdated) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta = NULL;
-  int        code = -1;
-  int        total_size = 0;
-  int        real_size = 0;
-  /* char       action     = SDB_TYPE_UPDATE; */
-
-  if (pTable == NULL || row == NULL) return -1;
-  pMeta = sdbGetRowMeta(handle, row);
-  if (pMeta == NULL) {
-    switch (pTable->keyType) {
-      case SDB_KEYTYPE_STRING:
-        sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
-                pTable->name, (char *) row, sdbVersion, pTable->id);
-        break;
-      case SDB_KEYTYPE_UINT32: //dnodes or mnodes
-        sdbError("table:%s, failed to update record:%s, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
-                pTable->name, taosIpStr(*(int32_t *) row), sdbVersion, pTable->id);
-        break;
-      case SDB_KEYTYPE_AUTO:
-        sdbError("table:%s, failed to update record:%d, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
-                pTable->name, *(int32_t *) row, sdbVersion, pTable->id);
-        break;
-      default:
-        sdbError("table:%s, failed to update record, record is not there, sdbVersion:%" PRId64 " id:%" PRId64,
-                pTable->name, sdbVersion, pTable->id);
-        break;
-    }
-    return -1;
-  }
-
-  void *pMetaRow = pMeta->row;
-  assert(pMetaRow != NULL);
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  SRowHead *rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory, sdb:%s", pTable->name);
-    return -1;
-  }
-  memset(rowHead, 0, total_size);
-
-  if (!isUpdated) {
-    (*(pTable->appTool))(SDB_TYPE_UPDATE, pMetaRow, row, updateSize, NULL);  // update in upper layer
-  }
-
-  if (pMetaRow != row) {
-    memcpy(rowHead->data, row, updateSize);
-    rowHead->rowSize = updateSize;
-  } else {
-    (*(pTable->appTool))(SDB_TYPE_ENCODE, pMetaRow, rowHead->data, pTable->maxRowSize, &(rowHead->rowSize));
-  }
-
-  real_size = sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM);
-  ;
-
-  pthread_mutex_lock(&pTable->mutex);
-
-  if (sdbForwardDbReqToPeer(pTable, SDB_TYPE_UPDATE, rowHead->data, rowHead->rowSize) == 0) {
-    pTable->id++;
-    sdbVersion++;
-
-    // write to the new position
-    rowHead->delimiter = SDB_DELIMITER;
-    rowHead->id = pTable->id;
-    if (taosCalcChecksumAppend(0, (uint8_t *)rowHead, real_size) < 0) {
-      sdbError("failed to get checksum, sdb:%s id:%d", pTable->name, rowHead->id);
-      pthread_mutex_unlock(&pTable->mutex);
-      tfree(rowHead);
-      return -1;
-    }
-    /* write(pTable->fd, &action, sizeof(action)); */
-    /* pTable->size += sizeof(action); */
-    twrite(pTable->fd, rowHead, real_size);
-
-    pMeta->id = pTable->id;
-    pMeta->offset = pTable->size;
-    pMeta->rowSize = rowHead->rowSize;
-    pTable->size += real_size;
-
-    sdbFinishCommit(pTable);
-
-    switch (pTable->keyType) {
-      case SDB_KEYTYPE_STRING:
-        sdbTrace("table:%s, a record is updated:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
-                pTable->name, (char *)row, sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      case SDB_KEYTYPE_UINT32: //dnodes or mnodes
-        sdbTrace("table:%s, a record is updated:%s, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
-                 pTable->name, taosIpStr(*(int32_t *)row), sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      case SDB_KEYTYPE_AUTO:
-        sdbTrace("table:%s, a record is updated:%d, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64,
-                pTable->name, *(int32_t *)row, sdbVersion, pTable->id, pTable->numOfRows);
-        break;
-      default:
-        sdbTrace("table:%s, a record is updated, sdbVersion:%" PRId64 " id:%" PRId64 " numOfRows:%" PRId64, pTable->name, sdbVersion,
-                 pTable->id, pTable->numOfRows);
-        break;
-    }
-
-    sdbAddIntoUpdateList(pTable, SDB_TYPE_UPDATE, pMetaRow);
-    code = 0;
-  }
-
-  pthread_mutex_unlock(&pTable->mutex);
-
-  tfree(rowHead);
-
-  return code;
-}
-
-// row here must be the instruction string
-int sdbBatchUpdateRow(void *handle, void *row, int rowSize) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta = NULL;
-  int        total_size = 0;
-  /* char        action = SDB_TYPE_BATCH_UPDATE; */
-
-  if (pTable == NULL || row == NULL || rowSize <= 0) return -1;
-  pMeta = sdbGetRowMeta(handle, row);
-  if (pMeta == NULL) {
-    sdbTrace("table:%s, record is not there, batch update failed", pTable->name);
-    return -1;
-  }
-
-  void *pMetaRow = pMeta->row;
-  assert(pMetaRow != NULL);
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  SRowHead *rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory, sdb:%s", pTable->name);
-    return -1;
-  }
-
-  pthread_mutex_lock(&pTable->mutex);
-  if (sdbForwardDbReqToPeer(pTable, SDB_TYPE_BATCH_UPDATE, row, rowSize) == 0) {
-    /* // write action */
-    /* write(pTable->fd, &action, sizeof(action)); */
-    /* pTable->size += sizeof(action); */
-
-    (*(pTable->appTool))(SDB_TYPE_BEFORE_BATCH_UPDATE, pMetaRow, NULL, 0, NULL);
-
-    void *next_row = pMetaRow;
-    while (next_row != NULL) {
-      pTable->id++;
-      sdbVersion++;
-
-      void *last_row = next_row;
-      next_row = (*(pTable->appTool))(SDB_TYPE_BATCH_UPDATE, last_row, (char *)row, rowSize, 0);
-      memset(rowHead, 0, sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM));
-
-      // update in current layer
-      pMeta->id = pTable->id;
-      pMeta->offset = pTable->size;
-
-      // write to disk
-      rowHead->delimiter = SDB_DELIMITER;
-      rowHead->id = pMeta->id;
-      (*(pTable->appTool))(SDB_TYPE_ENCODE, last_row, rowHead->data, pTable->maxRowSize, &(rowHead->rowSize));
-      taosCalcChecksumAppend(0, (uint8_t *)rowHead, sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM));
-      pMeta->rowSize = rowHead->rowSize;
-      lseek(pTable->fd, pTable->size, SEEK_SET);
-      twrite(pTable->fd, rowHead, sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM));
-      pTable->size += (sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM));
-
-      sdbAddIntoUpdateList(pTable, SDB_TYPE_UPDATE, last_row);
-
-      if (next_row != NULL) {
-        pMeta = sdbGetRowMeta(handle, next_row);
-      }
-    }
-
-    sdbFinishCommit(pTable);
-
-    (*(pTable->appTool))(SDB_TYPE_AFTER_BATCH_UPDATE, pMetaRow, NULL, 0, NULL);
-  }
-  pthread_mutex_unlock(&pTable->mutex);
-
-  tfree(rowHead);
-
-  return 0;
-}
-
-void sdbCloseTable(void *handle) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  void *     pNode = NULL;
-  void *     row;
-
-  if (pTable == NULL) return;
-
-  while (1) {
-    pNode = sdbFetchRow(handle, pNode, &row);
-    if (row == NULL) break;
-    (*(pTable->appTool))(SDB_TYPE_DESTROY, row, NULL, 0, NULL);
-  }
-
-  if (sdbCleanUpIndexFp[pTable->keyType]) (*sdbCleanUpIndexFp[pTable->keyType])(pTable->iHandle);
-
-  if (pTable->fd) tclose(pTable->fd);
-
-  pthread_mutex_destroy(&pTable->mutex);
-
-  sdbNumOfTables--;
-  sdbTrace("table:%s is closed, id:%" PRId64 " numOfTables:%d", pTable->name, pTable->id, sdbNumOfTables);
-
-  tfree(pTable->update);
-  tfree(pTable);
-}
-
-void sdbResetTable(SSdbTable *pTable) {
-  /* SRowHead rowHead; */
-  SRowMeta  rowMeta;
-  int       bytes;
-  int       total_size = 0;
-  int       real_size = 0;
-  SRowHead *rowHead = NULL;
-  void *    pMetaRow = NULL;
-  int64_t   oldId = pTable->id;
-  int       oldNumOfRows = pTable->numOfRows;
-
-  if (sdbOpenSdbFile(pTable) < 0) return;
-  pTable->numOfRows = oldNumOfRows;
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate row head memory for reset, sdb:%s", pTable->name);
-    return;
-  }
-
-  sdbPrint("open sdb file:%s for reset table", pTable->fn);
-
-  while (1) {
-    memset(rowHead, 0, total_size);
-
-    bytes = read(pTable->fd, rowHead, sizeof(SRowHead));
-    if (bytes < 0) {
-      sdbError("failed to read sdb file:%s", pTable->fn);
-      tfree(rowHead);
-      return;
-    }
-
-    if (bytes == 0) break;
-
-    if (bytes < sizeof(SRowHead) || rowHead->delimiter != SDB_DELIMITER) {
-      pTable->size++;
-      lseek(pTable->fd, -(bytes - 1), SEEK_CUR);
-      continue;
-    }
-
-    if (rowHead->rowSize < 0 || rowHead->rowSize > pTable->maxRowSize) {
-      sdbError("error row size in sdb file:%s for reset, id:%d rowSize:%d maxRowSize:%d",
-               pTable->fn, rowHead->id, rowHead->rowSize, pTable->maxRowSize);
-      pTable->size += sizeof(SRowHead);
-      continue;
-    }
-
-    bytes = read(pTable->fd, rowHead->data, rowHead->rowSize + sizeof(TSCKSUM));
-    if (bytes < rowHead->rowSize + sizeof(TSCKSUM)) {
-      sdbError("failed to read sdb file:%s for reset, id:%d  rowSize:%d", pTable->fn, rowHead->id, rowHead->rowSize);
-      break;
-    }
-
-    real_size = sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM);
-    if (!taosCheckChecksumWhole((uint8_t *)rowHead, real_size)) {
-      sdbError("error sdb checksum, sdb:%s  id:%d, skip", pTable->name, rowHead->id);
-      pTable->size += real_size;
-      continue;
-    }
-
-    if (abs(rowHead->id) > oldId) {  // not operated
-      pMetaRow = sdbGetRow(pTable, rowHead->data);
-      if (pMetaRow == NULL) {  // New object
-        if (rowHead->id < 0) {
-          sdbError("error sdb negative id:%d, sdb:%s, skip", rowHead->id, pTable->name);
-        } else {
-          rowMeta.id = rowHead->id;
-          // TODO:Get rid of the rowMeta.offset and rowSize
-          rowMeta.offset = pTable->size;
-          rowMeta.rowSize = rowHead->rowSize;
-          rowMeta.row = (*(pTable->appTool))(SDB_TYPE_DECODE, NULL, rowHead->data, rowHead->rowSize, NULL);
-          (*sdbAddIndexFp[pTable->keyType])(pTable->iHandle, rowMeta.row, &rowMeta);
-          pTable->numOfRows++;
-
-          (*pTable->appTool)(SDB_TYPE_INSERT, rowMeta.row, NULL, 0, NULL);
-        }
-      } else {                  // already exists
-        if (rowHead->id < 0) {  // Delete the object
-          (*sdbDeleteIndexFp[pTable->keyType])(pTable->iHandle, rowHead->data);
-          (*(pTable->appTool))(SDB_TYPE_DESTROY, pMetaRow, NULL, 0, NULL);
-          pTable->numOfRows--;
-        } else {  // update the object
-          (*(pTable->appTool))(SDB_TYPE_UPDATE, pMetaRow, rowHead->data, rowHead->rowSize, NULL);
-        }
-      }
-    }
-
-    pTable->size += real_size;
-    if (pTable->id < abs(rowHead->id)) pTable->id = abs(rowHead->id);
-  }
-
-  sdbVersion += (pTable->id - oldId);
-  pTable->numOfUpdates = 0;
-  pTable->updatePos = 0;
-
-  tfree(rowHead);
-
-  sdbPrint("table:%s is updated, sdbVerion:%" PRId64 " id:%" PRId64, pTable->name, sdbVersion, pTable->id);
-}
-
-// TODO:A problem here :use snapshot file to sync another node will cause
-// problem
-void sdbSaveSnapShot(void *handle) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta;
-  void *     pNode = NULL;
-  int        total_size = 0;
-  int        real_size = 0;
-  int        size = 0;
-  int        numOfRows = 0;
-  uint32_t   sdbEcommit = SDB_ENDCOMMIT;
-  char *     dirc = NULL;
-  char *     basec = NULL;
-  /* char       action = SDB_TYPE_INSERT; */
-
-  if (pTable == NULL) return;
-
-  sdbTrace("Table:%s, save the snapshop", pTable->name);
-
-  char fn[128] = "\0";
-  dirc = strdup(pTable->fn);
-  basec = strdup(pTable->fn);
-  sprintf(fn, "%s/.%s", dirname(dirc), basename(basec));
-  int fd = open(fn, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-  tfree(dirc);
-  tfree(basec);
-
-  total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM);
-  SRowHead *rowHead = (SRowHead *)malloc(total_size);
-  if (rowHead == NULL) {
-    sdbError("failed to allocate memory while saving SDB snapshot, sdb:%s", pTable->name);
-    return;
-  }
-  memset(rowHead, 0, size);
-
-  // Write the header
-  twrite(fd, &(pTable->header), sizeof(SSdbHeader));
-  size += sizeof(SSdbHeader);
-  twrite(fd, &sdbEcommit, sizeof(sdbEcommit));
-  size += sizeof(sdbEcommit);
-
-  while (1) {
-    pNode = (*sdbFetchRowFp[pTable->keyType])(pTable->iHandle, pNode, (void **)&pMeta);
-    if (pMeta == NULL) break;
-
-    rowHead->delimiter = SDB_DELIMITER;
-    rowHead->id = pMeta->id;
-    (*(pTable->appTool))(SDB_TYPE_ENCODE, pMeta->row, rowHead->data, pTable->maxRowSize, &(rowHead->rowSize));
-    real_size = sizeof(SRowHead) + rowHead->rowSize + sizeof(TSCKSUM);
-    if (taosCalcChecksumAppend(0, (uint8_t *)rowHead, real_size) < 0) {
-      sdbError("failed to get checksum while save sdb %s snapshot", pTable->name);
-      tfree(rowHead);
-      return;
-    }
-
-    /* write(fd, &action, sizeof(action)); */
-    /* size += sizeof(action); */
-    twrite(fd, rowHead, real_size);
-    size += real_size;
-    twrite(fd, &sdbEcommit, sizeof(sdbEcommit));
-    size += sizeof(sdbEcommit);
-    numOfRows++;
-  }
-
-  tfree(rowHead);
-
-  // Remove the old file
-  tclose(pTable->fd);
-  remove(pTable->fn);
-  // Rename the .sdb.db file to sdb.db file
-  rename(fn, pTable->fn);
-  pTable->fd = fd;
-  pTable->size = size;
-  pTable->numOfRows = numOfRows;
-
-  fdatasync(pTable->fd);
-}
-
-void *sdbFetchRow(void *handle, void *pNode, void **ppRow) {
-  SSdbTable *pTable = (SSdbTable *)handle;
-  SRowMeta * pMeta;
-
-  *ppRow = NULL;
-  if (pTable == NULL) return NULL;
-
-  pNode = (*sdbFetchRowFp[pTable->keyType])(pTable->iHandle, pNode, (void **)&pMeta);
-  if (pMeta == NULL) return NULL;
-
-  *ppRow = pMeta->row;
-
-  return pNode;
-}
-
-int64_t sdbGetId(void *handle) { return ((SSdbTable *)handle)->id; }
-
-int64_t sdbGetNumOfRows(void *handle) { return ((SSdbTable *)handle)->numOfRows; }
diff --git a/src/sdb/src/sdbstr.c b/src/sdb/src/sdbstr.c
deleted file mode 100644
index 90bf2a3d43cc8d998111480efc3f5061d58b7516..0000000000000000000000000000000000000000
--- a/src/sdb/src/sdbstr.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 "sdbint.h"
-
-char* sdbStatusStr[] = {"offline", "unsynced", "syncing", "serving", "null"};
-
-char* sdbRoleStr[] = {"unauthed", "undecided", "master", "slave", "null"};
-
-#ifndef CLUSTER
-
-/*
- * Lite Version sync request is always successful
- */
-int sdbForwardDbReqToPeer(SSdbTable *pTable, char type, char *data, int dataLen) {
-  return 0;
-}
-
-/*
- * Lite Version does not need to initialize peers
- */
-int sdbInitPeers(char *directory) {
-  return 0;
-}
-
-/*
- * Lite Version does not need to cleanup peers
- */
-void sdbCleanUpPeers(){}
-
-#endif
\ No newline at end of file
diff --git a/src/sync/CMakeLists.txt b/src/sync/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..efdf2bd185cb5db46d7f0918725ebe8886d5bd98
--- /dev/null
+++ b/src/sync/CMakeLists.txt
@@ -0,0 +1,18 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+  
+IF (TD_LINUX)
+  LIST(REMOVE_ITEM SRC ./src/tarbitrator.c)
+  ADD_LIBRARY(sync ${SRC})
+  TARGET_LINK_LIBRARIES(sync tutil pthread common)
+
+  LIST(APPEND BIN_SRC ./src/tarbitrator.c)
+  LIST(APPEND BIN_SRC ./src/taosTcpPool.c)
+  ADD_EXECUTABLE(tarbitrator ${BIN_SRC})
+  TARGET_LINK_LIBRARIES(tarbitrator sync common osdetail tutil)
+
+  ADD_SUBDIRECTORY(test)
+ENDIF ()
diff --git a/src/sync/inc/syncInt.h b/src/sync/inc/syncInt.h
new file mode 100644
index 0000000000000000000000000000000000000000..f6818106462cb9c9d694d59c7cb9012cd1a54c8b
--- /dev/null
+++ b/src/sync/inc/syncInt.h
@@ -0,0 +1,178 @@
+/*
+ * 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_SYNCINT_H
+#define TDENGINE_SYNCINT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define sFatal(...) { if (sDebugFlag & DEBUG_FATAL) { taosPrintLog("SYN FATAL ", sDebugFlag, __VA_ARGS__); }}
+#define sError(...) { if (sDebugFlag & DEBUG_ERROR) { taosPrintLog("SYN ERROR ", sDebugFlag, __VA_ARGS__); }}
+#define sWarn(...)  { if (sDebugFlag & DEBUG_WARN)  { taosPrintLog("SYN WARN ", sDebugFlag, __VA_ARGS__); }}
+#define sInfo(...)  { if (sDebugFlag & DEBUG_INFO)  { taosPrintLog("SYN ", sDebugFlag, __VA_ARGS__); }}
+#define sDebug(...) { if (sDebugFlag & DEBUG_DEBUG) { taosPrintLog("SYN ", sDebugFlag, __VA_ARGS__); }}
+#define sTrace(...) { if (sDebugFlag & DEBUG_TRACE) { taosPrintLog("SYN ", sDebugFlag, __VA_ARGS__); }}
+
+#define TAOS_SMSG_SYNC_DATA    1
+#define TAOS_SMSG_FORWARD      2
+#define TAOS_SMSG_FORWARD_RSP  3
+#define TAOS_SMSG_SYNC_REQ     4 
+#define TAOS_SMSG_SYNC_RSP     5
+#define TAOS_SMSG_SYNC_MUST    6
+#define TAOS_SMSG_STATUS       7
+
+#define nodeRole    pNode->peerInfo[pNode->selfIndex]->role
+#define nodeVersion pNode->peerInfo[pNode->selfIndex]->version
+#define nodeSStatus pNode->peerInfo[pNode->selfIndex]->sstatus
+
+#pragma pack(push, 1)
+
+typedef struct {
+  char     type;        // msg type
+  char     pversion;    // protocol version
+  char     reserved[6]; // not used
+  int32_t  vgId;        // vg ID
+  int32_t  len;         // content length, does not include head
+  // char     cont[];      // message content starts from here
+} SSyncHead;
+
+typedef struct {
+  SSyncHead syncHead;
+  uint16_t  port;
+  char      fqdn[TSDB_FQDN_LEN];
+  int32_t   sourceId;  // only for arbitrator
+} SFirstPkt;
+
+typedef struct {
+  int8_t    role;
+  uint64_t  version;
+} SPeerStatus;
+
+typedef struct {
+  int8_t      role;
+  int8_t      ack;
+  uint64_t    version;
+  SPeerStatus peersStatus[];
+} SPeersStatus;
+
+typedef struct {
+  char      name[TSDB_FILENAME_LEN];
+  uint32_t  magic;
+  uint32_t  index;
+  uint64_t  fversion;
+  int64_t   size;
+} SFileInfo;
+
+typedef struct {
+  int8_t    sync;
+} SFileAck;
+
+typedef struct {
+  uint64_t  version;
+  int32_t   code;
+} SFwdRsp;
+  
+#pragma pack(pop)
+
+typedef struct {
+  char  *buffer;
+  int    bufferSize;
+  char  *offset;
+  int    forwards;
+  int    code;
+} SRecvBuffer;
+
+typedef struct {
+  uint64_t  version;
+  void     *mhandle;
+  int8_t    acks;
+  int8_t    nacks;
+  int8_t    confirmed;
+  int32_t   code;
+  uint64_t  time;
+} SFwdInfo;
+
+typedef struct {
+  int       first;
+  int       last;
+  int       fwds;  // number of forwards
+  SFwdInfo  fwdInfo[];
+} SSyncFwds;
+
+typedef struct SsyncPeer {
+  int32_t  nodeId;
+  uint32_t ip;
+  uint16_t port;
+  char     fqdn[TSDB_FQDN_LEN];   // peer ip string
+  char     id[TSDB_EP_LEN + 32];  // peer vgId + end point
+  int8_t   role;
+  int8_t   sstatus;   // sync status
+  uint64_t version;
+  uint64_t sversion;  // track the peer version in retrieve process
+  int      syncFd;
+  int      peerFd;          // forward FD
+  int      numOfRetrieves;  // number of retrieves tried
+  int      fileChanged;     // a flag to indicate file is changed during retrieving process
+  void *   timer;
+  void *   pConn;
+  int      notifyFd;
+  int      watchNum;
+  int *    watchFd;
+  int8_t   refCount;  // reference count
+  struct   SSyncNode *pSyncNode;
+} SSyncPeer;
+
+typedef struct SSyncNode {
+  char         path[TSDB_FILENAME_LEN];
+  int8_t       replica;
+  int8_t       quorum;
+  uint32_t     vgId;
+  void        *ahandle;
+  int8_t       selfIndex;
+  SSyncPeer   *peerInfo[TAOS_SYNC_MAX_REPLICA+1];  // extra one for arbitrator
+  SSyncPeer   *pMaster;
+  int8_t       refCount;
+  SRecvBuffer *pRecv;
+  SSyncFwds   *pSyncFwds;  // saved forward info if quorum >1
+  void        *pFwdTimer;
+  FGetFileInfo    getFileInfo;
+  FGetWalInfo     getWalInfo;
+  FWriteToCache   writeToCache;
+  FConfirmForward confirmForward;
+  FNotifyRole     notifyRole;
+  FNotifyFlowCtrl notifyFlowCtrl;
+  FNotifyFileSynced notifyFileSynced;
+  pthread_mutex_t mutex;
+} SSyncNode;
+
+// sync module global
+extern int  tsSyncNum;
+extern char tsNodeFqdn[TSDB_FQDN_LEN];
+
+void *syncRetrieveData(void *param);
+void *syncRestoreData(void *param);
+int   syncSaveIntoBuffer(SSyncPeer *pPeer, SWalHead *pHead);
+void  syncRestartConnection(SSyncPeer *pPeer);
+void  syncBroadcastStatus(SSyncNode *pNode);
+void  syncAddPeerRef(SSyncPeer *pPeer);
+int   syncDecPeerRef(SSyncPeer *pPeer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_VNODEPEER_H
diff --git a/src/sync/inc/syncMain.h b/src/sync/inc/syncMain.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4ddb127334ea967cdc43dcc6a57dd4cb8c0ec3b
--- /dev/null
+++ b/src/sync/inc/syncMain.h
@@ -0,0 +1,33 @@
+/*
+ * 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_PLUGINS_SYNC_H
+#define TDENGINE_PLUGINS_SYNC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+
+int32_t syncTest1();
+int32_t syncTest2();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/sync/inc/taosTcpPool.h b/src/sync/inc/taosTcpPool.h
new file mode 100644
index 0000000000000000000000000000000000000000..261d190ad3b7cbe4fbf46a061a1432c217262d24
--- /dev/null
+++ b/src/sync/inc/taosTcpPool.h
@@ -0,0 +1,46 @@
+/*
+ * 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_TCP_POOL_H
+#define TDENGINE_TCP_POOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void* ttpool_h;
+typedef void* tthread_h;
+
+typedef struct {
+  int       numOfThreads;
+  uint32_t  serverIp;
+  int16_t   port;
+  int       bufferSize;
+  void     (*processBrokenLink)(void *ahandle);
+  int      (*processIncomingMsg)(void *ahandle, void *buffer);
+  void     (*processIncomingConn)(int fd, uint32_t ip);
+} SPoolInfo;
+
+ttpool_h   taosOpenTcpThreadPool(SPoolInfo *pInfo);
+void       taosCloseTcpThreadPool(ttpool_h);
+void      *taosAllocateTcpConn(void *, void *ahandle, int connFd);
+void       taosFreeTcpConn(void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TCP_POOL_H
+                                   
diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..c7b8959926949b4ddfa4030c024402dd9d726a3f
--- /dev/null
+++ b/src/sync/src/syncMain.c
@@ -0,0 +1,1207 @@
+/*
+ * 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 <stdint.h>
+//#include <stdbool.h>
+#include "os.h"
+#include "hash.h"
+#include "tlog.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tsocket.h"
+#include "tglobal.h"
+#include "taoserror.h"
+#include "taosTcpPool.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tsync.h"
+#include "syncInt.h"
+
+// global configurable
+int tsMaxSyncNum = 2;
+int tsSyncTcpThreads = 2;
+int tsMaxWatchFiles = 500;
+int tsMaxFwdInfo = 200;
+int tsSyncTimer = 1;
+
+// module global, not configurable
+int  tsSyncNum;  // number of sync in process in whole system
+char tsNodeFqdn[TSDB_FQDN_LEN];
+
+static ttpool_h tsTcpPool;
+static void *   syncTmrCtrl = NULL;
+static void *   vgIdHash;
+
+// local functions
+static void  syncProcessSyncRequest(char *pMsg, SSyncPeer *pPeer);
+static void  syncRecoverFromMaster(SSyncPeer *pPeer);
+static void  syncCheckPeerConnection(void *param, void *tmrId);
+static void  syncSendPeersStatusMsgToPeer(SSyncPeer *pPeer, char ack);
+static void  syncProcessBrokenLink(void *param);
+static int   syncProcessPeerMsg(void *param, void *buffer);
+static void  syncProcessIncommingConnection(int connFd, uint32_t sourceIp); 
+static void  syncRemovePeer(SSyncPeer *pPeer);
+static void  syncAddArbitrator(SSyncNode *pNode);
+static void  syncAddNodeRef(SSyncNode *pNode);
+static void  syncDecNodeRef(SSyncNode *pNode);
+static void  syncRemoveConfirmedFwdInfo(SSyncNode *pNode);
+static void  syncMonitorFwdInfos(void *param, void *tmrId);
+static void  syncProcessFwdAck(SSyncNode *pNode, SFwdInfo *pFwdInfo, int32_t code);
+static void  syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle); 
+static void  syncRestartPeer(SSyncPeer *pPeer);
+static SSyncPeer *syncAddPeer(SSyncNode *pNode, const SNodeInfo *pInfo);
+
+char* syncRole[] = {
+  "offline",
+  "unsynced",
+  "syncing",
+  "slave",
+  "master"
+};
+
+int32_t syncInit() {
+  SPoolInfo info;
+
+  info.numOfThreads = tsSyncTcpThreads;
+  info.serverIp = 0;
+  info.port = tsSyncPort;
+  info.bufferSize = 640000;
+  info.processBrokenLink = syncProcessBrokenLink;
+  info.processIncomingMsg = syncProcessPeerMsg;
+  info.processIncomingConn = syncProcessIncommingConnection;
+
+  tsTcpPool = taosOpenTcpThreadPool(&info);
+  if (tsTcpPool == NULL) {
+    sError("failed to init tcpPool");
+    return -1;
+  }
+
+  syncTmrCtrl = taosTmrInit(1000, 50, 10000, "SYNC");
+  if (syncTmrCtrl == NULL) {
+    sError("failed to init tmrCtrl");
+    taosCloseTcpThreadPool(tsTcpPool);
+    tsTcpPool = NULL;
+    return -1;
+  }
+
+  vgIdHash = taosHashInit(TSDB_MIN_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, true);
+  if (vgIdHash == NULL) {
+    sError("failed to init vgIdHash");
+    taosTmrCleanUp(syncTmrCtrl);
+    taosCloseTcpThreadPool(tsTcpPool);
+    tsTcpPool = NULL;
+    syncTmrCtrl = NULL;
+    return -1;
+  }
+
+  tstrncpy(tsNodeFqdn, tsLocalFqdn, sizeof(tsNodeFqdn));
+  sInfo("sync module initialized successfully");
+
+  return 0;
+}
+
+void syncCleanUp() {
+  if (tsTcpPool) {
+    taosCloseTcpThreadPool(tsTcpPool);
+    tsTcpPool = NULL;
+  }
+
+  if (syncTmrCtrl) {
+    taosTmrCleanUp(syncTmrCtrl);
+    syncTmrCtrl = NULL;
+  }
+
+  if (vgIdHash) {
+    taosHashCleanup(vgIdHash);
+    vgIdHash = NULL;
+  }
+
+  sInfo("sync module is cleaned up");
+}
+
+void *syncStart(const SSyncInfo *pInfo) {
+  const SSyncCfg *pCfg = &pInfo->syncCfg;
+
+  SSyncNode *pNode = (SSyncNode *)calloc(sizeof(SSyncNode), 1);
+  if (pNode == NULL) {
+    sError("no memory to allocate syncNode");
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  tstrncpy(pNode->path, pInfo->path, sizeof(pNode->path));
+  pthread_mutex_init(&pNode->mutex, NULL);
+
+  pNode->ahandle = pInfo->ahandle;
+  pNode->getFileInfo = pInfo->getFileInfo;
+  pNode->getWalInfo = pInfo->getWalInfo;
+  pNode->writeToCache = pInfo->writeToCache;
+  pNode->notifyRole = pInfo->notifyRole;
+  pNode->confirmForward = pInfo->confirmForward;
+  pNode->notifyFlowCtrl = pInfo->notifyFlowCtrl;
+  pNode->notifyFileSynced = pInfo->notifyFileSynced;
+
+  pNode->selfIndex = -1;
+  pNode->vgId = pInfo->vgId;
+  pNode->replica = pCfg->replica;
+  pNode->quorum = pCfg->quorum;
+  if (pNode->quorum > pNode->replica) pNode->quorum = pNode->replica;
+
+  for (int i = 0; i < pCfg->replica; ++i) {
+    const SNodeInfo *pNodeInfo = pCfg->nodeInfo + i;
+    pNode->peerInfo[i] = syncAddPeer(pNode, pNodeInfo);
+    if ((strcmp(pNodeInfo->nodeFqdn, tsNodeFqdn) == 0) && (pNodeInfo->nodePort == tsSyncPort)) {
+      pNode->selfIndex = i;
+    }
+  }
+
+  syncAddNodeRef(pNode);
+
+  if (pNode->selfIndex < 0) {
+    sInfo("vgId:%d, this node is not configured", pNode->vgId);
+    terrno = TSDB_CODE_SYN_INVALID_CONFIG;
+    syncStop(pNode);
+    return NULL;
+  }
+
+  nodeVersion = pInfo->version;  // set the initial version
+  nodeRole = (pNode->replica > 1) ? TAOS_SYNC_ROLE_UNSYNCED : TAOS_SYNC_ROLE_MASTER;
+  sInfo("vgId:%d, %d replicas are configured, quorum:%d role:%s", pNode->vgId, pNode->replica, pNode->quorum,
+        syncRole[nodeRole]);
+
+  pNode->pSyncFwds = calloc(sizeof(SSyncFwds) + tsMaxFwdInfo * sizeof(SFwdInfo), 1);
+  if (pNode->pSyncFwds == NULL) {
+    sError("vgId:%d, no memory to allocate syncFwds", pNode->vgId);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    syncStop(pNode);
+    return NULL;
+  }
+
+  pNode->pFwdTimer = taosTmrStart(syncMonitorFwdInfos, 300, pNode, syncTmrCtrl);
+  if (pNode->pFwdTimer == NULL) {
+    sError("vgId:%d, failed to allocate timer", pNode->vgId);
+    syncStop(pNode);
+    return NULL;
+  }
+
+  syncAddArbitrator(pNode);
+  taosHashPut(vgIdHash, (const char *)&pNode->vgId, sizeof(int32_t), (char *)(&pNode), sizeof(SSyncNode *));
+
+  if (pNode->notifyRole) {
+    (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+  }
+
+  return pNode;
+}
+
+void syncStop(void *param) {
+  SSyncNode *pNode = param;
+  SSyncPeer *pPeer;
+
+  if (pNode == NULL) return;
+  sInfo("vgId:%d, cleanup sync", pNode->vgId);
+
+  pthread_mutex_lock(&(pNode->mutex));
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    pPeer = pNode->peerInfo[i];
+    if (pPeer) syncRemovePeer(pPeer);
+  }
+
+  pPeer = pNode->peerInfo[TAOS_SYNC_MAX_REPLICA];
+  if (pPeer) syncRemovePeer(pPeer);
+
+  if (vgIdHash) taosHashRemove(vgIdHash, (const char *)&pNode->vgId, sizeof(int32_t));
+  if (pNode->pFwdTimer) taosTmrStop(pNode->pFwdTimer);
+
+  pthread_mutex_unlock(&(pNode->mutex));
+
+  syncDecNodeRef(pNode);
+}
+
+int32_t syncReconfig(void *param, const SSyncCfg *pNewCfg) {
+  SSyncNode *pNode = param;
+  int        i, j;
+
+  if (pNode == NULL) return TSDB_CODE_SYN_INVALID_CONFIG;
+  sInfo("vgId:%d, reconfig, role:%s replica:%d old:%d", pNode->vgId, syncRole[nodeRole], pNewCfg->replica,
+        pNode->replica);
+
+  pthread_mutex_lock(&(pNode->mutex));
+
+  for (i = 0; i < pNode->replica; ++i) {
+    for (j = 0; j < pNewCfg->replica; ++j) {
+      if ((strcmp(pNode->peerInfo[i]->fqdn, pNewCfg->nodeInfo[j].nodeFqdn) == 0) &&
+          (pNode->peerInfo[i]->port == pNewCfg->nodeInfo[j].nodePort))
+        break;
+    }
+
+    if (j >= pNewCfg->replica) {
+      syncRemovePeer(pNode->peerInfo[i]);
+      pNode->peerInfo[i] = NULL;
+    }
+  }
+
+  SSyncPeer *newPeers[TAOS_SYNC_MAX_REPLICA];
+  for (i = 0; i < pNewCfg->replica; ++i) {
+    const SNodeInfo *pNewNode = &pNewCfg->nodeInfo[i];
+
+    for (j = 0; j < pNode->replica; ++j) {
+      if (pNode->peerInfo[j] && (strcmp(pNode->peerInfo[j]->fqdn, pNewNode->nodeFqdn) == 0) &&
+          (pNode->peerInfo[j]->port == pNewNode->nodePort))
+        break;
+    }
+
+    if (j >= pNode->replica) {
+      newPeers[i] = syncAddPeer(pNode, pNewNode);
+    } else {
+      newPeers[i] = pNode->peerInfo[j];
+    }
+
+    if ((strcmp(pNewNode->nodeFqdn, tsNodeFqdn) == 0) && (pNewNode->nodePort == tsSyncPort)) {
+      pNode->selfIndex = i;
+    }
+  }
+
+  pNode->replica = pNewCfg->replica;
+  pNode->quorum = pNewCfg->quorum;
+  if (pNode->quorum > pNode->replica) pNode->quorum = pNode->replica;
+  memcpy(pNode->peerInfo, newPeers, sizeof(SSyncPeer *) * pNewCfg->replica);
+
+  for (i = pNewCfg->replica; i < TAOS_SYNC_MAX_REPLICA; ++i) {
+    pNode->peerInfo[i] = NULL;
+  }
+
+  syncAddArbitrator(pNode);
+
+  if (pNewCfg->replica <= 1) {
+    sInfo("vgId:%d, no peers are configured, work as master!", pNode->vgId);
+    nodeRole = TAOS_SYNC_ROLE_MASTER;
+    (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+
+  sInfo("vgId:%d, %d replicas are configured, quorum:%d role:%s", pNode->vgId, pNode->replica, pNode->quorum,
+        syncRole[nodeRole]);
+  syncBroadcastStatus(pNode);
+
+  return 0;
+}
+
+int32_t syncForwardToPeer(void *param, void *data, void *mhandle, int qtype) {
+  SSyncNode *pNode = param;
+  SSyncPeer *pPeer;
+  SSyncHead *pSyncHead;
+  SWalHead * pWalHead = data;
+  int        fwdLen;
+  int        code = 0;
+
+  if (pNode == NULL) return 0;
+
+  // always update version
+  nodeVersion = pWalHead->version;
+  if (pNode->replica == 1 || nodeRole != TAOS_SYNC_ROLE_MASTER) return 0;
+
+  // only pkt from RPC or CQ can be forwarded
+  if (qtype != TAOS_QTYPE_RPC && qtype != TAOS_QTYPE_CQ) return 0;
+
+  // a hacker way to improve the performance
+  pSyncHead = (SSyncHead *)(((char *)pWalHead) - sizeof(SSyncHead));
+  pSyncHead->type = TAOS_SMSG_FORWARD;
+  pSyncHead->pversion = 0;
+  pSyncHead->len = sizeof(SWalHead) + pWalHead->len;
+  fwdLen = pSyncHead->len + sizeof(SSyncHead);  // include the WAL and SYNC head
+
+  pthread_mutex_lock(&(pNode->mutex));
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    pPeer = pNode->peerInfo[i];
+    if (pPeer == NULL || pPeer->peerFd < 0) continue;
+    if (pPeer->role != TAOS_SYNC_ROLE_SLAVE && pPeer->sstatus != TAOS_SYNC_STATUS_CACHE) continue;
+
+    if (pNode->quorum > 1 && code == 0) {
+      syncSaveFwdInfo(pNode, pWalHead->version, mhandle);
+      code = 1;
+    }
+
+    int retLen = write(pPeer->peerFd, pSyncHead, fwdLen);
+    if (retLen == fwdLen) {
+      sDebug("%s, forward is sent, ver:%" PRIu64 " contLen:%d", pPeer->id, pWalHead->version, pWalHead->len);
+    } else {
+      sError("%s, failed to forward, ver:%" PRIu64 " retLen:%d", pPeer->id, pWalHead->version, retLen);
+      syncRestartConnection(pPeer);
+    }
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+
+  return code;
+}
+
+void syncConfirmForward(void *param, uint64_t version, int32_t code) {
+  SSyncNode *pNode = param;
+  if (pNode == NULL) return;
+  if (pNode->quorum <= 1) return;
+
+  SSyncPeer *pPeer = pNode->pMaster;
+  if (pPeer == NULL) return;
+
+  char msg[sizeof(SSyncHead) + sizeof(SFwdRsp)] = {0};
+
+  SSyncHead *pHead = (SSyncHead *)msg;
+  pHead->type = TAOS_SMSG_FORWARD_RSP;
+  pHead->len = sizeof(SFwdRsp);
+
+  SFwdRsp *pFwdRsp = (SFwdRsp *)(msg + sizeof(SSyncHead));
+  pFwdRsp->version = version;
+  pFwdRsp->code = code;
+
+  int msgLen = sizeof(SSyncHead) + sizeof(SFwdRsp);
+  int retLen = write(pPeer->peerFd, msg, msgLen);
+
+  if (retLen == msgLen) {
+    sDebug("%s, forward-rsp is sent, ver:%" PRIu64, pPeer->id, version);
+  } else {
+    sDebug("%s, failed to send forward ack, restart", pPeer->id);
+    syncRestartConnection(pPeer);
+  }
+}
+
+void syncRecover(void *param) {
+  SSyncNode *pNode = param;
+  SSyncPeer *pPeer;
+
+  // to do: add a few lines to check if recover is OK
+  // if take this node to unsync state, the whole system may not work
+
+  nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
+  (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+  nodeVersion = 0;
+
+  pthread_mutex_lock(&(pNode->mutex));
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    pPeer = (SSyncPeer *)pNode->peerInfo[i];
+    if (pPeer->peerFd >= 0) {
+      syncRestartConnection(pPeer);
+    }
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+}
+
+int syncGetNodesRole(void *param, SNodesRole *pNodesRole) {
+  SSyncNode *pNode = param;
+
+  pNodesRole->selfIndex = pNode->selfIndex;
+  for (int i = 0; i < pNode->replica; ++i) {
+    pNodesRole->nodeId[i] = pNode->peerInfo[i]->nodeId;
+    pNodesRole->role[i] = pNode->peerInfo[i]->role;
+  }
+
+  return 0;
+}
+
+static void syncAddArbitrator(SSyncNode *pNode) {
+  SSyncPeer *pPeer = pNode->peerInfo[TAOS_SYNC_MAX_REPLICA];
+
+  // if not configured, return right away
+  if (tsArbitrator[0] == 0) {
+    if (pPeer) syncRemovePeer(pPeer);
+    pNode->peerInfo[TAOS_SYNC_MAX_REPLICA] = NULL;
+    return;
+  }
+
+  SNodeInfo nodeInfo;
+  nodeInfo.nodeId = 0;
+  int ret = taosGetFqdnPortFromEp(tsArbitrator, nodeInfo.nodeFqdn, &nodeInfo.nodePort);
+  if (-1 == ret) {
+    nodeInfo.nodePort = tsArbitratorPort;
+  }
+
+  if (pPeer) {
+    if ((strcmp(nodeInfo.nodeFqdn, pPeer->fqdn) == 0) && (nodeInfo.nodePort == pPeer->port)) {
+      return;
+    } else {
+      syncRemovePeer(pPeer);
+      pNode->peerInfo[TAOS_SYNC_MAX_REPLICA] = NULL;
+    }
+  }
+
+  pNode->peerInfo[TAOS_SYNC_MAX_REPLICA] = syncAddPeer(pNode, &nodeInfo);
+}
+
+static void syncAddNodeRef(SSyncNode *pNode) { atomic_add_fetch_8(&pNode->refCount, 1); }
+
+static void syncDecNodeRef(SSyncNode *pNode) {
+  if (atomic_sub_fetch_8(&pNode->refCount, 1) == 0) {
+    pthread_mutex_destroy(&pNode->mutex);
+    taosTFree(pNode->pRecv);
+    taosTFree(pNode->pSyncFwds);
+    taosTFree(pNode);
+  }
+}
+
+void syncAddPeerRef(SSyncPeer *pPeer) { atomic_add_fetch_8(&pPeer->refCount, 1); }
+
+int syncDecPeerRef(SSyncPeer *pPeer) {
+  if (atomic_sub_fetch_8(&pPeer->refCount, 1) == 0) {
+    syncDecNodeRef(pPeer->pSyncNode);
+
+    sDebug("%s, resource is freed", pPeer->id);
+    taosTFree(pPeer->watchFd);
+    taosTFree(pPeer);
+    return 0;
+  }
+
+  return 1;
+}
+
+static void syncClosePeerConn(SSyncPeer *pPeer) {
+  taosTmrStopA(&pPeer->timer);
+  taosClose(pPeer->syncFd);
+  if (pPeer->peerFd >= 0) {
+    pPeer->peerFd = -1;
+    taosFreeTcpConn(pPeer->pConn);
+  }
+}
+
+static void syncRemovePeer(SSyncPeer *pPeer) {
+  sInfo("%s, it is removed", pPeer->id);
+
+  pPeer->ip = 0;
+  syncClosePeerConn(pPeer);
+  syncDecPeerRef(pPeer);
+}
+
+static SSyncPeer *syncAddPeer(SSyncNode *pNode, const SNodeInfo *pInfo) {
+  uint32_t ip = taosGetIpFromFqdn(pInfo->nodeFqdn);
+  if (ip == -1) return NULL;
+
+  SSyncPeer *pPeer = (SSyncPeer *)calloc(1, sizeof(SSyncPeer));
+  if (pPeer == NULL) return NULL;
+
+  pPeer->nodeId = pInfo->nodeId;
+  tstrncpy(pPeer->fqdn, pInfo->nodeFqdn, sizeof(pPeer->fqdn));
+  pPeer->ip = ip;
+  pPeer->port = pInfo->nodePort;
+  pPeer->fqdn[sizeof(pPeer->fqdn) - 1] = 0;
+  snprintf(pPeer->id, sizeof(pPeer->id), "vgId:%d peer:%s:%d", pNode->vgId, pPeer->fqdn, pPeer->port);
+
+  pPeer->peerFd = -1;
+  pPeer->syncFd = -1;
+  pPeer->role = TAOS_SYNC_ROLE_OFFLINE;
+  pPeer->pSyncNode = pNode;
+  pPeer->refCount = 1;
+
+  sInfo("%s, it is configured", pPeer->id);
+  int ret = strcmp(pPeer->fqdn, tsNodeFqdn);
+  if (pPeer->nodeId == 0 || (ret > 0) || (ret == 0 && pPeer->port > tsSyncPort)) {
+    int32_t checkMs = 100 + (pNode->vgId * 10) % 100;
+    if (pNode->vgId > 1) checkMs = tsStatusInterval * 2000 + checkMs;
+    sDebug("%s, start to check peer connection after %d ms", pPeer->id, checkMs);
+    taosTmrReset(syncCheckPeerConnection, checkMs, pPeer, syncTmrCtrl, &pPeer->timer);
+  }
+
+  syncAddNodeRef(pNode);
+  return pPeer;
+}
+
+void syncBroadcastStatus(SSyncNode *pNode) {
+  SSyncPeer *pPeer;
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    if (i == pNode->selfIndex) continue;
+    pPeer = pNode->peerInfo[i];
+    syncSendPeersStatusMsgToPeer(pPeer, 1);
+  }
+}
+
+static void syncResetFlowCtrl(SSyncNode *pNode) {
+  for (int i = 0; i < pNode->replica; ++i) {
+    pNode->peerInfo[i]->numOfRetrieves = 0;
+  }
+
+  if (pNode->notifyFlowCtrl) {
+    (*pNode->notifyFlowCtrl)(pNode->ahandle, 0);
+  }
+}
+
+static void syncChooseMaster(SSyncNode *pNode) {
+  SSyncPeer *pPeer;
+  int        onlineNum = 0;
+  int        index = -1;
+  int        replica = pNode->replica;
+
+  sDebug("vgId:%d, choose master", pNode->vgId);
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    if (pNode->peerInfo[i]->role != TAOS_SYNC_ROLE_OFFLINE) {
+      onlineNum++;
+    }
+  }
+
+  if (onlineNum == pNode->replica) {
+    // if all peers are online, peer with highest version shall be master
+    index = 0;
+    for (int i = 1; i < pNode->replica; ++i) {
+      if (pNode->peerInfo[i]->version > pNode->peerInfo[index]->version) {
+        index = i;
+      }
+    }
+  }
+
+  // add arbitrator connection
+  SSyncPeer *pArb = pNode->peerInfo[TAOS_SYNC_MAX_REPLICA];
+  if (pArb && pArb->role != TAOS_SYNC_ROLE_OFFLINE) {
+    onlineNum++;
+    replica = pNode->replica + 1;
+  }
+
+  if (index < 0 && onlineNum > replica / 2.0) {
+    // over half of nodes are online
+    for (int i = 0; i < pNode->replica; ++i) {
+      // slave with highest version shall be master
+      pPeer = pNode->peerInfo[i];
+      if (pPeer->role == TAOS_SYNC_ROLE_SLAVE || pPeer->role == TAOS_SYNC_ROLE_MASTER) {
+        if (index < 0 || pPeer->version > pNode->peerInfo[index]->version) {
+          index = i;
+        }
+      }
+    }
+  }
+
+  if (index >= 0) {
+    if (index == pNode->selfIndex) {
+      sInfo("vgId:%d, start to work as master", pNode->vgId);
+      nodeRole = TAOS_SYNC_ROLE_MASTER;
+      syncResetFlowCtrl(pNode);
+      (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+    } else {
+      pPeer = pNode->peerInfo[index];
+      sInfo("%s, it shall work as master", pPeer->id);
+    }
+  } else {
+    sDebug("vgId:%d, failed to choose master", pNode->vgId);
+  }
+}
+
+static SSyncPeer *syncCheckMaster(SSyncNode *pNode) {
+  int onlineNum = 0;
+  int index = -1;
+  int replica = pNode->replica;
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    if (pNode->peerInfo[i]->role != TAOS_SYNC_ROLE_OFFLINE) {
+      onlineNum++;
+    }
+  }
+
+  // add arbitrator connection
+  SSyncPeer *pArb = pNode->peerInfo[TAOS_SYNC_MAX_REPLICA];
+  if (pArb && pArb->role != TAOS_SYNC_ROLE_OFFLINE) {
+    onlineNum++;
+    replica = pNode->replica + 1;
+  }
+
+  if (onlineNum <= replica * 0.5) {
+    if (nodeRole != TAOS_SYNC_ROLE_UNSYNCED) {
+      nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
+      // pNode->peerInfo[pNode->selfIndex]->role = nodeRole;
+      (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+      sInfo("vgId:%d, change to unsynced state, online:%d replica:%d", pNode->vgId, onlineNum, replica);
+    }
+  } else {
+    for (int i = 0; i < pNode->replica; ++i) {
+      SSyncPeer *pTemp = pNode->peerInfo[i];
+      if (pTemp->role != TAOS_SYNC_ROLE_MASTER) continue;
+      if (index < 0) {
+        index = i;
+      } else {  // multiple masters, it shall not happen
+        if (i == pNode->selfIndex) {
+          sError("%s, peer is master, work as slave instead", pTemp->id);
+          nodeRole = TAOS_SYNC_ROLE_SLAVE;
+          (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+        }
+      }
+    }
+  }
+
+  SSyncPeer *pMaster = (index >= 0) ? pNode->peerInfo[index] : NULL;
+  return pMaster;
+}
+
+static int syncValidateMaster(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  int        code = 0;
+
+  if (nodeRole == TAOS_SYNC_ROLE_MASTER && nodeVersion < pPeer->version) {
+    sDebug("%s, slave has higher version, restart all connections!!!", pPeer->id);
+    nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
+    (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+    code = -1;
+
+    for (int i = 0; i < pNode->replica; ++i) {
+      if (i == pNode->selfIndex) continue;
+      syncRestartPeer(pNode->peerInfo[i]);
+    }
+  }
+
+  return code;
+}
+
+static void syncCheckRole(SSyncPeer *pPeer, SPeerStatus peersStatus[], int8_t newRole) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  int8_t     peerOldRole = pPeer->role;
+  int8_t     selfOldRole = nodeRole;
+  int8_t     i, syncRequired = 0;
+
+  // pNode->peerInfo[pNode->selfIndex]->version = nodeVersion;
+  pPeer->role = newRole;
+
+  sDebug("%s, own role:%s, new peer role:%s", pPeer->id, syncRole[nodeRole], syncRole[pPeer->role]);
+
+  SSyncPeer *pMaster = syncCheckMaster(pNode);
+
+  if (pMaster) {
+    // master is there
+    pNode->pMaster = pMaster;
+    sDebug("%s, it is the master, ver:%" PRIu64, pMaster->id, pMaster->version);
+
+    if (syncValidateMaster(pPeer) < 0) return;
+
+    if (nodeRole == TAOS_SYNC_ROLE_UNSYNCED) {
+      if (nodeVersion < pMaster->version) {
+        syncRequired = 1;
+      } else {
+        sInfo("%s is master, work as slave, ver:%" PRIu64, pMaster->id, pMaster->version);
+        nodeRole = TAOS_SYNC_ROLE_SLAVE;
+        (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+      }
+    } else if (nodeRole == TAOS_SYNC_ROLE_SLAVE && pMaster == pPeer) {
+      // nodeVersion = pMaster->version;
+    }
+  } else {
+    // master not there, if all peer's state and version are consistent, choose the master
+    int consistent = 0;
+    if (peersStatus) {
+      for (i = 0; i < pNode->replica; ++i) {
+        SSyncPeer *pTemp = pNode->peerInfo[i];
+        if (pTemp->role != peersStatus[i].role) break;
+        if ((pTemp->role != TAOS_SYNC_ROLE_OFFLINE) && (pTemp->version != peersStatus[i].version)) break;
+      }
+
+      if (i >= pNode->replica) consistent = 1;
+    } else {
+      if (pNode->replica == 2) consistent = 1;
+    }
+
+    if (consistent) {
+      syncChooseMaster(pNode);
+    }
+  }
+
+  if (syncRequired) {
+    syncRecoverFromMaster(pMaster);
+  }
+
+  if (peerOldRole != newRole || nodeRole != selfOldRole) {
+    syncBroadcastStatus(pNode);
+  }
+
+  if (nodeRole != TAOS_SYNC_ROLE_MASTER) {
+    syncResetFlowCtrl(pNode);
+  }
+}
+
+static void syncRestartPeer(SSyncPeer *pPeer) {
+  sDebug("%s, restart connection", pPeer->id);
+
+  syncClosePeerConn(pPeer);
+
+  pPeer->sstatus = TAOS_SYNC_STATUS_INIT;
+
+  int ret = strcmp(pPeer->fqdn, tsNodeFqdn);
+  if (ret > 0 || (ret == 0 && pPeer->port > tsSyncPort)) {
+    taosTmrReset(syncCheckPeerConnection, tsSyncTimer * 1000, pPeer, syncTmrCtrl, &pPeer->timer);
+  }
+}
+
+void syncRestartConnection(SSyncPeer *pPeer) {
+  if (pPeer->ip == 0) return;
+
+  syncRestartPeer(pPeer);
+  syncCheckRole(pPeer, NULL, TAOS_SYNC_ROLE_OFFLINE);
+}
+
+static void syncProcessSyncRequest(char *msg, SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  sDebug("%s, sync-req is received", pPeer->id);
+
+  if (pPeer->ip == 0) return;
+
+  if (nodeRole != TAOS_SYNC_ROLE_MASTER) {
+    sError("%s, I am not master anymore", pPeer->id);
+    taosClose(pPeer->syncFd);
+    return;
+  }
+
+  if (pPeer->sstatus != TAOS_SYNC_STATUS_INIT) {
+    sDebug("%s, sync is already started", pPeer->id);
+    return;  // already started
+  }
+
+  // start a new thread to retrieve the data
+  syncAddPeerRef(pPeer);
+  pthread_attr_t thattr;
+  pthread_t      thread;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
+  int ret = pthread_create(&thread, &thattr, syncRetrieveData, pPeer);
+  pthread_attr_destroy(&thattr);
+
+  if (ret != 0) {
+    sError("%s, failed to create sync thread(%s)", pPeer->id, strerror(errno));
+    syncDecPeerRef(pPeer);
+  } else {
+    pPeer->sstatus = TAOS_SYNC_STATUS_START;
+    sDebug("%s, thread is created to retrieve data", pPeer->id);
+  }
+}
+
+static void syncNotStarted(void *param, void *tmrId) {
+  SSyncPeer *pPeer = param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  pthread_mutex_lock(&(pNode->mutex));
+  pPeer->timer = NULL;
+  sInfo("%s, sync connection is still not up, restart", pPeer->id);
+  syncRestartConnection(pPeer);
+  pthread_mutex_unlock(&(pNode->mutex));
+}
+
+static void syncTryRecoverFromMaster(void *param, void *tmrId) {
+  SSyncPeer *pPeer = param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  pthread_mutex_lock(&(pNode->mutex));
+  syncRecoverFromMaster(pPeer);
+  pthread_mutex_unlock(&(pNode->mutex));
+}
+
+static void syncRecoverFromMaster(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  if (nodeSStatus != TAOS_SYNC_STATUS_INIT) {
+    sDebug("%s, sync is already started, status:%d", pPeer->id, nodeSStatus);
+    return;
+  }
+
+  taosTmrStopA(&pPeer->timer);
+
+  // Ensure the sync of mnode not interrupted
+  if (pNode->vgId != 1 && tsSyncNum >= tsMaxSyncNum) {
+    sInfo("%s, %d syncs are in process, try later", pPeer->id, tsSyncNum);
+    taosTmrReset(syncTryRecoverFromMaster, 500 + (pNode->vgId * 10) % 200, pPeer, syncTmrCtrl, &pPeer->timer);
+    return;
+  }
+
+  sDebug("%s, try to sync", pPeer->id);
+
+  SFirstPkt firstPkt;
+  memset(&firstPkt, 0, sizeof(firstPkt));
+  firstPkt.syncHead.type = TAOS_SMSG_SYNC_REQ;
+  firstPkt.syncHead.vgId = pNode->vgId;
+  firstPkt.syncHead.len = sizeof(firstPkt) - sizeof(SSyncHead);
+  tstrncpy(firstPkt.fqdn, tsNodeFqdn, sizeof(firstPkt.fqdn));
+  firstPkt.port = tsSyncPort;
+  taosTmrReset(syncNotStarted, tsSyncTimer * 1000, pPeer, syncTmrCtrl, &pPeer->timer);
+
+  if (write(pPeer->peerFd, &firstPkt, sizeof(firstPkt)) != sizeof(firstPkt)) {
+    sError("%s, failed to send sync-req to peer", pPeer->id);
+  } else {
+    nodeSStatus = TAOS_SYNC_STATUS_START;
+    sInfo("%s, sync-req is sent", pPeer->id);
+  }
+}
+
+static void syncProcessFwdResponse(char *cont, SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  SFwdRsp *  pFwdRsp = (SFwdRsp *)cont;
+  SSyncFwds *pSyncFwds = pNode->pSyncFwds;
+  SFwdInfo * pFwdInfo;
+
+  sDebug("%s, forward-rsp is received, ver:%" PRIu64, pPeer->id, pFwdRsp->version);
+  SFwdInfo *pFirst = pSyncFwds->fwdInfo + pSyncFwds->first;
+
+  if (pFirst->version <= pFwdRsp->version && pSyncFwds->fwds > 0) {
+    // find the forwardInfo from first
+    for (int i = 0; i < pSyncFwds->fwds; ++i) {
+      pFwdInfo = pSyncFwds->fwdInfo + (i + pSyncFwds->first) % tsMaxFwdInfo;
+      if (pFwdRsp->version == pFwdInfo->version) break;
+    }
+
+    syncProcessFwdAck(pNode, pFwdInfo, pFwdRsp->code);
+    syncRemoveConfirmedFwdInfo(pNode);
+  }
+}
+
+static void syncProcessForwardFromPeer(char *cont, SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  SWalHead * pHead = (SWalHead *)cont;
+
+  sDebug("%s, forward is received, ver:%" PRIu64, pPeer->id, pHead->version);
+
+  if (nodeRole == TAOS_SYNC_ROLE_SLAVE) {
+    // nodeVersion = pHead->version;
+    (*pNode->writeToCache)(pNode->ahandle, pHead, TAOS_QTYPE_FWD);
+  } else {
+    if (nodeSStatus != TAOS_SYNC_STATUS_INIT) {
+      syncSaveIntoBuffer(pPeer, pHead);
+    } else {
+      sError("%s, forward discarded, ver:%" PRIu64, pPeer->id, pHead->version);
+    }
+  }
+}
+
+static void syncProcessPeersStatusMsg(char *cont, SSyncPeer *pPeer) {
+  SSyncNode *   pNode = pPeer->pSyncNode;
+  SPeersStatus *pPeersStatus = (SPeersStatus *)cont;
+
+  sDebug("%s, status msg received, self:%s ver:%" PRIu64 " peer:%s ver:%" PRIu64 ", ack:%d", pPeer->id,
+         syncRole[nodeRole], nodeVersion, syncRole[pPeersStatus->role], pPeersStatus->version, pPeersStatus->ack);
+
+  pPeer->version = pPeersStatus->version;
+  syncCheckRole(pPeer, pPeersStatus->peersStatus, pPeersStatus->role);
+
+  if (pPeersStatus->ack) {
+    syncSendPeersStatusMsgToPeer(pPeer, 0);
+  }
+}
+
+static int syncReadPeerMsg(SSyncPeer *pPeer, SSyncHead *pHead, char *cont) {
+  if (pPeer->peerFd < 0) return -1;
+
+  int hlen = taosReadMsg(pPeer->peerFd, pHead, sizeof(SSyncHead));
+  if (hlen != sizeof(SSyncHead)) {
+    sDebug("%s, failed to read msg, hlen:%d", pPeer->id, hlen);
+    return -1;
+  }
+
+  // head.len = htonl(head.len);
+  if (pHead->len < 0) {
+    sError("%s, invalid pkt length, len:%d", pPeer->id, pHead->len);
+    return -1;
+  }
+
+  int bytes = taosReadMsg(pPeer->peerFd, cont, pHead->len);
+  if (bytes != pHead->len) {
+    sError("%s, failed to read, bytes:%d len:%d", pPeer->id, bytes, pHead->len);
+    return -1;
+  }
+
+  return 0;
+}
+
+static int syncProcessPeerMsg(void *param, void *buffer) {
+  SSyncPeer *pPeer = param;
+  SSyncHead  head;
+  char *     cont = buffer;
+
+  SSyncNode *pNode = pPeer->pSyncNode;
+  pthread_mutex_lock(&(pNode->mutex));
+
+  int code = syncReadPeerMsg(pPeer, &head, cont);
+
+  if (code == 0) {
+    if (head.type == TAOS_SMSG_FORWARD) {
+      syncProcessForwardFromPeer(cont, pPeer);
+    } else if (head.type == TAOS_SMSG_FORWARD_RSP) {
+      syncProcessFwdResponse(cont, pPeer);
+    } else if (head.type == TAOS_SMSG_SYNC_REQ) {
+      syncProcessSyncRequest(cont, pPeer);
+    } else if (head.type == TAOS_SMSG_STATUS) {
+      syncProcessPeersStatusMsg(cont, pPeer);
+    }
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+
+  return code;
+}
+
+#define statusMsgLen sizeof(SSyncHead) + sizeof(SPeersStatus) + sizeof(SPeerStatus) * TAOS_SYNC_MAX_REPLICA
+
+static void syncSendPeersStatusMsgToPeer(SSyncPeer *pPeer, char ack) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  char       msg[statusMsgLen] = {0};
+
+  if (pPeer->peerFd < 0 || pPeer->ip == 0) return;
+
+  SSyncHead *   pHead = (SSyncHead *)msg;
+  SPeersStatus *pPeersStatus = (SPeersStatus *)(msg + sizeof(SSyncHead));
+
+  pHead->type = TAOS_SMSG_STATUS;
+  pHead->len = statusMsgLen - sizeof(SSyncHead);
+
+  pPeersStatus->version = nodeVersion;
+  pPeersStatus->role = nodeRole;
+  pPeersStatus->ack = ack;
+
+  for (int i = 0; i < pNode->replica; ++i) {
+    pPeersStatus->peersStatus[i].role = pNode->peerInfo[i]->role;
+    pPeersStatus->peersStatus[i].version = pNode->peerInfo[i]->version;
+  }
+
+  int retLen = write(pPeer->peerFd, msg, statusMsgLen);
+  if (retLen == statusMsgLen) {
+    sDebug("%s, status msg is sent", pPeer->id);
+  } else {
+    sDebug("%s, failed to send status msg, restart", pPeer->id);
+    syncRestartConnection(pPeer);
+  }
+
+  return;
+}
+
+static void syncSetupPeerConnection(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  taosTmrStopA(&pPeer->timer);
+  if (pPeer->peerFd >= 0) {
+    sDebug("%s, send role version to peer", pPeer->id);
+    syncSendPeersStatusMsgToPeer(pPeer, 1);
+    return;
+  }
+
+  int connFd = taosOpenTcpClientSocket(pPeer->ip, pPeer->port, 0);
+  if (connFd < 0) {
+    sDebug("%s, failed to open tcp socket(%s)", pPeer->id, strerror(errno));
+    taosTmrReset(syncCheckPeerConnection, tsSyncTimer * 1000, pPeer, syncTmrCtrl, &pPeer->timer);
+    return;
+  }
+
+  SFirstPkt firstPkt;
+  memset(&firstPkt, 0, sizeof(firstPkt));
+  firstPkt.syncHead.vgId = pPeer->nodeId ? pNode->vgId : 0;
+  firstPkt.syncHead.type = TAOS_SMSG_STATUS;
+  tstrncpy(firstPkt.fqdn, tsNodeFqdn, sizeof(firstPkt.fqdn));
+  firstPkt.port = tsSyncPort;
+  firstPkt.sourceId = pNode->vgId;  // tell arbitrator its vgId
+
+  if (write(connFd, &firstPkt, sizeof(firstPkt)) == sizeof(firstPkt)) {
+    sDebug("%s, connection to peer server is setup", pPeer->id);
+    pPeer->peerFd = connFd;
+    pPeer->role = TAOS_SYNC_ROLE_UNSYNCED;
+    pPeer->pConn = taosAllocateTcpConn(tsTcpPool, pPeer, connFd);
+    syncAddPeerRef(pPeer);
+  } else {
+    sDebug("try later");
+    close(connFd);
+    taosTmrReset(syncCheckPeerConnection, tsSyncTimer * 1000, pPeer, syncTmrCtrl, &pPeer->timer);
+  }
+}
+
+static void syncCheckPeerConnection(void *param, void *tmrId) {
+  SSyncPeer *pPeer = param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  pthread_mutex_lock(&(pNode->mutex));
+
+  sDebug("%s, check peer connection", pPeer->id);
+  syncSetupPeerConnection(pPeer);
+
+  pthread_mutex_unlock(&(pNode->mutex));
+}
+
+static void syncCreateRestoreDataThread(SSyncPeer *pPeer) {
+  taosTmrStopA(&pPeer->timer);
+
+  pthread_attr_t thattr;
+  pthread_t      thread;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
+
+  syncAddPeerRef(pPeer);
+  int ret = pthread_create(&(thread), &thattr, (void *)syncRestoreData, pPeer);
+  pthread_attr_destroy(&thattr);
+
+  if (ret < 0) {
+    sError("%s, failed to create sync thread", pPeer->id);
+    taosClose(pPeer->syncFd);
+    syncDecPeerRef(pPeer);
+  } else {
+    sInfo("%s, sync connection is up", pPeer->id);
+  }
+}
+
+static void syncProcessIncommingConnection(int connFd, uint32_t sourceIp) {
+  char ipstr[24];
+  int  i;
+
+  tinet_ntoa(ipstr, sourceIp);
+  sDebug("peer TCP connection from ip:%s", ipstr);
+
+  SFirstPkt firstPkt;
+  if (taosReadMsg(connFd, &firstPkt, sizeof(firstPkt)) != sizeof(firstPkt)) {
+    sError("failed to read peer first pkt from ip:%s(%s)", ipstr, strerror(errno));
+    taosCloseSocket(connFd);
+    return;
+  }
+
+  int32_t     vgId = firstPkt.syncHead.vgId;
+  SSyncNode **ppNode = (SSyncNode **)taosHashGet(vgIdHash, (const char *)&vgId, sizeof(int32_t));
+  if (ppNode == NULL || *ppNode == NULL) {
+    sError("vgId:%d, vgId could not be found", vgId);
+    taosCloseSocket(connFd);
+    return;
+  }
+
+  SSyncNode *pNode = *ppNode;
+  pthread_mutex_lock(&(pNode->mutex));
+
+  SSyncPeer *pPeer;
+  for (i = 0; i < pNode->replica; ++i) {
+    pPeer = pNode->peerInfo[i];
+    if (pPeer && (strcmp(pPeer->fqdn, firstPkt.fqdn) == 0) && (pPeer->port == firstPkt.port)) break;
+  }
+
+  pPeer = (i < pNode->replica) ? pNode->peerInfo[i] : NULL;
+  if (pPeer == NULL) {
+    sError("vgId:%d, peer:%s not configured", pNode->vgId, firstPkt.fqdn);
+    taosCloseSocket(connFd);
+    // syncSendVpeerCfgMsg(sync);
+  } else {
+    // first packet tells what kind of link
+    if (firstPkt.syncHead.type == TAOS_SMSG_SYNC_DATA) {
+      pPeer->syncFd = connFd;
+      syncCreateRestoreDataThread(pPeer);
+    } else {
+      sDebug("%s, TCP connection is already up, close one", pPeer->id);
+      syncClosePeerConn(pPeer);
+      pPeer->peerFd = connFd;
+      pPeer->pConn = taosAllocateTcpConn(tsTcpPool, pPeer, connFd);
+      syncAddPeerRef(pPeer);
+      sDebug("%s, ready to exchange data", pPeer->id);
+      syncSendPeersStatusMsgToPeer(pPeer, 1);
+    }
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+}
+
+static void syncProcessBrokenLink(void *param) {
+  if (param == NULL) return;  // the connection for arbitrator
+  SSyncPeer *pPeer = param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  syncAddNodeRef(pNode);
+  pthread_mutex_lock(&(pNode->mutex));
+
+  sDebug("%s, TCP link is broken(%s)", pPeer->id, strerror(errno));
+  pPeer->peerFd = -1;
+
+  if (syncDecPeerRef(pPeer) != 0) {
+    syncRestartConnection(pPeer);
+  }
+
+  pthread_mutex_unlock(&(pNode->mutex));
+  syncDecNodeRef(pNode);
+}
+
+static void syncSaveFwdInfo(SSyncNode *pNode, uint64_t version, void *mhandle) {
+  SSyncFwds *pSyncFwds = pNode->pSyncFwds;
+  uint64_t   time = taosGetTimestampMs();
+
+  if (pSyncFwds->fwds >= tsMaxFwdInfo) {
+    pSyncFwds->first = (pSyncFwds->first + 1) % tsMaxFwdInfo;
+    pSyncFwds->fwds--;
+  }
+
+  if (pSyncFwds->fwds > 0) {
+    pSyncFwds->last = (pSyncFwds->last + 1) % tsMaxFwdInfo;
+  }
+
+  SFwdInfo *pFwdInfo = pSyncFwds->fwdInfo + pSyncFwds->last;
+  pFwdInfo->version = version;
+  pFwdInfo->mhandle = mhandle;
+  pFwdInfo->acks = 0;
+  pFwdInfo->confirmed = 0;
+  pFwdInfo->time = time;
+
+  pSyncFwds->fwds++;
+  sDebug("vgId:%d, fwd info is saved, ver:%" PRIu64 " fwds:%d ", pNode->vgId, version, pSyncFwds->fwds);
+}
+
+static void syncRemoveConfirmedFwdInfo(SSyncNode *pNode) {
+  SSyncFwds *pSyncFwds = pNode->pSyncFwds;
+
+  int fwds = pSyncFwds->fwds;
+  for (int i = 0; i < fwds; ++i) {
+    SFwdInfo *pFwdInfo = pSyncFwds->fwdInfo + pSyncFwds->first;
+    if (pFwdInfo->confirmed == 0) break;
+
+    pSyncFwds->first = (pSyncFwds->first + 1) % tsMaxFwdInfo;
+    pSyncFwds->fwds--;
+    if (pSyncFwds->fwds == 0) pSyncFwds->first = pSyncFwds->last;
+    // sDebug("vgId:%d, fwd info is removed, ver:%d, fwds:%d",
+    //        pNode->vgId, pFwdInfo->version, pSyncFwds->fwds);
+    memset(pFwdInfo, 0, sizeof(SFwdInfo));
+  }
+}
+
+static void syncProcessFwdAck(SSyncNode *pNode, SFwdInfo *pFwdInfo, int32_t code) {
+  int confirm = 0;
+  if (pFwdInfo->code == 0) pFwdInfo->code = code;
+
+  if (code == 0) {
+    pFwdInfo->acks++;
+    if (pFwdInfo->acks >= pNode->quorum - 1) {
+      confirm = 1;
+    }
+  } else {
+    pFwdInfo->nacks++;
+    if (pFwdInfo->nacks > pNode->replica - pNode->quorum) {
+      confirm = 1;
+    }
+  }
+
+  if (confirm && pFwdInfo->confirmed == 0) {
+    sDebug("vgId:%d, forward is confirmed, ver:%" PRIu64 " code:%x", pNode->vgId, pFwdInfo->version, pFwdInfo->code);
+    (*pNode->confirmForward)(pNode->ahandle, pFwdInfo->mhandle, pFwdInfo->code);
+    pFwdInfo->confirmed = 1;
+  }
+}
+
+static void syncMonitorFwdInfos(void *param, void *tmrId) {
+  SSyncNode *pNode = param;
+  SSyncFwds *pSyncFwds = pNode->pSyncFwds;
+  uint64_t   time = taosGetTimestampMs();
+
+  if (pSyncFwds->fwds > 0) {
+    pthread_mutex_lock(&(pNode->mutex));
+    for (int i = 0; i < pSyncFwds->fwds; ++i) {
+      SFwdInfo *pFwdInfo = pSyncFwds->fwdInfo + (pSyncFwds->first + i) % tsMaxFwdInfo;
+      if (time - pFwdInfo->time < 2000) break;
+      syncProcessFwdAck(pNode, pFwdInfo, TSDB_CODE_RPC_NETWORK_UNAVAIL);
+    }
+
+    syncRemoveConfirmedFwdInfo(pNode);
+    pthread_mutex_unlock(&(pNode->mutex));
+  }
+
+  pNode->pFwdTimer = taosTmrStart(syncMonitorFwdInfos, 300, pNode, syncTmrCtrl);
+}
diff --git a/src/sync/src/syncRestore.c b/src/sync/src/syncRestore.c
new file mode 100644
index 0000000000000000000000000000000000000000..ebb6c3a0a9edff5acfc5f2ce7da8b58f03d8ab4a
--- /dev/null
+++ b/src/sync/src/syncRestore.c
@@ -0,0 +1,323 @@
+/*
+ * 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 "os.h"
+#include "tlog.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tsocket.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tsync.h"
+#include "syncInt.h"
+
+static void syncRemoveExtraFile(SSyncPeer *pPeer, int32_t sindex, int32_t eindex) {
+  char       name[TSDB_FILENAME_LEN * 2] = {0};
+  char       fname[TSDB_FILENAME_LEN * 3] = {0};
+  uint32_t   magic;
+  uint64_t   fversion;
+  int64_t    size;
+  uint32_t   index = sindex;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  if (sindex < 0 || eindex < sindex) return;
+
+  while (1) {
+    name[0] = 0;
+    magic = (*pNode->getFileInfo)(pNode->ahandle, name, &index, eindex, &size, &fversion);
+    if (magic == 0) break;
+
+    snprintf(fname, sizeof(fname), "%s/%s", pNode->path, name);
+    (void)remove(fname);
+    sDebug("%s, %s is removed", pPeer->id, fname);
+
+    index++;
+    if (index > eindex) break;
+  }
+}
+
+static int syncRestoreFile(SSyncPeer *pPeer, uint64_t *fversion) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  SFileInfo  minfo; memset(&minfo, 0, sizeof(minfo)); /* = {0}; */  // master file info
+  SFileInfo  sinfo; memset(&sinfo, 0, sizeof(sinfo)); /* = {0}; */  // slave file info
+  SFileAck   fileAck; 
+  int        code = -1;
+  char       name[TSDB_FILENAME_LEN * 2] = {0};
+  uint32_t   pindex = 0;    // index in last restore
+
+  *fversion = 0;
+  sinfo.index = 0;
+  while (1) {
+    // read file info
+    int ret = taosReadMsg(pPeer->syncFd, &(minfo), sizeof(minfo));
+    if (ret < 0) break;
+
+    // if no more file from master, break;
+    if (minfo.name[0] == 0 || minfo.magic == 0) {
+      sDebug("%s, no more files to restore", pPeer->id);
+
+      // remove extra files after the current index
+      syncRemoveExtraFile(pPeer, sinfo.index + 1, TAOS_SYNC_MAX_INDEX);
+      code = 0;
+      break;
+    }
+
+    // remove extra files on slave between the current and last index
+    syncRemoveExtraFile(pPeer, pindex + 1, minfo.index - 1);
+    pindex = minfo.index;
+
+    // check the file info
+    sinfo = minfo;
+    sDebug("%s, get file info:%s", pPeer->id, minfo.name);
+    sinfo.magic = (*pNode->getFileInfo)(pNode->ahandle, sinfo.name, &sinfo.index, TAOS_SYNC_MAX_INDEX, &sinfo.size,
+                                        &sinfo.fversion);
+
+    // if file not there or magic is not the same, file shall be synced
+    memset(&fileAck, 0, sizeof(fileAck));
+    fileAck.sync = (sinfo.magic != minfo.magic || sinfo.name[0] == 0) ? 1 : 0;
+
+    // send file ack
+    ret = taosWriteMsg(pPeer->syncFd, &(fileAck), sizeof(fileAck));
+    if (ret < 0) break;
+
+    // if sync is not required, continue
+    if (fileAck.sync == 0) {
+      sDebug("%s, %s is the same", pPeer->id, minfo.name);
+      continue;
+    }
+
+    // if sync is required, open file, receive from master, and write to file
+    // get the full path to file
+    minfo.name[sizeof(minfo.name) - 1] = 0;
+    snprintf(name, sizeof(name), "%s/%s", pNode->path, minfo.name);
+
+    int dfd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+    if (dfd < 0) {
+      sError("%s, failed to open file:%s", pPeer->id, name);
+      break;
+    }
+
+    ret = taosCopyFds(pPeer->syncFd, dfd, minfo.size);
+    fsync(dfd);
+    close(dfd);
+    if (ret < 0) break;
+
+    sDebug("%s, %s is received, size:%" PRId64, pPeer->id, minfo.name, minfo.size);
+  }
+
+  if (code == 0 && (minfo.fversion != sinfo.fversion)) {
+    // data file is changed, code shall be set to 1
+    *fversion = minfo.fversion;
+    code = 1;
+  }
+
+  if (code < 0) {
+    sError("%s, failed to restore %s(%s)", pPeer->id, name, strerror(errno));
+  }
+
+  return code;
+}
+
+static int syncRestoreWal(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  int        ret, code = -1;
+
+  void *buffer = calloc(1024000, 1);  // size for one record
+  if (buffer == NULL) return -1;
+
+  SWalHead *pHead = (SWalHead *)buffer;
+
+  while (1) {
+    ret = taosReadMsg(pPeer->syncFd, pHead, sizeof(SWalHead));
+    if (ret < 0) break;
+
+    if (pHead->len == 0) {
+      code = 0;
+      break;
+    }  // wal sync over
+
+    ret = taosReadMsg(pPeer->syncFd, pHead->cont, pHead->len);
+    if (ret < 0) break;
+
+    sDebug("%s, restore a record, ver:%" PRIu64, pPeer->id, pHead->version);
+    (*pNode->writeToCache)(pNode->ahandle, pHead, TAOS_QTYPE_WAL);
+  }
+
+  if (code < 0) {
+    sError("%s, failed to restore wal(%s)", pPeer->id, strerror(errno));
+  }
+
+  free(buffer);
+  return code;
+}
+
+static char *syncProcessOneBufferedFwd(SSyncPeer *pPeer, char *offset) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  SWalHead * pHead = (SWalHead *)offset;
+
+  (*pNode->writeToCache)(pNode->ahandle, pHead, TAOS_QTYPE_FWD);
+  offset += pHead->len + sizeof(SWalHead);
+
+  return offset;
+}
+
+static int syncProcessBufferedFwd(SSyncPeer *pPeer) {
+  SSyncNode *  pNode = pPeer->pSyncNode;
+  SRecvBuffer *pRecv = pNode->pRecv;
+  int          forwards = 0;
+
+  sDebug("%s, number of buffered forwards:%d", pPeer->id, pRecv->forwards);
+
+  char *offset = pRecv->buffer;
+  while (forwards < pRecv->forwards) {
+    offset = syncProcessOneBufferedFwd(pPeer, offset);
+    forwards++;
+  }
+
+  pthread_mutex_lock(&pNode->mutex);
+
+  while (forwards < pRecv->forwards && pRecv->code == 0) {
+    offset = syncProcessOneBufferedFwd(pPeer, offset);
+    forwards++;
+  }
+
+  nodeRole = TAOS_SYNC_ROLE_SLAVE;
+  sDebug("%s, finish processing buffered fwds:%d", pPeer->id, forwards);
+
+  pthread_mutex_unlock(&pNode->mutex);
+
+  return pRecv->code;
+}
+
+int syncSaveIntoBuffer(SSyncPeer *pPeer, SWalHead *pHead) {
+  SSyncNode *  pNode = pPeer->pSyncNode;
+  SRecvBuffer *pRecv = pNode->pRecv;
+
+  if (pRecv == NULL) return -1;
+  int len = pHead->len + sizeof(SWalHead);
+
+  if (pRecv->bufferSize - (pRecv->offset - pRecv->buffer) >= len) {
+    memcpy(pRecv->offset, pHead, len);
+    pRecv->offset += len;
+    pRecv->forwards++;
+    sDebug("%s, fwd is saved into queue, ver:%" PRIu64 " fwds:%d", pPeer->id, pHead->version, pRecv->forwards);
+  } else {
+    sError("%s, buffer size:%d is too small", pPeer->id, pRecv->bufferSize);
+    pRecv->code = -1;  // set error code
+  }
+
+  return pRecv->code;
+}
+
+static void syncCloseRecvBuffer(SSyncNode *pNode) {
+  if (pNode->pRecv) {
+    taosTFree(pNode->pRecv->buffer);
+  }
+
+  taosTFree(pNode->pRecv);
+}
+
+static int syncOpenRecvBuffer(SSyncNode *pNode) {
+  syncCloseRecvBuffer(pNode);
+
+  SRecvBuffer *pRecv = calloc(sizeof(SRecvBuffer), 1);
+  if (pRecv == NULL) return -1;
+
+  pRecv->bufferSize = 5000000;
+  pRecv->buffer = malloc(pRecv->bufferSize);
+  if (pRecv->buffer == NULL) {
+    free(pRecv);
+    return -1;
+  }
+
+  pRecv->offset = pRecv->buffer;
+  pRecv->forwards = 0;
+
+  pNode->pRecv = pRecv;
+
+  return 0;
+}
+
+static int syncRestoreDataStepByStep(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  nodeSStatus = TAOS_SYNC_STATUS_FILE;
+  uint64_t fversion = 0;
+
+  sDebug("%s, start to restore file", pPeer->id);
+  int code = syncRestoreFile(pPeer, &fversion);
+  if (code < 0) {
+    sError("%s, failed to restore file", pPeer->id);
+    return -1;
+  }
+
+  // if code > 0, data file is changed, notify app, and pass the version
+  if (code > 0 && pNode->notifyFileSynced) {
+    if ((*pNode->notifyFileSynced)(pNode->ahandle, fversion) < 0) {
+      sError("%s, app not in ready state", pPeer->id);
+      return -1;
+    }
+  }
+
+  nodeVersion = fversion;
+
+  sDebug("%s, start to restore wal", pPeer->id);
+  if (syncRestoreWal(pPeer) < 0) {
+    sError("%s, failed to restore wal", pPeer->id);
+    return -1;
+  }
+
+  nodeSStatus = TAOS_SYNC_STATUS_CACHE;
+  sDebug("%s, start to insert buffered points", pPeer->id);
+  if (syncProcessBufferedFwd(pPeer) < 0) {
+    sError("%s, failed to insert buffered points", pPeer->id);
+    return -1;
+  }
+
+  return 0;
+}
+
+void *syncRestoreData(void *param) {
+  SSyncPeer *pPeer = (SSyncPeer *)param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  taosBlockSIGPIPE();
+  __sync_fetch_and_add(&tsSyncNum, 1);
+
+  (*pNode->notifyRole)(pNode->ahandle, TAOS_SYNC_ROLE_SYNCING);
+
+  if (syncOpenRecvBuffer(pNode) < 0) {
+    sError("%s, failed to allocate recv buffer", pPeer->id);
+  } else {
+    if (syncRestoreDataStepByStep(pPeer) == 0) {
+      sInfo("%s, it is synced successfully", pPeer->id);
+      nodeRole = TAOS_SYNC_ROLE_SLAVE;
+      syncBroadcastStatus(pNode);
+    } else {
+      sError("%s, failed to restore data, restart connection", pPeer->id);
+      nodeRole = TAOS_SYNC_ROLE_UNSYNCED;
+      syncRestartConnection(pPeer);
+    }
+  }
+
+  (*pNode->notifyRole)(pNode->ahandle, nodeRole);
+
+  nodeSStatus = TAOS_SYNC_STATUS_INIT;
+  taosClose(pPeer->syncFd);
+  syncCloseRecvBuffer(pNode);
+  __sync_fetch_and_sub(&tsSyncNum, 1);
+  syncDecPeerRef(pPeer);
+
+  return NULL;
+}
diff --git a/src/sync/src/syncRetrieve.c b/src/sync/src/syncRetrieve.c
new file mode 100644
index 0000000000000000000000000000000000000000..6d0b847afee7679783c05645e1ea762b89338630
--- /dev/null
+++ b/src/sync/src/syncRetrieve.c
@@ -0,0 +1,502 @@
+/*
+ * 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 <stdint.h>
+#include <stdbool.h>
+#include <sys/inotify.h>
+#include <unistd.h>
+#include "os.h"
+#include "tlog.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tsocket.h"
+#include "twal.h"
+#include "tsync.h"
+#include "syncInt.h"
+
+static int syncAddIntoWatchList(SSyncPeer *pPeer, char *name) {
+  sDebug("%s, start to monitor:%s", pPeer->id, name);
+
+  if (pPeer->notifyFd <= 0) {
+    pPeer->watchNum = 0;
+    pPeer->notifyFd = inotify_init1(IN_NONBLOCK);
+    if (pPeer->notifyFd < 0) {
+      sError("%s, failed to init inotify(%s)", pPeer->id, strerror(errno));
+      return -1;
+    }
+
+    if (pPeer->watchFd == NULL) pPeer->watchFd = malloc(sizeof(int) * tsMaxWatchFiles);
+    if (pPeer->watchFd == NULL) {
+      sError("%s, failed to allocate watchFd", pPeer->id);
+      return -1;
+    }
+
+    memset(pPeer->watchFd, -1, sizeof(int) * tsMaxWatchFiles);
+  }
+
+  int *wd = pPeer->watchFd + pPeer->watchNum;
+
+  if (*wd >= 0) {
+    if (inotify_rm_watch(pPeer->notifyFd, *wd) < 0) {
+      sError("%s, failed to remove wd:%d(%s)", pPeer->id, *wd, strerror(errno));
+      return -1;
+    }
+  }
+
+  *wd = inotify_add_watch(pPeer->notifyFd, name, IN_MODIFY | IN_DELETE);
+  if (*wd == -1) {
+    sError("%s, failed to add %s(%s)", pPeer->id, name, strerror(errno));
+    return -1;
+  } else {
+    sDebug("%s, monitor %s, wd:%d watchNum:%d", pPeer->id, name, *wd, pPeer->watchNum);
+  }
+
+  pPeer->watchNum = (pPeer->watchNum + 1) % tsMaxWatchFiles;
+
+  return 0;
+}
+
+static int syncAreFilesModified(SSyncPeer *pPeer) {
+  if (pPeer->notifyFd <= 0) return 0;
+
+  char buf[2048];
+  int  len = read(pPeer->notifyFd, buf, sizeof(buf));
+  if (len < 0 && errno != EAGAIN) {
+    sError("%s, failed to read notify FD(%s)", pPeer->id, strerror(errno));
+    return -1;
+  }
+
+  int code = 0;
+  if (len > 0) {
+    const struct inotify_event *event;
+    char *ptr;
+    for (ptr = buf; ptr < buf + len; ptr += sizeof(struct inotify_event) + event->len) {
+      event = (const struct inotify_event *)ptr;
+      if ((event->mask & IN_MODIFY) || (event->mask & IN_DELETE)) {
+        sDebug("%s, processed file is changed", pPeer->id);
+        pPeer->fileChanged = 1;
+        code = 1;
+        break;
+      }
+    }
+  }
+
+  return code;
+}
+
+static int syncRetrieveFile(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  SFileInfo  fileInfo;
+  SFileAck   fileAck;
+  int        code = -1;
+  char       name[TSDB_FILENAME_LEN * 2] = {0};
+
+  memset(&fileInfo, 0, sizeof(fileInfo));
+  memset(&fileAck, 0, sizeof(fileAck));
+
+  while (1) {
+    // retrieve file info
+    fileInfo.name[0] = 0;
+    fileInfo.magic = (*pNode->getFileInfo)(pNode->ahandle, fileInfo.name, &fileInfo.index, TAOS_SYNC_MAX_INDEX,
+                                           &fileInfo.size, &fileInfo.fversion);
+    // fileInfo.size = htonl(size);
+
+    // send the file info
+    int32_t ret = taosWriteMsg(pPeer->syncFd, &(fileInfo), sizeof(fileInfo));
+    if (ret < 0) break;
+
+    // if no file anymore, break
+    if (fileInfo.magic == 0 || fileInfo.name[0] == 0) {
+      sDebug("%s, no more files to sync", pPeer->id);
+      code = 0;
+      break;
+    }
+
+    // wait for the ack from peer
+    ret = taosReadMsg(pPeer->syncFd, &(fileAck), sizeof(fileAck));
+    if (ret < 0) break;
+
+    // set the peer sync version
+    pPeer->sversion = fileInfo.fversion;
+
+    // get the full path to file
+    snprintf(name, sizeof(name), "%s/%s", pNode->path, fileInfo.name);
+
+    // add the file into watch list
+    if (syncAddIntoWatchList(pPeer, name) < 0) break;
+
+    // if sync is not required, continue
+    if (fileAck.sync == 0) {
+      fileInfo.index++;
+      sDebug("%s, %s is the same", pPeer->id, fileInfo.name);
+      continue;
+    }
+
+    // send the file to peer
+    int sfd = open(name, O_RDONLY);
+    if (sfd < 0) break;
+
+    ret = taosTSendFile(pPeer->syncFd, sfd, NULL, fileInfo.size);
+    close(sfd);
+    if (ret < 0) break;
+
+    sDebug("%s, %s is sent, size:%" PRId64, pPeer->id, name, fileInfo.size);
+    fileInfo.index++;
+
+    // check if processed files are modified
+    if (syncAreFilesModified(pPeer) != 0) break;
+  }
+
+  if (code < 0) {
+    sError("%s, failed to retrieve file(%s)", pPeer->id, strerror(errno));
+  }
+
+  return code;
+}
+
+/* if only a partial record is read out, set the IN_MODIFY flag in event,
+   so upper layer will reload the file to get a complete record */
+static int syncReadOneWalRecord(int sfd, SWalHead *pHead, uint32_t *pEvent) {
+  int ret;
+
+  ret = read(sfd, pHead, sizeof(SWalHead));
+  if (ret < 0) return -1;
+  if (ret == 0) return 0;
+
+  if (ret != sizeof(SWalHead)) {
+    // file is not at end yet, it shall be reloaded
+    *pEvent = *pEvent | IN_MODIFY;
+    return 0;
+  }
+
+  ret = read(sfd, pHead->cont, pHead->len);
+  if (ret < 0) return -1;
+
+  if (ret != pHead->len) {
+    // file is not at end yet, it shall be reloaded
+    *pEvent = *pEvent | IN_MODIFY;
+    return 0;
+  }
+
+  return sizeof(SWalHead) + pHead->len;
+}
+
+static int syncMonitorLastWal(SSyncPeer *pPeer, char *name) {
+  pPeer->watchNum = 0;
+  taosClose(pPeer->notifyFd);
+  pPeer->notifyFd = inotify_init1(IN_NONBLOCK);
+  if (pPeer->notifyFd < 0) {
+    sError("%s, failed to init inotify(%s)", pPeer->id, strerror(errno));
+    return -1;
+  }
+
+  if (pPeer->watchFd == NULL) pPeer->watchFd = malloc(sizeof(int) * tsMaxWatchFiles);
+  if (pPeer->watchFd == NULL) {
+    sError("%s, failed to allocate watchFd", pPeer->id);
+    return -1;
+  }
+
+  memset(pPeer->watchFd, -1, sizeof(int) * tsMaxWatchFiles);
+  int *wd = pPeer->watchFd;
+
+  *wd = inotify_add_watch(pPeer->notifyFd, name, IN_MODIFY | IN_CLOSE_WRITE);
+  if (*wd == -1) {
+    sError("%s, failed to watch last wal(%s)", pPeer->id, strerror(errno));
+    return -1;
+  }
+
+  return 0;
+}
+
+static int32_t syncCheckLastWalChanges(SSyncPeer *pPeer, uint32_t *pEvent) {
+  char buf[2048];
+  int  len = read(pPeer->notifyFd, buf, sizeof(buf));
+  if (len < 0 && errno != EAGAIN) {
+    sError("%s, failed to read notify FD(%s)", pPeer->id, strerror(errno));
+    return -1;
+  }
+
+  if (len == 0) return 0;
+
+  struct inotify_event *event;
+  for (char *ptr = buf; ptr < buf + len; ptr += sizeof(struct inotify_event) + event->len) {
+    event = (struct inotify_event *)ptr;
+    if (event->mask & IN_MODIFY) *pEvent = *pEvent | IN_MODIFY;
+    if (event->mask & IN_CLOSE_WRITE) *pEvent = *pEvent | IN_CLOSE_WRITE;
+  }
+
+  if (pEvent != 0) sDebug("%s, last wal event:0x%x", pPeer->id, *pEvent);
+
+  return 0;
+}
+
+static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion, int64_t offset, uint32_t *pEvent) {
+  SWalHead *pHead = malloc(640000);
+  int       code = -1;
+  int32_t   bytes = 0;
+  int       sfd;
+
+  sfd = open(name, O_RDONLY);
+  if (sfd < 0) {
+    free(pHead);
+    return -1;
+  }
+
+  (void)lseek(sfd, offset, SEEK_SET);
+  sDebug("%s, retrieve last wal, offset:%" PRId64 " fversion:%" PRIu64, pPeer->id, offset, fversion);
+
+  while (1) {
+    int wsize = syncReadOneWalRecord(sfd, pHead, pEvent);
+    if (wsize < 0) break;
+    if (wsize == 0) {
+      code = 0;
+      break;
+    }
+
+    sDebug("%s, last wal is forwarded, ver:%" PRIu64, pPeer->id, pHead->version);
+    int ret = taosWriteMsg(pPeer->syncFd, pHead, wsize);
+    if (ret != wsize) break;
+    pPeer->sversion = pHead->version;
+
+    bytes += wsize;
+
+    if (pHead->version >= fversion && fversion > 0) {
+      code = 0;
+      bytes = 0;
+      break;
+    }
+  }
+
+  free(pHead);
+  close(sfd);
+
+  if (code == 0) return bytes;
+  return -1;
+}
+
+static int syncProcessLastWal(SSyncPeer *pPeer, char *wname, uint32_t index) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+  int        code = -1;
+  char       fname[TSDB_FILENAME_LEN * 2];  // full path to wal file
+
+  if (syncAreFilesModified(pPeer) != 0) return -1;
+
+  while (1) {
+    int32_t  once = 0;  // last WAL has once ever been processed
+    int64_t  offset = 0;
+    uint64_t fversion = 0;
+    uint32_t event = 0;
+
+    // get full path to wal file
+    snprintf(fname, sizeof(fname), "%s/%s", pNode->path, wname);
+    sDebug("%s, start to retrieve last wal:%s", pPeer->id, fname);
+
+    // monitor last wal
+    if (syncMonitorLastWal(pPeer, fname) < 0) break;
+
+    while (1) {
+      int32_t bytes = syncRetrieveLastWal(pPeer, fname, fversion, offset, &event);
+      if (bytes < 0) break;
+
+      // check file changes
+      if (syncCheckLastWalChanges(pPeer, &event) < 0) break;
+
+      // if file is not updated or updated once, set the fversion and sstatus
+      if (((event & IN_MODIFY) == 0) || once) {
+        if (fversion == 0) {
+          pPeer->sstatus = TAOS_SYNC_STATUS_CACHE;  // start to forward pkt
+          fversion = nodeVersion;                   // must read data to fversion
+        }
+      }
+
+      // if all data up to fversion is read out, it is over
+      if (pPeer->sversion >= fversion && fversion > 0) {
+        code = 0;
+        sDebug("%s, data up to fversion:%ld has been read out, bytes:%d", pPeer->id, fversion, bytes);
+        break;
+      }
+
+      // if all data are read out, and no update
+      if ((bytes == 0) && ((event & IN_MODIFY) == 0)) {
+        // wal file is closed, break
+        if (event & IN_CLOSE_WRITE) {
+          code = 0;
+          sDebug("%s, current wal is closed", pPeer->id);
+          break;
+        }
+
+        // wal not closed, it means some data not flushed to disk, wait for a while
+        usleep(10000);
+      }
+
+      // if bytes>0, file is updated, or fversion is not reached but file still open, read again
+      once = 1;
+      offset += bytes;
+      sDebug("%s, retrieve last wal, bytes:%d", pPeer->id, bytes);
+      event = event & (~IN_MODIFY);  // clear IN_MODIFY flag
+    }
+
+    if (code < 0) break;
+    if (pPeer->sversion >= fversion && fversion > 0) break;
+
+    index++;
+    wname[0] = 0;
+    code = (*pNode->getWalInfo)(pNode->ahandle, wname, &index);
+    if (code < 0) break;
+    if (wname[0] == 0) {
+      code = 0;
+      break;
+    }
+
+    // current last wal is closed, there is a new one
+    sDebug("%s, last wal is closed, try new one", pPeer->id);
+  }
+
+  taosClose(pPeer->notifyFd);
+
+  return code;
+}
+
+static int syncRetrieveWal(SSyncPeer *pPeer) {
+  SSyncNode * pNode = pPeer->pSyncNode;
+  char        fname[TSDB_FILENAME_LEN * 3];
+  char        wname[TSDB_FILENAME_LEN * 2];
+  int32_t     size;
+  struct stat fstat;
+  int         code = -1;
+  uint32_t    index = 0;
+
+  while (1) {
+    // retrieve wal info
+    wname[0] = 0;
+    code = (*pNode->getWalInfo)(pNode->ahandle, wname, &index);
+    if (code < 0) break;  // error
+    if (wname[0] == 0) {  // no wal file
+      sDebug("%s, no wal file", pPeer->id);
+      break;
+    }
+
+    if (code == 0) {  // last wal
+      code = syncProcessLastWal(pPeer, wname, index);
+      break;
+    }
+
+    // get the full path to wal file
+    snprintf(fname, sizeof(fname), "%s/%s", pNode->path, wname);
+
+    // send wal file,
+    // inotify is not required, old wal file won't be modified, even remove is ok
+    if (stat(fname, &fstat) < 0) break;
+    size = fstat.st_size;
+
+    sDebug("%s, retrieve wal:%s size:%d", pPeer->id, fname, size);
+    int sfd = open(fname, O_RDONLY);
+    if (sfd < 0) break;
+
+    code = taosTSendFile(pPeer->syncFd, sfd, NULL, size);
+    close(sfd);
+    if (code < 0) break;
+
+    index++;
+
+    if (syncAreFilesModified(pPeer) != 0) break;
+  }
+
+  if (code == 0) {
+    sDebug("%s, wal retrieve is finished", pPeer->id);
+    pPeer->sstatus = TAOS_SYNC_STATUS_CACHE;
+    SWalHead walHead;
+    memset(&walHead, 0, sizeof(walHead));
+    code = taosWriteMsg(pPeer->syncFd, &walHead, sizeof(walHead));
+  } else {
+    sError("%s, failed to send wal(%s)", pPeer->id, strerror(errno));
+  }
+
+  return code;
+}
+
+static int syncRetrieveDataStepByStep(SSyncPeer *pPeer) {
+  SSyncNode *pNode = pPeer->pSyncNode;
+
+  SFirstPkt firstPkt;
+  memset(&firstPkt, 0, sizeof(firstPkt));
+  firstPkt.syncHead.type = TAOS_SMSG_SYNC_DATA;
+  firstPkt.syncHead.vgId = pNode->vgId;
+  tstrncpy(firstPkt.fqdn, tsNodeFqdn, sizeof(firstPkt.fqdn));
+  firstPkt.port = tsSyncPort;
+
+  if (write(pPeer->syncFd, (char *)&firstPkt, sizeof(firstPkt)) < 0) {
+    sError("%s, failed to send syncCmd", pPeer->id);
+    return -1;
+  }
+
+  pPeer->sversion = 0;
+  pPeer->sstatus = TAOS_SYNC_STATUS_FILE;
+  sDebug("%s, start to retrieve file", pPeer->id);
+  if (syncRetrieveFile(pPeer) < 0) {
+    sError("%s, failed to retrieve file", pPeer->id);
+    return -1;
+  }
+
+  // if no files are synced, there must be wal to sync, sversion must be larger than one
+  if (pPeer->sversion == 0) pPeer->sversion = 1;
+
+  sDebug("%s, start to retrieve wal", pPeer->id);
+  if (syncRetrieveWal(pPeer) < 0) {
+    sError("%s, failed to retrieve wal", pPeer->id);
+    return -1;
+  }
+
+  return 0;
+}
+
+void *syncRetrieveData(void *param) {
+  SSyncPeer *pPeer = (SSyncPeer *)param;
+  SSyncNode *pNode = pPeer->pSyncNode;
+  taosBlockSIGPIPE();
+
+  pPeer->fileChanged = 0;
+  pPeer->syncFd = taosOpenTcpClientSocket(pPeer->ip, pPeer->port, 0);
+  if (pPeer->syncFd < 0) {
+    sError("%s, failed to open socket to sync", pPeer->id);
+  } else {
+    sInfo("%s, sync tcp is setup", pPeer->id);
+
+    if (syncRetrieveDataStepByStep(pPeer) == 0) {
+      sDebug("%s, sync retrieve process is successful", pPeer->id);
+    } else {
+      sError("%s, failed to retrieve data, restart connection", pPeer->id);
+      syncRestartConnection(pPeer);
+    }
+  }
+
+  if (pPeer->fileChanged) {
+    // if file is changed 3 times continuously, start flow control
+    pPeer->numOfRetrieves++;
+    if (pPeer->numOfRetrieves >= 2 && pNode->notifyFlowCtrl)
+      (*pNode->notifyFlowCtrl)(pNode->ahandle, 4 << (pPeer->numOfRetrieves - 2));
+  } else {
+    pPeer->numOfRetrieves = 0;
+    if (pNode->notifyFlowCtrl) (*pNode->notifyFlowCtrl)(pNode->ahandle, 0);
+  }
+
+  pPeer->fileChanged = 0;
+  taosClose(pPeer->notifyFd);
+  taosClose(pPeer->syncFd);
+  syncDecPeerRef(pPeer);
+
+  return NULL;
+}
diff --git a/src/sync/src/taosTcpPool.c b/src/sync/src/taosTcpPool.c
new file mode 100644
index 0000000000000000000000000000000000000000..eda822b1ec0b66ac984106566e03d5a1131ede8a
--- /dev/null
+++ b/src/sync/src/taosTcpPool.c
@@ -0,0 +1,325 @@
+/*
+ * 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 "os.h"
+#include "tulog.h"
+#include "tutil.h"
+#include "tsocket.h"
+#include "taoserror.h"
+#include "taosTcpPool.h"
+
+typedef struct SThreadObj {
+  pthread_t thread;
+  bool      stop;
+  int       pollFd;
+  int       numOfFds;
+  struct SPoolObj *pPool;
+} SThreadObj;
+
+typedef struct SPoolObj {
+  SPoolInfo    info;
+  SThreadObj **pThread;
+  pthread_t    thread;
+  int          nextId;
+  int          acceptFd;  // FD for accept new connection
+} SPoolObj;
+
+typedef struct {
+  SThreadObj *pThread;
+  void       *ahandle;
+  int         fd;
+  int         closedByApp; 
+} SConnObj;
+
+static void *taosAcceptPeerTcpConnection(void *argv);
+static void *taosProcessTcpData(void *param);
+static void  taosStopPoolThread(SThreadObj *pThread);
+static SThreadObj *taosGetTcpThread(SPoolObj *pPool);
+
+void *taosOpenTcpThreadPool(SPoolInfo *pInfo) {
+  pthread_attr_t thattr;
+
+  SPoolObj *pPool = calloc(sizeof(SPoolObj), 1);
+  if (pPool == NULL) {
+    uError("TCP server, no enough memory");
+    return NULL;
+  }
+
+  pPool->info = *pInfo;
+
+  pPool->pThread = (SThreadObj **)calloc(sizeof(SThreadObj *), pInfo->numOfThreads);
+  if (pPool->pThread == NULL) {
+    uError("TCP server, no enough memory");
+    free(pPool);
+    return NULL;
+  }
+
+  pPool->acceptFd = taosOpenTcpServerSocket(pInfo->serverIp, pInfo->port);
+  if (pPool->acceptFd < 0) {
+    free(pPool->pThread);
+    free(pPool);
+    uError("failed to create TCP server socket, port:%d (%s)", pInfo->port, strerror(errno));
+    return NULL;
+  }
+
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  if (pthread_create(&(pPool->thread), &thattr, (void *)taosAcceptPeerTcpConnection, pPool) != 0) {
+    uError("TCP server, failed to create accept thread, reason:%s", strerror(errno));
+    close(pPool->acceptFd);
+    free(pPool->pThread);
+    free(pPool);
+    return NULL;
+  }
+
+  pthread_attr_destroy(&thattr);
+
+  uDebug("%p TCP pool is created", pPool);
+  return pPool;
+}
+
+void taosCloseTcpThreadPool(void *param) {
+  SPoolObj *  pPool = (SPoolObj *)param;
+  SThreadObj *pThread;
+
+  shutdown(pPool->acceptFd, SHUT_RD);
+  pthread_join(pPool->thread, NULL);
+
+  for (int i = 0; i < pPool->info.numOfThreads; ++i) {
+    pThread = pPool->pThread[i];
+    if (pThread) taosStopPoolThread(pThread);
+  }
+
+  uDebug("%p TCP pool is closed", pPool);
+
+  taosTFree(pPool->pThread);
+  free(pPool);
+}
+
+void *taosAllocateTcpConn(void *param, void *pPeer, int connFd) {
+  struct epoll_event event;
+  SPoolObj *pPool = (SPoolObj *)param;
+
+  SConnObj *pConn = (SConnObj *)calloc(sizeof(SConnObj), 1);
+  if (pConn == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  SThreadObj *pThread = taosGetTcpThread(pPool);
+  if (pThread == NULL) {
+    free(pConn);
+    return NULL;
+  }
+
+  pConn->fd = connFd;
+  pConn->pThread = pThread;
+  pConn->ahandle = pPeer;
+  pConn->closedByApp = 0;
+
+  event.events = EPOLLIN | EPOLLRDHUP;
+  event.data.ptr = pConn;
+
+  if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, connFd, &event) < 0) {
+    uError("failed to add fd:%d(%s)", connFd, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    free(pConn);
+    pConn = NULL;
+  } else {
+    pThread->numOfFds++;
+    uDebug("%p fd:%d is added to epoll thread, num:%d", pThread, connFd, pThread->numOfFds);
+  }
+
+  return pConn;
+}
+
+void taosFreeTcpConn(void *param) {
+  SConnObj *  pConn = (SConnObj *)param;
+  SThreadObj *pThread = pConn->pThread;
+
+  uDebug("%p TCP connection will be closed, fd:%d", pThread, pConn->fd);
+  pConn->closedByApp = 1;
+  shutdown(pConn->fd, SHUT_WR);
+}
+
+static void taosProcessBrokenLink(SConnObj *pConn) {
+  SThreadObj *pThread = pConn->pThread;
+  SPoolObj *  pPool = pThread->pPool;
+  SPoolInfo * pInfo = &pPool->info;
+
+  if (pConn->closedByApp == 0) shutdown(pConn->fd, SHUT_WR);
+  (*pInfo->processBrokenLink)(pConn->ahandle);
+
+  pThread->numOfFds--;
+  epoll_ctl(pThread->pollFd, EPOLL_CTL_DEL, pConn->fd, NULL);
+  uDebug("%p fd:%d is removed from epoll thread, num:%d", pThread, pConn->fd, pThread->numOfFds);
+  taosClose(pConn->fd);
+  free(pConn);
+}
+
+#define maxEvents 10
+
+static void *taosProcessTcpData(void *param) {
+  SThreadObj *pThread = (SThreadObj *)param;
+  SPoolObj *  pPool = pThread->pPool;
+  SPoolInfo * pInfo = &pPool->info;
+  SConnObj *  pConn = NULL;
+  struct epoll_event events[maxEvents];
+
+  void *buffer = malloc(pInfo->bufferSize);
+  taosBlockSIGPIPE();
+
+  while (1) {
+    if (pThread->stop) break;
+    int fdNum = epoll_wait(pThread->pollFd, events, maxEvents, TAOS_EPOLL_WAIT_TIME);
+    if (pThread->stop) {
+      uDebug("%p TCP epoll thread is exiting...", pThread);
+      break;
+    }
+
+    if (fdNum < 0) {
+      uError("epoll_wait failed (%s)", strerror(errno));
+      continue;
+    }
+
+    for (int i = 0; i < fdNum; ++i) {
+      pConn = events[i].data.ptr;
+      assert(pConn);
+
+      if (events[i].events & EPOLLERR) {
+        taosProcessBrokenLink(pConn);
+        continue;
+      }
+
+      if (events[i].events & EPOLLHUP) {
+        taosProcessBrokenLink(pConn);
+        continue;
+      }
+
+      if (events[i].events & EPOLLRDHUP) {
+        taosProcessBrokenLink(pConn);
+        continue;
+      }
+
+      if (pConn->closedByApp == 0) {
+        if ((*pInfo->processIncomingMsg)(pConn->ahandle, buffer) < 0) {
+          taosFreeTcpConn(pConn);
+          continue;
+        }
+      }
+    }
+  }
+
+  uDebug("%p TCP epoll thread exits", pThread);
+
+  close(pThread->pollFd);
+  free(pThread);
+  free(buffer);
+  return NULL;
+}
+
+static void *taosAcceptPeerTcpConnection(void *argv) {
+  SPoolObj * pPool = (SPoolObj *)argv;
+  SPoolInfo *pInfo = &pPool->info;
+
+  taosBlockSIGPIPE();
+
+  while (1) {
+    struct sockaddr_in clientAddr;
+    socklen_t addrlen = sizeof(clientAddr);
+    int connFd = accept(pPool->acceptFd, (struct sockaddr *)&clientAddr, &addrlen);
+    if (connFd < 0) {
+      if (errno == EINVAL) {
+        uDebug("%p TCP server accept is exiting...", pPool);
+        break;
+      } else {
+        uError("TCP accept failure, reason:%s", strerror(errno));
+        continue;
+      }
+    }
+
+    // uDebug("TCP connection from: 0x%x:%d", clientAddr.sin_addr.s_addr, clientAddr.sin_port);
+    taosKeepTcpAlive(connFd);
+    (*pInfo->processIncomingConn)(connFd, clientAddr.sin_addr.s_addr);
+  }
+
+  taosClose(pPool->acceptFd);
+  return NULL;
+}
+
+static SThreadObj *taosGetTcpThread(SPoolObj *pPool) {
+  SThreadObj *pThread = pPool->pThread[pPool->nextId];
+
+  if (pThread) return pThread;
+
+  pThread = (SThreadObj *)calloc(1, sizeof(SThreadObj));
+  if (pThread == NULL) return NULL;
+
+  pThread->pPool = pPool;
+  pThread->pollFd = epoll_create(10);  // size does not matter
+  if (pThread->pollFd < 0) {
+    free(pThread);
+    return NULL;
+  }
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  int ret = pthread_create(&(pThread->thread), &thattr, (void *)taosProcessTcpData, pThread);
+  pthread_attr_destroy(&thattr);
+
+  if (ret != 0) {
+    close(pThread->pollFd);
+    free(pThread);
+    return NULL;
+  }
+
+  uDebug("%p TCP epoll thread is created", pThread);
+  pPool->pThread[pPool->nextId] = pThread;
+  pPool->nextId++;
+  pPool->nextId = pPool->nextId % pPool->info.numOfThreads;
+
+  return pThread;
+}
+
+static void taosStopPoolThread(SThreadObj *pThread) {
+  pThread->stop = true;
+
+  if (pThread->thread == pthread_self()) {
+    pthread_detach(pthread_self());
+    return;
+  }
+
+  // save thread ID into a local variable, since pThread is freed when the thread exits
+  pthread_t thread = pThread->thread;
+
+  // signal the thread to stop, try graceful method first,
+  // and use pthread_cancel when failed
+  struct epoll_event event = {.events = EPOLLIN};
+  eventfd_t fd = eventfd(1, 0);
+  if (fd == -1) {
+    // failed to create eventfd, call pthread_cancel instead, which may result in data corruption
+    uError("failed to create eventfd(%s)", strerror(errno));
+    pthread_cancel(pThread->thread);
+    pThread->stop = true;
+  } else if (epoll_ctl(pThread->pollFd, EPOLL_CTL_ADD, fd, &event) < 0) {
+    // failed to call epoll_ctl, call pthread_cancel instead, which may result in data corruption
+    uError("failed to call epoll_ctl(%s)", strerror(errno));
+    pthread_cancel(pThread->thread);
+  }
+
+  pthread_join(thread, NULL);
+  taosClose(fd);
+}
diff --git a/src/sync/src/tarbitrator.c b/src/sync/src/tarbitrator.c
new file mode 100644
index 0000000000000000000000000000000000000000..360ea93f6c3fcd41e1df03702a0c963029deaacc
--- /dev/null
+++ b/src/sync/src/tarbitrator.c
@@ -0,0 +1,186 @@
+/*
+ * 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/>.
+ */
+
+//#define _DEFAULT_SOURCE
+#include "os.h"
+#include "hash.h"
+#include "tlog.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "tsocket.h"
+#include "tglobal.h"
+#include "taoserror.h"
+#include "taosTcpPool.h"
+#include "twal.h"
+#include "tsync.h"
+#include "syncInt.h"
+
+static void     arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context);
+static void     arbProcessIncommingConnection(int connFd, uint32_t sourceIp);
+static void     arbProcessBrokenLink(void *param);
+static int      arbProcessPeerMsg(void *param, void *buffer);
+static tsem_t   tsArbSem;
+static ttpool_h tsArbTcpPool;
+
+typedef struct {
+  char  id[TSDB_EP_LEN + 24];
+  int   nodeFd;
+  void *pConn;
+} SNodeConn;
+
+int main(int argc, char *argv[]) {
+  char arbLogPath[TSDB_FILENAME_LEN + 16] = {0};
+
+  for (int i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-p") == 0 && i < argc - 1) {
+      tsArbitratorPort = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d") == 0 && i < argc - 1) {
+      debugFlag = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-g") == 0 && i < argc - 1) {
+      if (strlen(argv[++i]) > TSDB_FILENAME_LEN) continue;
+      tstrncpy(arbLogPath, argv[i], sizeof(arbLogPath));
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-p port]: arbitrator server port number, default is:%d\n", tsServerPort + TSDB_PORT_ARBITRATOR);
+      printf("  [-d debugFlag]: debug flag, option 131 | 135 | 143, default:0\n");
+      printf("  [-g logFilePath]: log file pathe, default:/arbitrator.log\n");
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  }
+
+  sDebugFlag = debugFlag;
+
+  if (tsem_init(&tsArbSem, 0, 0) != 0) {
+    printf("failed to create exit semphore\n");
+    exit(EXIT_FAILURE);
+  }
+
+  /* Set termination handler. */
+  struct sigaction act = {{0}};
+  act.sa_flags = SA_SIGINFO;
+  act.sa_sigaction = arbSignalHandler;
+  sigaction(SIGTERM, &act, NULL);
+  sigaction(SIGHUP, &act, NULL);
+  sigaction(SIGINT, &act, NULL);
+
+  tsAsyncLog = 0;
+  strcat(arbLogPath, "/arbitrator.log");
+  taosInitLog(arbLogPath, 1000000, 10);
+
+  taosGetFqdn(tsNodeFqdn);
+
+  SPoolInfo info;
+  info.numOfThreads = 1;
+  info.serverIp = 0;
+  info.port = tsArbitratorPort;
+  info.bufferSize = 640000;
+  info.processBrokenLink = arbProcessBrokenLink;
+  info.processIncomingMsg = arbProcessPeerMsg;
+  info.processIncomingConn = arbProcessIncommingConnection;
+  tsArbTcpPool = taosOpenTcpThreadPool(&info);
+
+  if (tsArbTcpPool == NULL) {
+    sDebug("failed to open TCP thread pool, exit...");
+    return -1;
+  }
+
+  sInfo("TAOS arbitrator: %s:%d is running", tsNodeFqdn, tsArbitratorPort);
+
+  tsem_wait(&tsArbSem);
+
+  taosCloseTcpThreadPool(tsArbTcpPool);
+  sInfo("TAOS arbitrator is shut down\n");
+  closelog();
+
+  return 0;
+}
+
+static void arbProcessIncommingConnection(int connFd, uint32_t sourceIp) {
+  char ipstr[24];
+  tinet_ntoa(ipstr, sourceIp);
+  sDebug("peer TCP connection from ip:%s", ipstr);
+
+  SFirstPkt firstPkt;
+  if (taosReadMsg(connFd, &firstPkt, sizeof(firstPkt)) != sizeof(firstPkt)) {
+    sError("failed to read peer first pkt from ip:%s(%s)", ipstr, strerror(errno));
+    taosCloseSocket(connFd);
+    return;
+  }
+
+  SNodeConn *pNode = (SNodeConn *)calloc(sizeof(SNodeConn), 1);
+  if (pNode == NULL) {
+    sError("failed to allocate memory(%s)", strerror(errno));
+    taosCloseSocket(connFd);
+    return;
+  }
+
+  firstPkt.fqdn[sizeof(firstPkt.fqdn) - 1] = 0;
+  snprintf(pNode->id, sizeof(pNode->id), "vgId:%d peer:%s:%d", firstPkt.sourceId, firstPkt.fqdn, firstPkt.port);
+  if (firstPkt.syncHead.vgId) {
+    sDebug("%s, vgId in head is not zero, close the connection", pNode->id);
+    taosTFree(pNode);
+    taosCloseSocket(connFd);
+    return;
+  }
+
+  sDebug("%s, arbitrator request is accepted", pNode->id);
+  pNode->nodeFd = connFd;
+  pNode->pConn = taosAllocateTcpConn(tsArbTcpPool, pNode, connFd);
+
+  return;
+}
+
+static void arbProcessBrokenLink(void *param) {
+  SNodeConn *pNode = param;
+
+  sDebug("%s, TCP link is broken(%s), close connection", pNode->id, strerror(errno));
+  taosTFree(pNode);
+}
+
+static int arbProcessPeerMsg(void *param, void *buffer) {
+  SNodeConn *pNode = param;
+  SSyncHead  head;
+  int        bytes = 0;
+  char *     cont = (char *)buffer;
+
+  int hlen = taosReadMsg(pNode->nodeFd, &head, sizeof(head));
+  if (hlen != sizeof(head)) {
+    sDebug("%s, failed to read msg, hlen:%d", pNode->id, hlen);
+    return -1;
+  }
+
+  bytes = taosReadMsg(pNode->nodeFd, cont, head.len);
+  if (bytes != head.len) {
+    sDebug("%s, failed to read, bytes:%d len:%d", pNode->id, bytes, head.len);
+    return -1;
+  }
+
+  sDebug("%s, msg is received, len:%d", pNode->id, head.len);
+  return 0;
+}
+
+static void arbSignalHandler(int32_t signum, siginfo_t *sigInfo, void *context) {
+  struct sigaction act = {{0}};
+  act.sa_handler = SIG_IGN;
+  sigaction(SIGTERM, &act, NULL);
+  sigaction(SIGHUP, &act, NULL);
+  sigaction(SIGINT, &act, NULL);
+
+  sInfo("shut down signal is %d, sender PID:%d", signum, sigInfo->si_pid);
+
+  // inform main thread to exit
+  tsem_post(&tsArbSem);
+}
diff --git a/src/sync/test/CMakeLists.txt b/src/sync/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..27614454f9f8924de561f0907f06078b03708363
--- /dev/null
+++ b/src/sync/test/CMakeLists.txt
@@ -0,0 +1,16 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_LINUX)
+  INCLUDE_DIRECTORIES(../inc)
+
+  LIST(APPEND CLIENT_SRC ./syncClient.c)
+  ADD_EXECUTABLE(syncClient ${CLIENT_SRC})
+  TARGET_LINK_LIBRARIES(syncClient sync trpc common)
+
+  LIST(APPEND SERVER_SRC ./syncServer.c)
+  ADD_EXECUTABLE(syncServer ${SERVER_SRC})
+  TARGET_LINK_LIBRARIES(syncServer sync trpc common)
+ENDIF ()
+
+
diff --git a/src/sync/test/syncClient.c b/src/sync/test/syncClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..23264dc8a0d969e238f35951b0a02e10261ab0c3
--- /dev/null
+++ b/src/sync/test/syncClient.c
@@ -0,0 +1,194 @@
+/*
+ * 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 "os.h"
+#include "tglobal.h"
+#include "tulog.h"
+#include "trpc.h"
+#include "taoserror.h"
+
+typedef struct {
+  int       index;
+  SRpcEpSet epSet;
+  int       num;
+  int       numOfReqs;
+  int       msgSize;
+  tsem_t    rspSem;
+  tsem_t *  pOverSem;
+  pthread_t thread;
+  void *    pRpc;
+} SInfo;
+
+void processResponse(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SInfo *pInfo = (SInfo *)pMsg->ahandle;
+  uDebug("thread:%d, response is received, type:%d contLen:%d code:0x%x", pInfo->index, pMsg->msgType, pMsg->contLen,
+         pMsg->code);
+
+  if (pEpSet) pInfo->epSet = *pEpSet;
+  rpcFreeCont(pMsg->pCont);
+
+  tsem_post(&pInfo->rspSem);
+}
+
+int tcount = 0;
+
+void *sendRequest(void *param) {
+  SInfo * pInfo = (SInfo *)param;
+  SRpcMsg rpcMsg = {0};
+
+  uDebug("thread:%d, start to send request", pInfo->index);
+
+  while (pInfo->numOfReqs == 0 || pInfo->num < pInfo->numOfReqs) {
+    pInfo->num++;
+    rpcMsg.pCont = rpcMallocCont(pInfo->msgSize);
+    rpcMsg.contLen = pInfo->msgSize;
+    rpcMsg.ahandle = pInfo;
+    rpcMsg.msgType = 1;
+    uDebug("thread:%d, send request, contLen:%d num:%d", pInfo->index, pInfo->msgSize, pInfo->num);
+    rpcSendRequest(pInfo->pRpc, &pInfo->epSet, &rpcMsg);
+    if (pInfo->num % 20000 == 0) {
+      uInfo("thread:%d, %d requests have been sent", pInfo->index, pInfo->num);
+    }
+    tsem_wait(&pInfo->rspSem);
+  }
+
+  uDebug("thread:%d, it is over", pInfo->index);
+  tcount++;
+
+  return NULL;
+}
+
+int main(int argc, char *argv[]) {
+  SRpcInit  rpcInit;
+  SRpcEpSet epSet;
+  char      secret[TSDB_KEY_LEN] = "mypassword";
+  int       msgSize = 128;
+  int       numOfReqs = 0;
+  int       appThreads = 1;
+  char      serverIp[40] = "127.0.0.1";
+  struct    timeval systemTime;
+  int64_t   startTime, endTime;
+  pthread_attr_t thattr;
+
+  // server info
+  epSet.numOfEps = 1;
+  epSet.inUse = 0;
+  epSet.port[0] = 7000;
+  epSet.port[1] = 7000;
+  strcpy(epSet.fqdn[0], serverIp);
+  strcpy(epSet.fqdn[1], "192.168.0.1");
+
+  // client info
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort    = 0;
+  rpcInit.label        = "APP";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp          = processResponse;
+  rpcInit.sessions     = 100;
+  rpcInit.idleTime     = tsShellActivityTimer*1000;
+  rpcInit.user         = "michael";
+  rpcInit.secret       = secret;
+  rpcInit.ckey         = "key";
+  rpcInit.spi          = 1;
+  rpcInit.connType     = TAOS_CONN_CLIENT;
+
+  for (int i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-p") == 0 && i < argc - 1) {
+      epSet.port[0] = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-i") == 0 && i < argc - 1) {
+      tstrncpy(epSet.fqdn[0], argv[++i], TSDB_FQDN_LEN);
+    } else if (strcmp(argv[i], "-t") == 0 && i < argc - 1) {
+      rpcInit.numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-m") == 0 && i < argc - 1) {
+      msgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0 && i < argc - 1) {
+      rpcInit.sessions = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0 && i < argc - 1) {
+      numOfReqs = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-a") == 0 && i < argc - 1) {
+      appThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-o") == 0 && i < argc - 1) {
+      tsCompressMsgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-u") == 0 && i < argc - 1) {
+      rpcInit.user = argv[++i];
+    } else if (strcmp(argv[i], "-k") == 0 && i < argc - 1) {
+      rpcInit.secret = argv[++i];
+    } else if (strcmp(argv[i], "-spi") == 0 && i < argc - 1) {
+      rpcInit.spi = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d") == 0 && i < argc - 1) {
+      rpcDebugFlag = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-i ip]: first server IP address, default is:%s\n", serverIp);
+      printf("  [-p port]: server port number, default is:%d\n", epSet.port[0]);
+      printf("  [-t threads]: number of rpc threads, default is:%d\n", rpcInit.numOfThreads);
+      printf("  [-s sessions]: number of rpc sessions, default is:%d\n", rpcInit.sessions);
+      printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
+      printf("  [-a threads]: number of app threads, default is:%d\n", appThreads);
+      printf("  [-n requests]: number of requests per thread, default is:%d\n", numOfReqs);
+      printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
+      printf("  [-u user]: user name for the connection, default is:%s\n", rpcInit.user);
+      printf("  [-k secret]: password for the connection, default is:%s\n", rpcInit.secret);
+      printf("  [-spi SPI]: security parameter index, default is:%d\n", rpcInit.spi);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  }
+
+  taosInitLog("client.log", 100000, 10);
+
+  void *pRpc = rpcOpen(&rpcInit);
+  if (pRpc == NULL) {
+    uError("failed to initialize RPC");
+    return -1;
+  }
+
+  uInfo("client is initialized");
+
+  gettimeofday(&systemTime, NULL);
+  startTime = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  SInfo *pInfo = (SInfo *)calloc(1, sizeof(SInfo) * appThreads);
+
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+
+  for (int i = 0; i < appThreads; ++i) {
+    pInfo->index = i;
+    pInfo->epSet = epSet;
+    pInfo->numOfReqs = numOfReqs;
+    pInfo->msgSize = msgSize;
+    tsem_init(&pInfo->rspSem, 0, 0);
+    pInfo->pRpc = pRpc;
+    pthread_create(&pInfo->thread, &thattr, sendRequest, pInfo);
+    pInfo++;
+  }
+
+  do {
+    usleep(1);
+  } while (tcount < appThreads);
+
+  gettimeofday(&systemTime, NULL);
+  endTime = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  float usedTime = (endTime - startTime) / 1000.0;  // mseconds
+
+  uInfo("it takes %.3f mseconds to send %d requests to server", usedTime, numOfReqs * appThreads);
+  uInfo("Performance: %.3f requests per second, msgSize:%d bytes", 1000.0 * numOfReqs * appThreads / usedTime, msgSize);
+
+  taosCloseLog();
+
+  return 0;
+}
diff --git a/src/sync/test/syncServer.c b/src/sync/test/syncServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e769a461e1b1d6c995cc64b3a4cd6dfc0dd4172
--- /dev/null
+++ b/src/sync/test/syncServer.c
@@ -0,0 +1,472 @@
+/*
+ * 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/>.
+ */
+
+//#define _DEFAULT_SOURCE
+#include <stdint.h>
+#include "os.h"
+#include "tulog.h"
+#include "tglobal.h"
+#include "tsocket.h"
+#include "trpc.h"
+#include "tqueue.h"
+#include "twal.h"
+#include "tsync.h"
+
+int       msgSize = 128;
+int       commit = 0;
+int       dataFd = -1;
+void *    qhandle = NULL;
+int       walNum = 0;
+uint64_t  tversion = 0;
+void *    syncHandle;
+int       role;
+int       nodeId;
+char      path[256];
+int       numOfWrites;
+SSyncInfo syncInfo;
+SSyncCfg *pCfg;
+
+int writeIntoWal(SWalHead *pHead) {
+  if (dataFd < 0) {
+    char walName[280];
+    snprintf(walName, sizeof(walName), "%s/wal/wal.%d", path, walNum);
+    (void)remove(walName);
+    dataFd = open(walName, O_CREAT | O_WRONLY, S_IRWXU | S_IRWXG | S_IRWXO);
+    if (dataFd < 0) {
+      uInfo("failed to open wal file:%s(%s)", walName, strerror(errno));
+      return -1;
+    } else {
+      walNum++;
+      uInfo("file:%s is opened to write, walNum:%d", walName, walNum);
+    }
+  }
+
+  if (write(dataFd, pHead, sizeof(SWalHead) + pHead->len) < 0) {
+    uError("ver:%" PRIu64 ", failed to write wal file(%s)", pHead->version, strerror(errno));
+  } else {
+    uDebug("ver:%" PRIu64 ", written to wal", pHead->version);
+  }
+
+  numOfWrites++;
+  if (numOfWrites >= 10000) {
+    uInfo("%d request have been written into disk", numOfWrites);
+    close(dataFd);
+    dataFd = -1;
+    numOfWrites = 0;
+  }
+
+  return 0;
+}
+
+void confirmForward(void *ahandle, void *mhandle, int32_t code) {
+  SRpcMsg * pMsg = (SRpcMsg *)mhandle;
+  SWalHead *pHead = (SWalHead *)(((char *)pMsg->pCont) - sizeof(SWalHead));
+
+  uDebug("ver:%" PRIu64 ", confirm is received", pHead->version);
+
+  rpcFreeCont(pMsg->pCont);
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = rpcMallocCont(msgSize);
+  rpcMsg.contLen = msgSize;
+  rpcMsg.handle = pMsg->handle;
+  rpcMsg.code = code;
+  rpcSendResponse(&rpcMsg);
+
+  taosFreeQitem(mhandle);
+}
+
+int processRpcMsg(void *item) {
+  SRpcMsg * pMsg = (SRpcMsg *)item;
+  SWalHead *pHead = (SWalHead *)(((char *)pMsg->pCont) - sizeof(SWalHead));
+  int       code = -1;
+
+  if (role != TAOS_SYNC_ROLE_MASTER) {
+    uError("not master, write failed, role:%s", syncRole[role]);
+  } else {
+    pHead->version = ++tversion;
+    pHead->msgType = pMsg->msgType;
+    pHead->len = pMsg->contLen;
+
+    uDebug("ver:%" PRIu64 ", pkt from client processed", pHead->version);
+    writeIntoWal(pHead);
+    syncForwardToPeer(syncHandle, pHead, item, TAOS_QTYPE_RPC);
+
+    code = 0;
+  }
+
+  if (pCfg->quorum <= 1) {
+    rpcFreeCont(pMsg->pCont);
+    taosFreeQitem(item);
+
+    SRpcMsg rpcMsg = {0};
+    rpcMsg.pCont = rpcMallocCont(msgSize);
+    rpcMsg.contLen = msgSize;
+    rpcMsg.handle = pMsg->handle;
+    rpcMsg.code = code;
+    rpcSendResponse(&rpcMsg);
+  }
+
+  return code;
+}
+
+int processFwdMsg(void *item) {
+  SWalHead *pHead = (SWalHead *)item;
+
+  if (pHead->version <= tversion) {
+    uError("ver:%" PRIu64 ", forward is even lower than local:%" PRIu64, pHead->version, tversion);
+    return -1;
+  }
+
+  uDebug("ver:%" PRIu64 ", forward from peer is received", pHead->version);
+  writeIntoWal(pHead);
+  tversion = pHead->version;
+
+  if (pCfg->quorum > 1) syncConfirmForward(syncHandle, pHead->version, 0);
+
+  // write into cache
+
+  /*
+    if (pHead->handle) {
+      syncSendFwdAck(syncHandle, pHead->handle, 0);
+    }
+  */
+
+  taosFreeQitem(item);
+
+  return 0;
+}
+
+int processWalMsg(void *item) {
+  SWalHead *pHead = (SWalHead *)item;
+
+  if (pHead->version <= tversion) {
+    uError("ver:%" PRIu64 ", wal is even lower than local:%" PRIu64, pHead->version, tversion);
+    return -1;
+  };
+
+  uDebug("ver:%" PRIu64 ", wal from peer is received", pHead->version);
+  writeIntoWal(pHead);
+  tversion = pHead->version;
+
+  // write into cache
+
+  /*
+    if (pHead->handle) {
+      syncSendFwdAck(syncHandle, pHead->handle, 0);
+    }
+  */
+
+  taosFreeQitem(item);
+
+  return 0;
+}
+
+void *processWriteQueue(void *param) {
+  int   type;
+  void *item;
+
+  while (1) {
+    int ret = taosReadQitem(qhandle, &type, &item);
+    if (ret <= 0) {
+      usleep(1000);
+      continue;
+    }
+
+    if (type == TAOS_QTYPE_RPC) {
+      processRpcMsg(item);
+    } else if (type == TAOS_QTYPE_WAL) {
+      processWalMsg(item);
+    } else if (type == TAOS_QTYPE_FWD) {
+      processFwdMsg(item);
+    }
+  }
+
+  return NULL;
+}
+
+int retrieveAuthInfo(char *meterId, char *spi, char *encrypt, char *secret, char *ckey) {
+  // app shall retrieve the auth info based on meterID from DB or a data file
+  // demo code here only for simple demo
+  int ret = 0;
+
+  if (strcmp(meterId, "michael") == 0) {
+    *spi = 1;
+    *encrypt = 0;
+    strcpy(secret, "mypassword");
+    strcpy(ckey, "key");
+  } else if (strcmp(meterId, "jeff") == 0) {
+    *spi = 0;
+    *encrypt = 0;
+  } else {
+    ret = -1;  // user not there
+  }
+
+  return ret;
+}
+
+void processRequestMsg(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
+  SRpcMsg *pTemp;
+
+  pTemp = taosAllocateQitem(sizeof(SRpcMsg));
+  memcpy(pTemp, pMsg, sizeof(SRpcMsg));
+
+  uDebug("request is received, type:%d, len:%d", pMsg->msgType, pMsg->contLen);
+  taosWriteQitem(qhandle, TAOS_QTYPE_RPC, pTemp);
+}
+
+uint32_t getFileInfo(void *ahandle, char *name, uint32_t *index, uint32_t eindex, int64_t *size, uint64_t *fversion) {
+  uint32_t    magic;
+  struct stat fstat;
+  char        aname[280];
+
+  if (*index == 2) {
+    uInfo("wait for a while .....");
+    sleep(3);
+  }
+
+  if (name[0] == 0) {
+    // find the file
+    snprintf(aname, sizeof(aname), "%s/data/data.%d", path, *index);
+    sprintf(name, "data/data.%d", *index);
+  } else {
+    snprintf(aname, sizeof(aname), "%s/%s", path, name);
+  }
+
+  uInfo("get file info:%s", aname);
+  if (stat(aname, &fstat) < 0) return 0;
+
+  *size = fstat.st_size;
+  magic = fstat.st_size;
+
+  return magic;
+}
+
+int getWalInfo(void *ahandle, char *name, uint32_t *index) {
+  struct stat fstat;
+  char        aname[280];
+
+  name[0] = 0;
+  if (*index + 1 > walNum) return 0;
+
+  snprintf(aname, sizeof(aname), "%s/wal/wal.%d", path, *index);
+  sprintf(name, "wal/wal.%d", *index);
+  uInfo("get wal info:%s", aname);
+
+  if (stat(aname, &fstat) < 0) return -1;
+
+  if (*index >= walNum - 1) return 0;  // no more
+
+  return 1;
+}
+
+int writeToCache(void *ahandle, void *data, int type) {
+  SWalHead *pHead = data;
+
+  uDebug("pkt from peer is received, ver:%" PRIu64 " len:%d type:%d", pHead->version, pHead->len, type);
+
+  int   msgSize = pHead->len + sizeof(SWalHead);
+  void *pMsg = taosAllocateQitem(msgSize);
+  memcpy(pMsg, pHead, msgSize);
+  taosWriteQitem(qhandle, type, pMsg);
+
+  return 0;
+}
+
+void confirmFwd(void *ahandle, int64_t version) { return; }
+
+void notifyRole(void *ahandle, int8_t r) {
+  role = r;
+  printf("current role:%s\n", syncRole[role]);
+}
+
+void initSync() {
+  pCfg->replica = 1;
+  pCfg->quorum = 1;
+  syncInfo.vgId = 1;
+  syncInfo.ahandle = &syncInfo;
+  syncInfo.getFileInfo = getFileInfo;
+  syncInfo.getWalInfo = getWalInfo;
+  syncInfo.writeToCache = writeToCache;
+  syncInfo.confirmForward = confirmForward;
+  syncInfo.notifyRole = notifyRole;
+
+  pCfg->nodeInfo[0].nodeId = 1;
+  pCfg->nodeInfo[0].nodePort = 7010;
+  taosGetFqdn(pCfg->nodeInfo[0].nodeFqdn);
+
+  pCfg->nodeInfo[1].nodeId = 2;
+  pCfg->nodeInfo[1].nodePort = 7110;
+  taosGetFqdn(pCfg->nodeInfo[1].nodeFqdn);
+
+  pCfg->nodeInfo[2].nodeId = 3;
+  pCfg->nodeInfo[2].nodePort = 7210;
+  taosGetFqdn(pCfg->nodeInfo[2].nodeFqdn);
+
+  pCfg->nodeInfo[3].nodeId = 4;
+  pCfg->nodeInfo[3].nodePort = 7310;
+  taosGetFqdn(pCfg->nodeInfo[3].nodeFqdn);
+
+  pCfg->nodeInfo[4].nodeId = 5;
+  pCfg->nodeInfo[4].nodePort = 7410;
+  taosGetFqdn(pCfg->nodeInfo[4].nodeFqdn);
+}
+
+void doSync() {
+  for (int i = 0; i < 5; ++i) {
+    if (tsSyncPort == pCfg->nodeInfo[i].nodePort) nodeId = pCfg->nodeInfo[i].nodeId;
+  }
+
+  snprintf(path, sizeof(path), "/root/test/d%d", nodeId);
+  tstrncpy(syncInfo.path, path, sizeof(syncInfo.path));
+
+  if (syncHandle == NULL) {
+    syncHandle = syncStart(&syncInfo);
+  } else {
+    if (syncReconfig(syncHandle, pCfg) < 0) syncHandle = NULL;
+  }
+
+  uInfo("nodeId:%d path:%s syncPort:%d", nodeId, path, tsSyncPort);
+}
+
+int main(int argc, char *argv[]) {
+  SRpcInit rpcInit;
+  char     dataName[20] = "server.data";
+  pCfg = &syncInfo.syncCfg;
+
+  initSync();
+
+  memset(&rpcInit, 0, sizeof(rpcInit));
+  rpcInit.localPort = 7000;
+  rpcInit.label = "SER";
+  rpcInit.numOfThreads = 1;
+  rpcInit.cfp = processRequestMsg;
+  rpcInit.sessions = 1000;
+  rpcInit.idleTime = tsShellActivityTimer * 1500;
+  rpcInit.afp = retrieveAuthInfo;
+
+  for (int i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-p") == 0 && i < argc - 1) {
+      rpcInit.localPort = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0 && i < argc - 1) {
+      rpcInit.numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-m") == 0 && i < argc - 1) {
+      msgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0 && i < argc - 1) {
+      rpcInit.sessions = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-o") == 0 && i < argc - 1) {
+      tsCompressMsgSize = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-w") == 0 && i < argc - 1) {
+      commit = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-v") == 0 && i < argc - 1) {
+      syncInfo.version = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0 && i < argc - 1) {
+      pCfg->replica = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-q") == 0 && i < argc - 1) {
+      pCfg->quorum = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-d") == 0 && i < argc - 1) {
+      rpcDebugFlag = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-p port]: server port number, default is:%d\n", rpcInit.localPort);
+      printf("  [-t threads]: number of rpc threads, default is:%d\n", rpcInit.numOfThreads);
+      printf("  [-s sessions]: number of sessions, default is:%d\n", rpcInit.sessions);
+      printf("  [-m msgSize]: message body size, default is:%d\n", msgSize);
+      printf("  [-o compSize]: compression message size, default is:%d\n", tsCompressMsgSize);
+      printf("  [-w write]: write received data to file(0, 1, 2), default is:%d\n", commit);
+      printf("  [-v version]: initial node version, default is:%ld\n", syncInfo.version);
+      printf("  [-r replica]: replicacation number, default is:%d\n", pCfg->replica);
+      printf("  [-q quorum]: quorum, default is:%d\n", pCfg->quorum);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", rpcDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  }
+
+  uDebugFlag = rpcDebugFlag;
+  dDebugFlag = rpcDebugFlag;
+  // tmrDebugFlag = rpcDebugFlag;
+  tsAsyncLog = 0;
+  taosInitLog("server.log", 1000000, 10);
+
+  rpcInit.connType = TAOS_CONN_SERVER;
+  void *pRpc = rpcOpen(&rpcInit);
+  if (pRpc == NULL) {
+    uError("failed to start RPC server");
+    return -1;
+  }
+
+  tsSyncPort = rpcInit.localPort + 10;
+  qhandle = taosOpenQueue();
+
+  doSync();
+
+  pthread_attr_t thattr;
+  pthread_t      thread;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  if (pthread_create(&thread, &thattr, processWriteQueue, NULL) != 0) {
+    uError("failed to create thread, reason:%s", strerror(errno));
+    return -1;
+  }
+
+  printf("server is running, localPort:%d\n", rpcInit.localPort);
+  SNodesRole nroles;
+
+  while (1) {
+    int c = getchar();
+
+    switch (c) {
+      case '1':
+        pCfg->replica = 1;
+        doSync();
+        break;
+      case '2':
+        pCfg->replica = 2;
+        doSync();
+        break;
+      case '3':
+        pCfg->replica = 3;
+        doSync();
+        break;
+      case '4':
+        pCfg->replica = 4;
+        doSync();
+        break;
+      case '5':
+        pCfg->replica = 5;
+        doSync();
+        break;
+      case 's':
+        syncGetNodesRole(syncHandle, &nroles);
+        for (int i = 0; i < pCfg->replica; ++i)
+          printf("=== nodeId:%d role:%s\n", nroles.nodeId[i], syncRole[nroles.role[i]]);
+        break;
+      default:
+        break;
+    }
+
+    if (c == 'q') break;
+  }
+
+  syncStop(syncHandle);
+
+  if (dataFd >= 0) {
+    close(dataFd);
+    remove(dataName);
+  }
+
+  return 0;
+}
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
deleted file mode 100644
index 5c4ab62d24e99adcda504b346046dd62bbe7c335..0000000000000000000000000000000000000000
--- a/src/system/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-ADD_SUBDIRECTORY(detail)
-
-IF (TD_LITE)
-  ADD_SUBDIRECTORY(lite)
-ENDIF ()
\ No newline at end of file
diff --git a/src/system/detail/CMakeLists.txt b/src/system/detail/CMakeLists.txt
deleted file mode 100644
index 95cce3dfe617464cb0cc442686a2802f2178cbbc..0000000000000000000000000000000000000000
--- a/src/system/detail/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
-  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  LIST(REMOVE_ITEM SRC ./src/vnodeFileUtil.c)
-  LIST(REMOVE_ITEM SRC ./src/taosGrant.c)
-
-  ADD_EXECUTABLE(taosd ${SRC})
-
-  TARGET_LINK_LIBRARIES(taosd taos_static trpc tutil sdb monitor pthread http)
-
-  IF (TD_LITE)
-    TARGET_LINK_LIBRARIES(taosd taosd_lite)
-  ELSE ()
-    TARGET_LINK_LIBRARIES(taosd taosd_cluster)
-  ENDIF ()
-
-  SET(PREPARE_ENV_CMD "prepare_env_cmd")
-  SET(PREPARE_ENV_TARGET "prepare_env_target")
-  ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
-    POST_BUILD 
-    COMMAND echo "make test directory"
-    DEPENDS taosd
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
-    COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-    COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-    COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-    COMMENT "prepare taosd environment")
-  ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
-
-ENDIF ()
diff --git a/src/system/detail/inc/dnodeSystem.h b/src/system/detail/inc/dnodeSystem.h
deleted file mode 100644
index 96e5699464af1095ae92e74b4e96dd67ae11c81d..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/dnodeSystem.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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_DNODESYSTEM_H
-#define TDENGINE_DNODESYSTEM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <pthread.h>
-
-#define tsetModuleStatus(mod) \
-  { tsModuleStatus |= (1 << mod); }
-#define tclearModuleStatus(mod) \
-  { tsModuleStatus &= ~(1 << mod); }
-
-enum _module { TSDB_MOD_MGMT, TSDB_MOD_HTTP, TSDB_MOD_MONITOR, TSDB_MOD_MAX };
-
-typedef struct {
-  char  *name;
-  int  (*initFp)();
-  void (*cleanUpFp)();
-  int  (*startFp)();
-  void (*stopFp)();
-  int    num;
-  int    curNum;
-  int    equalVnodeNum;
-} SModule;
-
-extern uint32_t        tsModuleStatus;
-extern SModule         tsModule[];
-extern pthread_mutex_t dmutex;
-
-void dnodeCleanUpSystem();
-int  dnodeInitSystem();
-int  dnodeInitSystemSpec();
-void dnodeStartModuleSpec();
-void dnodeParseParameterK();
-void dnodeProcessModuleStatus(uint32_t status);
-void dnodeResetSystem();
-void dnodeCheckDbRunning(const char* dir);
-
-void vnodeCleanUpSystem();
-int  vnodeInitSystem();
-void vnodeInitMgmtIp();
-void vnodeInitQHandle();
-
-int  mgmtInitSystem();
-void mgmtCleanUpSystem();
-int  mgmtStartSystem();
-void mgmtStopSystem();
-
-int  taosCreateTierDirectory();
-void taosCleanupTier();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/system/detail/inc/mgmt.h b/src/system/detail/inc/mgmt.h
deleted file mode 100644
index 24f9822f1616529801ef2eee8ce3ec3dc5fc6f5d..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/mgmt.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * 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_MGMT_H
-#define TDENGINE_MGMT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-#include "sdb.h"
-#include "tglobalcfg.h"
-#include "thash.h"
-#include "tidpool.h"
-#include "tlog.h"
-#include "tmempool.h"
-#include "trpc.h"
-#include "tsdb.h"
-#include "tskiplist.h"
-#include "tsocket.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tutil.h"
-
-// internal globals
-extern char  version[];
-extern void *mgmtTmr;
-extern void *mgmtQhandle;
-extern void *mgmtTranQhandle;
-extern int   mgmtShellConns;
-extern int   mgmtDnodeConns;
-extern char  mgmtDirectory[];
-
-
-typedef struct {
-  uint32_t   privateIp;
-  int32_t    sid;
-  uint32_t   moduleStatus;
-  int32_t    openVnodes;
-  int32_t    numOfVnodes;
-  int32_t    numOfFreeVnodes;
-  int64_t    createdTime;
-  uint32_t   publicIp;
-  int32_t    status;
-  uint32_t   lastAccess;
-  uint32_t   rebootTimes;
-  uint32_t   lastReboot;       // time stamp for last reboot
-  uint16_t   numOfCores;       // from dnode status msg
-  uint8_t    alternativeRole;  // from dnode status msg, 0-any, 1-mgmt, 2-dnode
-  uint8_t    reserveStatus;
-  uint16_t   numOfTotalVnodes; // from dnode status msg, config information
-  uint16_t   unused;
-  float      diskAvailable;    // from dnode status msg
-  int32_t    bandwidthMb;      // config by user
-  int16_t    cpuAvgUsage;      // calc from sys.cpu
-  int16_t    memoryAvgUsage;   // calc from sys.mem
-  int16_t    diskAvgUsage;     // calc from sys.disk
-  int16_t    bandwidthUsage;   // calc from sys.band
-  uint32_t   rack;
-  uint16_t   idc;
-  uint16_t   slot;
-  int32_t    customScore;     // config by user
-  float      lbScore;         // calc in balance function
-  int16_t    lbStatus;         // set in balance function
-  int16_t    lastAllocVnode;  // increase while create vnode
-  SVnodeLoad vload[TSDB_MAX_VNODES];
-  char       reserved[16];
-  char       updateEnd[1];
-  void *     thandle;
-} SDnodeObj;
-
-typedef struct {
-  uint32_t ip;
-  uint32_t publicIp;
-  int32_t  vnode;
-} SVnodeGid;
-
-typedef struct {
-  int32_t sid;
-  int32_t vgId;  // vnode group ID
-} SMeterGid;
-
-typedef struct _tab_obj {
-  char      meterId[TSDB_METER_ID_LEN + 1];
-  uint64_t  uid;
-  SMeterGid gid;
-
-  int32_t sversion;     // schema version
-  int64_t createdTime;
-  int32_t numOfTags;    // for metric
-  int32_t numOfMeters;  // for metric
-  int32_t numOfColumns;
-  int32_t schemaSize;
-  short   nextColId;
-  char    meterType : 4;
-  char    status : 3;
-  char    isDirty : 1;  // if the table change tag column 1 value
-  char    reserved[15];
-  char    updateEnd[1];
-
-  pthread_rwlock_t rwLock;
-  tSkipList *      pSkipList;
-  struct _tab_obj *pHead;  // for metric, a link list for all meters created
-                           // according to this metric
-  char *pTagData;          // TSDB_METER_ID_LEN(metric_name)+
-                           // tags_value1/tags_value2/tags_value3
-  struct _tab_obj *prev, *next;
-  char *           pSql;   // pointer to SQL, for SC, null-terminated string
-  char *           pReserve1;
-  char *           pReserve2;
-  char *           schema;
-  // SSchema    schema[];
-} STabObj;
-
-typedef struct _vg_obj {
-  uint32_t        vgId;
-  char            dbName[TSDB_DB_NAME_LEN];
-  int64_t         createdTime;
-  uint64_t        lastCreate;
-  uint64_t        lastRemove;
-  int32_t         numOfVnodes;
-  SVnodeGid       vnodeGid[TSDB_VNODES_SUPPORT];
-  int32_t         numOfMeters;
-  int32_t         lbIp;
-  int32_t         lbTime;
-  int8_t          lbStatus;
-  char            reserved[16];
-  char            updateEnd[1];
-  struct _vg_obj *prev, *next;
-  void *          idPool;
-  STabObj **      meterList;
-} SVgObj;
-
-typedef struct _db_obj {
-  /*
-   * this length will cause the storage structure to change, rollback
-   */
-  char    name[TSDB_DB_NAME_LEN + 1];
-  int64_t createdTime;
-  SDbCfg  cfg;
-  int32_t numOfVgroups;
-  int32_t numOfTables;
-  int32_t numOfMetrics;
-  uint8_t vgStatus;
-  uint8_t dropStatus;
-  char    reserved[16];
-  char    updateEnd[1];
-
-  STabObj *       pMetric;
-  struct _db_obj *prev, *next;
-  SVgObj *        pHead;  // empty vgroup first
-  SVgObj *        pTail;  // empty vgroup end
-  void *          vgTimer;
-} SDbObj;
-
-typedef struct _user_obj {
-  char              user[TSDB_USER_LEN + 1];
-  char              pass[TSDB_KEY_LEN];
-  char              acct[TSDB_USER_LEN];
-  int64_t           createdTime;
-  char              superAuth : 1;
-  char              writeAuth : 1;
-  char              reserved[16];
-  char              updateEnd[1];
-  struct _user_obj *prev, *next;
-} SUserObj;
-
-typedef struct {
-  int32_t numOfUsers;
-  int32_t numOfDbs;
-  int32_t numOfTimeSeries;
-  int32_t numOfPointsPerSecond;
-  int32_t numOfConns;
-  int32_t numOfQueries;
-  int32_t numOfStreams;
-  int64_t totalStorage;  // Total storage wrtten from this account
-  int64_t compStorage;   // Compressed storage on disk
-  int64_t queryTime;
-  int64_t totalPoints;
-  int64_t inblound;
-  int64_t outbound;
-  TSKEY   sKey;
-  char    accessState;  // Checked by mgmt heartbeat message
-} SAcctInfo;
-
-typedef struct {
-  char      user[TSDB_USER_LEN + 1];
-  char      pass[TSDB_KEY_LEN];
-  SAcctCfg  cfg;
-  int32_t   acctId;
-  int64_t   createdTime;
-  char      reserved[15];
-  char      updateEnd[1];
-  SAcctInfo acctInfo;
-
-  SDbObj *         pHead;
-  SUserObj *       pUser;
-  struct _connObj *pConn;
-  pthread_mutex_t  mutex;
-} SAcctObj;
-
-typedef struct _connObj {
-  SAcctObj *       pAcct;
-  SDbObj *         pDb;
-  SUserObj *       pUser;
-  char             user[TSDB_USER_LEN];
-  uint64_t         stime;               // login time
-  char             superAuth : 1;       // super user flag
-  char             writeAuth : 1;       // write flag
-  char             killConnection : 1;  // kill the connection flag
-  uint8_t          usePublicIp : 1;     // if the connection request is publicIp
-  uint8_t          reserved : 4;
-  uint32_t         queryId;             // query ID to be killed
-  uint32_t         streamId;            // stream ID to be killed
-  uint32_t         ip;                  // shell IP
-  uint16_t         port;                // shell port
-  void *           thandle;
-  SQList *         pQList;  // query list
-  SSList *         pSList;  // stream list
-  uint64_t         qhandle;
-  struct _connObj *prev, *next;
-} SConnObj;
-
-typedef struct {
-  char spi;
-  char encrypt;
-  char secret[TSDB_KEY_LEN];
-  char cipheringKey[TSDB_KEY_LEN];
-} SSecInfo;
-
-typedef struct {
-  char     type;
-  void *   pNode;
-  short    numOfColumns;
-  int      rowSize;
-  int      numOfRows;
-  int      numOfReads;
-  short    offset[TSDB_MAX_COLUMNS];
-  short    bytes[TSDB_MAX_COLUMNS];
-  void *   signature;
-  uint16_t payloadLen; /* length of payload*/
-  char     payload[];  /* payload for wildcard match in show tables */
-} SShowObj;
-
-extern SAcctObj  acctObj;
-extern SDnodeObj dnodeObj;
-
-// dnodeInt API
-int  mgmtInitDnodeInt();
-void mgmtCleanUpDnodeInt();
-int mgmtSendCreateMsgToVgroup(STabObj *pMeter, SVgObj *pVgroup);
-int mgmtSendRemoveMeterMsgToDnode(STabObj *pMeter, SVgObj *pVgroup);
-int mgmtSendVPeersMsg(SVgObj *pVgroup);
-int mgmtSendFreeVnodeMsg(SVgObj *pVgroup);
-int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid);
-
-// shell API
-int  mgmtInitShell();
-void mgmtCleanUpShell();
-int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey);
-
-// acct API
-int       mgmtInitAccts();
-SAcctObj *mgmtGetAcct(char *name);
-int mgmtCreateAcct(char *name, char *pass, SAcctCfg *pCfg);
-int mgmtUpdateAcct(SAcctObj *pAcct);
-int mgmtDropAcct(char *name);
-int mgmtAddDbIntoAcct(SAcctObj *pAcct, SDbObj *pDb);
-int mgmtRemoveDbFromAcct(SAcctObj *pAcct, SDbObj *pDb);
-int mgmtAddUserIntoAcct(SAcctObj *pAcct, SUserObj *pUser);
-int mgmtRemoveUserFromAcct(SAcctObj *pAcct, SUserObj *pUser);
-int mgmtAddConnIntoAcct(SConnObj *pConn);
-int mgmtRemoveConnFromAcct(SConnObj *pConn);
-int mgmtGetAcctMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveAccts(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void mgmtCheckAcct();
-void mgmtCleanUpAccts();
-int  mgmtAlterAcct(char *name, char *pass, SAcctCfg *pCfg);
-int64_t mgmtGetAcctStatistic(SAcctObj *pAcct);
-
-// user API
-int       mgmtInitUsers();
-SUserObj *mgmtGetUser(char *name);
-int mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass);
-int mgmtDropUser(SAcctObj *pAcct, char *name);
-int mgmtUpdateUser(SUserObj *pUser);
-int mgmtGetUserMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveUsers(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void mgmtCleanUpUsers();
-
-// metric API
-int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pMeter);
-int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pMeter);
-int mgmtGetMetricMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveMetrics(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-// DB API
-int mgmtInitDbs();
-int mgmtUpdateDb(SDbObj *pDb);
-SDbObj *mgmtGetDb(char *db);
-SDbObj *mgmtGetDbByMeterId(char *db);
-int mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate);
-int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists);
-int mgmtDropDb(SDbObj *pDb);
-/* void    mgmtMonitorDbDrop(void *unused); */
-void mgmtMonitorDbDrop(void *unused, void *unusedt);
-int mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter);
-int mgmtUseDb(SConnObj *pConn, char *name);
-int mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtRemoveVgroupFromDb(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtAddMetricIntoDb(SDbObj *pDb, STabObj *pMetric);
-int mgmtRemoveMetricFromDb(SDbObj *pDb, STabObj *pMetric);
-int mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtGetDbMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveDbs(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void mgmtCleanUpDbs();
-
-// vGroup API
-int     mgmtInitVgroups();
-SVgObj *mgmtGetVgroup(int vgId);
-SVgObj *mgmtCreateVgroup(SDbObj *pDb);
-int  mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup);
-void mgmtSetVgroupIdPool();
-int  mgmtGetVgroupMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int  mgmtRetrieveVgroups(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void mgmtCleanUpVgroups();
-
-// meter API
-int      mgmtInitMeters();
-STabObj *mgmtGetMeter(char *meterId);
-STabObj *mgmtGetMeterInfo(char *src, char *tags[]);
-int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pInfo);
-int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate);
-int mgmtDropMeter(SDbObj *pDb, char *meterId, int ignore);
-int mgmtAlterMeter(SDbObj *pDb, SAlterTableMsg *pAlter);
-int mgmtGetMeterMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveMeters(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void     mgmtCleanUpMeters();
-SSchema *mgmtGetMeterSchema(STabObj *pMeter);  // get schema for a meter
-
-bool mgmtMeterCreateFromMetric(STabObj *pMeterObj);
-bool mgmtIsMetric(STabObj *pMeterObj);
-bool mgmtIsNormalMeter(STabObj *pMeterObj);
-
-// grant API
-void grantActiveSystem(const char* cfgFile);
-void grantSendMsgToMgmt();
-void grantReset();
-void grantUpdate(void *pGrant);
-bool grantCheckExpired();
-void grantRestoreTimeSeries(uint32_t timeseries);
-void grantAddTimeSeries(uint32_t timeseries);
-int  grantCheckTimeSeries(uint32_t timeseries);
-void grantResetCurStorage(uint64_t totalStorage);
-int grantCheckStorage();
-int grantCheckDatabases();
-int grantCheckUsers();
-int grantCheckAccts();
-int grantCheckDnodes();
-int grantCheckConns();
-int grantCheckStreams();
-int grantCheckCpuCores();
-int grantCheckQueryTime();
-
-// dnode API
-int        mgmtInitDnodes();
-SDnodeObj *mgmtGetDnode(uint32_t ip);
-int mgmtCreateDnode(uint32_t ip);
-int mgmtDropDnode(SDnodeObj *pDnode);
-int mgmtDropDnodeByIp(uint32_t ip);
-int mgmtUpdateDnode(SDnodeObj *pDnode);
-int mgmtGetNextVnode(SVnodeGid *pVnodeGid);
-void mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int numOfVnodes, int vgId);
-void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int numOfVnodes);
-int  mgmtGetDnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int  mgmtRetrieveDnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-void mgmtCleanUpDnodes();
-int  mgmtSendCfgDnodeMsg(char *cont);
-void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode);
-
-int mgmtGetMnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveMnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtGetModuleMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveModules(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtGetConfigMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveConfigs(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtGetConnsMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveConns(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtGetScoresMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int mgmtRetrieveScores(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int grantGetGrantsMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int grantRetrieveGrants(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int  mgmtGetVnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-int  mgmtRetrieveVnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-// dnode balance api
-int  mgmtInitBalance();
-void mgmtCleanupBalance();
-int  mgmtAllocVnodes(SVgObj *pVgroup);
-int  mgmtSetDnodeShellRemoving(SDnodeObj *pDnode);
-void mgmtSetDnodeUnRemove(SDnodeObj *pDnode);
-void mgmtStartBalanceTimer(int64_t mseconds);
-void mgmtSetDnodeOfflineOnSdbChanged();
-void mgmtUpdateVgroupState(SVgObj *pVgroup, int lbStatus, int srcIp);
-bool mgmtAddVnode(SVgObj *pVgroup, SDnodeObj *pSrcDnode, SDnodeObj *pDestDnode);
-
-void mgmtSetModuleInDnode(SDnodeObj *pDnode, int moduleType);
-int mgmtUnSetModuleInDnode(SDnodeObj *pDnode, int moduleType);
-
-extern int (*mgmtGetMetaFp[])(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-extern int (*mgmtRetrieveFp[])(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-extern int tsDnodeUpdateSize;
-extern int tsVgUpdateSize;
-extern int tsDbUpdateSize;
-extern int tsUserUpdateSize;
-extern int tsAcctUpdateSize;
-extern int tsMnodeUpdateSize;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_MGMT_H
diff --git a/src/system/detail/inc/mgmtBalance.h b/src/system/detail/inc/mgmtBalance.h
deleted file mode 100644
index a97e7948940f7c5c9ddb2dae8370af84a82c0f34..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/mgmtBalance.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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_MGMTBALANCE_H
-#define TDENGINE_MGMTBALANCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "tglobalcfg.h"
-#include "vnodeStatus.h"
-#include "ttime.h"
-
-void mgmtCreateDnodeOrderList();
-
-void mgmtReleaseDnodeOrderList();
-
-void mgmtMakeDnodeOrderList();
-
-void mgmtCalcSystemScore();
-
-float mgmtTryCalcDnodeScore(SDnodeObj *pDnode, int extraVnode);
-
-bool mgmtCheckDnodeInOfflineState(SDnodeObj *pDnode);
-
-bool mgmtCheckDnodeInRemoveState(SDnodeObj *pDnode);
-
-bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType);
-
-void mgmtMonitorDnodeModule();
-
-void mgmtSetModuleInDnode(SDnodeObj *pDnode, int moduleType);
-
-int mgmtUnSetModuleInDnode(SDnodeObj *pDnode, int moduleType);
-
-void mgmtMonitorVgroups();
-
-void mgmtMonitorDnodes();
-
-void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode);
-
-extern void *      dnodeSdb;
-extern void *      vgSdb;
-extern void *      balanceTimer;
-extern int         mgmtOrderedDnodesSize;
-extern int         mgmtOrderedDnodesMallocSize;
-extern SDnodeObj **mgmtOrderedDnodes;
-extern uint32_t    mgmtAccessSquence;
-extern SMgmtIpList mgmtIpList;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_MGMTBALANCE_H
diff --git a/src/system/detail/inc/mgmtProfile.h b/src/system/detail/inc/mgmtProfile.h
deleted file mode 100644
index 38732c47930a8c4d4ab5a573e96dcd3380fba560..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/mgmtProfile.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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_MGMTPROFILE_H
-#define TDENGINE_MGMTPROFILE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "mgmt.h"
-
-int mgmtGetQueryMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-
-int mgmtGetStreamMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
-
-int mgmtRetrieveQueries(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtRetrieveStreams(SShowObj *pShow, char *data, int rows, SConnObj *pConn);
-
-int mgmtSaveQueryStreamList(char *cont, int contLen, SConnObj *pConn);
-
-int mgmtKillQuery(char *qidstr, SConnObj *pConn);
-
-int mgmtKillStream(char *qidstr, SConnObj *pConn);
-
-int mgmtKillConnection(char *qidstr, SConnObj *pConn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_MGMTPROFILE_H
diff --git a/src/system/detail/inc/mgmtSystem.h b/src/system/detail/inc/mgmtSystem.h
deleted file mode 100644
index 44bb0331e1908ecd49b973b4ea0297d07f261cc0..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/mgmtSystem.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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_MGMTSYSTEM_H
-#define TDENGINE_MGMTSYSTEM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int  mgmtInitRedirect();
-
-void mgmtCleanUpRedirect();
-
-void*mgmtRedirectAllMsgs(char *msg, void *ahandle, void *thandle);
-
-void mgmtSdbWorkAsMasterCallback();
-
-void mgmtSetDnodeOfflineOnSdbChanged();
-
-void mgmtPrintSystemInfo();
-
-int  mgmtInitSystem();
-
-int  mgmtStartCheckMgmtRunning();
-
-void mgmtDoStatistic(void *handle, void *tmrId);
-
-void mgmtStartMgmtTimer();
-
-void mgmtStopSystem();
-
-void mgmtCleanUpSystem();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_MGMTSYSTEM_H
diff --git a/src/system/detail/inc/mgmtUtil.h b/src/system/detail/inc/mgmtUtil.h
deleted file mode 100644
index 1f70485894e7e245193b9e432b9e40b126cdb1e6..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/mgmtUtil.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "tast.h"
-
-#ifndef TBASE_MGMTUTIL_H
-#define TBASE_MGMTUTIL_H
-
-typedef struct SSyntaxTreeFilterSupporter {
-  SSchema* pTagSchema;
-  int32_t  numOfTags;
-  int32_t  optr;
-} SSyntaxTreeFilterSupporter;
-
-char*   mgmtMeterGetTag(STabObj* pMeter, int32_t col, SSchema* pTagColSchema);
-int32_t mgmtFindTagCol(STabObj * pMetric, const char * tagName);
-
-int32_t mgmtGetTagsLength(STabObj* pMetric, int32_t col);
-bool mgmtCheckIsMonitorDB(char *db, char *monitordb);
-int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate);
-
-int32_t mgmtRetrieveMetersFromMetric(SMetricMetaMsg* pInfo, int32_t tableIndex, tQueryResultset* pRes);
-int32_t mgmtDoJoin(SMetricMetaMsg* pMetricMetaMsg, tQueryResultset* pRes);
-void mgmtReorganizeMetersInMetricMeta(SMetricMetaMsg* pInfo, int32_t index, tQueryResultset* pRes);
-
-bool tSkipListNodeFilterCallback(const void *pNode, void *param);
-
-#endif //TBASE_MGMTUTIL_H
diff --git a/src/system/detail/inc/vnode.h b/src/system/detail/inc/vnode.h
deleted file mode 100644
index 60449de9f5467ed6341215733156d1d8de3fb4d1..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnode.h
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * 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_VNODE_H
-#define TDENGINE_VNODE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-#include "tglobalcfg.h"
-#include "tidpool.h"
-#include "tlog.h"
-#include "tmempool.h"
-#include "trpc.h"
-#include "tsclient.h"
-#include "tsdb.h"
-#include "tsocket.h"
-#include "ttime.h"
-#include "ttimer.h"
-#include "tutil.h"
-#include "vnodeCache.h"
-#include "vnodeFile.h"
-#include "vnodePeer.h"
-#include "vnodeShell.h"
-
-#define TSDB_FILE_HEADER_LEN          512
-#define TSDB_FILE_HEADER_VERSION_SIZE 32
-#define TSDB_CACHE_POS_BITS           13
-#define TSDB_CACHE_POS_MASK           0x1FFF
-
-#define TSDB_ACTION_INSERT 0
-#define TSDB_ACTION_IMPORT 1
-#define TSDB_ACTION_DELETE 2
-#define TSDB_ACTION_UPDATE 3
-#define TSDB_ACTION_MAX    4
-
-enum _data_source {
-  TSDB_DATA_SOURCE_METER,
-  TSDB_DATA_SOURCE_VNODE,
-  TSDB_DATA_SOURCE_SHELL,
-  TSDB_DATA_SOURCE_QUEUE,
-  TSDB_DATA_SOURCE_LOG,
-};
-
-enum _sync_cmd {
-  TSDB_SYNC_CMD_FILE,
-  TSDB_SYNC_CMD_CACHE,
-  TSDB_SYNC_CMD_CREATE,
-  TSDB_SYNC_CMD_REMOVE,
-};
-
-typedef struct {
-  int64_t offset : 48;
-  int64_t length : 16;
-} SMeterObjHeader;
-
-typedef struct {
-  int64_t len;
-  char    data[];
-} SData;
-
-#pragma pack(push, 8)
-typedef struct {
-  SVnodeStatisticInfo vnodeStatistic;
-  int                 vnode;
-  SVnodeCfg           cfg;
-  // SDiskDesc   tierDisk[TSDB_MAX_TIER];
-  SVPeerDesc          vpeers[TSDB_VNODES_SUPPORT];
-  SVnodePeer *        peerInfo[TSDB_VNODES_SUPPORT];
-  char                selfIndex;
-  char                vnodeStatus;
-  char                accessState;  // Vnode access state, Readable/Writable
-  char                syncStatus;
-  char                commitInProcess;
-  pthread_t           commitThread;
-  TSKEY               firstKey;  // minimum key uncommitted, it may be smaller than
-  // commitFirstKey
-  TSKEY commitFirstKey;  // minimum key for a commit file, it shall be
-  // xxxx00000, calculated from fileId
-  TSKEY commitLastKey;  // maximum key for a commit file, it shall be xxxx99999,
-  // calculated fromm fileId
-  int   commitFileId;
-  TSKEY lastCreate;
-  TSKEY lastRemove;
-  TSKEY lastKey;  // last key for the whole vnode, updated by every insert
-  // operation
-  uint64_t version;
-
-  int   streamRole;
-  int   numOfStreams;
-  void *streamTimer;
-
-  TSKEY           lastKeyOnFile;  // maximum key on the last file, is shall be xxxx99999
-  int             fileId;
-  int             badFileId;
-  int             numOfFiles;
-  int             maxFiles;
-  int             maxFile1;
-  int             maxFile2;
-  int             nfd;  // temp head file FD
-  int             hfd;  // head file FD
-  int             lfd;  // last file FD
-  int             tfd;  // temp last file FD
-  int             dfd;  // data file FD
-  int64_t         dfSize;
-  int64_t         lfSize;
-  uint64_t *      fmagic;  // hold magic number for each file
-  char            cfn[TSDB_FILENAME_LEN];
-  char            nfn[TSDB_FILENAME_LEN];
-  char            lfn[TSDB_FILENAME_LEN];  // last file name
-  char            tfn[TSDB_FILENAME_LEN];  // temp last file name
-  pthread_mutex_t vmutex;
-
-  int             logFd;
-  char *          pMem;
-  char *          pWrite;
-  pthread_mutex_t logMutex;
-  char            logFn[TSDB_FILENAME_LEN];
-  char            logOFn[TSDB_FILENAME_LEN];
-  int64_t         mappingSize;
-  int64_t         mappingThreshold;
-
-  void *         commitTimer;
-  void **        meterList;
-  void *         pCachePool;
-  void *         pQueue;
-  pthread_t      thread;
-  int            peersOnline;
-  int            shellConns;
-  int            meterConns;
-  struct _qinfo *pQInfoList;
-
-  TAOS *           dbConn;
-  SMeterObjHeader *meterIndex;
-} SVnodeObj;
-#pragma pack(pop)
-
-typedef struct SColumn {
-  short colId;
-  short bytes;
-  char  type;
-} SColumn;
-
-typedef struct _meter_obj {
-  uint64_t uid;
-  char     meterId[TSDB_METER_ID_LEN];
-  int      sid;
-  short    vnode;
-  short    numOfColumns;
-  short    bytesPerPoint;
-  short    maxBytes;
-  int32_t  pointsPerBlock;
-  int32_t  pointsPerFileBlock;
-  int      freePoints;
-  TSKEY    lastKey;        // updated by insert operation
-  TSKEY    lastKeyOnFile;  // last key on file, updated by commit action
-  TSKEY    timeStamp;      // delete or added time
-  uint64_t commitCount;
-  int32_t  sversion;
-  short    sqlLen;
-  char     searchAlgorithm : 4;
-  char     compAlgorithm : 4;
-  char     status;  // 0: ok, 1: stop stream computing
-
-  char     reserved[16];
-  int      state;
-  int      numOfQueries;
-  char *   pSql;
-  void *   pStream;
-  void *   pCache;
-  SColumn *schema;
-} SMeterObj;
-
-typedef struct {
-  char     type;
-  char     pversion;  // protocol version
-  char     action;    // insert, import, delete, update
-  int32_t  sversion;  // only for insert
-  int32_t  sid;
-  int32_t  len;
-  uint64_t lastVersion;  // latest version
-  char     cont[];
-} SVMsgHeader;
-
-struct tSQLBinaryExpr;
-
-typedef struct SColumnInfoEx {
-  SColumnInfo data;
-  int16_t     colIdx;
-  int16_t     colIdxInBuf;
-
-  /*
-   * 0: denotes if its is required in the first round of scan of data block
-   * 1: denotes if its is required in the secondary scan
-   */
-  int16_t req[2];
-} SColumnInfoEx;
-
-struct SColumnFilterElem;
-
-typedef bool (*__filter_func_t)(struct SColumnFilterElem *pFilter, char *val1, char *val2);
-
-typedef struct SColumnFilterElem {
-  int16_t           bytes;  // column length
-  __filter_func_t   fp;
-  SColumnFilterInfo filterInfo;
-} SColumnFilterElem;
-
-typedef struct SSingleColumnFilterInfo {
-  SColumnInfoEx      info;
-  int32_t            numOfFilters;
-  SColumnFilterElem *pFilters;
-  char *             pData;
-} SSingleColumnFilterInfo;
-
-typedef struct SQuery {
-  short       numOfCols;
-  SOrderVal   order;
-  char        keyIsMet;  // if key is met, it will be set
-  char        over;
-  int         fileId;  // only for query in file
-  int         hfd;     // only for query in file, head file handle
-  int         dfd;     // only for query in file, data file handle
-  int         lfd;     // only for query in file, last file handle
-  SCompBlock *pBlock;  // only for query in file
-  SField **   pFields;
-  
-  int         numOfBlocks;      // only for query in file
-  int         blockBufferSize;  // length of pBlock buffer
-  int         currentSlot;
-  int         firstSlot;
-  
-  /*
-   * the two parameters are utilized to handle the data missing situation, caused by import operation.
-   * When the commit slot is the first slot, and commitPoints != 0
-   */
-  int32_t     commitSlot;   // which slot is committed,
-  int32_t     commitPoint;  // starting point for next commit
-  
-  int         slot;
-  int         pos;
-  TSKEY       key;
-  int         compBlockLen;  // only for import
-  int64_t     blockId;
-  TSKEY       skey;
-  TSKEY       ekey;
-  int64_t     nAggTimeInterval;
-  int64_t     slidingTime;       // sliding time for sliding window query
-  char        intervalTimeUnit;  // interval data type, used for daytime revise
-  int8_t      precision;
-  int16_t     numOfOutputCols;
-  int16_t     interpoType;
-  int16_t     checkBufferInLoop;  // check if the buffer is full during scan each block
-  SLimitVal   limit;
-  int32_t     rowSize;
-
-  SSqlGroupbyExpr *        pGroupbyExpr;
-  SSqlFunctionExpr *       pSelectExpr;
-  SColumnInfoEx *          colList;
-  int32_t                  numOfFilterCols;
-  SSingleColumnFilterInfo *pFilterInfo;
-  int64_t *                defaultVal;
-  TSKEY                    lastKey;
-
-  // buffer info
-  int64_t pointsRead;    // the number of points returned
-  int64_t pointsToRead;  // maximum number of points to read
-  int64_t pointsOffset;  // the number of points offset to save read data
-  SData **sdata;
-  SData * tsData;  // timestamp column/primary key column
-} SQuery;
-
-typedef struct {
-  char spi;
-  char encrypt;
-  char secret[TSDB_KEY_LEN];
-  char cipheringKey[TSDB_KEY_LEN];
-} SConnSec;
-
-typedef struct {
-  char *          buffer;
-  char *          offset;
-  int             trans;
-  int             bufferSize;
-  pthread_mutex_t qmutex;
-} STranQueue;
-
-// internal globals
-extern int        tsMeterSizeOnFile;
-extern uint32_t   tsRebootTime;
-extern void **    rpcQhandle;
-extern void *     dmQhandle;
-extern void *     queryQhandle;
-extern int        tsVnodePeers;
-extern int        tsMaxVnode;
-extern int        tsMaxQueues;
-extern int        tsOpenVnodes;
-extern SVnodeObj *vnodeList;
-extern void *     vnodeTmrCtrl;
-
-// read API
-extern int (*vnodeSearchKeyFunc[])(char *pValue, int num, TSKEY key, int order);
-
-void *vnodeQueryOnSingleTable(SMeterObj **pMeterObj, SSqlGroupbyExpr *pGroupbyExpr, SSqlFunctionExpr *sqlExprs,
-                            SQueryMeterMsg *pQueryMsg, int *code);
-
-void *vnodeQueryOnMultiMeters(SMeterObj **pMeterObj, SSqlGroupbyExpr *pGroupbyExpr, SSqlFunctionExpr *pSqlExprs,
-                              SQueryMeterMsg *pQueryMsg, int *code);
-
-// assistant/tool functions
-SSqlGroupbyExpr *vnodeCreateGroupbyExpr(SQueryMeterMsg *pQuery, int32_t *code);
-
-SSqlFunctionExpr *vnodeCreateSqlFunctionExpr(SQueryMeterMsg *pQuery, int32_t *code);
-bool vnodeValidateExprColumnInfo(SQueryMeterMsg *pQueryMsg, SSqlFuncExprMsg *pExprMsg);
-
-bool vnodeIsValidVnodeCfg(SVnodeCfg *pCfg);
-
-int32_t vnodeGetResultSize(void *handle, int32_t *numOfRows);
-
-int32_t vnodeCopyQueryResultToMsg(void *handle, char *data, int32_t numOfRows);
-
-int64_t vnodeGetOffsetVal(void *thandle);
-
-bool vnodeHasRemainResults(void *handle);
-
-int vnodeRetrieveQueryResult(void *handle, int *pNum, char *argv[]);
-
-int vnodeSaveQueryResult(void *handle, char *data, int32_t* size);
-
-int vnodeRetrieveQueryInfo(void *handle, int *numOfRows, int *rowSize, int16_t *timePrec);
-
-void vnodeFreeQInfo(void *, bool);
-
-void vnodeFreeQInfoInQueue(void *param);
-
-bool vnodeIsQInfoValid(void *param);
-void vnodeDecRefCount(void *param);
-void vnodeAddRefCount(void *param);
-
-int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQuery);
-
-void vnodeQueryData(SSchedMsg *pMsg);
-
-// meter API
-int vnodeOpenMetersVnode(int vnode);
-
-void vnodeCloseMetersVnode(int vnode);
-
-int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec);
-
-int vnodeRemoveMeterObj(int vnode, int sid);
-
-int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, void *, int sversion, int *numOfPoints, TSKEY now);
-
-int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, void *, int sversion, int *numOfPoints, TSKEY now);
-
-int vnodeInsertBufferedPoints(int vnode);
-
-int vnodeSaveAllMeterObjToFile(int vnode);
-
-int vnodeSaveMeterObjToFile(SMeterObj *pObj);
-
-int vnodeSaveVnodeCfg(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc);
-
-int vnodeSaveVnodeInfo(int vnode);
-
-// cache API
-void *vnodeOpenCachePool(int vnode);
-
-void vnodeCloseCachePool(int vnode);
-
-void *vnodeAllocateCacheInfo(SMeterObj *pObj);
-
-void vnodeFreeCacheInfo(SMeterObj *pObj);
-
-void vnodeSetCommitQuery(SMeterObj *pObj, SQuery *pQuery);
-
-int vnodeInsertPointToCache(SMeterObj *pObj, char *pData);
-
-int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery);
-
-uint64_t vnodeGetPoolCount(SVnodeObj *pVnode);
-
-void vnodeUpdateCommitInfo(SMeterObj *pObj, int slot, int pos, uint64_t count);
-
-void vnodeCommitOver(SVnodeObj *pVnode);
-
-TSKEY vnodeGetFirstKey(int vnode);
-
-int vnodeSyncRetrieveCache(int vnode, int fd);
-
-int vnodeSyncRestoreCache(int vnode, int fd);
-
-pthread_t vnodeCreateCommitThread(SVnodeObj *pVnode);
-
-void vnodeCancelCommit(SVnodeObj *pVnode);
-
-void vnodeCloseStream(SVnodeObj *pVnode);
-
-void vnodeProcessCommitTimer(void *param, void *tmrId);
-
-void vnodeSearchPointInCache(SMeterObj *pObj, SQuery *pQuery);
-
-int vnodeAllocateCacheBlock(SMeterObj *pObj);
-
-int vnodeFreeCacheBlock(SCacheBlock *pCacheBlock);
-
-int vnodeIsCacheCommitted(SMeterObj *pObj);
-
-// file API
-int vnodeInitFile(int vnode);
-
-int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery);
-
-void *vnodeCommitToFile(void *param);
-
-void *vnodeCommitMultiToFile(SVnodeObj *pVnode, int ssid, int esid);
-
-int vnodeSyncRetrieveFile(int vnode, int fd, uint32_t fileId, uint64_t *fmagic);
-
-int vnodeSyncRestoreFile(int vnode, int sfd);
-
-int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pBlock, SData *data[], SData *cdata[], int pointsRead);
-
-int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery);
-
-int vnodeReadCompBlockToMem(SMeterObj *pObj, SQuery *pQuery, SData *sdata[]);
-
-int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast);
-
-void vnodeCloseCommitFiles(SVnodeObj *pVnode);
-
-int vnodeReadLastBlockToMem(SMeterObj *pObj, SCompBlock *pBlock, SData *sdata[]);
-
-// vnode API
-void vnodeUpdateStreamRole(SVnodeObj *pVnode);
-
-int vnodeInitPeer(int numOfThreads);
-
-void vnodeCleanUpPeer();
-
-int vnodeOpenPeerVnode(int vnode);
-
-void vnodeClosePeerVnode(int vnode);
-
-void *vnodeGetMeterPeerConnection(SMeterObj *pObj, int index);
-
-int vnodeForwardToPeer(SMeterObj *pObj, char *msg, int msgLen, char action, int sversion);
-
-void vnodeCloseAllSyncFds(int vnode);
-
-void vnodeConfigVPeers(int vnode, int numOfPeers, SVPeerDesc peerDesc[]);
-
-void vnodeStartSyncProcess(SVnodeObj *pVnode);
-
-void vnodeCancelSync(int vnode);
-
-void vnodeListPeerStatus(char *buffer);
-
-void vnodeCheckOwnStatus(SVnodeObj *pVnode);
-
-int vnodeSaveMeterObjToFile(SMeterObj *pObj);
-
-int vnodeRecoverFromPeer(SVnodeObj *pVnode, int fileId);
-
-// vnodes API
-int vnodeInitVnodes();
-
-int vnodeInitStore();
-
-void vnodeCleanUpVnodes();
-
-int vnodeRemoveVnode(int vnode);
-
-int vnodeCreateVnode(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc);
-
-void vnodeOpenStreams(void *param, void *tmrId);
-
-void vnodeCreateStream(SMeterObj *pObj);
-
-void vnodeRemoveStream(SMeterObj *pObj);
-
-// shell API
-int vnodeInitShell();
-
-void vnodeCleanUpShell();
-
-int vnodeOpenShellVnode(int vnode);
-
-void vnodeCloseShellVnode(int vnode);
-
-// memter mgmt
-int  vnodeInitMeterMgmt();
-
-void vnodeCleanUpMeterMgmt();
-
-int  vnodeOpenMeterMgmtVnode(int vnode);
-
-int  vnodeOpenMeterMgmtStoreVnode(int vnode);
-
-void vnodeCloseMeterMgmtVnode(int vnode);
-
-int  vnodeCreateMeterMgmt(SMeterObj *pObj, SConnSec *pSec);
-
-void vnodeRemoveMeterMgmt(SMeterObj *pObj);
-
-SConnSec *vnodeGetMeterSec(int vnode, int sid);
-
-int  vnodeCreateMeterObjFile(int vnode);
-
-// mgmt
-int vnodeInitMgmt();
-
-void vnodeCleanUpMgmt();
-
-int vnodeRetrieveMissedCreateMsg(int vnode, int fd, uint64_t stime);
-
-int vnodeRestoreMissedCreateMsg(int vnode, int fd);
-
-int vnodeRetrieveMissedRemoveMsg(int vid, int fd, uint64_t stime);
-
-int vnodeRestoreMissedRemoveMsg(int vnode, int fd);
-
-int vnodeProcessBufferedCreateMsgs(int vnode);
-
-void vnodeSendVpeerCfgMsg(int vnode);
-
-int vnodeSendMeterCfgMsg(int vnode, int sid);
-
-int vnodeMgmtConns();
-
-void vnodeRemoveFile(int vnode, int fileId);
-
-// commit
-int vnodeInitCommit(int vnode);
-
-void vnodeCleanUpCommit(int vnode);
-
-int vnodeRenewCommitLog(int vnode);
-
-void vnodeRemoveCommitLog(int vnode);
-
-int vnodeWriteToCommitLog(SMeterObj *pObj, char action, char *cont, int contLen, int sversion);
-
-extern int (*vnodeProcessAction[])(SMeterObj *, char *, int, char, void *, int, int *, TSKEY);
-
-extern int (*pCompFunc[])(const char *const input, int inputSize, const int elements, char *const output,
-                          int outputSize, char algorithm, char *const buffer, int bufferSize);
-
-extern int (*pDecompFunc[])(const char *const input, int compressedSize, const int elements, char *const output,
-                            int outputSize, char algorithm, char *const buffer, int bufferSize);
-
-// global variable and APIs provided by mgmt
-extern char          mgmtStatus;
-extern char          mgmtDirectory[];
-extern const int16_t vnodeFileVersion;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODE_H
diff --git a/src/system/detail/inc/vnodeCache.h b/src/system/detail/inc/vnodeCache.h
deleted file mode 100644
index 8fb6d156479ff8a5ed94e6324d3a259ec65eb100..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeCache.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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_VNODECACHE_H
-#define TDENGINE_VNODECACHE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-  short              notFree;
-  short              numOfPoints;
-  int                slot;
-  int                index;
-  int64_t            blockId;
-  struct _meter_obj *pMeterObj;
-  char *             offset[];
-} SCacheBlock;
-
-typedef struct {
-  int64_t       blocks;
-  int           maxBlocks;
-  int           numOfBlocks;
-  int           unCommittedBlocks;
-  int32_t       currentSlot;
-  int32_t       commitSlot;   // which slot is committed
-  int32_t       commitPoint;  // starting point for next commit
-  SCacheBlock **cacheBlocks;  // cache block list, circular list
-} SCacheInfo;
-
-typedef struct {
-  int             vnode;
-  char **         pMem;
-  int64_t         freeSlot;
-  pthread_mutex_t vmutex;
-  uint64_t        count;  // kind of transcation ID
-  int64_t         notFreeSlots;
-  int64_t         threshold;
-  char            commitInProcess;
-  int             cacheBlockSize;
-  int             cacheNumOfBlocks;
-} SCachePool;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODECACHE_H
diff --git a/src/system/detail/inc/vnodeDataFilterFunc.h b/src/system/detail/inc/vnodeDataFilterFunc.h
deleted file mode 100644
index c2cd06597a37cb85309eda7fd4008ef176309cb0..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeDataFilterFunc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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_VNODEDATAFILTERFUNC_H
-#define TDENGINE_VNODEDATAFILTERFUNC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vnode.h"
-
-__filter_func_t *vnodeGetRangeFilterFuncArray(int32_t type);
-
-__filter_func_t *vnodeGetValueFilterFuncArray(int32_t type);
-
-bool vnodeSupportPrefilter(int32_t type);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEDATAFILTERFUNC_H
diff --git a/src/system/detail/inc/vnodeFile.h b/src/system/detail/inc/vnodeFile.h
deleted file mode 100644
index 3202f80ed6ef964f013bea24651df19f112e2ec7..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeFile.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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_VNODEFILE_H
-#define TDENGINE_VNODEFILE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "tchecksum.h"
-
-#define TSDB_VNODE_DELIMITER 0xF00AFA0F
-
-typedef struct { int64_t compInfoOffset; } SCompHeader;
-
-typedef struct {
-  short   colId;
-  short   bytes;
-  int32_t numOfNullPoints;
-  int32_t type : 8;
-  int32_t offset : 24;
-  int32_t len;  // data length
-  int64_t sum;
-  int64_t max;
-  int64_t min;
-  int16_t maxIndex;
-  int16_t minIndex;
-  char    reserved[20];
-} SField;
-
-typedef struct {
-  int64_t  last : 1;
-  int64_t  offset : 63;
-  int32_t  algorithm : 8;     // compression algorithm can be changed
-  int32_t  numOfPoints : 24;  // how many points have been written into this block
-  int32_t  sversion;
-  int32_t  len;  // total length of this data block
-  uint16_t numOfCols;
-  char     reserved[16];
-  TSKEY    keyFirst;  // time stamp for the first point
-  TSKEY    keyLast;   // time stamp for the last point
-} SCompBlock;
-
-typedef struct {
-  SCompBlock *compBlock;
-  SField *    fields;
-} SCompBlockFields;
-
-typedef struct {
-  uint64_t   uid;
-  int64_t    last : 1;
-  int64_t    numOfBlocks : 62;
-  uint32_t   delimiter;  // delimiter for recovery
-  TSCKSUM    checksum;
-  SCompBlock compBlocks[];  // comp block list
-} SCompInfo;
-
-typedef struct {
-  int64_t    tempHeadOffset;
-  int64_t    compInfoOffset;
-  int64_t    oldCompBlockOffset;
-
-  int64_t    oldNumOfBlocks;
-  int64_t    newNumOfBlocks;
-  int64_t    finalNumOfBlocks;
-
-  int64_t    oldCompBlockLen;
-  int64_t    newCompBlockLen;
-  int64_t    finalCompBlockLen;
-
-  int64_t    committedPoints;
-  int        commitSlot;
-  int32_t    last : 1;
-  int32_t    changed : 1;
-  int32_t    commitPos : 30;
-  int64_t    commitCount;
-  SCompBlock lastBlock;
-} SMeterInfo;
-
-typedef struct { int64_t totalStorage; } SVnodeHeadInfo;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEFILE_H
diff --git a/src/system/detail/inc/vnodeMgmt.h b/src/system/detail/inc/vnodeMgmt.h
deleted file mode 100644
index 453795e0bd4126ee2df1d668cd6977a309e8861a..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeMgmt.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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_VNODEMGMT_H
-#define TDENGINE_VNODEMGMT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-  char  id[20];
-  char  sid;
-  void *thandle;
-  int   mgmtIndex;
-  char  status;  // 0:offline, 1:online
-} SMgmtObj;
-
-int vnodeProcessCreateMeterRequest(char *pMsg, int msgLen, SMgmtObj *pMgmtObj);
-int vnodeProcessRemoveMeterRequest(char *pMsg, int msgLen, SMgmtObj *pMgmtObj);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEMGMT_H
diff --git a/src/system/detail/inc/vnodePeer.h b/src/system/detail/inc/vnodePeer.h
deleted file mode 100644
index 4f17e66a70d8ffc0727021a17359e7f58161cff4..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodePeer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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_VNODEPEER_H
-#define TDENGINE_VNODEPEER_H
-
-#include "os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TSDB_VMSG_SYNC_DATA 1
-#define TSDB_VMSG_FORWARD 2
-#define TSDB_VMSG_SYNC_REQ 3
-#define TSDB_VMSG_SYNC_RSP 4
-#define TSDB_VMSG_SYNC_MUST 5
-#define TSDB_VMSG_STATUS 6
-
-#pragma pack(push, 1)
-
-typedef struct {
-  char  type;
-  char  version;
-  short sourceVid;
-  short destVid;
-} SFirstPkt;
-
-typedef struct {
-  uint64_t lastCreate;
-  uint64_t lastRemove;
-  uint32_t fileId;
-  uint64_t fmagic[];
-} SSyncMsg;
-
-typedef struct {
-  char     status;
-  uint64_t version;
-} SPeerState;
-
-typedef struct {
-  char       status : 6;
-  char       ack : 2;
-  char       commitInProcess;
-  int32_t    fileId;  // ID for corrupted file, 0 means no corrupted file
-  uint64_t   version;
-  SPeerState peerStates[];
-} SPeerStatus;
-
-#pragma pack(pop)
-
-typedef struct _thread_obj {
-  pthread_t thread;
-  int       threadId;
-  int       pollFd;
-  int       numOfFds;
-} SThreadObj;
-
-typedef struct {
-  int          numOfThreads;
-  SThreadObj **pThread;
-  pthread_t    thread;
-  int          threadId;
-} SThreadPool;
-
-typedef struct _vnodePeer {
-  void *      signature;
-  int         ownId;  // own vnode ID
-  uint32_t    ip;
-  char        ipstr[20];  // ip string
-  int         vid;
-  int         status;
-  int         syncStatus;
-  int32_t     fileId;  // 0 means no corrupted file
-  uint64_t    version;
-  int         commitInProcess;
-  int         syncFd;
-  int         peerFd;  // forward FD
-  void *      hbTimer;
-  void *      syncTimer;
-  SThreadObj *pThread;
-} SVnodePeer;
-
-typedef struct {
-  SVnodePeer *pVPeer;
-  uint64_t    lastCreate;
-  uint64_t    lastRemove;
-  uint32_t    fileId;
-  uint64_t    fmagic[];
-} SSyncCmd;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEPEER_H
diff --git a/src/system/detail/inc/vnodeQueryImpl.h b/src/system/detail/inc/vnodeQueryImpl.h
deleted file mode 100644
index dc86f924aa1655291cb9ee97c2b23d8386ae46a7..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeQueryImpl.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * 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_VNODEQUERYUTIL_H
-#define TDENGINE_VNODEQUERYUTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-#include "hash.h"
-#include "hashutil.h"
-
-#define GET_QINFO_ADDR(x)    ((char*)(x)-offsetof(SQInfo, query))
-#define Q_STATUS_EQUAL(p, s) (((p) & (s)) != 0)
-
-/*
- * set the output buffer page size is 16k
- * The page size should be sufficient for at least one output result or intermediate result.
- * Some intermediate results may be extremely large, such as top/bottom(100) query.
- */
-#define DEFAULT_INTERN_BUF_SIZE            16384L
-
-#define INIT_ALLOCATE_DISK_PAGES           60L
-#define DEFAULT_DATA_FILE_MAPPING_PAGES    2L
-#define DEFAULT_DATA_FILE_MMAP_WINDOW_SIZE (DEFAULT_DATA_FILE_MAPPING_PAGES * DEFAULT_INTERN_BUF_SIZE)
-
-#define IO_ENGINE_MMAP 0
-#define IO_ENGINE_SYNC 1
-
-#define DEFAULT_IO_ENGINE IO_ENGINE_SYNC
-
-/**
- * check if the primary column is load by default, otherwise, the program will
- * forced to load primary column explicitly.
- */
-#define PRIMARY_TSCOL_LOADED(query) ((query)->colList[0].data.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX)
-
-typedef enum {
-
-  /*
-   * the program will call this function again, if this status is set.
-   * used to transfer from QUERY_RESBUF_FULL
-   */
-  QUERY_NOT_COMPLETED = 0x1,
-
-  /*
-   * output buffer is full, so, the next query will be employed,
-   * in this case, we need to set the appropriated start scan point for
-   * the next query.
-   *
-   * this status is only exist in group-by clause and
-   * diff/add/division/multiply/ query.
-   */
-  QUERY_RESBUF_FULL = 0x2,
-
-  /*
-   * query is over
-   * 1. this status is used in one row result query process, e.g.,
-   * count/sum/first/last/
-   * avg...etc.
-   * 2. when the query range on timestamp is satisfied, it is also denoted as
-   * query_compeleted
-   */
-  QUERY_COMPLETED = 0x4,
-
-  /*
-   * all data has been scanned, so current search is stopped,
-   * At last, the function will transfer this status to QUERY_COMPLETED
-   */
-  QUERY_NO_DATA_TO_CHECK = 0x8,
-
-} vnodeQueryStatus;
-
-typedef struct SPointInterpoSupporter {
-  int32_t numOfCols;
-  char**  pPrevPoint;
-  char**  pNextPoint;
-} SPointInterpoSupporter;
-
-typedef struct SBlockInfo {
-  TSKEY   keyFirst;
-  TSKEY   keyLast;
-  int32_t numOfCols;
-  int32_t size;
-} SBlockInfo;
-
-typedef struct SMeterDataBlockInfoEx {
-  SCompBlockFields pBlock;
-  SMeterDataInfo*  pMeterDataInfo;
-  int32_t          blockIndex;
-  int32_t          groupIdx; /* number of group is less than the total number of meters */
-} SMeterDataBlockInfoEx;
-
-typedef enum {
-  DISK_DATA_LOAD_FAILED = -0x1,
-  DISK_DATA_LOADED = 0x0,
-  DISK_DATA_DISCARDED = 0x01,
-} vnodeDiskLoadStatus;
-
-#define IS_MASTER_SCAN(runtime) ((runtime)->scanFlag == MASTER_SCAN)
-#define IS_SUPPLEMENT_SCAN(runtime) (!IS_MASTER_SCAN(runtime))
-#define SET_SUPPLEMENT_SCAN_FLAG(runtime) ((runtime)->scanFlag = SUPPLEMENTARY_SCAN)
-#define SET_MASTER_SCAN_FLAG(runtime) ((runtime)->scanFlag = MASTER_SCAN)
-
-typedef int (*__block_search_fn_t)(char* data, int num, int64_t key, int order);
-
-static FORCE_INLINE SMeterObj* getMeterObj(void* hashHandle, int32_t sid) {
-  return *(SMeterObj**)taosGetDataFromHash(hashHandle, (const char*) &sid, sizeof(sid));
-}
-
-bool isQueryKilled(SQuery* pQuery);
-bool isFixedOutputQuery(SQuery* pQuery);
-bool isPointInterpoQuery(SQuery* pQuery);
-bool isTopBottomQuery(SQuery* pQuery);
-bool isFirstLastRowQuery(SQuery* pQuery);
-bool isTSCompQuery(SQuery* pQuery);
-bool notHasQueryTimeRange(SQuery *pQuery);
-
-bool needSupplementaryScan(SQuery* pQuery);
-bool onDemandLoadDatablock(SQuery* pQuery, int16_t queryRangeSet);
-
-void setQueryStatus(SQuery* pQuery, int8_t status);
-
-bool doRevisedResultsByLimit(SQInfo* pQInfo);
-void truncateResultByLimit(SQInfo* pQInfo, int64_t* final, int32_t* interpo);
-
-void initCtxOutputBuf(SQueryRuntimeEnv* pRuntimeEnv);
-void resetCtxOutputBuf(SQueryRuntimeEnv* pRuntimeEnv);
-void forwardCtxOutputBuf(SQueryRuntimeEnv* pRuntimeEnv, int64_t output);
-
-bool needPrimaryTimestampCol(SQuery* pQuery, SBlockInfo* pBlockInfo);
-void vnodeScanAllData(SQueryRuntimeEnv* pRuntimeEnv);
-
-int32_t vnodeQueryResultInterpolate(SQInfo* pQInfo, tFilePage** pDst, tFilePage** pDataSrc, int32_t numOfRows,
-                                    int32_t* numOfInterpo);
-void copyResToQueryResultBuf(SMeterQuerySupportObj* pSupporter, SQuery* pQuery);
-
-void doSkipResults(SQueryRuntimeEnv* pRuntimeEnv);
-void doFinalizeResult(SQueryRuntimeEnv* pRuntimeEnv);
-int64_t getNumOfResult(SQueryRuntimeEnv* pRuntimeEnv);
-
-void forwardIntervalQueryRange(SMeterQuerySupportObj* pSupporter, SQueryRuntimeEnv* pRuntimeEnv);
-void forwardQueryStartPosition(SQueryRuntimeEnv* pRuntimeEnv);
-
-bool normalizedFirstQueryRange(bool dataInDisk, bool dataInCache, SMeterQuerySupportObj* pSupporter,
-                               SPointInterpoSupporter* pPointInterpSupporter, int64_t* key);
-
-void pointInterpSupporterInit(SQuery* pQuery, SPointInterpoSupporter* pInterpoSupport);
-void pointInterpSupporterDestroy(SPointInterpoSupporter* pPointInterpSupport);
-void pointInterpSupporterSetData(SQInfo* pQInfo, SPointInterpoSupporter* pPointInterpSupport);
-
-int64_t loadRequiredBlockIntoMem(SQueryRuntimeEnv* pRuntimeEnv, SPositionInfo* position);
-int32_t doCloseAllOpenedResults(SMeterQuerySupportObj* pSupporter);
-void disableFunctForSuppleScan(SQueryRuntimeEnv* pRuntimeEnv, int32_t order);
-void enableFunctForMasterScan(SQueryRuntimeEnv* pRuntimeEnv, int32_t order);
-
-int32_t mergeMetersResultToOneGroups(SMeterQuerySupportObj* pSupporter);
-void copyFromGroupBuf(SQInfo* pQInfo, SOutputRes* result);
-
-SBlockInfo getBlockBasicInfo(SQueryRuntimeEnv* pRuntimeEnv, void* pBlock, int32_t blockType);
-SCacheBlock* getCacheDataBlock(SMeterObj* pMeterObj, SQueryRuntimeEnv* pRuntimeEnv, int32_t slot);
-
-void queryOnBlock(SMeterQuerySupportObj* pSupporter, int64_t* primaryKeys, int32_t blockStatus,
-                  SBlockInfo* pBlockBasicInfo, SMeterDataInfo* pDataHeadInfoEx, SField* pFields,
-                  __block_search_fn_t searchFn);
-
-int32_t vnodeFilterQualifiedMeters(SQInfo *pQInfo, int32_t vid, tSidSet *pSidSet, SMeterDataInfo *pMeterDataInfo,
-                                   int32_t *numOfMeters, SMeterDataInfo ***pReqMeterDataInfo);
-int32_t vnodeGetVnodeHeaderFileIdx(int32_t* fid, SQueryRuntimeEnv* pRuntimeEnv, int32_t order);
-
-int32_t createDataBlocksInfoEx(SMeterDataInfo** pMeterDataInfo, int32_t numOfMeters,
-                               SMeterDataBlockInfoEx** pDataBlockInfoEx, int32_t numOfCompBlocks,
-                               int32_t* nAllocBlocksInfoSize, int64_t addr);
-void freeMeterBlockInfoEx(SMeterDataBlockInfoEx* pDataBlockInfoEx, int32_t len);
-
-void setExecutionContext(SMeterQuerySupportObj* pSupporter, SOutputRes* outputRes, int32_t meterIdx, int32_t groupIdx,
-                         SMeterQueryInfo* sqinfo);
-int32_t setIntervalQueryExecutionContext(SMeterQuerySupportObj* pSupporter, int32_t meterIdx, SMeterQueryInfo* sqinfo);
-
-int64_t getQueryStartPositionInCache(SQueryRuntimeEnv* pRuntimeEnv, int32_t* slot, int32_t* pos, bool ignoreQueryRange);
-int64_t getNextAccessedKeyInData(SQuery* pQuery, int64_t* pPrimaryCol, SBlockInfo* pBlockInfo, int32_t blockStatus);
-
-int32_t getDataBlocksForMeters(SMeterQuerySupportObj* pSupporter, SQuery* pQuery, int32_t numOfMeters,
-                                const char* filePath, SMeterDataInfo** pMeterDataInfo, uint32_t* numOfBlocks);
-int32_t LoadDatablockOnDemand(SCompBlock* pBlock, SField** pFields, uint8_t* blkStatus, SQueryRuntimeEnv* pRuntimeEnv,
-                              int32_t fileIdx, int32_t slotIdx, __block_search_fn_t searchFn, bool onDemand);
-int32_t vnodeGetHeaderFile(SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIndex);
-
-/**
- * Create SMeterQueryInfo.
- * The MeterQueryInfo is created one for each table during super table query
- *
- * @param skey
- * @param ekey
- * @return
- */
-SMeterQueryInfo* createMeterQueryInfo(SQuery* pQuery, TSKEY skey, TSKEY ekey);
-
-/**
- * Destroy meter query info
- * @param pMeterQInfo
- * @param numOfCols
- */
-void destroyMeterQueryInfo(SMeterQueryInfo *pMeterQueryInfo, int32_t numOfCols);
-
-/**
- * change the meter query info for supplement scan
- * @param pMeterQueryInfo
- * @param skey
- * @param ekey
- */
-void changeMeterQueryInfoForSuppleQuery(SMeterQueryInfo *pMeterQueryInfo, TSKEY skey, TSKEY ekey);
-
-/**
- * add the new allocated disk page to meter query info
- * the new allocated disk page is used to keep the intermediate (interval) results
- * @param pQuery
- * @param pMeterQueryInfo
- * @param pSupporter
- */
-tFilePage* addDataPageForMeterQueryInfo(SQuery* pQuery, SMeterQueryInfo *pMeterQueryInfo, SMeterQuerySupportObj *pSupporter);
-
-/**
- * save the query range data into SMeterQueryInfo
- * @param pRuntimeEnv
- * @param pMeterQueryInfo
- */
-void saveIntervalQueryRange(SQueryRuntimeEnv* pRuntimeEnv, SMeterQueryInfo* pMeterQueryInfo);
-
-/**
- * restore the query range data from SMeterQueryInfo to runtime environment
- *
- * @param pRuntimeEnv
- * @param pMeterQueryInfo
- */
-void restoreIntervalQueryRange(SQueryRuntimeEnv* pRuntimeEnv, SMeterQueryInfo* pMeterQueryInfo);
-
-/**
- * set the interval query range for the interval query, when handling a data(cache) block
- *
- * @param pMeterQueryInfo
- * @param pSupporter
- * @param key
- */
-void setIntervalQueryRange(SMeterQueryInfo *pMeterQueryInfo, SMeterQuerySupportObj* pSupporter, int64_t key);
-
-/**
- * set the meter data information
- * @param pMeterDataInfo
- * @param pMeterObj current query meter object
- * @param meterIdx  meter index in the sid list
- * @param groupId  group index, which the meter is belonged to
- */
-void setMeterDataInfo(SMeterDataInfo* pMeterDataInfo, SMeterObj* pMeterObj, int32_t meterIdx, int32_t groupId);
-
-void vnodeSetTagValueInParam(tSidSet* pSidSet, SQueryRuntimeEnv* pRuntimeEnv, SMeterSidExtInfo* pMeterInfo);
-
-void vnodeCheckIfDataExists(SQueryRuntimeEnv* pRuntimeEnv, SMeterObj* pMeterObj, bool* dataInDisk, bool* dataInCache);
-
-void displayInterResult(SData** pdata, SQuery* pQuery, int32_t numOfRows);
-
-void vnodePrintQueryStatistics(SMeterQuerySupportObj* pSupporter);
-
-void clearGroupResultBuf(SOutputRes* pOneOutputRes, int32_t nOutputCols);
-void copyGroupResultBuf(SOutputRes* dst, const SOutputRes* src, int32_t nOutputCols);
-
-void resetSlidingWindowInfo(SSlidingWindowInfo* pSlidingWindowInfo, int32_t numOfCols);
-void clearCompletedSlidingWindows(SSlidingWindowInfo* pSlidingWindowInfo, int32_t numOfCols);
-int32_t numOfClosedSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo);
-void closeSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot);
-void closeAllSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEQUERYUTIL_H
diff --git a/src/system/detail/inc/vnodeRead.h b/src/system/detail/inc/vnodeRead.h
deleted file mode 100644
index ee88e5e36681a2a9d22faa5f757fa3c4f1f57a59..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeRead.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * 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_VNODEREAD_H
-#define TDENGINE_VNODEREAD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-#include "tinterpolation.h"
-#include "vnodeTagMgmt.h"
-
-/*
- * use to keep the first point position, consisting of position in blk and block
- * id, file id
- */
-typedef struct {
-  int32_t pos;
-  int32_t slot;
-  int32_t fileId;
-} SPositionInfo;
-
-typedef struct SLoadDataBlockInfo {
-  int32_t fileListIndex; /* index of this file in files list of this vnode */
-  int32_t fileId;
-  int32_t slotIdx;
-  int32_t sid;
-  bool    tsLoaded;      // if timestamp column of current block is loaded or not
-} SLoadDataBlockInfo;
-
-typedef struct SLoadCompBlockInfo {
-  int32_t sid; /* meter sid */
-  int32_t fileId;
-  int32_t fileListIndex;
-} SLoadCompBlockInfo;
-
-/*
- * the header file info for one vnode
- */
-typedef struct SHeaderFileInfo {
-  int32_t fileID;  // file id
-} SHeaderFileInfo;
-
-typedef struct SQueryCostSummary {
-  double cacheTimeUs;
-  double fileTimeUs;
-
-  int64_t numOfFiles;   // opened files during query
-  int64_t numOfTables;  // num of queries tables
-  int64_t numOfSeek;    // number of seek operation
-
-  int64_t readDiskBlocks;     // accessed disk block
-  int64_t skippedFileBlocks;  // skipped blocks
-  int64_t blocksInCache;      // accessed cache blocks
-
-  int64_t readField;       // field size
-  int64_t totalFieldSize;  // total read fields size
-  double  loadFieldUs;     // total elapsed time to read fields info
-
-  int64_t totalBlockSize;  // read data blocks
-  double  loadBlocksUs;    // total elapsed time to read data blocks
-
-  int64_t totalGenData;  // in-memory generated data
-
-  int64_t readCompInfo;       // read compblock info
-  int64_t totalCompInfoSize;  // total comp block size
-  double  loadCompInfoUs;     // total elapsed time to read comp block info
-
-  int64_t tmpBufferInDisk;  // size of buffer for intermediate result
-} SQueryCostSummary;
-
-typedef struct SOutputRes {
-  uint16_t     numOfRows;
-  int32_t      nAlloc;
-  tFilePage**  result;
-  SResultInfo* resultInfo;
-} SOutputRes;
-
-/*
- * header files info, avoid to iterate the directory, the data is acquired
- * during in query preparation function
- */
-typedef struct SQueryFilesInfo {
-  SHeaderFileInfo* pFileInfo;
-  uint32_t         numOfFiles;  // the total available number of files for this virtual node during query execution
-  int32_t          current;     // the memory mapped header file, NOTE: only one header file can be mmap.
-  int32_t          vnodeId;
-  
-  int32_t          headerFd;         // header file fd
-  int64_t          headerFileSize;
-  int32_t          dataFd;
-  int32_t          lastFd;
-
-  char headerFilePath[PATH_MAX];  // current opened header file name
-  char dataFilePath[PATH_MAX];    // current opened data file name
-  char lastFilePath[PATH_MAX];    // current opened last file path
-  char dbFilePathPrefix[PATH_MAX];
-} SQueryFilesInfo;
-
-typedef struct STimeWindow {
-  TSKEY skey;
-  TSKEY ekey;
-} STimeWindow;
-
-typedef struct SWindowStatus {
-  STimeWindow window;
-  bool closed;
-} SWindowStatus;
-
-typedef struct SSlidingWindowInfo {
-  SOutputRes*         pResult;    // reference to SQuerySupporter->pResult
-  SWindowStatus*      pStatus;    // current query window closed or not?
-  void*               hashList;   // hash list for quick access
-  int16_t             type;       // data type for hash key
-  int32_t             capacity;   // max capacity
-  int32_t             curIndex;   // current start active index
-  int32_t             size;
-  
-  int64_t             startTime;  // start time of the first time window for sliding query
-  int64_t             prevSKey;   // previous (not completed) sliding window start key
-  int64_t             threshold;  // threshold for return completed results.
-} SSlidingWindowInfo;
-
-typedef struct SQueryRuntimeEnv {
-  SPositionInfo       startPos; /* the start position, used for secondary/third iteration */
-  SPositionInfo       endPos;   /* the last access position in query, served as the start pos of reversed order query */
-  SPositionInfo       nextPos;  /* start position of the next scan */
-  SData*              colDataBuffer[TSDB_MAX_COLUMNS];
-  SResultInfo*        resultInfo;
-  uint8_t             blockStatus;  // Indicate if data block is loaded, the block is first/last/internal block
-  int32_t             unzipBufSize;
-  SData*              primaryColBuffer;
-  char*               unzipBuffer;
-  char*               secondaryUnzipBuffer;
-  SQuery*             pQuery;
-  SMeterObj*          pMeterObj;
-  SQLFunctionCtx*     pCtx;
-  SLoadDataBlockInfo  loadBlockInfo;         /* record current block load information */
-  SLoadCompBlockInfo  loadCompBlockInfo; /* record current compblock information in SQuery */
-  SQueryFilesInfo     vnodeFileInfo;
-  int16_t             numOfRowsPerPage;
-  int16_t             offset[TSDB_MAX_COLUMNS];
-  int16_t             scanFlag;  // denotes reversed scan of data or not
-  SInterpolationInfo  interpoInfo;
-  SData**             pInterpoBuf;
-  
-  SSlidingWindowInfo   swindowResInfo;
-  
-  STSBuf*             pTSBuf;
-  STSCursor           cur;
-  SQueryCostSummary   summary;
-  
-  STimeWindow         intervalWindow;  // the complete time window, not affected by the actual data distribution
-  
-  /*
-   * Temporarily hold the in-memory cache block info during scan cache blocks
-   * Here we do not use the cacheblock info from pMeterObj, simple because it may change anytime
-   * during the query by the subumit/insert handling threads.
-   * So we keep a copy of the support structure as well as the cache block data itself.
-   */
-  SCacheBlock         cacheBlock;
-} SQueryRuntimeEnv;
-
-/* intermediate result during multimeter query involves interval */
-typedef struct SMeterQueryInfo {
-  int64_t      lastKey;
-  int64_t      skey;
-  int64_t      ekey;
-  int32_t      numOfRes;
-  uint32_t     numOfPages;
-  uint32_t     numOfAlloc;
-  int32_t      reverseIndex;    // reversed output indicator, start from (numOfRes-1)
-  int16_t      reverseFillRes;  // denote if reverse fill the results in supplementary scan required or not
-  int16_t      queryRangeSet;   // denote if the query range is set, only available for interval query
-  int16_t      lastResRows;
-  int64_t      tag;
-  STSCursor    cur;
-  SResultInfo* resultInfo;
-  uint32_t*    pageList;
-} SMeterQueryInfo;
-
-typedef struct SMeterDataInfo {
-  uint64_t     offsetInHeaderFile;
-  int32_t      numOfBlocks;
-  int32_t      start;  // start block index
-  SCompBlock*  pBlock;
-  int32_t      meterOrderIdx;
-  SMeterObj*   pMeterObj;
-  int32_t      groupIdx;    // group id in meter list
-  SMeterQueryInfo* pMeterQInfo;
-} SMeterDataInfo;
-
-typedef struct SMeterQuerySupportObj {
-  void* pMetersHashTable;   // meter table hash list
-
-  SMeterSidExtInfo** pMeterSidExtInfo;
-  int32_t            numOfMeters;
-
-  /*
-   * multimeter query resultset.
-   * In multimeter queries, the result is temporarily stored on this structure, instead of
-   * directly put result into output buffer, since we have no idea how many number of
-   * rows may be generated by a specific subgroup. When query on all subgroups is executed,
-   * the result is copy to output buffer. This attribution is not used during single meter query processing.
-   */
-  SOutputRes*      pResult;
-  SQueryRuntimeEnv runtimeEnv;
-  int64_t          rawSKey;
-  int64_t          rawEKey;
-  int32_t          subgroupIdx;
-  int32_t          offset; /* offset in group result set of subgroup */
-
-  tSidSet* pSidSet;
-
-  /*
-   * the query is executed position on which meter of the whole list.
-   * when the index reaches the last one of the list, it means the query is completed.
-   * We later may refactor to remove this attribution by using another flag to denote
-   * whether a multimeter query is completed or not.
-   */
-  int32_t meterIdx;
-
-  int32_t meterOutputFd;
-  int32_t lastPageId;
-  int32_t numOfPages;
-  int32_t numOfGroupResultPages;
-  int32_t groupResultSize;
-
-  char*   meterOutputMMapBuf;
-  int64_t bufSize;
-  char    extBufFile[256];  // external file name
-
-  SMeterDataInfo* pMeterDataInfo;
-
-  TSKEY* tsList;
-} SMeterQuerySupportObj;
-
-typedef struct _qinfo {
-  uint64_t       signature;
-  int32_t        refCount;  // QInfo reference count, when the value is 0, it can be released safely
-  char           user[TSDB_METER_ID_LEN + 1];
-  char           sql[TSDB_SHOW_SQL_LEN];
-  uint8_t        stream;
-  uint16_t       port;
-  uint32_t       ip;
-  uint64_t       startTime;
-  int64_t        useconds;
-  int            killed;
-  struct _qinfo *prev, *next;
-  SQuery         query;
-  int            totalPoints;
-  int            pointsRead;
-  int            pointsReturned;
-  int            pointsInterpo;
-  int            code;
-  char           bufIndex;
-  char           changed;
-  char           over;
-  SMeterObj*     pObj;
-  sem_t          dataReady;
-
-  SMeterQuerySupportObj* pMeterQuerySupporter;
-  int (*fp)(SMeterObj*, SQuery*);
-} SQInfo;
-
-int32_t vnodeQuerySingleMeterPrepare(SQInfo* pQInfo, SMeterObj* pMeterObj, SMeterQuerySupportObj* pSMultiMeterObj,
-                                     void* param);
-
-void vnodeQueryFreeQInfoEx(SQInfo* pQInfo);
-
-bool vnodeParametersSafetyCheck(SQuery* pQuery);
-
-int32_t vnodeMultiMeterQueryPrepare(SQInfo* pQInfo, SQuery* pQuery, void* param);
-
-/**
- * decrease the numofQuery of each table that is queried, enable the
- * remove/close operation can be executed
- * @param pQInfo
- */
-void vnodeDecMeterRefcnt(SQInfo* pQInfo);
-
-/* sql query handle in dnode */
-void vnodeSingleTableQuery(SSchedMsg* pMsg);
-
-/*
- * handle multi-meter query process
- */
-void vnodeMultiMeterQuery(SSchedMsg* pMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODEREAD_H
diff --git a/src/system/detail/inc/vnodeShell.h b/src/system/detail/inc/vnodeShell.h
deleted file mode 100644
index 25646fbb1a88e2bd971d90b35fa8ecaf4cc42374..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeShell.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_VNODESHELL_H
-#define TDENGINE_VNODESHELL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "os.h"
-
-typedef struct {
-  int      sid;
-  int      vnode;
-  uint32_t ip;
-  uint16_t port;
-  int      count;             // track the number of imports
-  int      code;              // track the code of imports
-  int      numOfTotalPoints;  // track the total number of points imported
-  void *   thandle;           // handle from TAOS layer
-  void *   qhandle;
-} SShellObj;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODESHELL_H
diff --git a/src/system/detail/inc/vnodeStatus.h b/src/system/detail/inc/vnodeStatus.h
deleted file mode 100644
index 456304370d34e6f4101293e197962b069085689f..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeStatus.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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_TSTATUS_H
-#define TDENGINE_TSTATUS_H
-
-#include "taoserror.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum _TSDB_VG_STATUS {
-  TSDB_VG_STATUS_READY = TSDB_CODE_SUCCESS,
-  TSDB_VG_STATUS_IN_PROGRESS = TSDB_CODE_ACTION_IN_PROGRESS,
-  TSDB_VG_STATUS_NO_DISK_PERMISSIONS = TSDB_CODE_NO_DISK_PERMISSIONS,
-  TSDB_VG_STATUS_SERVER_NO_PACE = TSDB_CODE_SERV_NO_DISKSPACE,
-  TSDB_VG_STATUS_SERV_OUT_OF_MEMORY = TSDB_CODE_SERV_OUT_OF_MEMORY,
-  TSDB_VG_STATUS_INIT_FAILED = TSDB_CODE_VG_INIT_FAILED,
-  TSDB_VG_STATUS_FULL = TSDB_CODE_NO_ENOUGH_DNODES,
-};
-
-enum _TSDB_DB_STATUS {
-  TSDB_DB_STATUS_READY,
-  TSDB_DB_STATUS_DROPPING,
-  TSDB_DB_STATUS_DROP_FROM_SDB
-};
-
-enum _TSDB_VN_STATUS {
-  TSDB_VN_STATUS_OFFLINE,
-  TSDB_VN_STATUS_CREATING,
-  TSDB_VN_STATUS_UNSYNCED,
-  TSDB_VN_STATUS_SLAVE,
-  TSDB_VN_STATUS_MASTER,
-  TSDB_VN_STATUS_CLOSING,
-  TSDB_VN_STATUS_DELETING,
-};
-
-enum _TSDB_VN_SYNC_STATUS {
-  TSDB_VN_SYNC_STATUS_INIT,
-  TSDB_VN_SYNC_STATUS_SYNCING,
-  TSDB_VN_SYNC_STATUS_SYNC_CACHE,
-  TSDB_VN_SYNC_STATUS_SYNC_FILE
-};
-
-enum _TSDB_VN_DROP_STATUS {
-  TSDB_VN_DROP_STATUS_READY,
-  TSDB_VN_DROP_STATUS_DROPPING
-};
-
-enum _TSDB_DN_STATUS {
-  TSDB_DN_STATUS_OFFLINE,
-  TSDB_DN_STATUS_READY
-};
-
-enum _TSDB_DN_LB_STATUS {
-  TSDB_DN_LB_STATUS_BALANCED,
-  TSDB_DN_LB_STATUS_BALANCING,
-  TSDB_DN_LB_STATUS_OFFLINE_REMOVING,
-  TSDB_DN_LB_STATE_SHELL_REMOVING
-};
-
-enum _TSDB_VG_LB_STATUS {
-  TSDB_VG_LB_STATUS_READY,
-  TSDB_VG_LB_STATUS_UPDATE
-};
-
-enum _TSDB_VN_STREAM_STATUS {
-  TSDB_VN_STREAM_STATUS_STOP,
-  TSDB_VN_STREAM_STATUS_START
-};
-
-enum TSDB_TABLE_STATUS {
-  TSDB_METER_STATE_READY       = 0x00,
-  TSDB_METER_STATE_INSERTING   = 0x01,
-  TSDB_METER_STATE_IMPORTING   = 0x02,
-  TSDB_METER_STATE_UPDATING    = 0x04,
-  TSDB_METER_STATE_DROPPING    = 0x10,
-  TSDB_METER_STATE_DROPPED     = 0x18,
-};
-
-const char* taosGetVgroupStatusStr(int32_t vgroupStatus);
-const char* taosGetDbStatusStr(int32_t dbStatus);
-const char* taosGetVnodeStatusStr(int32_t vnodeStatus);
-const char* taosGetVnodeSyncStatusStr(int32_t vnodeSyncStatus);
-const char* taosGetVnodeDropStatusStr(int32_t dropping);
-const char* taosGetDnodeStatusStr(int32_t dnodeStatus);
-const char* taosGetDnodeLbStatusStr(int32_t dnodeBalanceStatus);
-const char* taosGetVgroupLbStatusStr(int32_t vglbStatus);
-const char* taosGetVnodeStreamStatusStr(int32_t vnodeStreamStatus);
-
-const char* taosGetTableStatusStr(int32_t tableStatus);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_TSTATUS_H
diff --git a/src/system/detail/inc/vnodeStore.h b/src/system/detail/inc/vnodeStore.h
deleted file mode 100644
index 638bcb54bb40f7621a8712591775e5f4e676e704..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeStore.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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_VNODESTORE_H
-#define TDENGINE_VNODESTORE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vnodeProcessDataFromVnode(SIntMsg *msg, void *tcpHandle);
-
-void vnodeCalcOpenVnodes();
-
-bool vnodeRemoveDataFileFromLinkFile(char* linkFile, char* de_name);
-
-int  vnodeInitInfo();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDEGINE_VNODESTORE_H
diff --git a/src/system/detail/inc/vnodeSystem.h b/src/system/detail/inc/vnodeSystem.h
deleted file mode 100644
index e436288fc149cb5381b1e7f583d9450fd8772f5d..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeSystem.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_VNODESYSTEM_H
-#define TDENGINE_VNODESYSTEM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vnodeCleanUpSystem();
-
-void vnodePrintSystemInfo();
-
-int vnodeInitSystem();
-
-int vnodeCfgDynamicOptions(char *msg);
-
-int vnodeInitStore();
-
-int vnodeInitPeer(int numOfThreads);
-
-int vnodeInitMgmt();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODESYSTEM_H
diff --git a/src/system/detail/inc/vnodeTagMgmt.h b/src/system/detail/inc/vnodeTagMgmt.h
deleted file mode 100644
index 320ef5645395e08578d206b4f9db89809b56dafb..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeTagMgmt.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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_VNODETAGMGMT_H
-#define TDENGINE_VNODETAGMGMT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * @version 0.1
-
- * @date   2018/01/02
- * @author liaohj
- * management of the tag value of tables
- * in query, client need the vnode to aggregate results according to tags
- * values,
- * the grouping operation is done here.
- * Note:
- * 1. we implement a quick sort algorithm, may remove it later.
- */
-
-typedef struct tTagSchema {
-  struct SSchema *pSchema;
-  int32_t         numOfCols;
-  int32_t         colOffset[];
-} tTagSchema;
-
-typedef struct tSidSet {
-  int32_t            numOfSids;
-  int32_t            numOfSubSet;
-  SMeterSidExtInfo **pSids;
-  int32_t *          starterPos;  // position of each subgroup, generated according to
-
-  tTagSchema *pTagSchema;
-  tOrderIdx   orderIdx;
-} tSidSet;
-
-typedef int32_t (*__ext_compar_fn_t)(const void *p1, const void *p2, void *param);
-
-tSidSet *tSidSetCreate(struct SMeterSidExtInfo **pMeterSidExtInfo, int32_t numOfMeters, SSchema *pSchema,
-                       int32_t numOfTags, SColIndexEx *colList, int32_t numOfOrderCols);
-
-tTagSchema *tCreateTagSchema(SSchema *pSchema, int32_t numOfTagCols);
-
-int32_t *calculateSubGroup(void **pSids, int32_t numOfMeters, int32_t *numOfSubset, tOrderDescriptor *pOrderDesc,
-                           __ext_compar_fn_t compareFn);
-
-void tSidSetDestroy(tSidSet **pSets);
-
-void tSidSetSort(tSidSet *pSets);
-
-int32_t meterSidComparator(const void *s1, const void *s2, void *param);
-
-int32_t doCompare(char *f1, char *f2, int32_t type, int32_t size);
-
-void tQSortEx(void **pMeterSids, size_t size, int32_t start, int32_t end, void *param, __ext_compar_fn_t compareFn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODETAGMGMT_H
diff --git a/src/system/detail/inc/vnodeUtil.h b/src/system/detail/inc/vnodeUtil.h
deleted file mode 100644
index b0f573ba2d466b084ce750e2e5d368cca61d353e..0000000000000000000000000000000000000000
--- a/src/system/detail/inc/vnodeUtil.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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_VNODE_UTIL_H
-#define TDENGINE_VNODE_UTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* get the qinfo struct address from the query struct address */
-#define GET_COLUMN_BYTES(query, colidx) \
-  ((query)->colList[(query)->pSelectExpr[colidx].pBase.colInfo.colIdxInBuf].data.bytes)
-#define GET_COLUMN_TYPE(query, colidx) \
-  ((query)->colList[(query)->pSelectExpr[colidx].pBase.colInfo.colIdxInBuf].data.type)
-
-#define QUERY_IS_ASC_QUERY(q) (GET_FORWARD_DIRECTION_FACTOR((q)->order.order) == QUERY_ASC_FORWARD_STEP)
-#define EXTRA_BYTES 2            // for possible compression deflation
-
-#define GET_COL_DATA_POS(query, index, step) ((query)->pos + (index)*(step))
-
-int vnodeGetEid(int days);
-
-int vnodeCheckFileIntegrity(FILE *fp);
-
-void vnodeCreateFileHeader(FILE *fp);
-
-void vnodeCreateFileHeaderFd(int fd);
-
-void vnodeGetHeadFileHeaderInfo(int fd, SVnodeHeadInfo *pHeadInfo);
-
-void vnodeUpdateHeadFileHeader(int fd, SVnodeHeadInfo *pHeadInfo);
-
-/**
- * check if two schema is identical or not
- * This function does not check if a schema is valid or not
- *
- * @param pSSchemaFirst
- * @param numOfCols1
- * @param pSSchemaSecond
- * @param numOfCols2
- * @return
- */
-bool vnodeMeterSchemaIdentical(SColumn *pSchema1, int32_t numOfCols1, SColumn *pSchema2, int32_t numOfCols2);
-
-/**
- * free SFields in SQuery
- * vnodeFreeFields must be called before free(pQuery->pBlock);
- * @param pQuery
- */
-void vnodeFreeFields(SQuery *pQuery);
-
-void vnodeUpdateFilterColumnIndex(SQuery* pQuery);
-void vnodeUpdateQueryColumnIndex(SQuery* pQuery, SMeterObj* pMeterObj);
-
-int32_t vnodeCreateFilterInfo(void* pQInfo, SQuery *pQuery);
-
-bool vnodeFilterData(SQuery* pQuery, int32_t* numOfActualRead, int32_t index);
-bool vnodeDoFilterData(SQuery* pQuery, int32_t elemPos);
-
-bool vnodeIsProjectionQuery(SSqlFunctionExpr *pExpr, int32_t numOfOutput);
-
-int32_t vnodeIncQueryRefCount(SQueryMeterMsg *pQueryMsg, SMeterSidExtInfo **pSids, SMeterObj **pMeterObjList,
-                              int32_t *numOfInc);
-
-void vnodeDecQueryRefCount(SQueryMeterMsg *pQueryMsg, SMeterObj **pMeterObjList, int32_t numOfInc);
-
-int32_t vnodeSetMeterState(SMeterObj* pMeterObj, int32_t state);
-void vnodeClearMeterState(SMeterObj* pMeterObj, int32_t state);
-bool vnodeIsMeterState(SMeterObj* pMeterObj, int32_t state);
-void vnodeSetMeterDeleting(SMeterObj* pMeterObj);
-int32_t vnodeSetMeterInsertImportStateEx(SMeterObj* pObj, int32_t st);
-
-bool vnodeIsSafeToDeleteMeter(SVnodeObj* pVnode, int32_t sid);
-void vnodeFreeColumnInfo(SColumnInfo* pColumnInfo);
-bool isGroupbyNormalCol(SSqlGroupbyExpr* pExpr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TDENGINE_VNODE_UTIL_H
diff --git a/src/system/detail/src/dnodeMgmt.c b/src/system/detail/src/dnodeMgmt.c
deleted file mode 100644
index 5e2b150cbb1960daa4990bbd7aef81154be3111b..0000000000000000000000000000000000000000
--- a/src/system/detail/src/dnodeMgmt.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "taosmsg.h"
-#include "trpc.h"
-#include "tsched.h"
-#include "tsystem.h"
-#include "vnode.h"
-#include "vnodeMgmt.h"
-#include "vnodeSystem.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-SMgmtObj mgmtObj;
-extern uint64_t tsCreatedTime;
-
-int vnodeProcessVPeersMsg(char *msg, int msgLen, SMgmtObj *pMgmtObj);
-int vnodeProcessCreateMeterMsg(char *pMsg, int msgLen);
-int vnodeProcessFreeVnodeRequest(char *pMsg, int msgLen, SMgmtObj *pMgmtObj);
-int vnodeProcessVPeerCfgRsp(char *msg, int msgLen, SMgmtObj *pMgmtObj);
-int vnodeProcessMeterCfgRsp(char *msg, int msgLen, SMgmtObj *pMgmtObj);
-int vnodeProcessCfgDnodeRequest(char *cont, int contLen, SMgmtObj *pMgmtObj);
-int vnodeProcessAlterStreamRequest(char *pMsg, int msgLen, SMgmtObj *pObj);
-void vnodeUpdateHeadFile(int vnode, int oldTables, int newTables);
-void vnodeOpenVnode(int vnode);
-void vnodeCleanUpOneVnode(int vnode);
-
-int vnodeSaveCreateMsgIntoQueue(SVnodeObj *pVnode, char *pMsg, int msgLen);
-
-char *taosBuildRspMsgToMnodeWithSize(SMgmtObj *pObj, char type, int size);
-char *taosBuildReqMsgToMnodeWithSize(SMgmtObj *pObj, char type, int size);
-char *taosBuildRspMsgToMnode(SMgmtObj *pObj, char type);
-char *taosBuildReqMsgToMnode(SMgmtObj *pObj, char type);
-int   taosSendSimpleRspToMnode(SMgmtObj *pObj, char rsptype, char code);
-int   taosSendMsgToMnode(SMgmtObj *pObj, char *msg, int msgLen);
-
-void vnodeProcessMsgFromMgmt(char *content, int msgLen, int msgType, SMgmtObj *pObj) {
-  if (msgType == TSDB_MSG_TYPE_CREATE) {
-    vnodeProcessCreateMeterRequest(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_VPEERS) {
-    vnodeProcessVPeersMsg(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_VPEER_CFG_RSP) {
-    vnodeProcessVPeerCfgRsp(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_METER_CFG_RSP) {
-    vnodeProcessMeterCfgRsp(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_REMOVE) {
-    vnodeProcessRemoveMeterRequest(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_FREE_VNODE) {
-    vnodeProcessFreeVnodeRequest(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_CFG_PNODE) {
-    vnodeProcessCfgDnodeRequest(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM) {
-    vnodeProcessAlterStreamRequest(content, msgLen, pObj);
-  } else if (msgType == TSDB_MSG_TYPE_GRANT_RSP) {
-    // do nothing
-  } else {
-    dError("%s is not processed", taosMsg[msgType]);
-  }
-}
-
-int vnodeProcessMeterCfgRsp(char *pMsg, int msgLen, SMgmtObj *pObj) {
-  int code = *pMsg;
-
-  if (code == 0) {
-    vnodeProcessCreateMeterMsg(pMsg + 1, msgLen - 1);
-  } else {
-    STaosRsp *pRsp;
-    pRsp = (STaosRsp *)pMsg;
-    int32_t *pint = (int32_t *)pRsp->more;
-    int      vnode = htonl(*pint);
-    int      sid = htonl(*(pint + 1));
-    dError("vid:%d, sid:%d, code:%d, meter is not configured, remove it", vnode, sid, code);
-    int ret = vnodeRemoveMeterObj(vnode, sid);
-    dTrace("vid:%d, sid:%d, meter delete ret:%d", vnode, sid, ret);
-  }
-
-  return 0;
-}
-
-int vnodeProcessCreateMeterRequest(char *pMsg, int msgLen, SMgmtObj *pObj) {
-  SCreateMsg *pCreate;
-  int         code = 0;
-  int         vid;
-  SVnodeObj * pVnode;
-
-  pCreate = (SCreateMsg *)pMsg;
-  vid = htons(pCreate->vnode);
-
-  if (vid >= TSDB_MAX_VNODES || vid < 0) {
-    dError("vid:%d, vnode is out of range", vid);
-    code = TSDB_CODE_INVALID_VNODE_ID;
-    goto _over;
-  }
-
-  pVnode = vnodeList + vid;
-  if (pVnode->cfg.maxSessions <= 0) {
-    dError("vid:%d, not activated", vid);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _over;
-  }
-
-  if (pVnode->syncStatus == TSDB_VN_SYNC_STATUS_SYNCING) {
-    code = vnodeSaveCreateMsgIntoQueue(pVnode, pMsg, msgLen);
-    dTrace("vid:%d, create msg is saved into sync queue", vid);
-  } else {
-    code = vnodeProcessCreateMeterMsg(pMsg, msgLen);
-  }
-
-_over:
-  taosSendSimpleRspToMnode(pObj, TSDB_MSG_TYPE_CREATE_RSP, code);
-
-  return code;
-}
-
-int vnodeProcessAlterStreamRequest(char *pMsg, int msgLen, SMgmtObj *pObj) {
-  SAlterStreamMsg *pAlter;
-  int              code = 0;
-  int              vid, sid;
-  SVnodeObj *      pVnode;
-
-  pAlter = (SAlterStreamMsg *)pMsg;
-  vid = htons(pAlter->vnode);
-  sid = htonl(pAlter->sid);
-
-  if (vid >= TSDB_MAX_VNODES || vid < 0) {
-    dError("vid:%d, vnode is out of range", vid);
-    code = TSDB_CODE_INVALID_VNODE_ID;
-    goto _over;
-  }
-
-  pVnode = vnodeList + vid;
-  if (pVnode->cfg.maxSessions <= 0 || pVnode->pCachePool == NULL) {
-    dError("vid:%d is not activated yet", pAlter->vnode);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _over;
-  }
-
-  if (pAlter->sid >= pVnode->cfg.maxSessions || pAlter->sid < 0) {
-    dError("vid:%d sid:%d uid:%" PRIu64 ", sid is out of range", pAlter->vnode, pAlter->sid, pAlter->uid);
-    code = TSDB_CODE_INVALID_TABLE_ID;
-    goto _over;
-  }
-
-  SMeterObj *pMeterObj = vnodeList[vid].meterList[sid];
-  if (pMeterObj == NULL || sid != pMeterObj->sid || vid != pMeterObj->vnode) {
-    dError("vid:%d sid:%d, not active table", vid, sid);
-    code = TSDB_CODE_NOT_ACTIVE_TABLE;
-    goto _over;
-  }
-
-  pMeterObj->status = pAlter->status;
-  if (pMeterObj->status == 1) {
-    if (pAlter->stime > pMeterObj->lastKey)  // starting time can be specified
-      pMeterObj->lastKey = pAlter->stime;
-    vnodeCreateStream(pMeterObj);
-  } else {
-    vnodeRemoveStream(pMeterObj);
-  }
-
-  vnodeSaveMeterObjToFile(pMeterObj);
-
-_over:
-  taosSendSimpleRspToMnode(pObj, TSDB_MSG_TYPE_ALTER_STREAM_RSP, code);
-
-  return code;
-}
-
-int vnodeProcessCreateMeterMsg(char *pMsg, int msgLen) {
-  int         code;
-  SMeterObj * pObj = NULL;
-  SConnSec    connSec;
-  SCreateMsg *pCreate = (SCreateMsg *)pMsg;
-
-  pCreate->vnode = htons(pCreate->vnode);
-  pCreate->sid = htonl(pCreate->sid);
-  pCreate->lastCreate = htobe64(pCreate->lastCreate);
-  pCreate->timeStamp = htobe64(pCreate->timeStamp);
-
-  if (pCreate->vnode >= TSDB_MAX_VNODES || pCreate->vnode < 0) {
-    dError("vid:%d is out of range", pCreate->vnode);
-    code = TSDB_CODE_INVALID_VNODE_ID;
-    goto _create_over;
-  }
-
-  SVnodeObj *pVnode = vnodeList + pCreate->vnode;
-  if (pVnode->pCachePool == NULL) {
-    dError("vid:%d is not activated yet", pCreate->vnode);
-    vnodeSendVpeerCfgMsg(pCreate->vnode);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _create_over;
-  }
-
-  if (pCreate->sid >= pVnode->cfg.maxSessions || pCreate->sid < 0) {
-    dError("vid:%d sid:%d id:%s, sid is out of range", pCreate->vnode, pCreate->sid, pCreate->meterId);
-    code = TSDB_CODE_INVALID_TABLE_ID;
-    goto _create_over;
-  }
-
-  pCreate->numOfColumns = htons(pCreate->numOfColumns);
-  if (pCreate->numOfColumns <= 0) {
-    dTrace("vid:%d sid:%d id:%s, numOfColumns is out of range", pCreate->vnode, pCreate->sid, pCreate->meterId);
-    code = TSDB_CODE_OTHERS;
-    goto _create_over;
-  }
-
-  pCreate->sqlLen = htons(pCreate->sqlLen);
-  pObj = (SMeterObj *)calloc(1, sizeof(SMeterObj) + pCreate->sqlLen + 1);
-  if (pObj == NULL) {
-    dError("vid:%d sid:%d id:%s, no memory to allocate meterObj", pCreate->vnode, pCreate->sid, pCreate->meterId);
-    code = TSDB_CODE_NO_RESOURCE;
-    goto _create_over;
-  }
-
-  /*
-   * memory alignment may cause holes in SColumn struct which are not assigned any value
-   * therefore, we could not use memcmp to compare whether two SColumns are equal or not.
-   * So, we need to set the memory to 0 when allocating memory.
-   */
-  pObj->schema = (SColumn *)calloc(1, pCreate->numOfColumns * sizeof(SColumn));
-
-  pObj->vnode = pCreate->vnode;
-  pObj->sid = pCreate->sid;
-  pObj->uid = pCreate->uid;
-  memcpy(pObj->meterId, pCreate->meterId, TSDB_METER_ID_LEN);
-  pObj->numOfColumns = pCreate->numOfColumns;
-  pObj->timeStamp = pCreate->timeStamp;
-  pObj->sversion = htonl(pCreate->sversion);
-  pObj->maxBytes = 0;
-
-  for (int i = 0; i < pObj->numOfColumns; ++i) {
-    pObj->schema[i].type = pCreate->schema[i].type;
-    pObj->schema[i].bytes = htons(pCreate->schema[i].bytes);
-    pObj->schema[i].colId = htons(pCreate->schema[i].colId);
-    pObj->bytesPerPoint += pObj->schema[i].bytes;
-    if (pObj->maxBytes < pObj->schema[i].bytes) pObj->maxBytes = pObj->schema[i].bytes;
-  }
-
-  if (pCreate->sqlLen > 0) {
-    pObj->sqlLen = pCreate->sqlLen;
-    pObj->pSql = ((char *)pObj) + sizeof(SMeterObj);
-    memcpy(pObj->pSql, (char *)pCreate->schema + pCreate->numOfColumns * sizeof(SMColumn), pCreate->sqlLen);
-    pObj->pSql[pCreate->sqlLen] = 0;
-  }
-
-  pObj->pointsPerFileBlock = pVnode->cfg.rowsInFileBlock;
-
-  if (sizeof(TSKEY) != pObj->schema[0].bytes) {
-    dError("key length is not matched, required key length:%d", sizeof(TSKEY));
-    code = TSDB_CODE_OTHERS;
-    goto _create_over;
-  }
-
-  // security info shall be saved here
-  connSec.spi = pCreate->spi;
-  connSec.encrypt = pCreate->encrypt;
-  memcpy(connSec.secret, pCreate->secret, TSDB_KEY_LEN);
-  memcpy(connSec.cipheringKey, pCreate->cipheringKey, TSDB_KEY_LEN);
-
-  code = vnodeCreateMeterObj(pObj, &connSec);
-
-_create_over:
-  if (code != TSDB_CODE_SUCCESS) {
-    dTrace("vid:%d sid:%d id:%s, failed to create meterObj", pCreate->vnode, pCreate->sid, pCreate->meterId);
-    tfree(pObj);
-  }
-
-  return code;
-}
-
-int vnodeProcessRemoveMeterRequest(char *pMsg, int msgLen, SMgmtObj *pMgmtObj) {
-  SMeterObj *      pObj;
-  SRemoveMeterMsg *pRemove;
-  int              code = 0;
-
-  pRemove = (SRemoveMeterMsg *)pMsg;
-  pRemove->vnode = htons(pRemove->vnode);
-  pRemove->sid = htonl(pRemove->sid);
-
-  if (pRemove->vnode < 0 || pRemove->vnode >= TSDB_MAX_VNODES) {
-    dWarn("vid:%d sid:%d, already removed", pRemove->vnode, pRemove->sid);
-    goto _remove_over;
-  }
-
-  if (vnodeList[pRemove->vnode].meterList == NULL) goto _remove_over;
-
-  pObj = vnodeList[pRemove->vnode].meterList[pRemove->sid];
-  if (pObj == NULL) goto _remove_over;
-
-  if (memcmp(pObj->meterId, pRemove->meterId, TSDB_METER_ID_LEN) != 0) {
-    dWarn("vid:%d sid:%d id:%s, remove ID:%s, meter ID not matched", pObj->vnode, pObj->sid, pObj->meterId,
-          pRemove->meterId);
-    goto _remove_over;
-  }
-
-  if (vnodeRemoveMeterObj(pRemove->vnode, pRemove->sid) == TSDB_CODE_ACTION_IN_PROGRESS) {
-    code = TSDB_CODE_ACTION_IN_PROGRESS;
-    goto _remove_over;
-  }
-
-  dTrace("vid:%d sid:%d id:%s, meterObj is removed", pRemove->vnode, pRemove->sid, pRemove->meterId);
-
-_remove_over:
-  taosSendSimpleRspToMnode(pMgmtObj, TSDB_MSG_TYPE_REMOVE_RSP, code);
-  return 0;
-}
-
-int vnodeProcessVPeerCfg(char *msg, int msgLen, SMgmtObj *pMgmtObj) {
-  SVPeersMsg *pMsg = (SVPeersMsg *)msg;
-  int         i, vnode;
-
-  vnode = htonl(pMsg->vnode);
-  if (vnode >= TSDB_MAX_VNODES) {
-    dError("vid:%d, vnode is out of range", vnode);
-    return -1;
-  }
-
-  if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_CREATING) {
-    dTrace("vid:%d, vnode is still under creating", vnode);
-    return 0;
-  }
-
-  SVnodeCfg *pCfg = &pMsg->cfg;
-  pCfg->vgId = htonl(pCfg->vgId);
-  pCfg->maxSessions = htonl(pCfg->maxSessions);
-  pCfg->cacheBlockSize = htonl(pCfg->cacheBlockSize);
-  pCfg->cacheNumOfBlocks.totalBlocks = htonl(pCfg->cacheNumOfBlocks.totalBlocks);
-  pCfg->daysPerFile = htonl(pCfg->daysPerFile);
-  pCfg->daysToKeep1 = htonl(pCfg->daysToKeep1);
-  pCfg->daysToKeep2 = htonl(pCfg->daysToKeep2);
-  pCfg->daysToKeep = htonl(pCfg->daysToKeep);
-  pCfg->commitTime = htonl(pCfg->commitTime);
-  pCfg->blocksPerMeter = htons(pCfg->blocksPerMeter);
-  pCfg->rowsInFileBlock = htonl(pCfg->rowsInFileBlock);
-
-  if (pCfg->replications > 0) {
-    dPrint("vid:%d, vpeer cfg received, replica:%d session:%d, vnodeList replica:%d session:%d, acct:%s db:%s",
-        vnode, pCfg->replications, pCfg->maxSessions, vnodeList[vnode].cfg.replications, vnodeList[vnode].cfg.maxSessions,
-        pCfg->acct, pCfg->db);
-    for (i = 0; i < pCfg->replications; ++i) {
-      pMsg->vpeerDesc[i].vnode = htonl(pMsg->vpeerDesc[i].vnode);
-      pMsg->vpeerDesc[i].ip = htonl(pMsg->vpeerDesc[i].ip);
-      dPrint("vid:%d, vpeer:%d ip:0x%x vid:%d ", vnode, i, pMsg->vpeerDesc[i].ip, pMsg->vpeerDesc[i].vnode);
-    }
-  }
-
-  if (vnodeList[vnode].cfg.maxSessions == 0) {
-    dPrint("vid:%d, vnode is empty", vnode);
-    if (pCfg->maxSessions > 0) {
-      if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_OFFLINE) {
-        dPrint("vid:%d, status:%s, start to create vnode", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-        return vnodeCreateVnode(vnode, pCfg, pMsg->vpeerDesc);
-      } else {
-        dPrint("vid:%d, status:%s, cannot preform create vnode operation", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-        return TSDB_CODE_INVALID_VNODE_STATUS;
-      }
-    }
-  } else {
-    dPrint("vid:%d, vnode is not empty", vnode);
-    if (pCfg->maxSessions > 0) {
-      if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_DELETING) {
-        dPrint("vid:%d, status:%s, wait vnode delete finished", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-      } else {
-        dPrint("vid:%d, status:%s, start to update vnode", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-
-        if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
-          vnodeCleanUpOneVnode(vnode);
-        }
-
-        vnodeConfigVPeers(vnode, pCfg->replications, pMsg->vpeerDesc);
-        vnodeSaveVnodeCfg(vnode, pCfg, pMsg->vpeerDesc);
-
-        /*
-        if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
-          vnodeUpdateHeadFile(vnode, vnodeList[vnode].cfg.maxSessions, pCfg->maxSessions);
-          vnodeList[vnode].cfg.maxSessions = pCfg->maxSessions;
-          vnodeOpenVnode(vnode);
-        }
-        */
-      }
-      return 0;
-    } else {
-      dPrint("vid:%d, status:%s, start to delete vnode", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-      vnodeRemoveVnode(vnode);
-    }
-  }
-
-  return 0;
-}
-
-int vnodeProcessVPeerCfgRsp(char *msg, int msgLen, SMgmtObj *pMgmtObj) {
-  STaosRsp *pRsp;
-
-  pRsp = (STaosRsp *)msg;
-
-  if (pRsp->code == 0) {
-    vnodeProcessVPeerCfg(pRsp->more, msgLen - sizeof(STaosRsp), pMgmtObj);
-  } else {
-    int32_t *pint = (int32_t *)pRsp->more;
-    int      vnode = htonl(*pint);
-    if (vnode < TSDB_MAX_VNODES && vnodeList[vnode].lastKey != 0) {
-      dError("vnode:%d not configured, it shall be empty, code:%d", vnode, pRsp->code);
-      vnodeRemoveVnode(vnode);
-    } else {
-      dError("vnode:%d is invalid, code:%d", vnode, pRsp->code);
-    }
-  }
-
-  return 0;
-}
-
-int vnodeProcessVPeersMsg(char *msg, int msgLen, SMgmtObj *pMgmtObj) {
-  int code = 0;
-
-  code = vnodeProcessVPeerCfg(msg, msgLen, pMgmtObj);
-
-  char *      pStart;
-  STaosRsp *  pRsp;
-  SVPeersMsg *pVPeersMsg = (SVPeersMsg *)msg;
-
-  pStart = taosBuildRspMsgToMnode(pMgmtObj, TSDB_MSG_TYPE_VPEERS_RSP);
-  if (pStart == NULL) return -1;
-
-  pRsp = (STaosRsp *)pStart;
-  pRsp->code = code;
-  memcpy(pRsp->more, pVPeersMsg->cfg.db, TSDB_DB_NAME_LEN);
-
-  msgLen = sizeof(STaosRsp) + TSDB_DB_NAME_LEN;
-  taosSendMsgToMnode(pMgmtObj, pStart, msgLen);
-
-  return code;
-}
-
-int vnodeProcessFreeVnodeRequest(char *pMsg, int msgLen, SMgmtObj *pMgmtObj) {
-  SFreeVnodeMsg *pFree;
-
-  pFree = (SFreeVnodeMsg *)pMsg;
-  pFree->vnode = htons(pFree->vnode);
-
-  if (pFree->vnode < 0 || pFree->vnode >= TSDB_MAX_VNODES) {
-    dWarn("vid:%d, out of range", pFree->vnode);
-    return -1;
-  }
-
-  dTrace("vid:%d, receive free vnode message", pFree->vnode);
-  int32_t code = vnodeRemoveVnode(pFree->vnode);
-  assert(code == TSDB_CODE_SUCCESS || code == TSDB_CODE_ACTION_IN_PROGRESS);
-
-  taosSendSimpleRspToMnode(pMgmtObj, TSDB_MSG_TYPE_FREE_VNODE_RSP, code);
-  return 0;
-}
-
-int vnodeProcessCfgDnodeRequest(char *cont, int contLen, SMgmtObj *pMgmtObj) {
-  SCfgMsg *pCfg = (SCfgMsg *)cont;
-
-  int code = tsCfgDynamicOptions(pCfg->config);
-
-  taosSendSimpleRspToMnode(pMgmtObj, TSDB_MSG_TYPE_CFG_PNODE_RSP, code);
-
-  return 0;
-}
-
-void vnodeSendVpeerCfgMsg(int vnode) {
-  char *        pMsg, *pStart;
-  int           msgLen;
-  SVpeerCfgMsg *pCfg;
-  SMgmtObj *    pObj = &mgmtObj;
-
-  pStart = taosBuildReqMsgToMnode(pObj, TSDB_MSG_TYPE_VPEER_CFG);
-  if (pStart == NULL) return;
-  pMsg = pStart;
-
-  pCfg = (SVpeerCfgMsg *)pMsg;
-  pCfg->vnode = htonl(vnode);
-  pMsg += sizeof(SVpeerCfgMsg);
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToMnode(pObj, pStart, msgLen);
-}
-
-int vnodeSendMeterCfgMsg(int vnode, int sid) {
-  char *        pMsg, *pStart;
-  int           msgLen;
-  SMeterCfgMsg *pCfg;
-  SMgmtObj *    pObj = &mgmtObj;
-
-  pStart = taosBuildReqMsgToMnode(pObj, TSDB_MSG_TYPE_METER_CFG);
-  if (pStart == NULL) return -1;
-  pMsg = pStart;
-
-  pCfg = (SMeterCfgMsg *)pMsg;
-  pCfg->vnode = htonl(vnode);
-  pCfg->sid = htonl(sid);
-  pMsg += sizeof(SMeterCfgMsg);
-
-  msgLen = pMsg - pStart;
-  return taosSendMsgToMnode(pObj, pStart, msgLen);
-}
diff --git a/src/system/detail/src/dnodeService.c b/src/system/detail/src/dnodeService.c
deleted file mode 100644
index 742efb7b6a72856095759d7bf8262f50103185f8..0000000000000000000000000000000000000000
--- a/src/system/detail/src/dnodeService.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "tglobalcfg.h"
-#include "tsdb.h"
-#include "vnode.h"
-
-/* Termination handler */
-void signal_handler(int signum, siginfo_t *sigInfo, void *context) {
-  if (signum == SIGUSR1) {
-    tsCfgDynamicOptions("debugFlag 135");
-    return;
-  }
-  if (signum == SIGUSR2) {
-    tsCfgDynamicOptions("resetlog");
-    return;
-  }
-  syslog(LOG_INFO, "Shut down signal is %d", signum);
-  syslog(LOG_INFO, "Shutting down TDengine service...");
-  // clean the system.
-  dPrint("shut down signal is %d, sender PID:%d", signum, sigInfo->si_pid);
-  dnodeCleanUpSystem();
-  // close the syslog
-  syslog(LOG_INFO, "Shut down TDengine service successfully");
-  dPrint("TDengine is shut down!");
-  closelog();
-  exit(EXIT_SUCCESS);
-}
-
-int main(int argc, char *argv[]) {
-  // Set global configuration file
-  for (int i = 1; i < argc; ++i) {
-    if (strcmp(argv[i], "-c") == 0) {
-      if (i < argc - 1) {
-        strcpy(configDir, argv[++i]);
-      } else {
-        printf("'-c' requires a parameter, default:%s\n", configDir);
-        exit(EXIT_FAILURE);
-      }
-    } else if (strcmp(argv[i], "-V") == 0) {
-      char *versionStr = tsIsCluster ? "enterprise" : "community";
-      printf("%s version: %s compatible_version: %s\n", versionStr, version, compatible_version);
-      printf("gitinfo: %s\n", gitinfo);
-      printf("gitinfoI: %s\n", gitinfoOfInternal);
-      printf("buildinfo: %s\n", buildinfo);
-      return 0;
-    } else if (strcmp(argv[i], "-k") == 0) {
-      dnodeParseParameterK();
-#ifdef TAOS_MEM_CHECK
-    } else if (strcmp(argv[i], "--alloc-random-fail") == 0) {
-      if ((i < argc - 1) && (argv[i+1][0] != '-')) {
-        taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, argv[++i], true);
-      } else {
-        taosSetAllocMode(TAOS_ALLOC_MODE_RANDOM_FAIL, NULL, true);
-      }
-    } else if (strcmp(argv[i], "--detect-mem-leak") == 0) {
-      if ((i < argc - 1) && (argv[i+1][0] != '-')) {
-        taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, argv[++i], true);
-      } else {
-        taosSetAllocMode(TAOS_ALLOC_MODE_DETECT_LEAK, NULL, true);
-      }
-#endif
-    }
-  }
-
-  /* Set termination handler. */
-  struct sigaction act;
-  act.sa_flags = SA_SIGINFO;
-  act.sa_sigaction = signal_handler;
-  sigaction(SIGTERM, &act, NULL);
-  sigaction(SIGHUP, &act, NULL);
-  sigaction(SIGINT, &act, NULL);
-  sigaction(SIGUSR1, &act, NULL);
-  sigaction(SIGUSR2, &act, NULL);
-  // sigaction(SIGABRT, &act, NULL);
-
-  // Open /var/log/syslog file to record information.
-  openlog("TDengine:", LOG_PID | LOG_CONS | LOG_NDELAY, LOG_LOCAL1);
-  syslog(LOG_INFO, "Starting TDengine service...");
-
-  // Initialize the system
-  if (dnodeInitSystem() < 0) {
-    syslog(LOG_ERR, "Error initialize TDengine system");
-    closelog();
-
-    dnodeCleanUpSystem();
-    exit(EXIT_FAILURE);
-  }
-
-  syslog(LOG_INFO, "Started TDengine service successfully.");
-
-  while (1) {
-    sleep(1000);
-  }
-}
diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c
deleted file mode 100644
index 49e9a37590996921b1784c56e5edca4246fd2bd0..0000000000000000000000000000000000000000
--- a/src/system/detail/src/dnodeSystem.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "vnode.h"
-
-#include "dnodeSystem.h"
-#include "httpSystem.h"
-#include "monitorSystem.h"
-#include "tcrc32c.h"
-#include "tglobalcfg.h"
-#include "vnode.h"
-
-SModule         tsModule[TSDB_MOD_MAX] = {0};
-uint32_t        tsModuleStatus = 0;
-pthread_mutex_t dmutex;
-extern int      vnodeSelectReqNum;
-extern int      vnodeInsertReqNum;
-void *          tsStatusTimer = NULL;
-bool            tsDnodeStopping = false;
-
-int  dnodeCheckConfig();
-void dnodeCountRequest(SCountInfo *info);
-
-void dnodeInitModules() {
-  tsModule[TSDB_MOD_MGMT].name = "mgmt";
-  tsModule[TSDB_MOD_MGMT].initFp = mgmtInitSystem;
-  tsModule[TSDB_MOD_MGMT].cleanUpFp = mgmtCleanUpSystem;
-  tsModule[TSDB_MOD_MGMT].startFp = mgmtStartSystem;
-  tsModule[TSDB_MOD_MGMT].stopFp = mgmtStopSystem;
-  tsModule[TSDB_MOD_MGMT].num = tsNumOfMPeers;
-  tsModule[TSDB_MOD_MGMT].curNum = 0;
-  tsModule[TSDB_MOD_MGMT].equalVnodeNum = tsMgmtEqualVnodeNum;
-
-  tsModule[TSDB_MOD_HTTP].name = "http";
-  tsModule[TSDB_MOD_HTTP].initFp = httpInitSystem;
-  tsModule[TSDB_MOD_HTTP].cleanUpFp = httpCleanUpSystem;
-  tsModule[TSDB_MOD_HTTP].startFp = httpStartSystem;
-  tsModule[TSDB_MOD_HTTP].stopFp = httpStopSystem;
-  tsModule[TSDB_MOD_HTTP].num = (tsEnableHttpModule == 1) ? -1 : 0;
-  tsModule[TSDB_MOD_HTTP].curNum = 0;
-  tsModule[TSDB_MOD_HTTP].equalVnodeNum = 0;
-
-  tsModule[TSDB_MOD_MONITOR].name = "monitor";
-  tsModule[TSDB_MOD_MONITOR].initFp = monitorInitSystem;
-  tsModule[TSDB_MOD_MONITOR].cleanUpFp = monitorCleanUpSystem;
-  tsModule[TSDB_MOD_MONITOR].startFp = monitorStartSystem;
-  tsModule[TSDB_MOD_MONITOR].stopFp = monitorStopSystem;
-  tsModule[TSDB_MOD_MONITOR].num = (tsEnableMonitorModule == 1) ? -1 : 0;
-  tsModule[TSDB_MOD_MONITOR].curNum = 0;
-  tsModule[TSDB_MOD_MONITOR].equalVnodeNum = 0;
-}
-
-void dnodeCleanUpSystem() {
-  if (tsDnodeStopping) return;
-  tsDnodeStopping = true;
-
-  if (tsStatusTimer != NULL) {
-    taosTmrStopA(&tsStatusTimer);
-    tsStatusTimer = NULL;
-  }
-
-  for (int mod = 1; mod < TSDB_MOD_MAX; ++mod) {
-    if (tsModule[mod].num != 0 && tsModule[mod].stopFp) {
-      (*tsModule[mod].stopFp)();
-    }
-    if (tsModule[mod].num != 0 && tsModule[mod].cleanUpFp) {
-      (*tsModule[mod].cleanUpFp)();
-    }
-  }
-
-  if (tsModule[TSDB_MOD_MGMT].num != 0 && tsModule[TSDB_MOD_MGMT].cleanUpFp) {
-    (*tsModule[TSDB_MOD_MGMT].cleanUpFp)();
-  }
-
-  vnodeCleanUpVnodes();
-
-  taosCloseLogger();
-  taosCleanupTier();
-}
-
-void dnodeCheckDbRunning(const char* dir) {
-  char filepath[256] = {0};
-  sprintf(filepath, "%s/.running", dir);
-  int fd = open(filepath, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  int ret = flock(fd, LOCK_EX | LOCK_NB);
-  if (ret != 0) {
-    dError("failed to lock file:%s ret:%d, database may be running, quit", filepath, ret);
-    exit(0);
-  }
-}
-
-int dnodeInitSystem() {
-  char        temp[128];
-  struct stat dirstat;
-
-  taosResolveCRC();
-
-  tsRebootTime = taosGetTimestampSec();
-  tscEmbedded = 1;
-
-  // Read global configuration.
-  tsReadGlobalLogConfig();
-
-  if (stat(logDir, &dirstat) < 0) mkdir(logDir, 0755);
-
-  sprintf(temp, "%s/taosdlog", logDir);
-  if (taosInitLog(temp, tsNumOfLogLines, 1) < 0) printf("failed to init log file\n");
-
-  if (!tsReadGlobalConfig()) {  // TODO : Change this function
-    tsPrintGlobalConfig();
-    dError("TDengine read global config failed");
-    return -1;
-  }
-
-  if (taosCreateTierDirectory() != 0) {
-    dError("TDengine init tier directory failed");
-    return -1;
-  }
-
-  vnodeInitMgmtIp();
-
-  tsPrintGlobalConfig();
-  dPrint("Server IP address is:%s", tsPrivateIp);
-
-  taosSetCoreDump();
-
-  signal(SIGPIPE, SIG_IGN);
-
-  dnodeInitModules();
-  pthread_mutex_init(&dmutex, NULL);
-
-  dPrint("starting to initialize TDengine ...");
-
-  vnodeInitQHandle();
-  if (dnodeInitSystemSpec() < 0) {
-    return -1;
-  }
-  
-  for (int mod = 0; mod < TSDB_MOD_MAX; ++mod) {
-    if (tsModule[mod].num != 0 && tsModule[mod].initFp) {
-      if ((*tsModule[mod].initFp)() != 0) {
-        dError("TDengine initialization failed");
-        return -1;
-      }
-    }
-  }
-
-  if (vnodeInitSystem() != 0) {
-    dError("TDengine vnodes initialization failed");
-    return -1;
-  }
-
-  monitorCountReqFp = dnodeCountRequest;
-
-  dnodeStartModuleSpec();
-
-  dPrint("TDengine is initialized successfully");
-
-  return 0;
-}
-
-void dnodeProcessModuleStatus(uint32_t status) {
-  if (tsDnodeStopping) return;
-
-  int news = status;
-  int olds = tsModuleStatus;
-
-  for (int moduleType = 0; moduleType < TSDB_MOD_MAX; ++moduleType) {
-    int newStatus = news & (1 << moduleType);
-    int oldStatus = olds & (1 << moduleType);
-
-    if (oldStatus > 0) {
-      if (newStatus == 0) {
-        if (tsModule[moduleType].stopFp) {
-          dPrint("module:%s is stopped on this node", tsModule[moduleType].name);
-          (*tsModule[moduleType].stopFp)();
-        }
-      }
-    } else if (oldStatus == 0) {
-      if (newStatus > 0) {
-        if (tsModule[moduleType].startFp) {
-          dPrint("module:%s is started on this node", tsModule[moduleType].name);
-          (*tsModule[moduleType].startFp)();
-        }
-      }
-    } else {
-    }
-  }
-  tsModuleStatus = status;
-}
-
-void dnodeResetSystem() {
-  dPrint("reset the system ...");
-  for (int vnode = 0; vnode < TSDB_MAX_VNODES; ++vnode) vnodeRemoveVnode(vnode);
-  mgmtStopSystem();
-}
-
-void dnodeCountRequest(SCountInfo *info) {
-  httpGetReqCount(&info->httpReqNum);
-  info->selectReqNum = atomic_exchange_32(&vnodeSelectReqNum, 0);
-  info->insertReqNum = atomic_exchange_32(&vnodeInsertReqNum, 0);
-}
diff --git a/src/system/detail/src/mgmtAcct.c b/src/system/detail/src/mgmtAcct.c
deleted file mode 100644
index e5f52b17f963dfeaf915c21aeedf61e9655d8cd1..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtAcct.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "tschemautil.h"
-
-int mgmtGetAcctsNum();
-SShowObj *mgmtGetNextAcct(SShowObj *pShow, SAcctObj **pAcct);
-
-int mgmtAddDbIntoAcct(SAcctObj *pAcct, SDbObj *pDb) {
-  pthread_mutex_lock(&pAcct->mutex);
-  pDb->next = pAcct->pHead;
-  pDb->prev = NULL;
-
-  if (pAcct->pHead) pAcct->pHead->prev = pDb;
-
-  pAcct->pHead = pDb;
-  pAcct->acctInfo.numOfDbs++;
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtRemoveDbFromAcct(SAcctObj *pAcct, SDbObj *pDb) {
-  pthread_mutex_lock(&pAcct->mutex);
-  if (pDb->prev) pDb->prev->next = pDb->next;
-
-  if (pDb->next) pDb->next->prev = pDb->prev;
-
-  if (pDb->prev == NULL) pAcct->pHead = pDb->next;
-
-  pAcct->acctInfo.numOfDbs--;
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtAddUserIntoAcct(SAcctObj *pAcct, SUserObj *pUser) {
-  pthread_mutex_lock(&pAcct->mutex);
-  pUser->next = pAcct->pUser;
-  pUser->prev = NULL;
-
-  if (pAcct->pUser) pAcct->pUser->prev = pUser;
-
-  pAcct->pUser = pUser;
-  pAcct->acctInfo.numOfUsers++;
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtRemoveUserFromAcct(SAcctObj *pAcct, SUserObj *pUser) {
-  pthread_mutex_lock(&pAcct->mutex);
-  if (pUser->prev) pUser->prev->next = pUser->next;
-
-  if (pUser->next) pUser->next->prev = pUser->prev;
-
-  if (pUser->prev == NULL) pAcct->pUser = pUser->next;
-
-  pAcct->acctInfo.numOfUsers--;
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtAddConnIntoAcct(SConnObj *pConn) {
-  SAcctObj *pAcct = pConn->pAcct;
-  if (pAcct == NULL) return 0;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  assert(pConn != pAcct->pConn);
-
-  pConn->next = pAcct->pConn;
-  pConn->prev = NULL;
-
-  if (pAcct->pConn) pAcct->pConn->prev = pConn;
-
-  pAcct->pConn = pConn;
-  pAcct->acctInfo.numOfConns++;
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtRemoveConnFromAcct(SConnObj *pConn) {
-  SAcctObj *pAcct = pConn->pAcct;
-  if (pAcct == NULL) return 0;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  if (pConn->prev) pConn->prev->next = pConn->next;
-
-  if (pConn->next) pConn->next->prev = pConn->prev;
-
-  if (pConn->prev == NULL) pAcct->pConn = pConn->next;
-
-  pAcct->acctInfo.numOfConns--;
-  // pAcct->numOfUsers--;
-
-  if (pConn->pQList) {
-    pAcct->acctInfo.numOfQueries -= pConn->pQList->numOfQueries;
-    pAcct->acctInfo.numOfStreams -= pConn->pSList->numOfStreams;
-  }
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  pConn->next = NULL;
-  pConn->prev = NULL;
-
-  return 0;
-}
diff --git a/src/system/detail/src/mgmtConn.c b/src/system/detail/src/mgmtConn.c
deleted file mode 100644
index b440a1042e30756f50481f63afb5d82c37c5afc7..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtConn.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-
-#include "mgmt.h"
-#include "taosmsg.h"
-#include "tschemautil.h"
-
-typedef struct {
-  char     user[TSDB_METER_ID_LEN];
-  uint64_t stime;
-  uint32_t ip;
-  uint16_t port;
-} SConnInfo;
-
-typedef struct {
-  int       numOfConns;
-  int       index;
-  SConnInfo connInfo[];
-} SConnShow;
-
-int mgmtGetConns(SShowObj *pShow, SConnObj *pConn) {
-  SAcctObj * pAcct = pConn->pAcct;
-  SConnShow *pConnShow;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pConnShow = malloc(sizeof(SConnInfo) * pAcct->acctInfo.numOfConns + sizeof(SConnShow));
-  pConnShow->index = 0;
-  pConnShow->numOfConns = 0;
-
-  if (pAcct->acctInfo.numOfConns > 0) {
-    pConn = pAcct->pConn;
-    SConnInfo *pConnInfo = pConnShow->connInfo;
-
-    while (pConn && pConn->pUser) {
-      strcpy(pConnInfo->user, pConn->pUser->user);
-      pConnInfo->ip = pConn->ip;
-      pConnInfo->port = pConn->port;
-      pConnInfo->stime = pConn->stime;
-
-      pConnShow->numOfConns++;
-      pConnInfo++;
-      pConn = pConn->next;
-    }
-  }
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  // sorting based on useconds
-
-  pShow->pNode = pConnShow;
-
-  return 0;
-}
-
-int mgmtGetConnsMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  pShow->bytes[cols] = TSDB_METER_NAME_LEN;
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "user");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 6;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "ip:port");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "login time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = 1000000;
-  pShow->pNode = NULL;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  mgmtGetConns(pShow, pConn);
-  return 0;
-}
-
-int mgmtRetrieveConns(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int   numOfRows = 0;
-  char *pWrite;
-  int   cols = 0;
-
-  SConnShow *pConnShow = (SConnShow *)pShow->pNode;
-
-  if (rows > pConnShow->numOfConns - pConnShow->index) rows = pConnShow->numOfConns - pConnShow->index;
-
-  while (numOfRows < rows) {
-    SConnInfo *pNode = pConnShow->connInfo + pConnShow->index;
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pNode->user);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    uint32_t ip = pNode->ip;
-    sprintf(pWrite, "%d.%d.%d.%d:%hu", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24, htons(pNode->port));
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->stime;
-    cols++;
-
-    numOfRows++;
-    pConnShow->index++;
-  }
-
-  if (numOfRows == 0) {
-    tfree(pConnShow);
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
diff --git a/src/system/detail/src/mgmtDb.c b/src/system/detail/src/mgmtDb.c
deleted file mode 100644
index b935b68425e053a1a4ed466d65c8c790c701f384..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtDb.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "mgmtBalance.h"
-#include "mgmtUtil.h"
-#include "tschemautil.h"
-#include "vnodeStatus.h"
-
-void *dbSdb = NULL;
-int   tsDbUpdateSize;
-
-void *(*mgmtDbActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionInsert(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionDelete(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionEncode(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionDecode(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionAfterBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionReset(void *row, char *str, int size, int *ssize);
-void *mgmtDbActionDestroy(void *row, char *str, int size, int *ssize);
-
-int mgmtCheckDbGrant();
-int mgmtCheckDbLimit(SAcctObj *pAcct);
-
-void mgmtDbActionInit() {
-  mgmtDbActionFp[SDB_TYPE_INSERT] = mgmtDbActionInsert;
-  mgmtDbActionFp[SDB_TYPE_DELETE] = mgmtDbActionDelete;
-  mgmtDbActionFp[SDB_TYPE_UPDATE] = mgmtDbActionUpdate;
-  mgmtDbActionFp[SDB_TYPE_ENCODE] = mgmtDbActionEncode;
-  mgmtDbActionFp[SDB_TYPE_DECODE] = mgmtDbActionDecode;
-  mgmtDbActionFp[SDB_TYPE_BEFORE_BATCH_UPDATE] = mgmtDbActionBeforeBatchUpdate;
-  mgmtDbActionFp[SDB_TYPE_BATCH_UPDATE] = mgmtDbActionBatchUpdate;
-  mgmtDbActionFp[SDB_TYPE_AFTER_BATCH_UPDATE] = mgmtDbActionAfterBatchUpdate;
-  mgmtDbActionFp[SDB_TYPE_RESET] = mgmtDbActionReset;
-  mgmtDbActionFp[SDB_TYPE_DESTROY] = mgmtDbActionDestroy;
-}
-
-void *mgmtDbAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtDbActionFp[(uint8_t)action] != NULL) {
-    return (*(mgmtDbActionFp[(uint8_t)action]))(row, str, size, ssize);
-  }
-  return NULL;
-}
-
-void mgmtGetAcctStr(char *src, char *dest) {
-  char *pos = strstr(src, TS_PATH_DELIMITER);
-  while ((pos != NULL) && (*src != *pos)) {
-    *dest = *src;
-    src++;
-    dest++;
-  }
-
-  *dest = 0;
-}
-
-int mgmtInitDbs() {
-  void *    pNode = NULL;
-  SDbObj *  pDb = NULL;
-  SAcctObj *pAcct = NULL;
-
-  mgmtDbActionInit();
-
-  dbSdb = sdbOpenTable(tsMaxDbs, sizeof(SDbObj), "db", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtDbAction);
-  if (dbSdb == NULL) {
-    mError("failed to init db data");
-    return -1;
-  }
-
-  while (1) {
-    pNode = sdbFetchRow(dbSdb, pNode, (void **)&pDb);
-    if (pDb == NULL) break;
-
-    pDb->pHead = NULL;
-    pDb->pTail = NULL;
-    pDb->prev = NULL;
-    pDb->next = NULL;
-    pDb->numOfTables = 0;
-    pDb->numOfVgroups = 0;
-    pDb->numOfMetrics = 0;
-    pDb->vgStatus = TSDB_VG_STATUS_READY;
-    pDb->vgTimer = NULL;
-    pDb->pMetric = NULL;
-    pAcct = mgmtGetAcct(pDb->cfg.acct);
-    if (pAcct != NULL)
-      mgmtAddDbIntoAcct(pAcct, pDb);
-    else {
-      mError("db:%s acct:%s info not exist in sdb", pDb->name, pDb->cfg.acct);
-    }
-  }
-
-  SDbObj tObj;
-  tsDbUpdateSize = tObj.updateEnd - (char *)&tObj;
-
-  mTrace("db data is initialized");
-  return 0;
-}
-
-SDbObj *mgmtGetDb(char *db) { return (SDbObj *)sdbGetRow(dbSdb, db); }
-
-SDbObj *mgmtGetDbByMeterId(char *meterId) {
-  char db[TSDB_METER_ID_LEN], *pos;
-
-  pos = strstr(meterId, TS_PATH_DELIMITER);
-  pos = strstr(pos + 1, TS_PATH_DELIMITER);
-  memset(db, 0, sizeof(db));
-  strncpy(db, meterId, pos - meterId);
-
-  return (SDbObj *)sdbGetRow(dbSdb, db);
-}
-
-int mgmtCheckDbParams(SCreateDbMsg *pCreate) {
-  // assign default parameters
-  if (pCreate->maxSessions < 0) pCreate->maxSessions = tsSessionsPerVnode;      //
-  if (pCreate->cacheBlockSize < 0) pCreate->cacheBlockSize = tsCacheBlockSize;  //
-  if (pCreate->daysPerFile < 0) pCreate->daysPerFile = tsDaysPerFile;           //
-  if (pCreate->daysToKeep < 0) pCreate->daysToKeep = tsDaysToKeep;              //
-  if (pCreate->daysToKeep1 < 0) pCreate->daysToKeep1 = pCreate->daysToKeep;     //
-  if (pCreate->daysToKeep2 < 0) pCreate->daysToKeep2 = pCreate->daysToKeep;     //
-  if (pCreate->commitTime < 0) pCreate->commitTime = tsCommitTime;              //
-  if (pCreate->compression < 0) pCreate->compression = tsCompression;           //
-  if (pCreate->commitLog < 0) pCreate->commitLog = tsCommitLog;
-  if (pCreate->replications < 0) pCreate->replications = tsReplications;                                  //
-  if (pCreate->rowsInFileBlock < 0) pCreate->rowsInFileBlock = tsRowsInFileBlock;                         //
-  if (pCreate->cacheNumOfBlocks.fraction < 0) pCreate->cacheNumOfBlocks.fraction = tsAverageCacheBlocks;  //
-  
-  if (mgmtCheckDBParams(pCreate) != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  pCreate->cacheNumOfBlocks.totalBlocks = (int32_t)(pCreate->cacheNumOfBlocks.fraction * pCreate->maxSessions);
-  
-  if (pCreate->cacheNumOfBlocks.totalBlocks > TSDB_MAX_CACHE_BLOCKS) {
-    mTrace("invalid db option cacheNumOfBlocks: %d valid range: [%d, %d]", pCreate->cacheNumOfBlocks.totalBlocks,
-           TSDB_MIN_CACHE_BLOCKS, TSDB_MAX_CACHE_BLOCKS);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-
-  // calculate the blocks per table
-  if (pCreate->blocksPerMeter < 0) {
-    pCreate->blocksPerMeter = pCreate->cacheNumOfBlocks.totalBlocks / 4;
-  }
-  
-  if (pCreate->blocksPerMeter > pCreate->cacheNumOfBlocks.totalBlocks * 3 / 4) {
-    pCreate->blocksPerMeter = pCreate->cacheNumOfBlocks.totalBlocks * 3 / 4;
-  }
-  
-  if (pCreate->blocksPerMeter < TSDB_MIN_AVG_BLOCKS) {
-    pCreate->blocksPerMeter = TSDB_MIN_AVG_BLOCKS;
-  }
-
-  pCreate->maxSessions++;
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int mgmtCreateDb(SAcctObj *pAcct, SCreateDbMsg *pCreate) {
-  SDbObj *pDb;
-  int code;
-
-  code = mgmtCheckDbLimit(pAcct);
-  if (code != 0) {
-    return code;
-  }
-
-  pDb = (SDbObj *)sdbGetRow(dbSdb, pCreate->db);
-  if (pDb != NULL) {
-    return TSDB_CODE_DB_ALREADY_EXIST;
-  }
-
-  code = mgmtCheckDbParams(pCreate);
-  if (code != TSDB_CODE_SUCCESS) return code;
-
-  assert(pCreate->daysToKeep1 <= pCreate->daysToKeep2 && pCreate->daysToKeep2 <= pCreate->daysToKeep);
-
-  code = mgmtCheckDbGrant();
-  if (code != 0) {
-    return code;
-  }
-
-  pDb = malloc(sizeof(SDbObj));
-  memset(pDb, 0, sizeof(SDbObj));
-  strcpy(pDb->name, pCreate->db);
-  strcpy(pCreate->acct, pAcct->user);
-  pDb->createdTime = taosGetTimestampMs();
-  pDb->cfg = *pCreate;
-
-  if (sdbInsertRow(dbSdb, pDb, 0) < 0) {
-    code = TSDB_CODE_SDB_ERROR;
-    tfree(pDb);
-  }
-
-  return code;
-}
-
-int mgmtUpdateDb(SDbObj *pDb) { return sdbUpdateRow(dbSdb, pDb, tsDbUpdateSize, 1); }
-
-int mgmtSetDbDropping(SDbObj *pDb) {
-  if (pDb->dropStatus == TSDB_DB_STATUS_DROP_FROM_SDB) return 0;
-
-  SVgObj *pVgroup = pDb->pHead;
-  while (pVgroup != NULL) {
-    for (int i = 0; i < pVgroup->numOfVnodes; i++) {
-      SVnodeGid *pVnodeGid = pVgroup->vnodeGid + i;
-      SDnodeObj *pDnode = mgmtGetDnode(pVnodeGid->ip);
-      if (pDnode == NULL) continue;
-
-      SVnodeLoad *pVload = &pDnode->vload[pVnodeGid->vnode];
-      if (pVload->dropStatus != TSDB_VN_DROP_STATUS_DROPPING) {
-        pVload->dropStatus = TSDB_VN_DROP_STATUS_DROPPING;
-
-        mPrint("dnode:%s vnode:%d db:%s set to dropping status", taosIpStr(pDnode->privateIp), pVnodeGid->vnode, pDb->name);
-        if (mgmtUpdateDnode(pDnode) < 0) {
-          mError("db:%s drop failed, dnode sdb update error", pDb->name);
-          return TSDB_CODE_SDB_ERROR;
-        }
-      }
-    }
-    mgmtSendFreeVnodeMsg(pVgroup);
-    pVgroup = pVgroup->next;
-  }
-
-  if (pDb->dropStatus == TSDB_DB_STATUS_DROPPING) return 0;
-
-  pDb->dropStatus = TSDB_DB_STATUS_DROPPING;
-  if (mgmtUpdateDb(pDb) < 0) {
-    mError("db:%s drop failed, db sdb update error", pDb->name);
-    return TSDB_CODE_SDB_ERROR;
-  }
-
-  mPrint("db:%s set to dropping status", pDb->name);
-  return 0;
-}
-
-bool mgmtCheckDropDbFinished(SDbObj *pDb) {
-  SVgObj *pVgroup = pDb->pHead;
-  while (pVgroup) {
-    for (int i = 0; i < pVgroup->numOfVnodes; i++) {
-      SVnodeGid *pVnodeGid = pVgroup->vnodeGid + i;
-      SDnodeObj *pDnode = mgmtGetDnode(pVnodeGid->ip);
-
-      if (pDnode == NULL) continue;
-      if (pDnode->status == TSDB_DN_STATUS_OFFLINE) continue;
-
-      SVnodeLoad *pVload = &pDnode->vload[pVnodeGid->vnode];
-      if (pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) {
-        mTrace("dnode:%s, vnode:%d db:%s wait dropping", taosIpStr(pDnode->privateIp), pVnodeGid->vnode, pDb->name);
-        return false;
-      }
-    }
-    pVgroup = pVgroup->next;
-  }
-
-  mPrint("db:%s all vnodes drop finished", pDb->name);
-  return true;
-}
-
-void mgmtDropDbFromSdb(SDbObj *pDb) {
-  while (pDb->pHead) mgmtDropVgroup(pDb, pDb->pHead);
-
-  STabObj *pMetric = pDb->pMetric;
-  while (pMetric) {
-    STabObj *pNext = pMetric->next;
-    mgmtDropMeter(pDb, pMetric->meterId, 0);
-    pMetric = pNext;
-  }
-
-  mPrint("db:%s all meters drop finished", pDb->name);
-  sdbDeleteRow(dbSdb, pDb);
-  mPrint("db:%s database drop finished", pDb->name);
-}
-
-int mgmtDropDb(SDbObj *pDb) {
-  if (pDb->dropStatus == TSDB_DB_STATUS_DROPPING) {
-    bool finished = mgmtCheckDropDbFinished(pDb);
-    if (!finished) {
-      SVgObj *pVgroup = pDb->pHead;
-      while (pVgroup != NULL) {
-        mgmtSendFreeVnodeMsg(pVgroup);
-        pVgroup = pVgroup->next;
-      }
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-
-    // don't sync this action
-    pDb->dropStatus = TSDB_DB_STATUS_DROP_FROM_SDB;
-    mgmtDropDbFromSdb(pDb);
-    return 0;
-  } else {
-    int code = mgmtSetDbDropping(pDb);
-    if (code != 0) return code;
-    return TSDB_CODE_ACTION_IN_PROGRESS;
-  }
-}
-
-int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
-  SDbObj *pDb;
-  pDb = (SDbObj *)sdbGetRow(dbSdb, name);
-  if (pDb == NULL) {
-    if (ignoreNotExists) return TSDB_CODE_SUCCESS;
-    mWarn("db:%s is not there", name);
-    return TSDB_CODE_INVALID_DB;
-  }
-
-  if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-    return TSDB_CODE_MONITOR_DB_FORBEIDDEN;
-  }
-
-  return mgmtDropDb(pDb);
-}
-
-void mgmtMonitorDbDrop(void *unused, void *unusedt) {
-  void *  pNode = NULL;
-  SDbObj *pDb = NULL;
-
-  while (1) {
-    pNode = sdbFetchRow(dbSdb, pNode, (void **)&pDb);
-    if (pDb == NULL) break;
-    if (pDb->dropStatus != TSDB_DB_STATUS_DROPPING) continue;
-    mgmtDropDb(pDb);
-    break;
-  }
-}
-
-int mgmtAlterDb(SAcctObj *pAcct, SAlterDbMsg *pAlter) {
-  SDbObj *pDb;
-  int     code = TSDB_CODE_SUCCESS;
-
-  pDb = (SDbObj *)sdbGetRow(dbSdb, pAlter->db);
-  if (pDb == NULL) {
-    mTrace("db:%s is not exist", pAlter->db);
-    return TSDB_CODE_INVALID_DB;
-  }
-
-  int oldReplicaNum = pDb->cfg.replications;
-  if (pAlter->daysToKeep > 0) {
-    mTrace("db:%s daysToKeep:%d change to %d", pDb->name, pDb->cfg.daysToKeep, pAlter->daysToKeep);
-    pDb->cfg.daysToKeep = pAlter->daysToKeep;
-  } else if (pAlter->replications > 0) {
-    mTrace("db:%s replica:%d change to %d", pDb->name, pDb->cfg.replications, pAlter->replications);
-    if (pAlter->replications < TSDB_REPLICA_MIN_NUM || pAlter->replications > TSDB_REPLICA_MAX_NUM) {
-      mError("invalid db option replica: %d valid range: %d--%d", pAlter->replications, TSDB_REPLICA_MIN_NUM, TSDB_REPLICA_MAX_NUM);
-      return TSDB_CODE_INVALID_OPTION;
-    }
-    pDb->cfg.replications = pAlter->replications;
-  } else if (pAlter->maxSessions > 0) {
-    mTrace("db:%s tables:%d change to %d", pDb->name, pDb->cfg.maxSessions, pAlter->maxSessions);
-    if (pAlter->maxSessions < TSDB_MIN_TABLES_PER_VNODE || pAlter->maxSessions > TSDB_MAX_TABLES_PER_VNODE) {
-      mError("invalid db option tables: %d valid range: %d--%d", pAlter->maxSessions, TSDB_MIN_TABLES_PER_VNODE, TSDB_MAX_TABLES_PER_VNODE);
-      return TSDB_CODE_INVALID_OPTION;
-    }
-    if (pAlter->maxSessions < pDb->cfg.maxSessions) {
-      mError("invalid db option tables: %d should larger than original:%d", pAlter->maxSessions, pDb->cfg.maxSessions);
-      return TSDB_CODE_INVALID_OPTION;
-    }
-    return TSDB_CODE_INVALID_OPTION;
-    //The modification of tables needs to rewrite the head file, so disable this option
-    //pDb->cfg.maxSessions = pAlter->maxSessions;
-  } else {
-    mError("db:%s alter msg, replica:%d, keep:%d, tables:%d, origin replica:%d keep:%d", pDb->name,
-            pAlter->replications, pAlter->maxSessions, pAlter->daysToKeep,
-            pDb->cfg.replications, pDb->cfg.daysToKeep);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-
-  if (sdbUpdateRow(dbSdb, pDb, tsDbUpdateSize, 1) < 0) {
-    return TSDB_CODE_SDB_ERROR;
-  }
-
-  SVgObj *pVgroup = pDb->pHead;
-  while (pVgroup != NULL) {
-    mgmtUpdateVgroupState(pVgroup, TSDB_VG_LB_STATUS_UPDATE, 0);
-    if (oldReplicaNum < pDb->cfg.replications) {
-      if (!mgmtAddVnode(pVgroup, NULL, NULL)) {
-        mWarn("db:%s vgroup:%d not enough dnode to add vnode", pAlter->db, pVgroup->vgId);
-        code = TSDB_CODE_NO_ENOUGH_DNODES;
-      }
-    }
-    if (pAlter->maxSessions > 0) {
-      //rebuild meterList in mgmtVgroup.c
-      sdbUpdateRow(vgSdb, pVgroup, tsVgUpdateSize, 0);
-    }
-    mgmtSendVPeersMsg(pVgroup);
-    pVgroup = pVgroup->next;
-  }
-  mgmtStartBalanceTimer(10);
-
-  return code;
-}
-
-int mgmtUseDb(SConnObj *pConn, char *name) {
-  SDbObj *pDb;
-  int     code = TSDB_CODE_INVALID_DB;
-
-  // here change the default db for connect.
-  pDb = mgmtGetDb(name);
-  if (pDb) {
-    pConn->pDb = pDb;
-    code = 0;
-  }
-
-  return code;
-}
-
-int mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup) {
-  pVgroup->next = pDb->pHead;
-  pVgroup->prev = NULL;
-
-  if (pDb->pHead) pDb->pHead->prev = pVgroup;
-
-  if (pDb->pTail == NULL) pDb->pTail = pVgroup;
-
-  pDb->pHead = pVgroup;
-  pDb->numOfVgroups++;
-
-  return 0;
-}
-
-int mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup) {
-  pVgroup->next = NULL;
-  pVgroup->prev = pDb->pTail;
-
-  if (pDb->pTail) pDb->pTail->next = pVgroup;
-
-  if (pDb->pHead == NULL) pDb->pHead = pVgroup;
-
-  pDb->pTail = pVgroup;
-  pDb->numOfVgroups++;
-
-  return 0;
-}
-
-int mgmtRemoveVgroupFromDb(SDbObj *pDb, SVgObj *pVgroup) {
-  if (pVgroup->prev) pVgroup->prev->next = pVgroup->next;
-
-  if (pVgroup->next) pVgroup->next->prev = pVgroup->prev;
-
-  if (pVgroup->prev == NULL) pDb->pHead = pVgroup->next;
-
-  if (pVgroup->next == NULL) pDb->pTail = pVgroup->prev;
-
-  pDb->numOfVgroups--;
-
-  return 0;
-}
-
-int mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup) {
-  mgmtRemoveVgroupFromDb(pDb, pVgroup);
-  mgmtAddVgroupIntoDbTail(pDb, pVgroup);
-
-  return 0;
-}
-
-int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup) {
-  mgmtRemoveVgroupFromDb(pDb, pVgroup);
-  mgmtAddVgroupIntoDb(pDb, pVgroup);
-
-  return 0;
-}
-
-int mgmtAddMetricIntoDb(SDbObj *pDb, STabObj *pMetric) {
-  pMetric->next = pDb->pMetric;
-  pMetric->prev = NULL;
-
-  if (pDb->pMetric) pDb->pMetric->prev = pMetric;
-
-  pDb->pMetric = pMetric;
-  pDb->numOfMetrics++;
-
-  return 0;
-}
-
-int mgmtRemoveMetricFromDb(SDbObj *pDb, STabObj *pMetric) {
-  if (pMetric->prev) pMetric->prev->next = pMetric->next;
-
-  if (pMetric->next) pMetric->next->prev = pMetric->prev;
-
-  if (pMetric->prev == NULL) pDb->pMetric = pMetric->next;
-
-  pDb->numOfMetrics--;
-
-  if (pMetric->pSkipList != NULL) {
-    pMetric->pSkipList = tSkipListDestroy(pMetric->pSkipList);
-  }
-  return 0;
-}
-
-int mgmtShowTables(SAcctObj *pAcct, char *db) {
-  int code;
-
-  code = 0;
-
-  return code;
-}
-
-void mgmtCleanUpDbs() { sdbCloseTable(dbSdb); }
-
-int mgmtGetDbMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_DB_NAME_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "ntables");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-#ifndef __CLOUD_VERSION__
-  if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "vgroups");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-#ifndef __CLOUD_VERSION__
-  }
-#endif
-
-#ifndef __CLOUD_VERSION__
-  if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-    pShow->bytes[cols] = 2;
-    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-    strcpy(pSchema[cols].name, "replica");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 2;
-    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-    strcpy(pSchema[cols].name, "days");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-#ifndef __CLOUD_VERSION__
-  }
-#endif
-
-  pShow->bytes[cols] = 24;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "keep1,keep2,keep(D)");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-#ifndef __CLOUD_VERSION__
-  if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "tables");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "rows");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "cache(b)");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_FLOAT;
-    strcpy(pSchema[cols].name, "ablocks");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 2;
-    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-    strcpy(pSchema[cols].name, "tblocks");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 4;
-    pSchema[cols].type = TSDB_DATA_TYPE_INT;
-    strcpy(pSchema[cols].name, "ctime(s)");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 1;
-    pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-    strcpy(pSchema[cols].name, "clog");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 1;
-    pSchema[cols].type = TSDB_DATA_TYPE_TINYINT;
-    strcpy(pSchema[cols].name, "comp");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-#ifndef __CLOUD_VERSION__
-  }
-#endif
-
-  pShow->bytes[cols] = 3;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "time precision");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  //  pShow->numOfRows = sdbGetNumOfRows (dbSdb);
-  pShow->numOfRows = pConn->pAcct->acctInfo.numOfDbs;
-  pShow->pNode = pConn->pAcct->pHead;
-
-  return 0;
-}
-
-char *mgmtGetDbStr(char *src) {
-  char *pos = strstr(src, TS_PATH_DELIMITER);
-
-  return ++pos;
-}
-
-int mgmtRetrieveDbs(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int     numOfRows = 0;
-  SDbObj *pDb = NULL;
-  char *  pWrite;
-  int     cols = 0;
-
-  while (numOfRows < rows) {
-    pDb = (SDbObj *)pShow->pNode;
-    if (pDb == NULL) break;
-    pShow->pNode = (void *)pDb->next;
-    if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-      if (strcmp(pConn->pUser->user, "root") != 0 && strcmp(pConn->pUser->user, "_root") != 0 && strcmp(pConn->pUser->user, "monitor") != 0 ) {
-        continue;
-      }
-    }
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, mgmtGetDbStr(pDb->name));
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pDb->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pDb->numOfTables;
-    cols++;
-
-#ifndef __CLOUD_VERSION__
-    if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int32_t *)pWrite = pDb->numOfVgroups;
-      cols++;
-#ifndef __CLOUD_VERSION__
-    }
-#endif
-
-#ifndef __CLOUD_VERSION__
-    if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int16_t *)pWrite = pDb->cfg.replications;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int16_t *)pWrite = pDb->cfg.daysPerFile;
-      cols++;
-#ifndef __CLOUD_VERSION__
-    }
-#endif
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    sprintf(pWrite, "%d,%d,%d", pDb->cfg.daysToKeep1, pDb->cfg.daysToKeep2, pDb->cfg.daysToKeep);
-    cols++;
-
-#ifndef __CLOUD_VERSION__
-    if (strcmp(pConn->pAcct->user, "root") == 0) {
-#endif
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int32_t *)pWrite = pDb->cfg.maxSessions - 1;  // table num can be created should minus 1
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int32_t *)pWrite = pDb->cfg.rowsInFileBlock;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int32_t *)pWrite = pDb->cfg.cacheBlockSize;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-#ifdef _TD_ARM_32_
-      *(int32_t *)pWrite = (pDb->cfg.cacheNumOfBlocks.totalBlocks * 1.0 / (pDb->cfg.maxSessions - 1));
-#else
-      *(float *)pWrite = (pDb->cfg.cacheNumOfBlocks.totalBlocks * 1.0 / (pDb->cfg.maxSessions - 1));
-#endif
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int16_t *)pWrite = pDb->cfg.blocksPerMeter;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int32_t *)pWrite = pDb->cfg.commitTime;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int8_t *)pWrite = pDb->cfg.commitLog;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int8_t *)pWrite = pDb->cfg.compression;
-      cols++;
-#ifndef __CLOUD_VERSION__
-    }
-#endif
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    char *prec = (pDb->cfg.precision == TSDB_TIME_PRECISION_MILLI) ? TSDB_TIME_PRECISION_MILLI_STR
-                                                                   : TSDB_TIME_PRECISION_MICRO_STR;
-    strcpy(pWrite, prec);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pDb->dropStatus != TSDB_DB_STATUS_READY ? "dropping" : "ready");
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-void *mgmtDbActionInsert(void *row, char *str, int size, int *ssize) {
-  SDbObj *  pDb = (SDbObj *)row;
-  SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
-
-  pDb->pHead = NULL;
-  pDb->pTail = NULL;
-  pDb->numOfVgroups = 0;
-  pDb->numOfTables = 0;
-  pDb->vgTimer = NULL;
-  pDb->pMetric = NULL;
-  mgmtAddDbIntoAcct(pAcct, pDb);
-
-  return NULL;
-}
-void *mgmtDbActionDelete(void *row, char *str, int size, int *ssize) {
-  SDbObj *  pDb = (SDbObj *)row;
-  SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
-  mgmtRemoveDbFromAcct(pAcct, pDb);
-
-  return NULL;
-}
-void *mgmtDbActionUpdate(void *row, char *str, int size, int *ssize) {
-  return mgmtDbActionReset(row, str, size, ssize);
-}
-void *mgmtDbActionEncode(void *row, char *str, int size, int *ssize) {
-  SDbObj *pDb = (SDbObj *)row;
-  int     tsize = pDb->updateEnd - (char *)pDb;
-  if (size < tsize) {
-    *ssize = -1;
-  } else {
-    memcpy(str, pDb, tsize);
-    *ssize = tsize;
-  }
-
-  return NULL;
-}
-void *mgmtDbActionDecode(void *row, char *str, int size, int *ssize) {
-  SDbObj *pDb = (SDbObj *)malloc(sizeof(SDbObj));
-  if (pDb == NULL) return NULL;
-  memset(pDb, 0, sizeof(SDbObj));
-
-  int tsize = pDb->updateEnd - (char *)pDb;
-  memcpy(pDb, str, tsize);
-
-  return (void *)pDb;
-}
-void *mgmtDbActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtDbActionBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtDbActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtDbActionReset(void *row, char *str, int size, int *ssize) {
-  SDbObj *pDb = (SDbObj *)row;
-  int     tsize = pDb->updateEnd - (char *)pDb;
-  memcpy(pDb, str, tsize);
-
-  return NULL;
-}
-void *mgmtDbActionDestroy(void *row, char *str, int size, int *ssize) {
-  tfree(row);
-  return NULL;
-}
diff --git a/src/system/detail/src/mgmtDnode.c b/src/system/detail/src/mgmtDnode.c
deleted file mode 100644
index 4066dd766996b6e63f9226e4df2f27cebae2738b..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtDnode.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "tschemautil.h"
-#include "vnodeStatus.h"
-
-bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType);
-int  mgmtGetDnodesNum();
-void*mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode);
-bool mgmtCheckConfigShow(SGlobalConfig *cfg);
-
-void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode) {
-  int maxVnodes = pDnode->numOfCores * tsNumOfVnodesPerCore;
-  maxVnodes = maxVnodes > TSDB_MAX_VNODES ? TSDB_MAX_VNODES : maxVnodes;
-  maxVnodes = maxVnodes < TSDB_MIN_VNODES ? TSDB_MIN_VNODES : maxVnodes;
-  if (pDnode->numOfTotalVnodes != 0) {
-    maxVnodes = pDnode->numOfTotalVnodes;
-  }
-  if (pDnode->alternativeRole == TSDB_DNODE_ROLE_MGMT) {
-    maxVnodes = 0;
-  }
-
-  pDnode->numOfVnodes = maxVnodes;
-  pDnode->numOfFreeVnodes = maxVnodes;
-  pDnode->openVnodes = 0;
-
-#ifdef CLUSTER
-  pDnode->status = TSDB_DN_STATUS_OFFLINE;
-#else
-  pDnode->status = TSDB_DN_STATUS_READY;
-#endif
-}
-
-void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode) {
-  int totalVnodes = 0;
-
-  mTrace("dnode:%s, begin calc free vnodes", taosIpStr(pDnode->privateIp));
-  for (int i = 0; i < pDnode->numOfVnodes; ++i) {
-    SVnodeLoad *pVload = pDnode->vload + i;
-    if (pVload->vgId != 0) {
-      mTrace("%d-dnode:%s, calc free vnodes, exist vnode:%d, vgroup:%d, state:%d %s, dropstate:%d %s, syncstatus:%d %s",
-             totalVnodes, taosIpStr(pDnode->privateIp), i, pVload->vgId,
-             pVload->status, taosGetVnodeStatusStr(pVload->status),
-             pVload->dropStatus, taosGetVnodeDropStatusStr(pVload->dropStatus),
-             pVload->syncStatus, taosGetVnodeSyncStatusStr(pVload->syncStatus));
-      totalVnodes++;
-    }
-  }
-
-  pDnode->numOfFreeVnodes = pDnode->numOfVnodes - totalVnodes;
-  mTrace("dnode:%s, numOfVnodes:%d, numOfFreeVnodes:%d, totalVnodes:%d",
-          taosIpStr(pDnode->privateIp), pDnode->numOfVnodes, pDnode->numOfFreeVnodes, totalVnodes);
-}
-
-void mgmtSetDnodeVgid(SVnodeGid vnodeGid[], int numOfVnodes, int vgId) {
-  SDnodeObj *pDnode;
-
-  for (int i = 0; i < numOfVnodes; ++i) {
-    pDnode = mgmtGetDnode(vnodeGid[i].ip);
-    if (pDnode) {
-      SVnodeLoad *pVload = pDnode->vload + vnodeGid[i].vnode;
-      memset(pVload, 0, sizeof(SVnodeLoad));
-      pVload->vnode = vnodeGid[i].vnode;
-      pVload->vgId = vgId;
-      mTrace("dnode:%s, vnode:%d add to vgroup:%d", taosIpStr(vnodeGid[i].ip), vnodeGid[i].vnode, pVload->vgId);
-      mgmtCalcNumOfFreeVnodes(pDnode);
-    } else {
-      mError("dnode:%s, not in dnode DB!!!", taosIpStr(vnodeGid[i].ip));
-    }
-  }
-}
-
-void mgmtUnSetDnodeVgid(SVnodeGid vnodeGid[], int numOfVnodes) {
-  SDnodeObj *pDnode;
-
-  for (int i = 0; i < numOfVnodes; ++i) {
-    pDnode = mgmtGetDnode(vnodeGid[i].ip);
-    if (pDnode) {
-      SVnodeLoad *pVload = pDnode->vload + vnodeGid[i].vnode;
-      mTrace("dnode:%s, vnode:%d remove from vgroup:%d", taosIpStr(vnodeGid[i].ip), vnodeGid[i].vnode, pVload->vgId);
-      memset(pVload, 0, sizeof(SVnodeLoad));
-      mgmtCalcNumOfFreeVnodes(pDnode);
-    } else {
-      mError("dnode:%s not in dnode DB!!!", taosIpStr(vnodeGid[i].ip));
-    }
-  }
-}
-
-int mgmtGetDnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  if (strcmp(pConn->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "IP");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "open vnodes");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "free vnodes");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 18;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "balance state");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "public ip");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = mgmtGetDnodesNum();
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  pShow->pNode = NULL;
-
-  return 0;
-}
-
-int mgmtRetrieveDnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int        numOfRows = 0;
-  SDnodeObj *pDnode = NULL;
-  char *     pWrite;
-  int        cols = 0;
-  char       ipstr[20];
-
-  while (numOfRows < rows) {
-    pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode);
-    if (pDnode == NULL) break;
-
-    cols = 0;
-
-    tinet_ntoa(ipstr, pDnode->privateIp);
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, ipstr);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pDnode->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pDnode->openVnodes;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pDnode->numOfFreeVnodes;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, taosGetDnodeStatusStr(pDnode->status) );
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, taosGetDnodeLbStatusStr(pDnode->lbStatus));
-    cols++;
-
-    tinet_ntoa(ipstr, pDnode->publicIp);
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, ipstr);
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int mgmtGetModuleMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  if (strcmp(pConn->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 16;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "IP");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "module type");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 10;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "module status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = 0;
-  SDnodeObj *pDnode = NULL;
-  while (1) {
-    pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode);
-    if (pDnode == NULL) break;
-    for (int moduleType = 0; moduleType < TSDB_MOD_MAX; ++moduleType) {
-      if (mgmtCheckModuleInDnode(pDnode, moduleType)) {
-        pShow->numOfRows++;
-      }
-    }
-  }
-
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  pShow->pNode = NULL;
-
-  return 0;
-}
-
-int mgmtRetrieveModules(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int        numOfRows = 0;
-  SDnodeObj *pDnode = NULL;
-  char *     pWrite;
-  int        cols = 0;
-  char       ipstr[20];
-
-  while (numOfRows < rows) {
-    pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode);
-    if (pDnode == NULL) break;
-
-    for (int moduleType = 0; moduleType < TSDB_MOD_MAX; ++moduleType) {
-      if (!mgmtCheckModuleInDnode(pDnode, moduleType)) {
-        continue;
-      }
-
-      cols = 0;
-
-      tinet_ntoa(ipstr, pDnode->privateIp);
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      strcpy(pWrite, ipstr);
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      strcpy(pWrite, tsModule[moduleType].name);
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      strcpy(pWrite, taosGetDnodeStatusStr(pDnode->status) );
-      cols++;
-
-      numOfRows++;
-    }
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int mgmtGetConfigMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  if (strcmp(pConn->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_CFG_OPTION_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "config name");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_CFG_VALUE_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "config value");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = 0;
-  for (int i = tsGlobalConfigNum - 1; i >= 0; --i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (!mgmtCheckConfigShow(cfg)) continue;
-    pShow->numOfRows++;
-  }
-
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-  pShow->pNode = NULL;
-
-  return 0;
-}
-
-int mgmtRetrieveConfigs(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int numOfRows = 0;
-
-  for (int i = tsGlobalConfigNum - 1; i >= 0 && numOfRows < rows; --i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (!mgmtCheckConfigShow(cfg)) continue;
-
-    char *pWrite;
-    int   cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    snprintf(pWrite, TSDB_CFG_OPTION_LEN, "%s", cfg->option);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    switch (cfg->valType) {
-      case TSDB_CFG_VTYPE_SHORT:
-        snprintf(pWrite, TSDB_CFG_VALUE_LEN, "%d", *((int16_t *)cfg->ptr));
-        numOfRows++;
-        break;
-      case TSDB_CFG_VTYPE_INT:
-        snprintf(pWrite, TSDB_CFG_VALUE_LEN, "%d", *((int32_t *)cfg->ptr));
-        numOfRows++;
-        break;
-      case TSDB_CFG_VTYPE_UINT:
-        snprintf(pWrite, TSDB_CFG_VALUE_LEN, "%d", *((uint32_t *)cfg->ptr));
-        numOfRows++;
-        break;
-      case TSDB_CFG_VTYPE_FLOAT:
-        snprintf(pWrite, TSDB_CFG_VALUE_LEN, "%f", *((float *)cfg->ptr));
-        numOfRows++;
-        break;
-      case TSDB_CFG_VTYPE_STRING:
-      case TSDB_CFG_VTYPE_IPSTR:
-      case TSDB_CFG_VTYPE_DIRECTORY:
-        snprintf(pWrite, TSDB_CFG_VALUE_LEN, "%s", (char *)cfg->ptr);
-        numOfRows++;
-        break;
-      default:
-        break;
-    }
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int mgmtGetVnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  if (strcmp(pConn->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "vnode");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "vgid");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 12;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 12;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "sync status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  // TODO: if other thread drop dnode ????
-  SDnodeObj *pDnode = NULL;
-  if (pShow->payloadLen > 0 ) {
-    uint32_t ip = ip2uint(pShow->payload);
-    pDnode = mgmtGetDnode(ip);
-    if (NULL == pDnode) {
-      return TSDB_CODE_NODE_OFFLINE;
-    }
-
-    SVnodeLoad* pVnode;
-    pShow->numOfRows = 0;
-    for (int i = 0 ; i < TSDB_MAX_VNODES; i++) {
-      pVnode = &pDnode->vload[i];
-      if (0 != pVnode->vgId) {
-        pShow->numOfRows++;
-      }
-    }
-    
-    pShow->pNode = pDnode;
-  } else {
-    while (true) {
-      pShow->pNode = mgmtGetNextDnode(pShow, (SDnodeObj **)&pDnode);
-      if (pDnode == NULL) break;
-      pShow->numOfRows += pDnode->openVnodes;
-
-      if (0 == pShow->numOfRows) return TSDB_CODE_NODE_OFFLINE;      
-    }
-
-    pShow->pNode = NULL;
-  } 
-
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  return 0;
-}
-
-int mgmtRetrieveVnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int        numOfRows = 0;
-  SDnodeObj *pDnode = NULL;
-  char *     pWrite;
-  int        cols = 0;
-
-  if (0 == rows) return 0;
-
-  if (pShow->payloadLen) {
-    // output the vnodes info of the designated dnode. And output all vnodes of this dnode, instead of rows (max 100)
-    pDnode = (SDnodeObj *)(pShow->pNode);
-    if (pDnode != NULL) {
-      SVnodeLoad* pVnode;
-      for (int i = 0 ; i < TSDB_MAX_VNODES; i++) {
-        pVnode = &pDnode->vload[i];
-        if (0 == pVnode->vgId) {
-          continue;
-        }
-        
-        cols = 0;
-        
-        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        *(uint32_t *)pWrite = pVnode->vnode;
-        cols++;
-        
-        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        *(uint32_t *)pWrite = pVnode->vgId;
-        cols++;
-        
-        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        strcpy(pWrite, taosGetVnodeStatusStr(pVnode->status));
-        cols++;
-        
-        pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-        strcpy(pWrite, taosGetVnodeSyncStatusStr(pVnode->syncStatus));
-        cols++;
-        
-        numOfRows++;
-      }
-    }
-  } else {
-    // TODO: output all vnodes of all dnodes
-    numOfRows = 0;
-  }
-  
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-
diff --git a/src/system/detail/src/mgmtDnodeInt.c b/src/system/detail/src/mgmtDnodeInt.c
deleted file mode 100644
index a1dae7738f8f0f32b6c22666e62aff89e13f2c16..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtDnodeInt.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "mgmtBalance.h"
-#include "tutil.h"
-
-void  mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj);
-int   mgmtSendVPeersMsg(SVgObj *pVgroup);
-char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode);
-char *mgmtBuildCreateMeterIe(STabObj *pMeter, char *pMsg, int vnode);
-
-/*
- * functions for communicate between dnode and mnode
- */
-char *taosBuildRspMsgToDnodeWithSize(SDnodeObj *pObj, char type, int size);
-char *taosBuildReqMsgToDnodeWithSize(SDnodeObj *pObj, char type, int size);
-char *taosBuildRspMsgToDnode(SDnodeObj *pObj, char type);
-char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type);
-int   taosSendSimpleRspToDnode(SDnodeObj *pObj, char rsptype, char code);
-int   taosSendMsgToDnode(SDnodeObj *pObj, char *msg, int msgLen);
-
-int mgmtProcessMeterCfgMsg(char *cont, int contLen, SDnodeObj *pObj) {
-  char *        pMsg, *pStart;
-  int           msgLen = 0;
-  STabObj *     pMeter = NULL;
-  SMeterCfgMsg *pCfg = (SMeterCfgMsg *)cont;
-  SVgObj *      pVgroup;
-
-  if (!sdbMaster) {
-    taosSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_METER_CFG_RSP, TSDB_CODE_REDIRECT);
-    return 0;
-  }
-
-  int vnode = htonl(pCfg->vnode);
-  int sid = htonl(pCfg->sid);
-
-  pStart = taosBuildRspMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_METER_CFG_RSP, 64000);
-  if (pStart == NULL) {
-    taosSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_METER_CFG_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-
-  pMsg = pStart;
-
-  if (vnode < pObj->numOfVnodes) {
-    int vgId = pObj->vload[vnode].vgId;
-
-    pVgroup = mgmtGetVgroup(vgId);
-    if (pVgroup) pMeter = pVgroup->meterList[sid];
-  }
-
-  if (pMeter) {
-    *pMsg = 0;  // code
-    pMsg++;
-    pMsg = mgmtBuildCreateMeterIe(pMeter, pMsg, vnode);
-  } else {
-    mTrace("dnode:%s, vnode:%d sid:%d, meter not there", taosIpStr(pObj->privateIp), vnode, sid);
-    *pMsg = TSDB_CODE_INVALID_METER_ID;
-    pMsg++;
-
-    *(int32_t *)pMsg = htonl(vnode);
-    pMsg += sizeof(int32_t);
-    *(int32_t *)pMsg = htonl(sid);
-    pMsg += sizeof(int32_t);
-  }
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToDnode(pObj, pStart, msgLen);
-
-  return 0;
-}
-
-int mgmtProcessVpeerCfgMsg(char *cont, int contLen, SDnodeObj *pObj) {
-  char *        pMsg, *pStart;
-  int           msgLen = 0;
-  SVpeerCfgMsg *pCfg = (SVpeerCfgMsg *)cont;
-  SVgObj *      pVgroup = NULL;
-
-  if (!sdbMaster) {
-    taosSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VPEER_CFG_RSP, TSDB_CODE_REDIRECT);
-    return 0;
-  }
-
-  int vnode = htonl(pCfg->vnode);
-
-  pStart = taosBuildRspMsgToDnode(pObj, TSDB_MSG_TYPE_VPEER_CFG_RSP);
-  if (pStart == NULL) {
-    taosSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VPEER_CFG_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-  pMsg = pStart;
-
-  if (vnode < pObj->numOfVnodes) pVgroup = mgmtGetVgroup(pObj->vload[vnode].vgId);
-
-  if (pVgroup) {
-    *pMsg = 0;
-    pMsg++;
-    pMsg = mgmtBuildVpeersIe(pMsg, pVgroup, vnode);
-    mTrace("dnode:%s, vnode:%d, vgroup:%d, send create vnode msg, code:%d", taosIpStr(pObj->privateIp), vnode, pVgroup->vgId, *pMsg);
-  } else {
-    mTrace("dnode:%s, vnode:%d, no vgroup info, vgroup:%d", taosIpStr(pObj->privateIp), vnode, pObj->vload[vnode].vgId);
-    *pMsg = TSDB_CODE_NOT_ACTIVE_VNODE;
-    pMsg++;
-    *(int32_t *)pMsg = htonl(vnode);
-    pMsg += sizeof(int32_t);
-  }
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToDnode(pObj, pStart, msgLen);
-
-  return 0;
-}
-
-int mgmtProcessCreateRsp(char *msg, int msgLen, SDnodeObj *pObj) { return 0; }
-
-int mgmtProcessFreeVnodeRsp(char *msg, int msgLen, SDnodeObj *pObj) { return 0; }
-
-int mgmtProcessVPeersRsp(char *msg, int msgLen, SDnodeObj *pObj) {
-  STaosRsp *pRsp = (STaosRsp *)msg;
-
-  if (!sdbMaster) {
-    taosSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VPEERS_RSP, TSDB_CODE_REDIRECT);
-    return 0;
-  }
-
-  SDbObj *pDb = mgmtGetDb(pRsp->more);
-  if (!pDb) {
-    mError("dnode:%s, db:%s not find, code:%d", taosIpStr(pObj->privateIp), pRsp->more, pRsp->code);
-    return 0;
-  }
-
-  if (pDb->vgStatus != TSDB_VG_STATUS_IN_PROGRESS) {
-    mTrace("dnode:%s, db:%s vpeer rsp already disposed, vgroup status:%s code:%d",
-            taosIpStr(pObj->privateIp), pRsp->more, taosGetVgroupStatusStr(pDb->vgStatus), pRsp->code);
-    return 0;
-  }
-
-  if (pRsp->code == TSDB_CODE_SUCCESS) {
-    pDb->vgStatus = TSDB_VG_STATUS_READY;
-    mTrace("dnode:%s, db:%s vgroup is created in dnode", taosIpStr(pObj->privateIp), pRsp->more);
-    return 0;
-  }
-
-  pDb->vgStatus = pRsp->code;
-  mError("dnode:%s, db:%s vgroup init failed, code:%d %s",
-          taosIpStr(pObj->privateIp), pRsp->more, pRsp->code, taosGetVgroupStatusStr(pDb->vgStatus));
-
-  return 0;
-}
-
-void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj) {
-  if (msgType == TSDB_MSG_TYPE_METER_CFG) {
-    mgmtProcessMeterCfgMsg(content, msgLen - sizeof(SIntMsg), pObj);
-  } else if (msgType == TSDB_MSG_TYPE_VPEER_CFG) {
-    mgmtProcessVpeerCfgMsg(content, msgLen - sizeof(SIntMsg), pObj);
-  } else if (msgType == TSDB_MSG_TYPE_CREATE_RSP) {
-    mgmtProcessCreateRsp(content, msgLen - sizeof(SIntMsg), pObj);
-  } else if (msgType == TSDB_MSG_TYPE_REMOVE_RSP) {
-    // do nothing
-  } else if (msgType == TSDB_MSG_TYPE_VPEERS_RSP) {
-    mgmtProcessVPeersRsp(content, msgLen - sizeof(SIntMsg), pObj);
-  } else if (msgType == TSDB_MSG_TYPE_FREE_VNODE_RSP) {
-    mgmtProcessFreeVnodeRsp(content, msgLen - sizeof(SIntMsg), pObj);
-  } else if (msgType == TSDB_MSG_TYPE_CFG_PNODE_RSP) {
-    // do nothing;
-  } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) {
-    // do nothing;
-  } else {
-    mError("%s from dnode is not processed", taosMsg[msgType]);
-  }
-}
-
-char *mgmtBuildCreateMeterIe(STabObj *pMeter, char *pMsg, int vnode) {
-  SCreateMsg *pCreateMeter;
-
-  pCreateMeter = (SCreateMsg *)pMsg;
-  pCreateMeter->vnode = htons(vnode);
-  pCreateMeter->sid = htonl(pMeter->gid.sid);
-  pCreateMeter->uid = pMeter->uid;
-  memcpy(pCreateMeter->meterId, pMeter->meterId, TSDB_METER_ID_LEN);
-
-  // pCreateMeter->lastCreate = htobe64(pVgroup->lastCreate);
-  pCreateMeter->timeStamp = htobe64(pMeter->createdTime);
-  /*
-      pCreateMeter->spi = pSec->spi;
-      pCreateMeter->encrypt = pSec->encrypt;
-      memcpy(pCreateMeter->cipheringKey, pSec->cipheringKey, TSDB_KEY_LEN);
-      memcpy(pCreateMeter->secret, pSec->secret, TSDB_KEY_LEN);
-  */
-  pCreateMeter->sversion = htonl(pMeter->sversion);
-  pCreateMeter->numOfColumns = htons(pMeter->numOfColumns);
-  SSchema *pSchema = mgmtGetMeterSchema(pMeter);
-
-  for (int i = 0; i < pMeter->numOfColumns; ++i) {
-    pCreateMeter->schema[i].type = pSchema[i].type;
-    /* strcpy(pCreateMeter->schema[i].name, pSchema[i].name); */
-    pCreateMeter->schema[i].bytes = htons(pSchema[i].bytes);
-    pCreateMeter->schema[i].colId = htons(pSchema[i].colId);
-  }
-
-  pMsg = ((char *)(pCreateMeter->schema)) + pMeter->numOfColumns * sizeof(SMColumn);
-  pCreateMeter->sqlLen = 0;
-
-  if (pMeter->pSql) {
-    int len = strlen(pMeter->pSql) + 1;
-    pCreateMeter->sqlLen = htons(len);
-    strcpy(pMsg, pMeter->pSql);
-    pMsg += len;
-  }
-
-  return pMsg;
-}
-
-int mgmtSendCreateMsgToVgroup(STabObj *pMeter, SVgObj *pVgroup) {
-  char *     pMsg, *pStart;
-  int        i, msgLen = 0;
-  SDnodeObj *pObj;
-  uint64_t   timeStamp;
-
-  timeStamp = taosGetTimestampMs();
-
-  for (i = 0; i < pVgroup->numOfVnodes; ++i) {
-    //if (pVgroup->vnodeGid[i].ip == 0) continue;
-
-    pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
-    if (pObj == NULL) continue;
-
-    pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_CREATE, 64000);
-    if (pStart == NULL) continue;
-    pMsg = mgmtBuildCreateMeterIe(pMeter, pStart, pVgroup->vnodeGid[i].vnode);
-    msgLen = pMsg - pStart;
-
-    taosSendMsgToDnode(pObj, pStart, msgLen);
-  }
-
-  pVgroup->lastCreate = timeStamp;
-
-  return 0;
-}
-
-int mgmtSendRemoveMeterMsgToDnode(STabObj *pMeter, SVgObj *pVgroup) {
-  SRemoveMeterMsg *pRemove;
-  char *           pMsg, *pStart;
-  int              i, msgLen = 0;
-  SDnodeObj *      pObj;
-  char             ipstr[20];
-  uint64_t         timeStamp;
-
-  timeStamp = taosGetTimestampMs();
-
-  for (i = 0; i < pVgroup->numOfVnodes; ++i) {
-    //if (pVgroup->vnodeGid[i].ip == 0) continue;
-
-    pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
-    if (pObj == NULL) continue;
-
-    pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_REMOVE);
-    if (pStart == NULL) continue;
-    pMsg = pStart;
-
-    pRemove = (SRemoveMeterMsg *)pMsg;
-    pRemove->vnode = htons(pVgroup->vnodeGid[i].vnode);
-    pRemove->sid = htonl(pMeter->gid.sid);
-    memcpy(pRemove->meterId, pMeter->meterId, TSDB_METER_ID_LEN);
-
-    pMsg += sizeof(SRemoveMeterMsg);
-    msgLen = pMsg - pStart;
-
-    taosSendMsgToDnode(pObj, pStart, msgLen);
-
-    tinet_ntoa(ipstr, pVgroup->vnodeGid[i].ip);
-    mTrace("dnode:%s vid:%d, send remove meter msg, sid:%d status:%d", ipstr, pVgroup->vnodeGid[i].vnode,
-           pMeter->gid.sid, pObj->status);
-  }
-
-  pVgroup->lastRemove = timeStamp;
-
-  return 0;
-}
-
-int mgmtSendAlterStreamMsgToDnode(STabObj *pMeter, SVgObj *pVgroup) {
-  SAlterStreamMsg *pAlter;
-  char *           pMsg, *pStart;
-  int              i, msgLen = 0;
-  SDnodeObj *      pObj;
-
-  for (i = 0; i < pVgroup->numOfVnodes; ++i) {
-    if (pVgroup->vnodeGid[i].ip == 0) continue;
-
-    pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
-    if (pObj == NULL) continue;
-
-    pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_ALTER_STREAM);
-    if (pStart == NULL) continue;
-    pMsg = pStart;
-
-    pAlter = (SAlterStreamMsg *)pMsg;
-    pAlter->vnode = htons(pVgroup->vnodeGid[i].vnode);
-    pAlter->sid = htonl(pMeter->gid.sid);
-    pAlter->uid = pMeter->uid;
-    pAlter->status = pMeter->status;
-
-    pMsg += sizeof(SAlterStreamMsg);
-    msgLen = pMsg - pStart;
-
-    taosSendMsgToDnode(pObj, pStart, msgLen);
-  }
-
-  return 0;
-}
-
-char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode) {
-  SVPeersMsg *pVPeers = (SVPeersMsg *)pMsg;
-  SDbObj *    pDb;
-
-  pDb = mgmtGetDb(pVgroup->dbName);
-  pVPeers->vnode = htonl(vnode);
-
-  pVPeers->cfg = pDb->cfg;
-  SVnodeCfg *pCfg = &pVPeers->cfg;
-  pCfg->vgId = htonl(pVgroup->vgId);
-  pCfg->maxSessions = htonl(pCfg->maxSessions);
-  pCfg->cacheBlockSize = htonl(pCfg->cacheBlockSize);
-  pCfg->cacheNumOfBlocks.totalBlocks = htonl(pCfg->cacheNumOfBlocks.totalBlocks);
-  pCfg->daysPerFile = htonl(pCfg->daysPerFile);
-  pCfg->daysToKeep1 = htonl(pCfg->daysToKeep1);
-  pCfg->daysToKeep2 = htonl(pCfg->daysToKeep2);
-  pCfg->daysToKeep = htonl(pCfg->daysToKeep);
-  pCfg->commitTime = htonl(pCfg->commitTime);
-  pCfg->blocksPerMeter = htons(pCfg->blocksPerMeter);
-  pCfg->replications = (char)pVgroup->numOfVnodes;
-  pCfg->rowsInFileBlock = htonl(pCfg->rowsInFileBlock);
-
-  SVPeerDesc *vpeerDesc = pVPeers->vpeerDesc;
-
-  pMsg = (char *)(pVPeers->vpeerDesc);
-
-  for (int j = 0; j < pVgroup->numOfVnodes; ++j) {
-    vpeerDesc[j].ip = htonl(pVgroup->vnodeGid[j].ip);
-    vpeerDesc[j].vnode = htonl(pVgroup->vnodeGid[j].vnode);
-    pMsg += sizeof(SVPeerDesc);
-  }
-
-  return pMsg;
-}
-
-int mgmtSendVPeersMsg(SVgObj *pVgroup) {
-  SDnodeObj *pDnode;
-  char *     pMsg, *pStart;
-  int        msgLen = 0;
-
-  for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
-    pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
-    if (pDnode == NULL) {
-      mError("dnode:%s not there", taosIpStr(pVgroup->vnodeGid[i].ip));
-      continue;
-    }
-
-    pDnode->vload[pVgroup->vnodeGid[i].vnode].vgId = pVgroup->vgId;
-    mgmtUpdateDnode(pDnode);
-
-    if (pDnode->thandle && pVgroup->numOfVnodes >= 1) {
-      pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_VPEERS);
-      if (pStart == NULL) continue;
-      pMsg = mgmtBuildVpeersIe(pStart, pVgroup, pVgroup->vnodeGid[i].vnode);
-      msgLen = pMsg - pStart;
-
-      taosSendMsgToDnode(pDnode, pStart, msgLen);
-    }
-  }
-
-  return 0;
-}
-
-int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid) {
-  SFreeVnodeMsg *pFreeVnode;
-  char *         pMsg, *pStart;
-  int            msgLen = 0;
-  SDnodeObj *    pDnode;
-
-  pDnode = mgmtGetDnode(pVnodeGid->ip);
-  if (pDnode == NULL) {
-    mError("dnode:%s not there", taosIpStr(pVnodeGid->ip));
-    return -1;
-  }
-
-  if (pDnode->thandle == NULL) {
-    mTrace("dnode:%s offline, failed to send Vpeer msg", taosIpStr(pVnodeGid->ip));
-    return -1;
-  }
-
-  pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_FREE_VNODE);
-  if (pStart == NULL) return -1;
-  pMsg = pStart;
-
-  pFreeVnode = (SFreeVnodeMsg *)pMsg;
-  pFreeVnode->vnode = htons(pVnodeGid->vnode);
-
-  pMsg += sizeof(SFreeVnodeMsg);
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToDnode(pDnode, pStart, msgLen);
-
-  return 0;
-}
-
-int mgmtSendFreeVnodeMsg(SVgObj *pVgroup) {
-  for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
-    mgmtSendOneFreeVnodeMsg(pVgroup->vnodeGid + i);
-  }
-
-  return 0;
-}
-
-int mgmtCfgDynamicOptions(SDnodeObj *pDnode, char *msg) {
-  char *option, *value;
-  int   olen, valen;
-
-  paGetToken(msg, &option, &olen);
-  if (strncasecmp(option, "unremove", 8) == 0) {
-    mgmtSetDnodeUnRemove(pDnode);
-    return TSDB_CODE_SUCCESS;
-  } else if (strncasecmp(option, "score", 5) == 0) {
-    paGetToken(option + olen + 1, &value, &valen);
-    if (valen > 0) {
-      int score = atoi(value);
-      mTrace("dnode:%s, custom score set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->customScore, score);
-      pDnode->customScore = score;
-      mgmtUpdateDnode(pDnode);
-      mgmtStartBalanceTimer(15);
-    }
-    return TSDB_CODE_INVALID_SQL;
-  } else if (strncasecmp(option, "bandwidth", 9) == 0) {
-    paGetToken(msg, &value, &valen);
-    if (valen > 0) {
-      int bandwidthMb = atoi(value);
-      if (bandwidthMb >= 0 && bandwidthMb < 10000000) {
-        mTrace("dnode:%s, bandwidth(Mb) set from:%d to:%d", taosIpStr(pDnode->privateIp), pDnode->bandwidthMb, bandwidthMb);
-        pDnode->bandwidthMb = bandwidthMb;
-        mgmtUpdateDnode(pDnode);
-        return TSDB_CODE_SUCCESS;
-      }
-    }
-    return TSDB_CODE_INVALID_SQL;
-  }
-
-  return -1;
-}
-
-int mgmtSendCfgDnodeMsg(char *cont) {
-#ifdef CLUSTER
-  char *     pMsg, *pStart;
-  int        msgLen = 0;
-#endif
-
-  SDnodeObj *pDnode;
-  SCfgMsg *  pCfg = (SCfgMsg *)cont;
-  uint32_t   ip;
-
-  ip = inet_addr(pCfg->ip);
-  pDnode = mgmtGetDnode(ip);
-  if (pDnode == NULL) {
-    mError("dnode ip:%s not configured", pCfg->ip);
-    return TSDB_CODE_NOT_CONFIGURED;
-  }
-
-  mTrace("dnode:%s, dynamic option received, content:%s", taosIpStr(pDnode->privateIp), pCfg->config);
-  int code = mgmtCfgDynamicOptions(pDnode, pCfg->config);
-  if (code != -1) {
-    return code;
-  }
-
-#ifdef CLUSTER
-  pStart = taosBuildReqMsg(pDnode->thandle, TSDB_MSG_TYPE_CFG_PNODE);
-  if (pStart == NULL) return TSDB_CODE_NODE_OFFLINE;
-  pMsg = pStart;
-
-  memcpy(pMsg, cont, sizeof(SCfgMsg));
-  pMsg += sizeof(SCfgMsg);
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToDnode(pDnode, pStart, msgLen);
-#else
-  (void)tsCfgDynamicOptions(pCfg->config);
-#endif
-  return 0;
-}
diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c
deleted file mode 100644
index a2a6ed8a7d3e506ddfcd1926683a0d823906c36a..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtMeter.c
+++ /dev/null
@@ -1,1783 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "mgmtUtil.h"
-#include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
-#include "tschemautil.h"
-#include "tscompression.h"
-#include "tskiplist.h"
-#include "tsqlfunction.h"
-#include "ttime.h"
-#include "vnodeTagMgmt.h"
-#include "vnodeStatus.h"
-
-extern int64_t sdbVersion;
-
-#define mgmtDestroyMeter(pMeter)            \
-  do {                                      \
-    tfree(pMeter->schema);                  \
-    pMeter->pSkipList = tSkipListDestroy((pMeter)->pSkipList); \
-    tfree(pMeter);                          \
-  } while (0)
-
-enum _Meter_Update_Action {
-  METER_UPDATE_TAG_NAME,
-  METER_UPDATE_TAG_VALUE,
-  METER_UPDATE_TAG_VALUE_COL0,
-  METER_UPDATE_NULL,
-  MAX_METER_UPDATE_ACTION
-};
-
-typedef struct {
-  int32_t col;
-  int32_t pos;
-  SSchema schema;
-} SchemaUnit;
-
-typedef struct {
-  char     meterId[TSDB_METER_ID_LEN + 1];
-  char     type;
-  uint32_t cols;
-  char     data[];
-} SMeterBatchUpdateMsg;
-
-typedef struct {
-  char    meterId[TSDB_METER_ID_LEN + 1];
-  char    action;
-  int32_t dataSize;
-  char    data[];
-} SMeterUpdateMsg;
-
-void *meterSdb = NULL;
-void *(*mgmtMeterActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
-
-// Function declaration
-void *mgmtMeterActionInsert(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionDelete(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionEncode(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionDecode(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionAfterBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionReset(void *row, char *str, int size, int *ssize);
-void *mgmtMeterActionDestroy(void *row, char *str, int size, int *ssize);
-int32_t mgmtMeterAddTags(STabObj *pMetric, SSchema schema[], int ntags);
-static void removeMeterFromMetricIndex(STabObj *pMetric, STabObj *pMeter);
-static void addMeterIntoMetricIndex(STabObj *pMetric, STabObj *pMeter);
-int32_t mgmtMeterDropTagByName(STabObj *pMetric, char *name);
-int32_t mgmtMeterModifyTagNameByName(STabObj *pMetric, const char *oname, const char *nname);
-int32_t mgmtMeterModifyTagValueByName(STabObj *pMeter, char *tagName, char *nContent);
-int32_t mgmtMeterAddColumn(STabObj *pMeter, SSchema schema[], int ncols);
-int32_t mgmtMeterDropColumnByName(STabObj *pMeter, const char *name);
-static int dropMeterImp(SDbObj *pDb, STabObj * pMeter, SAcctObj *pAcct);
-static void dropAllMetersOfMetric(SDbObj *pDb, STabObj * pMetric, SAcctObj *pAcct);
-
-int mgmtCheckMeterLimit(SAcctObj *pAcct, SCreateTableMsg *pCreate);
-int mgmtCheckMeterGrant(SCreateTableMsg *pCreate, STabObj * pMeter);
-
-void mgmtMeterActionInit() {
-  mgmtMeterActionFp[SDB_TYPE_INSERT] = mgmtMeterActionInsert;
-  mgmtMeterActionFp[SDB_TYPE_DELETE] = mgmtMeterActionDelete;
-  mgmtMeterActionFp[SDB_TYPE_UPDATE] = mgmtMeterActionUpdate;
-  mgmtMeterActionFp[SDB_TYPE_ENCODE] = mgmtMeterActionEncode;
-  mgmtMeterActionFp[SDB_TYPE_DECODE] = mgmtMeterActionDecode;
-  mgmtMeterActionFp[SDB_TYPE_BEFORE_BATCH_UPDATE] = mgmtMeterActionBeforeBatchUpdate;
-  mgmtMeterActionFp[SDB_TYPE_BATCH_UPDATE] = mgmtMeterActionBatchUpdate;
-  mgmtMeterActionFp[SDB_TYPE_AFTER_BATCH_UPDATE] = mgmtMeterActionAfterBatchUpdate;
-  mgmtMeterActionFp[SDB_TYPE_RESET] = mgmtMeterActionReset;
-  mgmtMeterActionFp[SDB_TYPE_DESTROY] = mgmtMeterActionDestroy;
-}
-
-static int32_t mgmtGetReqTagsLength(STabObj *pMetric, int16_t *cols, int32_t numOfCols) {
-  assert(mgmtIsMetric(pMetric) && numOfCols >= 0 && numOfCols <= TSDB_MAX_TAGS + 1);
-
-  int32_t len = 0;
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    assert(cols[i] < pMetric->numOfTags);
-    if (cols[i] == -1) {
-      len += TSDB_METER_NAME_LEN;
-    } else {
-      len += ((SSchema *)pMetric->schema)[pMetric->numOfColumns + cols[i]].bytes;
-    }
-  }
-
-  return len;
-}
-
-/*
- * remove the hole in result set
- */
-static void mgmtVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_t capacity, SShowObj *pShow) {
-  if (rows < capacity) {
-    for (int32_t i = 0; i < numOfCols; ++i) {
-      memmove(data + pShow->offset[i] * rows, data + pShow->offset[i] * capacity, pShow->bytes[i] * rows);
-    }
-  }
-}
-
-void *mgmtMeterActionReset(void *row, char *str, int size, int *ssize) {
-  STabObj *pMeter = (STabObj *)row;
-  int      tsize = pMeter->updateEnd - (char *)pMeter;
-  memcpy(pMeter, str, tsize);
-  pMeter->schema = (char *)realloc(pMeter->schema, pMeter->schemaSize);
-  memcpy(pMeter->schema, str + tsize, pMeter->schemaSize);
-
-  if (mgmtMeterCreateFromMetric(pMeter)) {
-    pMeter->pTagData = pMeter->schema;
-  }
-
-  return NULL;
-}
-
-void *mgmtMeterActionDestroy(void *row, char *str, int size, int *ssize) {
-  STabObj *pMeter = (STabObj *)row;
-  mgmtDestroyMeter(pMeter);
-  return NULL;
-}
-
-void *mgmtMeterActionInsert(void *row, char *str, int size, int *ssize) {
-  STabObj * pMeter = NULL;
-  SVgObj *  pVgroup = NULL;
-  SDbObj *  pDb = NULL;
-  STabObj * pMetric = NULL;
-  SAcctObj *pAcct = NULL;
-
-  pMeter = (STabObj *)row;
-
-  if (mgmtIsNormalMeter(pMeter)) {
-    pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-    if (pVgroup == NULL) {
-      mError("id:%s not in vgroup:%d", pMeter->meterId, pMeter->gid.vgId);
-      return NULL;
-    }
-
-    pDb = mgmtGetDb(pVgroup->dbName);
-    if (pDb == NULL) {
-      mError("vgroup:%d not in DB:%s", pVgroup->vgId, pVgroup->dbName);
-      return NULL;
-    }
-
-    pAcct = mgmtGetAcct(pDb->cfg.acct);
-    // TODO : check if account exists.
-    if (pAcct == NULL) {
-      mError("account not exists");
-      return NULL;
-    }
-  }
-
-  if (mgmtMeterCreateFromMetric(pMeter)) {
-    pMeter->pTagData = (char *)pMeter->schema;
-    pMetric = mgmtGetMeter(pMeter->pTagData);
-    assert(pMetric != NULL);
-  }
-
-  if (pMeter->meterType == TSDB_METER_STABLE) {
-    pMeter->pSql = (char *)pMeter->schema + sizeof(SSchema) * pMeter->numOfColumns;
-  }
-
-  if (mgmtIsNormalMeter(pMeter)) {
-    if (pMetric) mgmtAddMeterIntoMetric(pMetric, pMeter);
-
-    if (!sdbMaster) {
-      int sid = taosAllocateId(pVgroup->idPool);
-      if (sid != pMeter->gid.sid) {
-        mError("sid:%d is not matched from the master:%d", sid, pMeter->gid.sid);
-        return NULL;
-      }
-    }
-
-    pAcct->acctInfo.numOfTimeSeries += (pMeter->numOfColumns - 1);
-    pVgroup->numOfMeters++;
-    pDb->numOfTables++;
-    pVgroup->meterList[pMeter->gid.sid] = pMeter;
-
-    if (pVgroup->numOfMeters >= pDb->cfg.maxSessions - 1 && pDb->numOfVgroups > 1) mgmtMoveVgroupToTail(pDb, pVgroup);
-  } else {
-    // insert a metric
-    pMeter->pHead = NULL;
-    pMeter->pSkipList = NULL;
-    pDb = mgmtGetDbByMeterId(pMeter->meterId);
-    if (pDb) {
-      mgmtAddMetricIntoDb(pDb, pMeter);
-    }
-  }
-
-  return NULL;
-}
-
-void *mgmtMeterActionDelete(void *row, char *str, int size, int *ssize) {
-  STabObj *pMeter = NULL;
-  SVgObj * pVgroup = NULL;
-  SDbObj * pDb = NULL;
-  STabObj *pMetric = NULL;
-
-  pMeter = (STabObj *)row;
-
-  if (mgmtIsNormalMeter(pMeter)) {
-    if (pMeter->gid.vgId == 0) {
-      return NULL;
-    }
-
-    pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-    if (pVgroup == NULL) {
-      mError("id:%s not in vgroup:%d", pMeter->meterId, pMeter->gid.vgId);
-      return NULL;
-    }
-
-    pDb = mgmtGetDb(pVgroup->dbName);
-    if (pDb == NULL) {
-      mError("vgroup:%d not in DB:%s", pVgroup->vgId, pVgroup->dbName);
-      return NULL;
-    }
-  }
-
-  if (mgmtMeterCreateFromMetric(pMeter)) {
-    pMeter->pTagData = (char *)pMeter->schema;
-    pMetric = mgmtGetMeter(pMeter->pTagData);
-    assert(pMetric != NULL);
-  }
-
-  if (mgmtIsNormalMeter(pMeter)) {
-    if (pMetric) mgmtRemoveMeterFromMetric(pMetric, pMeter);
-
-    pVgroup->meterList[pMeter->gid.sid] = NULL;
-    pVgroup->numOfMeters--;
-    pDb->numOfTables--;
-    taosFreeId(pVgroup->idPool, pMeter->gid.sid);
-
-    if (pVgroup->numOfMeters > 0) mgmtMoveVgroupToHead(pDb, pVgroup);
-  } else {
-    // remove a metric
-    // remove all the associated meters
-
-    pDb = mgmtGetDbByMeterId(pMeter->meterId);
-    if (pDb) mgmtRemoveMetricFromDb(pDb, pMeter);
-  }
-
-  return NULL;
-}
-
-void *mgmtMeterActionUpdate(void *row, char *str, int size, int *ssize) {
-  STabObj *pMeter = NULL;
-  STabObj *pMetric = NULL;
-
-  pMeter = (STabObj *)row;
-  STabObj *pNew = (STabObj *)str;
-
-  if (pNew->isDirty) {
-    pMetric = mgmtGetMeter(pMeter->pTagData);
-    removeMeterFromMetricIndex(pMetric, pMeter);
-  }
-  mgmtMeterActionReset(pMeter, str, size, NULL);
-  pMeter->pTagData = pMeter->schema;
-  if (pNew->isDirty) {
-    addMeterIntoMetricIndex(pMetric, pMeter);
-    pMeter->isDirty = 0;
-  }
-
-  return NULL;
-}
-
-void *mgmtMeterActionEncode(void *row, char *str, int size, int *ssize) {
-  assert(row != NULL && str != NULL);
-
-  STabObj *pMeter = (STabObj *)row;
-  int      tsize = pMeter->updateEnd - (char *)pMeter;
-
-  if (size < tsize + pMeter->schemaSize + 1) {
-    *ssize = -1;
-    return NULL;
-  }
-
-  memcpy(str, pMeter, tsize);
-  memcpy(str + tsize, pMeter->schema, pMeter->schemaSize);
-
-  *ssize = tsize + pMeter->schemaSize;
-
-  return NULL;
-}
-
-void *mgmtMeterActionDecode(void *row, char *str, int size, int *ssize) {
-  assert(str != NULL);
-
-  STabObj *pMeter = (STabObj *)malloc(sizeof(STabObj));
-  if (pMeter == NULL) return NULL;
-  memset(pMeter, 0, sizeof(STabObj));
-
-  int tsize = pMeter->updateEnd - (char *)pMeter;
-  if (size < tsize) {
-    mgmtDestroyMeter(pMeter);
-    return NULL;
-  }
-  memcpy(pMeter, str, tsize);
-
-  pMeter->schema = (char *)malloc(pMeter->schemaSize);
-  if (pMeter->schema == NULL) {
-    mgmtDestroyMeter(pMeter);
-    return NULL;
-  }
-
-  memcpy(pMeter->schema, str + tsize, pMeter->schemaSize);
-  return (void *)pMeter;
-}
-
-void *mgmtMeterActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize) {
-  STabObj *pMetric = (STabObj *)row;
-
-  pthread_rwlock_wrlock(&(pMetric->rwLock));
-
-  return NULL;
-}
-
-void *mgmtMeterActionBatchUpdate(void *row, char *str, int size, int *ssize) {
-  STabObj *             pMeter = (STabObj *)row;
-  SMeterBatchUpdateMsg *msg = (SMeterBatchUpdateMsg *)str;
-
-  if (mgmtIsMetric(pMeter)) {
-    if (msg->type == SDB_TYPE_INSERT) {  // Insert schema
-      uint32_t total_cols = pMeter->numOfColumns + pMeter->numOfTags;
-      pMeter->schema = realloc(pMeter->schema, (total_cols + msg->cols) * sizeof(SSchema));
-      pMeter->schemaSize = (total_cols + msg->cols) * sizeof(SSchema);
-      pMeter->numOfTags += msg->cols;
-      memcpy(pMeter->schema + total_cols * sizeof(SSchema), msg->data, msg->cols * sizeof(SSchema));
-
-    } else if (msg->type == SDB_TYPE_DELETE) {  // Delete schema
-      // Make sure the order of tag columns
-      SchemaUnit *schemaUnit = (SchemaUnit *)(msg->data);
-      int         col = schemaUnit->col;
-      assert(col > 0 && col < pMeter->numOfTags);
-      if (col < pMeter->numOfTags - 1) {
-        memmove(pMeter->schema + sizeof(SSchema) * (pMeter->numOfColumns + col),
-                pMeter->schema + sizeof(SSchema) * (pMeter->numOfColumns + col + 1),
-                pMeter->schemaSize - (sizeof(SSchema) * (pMeter->numOfColumns + col + 1)));
-      }
-      pMeter->schemaSize -= sizeof(SSchema);
-      pMeter->numOfTags--;
-      pMeter->schema = realloc(pMeter->schema, pMeter->schemaSize);
-    }
-
-    return pMeter->pHead;
-
-  } else if (mgmtMeterCreateFromMetric(pMeter)) {
-    if (msg->type == SDB_TYPE_INSERT) {
-      SSchema *schemas = (SSchema *)msg->data;
-      int      total_size = 0;
-      for (int i = 0; i < msg->cols; i++) {
-        total_size += schemas[i].bytes;
-      }
-      pMeter->schema = realloc(pMeter->schema, pMeter->schemaSize + total_size);
-      pMeter->pTagData = pMeter->schema;
-      memset(pMeter->schema + pMeter->schemaSize, 0, total_size);
-      pMeter->schemaSize += total_size;
-      // TODO: set the data as default value
-    } else if (msg->type == SDB_TYPE_DELETE) {  // Delete values in MTABLEs
-      SchemaUnit *schemaUnit = (SchemaUnit *)(msg->data);
-      int32_t     pos = schemaUnit->pos;
-      int32_t     bytes = schemaUnit->schema.bytes;
-      assert(pos + bytes <= pMeter->schemaSize);
-
-      if (pos + bytes != pMeter->schemaSize) {
-        memmove(pMeter->schema + pos, pMeter->schema + pos + bytes, pMeter->schemaSize - (pos + bytes));
-      }
-
-      pMeter->schemaSize -= bytes;
-      pMeter->schema = realloc(pMeter->schema, pMeter->schemaSize);
-    }
-
-    return pMeter->next;
-  }
-
-  return NULL;
-}
-
-void *mgmtMeterActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) {
-  STabObj *pMetric = (STabObj *)row;
-
-  pthread_rwlock_unlock(&(pMetric->rwLock));
-
-  return NULL;
-}
-
-void *mgmtMeterAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtMeterActionFp[(uint8_t)action] != NULL) {
-    return (*(mgmtMeterActionFp[(uint8_t)action]))(row, str, size, ssize);
-  }
-  return NULL;
-}
-
-void mgmtAddMeterStatisticToAcct(STabObj *pMeter, SAcctObj *pAcct) {
-  pAcct->acctInfo.numOfTimeSeries += (pMeter->numOfColumns - 1);
-}
-
-int mgmtInitMeters() {
-  void *    pNode = NULL;
-  void *    pLastNode = NULL;
-  SVgObj *  pVgroup = NULL;
-  STabObj * pMeter = NULL;
-  STabObj * pMetric = NULL;
-  SDbObj *  pDb = NULL;
-  SAcctObj *pAcct = NULL;
-
-  // TODO: Make sure this function only run once
-  mgmtMeterActionInit();
-
-  meterSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN,
-                          "meters", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtMeterAction);
-  if (meterSdb == NULL) {
-    mError("failed to init meter data");
-    return -1;
-  }
-
-  pNode = NULL;
-  while (1) {
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pMeter);
-    if (pMeter == NULL) break;
-    if (mgmtIsMetric(pMeter)) pMeter->numOfMeters = 0;
-  }
-
-  pNode = NULL;
-  while (1) {
-    pLastNode = pNode;
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pMeter);
-    if (pMeter == NULL) break;
-
-    pDb = mgmtGetDbByMeterId(pMeter->meterId);
-    if (pDb == NULL) {
-      mError("meter:%s, failed to get db, discard it", pMeter->meterId, pMeter->gid.vgId, pMeter->gid.sid);
-      pMeter->gid.vgId = 0;
-      sdbDeleteRow(meterSdb, pMeter);
-      pNode = pLastNode;
-      continue;
-    }
-
-    if (mgmtIsNormalMeter(pMeter)) {
-      pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-
-      if (pVgroup == NULL) {
-        mError("meter:%s, failed to get vgroup:%d sid:%d, discard it", pMeter->meterId, pMeter->gid.vgId, pMeter->gid.sid);
-        pMeter->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pMeter);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if (strcmp(pVgroup->dbName, pDb->name) != 0) {
-        mError("meter:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it",
-               pMeter->meterId, pDb->name, pMeter->gid.vgId, pVgroup->dbName, pMeter->gid.sid);
-        pMeter->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pMeter);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if ( pVgroup->meterList == NULL) {
-        mError("meter:%s, vgroup:%d meterlist is null", pMeter->meterId, pMeter->gid.vgId);
-        pMeter->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pMeter);
-        pNode = pLastNode;
-        continue;
-      }
-
-      pVgroup->meterList[pMeter->gid.sid] = pMeter;
-      taosIdPoolMarkStatus(pVgroup->idPool, pMeter->gid.sid, 1);
-
-      if (pMeter->meterType == TSDB_METER_STABLE) {
-        pMeter->pSql = (char *)pMeter->schema + sizeof(SSchema) * pMeter->numOfColumns;
-      }
-
-      if (mgmtMeterCreateFromMetric(pMeter)) {
-        pMeter->pTagData = (char *)pMeter->schema;  // + sizeof(SSchema)*pMeter->numOfColumns;
-        pMetric = mgmtGetMeter(pMeter->pTagData);
-        if (pMetric) mgmtAddMeterIntoMetric(pMetric, pMeter);
-      }
-
-      pAcct = mgmtGetAcct(pDb->cfg.acct);
-      if (pAcct) mgmtAddMeterStatisticToAcct(pMeter, pAcct);
-    } else {
-      if (pDb) mgmtAddMetricIntoDb(pDb, pMeter);
-    }
-  }
-
-  mgmtSetVgroupIdPool();
-
-  mTrace("meter is initialized");
-  return 0;
-}
-
-STabObj *mgmtGetMeter(char *meterId) { return (STabObj *)sdbGetRow(meterSdb, meterId); }
-
-int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate) {
-  STabObj * pMeter = NULL;
-  STabObj * pMetric = NULL;
-  SVgObj *  pVgroup = NULL;
-  int       size = 0;
-  SAcctObj *pAcct = NULL;
-
-  int numOfTables = sdbGetNumOfRows(meterSdb);
-  if (numOfTables >= tsMaxTables) {
-    mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, tsMaxTables);
-    return TSDB_CODE_TOO_MANY_TABLES;
-  }
-
-  pAcct = mgmtGetAcct(pDb->cfg.acct);
-  assert(pAcct != NULL);
-  int code = mgmtCheckMeterLimit(pAcct, pCreate);
-  if (code != 0) {
-    mError("table:%s, exceed the limit", pCreate->meterId);
-    return code;
-  }
-
-  // does table exist?
-  pMeter = mgmtGetMeter(pCreate->meterId);
-  if (pMeter) {
-    if (pCreate->igExists) {
-      return TSDB_CODE_SUCCESS;
-    } else {
-      return TSDB_CODE_TABLE_ALREADY_EXIST;
-    }
-  }
-
-  // Create the table object
-  pMeter = (STabObj *)malloc(sizeof(STabObj));
-  if (pMeter == NULL) return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  memset(pMeter, 0, sizeof(STabObj));
-
-  if (pCreate->numOfColumns == 0 && pCreate->numOfTags == 0) {  // MTABLE
-    pMeter->meterType = TSDB_METER_MTABLE;
-    char *pTagData = (char *)pCreate->schema;  // it is a tag key
-    pMetric = mgmtGetMeter(pTagData);
-    if (pMetric == NULL) {
-      mError("table:%s, corresponding super table does not exist", pCreate->meterId);
-      return TSDB_CODE_INVALID_TABLE;
-    }
-
-    /*
-     * for meters created according to metrics, the schema of this meter isn't needed.
-     * so, we don't allocate memory for it in order to save a huge amount of
-     * memory when a large amount of meters are created according to this super table.
-     */
-    size = mgmtGetTagsLength(pMetric, INT_MAX) + (uint32_t)TSDB_METER_ID_LEN;
-    pMeter->schema = (char *)malloc(size);
-    if (pMeter->schema == NULL) {
-      mgmtDestroyMeter(pMeter);
-      mError("table:%s, corresponding super table schema is null", pCreate->meterId);
-      return TSDB_CODE_INVALID_TABLE;
-    }
-    memset(pMeter->schema, 0, size);
-
-    pMeter->schemaSize = size;
-
-    pMeter->numOfColumns = pMetric->numOfColumns;
-    pMeter->sversion = pMetric->sversion;
-    pMeter->pTagData = pMeter->schema;
-    pMeter->nextColId = pMetric->nextColId;
-    memcpy(pMeter->pTagData, pTagData, size);
-  } else {
-    int numOfCols = pCreate->numOfColumns + pCreate->numOfTags;
-    size = numOfCols * sizeof(SSchema) + pCreate->sqlLen;
-    pMeter->schema = (char *)malloc(size);
-    if (pMeter->schema == NULL) {
-      mgmtDestroyMeter(pMeter);
-      mError("table:%s, no schema input", pCreate->meterId);
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-    memset(pMeter->schema, 0, size);
-
-    pMeter->numOfColumns = pCreate->numOfColumns;
-    pMeter->sversion = 0;
-    pMeter->numOfTags = pCreate->numOfTags;
-    pMeter->schemaSize = size;
-    memcpy(pMeter->schema, pCreate->schema, numOfCols * sizeof(SSchema));
-
-    for (int k = 0; k < pCreate->numOfColumns; k++) {
-      SSchema *tschema = (SSchema *)pMeter->schema;
-      tschema[k].colId = pMeter->nextColId++;
-    }
-
-    if (pCreate->sqlLen > 0) {
-      pMeter->meterType = TSDB_METER_STABLE;
-      pMeter->pSql = pMeter->schema + numOfCols * sizeof(SSchema);
-      memcpy(pMeter->pSql, (char *)(pCreate->schema) + numOfCols * sizeof(SSchema), pCreate->sqlLen);
-      pMeter->pSql[pCreate->sqlLen - 1] = 0;
-      mTrace("table:%s, stream sql len:%d sql:%s", pCreate->meterId, pCreate->sqlLen, pMeter->pSql);
-    } else {
-      if (pCreate->numOfTags > 0) {
-        pMeter->meterType = TSDB_METER_METRIC;
-      } else {
-        pMeter->meterType = TSDB_METER_OTABLE;
-      }
-    }
-  }
-
-  pMeter->createdTime = taosGetTimestampMs();
-  strcpy(pMeter->meterId, pCreate->meterId);
-  if (pthread_rwlock_init(&pMeter->rwLock, NULL)) {
-    mError("table:%s, failed to init meter lock", pCreate->meterId);
-    mgmtDestroyMeter(pMeter);
-    return TSDB_CODE_FAILED_TO_LOCK_RESOURCES;
-  }
-
-  code = mgmtCheckMeterGrant(pCreate, pMeter);
-  if (code != 0) {
-    mError("table:%s, grant expired", pCreate->meterId);
-    return code;
-  }
-
-  if (pCreate->numOfTags == 0) {  // handle normal meter creation
-    pVgroup = pDb->pHead;
-
-    if (pDb->vgStatus == TSDB_VG_STATUS_IN_PROGRESS) {
-      mgmtDestroyMeter(pMeter);
-      //mTrace("table:%s, vgroup in creating progress", pCreate->meterId);
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-
-    if (pDb->vgStatus == TSDB_VG_STATUS_FULL) {
-      mgmtDestroyMeter(pMeter);
-      mError("table:%s, vgroup is full", pCreate->meterId);
-      return TSDB_CODE_NO_ENOUGH_DNODES;
-    }
-
-    if (pDb->vgStatus == TSDB_VG_STATUS_NO_DISK_PERMISSIONS ||
-        pDb->vgStatus == TSDB_VG_STATUS_SERVER_NO_PACE ||
-        pDb->vgStatus == TSDB_VG_STATUS_SERV_OUT_OF_MEMORY ||
-        pDb->vgStatus == TSDB_VG_STATUS_INIT_FAILED ) {
-      mgmtDestroyMeter(pMeter);
-      mError("table:%s, vgroup init failed, reason:%d %s", pCreate->meterId, pDb->vgStatus, taosGetVgroupStatusStr(pDb->vgStatus));
-      return pDb->vgStatus;
-    }
-
-    if (pVgroup == NULL) {
-      pDb->vgStatus = TSDB_VG_STATUS_IN_PROGRESS;
-      mgmtCreateVgroup(pDb);
-      mgmtDestroyMeter(pMeter);
-      mTrace("table:%s, vgroup malloced, wait for create progress finished", pCreate->meterId);
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-
-    int sid = taosAllocateId(pVgroup->idPool);
-    if (sid < 0) {
-      mWarn("table:%s, vgroup:%d run out of ID, num:%d", pCreate->meterId, pVgroup->vgId, taosIdPoolNumOfUsed(pVgroup->idPool));
-      pDb->vgStatus = TSDB_VG_STATUS_IN_PROGRESS;
-      mgmtCreateVgroup(pDb);
-      mgmtDestroyMeter(pMeter);
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-
-    pMeter->gid.sid = sid;
-    pMeter->gid.vgId = pVgroup->vgId;
-    pMeter->uid = (((uint64_t)pMeter->gid.vgId) << 40) + ((((uint64_t)pMeter->gid.sid) & ((1ul << 24) - 1ul)) << 16) +
-                  ((uint64_t)sdbVersion & ((1ul << 16) - 1ul));
-
-    mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%" PRIu64 " db:%s",
-           pMeter->meterId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pMeter->uid, pDb->name);
-  } else {
-    pMeter->uid = (((uint64_t)pMeter->createdTime) << 16) + ((uint64_t)sdbVersion & ((1ul << 16) - 1ul));
-  }
-
-  if (sdbInsertRow(meterSdb, pMeter, 0) < 0) {
-    mError("table:%s, update sdb error", pCreate->meterId);
-    return TSDB_CODE_SDB_ERROR;
-  }
-
-  // send create message to the selected vnode servers
-  if (pCreate->numOfTags == 0) {
-    mTrace("table:%s, send create table msg to dnode, vgId:%d, sid:%d, vnode:%d",
-           pMeter->meterId, pMeter->gid.vgId, pMeter->gid.sid, pVgroup->vnodeGid[0].vnode);
-
-    grantAddTimeSeries(pMeter->numOfColumns - 1);
-    mgmtSendCreateMsgToVgroup(pMeter, pVgroup);
-  }
-
-  return 0;
-}
-
-int mgmtDropMeter(SDbObj *pDb, char *meterId, int ignore) {
-  STabObj * pMeter;
-  SAcctObj *pAcct;
-
-  pMeter = mgmtGetMeter(meterId);
-  if (pMeter == NULL) {
-    if (ignore) {
-      return TSDB_CODE_SUCCESS;
-    } else {
-      return TSDB_CODE_INVALID_TABLE;
-    }
-  }
-
-  pAcct = mgmtGetAcct(pDb->cfg.acct);
-
-  // 0.log
-  if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-    return TSDB_CODE_MONITOR_DB_FORBEIDDEN;
-  }
-
-  if (mgmtIsNormalMeter(pMeter)) {
-    return dropMeterImp(pDb, pMeter, pAcct);
-  } else {
-    // remove a metric
-    /*
-    if (pMeter->numOfMeters > 0) {
-      assert(pMeter->pSkipList != NULL && pMeter->pSkipList->nSize > 0);
-      return TSDB_CODE_RELATED_TABLES_EXIST;
-    }
-    */
-    // first delet all meters of metric
-    dropAllMetersOfMetric(pDb, pMeter, pAcct);
-
-    // finally delete metric
-    sdbDeleteRow(meterSdb, pMeter);
-  }
-
-  return 0;
-}
-
-int mgmtAlterMeter(SDbObj *pDb, SAlterTableMsg *pAlter) {
-  STabObj *pMeter;
-
-  pMeter = mgmtGetMeter(pAlter->meterId);
-  if (pMeter == NULL) {
-    return TSDB_CODE_INVALID_TABLE;
-  }
-
-  // 0.log
-  if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) return TSDB_CODE_MONITOR_DB_FORBEIDDEN;
-
-  if (pAlter->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
-    if (!mgmtIsNormalMeter(pMeter) || !mgmtMeterCreateFromMetric(pMeter)) {
-      return TSDB_CODE_OPS_NOT_SUPPORT;
-    }
-  }
-
-  // todo add
-  /* mgmtMeterAddTags */
-  if (pAlter->type == TSDB_ALTER_TABLE_ADD_TAG_COLUMN) {
-    mTrace("alter table %s to add tag column:%s, type:%d", pMeter->meterId, pAlter->schema[0].name,
-           pAlter->schema[0].type);
-    return mgmtMeterAddTags(pMeter, pAlter->schema, 1);
-  } else if (pAlter->type == TSDB_ALTER_TABLE_DROP_TAG_COLUMN) {
-    mTrace("alter table %s to drop tag column:%s", pMeter->meterId, pAlter->schema[0].name);
-    return mgmtMeterDropTagByName(pMeter, pAlter->schema[0].name);
-  } else if (pAlter->type == TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN) {
-    mTrace("alter table %s to change tag column name, old: %s, new: %s", pMeter->meterId, pAlter->schema[0].name,
-           pAlter->schema[1].name);
-    return mgmtMeterModifyTagNameByName(pMeter, pAlter->schema[0].name, pAlter->schema[1].name);
-  } else if (pAlter->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
-    mTrace("alter table %s to modify tag value, tag name:%s", pMeter->meterId, pAlter->schema[0].name);
-    return mgmtMeterModifyTagValueByName(pMeter, pAlter->schema[0].name, pAlter->tagVal);
-  } else if (pAlter->type == TSDB_ALTER_TABLE_ADD_COLUMN) {
-    mTrace("alter table %s to add column:%s, type:%d", pMeter->meterId, pAlter->schema[0].name, pAlter->schema[0].type);
-    return mgmtMeterAddColumn(pMeter, pAlter->schema, 1);
-  } else if (pAlter->type == TSDB_ALTER_TABLE_DROP_COLUMN) {
-    mTrace("alter table %s to drop column:%s", pMeter->meterId, pAlter->schema[0].name);
-    return mgmtMeterDropColumnByName(pMeter, pAlter->schema[0].name);
-  } else {
-    return TSDB_CODE_INVALID_MSG_TYPE;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int dropMeterImp(SDbObj *pDb, STabObj * pMeter, SAcctObj *pAcct) {
-  SVgObj *  pVgroup;
-
-  if (pAcct != NULL) pAcct->acctInfo.numOfTimeSeries -= (pMeter->numOfColumns - 1);
-  
-  pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-  if (pVgroup == NULL) return TSDB_CODE_OTHERS;
-
-  grantRestoreTimeSeries(pMeter->numOfColumns - 1);
-  mgmtSendRemoveMeterMsgToDnode(pMeter, pVgroup);
-  sdbDeleteRow(meterSdb, pMeter);
-
-  if (pVgroup->numOfMeters <= 0) mgmtDropVgroup(pDb, pVgroup);
-
-  return 0;
-}
-
-static void dropAllMetersOfMetric(SDbObj *pDb, STabObj * pMetric, SAcctObj *pAcct) {
-  STabObj * pMeter = NULL;
-
-  while ((pMeter = pMetric->pHead) != NULL) {
-    (void)dropMeterImp(pDb, pMeter, pAcct);    
-  }
-}
-
-/*
- * create key of each meter for skip list, which is generated from first tag
- * column
- */
-static void createKeyFromTagValue(STabObj *pMetric, STabObj *pMeter, tSkipListKey *pKey) {
-  SSchema *     pTagSchema = (SSchema *)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-  const int16_t KEY_COLUMN_OF_TAGS = 0;
-
-  char *tagVal = pMeter->pTagData + TSDB_METER_ID_LEN;  // tag start position
-  *pKey = tSkipListCreateKey(pTagSchema[KEY_COLUMN_OF_TAGS].type, tagVal, pTagSchema[KEY_COLUMN_OF_TAGS].bytes);
-}
-
-/*
- * add a meter into a metric's skip list
- */
-static void addMeterIntoMetricIndex(STabObj *pMetric, STabObj *pMeter) {
-  const int16_t KEY_COLUMN_OF_TAGS = 0;
-  SSchema *     pTagSchema = (SSchema *)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-
-  if (pMetric->pSkipList == NULL) {
-    pMetric->pSkipList = tSkipListCreate(MAX_SKIP_LIST_LEVEL, pTagSchema[KEY_COLUMN_OF_TAGS].type,
-                    pTagSchema[KEY_COLUMN_OF_TAGS].bytes);
-  }
-
-  if (pMetric->pSkipList) {
-    tSkipListKey key = {0};
-    createKeyFromTagValue(pMetric, pMeter, &key);
-    tSkipListPut(pMetric->pSkipList, pMeter, &key, 1);
-
-    tSkipListDestroyKey(&key);
-  }
-}
-
-static void removeMeterFromMetricIndex(STabObj *pMetric, STabObj *pMeter) {
-  if (pMetric->pSkipList == NULL) {
-    return;
-  }
-
-  tSkipListKey key = {0};
-  createKeyFromTagValue(pMetric, pMeter, &key);
-  tSkipListNode **pRes = NULL;
-
-  int32_t num = tSkipListGets(pMetric->pSkipList, &key, &pRes);
-  for (int32_t i = 0; i < num; ++i) {
-    STabObj *pOneMeter = (STabObj *)pRes[i]->pData;
-    if (pOneMeter->gid.sid == pMeter->gid.sid && pOneMeter->gid.vgId == pMeter->gid.vgId) {
-      assert(pMeter == pOneMeter);
-      tSkipListRemoveNode(pMetric->pSkipList, pRes[i]);
-    }
-  }
-
-  tSkipListDestroyKey(&key);
-  if (num != 0) {
-    free(pRes);
-  }
-}
-
-int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pMeter) {
-  if (pMeter == NULL || pMetric == NULL) return -1;
-
-  pthread_rwlock_wrlock(&(pMetric->rwLock));
-  // add meter into skip list
-  pMeter->next = pMetric->pHead;
-  pMeter->prev = NULL;
-
-  if (pMetric->pHead) pMetric->pHead->prev = pMeter;
-
-  pMetric->pHead = pMeter;
-  pMetric->numOfMeters++;
-
-  addMeterIntoMetricIndex(pMetric, pMeter);
-
-  pthread_rwlock_unlock(&(pMetric->rwLock));
-
-  return 0;
-}
-
-int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pMeter) {
-  pthread_rwlock_wrlock(&(pMetric->rwLock));
-
-  if (pMeter->prev) pMeter->prev->next = pMeter->next;
-
-  if (pMeter->next) pMeter->next->prev = pMeter->prev;
-
-  if (pMeter->prev == NULL) pMetric->pHead = pMeter->next;
-
-  pMetric->numOfMeters--;
-
-  removeMeterFromMetricIndex(pMetric, pMeter);
-
-  pthread_rwlock_unlock(&(pMetric->rwLock));
-
-  return 0;
-}
-
-void mgmtCleanUpMeters() { sdbCloseTable(meterSdb); }
-
-int mgmtGetMeterMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pDb == NULL) return TSDB_CODE_DB_NOT_SELECTED;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_METER_NAME_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "table_name");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created_time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "columns");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_METER_NAME_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "stable");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  //  pShow->numOfRows = sdbGetNumOfRows (meterSdb);
-  pShow->numOfRows = pDb->numOfTables;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  return 0;
-}
-
-SSchema *mgmtGetMeterSchema(STabObj *pMeter) {
-  if (pMeter == NULL) {
-    return NULL;
-  }
-
-  if (!mgmtMeterCreateFromMetric(pMeter)) {
-    return (SSchema *)pMeter->schema;
-  }
-
-  STabObj *pMetric = mgmtGetMeter(pMeter->pTagData);
-  assert(pMetric != NULL);
-
-  return (SSchema *)pMetric->schema;
-}
-
-static int32_t mgmtSerializeTagValue(char* pMsg, STabObj* pMeter, int16_t* tagsId, int32_t numOfTags) {
-  int32_t offset = 0;
-  
-  for (int32_t j = 0; j < numOfTags; ++j) {
-    if (tagsId[j] == TSDB_TBNAME_COLUMN_INDEX) {  // handle the table name tags
-      char name[TSDB_METER_NAME_LEN] = {0};
-      extractTableName(pMeter->meterId, name);
-      
-      memcpy(pMsg + offset, name, TSDB_METER_NAME_LEN);
-      offset += TSDB_METER_NAME_LEN;
-    } else {
-      SSchema s = {0};
-      char *  tag = mgmtMeterGetTag(pMeter, tagsId[j], &s);
-      
-      memcpy(pMsg + offset, tag, (size_t)s.bytes);
-      offset += s.bytes;
-    }
-  }
-  
-  return offset;
-}
-
-/*
- * serialize SVnodeSidList to byte array
- */
-static char *mgmtBuildMetricMetaMsg(SConnObj *pConn, STabObj *pMeter, int32_t *ovgId, SVnodeSidList **pList, SMetricMeta *pMeta,
-                                    int32_t tagLen, int16_t numOfTags, int16_t *tagsId, int32_t maxNumOfMeters,
-                                    char *pMsg) {
-  if (pMeter->gid.vgId != *ovgId || ((*pList) != NULL && (*pList)->numOfSids >= maxNumOfMeters)) {
-    /*
-     * here we construct a new vnode group for 2 reasons
-     * 1. the query msg may be larger than 64k,
-     * 2. the following meters belong to different vnodes
-     */
-    (*pList) = (SVnodeSidList *)pMsg;
-    (*pList)->numOfSids = 0;
-    (*pList)->index = 0;
-    pMeta->numOfVnodes++;
-
-    SVgObj *pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-    for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-      if (pConn->usePublicIp) {
-        (*pList)->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-        (*pList)->vpeerDesc[i].vnode = pVgroup->vnodeGid[i].vnode;
-      } else {
-        (*pList)->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
-        (*pList)->vpeerDesc[i].vnode = pVgroup->vnodeGid[i].vnode;
-      }
-    }
-
-    pMsg += sizeof(SVnodeSidList);
-    (*ovgId) = pMeter->gid.vgId;
-  }
-  pMeta->numOfMeters++;
-  (*pList)->numOfSids++;
-
-  SMeterSidExtInfo *pSMeterTagInfo = (SMeterSidExtInfo *)pMsg;
-  pSMeterTagInfo->sid = htonl(pMeter->gid.sid);
-  pSMeterTagInfo->uid = htobe64(pMeter->uid);
-  
-  pMsg += sizeof(SMeterSidExtInfo);
-
-  int32_t offset = mgmtSerializeTagValue(pMsg, pMeter, tagsId, numOfTags);
-  assert(offset == tagLen);
-  
-  pMsg += offset;
-  return pMsg;
-}
-
-// get total number of vnodes in final result set
-static int32_t mgmtGetNumOfVnodesInResult(tQueryResultset *pResult) {
-  int32_t numOfVnodes = 0;
-  int32_t prevGid = -1;
-
-  for (int32_t i = 0; i < pResult->num; ++i) {
-    STabObj *pMeter = pResult->pRes[i];
-    if (prevGid == -1) {
-      prevGid = pMeter->gid.vgId;
-      numOfVnodes++;
-    } else if (prevGid != pMeter->gid.vgId) {
-      prevGid = pMeter->gid.vgId;
-      numOfVnodes++;
-    }
-  }
-
-  return numOfVnodes;
-}
-
-static int32_t mgmtGetMetricMetaMsgSize(tQueryResultset *pResult, int32_t tagLength, int32_t maxMetersPerQuery) {
-  int32_t numOfVnodes = mgmtGetNumOfVnodesInResult(pResult);
-
-  int32_t size = (sizeof(SMeterSidExtInfo) + tagLength) * pResult->num +
-                 ((pResult->num / maxMetersPerQuery) + 1 + numOfVnodes) * sizeof(SVnodeSidList) + sizeof(SMetricMeta) +
-                 1024;
-
-  return size;
-}
-
-static SMetricMetaElemMsg *doConvertMetricMetaMsg(SMetricMetaMsg *pMetricMetaMsg, int32_t tableIndex) {
-  SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)((char *)pMetricMetaMsg + pMetricMetaMsg->metaElem[tableIndex]);
-
-  pElem->orderIndex = htons(pElem->orderIndex);
-  pElem->orderType = htons(pElem->orderType);
-  pElem->numOfTags = htons(pElem->numOfTags);
-
-  pElem->numOfGroupCols = htons(pElem->numOfGroupCols);
-  pElem->condLen = htonl(pElem->condLen);
-  pElem->cond = htonl(pElem->cond);
-
-  pElem->elemLen = htons(pElem->elemLen);
-
-  pElem->tableCond = htonl(pElem->tableCond);
-  pElem->tableCondLen = htonl(pElem->tableCondLen);
-
-  pElem->rel = htons(pElem->rel);
-
-  for (int32_t i = 0; i < pElem->numOfTags; ++i) {
-    pElem->tagCols[i] = htons(pElem->tagCols[i]);
-  }
-
-  pElem->groupbyTagColumnList = htonl(pElem->groupbyTagColumnList);
-
-  SColIndexEx *groupColIds = (SColIndexEx*) (((char *)pMetricMetaMsg) + pElem->groupbyTagColumnList);
-  for (int32_t i = 0; i < pElem->numOfGroupCols; ++i) {
-    groupColIds[i].colId = htons(groupColIds[i].colId);
-    groupColIds[i].colIdx = htons(groupColIds[i].colIdx);
-    groupColIds[i].flag = htons(groupColIds[i].flag);
-    groupColIds[i].colIdxInBuf = 0;
-  }
-
-  return pElem;
-}
-
-static int32_t mgmtBuildMetricMetaRspMsg(SConnObj *pConn, SMetricMetaMsg *pMetricMetaMsg, tQueryResultset *pResult,
-                                         char **pStart, int32_t *tagLen, int32_t rspMsgSize, int32_t maxTablePerVnode,
-                                         int32_t code) {
-  *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP, rspMsgSize);
-  if (*pStart == NULL) {
-    return 0;
-  }
-
-  char *    pMsg = (*pStart);
-  STaosRsp *pRsp = (STaosRsp *)pMsg;
-
-  pRsp->code = code;
-  pMsg += sizeof(STaosRsp);
-  *pMsg = TSDB_IE_TYPE_META;
-  pMsg++;
-
-  if (code != TSDB_CODE_SUCCESS) {
-    return pMsg - (*pStart);  // one bit in payload
-  }
-
-  int32_t msgLen = 0;
-
-  *(int16_t *)pMsg = htons(pMetricMetaMsg->numOfMeters);
-  pMsg += sizeof(int16_t);
-
-  for (int32_t j = 0; j < pMetricMetaMsg->numOfMeters; ++j) {
-    SVnodeSidList *pList = NULL;
-    int            ovgId = -1;
-
-    SMetricMeta *pMeta = (SMetricMeta *)pMsg;
-
-    pMeta->numOfMeters = 0;
-    pMeta->numOfVnodes = 0;
-    pMeta->tagLen = htons((uint16_t)tagLen[j]);
-
-    pMsg = (char *)pMeta + sizeof(SMetricMeta);
-
-    SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)((char *)pMetricMetaMsg + pMetricMetaMsg->metaElem[j]);
-
-    for (int32_t i = 0; i < pResult[j].num; ++i) {
-      STabObj *pMeter = pResult[j].pRes[i];
-      pMsg = mgmtBuildMetricMetaMsg(pConn, pMeter, &ovgId, &pList, pMeta, tagLen[j], pElem->numOfTags, pElem->tagCols,
-                                    maxTablePerVnode, pMsg);
-    }
-
-    mTrace("metric:%s metric-meta tables:%d, vnode:%d", pElem->meterId, pMeta->numOfMeters, pMeta->numOfVnodes);
-
-    pMeta->numOfMeters = htonl(pMeta->numOfMeters);
-    pMeta->numOfVnodes = htonl(pMeta->numOfVnodes);
-  }
-
-  msgLen = pMsg - (*pStart);
-  mTrace("metric-meta msg size %d", msgLen);
-
-  return msgLen;
-}
-
-int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pMetricMetaMsg) {
-  /*
-   * naive method: Do not limit the maximum number of meters in each
-   * vnode(subquery), split the result according to vnodes
-   *
-   * todo: split the number of vnodes to make sure each vnode has the same
-   * number of tables to query, while not break the upper limit of number of vnode queries
-   */
-  int32_t          maxMetersPerVNodeForQuery = INT32_MAX;
-  int              msgLen = 0;
-  int              ret = TSDB_CODE_SUCCESS;
-  tQueryResultset *result = calloc(1, pMetricMetaMsg->numOfMeters * sizeof(tQueryResultset));
-  int32_t *        tagLen = calloc(1, sizeof(int32_t) * pMetricMetaMsg->numOfMeters);
-
-  if (result == NULL || tagLen == NULL) {
-    tfree(result);
-    tfree(tagLen);
-    return -1;
-  }
-
-  for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-    SMetricMetaElemMsg *pElem = doConvertMetricMetaMsg(pMetricMetaMsg, i);
-    STabObj *           pMetric = mgmtGetMeter(pElem->meterId);
-
-    if (!mgmtIsMetric(pMetric)) {
-      ret = TSDB_CODE_NOT_SUPER_TABLE;
-      break;
-    }
-
-    tagLen[i] = mgmtGetReqTagsLength(pMetric, (int16_t *)pElem->tagCols, pElem->numOfTags);
-  }
-
-#if 0
-    //todo: opt for join process
-    int64_t num = 0;
-    int32_t index = 0;
-
-    for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-        SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg*) ((char *) pMetricMetaMsg + pMetricMetaMsg->metaElem[i]);
-        STabObj *pMetric = mgmtGetMeter(pElem->meterId);
-
-        if (pMetric->pSkipList->nSize > num) {
-            index = i;
-            num = pMetric->pSkipList->nSize;
-        }
-    }
-#endif
-
-  if (ret == TSDB_CODE_SUCCESS) {
-    // todo opt performance
-    for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-      ret = mgmtRetrieveMetersFromMetric(pMetricMetaMsg, i, &result[i]);
-    }
-  }
-
-  if (ret == TSDB_CODE_SUCCESS) {
-    ret = mgmtDoJoin(pMetricMetaMsg, result);
-  }
-
-  if (ret == TSDB_CODE_SUCCESS) {
-    for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-      mgmtReorganizeMetersInMetricMeta(pMetricMetaMsg, i, &result[i]);
-    }
-  }
-
-  if (ret == TSDB_CODE_SUCCESS) {
-    for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-      msgLen += mgmtGetMetricMetaMsgSize(&result[i], tagLen[i], maxMetersPerVNodeForQuery);
-    }
-  } else {
-    msgLen = 512;
-  }
-
-  msgLen = mgmtBuildMetricMetaRspMsg(pConn, pMetricMetaMsg, result, pStart, tagLen, msgLen, maxMetersPerVNodeForQuery, ret);
-
-  for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-    tQueryResultClean(&result[i]);
-  }
-
-  free(tagLen);
-  free(result);
-
-  return msgLen;
-}
-
-int mgmtRetrieveMeters(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int      numOfRows = 0;
-  STabObj *pMeter = NULL;
-  char *   pWrite;
-  int      cols = 0;
-  int      prefixLen;
-  int      numOfRead = 0;
-  char     prefix[20] = {0};
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pDb == NULL) return 0;
-  if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-    if (strcmp(pConn->pUser->user, "root") != 0 && strcmp(pConn->pUser->user, "_root") != 0 && strcmp(pConn->pUser->user, "monitor") != 0 ) {
-      return 0;
-    }
-  }
-
-  strcpy(prefix, pDb->name);
-  strcat(prefix, TS_PATH_DELIMITER);
-  prefixLen = strlen(prefix);
-
-  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
-  char                meterName[TSDB_METER_NAME_LEN] = {0};
-
-  while (numOfRows < rows) {
-    pShow->pNode = sdbFetchRow(meterSdb, pShow->pNode, (void **)&pMeter);
-    if (pMeter == NULL) break;
-
-    if (mgmtIsMetric(pMeter)) continue;
-
-    // not belong to current db
-    if (strncmp(pMeter->meterId, prefix, prefixLen)) continue;
-
-    numOfRead++;
-    memset(meterName, 0, tListLen(meterName));
-
-    // pattern compare for meter name
-    extractTableName(pMeter->meterId, meterName);
-
-    if (pShow->payloadLen > 0 &&
-        patternMatch(pShow->payload, meterName, TSDB_METER_NAME_LEN, &info) != TSDB_PATTERN_MATCH)
-      continue;
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strncpy(pWrite, meterName, TSDB_METER_NAME_LEN);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pMeter->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pMeter->numOfColumns;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    if (pMeter->pTagData) {
-      extractTableName(pMeter->pTagData, pWrite);
-    }
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRead;
-  const int32_t NUM_OF_COLUMNS = 4;
-
-  mgmtVacuumResult(data, NUM_OF_COLUMNS, numOfRows, rows, pShow);
-
-  return numOfRows;
-}
-
-int mgmtGetMetricMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pDb == NULL) return TSDB_CODE_DB_NOT_SELECTED;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_METER_NAME_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created_time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "columns");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 2;
-  pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "tags");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "tables");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = pDb->numOfMetrics;
-  pShow->pNode = pDb->pMetric;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  return 0;
-}
-
-int mgmtRetrieveMetrics(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int      numOfRows = 0;
-  STabObj *pMetric = NULL;
-  char *   pWrite;
-  int      cols = 0;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pDb == NULL) return 0;
-  if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-    if (strcmp(pConn->pUser->user, "root") != 0 && strcmp(pConn->pUser->user, "_root") != 0 && strcmp(pConn->pUser->user, "monitor") != 0 ) {
-      return 0;
-    }
-  }
-
-  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
-
-  char metricName[TSDB_METER_NAME_LEN] = {0};
-
-  while (numOfRows < rows) {
-    pMetric = (STabObj *)pShow->pNode;
-    if (pMetric == NULL) break;
-    pShow->pNode = (void *)pMetric->next;
-
-    memset(metricName, 0, tListLen(metricName));
-    extractTableName(pMetric->meterId, metricName);
-
-    if (pShow->payloadLen > 0 &&
-        patternMatch(pShow->payload, metricName, TSDB_METER_NAME_LEN, &info) != TSDB_PATTERN_MATCH)
-      continue;
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    extractTableName(pMetric->meterId, pWrite);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pMetric->createdTime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pMetric->numOfColumns;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pMetric->numOfTags;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pMetric->numOfMeters;
-    cols++;
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int32_t mgmtFindTagCol(STabObj *pMetric, const char *tagName) {
-  if (!mgmtIsMetric(pMetric)) return -1;
-
-  SSchema *schema = NULL;
-
-  for (int i = 0; i < pMetric->numOfTags; i++) {
-    schema = (SSchema *)(pMetric->schema + (pMetric->numOfColumns + i) * sizeof(SSchema));
-
-    if (strcasecmp(tagName, schema->name) == 0) return i;
-  }
-
-  return -1;
-}
-
-int32_t mgmtMeterModifyTagNameByCol(STabObj *pMetric, uint32_t col, const char *nname) {
-  int rowSize = 0;
-  assert(col >= 0);
-
-  uint32_t len = strlen(nname);
-
-  if (pMetric == NULL || (!mgmtIsMetric(pMetric)) || col >= pMetric->numOfTags || len >= TSDB_COL_NAME_LEN ||
-      mgmtFindTagCol(pMetric, nname) >= 0)
-    return TSDB_CODE_APP_ERROR;
-
-  // update
-  SSchema *schema = (SSchema *)(pMetric->schema + (pMetric->numOfColumns + col) * sizeof(SSchema));
-  strncpy(schema->name, nname, TSDB_COL_NAME_LEN);
-
-  // Encode string
-  int   size = 1 + sizeof(STabObj) + TSDB_MAX_BYTES_PER_ROW;
-  char *msg = (char *)malloc(size);
-  if (msg == NULL) return TSDB_CODE_APP_ERROR;
-  memset(msg, 0, size);
-
-  mgmtMeterActionEncode(pMetric, msg, size, &rowSize);
-
-  int32_t ret = sdbUpdateRow(meterSdb, msg, rowSize, 1);
-  tfree(msg);
-
-  if (ret < 0) {
-    mError("Failed to modify table %s tag column", pMetric->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  mTrace("Succeed to modify table %s tag column", pMetric->meterId);
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtMeterModifyTagNameByName(STabObj *pMetric, const char *oname, const char *nname) {
-  if (pMetric == NULL || (!mgmtIsMetric(pMetric))) return TSDB_CODE_APP_ERROR;
-
-  int index = mgmtFindTagCol(pMetric, oname);
-  if (index < 0) {
-    // Tag name does not exist
-    mError("Failed to modify table %s tag column, oname: %s, nname: %s", pMetric->meterId, oname, nname);
-    return TSDB_CODE_INVALID_MSG_TYPE;
-  }
-
-  return mgmtMeterModifyTagNameByCol(pMetric, index, nname);
-}
-
-int32_t mgmtMeterModifyTagValueByCol(STabObj *pMeter, int col, const char *nContent) {
-  int rowSize = 0;
-  if (pMeter == NULL || nContent == NULL || (!mgmtMeterCreateFromMetric(pMeter))) return TSDB_CODE_APP_ERROR;
-
-  STabObj *pMetric = mgmtGetMeter(pMeter->pTagData);
-  assert(pMetric != NULL);
-
-  if (col < 0 || col > pMetric->numOfTags) return TSDB_CODE_APP_ERROR;
-
-  SSchema *schema = (SSchema *)(pMetric->schema + (pMetric->numOfColumns + col) * sizeof(SSchema));
-
-  if (col == 0) {
-    pMeter->isDirty = 1;
-    removeMeterFromMetricIndex(pMetric, pMeter);
-  }
-  memcpy(pMeter->pTagData + mgmtGetTagsLength(pMetric, col) + TSDB_METER_ID_LEN, nContent, schema->bytes);
-  if (col == 0) {
-    addMeterIntoMetricIndex(pMetric, pMeter);
-  }
-
-  // Encode the string
-  int   size = sizeof(STabObj) + TSDB_MAX_BYTES_PER_ROW + 1;
-  char *msg = (char *)malloc(size);
-  if (msg == NULL) {
-    mError("failed to allocate message memory while modify tag value");
-    return TSDB_CODE_APP_ERROR;
-  }
-  memset(msg, 0, size);
-
-  mgmtMeterActionEncode(pMeter, msg, size, &rowSize);
-
-  int32_t ret = sdbUpdateRow(meterSdb, msg, rowSize, 1);  // Need callback function
-  tfree(msg);
-
-  if (pMeter->isDirty) pMeter->isDirty = 0;
-
-  if (ret < 0) {
-    mError("Failed to modify tag column %d of table %s", col, pMeter->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  mTrace("Succeed to modify tag column %d of table %s", col, pMeter->meterId);
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtMeterModifyTagValueByName(STabObj *pMeter, char *tagName, char *nContent) {
-  if (pMeter == NULL || tagName == NULL || nContent == NULL || (!mgmtMeterCreateFromMetric(pMeter)))
-    return TSDB_CODE_INVALID_MSG_TYPE;
-
-  STabObj *pMetric = mgmtGetMeter(pMeter->pTagData);
-  if (pMetric == NULL) return TSDB_CODE_APP_ERROR;
-
-  int col = mgmtFindTagCol(pMetric, tagName);
-  if (col < 0) return TSDB_CODE_APP_ERROR;
-
-  return mgmtMeterModifyTagValueByCol(pMeter, col, nContent);
-}
-
-int32_t mgmtMeterAddTags(STabObj *pMetric, SSchema schema[], int ntags) {
-  if (pMetric == NULL || (!mgmtIsMetric(pMetric))) return TSDB_CODE_INVALID_TABLE;
-
-  if (pMetric->numOfTags + ntags > TSDB_MAX_TAGS) return TSDB_CODE_APP_ERROR;
-
-  // check if schemas have the same name
-  for (int i = 1; i < ntags; i++) {
-    for (int j = 0; j < i; j++) {
-      if (strcasecmp(schema[i].name, schema[j].name) == 0) {
-        return TSDB_CODE_APP_ERROR;
-      }
-    }
-  }
-
-  for (int i = 0; i < ntags; i++) {
-    if (mgmtFindTagCol(pMetric, schema[i].name) >= 0) {
-      return TSDB_CODE_APP_ERROR;
-    }
-  }
-
-  uint32_t              size = sizeof(SMeterBatchUpdateMsg) + sizeof(SSchema) * ntags;
-  SMeterBatchUpdateMsg *msg = (SMeterBatchUpdateMsg *)malloc(size);
-  memset(msg, 0, size);
-
-  memcpy(msg->meterId, pMetric->meterId, TSDB_METER_ID_LEN);
-  msg->type = SDB_TYPE_INSERT;
-  msg->cols = ntags;
-  memcpy(msg->data, schema, sizeof(SSchema) * ntags);
-
-  int32_t ret = sdbBatchUpdateRow(meterSdb, msg, size);
-  tfree(msg);
-
-  if (ret < 0) {
-    mError("Failed to add tag column %s to table %s", schema[0].name, pMetric->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  mTrace("Succeed to add tag column %s to table %s", schema[0].name, pMetric->meterId);
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtMeterDropTagByCol(STabObj *pMetric, int col) {
-  if (pMetric == NULL || (!mgmtIsMetric(pMetric)) || col <= 0 || col >= pMetric->numOfTags) return TSDB_CODE_APP_ERROR;
-
-  // Pack message to do batch update
-  uint32_t              size = sizeof(SMeterBatchUpdateMsg) + sizeof(SchemaUnit);
-  SMeterBatchUpdateMsg *msg = (SMeterBatchUpdateMsg *)malloc(size);
-  memset(msg, 0, size);
-
-  memcpy(msg->meterId, pMetric->meterId, TSDB_METER_ID_LEN);
-  msg->type = SDB_TYPE_DELETE;  // TODO: what should here be ?
-  msg->cols = 1;
-
-  ((SchemaUnit *)(msg->data))->col = col;
-  ((SchemaUnit *)(msg->data))->pos = mgmtGetTagsLength(pMetric, col) + TSDB_METER_ID_LEN;
-  ((SchemaUnit *)(msg->data))->schema = *(SSchema *)(pMetric->schema + sizeof(SSchema) * (pMetric->numOfColumns + col));
-
-  int32_t ret = sdbBatchUpdateRow(meterSdb, msg, size);
-  tfree(msg);
-
-  if (ret < 0) {
-    mError("Failed to drop tag column: %d from table: %s", col, pMetric->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  mTrace("Succeed to drop tag column: %d from table: %s", col, pMetric->meterId);
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtMeterDropTagByName(STabObj *pMetric, char *name) {
-  if (pMetric == NULL || (!mgmtIsMetric(pMetric))) {
-    mTrace("Failed to drop tag name: %s from table: %s", name, pMetric->meterId);
-    return TSDB_CODE_INVALID_TABLE;
-  }
-
-  int col = mgmtFindTagCol(pMetric, name);
-
-  return mgmtMeterDropTagByCol(pMetric, col);
-}
-
-int32_t mgmtFindColumnIndex(STabObj *pMeter, const char *colName) {
-  STabObj *pMetric = NULL;
-  SSchema *schema = NULL;
-
-  if (pMeter->meterType == TSDB_METER_OTABLE || pMeter->meterType == TSDB_METER_METRIC) {
-    schema = (SSchema *)pMeter->schema;
-    for (int32_t i = 0; i < pMeter->numOfColumns; i++) {
-      if (strcasecmp(schema[i].name, colName) == 0) {
-        return i;
-      }
-    }
-
-  } else if (pMeter->meterType == TSDB_METER_MTABLE) {
-    pMetric = mgmtGetMeter(pMeter->pTagData);
-    if (pMetric == NULL) {
-      mError("MTable not belongs to any metric, meter: %s", pMeter->meterId);
-      return -1;
-    }
-    schema = (SSchema *)pMetric->schema;
-    for (int32_t i = 0; i < pMetric->numOfColumns; i++) {
-      if (strcasecmp(schema[i].name, colName) == 0) {
-        return i;
-      }
-    }
-  }
-
-  return -1;
-}
-
-int32_t mgmtMeterAddColumn(STabObj *pMeter, SSchema schema[], int ncols) {
-  SAcctObj *pAcct = NULL;
-  SDbObj *  pDb = NULL;
-
-  if (pMeter == NULL || pMeter->meterType == TSDB_METER_MTABLE || pMeter->meterType == TSDB_METER_STABLE || ncols <= 0)
-    return TSDB_CODE_APP_ERROR;
-
-  // ASSUMPTION: no two tags are the same
-  for (int i = 0; i < ncols; i++)
-    if (mgmtFindColumnIndex(pMeter, schema[i].name) > 0) return TSDB_CODE_APP_ERROR;
-
-  pDb = mgmtGetDbByMeterId(pMeter->meterId);
-  if (pDb == NULL) {
-    mError("meter: %s not belongs to any database", pMeter->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  pAcct = mgmtGetAcct(pDb->cfg.acct);
-  if (pAcct == NULL) {
-    mError("DB: %s not belongs to andy account", pDb->name);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  pMeter->schema = realloc(pMeter->schema, pMeter->schemaSize + sizeof(SSchema) * ncols);
-
-  if (pMeter->meterType == TSDB_METER_OTABLE) {
-    memcpy(pMeter->schema + pMeter->schemaSize, schema, sizeof(SSchema) * ncols);
-  } else if (pMeter->meterType == TSDB_METER_METRIC) {
-    memmove(pMeter->schema + sizeof(SSchema) * (pMeter->numOfColumns + ncols),
-            pMeter->schema + sizeof(SSchema) * pMeter->numOfColumns, sizeof(SSchema) * pMeter->numOfTags);
-    memcpy(pMeter->schema + sizeof(SSchema) * pMeter->numOfColumns, schema, sizeof(SSchema) * ncols);
-  }
-
-  SSchema *tschema = (SSchema *)(pMeter->schema + sizeof(SSchema) * pMeter->numOfColumns);
-  for (int i = 0; i < ncols; i++) tschema[i].colId = pMeter->nextColId++;
-
-  pMeter->schemaSize += sizeof(SSchema) * ncols;
-  pMeter->numOfColumns += ncols;
-  pMeter->sversion++;
-  if (mgmtIsNormalMeter(pMeter))
-    pAcct->acctInfo.numOfTimeSeries += ncols;
-  else
-    pAcct->acctInfo.numOfTimeSeries += (ncols * pMeter->numOfMeters);
-  sdbUpdateRow(meterSdb, pMeter, 0, 1);
-
-  if (pMeter->meterType == TSDB_METER_METRIC) {
-    for (STabObj *pObj = pMeter->pHead; pObj != NULL; pObj = pObj->next) {
-      pObj->numOfColumns++;
-      pObj->nextColId = pMeter->nextColId;
-      pObj->sversion = pMeter->sversion;
-      sdbUpdateRow(meterSdb, pObj, 0, 1);
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtMeterDropColumnByName(STabObj *pMeter, const char *name) {
-  SAcctObj *pAcct = NULL;
-  SDbObj *  pDb = NULL;
-
-  if (pMeter == NULL || pMeter->meterType == TSDB_METER_MTABLE || pMeter->meterType == TSDB_METER_STABLE)
-    return TSDB_CODE_APP_ERROR;
-
-  int32_t index = mgmtFindColumnIndex(pMeter, name);
-  if (index < 0) return TSDB_CODE_APP_ERROR;
-
-  pDb = mgmtGetDbByMeterId(pMeter->meterId);
-  if (pDb == NULL) {
-    mError("meter: %s not belongs to any database", pMeter->meterId);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  pAcct = mgmtGetAcct(pDb->cfg.acct);
-  if (pAcct == NULL) {
-    mError("DB: %s not belongs to any account", pDb->name);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  if (pMeter->meterType == TSDB_METER_OTABLE) {
-    memmove(pMeter->schema + sizeof(SSchema) * index, pMeter->schema + sizeof(SSchema) * (index + 1),
-            sizeof(SSchema) * (pMeter->numOfColumns - index - 1));
-  } else if (pMeter->meterType == TSDB_METER_METRIC) {
-    memmove(pMeter->schema + sizeof(SSchema) * index, pMeter->schema + sizeof(SSchema) * (index + 1),
-            sizeof(SSchema) * (pMeter->numOfColumns + pMeter->numOfTags - index - 1));
-  }
-  pMeter->schemaSize -= sizeof(SSchema);
-  pMeter->numOfColumns--;
-  if (mgmtIsNormalMeter(pMeter))
-    pAcct->acctInfo.numOfTimeSeries--;
-  else
-    pAcct->acctInfo.numOfTimeSeries -= (pMeter->numOfMeters);
-
-  pMeter->schema = realloc(pMeter->schema, pMeter->schemaSize);
-  pMeter->sversion++;
-  sdbUpdateRow(meterSdb, pMeter, 0, 1);
-
-  if (pMeter->meterType == TSDB_METER_METRIC) {
-    for (STabObj *pObj = pMeter->pHead; pObj != NULL; pObj = pObj->next) {
-      pObj->numOfColumns--;
-      pObj->sversion = pMeter->sversion;
-      sdbUpdateRow(meterSdb, pObj, 0, 1);
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
diff --git a/src/system/detail/src/mgmtProfile.c b/src/system/detail/src/mgmtProfile.c
deleted file mode 100644
index c1cd98952311f4cda6bf97cf2448de244299c8b8..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtProfile.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "mgmtProfile.h"
-#include "taosmsg.h"
-#include "tschemautil.h"
-
-typedef struct {
-  uint32_t ip;
-  uint16_t port;
-  char     user[TSDB_METER_ID_LEN];
-} SCDesc;
-
-typedef struct {
-  int      index;
-  int      numOfQueries;
-  SCDesc * connInfo;
-  SCDesc **cdesc;
-  SQDesc   qdesc[];
-} SQueryShow;
-
-typedef struct {
-  int      index;
-  int      numOfStreams;
-  SCDesc * connInfo;
-  SCDesc **cdesc;
-  SSDesc   sdesc[];
-} SStreamShow;
-
-int mgmtSaveQueryStreamList(char *cont, int contLen, SConnObj *pConn) {
-  SAcctObj *pAcct = pConn->pAcct;
-
-  if (contLen <= 0 || pAcct == NULL) {
-    return 0;
-  }
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  if (pConn->pQList) {
-    pAcct->acctInfo.numOfQueries -= pConn->pQList->numOfQueries;
-    pAcct->acctInfo.numOfStreams -= pConn->pSList->numOfStreams;
-  }
-
-  pConn->pQList = realloc(pConn->pQList, contLen);
-  memcpy(pConn->pQList, cont, contLen);
-
-  pConn->pSList = (SSList *)(((char *)pConn->pQList) + pConn->pQList->numOfQueries * sizeof(SQDesc) + sizeof(SQList));
-
-  pAcct->acctInfo.numOfQueries += pConn->pQList->numOfQueries;
-  pAcct->acctInfo.numOfStreams += pConn->pSList->numOfStreams;
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  return 0;
-}
-
-int mgmtGetQueries(SShowObj *pShow, SConnObj *pConn) {
-  SAcctObj *  pAcct = pConn->pAcct;
-  SQueryShow *pQueryShow;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pQueryShow = malloc(sizeof(SQDesc) * pAcct->acctInfo.numOfQueries + sizeof(SQueryShow));
-  pQueryShow->numOfQueries = 0;
-  pQueryShow->index = 0;
-  pQueryShow->connInfo = NULL;
-  pQueryShow->cdesc = NULL;
-
-  if (pAcct->acctInfo.numOfQueries > 0) {
-    pQueryShow->connInfo = (SCDesc *)malloc(pAcct->acctInfo.numOfConns * sizeof(SCDesc));
-    pQueryShow->cdesc = (SCDesc **)malloc(pAcct->acctInfo.numOfQueries * sizeof(SCDesc *));
-
-    pConn = pAcct->pConn;
-    SQDesc * pQdesc = pQueryShow->qdesc;
-    SCDesc * pCDesc = pQueryShow->connInfo;
-    SCDesc **ppCDesc = pQueryShow->cdesc;
-
-    while (pConn) {
-      if (pConn->pQList && pConn->pQList->numOfQueries > 0) {
-        pCDesc->ip = pConn->ip;
-        pCDesc->port = pConn->port;
-        strcpy(pCDesc->user, pConn->pUser->user);
-
-        memcpy(pQdesc, pConn->pQList->qdesc, sizeof(SQDesc) * pConn->pQList->numOfQueries);
-        pQdesc += pConn->pQList->numOfQueries;
-        pQueryShow->numOfQueries += pConn->pQList->numOfQueries;
-        for (int i = 0; i < pConn->pQList->numOfQueries; ++i, ++ppCDesc) *ppCDesc = pCDesc;
-
-        pCDesc++;
-      }
-      pConn = pConn->next;
-    }
-  }
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  // sorting based on useconds
-
-  pShow->pNode = pQueryShow;
-
-  return 0;
-}
-
-int mgmtGetQueryMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_USER_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "user");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 14;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "ip:port:id");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created_time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_BIGINT;
-  strcpy(pSchema[cols].name, "time(us)");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_SHOW_SQL_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "sql");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = 1000000;
-  pShow->pNode = NULL;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  mgmtGetQueries(pShow, pConn);
-  return 0;
-}
-
-int mgmtKillQuery(char *qidstr, SConnObj *pConn) {
-  char *temp, *chr, idstr[64];
-  strcpy(idstr, qidstr);
-
-  temp = idstr;
-  chr = strchr(temp, ':');
-  if (chr == NULL) goto _error;
-  *chr = 0;
-  uint32_t ip = inet_addr(temp);
-
-  temp = chr + 1;
-  chr = strchr(temp, ':');
-  if (chr == NULL) goto _error;
-  *chr = 0;
-  uint16_t port = htons(atoi(temp));
-
-  temp = chr + 1;
-  uint32_t queryId = atoi(temp);
-
-  SAcctObj *pAcct = pConn->pAcct;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pConn = pAcct->pConn;
-  while (pConn) {
-    if (pConn->ip == ip && pConn->port == port && pConn->pQList) {
-      int     i;
-      SQDesc *pQDesc = pConn->pQList->qdesc;
-      for (i = 0; i < pConn->pQList->numOfQueries; ++i, ++pQDesc) {
-        if (pQDesc->queryId == queryId) break;
-      }
-
-      if (i < pConn->pQList->numOfQueries) break;
-    }
-
-    pConn = pConn->next;
-  }
-
-  if (pConn) pConn->queryId = queryId;
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  if (pConn == NULL || pConn->pQList == NULL || pConn->pQList->numOfQueries == 0) goto _error;
-
-  mTrace("query:%s is there, kill it", qidstr);
-  return 0;
-
-_error:
-  mTrace("query:%s is not there", qidstr);
-
-  return TSDB_CODE_INVALID_QUERY_ID;
-}
-
-int mgmtRetrieveQueries(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int   numOfRows = 0;
-  char *pWrite;
-  int   cols = 0;
-
-  SQueryShow *pQueryShow = (SQueryShow *)pShow->pNode;
-
-  if (rows > pQueryShow->numOfQueries - pQueryShow->index) rows = pQueryShow->numOfQueries - pQueryShow->index;
-
-  while (numOfRows < rows) {
-    SQDesc *pNode = pQueryShow->qdesc + pQueryShow->index;
-    SCDesc *pCDesc = pQueryShow->cdesc[pQueryShow->index];
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pCDesc->user);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    uint32_t ip = pCDesc->ip;
-    sprintf(pWrite, "%d.%d.%d.%d:%hu:%d", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24, htons(pCDesc->port),
-            pNode->queryId);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->stime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->useconds;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pNode->sql);
-    cols++;
-
-    numOfRows++;
-    pQueryShow->index++;
-  }
-
-  if (numOfRows == 0) {
-    tfree(pQueryShow->cdesc);
-    tfree(pQueryShow->connInfo);
-    tfree(pQueryShow);
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int mgmtGetStreams(SShowObj *pShow, SConnObj *pConn) {
-  SAcctObj *   pAcct = pConn->pAcct;
-  SStreamShow *pStreamShow;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pStreamShow = malloc(sizeof(SSDesc) * pAcct->acctInfo.numOfStreams + sizeof(SQueryShow));
-  pStreamShow->numOfStreams = 0;
-  pStreamShow->index = 0;
-  pStreamShow->connInfo = NULL;
-  pStreamShow->cdesc = NULL;
-
-  if (pAcct->acctInfo.numOfStreams > 0) {
-    pStreamShow->connInfo = (SCDesc *)malloc(pAcct->acctInfo.numOfConns * sizeof(SCDesc));
-    pStreamShow->cdesc = (SCDesc **)malloc(pAcct->acctInfo.numOfStreams * sizeof(SCDesc *));
-
-    pConn = pAcct->pConn;
-    SSDesc * pSdesc = pStreamShow->sdesc;
-    SCDesc * pCDesc = pStreamShow->connInfo;
-    SCDesc **ppCDesc = pStreamShow->cdesc;
-
-    while (pConn) {
-      if (pConn->pSList && pConn->pSList->numOfStreams > 0) {
-        pCDesc->ip = pConn->ip;
-        pCDesc->port = pConn->port;
-        strcpy(pCDesc->user, pConn->pUser->user);
-
-        memcpy(pSdesc, pConn->pSList->sdesc, sizeof(SSDesc) * pConn->pSList->numOfStreams);
-        pSdesc += pConn->pSList->numOfStreams;
-        pStreamShow->numOfStreams += pConn->pSList->numOfStreams;
-        for (int i = 0; i < pConn->pSList->numOfStreams; ++i, ++ppCDesc) *ppCDesc = pCDesc;
-
-        pCDesc++;
-      }
-      pConn = pConn->next;
-    }
-  }
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  // sorting based on useconds
-
-  pShow->pNode = pStreamShow;
-
-  return 0;
-}
-
-int mgmtGetStreamMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int      cols = 0;
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_USER_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "user");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_IPv4ADDR_LEN + 14;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "ip:port:id");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "exec time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "time(us)");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = TSDB_SHOW_SQL_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "sql");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "cycles");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->numOfRows = 1000000;
-  pShow->pNode = NULL;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  mgmtGetStreams(pShow, pConn);
-  return 0;
-}
-
-int mgmtRetrieveStreams(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int   numOfRows = 0;
-  char *pWrite;
-  int   cols = 0;
-
-  SStreamShow *pStreamShow = (SStreamShow *)pShow->pNode;
-
-  if (rows > pStreamShow->numOfStreams - pStreamShow->index) rows = pStreamShow->numOfStreams - pStreamShow->index;
-
-  while (numOfRows < rows) {
-    SSDesc *pNode = pStreamShow->sdesc + pStreamShow->index;
-    SCDesc *pCDesc = pStreamShow->cdesc[pStreamShow->index];
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pCDesc->user);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    uint32_t ip = pCDesc->ip;
-    sprintf(pWrite, "%d.%d.%d.%d:%hu:%d", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, ip >> 24, htons(pCDesc->port),
-            pNode->streamId);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->ctime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->stime;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pNode->useconds;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pNode->sql);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pNode->num;
-    cols++;
-
-    numOfRows++;
-    pStreamShow->index++;
-  }
-
-  if (numOfRows == 0) {
-    tfree(pStreamShow->cdesc);
-    tfree(pStreamShow->connInfo);
-    tfree(pStreamShow);
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-int mgmtKillStream(char *qidstr, SConnObj *pConn) {
-  char *temp, *chr, idstr[64];
-  strcpy(idstr, qidstr);
-
-  temp = idstr;
-  chr = strchr(temp, ':');
-  if (chr == NULL) goto _error;
-  *chr = 0;
-  uint32_t ip = inet_addr(temp);
-
-  temp = chr + 1;
-  chr = strchr(temp, ':');
-  if (chr == NULL) goto _error;
-  *chr = 0;
-  uint16_t port = htons(atoi(temp));
-
-  temp = chr + 1;
-  uint32_t streamId = atoi(temp);
-
-  SAcctObj *pAcct = pConn->pAcct;
-
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pConn = pAcct->pConn;
-  while (pConn) {
-    if (pConn->ip == ip && pConn->port == port && pConn->pSList) {
-      int     i;
-      SSDesc *pSDesc = pConn->pSList->sdesc;
-      for (i = 0; i < pConn->pSList->numOfStreams; ++i, ++pSDesc) {
-        if (pSDesc->streamId == streamId) break;
-      }
-
-      if (i < pConn->pSList->numOfStreams) break;
-    }
-
-    pConn = pConn->next;
-  }
-
-  if (pConn) pConn->streamId = streamId;
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  if (pConn == NULL || pConn->pSList == NULL || pConn->pSList->numOfStreams == 0) goto _error;
-
-  mTrace("stream:%s is there, kill it", qidstr);
-  return 0;
-
-_error:
-  mTrace("stream:%s is not there", qidstr);
-
-  return TSDB_CODE_INVALID_STREAM_ID;
-}
-
-int mgmtKillConnection(char *qidstr, SConnObj *pConn) {
-  SConnObj *pConn1 = NULL;
-  char *    temp, *chr, idstr[64];
-  strcpy(idstr, qidstr);
-
-  temp = idstr;
-  chr = strchr(temp, ':');
-  if (chr == NULL) goto _error;
-  *chr = 0;
-  uint32_t ip = inet_addr(temp);
-
-  temp = chr + 1;
-  uint16_t port = htons(atoi(temp));
-  SAcctObj *pAcct = pConn->pAcct;
-  
-  pthread_mutex_lock(&pAcct->mutex);
-
-  pConn = pAcct->pConn;
-  while (pConn) {
-    if (pConn->ip == ip && pConn->port == port) {
-      // there maybe two connections from a shell
-      if (pConn1 == NULL)
-        pConn1 = pConn;
-      else
-        break;
-    }
-
-    pConn = pConn->next;
-  }
-
-  if (pConn1) pConn1->killConnection = 1;
-  if (pConn) pConn->killConnection = 1;
-
-  pthread_mutex_unlock(&pAcct->mutex);
-
-  if (pConn1 == NULL) goto _error;
-
-  mTrace("connection:%s is there, kill it", qidstr);
-  return 0;
-
-_error:
-  mTrace("connection:%s is not there", qidstr);
-
-  return TSDB_CODE_INVALID_CONNECTION;
-}
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
deleted file mode 100644
index 06556c817f0c6b1d99706893b0172ae6b732968f..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtShell.c
+++ /dev/null
@@ -1,1499 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "mgmtProfile.h"
-#include "taosmsg.h"
-#include "tlog.h"
-#include "vnodeStatus.h"
-
-#define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN)
-
-void *    pShellConn = NULL;
-SConnObj *connList;
-void *    mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle);
-int     (*mgmtProcessShellMsg[TSDB_MSG_TYPE_MAX])(char *, int, SConnObj *);
-void      mgmtInitProcessShellMsg();
-int       mgmtRedirectMsg(SConnObj *pConn, int msgType);
-int       mgmtKillQuery(char *queryId, SConnObj *pConn);
-
-int mgmtCheckRedirectMsg(SConnObj *pConn, int msgType);
-int mgmtProcessAlterAcctMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessCreateMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessCreateDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessCfgMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessDropMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessDropDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessDropAcctMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessCreateAcctMsg(char *pMsg, int msgLen, SConnObj *pConn);
-int mgmtProcessCfgDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn);
-
-void mgmtProcessTranRequest(SSchedMsg *pSchedMsg) {
-  SIntMsg * pMsg = (SIntMsg *)(pSchedMsg->msg);
-  SConnObj *pConn = (SConnObj *)(pSchedMsg->thandle);
-
-  char *cont = (char *)pMsg->content + sizeof(SMgmtHead);
-  int   contLen = pMsg->msgLen - sizeof(SIntMsg) - sizeof(SMgmtHead);
-
-  if (pConn->pAcct) (*mgmtProcessShellMsg[pMsg->msgType])(cont, contLen, pConn);
-
-  if (pSchedMsg->msg) free(pSchedMsg->msg);
-}
-
-int mgmtInitShell() {
-  SRpcInit rpcInit;
-
-  mgmtInitProcessShellMsg();
-
-  int size = sizeof(SConnObj) * tsMaxShellConns;
-  connList = (SConnObj *)malloc(size);
-  if (connList == NULL) {
-    mError("failed to malloc for connList to shell");
-    return -1;
-  }
-  memset(connList, 0, size);
-
-  int numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 4.0;
-  if (numOfThreads < 1) numOfThreads = 1;
-
-  memset(&rpcInit, 0, sizeof(rpcInit));
-
-  rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;;
-  rpcInit.localPort = tsMgmtShellPort;
-  rpcInit.label = "MND-shell";
-  rpcInit.numOfThreads = numOfThreads;
-  rpcInit.fp = mgmtProcessMsgFromShell;
-  rpcInit.bits = 20;
-  rpcInit.numOfChanns = 1;
-  rpcInit.sessionsPerChann = tsMaxShellConns;
-  rpcInit.idMgmt = TAOS_ID_FREE;
-  rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S();
-  rpcInit.idleTime = tsShellActivityTimer * 2000;
-  rpcInit.qhandle = mgmtQhandle;
-  rpcInit.afp = mgmtRetriveUserAuthInfo;
-
-  pShellConn = taosOpenRpc(&rpcInit);
-  if (pShellConn == NULL) {
-    mError("failed to init tcp connection to shell");
-    return -1;
-  }
-
-  return 0;
-}
-
-void mgmtCleanUpShell() {
-  if (pShellConn) taosCloseRpc(pShellConn);
-  pShellConn = NULL;
-  tfree(connList);
-}
-
-static void mgmtSetSchemaFromMeters(SSchema *pSchema, STabObj *pMeterObj, uint32_t numOfCols) {
-  SSchema *pMeterSchema = (SSchema *)(pMeterObj->schema);
-  for (int i = 0; i < numOfCols; ++i) {
-    pSchema->type = pMeterSchema[i].type;
-    strcpy(pSchema->name, pMeterSchema[i].name);
-    pSchema->bytes = htons(pMeterSchema[i].bytes);
-    pSchema->colId = htons(pMeterSchema[i].colId);
-    pSchema++;
-  }
-}
-
-static uint32_t mgmtSetMeterTagValue(char *pTags, STabObj *pMetric, STabObj *pMeterObj) {
-  SSchema *pTagSchema = (SSchema *)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-
-  char *tagVal = pMeterObj->pTagData + TSDB_METER_ID_LEN;  // tag start position
-
-  uint32_t tagsLen = 0;
-  for (int32_t i = 0; i < pMetric->numOfTags; ++i) {
-    tagsLen += pTagSchema[i].bytes;
-  }
-
-  memcpy(pTags, tagVal, tagsLen);
-  return tagsLen;
-}
-
-static char *mgmtAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) {
-  char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_METERINFO_RSP, size);
-  if (pStart == NULL) return 0;
-  *pMsg = pStart;
-  *pRsp = (STaosRsp *)(*pMsg);
-
-  return pStart;
-}
-
-static char *mgmtForMultiAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) {
-  char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_MULTI_METERINFO_RSP, size);
-  if (pStart == NULL) return 0;
-  *pMsg = pStart;
-  *pRsp = (STaosRsp *)(*pMsg);
-
-  return pStart;
-}
-
-/**
- * check if we need to add mgmtProcessMeterMetaMsg into tranQueue, which will be executed one-by-one.
- *
- * @param pMsg
- * @return
- */
-bool mgmtCheckMeterMetaMsgType(char *pMsg) {
-  SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg;
-
-  int16_t  autoCreate = htons(pInfo->createFlag);
-  STabObj *pMeterObj = mgmtGetMeter(pInfo->meterId);
-
-  // If table does not exists and autoCreate flag is set, we add the handler into another task queue, namely tranQueue
-  bool addIntoTranQueue = (pMeterObj == NULL && autoCreate == 1);
-  if (addIntoTranQueue) {
-    mTrace("meter:%s auto created task added", pInfo->meterId);
-  }
-
-  return addIntoTranQueue;
-}
-
-int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg;
-  STabObj *      pMeterObj = NULL;
-  SVgObj *       pVgroup = NULL;
-  SMeterMeta *   pMeta = NULL;
-  SSchema *      pSchema = NULL;
-  STaosRsp *     pRsp = NULL;
-  char *         pStart = NULL;
-
-  pInfo->createFlag = htons(pInfo->createFlag);
-
-  int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS +
-             sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN + TSDB_EXTRA_PAYLOAD_SIZE;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  // todo db check should be extracted
-  if (pDb == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) {
-
-    if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
-      taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-	  return 0;
-    }
-
-    pRsp->code = TSDB_CODE_INVALID_DB;
-    pMsg++;
-
-    goto _exit_code;
-  }
-
-  pMeterObj = mgmtGetMeter(pInfo->meterId);
-
-  // on demand create table from super table if meter does not exists
-  if (pMeterObj == NULL && pInfo->createFlag == 1) {
-    // write operation needs to redirect to master mnode
-    if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_METERINFO_RSP) != 0) {
-      return 0;
-    }
-
-    SCreateTableMsg *pCreateMsg = calloc(1, sizeof(SCreateTableMsg) + sizeof(STagData));
-    if (pCreateMsg == NULL) {
-      taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-      return 0;
-    }
-
-    memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData));
-    strcpy(pCreateMsg->meterId, pInfo->meterId);
-
-    SDbObj* pMeterDb = mgmtGetDbByMeterId(pCreateMsg->meterId);
-    mTrace("meter:%s, pConnDb:%p, pConnDbName:%s, pMeterDb:%p, pMeterDbName:%s",
-           pCreateMsg->meterId, pDb, pDb->name, pMeterDb, pMeterDb->name);
-    assert(pDb == pMeterDb);
-
-    int32_t code = mgmtCreateMeter(pDb, pCreateMsg);
-
-    char stableName[TSDB_METER_ID_LEN] = {0};
-    strncpy(stableName, pInfo->tags, TSDB_METER_ID_LEN);
-    mTrace("meter:%s is automatically created by %s from %s, code:%d", pCreateMsg->meterId, pConn->pUser->user,
-           stableName, code);
-
-    tfree(pCreateMsg);
-
-    if (code != TSDB_CODE_SUCCESS) {
-      if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
- 	    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
- 	    return 0;
-      }
-
-      pRsp->code = code;
-      pMsg++;
-
-      goto _exit_code;
-    }
-
-    pMeterObj = mgmtGetMeter(pInfo->meterId);
-  }
-
-  if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-
-  if (pMeterObj == NULL) {
-    if (pDb)
-      pRsp->code = TSDB_CODE_INVALID_TABLE;
-    else
-      pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
-    pMsg++;
-  } else {
-    mTrace("%s, uid:%" PRIu64 " meter meta is retrieved", pInfo->meterId, pMeterObj->uid);
-    pRsp->code = 0;
-    pMsg += sizeof(STaosRsp);
-    *pMsg = TSDB_IE_TYPE_META;
-    pMsg++;
-
-    pMeta = (SMeterMeta *)pMsg;
-    pMeta->uid = htobe64(pMeterObj->uid);
-    pMeta->sid = htonl(pMeterObj->gid.sid);
-    pMeta->vgid = htonl(pMeterObj->gid.vgId);
-    pMeta->sversion = htons(pMeterObj->sversion);
-
-    pMeta->precision = pDb->cfg.precision;
-
-    pMeta->numOfTags = pMeterObj->numOfTags;
-    pMeta->numOfColumns = htons(pMeterObj->numOfColumns);
-    pMeta->meterType = pMeterObj->meterType;
-
-    pMsg += sizeof(SMeterMeta);
-    pSchema = (SSchema *)pMsg;  // schema locates at the end of SMeterMeta struct
-
-    if (mgmtMeterCreateFromMetric(pMeterObj)) {
-      assert(pMeterObj->numOfTags == 0);
-
-      STabObj *pMetric = mgmtGetMeter(pMeterObj->pTagData);
-      uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
-
-      pMeta->numOfTags = pMetric->numOfTags;  // update the numOfTags info
-      mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
-      pMsg += numOfTotalCols * sizeof(SSchema);
-
-      // for meters created from metric, we need the metric tag schema to parse the tag data
-      int32_t tagsLen = mgmtSetMeterTagValue(pMsg, pMetric, pMeterObj);
-      pMsg += tagsLen;
-    } else {
-      /*
-       * for metrics, or meters that are not created from metric, set the schema directly
-       * for meters created from metric, we use the schema of metric instead
-       */
-      uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
-      mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
-      pMsg += numOfTotalCols * sizeof(SSchema);
-    }
-
-    if (mgmtIsNormalMeter(pMeterObj)) {
-      pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
-      if (pVgroup == NULL) {
-        pRsp->code = TSDB_CODE_INVALID_TABLE;
-        goto _exit_code;
-      }
-      for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-        if (pConn->usePublicIp) {
-          pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-          pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
-        } else {
-          pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
-          pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
-        }
-      }
-    }
-  }
-
-_exit_code:
-  msgLen = pMsg - pStart;
-
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-/**
- *  multi meter meta rsp pkg format:
- *  | STaosRsp | ieType | SMultiMeterInfoMsg | SMeterMeta0 | SSchema0 | SMeterMeta1 | SSchema1 | SMeterMeta2 | SSchema2
- *      1B         1B            4B
- *
- *  | STaosHeader | STaosRsp | ieType | SMultiMeterInfoMsg | SMeterMeta0 | SSchema0 | SMeterMeta1 | SSchema1 | ......................|
- *                ^                                                                                          ^                       ^
- *                |<--------------------------------------size-----------------------------------------------|---------------------->|
- *                |                                                                                          |                       |
- *              pStart                                                                                   pCurMeter                 pTail
- **/
-int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SDbObj *          pDbObj    = NULL;
-  STabObj *         pMeterObj = NULL;
-  SVgObj *          pVgroup   = NULL;
-  SMultiMeterMeta * pMeta     = NULL;
-  SSchema *         pSchema   = NULL;
-  STaosRsp *        pRsp      = NULL;
-  char *            pStart    = NULL;
-
-  SMultiMeterInfoMsg * pInfo = (SMultiMeterInfoMsg *)pMsg;
-  char *                 str = pMsg + sizeof(SMultiMeterInfoMsg);
-  pInfo->numOfMeters         = htonl(pInfo->numOfMeters);
-
-  int size = 4*1024*1024; // first malloc 4 MB, subsequent reallocation as twice
-
-  char *pNewMsg;
-  if ((pStart = mgmtForMultiAllocMsg(pConn, size, &pNewMsg, &pRsp)) == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-
-  int32_t totalNum = 0;
-  char  tblName[TSDB_METER_ID_LEN];
-  char* nextStr;
-
-  char* pCurMeter  = pStart + sizeof(STaosRsp) + sizeof(SMultiMeterInfoMsg) + 1;  // 1: ie type byte
-  char* pTail      = pStart + size;
-
-  while (str - pMsg < msgLen) {
-    nextStr = strchr(str, ',');
-    if (nextStr == NULL) {
-      break;
-    }
-
-    memcpy(tblName, str, nextStr - str);
-    tblName[nextStr - str] = '\0';
-    str = nextStr + 1;
-
-    // judge whether the remaining memory is adequate
-    if ((pTail - pCurMeter) < MAX_LEN_OF_METER_META) {
-      char* pMsgHdr = pStart - sizeof(STaosHeader);
-      size *= 2;
-      pMsgHdr = (char*)realloc(pMsgHdr, size);
-      if (NULL == pMsgHdr) {
-        char* pTmp = pStart - sizeof(STaosHeader);
-        tfree(pTmp);
-        taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_METERINFO_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-        break;
-      }
-
-      pCurMeter = (char*)pMsgHdr + sizeof(STaosHeader) + (pCurMeter - pStart);
-      pStart    = (char*)pMsgHdr + sizeof(STaosHeader);
-      pNewMsg   = pStart;
-      pRsp      = (STaosRsp *)pStart;
-      pTail     = pMsgHdr + size;      
-    }
-
-    // get meter schema, and fill into resp payload
-    pMeterObj = mgmtGetMeter(tblName);
-    pDbObj = mgmtGetDbByMeterId(tblName);
-
-    if (pMeterObj == NULL || (pDbObj == NULL)) {
-      continue;
-    } else {
-      mTrace("%s, uid:%" PRIu64 " sversion:%d meter meta is retrieved", tblName, pMeterObj->uid, pMeterObj->sversion);
-      pMeta = (SMultiMeterMeta *)pCurMeter;
-
-      memcpy(pMeta->meterId, tblName, strlen(tblName));
-      pMeta->meta.uid = htobe64(pMeterObj->uid);
-      pMeta->meta.sid = htonl(pMeterObj->gid.sid);
-      pMeta->meta.vgid = htonl(pMeterObj->gid.vgId);
-      pMeta->meta.sversion = htons(pMeterObj->sversion);
-      pMeta->meta.precision = pDbObj->cfg.precision;
-      pMeta->meta.numOfTags = pMeterObj->numOfTags;
-      pMeta->meta.numOfColumns = htons(pMeterObj->numOfColumns);
-      pMeta->meta.meterType = pMeterObj->meterType;
-
-      pCurMeter += sizeof(SMultiMeterMeta);
-      pSchema = (SSchema *)pCurMeter;  // schema locates at the end of SMeterMeta struct
-
-      if (mgmtMeterCreateFromMetric(pMeterObj)) {
-        assert(pMeterObj->numOfTags == 0);
-
-        STabObj *pMetric = mgmtGetMeter(pMeterObj->pTagData);
-        uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
-
-        pMeta->meta.numOfTags = pMetric->numOfTags;  // update the numOfTags info
-        mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
-        pCurMeter += numOfTotalCols * sizeof(SSchema);
-
-        // for meters created from metric, we need the metric tag schema to parse the tag data
-        int32_t tagsLen = mgmtSetMeterTagValue(pCurMeter, pMetric, pMeterObj);
-        pCurMeter += tagsLen;
-      } else {
-        /*
-         * for metrics, or meters that are not created from metric, set the schema directly
-         * for meters created from metric, we use the schema of metric instead
-         */
-        uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
-        mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
-        pCurMeter += numOfTotalCols * sizeof(SSchema);
-      }
-
-      if (mgmtIsNormalMeter(pMeterObj)) {
-        pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
-        if (pVgroup == NULL) {
-          pRsp->code = TSDB_CODE_INVALID_TABLE;
-          pNewMsg++;
-          mError("%s, uid:%" PRIu64 " sversion:%d vgId:%d pVgroup is NULL", tblName, pMeterObj->uid, pMeterObj->sversion,
-                 pMeterObj->gid.vgId);
-          goto _error_exit_code;
-        }
-
-        for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-          if (pConn->usePublicIp) {
-            pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-            pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
-          } else {
-            pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
-            pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
-          }
-        }
-      }
-    }
-
-    totalNum++;
-    if (totalNum > pInfo->numOfMeters) {
-      pNewMsg++;
-      break;
-    }
-  }
-
-  // fill rsp code, ieType
-  msgLen = pCurMeter - pNewMsg;
-
-  pRsp->code = 0;
-  pNewMsg += sizeof(STaosRsp);
-  *pNewMsg = TSDB_IE_TYPE_META;
-  pNewMsg++;
-
-  SMultiMeterInfoMsg *pRspInfo = (SMultiMeterInfoMsg *)pNewMsg;
-
-  pRspInfo->numOfMeters = htonl(totalNum);
-  goto _exit_code;
-
-_error_exit_code:
-  msgLen = pNewMsg - pStart;
-
-_exit_code:
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int mgmtProcessMetricMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SMetricMetaMsg *pMetricMetaMsg = (SMetricMetaMsg *)pMsg;
-  STabObj *       pMetric;
-  STaosRsp *      pRsp;
-  char *          pStart;
-
-  pMetricMetaMsg->numOfMeters = htonl(pMetricMetaMsg->numOfMeters);
-
-  pMetricMetaMsg->join = htonl(pMetricMetaMsg->join);
-  pMetricMetaMsg->joinCondLen = htonl(pMetricMetaMsg->joinCondLen);
-
-  for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-    pMetricMetaMsg->metaElem[i] = htonl(pMetricMetaMsg->metaElem[i]);
-  }
-
-  SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)(((char *)pMetricMetaMsg) + pMetricMetaMsg->metaElem[0]);
-  pMetric = mgmtGetMeter(pElem->meterId);
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pMetric == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) {
-    pStart = taosBuildRspMsg(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP);
-    if (pStart == NULL) {
-      taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-      return 0;
-    }
-
-    pMsg = pStart;
-    pRsp = (STaosRsp *)pMsg;
-    if (pDb)
-      pRsp->code = TSDB_CODE_INVALID_TABLE;
-    else
-      pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
-    pMsg++;
-
-    msgLen = pMsg - pStart;
-  } else {
-    msgLen = mgmtRetrieveMetricMeta(pConn, &pStart, pMetricMetaMsg);
-    if (msgLen <= 0) {
-      taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-      return 0;
-    }
-  }
-
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int mgmtProcessCreateDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SCreateDbMsg *pCreate = (SCreateDbMsg *)pMsg;
-  int           code = 0;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_DB_RSP) != 0) {
-    return 0;
-  }
-
-  pCreate->maxSessions = htonl(pCreate->maxSessions);
-  pCreate->cacheBlockSize = htonl(pCreate->cacheBlockSize);
-  // pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks);
-  pCreate->daysPerFile = htonl(pCreate->daysPerFile);
-  pCreate->daysToKeep = htonl(pCreate->daysToKeep);
-  pCreate->daysToKeep1 = htonl(pCreate->daysToKeep1);
-  pCreate->daysToKeep2 = htonl(pCreate->daysToKeep2);
-  pCreate->commitTime = htonl(pCreate->commitTime);
-  pCreate->blocksPerMeter = htons(pCreate->blocksPerMeter);
-  pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock);
-
-  if (grantCheckExpired()) {
-    code = TSDB_CODE_GRANT_EXPIRED;
-  } else if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtCreateDb(pConn->pAcct, pCreate);
-    if (code == TSDB_CODE_SUCCESS) {
-      mLPrint("DB:%s is created by %s", pCreate->db, pConn->pUser->user);
-    }
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DB_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessCreateMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessAlterDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SAlterDbMsg *pAlter = (SAlterDbMsg *)pMsg;
-  int          code = 0;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_DB_RSP) != 0) {
-    return 0;
-  }
-
-  pAlter->daysPerFile = htonl(pAlter->daysPerFile);
-  pAlter->daysToKeep = htonl(pAlter->daysToKeep);
-  pAlter->maxSessions = htonl(pAlter->maxSessions) + 1;
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtAlterDb(pConn->pAcct, pAlter);
-    if (code == TSDB_CODE_SUCCESS) {
-      mLPrint("DB:%s is altered by %s", pAlter->db, pConn->pUser->user);
-    }
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_DB_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessKillQueryMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  int         code = 0;
-  SKillQuery *pKill = (SKillQuery *)pMsg;
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtKillQuery(pKill->queryId, pConn);
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_QUERY_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessKillStreamMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  int          code = 0;
-  SKillStream *pKill = (SKillStream *)pMsg;
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtKillStream(pKill->queryId, pConn);
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_STREAM_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessKillConnectionMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  int              code = 0;
-  SKillConnection *pKill = (SKillConnection *)pMsg;
-
-  if (!pConn->superAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtKillConnection(pKill->queryId, pConn);
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_CONNECTION_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessCreateUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SCreateUserMsg *pCreate = (SCreateUserMsg *)pMsg;
-  int             code = 0;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_USER_RSP) != 0) {
-    return 0;
-  }
-
-  if (pConn->superAuth) {
-    code = mgmtCreateUser(pConn->pAcct, pCreate->user, pCreate->pass);
-    if (code == TSDB_CODE_SUCCESS) {
-      mLPrint("user:%s is created by %s", pCreate->user, pConn->pUser->user);
-    }
-  } else {
-    code = TSDB_CODE_NO_RIGHTS;
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_USER_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SAlterUserMsg *pAlter = (SAlterUserMsg *)pMsg;
-  int            code = 0;
-  SUserObj *     pUser;
-  SUserObj *     pOperUser;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_USER_RSP) != 0) {
-    return 0;
-  }
-
-  pUser = mgmtGetUser(pAlter->user);
-  pOperUser = mgmtGetUser(pConn->pUser->user);
-
-  if (pUser == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER);
-    return 0;
-  }
-
-  if (pOperUser == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER);
-    return 0;
-  }
-
-  if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
-    code = TSDB_CODE_NO_RIGHTS;
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
-    return 0;
-  }
-
-  if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) {
-    bool hasRight = false;
-    if (strcmp(pOperUser->user, "root") == 0) {
-      hasRight = true;
-    } else if (strcmp(pUser->user, pOperUser->user) == 0) {
-      hasRight = true;
-    } else if (pOperUser->superAuth) {
-      if (strcmp(pUser->user, "root") == 0) {
-        hasRight = false;
-      } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
-        hasRight = false;
-      } else {
-        hasRight = true;
-      }
-    }
-
-    if (hasRight) {
-      memset(pUser->pass, 0, sizeof(pUser->pass));
-      taosEncryptPass((uint8_t*)pAlter->pass, strlen(pAlter->pass), pUser->pass);
-      code = mgmtUpdateUser(pUser);
-      mLPrint("user:%s password is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code);
-    } else {
-      code = TSDB_CODE_NO_RIGHTS;
-    }
-
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
-    return 0;
-  }
-
-  if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) {
-    bool hasRight = false;
-
-    if (strcmp(pUser->user, "root") == 0) {
-      hasRight = false;
-    } else if (strcmp(pUser->user, pUser->acct) == 0) {
-      hasRight = false;
-    } else if (strcmp(pOperUser->user, "root") == 0) {
-      hasRight = true;
-    } else if (strcmp(pUser->user, pOperUser->user) == 0) {
-      hasRight = false;
-    } else if (pOperUser->superAuth) {
-      if (strcmp(pUser->user, "root") == 0) {
-        hasRight = false;
-      } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
-        hasRight = false;
-      } else {
-        hasRight = true;
-      }
-    }
-
-    if (pAlter->privilege == 1) { // super
-      hasRight = false;
-    }
-
-    if (hasRight) {
-      //if (pAlter->privilege == 1) {  // super
-      //  pUser->superAuth = 1;
-      //  pUser->writeAuth = 1;
-      //}
-      if (pAlter->privilege == 2) {  // read
-        pUser->superAuth = 0;
-        pUser->writeAuth = 0;
-      }
-      if (pAlter->privilege == 3) {  // write
-        pUser->superAuth = 0;
-        pUser->writeAuth = 1;
-      }
-
-      code = mgmtUpdateUser(pUser);
-      mLPrint("user:%s privilege is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code);
-    } else {
-      code = TSDB_CODE_NO_RIGHTS;
-    }
-
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
-    return 0;
-  }
-
-  code = TSDB_CODE_NO_RIGHTS;
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
-  return 0;
-}
-
-int mgmtProcessDropUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SDropUserMsg *pDrop = (SDropUserMsg *)pMsg;
-  int           code = 0;
-  SUserObj *    pUser;
-  SUserObj *    pOperUser;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_USER_RSP) != 0) {
-    return 0;
-  }
-
-  pUser = mgmtGetUser(pDrop->user);
-  pOperUser = mgmtGetUser(pConn->pUser->user);
-
-  if (pUser == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER);
-    return 0;
-  }
-
-  if (pOperUser == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER);
-    return 0;
-  }
-
-  if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
-    code = TSDB_CODE_NO_RIGHTS;
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code);
-    return 0;
-  }
-
-  bool hasRight = false;
-  if (strcmp(pUser->user, "root") == 0) {
-    hasRight = false;
-  } else if (strcmp(pOperUser->user, "root") == 0) {
-    hasRight = true;
-  } else if (strcmp(pUser->user, pOperUser->user) == 0) {
-    hasRight = false;
-  } else if (pOperUser->superAuth) {
-    if (strcmp(pUser->user, "root") == 0) {
-      hasRight = false;
-    } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
-      hasRight = false;
-    } else {
-      hasRight = true;
-    }
-  }
-
-  if (hasRight) {
-    code = mgmtDropUser(pConn->pAcct, pDrop->user);
-    if (code == 0) {
-      mLPrint("user:%s is dropped by %s", pDrop->user, pConn->pUser->user);
-    }
-  } else {
-    code = TSDB_CODE_NO_RIGHTS;
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code);
-  return 0;
-}
-
-int mgmtProcessDropDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SDropDbMsg *pDrop = (SDropDbMsg *)pMsg;
-  int         code;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_DB_RSP) != 0) {
-    return 0;
-  }
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtDropDbByName(pConn->pAcct, pDrop->db, pDrop->ignoreNotExists);
-    if (code == 0) {
-      mLPrint("DB:%s is dropped by %s", pDrop->db, pConn->pUser->user);
-    }
-  }
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DB_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessUseDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SUseDbMsg *pUse = (SUseDbMsg *)pMsg;
-  int        code;
-
-  code = mgmtUseDb(pConn, pUse->db);
-  if (code == 0) mTrace("DB is change to:%s by %s", pUse->db, pConn->pUser->user);
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_USE_DB_RSP, code);
-
-  return 0;
-}
-
-int (*mgmtGetMetaFp[])(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) = {
-    mgmtGetAcctMeta,   mgmtGetUserMeta,   mgmtGetDbMeta,     mgmtGetMeterMeta,  mgmtGetDnodeMeta,
-    mgmtGetMnodeMeta,  mgmtGetVgroupMeta, mgmtGetMetricMeta, mgmtGetModuleMeta, mgmtGetQueryMeta,
-    mgmtGetStreamMeta, mgmtGetConfigMeta, mgmtGetConnsMeta,  mgmtGetScoresMeta, grantGetGrantsMeta,
-    mgmtGetVnodeMeta,
-};
-
-int (*mgmtRetrieveFp[])(SShowObj *pShow, char *data, int rows, SConnObj *pConn) = {
-    mgmtRetrieveAccts,   mgmtRetrieveUsers,   mgmtRetrieveDbs,     mgmtRetrieveMeters,  mgmtRetrieveDnodes,
-    mgmtRetrieveMnodes,  mgmtRetrieveVgroups, mgmtRetrieveMetrics, mgmtRetrieveModules, mgmtRetrieveQueries,
-    mgmtRetrieveStreams, mgmtRetrieveConfigs, mgmtRetrieveConns,   mgmtRetrieveScores,  grantRetrieveGrants,
-    mgmtRetrieveVnodes,
-};
-
-int mgmtProcessShowMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SShowMsg *   pShowMsg = (SShowMsg *)pMsg;
-  STaosRsp *   pRsp;
-  char *       pStart;
-  int          code = 0;
-  SShowRspMsg *pShowRsp;
-  SShowObj *   pShow = NULL;
-
-  if (pShowMsg->type == TSDB_MGMT_TABLE_DNODE || TSDB_MGMT_TABLE_GRANTS || TSDB_MGMT_TABLE_SCORES) {
-    if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_SHOW_RSP) != 0) {
-      return 0;
-    }
-  }
-  
-  int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SShowRspMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS +
-             TSDB_EXTRA_PAYLOAD_SIZE;
-  pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, size);
-  if (pStart == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-  
-  pMsg = pStart;
-  pRsp = (STaosRsp *)pMsg;
-  pMsg = (char *)pRsp->more;
-
-  if (pShowMsg->type >= TSDB_MGMT_TABLE_MAX) {
-    code = -1;
-  } else {
-    pShow = (SShowObj *)calloc(1, sizeof(SShowObj) + htons(pShowMsg->payloadLen));
-    pShow->signature = pShow;
-    pShow->type = pShowMsg->type;
-    mTrace("pShow:%p is allocated", pShow);
-
-    // set the table name query condition
-    pShow->payloadLen = htons(pShowMsg->payloadLen);
-    memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen);
-
-    pShowRsp = (SShowRspMsg *)pMsg;
-    pShowRsp->qhandle = (uint64_t)pShow;  // qhandle;
-    pConn->qhandle = pShowRsp->qhandle;
-
-    code = (*mgmtGetMetaFp[(uint8_t)pShowMsg->type])(&pShowRsp->meterMeta, pShow, pConn);
-    if (code == 0) {
-      pMsg += sizeof(SShowRspMsg) + sizeof(SSchema) * pShow->numOfColumns;
-    } else {
-      mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, taosMsg[(uint8_t)pShowMsg->type], code);
-      free(pShow);
-    }
-  }
-
-  pRsp->code = code;
-  msgLen = pMsg - pStart;
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SRetrieveMeterMsg *pRetrieve;
-  SRetrieveMeterRsp *pRsp;
-  int                rowsToRead = 0, size = 0, rowsRead = 0;
-  char *             pStart;
-  int                code = 0;
-  SShowObj *         pShow;
-
-  pRetrieve = (SRetrieveMeterMsg *)pMsg;
-
-  /*
-   * in case of server restart, apps may hold qhandle created by server before
-   * restart, which is actually invalid, therefore, signature check is required.
-   */
-  if (pRetrieve->qhandle != pConn->qhandle) {
-    mError("retrieve:%p, qhandle:%p is not matched with saved:%p", pRetrieve, pRetrieve->qhandle, pConn->qhandle);
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED);
-    return -1;
-  }
-
-  pShow = (SShowObj *)pRetrieve->qhandle;
-  if (pShow->signature != (void *)pShow) {
-    mError("pShow:%p, signature:%p, query memory is corrupted", pShow, pShow->signature);
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED);
-    return -1;
-  } else {
-    if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) {
-      rowsToRead = pShow->numOfRows - pShow->numOfReads;
-    }
-
-    /* return no more than 100 meters in one round trip */
-    if (rowsToRead > 100) rowsToRead = 100;
-
-    /*
-     * the actual number of table may be larger than the value of pShow->numOfRows, if a query is
-     * issued during a continuous create table operation. Therefore, rowToRead may be less than 0.
-     */
-    if (rowsToRead < 0) rowsToRead = 0;
-    size = pShow->rowSize * rowsToRead;
-  }
-
-  pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, size + 100);
-  if (pStart == NULL) {
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    return 0;
-  }
-  
-  pMsg = pStart;
-
-  STaosRsp *pTaosRsp = (STaosRsp *)pStart;
-  pTaosRsp->code = code;
-  pMsg = pTaosRsp->more;
-
-  if (code == 0) {
-    pRsp = (SRetrieveMeterRsp *)pMsg;
-    pMsg = pRsp->data;
-
-    // if free flag is set, client wants to clean the resources
-    if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
-      rowsRead = (*mgmtRetrieveFp[(uint8_t)pShow->type])(pShow, pRsp->data, rowsToRead, pConn);
-
-    if (rowsRead < 0) {
-      rowsRead = 0;
-      pTaosRsp->code = TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-
-    pRsp->numOfRows = htonl(rowsRead);
-    pRsp->precision = htonl(TSDB_TIME_PRECISION_MILLI);  // millisecond time precision
-    pMsg += size;
-  }
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  if (rowsToRead == 0) {
-    uintptr_t oldSign = (uintptr_t)atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
-    if (oldSign != (uintptr_t)pShow) {
-      return msgLen;
-    }
-    // pShow->signature = 0;
-    mTrace("pShow:%p is released", pShow);
-    tfree(pShow);
-  }
-
-  return msgLen;
-}
-
-int mgmtProcessCreateTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SCreateTableMsg *pCreate = (SCreateTableMsg *)pMsg;
-  int              code;
-  SSchema *        pSchema;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_TABLE_RSP) != 0) {
-    return 0;
-  }
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    pCreate->numOfColumns = htons(pCreate->numOfColumns);
-    pCreate->numOfTags = htons(pCreate->numOfTags);
-
-    pCreate->sqlLen = htons(pCreate->sqlLen);
-    pSchema = pCreate->schema;
-    for (int i = 0; i < pCreate->numOfColumns + pCreate->numOfTags; ++i) {
-      pSchema->bytes = htons(pSchema->bytes);
-      pSchema->colId = i;
-      pSchema++;
-    }
-
-    SDbObj *pDb = NULL;
-    if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-    if (pDb) {
-      code = mgmtCreateMeter(pDb, pCreate);
-    } else {
-      code = TSDB_CODE_DB_NOT_SELECTED;
-    }
-  }
-
-  if (code == 1) {
-    //mTrace("table:%s, wait vgroup create finish", pCreate->meterId, code);
-  } else if (code != TSDB_CODE_SUCCESS) {
-    if (code == TSDB_CODE_TABLE_ALREADY_EXIST) {  // table already created when the second attempt to create table
-      
-      STabObj* pMeter = mgmtGetMeter(pCreate->meterId);
-      assert(pMeter != NULL);
-      
-      mWarn("table:%s, table already created, failed to create table, ts:%" PRId64 ", code:%d", pCreate->meterId,
-            pMeter->createdTime, code);
-    } else {  // other errors
-      mError("table:%s, failed to create table, code:%d", pCreate->meterId, code);
-    }
-  } else {
-    mTrace("table:%s, table is created by %s", pCreate->meterId, pConn->pUser->user);
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_TABLE_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessDropTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SDropTableMsg *pDrop = (SDropTableMsg *)pMsg;
-  int            code;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_TABLE_RSP) != 0) {
-    return 0;
-  }
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    SDbObj *pDb = NULL;
-    if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-    code = mgmtDropMeter(pDb, pDrop->meterId, pDrop->igNotExists);
-    if (code == 0) {
-      mTrace("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user);
-      // mLPrint("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user);
-    }
-
-    taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_TABLE_RSP, code);
-  }
-
-  return 0;
-}
-
-int mgmtProcessAlterTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  SAlterTableMsg *pAlter = (SAlterTableMsg *)pMsg;
-  int             code;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_TABLE_RSP) != 0) {
-    return 0;
-  }
-
-  if (!pConn->writeAuth) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    pAlter->type = htons(pAlter->type);
-    pAlter->numOfCols = htons(pAlter->numOfCols);
-
-    if (pAlter->numOfCols > 2) {
-      mError("meter:%s error numOfCols:%d in alter table", pAlter->meterId, pAlter->numOfCols);
-      code = TSDB_CODE_APP_ERROR;
-    } else {
-      SDbObj *pDb = NULL;
-      if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-      if (pDb) {
-        for (int32_t i = 0; i < pAlter->numOfCols; ++i) {
-          pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes);
-        }
-
-        code = mgmtAlterMeter(pDb, pAlter);
-        if (code == 0) {
-          mLPrint("meter:%s is altered by %s", pAlter->meterId, pConn->pUser->user);
-        }
-      } else {
-        code = TSDB_CODE_DB_NOT_SELECTED;
-      }
-    }
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_TABLE_RSP, code);
-
-  return 0;
-}
-
-int mgmtProcessCfgDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  int      code = 0;
-  SCfgMsg *pCfg = (SCfgMsg *)pMsg;
-
-  if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CFG_MNODE_RSP) != 0) {
-    return 0;
-  }
-
-  if (strcmp(pConn->pAcct->user, "root") != 0) {
-    code = TSDB_CODE_NO_RIGHTS;
-  } else {
-    code = mgmtSendCfgDnodeMsg(pMsg);
-  }
-
-  taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CFG_PNODE_RSP, code);
-
-  if (code == 0) mTrace("dnode:%s is configured by %s", pCfg->ip, pConn->pUser->user);
-
-  return 0;
-}
-
-int mgmtProcessHeartBeatMsg(char *cont, int contLen, SConnObj *pConn) {
-  char *    pStart, *pMsg;
-  int       msgLen;
-  STaosRsp *pRsp;
-
-  mgmtSaveQueryStreamList(cont, contLen, pConn);
-
-  pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_HEARTBEAT_RSP, 128);
-  if (pStart == NULL) return 0;
-  pMsg = pStart;
-  pRsp = (STaosRsp *)pMsg;
-  pRsp->code = 0;
-  pMsg = (char *)pRsp->more;
-
-  SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *)pRsp->more;
-  pHBRsp->queryId = pConn->queryId;
-  pConn->queryId = 0;
-  pHBRsp->streamId = pConn->streamId;
-  pHBRsp->streamId = pConn->streamId;
-  pConn->streamId = 0;
-  pHBRsp->killConnection = pConn->killConnection;
-
-  if (pConn->usePublicIp) {
-    if (pSdbPublicIpList != NULL) {
-      int size = pSdbPublicIpList->numOfIps * 4;
-      pHBRsp->ipList.numOfIps = pSdbPublicIpList->numOfIps;
-      memcpy(pHBRsp->ipList.ip, pSdbPublicIpList->ip, size);
-      pMsg += sizeof(SHeartBeatRsp) + size;
-    } else {
-      pHBRsp->ipList.numOfIps = 0;
-      pMsg += sizeof(SHeartBeatRsp);
-    }
-
-  } else {
-    if (pSdbIpList != NULL) {
-      int size = pSdbIpList->numOfIps * 4;
-      pHBRsp->ipList.numOfIps = pSdbIpList->numOfIps;
-      memcpy(pHBRsp->ipList.ip, pSdbIpList->ip, size);
-      pMsg += sizeof(SHeartBeatRsp) + size;
-    } else {
-      pHBRsp->ipList.numOfIps = 0;
-      pMsg += sizeof(SHeartBeatRsp);
-    }
-  }
-  msgLen = pMsg - pStart;
-
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  return 0;
-}
-
-void mgmtEstablishConn(SConnObj *pConn) {
-  atomic_fetch_add_32(&mgmtShellConns, 1);
-  atomic_fetch_add_32(&sdbExtConns, 1);
-  pConn->stime = taosGetTimestampMs();
-
-  if (strcmp(pConn->pUser->user, "root") == 0) {
-    pConn->superAuth = 1;
-    pConn->writeAuth = 1;
-  } else {
-    pConn->superAuth = pConn->pUser->superAuth;
-    pConn->writeAuth = pConn->pUser->writeAuth;
-    if (pConn->superAuth) {
-      pConn->writeAuth = 1;
-    }
-  }
-
-  int32_t tempint32;
-  uint32_t tempuint32;
-  taosGetRpcConnInfo(pConn->thandle, &tempuint32, &pConn->ip, &pConn->port, &tempint32, &tempint32);
-  mgmtAddConnIntoAcct(pConn);
-}
-
-int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey) {
-  SUserObj *pUser = NULL;
-
-  *spi = 0;
-  *encrypt = 0;
-  secret[0] = 0;
-  ckey[0] = 0;
-
-  pUser = mgmtGetUser(user);
-  if (pUser == NULL) return TSDB_CODE_INVALID_USER;
-
-  *spi = 1;
-  *encrypt = 0;
-  memcpy(secret, pUser->pass, TSDB_KEY_LEN);
-
-  return 0;
-}
-
-int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  STaosRsp *   pRsp;
-  SConnectRsp *pConnectRsp;
-  SConnectMsg *pConnectMsg;
-  char *       pStart;
-  int          code = TSDB_CODE_INVALID_USER;
-  SAcctObj *   pAcct = NULL;
-  SUserObj *   pUser = NULL;
-  SDbObj *     pDb = NULL;
-  char         dbName[256] = {0};
-
-  pConnectMsg = (SConnectMsg *)pMsg;
-
-  pUser = mgmtGetUser(pConn->user);
-  if (pUser == NULL) {
-    code = TSDB_CODE_INVALID_USER;
-    goto _rsp;
-  }
-
-  if (grantCheckExpired()) {
-    code = TSDB_CODE_GRANT_EXPIRED;
-    goto _rsp;
-  }
-
-  pAcct = mgmtGetAcct(pUser->acct);
-
-  code = taosCheckVersion(pConnectMsg->clientVersion, version, 3);
-  if (code != 0) {
-    mError("invalid client version:%s", pConnectMsg->clientVersion);
-    goto _rsp;
-  }
-
-  if (pConnectMsg->db[0]) {
-    sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db);
-    pDb = mgmtGetDb(dbName);
-    if (pDb == NULL) {
-      code = TSDB_CODE_INVALID_DB;
-      goto _rsp;
-    }
-  }
-
-  if (pConn->pAcct) {
-    mgmtRemoveConnFromAcct(pConn);
-    atomic_fetch_sub_32(&mgmtShellConns, 1);
-    atomic_fetch_sub_32(&sdbExtConns, 1);
-  }
-
-  code = 0;
-  pConn->pAcct = pAcct;
-  pConn->pDb = pDb;
-  pConn->pUser = pUser;
-  mgmtEstablishConn(pConn);
-  
-_rsp:
-  pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_CONNECT_RSP, 128);
-  if (pStart == NULL) return 0;
-
-  pMsg = pStart;
-  pRsp = (STaosRsp *)pMsg;
-  pRsp->code = code;
-  pMsg += sizeof(STaosRsp);
-
-  if (code == 0) {
-    pConnectRsp = (SConnectRsp *)pRsp->more;
-    sprintf(pConnectRsp->acctId, "%x", pConn->pAcct->acctId);
-    strcpy(pConnectRsp->version, version);
-    pConnectRsp->writeAuth = pConn->writeAuth;
-    pConnectRsp->superAuth = pConn->superAuth;
-    pMsg += sizeof(SConnectRsp);
-
-    int size;
-    if (pSdbPublicIpList != NULL && pSdbIpList != NULL) {
-      size = pSdbPublicIpList->numOfIps * 4 + sizeof(SIpList);
-      if (pConn->usePublicIp) {
-        memcpy(pMsg, pSdbPublicIpList, size);
-      } else {
-        memcpy(pMsg, pSdbIpList, size);
-      }
-    } else {
-      SIpList tmpIpList;
-      tmpIpList.numOfIps = 0;
-      size = tmpIpList.numOfIps * 4 + sizeof(SIpList);
-      memcpy(pMsg, &tmpIpList, size);
-    }
-
-    pMsg += size;
-
-    // set the time resolution: millisecond or microsecond
-    *((uint32_t *)pMsg) = tsTimePrecision;
-    pMsg += sizeof(uint32_t);
-
-  } else {
-    pConn->pAcct = NULL;
-    pConn->pUser = NULL;
-  }
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
-
-  char ipstr[24];
-  tinet_ntoa(ipstr, pConn->ip);
-  mLPrint("user:%s login from %s, code:%d", pConn->user, ipstr, code);
-
-  return code;
-}
-
-void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
-  SIntMsg * pMsg = (SIntMsg *)msg;
-  SConnObj *pConn = (SConnObj *)ahandle;
-
-  if (msg == NULL) {
-    if (pConn) {
-      mgmtRemoveConnFromAcct(pConn);
-      atomic_fetch_sub_32(&mgmtShellConns, 1);
-      atomic_fetch_sub_32(&sdbExtConns, 1);
-      mTrace("connection from %s is closed", pConn->pUser->user);
-      memset(pConn, 0, sizeof(SConnObj));
-    }
-
-    return NULL;
-  }
-
-#ifdef CLUSTER
-  if (sdbInited == NULL || sdbStatus != SDB_STATUS_SERVING) {
-    taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
-    mTrace("shell msg is ignored since SDB is not ready");
-  }
-#endif
-
-  if (pConn == NULL) {
-    pConn = connList + pMsg->destId;
-    pConn->thandle = thandle;
-    strcpy(pConn->user, pMsg->meterId);
-    pConn->usePublicIp = (pMsg->destIp == tsPublicIpInt ? 1 : 0);
-    mTrace("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
-            pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
-  }
-
-  if (pMsg->msgType == TSDB_MSG_TYPE_CONNECT) {
-    (*mgmtProcessShellMsg[pMsg->msgType])((char *)pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pConn);
-  } else {
-    SMgmtHead *pHead = (SMgmtHead *)pMsg->content;
-    if (pConn->pAcct == NULL) {
-      pConn->pUser = mgmtGetUser(pConn->user);
-      if (pConn->pUser) {
-        pConn->pAcct = mgmtGetAcct(pConn->pUser->acct);
-        mgmtEstablishConn(pConn);
-        mTrace("login from:%x:%hu", pConn->ip, htons(pConn->port));
-      }
-    }
-
-    if (pConn->pAcct) {
-      if (pConn->pDb == NULL || strncmp(pConn->pDb->name, pHead->db, tListLen(pConn->pDb->name)) != 0) {
-        pConn->pDb = mgmtGetDb(pHead->db);
-      }
-
-      char *cont = (char *)pMsg->content + sizeof(SMgmtHead);
-      int   contLen = pMsg->msgLen - sizeof(SIntMsg) - sizeof(SMgmtHead);
-
-      // read-only request can be executed concurrently
-      if ((pMsg->msgType == TSDB_MSG_TYPE_METERINFO && (!mgmtCheckMeterMetaMsgType(cont))) ||
-          pMsg->msgType == TSDB_MSG_TYPE_METRIC_META || pMsg->msgType == TSDB_MSG_TYPE_RETRIEVE ||
-          pMsg->msgType == TSDB_MSG_TYPE_SHOW || pMsg->msgType == TSDB_MSG_TYPE_MULTI_METERINFO) {
-        (*mgmtProcessShellMsg[pMsg->msgType])(cont, contLen, pConn);
-      } else {
-        if (mgmtProcessShellMsg[pMsg->msgType]) {
-          SSchedMsg schedMsg;
-          schedMsg.msg = malloc(pMsg->msgLen);  // Message to deal with
-          memcpy(schedMsg.msg, pMsg, pMsg->msgLen);
-
-          schedMsg.fp = mgmtProcessTranRequest;
-          schedMsg.tfp = NULL;
-          schedMsg.thandle = pConn;
-
-          taosScheduleTask(mgmtTranQhandle, &schedMsg);
-        } else {
-          mError("%s from shell is not processed", taosMsg[pMsg->msgType]);
-        }
-      }
-    } else {
-      taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_DISCONNECTED);
-    }
-  }
-
-  if (pConn->pAcct == NULL) {
-    taosCloseRpcConn(pConn->thandle);
-    memset(pConn, 0, sizeof(SConnObj));  // close the connection;
-    pConn = NULL;
-  }
-
-  return pConn;
-}
-
-void mgmtInitProcessShellMsg() {
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_METERINFO] = mgmtProcessMeterMetaMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_METRIC_META] = mgmtProcessMetricMetaMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_MULTI_METERINFO] = mgmtProcessMultiMeterMetaMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DB] = mgmtProcessCreateDbMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_DB] = mgmtProcessAlterDbMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_USER] = mgmtProcessCreateUserMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_USER] = mgmtProcessAlterUserMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_ACCT] = mgmtProcessCreateAcctMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DB] = mgmtProcessDropDbMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_USER] = mgmtProcessDropUserMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_ACCT] = mgmtProcessDropAcctMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_ACCT] = mgmtProcessAlterAcctMsg;
-
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_TABLE] = mgmtProcessCreateTableMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_TABLE] = mgmtProcessDropTableMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_ALTER_TABLE] = mgmtProcessAlterTableMsg;
-
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_USE_DB] = mgmtProcessUseDbMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_RETRIEVE] = mgmtProcessRetrieveMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_SHOW] = mgmtProcessShowMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CONNECT] = mgmtProcessConnectMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_HEARTBEAT] = mgmtProcessHeartBeatMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DNODE] = mgmtProcessCreateDnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DNODE] = mgmtProcessDropDnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_MNODE] = mgmtProcessCreateMnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_MNODE] = mgmtProcessDropMnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CFG_MNODE] = mgmtProcessCfgMnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_CFG_PNODE] = mgmtProcessCfgDnodeMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_QUERY] = mgmtProcessKillQueryMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_STREAM] = mgmtProcessKillStreamMsg;
-  mgmtProcessShellMsg[TSDB_MSG_TYPE_KILL_CONNECTION] = mgmtProcessKillConnectionMsg;
-}
diff --git a/src/system/detail/src/mgmtSupertableQuery.c b/src/system/detail/src/mgmtSupertableQuery.c
deleted file mode 100644
index 1b7ae66e6d5b01dd15e0dc26d91a03e37a2e29ab..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtSupertableQuery.c
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "mgmtUtil.h"
-#include "textbuffer.h"
-#include "tschemautil.h"
-#include "tsqlfunction.h"
-#include "vnodeTagMgmt.h"
-
-typedef struct SJoinSupporter {
-  void**  val;
-  void**  pTabObjs;
-  int32_t size;
-
-  int16_t type;
-  int16_t colIndex;
-
-  void**  qualMeterObj;
-  int32_t qualSize;
-} SJoinSupporter;
-
-typedef struct SMeterNameFilterSupporter {
-  SPatternCompareInfo info;
-  char*               pattern;
-} SMeterNameFilterSupporter;
-
-static void tansformQueryResult(tQueryResultset* pRes);
-
-static int32_t tabObjVGIDComparator(const void* pLeft, const void* pRight) {
-  STabObj* p1 = *(STabObj**)pLeft;
-  STabObj* p2 = *(STabObj**)pRight;
-
-  int32_t ret = p1->gid.vgId - p2->gid.vgId;
-  if (ret == 0) {
-    return ret;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
-}
-
-// monotonic inc in memory address
-static int32_t tabObjPointerComparator(const void* pLeft, const void* pRight) {
-  int64_t ret = (*(STabObj**)(pLeft))->uid - (*(STabObj**)(pRight))->uid;
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
-}
-
-static int32_t tabObjResultComparator(const void* p1, const void* p2, void* param) {
-  tOrderDescriptor* pOrderDesc = (tOrderDescriptor*)param;
-
-  STabObj* pNode1 = (STabObj*)p1;
-  STabObj* pNode2 = (STabObj*)p2;
-
-  for (int32_t i = 0; i < pOrderDesc->orderIdx.numOfOrderedCols; ++i) {
-    int32_t colIdx = pOrderDesc->orderIdx.pData[i];
-
-    char* f1 = NULL;
-    char* f2 = NULL;
-
-    SSchema schema = {0};
-
-    if (colIdx == -1) {
-      f1 = pNode1->meterId;
-      f2 = pNode2->meterId;
-      schema.type = TSDB_DATA_TYPE_BINARY;
-      schema.bytes = TSDB_METER_ID_LEN;
-    } else {
-      f1 = mgmtMeterGetTag(pNode1, colIdx, NULL);
-      f2 = mgmtMeterGetTag(pNode2, colIdx, &schema);
-      assert(schema.type == pOrderDesc->pTagSchema->pSchema[colIdx].type);
-    }
-
-    int32_t ret = doCompare(f1, f2, schema.type, schema.bytes);
-    if (ret == 0) {
-      continue;
-    } else {
-      return ret;
-    }
-  }
-
-  return 0;
-}
-
-/**
- * update the tag order index according to the tags column index. The tags column index needs to be checked one-by-one,
- * since the normal columns may be passed to server for handling the group by on status column.
- *
- * @param pMetricMetaMsg
- * @param tableIndex
- * @param pOrderIndexInfo
- * @param numOfTags
- */
-static void mgmtUpdateOrderTagColIndex(SMetricMetaMsg* pMetricMetaMsg, int32_t tableIndex, tOrderIdx* pOrderIndexInfo,
-     int32_t numOfTags) {
-  SMetricMetaElemMsg* pElem = (SMetricMetaElemMsg*)((char*)pMetricMetaMsg + pMetricMetaMsg->metaElem[tableIndex]);
-  SColIndexEx* groupColumnList = (SColIndexEx*)((char*)pMetricMetaMsg + pElem->groupbyTagColumnList);
-  
-  int32_t numOfGroupbyTags = 0;
-  for (int32_t i = 0; i < pElem->numOfGroupCols; ++i) {
-    if (groupColumnList[i].flag == TSDB_COL_TAG) {  // ignore this column if it is not a tag column.
-      pOrderIndexInfo->pData[numOfGroupbyTags++] = groupColumnList[i].colIdx;
-      
-      assert(groupColumnList[i].colIdx < numOfTags);
-    }
-  }
-  
-  pOrderIndexInfo->numOfOrderedCols = numOfGroupbyTags;
-}
-
-// todo merge sort function with losertree used
-void mgmtReorganizeMetersInMetricMeta(SMetricMetaMsg* pMetricMetaMsg, int32_t tableIndex, tQueryResultset* pRes) {
-  if (pRes->num <= 0) {  // no result, no need to pagination
-    return;
-  }
-
-  SMetricMetaElemMsg* pElem = (SMetricMetaElemMsg*)((char*)pMetricMetaMsg + pMetricMetaMsg->metaElem[tableIndex]);
-
-  STabObj* pMetric = mgmtGetMeter(pElem->meterId);
-  SSchema* pTagSchema = (SSchema*)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-
-  /*
-   * To apply the group limitation and group offset, we should sort the result
-   * list according to the order condition
-   */
-  tOrderDescriptor* descriptor =
-      (tOrderDescriptor*)calloc(1, sizeof(tOrderDescriptor) + sizeof(int32_t) * pElem->numOfGroupCols);
-  descriptor->pTagSchema = tCreateTagSchema(pTagSchema, pMetric->numOfTags);
-  descriptor->orderIdx.numOfOrderedCols = pElem->numOfGroupCols;
-
-  int32_t* startPos = NULL;
-  int32_t  numOfSubset = 1;
-  
-  mgmtUpdateOrderTagColIndex(pMetricMetaMsg, tableIndex, &descriptor->orderIdx, pMetric->numOfTags);
-  if (descriptor->orderIdx.numOfOrderedCols > 0) {
-    tQSortEx(pRes->pRes, POINTER_BYTES, 0, pRes->num - 1, descriptor, tabObjResultComparator);
-    startPos = calculateSubGroup(pRes->pRes, pRes->num, &numOfSubset, descriptor, tabObjResultComparator);
-  } else {
-    startPos = malloc(2 * sizeof(int32_t));
-
-    startPos[0] = 0;
-    startPos[1] = (int32_t)pRes->num;
-  }
-
-  /*
-   * sort the result according to vgid to ensure meters with the same vgid is
-   * continuous in the result list
-   */
-  qsort(pRes->pRes, (size_t)pRes->num, POINTER_BYTES, tabObjVGIDComparator);
-
-  free(descriptor->pTagSchema);
-  free(descriptor);
-  free(startPos);
-}
-
-static void mgmtRetrieveByMeterName(tQueryResultset* pRes, char* str, STabObj* pMetric) {
-  const char* sep = ",";
-  char*       pToken = NULL;
-
-  int32_t s = 4;  // initial size
-
-  pRes->pRes = malloc(sizeof(char*) * s);
-  pRes->num = 0;
-
-  for (pToken = strsep(&str, sep); pToken != NULL; pToken = strsep(&str, sep)) {
-    STabObj* pMeterObj = mgmtGetMeter(pToken);
-    if (pMeterObj == NULL) {
-      mWarn("metric:%s error in metric query expression, invalid meter id:%s", pMetric->meterId, pToken);
-      continue;
-    }
-
-    if (pRes->num >= s) {
-      s += (s >> 1);  // increase 50% size
-      pRes->pRes = realloc(pRes->pRes, sizeof(char*) * s);
-    }
-
-    /* not a table created from metric, ignore */
-    if (pMeterObj->meterType != TSDB_METER_MTABLE) {
-      continue;
-    }
-
-    /*
-     * queried meter not belongs to this metric, ignore, metric does not have
-     * uid, so compare according to meterid
-     */
-    STabObj* parentMetric = mgmtGetMeter(pMeterObj->pTagData);
-    if (strncasecmp(parentMetric->meterId, pMetric->meterId, TSDB_METER_ID_LEN) != 0 ||
-        (parentMetric->uid != pMetric->uid)) {
-      continue;
-    }
-
-    pRes->pRes[pRes->num++] = pMeterObj;
-  }
-}
-
-static bool mgmtTablenameFilterCallback(tSkipListNode* pNode, void* param) {
-  SMeterNameFilterSupporter* pSupporter = (SMeterNameFilterSupporter*)param;
-
-  char name[TSDB_METER_ID_LEN] = {0};
-
-  // pattern compare for meter name
-  STabObj* pMeterObj = (STabObj*)pNode->pData;
-  extractTableName(pMeterObj->meterId, name);
-
-  return patternMatch(pSupporter->pattern, name, TSDB_METER_ID_LEN, &pSupporter->info) == TSDB_PATTERN_MATCH;
-}
-
-static void mgmtRetrieveFromLikeOptr(tQueryResultset* pRes, const char* str, STabObj* pMetric) {
-  SPatternCompareInfo       info = PATTERN_COMPARE_INFO_INITIALIZER;
-  SMeterNameFilterSupporter supporter = {info, (char*) str};
-
-  pRes->num =
-      tSkipListIterateList(pMetric->pSkipList, (tSkipListNode***)&pRes->pRes, mgmtTablenameFilterCallback, &supporter);
-}
-
-static void mgmtFilterByTableNameCond(tQueryResultset* pRes, char* condStr, int32_t len, STabObj* pMetric) {
-  pRes->num = 0;
-  if (len <= 0) {
-    return;
-  }
-
-  char* str = calloc(1, (size_t)len + 1);
-  memcpy(str, condStr, len);
-
-  if (strncasecmp(condStr, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN) == 0) {  // handle in expression
-    mgmtRetrieveByMeterName(pRes, str + QUERY_COND_REL_PREFIX_IN_LEN, pMetric);
-  } else {  // handle like expression
-    assert(strncasecmp(str, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN) == 0);
-    mgmtRetrieveFromLikeOptr(pRes, str + QUERY_COND_REL_PREFIX_LIKE_LEN, pMetric);
-
-    tansformQueryResult(pRes);
-  }
-
-  free(str);
-}
-
-UNUSED_FUNC static bool mgmtJoinFilterCallback(tSkipListNode* pNode, void* param) {
-  SJoinSupporter* pSupporter = (SJoinSupporter*)param;
-
-  SSchema s = {0};
-  char*   v = mgmtMeterGetTag((STabObj*)pNode->pData, pSupporter->colIndex, &s);
-
-  for (int32_t i = 0; i < pSupporter->size; ++i) {
-    int32_t ret = doCompare(v, pSupporter->val[i], pSupporter->type, s.bytes);
-    if (ret == 0) {
-      pSupporter->qualMeterObj[pSupporter->qualSize++] = pSupporter->pTabObjs[i];
-
-      /*
-       * Once a value is qualified according to the join condition, it is remove from the
-       * candidate list, as well as its corresponding meter object.
-       *
-       * last one does not need to move forward
-       */
-      if (i < pSupporter->size - 1) {
-        memmove(pSupporter->val[i], pSupporter->val[i + 1], pSupporter->size - (i + 1));
-      }
-
-      pSupporter->size -= 1;
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static void orderResult(SMetricMetaMsg* pMetricMetaMsg, tQueryResultset* pRes, int16_t colIndex, int32_t tableIndex) {
-  SMetricMetaElemMsg* pElem = (SMetricMetaElemMsg*)((char*)pMetricMetaMsg + pMetricMetaMsg->metaElem[tableIndex]);
-
-  tOrderDescriptor* descriptor =
-      (tOrderDescriptor*)calloc(1, sizeof(tOrderDescriptor) + sizeof(int32_t) * 1);  // only one column for join
-
-  STabObj* pMetric = mgmtGetMeter(pElem->meterId);
-  SSchema* pTagSchema = (SSchema*)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-
-  descriptor->pTagSchema = tCreateTagSchema(pTagSchema, pMetric->numOfTags);
-
-  descriptor->orderIdx.pData[0] = colIndex;
-  descriptor->orderIdx.numOfOrderedCols = 1;
-
-  // sort results list
-  tQSortEx(pRes->pRes, POINTER_BYTES, 0, pRes->num - 1, descriptor, tabObjResultComparator);
-
-  free(descriptor->pTagSchema);
-  free(descriptor);
-}
-
-// check for duplicate join tags
-static int32_t mgmtCheckForDuplicateTagValue(tQueryResultset* pRes, int32_t index, int32_t tagCol) {
-  SSchema s = {0};
-
-  for (int32_t k = 1; k < pRes[index].num; ++k) {
-    STabObj* pObj1 = pRes[index].pRes[k - 1];
-    STabObj* pObj2 = pRes[index].pRes[k];
-
-    char* val1 = mgmtMeterGetTag(pObj1, tagCol, &s);
-    char* val2 = mgmtMeterGetTag(pObj2, tagCol, NULL);
-
-    if (doCompare(val1, val2, s.type, s.bytes) == 0) {
-      return TSDB_CODE_DUPLICATE_TAGS;
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t mgmtDoJoin(SMetricMetaMsg* pMetricMetaMsg, tQueryResultset* pRes) {
-  if (pMetricMetaMsg->numOfMeters == 1) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  bool allEmpty = false;
-  for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-    if (pRes[i].num == 0) {  // all results are empty if one of them is empty
-      allEmpty = true;
-      break;
-    }
-  }
-
-  if (allEmpty) {
-    for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-      pRes[i].num = 0;
-      tfree(pRes[i].pRes);
-    }
-
-    return TSDB_CODE_SUCCESS;
-  }
-
-  char* cond = (char*)pMetricMetaMsg + pMetricMetaMsg->join;
-
-  char left[TSDB_METER_ID_LEN + 1] = {0};
-  strcpy(left, cond);
-  int16_t leftTagColIndex = *(int16_t*)(cond + TSDB_METER_ID_LEN);
-
-  char right[TSDB_METER_ID_LEN + 1] = {0};
-  strcpy(right, cond + TSDB_METER_ID_LEN + sizeof(int16_t));
-  int16_t rightTagColIndex = *(int16_t*)(cond + TSDB_METER_ID_LEN * 2 + sizeof(int16_t));
-
-  STabObj* pLeftMetric = mgmtGetMeter(left);
-  STabObj* pRightMetric = mgmtGetMeter(right);
-
-  // decide the pRes belongs to
-  int32_t leftIndex = 0;
-  int32_t rightIndex = 0;
-
-  for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
-    STabObj* pObj = (STabObj*)pRes[i].pRes[0];
-    STabObj* pMetric1 = mgmtGetMeter(pObj->pTagData);
-    if (pMetric1 == pLeftMetric) {
-      leftIndex = i;
-    } else if (pMetric1 == pRightMetric) {
-      rightIndex = i;
-    }
-  }
-
-  orderResult(pMetricMetaMsg, &pRes[leftIndex], leftTagColIndex, leftIndex);
-  orderResult(pMetricMetaMsg, &pRes[rightIndex], rightTagColIndex, rightIndex);
-
-  int32_t i = 0;
-  int32_t j = 0;
-
-  SSchema s = {0};
-  int32_t res = 0;
-
-  // check for duplicated tag values
-  int32_t ret1 = mgmtCheckForDuplicateTagValue(pRes, leftIndex, leftTagColIndex);
-  int32_t ret2 = mgmtCheckForDuplicateTagValue(pRes, rightIndex, rightTagColIndex);
-  if (ret1 != TSDB_CODE_SUCCESS || ret2 != TSDB_CODE_SUCCESS) {
-    return ret1;
-  }
-
-  while (i < pRes[leftIndex].num && j < pRes[rightIndex].num) {
-    STabObj* pLeftObj = pRes[leftIndex].pRes[i];
-    STabObj* pRightObj = pRes[rightIndex].pRes[j];
-
-    char* v1 = mgmtMeterGetTag(pLeftObj, leftTagColIndex, &s);
-    char* v2 = mgmtMeterGetTag(pRightObj, rightTagColIndex, NULL);
-
-    int32_t ret = doCompare(v1, v2, s.type, s.bytes);
-    if (ret == 0) {  // qualified
-      pRes[leftIndex].pRes[res] = pRes[leftIndex].pRes[i++];
-      pRes[rightIndex].pRes[res] = pRes[rightIndex].pRes[j++];
-
-      res++;
-    } else if (ret < 0) {
-      i++;
-    } else {
-      j++;
-    }
-  }
-
-  pRes[leftIndex].num = res;
-  pRes[rightIndex].num = res;
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/**
- * convert the result pointer to STabObj instead of tSkipListNode
- * @param pRes
- */
-static void tansformQueryResult(tQueryResultset* pRes) {
-  if (pRes == NULL || pRes->num == 0) {
-    return;
-  }
-
-  for (int32_t i = 0; i < pRes->num; ++i) {
-    pRes->pRes[i] = ((tSkipListNode*)(pRes->pRes[i]))->pData;
-  }
-}
-
-static tQueryResultset* doNestedLoopIntersect(tQueryResultset* pRes1, tQueryResultset* pRes2) {
-  int32_t num = 0;
-  void**  pResult = pRes1->pRes;
-
-  for (int32_t i = 0; i < pRes1->num; ++i) {
-    for (int32_t j = 0; j < pRes2->num; ++j) {
-      if (pRes1->pRes[i] == pRes2->pRes[j]) {
-        pResult[num++] = pRes1->pRes[i];
-        break;
-      }
-    }
-  }
-
-  tQueryResultClean(pRes2);
-
-  memset(pRes1->pRes + num, 0, sizeof(void*) * (pRes1->num - num));
-  pRes1->num = num;
-
-  return pRes1;
-}
-
-static tQueryResultset* doSortIntersect(tQueryResultset* pRes1, tQueryResultset* pRes2) {
-  size_t sizePtr = sizeof(void *);
-  
-  qsort(pRes1->pRes, pRes1->num, sizePtr, tabObjPointerComparator);
-  qsort(pRes2->pRes, pRes2->num, sizePtr, tabObjPointerComparator);
-  
-  int32_t i = 0;
-  int32_t j = 0;
-
-  int32_t num = 0;
-  while (i < pRes1->num && j < pRes2->num) {
-    if (pRes1->pRes[i] == pRes2->pRes[j]) {
-      j++;
-      pRes1->pRes[num++] = pRes1->pRes[i++];
-    } else if (pRes1->pRes[i] < pRes2->pRes[j]) {
-      i++;
-    } else {
-      j++;
-    }
-  }
-
-  tQueryResultClean(pRes2);
-
-  memset(pRes1->pRes + num, 0, sizeof(void*) * (pRes1->num - num));
-  pRes1->num = num;
-  return pRes1;
-}
-
-static void queryResultIntersect(tQueryResultset* pFinalRes, tQueryResultset* pRes) {
-  const int32_t NUM_OF_RES_THRESHOLD = 20;
-
-  // for small result, use nested loop join
-  if (pFinalRes->num <= NUM_OF_RES_THRESHOLD && pRes->num <= NUM_OF_RES_THRESHOLD) {
-    doNestedLoopIntersect(pFinalRes, pRes);
-  } else {  // for larger result, sort merge is employed
-    doSortIntersect(pFinalRes, pRes);
-  }
-}
-
-static void queryResultUnion(tQueryResultset* pFinalRes, tQueryResultset* pRes) {
-  if (pRes->num == 0) {
-    tQueryResultClean(pRes);
-    return;
-  }
-
-  int32_t total = pFinalRes->num + pRes->num;
-  void*   tmp = realloc(pFinalRes->pRes, total * POINTER_BYTES);
-  if (tmp == NULL) {
-    return;
-  }
-  pFinalRes->pRes = tmp;
-
-  memcpy(&pFinalRes->pRes[pFinalRes->num], pRes->pRes, POINTER_BYTES * pRes->num);
-  qsort(pFinalRes->pRes, total, POINTER_BYTES, tabObjPointerComparator);
-
-  int32_t num = 1;
-  for (int32_t i = 1; i < total; ++i) {
-    if (pFinalRes->pRes[i] != pFinalRes->pRes[i - 1]) {
-      pFinalRes->pRes[num++] = pFinalRes->pRes[i];
-    }
-  }
-
-  if (num < total) {
-    memset(&pFinalRes->pRes[num], 0, POINTER_BYTES * (total - num));
-  }
-
-  pFinalRes->num = num;
-
-  tQueryResultClean(pRes);
-}
-
-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;
-
-  int32_t ret = patternMatch(pattern, str, strlen(str), &pInfo);
-
-  return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
-}
-
-static int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {
-  SPatternCompareInfo pInfo = {'%', '_'};
-
-  const wchar_t* pattern = pRight;
-  const wchar_t* str = pLeft;
-
-  int32_t ret = WCSPatternMatch(pattern, str, wcslen(str), &pInfo);
-
-  return (ret == TSDB_PATTERN_MATCH) ? 0 : 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;
-}
-
-static void getTagColumnInfo(SSyntaxTreeFilterSupporter* pSupporter, SSchema* pSchema, int32_t* index,
-                             int32_t* offset) {
-  *index = 0;
-  *offset = 0;
-
-  // filter on table name(TBNAME)
-  if (strcasecmp(pSchema->name, TSQL_TBNAME_L) == 0) {
-    *index = TSDB_TBNAME_COLUMN_INDEX;
-    *offset = TSDB_TBNAME_COLUMN_INDEX;
-    return;
-  }
-
-  while ((*index) < pSupporter->numOfTags) {
-    if (pSupporter->pTagSchema[*index].bytes == pSchema->bytes &&
-        pSupporter->pTagSchema[*index].type == pSchema->type &&
-        strcmp(pSupporter->pTagSchema[*index].name, pSchema->name) == 0) {
-      break;
-    } else {
-      (*offset) += pSupporter->pTagSchema[(*index)++].bytes;
-    }
-  }
-}
-
-void filterPrepare(void* expr, void* param) {
-  tSQLBinaryExpr *pExpr = (tSQLBinaryExpr*) expr;
-  if (pExpr->info != NULL) {
-    return;
-  }
-
-  int32_t i = 0, offset = 0;
-  pExpr->info = calloc(1, sizeof(tQueryInfo));
-
-  tQueryInfo*                 pInfo = pExpr->info;
-  SSyntaxTreeFilterSupporter* pSupporter = (SSyntaxTreeFilterSupporter*)param;
-
-  tVariant* pCond = pExpr->pRight->pVal;
-  SSchema*  pSchema = pExpr->pLeft->pSchema;
-
-  getTagColumnInfo(pSupporter, pSchema, &i, &offset);
-  assert((i >= 0 && i < TSDB_MAX_TAGS) || (i == TSDB_TBNAME_COLUMN_INDEX));
-  assert((offset >= 0 && offset < TSDB_MAX_TAGS_LEN) || (offset == TSDB_TBNAME_COLUMN_INDEX));
-
-  pInfo->sch = *pSchema;
-  pInfo->colIdx = i;
-  pInfo->optr = pExpr->nSQLBinaryOptr;
-  pInfo->offset = offset;
-  pInfo->compare = getFilterComparator(pSchema->type, pCond->nType, pInfo->optr);
-
-  tVariantAssign(&pInfo->q, pCond);
-  tVariantTypeSetType(&pInfo->q, pInfo->sch.type);
-}
-
-void tSQLListTraverseDestroyInfo(void* param) {
-  if (param == NULL) {
-    return;
-  }
-
-  tQueryInfo* pInfo = (tQueryInfo*)param;
-  tVariantDestroy(&(pInfo->q));
-  free(param);
-}
-
-static int32_t mgmtFilterMeterByIndex(STabObj* pMetric, tQueryResultset* pRes, char* pCond, int32_t condLen) {
-  SSchema* pTagSchema = (SSchema*)(pMetric->schema + pMetric->numOfColumns * sizeof(SSchema));
-
-  tSQLBinaryExpr* pExpr = NULL;
-  tSQLBinaryExprFromString(&pExpr, pTagSchema, pMetric->numOfTags, pCond, condLen);
-
-  // failed to build expression, no result, return immediately
-  if (pExpr == NULL) {
-    mError("metric:%s, no result returned, error in super table query expression:%s", pMetric->meterId, pCond);
-    tfree(pCond);
-
-    return TSDB_CODE_OPS_NOT_SUPPORT;
-  } else {  // query according to the binary expression
-    SSyntaxTreeFilterSupporter s = {.pTagSchema = pTagSchema, .numOfTags = pMetric->numOfTags};
-    SBinaryFilterSupp          supp = {.fp = (__result_filter_fn_t)tSkipListNodeFilterCallback,
-                                       .setupInfoFn = (__do_filter_suppl_fn_t)filterPrepare,
-                                       .pExtInfo = &s};
-
-    tSQLBinaryExprTraverse(pExpr, pMetric->pSkipList, pRes, &supp);
-    tSQLBinaryExprDestroy(&pExpr, tSQLListTraverseDestroyInfo);
-  }
-
-  tansformQueryResult(pRes);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int mgmtRetrieveMetersFromMetric(SMetricMetaMsg* pMsg, int32_t tableIndex, tQueryResultset* pRes) {
-  SMetricMetaElemMsg* pElem = (SMetricMetaElemMsg*)((char*)pMsg + pMsg->metaElem[tableIndex]);
-  STabObj*            pMetric = mgmtGetMeter(pElem->meterId);
-  char*               pCond = NULL;
-  char*               tmpTableNameCond = NULL;
-
-  // no table created in accordance with this metric.
-  if (pMetric->pSkipList == NULL || pMetric->pSkipList->nSize == 0) {
-    assert(pMetric->numOfMeters == 0);
-    return TSDB_CODE_SUCCESS;
-  }
-
-  char*   pQueryCond = (char*)pMsg + pElem->cond;
-  int32_t condLen = pElem->condLen;
-
-  // transfer the unicode string to mbs binary expression
-  if (condLen > 0) {
-    pCond = calloc(1, (condLen + 1) * TSDB_NCHAR_SIZE);
-
-    taosUcs4ToMbs(pQueryCond, condLen * TSDB_NCHAR_SIZE, pCond);
-    condLen = strlen(pCond) + 1;
-    mTrace("metric:%s len:%d, metric query condition:%s", pMetric->meterId, condLen, pCond);
-  }
-
-  char* tablenameCond = (char*)pMsg + pElem->tableCond;
-
-  if (pElem->tableCondLen > 0) {
-    tmpTableNameCond = calloc(1, pElem->tableCondLen + 1);
-    strncpy(tmpTableNameCond, tablenameCond, pElem->tableCondLen);
-
-    mTrace("metric:%s rel:%d, len:%d, table name cond:%s", pMetric->meterId, pElem->rel, pElem->tableCondLen,
-           tmpTableNameCond);
-  }
-
-  if (pElem->tableCondLen > 0 || condLen > 0) {
-    mgmtFilterByTableNameCond(pRes, tmpTableNameCond, pElem->tableCondLen, pMetric);
-
-    bool noNextCal = (pRes->num == 0 && pElem->rel == TSDB_RELATION_AND);  // no need to calculate next result
-
-    if (!noNextCal && condLen > 0) {
-      tQueryResultset filterRes = {0};
-
-      int32_t ret = mgmtFilterMeterByIndex(pMetric, &filterRes, pCond, condLen);
-      if (ret != TSDB_CODE_SUCCESS) {
-        tfree(pCond);
-        tfree(tmpTableNameCond);
-
-        return ret;
-      }
-
-      // union or intersect of two results
-      assert(pElem->rel == TSDB_RELATION_AND || pElem->rel == TSDB_RELATION_OR);
-
-      if (pElem->rel == TSDB_RELATION_AND) {
-        if (filterRes.num == 0 || pRes->num == 0) {  // intersect two sets
-          tQueryResultClean(pRes);
-        } else {
-          queryResultIntersect(pRes, &filterRes);
-        }
-      } else {  // union two sets
-        queryResultUnion(pRes, &filterRes);
-      }
-
-      tQueryResultClean(&filterRes);
-    }
-  } else {
-    mTrace("metric:%s retrieve all meter, no query condition", pMetric->meterId);
-    pRes->num = tSkipListIterateList(pMetric->pSkipList, (tSkipListNode***)&pRes->pRes, NULL, NULL);
-    tansformQueryResult(pRes);
-  }
-
-  tfree(pCond);
-  tfree(tmpTableNameCond);
-
-  mTrace("metric:%s numOfRes:%d", pMetric->meterId, pRes->num);
-  return TSDB_CODE_SUCCESS;
-}
-
-// todo refactor!!!!!
-static char* getTagValueFromMeter(STabObj* pMeter, int32_t offset, int32_t len, char* param) {
-  if (offset == TSDB_TBNAME_COLUMN_INDEX) {
-    extractTableName(pMeter->meterId, param);
-  } else {
-    char* tags = pMeter->pTagData + offset + TSDB_METER_ID_LEN;  // tag start position
-    memcpy(param, tags, len);  // make sure the value is null-terminated string
-  }
-  
-  return param;
-}
-
-bool tSkipListNodeFilterCallback(const void* pNode, void* param) {
-  
-  tQueryInfo* pInfo = (tQueryInfo*)param;
-  STabObj*    pMeter = (STabObj*)(((tSkipListNode*)pNode)->pData);
-
-  char   buf[TSDB_MAX_TAGS_LEN] = {0};
-  
-  char*  val = getTagValueFromMeter(pMeter, pInfo->offset, pInfo->sch.bytes, buf);
-  int8_t type = pInfo->sch.type;
-
-  int32_t ret = 0;
-  if (pInfo->q.nType == TSDB_DATA_TYPE_BINARY || pInfo->q.nType == TSDB_DATA_TYPE_NCHAR) {
-    ret = pInfo->compare(val, pInfo->q.pz);
-  } else {
-    tVariant t = {0};
-    tVariantCreateFromBinary(&t, val, (uint32_t) pInfo->sch.bytes, type);
-
-    ret = pInfo->compare(&t.i64Key, &pInfo->q.i64Key);
-  }
-
-  switch (pInfo->optr) {
-    case TSDB_RELATION_EQUAL: {
-      return ret == 0;
-    }
-    case TSDB_RELATION_NOT_EQUAL: {
-      return ret != 0;
-    }
-    case TSDB_RELATION_LARGE_EQUAL: {
-      return ret >= 0;
-    }
-    case TSDB_RELATION_LARGE: {
-      return ret > 0;
-    }
-    case TSDB_RELATION_LESS_EQUAL: {
-      return ret <= 0;
-    }
-    case TSDB_RELATION_LESS: {
-      return ret < 0;
-    }
-    case TSDB_RELATION_LIKE: {
-      return ret == 0;
-    }
-
-    default:
-      assert(false);
-  }
-  return true;
-}
diff --git a/src/system/detail/src/mgmtSystem.c b/src/system/detail/src/mgmtSystem.c
deleted file mode 100644
index 375e100a83668f0288fb25fc05f689b3e52b0c91..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtSystem.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "tsdb.h"
-#include "mgmtSystem.h"
-
-// global, not configurable
-char               mgmtDirectory[128];
-void *             mgmtTmr;
-void *             mgmtQhandle = NULL;
-void *             mgmtTranQhandle = NULL;
-void *             mgmtStatisticTimer = NULL;
-int                mgmtShellConns = 0;
-int                mgmtDnodeConns = 0;
-extern void *      pShellConn;
-extern void **     rpcQhandle;
-extern SMgmtIpList mgmtIpList;
-extern SMgmtIpList mgmtPublicIpList;
-extern char        mgmtIpStr[TSDB_MAX_MGMT_IPS][20];
-extern void *      acctSdb;
-
-void mgmtCleanUpSystem() {
-  if (tsModuleStatus & (1 << TSDB_MOD_MGMT)) {
-    mTrace("mgmt is running, clean it up");
-    taosTmrStopA(&mgmtStatisticTimer);
-    sdbCleanUpPeers();
-    mgmtCleanupBalance();
-    mgmtCleanUpDnodeInt();
-    mgmtCleanUpShell();
-    mgmtCleanUpMeters();
-    mgmtCleanUpVgroups();
-    mgmtCleanUpDbs();
-    mgmtCleanUpDnodes();
-    mgmtCleanUpUsers();
-    mgmtCleanUpAccts();
-    taosTmrCleanUp(mgmtTmr);
-    taosCleanUpScheduler(mgmtQhandle);
-    taosCleanUpScheduler(mgmtTranQhandle);
-  } else {
-    mgmtCleanUpRedirect();
-  }
-
-  mgmtTmr = NULL;
-  mgmtQhandle = NULL;
-  mgmtShellConns = 0;
-  mgmtDnodeConns = 0;
-  tclearModuleStatus(TSDB_MOD_MGMT);
-  pShellConn = NULL;
-
-  mTrace("mgmt is cleaned up");
-}
-
-int mgmtStartSystem() {
-  mPrint("starting to initialize TDengine mgmt ...");
-
-  struct stat dirstat;
-  if (stat(mgmtDirectory, &dirstat) < 0) {
-    mkdir(mgmtDirectory, 0755);
-  }
-
-  if (mgmtStartCheckMgmtRunning() != 0) {
-    mPrint("TDengine mgmt module already started...");
-    return 0;
-  }
-
-  int numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore / 2.0;
-  if (numOfThreads < 1) numOfThreads = 1;
-  mgmtQhandle = taosInitScheduler(tsMaxDnodes + tsMaxShellConns, numOfThreads, "mnode");
-
-  mgmtTranQhandle = taosInitScheduler(tsMaxDnodes + tsMaxShellConns, 1, "mnodeT");
-
-  mgmtTmr = taosTmrInit((tsMaxDnodes + tsMaxShellConns) * 3, 200, 3600000, "MND");
-  if (mgmtTmr == NULL) {
-    mError("failed to init timer, exit");
-    return -1;
-  }
-
-  if (mgmtInitAccts() < 0) {
-    mError("failed to init accts");
-    return -1;
-  }
-
-  if (mgmtInitUsers() < 0) {
-    mError("failed to init users");
-    return -1;
-  }
-
-  if (mgmtInitDnodes() < 0) {
-    mError("failed to init dnodes");
-    return -1;
-  }
-
-  if (mgmtInitDbs() < 0) {
-    mError("failed to init dbs");
-    return -1;
-  }
-
-  if (mgmtInitVgroups() < 0) {
-    mError("failed to init vgroups");
-    return -1;
-  }
-
-  if (mgmtInitMeters() < 0) {
-    mError("failed to init meters");
-    return -1;
-  }
-
-  if (mgmtInitDnodeInt() < 0) {
-    mError("failed to init inter-mgmt communication");
-    return -1;
-  }
-
-  if (mgmtInitShell() < 0) {
-    mError("failed to init shell");
-    return -1;
-  }
-
-  if (sdbInitPeers(mgmtDirectory) < 0) {
-    mError("failed to init peers");
-    return -1;
-  }
-
-  if (mgmtInitBalance() < 0) {
-    mError("failed to init dnode balance")
-  }
-
-  mgmtCheckAcct();
-
-  taosTmrReset(mgmtDoStatistic, tsStatusInterval * 30000, NULL, mgmtTmr, &mgmtStatisticTimer);
-
-  mgmtStartMgmtTimer();
-
-  mPrint("TDengine mgmt is initialized successfully");
-
-  return 0;
-}
diff --git a/src/system/detail/src/mgmtUser.c b/src/system/detail/src/mgmtUser.c
deleted file mode 100644
index 89b83e3553f26a3d2cc755709086d8f5c4fa7f3f..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtUser.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "tschemautil.h"
-#include "ttime.h"
-
-void *userSdb = NULL;
-int   tsUserUpdateSize;
-
-void *(*mgmtUserActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionInsert(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionDelete(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionEncode(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionDecode(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionAfterBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionReset(void *row, char *str, int size, int *ssize);
-void *mgmtUserActionDestroy(void *row, char *str, int size, int *ssize);
-
-SAcctObj *mgmtGetAcct(char *name);
-void mgmtCreateRootAcct();
-int mgmtCheckUserLimit(SAcctObj *pAcct);
-int mgmtCheckUserGrant();
-
-void mgmtUserActionInit() {
-  mgmtUserActionFp[SDB_TYPE_INSERT] = mgmtUserActionInsert;
-  mgmtUserActionFp[SDB_TYPE_DELETE] = mgmtUserActionDelete;
-  mgmtUserActionFp[SDB_TYPE_UPDATE] = mgmtUserActionUpdate;
-  mgmtUserActionFp[SDB_TYPE_ENCODE] = mgmtUserActionEncode;
-  mgmtUserActionFp[SDB_TYPE_DECODE] = mgmtUserActionDecode;
-  mgmtUserActionFp[SDB_TYPE_BEFORE_BATCH_UPDATE] = mgmtUserActionBeforeBatchUpdate;
-  mgmtUserActionFp[SDB_TYPE_BATCH_UPDATE] = mgmtUserActionBatchUpdate;
-  mgmtUserActionFp[SDB_TYPE_AFTER_BATCH_UPDATE] = mgmtUserActionAfterBatchUpdate;
-  mgmtUserActionFp[SDB_TYPE_RESET] = mgmtUserActionReset;
-  mgmtUserActionFp[SDB_TYPE_DESTROY] = mgmtUserActionDestroy;
-}
-
-void *mgmtUserAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtUserActionFp[(uint8_t)action] != NULL) {
-    return (*(mgmtUserActionFp[(uint8_t)action]))(row, str, size, ssize);
-  }
-  return NULL;
-}
-
-int mgmtInitUsers() {
-  void *    pNode = NULL;
-  SUserObj *pUser = NULL;
-  SAcctObj *pAcct = NULL;
-  int       numOfUsers = 0;
-
-  mgmtUserActionInit();
-
-  userSdb = sdbOpenTable(tsMaxUsers, sizeof(SUserObj), "user", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtUserAction);
-  if (userSdb == NULL) {
-    mError("failed to init user data");
-    return -1;
-  }
-
-  mgmtCreateRootAcct();
-
-  while (1) {
-    pNode = sdbFetchRow(userSdb, pNode, (void **)&pUser);
-    if (pUser == NULL) break;
-
-    pUser->prev = NULL;
-    pUser->next = NULL;
-
-    pAcct = mgmtGetAcct(pUser->acct);
-    mgmtAddUserIntoAcct(pAcct, pUser);
-
-    numOfUsers++;
-  }
-
-  SUserObj tObj;
-  tsUserUpdateSize = tObj.updateEnd - (char *)&tObj;
-
-  mTrace("user data is initialized");
-  return 0;
-}
-
-SUserObj *mgmtGetUser(char *name) { return (SUserObj *)sdbGetRow(userSdb, name); }
-
-int mgmtUpdateUser(SUserObj *pUser) { return sdbUpdateRow(userSdb, pUser, 0, 1); }
-
-int mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass) {
-  SUserObj *pUser;
-  int code;
-
-  code = mgmtCheckUserLimit(pAcct);
-  if (code != 0) {
-    return code;
-  }
-
-  pUser = (SUserObj *)sdbGetRow(userSdb, name);
-  if (pUser != NULL) {
-    mWarn("user:%s is already there", name);
-    return TSDB_CODE_USER_ALREADY_EXIST;
-  }
-
-  code = mgmtCheckUserGrant();
-  if (code != 0) {
-    return code;
-  }
-
-  pUser = malloc(sizeof(SUserObj));
-  memset(pUser, 0, sizeof(SUserObj));
-  strcpy(pUser->user, name);
-  taosEncryptPass((uint8_t*) pass, strlen(pass), pUser->pass);
-  strcpy(pUser->acct, pAcct->user);
-  pUser->createdTime = taosGetTimestampMs();
-  pUser->superAuth = 0;
-  pUser->writeAuth = 1;
-  if (strcmp(pUser->user, "root") == 0 || strcmp(pUser->user, pUser->acct) == 0) {
-    pUser->superAuth = 1;
-  }
-
-  code = TSDB_CODE_SUCCESS;
-  if (sdbInsertRow(userSdb, pUser, 0) < 0) {
-    tfree(pUser);
-    code = TSDB_CODE_SDB_ERROR;
-  }
-
-  //  mgmtAddUserIntoAcct(pAcct, pUser);
-
-  return code;
-}
-
-int mgmtDropUser(SAcctObj *pAcct, char *name) {
-  SUserObj *pUser;
-
-  pUser = (SUserObj *)sdbGetRow(userSdb, name);
-  if (pUser == NULL) {
-    mWarn("user:%s is not there", name);
-    return TSDB_CODE_INVALID_USER;
-  }
-
-  if (strcmp(pAcct->user, pUser->acct) != 0) return TSDB_CODE_NO_RIGHTS;
-
-  //  mgmtRemoveUserFromAcct(pAcct, pUser);
-  sdbDeleteRow(userSdb, pUser);
-
-  return 0;
-}
-
-void mgmtCleanUpUsers() { sdbCloseTable(userSdb); }
-
-int mgmtGetUserMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int      cols = 0;
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = TSDB_USER_LEN;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "name");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 6;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "privilege");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 8;
-  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-  strcpy(pSchema[cols].name, "created time");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  //  pShow->numOfRows = sdbGetNumOfRows (userSdb);
-  pShow->numOfRows = pConn->pAcct->acctInfo.numOfUsers;
-  pShow->pNode = pConn->pAcct->pUser;
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  return 0;
-}
-
-int mgmtRetrieveUsers(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int       numOfRows = 0;
-  SUserObj *pUser = NULL;
-  char *    pWrite;
-  int       cols = 0;
-
-  while (numOfRows < rows) {
-    //    pShow->pNode = sdbFetchRow(userSdb, pShow->pNode, (void **)&pUser);
-    pUser = (SUserObj *)pShow->pNode;
-    if (pUser == NULL) break;
-    pShow->pNode = (void *)pUser->next;
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, pUser->user);
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    if (pUser->superAuth) {
-      strcpy(pWrite, "super");
-    } else if (pUser->writeAuth) {
-      strcpy(pWrite, "write");
-    } else {
-      strcpy(pWrite, "read");
-    }
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pUser->createdTime;
-    cols++;
-
-    numOfRows++;
-  }
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-void *mgmtUserActionInsert(void *row, char *str, int size, int *ssize) {
-  SUserObj *pUser = (SUserObj *)row;
-  SAcctObj *pAcct = mgmtGetAcct(pUser->acct);
-  mgmtAddUserIntoAcct(pAcct, pUser);
-
-  return NULL;
-}
-void *mgmtUserActionDelete(void *row, char *str, int size, int *ssize) {
-  SUserObj *pUser = (SUserObj *)row;
-  SAcctObj *pAcct = mgmtGetAcct(pUser->acct);
-  mgmtRemoveUserFromAcct(pAcct, pUser);
-
-  return NULL;
-}
-void *mgmtUserActionUpdate(void *row, char *str, int size, int *ssize) {
-  return mgmtUserActionReset(row, str, size, ssize);
-}
-void *mgmtUserActionEncode(void *row, char *str, int size, int *ssize) {
-  SUserObj *pUser = (SUserObj *)row;
-  int       tsize = pUser->updateEnd - (char *)pUser;
-  if (size < tsize) {
-    *ssize = -1;
-  } else {
-    memcpy(str, pUser, tsize);
-    *ssize = tsize;
-  }
-  return NULL;
-}
-void *mgmtUserActionDecode(void *row, char *str, int size, int *ssize) {
-  SUserObj *pUser = (SUserObj *)malloc(sizeof(SUserObj));
-  if (pUser == NULL) return NULL;
-  memset(pUser, 0, sizeof(SUserObj));
-
-  int tsize = pUser->updateEnd - (char *)pUser;
-  memcpy(pUser, str, tsize);
-  return (void *)pUser;
-}
-void *mgmtUserActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtUserActionBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtUserActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtUserActionReset(void *row, char *str, int size, int *ssize) {
-  SUserObj *pUser = (SUserObj *)row;
-  int       tsize = pUser->updateEnd - (char *)pUser;
-  memcpy(pUser, str, tsize);
-
-  return NULL;
-}
-
-void *mgmtUserActionDestroy(void *row, char *str, int size, int *ssize) {
-  tfree(row);
-  return NULL;
-}
diff --git a/src/system/detail/src/mgmtUtil.c b/src/system/detail/src/mgmtUtil.c
deleted file mode 100644
index 98978767ce73b957a12bebbc945f606bad8ec086..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtUtil.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "mgmtUtil.h"
-#include "textbuffer.h"
-#include "tschemautil.h"
-#include "tsqlfunction.h"
-#include "vnodeTagMgmt.h"
-
-extern int cksumsize;
-
-uint64_t mgmtGetCheckSum(FILE* fp, int offset) {
-  uint64_t checksum = 0;
-  uint64_t data;
-  int      bytes;
-
-  while (1) {
-    data = 0;
-    bytes = fread(&data, sizeof(data), 1, fp);
-
-    if (bytes != sizeof(data)) break;
-
-    checksum += data;
-  }
-
-  return checksum;
-}
-
-bool mgmtMeterCreateFromMetric(STabObj* pMeterObj) { return pMeterObj->meterType == TSDB_METER_MTABLE; }
-
-bool mgmtIsMetric(STabObj* pMeterObj) { return pMeterObj->meterType == TSDB_METER_METRIC; }
-
-bool mgmtIsNormalMeter(STabObj* pMeterObj) { return !mgmtIsMetric(pMeterObj); }
-
-/**
- * TODO: the tag offset value should be kept in memory to avoid dynamically calculating the value
- *
- * @param pMeter
- * @param col
- * @param pTagColSchema
- * @return
- */
-char* mgmtMeterGetTag(STabObj* pMeter, int32_t col, SSchema* pTagColSchema) {
-  if (!mgmtMeterCreateFromMetric(pMeter)) {
-    return NULL;
-  }
-
-  STabObj* pMetric = mgmtGetMeter(pMeter->pTagData);
-  int32_t  offset = mgmtGetTagsLength(pMetric, col) + TSDB_METER_ID_LEN;
-  assert(offset > 0);
-
-  if (pTagColSchema != NULL) {
-    *pTagColSchema = ((SSchema*)pMetric->schema)[pMetric->numOfColumns + col];
-  }
-
-  return (pMeter->pTagData + offset);
-}
-
-int32_t mgmtGetTagsLength(STabObj* pMetric, int32_t col) {  // length before column col
-  assert(mgmtIsMetric(pMetric) && col >= 0);
-
-  int32_t len = 0;
-  int32_t tagColumnIndexOffset = pMetric->numOfColumns;
-
-  for (int32_t i = 0; i < pMetric->numOfTags && i < col; ++i) {
-    len += ((SSchema*)pMetric->schema)[tagColumnIndexOffset + i].bytes;
-  }
-
-  return len;
-}
-
-bool mgmtCheckIsMonitorDB(char *db, char *monitordb) {
-  char dbName[TSDB_DB_NAME_LEN + 1] = {0};
-  extractDBName(db, dbName);
-
-  size_t len = strlen(dbName);
-  return (strncasecmp(dbName, monitordb, len) == 0 && len == strlen(monitordb));
-}
-
-int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate) {
-  if (pCreate->commitLog < 0 || pCreate->commitLog > 1) {
-    mError("invalid db option commitLog: %d, only 0 or 1 allowed", pCreate->commitLog);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->replications < TSDB_REPLICA_MIN_NUM || pCreate->replications > TSDB_REPLICA_MAX_NUM) {
-    mError("invalid db option replications: %d valid range: [%d, %d]", pCreate->replications, TSDB_REPLICA_MIN_NUM,
-           TSDB_REPLICA_MAX_NUM);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->daysPerFile < TSDB_FILE_MIN_PARTITION_RANGE || pCreate->daysPerFile > TSDB_FILE_MAX_PARTITION_RANGE) {
-    mError("invalid db option daysPerFile: %d valid range: [%d, %d]", pCreate->daysPerFile, TSDB_FILE_MIN_PARTITION_RANGE,
-           TSDB_FILE_MAX_PARTITION_RANGE);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->daysToKeep1 > pCreate->daysToKeep2 || pCreate->daysToKeep2 > pCreate->daysToKeep) {
-    mError("invalid db option daystokeep1: %d, daystokeep2: %d, daystokeep: %d", pCreate->daysToKeep1,
-           pCreate->daysToKeep2, pCreate->daysToKeep);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->daysToKeep1 < TSDB_FILE_MIN_PARTITION_RANGE || pCreate->daysToKeep1 < pCreate->daysPerFile) {
-    mError("invalid db option daystokeep: %d", pCreate->daysToKeep);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->rowsInFileBlock < TSDB_MIN_ROWS_IN_FILEBLOCK || pCreate->rowsInFileBlock > TSDB_MAX_ROWS_IN_FILEBLOCK) {
-    mError("invalid db option rowsInFileBlock: %d valid range: [%d, %d]", pCreate->rowsInFileBlock,
-           TSDB_MIN_ROWS_IN_FILEBLOCK, TSDB_MAX_ROWS_IN_FILEBLOCK);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->cacheBlockSize < TSDB_MIN_CACHE_BLOCK_SIZE || pCreate->cacheBlockSize > TSDB_MAX_CACHE_BLOCK_SIZE) {
-    mError("invalid db option cacheBlockSize: %d valid range: [%d, %d]", pCreate->cacheBlockSize,
-           TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MAX_CACHE_BLOCK_SIZE);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->maxSessions < TSDB_MIN_TABLES_PER_VNODE || pCreate->maxSessions > TSDB_MAX_TABLES_PER_VNODE) {
-    mError("invalid db option maxSessions: %d valid range: [%d, %d]", pCreate->maxSessions, TSDB_MIN_TABLES_PER_VNODE,
-           TSDB_MAX_TABLES_PER_VNODE);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->precision != TSDB_TIME_PRECISION_MILLI && pCreate->precision != TSDB_TIME_PRECISION_MICRO) {
-    mError("invalid db option timePrecision: %d valid value: [%d, %d]", pCreate->precision, TSDB_TIME_PRECISION_MILLI,
-           TSDB_TIME_PRECISION_MICRO);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->cacheNumOfBlocks.fraction < TSDB_MIN_AVG_BLOCKS || pCreate->cacheNumOfBlocks.fraction > TSDB_MAX_AVG_BLOCKS) {
-    mError("invalid db option ablocks: %f valid value: [%d, %d]", pCreate->cacheNumOfBlocks.fraction, 0, TSDB_MAX_AVG_BLOCKS);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->commitTime < TSDB_MIN_COMMIT_TIME_INTERVAL || pCreate->commitTime > TSDB_MAX_COMMIT_TIME_INTERVAL) {
-    mError("invalid db option commitTime: %d valid range: [%d, %d]", pCreate->commitTime, TSDB_MIN_COMMIT_TIME_INTERVAL,
-           TSDB_MAX_COMMIT_TIME_INTERVAL);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  if (pCreate->compression < TSDB_MIN_COMPRESSION_LEVEL || pCreate->compression > TSDB_MAX_COMPRESSION_LEVEL) {
-    mError("invalid db option compression: %d valid range: [%d, %d]", pCreate->compression, TSDB_MIN_COMPRESSION_LEVEL,
-           TSDB_MAX_COMPRESSION_LEVEL);
-    return TSDB_CODE_INVALID_OPTION;
-  }
-  
-  return TSDB_CODE_SUCCESS;
-}
diff --git a/src/system/detail/src/mgmtVgroup.c b/src/system/detail/src/mgmtVgroup.c
deleted file mode 100644
index 15a5fe808b44c5cc3f94f06bb691a11aa8998122..0000000000000000000000000000000000000000
--- a/src/system/detail/src/mgmtVgroup.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "mgmt.h"
-#include "tschemautil.h"
-#include "tlog.h"
-#include "vnodeStatus.h"
-
-void *       vgSdb = NULL;
-int          tsVgUpdateSize;
-extern void *dbSdb;
-extern void *acctSdb;
-extern void *userSdb;
-extern void *dnodeSdb;
-
-void *(*mgmtVgroupActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionInsert(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionDelete(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionEncode(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionDecode(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionAfterBatchUpdate(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize);
-void *mgmtVgroupActionDestroy(void *row, char *str, int size, int *ssize);
-bool mgmtCheckVnodeReady(SDnodeObj *pDnode, SVgObj *pVgroup, SVnodeGid *pVnode);
-char *mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode);
-
-void mgmtVgroupActionInit() {
-  mgmtVgroupActionFp[SDB_TYPE_INSERT] = mgmtVgroupActionInsert;
-  mgmtVgroupActionFp[SDB_TYPE_DELETE] = mgmtVgroupActionDelete;
-  mgmtVgroupActionFp[SDB_TYPE_UPDATE] = mgmtVgroupActionUpdate;
-  mgmtVgroupActionFp[SDB_TYPE_ENCODE] = mgmtVgroupActionEncode;
-  mgmtVgroupActionFp[SDB_TYPE_DECODE] = mgmtVgroupActionDecode;
-  mgmtVgroupActionFp[SDB_TYPE_BEFORE_BATCH_UPDATE] = mgmtVgroupActionBeforeBatchUpdate;
-  mgmtVgroupActionFp[SDB_TYPE_BATCH_UPDATE] = mgmtVgroupActionBatchUpdate;
-  mgmtVgroupActionFp[SDB_TYPE_AFTER_BATCH_UPDATE] = mgmtVgroupActionAfterBatchUpdate;
-  mgmtVgroupActionFp[SDB_TYPE_RESET] = mgmtVgroupActionReset;
-  mgmtVgroupActionFp[SDB_TYPE_DESTROY] = mgmtVgroupActionDestroy;
-}
-
-void *mgmtVgroupAction(char action, void *row, char *str, int size, int *ssize) {
-  if (mgmtVgroupActionFp[(uint8_t)action] != NULL) {
-    return (*(mgmtVgroupActionFp[(uint8_t)action]))(row, str, size, ssize);
-  }
-  return NULL;
-}
-
-int mgmtInitVgroups() {
-  void *  pNode = NULL;
-  SVgObj *pVgroup = NULL;
-
-  mgmtVgroupActionInit();
-
-  SVgObj tObj;
-  tsVgUpdateSize = tObj.updateEnd - (char *)&tObj;
-
-  vgSdb = sdbOpenTable(tsMaxVGroups, sizeof(SVgObj), "vgroups", SDB_KEYTYPE_AUTO, mgmtDirectory, mgmtVgroupAction);
-  if (vgSdb == NULL) {
-    mError("failed to init vgroup data");
-    return -1;
-  }
-
-  while (1) {
-    pNode = sdbFetchRow(vgSdb, pNode, (void **)&pVgroup);
-    if (pVgroup == NULL) break;
-
-    SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
-    if (pDb == NULL) continue;
-
-    pVgroup->prev = NULL;
-    pVgroup->next = NULL;
-    int size = sizeof(STabObj *) * pDb->cfg.maxSessions;
-    pVgroup->meterList = (STabObj **)malloc(size);
-    if (pVgroup->meterList == NULL) {
-      mError("failed to malloc(size:%d) for the meterList of vgroups", size);
-      return -1;
-    }
-    
-    memset(pVgroup->meterList, 0, size);
-
-    pVgroup->idPool = taosInitIdPool(pDb->cfg.maxSessions);
-    if (pVgroup->idPool == NULL) {
-      mError("failed to taosInitIdPool for vgroups");
-      free(pVgroup->meterList);
-      return -1;
-    }
-    
-    taosIdPoolReinit(pVgroup->idPool);
-
-    if (tsIsCluster) {
-      /*
-       * Upgrade from open source version to cluster version for the first time
-       */
-      if (pVgroup->vnodeGid[0].publicIp == 0) {
-        pVgroup->vnodeGid[0].publicIp = inet_addr(tsPublicIp);
-        pVgroup->vnodeGid[0].ip = inet_addr(tsPrivateIp);
-        sdbUpdateRow(vgSdb, pVgroup, tsVgUpdateSize, 1);
-      }
-    }
-
-    mgmtSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes, pVgroup->vgId);
-  }
-
-  mTrace("vgroup is initialized");
-  return 0;
-}
-
-SVgObj *mgmtGetVgroup(int vgId) { return (SVgObj *)sdbGetRow(vgSdb, &vgId); }
-
-void mgmtProcessVgTimer(void *handle, void *tmrId) {
-  SDbObj *pDb = (SDbObj *)handle;
-  if (pDb == NULL) return;
-
-  if (pDb->vgStatus > TSDB_VG_STATUS_IN_PROGRESS) {
-    mTrace("db:%s, set vgroup status from %d to ready", pDb->name, pDb->vgStatus);
-    pDb->vgStatus = TSDB_VG_STATUS_READY;
-  }
-
-  pDb->vgTimer = NULL;
-}
-
-SVgObj *mgmtCreateVgroup(SDbObj *pDb) {
-  SVgObj *pVgroup;
-  int     size;
-
-  size = sizeof(SVgObj);
-  pVgroup = (SVgObj *)malloc(size);
-  memset(pVgroup, 0, size);
-  strcpy(pVgroup->dbName, pDb->name);
-  pVgroup->numOfVnodes = pDb->cfg.replications;
-  pVgroup->createdTime = taosGetTimestampMs();
-
-  // based on load balance, create a new one
-  if (mgmtAllocVnodes(pVgroup) != 0) {
-    mError("db:%s, no enough free dnode to alloc %d vnodes", pDb->name, pVgroup->numOfVnodes);
-    free(pVgroup);
-    pDb->vgStatus = TSDB_VG_STATUS_FULL;
-    taosTmrReset(mgmtProcessVgTimer, 5000, pDb, mgmtTmr, &pDb->vgTimer);
-    return NULL;
-  }
-
-  sdbInsertRow(vgSdb, pVgroup, 0);
-
-  mTrace("vgroup:%d, vgroup is created, db:%s replica:%d", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes);
-  for (int i = 0; i < pVgroup->numOfVnodes; ++i)
-    mTrace("vgroup:%d, dnode:%s vnode:%d is created", pVgroup->vgId, taosIpStr(pVgroup->vnodeGid[i].ip), pVgroup->vnodeGid[i].vnode);
-
-  mgmtSendVPeersMsg(pVgroup);
-
-  return pVgroup;
-}
-
-int mgmtDropVgroup(SDbObj *pDb, SVgObj *pVgroup) {
-  STabObj *pMeter;
-
-  if (pVgroup->numOfMeters > 0) {
-    for (int i = 0; i < pDb->cfg.maxSessions; ++i) {
-      if (pVgroup->meterList != NULL) {
-        pMeter = pVgroup->meterList[i];
-        if (pMeter) mgmtDropMeter(pDb, pMeter->meterId, 0);
-      }
-    }
-  }
-
-  mTrace("vgroup:%d, db:%s replica:%d is deleted", pVgroup->vgId, pDb->name, pVgroup->numOfVnodes);
-  mgmtSendFreeVnodeMsg(pVgroup);
-  sdbDeleteRow(vgSdb, pVgroup);
-
-  return 0;
-}
-
-void mgmtSetVgroupIdPool() {
-  void *  pNode = NULL;
-  SVgObj *pVgroup = NULL;
-  SDbObj *pDb;
-
-  while (1) {
-    pNode = sdbFetchRow(vgSdb, pNode, (void **)&pVgroup);
-    if (pVgroup == NULL || pVgroup->idPool == 0) break;
-
-    taosIdPoolSetFreeList(pVgroup->idPool);
-    pVgroup->numOfMeters = taosIdPoolNumOfUsed(pVgroup->idPool);
-
-    pDb = mgmtGetDb(pVgroup->dbName);
-    pDb->numOfTables += pVgroup->numOfMeters;
-    if (pVgroup->numOfMeters >= pDb->cfg.maxSessions - 1)
-      mgmtAddVgroupIntoDbTail(pDb, pVgroup);
-    else
-      mgmtAddVgroupIntoDb(pDb, pVgroup);
-  }
-}
-
-void mgmtCleanUpVgroups() { sdbCloseTable(vgSdb); }
-
-int mgmtGetVgroupMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
-  int cols = 0;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-
-  if (pDb == NULL) return TSDB_CODE_DB_NOT_SELECTED;
-
-  SSchema *pSchema = tsGetSchema(pMeta);
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "vgId");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "meters");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  pShow->bytes[cols] = 9;
-  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "vgroup status");
-  pSchema[cols].bytes = htons(pShow->bytes[cols]);
-  cols++;
-
-  int      maxReplica = 0;
-  SVgObj  *pVgroup    = NULL;
-  STabObj *pMeter     = NULL;
-  if (pShow->payloadLen > 0 ) {
-    pMeter = mgmtGetMeter(pShow->payload);
-    if (NULL == pMeter) {
-      return TSDB_CODE_INVALID_METER_ID;
-    }
-
-    pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
-    if (NULL == pVgroup) return TSDB_CODE_INVALID_METER_ID;
-    
-    maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
-  } else {
-    SVgObj *pVgroup = pDb->pHead;
-    while (pVgroup != NULL) {
-      maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
-      pVgroup = pVgroup->next;
-    }
-  }
-
-  for (int i = 0; i < maxReplica; ++i) {
-    pShow->bytes[cols] = 16;
-    pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-    strcpy(pSchema[cols].name, "ip");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 2;
-    pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-    strcpy(pSchema[cols].name, "vnode");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 9;
-    pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-    strcpy(pSchema[cols].name, "vnode status");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-
-    pShow->bytes[cols] = 16;
-    pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-    strcpy(pSchema[cols].name, "public ip");
-    pSchema[cols].bytes = htons(pShow->bytes[cols]);
-    cols++;
-  }
-
-  pMeta->numOfColumns = htons(cols);
-  pShow->numOfColumns = cols;
-
-  pShow->offset[0] = 0;
-  for (int i = 1; i < cols; ++i) pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-
-  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-  if (NULL == pMeter) {
-    pShow->numOfRows = pDb->numOfVgroups;
-    pShow->pNode = pDb->pHead;
-  } else {
-    pShow->numOfRows = 1;
-    pShow->pNode = pVgroup;
-  }
-
-  return 0;
-}
-
-int mgmtRetrieveVgroups(SShowObj *pShow, char *data, int rows, SConnObj *pConn) {
-  int     numOfRows = 0;
-  SVgObj *pVgroup = NULL;
-  char *  pWrite;
-  int     cols = 0;
-  char    ipstr[20];
-
-  int maxReplica = 0;
-
-  SDbObj *pDb = NULL;
-  if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
-  assert(pDb != NULL);
-
-  pVgroup = pDb->pHead;
-  while (pVgroup != NULL) {
-    maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
-    pVgroup = pVgroup->next;
-  }
-
-  while (numOfRows < rows) {
-    //    pShow->pNode = sdbFetchRow(vgSdb, pShow->pNode, (void **)&pVgroup);
-    pVgroup = (SVgObj *)pShow->pNode;
-    if (pVgroup == NULL) break;
-    pShow->pNode = (void *)pVgroup->next;
-
-    cols = 0;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pVgroup->vgId;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pVgroup->numOfMeters;
-    cols++;
-
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    strcpy(pWrite, taosGetVgroupLbStatusStr(pVgroup->lbStatus));
-    cols++;
-
-    for (int i = 0; i < maxReplica; ++i) {
-      tinet_ntoa(ipstr, pVgroup->vnodeGid[i].ip);
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      strcpy(pWrite, ipstr);
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      *(int16_t *)pWrite = pVgroup->vnodeGid[i].vnode;
-      cols++;
-
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      if (pVgroup->vnodeGid[i].ip != 0) {
-        char *vnodeStatus = mgmtGetVnodeStatus(pVgroup, pVgroup->vnodeGid + i);
-        strcpy(pWrite, vnodeStatus);
-      } else {
-        strcpy(pWrite, "null");
-      }
-      cols++;
-
-      tinet_ntoa(ipstr, pVgroup->vnodeGid[i].publicIp);
-      pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-      strcpy(pWrite, ipstr);
-      cols++;
-    }
-
-    numOfRows++;
-  }
-
-  pShow->numOfReads += numOfRows;
-  return numOfRows;
-}
-
-void *mgmtVgroupActionInsert(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)row;
-  SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
-
-  if (pDb == NULL) return NULL;
-
-  int tsize = sizeof(STabObj *) * pDb->cfg.maxSessions;
-  pVgroup->meterList = (STabObj **)malloc(tsize);
-  memset(pVgroup->meterList, 0, tsize);
-  pVgroup->numOfMeters = 0;
-  pVgroup->idPool = taosInitIdPool(pDb->cfg.maxSessions);
-  mgmtAddVgroupIntoDb(pDb, pVgroup);
-  mgmtSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes, pVgroup->vgId);
-
-  return NULL;
-}
-
-void *mgmtVgroupActionDelete(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)row;
-  SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
-
-  if (pDb != NULL) mgmtRemoveVgroupFromDb(pDb, pVgroup);
-  mgmtUnSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes);
-  tfree(pVgroup->meterList);
-
-  return NULL;
-}
-
-void *mgmtVgroupActionUpdate(void *row, char *str, int size, int *ssize) {
-  mgmtVgroupActionReset(row, str, size, ssize);
-  SVgObj *pVgroup = (SVgObj *)row;
-  int oldTables = taosIdPoolMaxSize(pVgroup->idPool);
-
-  SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
-  if (pDb != NULL) {
-    if (pDb->cfg.maxSessions != oldTables) {
-      mPrint("vgroup:%d tables change from %d to %d", pVgroup->vgId, oldTables, pDb->cfg.maxSessions);
-      taosUpdateIdPool(pVgroup->idPool, pDb->cfg.maxSessions);
-      int size = sizeof(STabObj *) * pDb->cfg.maxSessions;
-      pVgroup->meterList = (STabObj **)realloc(pVgroup->meterList, size);
-    }
-  }
-
-  mTrace("vgroup:%d update, numOfVnode:%d", pVgroup->vgId, pVgroup->numOfVnodes);
-
-  return NULL;
-}
-void *mgmtVgroupActionEncode(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)row;
-  int     tsize = pVgroup->updateEnd - (char *)pVgroup;
-  if (size < tsize) {
-    *ssize = -1;
-  } else {
-    memcpy(str, pVgroup, tsize);
-    *ssize = tsize;
-  }
-
-  return NULL;
-}
-void *mgmtVgroupActionDecode(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)malloc(sizeof(SVgObj));
-  if (pVgroup == NULL) return NULL;
-  memset(pVgroup, 0, sizeof(SVgObj));
-
-  int tsize = pVgroup->updateEnd - (char *)pVgroup;
-  memcpy(pVgroup, str, tsize);
-
-  return (void *)pVgroup;
-}
-void *mgmtVgroupActionBeforeBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtVgroupActionBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtVgroupActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
-void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)row;
-  int     tsize = pVgroup->updateEnd - (char *)pVgroup;
-
-  memcpy(pVgroup, str, tsize);
-
-  return NULL;
-}
-void *mgmtVgroupActionDestroy(void *row, char *str, int size, int *ssize) {
-  SVgObj *pVgroup = (SVgObj *)row;
-  if (pVgroup->idPool) {
-    taosIdPoolCleanUp(pVgroup->idPool);
-    pVgroup->idPool = NULL;
-  }
-  if (pVgroup->meterList) tfree(pVgroup->meterList);
-  tfree(row);
-  return NULL;
-}
diff --git a/src/system/detail/src/vnodeCache.c b/src/system/detail/src/vnodeCache.c
deleted file mode 100644
index 9f078b09ffd4e15e2221dc818e22d03fc8396ddd..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeCache.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "taosmsg.h"
-#include "vnode.h"
-#include "vnodeCache.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-void vnodeSearchPointInCache(SMeterObj *pObj, SQuery *pQuery);
-void vnodeProcessCommitTimer(void *param, void *tmrId);
-
-void *vnodeOpenCachePool(int vnode) {
-  SCachePool *pCachePool;
-  SVnodeCfg * pCfg = &vnodeList[vnode].cfg;
-  int         blockId = 0;
-  char *      pMem = NULL;
-
-  pCachePool = (SCachePool *)malloc(sizeof(SCachePool));
-  if (pCachePool == NULL) {
-    dError("no memory to allocate cache pool!");
-    return NULL;
-  }
-
-  memset(pCachePool, 0, sizeof(SCachePool));
-  pCachePool->count = 1;
-  pCachePool->vnode = vnode;
-
-  pthread_mutex_init(&(pCachePool->vmutex), NULL);
-
-  size_t size = sizeof(char *) * pCfg->cacheNumOfBlocks.totalBlocks;
-  pCachePool->pMem = malloc(size);
-  if (pCachePool->pMem == NULL) {
-    dError("no memory to allocate cache blocks!");
-    pthread_mutex_destroy(&(pCachePool->vmutex));
-    tfree(pCachePool);
-    return NULL;
-  }
-
-  memset(pCachePool->pMem, 0, size);
-  pCachePool->threshold = pCfg->cacheNumOfBlocks.totalBlocks * 0.6;
-
-  int maxAllocBlock = (1024 * 1024 * 1024) / pCfg->cacheBlockSize;
-  if (maxAllocBlock < 1) {
-    dError("Cache block size is too large");
-    pthread_mutex_destroy(&(pCachePool->vmutex));
-    tfree(pCachePool->pMem);
-    tfree(pCachePool);
-    return NULL;
-  }
-  while (blockId < pCfg->cacheNumOfBlocks.totalBlocks) {
-    // TODO : Allocate real blocks
-    int allocBlocks = MIN(pCfg->cacheNumOfBlocks.totalBlocks - blockId, maxAllocBlock);
-    pMem = calloc(allocBlocks, pCfg->cacheBlockSize);
-    if (pMem == NULL) {
-      dError("failed to allocate cache memory: %d", allocBlocks*pCfg->cacheBlockSize);
-      goto _err_exit;
-    }
-
-    for (int i = 0; i < allocBlocks; i++) {
-      pCachePool->pMem[blockId] = pMem + i * pCfg->cacheBlockSize;
-      blockId++;
-    }
-  }
-
-  dPrint("vid:%d, cache pool is allocated:0x%x", vnode, pCachePool);
-
-  return pCachePool;
-
-_err_exit:
-  pthread_mutex_destroy(&(pCachePool->vmutex));
-  // TODO : Free the cache blocks and return
-  blockId = 0;
-  while (blockId < pCfg->cacheNumOfBlocks.totalBlocks) {
-    tfree(pCachePool->pMem[blockId]);
-    blockId = blockId + (MIN(maxAllocBlock, pCfg->cacheNumOfBlocks.totalBlocks - blockId));
-  }
-  tfree(pCachePool->pMem);
-  tfree(pCachePool);
-  return NULL;
-}
-
-void vnodeCloseCachePool(int vnode) {
-  SVnodeObj * pVnode = vnodeList + vnode;
-  SCachePool *pCachePool = (SCachePool *)pVnode->pCachePool;
-  int         blockId = 0;
-
-  taosTmrStopA(&pVnode->commitTimer);
-  if (pVnode->commitInProcess) pthread_cancel(pVnode->commitThread);
-
-  dPrint("vid:%d, cache pool closed, count:%d", vnode, pCachePool->count);
-
-  int maxAllocBlock = (1024 * 1024 * 1024) / pVnode->cfg.cacheBlockSize;
-  while (blockId < pVnode->cfg.cacheNumOfBlocks.totalBlocks) {
-    tfree(pCachePool->pMem[blockId]);
-    blockId = blockId + (MIN(maxAllocBlock, pVnode->cfg.cacheNumOfBlocks.totalBlocks - blockId));
-  }
-  tfree(pCachePool->pMem);
-  pthread_mutex_destroy(&(pCachePool->vmutex));
-  tfree(pCachePool);
-  pVnode->pCachePool = NULL;
-}
-
-void *vnodeAllocateCacheInfo(SMeterObj *pObj) {
-  SCacheInfo *pInfo;
-  size_t      size;
-  SVnodeCfg * pCfg = &vnodeList[pObj->vnode].cfg;
-
-  size = sizeof(SCacheInfo);
-  pInfo = (SCacheInfo *)malloc(size);
-  if (pInfo == NULL) {
-    dError("id:%s, no memory for cacheInfo", pObj->meterId);
-    return NULL;
-  }
-  memset(pInfo, 0, size);
-  pInfo->maxBlocks = vnodeList[pObj->vnode].cfg.blocksPerMeter;
-  size = sizeof(SCacheBlock *) * pInfo->maxBlocks;
-  pInfo->cacheBlocks = (SCacheBlock **)malloc(size);
-  if (pInfo->cacheBlocks == NULL) {
-    dError("id:%s, no memory for cacheBlocks", pObj->meterId);
-    tfree(pInfo);
-    return NULL;
-  }
-  memset(pInfo->cacheBlocks, 0, size);
-  pInfo->currentSlot = -1;
-
-  pObj->pointsPerBlock =
-      (pCfg->cacheBlockSize - sizeof(SCacheBlock) - pObj->numOfColumns * sizeof(char *)) / pObj->bytesPerPoint;
-  if (pObj->pointsPerBlock > pObj->pointsPerFileBlock) pObj->pointsPerBlock = pObj->pointsPerFileBlock;
-  pObj->pCache = (void *)pInfo;
-
-  pObj->freePoints = pObj->pointsPerBlock * pInfo->maxBlocks;
-
-  return (void *)pInfo;
-}
-
-int vnodeFreeCacheBlock(SCacheBlock *pCacheBlock) {
-  SMeterObj * pObj;
-  SCacheInfo *pInfo;
-
-  if (pCacheBlock == NULL) return -1;
-
-  pObj = pCacheBlock->pMeterObj;
-  pInfo = (SCacheInfo *)pObj->pCache;
-
-  if (pObj) {
-    pInfo->numOfBlocks--;
-
-    if (pInfo->numOfBlocks < 0) {
-      dError("vid:%d sid:%d id:%s, numOfBlocks:%d shall never be negative", pObj->vnode, pObj->sid, pObj->meterId,
-           pInfo->numOfBlocks);
-    }
-
-    if (pCacheBlock->blockId == 0) {
-      dError("vid:%d sid:%d id:%s, double free", pObj->vnode, pObj->sid, pObj->meterId);
-    }
-
-    SCachePool *pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-    if (pCacheBlock->notFree) {
-      pPool->notFreeSlots--;
-      pInfo->unCommittedBlocks--;
-      dTrace("vid:%d sid:%d id:%s, cache block is not free, slot:%d, index:%d notFreeSlots:%d",
-             pObj->vnode, pObj->sid, pObj->meterId, pCacheBlock->slot, pCacheBlock->index, pPool->notFreeSlots);
-    }
-
-    dTrace("vid:%d sid:%d id:%s, free a cache block, numOfBlocks:%d, slot:%d, index:%d notFreeSlots:%d",
-           pObj->vnode, pObj->sid, pObj->meterId, pInfo->numOfBlocks, pCacheBlock->slot, pCacheBlock->index,
-           pPool->notFreeSlots);
-
-    memset(pCacheBlock, 0, sizeof(SCacheBlock));
-
-  } else {
-    dError("BUG, pObj is null");
-  }
-
-  return 0;
-}
-
-void vnodeFreeCacheInfo(SMeterObj *pObj) {
-  SCacheInfo * pInfo;
-  SCacheBlock *pCacheBlock;
-  SCachePool * pPool;
-  int          slot, numOfBlocks;
-
-  if (pObj == NULL || pObj->pCache == NULL) return;
-
-  pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-  pInfo = (SCacheInfo *)pObj->pCache;
-  if (pPool == NULL || pInfo == NULL) return;
-
-  pthread_mutex_lock(&pPool->vmutex);
-  numOfBlocks = pInfo->numOfBlocks;
-  slot = pInfo->currentSlot;
-
-  for (int i = 0; i < numOfBlocks; ++i) {
-    pCacheBlock = pInfo->cacheBlocks[slot];
-    vnodeFreeCacheBlock(pCacheBlock);
-    slot = (slot - 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-  }
-
-  pObj->pCache = NULL;
-  tfree(pInfo->cacheBlocks);
-  tfree(pInfo);
-  pthread_mutex_unlock(&pPool->vmutex);
-}
-
-uint64_t vnodeGetPoolCount(SVnodeObj *pVnode) {
-  SCachePool *pPool;
-
-  pPool = (SCachePool *)pVnode->pCachePool;
-
-  return pPool->count;
-}
-
-void vnodeUpdateCommitInfo(SMeterObj *pObj, int slot, int pos, uint64_t count) {
-  SCacheInfo * pInfo;
-  SCacheBlock *pBlock;
-  SCachePool * pPool;
-
-  pInfo = (SCacheInfo *)pObj->pCache;
-  pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-
-  int tslot =
-      (pInfo->commitPoint == pObj->pointsPerBlock) ? (pInfo->commitSlot + 1) % pInfo->maxBlocks : pInfo->commitSlot;
-  int slots = 0;
-
-  while (tslot != slot || ((tslot == slot) && (pos == pObj->pointsPerBlock))) {
-    slots++;
-    pthread_mutex_lock(&pPool->vmutex);
-    pBlock = pInfo->cacheBlocks[tslot];
-    assert(pBlock->notFree);
-    pBlock->notFree = 0;
-    pInfo->unCommittedBlocks--;
-    pPool->notFreeSlots--;
-    pthread_mutex_unlock(&pPool->vmutex);
-
-    dTrace("vid:%d sid:%d id:%s, cache block is committed, slot:%d, index:%d notFreeSlots:%d, unCommittedBlocks:%d",
-           pObj->vnode, pObj->sid, pObj->meterId, pBlock->slot, pBlock->index, pPool->notFreeSlots,
-           pInfo->unCommittedBlocks);
-    if (tslot == slot) break;
-    tslot = (tslot + 1) % pInfo->maxBlocks;
-  }
-
-  atomic_fetch_add_32(&pObj->freePoints, pObj->pointsPerBlock * slots);
-  pInfo->commitSlot = slot;
-  pInfo->commitPoint = pos;
-  pObj->commitCount = count;
-}
-
-TSKEY vnodeGetFirstKey(int vnode) {
-  SMeterObj *  pObj;
-  SCacheInfo * pInfo;
-  SCacheBlock *pCacheBlock;
-
-  SVnodeCfg *pCfg = &vnodeList[vnode].cfg;
-  TSKEY      key = taosGetTimestamp(pCfg->precision);
-
-  for (int sid = 0; sid < pCfg->maxSessions; ++sid) {
-    pObj = vnodeList[vnode].meterList[sid];
-    if (pObj == NULL || pObj->pCache == NULL) continue;
-
-    pInfo = (SCacheInfo *)pObj->pCache;
-    pCacheBlock = pInfo->cacheBlocks[0];
-
-    if (pCacheBlock == NULL || pCacheBlock->numOfPoints <= 0) continue;
-
-    if (*((TSKEY *)(pCacheBlock->offset[0])) < key) key = *((TSKEY *)(pCacheBlock->offset[0]));
-  }
-
-  return key;
-}
-
-pthread_t vnodeCreateCommitThread(SVnodeObj *pVnode) {
-  // this function has to mutex locked before it is called
-
-  pthread_attr_t thattr;
-  SCachePool *   pPool = (SCachePool *)pVnode->pCachePool;
-
-  if (pPool->commitInProcess) {
-    dTrace("vid:%d, commit is already in process", pVnode->vnode);
-    return pVnode->commitThread;
-  }
-
-  taosTmrStopA(&pVnode->commitTimer);
-
-  if (pVnode->vnodeStatus == TSDB_VN_STATUS_UNSYNCED) {
-    taosTmrReset(vnodeProcessCommitTimer, pVnode->cfg.commitTime * 1000, pVnode, vnodeTmrCtrl, &pVnode->commitTimer);
-    dTrace("vid:%d, it is in unsyc state, commit later", pVnode->vnode);
-    return pVnode->commitThread;
-  }
-
-  pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
-  if (pthread_create(&(pVnode->commitThread), &thattr, vnodeCommitToFile, pVnode) != 0) {
-    dError("vid:%d, failed to create thread to commit file, reason:%s", pVnode->vnode, strerror(errno));
-  } else {
-    pPool->commitInProcess = 1;
-    dTrace("vid:%d, commit thread: 0x%lx is created", pVnode->vnode, pVnode->commitThread);
-  }
-
-  pthread_attr_destroy(&thattr);
-
-  return pVnode->commitThread;
-}
-
-void vnodeProcessCommitTimer(void *param, void *tmrId) {
-  SVnodeObj * pVnode = (SVnodeObj *)param;
-  SCachePool *pPool = (SCachePool *)pVnode->pCachePool;
-
-  pthread_mutex_lock(&pPool->vmutex);
-
-  vnodeCreateCommitThread(pVnode);
-
-  pthread_mutex_unlock(&pPool->vmutex);
-}
-
-void vnodeCommitOver(SVnodeObj *pVnode) {
-  SCachePool *pPool = (SCachePool *)(pVnode->pCachePool);
-
-  taosTmrReset(vnodeProcessCommitTimer, pVnode->cfg.commitTime * 1000, pVnode, vnodeTmrCtrl, &pVnode->commitTimer);
-
-  pthread_mutex_lock(&pPool->vmutex);
-
-  pPool->commitInProcess = 0;
-  dTrace("vid:%d, commit is over, notFreeSlots:%d", pPool->vnode, pPool->notFreeSlots);
-
-  pthread_mutex_unlock(&pPool->vmutex);
-}
-
-static void vnodeWaitForCommitComplete(SVnodeObj *pVnode) {
-  SCachePool *pPool = (SCachePool *)(pVnode->pCachePool);
-
-  // wait for 100s at most
-  const int32_t totalCount = 1000;
-  int32_t count = 0;
-
-  // all meter is marked as dropped, so the commit will abort very quickly
-  while(count++ < totalCount) {
-    int32_t commitInProcess = 0;
-
-    pthread_mutex_lock(&pPool->vmutex);
-    commitInProcess = pPool->commitInProcess;
-    pthread_mutex_unlock(&pPool->vmutex);
-
-    if (commitInProcess) {
-      dWarn("vid:%d still in commit, wait for completed", pVnode->vnode);
-      taosMsleep(10);
-    }
-  }
-}
-
-void vnodeCancelCommit(SVnodeObj *pVnode) {
-  SCachePool *pPool = (SCachePool *)(pVnode->pCachePool);
-  if (pPool == NULL) return;
-
-  vnodeWaitForCommitComplete(pVnode);
-  taosTmrReset(vnodeProcessCommitTimer, pVnode->cfg.commitTime * 1000, pVnode, vnodeTmrCtrl, &pVnode->commitTimer);
-}
-
-/* The vnode cache lock should be hold before calling this interface
- */
-SCacheBlock *vnodeGetFreeCacheBlock(SVnodeObj *pVnode) {
-  SCachePool  *pPool = (SCachePool *)(pVnode->pCachePool);
-  SVnodeCfg   *pCfg = &(pVnode->cfg);
-  SCacheBlock *pCacheBlock = NULL;
-  int skipped = 0;
-
-  while (1) {
-    pCacheBlock = (SCacheBlock *)(pPool->pMem[((int64_t)pPool->freeSlot)]);
-    if (pCacheBlock->blockId == 0) break;
-
-    if (pCacheBlock->notFree) {
-      pPool->freeSlot++;
-      pPool->freeSlot = pPool->freeSlot % pCfg->cacheNumOfBlocks.totalBlocks;
-      skipped++;
-      if (skipped > pPool->threshold) {
-        vnodeCreateCommitThread(pVnode);
-        pthread_mutex_unlock(&pPool->vmutex);
-        dError("vid:%d committing process is too slow, notFreeSlots:%d....", pVnode->vnode, pPool->notFreeSlots);
-        return NULL;
-      }
-    } else {
-      SMeterObj * pRelObj = pCacheBlock->pMeterObj;
-      SCacheInfo *pRelInfo = (SCacheInfo *)pRelObj->pCache;
-      int firstSlot = (pRelInfo->currentSlot - pRelInfo->numOfBlocks + 1 + pRelInfo->maxBlocks) % pRelInfo->maxBlocks;
-      pCacheBlock = pRelInfo->cacheBlocks[firstSlot];
-      if (pCacheBlock) {
-        pPool->freeSlot = pCacheBlock->index;
-        vnodeFreeCacheBlock(pCacheBlock);
-        break;
-      } else {
-        pPool->freeSlot = (pPool->freeSlot + 1) % pCfg->cacheNumOfBlocks.totalBlocks;
-        skipped++;
-      }
-    }
-  }
-
-  pCacheBlock = (SCacheBlock *)(pPool->pMem[pPool->freeSlot]);
-  pCacheBlock->index = pPool->freeSlot;
-  pCacheBlock->notFree = 1;
-  pPool->freeSlot = (pPool->freeSlot + 1) % pCfg->cacheNumOfBlocks.totalBlocks;
-  pPool->notFreeSlots++;
-
-  return pCacheBlock;
-}
-
-int vnodeAllocateCacheBlock(SMeterObj *pObj) {
-  int          index;
-  SCachePool * pPool;
-  SCacheBlock *pCacheBlock;
-  SCacheInfo * pInfo;
-  SVnodeObj *  pVnode;
-  int          commit = 0;
-
-  pVnode = vnodeList + pObj->vnode;
-  pPool = (SCachePool *)pVnode->pCachePool;
-  pInfo = (SCacheInfo *)pObj->pCache;
-  SVnodeCfg *pCfg = &(vnodeList[pObj->vnode].cfg);
-
-  if (pPool == NULL) return -1;
-  pthread_mutex_lock(&pPool->vmutex);
-
-  if (pInfo == NULL || pInfo->cacheBlocks == NULL) {
-    pthread_mutex_unlock(&pPool->vmutex);
-    dError("vid:%d sid:%d id:%s, meter is not there", pObj->vnode, pObj->sid, pObj->meterId);
-    return -1;
-  }
-
-  if (pPool->count <= 1) {
-    if (pVnode->commitTimer == NULL)
-      pVnode->commitTimer = taosTmrStart(vnodeProcessCommitTimer, pCfg->commitTime * 1000, pVnode, vnodeTmrCtrl);
-  }
-
-  if (pInfo->unCommittedBlocks >= pInfo->maxBlocks-1) {
-    vnodeCreateCommitThread(pVnode);
-    pthread_mutex_unlock(&pPool->vmutex);
-    dError("vid:%d sid:%d id:%s, all blocks are not committed yet....", pObj->vnode, pObj->sid, pObj->meterId);
-    return -1;
-  }
-
-  if ((pCacheBlock = vnodeGetFreeCacheBlock(pVnode)) == NULL) return -1;
-
-  index = pCacheBlock->index;
-  pCacheBlock->pMeterObj = pObj;
-
-  pCacheBlock->offset[0] = ((char *)(pCacheBlock)) + sizeof(SCacheBlock) + pObj->numOfColumns * sizeof(char *);
-  for (int col = 1; col < pObj->numOfColumns; ++col)
-    pCacheBlock->offset[col] = pCacheBlock->offset[col - 1] + pObj->schema[col - 1].bytes * pObj->pointsPerBlock;
-
-  pInfo->numOfBlocks++;
-  pInfo->blocks++;
-  pInfo->unCommittedBlocks++;
-  pInfo->currentSlot = (pInfo->currentSlot + 1) % pInfo->maxBlocks;
-  pCacheBlock->blockId = pInfo->blocks;
-  pCacheBlock->slot = pInfo->currentSlot;
-  if (pInfo->numOfBlocks > pInfo->maxBlocks) {
-    pCacheBlock = pInfo->cacheBlocks[pInfo->currentSlot];
-    vnodeFreeCacheBlock(pCacheBlock);
-  }
-
-  pInfo->cacheBlocks[pInfo->currentSlot] = (SCacheBlock *)(pPool->pMem[(int64_t)index]);
-  dTrace("vid:%d sid:%d id:%s, allocate a cache block, numOfBlocks:%d, slot:%d, index:%d notFreeSlots:%d blocks:%d",
-         pObj->vnode, pObj->sid, pObj->meterId, pInfo->numOfBlocks, pInfo->currentSlot, index, pPool->notFreeSlots,
-         pInfo->blocks);
-
-  if (((pPool->notFreeSlots > pPool->threshold) || (pInfo->unCommittedBlocks >= pInfo->maxBlocks / 2))) {
-    dTrace("vid:%d sid:%d id:%s, too many unCommitted slots, unCommitted:%d notFreeSlots:%d",
-           pObj->vnode, pObj->sid, pObj->meterId, pInfo->unCommittedBlocks, pPool->notFreeSlots);
-    vnodeCreateCommitThread(pVnode);
-    commit = 1;
-  }
-
-  pthread_mutex_unlock(&pPool->vmutex);
-
-  return commit;
-}
-
-int vnodeInsertPointToCache(SMeterObj *pObj, char *pData) {
-  SCacheBlock *pCacheBlock;
-  SCacheInfo * pInfo;
-  SCachePool * pPool;
-
-  pInfo = (SCacheInfo *)pObj->pCache;
-  pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-
-  if (pInfo->numOfBlocks == 0) {
-    if (vnodeAllocateCacheBlock(pObj) < 0) {
-      return -1;
-    }
-  }
-
-  if (pInfo->currentSlot < 0) return -1;
-  pCacheBlock = pInfo->cacheBlocks[pInfo->currentSlot];
-  if (pCacheBlock->numOfPoints >= pObj->pointsPerBlock) {
-    if (vnodeAllocateCacheBlock(pObj) < 0) return -1;
-    pCacheBlock = pInfo->cacheBlocks[pInfo->currentSlot];
-  }
-
-  for (int col = 0; col < pObj->numOfColumns; ++col) {
-    memcpy(pCacheBlock->offset[col] + pCacheBlock->numOfPoints * pObj->schema[col].bytes, pData,
-           pObj->schema[col].bytes);
-    pData += pObj->schema[col].bytes;
-  }
-
-  atomic_fetch_sub_32(&pObj->freePoints, 1);
-  pCacheBlock->numOfPoints++;
-  pPool->count++;
-
-  return 0;
-}
-
-void vnodeUpdateQuerySlotPos(SCacheInfo *pInfo, SQuery *pQuery) {
-  SCacheBlock *pCacheBlock;
-
-  int step = QUERY_IS_ASC_QUERY(pQuery) ? -1 : 1;
-
-  if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->slot == pQuery->currentSlot)) ||
-      (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->slot == pQuery->firstSlot))) {
-    pQuery->over = 1;
-
-  } else {
-    pQuery->slot = (pQuery->slot - step + pInfo->maxBlocks) % pInfo->maxBlocks;
-    pCacheBlock = pInfo->cacheBlocks[pQuery->slot];
-    pQuery->pos = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pCacheBlock->numOfPoints - 1;
-  }
-}
-
-static FORCE_INLINE TSKEY vnodeGetTSInCacheBlock(SCacheBlock *pCacheBlock, int32_t pos) {
-  return *(TSKEY *)(pCacheBlock->offset[PRIMARYKEY_TIMESTAMP_COL_INDEX] + pos * TSDB_KEYSIZE);
-}
-
-int vnodeQueryFromCache(SMeterObj *pObj, SQuery *pQuery) {
-  SCacheBlock *pCacheBlock;
-  int          col, step;
-  char *       pRead, *pData;
-  SCacheInfo * pInfo;
-  int          lastPos = -1;
-  int          startPos, numOfReads, numOfPoints;
-
-  pQuery->pointsRead = 0;
-  if (pQuery->over) return 0;
-
-  vnodeFreeFields(pQuery);
-
-  pInfo = (SCacheInfo *)pObj->pCache;
-  if ((pInfo == NULL) || (pInfo->numOfBlocks == 0)) {
-    pQuery->over = 1;
-    return 0;
-  }
-
-  if (pQuery->slot < 0 || pQuery->pos < 0)  // it means a new query, we need to find the point first
-    vnodeSearchPointInCache(pObj, pQuery);
-
-  if (pQuery->slot < 0 || pQuery->pos < 0) {
-    pQuery->over = 1;
-    return 0;
-  }
-
-  step = QUERY_IS_ASC_QUERY(pQuery) ? -1 : 1;
-  pCacheBlock = pInfo->cacheBlocks[pQuery->slot];
-  numOfPoints = pCacheBlock->numOfPoints;
-
-  int maxReads = QUERY_IS_ASC_QUERY(pQuery) ? numOfPoints - pQuery->pos : pQuery->pos + 1;
-  if (maxReads <= 0) {
-    vnodeUpdateQuerySlotPos(pInfo, pQuery);
-    return 0;
-  }
-
-  TSKEY startkey = vnodeGetTSInCacheBlock(pCacheBlock, 0);
-  TSKEY endkey   = vnodeGetTSInCacheBlock(pCacheBlock, numOfPoints - 1);
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    if (endkey < pQuery->ekey) {
-      numOfReads = maxReads;
-    } else {
-      lastPos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(
-          pCacheBlock->offset[PRIMARYKEY_TIMESTAMP_COL_INDEX] + TSDB_KEYSIZE * pQuery->pos, maxReads, pQuery->ekey, 0);
-      numOfReads = (lastPos >= 0) ? lastPos + 1 : 0;
-    }
-  } else {
-    if (startkey > pQuery->ekey) {
-      numOfReads = maxReads;
-    } else {
-      lastPos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(pCacheBlock->offset[PRIMARYKEY_TIMESTAMP_COL_INDEX],
-                                                             maxReads, pQuery->ekey, 1);
-      numOfReads = (lastPos >= 0) ? pQuery->pos - lastPos + 1 : 0;
-    }
-  }
-
-  if (numOfReads > pQuery->pointsToRead - pQuery->pointsRead) {
-    numOfReads = pQuery->pointsToRead - pQuery->pointsRead;
-  } else {
-    if (lastPos >= 0 || numOfReads == 0) {
-      pQuery->keyIsMet = 1;
-      pQuery->over = 1;
-    }
-  }
-
-  startPos = QUERY_IS_ASC_QUERY(pQuery) ? pQuery->pos : pQuery->pos - numOfReads + 1;
-
-  int32_t numOfQualifiedPoints = 0;
-  int32_t numOfActualRead = numOfReads;
-
-  if (pQuery->numOfFilterCols == 0) {
-    for (col = 0; col < pQuery->numOfOutputCols; ++col) {
-      int16_t colIdx = pQuery->pSelectExpr[col].pBase.colInfo.colIdx;
-
-      int16_t bytes = GET_COLUMN_BYTES(pQuery, col);
-      int16_t type = GET_COLUMN_TYPE(pQuery, col);
-
-      pData = pQuery->sdata[col]->data + pQuery->pointsOffset * bytes;
-      /* this column is absent from current block, fill this block with null value */
-      if (colIdx < 0 || colIdx >= pObj->numOfColumns ||
-          pObj->schema[colIdx].colId != pQuery->pSelectExpr[col].pBase.colInfo.colId) {  // set null
-        setNullN(pData, type, bytes, pCacheBlock->numOfPoints);
-      } else {
-        pRead = pCacheBlock->offset[colIdx] + startPos * bytes;
-        
-        if (QUERY_IS_ASC_QUERY(pQuery)) {
-          memcpy(pData, pRead, numOfReads * bytes);
-        } else {
-          for(int32_t j = 0; j < numOfReads; ++j) {
-            memcpy(pData + bytes * j, pRead + (numOfReads - 1 - j) * bytes, bytes);
-          }
-        }
-      }
-    }
-    numOfQualifiedPoints = numOfReads;
-  } else {  // check each data one by one
-    // set the input column data
-    for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
-      int16_t colIdx = pQuery->pFilterInfo[k].info.colIdx;
-
-      if (colIdx < 0) { // current data has not specified column
-        pQuery->pFilterInfo[k].pData = NULL;
-      } else {
-        pQuery->pFilterInfo[k].pData = pCacheBlock->offset[colIdx];
-      }
-    }
-
-    int32_t *ids = calloc(1, numOfReads * sizeof(int32_t));
-    numOfActualRead = 0;
-
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      for (int32_t j = startPos; j < pCacheBlock->numOfPoints; ++j) {
-        TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j);
-        if (key < startkey || key > endkey) {
-          dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
-                 "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey);
-          tfree(ids);
-          return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
-        }
-
-        if (key > pQuery->ekey) {
-          break;
-        }
-
-        if (!vnodeFilterData(pQuery, &numOfActualRead, j)) {
-          continue;
-        }
-
-        ids[numOfQualifiedPoints] = j;
-        if (++numOfQualifiedPoints == numOfReads) { // qualified data are enough
-          break;
-        }
-      }
-    } else {
-      startPos = pQuery->pos;
-      for (int32_t j = startPos; j >= 0; --j) {
-        TSKEY key = vnodeGetTSInCacheBlock(pCacheBlock, j);
-        if (key < startkey || key > endkey) {
-          dError("vid:%d sid:%d id:%s, timestamp in cache slot is disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
-                 "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startkey, endkey);
-          tfree(ids);
-          return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
-        }
-
-        if (key < pQuery->ekey) {
-          break;
-        }
-
-        if (!vnodeFilterData(pQuery, &numOfActualRead, j)) {
-          continue;
-        }
-  
-        ids[numOfQualifiedPoints] = j;
-        if (++numOfQualifiedPoints == numOfReads) { // qualified data are enough
-          break;
-        }
-      }
-    }
-
-//    int32_t start = QUERY_IS_ASC_QUERY(pQuery) ? 0 : numOfReads - numOfQualifiedPoints;
-    for (int32_t j = 0; j < numOfQualifiedPoints; ++j) {
-      for (int32_t col = 0; col < pQuery->numOfOutputCols; ++col) {
-        int16_t colIndex = pQuery->pSelectExpr[col].pBase.colInfo.colIdx;
-
-        int32_t bytes = pObj->schema[colIndex].bytes;
-        pData = pQuery->sdata[col]->data + (pQuery->pointsOffset + j) * bytes;
-        pRead = pCacheBlock->offset[colIndex] + ids[j/* + start*/] * bytes;
-
-        memcpy(pData, pRead, bytes);
-      }
-    }
-
-    tfree(ids);
-    assert(numOfQualifiedPoints <= numOfReads);
-  }
-
-  pQuery->pointsRead += numOfQualifiedPoints;
-  pQuery->pos -= numOfActualRead * step;
-
-  // update the skey/lastkey
-  int32_t lastAccessPos = pQuery->pos + step;
-  pQuery->lastKey = vnodeGetTSInCacheBlock(pCacheBlock, lastAccessPos);
-  pQuery->skey = pQuery->lastKey - step;
-
-  int update = 0;  // go to next slot after this round
-  if ((pQuery->pos < 0 || pQuery->pos >= pObj->pointsPerBlock || numOfReads == 0) && (pQuery->over == 0)) update = 1;
-
-  // if block is changed, it shall be thrown away, it won't happen for committing
-  if (pObj != pCacheBlock->pMeterObj || pCacheBlock->blockId > pQuery->blockId) {
-    update = 1;
-    pQuery->pointsRead = 0;
-    dWarn("vid:%d sid:%d id:%s, cache block is overwritten, slot:%d blockId:%d qBlockId:%d",
-          pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, pCacheBlock->blockId, pQuery->blockId);
-  }
-
-  if (update) vnodeUpdateQuerySlotPos(pInfo, pQuery);
-
-  for (col = 0; col < pQuery->numOfOutputCols; ++col) {
-    int16_t bytes = GET_COLUMN_BYTES(pQuery, col);
-    pQuery->sdata[col]->len = bytes * (pQuery->pointsRead + pQuery->pointsOffset);
-  }
-  return pQuery->pointsRead;
-}
-
-void vnodeSearchPointInCache(SMeterObj *pObj, SQuery *pQuery) {
-  int          numOfBlocks;
-  int          firstSlot, lastSlot, midSlot;
-  TSKEY        keyFirst, keyLast;
-  SCacheBlock *pBlock;
-  SCacheInfo * pInfo = (SCacheInfo *)pObj->pCache;
-  SCachePool * pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-
-  pQuery->slot = -1;
-  pQuery->pos = -1;
-
-  // save these variables first in case it may be changed by write operation
-  pthread_mutex_lock(&pPool->vmutex);
-  numOfBlocks = pInfo->numOfBlocks;
-  lastSlot = pInfo->currentSlot;
-  pthread_mutex_unlock(&pPool->vmutex);
-  if (numOfBlocks <= 0) return;
-
-  firstSlot = (lastSlot - numOfBlocks + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-
-  // make sure it is there, otherwise, return right away
-  pBlock = pInfo->cacheBlocks[firstSlot];
-  keyFirst = vnodeGetTSInCacheBlock(pBlock, 0);
-
-  pBlock = pInfo->cacheBlocks[lastSlot];
-  keyLast = vnodeGetTSInCacheBlock(pBlock, pBlock->numOfPoints - 1);
-
-  pQuery->blockId = pBlock->blockId;
-  pQuery->currentSlot = lastSlot;
-  pQuery->numOfBlocks = numOfBlocks;
-  pQuery->firstSlot = firstSlot;
-
-  if (!QUERY_IS_ASC_QUERY(pQuery)) {
-    if (pQuery->skey < keyFirst) return;
-    if (pQuery->ekey > keyLast) return;
-  } else {
-    if (pQuery->skey > keyLast) return;
-    if (pQuery->ekey < keyFirst) return;
-  }
-
-  while (1) {
-    numOfBlocks = (lastSlot - firstSlot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-    if (numOfBlocks == 0) numOfBlocks = pInfo->maxBlocks;
-    midSlot = (firstSlot + (numOfBlocks >> 1)) % pInfo->maxBlocks;
-    pBlock = pInfo->cacheBlocks[midSlot];
-
-    keyFirst = vnodeGetTSInCacheBlock(pBlock, 0);
-    keyLast = vnodeGetTSInCacheBlock(pBlock, pBlock->numOfPoints - 1);
-
-    if (numOfBlocks == 1) break;
-
-    if (pQuery->skey > keyLast) {
-      if (numOfBlocks == 2) break;
-      if (!QUERY_IS_ASC_QUERY(pQuery)) {
-        int          nextSlot = (midSlot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-        SCacheBlock *pNextBlock = pInfo->cacheBlocks[nextSlot];
-        TSKEY        nextKeyFirst = vnodeGetTSInCacheBlock(pNextBlock, 0);
-        if (pQuery->skey < nextKeyFirst) break;
-      }
-      firstSlot = (midSlot + 1) % pInfo->maxBlocks;
-    } else if (pQuery->skey < keyFirst) {
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        int          prevSlot = (midSlot - 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-        SCacheBlock *pPrevBlock = pInfo->cacheBlocks[prevSlot];
-        TSKEY        prevKeyLast = vnodeGetTSInCacheBlock(pPrevBlock, pPrevBlock->numOfPoints - 1);
-
-        if (pQuery->skey > prevKeyLast) break;
-      }
-      lastSlot = (midSlot - 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-    } else {
-      break;  // got the slot
-    }
-  }
-
-  pQuery->slot = midSlot;
-  if (!QUERY_IS_ASC_QUERY(pQuery)) {
-    if (pQuery->skey < keyFirst) return;
-
-    if (pQuery->ekey > keyLast) {
-      pQuery->slot = (midSlot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-      return;
-    }
-  } else {
-    if (pQuery->skey > keyLast) {
-      pQuery->slot = (midSlot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-      return;
-    }
-
-    if (pQuery->ekey < keyFirst) return;
-  }
-
-  // midSlot and pBlock is the search result
-
-  pBlock = pInfo->cacheBlocks[midSlot];
-  pQuery->pos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(pBlock->offset[0], pBlock->numOfPoints, pQuery->skey,
-                                                             pQuery->order.order);
-  pQuery->key = vnodeGetTSInCacheBlock(pBlock, pQuery->pos);
-
-  if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0) {
-    int maxReads = QUERY_IS_ASC_QUERY(pQuery) ? pBlock->numOfPoints - pQuery->pos : pQuery->pos + 1;
-
-    if (pQuery->limit.offset < maxReads) {  // start position in current block
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        pQuery->pos += pQuery->limit.offset;
-      } else {
-        pQuery->pos -= pQuery->limit.offset;
-      }
-
-      pQuery->key = vnodeGetTSInCacheBlock(pBlock, pQuery->pos);
-      pQuery->limit.offset = 0;
-    } else if (pInfo->numOfBlocks == 1) {
-      pQuery->pos = -1;  // no qualified data
-    } else {
-      int step = QUERY_IS_ASC_QUERY(pQuery) ? 1 : -1;
-
-      pQuery->limit.offset -= maxReads;
-      midSlot = (midSlot + step + pInfo->maxBlocks) % pInfo->maxBlocks;
-
-      bool hasData = true;
-      while (pQuery->limit.offset > pInfo->cacheBlocks[midSlot]->numOfPoints) {
-        pQuery->limit.offset -= pInfo->cacheBlocks[midSlot]->numOfPoints;
-
-        if ((QUERY_IS_ASC_QUERY(pQuery) && midSlot == pQuery->currentSlot) ||
-            (!QUERY_IS_ASC_QUERY(pQuery) && midSlot == pQuery->firstSlot)) {  // no qualified data in cache
-          hasData = false;
-          break;
-        }
-        midSlot = (midSlot + step + pInfo->maxBlocks) % pInfo->maxBlocks;
-      }
-
-      if (hasData) {
-        if (QUERY_IS_ASC_QUERY(pQuery)) {
-          pQuery->pos = pQuery->limit.offset;
-        } else {
-          pQuery->pos = pInfo->cacheBlocks[midSlot]->numOfPoints - pQuery->limit.offset - 1;
-        }
-        pQuery->limit.offset = 0;
-        pQuery->slot = midSlot;
-
-        pQuery->key = vnodeGetTSInCacheBlock(pInfo->cacheBlocks[midSlot], pQuery->pos);
-      } else {
-        pQuery->pos = -1;  // no qualified data
-
-        pBlock = pInfo->cacheBlocks[midSlot];
-        if (QUERY_IS_ASC_QUERY(pQuery)) {
-          pQuery->lastKey = vnodeGetTSInCacheBlock(pBlock, pBlock->numOfPoints - 1);
-          pQuery->skey = pQuery->lastKey + 1;
-        } else {
-          pQuery->lastKey = vnodeGetTSInCacheBlock(pBlock, 0);
-          pQuery->skey = pQuery->lastKey - 1;
-        }
-      }
-    }
-  }
-
-  return;
-}
-
-void vnodeSetCommitQuery(SMeterObj *pObj, SQuery *pQuery) {
-  SCacheInfo *pInfo = (SCacheInfo *)pObj->pCache;
-  SCachePool *pPool = (SCachePool *)vnodeList[pObj->vnode].pCachePool;
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-
-  pQuery->order.order = TSQL_SO_ASC;
-  pQuery->numOfCols = pObj->numOfColumns;
-  pQuery->numOfOutputCols = pObj->numOfColumns;
-
-  for (int16_t col = 0; col < pObj->numOfColumns; ++col) {
-    pQuery->colList[col].colIdxInBuf = col;
-
-    pQuery->colList[col].data.colId = pObj->schema[col].colId;
-    pQuery->colList[col].data.bytes = pObj->schema[col].bytes;
-    pQuery->colList[col].data.type = pObj->schema[col].type;
-
-    SColIndexEx *pColIndexEx = &pQuery->pSelectExpr[col].pBase.colInfo;
-
-    pColIndexEx->colId = pObj->schema[col].colId;
-    pColIndexEx->colIdx = col;
-    pColIndexEx->colIdxInBuf = col;
-    pColIndexEx->flag = TSDB_COL_NORMAL;
-  }
-
-  pQuery->slot = pInfo->commitSlot;
-  pQuery->pos = pInfo->commitPoint;
-  pQuery->over = 0;
-
-  pthread_mutex_lock(&pPool->vmutex);
-  pQuery->currentSlot = pInfo->currentSlot;
-  pQuery->numOfBlocks = pInfo->numOfBlocks;
-  pthread_mutex_unlock(&pPool->vmutex);
-
-  if (pQuery->numOfBlocks <= 0 || pQuery->firstSlot < 0) {
-    pQuery->over = 1;
-    return;
-  }
-
-  pQuery->firstSlot = (pQuery->currentSlot - pQuery->numOfBlocks + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-  pQuery->blockId = pInfo->cacheBlocks[pQuery->currentSlot]->blockId;
-
-  SCacheBlock *pCacheBlock;
-  pCacheBlock = pInfo->cacheBlocks[pInfo->commitSlot];
-  if (pInfo->commitSlot == pQuery->currentSlot && pInfo->commitPoint == pCacheBlock->numOfPoints) {
-    dTrace("vid:%d sid:%d id:%s, no new data to commit", pObj->vnode, pObj->sid, pObj->meterId);
-    pQuery->over = 1;
-    return;
-  }
-
-  if (pQuery->pos == pObj->pointsPerBlock) {
-    pQuery->slot = (pQuery->slot + 1) % pInfo->maxBlocks;
-    pQuery->pos = 0;
-  }
-
-  pCacheBlock = pInfo->cacheBlocks[pQuery->slot];
-  TSKEY firstKey = *((TSKEY *)(pCacheBlock->offset[0] + pQuery->pos * pObj->schema[0].bytes));
-
-  if (firstKey < pQuery->skey) {
-    pQuery->over = 1;
-    dTrace("vid:%d sid:%d id:%s, first key is small, keyFirst:%" PRId64 " commitFirstKey:%" PRId64 "",
-        pObj->vnode, pObj->sid, pObj->meterId, firstKey, pQuery->skey);
-    pthread_mutex_lock(&(pVnode->vmutex));
-    if (firstKey < pVnode->firstKey) pVnode->firstKey = firstKey;
-    assert(pVnode->firstKey > 0);
-    pthread_mutex_unlock(&(pVnode->vmutex));
-  }
-}
-
-int vnodeSyncRetrieveVnodeStatistic(int vnode, int fd) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  if (taosWriteMsg(fd, &(pVnode->vnodeStatistic.pointsWritten), sizeof(int64_t)) < 0) return -1;
-  if (taosWriteMsg(fd, &(pVnode->vnodeStatistic.totalStorage), sizeof(int64_t)) < 0) return -1;
-  if (taosWriteMsg(fd, &(pVnode->vnodeStatistic.compStorage), sizeof(int64_t)) < 0) return -1;
-
-  return 0;
-}
-
-int vnodeSyncRestoreVnodeStatistic(int vnode, int fd) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  if (taosReadMsg(fd, &(pVnode->vnodeStatistic.pointsWritten), sizeof(int64_t)) < 0) return -1;
-  if (taosReadMsg(fd, &(pVnode->vnodeStatistic.totalStorage), sizeof(int64_t)) < 0) return -1;
-  if (taosReadMsg(fd, &(pVnode->vnodeStatistic.compStorage), sizeof(int64_t)) < 0) return -1;
-
-  return 0;
-}
-
-int vnodeSyncRetrieveCache(int vnode, int fd) {
-  int32_t      sid, slot, points;
-  SVnodeObj *  pVnode;
-  SMeterObj *  pObj;
-  SCacheInfo * pInfo;
-  SCacheBlock *pBlock;
-  int          blocksSent, pointsSent;
-
-  pVnode = vnodeList + vnode;
-  points = 0;
-  SVnodeCfg *pCfg = &vnodeList[vnode].cfg;
-
-  for (sid = 0; sid < pCfg->maxSessions; ++sid) {
-    pObj = pVnode->meterList[sid];
-    if (pObj == NULL) continue;
-
-    pInfo = (SCacheInfo *)pObj->pCache;
-    if (pInfo == NULL) continue;
-
-    // write sid first
-    if (taosWriteMsg(fd, &sid, sizeof(sid)) <= 0) return -1;
-    if (taosWriteMsg(fd, &(pObj->lastKey), sizeof(pObj->lastKey)) <= 0) return -1;
-    if (taosWriteMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1;
-    if (taosWriteMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1;
-
-    dTrace("vid:%d sid:%d id:%s, send lastKey:%" PRId64 " lastKeyOnFile:%" PRId64, vnode, sid, pObj->meterId, pObj->lastKey,
-           pObj->lastKeyOnFile);
-
-    slot = pInfo->commitSlot;
-    blocksSent = 0;
-    pointsSent = 0;
-
-    while (pInfo->numOfBlocks > 0) {
-      pBlock = pInfo->cacheBlocks[slot];
-      if (pBlock->numOfPoints == 0) break;
-
-      // write the number of points
-      points = pBlock->numOfPoints;
-      if (taosWriteMsg(fd, &(points), sizeof(points)) <= 0) return -1;
-
-      // write the data
-      for (int col = 0; col < pObj->numOfColumns; ++col)
-        if (taosWriteMsg(fd, pBlock->offset[col], pObj->schema[col].bytes * points) <= 0) return -1;
-
-      TSKEY lastKey = *((TSKEY *)(pBlock->offset[0] + pObj->schema[0].bytes * (points - 1)));
-      dTrace("vid:%d sid:%d id:%s, cache block is sent, points:%d lastKey:%" PRId64, vnode, sid, pObj->meterId, points,
-             lastKey);
-
-      blocksSent++;
-      pointsSent += pBlock->numOfPoints;
-      if (slot == pInfo->currentSlot) break;
-
-      slot = (slot + 1) % pInfo->maxBlocks;
-    }
-
-    // set number of points as zero at the end
-    points = 0;
-    if (taosWriteMsg(fd, &(points), sizeof(points)) <= 0) return -1;
-  }
-
-  sid = -1;
-  if (taosWriteMsg(fd, &sid, sizeof(sid)) < 0) return -1;
-  if (vnodeSyncRetrieveVnodeStatistic(vnode, fd) < 0) return -1;
-
-  return 0;
-}
-
-int vnodeSyncRestoreCache(int vnode, int fd) {
-  int32_t      sid, points, i, slot;
-  SMeterObj *  pObj;
-  SCacheInfo * pInfo;
-  SCacheBlock *pBlock;
-  int          blocksReceived, pointsReceived;
-  int          numOfBlocks;
-  SVnodeCfg *  pCfg = &vnodeList[vnode].cfg;
-  SCachePool * pPool = (SCachePool *)vnodeList[vnode].pCachePool;
-
-  while (1) {
-    // read sid first
-
-    if (taosReadMsg(fd, &sid, sizeof(sid)) <= 0) return -1;
-    if (sid >= pCfg->maxSessions) {
-      dError("vid:%d, restore cache, sid:%d is messed up", vnode, sid);
-      return -1;
-    }
-    if (sid < 0) break;
-
-    pObj = vnodeList[vnode].meterList[sid];
-    if (pObj == NULL) {
-      dError("vid:%d sid:%d, meter is not there", vnode, sid);
-      vnodeSendMeterCfgMsg(vnode, sid);
-      return -1;
-    }
-
-    pInfo = (SCacheInfo *)pObj->pCache;
-    numOfBlocks = pInfo->numOfBlocks;
-    pthread_mutex_lock(&pPool->vmutex);
-    for (i = 0; i < numOfBlocks; ++i) {
-      slot = (pInfo->currentSlot - i + pInfo->maxBlocks) % pInfo->maxBlocks;
-      pBlock = pInfo->cacheBlocks[slot];
-      vnodeFreeCacheBlock(pBlock);
-    }
-    pthread_mutex_unlock(&pPool->vmutex);
-
-    pInfo->unCommittedBlocks = 0;
-    if (taosReadMsg(fd, &(pObj->lastKey), sizeof(pObj->lastKey)) <= 0) return -1;
-    if (taosReadMsg(fd, &(pObj->lastKeyOnFile), sizeof(pObj->lastKeyOnFile)) <= 0) return -1;
-    if (taosReadMsg(fd, &(pInfo->commitPoint), sizeof(pInfo->commitPoint)) <= 0) return -1;
-
-    dTrace("vid:%d sid:%d id:%s, commitPoint:%d lastKeyOnFile:%" PRId64, vnode, sid, pObj->meterId, pInfo->commitPoint,
-           pObj->lastKeyOnFile);
-
-    if (vnodeList[pObj->vnode].lastKey < pObj->lastKey) vnodeList[pObj->vnode].lastKey = pObj->lastKey;
-
-    if (vnodeList[pObj->vnode].lastKeyOnFile < pObj->lastKeyOnFile)
-      vnodeList[pObj->vnode].lastKeyOnFile = pObj->lastKeyOnFile;
-
-    pInfo->currentSlot = -1;
-    pInfo->commitSlot = 0;
-    memset(pInfo->cacheBlocks, 0, sizeof(SCacheBlock *) * pInfo->maxBlocks);
-    blocksReceived = 0;
-    pointsReceived = 0;
-    pObj->freePoints = pObj->pointsPerBlock * pInfo->maxBlocks;
-
-    while (1) {
-      // read number of points;
-      points = 0;
-      if (taosReadMsg(fd, &points, sizeof(points)) <= 0) return -1;
-      if (points == 0) break;
-
-      if (vnodeAllocateCacheBlock(pObj) < 0) return -1;
-      pBlock = pInfo->cacheBlocks[pInfo->currentSlot];
-      pBlock->numOfPoints = points;
-
-      // read the data
-      for (int col = 0; col < pObj->numOfColumns; ++col)
-        if (taosReadMsg(fd, pBlock->offset[col], pObj->schema[col].bytes * points) <= 0) return -1;
-
-      atomic_fetch_sub_32(&pObj->freePoints, points);
-      blocksReceived++;
-      pointsReceived += points;
-      pObj->lastKey = *((TSKEY *)(pBlock->offset[0] + pObj->schema[0].bytes * (points - 1)));
-      if (vnodeList[pObj->vnode].lastKey < pObj->lastKey) vnodeList[pObj->vnode].lastKey = pObj->lastKey;
-
-      if (vnodeList[pObj->vnode].firstKey > *(TSKEY *)(pBlock->offset[0]))
-        vnodeList[pObj->vnode].firstKey = *(TSKEY *)(pBlock->offset[0]);
-
-      dTrace("vid:%d sid:%d id:%s, cache block is received, points:%d lastKey:%" PRId64, vnode, sid, pObj->meterId, points,
-             pObj->lastKey);
-    }
-  }
-
-  if (vnodeSyncRestoreVnodeStatistic(pObj->vnode, fd) < 0) return -1;
-
-  return 0;
-}
-
-int vnodeIsCacheCommitted(SMeterObj *pObj) {
-  if (pObj->pCache == NULL) return 1;
-
-  SCacheInfo *pInfo = (SCacheInfo *)pObj->pCache;
-  if (pInfo->currentSlot < 0) return 1;
-
-  SCacheBlock *pBlock = pInfo->cacheBlocks[pInfo->currentSlot];
-  if (pInfo->commitSlot != pInfo->currentSlot) return 0;
-  if (pInfo->commitPoint != pBlock->numOfPoints) return 0;
-
-  return 1;
-}
diff --git a/src/system/detail/src/vnodeCommit.c b/src/system/detail/src/vnodeCommit.c
deleted file mode 100644
index a650376afac0615c1966e6c0181adfdf41910329..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeCommit.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _GNU_SOURCE /* See feature_test_macros(7) */
-#include "os.h"
-
-#include "tsdb.h"
-#include "vnode.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-typedef struct {
-  int  sversion;
-  int  sid;
-  int  contLen;
-  int  action:8;
-  int  simpleCheck:24;
-} SCommitHead;
-
-int vnodeOpenCommitLog(int vnode, uint64_t firstV) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  char *     fileName = pVnode->logFn;
-
-  pVnode->logFd = open(fileName, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (pVnode->logFd < 0) {
-    dError("vid:%d, failed to open file:%s, reason:%s", vnode, fileName, strerror(errno));
-    return -1;
-  }
-
-  dTrace("vid:%d, logfd:%d, open file:%s success", vnode, pVnode->logFd, fileName);
-  if (posix_fallocate64(pVnode->logFd, 0, pVnode->mappingSize) != 0) {
-    dError("vid:%d, logfd:%d, failed to alloc file size:%d, reason:%s", vnode, pVnode->logFd, pVnode->mappingSize, strerror(errno));
-    perror("fallocate failed");
-    goto _err_log_open;
-  }
-
-  struct stat statbuf;
-  stat(fileName, &statbuf);
-  int64_t length = statbuf.st_size;
-
-  if (length != pVnode->mappingSize) {
-    dError("vid:%d, logfd:%d, alloc file size:%" PRId64 " not equal to mapping size:%" PRId64, vnode, pVnode->logFd, length,
-           pVnode->mappingSize);
-    goto _err_log_open;
-  }
-
-  pVnode->pMem = mmap(0, pVnode->mappingSize, PROT_WRITE | PROT_READ, MAP_SHARED, pVnode->logFd, 0);
-  if (pVnode->pMem == MAP_FAILED) {
-    dError("vid:%d, logfd:%d, failed to map file, reason:%s", vnode, pVnode->logFd, strerror(errno));
-    goto _err_log_open;
-  }
-
-  pVnode->pWrite = pVnode->pMem;
-  memcpy(pVnode->pWrite, &(firstV), sizeof(firstV));
-  pVnode->pWrite += sizeof(firstV);
-
-  return pVnode->logFd;
-
-  _err_log_open:
-  close(pVnode->logFd);
-  remove(fileName);
-  pVnode->logFd = -1;
-  return -1;
-}
-
-int vnodeRenewCommitLog(int vnode) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  char *     fileName = pVnode->logFn;
-  char *     oldName = pVnode->logOFn;
-
-  pthread_mutex_lock(&(pVnode->logMutex));
-
-  if (FD_VALID(pVnode->logFd)) {
-    munmap(pVnode->pMem, pVnode->mappingSize);
-    close(pVnode->logFd);
-    rename(fileName, oldName);
-  }
-
-  if (pVnode->cfg.commitLog) vnodeOpenCommitLog(vnode, vnodeList[vnode].version);
-
-  pthread_mutex_unlock(&(pVnode->logMutex));
-
-  return pVnode->logFd;
-}
-
-void vnodeRemoveCommitLog(int vnode) { remove(vnodeList[vnode].logOFn); }
-
-size_t vnodeRestoreDataFromLog(int vnode, char *fileName, uint64_t *firstV) {
-  int    fd, ret;
-  char * cont = NULL;
-  size_t totalLen = 0;
-  int    actions = 0;
-
-  SVnodeObj *pVnode = vnodeList + vnode;
-  if (pVnode->meterList == NULL) {
-    dError("vid:%d, vnode is not initialized!!!", vnode);
-    return 0;
-  }
-
-  struct stat fstat;
-  if (stat(fileName, &fstat) < 0) {
-    dTrace("vid:%d, no log file:%s", vnode, fileName);
-    return 0;
-  }
-
-  dTrace("vid:%d, uncommitted data in file:%s, restore them ...", vnode, fileName);
-
-  fd = open(fileName, O_RDWR);
-  if (fd < 0) {
-    dError("vid:%d, failed to open:%s, reason:%s", vnode, fileName, strerror(errno));
-    goto _error;
-  }
-
-  ret = read(fd, firstV, sizeof(pVnode->version));
-  if (ret <= 0) {
-    dError("vid:%d, failed to read version", vnode);
-    goto _error;
-  }
-  pVnode->version = *firstV;
-
-  int32_t bufLen = TSDB_PAYLOAD_SIZE;
-  cont = calloc(1, bufLen);
-  if (cont == NULL) {
-    dError("vid:%d, out of memory", vnode);
-    goto _error;
-  }
-  TSKEY now = taosGetTimestamp(pVnode->cfg.precision);
-
-  SCommitHead head;
-  int simpleCheck = 0;
-  while (1) {
-    ret = read(fd, &head, sizeof(head));
-    if (ret < 0) goto _error;
-    if (ret == 0) break;
-    if (((head.sversion+head.sid+head.contLen+head.action) & 0xFFFFFF) != head.simpleCheck) break;
-    simpleCheck = head.simpleCheck;
-
-    // head.contLen validation is removed
-    if (head.sid >= pVnode->cfg.maxSessions || head.sid < 0 || head.action >= TSDB_ACTION_MAX) {
-      dError("vid, invalid commit head, sid:%d contLen:%d action:%d", head.sid, head.contLen, head.action);
-    } else {
-      if (head.contLen > 0) {
-        if (bufLen < head.contLen+sizeof(simpleCheck)) {  // pre-allocated buffer is not enough
-          cont = realloc(cont, head.contLen+sizeof(simpleCheck));
-          bufLen = head.contLen+sizeof(simpleCheck);
-        }
-
-        if (read(fd, cont, head.contLen+sizeof(simpleCheck)) < 0) goto _error;
-        if (*(int *)(cont+head.contLen) != simpleCheck) break;
-        SMeterObj *pObj = pVnode->meterList[head.sid];
-        if (pObj == NULL) {
-          dError("vid:%d, sid:%d not exists, ignore data in commit log, contLen:%d action:%d",
-              vnode, head.sid, head.contLen, head.action);
-          continue;
-        }
-
-        if (vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) {
-          dWarn("vid:%d sid:%d id:%s, meter is dropped, ignore data in commit log, contLen:%d action:%d",
-                 vnode, head.sid, head.contLen, head.action);
-          continue;
-        }
-
-        int32_t numOfPoints = 0;
-        (*vnodeProcessAction[head.action])(pObj, cont, head.contLen, TSDB_DATA_SOURCE_LOG, NULL, head.sversion,
-                                           &numOfPoints, now);
-        actions++;
-      } else {
-        break;
-      }
-    }
-
-    totalLen += sizeof(head) + head.contLen + sizeof(simpleCheck);
-  }
-
-  tclose(fd);
-  tfree(cont);
-  dTrace("vid:%d, %d pieces of uncommitted data are restored", vnode, actions);
-
-  return totalLen;
-
-_error:
-  tclose(fd);
-  tfree(cont);
-  dError("vid:%d, failed to restore %s, remove this node...", vnode, fileName);
-
-  // rename to error file for future process
-  char *f = NULL;
-  taosFileRename(fileName, "error", '/', &f);
-  free(f);
-
-  return -1;
-}
-
-int vnodeInitCommit(int vnode) {
-  size_t     size = 0;
-  uint64_t   firstV = 0;
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  pthread_mutex_init(&(pVnode->logMutex), NULL);
-
-  sprintf(pVnode->logFn, "%s/vnode%d/db/submit%d.log", tsDirectory, vnode, vnode);
-  sprintf(pVnode->logOFn, "%s/vnode%d/db/submit%d.olog", tsDirectory, vnode, vnode);
-  pVnode->mappingSize = ((int64_t)pVnode->cfg.cacheBlockSize) * pVnode->cfg.cacheNumOfBlocks.totalBlocks * 1.5;
-  pVnode->mappingThreshold = pVnode->mappingSize * 0.7;
-
-  // restore from .olog file and commit to file
-  size = vnodeRestoreDataFromLog(vnode, pVnode->logOFn, &firstV);
-  if (size < 0) return -1;
-  if (size > 0) {
-    if (pVnode->commitInProcess == 0) vnodeCommitToFile(pVnode);
-    remove(pVnode->logOFn);
-  }
-
-  // restore from .log file to cache
-  size = vnodeRestoreDataFromLog(vnode, pVnode->logFn, &firstV);
-  if (size < 0) return -1;
-
-  if (pVnode->cfg.commitLog == 0) return 0;
-
-  if (size == 0) firstV = pVnode->version;
-  if (vnodeOpenCommitLog(vnode, firstV) < 0) {
-    dError("vid:%d, commit log init failed", vnode);
-    return -1;
-  }
-
-  pVnode->pWrite += size;
-  dPrint("vid:%d, commit log is initialized", vnode);
-
-  return 0;
-}
-
-void vnodeCleanUpCommit(int vnode) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  if (FD_VALID(pVnode->logFd)) close(pVnode->logFd);
-
-  if (pVnode->cfg.commitLog && (pVnode->logFd > 0 && remove(pVnode->logFn) < 0)) {
-    dError("vid:%d, failed to remove:%s", vnode, pVnode->logFn);
-    taosLogError("vid:%d, failed to remove:%s", vnode, pVnode->logFn);
-  }
-
-  pthread_mutex_destroy(&(pVnode->logMutex));
-}
-
-int vnodeWriteToCommitLog(SMeterObj *pObj, char action, char *cont, int contLen, int sverion) {
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-  if (pVnode->pWrite == NULL) return 0;
-
-  SCommitHead head;
-  head.sid = pObj->sid;
-  head.action = action;
-  head.sversion = pObj->sversion;
-  head.contLen = contLen;
-  head.simpleCheck = (head.sversion+head.sid+head.contLen+head.action) & 0xFFFFFF;
-  int simpleCheck = head.simpleCheck;
-
-  pthread_mutex_lock(&(pVnode->logMutex));
-  // 100 bytes redundant mem space
-  if (pVnode->mappingSize - (pVnode->pWrite - pVnode->pMem) < contLen + sizeof(SCommitHead) + sizeof(simpleCheck) + 100) {
-    pthread_mutex_unlock(&(pVnode->logMutex));
-    dTrace("vid:%d, mem mapping space is not enough, wait for commit", pObj->vnode);
-    vnodeProcessCommitTimer(pVnode, NULL);
-    return TSDB_CODE_ACTION_IN_PROGRESS;
-  }
-  char *pWrite = pVnode->pWrite;
-  pVnode->pWrite += sizeof(head) + contLen + sizeof(simpleCheck);
-  memcpy(pWrite, (char *)&head, sizeof(head));
-  memcpy(pWrite + sizeof(head), cont, contLen);
-  memcpy(pWrite + sizeof(head) + contLen, &simpleCheck, sizeof(simpleCheck));
-  pthread_mutex_unlock(&(pVnode->logMutex));
-
-  if (pVnode->pWrite - pVnode->pMem > pVnode->mappingThreshold) {
-    dTrace("vid:%d, mem mapping is close to limit, commit", pObj->vnode);
-    vnodeProcessCommitTimer(pVnode, NULL);
-  }
-
-  dTrace("vid:%d sid:%d, data is written to commit log", pObj->vnode, pObj->sid);
-
-  return 0;
-}
diff --git a/src/system/detail/src/vnodeFile.c b/src/system/detail/src/vnodeFile.c
deleted file mode 100644
index 9c53d47507b18582333aa64abc9f39fb1cab5407..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeFile.c
+++ /dev/null
@@ -1,1880 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "tscompression.h"
-#include "tutil.h"
-#include "vnode.h"
-#include "vnodeFile.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-#define FILE_QUERY_NEW_BLOCK -5  // a special negative number
-
-const int16_t vnodeFileVersion = 0;
-
-int (*pCompFunc[])(const char *const input, int inputSize, const int elements, char *const output, int outputSize,
-                   char algorithm, char *const buffer, int bufferSize) = {NULL,
-                                          tsCompressBool,
-                                          tsCompressTinyint,
-                                          tsCompressSmallint,
-                                          tsCompressInt,
-                                          tsCompressBigint,
-                                          tsCompressFloat,
-                                          tsCompressDouble,
-                                          tsCompressString,
-                                          tsCompressTimestamp,
-                                          tsCompressString};
-
-int (*pDecompFunc[])(const char *const input, int compressedSize, const int elements, char *const output,
-                     int outputSize, char algorithm, char *const buffer, int bufferSize) = {NULL,
-                                                            tsDecompressBool,
-                                                            tsDecompressTinyint,
-                                                            tsDecompressSmallint,
-                                                            tsDecompressInt,
-                                                            tsDecompressBigint,
-                                                            tsDecompressFloat,
-                                                            tsDecompressDouble,
-                                                            tsDecompressString,
-                                                            tsDecompressTimestamp,
-                                                            tsDecompressString};
-
-int vnodeUpdateFileMagic(int vnode, int fileId);
-int vnodeRecoverCompHeader(int vnode, int fileId);
-int vnodeRecoverHeadFile(int vnode, int fileId);
-int vnodeRecoverDataFile(int vnode, int fileId);
-int vnodeForwardStartPosition(SQuery *pQuery, SCompBlock *pBlock, int32_t slotIdx, SVnodeObj *pVnode, SMeterObj *pObj);
-int vnodeCheckNewHeaderFile(int fd, SVnodeObj *pVnode);
-char* vnodeGetDataDir(int vnode, int fileId);
-char* vnodeGetDiskFromHeadFile(char *headName);
-void vnodeAdustVnodeFile(SVnodeObj *pVnode);
-int vnodeSyncRetrieveFile(int vnode, int fd, uint32_t peerFid, uint64_t *fmagic);
-int vnodeSyncRestoreFile(int vnode, int sfd);
-void vnodeAdjustFileTier(int vnode);
-
-void vnodeGetHeadDataLname(char *headName, char *dataName, char *lastName, int vnode, int fileId) {
-  if (headName != NULL) sprintf(headName, "%s/vnode%d/db/v%df%d.head", tsDirectory, vnode, vnode, fileId);
-  if (dataName != NULL) sprintf(dataName, "%s/vnode%d/db/v%df%d.data", tsDirectory, vnode, vnode, fileId);
-  if (lastName != NULL) sprintf(lastName, "%s/vnode%d/db/v%df%d.last", tsDirectory, vnode, vnode, fileId);
-}
-
-void vnodeGetHeadDataDname(char *dHeadName, char *dDataName, char *dLastName, int vnode, int fileId, char *path) {
-  if (dHeadName != NULL) sprintf(dHeadName, "%s/data/vnode%d/v%df%d.head0", path, vnode, vnode, fileId);
-  if (dDataName != NULL) sprintf(dDataName, "%s/data/vnode%d/v%df%d.data", path, vnode, vnode, fileId);
-  if (dLastName != NULL) sprintf(dLastName, "%s/data/vnode%d/v%df%d.last0", path, vnode, vnode, fileId);
-}
-
-void vnodeGetDnameFromLname(char *lhead, char *ldata, char *llast, char *dhead, char *ddata, char *dlast) {
-  if (lhead != NULL) {
-    assert(dhead != NULL);
-    readlink(lhead, dhead, TSDB_FILENAME_LEN);
-  }
-
-  if (ldata != NULL) {
-    assert(ddata != NULL);
-    readlink(ldata, ddata, TSDB_FILENAME_LEN);
-  }
-
-  if (llast != NULL) {
-    assert(dlast != NULL);
-    readlink(llast, dlast, TSDB_FILENAME_LEN);
-  }
-}
-
-void vnodeGetHeadTname(char *nHeadName, char *nLastName, int vnode, int fileId) {
-  if (nHeadName != NULL) sprintf(nHeadName, "%s/vnode%d/db/v%df%d.t", tsDirectory, vnode, vnode, fileId);
-  if (nLastName != NULL) sprintf(nLastName, "%s/vnode%d/db/v%df%d.l", tsDirectory, vnode, vnode, fileId);
-}
-
-void vnodeCreateDataDirIfNeeded(int vnode, char *path) {
-  char directory[TSDB_FILENAME_LEN] = "\0";
-
-  sprintf(directory, "%s/data/vnode%d", path, vnode);
-
-  if (access(directory, F_OK) != 0) mkdir(directory, 0755);
-}
-
-int vnodeCreateHeadDataFile(int vnode, int fileId, char *headName, char *dataName, char *lastName) {
-  char dHeadName[TSDB_FILENAME_LEN];
-  char dDataName[TSDB_FILENAME_LEN];
-  char dLastName[TSDB_FILENAME_LEN];
-
-  char *path = vnodeGetDataDir(vnode, fileId);
-  if (path == NULL) {
-    dError("vid:%d, fileId:%d, failed to get dataDir", vnode, fileId);
-    return -1;
-  }
-  
-  vnodeCreateDataDirIfNeeded(vnode, path);
-
-  vnodeGetHeadDataLname(headName, dataName, lastName, vnode, fileId);
-  vnodeGetHeadDataDname(dHeadName, dDataName, dLastName, vnode, fileId, path);
-  if (symlink(dHeadName, headName) != 0) return -1;
-  if (symlink(dDataName, dataName) != 0) return -1;
-  if (symlink(dLastName, lastName) != 0) return -1;
-
-  dPrint("vid:%d, fileId:%d, empty header file:%s dataFile:%s lastFile:%s on disk:%s is created ",
-          vnode, fileId, headName, dataName, lastName, path);
-
-  return 0;
-}
-
-int vnodeCreateEmptyCompFile(int vnode, int fileId) {
-  char  headName[TSDB_FILENAME_LEN];
-  char  dataName[TSDB_FILENAME_LEN];
-  char  lastName[TSDB_FILENAME_LEN];
-  int   tfd;
-  char *temp;
-
-  if (vnodeCreateHeadDataFile(vnode, fileId, headName, dataName, lastName) < 0) {
-    dError("failed to create head data file, vnode: %d, fileId: %d", vnode, fileId);
-    return -1;
-  }
-
-  tfd = open(headName, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (tfd < 0) {
-    dError("failed to create head file:%s, reason:%s", headName, strerror(errno));
-    return -1;
-  }
-
-  vnodeCreateFileHeaderFd(tfd);
-  int size = sizeof(SCompHeader) * vnodeList[vnode].cfg.maxSessions + sizeof(TSCKSUM);
-  temp = malloc(size);
-  memset(temp, 0, size);
-  taosCalcChecksumAppend(0, (uint8_t *)temp, size);
-
-  lseek(tfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  twrite(tfd, temp, size);
-  free(temp);
-  close(tfd);
-
-  tfd = open(dataName, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (tfd < 0) {
-    dError("failed to create data file:%s, reason:%s", dataName, strerror(errno));
-    return -1;
-  }
-  vnodeCreateFileHeaderFd(tfd);
-  close(tfd);
-
-  tfd = open(lastName, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (tfd < 0) {
-    dError("failed to create last file:%s, reason:%s", lastName, strerror(errno));
-    return -1;
-  }
-  vnodeCreateFileHeaderFd(tfd);
-  close(tfd);
-
-  return 0;
-}
-
-int vnodeCreateNeccessaryFiles(SVnodeObj *pVnode) {
-  int        numOfFiles = 0, fileId, filesAdded = 0;
-  int        vnode = pVnode->vnode;
-  SVnodeCfg *pCfg = &(pVnode->cfg);
-
-  if (pVnode->lastKeyOnFile == 0) {
-    if (pCfg->daysPerFile == 0) pCfg->daysPerFile = 10;
-    pVnode->fileId = pVnode->firstKey / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile;
-    pVnode->lastKeyOnFile = (int64_t)(pVnode->fileId + 1) * pCfg->daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 1;
-    pVnode->numOfFiles = 1;
-    if (vnodeCreateEmptyCompFile(vnode, pVnode->fileId) < 0) return -1;
-  }
-
-  numOfFiles = (pVnode->lastKeyOnFile - pVnode->commitFirstKey) / tsMsPerDay[(uint8_t)pVnode->cfg.precision] / pCfg->daysPerFile;
-  if (pVnode->commitFirstKey > pVnode->lastKeyOnFile) numOfFiles = -1;
-
-  dTrace("vid:%d, commitFirstKey:%" PRId64 " lastKeyOnFile:%" PRId64 " numOfFiles:%d fileId:%d vnodeNumOfFiles:%d", pVnode->vnode,
-         pVnode->commitFirstKey, pVnode->lastKeyOnFile, numOfFiles, pVnode->fileId, pVnode->numOfFiles);
-
-  if (numOfFiles >= pVnode->numOfFiles) {
-    // create empty header files backward
-    filesAdded = numOfFiles - pVnode->numOfFiles + 1;
-    assert(filesAdded <= pVnode->maxFiles + 2);
-    for (int i = 0; i < filesAdded; ++i) {
-      fileId = pVnode->fileId - pVnode->numOfFiles - i;
-      if (vnodeCreateEmptyCompFile(vnode, fileId) < 0) 
-#ifdef CLUSTER	  
-	    return vnodeRecoverFromPeer(pVnode, fileId);
-#else
-      return -1;
-#endif				
-    }
-  } else if (numOfFiles < 0) {
-    // create empty header files forward
-    pVnode->fileId++;
-    if (vnodeCreateEmptyCompFile(vnode, pVnode->fileId) < 0) 
-#ifdef CLUSTER	  
-	    return vnodeRecoverFromPeer(pVnode, pVnode->fileId);
-#else
-      return -1;
-#endif
-    pVnode->lastKeyOnFile += (int64_t)tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile;
-    filesAdded = 1;
-    numOfFiles = 0;  // hacker way
-  }
-
-  fileId = pVnode->fileId - numOfFiles;
-  pVnode->commitLastKey =
-      pVnode->lastKeyOnFile - (int64_t)numOfFiles * tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile;
-  pVnode->commitFirstKey = pVnode->commitLastKey - (int64_t)tsMsPerDay[(uint8_t)pVnode->cfg.precision] * pCfg->daysPerFile + 1;
-  pVnode->commitFileId = fileId;
-  pVnode->numOfFiles = pVnode->numOfFiles + filesAdded;
-
-  return 0;
-}
-
-
-int vnodeOpenCommitFiles(SVnodeObj *pVnode, int noTempLast) {
-  char        name[TSDB_FILENAME_LEN];
-  char        dHeadName[TSDB_FILENAME_LEN] = "\0";
-  char        dLastName[TSDB_FILENAME_LEN] = "\0";
-  int         len = 0;
-  struct stat filestat;
-  int         vnode = pVnode->vnode;
-  int         fileId;
-
-  if (vnodeCreateNeccessaryFiles(pVnode) < 0) return -1;
-
-  fileId = pVnode->commitFileId;
-
-  dTrace("vid:%d, commit fileId:%d, commitLastKey:%" PRId64 ", vnodeLastKey:%" PRId64 ", lastKeyOnFile:%" PRId64 " numOfFiles:%d",
-      vnode, fileId, pVnode->commitLastKey, pVnode->lastKey, pVnode->lastKeyOnFile, pVnode->numOfFiles);
-
-  int minSize = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM) + TSDB_FILE_HEADER_LEN;
-
-  vnodeGetHeadDataLname(pVnode->cfn, name, pVnode->lfn, vnode, fileId);
-  readlink(pVnode->cfn, dHeadName, TSDB_FILENAME_LEN);
-  readlink(pVnode->lfn, dLastName, TSDB_FILENAME_LEN);
-  len = strlen(dHeadName);
-  if (dHeadName[len - 1] == 'd') {
-    dHeadName[len] = '0';
-    dHeadName[len + 1] = '\0';
-  } else {
-    dHeadName[len - 1] = '0' + (dHeadName[len - 1] + 1 - '0') % 2;
-  }
-  len = strlen(dLastName);
-  if (dLastName[len - 1] == 't') {
-    dLastName[len] = '0';
-    dLastName[len + 1] = '\0';
-  } else {
-    dLastName[len - 1] = '0' + (dLastName[len - 1] + 1 - '0') % 2;
-  }
-  vnodeGetHeadTname(pVnode->nfn, pVnode->tfn, vnode, fileId);
-  symlink(dHeadName, pVnode->nfn);
-  if (!noTempLast) symlink(dLastName, pVnode->tfn);
-
-  // open head file
-  pVnode->hfd = open(pVnode->cfn, O_RDONLY);
-  if (pVnode->hfd < 0) {
-    dError("vid:%d, failed to open head file:%s, reason:%s", vnode, pVnode->cfn, strerror(errno));
-    taosLogError("vid:%d, failed to open head file:%s, reason:%s", vnode, pVnode->cfn, strerror(errno));
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-
-  // verify head file, check size
-  fstat(pVnode->hfd, &filestat);
-  if (filestat.st_size < minSize) {
-    dError("vid:%d, head file:%s corrupted", vnode, pVnode->cfn);
-    taosLogError("vid:%d, head file:%s corrupted", vnode, pVnode->cfn);
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-
-  // open a new header file
-  pVnode->nfd = open(pVnode->nfn, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (pVnode->nfd < 0) {
-    dError("vid:%d, failed to open new head file:%s, reason:%s", vnode, pVnode->nfn, strerror(errno));
-    taosLogError("vid:%d, failed to open new head file:%s, reason:%s", vnode, pVnode->nfn, strerror(errno));
-    goto _error;
-  }
-  vnodeCreateFileHeaderFd(pVnode->nfd);
-
-  // open existing data file
-  pVnode->dfd = open(name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (pVnode->dfd < 0) {
-    dError("vid:%d, failed to open data file:%s, reason:%s", vnode, name, strerror(errno));
-    taosLogError("vid:%d, failed to open data file:%s, reason:%s", vnode, name, strerror(errno));
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-
-  // verify data file, check size
-  fstat(pVnode->dfd, &filestat);
-  if (filestat.st_size < TSDB_FILE_HEADER_LEN) {
-    dError("vid:%d, data file:%s corrupted", vnode, name);
-    taosLogError("vid:%d, data file:%s corrupted", vnode, name);
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  } else {
-    dPrint("vid:%d, data file:%s is opened to write", vnode, name);
-  }
-
-  // open last file
-  pVnode->lfd = open(pVnode->lfn, O_RDWR);
-  if (pVnode->lfd < 0) {
-    dError("vid:%d, failed to open last file:%s, reason:%s", vnode, pVnode->lfn, strerror(errno));
-    taosLogError("vid:%d, failed to open last file:%s, reason:%s", vnode, pVnode->lfn, strerror(errno));
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-
-  // verify last file, check size
-  fstat(pVnode->lfd, &filestat);
-  if (filestat.st_size < TSDB_FILE_HEADER_LEN) {
-    dError("vid:%d, last file:%s corrupted", vnode, pVnode->lfn);
-    taosLogError("vid:%d, last file:%s corrupted", vnode, pVnode->lfn);
-    vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-
-  // open a new last file
-  if (noTempLast) {
-    pVnode->tfd = -1;  // do not open temporary last file
-  } else {
-    pVnode->tfd = open(pVnode->tfn, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-    if (pVnode->tfd < 0) {
-      dError("vid:%d, failed to open new last file:%s, reason:%s", vnode, pVnode->tfn, strerror(errno));
-      taosLogError("vid:%d, failed to open new last file:%s, reason:%s", vnode, pVnode->tfn, strerror(errno));
-      goto _error;
-    }
-    vnodeCreateFileHeaderFd(pVnode->tfd);
-    pVnode->lfSize = lseek(pVnode->tfd, 0, SEEK_END);
-  }
-
-  int   size = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM);
-  char *temp = malloc(size);
-  if (NULL == temp) {
-    dError("vid:%d, malloc failed", vnode);
-    taosLogError("vid:%d, malloc failed", vnode);
-    //vnodeRecoverFromPeer(pVnode, fileId);
-    goto _error;
-  }
-  memset(temp, 0, size);
-  
-  taosCalcChecksumAppend(0, (uint8_t *)temp, size);
-  twrite(pVnode->nfd, temp, size);
-  free(temp);
-
-  pVnode->dfSize = lseek(pVnode->dfd, 0, SEEK_END);
-
-  return 0;
-
-_error:
-  if (pVnode->dfd > 0) close(pVnode->dfd);
-  pVnode->dfd = 0;
-
-  if (pVnode->hfd > 0) close(pVnode->hfd);
-  pVnode->hfd = 0;
-
-  if (pVnode->nfd > 0) close(pVnode->nfd);
-  pVnode->nfd = 0;
-
-  if (pVnode->lfd > 0) close(pVnode->lfd);
-  pVnode->lfd = 0;
-
-  if (pVnode->tfd > 0) close(pVnode->tfd);
-  pVnode->tfd = 0;
-
-  return -1;
-}
-
-void vnodeRemoveFile(int vnode, int fileId) {
-  char           headName[TSDB_FILENAME_LEN] = "\0";
-  char           dataName[TSDB_FILENAME_LEN] = "\0";
-  char           lastName[TSDB_FILENAME_LEN] = "\0";
-  char           dHeadName[TSDB_FILENAME_LEN] = "\0";
-  char           dDataName[TSDB_FILENAME_LEN] = "\0";
-  char           dLastName[TSDB_FILENAME_LEN] = "\0";
-  SVnodeObj *    pVnode = NULL;
-  SVnodeHeadInfo headInfo;
-
-  pVnode = vnodeList + vnode;
-
-  vnodeGetHeadDataLname(headName, dataName, lastName, vnode, fileId);
-  char *path = vnodeGetDiskFromHeadFile(headName);
-  if (path == NULL) {
-    return ;
-  }	
-  vnodeGetDnameFromLname(headName, dataName, lastName, dHeadName, dDataName, dLastName);
-
-  int fd = open(headName, O_RDWR | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (fd > 0) {
-    vnodeGetHeadFileHeaderInfo(fd, &headInfo);
-    atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), -headInfo.totalStorage);
-    close(fd);
-  }
-
-  remove(headName);
-  remove(dataName);
-  remove(lastName);
-  remove(dHeadName);
-  remove(dDataName);
-  remove(dLastName);
-
-  dPrint("vid:%d fileId:%d on disk: %s is removed, numOfFiles:%d maxFiles:%d", vnode, fileId, path,
-         pVnode->numOfFiles, pVnode->maxFiles);
-}
-
-void vnodeCloseCommitFiles(SVnodeObj *pVnode) {
-  char dpath[TSDB_FILENAME_LEN] = "\0";
-  int  ret;
-
-  // Check new if new header file is correct
-  if (tsCheckHeaderFile != 0) {
-    assert(vnodeCheckNewHeaderFile(pVnode->nfd, pVnode) == 0);
-  }
-
-  close(pVnode->nfd);
-  pVnode->nfd = 0;
-
-  close(pVnode->hfd);
-  pVnode->hfd = 0;
-
-  close(pVnode->dfd);
-  pVnode->dfd = 0;
-
-  close(pVnode->lfd);
-  pVnode->lfd = 0;
-
-  if (pVnode->tfd > 0) close(pVnode->tfd);
-
-  pthread_mutex_lock(&(pVnode->vmutex));
-
-  readlink(pVnode->cfn, dpath, TSDB_FILENAME_LEN);
-  ret = rename(pVnode->nfn, pVnode->cfn);
-  if (ret < 0) {
-    dError("vid:%d, failed to rename:%s, reason:%s", pVnode->vnode, pVnode->nfn, strerror(errno));
-  }
-  remove(dpath);
-
-  if (pVnode->tfd > 0) {
-    memset(dpath, 0, TSDB_FILENAME_LEN);
-    readlink(pVnode->lfn, dpath, TSDB_FILENAME_LEN);
-    ret = rename(pVnode->tfn, pVnode->lfn);
-    if (ret < 0) {
-      dError("vid:%d, failed to rename:%s, reason:%s", pVnode->vnode, pVnode->tfn, strerror(errno));
-    }
-    remove(dpath);
-  }
-
-  pthread_mutex_unlock(&(pVnode->vmutex));
-
-  pVnode->tfd = 0;
-
-  dTrace("vid:%d, %s and %s is saved", pVnode->vnode, pVnode->cfn, pVnode->lfn);
-  vnodeAdustVnodeFile(pVnode);
-  vnodeSaveAllMeterObjToFile(pVnode->vnode);
-
-  return;
-}
-
-void vnodeBroadcastStatusToUnsyncedPeer(SVnodeObj *pVnode);
-
-void *vnodeCommitMultiToFile(SVnodeObj *pVnode, int ssid, int esid) {
-  int              vnode = pVnode->vnode;
-  SData *          data[TSDB_MAX_COLUMNS], *cdata[TSDB_MAX_COLUMNS];  // first 4 bytes are length
-  char *           buffer = NULL, *dmem = NULL, *cmem = NULL, *hmem = NULL, *tmem = NULL;
-  SMeterObj *      pObj = NULL;
-  SCompInfo        compInfo = {0};
-  SCompHeader *    pHeader;
-  SMeterInfo *     meterInfo = NULL, *pMeter = NULL;
-  SQuery           query;
-  SColumnInfoEx    colList[TSDB_MAX_COLUMNS] = {0};
-  SSqlFunctionExpr pExprs[TSDB_MAX_COLUMNS] = {0};
-  int              commitAgain;
-  int              headLen, sid, col;
-  int64_t          pointsRead;
-  int64_t          pointsReadLast;
-  SCompBlock *     pCompBlock = NULL;
-  SVnodeCfg *      pCfg = &pVnode->cfg;
-  TSCKSUM          chksum;
-  SVnodeHeadInfo   headInfo;
-  uint8_t *        pOldCompBlocks;
-
-  dPrint("vid:%d, committing to file, firstKey:%" PRId64 " lastKey:%" PRId64 " ssid:%d esid:%d", vnode, pVnode->firstKey,
-         pVnode->lastKey, ssid, esid);
-  if (pVnode->lastKey == 0) goto _over;
-
-  vnodeCloseAllSyncFds(vnode);
-  vnodeRenewCommitLog(vnode);
-
-  // get the MAX consumption buffer for this vnode
-  int32_t maxBytesPerPoint = 0;
-  int32_t minBytesPerPoint = INT32_MAX;
-  for (sid = ssid; sid <= esid; ++sid) {
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    if ((pObj == NULL) || (pObj->pCache == NULL)) continue;
-
-    if (maxBytesPerPoint < pObj->bytesPerPoint) {
-      maxBytesPerPoint = pObj->bytesPerPoint;
-    }
-    if (minBytesPerPoint > pObj->bytesPerPoint) {
-      minBytesPerPoint = pObj->bytesPerPoint;
-    }
-  }
-
-  // buffer to hold the temp head
-  int tcachblocks = pCfg->cacheBlockSize / (minBytesPerPoint * pCfg->rowsInFileBlock);
-
-  int hmsize =
-      (pCfg->cacheNumOfBlocks.totalBlocks * (MAX(tcachblocks, 1) + 1) + pCfg->maxSessions) * sizeof(SCompBlock);
-
-  // buffer to hold the uncompressed data
-  int dmsize =
-      maxBytesPerPoint * pCfg->rowsInFileBlock + (sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM)) * TSDB_MAX_COLUMNS;
-
-  // buffer to hold the compressed data
-  int cmsize =
-      maxBytesPerPoint * pCfg->rowsInFileBlock + (sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM)) * TSDB_MAX_COLUMNS;
-
-  // buffer to hold compHeader
-  int tmsize = sizeof(SCompHeader) * pCfg->maxSessions + sizeof(TSCKSUM);
-
-  // buffer to hold meterInfo
-  int misize = pVnode->cfg.maxSessions * sizeof(SMeterInfo);
-
-  int totalSize = hmsize + dmsize + cmsize + misize + tmsize;
-  buffer = malloc(totalSize);
-  if (buffer == NULL) {
-    dError("no enough memory for committing buffer");
-    return NULL;
-  }
-
-  hmem = buffer;
-  dmem = hmem + hmsize;
-  cmem = dmem + dmsize;
-  tmem = cmem + cmsize;
-  meterInfo = (SMeterInfo *)(tmem + tmsize);
-
-  pthread_mutex_lock(&(pVnode->vmutex));
-  pVnode->commitFirstKey = pVnode->firstKey;
-  pVnode->firstKey = pVnode->lastKey + 1;
-  pthread_mutex_unlock(&(pVnode->vmutex));
-
-_again:
-  pVnode->commitInProcess = 1;
-  commitAgain = 0;
-  memset(hmem, 0, totalSize);
-  memset(&query, 0, sizeof(query));
-
-  if (vnodeOpenCommitFiles(pVnode, ssid) < 0) goto _over;
-  dTrace("vid:%d, start to commit, commitFirstKey:%" PRId64 " commitLastKey:%" PRId64, vnode, pVnode->commitFirstKey,
-         pVnode->commitLastKey);
-
-  headLen = 0;
-  vnodeGetHeadFileHeaderInfo(pVnode->hfd, &headInfo);
-  int maxOldBlocks = 1;
-
-  // read head info
-  if (pVnode->hfd) {
-    lseek(pVnode->hfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-    if (read(pVnode->hfd, tmem, tmsize) <= 0) {
-      dError("vid:%d, failed to read old header file:%s", vnode, pVnode->cfn);
-      taosLogError("vid:%d, failed to read old header file:%s", vnode, pVnode->cfn);
-      vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-      goto _over;
-    } else {
-      if (!taosCheckChecksumWhole((uint8_t *)tmem, tmsize)) {
-        dError("vid:%d, failed to read old header file:%s since comp header offset is broken", vnode, pVnode->cfn);
-        taosLogError("vid:%d, failed to read old header file:%s since comp header offset is broken",
-            vnode, pVnode->cfn);
-
-        vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-        goto _over;
-      }
-    }
-  }
-
-  // read compInfo
-  for (sid = 0; sid < pCfg->maxSessions; ++sid) {
-    if (pVnode->meterList == NULL) {  // vnode is being freed, abort
-      goto _over;
-    }
-
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    if (pObj == NULL) {
-      continue;
-    }
-
-    // meter is going to be deleted, abort
-    if (vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) {
-      dWarn("vid:%d sid:%d is dropped, ignore this meter", vnode, sid);
-      continue;
-    }
-
-    pMeter = meterInfo + sid;
-    pHeader = ((SCompHeader *)tmem) + sid;
-
-    if (pVnode->hfd > 0) {
-      if (pHeader->compInfoOffset > 0) {
-        lseek(pVnode->hfd, pHeader->compInfoOffset, SEEK_SET);
-        if (read(pVnode->hfd, &compInfo, sizeof(compInfo)) == sizeof(compInfo)) {
-          if (!taosCheckChecksumWhole((uint8_t *)(&compInfo), sizeof(SCompInfo))) {
-            dError("vid:%d sid:%d id:%s, failed to read compinfo in file:%s since checksum mismatch",
-                vnode, sid, pObj->meterId, pVnode->cfn);
-            taosLogError("vid:%d sid:%d id:%s, failed to read compinfo in file:%s since checksum mismatch",
-                vnode, sid, pObj->meterId, pVnode->cfn);
-            vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-            goto _over;
-          } else {
-            if (pObj->uid == compInfo.uid) {
-              pMeter->oldNumOfBlocks = compInfo.numOfBlocks;
-              pMeter->oldCompBlockOffset = pHeader->compInfoOffset + sizeof(SCompInfo);
-              pMeter->last = compInfo.last;
-              if (compInfo.numOfBlocks > maxOldBlocks) maxOldBlocks = compInfo.numOfBlocks;
-              if (pMeter->last) {
-                lseek(pVnode->hfd, sizeof(SCompBlock) * (compInfo.numOfBlocks - 1), SEEK_CUR);
-                read(pVnode->hfd, &pMeter->lastBlock, sizeof(SCompBlock));
-              }
-            } else {
-              dTrace("vid:%d sid:%d id:%s, uid:%" PRIu64 " is not matched with old:%" PRIu64 ", old data will be thrown away",
-                  vnode, sid, pObj->meterId, pObj->uid, compInfo.uid);
-              pMeter->oldNumOfBlocks = 0;
-            }
-          }
-        } else {
-          dError("vid:%d sid:%d id:%s, failed to read compinfo in file:%s", vnode, sid, pObj->meterId, pVnode->cfn);
-          vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-          goto _over;
-        }
-      }
-    }
-  }
-  // Loop To write data to fileId
-  for (sid = ssid; sid <= esid; ++sid) {
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    if ((pObj == NULL) || (pObj->pCache == NULL)) continue;
-
-    data[0] = (SData *)dmem;
-    cdata[0] = (SData *)cmem;
-    for (col = 1; col < pObj->numOfColumns; ++col) {
-      data[col] = (SData *)(((char *)data[col - 1]) + sizeof(SData) +
-                            pObj->pointsPerFileBlock * pObj->schema[col - 1].bytes + EXTRA_BYTES + sizeof(TSCKSUM));
-      cdata[col] = (SData *)(((char *)cdata[col - 1]) + sizeof(SData) +
-                             pObj->pointsPerFileBlock * pObj->schema[col - 1].bytes + EXTRA_BYTES + sizeof(TSCKSUM));
-    }
-
-    pMeter = meterInfo + sid;
-    pMeter->tempHeadOffset = headLen;
-
-    memset(&query, 0, sizeof(query));
-    query.colList = colList;
-    query.pSelectExpr = pExprs;
-
-    query.ekey = pVnode->commitLastKey;
-    query.skey = pVnode->commitFirstKey;
-    query.lastKey = query.skey;
-
-    query.sdata = data;
-    vnodeSetCommitQuery(pObj, &query);
-
-    dTrace("vid:%d sid:%d id:%s, start to commit, startKey:%" PRId64 " slot:%d pos:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           pObj->lastKeyOnFile, query.slot, query.pos);
-
-    pointsRead = 0;
-    pointsReadLast = 0;
-
-    // last block is at last file
-    if (pMeter->last) {
-      if ((pMeter->lastBlock.sversion != pObj->sversion) || (query.over)) {
-        // TODO : Check the correctness of this code. write the last block to
-        // .data file
-        pCompBlock = (SCompBlock *)(hmem + headLen);
-        assert(dmem - (char *)pCompBlock >= sizeof(SCompBlock));
-        *pCompBlock = pMeter->lastBlock;
-        if (pMeter->lastBlock.sversion != pObj->sversion) {
-          pCompBlock->last = 0;
-          pCompBlock->offset = lseek(pVnode->dfd, 0, SEEK_END);
-          pMeter->last = 0;
-          lseek(pVnode->lfd, pMeter->lastBlock.offset, SEEK_SET);
-          tsendfile(pVnode->dfd, pVnode->lfd, NULL, pMeter->lastBlock.len);
-          pVnode->dfSize = pCompBlock->offset + pMeter->lastBlock.len;
-        } else {
-          if (ssid == 0) {
-            assert(pCompBlock->last && pVnode->tfd != -1);
-            pCompBlock->offset = lseek(pVnode->tfd, 0, SEEK_END); 
-            lseek(pVnode->lfd, pMeter->lastBlock.offset, SEEK_SET);
-            tsendfile(pVnode->tfd, pVnode->lfd, NULL, pMeter->lastBlock.len);
-            pVnode->lfSize = pCompBlock->offset + pMeter->lastBlock.len;
-          } else {
-            assert(pVnode->tfd == -1);
-          }
-
-        }
-
-        headLen += sizeof(SCompBlock);
-        pMeter->newNumOfBlocks++;
-      } else {
-        // read last block into memory
-        if (vnodeReadLastBlockToMem(pObj, &pMeter->lastBlock, data) < 0) goto _over;
-        pMeter->last = 0;
-        pointsReadLast = pMeter->lastBlock.numOfPoints;
-        query.over = 0;
-        headInfo.totalStorage -= (pointsReadLast * pObj->bytesPerPoint);
-
-        dTrace("vid:%d sid:%d id:%s, points:%d in last block will be merged to new block",
-            pObj->vnode, pObj->sid, pObj->meterId, pointsReadLast);
-      }
-
-      pMeter->changed = 1;
-      pMeter->oldNumOfBlocks--;
-    }
-
-    while (query.over == 0) {
-      pCompBlock = (SCompBlock *)(hmem + headLen);
-      assert(dmem - (char *)pCompBlock >= sizeof(SCompBlock));
-      pointsRead += pointsReadLast;
-
-      while (pointsRead < pObj->pointsPerFileBlock) {
-        query.pointsToRead = pObj->pointsPerFileBlock - pointsRead;
-        query.pointsOffset = pointsRead;
-        pointsRead += vnodeQueryFromCache(pObj, &query);
-        if (query.over) break;
-      }
-
-      if (pointsRead == 0) break;
-
-      headInfo.totalStorage += ((pointsRead - pointsReadLast) * pObj->bytesPerPoint);
-      pCompBlock->last = 1;
-      if (vnodeWriteBlockToFile(pObj, pCompBlock, data, cdata, pointsRead) < 0) goto _over;
-      if (pCompBlock->keyLast > pObj->lastKeyOnFile) pObj->lastKeyOnFile = pCompBlock->keyLast;
-      pMeter->last = pCompBlock->last;
-
-      // write block info into header buffer
-      headLen += sizeof(SCompBlock);
-      pMeter->newNumOfBlocks++;
-      pMeter->committedPoints += (pointsRead - pointsReadLast);
-
-      dTrace("vid:%d sid:%d id:%s, pointsRead:%d, pointsReadLast:%d lastKey:%" PRId64 ", "
-             "slot:%d pos:%d newNumOfBlocks:%d headLen:%d",
-          pObj->vnode, pObj->sid, pObj->meterId, pointsRead, pointsReadLast, pObj->lastKeyOnFile, query.slot, query.pos,
-          pMeter->newNumOfBlocks, headLen);
-
-      if (pointsRead < pObj->pointsPerFileBlock || query.keyIsMet) break;
-
-      pointsRead = 0;
-      pointsReadLast = 0;
-    }
-
-    dTrace("vid:%d sid:%d id:%s, %d points are committed, lastKey:%" PRId64 " slot:%d pos:%d newNumOfBlocks:%d",
-        pObj->vnode, pObj->sid, pObj->meterId, pMeter->committedPoints, pObj->lastKeyOnFile, query.slot, query.pos,
-        pMeter->newNumOfBlocks);
-
-    if (pMeter->committedPoints > 0) {
-      pMeter->commitSlot = query.slot;
-      pMeter->commitPos = query.pos;
-    }
-
-    TSKEY nextKey = 0;
-    if (pObj->lastKey > pVnode->commitLastKey)
-      nextKey = pVnode->commitLastKey + 1;
-    else if (pObj->lastKey > pObj->lastKeyOnFile)
-      nextKey = pObj->lastKeyOnFile + 1;
-
-    pthread_mutex_lock(&(pVnode->vmutex));
-    if (nextKey < pVnode->firstKey && nextKey > 1) pVnode->firstKey = nextKey;
-    pthread_mutex_unlock(&(pVnode->vmutex));
-  }
-
-  if (pVnode->lastKey > pVnode->commitLastKey) commitAgain = 1;
-
-  dTrace("vid:%d, finish appending the data file", vnode);
-
-  // calculate the new compInfoOffset
-  int compInfoOffset = TSDB_FILE_HEADER_LEN + tmsize;
-  for (sid = 0; sid < pCfg->maxSessions; ++sid) {
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    pHeader = ((SCompHeader *)tmem) + sid;
-    if (pObj == NULL) {
-      pHeader->compInfoOffset = 0;
-      continue;
-    }
-
-    pMeter = meterInfo + sid;
-    pMeter->compInfoOffset = compInfoOffset;
-    pMeter->finalNumOfBlocks = pMeter->oldNumOfBlocks + pMeter->newNumOfBlocks;
-
-    if (pMeter->finalNumOfBlocks > 0) {
-      pHeader->compInfoOffset = pMeter->compInfoOffset;
-      compInfoOffset += sizeof(SCompInfo) + pMeter->finalNumOfBlocks * sizeof(SCompBlock) + sizeof(TSCKSUM);
-    } else {
-      pHeader->compInfoOffset = 0;
-    }
-
-    dTrace("vid:%d sid:%d id:%s, oldBlocks:%d numOfBlocks:%d compInfoOffset:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           pMeter->oldNumOfBlocks, pMeter->finalNumOfBlocks, compInfoOffset);
-  }
-
-  // write the comp header into new file
-  vnodeUpdateHeadFileHeader(pVnode->nfd, &headInfo);
-  lseek(pVnode->nfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  taosCalcChecksumAppend(0, (uint8_t *)tmem, tmsize);
-  if (twrite(pVnode->nfd, tmem, tmsize) <= 0) {
-    dError("vid:%d sid:%d id:%s, failed to write:%s, error:%s", vnode, sid, pObj->meterId, pVnode->nfn,
-           strerror(errno));
-    vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-    goto _over;
-  }
-
-  pOldCompBlocks = (uint8_t *)malloc(sizeof(SCompBlock) * maxOldBlocks);
-
-  // write the comp block list in new file
-  for (sid = 0; sid < pCfg->maxSessions; ++sid) {
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    if (pObj == NULL) continue;
-
-    pMeter = meterInfo + sid;
-    if (pMeter->finalNumOfBlocks <= 0) continue;
-
-    compInfo.last = pMeter->last;
-    compInfo.uid = pObj->uid;
-    compInfo.numOfBlocks = pMeter->finalNumOfBlocks;
-    /* compInfo.compBlockLen = pMeter->finalCompBlockLen; */
-    compInfo.delimiter = TSDB_VNODE_DELIMITER;
-    taosCalcChecksumAppend(0, (uint8_t *)(&compInfo), sizeof(SCompInfo));
-    lseek(pVnode->nfd, pMeter->compInfoOffset, SEEK_SET);
-    if (twrite(pVnode->nfd, &compInfo, sizeof(compInfo)) <= 0) {
-      dError("vid:%d sid:%d id:%s, failed to write:%s, reason:%s", vnode, sid, pObj->meterId, pVnode->nfn,
-             strerror(errno));
-      vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-      goto _over;
-    }
-
-    // write the old comp blocks
-    chksum = 0;
-    if (pVnode->hfd && pMeter->oldNumOfBlocks) {
-      lseek(pVnode->hfd, pMeter->oldCompBlockOffset, SEEK_SET);
-      if (pMeter->changed) {
-        int compBlockLen = pMeter->oldNumOfBlocks * sizeof(SCompBlock);
-        read(pVnode->hfd, pOldCompBlocks, compBlockLen);
-        twrite(pVnode->nfd, pOldCompBlocks, compBlockLen);
-        chksum = taosCalcChecksum(0, pOldCompBlocks, compBlockLen);
-      } else {
-        tsendfile(pVnode->nfd, pVnode->hfd, NULL, pMeter->oldNumOfBlocks * sizeof(SCompBlock));
-        read(pVnode->hfd, &chksum, sizeof(TSCKSUM));
-      }
-    }
-
-    if (pMeter->newNumOfBlocks) {
-      chksum = taosCalcChecksum(chksum, (uint8_t *)(hmem + pMeter->tempHeadOffset),
-                                pMeter->newNumOfBlocks * sizeof(SCompBlock));
-      if (twrite(pVnode->nfd, hmem + pMeter->tempHeadOffset, pMeter->newNumOfBlocks * sizeof(SCompBlock)) <= 0) {
-        dError("vid:%d sid:%d id:%s, failed to write:%s, reason:%s", vnode, sid, pObj->meterId, pVnode->nfn,
-               strerror(errno));
-        vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-        goto _over;
-      }
-    }
-    twrite(pVnode->nfd, &chksum, sizeof(TSCKSUM));
-  }
-
-  tfree(pOldCompBlocks);
-  dTrace("vid:%d, finish writing the new header file:%s", vnode, pVnode->nfn);
-  vnodeCloseCommitFiles(pVnode);
-
-  for (sid = ssid; sid <= esid; ++sid) {
-    pObj = (SMeterObj *)(pVnode->meterList[sid]);
-    if (pObj == NULL) continue;
-
-    pMeter = meterInfo + sid;
-    if (pMeter->finalNumOfBlocks <= 0) continue;
-
-    if (pMeter->committedPoints > 0) {
-      vnodeUpdateCommitInfo(pObj, pMeter->commitSlot, pMeter->commitPos, pMeter->commitCount);
-    }
-  }
-
-  if (commitAgain) {
-    pVnode->commitFirstKey = pVnode->commitLastKey + 1;
-    goto _again;
-  }
-
-  vnodeRemoveCommitLog(vnode);
-
-_over:
-  pVnode->commitInProcess = 0;
-  vnodeCommitOver(pVnode);
-  memset(&(vnodeList[vnode].commitThread), 0, sizeof(vnodeList[vnode].commitThread));
-  tfree(buffer);
-  tfree(pOldCompBlocks);
-
-  vnodeBroadcastStatusToUnsyncedPeer(pVnode);
-  dPrint("vid:%d, committing is over", vnode);
-
-  return pVnode;
-}
-
-void *vnodeCommitToFile(void *param) {
-  SVnodeObj *pVnode = (SVnodeObj *)param;
-
-  return vnodeCommitMultiToFile(pVnode, 0, pVnode->cfg.maxSessions - 1);
-}
-
-int vnodeGetCompBlockInfo(SMeterObj *pObj, SQuery *pQuery) {
-  char        prefix[TSDB_FILENAME_LEN];
-  char        fileName[TSDB_FILENAME_LEN];
-  SCompHeader compHeader;
-  SCompInfo   compInfo;
-  struct stat fstat;
-  SVnodeObj * pVnode = &vnodeList[pObj->vnode];
-  char *      buffer = NULL;
-  TSCKSUM     chksum;
-
-  vnodeFreeFields(pQuery);
-  tfree(pQuery->pBlock);
-
-  pQuery->numOfBlocks = 0;
-  SVnodeCfg *pCfg = &vnodeList[pObj->vnode].cfg;
-
-  if (pQuery->hfd > 0) close(pQuery->hfd);
-  sprintf(prefix, "%s/vnode%d/db/v%df%d", tsDirectory, pObj->vnode, pObj->vnode, pQuery->fileId);
-
-  sprintf(fileName, "%s.head", prefix);
-  pthread_mutex_lock(&(pVnode->vmutex));
-  pQuery->hfd = open(fileName, O_RDONLY);
-  pthread_mutex_unlock(&(pVnode->vmutex));
-
-  if (pQuery->hfd < 0) {
-    dError("vid:%d sid:%d id:%s, failed to open head file:%s, reason:%s", pObj->vnode, pObj->sid, pObj->meterId,
-           fileName, strerror(errno));
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  int tmsize = sizeof(SCompHeader) * pCfg->maxSessions + sizeof(TSCKSUM);
-  buffer = (char *)calloc(1, tmsize);
-  if (buffer == NULL) {
-    dError("vid:%d sid:%d id:%s, failed to allocate memory to buffer", pObj->vnode, pObj->sid, pObj->meterId);
-    return -TSDB_CODE_APP_ERROR;
-  }
-
-  lseek(pQuery->hfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  if (read(pQuery->hfd, buffer, tmsize) != tmsize) {
-    dError("vid:%d sid:%d id:%s, file:%s failed to read comp header, reason:%s", pObj->vnode, pObj->sid, pObj->meterId,
-           fileName, strerror(errno));
-    taosLogError("vid:%d sid:%d id:%s, file:%s failed to read comp header", pObj->vnode, pObj->sid, pObj->meterId,
-                 fileName);
-    tfree(buffer);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  if (!taosCheckChecksumWhole((uint8_t *)buffer, tmsize)) {
-    dError("vid:%d sid:%d id:%s, file:%s comp header offset is broken", pObj->vnode, pObj->sid, pObj->meterId,
-           fileName);
-    taosLogError("vid:%d sid:%d id:%s, file:%s comp header offset is broken", pObj->vnode, pObj->sid, pObj->meterId,
-                 fileName);
-    tfree(buffer);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-  compHeader = ((SCompHeader *)buffer)[pObj->sid];
-  tfree(buffer);
-  if (compHeader.compInfoOffset == 0) return 0;
-
-  lseek(pQuery->hfd, compHeader.compInfoOffset, SEEK_SET);
-  read(pQuery->hfd, &compInfo, sizeof(SCompInfo));
-  if (!taosCheckChecksumWhole((uint8_t *)(&compInfo), sizeof(SCompInfo))) {
-    dError("vid:%d sid:%d id:%s, file:%s compInfo checksum mismatch", pObj->vnode, pObj->sid, pObj->meterId, fileName);
-    taosLogError("vid:%d sid:%d id:%s, file:%s compInfo checksum mismatch", pObj->vnode, pObj->sid, pObj->meterId,
-                 fileName);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-  if (compInfo.numOfBlocks <= 0) return 0;
-  if (compInfo.uid != pObj->uid) return 0;
-
-  pQuery->numOfBlocks = compInfo.numOfBlocks;
-  pQuery->pBlock = (SCompBlock *)calloc(1, (sizeof(SCompBlock) + sizeof(SField *)) * compInfo.numOfBlocks);
-  pQuery->pFields = (SField **)((char *)pQuery->pBlock + sizeof(SCompBlock) * compInfo.numOfBlocks);
-
-  /* char *pBlock = (char *)pQuery->pBlockFields +
-   * sizeof(SCompBlockFields)*compInfo.numOfBlocks; */
-  read(pQuery->hfd, pQuery->pBlock, compInfo.numOfBlocks * sizeof(SCompBlock));
-  read(pQuery->hfd, &chksum, sizeof(TSCKSUM));
-  if (chksum != taosCalcChecksum(0, (uint8_t *)(pQuery->pBlock), compInfo.numOfBlocks * sizeof(SCompBlock))) {
-    dError("vid:%d sid:%d id:%s, head file comp block broken, fileId: %d", pObj->vnode, pObj->sid, pObj->meterId,
-           pQuery->fileId);
-    taosLogError("vid:%d sid:%d id:%s, head file comp block broken, fileId: %d", pObj->vnode, pObj->sid, pObj->meterId,
-                 pQuery->fileId);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  close(pQuery->hfd);
-  pQuery->hfd = -1;
-
-  sprintf(fileName, "%s.data", prefix);
-  if (stat(fileName, &fstat) < 0) {
-    dError("vid:%d sid:%d id:%s, data file:%s not there!", pObj->vnode, pObj->sid, pObj->meterId, fileName);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  if (pQuery->dfd > 0) close(pQuery->dfd);
-  pQuery->dfd = open(fileName, O_RDONLY);
-  if (pQuery->dfd < 0) {
-    dError("vid:%d sid:%d id:%s, failed to open data file:%s, reason:%s", pObj->vnode, pObj->sid, pObj->meterId,
-           fileName, strerror(errno));
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  sprintf(fileName, "%s.last", prefix);
-  if (stat(fileName, &fstat) < 0) {
-    dError("vid:%d sid:%d id:%s, last file:%s not there!", pObj->vnode, pObj->sid, pObj->meterId, fileName);
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  if (pQuery->lfd > 0) close(pQuery->lfd);
-  pQuery->lfd = open(fileName, O_RDONLY);
-  if (pQuery->lfd < 0) {
-    dError("vid:%d sid:%d id:%s, failed to open last file:%s, reason:%s", pObj->vnode, pObj->sid, pObj->meterId,
-           fileName, strerror(errno));
-    return vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-  }
-
-  return pQuery->numOfBlocks;
-}
-
-int vnodeReadColumnToMem(int fd, SCompBlock *pBlock, SField **fields, int col, char *data, int dataSize,
-                         char *temp, char *buffer, int bufferSize) {
-  int     len = 0, size = 0;
-  SField *tfields = NULL;
-  TSCKSUM chksum = 0;
-
-  if (*fields == NULL) {
-    size = sizeof(SField) * (pBlock->numOfCols) + sizeof(TSCKSUM);
-    *fields = (SField *)calloc(1, size);
-    lseek(fd, pBlock->offset, SEEK_SET);
-    read(fd, *fields, size);
-    if (!taosCheckChecksumWhole((uint8_t *)(*fields), size)) {
-      dError("SField checksum error, col: %d", col);
-      taosLogError("SField checksum error, col: %d", col);
-      return -1;
-    }
-  }
-
-  tfields = *fields;
-
-  /* If data is NULL, that means only to read SField content. So no need to read data part. */
-  if (data == NULL) return 0;
-
-  lseek(fd, pBlock->offset + tfields[col].offset, SEEK_SET);
-
-  if (pBlock->algorithm) {
-    len = read(fd, temp, tfields[col].len);
-    read(fd, &chksum, sizeof(TSCKSUM));
-    if (chksum != taosCalcChecksum(0, (uint8_t *)temp, tfields[col].len)) {
-      dError("data column checksum error, col: %d", col);
-      taosLogError("data column checksum error, col: %d", col);
-      return -1;
-    }
-
-    (*pDecompFunc[tfields[col].type])(temp, tfields[col].len, pBlock->numOfPoints, data, dataSize,
-                                      pBlock->algorithm, buffer, bufferSize);
-
-  } else {
-    len = read(fd, data, tfields[col].len);
-    read(fd, &chksum, sizeof(TSCKSUM));
-    if (chksum != taosCalcChecksum(0, (uint8_t *)data, tfields[col].len)) {
-      dError("data column checksum error, col: %d", col);
-      taosLogError("data column checksum error, col: %d", col);
-      return -1;
-    }
-  }
-
-  if (len <= 0) {
-    dError("failed to read col:%d, offset:%d, reason:%s", col, (int32_t)(tfields[col].offset), strerror(errno));
-    return -1;
-  }
-
-  return 0;
-}
-
-int vnodeReadCompBlockToMem(SMeterObj *pObj, SQuery *pQuery, SData *sdata[]) {
-  char *      temp = NULL;
-  int         i = 0, col = 0, code = 0;
-  SCompBlock *pBlock = NULL;
-  SField **   pFields = NULL;
-  char *      buffer = NULL;
-  int         bufferSize = 0;
-  int         dfd = pQuery->dfd;
-
-  tfree(pQuery->pFields[pQuery->slot]);
-
-  pBlock = pQuery->pBlock + pQuery->slot;
-  pFields = pQuery->pFields + pQuery->slot;
-  temp = malloc(pObj->bytesPerPoint * (pBlock->numOfPoints + 1));
-
-  if (pBlock->last) dfd = pQuery->lfd;
-
-  if (pBlock->algorithm == TWO_STAGE_COMP) {
-    bufferSize = pObj->maxBytes * pBlock->numOfPoints + EXTRA_BYTES;
-    buffer = (char *)calloc(1, bufferSize);
-  }
-
-  if (pQuery->colList[0].colIdx != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    // load timestamp column first in any cases.
-    code = vnodeReadColumnToMem(dfd, pBlock, pFields, PRIMARYKEY_TIMESTAMP_COL_INDEX,
-                                pQuery->tsData->data + pQuery->pointsOffset * TSDB_KEYSIZE,
-                                TSDB_KEYSIZE*pBlock->numOfPoints, temp, buffer, bufferSize);
-    col = 1;
-  } else {
-    // Read the SField data for this block first, if timestamp column is retrieved in this query, we ignore this process
-    code = vnodeReadColumnToMem(dfd, pBlock, pFields, 0, NULL, 0, NULL, buffer, bufferSize);
-  }
-
-  if (code < 0) goto _over;
-
-  while (col < pBlock->numOfCols && i < pQuery->numOfCols) {
-    SColumnInfo *pColumnInfo = &pQuery->colList[i].data;
-    if ((*pFields)[col].colId < pColumnInfo->colId) {
-      ++col;
-    } else if ((*pFields)[col].colId == pColumnInfo->colId) {
-      code = vnodeReadColumnToMem(dfd, pBlock, pFields, col, sdata[i]->data, pColumnInfo->bytes*pBlock->numOfPoints, temp, buffer, bufferSize);
-      if (code < 0) goto _over;
-      ++i;
-      ++col;
-    } else {
-      /*
-       * pQuery->colList[i].colIdx < (*pFields)[col].colId, this column is not existed in current block,
-       * fill space with NULL value
-       */
-      char *  output = sdata[i]->data;
-      int32_t bytes = pQuery->colList[i].data.bytes;
-      int32_t type = pQuery->colList[i].data.type;
-
-      setNullN(output, type, bytes, pBlock->numOfPoints);
-      ++i;
-    }
-  }
-
-  if (col >= pBlock->numOfCols && i < pQuery->numOfCols) {
-    // remain columns need to set null value
-    while (i < pQuery->numOfCols) {
-      char *  output = sdata[i]->data;
-      int32_t bytes = pQuery->colList[i].data.bytes;
-      int32_t type = pQuery->colList[i].data.type;
-
-      setNullN(output, type, bytes, pBlock->numOfPoints);
-      ++i;
-    }
-  }
-
-_over:
-  tfree(buffer);
-  tfree(temp);
-  if (code < 0) code = vnodeRecoverFromPeer(vnodeList + pObj->vnode, pQuery->fileId);
-  return code;
-}
-
-int vnodeReadLastBlockToMem(SMeterObj *pObj, SCompBlock *pBlock, SData *sdata[]) {
-  char *  temp = NULL;
-  int     col = 0, code = 0;
-  SField *pFields = NULL;
-  char *  buffer = NULL;
-  int     bufferSize = 0;
-
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-  temp = malloc(pObj->bytesPerPoint * (pBlock->numOfPoints + 1));
-  if (pBlock->algorithm == TWO_STAGE_COMP) {
-    bufferSize = pObj->maxBytes*pBlock->numOfPoints+EXTRA_BYTES;
-    buffer = (char *)calloc(1, pObj->maxBytes * pBlock->numOfPoints + EXTRA_BYTES);
-  }
-
-  for (col = 0; col < pBlock->numOfCols; ++col) {
-    code = vnodeReadColumnToMem(pVnode->lfd, pBlock, &pFields, col, sdata[col]->data, 
-                                pObj->pointsPerFileBlock*pObj->schema[col].bytes+EXTRA_BYTES, temp, buffer, bufferSize);
-    if (code < 0) break;
-    sdata[col]->len = pObj->schema[col].bytes * pBlock->numOfPoints;
-  }
-
-  tfree(buffer);
-  tfree(temp);
-  tfree(pFields);
-  if (code < 0) code = vnodeRecoverFromPeer(pVnode, pVnode->fileId);
-  return code;
-}
-
-int vnodeWriteBlockToFile(SMeterObj *pObj, SCompBlock *pCompBlock, SData *data[], SData *cdata[], int points) {
-  SVnodeObj *pVnode = &vnodeList[pObj->vnode];
-  SVnodeCfg *pCfg = &pVnode->cfg;
-  int        wlen = 0;
-  SField *   fields = NULL;
-  int        size = sizeof(SField) * pObj->numOfColumns + sizeof(TSCKSUM);
-  int32_t    offset = size;
-  char *     buffer = NULL;
-  int        bufferSize = 0;
-
-  int dfd = pVnode->dfd;
-
-  if (pCompBlock->last && (points < pObj->pointsPerFileBlock * tsFileBlockMinPercent)) {
-    dTrace("vid:%d sid:%d id:%s, points:%d are written to last block, block stime: %" PRId64 ", block etime: %" PRId64,
-           pObj->vnode, pObj->sid, pObj->meterId, points, *((TSKEY *)(data[0]->data)),
-           *((TSKEY * )(data[0]->data + (points - 1) * pObj->schema[0].bytes)));
-    pCompBlock->last = 1;
-    dfd = pVnode->tfd > 0 ? pVnode->tfd : pVnode->lfd;
-  } else {
-    pCompBlock->last = 0;
-  }
-
-  pCompBlock->offset = lseek(dfd, 0, SEEK_END);
-  pCompBlock->len = 0;
-
-  fields = (SField *)calloc(1, size);
-  if (fields == NULL) return -1;
-
-  if (pCfg->compression == TWO_STAGE_COMP){
-    bufferSize = pObj->maxBytes * points + EXTRA_BYTES;
-    buffer = (char *)malloc(bufferSize);
-  } 
-
-  for (int i = 0; i < pObj->numOfColumns; ++i) {
-    fields[i].colId = pObj->schema[i].colId;
-    fields[i].type = pObj->schema[i].type;
-    fields[i].bytes = pObj->schema[i].bytes;
-    fields[i].offset = offset;
-    // assert(data[i]->len == points*pObj->schema[i].bytes);
-
-    if (pCfg->compression) {
-      cdata[i]->len = (*pCompFunc[(uint8_t)pObj->schema[i].type])(data[i]->data, points * pObj->schema[i].bytes, points,
-                                                         cdata[i]->data, pObj->schema[i].bytes*pObj->pointsPerFileBlock+EXTRA_BYTES, 
-                                                         pCfg->compression, buffer, bufferSize);
-      fields[i].len = cdata[i]->len;
-      taosCalcChecksumAppend(0, (uint8_t *)(cdata[i]->data), cdata[i]->len + sizeof(TSCKSUM));
-      offset += (cdata[i]->len + sizeof(TSCKSUM));
-
-    } else {
-      data[i]->len = pObj->schema[i].bytes * points;
-      fields[i].len = data[i]->len;
-      taosCalcChecksumAppend(0, (uint8_t *)(data[i]->data), data[i]->len + sizeof(TSCKSUM));
-      offset += (data[i]->len + sizeof(TSCKSUM));
-    }
-
-    getStatistics(data[0]->data, data[i]->data, pObj->schema[i].bytes, points, pObj->schema[i].type, &fields[i].min,
-                  &fields[i].max, &fields[i].sum, &fields[i].minIndex, &fields[i].maxIndex, &fields[i].numOfNullPoints);
-  }
-
-  tfree(buffer);
-
-  // Write SField part
-  taosCalcChecksumAppend(0, (uint8_t *)fields, size);
-  wlen = twrite(dfd, fields, size);
-  if (wlen <= 0) {
-    tfree(fields);
-    dError("vid:%d sid:%d id:%s, failed to write block, wlen:%d reason:%s", pObj->vnode, pObj->sid, pObj->meterId, wlen,
-           strerror(errno));
-#ifdef CLUSTER		   
-    return vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-#else
-    return -1;
-#endif	
-  }
-  pVnode->vnodeStatistic.compStorage += wlen;
-  pVnode->dfSize += wlen;
-  pCompBlock->len += wlen;
-  tfree(fields);
-
-  // Write data part
-  for (int i = 0; i < pObj->numOfColumns; ++i) {
-    if (pCfg->compression) {
-      wlen = twrite(dfd, cdata[i]->data, cdata[i]->len + sizeof(TSCKSUM));
-    } else {
-      wlen = twrite(dfd, data[i]->data, data[i]->len + sizeof(TSCKSUM));
-    }
-
-    if (wlen <= 0) {
-      dError("vid:%d sid:%d id:%s, failed to write block, wlen:%d points:%d reason:%s",
-             pObj->vnode, pObj->sid, pObj->meterId, wlen, points, strerror(errno));
-      return vnodeRecoverFromPeer(pVnode, pVnode->commitFileId);
-    }
-
-    pVnode->vnodeStatistic.compStorage += wlen;
-    pVnode->dfSize += wlen;
-    pCompBlock->len += wlen;
-  }
-
-  dTrace("vid:%d, vnode compStorage size is: %" PRId64, pObj->vnode, pVnode->vnodeStatistic.compStorage);
-
-  pCompBlock->algorithm = pCfg->compression;
-  pCompBlock->numOfPoints = points;
-  pCompBlock->numOfCols = pObj->numOfColumns;
-  pCompBlock->keyFirst = *((TSKEY *)(data[0]->data));  // hack way to get the key
-  pCompBlock->keyLast = *((TSKEY *)(data[0]->data + (points - 1) * pObj->schema[0].bytes));
-  pCompBlock->sversion = pObj->sversion;
-  assert(pCompBlock->keyFirst <= pCompBlock->keyLast);
-
-  return 0;
-}
-
-static int forwardInFile(SQuery *pQuery, int32_t midSlot, int32_t step, SVnodeObj *pVnode, SMeterObj *pObj);
-
-int vnodeSearchPointInFile(SMeterObj *pObj, SQuery *pQuery) {
-  TSKEY       latest, oldest;
-  int         ret = 0;
-  int64_t     delta = 0;
-  int         firstSlot, lastSlot, midSlot;
-  int         numOfBlocks;
-  char *      temp = NULL, *data = NULL;
-  SCompBlock *pBlock = NULL;
-  SVnodeObj * pVnode = &vnodeList[pObj->vnode];
-  int         step;
-  char *      buffer = NULL;
-  int         bufferSize = 0;
-  int         dfd;
-
-  // if file is broken, pQuery->slot = -2; if not found, pQuery->slot = -1;
-
-  pQuery->slot = -1;
-  pQuery->pos = -1;
-  if (pVnode->numOfFiles <= 0) return 0;
-
-  SVnodeCfg *pCfg = &pVnode->cfg;
-  delta = (int64_t)pCfg->daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  latest = pObj->lastKeyOnFile;
-  oldest = (pVnode->fileId - pVnode->numOfFiles + 1) * delta;
-
-  if (latest < oldest) return 0;
-
-  if (!QUERY_IS_ASC_QUERY(pQuery)) {
-    if (pQuery->skey < oldest) return 0;
-    if (pQuery->ekey > latest) return 0;
-    if (pQuery->skey > latest) pQuery->skey = latest;
-  } else {
-    if (pQuery->skey > latest) return 0;
-    if (pQuery->ekey < oldest) return 0;
-    if (pQuery->skey < oldest) pQuery->skey = oldest;
-  }
-
-  dTrace("vid:%d sid:%d id:%s, skey:%" PRId64 " ekey:%" PRId64 " oldest:%" PRId64 " latest:%" PRId64 " fileId:%d numOfFiles:%d",
-         pObj->vnode, pObj->sid, pObj->meterId, pQuery->skey, pQuery->ekey, oldest, latest, pVnode->fileId,
-         pVnode->numOfFiles);
-
-  step = QUERY_IS_ASC_QUERY(pQuery) ? 1 : -1;
-
-  pQuery->fileId = pQuery->skey / delta;  // starting fileId
-  pQuery->fileId -= step;                 // hacker way to make while loop below works
-
-  bufferSize = pCfg->rowsInFileBlock*sizeof(TSKEY)+EXTRA_BYTES;
-  buffer = (char *)calloc(1, bufferSize);
-
-  while (1) {
-    pQuery->fileId += step;
-
-    if ((pQuery->fileId > pVnode->fileId) || (pQuery->fileId < pVnode->fileId - pVnode->numOfFiles + 1)) {
-      tfree(buffer);
-      return 0;
-    }
-
-    ret = vnodeGetCompBlockInfo(pObj, pQuery);
-    if (ret == 0) continue;
-    if (ret < 0) break;  // file broken
-
-    pBlock = pQuery->pBlock;
-
-    firstSlot = 0;
-    lastSlot = pQuery->numOfBlocks - 1;
-    //numOfBlocks = pQuery->numOfBlocks;
-    if (QUERY_IS_ASC_QUERY(pQuery) && pBlock[lastSlot].keyLast < pQuery->skey) continue;
-    if (!QUERY_IS_ASC_QUERY(pQuery) && pBlock[firstSlot].keyFirst > pQuery->skey) continue;
-
-    while (1) {
-      numOfBlocks = lastSlot - firstSlot + 1;
-      midSlot = (firstSlot + (numOfBlocks >> 1));
-
-      if (numOfBlocks == 1) break;
-
-      if (pQuery->skey > pBlock[midSlot].keyLast) {
-        if (numOfBlocks == 2) break;
-        if (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey < pBlock[midSlot + 1].keyFirst)) break;
-        firstSlot = midSlot + 1;
-      } else if (pQuery->skey < pBlock[midSlot].keyFirst) {
-        if (QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pBlock[midSlot - 1].keyLast)) break;
-        lastSlot = midSlot - 1;
-      } else {
-        break;  // got the slot
-      }
-    }
-
-    pQuery->slot = midSlot;
-    if (!QUERY_IS_ASC_QUERY(pQuery)) {
-      if (pQuery->skey < pBlock[midSlot].keyFirst) break;
-
-      if (pQuery->ekey > pBlock[midSlot].keyLast) {
-        pQuery->slot = midSlot + 1;
-        break;
-      }
-    } else {
-      if (pQuery->skey > pBlock[midSlot].keyLast) {
-        pQuery->slot = midSlot + 1;
-        break;
-      }
-
-      if (pQuery->ekey < pBlock[midSlot].keyFirst) break;
-    }
-
-    temp = malloc(pObj->pointsPerFileBlock * TSDB_KEYSIZE + EXTRA_BYTES);  // only first column
-    data = malloc(pObj->pointsPerFileBlock * TSDB_KEYSIZE + EXTRA_BYTES);  // only first column
-    dfd = pBlock[midSlot].last ? pQuery->lfd : pQuery->dfd;
-    ret = vnodeReadColumnToMem(dfd, pBlock + midSlot, pQuery->pFields + midSlot, 0, data,
-                               pObj->pointsPerFileBlock*TSDB_KEYSIZE+EXTRA_BYTES,
-                               temp, buffer, bufferSize);
-    if (ret < 0) {
-      ret = vnodeRecoverFromPeer(pVnode, pQuery->fileId);
-      break;
-    }  // file broken
-
-    pQuery->pos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(data, pBlock[midSlot].numOfPoints, pQuery->skey,
-                                                               pQuery->order.order);
-    pQuery->key = *((TSKEY *)(data + pObj->schema[0].bytes * pQuery->pos));
-
-    ret = vnodeForwardStartPosition(pQuery, pBlock, midSlot, pVnode, pObj);
-    break;
-  }
-
-  tfree(buffer);
-  tfree(temp);
-  tfree(data);
-
-  return ret;
-}
-
-int vnodeForwardStartPosition(SQuery *pQuery, SCompBlock *pBlock, int32_t slotIdx, SVnodeObj *pVnode, SMeterObj *pObj) {
-  int step = QUERY_IS_ASC_QUERY(pQuery) ? 1 : -1;
-
-  if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0) {
-    int maxReads = QUERY_IS_ASC_QUERY(pQuery) ? pBlock->numOfPoints - pQuery->pos : pQuery->pos + 1;
-
-    if (pQuery->limit.offset < maxReads) {  // start position in current block
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        pQuery->pos += pQuery->limit.offset;
-      } else {
-        pQuery->pos -= pQuery->limit.offset;
-      }
-
-      pQuery->limit.offset = 0;
-
-    } else {
-      pQuery->limit.offset -= maxReads;
-      slotIdx += step;
-
-      return forwardInFile(pQuery, slotIdx, step, pVnode, pObj);
-    }
-  }
-
-  return pQuery->numOfBlocks;
-}
-
-int forwardInFile(SQuery *pQuery, int32_t slotIdx, int32_t step, SVnodeObj *pVnode, SMeterObj *pObj) {
-  SCompBlock *pBlock = pQuery->pBlock;
-
-  while (slotIdx < pQuery->numOfBlocks && slotIdx >= 0 && pQuery->limit.offset >= pBlock[slotIdx].numOfPoints) {
-    pQuery->limit.offset -= pBlock[slotIdx].numOfPoints;
-    slotIdx += step;
-  }
-
-  if (slotIdx < pQuery->numOfBlocks && slotIdx >= 0) {
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      pQuery->pos = pQuery->limit.offset;
-    } else {
-      pQuery->pos = pBlock[slotIdx].numOfPoints - pQuery->limit.offset - 1;
-    }
-    pQuery->slot = slotIdx;
-    pQuery->limit.offset = 0;
-
-    return pQuery->numOfBlocks;
-  } else {  // continue in next file, forward pQuery->limit.offset points
-    int ret = 0;
-    pQuery->slot = -1;
-    pQuery->pos = -1;
-
-    while (1) {
-      pQuery->fileId += step;
-      if ((pQuery->fileId > pVnode->fileId) || (pQuery->fileId < pVnode->fileId - pVnode->numOfFiles + 1)) {
-        pQuery->lastKey = pObj->lastKeyOnFile;
-        pQuery->skey = pQuery->lastKey + 1;
-        return 0;
-      }
-
-      ret = vnodeGetCompBlockInfo(pObj, pQuery);
-      if (ret == 0) continue;
-      if (ret > 0) break;  // qualified file
-    }
-
-    if (ret > 0) {
-      int startSlot = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pQuery->numOfBlocks - 1;
-      return forwardInFile(pQuery, startSlot, step, pVnode, pObj);
-    } else {
-      return ret;
-    }
-  }
-}
-
-static FORCE_INLINE TSKEY vnodeGetTSInDataBlock(SQuery *pQuery, int32_t pos, int32_t factor) {
-  return *(TSKEY *)(pQuery->tsData->data + (pQuery->pointsOffset * factor + pos) * TSDB_KEYSIZE);
-}
-
-int vnodeQueryFromFile(SMeterObj *pObj, SQuery *pQuery) {
-  int numOfReads = 0;
-
-  int         lastPos = -1, startPos;
-  int         col, step, code = 0;
-  char *      pRead, *pData;
-  SData *     sdata[TSDB_MAX_COLUMNS];
-  SCompBlock *pBlock = NULL;
-  SVnodeObj * pVnode = &vnodeList[pObj->vnode];
-  pQuery->pointsRead = 0;
-  int keyLen = TSDB_KEYSIZE;
-
-  if (pQuery->over) return 0;
-
-  if (pQuery->slot < 0)  // it means a new query, we need to find the point first
-    code = vnodeSearchPointInFile(pObj, pQuery);
-
-  if (code < 0 || pQuery->slot < 0 || pQuery->pos == -1) {
-    pQuery->over = 1;
-    return code;
-  }
-
-  step = QUERY_IS_ASC_QUERY(pQuery) ? -1 : 1;
-  pBlock = pQuery->pBlock + pQuery->slot;
-
-  if (pQuery->pos == FILE_QUERY_NEW_BLOCK) {
-    if (!QUERY_IS_ASC_QUERY(pQuery)) {
-      if (pQuery->ekey > pBlock->keyLast) pQuery->over = 1;
-      if (pQuery->skey < pBlock->keyFirst) pQuery->over = 1;
-    } else {
-      if (pQuery->ekey < pBlock->keyFirst) pQuery->over = 1;
-      if (pQuery->skey > pBlock->keyLast) pQuery->over = 1;
-    }
-
-    pQuery->pos = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pBlock->numOfPoints - 1;
-  }
-
-  if (pQuery->over) return 0;
-
-  // To make sure the start position of each buffer is aligned to 4bytes in 32-bit ARM system.
-  for(col = 0; col < pQuery->numOfCols; ++col) {
-    sdata[col] = calloc(1, sizeof(SData) + pBlock->numOfPoints * pQuery->colList[col].data.bytes + EXTRA_BYTES);
-  }
-
-  /*
-   * timestamp column is fetched in any cases. Therefore, if the query does not fetch primary column,
-   * we allocate tsData buffer with twice size of the other ordinary pQuery->sdata.
-   * Otherwise, the query function may over-write buffer area while retrieve function has not packed the results into
-   * message to send to client yet.
-   *
-   * So the startPositionFactor is needed to denote which half part is used to store the result, and which
-   * part is available for keep data during query process.
-   *
-   * Note: the startPositionFactor must be used in conjunction with pQuery->pointsOffset
-   */
-  int32_t startPositionFactor = 1;
-  if (pQuery->colList[0].colIdx == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    pQuery->tsData = sdata[0];
-    startPositionFactor = 0;
-  }
-
-  code = vnodeReadCompBlockToMem(pObj, pQuery, sdata);
-  if (code < 0) {
-    dError("vid:%d sid:%d id:%s, failed to read block:%d numOfPoints:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           pQuery->slot, pBlock->numOfPoints);
-    goto _next;
-  }
-
-  int maxReads = QUERY_IS_ASC_QUERY(pQuery) ? pBlock->numOfPoints - pQuery->pos : pQuery->pos + 1;
-
-  TSKEY startKey = vnodeGetTSInDataBlock(pQuery, 0, startPositionFactor);
-  TSKEY endKey = vnodeGetTSInDataBlock(pQuery, pBlock->numOfPoints - 1, startPositionFactor);
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    if (endKey < pQuery->ekey) {
-      numOfReads = maxReads;
-    } else {
-      lastPos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(
-          pQuery->tsData->data + keyLen * (pQuery->pos + pQuery->pointsOffset * startPositionFactor), maxReads,
-          pQuery->ekey, TSQL_SO_DESC);
-      numOfReads = (lastPos >= 0) ? lastPos + 1 : 0;
-    }
-  } else {
-    if (startKey > pQuery->ekey) {
-      numOfReads = maxReads;
-    } else {
-      lastPos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(
-          pQuery->tsData->data + keyLen * pQuery->pointsOffset * startPositionFactor, maxReads, pQuery->ekey,
-          TSQL_SO_ASC);
-      numOfReads = (lastPos >= 0) ? pQuery->pos - lastPos + 1 : 0;
-    }
-  }
-
-  if (numOfReads > pQuery->pointsToRead - pQuery->pointsRead) {
-    numOfReads = pQuery->pointsToRead - pQuery->pointsRead;
-  } else {
-    if (lastPos >= 0 || numOfReads == 0) {
-      pQuery->keyIsMet = 1;
-      pQuery->over = 1;
-    }
-  }
-
-  startPos = QUERY_IS_ASC_QUERY(pQuery) ? pQuery->pos : pQuery->pos - numOfReads + 1;
-
-  int32_t numOfQualifiedPoints = 0;
-  int32_t numOfActualRead = numOfReads;
-
-  // copy data to result buffer
-  if (pQuery->numOfFilterCols == 0) {
-    // no filter condition on ordinary columns
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      int16_t colBufferIndex = pQuery->pSelectExpr[i].pBase.colInfo.colIdxInBuf;
-      int32_t bytes = GET_COLUMN_BYTES(pQuery, i);
-
-      pData = pQuery->sdata[i]->data + pQuery->pointsOffset * bytes;
-      pRead = sdata[colBufferIndex]->data + startPos * bytes;
-
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        memcpy(pData, pRead, numOfReads * bytes);
-      } else { //reversed copy to output buffer
-        for(int32_t j = 0; j < numOfReads; ++j) {
-          memcpy(pData + bytes * j, pRead + (numOfReads - 1 - j) * bytes, bytes);
-        }
-      }
-    }
-    numOfQualifiedPoints = numOfReads;
-  } else {
-    // check each data one by one set the input column data
-    for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
-      struct SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
-      pFilterInfo->pData = sdata[pFilterInfo->info.colIdxInBuf]->data;
-    }
-
-    int32_t *ids = calloc(1, numOfReads * sizeof(int32_t));
-    numOfActualRead = 0;
-
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      for (int32_t j = startPos; j < pBlock->numOfPoints; j -= step) {
-        TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor);
-        if (key < startKey || key > endKey) {
-          dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
-                 "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey);
-          tfree(ids);
-          return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
-        }
-
-        // out of query range, quit
-        if (key > pQuery->ekey) {
-          break;
-        }
-
-        if (!vnodeFilterData(pQuery, &numOfActualRead, j)) {
-          continue;
-        }
-
-        ids[numOfQualifiedPoints] = j;
-        if (++numOfQualifiedPoints == numOfReads) { // qualified data are enough
-          break;
-        }
-      }
-    } else {
-      for (int32_t j = pQuery->pos; j >= 0; --j) {
-        TSKEY key = vnodeGetTSInDataBlock(pQuery, j, startPositionFactor);
-        if (key < startKey || key > endKey) {
-          dError("vid:%d sid:%d id:%s, timestamp in file block disordered. slot:%d, pos:%d, ts:%" PRId64 ", block "
-                 "range:%" PRId64 "-%" PRId64, pObj->vnode, pObj->sid, pObj->meterId, pQuery->slot, j, key, startKey, endKey);
-          tfree(ids);
-          return -TSDB_CODE_FILE_BLOCK_TS_DISORDERED;
-        }
-
-        // out of query range, quit
-        if (key < pQuery->ekey) {
-          break;
-        }
-
-        if (!vnodeFilterData(pQuery, &numOfActualRead, j)) {
-          continue;
-        }
-  
-        ids[numOfQualifiedPoints] = j;
-        if (++numOfQualifiedPoints == numOfReads) { // qualified data are enough
-          break;
-        }
-      }
-    }
-
-//    int32_t start = QUERY_IS_ASC_QUERY(pQuery) ? 0 : numOfReads - numOfQualifiedPoints;
-    for (int32_t j = 0; j < numOfQualifiedPoints; ++j) {
-      for (int32_t col = 0; col < pQuery->numOfOutputCols; ++col) {
-        int16_t colIndexInBuffer = pQuery->pSelectExpr[col].pBase.colInfo.colIdxInBuf;
-        int32_t bytes = GET_COLUMN_BYTES(pQuery, col);
-        pData = pQuery->sdata[col]->data + (pQuery->pointsOffset + j) * bytes;
-        pRead = sdata[colIndexInBuffer]->data + ids[j/* + start*/] * bytes;
-
-        memcpy(pData, pRead, bytes);
-      }
-    }
-
-    tfree(ids);
-    assert(numOfQualifiedPoints <= numOfReads);
-  }
-
-  // Note: numOfQualifiedPoints may be 0, since no data in this block are qualified
-  assert(pQuery->pointsRead == 0);
-
-  pQuery->pointsRead += numOfQualifiedPoints;
-  for (col = 0; col < pQuery->numOfOutputCols; ++col) {
-    int16_t bytes = GET_COLUMN_BYTES(pQuery, col);
-    pQuery->sdata[col]->len = bytes * (pQuery->pointsOffset + pQuery->pointsRead);
-  }
-  pQuery->pos -= numOfActualRead * step;
-
-  // update the lastkey/skey
-  int32_t lastAccessPos = pQuery->pos + step;
-  pQuery->lastKey = vnodeGetTSInDataBlock(pQuery, lastAccessPos, startPositionFactor);
-  pQuery->skey = pQuery->lastKey - step;
-
-_next:
-  if ((pQuery->pos < 0 || pQuery->pos >= pBlock->numOfPoints || numOfReads == 0) && (pQuery->over == 0)) {
-    pQuery->slot = pQuery->slot - step;
-    pQuery->pos = FILE_QUERY_NEW_BLOCK;
-  }
-
-  if ((pQuery->slot < 0 || pQuery->slot >= pQuery->numOfBlocks) && (pQuery->over == 0)) {
-    int ret;
-
-    while (1) {
-      ret = -1;
-      pQuery->fileId -= step;  // jump to next file
-
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        if (pQuery->fileId > pVnode->fileId) {
-          // to do:
-          // check if file is updated, if updated, open again and check if this Meter is updated
-          // if meter is updated, read in new block info, and
-          break;
-        }
-      } else {
-        if ((pVnode->fileId - pQuery->fileId + 1) > pVnode->numOfFiles) break;
-      }
-
-      ret = vnodeGetCompBlockInfo(pObj, pQuery);
-      if (ret > 0) break;
-      if (ret < 0) code = ret;
-    }
-
-    if (ret <= 0) pQuery->over = 1;
-
-    pQuery->slot = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pQuery->numOfBlocks - 1;
-  }
-
-  for(int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    tfree(sdata[i]);
-  }
-
-  return code;
-}
-
-int vnodeUpdateFileMagic(int vnode, int fileId) {
-  struct stat fstat;
-  char        fileName[256];
-
-  SVnodeObj *pVnode = vnodeList + vnode;
-  uint64_t   magic = 0;
-
-  vnodeGetHeadDataLname(fileName, NULL, NULL, vnode, fileId);
-  if (stat(fileName, &fstat) != 0) {
-    dError("vid:%d, head file:%s is not there", vnode, fileName);
-    return -1;
-  }
-
-  int size = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM) + TSDB_FILE_HEADER_LEN;
-  if (fstat.st_size < size) {
-    dError("vid:%d, head file:%s is corrupted", vnode, fileName);
-    return -1;
-  }
-
-#ifdef CLUSTER
-  //if (fstat.st_size == size) return 0;
-#else
-  if (fstat.st_size == size) return 0;
-#endif
-  vnodeGetHeadDataLname(NULL, fileName, NULL, vnode, fileId);
-  if (stat(fileName, &fstat) == 0) {
-    magic = fstat.st_size;
-  } else {
-    dError("vid:%d, data file:%s is not there", vnode, fileName);
-    return -1;
-  }
-
-  vnodeGetHeadDataLname(NULL, NULL, fileName, vnode, fileId);
-  if (stat(fileName, &fstat) == 0) {
-    magic += fstat.st_size;
-  }
-
-  int slot = fileId % pVnode->maxFiles;
-  pVnode->fmagic[slot] = magic;
-
-  return 0;
-}
-
-int vnodeInitFile(int vnode) {
-  int        code = TSDB_CODE_SUCCESS;
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  pVnode->maxFiles = pVnode->cfg.daysToKeep / pVnode->cfg.daysPerFile + 1;
-  pVnode->maxFile1 = pVnode->cfg.daysToKeep1 / pVnode->cfg.daysPerFile;
-  pVnode->maxFile2 = pVnode->cfg.daysToKeep2 / pVnode->cfg.daysPerFile;
-  pVnode->fmagic = (uint64_t *)calloc(pVnode->maxFiles + 1, sizeof(uint64_t));
-  int fileId = pVnode->fileId;
-
-  /*
-   * The actual files will far exceed the files that need to exist
-   */
-  if (pVnode->numOfFiles > pVnode->maxFiles) {
-    dError("vid:%d numOfFiles:%d should not larger than maxFiles:%d", vnode, pVnode->numOfFiles, pVnode->maxFiles);
-  }
-
-  int numOfFiles = MIN(pVnode->numOfFiles, pVnode->maxFiles);
-  for (int i = 0; i < numOfFiles; ++i) {
-    if (vnodeUpdateFileMagic(vnode, fileId) < 0) {
-      if (pVnode->cfg.replications > 1) {
-        pVnode->badFileId = fileId;
-      }
-      dError("vid:%d fileId:%d is corrupted", vnode, fileId);
-    } else {
-      dTrace("vid:%d fileId:%d is checked", vnode, fileId);
-    }
-
-    fileId--;
-  }
-
-  return code;
-}
-
-int vnodeRecoverCompHeader(int vnode, int fileId) {
-  // TODO: try to recover SCompHeader part
-  dTrace("starting to recover vnode head file comp header part, vnode: %d fileId: %d", vnode, fileId);
-  assert(0);
-  return 0;
-}
-
-int vnodeRecoverHeadFile(int vnode, int fileId) {
-  // TODO: try to recover SCompHeader part
-  dTrace("starting to recover vnode head file, vnode: %d, fileId: %d", vnode, fileId);
-  assert(0);
-  return 0;
-}
-
-int vnodeRecoverDataFile(int vnode, int fileId) {
-  // TODO: try to recover SCompHeader part
-  dTrace("starting to recover vnode data file, vnode: %d, fileId: %d", vnode, fileId);
-  assert(0);
-  return 0;
-}
diff --git a/src/system/detail/src/vnodeFileUtil.c b/src/system/detail/src/vnodeFileUtil.c
deleted file mode 100644
index b40e7cfd41eed93e08c4959d55fd379bdc206c4d..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeFileUtil.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "vnode.h"
-
-int vnodeCheckHeaderFile(int fd, int dfd, SVnodeCfg cfg, int mode) {
-    SCompHeader *pHeaders = NULL;
-    SVnodeCfg *pCfg = &cfg;
-    SCompInfo compInfo;
-    SCompBlock *pBlocks = NULL;
-    int blockSize = 0;
-    SField *pFields = NULL;
-    char *pBuf = NULL;
-    int size = 0;
-    int ret = 0;
-
-    if (fd < 0 || dfd < 0) return -1;
-
-    lseek(fd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-    size = pCfg->maxSessions*sizeof(SCompHeader)+sizeof(TSCKSUM);
-    pHeaders = calloc(1, size);
-    if (pHeaders == NULL) {
-        return -1;
-    }
-
-    read(fd, pHeaders, size);
-    if (!taosCheckChecksumWhole((uint8_t *)pHeaders, size)) {
-        return -1;
-    }
-
-    for (int i = 0; i < pCfg->maxSessions; i++) {
-        if (pHeaders[i].compInfoOffset == 0) continue;
-        if (pHeaders[i].compInfoOffset < 0) {
-            // TODO : report error here
-            ret = -1;
-            continue;
-        }
-        lseek(fd, pHeaders[i].compInfoOffset, SEEK_SET);
-        read(fd, &compInfo, sizeof(SCompInfo));
-        if (!taosCheckChecksumWhole((uint8_t *)&compInfo, sizeof(SCompInfo))) {
-            // TODO : report error
-            ret = -1;
-            continue;
-        }
-
-        int tsize = sizeof(SCompBlock) * compInfo.numOfBlocks + sizeof(TSCKSUM);
-        if (tsize > blockSize) {
-            if (pBlocks == NULL) {
-                pBlocks = calloc(1, tsize);
-            } else {
-                pBlocks = realloc(pBlocks, tsize);
-            }
-            blockSize = tsize;
-        }
-
-        read(fd, tsize);
-        if (!taosCheckChecksumWhole(pBlocks, tsize)) {
-            // TODO: Report error
-            ret = -1;
-            continue;
-        }
-
-        TSKEY keyLast = 0;
-        for (int j = 0; j < compInfo.numOfBlocks; j++) {
-            SCompBlock *pBlock = pBlocks + j;
-            if (pBlock->last != 0 && j < compInfo.numOfBlocks-1) {
-                // TODO: report error
-                ret = -1;
-                break;
-            }
-
-            if (pBlock->offset < TSDB_FILE_HEADER_LEN) {
-                // TODO : report erro
-                ret = -1;
-                break;
-            }
-            
-            if (pBlock->keyLast < pBlock->keyFirst) {
-                // TODO : report error
-                ret = -1;
-                break;
-            }
-
-            if (pBlock->keyFirst <= keyLast) {
-                // TODO : report error
-                ret = -1;
-                break;
-            }
-            keyLast = pBlock->keyLast;
-
-            // Check block in data
-            lseek(dfd, pBlock->offset, SEEK_SET);
-            tsize = sizeof(SField) * pBlock->numOfCols + sizeof(TSCKSUM);
-            pFields = realloc(pFields, tsize);
-
-            read(dfd, pFields, tsize);
-            if (!taosCheckChecksumWhole((uint8_t*)pFields, tsize)) {
-                // TODO : report error
-                ret = -1;
-                continue;
-            }
-
-            for (int k = 0; k < pBlock->numOfCols; k++) {
-                // TODO: Check pFields[k] content
-
-                pBuf = realloc(pBuf, pFields[k].len);
-
-                if (!taosCheckChecksumWhole((uint8_t *)pBuf, pFields[k].len)) {
-                    // TODO : report error;
-                    ret = -1;
-                    continue;
-                }
-            }
-        }
-    }
-
-    tfree(pBuf);
-    tfree(pFields);
-    tfree(pBlocks);
-    tfree(pHeaders);
-    return ret;
-}
-
-int vnodePackDataFile(int vnode, int fileId) {
-    // TODO: check if it is able to pack current file
-
-    // TODO: assign value to headerFile and dataFile
-    char *headerFile = NULL;
-    char *dataFile = NULL;
-    char *lastFile = NULL;
-    SVnodeObj *pVnode = vnodeList+vnode;
-    SCompHeader *pHeaders = NULL;
-    SCompBlock *pBlocks = NULL;
-    int blockSize = 0;
-    char *pBuff = 0;
-    int buffSize = 0;
-    SCompInfo compInfo;
-    int size = 0;
-
-    int hfd = open(headerFile, O_RDONLY);
-    if (hfd < 0) {
-        dError("vid: %d, failed to open header file:%s\n", vnode, headerFile);
-        return -1;
-    }
-    int dfd = open(dataFile, O_RDONLY);
-    if (dfd < 0) {
-        dError("vid: %d, failed to open data file:%s\n", vnode, dataFile);
-        return -1;
-    }
-    int lfd = open(lastFile, O_RDONLY);
-    if (lfd < 0) {
-        dError("vid: %d, failed to open data file:%s\n", vnode, lastFile);
-        return -1;
-    }
-
-    lseek(hfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-    size = sizeof(SCompHeader)*pVnode->cfg.maxSessions+sizeof(TSCKSUM);
-    pHeaders = malloc(size);
-    if (pHeaders == NULL) goto _exit_failure;
-    read(hfd, pHeaders, size);
-    if (!taosCheckChecksumWhole((uint8_t *)pHeaders, size)) {
-        dError("vid: %d, header file %s is broken", vnode, headerFile);
-        goto _exit_failure;
-    }
-
-    for (size_t i = 0; i < pVnode->cfg.maxSessions; i++)
-    {
-        if (pHeaders[i].compInfoOffset <= 0) continue;
-        SMeterObj *pObj = (SMeterObj *)pVnode->meterList[i];
-        // read compInfo part
-        lseek(hfd, pHeaders[i].compInfoOffset, SEEK_SET);
-        read(hfd, &compInfo, sizeof(SCompInfo));
-        if (!taosCheckChecksumWhole((uint8_t *)&compInfo, sizeof(SCompInfo))) {
-            dError("vid: %d sid:%d fileId:%d compInfo is broken", vnode, i, fileId);
-            goto _exit_failure;
-        }
-
-        // read compBlock part
-        int tsize = compInfo.numOfBlocks * sizeof(SCompBlock) + sizeof(TSCKSUM);
-        if (tsize >  blockSize) {
-            if (blockSize == 0) {
-                pBlocks = malloc(tsize);
-            } else {
-                pBlocks = realloc(pBlocks, tsize);
-            }
-            blockSize = tsize;
-        }
-        read(hfd, pBlocks, tsize);
-        if (!taosCheckChecksumWhole((uint8_t *)pBlocks, tsize)) {
-            dError("vid:%d sid:%d fileId:%d block part is broken", vnode, i, fileId);
-            goto _exit_failure;
-        }
-
-        assert(compInfo.numOfBlocks > 0);
-        // Loop to scan the blocks and merge block when neccessary.
-        tsize = sizeof(SCompInfo) + compInfo.numOfBlocks *sizeof(SCompBlock) + sizeof(TSCKSUM);
-        pBuff = realloc(pBuff, tsize);
-        SCompInfo *pInfo = (SCompInfo *)pBuff;
-        SCompBlock *pNBlocks = pBuff + sizeof(SCompInfo);
-        int nCounter = 0;
-        for (int j; j < compInfo.numOfBlocks; j++) {
-            // TODO : Check if it is the last block
-            // if (j == compInfo.numOfBlocks - 1) {}
-            if (pBlocks[j].numOfPoints + pNBlocks[nCounter].numOfPoints <= pObj->pointsPerFileBlock) {
-                // Merge current block to current new block
-            } else {
-                // Write new block to new data file
-                // pNBlocks[nCounter].
-                nCounter++;
-            }
-        }
-    }
-
-    return 0;
-
-_exit_failure:
-    tfree(pHeaders);
-    if (hfd > 0) close(hfd);
-    if (dfd > 0) close(dfd);
-    if (lfd > 0) close(lfd);
-    return -1;
-}
\ No newline at end of file
diff --git a/src/system/detail/src/vnodeFilterFunc.c b/src/system/detail/src/vnodeFilterFunc.c
deleted file mode 100644
index 08fe78c188b2d0e1536bd57c40867783f24b4a16..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeFilterFunc.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "taosmsg.h"
-#include "tsqlfunction.h"
-#include "vnode.h"
-#include "vnodeDataFilterFunc.h"
-
-bool less_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval < pFilter->filterInfo.upperBndi);
-}
-
-bool less_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval < pFilter->filterInfo.upperBndi);
-}
-
-bool less_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval < pFilter->filterInfo.upperBndi);
-}
-
-bool less_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval < pFilter->filterInfo.upperBndi);
-}
-
-bool less_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval < pFilter->filterInfo.upperBndd);
-}
-
-bool less_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval < pFilter->filterInfo.upperBndd);
-}
-
-//////////////////////////////////////////////////////////////////
-bool large_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-bool large_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-bool large_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-bool large_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-bool large_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)maxval > pFilter->filterInfo.lowerBndd);
-}
-
-bool large_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)maxval > pFilter->filterInfo.lowerBndd);
-}
-/////////////////////////////////////////////////////////////////////
-
-bool lessEqual_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi);
-}
-
-bool lessEqual_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi);
-}
-
-bool lessEqual_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi);
-}
-
-bool lessEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi);
-}
-
-bool lessEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval <= pFilter->filterInfo.upperBndd);
-}
-
-bool lessEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval <= pFilter->filterInfo.upperBndd);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool largeEqual_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool largeEqual_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool largeEqual_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool largeEqual_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool largeEqual_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-bool largeEqual_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-bool equal_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int8_t *)minval == *(int8_t *)maxval) {
-    return (*(int8_t *)minval == pFilter->filterInfo.lowerBndi);
-  } else { /* range filter */
-    assert(*(int8_t *)minval < *(int8_t *)maxval);
-
-    return *(int8_t *)minval <= pFilter->filterInfo.lowerBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi;
-  }
-}
-
-bool equal_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int16_t *)minval == *(int16_t *)maxval) {
-    return (*(int16_t *)minval == pFilter->filterInfo.lowerBndi);
-  } else { /* range filter */
-    assert(*(int16_t *)minval < *(int16_t *)maxval);
-
-    return *(int16_t *)minval <= pFilter->filterInfo.lowerBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi;
-  }
-}
-
-bool equal_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int32_t *)minval == *(int32_t *)maxval) {
-    return (*(int32_t *)minval == pFilter->filterInfo.lowerBndi);
-  } else { /* range filter */
-    assert(*(int32_t *)minval < *(int32_t *)maxval);
-
-    return *(int32_t *)minval <= pFilter->filterInfo.lowerBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi;
-  }
-}
-
-bool equal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int64_t *)minval == *(int64_t *)maxval) {
-    return (*(int64_t *)minval == pFilter->filterInfo.lowerBndi);
-  } else { /* range filter */
-    assert(*(int64_t *)minval < *(int64_t *)maxval);
-
-    return *(int64_t *)minval <= pFilter->filterInfo.lowerBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi;
-  }
-}
-
-bool equal_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(float *)minval == *(float *)maxval) {
-    return (fabs(*(float *)minval - pFilter->filterInfo.lowerBndd) <= FLT_EPSILON);
-  } else { /* range filter */
-    assert(*(float *)minval < *(float *)maxval);
-    return *(float *)minval <= pFilter->filterInfo.lowerBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd;
-  }
-}
-
-bool equal_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(double *)minval == *(double *)maxval) {
-    return (*(double *)minval == pFilter->filterInfo.lowerBndd);
-  } else { /* range filter */
-    assert(*(double *)minval < *(double *)maxval);
-
-    return *(double *)minval <= pFilter->filterInfo.lowerBndi && *(double *)maxval >= pFilter->filterInfo.lowerBndi;
-  }
-}
-
-bool equal_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  // query condition string is greater than the max length of string, not qualified data
-  if (pFilter->filterInfo.len > pFilter->bytes) {
-    return false;
-  }
-
-  return strncmp((char *)pFilter->filterInfo.pz, minval, pFilter->bytes) == 0;
-}
-
-bool equal_nchar(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  // query condition string is greater than the max length of string, not qualified data
-  if (pFilter->filterInfo.len > pFilter->bytes) {
-    return false;
-  }
-
-  return wcsncmp((wchar_t *)pFilter->filterInfo.pz, (wchar_t*) minval, pFilter->bytes/TSDB_NCHAR_SIZE) == 0;
-}
-
-////////////////////////////////////////////////////////////////
-bool like_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
-
-  return patternMatch((char *)pFilter->filterInfo.pz, minval, pFilter->bytes, &info) == TSDB_PATTERN_MATCH;
-}
-
-bool like_nchar(SColumnFilterElem* pFilter, char* minval, char *maxval) {
-  SPatternCompareInfo info = PATTERN_COMPARE_INFO_INITIALIZER;
-
-  return WCSPatternMatch((wchar_t*) pFilter->filterInfo.pz, (wchar_t*) minval, pFilter->bytes/TSDB_NCHAR_SIZE, &info) == TSDB_PATTERN_MATCH;
-}
-
-////////////////////////////////////////////////////////////////
-/**
- *  If minval equals to maxval, it may serve as the one element filter,
- *  or all elements of an array are identical during pref-filter stage.
- *  Otherwise, it must be pre-filter of array list of elements.
- *
- *  During pre-filter stage, if there is one element that locates in [minval, maxval],
- *  the filter function will return true.
- */
-bool nequal_i8(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int8_t *)minval == *(int8_t *)maxval) {
-    return (*(int8_t *)minval != pFilter->filterInfo.lowerBndi);
-  }
-
-  return true;
-}
-
-bool nequal_i16(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int16_t *)minval == *(int16_t *)maxval) {
-    return (*(int16_t *)minval != pFilter->filterInfo.lowerBndi);
-  }
-
-  return true;
-}
-
-bool nequal_i32(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int32_t *)minval == *(int32_t *)maxval) {
-    return (*(int32_t *)minval != pFilter->filterInfo.lowerBndi);
-  }
-
-  return true;
-}
-
-bool nequal_i64(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(int64_t *)minval == *(int64_t *)maxval) {
-    return (*(int64_t *)minval != pFilter->filterInfo.lowerBndi);
-  }
-
-  return true;
-}
-
-bool nequal_ds(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(float *)minval == *(float *)maxval) {
-    return (*(float *)minval != pFilter->filterInfo.lowerBndd);
-  }
-
-  return true;
-}
-
-bool nequal_dd(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (*(double *)minval == *(double *)maxval) {
-    return (*(double *)minval != pFilter->filterInfo.lowerBndd);
-  }
-
-  return true;
-}
-
-bool nequal_str(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  if (pFilter->filterInfo.len > pFilter->bytes) {
-    return true;
-  }
-
-  return strncmp((char *)pFilter->filterInfo.pz, minval, pFilter->bytes) != 0;
-}
-
-bool nequal_nchar(SColumnFilterElem *pFilter, char* minval, char *maxval) {
-  if (pFilter->filterInfo.len > pFilter->bytes) {
-    return true;
-  }
-
-  return wcsncmp((wchar_t *)pFilter->filterInfo.pz, (wchar_t*)minval, pFilter->bytes/TSDB_NCHAR_SIZE) != 0;
-}
-
-////////////////////////////////////////////////////////////////
-
-bool rangeFilter_i32_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i32_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval<pFilter->filterInfo.upperBndi &&*(int32_t *)maxval> pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i32_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval < pFilter->filterInfo.upperBndi && *(int32_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i32_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int32_t *)minval <= pFilter->filterInfo.upperBndi && *(int32_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-bool rangeFilter_i8_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i8_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval<pFilter->filterInfo.upperBndi &&*(int8_t *)maxval> pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i8_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval < pFilter->filterInfo.upperBndi && *(int8_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i8_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int8_t *)minval <= pFilter->filterInfo.upperBndi && *(int8_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-bool rangeFilter_i16_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i16_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval<pFilter->filterInfo.upperBndi &&*(int16_t *)maxval> pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i16_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval < pFilter->filterInfo.upperBndi && *(int16_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i16_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int16_t *)minval <= pFilter->filterInfo.upperBndi && *(int16_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-////////////////////////////////////////////////////////////////////////
-bool rangeFilter_i64_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i64_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval<pFilter->filterInfo.upperBndi &&*(int64_t *)maxval> pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i64_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval < pFilter->filterInfo.upperBndi && *(int64_t *)maxval >= pFilter->filterInfo.lowerBndi);
-}
-
-bool rangeFilter_i64_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(int64_t *)minval <= pFilter->filterInfo.upperBndi && *(int64_t *)maxval > pFilter->filterInfo.lowerBndi);
-}
-
-////////////////////////////////////////////////////////////////////////
-bool rangeFilter_ds_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_ds_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval<pFilter->filterInfo.upperBndd &&*(float *)maxval> pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_ds_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval < pFilter->filterInfo.upperBndd && *(float *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_ds_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(float *)minval <= pFilter->filterInfo.upperBndd && *(float *)maxval > pFilter->filterInfo.lowerBndd);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool rangeFilter_dd_ii(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval <= pFilter->filterInfo.upperBndd && *(double *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_dd_ee(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval<pFilter->filterInfo.upperBndd &&*(double *)maxval> pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_dd_ie(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval < pFilter->filterInfo.upperBndd && *(double *)maxval >= pFilter->filterInfo.lowerBndd);
-}
-
-bool rangeFilter_dd_ei(SColumnFilterElem *pFilter, char *minval, char *maxval) {
-  return (*(double *)minval <= pFilter->filterInfo.upperBndd && *(double *)maxval > pFilter->filterInfo.lowerBndd);
-}
-
-////////////////////////////////////////////////////////////////////////////
-bool (*filterFunc_i8[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_i8,
-  large_i8,
-  equal_i8,
-  lessEqual_i8,
-  largeEqual_i8,
-  nequal_i8,
-  NULL,
-};
-
-bool (*filterFunc_i16[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_i16,
-  large_i16,
-  equal_i16,
-  lessEqual_i16,
-  largeEqual_i16,
-  nequal_i16,
-  NULL,
-};
-
-bool (*filterFunc_i32[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_i32,
-  large_i32,
-  equal_i32,
-  lessEqual_i32,
-  largeEqual_i32,
-  nequal_i32,
-  NULL,
-};
-
-bool (*filterFunc_i64[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_i64,
-  large_i64,
-  equal_i64,
-  lessEqual_i64,
-  largeEqual_i64,
-  nequal_i64,
-  NULL,
-};
-
-bool (*filterFunc_ds[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_ds,
-  large_ds,
-  equal_ds,
-  lessEqual_ds,
-  largeEqual_ds,
-  nequal_ds,
-  NULL,
-};
-
-bool (*filterFunc_dd[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  less_dd,
-  large_dd,
-  equal_dd,
-  lessEqual_dd,
-  largeEqual_dd,
-  nequal_dd,
-  NULL,
-};
-
-bool (*filterFunc_str[])(SColumnFilterElem* pFilter, char* minval, char *maxval) = {
-  NULL,
-  NULL,
-  NULL,
-  equal_str,
-  NULL,
-  NULL,
-  nequal_str,
-  like_str,
-};
-
-bool (*filterFunc_nchar[])(SColumnFilterElem* pFitler, char* minval, char* maxval) = {
-  NULL,
-  NULL,
-  NULL,
-  equal_nchar,
-  NULL,
-  NULL,
-  nequal_nchar,
-  like_nchar,
-};
-
-bool (*rangeFilterFunc_i8[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_i8_ee,
-  rangeFilter_i8_ie,
-  rangeFilter_i8_ei,
-  rangeFilter_i8_ii,
-};
-
-bool (*rangeFilterFunc_i16[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_i16_ee,
-  rangeFilter_i16_ie,
-  rangeFilter_i16_ei,
-  rangeFilter_i16_ii,
-};
-
-bool (*rangeFilterFunc_i32[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_i32_ee,
-  rangeFilter_i32_ie,
-  rangeFilter_i32_ei,
-  rangeFilter_i32_ii,
-};
-
-bool (*rangeFilterFunc_i64[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_i64_ee,
-  rangeFilter_i64_ie,
-  rangeFilter_i64_ei,
-  rangeFilter_i64_ii,
-};
-
-bool (*rangeFilterFunc_ds[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_ds_ee,
-  rangeFilter_ds_ie,
-  rangeFilter_ds_ei,
-  rangeFilter_ds_ii,
-};
-
-bool (*rangeFilterFunc_dd[])(SColumnFilterElem *pFilter, char *minval, char *maxval) = {
-  NULL,
-  rangeFilter_dd_ee,
-  rangeFilter_dd_ie,
-  rangeFilter_dd_ei,
-  rangeFilter_dd_ii,
-};
-
-__filter_func_t* vnodeGetRangeFilterFuncArray(int32_t type) {
-  switch(type) {
-    case TSDB_DATA_TYPE_BOOL:       return rangeFilterFunc_i8;
-    case TSDB_DATA_TYPE_TINYINT:    return rangeFilterFunc_i8;
-    case TSDB_DATA_TYPE_SMALLINT:   return rangeFilterFunc_i16;
-    case TSDB_DATA_TYPE_INT:        return rangeFilterFunc_i32;
-    case TSDB_DATA_TYPE_TIMESTAMP:  //timestamp uses bigint filter
-    case TSDB_DATA_TYPE_BIGINT:     return rangeFilterFunc_i64;
-    case TSDB_DATA_TYPE_FLOAT:      return rangeFilterFunc_ds;
-    case TSDB_DATA_TYPE_DOUBLE:     return rangeFilterFunc_dd;
-    default:return NULL;
-  }
-}
-
-__filter_func_t* vnodeGetValueFilterFuncArray(int32_t type) {
-  switch(type) {
-    case TSDB_DATA_TYPE_BOOL:       return filterFunc_i8;
-    case TSDB_DATA_TYPE_TINYINT:    return filterFunc_i8;
-    case TSDB_DATA_TYPE_SMALLINT:   return filterFunc_i16;
-    case TSDB_DATA_TYPE_INT:        return filterFunc_i32;
-    case TSDB_DATA_TYPE_TIMESTAMP:  //timestamp uses bigint filter
-    case TSDB_DATA_TYPE_BIGINT:     return filterFunc_i64;
-    case TSDB_DATA_TYPE_FLOAT:      return filterFunc_ds;
-    case TSDB_DATA_TYPE_DOUBLE:     return filterFunc_dd;
-    case TSDB_DATA_TYPE_BINARY:     return filterFunc_str;
-    case TSDB_DATA_TYPE_NCHAR:      return filterFunc_nchar;
-    default: return NULL;
-  }
-}
-
-bool vnodeSupportPrefilter(int32_t type) { return type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_NCHAR; }
diff --git a/src/system/detail/src/vnodeImport.c b/src/system/detail/src/vnodeImport.c
deleted file mode 100644
index 7ebab90f0baed0b79936fced88c3a129cff6f170..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeImport.c
+++ /dev/null
@@ -1,1573 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "vnode.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-extern void         vnodeGetHeadTname(char *nHeadName, char *nLastName, int vnode, int fileId);
-extern int          vnodeReadColumnToMem(int fd, SCompBlock *pBlock, SField **fields, int col, char *data, int dataSize,
-                                         char *temp, char *buffer, int bufferSize);
-extern int          vnodeSendShellSubmitRspMsg(SShellObj *pObj, int code, int numOfPoints);
-extern void         vnodeGetHeadDataLname(char *headName, char *dataName, char *lastName, int vnode, int fileId);
-extern int          vnodeCreateEmptyCompFile(int vnode, int fileId);
-extern int          vnodeUpdateFreeSlot(SVnodeObj *pVnode);
-extern SCacheBlock *vnodeGetFreeCacheBlock(SVnodeObj *pVnode);
-extern int          vnodeCreateNeccessaryFiles(SVnodeObj *pVnode);
-
-#define KEY_AT_INDEX(payload, step, idx) (*(TSKEY *)((char *)(payload) + (step) * (idx)))
-typedef struct {
-  void *     signature;
-  SShellObj *pShell;
-  SMeterObj *pObj;
-  int        retry;
-  TSKEY      firstKey;
-  TSKEY      lastKey;
-  int        importedRows;
-  int        commit;  // start to commit if it is set to 1
-
-  int   slot;  // slot/block to start writing the import data
-  int   pos;   // pos to start writing the import data in the slot/block
-  TSKEY key;
-
-  // only for file
-  int     numOfPoints;
-  int64_t offset;  // offset in data file
-  char *  payload;
-  char *  opayload;  // allocated space for payload from client
-  int     rows;
-} SImportInfo;
-
-typedef struct {
-  // in .head file
-  SCompHeader *pHeader;
-  size_t       pHeaderSize;
-
-  SCompInfo   compInfo;
-  SCompBlock *pBlocks;
-  // in .data file
-  int     blockId;
-  uint8_t blockLoadState;
-
-  SField *pField;
-  size_t  pFieldSize;
-
-  SData *data[TSDB_MAX_COLUMNS];
-  char * buffer;
-
-  char *temp;
-
-  char * tempBuffer;
-  size_t tempBufferSize;
-  // Variables for sendfile
-  int64_t compInfoOffset;
-  int64_t nextNo0Offset;  // next sid whose compInfoOffset > 0
-  int64_t hfSize;
-  int64_t driftOffset;
-
-  int oldNumOfBlocks;
-  int newNumOfBlocks;
-  int last;
-} SImportHandle;
-
-typedef struct {
-  int   slot;
-  int   pos;
-  int   oslot;  // old slot
-  TSKEY nextKey;
-} SBlockIter;
-
-typedef struct {
-  int64_t spos;
-  int64_t epos;
-  int64_t totalRows;
-  char *  offset[];
-} SMergeBuffer;
-
-int vnodeImportData(SMeterObj *pObj, SImportInfo *pImport);
-
-int vnodeFindKeyInCache(SImportInfo *pImport, int order) {
-  SMeterObj * pObj = pImport->pObj;
-  int         code = 0;
-  SQuery      query;
-  SCacheInfo *pInfo = (SCacheInfo *)pObj->pCache;
-
-  TSKEY key = order ? pImport->firstKey : pImport->lastKey;
-  memset(&query, 0, sizeof(query));
-  query.order.order = order;
-  query.skey = key;
-  query.ekey = order ? pImport->lastKey : pImport->firstKey;
-  vnodeSearchPointInCache(pObj, &query);
-
-  if (query.slot < 0) {
-    pImport->slot = pInfo->commitSlot;
-    if (pInfo->commitPoint >= pObj->pointsPerBlock) pImport->slot = (pImport->slot + 1) % pInfo->maxBlocks;
-    pImport->pos = 0;
-    pImport->key = 0;
-    dTrace("vid:%d sid:%d id:%s, key:%" PRId64 ", import to head of cache", pObj->vnode, pObj->sid, pObj->meterId, key);
-    code = 0;
-  } else {
-    pImport->slot = query.slot;
-    pImport->pos = query.pos;
-    pImport->key = query.key;
-
-    if (key != query.key) {
-      if (order == 0) {
-        // since pos is the position which has smaller key, data shall be imported after it
-        pImport->pos++;
-        if (pImport->pos >= pObj->pointsPerBlock) {
-          pImport->slot = (pImport->slot + 1) % pInfo->maxBlocks;
-          pImport->pos = 0;
-        }
-      } else {
-        if (pImport->pos < 0) pImport->pos = 0;
-      }
-    }
-    code = 0;
-  }
-
-  return code;
-}
-
-void vnodeGetValidDataRange(int vnode, TSKEY now, TSKEY *minKey, TSKEY *maxKey) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  int     fid = now / delta;
-  *minKey = (fid - pVnode->maxFiles + 1) * delta;
-  *maxKey = (fid + 2) * delta - 1;
-  return;
-}
-
-int vnodeImportPoints(SMeterObj *pObj, char *cont, int contLen, char source, void *param, int sversion,
-                      int *pNumOfPoints, TSKEY now) {
-  SSubmitMsg *pSubmit = (SSubmitMsg *)cont;
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-  int         rows = 0;
-  char *      payload = NULL;
-  int         code = TSDB_CODE_SUCCESS;
-  SCachePool *pPool = (SCachePool *)(pVnode->pCachePool);
-  SShellObj * pShell = (SShellObj *)param;
-  TSKEY       firstKey, lastKey;
-
-  payload = pSubmit->payLoad;
-
-  rows = htons(pSubmit->numOfRows);
-  assert(rows > 0);
-  int expectedLen = rows * pObj->bytesPerPoint + sizeof(pSubmit->numOfRows);
-  if (expectedLen != contLen) {
-    dError("vid:%d sid:%d id:%s, invalid import, expected:%d, contLen:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           expectedLen, contLen);
-    return TSDB_CODE_WRONG_MSG_SIZE;
-  }
-
-  // Check timestamp context.
-  TSKEY minKey = 0, maxKey = 0;
-  firstKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0);
-  lastKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, rows - 1);
-  assert(firstKey <= lastKey);
-  vnodeGetValidDataRange(pObj->vnode, now, &minKey, &maxKey);
-  if (firstKey < minKey || firstKey > maxKey || lastKey < minKey || lastKey > maxKey) {
-    dError(
-        "vid:%d sid:%d id:%s, invalid timestamp to import, rows:%d firstKey: %" PRId64 " lastKey: %" PRId64 " minAllowedKey:%" PRId64 " "
-        "maxAllowedKey:%" PRId64,
-        pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, minKey, maxKey);
-    return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
-  }
-    // forward to peers
-  if (pShell && pVnode->cfg.replications > 1) {
-    code = vnodeForwardToPeer(pObj, cont, contLen, TSDB_ACTION_IMPORT, sversion);
-    if (code != 0) return code;
-  }
-
-  if (pVnode->cfg.commitLog && source != TSDB_DATA_SOURCE_LOG) {
-    if (pVnode->logFd < 0) return TSDB_CODE_INVALID_COMMIT_LOG;
-    code = vnodeWriteToCommitLog(pObj, TSDB_ACTION_IMPORT, cont, contLen, sversion);
-    if (code != 0) return code;
-  }
-
-  /*
-   * The timestamp of all records in a submit payload are always in ascending order, guaranteed by client, so here only
-   * the first key.
-   */
-  if (firstKey > pObj->lastKey) {  // Just call insert
-    code = vnodeInsertPoints(pObj, cont, contLen, TSDB_DATA_SOURCE_LOG, NULL, sversion, pNumOfPoints, now);
-  } else {  // trigger import
-    if (sversion != pObj->sversion) {
-      dError("vid:%d sid:%d id:%s, invalid sversion, expected:%d received:%d", pObj->vnode, pObj->sid, pObj->meterId,
-             pObj->sversion, sversion);
-      return TSDB_CODE_OTHERS;
-    }
-  
-    // check the table status for perform import historical data
-    if ((code = vnodeSetMeterInsertImportStateEx(pObj, TSDB_METER_STATE_IMPORTING)) != TSDB_CODE_SUCCESS) {
-      return code;
-    }
-    
-    SImportInfo import = {0};
-
-    dTrace("vid:%d sid:%d id:%s, try to import %d rows data, firstKey:%" PRId64 ", lastKey:%" PRId64 ", object lastKey:%" PRId64,
-           pObj->vnode, pObj->sid, pObj->meterId, rows, firstKey, lastKey, pObj->lastKey);
-    
-    import.firstKey = firstKey;
-    import.lastKey = lastKey;
-    import.pObj = pObj;
-    import.pShell = pShell;
-    import.payload = payload;
-    import.rows = rows;
-
-    // FIXME: mutex here seems meaningless and num here still can be changed
-    int32_t num = 0;
-    pthread_mutex_lock(&pVnode->vmutex);
-    num = pObj->numOfQueries;
-    pthread_mutex_unlock(&pVnode->vmutex);
-
-    int32_t commitInProcess = 0;
-
-    pthread_mutex_lock(&pPool->vmutex);
-    if (((commitInProcess = pPool->commitInProcess) == 1) || num > 0) {
-      // mutual exclusion with read (need to change here)
-      pthread_mutex_unlock(&pPool->vmutex);
-      vnodeClearMeterState(pObj, TSDB_METER_STATE_IMPORTING);
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-
-    } else {
-      pPool->commitInProcess = 1;
-      pthread_mutex_unlock(&pPool->vmutex);
-      code = vnodeImportData(pObj, &import);
-      *pNumOfPoints = import.importedRows;
-    }
-    pVnode->version++;
-    vnodeClearMeterState(pObj, TSDB_METER_STATE_IMPORTING);
-  }
-  
-  return code;
-}
-
-/* Function to search keys in a range
- *
- * Assumption: keys in payload are in ascending order
- *
- * @payload: data records, key in ascending order
- * @step:    bytes each record takes
- * @rows:    number of data records
- * @skey:    range start (included)
- * @ekey:    range end (included)
- * @srows:   rtype, start index of records
- * @nrows:   rtype, number of records in range
- *
- * @rtype:   0 means find data in the range
- *          -1 means find no data in the range
- */
-static int vnodeSearchKeyInRange(char *payload, int step, int rows, TSKEY skey, TSKEY ekey, int *srow, int *nrows) {
-  if (rows <= 0 || KEY_AT_INDEX(payload, step, 0) > ekey || KEY_AT_INDEX(payload, step, rows - 1) < skey || skey > ekey)
-    return -1;
-
-  int left = 0;
-  int right = rows - 1;
-  int mid;
-
-  // Binary search the first key in payload >= skey
-  do {
-    mid = (left + right) / 2;
-    if (skey < KEY_AT_INDEX(payload, step, mid)) {
-      right = mid;
-    } else if (skey > KEY_AT_INDEX(payload, step, mid)) {
-      left = mid + 1;
-    } else {
-      break;
-    }
-  } while (left < right);
-
-  if (skey <= KEY_AT_INDEX(payload, step, mid)) {
-    *srow = mid;
-  } else {
-    if (mid + 1 >= rows) {
-      return -1;
-    } else {
-      *srow = mid + 1;
-    }
-  }
-
-  assert(skey <= KEY_AT_INDEX(payload, step, *srow));
-
-  *nrows = 0;
-  for (int i = *srow; i < rows; i++) {
-    if (KEY_AT_INDEX(payload, step, i) <= ekey) {
-      (*nrows)++;
-    } else {
-      break;
-    }
-  }
-
-  if (*nrows == 0) return -1;
-
-  return 0;
-}
-
-int vnodeOpenMinFilesForImport(int vnode, int fid) {
-  char        dname[TSDB_FILENAME_LEN] = "\0";
-  SVnodeObj * pVnode = vnodeList + vnode;
-  struct stat filestat;
-  int         minFileSize;
-
-  minFileSize = TSDB_FILE_HEADER_LEN + sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM);
-
-  vnodeGetHeadDataLname(pVnode->cfn, dname, pVnode->lfn, vnode, fid);
-
-  // Open .head file
-  pVnode->hfd = open(pVnode->cfn, O_RDONLY);
-  if (pVnode->hfd < 0) {
-    dError("vid:%d, failed to open head file:%s, reason:%s", vnode, pVnode->cfn, strerror(errno));
-    taosLogError("vid:%d, failed to open head file:%s, reason:%s", vnode, pVnode->cfn, strerror(errno));
-    goto _error_open;
-  }
-
-  fstat(pVnode->hfd, &filestat);
-  if (filestat.st_size < minFileSize) {
-    dError("vid:%d, head file:%s is corrupted", vnode, pVnode->cfn);
-    taosLogError("vid:%d, head file:%s corrupted", vnode, pVnode->cfn);
-    goto _error_open;
-  }
-
-  // Open .data file
-  pVnode->dfd = open(dname, O_RDWR);
-  if (pVnode->dfd < 0) {
-    dError("vid:%d, failed to open data file:%s, reason:%s", vnode, dname, strerror(errno));
-    taosLogError("vid:%d, failed to open data file:%s, reason:%s", vnode, dname, strerror(errno));
-    goto _error_open;
-  }
-
-  fstat(pVnode->dfd, &filestat);
-  if (filestat.st_size < TSDB_FILE_HEADER_LEN) {
-    dError("vid:%d, data file:%s corrupted", vnode, dname);
-    taosLogError("vid:%d, data file:%s corrupted", vnode, dname);
-    goto _error_open;
-  }
-
-  // Open .last file
-  pVnode->lfd = open(pVnode->lfn, O_RDWR);
-  if (pVnode->lfd < 0) {
-    dError("vid:%d, failed to open last file:%s, reason:%s", vnode, pVnode->lfn, strerror(errno));
-    taosLogError("vid:%d, failed to open last file:%s, reason:%s", vnode, pVnode->lfn, strerror(errno));
-    goto _error_open;
-  }
-
-  fstat(pVnode->lfd, &filestat);
-  if (filestat.st_size < TSDB_FILE_HEADER_LEN) {
-    dError("vid:%d, last file:%s corrupted", vnode, pVnode->lfn);
-    taosLogError("vid:%d, last file:%s corrupted", vnode, pVnode->lfn);
-    goto _error_open;
-  }
-
-  return 0;
-
-_error_open:
-  if (pVnode->hfd > 0) close(pVnode->hfd);
-  pVnode->hfd = 0;
-
-  if (pVnode->dfd > 0) close(pVnode->dfd);
-  pVnode->dfd = 0;
-
-  if (pVnode->lfd > 0) close(pVnode->lfd);
-  pVnode->lfd = 0;
-
-  return -1;
-}
-
-/* Function to open .t file and sendfile the first part
- */
-int vnodeOpenTempFilesForImport(SImportHandle *pHandle, SMeterObj *pObj, int fid) {
-  char        dHeadName[TSDB_FILENAME_LEN] = "\0";
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-  struct stat filestat;
-  int         sid;
-
-  // cfn: .head
-  if (readlink(pVnode->cfn, dHeadName, TSDB_FILENAME_LEN) < 0) return -1;
-
-  size_t len = strlen(dHeadName);
-  // switch head name
-  switch (dHeadName[len - 1]) {
-    case '0':
-      dHeadName[len - 1] = '1';
-      break;
-    case '1':
-      dHeadName[len - 1] = '0';
-      break;
-    default:
-      dError("vid: %d, fid: %d, head target filename not end with 0 or 1", pVnode->vnode, fid);
-      return -1;
-  }
-
-  vnodeGetHeadTname(pVnode->nfn, NULL, pVnode->vnode, fid);
-  if (symlink(dHeadName, pVnode->nfn) < 0) return -1;
-
-  pVnode->nfd = open(pVnode->nfn, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  if (pVnode->nfd < 0) {
-    dError("vid:%d, failed to open new head file:%s, reason:%s", pVnode->vnode, pVnode->nfn, strerror(errno));
-    taosLogError("vid:%d, failed to open new head file:%s, reason:%s", pVnode->vnode, pVnode->nfn, strerror(errno));
-    return -1;
-  }
-
-  fstat(pVnode->hfd, &filestat);
-  pHandle->hfSize = filestat.st_size;
-
-  // Find the next sid whose compInfoOffset > 0
-  for (sid = pObj->sid + 1; sid < pVnode->cfg.maxSessions; sid++) {
-    if (pHandle->pHeader[sid].compInfoOffset > 0) break;
-  }
-
-  pHandle->nextNo0Offset = (sid == pVnode->cfg.maxSessions) ? pHandle->hfSize : pHandle->pHeader[sid].compInfoOffset;
-
-  // FIXME: sendfile the original part
-  // TODO: Here, we need to take the deleted table case in consideration, this function
-  // just assume the case is handled before calling this function
-  if (pHandle->pHeader[pObj->sid].compInfoOffset > 0) {
-    pHandle->compInfoOffset = pHandle->pHeader[pObj->sid].compInfoOffset;
-  } else {
-    pHandle->compInfoOffset = pHandle->nextNo0Offset;
-  }
-
-  assert(pHandle->compInfoOffset <= pHandle->hfSize);
-
-  lseek(pVnode->hfd, 0, SEEK_SET);
-  lseek(pVnode->nfd, 0, SEEK_SET);
-  if (tsendfile(pVnode->nfd, pVnode->hfd, NULL, pHandle->compInfoOffset) < 0) {
-    return -1;
-  }
-
-  // Leave a SCompInfo space here
-  lseek(pVnode->nfd, sizeof(SCompInfo), SEEK_CUR);
-
-  return 0;
-}
-
-typedef enum { DATA_LOAD_TIMESTAMP = 0x1, DATA_LOAD_OTHER_DATA = 0x2 } DataLoadMod;
-
-/* Function to load a block data at the requirement of mod
- */
-static int vnodeLoadNeededBlockData(SMeterObj *pObj, SImportHandle *pHandle, int blockId, uint8_t loadMod, int *code) {
-  size_t      size;
-  SCompBlock *pBlock = pHandle->pBlocks + blockId;
-  *code = TSDB_CODE_SUCCESS;
-
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-
-  int dfd = pBlock->last ? pVnode->lfd : pVnode->dfd;
-
-  if (pHandle->blockId != blockId) {
-    pHandle->blockId = blockId;
-    pHandle->blockLoadState = 0;
-  }
-
-  if (pHandle->blockLoadState == 0){ // Reload pField
-    size = sizeof(SField) * pBlock->numOfCols + sizeof(TSCKSUM);
-    if (pHandle->pFieldSize < size) {
-      pHandle->pField = (SField *)realloc((void *)(pHandle->pField), size);
-      if (pHandle->pField == NULL) {
-        dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-               pObj->meterId, size);
-        *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        return -1;
-      }
-      pHandle->pFieldSize = size;
-    }
-
-    lseek(dfd, pBlock->offset, SEEK_SET);
-    if (read(dfd, (void *)(pHandle->pField), pHandle->pFieldSize) < 0) {
-      dError("vid:%d sid:%d meterId:%s, failed to read data file, size:%zu reason:%s", pVnode->vnode, pObj->sid,
-             pObj->meterId, pHandle->pFieldSize, strerror(errno));
-      *code = TSDB_CODE_FILE_CORRUPTED;
-      return -1;
-    }
-
-    if (!taosCheckChecksumWhole((uint8_t *)(pHandle->pField), pHandle->pFieldSize)) {
-      dError("vid:%d sid:%d meterId:%s, data file %s is broken since checksum mismatch", pVnode->vnode, pObj->sid,
-             pObj->meterId, pVnode->lfn);
-      *code = TSDB_CODE_FILE_CORRUPTED;
-      return -1;
-    }
-  }
-
-  {  // Allocate necessary buffer
-    size = pObj->bytesPerPoint * pObj->pointsPerFileBlock +
-           (sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM)) * pObj->numOfColumns;
-    if (pHandle->buffer == NULL) {
-      pHandle->buffer = malloc(size);
-      if (pHandle->buffer == NULL) {
-        dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-               pObj->meterId, size);
-        *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        return -1;
-      }
-
-      // TODO: Init data
-      pHandle->data[0] = (SData *)(pHandle->buffer);
-      for (int col = 1; col < pObj->numOfColumns; col++) {
-        pHandle->data[col] = (SData *)((char *)(pHandle->data[col - 1]) + sizeof(SData) + EXTRA_BYTES +
-                                       sizeof(TSCKSUM) + pObj->pointsPerFileBlock * pObj->schema[col - 1].bytes);
-      }
-    }
-
-    if (pHandle->temp == NULL) {
-      pHandle->temp = malloc(size);
-      if (pHandle->temp == NULL) {
-        dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-               pObj->meterId, size);
-        *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        return -1;
-      }
-    }
-
-    if (pHandle->tempBuffer == NULL) {
-      pHandle->tempBufferSize = pObj->maxBytes * pObj->pointsPerFileBlock + EXTRA_BYTES + sizeof(TSCKSUM);
-      pHandle->tempBuffer = malloc(pHandle->tempBufferSize);
-      if (pHandle->tempBuffer == NULL) {
-        dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-               pObj->meterId, pHandle->tempBufferSize);
-        *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        return -1;
-      }
-    }
-  }
-
-  if ((loadMod & DATA_LOAD_TIMESTAMP) &&
-      (~(pHandle->blockLoadState & DATA_LOAD_TIMESTAMP))) {  // load only timestamp part
-    if (vnodeReadColumnToMem(dfd, pBlock, &(pHandle->pField), PRIMARYKEY_TIMESTAMP_COL_INDEX,
-                             pHandle->data[PRIMARYKEY_TIMESTAMP_COL_INDEX]->data, sizeof(TSKEY) * pBlock->numOfPoints,
-                             pHandle->temp, pHandle->tempBuffer, pHandle->tempBufferSize) < 0) {
-      *code = TSDB_CODE_FILE_CORRUPTED;
-      return -1;
-    }
-
-    pHandle->blockLoadState |= DATA_LOAD_TIMESTAMP;
-  }
-
-  if ((loadMod & DATA_LOAD_OTHER_DATA) && (~(pHandle->blockLoadState & DATA_LOAD_OTHER_DATA))) {  // load other columns
-    for (int col = 1; col < pBlock->numOfCols; col++) {
-      if (vnodeReadColumnToMem(dfd, pBlock, &(pHandle->pField), col, pHandle->data[col]->data,
-                               pBlock->numOfPoints * pObj->schema[col].bytes, pHandle->temp, pHandle->tempBuffer,
-                               pHandle->tempBufferSize) < 0) {
-        *code = TSDB_CODE_FILE_CORRUPTED;
-        return -1;
-      }
-    }
-
-    pHandle->blockLoadState |= DATA_LOAD_OTHER_DATA;
-  }
-
-  return 0;
-}
-
-static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) {
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-  char       dpath[TSDB_FILENAME_LEN] = "\0";
-  SCompInfo  compInfo;
-
-#ifdef _ALPINE
-  off_t    offset = 0;
-#else
-  __off_t  offset = 0;
-#endif
-
-  if (pVnode->nfd > 0) {
-    offset = lseek(pVnode->nfd, 0, SEEK_CUR);
-    assert(offset == pHandle->nextNo0Offset + pHandle->driftOffset);
-
-    {  // Write the SCompInfo part
-      compInfo.uid = pObj->uid;
-      compInfo.last = pHandle->last;
-      compInfo.numOfBlocks = pHandle->newNumOfBlocks + pHandle->oldNumOfBlocks;
-      compInfo.delimiter = TSDB_VNODE_DELIMITER;
-      taosCalcChecksumAppend(0, (uint8_t *)(&compInfo), sizeof(SCompInfo));
-
-      lseek(pVnode->nfd, pHandle->compInfoOffset, SEEK_SET);
-      if (twrite(pVnode->nfd, (void *)(&compInfo), sizeof(SCompInfo)) < 0) {
-        dError("vid:%d sid:%d meterId:%s, failed to wirte SCompInfo, reason:%s", pObj->vnode, pObj->sid, pObj->meterId,
-               strerror(errno));
-        return -1;
-      }
-    }
-
-    // Write the rest of the SCompBlock part
-    if (pHandle->hfSize > pHandle->nextNo0Offset) {
-      lseek(pVnode->nfd, 0, SEEK_END);
-      lseek(pVnode->hfd, pHandle->nextNo0Offset, SEEK_SET);
-      if (tsendfile(pVnode->nfd, pVnode->hfd, NULL, pHandle->hfSize - pHandle->nextNo0Offset) < 0) {
-        dError("vid:%d sid:%d meterId:%s, failed to sendfile, size:%" PRId64 ", reason:%s", pObj->vnode, pObj->sid,
-               pObj->meterId, pHandle->hfSize - pHandle->nextNo0Offset, strerror(errno));
-        return -1;
-      }
-    }
-
-    // Write SCompHeader part
-    pHandle->pHeader[pObj->sid].compInfoOffset = pHandle->compInfoOffset;
-    for (int sid = pObj->sid + 1; sid < pVnode->cfg.maxSessions; ++sid) {
-      if (pHandle->pHeader[sid].compInfoOffset > 0) {
-        pHandle->pHeader[sid].compInfoOffset += pHandle->driftOffset;
-      }
-    }
-
-    taosCalcChecksumAppend(0, (uint8_t *)(pHandle->pHeader), pHandle->pHeaderSize);
-    lseek(pVnode->nfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-    if (twrite(pVnode->nfd, (void *)(pHandle->pHeader), pHandle->pHeaderSize) < 0) {
-      dError("vid:%d sid:%d meterId:%s, failed to wirte SCompHeader part, size:%zu, reason:%s", pObj->vnode, pObj->sid,
-             pObj->meterId, pHandle->pHeaderSize, strerror(errno));
-      return -1;
-    }
-  }
-
-  // Close opened files
-  close(pVnode->dfd);
-  pVnode->dfd = 0;
-
-  close(pVnode->hfd);
-  pVnode->hfd = 0;
-
-  close(pVnode->lfd);
-  pVnode->lfd = 0;
-
-  if (pVnode->nfd > 0) {
-    close(pVnode->nfd);
-    pVnode->nfd = 0;
-
-    readlink(pVnode->cfn, dpath, TSDB_FILENAME_LEN);
-    rename(pVnode->nfn, pVnode->cfn);
-    remove(dpath);
-  }
-
-  return 0;
-}
-
-static void vnodeConvertRowsToCols(SMeterObj *pObj, const char *payload, int rows, SData *data[], int rowOffset) {
-  int sdataRow;
-  int offset;
-
-  for (int row = 0; row < rows; ++row) {
-    sdataRow = row + rowOffset;
-    offset = 0;
-    for (int col = 0; col < pObj->numOfColumns; ++col) {
-      memcpy(data[col]->data + sdataRow * pObj->schema[col].bytes, payload + pObj->bytesPerPoint * row + offset,
-             pObj->schema[col].bytes);
-
-      offset += pObj->schema[col].bytes;
-    }
-  }
-}
-
-static int vnodeMergeDataIntoFile(SImportInfo *pImport, const char *payload, int rows, int fid) {
-  SMeterObj *   pObj = (SMeterObj *)(pImport->pObj);
-  SVnodeObj *   pVnode = vnodeList + pObj->vnode;
-  SImportHandle importHandle;
-  size_t        size = 0;
-  SData *       data[TSDB_MAX_COLUMNS];
-  char *        buffer = NULL;
-  SData *       cdata[TSDB_MAX_COLUMNS];
-  char *        cbuffer = NULL;
-  SCompBlock    compBlock;
-  TSCKSUM       checksum = 0;
-  int           pointsImported = 0;
-  int           code = TSDB_CODE_SUCCESS;
-  SCachePool *  pPool = (SCachePool *)pVnode->pCachePool;
-  SCacheInfo *  pInfo = (SCacheInfo *)(pObj->pCache);
-  TSKEY         lastKeyImported = 0;
-
-  TSKEY delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  TSKEY minFileKey = fid * delta;
-  TSKEY maxFileKey = minFileKey + delta - 1;
-  TSKEY firstKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0);
-  TSKEY lastKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, rows - 1);
-
-  assert(firstKey >= minFileKey && firstKey <= maxFileKey && lastKey >= minFileKey && lastKey <= maxFileKey);
-
-  // create neccessary files
-  pVnode->commitFirstKey = firstKey;
-  if (vnodeCreateNeccessaryFiles(pVnode) < 0) return TSDB_CODE_OTHERS;
-
-  assert(pVnode->commitFileId == fid);
-
-  // Open least files to import .head(hfd) .data(dfd) .last(lfd)
-  if (vnodeOpenMinFilesForImport(pObj->vnode, fid) < 0) return TSDB_CODE_FILE_CORRUPTED;
-
-  memset(&importHandle, 0, sizeof(SImportHandle));
-
-  {  // Load SCompHeader part from .head file
-    importHandle.pHeaderSize = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM);
-    importHandle.pHeader = (SCompHeader *)malloc(importHandle.pHeaderSize);
-    if (importHandle.pHeader == NULL) {
-      dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-             pObj->meterId, importHandle.pHeaderSize);
-      code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-      goto _error_merge;
-    }
-
-    lseek(pVnode->hfd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-    if (read(pVnode->hfd, (void *)(importHandle.pHeader), importHandle.pHeaderSize) < importHandle.pHeaderSize) {
-      dError("vid: %d, sid: %d, meterId: %s, fid: %d failed to read SCompHeader part, reason:%s", pObj->vnode,
-             pObj->sid, pObj->meterId, fid, strerror(errno));
-      code = TSDB_CODE_FILE_CORRUPTED;
-      goto _error_merge;
-    }
-
-    if (!taosCheckChecksumWhole((uint8_t *)(importHandle.pHeader), importHandle.pHeaderSize)) {
-      dError("vid: %d, sid: %d, meterId: %s, fid: %d SCompHeader part is broken", pObj->vnode, pObj->sid, pObj->meterId,
-             fid);
-      code = TSDB_CODE_FILE_CORRUPTED;
-      goto _error_merge;
-    }
-  }
-
-  {  // Initialize data[] and cdata[], which is used to hold data to write to data file
-    size = pObj->bytesPerPoint * pVnode->cfg.rowsInFileBlock + (sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM)) * pObj->numOfColumns;
-
-    buffer = (char *)malloc(size);
-    if (buffer == NULL) {
-      dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-             pObj->meterId, size);
-      code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-      goto _error_merge;
-    }
-
-    cbuffer = (char *)malloc(size);
-    if (cbuffer == NULL) {
-      dError("vid: %d, sid: %d, meterId: %s, failed to allocate memory, size: %ul", pObj->vnode, pObj->sid,
-             pObj->meterId, size);
-      code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-      goto _error_merge;
-    }
-
-    data[0] = (SData *)buffer;
-    cdata[0] = (SData *)cbuffer;
-
-    for (int col = 1; col < pObj->numOfColumns; col++) {
-      data[col] = (SData *)((char *)data[col - 1] + sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM) +
-                            pObj->pointsPerFileBlock * pObj->schema[col - 1].bytes);
-      cdata[col] = (SData *)((char *)cdata[col - 1] + sizeof(SData) + EXTRA_BYTES + sizeof(TSCKSUM) +
-                             pObj->pointsPerFileBlock * pObj->schema[col - 1].bytes);
-    }
-  }
-
-  if (importHandle.pHeader[pObj->sid].compInfoOffset == 0) {  // No data in this file, just write it
-  _write_empty_point:
-    if (vnodeOpenTempFilesForImport(&importHandle, pObj, fid) < 0) {
-      code = TSDB_CODE_OTHERS;
-      goto _error_merge;
-    }
-    importHandle.oldNumOfBlocks = 0;
-    importHandle.driftOffset += sizeof(SCompInfo);
-    lastKeyImported = lastKey;
-
-    for (int rowsWritten = 0; rowsWritten < rows;) {
-      int rowsToWrite = MIN(pVnode->cfg.rowsInFileBlock, (rows - rowsWritten) /* the rows left */);
-      vnodeConvertRowsToCols(pObj, payload + rowsWritten * pObj->bytesPerPoint, rowsToWrite, data, 0);
-      pointsImported += rowsToWrite;
-
-      compBlock.last = 1;
-      if (vnodeWriteBlockToFile(pObj, &compBlock, data, cdata, rowsToWrite) < 0) {
-        // TODO: deal with ERROR here
-      }
-
-      importHandle.last = compBlock.last;
-
-      checksum = taosCalcChecksum(checksum, (uint8_t *)(&compBlock), sizeof(SCompBlock));
-      twrite(pVnode->nfd, &compBlock, sizeof(SCompBlock));
-      importHandle.newNumOfBlocks++;
-      importHandle.driftOffset += sizeof(SCompBlock);
-
-      rowsWritten += rowsToWrite;
-    }
-    twrite(pVnode->nfd, &checksum, sizeof(TSCKSUM));
-    importHandle.driftOffset += sizeof(TSCKSUM);
-  } else {  // Else if there are old data in this file.
-    {       // load SCompInfo and SCompBlock part
-      lseek(pVnode->hfd, importHandle.pHeader[pObj->sid].compInfoOffset, SEEK_SET);
-      if (read(pVnode->hfd, (void *)(&(importHandle.compInfo)), sizeof(SCompInfo)) < sizeof(SCompInfo)) {
-        dError("vid:%d sid:%d meterId:%s, failed to read .head file, reason:%s", pVnode->vnode, pObj->sid,
-               pObj->meterId, strerror(errno));
-        code = TSDB_CODE_FILE_CORRUPTED;
-        goto _error_merge;
-      }
-
-      if ((importHandle.compInfo.delimiter != TSDB_VNODE_DELIMITER) ||
-          (!taosCheckChecksumWhole((uint8_t *)(&(importHandle.compInfo)), sizeof(SCompInfo)))) {
-        dError("vid:%d sid:%d meterId:%s, .head file %s is broken, delemeter:%x", pVnode->vnode, pObj->sid,
-               pObj->meterId, pVnode->cfn, importHandle.compInfo.delimiter);
-        code = TSDB_CODE_FILE_CORRUPTED;
-        goto _error_merge;
-      }
-
-      // Check the context of SCompInfo part
-      if (importHandle.compInfo.uid != pObj->uid) {  // The data belongs to the other meter
-        goto _write_empty_point;
-      }
-
-      importHandle.oldNumOfBlocks = importHandle.compInfo.numOfBlocks;
-      importHandle.last = importHandle.compInfo.last;
-
-      size = sizeof(SCompBlock) * importHandle.compInfo.numOfBlocks + sizeof(TSCKSUM);
-      importHandle.pBlocks = (SCompBlock *)malloc(size);
-      if (importHandle.pBlocks == NULL) {
-        dError("vid:%d sid:%d meterId:%s, failed to allocate importHandle.pBlock, size:%ul", pVnode->vnode, pObj->sid,
-               pObj->meterId, size);
-        code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        goto _error_merge;
-      }
-
-      if (read(pVnode->hfd, (void *)(importHandle.pBlocks), size) < size) {
-        dError("vid:%d sid:%d meterId:%s, failed to read importHandle.pBlock, reason:%s", pVnode->vnode, pObj->sid,
-               pObj->meterId, strerror(errno));
-        code = TSDB_CODE_FILE_CORRUPTED;
-        goto _error_merge;
-      }
-
-      if (!taosCheckChecksumWhole((uint8_t *)(importHandle.pBlocks), size)) {
-        dError("vid:%d sid:%d meterId:%s, pBlock part is broken in %s", pVnode->vnode, pObj->sid, pObj->meterId,
-               pVnode->cfn);
-        code = TSDB_CODE_FILE_CORRUPTED;
-        goto _error_merge;
-      }
-    }
-
-    /* Now we have _payload_, we have _importHandle.pBlocks_, just merge payload into the importHandle.pBlocks
-     *
-     * Input: payload, pObj->bytesPerBlock, rows, importHandle.pBlocks
-     */
-    {
-      int        payloadIter = 0;
-      SBlockIter blockIter = {0, 0, 0, 0};
-
-      while (1) {
-        if (payloadIter >= rows) {  // payload end, break
-          // write the remaining blocks to the file
-          if (pVnode->nfd > 0) {
-            int blocksLeft = importHandle.compInfo.numOfBlocks - blockIter.oslot;
-            if (blocksLeft > 0) {
-              checksum = taosCalcChecksum(checksum, (uint8_t *)(importHandle.pBlocks + blockIter.oslot),
-                                          sizeof(SCompBlock) * blocksLeft);
-              if (twrite(pVnode->nfd, (void *)(importHandle.pBlocks + blockIter.oslot),
-                         sizeof(SCompBlock) * blocksLeft) < 0) {
-                dError("vid:%d sid:%d meterId:%s, failed to write %s file, size:%ul, reason:%s", pVnode->vnode,
-                       pObj->sid, pObj->meterId, pVnode->nfn, sizeof(SCompBlock) * blocksLeft, strerror(errno));
-                code = TSDB_CODE_OTHERS;
-                goto _error_merge;
-              }
-            }
-
-            if (twrite(pVnode->nfd, (void *)(&checksum), sizeof(TSCKSUM)) < 0) {
-              dError("vid:%d sid:%d meterId:%s, failed to write %s file, size:%ul, reason:%s", pVnode->vnode, pObj->sid,
-                     pObj->meterId, pVnode->nfn, sizeof(TSCKSUM), strerror(errno));
-              code = TSDB_CODE_OTHERS;
-              goto _error_merge;
-            }
-          }
-          break;
-        }
-
-        if (blockIter.slot >= importHandle.compInfo.numOfBlocks) {  // blocks end, break
-          // Should never come here
-          assert(false);
-        }
-
-        TSKEY key = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-
-        {  // Binary search the (slot, pos) which is >= key as well as nextKey
-          int   left = blockIter.slot;
-          int   right = importHandle.compInfo.numOfBlocks - 1;
-          TSKEY minKey = importHandle.pBlocks[left].keyFirst;
-          TSKEY maxKey = importHandle.pBlocks[right].keyLast;
-
-          assert(minKey <= maxKey);
-
-          if (key < minKey) {  // Case 1. write just ahead the blockIter.slot
-            blockIter.slot = left;
-            blockIter.pos = 0;
-            blockIter.nextKey = minKey;
-          } else if (key > maxKey) {                 // Case 2. write to the end
-            if (importHandle.pBlocks[right].last) {  // Case 2.1 last block in .last file, need to merge
-              assert(importHandle.last != 0);
-              importHandle.last = 0;
-              blockIter.slot = right;
-              blockIter.pos = importHandle.pBlocks[right].numOfPoints;
-            } else {  // Case 2.2 just write after the last block
-              blockIter.slot = right + 1;
-              blockIter.pos = 0;
-            }
-            blockIter.nextKey = maxFileKey + 1;
-          } else {  // Case 3. need to search the block for slot and pos
-            if (key == minKey || key == maxKey) {
-              if (tsAffectedRowsMod) pointsImported++;
-              payloadIter++;
-              continue;
-            }
-
-            // Here: minKey < key < maxKey
-
-            int   mid;
-            TSKEY blockMinKey;
-            TSKEY blockMaxKey;
-
-            // Binary search the slot
-            do {
-              mid = (left + right) / 2;
-              blockMinKey = importHandle.pBlocks[mid].keyFirst;
-              blockMaxKey = importHandle.pBlocks[mid].keyLast;
-
-              assert(blockMinKey <= blockMaxKey);
-
-              if (key < blockMinKey) {
-                right = mid;
-              } else if (key > blockMaxKey) {
-                left = mid + 1;
-              } else { /* blockMinKey <= key <= blockMaxKey */
-                break;
-              }
-            } while (left < right);
-
-            if (key == blockMinKey || key == blockMaxKey) {  // duplicate key
-              if (tsAffectedRowsMod) pointsImported++;
-              payloadIter++;
-              continue;
-            }
-
-            // Get the slot
-            if (key > blockMaxKey) { /* pos = 0 or pos = ? */
-              blockIter.slot = mid + 1;
-            } else { /* key < blockMinKey (pos = 0) || (key > blockMinKey && key < blockMaxKey) (pos=?) */
-              blockIter.slot = mid;
-            }
-
-            // Get the pos
-            assert(blockIter.slot < importHandle.compInfo.numOfBlocks);
-
-            if (key == importHandle.pBlocks[blockIter.slot].keyFirst ||
-                key == importHandle.pBlocks[blockIter.slot].keyLast) {
-              if (tsAffectedRowsMod) pointsImported++;
-              payloadIter++;
-              continue;
-            }
-
-            assert(key < importHandle.pBlocks[blockIter.slot].keyLast);
-
-            /* */
-            if (key < importHandle.pBlocks[blockIter.slot].keyFirst) {
-              blockIter.pos = 0;
-              blockIter.nextKey = importHandle.pBlocks[blockIter.slot].keyFirst;
-            } else {
-              SCompBlock *pBlock = importHandle.pBlocks + blockIter.slot;
-              if (pBlock->sversion != pObj->sversion) { /*TODO*/
-              }
-              if (vnodeLoadNeededBlockData(pObj, &importHandle, blockIter.slot, DATA_LOAD_TIMESTAMP, &code) < 0) {
-                goto _error_merge;
-              }
-              int pos = (*vnodeSearchKeyFunc[pObj->searchAlgorithm])(
-                  importHandle.data[PRIMARYKEY_TIMESTAMP_COL_INDEX]->data, pBlock->numOfPoints, key, TSQL_SO_ASC);
-              assert(pos != 0);
-              if (KEY_AT_INDEX(importHandle.data[PRIMARYKEY_TIMESTAMP_COL_INDEX]->data, sizeof(TSKEY), pos) == key) {
-                if (tsAffectedRowsMod) pointsImported++;
-                payloadIter++;
-                continue;
-              }
-
-              blockIter.pos = pos;
-              blockIter.nextKey = (blockIter.slot + 1 < importHandle.compInfo.numOfBlocks)
-                                      ? importHandle.pBlocks[blockIter.slot + 1].keyFirst
-                                      : maxFileKey + 1;
-              // Need to merge with this block
-              if (importHandle.pBlocks[blockIter.slot].last) {  // this is to merge with the last block
-                assert((blockIter.slot == (importHandle.compInfo.numOfBlocks - 1)));
-                importHandle.last = 0;
-              }
-            }
-          }
-        }
-
-        int aslot = MIN(blockIter.slot, importHandle.compInfo.numOfBlocks - 1);
-        int64_t sversion = importHandle.pBlocks[aslot].sversion;
-        if (sversion != pObj->sversion) {
-          code = TSDB_CODE_OTHERS;
-          goto _error_merge;
-        }
-
-        // Open the new .t file if not opened yet.
-        if (pVnode->nfd <= 0) {
-          if (vnodeOpenTempFilesForImport(&importHandle, pObj, fid) < 0) {
-            code = TSDB_CODE_OTHERS;
-            goto _error_merge;
-          }
-        }
-
-        if (blockIter.slot > blockIter.oslot) {  // write blocks in range [blockIter.oslot, blockIter.slot) to .t file
-          checksum = taosCalcChecksum(checksum, (uint8_t *)(importHandle.pBlocks + blockIter.oslot),
-                                      sizeof(SCompBlock) * (blockIter.slot - blockIter.oslot));
-          if (twrite(pVnode->nfd, (void *)(importHandle.pBlocks + blockIter.oslot),
-                     sizeof(SCompBlock) * (blockIter.slot - blockIter.oslot)) < 0) {
-            dError("vid:%d sid:%d meterId:%s, failed to write %s file, size:%ul, reason:%s", pVnode->vnode, pObj->sid,
-                   pObj->meterId, pVnode->nfn, sizeof(SCompBlock) * (blockIter.slot - blockIter.oslot),
-                   strerror(errno));
-            code = TSDB_CODE_OTHERS;
-            goto _error_merge;
-          }
-
-          blockIter.oslot = blockIter.slot;
-        }
-
-        if (blockIter.pos == 0) {  // No need to merge
-          // copy payload part to data
-          int rowOffset = 0;
-          for (; payloadIter < rows; rowOffset++) {
-            if (KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) >= blockIter.nextKey) break;
-
-            vnodeConvertRowsToCols(pObj, payload + pObj->bytesPerPoint * payloadIter, 1, data, rowOffset);
-            pointsImported++;
-            lastKeyImported = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-            payloadIter++;
-          }
-
-          // write directly to .data file
-          compBlock.last = 0;
-          if (vnodeWriteBlockToFile(pObj, &compBlock, data, cdata, rowOffset) < 0) {
-            // TODO: Deal with the ERROR here
-          }
-
-          checksum = taosCalcChecksum(checksum, (uint8_t *)(&compBlock), sizeof(SCompBlock));
-          if (twrite(pVnode->nfd, &compBlock, sizeof(SCompBlock)) < 0) {
-            // TODO : deal with the ERROR here
-          }
-          importHandle.newNumOfBlocks++;
-          importHandle.driftOffset += sizeof(SCompBlock);
-        } else {  // Merge block and payload from payloadIter
-
-          if (vnodeLoadNeededBlockData(pObj, &importHandle, blockIter.slot,
-                                       DATA_LOAD_TIMESTAMP | DATA_LOAD_OTHER_DATA, &code) < 0) {  // Load neccessary blocks
-            goto _error_merge;
-          }
-
-          importHandle.oldNumOfBlocks--;
-          importHandle.driftOffset -= sizeof(SCompBlock);
-
-          int rowOffset = blockIter.pos;  // counter for data
-
-          // Copy the front part
-          for (int col = 0; col < pObj->numOfColumns; col++) {
-            memcpy((void *)(data[col]->data), (void *)(importHandle.data[col]->data),
-                   pObj->schema[col].bytes * blockIter.pos);
-          }
-
-          // Merge part
-          while (1) {
-            if (rowOffset >= pVnode->cfg.rowsInFileBlock) {  // data full in a block to commit
-              compBlock.last = 0;
-              if (vnodeWriteBlockToFile(pObj, &compBlock, data, cdata, rowOffset) < 0) {
-                // TODO : deal with the ERROR here
-              }
-
-              checksum = taosCalcChecksum(checksum, (uint8_t *)(&compBlock), sizeof(SCompBlock));
-              if (twrite(pVnode->nfd, (void *)(&compBlock), sizeof(SCompBlock)) < 0) {
-                dError("vid:%d sid:%d meterId:%s, failed to write %s file, size:%ul, reason:%s", pVnode->vnode,
-                       pObj->sid, pObj->meterId, pVnode->nfn, sizeof(SCompBlock), strerror(errno));
-                goto _error_merge;
-              }
-              importHandle.newNumOfBlocks++;
-              importHandle.driftOffset += sizeof(SCompBlock);
-              rowOffset = 0;
-            }
-
-            if ((payloadIter >= rows || KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) >= blockIter.nextKey) &&
-                blockIter.pos >= importHandle.pBlocks[blockIter.slot].numOfPoints)
-              break;
-
-            if (payloadIter >= rows ||
-                KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) >= blockIter.nextKey) {  // payload end
-              for (int col = 0; col < pObj->numOfColumns; col++) {
-                memcpy(data[col]->data + rowOffset * pObj->schema[col].bytes,
-                       importHandle.data[col]->data + pObj->schema[col].bytes * blockIter.pos, pObj->schema[col].bytes);
-              }
-              blockIter.pos++;
-              rowOffset++;
-            } else if (blockIter.pos >= importHandle.pBlocks[blockIter.slot].numOfPoints) {  // block end
-              vnodeConvertRowsToCols(pObj, payload + pObj->bytesPerPoint * payloadIter, 1, data, rowOffset);
-              pointsImported++;
-              lastKeyImported = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-              payloadIter++;
-              rowOffset++;
-            } else {
-              if (KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) ==
-                  KEY_AT_INDEX(importHandle.data[PRIMARYKEY_TIMESTAMP_COL_INDEX]->data, sizeof(TSKEY),
-                               blockIter.pos)) {  // duplicate key
-                if (tsAffectedRowsMod) pointsImported++;
-                payloadIter++;
-                continue;
-              } else if (KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) <
-                         KEY_AT_INDEX(importHandle.data[PRIMARYKEY_TIMESTAMP_COL_INDEX]->data, sizeof(TSKEY),
-                                      blockIter.pos)) {
-                vnodeConvertRowsToCols(pObj, payload + pObj->bytesPerPoint * payloadIter, 1, data, rowOffset);
-                pointsImported++;
-                lastKeyImported = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-                payloadIter++;
-                rowOffset++;
-              } else {
-                for (int col = 0; col < pObj->numOfColumns; col++) {
-                  memcpy(data[col]->data + rowOffset * pObj->schema[col].bytes,
-                         importHandle.data[col]->data + pObj->schema[col].bytes * blockIter.pos,
-                         pObj->schema[col].bytes);
-                }
-                blockIter.pos++;
-                rowOffset++;
-              }
-            }
-          }
-          if (rowOffset > 0) {  // data full in a block to commit
-            compBlock.last = 0;
-            if (vnodeWriteBlockToFile(pObj, &compBlock, data, cdata, rowOffset) < 0) {
-              // TODO : deal with the ERROR here
-            }
-
-            checksum = taosCalcChecksum(checksum, (uint8_t *)(&compBlock), sizeof(SCompBlock));
-            if (twrite(pVnode->nfd, (void *)(&compBlock), sizeof(SCompBlock)) < 0) {
-              dError("vid:%d sid:%d meterId:%s, failed to write %s file, size:%ul, reason:%s", pVnode->vnode, pObj->sid,
-                     pObj->meterId, pVnode->nfn, sizeof(SCompBlock), strerror(errno));
-              goto _error_merge;
-            }
-            importHandle.newNumOfBlocks++;
-            importHandle.driftOffset += sizeof(SCompBlock);
-            rowOffset = 0;
-          }
-
-          blockIter.slot++;
-          blockIter.oslot = blockIter.slot;
-        }
-      }
-    }
-  }
-
-  // Write the SCompInfo part
-  if (vnodeCloseImportFiles(pObj, &importHandle) < 0) {
-    code = TSDB_CODE_OTHERS;
-    goto _error_merge;
-  }
-
-  pImport->importedRows += pointsImported;
-
-  pthread_mutex_lock(&(pPool->vmutex));
-  if (pInfo->numOfBlocks > 0) {
-    int   slot = (pInfo->currentSlot - pInfo->numOfBlocks + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-    TSKEY firstKeyInCache = *((TSKEY *)(pInfo->cacheBlocks[slot]->offset[0]));
-
-    // data may be in commited cache, cache shall be released
-    if (lastKeyImported > firstKeyInCache) {
-      while (slot != pInfo->commitSlot) {
-        SCacheBlock *pCacheBlock = pInfo->cacheBlocks[slot];
-        vnodeFreeCacheBlock(pCacheBlock);
-        slot = (slot + 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-      }
-
-      if (pInfo->commitPoint == pObj->pointsPerBlock) {
-        if (pInfo->cacheBlocks[pInfo->commitSlot]->pMeterObj == pObj) {
-          vnodeFreeCacheBlock(pInfo->cacheBlocks[pInfo->commitSlot]);
-        }
-      }
-    }
-  }
-  pthread_mutex_unlock(&(pPool->vmutex));
-
-  // TODO: free the allocated memory
-  tfree(buffer);
-  tfree(cbuffer);
-  tfree(importHandle.pHeader);
-  tfree(importHandle.pBlocks);
-  tfree(importHandle.pField);
-  tfree(importHandle.buffer);
-  tfree(importHandle.temp);
-  tfree(importHandle.tempBuffer);
-
-  return code;
-
-_error_merge:
-  tfree(buffer);
-  tfree(cbuffer);
-  tfree(importHandle.pHeader);
-  tfree(importHandle.pBlocks);
-  tfree(importHandle.pField);
-  tfree(importHandle.buffer);
-  tfree(importHandle.temp);
-  tfree(importHandle.tempBuffer);
-
-  close(pVnode->dfd);
-  pVnode->dfd = 0;
-
-  close(pVnode->hfd);
-  pVnode->hfd = 0;
-
-  close(pVnode->lfd);
-  pVnode->lfd = 0;
-
-  if (pVnode->nfd > 0) {
-    close(pVnode->nfd);
-    pVnode->nfd = 0;
-    remove(pVnode->nfn);
-  }
-
-  return code;
-}
-
-#define FORWARD_ITER(iter, step, slotLimit, posLimit) \
-  {                                                   \
-    if ((iter.pos) + (step) < (posLimit)) {           \
-      (iter.pos) = (iter.pos) + (step);               \
-    } else {                                          \
-      (iter.pos) = 0;                                 \
-      (iter.slot) = ((iter.slot) + 1) % (slotLimit);  \
-    }                                                 \
-  }
-
-int isCacheEnd(SBlockIter iter, SMeterObj *pMeter) {
-  SCacheInfo *pInfo = (SCacheInfo *)(pMeter->pCache);
-  int         slot = 0;
-  int         pos = 0;
-
-  if (pInfo->cacheBlocks[pInfo->currentSlot]->numOfPoints == pMeter->pointsPerBlock) {
-    slot = (pInfo->currentSlot + 1) % (pInfo->maxBlocks);
-    pos = 0;
-  } else {
-    slot = pInfo->currentSlot;
-    pos = pInfo->cacheBlocks[pInfo->currentSlot]->numOfPoints;
-  }
-  return ((iter.slot == slot) && (iter.pos == pos));
-}
-
-static void vnodeFlushMergeBuffer(SMergeBuffer *pBuffer, SBlockIter *pWriteIter, SBlockIter *pCacheIter,
-                                  SMeterObj *pObj, SCacheInfo *pInfo, int checkBound) {
-  // Function to flush the merge buffer data to cache
-  if (pWriteIter->pos == pObj->pointsPerBlock) {
-    pWriteIter->pos = 0;
-    pWriteIter->slot = (pWriteIter->slot + 1) % pInfo->maxBlocks;
-  }
-
-  while (pBuffer->spos != pBuffer->epos) {
-    if (checkBound && pWriteIter->slot == pCacheIter->slot && pWriteIter->pos == pCacheIter->pos) break;
-    for (int col = 0; col < pObj->numOfColumns; col++) {
-      memcpy(pInfo->cacheBlocks[pWriteIter->slot]->offset[col] + pObj->schema[col].bytes * pWriteIter->pos,
-             pBuffer->offset[col] + pObj->schema[col].bytes * pBuffer->spos, pObj->schema[col].bytes);
-    }
-
-    if (pWriteIter->pos + 1 < pObj->pointsPerBlock) {
-      (pWriteIter->pos)++;
-    } else {
-      pInfo->cacheBlocks[pWriteIter->slot]->numOfPoints = pWriteIter->pos + 1;
-      pWriteIter->slot = (pWriteIter->slot + 1) % pInfo->maxBlocks;
-      pWriteIter->pos = 0;
-    }
-
-    pBuffer->spos = (pBuffer->spos + 1) % pBuffer->totalRows;
-  }
-
-  if ((!checkBound) && pWriteIter->pos != 0) {
-    pInfo->cacheBlocks[pWriteIter->slot]->numOfPoints = pWriteIter->pos;
-  }
-}
-
-int vnodeImportDataToCache(SImportInfo *pImport, const char *payload, const int rows) {
-  SMeterObj *   pObj = pImport->pObj;
-  SVnodeObj *   pVnode = vnodeList + pObj->vnode;
-  int           code = -1;
-  SCacheInfo *  pInfo = (SCacheInfo *)(pObj->pCache);
-  int           payloadIter;
-  SCachePool *  pPool = (SCachePool *)(pVnode->pCachePool);
-  int           isCacheIterEnd = 0;
-  int           spayloadIter = 0;
-  int           isAppendData = 0;
-  int           rowsImported = 0;
-  int           totalRows = 0;
-  size_t        size = 0;
-  SMergeBuffer *pBuffer = NULL;
-
-  TSKEY firstKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0);
-  TSKEY lastKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, rows - 1);
-
-  assert(firstKey <= lastKey && firstKey > pObj->lastKeyOnFile);
-
-  // TODO: make this condition less strict
-  if (pObj->freePoints < rows || pObj->freePoints < (pObj->pointsPerBlock << 1)) {  // No free room to hold the data
-    dError("vid:%d sid:%d id:%s, import failed, cache is full, freePoints:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           pObj->freePoints);
-    pImport->importedRows = 0;
-    pImport->commit = 1;
-    code = TSDB_CODE_ACTION_IN_PROGRESS;
-    return code;
-  }
-
-  if (pInfo->numOfBlocks == 0) {
-    if (vnodeAllocateCacheBlock(pObj) < 0) {
-      pImport->importedRows = 0;
-      pImport->commit = 1;
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-      return code;
-    }
-  }
-
-  // Find the first importable record from payload
-  pImport->lastKey = lastKey;
-  for (payloadIter = 0; payloadIter < rows; payloadIter++) {
-    TSKEY key = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-    if (key == pObj->lastKey) {
-      if (tsAffectedRowsMod) rowsImported++;
-      continue;
-    }
-    if (key > pObj->lastKey) {  // Just as insert
-      pImport->slot = pInfo->currentSlot;
-      pImport->pos = pInfo->cacheBlocks[pImport->slot]->numOfPoints;
-      isCacheIterEnd = 1;
-      break;
-    } else {
-      pImport->firstKey = key;
-      if (vnodeFindKeyInCache(pImport, 1) < 0) {
-        goto _exit;
-      }
-
-      if (pImport->firstKey != pImport->key) break;
-      if (tsAffectedRowsMod) rowsImported++;
-    }
-  }
-
-  if (payloadIter == rows) {
-    pImport->importedRows += rowsImported;
-    code = 0;
-    goto _exit;
-  }
-
-  spayloadIter = payloadIter;
-  if (pImport->pos == pObj->pointsPerBlock) assert(isCacheIterEnd);
-
-  // Allocate a new merge buffer work as buffer
-  totalRows = pObj->pointsPerBlock + rows - payloadIter + 1;
-  size = sizeof(SMergeBuffer) + sizeof(char *) * pObj->numOfColumns + pObj->bytesPerPoint * totalRows;
-  pBuffer = (SMergeBuffer *)malloc(size);
-  if (pBuffer == NULL) {
-    dError("vid:%d sid:%d meterId:%s, failed to allocate memory, size:%d", pObj->vnode, pObj->sid, pObj->meterId, size);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-  pBuffer->spos = 0;
-  pBuffer->epos = 0;
-  pBuffer->totalRows = totalRows;
-  pBuffer->offset[0] = (char *)pBuffer + sizeof(SMergeBuffer) + sizeof(char *) * pObj->numOfColumns;
-  for (int col = 1; col < pObj->numOfColumns; col++) {
-    pBuffer->offset[col] = pBuffer->offset[col - 1] + pObj->schema[col - 1].bytes * totalRows;
-  }
-
-  // TODO: take pImport->pos = pObj->pointsPerBlock into consideration
-  {                                                              // Do the merge staff
-    SBlockIter cacheIter = {pImport->slot, pImport->pos, 0, 0};  // Iter to traverse old cache data
-    SBlockIter writeIter = {pImport->slot, pImport->pos, 0, 0};  // Iter to write data to cache
-    int        availPoints = pObj->pointsPerBlock - pInfo->cacheBlocks[pInfo->currentSlot]->numOfPoints;
-
-    assert(availPoints >= 0);
-
-    while (1) {
-      if ((payloadIter >= rows) && isCacheIterEnd) break;
-
-      if ((pBuffer->epos + 1) % pBuffer->totalRows == pBuffer->spos) {  // merge buffer is full, flush
-        vnodeFlushMergeBuffer(pBuffer, &writeIter, &cacheIter, pObj, pInfo, 1);
-      }
-
-      TSKEY payloadKey = (payloadIter < rows) ? KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) : INT64_MAX;
-      TSKEY cacheKey = (isCacheIterEnd) ? INT64_MAX : KEY_AT_INDEX(pInfo->cacheBlocks[cacheIter.slot]->offset[0], sizeof(TSKEY), cacheIter.pos);
-
-      if (cacheKey < payloadKey) {  // if (payload end || (cacheIter not end && payloadKey > blockKey)), consume cache
-        for (int col = 0; col < pObj->numOfColumns; col++) {
-          memcpy(pBuffer->offset[col] + pObj->schema[col].bytes * pBuffer->epos,
-                 pInfo->cacheBlocks[cacheIter.slot]->offset[col] + pObj->schema[col].bytes * cacheIter.pos,
-                 pObj->schema[col].bytes);
-        }
-        FORWARD_ITER(cacheIter, 1, pInfo->maxBlocks, pObj->pointsPerBlock);
-        isCacheIterEnd = isCacheEnd(cacheIter, pObj);
-      } else if (cacheKey > payloadKey) {  // cacheIter end || (payloadIter not end && payloadKey < blockKey), consume payload
-        if (availPoints == 0) {                      // Need to allocate a new cache block
-          pthread_mutex_lock(&(pPool->vmutex));
-          // TODO: Need to check if there are enough slots to hold a new one
-          SCacheBlock *pNewBlock = vnodeGetFreeCacheBlock(pVnode);
-          if (pNewBlock == NULL) {  // Failed to allocate a new cache block, need to commit and loop over the remaining cache records
-            pthread_mutex_unlock(&(pPool->vmutex));
-            payloadIter = rows;
-            code = TSDB_CODE_ACTION_IN_PROGRESS;
-            pImport->commit = 1;
-            continue;
-          }
-          
-          assert(pInfo->numOfBlocks <= pInfo->maxBlocks);
-          if (pInfo->numOfBlocks == pInfo->maxBlocks) {
-            vnodeFreeCacheBlock(pInfo->cacheBlocks[(pInfo->currentSlot + 1) % pInfo->maxBlocks]);
-          }
-
-          pNewBlock->pMeterObj = pObj;
-          pNewBlock->offset[0] = (char *)pNewBlock + sizeof(SCacheBlock) + sizeof(char *) * pObj->numOfColumns;
-          for (int col = 1; col < pObj->numOfColumns; col++)
-            pNewBlock->offset[col] = pNewBlock->offset[col - 1] + pObj->schema[col - 1].bytes * pObj->pointsPerBlock;
-
-          int newSlot = (writeIter.slot + 1) % pInfo->maxBlocks;
-          pInfo->blocks++;
-          int tblockId = pInfo->blocks;
-
-          if (writeIter.slot != pInfo->currentSlot) {
-            for (int tslot = pInfo->currentSlot; tslot != writeIter.slot;) {
-              int nextSlot = (tslot + 1) % pInfo->maxBlocks;
-              pInfo->cacheBlocks[nextSlot] = pInfo->cacheBlocks[tslot];
-              pInfo->cacheBlocks[nextSlot]->slot = nextSlot;
-              pInfo->cacheBlocks[nextSlot]->blockId = tblockId--;
-              tslot = (tslot - 1 + pInfo->maxBlocks) % pInfo->maxBlocks;
-            }
-          }
-
-          int index = pNewBlock->index;
-          if (cacheIter.slot == writeIter.slot) {
-            pNewBlock->numOfPoints = pInfo->cacheBlocks[cacheIter.slot]->numOfPoints;
-            int pointsLeft = pInfo->cacheBlocks[cacheIter.slot]->numOfPoints - cacheIter.pos;
-            if (pointsLeft > 0) {
-              for (int col = 0; col < pObj->numOfColumns; col++) {
-                memcpy((void *)(pNewBlock->offset[col] + pObj->schema[col].bytes*cacheIter.pos),
-                       pInfo->cacheBlocks[cacheIter.slot]->offset[col] + pObj->schema[col].bytes * cacheIter.pos,
-                       pObj->schema[col].bytes * pointsLeft);
-              }
-            }
-          }
-          pNewBlock->blockId = tblockId;
-          pNewBlock->slot = newSlot;
-          pNewBlock->index = index;
-          pInfo->cacheBlocks[newSlot] = pNewBlock;
-          pInfo->numOfBlocks++;
-          pInfo->unCommittedBlocks++;
-          pInfo->currentSlot = (pInfo->currentSlot + 1) % pInfo->maxBlocks;
-          pthread_mutex_unlock(&(pPool->vmutex));
-          cacheIter.slot = (cacheIter.slot + 1) % pInfo->maxBlocks;
-          // move a cache of data forward
-          availPoints = pObj->pointsPerBlock;
-        }
-
-        int offset = 0;
-        for (int col = 0; col < pObj->numOfColumns; col++) {
-          memcpy(pBuffer->offset[col] + pObj->schema[col].bytes * pBuffer->epos,
-                 payload + pObj->bytesPerPoint * payloadIter + offset, pObj->schema[col].bytes);
-          offset += pObj->schema[col].bytes;
-        }
-        if (spayloadIter == payloadIter) {// update pVnode->firstKey
-          pthread_mutex_lock(&(pVnode->vmutex));
-          if (KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter) < pVnode->firstKey) pVnode->firstKey = firstKey;
-          pthread_mutex_unlock(&(pVnode->vmutex));
-        }
-        if (isCacheIterEnd) {
-          pObj->lastKey = KEY_AT_INDEX(payload, pObj->bytesPerPoint, payloadIter);
-          if (!isAppendData) isAppendData = 1;
-        }
-
-        rowsImported++;
-        availPoints--;
-        payloadIter++;
-
-      } else {
-        if (tsAffectedRowsMod) rowsImported++;
-        payloadIter++;
-        continue;
-      }
-      pBuffer->epos = (pBuffer->epos + 1) % pBuffer->totalRows;
-    }
-
-    if (pBuffer->spos != pBuffer->epos) { // Flush the remaining data in the merge buffer
-      vnodeFlushMergeBuffer(pBuffer, &writeIter, &cacheIter, pObj, pInfo, 0);
-    } else {
-      // Should never come here
-      assert(false);
-    }
-
-    if (isAppendData) {
-      pthread_mutex_lock(&(pVnode->vmutex));
-      if (pObj->lastKey > pVnode->lastKey) pVnode->lastKey = pObj->lastKey;
-      pthread_mutex_unlock(&(pVnode->vmutex));
-    }
-  }
-  pImport->importedRows += rowsImported;
-  atomic_fetch_sub_32(&(pObj->freePoints), rowsImported);
-
-  code = TSDB_CODE_SUCCESS;
-
-_exit:
-  tfree(pBuffer);
-  return code;
-}
-
-int vnodeImportDataToFiles(SImportInfo *pImport, char *payload, const int rows) {
-  int code = 0;
-  // TODO : Check the correctness of pObj and pVnode
-  SMeterObj *pObj = (SMeterObj *)(pImport->pObj);
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-
-  int64_t delta = pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  int     sfid = KEY_AT_INDEX(payload, pObj->bytesPerPoint, 0) / delta;
-  int     efid = KEY_AT_INDEX(payload, pObj->bytesPerPoint, rows - 1) / delta;
-
-  for (int fid = sfid; fid <= efid; fid++) {
-    TSKEY skey = fid * delta;
-    TSKEY ekey = skey + delta - 1;
-    int   srow = 0, nrows = 0;
-
-    if (vnodeSearchKeyInRange(payload, pObj->bytesPerPoint, rows, skey, ekey, &srow, &nrows) < 0) continue;
-
-    assert(nrows > 0);
-
-    dTrace("vid:%d sid:%d meterId:%s, %d rows of data will be imported to file %d, srow:%d firstKey:%" PRId64 " lastKey:%" PRId64,
-           pObj->vnode, pObj->sid, pObj->meterId, nrows, fid, srow, KEY_AT_INDEX(payload, pObj->bytesPerPoint, srow),
-           KEY_AT_INDEX(payload, pObj->bytesPerPoint, (srow + nrows - 1)));
-
-    code = vnodeMergeDataIntoFile(pImport, payload + (srow * pObj->bytesPerPoint), nrows, fid);
-    if (code != TSDB_CODE_SUCCESS) break;
-  }
-
-  return code;
-}
-
-// TODO : add offset in pShell to make it avoid repeatedly deal with messages
-int vnodeImportData(SMeterObj *pObj, SImportInfo *pImport) {
-  int         code = 0;
-  int         srow = 0, nrows = 0;
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-  SCachePool *pPool = (SCachePool *)(pVnode->pCachePool);
-
-  // 1. import data in range (pObj->lastKeyOnFile, INT64_MAX) into cache
-  if (vnodeSearchKeyInRange(pImport->payload, pObj->bytesPerPoint, pImport->rows, pObj->lastKeyOnFile + 1, INT64_MAX,
-                            &srow, &nrows) >= 0) {
-    assert(nrows > 0);
-    code = vnodeImportDataToCache(pImport, pImport->payload + pObj->bytesPerPoint * srow, nrows);
-    if (pImport->commit) {  // Need to commit now
-      pPool->commitInProcess = 0;
-      vnodeProcessCommitTimer(pVnode, NULL);
-      return code;
-    }
-
-    if (code != TSDB_CODE_SUCCESS) return code;
-  }
-
-  // 2. import data (0, pObj->lastKeyOnFile) into files
-  if (vnodeSearchKeyInRange(pImport->payload, pObj->bytesPerPoint, pImport->rows, 0, pObj->lastKeyOnFile - 1, &srow,
-                            &nrows) >= 0) {
-    assert(nrows > 0);
-    code = vnodeImportDataToFiles(pImport, pImport->payload + pObj->bytesPerPoint * srow, nrows);
-  }
-
-  pPool->commitInProcess = 0;
-
-  return code;
-}
diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c
deleted file mode 100644
index 79610a73ad1b368def881f3f80979cb790f76bfe..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeMeter.c
+++ /dev/null
@@ -1,826 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "trpc.h"
-#include "tschemautil.h"
-#include "ttime.h"
-#include "tutil.h"
-#include "vnode.h"
-#include "vnodeMgmt.h"
-#include "vnodeShell.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-#define VALID_TIMESTAMP(key, curKey, prec) (((key) >= 0) && ((key) <= ((curKey) + 36500 * tsMsPerDay[prec])))
-
-int  tsMeterSizeOnFile;
-void vnodeUpdateMeter(void *param, void *tmdId);
-void vnodeRecoverMeterObjectFile(int vnode);
-
-int (*vnodeProcessAction[])(SMeterObj *, char *, int, char, void *, int, int *, TSKEY) = {vnodeInsertPoints,
-                                                                                   vnodeImportPoints};
-
-void vnodeFreeMeterObj(SMeterObj *pObj) {
-  if (pObj == NULL) return;
-
-  dTrace("vid:%d sid:%d id:%s, meter is cleaned up", pObj->vnode, pObj->sid, pObj->meterId);
-
-  vnodeFreeCacheInfo(pObj);
-  if (vnodeList[pObj->vnode].meterList != NULL) {
-    vnodeList[pObj->vnode].meterList[pObj->sid] = NULL;
-  }
-
-  memset(pObj->meterId, 0, tListLen(pObj->meterId));
-  tfree(pObj);
-}
-
-int vnodeUpdateVnodeStatistic(FILE *fp, SVnodeObj *pVnode) {
-  fseek(fp, TSDB_FILE_HEADER_VERSION_SIZE, SEEK_SET);
-  fwrite(&(pVnode->vnodeStatistic), sizeof(SVnodeStatisticInfo), 1, fp);
-
-  return 0;
-}
-
-void vnodeUpdateVnodeFileHeader(FILE *fp, SVnodeObj *pVnode) {
-  fseek(fp, TSDB_FILE_HEADER_LEN * 1 / 4, SEEK_SET);
-
-#ifdef _TD_ARM_32_
-  fprintf(fp, "%lld %lld %lld ", pVnode->lastCreate, pVnode->lastRemove, pVnode->version);
-  fprintf(fp, "%lld %d %d ", pVnode->lastKeyOnFile, pVnode->fileId, pVnode->numOfFiles);
-#else
-  fprintf(fp, "%ld %ld %ld ", pVnode->lastCreate, pVnode->lastRemove, pVnode->version);
-  fprintf(fp, "%ld %d %d ", pVnode->lastKeyOnFile, pVnode->fileId, pVnode->numOfFiles);
-#endif  
-}
-
-int vnodeCreateMeterObjFile(int vnode) {
-  FILE *  fp;
-  char    fileName[TSDB_FILENAME_LEN];
-  int32_t size;
-  // SMeterObj *pObj;
-
-  sprintf(fileName, "%s/vnode%d/meterObj.v%d", tsDirectory, vnode, vnode);
-  fp = fopen(fileName, "w+");
-  if (fp == NULL) {
-    dError("failed to create vnode:%d file:%s, errno:%d, reason:%s", vnode, fileName, errno, strerror(errno));
-    if (errno == EACCES) {
-      return TSDB_CODE_NO_DISK_PERMISSIONS;
-    } else if (errno == ENOSPC) {
-      return TSDB_CODE_SERV_NO_DISKSPACE;
-    } else {
-      return TSDB_CODE_VG_INIT_FAILED;
-    }
-  } else {
-    vnodeCreateFileHeader(fp);
-    vnodeUpdateVnodeFileHeader(fp, vnodeList + vnode);
-    fseek(fp, TSDB_FILE_HEADER_LEN, SEEK_SET);
-
-    size = sizeof(SMeterObjHeader) * vnodeList[vnode].cfg.maxSessions + sizeof(TSCKSUM);
-    tfree(vnodeList[vnode].meterIndex);
-    vnodeList[vnode].meterIndex = calloc(1, size);
-    taosCalcChecksumAppend(0, (uint8_t *)(vnodeList[vnode].meterIndex), size);
-    fwrite(vnodeList[vnode].meterIndex, size, 1, fp);
-
-    fclose(fp);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-FILE *vnodeOpenMeterObjFile(int vnode) {
-  FILE *      fp;
-  char        fileName[TSDB_FILENAME_LEN];
-  struct stat fstat;
-
-  // check if directory exists
-  sprintf(fileName, "%s/vnode%d", tsDirectory, vnode);
-  if (stat(fileName, &fstat) < 0) return NULL;
-
-  sprintf(fileName, "%s/vnode%d/meterObj.v%d", tsDirectory, vnode, vnode);
-  if (stat(fileName, &fstat) < 0) return NULL;
-
-  fp = fopen(fileName, "r+");
-  if (fp != NULL) {
-    if (vnodeCheckFileIntegrity(fp) < 0) {
-      dError("file:%s is corrupted, need to restore it first, exit program", fileName);
-      fclose(fp);
-
-      // todo: how to recover
-      exit(1);
-    }
-  } else {
-    dError("failed to open %s, reason:%s", fileName, strerror(errno));
-  }
-
-  return fp;
-}
-
-int vnodeSaveMeterObjToFile(SMeterObj *pObj) {
-  int64_t    offset, length, new_length, new_offset;
-  FILE *     fp;
-  SVnodeObj *pVnode = &vnodeList[pObj->vnode];
-  char *     buffer = NULL;
-
-  fp = vnodeOpenMeterObjFile(pObj->vnode);
-  if (fp == NULL) return -1;
-
-  buffer = (char *)malloc(tsMeterSizeOnFile);
-  if (buffer == NULL) {
-    dError("Failed to allocate memory while saving meter object to file, meterId", pObj->meterId);
-    fclose(fp);
-    return -1;
-  }
-
-  offset = pVnode->meterIndex[pObj->sid].offset;
-  length = pVnode->meterIndex[pObj->sid].length;
-
-  new_length = offsetof(SMeterObj, reserved) + pObj->numOfColumns * sizeof(SColumn) + pObj->sqlLen + sizeof(TSCKSUM);
-
-  memcpy(buffer, pObj, offsetof(SMeterObj, reserved));
-  memcpy(buffer + offsetof(SMeterObj, reserved), pObj->schema, pObj->numOfColumns * sizeof(SColumn));
-  memcpy(buffer + offsetof(SMeterObj, reserved) + pObj->numOfColumns * sizeof(SColumn), pObj->pSql, pObj->sqlLen);
-  taosCalcChecksumAppend(0, (uint8_t *)buffer, new_length);
-
-  if (offset == 0 || length < new_length) {  // New, append to file end
-    fseek(fp, 0, SEEK_END);
-    new_offset = ftell(fp);
-    fwrite(buffer, new_length, 1, fp);
-    pVnode->meterIndex[pObj->sid].offset = new_offset;
-    pVnode->meterIndex[pObj->sid].length = new_length;
-  } else if (offset < 0) {  // deleted meter, append to end of file
-    fseek(fp, -offset, SEEK_SET);
-    fwrite(buffer, new_length, 1, fp);
-    pVnode->meterIndex[pObj->sid].offset = -offset;
-    pVnode->meterIndex[pObj->sid].length = new_length;
-  } else {  // meter exists, overwrite it, offset > 0
-    fseek(fp, offset, SEEK_SET);
-    fwrite(buffer, new_length, 1, fp);
-    pVnode->meterIndex[pObj->sid].offset = (pObj->meterId[0] == 0) ? -offset : offset;
-    pVnode->meterIndex[pObj->sid].length = new_length;
-  }
-  // taosCalcChecksumAppend(0, pVnode->meterIndex, sizeof(SMeterObjHeader)*pVnode->cfg.maxSessions+sizeof(TSCKSUM));
-  // NOTE: no checksum, since it makes creating table slow
-  fseek(fp, TSDB_FILE_HEADER_LEN + sizeof(SMeterObjHeader) * pObj->sid, SEEK_SET);
-  fwrite(&(pVnode->meterIndex[pObj->sid]), sizeof(SMeterObjHeader), 1, fp);
-  // update checksum
-  // fseek(fp, TSDB_FILE_HEADER_LEN+sizeof(SMeterObjHeader)*(pVnode->cfg.maxSessions), SEEK_SET);
-  // fwrite(((char *)(pVnode->meterIndex) + sizeof(SMeterObjHeader)*(pVnode->cfg.maxSessions)), sizeof(TSCKSUM), 1, fp);
-
-  tfree(buffer);
-
-  vnodeUpdateVnodeStatistic(fp, pVnode);
-  vnodeUpdateVnodeFileHeader(fp, pVnode);
-  /* vnodeUpdateFileCheckSum(fp); */
-  fclose(fp);
-
-  return 0;
-}
-
-int vnodeSaveAllMeterObjToFile(int vnode) {
-  int64_t    offset, length, new_length, new_offset;
-  FILE *     fp;
-  SMeterObj *pObj;
-  SVnodeObj *pVnode = &vnodeList[vnode];
-  char *     buffer = NULL;
-
-  fp = vnodeOpenMeterObjFile(vnode);
-  if (fp == NULL) return -1;
-
-  buffer = (char *)malloc(tsMeterSizeOnFile);
-  if (buffer == NULL) {
-    dError("Failed to allocate memory while saving all meter objects to file");
-    return -1;
-  }
-
-  for (int sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-    pObj = pVnode->meterList[sid];
-    if (pObj == NULL) continue;
-
-    offset = pVnode->meterIndex[sid].offset;
-    length = pVnode->meterIndex[sid].length;
-
-    new_length = offsetof(SMeterObj, reserved) + pObj->numOfColumns * sizeof(SColumn) + pObj->sqlLen + sizeof(TSCKSUM);
-
-    memcpy(buffer, pObj, offsetof(SMeterObj, reserved));
-    memcpy(buffer + offsetof(SMeterObj, reserved), pObj->schema, pObj->numOfColumns * sizeof(SColumn));
-    memcpy(buffer + offsetof(SMeterObj, reserved) + pObj->numOfColumns * sizeof(SColumn), pObj->pSql, pObj->sqlLen);
-    taosCalcChecksumAppend(0, (uint8_t *)buffer, new_length);
-
-    if (offset == 0 || length > new_length) {  // New, append to file end
-      new_offset = fseek(fp, 0, SEEK_END);
-      fwrite(buffer, new_length, 1, fp);
-      pVnode->meterIndex[sid].offset = new_offset;
-      pVnode->meterIndex[sid].length = new_length;
-    } else if (offset < 0) {  // deleted meter, append to end of file
-      fseek(fp, -offset, SEEK_SET);
-      fwrite(buffer, new_length, 1, fp);
-      pVnode->meterIndex[sid].offset = -offset;
-      pVnode->meterIndex[sid].length = new_length;
-    } else {  // meter exists, overwrite it, offset > 0
-      fseek(fp, offset, SEEK_SET);
-      fwrite(buffer, new_length, 1, fp);
-      pVnode->meterIndex[sid].offset = offset;
-      pVnode->meterIndex[sid].length = new_length;
-    }
-  }
-  // taosCalcChecksumAppend(0, pVnode->meterIndex, sizeof(SMeterObjHeader)*pVnode->cfg.maxSessions+sizeof(TSCKSUM));
-  fseek(fp, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  fwrite(pVnode->meterIndex, sizeof(SMeterObjHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM), 1, fp);
-
-  tfree(buffer);
-
-  vnodeUpdateVnodeStatistic(fp, pVnode);
-  vnodeUpdateVnodeFileHeader(fp, pVnode);
-  /* vnodeUpdateFileCheckSum(fp); */
-  fclose(fp);
-
-  return 0;
-}
-
-int vnodeSaveVnodeCfg(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc) {
-  FILE *fp;
-
-  fp = vnodeOpenMeterObjFile(vnode);
-  if (fp == NULL) {
-    dError("failed to open vnode:%d file", vnode);
-    return -1;
-  }
-
-  fseek(fp, TSDB_FILE_HEADER_LEN * 2 / 4, SEEK_SET);
-  fwrite(pCfg, sizeof(SVnodeCfg), 1, fp);
-
-  char temp[TSDB_FILE_HEADER_LEN / 4];
-  memset(temp, 0, sizeof(temp));
-  fseek(fp, TSDB_FILE_HEADER_LEN * 3 / 4, SEEK_SET);
-  fwrite(temp, sizeof(temp), 1, fp);
-
-  if (pCfg->replications >= 1) {
-    fseek(fp, TSDB_FILE_HEADER_LEN * 3 / 4, SEEK_SET);
-    fwrite(pDesc, sizeof(SVPeerDesc), pCfg->replications, fp);
-  }
-
-  /* vnodeUpdateFileCheckSum(fp); */
-  fclose(fp);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int vnodeSaveVnodeInfo(int vnode) {
-  FILE *     fp;
-  SVnodeObj *pVnode = &vnodeList[vnode];
-
-  fp = vnodeOpenMeterObjFile(vnode);
-  if (fp == NULL) return -1;
-
-  vnodeUpdateVnodeFileHeader(fp, pVnode);
-  /* vnodeUpdateFileCheckSum(fp); */
-  fclose(fp);
-
-  return 0;
-}
-
-int vnodeRestoreMeterObj(char *buffer, int64_t length) {
-  SMeterObj *pSavedObj, *pObj;
-  int        size;
-
-  pSavedObj = (SMeterObj *)buffer;
-  if (pSavedObj->vnode < 0 || pSavedObj->vnode >= TSDB_MAX_VNODES) {
-    dTrace("vid:%d is out of range, corrupted meter obj file", pSavedObj->vnode);
-    return -1;
-  }
-
-  SVnodeCfg *pCfg = &vnodeList[pSavedObj->vnode].cfg;
-  if (pSavedObj->sid < 0 || pSavedObj->sid >= pCfg->maxSessions) {
-    dTrace("vid:%d, sid:%d is larger than max:%d", pSavedObj->vnode, pSavedObj->sid, pCfg->maxSessions);
-    return -1;
-  }
-
-  if (pSavedObj->meterId[0] == 0) return TSDB_CODE_SUCCESS;
-
-  size = sizeof(SMeterObj) + pSavedObj->sqlLen + 1;
-  pObj = (SMeterObj *)malloc(size);
-  if (pObj == NULL) {
-    dError("vid:%d sid:%d, no memory to allocate", pSavedObj->vnode, pSavedObj->sid);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-  
-  pObj->schema = (SColumn *)malloc(pSavedObj->numOfColumns * sizeof(SColumn));
-  if (NULL == pObj->schema){
-    dError("vid:%d sid:%d, no memory to allocate for schema", pSavedObj->vnode, pSavedObj->sid);
-    free(pObj);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  memcpy(pObj, pSavedObj, offsetof(SMeterObj, reserved));
-  pObj->numOfQueries = 0;
-  pObj->pCache = vnodeAllocateCacheInfo(pObj);
-  if (NULL == pObj->pCache){
-    dError("vid:%d sid:%d, no memory to allocate for cache", pSavedObj->vnode, pSavedObj->sid);
-    tfree(pObj->schema);
-    tfree(pObj);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-  
-  vnodeList[pSavedObj->vnode].meterList[pSavedObj->sid] = pObj;
-  pObj->pStream = NULL;
-  
-  memcpy(pObj->schema, buffer + offsetof(SMeterObj, reserved), pSavedObj->numOfColumns * sizeof(SColumn));
-  pObj->state = TSDB_METER_STATE_READY;
-
-  if (pObj->sqlLen > 0)
-    memcpy((char *)pObj + sizeof(SMeterObj),
-           ((char *)pSavedObj) + offsetof(SMeterObj, reserved) + sizeof(SColumn) * pSavedObj->numOfColumns,
-           pSavedObj->sqlLen);
-  pObj->pSql = (char *)pObj + sizeof(SMeterObj);
-
-  pObj->lastKey = pObj->lastKeyOnFile;
-  if (pObj->lastKey > vnodeList[pObj->vnode].lastKey) vnodeList[pObj->vnode].lastKey = pObj->lastKey;
-
-  //  taosSetSecurityInfo(pObj->vnode, pObj->sid, pObj->meterId, pObj->spi, pObj->encrypt, pObj->secret, pObj->cipheringKey);
-
-  dTrace("vid:%d sid:%d id:%s, meter is restored, uid:%" PRIu64 "", pObj->vnode, pObj->sid, pObj->meterId, pObj->uid);
-  return TSDB_CODE_SUCCESS;
-}
-
-int vnodeOpenMetersVnode(int vnode) {
-  FILE *     fp;
-  char *     buffer;
-  int64_t    sid;
-  int64_t    offset, length;
-  SVnodeObj *pVnode = &vnodeList[vnode];
-
-  fp = vnodeOpenMeterObjFile(vnode);
-  if (fp == NULL) return 0;
-
-  fseek(fp, TSDB_FILE_HEADER_VERSION_SIZE, SEEK_SET);
-  fread(&(pVnode->vnodeStatistic), sizeof(SVnodeStatisticInfo), 1, fp);
-
-  fseek(fp, TSDB_FILE_HEADER_LEN * 1 / 4, SEEK_SET);
-#ifdef _TD_ARM_32_
-  fscanf(fp, "%lld %lld %lld ", &(pVnode->lastCreate), &(pVnode->lastRemove), &(pVnode->version));
-  fscanf(fp, "%lld %d %d ", &(pVnode->lastKeyOnFile), &(pVnode->fileId), &(pVnode->numOfFiles));
-#else
-  fscanf(fp, "%ld %ld %ld ", &(pVnode->lastCreate), &(pVnode->lastRemove), &(pVnode->version));
-  fscanf(fp, "%ld %d %d ", &(pVnode->lastKeyOnFile), &(pVnode->fileId), &(pVnode->numOfFiles));
-#endif
-
-  fseek(fp, TSDB_FILE_HEADER_LEN * 2 / 4, SEEK_SET);
-  fread(&pVnode->cfg, sizeof(SVnodeCfg), 1, fp);
-
-  if (vnodeIsValidVnodeCfg(&pVnode->cfg) == false) {
-    dError("vid:%d, maxSessions:%d cacheBlockSize:%d replications:%d daysPerFile:%d daysToKeep:%d invalid, clear it",
-            vnode, pVnode->cfg.maxSessions, pVnode->cfg.cacheBlockSize, pVnode->cfg.replications,
-            pVnode->cfg.daysPerFile, pVnode->cfg.daysToKeep);
-    pVnode->cfg.maxSessions = 0;  // error in vnode file
-    return 0;
-  }
-
-  fseek(fp, TSDB_FILE_HEADER_LEN * 3 / 4, SEEK_SET);
-  fread(&pVnode->vpeers, sizeof(SVPeerDesc), TSDB_VNODES_SUPPORT, fp);
-
-  fseek(fp, TSDB_FILE_HEADER_LEN, SEEK_SET);
-
-  tsMeterSizeOnFile = sizeof(SMeterObj) + TSDB_MAX_COLUMNS * sizeof(SColumn) + TSDB_MAX_SAVED_SQL_LEN + sizeof(TSCKSUM);
-
-  int size = sizeof(SMeterObj *) * pVnode->cfg.maxSessions;
-  pVnode->meterList = (void *)malloc(size);
-  if (pVnode->meterList == NULL) return -1;
-  memset(pVnode->meterList, 0, size);
-  size = sizeof(SMeterObjHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM);
-  pVnode->meterIndex = (SMeterObjHeader *)calloc(1, size);
-  if (pVnode->meterIndex == NULL) {
-    tfree(pVnode->meterList);
-    return -1;
-  }
-
-  // Read SMeterObjHeader list from file
-  if (fread(pVnode->meterIndex, size, 1, fp) < 0) return -1;
-  // if (!taosCheckChecksumWhole(pVnode->meterIndex, size)) {
-  //   dError("vid: %d meter obj file header is broken since checksum mismatch", vnode);
-  //   return -1;
-  // }
-
-  // Read the meter object from file and recover the structure
-  buffer = malloc(tsMeterSizeOnFile);
-  memset(buffer, 0, tsMeterSizeOnFile);
-  for (sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-    offset = pVnode->meterIndex[sid].offset;
-    length = pVnode->meterIndex[sid].length;
-    if (offset <= 0 || length <= 0) continue;
-
-    fseek(fp, offset, SEEK_SET);
-    if (fread(buffer, length, 1, fp) <= 0) break;
-    if (taosCheckChecksumWhole((uint8_t *)buffer, length)) {
-      vnodeRestoreMeterObj(buffer, length - sizeof(TSCKSUM));
-    } else {
-      dError("meter object file is broken since checksum mismatch, vnode: %d sid: %d, try to recover", vnode, sid);
-      continue;
-      /* vnodeRecoverMeterObjectFile(vnode); */
-    }
-  }
-
-  tfree(buffer);
-  fclose(fp);
-
-  return 0;
-}
-
-void vnodeCloseMetersVnode(int vnode) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  SMeterObj *pObj;
-
-  if (pVnode->meterList) {
-    for (int sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-      pObj = pVnode->meterList[sid];
-      if (pObj == NULL) continue;
-      vnodeFreeCacheInfo(pObj);
-      tfree(pObj->schema);
-      tfree(pObj);
-    }
-
-    tfree(pVnode->meterList);
-  }
-
-  pVnode->meterList = NULL;
-}
-
-int vnodeCreateMeterObj(SMeterObj *pNew, SConnSec *pSec) {
-  SMeterObj *pObj;
-  int        code;
-
-  pObj = vnodeList[pNew->vnode].meterList[pNew->sid];
-  code = TSDB_CODE_SUCCESS;
-
-  if (pObj && pObj->uid == pNew->uid) {
-    if (pObj->sversion == pNew->sversion) {
-      dTrace("vid:%d sid:%d id:%s sversion:%d, identical meterObj, ignore create", pNew->vnode, pNew->sid,
-             pNew->meterId, pNew->sversion);
-      return -1;
-    }
-
-    dTrace("vid:%d sid:%d id:%s, update schema", pNew->vnode, pNew->sid, pNew->meterId);
-    if (!vnodeIsMeterState(pObj, TSDB_METER_STATE_UPDATING)) vnodeUpdateMeter(pNew, NULL);
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (pObj) {
-    dWarn("vid:%d sid:%d id:%s, old meter is there, remove it", pNew->vnode, pNew->sid, pNew->meterId);
-    vnodeRemoveMeterObj(pNew->vnode, pNew->sid);
-  }
-
-  pNew->pCache = vnodeAllocateCacheInfo(pNew);
-  if (pNew->pCache == NULL) {
-    code = TSDB_CODE_NO_RESOURCE;
-  } else {
-    vnodeList[pNew->vnode].meterList[pNew->sid] = pNew;
-    pNew->state = TSDB_METER_STATE_READY;
-    if (pNew->timeStamp > vnodeList[pNew->vnode].lastCreate) vnodeList[pNew->vnode].lastCreate = pNew->timeStamp;
-    vnodeSaveMeterObjToFile(pNew);
-    // vnodeCreateMeterMgmt(pNew, pSec);
-    vnodeCreateStream(pNew);
-    dTrace("vid:%d, sid:%d id:%s, meterObj is created, uid:%" PRIu64 "", pNew->vnode, pNew->sid, pNew->meterId, pNew->uid);
-  }
-
-  return code;
-}
-
-int vnodeRemoveMeterObj(int vnode, int sid) {
-  SMeterObj *pObj;
-
-  if (vnode < 0 || vnode >= TSDB_MAX_VNODES) {
-    dError("vid:%d is out of range", vnode);
-    return 0;
-  }
-
-  SVnodeCfg *pCfg = &vnodeList[vnode].cfg;
-  if (sid < 0 || sid >= pCfg->maxSessions) {
-    dError("vid:%d, sid:%d is larger than max:%d or less than 0", vnode, sid, pCfg->maxSessions);
-    return 0;
-  }
-
-  // vnode has been closed, no meters in this vnode
-  if (vnodeList[vnode].meterList == NULL) return 0;
-
-  pObj = vnodeList[vnode].meterList[sid];
-  if (pObj == NULL) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (!vnodeIsSafeToDeleteMeter(&vnodeList[vnode], sid)) {
-    return TSDB_CODE_ACTION_IN_PROGRESS;
-  }
-
-  // after remove this meter, change its state to DELETED
-  pObj->state = TSDB_METER_STATE_DROPPED;
-  pObj->timeStamp = taosGetTimestampMs();
-  vnodeList[vnode].lastRemove = pObj->timeStamp;
-
-  vnodeRemoveStream(pObj);
-  vnodeSaveMeterObjToFile(pObj);
-  vnodeFreeMeterObj(pObj);
-
-  return 0;
-}
-
-int vnodeInsertPoints(SMeterObj *pObj, char *cont, int contLen, char source, void *param, int sversion,
-                      int *numOfInsertPoints, TSKEY now) {
-  int         expectedLen, i;
-  short       numOfPoints;
-  SSubmitMsg *pSubmit = (SSubmitMsg *)cont;
-  char *      pData;
-  TSKEY       tsKey;
-  int         points = 0;
-  int         code = TSDB_CODE_SUCCESS;
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-
-  numOfPoints = htons(pSubmit->numOfRows);
-  expectedLen = numOfPoints * pObj->bytesPerPoint + sizeof(pSubmit->numOfRows);
-  if (expectedLen != contLen) {
-    dError("vid:%d sid:%d id:%s, invalid submit msg length:%d, expected:%d, bytesPerPoint: %d",
-           pObj->vnode, pObj->sid, pObj->meterId, contLen, expectedLen, pObj->bytesPerPoint);
-    code = TSDB_CODE_WRONG_MSG_SIZE;
-    goto _over;
-  }
-
-  // to guarantee time stamp is the same for all vnodes
-  pData = pSubmit->payLoad;
-  tsKey = now;
-  if (*((TSKEY *)pData) == 0) {
-    for (i = 0; i < numOfPoints; ++i) {
-      *((TSKEY *)pData) = tsKey++;
-      pData += pObj->bytesPerPoint;
-    }
-  }
-
-  if (numOfPoints >= (pVnode->cfg.blocksPerMeter - 2) * pObj->pointsPerBlock) {
-    code = TSDB_CODE_BATCH_SIZE_TOO_BIG;
-    dError("vid:%d sid:%d id:%s, batch size too big, insert points:%d, it shall be smaller than:%d", pObj->vnode, pObj->sid,
-           pObj->meterId, numOfPoints, (pVnode->cfg.blocksPerMeter - 2) * pObj->pointsPerBlock);
-    return code;
-  }
-
-  /*
-   * please refer to TBASE-926, data may be lost when the cache is full
-   */
-  if (source == TSDB_DATA_SOURCE_SHELL && pVnode->cfg.replications > 1) {
-    code = vnodeForwardToPeer(pObj, cont, contLen, TSDB_ACTION_INSERT, sversion);
-    if (code != TSDB_CODE_SUCCESS) return code;
-  }
-
-  SCachePool *pPool = (SCachePool *)pVnode->pCachePool;
-  if (pObj->freePoints < numOfPoints || pObj->freePoints < (pObj->pointsPerBlock << 1) ||
-      pPool->notFreeSlots > pVnode->cfg.cacheNumOfBlocks.totalBlocks - 2) {
-    code = TSDB_CODE_ACTION_IN_PROGRESS;
-    dTrace("vid:%d sid:%d id:%s, cache is full, freePoints:%d, notFreeSlots:%d", pObj->vnode, pObj->sid, pObj->meterId,
-           pObj->freePoints, pPool->notFreeSlots);
-    vnodeProcessCommitTimer(pVnode, NULL);
-    return code;
-  }
-
-  // FIXME: Here should be after the comparison of sversions.
-  if (pVnode->cfg.commitLog && source != TSDB_DATA_SOURCE_LOG) {
-    if (pVnode->logFd < 0) return TSDB_CODE_INVALID_COMMIT_LOG;
-    code = vnodeWriteToCommitLog(pObj, TSDB_ACTION_INSERT, cont, contLen, sversion);
-    if (code != TSDB_CODE_SUCCESS) return code;
-  }
-
-  if (pObj->sversion < sversion) {
-    dTrace("vid:%d sid:%d id:%s, schema is changed, new:%d old:%d", pObj->vnode, pObj->sid, pObj->meterId, sversion,
-           pObj->sversion);
-    vnodeSendMeterCfgMsg(pObj->vnode, pObj->sid);
-    code = TSDB_CODE_ACTION_IN_PROGRESS;
-    return code;
-  } else if (pObj->sversion > sversion) {
-    dTrace("vid:%d sid:%d id:%s, client schema out of date, sql is invalid. client sversion:%d vnode sversion:%d",
-        pObj->vnode, pObj->sid, pObj->meterId, pObj->sversion, sversion);
-    code = TSDB_CODE_INVALID_SQL;
-    return code;
-  }
-
-  pData = pSubmit->payLoad;
-
-  TSKEY firstKey = *((TSKEY *)pData);
-  TSKEY lastKey = *((TSKEY *)(pData + pObj->bytesPerPoint * (numOfPoints - 1)));
-  int cfid = now/pVnode->cfg.daysPerFile/tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  
-  TSKEY minAllowedKey = (cfid - pVnode->maxFiles + 1)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  TSKEY maxAllowedKey = (cfid + 2)*pVnode->cfg.daysPerFile*tsMsPerDay[(uint8_t)pVnode->cfg.precision] - 2;
-  if (firstKey < minAllowedKey || firstKey > maxAllowedKey || lastKey < minAllowedKey || lastKey > maxAllowedKey) {
-    dError("vid:%d sid:%d id:%s, vnode lastKeyOnFile:%" PRId64 ", data is out of range, numOfPoints:%d firstKey:%" PRId64 " lastKey:%" PRId64 " minAllowedKey:%" PRId64 " maxAllowedKey:%" PRId64,
-            pObj->vnode, pObj->sid, pObj->meterId, pVnode->lastKeyOnFile, numOfPoints,firstKey, lastKey, minAllowedKey, maxAllowedKey);
-    return TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
-  }
-  
-  if ((code = vnodeSetMeterInsertImportStateEx(pObj, TSDB_METER_STATE_INSERTING)) != TSDB_CODE_SUCCESS) {
-    goto _over;
-  }
-  
-  for (i = 0; i < numOfPoints; ++i) { // meter will be dropped, abort current insertion
-    if (vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) {
-      dWarn("vid:%d sid:%d id:%s, meter is dropped, abort insert, state:%d", pObj->vnode, pObj->sid, pObj->meterId,
-            pObj->state);
-
-      code = TSDB_CODE_NOT_ACTIVE_TABLE;
-      break;
-    }
-
-    if (*((TSKEY *)pData) <= pObj->lastKey) {
-      dWarn("vid:%d sid:%d id:%s, received key:%" PRId64 " not larger than lastKey:%" PRId64, pObj->vnode, pObj->sid, pObj->meterId,
-            *((TSKEY *)pData), pObj->lastKey);
-      pData += pObj->bytesPerPoint;
-      continue;
-    }
-
-    if (!VALID_TIMESTAMP(*((TSKEY *)pData), tsKey, (uint8_t)pVnode->cfg.precision)) {
-      code = TSDB_CODE_TIMESTAMP_OUT_OF_RANGE;
-      break;
-    }
-
-    if (vnodeInsertPointToCache(pObj, pData) < 0) {
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-      break;
-    }
-
-    pObj->lastKey = *((TSKEY *)pData);
-    pData += pObj->bytesPerPoint;
-    points++;
-  }
-  
-  atomic_fetch_add_64(&(pVnode->vnodeStatistic.pointsWritten), points * (pObj->numOfColumns - 1));
-  atomic_fetch_add_64(&(pVnode->vnodeStatistic.totalStorage), points * pObj->bytesPerPoint);
-
-  pthread_mutex_lock(&(pVnode->vmutex));
-
-  if (pObj->lastKey > pVnode->lastKey) pVnode->lastKey = pObj->lastKey;
-
-  if (firstKey < pVnode->firstKey) pVnode->firstKey = firstKey;
-  assert(pVnode->firstKey > 0);
-
-  pVnode->version++;
-
-  pthread_mutex_unlock(&(pVnode->vmutex));
-  
-  vnodeClearMeterState(pObj, TSDB_METER_STATE_INSERTING);
-
-_over:
-  dTrace("vid:%d sid:%d id:%s, %d out of %d points are inserted, lastKey:%" PRId64 " source:%d, vnode total storage: %" PRId64 "",
-         pObj->vnode, pObj->sid, pObj->meterId, points, numOfPoints, pObj->lastKey, source,
-         pVnode->vnodeStatistic.totalStorage);
-
-  *numOfInsertPoints = points;
-  return code;
-}
-
-/**
- * continue running of the function may cause the free vnode crash with high probability
- * todo fix it by set flag to disable commit in any cases
- *
- * @param param
- * @param tmrId
- */
-void vnodeProcessUpdateSchemaTimer(void *param, void *tmrId) {
-  SMeterObj * pObj = (SMeterObj *)param;
-  SVnodeObj * pVnode = vnodeList + pObj->vnode;
-
-  /*
-   * vnode may have been dropped, check it in the first place
-   * if the vnode is freed, the pObj is not valid any more, the pObj->vnode is meanless
-   * so may be the vid should be passed into this function as a parameter?
-   */
-  if (pVnode->meterList == NULL) {
-    dTrace("vnode is deleted, abort update schema");
-    return;
-  }
-
-  SCachePool *pPool = (SCachePool *)pVnode->pCachePool;
-
-  pthread_mutex_lock(&pPool->vmutex);
-  if (pPool->commitInProcess) {
-    dTrace("vid:%d sid:%d mid:%s, committing in process, commit later", pObj->vnode, pObj->sid, pObj->meterId);
-    if (taosTmrStart(vnodeProcessUpdateSchemaTimer, 10, pObj, vnodeTmrCtrl) == NULL) {
-      vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-    }
-
-    pthread_mutex_unlock(&pPool->vmutex);
-    return;
-  }
-
-  pPool->commitInProcess = 1;
-  pthread_mutex_unlock(&pPool->vmutex);
-
-  vnodeCommitMultiToFile(pVnode, pObj->sid, pObj->sid);
-}
-
-void vnodeUpdateMeter(void *param, void *tmrId) {
-  SMeterObj *pNew = (SMeterObj *)param;
-  if (pNew == NULL || pNew->vnode < 0 || pNew->sid < 0) return;
-
-  SVnodeObj* pVnode = &vnodeList[pNew->vnode];
-
-  if (pVnode->meterList == NULL) {
-    dTrace("vid:%d sid:%d id:%s, vnode is deleted, status:%s, abort update schema",
-            pNew->vnode, pNew->sid, pNew->meterId, taosGetVnodeStatusStr(vnodeList[pNew->vnode].vnodeStatus));
-    free(pNew->schema);
-    free(pNew);
-    return;
-  }
-
-  SMeterObj *pObj = pVnode->meterList[pNew->sid];
-  if (pObj == NULL || vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) {
-    dTrace("vid:%d sid:%d id:%s, meter is deleted, abort update schema", pNew->vnode, pNew->sid, pNew->meterId);
-    free(pNew->schema);
-    free(pNew);
-    return;
-  }
-
-  int32_t state = vnodeSetMeterState(pObj, TSDB_METER_STATE_UPDATING);
-  if (state >= TSDB_METER_STATE_DROPPING) {
-    dError("vid:%d sid:%d id:%s, meter is deleted, failed to update, state:%d",
-           pObj->vnode, pObj->sid, pObj->meterId, state);
-    return;
-  }
-
-  int32_t num = 0;
-  pthread_mutex_lock(&pVnode->vmutex);
-  num = pObj->numOfQueries;
-  pthread_mutex_unlock(&pVnode->vmutex);
-
-  if (num > 0 || state != TSDB_METER_STATE_READY) {
-    // the state may have been changed by vnodeSetMeterState, recover it in the first place
-    vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-    dTrace("vid:%d sid:%d id:%s, update failed, retry later, numOfQueries:%d, state:%d",
-           pNew->vnode, pNew->sid, pNew->meterId, num, state);
-
-    // retry update meter in 50ms
-    if (taosTmrStart(vnodeUpdateMeter, 50, pNew, vnodeTmrCtrl) == NULL) {
-      dError("vid:%d sid:%d id:%s, failed to start update timer, no retry", pNew->vnode, pNew->sid, pNew->meterId);
-      free(pNew->schema);
-      free(pNew);
-    }
-    return;
-  }
-
-  // commit first
-  if (!vnodeIsCacheCommitted(pObj)) {
-    // commit data first
-    if (taosTmrStart(vnodeProcessUpdateSchemaTimer, 0, pObj, vnodeTmrCtrl) == NULL) {
-      dError("vid:%d sid:%d id:%s, failed to start commit timer", pObj->vnode, pObj->sid, pObj->meterId);
-      vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-      free(pNew->schema);
-      free(pNew);
-      return;
-    }
-
-    if (taosTmrStart(vnodeUpdateMeter, 50, pNew, vnodeTmrCtrl) == NULL) {
-      dError("vid:%d sid:%d id:%s, failed to start update timer", pNew->vnode, pNew->sid, pNew->meterId);
-      vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-      free(pNew->schema);
-      free(pNew);
-    }
-
-    dTrace("vid:%d sid:%d meterId:%s, there are data in cache, commit first, update later",
-           pNew->vnode, pNew->sid, pNew->meterId);
-    vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-    return;
-  }
-
-  strcpy(pObj->meterId, pNew->meterId);
-  pObj->numOfColumns = pNew->numOfColumns;
-  pObj->timeStamp = pNew->timeStamp;
-  pObj->bytesPerPoint = pNew->bytesPerPoint;
-  pObj->maxBytes = pNew->maxBytes;
-  if (pObj->timeStamp > vnodeList[pObj->vnode].lastCreate) vnodeList[pObj->vnode].lastCreate = pObj->timeStamp;
-
-  tfree(pObj->schema);
-  pObj->schema = pNew->schema;
-
-  vnodeFreeCacheInfo(pObj);
-  pObj->pCache = vnodeAllocateCacheInfo(pObj);
-
-  pObj->sversion = pNew->sversion;
-  vnodeSaveMeterObjToFile(pObj);
-  vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING);
-
-  dTrace("vid:%d sid:%d id:%s, schema is updated, state:%d", pObj->vnode, pObj->sid, pObj->meterId, pObj->state);
-  free(pNew);
-}
-
-void vnodeRecoverMeterObjectFile(int vnode) {
-  // TODO: start the recovery process
-  assert(0);
-}
diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/system/detail/src/vnodeQueryImpl.c
deleted file mode 100644
index 81fce50bd6f950c2f50fc60efb4ce251481855bb..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeQueryImpl.c
+++ /dev/null
@@ -1,7974 +0,0 @@
-/*
- * 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 "os.h"
-#include "hash.h"
-#include "hashutil.h"
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "ttime.h"
-
-#include "tinterpolation.h"
-#include "tscJoinProcess.h"
-#include "tscSecondaryMerge.h"
-#include "tscompression.h"
-#include "ttime.h"
-#include "vnode.h"
-#include "vnodeRead.h"
-#include "vnodeUtil.h"
-
-#include "vnodeCache.h"
-#include "vnodeDataFilterFunc.h"
-#include "vnodeFile.h"
-#include "vnodeQueryImpl.h"
-#include "vnodeStatus.h"
-
-enum {
-  TS_JOIN_TS_EQUAL = 0,
-  TS_JOIN_TS_NOT_EQUALS = 1,
-  TS_JOIN_TAG_NOT_EQUALS = 2,
-};
-
-enum {
-  DISK_BLOCK_NO_NEED_TO_LOAD = 0,
-  DISK_BLOCK_LOAD_TS = 1,
-  DISK_BLOCK_LOAD_BLOCK = 2,
-};
-
-#define IS_DISK_DATA_BLOCK(q) ((q)->fileId >= 0)
-
-static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
-                                    int32_t size);
-
-static void    vnodeInitLoadCompBlockInfo(SLoadCompBlockInfo *pCompBlockLoadInfo);
-static int32_t moveToNextBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t step, __block_search_fn_t searchFn,
-                               bool loadData);
-static int32_t doMergeMetersResultsToGroupRes(SMeterQuerySupportObj *pSupporter, SQuery *pQuery,
-                                              SQueryRuntimeEnv *pRuntimeEnv, SMeterDataInfo *pMeterHeadDataInfo,
-                                              int32_t start, int32_t end);
-
-static TSKEY getTimestampInCacheBlock(SQueryRuntimeEnv *pRuntimeEnv, SCacheBlock *pBlock, int32_t index);
-static TSKEY getTimestampInDiskBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t index);
-
-static void    savePointPosition(SPositionInfo *position, int32_t fileId, int32_t slot, int32_t pos);
-static int32_t getNextDataFileCompInfo(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, int32_t step);
-
-static void setGroupOutputBuffer(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes *pResult);
-
-static void getAlignedIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, TSKEY keyInData, TSKEY skey, TSKEY ekey);
-static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
-                                        SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
-                                        __block_search_fn_t searchFn);
-
-static int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo, int32_t numOfResult);
-static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo,
-                                      SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
-                                      __block_search_fn_t searchFn);
-
-static void    resetMergeResultBuf(SQuery *pQuery, SQLFunctionCtx *pCtx);
-static int32_t flushFromResultBuf(SMeterQuerySupportObj *pSupporter, const SQuery *pQuery,
-                                  const SQueryRuntimeEnv *pRuntimeEnv);
-static void    validateTimestampForSupplementResult(SQueryRuntimeEnv *pRuntimeEnv, int64_t numOfIncrementRes);
-static void    getBasicCacheInfoSnapshot(SQuery *pQuery, SCacheInfo *pCacheInfo, int32_t vid);
-static TSKEY   getQueryPositionForCacheInvalid(SQueryRuntimeEnv *pRuntimeEnv, __block_search_fn_t searchFn);
-static bool    functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId);
-static void    doGetAlignedIntervalQueryRangeImpl(SQuery *pQuery, int64_t pKey, int64_t keyFirst, int64_t keyLast,
-                                                  int64_t *actualSkey, int64_t *actualEkey, int64_t *skey, int64_t *ekey);
-static void    getNextLogicalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow* pTimeWindow);
-
-// check the offset value integrity
-static FORCE_INLINE int32_t validateHeaderOffsetSegment(SQInfo *pQInfo, char *filePath, int32_t vid, char *data,
-                                                        int32_t size) {
-  if (!taosCheckChecksumWhole((uint8_t *)data + TSDB_FILE_HEADER_LEN, size)) {
-    dLError("QInfo:%p vid:%d, failed to read header file:%s, file offset area is broken", pQInfo, vid, filePath);
-    return -1;
-  }
-  return 0;
-}
-
-static FORCE_INLINE int32_t getCompHeaderSegSize(SVnodeCfg *pCfg) {
-  return pCfg->maxSessions * sizeof(SCompHeader) + sizeof(TSCKSUM);
-}
-
-static FORCE_INLINE int32_t getCompHeaderStartPosition(SVnodeCfg *pCfg) {
-  return TSDB_FILE_HEADER_LEN + getCompHeaderSegSize(pCfg);
-}
-
-static FORCE_INLINE int32_t validateCompBlockOffset(SQInfo *pQInfo, SMeterObj *pMeterObj, SCompHeader *pCompHeader,
-                                                    SQueryFilesInfo *pQueryFileInfo, int32_t headerSize) {
-  if (pCompHeader->compInfoOffset < headerSize || pCompHeader->compInfoOffset > pQueryFileInfo->headerFileSize) {
-    dError("QInfo:%p vid:%d sid:%d id:%s, compInfoOffset:%" PRId64 " is not valid, size:%" PRId64, pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pCompHeader->compInfoOffset,
-           pQueryFileInfo->headerFileSize);
-
-    return -1;
-  }
-
-  return 0;
-}
-
-// check compinfo integrity
-static FORCE_INLINE int32_t validateCompBlockInfoSegment(SQInfo *pQInfo, const char *filePath, int32_t vid,
-                                                         SCompInfo *compInfo, int64_t offset) {
-  if (!taosCheckChecksumWhole((uint8_t *)compInfo, sizeof(SCompInfo))) {
-    dLError("QInfo:%p vid:%d, failed to read header file:%s, file compInfo broken, offset:%" PRId64, pQInfo, vid,
-            filePath, offset);
-    return -1;
-  }
-  return 0;
-}
-
-static FORCE_INLINE int32_t validateCompBlockSegment(SQInfo *pQInfo, const char *filePath, SCompInfo *compInfo,
-                                                     char *pBlock, int32_t vid, TSCKSUM checksum) {
-  uint32_t size = compInfo->numOfBlocks * sizeof(SCompBlock);
-
-  if (checksum != taosCalcChecksum(0, (uint8_t *)pBlock, size)) {
-    dLError("QInfo:%p vid:%d, failed to read header file:%s, file compblock is broken:%zu", pQInfo, vid, filePath,
-            (char *)compInfo + sizeof(SCompInfo));
-    return -1;
-  }
-
-  return 0;
-}
-
-bool isGroupbyNormalCol(SSqlGroupbyExpr *pGroupbyExpr) {
-  if (pGroupbyExpr == NULL || pGroupbyExpr->numOfGroupCols == 0) {
-    return false;
-  }
-
-  for (int32_t i = 0; i < pGroupbyExpr->numOfGroupCols; ++i) {
-    SColIndexEx *pColIndex = &pGroupbyExpr->columnInfo[i];
-    if (pColIndex->flag == TSDB_COL_NORMAL) {
-      /*
-       * make sure the normal column locates at the second position if tbname exists in group by clause
-       */
-      if (pGroupbyExpr->numOfGroupCols > 1) {
-        assert(pColIndex->colIdx > 0);
-      }
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-int16_t getGroupbyColumnType(SQuery *pQuery, SSqlGroupbyExpr *pGroupbyExpr) {
-  assert(pGroupbyExpr != NULL);
-
-  int32_t colId = -2;
-  int16_t type = TSDB_DATA_TYPE_NULL;
-
-  for (int32_t i = 0; i < pGroupbyExpr->numOfGroupCols; ++i) {
-    SColIndexEx *pColIndex = &pGroupbyExpr->columnInfo[i];
-    if (pColIndex->flag == TSDB_COL_NORMAL) {
-      colId = pColIndex->colId;
-      break;
-    }
-  }
-
-  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    if (colId == pQuery->colList[i].data.colId) {
-      type = pQuery->colList[i].data.type;
-      break;
-    }
-  }
-
-  return type;
-}
-
-bool isSelectivityWithTagsQuery(SQuery *pQuery) {
-  bool    hasTags = false;
-  int32_t numOfSelectivity = 0;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functId == TSDB_FUNC_TAG_DUMMY || functId == TSDB_FUNC_TS_DUMMY) {
-      hasTags = true;
-      continue;
-    }
-
-    if ((aAggs[functId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
-      numOfSelectivity++;
-    }
-  }
-
-  if (numOfSelectivity > 0 && hasTags) {
-    return true;
-  }
-
-  return false;
-}
-
-static void vnodeFreeFieldsEx(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  vnodeFreeFields(pQuery);
-
-  vnodeInitLoadCompBlockInfo(&pRuntimeEnv->loadCompBlockInfo);
-}
-
-static bool vnodeIsCompBlockInfoLoaded(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, int32_t fileIndex) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  // check if data file header of this table has been loaded into memory, avoid to reloaded comp Block info
-  SLoadCompBlockInfo *pLoadCompBlockInfo = &pRuntimeEnv->loadCompBlockInfo;
-
-  // if vnodeFreeFields is called, the pQuery->pFields is NULL
-  if (pLoadCompBlockInfo->fileListIndex == fileIndex && pLoadCompBlockInfo->sid == pMeterObj->sid &&
-      pQuery->pFields != NULL && pQuery->fileId > 0) {
-    assert(pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID == pLoadCompBlockInfo->fileId &&
-           pQuery->numOfBlocks > 0);
-    return true;
-  }
-
-  return false;
-}
-
-static void vnodeSetCompBlockInfoLoaded(SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIndex, int32_t sid) {
-  SLoadCompBlockInfo *pCompBlockLoadInfo = &pRuntimeEnv->loadCompBlockInfo;
-
-  pCompBlockLoadInfo->sid = sid;
-  pCompBlockLoadInfo->fileListIndex = fileIndex;
-  pCompBlockLoadInfo->fileId = pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID;
-}
-
-static void vnodeInitLoadCompBlockInfo(SLoadCompBlockInfo *pCompBlockLoadInfo) {
-  pCompBlockLoadInfo->sid = -1;
-  pCompBlockLoadInfo->fileId = -1;
-  pCompBlockLoadInfo->fileListIndex = -1;
-}
-
-static int32_t vnodeIsDatablockLoaded(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, int32_t fileIndex,
-                                      bool loadPrimaryTS) {
-  SQuery *            pQuery = pRuntimeEnv->pQuery;
-  SLoadDataBlockInfo *pLoadInfo = &pRuntimeEnv->loadBlockInfo;
-
-  /* this block has been loaded into memory, return directly */
-  if (pLoadInfo->fileId == pQuery->fileId && pLoadInfo->slotIdx == pQuery->slot && pQuery->slot != -1 &&
-      pLoadInfo->sid == pMeterObj->sid && pLoadInfo->fileListIndex == fileIndex) {
-    // previous load operation does not load the primary timestamp column, we only need to load the timestamp column
-    if (pLoadInfo->tsLoaded == false && pLoadInfo->tsLoaded != loadPrimaryTS) {
-      return DISK_BLOCK_LOAD_TS;
-    } else {
-      return DISK_BLOCK_NO_NEED_TO_LOAD;
-    }
-  }
-
-  return DISK_BLOCK_LOAD_BLOCK;
-}
-
-static void vnodeSetDataBlockInfoLoaded(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, int32_t fileIndex,
-                                        bool tsLoaded) {
-  SQuery *            pQuery = pRuntimeEnv->pQuery;
-  SLoadDataBlockInfo *pLoadInfo = &pRuntimeEnv->loadBlockInfo;
-
-  pLoadInfo->fileId = pQuery->fileId;
-  pLoadInfo->slotIdx = pQuery->slot;
-  pLoadInfo->fileListIndex = fileIndex;
-  pLoadInfo->sid = pMeterObj->sid;
-  pLoadInfo->tsLoaded = tsLoaded;
-}
-
-static void vnodeInitDataBlockInfo(SLoadDataBlockInfo *pBlockLoadInfo) {
-  pBlockLoadInfo->slotIdx = -1;
-  pBlockLoadInfo->fileId = -1;
-  pBlockLoadInfo->sid = -1;
-  pBlockLoadInfo->fileListIndex = -1;
-}
-
-static void vnodeSetCurrentFileNames(SQueryFilesInfo *pVnodeFilesInfo) {
-  assert(pVnodeFilesInfo->current >= 0 && pVnodeFilesInfo->current < pVnodeFilesInfo->numOfFiles);
-
-  SHeaderFileInfo *pCurrentFileInfo = &pVnodeFilesInfo->pFileInfo[pVnodeFilesInfo->current];
-
-  /*
-   * set the full file path for current opened files
-   * the maximum allowed path string length is PATH_MAX in Linux, 100 bytes is used to
-   * suppress the compiler warnings
-   */
-  char    str[PATH_MAX + 100] = {0};
-  int32_t PATH_WITH_EXTRA = PATH_MAX + 100;
-
-  int32_t vnodeId = pVnodeFilesInfo->vnodeId;
-  int32_t fileId = pCurrentFileInfo->fileID;
-
-  int32_t len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.head", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
-  assert(len <= PATH_MAX);
-
-  strncpy(pVnodeFilesInfo->headerFilePath, str, PATH_MAX);
-
-  len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.data", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
-  assert(len <= PATH_MAX);
-
-  strncpy(pVnodeFilesInfo->dataFilePath, str, PATH_MAX);
-
-  len = snprintf(str, PATH_WITH_EXTRA, "%sv%df%d.last", pVnodeFilesInfo->dbFilePathPrefix, vnodeId, fileId);
-  assert(len <= PATH_MAX);
-
-  strncpy(pVnodeFilesInfo->lastFilePath, str, PATH_MAX);
-}
-
-/**
- * if the header is smaller than a threshold value(header size + initial offset value)
- *
- * @param vnodeId
- * @param headerFileSize
- * @return
- */
-static FORCE_INLINE bool isHeaderFileEmpty(int32_t vnodeId, size_t headerFileSize) {
-  SVnodeCfg *pVnodeCfg = &vnodeList[vnodeId].cfg;
-  return headerFileSize <= getCompHeaderStartPosition(pVnodeCfg);
-}
-
-static bool checkIsHeaderFileEmpty(SQueryFilesInfo *pVnodeFilesInfo) {
-  struct stat fstat = {0};
-  if (stat(pVnodeFilesInfo->headerFilePath, &fstat) < 0) {
-    return true;
-  }
-
-  pVnodeFilesInfo->headerFileSize = fstat.st_size;
-  return isHeaderFileEmpty(pVnodeFilesInfo->vnodeId, pVnodeFilesInfo->headerFileSize);
-}
-
-static void doCloseQueryFileInfoFD(SQueryFilesInfo *pVnodeFilesInfo) {
-  tclose(pVnodeFilesInfo->headerFd);
-  tclose(pVnodeFilesInfo->dataFd);
-  tclose(pVnodeFilesInfo->lastFd);
-
-  pVnodeFilesInfo->current = -1;
-  pVnodeFilesInfo->headerFileSize = -1;
-}
-
-static void doInitQueryFileInfoFD(SQueryFilesInfo *pVnodeFilesInfo) {
-  pVnodeFilesInfo->current = -1;
-  pVnodeFilesInfo->headerFileSize = -1;
-
-  pVnodeFilesInfo->headerFd = FD_INITIALIZER;  // set the initial value
-  pVnodeFilesInfo->dataFd = FD_INITIALIZER;
-  pVnodeFilesInfo->lastFd = FD_INITIALIZER;
-}
-
-/*
- * close the opened fd are delegated to invoker
- */
-static int32_t doOpenQueryFile(SQInfo *pQInfo, SQueryFilesInfo *pVnodeFileInfo) {
-  SHeaderFileInfo *pHeaderFileInfo = &pVnodeFileInfo->pFileInfo[pVnodeFileInfo->current];
-
-  /*
-   * current header file is empty or broken, return directly.
-   *
-   * if the header is smaller than or equals to the minimum file size value, this file is empty. No need to open this
-   * file and the corresponding files.
-   */
-  if (checkIsHeaderFileEmpty(pVnodeFileInfo)) {
-    qTrace("QInfo:%p vid:%d, fileId:%d, index:%d, size:%d, ignore file, empty or broken", pQInfo,
-           pVnodeFileInfo->vnodeId, pHeaderFileInfo->fileID, pVnodeFileInfo->current, pVnodeFileInfo->headerFileSize);
-
-    return -1;
-  }
-
-  pVnodeFileInfo->headerFd = open(pVnodeFileInfo->headerFilePath, O_RDONLY);
-  if (!FD_VALID(pVnodeFileInfo->headerFd)) {
-    dError("QInfo:%p failed open head file:%s reason:%s", pQInfo, pVnodeFileInfo->headerFilePath, strerror(errno));
-    return -1;
-  }
-
-  pVnodeFileInfo->dataFd = open(pVnodeFileInfo->dataFilePath, O_RDONLY);
-  if (!FD_VALID(pVnodeFileInfo->dataFd)) {
-    dError("QInfo:%p failed open data file:%s reason:%s", pQInfo, pVnodeFileInfo->dataFilePath, strerror(errno));
-    return -1;
-  }
-
-  pVnodeFileInfo->lastFd = open(pVnodeFileInfo->lastFilePath, O_RDONLY);
-  if (!FD_VALID(pVnodeFileInfo->lastFd)) {
-    dError("QInfo:%p failed open last file:%s reason:%s", pQInfo, pVnodeFileInfo->lastFilePath, strerror(errno));
-    return -1;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static void doCloseQueryFiles(SQueryFilesInfo *pVnodeFileInfo) {
-  if (pVnodeFileInfo->current >= 0) {
-    assert(pVnodeFileInfo->current < pVnodeFileInfo->numOfFiles && pVnodeFileInfo->current >= 0);
-
-    pVnodeFileInfo->headerFileSize = -1;
-
-    doCloseQueryFileInfoFD(pVnodeFileInfo);
-  }
-
-  assert(pVnodeFileInfo->current == -1);
-}
-
-/**
- * For each query, only one header file along with corresponding files is opened, in order to
- * avoid too many memory files opened at the same time.
- *
- * @param pRuntimeEnv
- * @param fileIndex
- * @return   -1 failed, 0 success
- */
-int32_t vnodeGetHeaderFile(SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIndex) {
-  assert(fileIndex >= 0 && fileIndex < pRuntimeEnv->vnodeFileInfo.numOfFiles);
-
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);  // only for log output
-
-  SQueryFilesInfo *pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
-
-  if (pVnodeFileInfo->current != fileIndex) {
-    if (pVnodeFileInfo->current >= 0) {
-      assert(pVnodeFileInfo->headerFileSize > 0);
-    }
-
-    // do close the current memory mapped header file and corresponding fd
-    doCloseQueryFiles(pVnodeFileInfo);
-    assert(pVnodeFileInfo->headerFileSize == -1);
-
-    // set current opened file Index
-    pVnodeFileInfo->current = fileIndex;
-
-    // set the current opened files(header, data, last) path
-    vnodeSetCurrentFileNames(pVnodeFileInfo);
-
-    if (doOpenQueryFile(pQInfo, pVnodeFileInfo) != TSDB_CODE_SUCCESS) {
-      doCloseQueryFiles(pVnodeFileInfo);  // all the fds may be partially opened, close them anyway.
-      return -1;
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/*
- * read comp block info from header file
- *
- */
-static int vnodeGetCompBlockInfo(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIndex) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  SVnodeCfg *      pCfg = &vnodeList[pMeterObj->vnode].cfg;
-  SHeaderFileInfo *pHeadeFileInfo = &pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex];
-
-  int64_t st = taosGetTimestampUs();
-
-  if (vnodeIsCompBlockInfoLoaded(pRuntimeEnv, pMeterObj, fileIndex)) {
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d compBlock info is loaded, not reload", GET_QINFO_ADDR(pQuery),
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pHeadeFileInfo->fileID);
-
-    return pQuery->numOfBlocks;
-  }
-
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-  pSummary->readCompInfo++;
-  pSummary->numOfSeek++;
-
-  int32_t ret = vnodeGetHeaderFile(pRuntimeEnv, fileIndex);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return -1;  // failed to load the header file data into memory
-  }
-
-  char *           buf = calloc(1, getCompHeaderSegSize(pCfg));
-  SQueryFilesInfo *pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
-
-  lseek(pVnodeFileInfo->headerFd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  read(pVnodeFileInfo->headerFd, buf, getCompHeaderSegSize(pCfg));
-
-  // check the offset value integrity
-  if (validateHeaderOffsetSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, pMeterObj->vnode,
-                                  buf - TSDB_FILE_HEADER_LEN, getCompHeaderSegSize(pCfg)) < 0) {
-    free(buf);
-    return -1;
-  }
-
-  SCompHeader *compHeader = (SCompHeader *)(buf + sizeof(SCompHeader) * pMeterObj->sid);
-
-  // no data in this file for specified meter, abort
-  if (compHeader->compInfoOffset == 0) {
-    free(buf);
-    return 0;
-  }
-
-  // corrupted file may cause the invalid compInfoOffset, check needs
-  if (validateCompBlockOffset(pQInfo, pMeterObj, compHeader, &pRuntimeEnv->vnodeFileInfo,
-                              getCompHeaderStartPosition(pCfg)) < 0) {
-    free(buf);
-    return -1;
-  }
-
-  lseek(pVnodeFileInfo->headerFd, compHeader->compInfoOffset, SEEK_SET);
-
-  SCompInfo compInfo = {0};
-  read(pVnodeFileInfo->headerFd, &compInfo, sizeof(SCompInfo));
-
-  // check compblock info integrity
-  if (validateCompBlockInfoSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, pMeterObj->vnode, &compInfo,
-                                   compHeader->compInfoOffset) < 0) {
-    free(buf);
-    return -1;
-  }
-
-  if (compInfo.numOfBlocks <= 0 || compInfo.uid != pMeterObj->uid) {
-    free(buf);
-    return 0;
-  }
-
-  // free allocated SField data
-  vnodeFreeFieldsEx(pRuntimeEnv);
-  pQuery->numOfBlocks = (int32_t)compInfo.numOfBlocks;
-
-  /*
-   * +-------------+-----------+----------------+
-   * | comp block  | checksum  | SField Pointer |
-   * +-------------+-----------+----------------+
-   */
-  int32_t compBlockSize = compInfo.numOfBlocks * sizeof(SCompBlock);
-  size_t  bufferSize = compBlockSize + sizeof(TSCKSUM) + POINTER_BYTES * pQuery->numOfBlocks;
-
-  // prepare buffer to hold compblock data
-  if (pQuery->blockBufferSize != bufferSize) {
-    pQuery->pBlock = realloc(pQuery->pBlock, bufferSize);
-    pQuery->blockBufferSize = (int32_t)bufferSize;
-  }
-
-  memset(pQuery->pBlock, 0, bufferSize);
-
-  // read data: comp block + checksum
-  read(pVnodeFileInfo->headerFd, pQuery->pBlock, compBlockSize + sizeof(TSCKSUM));
-  TSCKSUM checksum = *(TSCKSUM *)((char *)pQuery->pBlock + compBlockSize);
-
-  // check comp block integrity
-  if (validateCompBlockSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, &compInfo, (char *)pQuery->pBlock,
-                               pMeterObj->vnode, checksum) < 0) {
-    free(buf);
-    return -1;
-  }
-
-  pQuery->pFields = (SField **)((char *)pQuery->pBlock + compBlockSize + sizeof(TSCKSUM));
-  vnodeSetCompBlockInfoLoaded(pRuntimeEnv, fileIndex, pMeterObj->sid);
-
-  int64_t et = taosGetTimestampUs();
-  qTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d, load compblock info, size:%d, elapsed:%f ms", pQInfo,
-         pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pRuntimeEnv->vnodeFileInfo.pFileInfo[fileIndex].fileID,
-         compBlockSize, (et - st) / 1000.0);
-
-  pSummary->totalCompInfoSize += compBlockSize;
-  pSummary->loadCompInfoUs += (et - st);
-
-  free(buf);
-  return pQuery->numOfBlocks;
-}
-
-bool doRevisedResultsByLimit(SQInfo *pQInfo) {
-  SQuery *pQuery = &pQInfo->query;
-
-  if ((pQuery->limit.limit > 0) && (pQuery->pointsRead + pQInfo->pointsRead > pQuery->limit.limit)) {
-    pQuery->pointsRead = pQuery->limit.limit - pQInfo->pointsRead;
-
-    setQueryStatus(pQuery, QUERY_COMPLETED);  // query completed
-    return true;
-  }
-
-  return false;
-}
-
-static void setExecParams(SQuery *pQuery, SQLFunctionCtx *pCtx, int64_t StartQueryTimestamp, void *inputData,
-                          char *primaryColumnData, int32_t size, int32_t functionId, SField *pField, bool hasNull,
-                          int32_t blockStatus, void *param, int32_t scanFlag);
-
-void        createGroupResultBuf(SQuery *pQuery, SOutputRes *pOneResult, bool isMetricQuery);
-static void destroyGroupResultBuf(SOutputRes *pOneOutputRes, int32_t nOutputCols);
-
-static int32_t binarySearchForBlockImpl(SCompBlock *pBlock, int32_t numOfBlocks, TSKEY skey, int32_t order) {
-  int32_t firstSlot = 0;
-  int32_t lastSlot = numOfBlocks - 1;
-
-  int32_t midSlot = firstSlot;
-
-  while (1) {
-    numOfBlocks = lastSlot - firstSlot + 1;
-    midSlot = (firstSlot + (numOfBlocks >> 1));
-
-    if (numOfBlocks == 1) break;
-
-    if (skey > pBlock[midSlot].keyLast) {
-      if (numOfBlocks == 2) break;
-      if ((order == TSQL_SO_DESC) && (skey < pBlock[midSlot + 1].keyFirst)) break;
-      firstSlot = midSlot + 1;
-    } else if (skey < pBlock[midSlot].keyFirst) {
-      if ((order == TSQL_SO_ASC) && (skey > pBlock[midSlot - 1].keyLast)) break;
-      lastSlot = midSlot - 1;
-    } else {
-      break;  // got the slot
-    }
-  }
-
-  return midSlot;
-}
-
-static int32_t binarySearchForBlock(SQuery *pQuery, int64_t key) {
-  return binarySearchForBlockImpl(pQuery->pBlock, pQuery->numOfBlocks, key, pQuery->order.order);
-}
-
-#if 0
-/* unmap previous buffer */
-static UNUSED_FUNC int32_t resetMMapWindow(SHeaderFileInfo *pQueryFileInfo) {
-  munmap(pQueryFileInfo->pDataFileData, pQueryFileInfo->defaultMappingSize);
-
-  pQueryFileInfo->dtFileMappingOffset = 0;
-  pQueryFileInfo->pDataFileData = mmap(NULL, pQueryFileInfo->defaultMappingSize, PROT_READ, MAP_PRIVATE | MAP_POPULATE,
-                                       pQueryFileInfo->dataFd, pQueryFileInfo->dtFileMappingOffset);
-  if (pQueryFileInfo->pDataFileData == MAP_FAILED) {
-    dError("failed to mmaping data file:%s, reason:%s", pQueryFileInfo->dataFilePath, strerror(errno));
-    return -1;
-  }
-
-  return 0;
-}
-
-static int32_t moveMMapWindow(SHeaderFileInfo *pQueryFileInfo, uint64_t offset) {
-  uint64_t upperBnd = (pQueryFileInfo->dtFileMappingOffset + pQueryFileInfo->defaultMappingSize - 1);
-
-  /* data that are located in current mmapping window */
-  if ((offset >= pQueryFileInfo->dtFileMappingOffset && offset <= upperBnd) &&
-      pQueryFileInfo->pDataFileData != MAP_FAILED) {
-    // if it mapping failed, try again when it is called.
-    return 0;
-  }
-
-  /*
-   * 1. there is import data that locate farther from the beginning, but with less timestamp, so we need to move the
-   * window backwards
-   * 2. otherwise, move the mmaping window forward
-   */
-  upperBnd = (offset / pQueryFileInfo->defaultMappingSize + 1) * pQueryFileInfo->defaultMappingSize - 1;
-
-  /* unmap previous buffer */
-  if (pQueryFileInfo->pDataFileData != MAP_FAILED) {
-    int32_t ret = munmap(pQueryFileInfo->pDataFileData, pQueryFileInfo->defaultMappingSize);
-    pQueryFileInfo->pDataFileData = MAP_FAILED;
-    if (ret != 0) {
-      dError("failed to unmmaping data file:%s, handle:%d, offset:%ld, reason:%s", pQueryFileInfo->dataFilePath,
-             pQueryFileInfo->dataFd, pQueryFileInfo->dtFileMappingOffset, strerror(errno));
-      return -1;
-    }
-  }
-
-  /* mmap from the new position */
-  pQueryFileInfo->dtFileMappingOffset = upperBnd - pQueryFileInfo->defaultMappingSize + 1;
-  pQueryFileInfo->pDataFileData = mmap(NULL, pQueryFileInfo->defaultMappingSize, PROT_READ, MAP_PRIVATE | MAP_POPULATE,
-                                       pQueryFileInfo->dataFd, pQueryFileInfo->dtFileMappingOffset);
-  if (pQueryFileInfo->pDataFileData == MAP_FAILED) {
-    dError("failed to mmaping data file:%s, handle:%d, offset:%ld, reason:%s", pQueryFileInfo->dataFilePath,
-           pQueryFileInfo->dataFd, pQueryFileInfo->dtFileMappingOffset, strerror(errno));
-    return -1;
-  }
-
-  /* advise kernel the usage of mmaped data */
-  if (madvise(pQueryFileInfo->pDataFileData, pQueryFileInfo->defaultMappingSize, MADV_SEQUENTIAL) == -1) {
-    dError("failed to advise kernel the usage of data file:%s, handle:%d, reason:%s", pQueryFileInfo->dataFilePath,
-           pQueryFileInfo->dataFd, strerror(errno));
-  }
-
-  return 0;
-}
-
-static int32_t copyDataFromMMapBuffer(int fd, SQInfo *pQInfo, SHeaderFileInfo *pQueryFile, char *buf, uint64_t offset,
-                                      int32_t size) {
-  assert(size >= 0);
-
-  int32_t ret = moveMMapWindow(pQueryFile, offset);
-  dTrace("QInfo:%p finished move to correct position:%ld", pQInfo, taosGetTimestampUs());
-
-  if (pQueryFile->pDataFileData == MAP_FAILED || ret != TSDB_CODE_SUCCESS) {
-    dTrace("QInfo:%p move window failed. ret:%d", pQInfo, ret);
-    return -1;
-  }
-
-  uint64_t upperBnd = pQueryFile->dtFileMappingOffset + pQueryFile->defaultMappingSize - 1;
-
-  /* data are enclosed in current mmap window */
-  if (offset + size <= upperBnd) {
-    uint64_t startPos = offset - pQueryFile->dtFileMappingOffset;
-    memcpy(buf, pQueryFile->pDataFileData + startPos, size);
-
-    dTrace("QInfo:%p copy data completed, size:%d, time:%ld", pQInfo, size, taosGetTimestampUs());
-
-  } else {
-    uint32_t firstPart = upperBnd - offset + 1;
-    memcpy(buf, pQueryFile->pDataFileData + (offset - pQueryFile->dtFileMappingOffset), firstPart);
-
-    dTrace("QInfo:%p copy data first part,size:%d, time:%ld", pQInfo, firstPart, taosGetTimestampUs());
-
-    char *dst = buf + firstPart;
-
-    /* remain data */
-    uint32_t remain = size - firstPart;
-    while (remain > 0) {
-      int32_t ret1 = moveMMapWindow(pQueryFile, pQueryFile->dtFileMappingOffset + pQueryFile->defaultMappingSize);
-      if (ret1 != 0) {
-        return ret1;
-      }
-
-      uint32_t len = (remain > pQueryFile->defaultMappingSize) ? pQueryFile->defaultMappingSize : remain;
-
-      /* start from the 0 position */
-      memcpy(dst, pQueryFile->pDataFileData, len);
-      remain -= len;
-      dst += len;
-
-      dTrace("QInfo:%p copy data part,size:%d, time:%ld", pQInfo, len, taosGetTimestampUs());
-    }
-  }
-
-  return 0;
-}
-
-#endif
-
-static int32_t readDataFromDiskFile(int fd, SQInfo *pQInfo, SQueryFilesInfo *pQueryFile, char *buf, uint64_t offset,
-                                    int32_t size) {
-  assert(size >= 0);
-
-  int32_t ret = (int32_t)lseek(fd, offset, SEEK_SET);
-  if (ret == -1) {
-    //        qTrace("QInfo:%p seek failed, reason:%s", pQInfo, strerror(errno));
-    return -1;
-  }
-
-  ret = read(fd, buf, size);
-  //    qTrace("QInfo:%p read data %d completed", pQInfo, size);
-  return 0;
-}
-
-static int32_t loadColumnIntoMem(SQuery *pQuery, SQueryFilesInfo *pQueryFileInfo, SCompBlock *pBlock, SField *pFields,
-                                 int32_t col, SData *sdata, void *tmpBuf, char *buffer, int32_t buffersize) {
-  char *dst = (pBlock->algorithm) ? tmpBuf : sdata->data;
-
-  int64_t offset = pBlock->offset + pFields[col].offset;
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  int     fd = pBlock->last ? pQueryFileInfo->lastFd : pQueryFileInfo->dataFd;
-  int32_t ret = readDataFromDiskFile(fd, pQInfo, pQueryFileInfo, dst, offset, pFields[col].len);
-  if (ret != 0) {
-    return ret;
-  }
-
-  // load checksum
-  TSCKSUM checksum = 0;
-  ret = readDataFromDiskFile(fd, pQInfo, pQueryFileInfo, (char *)&checksum, offset + pFields[col].len, sizeof(TSCKSUM));
-  if (ret != 0) {
-    return ret;
-  }
-
-  // check column data integrity
-  if (checksum != taosCalcChecksum(0, (const uint8_t *)dst, pFields[col].len)) {
-    dLError("QInfo:%p, column data checksum error, file:%s, col: %d, offset:%" PRId64, GET_QINFO_ADDR(pQuery),
-            pQueryFileInfo->dataFilePath, col, offset);
-
-    return -1;
-  }
-
-  if (pBlock->algorithm) {
-    (*pDecompFunc[pFields[col].type])(tmpBuf, pFields[col].len, pBlock->numOfPoints, sdata->data,
-                                      pFields[col].bytes * pBlock->numOfPoints, pBlock->algorithm, buffer, buffersize);
-  }
-
-  return 0;
-}
-
-static int32_t loadDataBlockFieldsInfo(SQueryRuntimeEnv *pRuntimeEnv, SCompBlock *pBlock, SField **pField) {
-  SQuery *         pQuery = pRuntimeEnv->pQuery;
-  SQInfo *         pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-  SMeterObj *      pMeterObj = pRuntimeEnv->pMeterObj;
-  SQueryFilesInfo *pVnodeFilesInfo = &pRuntimeEnv->vnodeFileInfo;
-
-  size_t size = sizeof(SField) * (pBlock->numOfCols) + sizeof(TSCKSUM);
-
-  // if *pField != NULL, this block is loaded once, in current query do nothing
-  if (*pField == NULL) {  // load the fields information once
-    *pField = malloc(size);
-  }
-
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-  pSummary->totalFieldSize += size;
-  pSummary->readField++;
-  pSummary->numOfSeek++;
-
-  int64_t st = taosGetTimestampUs();
-
-  int     fd = pBlock->last ? pVnodeFilesInfo->lastFd : pVnodeFilesInfo->dataFd;
-  int32_t ret = readDataFromDiskFile(fd, pQInfo, pVnodeFilesInfo, (char *)(*pField), pBlock->offset, size);
-  if (ret != 0) {
-    return ret;
-  }
-
-  // check fields integrity
-  if (!taosCheckChecksumWhole((uint8_t *)(*pField), size)) {
-    dLError("QInfo:%p vid:%d sid:%d id:%s, slot:%d, failed to read sfields, file:%s, sfields area broken:%" PRId64,
-            pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pVnodeFilesInfo->dataFilePath,
-            pBlock->offset);
-    return -1;
-  }
-
-  int64_t et = taosGetTimestampUs();
-  qTrace("QInfo:%p vid:%d sid:%d id:%s, slot:%d, load field info, size:%d, elapsed:%f ms", pQInfo, pMeterObj->vnode,
-         pMeterObj->sid, pMeterObj->meterId, pQuery->slot, size, (et - st) / 1000.0);
-
-  pSummary->loadFieldUs += (et - st);
-  return 0;
-}
-
-static void fillWithNull(SQuery *pQuery, char *dst, int32_t col, int32_t numOfPoints) {
-  int32_t bytes = pQuery->colList[col].data.bytes;
-  int32_t type = pQuery->colList[col].data.type;
-
-  setNullN(dst, type, bytes, numOfPoints);
-}
-
-static int32_t loadPrimaryTSColumn(SQueryRuntimeEnv *pRuntimeEnv, SCompBlock *pBlock, SField **pField,
-                                   int32_t *columnBytes) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  assert(PRIMARY_TSCOL_LOADED(pQuery) == false);
-
-  if (columnBytes != NULL) {
-    (*columnBytes) += (*pField)[PRIMARYKEY_TIMESTAMP_COL_INDEX].len + sizeof(TSCKSUM);
-  }
-
-  int32_t ret = loadColumnIntoMem(pQuery, &pRuntimeEnv->vnodeFileInfo, pBlock, *pField, PRIMARYKEY_TIMESTAMP_COL_INDEX,
-                                  pRuntimeEnv->primaryColBuffer, pRuntimeEnv->unzipBuffer,
-                                  pRuntimeEnv->secondaryUnzipBuffer, pRuntimeEnv->unzipBufSize);
-  return ret;
-}
-
-static int32_t loadDataBlockIntoMem(SCompBlock *pBlock, SField **pField, SQueryRuntimeEnv *pRuntimeEnv, int32_t fileIdx,
-                                    bool loadPrimaryCol, bool loadSField) {
-  int32_t i = 0, j = 0;
-
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-  SData **   sdata = pRuntimeEnv->colDataBuffer;
-
-  assert(fileIdx == pRuntimeEnv->vnodeFileInfo.current);
-
-  SData **primaryTSBuf = &pRuntimeEnv->primaryColBuffer;
-  void *  tmpBuf = pRuntimeEnv->unzipBuffer;
-  int32_t columnBytes = 0;
-
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-
-  int32_t status = vnodeIsDatablockLoaded(pRuntimeEnv, pMeterObj, fileIdx, loadPrimaryCol);
-  if (status == DISK_BLOCK_NO_NEED_TO_LOAD) {
-    dTrace(
-        "QInfo:%p vid:%d sid:%d id:%s, fileId:%d, data block has been loaded, no need to load again, ts:%d, slot:%d,"
-        " brange:%lld-%lld, rows:%d",
-        GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, loadPrimaryCol,
-        pQuery->slot, pBlock->keyFirst, pBlock->keyLast, pBlock->numOfPoints);
-
-    if (loadSField && (pQuery->pFields == NULL || pQuery->pFields[pQuery->slot] == NULL)) {
-      loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, &pQuery->pFields[pQuery->slot]);
-    }
-
-    return TSDB_CODE_SUCCESS;
-  } else if (status == DISK_BLOCK_LOAD_TS) {
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d, data block has been loaded, incrementally load ts",
-           GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId);
-
-    assert(PRIMARY_TSCOL_LOADED(pQuery) == false && loadSField == true);
-    if (pQuery->pFields == NULL || pQuery->pFields[pQuery->slot] == NULL) {
-      loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, &pQuery->pFields[pQuery->slot]);
-    }
-
-    // load primary timestamp
-    int32_t ret = loadPrimaryTSColumn(pRuntimeEnv, pBlock, pField, &columnBytes);
-
-    vnodeSetDataBlockInfoLoaded(pRuntimeEnv, pMeterObj, fileIdx, loadPrimaryCol);
-    return ret;
-  }
-
-  /* failed to load fields info, return with error info */
-  if (loadSField && (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pField) != 0)) {
-    return -1;
-  }
-
-  int64_t st = taosGetTimestampUs();
-
-  if (loadPrimaryCol) {
-    if (PRIMARY_TSCOL_LOADED(pQuery)) {
-      *primaryTSBuf = sdata[0];
-    } else {
-      int32_t ret = loadPrimaryTSColumn(pRuntimeEnv, pBlock, pField, &columnBytes);
-      if (ret != TSDB_CODE_SUCCESS) {
-        return ret;
-      }
-
-      pSummary->numOfSeek++;
-      j += 1;  // first column of timestamp is not needed to be read again
-    }
-  }
-
-  int32_t ret = 0;
-
-  /* the first round always be 1, the secondary round is determined by queried function */
-  int32_t round = pRuntimeEnv->scanFlag;
-
-  while (j < pBlock->numOfCols && i < pQuery->numOfCols) {
-    if ((*pField)[j].colId < pQuery->colList[i].data.colId) {
-      ++j;
-    } else if ((*pField)[j].colId == pQuery->colList[i].data.colId) {
-      // add additional check for data type
-      if ((*pField)[j].type != pQuery->colList[i].data.type) {
-        ret = TSDB_CODE_INVALID_QUERY_MSG;
-        break;
-      }
-
-      /*
-       * during supplementary scan:
-       * 1. primary ts column (always loaded)
-       * 2. query specified columns
-       * 3. in case of filter column required, filter columns must be loaded.
-       */
-      if (pQuery->colList[i].req[round] == 1 || pQuery->colList[i].data.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-        // if data of this column in current block are all null, do NOT read it from disk
-        if ((*pField)[j].numOfNullPoints == pBlock->numOfPoints) {
-          fillWithNull(pQuery, sdata[i]->data, i, pBlock->numOfPoints);
-        } else {
-          columnBytes += (*pField)[j].len + sizeof(TSCKSUM);
-          ret = loadColumnIntoMem(pQuery, &pRuntimeEnv->vnodeFileInfo, pBlock, *pField, j, sdata[i], tmpBuf,
-                                  pRuntimeEnv->secondaryUnzipBuffer, pRuntimeEnv->unzipBufSize);
-
-          pSummary->numOfSeek++;
-        }
-      }
-      ++i;
-      ++j;
-    } else {
-      /*
-       * pQuery->colList[i].colIdx < (*pFields)[j].colId this column is not existed in current block,
-       * fill with NULL value
-       */
-      fillWithNull(pQuery, sdata[i]->data, i, pBlock->numOfPoints);
-
-      pSummary->totalGenData += (pBlock->numOfPoints * pQuery->colList[i].data.bytes);
-      ++i;
-    }
-  }
-
-  if (j >= pBlock->numOfCols && i < pQuery->numOfCols) {
-    // remain columns need to set null value
-    while (i < pQuery->numOfCols) {
-      fillWithNull(pQuery, sdata[i]->data, i, pBlock->numOfPoints);
-
-      pSummary->totalGenData += (pBlock->numOfPoints * pQuery->colList[i].data.bytes);
-      ++i;
-    }
-  }
-
-  int64_t et = taosGetTimestampUs();
-  qTrace("QInfo:%p vid:%d sid:%d id:%s, slot:%d, load block completed, ts loaded:%d, rec:%d, elapsed:%f ms",
-         GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, loadPrimaryCol,
-         pBlock->numOfPoints, (et - st) / 1000.0);
-
-  pSummary->totalBlockSize += columnBytes;
-  pSummary->loadBlocksUs += (et - st);
-  pSummary->readDiskBlocks++;
-
-  vnodeSetDataBlockInfoLoaded(pRuntimeEnv, pMeterObj, fileIdx, loadPrimaryCol);
-  return ret;
-}
-
-// todo ignore the blockType, pass the pQuery into this function
-SBlockInfo getBlockBasicInfo(SQueryRuntimeEnv *pRuntimeEnv, void *pBlock, int32_t blockType) {
-  SBlockInfo blockInfo = {0};
-  if (IS_FILE_BLOCK(blockType)) {
-    SCompBlock *pDiskBlock = (SCompBlock *)pBlock;
-
-    blockInfo.keyFirst = pDiskBlock->keyFirst;
-    blockInfo.keyLast = pDiskBlock->keyLast;
-    blockInfo.size = pDiskBlock->numOfPoints;
-    blockInfo.numOfCols = pDiskBlock->numOfCols;
-  } else {
-    SCacheBlock *pCacheBlock = (SCacheBlock *)pBlock;
-
-    blockInfo.keyFirst = getTimestampInCacheBlock(pRuntimeEnv, pCacheBlock, 0);
-    blockInfo.keyLast = getTimestampInCacheBlock(pRuntimeEnv, pCacheBlock, pCacheBlock->numOfPoints - 1);
-    blockInfo.size = pCacheBlock->numOfPoints;
-    blockInfo.numOfCols = pCacheBlock->pMeterObj->numOfColumns;
-  }
-
-  return blockInfo;
-}
-
-static bool checkQueryRangeAgainstNextBlock(SBlockInfo *pBlockInfo, SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  if ((QUERY_IS_ASC_QUERY(pQuery) && pBlockInfo->keyFirst > pQuery->ekey) ||
-      (!QUERY_IS_ASC_QUERY(pQuery) && pBlockInfo->keyLast < pQuery->ekey)) {
-    int32_t pos = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pBlockInfo->size - 1;
-
-    savePointPosition(&pRuntimeEnv->nextPos, pQuery->fileId, pQuery->slot, pos);
-    setQueryStatus(pQuery, QUERY_COMPLETED);
-
-    return false;
-  }
-
-  return true;
-}
-
-/**
- *
- * @param pQuery
- * @param pBlockInfo
- * @param forwardStep
- * @return  TRUE means query not completed, FALSE means query is completed
- */
-static bool queryCompleteInBlock(SQuery *pQuery, SBlockInfo *pBlockInfo, int32_t forwardStep) {
-  if (Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL)) {
-    //    assert(pQuery->checkBufferInLoop == 1 && pQuery->over == QUERY_RESBUF_FULL && pQuery->pointsOffset == 0);
-
-    assert((QUERY_IS_ASC_QUERY(pQuery) && forwardStep + pQuery->pos <= pBlockInfo->size) ||
-           (!QUERY_IS_ASC_QUERY(pQuery) && pQuery->pos - forwardStep + 1 >= 0));
-
-    // current query completed
-    if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-    }
-
-    return true;
-  } else {  // query completed
-    if ((pQuery->ekey <= pBlockInfo->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (pQuery->ekey >= pBlockInfo->keyFirst && !QUERY_IS_ASC_QUERY(pQuery))) {
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-      return true;
-    }
-
-    return false;
-  }
-}
-
-/**
- * save triple tuple of (fileId, slot, pos) to SPositionInfo
- */
-void savePointPosition(SPositionInfo *position, int32_t fileId, int32_t slot, int32_t pos) {
-  /*
-   * slot == -1 && pos == -1 means no data left anymore
-   */
-  assert(fileId >= -1 && slot >= -1 && pos >= -1);
-
-  position->fileId = fileId;
-  position->slot = slot;
-  position->pos = pos;
-}
-
-bool isCacheBlockValid(SQuery *pQuery, SCacheBlock *pBlock, SMeterObj *pMeterObj) {
-  if (pMeterObj != pBlock->pMeterObj || pBlock->blockId > pQuery->blockId) {
-    SMeterObj *pNewMeterObj = pBlock->pMeterObj;
-    char *     id = (pNewMeterObj != NULL) ? pNewMeterObj->meterId : NULL;
-
-    dWarn(
-        "QInfo:%p vid:%d sid:%d id:%s, cache block is overwritten, slot:%d blockId:%d qBlockId:%d, meterObj:%p, "
-        "blockMeterObj:%p, blockMeter id:%s, first:%d, last:%d, numOfBlocks:%d",
-        GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pBlock->blockId,
-        pQuery->blockId, pMeterObj, pNewMeterObj, id, pQuery->firstSlot, pQuery->currentSlot, pQuery->numOfBlocks);
-
-    return false;
-  }
-
-  /*
-   * The check for empty block:
-   *    pBlock->numOfPoints == 0. There is a empty block, which is caused by allocate-and-write data into cache
-   *    procedure. The block has been allocated but data has not been put into yet. If the block is the last
-   *    block(newly allocated block), abort query. Otherwise, skip it and go on.
-   */
-  if (pBlock->numOfPoints == 0) {
-    dWarn(
-        "QInfo:%p vid:%d sid:%d id:%s, cache block is empty. slot:%d first:%d, last:%d, numOfBlocks:%d,"
-        "allocated but not write data yet.",
-        GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot, pQuery->firstSlot,
-        pQuery->currentSlot, pQuery->numOfBlocks);
-
-    return false;
-  }
-
-  return true;
-}
-
-// todo all functions that call this function should check the returned data blocks status
-SCacheBlock *getCacheDataBlock(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntimeEnv, int32_t slot) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-  if (pCacheInfo == NULL || pCacheInfo->cacheBlocks == NULL || slot < 0 || slot >= pCacheInfo->maxBlocks) {
-    return NULL;
-  }
-
-  getBasicCacheInfoSnapshot(pQuery, pCacheInfo, pMeterObj->vnode);
-
-  SCacheBlock *pBlock = pCacheInfo->cacheBlocks[slot];
-  if (pBlock == NULL) {  // the cache info snapshot must be existed.
-    int32_t curNumOfBlocks = pCacheInfo->numOfBlocks;
-    int32_t curSlot = pCacheInfo->currentSlot;
-
-    dError(
-        "QInfo:%p NULL Block In Cache, snapshot (available blocks:%d, last block:%d), current (available blocks:%d, "
-        "last block:%d), accessed null block:%d, pBlockId:%d",
-        GET_QINFO_ADDR(pQuery), pQuery->numOfBlocks, pQuery->currentSlot, curNumOfBlocks, curSlot, slot,
-        pQuery->blockId);
-
-    return NULL;
-  }
-
-  // block is empty or block does not belongs to current table, return NULL value
-  if (!isCacheBlockValid(pQuery, pBlock, pMeterObj)) {
-    return NULL;
-  }
-
-  // the accessed cache block has been loaded already, return directly
-  if (vnodeIsDatablockLoaded(pRuntimeEnv, pMeterObj, -1, true) == DISK_BLOCK_NO_NEED_TO_LOAD) {
-    TSKEY skey = getTimestampInCacheBlock(pRuntimeEnv, pBlock, 0);
-    TSKEY ekey = getTimestampInCacheBlock(pRuntimeEnv, pBlock, pBlock->numOfPoints - 1);
-
-    dTrace(
-        "QInfo:%p vid:%d sid:%d id:%s, fileId:%d, cache block has been loaded, no need to load again, ts:%d, "
-        "slot:%d, brange:%lld-%lld, rows:%d",
-        GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, 1, pQuery->slot,
-        skey, ekey, pBlock->numOfPoints);
-
-    return &pRuntimeEnv->cacheBlock;
-  }
-
-  // keep the structure as well as the block data into local buffer
-  memcpy(&pRuntimeEnv->cacheBlock, pBlock, sizeof(SCacheBlock));
-
-  SCacheBlock *pNewBlock = &pRuntimeEnv->cacheBlock;
-
-  // the commit data points will be ignored
-  int32_t offset = 0;
-  int32_t numOfPoints = pNewBlock->numOfPoints;
-  if (pQuery->firstSlot == pQuery->commitSlot) {
-    assert(pQuery->commitPoint >= 0 && pQuery->commitPoint <= pNewBlock->numOfPoints);
-
-    offset = pQuery->commitPoint;
-    numOfPoints = pNewBlock->numOfPoints - offset;
-
-    if (offset != 0) {
-      dTrace(
-          "%p ignore the data in cache block that are commit already, numOfblock:%d slot:%d ignore points:%d. "
-          "first:%d last:%d",
-          GET_QINFO_ADDR(pQuery), pQuery->numOfBlocks, pQuery->slot, pQuery->commitPoint, pQuery->firstSlot,
-          pQuery->currentSlot);
-    }
-
-    pNewBlock->numOfPoints = numOfPoints;
-
-    // current block are all commit already, ignore it
-    if (pNewBlock->numOfPoints == 0) {
-      dTrace(
-          "%p ignore current in cache block that are all commit already, numOfblock:%d slot:%d"
-          "first:%d last:%d",
-          GET_QINFO_ADDR(pQuery), pQuery->numOfBlocks, pQuery->slot, pQuery->firstSlot, pQuery->currentSlot);
-      return NULL;
-    }
-  }
-
-  // keep the data from in cache into the temporarily allocated buffer
-  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    SColumnInfoEx *pColumnInfoEx = &pQuery->colList[i];
-
-    int16_t columnIndex = pColumnInfoEx->colIdx;
-    int16_t columnIndexInBuf = pColumnInfoEx->colIdxInBuf;
-
-    SColumn *pCol = &pMeterObj->schema[columnIndex];
-
-    int16_t bytes = pCol->bytes;
-    int16_t type = pCol->type;
-
-    char *dst = pRuntimeEnv->colDataBuffer[columnIndexInBuf]->data;
-
-    if (pQuery->colList[i].colIdx != -1) {
-      assert(pCol->colId == pQuery->colList[i].data.colId && bytes == pColumnInfoEx->data.bytes &&
-             type == pColumnInfoEx->data.type);
-
-      memcpy(dst, pBlock->offset[columnIndex] + offset * bytes, numOfPoints * bytes);
-    } else {
-      setNullN(dst, type, bytes, numOfPoints);
-    }
-  }
-
-  assert(numOfPoints == pNewBlock->numOfPoints);
-
-  // if the primary timestamp are not loaded by default, always load it here into buffer
-  if (!PRIMARY_TSCOL_LOADED(pQuery)) {
-    memcpy(pRuntimeEnv->primaryColBuffer->data, pBlock->offset[0] + offset * TSDB_KEYSIZE, TSDB_KEYSIZE * numOfPoints);
-  }
-
-  pQuery->fileId = -1;
-  pQuery->slot = slot;
-
-  if (!isCacheBlockValid(pQuery, pNewBlock, pMeterObj)) {
-    return NULL;
-  }
-
-  /*
-   * the accessed cache block still belongs to current meterObj, go on
-   * update the load data block info
-   */
-  vnodeSetDataBlockInfoLoaded(pRuntimeEnv, pMeterObj, -1, true);
-
-  TSKEY skey = getTimestampInCacheBlock(pRuntimeEnv, pNewBlock, 0);
-  TSKEY ekey = getTimestampInCacheBlock(pRuntimeEnv, pNewBlock, numOfPoints - 1);
-
-  dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d, load cache block, ts:%d, slot:%d, brange:%lld-%lld, rows:%d",
-         GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, 1, pQuery->slot,
-         skey, ekey, numOfPoints);
-
-  return pNewBlock;
-}
-
-static SCompBlock *getDiskDataBlock(SQuery *pQuery, int32_t slot) {
-  assert(pQuery->fileId >= 0 && slot >= 0 && slot < pQuery->numOfBlocks && pQuery->pBlock != NULL);
-  return &pQuery->pBlock[slot];
-}
-
-static void *getGenericDataBlock(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntimeEnv, int32_t slot) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  if (IS_DISK_DATA_BLOCK(pQuery)) {
-    return getDiskDataBlock(pQuery, slot);
-  } else {
-    return getCacheDataBlock(pMeterObj, pRuntimeEnv, slot);
-  }
-}
-
-static int32_t getFileIdFromKey(int32_t vid, TSKEY key) {
-  SVnodeObj *pVnode = &vnodeList[vid];
-  int64_t    delta = (int64_t)pVnode->cfg.daysPerFile * tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-
-  return (int32_t)(key / delta);  // set the starting fileId
-}
-
-enum {
-  QUERY_RANGE_LESS_EQUAL = 0,
-  QUERY_RANGE_GREATER_EQUAL = 1,
-};
-
-static bool getQualifiedDataBlock(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntimeEnv, int32_t type,
-                                  __block_search_fn_t searchFn) {
-  int32_t blkIdx = -1;
-  int32_t fid = -1;
-  int32_t step = (type == QUERY_RANGE_GREATER_EQUAL) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP;
-
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  pQuery->slot = -1;
-
-  TSKEY key = pQuery->lastKey;
-
-  SData *primaryColBuffer = pRuntimeEnv->primaryColBuffer;
-  pQuery->fileId = getFileIdFromKey(pMeterObj->vnode, key) - step;
-
-  while (1) {
-    if ((fid = getNextDataFileCompInfo(pRuntimeEnv, pMeterObj, step)) < 0) {
-      break;
-    }
-
-    blkIdx = binarySearchForBlock(pQuery, key);
-
-    if (type == QUERY_RANGE_GREATER_EQUAL) {
-      if (key <= pQuery->pBlock[blkIdx].keyLast) {
-        break;
-      } else {
-        blkIdx = -1;
-      }
-    } else {
-      if (key >= pQuery->pBlock[blkIdx].keyFirst) {
-        break;
-      } else {
-        blkIdx = -1;
-      }
-    }
-  }
-
-  /* failed to find qualified point in file, abort */
-  if (blkIdx == -1) {
-    return false;
-  }
-
-  assert(blkIdx >= 0 && blkIdx < pQuery->numOfBlocks);
-
-  // load first data block into memory failed, caused by disk block error
-  bool blockLoaded = false;
-  while (blkIdx < pQuery->numOfBlocks && blkIdx >= 0) {
-    pQuery->slot = blkIdx;
-    if (loadDataBlockIntoMem(&pQuery->pBlock[pQuery->slot], &pQuery->pFields[pQuery->slot], pRuntimeEnv, fid, true,
-                             true) == 0) {
-      SET_DATA_BLOCK_LOADED(pRuntimeEnv->blockStatus);
-      blockLoaded = true;
-      break;
-    }
-
-    dError("QInfo:%p fileId:%d total numOfBlks:%d blockId:%d load into memory failed due to error in disk files",
-           GET_QINFO_ADDR(pQuery), pQuery->fileId, pQuery->numOfBlocks, blkIdx);
-    blkIdx += step;
-  }
-
-  // failed to load data from disk, abort current query
-  if (blockLoaded == false) {
-    return false;
-  }
-
-  SCompBlock *pBlocks = getDiskDataBlock(pQuery, blkIdx);
-
-  // search qualified points in blk, according to primary key (timestamp) column
-  pQuery->pos = searchFn(primaryColBuffer->data, pBlocks->numOfPoints, key, pQuery->order.order);
-  assert(pQuery->pos >= 0 && pQuery->fileId >= 0 && pQuery->slot >= 0);
-
-  return true;
-}
-
-static SField *getFieldInfo(SQuery *pQuery, SBlockInfo *pBlockInfo, SField *pFields, int32_t column) {
-  // no SField info exist, or column index larger than the output column, no result.
-  if (pFields == NULL || column >= pQuery->numOfOutputCols) {
-    return NULL;
-  }
-
-  SColIndexEx *pColIndexEx = &pQuery->pSelectExpr[column].pBase.colInfo;
-
-  // for a tag column, no corresponding field info
-  if (TSDB_COL_IS_TAG(pColIndexEx->flag)) {
-    return NULL;
-  }
-
-  /*
-   * Choose the right column field info by field id, since the file block may be out of date,
-   * which means the newest table schema is not equalled to the schema of this block.
-   */
-  for (int32_t i = 0; i < pBlockInfo->numOfCols; ++i) {
-    if (pColIndexEx->colId == pFields[i].colId) {
-      return &pFields[i];
-    }
-  }
-
-  return NULL;
-}
-
-/*
- * not null data in two cases:
- * 1. tags data: isTag == true;
- * 2. data locate in file, numOfNullPoints == 0 or pFields does not needed to be loaded
- */
-static bool hasNullVal(SQuery *pQuery, int32_t col, SBlockInfo *pBlockInfo, SField *pFields, bool isDiskFileBlock) {
-  bool ret = true;
-
-  if (TSDB_COL_IS_TAG(pQuery->pSelectExpr[col].pBase.colInfo.flag)) {
-    ret = false;
-  } else if (isDiskFileBlock) {
-    if (pFields == NULL) {
-      ret = false;
-    } else {
-      SField *pField = getFieldInfo(pQuery, pBlockInfo, pFields, col);
-      if (pField != NULL && pField->numOfNullPoints == 0) {
-        ret = false;
-      }
-    }
-  }
-
-  return ret;
-}
-
-static char *doGetDataBlocks(SQuery *pQuery, SData **data, int32_t colIdx) {
-  assert(colIdx >= 0 && colIdx < pQuery->numOfCols);
-  char *pData = data[colIdx]->data;
-  return pData;
-}
-
-static char *getDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int32_t col, int32_t size) {
-  SQuery *        pQuery = pRuntimeEnv->pQuery;
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-
-  char *dataBlock = NULL;
-
-  int32_t functionId = pQuery->pSelectExpr[col].pBase.functionId;
-
-  if (functionId == TSDB_FUNC_ARITHM) {
-    sas->pExpr = &pQuery->pSelectExpr[col];
-
-    // set the start offset to be the lowest start position, no matter asc/desc query order
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      pCtx->startOffset = pQuery->pos;
-    } else {
-      pCtx->startOffset = pQuery->pos - (size - 1);
-    }
-
-    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-      SColumnInfo *pColMsg = &pQuery->colList[i].data;
-      char *       pData = doGetDataBlocks(pQuery, pRuntimeEnv->colDataBuffer, pQuery->colList[i].colIdxInBuf);
-
-      sas->elemSize[i] = pColMsg->bytes;
-      sas->data[i] = pData + pCtx->startOffset * sas->elemSize[i];  // start from the offset
-    }
-
-    sas->numOfCols = pQuery->numOfCols;
-    sas->offset = 0;
-  } else {  // other type of query function
-    SColIndexEx *pCol = &pQuery->pSelectExpr[col].pBase.colInfo;
-    if (TSDB_COL_IS_TAG(pCol->flag)) {
-      dataBlock = NULL;
-    } else {
-      /*
-       *  the colIdx is acquired from the first meter of all qualified meters in this vnode during query prepare stage,
-       *  the remain meter may not have the required column in cache actually.
-       *  So, the validation of required column in cache with the corresponding meter schema is reinforced.
-       */
-      dataBlock = doGetDataBlocks(pQuery, pRuntimeEnv->colDataBuffer, pCol->colIdxInBuf);
-    }
-  }
-
-  return dataBlock;
-}
-
-/**
- *
- * @param pRuntimeEnv
- * @param forwardStep
- * @param primaryKeyCol
- * @param pFields
- * @param isDiskFileBlock
- * @return                  the incremental number of output value, so it maybe 0 for fixed number of query,
- *                          such as count/min/max etc.
- */
-static int32_t blockwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t forwardStep, TSKEY *primaryKeyCol,
-                                          SField *pFields, SBlockInfo *pBlockInfo) {
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-  SQuery *        pQuery = pRuntimeEnv->pQuery;
-
-  bool    isDiskFileBlock = IS_FILE_BLOCK(pRuntimeEnv->blockStatus);
-  int64_t prevNumOfRes = getNumOfResult(pRuntimeEnv);
-
-  SArithmeticSupport *sasArray = calloc((size_t)pQuery->numOfOutputCols, sizeof(SArithmeticSupport));
-
-  for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-
-    SField dummyField = {0};
-
-    bool  hasNull = hasNullVal(pQuery, k, pBlockInfo, pFields, isDiskFileBlock);
-    char *dataBlock = getDataBlocks(pRuntimeEnv, &sasArray[k], k, forwardStep);
-
-    SField *tpField = NULL;
-
-    if (pFields != NULL) {
-      tpField = getFieldInfo(pQuery, pBlockInfo, pFields, k);
-      /*
-       * Field info not exist, the required column is not present in current block,
-       * so all data must be null value in current block.
-       */
-      if (tpField == NULL) {
-        tpField = &dummyField;
-        tpField->numOfNullPoints = (int32_t)forwardStep;
-      }
-    }
-
-    TSKEY ts = QUERY_IS_ASC_QUERY(pQuery) ? pRuntimeEnv->intervalWindow.skey : pRuntimeEnv->intervalWindow.ekey;
-    setExecParams(pQuery, &pCtx[k], ts, dataBlock, (char *)primaryKeyCol, forwardStep, functionId, tpField, hasNull,
-                  pRuntimeEnv->blockStatus, &sasArray[k], pRuntimeEnv->scanFlag);
-  }
-
-  /*
-   * the sqlfunctionCtx parameters should be set done before all functions are invoked,
-   * since the selectivity + tag_prj query needs all parameters been set done.
-   * tag_prj function are changed to be TSDB_FUNC_TAG_DUMMY
-   */
-  for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-    if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
-      aAggs[functionId].xFunction(&pCtx[k]);
-    }
-  }
-
-  int64_t numOfIncrementRes = getNumOfResult(pRuntimeEnv) - prevNumOfRes;
-  validateTimestampForSupplementResult(pRuntimeEnv, numOfIncrementRes);
-
-  tfree(sasArray);
-
-  return (int32_t)numOfIncrementRes;
-}
-
-/**
- * if sfields is null
- * 1. count(*)/spread(ts) is invoked
- * 2. this column does not exists
- *
- * first filter the data block according to the value filter condition, then, if the top/bottom query applied,
- * invoke the filter function to decide if the data block need to be accessed or not.
- * TODO handle the whole data block is NULL situation
- * @param pQuery
- * @param pField
- * @return
- */
-static bool needToLoadDataBlock(SQuery *pQuery, SField *pField, SQLFunctionCtx *pCtx, int32_t numOfTotalPoints) {
-  if (pField == NULL) {
-    return false;  // no need to load data
-  }
-
-  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
-    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
-    int32_t                  colIndex = pFilterInfo->info.colIdx;
-
-    // this column not valid in current data block
-    if (colIndex < 0 || pField[colIndex].colId != pFilterInfo->info.data.colId) {
-      continue;
-    }
-
-    // not support pre-filter operation on binary/nchar data type
-    if (!vnodeSupportPrefilter(pFilterInfo->info.data.type)) {
-      continue;
-    }
-
-    // all points in current column are NULL, no need to check its boundary value
-    if (pField[colIndex].numOfNullPoints == numOfTotalPoints) {
-      continue;
-    }
-
-    if (pFilterInfo->info.data.type == TSDB_DATA_TYPE_FLOAT) {
-      float minval = *(double *)(&pField[colIndex].min);
-      float maxval = *(double *)(&pField[colIndex].max);
-
-      for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
-        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&minval, (char *)&maxval)) {
-          return true;
-        }
-      }
-    } else {
-      for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
-        if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&pField[colIndex].min,
-                                        (char *)&pField[colIndex].max)) {
-          return true;
-        }
-      }
-    }
-  }
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functId == TSDB_FUNC_TOP || functId == TSDB_FUNC_BOTTOM) {
-      return top_bot_datablock_filter(&pCtx[i], functId, (char *)&pField[i].min, (char *)&pField[i].max);
-    }
-  }
-
-  return true;
-}
-
-static SOutputRes *doSetSlidingWindowFromKey(SSlidingWindowInfo *pSlidingWindowInfo, char *pData, int16_t bytes,
-                                SWindowStatus **pStatus) {
-  int32_t p = -1;
-
-  int32_t *p1 = (int32_t *)taosGetDataFromHash(pSlidingWindowInfo->hashList, pData, bytes);
-  if (p1 != NULL) {
-    p = *p1;
-
-    pSlidingWindowInfo->curIndex = p;
-    if (pStatus != NULL) {
-      *pStatus = &pSlidingWindowInfo->pStatus[p];
-    }
-  } else {  // more than the capacity, reallocate the resources
-    if (pSlidingWindowInfo->size >= pSlidingWindowInfo->capacity) {
-      int64_t newCap = pSlidingWindowInfo->capacity * 2;
-
-      char *t = realloc(pSlidingWindowInfo->pStatus, newCap * sizeof(SWindowStatus));
-      if (t != NULL) {
-        pSlidingWindowInfo->pStatus = (SWindowStatus *)t;
-        memset(&pSlidingWindowInfo->pStatus[pSlidingWindowInfo->capacity], 0, sizeof(SWindowStatus) * pSlidingWindowInfo->capacity);
-      } else {
-        // todo
-      }
-
-      pSlidingWindowInfo->capacity = newCap;
-    }
-
-    // add a new result set for a new group
-    if (pStatus != NULL) {
-      *pStatus = &pSlidingWindowInfo->pStatus[pSlidingWindowInfo->size];
-    }
-
-    p = pSlidingWindowInfo->size;
-    pSlidingWindowInfo->curIndex = pSlidingWindowInfo->size;
-
-    pSlidingWindowInfo->size += 1;
-    taosAddToHashTable(pSlidingWindowInfo->hashList, pData, bytes, (char *)&pSlidingWindowInfo->curIndex, sizeof(int32_t));
-  }
-
-  return &pSlidingWindowInfo->pResult[p];
-}
-
-static int32_t initSlidingWindowInfo(SSlidingWindowInfo *pSlidingWindowInfo, int32_t threshold, int16_t type,
-                                 SOutputRes *pRes) {
-  pSlidingWindowInfo->capacity = threshold;
-  pSlidingWindowInfo->threshold = threshold;
-
-  pSlidingWindowInfo->type = type;
-
-  _hash_fn_t fn = taosGetDefaultHashFunction(type);
-  pSlidingWindowInfo->hashList = taosInitHashTable(threshold, fn, false);
-
-  pSlidingWindowInfo->curIndex = -1;
-  pSlidingWindowInfo->size = 0;
-  pSlidingWindowInfo->pResult = pRes;
-  pSlidingWindowInfo->pStatus = calloc(threshold, sizeof(SWindowStatus));
-
-  if (pSlidingWindowInfo->pStatus == NULL || pSlidingWindowInfo->hashList == NULL) {
-    return -1;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static void destroySlidingWindowInfo(SSlidingWindowInfo *pSlidingWindowInfo) {
-  if (pSlidingWindowInfo == NULL || pSlidingWindowInfo->capacity == 0) {
-    assert(pSlidingWindowInfo->hashList == NULL && pSlidingWindowInfo->pResult == NULL);
-    return;
-  }
-
-  taosCleanUpHashTable(pSlidingWindowInfo->hashList);
-  tfree(pSlidingWindowInfo->pStatus);
-}
-
-void resetSlidingWindowInfo(SSlidingWindowInfo *pSlidingWindowInfo, int32_t numOfCols) {
-  if (pSlidingWindowInfo == NULL || pSlidingWindowInfo->capacity == 0) {
-    return;
-  }
-
-  for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-    SOutputRes *pOneRes = &pSlidingWindowInfo->pResult[i];
-    clearGroupResultBuf(pOneRes, numOfCols);
-  }
-
-  memset(pSlidingWindowInfo->pStatus, 0, sizeof(SWindowStatus) * pSlidingWindowInfo->capacity);
-
-  pSlidingWindowInfo->curIndex = -1;
-  taosCleanUpHashTable(pSlidingWindowInfo->hashList);
-  pSlidingWindowInfo->size = 0;
-
-  _hash_fn_t fn = taosGetDefaultHashFunction(pSlidingWindowInfo->type);
-  pSlidingWindowInfo->hashList = taosInitHashTable(pSlidingWindowInfo->capacity, fn, false);
-
-  pSlidingWindowInfo->startTime = 0;
-  pSlidingWindowInfo->prevSKey = 0;
-}
-
-void clearCompletedSlidingWindows(SSlidingWindowInfo *pSlidingWindowInfo, int32_t numOfCols) {
-  if (pSlidingWindowInfo == NULL || pSlidingWindowInfo->capacity == 0 || pSlidingWindowInfo->size == 0) {
-    return;
-  }
-
-  int32_t i = 0;
-  for (i = 0; i < pSlidingWindowInfo->size; ++i) {
-    SWindowStatus *pStatus = &pSlidingWindowInfo->pStatus[i];
-    if (pStatus->closed) {  // remove the window slot from hash table
-      taosDeleteFromHashTable(pSlidingWindowInfo->hashList, (const char *)&pStatus->window.skey, TSDB_KEYSIZE);
-    } else {
-      break;
-    }
-  }
-
-  if (i == 0) {
-    return;
-  }
-
-  int32_t remain = pSlidingWindowInfo->size - i;
-  //clear remain list
-  memmove(pSlidingWindowInfo->pStatus, &pSlidingWindowInfo->pStatus[i], remain * sizeof(SWindowStatus));
-  memset(&pSlidingWindowInfo->pStatus[remain], 0, (pSlidingWindowInfo->capacity - remain) * sizeof(SWindowStatus));
-  
-  for(int32_t k = 0; k < remain; ++k) {
-    copyGroupResultBuf(&pSlidingWindowInfo->pResult[k], &pSlidingWindowInfo->pResult[i + k], numOfCols);
-  }
-  
-  for(int32_t k = remain; k < pSlidingWindowInfo->size; ++k) {
-    SOutputRes *pOneRes = &pSlidingWindowInfo->pResult[k];
-    clearGroupResultBuf(pOneRes, numOfCols);
-  }
-
-  pSlidingWindowInfo->size = remain;
-
-  for(int32_t k = 0; k < pSlidingWindowInfo->size; ++k) {
-    SWindowStatus* pStatus = &pSlidingWindowInfo->pStatus[k];
-    int32_t *p = (int32_t*) taosGetDataFromHash(pSlidingWindowInfo->hashList, (const char*)&pStatus->window.skey, TSDB_KEYSIZE);
-    int32_t v = *p;
-    v = (v - i);
-  
-    taosDeleteFromHashTable(pSlidingWindowInfo->hashList, (const char *)&pStatus->window.skey, TSDB_KEYSIZE);
-  
-    taosAddToHashTable(pSlidingWindowInfo->hashList, (const char*)&pStatus->window.skey, TSDB_KEYSIZE,
-        (char *)&v, sizeof(int32_t));
-  }
-  
-  pSlidingWindowInfo->curIndex = -1;
-}
-
-int32_t numOfClosedSlidingWindow(SSlidingWindowInfo *pSlidingWindowInfo) {
-  for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-    SWindowStatus *pStatus = &pSlidingWindowInfo->pStatus[i];
-    if (pStatus->closed == false) {
-      return i;
-    }
-  }
-  
-  return 0;
-}
-
-void closeSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot) {
-  assert(slot >= 0 && slot < pSlidingWindowInfo->size);
-  SWindowStatus* pStatus = &pSlidingWindowInfo->pStatus[slot];
-  pStatus->closed = true;
-}
-
-void closeAllSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo) {
-  assert(pSlidingWindowInfo->size >=0 && pSlidingWindowInfo->capacity >= pSlidingWindowInfo->size);
-  
-  for(int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-    SWindowStatus* pStatus = &pSlidingWindowInfo->pStatus[i];
-    pStatus->closed = true;
-  }
-}
-
-static SWindowStatus* getSlidingWindowStatus(SSlidingWindowInfo *pSlidingWindowInfo, int32_t slot) {
-  return &pSlidingWindowInfo->pStatus[slot];
-}
-
-static bool slidingWindowClosed(SSlidingWindowInfo* pSlidingWindowInfo, int32_t slot) {
-  return (pSlidingWindowInfo->pStatus[slot].closed == true);
-}
-
-static int32_t curSlidingWindow(SSlidingWindowInfo *pSlidingWindowInfo) {
-  assert(pSlidingWindowInfo->curIndex >= 0 && pSlidingWindowInfo->curIndex < pSlidingWindowInfo->size);
-  
-  return pSlidingWindowInfo->curIndex;
-}
-
-// get the correct sliding window according to the handled timestamp
-static STimeWindow getActiveSlidingWindow(SSlidingWindowInfo* pSlidingWindowInfo, int64_t ts, SQuery* pQuery) {
-  STimeWindow w = {0};
-  
-  if (pSlidingWindowInfo->curIndex == -1) { // the first window, from the prevous stored value
-    w.skey = pSlidingWindowInfo->prevSKey;
-    w.ekey = w.skey + pQuery->nAggTimeInterval - 1;
-    
-  } else {
-    SWindowStatus* pStatus = getSlidingWindowStatus(pSlidingWindowInfo, curSlidingWindow(pSlidingWindowInfo));
-    
-    if (pStatus->window.skey <= ts && pStatus->window.ekey >= ts) {
-      w = pStatus->window;
-    } else {
-      int64_t st = pStatus->window.skey;
-      
-      while (st > ts) {
-        st -= pQuery->slidingTime;
-      }
-      
-      while ((st + pQuery->nAggTimeInterval - 1) < ts) {
-        st += pQuery->slidingTime;
-      }
-  
-      w.skey = st;
-      w.ekey = w.skey + pQuery->nAggTimeInterval - 1;
-    }
-  }
-  
-  assert(ts >= w.skey && ts <= w.ekey);
-  return w;
-}
-
-static int32_t setGroupResultFromKey(SQueryRuntimeEnv *pRuntimeEnv, char *pData, int16_t type, int16_t bytes) {
-  if (isNull(pData, type)) {  // ignore the null value
-    return -1;
-  }
-
-  SOutputRes *pOutputRes = doSetSlidingWindowFromKey(&pRuntimeEnv->swindowResInfo, pData, bytes, NULL);
-  if (pOutputRes == NULL) {
-    return -1;
-  }
-
-  setGroupOutputBuffer(pRuntimeEnv, pOutputRes);
-  initCtxOutputBuf(pRuntimeEnv);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t setSlidingWindowFromKey(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow *pTimeWindow) {
-  assert(pTimeWindow->skey < pTimeWindow->ekey);
-  
-  int64_t st = pTimeWindow->skey;
- 
-  SWindowStatus *pStatus = NULL;
-  SOutputRes*   pOutputRes = doSetSlidingWindowFromKey(&pRuntimeEnv->swindowResInfo, (char *)&st, TSDB_KEYSIZE,
-      &pStatus);
-  
-  if (pOutputRes == NULL) {
-    return -1;
-  }
-
-  pStatus->window = *pTimeWindow;
-  setGroupOutputBuffer(pRuntimeEnv, pOutputRes);
-  initCtxOutputBuf(pRuntimeEnv);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static char *getGroupbyColumnData(SQuery *pQuery, SData **data, int16_t *type, int16_t *bytes) {
-  char *groupbyColumnData = NULL;
-
-  SSqlGroupbyExpr *pGroupbyExpr = pQuery->pGroupbyExpr;
-
-  for (int32_t k = 0; k < pGroupbyExpr->numOfGroupCols; ++k) {
-    if (pGroupbyExpr->columnInfo[k].flag == TSDB_COL_TAG) {
-      continue;
-    }
-
-    int16_t colIndex = -1;
-    int32_t colId = pGroupbyExpr->columnInfo[k].colId;
-
-    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-      if (pQuery->colList[i].data.colId == colId) {
-        colIndex = i;
-        break;
-      }
-    }
-
-    assert(colIndex >= 0 && colIndex < pQuery->numOfCols);
-
-    *type = pQuery->colList[colIndex].data.type;
-    *bytes = pQuery->colList[colIndex].data.bytes;
-
-    groupbyColumnData = doGetDataBlocks(pQuery, data, pQuery->colList[colIndex].colIdxInBuf);
-    break;
-  }
-
-  return groupbyColumnData;
-}
-
-static int32_t doTSJoinFilter(SQueryRuntimeEnv *pRuntimeEnv, int32_t offset) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  STSElem         elem = tsBufGetElem(pRuntimeEnv->pTSBuf);
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-
-  // compare tag first
-  if (pCtx[0].tag.i64Key != elem.tag) {
-    return TS_JOIN_TAG_NOT_EQUALS;
-  }
-
-  TSKEY key = *(TSKEY *)(pCtx[0].aInputElemBuf + TSDB_KEYSIZE * offset);
-
-#if defined(_DEBUG_VIEW)
-  printf("elem in comp ts file:%" PRId64 ", key:%" PRId64
-         ", tag:%d, id:%s, query order:%d, ts order:%d, traverse:%d, index:%d\n",
-         elem.ts, key, elem.tag, pRuntimeEnv->pMeterObj->meterId, pQuery->order.order, pRuntimeEnv->pTSBuf->tsOrder,
-         pRuntimeEnv->pTSBuf->cur.order, pRuntimeEnv->pTSBuf->cur.tsIndex);
-#endif
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    if (key < elem.ts) {
-      return TS_JOIN_TS_NOT_EQUALS;
-    } else if (key > elem.ts) {
-      assert(false);
-    }
-  } else {
-    if (key > elem.ts) {
-      return TS_JOIN_TS_NOT_EQUALS;
-    } else if (key < elem.ts) {
-      assert(false);
-    }
-  }
-
-  return TS_JOIN_TS_EQUAL;
-}
-
-static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t functionId) {
-  SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-
-  if (pResInfo->complete || functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TS_DUMMY) {
-    return false;
-  }
-
-  // in the supplementary scan, only the following functions need to be executed
-  if (!IS_MASTER_SCAN(pRuntimeEnv) &&
-      !(functionId == TSDB_FUNC_LAST_DST || functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_FIRST ||
-        functionId == TSDB_FUNC_LAST || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TS)) {
-    return false;
-  }
-
-  return true;
-}
-
-static int32_t rowwiseApplyAllFunctions(SQueryRuntimeEnv *pRuntimeEnv, int32_t *forwardStep, TSKEY *primaryKeyCol,
-                                        SField *pFields, SBlockInfo *pBlockInfo) {
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-  SQuery *        pQuery = pRuntimeEnv->pQuery;
-
-  bool    isDiskFileBlock = IS_FILE_BLOCK(pRuntimeEnv->blockStatus);
-  SData **data = pRuntimeEnv->colDataBuffer;
-
-  int64_t prevNumOfRes = 0;
-  bool    groupbyStateValue = isGroupbyNormalCol(pQuery->pGroupbyExpr);
-
-  if (!groupbyStateValue) {
-    prevNumOfRes = getNumOfResult(pRuntimeEnv);
-  }
-
-  SArithmeticSupport *sasArray = calloc((size_t)pQuery->numOfOutputCols, sizeof(SArithmeticSupport));
-
-  int16_t type = 0;
-  int16_t bytes = 0;
-
-  char *groupbyColumnData = NULL;
-  if (groupbyStateValue) {
-    groupbyColumnData = getGroupbyColumnData(pQuery, data, &type, &bytes);
-  }
-
-  for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-
-    bool  hasNull = hasNullVal(pQuery, k, pBlockInfo, pFields, isDiskFileBlock);
-    char *dataBlock = getDataBlocks(pRuntimeEnv, &sasArray[k], k, *forwardStep);
-
-    TSKEY ts = QUERY_IS_ASC_QUERY(pQuery) ? pRuntimeEnv->intervalWindow.skey : pRuntimeEnv->intervalWindow.ekey;
-    setExecParams(pQuery, &pCtx[k], ts, dataBlock, (char *)primaryKeyCol, (*forwardStep), functionId, pFields, hasNull,
-                  pRuntimeEnv->blockStatus, &sasArray[k], pRuntimeEnv->scanFlag);
-  }
-
-  // set the input column data
-  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
-    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
-    /*
-     * NOTE: here the tbname/tags column cannot reach here, since it will never be a filter column,
-     * so we do NOT check if is a tag or not
-     */
-    pFilterInfo->pData = doGetDataBlocks(pQuery, data, pFilterInfo->info.colIdxInBuf);
-  }
-
-  int32_t numOfRes = 0;
-  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  // from top to bottom in desc
-  // from bottom to top in asc order
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-    qTrace("QInfo:%p process data rows, numOfRows:%d, query order:%d, ts comp order:%d", pQInfo, *forwardStep,
-           pQuery->order.order, pRuntimeEnv->pTSBuf->cur.order);
-  }
-
-  int32_t j = 0;
-  int64_t lastKey = 0;
-  
-  for (j = 0; j < (*forwardStep); ++j) {
-    int32_t offset = GET_COL_DATA_POS(pQuery, j, step);
-
-    if (pRuntimeEnv->pTSBuf != NULL) {
-      int32_t r = doTSJoinFilter(pRuntimeEnv, offset);
-
-      if (r == TS_JOIN_TAG_NOT_EQUALS) {
-        break;
-      } else if (r == TS_JOIN_TS_NOT_EQUALS) {
-        continue;
-      } else {
-        assert(r == TS_JOIN_TS_EQUAL);
-      }
-    }
-
-    if (pQuery->numOfFilterCols > 0 && (!vnodeDoFilterData(pQuery, offset))) {
-      continue;
-    }
-
-    // sliding window query
-    if (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0) {
-      // decide the time window according to the primary timestamp
-      int64_t ts = primaryKeyCol[offset];
-      
-      SSlidingWindowInfo* pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-      STimeWindow win = getActiveSlidingWindow(pSlidingWindowInfo, ts, pQuery);
-
-      int32_t ret = setSlidingWindowFromKey(pRuntimeEnv, &win);
-      if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-        continue;
-      }
-
-      // all startOffset are identical
-      offset -= pCtx[0].startOffset;
-
-      for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-        int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-        pCtx[k].nStartQueryTimestamp = win.skey;
-        
-        SWindowStatus* pStatus = getSlidingWindowStatus(pSlidingWindowInfo, curSlidingWindow(pSlidingWindowInfo));
-        
-        if (!IS_MASTER_SCAN(pRuntimeEnv) && !pStatus->closed) {
-//          qTrace("QInfo:%p not completed in supplementary scan, ignore funcId:%d, window:%lld-%lld",
-//              GET_QINFO_ADDR(pQuery), functionId, pStatus->window.skey, pStatus->window.ekey);
-          continue;
-        }
-        
-        if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
-          aAggs[functionId].xFunctionF(&pCtx[k], offset);
-        }
-      }
-
-      lastKey = ts;
-      int32_t index = pRuntimeEnv->swindowResInfo.curIndex;
-      
-      STimeWindow nextWin = win;
-      while (1) {
-        getNextLogicalQueryRange(pRuntimeEnv, &nextWin);
-        if (pSlidingWindowInfo->startTime > nextWin.skey || (nextWin.skey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (nextWin.skey > pQuery->skey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          pRuntimeEnv->swindowResInfo.curIndex = index;
-          break;
-        }
-
-        if (ts >= nextWin.skey && ts <= nextWin.ekey) {
-            // null data, failed to allocate more memory buffer
-          if (setSlidingWindowFromKey(pRuntimeEnv, &nextWin) != TSDB_CODE_SUCCESS) {
-            pRuntimeEnv->swindowResInfo.curIndex = index;
-            break;
-          }
-
-          for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-            int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-            pCtx[k].nStartQueryTimestamp = nextWin.skey;
-  
-            SWindowStatus* pStatus = getSlidingWindowStatus(pSlidingWindowInfo, curSlidingWindow(pSlidingWindowInfo));
-            if (!IS_MASTER_SCAN(pRuntimeEnv) && !pStatus->closed) {
-//              qTrace("QInfo:%p not completed in supplementary scan, ignore funcId:%d, window:%lld-%lld",
-//                     GET_QINFO_ADDR(pQuery), functionId, pStatus->window.skey, pStatus->window.ekey);
-              continue;
-            }
-            
-            if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
-              aAggs[functionId].xFunctionF(&pCtx[k], offset);
-            }
-          }
-        } else {
-          pRuntimeEnv->swindowResInfo.curIndex = index;
-          break;
-        }
-      }
-    } else {  // other queries
-      // decide which group this rows belongs to according to current state value
-      if (groupbyStateValue) {
-        char *stateVal = groupbyColumnData + bytes * offset;
-
-        int32_t ret = setGroupResultFromKey(pRuntimeEnv, stateVal, type, bytes);
-        if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-          continue;
-        }
-      }
-
-      // all startOffset are identical
-      offset -= pCtx[0].startOffset;
-
-      for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-        int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
-        if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
-          aAggs[functionId].xFunctionF(&pCtx[k], offset);
-        }
-      }
-    }
-
-    if (pRuntimeEnv->pTSBuf != NULL) {
-      // if timestamp filter list is empty, quit current query
-      if (!tsBufNextPos(pRuntimeEnv->pTSBuf)) {
-        setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-        break;
-      }
-    }
-
-    /*
-     * pointsOffset is the maximum available space in result buffer update the actual forward step for query that
-     * requires checking buffer during loop
-     */
-    if ((pQuery->checkBufferInLoop == 1) && (++numOfRes) >= pQuery->pointsOffset) {
-      pQuery->lastKey = primaryKeyCol[pQuery->pos + j * step] + step;
-      *forwardStep = j + 1;
-      break;
-    }
-  }
-
-  free(sasArray);
-
-  if (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0 && IS_MASTER_SCAN(pRuntimeEnv)) {
-    SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-
-    // query completed
-    if ((lastKey >= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (lastKey <= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-      closeAllSlidingWindow(pSlidingWindowInfo);
-      
-      pSlidingWindowInfo->curIndex = pSlidingWindowInfo->size - 1;
-      setQueryStatus(pQuery, QUERY_COMPLETED | QUERY_RESBUF_FULL);
-    } else {
-      int32_t i = 0;
-      int64_t skey = 0;
-
-      for (i = 0; i < pSlidingWindowInfo->size; ++i) {
-        SWindowStatus *pStatus = &pSlidingWindowInfo->pStatus[i];
-        if ((pStatus->window.ekey <= lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (pStatus->window.skey >= lastKey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          closeSlidingWindow(pSlidingWindowInfo, i);
-        } else {
-          skey = pStatus->window.skey;
-          break;
-        }
-      }
-
-      pSlidingWindowInfo->prevSKey = skey;
-      
-      // the number of completed slots are larger than the threshold, dump to client immediately.
-      int32_t v = numOfClosedSlidingWindow(pSlidingWindowInfo);
-      if (v > pSlidingWindowInfo->threshold) {
-        setQueryStatus(pQuery, QUERY_RESBUF_FULL);
-      }
-      
-      dTrace("QInfo:%p total window:%d, closed:%d", GET_QINFO_ADDR(pQuery), pSlidingWindowInfo->size, v);
-    }
-  }
-
-  /*
-   * No need to calculate the number of output results for groupby normal columns
-   * because the results of group by normal column is put into intermediate buffer.
-   */
-  int32_t num = 0;
-  if (!groupbyStateValue && !(pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    num = getNumOfResult(pRuntimeEnv) - prevNumOfRes;
-  }
-
-  return num;
-}
-
-static int32_t getForwardStepsInBlock(int32_t numOfPoints, __block_search_fn_t searchFn, SQuery *pQuery,
-                                      int64_t *pData) {
-  int32_t endPos = searchFn((char *)pData, numOfPoints, pQuery->ekey, pQuery->order.order);
-  int32_t forwardStep = 0;
-
-  if (endPos >= 0) {
-    forwardStep = QUERY_IS_ASC_QUERY(pQuery) ? (endPos - pQuery->pos) : (pQuery->pos - endPos);
-    assert(forwardStep >= 0);
-
-    // endPos data is equalled to the key so, we do need to read the element in endPos
-    if (pData[endPos] == pQuery->ekey) {
-      forwardStep += 1;
-    }
-  }
-  return forwardStep;
-}
-
-static int32_t reviseForwardSteps(SQueryRuntimeEnv *pRuntimeEnv, int32_t forwardStep) {
-  /*
-   * 1. If value filter exists, we try all data in current block, and do not set the QUERY_RESBUF_FULL flag.
-   *
-   * 2. In case of top/bottom/ts_comp query, the checkBufferInLoop == 1 and pQuery->numOfFilterCols
-   * may be 0 or not. We do not check the capacity of output buffer, since the filter function will do it.
-   *
-   * 3. In handling the query of secondary query of join, tsBuf servers as a ts filter.
-   */
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  if (isTopBottomQuery(pQuery) || isTSCompQuery(pQuery) || pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL) {
-    return forwardStep;
-  }
-
-  // current buffer does not have enough space, try in the next loop
-  if ((pQuery->checkBufferInLoop == 1) && (pQuery->pointsOffset <= forwardStep)) {
-    forwardStep = pQuery->pointsOffset;
-  }
-
-  return forwardStep;
-}
-
-static void validateQueryRangeAndData(SQueryRuntimeEnv *pRuntimeEnv, const TSKEY *pPrimaryColumn,
-                                      SBlockInfo *pBlockBasicInfo) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  TSKEY startKey = -1;
-  // timestamp qualification check
-  if (IS_DATA_BLOCK_LOADED(pRuntimeEnv->blockStatus) && needPrimaryTimestampCol(pQuery, pBlockBasicInfo)) {
-    startKey = pPrimaryColumn[pQuery->pos];
-  } else {
-    startKey = pBlockBasicInfo->keyFirst;
-    TSKEY endKey = pBlockBasicInfo->keyLast;
-
-    assert((endKey <= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-           (endKey >= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery)));
-  }
-
-  assert((startKey >= pQuery->lastKey && startKey <= pQuery->ekey && pQuery->skey <= pQuery->lastKey &&
-          QUERY_IS_ASC_QUERY(pQuery)) ||
-         (startKey <= pQuery->lastKey && startKey >= pQuery->ekey && pQuery->skey >= pQuery->lastKey &&
-          !QUERY_IS_ASC_QUERY(pQuery)));
-}
-
-static int32_t applyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SBlockInfo *pBlockInfo, int64_t *pPrimaryColumn,
-                                     SField *pFields, __block_search_fn_t searchFn, int32_t *numOfRes) {
-  int32_t forwardStep = 0;
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  validateQueryRangeAndData(pRuntimeEnv, pPrimaryColumn, pBlockInfo);
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    if (pQuery->ekey < pBlockInfo->keyLast) {
-      forwardStep = getForwardStepsInBlock(pBlockInfo->size, searchFn, pQuery, pPrimaryColumn);
-      assert(forwardStep >= 0);
-
-      if (forwardStep == 0) {
-        // no qualified data in current block, do not update the lastKey value
-        assert(pQuery->ekey < pPrimaryColumn[pQuery->pos]);
-      } else {
-        pQuery->lastKey = pQuery->ekey + step;//pPrimaryColumn[pQuery->pos + (forwardStep - 1)] + step;
-      }
-
-    } else {
-      forwardStep = pBlockInfo->size - pQuery->pos;
-      assert(forwardStep > 0);
-
-      pQuery->lastKey = pBlockInfo->keyLast + step;
-    }
-  } else {  // desc
-    if (pQuery->ekey > pBlockInfo->keyFirst) {
-      forwardStep = getForwardStepsInBlock(pBlockInfo->size, searchFn, pQuery, pPrimaryColumn);
-      assert(forwardStep >= 0);
-
-      if (forwardStep == 0) {
-        // no qualified data in current block, do not update the lastKey value
-        assert(pQuery->ekey > pPrimaryColumn[pQuery->pos]);
-      } else {
-        pQuery->lastKey = pQuery->ekey + step;//pPrimaryColumn[pQuery->pos - (forwardStep - 1)] + step;
-      }
-    } else {
-      forwardStep = pQuery->pos + 1;
-      assert(forwardStep > 0);
-
-      pQuery->lastKey = pBlockInfo->keyFirst + step;
-    }
-  }
-
-  int32_t newForwardStep = reviseForwardSteps(pRuntimeEnv, forwardStep);
-  assert(newForwardStep <= forwardStep && newForwardStep >= 0);
-
-  // if buffer limitation is applied, there must be primary column(timestamp) loaded
-  if (newForwardStep < forwardStep && newForwardStep > 0) {
-    pQuery->lastKey = pPrimaryColumn[pQuery->pos + (newForwardStep - 1) * step] + step;
-  }
-
-  if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL || isGroupbyNormalCol(pQuery->pGroupbyExpr) ||
-      (pQuery->slidingTime != -1 && pQuery->nAggTimeInterval > 0)) {
-    *numOfRes = rowwiseApplyAllFunctions(pRuntimeEnv, &newForwardStep, pPrimaryColumn, pFields, pBlockInfo);
-  } else {
-    *numOfRes = blockwiseApplyAllFunctions(pRuntimeEnv, newForwardStep, pPrimaryColumn, pFields, pBlockInfo);
-  }
-
-  assert(*numOfRes >= 0);
-
-  // check if buffer is large enough for accommodating all qualified points
-  if (*numOfRes > 0 && pQuery->checkBufferInLoop == 1) {
-    pQuery->pointsOffset -= *numOfRes;
-    if (pQuery->pointsOffset <= 0) {  // todo return correct numOfRes for ts_comp function
-      pQuery->pointsOffset = 0;
-      setQueryStatus(pQuery, QUERY_RESBUF_FULL);
-    }
-  }
-
-  return newForwardStep;
-}
-
-int32_t vnodeGetVnodeHeaderFileIdx(int32_t *fid, SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
-  if (pRuntimeEnv->vnodeFileInfo.numOfFiles == 0) {
-    return -1;
-  }
-
-  SQueryFilesInfo *pVnodeFiles = &pRuntimeEnv->vnodeFileInfo;
-
-  /* set the initial file for current query */
-  if (order == TSQL_SO_ASC && *fid < pVnodeFiles->pFileInfo[0].fileID) {
-    *fid = pVnodeFiles->pFileInfo[0].fileID;
-    return 0;
-  } else if (order == TSQL_SO_DESC && *fid > pVnodeFiles->pFileInfo[pVnodeFiles->numOfFiles - 1].fileID) {
-    *fid = pVnodeFiles->pFileInfo[pVnodeFiles->numOfFiles - 1].fileID;
-    return pVnodeFiles->numOfFiles - 1;
-  }
-
-  int32_t numOfFiles = pVnodeFiles->numOfFiles;
-
-  if (order == TSQL_SO_DESC && *fid > pVnodeFiles->pFileInfo[numOfFiles - 1].fileID) {
-    *fid = pVnodeFiles->pFileInfo[numOfFiles - 1].fileID;
-    return numOfFiles - 1;
-  }
-
-  if (order == TSQL_SO_ASC) {
-    int32_t i = 0;
-    int32_t step = QUERY_ASC_FORWARD_STEP;
-
-    while (i<numOfFiles && * fid> pVnodeFiles->pFileInfo[i].fileID) {
-      i += step;
-    }
-
-    if (i < numOfFiles && *fid <= pVnodeFiles->pFileInfo[i].fileID) {
-      *fid = pVnodeFiles->pFileInfo[i].fileID;
-      return i;
-    } else {
-      return -1;
-    }
-  } else {
-    int32_t i = numOfFiles - 1;
-    int32_t step = QUERY_DESC_FORWARD_STEP;
-
-    while (i >= 0 && *fid < pVnodeFiles->pFileInfo[i].fileID) {
-      i += step;
-    }
-
-    if (i >= 0 && *fid >= pVnodeFiles->pFileInfo[i].fileID) {
-      *fid = pVnodeFiles->pFileInfo[i].fileID;
-      return i;
-    } else {
-      return -1;
-    }
-  }
-}
-
-int32_t getNextDataFileCompInfo(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, int32_t step) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  pQuery->fileId += step;
-
-  int32_t fileIndex = 0;
-  int32_t order = (step == QUERY_ASC_FORWARD_STEP) ? TSQL_SO_ASC : TSQL_SO_DESC;
-  while (1) {
-    fileIndex = vnodeGetVnodeHeaderFileIdx(&pQuery->fileId, pRuntimeEnv, order);
-
-    // no files left, abort
-    if (fileIndex < 0) {
-      if (step == QUERY_ASC_FORWARD_STEP) {
-        dTrace("QInfo:%p no more file to access, try data in cache", GET_QINFO_ADDR(pQuery));
-      } else {
-        dTrace("QInfo:%p no more file to access in desc order, query completed", GET_QINFO_ADDR(pQuery));
-      }
-
-      vnodeFreeFieldsEx(pRuntimeEnv);
-      pQuery->fileId = -1;
-      break;
-    }
-
-    // failed to mmap header file into memory will cause the retrieval of compblock info failed
-    if (vnodeGetCompBlockInfo(pMeterObj, pRuntimeEnv, fileIndex) > 0) {
-      break;
-    }
-
-    /*
-     * 1. failed to read blk information from header file or open data file failed
-     * 2. header file is empty
-     *
-     * try next one
-     */
-    pQuery->fileId += step;
-
-    /* for backwards search, if the first file is not valid, abort */
-    if (step < 0 && fileIndex == 0) {
-      vnodeFreeFieldsEx(pRuntimeEnv);
-      pQuery->fileId = -1;
-      fileIndex = -1;
-      break;
-    }
-  }
-
-  return fileIndex;
-}
-
-void setExecParams(SQuery *pQuery, SQLFunctionCtx *pCtx, int64_t startQueryTimestamp, void *inputData,
-                   char *primaryColumnData, int32_t size, int32_t functionId, SField *pField, bool hasNull,
-                   int32_t blockStatus, void *param, int32_t scanFlag) {
-  int32_t startOffset = (QUERY_IS_ASC_QUERY(pQuery)) ? pQuery->pos : pQuery->pos - (size - 1);
-
-  pCtx->nStartQueryTimestamp = startQueryTimestamp;
-  pCtx->scanFlag = scanFlag;
-
-  pCtx->aInputElemBuf = inputData;
-  pCtx->hasNull = hasNull;
-  pCtx->blockStatus = blockStatus;
-
-  if (pField != NULL) {
-    pCtx->preAggVals.isSet = true;
-    pCtx->preAggVals.minIndex = pField->minIndex;
-    pCtx->preAggVals.maxIndex = pField->maxIndex;
-    pCtx->preAggVals.sum = pField->sum;
-    pCtx->preAggVals.max = pField->max;
-    pCtx->preAggVals.min = pField->min;
-    pCtx->preAggVals.numOfNull = pField->numOfNullPoints;
-  } else {
-    pCtx->preAggVals.isSet = false;
-  }
-
-  if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0 && (primaryColumnData != NULL)) {
-    pCtx->ptsList = (int64_t *)(primaryColumnData + startOffset * TSDB_KEYSIZE);
-  }
-
-  if (functionId >= TSDB_FUNC_FIRST_DST && functionId <= TSDB_FUNC_LAST_DST) {
-    // last_dist or first_dist function
-    // store the first&last timestamp into the intermediate buffer [1], the true
-    // value may be null but timestamp will never be null
-    pCtx->ptsList = (int64_t *)(primaryColumnData + startOffset * TSDB_KEYSIZE);
-  } else if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_TWA ||
-             functionId == TSDB_FUNC_DIFF) {
-    /*
-     * leastsquares function needs two columns of input, currently, the x value of linear equation is set to
-     * timestamp column, and the y-value is the column specified in pQuery->pSelectExpr[i].colIdxInBuffer
-     *
-     * top/bottom function needs timestamp to indicate when the
-     * top/bottom values emerge, so does diff function
-     */
-    if (functionId == TSDB_FUNC_TWA) {
-      STwaInfo *pTWAInfo = GET_RES_INFO(pCtx)->interResultBuf;
-      pTWAInfo->SKey = pQuery->skey;
-      pTWAInfo->EKey = pQuery->ekey;
-    }
-
-    pCtx->ptsList = (int64_t *)(primaryColumnData + startOffset * TSDB_KEYSIZE);
-
-  } else if (functionId == TSDB_FUNC_ARITHM) {
-    pCtx->param[1].pz = param;
-  }
-
-  pCtx->startOffset = startOffset;
-  pCtx->size = size;
-
-#if defined(_DEBUG_VIEW)
-  int64_t *tsList = (int64_t *)(primaryColumnData + startOffset * TSDB_KEYSIZE);
-  int64_t  s = tsList[0];
-  int64_t  e = tsList[size - 1];
-
-//    if (IS_DATA_BLOCK_LOADED(blockStatus)) {
-//        dTrace("QInfo:%p query ts:%lld-%lld, offset:%d, rows:%d, bstatus:%d,
-//        functId:%d", GET_QINFO_ADDR(pQuery),
-//               s, e, startOffset, size, blockStatus, functionId);
-//    } else {
-//        dTrace("QInfo:%p block not loaded, bstatus:%d",
-//        GET_QINFO_ADDR(pQuery), blockStatus);
-//    }
-#endif
-}
-
-// set the output buffer for the selectivity + tag query
-static void setCtxTagColumnInfo(SQuery *pQuery, SQueryRuntimeEnv *pRuntimeEnv) {
-  if (isSelectivityWithTagsQuery(pQuery)) {
-    int32_t         num = 0;
-    SQLFunctionCtx *pCtx = NULL;
-    int16_t         tagLen = 0;
-
-    SQLFunctionCtx **pTagCtx = calloc(pQuery->numOfOutputCols, POINTER_BYTES);
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      SSqlFuncExprMsg *pSqlFuncMsg = &pQuery->pSelectExpr[i].pBase;
-      if (pSqlFuncMsg->functionId == TSDB_FUNC_TAG_DUMMY || pSqlFuncMsg->functionId == TSDB_FUNC_TS_DUMMY) {
-        tagLen += pRuntimeEnv->pCtx[i].outputBytes;
-        pTagCtx[num++] = &pRuntimeEnv->pCtx[i];
-      } else if ((aAggs[pSqlFuncMsg->functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
-        pCtx = &pRuntimeEnv->pCtx[i];
-      } else if (pSqlFuncMsg->functionId == TSDB_FUNC_TS || pSqlFuncMsg->functionId == TSDB_FUNC_TAG) {
-        // tag function may be the group by tag column
-        // ts may be the required primary timestamp column
-        continue;
-      } else {
-        // the column may be the normal column, group by normal_column, the functionId is TSDB_FUNC_PRJ
-      }
-    }
-
-    pCtx->tagInfo.pTagCtxList = pTagCtx;
-    pCtx->tagInfo.numOfTagCols = num;
-    pCtx->tagInfo.tagsLen = tagLen;
-  }
-}
-
-static int32_t setupQueryRuntimeEnv(SMeterObj *pMeterObj, SQuery *pQuery, SQueryRuntimeEnv *pRuntimeEnv,
-                                    SSchema *pTagsSchema, int16_t order, bool isMetricQuery) {
-  dTrace("QInfo:%p setup runtime env", GET_QINFO_ADDR(pQuery));
-
-  pRuntimeEnv->pMeterObj = pMeterObj;
-  pRuntimeEnv->pQuery = pQuery;
-
-  pRuntimeEnv->resultInfo = calloc(pQuery->numOfOutputCols, sizeof(SResultInfo));
-  pRuntimeEnv->pCtx = (SQLFunctionCtx *)calloc(pQuery->numOfOutputCols, sizeof(SQLFunctionCtx));
-
-  if (pRuntimeEnv->resultInfo == NULL || pRuntimeEnv->pCtx == NULL) {
-    goto _error_clean;
-  }
-
-  pRuntimeEnv->offset[0] = 0;
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    SSqlFuncExprMsg *pSqlFuncMsg = &pQuery->pSelectExpr[i].pBase;
-    SColIndexEx *    pColIndexEx = &pSqlFuncMsg->colInfo;
-
-    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-
-    if (TSDB_COL_IS_TAG(pSqlFuncMsg->colInfo.flag)) {  // process tag column info
-      pCtx->inputType = pTagsSchema[pColIndexEx->colIdx].type;
-      pCtx->inputBytes = pTagsSchema[pColIndexEx->colIdx].bytes;
-    } else {
-      pCtx->inputType = GET_COLUMN_TYPE(pQuery, i);
-      pCtx->inputBytes = GET_COLUMN_BYTES(pQuery, i);
-    }
-
-    pCtx->ptsOutputBuf = NULL;
-
-    pCtx->outputBytes = pQuery->pSelectExpr[i].resBytes;
-    pCtx->outputType = pQuery->pSelectExpr[i].resType;
-
-    pCtx->order = pQuery->order.order;
-    pCtx->functionId = pSqlFuncMsg->functionId;
-
-    pCtx->numOfParams = pSqlFuncMsg->numOfParams;
-    for (int32_t j = 0; j < pCtx->numOfParams; ++j) {
-      int16_t type = pSqlFuncMsg->arg[j].argType;
-      int16_t bytes = pSqlFuncMsg->arg[j].argBytes;
-      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-        tVariantCreateFromBinary(&pCtx->param[j], pSqlFuncMsg->arg->argValue.pz, bytes, type);
-      } else {
-        tVariantCreateFromBinary(&pCtx->param[j], (char *)&pSqlFuncMsg->arg[j].argValue.i64, bytes, type);
-      }
-    }
-
-    // set the order information for top/bottom query
-    int32_t functionId = pCtx->functionId;
-
-    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
-      int32_t f = pQuery->pSelectExpr[0].pBase.functionId;
-      assert(f == TSDB_FUNC_TS || f == TSDB_FUNC_TS_DUMMY);
-
-      pCtx->param[2].i64Key = order;
-      pCtx->param[2].nType = TSDB_DATA_TYPE_BIGINT;
-      pCtx->param[3].i64Key = functionId;
-      pCtx->param[3].nType = TSDB_DATA_TYPE_BIGINT;
-
-      pCtx->param[1].i64Key = pQuery->order.orderColId;
-    }
-
-    if (i > 0) {
-      pRuntimeEnv->offset[i] = pRuntimeEnv->offset[i - 1] + pRuntimeEnv->pCtx[i - 1].outputBytes;
-    }
-
-    // set the intermediate result output buffer
-    SResultInfo *pResInfo = &pRuntimeEnv->resultInfo[i];
-    setResultInfoBuf(pResInfo, pQuery->pSelectExpr[i].interResBytes, isMetricQuery);
-  }
-
-  // if it is group by normal column, do not set output buffer, the output buffer is pResult
-  if (!isGroupbyNormalCol(pQuery->pGroupbyExpr) && !isMetricQuery) {
-    resetCtxOutputBuf(pRuntimeEnv);
-  }
-
-  setCtxTagColumnInfo(pQuery, pRuntimeEnv);
-
-  // for loading block data in memory
-  assert(vnodeList[pMeterObj->vnode].cfg.rowsInFileBlock == pMeterObj->pointsPerFileBlock);
-  return TSDB_CODE_SUCCESS;
-
-_error_clean:
-  tfree(pRuntimeEnv->resultInfo);
-  tfree(pRuntimeEnv->pCtx);
-
-  return TSDB_CODE_SERV_OUT_OF_MEMORY;
-}
-
-static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
-  if (pRuntimeEnv->pQuery == NULL) {
-    return;
-  }
-
-  dTrace("QInfo:%p teardown runtime env", GET_QINFO_ADDR(pRuntimeEnv->pQuery));
-  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfCols; ++i) {
-    tfree(pRuntimeEnv->colDataBuffer[i]);
-  }
-
-  tfree(pRuntimeEnv->secondaryUnzipBuffer);
-  destroySlidingWindowInfo(&pRuntimeEnv->swindowResInfo);
-
-  if (pRuntimeEnv->pCtx != NULL) {
-    for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutputCols; ++i) {
-      SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-
-      for (int32_t j = 0; j < pCtx->numOfParams; ++j) {
-        tVariantDestroy(&pCtx->param[j]);
-      }
-
-      tVariantDestroy(&pCtx->tag);
-      tfree(pCtx->tagInfo.pTagCtxList);
-      tfree(pRuntimeEnv->resultInfo[i].interResultBuf);
-    }
-
-    tfree(pRuntimeEnv->resultInfo);
-    tfree(pRuntimeEnv->pCtx);
-  }
-
-  tfree(pRuntimeEnv->unzipBuffer);
-
-  if (pRuntimeEnv->pQuery && (!PRIMARY_TSCOL_LOADED(pRuntimeEnv->pQuery))) {
-    tfree(pRuntimeEnv->primaryColBuffer);
-  }
-
-  doCloseQueryFiles(&pRuntimeEnv->vnodeFileInfo);
-
-  if (pRuntimeEnv->vnodeFileInfo.pFileInfo != NULL) {
-    pRuntimeEnv->vnodeFileInfo.numOfFiles = 0;
-    free(pRuntimeEnv->vnodeFileInfo.pFileInfo);
-  }
-
-  taosDestoryInterpoInfo(&pRuntimeEnv->interpoInfo);
-
-  if (pRuntimeEnv->pInterpoBuf != NULL) {
-    for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutputCols; ++i) {
-      tfree(pRuntimeEnv->pInterpoBuf[i]);
-    }
-
-    tfree(pRuntimeEnv->pInterpoBuf);
-  }
-
-  pRuntimeEnv->pTSBuf = tsBufDestory(pRuntimeEnv->pTSBuf);
-}
-
-// get maximum time interval in each file
-static int64_t getOldestKey(int32_t numOfFiles, int64_t fileId, SVnodeCfg *pCfg) {
-  int64_t duration = pCfg->daysPerFile * tsMsPerDay[(uint8_t)pCfg->precision];
-  return (fileId - numOfFiles + 1) * duration;
-}
-
-bool isQueryKilled(SQuery *pQuery) {
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  /*
-   * check if the queried meter is going to be deleted.
-   * if it will be deleted soon, stop current query ASAP.
-   */
-  SMeterObj *pMeterObj = pQInfo->pObj;
-  if (vnodeIsMeterState(pMeterObj, TSDB_METER_STATE_DROPPING)) {
-    pQInfo->killed = 1;
-    return true;
-  }
-
-  return (pQInfo->killed == 1);
-}
-
-bool isFixedOutputQuery(SQuery *pQuery) {
-  if (pQuery->nAggTimeInterval != 0) {
-    return false;
-  }
-
-  // Note:top/bottom query is fixed output query
-  if (isTopBottomQuery(pQuery) || isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-    return true;
-  }
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    SSqlFuncExprMsg *pExprMsg = &pQuery->pSelectExpr[i].pBase;
-
-    // ignore the ts_comp function
-    if (i == 0 && pExprMsg->functionId == TSDB_FUNC_PRJ && pExprMsg->numOfParams == 1 &&
-        pExprMsg->colInfo.colIdx == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-      continue;
-    }
-
-    if (pExprMsg->functionId == TSDB_FUNC_TS || pExprMsg->functionId == TSDB_FUNC_TS_DUMMY) {
-      continue;
-    }
-
-    if (!IS_MULTIOUTPUT(aAggs[pExprMsg->functionId].nStatus)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool isPointInterpoQuery(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionID = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionID == TSDB_FUNC_INTERP || functionID == TSDB_FUNC_LAST_ROW) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// TODO REFACTOR:MERGE WITH CLIENT-SIDE FUNCTION
-bool isTopBottomQuery(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionId == TSDB_FUNC_TS) {
-      continue;
-    }
-
-    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool isFirstLastRowQuery(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionID = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionID == TSDB_FUNC_LAST_ROW) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool notHasQueryTimeRange(SQuery *pQuery) {
-  return (pQuery->skey == 0 && pQuery->ekey == INT64_MAX && QUERY_IS_ASC_QUERY(pQuery)) ||
-         (pQuery->skey == INT64_MAX && pQuery->ekey == 0 && (!QUERY_IS_ASC_QUERY(pQuery)));
-}
-
-bool isTSCompQuery(SQuery *pQuery) { return pQuery->pSelectExpr[0].pBase.functionId == TSDB_FUNC_TS_COMP; }
-
-bool needSupplementaryScan(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG) {
-      continue;
-    }
-
-    if (((functionId == TSDB_FUNC_LAST || functionId == TSDB_FUNC_LAST_DST) && QUERY_IS_ASC_QUERY(pQuery)) ||
-        ((functionId == TSDB_FUNC_FIRST || functionId == TSDB_FUNC_FIRST_DST) && !QUERY_IS_ASC_QUERY(pQuery))) {
-      return true;
-    }
-  }
-
-  return false;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////
-static int32_t binarySearchInCacheBlk(SCacheInfo *pCacheInfo, SQuery *pQuery, int32_t keyLen, int32_t firstSlot,
-                                      int32_t lastSlot) {
-  int32_t midSlot = 0;
-
-  while (1) {
-    int32_t numOfBlocks = (lastSlot - firstSlot + 1 + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-    if (numOfBlocks == 0) {
-      numOfBlocks = pCacheInfo->maxBlocks;
-    }
-
-    midSlot = (firstSlot + (numOfBlocks >> 1)) % pCacheInfo->maxBlocks;
-    SCacheBlock *pBlock = pCacheInfo->cacheBlocks[midSlot];
-
-    TSKEY keyFirst = *((TSKEY *)pBlock->offset[0]);
-    TSKEY keyLast = *((TSKEY *)(pBlock->offset[0] + (pBlock->numOfPoints - 1) * keyLen));
-
-    if (numOfBlocks == 1) {
-      break;
-    }
-
-    if (pQuery->skey > keyLast) {
-      if (numOfBlocks == 2) break;
-      if (!QUERY_IS_ASC_QUERY(pQuery)) {
-        int          nextSlot = (midSlot + 1 + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-        SCacheBlock *pNextBlock = pCacheInfo->cacheBlocks[nextSlot];
-        TSKEY        nextKeyFirst = *((TSKEY *)(pNextBlock->offset[0]));
-        if (pQuery->skey < nextKeyFirst) break;
-      }
-      firstSlot = (midSlot + 1) % pCacheInfo->maxBlocks;
-    } else if (pQuery->skey < keyFirst) {
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        int          prevSlot = (midSlot - 1 + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-        SCacheBlock *pPrevBlock = pCacheInfo->cacheBlocks[prevSlot];
-        TSKEY        prevKeyLast = *((TSKEY *)(pPrevBlock->offset[0] + (pPrevBlock->numOfPoints - 1) * keyLen));
-        if (pQuery->skey > prevKeyLast) {
-          break;
-        }
-      }
-      lastSlot = (midSlot - 1 + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-    } else {
-      break;  // got the slot
-    }
-  }
-
-  return midSlot;
-}
-
-static void getQueryRange(SQuery *pQuery, TSKEY *min, TSKEY *max) {
-  *min = pQuery->lastKey < pQuery->ekey ? pQuery->lastKey : pQuery->ekey;
-  *max = pQuery->lastKey >= pQuery->ekey ? pQuery->lastKey : pQuery->ekey;
-}
-
-static int32_t getFirstCacheSlot(int32_t numOfBlocks, int32_t lastSlot, SCacheInfo *pCacheInfo) {
-  return (lastSlot - numOfBlocks + 1 + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-}
-
-static bool cacheBoundaryCheck(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj) {
-  /*
-   * here we get the first slot from the meter cache, not from the cache snapshot from pQuery, since the
-   * snapshot value in pQuery may have been expired now.
-   */
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  SCacheInfo * pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-  SCacheBlock *pBlock = NULL;
-
-  // earliest key in cache
-  TSKEY keyFirst = 0;
-  TSKEY keyLast = pMeterObj->lastKey;
-
-  while (1) {
-    // keep the value in local variable, since it may be changed by other thread any time
-    int32_t numOfBlocks = pCacheInfo->numOfBlocks;
-    int32_t currentSlot = pCacheInfo->currentSlot;
-
-    // no data in cache, return false directly
-    if (numOfBlocks == 0) {
-      return false;
-    }
-
-    int32_t first = getFirstCacheSlot(numOfBlocks, currentSlot, pCacheInfo);
-
-    /*
-     * pBlock may be null value since this block is flushed to disk, and re-distributes to
-     * other meter, so go on until we get the first not flushed cache block.
-     */
-    if ((pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, first)) != NULL) {
-      keyFirst = getTimestampInCacheBlock(pRuntimeEnv, pBlock, 0);
-      break;
-    } else {
-      /*
-       * there may be only one empty cache block existed caused by import.
-       */
-      if (numOfBlocks == 1) {
-        return false;
-      }
-    }
-  }
-
-  TSKEY min, max;
-  getQueryRange(pQuery, &min, &max);
-
-  /*
-   * The query time range is earlier than the first element or later than the last elements in cache.
-   * If the query window overlaps with the time range of disk files, the flag needs to be reset.
-   * Otherwise, this flag will cause error in following processing.
-   */
-  if (max < keyFirst || min > keyLast) {
-    setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-    return false;
-  }
-
-  return true;
-}
-
-void getBasicCacheInfoSnapshot(SQuery *pQuery, SCacheInfo *pCacheInfo, int32_t vid) {
-  // commitSlot here denotes the first uncommitted block in cache
-  int32_t numOfBlocks = 0;
-  int32_t lastSlot = 0;
-  int32_t commitSlot = 0;
-  int32_t commitPoint = 0;
-
-  SCachePool *pPool = (SCachePool *)vnodeList[vid].pCachePool;
-  pthread_mutex_lock(&pPool->vmutex);
-  numOfBlocks = pCacheInfo->numOfBlocks;
-  lastSlot = pCacheInfo->currentSlot;
-  commitSlot = pCacheInfo->commitSlot;
-  commitPoint = pCacheInfo->commitPoint;
-  pthread_mutex_unlock(&pPool->vmutex);
-
-  // make sure it is there, otherwise, return right away
-  pQuery->currentSlot = lastSlot;
-  pQuery->numOfBlocks = numOfBlocks;
-  pQuery->firstSlot = getFirstCacheSlot(numOfBlocks, lastSlot, pCacheInfo);
-  pQuery->commitSlot = commitSlot;
-  pQuery->commitPoint = commitPoint;
-
-  /*
-   * Note: the block id is continuous increasing, never becomes smaller.
-   *
-   * blockId is the maximum block id in cache of current meter during query.
-   * If any blocks' id are greater than this value, those blocks may be reallocated to other meters,
-   * or assigned new data of this meter, on which the query is performed should be ignored.
-   */
-  if (pQuery->numOfBlocks > 0) {
-    pQuery->blockId = pCacheInfo->cacheBlocks[pQuery->currentSlot]->blockId;
-  }
-}
-
-int64_t getQueryStartPositionInCache(SQueryRuntimeEnv *pRuntimeEnv, int32_t *slot, int32_t *pos,
-                                     bool ignoreQueryRange) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  pQuery->fileId = -1;
-  vnodeFreeFieldsEx(pRuntimeEnv);
-
-  // keep in-memory cache status in local variables in case that it may be changed by write operation
-  getBasicCacheInfoSnapshot(pQuery, pMeterObj->pCache, pMeterObj->vnode);
-
-  SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-  if (pCacheInfo == NULL || pCacheInfo->cacheBlocks == NULL || pQuery->numOfBlocks == 0) {
-    setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-    return -1;
-  }
-
-  assert((pQuery->lastKey >= pQuery->skey && QUERY_IS_ASC_QUERY(pQuery)) ||
-         (pQuery->lastKey <= pQuery->skey && !QUERY_IS_ASC_QUERY(pQuery)));
-
-  if (!ignoreQueryRange && !cacheBoundaryCheck(pRuntimeEnv, pMeterObj)) {
-    return -1;
-  }
-
-  /* find the appropriated slot that contains the requested points */
-  TSKEY rawskey = pQuery->skey;
-
-  /* here we actual start to query from pQuery->lastKey */
-  pQuery->skey = pQuery->lastKey;
-
-  (*slot) = binarySearchInCacheBlk(pCacheInfo, pQuery, TSDB_KEYSIZE, pQuery->firstSlot, pQuery->currentSlot);
-
-  /* locate the first point of which time stamp is no less than pQuery->skey */
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-
-  pQuery->slot = *slot;
-
-  // cache block has been flushed to disk, no required data block in cache.
-  SCacheBlock *pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-  if (pBlock == NULL) {
-    pQuery->skey = rawskey;  // restore the skey
-    return -1;
-  }
-
-  (*pos) = searchFn(pRuntimeEnv->primaryColBuffer->data, pBlock->numOfPoints, pQuery->skey, pQuery->order.order);
-
-  // restore skey before return
-  pQuery->skey = rawskey;
-
-  // all data are less(greater) than the pQuery->lastKey in case of ascending(descending) query
-  if (*pos == -1) {
-    return -1;
-  }
-
-  int64_t nextKey = getTimestampInCacheBlock(pRuntimeEnv, pBlock, *pos);
-  if ((nextKey < pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (nextKey > pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery))) {
-    // all data are less than the pQuery->lastKey(pQuery->sKey) for asc query
-    return -1;
-  }
-
-  SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
-  return nextKey;
-}
-
-/**
- * check if data in disk.
- */
-bool hasDataInDisk(SQuery *pQuery, SMeterObj *pMeterObj) {
-  SVnodeObj *pVnode = &vnodeList[pMeterObj->vnode];
-  if (pVnode->numOfFiles <= 0) {
-    pQuery->fileId = -1;
-    return false;
-  }
-
-  int64_t latestKey = pMeterObj->lastKeyOnFile;
-  int64_t oldestKey = getOldestKey(pVnode->numOfFiles, pVnode->fileId, &pVnode->cfg);
-
-  TSKEY min, max;
-  getQueryRange(pQuery, &min, &max);
-
-  /* query range is out of current time interval of table */
-  if ((min > latestKey) || (max < oldestKey)) {
-    pQuery->fileId = -1;
-    return false;
-  }
-
-  return true;
-}
-
-bool hasDataInCache(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj) {
-  SQuery *    pQuery = pRuntimeEnv->pQuery;
-  SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-
-  /* no data in cache, return */
-  if ((pCacheInfo == NULL) || (pCacheInfo->cacheBlocks == NULL)) {
-    return false;
-  }
-
-  /* numOfBlocks value has been overwrite, release pFields data if exists */
-  vnodeFreeFieldsEx(pRuntimeEnv);
-  getBasicCacheInfoSnapshot(pQuery, pCacheInfo, pMeterObj->vnode);
-  if (pQuery->numOfBlocks <= 0) {
-    return false;
-  }
-
-  return cacheBoundaryCheck(pRuntimeEnv, pMeterObj);
-}
-
-/**
- *  Get cache snapshot will destroy the comp block info in SQuery, in order to speedup the query
- *  process, we always check cache first.
- */
-void vnodeCheckIfDataExists(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj, bool *dataInDisk, bool *dataInCache) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  *dataInCache = hasDataInCache(pRuntimeEnv, pMeterObj);
-  *dataInDisk = hasDataInDisk(pQuery, pMeterObj);
-
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-}
-
-static void doGetAlignedIntervalQueryRangeImpl(SQuery *pQuery, int64_t pKey, int64_t keyFirst, int64_t keyLast,
-                                               int64_t *actualSkey, int64_t *actualEkey, int64_t *skey, int64_t *ekey) {
-  assert(pKey >= keyFirst && pKey <= keyLast);
-  *skey = taosGetIntervalStartTimestamp(pKey, pQuery->nAggTimeInterval, pQuery->intervalTimeUnit, pQuery->precision);
-
-  if (keyFirst > (INT64_MAX - pQuery->nAggTimeInterval)) {
-    /*
-     * if the actualSkey > INT64_MAX - pQuery->nAggTimeInterval, the query duration between
-     * actualSkey and actualEkey must be less than one interval.Therefore, no need to adjust the query ranges.
-     */
-    assert(keyLast - keyFirst < pQuery->nAggTimeInterval);
-
-    *actualSkey = keyFirst;
-    *actualEkey = keyLast;
-
-    *ekey = INT64_MAX;
-    return;
-  }
-
-  *ekey = *skey + pQuery->nAggTimeInterval - 1;
-
-  if (*skey < keyFirst) {
-    *actualSkey = keyFirst;
-  } else {
-    *actualSkey = *skey;
-  }
-
-  if (*ekey < keyLast) {
-    *actualEkey = *ekey;
-  } else {
-    *actualEkey = keyLast;
-  }
-}
-
-static void getAlignedIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, TSKEY key, TSKEY skey, TSKEY ekey) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  if (pQuery->nAggTimeInterval == 0 || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    return;
-  }
-
-  TSKEY skey2 = MIN(skey, ekey);
-  TSKEY ekey2 = MAX(skey, ekey);
-
-  // the actual first query range in skey1 and ekey1
-  TSKEY skey1, ekey1;
-
-  TSKEY windowSKey = 0, windowEKey = 0;
-  doGetAlignedIntervalQueryRangeImpl(pQuery, key, skey2, ekey2, &skey1, &ekey1, &windowSKey, &windowEKey);
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    pQuery->skey = skey1;
-    pQuery->ekey = ekey1;
-
-    pRuntimeEnv->intervalWindow = (STimeWindow) {.skey = windowSKey, .ekey = windowEKey};
-
-    assert(pQuery->skey <= pQuery->ekey &&
-           pRuntimeEnv->intervalWindow.skey + (pQuery->nAggTimeInterval - 1) == pRuntimeEnv->intervalWindow.ekey);
-  } else {
-    pQuery->skey = ekey1;
-    pQuery->ekey = skey1;
-  
-    pRuntimeEnv->intervalWindow = (STimeWindow) {.skey = windowEKey, .ekey = windowSKey};
-  
-    assert(pQuery->skey >= pQuery->ekey &&
-           pRuntimeEnv->intervalWindow.skey - (pQuery->nAggTimeInterval - 1) == pRuntimeEnv->intervalWindow.ekey);
-  }
-
-  pQuery->lastKey = pQuery->skey;
-}
-
-static void getOneRowFromDataBlock(SQueryRuntimeEnv *pRuntimeEnv, char **dst, int32_t pos) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    int32_t bytes = pQuery->colList[i].data.bytes;
-    memcpy(dst[i], pRuntimeEnv->colDataBuffer[i]->data + pos * bytes, bytes);
-  }
-}
-
-static bool getNeighborPoints(SMeterQuerySupportObj *pSupporter, SMeterObj *pMeterObj,
-                              SPointInterpoSupporter *pPointInterpSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  if (!isPointInterpoQuery(pQuery)) {
-    return false;
-  }
-
-  /*
-   * for interpolate point query, points that are directly before/after the specified point are required
-   */
-  if (isFirstLastRowQuery(pQuery)) {
-    assert(!QUERY_IS_ASC_QUERY(pQuery));
-  } else {
-    assert(QUERY_IS_ASC_QUERY(pQuery));
-  }
-  assert(pPointInterpSupporter != NULL && pQuery->skey == pQuery->ekey);
-
-  SCacheBlock *pBlock = NULL;
-
-  qTrace("QInfo:%p get next data point, fileId:%d, slot:%d, pos:%d", GET_QINFO_ADDR(pQuery), pQuery->fileId,
-         pQuery->slot, pQuery->pos);
-
-  // save the point that is directly after or equals to the specified point
-  getOneRowFromDataBlock(pRuntimeEnv, pPointInterpSupporter->pNextPoint, pQuery->pos);
-
-  /*
-   * 1. for last_row query, return immediately.
-   * 2. the specified timestamp equals to the required key, interpolation according to neighbor points is not necessary
-   *    for interp query.
-   */
-  TSKEY actualKey = *(TSKEY *)pPointInterpSupporter->pNextPoint[0];
-  if (isFirstLastRowQuery(pQuery) || actualKey == pQuery->skey) {
-    setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-
-    /*
-     * the retrieved ts may not equals to pMeterObj->lastKey due to cache re-allocation
-     * set the pQuery->ekey/pQuery->skey/pQuery->lastKey to be the new value.
-     */
-    if (pQuery->ekey != actualKey) {
-      pQuery->skey = actualKey;
-      pQuery->ekey = actualKey;
-      pQuery->lastKey = actualKey;
-      pSupporter->rawSKey = actualKey;
-      pSupporter->rawEKey = actualKey;
-    }
-    return true;
-  }
-
-  /* the qualified point is not the first point in data block */
-  if (pQuery->pos > 0) {
-    int32_t prevPos = pQuery->pos - 1;
-
-    /* save the point that is directly after the specified point */
-    getOneRowFromDataBlock(pRuntimeEnv, pPointInterpSupporter->pPrevPoint, prevPos);
-  } else {
-    __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-
-    savePointPosition(&pRuntimeEnv->startPos, pQuery->fileId, pQuery->slot, pQuery->pos);
-
-    // backwards movement would not set the pQuery->pos correct. We need to set it manually later.
-    moveToNextBlock(pRuntimeEnv, QUERY_DESC_FORWARD_STEP, searchFn, true);
-
-    /*
-     * no previous data exists.
-     * reset the status and load the data block that contains the qualified point
-     */
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
-      dTrace("QInfo:%p no previous data block, start fileId:%d, slot:%d, pos:%d, qrange:%" PRId64 "-%" PRId64
-             ", out of range",
-             GET_QINFO_ADDR(pQuery), pRuntimeEnv->startPos.fileId, pRuntimeEnv->startPos.slot,
-             pRuntimeEnv->startPos.pos, pQuery->skey, pQuery->ekey);
-
-      // no result, return immediately
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-      return false;
-    } else {  // prev has been located
-      if (pQuery->fileId >= 0) {
-        pQuery->pos = pQuery->pBlock[pQuery->slot].numOfPoints - 1;
-        getOneRowFromDataBlock(pRuntimeEnv, pPointInterpSupporter->pPrevPoint, pQuery->pos);
-
-        qTrace("QInfo:%p get prev data point, fileId:%d, slot:%d, pos:%d, pQuery->pos:%d", GET_QINFO_ADDR(pQuery),
-               pQuery->fileId, pQuery->slot, pQuery->pos, pQuery->pos);
-      } else {
-        // moveToNextBlock make sure there is a available cache block, if exists
-        assert(vnodeIsDatablockLoaded(pRuntimeEnv, pMeterObj, -1, true) == DISK_BLOCK_NO_NEED_TO_LOAD);
-        pBlock = &pRuntimeEnv->cacheBlock;
-
-        pQuery->pos = pBlock->numOfPoints - 1;
-        getOneRowFromDataBlock(pRuntimeEnv, pPointInterpSupporter->pPrevPoint, pQuery->pos);
-
-        qTrace("QInfo:%p get prev data point, fileId:%d, slot:%d, pos:%d, pQuery->pos:%d", GET_QINFO_ADDR(pQuery),
-               pQuery->fileId, pQuery->slot, pBlock->numOfPoints - 1, pQuery->pos);
-      }
-    }
-  }
-
-  pQuery->skey = *(TSKEY *)pPointInterpSupporter->pPrevPoint[0];
-  pQuery->ekey = *(TSKEY *)pPointInterpSupporter->pNextPoint[0];
-  pQuery->lastKey = pQuery->skey;
-
-  return true;
-}
-
-static bool doGetQueryPos(TSKEY key, SMeterQuerySupportObj *pSupporter, SPointInterpoSupporter *pPointInterpSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *       pMeterObj = pRuntimeEnv->pMeterObj;
-
-  /* key in query range. If not, no qualified in disk file */
-  if (key != -1 && key <= pQuery->ekey) {
-    if (isPointInterpoQuery(pQuery)) { /* no qualified data in this query range */
-      return getNeighborPoints(pSupporter, pMeterObj, pPointInterpSupporter);
-    } else {
-      getAlignedIntervalQueryRange(pRuntimeEnv, key, pQuery->skey, pQuery->ekey);
-      return true;
-    }
-  } else {  // key > pQuery->ekey, abort for normal query, continue for interp query
-    if (isPointInterpoQuery(pQuery)) {
-      return getNeighborPoints(pSupporter, pMeterObj, pPointInterpSupporter);
-    } else {
-      return false;
-    }
-  }
-}
-
-static bool doSetDataInfo(SMeterQuerySupportObj *pSupporter, SPointInterpoSupporter *pPointInterpSupporter,
-                          SMeterObj *pMeterObj, TSKEY nextKey) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  if (isFirstLastRowQuery(pQuery)) {
-    /*
-     * if the pQuery->skey != pQuery->ekey for last_row query,
-     * the query range is existed, so set them both the value of nextKey
-     */
-    if (pQuery->skey != pQuery->ekey) {
-      assert(pQuery->skey >= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery) && nextKey >= pQuery->ekey &&
-             nextKey <= pQuery->skey);
-
-      pQuery->skey = nextKey;
-      pQuery->ekey = nextKey;
-    }
-
-    return getNeighborPoints(pSupporter, pMeterObj, pPointInterpSupporter);
-  } else {
-    getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pQuery->skey, pQuery->ekey);
-    return true;
-  }
-}
-
-// TODO refactor code, the best way to implement the last_row is utilizing the iterator
-bool normalizeUnBoundLastRowQuery(SMeterQuerySupportObj *pSupporter, SPointInterpoSupporter *pPointInterpSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  assert(!QUERY_IS_ASC_QUERY(pQuery) && notHasQueryTimeRange(pQuery));
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-
-  TSKEY lastKey = -1;
-
-  pQuery->fileId = -1;
-  vnodeFreeFieldsEx(pRuntimeEnv);
-
-  // keep in-memory cache status in local variables in case that it may be changed by write operation
-  getBasicCacheInfoSnapshot(pQuery, pMeterObj->pCache, pMeterObj->vnode);
-
-  SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-  if (pCacheInfo != NULL && pCacheInfo->cacheBlocks != NULL && pQuery->numOfBlocks > 0) {
-    pQuery->fileId = -1;
-    TSKEY key = pMeterObj->lastKey;
-
-    pQuery->skey = key;
-    pQuery->ekey = key;
-    pQuery->lastKey = pQuery->skey;
-
-    /*
-     * cache block may have been flushed to disk, and no data in cache anymore.
-     * So, copy cache block to local buffer is required.
-     */
-    lastKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, false);
-    if (lastKey < 0) {  // data has been flushed to disk, try again search in file
-      lastKey = getQueryPositionForCacheInvalid(pRuntimeEnv, searchFn);
-
-      if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK | QUERY_COMPLETED)) {
-        return false;
-      }
-    }
-  } else {  // no data in cache, try file
-    TSKEY key = pMeterObj->lastKeyOnFile;
-
-    pQuery->skey = key;
-    pQuery->ekey = key;
-    pQuery->lastKey = pQuery->skey;
-
-    bool ret = getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_LESS_EQUAL, searchFn);
-    if (!ret) {  // no data in file, return false;
-      return false;
-    }
-
-    lastKey = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-  }
-
-  assert(lastKey <= pQuery->skey);
-
-  pQuery->skey = lastKey;
-  pQuery->ekey = lastKey;
-  pQuery->lastKey = pQuery->skey;
-
-  return getNeighborPoints(pSupporter, pMeterObj, pPointInterpSupporter);
-}
-
-/**
- * determine the first query range, according to raw query range [skey, ekey] and group-by interval.
- * the time interval for aggregating is not enforced to check its validation, the minimum interval is not less than
- * 10ms, which is guaranteed by parser at client-side
- */
-bool normalizedFirstQueryRange(bool dataInDisk, bool dataInCache, SMeterQuerySupportObj *pSupporter,
-                               SPointInterpoSupporter *pPointInterpSupporter, int64_t *key) {
-  SQueryRuntimeEnv *  pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *            pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *         pMeterObj = pRuntimeEnv->pMeterObj;
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    // todo: the action return as the getQueryStartPositionInCache function
-    if (dataInDisk && getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_GREATER_EQUAL, searchFn)) {
-      TSKEY nextKey = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-      assert(nextKey >= pQuery->skey);
-
-      if (key != NULL) {
-        *key = nextKey;
-      }
-
-      return doGetQueryPos(nextKey, pSupporter, pPointInterpSupporter);
-    }
-
-    // set no data in file
-    pQuery->fileId = -1;
-    SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-
-    /* if it is a interpolation query, the any points in cache that is greater than the query range is required */
-    if (pCacheInfo == NULL || pCacheInfo->cacheBlocks == NULL || pCacheInfo->numOfBlocks == 0 || !dataInCache) {
-      return false;
-    }
-
-    TSKEY nextKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, false);
-
-    if (key != NULL) {
-      *key = nextKey;
-    }
-
-    return doGetQueryPos(nextKey, pSupporter, pPointInterpSupporter);
-
-  } else {              // descending order
-    if (dataInCache) {  // todo handle error
-      TSKEY nextKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, false);
-      assert(nextKey == -1 || nextKey <= pQuery->skey);
-
-      if (key != NULL) {
-        *key = nextKey;
-      }
-
-      if (nextKey != -1) {  // find qualified data in cache
-        if (nextKey >= pQuery->ekey) {
-          return doSetDataInfo(pSupporter, pPointInterpSupporter, pMeterObj, nextKey);
-        } else {
-          /*
-           * nextKey < pQuery->ekey && nextKey < pQuery->lastKey, query range is
-           * larger than all data, abort
-           *
-           * NOTE: Interp query does not reach here, since for all interp query,
-           * the query order is ascending order.
-           */
-          return false;
-        }
-      } else {  // all data in cache are greater than pQuery->skey, try file
-      }
-    }
-
-    if (dataInDisk && getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_LESS_EQUAL, searchFn)) {
-      TSKEY nextKey = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-      assert(nextKey <= pQuery->skey);
-
-      if (key != NULL) {
-        *key = nextKey;
-      }
-
-      // key in query range. If not, no qualified in disk file
-      if (nextKey >= pQuery->ekey) {
-        return doSetDataInfo(pSupporter, pPointInterpSupporter, pMeterObj, nextKey);
-      } else {  // In case of all queries, the value of false will be returned if key < pQuery->ekey
-        return false;
-      }
-    }
-  }
-
-  return false;
-}
-
-int64_t loadRequiredBlockIntoMem(SQueryRuntimeEnv *pRuntimeEnv, SPositionInfo *position) {
-  TSKEY nextTimestamp = -1;
-
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  pQuery->fileId = position->fileId;
-  pQuery->slot = position->slot;
-  pQuery->pos = position->pos;
-
-  if (position->fileId == -1) {
-    SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-    if (pCacheInfo == NULL || pCacheInfo->numOfBlocks == 0 || pCacheInfo->cacheBlocks == NULL) {
-      setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-      return -1;
-    }
-
-    SCacheBlock *pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-    if (pBlock != NULL) {
-      nextTimestamp = getTimestampInCacheBlock(pRuntimeEnv, pBlock, position->pos);
-    } else {
-      // todo fix it
-    }
-
-    SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
-  } else {
-    // todo handle the file broken situation
-    /*
-     * load the file metadata into buffer first, then the specific data block.
-     * currently opened file is not the start file, reset to the start file
-     */
-    int32_t fileIdx = vnodeGetVnodeHeaderFileIdx(&pQuery->fileId, pRuntimeEnv, pQuery->order.order);
-    if (fileIdx < 0) {  // ignore the files on disk
-      dError("QInfo:%p failed to get data file:%d", GET_QINFO_ADDR(pQuery), pQuery->fileId);
-      position->fileId = -1;
-      return -1;
-    }
-
-    /*
-     * NOTE:
-     * The compblock information may not be loaded yet, here loaded it firstly.
-     * If the compBlock info is loaded, it wont be loaded again.
-     *
-     * If failed to load comp block into memory due some how reasons, e.g., empty header file/not enough memory
-     */
-    if (vnodeGetCompBlockInfo(pMeterObj, pRuntimeEnv, fileIdx) <= 0) {
-      position->fileId = -1;
-      return -1;
-    }
-
-    nextTimestamp = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-  }
-
-  return nextTimestamp;
-}
-
-static void setScanLimitationByResultBuffer(SQuery *pQuery) {
-  if (isTopBottomQuery(pQuery)) {
-    pQuery->checkBufferInLoop = 0;
-  } else if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-    pQuery->checkBufferInLoop = 0;
-  } else {
-    bool hasMultioutput = false;
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      SSqlFuncExprMsg *pExprMsg = &pQuery->pSelectExpr[i].pBase;
-      if (pExprMsg->functionId == TSDB_FUNC_TS || pExprMsg->functionId == TSDB_FUNC_TS_DUMMY) {
-        continue;
-      }
-
-      hasMultioutput = IS_MULTIOUTPUT(aAggs[pExprMsg->functionId].nStatus);
-      if (!hasMultioutput) {
-        break;
-      }
-    }
-
-    pQuery->checkBufferInLoop = hasMultioutput ? 1 : 0;
-  }
-
-  pQuery->pointsOffset = pQuery->pointsToRead;
-}
-
-/*
- * todo add more parameters to check soon..
- */
-bool vnodeParametersSafetyCheck(SQuery *pQuery) {
-  // load data column information is incorrect
-  for (int32_t i = 0; i < pQuery->numOfCols - 1; ++i) {
-    if (pQuery->colList[i].data.colId == pQuery->colList[i + 1].data.colId) {
-      dError("QInfo:%p invalid data load column for query", GET_QINFO_ADDR(pQuery));
-      return false;
-    }
-  }
-  return true;
-}
-
-static int file_order_comparator(const void *p1, const void *p2) {
-  SHeaderFileInfo *pInfo1 = (SHeaderFileInfo *)p1;
-  SHeaderFileInfo *pInfo2 = (SHeaderFileInfo *)p2;
-
-  if (pInfo1->fileID == pInfo2->fileID) {
-    return 0;
-  }
-
-  return (pInfo1->fileID > pInfo2->fileID) ? 1 : -1;
-}
-
-/**
- * open a data files and header file for metric meta query
- *
- * @param pVnodeFiles
- * @param fid
- * @param index
- */
-static FORCE_INLINE void vnodeStoreFileId(SQueryFilesInfo *pVnodeFiles, int32_t fid, int32_t index) {
-  pVnodeFiles->pFileInfo[index].fileID = fid;
-}
-
-static void vnodeRecordAllFiles(SQInfo *pQInfo, int32_t vnodeId) {
-  char suffix[] = ".head";
-
-  struct dirent *pEntry = NULL;
-  size_t         alloc = 4;  // default allocated size
-
-  SQueryFilesInfo *pVnodeFilesInfo = &(pQInfo->pMeterQuerySupporter->runtimeEnv.vnodeFileInfo);
-  pVnodeFilesInfo->vnodeId = vnodeId;
-
-  sprintf(pVnodeFilesInfo->dbFilePathPrefix, "%s/vnode%d/db/", tsDirectory, vnodeId);
-  DIR *pDir = opendir(pVnodeFilesInfo->dbFilePathPrefix);
-  if (pDir == NULL) {
-    dError("QInfo:%p failed to open directory:%s, %s", pQInfo, pVnodeFilesInfo->dbFilePathPrefix, strerror(errno));
-    return;
-  }
-
-  pVnodeFilesInfo->pFileInfo = calloc(1, sizeof(SHeaderFileInfo) * alloc);
-  SVnodeObj *pVnode = &vnodeList[vnodeId];
-
-  while ((pEntry = readdir(pDir)) != NULL) {
-    if ((pEntry->d_name[0] == '.' && pEntry->d_name[1] == '\0') || (strcmp(pEntry->d_name, "..") == 0)) {
-      continue;
-    }
-
-    if (pEntry->d_type & DT_DIR) {
-      continue;
-    }
-
-    size_t len = strlen(pEntry->d_name);
-    if (strcasecmp(&pEntry->d_name[len - 5], suffix) != 0) {
-      continue;
-    }
-
-    int32_t vid = 0;
-    int32_t fid = 0;
-    sscanf(pEntry->d_name, "v%df%d", &vid, &fid);
-    if (vid != vnodeId) { /* ignore error files */
-      dError("QInfo:%p error data file:%s in vid:%d, ignore", pQInfo, pEntry->d_name, vnodeId);
-      continue;
-    }
-
-    int32_t firstFid = pVnode->fileId - pVnode->numOfFiles + 1;
-    if (fid > pVnode->fileId || fid < firstFid) {
-      dError("QInfo:%p error data file:%s in vid:%d, fid:%d, fid range:%d-%d", pQInfo, pEntry->d_name, vnodeId, fid,
-             firstFid, pVnode->fileId);
-      continue;
-    }
-
-    assert(fid >= 0 && vid >= 0);
-
-    if (++pVnodeFilesInfo->numOfFiles > alloc) {
-      alloc = alloc << 1U;
-      pVnodeFilesInfo->pFileInfo = realloc(pVnodeFilesInfo->pFileInfo, alloc * sizeof(SHeaderFileInfo));
-      memset(&pVnodeFilesInfo->pFileInfo[alloc >> 1U], 0, (alloc >> 1U) * sizeof(SHeaderFileInfo));
-    }
-
-    int32_t index = pVnodeFilesInfo->numOfFiles - 1;
-    vnodeStoreFileId(pVnodeFilesInfo, fid, index);
-  }
-
-  closedir(pDir);
-
-  dTrace("QInfo:%p find %d data files in %s to be checked", pQInfo, pVnodeFilesInfo->numOfFiles,
-         pVnodeFilesInfo->dbFilePathPrefix);
-
-  /* order the files information according their names */
-  qsort(pVnodeFilesInfo->pFileInfo, (size_t)pVnodeFilesInfo->numOfFiles, sizeof(SHeaderFileInfo),
-        file_order_comparator);
-}
-
-static void updateOffsetVal(SQueryRuntimeEnv *pRuntimeEnv, SBlockInfo *pBlockInfo, void *pBlock) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  /*
-   *  The actually qualified points that can be skipped needs to be calculated if query is
-   *  done in current data block
-   */
-  if ((pQuery->ekey <= pBlockInfo->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (pQuery->ekey >= pBlockInfo->keyFirst && !QUERY_IS_ASC_QUERY(pQuery))) {
-    // force load timestamp data blocks
-    if (IS_DISK_DATA_BLOCK(pQuery)) {
-      getTimestampInDiskBlock(pRuntimeEnv, 0);
-    }
-
-    // update the pQuery->limit.offset value, and pQuery->pos value
-    TSKEY *keys = (TSKEY *)pRuntimeEnv->primaryColBuffer->data;
-
-    int32_t i = 0;
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      for (i = pQuery->pos; i < pBlockInfo->size && pQuery->limit.offset > 0; ++i) {
-        if (keys[i] <= pQuery->ekey) {
-          pQuery->limit.offset -= 1;
-        } else {
-          break;
-        }
-      }
-
-    } else {
-      for (i = pQuery->pos; i >= 0 && pQuery->limit.offset > 0; --i) {
-        if (keys[i] >= pQuery->ekey) {
-          pQuery->limit.offset -= 1;
-        } else {
-          break;
-        }
-      }
-    }
-
-    if (((i == pBlockInfo->size || keys[i] > pQuery->ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-        ((i < 0 || keys[i] < pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-      pQuery->pos = -1;
-    } else {
-      pQuery->pos = i;
-    }
-  } else {
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      pQuery->pos += pQuery->limit.offset;
-    } else {
-      pQuery->pos -= pQuery->limit.offset;
-    }
-
-    assert(pQuery->pos >= 0 && pQuery->pos <= pBlockInfo->size - 1);
-
-    if (IS_DISK_DATA_BLOCK(pQuery)) {
-      pQuery->skey = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-    } else {
-      pQuery->skey = getTimestampInCacheBlock(pRuntimeEnv, pBlock, pQuery->pos);
-    }
-
-    // update the offset value
-    pQuery->lastKey = pQuery->skey;
-    pQuery->limit.offset = 0;
-  }
-}
-
-// todo ignore the avg/sum/min/max/count/stddev/top/bottom functions, of which
-// the scan order is not matter
-static bool onlyOneQueryType(SQuery *pQuery, int32_t functId, int32_t functIdDst) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-
-    if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TS_DUMMY || functionId == TSDB_FUNC_TAG ||
-        functionId == TSDB_FUNC_TAG_DUMMY) {
-      continue;
-    }
-
-    if (functionId != functId && functionId != functIdDst) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static bool onlyFirstQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB_FUNC_FIRST, TSDB_FUNC_FIRST_DST); }
-
-static bool onlyLastQuery(SQuery *pQuery) { return onlyOneQueryType(pQuery, TSDB_FUNC_LAST, TSDB_FUNC_LAST_DST); }
-
-static void changeExecuteScanOrder(SQuery *pQuery, bool metricQuery) {
-  // in case of point-interpolation query, use asc order scan
-  char msg[] =
-      "QInfo:%p scan order changed for %s query, old:%d, new:%d, qrange exchanged, old qrange:%" PRId64 "-%" PRId64
-      ", "
-      "new qrange:%" PRId64 "-%" PRId64;
-
-  // descending order query for last_row query
-  if (isFirstLastRowQuery(pQuery)) {
-    dTrace("QInfo:%p scan order changed for last_row query, old:%d, new:%d", GET_QINFO_ADDR(pQuery),
-           pQuery->order.order, TSQL_SO_DESC);
-
-    pQuery->order.order = TSQL_SO_DESC;
-
-    int64_t skey = MIN(pQuery->skey, pQuery->ekey);
-    int64_t ekey = MAX(pQuery->skey, pQuery->ekey);
-
-    pQuery->skey = ekey;
-    pQuery->ekey = skey;
-
-    return;
-  }
-
-  if (isPointInterpoQuery(pQuery) && pQuery->nAggTimeInterval == 0) {
-    if (!QUERY_IS_ASC_QUERY(pQuery)) {
-      dTrace(msg, GET_QINFO_ADDR(pQuery), "interp", pQuery->order.order, TSQL_SO_ASC, pQuery->skey, pQuery->ekey,
-             pQuery->ekey, pQuery->skey);
-      SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-    }
-
-    pQuery->order.order = TSQL_SO_ASC;
-    return;
-  }
-
-  if (pQuery->nAggTimeInterval == 0) {
-    if (onlyFirstQuery(pQuery)) {
-      if (!QUERY_IS_ASC_QUERY(pQuery)) {
-        dTrace(msg, GET_QINFO_ADDR(pQuery), "only-first", pQuery->order.order, TSQL_SO_ASC, pQuery->skey, pQuery->ekey,
-               pQuery->ekey, pQuery->skey);
-
-        SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-      }
-
-      pQuery->order.order = TSQL_SO_ASC;
-    } else if (onlyLastQuery(pQuery)) {
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        dTrace(msg, GET_QINFO_ADDR(pQuery), "only-last", pQuery->order.order, TSQL_SO_DESC, pQuery->skey, pQuery->ekey,
-               pQuery->ekey, pQuery->skey);
-
-        SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-      }
-
-      pQuery->order.order = TSQL_SO_DESC;
-    }
-
-  } else {  // interval query
-    if (metricQuery) {
-      if (onlyFirstQuery(pQuery)) {
-        if (!QUERY_IS_ASC_QUERY(pQuery)) {
-          dTrace(msg, GET_QINFO_ADDR(pQuery), "only-first stable", pQuery->order.order, TSQL_SO_ASC, pQuery->skey,
-                 pQuery->ekey, pQuery->ekey, pQuery->skey);
-
-          SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-        }
-
-        pQuery->order.order = TSQL_SO_ASC;
-      } else if (onlyLastQuery(pQuery)) {
-        if (QUERY_IS_ASC_QUERY(pQuery)) {
-          dTrace(msg, GET_QINFO_ADDR(pQuery), "only-last stable", pQuery->order.order, TSQL_SO_DESC, pQuery->skey,
-                 pQuery->ekey, pQuery->ekey, pQuery->skey);
-
-          SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-        }
-
-        pQuery->order.order = TSQL_SO_DESC;
-      }
-    }
-  }
-}
-
-static int32_t doSkipDataBlock(SQueryRuntimeEnv *pRuntimeEnv) {
-  SMeterObj *         pMeterObj = pRuntimeEnv->pMeterObj;
-  SQuery *            pQuery = pRuntimeEnv->pQuery;
-  int32_t             step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-
-  while (1) {
-    moveToNextBlock(pRuntimeEnv, step, searchFn, false);
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
-      break;
-    }
-
-    void *pBlock = getGenericDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-    assert(pBlock != NULL);
-
-    int32_t    blockType = IS_DISK_DATA_BLOCK(pQuery) ? BLK_FILE_BLOCK : BLK_CACHE_BLOCK;
-    SBlockInfo blockInfo = getBlockBasicInfo(pRuntimeEnv, pBlock, blockType);
-
-    int32_t maxReads = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.size - pQuery->pos : pQuery->pos + 1;
-    assert(maxReads >= 0);
-
-    if (pQuery->limit.offset < maxReads || (pQuery->ekey <= blockInfo.keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (pQuery->ekey >= blockInfo.keyFirst && !QUERY_IS_ASC_QUERY(pQuery))) {  // start position in current block
-      updateOffsetVal(pRuntimeEnv, &blockInfo, pBlock);
-      break;
-    } else {
-      pQuery->limit.offset -= maxReads;
-      pQuery->lastKey = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.keyLast : blockInfo.keyFirst;
-      pQuery->lastKey += step;
-
-      qTrace("QInfo:%p skip rows:%d, offset:%" PRId64 "", GET_QINFO_ADDR(pQuery), maxReads, pQuery->limit.offset);
-    }
-  }
-
-  return 0;
-}
-
-void forwardQueryStartPosition(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  if (pQuery->limit.offset <= 0) {
-    return;
-  }
-
-  void *pBlock = getGenericDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-
-  int32_t    blockType = (IS_DISK_DATA_BLOCK(pQuery)) ? BLK_FILE_BLOCK : BLK_CACHE_BLOCK;
-  SBlockInfo blockInfo = getBlockBasicInfo(pRuntimeEnv, pBlock, blockType);
-
-  // get the qualified data that can be skipped
-  int32_t maxReads = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.size - pQuery->pos : pQuery->pos + 1;
-
-  if (pQuery->limit.offset < maxReads || (pQuery->ekey <= blockInfo.keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (pQuery->ekey >= blockInfo.keyFirst && !QUERY_IS_ASC_QUERY(pQuery))) {  // start position in current block
-    updateOffsetVal(pRuntimeEnv, &blockInfo, pBlock);
-  } else {
-    pQuery->limit.offset -= maxReads;
-    // update the lastkey, since the following skip operation may traverse to another media. update the lastkey first.
-    pQuery->lastKey = (QUERY_IS_ASC_QUERY(pQuery)) ? blockInfo.keyLast + 1 : blockInfo.keyFirst - 1;
-    doSkipDataBlock(pRuntimeEnv);
-  }
-}
-
-static bool forwardQueryStartPosIfNeeded(SQInfo *pQInfo, SMeterQuerySupportObj *pSupporter, bool dataInDisk,
-                                         bool dataInCache) {
-  SQuery *pQuery = &pQInfo->query;
-
-  /* if queried with value filter, do NOT forward query start position */
-  if (pQuery->numOfFilterCols > 0 || pSupporter->runtimeEnv.pTSBuf != NULL) {
-    return true;
-  }
-
-  if (pQuery->limit.offset > 0 && (!isTopBottomQuery(pQuery)) && pQuery->interpoType == TSDB_INTERPO_NONE) {
-    /*
-     * 1. for top/bottom query, the offset applies to the final result, not here
-     * 2. for interval without interpolation query we forward pQuery->nAggTimeInterval at a time for
-     *    pQuery->limit.offset times. Since hole exists, pQuery->nAggTimeInterval*pQuery->limit.offset value is
-     *    not valid. otherwise, we only forward pQuery->limit.offset number of points
-     */
-    if (pQuery->nAggTimeInterval > 0) {
-      while (1) {
-        /*
-         * the skey may not be the aligned start time
-         * 1. it is the value of first existed data point, therefore, the range
-         *    between skey and ekey may be less than the interval value.
-         * 2. the ekey may not be the actual end value of time interval, in case of the
-         */
-        if (QUERY_IS_ASC_QUERY(pQuery)) {
-          pQuery->skey = pQuery->ekey + 1;
-        } else {
-          pQuery->skey = pQuery->ekey - 1;
-        }
-
-        // boundary check
-        if ((pQuery->skey > pSupporter->rawEKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (pQuery->skey < pSupporter->rawEKey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          setQueryStatus(pQuery, QUERY_COMPLETED);
-
-          sem_post(&pQInfo->dataReady);
-          pQInfo->over = 1;
-          return false;
-        }
-
-        /*
-         * NOTE: the end key must be set the last value, to cover all possible
-         * data. Otherwise, it may contain no data with only one interval time range
-         */
-        pQuery->ekey = pSupporter->rawEKey;
-        pQuery->lastKey = pQuery->skey;
-
-        // todo opt performance
-        if (normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, NULL, NULL) == false) {
-          sem_post(&pQInfo->dataReady);  // hack for next read for empty return
-          pQInfo->over = 1;
-          return false;
-        }
-
-        if (--pQuery->limit.offset == 0) {
-          break;
-        }
-      }
-    } else {
-      forwardQueryStartPosition(&pSupporter->runtimeEnv);
-      if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
-        setQueryStatus(pQuery, QUERY_COMPLETED);
-
-        sem_post(&pQInfo->dataReady);  // hack for next read for empty return;
-        pQInfo->over = 1;
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-static void doSetInterpVal(SQLFunctionCtx *pCtx, TSKEY ts, int16_t type, int32_t index, char *data) {
-  assert(pCtx->param[index].pz == NULL);
-
-  int32_t len = 0;
-  size_t  t = 0;
-
-  if (type == TSDB_DATA_TYPE_BINARY) {
-    t = strlen(data);
-
-    len = t + 1 + TSDB_KEYSIZE;
-    pCtx->param[index].pz = calloc(1, len);
-  } else if (type == TSDB_DATA_TYPE_NCHAR) {
-    t = wcslen((const wchar_t *)data);
-
-    len = (t + 1) * TSDB_NCHAR_SIZE + TSDB_KEYSIZE;
-    pCtx->param[index].pz = calloc(1, len);
-  } else {
-    len = TSDB_KEYSIZE * 2;
-    pCtx->param[index].pz = malloc(len);
-  }
-
-  pCtx->param[index].nType = TSDB_DATA_TYPE_BINARY;
-
-  char *z = pCtx->param[index].pz;
-  *(TSKEY *)z = ts;
-  z += TSDB_KEYSIZE;
-
-  switch (type) {
-    case TSDB_DATA_TYPE_FLOAT:
-      *(double *)z = GET_FLOAT_VAL(data);
-      break;
-    case TSDB_DATA_TYPE_DOUBLE:
-      *(double *)z = GET_DOUBLE_VAL(data);
-      break;
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_TIMESTAMP:
-      *(int64_t *)z = GET_INT64_VAL(data);
-      break;
-    case TSDB_DATA_TYPE_BINARY:
-      strncpy(z, data, t);
-      break;
-    case TSDB_DATA_TYPE_NCHAR: {
-      wcsncpy((wchar_t *)z, (const wchar_t *)data, t);
-    } break;
-    default:
-      assert(0);
-  }
-
-  pCtx->param[index].nLen = len;
-}
-
-/**
- * param[1]: default value/previous value of specified timestamp
- * param[2]: next value of specified timestamp
- * param[3]: denotes if the result is a precious result or interpolation results
- *
- * @param pQInfo
- * @param pSupporter
- * @param pInterpoRaw
- */
-void pointInterpSupporterSetData(SQInfo *pQInfo, SPointInterpoSupporter *pPointInterpSupport) {
-  // not point interpolation query, abort
-  if (!isPointInterpoQuery(&pQInfo->query)) {
-    return;
-  }
-
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  int32_t count = 1;
-  TSKEY   key = *(TSKEY *)pPointInterpSupport->pNextPoint[0];
-
-  if (key == pSupporter->rawSKey) {
-    // the queried timestamp has value, return it directly without interpolation
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      tVariantCreateFromBinary(&pRuntimeEnv->pCtx[i].param[3], (char *)&count, sizeof(count), TSDB_DATA_TYPE_INT);
-
-      pRuntimeEnv->pCtx[i].param[0].i64Key = key;
-      pRuntimeEnv->pCtx[i].param[0].nType = TSDB_DATA_TYPE_BIGINT;
-    }
-  } else {
-    // set the direct previous(next) point for process
-    count = 2;
-
-    if (pQuery->interpoType == TSDB_INTERPO_SET_VALUE) {
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-
-        // only the function of interp needs the corresponding information
-        if (pCtx->functionId != TSDB_FUNC_INTERP) {
-          continue;
-        }
-
-        pCtx->numOfParams = 4;
-
-        SInterpInfo *pInterpInfo = (SInterpInfo *)pRuntimeEnv->pCtx[i].aOutputBuf;
-        pInterpInfo->pInterpDetail = calloc(1, sizeof(SInterpInfoDetail));
-
-        SInterpInfoDetail *pInterpDetail = pInterpInfo->pInterpDetail;
-
-        // for primary timestamp column, set the flag
-        if (pQuery->pSelectExpr[i].pBase.colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-          pInterpDetail->primaryCol = 1;
-        }
-
-        tVariantCreateFromBinary(&pCtx->param[3], (char *)&count, sizeof(count), TSDB_DATA_TYPE_INT);
-
-        if (isNull((char *)&pQuery->defaultVal[i], pCtx->inputType)) {
-          pCtx->param[1].nType = TSDB_DATA_TYPE_NULL;
-        } else {
-          tVariantCreateFromBinary(&pCtx->param[1], (char *)&pQuery->defaultVal[i], pCtx->inputBytes, pCtx->inputType);
-        }
-
-        pInterpDetail->ts = pSupporter->rawSKey;
-        pInterpDetail->type = pQuery->interpoType;
-      }
-    } else {
-      TSKEY prevKey = *(TSKEY *)pPointInterpSupport->pPrevPoint[0];
-      TSKEY nextKey = *(TSKEY *)pPointInterpSupport->pNextPoint[0];
-
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-
-        // tag column does not need the interp environment
-        if (pQuery->pSelectExpr[i].pBase.functionId == TSDB_FUNC_TAG) {
-          continue;
-        }
-
-        int32_t colInBuf = pQuery->pSelectExpr[i].pBase.colInfo.colIdxInBuf;
-
-        SInterpInfo *pInterpInfo = (SInterpInfo *)pRuntimeEnv->pCtx[i].aOutputBuf;
-
-        pInterpInfo->pInterpDetail = calloc(1, sizeof(SInterpInfoDetail));
-        SInterpInfoDetail *pInterpDetail = pInterpInfo->pInterpDetail;
-
-        int32_t type = GET_COLUMN_TYPE(pQuery, i);
-
-        // for primary timestamp column, set the flag
-        if (pQuery->pSelectExpr[i].pBase.colInfo.colId == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-          pInterpDetail->primaryCol = 1;
-        } else {
-          doSetInterpVal(pCtx, prevKey, type, 1, pPointInterpSupport->pPrevPoint[colInBuf]);
-          doSetInterpVal(pCtx, nextKey, type, 2, pPointInterpSupport->pNextPoint[colInBuf]);
-        }
-
-        tVariantCreateFromBinary(&pRuntimeEnv->pCtx[i].param[3], (char *)&count, sizeof(count), TSDB_DATA_TYPE_INT);
-
-        pInterpDetail->ts = pSupporter->rawSKey;
-        pInterpDetail->type = pQuery->interpoType;
-      }
-    }
-  }
-}
-
-void pointInterpSupporterInit(SQuery *pQuery, SPointInterpoSupporter *pInterpoSupport) {
-  if (isPointInterpoQuery(pQuery)) {
-    pInterpoSupport->pPrevPoint = malloc(pQuery->numOfCols * POINTER_BYTES);
-    pInterpoSupport->pNextPoint = malloc(pQuery->numOfCols * POINTER_BYTES);
-
-    pInterpoSupport->numOfCols = pQuery->numOfCols;
-
-    /* get appropriated size for one row data source*/
-    int32_t len = 0;
-    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-      len += pQuery->colList[i].data.bytes;
-    }
-
-    assert(PRIMARY_TSCOL_LOADED(pQuery));
-
-    void *prev = calloc(1, len);
-    void *next = calloc(1, len);
-
-    int32_t offset = 0;
-
-    for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-      pInterpoSupport->pPrevPoint[i] = prev + offset;
-      pInterpoSupport->pNextPoint[i] = next + offset;
-
-      offset += pQuery->colList[i].data.bytes;
-    }
-  }
-}
-
-void pointInterpSupporterDestroy(SPointInterpoSupporter *pPointInterpSupport) {
-  if (pPointInterpSupport->numOfCols <= 0 || pPointInterpSupport->pPrevPoint == NULL) {
-    return;
-  }
-
-  tfree(pPointInterpSupport->pPrevPoint[0]);
-  tfree(pPointInterpSupport->pNextPoint[0]);
-
-  tfree(pPointInterpSupport->pPrevPoint);
-  tfree(pPointInterpSupport->pNextPoint);
-
-  pPointInterpSupport->numOfCols = 0;
-}
-
-static void allocMemForInterpo(SMeterQuerySupportObj *pSupporter, SQuery *pQuery, SMeterObj *pMeterObj) {
-  if (pQuery->interpoType != TSDB_INTERPO_NONE) {
-    assert(pQuery->nAggTimeInterval > 0 || (pQuery->nAggTimeInterval == 0 && isPointInterpoQuery(pQuery)));
-
-    if (pQuery->nAggTimeInterval > 0) {
-      pSupporter->runtimeEnv.pInterpoBuf = malloc(POINTER_BYTES * pQuery->numOfOutputCols);
-
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        pSupporter->runtimeEnv.pInterpoBuf[i] =
-            calloc(1, sizeof(tFilePage) + pQuery->pSelectExpr[i].resBytes * pMeterObj->pointsPerFileBlock);
-      }
-    }
-  }
-}
-
-static int32_t allocateOutputBufForGroup(SMeterQuerySupportObj *pSupporter, SQuery *pQuery, bool isMetricQuery) {
-  int32_t slot = 0;
-
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    slot = 10000;
-  } else {
-    slot = pSupporter->pSidSet->numOfSubSet;
-  }
-
-  pSupporter->pResult = calloc(1, sizeof(SOutputRes) * slot);
-  if (pSupporter->pResult == NULL) {
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  for (int32_t k = 0; k < slot; ++k) {
-    SOutputRes *pOneRes = &pSupporter->pResult[k];
-    pOneRes->nAlloc = 1;
-
-    /*
-     * for single table top/bottom query, the output for group by normal column, the output rows is
-     * equals to the maximum rows, instead of 1.
-     */
-    if (!isMetricQuery && isTopBottomQuery(pQuery)) {
-      assert(pQuery->numOfOutputCols > 1);
-
-      SSqlFunctionExpr *pExpr = &pQuery->pSelectExpr[1];
-      pOneRes->nAlloc = pExpr->pBase.arg[0].argValue.i64;
-    }
-
-    createGroupResultBuf(pQuery, pOneRes, isMetricQuery);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t allocateRuntimeEnvBuf(SQueryRuntimeEnv *pRuntimeEnv, SMeterObj *pMeterObj) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  // To make sure the start position of each buffer is aligned to 4bytes in 32-bit ARM system.
-  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    int32_t bytes = pQuery->colList[i].data.bytes;
-    pRuntimeEnv->colDataBuffer[i] = calloc(1, sizeof(SData) + EXTRA_BYTES + pMeterObj->pointsPerFileBlock * bytes);
-    if (pRuntimeEnv->colDataBuffer[i] == NULL) {
-      goto _error_clean;
-    }
-  }
-
-  // record the maximum column width among columns of this meter/metric
-  int32_t maxColWidth = pQuery->colList[0].data.bytes;
-  for (int32_t i = 1; i < pQuery->numOfCols; ++i) {
-    int32_t bytes = pQuery->colList[i].data.bytes;
-    if (bytes > maxColWidth) {
-      maxColWidth = bytes;
-    }
-  }
-
-  pRuntimeEnv->primaryColBuffer = NULL;
-  if (PRIMARY_TSCOL_LOADED(pQuery)) {
-    pRuntimeEnv->primaryColBuffer = pRuntimeEnv->colDataBuffer[0];
-  } else {
-    pRuntimeEnv->primaryColBuffer =
-        (SData *)malloc(pMeterObj->pointsPerFileBlock * TSDB_KEYSIZE + sizeof(SData) + EXTRA_BYTES);
-  }
-
-  pRuntimeEnv->unzipBufSize = (size_t)(maxColWidth * pMeterObj->pointsPerFileBlock + EXTRA_BYTES);  // plus extra_bytes
-
-  pRuntimeEnv->unzipBuffer = (char *)calloc(1, pRuntimeEnv->unzipBufSize);
-  pRuntimeEnv->secondaryUnzipBuffer = (char *)calloc(1, pRuntimeEnv->unzipBufSize);
-
-  if (pRuntimeEnv->unzipBuffer == NULL || pRuntimeEnv->secondaryUnzipBuffer == NULL ||
-      pRuntimeEnv->primaryColBuffer == NULL) {
-    goto _error_clean;
-  }
-
-  return TSDB_CODE_SUCCESS;
-
-_error_clean:
-  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfCols; ++i) {
-    tfree(pRuntimeEnv->colDataBuffer[i]);
-  }
-
-  tfree(pRuntimeEnv->unzipBuffer);
-  tfree(pRuntimeEnv->secondaryUnzipBuffer);
-
-  if (!PRIMARY_TSCOL_LOADED(pQuery)) {
-    tfree(pRuntimeEnv->primaryColBuffer);
-  }
-
-  return TSDB_CODE_SERV_OUT_OF_MEMORY;
-}
-
-int32_t vnodeQuerySingleMeterPrepare(SQInfo *pQInfo, SMeterObj *pMeterObj, SMeterQuerySupportObj *pSupporter,
-                                     void *param) {
-  SQuery *pQuery = &pQInfo->query;
-  int32_t code = TSDB_CODE_SUCCESS;
-
-  /*
-   * only the successful complete requries the sem_post/over = 1 operations.
-   */
-  if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) ||
-      (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) {
-    dTrace("QInfo:%p no result in time range %" PRId64 "-%" PRId64 ", order %d", pQInfo, pQuery->skey, pQuery->ekey,
-           pQuery->order.order);
-
-    sem_post(&pQInfo->dataReady);
-    pQInfo->over = 1;
-    return TSDB_CODE_SUCCESS;
-  }
-
-  setScanLimitationByResultBuffer(pQuery);
-  changeExecuteScanOrder(pQuery, false);
-
-  pQInfo->over = 0;
-  pQInfo->pointsRead = 0;
-  pQuery->pointsRead = 0;
-
-  // dataInCache requires lastKey value
-  pQuery->lastKey = pQuery->skey;
-
-  doInitQueryFileInfoFD(&pSupporter->runtimeEnv.vnodeFileInfo);
-
-  vnodeInitDataBlockInfo(&pSupporter->runtimeEnv.loadBlockInfo);
-  vnodeInitLoadCompBlockInfo(&pSupporter->runtimeEnv.loadCompBlockInfo);
-
-  // check data in file or cache
-  bool dataInCache = true;
-  bool dataInDisk = true;
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  pRuntimeEnv->pQuery = pQuery;
-  pRuntimeEnv->pMeterObj = pMeterObj;
-
-  if ((code = allocateRuntimeEnvBuf(pRuntimeEnv, pMeterObj)) != TSDB_CODE_SUCCESS) {
-    return code;
-  }
-
-  vnodeCheckIfDataExists(pRuntimeEnv, pMeterObj, &dataInDisk, &dataInCache);
-
-  /* data in file or cache is not qualified for the query. abort */
-  if (!(dataInCache || dataInDisk)) {
-    dTrace("QInfo:%p no result in query", pQInfo);
-    sem_post(&pQInfo->dataReady);
-    pQInfo->over = 1;
-    return code;
-  }
-
-  pRuntimeEnv->pTSBuf = param;
-  pRuntimeEnv->cur.vnodeIndex = -1;
-  if (param != NULL) {
-    int16_t order = (pQuery->order.order == pRuntimeEnv->pTSBuf->tsOrder) ? TSQL_SO_ASC : TSQL_SO_DESC;
-    tsBufSetTraverseOrder(pRuntimeEnv->pTSBuf, order);
-  }
-
-  // create runtime environment
-  code = setupQueryRuntimeEnv(pMeterObj, pQuery, &pSupporter->runtimeEnv, NULL, pQuery->order.order, false);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
-
-  vnodeRecordAllFiles(pQInfo, pMeterObj->vnode);
-
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    if ((code = allocateOutputBufForGroup(pSupporter, pQuery, false)) != TSDB_CODE_SUCCESS) {
-      return code;
-    }
-
-    int16_t type = TSDB_DATA_TYPE_NULL;
-    if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-      type = getGroupbyColumnType(pQuery, pQuery->pGroupbyExpr);
-    } else {
-      type = TSDB_DATA_TYPE_TIMESTAMP;
-    }
-
-    // todo bug!
-    initSlidingWindowInfo(&pRuntimeEnv->swindowResInfo, 3, type, pSupporter->pResult);
-  }
-
-  pSupporter->rawSKey = pQuery->skey;
-  pSupporter->rawEKey = pQuery->ekey;
-
-  /* query on single table */
-  pSupporter->numOfMeters = 1;
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-
-  SPointInterpoSupporter interpInfo = {0};
-  pointInterpSupporterInit(pQuery, &interpInfo);
-
-  /*
-   * in case of last_row query without query range, we set the query timestamp to
-   * pMeterObj->lastKey. Otherwise, keep the initial query time range unchanged.
-   */
-
-  if (isFirstLastRowQuery(pQuery) && notHasQueryTimeRange(pQuery)) {
-    if (!normalizeUnBoundLastRowQuery(pSupporter, &interpInfo)) {
-      sem_post(&pQInfo->dataReady);
-      pQInfo->over = 1;
-
-      pointInterpSupporterDestroy(&interpInfo);
-      return TSDB_CODE_SUCCESS;
-    }
-  } else {
-    // find the skey and ekey in case of sliding query
-    // todo refactor
-    if (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0) {
-      int64_t skey = 0;
-
-      SWAP(pQuery->skey, pQuery->ekey, int64_t);
-      pQuery->order.order ^= 1;
-      pQuery->lastKey = pQuery->skey;
-
-      if (normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, &interpInfo, &skey) == false) {
-        sem_post(&pQInfo->dataReady);
-        pQInfo->over = 1;
-
-        pointInterpSupporterDestroy(&interpInfo);
-        return TSDB_CODE_SUCCESS;
-      }
-
-      pQuery->skey = skey;
-
-      pQuery->order.order ^= 1;
-      SWAP(pQuery->skey, pQuery->ekey, int64_t);
-
-      int64_t ekey = 0;
-      pQuery->lastKey = pQuery->skey;
-      if (normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, &interpInfo, &ekey) == false) {
-        //
-      }
-
-      pQuery->skey = ekey;
-
-      TSKEY skey1, ekey1;
-      TSKEY windowSKey = 0, windowEKey = 0;
-
-      TSKEY minKey = MIN(pQuery->skey, pQuery->ekey);
-      TSKEY maxKey = MAX(pQuery->skey, pQuery->ekey);
-
-      doGetAlignedIntervalQueryRangeImpl(pQuery, minKey, minKey, maxKey, &skey1, &ekey1, &windowSKey, &windowEKey);
-      pRuntimeEnv->swindowResInfo.startTime = windowSKey;
-
-      pSupporter->rawSKey = pQuery->skey;
-      pSupporter->rawEKey = pQuery->ekey;
-
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        pRuntimeEnv->swindowResInfo.prevSKey = windowSKey;
-      } else {
-        pRuntimeEnv->swindowResInfo.prevSKey = windowSKey + ((pQuery->skey - windowSKey) / pQuery->slidingTime) * pQuery->slidingTime;
-      }
-    } else {
-      int64_t ekey = 0;
-      if ((normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, &interpInfo, &ekey) == false) ||
-          (isFixedOutputQuery(pQuery) && !isTopBottomQuery(pQuery) && (pQuery->limit.offset > 0)) ||
-          (isTopBottomQuery(pQuery) && pQuery->limit.offset >= pQuery->pSelectExpr[1].pBase.arg[0].argValue.i64)) {
-        sem_post(&pQInfo->dataReady);
-        pQInfo->over = 1;
-
-        pointInterpSupporterDestroy(&interpInfo);
-        return TSDB_CODE_SUCCESS;
-      }
-    }
-  }
-
-  /*
-   * here we set the value for before and after the specified time into the
-   * parameter for interpolation query
-   */
-  pointInterpSupporterSetData(pQInfo, &interpInfo);
-  pointInterpSupporterDestroy(&interpInfo);
-
-  if (!forwardQueryStartPosIfNeeded(pQInfo, pSupporter, dataInDisk, dataInCache)) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  int64_t rs = taosGetIntervalStartTimestamp(pSupporter->rawSKey, pQuery->nAggTimeInterval, pQuery->intervalTimeUnit,
-                                             pQuery->precision);
-  taosInitInterpoInfo(&pRuntimeEnv->interpoInfo, pQuery->order.order, rs, 0, 0);
-  allocMemForInterpo(pSupporter, pQuery, pMeterObj);
-
-  if (!isPointInterpoQuery(pQuery)) {
-    assert(pQuery->pos >= 0 && pQuery->slot >= 0);
-  }
-
-  // the pQuery->skey is changed during normalizedFirstQueryRange, so set the newest lastkey value
-  pQuery->lastKey = pQuery->skey;
-  return TSDB_CODE_SUCCESS;
-}
-
-void vnodeQueryFreeQInfoEx(SQInfo *pQInfo) {
-  if (pQInfo == NULL || pQInfo->pMeterQuerySupporter == NULL) {
-    return;
-  }
-
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  teardownQueryRuntimeEnv(&pSupporter->runtimeEnv);
-  tfree(pSupporter->pMeterSidExtInfo);
-
-  if (pSupporter->pMetersHashTable != NULL) {
-    taosCleanUpHashTable(pSupporter->pMetersHashTable);
-    pSupporter->pMetersHashTable = NULL;
-  }
-
-  if (pSupporter->pSidSet != NULL || isGroupbyNormalCol(pQInfo->query.pGroupbyExpr) ||
-      (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    int32_t size = 0;
-    if (isGroupbyNormalCol(pQInfo->query.pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-      size = 10000;
-    } else if (pSupporter->pSidSet != NULL) {
-      size = pSupporter->pSidSet->numOfSubSet;
-    }
-
-    for (int32_t i = 0; i < size; ++i) {
-      destroyGroupResultBuf(&pSupporter->pResult[i], pQInfo->query.numOfOutputCols);
-    }
-  }
-
-  if (FD_VALID(pSupporter->meterOutputFd)) {
-    assert(pSupporter->meterOutputMMapBuf != NULL);
-    dTrace("QInfo:%p disk-based output buffer during query:%" PRId64 " bytes", pQInfo, pSupporter->bufSize);
-    munmap(pSupporter->meterOutputMMapBuf, pSupporter->bufSize);
-    tclose(pSupporter->meterOutputFd);
-
-    unlink(pSupporter->extBufFile);
-  }
-
-  tSidSetDestroy(&pSupporter->pSidSet);
-
-  if (pSupporter->pMeterDataInfo != NULL) {
-    for (int32_t j = 0; j < pSupporter->numOfMeters; ++j) {
-      destroyMeterQueryInfo(pSupporter->pMeterDataInfo[j].pMeterQInfo, pQuery->numOfOutputCols);
-      free(pSupporter->pMeterDataInfo[j].pBlock);
-    }
-  }
-
-  tfree(pSupporter->pMeterDataInfo);
-
-  tfree(pSupporter->pResult);
-  tfree(pQInfo->pMeterQuerySupporter);
-}
-
-int32_t vnodeMultiMeterQueryPrepare(SQInfo *pQInfo, SQuery *pQuery, void *param) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey > pQuery->ekey)) ||
-      (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey > pQuery->skey))) {
-    dTrace("QInfo:%p no result in time range %" PRId64 "-%" PRId64 ", order %d", pQInfo, pQuery->skey, pQuery->ekey,
-           pQuery->order.order);
-
-    sem_post(&pQInfo->dataReady);
-    pQInfo->over = 1;
-
-    return TSDB_CODE_SUCCESS;
-  }
-
-  pQInfo->over = 0;
-  pQInfo->pointsRead = 0;
-  pQuery->pointsRead = 0;
-
-  changeExecuteScanOrder(pQuery, true);
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  doInitQueryFileInfoFD(&pRuntimeEnv->vnodeFileInfo);
-  vnodeInitDataBlockInfo(&pRuntimeEnv->loadBlockInfo);
-  vnodeInitLoadCompBlockInfo(&pRuntimeEnv->loadCompBlockInfo);
-
-  /*
-   * since we employ the output control mechanism in main loop.
-   * so, disable it during data block scan procedure.
-   */
-  setScanLimitationByResultBuffer(pQuery);
-
-  // save raw query range for applying to each subgroup
-  pSupporter->rawEKey = pQuery->ekey;
-  pSupporter->rawSKey = pQuery->skey;
-  pQuery->lastKey = pQuery->skey;
-
-  // create runtime environment
-  SSchema *pTagSchema = NULL;
-
-  tTagSchema *pTagSchemaInfo = pSupporter->pSidSet->pTagSchema;
-  if (pTagSchemaInfo != NULL) {
-    pTagSchema = pTagSchemaInfo->pSchema;
-  }
-
-  // get one queried meter
-  SMeterObj *pMeter = getMeterObj(pSupporter->pMetersHashTable, pSupporter->pSidSet->pSids[0]->sid);
-
-  pRuntimeEnv->pTSBuf = param;
-  pRuntimeEnv->cur.vnodeIndex = -1;
-
-  // set the ts-comp file traverse order
-  if (param != NULL) {
-    int16_t order = (pQuery->order.order == pRuntimeEnv->pTSBuf->tsOrder) ? TSQL_SO_ASC : TSQL_SO_DESC;
-    tsBufSetTraverseOrder(pRuntimeEnv->pTSBuf, order);
-  }
-
-  int32_t ret = setupQueryRuntimeEnv(pMeter, pQuery, &pSupporter->runtimeEnv, pTagSchema, TSQL_SO_ASC, true);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return ret;
-  }
-
-  ret = allocateRuntimeEnvBuf(pRuntimeEnv, pMeter);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return ret;
-  }
-
-  tSidSetSort(pSupporter->pSidSet);
-  vnodeRecordAllFiles(pQInfo, pMeter->vnode);
-
-  if ((ret = allocateOutputBufForGroup(pSupporter, pQuery, true)) != TSDB_CODE_SUCCESS) {
-    return ret;
-  }
-
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {  // group by columns not tags;
-    int16_t type = getGroupbyColumnType(pQuery, pQuery->pGroupbyExpr);
-    initSlidingWindowInfo(&pRuntimeEnv->swindowResInfo, 10039, type, pSupporter->pResult);
-  }
-
-  if (pQuery->nAggTimeInterval != 0) {
-    getTmpfilePath("tb_metric_mmap", pSupporter->extBufFile);
-    pSupporter->meterOutputFd = open(pSupporter->extBufFile, O_CREAT | O_RDWR, 0666);
-
-    if (!FD_VALID(pSupporter->meterOutputFd)) {
-      dError("QInfo:%p failed to create file: %s on disk. %s", pQInfo, pSupporter->extBufFile, strerror(errno));
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-
-    pSupporter->numOfPages = pSupporter->numOfMeters;
-
-    ret = ftruncate(pSupporter->meterOutputFd, pSupporter->numOfPages * DEFAULT_INTERN_BUF_SIZE);
-    if (ret != TSDB_CODE_SUCCESS) {
-      dError("QInfo:%p failed to create intermediate result output file:%s. %s", pQInfo, pSupporter->extBufFile,
-             strerror(errno));
-      return TSDB_CODE_SERV_NO_DISKSPACE;
-    }
-
-    pRuntimeEnv->numOfRowsPerPage = (DEFAULT_INTERN_BUF_SIZE - sizeof(tFilePage)) / pQuery->rowSize;
-    pSupporter->lastPageId = -1;
-    pSupporter->bufSize = pSupporter->numOfPages * DEFAULT_INTERN_BUF_SIZE;
-
-    pSupporter->meterOutputMMapBuf =
-        mmap(NULL, pSupporter->bufSize, PROT_READ | PROT_WRITE, MAP_SHARED, pSupporter->meterOutputFd, 0);
-    if (pSupporter->meterOutputMMapBuf == MAP_FAILED) {
-      dError("QInfo:%p failed to map temp file: %s. %s", pQInfo, pSupporter->extBufFile, strerror(errno));
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-  }
-
-  // metric query do not invoke interpolation, it will be done at the second-stage merge
-  if (!isPointInterpoQuery(pQuery)) {
-    pQuery->interpoType = TSDB_INTERPO_NONE;
-  }
-
-  TSKEY revisedStime = taosGetIntervalStartTimestamp(pSupporter->rawSKey, pQuery->nAggTimeInterval,
-                                                     pQuery->intervalTimeUnit, pQuery->precision);
-  taosInitInterpoInfo(&pRuntimeEnv->interpoInfo, pQuery->order.order, revisedStime, 0, 0);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/**
- * decrease the refcount for each table involved in this query
- * @param pQInfo
- */
-void vnodeDecMeterRefcnt(SQInfo *pQInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  if (pSupporter == NULL || pSupporter->numOfMeters == 1) {
-    atomic_fetch_sub_32(&pQInfo->pObj->numOfQueries, 1);
-    dTrace("QInfo:%p vid:%d sid:%d meterId:%s, query is over, numOfQueries:%d", pQInfo, pQInfo->pObj->vnode,
-           pQInfo->pObj->sid, pQInfo->pObj->meterId, pQInfo->pObj->numOfQueries);
-  } else {
-    int32_t num = 0;
-    for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
-      SMeterObj *pMeter = getMeterObj(pSupporter->pMetersHashTable, pSupporter->pSidSet->pSids[i]->sid);
-      atomic_fetch_sub_32(&(pMeter->numOfQueries), 1);
-
-      if (pMeter->numOfQueries > 0) {
-        dTrace("QInfo:%p vid:%d sid:%d meterId:%s, query is over, numOfQueries:%d", pQInfo, pMeter->vnode, pMeter->sid,
-               pMeter->meterId, pMeter->numOfQueries);
-        num++;
-      }
-    }
-
-    /*
-     * in order to reduce log output, for all meters of which numOfQueries count are 0,
-     * we do not output corresponding information
-     */
-    num = pSupporter->numOfMeters - num;
-    dTrace("QInfo:%p metric query is over, dec query ref for %d meters, numOfQueries on %d meters are 0", pQInfo,
-           pSupporter->numOfMeters, num);
-  }
-}
-
-TSKEY getTimestampInCacheBlock(SQueryRuntimeEnv *pRuntimeEnv, SCacheBlock *pBlock, int32_t index) {
-  if (pBlock == NULL || index >= pBlock->numOfPoints || index < 0) {
-    return -1;
-  }
-
-  return ((TSKEY *)(pRuntimeEnv->primaryColBuffer->data))[index];
-}
-
-/*
- * NOTE: pQuery->pos will not change, the corresponding data block will be loaded into buffer
- * loadDataBlockOnDemand will change the value of pQuery->pos, according to the pQuery->lastKey
- */
-TSKEY getTimestampInDiskBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t index) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  /*
-   * the corresponding compblock info has been loaded already
-   * todo add check for compblock loaded
-   */
-  SCompBlock *pBlock = getDiskDataBlock(pQuery, pQuery->slot);
-
-  // this block must be loaded into buffer
-  SLoadDataBlockInfo *pLoadInfo = &pRuntimeEnv->loadBlockInfo;
-  assert(pQuery->pos >= 0 && pQuery->pos < pBlock->numOfPoints);
-
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  int32_t fileIndex = vnodeGetVnodeHeaderFileIdx(&pQuery->fileId, pRuntimeEnv, pQuery->order.order);
-
-  dTrace("QInfo:%p vid:%d sid:%d id:%s, fileId:%d, slot:%d load data block due to primary key required",
-         GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, pQuery->slot);
-
-  bool    loadTS = true;
-  bool    loadFields = true;
-  int32_t slot = pQuery->slot;
-
-  int32_t ret = loadDataBlockIntoMem(pBlock, &pQuery->pFields[slot], pRuntimeEnv, fileIndex, loadTS, loadFields);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return -1;
-  }
-
-  SET_DATA_BLOCK_LOADED(pRuntimeEnv->blockStatus);
-  SET_FILE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
-
-  assert(pQuery->fileId == pLoadInfo->fileId && pQuery->slot == pLoadInfo->slotIdx);
-  return ((TSKEY *)pRuntimeEnv->primaryColBuffer->data)[index];
-}
-
-// todo remove this function
-static TSKEY getFirstDataBlockInCache(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  assert(pQuery->fileId == -1 && QUERY_IS_ASC_QUERY(pQuery));
-
-  /*
-   * get the start position in cache according to the pQuery->lastkey
-   *
-   * In case of cache and disk file data overlaps and all required data are commit to disk file,
-   * there are no qualified data available in cache, we need to set the QUERY_COMPLETED flag.
-   *
-   * If cache data and disk-based data are not completely overlapped, cacheBoundaryCheck function will set the
-   * correct status flag.
-   */
-  TSKEY nextTimestamp = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, true);
-  if (nextTimestamp < 0) {
-    setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-  } else if (nextTimestamp > pQuery->ekey) {
-    setQueryStatus(pQuery, QUERY_COMPLETED);
-  }
-
-  return nextTimestamp;
-}
-
-TSKEY getQueryPositionForCacheInvalid(SQueryRuntimeEnv *pRuntimeEnv, __block_search_fn_t searchFn) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SQInfo *   pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-  int32_t    step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  dTrace(
-      "QInfo:%p vid:%d sid:%d id:%s cache block re-allocated to other meter, "
-      "try get query start position in file/cache, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64,
-      pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey);
-
-  if (step == QUERY_DESC_FORWARD_STEP) {
-    /*
-     * In descending order query, if the cache is invalid, it must be flushed to disk.
-     * Try to find the appropriate position in file, and no need to search cache any more.
-     */
-    bool ret = getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_LESS_EQUAL, searchFn);
-
-    dTrace("QInfo:%p vid:%d sid:%d id:%s find the possible position in file, fileId:%d, slot:%d, pos:%d", pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, pQuery->slot, pQuery->pos);
-
-    if (ret) {
-      TSKEY key = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-
-      // key in query range. If not, no qualified in disk file
-      if (key < pQuery->ekey) {
-        setQueryStatus(pQuery, QUERY_COMPLETED);
-      }
-
-      return key;
-    } else {
-      setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-      return -1;  // no data to check
-    }
-  } else {  // asc query
-    bool ret = getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_GREATER_EQUAL, searchFn);
-    if (ret) {
-      dTrace("QInfo:%p vid:%d sid:%d id:%s find the possible position, fileId:%d, slot:%d, pos:%d", pQInfo,
-             pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, pQuery->slot, pQuery->pos);
-
-      TSKEY key = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-
-      // key in query range. If not, no qualified in disk file
-      if (key > pQuery->ekey) {
-        setQueryStatus(pQuery, QUERY_COMPLETED);
-      }
-
-      return key;
-    } else {
-      /*
-       * all data in file is less than the pQuery->lastKey, try cache again.
-       * cache block status will be set in getFirstDataBlockInCache function
-       */
-      TSKEY key = getFirstDataBlockInCache(pRuntimeEnv);
-
-      dTrace("QInfo:%p vid:%d sid:%d id:%s find the new position in cache, fileId:%d, slot:%d, pos:%d", pQInfo,
-             pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->fileId, pQuery->slot, pQuery->pos);
-      return key;
-    }
-  }
-}
-
-static int32_t moveToNextBlockInCache(SQueryRuntimeEnv *pRuntimeEnv, int32_t step, __block_search_fn_t searchFn) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-  assert(pQuery->fileId < 0);
-
-  /*
-   * ascending order to last cache block all data block in cache have been iterated, no need to set
-   * pRuntimeEnv->nextPos. done
-   */
-  if (step == QUERY_ASC_FORWARD_STEP && pQuery->slot == pQuery->currentSlot) {
-    setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-    return DISK_DATA_LOADED;
-  }
-
-  /*
-   * descending order to first cache block, try file
-   * NOTE: use the real time cache information, not the snapshot
-   */
-  int32_t numOfBlocks = pCacheInfo->numOfBlocks;
-  int32_t currentSlot = pCacheInfo->currentSlot;
-
-  int32_t firstSlot = getFirstCacheSlot(numOfBlocks, currentSlot, pCacheInfo);
-
-  if (step == QUERY_DESC_FORWARD_STEP && pQuery->slot == firstSlot) {
-    bool ret = getQualifiedDataBlock(pMeterObj, pRuntimeEnv, QUERY_RANGE_LESS_EQUAL, searchFn);
-    if (ret) {
-      TSKEY key = getTimestampInDiskBlock(pRuntimeEnv, pQuery->pos);
-
-      // key in query range. If not, no qualified in disk file
-      if (key < pQuery->ekey) {
-        setQueryStatus(pQuery, QUERY_COMPLETED);
-      }
-
-      // the skip operation does NOT set the startPos yet
-      //      assert(pRuntimeEnv->startPos.fileId < 0);
-    } else {
-      setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-    }
-    return DISK_DATA_LOADED;
-  }
-
-  /* now still iterate the cache data blocks */
-  pQuery->slot = (pQuery->slot + step + pCacheInfo->maxBlocks) % pCacheInfo->maxBlocks;
-  SCacheBlock *pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-
-  /*
-   * data in this cache block has been flushed to disk, then we should locate the start position in file.
-   * In both desc/asc query, this situation may occur. And we need to locate the start query position in file or cache.
-   */
-  if (pBlock == NULL) {
-    getQueryPositionForCacheInvalid(pRuntimeEnv, searchFn);
-
-    return DISK_DATA_LOADED;
-  } else {
-    pQuery->pos = (QUERY_IS_ASC_QUERY(pQuery)) ? 0 : pBlock->numOfPoints - 1;
-
-    TSKEY startkey = getTimestampInCacheBlock(pRuntimeEnv, pBlock, pQuery->pos);
-    if (startkey < 0) {
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-    }
-
-    SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
-
-    dTrace("QInfo:%p check cache block, blockId:%d slot:%d pos:%d, blockstatus:%d", GET_QINFO_ADDR(pQuery),
-           pQuery->blockId, pQuery->slot, pQuery->pos, pRuntimeEnv->blockStatus);
-  }
-
-  return DISK_DATA_LOADED;
-}
-
-/**
- *  move the cursor to next block and not load
- */
-static int32_t moveToNextBlock(SQueryRuntimeEnv *pRuntimeEnv, int32_t step, __block_search_fn_t searchFn,
-                               bool loadData) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  SET_DATA_BLOCK_NOT_LOADED(pRuntimeEnv->blockStatus);
-
-  if (pQuery->fileId >= 0) {
-    int32_t fileIndex = -1;
-
-    /*
-     * 1. ascending  order. The last data block of data file
-     * 2. descending order. The first block of file
-     */
-    if ((step == QUERY_ASC_FORWARD_STEP && (pQuery->slot == pQuery->numOfBlocks - 1)) ||
-        (step == QUERY_DESC_FORWARD_STEP && (pQuery->slot == 0))) {
-      fileIndex = getNextDataFileCompInfo(pRuntimeEnv, pMeterObj, step);
-      /* data maybe in cache */
-
-      if (fileIndex >= 0) {  // next file
-        pQuery->slot = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->numOfBlocks - 1;
-        pQuery->pos = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->pBlock[pQuery->slot].numOfPoints - 1;
-      } else {  // try data in cache
-        assert(pQuery->fileId == -1);
-
-        if (step == QUERY_ASC_FORWARD_STEP) {
-          getFirstDataBlockInCache(pRuntimeEnv);
-        } else {  // no data to check for desc order query
-          setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-        }
-
-        return DISK_DATA_LOADED;
-      }
-    } else {  // next block in the same file
-      int32_t fid = pQuery->fileId;
-      fileIndex = vnodeGetVnodeHeaderFileIdx(&fid, pRuntimeEnv, pQuery->order.order);
-
-      pQuery->slot += step;
-      pQuery->pos = (step == QUERY_ASC_FORWARD_STEP) ? 0 : pQuery->pBlock[pQuery->slot].numOfPoints - 1;
-    }
-
-    assert(pQuery->pBlock != NULL);
-
-    /* no need to load data, return directly */
-    if (!loadData) {
-      return DISK_DATA_LOADED;
-    }
-
-    // load data block function will change the value of pQuery->pos
-    int32_t ret =
-        LoadDatablockOnDemand(&pQuery->pBlock[pQuery->slot], &pQuery->pFields[pQuery->slot], &pRuntimeEnv->blockStatus,
-                              pRuntimeEnv, fileIndex, pQuery->slot, searchFn, true);
-    if (ret != DISK_DATA_LOADED) {
-      return ret;
-    }
-  } else {  // data in cache
-    return moveToNextBlockInCache(pRuntimeEnv, step, searchFn);
-  }
-
-  return DISK_DATA_LOADED;
-}
-
-static void doHandleDataBlockImpl(SQueryRuntimeEnv *pRuntimeEnv, SBlockInfo *pblockInfo, __block_search_fn_t searchFn,
-                                  int32_t *numOfRes, int32_t blockLoadStatus, int32_t *forwardStep) {
-  SQuery *           pQuery = pRuntimeEnv->pQuery;
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-
-  TSKEY * primaryKeys = (TSKEY *)pRuntimeEnv->primaryColBuffer->data;
-  int64_t start = taosGetTimestampUs();
-
-  if (IS_DISK_DATA_BLOCK(pQuery)) {
-    SCompBlock *pBlock = getDiskDataBlock(pQuery, pQuery->slot);
-    *pblockInfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_FILE_BLOCK);
-
-    if (blockLoadStatus == DISK_DATA_LOADED) {
-      *forwardStep = applyFunctionsOnBlock(pRuntimeEnv, pblockInfo, primaryKeys, pQuery->pFields[pQuery->slot],
-                                           searchFn, numOfRes);
-    } else {
-      *forwardStep = pblockInfo->size;
-    }
-
-    pSummary->fileTimeUs += (taosGetTimestampUs() - start);
-  } else {
-    assert(vnodeIsDatablockLoaded(pRuntimeEnv, pRuntimeEnv->pMeterObj, -1, true) == DISK_BLOCK_NO_NEED_TO_LOAD);
-
-    SCacheBlock *pBlock = getCacheDataBlock(pRuntimeEnv->pMeterObj, pRuntimeEnv, pQuery->slot);
-    *pblockInfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_CACHE_BLOCK);
-
-    *forwardStep = applyFunctionsOnBlock(pRuntimeEnv, pblockInfo, primaryKeys, NULL, searchFn, numOfRes);
-
-    pSummary->cacheTimeUs += (taosGetTimestampUs() - start);
-  }
-}
-
-static void getNextLogicalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow* pTimeWindow) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-  
-  pTimeWindow->skey += (pQuery->slidingTime * factor);
-  pTimeWindow->ekey += (pQuery->slidingTime * factor);
-}
-
-static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  bool    LOAD_DATA = true;
-
-  int32_t forwardStep = 0;
-  int64_t cnt = 0;
-
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pMeterObj->searchAlgorithm];
-  int32_t             blockLoadStatus = DISK_DATA_LOADED;
-  SQueryCostSummary * pSummary = &pRuntimeEnv->summary;
-
-  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  // initial data block always be loaded
-  SPositionInfo *pStartPos = &pRuntimeEnv->startPos;
-  assert(pQuery->slot == pStartPos->slot);
-
-  dTrace("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", lastkey:%" PRId64
-         ", order:%d, start fileId:%d, slot:%d, pos:%d, bstatus:%d",
-         GET_QINFO_ADDR(pQuery), pQuery->skey, pQuery->ekey, pQuery->lastKey, pQuery->order.order, pStartPos->fileId,
-         pStartPos->slot, pStartPos->pos, pRuntimeEnv->blockStatus);
-
-  while (1) {
-    // check if query is killed or not set the status of query to pass the status check
-    if (isQueryKilled(pQuery)) {
-      setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-      return cnt;
-    }
-
-    int32_t    numOfRes = 0;
-    SBlockInfo blockInfo = {0};
-    doHandleDataBlockImpl(pRuntimeEnv, &blockInfo, searchFn, &numOfRes, blockLoadStatus, &forwardStep);
-
-    dTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64
-           ", fileId:%d, slot:%d, pos:%d, bstatus:%d, rows:%d, checked:%d",
-           GET_QINFO_ADDR(pQuery), blockInfo.keyFirst, blockInfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos,
-           pRuntimeEnv->blockStatus, blockInfo.size, forwardStep);
-
-    // save last access position
-    int32_t accessPos = pQuery->pos + (forwardStep - 1) * step;
-    savePointPosition(&pRuntimeEnv->endPos, pQuery->fileId, pQuery->slot, accessPos);
-
-    cnt += forwardStep;
-
-    if (queryCompleteInBlock(pQuery, &blockInfo, forwardStep)) {
-      int32_t nextPos = accessPos + step;
-
-      /*
-       * set the next access position, nextPos only required by
-       * 1. interval query.
-       * 2. multi-output query that may cause buffer overflow.
-       */
-      if (pQuery->nAggTimeInterval > 0 ||
-          (Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL) && pQuery->checkBufferInLoop == 1)) {
-        if (nextPos >= blockInfo.size || nextPos < 0) {
-          moveToNextBlock(pRuntimeEnv, step, searchFn, !LOAD_DATA);
-
-          // slot/pos/fileId is updated in moveToNextBlock function
-          savePointPosition(&pRuntimeEnv->nextPos, pQuery->fileId, pQuery->slot, pQuery->pos);
-        } else {
-          savePointPosition(&pRuntimeEnv->nextPos, pQuery->fileId, pQuery->slot, accessPos + step);
-        }
-      }
-      break;
-    } else {  // query not completed, move to next block
-      int64_t start = taosGetTimestampUs();
-
-      blockLoadStatus = moveToNextBlock(pRuntimeEnv, step, searchFn, LOAD_DATA);
-      if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK | QUERY_COMPLETED)) {
-        savePointPosition(&pRuntimeEnv->nextPos, pQuery->fileId, pQuery->slot, pQuery->pos);
-        setQueryStatus(pQuery, QUERY_COMPLETED);
-        break;
-      }
-
-      int64_t delta = (taosGetTimestampUs() - start);
-      if (IS_DISK_DATA_BLOCK(pQuery)) {
-        pSummary->fileTimeUs += delta;
-      } else {
-        pSummary->cacheTimeUs += delta;
-      }
-    }
-
-    // check next block
-    void *pNextBlock = getGenericDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-
-    int32_t blockType = (IS_DISK_DATA_BLOCK(pQuery)) ? BLK_FILE_BLOCK : BLK_CACHE_BLOCK;
-    blockInfo = getBlockBasicInfo(pRuntimeEnv, pNextBlock, blockType);
-    if (!checkQueryRangeAgainstNextBlock(&blockInfo, pRuntimeEnv)) {
-      break;
-    }
-  }  // while(1)
-
-  return cnt;
-}
-
-static void updatelastkey(SQuery *pQuery, SMeterQueryInfo *pMeterQInfo) { pMeterQInfo->lastKey = pQuery->lastKey; }
-
-void queryOnBlock(SMeterQuerySupportObj *pSupporter, int64_t *primaryKeys, int32_t blockStatus,
-                  SBlockInfo *pBlockBasicInfo, SMeterDataInfo *pMeterDataInfo, SField *pFields,
-                  __block_search_fn_t searchFn) {
-  /* cache blocks may be assign to other meter, abort */
-  if (pBlockBasicInfo->size <= 0) {
-    return;
-  }
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  if (pQuery->nAggTimeInterval == 0) {  // not interval query
-    int32_t numOfRes = 0;
-    applyFunctionsOnBlock(pRuntimeEnv, pBlockBasicInfo, primaryKeys, pFields, searchFn, &numOfRes);
-
-    // note: only fixed number of output for each group by operation
-    if (numOfRes > 0) {
-      pSupporter->pResult[pMeterDataInfo->groupIdx].numOfRows = numOfRes;
-    }
-
-    // used to decide the correct start position in cache after check all data in files
-    updatelastkey(pQuery, pMeterDataInfo->pMeterQInfo);
-    if (pRuntimeEnv->pTSBuf != NULL) {
-      pMeterDataInfo->pMeterQInfo->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);
-    }
-
-  } else {
-    applyIntervalQueryOnBlock(pSupporter, pMeterDataInfo, pBlockBasicInfo, blockStatus, pFields, searchFn);
-  }
-}
-
-/*
- * set tag value in SQLFunctionCtx
- * e.g.,tag information into input buffer
- */
-static void doSetTagValueInParam(tTagSchema *pTagSchema, int32_t tagColIdx, SMeterSidExtInfo *pMeterSidInfo,
-                                 tVariant *param) {
-  assert(tagColIdx >= 0);
-
-  int32_t *fieldValueOffset = pTagSchema->colOffset;
-
-  void *   pStr = (char *)pMeterSidInfo->tags + fieldValueOffset[tagColIdx];
-  SSchema *pCol = &pTagSchema->pSchema[tagColIdx];
-
-  tVariantDestroy(param);
-
-  if (isNull(pStr, pCol->type)) {
-    param->nType = TSDB_DATA_TYPE_NULL;
-  } else {
-    tVariantCreateFromBinary(param, pStr, pCol->bytes, pCol->type);
-  }
-}
-
-void vnodeSetTagValueInParam(tSidSet *pSidSet, SQueryRuntimeEnv *pRuntimeEnv, SMeterSidExtInfo *pMeterSidInfo) {
-  SQuery *    pQuery = pRuntimeEnv->pQuery;
-  tTagSchema *pTagSchema = pSidSet->pTagSchema;
-
-  SSqlFuncExprMsg *pFuncMsg = &pQuery->pSelectExpr[0].pBase;
-  if (pQuery->numOfOutputCols == 1 && pFuncMsg->functionId == TSDB_FUNC_TS_COMP) {
-    assert(pFuncMsg->numOfParams == 1);
-    doSetTagValueInParam(pTagSchema, pFuncMsg->arg->argValue.i64, pMeterSidInfo, &pRuntimeEnv->pCtx[0].tag);
-  } else {
-    // set tag value, by which the results are aggregated.
-    for (int32_t idx = 0; idx < pQuery->numOfOutputCols; ++idx) {
-      SColIndexEx *pColEx = &pQuery->pSelectExpr[idx].pBase.colInfo;
-
-      // ts_comp column required the tag value for join filter
-      if (!TSDB_COL_IS_TAG(pColEx->flag)) {
-        continue;
-      }
-
-      doSetTagValueInParam(pTagSchema, pColEx->colIdx, pMeterSidInfo, &pRuntimeEnv->pCtx[idx].tag);
-    }
-
-    // set the join tag for first column
-    SSqlFuncExprMsg *pFuncMsg = &pQuery->pSelectExpr[0].pBase;
-    if (pFuncMsg->functionId == TSDB_FUNC_TS && pFuncMsg->colInfo.colIdx == PRIMARYKEY_TIMESTAMP_COL_INDEX &&
-        pRuntimeEnv->pTSBuf != NULL) {
-      assert(pFuncMsg->numOfParams == 1);
-      doSetTagValueInParam(pTagSchema, pFuncMsg->arg->argValue.i64, pMeterSidInfo, &pRuntimeEnv->pCtx[0].tag);
-    }
-  }
-}
-
-static void doMerge(SQueryRuntimeEnv *pRuntimeEnv, int64_t timestamp, tFilePage *inputSrc, int32_t inputIdx,
-                    bool mergeFlag) {
-  SQuery *        pQuery = pRuntimeEnv->pQuery;
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (!mergeFlag) {
-      pCtx[i].aOutputBuf = pCtx[i].aOutputBuf + pCtx[i].outputBytes;
-      pCtx[i].currentStage = FIRST_STAGE_MERGE;
-
-      resetResultInfo(pCtx[i].resultInfo);
-      aAggs[functionId].init(&pCtx[i]);
-    }
-
-    pCtx[i].hasNull = true;
-    pCtx[i].nStartQueryTimestamp = timestamp;
-    pCtx[i].aInputElemBuf = ((char *)inputSrc->data) +
-                            ((int32_t)pRuntimeEnv->offset[i] * pRuntimeEnv->numOfRowsPerPage) +
-                            pCtx[i].outputBytes * inputIdx;
-
-    // in case of tag column, the tag information should be extracted from input buffer
-    if (functionId == TSDB_FUNC_TAG_DUMMY || functionId == TSDB_FUNC_TAG) {
-      tVariantDestroy(&pCtx[i].tag);
-      tVariantCreateFromBinary(&pCtx[i].tag, pCtx[i].aInputElemBuf, pCtx[i].inputBytes, pCtx[i].inputType);
-    }
-  }
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionId == TSDB_FUNC_TAG_DUMMY) {
-      continue;
-    }
-
-    aAggs[functionId].distMergeFunc(&pCtx[i]);
-  }
-}
-
-static void printBinaryData(int32_t functionId, char *data, int32_t srcDataType) {
-  if (functionId == TSDB_FUNC_FIRST_DST || functionId == TSDB_FUNC_LAST_DST) {
-    switch (srcDataType) {
-      case TSDB_DATA_TYPE_BINARY:
-        printf("%" PRId64 ",%s\t", *(TSKEY *)data, (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-      case TSDB_DATA_TYPE_BOOL:
-        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int8_t *)(data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int16_t *)(data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-      case TSDB_DATA_TYPE_TIMESTAMP:
-        printf("%" PRId64 ",%" PRId64 "\t", *(TSKEY *)data, *(TSKEY *)(data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_INT:
-        printf("%" PRId64 ",%d\t", *(TSKEY *)data, *(int32_t *)(data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        printf("%" PRId64 ",%f\t", *(TSKEY *)data, *(float *)(data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        printf("%" PRId64 ",%lf\t", *(TSKEY *)data, *(double *)(data + TSDB_KEYSIZE + 1));
-        break;
-    }
-  } else if (functionId == TSDB_FUNC_AVG) {
-    printf("%lf,%d\t", *(double *)data, *(int32_t *)(data + sizeof(double)));
-  } else if (functionId == TSDB_FUNC_SPREAD) {
-    printf("%lf,%lf\t", *(double *)data, *(double *)(data + sizeof(double)));
-  } else if (functionId == TSDB_FUNC_TWA) {
-    data += 1;
-    printf("%lf,%" PRId64 ",%" PRId64 ",%" PRId64 "\t", *(double *)data, *(int64_t *)(data + 8),
-           *(int64_t *)(data + 16), *(int64_t *)(data + 24));
-  } else if (functionId == TSDB_FUNC_MIN || functionId == TSDB_FUNC_MAX) {
-    switch (srcDataType) {
-      case TSDB_DATA_TYPE_TINYINT:
-      case TSDB_DATA_TYPE_BOOL:
-        printf("%d\t", *(int8_t *)data);
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        printf("%d\t", *(int16_t *)data);
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-      case TSDB_DATA_TYPE_TIMESTAMP:
-        printf("%" PRId64 "\t", *(int64_t *)data);
-        break;
-      case TSDB_DATA_TYPE_INT:
-        printf("%d\t", *(int *)data);
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        printf("%f\t", *(float *)data);
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        printf("%f\t", *(float *)data);
-        break;
-    }
-  } else if (functionId == TSDB_FUNC_SUM) {
-    if (srcDataType == TSDB_DATA_TYPE_FLOAT || srcDataType == TSDB_DATA_TYPE_DOUBLE) {
-      printf("%lf\t", *(float *)data);
-    } else {
-      printf("%" PRId64 "\t", *(int64_t *)data);
-    }
-  } else {
-    printf("%s\t", data);
-  }
-}
-
-void UNUSED_FUNC displayInterResult(SData **pdata, SQuery *pQuery, int32_t numOfRows) {
-  int32_t numOfCols = pQuery->numOfOutputCols;
-  printf("metric query intern-result, total:%d\n", numOfRows);
-
-  SQInfo *   pQInfo = (SQInfo *)(GET_QINFO_ADDR(pQuery));
-  SMeterObj *pMeterObj = pQInfo->pObj;
-
-  for (int32_t j = 0; j < numOfRows; ++j) {
-    for (int32_t i = 0; i < numOfCols; ++i) {
-      switch (pQuery->pSelectExpr[i].resType) {
-        case TSDB_DATA_TYPE_BINARY: {
-          int32_t colIdx = pQuery->pSelectExpr[i].pBase.colInfo.colIdx;
-          int32_t type = 0;
-
-          if (TSDB_COL_IS_TAG(pQuery->pSelectExpr[i].pBase.colInfo.flag)) {
-            type = pQuery->pSelectExpr[i].resType;
-          } else {
-            type = pMeterObj->schema[colIdx].type;
-          }
-          printBinaryData(pQuery->pSelectExpr[i].pBase.functionId, pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j,
-                          type);
-          break;
-        }
-        case TSDB_DATA_TYPE_TIMESTAMP:
-        case TSDB_DATA_TYPE_BIGINT:
-          printf("%" PRId64 "\t", *(int64_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
-          break;
-        case TSDB_DATA_TYPE_INT:
-          printf("%d\t", *(int32_t *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          printf("%f\t", *(float *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
-          break;
-        case TSDB_DATA_TYPE_DOUBLE:
-          printf("%lf\t", *(double *)(pdata[i]->data + pQuery->pSelectExpr[i].resBytes * j));
-          break;
-      }
-    }
-    printf("\n");
-  }
-}
-
-static tFilePage *getFilePage(SMeterQuerySupportObj *pSupporter, int32_t pageId) {
-  assert(pageId <= pSupporter->lastPageId && pageId >= 0);
-  return (tFilePage *)(pSupporter->meterOutputMMapBuf + DEFAULT_INTERN_BUF_SIZE * pageId);
-}
-
-static tFilePage *getMeterDataPage(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo, int32_t pageId) {
-  SMeterQueryInfo *pMeterQueryInfo = pMeterDataInfo->pMeterQInfo;
-  if (pageId >= pMeterQueryInfo->numOfPages) {
-    return NULL;
-  }
-
-  int32_t realId = pMeterQueryInfo->pageList[pageId];
-  return getFilePage(pSupporter, realId);
-}
-
-typedef struct Position {
-  int32_t pageIdx;
-  int32_t rowIdx;
-} Position;
-
-typedef struct SCompSupporter {
-  SMeterDataInfo **      pMeterDataInfo;
-  Position *             pPosition;
-  SMeterQuerySupportObj *pSupporter;
-} SCompSupporter;
-
-int64_t getCurrentTimestamp(SCompSupporter *pSupportor, int32_t meterIdx) {
-  Position * pPos = &pSupportor->pPosition[meterIdx];
-  tFilePage *pPage = getMeterDataPage(pSupportor->pSupporter, pSupportor->pMeterDataInfo[meterIdx], pPos->pageIdx);
-  return *(int64_t *)(pPage->data + TSDB_KEYSIZE * pPos->rowIdx);
-}
-
-int32_t meterResultComparator(const void *pLeft, const void *pRight, void *param) {
-  int32_t left = *(int32_t *)pLeft;
-  int32_t right = *(int32_t *)pRight;
-
-  SCompSupporter *supportor = (SCompSupporter *)param;
-
-  Position leftPos = supportor->pPosition[left];
-  Position rightPos = supportor->pPosition[right];
-
-  /* left source is exhausted */
-  if (leftPos.pageIdx == -1 && leftPos.rowIdx == -1) {
-    return 1;
-  }
-
-  /* right source is exhausted*/
-  if (rightPos.pageIdx == -1 && rightPos.rowIdx == -1) {
-    return -1;
-  }
-
-  tFilePage *pPageLeft = getMeterDataPage(supportor->pSupporter, supportor->pMeterDataInfo[left], leftPos.pageIdx);
-  int64_t    leftTimestamp = *(int64_t *)(pPageLeft->data + TSDB_KEYSIZE * leftPos.rowIdx);
-
-  tFilePage *pPageRight = getMeterDataPage(supportor->pSupporter, supportor->pMeterDataInfo[right], rightPos.pageIdx);
-  int64_t    rightTimestamp = *(int64_t *)(pPageRight->data + TSDB_KEYSIZE * rightPos.rowIdx);
-
-  if (leftTimestamp == rightTimestamp) {
-    return 0;
-  }
-
-  return leftTimestamp > rightTimestamp ? 1 : -1;
-}
-
-int32_t mergeMetersResultToOneGroups(SMeterQuerySupportObj *pSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  int64_t st = taosGetTimestampMs();
-  int32_t ret = TSDB_CODE_SUCCESS;
-
-  while (pSupporter->subgroupIdx < pSupporter->pSidSet->numOfSubSet) {
-    int32_t start = pSupporter->pSidSet->starterPos[pSupporter->subgroupIdx];
-    int32_t end = pSupporter->pSidSet->starterPos[pSupporter->subgroupIdx + 1];
-
-    ret = doMergeMetersResultsToGroupRes(pSupporter, pQuery, pRuntimeEnv, pSupporter->pMeterDataInfo, start, end);
-    if (ret < 0) {  // not enough disk space to save the data into disk
-      return -1;
-    }
-
-    pSupporter->subgroupIdx += 1;
-
-    // this group generates at least one result, return results
-    if (ret > 0) {
-      break;
-    }
-
-    assert(pSupporter->numOfGroupResultPages == 0);
-    dTrace("QInfo:%p no result in group %d, continue", GET_QINFO_ADDR(pQuery), pSupporter->subgroupIdx - 1);
-  }
-
-  dTrace("QInfo:%p merge res data into group, index:%d, total group:%d, elapsed time:%lldms", GET_QINFO_ADDR(pQuery),
-         pSupporter->subgroupIdx - 1, pSupporter->pSidSet->numOfSubSet, taosGetTimestampMs() - st);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void copyResToQueryResultBuf(SMeterQuerySupportObj *pSupporter, SQuery *pQuery) {
-  if (pSupporter->offset == pSupporter->numOfGroupResultPages) {
-    pSupporter->numOfGroupResultPages = 0;
-
-    // current results of group has been sent to client, try next group
-    if (mergeMetersResultToOneGroups(pSupporter) != TSDB_CODE_SUCCESS) {
-      return;  // failed to save data in the disk
-    }
-
-    // set current query completed
-    if (pSupporter->numOfGroupResultPages == 0 && pSupporter->subgroupIdx == pSupporter->pSidSet->numOfSubSet) {
-      pSupporter->meterIdx = pSupporter->pSidSet->numOfSids;
-      return;
-    }
-  }
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  char *            pStart = pSupporter->meterOutputMMapBuf + DEFAULT_INTERN_BUF_SIZE * (pSupporter->lastPageId + 1) +
-                 pSupporter->groupResultSize * pSupporter->offset;
-
-  uint64_t numOfElem = ((tFilePage *)pStart)->numOfElems;
-  assert(numOfElem <= pQuery->pointsToRead);
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    memcpy(pQuery->sdata[i], pStart, pRuntimeEnv->pCtx[i].outputBytes * numOfElem + sizeof(tFilePage));
-    pStart += pRuntimeEnv->pCtx[i].outputBytes * pQuery->pointsToRead + sizeof(tFilePage);
-  }
-
-  pQuery->pointsRead += numOfElem;
-  pSupporter->offset += 1;
-}
-
-int32_t doMergeMetersResultsToGroupRes(SMeterQuerySupportObj *pSupporter, SQuery *pQuery, SQueryRuntimeEnv *pRuntimeEnv,
-                                       SMeterDataInfo *pMeterHeadDataInfo, int32_t start, int32_t end) {
-  // calculate the maximum required space
-  if (pSupporter->groupResultSize == 0) {
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      pSupporter->groupResultSize += sizeof(tFilePage) + pQuery->pointsToRead * pRuntimeEnv->pCtx[i].outputBytes;
-    }
-  }
-
-  tFilePage **     buffer = (tFilePage **)pQuery->sdata;
-  Position *       posArray = calloc(1, sizeof(Position) * (end - start));
-  SMeterDataInfo **pValidMeter = malloc(POINTER_BYTES * (end - start));
-
-  int32_t numOfMeters = 0;
-  for (int32_t i = start; i < end; ++i) {
-    if (pMeterHeadDataInfo[i].pMeterQInfo->numOfPages > 0 && pMeterHeadDataInfo[i].pMeterQInfo->numOfRes > 0) {
-      pValidMeter[numOfMeters] = &pMeterHeadDataInfo[i];
-      // set the merge start position: page:0, index:0
-      posArray[numOfMeters].pageIdx = 0;
-      posArray[numOfMeters++].rowIdx = 0;
-    }
-  }
-
-  if (numOfMeters == 0) {
-    tfree(posArray);
-    tfree(pValidMeter);
-    assert(pSupporter->numOfGroupResultPages == 0);
-    return 0;
-  }
-
-  SCompSupporter  cs = {pValidMeter, posArray, pSupporter};
-  SLoserTreeInfo *pTree = NULL;
-
-  tLoserTreeCreate(&pTree, numOfMeters, &cs, meterResultComparator);
-
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-  resetMergeResultBuf(pQuery, pCtx);
-
-  int64_t lastTimestamp = -1;
-
-  int64_t startt = taosGetTimestampMs();
-
-  while (1) {
-    int32_t    pos = pTree->pNode[0].index;
-    Position * position = &cs.pPosition[pos];
-    tFilePage *pPage = getMeterDataPage(cs.pSupporter, pValidMeter[pos], position->pageIdx);
-
-    int64_t ts = getCurrentTimestamp(&cs, pos);
-    if (ts == lastTimestamp) {  // merge with the last one
-      doMerge(pRuntimeEnv, ts, pPage, position->rowIdx, true);
-    } else {
-      // copy data to disk buffer
-      if (buffer[0]->numOfElems == pQuery->pointsToRead) {
-        if (flushFromResultBuf(pSupporter, pQuery, pRuntimeEnv) != TSDB_CODE_SUCCESS) {
-          return -1;
-        }
-
-        resetMergeResultBuf(pQuery, pCtx);
-      }
-
-      pPage = getMeterDataPage(cs.pSupporter, pValidMeter[pos], position->pageIdx);
-      if (pPage->numOfElems <= 0) {  // current source data page is empty
-        // do nothing
-      } else {
-        doMerge(pRuntimeEnv, ts, pPage, position->rowIdx, false);
-        buffer[0]->numOfElems += 1;
-      }
-    }
-
-    lastTimestamp = ts;
-
-    if (cs.pPosition[pos].rowIdx >= pPage->numOfElems - 1) {
-      cs.pPosition[pos].rowIdx = 0;
-      cs.pPosition[pos].pageIdx += 1;  // try next page
-
-      // check if current page is empty or not. if it is empty, ignore it and try next
-      if (cs.pPosition[pos].pageIdx <= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages - 1) {
-        tFilePage *newPage = getMeterDataPage(cs.pSupporter, pValidMeter[pos], position->pageIdx);
-        if (newPage->numOfElems <= 0) {
-          // if current source data page is null, it must be the last page of source output page
-          cs.pPosition[pos].pageIdx += 1;
-          assert(cs.pPosition[pos].pageIdx >= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages - 1);
-        }
-      }
-
-      // the following code must be executed if current source pages are exhausted
-      if (cs.pPosition[pos].pageIdx >= cs.pMeterDataInfo[pos]->pMeterQInfo->numOfPages) {
-        cs.pPosition[pos].pageIdx = -1;
-        cs.pPosition[pos].rowIdx = -1;
-
-        // all input sources are exhausted
-        if (--numOfMeters == 0) {
-          break;
-        }
-      }
-    } else {
-      cs.pPosition[pos].rowIdx += 1;
-    }
-
-    tLoserTreeAdjust(pTree, pos + pTree->numOfEntries);
-  }
-
-  if (buffer[0]->numOfElems != 0) {  // there are data in buffer
-    if (flushFromResultBuf(pSupporter, pQuery, pRuntimeEnv) != TSDB_CODE_SUCCESS) {
-      dError("QInfo:%p failed to flush data into temp file, abort query", GET_QINFO_ADDR(pQuery),
-             pSupporter->extBufFile);
-      tfree(pTree);
-      tfree(pValidMeter);
-      tfree(posArray);
-
-      return -1;
-    }
-  }
-
-  int64_t endt = taosGetTimestampMs();
-
-#ifdef _DEBUG_VIEW
-  displayInterResult(pQuery->sdata, pQuery, pQuery->sdata[0]->len);
-#endif
-
-  dTrace("QInfo:%p result merge completed, elapsed time:%" PRId64 " ms", GET_QINFO_ADDR(pQuery), endt - startt);
-  tfree(pTree);
-  tfree(pValidMeter);
-  tfree(posArray);
-
-  pSupporter->offset = 0;
-
-  return pSupporter->numOfGroupResultPages;
-}
-
-static int32_t extendDiskBuf(const SQuery *pQuery, SMeterQuerySupportObj *pSupporter, int32_t numOfPages) {
-  assert(pSupporter->numOfPages * DEFAULT_INTERN_BUF_SIZE == pSupporter->bufSize);
-
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  int32_t ret = munmap(pSupporter->meterOutputMMapBuf, pSupporter->bufSize);
-  pSupporter->numOfPages = numOfPages;
-
-  /*
-   * disk-based output buffer is exhausted, try to extend the disk-based buffer, the available disk space may
-   * be insufficient
-   */
-  ret = ftruncate(pSupporter->meterOutputFd, pSupporter->numOfPages * DEFAULT_INTERN_BUF_SIZE);
-  if (ret != 0) {
-    dError("QInfo:%p failed to create intermediate result output file:%s. %s", pQInfo, pSupporter->extBufFile,
-           strerror(errno));
-    pQInfo->code = -TSDB_CODE_SERV_NO_DISKSPACE;
-    pQInfo->killed = 1;
-
-    return pQInfo->code;
-  }
-
-  pSupporter->bufSize = pSupporter->numOfPages * DEFAULT_INTERN_BUF_SIZE;
-  pSupporter->meterOutputMMapBuf =
-      mmap(NULL, pSupporter->bufSize, PROT_READ | PROT_WRITE, MAP_SHARED, pSupporter->meterOutputFd, 0);
-
-  if (pSupporter->meterOutputMMapBuf == MAP_FAILED) {
-    dError("QInfo:%p failed to map temp file: %s. %s", pQInfo, pSupporter->extBufFile, strerror(errno));
-    pQInfo->code = -TSDB_CODE_SERV_OUT_OF_MEMORY;
-    pQInfo->killed = 1;
-
-    return pQInfo->code;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t flushFromResultBuf(SMeterQuerySupportObj *pSupporter, const SQuery *pQuery,
-                           const SQueryRuntimeEnv *pRuntimeEnv) {
-  int32_t numOfMeterResultBufPages = pSupporter->lastPageId + 1;
-  int64_t dstSize = numOfMeterResultBufPages * DEFAULT_INTERN_BUF_SIZE +
-                    pSupporter->groupResultSize * (pSupporter->numOfGroupResultPages + 1);
-
-  int32_t requiredPages = pSupporter->numOfPages;
-  if (requiredPages * DEFAULT_INTERN_BUF_SIZE < dstSize) {
-    while (requiredPages * DEFAULT_INTERN_BUF_SIZE < dstSize) {
-      requiredPages += pSupporter->numOfMeters;
-    }
-
-    if (extendDiskBuf(pQuery, pSupporter, requiredPages) != TSDB_CODE_SUCCESS) {
-      return -1;
-    }
-  }
-
-  char *lastPosition = pSupporter->meterOutputMMapBuf + DEFAULT_INTERN_BUF_SIZE * numOfMeterResultBufPages +
-                       pSupporter->groupResultSize * pSupporter->numOfGroupResultPages;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t size = pRuntimeEnv->pCtx[i].outputBytes * pQuery->sdata[0]->len + sizeof(tFilePage);
-    memcpy(lastPosition, pQuery->sdata[i], size);
-
-    lastPosition += pRuntimeEnv->pCtx[i].outputBytes * pQuery->pointsToRead + sizeof(tFilePage);
-  }
-
-  pSupporter->numOfGroupResultPages += 1;
-  return TSDB_CODE_SUCCESS;
-}
-
-void resetMergeResultBuf(SQuery *pQuery, SQLFunctionCtx *pCtx) {
-  for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    pCtx[k].aOutputBuf = pQuery->sdata[k]->data - pCtx[k].outputBytes;
-    pCtx[k].size = 1;
-    pCtx[k].startOffset = 0;
-    pQuery->sdata[k]->len = 0;
-  }
-}
-
-void setMeterDataInfo(SMeterDataInfo *pMeterDataInfo, SMeterObj *pMeterObj, int32_t meterIdx, int32_t groupId) {
-  pMeterDataInfo->pMeterObj = pMeterObj;
-  pMeterDataInfo->groupIdx = groupId;
-  pMeterDataInfo->meterOrderIdx = meterIdx;
-}
-
-int32_t doCloseAllOpenedResults(SMeterQuerySupportObj *pSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  /* for interval query, close all unclosed results */
-  if (pQuery->nAggTimeInterval > 0) {
-    SMeterDataInfo *pMeterInfo = pSupporter->pMeterDataInfo;
-    for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
-      if (pMeterInfo[i].pMeterQInfo != NULL && pMeterInfo[i].pMeterQInfo->lastResRows > 0) {
-        int32_t index = pMeterInfo[i].meterOrderIdx;
-
-        pRuntimeEnv->pMeterObj = getMeterObj(pSupporter->pMetersHashTable, pSupporter->pSidSet->pSids[index]->sid);
-        assert(pRuntimeEnv->pMeterObj == pMeterInfo[i].pMeterObj);
-
-        int32_t ret = setIntervalQueryExecutionContext(pSupporter, i, pMeterInfo[i].pMeterQInfo);
-        if (ret != TSDB_CODE_SUCCESS) {
-          return ret;
-        }
-
-        ret = saveResult(pSupporter, pMeterInfo[i].pMeterQInfo, pMeterInfo[i].pMeterQInfo->lastResRows);
-        if (ret != TSDB_CODE_SUCCESS) {
-          return ret;
-        }
-      }
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-void disableFunctForSuppleScan(SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0)) {
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      pRuntimeEnv->pCtx[i].order = (pRuntimeEnv->pCtx[i].order) ^ 1;
-    }
-
-    SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-
-    for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-      SWindowStatus *pStatus = &pSlidingWindowInfo->pStatus[i];
-      if (!pStatus->closed) {
-        continue;
-      }
-
-      SOutputRes *buf = &pSlidingWindowInfo->pResult[i];
-
-      // open/close the specified query for each group result
-      for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-        int32_t functId = pQuery->pSelectExpr[j].pBase.functionId;
-
-        if (((functId == TSDB_FUNC_FIRST || functId == TSDB_FUNC_FIRST_DST) && order == TSQL_SO_DESC) ||
-            ((functId == TSDB_FUNC_LAST || functId == TSDB_FUNC_LAST_DST) && order == TSQL_SO_ASC)) {
-          buf->resultInfo[j].complete = false;
-        } else if (functId != TSDB_FUNC_TS && functId != TSDB_FUNC_TAG) {
-          buf->resultInfo[j].complete = true;
-        }
-      }
-    }
-  } else {  // TODO ERROR!!
-    // need to handle for each query result, not just the single runtime ctx.
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      pRuntimeEnv->pCtx[i].order = (pRuntimeEnv->pCtx[i].order) ^ 1;
-      int32_t functId = pQuery->pSelectExpr[i].pBase.functionId;
-
-      SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[i]);
-      if (((functId == TSDB_FUNC_FIRST || functId == TSDB_FUNC_FIRST_DST) && order == TSQL_SO_DESC) ||
-          ((functId == TSDB_FUNC_LAST || functId == TSDB_FUNC_LAST_DST) && order == TSQL_SO_ASC)) {
-        pResInfo->complete = false;
-
-      } else if (functId != TSDB_FUNC_TS && functId != TSDB_FUNC_TAG) {
-        pResInfo->complete = true;
-      }
-    }
-  }
-
-  pQuery->order.order = pQuery->order.order ^ 1;
-}
-
-void enableFunctForMasterScan(SQueryRuntimeEnv *pRuntimeEnv, int32_t order) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    pRuntimeEnv->pCtx[i].order = (pRuntimeEnv->pCtx[i].order) ^ 1;
-  }
-
-  pQuery->order.order = (pQuery->order.order ^ 1);
-}
-
-void createGroupResultBuf(SQuery *pQuery, SOutputRes *pOneResult, bool isMetricQuery) {
-  int32_t numOfOutput = pQuery->numOfOutputCols;
-
-  pOneResult->resultInfo = calloc((size_t)numOfOutput, sizeof(SResultInfo));
-
-  pOneResult->result = malloc(POINTER_BYTES * numOfOutput);
-  for (int32_t i = 0; i < numOfOutput; ++i) {
-    size_t       size = pQuery->pSelectExpr[i].interResBytes;
-    SResultInfo *pResInfo = &pOneResult->resultInfo[i];
-
-    pOneResult->result[i] = malloc(sizeof(tFilePage) + size * pOneResult->nAlloc);
-    pOneResult->result[i]->numOfElems = 0;
-
-    setResultInfoBuf(pResInfo, (int32_t)size, isMetricQuery);
-  }
-}
-
-void clearGroupResultBuf(SOutputRes *pOneOutputRes, int32_t nOutputCols) {
-  if (pOneOutputRes == NULL) {
-    return;
-  }
-
-  for (int32_t i = 0; i < nOutputCols; ++i) {
-    SResultInfo *pResInfo = &pOneOutputRes->resultInfo[i];
-    int32_t      size = sizeof(tFilePage) + pResInfo->bufLen * pOneOutputRes->nAlloc;
-
-    memset(pOneOutputRes->result[i], 0, (size_t)size);
-    resetResultInfo(pResInfo);
-  }
-}
-
-void copyGroupResultBuf(SOutputRes* dst, const SOutputRes* src, int32_t nOutputCols) {
-  for(int32_t i = 0; i < nOutputCols; ++i) {
-    SResultInfo *pDst = &dst->resultInfo[i];
-    SResultInfo *pSrc = &src->resultInfo[i];
-    
-    char* buf = pDst->interResultBuf;
-    memcpy(pDst, pSrc, sizeof(SResultInfo));
-    pDst->interResultBuf = buf;
-    memcpy(pDst->interResultBuf, pSrc->interResultBuf, pDst->bufLen);
-  
-    int32_t size = sizeof(tFilePage) + pSrc->bufLen * src->nAlloc;
-    memcpy(dst->result[i], src->result[i], size);
-  }
-}
-
-void destroyGroupResultBuf(SOutputRes *pOneOutputRes, int32_t nOutputCols) {
-  if (pOneOutputRes == NULL) {
-    return;
-  }
-
-  for (int32_t i = 0; i < nOutputCols; ++i) {
-    free(pOneOutputRes->result[i]);
-    free(pOneOutputRes->resultInfo[i].interResultBuf);
-  }
-
-  free(pOneOutputRes->resultInfo);
-  free(pOneOutputRes->result);
-}
-
-void resetCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  int32_t rows = pRuntimeEnv->pMeterObj->pointsPerFileBlock;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-    pCtx->aOutputBuf = pQuery->sdata[i]->data;
-
-    /*
-     * set the output buffer information and intermediate buffer
-     * not all queries require the interResultBuf, such as COUNT/TAGPRJ/PRJ/TAG etc.
-     */
-    resetResultInfo(&pRuntimeEnv->resultInfo[i]);
-    pCtx->resultInfo = &pRuntimeEnv->resultInfo[i];
-
-    // set the timestamp output buffer for top/bottom/diff query
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
-      pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
-    }
-
-    memset(pQuery->sdata[i]->data, 0, (size_t)pQuery->pSelectExpr[i].resBytes * rows);
-  }
-
-  initCtxOutputBuf(pRuntimeEnv);
-}
-
-void forwardCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, int64_t output) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  // reset the execution contexts
-  for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-    int32_t functionId = pQuery->pSelectExpr[j].pBase.functionId;
-    assert(functionId != TSDB_FUNC_DIFF);
-
-    // set next output position
-    if (IS_OUTER_FORWARD(aAggs[functionId].nStatus)) {
-      pRuntimeEnv->pCtx[j].aOutputBuf += pRuntimeEnv->pCtx[j].outputBytes * output /** factor*/;
-    }
-
-    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
-      /*
-       * NOTE: for top/bottom query, the value of first column of output (timestamp) are assigned
-       * in the procedure of top/bottom routine
-       * the output buffer in top/bottom routine is ptsOutputBuf, so we need to forward the output buffer
-       *
-       * diff function is handled in multi-output function
-       */
-      pRuntimeEnv->pCtx[j].ptsOutputBuf += TSDB_KEYSIZE * output/* * factor*/;
-    }
-
-    resetResultInfo(pRuntimeEnv->pCtx[j].resultInfo);
-  }
-}
-
-void initCtxOutputBuf(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-    int32_t functionId = pQuery->pSelectExpr[j].pBase.functionId;
-    pRuntimeEnv->pCtx[j].currentStage = 0;
-    aAggs[functionId].init(&pRuntimeEnv->pCtx[j]);
-  }
-}
-
-void doSkipResults(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  if (pQuery->pointsRead == 0 || pQuery->limit.offset == 0) {
-    return;
-  }
-
-  if (pQuery->pointsRead <= pQuery->limit.offset) {
-    pQuery->limit.offset -= pQuery->pointsRead;
-
-    pQuery->pointsRead = 0;
-    pQuery->pointsOffset = pQuery->pointsToRead;  // clear all data in result buffer
-
-    resetCtxOutputBuf(pRuntimeEnv);
-
-    // clear the buffer is full flag if exists
-    pQuery->over &= (~QUERY_RESBUF_FULL);
-  } else {
-    int32_t numOfSkip = (int32_t)pQuery->limit.offset;
-    pQuery->pointsRead -= numOfSkip;
-
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-      int32_t bytes = pRuntimeEnv->pCtx[i].outputBytes;
-
-      memmove(pQuery->sdata[i]->data, pQuery->sdata[i]->data + bytes * numOfSkip, pQuery->pointsRead * bytes);
-      pRuntimeEnv->pCtx[i].aOutputBuf += bytes * numOfSkip;
-
-      if (functionId == TSDB_FUNC_DIFF || functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM) {
-        pRuntimeEnv->pCtx[i].ptsOutputBuf += TSDB_KEYSIZE * numOfSkip;
-      }
-    }
-
-    pQuery->limit.offset = 0;
-  }
-}
-
-typedef struct SQueryStatus {
-  SPositionInfo start;
-  SPositionInfo next;
-  SPositionInfo end;
-
-  TSKEY  skey;
-  TSKEY  ekey;
-  int8_t overStatus;
-  TSKEY  lastKey;
-
-  STSCursor cur;
-} SQueryStatus;
-
-static void queryStatusSave(SQueryRuntimeEnv *pRuntimeEnv, SQueryStatus *pStatus) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  pStatus->overStatus = pQuery->over;
-  pStatus->lastKey = pQuery->lastKey;
-
-  pStatus->skey = pQuery->skey;
-  pStatus->ekey = pQuery->ekey;
-
-  pStatus->start = pRuntimeEnv->startPos;
-  pStatus->next = pRuntimeEnv->nextPos;
-  pStatus->end = pRuntimeEnv->endPos;
-
-  pStatus->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);  // save the cursor
-
-  if (pRuntimeEnv->pTSBuf) {
-    pRuntimeEnv->pTSBuf->cur.order ^= 1;
-    tsBufNextPos(pRuntimeEnv->pTSBuf);
-  }
-
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-
-  SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-  pQuery->lastKey = pQuery->skey;
-  pRuntimeEnv->startPos = pRuntimeEnv->endPos;
-  
-  SWAP(pRuntimeEnv->intervalWindow.skey, pRuntimeEnv->intervalWindow.ekey, TSKEY);
-}
-
-static void queryStatusRestore(SQueryRuntimeEnv *pRuntimeEnv, SQueryStatus *pStatus) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  SWAP(pQuery->skey, pQuery->ekey, TSKEY);
-  SWAP(pRuntimeEnv->intervalWindow.skey, pRuntimeEnv->intervalWindow.ekey, TSKEY);
-  
-  pQuery->lastKey = pStatus->lastKey;
-  pQuery->skey = pStatus->skey;
-  pQuery->ekey = pStatus->ekey;
-
-  pQuery->over = pStatus->overStatus;
-
-  pRuntimeEnv->startPos = pStatus->start;
-  pRuntimeEnv->nextPos = pStatus->next;
-  pRuntimeEnv->endPos = pStatus->end;
-
-  tsBufSetCursor(pRuntimeEnv->pTSBuf, &pStatus->cur);
-}
-
-static void doSingleMeterSupplementScan(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *     pQuery = pRuntimeEnv->pQuery;
-  SQueryStatus qStatus = {0};
-
-  if (!needSupplementaryScan(pQuery)) {
-    return;
-  }
-
-  dTrace("QInfo:%p start to supp scan", GET_QINFO_ADDR(pQuery));
-  
-  SET_SUPPLEMENT_SCAN_FLAG(pRuntimeEnv);
-
-  // usually this load operation will incur load disk block operation
-  TSKEY endKey = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->endPos);
-
-  assert((QUERY_IS_ASC_QUERY(pQuery) && endKey <= pQuery->ekey) ||
-         (!QUERY_IS_ASC_QUERY(pQuery) && endKey >= pQuery->ekey));
-
-  // close necessary function execution during supplementary scan
-  disableFunctForSuppleScan(pRuntimeEnv, pQuery->order.order);
-  queryStatusSave(pRuntimeEnv, &qStatus);
-
-  doScanAllDataBlocks(pRuntimeEnv);
-
-  // set the correct start position, and load the corresponding block in buffer if required.
-  TSKEY actKey = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->startPos);
-  assert((QUERY_IS_ASC_QUERY(pQuery) && actKey >= pQuery->skey) ||
-         (!QUERY_IS_ASC_QUERY(pQuery) && actKey <= pQuery->skey));
-
-  queryStatusRestore(pRuntimeEnv, &qStatus);
-  enableFunctForMasterScan(pRuntimeEnv, pQuery->order.order);
-  SET_MASTER_SCAN_FLAG(pRuntimeEnv);
-}
-
-void setQueryStatus(SQuery *pQuery, int8_t status) {
-  if (status == QUERY_NOT_COMPLETED) {
-    pQuery->over = status;
-  } else {
-    // QUERY_NOT_COMPLETED is not compatible with any other status, so clear its position first
-    pQuery->over &= (~QUERY_NOT_COMPLETED);
-    pQuery->over |= status;
-  }
-}
-
-void vnodeScanAllData(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-
-  /* store the start query position */
-  savePointPosition(&pRuntimeEnv->startPos, pQuery->fileId, pQuery->slot, pQuery->pos);
-  int64_t skey = pQuery->lastKey;
-  
-  while (1) {
-    doScanAllDataBlocks(pRuntimeEnv);
-
-    bool toContinue = true;
-
-    if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-      // for each group result, call the finalize function for each column
-      SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-
-      for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-        SOutputRes *buf = &pSlidingWindowInfo->pResult[i];
-
-        SWindowStatus *pStatus = &pSlidingWindowInfo->pStatus[i];
-        if (!pStatus->closed) {
-          continue;
-        }
-
-        setGroupOutputBuffer(pRuntimeEnv, buf);
-
-        for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-          aAggs[pQuery->pSelectExpr[j].pBase.functionId].xNextStep(&pRuntimeEnv->pCtx[j]);
-          SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
-
-          toContinue &= (pResInfo->complete);
-        }
-      }
-    } else {
-      for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-        aAggs[pQuery->pSelectExpr[j].pBase.functionId].xNextStep(&pRuntimeEnv->pCtx[j]);
-        SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
-
-        toContinue &= (pResInfo->complete);
-      }
-    }
-
-    if (toContinue) {
-      break;
-    }
-
-    // set the correct start position, and load the corresponding block in buffer if required.
-    TSKEY actKey = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->startPos);
-    assert((QUERY_IS_ASC_QUERY(pQuery) && actKey >= pQuery->skey) ||
-           (!QUERY_IS_ASC_QUERY(pQuery) && actKey <= pQuery->skey));
-
-    setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-    pQuery->lastKey = pQuery->skey;
-
-    /* check if query is killed or not */
-    if (isQueryKilled(pQuery)) {
-      setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-      return;
-    }
-  }
-
-  int64_t newSkey = pQuery->skey;
-  pQuery->skey = skey;
-  
-  doSingleMeterSupplementScan(pRuntimeEnv);
-  
-  // update the pQuery->skey/pQuery->ekey to limit the scan scope of sliding query during
-  // supplementary scan
-  pQuery->skey = newSkey;
-}
-
-void doFinalizeResult(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    // for each group result, call the finalize function for each column
-    SSlidingWindowInfo *pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-    if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-      closeAllSlidingWindow(pSlidingWindowInfo);
-    }
-    
-    for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-      SOutputRes *buf = &pSlidingWindowInfo->pResult[i];
-      if (!slidingWindowClosed(pSlidingWindowInfo, i)) {
-        continue;
-      }
-      
-      setGroupOutputBuffer(pRuntimeEnv, buf);
-
-      for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-        aAggs[pQuery->pSelectExpr[j].pBase.functionId].xFinalize(&pRuntimeEnv->pCtx[j]);
-      }
-
-      /*
-       * set the number of output results for group by normal columns, the number of output rows usually is 1 except
-       * the top and bottom query
-       */
-      buf->numOfRows = getNumOfResult(pRuntimeEnv);
-    }
-
-  } else {
-    for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-      aAggs[pQuery->pSelectExpr[j].pBase.functionId].xFinalize(&pRuntimeEnv->pCtx[j]);
-    }
-  }
-}
-
-static bool hasMainOutput(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-
-    if (functionId != TSDB_FUNC_TS && functionId != TSDB_FUNC_TAG && functionId != TSDB_FUNC_TAGPRJ) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-int64_t getNumOfResult(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  bool    hasMainFunction = hasMainOutput(pQuery);
-
-  int64_t maxOutput = 0;
-  for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-    int32_t functionId = pQuery->pSelectExpr[j].pBase.functionId;
-
-    /*
-     * ts, tag, tagprj function can not decide the output number of current query
-     * the number of output result is decided by main output
-     */
-    if (hasMainFunction &&
-        (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ)) {
-      continue;
-    }
-
-    SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[j]);
-    if (pResInfo != NULL && maxOutput < pResInfo->numOfRes) {
-      maxOutput = pResInfo->numOfRes;
-    }
-  }
-
-  return maxOutput;
-}
-
-static int32_t getNextIntervalQueryRange(SMeterQuerySupportObj *pSupporter, SQueryRuntimeEnv *pRuntimeEnv,
-                                         int64_t *skey, int64_t *ekey) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  *skey = pRuntimeEnv->intervalWindow.skey + (pQuery->slidingTime * factor);
-  *ekey = pRuntimeEnv->intervalWindow.ekey + (pQuery->slidingTime * factor);
-
-  if (pQuery->slidingTime > 0) {
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      // the next sliding window is not contained in the query time range
-      if (*skey < pSupporter->rawSKey) {
-        *skey = pSupporter->rawSKey;
-      }
-
-      if (*skey > pSupporter->rawEKey) {
-        return QUERY_COMPLETED;
-      }
-
-      if (*ekey > pSupporter->rawEKey) {
-        *ekey = pSupporter->rawEKey;
-      }
-    } else {
-      if (*skey > pSupporter->rawSKey) {
-        *skey = pSupporter->rawSKey;
-      }
-
-      if (*skey < pSupporter->rawEKey) {
-        return QUERY_COMPLETED;
-      }
-
-      if (*ekey < pSupporter->rawEKey) {
-        *ekey = pSupporter->rawEKey;
-      }
-    }
-  }
-
-  return QUERY_NOT_COMPLETED;
-}
-
-/*
- * forward the query range for next interval query
- */
-void forwardIntervalQueryRange(SMeterQuerySupportObj *pSupporter, SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  if (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0) {
-    if ((QUERY_IS_ASC_QUERY(pQuery) && pQuery->lastKey >= pQuery->ekey) ||
-        (!QUERY_IS_ASC_QUERY(pQuery) && pQuery->lastKey <= pQuery->ekey)) {
-      setQueryStatus(pQuery, QUERY_COMPLETED);
-    } else {
-      TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
-    }
-
-    return;
-  }
-
-  int32_t r = getNextIntervalQueryRange(pSupporter, pRuntimeEnv, &pQuery->skey, &pQuery->ekey);
-  if (r == QUERY_COMPLETED) {
-    setQueryStatus(pQuery, QUERY_COMPLETED);
-    return;
-  }
-
-  getNextLogicalQueryRange(pRuntimeEnv, &pRuntimeEnv->intervalWindow);
-
-  /* ensure the search in cache will return right position */
-  pQuery->lastKey = pQuery->skey;
-
-  TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
-  if ((nextTimestamp > pSupporter->rawEKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (nextTimestamp < pSupporter->rawEKey && !QUERY_IS_ASC_QUERY(pQuery)) ||
-      Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
-    setQueryStatus(pQuery, QUERY_COMPLETED);
-    return;
-  }
-
-  // bridge the gap in group by time function
-  if ((nextTimestamp > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (nextTimestamp < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-    getAlignedIntervalQueryRange(pRuntimeEnv, nextTimestamp, pSupporter->rawSKey, pSupporter->rawEKey);
-  }
-}
-
-static int32_t offsetComparator(const void *pLeft, const void *pRight) {
-  SMeterDataInfo **pLeft1 = (SMeterDataInfo **)pLeft;
-  SMeterDataInfo **pRight1 = (SMeterDataInfo **)pRight;
-
-  if ((*pLeft1)->offsetInHeaderFile == (*pRight1)->offsetInHeaderFile) {
-    return 0;
-  }
-
-  return ((*pLeft1)->offsetInHeaderFile > (*pRight1)->offsetInHeaderFile) ? 1 : -1;
-}
-
-/**
- *
- * @param pQInfo
- * @param fid
- * @param pQueryFileInfo
- * @param start
- * @param end
- * @param pMeterHeadDataInfo
- * @return
- */
-int32_t vnodeFilterQualifiedMeters(SQInfo *pQInfo, int32_t vid, tSidSet *pSidSet, SMeterDataInfo *pMeterDataInfo,
-                                   int32_t *numOfMeters, SMeterDataInfo ***pReqMeterDataInfo) {
-  SQuery *pQuery = &pQInfo->query;
-
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SMeterSidExtInfo **    pMeterSidExtInfo = pSupporter->pMeterSidExtInfo;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  SVnodeObj *pVnode = &vnodeList[vid];
-
-  char *buf = calloc(1, getCompHeaderSegSize(&pVnode->cfg));
-  if (buf == NULL) {
-    *numOfMeters = 0;
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  SQueryFilesInfo *pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
-
-  int32_t headerSize = getCompHeaderSegSize(&pVnode->cfg);
-  lseek(pVnodeFileInfo->headerFd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  read(pVnodeFileInfo->headerFd, buf, headerSize);
-
-  // check the offset value integrity
-  if (validateHeaderOffsetSegment(pQInfo, pRuntimeEnv->vnodeFileInfo.headerFilePath, vid, buf - TSDB_FILE_HEADER_LEN,
-                                  headerSize) < 0) {
-    free(buf);
-    *numOfMeters = 0;
-
-    return TSDB_CODE_FILE_CORRUPTED;
-  }
-
-  int64_t oldestKey = getOldestKey(pVnode->numOfFiles, pVnode->fileId, &pVnode->cfg);
-  (*pReqMeterDataInfo) = malloc(POINTER_BYTES * pSidSet->numOfSids);
-  if (*pReqMeterDataInfo == NULL) {
-    free(buf);
-    *numOfMeters = 0;
-
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  int32_t groupId = 0;
-  TSKEY   skey, ekey;
-
-  for (int32_t i = 0; i < pSidSet->numOfSids; ++i) {  // load all meter meta info
-    SMeterObj *pMeterObj = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[i]->sid);
-    if (pMeterObj == NULL) {
-      dError("QInfo:%p failed to find required sid:%d", pQInfo, pMeterSidExtInfo[i]->sid);
-      continue;
-    }
-
-    if (i >= pSidSet->starterPos[groupId + 1]) {
-      groupId += 1;
-    }
-
-    SMeterDataInfo *pOneMeterDataInfo = &pMeterDataInfo[i];
-    if (pOneMeterDataInfo->pMeterObj == NULL) {
-      setMeterDataInfo(pOneMeterDataInfo, pMeterObj, i, groupId);
-    }
-
-    /* restore possible exists new query range for this meter, which starts from cache */
-    if (pOneMeterDataInfo->pMeterQInfo != NULL) {
-      skey = pOneMeterDataInfo->pMeterQInfo->lastKey;
-    } else {
-      skey = pSupporter->rawSKey;
-    }
-
-    // query on disk data files, which actually starts from the lastkey
-    ekey = pSupporter->rawEKey;
-
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      assert(skey >= pSupporter->rawSKey);
-      if (ekey < oldestKey || skey > pMeterObj->lastKeyOnFile) {
-        continue;
-      }
-    } else {
-      assert(skey <= pSupporter->rawSKey);
-      if (skey < oldestKey || ekey > pMeterObj->lastKeyOnFile) {
-        continue;
-      }
-    }
-
-    int64_t      headerOffset = sizeof(SCompHeader) * pMeterObj->sid;
-    SCompHeader *compHeader = (SCompHeader *)(buf + headerOffset);
-    if (compHeader->compInfoOffset == 0) {  // current table is empty
-      continue;
-    }
-
-    // corrupted file may cause the invalid compInfoOffset, check needs
-    int32_t compHeaderOffset = getCompHeaderStartPosition(&pVnode->cfg);
-    if (validateCompBlockOffset(pQInfo, pMeterObj, compHeader, &pRuntimeEnv->vnodeFileInfo, compHeaderOffset) !=
-        TSDB_CODE_SUCCESS) {
-      free(buf);
-      *numOfMeters = 0;
-
-      return TSDB_CODE_FILE_CORRUPTED;
-    }
-
-    pOneMeterDataInfo->offsetInHeaderFile = (uint64_t)compHeader->compInfoOffset;
-
-    if (pOneMeterDataInfo->pMeterQInfo == NULL) {
-      pOneMeterDataInfo->pMeterQInfo = createMeterQueryInfo(pQuery, pSupporter->rawSKey, pSupporter->rawEKey);
-    }
-
-    (*pReqMeterDataInfo)[*numOfMeters] = pOneMeterDataInfo;
-    (*numOfMeters) += 1;
-  }
-
-  assert(*numOfMeters <= pSidSet->numOfSids);
-
-  /* enable sequentially access*/
-  if (*numOfMeters > 1) {
-    qsort((*pReqMeterDataInfo), *numOfMeters, POINTER_BYTES, offsetComparator);
-  }
-
-  free(buf);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-SMeterQueryInfo *createMeterQueryInfo(SQuery *pQuery, TSKEY skey, TSKEY ekey) {
-  SMeterQueryInfo *pMeterQueryInfo = calloc(1, sizeof(SMeterQueryInfo));
-
-  pMeterQueryInfo->skey = skey;
-  pMeterQueryInfo->ekey = ekey;
-  pMeterQueryInfo->lastKey = skey;
-
-  pMeterQueryInfo->numOfPages = 0;
-  pMeterQueryInfo->numOfAlloc = INIT_ALLOCATE_DISK_PAGES;
-  pMeterQueryInfo->pageList = calloc(pMeterQueryInfo->numOfAlloc, sizeof(uint32_t));
-  pMeterQueryInfo->lastResRows = 0;
-
-  pMeterQueryInfo->cur.vnodeIndex = -1;
-
-  pMeterQueryInfo->resultInfo = calloc((size_t)pQuery->numOfOutputCols, sizeof(SResultInfo));
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    SResultInfo *pResInfo = &pMeterQueryInfo->resultInfo[i];
-    setResultInfoBuf(pResInfo, pQuery->pSelectExpr[i].interResBytes, true);
-  }
-
-  return pMeterQueryInfo;
-}
-
-void destroyMeterQueryInfo(SMeterQueryInfo *pMeterQueryInfo, int32_t numOfCols) {
-  if (pMeterQueryInfo == NULL) {
-    return;
-  }
-
-  free(pMeterQueryInfo->pageList);
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    tfree(pMeterQueryInfo->resultInfo[i].interResultBuf);
-  }
-
-  free(pMeterQueryInfo->resultInfo);
-  free(pMeterQueryInfo);
-}
-
-void changeMeterQueryInfoForSuppleQuery(SMeterQueryInfo *pMeterQueryInfo, TSKEY skey, TSKEY ekey) {
-  if (pMeterQueryInfo == NULL) {
-    return;
-  }
-
-  pMeterQueryInfo->skey = skey;
-  pMeterQueryInfo->ekey = ekey;
-  pMeterQueryInfo->lastKey = pMeterQueryInfo->skey;
-
-  pMeterQueryInfo->queryRangeSet = 0;
-  pMeterQueryInfo->cur.order = pMeterQueryInfo->cur.order ^ 1;
-  pMeterQueryInfo->cur.vnodeIndex = -1;
-
-  // previous does not generate any results
-  if (pMeterQueryInfo->numOfPages == 0) {
-    pMeterQueryInfo->reverseFillRes = 0;
-  } else {
-    pMeterQueryInfo->reverseIndex = pMeterQueryInfo->numOfRes;
-    pMeterQueryInfo->reverseFillRes = 1;
-  }
-}
-
-static tFilePage *allocNewPage(SQuery *pQuery, SMeterQuerySupportObj *pSupporter, uint32_t *pageId) {
-  if (pSupporter->lastPageId == pSupporter->numOfPages - 1) {
-    if (extendDiskBuf(pQuery, pSupporter, pSupporter->numOfPages + pSupporter->numOfMeters) != TSDB_CODE_SUCCESS) {
-      return NULL;
-    }
-  }
-
-  *pageId = (++pSupporter->lastPageId);
-  return getFilePage(pSupporter, *pageId);
-}
-
-tFilePage *addDataPageForMeterQueryInfo(SQuery *pQuery, SMeterQueryInfo *pMeterQueryInfo,
-                                        SMeterQuerySupportObj *pSupporter) {
-  uint32_t pageId = 0;
-
-  tFilePage *pPage = allocNewPage(pQuery, pSupporter, &pageId);
-  if (pPage == NULL) {  // failed to allocate disk-based buffer for intermediate results
-    return NULL;
-  }
-
-  if (pMeterQueryInfo->numOfPages >= pMeterQueryInfo->numOfAlloc) {
-    pMeterQueryInfo->numOfAlloc = pMeterQueryInfo->numOfAlloc << 1;
-    pMeterQueryInfo->pageList = realloc(pMeterQueryInfo->pageList, sizeof(uint32_t) * pMeterQueryInfo->numOfAlloc);
-  }
-
-  pMeterQueryInfo->pageList[pMeterQueryInfo->numOfPages++] = pageId;
-  return pPage;
-}
-
-void saveIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, SMeterQueryInfo *pMeterQueryInfo) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  pMeterQueryInfo->skey = pQuery->skey;
-  pMeterQueryInfo->ekey = pQuery->ekey;
-  pMeterQueryInfo->lastKey = pQuery->lastKey;
-
-  assert(((pQuery->lastKey >= pQuery->skey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-         ((pQuery->lastKey <= pQuery->skey) && !QUERY_IS_ASC_QUERY(pQuery)));
-
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    pMeterQueryInfo->cur = tsBufGetCursor(pRuntimeEnv->pTSBuf);
-  }
-}
-
-void restoreIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, SMeterQueryInfo *pMeterQueryInfo) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  pQuery->skey = pMeterQueryInfo->skey;
-  pQuery->ekey = pMeterQueryInfo->ekey;
-  pQuery->lastKey = pMeterQueryInfo->lastKey;
-
-  assert(((pQuery->lastKey >= pQuery->skey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-         ((pQuery->lastKey <= pQuery->skey) && !QUERY_IS_ASC_QUERY(pQuery)));
-}
-
-static void clearAllMeterDataBlockInfo(SMeterDataInfo **pMeterDataInfo, int32_t start, int32_t end) {
-  for (int32_t i = start; i < end; ++i) {
-    tfree(pMeterDataInfo[i]->pBlock);
-    pMeterDataInfo[i]->numOfBlocks = 0;
-    pMeterDataInfo[i]->start = -1;
-  }
-}
-
-static bool getValidDataBlocksRangeIndex(SMeterDataInfo *pMeterDataInfo, SQuery *pQuery, SCompBlock *pCompBlock,
-                                         int64_t numOfBlocks, TSKEY minval, TSKEY maxval, int32_t *end) {
-  SMeterObj *pMeterObj = pMeterDataInfo->pMeterObj;
-  SQInfo *   pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  /*
-   * search the possible blk that may satisfy the query condition always start from the min value, therefore,
-   * the order is always ascending order
-   */
-  pMeterDataInfo->start = binarySearchForBlockImpl(pCompBlock, (int32_t)numOfBlocks, minval, TSQL_SO_ASC);
-  if (minval > pCompBlock[pMeterDataInfo->start].keyLast || maxval < pCompBlock[pMeterDataInfo->start].keyFirst) {
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, no result in files", pQInfo, pMeterObj->vnode, pMeterObj->sid,
-           pMeterObj->meterId);
-    return false;
-  }
-
-  // incremental checks following blocks until whose time range does not overlap with the query range
-  *end = pMeterDataInfo->start;
-  while (*end <= (numOfBlocks - 1)) {
-    if (pCompBlock[*end].keyFirst <= maxval && pCompBlock[*end].keyLast >= maxval) {
-      break;
-    }
-
-    if (pCompBlock[*end].keyFirst > maxval) {
-      *end -= 1;
-      break;
-    }
-
-    if (*end == numOfBlocks - 1) {
-      break;
-    } else {
-      ++(*end);
-    }
-  }
-
-  return true;
-}
-
-static bool setValidDataBlocks(SMeterDataInfo *pMeterDataInfo, int32_t end) {
-  int32_t size = (end - pMeterDataInfo->start) + 1;
-  assert(size > 0);
-
-  if (size != pMeterDataInfo->numOfBlocks) {
-    memmove(pMeterDataInfo->pBlock, &pMeterDataInfo->pBlock[pMeterDataInfo->start], size * sizeof(SCompBlock));
-
-    char *tmp = realloc(pMeterDataInfo->pBlock, size * sizeof(SCompBlock));
-    if (tmp == NULL) {
-      return false;
-    }
-
-    pMeterDataInfo->pBlock = (SCompBlock *)tmp;
-    pMeterDataInfo->numOfBlocks = size;
-  }
-
-  return true;
-}
-
-static bool setCurrentQueryRange(SMeterDataInfo *pMeterDataInfo, SQuery *pQuery, TSKEY endKey, TSKEY *minval,
-                                 TSKEY *maxval) {
-  SQInfo *         pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-  SMeterObj *      pMeterObj = pMeterDataInfo->pMeterObj;
-  SMeterQueryInfo *pMeterQInfo = pMeterDataInfo->pMeterQInfo;
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    *minval = pMeterQInfo->lastKey;
-    *maxval = endKey;
-  } else {
-    *minval = endKey;
-    *maxval = pMeterQInfo->lastKey;
-  }
-
-  if (*minval > *maxval) {
-    qTrace("QInfo:%p vid:%d sid:%d id:%s, no result in files, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey,
-           pMeterQInfo->lastKey);
-    return false;
-  } else {
-    qTrace("QInfo:%p vid:%d sid:%d id:%s, query in files, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pMeterQInfo->skey, pMeterQInfo->ekey,
-           pMeterQInfo->lastKey);
-    return true;
-  }
-}
-
-/**
- * @param pSupporter
- * @param pQuery
- * @param numOfMeters
- * @param filePath
- * @param pMeterDataInfo
- * @return
- */
-int32_t getDataBlocksForMeters(SMeterQuerySupportObj *pSupporter, SQuery *pQuery, int32_t numOfMeters,
-                               const char *filePath, SMeterDataInfo **pMeterDataInfo, uint32_t *numOfBlocks) {
-  SQInfo *           pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-  SQueryCostSummary *pSummary = &pSupporter->runtimeEnv.summary;
-
-  TSKEY minval, maxval;
-
-  *numOfBlocks = 0;
-  SQueryFilesInfo *pVnodeFileInfo = &pSupporter->runtimeEnv.vnodeFileInfo;
-
-  // sequentially scan this header file to extract the compHeader info
-  for (int32_t j = 0; j < numOfMeters; ++j) {
-    SMeterObj *pMeterObj = pMeterDataInfo[j]->pMeterObj;
-
-    lseek(pVnodeFileInfo->headerFd, pMeterDataInfo[j]->offsetInHeaderFile, SEEK_SET);
-
-    SCompInfo compInfo = {0};
-    read(pVnodeFileInfo->headerFd, &compInfo, sizeof(SCompInfo));
-
-    int32_t ret = validateCompBlockInfoSegment(pQInfo, filePath, pMeterObj->vnode, &compInfo,
-                                               pMeterDataInfo[j]->offsetInHeaderFile);
-    if (ret != TSDB_CODE_SUCCESS) {  // file corrupted
-      clearAllMeterDataBlockInfo(pMeterDataInfo, 0, numOfMeters);
-      return TSDB_CODE_FILE_CORRUPTED;
-    }
-
-    if (compInfo.numOfBlocks <= 0 || compInfo.uid != pMeterDataInfo[j]->pMeterObj->uid) {
-      clearAllMeterDataBlockInfo(pMeterDataInfo, 0, numOfMeters);
-      continue;
-    }
-
-    int32_t size = compInfo.numOfBlocks * sizeof(SCompBlock);
-    size_t  bufferSize = size + sizeof(TSCKSUM);
-
-    pMeterDataInfo[j]->numOfBlocks = compInfo.numOfBlocks;
-    char* p = realloc(pMeterDataInfo[j]->pBlock, bufferSize);
-    if (p == NULL) {
-      clearAllMeterDataBlockInfo(pMeterDataInfo, 0, numOfMeters);
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    } else {
-      memset(p, 0, bufferSize);
-      pMeterDataInfo[j]->pBlock = (SCompBlock*) p;
-    }
-
-    read(pVnodeFileInfo->headerFd, pMeterDataInfo[j]->pBlock, bufferSize);
-    TSCKSUM checksum = *(TSCKSUM *)((char *)pMeterDataInfo[j]->pBlock + size);
-
-    int64_t st = taosGetTimestampUs();
-
-    // check compblock integrity
-    ret = validateCompBlockSegment(pQInfo, filePath, &compInfo, (char *)pMeterDataInfo[j]->pBlock, pMeterObj->vnode,
-                                   checksum);
-    if (ret != TSDB_CODE_SUCCESS) {
-      clearAllMeterDataBlockInfo(pMeterDataInfo, 0, numOfMeters);
-      return TSDB_CODE_FILE_CORRUPTED;
-    }
-
-    int64_t et = taosGetTimestampUs();
-
-    pSummary->readCompInfo++;
-    pSummary->totalCompInfoSize += (size + sizeof(SCompInfo) + sizeof(TSCKSUM));
-    pSummary->loadCompInfoUs += (et - st);
-
-    if (!setCurrentQueryRange(pMeterDataInfo[j], pQuery, pSupporter->rawEKey, &minval, &maxval)) {
-      clearAllMeterDataBlockInfo(pMeterDataInfo, j, j + 1);
-      continue;
-    }
-
-    int32_t end = 0;
-    if (!getValidDataBlocksRangeIndex(pMeterDataInfo[j], pQuery, pMeterDataInfo[j]->pBlock, compInfo.numOfBlocks,
-                                      minval, maxval, &end)) {
-      // current table has no qualified data blocks, erase its information.
-      clearAllMeterDataBlockInfo(pMeterDataInfo, j, j + 1);
-      continue;
-    }
-
-    if (!setValidDataBlocks(pMeterDataInfo[j], end)) {
-      clearAllMeterDataBlockInfo(pMeterDataInfo, 0, numOfMeters);
-      
-      pQInfo->killed = 1;  // set query kill, abort current query since no memory available
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-
-    qTrace("QInfo:%p vid:%d sid:%d id:%s, startIndex:%d, %d blocks qualified", pQInfo, pMeterObj->vnode, pMeterObj->sid,
-           pMeterObj->meterId, pMeterDataInfo[j]->start, pMeterDataInfo[j]->numOfBlocks);
-
-    (*numOfBlocks) += pMeterDataInfo[j]->numOfBlocks;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static void freeDataBlockFieldInfo(SMeterDataBlockInfoEx *pDataBlockInfoEx, int32_t len) {
-  for (int32_t i = 0; i < len; ++i) {
-    tfree(pDataBlockInfoEx[i].pBlock.fields);
-  }
-}
-
-void freeMeterBlockInfoEx(SMeterDataBlockInfoEx *pDataBlockInfoEx, int32_t len) {
-  freeDataBlockFieldInfo(pDataBlockInfoEx, len);
-  tfree(pDataBlockInfoEx);
-}
-
-typedef struct SBlockOrderSupporter {
-  int32_t                 numOfMeters;
-  SMeterDataBlockInfoEx **pDataBlockInfoEx;
-  int32_t *               blockIndexArray;
-  int32_t *               numOfBlocksPerMeter;
-} SBlockOrderSupporter;
-
-static int32_t blockAccessOrderComparator(const void *pLeft, const void *pRight, void *param) {
-  int32_t leftTableIndex = *(int32_t *)pLeft;
-  int32_t rightTableIndex = *(int32_t *)pRight;
-
-  SBlockOrderSupporter *pSupporter = (SBlockOrderSupporter *)param;
-
-  int32_t leftTableBlockIndex = pSupporter->blockIndexArray[leftTableIndex];
-  int32_t rightTableBlockIndex = pSupporter->blockIndexArray[rightTableIndex];
-
-  if (leftTableBlockIndex > pSupporter->numOfBlocksPerMeter[leftTableIndex]) {
-    /* left block is empty */
-    return 1;
-  } else if (rightTableBlockIndex > pSupporter->numOfBlocksPerMeter[rightTableIndex]) {
-    /* right block is empty */
-    return -1;
-  }
-
-  SMeterDataBlockInfoEx *pLeftBlockInfoEx = &pSupporter->pDataBlockInfoEx[leftTableIndex][leftTableBlockIndex];
-  SMeterDataBlockInfoEx *pRightBlockInfoEx = &pSupporter->pDataBlockInfoEx[rightTableIndex][rightTableBlockIndex];
-
-  //    assert(pLeftBlockInfoEx->pBlock.compBlock->offset != pRightBlockInfoEx->pBlock.compBlock->offset);
-  if (pLeftBlockInfoEx->pBlock.compBlock->offset == pRightBlockInfoEx->pBlock.compBlock->offset &&
-      pLeftBlockInfoEx->pBlock.compBlock->last == pRightBlockInfoEx->pBlock.compBlock->last) {
-    // todo add more information
-    dError("error in header file, two block with same offset:%p", pLeftBlockInfoEx->pBlock.compBlock->offset);
-  }
-
-  return pLeftBlockInfoEx->pBlock.compBlock->offset > pRightBlockInfoEx->pBlock.compBlock->offset ? 1 : -1;
-}
-
-void cleanBlockOrderSupporter(SBlockOrderSupporter *pSupporter, int32_t numOfTables) {
-  tfree(pSupporter->numOfBlocksPerMeter);
-  tfree(pSupporter->blockIndexArray);
-
-  for (int32_t i = 0; i < numOfTables; ++i) {
-    tfree(pSupporter->pDataBlockInfoEx[i]);
-  }
-
-  tfree(pSupporter->pDataBlockInfoEx);
-}
-
-int32_t createDataBlocksInfoEx(SMeterDataInfo **pMeterDataInfo, int32_t numOfMeters,
-                               SMeterDataBlockInfoEx **pDataBlockInfoEx, int32_t numOfCompBlocks,
-                               int32_t *numOfAllocBlocks, int64_t addr) {
-  // release allocated memory first
-  freeDataBlockFieldInfo(*pDataBlockInfoEx, *numOfAllocBlocks);
-
-  if (*numOfAllocBlocks == 0 || *numOfAllocBlocks < numOfCompBlocks) {
-    char *tmp = realloc((*pDataBlockInfoEx), sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
-    if (tmp == NULL) {
-      tfree(*pDataBlockInfoEx);
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-
-    *pDataBlockInfoEx = (SMeterDataBlockInfoEx *)tmp;
-    memset((*pDataBlockInfoEx), 0, sizeof(SMeterDataBlockInfoEx) * numOfCompBlocks);
-    *numOfAllocBlocks = numOfCompBlocks;
-  }
-
-  SBlockOrderSupporter supporter = {0};
-  supporter.numOfMeters = numOfMeters;
-  supporter.numOfBlocksPerMeter = calloc(1, sizeof(int32_t) * numOfMeters);
-  supporter.blockIndexArray = calloc(1, sizeof(int32_t) * numOfMeters);
-  supporter.pDataBlockInfoEx = calloc(1, POINTER_BYTES * numOfMeters);
-
-  if (supporter.numOfBlocksPerMeter == NULL || supporter.blockIndexArray == NULL ||
-      supporter.pDataBlockInfoEx == NULL) {
-    cleanBlockOrderSupporter(&supporter, 0);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  int32_t cnt = 0;
-  int32_t numOfQualMeters = 0;
-  for (int32_t j = 0; j < numOfMeters; ++j) {
-    if (pMeterDataInfo[j]->numOfBlocks == 0) {
-      continue;
-    }
-
-    SCompBlock *pBlock = pMeterDataInfo[j]->pBlock;
-    supporter.numOfBlocksPerMeter[numOfQualMeters] = pMeterDataInfo[j]->numOfBlocks;
-
-    char *buf = calloc(1, sizeof(SMeterDataBlockInfoEx) * pMeterDataInfo[j]->numOfBlocks);
-    if (buf == NULL) {
-      cleanBlockOrderSupporter(&supporter, numOfQualMeters);
-      return TSDB_CODE_SERV_OUT_OF_MEMORY;
-    }
-
-    supporter.pDataBlockInfoEx[numOfQualMeters] = (SMeterDataBlockInfoEx *)buf;
-
-    for (int32_t k = 0; k < pMeterDataInfo[j]->numOfBlocks; ++k) {
-      SMeterDataBlockInfoEx *pBlockInfoEx = &supporter.pDataBlockInfoEx[numOfQualMeters][k];
-  
-      pBlockInfoEx->pBlock.compBlock = &pBlock[k];
-      pBlockInfoEx->pBlock.fields = NULL;
-  
-      pBlockInfoEx->pMeterDataInfo = pMeterDataInfo[j];
-      pBlockInfoEx->groupIdx = pMeterDataInfo[j]->groupIdx;     // set the group index
-      pBlockInfoEx->blockIndex = pMeterDataInfo[j]->start + k;  // set the block index in original meter
-      cnt++;
-    }
-
-    numOfQualMeters++;
-  }
-
-  dTrace("QInfo %p create data blocks info struct completed", addr);
-
-  assert(cnt == numOfCompBlocks && numOfQualMeters <= numOfMeters);  // the pMeterDataInfo[j]->numOfBlocks may be 0
-  supporter.numOfMeters = numOfQualMeters;
-  SLoserTreeInfo *pTree = NULL;
-
-  uint8_t ret = tLoserTreeCreate(&pTree, supporter.numOfMeters, &supporter, blockAccessOrderComparator);
-  if (ret != TSDB_CODE_SUCCESS) {
-    cleanBlockOrderSupporter(&supporter, numOfMeters);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  int32_t numOfTotal = 0;
-
-  while (numOfTotal < cnt) {
-    int32_t                pos = pTree->pNode[0].index;
-    SMeterDataBlockInfoEx *pBlocksInfoEx = supporter.pDataBlockInfoEx[pos];
-    int32_t                index = supporter.blockIndexArray[pos]++;
-
-    (*pDataBlockInfoEx)[numOfTotal++] = pBlocksInfoEx[index];
-
-    // set data block index overflow, in order to disable the offset comparator
-    if (supporter.blockIndexArray[pos] >= supporter.numOfBlocksPerMeter[pos]) {
-      supporter.blockIndexArray[pos] = supporter.numOfBlocksPerMeter[pos] + 1;
-    }
-
-    tLoserTreeAdjust(pTree, pos + supporter.numOfMeters);
-  }
-
-  /*
-   * available when no import exists
-   * for(int32_t i = 0; i < cnt - 1; ++i) {
-   *   assert((*pDataBlockInfoEx)[i].pBlock.compBlock->offset < (*pDataBlockInfoEx)[i+1].pBlock.compBlock->offset);
-   * }
-   */
-
-  dTrace("QInfo %p %d data blocks sort completed", addr, cnt);
-  cleanBlockOrderSupporter(&supporter, numOfMeters);
-  free(pTree);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-/**
- * set output buffer for different group
- * @param pRuntimeEnv
- * @param pDataBlockInfoEx
- */
-void setExecutionContext(SMeterQuerySupportObj *pSupporter, SOutputRes *outputRes, int32_t meterIdx, int32_t groupIdx,
-                         SMeterQueryInfo *pMeterQueryInfo) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  setGroupOutputBuffer(pRuntimeEnv, &outputRes[groupIdx]);
-  initCtxOutputBuf(pRuntimeEnv);
-
-  vnodeSetTagValueInParam(pSupporter->pSidSet, pRuntimeEnv, pSupporter->pMeterSidExtInfo[meterIdx]);
-
-  // set the right cursor position for ts buffer
-  if (pSupporter->runtimeEnv.pTSBuf != NULL) {
-    if (pMeterQueryInfo->cur.vnodeIndex == -1) {
-      pMeterQueryInfo->tag = pRuntimeEnv->pCtx[0].tag.i64Key;
-
-      tsBufGetElemStartPos(pSupporter->runtimeEnv.pTSBuf, 0, pMeterQueryInfo->tag);
-    } else {
-      tsBufSetCursor(pSupporter->runtimeEnv.pTSBuf, &pMeterQueryInfo->cur);
-    }
-  }
-}
-
-static void setGroupOutputBuffer(SQueryRuntimeEnv *pRuntimeEnv, SOutputRes *pResult) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  // Note: pResult->result[i]->numOfElems == 0, there is only fixed number of results for each group
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    assert(pResult->result[i]->numOfElems == 0 || pResult->result[i]->numOfElems == 1);
-
-    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
-    pCtx->aOutputBuf = pResult->result[i]->data + pCtx->outputBytes * pResult->result[i]->numOfElems;
-
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if (functionId == TSDB_FUNC_TOP || functionId == TSDB_FUNC_BOTTOM || functionId == TSDB_FUNC_DIFF) {
-      pCtx->ptsOutputBuf = pRuntimeEnv->pCtx[0].aOutputBuf;
-    }
-
-    /*
-     * set the output buffer information and intermediate buffer
-     * not all queries require the interResultBuf, such as COUNT
-     */
-    pCtx->resultInfo = &pResult->resultInfo[i];
-
-    // set super table query flag
-    SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-    if (!isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-      pResInfo->superTableQ = true;
-    }
-  }
-}
-
-static char *getOutputResPos(SQueryRuntimeEnv *pRuntimeEnv, tFilePage *pData, int32_t row, int32_t col) {
-  // the output for each record should be less than the DEFAULT_INTERN_BUF_SIZE
-  assert(pRuntimeEnv->pCtx[col].outputBytes <= DEFAULT_INTERN_BUF_SIZE);
-
-  return (char *)pData->data + pRuntimeEnv->offset[col] * pRuntimeEnv->numOfRowsPerPage +
-         pRuntimeEnv->pCtx[col].outputBytes * row;
-}
-
-void setCtxOutputPointerForSupplementScan(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  int32_t    index = pMeterQueryInfo->reverseIndex;
-  tFilePage *pData = NULL;
-  int32_t    i = 0;
-
-  // find the position for this output result
-  for (; i < pMeterQueryInfo->numOfPages; ++i) {
-    pData = getFilePage(pSupporter, pMeterQueryInfo->pageList[i]);
-    if (index <= pData->numOfElems) {
-      break;
-    }
-    index -= pData->numOfElems;
-  }
-
-  assert(index >= 0);
-
-  /*
-   * if it is the first records in master scan, no next results exist, so no need to init the result buffer
-   * all data are processed and save to buffer during supplementary scan.
-   */
-  if (index == 0) {
-    return;
-  }
-
-  for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[k];
-
-    pCtx->aOutputBuf = getOutputResPos(pRuntimeEnv, pData, index - 1, k);
-    SResultInfo *pResInfo = GET_RES_INFO(pCtx);
-    if (pResInfo->complete) {
-      continue;
-    }
-
-    int32_t functId = pQuery->pSelectExpr[k].pBase.functionId;
-
-    // setup runtime environment
-    if ((QUERY_IS_ASC_QUERY(pQuery) && functId == TSDB_FUNC_FIRST_DST) ||
-        (!QUERY_IS_ASC_QUERY(pQuery) && functId == TSDB_FUNC_LAST_DST)) {
-      if (pMeterQueryInfo->lastResRows == 0) {
-        pCtx->currentStage = 0;
-
-        resetResultInfo(pResInfo);
-        aAggs[functId].init(pCtx);
-      }
-    }
-  }
-
-  // the first column is always the timestamp for interval query
-  TSKEY      ts = *(TSKEY *)pRuntimeEnv->pCtx[0].aOutputBuf;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-  qTrace("QInfo:%p vid:%d sid:%d id:%s, set output result pointer, ts:%" PRId64 ", index:%d", GET_QINFO_ADDR(pQuery),
-         pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->reverseIndex);
-}
-
-void validateTimestampForSupplementResult(SQueryRuntimeEnv *pRuntimeEnv, int64_t numOfIncrementRes) {
-  SQuery *        pQuery = pRuntimeEnv->pQuery;
-  SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-
-  if (pRuntimeEnv->scanFlag == SUPPLEMENTARY_SCAN && numOfIncrementRes > 0) {
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-      if (functionId == TSDB_FUNC_TS) {
-        assert(*(TSKEY *)pCtx[i].aOutputBuf == pCtx[i].nStartQueryTimestamp);
-      }
-    }
-  }
-}
-
-int32_t setOutputBufferForIntervalQuery(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  tFilePage *       pData = NULL;
-
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  // in the first scan, new space needed for results
-  if (pMeterQueryInfo->numOfPages == 0) {
-    pData = addDataPageForMeterQueryInfo(pQuery, pMeterQueryInfo, pSupporter);
-  } else {
-    int32_t lastPageId = pMeterQueryInfo->pageList[pMeterQueryInfo->numOfPages - 1];
-    pData = getFilePage(pSupporter, lastPageId);
-
-    if (pData->numOfElems >= pRuntimeEnv->numOfRowsPerPage) {
-      pData = addDataPageForMeterQueryInfo(pRuntimeEnv->pQuery, pMeterQueryInfo, pSupporter);
-      if (pData != NULL) {
-        assert(pData->numOfElems == 0);  // number of elements must be 0 for new allocated buffer
-      }
-    }
-  }
-
-  if (pData == NULL) {
-    return -1;
-  }
-
-  for (int32_t i = 0; i < pRuntimeEnv->pQuery->numOfOutputCols; ++i) {
-    pRuntimeEnv->pCtx[i].aOutputBuf = getOutputResPos(pRuntimeEnv, pData, pData->numOfElems, i);
-    pRuntimeEnv->pCtx[i].resultInfo = &pMeterQueryInfo->resultInfo[i];
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int32_t setIntervalQueryExecutionContext(SMeterQuerySupportObj *pSupporter, int32_t meterIdx,
-                                         SMeterQueryInfo *pMeterQueryInfo) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  if (IS_MASTER_SCAN(pRuntimeEnv)) {
-    if (setOutputBufferForIntervalQuery(pSupporter, pMeterQueryInfo) != TSDB_CODE_SUCCESS) {
-      // not enough disk space or memory buffer for intermediate results
-      return -1;
-    }
-
-    if (pMeterQueryInfo->lastResRows == 0) {
-      initCtxOutputBuf(pRuntimeEnv);
-    }
-
-  } else {
-    if (pMeterQueryInfo->reverseFillRes) {
-      setCtxOutputPointerForSupplementScan(pSupporter, pMeterQueryInfo);
-    } else {
-      /*
-       * set output buffer for reverse scan data blocks
-       * find the correct output position of existed results during
-       *
-       * If the master scan does not produce any results, new spaces needed to be allocated during supplement scan
-       */
-      if (setOutputBufferForIntervalQuery(pSupporter, pMeterQueryInfo) != TSDB_CODE_SUCCESS) {
-        return -1;
-      }
-    }
-  }
-
-  vnodeSetTagValueInParam(pSupporter->pSidSet, pRuntimeEnv, pSupporter->pMeterSidExtInfo[meterIdx]);
-
-  // both the master and supplement scan needs to set the correct ts comp start position
-  if (pSupporter->runtimeEnv.pTSBuf != NULL) {
-    if (pMeterQueryInfo->cur.vnodeIndex == -1) {
-      pMeterQueryInfo->tag = pRuntimeEnv->pCtx[0].tag.i64Key;
-
-      tsBufGetElemStartPos(pSupporter->runtimeEnv.pTSBuf, 0, pMeterQueryInfo->tag);
-
-      // keep the cursor info of current meter
-      pMeterQueryInfo->cur = pSupporter->runtimeEnv.pTSBuf->cur;
-    } else {
-      tsBufSetCursor(pSupporter->runtimeEnv.pTSBuf, &pMeterQueryInfo->cur);
-    }
-  }
-
-  return 0;
-}
-
-static void doApplyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
-                                        SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
-                                        __block_search_fn_t searchFn) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-  int32_t           factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  int64_t nextKey = -1;
-  bool    queryCompleted = false;
-
-  while (1) {
-    int32_t numOfRes = 0;
-    int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryCol, pFields, searchFn, &numOfRes);
-    assert(steps > 0);
-
-    // NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
-    if (pMeterQueryInfo->lastResRows == 0) {
-      pMeterQueryInfo->lastResRows = numOfRes;
-    } else {
-      assert(pMeterQueryInfo->lastResRows == 1);
-    }
-
-    int32_t pos = pQuery->pos + steps * factor;
-
-    // query does not reach the end of current block
-    if ((pos < pBlockInfo->size && QUERY_IS_ASC_QUERY(pQuery)) || (pos >= 0 && !QUERY_IS_ASC_QUERY(pQuery))) {
-      nextKey = pPrimaryCol[pos];
-    } else {
-      assert((pQuery->lastKey > pBlockInfo->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-             (pQuery->lastKey < pBlockInfo->keyFirst && !QUERY_IS_ASC_QUERY(pQuery)));
-    }
-
-    // all data satisfy current query are checked, query completed
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      queryCompleted = (nextKey > pQuery->ekey || pQuery->ekey <= pBlockInfo->keyLast);
-    } else {
-      queryCompleted = (nextKey < pQuery->ekey || pQuery->ekey >= pBlockInfo->keyFirst);
-    }
-
-    /*
-     * 1. there may be more date that satisfy current query interval, other than
-     *    current block, we need to try next data blocks
-     * 2. query completed, since reaches the upper bound of the main query range
-     */
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      if (pQuery->lastKey > pBlockInfo->keyLast || pQuery->lastKey > pSupporter->rawEKey ||
-          nextKey > pSupporter->rawEKey) {
-        /*
-         * current interval query is completed, set query result flag closed and
-         * try next data block if pQuery->ekey == pSupporter->rawEKey, whole query is completed
-         */
-        if (pQuery->lastKey > pBlockInfo->keyLast) {
-          assert(pQuery->ekey >= pBlockInfo->keyLast);
-        }
-
-        if (pQuery->lastKey > pSupporter->rawEKey || nextKey > pSupporter->rawEKey) {
-          /* whole query completed, save result and abort */
-          assert(queryCompleted);
-          saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-
-          // save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-        } else if (pQuery->ekey == pBlockInfo->keyLast) {
-          /* current interval query is completed, set the next query range on other data blocks if exist */
-          int64_t prevEKey = pQuery->ekey;
-
-          getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-          assert(queryCompleted && prevEKey < pQuery->skey);
-          if (pMeterQueryInfo->lastResRows > 0) {
-            saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-          }
-        } else {
-          /*
-           * Data that satisfy current query range may locate in current block and blocks that are directly right
-           * next to current block. Therefore, we need to keep the query range(interval) unchanged until reaching
-           * the direct next data block, while only forwards the pQuery->lastKey.
-           *
-           * With the information of the directly next data block, whether locates in cache or disk,
-           * current interval query being completed or not can be decided.
-           */
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-          assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
-
-          /*
-           * if current block is the last block of current file, we still close the result flag, and
-           * merge with other meters in the same group
-           */
-          if (queryCompleted) {
-            saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-          }
-        }
-
-        break;
-      }
-    } else {
-      if (pQuery->lastKey < pBlockInfo->keyFirst || pQuery->lastKey < pSupporter->rawEKey ||
-          nextKey < pSupporter->rawEKey) {
-        if (pQuery->lastKey < pBlockInfo->keyFirst) {
-          assert(pQuery->ekey <= pBlockInfo->keyFirst);
-        }
-
-        if (pQuery->lastKey < pSupporter->rawEKey || (nextKey < pSupporter->rawEKey && nextKey != -1)) {
-          /* whole query completed, save result and abort */
-          assert(queryCompleted);
-          saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-
-          /*
-           * save the pQuery->lastKey for retrieve data in cache, actually,
-           * there will be no qualified data in cache.
-           */
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-        } else if (pQuery->ekey == pBlockInfo->keyFirst) {
-          // current interval query is completed, set the next query range on other data blocks if exist
-          int64_t prevEKey = pQuery->ekey;
-
-          getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->lastKey, pSupporter->rawSKey, pSupporter->rawEKey);
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-          assert(queryCompleted && prevEKey > pQuery->skey);
-          if (pMeterQueryInfo->lastResRows > 0) {
-            saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-          }
-        } else {
-          /*
-           * Data that satisfy current query range may locate in current block and blocks that are
-           * directly right next to current block. Therefore, we need to keep the query range(interval)
-           * unchanged until reaching the direct next data block, while only forwards the pQuery->lastKey.
-           *
-           * With the information of the directly next data block, whether locates in cache or disk,
-           * current interval query being completed or not can be decided.
-           */
-          saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-          assert(pQuery->lastKey < pBlockInfo->keyFirst && pQuery->lastKey >= pQuery->ekey);
-
-          /*
-           * if current block is the last block of current file, we still close the result
-           * flag, and merge with other meters in the same group
-           */
-          if (queryCompleted) {
-            saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-          }
-        }
-
-        break;
-      }
-    }
-
-    assert(queryCompleted);
-    saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-
-    assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-           (nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
-
-    /* still in the same block to query */
-    getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
-    saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-    int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
-    assert(newPos == pQuery->pos + steps * factor);
-
-    pQuery->pos = newPos;
-  }
-}
-
-static void doApplyIntervalQueryOnBlock_rv(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo,
-                                        SBlockInfo *pBlockInfo, int64_t *pPrimaryCol, SField *pFields,
-                                        __block_search_fn_t searchFn) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-  int32_t           factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-  
-  while (1) {
-    int64_t nextKey = -1;
-    int32_t numOfRes = 0;
-    
-    int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryCol, pFields, searchFn, &numOfRes);
-    assert(steps > 0);
-
-    // NOTE: in case of stable query, only ONE(or ZERO) row of result generated for each query range
-    if (pMeterQueryInfo->lastResRows == 0) {
-      pMeterQueryInfo->lastResRows = numOfRes;
-    } else {
-      assert(pMeterQueryInfo->lastResRows == 1);
-    }
-  
-    int32_t pos = pQuery->pos + steps * factor;
-  
-    // query does not reach the end of current block
-    if ((pos < pBlockInfo->size && QUERY_IS_ASC_QUERY(pQuery)) || (pos >= 0 && !QUERY_IS_ASC_QUERY(pQuery))) {
-      nextKey = pPrimaryCol[pos];
-    } else {
-      assert((pQuery->lastKey > pBlockInfo->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-          (pQuery->lastKey < pBlockInfo->keyFirst && !QUERY_IS_ASC_QUERY(pQuery)));
-    }
-    
-    // all data satisfy current query are checked, query completed
-    bool completed = false;
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      completed = (pQuery->lastKey > pQuery->ekey);
-    } else {
-      completed = (pQuery->lastKey < pQuery->ekey);
-    }
-  
-    /*
-     * 1. there may be more date that satisfy current query interval, other than
-     *    current block, we need to try next data blocks
-     * 2. query completed, since reaches the upper bound of the main query range
-     */
-    if (!completed) {
-      /*
-       * Data that satisfy current query range may locate in current block and blocks that are directly right
-       * next to current block. Therefore, we need to keep the query range(interval) unchanged until reaching
-       * the direct next data block, while only forwards the pQuery->lastKey.
-       *
-       * With the information of the directly next data block, whether locates in cache or disk,
-       * current interval query being completed or not can be decided.
-       */
-      saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-      
-      if (QUERY_IS_ASC_QUERY(pQuery)) {
-        assert(pQuery->lastKey > pBlockInfo->keyLast && pQuery->lastKey <= pQuery->ekey);
-      } else {
-        assert(pQuery->lastKey < pBlockInfo->keyFirst && pQuery->lastKey >= pQuery->ekey);
-      }
-      
-      break;
-    }
-  
-    assert(completed);
-    
-    if (pQuery->ekey == pSupporter->rawEKey) {
-      /* whole query completed, save result and abort */
-      saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-    
-      // save the pQuery->lastKey for retrieve data in cache, actually, there will be no qualified data in cache.
-      saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-      
-      return;
-    } else if ((QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyLast) ||
-        (!QUERY_IS_ASC_QUERY(pQuery) && pQuery->ekey == pBlockInfo->keyFirst)) {
-      /* current interval query is completed, set the next query range on other data blocks if exist */
-      saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-      return;
-    }
-  
-    saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-    
-    assert(pos >= 0 && pos < pBlockInfo->size);
-    assert((nextKey >= pQuery->lastKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (nextKey <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
-  
-    /* still in the same block to query */
-    getAlignedIntervalQueryRange(pRuntimeEnv, nextKey, pSupporter->rawSKey, pSupporter->rawEKey);
-    saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-  
-    int32_t newPos = searchFn((char *)pPrimaryCol, pBlockInfo->size, pQuery->skey, pQuery->order.order);
-    assert(newPos == pQuery->pos + steps * factor);
-  
-    pQuery->pos = newPos;
-  }
-  
-}
-int64_t getNextAccessedKeyInData(SQuery *pQuery, int64_t *pPrimaryCol, SBlockInfo *pBlockInfo, int32_t blockStatus) {
-  assert(pQuery->pos >= 0 && pQuery->pos <= pBlockInfo->size - 1);
-
-  TSKEY key = -1;
-  if (IS_DATA_BLOCK_LOADED(blockStatus)) {
-    key = pPrimaryCol[pQuery->pos];
-  } else {
-    assert(pQuery->pos == pBlockInfo->size - 1 || pQuery->pos == 0);
-    key = QUERY_IS_ASC_QUERY(pQuery) ? pBlockInfo->keyFirst : pBlockInfo->keyLast;
-  }
-
-  assert((key >= pQuery->skey && QUERY_IS_ASC_QUERY(pQuery)) || (key <= pQuery->skey && !QUERY_IS_ASC_QUERY(pQuery)));
-  return key;
-}
-
-/*
- * There are two cases to handle:
- *
- * 1. Query range is not set yet (queryRangeSet = 0). we need to set the query range info, including pQuery->lastKey,
- *    pQuery->skey, and pQuery->eKey.
- * 2. Query range is set and query is in progress. There may be another result with the same query ranges to be
- *    merged during merge stage. In this case, we need the pMeterQueryInfo->lastResRows to decide if there
- *    is a previous result generated or not.
- */
-void setIntervalQueryRange(SMeterQueryInfo *pMeterQueryInfo, SMeterQuerySupportObj *pSupporter, TSKEY key) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  if (pMeterQueryInfo->queryRangeSet) {
-    assert((QUERY_IS_ASC_QUERY(pQuery) && pQuery->lastKey >= pQuery->skey) ||
-           (!QUERY_IS_ASC_QUERY(pQuery) && pQuery->lastKey <= pQuery->skey));
-
-    if ((pQuery->ekey < key && QUERY_IS_ASC_QUERY(pQuery)) || (pQuery->ekey > key && !QUERY_IS_ASC_QUERY(pQuery))) {
-      /*
-       * last query on this block of the meter is done, start next interval on this block
-       * otherwise, keep the previous query range and proceed
-       */
-      getAlignedIntervalQueryRange(pRuntimeEnv, key, pSupporter->rawSKey, pSupporter->rawEKey);
-      saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-      // previous query does not be closed, save the results and close it
-      if (pMeterQueryInfo->lastResRows > 0) {
-        saveResult(pSupporter, pMeterQueryInfo, pMeterQueryInfo->lastResRows);
-      }
-    } else {
-      /* current query not completed, continue. do nothing with respect to query range, */
-    }
-  } else {
-    pQuery->skey = key;
-    assert(pMeterQueryInfo->lastResRows == 0);
-
-    if ((QUERY_IS_ASC_QUERY(pQuery) && (pQuery->ekey < pQuery->skey)) ||
-        (!QUERY_IS_ASC_QUERY(pQuery) && (pQuery->skey < pQuery->ekey))) {
-      // for too small query range, no data in this interval.
-      return;
-    }
-
-    getAlignedIntervalQueryRange(pRuntimeEnv, pQuery->skey, pSupporter->rawSKey, pSupporter->rawEKey);
-    saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-    pMeterQueryInfo->queryRangeSet = 1;
-  }
-}
-
-bool requireTimestamp(SQuery *pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; i++) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-    if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_NEED_TS) != 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-static void setTimestampRange(SQueryRuntimeEnv *pRuntimeEnv, int64_t stime, int64_t etime) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    int32_t functionId = pQuery->pSelectExpr[i].pBase.functionId;
-
-    if (functionId == TSDB_FUNC_SPREAD) {
-      pRuntimeEnv->pCtx[i].param[1].dKey = stime;
-      pRuntimeEnv->pCtx[i].param[2].dKey = etime;
-
-      pRuntimeEnv->pCtx[i].param[1].nType = TSDB_DATA_TYPE_DOUBLE;
-      pRuntimeEnv->pCtx[i].param[2].nType = TSDB_DATA_TYPE_DOUBLE;
-    }
-  }
-}
-
-bool needPrimaryTimestampCol(SQuery *pQuery, SBlockInfo *pBlockInfo) {
-  /*
-   * 1. if skey or ekey locates in this block, we need to load the timestamp column to decide the precise position
-   * 2. if there are top/bottom, first_dst/last_dst functions, we need to load timestamp column in any cases;
-   */
-  bool loadPrimaryTS = (pQuery->lastKey >= pBlockInfo->keyFirst && pQuery->lastKey <= pBlockInfo->keyLast) ||
-                       (pQuery->ekey >= pBlockInfo->keyFirst && pQuery->ekey <= pBlockInfo->keyLast) ||
-                       requireTimestamp(pQuery);
-
-  return loadPrimaryTS;
-}
-
-int32_t LoadDatablockOnDemand(SCompBlock *pBlock, SField **pFields, uint8_t *blkStatus, SQueryRuntimeEnv *pRuntimeEnv,
-                              int32_t fileIdx, int32_t slotIdx, __block_search_fn_t searchFn, bool onDemand) {
-  SQuery *   pQuery = pRuntimeEnv->pQuery;
-  SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-
-  TSKEY *primaryKeys = (TSKEY *)pRuntimeEnv->primaryColBuffer->data;
-
-  pQuery->slot = slotIdx;
-  pQuery->pos = QUERY_IS_ASC_QUERY(pQuery) ? 0 : pBlock->numOfPoints - 1;
-
-  SET_FILE_BLOCK_FLAG(*blkStatus);
-  SET_DATA_BLOCK_NOT_LOADED(*blkStatus);
-
-  if (((pQuery->lastKey <= pBlock->keyFirst && pQuery->ekey >= pBlock->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-       (pQuery->ekey <= pBlock->keyFirst && pQuery->lastKey >= pBlock->keyLast && !QUERY_IS_ASC_QUERY(pQuery))) &&
-      onDemand) {
-    int32_t req = 0;
-    if (pQuery->numOfFilterCols > 0) {
-      req = BLK_DATA_ALL_NEEDED;
-    } else {
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        int32_t functID = pQuery->pSelectExpr[i].pBase.functionId;
-        req |= aAggs[functID].dataReqFunc(&pRuntimeEnv->pCtx[i], pBlock->keyFirst, pBlock->keyLast,
-                                          pQuery->pSelectExpr[i].pBase.colInfo.colId, *blkStatus);
-      }
-
-      if (pRuntimeEnv->pTSBuf > 0 || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-        req |= BLK_DATA_ALL_NEEDED;
-      }
-    }
-
-    if (req == BLK_DATA_NO_NEEDED) {
-      qTrace("QInfo:%p vid:%d sid:%d id:%s, slot:%d, data block ignored, brange:%" PRId64 "-%" PRId64 ", rows:%d",
-             GET_QINFO_ADDR(pQuery), pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->slot,
-             pBlock->keyFirst, pBlock->keyLast, pBlock->numOfPoints);
-
-      setTimestampRange(pRuntimeEnv, pBlock->keyFirst, pBlock->keyLast);
-    } else if (req == BLK_DATA_FILEDS_NEEDED) {
-      if (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pFields) < 0) {
-        return DISK_DATA_LOAD_FAILED;
-      }
-    } else {
-      assert(req == BLK_DATA_ALL_NEEDED);
-      goto _load_all;
-    }
-  } else {
-  _load_all:
-    if (loadDataBlockFieldsInfo(pRuntimeEnv, pBlock, pFields) < 0) {
-      return DISK_DATA_LOAD_FAILED;
-    }
-
-    if ((pQuery->lastKey <= pBlock->keyFirst && pQuery->ekey >= pBlock->keyLast && QUERY_IS_ASC_QUERY(pQuery)) ||
-        (pQuery->lastKey >= pBlock->keyLast && pQuery->ekey <= pBlock->keyFirst && !QUERY_IS_ASC_QUERY(pQuery))) {
-      /*
-       * if this block is completed included in the query range, do more filter operation
-       * filter the data block according to the value filter condition.
-       * no need to load the data block, continue for next block
-       */
-      if (!needToLoadDataBlock(pQuery, *pFields, pRuntimeEnv->pCtx, pBlock->numOfPoints)) {
-#if defined(_DEBUG_VIEW)
-        dTrace("QInfo:%p fileId:%d, slot:%d, block discarded by per-filter, ", GET_QINFO_ADDR(pQuery), pQuery->fileId,
-               pQuery->slot);
-#endif
-        qTrace("QInfo:%p id:%s slot:%d, data block ignored by pre-filter, fields loaded, brange:%" PRId64 "-%" PRId64
-               ", rows:%d",
-               GET_QINFO_ADDR(pQuery), pMeterObj->meterId, pQuery->slot, pBlock->keyFirst, pBlock->keyLast,
-               pBlock->numOfPoints);
-        return DISK_DATA_DISCARDED;
-      }
-    }
-
-    SBlockInfo binfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_FILE_BLOCK);
-    bool       loadTS = needPrimaryTimestampCol(pQuery, &binfo);
-
-    /*
-     * the pRuntimeEnv->pMeterObj is not updated during loop, since which meter this block is belonged to is not matter
-     * in order to enforce to load the data block, we HACK the load check procedure,
-     * by changing pQuery->slot each time to IGNORE the pLoadInfo data check. It is NOT a normal way.
-     */
-    int32_t ret = loadDataBlockIntoMem(pBlock, pFields, pRuntimeEnv, fileIdx, loadTS, false);
-    SET_DATA_BLOCK_LOADED(*blkStatus);
-
-    if (ret < 0) {
-      return DISK_DATA_LOAD_FAILED;
-    }
-
-    /* find first qualified record position in this block */
-    if (loadTS) {
-      /* find first qualified record position in this block */
-      pQuery->pos =
-          searchFn(pRuntimeEnv->primaryColBuffer->data, pBlock->numOfPoints, pQuery->lastKey, pQuery->order.order);
-      /* boundary timestamp check */
-      assert(pBlock->keyFirst == primaryKeys[0] && pBlock->keyLast == primaryKeys[pBlock->numOfPoints - 1]);
-    }
-
-    /*
-     * NOTE:
-     * if the query of current timestamp window is COMPLETED, the query range condition may not be satisfied
-     * such as:
-     * pQuery->lastKey + 1 == pQuery->ekey for descending order interval query
-     * pQuery->lastKey - 1 == pQuery->ekey for ascending query
-     */
-    assert(((pQuery->ekey >= pQuery->lastKey || pQuery->ekey == pQuery->lastKey - 1) && QUERY_IS_ASC_QUERY(pQuery)) ||
-           ((pQuery->ekey <= pQuery->lastKey || pQuery->ekey == pQuery->lastKey + 1) && !QUERY_IS_ASC_QUERY(pQuery)));
-  }
-
-  return DISK_DATA_LOADED;
-}
-
-bool onDemandLoadDatablock(SQuery *pQuery, int16_t queryRangeSet) {
-  return (pQuery->nAggTimeInterval == 0) || ((queryRangeSet == 1) && (pQuery->nAggTimeInterval > 0));
-}
-
-static void validateResultBuf(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pSupporter->runtimeEnv.pQuery;
-
-  tFilePage *newOutput = getFilePage(pSupporter, pMeterQueryInfo->pageList[pMeterQueryInfo->numOfPages - 1]);
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    assert(pRuntimeEnv->pCtx[i].aOutputBuf - newOutput->data < DEFAULT_INTERN_BUF_SIZE);
-  }
-}
-
-int32_t saveResult(SMeterQuerySupportObj *pSupporter, SMeterQueryInfo *pMeterQueryInfo, int32_t numOfResult) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  // no results generated, do nothing for master scan
-  if (numOfResult <= 0) {
-    if (IS_MASTER_SCAN(pRuntimeEnv)) {
-      return TSDB_CODE_SUCCESS;
-    } else {
-      /*
-       * There is a case that no result generated during the the supplement scan, and during the main
-       * scan also no result generated. The index can be backwards moved.
-       *
-       * However, if during the main scan, there is a result generated, such as applies count to timestamp, which
-       * always generates a result, but applies last query to a NULL column may fail to generate results during the
-       * supplement scan.
-       *
-       * NOTE:
-       * nStartQueryTimestamp is the actually timestamp of current interval, if the actually interval timestamp
-       * equals to the recorded timestamp that is acquired during the master scan, backwards one step even
-       * there is no results during the supplementary scan.
-       */
-      TSKEY ts = *(TSKEY *)pRuntimeEnv->pCtx[0].aOutputBuf;
-      if (ts == pRuntimeEnv->pCtx[0].nStartQueryTimestamp && pMeterQueryInfo->reverseIndex > 0) {
-        assert(pMeterQueryInfo->numOfRes >= 0 && pMeterQueryInfo->reverseIndex > 0 &&
-               pMeterQueryInfo->reverseIndex <= pMeterQueryInfo->numOfRes);
-
-        // backward one step from the previous position, the start position is (pMeterQueryInfo->numOfRows-1);
-        pMeterQueryInfo->reverseIndex -= 1;
-        setCtxOutputPointerForSupplementScan(pSupporter, pMeterQueryInfo);
-      }
-
-      return TSDB_CODE_SUCCESS;
-    }
-  }
-
-  assert(pMeterQueryInfo->lastResRows == 1);
-  numOfResult = 1;
-  pMeterQueryInfo->lastResRows = 0;
-
-  if (IS_SUPPLEMENT_SCAN(pRuntimeEnv) && pMeterQueryInfo->reverseFillRes == 1) {
-    assert(pMeterQueryInfo->numOfRes > 0 && pMeterQueryInfo->reverseIndex > 0 &&
-           pMeterQueryInfo->reverseIndex <= pMeterQueryInfo->numOfRes);
-    // backward one step from the previous position, the start position is (pMeterQueryInfo->numOfRows-1);
-    pMeterQueryInfo->reverseIndex -= 1;
-    setCtxOutputPointerForSupplementScan(pSupporter, pMeterQueryInfo);
-  } else {
-    int32_t    pageId = pMeterQueryInfo->pageList[pMeterQueryInfo->numOfPages - 1];
-    tFilePage *pData = getFilePage(pSupporter, pageId);
-
-    // in handling records occuring around '1970-01-01', the aligned start timestamp may be 0.
-    TSKEY ts = *(TSKEY *)getOutputResPos(pRuntimeEnv, pData, pData->numOfElems, 0);
-
-    SMeterObj *pMeterObj = pRuntimeEnv->pMeterObj;
-    qTrace("QInfo:%p vid:%d sid:%d id:%s, save results, ts:%" PRId64 ", total:%d", GET_QINFO_ADDR(pQuery),
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, ts, pMeterQueryInfo->numOfRes + 1);
-
-    pData->numOfElems += numOfResult;
-    pMeterQueryInfo->numOfRes += numOfResult;
-    assert(pData->numOfElems <= pRuntimeEnv->numOfRowsPerPage);
-
-    if (setOutputBufferForIntervalQuery(pSupporter, pMeterQueryInfo) != TSDB_CODE_SUCCESS) {
-      return -1;
-    }
-
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      resetResultInfo(&pMeterQueryInfo->resultInfo[i]);
-    }
-
-    validateResultBuf(pSupporter, pMeterQueryInfo);
-    initCtxOutputBuf(pRuntimeEnv);
-#if 0
-    SSchema sc[TSDB_MAX_COLUMNS] = {0};
-    sc[0].type = TSDB_DATA_TYPE_BIGINT;
-    sc[0].bytes = 8;
-
-    sc[1].type = TSDB_DATA_TYPE_BIGINT;
-    sc[1].bytes = 8;
-
-    UNUSED(sc);
-    tColModel *cm = tColModelCreate(sc, pQuery->numOfOutputCols, pRuntimeEnv->numOfRowsPerPage);
-
-//    if (outputPage->numOfElems + numOfResult >= pRuntimeEnv->numOfRowsPerPage)
-        tColModelDisplay(cm, outputPage->data, outputPage->numOfElems, pRuntimeEnv->numOfRowsPerPage);
-#endif
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getSubsetNumber(SMeterQuerySupportObj *pSupporter) {
-  SQuery *pQuery = pSupporter->runtimeEnv.pQuery;
-
-  int32_t totalSubset = 0;
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->nAggTimeInterval > 0 && pQuery->slidingTime > 0)) {
-    totalSubset = numOfClosedSlidingWindow(&pSupporter->runtimeEnv.swindowResInfo);
-  } else {
-    totalSubset = pSupporter->pSidSet->numOfSubSet;
-  }
-
-  return totalSubset;
-}
-
-static int32_t doCopyFromGroupBuf(SMeterQuerySupportObj *pSupporter, SOutputRes *result, int32_t orderType) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  int32_t numOfResult = 0;
-  int32_t startIdx = 0;
-  int32_t forward = 1;
-
-  dTrace("QInfo:%p start to copy data to dest buf", GET_QINFO_ADDR(pSupporter->runtimeEnv.pQuery));
-
-  int32_t totalSubset = getSubsetNumber(pSupporter);
-
-  if (orderType == TSQL_SO_ASC) {
-    startIdx = pSupporter->subgroupIdx;
-  } else {  // desc
-    startIdx = totalSubset - pSupporter->subgroupIdx - 1;
-    forward = -1;
-  }
-
-  for (int32_t i = startIdx; (i < totalSubset) && (i >= 0); i += forward) {
-    if (result[i].numOfRows == 0) {
-      pSupporter->offset = 0;
-      pSupporter->subgroupIdx += 1;
-      continue;
-    }
-
-    assert(result[i].numOfRows >= 0 && pSupporter->offset <= 1);
-
-    tFilePage **srcBuf = result[i].result;
-
-    int32_t numOfRowsToCopy = result[i].numOfRows - pSupporter->offset;
-    int32_t oldOffset = pSupporter->offset;
-
-    if (numOfRowsToCopy > pQuery->pointsToRead - numOfResult) {
-      // current output space is not enough for the keep the data of this group
-      numOfRowsToCopy = pQuery->pointsToRead - numOfResult;
-      pSupporter->offset += numOfRowsToCopy;
-    } else {
-      pSupporter->offset = 0;
-      pSupporter->subgroupIdx += 1;
-    }
-
-    for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-      int32_t elemSize = pRuntimeEnv->pCtx[j].outputBytes;
-      char *  outputBuf = pQuery->sdata[j]->data + numOfResult * elemSize;
-
-      memcpy(outputBuf, srcBuf[j]->data + oldOffset * elemSize, elemSize * numOfRowsToCopy);
-    }
-
-    numOfResult += numOfRowsToCopy;
-    if (numOfResult == pQuery->pointsToRead) {
-      break;
-    }
-  }
-
-  dTrace("QInfo:%p done copy data to dst buf", GET_QINFO_ADDR(pSupporter->runtimeEnv.pQuery));
-
-#ifdef _DEBUG_VIEW
-  displayInterResult(pQuery->sdata, pQuery, numOfResult);
-#endif
-  return numOfResult;
-}
-
-/**
- * copyFromGroupBuf support copy data in ascending/descending order
- * @param pQInfo
- * @param result
- */
-void copyFromGroupBuf(SQInfo *pQInfo, SOutputRes *result) {
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  int32_t orderType = (pQuery->pGroupbyExpr != NULL) ? pQuery->pGroupbyExpr->orderType : TSQL_SO_ASC;
-  int32_t numOfResult = doCopyFromGroupBuf(pSupporter, result, orderType);
-
-  pQuery->pointsRead += numOfResult;
-  assert(pQuery->pointsRead <= pQuery->pointsToRead);
-}
-
-static void applyIntervalQueryOnBlock(SMeterQuerySupportObj *pSupporter, SMeterDataInfo *pMeterDataInfo,
-                                      SBlockInfo *pBlockInfo, int32_t blockStatus, SField *pFields,
-                                      __block_search_fn_t searchFn) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-  SMeterQueryInfo * pMeterQueryInfo = pMeterDataInfo->pMeterQInfo;
-
-  int64_t* pPrimaryKey = (int64_t*) pRuntimeEnv->primaryColBuffer->data;
-  /*
-   * for each block, we need to handle the previous query, since the determination of previous query being completed
-   * or not is based on the start key of current block.
-   */
-  TSKEY key = getNextAccessedKeyInData(pQuery, pPrimaryKey, pBlockInfo, blockStatus);
-  setIntervalQueryRange(pMeterDataInfo->pMeterQInfo, pSupporter, key);
-
-  if (((pQuery->skey > pQuery->ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-      ((pQuery->skey < pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
-    return;
-  }
-
-  if (((pBlockInfo->keyLast < pQuery->ekey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-      ((pBlockInfo->keyFirst > pQuery->ekey) && !QUERY_IS_ASC_QUERY(pQuery))) {
-    int32_t numOfRes = 0;
-    /* current block is included in this interval */
-    int32_t steps = applyFunctionsOnBlock(pRuntimeEnv, pBlockInfo, pPrimaryKey, pFields, searchFn, &numOfRes);
-    assert(numOfRes <= 1 && numOfRes >= 0 && steps > 0);
-
-    if (pMeterQueryInfo->lastResRows == 0) {
-      pMeterQueryInfo->lastResRows = numOfRes;
-    } else {
-      assert(pMeterQueryInfo->lastResRows == 1);
-    }
-
-    saveIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-  } else {
-    doApplyIntervalQueryOnBlock(pSupporter, pMeterQueryInfo, pBlockInfo, pPrimaryKey, pFields, searchFn);
-  }
-}
-
-// we need to split the refstatsult into different packages.
-int32_t vnodeGetResultSize(void *thandle, int32_t *numOfRows) {
-  SQInfo *pQInfo = (SQInfo *)thandle;
-  SQuery *pQuery = &pQInfo->query;
-
-  /*
-   * get the file size and set the numOfRows to be the file size, since for tsComp query,
-   * the returned row size is equalled to 1
-   *
-   * TODO handle the case that the file is too large to send back one time
-   */
-  if (pQInfo->pMeterQuerySupporter != NULL && isTSCompQuery(pQuery) && (*numOfRows) > 0) {
-    struct stat fstat;
-    if (stat(pQuery->sdata[0]->data, &fstat) == 0) {
-      *numOfRows = fstat.st_size;
-      return fstat.st_size;
-    } else {
-      dError("QInfo:%p failed to get file info, path:%s, reason:%s", pQInfo, pQuery->sdata[0]->data, strerror(errno));
-      return 0;
-    }
-  } else {
-    return pQInfo->query.rowSize * (*numOfRows);
-  }
-}
-
-int64_t vnodeGetOffsetVal(void *thandle) {
-  SQInfo *pQInfo = (SQInfo *)thandle;
-  return pQInfo->query.limit.offset;
-}
-
-bool vnodeHasRemainResults(void *handle) {
-  SQInfo *               pQInfo = (SQInfo *)handle;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  if (pSupporter == NULL || pQInfo->query.interpoType == TSDB_INTERPO_NONE) {
-    return false;
-  }
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = pRuntimeEnv->pQuery;
-
-  SInterpolationInfo *pInterpoInfo = &pRuntimeEnv->interpoInfo;
-  if (pQuery->limit.limit > 0 && pQInfo->pointsRead >= pQuery->limit.limit) {
-    return false;
-  }
-
-  int32_t remain = taosNumOfRemainPoints(pInterpoInfo);
-  if (remain > 0) {
-    return true;
-  } else {
-    if (pRuntimeEnv->pInterpoBuf == NULL) {
-      return false;
-    }
-
-    // query has completed
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED | QUERY_NO_DATA_TO_CHECK)) {
-      TSKEY   ekey = taosGetRevisedEndKey(pSupporter->rawEKey, pQuery->order.order, pQuery->nAggTimeInterval,
-                                        pQuery->intervalTimeUnit, pQuery->precision);
-      int32_t numOfTotal = taosGetNumOfResultWithInterpo(pInterpoInfo, (TSKEY *)pRuntimeEnv->pInterpoBuf[0]->data,
-                                                         remain, pQuery->nAggTimeInterval, ekey, pQuery->pointsToRead);
-      return numOfTotal > 0;
-    }
-
-    return false;
-  }
-}
-
-static int32_t resultInterpolate(SQInfo *pQInfo, tFilePage **data, tFilePage **pDataSrc, int32_t numOfRows,
-                                 int32_t outputRows) {
-  SQuery *          pQuery = &pQInfo->query;
-  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->pMeterQuerySupporter->runtimeEnv;
-
-  assert(pRuntimeEnv->pCtx[0].outputBytes == TSDB_KEYSIZE);
-
-  // build support structure for performing interpolation
-  SSchema *pSchema = calloc(1, sizeof(SSchema) * pQuery->numOfOutputCols);
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    pSchema[i].bytes = pRuntimeEnv->pCtx[i].outputBytes;
-    pSchema[i].type = pQuery->pSelectExpr[i].resType;
-  }
-
-  tColModel *pModel = tColModelCreate(pSchema, pQuery->numOfOutputCols, pQuery->pointsToRead);
-
-  char *  srcData[TSDB_MAX_COLUMNS] = {0};
-  int32_t functions[TSDB_MAX_COLUMNS] = {0};
-
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    srcData[i] = pDataSrc[i]->data;
-    functions[i] = pQuery->pSelectExpr[i].pBase.functionId;
-  }
-
-  int32_t numOfRes = taosDoInterpoResult(&pRuntimeEnv->interpoInfo, pQuery->interpoType, data, numOfRows, outputRows,
-                                         pQuery->nAggTimeInterval, (int64_t *)pDataSrc[0]->data, pModel, srcData,
-                                         pQuery->defaultVal, functions, pRuntimeEnv->pMeterObj->pointsPerFileBlock);
-
-  tColModelDestroy(pModel);
-  free(pSchema);
-
-  return numOfRes;
-}
-
-static void doCopyQueryResultToMsg(SQInfo *pQInfo, int32_t numOfRows, char *data) {
-  SMeterObj *pObj = pQInfo->pObj;
-  SQuery *   pQuery = &pQInfo->query;
-
-  int tnumOfRows = vnodeList[pObj->vnode].cfg.rowsInFileBlock;
-
-  // for metric query, bufIndex always be 0.
-  for (int32_t col = 0; col < pQuery->numOfOutputCols; ++col) {  // pQInfo->bufIndex == 0
-    int32_t bytes = pQuery->pSelectExpr[col].resBytes;
-
-    memmove(data, pQuery->sdata[col]->data + bytes * tnumOfRows * pQInfo->bufIndex, bytes * numOfRows);
-    data += bytes * numOfRows;
-  }
-}
-
-/**
- * Copy the result data/file to output message buffer.
- * If the result is in file format, read file from disk and copy to output buffer, compression is not involved since
- * data in file is already compressed.
- * In case of other result in buffer, compress the result before copy once the tsComressMsg is set.
- *
- * @param handle
- * @param data
- * @param numOfRows the number of rows that are not returned in current retrieve
- * @return
- */
-int32_t vnodeCopyQueryResultToMsg(void *handle, char *data, int32_t numOfRows) {
-  SQInfo *pQInfo = (SQInfo *)handle;
-  SQuery *pQuery = &pQInfo->query;
-
-  assert(pQuery->pSelectExpr != NULL && pQuery->numOfOutputCols > 0);
-
-  // load data from file to msg buffer
-  if (isTSCompQuery(pQuery)) {
-    int32_t fd = open(pQuery->sdata[0]->data, O_RDONLY, 0666);
-
-    // make sure file exist
-    if (FD_VALID(fd)) {
-      size_t s = lseek(fd, 0, SEEK_END);
-      dTrace("QInfo:%p ts comp data return, file:%s, size:%zu", pQInfo, pQuery->sdata[0]->data, s);
-
-      lseek(fd, 0, SEEK_SET);
-      read(fd, data, s);
-      close(fd);
-
-      unlink(pQuery->sdata[0]->data);
-    } else {
-      dError("QInfo:%p failed to open tmp file to send ts-comp data to client, path:%s, reason:%s", pQInfo,
-             pQuery->sdata[0]->data, strerror(errno));
-    }
-  } else {
-    doCopyQueryResultToMsg(pQInfo, numOfRows, data);
-  }
-
-  return numOfRows;
-}
-
-int32_t vnodeQueryResultInterpolate(SQInfo *pQInfo, tFilePage **pDst, tFilePage **pDataSrc, int32_t numOfRows,
-                                    int32_t *numOfInterpo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *               pQuery = pRuntimeEnv->pQuery;
-
-  while (1) {
-    numOfRows = taosNumOfRemainPoints(&pRuntimeEnv->interpoInfo);
-
-    TSKEY   ekey = taosGetRevisedEndKey(pSupporter->rawEKey, pQuery->order.order, pQuery->nAggTimeInterval,
-                                      pQuery->intervalTimeUnit, pQuery->precision);
-    int32_t numOfFinalRows =
-        taosGetNumOfResultWithInterpo(&pRuntimeEnv->interpoInfo, (TSKEY *)pDataSrc[0]->data, numOfRows,
-                                      pQuery->nAggTimeInterval, ekey, pQuery->pointsToRead);
-
-    int32_t ret = resultInterpolate(pQInfo, pDst, pDataSrc, numOfRows, numOfFinalRows);
-    assert(ret == numOfFinalRows);
-
-    /* reached the start position of according to offset value, return immediately */
-    if (pQuery->limit.offset == 0) {
-      return ret;
-    }
-
-    if (pQuery->limit.offset < ret) {
-      ret -= pQuery->limit.offset;
-      // todo !!!!there exactly number of interpo is not valid.
-      // todo refactor move to the beginning of buffer
-      //      if (QUERY_IS_ASC_QUERY(pQuery)) {
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        memmove(pDst[i]->data, pDst[i]->data + pQuery->pSelectExpr[i].resBytes * pQuery->limit.offset,
-                ret * pQuery->pSelectExpr[i].resBytes);
-      }
-      //      } else {
-      //        for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      //          memmove(pDst[i]->data + (pQuery->pointsToRead - ret) * pQuery->pSelectExpr[i].resBytes,
-      //                  pDst[i]->data + (pQuery->pointsToRead - ret - pQuery->limit.offset) *
-      //                  pQuery->pSelectExpr[i].resBytes, ret * pQuery->pSelectExpr[i].resBytes);
-      //        }
-      //      }
-      pQuery->limit.offset = 0;
-      return ret;
-    } else {
-      pQuery->limit.offset -= ret;
-      ret = 0;
-    }
-
-    if (!vnodeHasRemainResults(pQInfo)) {
-      return ret;
-    }
-  }
-}
-
-void vnodePrintQueryStatistics(SMeterQuerySupportObj *pSupporter) {
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-  SQInfo *pQInfo = (SQInfo *)GET_QINFO_ADDR(pQuery);
-
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-  pSummary->tmpBufferInDisk = pSupporter->bufSize;
-
-  dTrace("QInfo:%p statis: comp blocks:%d, size:%d Bytes, elapsed time:%.2f ms", pQInfo, pSummary->readCompInfo,
-         pSummary->totalCompInfoSize, pSummary->loadCompInfoUs / 1000.0);
-
-  dTrace("QInfo:%p statis: field info: %d, size:%d Bytes, avg size:%.2f Bytes, elapsed time:%.2f ms", pQInfo,
-         pSummary->readField, pSummary->totalFieldSize, (double)pSummary->totalFieldSize / pSummary->readField,
-         pSummary->loadFieldUs / 1000.0);
-
-  dTrace(
-      "QInfo:%p statis: file blocks:%d, size:%d Bytes, elapsed time:%.2f ms, skipped:%d, in-memory gen null:%d Bytes",
-      pQInfo, pSummary->readDiskBlocks, pSummary->totalBlockSize, pSummary->loadBlocksUs / 1000.0,
-      pSummary->skippedFileBlocks, pSummary->totalGenData);
-
-  dTrace("QInfo:%p statis: cache blocks:%d", pQInfo, pSummary->blocksInCache, 0);
-  dTrace("QInfo:%p statis: temp file:%d Bytes", pQInfo, pSummary->tmpBufferInDisk);
-
-  dTrace("QInfo:%p statis: file:%d, table:%d", pQInfo, pSummary->numOfFiles, pSummary->numOfTables);
-  dTrace("QInfo:%p statis: seek ops:%d", pQInfo, pSummary->numOfSeek);
-
-  double total = pSummary->fileTimeUs + pSummary->cacheTimeUs;
-  double io = pSummary->loadCompInfoUs + pSummary->loadBlocksUs + pSummary->loadFieldUs;
-  //    assert(io <= pSummary->fileTimeUs);
-
-  // todo add the intermediate result save cost!!
-  double computing = total - io;
-
-  dTrace(
-      "QInfo:%p statis: total elapsed time:%.2f ms, file:%.2f ms(%.2f%), cache:%.2f ms(%.2f%). io:%.2f ms(%.2f%),"
-      "comput:%.2fms(%.2f%)",
-      pQInfo, total / 1000.0, pSummary->fileTimeUs / 1000.0, pSummary->fileTimeUs * 100 / total,
-      pSummary->cacheTimeUs / 1000.0, pSummary->cacheTimeUs * 100 / total, io / 1000.0, io * 100 / total,
-      computing / 1000.0, computing * 100 / total);
-}
diff --git a/src/system/detail/src/vnodeQueryProcess.c b/src/system/detail/src/vnodeQueryProcess.c
deleted file mode 100644
index 6fe8b2fa775b57799b150f57ba3f0eb71e7ab3f6..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeQueryProcess.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "tscJoinProcess.h"
-#include "ttime.h"
-#include "vnode.h"
-#include "vnodeRead.h"
-#include "vnodeUtil.h"
-
-#include "vnodeQueryImpl.h"
-
-#define ALL_CACHE_BLOCKS_CHECKED(q) \
-  (((q)->slot == (q)->currentSlot && QUERY_IS_ASC_QUERY(q)) || ((q)->slot == (q)->firstSlot && (!QUERY_IS_ASC_QUERY(q))))
-
-#define FORWARD_CACHE_BLOCK_CHECK_SLOT(slot, step, maxblocks) (slot) = ((slot) + (step) + (maxblocks)) % (maxblocks);
-
-static bool isGroupbyEachTable(SSqlGroupbyExpr *pGroupbyExpr, tSidSet *pSidset) {
-  if (pGroupbyExpr == NULL || pGroupbyExpr->numOfGroupCols == 0) {
-    return false;
-  }
-
-  for (int32_t i = 0; i < pGroupbyExpr->numOfGroupCols; ++i) {
-    SColIndexEx *pColIndex = &pGroupbyExpr->columnInfo[i];
-    if (pColIndex->flag == TSDB_COL_TAG) {
-      assert(pSidset->numOfSids == pSidset->numOfSubSet);
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static bool doCheckWithPrevQueryRange(SQInfo *pQInfo, TSKEY nextKey, SMeterDataInfo *pMeterInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterObj *            pMeterObj = pMeterInfo->pMeterObj;
-
-  /* no data for current query */
-  if ((nextKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-      (nextKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-    if (((nextKey > pSupporter->rawEKey) && QUERY_IS_ASC_QUERY(pQuery)) ||
-        ((nextKey < pSupporter->rawEKey) && (!QUERY_IS_ASC_QUERY(pQuery)))) {
-      dTrace("QInfo:%p vid:%d sid:%d id:%s, no data qualified in block, ignore", pQInfo, pMeterObj->vnode,
-             pMeterObj->sid, pMeterObj->meterId);
-
-      return false;
-    } else {  // in case of interval query, forward the query range
-      setIntervalQueryRange(pMeterInfo->pMeterQInfo, pSupporter, nextKey);
-    }
-  }
-
-  return true;
-}
-
-/**
- * The start position of the first check cache block is located before starting the loop.
- * And the start position for next cache blocks needs to be decided before checking each cache block.
- */
-static void setStartPositionForCacheBlock(SQuery *pQuery, SCacheBlock *pBlock, bool *firstCheckSlot) {
-  if (!(*firstCheckSlot)) {
-    if (QUERY_IS_ASC_QUERY(pQuery)) {
-      pQuery->pos = 0;
-    } else {
-      pQuery->pos = pBlock->numOfPoints - 1;
-    }
-  } else {
-    (*firstCheckSlot) = false;
-  }
-}
-
-static void enableExecutionForNextTable(SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery* pQuery = pRuntimeEnv->pQuery;
-  
-  for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-    SResultInfo *pResInfo = GET_RES_INFO(&pRuntimeEnv->pCtx[i]);
-    if (pResInfo != NULL) {
-      pResInfo->complete = false;
-    }
-  }
-}
-
-static void queryOnMultiDataCache(SQInfo *pQInfo, SMeterDataInfo *pMeterInfo) {
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pQInfo->pMeterQuerySupporter->runtimeEnv;
-
-  SMeterSidExtInfo **pMeterSidExtInfo = pSupporter->pMeterSidExtInfo;
-
-  SMeterObj *pTempMeterObj = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[0]->sid);
-  assert(pTempMeterObj != NULL);
-
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pTempMeterObj->searchAlgorithm];
-  int32_t             step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-
-  dTrace("QInfo:%p start to query data in cache", pQInfo);
-  int64_t st = taosGetTimestampUs();
-  int32_t totalBlocks = 0;
-
-  for (int32_t groupIdx = 0; groupIdx < pSupporter->pSidSet->numOfSubSet; ++groupIdx) {
-    int32_t start = pSupporter->pSidSet->starterPos[groupIdx];
-    int32_t end = pSupporter->pSidSet->starterPos[groupIdx + 1] - 1;
-
-    if (isQueryKilled(pQuery)) {
-      return;
-    }
-
-    for (int32_t k = start; k <= end; ++k) {
-      SMeterObj *pMeterObj = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[k]->sid);
-      if (pMeterObj == NULL) {
-        dError("QInfo:%p failed to find meterId:%d, continue", pQInfo, pMeterSidExtInfo[k]->sid);
-        continue;
-      }
-
-      pQInfo->pObj = pMeterObj;
-      pRuntimeEnv->pMeterObj = pMeterObj;
-
-      if (pMeterInfo[k].pMeterQInfo == NULL) {
-        pMeterInfo[k].pMeterQInfo = createMeterQueryInfo(pQuery, pSupporter->rawSKey, pSupporter->rawEKey);
-      }
-
-      if (pMeterInfo[k].pMeterObj == NULL) {  // no data in disk for this meter, set its pointer
-        setMeterDataInfo(&pMeterInfo[k], pMeterObj, k, groupIdx);
-      }
-
-      assert(pMeterInfo[k].meterOrderIdx == k && pMeterObj == pMeterInfo[k].pMeterObj);
-
-      SMeterQueryInfo *pMeterQueryInfo = pMeterInfo[k].pMeterQInfo;
-      restoreIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-      /*
-       * Update the query meter column index and the corresponding filter column index
-       * the original column index info may be inconsistent with current meter in cache.
-       *
-       * The stable schema has been changed, but the meter schema, along with the data in cache,
-       * will not be updated until data with new schema arrive.
-       */
-      vnodeUpdateQueryColumnIndex(pQuery, pMeterObj);
-      vnodeUpdateFilterColumnIndex(pQuery);
-
-      if (pQuery->nAggTimeInterval == 0) {
-        if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          dTrace(
-              "QInfo:%p vid:%d sid:%d id:%s, query completed, ignore data in cache. qrange:%" PRId64 "-%" PRId64 ", "
-              "lastKey:%" PRId64,
-              pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey,
-              pQuery->lastKey);
-
-          continue;
-        }
-
-        setExecutionContext(pSupporter, pSupporter->pResult, k, pMeterInfo[k].groupIdx, pMeterQueryInfo);
-      } else {
-        int32_t ret = setIntervalQueryExecutionContext(pSupporter, k, pMeterQueryInfo);
-        if (ret != TSDB_CODE_SUCCESS) {
-          pQInfo->killed = 1;
-          return;
-        }
-      }
-
-      qTrace("QInfo:%p vid:%d sid:%d id:%s, query in cache, qrange:%" PRId64 "-%" PRId64 ", lastKey:%" PRId64, pQInfo, pMeterObj->vnode,
-             pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery->lastKey);
-
-      /*
-       * find the appropriated start position in cache
-       * NOTE: (taking ascending order query for example)
-       * for the specific query range [pQuery->lastKey, pQuery->ekey], there may be no qualified result in cache.
-       * Therefore, we need the first point that is greater(less) than the pQuery->lastKey, so the boundary check
-       * should be ignored (the fourth parameter).
-       */
-      TSKEY nextKey = getQueryStartPositionInCache(pRuntimeEnv, &pQuery->slot, &pQuery->pos, true);
-      if (nextKey < 0) {
-        qTrace("QInfo:%p vid:%d sid:%d id:%s, no data qualified in cache, cache blocks:%d, lastKey:%" PRId64, pQInfo,
-               pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->numOfBlocks, pQuery->lastKey);
-        continue;
-      }
-
-      // data in this block may be flushed to disk and this block is allocated to other meter
-      // todo try with remain cache blocks
-      SCacheBlock *pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-      if (pBlock == NULL) {
-        continue;
-      }
-
-      if (!doCheckWithPrevQueryRange(pQInfo, nextKey, &pMeterInfo[k])) {
-        continue;
-      }
-
-      bool        firstCheckSlot = true;
-      SCacheInfo *pCacheInfo = (SCacheInfo *)pMeterObj->pCache;
-
-      for (int32_t i = 0; i < pCacheInfo->maxBlocks; ++i) {
-        pBlock = getCacheDataBlock(pMeterObj, pRuntimeEnv, pQuery->slot);
-
-        /*
-         * 1. pBlock == NULL. The cache block may be flushed to disk, so it is not available, skip and try next
-         * The check for empty block is refactor to getCacheDataBlock function
-         */
-        if (pBlock == NULL) {
-          if (ALL_CACHE_BLOCKS_CHECKED(pQuery)) {
-            break;
-          }
-
-          FORWARD_CACHE_BLOCK_CHECK_SLOT(pQuery->slot, step, pCacheInfo->maxBlocks);
-          continue;
-        }
-
-        setStartPositionForCacheBlock(pQuery, pBlock, &firstCheckSlot);
-
-        TSKEY* primaryKeys = (TSKEY*) pRuntimeEnv->primaryColBuffer->data;
-        
-        // in handling file data block, the timestamp range validation is done during fetching candidate file blocks
-        if ((primaryKeys[pQuery->pos] > pSupporter->rawEKey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (primaryKeys[pQuery->pos] < pSupporter->rawEKey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          break;
-        }
-
-        // only record the key on last block
-        SET_CACHE_BLOCK_FLAG(pRuntimeEnv->blockStatus);
-        SBlockInfo binfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_CACHE_BLOCK);
-
-        dTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", fileId:%d, slot:%d, pos:%d, bstatus:%d",
-               GET_QINFO_ADDR(pQuery), binfo.keyFirst, binfo.keyLast, pQuery->fileId, pQuery->slot, pQuery->pos,
-               pRuntimeEnv->blockStatus);
-
-        totalBlocks++;
-        queryOnBlock(pSupporter, primaryKeys, pRuntimeEnv->blockStatus, &binfo, &pMeterInfo[k], NULL, searchFn);
-
-        if (ALL_CACHE_BLOCKS_CHECKED(pQuery)) {
-          break;
-        }
-
-        FORWARD_CACHE_BLOCK_CHECK_SLOT(pQuery->slot, step, pCacheInfo->maxBlocks);
-      }
-    }
-  }
-
-  int64_t            time = taosGetTimestampUs() - st;
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-
-  pSummary->blocksInCache += totalBlocks;
-  pSummary->cacheTimeUs += time;
-  pSummary->numOfTables = pSupporter->pSidSet->numOfSids;
-
-  dTrace("QInfo:%p complete check %d cache blocks, elapsed time:%.3fms", pQInfo, totalBlocks, time / 1000.0);
-
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-}
-
-static void queryOnMultiDataFiles(SQInfo *pQInfo, SMeterDataInfo *pMeterDataInfo) {
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-  SMeterDataBlockInfoEx *pDataBlockInfoEx = NULL;
-  int32_t                nAllocBlocksInfoSize = 0;
-
-  SMeterObj *         pTempMeter = getMeterObj(pSupporter->pMetersHashTable, pSupporter->pMeterSidExtInfo[0]->sid);
-  __block_search_fn_t searchFn = vnodeSearchKeyFunc[pTempMeter->searchAlgorithm];
-
-  int32_t vnodeId = pTempMeter->vnode;
-  SQueryFilesInfo* pVnodeFileInfo = &pRuntimeEnv->vnodeFileInfo;
-  
-  dTrace("QInfo:%p start to check data blocks in %d files", pQInfo, pVnodeFileInfo->numOfFiles);
-
-  int32_t            fid = QUERY_IS_ASC_QUERY(pQuery) ? -1 : INT32_MAX;
-  int32_t            step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
-  SQueryCostSummary *pSummary = &pRuntimeEnv->summary;
-
-  int64_t totalBlocks = 0;
-  int64_t st = taosGetTimestampUs();
-
-  while (1) {
-    if (isQueryKilled(pQuery)) {
-      break;
-    }
-
-    int32_t fileIdx = vnodeGetVnodeHeaderFileIdx(&fid, pRuntimeEnv, pQuery->order.order);
-    if (fileIdx < 0) {  // no valid file, abort current search
-      break;
-    }
-
-    pRuntimeEnv->startPos.fileId = fid;
-    pQuery->fileId = fid;
-    pSummary->numOfFiles++;
-
-    if (vnodeGetHeaderFile(pRuntimeEnv, fileIdx) != TSDB_CODE_SUCCESS) {
-      fid += step;
-      continue;
-    }
-    
-    int32_t numOfQualifiedMeters = 0;
-    assert(fileIdx == pRuntimeEnv->vnodeFileInfo.current);
-    
-    SMeterDataInfo **pReqMeterDataInfo = NULL;
-    int32_t ret = vnodeFilterQualifiedMeters(pQInfo, vnodeId, pSupporter->pSidSet, pMeterDataInfo,
-                                             &numOfQualifiedMeters, &pReqMeterDataInfo);
-    if (ret != TSDB_CODE_SUCCESS) {
-      dError("QInfo:%p failed to create meterdata struct to perform query processing, abort", pQInfo);
-  
-      tfree(pReqMeterDataInfo);
-      pQInfo->code = -ret;
-      pQInfo->killed = 1;
-      
-      return;
-    }
-
-    dTrace("QInfo:%p file:%s, %d meters qualified", pQInfo, pVnodeFileInfo->dataFilePath, numOfQualifiedMeters);
-    
-    // none of meters in query set have pHeaderFileData in this file, try next file
-    if (numOfQualifiedMeters == 0) {
-      fid += step;
-      tfree(pReqMeterDataInfo);
-      continue;
-    }
-
-    uint32_t numOfBlocks = 0;
-    ret = getDataBlocksForMeters(pSupporter, pQuery, numOfQualifiedMeters, pVnodeFileInfo->headerFilePath,
-                                 pReqMeterDataInfo, &numOfBlocks);
-    if (ret != TSDB_CODE_SUCCESS) {
-      dError("QInfo:%p failed to get data block before scan data blocks, abort", pQInfo);
-  
-      tfree(pReqMeterDataInfo);
-      pQInfo->code = -ret;
-      pQInfo->killed = 1;
-  
-      return;
-    }
-
-    dTrace("QInfo:%p file:%s, %d meters contains %d blocks to be checked", pQInfo, pVnodeFileInfo->dataFilePath,
-           numOfQualifiedMeters, numOfBlocks);
-    
-    if (numOfBlocks == 0) {
-      fid += step;
-      tfree(pReqMeterDataInfo);
-      continue;
-    }
-
-    ret = createDataBlocksInfoEx(pReqMeterDataInfo, numOfQualifiedMeters, &pDataBlockInfoEx, numOfBlocks,
-                                       &nAllocBlocksInfoSize, (int64_t)pQInfo);
-    if (ret != TSDB_CODE_SUCCESS) {  // failed to create data blocks
-      dError("QInfo:%p build blockInfoEx failed, abort", pQInfo);
-      tfree(pReqMeterDataInfo);
-
-      pQInfo->code = -ret;
-      pQInfo->killed = 1;
-      return;
-    }
-
-    dTrace("QInfo:%p start to load %d blocks and check", pQInfo, numOfBlocks);
-    int64_t TRACE_OUTPUT_BLOCK_CNT = 10000;
-    int64_t stimeUnit = 0;
-    int64_t etimeUnit = 0;
-
-    totalBlocks += numOfBlocks;
-
-    // sequentially scan the pHeaderFileData file
-    int32_t j = QUERY_IS_ASC_QUERY(pQuery) ? 0 : numOfBlocks - 1;
-
-    for (; j < numOfBlocks && j >= 0; j += step) {
-      if (isQueryKilled(pQuery)) {
-        break;
-      }
-
-      /* output elapsed time for log every TRACE_OUTPUT_BLOCK_CNT blocks */
-      if (j == 0) {
-        stimeUnit = taosGetTimestampMs();
-      } else if ((j % TRACE_OUTPUT_BLOCK_CNT) == 0) {
-        etimeUnit = taosGetTimestampMs();
-        dTrace("QInfo:%p load and check %" PRId64 " blocks, and continue. elapsed:%" PRId64 " ms", pQInfo, TRACE_OUTPUT_BLOCK_CNT,
-               etimeUnit - stimeUnit);
-        stimeUnit = taosGetTimestampMs();
-      }
-
-      SMeterDataBlockInfoEx *pInfoEx = &pDataBlockInfoEx[j];
-      SMeterDataInfo *       pOneMeterDataInfo = pInfoEx->pMeterDataInfo;
-      SMeterQueryInfo *      pMeterQueryInfo = pOneMeterDataInfo->pMeterQInfo;
-      SMeterObj *            pMeterObj = pOneMeterDataInfo->pMeterObj;
-
-      pQInfo->pObj = pMeterObj;
-      pRuntimeEnv->pMeterObj = pMeterObj;
-
-      restoreIntervalQueryRange(pRuntimeEnv, pMeterQueryInfo);
-
-      if (pQuery->nAggTimeInterval == 0) {  // normal query
-        if ((pQuery->lastKey > pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-            (pQuery->lastKey < pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery))) {
-          qTrace(
-              "QInfo:%p vid:%d sid:%d id:%s, query completed, no need to scan this data block. qrange:%" PRId64 "-%" PRId64 ", "
-              "lastKey:%" PRId64,
-              pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey,
-              pQuery->lastKey);
-
-          continue;
-        }
-
-        setExecutionContext(pSupporter, pSupporter->pResult, pOneMeterDataInfo->meterOrderIdx,
-                            pOneMeterDataInfo->groupIdx, pMeterQueryInfo);
-      } else {  // interval query
-        ret = setIntervalQueryExecutionContext(pSupporter, pOneMeterDataInfo->meterOrderIdx, pMeterQueryInfo);
-        if (ret != TSDB_CODE_SUCCESS) {
-          tfree(pReqMeterDataInfo);  // error code has been set
-          pQInfo->killed = 1;
-          return;
-        }
-      }
-
-      SCompBlock *pBlock = pInfoEx->pBlock.compBlock;
-      bool        ondemandLoad = onDemandLoadDatablock(pQuery, pMeterQueryInfo->queryRangeSet);
-      int32_t     ret = LoadDatablockOnDemand(pBlock, &pInfoEx->pBlock.fields, &pRuntimeEnv->blockStatus, pRuntimeEnv,
-                                          fileIdx, pInfoEx->blockIndex, searchFn, ondemandLoad);
-      if (ret != DISK_DATA_LOADED) {
-        pSummary->skippedFileBlocks++;
-        continue;
-      }
-
-      SBlockInfo binfo = getBlockBasicInfo(pRuntimeEnv, pBlock, BLK_FILE_BLOCK);
-
-      assert(pQuery->pos >= 0 && pQuery->pos < pBlock->numOfPoints);
-      TSKEY *primaryKeys = (TSKEY *)pRuntimeEnv->primaryColBuffer->data;
-
-      if (IS_DATA_BLOCK_LOADED(pRuntimeEnv->blockStatus) && needPrimaryTimestampCol(pQuery, &binfo)) {
-        TSKEY nextKey = primaryKeys[pQuery->pos];
-        if (!doCheckWithPrevQueryRange(pQInfo, nextKey, pOneMeterDataInfo)) {
-          continue;
-        }
-      } else {
-        // if data block is not loaded, it must be the intermediate blocks
-        assert((pBlock->keyFirst >= pQuery->lastKey && pBlock->keyLast <= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-               (pBlock->keyFirst >= pQuery->ekey && pBlock->keyLast <= pQuery->lastKey && !QUERY_IS_ASC_QUERY(pQuery)));
-      }
-
-      queryOnBlock(pSupporter, primaryKeys, pRuntimeEnv->blockStatus, &binfo, pOneMeterDataInfo, pInfoEx->pBlock.fields,
-                   searchFn);
-    }
-
-    tfree(pReqMeterDataInfo);
-
-    // try next file
-    fid += step;
-  }
-
-  int64_t time = taosGetTimestampUs() - st;
-  dTrace("QInfo:%p complete check %d files, %d blocks, elapsed time:%.3fms", pQInfo, pVnodeFileInfo->numOfFiles,
-         totalBlocks, time / 1000.0);
-
-  pSummary->fileTimeUs += time;
-  pSummary->readDiskBlocks += totalBlocks;
-  pSummary->numOfTables = pSupporter->pSidSet->numOfSids;
-
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-  freeMeterBlockInfoEx(pDataBlockInfoEx, nAllocBlocksInfoSize);
-}
-
-static bool multimeterMultioutputHelper(SQInfo *pQInfo, bool *dataInDisk, bool *dataInCache, int32_t index,
-                                        int32_t start) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  SMeterSidExtInfo **pMeterSidExtInfo = pSupporter->pMeterSidExtInfo;
-  SQueryRuntimeEnv * pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *           pQuery = &pQInfo->query;
-
-  setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
-
-  SMeterObj *pMeterObj = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[index]->sid);
-  if (pMeterObj == NULL) {
-    dError("QInfo:%p do not find required meter id: %d, all meterObjs id is:", pQInfo, pMeterSidExtInfo[index]->sid);
-    return false;
-  }
-
-  vnodeSetTagValueInParam(pSupporter->pSidSet, pRuntimeEnv, pMeterSidExtInfo[index]);
-
-  dTrace("QInfo:%p query on (%d): vid:%d sid:%d meterId:%s, qrange:%" PRId64 "-%" PRId64, pQInfo, index - start, pMeterObj->vnode,
-         pMeterObj->sid, pMeterObj->meterId, pQuery->skey, pQuery->ekey);
-
-  pQInfo->pObj = pMeterObj;
-  pQuery->lastKey = pQuery->skey;
-  pRuntimeEnv->pMeterObj = pMeterObj;
-  
-  vnodeUpdateQueryColumnIndex(pQuery, pRuntimeEnv->pMeterObj);
-  vnodeUpdateFilterColumnIndex(pQuery);
-
-  vnodeCheckIfDataExists(pRuntimeEnv, pMeterObj, dataInDisk, dataInCache);
-
-  // data in file or cache is not qualified for the query. abort
-  if (!(dataInCache || dataInDisk)) {
-    dTrace("QInfo:%p vid:%d sid:%d meterId:%s, qrange:%" PRId64 "-%" PRId64 ", nores, %p", pQInfo, pMeterObj->vnode, pMeterObj->sid,
-           pMeterObj->meterId, pQuery->skey, pQuery->ekey, pQuery);
-    return false;
-  }
-
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    if (pRuntimeEnv->cur.vnodeIndex == -1) {
-      int64_t tag = pRuntimeEnv->pCtx[0].tag.i64Key;
-      STSElem elem = tsBufGetElemStartPos(pRuntimeEnv->pTSBuf, 0, tag);
-
-      // failed to find data with the specified tag value
-      if (elem.vnode < 0) {
-        return false;
-      }
-    } else {
-      tsBufSetCursor(pRuntimeEnv->pTSBuf, &pRuntimeEnv->cur);
-    }
-  }
-
-  initCtxOutputBuf(pRuntimeEnv);
-  return true;
-}
-
-static int64_t doCheckMetersInGroup(SQInfo *pQInfo, int32_t index, int32_t start) {
-  SQuery *               pQuery = &pQInfo->query;
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  bool dataInDisk = true;
-  bool dataInCache = true;
-  if (!multimeterMultioutputHelper(pQInfo, &dataInDisk, &dataInCache, index, start)) {
-    return 0;
-  }
-
-#if DEFAULT_IO_ENGINE == IO_ENGINE_MMAP
-  for (int32_t i = 0; i < pRuntimeEnv->numOfFiles; ++i) {
-    resetMMapWindow(&pRuntimeEnv->pVnodeFiles[i]);
-  }
-#endif
-
-  SPointInterpoSupporter pointInterpSupporter = {0};
-  pointInterpSupporterInit(pQuery, &pointInterpSupporter);
-
-  if (!normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, &pointInterpSupporter, NULL)) {
-    pointInterpSupporterDestroy(&pointInterpSupporter);
-    return 0;
-  }
-
-  /*
-   * here we set the value for before and after the specified time into the
-   * parameter for interpolation query
-   */
-  pointInterpSupporterSetData(pQInfo, &pointInterpSupporter);
-  pointInterpSupporterDestroy(&pointInterpSupporter);
-
-  vnodeScanAllData(pRuntimeEnv);
-  
-  // first/last_row query, do not invoke the finalize for super table query
-  doFinalizeResult(pRuntimeEnv);
-
-  int64_t numOfRes = getNumOfResult(pRuntimeEnv);
-  assert(numOfRes == 1 || numOfRes == 0);
-
-  // accumulate the point interpolation result
-  if (numOfRes > 0) {
-    pQuery->pointsRead += numOfRes;
-    forwardCtxOutputBuf(pRuntimeEnv, numOfRes);
-  }
-
-  return numOfRes;
-}
-
-/**
- * super table query handler
- * 1. super table projection query, group-by on normal columns query, ts-comp query
- * 2. point interpolation query, last row query
- *
- * @param pQInfo
- */
-static void vnodeSTableSeqProcessor(SQInfo *pQInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  SMeterSidExtInfo **pMeterSidExtInfo = pSupporter->pMeterSidExtInfo;
-  SQueryRuntimeEnv * pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  SQuery * pQuery = &pQInfo->query;
-  tSidSet *pSids = pSupporter->pSidSet;
-
-  int32_t vid = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[0]->sid)->vnode;
-  
-  if (isPointInterpoQuery(pQuery)) {
-    resetCtxOutputBuf(pRuntimeEnv);
-  
-    assert(pQuery->limit.offset == 0 && pQuery->limit.limit != 0);
-
-    while (pSupporter->subgroupIdx < pSids->numOfSubSet) {
-      int32_t start = pSids->starterPos[pSupporter->subgroupIdx];
-      int32_t end = pSids->starterPos[pSupporter->subgroupIdx + 1] - 1;
-
-      if (isFirstLastRowQuery(pQuery)) {
-        dTrace("QInfo:%p last_row query on vid:%d, numOfGroups:%d, current group:%d", pQInfo, vid,
-               pSids->numOfSubSet, pSupporter->subgroupIdx);
-
-        TSKEY   key = -1;
-        int32_t index = -1;
-
-        // choose the last key for one group
-        pSupporter->meterIdx = start;
-
-        for (int32_t k = start; k <= end; ++k, pSupporter->meterIdx++) {
-          if (isQueryKilled(pQuery)) {
-            setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-            return;
-          }
-
-          // get the last key of meters that belongs to this group
-          SMeterObj *pMeterObj = getMeterObj(pSupporter->pMetersHashTable, pMeterSidExtInfo[k]->sid);
-          if (pMeterObj != NULL) {
-            if (key < pMeterObj->lastKey) {
-              key = pMeterObj->lastKey;
-              index = k;
-            }
-          }
-        }
-
-        pQuery->skey = key;
-        pQuery->ekey = key;
-        pSupporter->rawSKey = key;
-        pSupporter->rawEKey = key;
-
-        int64_t num = doCheckMetersInGroup(pQInfo, index, start);
-        assert(num >= 0);
-      } else {
-        dTrace("QInfo:%p interp query on vid:%d, numOfGroups:%d, current group:%d", pQInfo, vid,
-               pSids->numOfSubSet, pSupporter->subgroupIdx);
-
-        for (int32_t k = start; k <= end; ++k) {
-          if (isQueryKilled(pQuery)) {
-            setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-            return;
-          }
-
-          pQuery->skey = pSupporter->rawSKey;
-          pQuery->ekey = pSupporter->rawEKey;
-
-          int64_t num = doCheckMetersInGroup(pQInfo, k, start);
-          if (num == 1) {
-            break;
-          }
-        }
-      }
-
-      pSupporter->subgroupIdx++;
-
-      // output buffer is full, return to client
-      if (pQuery->pointsRead >= pQuery->pointsToRead) {
-        break;
-      }
-    }
-  } else {
-    /*
-     * 1. super table projection query, 2. group-by on normal columns query, 3. ts-comp query
-     */
-    assert(pSupporter->meterIdx >= 0);
-
-    /*
-     * if the subgroup index is larger than 0, results generated by group by tbname,k is existed.
-     * we need to return it to client in the first place.
-     */
-    if (pSupporter->subgroupIdx > 0) {
-      copyFromGroupBuf(pQInfo, pSupporter->pResult);
-      pQInfo->pointsRead += pQuery->pointsRead;
-
-      if (pQuery->pointsRead > 0) {
-        return;
-      }
-    }
-
-    if (pSupporter->meterIdx >= pSids->numOfSids) {
-      return;
-    }
-  
-    resetCtxOutputBuf(pRuntimeEnv);
-    resetSlidingWindowInfo(&pRuntimeEnv->swindowResInfo, pQuery->numOfOutputCols);
-    
-    while (pSupporter->meterIdx < pSupporter->numOfMeters) {
-      int32_t k = pSupporter->meterIdx;
-
-      if (isQueryKilled(pQuery)) {
-        setQueryStatus(pQuery, QUERY_NO_DATA_TO_CHECK);
-        return;
-      }
-      
-
-      TSKEY skey = pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[k]->key;
-      if (skey > 0) {
-        pQuery->skey = skey;
-      }
-
-      bool dataInDisk = true;
-      bool dataInCache = true;
-      if (!multimeterMultioutputHelper(pQInfo, &dataInDisk, &dataInCache, k, 0)) {
-        pQuery->skey = pSupporter->rawSKey;
-        pQuery->ekey = pSupporter->rawEKey;
-
-        pSupporter->meterIdx++;
-        continue;
-      }
-
-#if DEFAULT_IO_ENGINE == IO_ENGINE_MMAP
-      for (int32_t i = 0; i < pRuntimeEnv->numOfFiles; ++i) {
-        resetMMapWindow(&pRuntimeEnv->pVnodeFiles[i]);
-      }
-#endif
-
-      SPointInterpoSupporter pointInterpSupporter = {0};
-      if (normalizedFirstQueryRange(dataInDisk, dataInCache, pSupporter, &pointInterpSupporter, NULL) == false) {
-        pQuery->skey = pSupporter->rawSKey;
-        pQuery->ekey = pSupporter->rawEKey;
-
-        pSupporter->meterIdx++;
-        continue;
-      }
-
-      // TODO handle the limit problem
-      if (pQuery->numOfFilterCols == 0 && pQuery->limit.offset > 0) {
-        forwardQueryStartPosition(pRuntimeEnv);
-
-        if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK | QUERY_COMPLETED)) {
-          pQuery->skey = pSupporter->rawSKey;
-          pQuery->ekey = pSupporter->rawEKey;
-
-          pSupporter->meterIdx++;
-          continue;
-        }
-      }
-
-      vnodeScanAllData(pRuntimeEnv);
-
-      pQuery->pointsRead = getNumOfResult(pRuntimeEnv);
-      doSkipResults(pRuntimeEnv);
-
-      // the limitation of output result is reached, set the query completed
-      if (doRevisedResultsByLimit(pQInfo)) {
-        pSupporter->meterIdx = pSupporter->pSidSet->numOfSids;
-        break;
-      }
-  
-      // enable execution for next table, when handling the projection query
-      enableExecutionForNextTable(pRuntimeEnv);
-  
-      if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK | QUERY_COMPLETED)) {
-        /*
-         * query range is identical in terms of all meters involved in query,
-         * so we need to restore them at the *beginning* of query on each meter,
-         * not the consecutive query on meter on which is aborted due to buffer limitation
-         * to ensure that, we can reset the query range once query on a meter is completed.
-         */
-        pQuery->skey = pSupporter->rawSKey;
-        pQuery->ekey = pSupporter->rawEKey;
-        pSupporter->meterIdx++;
-
-        pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[k]->key = pQuery->lastKey;
-
-        // if the buffer is full or group by each table, we need to jump out of the loop
-        if (Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL) ||
-            isGroupbyEachTable(pQuery->pGroupbyExpr, pSupporter->pSidSet)) {
-          break;
-        }
-
-      } else { // forward query range
-        pQuery->skey = pQuery->lastKey;
-
-        // all data in the result buffer are skipped due to the offset, continue to retrieve data from current meter
-        if (pQuery->pointsRead == 0) {
-          assert(!Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL));
-          continue;
-        } else {
-          pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[k]->key = pQuery->lastKey;
-          // buffer is full, wait for the next round to retrieve data from current meter
-          assert(Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL));
-          break;
-        }
-      }
-    }
-  }
-
-  /*
-   * 1. super table projection query, group-by on normal columns query, ts-comp query
-   * 2. point interpolation query, last row query
-   *
-   * group-by on normal columns query and last_row query do NOT invoke the finalizer here,
-   * since the finalize stage will be done at the client side.
-   *
-   * projection query, point interpolation query do not need the finalizer.
-   *
-   * Only the ts-comp query requires the finalizer function to be executed here.
-   */
-  if (isTSCompQuery(pQuery)) {
-    doFinalizeResult(pRuntimeEnv);
-  }
-
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    pRuntimeEnv->cur = pRuntimeEnv->pTSBuf->cur;
-  }
-
-  // todo refactor
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-    SSlidingWindowInfo* pSlidingWindowInfo = &pRuntimeEnv->swindowResInfo;
-  
-    for (int32_t i = 0; i < pSlidingWindowInfo->size; ++i) {
-      SOutputRes *buf = &pSlidingWindowInfo->pResult[i];
-      pSlidingWindowInfo->pStatus[i].closed = true;   // enable return all results for group by normal columns
-      
-      for (int32_t j = 0; j < pQuery->numOfOutputCols; ++j) {
-        buf->numOfRows = MAX(buf->numOfRows, buf->resultInfo[j].numOfRes);
-      }
-    }
-
-    pQInfo->pMeterQuerySupporter->subgroupIdx = 0;
-    pQuery->pointsRead = 0;
-    copyFromGroupBuf(pQInfo, pSlidingWindowInfo->pResult);
-  }
-
-  pQInfo->pointsRead += pQuery->pointsRead;
-  pQuery->pointsOffset = pQuery->pointsToRead;
-
-  dTrace(
-      "QInfo %p vid:%d, numOfMeters:%d, index:%d, numOfGroups:%d, %d points returned, totalRead:%d totalReturn:%d,"
-      "next skey:%" PRId64 ", offset:%" PRId64,
-      pQInfo, vid, pSids->numOfSids, pSupporter->meterIdx, pSids->numOfSubSet, pQuery->pointsRead,
-      pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->skey, pQuery->limit.offset);
-}
-
-static void doOrderedScan(SQInfo *pQInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQuery *               pQuery = &pQInfo->query;
-
-  if (QUERY_IS_ASC_QUERY(pQuery)) {
-    queryOnMultiDataFiles(pQInfo, pSupporter->pMeterDataInfo);
-    if (pQInfo->code != TSDB_CODE_SUCCESS) {
-      return;
-    }
-
-    queryOnMultiDataCache(pQInfo, pSupporter->pMeterDataInfo);
-  } else {
-    queryOnMultiDataCache(pQInfo, pSupporter->pMeterDataInfo);
-    if (pQInfo->code != TSDB_CODE_SUCCESS) {
-      return;
-    }
-
-    queryOnMultiDataFiles(pQInfo, pSupporter->pMeterDataInfo);
-  }
-}
-
-static void setupMeterQueryInfoForSupplementQuery(SMeterQuerySupportObj *pSupporter) {
-  for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
-    SMeterQueryInfo *pMeterQueryInfo = pSupporter->pMeterDataInfo[i].pMeterQInfo;
-    changeMeterQueryInfoForSuppleQuery(pMeterQueryInfo, pSupporter->rawSKey, pSupporter->rawEKey);
-  }
-}
-
-static void doMultiMeterSupplementaryScan(SQInfo *pQInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pSupporter->runtimeEnv;
-  SQuery *          pQuery = &pQInfo->query;
-
-  if (!needSupplementaryScan(pQuery)) {
-    dTrace("QInfo:%p no need to do supplementary scan, query completed", pQInfo);
-    return;
-  }
-
-  SET_SUPPLEMENT_SCAN_FLAG(pRuntimeEnv);
-  disableFunctForSuppleScan(pRuntimeEnv, pQuery->order.order);
-
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    pRuntimeEnv->pTSBuf->cur.order = pRuntimeEnv->pTSBuf->cur.order ^ 1;
-  }
-
-  SWAP(pSupporter->rawSKey, pSupporter->rawEKey, TSKEY);
-  setupMeterQueryInfoForSupplementQuery(pSupporter);
-
-  int64_t st = taosGetTimestampMs();
-  doOrderedScan(pQInfo);
-  int64_t et = taosGetTimestampMs();
-  dTrace("QInfo:%p supplementary scan completed, elapsed time: %lldms", pQInfo, et - st);
-
-  /*
-   * restore the env
-   * the meter query info is not reset to the original state
-   */
-  SWAP(pSupporter->rawSKey, pSupporter->rawEKey, TSKEY);
-  enableFunctForMasterScan(pRuntimeEnv, pQuery->order.order);
-
-  if (pRuntimeEnv->pTSBuf != NULL) {
-    pRuntimeEnv->pTSBuf->cur.order = pRuntimeEnv->pTSBuf->cur.order ^ 1;
-  }
-
-  SET_MASTER_SCAN_FLAG(pRuntimeEnv);
-}
-
-static void vnodeMultiMeterQueryProcessor(SQInfo *pQInfo) {
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQuery *               pQuery = &pQInfo->query;
-
-  if (pSupporter->subgroupIdx > 0) {
-    /*
-     * if the subgroupIdx > 0, the query process must be completed yet, we only need to
-     * copy the data into output buffer
-     */
-    if (pQuery->nAggTimeInterval > 0) {
-      copyResToQueryResultBuf(pSupporter, pQuery);
-
-#ifdef _DEBUG_VIEW
-      displayInterResult(pQuery->sdata, pQuery, pQuery->sdata[0]->len);
-#endif
-    } else {
-      copyFromGroupBuf(pQInfo, pSupporter->pResult);
-    }
-
-    pQInfo->pointsRead += pQuery->pointsRead;
-
-    if (pQuery->pointsRead == 0) {
-      vnodePrintQueryStatistics(pSupporter);
-    }
-
-    dTrace("QInfo:%p points returned:%d, totalRead:%d totalReturn:%d", pQInfo, pQuery->pointsRead, pQInfo->pointsRead,
-           pQInfo->pointsReturned);
-    return;
-  }
-
-  pSupporter->pMeterDataInfo = (SMeterDataInfo *)calloc(1, sizeof(SMeterDataInfo) * pSupporter->numOfMeters);
-  if (pSupporter->pMeterDataInfo == NULL) {
-    dError("QInfo:%p failed to allocate memory, %s", pQInfo, strerror(errno));
-    pQInfo->code = -TSDB_CODE_SERV_OUT_OF_MEMORY;
-    return;
-  }
-
-  dTrace("QInfo:%p query start, qrange:%" PRId64 "-%" PRId64 ", order:%d, group:%d", pQInfo, pSupporter->rawSKey, pSupporter->rawEKey,
-         pQuery->order.order, pSupporter->pSidSet->numOfSubSet);
-
-  dTrace("QInfo:%p main query scan start", pQInfo);
-  int64_t st = taosGetTimestampMs();
-  doOrderedScan(pQInfo);
-  int64_t et = taosGetTimestampMs();
-  dTrace("QInfo:%p main scan completed, elapsed time: %lldms, supplementary scan start, order:%d", pQInfo, et - st,
-         pQuery->order.order ^ 1);
-
-  // failed to save all intermediate results into disk, abort further query processing
-  if (doCloseAllOpenedResults(pSupporter) != TSDB_CODE_SUCCESS) {
-    dError("QInfo:%p failed to save intermediate results, abort further query processing", pQInfo);
-    return;
-  }
-  
-  doMultiMeterSupplementaryScan(pQInfo);
-
-  if (isQueryKilled(pQuery)) {
-    dTrace("QInfo:%p query killed, abort", pQInfo);
-    return;
-  }
-
-  if (pQuery->nAggTimeInterval > 0) {
-    assert(pSupporter->subgroupIdx == 0 && pSupporter->numOfGroupResultPages == 0);
-
-    if (mergeMetersResultToOneGroups(pSupporter) == TSDB_CODE_SUCCESS) {
-      copyResToQueryResultBuf(pSupporter, pQuery);
-      
-#ifdef _DEBUG_VIEW
-      displayInterResult(pQuery->sdata, pQuery, pQuery->sdata[0]->len);
-#endif
-    }
-  } else {  // not a interval query
-    copyFromGroupBuf(pQInfo, pSupporter->pResult);
-  }
-
-  // handle the limitation of output buffer
-  pQInfo->pointsRead += pQuery->pointsRead;
-  dTrace("QInfo:%p points returned:%d, totalRead:%d totalReturn:%d", pQInfo, pQuery->pointsRead, pQInfo->pointsRead,
-         pQInfo->pointsReturned);
-}
-
-/*
- * in each query, this function will be called only once, no retry for further result.
- *
- * select count(*)/top(field,k)/avg(field name) from table_name [where ts>now-1a];
- * select count(*) from table_name group by status_column;
- */
-static void vnodeSingleTableFixedOutputProcessor(SQInfo *pQInfo) {
-  SQuery *          pQuery = &pQInfo->query;
-  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->pMeterQuerySupporter->runtimeEnv;
-
-  assert(pQuery->slot >= 0 && pQuery->pos >= 0);
-
-  vnodeScanAllData(pRuntimeEnv);
-  doFinalizeResult(pRuntimeEnv);
-
-  if (isQueryKilled(pQuery)) {
-    return;
-  }
-
-  // since the numOfOutputElems must be identical for all sql functions that are allowed to be executed simutanelously.
-  pQuery->pointsRead = getNumOfResult(pRuntimeEnv);
-  assert(pQuery->pointsRead <= pQuery->pointsToRead &&
-         Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED | QUERY_NO_DATA_TO_CHECK));
-
-  // must be top/bottom query if offset > 0
-  if (pQuery->limit.offset > 0) {
-    assert(isTopBottomQuery(pQuery));
-  }
-
-  doSkipResults(pRuntimeEnv);
-  doRevisedResultsByLimit(pQInfo);
-
-  pQInfo->pointsRead = pQuery->pointsRead;
-}
-
-static void vnodeSingleTableMultiOutputProcessor(SQInfo *pQInfo) {
-  SQuery *   pQuery = &pQInfo->query;
-  SMeterObj *pMeterObj = pQInfo->pObj;
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->pMeterQuerySupporter->runtimeEnv;
-
-  // for ts_comp query, re-initialized is not allowed
-  if (!isTSCompQuery(pQuery)) {
-    resetCtxOutputBuf(pRuntimeEnv);
-  }
-
-  while (1) {
-    vnodeScanAllData(pRuntimeEnv);
-    doFinalizeResult(pRuntimeEnv);
-
-    if (isQueryKilled(pQuery)) {
-      return;
-    }
-
-    pQuery->pointsRead = getNumOfResult(pRuntimeEnv);
-    if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols > 0 && pQuery->pointsRead > 0) {
-      doSkipResults(pRuntimeEnv);
-    }
-
-    /*
-     * 1. if pQuery->pointsRead == 0, pQuery->limit.offset >= 0, still need to check data
-     * 2. if pQuery->pointsRead > 0, pQuery->limit.offset must be 0
-     */
-    if (pQuery->pointsRead > 0 || Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED | QUERY_NO_DATA_TO_CHECK)) {
-      break;
-    }
-
-    TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
-    assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)));
-
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, skip current result, offset:%" PRId64 ", next qrange:%" PRId64 "-%" PRId64, pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->limit.offset, pQuery->lastKey, pQuery->ekey);
-
-    resetCtxOutputBuf(pRuntimeEnv);
-  }
-
-  doRevisedResultsByLimit(pQInfo);
-  pQInfo->pointsRead += pQuery->pointsRead;
-
-  if (Q_STATUS_EQUAL(pQuery->over, QUERY_RESBUF_FULL)) {
-    TSKEY nextTimestamp = loadRequiredBlockIntoMem(pRuntimeEnv, &pRuntimeEnv->nextPos);
-    assert(nextTimestamp > 0 || ((nextTimestamp < 0) && Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)));
-
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, query abort due to buffer limitation, next qrange:%" PRId64 "-%" PRId64, pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->lastKey, pQuery->ekey);
-  }
-
-  dTrace("QInfo:%p vid:%d sid:%d id:%s, %d points returned, totalRead:%d totalReturn:%d", pQInfo, pMeterObj->vnode,
-         pMeterObj->sid, pMeterObj->meterId, pQuery->pointsRead, pQInfo->pointsRead, pQInfo->pointsReturned);
-
-  pQuery->pointsOffset = pQuery->pointsToRead;  // restore the available buffer
-  if (!isTSCompQuery(pQuery)) {
-    assert(pQuery->pointsRead <= pQuery->pointsToRead);
-  }
-}
-
-static void vnodeSingleMeterIntervalMainLooper(SMeterQuerySupportObj *pSupporter, SQueryRuntimeEnv *pRuntimeEnv) {
-  SQuery *pQuery = pRuntimeEnv->pQuery;
-
-  while (1) {
-    assert((pQuery->skey <= pQuery->ekey && QUERY_IS_ASC_QUERY(pQuery)) ||
-           (pQuery->skey >= pQuery->ekey && !QUERY_IS_ASC_QUERY(pQuery)));
-
-    initCtxOutputBuf(pRuntimeEnv);
-    clearCompletedSlidingWindows(&pRuntimeEnv->swindowResInfo, pQuery->numOfOutputCols);
-    
-    vnodeScanAllData(pRuntimeEnv);
-    if (isQueryKilled(pQuery)) {
-      return;
-    }
-
-    assert(!Q_STATUS_EQUAL(pQuery->over, QUERY_NOT_COMPLETED));
-
-    // clear tag, used to decide if the whole interval query is completed or not
-    pQuery->over &= (~QUERY_COMPLETED);
-    doFinalizeResult(pRuntimeEnv);
-
-    int64_t maxOutput = getNumOfResult(pRuntimeEnv);
-
-    // here we can ignore the records in case of no interpolation
-    if ((pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL) && pQuery->limit.offset > 0 &&
-        pQuery->interpoType == TSDB_INTERPO_NONE) { // maxOutput <= 0, means current query does not generate any results
-      // todo handle offset, in case of top/bottom interval query
-      if (maxOutput > 0) {
-        pQuery->limit.offset--;
-      }
-    } else {
-      pQuery->pointsRead += maxOutput;
-      forwardCtxOutputBuf(pRuntimeEnv, maxOutput);
-    }
-
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK)) {
-      break;
-    }
-
-    forwardIntervalQueryRange(pSupporter, pRuntimeEnv);
-    if (Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED|QUERY_RESBUF_FULL)) {
-      break;
-    }
-
-    /*
-     * the scan limitation mechanism is upon here,
-     * 1. since there is only one(k) record is generated in one scan operation
-     * 2. remain space is not sufficient for next query output, abort
-     */
-    if ((pQuery->pointsRead % pQuery->pointsToRead == 0 && pQuery->pointsRead != 0) ||
-        ((pQuery->pointsRead + maxOutput) > pQuery->pointsToRead)) {
-      setQueryStatus(pQuery, QUERY_RESBUF_FULL);
-      break;
-    }
-  }
-}
-
-/* handle time interval query on single table */
-static void vnodeSingleTableIntervalProcessor(SQInfo *pQInfo) {
-  SQuery *   pQuery = &(pQInfo->query);
-  SMeterObj *pMeterObj = pQInfo->pObj;
-
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-  SQueryRuntimeEnv *     pRuntimeEnv = &pSupporter->runtimeEnv;
-
-  int32_t numOfInterpo = 0;
-
-  while (1) {
-    resetCtxOutputBuf(pRuntimeEnv);
-    vnodeSingleMeterIntervalMainLooper(pSupporter, pRuntimeEnv);
-
-    // the offset is handled at prepare stage if no interpolation involved
-    if (pQuery->interpoType == TSDB_INTERPO_NONE) {
-      doRevisedResultsByLimit(pQInfo);
-      break;
-    } else {
-      taosInterpoSetStartInfo(&pRuntimeEnv->interpoInfo, pQuery->pointsRead, pQuery->interpoType);
-      SData **pInterpoBuf = pRuntimeEnv->pInterpoBuf;
-
-      for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-        memcpy(pInterpoBuf[i]->data, pQuery->sdata[i]->data, pQuery->pointsRead * pQuery->pSelectExpr[i].resBytes);
-      }
-
-      numOfInterpo = 0;
-      pQuery->pointsRead = vnodeQueryResultInterpolate(pQInfo, (tFilePage **)pQuery->sdata, (tFilePage **)pInterpoBuf,
-                                                       pQuery->pointsRead, &numOfInterpo);
-
-      dTrace("QInfo: %p interpo completed, final:%d", pQInfo, pQuery->pointsRead);
-      if (pQuery->pointsRead > 0 || Q_STATUS_EQUAL(pQuery->over, QUERY_COMPLETED | QUERY_NO_DATA_TO_CHECK)) {
-        doRevisedResultsByLimit(pQInfo);
-        break;
-      }
-
-      // no result generated yet, continue retrieve data
-      pQuery->pointsRead = 0;
-    }
-  }
-  
-  if (isGroupbyNormalCol(pQuery->pGroupbyExpr) || (pQuery->slidingTime > 0 && pQuery->nAggTimeInterval > 0)) {
-    pQInfo->pMeterQuerySupporter->subgroupIdx = 0;
-    pQuery->pointsRead = 0;
-    copyFromGroupBuf(pQInfo, pRuntimeEnv->swindowResInfo.pResult);
-  }
-
-  pQInfo->pointsRead += pQuery->pointsRead;
-  pQInfo->pointsInterpo += numOfInterpo;
-
-  dTrace("%p vid:%d sid:%d id:%s, %d points returned %d points interpo, totalRead:%d totalInterpo:%d totalReturn:%d",
-         pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->pointsRead, numOfInterpo,
-         pQInfo->pointsRead - pQInfo->pointsInterpo, pQInfo->pointsInterpo, pQInfo->pointsReturned);
-}
-
-void vnodeSingleTableQuery(SSchedMsg *pMsg) {
-  SQInfo *pQInfo = (SQInfo *)pMsg->ahandle;
-
-  if (pQInfo == NULL || pQInfo->pMeterQuerySupporter == NULL) {
-    dTrace("%p freed abort query", pQInfo);
-    return;
-  }
-
-  if (pQInfo->killed) {
-    dTrace("QInfo:%p it is already killed, abort", pQInfo);
-    vnodeDecRefCount(pQInfo);
-  
-    return;
-  }
-
-  assert(pQInfo->refCount >= 1);
-
-  SQuery *   pQuery = &pQInfo->query;
-  SMeterObj *pMeterObj = pQInfo->pObj;
-
-  dTrace("vid:%d sid:%d id:%s, query thread is created, numOfQueries:%d, QInfo:%p", pMeterObj->vnode, pMeterObj->sid,
-         pMeterObj->meterId, pMeterObj->numOfQueries, pQInfo);
-
-  SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->pMeterQuerySupporter->runtimeEnv;
-  assert(pRuntimeEnv->pMeterObj == pMeterObj);
-
-  if (vnodeHasRemainResults(pQInfo)) {
-    /*
-     * There are remain results that are not returned due to result interpolation
-     * So, we do keep in this procedure instead of launching retrieve procedure for next results.
-     */
-    int32_t numOfInterpo = 0;
-
-    int32_t remain = taosNumOfRemainPoints(&pRuntimeEnv->interpoInfo);
-    pQuery->pointsRead = vnodeQueryResultInterpolate(pQInfo, (tFilePage **)pQuery->sdata,
-                                                     (tFilePage **)pRuntimeEnv->pInterpoBuf, remain, &numOfInterpo);
-
-    doRevisedResultsByLimit(pQInfo);
-
-    pQInfo->pointsInterpo += numOfInterpo;
-    pQInfo->pointsRead += pQuery->pointsRead;
-
-    dTrace(
-        "QInfo:%p vid:%d sid:%d id:%s, %d points returned %d points interpo, totalRead:%d totalInterpo:%d "
-        "totalReturn:%d",
-        pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->pointsRead, numOfInterpo,
-        pQInfo->pointsRead, pQInfo->pointsInterpo, pQInfo->pointsReturned);
-
-    sem_post(&pQInfo->dataReady);
-    vnodeDecRefCount(pQInfo);
-
-    return;
-  }
-
-  // here we have scan all qualified data in both data file and cache
-  if (Q_STATUS_EQUAL(pQuery->over, QUERY_NO_DATA_TO_CHECK | QUERY_COMPLETED)) {
-    // continue to get push data from the group result
-    if (isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
-      pQuery->pointsRead = 0;
-      if (pQInfo->pMeterQuerySupporter->subgroupIdx > 0) {
-        copyFromGroupBuf(pQInfo, pQInfo->pMeterQuerySupporter->pResult);
-        pQInfo->pointsRead += pQuery->pointsRead;
-
-        if (pQuery->pointsRead > 0) {
-          dTrace("QInfo:%p vid:%d sid:%d id:%s, %d points returned %d from group results, totalRead:%d totalReturn:%d",
-                 pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->pointsRead, pQInfo->pointsRead,
-                 pQInfo->pointsInterpo, pQInfo->pointsReturned);
-
-          sem_post(&pQInfo->dataReady);
-          vnodeDecRefCount(pQInfo);
-  
-          return;
-        }
-      }
-    }
-
-    pQInfo->over = 1;
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, query over, %d points are returned", pQInfo,
-           pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQInfo->pointsRead);
-
-    vnodePrintQueryStatistics(pQInfo->pMeterQuerySupporter);
-    sem_post(&pQInfo->dataReady);
-    
-    vnodeDecRefCount(pQInfo);
-    return;
-  }
-
-  /* number of points returned during this query  */
-  pQuery->pointsRead = 0;
-  assert(pQuery->pos >= 0 && pQuery->slot >= 0);
-
-  int64_t st = taosGetTimestampUs();
-
-  // group by normal column, sliding window query, interval query are handled by interval query processor
-  if (pQuery->nAggTimeInterval != 0 || isGroupbyNormalCol(pQuery->pGroupbyExpr)) {  // interval (down sampling operation)
-    assert(pQuery->checkBufferInLoop == 0 && pQuery->pointsOffset == pQuery->pointsToRead);
-    vnodeSingleTableIntervalProcessor(pQInfo);
-  } else {
-    if (isFixedOutputQuery(pQuery)) {
-      assert(pQuery->checkBufferInLoop == 0);
-      vnodeSingleTableFixedOutputProcessor(pQInfo);
-    } else {  // diff/add/multiply/subtract/division
-      assert(pQuery->checkBufferInLoop == 1);
-      vnodeSingleTableMultiOutputProcessor(pQInfo);
-    }
-  }
-
-  // record the total elapsed time
-  pQInfo->useconds += (taosGetTimestampUs() - st);
-
-  /* check if query is killed or not */
-  if (isQueryKilled(pQuery)) {
-    dTrace("QInfo:%p query is killed", pQInfo);
-    pQInfo->over = 1;
-  } else {
-    dTrace("QInfo:%p vid:%d sid:%d id:%s, meter query thread completed, %d points are returned",
-           pQInfo, pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId, pQuery->pointsRead);
-  }
-
-  sem_post(&pQInfo->dataReady);
-  vnodeDecRefCount(pQInfo);
-}
-
-void vnodeMultiMeterQuery(SSchedMsg *pMsg) {
-  SQInfo *pQInfo = (SQInfo *)pMsg->ahandle;
-
-  if (pQInfo == NULL || pQInfo->pMeterQuerySupporter == NULL) {
-    return;
-  }
-
-  if (pQInfo->killed) {
-    vnodeDecRefCount(pQInfo);
-    dTrace("QInfo:%p it is already killed, abort", pQInfo);
-    return;
-  }
-
-  assert(pQInfo->refCount >= 1);
-
-  SQuery *pQuery = &pQInfo->query;
-  pQuery->pointsRead = 0;
-
-  int64_t st = taosGetTimestampUs();
-  if (pQuery->nAggTimeInterval > 0 ||
-      (isFixedOutputQuery(pQuery) && (!isPointInterpoQuery(pQuery)) && !isGroupbyNormalCol(pQuery->pGroupbyExpr))) {
-    assert(pQuery->checkBufferInLoop == 0);
-    vnodeMultiMeterQueryProcessor(pQInfo);
-  } else {
-    assert((pQuery->checkBufferInLoop == 1 && pQuery->nAggTimeInterval == 0) || isPointInterpoQuery(pQuery) ||
-           isGroupbyNormalCol(pQuery->pGroupbyExpr));
-
-    vnodeSTableSeqProcessor(pQInfo);
-  }
-
-  /* record the total elapsed time */
-  pQInfo->useconds += (taosGetTimestampUs() - st);
-  pQInfo->over = isQueryKilled(pQuery) ? 1 : 0;
-
-  taosInterpoSetStartInfo(&pQInfo->pMeterQuerySupporter->runtimeEnv.interpoInfo, pQuery->pointsRead,
-                          pQInfo->query.interpoType);
-
-  SMeterQuerySupportObj *pSupporter = pQInfo->pMeterQuerySupporter;
-
-  if (pQuery->pointsRead == 0) {
-    pQInfo->over = 1;
-    dTrace("QInfo:%p over, %d meters queried, %d points are returned", pQInfo, pSupporter->numOfMeters,
-           pQInfo->pointsRead);
-    vnodePrintQueryStatistics(pSupporter);
-  }
-
-  sem_post(&pQInfo->dataReady);
-  vnodeDecRefCount(pQInfo);
-}
diff --git a/src/system/detail/src/vnodeRead.c b/src/system/detail/src/vnodeRead.c
deleted file mode 100644
index 71dd088ae97b8110c85cc3733c6500ddc52e06f4..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeRead.c
+++ /dev/null
@@ -1,1153 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "ihash.h"
-#include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
-#include "tscJoinProcess.h"
-#include "tscompression.h"
-#include "vnode.h"
-#include "vnodeRead.h"
-#include "vnodeUtil.h"
-#include "hash.h"
-#include "hashutil.h"
-
-int (*pQueryFunc[])(SMeterObj *, SQuery *) = {vnodeQueryFromCache, vnodeQueryFromFile};
-
-int vnodeInterpolationSearchKey(char *pValue, int num, TSKEY key, int order) {
-  int    firstPos, lastPos, midPos = -1;
-  int    delta, numOfPoints;
-  TSKEY *keyList;
-
-  keyList = (TSKEY *)pValue;
-  firstPos = 0;
-  lastPos = num - 1;
-
-  if (order == 0) {
-    // from latest to oldest
-    while (1) {
-      if (key >= keyList[lastPos]) return lastPos;
-      if (key == keyList[firstPos]) return firstPos;
-      if (key < keyList[firstPos]) return firstPos - 1;
-
-      numOfPoints = lastPos - firstPos + 1;
-      delta = keyList[lastPos] - keyList[firstPos];
-      midPos = (key - keyList[firstPos]) / delta * numOfPoints + firstPos;
-
-      if (key < keyList[midPos]) {
-        lastPos = midPos - 1;
-      } else if (key > keyList[midPos]) {
-        firstPos = midPos + 1;
-      } else {
-        break;
-      }
-    }
-
-  } else {
-    // from oldest to latest
-    while (1) {
-      if (key <= keyList[firstPos]) return firstPos;
-      if (key == keyList[lastPos]) return lastPos;
-
-      if (key > keyList[lastPos]) {
-        lastPos = lastPos + 1;
-        if (lastPos >= num) return -1;
-      }
-
-      numOfPoints = lastPos - firstPos + 1;
-      delta = keyList[lastPos] - keyList[firstPos];
-      midPos = (key - keyList[firstPos]) / delta * numOfPoints + firstPos;
-
-      if (key < keyList[midPos]) {
-        lastPos = midPos - 1;
-      } else if (key > keyList[midPos]) {
-        firstPos = midPos + 1;
-      } else {
-        break;
-      }
-    }
-  }
-
-  return midPos;
-}
-
-int vnodeBinarySearchKey(char *pValue, int num, TSKEY key, int order) {
-  int    firstPos, lastPos, midPos = -1;
-  int    numOfPoints;
-  TSKEY *keyList;
-
-  if (num <= 0) return -1;
-
-  keyList = (TSKEY *)pValue;
-  firstPos = 0;
-  lastPos = num - 1;
-
-  if (order == 0) {
-    // find the first position which is smaller than the key
-    while (1) {
-      if (key >= keyList[lastPos]) return lastPos;
-      if (key == keyList[firstPos]) return firstPos;
-      if (key < keyList[firstPos]) return firstPos - 1;
-
-      numOfPoints = lastPos - firstPos + 1;
-      midPos = (numOfPoints >> 1) + firstPos;
-
-      if (key < keyList[midPos]) {
-        lastPos = midPos - 1;
-      } else if (key > keyList[midPos]) {
-        firstPos = midPos + 1;
-      } else {
-        break;
-      }
-    }
-
-  } else {
-    // find the first position which is bigger than the key
-    while (1) {
-      if (key <= keyList[firstPos]) return firstPos;
-      if (key == keyList[lastPos]) return lastPos;
-
-      if (key > keyList[lastPos]) {
-        lastPos = lastPos + 1;
-        if (lastPos >= num)
-          return -1;
-        else
-          return lastPos;
-      }
-
-      numOfPoints = lastPos - firstPos + 1;
-      midPos = (numOfPoints >> 1) + firstPos;
-
-      if (key < keyList[midPos]) {
-        lastPos = midPos - 1;
-      } else if (key > keyList[midPos]) {
-        firstPos = midPos + 1;
-      } else {
-        break;
-      }
-    }
-  }
-
-  return midPos;
-}
-
-int (*vnodeSearchKeyFunc[])(char *pValue, int num, TSKEY key, int order) = {vnodeBinarySearchKey,
-                                                                            vnodeInterpolationSearchKey};
-
-static SQInfo *vnodeAllocateQInfoCommon(SQueryMeterMsg *pQueryMsg, SMeterObj *pMeterObj, SSqlFunctionExpr *pExprs) {
-  SQInfo *pQInfo = (SQInfo *)calloc(1, sizeof(SQInfo));
-  if (pQInfo == NULL) {
-    return NULL;
-  }
-
-  SQuery *pQuery = &(pQInfo->query);
-
-  SColumnInfo *colList = pQueryMsg->colList;
-
-  short numOfCols = pQueryMsg->numOfCols;
-  short numOfOutputCols = pQueryMsg->numOfOutputCols;
-
-  pQuery->numOfCols = numOfCols;
-  pQuery->numOfOutputCols = numOfOutputCols;
-
-  pQuery->limit.limit = pQueryMsg->limit;
-  pQuery->limit.offset = pQueryMsg->offset;
-
-  pQuery->order.order = pQueryMsg->order;
-  pQuery->order.orderColId = pQueryMsg->orderColId;
-
-  pQuery->colList = calloc(1, sizeof(SSingleColumnFilterInfo) * numOfCols);
-  if (pQuery->colList == NULL) {
-    goto _clean_memory;
-  }
-
-  for (int16_t i = 0; i < numOfCols; ++i) {
-    pQuery->colList[i].req[0] = 1;  // column required during mater scan of data blocks
-    pQuery->colList[i].colIdxInBuf = i;
-
-    pQuery->colList[i].data = colList[i];
-    SColumnInfo *pColInfo = &pQuery->colList[i].data;
-
-    pColInfo->filters = NULL;
-
-    if (colList[i].numOfFilters > 0) {
-      pColInfo->filters = calloc(1, colList[i].numOfFilters * sizeof(SColumnFilterInfo));
-
-      for (int32_t j = 0; j < colList[i].numOfFilters; ++j) {
-        tscColumnFilterInfoCopy(&pColInfo->filters[j], &colList[i].filters[j]);
-      }
-    } else {
-      pQuery->colList[i].data.filters = NULL;
-    }
-  }
-
-  vnodeUpdateQueryColumnIndex(pQuery, pMeterObj);
-
-  for (int16_t col = 0; col < numOfOutputCols; ++col) {
-    assert(pExprs[col].resBytes > 0);
-
-    pQuery->rowSize += pExprs[col].resBytes;
-    if (TSDB_COL_IS_TAG(pExprs[col].pBase.colInfo.flag)) {
-      continue;
-    }
-
-    int16_t colId = pExprs[col].pBase.colInfo.colId;
-    int16_t functId = pExprs[col].pBase.functionId;
-
-    // build the projection of actual column data in buffer and the real column index
-    for (int32_t k = 0; k < numOfCols; ++k) {
-      if (pQuery->colList[k].data.colId == colId) {
-        pExprs[col].pBase.colInfo.colIdxInBuf = (int16_t)k;
-        pExprs[col].pBase.colInfo.colIdx = pQuery->colList[k].colIdx;
-
-        if (((functId == TSDB_FUNC_FIRST_DST || functId == TSDB_FUNC_FIRST) && pQuery->order.order == TSQL_SO_DESC) ||
-            ((functId == TSDB_FUNC_LAST_DST || functId == TSDB_FUNC_LAST) && pQuery->order.order == TSQL_SO_ASC)) {
-          pQuery->colList[k].req[1] = 1;
-        } else if (functId == TSDB_FUNC_STDDEV) {
-          pQuery->colList[k].req[1] = 1;
-        }
-        break;
-      }
-    }
-  }
-
-  pQuery->pSelectExpr = pExprs;
-
-  int32_t ret = vnodeCreateFilterInfo(pQInfo, pQuery);
-  if (ret != TSDB_CODE_SUCCESS) {
-    goto _clean_memory;
-  }
-
-  vnodeUpdateFilterColumnIndex(pQuery);
-  pQuery->precision = vnodeList[pMeterObj->vnode].cfg.precision;
-
-  return pQInfo;
-
-_clean_memory:
-  tfree(pQuery->pFilterInfo);
-  tfree(pQuery->colList);
-  tfree(pQInfo);
-
-  return NULL;
-}
-
-static SQInfo *vnodeAllocateQInfoEx(SQueryMeterMsg *pQueryMsg, SSqlGroupbyExpr *pGroupbyExpr, SSqlFunctionExpr *pExprs,
-                                    SMeterObj *pMeterObj) {
-  SQInfo *pQInfo = vnodeAllocateQInfoCommon(pQueryMsg, pMeterObj, pExprs);
-  if (pQInfo == NULL) {
-    tfree(pExprs);
-    tfree(pGroupbyExpr);
-
-    return NULL;
-  }
-
-  SQuery *pQuery = &(pQInfo->query);
-
-  /* pQuery->sdata is the results output buffer. */
-  pQuery->sdata = (SData **)calloc(pQuery->numOfOutputCols, sizeof(SData *));
-  if (pQuery->sdata == NULL) {
-    goto sign_clean_memory;
-  }
-
-  pQuery->pGroupbyExpr = pGroupbyExpr;
-  pQuery->nAggTimeInterval = pQueryMsg->nAggTimeInterval;
-  pQuery->slidingTime = pQueryMsg->slidingTime;
-  pQuery->interpoType = pQueryMsg->interpoType;
-  pQuery->intervalTimeUnit = pQueryMsg->intervalTimeUnit;
-
-  pQInfo->query.pointsToRead = vnodeList[pMeterObj->vnode].cfg.rowsInFileBlock;
-
-  for (int32_t col = 0; col < pQuery->numOfOutputCols; ++col) {
-    assert(pExprs[col].interResBytes >= pExprs[col].resBytes);
-
-    // allocate additional memory for interResults that are usually larger then final results
-    size_t size = (pQInfo->query.pointsToRead + 1) * pExprs[col].resBytes + pExprs[col].interResBytes + sizeof(SData);
-    pQuery->sdata[col] = (SData *)calloc(1, size);
-    if (pQuery->sdata[col] == NULL) {
-      goto sign_clean_memory;
-    }
-  }
-
-  if (pQuery->interpoType != TSDB_INTERPO_NONE) {
-    pQuery->defaultVal = malloc(sizeof(int64_t) * pQuery->numOfOutputCols);
-    if (pQuery->defaultVal == NULL) {
-      goto sign_clean_memory;
-    }
-
-    // the first column is the timestamp
-    memcpy(pQuery->defaultVal, (char *)pQueryMsg->defaultVal, pQuery->numOfOutputCols * sizeof(int64_t));
-  }
-
-  // to make sure third party won't overwrite this structure
-  pQInfo->signature = (uint64_t)pQInfo;
-  pQInfo->pObj = pMeterObj;
-  pQuery->slot = -1;
-  pQuery->pos = -1;
-  pQuery->hfd = -1;
-  pQuery->dfd = -1;
-  pQuery->lfd = -1;
-
-  dTrace("vid:%d sid:%d meterId:%s, QInfo is allocated:%p", pMeterObj->vnode, pMeterObj->sid, pMeterObj->meterId,
-         pQInfo);
-
-  return pQInfo;
-
-sign_clean_memory:
-  tfree(pQuery->defaultVal);
-
-  if (pQuery->sdata != NULL) {
-    for (int16_t col = 0; col < pQuery->numOfOutputCols; ++col) {
-      tfree(pQuery->sdata[col]);
-    }
-  }
-
-  tfree(pQuery->sdata);
-  tfree(pQuery->pFilterInfo);
-  tfree(pQuery->colList);
-
-  tfree(pExprs);
-  tfree(pGroupbyExpr);
-
-  tfree(pQInfo);
-
-  return NULL;
-}
-
-SQInfo *vnodeAllocateQInfo(SQueryMeterMsg *pQueryMsg, SMeterObj *pObj, SSqlFunctionExpr *pExprs) {
-  SQInfo *pQInfo = vnodeAllocateQInfoCommon(pQueryMsg, pObj, pExprs);
-  if (pQInfo == NULL) {
-    tfree(pExprs);
-    return NULL;
-  }
-
-  SQuery *pQuery = &(pQInfo->query);
-
-  pQuery->sdata = (SData **)calloc(1, sizeof(SData *) * pQuery->numOfOutputCols);
-  if (pQuery->sdata == NULL) {
-    goto __clean_memory;
-  }
-
-  size_t  size = 0;
-  int32_t numOfRows = vnodeList[pObj->vnode].cfg.rowsInFileBlock;
-  for (int col = 0; col < pQuery->numOfOutputCols; ++col) {
-    size = 2 * (numOfRows * pQuery->pSelectExpr[col].resBytes + sizeof(SData));
-    pQuery->sdata[col] = (SData *)malloc(size);
-    if (pQuery->sdata[col] == NULL) {
-      goto __clean_memory;
-    }
-  }
-
-  if (pQuery->colList[0].data.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    size = 2 * (numOfRows * TSDB_KEYSIZE + sizeof(SData));
-    pQuery->tsData = (SData *)malloc(size);
-    if (pQuery->tsData == NULL) {
-      goto __clean_memory;
-    }
-  }
-
-  // to make sure third party won't overwrite this structure
-  pQInfo->signature = (uint64_t)pQInfo;
-  pQInfo->pObj = pObj;
-  pQuery->slot = -1;
-  pQuery->hfd = -1;
-  pQuery->dfd = -1;
-  pQuery->lfd = -1;
-  pQuery->pos = -1;
-  pQuery->interpoType = TSDB_INTERPO_NONE;
-
-  dTrace("vid:%d sid:%d meterId:%s, QInfo is allocated:%p", pObj->vnode, pObj->sid, pObj->meterId, pQInfo);
-  return pQInfo;
-
-__clean_memory:
-
-  tfree(pQuery->tsData);
-  if (pQuery->sdata != NULL) {
-    for (int col = 0; col < pQuery->numOfOutputCols; ++col) {
-      tfree(pQuery->sdata[col]);
-    }
-  }
-  tfree(pQuery->sdata);
-  tfree(pQuery->pFilterInfo);
-  tfree(pQuery->colList);
-
-  tfree(pExprs);
-
-  tfree(pQInfo);
-
-  return NULL;
-}
-
-void vnodeFreeQInfoInQueue(void *param) {
-  SQInfo *pQInfo = (SQInfo *)param;
-
-  if (!vnodeIsQInfoValid(pQInfo)) return;
-
-  pQInfo->killed = 1;
-  dTrace("QInfo:%p set kill flag to free QInfo");
-  
-  vnodeDecRefCount(pQInfo);
-}
-
-void vnodeFreeQInfo(void *param, bool decQueryRef) {
-  SQInfo *pQInfo = (SQInfo *)param;
-  if (!vnodeIsQInfoValid(param)) return;
-
-  pQInfo->killed = 1;
-  SMeterObj *pObj = pQInfo->pObj;
-  dTrace("QInfo:%p start to free SQInfo", pQInfo);
-
-  if (decQueryRef) {
-    vnodeDecMeterRefcnt(pQInfo);
-  }
-
-  SQuery *pQuery = &(pQInfo->query);
-  tclose(pQuery->hfd);
-  tclose(pQuery->dfd);
-  tclose(pQuery->lfd);
-
-  vnodeFreeFields(pQuery);
-
-  tfree(pQuery->pBlock);
-
-  for (int col = 0; col < pQuery->numOfOutputCols; ++col) {
-    tfree(pQuery->sdata[col]);
-  }
-
-  for (int col = 0; col < pQuery->numOfCols; ++col) {
-    vnodeFreeColumnInfo(&pQuery->colList[col].data);
-  }
-
-  if (pQuery->colList[0].colIdx != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    tfree(pQuery->tsData);
-  }
-
-  sem_destroy(&(pQInfo->dataReady));
-  vnodeQueryFreeQInfoEx(pQInfo);
-
-  for (int32_t i = 0; i < pQuery->numOfFilterCols; ++i) {
-    SSingleColumnFilterInfo *pColFilter = &pQuery->pFilterInfo[i];
-    if (pColFilter->numOfFilters > 0) {
-      tfree(pColFilter->pFilters);
-    }
-  }
-
-  tfree(pQuery->pFilterInfo);
-  tfree(pQuery->colList);
-  tfree(pQuery->sdata);
-
-  if (pQuery->pSelectExpr != NULL) {
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      SSqlBinaryExprInfo *pBinExprInfo = &pQuery->pSelectExpr[i].pBinExprInfo;
-
-      if (pBinExprInfo->numOfCols > 0) {
-        tfree(pBinExprInfo->pReqColumns);
-        tSQLBinaryExprDestroy(&pBinExprInfo->pBinExpr, NULL);
-      }
-    }
-
-    tfree(pQuery->pSelectExpr);
-  }
-
-  if (pQuery->defaultVal != NULL) {
-    tfree(pQuery->defaultVal);
-  }
-
-  tfree(pQuery->pGroupbyExpr);
-  dTrace("QInfo:%p vid:%d sid:%d meterId:%s, QInfo is freed", pQInfo, pObj->vnode, pObj->sid, pObj->meterId);
-
-  //destroy signature, in order to avoid the query process pass the object safety check
-  memset(pQInfo, 0, sizeof(SQInfo));
-  tfree(pQInfo);
-}
-
-bool vnodeIsQInfoValid(void *param) {
-  SQInfo *pQInfo = (SQInfo *)param;
-  if (pQInfo == NULL) {
-    return false;
-  }
-
-  /*
-   * pQInfo->signature may be changed by another thread, so we assign value of signature
-   * into local variable, then compare by using local variable
-   */
-  uint64_t sig = pQInfo->signature;
-  return (sig == (uint64_t)pQInfo);
-}
-
-void vnodeDecRefCount(void *param) {
-  SQInfo *pQInfo = (SQInfo*) param;
-  
-  assert(vnodeIsQInfoValid(pQInfo));
-  
-  int32_t ref = atomic_sub_fetch_32(&pQInfo->refCount, 1);
-  assert(ref >= 0);
-  
-  dTrace("QInfo:%p decrease obj refcount, %d", pQInfo, ref);
-  if (ref == 0) {
-    vnodeFreeQInfo(pQInfo, true);
-  }
-}
-
-void vnodeAddRefCount(void *param) {
-  SQInfo *pQInfo = (SQInfo*) param;
-  
-  assert(vnodeIsQInfoValid(pQInfo));
-  
-  int32_t ref = atomic_add_fetch_32(&pQInfo->refCount, 1);
-  dTrace("QInfo:%p add refcount, %d", pQInfo, ref);
-}
-
-void vnodeQueryData(SSchedMsg *pMsg) {
-  SQuery *pQuery;
-  SQInfo *pQInfo;
-
-  pQInfo = (SQInfo *)pMsg->ahandle;
-
-  if (pQInfo->killed) {
-    dTrace("QInfo:%p it is already killed, abort", pQInfo);
-    vnodeDecRefCount(pQInfo);
-    return;
-  }
-
-  pQuery = &(pQInfo->query);
-
-  SMeterObj *pObj = pQInfo->pObj;
-
-  dTrace("QInfo:%p vid:%d sid:%d id:%s, query thread is created, numOfQueries:%d, func:%s", pQInfo, pObj->vnode,
-         pObj->sid, pObj->meterId, pObj->numOfQueries, __FUNCTION__);
-
-  pQuery->pointsToRead = vnodeList[pObj->vnode].cfg.rowsInFileBlock;
-  pQuery->pointsOffset = pQInfo->bufIndex * pQuery->pointsToRead;
-
-  int64_t st = taosGetTimestampUs();
-
-  while (1) {
-    int64_t potentNumOfRes = pQInfo->pointsRead + pQuery->pointsToRead;
-    /* limit the potential overflow data */
-    if (pQuery->limit.limit > 0 && potentNumOfRes > pQuery->limit.limit) {
-      pQuery->pointsToRead = pQuery->limit.limit - pQInfo->pointsRead;
-
-      if (pQuery->pointsToRead == 0) {
-        /* reach the limitation, abort */
-        pQuery->pointsRead = 0;
-        pQInfo->over = 1;
-        break;
-      }
-    }
-
-    pQInfo->code = (*pQInfo->fp)(pObj, pQuery);  // <0:error
-
-    // has read at least one point
-    if (pQuery->pointsRead > 0 || pQInfo->code < 0) break;
-
-    if (pQuery->pointsRead == 0 && pQuery->over == 0) continue;
-
-    if (pQInfo->changed) {
-      pQInfo->over = 1;
-      break;
-    }
-
-    // has read all data in file, check data in cache
-    pQInfo->fp = pQueryFunc[pQuery->order.order ^ 1];
-    pQInfo->changed = 1;
-
-    pQuery->slot = -1;  // reset the handle
-    pQuery->over = 0;
-
-    dTrace("vid:%d sid:%d id:%s, query in other media, order:%d, skey:%" PRId64 " query:%p", pObj->vnode, pObj->sid,
-           pObj->meterId, pQuery->order.order, pQuery->skey, pQuery);
-  }
-
-  pQInfo->pointsRead += pQuery->pointsRead;
-
-  dTrace("vid:%d sid:%d id:%s, %d points returned, totalRead:%d totalReturn:%d last key:%" PRId64 ", query:%p", pObj->vnode,
-         pObj->sid, pObj->meterId, pQuery->pointsRead, pQInfo->pointsRead, pQInfo->pointsReturned, pQuery->lastKey,
-         pQuery);
-
-  int64_t et = taosGetTimestampUs();
-  pQInfo->useconds += et - st;
-
-  // close FDs as soon as possible
-  if (pQInfo->over) {
-    dTrace("vid:%d sid:%d id:%s, query over, %d points are returned", pObj->vnode, pObj->sid, pObj->meterId,
-           pQInfo->pointsRead);
-    tclose(pQInfo->query.hfd);
-    tclose(pQInfo->query.dfd);
-    tclose(pQInfo->query.lfd);
-  }
-
-  sem_post(&pQInfo->dataReady);
-  vnodeDecRefCount(pQInfo);
-}
-
-void *vnodeQueryOnSingleTable(SMeterObj **pMetersObj, SSqlGroupbyExpr *pGroupbyExpr, SSqlFunctionExpr *pSqlExprs,
-                            SQueryMeterMsg *pQueryMsg, int32_t *code) {
-  SQInfo *pQInfo;
-  SQuery *pQuery;
-
-  SMeterObj *pMeterObj = pMetersObj[0];
-  bool       isProjQuery = vnodeIsProjectionQuery(pSqlExprs, pQueryMsg->numOfOutputCols);
-
-  // todo pass the correct error code
-  if (isProjQuery && pQueryMsg->tsLen == 0) {
-    pQInfo = vnodeAllocateQInfo(pQueryMsg, pMeterObj, pSqlExprs);
-  } else {
-    pQInfo = vnodeAllocateQInfoEx(pQueryMsg, pGroupbyExpr, pSqlExprs, pMetersObj[0]);
-  }
-
-  if (pQInfo == NULL) {
-    *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    goto _error;
-  }
-
-  pQuery = &(pQInfo->query);
-  dTrace("qmsg:%p create QInfo:%p, QInfo created", pQueryMsg, pQInfo);
-
-  SMeterSidExtInfo** pSids = (SMeterSidExtInfo**)pQueryMsg->pSidExtInfo;
-  if (pSids != NULL && pSids[0]->key > 0) {
-    pQuery->skey = pSids[0]->key;
-  } else {
-    pQuery->skey = pQueryMsg->skey;
-  }
-
-  pQuery->ekey = pQueryMsg->ekey;
-  pQuery->lastKey = pQuery->skey;
-
-  pQInfo->fp = pQueryFunc[pQueryMsg->order];
-
-  if (sem_init(&(pQInfo->dataReady), 0, 0) != 0) {
-    dError("QInfo:%p vid:%d sid:%d meterId:%s, init dataReady sem failed, reason:%s", pQInfo, pMeterObj->vnode,
-           pMeterObj->sid, pMeterObj->meterId, strerror(errno));
-    *code = TSDB_CODE_APP_ERROR;
-    goto _error;
-  }
-
-  SSchedMsg schedMsg = {0};
-
-  if (isProjQuery && pQueryMsg->tsLen == 0) {
-    schedMsg.fp = vnodeQueryData;
-  } else {
-    if (vnodeParametersSafetyCheck(pQuery) == false) {
-      *code = TSDB_CODE_APP_ERROR;
-      goto _error;
-    }
-
-    SMeterQuerySupportObj *pSupporter = (SMeterQuerySupportObj *)calloc(1, sizeof(SMeterQuerySupportObj));
-    pSupporter->numOfMeters = 1;
-
-    pSupporter->pMetersHashTable = taosInitHashTable(pSupporter->numOfMeters, taosIntHash_32, false);
-    taosAddToHashTable(pSupporter->pMetersHashTable, (const char*) &pMetersObj[0]->sid, sizeof(pMeterObj[0].sid),
-        (char *)&pMetersObj[0], POINTER_BYTES);
-
-    pSupporter->pSidSet = NULL;
-    pSupporter->subgroupIdx = -1;
-    pSupporter->pMeterSidExtInfo = NULL;
-
-    pQInfo->pMeterQuerySupporter = pSupporter;
-
-    STSBuf *pTSBuf = NULL;
-    if (pQueryMsg->tsLen > 0) {
-      // open new file to save the result
-      char *tsBlock = (char *)pQueryMsg + pQueryMsg->tsOffset;
-      pTSBuf = tsBufCreateFromCompBlocks(tsBlock, pQueryMsg->tsNumOfBlocks, pQueryMsg->tsLen, pQueryMsg->tsOrder);
-      tsBufResetPos(pTSBuf);
-      tsBufNextPos(pTSBuf);
-    }
-
-    if (((*code) = vnodeQuerySingleMeterPrepare(pQInfo, pQInfo->pObj, pSupporter, pTSBuf)) != TSDB_CODE_SUCCESS) {
-      goto _error;
-    }
-
-    if (pQInfo->over == 1) {
-      vnodeAddRefCount(pQInfo);  // for retrieve procedure
-      return pQInfo;
-    }
-
-    schedMsg.fp = vnodeSingleTableQuery;
-  }
-
-  /*
-   * The reference count, which is 2, is for both the current query thread and the future retrieve request,
-   * which will always be issued by client to acquire data or free SQInfo struct.
-   */
-  vnodeAddRefCount(pQInfo);
-  vnodeAddRefCount(pQInfo);
-  
-  schedMsg.msg = NULL;
-  schedMsg.thandle = (void *)1;
-  schedMsg.ahandle = pQInfo;
-
-  dTrace("QInfo:%p set query flag and prepare runtime environment completed, ref:%d, wait for schedule", pQInfo,
-      pQInfo->refCount);
-  
-  taosScheduleTask(queryQhandle, &schedMsg);
-  return pQInfo;
-
-_error:
-  // table query ref will be decrease during error handling
-  vnodeFreeQInfo(pQInfo, false);
-  return NULL;
-}
-
-/*
- * query on multi-meters
- */
-void *vnodeQueryOnMultiMeters(SMeterObj **pMetersObj, SSqlGroupbyExpr *pGroupbyExpr, SSqlFunctionExpr *pSqlExprs,
-                              SQueryMeterMsg *pQueryMsg, int32_t *code) {
-  SQInfo *pQInfo;
-  SQuery *pQuery;
-
-  assert(QUERY_IS_STABLE_QUERY(pQueryMsg->queryType) && pQueryMsg->numOfCols > 0 && pQueryMsg->pSidExtInfo != 0 &&
-         pQueryMsg->numOfSids >= 1);
-
-  pQInfo = vnodeAllocateQInfoEx(pQueryMsg, pGroupbyExpr, pSqlExprs, *pMetersObj);
-  if (pQInfo == NULL) {
-    *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    goto _error;
-  }
-
-  pQuery = &(pQInfo->query);
-  dTrace("qmsg:%p create QInfo:%p, QInfo created", pQueryMsg, pQInfo);
-
-  pQuery->skey = pQueryMsg->skey;
-  pQuery->ekey = pQueryMsg->ekey;
-
-  pQInfo->fp = pQueryFunc[pQueryMsg->order];
-
-  if (sem_init(&(pQInfo->dataReady), 0, 0) != 0) {
-    dError("QInfo:%p vid:%d sid:%d id:%s, init dataReady sem failed, reason:%s", pQInfo, pMetersObj[0]->vnode,
-           pMetersObj[0]->sid, pMetersObj[0]->meterId, strerror(errno));
-    *code = TSDB_CODE_APP_ERROR;
-    goto _error;
-  }
-
-  SSchedMsg schedMsg = {0};
-
-  SMeterQuerySupportObj *pSupporter = (SMeterQuerySupportObj *)calloc(1, sizeof(SMeterQuerySupportObj));
-  pSupporter->numOfMeters = pQueryMsg->numOfSids;
-
-  pSupporter->pMetersHashTable = taosInitHashTable(pSupporter->numOfMeters, taosIntHash_32, false);
-  for (int32_t i = 0; i < pSupporter->numOfMeters; ++i) {
-    taosAddToHashTable(pSupporter->pMetersHashTable, (const char*) &pMetersObj[i]->sid, sizeof(pMetersObj[i]->sid), (char *)&pMetersObj[i],
-                       POINTER_BYTES);
-  }
-
-  int32_t sidElemLen = pQueryMsg->tagLength + sizeof(SMeterSidExtInfo);
-
-  int32_t size = POINTER_BYTES * pQueryMsg->numOfSids + sidElemLen * pQueryMsg->numOfSids;
-  pSupporter->pMeterSidExtInfo = (SMeterSidExtInfo **)malloc(size);
-  if (pSupporter->pMeterSidExtInfo == NULL) {
-    *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    dError("QInfo:%p failed to allocate memory for meterSid info, size:%d, abort", pQInfo, size);
-    goto _error;
-  }
-
-  char *px = ((char *)pSupporter->pMeterSidExtInfo) + POINTER_BYTES * pQueryMsg->numOfSids;
-
-  for (int32_t i = 0; i < pQueryMsg->numOfSids; ++i) {
-    SMeterSidExtInfo* pSrc = ((SMeterSidExtInfo **)pQueryMsg->pSidExtInfo)[i];
-    SMeterSidExtInfo* pDst = (SMeterSidExtInfo *)px;
-
-    pSupporter->pMeterSidExtInfo[i] = pDst;
-    pDst->sid = pSrc->sid;
-    pDst->uid = pSrc->uid;
-    pDst->key = pSrc->key;
-
-    if (pQueryMsg->tagLength > 0) {
-      memcpy(pDst->tags, pSrc->tags, pQueryMsg->tagLength);
-    }
-    px += sidElemLen;
-  }
-
-  if (pGroupbyExpr != NULL && pGroupbyExpr->numOfGroupCols > 0) {
-    pSupporter->pSidSet =
-        tSidSetCreate(pSupporter->pMeterSidExtInfo, pQueryMsg->numOfSids, (SSchema *)pQueryMsg->pTagSchema,
-                      pQueryMsg->numOfTagsCols, pGroupbyExpr->columnInfo, pGroupbyExpr->numOfGroupCols);
-  } else {
-    pSupporter->pSidSet = tSidSetCreate(pSupporter->pMeterSidExtInfo, pQueryMsg->numOfSids,
-                                        (SSchema *)pQueryMsg->pTagSchema, pQueryMsg->numOfTagsCols, NULL, 0);
-  }
-
-  pQInfo->pMeterQuerySupporter = pSupporter;
-
-  STSBuf *pTSBuf = NULL;
-  if (pQueryMsg->tsLen > 0) {
-    // open new file to save the result
-    char *tsBlock = (char *)pQueryMsg + pQueryMsg->tsOffset;
-    pTSBuf = tsBufCreateFromCompBlocks(tsBlock, pQueryMsg->tsNumOfBlocks, pQueryMsg->tsLen, pQueryMsg->tsOrder);
-    tsBufResetPos(pTSBuf);
-  }
-
-  if (((*code) = vnodeMultiMeterQueryPrepare(pQInfo, pQuery, pTSBuf)) != TSDB_CODE_SUCCESS) {
-    goto _error;
-  }
-
-  vnodeAddRefCount(pQInfo);
-  if (pQInfo->over == 1) {
-    return pQInfo;
-  }
-
-  vnodeAddRefCount(pQInfo);
-  
-  schedMsg.msg = NULL;
-  schedMsg.thandle = (void *)1;
-  schedMsg.ahandle = pQInfo;
-  schedMsg.fp = vnodeMultiMeterQuery;
-
-  dTrace("QInfo:%p set query flag and prepare runtime environment completed, wait for schedule", pQInfo);
-
-  taosScheduleTask(queryQhandle, &schedMsg);
-  return pQInfo;
-
-_error:
-  // table query ref will be decrease during error handling
-  vnodeFreeQInfo(pQInfo, false);
-  return NULL;
-}
-
-/* engine provides the storage, the app has to save the data before next
-   retrieve, *pNum is the number of points retrieved, and argv[] is
-   the point to retrieved column
-*/
-
-int vnodeRetrieveQueryInfo(void *handle, int *numOfRows, int *rowSize, int16_t *timePrec) {
-  SQInfo *pQInfo;
-  SQuery *pQuery;
-
-  *numOfRows = 0;
-  *rowSize = 0;
-
-  pQInfo = (SQInfo *)handle;
-  if (pQInfo == NULL) {
-    return TSDB_CODE_INVALID_QHANDLE;
-  }
-
-  pQuery = &(pQInfo->query);
-  if (!vnodeIsQInfoValid(pQInfo) || (pQuery->sdata == NULL)) {
-    dError("QInfo:%p %p retrieve memory is corrupted!!! QInfo:%p, sign:%p, sdata:%p", pQInfo, pQuery, pQInfo,
-           pQInfo->signature, pQuery->sdata);
-    return TSDB_CODE_INVALID_QHANDLE;
-  }
-
-  if (pQInfo->killed) {
-    dTrace("QInfo:%p query is killed, %p, code:%d", pQInfo, pQuery, pQInfo->code);
-    if (pQInfo->code == TSDB_CODE_SUCCESS) {
-      return TSDB_CODE_QUERY_CANCELLED;
-    } else { // in case of not TSDB_CODE_SUCCESS, return the code to client
-      return abs(pQInfo->code);
-    }
-  }
-
-  sem_wait(&pQInfo->dataReady);
-  *numOfRows = pQInfo->pointsRead - pQInfo->pointsReturned;
-  *rowSize = pQuery->rowSize;
-
-  *timePrec = vnodeList[pQInfo->pObj->vnode].cfg.precision;
-  
-  dTrace("QInfo:%p, retrieve data info completed, precision:%d, rowsize:%d, rows:%d, code:%d", pQInfo, *timePrec,
-      *rowSize, *numOfRows, pQInfo->code);
-  
-  if (pQInfo->code < 0) {  // less than 0 means there are error existed.
-    return -pQInfo->code;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-// vnodeRetrieveQueryInfo must be called first
-int vnodeSaveQueryResult(void *handle, char *data, int32_t *size) {
-  SQInfo *pQInfo = (SQInfo *)handle;
-
-  // the remained number of retrieved rows, not the interpolated result
-  int numOfRows = pQInfo->pointsRead - pQInfo->pointsReturned;
-
-  int32_t numOfFinal = vnodeCopyQueryResultToMsg(pQInfo, data, numOfRows);
-  pQInfo->pointsReturned += numOfFinal;
-
-  dTrace("QInfo:%p %d are returned, totalReturned:%d totalRead:%d", pQInfo, numOfFinal, pQInfo->pointsReturned,
-         pQInfo->pointsRead);
-
-  if (pQInfo->over == 0) {
-    #ifdef _TD_ARM_
-      dTrace("QInfo:%p set query flag, sig:%" PRIu64 ", func:vnodeSaveQueryResult", pQInfo, pQInfo->signature);
-    #else
-      dTrace("QInfo:%p set query flag, sig:%" PRIu64 ", func:%s", pQInfo, pQInfo->signature, __FUNCTION__);
-    #endif
-
-    if (pQInfo->killed == 1) {
-      dTrace("%p freed or killed, abort query", pQInfo);
-    } else {
-      vnodeAddRefCount(pQInfo);
-      dTrace("%p add query into task queue for schedule", pQInfo);
-      
-      SSchedMsg schedMsg = {0};
-
-      if (pQInfo->pMeterQuerySupporter != NULL) {
-        if (pQInfo->pMeterQuerySupporter->pSidSet == NULL) {
-          schedMsg.fp = vnodeSingleTableQuery;
-        } else {  // group by tag
-          schedMsg.fp = vnodeMultiMeterQuery;
-        }
-      } else {
-        pQInfo->bufIndex = pQInfo->bufIndex ^ 1;  // exchange between 0 and 1
-        schedMsg.fp = vnodeQueryData;
-      }
-
-      schedMsg.msg = NULL;
-      schedMsg.thandle = (void *)1;
-      schedMsg.ahandle = pQInfo;
-      taosScheduleTask(queryQhandle, &schedMsg);
-    }
-  }
-
-  return numOfFinal;
-}
-
-static int32_t validateQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
-  if (pQueryMsg->nAggTimeInterval < 0) {
-    dError("qmsg:%p illegal value of aggTimeInterval %" PRId64 "", pQueryMsg, pQueryMsg->nAggTimeInterval);
-    return -1;
-  }
-
-  if (pQueryMsg->numOfTagsCols < 0 || pQueryMsg->numOfTagsCols > TSDB_MAX_TAGS + 1) {
-    dError("qmsg:%p illegal value of numOfTagsCols %d", pQueryMsg, pQueryMsg->numOfTagsCols);
-    return -1;
-  }
-
-  if (pQueryMsg->numOfCols <= 0 || pQueryMsg->numOfCols > TSDB_MAX_COLUMNS) {
-    dError("qmsg:%p illegal value of numOfCols %d", pQueryMsg, pQueryMsg->numOfCols);
-    return -1;
-  }
-
-  if (pQueryMsg->numOfSids <= 0) {
-    dError("qmsg:%p illegal value of numOfSids %d", pQueryMsg, pQueryMsg->numOfSids);
-    return -1;
-  }
-
-  if (pQueryMsg->numOfGroupCols < 0) {
-    dError("qmsg:%p illegal value of numOfGroupbyCols %d", pQueryMsg, pQueryMsg->numOfGroupCols);
-    return -1;
-  }
-
-  if (pQueryMsg->numOfOutputCols > TSDB_MAX_COLUMNS || pQueryMsg->numOfOutputCols <= 0) {
-    dError("qmsg:%p illegal value of output columns %d", pQueryMsg, pQueryMsg->numOfOutputCols);
-    return -1;
-  }
-
-  if (pQueryMsg->tagLength < 0) {
-    dError("qmsg:%p illegal value of tag length %d", pQueryMsg, pQueryMsg->tagLength);
-    return -1;
-  }
-
-  return 0;
-}
-
-int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
-  pQueryMsg->vnode = htons(pQueryMsg->vnode);
-  pQueryMsg->numOfSids = htonl(pQueryMsg->numOfSids);
-
-#ifdef TSKEY32
-  pQueryMsg->skey = htonl(pQueryMsg->skey);
-  pQueryMsg->ekey = htonl(pQueryMsg->ekey);
-#else
-  pQueryMsg->skey = htobe64(pQueryMsg->skey);
-  pQueryMsg->ekey = htobe64(pQueryMsg->ekey);
-#endif
-
-  pQueryMsg->order = htons(pQueryMsg->order);
-  pQueryMsg->orderColId = htons(pQueryMsg->orderColId);
-
-  pQueryMsg->queryType = htons(pQueryMsg->queryType);
-
-  pQueryMsg->nAggTimeInterval = htobe64(pQueryMsg->nAggTimeInterval);
-  pQueryMsg->slidingTime = htobe64(pQueryMsg->slidingTime);
-  
-  pQueryMsg->numOfTagsCols = htons(pQueryMsg->numOfTagsCols);
-  pQueryMsg->numOfCols = htons(pQueryMsg->numOfCols);
-  pQueryMsg->numOfOutputCols = htons(pQueryMsg->numOfOutputCols);
-  pQueryMsg->numOfGroupCols = htons(pQueryMsg->numOfGroupCols);
-  pQueryMsg->tagLength = htons(pQueryMsg->tagLength);
-
-  pQueryMsg->limit = htobe64(pQueryMsg->limit);
-  pQueryMsg->offset = htobe64(pQueryMsg->offset);
-  pQueryMsg->tsOffset = htonl(pQueryMsg->tsOffset);
-  pQueryMsg->tsLen = htonl(pQueryMsg->tsLen);
-  pQueryMsg->tsNumOfBlocks = htonl(pQueryMsg->tsNumOfBlocks);
-  pQueryMsg->tsOrder = htonl(pQueryMsg->tsOrder);
-
-  // query msg safety check
-  if (validateQueryMeterMsg(pQueryMsg) != 0) {
-    return TSDB_CODE_INVALID_QUERY_MSG;
-  }
-
-  SMeterSidExtInfo **pSids = NULL;
-  char *             pMsg = (char *)(pQueryMsg->colList) + sizeof(SColumnInfo) * pQueryMsg->numOfCols;
-
-  for (int32_t col = 0; col < pQueryMsg->numOfCols; ++col) {
-    pQueryMsg->colList[col].colId = htons(pQueryMsg->colList[col].colId);
-    pQueryMsg->colList[col].type = htons(pQueryMsg->colList[col].type);
-    pQueryMsg->colList[col].bytes = htons(pQueryMsg->colList[col].bytes);
-    pQueryMsg->colList[col].numOfFilters = htons(pQueryMsg->colList[col].numOfFilters);
-
-    assert(pQueryMsg->colList[col].type >= TSDB_DATA_TYPE_BOOL && pQueryMsg->colList[col].type <= TSDB_DATA_TYPE_NCHAR);
-
-    int32_t numOfFilters = pQueryMsg->colList[col].numOfFilters;
-
-    if (numOfFilters > 0) {
-      pQueryMsg->colList[col].filters = calloc(numOfFilters, sizeof(SColumnFilterInfo));
-    }
-
-    for (int32_t f = 0; f < numOfFilters; ++f) {
-      SColumnFilterInfo *pFilterInfo = (SColumnFilterInfo *)pMsg;
-      SColumnFilterInfo *pDestFilterInfo = &pQueryMsg->colList[col].filters[f];
-
-      pDestFilterInfo->filterOnBinary = htons(pFilterInfo->filterOnBinary);
-
-      pMsg += sizeof(SColumnFilterInfo);
-
-      if (pDestFilterInfo->filterOnBinary) {
-        pDestFilterInfo->len = htobe64(pFilterInfo->len);
-
-        pDestFilterInfo->pz = (int64_t)calloc(1, pDestFilterInfo->len + 1);
-        memcpy((void*)pDestFilterInfo->pz, pMsg, pDestFilterInfo->len + 1);
-        pMsg += (pDestFilterInfo->len + 1);
-      } else {
-        pDestFilterInfo->lowerBndi = htobe64(pFilterInfo->lowerBndi);
-        pDestFilterInfo->upperBndi = htobe64(pFilterInfo->upperBndi);
-      }
-
-      pDestFilterInfo->lowerRelOptr = htons(pFilterInfo->lowerRelOptr);
-      pDestFilterInfo->upperRelOptr = htons(pFilterInfo->upperRelOptr);
-    }
-  }
-
-  bool hasArithmeticFunction = false;
-
-  /*
-   * 1. simple projection query on meters, we only record the pSqlFuncExprs[i].colIdx value
-   * 2. for complex queries, whole SqlExprs object is required.
-   */
-  pQueryMsg->pSqlFuncExprs = (int64_t)malloc(POINTER_BYTES * pQueryMsg->numOfOutputCols);
-  SSqlFuncExprMsg *pExprMsg = (SSqlFuncExprMsg *)pMsg;
-
-  for (int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
-    ((SSqlFuncExprMsg **)pQueryMsg->pSqlFuncExprs)[i] = pExprMsg;
-
-    pExprMsg->colInfo.colIdx = htons(pExprMsg->colInfo.colIdx);
-    pExprMsg->colInfo.colId = htons(pExprMsg->colInfo.colId);
-    pExprMsg->colInfo.flag = htons(pExprMsg->colInfo.flag);
-
-    pExprMsg->functionId = htons(pExprMsg->functionId);
-    pExprMsg->numOfParams = htons(pExprMsg->numOfParams);
-
-    pMsg += sizeof(SSqlFuncExprMsg);
-
-    for (int32_t j = 0; j < pExprMsg->numOfParams; ++j) {
-      pExprMsg->arg[j].argType = htons(pExprMsg->arg[j].argType);
-      pExprMsg->arg[j].argBytes = htons(pExprMsg->arg[j].argBytes);
-
-      if (pExprMsg->arg[j].argType == TSDB_DATA_TYPE_BINARY) {
-        pExprMsg->arg[j].argValue.pz = pMsg;
-        pMsg += pExprMsg->arg[j].argBytes + 1;  // one more for the string terminated char.
-      } else {
-        pExprMsg->arg[j].argValue.i64 = htobe64(pExprMsg->arg[j].argValue.i64);
-      }
-    }
-
-    if (pExprMsg->functionId == TSDB_FUNC_ARITHM) {
-      hasArithmeticFunction = true;
-    } else if (pExprMsg->functionId == TSDB_FUNC_TAG ||
-        pExprMsg->functionId == TSDB_FUNC_TAGPRJ ||
-        pExprMsg->functionId == TSDB_FUNC_TAG_DUMMY) {
-      if (pExprMsg->colInfo.flag != TSDB_COL_TAG) { // ignore the column  index check for arithmetic expression.
-        return TSDB_CODE_INVALID_QUERY_MSG;
-      }
-    } else {
-      if (!vnodeValidateExprColumnInfo(pQueryMsg, pExprMsg)) {
-        return TSDB_CODE_INVALID_QUERY_MSG;
-      }
-    }
-
-    pExprMsg = (SSqlFuncExprMsg *)pMsg;
-  }
-
-  pQueryMsg->colNameLen = htonl(pQueryMsg->colNameLen);
-  if (hasArithmeticFunction) {  // column name array
-    assert(pQueryMsg->colNameLen > 0);
-    pQueryMsg->colNameList = (int64_t)pMsg;
-    pMsg += pQueryMsg->colNameLen;
-  }
-
-  pSids = (SMeterSidExtInfo **)calloc(pQueryMsg->numOfSids, sizeof(SMeterSidExtInfo *));
-  pQueryMsg->pSidExtInfo = (uint64_t)pSids;
-
-  pSids[0] = (SMeterSidExtInfo *)pMsg;
-  pSids[0]->sid = htonl(pSids[0]->sid);
-  pSids[0]->uid = htobe64(pSids[0]->uid);
-  pSids[0]->key = htobe64(pSids[0]->key);
-  
-  for (int32_t j = 1; j < pQueryMsg->numOfSids; ++j) {
-    pSids[j] = (SMeterSidExtInfo *)((char *)pSids[j - 1] + sizeof(SMeterSidExtInfo) + pQueryMsg->tagLength);
-    pSids[j]->sid = htonl(pSids[j]->sid);
-    pSids[j]->uid = htobe64(pSids[j]->uid);
-    pSids[j]->key = htobe64(pSids[j]->key);
-  }
-
-  pMsg = (char *)pSids[pQueryMsg->numOfSids - 1];
-  pMsg += sizeof(SMeterSidExtInfo) + pQueryMsg->tagLength;
-
-  if (pQueryMsg->numOfGroupCols > 0 || pQueryMsg->numOfTagsCols > 0) {  // group by tag columns
-    pQueryMsg->pTagSchema = (uint64_t)pMsg;
-    SSchema *pTagSchema = (SSchema *)pQueryMsg->pTagSchema;
-    pMsg += sizeof(SSchema) * pQueryMsg->numOfTagsCols;
-
-    if (pQueryMsg->numOfGroupCols > 0) {
-      pQueryMsg->groupbyTagIds = (uint64_t) & (pTagSchema[pQueryMsg->numOfTagsCols]);
-    } else {
-      pQueryMsg->groupbyTagIds = 0;
-    }
-    pQueryMsg->orderByIdx = htons(pQueryMsg->orderByIdx);
-    pQueryMsg->orderType = htons(pQueryMsg->orderType);
-
-    pMsg += sizeof(SColIndexEx) * pQueryMsg->numOfGroupCols;
-  } else {
-    pQueryMsg->pTagSchema = 0;
-    pQueryMsg->groupbyTagIds = 0;
-  }
-
-  pQueryMsg->interpoType = htons(pQueryMsg->interpoType);
-  if (pQueryMsg->interpoType != TSDB_INTERPO_NONE) {
-    pQueryMsg->defaultVal = (uint64_t)(pMsg);
-
-    int64_t *v = (int64_t *)pMsg;
-    for (int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
-      v[i] = htobe64(v[i]);
-    }
-  }
-
-  dTrace("qmsg:%p query on %d meter(s), qrange:%" PRId64 "-%" PRId64 ", numOfGroupbyTagCols:%d, numOfTagCols:%d, timestamp order:%d, "
-      "tags order:%d, tags order col:%d, numOfOutputCols:%d, numOfCols:%d, interval:%" PRId64 ", fillType:%d, comptslen:%d, limit:%" PRId64 ", "
-      "offset:%" PRId64,
-      pQueryMsg, pQueryMsg->numOfSids, pQueryMsg->skey, pQueryMsg->ekey, pQueryMsg->numOfGroupCols,
-      pQueryMsg->numOfTagsCols, pQueryMsg->order, pQueryMsg->orderType, pQueryMsg->orderByIdx,
-      pQueryMsg->numOfOutputCols, pQueryMsg->numOfCols, pQueryMsg->nAggTimeInterval, pQueryMsg->interpoType,
-      pQueryMsg->tsLen, pQueryMsg->limit, pQueryMsg->offset);
-
-  return 0;
-}
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
deleted file mode 100644
index 69d502c61828154b6ea985399e41e5039a6f9805..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeShell.c
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "taosmsg.h"
-#include "vnode.h"
-#include "vnodeShell.h"
-#include "tschemautil.h"
-
-#include "textbuffer.h"
-#include "trpc.h"
-#include "tscJoinProcess.h"
-#include "vnode.h"
-#include "vnodeRead.h"
-#include "vnodeUtil.h"
-#include "vnodeStore.h"
-#include "vnodeStatus.h"
-
-extern int tsMaxQueues;
-
-void *      pShellServer = NULL;
-SShellObj **shellList = NULL;
-
-int vnodeProcessRetrieveRequest(char *pMsg, int msgLen, SShellObj *pObj);
-int vnodeProcessQueryRequest(char *pMsg, int msgLen, SShellObj *pObj);
-int vnodeProcessShellSubmitRequest(char *pMsg, int msgLen, SShellObj *pObj);
-static void vnodeProcessBatchSubmitTimer(void *param, void *tmrId);
-
-int vnodeSelectReqNum = 0;
-int vnodeInsertReqNum = 0;
-
-typedef struct {
-  int32_t import;
-  int32_t vnode;
-  int32_t numOfSid;
-  int32_t ssid;   // Start sid
-  SShellObj *pObj;
-  int64_t offset; // offset relative the blks
-  char    blks[];
-} SBatchSubmitInfo;
-
-void *vnodeProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
-  int        sid, vnode;
-  SShellObj *pObj = (SShellObj *)ahandle;
-  SIntMsg *  pMsg = (SIntMsg *)msg;
-  uint32_t   peerId, peerIp;
-  uint16_t   peerPort;
-  char       ipstr[20];
-
-  if (msg == NULL) {
-    if (pObj) {
-      pObj->thandle = NULL;
-      dTrace("QInfo:%p %s free qhandle", pObj->qhandle, __FUNCTION__);
-      vnodeFreeQInfoInQueue(pObj->qhandle);
-      pObj->qhandle = NULL;
-      vnodeList[pObj->vnode].shellConns--;
-      dTrace("vid:%d, shell connection:%d is gone, shellConns:%d", pObj->vnode, pObj->sid,
-             vnodeList[pObj->vnode].shellConns);
-    }
-    return NULL;
-  }
-
-  taosGetRpcConnInfo(thandle, &peerId, &peerIp, &peerPort, &vnode, &sid);
-
-  if (pObj == NULL) {
-    if (shellList[vnode]) {
-      pObj = shellList[vnode] + sid;
-      pObj->thandle = thandle;
-      pObj->sid = sid;
-      pObj->vnode = vnode;
-      pObj->ip = peerIp;
-      tinet_ntoa(ipstr, peerIp);
-      vnodeList[pObj->vnode].shellConns++;
-      dTrace("vid:%d, shell connection:%d from ip:%s is created, shellConns:%d", vnode, sid, ipstr,
-             vnodeList[pObj->vnode].shellConns);
-    } else {
-      dError("vid:%d, vnode not there, shell connection shall be closed", vnode);
-      return NULL;
-    }
-  } else {
-    if (pObj != shellList[vnode] + sid) {
-      dError("vid:%d, shell connection:%d, pObj:%p is not matched with:%p", vnode, sid, pObj, shellList[vnode] + sid);
-      return NULL;
-    }
-  }
-
-  dTrace("vid:%d sid:%d, msg:%s is received pConn:%p", vnode, sid, taosMsg[pMsg->msgType], thandle);
-
-  if (pMsg->msgType == TSDB_MSG_TYPE_QUERY) {
-    if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_MASTER || vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_SLAVE) {
-      vnodeProcessQueryRequest((char *)pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pObj);
-    } else {
-      taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
-      dTrace("vid:%d sid:%d, shell query msg is ignored since in status:%s", vnode, sid, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-    }
-  } else if (pMsg->msgType == TSDB_MSG_TYPE_RETRIEVE) {
-    if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_MASTER || vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_SLAVE) {
-      vnodeProcessRetrieveRequest((char *) pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pObj);
-    } else {
-      taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
-      dTrace("vid:%d sid:%d, shell retrieve msg is ignored since in status:%s", vnode, sid, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-    }
-  } else if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT) {
-    if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_MASTER) {
-      vnodeProcessShellSubmitRequest((char *) pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pObj);
-    } else if (vnodeList[vnode].vnodeStatus == TSDB_VN_STATUS_SLAVE) {
-      taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_REDIRECT);
-      dTrace("vid:%d sid:%d, shell submit msg is redirect since in status:%s", vnode, sid, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-    } else {
-      taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
-      dTrace("vid:%d sid:%d, shell submit msg is ignored since in status:%s", vnode, sid, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-    }
-  } else {
-    dError("%s is not processed", taosMsg[pMsg->msgType]);
-  }
-
-  return pObj;
-}
-
-int vnodeInitShell() {
-  int      size;
-  SRpcInit rpcInit;
-
-  size = TSDB_MAX_VNODES * sizeof(SShellObj *);
-  shellList = (SShellObj **)malloc(size);
-  if (shellList == NULL) return -1;
-  memset(shellList, 0, size);
-
-  int numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore;
-  numOfThreads = (1.0 - tsRatioOfQueryThreads) * numOfThreads / 2.0;
-  if (numOfThreads < 1) numOfThreads = 1;
-
-  memset(&rpcInit, 0, sizeof(rpcInit));
-
-  rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;
-
-  rpcInit.localPort = tsVnodeShellPort;
-  rpcInit.label = "DND-shell";
-  rpcInit.numOfThreads = numOfThreads;
-  rpcInit.fp = vnodeProcessMsgFromShell;
-  rpcInit.bits = TSDB_SHELL_VNODE_BITS;
-  rpcInit.numOfChanns = TSDB_MAX_VNODES;
-  rpcInit.sessionsPerChann = 16;
-  rpcInit.idMgmt = TAOS_ID_FREE;
-  rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S();
-  rpcInit.idleTime = tsShellActivityTimer * 2000;
-  rpcInit.qhandle = rpcQhandle[0];
-  rpcInit.efp = vnodeSendVpeerCfgMsg;
-
-  pShellServer = taosOpenRpc(&rpcInit);
-  if (pShellServer == NULL) {
-    dError("failed to init connection to shell");
-    return -1;
-  }
-
-  return 0;
-}
-
-int vnodeOpenShellVnode(int vnode) {
-  if (shellList[vnode] != NULL) {
-    dError("vid:%d, shell is already opened", vnode);
-    return -1;
-  }
-
-  const int32_t MIN_NUM_OF_SESSIONS = 300;
-
-  SVnodeCfg *pCfg = &vnodeList[vnode].cfg;
-  int32_t sessions = (int32_t) MAX(pCfg->maxSessions * 1.1, MIN_NUM_OF_SESSIONS);
-
-  size_t size = sessions * sizeof(SShellObj);
-  shellList[vnode] = (SShellObj *)calloc(1, size);
-  if (shellList[vnode] == NULL) {
-    dError("vid:%d, sessions:%d, failed to allocate shellObj, size:%d", vnode, pCfg->maxSessions, size);
-    return -1;
-  }
-
-  if(taosOpenRpcChannWithQ(pShellServer, vnode, sessions, rpcQhandle[(vnode+1)%tsMaxQueues]) != TSDB_CODE_SUCCESS) {
-    dError("vid:%d, sessions:%d, failed to open shell", vnode, pCfg->maxSessions);
-    return -1;
-  }
-
-  dPrint("vid:%d, sessions:%d, shell is opened", vnode, pCfg->maxSessions);
-  return TSDB_CODE_SUCCESS;
-}
-
-static void vnodeDelayedFreeResource(void *param, void *tmrId) {
-  int32_t vnode = *(int32_t*) param;
-  dTrace("vid:%d, start to free resources for 500ms arrived", vnode);
-
-  taosCloseRpcChann(pShellServer, vnode); // close connection
-  tfree(shellList[vnode]);  //free SShellObj
-  tfree(param);
-
-  memset(vnodeList + vnode, 0, sizeof(SVnodeObj));
-  dTrace("vid:%d, status set to %s", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-
-  vnodeCalcOpenVnodes();
-}
-
-void vnodeCloseShellVnode(int vnode) {
-  if (shellList[vnode] == NULL) return;
-
-  for (int i = 0; i < vnodeList[vnode].cfg.maxSessions; ++i) {
-    void* qhandle = shellList[vnode][i].qhandle;
-    if (qhandle != NULL) {
-      vnodeDecRefCount(qhandle);
-    }
-  }
-
-  int32_t* v = malloc(sizeof(int32_t));
-  *v = vnode;
-
-  /*
-   * free the connection related resource after 5sec.
-   * 1. The msg, as well as SRpcConn may be in the task queue, free it immediate will cause crash
-   * 2. Free connection may cause *(SRpcConn*)pObj->thandle to be invalid to access.
-   */
-  dTrace("vid:%d, free resources in 500ms", vnode);
-  taosTmrStart(vnodeDelayedFreeResource, 500, v, vnodeTmrCtrl);
-}
-
-void vnodeCleanUpShell() {
-  if (pShellServer) taosCloseRpc(pShellServer);
-
-  tfree(shellList);
-}
-
-int vnodeSendQueryRspMsg(SShellObj *pObj, int code, void *qhandle) {
-  char *pMsg, *pStart;
-  int   msgLen;
-
-  pStart = taosBuildRspMsgWithSize(pObj->thandle, TSDB_MSG_TYPE_QUERY_RSP, 128);
-  if (pStart == NULL) return -1;
-  pMsg = pStart;
-
-  *pMsg = code;
-  pMsg++;
-
-  *((uint64_t *)pMsg) = (uint64_t)qhandle;
-  pMsg += 8;
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToPeer(pObj->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int vnodeSendShellSubmitRspMsg(SShellObj *pObj, int code, int numOfPoints) {
-  char *pMsg, *pStart;
-  int   msgLen;
-
-  dTrace("code:%d numOfTotalPoints:%d", code, numOfPoints);
-  pStart = taosBuildRspMsgWithSize(pObj->thandle, TSDB_MSG_TYPE_SUBMIT_RSP, 128);
-  if (pStart == NULL) return -1;
-  pMsg = pStart;
-
-  *pMsg = code;
-  pMsg++;
-
-  *(int32_t *)pMsg = numOfPoints;
-  pMsg += sizeof(numOfPoints);
-
-  msgLen = pMsg - pStart;
-  taosSendMsgToPeer(pObj->thandle, pStart, msgLen);
-
-  return msgLen;
-}
-
-int vnodeProcessQueryRequest(char *pMsg, int msgLen, SShellObj *pObj) {
-  int                ret, code = 0;
-  SQueryMeterMsg *   pQueryMsg;
-  SMeterSidExtInfo **pSids = NULL;
-  int32_t            incNumber = 0;
-  SSqlFunctionExpr * pExprs = NULL;
-  SSqlGroupbyExpr *  pGroupbyExpr = NULL;
-  SMeterObj **       pMeterObjList = NULL;
-
-  pQueryMsg = (SQueryMeterMsg *)pMsg;
-  if ((code = vnodeConvertQueryMeterMsg(pQueryMsg)) != TSDB_CODE_SUCCESS) {
-    goto _query_over;
-  }
-
-  if (pQueryMsg->numOfSids <= 0) {
-    dError("Invalid number of meters to query, numOfSids:%d", pQueryMsg->numOfSids);
-    code = TSDB_CODE_INVALID_QUERY_MSG;
-    goto _query_over;
-  }
-
-  if (pQueryMsg->vnode >= TSDB_MAX_VNODES || pQueryMsg->vnode < 0) {
-    dError("qmsg:%p,vid:%d is out of range", pQueryMsg, pQueryMsg->vnode);
-    code = TSDB_CODE_INVALID_TABLE_ID;
-    goto _query_over;
-  }
-
-  SVnodeObj *pVnode = &vnodeList[pQueryMsg->vnode];
-
-  if (pVnode->cfg.maxSessions == 0) {
-    dError("qmsg:%p,vid:%d is not activated yet", pQueryMsg, pQueryMsg->vnode);
-    vnodeSendVpeerCfgMsg(pQueryMsg->vnode);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _query_over;
-  }
-
-  if (!(pVnode->accessState & TSDB_VN_READ_ACCCESS)) {
-    dError("qmsg:%p,vid:%d access not allowed", pQueryMsg, pQueryMsg->vnode);
-    code = TSDB_CODE_NO_READ_ACCESS;
-    goto _query_over;
-  }
-  
-  if (pVnode->meterList == NULL) {
-    dError("qmsg:%p,vid:%d has been closed", pQueryMsg, pQueryMsg->vnode);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _query_over;
-  }
-
-  if (pQueryMsg->pSidExtInfo == 0) {
-    dError("qmsg:%p,SQueryMeterMsg wrong format", pQueryMsg);
-    code = TSDB_CODE_INVALID_QUERY_MSG;
-    goto _query_over;
-  }
-
-  pSids = (SMeterSidExtInfo **)pQueryMsg->pSidExtInfo;
-  for (int32_t i = 0; i < pQueryMsg->numOfSids; ++i) {
-    if (pSids[i]->sid >= pVnode->cfg.maxSessions || pSids[i]->sid < 0) {
-      dError("qmsg:%p sid:%d out of range, valid range:[%d,%d]", pQueryMsg, pSids[i]->sid, 0, pVnode->cfg.maxSessions);
-      code = TSDB_CODE_INVALID_TABLE_ID;
-      goto _query_over;
-    }
-  }
-
-  // todo optimize for single table query process
-  pMeterObjList = (SMeterObj **)calloc(pQueryMsg->numOfSids, sizeof(SMeterObj *));
-  if (pMeterObjList == NULL) {
-    code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    goto _query_over;
-  }
-
-  //add query ref for all meters. if any meter failed to add ref, rollback whole operation and go to error
-  pthread_mutex_lock(&pVnode->vmutex);
-  code = vnodeIncQueryRefCount(pQueryMsg, pSids, pMeterObjList, &incNumber);
-  assert(incNumber <= pQueryMsg->numOfSids);
-  pthread_mutex_unlock(&pVnode->vmutex);
-
-  if (code != TSDB_CODE_SUCCESS || pQueryMsg->numOfSids == 0) { // all the meters may have been dropped.
-    goto _query_over;
-  }
-
-  pExprs = vnodeCreateSqlFunctionExpr(pQueryMsg, &code);
-  if (pExprs == NULL) {
-    assert(code != TSDB_CODE_SUCCESS);
-    goto _query_over;
-  }
-
-  pGroupbyExpr = vnodeCreateGroupbyExpr(pQueryMsg, &code);
-  if ((pGroupbyExpr == NULL && pQueryMsg->numOfGroupCols != 0) || code != TSDB_CODE_SUCCESS) {
-    goto _query_over;
-  }
-
-  if (pObj->qhandle) {
-    dTrace("QInfo:%p %s free qhandle", pObj->qhandle, __FUNCTION__);
-    void* qHandle = pObj->qhandle;
-    pObj->qhandle = NULL;
-    
-    vnodeDecRefCount(qHandle);
-  }
-
-  if (QUERY_IS_STABLE_QUERY(pQueryMsg->queryType)) {
-    pObj->qhandle = vnodeQueryOnMultiMeters(pMeterObjList, pGroupbyExpr, pExprs, pQueryMsg, &code);
-  } else {
-    pObj->qhandle = vnodeQueryOnSingleTable(pMeterObjList, pGroupbyExpr, pExprs, pQueryMsg, &code);
-  }
-
-_query_over:
-  // if failed to add ref for all meters in this query, abort current query
-  if (code != TSDB_CODE_SUCCESS) {
-    vnodeDecQueryRefCount(pQueryMsg, pMeterObjList, incNumber);
-  }
-
-  tfree(pQueryMsg->pSqlFuncExprs);
-  tfree(pMeterObjList);
-  ret = vnodeSendQueryRspMsg(pObj, code, pObj->qhandle);
-
-  tfree(pQueryMsg->pSidExtInfo);
-  for(int32_t i = 0; i < pQueryMsg->numOfCols; ++i) {
-    vnodeFreeColumnInfo(&pQueryMsg->colList[i]);
-  }
-
-  atomic_fetch_add_32(&vnodeSelectReqNum, 1);
-  return ret;
-}
-
-void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
-  char *     pMsg = pSched->msg;
-  int        msgLen;
-  SShellObj *pObj = (SShellObj *)pSched->ahandle;
-
-  SRetrieveMeterMsg *pRetrieve;
-  SRetrieveMeterRsp *pRsp;
-  int                numOfRows = 0, rowSize = 0, size = 0;
-  int16_t            timePrec = TSDB_TIME_PRECISION_MILLI;
-
-  char *pStart;
-
-  int code = 0;
-  pRetrieve = (SRetrieveMeterMsg *)pMsg;
-  SQInfo* pQInfo = (SQInfo*)pRetrieve->qhandle;
-  pRetrieve->free = htons(pRetrieve->free);
-
-  if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) {
-    dTrace("retrieve msg, handle:%p, free:%d", pRetrieve->qhandle, pRetrieve->free);
-  } else {
-    dTrace("retrieve msg to free resource from client, handle:%p, free:%d", pRetrieve->qhandle, pRetrieve->free);
-  }
-
-  /*
-   * in case of server restart, apps may hold qhandle created by server before restart,
-   * which is actually invalid, therefore, signature check is required.
-   */
-  if (pRetrieve->qhandle == (uint64_t)pObj->qhandle) {
-    // if free flag is set, client wants to clean the resources
-    if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) {
-      code = vnodeRetrieveQueryInfo((void *)(pRetrieve->qhandle), &numOfRows, &rowSize, &timePrec);
-    }
-  } else {
-    dError("QInfo:%p, qhandle:%p is not matched with saved:%p", pObj->qhandle, pRetrieve->qhandle, pObj->qhandle);
-    code = TSDB_CODE_INVALID_QHANDLE;
-  }
-
-  if (code == TSDB_CODE_SUCCESS) {
-    size = vnodeGetResultSize((void *)(pRetrieve->qhandle), &numOfRows);
-  }
-
-  // buffer size for progress information, including meter count,
-  // and for each meter, including 'uid' and 'TSKEY'.
-  int progressSize = 0;
-  if (pQInfo->pMeterQuerySupporter != NULL)
-    progressSize = pQInfo->pMeterQuerySupporter->numOfMeters * (sizeof(int64_t) + sizeof(TSKEY)) + sizeof(int32_t);
-  else if (pQInfo->pObj != NULL)
-    progressSize = sizeof(int64_t) + sizeof(TSKEY) + sizeof(int32_t);
-
-  pStart = taosBuildRspMsgWithSize(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, progressSize + size + 100);
-  if (pStart == NULL) {
-    taosSendSimpleRsp(pObj->thandle, TSDB_MSG_TYPE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
-    goto _exit;
-  }
-  
-  pMsg = pStart;
-
-  *pMsg = code;
-  pMsg++;
-
-  pRsp = (SRetrieveMeterRsp *)pMsg;
-  pRsp->numOfRows = htonl(numOfRows);
-  pRsp->precision = htons(timePrec);
-
-  if (code == TSDB_CODE_SUCCESS) {
-    pRsp->offset = htobe64(vnodeGetOffsetVal((void*)pRetrieve->qhandle));
-    pRsp->useconds = htobe64(((SQInfo *)(pRetrieve->qhandle))->useconds);
-  } else {
-    pRsp->offset = 0;
-    pRsp->useconds = 0;
-  }
-
-  pMsg = pRsp->data;
-
-  if (numOfRows > 0 && code == TSDB_CODE_SUCCESS) {
-    vnodeSaveQueryResult((void *)(pRetrieve->qhandle), pRsp->data, &size);
-  }
-
-  pMsg += size;
-
-  // write the progress information of each meter to response
-  // this is required by subscriptions
-  if (pQInfo->pMeterQuerySupporter != NULL && pQInfo->pMeterQuerySupporter->pMeterSidExtInfo != NULL) {
-    *((int32_t*)pMsg) = htonl(pQInfo->pMeterQuerySupporter->numOfMeters);
-    pMsg += sizeof(int32_t);
-    for (int32_t i = 0; i < pQInfo->pMeterQuerySupporter->numOfMeters; i++) {
-      *((int64_t*)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->uid);
-      pMsg += sizeof(int64_t);
-      *((TSKEY*)pMsg) = htobe64(pQInfo->pMeterQuerySupporter->pMeterSidExtInfo[i]->key);
-      pMsg += sizeof(TSKEY);
-    }
-  } else if (pQInfo->pObj != NULL) {
-    *((int32_t*)pMsg) = htonl(1);
-    pMsg += sizeof(int32_t);
-    *((int64_t*)pMsg) = htobe64(pQInfo->pObj->uid);
-    pMsg += sizeof(int64_t);
-    if (pQInfo->pointsRead > 0) {
-      *((TSKEY*)pMsg) = htobe64(pQInfo->query.lastKey + 1);
-    } else {
-      *((TSKEY*)pMsg) = htobe64(pQInfo->query.lastKey);
-    }
-    pMsg += sizeof(TSKEY);
-  }
-
-  msgLen = pMsg - pStart;
-
-  assert(code != TSDB_CODE_ACTION_IN_PROGRESS);
-  
-  if (numOfRows == 0 && (pRetrieve->qhandle == (uint64_t)pObj->qhandle) && (code != TSDB_CODE_ACTION_IN_PROGRESS) &&
-     pRetrieve->qhandle != 0) {
-    dTrace("QInfo:%p %s free qhandle code:%d", pObj->qhandle, __FUNCTION__, code);
-    vnodeDecRefCount(pObj->qhandle);
-    pObj->qhandle = NULL;
-  }
-
-  taosSendMsgToPeer(pObj->thandle, pStart, msgLen);
-
-_exit:
-  free(pSched->msg);
-}
-
-int vnodeProcessRetrieveRequest(char *pMsg, int msgLen, SShellObj *pObj) {
-  SSchedMsg schedMsg;
-
-  char *msg = malloc(msgLen);
-  memcpy(msg, pMsg, msgLen);
-  schedMsg.msg = msg;
-  schedMsg.ahandle = pObj;
-  schedMsg.fp = vnodeExecuteRetrieveReq;
-  taosScheduleTask(queryQhandle, &schedMsg);
-
-  return msgLen;
-}
-
-static int vnodeCheckSubmitBlockContext(SShellSubmitBlock *pBlocks, SVnodeObj *pVnode) {
-  int32_t  sid = htonl(pBlocks->sid);
-  uint64_t uid = htobe64(pBlocks->uid);
-
-  if (sid >= pVnode->cfg.maxSessions || sid <= 0) {
-    dError("vid:%d sid:%d, sid is out of range", pVnode->vnode, sid);
-    return TSDB_CODE_INVALID_TABLE_ID;
-  }
-
-  SMeterObj *pMeterObj = pVnode->meterList[sid];
-  if (pMeterObj == NULL) {
-    dError("vid:%d sid:%d, not active table", pVnode->vnode, sid);
-    vnodeSendMeterCfgMsg(pVnode->vnode, sid);
-    return TSDB_CODE_NOT_ACTIVE_TABLE;
-  }
-
-  if (pMeterObj->uid != uid) {
-    dError("vid:%d sid:%d id:%s, uid:%" PRIu64 ", uid in msg:%" PRIu64 ", uid mismatch", pVnode->vnode, sid, pMeterObj->meterId,
-           pMeterObj->uid, uid);
-    return TSDB_CODE_INVALID_SUBMIT_MSG;
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int vnodeDoSubmitJob(SVnodeObj *pVnode, int import, int32_t *ssid, int32_t esid, SShellSubmitBlock **ppBlocks,
-                            TSKEY now, SShellObj *pObj) {
-  SShellSubmitBlock *pBlocks = *ppBlocks;
-  int code = TSDB_CODE_SUCCESS;
-  int32_t numOfPoints = 0;
-  int32_t i = 0;
-  SShellSubmitBlock tBlock;
-
-  for (i = *ssid; i < esid; i++) {
-    numOfPoints = 0;
-    tBlock = *pBlocks;
-
-    code = vnodeCheckSubmitBlockContext(pBlocks, pVnode);
-    if (code != TSDB_CODE_SUCCESS) break;
-
-    SMeterObj *pMeterObj = (SMeterObj *)(pVnode->meterList[htonl(pBlocks->sid)]);
-
-    // dont include sid, vid
-    int32_t subMsgLen = sizeof(pBlocks->numOfRows) + htons(pBlocks->numOfRows) * pMeterObj->bytesPerPoint;
-    int32_t sversion = htonl(pBlocks->sversion);
-
-    if (import) {
-      code = vnodeImportPoints(pMeterObj, (char *)&(pBlocks->numOfRows), subMsgLen, TSDB_DATA_SOURCE_SHELL, pObj,
-                               sversion, &numOfPoints, now);
-      pObj->numOfTotalPoints += numOfPoints;
-
-      // records for one table should be consecutive located in the payload buffer, which is guaranteed by client
-      if (code == TSDB_CODE_SUCCESS) {
-        pObj->count--;
-      }
-    } else {
-      code = vnodeInsertPoints(pMeterObj, (char *)&(pBlocks->numOfRows), subMsgLen, TSDB_DATA_SOURCE_SHELL, NULL,
-                               sversion, &numOfPoints, now);
-      pObj->numOfTotalPoints += numOfPoints;
-    }
-
-    if (code != TSDB_CODE_SUCCESS) break;
-
-    pBlocks = (SShellSubmitBlock *)((char *)pBlocks + sizeof(SShellSubmitBlock) +
-                                    htons(pBlocks->numOfRows) * pMeterObj->bytesPerPoint);
-  }
-
-  *ssid = i;
-  *ppBlocks = pBlocks;
-  /* Since the pBlock part can be changed by the vnodeForwardToPeer interface,
-   * which is also possible to be used again. For that case, we just copy the original
-   * block content back.
-   */
-  if (import && (code == TSDB_CODE_ACTION_IN_PROGRESS)) {
-    memcpy((void *)pBlocks, (void *)&tBlock, sizeof(SShellSubmitBlock));
-  }
-
-  return code;
-}
-
-int vnodeProcessShellSubmitRequest(char *pMsg, int msgLen, SShellObj *pObj) {
-  int              code = 0, ret = 0;
-  int32_t          i = 0;
-  SShellSubmitMsg  shellSubmit = *(SShellSubmitMsg *)pMsg;
-  SShellSubmitMsg *pSubmit = &shellSubmit;
-  SShellSubmitBlock *pBlocks = NULL;
-
-  pSubmit->import = htons(pSubmit->import);
-  pSubmit->vnode = htons(pSubmit->vnode);
-  pSubmit->numOfSid = htonl(pSubmit->numOfSid);
-
-  if (pSubmit->numOfSid <= 0) {
-    dError("invalid num of meters:%d", pSubmit->numOfSid);
-    code = TSDB_CODE_INVALID_QUERY_MSG;
-    goto _submit_over;
-  }
-
-  if (pSubmit->vnode >= TSDB_MAX_VNODES || pSubmit->vnode < 0) {
-    dTrace("vnode:%d is out of range", pSubmit->vnode);
-    code = TSDB_CODE_INVALID_VNODE_ID;
-    goto _submit_over;
-  }
-
-  SVnodeObj *pVnode = vnodeList + pSubmit->vnode;
-  if (pVnode->cfg.maxSessions == 0 || pVnode->meterList == NULL) {
-    dError("vid:%d is not activated for submit", pSubmit->vnode);
-    vnodeSendVpeerCfgMsg(pSubmit->vnode);
-    code = TSDB_CODE_NOT_ACTIVE_VNODE;
-    goto _submit_over;
-  }
-
-  if (!(pVnode->accessState & TSDB_VN_WRITE_ACCCESS)) {
-    code = TSDB_CODE_NO_WRITE_ACCESS;
-    goto _submit_over;
-  }
-
-  if (tsAvailDataDirGB < tsMinimalDataDirGB) {
-    dError("server disk space remain %.3f GB, need at least %.3f GB, stop writing", tsAvailDataDirGB, tsMinimalDataDirGB);
-    code = TSDB_CODE_SERV_NO_DISKSPACE;
-    goto _submit_over;
-  }
-
-  pObj->count = pSubmit->numOfSid;  // for import
-  pObj->code = 0;                   // for import
-  pObj->numOfTotalPoints = 0;
-
-  TSKEY   now = taosGetTimestamp(pVnode->cfg.precision);
-
-  pBlocks = (SShellSubmitBlock *)(pMsg + sizeof(SShellSubmitMsg));
-  i = 0;
-  code = vnodeDoSubmitJob(pVnode, pSubmit->import, &i, pSubmit->numOfSid, &pBlocks, now, pObj);
-
-_submit_over:
-  ret = 0;
-  if (pSubmit->import) {  // Import case
-    if (code == TSDB_CODE_ACTION_IN_PROGRESS) {
-
-      SBatchSubmitInfo *pSubmitInfo =
-          (SBatchSubmitInfo *)calloc(1, sizeof(SBatchSubmitInfo) + msgLen - sizeof(SShellSubmitMsg));
-      if (pSubmitInfo == NULL) {
-        code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-        ret = vnodeSendShellSubmitRspMsg(pObj, code, pObj->numOfTotalPoints);
-      } else { // Start a timer to process the next part of request
-        pSubmitInfo->import = 1;
-        pSubmitInfo->vnode = pSubmit->vnode;
-        pSubmitInfo->numOfSid = pSubmit->numOfSid;
-        pSubmitInfo->ssid = i;   // start from this position, not the initial position
-        pSubmitInfo->pObj = pObj;
-        pSubmitInfo->offset = ((char *)pBlocks) - (pMsg + sizeof(SShellSubmitMsg));
-        assert(pSubmitInfo->offset >= 0);
-        memcpy((void *)(pSubmitInfo->blks), (void *)(pMsg + sizeof(SShellSubmitMsg)), msgLen - sizeof(SShellSubmitMsg));
-        taosTmrStart(vnodeProcessBatchSubmitTimer, 10, (void *)pSubmitInfo, vnodeTmrCtrl);
-      }
-    } else {
-      if (code == TSDB_CODE_SUCCESS) assert(pObj->count == 0);
-      ret = vnodeSendShellSubmitRspMsg(pObj, code, pObj->numOfTotalPoints);
-    }
-  } else {  // Insert case
-    ret = vnodeSendShellSubmitRspMsg(pObj, code, pObj->numOfTotalPoints);
-  }
-
-  atomic_fetch_add_32(&vnodeInsertReqNum, 1);
-  return ret;
-}
-
-static void vnodeProcessBatchSubmitTimer(void *param, void *tmrId) {
-  SBatchSubmitInfo *pSubmitInfo = (SBatchSubmitInfo *)param;
-  assert(pSubmitInfo != NULL && pSubmitInfo->import);
-
-  int32_t i = 0;
-  int32_t code = TSDB_CODE_SUCCESS;
-
-  SShellObj *        pShell = pSubmitInfo->pObj;
-  SVnodeObj *        pVnode = &vnodeList[pSubmitInfo->vnode];
-  SShellSubmitBlock *pBlocks = (SShellSubmitBlock *)(pSubmitInfo->blks + pSubmitInfo->offset);
-  TSKEY   now = taosGetTimestamp(pVnode->cfg.precision);
-  i = pSubmitInfo->ssid;
-
-  code = vnodeDoSubmitJob(pVnode, pSubmitInfo->import, &i, pSubmitInfo->numOfSid, &pBlocks, now, pShell);
-
-  if (code == TSDB_CODE_ACTION_IN_PROGRESS) {
-    pSubmitInfo->ssid = i;
-    pSubmitInfo->offset = ((char *)pBlocks) - pSubmitInfo->blks;
-    taosTmrStart(vnodeProcessBatchSubmitTimer, 10, (void *)pSubmitInfo, vnodeTmrCtrl);
-  } else {
-    if (code == TSDB_CODE_SUCCESS) assert(pShell->count == 0);
-    tfree(param);
-    vnodeSendShellSubmitRspMsg(pShell, code, pShell->numOfTotalPoints);
-  }
-}
diff --git a/src/system/detail/src/vnodeStatus.c b/src/system/detail/src/vnodeStatus.c
deleted file mode 100644
index d78f3633fbb2ab23b5e2f0179eaa7bc98de79813..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeStatus.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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 "taosmsg.h"
-#include "tsdb.h"
-#include "vnodeStatus.h"
-
-const char* taosGetVgroupStatusStr(int32_t vgroupStatus) {
-  switch (vgroupStatus) {
-    case TSDB_VG_STATUS_READY:                 return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_IN_PROGRESS:           return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_NO_DISK_PERMISSIONS:   return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_SERVER_NO_PACE:        return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_SERV_OUT_OF_MEMORY:    return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_INIT_FAILED:           return tsError[vgroupStatus];
-    case TSDB_VG_STATUS_FULL:                  return tsError[vgroupStatus];
-    default:                                   return "undefined";
-  }
-}
-
-const char* taosGetDbStatusStr(int32_t dbStatus) {
-  switch (dbStatus) {
-    case TSDB_DB_STATUS_READY:         return "ready";
-    case TSDB_DB_STATUS_DROPPING:      return "dropping";
-    case TSDB_DB_STATUS_DROP_FROM_SDB: return "drop_from_sdb";
-    default:                           return "undefined";
-  }
-}
-
-const char* taosGetVnodeStatusStr(int32_t vnodeStatus) {
-  switch (vnodeStatus) {
-    case TSDB_VN_STATUS_OFFLINE:  return "offline";
-    case TSDB_VN_STATUS_CREATING: return "creating";
-    case TSDB_VN_STATUS_UNSYNCED: return "unsynced";
-    case TSDB_VN_STATUS_SLAVE:    return "slave";
-    case TSDB_VN_STATUS_MASTER:   return "master";
-    case TSDB_VN_STATUS_CLOSING:  return "closing";
-    case TSDB_VN_STATUS_DELETING: return "deleting";
-    default:                      return "undefined";
-  }
-}
-
-const char* taosGetVnodeSyncStatusStr(int32_t vnodeSyncStatus) {
-  switch (vnodeSyncStatus) {
-    case TSDB_VN_SYNC_STATUS_INIT:       return "ready";
-    case TSDB_VN_SYNC_STATUS_SYNCING:    return "syncing";
-    case TSDB_VN_SYNC_STATUS_SYNC_CACHE: return "sync_cache";
-    case TSDB_VN_SYNC_STATUS_SYNC_FILE:  return "sync_file";
-    default:                             return "undefined";
-  }
-}
-
-const char* taosGetVnodeDropStatusStr(int32_t dropping) {
-  switch (dropping) {
-    case TSDB_VN_DROP_STATUS_READY:     return "ready";
-    case TSDB_VN_DROP_STATUS_DROPPING:  return "dropping";
-    default:                            return "undefined";
-  }
-}
-
-const char* taosGetDnodeStatusStr(int32_t dnodeStatus) {
-  switch (dnodeStatus) {
-    case TSDB_DN_STATUS_OFFLINE: return "offline";
-    case TSDB_DN_STATUS_READY:   return "ready";
-    default:                     return "undefined";
-  }
-}
-
-const char* taosGetDnodeLbStatusStr(int32_t dnodeBalanceStatus) {
-  switch (dnodeBalanceStatus) {
-    case TSDB_DN_LB_STATUS_BALANCED:         return "balanced";
-    case TSDB_DN_LB_STATUS_BALANCING:        return "balancing";
-    case TSDB_DN_LB_STATUS_OFFLINE_REMOVING: return "offline removing";
-    case TSDB_DN_LB_STATE_SHELL_REMOVING:    return "removing";
-    default:                                 return "undefined";
-  }
-}
-
-const char* taosGetVgroupLbStatusStr(int32_t vglbStatus) {
-  switch (vglbStatus) {
-    case TSDB_VG_LB_STATUS_READY:   return "ready";
-    case TSDB_VG_LB_STATUS_UPDATE:  return "updating";
-    default:                        return "undefined";
-  }
-}
-
-const  char* taosGetVnodeStreamStatusStr(int32_t vnodeStreamStatus) {
-  switch (vnodeStreamStatus) {
-    case TSDB_VN_STREAM_STATUS_START: return "start";
-    case TSDB_VN_STREAM_STATUS_STOP:  return "stop";
-    default:                          return "undefined";
-  }
-}
-
-const char* taosGetTableStatusStr(int32_t tableStatus) {
-  switch(tableStatus) {
-    case TSDB_METER_STATE_INSERTING:   return "inserting";
-    case TSDB_METER_STATE_IMPORTING:return "importing";
-    case TSDB_METER_STATE_UPDATING: return "updating";
-    case TSDB_METER_STATE_DROPPING: return "deleting";
-    case TSDB_METER_STATE_DROPPED:  return "dropped";
-    case TSDB_METER_STATE_READY:    return "ready";
-    default:return "undefined";
-  }
-}
diff --git a/src/system/detail/src/vnodeStore.c b/src/system/detail/src/vnodeStore.c
deleted file mode 100644
index 5949b1636d1e5d48991df1ed06f63ca354a79d9a..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeStore.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "dnodeSystem.h"
-#include "trpc.h"
-#include "ttime.h"
-#include "vnode.h"
-#include "vnodeStore.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-int        tsMaxVnode = -1;
-int        tsOpenVnodes = 0;
-SVnodeObj *vnodeList = NULL;
-
-static int vnodeInitStoreVnode(int vnode) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  pVnode->vnode = vnode;
-  vnodeOpenMetersVnode(vnode);
-  if (pVnode->cfg.maxSessions <= 0) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  pVnode->firstKey = taosGetTimestamp(pVnode->cfg.precision);
-
-  pVnode->pCachePool = vnodeOpenCachePool(vnode);
-  if (pVnode->pCachePool == NULL) {
-    dError("vid:%d, cache pool init failed.", pVnode->vnode);
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-
-  if (vnodeInitFile(vnode) != TSDB_CODE_SUCCESS) {
-    dError("vid:%d, files init failed.", pVnode->vnode);
-    return TSDB_CODE_VG_INIT_FAILED;
-  }
-
-  if (vnodeInitCommit(vnode) != TSDB_CODE_SUCCESS) {
-    dError("vid:%d, commit init failed.", pVnode->vnode);
-    return TSDB_CODE_VG_INIT_FAILED;
-  }
-
-  pthread_mutex_init(&(pVnode->vmutex), NULL);
-  dPrint("vid:%d, storage initialized, version:%" PRIu64 " fileId:%d numOfFiles:%d", vnode, pVnode->version, pVnode->fileId,
-         pVnode->numOfFiles);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int vnodeOpenVnode(int vnode) {
-  int32_t code = TSDB_CODE_SUCCESS;
-
-  SVnodeObj *pVnode = vnodeList + vnode;
-
-  pVnode->vnode = vnode;
-  pVnode->accessState = TSDB_VN_ALL_ACCCESS;
-
-  // vnode is empty
-  if (pVnode->cfg.maxSessions <= 0) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (!(pVnode->vnodeStatus == TSDB_VN_STATUS_OFFLINE || pVnode->vnodeStatus == TSDB_VN_STATUS_CREATING)) {
-    dError("vid:%d, status:%s, cannot enter open operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-    return TSDB_CODE_INVALID_VNODE_STATUS;
-  }
-
-  dPrint("vid:%d, status:%s, start to open", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-  pthread_mutex_lock(&dmutex);
-
-  // not enough memory, abort
-  if ((code = vnodeOpenShellVnode(vnode)) != TSDB_CODE_SUCCESS) {
-    pthread_mutex_unlock(&dmutex);
-    return code;
-  }
-
-  vnodeOpenPeerVnode(vnode);
-
-  if (vnode > tsMaxVnode) tsMaxVnode = vnode;
-
-  vnodeCalcOpenVnodes();
-
-  pthread_mutex_unlock(&dmutex);
-
-#ifndef CLUSTER
-  vnodeOpenStreams(pVnode, NULL);
-#endif
-
-  dPrint("vid:%d, vnode is opened, openVnodes:%d, status:%s", vnode, tsOpenVnodes, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t vnodeMarkAllMetersDropped(SVnodeObj* pVnode) {
-  if (pVnode->meterList == NULL) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  bool ready = true;
-  for (int sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-    if (!vnodeIsSafeToDeleteMeter(pVnode, sid)) {
-      ready = false;
-    } else { // set the meter is to be deleted
-      SMeterObj* pObj = pVnode->meterList[sid];
-      if (pObj != NULL) {
-        pObj->state = TSDB_METER_STATE_DROPPED;
-      }
-    }
-  }
-
-  return ready? TSDB_CODE_SUCCESS:TSDB_CODE_ACTION_IN_PROGRESS;
-}
-
-static int vnodeCloseVnode(int vnode) {
-  if (vnodeList == NULL) return TSDB_CODE_SUCCESS;
-
-  SVnodeObj* pVnode = &vnodeList[vnode];
-
-  pthread_mutex_lock(&dmutex);
-  if (pVnode->cfg.maxSessions == 0) {
-    pthread_mutex_unlock(&dmutex);
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (pVnode->vnodeStatus == TSDB_VN_STATUS_DELETING) {
-    dPrint("vid:%d, status:%s, another thread performed delete operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-    return TSDB_CODE_SUCCESS;
-  } else {
-    dPrint("vid:%d, status:%s, enter close operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-    pVnode->vnodeStatus = TSDB_VN_STATUS_CLOSING;
-  }
-
-  // set the meter is dropped flag 
-  if (vnodeMarkAllMetersDropped(pVnode) != TSDB_CODE_SUCCESS) {
-    pthread_mutex_unlock(&dmutex);
-    return TSDB_CODE_ACTION_IN_PROGRESS;
-  }
-
-  dPrint("vid:%d, status:%s, enter delete operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-  pVnode->vnodeStatus = TSDB_VN_STATUS_DELETING;
-
-  vnodeCloseStream(vnodeList + vnode);
-  vnodeCancelCommit(vnodeList + vnode);
-  vnodeClosePeerVnode(vnode);
-  vnodeCloseMetersVnode(vnode);
-  vnodeCloseShellVnode(vnode);
-  vnodeCloseCachePool(vnode);
-  vnodeCleanUpCommit(vnode);
-
-  pthread_mutex_destroy(&(vnodeList[vnode].vmutex));
-
-  if (tsMaxVnode == vnode) tsMaxVnode = vnode - 1;
-
-  tfree(vnodeList[vnode].meterIndex);
-
-  pthread_mutex_unlock(&dmutex);
-  return TSDB_CODE_SUCCESS;
-}
-
-int vnodeCreateVnode(int vnode, SVnodeCfg *pCfg, SVPeerDesc *pDesc) {
-  char fileName[128];
-
-  if (vnodeList[vnode].vnodeStatus != TSDB_VN_STATUS_OFFLINE) {
-    dError("vid:%d, status:%s, cannot enter create operation", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-    return TSDB_CODE_INVALID_VNODE_STATUS;
-  }
-
-  vnodeList[vnode].vnodeStatus = TSDB_VN_STATUS_CREATING;
-
-  sprintf(fileName, "%s/vnode%d", tsDirectory, vnode);
-  if (mkdir(fileName, 0755) != 0) {
-    dError("failed to create vnode:%d directory:%s, errno:%d, reason:%s", vnode, fileName, errno, strerror(errno));
-    if (errno == EACCES) {
-      return TSDB_CODE_NO_DISK_PERMISSIONS;
-    } else if (errno == ENOSPC) {
-      return TSDB_CODE_SERV_NO_DISKSPACE;
-    } else if (errno == EEXIST) {
-    } else {
-      return TSDB_CODE_VG_INIT_FAILED;
-    }
-  }
-
-  sprintf(fileName, "%s/vnode%d/db", tsDirectory, vnode);
-  if (mkdir(fileName, 0755) != 0) {
-    dError("failed to create vnode:%d directory:%s, errno:%d, reason:%s", vnode, fileName, errno, strerror(errno));
-    if (errno == EACCES) {
-      return TSDB_CODE_NO_DISK_PERMISSIONS;
-    } else if (errno == ENOSPC) {
-      return TSDB_CODE_SERV_NO_DISKSPACE;
-    } else if (errno == EEXIST) {
-    } else {
-      return TSDB_CODE_VG_INIT_FAILED;
-    }
-  }
-
-  vnodeList[vnode].cfg = *pCfg;
-  int code = vnodeCreateMeterObjFile(vnode);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
-
-  code = vnodeSaveVnodeCfg(vnode, pCfg, pDesc);
-  if (code != TSDB_CODE_SUCCESS) {
-    return TSDB_CODE_VG_INIT_FAILED;
-  }
-
-  code = vnodeInitStoreVnode(vnode);
-  if (code != TSDB_CODE_SUCCESS) {
-    return code;
-  }
-
-  return vnodeOpenVnode(vnode);
-}
-
-static void vnodeRemoveDataFiles(int vnode) {
-  char           vnodeDir[TSDB_FILENAME_LEN];
-  char           dfilePath[TSDB_FILENAME_LEN];
-  char           linkFile[TSDB_FILENAME_LEN];
-  struct dirent *de = NULL;
-  DIR *          dir = NULL;
-
-  sprintf(vnodeDir, "%s/vnode%d/db", tsDirectory, vnode);
-  dir = opendir(vnodeDir);
-  if (dir == NULL) return;
-  while ((de = readdir(dir)) != NULL) {
-    if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
-    if ((strcmp(de->d_name + strlen(de->d_name) - strlen(".head"), ".head") == 0 ||
-         strcmp(de->d_name + strlen(de->d_name) - strlen(".data"), ".data") == 0 ||
-         strcmp(de->d_name + strlen(de->d_name) - strlen(".last"), ".last") == 0) &&
-        (de->d_type & DT_LNK)) {
-      sprintf(linkFile, "%s/%s", vnodeDir, de->d_name);
-
-      if (!vnodeRemoveDataFileFromLinkFile(linkFile, de->d_name)) {
-        continue;
-      }
-
-      memset(dfilePath, 0, TSDB_FILENAME_LEN);
-      int tcode = readlink(linkFile, dfilePath, TSDB_FILENAME_LEN);
-      remove(linkFile);
-
-      if (tcode >= 0) {
-        remove(dfilePath);
-        dPrint("Data file %s is removed, link file %s", dfilePath, linkFile);
-      }
-    } else {
-      remove(de->d_name);
-    }
-  }
-
-  closedir(dir);
-  rmdir(vnodeDir);
-
-  sprintf(vnodeDir, "%s/vnode%d/meterObj.v%d", tsDirectory, vnode, vnode);
-  remove(vnodeDir);
-
-  sprintf(vnodeDir, "%s/vnode%d", tsDirectory, vnode);
-  rmdir(vnodeDir);
-  dPrint("vid:%d, vnode is removed, status:%s", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-}
-
-int vnodeRemoveVnode(int vnode) {
-  if (vnodeList == NULL) return TSDB_CODE_SUCCESS;
-
-  if (vnodeList[vnode].cfg.maxSessions > 0) {
-    SVnodeObj* pVnode = &vnodeList[vnode];
-    if (pVnode->vnodeStatus == TSDB_VN_STATUS_CREATING
-        || pVnode->vnodeStatus == TSDB_VN_STATUS_OFFLINE
-        || pVnode->vnodeStatus == TSDB_VN_STATUS_DELETING) {
-      dTrace("vid:%d, status:%s, cannot enter close/delete operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-      return TSDB_CODE_ACTION_IN_PROGRESS;
-    } else {
-      int32_t ret = vnodeCloseVnode(vnode);
-      if (ret != TSDB_CODE_SUCCESS) {
-        return ret;
-      }
-
-      dTrace("vid:%d, status:%s, do delete operation", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus));
-      vnodeRemoveDataFiles(vnode);
-    }
-
-  } else {
-    dPrint("vid:%d, max sessions:%d, this vnode already dropped!!!", vnode, vnodeList[vnode].cfg.maxSessions);
-    vnodeList[vnode].cfg.maxSessions = 0;  //reset value
-    vnodeCalcOpenVnodes();
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-int vnodeInitStore() {
-  int vnode;
-  int size;
-
-  size = sizeof(SVnodeObj) * TSDB_MAX_VNODES;
-  vnodeList = (SVnodeObj *)malloc(size);
-  if (vnodeList == NULL) return -1;
-  memset(vnodeList, 0, size);
-
-  if (vnodeInitInfo() < 0) return -1;
-
-  for (vnode = 0; vnode < TSDB_MAX_VNODES; ++vnode) {
-    int code = vnodeInitStoreVnode(vnode);
-    if (code != TSDB_CODE_SUCCESS) {
-      // one vnode is failed to recover from commit log, continue for remain
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int vnodeInitVnodes() {
-  int vnode;
-
-  for (vnode = 0; vnode < TSDB_MAX_VNODES; ++vnode) {
-    if (vnodeOpenVnode(vnode) < 0) return -1;
-  }
-
-  return 0;
-}
-
-void vnodeCleanUpOneVnode(int vnode) {
-  static int again = 0;
-  if (vnodeList == NULL) return;
-
-  pthread_mutex_lock(&dmutex);
-
-  if (again) {
-    pthread_mutex_unlock(&dmutex);
-    return;
-  }
-  again = 1;
-
-  if (vnodeList[vnode].pCachePool) {
-    vnodeList[vnode].vnodeStatus = TSDB_VN_STATUS_OFFLINE;
-    vnodeClosePeerVnode(vnode);
-  }
-
-  pthread_mutex_unlock(&dmutex);
-
-  if (vnodeList[vnode].pCachePool) {
-    vnodeProcessCommitTimer(vnodeList + vnode, NULL);
-    while (vnodeList[vnode].commitThread != 0) {
-      taosMsleep(10);
-    }
-    vnodeCleanUpCommit(vnode);
-  }
-}
-
-void vnodeCleanUpVnodes() {
-  static int again = 0;
-  if (vnodeList == NULL) return;
-
-  pthread_mutex_lock(&dmutex);
-
-  if (again) {
-    pthread_mutex_unlock(&dmutex);
-    return;
-  }
-  again = 1;
-
-  for (int vnode = 0; vnode < TSDB_MAX_VNODES; ++vnode) {
-    if (vnodeList[vnode].pCachePool) {
-      vnodeList[vnode].vnodeStatus = TSDB_VN_STATUS_OFFLINE;
-      vnodeClosePeerVnode(vnode);
-    }
-  }
-
-  pthread_mutex_unlock(&dmutex);
-
-  for (int vnode = 0; vnode < TSDB_MAX_VNODES; ++vnode) {
-    if (vnodeList[vnode].pCachePool) {
-      vnodeProcessCommitTimer(vnodeList + vnode, NULL);
-      while (vnodeList[vnode].commitThread != 0) {
-        taosMsleep(10);
-      }
-      vnodeCleanUpCommit(vnode);
-    }
-  }
-}
-
-void vnodeCalcOpenVnodes() {
-  int openVnodes = 0;
-  for (int vnode = 0; vnode <= tsMaxVnode; ++vnode) {
-    if (vnodeList[vnode].cfg.maxSessions <= 0) continue;
-    openVnodes++;
-  }
-
-  atomic_store_32(&tsOpenVnodes, openVnodes);
-}
-
-void vnodeUpdateHeadFile(int vnode, int oldTables, int newTables) {
-  //todo rewrite the head file with newTables
-}
diff --git a/src/system/detail/src/vnodeStream.c b/src/system/detail/src/vnodeStream.c
deleted file mode 100644
index 7ee20a2e59562f63903fb2ea13228070f14f0932..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeStream.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "taosmsg.h"
-#include "vnode.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-/* static TAOS *dbConn = NULL; */
-void vnodeCloseStreamCallback(void *param);
-
-void vnodeProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
-  SMeterObj *pObj = (SMeterObj *)param;
-  dTrace("vid:%d sid:%d id:%s, stream result is ready", pObj->vnode, pObj->sid, pObj->meterId);
-
-  // construct data
-  int32_t     contLen = pObj->bytesPerPoint;
-  char *      pTemp = calloc(1, sizeof(SSubmitMsg) + pObj->bytesPerPoint + sizeof(SVMsgHeader));
-  SSubmitMsg *pMsg = (SSubmitMsg *)(pTemp + sizeof(SVMsgHeader));
-
-  pMsg->numOfRows = htons(1);
-
-  char ncharBuf[TSDB_MAX_BYTES_PER_ROW] = {0};
-
-  int32_t offset = 0;
-  for (int32_t i = 0; i < pObj->numOfColumns; ++i) {
-    char *dst = row[i];
-    if (dst == NULL) {
-      setNull(pMsg->payLoad + offset, pObj->schema[i].type, pObj->schema[i].bytes);
-    } else {
-      // here, we need to transfer nchar(utf8) to unicode(ucs-4)
-      if (pObj->schema[i].type == TSDB_DATA_TYPE_NCHAR) {
-        taosMbsToUcs4(row[i], pObj->schema[i].bytes, ncharBuf, TSDB_MAX_BYTES_PER_ROW);
-        dst = ncharBuf;
-      }
-
-      memcpy(pMsg->payLoad + offset, dst, pObj->schema[i].bytes);
-    }
-
-    offset += pObj->schema[i].bytes;
-  }
-
-  contLen += sizeof(SSubmitMsg);
-
-  int32_t numOfPoints = 0;
-  int32_t code = vnodeInsertPoints(pObj, (char *)pMsg, contLen, TSDB_DATA_SOURCE_SHELL, NULL, pObj->sversion,
-      &numOfPoints, taosGetTimestamp(vnodeList[pObj->vnode].cfg.precision));
-
-  if (code != TSDB_CODE_SUCCESS) {
-    dError("vid:%d sid:%d id:%s, failed to insert continuous query results", pObj->vnode, pObj->sid, pObj->meterId);
-  }
-
-  assert(numOfPoints >= 0 && numOfPoints <= 1);
-  tfree(pTemp);
-}
-
-static void vnodeGetDBFromMeterId(SMeterObj *pObj, char *db) {
-  char *st = strstr(pObj->meterId, ".");
-  char *end = strstr(st + 1, ".");
-
-  memcpy(db, st + 1, end - (st + 1));
-}
-
-void vnodeOpenStreams(void *param, void *tmrId) {
-  SVnodeObj *pVnode = (SVnodeObj *)param;
-  SMeterObj *pObj;
-
-  if (pVnode->streamRole == TSDB_VN_STREAM_STATUS_STOP) return;
-  if (pVnode->meterList == NULL) return;
-
-  taosTmrStopA(&pVnode->streamTimer);
-  pVnode->streamTimer = NULL;
-
-  for (int sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-    pObj = pVnode->meterList[sid];
-    if (pObj == NULL || pObj->sqlLen == 0 || vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) continue;
-
-    dTrace("vid:%d sid:%d id:%s, open stream:%s", pObj->vnode, sid, pObj->meterId, pObj->pSql);
-
-    if (pVnode->dbConn == NULL) {
-      char db[64] = {0};
-      char user[64] = {0};
-      vnodeGetDBFromMeterId(pObj, db);
-      sprintf(user, "_%s", pVnode->cfg.acct);
-      pVnode->dbConn = taos_connect(NULL, user, tsInternalPass, db, 0);
-    }
-
-    if (pVnode->dbConn == NULL) {
-      dError("vid:%d, failed to connect to mgmt node", pVnode->vnode);
-      taosTmrReset(vnodeOpenStreams, 1000, param, vnodeTmrCtrl, &pVnode->streamTimer);
-      return;
-    }
-
-    if (pObj->pStream == NULL) {
-      pObj->pStream = taos_open_stream(pVnode->dbConn, pObj->pSql, vnodeProcessStreamRes, pObj->lastKey, pObj,
-                                       vnodeCloseStreamCallback);
-      if (pObj->pStream) pVnode->numOfStreams++;
-    }
-  }
-}
-
-void vnodeCreateStream(SMeterObj *pObj) {
-  if (pObj->sqlLen <= 0) return;
-
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-
-  if (pVnode->streamRole == TSDB_VN_STREAM_STATUS_STOP) return;
-  if (pObj->pStream) return;
-
-  dTrace("vid:%d sid:%d id:%s stream:%s is created", pObj->vnode, pObj->sid, pObj->meterId, pObj->pSql);
-  if (pVnode->dbConn == NULL) {
-    if (pVnode->streamTimer == NULL) taosTmrReset(vnodeOpenStreams, 1000, pVnode, vnodeTmrCtrl, &pVnode->streamTimer);
-  } else {
-    pObj->pStream = taos_open_stream(pVnode->dbConn, pObj->pSql, vnodeProcessStreamRes, pObj->lastKey, pObj,
-                                     vnodeCloseStreamCallback);
-    if (pObj->pStream) pVnode->numOfStreams++;
-  }
-}
-
-// Close only one stream
-void vnodeRemoveStream(SMeterObj *pObj) {
-  SVnodeObj *pVnode = vnodeList + pObj->vnode;
-  if (pObj->sqlLen <= 0) return;
-
-  if (pObj->pStream) {
-    taos_close_stream(pObj->pStream);
-    pVnode->numOfStreams--;
-  }
-
-  pObj->pStream = NULL;
-  if (pVnode->numOfStreams == 0) {
-    taos_close(pVnode->dbConn);
-    pVnode->dbConn = NULL;
-  }
-
-  dTrace("vid:%d sid:%d id:%d stream is removed", pObj->vnode, pObj->sid, pObj->meterId);
-}
-
-// Close all streams in a vnode
-void vnodeCloseStream(SVnodeObj *pVnode) {
-  SMeterObj *pObj;
-  dPrint("vid:%d, stream is closed, old role %s", pVnode->vnode, taosGetVnodeStreamStatusStr(pVnode->streamRole));
-
-  // stop stream computing
-  for (int sid = 0; sid < pVnode->cfg.maxSessions; ++sid) {
-    pObj = pVnode->meterList[sid];
-    if (pObj == NULL) continue;
-    if (pObj->sqlLen > 0 && pObj->pStream) {
-      taos_close_stream(pObj->pStream);
-      pVnode->numOfStreams--;
-    }
-    pObj->pStream = NULL;
-  }
-}
-
-void vnodeUpdateStreamRole(SVnodeObj *pVnode) {
-  /* SMeterObj *pObj; */
-
-  int newRole = (pVnode->vnodeStatus == TSDB_VN_STATUS_MASTER) ? TSDB_VN_STREAM_STATUS_START : TSDB_VN_STREAM_STATUS_STOP;
-  if (newRole != pVnode->streamRole) {
-    dPrint("vid:%d, stream role is changed from %s to %s",
-            pVnode->vnode, taosGetVnodeStreamStatusStr(pVnode->streamRole), taosGetVnodeStreamStatusStr(newRole));
-    pVnode->streamRole = newRole;
-    if (newRole == TSDB_VN_STREAM_STATUS_START) {
-      vnodeOpenStreams(pVnode, NULL);
-    } else {
-      vnodeCloseStream(pVnode);
-    }
-  } else {
-    dPrint("vid:%d, stream role is keep to %s", pVnode->vnode, taosGetVnodeStreamStatusStr(pVnode->streamRole));
-  }
-}
-
-// Callback function called from client
-void vnodeCloseStreamCallback(void *param) {
-  SMeterObj *pMeter = (SMeterObj *)param;
-  SVnodeObj *pVnode = NULL;
-
-  if (pMeter == NULL || pMeter->sqlLen == 0) return;
-  pVnode = vnodeList + pMeter->vnode;
-
-  pMeter->sqlLen = 0;
-  pMeter->pSql = NULL;
-  pMeter->pStream = NULL;
-
-  pVnode->numOfStreams--;
-
-  if (pVnode->numOfStreams == 0) {
-    taos_close(pVnode->dbConn);
-    pVnode->dbConn = NULL;
-  }
-
-  vnodeSaveMeterObjToFile(pMeter);
-}
\ No newline at end of file
diff --git a/src/system/detail/src/vnodeSystem.c b/src/system/detail/src/vnodeSystem.c
deleted file mode 100644
index b23050ab03eeeeb9de329d7259da352d48fda23b..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeSystem.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "tsdb.h"
-#include "tsocket.h"
-#include "vnode.h"
-#include "vnodeSystem.h"
-
-// internal global, not configurable
-void *   vnodeTmrCtrl;
-void **  rpcQhandle;
-void *   dmQhandle;
-void *   queryQhandle;
-int      tsVnodePeers = TSDB_VNODES_SUPPORT - 1;
-int      tsMaxQueues;
-uint32_t tsRebootTime;
-
-void vnodeCleanUpSystem() {
-  vnodeCleanUpVnodes();
-}
-
-bool vnodeInitQueryHandle() {
-  int numOfThreads = tsRatioOfQueryThreads * tsNumOfCores * tsNumOfThreadsPerCore;
-  if (numOfThreads < 1) {
-    numOfThreads = 1;
-  }
-  
-  int32_t maxQueueSize = tsNumOfVnodesPerCore * tsNumOfCores * tsSessionsPerVnode;
-  dTrace("query task queue initialized, max slot:%d, task threads:%d", maxQueueSize,numOfThreads);
-  
-  queryQhandle = taosInitSchedulerWithInfo(maxQueueSize, numOfThreads, "query", vnodeTmrCtrl);
-  return true;
-}
-
-bool vnodeInitTmrCtl() {
-  vnodeTmrCtrl = taosTmrInit(TSDB_MAX_VNODES * (tsVnodePeers + 10) + tsSessionsPerVnode + 1000, 200, 60000, "DND-vnode");
-  if (vnodeTmrCtrl == NULL) {
-    dError("failed to init timer, exit");
-    return false;
-  }
-  return true;
-}
-
-int vnodeInitSystem() {
-
-  if (!vnodeInitTmrCtl()) {
-    dError("failed to init timer, exit");
-    return -1;
-  }
-  
-  if (!vnodeInitQueryHandle()) {
-    dError("failed to init query qhandle, exit");
-    return -1;
-  }
-
-  if (vnodeInitStore() < 0) {
-    dError("failed to init vnode storage");
-    return -1;
-  }
-
-  int numOfThreads = (1.0 - tsRatioOfQueryThreads) * tsNumOfCores * tsNumOfThreadsPerCore / 2.0;
-  if (numOfThreads < 1) numOfThreads = 1;
-  if (vnodeInitPeer(numOfThreads) < 0) {
-    dError("failed to init vnode peer communication");
-    return -1;
-  }
-
-  if (vnodeInitMgmt() < 0) {
-    dError("failed to init communication to mgmt");
-    return -1;
-  }
-
-  if (vnodeInitShell() < 0) {
-    dError("failed to init communication to shell");
-    return -1;
-  }
-
-  if (vnodeInitVnodes() < 0) {
-    dError("failed to init store");
-    return -1;
-  }
-
-  dPrint("vnode is initialized successfully");
-
-  return 0;
-}
-
-void vnodeInitQHandle() {
-  tsMaxQueues = (1.0 - tsRatioOfQueryThreads)*tsNumOfCores*tsNumOfThreadsPerCore / 2.0;
-  if (tsMaxQueues < 1) tsMaxQueues = 1;
-
-  rpcQhandle = malloc(tsMaxQueues*sizeof(void *));
-
-  for (int i=0; i< tsMaxQueues; ++i ) 
-    rpcQhandle[i] = taosInitScheduler(tsSessionsPerVnode, 1, "dnode");
-
-  dmQhandle = taosInitScheduler(tsSessionsPerVnode, 1, "mgmt");
-}
diff --git a/src/system/detail/src/vnodeTagMgmt.c b/src/system/detail/src/vnodeTagMgmt.c
deleted file mode 100644
index cea4f75f83fb200f1bae2473691a329ce91ccae5..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeTagMgmt.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "tsdb.h"
-#include "tlog.h"
-#include "tutil.h"
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "tast.h"
-#include "vnodeTagMgmt.h"
-
-#define GET_TAG_VAL_POINTER(s, col, sc, t) ((t *)(&((s)->tags[(sc)->colOffset[(col)]])))
-#define GET_TAG_VAL(s, col, sc, t) (*GET_TAG_VAL_POINTER(s, col, sc, t))
-
-static void tTagsPrints(SMeterSidExtInfo *pMeterInfo, tTagSchema *pSchema, tOrderIdx *pOrder);
-
-static void tSidSetDisplay(tSidSet *pSets);
-
-//todo merge with losertree_compar/ext_comp
-int32_t doCompare(char* f1, char* f2, int32_t type, int32_t size) {
-  switch (type) {
-    case TSDB_DATA_TYPE_INT:        DEFAULT_COMP(GET_INT32_VAL(f1), GET_INT32_VAL(f2));
-    case TSDB_DATA_TYPE_DOUBLE:     DEFAULT_COMP(GET_DOUBLE_VAL(f1), GET_DOUBLE_VAL(f2));
-    case TSDB_DATA_TYPE_FLOAT:      DEFAULT_COMP(GET_FLOAT_VAL(f1), GET_FLOAT_VAL(f2));
-    case TSDB_DATA_TYPE_BIGINT:     DEFAULT_COMP(GET_INT64_VAL(f1), GET_INT64_VAL(f2));
-    case TSDB_DATA_TYPE_SMALLINT:   DEFAULT_COMP(GET_INT16_VAL(f1), GET_INT16_VAL(f2));
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_BOOL:       DEFAULT_COMP(GET_INT8_VAL(f1), GET_INT8_VAL(f2));
-    case TSDB_DATA_TYPE_NCHAR: {
-      int32_t ret = wcsncmp((wchar_t*) f1, (wchar_t*) f2, size/TSDB_NCHAR_SIZE);
-      if (ret == 0) {
-          return ret;
-      }
-      return (ret < 0) ? -1 : 1;
-    }
-    default: {
-      int32_t ret = strncmp(f1, f2, (size_t)size);
-      if (ret == 0) {
-        return ret;
-      }
-
-      return (ret < 0) ? -1 : 1;
-    }
-  }
-}
-
-int32_t meterSidComparator(const void *p1, const void *p2, void *param) {
-  tOrderDescriptor *pOrderDesc = (tOrderDescriptor *)param;
-
-  SMeterSidExtInfo *s1 = (SMeterSidExtInfo *)p1;
-  SMeterSidExtInfo *s2 = (SMeterSidExtInfo *)p2;
-
-  for (int32_t i = 0; i < pOrderDesc->orderIdx.numOfOrderedCols; ++i) {
-    int32_t colIdx = pOrderDesc->orderIdx.pData[i];
-
-    char *  f1 = NULL;
-    char *  f2 = NULL;
-    int32_t type = 0;
-    int32_t bytes = 0;
-
-    if (colIdx == -1) {
-      f1 = s1->tags;
-      f2 = s2->tags;
-      type = TSDB_DATA_TYPE_BINARY;
-      bytes = TSDB_METER_NAME_LEN;
-    } else {
-      f1 = GET_TAG_VAL_POINTER(s1, colIdx, pOrderDesc->pTagSchema, char);
-      f2 = GET_TAG_VAL_POINTER(s2, colIdx, pOrderDesc->pTagSchema, char);
-      SSchema *pSchema = &pOrderDesc->pTagSchema->pSchema[colIdx];
-      type = pSchema->type;
-      bytes = pSchema->bytes;
-    }
-
-    int32_t ret = doCompare(f1, f2, type, bytes);
-    if (ret == 0) {
-      continue;
-    } else {
-      return ret;
-    }
-  }
-
-  return 0;
-}
-
-static void median(void **pMeterSids, size_t size, int32_t s1, int32_t s2, tOrderDescriptor *pOrderDesc,
-                   __ext_compar_fn_t compareFn) {
-  int32_t midIdx = ((s2 - s1) >> 1) + s1;
-
-  if (compareFn(pMeterSids[midIdx], pMeterSids[s1], pOrderDesc) == 1) {
-    tsDataSwap(&pMeterSids[midIdx], &pMeterSids[s1], TSDB_DATA_TYPE_BINARY, size);
-  }
-
-  if (compareFn(pMeterSids[midIdx], pMeterSids[s2], pOrderDesc) == 1) {
-    tsDataSwap(&pMeterSids[midIdx], &pMeterSids[s1], TSDB_DATA_TYPE_BINARY, size);
-    tsDataSwap(&pMeterSids[midIdx], &pMeterSids[s2], TSDB_DATA_TYPE_BINARY, size);
-  } else if (compareFn(pMeterSids[s1], pMeterSids[s2], pOrderDesc) == 1) {
-    tsDataSwap(&pMeterSids[s1], &pMeterSids[s2], TSDB_DATA_TYPE_BINARY, size);
-  }
-
-  assert(compareFn(pMeterSids[midIdx], pMeterSids[s1], pOrderDesc) <= 0 &&
-         compareFn(pMeterSids[s1], pMeterSids[s2], pOrderDesc) <= 0);
-
-#ifdef _DEBUG_VIEW
-  tTagsPrints(pMeterSids[s1], pOrderDesc->pTagSchema, &pOrderDesc->orderIdx);
-  tTagsPrints(pMeterSids[midIdx], pOrderDesc->pTagSchema, &pOrderDesc->orderIdx);
-  tTagsPrints(pMeterSids[s2], pOrderDesc->pTagSchema, &pOrderDesc->orderIdx);
-#endif
-}
-
-static void tInsertSort(void **pMeterSids, size_t size, int32_t startPos, int32_t endPos, void *param,
-                        __ext_compar_fn_t compareFn) {
-  for (int32_t i = startPos + 1; i <= endPos; ++i) {
-    for (int32_t j = i; j > startPos; --j) {
-      if (compareFn(pMeterSids[j], pMeterSids[j - 1], param) == -1) {
-        tsDataSwap(&pMeterSids[j], &pMeterSids[j - 1], TSDB_DATA_TYPE_BINARY, size);
-      } else {
-        break;
-      }
-    }
-  }
-}
-
-void tQSortEx(void **pMeterSids, size_t size, int32_t start, int32_t end, void *param, __ext_compar_fn_t compareFn) {
-  tOrderDescriptor *pOrderDesc = (tOrderDescriptor *)param;
-
-  // short array sort, incur another sort procedure instead of quick sort process
-  if (end - start + 1 <= 8) {
-    tInsertSort(pMeterSids, size, start, end, pOrderDesc, compareFn);
-    return;
-  }
-
-  median(pMeterSids, size, start, end, pOrderDesc, compareFn);
-
-  int32_t s = start, e = end;
-  int32_t endRightS = end, startLeftS = start;
-
-  while (s < e) {
-    while (e > s) {
-      int32_t ret = compareFn(pMeterSids[e], pMeterSids[s], pOrderDesc);
-      if (ret < 0) {
-        break;
-      }
-
-      /*
-       * move the data that equals to pivotal value to the right end of the list
-       */
-      if (ret == 0 && e != endRightS) {
-        tsDataSwap(&pMeterSids[e], &pMeterSids[endRightS--], TSDB_DATA_TYPE_BINARY, size);
-      }
-
-      e--;
-    }
-
-    if (e != s) {
-      tsDataSwap(&pMeterSids[e], &pMeterSids[s], TSDB_DATA_TYPE_BINARY, size);
-    }
-
-    while (s < e) {
-      int32_t ret = compareFn(pMeterSids[s], pMeterSids[e], pOrderDesc);
-      if (ret > 0) {
-        break;
-      }
-
-      if (ret == 0 && s != startLeftS) {
-        tsDataSwap(&pMeterSids[s], &pMeterSids[startLeftS++], TSDB_DATA_TYPE_BINARY, size);
-      }
-        s++;
-    }
-
-      if (e != s) {
-        tsDataSwap(&pMeterSids[s], &pMeterSids[e], TSDB_DATA_TYPE_BINARY, size);
-      }
-  }
-
-  int32_t rightPartStart = e + 1;
-  if (endRightS != end && e < end) {
-    int32_t left = rightPartStart;
-    int32_t right = end;
-
-    while (right > endRightS && left <= endRightS) {
-      tsDataSwap(&pMeterSids[left++], &pMeterSids[right--], TSDB_DATA_TYPE_BINARY, size);
-    }
-
-    rightPartStart += (end - endRightS);
-  }
-
-  int32_t leftPartEnd = e - 1;
-  if (startLeftS != end && s > start) {
-    int32_t left = start;
-    int32_t right = leftPartEnd;
-
-    while (left < startLeftS && right >= startLeftS) {
-      tsDataSwap(&pMeterSids[left++], &pMeterSids[right--], TSDB_DATA_TYPE_BINARY, size);
-    }
-
-    leftPartEnd -= (startLeftS - start);
-  }
-
-  if (leftPartEnd > start) {
-    tQSortEx(pMeterSids, size, start, leftPartEnd, pOrderDesc, compareFn);
-  }
-
-  if (rightPartStart < end) {
-    tQSortEx(pMeterSids, size, rightPartStart, end, pOrderDesc, compareFn);
-  }
-}
-
-int32_t *calculateSubGroup(void **pSids, int32_t numOfMeters, int32_t *numOfSubset, tOrderDescriptor *pOrderDesc,
-                           __ext_compar_fn_t compareFn) {
-  int32_t *starterPos = (int32_t *)malloc((numOfMeters + 1) * sizeof(int32_t));  // add additional buffer
-  starterPos[0] = 0;
-
-  *numOfSubset = 1;
-
-  for (int32_t i = 1; i < numOfMeters; ++i) {
-    int32_t ret = compareFn(pSids[i - 1], pSids[i], pOrderDesc);
-    if (ret != 0) {
-      assert(ret == -1);
-      starterPos[(*numOfSubset)++] = i;
-    }
-  }
-
-  starterPos[*numOfSubset] = numOfMeters;
-  assert(*numOfSubset <= numOfMeters);
-
-  return starterPos;
-}
-
-tTagSchema *tCreateTagSchema(SSchema *pSchema, int32_t numOfTagCols) {
-  if (numOfTagCols == 0 || pSchema == NULL) {
-    return NULL;
-  }
-
-  tTagSchema *pTagSchema =
-      (tTagSchema *)calloc(1, sizeof(tTagSchema) + numOfTagCols * sizeof(int32_t) + sizeof(SSchema) * numOfTagCols);
-
-  pTagSchema->colOffset[0] = 0;
-  pTagSchema->numOfCols = numOfTagCols;
-  for (int32_t i = 1; i < numOfTagCols; ++i) {
-    pTagSchema->colOffset[i] = (pTagSchema->colOffset[i - 1] + pSchema[i - 1].bytes);
-  }
-
-  pTagSchema->pSchema = (SSchema *)&(pTagSchema->colOffset[numOfTagCols]);
-  memcpy(pTagSchema->pSchema, pSchema, sizeof(SSchema) * numOfTagCols);
-  return pTagSchema;
-}
-
-tSidSet *tSidSetCreate(struct SMeterSidExtInfo **pMeterSidExtInfo, int32_t numOfMeters, SSchema *pSchema,
-                       int32_t numOfTags, SColIndexEx *colList, int32_t numOfCols) {
-  tSidSet *pSidSet = (tSidSet *)calloc(1, sizeof(tSidSet) + numOfCols * sizeof(int16_t));
-  if (pSidSet == NULL) {
-    return NULL;
-  }
-
-  pSidSet->numOfSids = numOfMeters;
-  pSidSet->pSids = pMeterSidExtInfo;
-  pSidSet->pTagSchema = tCreateTagSchema(pSchema, numOfTags);
-  pSidSet->orderIdx.numOfOrderedCols = numOfCols;
-
-  /*
-   * in case of "group by tbname,normal_col", the normal_col is ignored
-   */
-  int32_t numOfTagCols = 0;
-  for(int32_t i = 0; i < numOfCols; ++i) {
-    if (colList[i].flag == TSDB_COL_TAG) {
-      pSidSet->orderIdx.pData[numOfTagCols++] = colList[i].colIdx;
-    }
-  }
-
-  pSidSet->orderIdx.numOfOrderedCols = numOfTagCols;
-
-  pSidSet->starterPos = NULL;
-  return pSidSet;
-}
-
-void tSidSetDestroy(tSidSet **pSets) {
-  if ((*pSets) != NULL) {
-    tfree((*pSets)->starterPos);
-    tfree((*pSets)->pTagSchema)(*pSets)->pSids = NULL;
-    tfree(*pSets);
-  }
-}
-
-void tTagsPrints(SMeterSidExtInfo *pMeterInfo, tTagSchema *pSchema, tOrderIdx *pOrder) {
-  if (pSchema == NULL) {
-    return;
-  }
-
-  printf("sid: %-5d tags(", pMeterInfo->sid);
-
-  for (int32_t i = 0; i < pOrder->numOfOrderedCols; ++i) {
-    int32_t colIndex = pOrder->pData[i];
-
-    // it is the tbname column
-    if (colIndex == -1) {
-      printf("%s, ", pMeterInfo->tags);
-      continue;
-    }
-
-    switch (pSchema->pSchema[colIndex].type) {
-      case TSDB_DATA_TYPE_INT:
-        printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int32_t));
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        printf("%lf, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, double));
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        printf("%f, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, float));
-        break;
-      case TSDB_DATA_TYPE_BIGINT:
-        printf("%" PRId64 ", ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int64_t));
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int16_t));
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-        printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int8_t));
-        break;
-      case TSDB_DATA_TYPE_BINARY:
-        printf("%s, ", GET_TAG_VAL_POINTER(pMeterInfo, colIndex, pSchema, char));
-        break;
-      case TSDB_DATA_TYPE_NCHAR: {
-        char *data = GET_TAG_VAL_POINTER(pMeterInfo, colIndex, pSchema, char);
-        char  buffer[512] = {0};
-
-        taosUcs4ToMbs(data, pSchema->pSchema[colIndex].bytes, buffer);
-        printf("%s, ", buffer);
-        break;
-      }
-      case TSDB_DATA_TYPE_BOOL:
-        printf("%d, ", GET_TAG_VAL(pMeterInfo, colIndex, pSchema, int8_t));
-        break;
-
-      default:
-        assert(false);
-    }
-  }
-  printf(")\n");
-}
-
-/*
- * display all the subset groups for debug purpose only
- */
-static void UNUSED_FUNC tSidSetDisplay(tSidSet *pSets) {
-  printf("%d meters.\n", pSets->numOfSids);
-  for (int32_t i = 0; i < pSets->numOfSids; ++i) {
-    printf("%d\t", pSets->pSids[i]->sid);
-  }
-  printf("\n");
-
-  printf("total number of subset group is: %d\n", pSets->numOfSubSet);
-  for (int32_t i = 0; i < pSets->numOfSubSet; ++i) {
-    int32_t s = pSets->starterPos[i];
-    int32_t e = pSets->starterPos[i + 1];
-
-    printf("the %d-th subgroup: \n", i + 1);
-    for (int32_t j = s; j < e; ++j) {
-      tTagsPrints(pSets->pSids[j], pSets->pTagSchema, &pSets->orderIdx);
-    }
-  }
-}
-
-void tSidSetSort(tSidSet *pSets) {
-  pTrace("number of meters in sort: %d", pSets->numOfSids);
-  tOrderIdx *pOrderIdx = &pSets->orderIdx;
-
-  if (pOrderIdx->numOfOrderedCols == 0 || pSets->numOfSids <= 1 || pSets->pTagSchema == NULL) { // no group by tags clause
-    pSets->numOfSubSet = 1;
-    pSets->starterPos = (int32_t *)malloc(sizeof(int32_t) * (pSets->numOfSubSet + 1));
-    pSets->starterPos[0] = 0;
-    pSets->starterPos[1] = pSets->numOfSids;
-    pTrace("all meters belong to one subgroup, no need to subgrouping ops");
-#ifdef _DEBUG_VIEW
-    tSidSetDisplay(pSets);
-#endif
-  } else {
-    tOrderDescriptor *descriptor =
-        (tOrderDescriptor *)calloc(1, sizeof(tOrderDescriptor) + sizeof(int16_t) * pSets->orderIdx.numOfOrderedCols);
-    descriptor->pTagSchema = pSets->pTagSchema;
-    descriptor->orderIdx = pSets->orderIdx;
-
-    memcpy(descriptor->orderIdx.pData, pOrderIdx->pData, sizeof(int16_t) * pSets->orderIdx.numOfOrderedCols);
-
-    tQSortEx((void **)pSets->pSids, POINTER_BYTES, 0, pSets->numOfSids - 1, descriptor, meterSidComparator);
-    pSets->starterPos =
-        calculateSubGroup((void **)pSets->pSids, pSets->numOfSids, &pSets->numOfSubSet, descriptor, meterSidComparator);
-
-#ifdef _DEBUG_VIEW
-    tSidSetDisplay(pSets);
-#endif
-    tfree(descriptor);
-  }
-}
diff --git a/src/system/detail/src/vnodeUtil.c b/src/system/detail/src/vnodeUtil.c
deleted file mode 100644
index c9d7ca0cf42d099c3e30906992084841950c6ef1..0000000000000000000000000000000000000000
--- a/src/system/detail/src/vnodeUtil.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-
-#include "tast.h"
-#include "tscUtil.h"
-#include "tschemautil.h"
-#include "vnode.h"
-#include "vnodeDataFilterFunc.h"
-#include "vnodeUtil.h"
-#include "vnodeStatus.h"
-
-int vnodeCheckFileIntegrity(FILE* fp) {
-  /*
-    int savedSessions, savedMeterSize;
-
-    fseek(fp, TSDB_FILE_HEADER_LEN/3, SEEK_SET);
-    fscanf(fp, "%d %d", &savedSessions, &savedMeterSize);
-    if ( (savedSessions != tsSessionsPerVnode) || (savedMeterSize != tsMeterSizeOnFile) ) {
-      dError("file structure is changed");
-      return -1;
-
-    }
-
-    uint64_t checkSum = 0, savedCheckSum=0;
-    checkSum = taosGetCheckSum(fp, TSDB_FILE_HEADER_LEN);
-
-    fseek(fp, TSDB_FILE_HEADER_LEN - cksumsize, SEEK_SET);
-    fread(&savedCheckSum, cksumsize, 1, fp);
-
-    if ( savedCheckSum != checkSum ) {
-      dError("check sum is not matched:0x%x 0x%x", checkSum, savedCheckSum);
-      return -1;
-    }
-  */
-  return 0;
-}
-
-void vnodeCreateFileHeaderFd(int fd) {
-  char temp[TSDB_FILE_HEADER_LEN / 4];
-  int  lineLen;
-
-  lineLen = sizeof(temp);
-
-  // write the first line`
-  memset(temp, 0, lineLen);
-  *(int16_t*)temp = vnodeFileVersion;
-  sprintf(temp + sizeof(int16_t), "tsdb version: %s\n", version);
-  /* *((int16_t *)(temp + TSDB_FILE_HEADER_LEN/8)) = vnodeFileVersion; */
-  lseek(fd, 0, SEEK_SET);
-  twrite(fd, temp, lineLen);
-
-  // second line
-  memset(temp, 0, lineLen);
-  twrite(fd, temp, lineLen);
-
-  // the third/forth line is the dynamic info
-  memset(temp, 0, lineLen);
-  twrite(fd, temp, lineLen);
-  twrite(fd, temp, lineLen);
-}
-
-void vnodeGetHeadFileHeaderInfo(int fd, SVnodeHeadInfo* pHeadInfo) {
-  lseek(fd, TSDB_FILE_HEADER_LEN / 4, SEEK_SET);
-  read(fd, pHeadInfo, sizeof(SVnodeHeadInfo));
-}
-
-void vnodeUpdateHeadFileHeader(int fd, SVnodeHeadInfo* pHeadInfo) {
-  lseek(fd, TSDB_FILE_HEADER_LEN / 4, SEEK_SET);
-  twrite(fd, pHeadInfo, sizeof(SVnodeHeadInfo));
-}
-
-void vnodeCreateFileHeader(FILE* fp) {
-  char temp[TSDB_FILE_HEADER_LEN / 4];
-  int  lineLen;
-
-  lineLen = sizeof(temp);
-
-  // write the first line
-  memset(temp, 0, lineLen);
-  *(int16_t*)temp = vnodeFileVersion;
-  sprintf(temp + sizeof(int16_t), "tsdb version: %s\n", version);
-  /* *((int16_t *)(temp + TSDB_FILE_HEADER_LEN/8)) = vnodeFileVersion; */
-  fseek(fp, 0, SEEK_SET);
-  fwrite(temp, lineLen, 1, fp);
-
-  // second line
-  memset(temp, 0, lineLen);
-  fwrite(temp, lineLen, 1, fp);
-
-  // the third line is the dynamic info
-  memset(temp, 0, lineLen);
-  fwrite(temp, lineLen, 1, fp);
-  fwrite(temp, lineLen, 1, fp);
-}
-
-SSqlGroupbyExpr* vnodeCreateGroupbyExpr(SQueryMeterMsg* pQueryMsg, int32_t* code) {
-  if (pQueryMsg->numOfGroupCols == 0) {
-    return NULL;
-  }
-
-  // using group by tag columns
-  SSqlGroupbyExpr* pGroupbyExpr =
-      (SSqlGroupbyExpr*)malloc(sizeof(SSqlGroupbyExpr) + pQueryMsg->numOfGroupCols * sizeof(SColIndexEx));
-  if (pGroupbyExpr == NULL) {
-    *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    return NULL;
-  }
-
-  SColIndexEx* pGroupbyColInfo = (SColIndexEx*)pQueryMsg->groupbyTagIds;
-
-  pGroupbyExpr->numOfGroupCols = pQueryMsg->numOfGroupCols;
-  pGroupbyExpr->orderType = pQueryMsg->orderType;
-  pGroupbyExpr->orderIndex = pQueryMsg->orderByIdx;
-
-  memcpy(pGroupbyExpr->columnInfo, pGroupbyColInfo, sizeof(SColIndexEx) * pGroupbyExpr->numOfGroupCols);
-
-  // TODO: update the colIndexInBuf for each column in group by clause
-
-  return pGroupbyExpr;
-}
-
-static SSchema* toSchema(SQueryMeterMsg* pQuery, SColumnInfo* pCols, int32_t numOfCols) {
-  char* start = (char*)pQuery->colNameList;
-  char* end = start;
-
-  SSchema* pSchema = calloc(1, sizeof(SSchema) * numOfCols);
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    pSchema[i].type = pCols[i].type;
-    pSchema[i].bytes = pCols[i].bytes;
-    pSchema[i].colId = pCols[i].colId;
-
-    end = strstr(start, ",");
-    memcpy(pSchema[i].name, start, end - start);
-    start = end + 1;
-  }
-
-  return pSchema;
-}
-
-static int32_t id_compar(const void* left, const void* right) {
-  DEFAULT_COMP(GET_INT16_VAL(left), GET_INT16_VAL(right));
-}
-
-static int32_t vnodeBuildExprFromArithmeticStr(SSqlFunctionExpr* pExpr, SQueryMeterMsg* pQueryMsg) {
-  SSqlBinaryExprInfo* pBinaryExprInfo = &pExpr->pBinExprInfo;
-  SColumnInfo*   pColMsg = pQueryMsg->colList;
-
-  tSQLBinaryExpr* pBinExpr = NULL;
-  SSchema*        pSchema = toSchema(pQueryMsg, pColMsg, pQueryMsg->numOfCols);
-
-  dTrace("qmsg:%p create binary expr from string:%s", pQueryMsg, pExpr->pBase.arg[0].argValue.pz);
-  tSQLBinaryExprFromString(&pBinExpr, pSchema, pQueryMsg->numOfCols, pExpr->pBase.arg[0].argValue.pz,
-                           pExpr->pBase.arg[0].argBytes);
-
-  if (pBinExpr == NULL) {
-    dError("qmsg:%p failed to create arithmetic expression string from:%s", pQueryMsg, pExpr->pBase.arg[0].argValue.pz);
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  pBinaryExprInfo->pBinExpr = pBinExpr;
-
-  int32_t num = 0;
-  int16_t ids[TSDB_MAX_COLUMNS] = {0};
-
-  tSQLBinaryExprTrv(pBinExpr, &num, ids);
-  qsort(ids, num, sizeof(int16_t), id_compar);
-
-  int32_t i = 0, j = 0;
-
-  while (i < num && j < num) {
-    if (ids[i] == ids[j]) {
-      j++;
-    } else {
-      ids[++i] = ids[j++];
-    }
-  }
-  assert(i <= num);
-
-  // there may be duplicated referenced columns.
-  num = i + 1;
-  pBinaryExprInfo->pReqColumns = malloc(sizeof(SColIndexEx) * num);
-
-  for (int32_t k = 0; k < num; ++k) {
-    SColIndexEx* pColIndex = &pBinaryExprInfo->pReqColumns[k];
-    pColIndex->colId = ids[k];
-  }
-
-  pBinaryExprInfo->numOfCols = num;
-  free(pSchema);
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getColumnIndexInSource(SQueryMeterMsg* pQueryMsg, SSqlFuncExprMsg* pExprMsg) {
-  int32_t j = 0;
-
-  while(j < pQueryMsg->numOfCols) {
-    if (pExprMsg->colInfo.colId == pQueryMsg->colList[j].colId) {
-      break;
-    }
-
-    j += 1;
-  }
-
-  return j;
-}
-
-bool vnodeValidateExprColumnInfo(SQueryMeterMsg* pQueryMsg, SSqlFuncExprMsg* pExprMsg) {
-  int32_t j = getColumnIndexInSource(pQueryMsg, pExprMsg);
-  return j < pQueryMsg->numOfCols;
-}
-
-SSqlFunctionExpr* vnodeCreateSqlFunctionExpr(SQueryMeterMsg* pQueryMsg, int32_t* code) {
-  SSqlFunctionExpr* pExprs = (SSqlFunctionExpr*)calloc(1, sizeof(SSqlFunctionExpr) * pQueryMsg->numOfOutputCols);
-  if (pExprs == NULL) {
-    tfree(pQueryMsg->pSqlFuncExprs);
-
-    *code = TSDB_CODE_SERV_OUT_OF_MEMORY;
-    return NULL;
-  }
-
-  bool isSuperTable = QUERY_IS_STABLE_QUERY(pQueryMsg->queryType);
-  int16_t tagLen = 0;
-
-  SSchema* pTagSchema = (SSchema*)pQueryMsg->pTagSchema;
-  for (int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
-    pExprs[i].pBase = *((SSqlFuncExprMsg**)pQueryMsg->pSqlFuncExprs)[i];
-    pExprs[i].resBytes = 0;
-
-    int16_t type = 0;
-    int16_t bytes = 0;
-
-    SColIndexEx* pColumnIndexExInfo = &pExprs[i].pBase.colInfo;
-
-    // tag column schema is kept in pQueryMsg->pTagSchema
-    if (TSDB_COL_IS_TAG(pColumnIndexExInfo->flag)) {
-      if (pColumnIndexExInfo->colIdx >= pQueryMsg->numOfTagsCols) {
-        *code = TSDB_CODE_INVALID_QUERY_MSG;
-        tfree(pExprs);
-        return NULL;
-      }
-
-      type = pTagSchema[pColumnIndexExInfo->colIdx].type;
-      bytes = pTagSchema[pColumnIndexExInfo->colIdx].bytes;
-
-    } else { // parse the arithmetic expression
-      if (pExprs[i].pBase.functionId == TSDB_FUNC_ARITHM) {
-        *code = vnodeBuildExprFromArithmeticStr(&pExprs[i], pQueryMsg);
-
-        if (*code != TSDB_CODE_SUCCESS) {
-          tfree(pExprs);
-          return NULL;
-        }
-
-        type = TSDB_DATA_TYPE_DOUBLE;
-        bytes = tDataTypeDesc[type].nSize;
-      } else { // parse the normal column
-        int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].pBase);
-        assert(j < pQueryMsg->numOfCols);
-
-        SColumnInfo* pCol = &pQueryMsg->colList[j];
-        type = pCol->type;
-        bytes = pCol->bytes;
-      }
-    }
-
-    int32_t param = pExprs[i].pBase.arg[0].argValue.i64;
-    if (getResultDataInfo(type, bytes, pExprs[i].pBase.functionId, param, &pExprs[i].resType, &pExprs[i].resBytes,
-                  &pExprs[i].interResBytes, 0, isSuperTable) != TSDB_CODE_SUCCESS) {
-      *code = TSDB_CODE_INVALID_QUERY_MSG;
-      return NULL;
-    }
-
-    if (pExprs[i].pBase.functionId == TSDB_FUNC_TAG_DUMMY || pExprs[i].pBase.functionId == TSDB_FUNC_TS_DUMMY) {
-      tagLen += pExprs[i].resBytes;
-    }
-    assert(isValidDataType(pExprs[i].resType, pExprs[i].resBytes));
-  }
-
-  //get the correct result size for top/bottom query, according to the number of tags columns in selection clause
-
-  // TODO refactor
-  for(int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
-    pExprs[i].pBase = *((SSqlFuncExprMsg**)pQueryMsg->pSqlFuncExprs)[i];
-    int16_t functId = pExprs[i].pBase.functionId;
-    if (functId == TSDB_FUNC_TOP || functId == TSDB_FUNC_BOTTOM) {
-      int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].pBase);
-      assert(j < pQueryMsg->numOfCols);
-
-      SColumnInfo* pCol = &pQueryMsg->colList[j];
-      int16_t type = pCol->type;
-      int16_t bytes = pCol->bytes;
-
-      int32_t ret = getResultDataInfo(type, bytes, pExprs[i].pBase.functionId, pExprs[i].pBase.arg[0].argValue.i64,
-                                      &pExprs[i].resType, &pExprs[i].resBytes, &pExprs[i].interResBytes, tagLen, isSuperTable);
-      assert(ret == TSDB_CODE_SUCCESS);
-    }
-  }
-
-  tfree(pQueryMsg->pSqlFuncExprs);
-  return pExprs;
-}
-
-bool vnodeIsValidVnodeCfg(SVnodeCfg* pCfg) {
-  if (pCfg == NULL) return false;
-
-  if (pCfg->maxSessions <= 0 || pCfg->cacheBlockSize <= 0 || pCfg->replications <= 0 || pCfg->replications > 20 ||
-      pCfg->daysPerFile <= 0 || pCfg->daysToKeep <= 0) {
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * compare if schema of two tables are identical.
- * when multi-table query is issued, the schemas of all requested tables
- * should be identical. Otherwise,query process will abort.
- */
-bool vnodeMeterSchemaIdentical(SColumn* pSchema1, int32_t numOfCols1, SColumn* pSchema2, int32_t numOfCols2) {
-  if (!VALIDNUMOFCOLS(numOfCols1) || !VALIDNUMOFCOLS(numOfCols2) || numOfCols1 != numOfCols2) {
-    return false;
-  }
-
-  return memcmp((char*)pSchema1, (char*)pSchema2, sizeof(SColumn) * numOfCols1) == 0;
-}
-
-void vnodeFreeFields(SQuery* pQuery) {
-  if (pQuery == NULL || pQuery->pFields == NULL) {
-    return;
-  }
-
-  for (int32_t i = 0; i < pQuery->numOfBlocks; ++i) {
-    tfree(pQuery->pFields[i]);
-  }
-
-  /*
-   * pQuery->pFields does not need to be released, it is allocated at the last part of pBlock
-   * so free(pBlock) can release this memory at the same time.
-   */
-  pQuery->pFields = NULL;
-  pQuery->numOfBlocks = 0;
-}
-
-void vnodeUpdateFilterColumnIndex(SQuery* pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfFilterCols; ++i) {
-    for (int16_t j = 0; j < pQuery->numOfCols; ++j) {
-      if (pQuery->pFilterInfo[i].info.data.colId == pQuery->colList[j].data.colId) {
-        pQuery->pFilterInfo[i].info.colIdx = pQuery->colList[j].colIdx;
-        pQuery->pFilterInfo[i].info.colIdxInBuf = pQuery->colList[j].colIdxInBuf;
-
-        // supplementary scan is also require this column
-        pQuery->colList[j].req[1] = 1;
-        break;
-      }
-    }
-  }
-
-  // set the column index in buffer for arithmetic operation
-  if (pQuery->pSelectExpr != NULL) {
-    for (int32_t i = 0; i < pQuery->numOfOutputCols; ++i) {
-      SSqlBinaryExprInfo* pBinExprInfo = &pQuery->pSelectExpr[i].pBinExprInfo;
-      if (pBinExprInfo->pBinExpr != NULL) {
-        for (int16_t j = 0; j < pBinExprInfo->numOfCols; ++j) {
-          for (int32_t k = 0; k < pQuery->numOfCols; ++k) {
-            if (pBinExprInfo->pReqColumns[j].colId == pQuery->colList[k].data.colId) {
-              pBinExprInfo->pReqColumns[j].colIdxInBuf = pQuery->colList[k].colIdxInBuf;
-              assert(pQuery->colList[k].colIdxInBuf == k);
-              break;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-// TODO support k<12 and k<>9
-int32_t vnodeCreateFilterInfo(void* pQInfo, SQuery* pQuery) {
-  for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
-    if (pQuery->colList[i].data.numOfFilters > 0) {
-      pQuery->numOfFilterCols++;
-    }
-  }
-
-  if (pQuery->numOfFilterCols == 0) {
-    return TSDB_CODE_SUCCESS;
-  }
-
-  pQuery->pFilterInfo = calloc(1, sizeof(SSingleColumnFilterInfo) * pQuery->numOfFilterCols);
-
-  for (int32_t i = 0, j = 0; i < pQuery->numOfCols; ++i) {
-    if (pQuery->colList[i].data.numOfFilters > 0) {
-      SSingleColumnFilterInfo* pFilterInfo = &pQuery->pFilterInfo[j];
-
-      memcpy(&pFilterInfo->info, &pQuery->colList[i], sizeof(SColumnInfoEx));
-      pFilterInfo->info.data.filters = NULL;
-
-      pFilterInfo->numOfFilters = pQuery->colList[i].data.numOfFilters;
-      pFilterInfo->pFilters = calloc(pFilterInfo->numOfFilters, sizeof(SColumnFilterElem));
-
-      for(int32_t f = 0; f < pFilterInfo->numOfFilters; ++f) {
-        SColumnFilterElem *pSingleColFilter = &pFilterInfo->pFilters[f];
-        pSingleColFilter->filterInfo = pQuery->colList[i].data.filters[f];
-
-        int32_t lower = pSingleColFilter->filterInfo.lowerRelOptr;
-        int32_t upper = pSingleColFilter->filterInfo.upperRelOptr;
-
-        if (lower == TSDB_RELATION_INVALID && upper == TSDB_RELATION_INVALID) {
-          dError("QInfo:%p invalid filter info", pQInfo);
-          return TSDB_CODE_INVALID_QUERY_MSG;
-        }
-
-        int16_t type = pQuery->colList[i].data.type;
-        int16_t bytes = pQuery->colList[i].data.bytes;
-
-        __filter_func_t *rangeFilterArray = vnodeGetRangeFilterFuncArray(type);
-        __filter_func_t *filterArray = vnodeGetValueFilterFuncArray(type);
-
-        if (rangeFilterArray == NULL && filterArray == NULL) {
-          dError("QInfo:%p failed to get filter function, invalid data type:%d", pQInfo, type);
-          return TSDB_CODE_INVALID_QUERY_MSG;
-        }
-
-        if ((lower == TSDB_RELATION_LARGE_EQUAL || lower == TSDB_RELATION_LARGE) &&
-            (upper == TSDB_RELATION_LESS_EQUAL || upper == TSDB_RELATION_LESS)) {
-          if (lower == TSDB_RELATION_LARGE_EQUAL) {
-            if (upper == TSDB_RELATION_LESS_EQUAL) {
-              pSingleColFilter->fp = rangeFilterArray[4];
-            } else {
-              pSingleColFilter->fp = rangeFilterArray[2];
-            }
-          } else {
-            if (upper == TSDB_RELATION_LESS_EQUAL) {
-              pSingleColFilter->fp = rangeFilterArray[3];
-            } else {
-              pSingleColFilter->fp = rangeFilterArray[1];
-            }
-          }
-        } else {  // set callback filter function
-          if (lower != TSDB_RELATION_INVALID) {
-            pSingleColFilter->fp = filterArray[lower];
-
-            if (upper != TSDB_RELATION_INVALID) {
-              dError("pQInfo:%p failed to get filter function, invalid filter condition", pQInfo, type);
-              return TSDB_CODE_INVALID_QUERY_MSG;
-            }
-          } else {
-            pSingleColFilter->fp = filterArray[upper];
-          }
-        }
-        assert (pSingleColFilter->fp != NULL);
-        pSingleColFilter->bytes = bytes;
-      }
-
-      j++;
-    }
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-bool vnodeDoFilterData(SQuery* pQuery, int32_t elemPos) {
-  for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
-    SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
-    char* pElem = pFilterInfo->pData + pFilterInfo->info.data.bytes * elemPos;
-
-    if(isNull(pElem, pFilterInfo->info.data.type)) {
-      return false;
-    }
-
-    int32_t num = pFilterInfo->numOfFilters;
-    bool qualified = false;
-    for(int32_t j = 0; j < num; ++j) {
-      SColumnFilterElem* pFilterElem = &pFilterInfo->pFilters[j];
-      if (pFilterElem->fp(pFilterElem, pElem, pElem)) {
-        qualified = true;
-        break;
-      }
-    }
-
-    if (!qualified) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool vnodeFilterData(SQuery* pQuery, int32_t* numOfActualRead, int32_t index) {
-  (*numOfActualRead)++;
-  if (!vnodeDoFilterData(pQuery, index)) {
-    return false;
-  }
-
-  if (pQuery->limit.offset > 0) {
-    pQuery->limit.offset--;  // ignore this qualified row
-    return false;
-  }
-
-  return true;
-}
-
-bool vnodeIsProjectionQuery(SSqlFunctionExpr* pExpr, int32_t numOfOutput) {
-  for (int32_t i = 0; i < numOfOutput; ++i) {
-    if (pExpr[i].pBase.functionId != TSDB_FUNC_PRJ) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/*
- * the pMeter->state may be changed by vnodeIsSafeToDeleteMeter and import/update processor, the check of
- * the state will not always be correct.
- *
- * The import/update/deleting is actually blocked by current query processing if the check of meter state is
- * passed, but later queries are denied.
- *
- * 1. vnodeIsSafeToDelete will wait for this complete, since it also use the vmutex to check the numOfQueries
- * 2. import will check the numOfQueries again after setting state to be TSDB_METER_STATE_IMPORTING, while the
- *    vmutex is also used.
- * 3. insert has nothing to do with the query processing.
- */
-int32_t vnodeIncQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterSidExtInfo** pSids, SMeterObj** pMeterObjList,
-                              int32_t* numOfIncTables) {
-  SVnodeObj* pVnode = &vnodeList[pQueryMsg->vnode];
-
-  int32_t num = 0;
-  int32_t index = 0;
-  
-  int32_t code = TSDB_CODE_SUCCESS;
-
-  for (int32_t i = 0; i < pQueryMsg->numOfSids; ++i) {
-    SMeterObj* pMeter = pVnode->meterList[pSids[i]->sid];
-
-    /*
-     * If table is missing or is in dropping status, config it from management node, and ignore it
-     * during query processing. The error code of TSDB_CODE_NOT_ACTIVE_TABLE will never return to client.
-     * The missing table needs to be removed from pSids list
-     */
-    if (pMeter == NULL || vnodeIsMeterState(pMeter, TSDB_METER_STATE_DROPPING)) {
-      dWarn("qmsg:%p, vid:%d sid:%d, not there or will be dropped, ignore this table in query", pQueryMsg,
-          pQueryMsg->vnode, pSids[i]->sid);
-      
-      vnodeSendMeterCfgMsg(pQueryMsg->vnode, pSids[i]->sid);
-      continue;
-    } else if (pMeter->uid != pSids[i]->uid || pMeter->sid != pSids[i]->sid) {
-      code = TSDB_CODE_TABLE_ID_MISMATCH;
-      dError("qmsg:%p, vid:%d sid:%d id:%s uid:%" PRIu64 ", id mismatch. sid:%d uid:%" PRId64 " in msg", pQueryMsg,
-          pQueryMsg->vnode, pMeter->sid, pMeter->meterId, pMeter->uid, pSids[i]->sid, pSids[i]->uid);
-      
-      vnodeSendMeterCfgMsg(pQueryMsg->vnode, pSids[i]->sid);
-      continue;
-    } else if (pMeter->state > TSDB_METER_STATE_INSERTING) { //update or import
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-      dTrace("qmsg:%p, vid:%d sid:%d id:%s, it is in state:%s, wait!", pQueryMsg, pQueryMsg->vnode, pSids[i]->sid,
-             pMeter->meterId, taosGetTableStatusStr(pMeter->state));
-      continue;
-    }
-    
-    /*
-     * vnodeIsSafeToDeleteMeter will wait for this function complete, and then it can
-     * check if the numOfQueries is 0 or not.
-     */
-    pMeterObjList[(*numOfIncTables)++] = pMeter;
-    atomic_fetch_add_32(&pMeter->numOfQueries, 1);
-    
-    pSids[index++] = pSids[i];
-    
-    // output for meter more than one query executed
-    if (pMeter->numOfQueries > 1) {
-      dTrace("qmsg:%p, vid:%d sid:%d id:%s, inc query ref, numOfQueries:%d", pQueryMsg, pMeter->vnode, pMeter->sid,
-             pMeter->meterId, pMeter->numOfQueries);
-      num++;
-    }
-  }
-
-  dTrace("qmsg:%p, query meters: %d, inc query ref %d, numOfQueries on %d meters are 1, queried meters:%d after "
-         "filter missing meters", pQueryMsg, pQueryMsg->numOfSids, *numOfIncTables, (*numOfIncTables) - num, index);
-
-  assert(pQueryMsg->numOfSids >= (*numOfIncTables) && pQueryMsg->numOfSids >= index);
-  
-  pQueryMsg->numOfSids = index;
-  return code;
-}
-
-void vnodeDecQueryRefCount(SQueryMeterMsg* pQueryMsg, SMeterObj** pMeterObjList, int32_t numOfIncTables) {
-  int32_t num = 0;
-
-  for (int32_t i = 0; i < numOfIncTables; ++i) {
-    SMeterObj* pMeter = pMeterObjList[i];
-
-    if (pMeter != NULL) {  // here, do not need to lock to perform operations
-      atomic_fetch_sub_32(&pMeter->numOfQueries, 1);
-
-      if (pMeter->numOfQueries > 0) {
-        dTrace("qmsg:%p, vid:%d sid:%d id:%s dec query ref, numOfQueries:%d", pQueryMsg, pMeter->vnode, pMeter->sid,
-               pMeter->meterId, pMeter->numOfQueries);
-        num++;
-      }
-    }
-  }
-
-  dTrace("qmsg:%p, dec query ref for %d meters, numOfQueries on %d meters are 0", pQueryMsg, numOfIncTables, numOfIncTables - num);
-}
-
-void vnodeUpdateQueryColumnIndex(SQuery* pQuery, SMeterObj* pMeterObj) {
-  if (pQuery == NULL || pMeterObj == NULL) {
-    return;
-  }
-
-  int32_t i = 0, j = 0;
-  while (i < pQuery->numOfCols && j < pMeterObj->numOfColumns) {
-    if (pQuery->colList[i].data.colId == pMeterObj->schema[j].colId) {
-      pQuery->colList[i++].colIdx = (int16_t)j++;
-    } else if (pQuery->colList[i].data.colId < pMeterObj->schema[j].colId) {
-      pQuery->colList[i++].colIdx = -1;
-    } else if (pQuery->colList[i].data.colId > pMeterObj->schema[j].colId) {
-      j++;
-    }
-  }
-
-  while (i < pQuery->numOfCols) {
-    pQuery->colList[i++].colIdx = -1;  // not such column in current meter
-  }
-
-  // sql expression has not been created yet
-  if (pQuery->pSelectExpr == NULL) {
-    return;
-  }
-
-  for(int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
-    SSqlFuncExprMsg* pSqlExprMsg = &pQuery->pSelectExpr[k].pBase;
-    if (pSqlExprMsg->functionId == TSDB_FUNC_ARITHM || pSqlExprMsg->colInfo.flag == TSDB_COL_TAG) {
-      continue;
-    }
-
-    SColIndexEx* pColIndexEx = &pSqlExprMsg->colInfo;
-    for(int32_t f = 0; f < pQuery->numOfCols; ++f) {
-      if (pColIndexEx->colId == pQuery->colList[f].data.colId) {
-        pColIndexEx->colIdx = pQuery->colList[f].colIdx;
-        break;
-      }
-    }
-  }
-}
-
-int32_t vnodeSetMeterState(SMeterObj* pMeterObj, int32_t state) {
-  return atomic_val_compare_exchange_32(&pMeterObj->state, TSDB_METER_STATE_READY, state);
-}
-
-void vnodeClearMeterState(SMeterObj* pMeterObj, int32_t state) {
-  pMeterObj->state &= (~state);
-}
-
-bool vnodeIsMeterState(SMeterObj* pMeterObj, int32_t state) {
-  if (state == TSDB_METER_STATE_READY) {
-    return pMeterObj->state == TSDB_METER_STATE_READY;
-  } else if (state == TSDB_METER_STATE_DROPPING) {
-    return pMeterObj->state >= state;
-  } else {
-    return (((pMeterObj->state) & state) == state);
-  }
-}
-
-void vnodeSetMeterDeleting(SMeterObj* pMeterObj) {
-  if (pMeterObj == NULL) {
-    return;
-  }
-
-  pMeterObj->state |= TSDB_METER_STATE_DROPPING;
-}
-
-int32_t vnodeSetMeterInsertImportStateEx(SMeterObj* pObj, int32_t st) {
-  int32_t code = TSDB_CODE_SUCCESS;
-  
-  int32_t state = vnodeSetMeterState(pObj, st);
-  if (state != TSDB_METER_STATE_READY) {//return to denote import is not performed
-    if (vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPING)) {
-      dTrace("vid:%d sid:%d id:%s, meter is deleted, state:%d", pObj->vnode, pObj->sid, pObj->meterId,
-             pObj->state);
-      code = TSDB_CODE_NOT_ACTIVE_TABLE;
-    } else {// waiting for 300ms by default and try again
-      dTrace("vid:%d sid:%d id:%s, try submit again since in state:%d", pObj->vnode, pObj->sid,
-             pObj->meterId, pObj->state);
-      
-      code = TSDB_CODE_ACTION_IN_PROGRESS;
-    }
-  }
-  
-  return code;
-}
-
-bool vnodeIsSafeToDeleteMeter(SVnodeObj* pVnode, int32_t sid) {
-  SMeterObj* pObj = pVnode->meterList[sid];
-
-  if (pObj == NULL || vnodeIsMeterState(pObj, TSDB_METER_STATE_DROPPED)) {
-    return true;
-  }
-
-  int32_t prev = vnodeSetMeterState(pObj, TSDB_METER_STATE_DROPPING);
-
-  /*
-   * if the meter is not in ready/deleting state, it must be in insert/import/update,
-   * set the deleting state and wait the procedure to be completed
-   */
-  if (prev != TSDB_METER_STATE_READY && prev < TSDB_METER_STATE_DROPPING) {
-    vnodeSetMeterDeleting(pObj);
-
-    dWarn("vid:%d sid:%d id:%s, can not be deleted, state:%d, wait", pObj->vnode, pObj->sid, pObj->meterId, prev);
-    return false;
-  }
-
-  bool ready = true;
-
-  /*
-   * the query will be stopped ASAP, since the state of meter is set to TSDB_METER_STATE_DROPPING,
-   * and new query will abort since the meter is deleted.
-   */
-  pthread_mutex_lock(&pVnode->vmutex);
-  if (pObj->numOfQueries > 0) {
-    dWarn("vid:%d sid:%d id:%s %d queries executing on it, wait query to be finished",
-          pObj->vnode, pObj->sid, pObj->meterId, pObj->numOfQueries);
-    ready = false;
-  }
-  pthread_mutex_unlock(&pVnode->vmutex);
-
-  return ready;
-}
-
-void vnodeFreeColumnInfo(SColumnInfo* pColumnInfo) {
-  if (pColumnInfo == NULL) {
-    return;
-  }
-
-  if (pColumnInfo->numOfFilters > 0) {
-    if (pColumnInfo->type == TSDB_DATA_TYPE_BINARY) {
-      for (int32_t i = 0; i < pColumnInfo->numOfFilters; ++i) {
-        tfree(pColumnInfo->filters[i].pz);
-        pColumnInfo->filters[i].len = 0;
-      }
-    }
-
-    tfree(pColumnInfo->filters);
-  }
-}
diff --git a/src/system/lite/CMakeLists.txt b/src/system/lite/CMakeLists.txt
deleted file mode 100644
index a22ed60563e5a237d060abfc46dc9fa87e546a87..0000000000000000000000000000000000000000
--- a/src/system/lite/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/system/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
-  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-
-  AUX_SOURCE_DIRECTORY(./src SRC)
-  ADD_LIBRARY(taosd_lite ${SRC})
-ENDIF ()
diff --git a/src/system/lite/src/dnodeMgmt.spec.c b/src/system/lite/src/dnodeMgmt.spec.c
deleted file mode 100644
index 576dbcb337b329571296d331e043e2ab1bc8d92c..0000000000000000000000000000000000000000
--- a/src/system/lite/src/dnodeMgmt.spec.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "tsched.h"
-#include "vnode.h"
-#include "vnodeMgmt.h"
-
-void*vnodeProcessMsgFromMgmt(char *content, int msgLen, int msgType, SMgmtObj *pObj);
-void mgmtProcessMsgFromDnodeSpec(SSchedMsg *sched);
-
-char *taosBuildRspMsgToMnodeWithSize(SMgmtObj *pObj, char type, int size) {
-  char *pStart = (char *)malloc(size);
-  if (pStart == NULL) {
-    return NULL;
-  }
-
-  *pStart = type;
-  return pStart + 1;
-}
-
-char *taosBuildReqMsgToMnodeWithSize(SMgmtObj *pObj, char type, int size) {
-  char *pStart = (char *)malloc(size);
-  if (pStart == NULL) {
-    return NULL;
-  }
-
-  *pStart = type;
-  return pStart + 1;
-}
-
-char *taosBuildRspMsgToMnode(SMgmtObj *pObj, char type) {
-  return taosBuildRspMsgToMnodeWithSize(pObj, type, 256);
-}
-
-char *taosBuildReqMsgToMnode(SMgmtObj *pObj, char type) {
-  return taosBuildReqMsgToMnodeWithSize(pObj, type, 256);
-}
-
-int taosSendMsgToMnode(SMgmtObj *pObj, char *msg, int msgLen) {
-  dTrace("msg:%s is sent to mnode", taosMsg[(uint8_t)(*(msg-1))]);
-
-  /*
-   * Lite version has no message header, so minus one
-   */
-  SSchedMsg schedMsg;
-  schedMsg.fp = mgmtProcessMsgFromDnodeSpec;
-  schedMsg.msg = msg - 1;
-  schedMsg.ahandle = NULL;
-  schedMsg.thandle = NULL;
-  taosScheduleTask(dmQhandle, &schedMsg);
-
-  return 0;
-}
-
-int taosSendSimpleRspToMnode(SMgmtObj *pObj, char rsptype, char code) {
-  char *pStart = taosBuildRspMsgToMnode(0, rsptype);
-  if (pStart == NULL) {
-    return 0;
-  }
-
-  *pStart = code;
-  taosSendMsgToMnode(0, pStart, code);
-
-  return 0;
-}
-
-void vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched) {
-  char  msgType = *sched->msg;
-  char *content = sched->msg + 1;
-
-  dTrace("msg:%s is received from mgmt", taosMsg[(uint8_t)msgType]);
-
-  vnodeProcessMsgFromMgmt(content, 0, msgType, 0);
-
-  free(sched->msg);
-}
-
-int vnodeInitMgmt() { return 0; }
-
-void vnodeInitMgmtIp() {}
-
-int vnodeSaveCreateMsgIntoQueue(SVnodeObj *pVnode, char *pMsg, int msgLen) { return 0; }
\ No newline at end of file
diff --git a/src/system/lite/src/dnodeSystem.spec.c b/src/system/lite/src/dnodeSystem.spec.c
deleted file mode 100644
index 7d6602c463ae43d77369469e00be716d145bbe09..0000000000000000000000000000000000000000
--- a/src/system/lite/src/dnodeSystem.spec.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "mgmt.h"
-#include "dnodeSystem.h"
-
-extern SModule tsModule[TSDB_MOD_MAX];
-
-int taosCreateTierDirectory() {
-  struct stat dirstat;
-  strcpy(tsDirectory, dataDir);
-  if (stat(dataDir, &dirstat) < 0) {
-    mkdir(dataDir, 0755);
-  }
-
-  char fileName[128];
-
-  sprintf(fileName, "%s/tsdb", tsDirectory);
-  mkdir(fileName, 0755);
-
-  sprintf(fileName, "%s/data", tsDirectory);
-  mkdir(fileName, 0755);
-
-  sprintf(mgmtDirectory, "%s/mgmt", tsDirectory);
-  sprintf(tsDirectory, "%s/tsdb", dataDir);
-  dnodeCheckDbRunning(dataDir);
-
-  return 0;
-}
-
-int dnodeInitSystemSpec() { return 0; }
-
-void dnodeStartModuleSpec() {
-  for (int mod = 1; mod < TSDB_MOD_MAX; ++mod) {
-    if (tsModule[mod].num != 0 && tsModule[mod].startFp) {
-      if ((*tsModule[mod].startFp)() != 0) {
-        dError("failed to start module:%d", mod);
-      }
-    }
-  }
-}
-
-void dnodeParseParameterK() {}
\ No newline at end of file
diff --git a/src/system/lite/src/mgmtAcct.spec.c b/src/system/lite/src/mgmtAcct.spec.c
deleted file mode 100644
index 81f83df98858055cde7da09e07edb077ab8f0014..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtAcct.spec.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "mgmt.h"
-
-extern void *userSdb;
-extern void *dbSdb;
-SAcctObj     acctObj;
-
-int mgmtInitAccts() { return 0; }
-
-void mgmtCreateRootAcct() {}
-
-SAcctObj *mgmtGetAcct(char *name) { return &acctObj; }
-
-int mgmtCheckUserLimit(SAcctObj *pAcct) {
-  int numOfUsers = sdbGetNumOfRows(userSdb);
-  if (numOfUsers >= tsMaxUsers) {
-    mWarn("numOfUsers:%d, exceed tsMaxUsers:%d", numOfUsers, tsMaxUsers);
-    return TSDB_CODE_TOO_MANY_USERS;
-  }
-  return 0;
-}
-
-int mgmtCheckDbLimit(SAcctObj *pAcct) {
-  int numOfDbs = sdbGetNumOfRows(dbSdb);
-  if (numOfDbs >= tsMaxDbs) {
-    mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs);
-    return TSDB_CODE_TOO_MANY_DATABSES;
-  }
-  return 0;
-}
-
-int mgmtCheckMeterLimit(SAcctObj *pAcct) { return 0; }
-
-int mgmtCheckUserGrant() { return 0; }
-
-int mgmtCheckDbGrant() { return 0; }
-
-int mgmtCheckMeterGrant() { return 0; }
-
-void grantAddTimeSeries(uint32_t timeSeriesNum) {}
-
-void mgmtCheckAcct() {
-  SAcctObj *pAcct = &acctObj;
-  pAcct->acctId = 0;
-  strcpy(pAcct->user, "root");
-
-  mgmtCreateUser(pAcct, "root", "taosdata");
-  mgmtCreateUser(pAcct, "monitor", tsInternalPass);
-  mgmtCreateUser(pAcct, "_root", tsInternalPass);
-}
-
-void mgmtCleanUpAccts() {}
-
-int mgmtGetAcctMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; }
-
-int mgmtRetrieveAccts(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; }
diff --git a/src/system/lite/src/mgmtBalance.spec.c b/src/system/lite/src/mgmtBalance.spec.c
deleted file mode 100644
index cf3e999e4f48c09df5da03d55b8084b0d1169168..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtBalance.spec.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "mgmtBalance.h"
-#include "vnodeStatus.h"
-
-void mgmtStartBalanceTimer(int64_t mseconds) {}
-
-int mgmtInitBalance() { return 0; }
-
-void mgmtCleanupBalance() {}
-
-int mgmtAllocVnodes(SVgObj *pVgroup) {
-  int        selectedVnode = -1;
-  SDnodeObj *pDnode = &dnodeObj;
-  int        lastAllocVode = pDnode->lastAllocVnode;
-
-  for (int i = 0; i < pDnode->numOfVnodes; i++) {
-    int vnode = (i + lastAllocVode) % pDnode->numOfVnodes;
-    if (pDnode->vload[vnode].vgId == 0 && pDnode->vload[vnode].status == TSDB_VN_STATUS_OFFLINE) {
-      selectedVnode = vnode;
-      break;
-    }
-  }
-
-  if (selectedVnode == -1) {
-    mError("vgroup:%d alloc vnode failed, free vnodes:%d", pVgroup->vgId, pDnode->numOfFreeVnodes);
-    return -1;
-  } else {
-    mTrace("vgroup:%d allocate vnode:%d, last allocated vnode:%d", pVgroup->vgId, selectedVnode, lastAllocVode);
-    pVgroup->vnodeGid[0].vnode = selectedVnode;
-    pDnode->lastAllocVnode = selectedVnode + 1;
-    if (pDnode->lastAllocVnode >= pDnode->numOfVnodes) pDnode->lastAllocVnode = 0;
-    return 0;
-  }
-}
-
-bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType) {
-  return tsModule[moduleType].num != 0;
-}
-
-char *mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode) { return "master"; }
-
-bool mgmtCheckVnodeReady(SDnodeObj *pDnode, SVgObj *pVgroup, SVnodeGid *pVnode) { return true; }
-
-void mgmtUpdateDnodeState(SDnodeObj *pDnode, int lbStatus) {}
-
-void mgmtUpdateVgroupState(SVgObj *pVgroup, int lbStatus, int srcIp) {}
-
-bool mgmtAddVnode(SVgObj *pVgroup, SDnodeObj *pSrcDnode, SDnodeObj *pDestDnode) { return false; }
\ No newline at end of file
diff --git a/src/system/lite/src/mgmtDnode.spec.c b/src/system/lite/src/mgmtDnode.spec.c
deleted file mode 100644
index 7fd9e7a2dfac9fa57969f393b367d668e1c419fa..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtDnode.spec.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "mgmt.h"
-#include "vnodeStatus.h"
-
-SDnodeObj       dnodeObj;
-extern uint32_t tsRebootTime;
-
-SDnodeObj *mgmtGetDnode(uint32_t ip) { return &dnodeObj; }
-
-int mgmtUpdateDnode(SDnodeObj *pDnode) { return 0; }
-
-void mgmtCleanUpDnodes() {}
-
-int mgmtInitDnodes() {
-  dnodeObj.privateIp = inet_addr(tsPrivateIp);;
-  dnodeObj.createdTime = (int64_t)tsRebootTime * 1000;
-  dnodeObj.lastReboot = tsRebootTime;
-  dnodeObj.numOfCores = (uint16_t)tsNumOfCores;
-  dnodeObj.status = TSDB_DN_STATUS_READY;
-  dnodeObj.alternativeRole = TSDB_DNODE_ROLE_ANY;
-  dnodeObj.numOfTotalVnodes = tsNumOfTotalVnodes;
-  dnodeObj.thandle = (void*)(1);  //hack way
-  if (dnodeObj.numOfVnodes == TSDB_INVALID_VNODE_NUM) {
-    mgmtSetDnodeMaxVnodes(&dnodeObj);
-    mPrint("dnode first access, set total vnodes:%d", dnodeObj.numOfVnodes);
-  }
-  return  0;
-}
-
-int mgmtGetDnodesNum() { return 1; }
-
-void *mgmtGetNextDnode(SShowObj *pShow, SDnodeObj **pDnode) {
-  if (*pDnode == NULL) {
-    *pDnode = &dnodeObj;
-  } else {
-    *pDnode = NULL;
-  }
-
-  return *pDnode;
-}
-
-int mgmtGetScoresMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; }
-
-int mgmtRetrieveScores(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; }
-
-void mgmtSetDnodeUnRemove(SDnodeObj *pDnode) {}
-
-bool mgmtCheckConfigShow(SGlobalConfig *cfg) {
-  if (cfg->cfgType & TSDB_CFG_CTYPE_B_CLUSTER)
-    return false;
-  if (cfg->cfgType & TSDB_CFG_CTYPE_B_NOT_PRINT)
-    return false;
-  return true;
-}
\ No newline at end of file
diff --git a/src/system/lite/src/mgmtDnodeInt.spec.c b/src/system/lite/src/mgmtDnodeInt.spec.c
deleted file mode 100644
index 734fa630c5303faddb510093c20de21aafc521b9..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtDnodeInt.spec.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <endian.h>
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-#include "tsched.h"
-#include "tutil.h"
-#include "vnode.h"
-#include "tsystem.h"
-#include "vnodeStatus.h"
-
-extern void *dmQhandle;
-void * mgmtStatusTimer = NULL;
-void   mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj);
-void   vnodeProcessMsgFromMgmtSpec(SSchedMsg *sched);
-
-char *taosBuildRspMsgToDnodeWithSize(SDnodeObj *pObj, char type, int size) {
-  char *pStart = (char *)malloc(size);
-  if (pStart == NULL) {
-    return NULL;
-  }
-
-  *pStart = type;
-  return pStart + 1;
-}
-
-char *taosBuildReqMsgToDnodeWithSize(SDnodeObj *pObj, char type, int size) {
-  char *pStart = (char *)malloc(size);
-  if (pStart == NULL) {
-    return NULL;
-  }
-
-  *pStart = type;
-  return pStart + 1;
-}
-
-char *taosBuildRspMsgToDnode(SDnodeObj *pObj, char type) {
-  return taosBuildRspMsgToDnodeWithSize(pObj, type, 256);
-}
-
-char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type) {
-  return taosBuildReqMsgToDnodeWithSize(pObj, type, 256);
-}
-
-int taosSendSimpleRspToDnode(SDnodeObj *pObj, char rsptype, char code) { return 0; }
-
-int taosSendMsgToDnode(SDnodeObj *pObj, char *msg, int msgLen) {
-  mTrace("msg:%s is sent to dnode", taosMsg[(uint8_t)(*(msg-1))]);
-
-  /*
-   * Lite version has no message header, so minus one
-   */
-  SSchedMsg schedMsg;
-  schedMsg.fp = vnodeProcessMsgFromMgmtSpec;
-  schedMsg.msg = msg - 1;
-  schedMsg.ahandle = NULL;
-  schedMsg.thandle = NULL;
-  taosScheduleTask(dmQhandle, &schedMsg);
-
-  return 0;
-}
-
-int mgmtInitDnodeInt() { return 0; }
-
-void mgmtCleanUpDnodeInt() {}
-
-void mgmtProcessDnodeStatus(void *handle, void *tmrId) {
-  SDnodeObj *pObj = &dnodeObj;
-  pObj->openVnodes = tsOpenVnodes;
-  pObj->status = TSDB_DN_STATUS_READY;
-
-  float memoryUsedMB = 0;
-  taosGetSysMemory(&memoryUsedMB);
-  pObj->diskAvailable = tsAvailDataDirGB;
-
-  for (int vnode = 0; vnode < pObj->numOfVnodes; ++vnode) {
-    SVnodeLoad *pVload = &(pObj->vload[vnode]);
-    SVnodeObj * pVnode = vnodeList + vnode;
-
-    // wait vnode dropped
-    if (pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) {
-      if (vnodeList[vnode].cfg.maxSessions <= 0) {
-        pVload->dropStatus = TSDB_VN_DROP_STATUS_READY;
-        pVload->status = TSDB_VN_STATUS_OFFLINE;
-        mPrint("dnode:%s, vid:%d, drop finished", taosIpStr(pObj->privateIp), vnode);
-        taosTmrStart(mgmtMonitorDbDrop, 10000, NULL, mgmtTmr);
-      }
-    }
-
-    if (vnodeList[vnode].cfg.maxSessions <= 0) {
-      continue;
-    }
-
-    pVload->vnode = vnode;
-    pVload->status = TSDB_VN_STATUS_MASTER;
-    pVload->totalStorage = pVnode->vnodeStatistic.totalStorage;
-    pVload->compStorage = pVnode->vnodeStatistic.compStorage;
-    pVload->pointsWritten = pVnode->vnodeStatistic.pointsWritten;
-    uint32_t vgId = pVnode->cfg.vgId;
-
-    SVgObj *pVgroup = mgmtGetVgroup(vgId);
-    if (pVgroup == NULL) {
-      mError("vgroup:%d is not there, but associated with vnode %d", vgId, vnode);
-      pVload->dropStatus = TSDB_VN_DROP_STATUS_DROPPING;
-      continue;
-    }
-
-    SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
-    if (pDb == NULL) {
-      mError("vgroup:%d not belongs to any database, vnode:%d", vgId, vnode);
-      continue;
-    }
-
-    if (pVload->vgId == 0 || pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) {
-      mError("vid:%d, mgmt not exist, drop it", vnode);
-      pVload->dropStatus = TSDB_VN_DROP_STATUS_DROPPING;
-    }
-  }
-
-  taosTmrReset(mgmtProcessDnodeStatus, tsStatusInterval * 1000, NULL, mgmtTmr, &mgmtStatusTimer);
-  if (mgmtStatusTimer == NULL) {
-    mError("Failed to start status timer");
-  }
-}
-
-void mgmtProcessMsgFromDnodeSpec(SSchedMsg *sched) {
-  char  msgType = *sched->msg;
-  char *content = sched->msg + 1;
-  mTrace("msg:%s is received from dnode", taosMsg[(uint8_t)msgType]);
-
-  mgmtProcessMsgFromDnode(content, 0, msgType, mgmtGetDnode(0));
-  free(sched->msg);
-}
diff --git a/src/system/lite/src/mgmtMnode.spec.c b/src/system/lite/src/mgmtMnode.spec.c
deleted file mode 100644
index e24f38adf25e3cb7ba1d551416399683a6df50dc..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtMnode.spec.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "mgmt.h"
-
-int mgmtGetMnodeMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; }
-
-int mgmtRetrieveMnodes(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; }
diff --git a/src/system/lite/src/mgmtShell.spec.c b/src/system/lite/src/mgmtShell.spec.c
deleted file mode 100644
index a1d8e6a34a4e2cc2d7df7c1acc6cdf75a796fc1a..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtShell.spec.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include "mgmt.h"
-
-int mgmtCheckRedirectMsg(SConnObj *pConn, int msgType) { return 0; }
-
-int mgmtProcessAlterAcctMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessCreateDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessCfgMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CFG_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessDropMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessDropDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessDropAcctMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
-
-int mgmtProcessCreateAcctMsg(char *pMsg, int msgLen, SConnObj *pConn) {
-  return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
-}
\ No newline at end of file
diff --git a/src/system/lite/src/mgmtSystem.spec.c b/src/system/lite/src/mgmtSystem.spec.c
deleted file mode 100644
index 47e36bf1a4da9c1b05424e0199346cca4b667a06..0000000000000000000000000000000000000000
--- a/src/system/lite/src/mgmtSystem.spec.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-
-#include "dnodeSystem.h"
-#include "mgmt.h"
-
-extern void *mgmtTmr;
-extern void *mgmtStatusTimer;
-
-void mgmtProcessDnodeStatus(void *handle, void *tmrId);
-
-int mgmtInitSystem() { return mgmtStartSystem(); }
-
-int32_t mgmtStartCheckMgmtRunning() { return 0; }
-
-void mgmtDoStatistic(void *handle, void *tmrId) {}
-
-void mgmtStartMgmtTimer() { taosTmrReset(mgmtProcessDnodeStatus, 500, NULL, mgmtTmr, &mgmtStatusTimer); }
-
-void mgmtStopSystem() {}
-
-void mgmtCleanUpRedirect() {}
-
-bool grantCheckExpired() { return false; }
-
-int grantGetGrantsMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { return TSDB_CODE_OPS_NOT_SUPPORT; }
-
-int grantRetrieveGrants(SShowObj *pShow, char *data, int rows, SConnObj *pConn) { return 0; }
-
-void grantRestoreTimeSeries(uint32_t timeseries) {}
\ No newline at end of file
diff --git a/src/system/lite/src/vnodeFile.spec.c b/src/system/lite/src/vnodeFile.spec.c
deleted file mode 100644
index 4ad624d2ad74b7ded307c014586552ef4f0a6e4e..0000000000000000000000000000000000000000
--- a/src/system/lite/src/vnodeFile.spec.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "vnode.h"
-#include "vnodeFile.h"
-
-char* vnodeGetDiskFromHeadFile(char *headName) { return tsDirectory; }
-
-char* vnodeGetDataDir(int vnode, int fileId) { return dataDir; }
-
-void vnodeAdustVnodeFile(SVnodeObj *pVnode) {
-  // Retention policy here
-  int fileId = pVnode->fileId - pVnode->numOfFiles + 1;
-  int cfile = taosGetTimestamp(pVnode->cfg.precision)/pVnode->cfg.daysPerFile/tsMsPerDay[(uint8_t)pVnode->cfg.precision];
-  while (fileId <= cfile - pVnode->maxFiles) {
-    vnodeRemoveFile(pVnode->vnode, fileId);
-    pVnode->numOfFiles--;
-    fileId++;
-  }
-}
-
-int vnodeCheckNewHeaderFile(int fd, SVnodeObj *pVnode) {
-  SCompHeader *pHeader = NULL;
-  SCompBlock  *pBlocks = NULL;
-  int          blockSize = 0;
-  SCompInfo    compInfo;
-  int          tmsize = 0;
-
-  tmsize = sizeof(SCompHeader) * pVnode->cfg.maxSessions + sizeof(TSCKSUM);
-
-  pHeader = (SCompHeader *)malloc(tmsize);
-  if (pHeader == NULL) return 0;
-
-  lseek(fd, TSDB_FILE_HEADER_LEN, SEEK_SET);
-  if (read(fd, (void *)pHeader, tmsize) != tmsize) {
-    goto _broken_exit;
-  }
-
-  if (!taosCheckChecksumWhole((uint8_t *)pHeader, tmsize)) {
-    goto _broken_exit;
-  }
-
-  for (int sid = 0; sid < pVnode->cfg.maxSessions; sid++) {
-    if (pVnode->meterList == NULL) goto _correct_exit;
-    if (pVnode->meterList[sid] == NULL || pHeader[sid].compInfoOffset == 0) continue;
-    lseek(fd, pHeader[sid].compInfoOffset, SEEK_SET);
-
-    if (read(fd, (void *)(&compInfo), sizeof(SCompInfo)) != sizeof(SCompInfo)) {
-      goto _broken_exit;
-    }
-
-    if (!taosCheckChecksumWhole((uint8_t *)(&compInfo), sizeof(SCompInfo))) {
-      goto _broken_exit;
-    }
-
-    if (compInfo.uid != ((SMeterObj *)pVnode->meterList[sid])->uid) continue;
-
-    int expectedSize = sizeof(SCompBlock) * compInfo.numOfBlocks + sizeof(TSCKSUM);
-    if (blockSize < expectedSize) {
-      pBlocks = (SCompBlock *)realloc(pBlocks, expectedSize);
-      if (pBlocks == NULL) {
-        tfree(pHeader);
-        return 0;
-      }
-
-      blockSize = expectedSize;
-    }
-
-    if (read(fd, (void *)pBlocks, expectedSize) != expectedSize) {
-      dError("failed to read block part");
-      goto _broken_exit;
-    }
-    if (!taosCheckChecksumWhole((uint8_t *)pBlocks, expectedSize)) {
-      dError("block part is broken");
-      goto _broken_exit;
-    }
-
-    for (int i = 0; i < compInfo.numOfBlocks; i++) {
-      if (pBlocks[i].last && i != compInfo.numOfBlocks-1) {
-        dError("last block in middle, block:%d", i);
-        goto  _broken_exit;
-      }
-    }
-  }
-
-    _correct_exit:
-  dPrint("vid: %d new header file %s is correct", pVnode->vnode, pVnode->nfn);
-  tfree(pBlocks);
-  tfree(pHeader);
-  return 0;
-
-    _broken_exit:
-  dError("vid: %d new header file %s is broken", pVnode->vnode, pVnode->nfn);
-  tfree(pBlocks);
-  tfree(pHeader);
-  return -1;
-}
\ No newline at end of file
diff --git a/src/system/lite/src/vnodePeer.spec.c b/src/system/lite/src/vnodePeer.spec.c
deleted file mode 100644
index 34400d4051729a8b0d8e50ec01a8d5ae877c9622..0000000000000000000000000000000000000000
--- a/src/system/lite/src/vnodePeer.spec.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "vnode.h"
-#include "vnodeStatus.h"
-
-int vnodeInitPeer(int numOfThreads) { return 0; }
-
-void vnodeCleanUpPeer(int vnode) {}
-
-int vnodeForwardToPeer(SMeterObj *pObj, char *cont, int contLen, char action, int sversion) { return 0; }
-
-int vnodeRecoverFromPeer(SVnodeObj *pVnode, int fileId) { return -TSDB_CODE_FILE_CORRUPTED; }
-
-void  vnodeCloseAllSyncFds(int vnode) {}
-
-void vnodeBroadcastStatusToUnsyncedPeer(SVnodeObj *pVnode) {}
-
-int vnodeOpenPeerVnode(int vnode) {
-  SVnodeObj *pVnode = vnodeList + vnode;
-  pVnode->vnodeStatus = (pVnode->cfg.replications > 1) ? TSDB_VN_STATUS_UNSYNCED : TSDB_VN_STATUS_MASTER;
-  dPrint("vid:%d, status:%s numOfPeers:%d", vnode, taosGetVnodeStatusStr(pVnode->vnodeStatus), pVnode->cfg.replications - 1);
-  vnodeUpdateStreamRole(pVnode);
-  return 0;
-}
-
-void vnodeClosePeerVnode(int vnode) {}
-
-void vnodeConfigVPeers(int vnode, int numOfPeers, SVPeerDesc peerDesc[]) {}
\ No newline at end of file
diff --git a/src/system/lite/src/vnodeStore.spec.c b/src/system/lite/src/vnodeStore.spec.c
deleted file mode 100644
index 2259d1267e862b0842a61d514ab2734d95fb79dd..0000000000000000000000000000000000000000
--- a/src/system/lite/src/vnodeStore.spec.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _DEFAULT_SOURCE
-#include <stdbool.h>
-
-int vnodeInitInfo() { return 0; }
-
-bool vnodeRemoveDataFileFromLinkFile(char* linkFile, char* de_name) { return true; }
-
diff --git a/src/tsdb/CMakeLists.txt b/src/tsdb/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d86b104f234a7e39bd67f728370e188c965cf42a
--- /dev/null
+++ b/src/tsdb/CMakeLists.txt
@@ -0,0 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_LIBRARY(tsdb ${SRC})
+TARGET_LINK_LIBRARIES(tsdb common tutil)
+
+IF (TD_LINUX)
+  # Someone has no gtest directory, so comment it
+  # ADD_SUBDIRECTORY(tests)
+ENDIF ()
diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
new file mode 100644
index 0000000000000000000000000000000000000000..256b8189f8fc69345b27fdf702fb705d22ac3c10
--- /dev/null
+++ b/src/tsdb/inc/tsdbMain.h
@@ -0,0 +1,579 @@
+/*
+ * 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 _TD_TSDB_MAIN_H_
+#define _TD_TSDB_MAIN_H_
+
+#include "os.h"
+#include "hash.h"
+#include "tcoding.h"
+#include "tglobal.h"
+#include "tkvstore.h"
+#include "tlist.h"
+#include "tlog.h"
+#include "tlockfree.h"
+#include "tsdb.h"
+#include "tskiplist.h"
+#include "tutil.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int tsdbDebugFlag;
+
+#define tsdbFatal(...) { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }}
+#define tsdbError(...) { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", 255, __VA_ARGS__); }}
+#define tsdbWarn(...)  { if (tsdbDebugFlag & DEBUG_WARN)  { taosPrintLog("TDB WARN ", 255, __VA_ARGS__); }}
+#define tsdbInfo(...)  { if (tsdbDebugFlag & DEBUG_INFO)  { taosPrintLog("TDB ", 255, __VA_ARGS__); }}
+#define tsdbDebug(...) { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }}
+#define tsdbTrace(...) { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }}
+
+#define TSDB_MAX_TABLE_SCHEMAS 16
+#define TSDB_FILE_HEAD_SIZE 512
+#define TSDB_FILE_DELIMITER 0xF00AFA0F
+#define TSDB_FILE_INIT_MAGIC 0xFFFFFFFF
+
+#define TAOS_IN_RANGE(key, keyMin, keyLast) (((key) >= (keyMin)) && ((key) <= (keyMax)))
+
+// NOTE: Any file format change must increase this version number by 1
+//       Also, implement the convert function
+#define TSDB_FILE_VERSION ((uint32_t)0)
+
+// Definitions
+// ------------------ tsdbMeta.c
+typedef struct STable {
+  STableId       tableId;
+  ETableType     type;
+  tstr*          name;  // NOTE: there a flexible string here
+  uint64_t       suid;
+  struct STable* pSuper;  // super table pointer
+  uint8_t        numOfSchemas;
+  STSchema*      schema[TSDB_MAX_TABLE_SCHEMAS];
+  STSchema*      tagSchema;
+  SKVRow         tagVal;
+  SSkipList*     pIndex;         // For TSDB_SUPER_TABLE, it is the skiplist index
+  void*          eventHandler;   // TODO
+  void*          streamHandler;  // TODO
+  TSKEY          lastKey;        // lastkey inserted in this table, initialized as 0, TODO: make a structure
+  char*          sql;
+  void*          cqhandle;
+  SRWLatch       latch;  // TODO: implementa latch functions
+  T_REF_DECLARE()
+} STable;
+
+typedef struct {
+  pthread_rwlock_t rwLock;
+
+  int32_t   nTables;
+  int32_t   maxTables;
+  STable**  tables;
+  SList*    superList;
+  SHashObj* uidMap;
+  SKVStore* pStore;
+  int       maxRowBytes;
+  int       maxCols;
+} STsdbMeta;
+
+// ------------------ tsdbBuffer.c
+typedef struct {
+  int64_t blockId;
+  int     offset;
+  int     remain;
+  char    data[];
+} STsdbBufBlock;
+
+typedef struct {
+  pthread_cond_t poolNotEmpty;
+  int            bufBlockSize;
+  int            tBufBlocks;
+  int            nBufBlocks;
+  int64_t        index;
+  SList*         bufBlockList;
+} STsdbBufPool;
+
+// ------------------ tsdbMemTable.c
+typedef struct {
+  STable *           pTable;
+  SSkipListIterator *pIter;
+} SCommitIter;
+
+typedef struct {
+  uint64_t   uid;
+  TSKEY      keyFirst;
+  TSKEY      keyLast;
+  int64_t    numOfRows;
+  SSkipList* pData;
+} STableData;
+
+typedef struct {
+  T_REF_DECLARE()
+  SRWLatch     latch;
+  TSKEY        keyFirst;
+  TSKEY        keyLast;
+  int64_t      numOfRows;
+  int32_t      maxTables;
+  STableData** tData;
+  SList*       actList;
+  SList*       extraBuffList;
+  SList*       bufBlockList;
+} SMemTable;
+
+enum { TSDB_UPDATE_META, TSDB_DROP_META };
+
+#ifdef WINDOWS
+#pragma pack(push ,1) 
+typedef struct {
+#else
+typedef struct __attribute__((packed)){
+#endif
+  char     act;
+  uint64_t uid;
+} SActObj;
+#ifdef WINDOWS
+#pragma pack(pop) 
+#endif
+
+typedef struct {
+  int  len;
+  char cont[];
+} SActCont;
+
+// ------------------ tsdbFile.c
+extern const char* tsdbFileSuffix[];
+typedef enum {
+  TSDB_FILE_TYPE_HEAD = 0,
+  TSDB_FILE_TYPE_DATA,
+  TSDB_FILE_TYPE_LAST,
+  TSDB_FILE_TYPE_STAT,
+  TSDB_FILE_TYPE_NHEAD,
+  TSDB_FILE_TYPE_NDATA,
+  TSDB_FILE_TYPE_NLAST,
+  TSDB_FILE_TYPE_NSTAT
+} TSDB_FILE_TYPE;
+
+#ifndef TDINTERNAL
+#define TSDB_FILE_TYPE_MAX (TSDB_FILE_TYPE_LAST+1)
+#else
+#define TSDB_FILE_TYPE_MAX (TSDB_FILE_TYPE_STAT+1)
+#endif
+
+typedef struct {
+  uint32_t magic;
+  uint32_t len;
+  uint32_t totalBlocks;
+  uint32_t totalSubBlocks;
+  uint32_t offset;
+  uint64_t size;      // total size of the file
+  uint64_t tombSize;  // unused file size
+} STsdbFileInfo;
+
+typedef struct {
+  char  fname[TSDB_FILENAME_LEN];
+  int   fd;
+
+  STsdbFileInfo info;
+} SFile;
+
+typedef struct {
+  int   fileId;
+  int   state; // 0 for health, 1 for problem
+  SFile files[TSDB_FILE_TYPE_MAX];
+} SFileGroup;
+
+typedef struct {
+  pthread_rwlock_t fhlock;
+
+  int         maxFGroups;
+  int         nFGroups;
+  SFileGroup* pFGroup;
+} STsdbFileH;
+
+typedef struct {
+  int         direction;
+  STsdbFileH* pFileH;
+  int         fileId;
+  int         index;
+} SFileGroupIter;
+
+// ------------------ tsdbMain.c
+typedef struct {
+  int8_t state;
+
+  char*           rootDir;
+  STsdbCfg        config;
+  STsdbAppH       appH;
+  STsdbStat       stat;
+  STsdbMeta*      tsdbMeta;
+  STsdbBufPool*   pPool;
+  SMemTable*      mem;
+  SMemTable*      imem;
+  STsdbFileH*     tsdbFileH;
+  int             commit;
+  pthread_t       commitThread;
+  pthread_mutex_t mutex;
+  bool            repoLocked;
+} STsdbRepo;
+
+// ------------------ tsdbRWHelper.c
+typedef struct {
+  int32_t  tid;
+  uint32_t len;
+  uint32_t offset;
+  uint32_t hasLast : 2;
+  uint32_t numOfBlocks : 30;
+  uint64_t uid;
+  TSKEY    maxKey;
+} SCompIdx;
+
+typedef struct {
+  int64_t last : 1;
+  int64_t offset : 63;
+  int32_t algorithm : 8;
+  int32_t numOfRows : 24;
+  int32_t len;
+  int32_t keyLen;     // key column length, keyOffset = offset+sizeof(SCompData)+sizeof(SCompCol)*numOfCols
+  int16_t numOfSubBlocks;
+  int16_t numOfCols; // not including timestamp column
+  TSKEY   keyFirst;
+  TSKEY   keyLast;
+} SCompBlock;
+
+typedef struct {
+  int32_t    delimiter;  // For recovery usage
+  int32_t    tid;
+  uint64_t   uid;
+  SCompBlock blocks[];
+} SCompInfo;
+
+typedef struct {
+  int16_t colId;
+  int32_t len;
+  int32_t type : 8;
+  int32_t offset : 24;
+  int64_t sum;
+  int64_t max;
+  int64_t min;
+  int16_t maxIndex;
+  int16_t minIndex;
+  int16_t numOfNull;
+  char    padding[2];
+} SCompCol;
+
+typedef struct {
+  int32_t  delimiter;  // For recovery usage
+  int32_t  numOfCols;  // For recovery usage
+  uint64_t uid;        // For recovery usage
+  SCompCol cols[];
+} SCompData;
+
+typedef enum { TSDB_WRITE_HELPER, TSDB_READ_HELPER } tsdb_rw_helper_t;
+
+typedef struct {
+  TSKEY      minKey;
+  TSKEY      maxKey;
+  SFileGroup fGroup;
+  SFile      nHeadF;
+  SFile      nLastF;
+} SHelperFile;
+
+typedef struct {
+  uint64_t uid;
+  int32_t  tid;
+} SHelperTable;
+
+typedef struct {
+  SCompIdx* pIdxArray;
+  int       numOfIdx;
+  int       curIdx;
+} SIdxH;
+
+typedef struct {
+  tsdb_rw_helper_t type;
+
+  STsdbRepo* pRepo;
+  int8_t     state;
+  // For file set usage
+  SHelperFile files;
+  SIdxH       idxH;
+  SCompIdx    curCompIdx;
+  void*       pWIdx;
+  // For table set usage
+  SHelperTable tableInfo;
+  SCompInfo*   pCompInfo;
+  bool         hasOldLastBlock;
+  // For block set usage
+  SCompData* pCompData;
+  SDataCols* pDataCols[2];
+  void*      pBuffer;     // Buffer to hold the whole data block
+  void*      compBuffer;  // Buffer for temperary compress/decompress purpose
+} SRWHelper;
+
+// ------------------ tsdbScan.c
+typedef struct {
+  SFileGroup fGroup;
+  int        numOfIdx;
+  SCompIdx*  pCompIdx;
+  SCompInfo* pCompInfo;
+  void*      pBuf;
+  FILE*      tLogStream;
+} STsdbScanHandle;
+
+// Operations
+// ------------------ tsdbMeta.c
+#define TSDB_INIT_NTABLES 1024
+#define TABLE_TYPE(t) (t)->type
+#define TABLE_NAME(t) (t)->name
+#define TABLE_CHAR_NAME(t) TABLE_NAME(t)->data
+#define TABLE_UID(t) (t)->tableId.uid
+#define TABLE_TID(t) (t)->tableId.tid
+#define TABLE_SUID(t) (t)->suid
+#define TABLE_LASTKEY(t) (t)->lastKey
+#define TSDB_META_FILE_MAGIC(m) KVSTORE_MAGIC((m)->pStore)
+
+STsdbMeta* tsdbNewMeta(STsdbCfg* pCfg);
+void       tsdbFreeMeta(STsdbMeta* pMeta);
+int        tsdbOpenMeta(STsdbRepo* pRepo);
+int        tsdbCloseMeta(STsdbRepo* pRepo);
+STable*    tsdbGetTableByUid(STsdbMeta* pMeta, uint64_t uid);
+STSchema*  tsdbGetTableSchemaByVersion(STable* pTable, int16_t version);
+int        tsdbWLockRepoMeta(STsdbRepo* pRepo);
+int        tsdbRLockRepoMeta(STsdbRepo* pRepo);
+int        tsdbUnlockRepoMeta(STsdbRepo* pRepo);
+void       tsdbRefTable(STable* pTable);
+void       tsdbUnRefTable(STable* pTable);
+void       tsdbUpdateTableSchema(STsdbRepo* pRepo, STable* pTable, STSchema* pSchema, bool insertAct);
+
+static FORCE_INLINE int tsdbCompareSchemaVersion(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 < schemaVersion(*(STSchema **)key2)) {
+    return -1;
+  } else if (*(int16_t *)key1 > schemaVersion(*(STSchema **)key2)) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE STSchema* tsdbGetTableSchemaImpl(STable* pTable, bool lock, bool copy, int16_t version) {
+  STable*   pDTable = (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) ? pTable->pSuper : pTable;
+  STSchema* pSchema = NULL;
+  STSchema* pTSchema = NULL;
+
+  if (lock) taosRLockLatch(&(pDTable->latch));
+  if (version < 0) {  // get the latest version of schema
+    pTSchema = pDTable->schema[pDTable->numOfSchemas - 1];
+  } else {  // get the schema with version
+    void* ptr = taosbsearch(&version, pDTable->schema, pDTable->numOfSchemas, sizeof(STSchema*),
+                            tsdbCompareSchemaVersion, TD_EQ);
+    if (ptr == NULL) {
+      terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION;
+      goto _exit;
+    }
+    pTSchema = *(STSchema**)ptr;
+  }
+
+  ASSERT(pTSchema != NULL);
+
+  if (copy) {
+    if ((pSchema = tdDupSchema(pTSchema)) == NULL) terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+  } else {
+    pSchema = pTSchema;
+  }
+
+_exit:
+  if (lock) taosRUnLockLatch(&(pDTable->latch));
+  return pSchema;
+}
+
+static FORCE_INLINE STSchema* tsdbGetTableSchema(STable* pTable) {
+  return tsdbGetTableSchemaImpl(pTable, false, false, -1);
+}
+
+static FORCE_INLINE STSchema *tsdbGetTableTagSchema(STable *pTable) {
+  if (pTable->type == TSDB_CHILD_TABLE) {  // check child table first
+    STable *pSuper = pTable->pSuper;
+    if (pSuper == NULL) return NULL;
+    return pSuper->tagSchema;
+  } else if (pTable->type == TSDB_SUPER_TABLE) {
+    return pTable->tagSchema;
+  } else {
+    return NULL;
+  }
+}
+
+// ------------------ tsdbBuffer.c
+#define TSDB_BUFFER_RESERVE 1024  // Reseve 1K as commit threshold
+
+STsdbBufPool* tsdbNewBufPool();
+void          tsdbFreeBufPool(STsdbBufPool* pBufPool);
+int           tsdbOpenBufPool(STsdbRepo* pRepo);
+void          tsdbCloseBufPool(STsdbRepo* pRepo);
+SListNode*    tsdbAllocBufBlockFromPool(STsdbRepo* pRepo);
+
+// ------------------ tsdbMemTable.c
+int   tsdbInsertRowToMem(STsdbRepo* pRepo, SDataRow row, STable* pTable);
+int   tsdbRefMemTable(STsdbRepo* pRepo, SMemTable* pMemTable);
+int   tsdbUnRefMemTable(STsdbRepo* pRepo, SMemTable* pMemTable);
+int   tsdbTakeMemSnapshot(STsdbRepo* pRepo, SMemTable** pMem, SMemTable** pIMem);
+void  tsdbUnTakeMemSnapShot(STsdbRepo* pRepo, SMemTable* pMem, SMemTable* pIMem);
+void* tsdbAllocBytes(STsdbRepo* pRepo, int bytes);
+int   tsdbAsyncCommit(STsdbRepo* pRepo);
+int   tsdbLoadDataFromCache(STable* pTable, SSkipListIterator* pIter, TSKEY maxKey, int maxRowsToRead, SDataCols* pCols,
+                            TSKEY* filterKeys, int nFilterKeys);
+
+static FORCE_INLINE SDataRow tsdbNextIterRow(SSkipListIterator* pIter) {
+  if (pIter == NULL) return NULL;
+
+  SSkipListNode* node = tSkipListIterGet(pIter);
+  if (node == NULL) return NULL;
+
+  return *(SDataRow *)SL_GET_NODE_DATA(node);
+}
+
+static FORCE_INLINE TSKEY tsdbNextIterKey(SSkipListIterator* pIter) {
+  SDataRow row = tsdbNextIterRow(pIter);
+  if (row == NULL) return -1;
+
+  return dataRowKey(row);
+}
+
+static FORCE_INLINE STsdbBufBlock* tsdbGetCurrBufBlock(STsdbRepo* pRepo) {
+  ASSERT(pRepo != NULL);
+  if (pRepo->mem == NULL) return NULL;
+
+  SListNode* pNode = listTail(pRepo->mem->bufBlockList);
+  if (pNode == NULL) return NULL;
+
+  STsdbBufBlock* pBufBlock = NULL;
+  tdListNodeGetData(pRepo->mem->bufBlockList, pNode, (void*)(&pBufBlock));
+
+  return pBufBlock;
+}
+
+// ------------------ tsdbFile.c
+#define TSDB_KEY_FILEID(key, daysPerFile, precision) ((key) / tsMsPerDay[(precision)] / (daysPerFile))
+#define TSDB_MAX_FILE(keep, daysPerFile) ((keep) / (daysPerFile) + 3)
+#define TSDB_MIN_FILE_ID(fh) (fh)->pFGroup[0].fileId
+#define TSDB_MAX_FILE_ID(fh) (fh)->pFGroup[(fh)->nFGroups - 1].fileId
+#define TSDB_IS_FILE_OPENED(f) ((f)->fd > 0)
+#define TSDB_FGROUP_ITER_FORWARD TSDB_ORDER_ASC
+#define TSDB_FGROUP_ITER_BACKWARD TSDB_ORDER_DESC
+
+STsdbFileH* tsdbNewFileH(STsdbCfg* pCfg);
+void        tsdbFreeFileH(STsdbFileH* pFileH);
+int         tsdbOpenFileH(STsdbRepo* pRepo);
+void        tsdbCloseFileH(STsdbRepo* pRepo);
+SFileGroup* tsdbCreateFGroupIfNeed(STsdbRepo* pRepo, char* dataDir, int fid);
+void        tsdbInitFileGroupIter(STsdbFileH* pFileH, SFileGroupIter* pIter, int direction);
+void        tsdbSeekFileGroupIter(SFileGroupIter* pIter, int fid);
+SFileGroup* tsdbGetFileGroupNext(SFileGroupIter* pIter);
+int         tsdbOpenFile(SFile* pFile, int oflag);
+void        tsdbCloseFile(SFile* pFile);
+int         tsdbCreateFile(SFile* pFile, STsdbRepo* pRepo, int fid, int type);
+SFileGroup* tsdbSearchFGroup(STsdbFileH* pFileH, int fid, int flags);
+void        tsdbFitRetention(STsdbRepo* pRepo);
+int         tsdbUpdateFileHeader(SFile* pFile);
+int         tsdbEncodeSFileInfo(void** buf, const STsdbFileInfo* pInfo);
+void*       tsdbDecodeSFileInfo(void* buf, STsdbFileInfo* pInfo);
+void        tsdbRemoveFileGroup(STsdbRepo* pRepo, SFileGroup* pFGroup);
+int         tsdbLoadFileHeader(SFile* pFile, uint32_t* version);
+void        tsdbGetFileInfoImpl(char* fname, uint32_t* magic, int64_t* size);
+void        tsdbGetFidKeyRange(int daysPerFile, int8_t precision, int fileId, TSKEY *minKey, TSKEY *maxKey);
+
+// ------------------ tsdbRWHelper.c
+#define TSDB_HELPER_CLEAR_STATE 0x0        // Clear state
+#define TSDB_HELPER_FILE_SET_AND_OPEN 0x1  // File is set
+#define TSDB_HELPER_IDX_LOAD 0x2           // SCompIdx part is loaded
+#define TSDB_HELPER_TABLE_SET 0x4          // Table is set
+#define TSDB_HELPER_INFO_LOAD 0x8          // SCompInfo part is loaded
+#define TSDB_HELPER_FILE_DATA_LOAD 0x10    // SCompData part is loaded
+#define helperSetState(h, s) (((h)->state) |= (s))
+#define helperClearState(h, s) ((h)->state &= (~(s)))
+#define helperHasState(h, s) ((((h)->state) & (s)) == (s))
+#define blockAtIdx(h, idx) ((h)->pCompInfo->blocks + idx)
+#define TSDB_MAX_SUBBLOCKS 8
+#define IS_SUB_BLOCK(pBlock) ((pBlock)->numOfSubBlocks == 0)
+#define helperType(h) (h)->type
+#define helperRepo(h) (h)->pRepo
+#define helperState(h) (h)->state
+#define TSDB_NLAST_FILE_OPENED(h) ((h)->files.nLastF.fd > 0)
+#define helperFileId(h) ((h)->files.fGroup.fileId)
+#define helperHeadF(h) (&((h)->files.fGroup.files[TSDB_FILE_TYPE_HEAD]))
+#define helperDataF(h) (&((h)->files.fGroup.files[TSDB_FILE_TYPE_DATA]))
+#define helperLastF(h) (&((h)->files.fGroup.files[TSDB_FILE_TYPE_LAST]))
+#define helperNewHeadF(h) (&((h)->files.nHeadF))
+#define helperNewLastF(h) (&((h)->files.nLastF))
+
+int  tsdbInitReadHelper(SRWHelper* pHelper, STsdbRepo* pRepo);
+int  tsdbInitWriteHelper(SRWHelper* pHelper, STsdbRepo* pRepo);
+void tsdbDestroyHelper(SRWHelper* pHelper);
+void tsdbResetHelper(SRWHelper* pHelper);
+int  tsdbSetAndOpenHelperFile(SRWHelper* pHelper, SFileGroup* pGroup);
+int  tsdbCloseHelperFile(SRWHelper* pHelper, bool hasError, SFileGroup* pGroup);
+int  tsdbSetHelperTable(SRWHelper* pHelper, STable* pTable, STsdbRepo* pRepo);
+int  tsdbCommitTableData(SRWHelper* pHelper, SCommitIter* pCommitIter, SDataCols* pDataCols, TSKEY maxKey);
+int  tsdbMoveLastBlockIfNeccessary(SRWHelper* pHelper);
+int  tsdbWriteCompInfo(SRWHelper* pHelper);
+int  tsdbWriteCompIdx(SRWHelper* pHelper);
+int  tsdbLoadCompIdxImpl(SFile* pFile, uint32_t offset, uint32_t len, void* buffer);
+int  tsdbDecodeSCompIdxImpl(void* buffer, uint32_t len, SCompIdx** ppCompIdx, int* numOfIdx);
+int  tsdbLoadCompIdx(SRWHelper* pHelper, void* target);
+int  tsdbLoadCompInfoImpl(SFile* pFile, SCompIdx* pIdx, SCompInfo** ppCompInfo);
+int  tsdbLoadCompInfo(SRWHelper* pHelper, void* target);
+int  tsdbLoadCompData(SRWHelper* phelper, SCompBlock* pcompblock, void* target);
+void tsdbGetDataStatis(SRWHelper* pHelper, SDataStatis* pStatis, int numOfCols);
+int  tsdbLoadBlockDataCols(SRWHelper* pHelper, SCompBlock* pCompBlock, SCompInfo* pCompInfo, int16_t* colIds,
+                           int numOfColIds);
+int  tsdbLoadBlockData(SRWHelper* pHelper, SCompBlock* pCompBlock, SCompInfo* pCompInfo);
+
+static FORCE_INLINE int compTSKEY(const void* key1, const void* key2) {
+  if (*(TSKEY*)key1 > *(TSKEY*)key2) {
+    return 1;
+  } else if (*(TSKEY*)key1 == *(TSKEY*)key2) {
+    return 0;
+  } else {
+    return -1;
+  }
+}
+
+// ------------------ tsdbMain.c
+#define REPO_ID(r) (r)->config.tsdbId
+#define IS_REPO_LOCKED(r) (r)->repoLocked
+#define TSDB_SUBMIT_MSG_HEAD_SIZE sizeof(SSubmitMsg)
+
+char*       tsdbGetMetaFileName(char* rootDir);
+void        tsdbGetDataFileName(char* rootDir, int vid, int fid, int type, char* fname);
+int         tsdbLockRepo(STsdbRepo* pRepo);
+int         tsdbUnlockRepo(STsdbRepo* pRepo);
+char*       tsdbGetDataDirName(char* rootDir);
+int         tsdbGetNextMaxTables(int tid);
+STsdbMeta*  tsdbGetMeta(TSDB_REPO_T* pRepo);
+STsdbFileH* tsdbGetFile(TSDB_REPO_T* pRepo);
+int         tsdbCheckCommit(STsdbRepo* pRepo);
+
+// ------------------ tsdbScan.c
+int              tsdbScanFGroup(STsdbScanHandle* pScanHandle, char* rootDir, int fid);
+STsdbScanHandle* tsdbNewScanHandle();
+void             tsdbSetScanLogStream(STsdbScanHandle* pScanHandle, FILE* fLogStream);
+int              tsdbSetAndOpenScanFile(STsdbScanHandle* pScanHandle, char* rootDir, int fid);
+int              tsdbScanSCompIdx(STsdbScanHandle* pScanHandle);
+int              tsdbScanSCompBlock(STsdbScanHandle* pScanHandle, int idx);
+int              tsdbCloseScanFile(STsdbScanHandle* pScanHandle);
+void             tsdbFreeScanHandle(STsdbScanHandle* pScanHandle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbBuffer.c b/src/tsdb/src/tsdbBuffer.c
new file mode 100644
index 0000000000000000000000000000000000000000..2e097c6ff73543f2dd858f8424b1e942ebdd8c3e
--- /dev/null
+++ b/src/tsdb/src/tsdbBuffer.c
@@ -0,0 +1,160 @@
+/*
+ * 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 "tsdb.h"
+#include "tsdbMain.h"
+
+#define POOL_IS_EMPTY(b) (listNEles((b)->bufBlockList) == 0)
+
+static STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize);
+static void           tsdbFreeBufBlock(STsdbBufBlock *pBufBlock);
+
+// ---------------- INTERNAL FUNCTIONS ----------------
+STsdbBufPool *tsdbNewBufPool() {
+  STsdbBufPool *pBufPool = (STsdbBufPool *)calloc(1, sizeof(*pBufPool));
+  if (pBufPool == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  int code = pthread_cond_init(&(pBufPool->poolNotEmpty), NULL);
+  if (code != 0) {
+    terrno = TAOS_SYSTEM_ERROR(code);
+    goto _err;
+  }
+
+  pBufPool->bufBlockList = tdListNew(sizeof(STsdbBufBlock *));
+  if (pBufPool->bufBlockList == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return pBufPool;
+
+_err:
+  tsdbFreeBufPool(pBufPool);
+  return NULL;
+}
+
+void tsdbFreeBufPool(STsdbBufPool *pBufPool) {
+  if (pBufPool) {
+    if (pBufPool->bufBlockList) {
+      ASSERT(listNEles(pBufPool->bufBlockList) == 0);
+      tdListFree(pBufPool->bufBlockList);
+    }
+
+    pthread_cond_destroy(&pBufPool->poolNotEmpty);
+
+    free(pBufPool);
+  }
+}
+
+int tsdbOpenBufPool(STsdbRepo *pRepo) {
+  STsdbCfg *    pCfg = &(pRepo->config);
+  STsdbBufPool *pPool = pRepo->pPool;
+
+  ASSERT(pPool != NULL);
+
+  pPool->bufBlockSize = pCfg->cacheBlockSize * 1024 * 1024; // MB
+  pPool->tBufBlocks = pCfg->totalBlocks;
+  pPool->nBufBlocks = 0;
+  pPool->index = 0;
+
+  for (int i = 0; i < pCfg->totalBlocks; i++) {
+    STsdbBufBlock *pBufBlock = tsdbNewBufBlock(pPool->bufBlockSize);
+    if (pBufBlock == NULL) goto _err;
+
+    if (tdListAppend(pPool->bufBlockList, (void *)(&pBufBlock)) < 0) {
+      tsdbFreeBufBlock(pBufBlock);
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+
+    pPool->nBufBlocks++;
+  }
+
+  tsdbDebug("vgId:%d buffer pool is opened! bufBlockSize:%d tBufBlocks:%d nBufBlocks:%d", REPO_ID(pRepo),
+            pPool->bufBlockSize, pPool->tBufBlocks, pPool->nBufBlocks);
+
+  return 0;
+
+_err:
+  tsdbCloseBufPool(pRepo);
+  return -1;
+}
+
+void tsdbCloseBufPool(STsdbRepo *pRepo) {
+  if (pRepo == NULL) return;
+
+  STsdbBufPool * pBufPool = pRepo->pPool;
+  STsdbBufBlock *pBufBlock = NULL;
+
+  if (pBufPool) {
+    SListNode *pNode = NULL;
+    while ((pNode = tdListPopHead(pBufPool->bufBlockList)) != NULL) {
+      tdListNodeGetData(pBufPool->bufBlockList, pNode, (void *)(&pBufBlock));
+      tsdbFreeBufBlock(pBufBlock);
+      free(pNode);
+    }
+  }
+
+  tsdbDebug("vgId:%d buffer pool is closed", REPO_ID(pRepo));
+}
+
+SListNode *tsdbAllocBufBlockFromPool(STsdbRepo *pRepo) {
+  ASSERT(pRepo != NULL && pRepo->pPool != NULL);
+  ASSERT(IS_REPO_LOCKED(pRepo));
+
+  STsdbBufPool *pBufPool = pRepo->pPool;
+
+  while (POOL_IS_EMPTY(pBufPool)) {
+    pRepo->repoLocked = false;
+    pthread_cond_wait(&(pBufPool->poolNotEmpty), &(pRepo->mutex));
+    pRepo->repoLocked = true;
+  }
+
+  SListNode *    pNode = tdListPopHead(pBufPool->bufBlockList);
+  ASSERT(pNode != NULL);
+  STsdbBufBlock *pBufBlock = NULL;
+  tdListNodeGetData(pBufPool->bufBlockList, pNode, (void *)(&pBufBlock));
+
+  pBufBlock->blockId = pBufPool->index++;
+  pBufBlock->offset = 0;
+  pBufBlock->remain = pBufPool->bufBlockSize;
+
+  tsdbDebug("vgId:%d buffer block is allocated, blockId:%" PRId64, REPO_ID(pRepo), pBufBlock->blockId);
+  return pNode;
+}
+
+// ---------------- LOCAL FUNCTIONS ----------------
+static STsdbBufBlock *tsdbNewBufBlock(int bufBlockSize) {
+  STsdbBufBlock *pBufBlock = (STsdbBufBlock *)malloc(sizeof(*pBufBlock) + bufBlockSize);
+  if (pBufBlock == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pBufBlock->blockId = 0;
+  pBufBlock->offset = 0;
+  pBufBlock->remain = bufBlockSize;
+
+  return pBufBlock;
+
+_err:
+  tsdbFreeBufBlock(pBufBlock);
+  return NULL;
+}
+
+static void tsdbFreeBufBlock(STsdbBufBlock *pBufBlock) { taosTFree(pBufBlock); }
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c
new file mode 100644
index 0000000000000000000000000000000000000000..6dea4a4e57392be988126c579648f39a8270b9bf
--- /dev/null
+++ b/src/tsdb/src/tsdbCompact.c
@@ -0,0 +1,14 @@
+/*
+ * 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/>.
+ */
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
new file mode 100644
index 0000000000000000000000000000000000000000..626ad77da2eab4be9e94516c4e5c7c0e5a45837e
--- /dev/null
+++ b/src/tsdb/src/tsdbFile.c
@@ -0,0 +1,599 @@
+/*
+ * 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/>.
+ */
+#define _DEFAULT_SOURCE
+#include <regex.h>
+
+#define TAOS_RANDOM_FILE_FAIL_TEST
+
+#include "os.h"
+#include "talgo.h"
+#include "tchecksum.h"
+#include "tsdbMain.h"
+#include "tutil.h"
+
+
+const char *tsdbFileSuffix[] = {".head", ".data", ".last", ".stat", ".h", ".d", ".l", ".s"};
+
+static int   tsdbInitFile(SFile *pFile, STsdbRepo *pRepo, int fid, int type);
+static void  tsdbDestroyFile(SFile *pFile);
+static int   compFGroup(const void *arg1, const void *arg2);
+static int   keyFGroupCompFunc(const void *key, const void *fgroup);
+static void  tsdbInitFileGroup(SFileGroup *pFGroup, STsdbRepo *pRepo);
+static TSKEY tsdbGetCurrMinKey(int8_t precision, int32_t keep);
+static int   tsdbGetCurrMinFid(int8_t precision, int32_t keep, int32_t days);
+
+// ---------------- INTERNAL FUNCTIONS ----------------
+STsdbFileH *tsdbNewFileH(STsdbCfg *pCfg) {
+  STsdbFileH *pFileH = (STsdbFileH *)calloc(1, sizeof(*pFileH));
+  if (pFileH == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  int code = pthread_rwlock_init(&(pFileH->fhlock), NULL);
+  if (code != 0) {
+    tsdbError("vgId:%d failed to init file handle lock since %s", pCfg->tsdbId, strerror(code));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    goto _err;
+  }
+
+  pFileH->maxFGroups = TSDB_MAX_FILE(pCfg->keep, pCfg->daysPerFile);
+
+  pFileH->pFGroup = (SFileGroup *)calloc(pFileH->maxFGroups, sizeof(SFileGroup));
+  if (pFileH->pFGroup == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return pFileH;
+
+_err:
+  tsdbFreeFileH(pFileH);
+  return NULL;
+}
+
+void tsdbFreeFileH(STsdbFileH *pFileH) {
+  if (pFileH) {
+    pthread_rwlock_destroy(&pFileH->fhlock);
+    taosTFree(pFileH->pFGroup);
+    free(pFileH);
+  }
+}
+
+int tsdbOpenFileH(STsdbRepo *pRepo) {
+  ASSERT(pRepo != NULL && pRepo->tsdbFileH != NULL);
+
+  char *  tDataDir = NULL;
+  DIR *   dir = NULL;
+  int     fid = 0;
+  int     vid = 0;
+  regex_t regex1, regex2;
+  int     code = 0;
+  char    fname[TSDB_FILENAME_LEN] = "\0";
+
+  SFileGroup  fileGroup = {0};
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  STsdbCfg *  pCfg = &(pRepo->config);
+
+  tDataDir = tsdbGetDataDirName(pRepo->rootDir);
+  if (tDataDir == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  dir = opendir(tDataDir);
+  if (dir == NULL) {
+    tsdbError("vgId:%d failed to open directory %s since %s", REPO_ID(pRepo), tDataDir, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  code = regcomp(&regex1, "^v[0-9]+f[0-9]+\\.(head|data|last|stat)$", REG_EXTENDED);
+  if (code != 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  code = regcomp(&regex2, "^v[0-9]+f[0-9]+\\.(h|d|l|s)$", REG_EXTENDED);
+  if (code != 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  int mfid = tsdbGetCurrMinFid(pCfg->precision, pCfg->keep, pCfg->daysPerFile);
+
+  struct dirent *dp = NULL;
+  while ((dp = readdir(dir)) != NULL) {
+    if (strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0) continue;
+
+    code = regexec(&regex1, dp->d_name, 0, NULL, 0);
+    if (code == 0) {
+      sscanf(dp->d_name, "v%df%d", &vid, &fid);
+      if (vid != REPO_ID(pRepo)) {
+        tsdbError("vgId:%d invalid file %s exists, ignore it", REPO_ID(pRepo), dp->d_name);
+        continue;
+      }
+
+      if (fid < mfid) {
+        for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
+          tsdbGetDataFileName(pRepo->rootDir, pCfg->tsdbId, fid, type, fname);
+          (void)remove(fname);
+        }
+        continue;
+      }
+
+      if (tsdbSearchFGroup(pFileH, fid, TD_EQ) != NULL) continue;
+      memset((void *)(&fileGroup), 0, sizeof(SFileGroup));
+      fileGroup.fileId = fid;
+
+      tsdbInitFileGroup(&fileGroup, pRepo);
+    } else if (code == REG_NOMATCH) {
+      code = regexec(&regex2, dp->d_name, 0, NULL, 0);
+      if (code == 0) {
+        size_t tsize = strlen(tDataDir) + strlen(dp->d_name) + 2;
+        char * fname1 = malloc(tsize);
+        if (fname1 == NULL) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          goto _err;
+        }
+        sprintf(fname1, "%s/%s", tDataDir, dp->d_name);
+
+        tsize = tsize + 64;
+        char *fname2 = malloc(tsize);
+        if (fname2 == NULL) {
+          free(fname1);
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          goto _err;
+        }
+        sprintf(fname2, "%s/%s_back_%" PRId64, tDataDir, dp->d_name, taosGetTimestamp(TSDB_TIME_PRECISION_MILLI));
+
+        (void)rename(fname1, fname2);
+
+        tsdbDebug("vgId:%d file %s exists, backup it as %s", REPO_ID(pRepo), fname1, fname2);
+
+        free(fname1);
+        free(fname2);
+        continue;
+      } else if (code == REG_NOMATCH) {
+        tsdbError("vgId:%d invalid file %s exists, ignore it", REPO_ID(pRepo), dp->d_name);
+        continue;
+      } else {
+        goto _err;
+      }
+    } else {
+      goto _err;
+    }
+
+    pFileH->pFGroup[pFileH->nFGroups++] = fileGroup;
+    qsort((void *)(pFileH->pFGroup), pFileH->nFGroups, sizeof(SFileGroup), compFGroup);
+    tsdbDebug("vgId:%d file group %d is restored, nFGroups %d", REPO_ID(pRepo), fileGroup.fileId, pFileH->nFGroups);
+  }
+
+  regfree(&regex1);
+  regfree(&regex2);
+  taosTFree(tDataDir);
+  closedir(dir);
+  return 0;
+
+_err:
+  for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) tsdbDestroyFile(&fileGroup.files[type]);
+
+  regfree(&regex1);
+  regfree(&regex2);
+
+  taosTFree(tDataDir);
+  if (dir != NULL) closedir(dir);
+  tsdbCloseFileH(pRepo);
+  return -1;
+}
+
+void tsdbCloseFileH(STsdbRepo *pRepo) {
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+
+  for (int i = 0; i < pFileH->nFGroups; i++) {
+    SFileGroup *pFGroup = pFileH->pFGroup + i;
+    for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
+      tsdbDestroyFile(&pFGroup->files[type]);
+    }
+  }
+}
+
+SFileGroup *tsdbCreateFGroupIfNeed(STsdbRepo *pRepo, char *dataDir, int fid) {
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  STsdbCfg *  pCfg = &(pRepo->config);
+
+  if (pFileH->nFGroups >= pFileH->maxFGroups) {
+    int mfid = tsdbGetCurrMinFid(pCfg->precision, pCfg->keep, pCfg->daysPerFile);
+    if (pFileH->pFGroup[0].fileId < mfid) {
+      pthread_rwlock_wrlock(&pFileH->fhlock);
+      tsdbRemoveFileGroup(pRepo, &(pFileH->pFGroup[0]));
+      pthread_rwlock_unlock(&pFileH->fhlock);
+    }
+  }
+
+  ASSERT(pFileH->nFGroups < pFileH->maxFGroups);
+
+  SFileGroup  fGroup;
+  SFileGroup *pFGroup = &fGroup;
+
+  SFileGroup *pGroup = tsdbSearchFGroup(pFileH, fid, TD_EQ);
+  if (pGroup == NULL) {  // if not exists, create one
+    pFGroup->fileId = fid;
+    for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
+      if (tsdbCreateFile(&pFGroup->files[type], pRepo, fid, type) < 0)
+        goto _err;
+    }
+
+    pthread_rwlock_wrlock(&pFileH->fhlock);
+    pFileH->pFGroup[pFileH->nFGroups++] = fGroup;
+    qsort((void *)(pFileH->pFGroup), pFileH->nFGroups, sizeof(SFileGroup), compFGroup);
+    pthread_rwlock_unlock(&pFileH->fhlock);
+    return tsdbSearchFGroup(pFileH, fid, TD_EQ);
+  }
+
+  return pGroup;
+
+_err:
+  for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) tsdbDestroyFile(&pGroup->files[type]);
+  return NULL;
+}
+
+void tsdbInitFileGroupIter(STsdbFileH *pFileH, SFileGroupIter *pIter, int direction) {
+  pIter->pFileH = pFileH;
+  pIter->direction = direction;
+
+  if (pFileH->nFGroups == 0) {
+    pIter->index = -1;
+    pIter->fileId = -1;
+  } else {
+    if (direction == TSDB_FGROUP_ITER_FORWARD) {
+      pIter->index = 0;
+    } else {
+      pIter->index = pFileH->nFGroups - 1;
+    }
+    pIter->fileId = pFileH->pFGroup[pIter->index].fileId;
+  }
+}
+
+void tsdbSeekFileGroupIter(SFileGroupIter *pIter, int fid) {
+  STsdbFileH *pFileH = pIter->pFileH;
+
+  if (pFileH->nFGroups == 0) {
+    pIter->index = -1;
+    pIter->fileId = -1;
+    return;
+  }
+
+  int   flags = (pIter->direction == TSDB_FGROUP_ITER_FORWARD) ? TD_GE : TD_LE;
+  void *ptr = taosbsearch(&fid, (void *)pFileH->pFGroup, pFileH->nFGroups, sizeof(SFileGroup), keyFGroupCompFunc, flags);
+  if (ptr == NULL) {
+    pIter->index = -1;
+    pIter->fileId = -1;
+  } else {
+    pIter->index = (int)(POINTER_DISTANCE(ptr, pFileH->pFGroup) / sizeof(SFileGroup));
+    pIter->fileId = ((SFileGroup *)ptr)->fileId;
+  }
+}
+
+SFileGroup *tsdbGetFileGroupNext(SFileGroupIter *pIter) {
+  STsdbFileH *pFileH = pIter->pFileH;
+  SFileGroup *pFGroup = NULL;
+
+  if (pIter->index < 0 || pIter->index >= pFileH->nFGroups || pIter->fileId < 0) return NULL;
+
+  pFGroup = &pFileH->pFGroup[pIter->index];
+  if (pFGroup->fileId != pIter->fileId) {
+    tsdbSeekFileGroupIter(pIter, pIter->fileId);
+  }
+
+  if (pIter->index < 0) return NULL;
+
+  pFGroup = &pFileH->pFGroup[pIter->index];
+  ASSERT(pFGroup->fileId == pIter->fileId);
+
+  if (pIter->direction == TSDB_FGROUP_ITER_FORWARD) {
+    pIter->index++;
+  } else {
+    pIter->index--;
+  }
+
+  if (pIter->index >= 0 && pIter->index < pFileH->nFGroups) {
+    pIter->fileId = pFileH->pFGroup[pIter->index].fileId;
+  } else {
+    pIter->fileId = -1;
+  }
+
+  return pFGroup;
+}
+
+int tsdbOpenFile(SFile *pFile, int oflag) {
+  ASSERT(!TSDB_IS_FILE_OPENED(pFile));
+
+  pFile->fd = open(pFile->fname, oflag, 0755);
+  if (pFile->fd < 0) {
+    tsdbError("failed to open file %s since %s", pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  tsdbTrace("open file %s, fd %d", pFile->fname, pFile->fd);
+
+  return 0;
+}
+
+void tsdbCloseFile(SFile *pFile) {
+  if (TSDB_IS_FILE_OPENED(pFile)) {
+    tsdbTrace("close file %s, fd %d", pFile->fname, pFile->fd);
+    close(pFile->fd);
+    pFile->fd = -1;
+  }
+}
+
+int tsdbCreateFile(SFile *pFile, STsdbRepo *pRepo, int fid, int type) {
+  memset((void *)pFile, 0, sizeof(SFile));
+  pFile->fd = -1;
+
+  tsdbGetDataFileName(pRepo->rootDir, REPO_ID(pRepo), fid, type, pFile->fname);
+
+  if (access(pFile->fname, F_OK) == 0) {
+    tsdbError("vgId:%d file %s already exists", REPO_ID(pRepo), pFile->fname);
+    terrno = TSDB_CODE_TDB_FILE_ALREADY_EXISTS;
+    goto _err;
+  }
+
+  if (tsdbOpenFile(pFile, O_RDWR | O_CREAT) < 0) {
+    goto _err;
+  }
+
+  pFile->info.size = TSDB_FILE_HEAD_SIZE;
+  pFile->info.magic = TSDB_FILE_INIT_MAGIC;
+
+  if (tsdbUpdateFileHeader(pFile) < 0) {
+    tsdbCloseFile(pFile);
+    return -1;
+  }
+
+  tsdbCloseFile(pFile);
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+SFileGroup *tsdbSearchFGroup(STsdbFileH *pFileH, int fid, int flags) {
+  void *ptr =
+      taosbsearch((void *)(&fid), (void *)(pFileH->pFGroup), pFileH->nFGroups, sizeof(SFileGroup), keyFGroupCompFunc, flags);
+  if (ptr == NULL) return NULL;
+  return (SFileGroup *)ptr;
+}
+
+void tsdbFitRetention(STsdbRepo *pRepo) {
+  STsdbCfg *pCfg = &(pRepo->config);
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  SFileGroup *pGroup = pFileH->pFGroup;
+
+  int mfid = tsdbGetCurrMinFid(pCfg->precision, pCfg->keep, pCfg->daysPerFile);
+
+  pthread_rwlock_wrlock(&(pFileH->fhlock));
+
+  while (pFileH->nFGroups > 0 && pGroup[0].fileId < mfid) {
+    tsdbRemoveFileGroup(pRepo, pGroup);
+  }
+
+  pthread_rwlock_unlock(&(pFileH->fhlock));
+}
+
+int tsdbUpdateFileHeader(SFile *pFile) {
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  void *pBuf = (void *)buf;
+  taosEncodeFixedU32((void *)(&pBuf), TSDB_FILE_VERSION);
+  tsdbEncodeSFileInfo((void *)(&pBuf), &(pFile->info));
+
+  taosCalcChecksumAppend(0, (uint8_t *)buf, TSDB_FILE_HEAD_SIZE);
+
+  if (lseek(pFile->fd, 0, SEEK_SET) < 0) {
+    tsdbError("failed to lseek file %s since %s", pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+  if (taosTWrite(pFile->fd, (void *)buf, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE) {
+    tsdbError("failed to write %d bytes to file %s since %s", TSDB_FILE_HEAD_SIZE, pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  return 0;
+}
+
+int tsdbEncodeSFileInfo(void **buf, const STsdbFileInfo *pInfo) {
+  int tlen = 0;
+  tlen += taosEncodeFixedU32(buf, pInfo->magic);
+  tlen += taosEncodeFixedU32(buf, pInfo->len);
+  tlen += taosEncodeFixedU32(buf, pInfo->totalBlocks);
+  tlen += taosEncodeFixedU32(buf, pInfo->totalSubBlocks);
+  tlen += taosEncodeFixedU32(buf, pInfo->offset);
+  tlen += taosEncodeFixedU64(buf, pInfo->size);
+  tlen += taosEncodeFixedU64(buf, pInfo->tombSize);
+
+  return tlen;
+}
+
+void *tsdbDecodeSFileInfo(void *buf, STsdbFileInfo *pInfo) {
+  buf = taosDecodeFixedU32(buf, &(pInfo->magic));
+  buf = taosDecodeFixedU32(buf, &(pInfo->len));
+  buf = taosDecodeFixedU32(buf, &(pInfo->totalBlocks));
+  buf = taosDecodeFixedU32(buf, &(pInfo->totalSubBlocks));
+  buf = taosDecodeFixedU32(buf, &(pInfo->offset));
+  buf = taosDecodeFixedU64(buf, &(pInfo->size));
+  buf = taosDecodeFixedU64(buf, &(pInfo->tombSize));
+
+  return buf;
+}
+
+void tsdbRemoveFileGroup(STsdbRepo *pRepo, SFileGroup *pFGroup) {
+  ASSERT(pFGroup != NULL);
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+
+  SFileGroup fileGroup = *pFGroup;
+
+  int nFilesLeft = pFileH->nFGroups - (int)(POINTER_DISTANCE(pFGroup, pFileH->pFGroup) / sizeof(SFileGroup) + 1);
+  if (nFilesLeft > 0) {
+    memmove((void *)pFGroup, POINTER_SHIFT(pFGroup, sizeof(SFileGroup)), sizeof(SFileGroup) * nFilesLeft);
+  }
+
+  pFileH->nFGroups--;
+  ASSERT(pFileH->nFGroups >= 0);
+
+  for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
+    if (remove(fileGroup.files[type].fname) < 0) {
+      tsdbError("vgId:%d failed to remove file %s", REPO_ID(pRepo), fileGroup.files[type].fname);
+    }
+    tsdbDestroyFile(&fileGroup.files[type]);
+  }
+}
+
+int tsdbLoadFileHeader(SFile *pFile, uint32_t *version) {
+  char buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  if (lseek(pFile->fd, 0, SEEK_SET) < 0) {
+    tsdbError("failed to lseek file %s to start since %s", pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosTRead(pFile->fd, buf, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE) {
+    tsdbError("failed to read file %s header part with %d bytes, reason:%s", pFile->fname, TSDB_FILE_HEAD_SIZE,
+              strerror(errno));
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)buf, TSDB_FILE_HEAD_SIZE)) {
+    tsdbError("file %s header part is corrupted with failed checksum", pFile->fname);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  void *pBuf = (void *)buf;
+  pBuf = taosDecodeFixedU32(pBuf, version);
+  pBuf = tsdbDecodeSFileInfo(pBuf, &(pFile->info));
+
+  return 0;
+}
+
+void tsdbGetFileInfoImpl(char *fname, uint32_t *magic, int64_t *size) {
+  uint32_t      version = 0;
+  SFile         file;
+  SFile *       pFile = &file;
+
+  strncpy(pFile->fname, fname, TSDB_FILENAME_LEN);
+  pFile->fd = -1;
+
+  if (tsdbOpenFile(pFile, O_RDONLY) < 0) goto _err;
+  if (tsdbLoadFileHeader(pFile, &version) < 0) goto _err;
+
+  off_t offset = lseek(pFile->fd, 0, SEEK_END);
+  if (offset < 0) goto _err;
+  tsdbCloseFile(pFile);
+
+  *magic = pFile->info.magic;
+  *size = offset;
+
+  return;
+
+_err:
+  tsdbCloseFile(pFile);
+  *magic = TSDB_FILE_INIT_MAGIC;
+  *size = 0;
+}
+
+// ---------------- LOCAL FUNCTIONS ----------------
+static int tsdbInitFile(SFile *pFile, STsdbRepo *pRepo, int fid, int type) {
+  uint32_t version;
+
+  tsdbGetDataFileName(pRepo->rootDir, REPO_ID(pRepo), fid, type, pFile->fname);
+
+  pFile->fd = -1;
+  if (tsdbOpenFile(pFile, O_RDONLY) < 0) goto _err;
+
+  if (tsdbLoadFileHeader(pFile, &version) < 0) {
+    tsdbError("vgId:%d failed to load file %s header part since %s", REPO_ID(pRepo), pFile->fname, tstrerror(terrno));
+    goto _err;
+  }
+
+  if (pFile->info.size == TSDB_FILE_HEAD_SIZE) {
+    pFile->info.size = lseek(pFile->fd, 0, SEEK_END);
+  }
+
+  if (version != TSDB_FILE_VERSION) {
+    // TODO: deal with error
+    tsdbError("vgId:%d file %s version %u is not the same as program version %u which may cause problem",
+              REPO_ID(pRepo), pFile->fname, version, TSDB_FILE_VERSION);
+  }
+
+  tsdbCloseFile(pFile);
+
+  return 0;
+_err:
+  tsdbDestroyFile(pFile);
+  return -1;
+}
+
+static void tsdbDestroyFile(SFile *pFile) { tsdbCloseFile(pFile); }
+
+static int compFGroup(const void *arg1, const void *arg2) {
+  int val1 = ((SFileGroup *)arg1)->fileId;
+  int val2 = ((SFileGroup *)arg2)->fileId;
+
+  if (val1 < val2) {
+    return -1;
+  } else if (val1 > val2) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+static int keyFGroupCompFunc(const void *key, const void *fgroup) {
+  int         fid = *(int *)key;
+  SFileGroup *pFGroup = (SFileGroup *)fgroup;
+  if (fid == pFGroup->fileId) {
+    return 0;
+  } else {
+    return fid > pFGroup->fileId ? 1 : -1;
+  }
+}
+
+static void tsdbInitFileGroup(SFileGroup *pFGroup, STsdbRepo *pRepo) {
+  for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
+    if (tsdbInitFile(&pFGroup->files[type], pRepo, pFGroup->fileId, type) < 0) {
+      memset(&pFGroup->files[type].info, 0, sizeof(STsdbFileInfo));
+      pFGroup->files[type].info.magic = TSDB_FILE_INIT_MAGIC;
+      pFGroup->state = 1;
+      pRepo->state = TSDB_STATE_BAD_FILE;
+      terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    }
+  }
+}
+
+static TSKEY tsdbGetCurrMinKey(int8_t precision, int32_t keep) {
+  return (TSKEY)(taosGetTimestamp(precision) - keep * tsMsPerDay[precision]);
+}
+
+static int tsdbGetCurrMinFid(int8_t precision, int32_t keep, int32_t days) {
+  return (int)(TSDB_KEY_FILEID(tsdbGetCurrMinKey(precision, keep), days, precision));
+}
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..a1e6376304a54ea810f3662bd30e3f97fd53765c
--- /dev/null
+++ b/src/tsdb/src/tsdbMain.c
@@ -0,0 +1,1141 @@
+/*
+ * 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/>.
+ */
+
+// no test file errors here
+#include "tsdbMain.h"
+#include "os.h"
+#include "talgo.h"
+#include "taosdef.h"
+#include "tchecksum.h"
+#include "tscompression.h"
+#include "tsdb.h"
+#include "tulog.h"
+
+#define TSDB_CFG_FILE_NAME "config"
+#define TSDB_DATA_DIR_NAME "data"
+#define TSDB_META_FILE_NAME "meta"
+#define TSDB_META_FILE_INDEX 10000000
+#define IS_VALID_PRECISION(precision) \
+  (((precision) >= TSDB_TIME_PRECISION_MILLI) && ((precision) <= TSDB_TIME_PRECISION_NANO))
+#define TSDB_DEFAULT_COMPRESSION TWO_STAGE_COMP
+#define IS_VALID_COMPRESSION(compression) (((compression) >= NO_COMPRESSION) && ((compression) <= TWO_STAGE_COMP))
+
+typedef struct {
+  int32_t  totalLen;
+  int32_t  len;
+  SDataRow row;
+} SSubmitBlkIter;
+
+typedef struct {
+  int32_t totalLen;
+  int32_t len;
+  void *  pMsg;
+} SSubmitMsgIter;
+
+static int32_t     tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg);
+static int32_t     tsdbSetRepoEnv(char *rootDir, STsdbCfg *pCfg);
+static int32_t     tsdbUnsetRepoEnv(char *rootDir);
+static int32_t     tsdbSaveConfig(char *rootDir, STsdbCfg *pCfg);
+static int         tsdbLoadConfig(char *rootDir, STsdbCfg *pCfg);
+static char *      tsdbGetCfgFname(char *rootDir);
+static STsdbRepo * tsdbNewRepo(char *rootDir, STsdbAppH *pAppH, STsdbCfg *pCfg);
+static void        tsdbFreeRepo(STsdbRepo *pRepo);
+static int         tsdbInitSubmitMsgIter(SSubmitMsg *pMsg, SSubmitMsgIter *pIter);
+static int32_t     tsdbInsertDataToTable(STsdbRepo *pRepo, SSubmitBlk *pBlock, TSKEY now, int32_t *affectedrows);
+static int         tsdbGetSubmitMsgNext(SSubmitMsgIter *pIter, SSubmitBlk **pPBlock);
+static SDataRow    tsdbGetSubmitBlkNext(SSubmitBlkIter *pIter);
+static int         tsdbRestoreInfo(STsdbRepo *pRepo);
+static int         tsdbInitSubmitBlkIter(SSubmitBlk *pBlock, SSubmitBlkIter *pIter);
+static void        tsdbAlterCompression(STsdbRepo *pRepo, int8_t compression);
+static int         tsdbAlterKeep(STsdbRepo *pRepo, int32_t keep);
+static int         tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks);
+static int         keyFGroupCompFunc(const void *key, const void *fgroup);
+static int         tsdbEncodeCfg(void **buf, STsdbCfg *pCfg);
+static void *      tsdbDecodeCfg(void *buf, STsdbCfg *pCfg);
+static int         tsdbCheckTableSchema(STsdbRepo *pRepo, SSubmitBlk *pBlock, STable *pTable);
+static int         tsdbScanAndConvertSubmitMsg(STsdbRepo *pRepo, SSubmitMsg *pMsg);
+static void        tsdbStartStream(STsdbRepo *pRepo);
+static void        tsdbStopStream(STsdbRepo *pRepo);
+
+// Function declaration
+int32_t tsdbCreateRepo(char *rootDir, STsdbCfg *pCfg) {
+  DIR *dir = opendir(rootDir);
+  if (dir) {
+    tsdbDebug("repository %s already exists", rootDir);
+    closedir(dir);
+    return 0;
+  } else {
+    if (ENOENT != errno) {
+      tsdbError("failed to open directory %s since %s", rootDir, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      return -1;
+    }
+  }
+
+  if (mkdir(rootDir, 0755) < 0) {
+    tsdbError("vgId:%d failed to create rootDir %s since %s", pCfg->tsdbId, rootDir, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (tsdbCheckAndSetDefaultCfg(pCfg) < 0) return -1;
+
+  if (tsdbSetRepoEnv(rootDir, pCfg) < 0) return -1;
+
+  tsdbDebug(
+      "vgId:%d tsdb env create succeed! cacheBlockSize %d totalBlocks %d daysPerFile %d keep "
+      "%d minRowsPerFileBlock %d maxRowsPerFileBlock %d precision %d compression %d",
+      pCfg->tsdbId, pCfg->cacheBlockSize, pCfg->totalBlocks, pCfg->daysPerFile, pCfg->keep, pCfg->minRowsPerFileBlock,
+      pCfg->maxRowsPerFileBlock, pCfg->precision, pCfg->compression);
+  return 0;
+}
+
+int32_t tsdbDropRepo(char *rootDir) { return tsdbUnsetRepoEnv(rootDir); }
+
+TSDB_REPO_T *tsdbOpenRepo(char *rootDir, STsdbAppH *pAppH) {
+  STsdbCfg   config = {0};
+  STsdbRepo *pRepo = NULL;
+
+  terrno = TSDB_CODE_SUCCESS;
+
+  if (tsdbLoadConfig(rootDir, &config) < 0) {
+    tsdbError("failed to open repo in rootDir %s since %s", rootDir, tstrerror(terrno));
+    return NULL;
+  }
+
+  pRepo = tsdbNewRepo(rootDir, pAppH, &config);
+  if (pRepo == NULL) {
+    tsdbError("failed to open repo in rootDir %s since %s", rootDir, tstrerror(terrno));
+    return NULL;
+  }
+
+  if (tsdbOpenMeta(pRepo) < 0) {
+    tsdbError("vgId:%d failed to open meta since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  if (tsdbOpenBufPool(pRepo) < 0) {
+    tsdbError("vgId:%d failed to open buffer pool since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  if (tsdbOpenFileH(pRepo) < 0) {
+    tsdbError("vgId:%d failed to open file handle since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  if (tsdbRestoreInfo(pRepo) < 0) {
+    tsdbError("vgId:%d failed to restore info from file since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  tsdbStartStream(pRepo);
+
+  tsdbDebug("vgId:%d open tsdb repository succeed!", REPO_ID(pRepo));
+
+  return (TSDB_REPO_T *)pRepo;
+
+_err:
+  tsdbCloseRepo(pRepo, false);
+  return NULL;
+}
+
+// Note: all working thread and query thread must stopped when calling this function
+void tsdbCloseRepo(TSDB_REPO_T *repo, int toCommit) {
+  if (repo == NULL) return;
+
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  int        vgId = REPO_ID(pRepo);
+
+  tsdbStopStream(pRepo);
+
+  if (toCommit) {
+    tsdbAsyncCommit(pRepo);
+    if (pRepo->commit) pthread_join(pRepo->commitThread, NULL);
+  }
+  tsdbUnRefMemTable(pRepo, pRepo->mem);
+  tsdbUnRefMemTable(pRepo, pRepo->imem);
+  pRepo->mem = NULL;
+  pRepo->imem = NULL;
+
+  tsdbCloseFileH(pRepo);
+  tsdbCloseBufPool(pRepo);
+  tsdbCloseMeta(pRepo);
+  tsdbFreeRepo(pRepo);
+  tsdbDebug("vgId:%d repository is closed", vgId);
+}
+
+int32_t tsdbInsertData(TSDB_REPO_T *repo, SSubmitMsg *pMsg, SShellSubmitRspMsg *pRsp) {
+  STsdbRepo *    pRepo = (STsdbRepo *)repo;
+  SSubmitMsgIter msgIter = {0};
+
+  if (tsdbScanAndConvertSubmitMsg(pRepo, pMsg) < 0) {
+    if (terrno != TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+      tsdbError("vgId:%d failed to insert data since %s", REPO_ID(pRepo), tstrerror(terrno));
+    }
+    return -1;
+  }
+
+  if (tsdbInitSubmitMsgIter(pMsg, &msgIter) < 0) {
+    tsdbError("vgId:%d failed to insert data since %s", REPO_ID(pRepo), tstrerror(terrno));
+    return -1;
+  }
+
+  SSubmitBlk *pBlock = NULL;
+  int32_t     affectedrows = 0;
+
+  TSKEY now = taosGetTimestamp(pRepo->config.precision);
+  while (true) {
+    tsdbGetSubmitMsgNext(&msgIter, &pBlock);
+    if (pBlock == NULL) break;
+    if (tsdbInsertDataToTable(pRepo, pBlock, now, &affectedrows) < 0) {
+      return -1;
+    }
+  }
+
+  if (pRsp != NULL) pRsp->affectedRows = htonl(affectedrows);
+
+  if (tsdbCheckCommit(pRepo) < 0) return -1;
+  return 0;
+}
+
+uint32_t tsdbGetFileInfo(TSDB_REPO_T *repo, char *name, uint32_t *index, uint32_t eindex, int64_t *size) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  // STsdbMeta *pMeta = pRepo->tsdbMeta;
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  uint32_t    magic = 0;
+  char *      fname = NULL;
+
+  struct stat fState;
+
+  tsdbDebug("vgId:%d name:%s index:%d eindex:%d", pRepo->config.tsdbId, name, *index, eindex);
+  ASSERT(*index <= eindex);
+
+  char *sdup = strdup(pRepo->rootDir);
+  char *prefix = dirname(sdup);
+  int   prefixLen = (int)strlen(prefix);
+
+  if (name[0] == 0) {  // get the file from index or after, but not larger than eindex
+    taosTFree(sdup);
+    int fid = (*index) / TSDB_FILE_TYPE_MAX;
+
+    if (pFileH->nFGroups == 0 || fid > pFileH->pFGroup[pFileH->nFGroups - 1].fileId) {
+      if (*index <= TSDB_META_FILE_INDEX && TSDB_META_FILE_INDEX <= eindex) {
+        fname = tsdbGetMetaFileName(pRepo->rootDir);
+        *index = TSDB_META_FILE_INDEX;
+        magic = TSDB_META_FILE_MAGIC(pRepo->tsdbMeta);
+      } else {
+        return 0;
+      }
+    } else {
+      SFileGroup *pFGroup =
+          taosbsearch(&fid, pFileH->pFGroup, pFileH->nFGroups, sizeof(SFileGroup), keyFGroupCompFunc, TD_GE);
+      if (pFGroup->fileId == fid) {
+        fname = strdup(pFGroup->files[(*index) % TSDB_FILE_TYPE_MAX].fname);
+        magic = pFGroup->files[(*index) % TSDB_FILE_TYPE_MAX].info.magic;
+      } else {
+        if ((pFGroup->fileId + 1) * TSDB_FILE_TYPE_MAX - 1 < (int)eindex) {
+          fname = strdup(pFGroup->files[0].fname);
+          *index = pFGroup->fileId * TSDB_FILE_TYPE_MAX;
+          magic = pFGroup->files[0].info.magic;
+        } else {
+          return 0;
+        }
+      }
+    }
+    strcpy(name, fname + prefixLen);
+  } else {  // get the named file at the specified index. If not there, return 0
+    fname = malloc(prefixLen + strlen(name) + 2);
+    sprintf(fname, "%s/%s", prefix, name);
+    if (access(fname, F_OK) != 0) {
+      taosFree(fname);
+      taosFree(sdup);
+      return 0;
+    }
+    if (*index == TSDB_META_FILE_INDEX) {  // get meta file
+      tsdbGetStoreInfo(fname, &magic, size);
+    } else {
+      tsdbGetFileInfoImpl(fname, &magic, size);
+    }
+    taosFree(fname);
+    taosFree(sdup);
+    return magic;
+  }
+
+  if (stat(fname, &fState) < 0) {
+    taosTFree(fname);
+    return 0;
+  }
+
+  *size = fState.st_size;
+  // magic = *size;
+
+  taosTFree(fname);
+  return magic;
+}
+
+STsdbCfg *tsdbGetCfg(const TSDB_REPO_T *repo) {
+  ASSERT(repo != NULL);
+  return &((STsdbRepo *)repo)->config;
+}
+
+int32_t tsdbConfigRepo(TSDB_REPO_T *repo, STsdbCfg *pCfg) {
+  // TODO: think about multithread cases
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbCfg * pRCfg = &pRepo->config;
+
+  if (tsdbCheckAndSetDefaultCfg(pCfg) < 0) return -1;
+
+  ASSERT(pRCfg->tsdbId == pCfg->tsdbId);
+  ASSERT(pRCfg->cacheBlockSize == pCfg->cacheBlockSize);
+  ASSERT(pRCfg->daysPerFile == pCfg->daysPerFile);
+  ASSERT(pRCfg->minRowsPerFileBlock == pCfg->minRowsPerFileBlock);
+  ASSERT(pRCfg->maxRowsPerFileBlock == pCfg->maxRowsPerFileBlock);
+  ASSERT(pRCfg->precision == pCfg->precision);
+
+  bool configChanged = false;
+  if (pRCfg->compression != pCfg->compression) {
+    tsdbAlterCompression(pRepo, pCfg->compression);
+    configChanged = true;
+  }
+  if (pRCfg->keep != pCfg->keep) {
+    if (tsdbAlterKeep(pRepo, pCfg->keep) < 0) {
+      tsdbError("vgId:%d failed to configure repo when alter keep since %s", REPO_ID(pRepo), tstrerror(terrno));
+      return -1;
+    }
+    configChanged = true;
+  }
+  if (pRCfg->totalBlocks != pCfg->totalBlocks) {
+    tsdbAlterCacheTotalBlocks(pRepo, pCfg->totalBlocks);
+    configChanged = true;
+  }
+
+  if (configChanged) {
+    if (tsdbSaveConfig(pRepo->rootDir, &pRepo->config) < 0) {
+      tsdbError("vgId:%d failed to configure repository while save config since %s", REPO_ID(pRepo), tstrerror(terrno));
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+void tsdbReportStat(void *repo, int64_t *totalPoints, int64_t *totalStorage, int64_t *compStorage) {
+  ASSERT(repo != NULL);
+  STsdbRepo *pRepo = repo;
+  *totalPoints = pRepo->stat.pointsWritten;
+  *totalStorage = pRepo->stat.totalStorage;
+  *compStorage = pRepo->stat.compStorage;
+}
+
+int tsdbGetState(TSDB_REPO_T *repo) {
+  return ((STsdbRepo *)repo)->state;
+}
+
+// ----------------- INTERNAL FUNCTIONS -----------------
+char *tsdbGetMetaFileName(char *rootDir) {
+  int   tlen = (int)(strlen(rootDir) + strlen(TSDB_META_FILE_NAME) + 2);
+  char *fname = calloc(1, tlen);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  snprintf(fname, tlen, "%s/%s", rootDir, TSDB_META_FILE_NAME);
+  return fname;
+}
+
+void tsdbGetDataFileName(char *rootDir, int vid, int fid, int type, char *fname) {
+  snprintf(fname, TSDB_FILENAME_LEN, "%s/%s/v%df%d%s", rootDir, TSDB_DATA_DIR_NAME, vid, fid, tsdbFileSuffix[type]);
+}
+
+int tsdbLockRepo(STsdbRepo *pRepo) {
+  int code = pthread_mutex_lock(&pRepo->mutex);
+  if (code != 0) {
+    tsdbError("vgId:%d failed to lock tsdb since %s", REPO_ID(pRepo), strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+  pRepo->repoLocked = true;
+  return 0;
+}
+
+int tsdbUnlockRepo(STsdbRepo *pRepo) {
+  ASSERT(IS_REPO_LOCKED(pRepo));
+  pRepo->repoLocked = false;
+  int code = pthread_mutex_unlock(&pRepo->mutex);
+  if (code != 0) {
+    tsdbError("vgId:%d failed to unlock tsdb since %s", REPO_ID(pRepo), strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+  return 0;
+}
+
+char *tsdbGetDataDirName(char *rootDir) {
+  int   tlen = (int)(strlen(rootDir) + strlen(TSDB_DATA_DIR_NAME) + 2);
+  char *fname = calloc(1, tlen);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  snprintf(fname, tlen, "%s/%s", rootDir, TSDB_DATA_DIR_NAME);
+  return fname;
+}
+
+int tsdbGetNextMaxTables(int tid) {
+  ASSERT(tid >= 1 && tid <= TSDB_MAX_TABLES);
+  int maxTables = TSDB_INIT_NTABLES;
+  while (true) {
+    maxTables = MIN(maxTables, TSDB_MAX_TABLES);
+    if (tid <= maxTables) break;
+    maxTables *= 2;
+  }
+
+  return maxTables + 1;
+}
+
+int tsdbCheckCommit(STsdbRepo *pRepo) {
+  ASSERT(pRepo->mem != NULL);
+  STsdbCfg *pCfg = &(pRepo->config);
+
+  STsdbBufBlock *pBufBlock = tsdbGetCurrBufBlock(pRepo);
+  ASSERT(pBufBlock != NULL);
+  if ((pRepo->mem->extraBuffList != NULL) ||
+      ((listNEles(pRepo->mem->bufBlockList) >= pCfg->totalBlocks / 3) && (pBufBlock->remain < TSDB_BUFFER_RESERVE))) {
+    // trigger commit
+    if (tsdbAsyncCommit(pRepo) < 0) return -1;
+  }
+
+  return 0;
+}
+
+STsdbMeta *    tsdbGetMeta(TSDB_REPO_T *pRepo) { return ((STsdbRepo *)pRepo)->tsdbMeta; }
+STsdbFileH *   tsdbGetFile(TSDB_REPO_T *pRepo) { return ((STsdbRepo *)pRepo)->tsdbFileH; }
+STsdbRepoInfo *tsdbGetStatus(TSDB_REPO_T *pRepo) { return NULL; }
+
+// ----------------- LOCAL FUNCTIONS -----------------
+static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) {
+  // Check precision
+  if (pCfg->precision == -1) {
+    pCfg->precision = TSDB_DEFAULT_PRECISION;
+  } else {
+    if (!IS_VALID_PRECISION(pCfg->precision)) {
+      tsdbError("vgId:%d invalid precision configuration %d", pCfg->tsdbId, pCfg->precision);
+      goto _err;
+    }
+  }
+
+  // Check compression
+  if (pCfg->compression == -1) {
+    pCfg->compression = TSDB_DEFAULT_COMPRESSION;
+  } else {
+    if (!IS_VALID_COMPRESSION(pCfg->compression)) {
+      tsdbError("vgId:%d invalid compression configuration %d", pCfg->tsdbId, pCfg->precision);
+      goto _err;
+    }
+  }
+
+  // Check tsdbId
+  if (pCfg->tsdbId < 0) {
+    tsdbError("vgId:%d invalid vgroup ID", pCfg->tsdbId);
+    goto _err;
+  }
+
+  // Check daysPerFile
+  if (pCfg->daysPerFile == -1) {
+    pCfg->daysPerFile = TSDB_DEFAULT_DAYS_PER_FILE;
+  } else {
+    if (pCfg->daysPerFile < TSDB_MIN_DAYS_PER_FILE || pCfg->daysPerFile > TSDB_MAX_DAYS_PER_FILE) {
+      tsdbError(
+          "vgId:%d invalid daysPerFile configuration! daysPerFile %d TSDB_MIN_DAYS_PER_FILE %d TSDB_MAX_DAYS_PER_FILE "
+          "%d",
+          pCfg->tsdbId, pCfg->daysPerFile, TSDB_MIN_DAYS_PER_FILE, TSDB_MAX_DAYS_PER_FILE);
+      goto _err;
+    }
+  }
+
+  // Check minRowsPerFileBlock and maxRowsPerFileBlock
+  if (pCfg->minRowsPerFileBlock == -1) {
+    pCfg->minRowsPerFileBlock = TSDB_DEFAULT_MIN_ROW_FBLOCK;
+  } else {
+    if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK) {
+      tsdbError(
+          "vgId:%d invalid minRowsPerFileBlock configuration! minRowsPerFileBlock %d TSDB_MIN_MIN_ROW_FBLOCK %d "
+          "TSDB_MAX_MIN_ROW_FBLOCK %d",
+          pCfg->tsdbId, pCfg->minRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK);
+      goto _err;
+    }
+  }
+
+  if (pCfg->maxRowsPerFileBlock == -1) {
+    pCfg->maxRowsPerFileBlock = TSDB_DEFAULT_MAX_ROW_FBLOCK;
+  } else {
+    if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK) {
+      tsdbError(
+          "vgId:%d invalid maxRowsPerFileBlock configuration! maxRowsPerFileBlock %d TSDB_MIN_MAX_ROW_FBLOCK %d "
+          "TSDB_MAX_MAX_ROW_FBLOCK %d",
+          pCfg->tsdbId, pCfg->maxRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK);
+      goto _err;
+    }
+  }
+
+  if (pCfg->minRowsPerFileBlock > pCfg->maxRowsPerFileBlock) {
+    tsdbError("vgId:%d invalid configuration! minRowsPerFileBlock %d maxRowsPerFileBlock %d", pCfg->tsdbId,
+              pCfg->minRowsPerFileBlock, pCfg->maxRowsPerFileBlock);
+    goto _err;
+  }
+
+  // Check keep
+  if (pCfg->keep == -1) {
+    pCfg->keep = TSDB_DEFAULT_KEEP;
+  } else {
+    if (pCfg->keep < TSDB_MIN_KEEP || pCfg->keep > TSDB_MAX_KEEP) {
+      tsdbError(
+          "vgId:%d invalid keep configuration! keep %d TSDB_MIN_KEEP %d "
+          "TSDB_MAX_KEEP %d",
+          pCfg->tsdbId, pCfg->keep, TSDB_MIN_KEEP, TSDB_MAX_KEEP);
+      goto _err;
+    }
+  }
+
+  return 0;
+
+_err:
+  terrno = TSDB_CODE_TDB_INVALID_CONFIG;
+  return -1;
+}
+
+static int32_t tsdbSetRepoEnv(char *rootDir, STsdbCfg *pCfg) {
+  if (tsdbSaveConfig(rootDir, pCfg) < 0) {
+    tsdbError("vgId:%d failed to set TSDB environment since %s", pCfg->tsdbId, tstrerror(terrno));
+    return -1;
+  }
+
+  char *dirName = tsdbGetDataDirName(rootDir);
+  if (dirName == NULL) return -1;
+
+  if (mkdir(dirName, 0755) < 0) {
+    tsdbError("vgId:%d failed to create directory %s since %s", pCfg->tsdbId, dirName, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    free(dirName);
+    return -1;
+  }
+
+  free(dirName);
+
+  char *fname = tsdbGetMetaFileName(rootDir);
+  if (fname == NULL) return -1;
+  if (tdCreateKVStore(fname) < 0) {
+    tsdbError("vgId:%d failed to open KV store since %s", pCfg->tsdbId, tstrerror(terrno));
+    free(fname);
+    return -1;
+  }
+
+  free(fname);
+  return 0;
+}
+
+static int32_t tsdbUnsetRepoEnv(char *rootDir) {
+  taosRemoveDir(rootDir);
+  tsdbDebug("repository %s is removed", rootDir);
+  return 0;
+}
+
+static int32_t tsdbSaveConfig(char *rootDir, STsdbCfg *pCfg) {
+  int   fd = -1;
+  char *fname = NULL;
+  char  buf[TSDB_FILE_HEAD_SIZE] = "\0";
+  char *pBuf = buf;
+
+  fname = tsdbGetCfgFname(rootDir);
+  if (fname == NULL) {
+    tsdbError("vgId:%d failed to save configuration since %s", pCfg->tsdbId, tstrerror(terrno));
+    goto _err;
+  }
+
+  fd = open(fname, O_WRONLY | O_CREAT, 0755);
+  if (fd < 0) {
+    tsdbError("vgId:%d failed to open file %s since %s", pCfg->tsdbId, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  int tlen = tsdbEncodeCfg((void *)(&pBuf), pCfg);
+  ASSERT((tlen + sizeof(TSCKSUM) <= TSDB_FILE_HEAD_SIZE) && (POINTER_DISTANCE(pBuf, buf) == tlen));
+
+  taosCalcChecksumAppend(0, (uint8_t *)buf, TSDB_FILE_HEAD_SIZE);
+
+  if (taosTWrite(fd, (void *)buf, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE) {
+    tsdbError("vgId:%d failed to write %d bytes to file %s since %s", pCfg->tsdbId, TSDB_FILE_HEAD_SIZE, fname,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (fsync(fd) < 0) {
+    tsdbError("vgId:%d failed to fsync file %s since %s", pCfg->tsdbId, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  free(fname);
+  close(fd);
+  return 0;
+
+_err:
+  taosTFree(fname);
+  if (fd >= 0) close(fd);
+  return -1;
+}
+
+static int tsdbLoadConfig(char *rootDir, STsdbCfg *pCfg) {
+  char *fname = NULL;
+  int   fd = -1;
+  char  buf[TSDB_FILE_HEAD_SIZE] = "\0";
+
+  fname = tsdbGetCfgFname(rootDir);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  fd = open(fname, O_RDONLY);
+  if (fd < 0) {
+    tsdbError("failed to open file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (taosTRead(fd, (void *)buf, TSDB_FILE_HEAD_SIZE) < TSDB_FILE_HEAD_SIZE) {
+    tsdbError("failed to read %d bytes from file %s since %s", TSDB_FILE_HEAD_SIZE, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)buf, TSDB_FILE_HEAD_SIZE)) {
+    tsdbError("file %s is corrupted", fname);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    goto _err;
+  }
+
+  tsdbDecodeCfg(buf, pCfg);
+
+  taosTFree(fname);
+  close(fd);
+
+  return 0;
+
+_err:
+  taosTFree(fname);
+  if (fd >= 0) close(fd);
+  return -1;
+}
+
+static char *tsdbGetCfgFname(char *rootDir) {
+  int   tlen = (int)(strlen(rootDir) + strlen(TSDB_CFG_FILE_NAME) + 2);
+  char *fname = calloc(1, tlen);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  snprintf(fname, tlen, "%s/%s", rootDir, TSDB_CFG_FILE_NAME);
+  return fname;
+}
+
+static STsdbRepo *tsdbNewRepo(char *rootDir, STsdbAppH *pAppH, STsdbCfg *pCfg) {
+  STsdbRepo *pRepo = (STsdbRepo *)calloc(1, sizeof(STsdbRepo));
+  if (pRepo == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pRepo->state = TSDB_STATE_OK;
+
+  int code = pthread_mutex_init(&pRepo->mutex, NULL);
+  if (code != 0) {
+    terrno = TAOS_SYSTEM_ERROR(code);
+    goto _err;
+  }
+
+  pRepo->repoLocked = false;
+
+  pRepo->rootDir = strdup(rootDir);
+  if (pRepo->rootDir == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pRepo->config = *pCfg;
+  if (pAppH) pRepo->appH = *pAppH;
+
+  pRepo->tsdbMeta = tsdbNewMeta(pCfg);
+  if (pRepo->tsdbMeta == NULL) {
+    tsdbError("vgId:%d failed to create meta since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  pRepo->pPool = tsdbNewBufPool(pCfg);
+  if (pRepo->pPool == NULL) {
+    tsdbError("vgId:%d failed to create buffer pool since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  pRepo->tsdbFileH = tsdbNewFileH(pCfg);
+  if (pRepo->tsdbFileH == NULL) {
+    tsdbError("vgId:%d failed to create file handle since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  return pRepo;
+
+_err:
+  tsdbFreeRepo(pRepo);
+  return NULL;
+}
+
+static void tsdbFreeRepo(STsdbRepo *pRepo) {
+  if (pRepo) {
+    tsdbFreeFileH(pRepo->tsdbFileH);
+    tsdbFreeBufPool(pRepo->pPool);
+    tsdbFreeMeta(pRepo->tsdbMeta);
+    // tsdbFreeMemTable(pRepo->mem);
+    // tsdbFreeMemTable(pRepo->imem);
+    taosTFree(pRepo->rootDir);
+    pthread_mutex_destroy(&pRepo->mutex);
+    free(pRepo);
+  }
+}
+
+static int tsdbInitSubmitMsgIter(SSubmitMsg *pMsg, SSubmitMsgIter *pIter) {
+  if (pMsg == NULL) {
+    terrno = TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP;
+    return -1;
+  }
+
+  pIter->totalLen = pMsg->length;
+  pIter->len = 0;
+  pIter->pMsg = pMsg;
+  if (pMsg->length <= TSDB_SUBMIT_MSG_HEAD_SIZE) {
+    terrno = TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP;
+    return -1;
+  }
+
+  return 0;
+}
+
+static int32_t tsdbInsertDataToTable(STsdbRepo *pRepo, SSubmitBlk *pBlock, TSKEY now, int32_t *affectedrows) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  int64_t    points = 0;
+
+  ASSERT(pBlock->tid < pMeta->maxTables);
+  STable *pTable = pMeta->tables[pBlock->tid];
+  ASSERT(pTable != NULL && TABLE_UID(pTable) == pBlock->uid);
+
+  SSubmitBlkIter blkIter = {0};
+  SDataRow       row = NULL;
+
+  TSKEY minKey = now - tsMsPerDay[pRepo->config.precision] * pRepo->config.keep;
+  TSKEY maxKey = now + tsMsPerDay[pRepo->config.precision] * pRepo->config.daysPerFile;
+
+  tsdbInitSubmitBlkIter(pBlock, &blkIter);
+  while ((row = tsdbGetSubmitBlkNext(&blkIter)) != NULL) {
+    if (dataRowKey(row) < minKey || dataRowKey(row) > maxKey) {
+      tsdbError("vgId:%d table %s tid %d uid %" PRIu64 " timestamp is out of range! now %" PRId64 " minKey %" PRId64
+                " maxKey %" PRId64,
+                REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable), now, minKey, maxKey);
+      terrno = TSDB_CODE_TDB_TIMESTAMP_OUT_OF_RANGE;
+      return -1;
+    }
+
+    if (tsdbInsertRowToMem(pRepo, row, pTable) < 0) return -1;
+
+    (*affectedrows)++;
+    points++;
+  }
+
+  STSchema *pSchema = tsdbGetTableSchemaByVersion(pTable, pBlock->sversion);
+  pRepo->stat.pointsWritten += points * schemaNCols(pSchema);
+  pRepo->stat.totalStorage += points * schemaVLen(pSchema);
+
+  return 0;
+}
+
+static int tsdbGetSubmitMsgNext(SSubmitMsgIter *pIter, SSubmitBlk **pPBlock) {
+  if (pIter->len == 0) {
+    pIter->len += TSDB_SUBMIT_MSG_HEAD_SIZE;
+  } else {
+    SSubmitBlk *pSubmitBlk = (SSubmitBlk *)POINTER_SHIFT(pIter->pMsg, pIter->len);
+    pIter->len += (sizeof(SSubmitBlk) + pSubmitBlk->dataLen + pSubmitBlk->schemaLen);
+  }
+
+  if (pIter->len > pIter->totalLen) {
+    terrno = TSDB_CODE_TDB_SUBMIT_MSG_MSSED_UP;
+    *pPBlock = NULL;
+    return -1;
+  }
+
+  *pPBlock = (pIter->len == pIter->totalLen) ? NULL : (SSubmitBlk *)POINTER_SHIFT(pIter->pMsg, pIter->len);
+
+  return 0;
+}
+
+static SDataRow tsdbGetSubmitBlkNext(SSubmitBlkIter *pIter) {
+  SDataRow row = pIter->row;
+  if (row == NULL) return NULL;
+
+  pIter->len += dataRowLen(row);
+  if (pIter->len >= pIter->totalLen) {
+    pIter->row = NULL;
+  } else {
+    pIter->row = (char *)row + dataRowLen(row);
+  }
+
+  return row;
+}
+
+static int tsdbRestoreInfo(STsdbRepo *pRepo) {
+  STsdbMeta * pMeta = pRepo->tsdbMeta;
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  SFileGroup *pFGroup = NULL;
+
+  SFileGroupIter iter;
+  SRWHelper      rhelper = {0};
+
+  if (tsdbInitReadHelper(&rhelper, pRepo) < 0) goto _err;
+
+  tsdbInitFileGroupIter(pFileH, &iter, TSDB_ORDER_DESC);
+  while ((pFGroup = tsdbGetFileGroupNext(&iter)) != NULL) {
+    if (pFGroup->state) continue;
+    if (tsdbSetAndOpenHelperFile(&rhelper, pFGroup) < 0) goto _err;
+    if (tsdbLoadCompIdx(&rhelper, NULL) < 0) goto _err;
+    for (int i = 1; i < pMeta->maxTables; i++) {
+      STable *pTable = pMeta->tables[i];
+      if (pTable == NULL) continue;
+      if (tsdbSetHelperTable(&rhelper, pTable, pRepo) < 0) goto _err;
+      SCompIdx *pIdx = &(rhelper.curCompIdx);
+
+      if (pIdx->offset > 0 && pTable->lastKey < pIdx->maxKey) pTable->lastKey = pIdx->maxKey;
+    }
+  }
+
+  tsdbDestroyHelper(&rhelper);
+  return 0;
+
+_err:
+  tsdbDestroyHelper(&rhelper);
+  return -1;
+}
+
+static int tsdbInitSubmitBlkIter(SSubmitBlk *pBlock, SSubmitBlkIter *pIter) {
+  if (pBlock->dataLen <= 0) return -1;
+  pIter->totalLen = pBlock->dataLen;
+  pIter->len = 0;
+  pIter->row = (SDataRow)(pBlock->data+pBlock->schemaLen);
+  return 0;
+}
+
+static void tsdbAlterCompression(STsdbRepo *pRepo, int8_t compression) {
+  int8_t ocompression = pRepo->config.compression;
+  pRepo->config.compression = compression;
+  tsdbDebug("vgId:%d tsdb compression is changed from %d to %d", REPO_ID(pRepo), ocompression, compression);
+}
+
+static int tsdbAlterKeep(STsdbRepo *pRepo, int32_t keep) {
+  STsdbCfg *  pCfg = &pRepo->config;
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  int         okeep = pCfg->keep;
+  SFileGroup *pFGroup = NULL;
+
+  ASSERT(pCfg->keep != keep);
+  int maxFiles = TSDB_MAX_FILE(keep, pCfg->daysPerFile);
+  
+  if (maxFiles != pFileH->maxFGroups) {
+    pthread_rwlock_wrlock(&(pFileH->fhlock));
+
+    pCfg->keep = keep;
+    pFGroup = (SFileGroup *)calloc(maxFiles, sizeof(SFileGroup));
+    if (pFGroup == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      pthread_rwlock_unlock(&(pFileH->fhlock));
+      return -1;
+    }
+
+    int mfid = (int)(TSDB_KEY_FILEID(taosGetTimestamp(pCfg->precision), pCfg->daysPerFile, pCfg->precision) -
+               TSDB_MAX_FILE(keep, pCfg->daysPerFile));
+
+    int i = 0;
+    for (; i < pFileH->nFGroups; i++) {
+      if (pFileH->pFGroup[i].fileId >= mfid) break;
+      tsdbRemoveFileGroup(pRepo, &(pFileH->pFGroup[i]));
+    }
+
+    for (int j = 0; i < pFileH->nFGroups; i++, j++) {
+      pFGroup[j] = pFileH->pFGroup[i];
+    }
+
+    free(pFileH->pFGroup);
+    pFileH->pFGroup = pFGroup;
+
+    pthread_rwlock_unlock(&(pFileH->fhlock));
+  }
+
+  tsdbDebug("vgId:%d keep is changed from %d to %d", REPO_ID(pRepo), okeep, keep);
+
+  return 0;
+}
+
+static int keyFGroupCompFunc(const void *key, const void *fgroup) {
+  int         fid = *(int *)key;
+  SFileGroup *pFGroup = (SFileGroup *)fgroup;
+  if (fid == pFGroup->fileId) {
+    return 0;
+  } else {
+    return fid > pFGroup->fileId ? 1 : -1;
+  }
+}
+
+static int tsdbEncodeCfg(void **buf, STsdbCfg *pCfg) {
+  int tlen = 0;
+
+  tlen += taosEncodeVariantI32(buf, pCfg->tsdbId);
+  tlen += taosEncodeFixedI32(buf, pCfg->cacheBlockSize);
+  tlen += taosEncodeVariantI32(buf, pCfg->totalBlocks);
+  tlen += taosEncodeVariantI32(buf, pCfg->daysPerFile);
+  tlen += taosEncodeVariantI32(buf, pCfg->keep);
+  tlen += taosEncodeVariantI32(buf, pCfg->keep1);
+  tlen += taosEncodeVariantI32(buf, pCfg->keep2);
+  tlen += taosEncodeVariantI32(buf, pCfg->minRowsPerFileBlock);
+  tlen += taosEncodeVariantI32(buf, pCfg->maxRowsPerFileBlock);
+  tlen += taosEncodeFixedI8(buf, pCfg->precision);
+  tlen += taosEncodeFixedI8(buf, pCfg->compression);
+
+  return tlen;
+}
+
+static void *tsdbDecodeCfg(void *buf, STsdbCfg *pCfg) {
+  buf = taosDecodeVariantI32(buf, &(pCfg->tsdbId));
+  buf = taosDecodeFixedI32(buf, &(pCfg->cacheBlockSize));
+  buf = taosDecodeVariantI32(buf, &(pCfg->totalBlocks));
+  buf = taosDecodeVariantI32(buf, &(pCfg->daysPerFile));
+  buf = taosDecodeVariantI32(buf, &(pCfg->keep));
+  buf = taosDecodeVariantI32(buf, &(pCfg->keep1));
+  buf = taosDecodeVariantI32(buf, &(pCfg->keep2));
+  buf = taosDecodeVariantI32(buf, &(pCfg->minRowsPerFileBlock));
+  buf = taosDecodeVariantI32(buf, &(pCfg->maxRowsPerFileBlock));
+  buf = taosDecodeFixedI8(buf, &(pCfg->precision));
+  buf = taosDecodeFixedI8(buf, &(pCfg->compression));
+
+  return buf;
+}
+
+static int tsdbCheckTableSchema(STsdbRepo *pRepo, SSubmitBlk *pBlock, STable *pTable) {
+  ASSERT(pTable != NULL);
+
+  STSchema *pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+  int       sversion = schemaVersion(pSchema);
+
+  if (pBlock->sversion == sversion) {
+    return 0;
+  } else {
+    if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) {  // stream table is not allowed to change schema
+      terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION;
+      return -1;
+    }
+  }
+
+  if (pBlock->sversion > sversion) {  // may need to update table schema
+    if (pBlock->schemaLen > 0) {
+      tsdbDebug(
+          "vgId:%d table %s tid %d uid %" PRIu64 " schema version %d is out of data, client version %d, update...",
+          REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable), sversion, pBlock->sversion);
+      ASSERT(pBlock->schemaLen % sizeof(STColumn) == 0);
+      int       numOfCols = pBlock->schemaLen / sizeof(STColumn);
+      STColumn *pTCol = (STColumn *)pBlock->data;
+
+      STSchemaBuilder schemaBuilder = {0};
+      if (tdInitTSchemaBuilder(&schemaBuilder, pBlock->sversion) < 0) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        tsdbError("vgId:%d failed to update schema of table %s since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+                  tstrerror(terrno));
+        return -1;
+      }
+
+      for (int i = 0; i < numOfCols; i++) {
+        if (tdAddColToSchema(&schemaBuilder, pTCol[i].type, htons(pTCol[i].colId), htons(pTCol[i].bytes)) < 0) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          tsdbError("vgId:%d failed to update schema of table %s since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+                    tstrerror(terrno));
+          tdDestroyTSchemaBuilder(&schemaBuilder);
+          return -1;
+        }
+      }
+
+      STSchema *pNSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+      if (pNSchema == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        tdDestroyTSchemaBuilder(&schemaBuilder);
+        return -1;
+      }
+
+      tdDestroyTSchemaBuilder(&schemaBuilder);
+      tsdbUpdateTableSchema(pRepo, pTable, pNSchema, true);
+    } else {
+      tsdbDebug(
+          "vgId:%d table %s tid %d uid %" PRIu64 " schema version %d is out of data, client version %d, reconfigure...",
+          REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable), sversion, pBlock->sversion);
+      terrno = TSDB_CODE_TDB_TABLE_RECONFIGURE;
+      return -1;
+    }
+  } else {
+    ASSERT(pBlock->sversion >= 0);
+    if (tsdbGetTableSchemaImpl(pTable, false, false, pBlock->sversion) == NULL) {
+      tsdbError("vgId:%d invalid submit schema version %d to table %s tid %d from client", REPO_ID(pRepo),
+                pBlock->sversion, TABLE_CHAR_NAME(pTable), TABLE_TID(pTable));
+    }
+    terrno = TSDB_CODE_TDB_IVD_TB_SCHEMA_VERSION;
+    return -1;
+  }
+
+  return 0;
+}
+
+static int tsdbScanAndConvertSubmitMsg(STsdbRepo *pRepo, SSubmitMsg *pMsg) {
+  ASSERT(pMsg != NULL);
+  STsdbMeta *    pMeta = pRepo->tsdbMeta;
+  SSubmitMsgIter msgIter = {0};
+  SSubmitBlk *   pBlock = NULL;
+
+  terrno = TSDB_CODE_SUCCESS;
+  pMsg->length = htonl(pMsg->length);
+  pMsg->numOfBlocks = htonl(pMsg->numOfBlocks);
+
+  if (tsdbInitSubmitMsgIter(pMsg, &msgIter) < 0) return -1;
+  while (true) {
+    if (tsdbGetSubmitMsgNext(&msgIter, &pBlock) < 0) return -1;
+    if (pBlock == NULL) break;
+
+    pBlock->uid = htobe64(pBlock->uid);
+    pBlock->tid = htonl(pBlock->tid);
+    pBlock->sversion = htonl(pBlock->sversion);
+    pBlock->dataLen = htonl(pBlock->dataLen);
+    pBlock->schemaLen = htonl(pBlock->schemaLen);
+    pBlock->numOfRows = htons(pBlock->numOfRows);
+
+    if (pBlock->tid <= 0 || pBlock->tid >= pMeta->maxTables) {
+      tsdbError("vgId:%d failed to get table to insert data, uid %" PRIu64 " tid %d", REPO_ID(pRepo), pBlock->uid,
+                pBlock->tid);
+      terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+      return -1;
+    }
+
+    STable *pTable = pMeta->tables[pBlock->tid];
+    if (pTable == NULL || TABLE_UID(pTable) != pBlock->uid) {
+      tsdbError("vgId:%d failed to get table to insert data, uid %" PRIu64 " tid %d", REPO_ID(pRepo), pBlock->uid,
+                pBlock->tid);
+      terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+      return -1;
+    }
+
+    if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+      tsdbError("vgId:%d invalid action trying to insert a super table %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable));
+      terrno = TSDB_CODE_TDB_INVALID_ACTION;
+      return -1;
+    }
+
+    // Check schema version and update schema if needed
+    if (tsdbCheckTableSchema(pRepo, pBlock, pTable) < 0) {
+      if (terrno == TSDB_CODE_TDB_TABLE_RECONFIGURE) {
+        continue;
+      } else {
+        return -1;
+      }
+    }
+  }
+
+  if (terrno != TSDB_CODE_SUCCESS) return -1;
+  return 0;
+}
+
+static int tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks) {
+  // TODO
+  // STsdbCache *pCache = pRepo->tsdbCache;
+  // int         oldNumOfBlocks = pCache->totalCacheBlocks;
+
+  // tsdbLockRepo((TsdbRepoT *)pRepo);
+
+  // ASSERT(pCache->totalCacheBlocks != totalBlocks);
+
+  // if (pCache->totalCacheBlocks < totalBlocks) {
+  //   ASSERT(pCache->totalCacheBlocks == pCache->pool.numOfCacheBlocks);
+  //   int blocksToAdd = pCache->totalCacheBlocks - totalBlocks;
+  //   pCache->totalCacheBlocks = totalBlocks;
+  //   for (int i = 0; i < blocksToAdd; i++) {
+  //     if (tsdbAddCacheBlockToPool(pCache) < 0) {
+  //       tsdbUnLockRepo((TsdbRepoT *)pRepo);
+  //       tsdbError("tsdbId:%d, failed to add cache block to cache pool", pRepo->config.tsdbId);
+  //       return -1;
+  //     }
+  //   }
+  // } else {
+  //   pCache->totalCacheBlocks = totalBlocks;
+  //   tsdbAdjustCacheBlocks(pCache);
+  // }
+  // pRepo->config.totalBlocks = totalBlocks;
+
+  // tsdbUnLockRepo((TsdbRepoT *)pRepo);
+  // tsdbDebug("vgId:%d, tsdb total cache blocks changed from %d to %d", pRepo->config.tsdbId, oldNumOfBlocks,
+  // totalBlocks);
+  return 0;
+}
+
+#if 0
+
+TSKEY tsdbGetTableLastKey(TSDB_REPO_T *repo, uint64_t uid) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+
+  STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, uid);
+  if (pTable == NULL) return -1;
+
+  return TSDB_GET_TABLE_LAST_KEY(pTable);
+}
+
+#endif
+
+static void tsdbStartStream(STsdbRepo *pRepo) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  for (int i = 0; i < pMeta->maxTables; i++) {
+    STable *pTable = pMeta->tables[i];
+    if (pTable && pTable->type == TSDB_STREAM_TABLE) {
+      pTable->cqhandle = (*pRepo->appH.cqCreateFunc)(pRepo->appH.cqH, TABLE_UID(pTable), TABLE_TID(pTable), pTable->sql,
+                                                     tsdbGetTableSchemaImpl(pTable, false, false, -1));
+    }
+  }
+}
+
+
+static void tsdbStopStream(STsdbRepo *pRepo) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  for (int i = 0; i < pMeta->maxTables; i++) {
+    STable *pTable = pMeta->tables[i];
+    if (pTable && pTable->type == TSDB_STREAM_TABLE) {
+      (*pRepo->appH.cqDropFunc)(pTable->cqhandle);
+    }
+  }
+}
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
new file mode 100644
index 0000000000000000000000000000000000000000..4cf8ddd4bd8df396352ad66b8499552018d5d322
--- /dev/null
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -0,0 +1,783 @@
+/*
+ * 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 "tsdb.h"
+#include "tsdbMain.h"
+
+#define TSDB_DATA_SKIPLIST_LEVEL 5
+
+static void        tsdbFreeBytes(STsdbRepo *pRepo, void *ptr, int bytes);
+static SMemTable * tsdbNewMemTable(STsdbRepo *pRepo);
+static void        tsdbFreeMemTable(SMemTable *pMemTable);
+static STableData *tsdbNewTableData(STsdbCfg *pCfg, STable *pTable);
+static void        tsdbFreeTableData(STableData *pTableData);
+static char *      tsdbGetTsTupleKey(const void *data);
+static void *      tsdbCommitData(void *arg);
+static int         tsdbCommitMeta(STsdbRepo *pRepo);
+static void        tsdbEndCommit(STsdbRepo *pRepo);
+static int         tsdbHasDataToCommit(SCommitIter *iters, int nIters, TSKEY minKey, TSKEY maxKey);
+static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SCommitIter *iters, SRWHelper *pHelper, SDataCols *pDataCols);
+static SCommitIter *tsdbCreateCommitIters(STsdbRepo *pRepo);
+static void         tsdbDestroyCommitIters(SCommitIter *iters, int maxTables);
+static int          tsdbAdjustMemMaxTables(SMemTable *pMemTable, int maxTables);
+
+// ---------------- INTERNAL FUNCTIONS ----------------
+int tsdbInsertRowToMem(STsdbRepo *pRepo, SDataRow row, STable *pTable) {
+  STsdbCfg *  pCfg = &pRepo->config;
+  STsdbMeta * pMeta = pRepo->tsdbMeta;
+  int32_t     level = 0;
+  int32_t     headSize = 0;
+  TSKEY       key = dataRowKey(row);
+  SMemTable * pMemTable = pRepo->mem;
+  STableData *pTableData = NULL;
+  SSkipList * pSList = NULL;
+
+  if (pMemTable != NULL && TABLE_TID(pTable) < pMemTable->maxTables && pMemTable->tData[TABLE_TID(pTable)] != NULL &&
+      pMemTable->tData[TABLE_TID(pTable)]->uid == TABLE_UID(pTable)) {
+    pTableData = pMemTable->tData[TABLE_TID(pTable)];
+    pSList = pTableData->pData;
+  }
+
+  tSkipListNewNodeInfo(pSList, &level, &headSize);
+
+  SSkipListNode *pNode = (SSkipListNode *)malloc(headSize + sizeof(SDataRow *));
+  if (pNode == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  void *pRow = tsdbAllocBytes(pRepo, dataRowLen(row));
+  if (pRow == NULL) {
+    tsdbError("vgId:%d failed to insert row with key %" PRId64 " to table %s while allocate %d bytes since %s",
+              REPO_ID(pRepo), key, TABLE_CHAR_NAME(pTable), dataRowLen(row), tstrerror(terrno));
+    free(pNode);
+    return -1;
+  }
+
+  pNode->level = level;
+  dataRowCpy(pRow, row);
+  *(SDataRow *)SL_GET_NODE_DATA(pNode) = pRow;
+
+  // Operations above may change pRepo->mem, retake those values
+  ASSERT(pRepo->mem != NULL);
+  pMemTable = pRepo->mem;
+
+  if (TABLE_TID(pTable) >= pMemTable->maxTables) {
+    if (tsdbAdjustMemMaxTables(pMemTable, pMeta->maxTables) < 0) {
+      tsdbFreeBytes(pRepo, pRow, dataRowLen(row));
+      free(pNode);
+      return -1;
+    }
+  }
+  pTableData = pMemTable->tData[TABLE_TID(pTable)];
+
+  if (pTableData == NULL || pTableData->uid != TABLE_UID(pTable)) {
+    if (pTableData != NULL) {
+      taosWLockLatch(&(pMemTable->latch));
+      pMemTable->tData[TABLE_TID(pTable)] = NULL;
+      tsdbFreeTableData(pTableData);
+      taosWUnLockLatch(&(pMemTable->latch));
+    }
+
+    pTableData = tsdbNewTableData(pCfg, pTable);
+    if (pTableData == NULL) {
+      tsdbError("vgId:%d failed to insert row with key %" PRId64
+                " to table %s while create new table data object since %s",
+                REPO_ID(pRepo), key, TABLE_CHAR_NAME(pTable), tstrerror(terrno));
+      tsdbFreeBytes(pRepo, (void *)pRow, dataRowLen(row));
+      free(pNode);
+      return -1;
+    }
+
+    pRepo->mem->tData[TABLE_TID(pTable)] = pTableData;
+  }
+
+  ASSERT((pTableData != NULL) && pTableData->uid == TABLE_UID(pTable));
+
+  if (tSkipListPut(pTableData->pData, pNode) == NULL) {
+    tsdbFreeBytes(pRepo, (void *)pRow, dataRowLen(row));
+    free(pNode);
+  } else {
+    if (TABLE_LASTKEY(pTable) < key) TABLE_LASTKEY(pTable) = key;
+    if (pMemTable->keyFirst > key) pMemTable->keyFirst = key;
+    if (pMemTable->keyLast < key) pMemTable->keyLast = key;
+    pMemTable->numOfRows++;
+
+    if (pTableData->keyFirst > key) pTableData->keyFirst = key;
+    if (pTableData->keyLast < key) pTableData->keyLast = key;
+    pTableData->numOfRows++;
+
+    ASSERT(pTableData->numOfRows == tSkipListGetSize(pTableData->pData));
+  }
+
+  tsdbTrace("vgId:%d a row is inserted to table %s tid %d uid %" PRIu64 " key %" PRIu64, REPO_ID(pRepo),
+            TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable), key);
+
+  return 0;
+}
+
+int tsdbRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
+  if (pMemTable == NULL) return 0;
+  int ref = T_REF_INC(pMemTable);
+	tsdbDebug("vgId:%d ref memtable %p ref %d", REPO_ID(pRepo), pMemTable, ref);
+  return 0;
+}
+
+// Need to lock the repository
+int tsdbUnRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
+  if (pMemTable == NULL) return 0;
+
+	int ref = T_REF_DEC(pMemTable);
+	tsdbDebug("vgId:%d unref memtable %p ref %d", REPO_ID(pRepo), pMemTable, ref);
+  if (ref == 0) {
+    STsdbBufPool *pBufPool = pRepo->pPool;
+
+    SListNode *pNode = NULL;
+    if (tsdbLockRepo(pRepo) < 0) return -1;
+    while ((pNode = tdListPopHead(pMemTable->bufBlockList)) != NULL) {
+      tdListAppendNode(pBufPool->bufBlockList, pNode);
+    }
+    int code = pthread_cond_signal(&pBufPool->poolNotEmpty);
+    if (code != 0) {
+      tsdbUnlockRepo(pRepo);
+      tsdbError("vgId:%d failed to signal pool not empty since %s", REPO_ID(pRepo), strerror(code));
+      terrno = TAOS_SYSTEM_ERROR(code);
+      return -1;
+    }
+    if (tsdbUnlockRepo(pRepo) < 0) return -1;
+
+    for (int i = 0; i < pMemTable->maxTables; i++) {
+      if (pMemTable->tData[i] != NULL) {
+        tsdbFreeTableData(pMemTable->tData[i]);
+      }
+    }
+
+    tdListDiscard(pMemTable->actList);
+    tdListDiscard(pMemTable->bufBlockList);
+    tsdbFreeMemTable(pMemTable);
+  }
+  return 0;
+}
+
+int tsdbTakeMemSnapshot(STsdbRepo *pRepo, SMemTable **pMem, SMemTable **pIMem) {
+  if (tsdbLockRepo(pRepo) < 0) return -1;
+
+  *pMem = pRepo->mem;
+  *pIMem = pRepo->imem;
+  tsdbRefMemTable(pRepo, *pMem);
+  tsdbRefMemTable(pRepo, *pIMem);
+
+  if (tsdbUnlockRepo(pRepo) < 0) return -1;
+
+  if (*pMem != NULL) taosRLockLatch(&((*pMem)->latch));
+
+  tsdbDebug("vgId:%d take memory snapshot, pMem %p pIMem %p", REPO_ID(pRepo), *pMem, *pIMem);
+  return 0;
+}
+
+void tsdbUnTakeMemSnapShot(STsdbRepo *pRepo, SMemTable *pMem, SMemTable *pIMem) {
+  if (pMem != NULL) {
+    taosRUnLockLatch(&(pMem->latch));
+    tsdbUnRefMemTable(pRepo, pMem);
+  }
+
+  if (pIMem != NULL) {
+    tsdbUnRefMemTable(pRepo, pIMem);
+  }
+}
+
+void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
+  STsdbCfg *     pCfg = &pRepo->config;
+  STsdbBufBlock *pBufBlock = NULL;
+  void *         ptr = NULL;
+
+  // Either allocate from buffer blocks or from SYSTEM memory pool
+  if (pRepo->mem == NULL) {
+    SMemTable *pMemTable = tsdbNewMemTable(pRepo);
+    if (pMemTable == NULL) return NULL;
+    pRepo->mem = pMemTable;
+  }
+
+  ASSERT(pRepo->mem != NULL);
+
+  pBufBlock = tsdbGetCurrBufBlock(pRepo);
+  if ((pRepo->mem->extraBuffList != NULL) ||
+      ((listNEles(pRepo->mem->bufBlockList) >= pCfg->totalBlocks / 3) && (pBufBlock->remain < bytes))) {
+    // allocate from SYSTEM buffer pool
+    if (pRepo->mem->extraBuffList == NULL) {
+      pRepo->mem->extraBuffList = tdListNew(0);
+      if (pRepo->mem->extraBuffList == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return NULL;
+      }
+    }
+
+    ASSERT(pRepo->mem->extraBuffList != NULL);
+    SListNode *pNode = (SListNode *)malloc(sizeof(SListNode) + bytes);
+    if (pNode == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return NULL;
+    }
+
+    pNode->next = pNode->prev = NULL;
+    tdListAppendNode(pRepo->mem->extraBuffList, pNode);
+    ptr = (void *)(pNode->data);
+    tsdbTrace("vgId:%d allocate %d bytes from SYSTEM buffer block", REPO_ID(pRepo), bytes);
+  } else {  // allocate from TSDB buffer pool
+    if (pBufBlock == NULL || pBufBlock->remain < bytes) {
+      ASSERT(listNEles(pRepo->mem->bufBlockList) < pCfg->totalBlocks / 3);
+      if (tsdbLockRepo(pRepo) < 0) return NULL;
+      SListNode *pNode = tsdbAllocBufBlockFromPool(pRepo);
+      tdListAppendNode(pRepo->mem->bufBlockList, pNode);
+      if (tsdbUnlockRepo(pRepo) < 0) return NULL;
+      pBufBlock = tsdbGetCurrBufBlock(pRepo);
+    }
+
+    ASSERT(pBufBlock->remain >= bytes);
+    ptr = POINTER_SHIFT(pBufBlock->data, pBufBlock->offset);
+    pBufBlock->offset += bytes;
+    pBufBlock->remain -= bytes;
+    tsdbTrace("vgId:%d allocate %d bytes from TSDB buffer block, nBlocks %d offset %d remain %d", REPO_ID(pRepo), bytes,
+              listNEles(pRepo->mem->bufBlockList), pBufBlock->offset, pBufBlock->remain);
+  }
+
+  return ptr;
+}
+
+int tsdbAsyncCommit(STsdbRepo *pRepo) {
+  SMemTable *pIMem = pRepo->imem;
+  int        code = 0;
+
+  if (pIMem != NULL) {
+    ASSERT(pRepo->commit);
+    tsdbDebug("vgId:%d waiting for the commit thread", REPO_ID(pRepo));
+    code = pthread_join(pRepo->commitThread, NULL);
+    tsdbDebug("vgId:%d commit thread is finished", REPO_ID(pRepo));
+    if (code != 0) {
+      tsdbError("vgId:%d failed to thread join since %s", REPO_ID(pRepo), strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      return -1;
+    }
+    pRepo->commit = 0;
+  }
+
+  ASSERT(pRepo->commit == 0);
+  if (pRepo->mem != NULL) {
+    if (pRepo->appH.notifyStatus) pRepo->appH.notifyStatus(pRepo->appH.appH, TSDB_STATUS_COMMIT_START);
+    if (tsdbLockRepo(pRepo) < 0) return -1;
+    pRepo->imem = pRepo->mem;
+    pRepo->mem = NULL;
+    pRepo->commit = 1;
+    code = pthread_create(&pRepo->commitThread, NULL, tsdbCommitData, (void *)pRepo);
+    if (code != 0) {
+      tsdbError("vgId:%d failed to create commit thread since %s", REPO_ID(pRepo), strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(code);
+      tsdbUnlockRepo(pRepo);
+      return -1;
+    }
+    if (tsdbUnlockRepo(pRepo) < 0) return -1;
+  }
+
+  if (pIMem && tsdbUnRefMemTable(pRepo, pIMem) < 0) return -1;
+
+  return 0;
+}
+
+int tsdbLoadDataFromCache(STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, SDataCols *pCols,
+                          TSKEY *filterKeys, int nFilterKeys) {
+  ASSERT(maxRowsToRead > 0 && nFilterKeys >= 0);
+  if (pIter == NULL) return 0;
+  STSchema *pSchema = NULL;
+  int       numOfRows = 0;
+  TSKEY     keyNext = 0;
+  int       filterIter = 0;
+
+  if (nFilterKeys != 0) { // for filter purpose
+    ASSERT(filterKeys != NULL);
+    keyNext = tsdbNextIterKey(pIter);
+    if (keyNext < 0 || keyNext > maxKey) return numOfRows;
+    void *ptr = taosbsearch((void *)(&keyNext), (void *)filterKeys, nFilterKeys, sizeof(TSKEY), compTSKEY, TD_GE);
+    filterIter = (ptr == NULL) ? nFilterKeys : (int)((POINTER_DISTANCE(ptr, filterKeys) / sizeof(TSKEY)));
+  }
+
+  do {
+    SDataRow row = tsdbNextIterRow(pIter);
+    if (row == NULL) break;
+
+    keyNext = dataRowKey(row);
+    if (keyNext > maxKey) break;
+
+    bool keyFiltered = false;
+    if (nFilterKeys != 0) {
+      while (true) {
+        if (filterIter >= nFilterKeys) break;
+        if (keyNext == filterKeys[filterIter]) {
+          keyFiltered = true;
+          filterIter++;
+          break;
+        } else if (keyNext < filterKeys[filterIter]) {
+          break;
+        } else {
+          filterIter++;
+        }
+      }
+    }
+
+    if (!keyFiltered) {
+      if (numOfRows >= maxRowsToRead) break;
+      if (pCols) {
+        if (pSchema == NULL || schemaVersion(pSchema) != dataRowVersion(row)) {
+          pSchema = tsdbGetTableSchemaImpl(pTable, false, false, dataRowVersion(row));
+          if (pSchema == NULL) {
+            ASSERT(0);
+          }
+        }
+
+        tdAppendDataRowToDataCol(row, pSchema, pCols);
+      }
+      numOfRows++;
+    }
+  } while (tSkipListIterNext(pIter));
+
+  return numOfRows;
+}
+
+// ---------------- LOCAL FUNCTIONS ----------------
+static void tsdbFreeBytes(STsdbRepo *pRepo, void *ptr, int bytes) {
+  ASSERT(pRepo->mem != NULL);
+  if (pRepo->mem->extraBuffList == NULL) {
+    STsdbBufBlock *pBufBlock = tsdbGetCurrBufBlock(pRepo);
+    ASSERT(pBufBlock != NULL);
+    pBufBlock->offset -= bytes;
+    pBufBlock->remain += bytes;
+    ASSERT(ptr == POINTER_SHIFT(pBufBlock->data, pBufBlock->offset));
+    tsdbTrace("vgId:%d free %d bytes to TSDB buffer pool, nBlocks %d offset %d remain %d", REPO_ID(pRepo), bytes,
+              listNEles(pRepo->mem->bufBlockList), pBufBlock->offset, pBufBlock->remain);
+  } else {
+    SListNode *pNode = (SListNode *)POINTER_SHIFT(ptr, -(int)(sizeof(SListNode)));
+    ASSERT(listTail(pRepo->mem->extraBuffList) == pNode);
+    tdListPopNode(pRepo->mem->extraBuffList, pNode);
+    free(pNode);
+    tsdbTrace("vgId:%d free %d bytes to SYSTEM buffer pool", REPO_ID(pRepo), bytes);
+  }
+}
+
+static SMemTable* tsdbNewMemTable(STsdbRepo *pRepo) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  SMemTable *pMemTable = (SMemTable *)calloc(1, sizeof(*pMemTable));
+  if (pMemTable == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMemTable->keyFirst = INT64_MAX;
+  pMemTable->keyLast = 0;
+  pMemTable->numOfRows = 0;
+
+  pMemTable->maxTables = pMeta->maxTables;
+  pMemTable->tData = (STableData **)calloc(pMemTable->maxTables, sizeof(STableData *));
+  if (pMemTable->tData == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMemTable->actList = tdListNew(0);
+  if (pMemTable->actList == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMemTable->bufBlockList = tdListNew(sizeof(STsdbBufBlock*));
+  if (pMemTable->bufBlockList == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  T_REF_INC(pMemTable);
+
+  return pMemTable;
+
+_err:
+  tsdbFreeMemTable(pMemTable);
+  return NULL;
+}
+
+static void tsdbFreeMemTable(SMemTable* pMemTable) {
+  if (pMemTable) {
+    ASSERT((pMemTable->bufBlockList == NULL) ? true : (listNEles(pMemTable->bufBlockList) == 0));
+    ASSERT((pMemTable->actList == NULL) ? true : (listNEles(pMemTable->actList) == 0));
+
+    tdListFree(pMemTable->extraBuffList);
+    tdListFree(pMemTable->bufBlockList);
+    tdListFree(pMemTable->actList);
+    taosTFree(pMemTable->tData);
+    free(pMemTable);
+  }
+}
+
+static STableData *tsdbNewTableData(STsdbCfg *pCfg, STable *pTable) {
+  STableData *pTableData = (STableData *)calloc(1, sizeof(*pTableData));
+  if (pTableData == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pTableData->uid = TABLE_UID(pTable);
+  pTableData->keyFirst = INT64_MAX;
+  pTableData->keyLast = 0;
+  pTableData->numOfRows = 0;
+
+  pTableData->pData = tSkipListCreate(TSDB_DATA_SKIPLIST_LEVEL, TSDB_DATA_TYPE_TIMESTAMP,
+                                      TYPE_BYTES[TSDB_DATA_TYPE_TIMESTAMP], 0, 0, 1, tsdbGetTsTupleKey);
+  if (pTableData->pData == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return pTableData;
+
+_err:
+  tsdbFreeTableData(pTableData);
+  return NULL;
+}
+
+static void tsdbFreeTableData(STableData *pTableData) {
+  if (pTableData) {
+    tSkipListDestroy(pTableData->pData);
+    free(pTableData);
+  }
+}
+
+static char *tsdbGetTsTupleKey(const void *data) { return dataRowTuple(*(SDataRow *)data); }
+
+static void *tsdbCommitData(void *arg) {
+  STsdbRepo *  pRepo = (STsdbRepo *)arg;
+  SMemTable *  pMem = pRepo->imem;
+  STsdbCfg *   pCfg = &pRepo->config;
+  SDataCols *  pDataCols = NULL;
+  STsdbMeta *  pMeta = pRepo->tsdbMeta;
+  SCommitIter *iters = NULL;
+  SRWHelper    whelper = {0};
+  ASSERT(pRepo->commit == 1);
+  ASSERT(pMem != NULL);
+
+  tsdbInfo("vgId:%d start to commit! keyFirst %" PRId64 " keyLast %" PRId64 " numOfRows %" PRId64, REPO_ID(pRepo),
+            pMem->keyFirst, pMem->keyLast, pMem->numOfRows);
+
+  // Create the iterator to read from cache
+  if (pMem->numOfRows > 0) {
+    iters = tsdbCreateCommitIters(pRepo);
+    if (iters == NULL) {
+      tsdbError("vgId:%d failed to create commit iterator since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _exit;
+    }
+
+    if (tsdbInitWriteHelper(&whelper, pRepo) < 0) {
+      tsdbError("vgId:%d failed to init write helper since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _exit;
+    }
+
+    if ((pDataCols = tdNewDataCols(pMeta->maxRowBytes, pMeta->maxCols, pCfg->maxRowsPerFileBlock)) == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      tsdbError("vgId:%d failed to init data cols with maxRowBytes %d maxCols %d maxRowsPerFileBlock %d since %s",
+                REPO_ID(pRepo), pMeta->maxCols, pMeta->maxRowBytes, pCfg->maxRowsPerFileBlock, tstrerror(terrno));
+      goto _exit;
+    }
+
+    int sfid = (int)(TSDB_KEY_FILEID(pMem->keyFirst, pCfg->daysPerFile, pCfg->precision));
+    int efid = (int)(TSDB_KEY_FILEID(pMem->keyLast, pCfg->daysPerFile, pCfg->precision));
+
+    // Loop to commit to each file
+    for (int fid = sfid; fid <= efid; fid++) {
+      if (tsdbCommitToFile(pRepo, fid, iters, &whelper, pDataCols) < 0) {
+        tsdbError("vgId:%d failed to commit to file %d since %s", REPO_ID(pRepo), fid, tstrerror(terrno));
+        goto _exit;
+      }
+    }
+  }
+
+  // Commit to update meta file
+  if (tsdbCommitMeta(pRepo) < 0) {
+    tsdbError("vgId:%d failed to commit data while committing meta data since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _exit;
+  }
+
+  tsdbFitRetention(pRepo);
+
+_exit:
+  tdFreeDataCols(pDataCols);
+  tsdbDestroyCommitIters(iters, pMem->maxTables);
+  tsdbDestroyHelper(&whelper);
+  tsdbEndCommit(pRepo);
+  tsdbInfo("vgId:%d commit over", pRepo->config.tsdbId);
+
+  return NULL;
+}
+
+static int tsdbCommitMeta(STsdbRepo *pRepo) {
+  SMemTable *pMem = pRepo->imem;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  SActObj *  pAct = NULL;
+  SActCont * pCont = NULL;
+
+  if (listNEles(pMem->actList) > 0) {
+    if (tdKVStoreStartCommit(pMeta->pStore) < 0) {
+      tsdbError("vgId:%d failed to commit data while start commit meta since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _err;
+    }
+
+    SListNode *pNode = NULL;
+
+    while ((pNode = tdListPopHead(pMem->actList)) != NULL) {
+      pAct = (SActObj *)pNode->data;
+      if (pAct->act == TSDB_UPDATE_META) {
+        pCont = (SActCont *)POINTER_SHIFT(pAct, sizeof(SActObj));
+        if (tdUpdateKVStoreRecord(pMeta->pStore, pAct->uid, (void *)(pCont->cont), pCont->len) < 0) {
+          tsdbError("vgId:%d failed to update meta with uid %" PRIu64 " since %s", REPO_ID(pRepo), pAct->uid,
+                    tstrerror(terrno));
+          tdKVStoreEndCommit(pMeta->pStore);
+          goto _err;
+        }
+      } else if (pAct->act == TSDB_DROP_META) {
+        if (tdDropKVStoreRecord(pMeta->pStore, pAct->uid) < 0) {
+          tsdbError("vgId:%d failed to drop meta with uid %" PRIu64 " since %s", REPO_ID(pRepo), pAct->uid,
+                    tstrerror(terrno));
+          tdKVStoreEndCommit(pMeta->pStore);
+          goto _err;
+        }
+      } else {
+        ASSERT(false);
+      }
+    }
+
+    if (tdKVStoreEndCommit(pMeta->pStore) < 0) {
+      tsdbError("vgId:%d failed to commit data while end commit meta since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _err;
+    }
+  }
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static void tsdbEndCommit(STsdbRepo *pRepo) {
+  ASSERT(pRepo->commit == 1);
+  if (pRepo->appH.notifyStatus) pRepo->appH.notifyStatus(pRepo->appH.appH, TSDB_STATUS_COMMIT_OVER);
+}
+
+static int tsdbHasDataToCommit(SCommitIter *iters, int nIters, TSKEY minKey, TSKEY maxKey) {
+  for (int i = 0; i < nIters; i++) {
+    TSKEY nextKey = tsdbNextIterKey((iters + i)->pIter);
+    if (nextKey > 0 && (nextKey >= minKey && nextKey <= maxKey)) return 1;
+  }
+  return 0;
+}
+
+void tsdbGetFidKeyRange(int daysPerFile, int8_t precision, int fileId, TSKEY *minKey, TSKEY *maxKey) {
+  *minKey = fileId * daysPerFile * tsMsPerDay[precision];
+  *maxKey = *minKey + daysPerFile * tsMsPerDay[precision] - 1;
+}
+
+static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SCommitIter *iters, SRWHelper *pHelper, SDataCols *pDataCols) {
+  char *      dataDir = NULL;
+  STsdbCfg *  pCfg = &pRepo->config;
+  STsdbFileH *pFileH = pRepo->tsdbFileH;
+  SFileGroup *pGroup = NULL;
+  SMemTable * pMem = pRepo->imem;
+  bool        newLast = false;
+
+  TSKEY minKey = 0, maxKey = 0;
+  tsdbGetFidKeyRange(pCfg->daysPerFile, pCfg->precision, fid, &minKey, &maxKey);
+
+  // Check if there are data to commit to this file
+  int hasDataToCommit = tsdbHasDataToCommit(iters, pMem->maxTables, minKey, maxKey);
+  if (!hasDataToCommit) {
+    tsdbDebug("vgId:%d no data to commit to file %d", REPO_ID(pRepo), fid);
+    return 0;
+  }
+
+  // Create and open files for commit
+  dataDir = tsdbGetDataDirName(pRepo->rootDir);
+  if (dataDir == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  if ((pGroup = tsdbCreateFGroupIfNeed(pRepo, dataDir, fid)) == NULL) {
+    tsdbError("vgId:%d failed to create file group %d since %s", REPO_ID(pRepo), fid, tstrerror(terrno));
+    goto _err;
+  }
+
+  // Open files for write/read
+  if (tsdbSetAndOpenHelperFile(pHelper, pGroup) < 0) {
+    tsdbError("vgId:%d failed to set helper file since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  newLast = TSDB_NLAST_FILE_OPENED(pHelper);
+
+  if (tsdbLoadCompIdx(pHelper, NULL) < 0) {
+    tsdbError("vgId:%d failed to load SCompIdx part since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  // Loop to commit data in each table
+  for (int tid = 1; tid < pMem->maxTables; tid++) {
+    SCommitIter *pIter = iters + tid;
+    if (pIter->pTable == NULL) continue;
+
+    taosRLockLatch(&(pIter->pTable->latch));
+
+    if (tsdbSetHelperTable(pHelper, pIter->pTable, pRepo) < 0) goto _err;
+
+    if (pIter->pIter != NULL) {
+      if (tdInitDataCols(pDataCols, tsdbGetTableSchemaImpl(pIter->pTable, false, false, -1)) < 0) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto _err;
+      }
+
+      if (tsdbCommitTableData(pHelper, pIter, pDataCols, maxKey) < 0) {
+        taosRUnLockLatch(&(pIter->pTable->latch));
+        tsdbError("vgId:%d failed to write data of table %s tid %d uid %" PRIu64 " since %s", REPO_ID(pRepo),
+                  TABLE_CHAR_NAME(pIter->pTable), TABLE_TID(pIter->pTable), TABLE_UID(pIter->pTable),
+                  tstrerror(terrno));
+        goto _err;
+      }
+    }
+
+    taosRUnLockLatch(&(pIter->pTable->latch));
+
+    // Move the last block to the new .l file if neccessary
+    if (tsdbMoveLastBlockIfNeccessary(pHelper) < 0) {
+      tsdbError("vgId:%d, failed to move last block, since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _err;
+    }
+
+    // Write the SCompBlock part
+    if (tsdbWriteCompInfo(pHelper) < 0) {
+      tsdbError("vgId:%d, failed to write compInfo part since %s", REPO_ID(pRepo), tstrerror(terrno));
+      goto _err;
+    }
+  }
+
+  if (tsdbWriteCompIdx(pHelper) < 0) {
+    tsdbError("vgId:%d failed to write compIdx part to file %d since %s", REPO_ID(pRepo), fid, tstrerror(terrno));
+    goto _err;
+  }
+
+  taosTFree(dataDir);
+  tsdbCloseHelperFile(pHelper, 0, pGroup);
+
+  pthread_rwlock_wrlock(&(pFileH->fhlock));
+
+  (void)rename(helperNewHeadF(pHelper)->fname, helperHeadF(pHelper)->fname);
+  pGroup->files[TSDB_FILE_TYPE_HEAD].info = helperNewHeadF(pHelper)->info;
+
+  if (newLast) {
+    (void)rename(helperNewLastF(pHelper)->fname, helperLastF(pHelper)->fname);
+    pGroup->files[TSDB_FILE_TYPE_LAST].info = helperNewLastF(pHelper)->info;
+  } else {
+    pGroup->files[TSDB_FILE_TYPE_LAST].info = helperLastF(pHelper)->info;
+  }
+
+  pGroup->files[TSDB_FILE_TYPE_DATA].info = helperDataF(pHelper)->info;
+
+  pthread_rwlock_unlock(&(pFileH->fhlock));
+
+  return 0;
+
+_err:
+  taosTFree(dataDir);
+  tsdbCloseHelperFile(pHelper, 1, NULL);
+  return -1;
+}
+
+static SCommitIter *tsdbCreateCommitIters(STsdbRepo *pRepo) {
+  SMemTable *pMem = pRepo->imem;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  SCommitIter *iters = (SCommitIter *)calloc(pMem->maxTables, sizeof(SCommitIter));
+  if (iters == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  if (tsdbRLockRepoMeta(pRepo) < 0) goto _err;
+
+  // reference all tables
+  for (int i = 0; i < pMem->maxTables; i++) {
+    if (pMeta->tables[i] != NULL) {
+      tsdbRefTable(pMeta->tables[i]);
+      iters[i].pTable = pMeta->tables[i];
+    }
+  }
+
+  if (tsdbUnlockRepoMeta(pRepo) < 0) goto _err;
+
+  for (int i = 0; i < pMem->maxTables; i++) {
+    if ((iters[i].pTable != NULL) && (pMem->tData[i] != NULL) && (TABLE_UID(iters[i].pTable) == pMem->tData[i]->uid)) {
+      if ((iters[i].pIter = tSkipListCreateIter(pMem->tData[i]->pData)) == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto _err;
+      }
+
+      tSkipListIterNext(iters[i].pIter);
+    }
+  }
+
+  return iters;
+
+_err:
+  tsdbDestroyCommitIters(iters, pMem->maxTables);
+  return NULL;
+}
+
+static void tsdbDestroyCommitIters(SCommitIter *iters, int maxTables) {
+  if (iters == NULL) return;
+
+  for (int i = 1; i < maxTables; i++) {
+    if (iters[i].pTable != NULL) {
+      tsdbUnRefTable(iters[i].pTable);
+      tSkipListDestroyIter(iters[i].pIter);
+    }
+  }
+
+  free(iters);
+}
+
+static int tsdbAdjustMemMaxTables(SMemTable *pMemTable, int maxTables) {
+  ASSERT(pMemTable->maxTables < maxTables);
+
+  STableData **pTableData = (STableData **)calloc(maxTables, sizeof(STableData *));
+  if (pTableData == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+  memcpy((void *)pTableData, (void *)pMemTable->tData, sizeof(STableData *) * pMemTable->maxTables);
+
+  STableData **tData = pMemTable->tData;
+
+  taosWLockLatch(&(pMemTable->latch));
+  pMemTable->maxTables = maxTables;
+  pMemTable->tData = pTableData;
+  taosWUnLockLatch(&(pMemTable->latch));
+
+  taosTFree(tData);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
new file mode 100644
index 0000000000000000000000000000000000000000..564d7f5db51c80929391283e4b6fa1128275ea14
--- /dev/null
+++ b/src/tsdb/src/tsdbMeta.c
@@ -0,0 +1,1311 @@
+/*
+ * 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 <stdlib.h>
+#include "hash.h"
+#include "taosdef.h"
+#include "tchecksum.h"
+#include "tsdb.h"
+#include "tsdbMain.h"
+#include "tskiplist.h"
+
+#define TSDB_SUPER_TABLE_SL_LEVEL 5
+#define DEFAULT_TAG_INDEX_COLUMN 0
+
+static int     tsdbCompareSchemaVersion(const void *key1, const void *key2);
+static int     tsdbRestoreTable(void *pHandle, void *cont, int contLen);
+static void    tsdbOrgMeta(void *pHandle);
+static char *  getTagIndexKey(const void *pData);
+static STable *tsdbNewTable();
+static STable *tsdbCreateTableFromCfg(STableCfg *pCfg, bool isSuper);
+static void    tsdbFreeTable(STable *pTable);
+static int     tsdbAddTableToMeta(STsdbRepo *pRepo, STable *pTable, bool addIdx, bool lock);
+static void    tsdbRemoveTableFromMeta(STsdbRepo *pRepo, STable *pTable, bool rmFromIdx, bool lock);
+static int     tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable, bool refSuper);
+static int     tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
+static int     tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t tid);
+static int     tsdbTableSetSchema(STableCfg *config, STSchema *pSchema, bool dup);
+static int     tsdbTableSetName(STableCfg *config, char *name, bool dup);
+static int     tsdbTableSetTagSchema(STableCfg *config, STSchema *pSchema, bool dup);
+static int     tsdbTableSetSName(STableCfg *config, char *sname, bool dup);
+static int     tsdbTableSetSuperUid(STableCfg *config, uint64_t uid);
+static int     tsdbTableSetTagValue(STableCfg *config, SKVRow row, bool dup);
+static int     tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup);
+static int     tsdbEncodeTableName(void **buf, tstr *name);
+static void *  tsdbDecodeTableName(void *buf, tstr **name);
+static int     tsdbEncodeTable(void **buf, STable *pTable);
+static void *  tsdbDecodeTable(void *buf, STable **pRTable);
+static int     tsdbGetTableEncodeSize(int8_t act, STable *pTable);
+static void *  tsdbInsertTableAct(STsdbRepo *pRepo, int8_t act, void *buf, STable *pTable);
+static int     tsdbRemoveTableFromStore(STsdbRepo *pRepo, STable *pTable);
+static int     tsdbRmTableFromMeta(STsdbRepo *pRepo, STable *pTable);
+static int     tsdbAdjustMetaTables(STsdbRepo *pRepo, int tid);
+
+// ------------------ OUTER FUNCTIONS ------------------
+int tsdbCreateTable(TSDB_REPO_T *repo, STableCfg *pCfg) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  STable *   super = NULL;
+  STable *   table = NULL;
+  int        newSuper = 0;
+  int        tid = pCfg->tableId.tid;
+  STable *   pTable = NULL;
+
+  if (tid < 1 || tid > TSDB_MAX_TABLES) {
+    tsdbError("vgId:%d failed to create table since invalid tid %d", REPO_ID(pRepo), tid);
+    terrno = TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO;
+    goto _err;
+  }
+
+  if (tid < pMeta->maxTables && pMeta->tables[tid] != NULL) {
+    if (TABLE_UID(pMeta->tables[tid]) == pCfg->tableId.uid) {
+      tsdbError("vgId:%d table %s already exists, tid %d uid %" PRId64, REPO_ID(pRepo),
+                TABLE_CHAR_NAME(pMeta->tables[tid]), TABLE_TID(pMeta->tables[tid]), TABLE_UID(pMeta->tables[tid]));
+      return 0;
+    } else {
+      tsdbError("vgId:%d table %s at tid %d uid %" PRIu64
+                " exists, replace it with new table, this can be not reasonable",
+                REPO_ID(pRepo), TABLE_CHAR_NAME(pMeta->tables[tid]), TABLE_TID(pMeta->tables[tid]),
+                TABLE_UID(pMeta->tables[tid]));
+      tsdbDropTable(pRepo, pMeta->tables[tid]->tableId);
+    }
+  }
+
+  pTable = tsdbGetTableByUid(pMeta, pCfg->tableId.uid);
+  if (pTable != NULL) {
+    tsdbError("vgId:%d table %s already exists, tid %d uid %" PRId64, REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+              TABLE_TID(pTable), TABLE_UID(pTable));
+    return TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
+  }
+
+  if (pCfg->type == TSDB_CHILD_TABLE) {
+    super = tsdbGetTableByUid(pMeta, pCfg->superUid);
+    if (super == NULL) {  // super table not exists, try to create it
+      newSuper = 1;
+      super = tsdbCreateTableFromCfg(pCfg, true);
+      if (super == NULL) goto _err;
+    } else {
+      if (TABLE_TYPE(super) != TSDB_SUPER_TABLE || TABLE_UID(super) != pCfg->superUid) {
+        terrno = TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO;
+        goto _err;
+      }
+    }
+  }
+
+  table = tsdbCreateTableFromCfg(pCfg, false);
+  if (table == NULL) goto _err;
+
+  // Register to meta
+  tsdbWLockRepoMeta(pRepo);
+  if (newSuper) {
+    if (tsdbAddTableToMeta(pRepo, super, true, false) < 0) {
+      tsdbUnlockRepoMeta(pRepo);
+      goto _err;
+    }
+  }
+  if (tsdbAddTableToMeta(pRepo, table, true, false) < 0) {
+    tsdbUnlockRepoMeta(pRepo);
+    goto _err;
+  }
+  tsdbUnlockRepoMeta(pRepo);
+
+  // Write to memtable action
+  // TODO: refactor duplicate codes
+  int   tlen = 0;
+  void *pBuf = NULL;
+  if (newSuper) {
+    tlen = tsdbGetTableEncodeSize(TSDB_UPDATE_META, super);
+    pBuf = tsdbAllocBytes(pRepo, tlen);
+    if (pBuf == NULL) goto _err;
+    void *tBuf = tsdbInsertTableAct(pRepo, TSDB_UPDATE_META, pBuf, super);
+    ASSERT(POINTER_DISTANCE(tBuf, pBuf) == tlen);
+  }
+  tlen = tsdbGetTableEncodeSize(TSDB_UPDATE_META, table);
+  pBuf = tsdbAllocBytes(pRepo, tlen);
+  if (pBuf == NULL) goto _err;
+  void *tBuf = tsdbInsertTableAct(pRepo, TSDB_UPDATE_META, pBuf, table);
+  ASSERT(POINTER_DISTANCE(tBuf, pBuf) == tlen);
+
+  if (tsdbCheckCommit(pRepo) < 0) return -1;
+
+  return 0;
+
+_err:
+  tsdbFreeTable(super);
+  tsdbFreeTable(table);
+  return -1;
+}
+
+int tsdbDropTable(TSDB_REPO_T *repo, STableId tableId) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  uint64_t   uid = tableId.uid;
+  int        tid = 0;
+  char *     tbname = NULL;
+
+  STable *pTable = tsdbGetTableByUid(pMeta, uid);
+  if (pTable == NULL) {
+    tsdbError("vgId:%d failed to drop table since table not exists! tid:%d uid %" PRIu64, REPO_ID(pRepo), tableId.tid,
+              uid);
+    terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+    return -1;
+  }
+
+  tsdbDebug("vgId:%d try to drop table %s type %d", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TYPE(pTable));
+
+  tid = TABLE_TID(pTable);
+  tbname = strdup(TABLE_CHAR_NAME(pTable));
+  if (tbname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  // Write to KV store first
+  if (tsdbRemoveTableFromStore(pRepo, pTable) < 0) {
+    tsdbError("vgId:%d failed to drop table %s since %s", REPO_ID(pRepo), tbname, tstrerror(terrno));
+    goto _err;
+  }
+
+  // Remove table from Meta
+  if (tsdbRmTableFromMeta(pRepo, pTable) < 0) {
+    tsdbError("vgId:%d failed to drop table %s since %s", REPO_ID(pRepo), tbname, tstrerror(terrno));
+    goto _err;
+  }
+
+  tsdbDebug("vgId:%d, table %s is dropped! tid:%d, uid:%" PRId64, pRepo->config.tsdbId, tbname, tid, uid);
+  free(tbname);
+
+  if (tsdbCheckCommit(pRepo) < 0) goto _err;
+
+  return 0;
+
+_err:
+  taosTFree(tbname);
+  return -1;
+}
+
+void *tsdbGetTableTagVal(const void* pTable, int32_t colId, int16_t type, int16_t bytes) {
+  // TODO: this function should be changed also
+
+  STSchema *pSchema = tsdbGetTableTagSchema((STable*) pTable);
+  STColumn *pCol = tdGetColOfID(pSchema, colId);
+  if (pCol == NULL) {
+    return NULL;  // No matched tag volumn
+  }
+
+  char *val = tdGetKVRowValOfCol(((STable*)pTable)->tagVal, colId);
+  assert(type == pCol->type && bytes == pCol->bytes);
+
+  if (val != NULL && IS_VAR_DATA_TYPE(type)) {
+    assert(varDataLen(val) < pCol->bytes);
+  }
+
+  return val;
+}
+
+char *tsdbGetTableName(void* pTable) {
+  // TODO: need to change as thread-safe
+
+  if (pTable == NULL) {
+    return NULL;
+  } else {
+    return (char*) (((STable *)pTable)->name);
+  }
+}
+
+STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
+  if (pMsg == NULL) return NULL;
+
+  SSchema *pSchema = (SSchema *)pMsg->data;
+  int16_t  numOfCols = htons(pMsg->numOfColumns);
+  int16_t  numOfTags = htons(pMsg->numOfTags);
+
+  STSchemaBuilder schemaBuilder = {0};
+
+  STableCfg *pCfg = (STableCfg *)calloc(1, sizeof(STableCfg));
+  if (pCfg == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  if (tsdbInitTableCfg(pCfg, pMsg->tableType, htobe64(pMsg->uid), htonl(pMsg->sid)) < 0) goto _err;
+  if (tdInitTSchemaBuilder(&schemaBuilder, htonl(pMsg->sversion)) < 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  for (int i = 0; i < numOfCols; i++) {
+    if (tdAddColToSchema(&schemaBuilder, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)) < 0) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+  }
+  if (tsdbTableSetSchema(pCfg, tdGetSchemaFromBuilder(&schemaBuilder), false) < 0) goto _err;
+  if (tsdbTableSetName(pCfg, pMsg->tableId, true) < 0) goto _err;
+
+  if (numOfTags > 0) {
+    // Decode tag schema
+    tdResetTSchemaBuilder(&schemaBuilder, htonl(pMsg->tversion));
+    for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
+      if (tdAddColToSchema(&schemaBuilder, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes)) < 0) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto _err;
+      }
+    }
+    if (tsdbTableSetTagSchema(pCfg, tdGetSchemaFromBuilder(&schemaBuilder), false) < 0) goto _err;
+    if (tsdbTableSetSName(pCfg, pMsg->superTableId, true) < 0) goto _err;
+    if (tsdbTableSetSuperUid(pCfg, htobe64(pMsg->superTableUid)) < 0) goto _err;
+
+    int32_t tagDataLen = htonl(pMsg->tagDataLen);
+    if (tagDataLen) {
+      char *pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+      tsdbTableSetTagValue(pCfg, pTagData, true);
+    }
+  }
+
+  if (pMsg->tableType == TSDB_STREAM_TABLE) {
+    char *sql = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+    tsdbTableSetStreamSql(pCfg, sql, true);
+  }
+
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+
+  return pCfg;
+
+_err:
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+  tsdbClearTableCfg(pCfg);
+  return NULL;
+}
+
+static UNUSED_FUNC int32_t colIdCompar(const void* left, const void* right) {
+  int16_t colId = *(int16_t*) left;
+  STColumn* p2 = (STColumn*) right;
+
+  if (colId == p2->colId) {
+    return 0;
+  }
+
+  return (colId < p2->colId)? -1:1;
+}
+
+int tsdbUpdateTableTagValue(TSDB_REPO_T *repo, SUpdateTableTagValMsg *pMsg) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  STSchema * pNewSchema = NULL;
+
+  pMsg->uid = htobe64(pMsg->uid);
+  pMsg->tid = htonl(pMsg->tid);
+  pMsg->tversion  = htons(pMsg->tversion);
+  pMsg->colId     = htons(pMsg->colId);
+  pMsg->bytes     = htons(pMsg->bytes);
+  pMsg->tagValLen = htonl(pMsg->tagValLen);
+  pMsg->numOfTags = htons(pMsg->numOfTags);
+  pMsg->schemaLen = htonl(pMsg->schemaLen);
+  for (int i = 0; i < pMsg->numOfTags; i++) {
+    STColumn *pTCol = (STColumn *)pMsg->data + i;
+    pTCol->bytes = htons(pTCol->bytes);
+    pTCol->colId = htons(pTCol->colId);
+  }
+
+  STable *pTable = tsdbGetTableByUid(pMeta, pMsg->uid);
+  if (pTable == NULL || TABLE_TID(pTable) != pMsg->tid) {
+    tsdbError("vgId:%d failed to update table tag value since invalid table id %d uid %" PRIu64, REPO_ID(pRepo),
+              pMsg->tid, pMsg->uid);
+    terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+    return -1;
+  }
+
+  if (TABLE_TYPE(pTable) != TSDB_CHILD_TABLE) {
+    tsdbError("vgId:%d try to update tag value of a non-child table, invalid action", REPO_ID(pRepo));
+    terrno = TSDB_CODE_TDB_INVALID_ACTION;
+    return -1;
+  }
+
+  if (schemaVersion(pTable->pSuper->tagSchema) > pMsg->tversion) {
+    tsdbError(
+        "vgId:%d failed to update tag value of table %s since version out of date, client tag version %d server tag "
+        "version %d",
+        REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), pMsg->tversion, schemaVersion(pTable->tagSchema));
+    terrno = TSDB_CODE_TDB_TAG_VER_OUT_OF_DATE;
+    return -1;
+  }
+
+  if (schemaVersion(pTable->pSuper->tagSchema) < pMsg->tversion) {  // tag schema out of data,
+    tsdbDebug("vgId:%d need to update tag schema of table %s tid %d uid %" PRIu64
+              " since out of date, current version %d new version %d",
+              REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable),
+              schemaVersion(pTable->pSuper->tagSchema), pMsg->tversion);
+
+    STSchemaBuilder schemaBuilder = {0};
+
+    STColumn *pTCol = (STColumn *)pMsg->data;
+    ASSERT(pMsg->schemaLen % sizeof(STColumn) == 0 && pTCol[0].colId == colColId(schemaColAt(pTable->pSuper->tagSchema, 0)));
+    if (tdInitTSchemaBuilder(&schemaBuilder, pMsg->tversion) < 0) {
+      tsdbDebug("vgId:%d failed to update tag schema of table %s tid %d uid %" PRIu64 " since out of memory",
+                REPO_ID(pRepo), TABLE_CHAR_NAME(pTable), TABLE_TID(pTable), TABLE_UID(pTable));
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+    for (int i = 0; i < (pMsg->schemaLen / sizeof(STColumn)); i++) {
+      if (tdAddColToSchema(&schemaBuilder, pTCol[i].type, pTCol[i].colId, pTCol[i].bytes) < 0) {
+        tdDestroyTSchemaBuilder(&schemaBuilder);
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return -1;
+      }
+    }
+    pNewSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+    if (pNewSchema == NULL) {
+      tdDestroyTSchemaBuilder(&schemaBuilder);
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+    tdDestroyTSchemaBuilder(&schemaBuilder);
+  }
+
+  // Chage in memory
+  if (pNewSchema != NULL) { // change super table tag schema
+    taosWLockLatch(&(pTable->pSuper->latch));
+    STSchema *pOldSchema = pTable->pSuper->tagSchema;
+    pTable->pSuper->tagSchema = pNewSchema;
+    tdFreeSchema(pOldSchema);
+    taosWUnLockLatch(&(pTable->pSuper->latch));
+  }
+
+  bool      isChangeIndexCol = (pMsg->colId == colColId(schemaColAt(pTable->pSuper->tagSchema, 0)));
+  // STColumn *pCol = bsearch(&(pMsg->colId), pMsg->data, pMsg->numOfTags, sizeof(STColumn), colIdCompar);
+  // ASSERT(pCol != NULL);
+
+  if (isChangeIndexCol) {
+    tsdbWLockRepoMeta(pRepo);
+    tsdbRemoveTableFromIndex(pMeta, pTable);
+  }
+  taosWLockLatch(&(pTable->latch));
+  tdSetKVRowDataOfCol(&(pTable->tagVal), pMsg->colId, pMsg->type, POINTER_SHIFT(pMsg->data, pMsg->schemaLen));
+  taosWUnLockLatch(&(pTable->latch));
+  if (isChangeIndexCol) {
+    tsdbAddTableIntoIndex(pMeta, pTable, false);
+    tsdbUnlockRepoMeta(pRepo);
+  }
+
+  // Update on file
+  int tlen1 = (pNewSchema) ? tsdbGetTableEncodeSize(TSDB_UPDATE_META, pTable->pSuper) : 0;
+  int tlen2 = tsdbGetTableEncodeSize(TSDB_UPDATE_META, pTable);
+  void *buf = tsdbAllocBytes(pRepo, tlen1+tlen2);
+  ASSERT(buf != NULL);
+  if (pNewSchema) {
+    void *pBuf = tsdbInsertTableAct(pRepo, TSDB_UPDATE_META, buf, pTable->pSuper);
+    ASSERT(POINTER_DISTANCE(pBuf, buf) == tlen1);
+    buf = pBuf;
+  }
+  tsdbInsertTableAct(pRepo, TSDB_UPDATE_META, buf, pTable);
+
+  if (tsdbCheckCommit(pRepo) < 0) return -1;
+
+  return 0;
+}
+
+// ------------------ INTERNAL FUNCTIONS ------------------
+STsdbMeta *tsdbNewMeta(STsdbCfg *pCfg) {
+  STsdbMeta *pMeta = (STsdbMeta *)calloc(1, sizeof(*pMeta));
+  if (pMeta == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  int code = pthread_rwlock_init(&pMeta->rwLock, NULL);
+  if (code != 0) {
+    tsdbError("vgId:%d failed to init TSDB meta r/w lock since %s", pCfg->tsdbId, strerror(code));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    goto _err;
+  }
+
+  pMeta->maxTables = TSDB_INIT_NTABLES + 1;
+  pMeta->tables = (STable **)calloc(pMeta->maxTables, sizeof(STable *));
+  if (pMeta->tables == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMeta->superList = tdListNew(sizeof(STable *));
+  if (pMeta->superList == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMeta->uidMap = taosHashInit((size_t)(TSDB_INIT_NTABLES * 1.1), taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+  if (pMeta->uidMap == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return pMeta;
+
+_err:
+  tsdbFreeMeta(pMeta);
+  return NULL;
+}
+
+void tsdbFreeMeta(STsdbMeta *pMeta) {
+  if (pMeta) {
+    taosHashCleanup(pMeta->uidMap);
+    tdListFree(pMeta->superList);
+    taosTFree(pMeta->tables);
+    pthread_rwlock_destroy(&pMeta->rwLock);
+    free(pMeta);
+  }
+}
+
+int tsdbOpenMeta(STsdbRepo *pRepo) {
+  char *     fname = NULL;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  ASSERT(pMeta != NULL);
+
+  fname = tsdbGetMetaFileName(pRepo->rootDir);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pMeta->pStore = tdOpenKVStore(fname, tsdbRestoreTable, tsdbOrgMeta, (void *)pRepo);
+  if (pMeta->pStore == NULL) {
+    tsdbError("vgId:%d failed to open TSDB meta while open the kv store since %s", REPO_ID(pRepo), tstrerror(terrno));
+    goto _err;
+  }
+
+  tsdbDebug("vgId:%d open TSDB meta succeed", REPO_ID(pRepo));
+  taosTFree(fname);
+  return 0;
+
+_err:
+  taosTFree(fname);
+  return -1;
+}
+
+int tsdbCloseMeta(STsdbRepo *pRepo) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  SListNode *pNode = NULL;
+  STable *   pTable = NULL;
+
+  if (pMeta == NULL) return 0;
+  tdCloseKVStore(pMeta->pStore);
+  for (int i = 1; i < pMeta->maxTables; i++) {
+    tsdbFreeTable(pMeta->tables[i]);
+  }
+
+  while ((pNode = tdListPopHead(pMeta->superList)) != NULL) {
+    tdListNodeGetData(pMeta->superList, pNode, (void *)(&pTable));
+    tsdbFreeTable(pTable);
+    listNodeFree(pNode);
+  }
+
+  tsdbDebug("vgId:%d TSDB meta is closed", REPO_ID(pRepo));
+  return 0;
+}
+
+STable *tsdbGetTableByUid(STsdbMeta *pMeta, uint64_t uid) {
+  void *ptr = taosHashGet(pMeta->uidMap, (char *)(&uid), sizeof(uid));
+
+  if (ptr == NULL) return NULL;
+
+  return *(STable **)ptr;
+}
+
+STSchema *tsdbGetTableSchemaByVersion(STable *pTable, int16_t version) {
+  return tsdbGetTableSchemaImpl(pTable, true, false, version);
+}
+
+int tsdbWLockRepoMeta(STsdbRepo *pRepo) {
+  int code = pthread_rwlock_wrlock(&(pRepo->tsdbMeta->rwLock));
+  if (code != 0) {
+    tsdbError("vgId:%d failed to write lock TSDB meta since %s", REPO_ID(pRepo), strerror(code));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+
+  return 0;
+}
+
+int tsdbRLockRepoMeta(STsdbRepo *pRepo) {
+  int code = pthread_rwlock_rdlock(&(pRepo->tsdbMeta->rwLock));
+  if (code != 0) {
+    tsdbError("vgId:%d failed to read lock TSDB meta since %s", REPO_ID(pRepo), strerror(code));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+
+  return 0;
+}
+
+int tsdbUnlockRepoMeta(STsdbRepo *pRepo) {
+  int code = pthread_rwlock_unlock(&(pRepo->tsdbMeta->rwLock));
+  if (code != 0) {
+    tsdbError("vgId:%d failed to unlock TSDB meta since %s", REPO_ID(pRepo), strerror(code));
+    terrno = TAOS_SYSTEM_ERROR(code);
+    return -1;
+  }
+
+  return 0;
+}
+
+void tsdbRefTable(STable *pTable) {
+  int32_t ref = T_REF_INC(pTable);
+  UNUSED(ref);
+  // tsdbDebug("ref table %"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
+}
+
+void tsdbUnRefTable(STable *pTable) {
+  int32_t ref = T_REF_DEC(pTable);
+  tsdbDebug("unref table uid:%"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
+
+  if (ref == 0) {
+    // tsdbDebug("destory table name:%s uid:%"PRIu64", tid:%d", TABLE_CHAR_NAME(pTable), TABLE_UID(pTable), TABLE_TID(pTable));
+
+    if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) {
+      tsdbUnRefTable(pTable->pSuper);
+    }
+    tsdbFreeTable(pTable);
+  }
+}
+
+void tsdbUpdateTableSchema(STsdbRepo *pRepo, STable *pTable, STSchema *pSchema, bool insertAct) {
+  ASSERT(TABLE_TYPE(pTable) != TSDB_STREAM_TABLE && TABLE_TYPE(pTable) != TSDB_SUPER_TABLE);
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  STable *pCTable = (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) ? pTable->pSuper : pTable;
+  ASSERT(schemaVersion(pSchema) > schemaVersion(pCTable->schema[pCTable->numOfSchemas - 1]));
+
+  taosWLockLatch(&(pCTable->latch));
+  if (pCTable->numOfSchemas < TSDB_MAX_TABLE_SCHEMAS) {
+    pCTable->schema[pCTable->numOfSchemas++] = pSchema;
+  } else {
+    ASSERT(pCTable->numOfSchemas == TSDB_MAX_TABLE_SCHEMAS);
+    tdFreeSchema(pCTable->schema[0]);
+    memmove(pCTable->schema, pCTable->schema + 1, sizeof(STSchema *) * (TSDB_MAX_TABLE_SCHEMAS - 1));
+    pCTable->schema[pCTable->numOfSchemas - 1] = pSchema;
+  }
+
+  if (schemaNCols(pSchema) > pMeta->maxCols) pMeta->maxCols = schemaNCols(pSchema);
+  if (schemaTLen(pSchema) > pMeta->maxRowBytes) pMeta->maxRowBytes = schemaTLen(pSchema);
+  taosWUnLockLatch(&(pCTable->latch));
+
+  if (insertAct) {
+    int   tlen = tsdbGetTableEncodeSize(TSDB_UPDATE_META, pCTable);
+    void *buf = tsdbAllocBytes(pRepo, tlen);
+    ASSERT(buf != NULL);
+    tsdbInsertTableAct(pRepo, TSDB_UPDATE_META, buf, pCTable);
+  }
+}
+
+// ------------------ LOCAL FUNCTIONS ------------------
+static int tsdbRestoreTable(void *pHandle, void *cont, int contLen) {
+  STsdbRepo *pRepo = (STsdbRepo *)pHandle;
+  STable *   pTable = NULL;
+
+  if (!taosCheckChecksumWhole((uint8_t *)cont, contLen)) {
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  tsdbDecodeTable(cont, &pTable);
+
+  if (tsdbAddTableToMeta(pRepo, pTable, false, false) < 0) {
+    tsdbFreeTable(pTable);
+    return -1;
+  }
+
+  tsdbTrace("vgId:%d table %s tid %d uid %" PRIu64 " is restored from file", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+            TABLE_TID(pTable), TABLE_UID(pTable));
+  return 0;
+}
+
+static void tsdbOrgMeta(void *pHandle) {
+  STsdbRepo *pRepo = (STsdbRepo *)pHandle;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  for (int i = 1; i < pMeta->maxTables; i++) {
+    STable *pTable = pMeta->tables[i];
+    if (pTable != NULL && pTable->type == TSDB_CHILD_TABLE) {
+      tsdbAddTableIntoIndex(pMeta, pTable, true);
+    }
+  }
+}
+
+static char *getTagIndexKey(const void *pData) {
+  STable *pTable = *(STable **)pData;
+
+  STSchema *pSchema = tsdbGetTableTagSchema(pTable);
+  STColumn *pCol = schemaColAt(pSchema, DEFAULT_TAG_INDEX_COLUMN);
+  void *    res = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
+  if (res == NULL) {
+    // treat the column as NULL if we cannot find it
+    res = getNullValue(pCol->type);
+  }
+  return res;
+}
+
+static STable *tsdbNewTable() {
+  STable *pTable = (STable *)calloc(1, sizeof(*pTable));
+  if (pTable == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pTable->lastKey = TSKEY_INITIAL_VAL;
+
+  return pTable;
+}
+
+static STable *tsdbCreateTableFromCfg(STableCfg *pCfg, bool isSuper) {
+  STable *pTable = NULL;
+  size_t  tsize = 0;
+
+  pTable = tsdbNewTable();
+  if (pTable == NULL) goto _err;
+
+  if (isSuper) {
+    pTable->type = TSDB_SUPER_TABLE;
+    tsize = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN - 1);
+    pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1);
+    if (pTable->name == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+    STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->sname, (VarDataLenT)tsize);
+    TABLE_UID(pTable) = pCfg->superUid;
+    TABLE_TID(pTable) = -1;
+    TABLE_SUID(pTable) = -1;
+    pTable->pSuper = NULL;
+    pTable->numOfSchemas = 1;
+    pTable->schema[0] = tdDupSchema(pCfg->schema);
+    if (pTable->schema[0] == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+    pTable->tagSchema = tdDupSchema(pCfg->tagSchema);
+    if (pTable->tagSchema == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+    pTable->tagVal = NULL;
+    STColumn *pCol = schemaColAt(pTable->tagSchema, DEFAULT_TAG_INDEX_COLUMN);
+    pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, colType(pCol), (uint8_t)(colBytes(pCol)), 1, 0, 1, getTagIndexKey);
+    if (pTable->pIndex == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+  } else {
+    pTable->type = pCfg->type;
+    tsize = strnlen(pCfg->name, TSDB_TABLE_NAME_LEN - 1);
+    pTable->name = calloc(1, tsize + VARSTR_HEADER_SIZE + 1);
+    if (pTable->name == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      goto _err;
+    }
+    STR_WITH_SIZE_TO_VARSTR(pTable->name, pCfg->name, (VarDataLenT)tsize);
+    TABLE_UID(pTable) = pCfg->tableId.uid;
+    TABLE_TID(pTable) = pCfg->tableId.tid;
+
+    if (pCfg->type == TSDB_CHILD_TABLE) {
+      TABLE_SUID(pTable) = pCfg->superUid;
+      pTable->tagVal = tdKVRowDup(pCfg->tagValues);
+      if (pTable->tagVal == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto _err;
+      }
+    } else {
+      TABLE_SUID(pTable) = -1;
+      pTable->numOfSchemas = 1;
+      pTable->schema[0] = tdDupSchema(pCfg->schema);
+      if (pTable->schema[0] == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        goto _err;
+      }
+
+      if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) {
+        pTable->sql = strdup(pCfg->sql);
+        if (pTable->sql == NULL) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          goto _err;
+        }
+      }
+    }
+  }
+
+  T_REF_INC(pTable);
+
+  tsdbTrace("table %s tid %d uid %" PRIu64 " is created", TABLE_CHAR_NAME(pTable), TABLE_TID(pTable),
+            TABLE_UID(pTable));
+
+  return pTable;
+
+_err:
+  tsdbFreeTable(pTable);
+  return NULL;
+}
+
+static void tsdbFreeTable(STable *pTable) {
+  if (pTable) {
+    if (pTable->name != NULL)
+      tsdbTrace("table %s tid %d uid %" PRIu64 " is freed", TABLE_CHAR_NAME(pTable), TABLE_TID(pTable),
+                TABLE_UID(pTable));
+    taosTFree(TABLE_NAME(pTable));
+    if (TABLE_TYPE(pTable) != TSDB_CHILD_TABLE) {
+      for (int i = 0; i < TSDB_MAX_TABLE_SCHEMAS; i++) {
+        tdFreeSchema(pTable->schema[i]);
+      }
+
+      if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+        tdFreeSchema(pTable->tagSchema);
+      }
+    }
+
+    kvRowFree(pTable->tagVal);
+
+    tSkipListDestroy(pTable->pIndex);
+    taosTFree(pTable->sql);
+    free(pTable);
+  }
+}
+
+static int tsdbAddTableToMeta(STsdbRepo *pRepo, STable *pTable, bool addIdx, bool lock) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  if (lock && tsdbWLockRepoMeta(pRepo) < 0) {
+    tsdbError("vgId:%d failed to add table %s to meta since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+              tstrerror(terrno));
+    return -1;
+  }
+
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    if (tdListAppend(pMeta->superList, (void *)(&pTable)) < 0) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      tsdbError("vgId:%d failed to add table %s to meta since %s", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+                tstrerror(terrno));
+      goto _err;
+    }
+  } else {
+    if (TABLE_TID(pTable) >= pMeta->maxTables) {
+      if (tsdbAdjustMetaTables(pRepo, TABLE_TID(pTable)) < 0) goto _err;
+    }
+    if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE && addIdx) {  // add STABLE to the index
+      if (tsdbAddTableIntoIndex(pMeta, pTable, true) < 0) {
+        tsdbDebug("vgId:%d failed to add table %s to meta while add table to index since %s", REPO_ID(pRepo),
+                  TABLE_CHAR_NAME(pTable), tstrerror(terrno));
+        goto _err;
+      }
+    }
+    ASSERT(TABLE_TID(pTable) < pMeta->maxTables);
+    pMeta->tables[TABLE_TID(pTable)] = pTable;
+    pMeta->nTables++;
+  }
+
+  if (taosHashPut(pMeta->uidMap, (char *)(&pTable->tableId.uid), sizeof(pTable->tableId.uid), (void *)(&pTable),
+                  sizeof(pTable)) < 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    tsdbError("vgId:%d failed to add table %s to meta while put into uid map since %s", REPO_ID(pRepo),
+              TABLE_CHAR_NAME(pTable), tstrerror(terrno));
+    goto _err;
+  }
+
+  if (TABLE_TYPE(pTable) != TSDB_CHILD_TABLE) {
+    STSchema *pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+    if (schemaNCols(pSchema) > pMeta->maxCols) pMeta->maxCols = schemaNCols(pSchema);
+    if (schemaTLen(pSchema) > pMeta->maxRowBytes) pMeta->maxRowBytes = schemaTLen(pSchema);
+  }
+
+  if (lock && tsdbUnlockRepoMeta(pRepo) < 0) return -1;
+  if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE && addIdx) {
+    pTable->cqhandle = (*pRepo->appH.cqCreateFunc)(pRepo->appH.cqH, TABLE_UID(pTable), TABLE_TID(pTable), pTable->sql,
+                                                   tsdbGetTableSchemaImpl(pTable, false, false, -1));
+  }
+
+  tsdbDebug("vgId:%d table %s tid %d uid %" PRIu64 " is added to meta", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable),
+            TABLE_TID(pTable), TABLE_UID(pTable));
+  return 0;
+
+_err:
+  tsdbRemoveTableFromMeta(pRepo, pTable, false, false);
+  if (lock) tsdbUnlockRepoMeta(pRepo);
+  return -1;
+}
+
+static void tsdbRemoveTableFromMeta(STsdbRepo *pRepo, STable *pTable, bool rmFromIdx, bool lock) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  SListIter  lIter = {0};
+  SListNode *pNode = NULL;
+  STable *   tTable = NULL;
+
+  STSchema *pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+  int       maxCols = schemaNCols(pSchema);
+  int       maxRowBytes = schemaTLen(pSchema);
+
+  if (lock) tsdbWLockRepoMeta(pRepo);
+
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    tdListInitIter(pMeta->superList, &lIter, TD_LIST_BACKWARD);
+
+    while ((pNode = tdListNext(&lIter)) != NULL) {
+      tdListNodeGetData(pMeta->superList, pNode, (void *)(&tTable));
+      if (pTable == tTable) {
+        tdListPopNode(pMeta->superList, pNode);
+        free(pNode);
+        break;
+      }
+    }
+  } else {
+    pMeta->tables[pTable->tableId.tid] = NULL;
+    if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE && rmFromIdx) {
+      tsdbRemoveTableFromIndex(pMeta, pTable);
+    }
+
+    pMeta->nTables--;
+  }
+
+  taosHashRemove(pMeta->uidMap, (char *)(&(TABLE_UID(pTable))), sizeof(TABLE_UID(pTable)));
+
+  if (maxCols == pMeta->maxCols || maxRowBytes == pMeta->maxRowBytes) {
+    maxCols = 0;
+    maxRowBytes = 0;
+    for (int i = 0; i < pMeta->maxTables; i++) {
+      STable *pTable = pMeta->tables[i];
+      if (pTable != NULL) {
+        pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+        maxCols = MAX(maxCols, schemaNCols(pSchema));
+        maxRowBytes = MAX(maxRowBytes, schemaTLen(pSchema));
+      }
+    }
+  }
+
+  if (lock) tsdbUnlockRepoMeta(pRepo);
+  tsdbDebug("vgId:%d table %s is removed from meta", REPO_ID(pRepo), TABLE_CHAR_NAME(pTable));
+  tsdbUnRefTable(pTable);
+}
+
+static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable, bool refSuper) {
+  ASSERT(pTable->type == TSDB_CHILD_TABLE && pTable != NULL);
+  STable *pSTable = tsdbGetTableByUid(pMeta, TABLE_SUID(pTable));
+  ASSERT(pSTable != NULL);
+
+  pTable->pSuper = pSTable;
+
+  int32_t level = 0;
+  int32_t headSize = 0;
+
+  tSkipListNewNodeInfo(pSTable->pIndex, &level, &headSize);
+
+  // NOTE: do not allocate the space for key, since in each skip list node, only keep the pointer to pTable, not the
+  // actual key value, and the key value will be retrieved during query through the pTable and getTagIndexKey function
+  SSkipListNode *pNode = calloc(1, headSize + sizeof(STable *));
+  if (pNode == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+  pNode->level = level;
+
+  memcpy(SL_GET_NODE_DATA(pNode), &pTable, sizeof(STable *));
+
+  tSkipListPut(pSTable->pIndex, pNode);
+  if (refSuper) T_REF_INC(pSTable);
+  return 0;
+}
+
+static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) {
+  ASSERT(pTable->type == TSDB_CHILD_TABLE && pTable != NULL);
+
+  STable *pSTable = pTable->pSuper;
+  ASSERT(pSTable != NULL);
+
+  STSchema *pSchema = tsdbGetTableTagSchema(pTable);
+  STColumn *pCol = schemaColAt(pSchema, DEFAULT_TAG_INDEX_COLUMN);
+
+  char *  key = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
+  SArray *res = tSkipListGet(pSTable->pIndex, key);
+
+  size_t size = taosArrayGetSize(res);
+  ASSERT(size > 0);
+
+  for (int32_t i = 0; i < size; ++i) {
+    SSkipListNode *pNode = taosArrayGetP(res, i);
+
+    // STableIndexElem* pElem = (STableIndexElem*) SL_GET_NODE_DATA(pNode);
+    if (*(STable **)SL_GET_NODE_DATA(pNode) == pTable) {  // this is the exact what we need
+      tSkipListRemoveNode(pSTable->pIndex, pNode);
+    }
+  }
+
+  taosArrayDestroy(res);
+  return 0;
+}
+
+static int tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t tid) {
+  if (type != TSDB_CHILD_TABLE && type != TSDB_NORMAL_TABLE && type != TSDB_STREAM_TABLE) {
+    terrno = TSDB_CODE_TDB_INVALID_TABLE_TYPE;
+    return -1;
+  }
+
+  memset((void *)config, 0, sizeof(*config));
+
+  config->type = type;
+  config->superUid = TSDB_INVALID_SUPER_TABLE_ID;
+  config->tableId.uid = uid;
+  config->tableId.tid = tid;
+  return 0;
+}
+
+static int tsdbTableSetSchema(STableCfg *config, STSchema *pSchema, bool dup) {
+  if (dup) {
+    config->schema = tdDupSchema(pSchema);
+    if (config->schema == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->schema = pSchema;
+  }
+  return 0;
+}
+
+static int tsdbTableSetName(STableCfg *config, char *name, bool dup) {
+  if (dup) {
+    config->name = strdup(name);
+    if (config->name == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->name = name;
+  }
+
+  return 0;
+}
+
+static int tsdbTableSetTagSchema(STableCfg *config, STSchema *pSchema, bool dup) {
+  if (config->type != TSDB_CHILD_TABLE) {
+    terrno = TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
+    return -1;
+  }
+
+  if (dup) {
+    config->tagSchema = tdDupSchema(pSchema);
+    if (config->tagSchema == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->tagSchema = pSchema;
+  }
+  return 0;
+}
+
+static int tsdbTableSetSName(STableCfg *config, char *sname, bool dup) {
+  if (config->type != TSDB_CHILD_TABLE) {
+    terrno = TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
+    return -1;
+  }
+
+  if (dup) {
+    config->sname = strdup(sname);
+    if (config->sname == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->sname = sname;
+  }
+  return 0;
+}
+
+static int tsdbTableSetSuperUid(STableCfg *config, uint64_t uid) {
+  if (config->type != TSDB_CHILD_TABLE || uid == TSDB_INVALID_SUPER_TABLE_ID) {
+    terrno = TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
+    return -1;
+  }
+
+  config->superUid = uid;
+  return 0;
+}
+
+static int tsdbTableSetTagValue(STableCfg *config, SKVRow row, bool dup) {
+  if (config->type != TSDB_CHILD_TABLE) {
+    terrno = TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
+    return -1;
+  }
+
+  if (dup) {
+    config->tagValues = tdKVRowDup(row);
+    if (config->tagValues == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->tagValues = row;
+  }
+
+  return 0;
+}
+
+static int tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup) {
+  if (config->type != TSDB_STREAM_TABLE) {
+    terrno = TSDB_CODE_TDB_INVALID_CREATE_TB_MSG;
+    return -1;
+  }
+
+  if (dup) {
+    config->sql = strdup(sql);
+    if (config->sql == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  } else {
+    config->sql = sql;
+  }
+
+  return 0;
+}
+
+void tsdbClearTableCfg(STableCfg *config) {
+  if (config) {
+    if (config->schema) tdFreeSchema(config->schema);
+    if (config->tagSchema) tdFreeSchema(config->tagSchema);
+    if (config->tagValues) kvRowFree(config->tagValues);
+    taosTFree(config->name);
+    taosTFree(config->sname);
+    taosTFree(config->sql);
+    free(config);
+  }
+}
+
+static int tsdbEncodeTableName(void **buf, tstr *name) {
+  int tlen = 0;
+
+  tlen += taosEncodeFixedI16(buf, name->len);
+  if (buf != NULL) {
+    memcpy(*buf, name->data, name->len);
+    *buf = POINTER_SHIFT(*buf, name->len);
+  }
+  tlen += name->len;
+
+  return tlen;
+}
+
+static void *tsdbDecodeTableName(void *buf, tstr **name) {
+  VarDataLenT len = 0;
+
+  buf = taosDecodeFixedI16(buf, &len);
+  *name = calloc(1, sizeof(tstr) + len + 1);
+  if (*name == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return NULL;
+  }
+  (*name)->len = len;
+  memcpy((*name)->data, buf, len);
+
+  buf = POINTER_SHIFT(buf, len);
+  return buf;
+}
+
+static int tsdbEncodeTable(void **buf, STable *pTable) {
+  ASSERT(pTable != NULL);
+  int tlen = 0;
+
+  tlen += taosEncodeFixedU8(buf, pTable->type);
+  tlen += tsdbEncodeTableName(buf, pTable->name);
+  tlen += taosEncodeFixedU64(buf, TABLE_UID(pTable));
+  tlen += taosEncodeFixedI32(buf, TABLE_TID(pTable));
+
+  if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) {
+    tlen += taosEncodeFixedU64(buf, TABLE_SUID(pTable));
+    tlen += tdEncodeKVRow(buf, pTable->tagVal);
+  } else {
+    tlen += taosEncodeFixedU8(buf, pTable->numOfSchemas);
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      tlen += tdEncodeSchema(buf, pTable->schema[i]);
+    }
+
+    if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+      tlen += tdEncodeSchema(buf, pTable->tagSchema);
+    }
+
+    if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) {
+      tlen += taosEncodeString(buf, pTable->sql);
+    }
+  }
+
+  return tlen;
+}
+
+static void *tsdbDecodeTable(void *buf, STable **pRTable) {
+  STable *pTable = tsdbNewTable();
+  if (pTable == NULL) return NULL;
+
+  uint8_t type = 0;
+
+  buf = taosDecodeFixedU8(buf, &type);
+  pTable->type = type;
+  buf = tsdbDecodeTableName(buf, &(pTable->name));
+  buf = taosDecodeFixedU64(buf, &TABLE_UID(pTable));
+  buf = taosDecodeFixedI32(buf, &TABLE_TID(pTable));
+
+  if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) {
+    buf = taosDecodeFixedU64(buf, &TABLE_SUID(pTable));
+    buf = tdDecodeKVRow(buf, &(pTable->tagVal));
+  } else {
+    buf = taosDecodeFixedU8(buf, &(pTable->numOfSchemas));
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      buf = tdDecodeSchema(buf, &(pTable->schema[i]));
+    }
+
+    if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+      buf = tdDecodeSchema(buf, &(pTable->tagSchema));
+      STColumn *pCol = schemaColAt(pTable->tagSchema, DEFAULT_TAG_INDEX_COLUMN);
+      pTable->pIndex =
+          tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, colType(pCol), (uint8_t)(colBytes(pCol)), 1, 0, 1, getTagIndexKey);
+      if (pTable->pIndex == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        tsdbFreeTable(pTable);
+        return NULL;
+      }
+    }
+
+    if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) {
+      buf = taosDecodeString(buf, &(pTable->sql));
+    }
+  }
+
+  T_REF_INC(pTable);
+
+  *pRTable = pTable;
+
+  return buf;
+}
+
+static int tsdbGetTableEncodeSize(int8_t act, STable *pTable) {
+  int tlen = 0;
+  if (act == TSDB_UPDATE_META) {
+    tlen = sizeof(SListNode) + sizeof(SActObj) + sizeof(SActCont) + tsdbEncodeTable(NULL, pTable) + sizeof(TSCKSUM);
+  } else {
+    if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+      tlen = (int)((sizeof(SListNode) + sizeof(SActObj)) * (tSkipListGetSize(pTable->pIndex) + 1));
+    } else {
+      tlen = sizeof(SListNode) + sizeof(SActObj);
+    }
+  }
+
+  return tlen;
+}
+
+static void *tsdbInsertTableAct(STsdbRepo *pRepo, int8_t act, void *buf, STable *pTable) {
+  SListNode *pNode = (SListNode *)buf;
+  SActObj *  pAct = (SActObj *)(pNode->data);
+  SActCont * pCont = (SActCont *)POINTER_SHIFT(pAct, sizeof(*pAct));
+  void *     pBuf = (void *)pCont;
+
+  pNode->prev = pNode->next = NULL;
+  pAct->act = act;
+  pAct->uid = TABLE_UID(pTable);
+
+  if (act == TSDB_UPDATE_META) {
+    pBuf = (void *)(pCont->cont);
+    pCont->len = tsdbEncodeTable(&pBuf, pTable) + sizeof(TSCKSUM);
+    taosCalcChecksumAppend(0, (uint8_t *)pCont->cont, pCont->len);
+    pBuf = POINTER_SHIFT(pBuf, sizeof(TSCKSUM));
+  }
+
+  tdListAppendNode(pRepo->mem->actList, pNode);
+
+  return pBuf;
+}
+
+static int tsdbRemoveTableFromStore(STsdbRepo *pRepo, STable *pTable) {
+  int   tlen = tsdbGetTableEncodeSize(TSDB_DROP_META, pTable);
+  void *buf = tsdbAllocBytes(pRepo, tlen);
+  if (buf == NULL) {
+    return -1;
+  }
+
+  void *pBuf = buf;
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    SSkipListIterator *pIter = tSkipListCreateIter(pTable->pIndex);
+    if (pIter == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+
+    while (tSkipListIterNext(pIter)) {
+      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
+      ASSERT(TABLE_TYPE(tTable) == TSDB_CHILD_TABLE);
+      pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, tTable);
+    }
+
+    tSkipListDestroyIter(pIter);
+  }
+  pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, pTable);
+
+  ASSERT(POINTER_DISTANCE(pBuf, buf) == tlen);
+
+  return 0;
+}
+
+static int tsdbRmTableFromMeta(STsdbRepo *pRepo, STable *pTable) {
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    SSkipListIterator *pIter = tSkipListCreateIter(pTable->pIndex);
+    if (pIter == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+
+    tsdbWLockRepoMeta(pRepo);
+
+    while (tSkipListIterNext(pIter)) {
+      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
+      tsdbRemoveTableFromMeta(pRepo, tTable, false, false);
+    }
+
+    tsdbRemoveTableFromMeta(pRepo, pTable, false, false);
+
+    tsdbUnlockRepoMeta(pRepo);
+
+    tSkipListDestroyIter(pIter);
+
+  } else {
+    if ((TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) && pTable->cqhandle) pRepo->appH.cqDropFunc(pTable->cqhandle);
+    tsdbRemoveTableFromMeta(pRepo, pTable, true, true);
+  }
+
+  return 0;
+}
+
+static int tsdbAdjustMetaTables(STsdbRepo *pRepo, int tid) {
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  ASSERT(tid >= pMeta->maxTables);
+
+  int maxTables = tsdbGetNextMaxTables(tid);
+
+  STable **tables = (STable **)calloc(maxTables, sizeof(STable *));
+  if (tables == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  memcpy((void *)tables, (void *)pMeta->tables, sizeof(STable *) * pMeta->maxTables);
+  pMeta->maxTables = maxTables;
+
+  STable **tTables = pMeta->tables;
+  pMeta->tables = tables;
+  taosTFree(tTables);
+  tsdbDebug("vgId:%d tsdb meta maxTables is adjusted as %d", REPO_ID(pRepo), maxTables);
+
+  return 0;
+}
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
new file mode 100644
index 0000000000000000000000000000000000000000..357093bd9e125567ef3d3629c00877f54778b500
--- /dev/null
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -0,0 +1,1697 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+
+#define TAOS_RANDOM_FILE_FAIL_TEST
+
+#include "os.h"
+#include "talgo.h"
+#include "tchecksum.h"
+#include "tcoding.h"
+#include "tscompression.h"
+#include "tsdbMain.h"
+
+#define TSDB_GET_COMPCOL_LEN(nCols) (sizeof(SCompData) + sizeof(SCompCol) * (nCols) + sizeof(TSCKSUM))
+#define TSDB_KEY_COL_OFFSET 0
+#define TSDB_GET_COMPBLOCK_IDX(h, b) (POINTER_DISTANCE(b, (h)->pCompInfo->blocks)/sizeof(SCompBlock))
+
+static bool tsdbShouldCreateNewLast(SRWHelper *pHelper);
+static int  tsdbWriteBlockToFile(SRWHelper *pHelper, SFile *pFile, SDataCols *pDataCols, SCompBlock *pCompBlock,
+                                 bool isLast, bool isSuperBlock);
+static int  compareKeyBlock(const void *arg1, const void *arg2);
+static int  tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize);
+static int  tsdbInsertSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx);
+static int  tsdbAddSubBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx, int rowsAdded);
+static int  tsdbUpdateSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx);
+static void tsdbResetHelperFileImpl(SRWHelper *pHelper);
+static int  tsdbInitHelperFile(SRWHelper *pHelper);
+static void tsdbDestroyHelperFile(SRWHelper *pHelper);
+static void tsdbResetHelperTableImpl(SRWHelper *pHelper);
+static void tsdbResetHelperTable(SRWHelper *pHelper);
+static void tsdbInitHelperTable(SRWHelper *pHelper);
+static void tsdbDestroyHelperTable(SRWHelper *pHelper);
+static void tsdbResetHelperBlockImpl(SRWHelper *pHelper);
+static void tsdbResetHelperBlock(SRWHelper *pHelper);
+static int  tsdbInitHelperBlock(SRWHelper *pHelper);
+static int  tsdbInitHelper(SRWHelper *pHelper, STsdbRepo *pRepo, tsdb_rw_helper_t type);
+static int  tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32_t len, int8_t comp, int numOfRows,
+                                         int maxPoints, char *buffer, int bufferSize);
+static int  tsdbLoadBlockDataColsImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols, int16_t *colIds,
+                                      int numOfColIds);
+static int  tsdbLoadBlockDataImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols);
+static int  tsdbEncodeSCompIdx(void **buf, SCompIdx *pIdx);
+static void *tsdbDecodeSCompIdx(void *buf, SCompIdx *pIdx);
+static int   tsdbProcessAppendCommit(SRWHelper *pHelper, SCommitIter *pCommitIter, SDataCols *pDataCols, TSKEY maxKey);
+static void  tsdbDestroyHelperBlock(SRWHelper *pHelper);
+static int   tsdbLoadColData(SRWHelper *pHelper, SFile *pFile, SCompBlock *pCompBlock, SCompCol *pCompCol,
+                             SDataCol *pDataCol);
+static int   tsdbWriteBlockToProperFile(SRWHelper *pHelper, SDataCols *pDataCols, SCompBlock *pCompBlock);
+static int   tsdbProcessMergeCommit(SRWHelper *pHelper, SCommitIter *pCommitIter, SDataCols *pDataCols, TSKEY maxKey,
+                                    int *blkIdx);
+static int   tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIter *pCommitIter, SDataCols *pTarget,
+                                       TSKEY maxKey, int maxRows);
+
+// ---------------------- INTERNAL FUNCTIONS ----------------------
+int tsdbInitReadHelper(SRWHelper *pHelper, STsdbRepo *pRepo) {
+  return tsdbInitHelper(pHelper, pRepo, TSDB_READ_HELPER);
+}
+
+int tsdbInitWriteHelper(SRWHelper *pHelper, STsdbRepo *pRepo) {
+  return tsdbInitHelper(pHelper, pRepo, TSDB_WRITE_HELPER);
+}
+
+void tsdbDestroyHelper(SRWHelper *pHelper) {
+  if (pHelper) {
+    taosTZfree(pHelper->pBuffer);
+    taosTZfree(pHelper->compBuffer);
+    tsdbDestroyHelperFile(pHelper);
+    tsdbDestroyHelperTable(pHelper);
+    tsdbDestroyHelperBlock(pHelper);
+    memset((void *)pHelper, 0, sizeof(*pHelper));
+  }
+}
+
+void tsdbResetHelper(SRWHelper *pHelper) {
+  if (pHelper) {
+    // Reset the block part
+    tsdbResetHelperBlockImpl(pHelper);
+
+    // Reset the table part
+    tsdbResetHelperTableImpl(pHelper);
+
+    // Reset the file part
+    tsdbCloseHelperFile(pHelper, false, NULL);
+    tsdbResetHelperFileImpl(pHelper);
+
+    pHelper->state = TSDB_HELPER_CLEAR_STATE;
+  }
+}
+
+int tsdbSetAndOpenHelperFile(SRWHelper *pHelper, SFileGroup *pGroup) {
+  ASSERT(pHelper != NULL && pGroup != NULL);
+  SFile *    pFile = NULL;
+  STsdbRepo *pRepo = pHelper->pRepo;
+
+  // Clear the helper object
+  tsdbResetHelper(pHelper);
+
+  ASSERT(pHelper->state == TSDB_HELPER_CLEAR_STATE);
+
+  // Set the files
+  pHelper->files.fGroup = *pGroup;
+  if (helperType(pHelper) == TSDB_WRITE_HELPER) {
+    tsdbGetDataFileName(pRepo->rootDir, REPO_ID(pRepo), pGroup->fileId, TSDB_FILE_TYPE_NHEAD,
+                        helperNewHeadF(pHelper)->fname);
+    tsdbGetDataFileName(pRepo->rootDir, REPO_ID(pRepo), pGroup->fileId, TSDB_FILE_TYPE_NLAST,
+                        helperNewLastF(pHelper)->fname);
+  }
+
+  // Open the files
+  if (tsdbOpenFile(helperHeadF(pHelper), O_RDONLY) < 0) return -1;
+  if (helperType(pHelper) == TSDB_WRITE_HELPER) {
+    if (tsdbOpenFile(helperDataF(pHelper), O_RDWR) < 0) return -1;
+    if (tsdbOpenFile(helperLastF(pHelper), O_RDWR) < 0) return -1;
+
+    // Create and open .h
+    pFile = helperNewHeadF(pHelper);
+    if (tsdbOpenFile(pFile, O_WRONLY | O_CREAT) < 0) return -1;
+    pFile->info.size = TSDB_FILE_HEAD_SIZE;
+    pFile->info.magic = TSDB_FILE_INIT_MAGIC;
+    if (tsdbUpdateFileHeader(pFile) < 0) return -1;
+
+    // Create and open .l file if should
+    if (tsdbShouldCreateNewLast(pHelper)) {
+      pFile = helperNewLastF(pHelper);
+      if (tsdbOpenFile(pFile, O_WRONLY | O_CREAT) < 0) return -1;
+      pFile->info.size = TSDB_FILE_HEAD_SIZE;
+      pFile->info.magic = TSDB_FILE_INIT_MAGIC;
+      pFile->info.len = 0;
+      if (tsdbUpdateFileHeader(pFile) < 0) return -1;
+    }
+  } else {
+    if (tsdbOpenFile(helperDataF(pHelper), O_RDONLY) < 0) return -1;
+    if (tsdbOpenFile(helperLastF(pHelper), O_RDONLY) < 0) return -1;
+  }
+
+  helperSetState(pHelper, TSDB_HELPER_FILE_SET_AND_OPEN);
+
+  return 0;
+}
+
+int tsdbCloseHelperFile(SRWHelper *pHelper, bool hasError, SFileGroup *pGroup) {
+  SFile *pFile = NULL;
+
+  pFile = helperHeadF(pHelper);
+  tsdbCloseFile(pFile);
+
+  pFile = helperDataF(pHelper);
+  if (pFile->fd > 0) {
+    if (helperType(pHelper) == TSDB_WRITE_HELPER) {
+      if (!hasError) {
+        tsdbUpdateFileHeader(pFile);
+      } else {
+        ASSERT(pGroup != NULL);
+        taosFtruncate(pFile->fd, pGroup->files[TSDB_FILE_TYPE_DATA].info.size);
+      }
+      fsync(pFile->fd);
+    }
+    tsdbCloseFile(pFile);
+  }
+
+  pFile = helperLastF(pHelper);
+  if (pFile->fd > 0) {
+    if (helperType(pHelper) == TSDB_WRITE_HELPER && !TSDB_NLAST_FILE_OPENED(pHelper)) {
+      if (!hasError) {
+        tsdbUpdateFileHeader(pFile);
+      } else {
+        ASSERT(pGroup != NULL);
+        taosFtruncate(pFile->fd, pGroup->files[TSDB_FILE_TYPE_LAST].info.size);
+      }
+      fsync(pFile->fd);
+    }
+    tsdbCloseFile(pFile);
+  }
+
+  if (helperType(pHelper) == TSDB_WRITE_HELPER) {
+    pFile = helperNewHeadF(pHelper);
+    if (pFile->fd > 0) {
+      if (!hasError) {
+        tsdbUpdateFileHeader(pFile);
+        fsync(pFile->fd);
+      }
+      tsdbCloseFile(pFile);
+      if (hasError) (void)remove(pFile->fname);
+    }
+
+    pFile = helperNewLastF(pHelper);
+    if (pFile->fd > 0) {
+      if (!hasError) {
+        tsdbUpdateFileHeader(pFile);
+        fsync(pFile->fd);
+      }
+      tsdbCloseFile(pFile);
+      if (hasError) (void)remove(pFile->fname);
+    }
+  }
+  return 0;
+}
+
+int tsdbSetHelperTable(SRWHelper *pHelper, STable *pTable, STsdbRepo *pRepo) {
+  ASSERT(helperHasState(pHelper, TSDB_HELPER_FILE_SET_AND_OPEN | TSDB_HELPER_IDX_LOAD));
+
+  // Clear members and state used by previous table
+  tsdbResetHelperTable(pHelper);
+  ASSERT(helperHasState(pHelper, (TSDB_HELPER_FILE_SET_AND_OPEN | TSDB_HELPER_IDX_LOAD)));
+
+  pHelper->tableInfo.tid = pTable->tableId.tid;
+  pHelper->tableInfo.uid = pTable->tableId.uid;
+  STSchema *pSchema = tsdbGetTableSchemaImpl(pTable, false, false, -1);
+
+  if (tdInitDataCols(pHelper->pDataCols[0], pSchema) < 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  if (tdInitDataCols(pHelper->pDataCols[1], pSchema) < 0) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  if (pHelper->idxH.numOfIdx > 0) {
+    while (true) {
+      if (pHelper->idxH.curIdx >= pHelper->idxH.numOfIdx) {
+        memset(&(pHelper->curCompIdx), 0, sizeof(SCompIdx));
+        break;
+      }
+
+      SCompIdx *pIdx = &(pHelper->idxH.pIdxArray[pHelper->idxH.curIdx]);
+      if (pIdx->tid == TABLE_TID(pTable)) {
+        if (pIdx->uid == TABLE_UID(pTable)) {
+          pHelper->curCompIdx = *pIdx;
+        } else {
+          memset(&(pHelper->curCompIdx), 0, sizeof(SCompIdx));
+        }
+        pHelper->idxH.curIdx++;
+        break;
+      } else if (pIdx->tid > TABLE_TID(pTable)) {
+        memset(&(pHelper->curCompIdx), 0, sizeof(SCompIdx));
+        break;
+      } else {
+        pHelper->idxH.curIdx++;
+      }
+    }
+  } else {
+    memset(&(pHelper->curCompIdx), 0, sizeof(SCompIdx));
+  }
+
+  if (helperType(pHelper) == TSDB_WRITE_HELPER && pHelper->curCompIdx.hasLast) {
+    pHelper->hasOldLastBlock = true;
+  }
+
+  helperSetState(pHelper, TSDB_HELPER_TABLE_SET);
+  ASSERT(pHelper->state == ((TSDB_HELPER_TABLE_SET << 1) - 1));
+
+  return 0;
+}
+
+int tsdbCommitTableData(SRWHelper *pHelper, SCommitIter *pCommitIter, SDataCols *pDataCols, TSKEY maxKey) {
+  ASSERT(helperType(pHelper) == TSDB_WRITE_HELPER);
+
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+  int       blkIdx = 0;
+
+  ASSERT(pIdx->offset == 0 || pIdx->uid == TABLE_UID(pCommitIter->pTable));
+  if (tsdbLoadCompInfo(pHelper, NULL) < 0) return -1;
+
+  while (true) {
+    ASSERT(blkIdx <= (int)pIdx->numOfBlocks);
+    TSKEY keyFirst = tsdbNextIterKey(pCommitIter->pIter);
+    if (keyFirst < 0 || keyFirst > maxKey) break;  // iter over
+
+    if (pIdx->len <= 0 || keyFirst > pIdx->maxKey) {
+      if (tsdbProcessAppendCommit(pHelper, pCommitIter, pDataCols, maxKey) < 0) return -1;
+      blkIdx = pIdx->numOfBlocks;
+    } else {
+      if (tsdbProcessMergeCommit(pHelper, pCommitIter, pDataCols, maxKey, &blkIdx) < 0) return -1;
+    }
+  }
+
+  return 0;
+}
+
+int tsdbMoveLastBlockIfNeccessary(SRWHelper *pHelper) {
+  STsdbCfg *pCfg = &pHelper->pRepo->config;
+
+  ASSERT(helperType(pHelper) == TSDB_WRITE_HELPER);
+  SCompIdx * pIdx = &(pHelper->curCompIdx);
+  SCompBlock compBlock = {0};
+  if (TSDB_NLAST_FILE_OPENED(pHelper) && (pHelper->hasOldLastBlock)) {
+    if (tsdbLoadCompInfo(pHelper, NULL) < 0) return -1;
+
+    SCompBlock *pCompBlock = blockAtIdx(pHelper, pIdx->numOfBlocks - 1);
+    ASSERT(pCompBlock->last);
+    if (tsdbLoadBlockData(pHelper, pCompBlock, NULL) < 0) return -1;
+    ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows &&
+           pHelper->pDataCols[0]->numOfRows < pCfg->minRowsPerFileBlock);
+    if (tsdbWriteBlockToFile(pHelper, helperNewLastF(pHelper), pHelper->pDataCols[0], &compBlock, true, true) < 0)
+      return -1;
+
+    if (tsdbUpdateSuperBlock(pHelper, &compBlock, pIdx->numOfBlocks - 1) < 0) return -1;
+
+#if 0
+    if (pCompBlock->numOfSubBlocks > 1) {
+      if (tsdbLoadBlockData(pHelper, pCompBlock, NULL) < 0) return -1;
+      ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows &&
+             pHelper->pDataCols[0]->numOfRows < pCfg->minRowsPerFileBlock);
+      if (tsdbWriteBlockToFile(pHelper, helperNewLastF(pHelper), pHelper->pDataCols[0], &compBlock, true, true) < 0)
+        return -1;
+
+      if (tsdbUpdateSuperBlock(pHelper, &compBlock, pIdx->numOfBlocks - 1) < 0) return -1;
+    } else {
+      if (lseek(helperLastF(pHelper)->fd, pCompBlock->offset, SEEK_SET) < 0) {
+        tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), helperLastF(pHelper)->fname,
+                  strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        return -1;
+      }
+      pCompBlock->offset = lseek(helperNewLastF(pHelper)->fd, 0, SEEK_END);
+      if (pCompBlock->offset < 0) {
+        tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), helperNewLastF(pHelper)->fname,
+                  strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        return -1;
+      }
+
+      if (taosTSendFile(helperNewLastF(pHelper)->fd, helperLastF(pHelper)->fd, NULL, pCompBlock->len) < pCompBlock->len) {
+        tsdbError("vgId:%d failed to sendfile from file %s to file %s since %s", REPO_ID(pHelper->pRepo),
+                  helperLastF(pHelper)->fname, helperNewLastF(pHelper)->fname, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        return -1;
+      }
+    }
+#endif
+
+    pHelper->hasOldLastBlock = false;
+  }
+
+  return 0;
+}
+
+int tsdbWriteCompInfo(SRWHelper *pHelper) {
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+  off_t     offset = 0;
+  SFile *   pFile = helperNewHeadF(pHelper);
+
+  if (pIdx->len > 0) {
+    if (!helperHasState(pHelper, TSDB_HELPER_INFO_LOAD)) {
+      if (tsdbLoadCompInfo(pHelper, NULL) < 0) return -1;
+    } else {
+      pHelper->pCompInfo->delimiter = TSDB_FILE_DELIMITER;
+      pHelper->pCompInfo->uid = pHelper->tableInfo.uid;
+      pHelper->pCompInfo->tid = pHelper->tableInfo.tid;
+      ASSERT(pIdx->len > sizeof(SCompInfo) + sizeof(TSCKSUM) &&
+             (pIdx->len - sizeof(SCompInfo) - sizeof(TSCKSUM)) % sizeof(SCompBlock) == 0);
+      taosCalcChecksumAppend(0, (uint8_t *)pHelper->pCompInfo, pIdx->len);
+    }
+
+    pFile->info.magic = taosCalcChecksum(
+        pFile->info.magic, (uint8_t *)POINTER_SHIFT(pHelper->pCompInfo, pIdx->len - sizeof(TSCKSUM)), sizeof(TSCKSUM));
+    offset = lseek(pFile->fd, 0, SEEK_END);
+    if (offset < 0) {
+      tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      return -1;
+    }
+    pIdx->offset = offset;
+    pIdx->uid = pHelper->tableInfo.uid;
+    pIdx->tid = pHelper->tableInfo.tid;
+    ASSERT(pIdx->offset >= TSDB_FILE_HEAD_SIZE);
+
+    if (taosTWrite(pFile->fd, (void *)(pHelper->pCompInfo), pIdx->len) < (int)pIdx->len) {
+      tsdbError("vgId:%d failed to write %d bytes to file %s since %s", REPO_ID(pHelper->pRepo), pIdx->len,
+                pFile->fname, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      return -1;
+    }
+
+    if (taosTSizeof(pHelper->pWIdx) < pFile->info.len + sizeof(SCompIdx) + 12) {
+      pHelper->pWIdx = taosTRealloc(pHelper->pWIdx, taosTSizeof(pHelper->pWIdx) == 0 ? 1024 : taosTSizeof(pHelper->pWIdx) * 2);
+      if (pHelper->pWIdx == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return -1;
+      }
+    }
+
+    void *pBuf = POINTER_SHIFT(pHelper->pWIdx, pFile->info.len);
+    pFile->info.len += tsdbEncodeSCompIdx(&pBuf, &(pHelper->curCompIdx));
+
+    pFile->info.size += pIdx->len;
+    // ASSERT(pFile->info.size == lseek(pFile->fd, 0, SEEK_CUR));
+  }
+
+  return 0;
+}
+
+int tsdbWriteCompIdx(SRWHelper *pHelper) {
+  ASSERT(helperType(pHelper) == TSDB_WRITE_HELPER);
+  off_t offset = 0;
+
+  SFile *pFile = helperNewHeadF(pHelper);
+
+  pFile->info.len += sizeof(TSCKSUM);
+  if (taosTSizeof(pHelper->pWIdx) < pFile->info.len) {
+    pHelper->pWIdx = taosTRealloc(pHelper->pWIdx, pFile->info.len);
+    if (pHelper->pWIdx == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+  }
+  taosCalcChecksumAppend(0, (uint8_t *)pHelper->pWIdx, pFile->info.len);
+  pFile->info.magic = taosCalcChecksum(
+      pFile->info.magic, (uint8_t *)POINTER_SHIFT(pHelper->pWIdx, pFile->info.len - sizeof(TSCKSUM)), sizeof(TSCKSUM));
+
+  offset = lseek(pFile->fd, 0, SEEK_END);
+  if (offset < 0) {
+    tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  ASSERT(offset == pFile->info.size);
+
+  if (taosTWrite(pFile->fd, (void *)pHelper->pWIdx, pFile->info.len) < (int)pFile->info.len) {
+    tsdbError("vgId:%d failed to write %d bytes to file %s since %s", REPO_ID(pHelper->pRepo), pFile->info.len,
+              pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  pFile->info.offset = offset;
+  pFile->info.size += pFile->info.len;
+  // ASSERT(pFile->info.size == lseek(pFile->fd, 0, SEEK_CUR));
+
+  return 0;
+}
+
+int tsdbLoadCompIdxImpl(SFile *pFile, uint32_t offset, uint32_t len, void *buffer) {
+  const char *prefixMsg = "failed to load SCompIdx part";
+  if (lseek(pFile->fd, offset, SEEK_SET) < 0) {
+    tsdbError("%s: seek to file %s offset %u failed since %s", prefixMsg, pFile->fname, offset, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosTRead(pFile->fd, buffer, len) < len) {
+    tsdbError("%s: read file %s offset %u len %u failed since %s", prefixMsg, pFile->fname, offset, len,
+              strerror(errno));
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)buffer, len)) {
+    tsdbError("%s: file %s corrupted, offset %u len %u", prefixMsg, pFile->fname, offset, len);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  return 0;
+}
+
+int tsdbDecodeSCompIdxImpl(void *buffer, uint32_t len, SCompIdx **ppCompIdx, int *numOfIdx) {
+  int   nIdx = 0;
+  void *pPtr = buffer;
+
+  while (POINTER_DISTANCE(pPtr, buffer) < (int)(len - sizeof(TSCKSUM))) {
+    size_t tlen = taosTSizeof(*ppCompIdx);
+    if (tlen < sizeof(SCompIdx) * (nIdx + 1)) {
+      *ppCompIdx = (SCompIdx *)taosTRealloc(*ppCompIdx, (tlen == 0) ? 1024 : tlen * 2);
+      if (*ppCompIdx == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return -1;
+      }
+    }
+
+    pPtr = tsdbDecodeSCompIdx(pPtr, &((*ppCompIdx)[nIdx]));
+    if (pPtr == NULL) {
+      tsdbError("failed to decode SCompIdx part, idx:%d", nIdx);
+      terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+      return -1;
+    }
+
+    nIdx++;
+
+    ASSERT(nIdx == 1 || (*ppCompIdx)[nIdx - 1].tid > (*ppCompIdx)[nIdx - 2].tid);
+    ASSERT(POINTER_DISTANCE(pPtr, buffer) <= (int)(len - sizeof(TSCKSUM)));
+  }
+
+  *numOfIdx = nIdx;
+  return 0;
+}
+
+int tsdbLoadCompIdx(SRWHelper *pHelper, void *target) {
+  ASSERT(pHelper->state == TSDB_HELPER_FILE_SET_AND_OPEN);
+  SFile *pFile = helperHeadF(pHelper);
+
+  if (!helperHasState(pHelper, TSDB_HELPER_IDX_LOAD)) {
+    // If not load from file, just load it in object
+    if (pFile->info.len > 0) {
+      if ((pHelper->pBuffer = taosTRealloc(pHelper->pBuffer, pFile->info.len)) == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return -1;
+      }
+
+      // Load SCompIdx binary from file
+      if (tsdbLoadCompIdxImpl(pFile, pFile->info.offset, pFile->info.len, (void *)(pHelper->pBuffer)) < 0) {
+        return -1;
+      }
+
+      // Decode the SCompIdx part
+      if (tsdbDecodeSCompIdxImpl(pHelper->pBuffer, pFile->info.len, &(pHelper->idxH.pIdxArray),
+                                 &(pHelper->idxH.numOfIdx)) < 0) {
+        tsdbError("vgId:%d failed to decode SCompIdx part from file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname,
+                  tstrerror(errno));
+        return -1;
+      }
+    }
+  }
+  helperSetState(pHelper, TSDB_HELPER_IDX_LOAD);
+
+  // Copy the memory for outside usage
+  if (target && pHelper->idxH.numOfIdx > 0)
+    memcpy(target, pHelper->idxH.pIdxArray, sizeof(SCompIdx) * pHelper->idxH.numOfIdx);
+
+  return 0;
+}
+
+int tsdbLoadCompInfoImpl(SFile *pFile, SCompIdx *pIdx, SCompInfo **ppCompInfo) {
+  const char *prefixMsg = "failed to load SCompInfo/SCompBlock part";
+
+  if (lseek(pFile->fd, pIdx->offset, SEEK_SET) < 0) {
+    tsdbError("%s: seek to file %s offset %u failed since %s", prefixMsg, pFile->fname, pIdx->offset, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  *ppCompInfo = taosTRealloc((void *)(*ppCompInfo), pIdx->len);
+  if (*ppCompInfo == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  if (taosTRead(pFile->fd, (void *)(*ppCompInfo), pIdx->len) < (int)pIdx->len) {
+    tsdbError("%s: read file %s offset %u len %u failed since %s", prefixMsg, pFile->fname, pIdx->offset, pIdx->len,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)(*ppCompInfo), pIdx->len)) {
+    tsdbError("%s: file %s corrupted, offset %u len %u", prefixMsg, pFile->fname, pIdx->offset, pIdx->len);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  return 0;
+}
+
+int tsdbLoadCompInfo(SRWHelper *pHelper, void *target) {
+  ASSERT(helperHasState(pHelper, TSDB_HELPER_TABLE_SET));
+
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+
+  SFile *pFile = helperHeadF(pHelper);
+
+  if (!helperHasState(pHelper, TSDB_HELPER_INFO_LOAD)) {
+    if (pIdx->offset > 0) {
+      ASSERT(pIdx->uid == pHelper->tableInfo.uid);
+
+      if (tsdbLoadCompInfoImpl(pFile, pIdx, &(pHelper->pCompInfo)) < 0) return -1;
+
+      ASSERT(pIdx->uid == pHelper->pCompInfo->uid && pIdx->tid == pHelper->pCompInfo->tid);
+    }
+
+    helperSetState(pHelper, TSDB_HELPER_INFO_LOAD);
+  }
+
+  if (target) memcpy(target, (void *)(pHelper->pCompInfo), pIdx->len);
+
+  return 0;
+}
+
+int tsdbLoadCompData(SRWHelper *pHelper, SCompBlock *pCompBlock, void *target) {
+  ASSERT(pCompBlock->numOfSubBlocks <= 1);
+  SFile *pFile = (pCompBlock->last) ? helperLastF(pHelper) : helperDataF(pHelper);
+
+  if (lseek(pFile->fd, (off_t)pCompBlock->offset, SEEK_SET) < 0) {
+    tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  size_t tsize = TSDB_GET_COMPCOL_LEN(pCompBlock->numOfCols);
+  pHelper->pCompData = taosTRealloc((void *)pHelper->pCompData, tsize);
+  if (pHelper->pCompData == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  if (taosTRead(pFile->fd, (void *)pHelper->pCompData, tsize) < tsize) {
+    tsdbError("vgId:%d failed to read %" PRIzu " bytes from file %s since %s", REPO_ID(pHelper->pRepo), tsize, pFile->fname,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)pHelper->pCompData, (uint32_t)tsize)) {
+    tsdbError("vgId:%d file %s is broken, offset %" PRId64 " size %" PRIzu "", REPO_ID(pHelper->pRepo), pFile->fname,
+              (int64_t)pCompBlock->offset, tsize);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  ASSERT(pCompBlock->numOfCols == pHelper->pCompData->numOfCols);
+
+  if (target) memcpy(target, pHelper->pCompData, tsize);
+
+  return 0;
+}
+
+void tsdbGetDataStatis(SRWHelper *pHelper, SDataStatis *pStatis, int numOfCols) {
+  SCompData *pCompData = pHelper->pCompData;
+
+  for (int i = 0, j = 0; i < numOfCols;) {
+    if (j >= pCompData->numOfCols) {
+      pStatis[i].numOfNull = -1;
+      i++;
+      continue;
+    }
+
+    if (pStatis[i].colId == pCompData->cols[j].colId) {
+      pStatis[i].sum = pCompData->cols[j].sum;
+      pStatis[i].max = pCompData->cols[j].max;
+      pStatis[i].min = pCompData->cols[j].min;
+      pStatis[i].maxIndex = pCompData->cols[j].maxIndex;
+      pStatis[i].minIndex = pCompData->cols[j].minIndex;
+      pStatis[i].numOfNull = pCompData->cols[j].numOfNull;
+      i++;
+      j++;
+    } else if (pStatis[i].colId < pCompData->cols[j].colId) {
+      pStatis[i].numOfNull = -1;
+      i++;
+    } else {
+      j++;
+    }
+  }
+}
+
+int tsdbLoadBlockDataCols(SRWHelper *pHelper, SCompBlock *pCompBlock, SCompInfo *pCompInfo, int16_t *colIds, int numOfColIds) {
+  ASSERT(pCompBlock->numOfSubBlocks >= 1);  // Must be super block
+  SCompBlock *pTCompBlock = pCompBlock;
+
+  int numOfSubBlocks = pCompBlock->numOfSubBlocks;
+  if (numOfSubBlocks > 1)
+    pTCompBlock = (SCompBlock *)POINTER_SHIFT((pCompInfo == NULL) ? pHelper->pCompInfo : pCompInfo, pCompBlock->offset);
+
+  tdResetDataCols(pHelper->pDataCols[0]);
+  if (tsdbLoadBlockDataColsImpl(pHelper, pTCompBlock, pHelper->pDataCols[0], colIds, numOfColIds) < 0) goto _err;
+  for (int i = 1; i < numOfSubBlocks; i++) {
+    tdResetDataCols(pHelper->pDataCols[1]);
+    pTCompBlock++;
+    if (tsdbLoadBlockDataColsImpl(pHelper, pTCompBlock, pHelper->pDataCols[1], colIds, numOfColIds) < 0) goto _err;
+    if (tdMergeDataCols(pHelper->pDataCols[0], pHelper->pDataCols[1], pHelper->pDataCols[1]->numOfRows) < 0) goto _err;
+  }
+
+  ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows &&
+         dataColsKeyFirst(pHelper->pDataCols[0]) == pCompBlock->keyFirst &&
+         dataColsKeyLast(pHelper->pDataCols[0]) == pCompBlock->keyLast);
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+int tsdbLoadBlockData(SRWHelper *pHelper, SCompBlock *pCompBlock, SCompInfo *pCompInfo) {
+  SCompBlock *pTCompBlock = pCompBlock;
+
+  int numOfSubBlock = pCompBlock->numOfSubBlocks;
+  if (numOfSubBlock > 1)
+    pTCompBlock = (SCompBlock *)POINTER_SHIFT((pCompInfo == NULL) ? pHelper->pCompInfo : pCompInfo, pCompBlock->offset);
+
+  tdResetDataCols(pHelper->pDataCols[0]);
+  if (tsdbLoadBlockDataImpl(pHelper, pTCompBlock, pHelper->pDataCols[0]) < 0) goto _err;
+  for (int i = 1; i < numOfSubBlock; i++) {
+    tdResetDataCols(pHelper->pDataCols[1]);
+    pTCompBlock++;
+    if (tsdbLoadBlockDataImpl(pHelper, pTCompBlock, pHelper->pDataCols[1]) < 0) goto _err;
+    if (tdMergeDataCols(pHelper->pDataCols[0], pHelper->pDataCols[1], pHelper->pDataCols[1]->numOfRows) < 0) goto _err;
+  }
+
+  ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows &&
+         dataColsKeyFirst(pHelper->pDataCols[0]) == pCompBlock->keyFirst &&
+         dataColsKeyLast(pHelper->pDataCols[0]) == pCompBlock->keyLast);
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+// ---------------------- INTERNAL FUNCTIONS ----------------------
+static bool tsdbShouldCreateNewLast(SRWHelper *pHelper) {
+  ASSERT(helperLastF(pHelper)->fd > 0);
+  struct stat st;
+  if (fstat(helperLastF(pHelper)->fd, &st) < 0) return true;
+  if (st.st_size > 32 * 1024 + TSDB_FILE_HEAD_SIZE) return true;
+  return false;
+}
+
+static int tsdbWriteBlockToFile(SRWHelper *pHelper, SFile *pFile, SDataCols *pDataCols, SCompBlock *pCompBlock,
+                                bool isLast, bool isSuperBlock) {
+  STsdbCfg * pCfg = &(pHelper->pRepo->config);
+  SCompData *pCompData = (SCompData *)(pHelper->pBuffer);
+  int64_t    offset = 0;
+  int        rowsToWrite = pDataCols->numOfRows;
+
+  ASSERT(rowsToWrite > 0 && rowsToWrite <= pCfg->maxRowsPerFileBlock);
+  ASSERT(isLast ? rowsToWrite < pCfg->minRowsPerFileBlock : true);
+
+  offset = lseek(pFile->fd, 0, SEEK_END);
+  if (offset < 0) {
+    tsdbError("vgId:%d failed to write block to file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  int nColsNotAllNull = 0;
+  for (int ncol = 1; ncol < pDataCols->numOfCols; ncol++) {  // ncol from 1, we skip the timestamp column
+    SDataCol *pDataCol = pDataCols->cols + ncol;
+    SCompCol *pCompCol = pCompData->cols + nColsNotAllNull;
+
+    if (isNEleNull(pDataCol, rowsToWrite)) {  // all data to commit are NULL, just ignore it
+      continue;
+    }
+
+    memset(pCompCol, 0, sizeof(*pCompCol));
+
+    pCompCol->colId = pDataCol->colId;
+    pCompCol->type = pDataCol->type;
+    if (tDataTypeDesc[pDataCol->type].getStatisFunc) {
+      (*tDataTypeDesc[pDataCol->type].getStatisFunc)(
+          (TSKEY *)(pDataCols->cols[0].pData), pDataCol->pData, rowsToWrite, &(pCompCol->min), &(pCompCol->max),
+          &(pCompCol->sum), &(pCompCol->minIndex), &(pCompCol->maxIndex), &(pCompCol->numOfNull));
+    }
+    nColsNotAllNull++;
+  }
+
+  ASSERT(nColsNotAllNull >= 0 && nColsNotAllNull <= pDataCols->numOfCols);
+
+  // Compress the data if neccessary
+  int     tcol = 0;
+  int32_t toffset = 0;
+  int32_t tsize = TSDB_GET_COMPCOL_LEN(nColsNotAllNull);
+  int32_t lsize = tsize;
+  int32_t keyLen = 0;
+  for (int ncol = 0; ncol < pDataCols->numOfCols; ncol++) {
+    if (ncol != 0 && tcol >= nColsNotAllNull) break;
+
+    SDataCol *pDataCol = pDataCols->cols + ncol;
+    SCompCol *pCompCol = pCompData->cols + tcol;
+
+    if (ncol != 0 && (pDataCol->colId != pCompCol->colId)) continue;
+    void *tptr = POINTER_SHIFT(pCompData, lsize);
+
+    int32_t flen = 0;  // final length
+    int32_t tlen = dataColGetNEleLen(pDataCol, rowsToWrite);
+
+    if (pCfg->compression) {
+      if (pCfg->compression == TWO_STAGE_COMP) {
+        pHelper->compBuffer = taosTRealloc(pHelper->compBuffer, tlen + COMP_OVERFLOW_BYTES);
+        if (pHelper->compBuffer == NULL) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          goto _err;
+        }
+      }
+
+      flen = (*(tDataTypeDesc[pDataCol->type].compFunc))((char *)pDataCol->pData, tlen, rowsToWrite, tptr,
+                                                         (int32_t)taosTSizeof(pHelper->pBuffer) - lsize, pCfg->compression,
+                                                         pHelper->compBuffer, (int32_t)taosTSizeof(pHelper->compBuffer));
+    } else {
+      flen = tlen;
+      memcpy(tptr, pDataCol->pData, flen);
+    }
+
+    // Add checksum
+    ASSERT(flen > 0);
+    flen += sizeof(TSCKSUM);
+    taosCalcChecksumAppend(0, (uint8_t *)tptr, flen);
+    pFile->info.magic =
+        taosCalcChecksum(pFile->info.magic, (uint8_t *)POINTER_SHIFT(tptr, flen - sizeof(TSCKSUM)), sizeof(TSCKSUM));
+
+    if (ncol != 0) {
+      pCompCol->offset = toffset;
+      pCompCol->len = flen;
+      tcol++;
+    } else {
+      keyLen = flen;
+    }
+
+    toffset += flen;
+    lsize += flen;
+  }
+
+  pCompData->delimiter = TSDB_FILE_DELIMITER;
+  pCompData->uid = pHelper->tableInfo.uid;
+  pCompData->numOfCols = nColsNotAllNull;
+
+  taosCalcChecksumAppend(0, (uint8_t *)pCompData, tsize);
+  pFile->info.magic = taosCalcChecksum(pFile->info.magic, (uint8_t *)POINTER_SHIFT(pCompData, tsize - sizeof(TSCKSUM)),
+                                       sizeof(TSCKSUM));
+
+  // Write the whole block to file
+  if (taosTWrite(pFile->fd, (void *)pCompData, lsize) < lsize) {
+    tsdbError("vgId:%d failed to write %d bytes to file %s since %s", REPO_ID(helperRepo(pHelper)), lsize, pFile->fname,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  // Update pCompBlock membership vairables
+  pCompBlock->last = isLast;
+  pCompBlock->offset = offset;
+  pCompBlock->algorithm = pCfg->compression;
+  pCompBlock->numOfRows = rowsToWrite;
+  pCompBlock->len = lsize;
+  pCompBlock->keyLen = keyLen;
+  pCompBlock->numOfSubBlocks = isSuperBlock ? 1 : 0;
+  pCompBlock->numOfCols = nColsNotAllNull;
+  pCompBlock->keyFirst = dataColsKeyFirst(pDataCols);
+  pCompBlock->keyLast = dataColsKeyAt(pDataCols, rowsToWrite - 1);
+
+  tsdbDebug("vgId:%d tid:%d a block of data is written to file %s, offset %" PRId64
+            " numOfRows %d len %d numOfCols %" PRId16 " keyFirst %" PRId64 " keyLast %" PRId64,
+            REPO_ID(helperRepo(pHelper)), pHelper->tableInfo.tid, pFile->fname, (int64_t)(pCompBlock->offset),
+            (int)(pCompBlock->numOfRows), pCompBlock->len, pCompBlock->numOfCols, pCompBlock->keyFirst,
+            pCompBlock->keyLast);
+
+  pFile->info.size += pCompBlock->len;
+  // ASSERT(pFile->info.size == lseek(pFile->fd, 0, SEEK_CUR));
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static int compareKeyBlock(const void *arg1, const void *arg2) {
+  TSKEY       key = *(TSKEY *)arg1;
+  SCompBlock *pBlock = (SCompBlock *)arg2;
+
+  if (key < pBlock->keyFirst) {
+    return -1;
+  } else if (key > pBlock->keyLast) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static int tsdbAdjustInfoSizeIfNeeded(SRWHelper *pHelper, size_t esize) {
+  if (taosTSizeof((void *)pHelper->pCompInfo) <= esize) {
+    size_t tsize = esize + sizeof(SCompBlock) * 16;
+    pHelper->pCompInfo = (SCompInfo *)taosTRealloc(pHelper->pCompInfo, tsize);
+    if (pHelper->pCompInfo == NULL) return -1;
+  }
+
+  return 0;
+}
+
+static int tsdbInsertSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx) {
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+
+  ASSERT(blkIdx >= 0 && blkIdx <= (int)pIdx->numOfBlocks);
+  ASSERT(pCompBlock->numOfSubBlocks == 1);
+
+  // Adjust memory if no more room
+  if (pIdx->len == 0) pIdx->len = sizeof(SCompInfo) + sizeof(TSCKSUM);
+  if (tsdbAdjustInfoSizeIfNeeded(pHelper, pIdx->len + sizeof(SCompInfo)) < 0) goto _err;
+
+  // Change the offset
+  for (uint32_t i = 0; i < pIdx->numOfBlocks; i++) {
+    SCompBlock *pTCompBlock = &pHelper->pCompInfo->blocks[i];
+    if (pTCompBlock->numOfSubBlocks > 1) pTCompBlock->offset += sizeof(SCompBlock);
+  }
+
+  // Memmove if needed
+  int tsize = pIdx->len - (sizeof(SCompInfo) + sizeof(SCompBlock) * blkIdx);
+  if (tsize > 0) {
+    ASSERT(sizeof(SCompInfo) + sizeof(SCompBlock) * (blkIdx + 1) < taosTSizeof(pHelper->pCompInfo));
+    ASSERT(sizeof(SCompInfo) + sizeof(SCompBlock) * (blkIdx + 1) + tsize <= taosTSizeof(pHelper->pCompInfo));
+    memmove(POINTER_SHIFT(pHelper->pCompInfo, sizeof(SCompInfo) + sizeof(SCompBlock) * (blkIdx + 1)),
+            POINTER_SHIFT(pHelper->pCompInfo, sizeof(SCompInfo) + sizeof(SCompBlock) * blkIdx), tsize);
+  }
+  pHelper->pCompInfo->blocks[blkIdx] = *pCompBlock;
+
+  pIdx->numOfBlocks++;
+  pIdx->len += sizeof(SCompBlock);
+  ASSERT(pIdx->len <= taosTSizeof(pHelper->pCompInfo));
+  pIdx->maxKey = blockAtIdx(pHelper, pIdx->numOfBlocks - 1)->keyLast;
+  pIdx->hasLast = (uint32_t)blockAtIdx(pHelper, pIdx->numOfBlocks - 1)->last;
+
+  if (pIdx->numOfBlocks > 1) {
+    ASSERT(pHelper->pCompInfo->blocks[0].keyLast < pHelper->pCompInfo->blocks[1].keyFirst);
+  }
+
+  tsdbDebug("vgId:%d tid:%d a super block is inserted at index %d", REPO_ID(pHelper->pRepo), pHelper->tableInfo.tid,
+            blkIdx);
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static int tsdbAddSubBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx, int rowsAdded) {
+  ASSERT(pCompBlock->numOfSubBlocks == 0);
+
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+  ASSERT(blkIdx >= 0 && blkIdx < (int)pIdx->numOfBlocks);
+
+  SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx;
+  ASSERT(pSCompBlock->numOfSubBlocks >= 1 && pSCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS);
+
+  size_t spaceNeeded =
+      (pSCompBlock->numOfSubBlocks == 1) ? pIdx->len + sizeof(SCompBlock) * 2 : pIdx->len + sizeof(SCompBlock);
+  if (tsdbAdjustInfoSizeIfNeeded(pHelper, spaceNeeded) < 0) goto _err;
+
+  pSCompBlock = pHelper->pCompInfo->blocks + blkIdx;
+
+  // Add the sub-block
+  if (pSCompBlock->numOfSubBlocks > 1) {
+    size_t tsize = (size_t)(pIdx->len - (pSCompBlock->offset + pSCompBlock->len));
+    if (tsize > 0) {
+      memmove((void *)((char *)(pHelper->pCompInfo) + pSCompBlock->offset + pSCompBlock->len + sizeof(SCompBlock)),
+              (void *)((char *)(pHelper->pCompInfo) + pSCompBlock->offset + pSCompBlock->len), tsize);
+
+      for (uint32_t i = blkIdx + 1; i < pIdx->numOfBlocks; i++) {
+        SCompBlock *pTCompBlock = &pHelper->pCompInfo->blocks[i];
+        if (pTCompBlock->numOfSubBlocks > 1) pTCompBlock->offset += sizeof(SCompBlock);
+      }
+    }
+
+    *(SCompBlock *)((char *)(pHelper->pCompInfo) + pSCompBlock->offset + pSCompBlock->len) = *pCompBlock;
+
+    pSCompBlock->numOfSubBlocks++;
+    ASSERT(pSCompBlock->numOfSubBlocks <= TSDB_MAX_SUBBLOCKS);
+    pSCompBlock->len += sizeof(SCompBlock);
+    pSCompBlock->numOfRows += rowsAdded;
+    pSCompBlock->keyFirst = MIN(pSCompBlock->keyFirst, pCompBlock->keyFirst);
+    pSCompBlock->keyLast = MAX(pSCompBlock->keyLast, pCompBlock->keyLast);
+    pIdx->len += sizeof(SCompBlock);
+  } else {  // Need to create two sub-blocks
+    void *ptr = NULL;
+    for (uint32_t i = blkIdx + 1; i < pIdx->numOfBlocks; i++) {
+      SCompBlock *pTCompBlock = pHelper->pCompInfo->blocks + i;
+      if (pTCompBlock->numOfSubBlocks > 1) {
+        ptr = POINTER_SHIFT(pHelper->pCompInfo, pTCompBlock->offset);
+        break;
+      }
+    }
+
+    if (ptr == NULL) ptr = POINTER_SHIFT(pHelper->pCompInfo, pIdx->len - sizeof(TSCKSUM));
+
+    size_t tsize = pIdx->len - ((char *)ptr - (char *)(pHelper->pCompInfo));
+    if (tsize > 0) {
+      memmove(POINTER_SHIFT(ptr, sizeof(SCompBlock) * 2), ptr, tsize);
+      for (uint32_t i = blkIdx + 1; i < pIdx->numOfBlocks; i++) {
+        SCompBlock *pTCompBlock = pHelper->pCompInfo->blocks + i;
+        if (pTCompBlock->numOfSubBlocks > 1) pTCompBlock->offset += (sizeof(SCompBlock) * 2);
+      }
+    }
+
+    ((SCompBlock *)ptr)[0] = *pSCompBlock;
+    ((SCompBlock *)ptr)[0].numOfSubBlocks = 0;
+
+    ((SCompBlock *)ptr)[1] = *pCompBlock;
+
+    pSCompBlock->numOfSubBlocks = 2;
+    pSCompBlock->numOfRows += rowsAdded;
+    pSCompBlock->offset = ((char *)ptr) - ((char *)pHelper->pCompInfo);
+    pSCompBlock->len = sizeof(SCompBlock) * 2;
+    pSCompBlock->keyFirst = MIN(((SCompBlock *)ptr)[0].keyFirst, ((SCompBlock *)ptr)[1].keyFirst);
+    pSCompBlock->keyLast = MAX(((SCompBlock *)ptr)[0].keyLast, ((SCompBlock *)ptr)[1].keyLast);
+
+    pIdx->len += (sizeof(SCompBlock) * 2);
+  }
+
+  pIdx->maxKey = pHelper->pCompInfo->blocks[pIdx->numOfBlocks - 1].keyLast;
+  pIdx->hasLast = (uint32_t)pHelper->pCompInfo->blocks[pIdx->numOfBlocks - 1].last;
+
+  tsdbDebug("vgId:%d tid:%d a subblock is added at index %d", REPO_ID(pHelper->pRepo), pHelper->tableInfo.tid, blkIdx);
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static int tsdbUpdateSuperBlock(SRWHelper *pHelper, SCompBlock *pCompBlock, int blkIdx) {
+  ASSERT(pCompBlock->numOfSubBlocks == 1);
+
+  SCompIdx *pIdx = &(pHelper->curCompIdx);
+
+  ASSERT(blkIdx >= 0 && blkIdx < (int)pIdx->numOfBlocks);
+
+  SCompBlock *pSCompBlock = pHelper->pCompInfo->blocks + blkIdx;
+
+  ASSERT(pSCompBlock->numOfSubBlocks >= 1);
+
+  // Delete the sub blocks it has
+  if (pSCompBlock->numOfSubBlocks > 1) {
+    size_t tsize = (size_t)(pIdx->len - (pSCompBlock->offset + pSCompBlock->len));
+    if (tsize > 0) {
+      memmove(POINTER_SHIFT(pHelper->pCompInfo, pSCompBlock->offset),
+              POINTER_SHIFT(pHelper->pCompInfo, pSCompBlock->offset + pSCompBlock->len), tsize);
+    }
+
+    for (uint32_t i = blkIdx + 1; i < pIdx->numOfBlocks; i++) {
+      SCompBlock *pTCompBlock = &pHelper->pCompInfo->blocks[i];
+      if (pTCompBlock->numOfSubBlocks > 1) pTCompBlock->offset -= (sizeof(SCompBlock) * pSCompBlock->numOfSubBlocks);
+    }
+
+    pIdx->len -= (sizeof(SCompBlock) * pSCompBlock->numOfSubBlocks);
+  }
+
+  *pSCompBlock = *pCompBlock;
+
+  pIdx->maxKey = blockAtIdx(pHelper, pIdx->numOfBlocks - 1)->keyLast;
+  pIdx->hasLast = (uint32_t)blockAtIdx(pHelper, pIdx->numOfBlocks - 1)->last;
+
+  tsdbDebug("vgId:%d tid:%d a super block is updated at index %d", REPO_ID(pHelper->pRepo), pHelper->tableInfo.tid,
+            blkIdx);
+
+  return 0;
+}
+
+static void tsdbResetHelperFileImpl(SRWHelper *pHelper) {
+  pHelper->idxH.numOfIdx = 0;
+  pHelper->idxH.curIdx = 0;
+  memset((void *)&pHelper->files, 0, sizeof(pHelper->files));
+  helperHeadF(pHelper)->fd = -1;
+  helperDataF(pHelper)->fd = -1;
+  helperLastF(pHelper)->fd = -1;
+  helperNewHeadF(pHelper)->fd = -1;
+  helperNewLastF(pHelper)->fd = -1;
+}
+
+static int tsdbInitHelperFile(SRWHelper *pHelper) {
+  tsdbResetHelperFileImpl(pHelper);
+  return 0;
+}
+
+static void tsdbDestroyHelperFile(SRWHelper *pHelper) {
+  tsdbCloseHelperFile(pHelper, false, NULL);
+  tsdbResetHelperFileImpl(pHelper);
+  taosTZfree(pHelper->idxH.pIdxArray);
+  taosTZfree(pHelper->pWIdx);
+}
+
+// ---------- Operations on Helper Table part
+static void tsdbResetHelperTableImpl(SRWHelper *pHelper) {
+  memset((void *)&pHelper->tableInfo, 0, sizeof(SHelperTable));
+  pHelper->hasOldLastBlock = false;
+}
+
+static void tsdbResetHelperTable(SRWHelper *pHelper) {
+  tsdbResetHelperBlock(pHelper);
+  tsdbResetHelperTableImpl(pHelper);
+  helperClearState(pHelper, (TSDB_HELPER_TABLE_SET | TSDB_HELPER_INFO_LOAD));
+}
+
+static void tsdbInitHelperTable(SRWHelper *pHelper) { tsdbResetHelperTableImpl(pHelper); }
+
+static void tsdbDestroyHelperTable(SRWHelper *pHelper) { taosTZfree((void *)pHelper->pCompInfo); }
+
+// ---------- Operations on Helper Block part
+static void tsdbResetHelperBlockImpl(SRWHelper *pHelper) {
+  tdResetDataCols(pHelper->pDataCols[0]);
+  tdResetDataCols(pHelper->pDataCols[1]);
+}
+
+static void tsdbResetHelperBlock(SRWHelper *pHelper) {
+  tsdbResetHelperBlockImpl(pHelper);
+  // helperClearState(pHelper, TSDB_HELPER_)
+}
+
+static int tsdbInitHelperBlock(SRWHelper *pHelper) {
+  STsdbRepo *pRepo = helperRepo(pHelper);
+  STsdbMeta *pMeta = pHelper->pRepo->tsdbMeta;
+
+  pHelper->pDataCols[0] = tdNewDataCols(pMeta->maxRowBytes, pMeta->maxCols, pRepo->config.maxRowsPerFileBlock);
+  pHelper->pDataCols[1] = tdNewDataCols(pMeta->maxRowBytes, pMeta->maxCols, pRepo->config.maxRowsPerFileBlock);
+  if (pHelper->pDataCols[0] == NULL || pHelper->pDataCols[1] == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  tsdbResetHelperBlockImpl(pHelper);
+
+  return 0;
+}
+
+static void tsdbDestroyHelperBlock(SRWHelper *pHelper) {
+  taosTZfree(pHelper->pCompData);
+  tdFreeDataCols(pHelper->pDataCols[0]);
+  tdFreeDataCols(pHelper->pDataCols[1]);
+}
+
+static int tsdbInitHelper(SRWHelper *pHelper, STsdbRepo *pRepo, tsdb_rw_helper_t type) {
+  STsdbCfg *pCfg = &pRepo->config;
+  memset((void *)pHelper, 0, sizeof(*pHelper));
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+
+  helperType(pHelper) = type;
+  helperRepo(pHelper) = pRepo;
+  helperState(pHelper) = TSDB_HELPER_CLEAR_STATE;
+
+  // Init file part
+  if (tsdbInitHelperFile(pHelper) < 0) goto _err;
+
+  // Init table part
+  tsdbInitHelperTable(pHelper);
+
+  // Init block part
+  if (tsdbInitHelperBlock(pHelper) < 0) goto _err;
+
+  // TODO: pMeta->maxRowBytes and pMeta->maxCols may change here causing invalid write
+  pHelper->pBuffer =
+      taosTMalloc(sizeof(SCompData) + (sizeof(SCompCol) + sizeof(TSCKSUM) + COMP_OVERFLOW_BYTES) * pMeta->maxCols +
+              pMeta->maxRowBytes * pCfg->maxRowsPerFileBlock + sizeof(TSCKSUM));
+  if (pHelper->pBuffer == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return 0;
+
+_err:
+  tsdbDestroyHelper(pHelper);
+  return -1;
+}
+
+static int tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32_t len, int8_t comp, int numOfRows,
+                                        int maxPoints, char *buffer, int bufferSize) {
+  // Verify by checksum
+  if (!taosCheckChecksumWhole((uint8_t *)content, len)) {
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    return -1;
+  }
+
+  // Decode the data
+  if (comp) {
+    // // Need to decompress
+    int tlen = (*(tDataTypeDesc[pDataCol->type].decompFunc))(content, len - sizeof(TSCKSUM), numOfRows, pDataCol->pData,
+                                                             pDataCol->spaceSize, comp, buffer, bufferSize);
+    if (tlen <= 0) {
+      tsdbError("Failed to decompress column, file corrupted, len:%d comp:%d numOfRows:%d maxPoints:%d bufferSize:%d",
+                len, comp, numOfRows, maxPoints, bufferSize);
+      terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+      return -1;
+    }
+    pDataCol->len = tlen;
+    if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+      dataColSetOffset(pDataCol, numOfRows);
+    }
+  } else {
+    // No need to decompress, just memcpy it
+    pDataCol->len = len - sizeof(TSCKSUM);
+    memcpy(pDataCol->pData, content, pDataCol->len);
+    if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+      dataColSetOffset(pDataCol, numOfRows);
+    }
+  }
+  return 0;
+}
+
+static int tsdbLoadColData(SRWHelper *pHelper, SFile *pFile, SCompBlock *pCompBlock, SCompCol *pCompCol,
+                           SDataCol *pDataCol) {
+  ASSERT(pDataCol->colId == pCompCol->colId);
+  int tsize = pDataCol->bytes * pCompBlock->numOfRows + COMP_OVERFLOW_BYTES;
+  pHelper->pBuffer = taosTRealloc(pHelper->pBuffer, pCompCol->len);
+  if (pHelper->pBuffer == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  pHelper->compBuffer = taosTRealloc(pHelper->compBuffer, tsize);
+  if (pHelper->compBuffer == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  int64_t offset = pCompBlock->offset + TSDB_GET_COMPCOL_LEN(pCompBlock->numOfCols) + pCompCol->offset;
+  if (lseek(pFile->fd, (off_t)offset, SEEK_SET) < 0) {
+    tsdbError("vgId:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosTRead(pFile->fd, pHelper->pBuffer, pCompCol->len) < pCompCol->len) {
+    tsdbError("vgId:%d failed to read %d bytes from file %s since %s", REPO_ID(pHelper->pRepo), pCompCol->len, pFile->fname,
+              strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (tsdbCheckAndDecodeColumnData(pDataCol, pHelper->pBuffer, pCompCol->len, pCompBlock->algorithm,
+                                   pCompBlock->numOfRows, pHelper->pRepo->config.maxRowsPerFileBlock,
+                                   pHelper->compBuffer, (int32_t)taosTSizeof(pHelper->compBuffer)) < 0) {
+    tsdbError("vgId:%d file %s is broken at column %d offset %" PRId64, REPO_ID(pHelper->pRepo), pFile->fname,
+              pCompCol->colId, offset);
+    return -1;
+  }
+
+  return 0;
+}
+
+static int tsdbLoadBlockDataColsImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols, int16_t *colIds, int numOfColIds) {
+  ASSERT(pCompBlock->numOfSubBlocks <= 1);
+  ASSERT(colIds[0] == 0);
+
+  SFile *  pFile = (pCompBlock->last) ? helperLastF(pHelper) : helperDataF(pHelper);
+  SCompCol compCol = {0};
+
+  // If only load timestamp column, no need to load SCompData part
+  if (numOfColIds > 1 && tsdbLoadCompData(pHelper, pCompBlock, NULL) < 0) goto _err;
+
+  pDataCols->numOfRows = pCompBlock->numOfRows;
+
+  int dcol = 0;
+  int ccol = 0;
+  for (int i = 0; i < numOfColIds; i++) {
+    int16_t   colId = colIds[i];
+    SDataCol *pDataCol = NULL;
+    SCompCol *pCompCol = NULL;
+
+    while (true) {
+      if (dcol >= pDataCols->numOfCols) {
+        pDataCol = NULL;
+        break;
+      }
+      pDataCol = &pDataCols->cols[dcol];
+      if (pDataCol->colId > colId) {
+        pDataCol = NULL;
+        break;
+      } else {
+        dcol++;
+        if (pDataCol->colId == colId) break;
+      }
+    }
+
+    if (pDataCol == NULL) continue;
+    ASSERT(pDataCol->colId == colId);
+
+    if (colId == 0) {  // load the key row
+      compCol.colId = colId;
+      compCol.len = pCompBlock->keyLen;
+      compCol.type = pDataCol->type;
+      compCol.offset = TSDB_KEY_COL_OFFSET;
+      pCompCol = &compCol;
+    } else {  // load non-key rows
+      while (true) {
+        if (ccol >= pCompBlock->numOfCols) {
+          pCompCol = NULL;
+          break;
+        }
+
+        pCompCol = &(pHelper->pCompData->cols[ccol]);
+        if (pCompCol->colId > colId) {
+          pCompCol = NULL;
+          break;
+        } else {
+          ccol++;
+          if (pCompCol->colId == colId) break;
+        }
+      }
+
+      if (pCompCol == NULL) {
+        dataColSetNEleNull(pDataCol, pCompBlock->numOfRows, pDataCols->maxPoints);
+        continue;
+      }
+
+      ASSERT(pCompCol->colId == pDataCol->colId);
+    }
+
+    if (tsdbLoadColData(pHelper, pFile, pCompBlock, pCompCol, pDataCol) < 0) goto _err;
+  }
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static int tsdbLoadBlockDataImpl(SRWHelper *pHelper, SCompBlock *pCompBlock, SDataCols *pDataCols) {
+  ASSERT(pCompBlock->numOfSubBlocks <= 1);
+
+  SFile *pFile = (pCompBlock->last) ? helperLastF(pHelper) : helperDataF(pHelper);
+
+  pHelper->pBuffer = taosTRealloc(pHelper->pBuffer, pCompBlock->len);
+  if (pHelper->pBuffer == NULL) {
+    terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  SCompData *pCompData = (SCompData *)pHelper->pBuffer;
+
+  int fd = pFile->fd;
+  if (lseek(fd, (off_t)pCompBlock->offset, SEEK_SET) < 0) {
+    tsdbError("vgId:%d tid:%d failed to lseek file %s since %s", REPO_ID(pHelper->pRepo), pHelper->tableInfo.tid,
+              pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+  if (taosTRead(fd, (void *)pCompData, pCompBlock->len) < pCompBlock->len) {
+    tsdbError("vgId:%d failed to read %d bytes from file %s since %s", REPO_ID(pHelper->pRepo), pCompBlock->len,
+              pFile->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  int32_t tsize = TSDB_GET_COMPCOL_LEN(pCompBlock->numOfCols);
+  if (!taosCheckChecksumWhole((uint8_t *)pCompData, tsize)) {
+    tsdbError("vgId:%d file %s block data is corrupted offset %" PRId64 " len %d", REPO_ID(pHelper->pRepo),
+              pFile->fname, (int64_t)(pCompBlock->offset), pCompBlock->len);
+    terrno = TSDB_CODE_TDB_FILE_CORRUPTED;
+    goto _err;
+  }
+  ASSERT(pCompData->numOfCols == pCompBlock->numOfCols);
+
+  pDataCols->numOfRows = pCompBlock->numOfRows;
+
+  // Recover the data
+  int ccol = 0;  // loop iter for SCompCol object
+  int dcol = 0;  // loop iter for SDataCols object
+  while (dcol < pDataCols->numOfCols) {
+    SDataCol *pDataCol = &(pDataCols->cols[dcol]);
+    if (dcol != 0 && ccol >= pCompData->numOfCols) {
+      // Set current column as NULL and forward
+      dataColSetNEleNull(pDataCol, pCompBlock->numOfRows, pDataCols->maxPoints);
+      dcol++;
+      continue;
+    }
+
+    int16_t tcolId = 0;
+    int32_t toffset = TSDB_KEY_COL_OFFSET;
+    int32_t tlen = pCompBlock->keyLen;
+
+    if (dcol != 0) {
+      SCompCol *pCompCol = &(pCompData->cols[ccol]);
+      tcolId = pCompCol->colId;
+      toffset = pCompCol->offset;
+      tlen = pCompCol->len;
+    } else {
+      ASSERT(pDataCol->colId == tcolId);
+    }
+
+    if (tcolId == pDataCol->colId) {
+      if (pCompBlock->algorithm == TWO_STAGE_COMP) {
+        int zsize = pDataCol->bytes * pCompBlock->numOfRows + COMP_OVERFLOW_BYTES;
+        if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+          zsize += (sizeof(VarDataLenT) * pCompBlock->numOfRows);
+        }
+        pHelper->compBuffer = taosTRealloc(pHelper->compBuffer, zsize);
+        if (pHelper->compBuffer == NULL) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          goto _err;
+        }
+      }
+      if (tsdbCheckAndDecodeColumnData(pDataCol, (char *)pCompData + tsize + toffset, tlen, pCompBlock->algorithm,
+                                       pCompBlock->numOfRows, pDataCols->maxPoints, pHelper->compBuffer,
+                                       (int32_t)taosTSizeof(pHelper->compBuffer)) < 0) {
+        tsdbError("vgId:%d file %s is broken at column %d block offset %" PRId64 " column offset %d",
+                  REPO_ID(pHelper->pRepo), pFile->fname, tcolId, (int64_t)pCompBlock->offset, toffset);
+        goto _err;
+      }
+      if (dcol != 0) ccol++;
+      dcol++;
+    } else if (tcolId < pDataCol->colId) {
+      ccol++;
+    } else {
+      // Set current column as NULL and forward
+      dataColSetNEleNull(pDataCol, pCompBlock->numOfRows, pDataCols->maxPoints);
+      dcol++;
+    }
+  }
+
+  return 0;
+
+_err:
+  return -1;
+}
+
+static int tsdbEncodeSCompIdx(void **buf, SCompIdx *pIdx) {
+  int tlen = 0;
+
+  tlen += taosEncodeVariantI32(buf, pIdx->tid);
+  tlen += taosEncodeVariantU32(buf, pIdx->len);
+  tlen += taosEncodeVariantU32(buf, pIdx->offset);
+  tlen += taosEncodeFixedU8(buf, pIdx->hasLast);
+  tlen += taosEncodeVariantU32(buf, pIdx->numOfBlocks);
+  tlen += taosEncodeFixedU64(buf, pIdx->uid);
+  tlen += taosEncodeFixedU64(buf, pIdx->maxKey);
+
+  return tlen;
+}
+
+static void *tsdbDecodeSCompIdx(void *buf, SCompIdx *pIdx) {
+  uint8_t  hasLast = 0;
+  uint32_t numOfBlocks = 0;
+  uint64_t value = 0;
+
+  if ((buf = taosDecodeVariantI32(buf, &(pIdx->tid))) == NULL) return NULL;
+  if ((buf = taosDecodeVariantU32(buf, &(pIdx->len))) == NULL) return NULL;
+  if ((buf = taosDecodeVariantU32(buf, &(pIdx->offset))) == NULL) return NULL;
+  if ((buf = taosDecodeFixedU8(buf, &(hasLast))) == NULL) return NULL;
+  pIdx->hasLast = hasLast;
+  if ((buf = taosDecodeVariantU32(buf, &(numOfBlocks))) == NULL) return NULL;
+  pIdx->numOfBlocks = numOfBlocks;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
+  pIdx->uid = (int64_t)value;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
+  pIdx->maxKey = (TSKEY)value;
+
+  return buf;
+}
+
+static int tsdbProcessAppendCommit(SRWHelper *pHelper, SCommitIter *pCommitIter, SDataCols *pDataCols, TSKEY maxKey) {
+  STsdbCfg * pCfg = &(pHelper->pRepo->config);
+  STable *   pTable = pCommitIter->pTable;
+  SCompIdx * pIdx = &(pHelper->curCompIdx);
+  TSKEY      keyFirst = tsdbNextIterKey(pCommitIter->pIter);
+  int        defaultRowsInBlock = pCfg->maxRowsPerFileBlock * 4 / 5;
+  SCompBlock compBlock = {0};
+
+  ASSERT(pIdx->len <= 0 || keyFirst > pIdx->maxKey);
+  if (pIdx->hasLast) {  // append to with last block
+    ASSERT(pIdx->len > 0);
+    SCompBlock *pCompBlock = blockAtIdx(pHelper, pIdx->numOfBlocks - 1);
+    ASSERT(pCompBlock->last && pCompBlock->numOfRows < pCfg->minRowsPerFileBlock);
+    tdResetDataCols(pDataCols);
+    int rowsRead = tsdbLoadDataFromCache(pTable, pCommitIter->pIter, maxKey, defaultRowsInBlock - pCompBlock->numOfRows,
+                                         pDataCols, NULL, 0);
+    ASSERT(rowsRead > 0 && rowsRead == pDataCols->numOfRows);
+    if (rowsRead + pCompBlock->numOfRows < pCfg->minRowsPerFileBlock &&
+        pCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS && !TSDB_NLAST_FILE_OPENED(pHelper)) {
+      if (tsdbWriteBlockToFile(pHelper, helperLastF(pHelper), pDataCols, &compBlock, true, false) < 0) return -1;
+      if (tsdbAddSubBlock(pHelper, &compBlock, pIdx->numOfBlocks - 1, rowsRead) < 0) return -1;
+    } else {
+      if (tsdbLoadBlockData(pHelper, pCompBlock, NULL) < 0) return -1;
+      ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows);
+
+      if (tdMergeDataCols(pHelper->pDataCols[0], pDataCols, pDataCols->numOfRows) < 0) return -1;
+      ASSERT(pHelper->pDataCols[0]->numOfRows == pCompBlock->numOfRows + pDataCols->numOfRows);
+
+      if (tsdbWriteBlockToProperFile(pHelper, pHelper->pDataCols[0], &compBlock) < 0) return -1;
+      if (tsdbUpdateSuperBlock(pHelper, &compBlock, pIdx->numOfBlocks - 1) < 0) return -1;
+    }
+
+    if (pHelper->hasOldLastBlock) pHelper->hasOldLastBlock = false;
+  } else {
+    ASSERT(!pHelper->hasOldLastBlock);
+    tdResetDataCols(pDataCols);
+    int rowsRead = tsdbLoadDataFromCache(pTable, pCommitIter->pIter, maxKey, defaultRowsInBlock, pDataCols, NULL, 0);
+    ASSERT(rowsRead > 0 && rowsRead == pDataCols->numOfRows);
+
+    if (tsdbWriteBlockToProperFile(pHelper, pDataCols, &compBlock) < 0) return -1;
+    if (tsdbInsertSuperBlock(pHelper, &compBlock, pIdx->numOfBlocks) < 0) return -1;
+  }
+
+#ifndef NDEBUG
+  TSKEY keyNext = tsdbNextIterKey(pCommitIter->pIter);
+  ASSERT(keyNext < 0 || keyNext > pIdx->maxKey);
+#endif
+
+  return 0;
+}
+
+static int tsdbProcessMergeCommit(SRWHelper *pHelper, SCommitIter *pCommitIter, SDataCols *pDataCols, TSKEY maxKey,
+                                  int *blkIdx) {
+  STsdbCfg * pCfg = &(pHelper->pRepo->config);
+  STable *   pTable = pCommitIter->pTable;
+  SCompIdx * pIdx = &(pHelper->curCompIdx);
+  SCompBlock compBlock = {0};
+  TSKEY      keyFirst = tsdbNextIterKey(pCommitIter->pIter);
+  int        defaultRowsInBlock = pCfg->maxRowsPerFileBlock * 4 / 5;
+  SDataCols *pDataCols0 = pHelper->pDataCols[0];
+
+  SSkipListIterator slIter = {0};
+
+  ASSERT(keyFirst <= pIdx->maxKey);
+
+  SCompBlock *pCompBlock = taosbsearch((void *)(&keyFirst), (void *)blockAtIdx(pHelper, *blkIdx),
+                                       pIdx->numOfBlocks - *blkIdx, sizeof(SCompBlock), compareKeyBlock, TD_GE);
+  ASSERT(pCompBlock != NULL);
+  int tblkIdx = (int32_t)(TSDB_GET_COMPBLOCK_IDX(pHelper, pCompBlock));
+
+  if (pCompBlock->last) {
+    ASSERT(pCompBlock->numOfRows < pCfg->minRowsPerFileBlock && tblkIdx == pIdx->numOfBlocks - 1);
+    int16_t colId = 0;
+    slIter = *(pCommitIter->pIter);
+    if (tsdbLoadBlockDataCols(pHelper, pCompBlock, NULL, &colId, 1) < 0) return -1;
+    ASSERT(pDataCols0->numOfRows == pCompBlock->numOfRows);
+
+    int rows1 = defaultRowsInBlock - pCompBlock->numOfRows;
+    int rows2 =
+        tsdbLoadDataFromCache(pTable, &slIter, maxKey, rows1, NULL, pDataCols0->cols[0].pData, pDataCols0->numOfRows);
+    if (rows2 == 0) {  // all data filtered out
+      *(pCommitIter->pIter) = slIter;
+    } else {
+      if (pCompBlock->numOfRows + rows2 < pCfg->minRowsPerFileBlock &&
+          pCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS && !TSDB_NLAST_FILE_OPENED(pHelper)) {
+        tdResetDataCols(pDataCols);
+        int rowsRead = tsdbLoadDataFromCache(pTable, pCommitIter->pIter, maxKey, rows1, pDataCols,
+                                             pDataCols0->cols[0].pData, pDataCols0->numOfRows);
+        ASSERT(rowsRead == rows2 && rowsRead == pDataCols->numOfRows);
+        if (tsdbWriteBlockToFile(pHelper, helperLastF(pHelper), pDataCols, &compBlock, true, false) < 0) return -1;
+        if (tsdbAddSubBlock(pHelper, &compBlock, tblkIdx, rowsRead) < 0) return -1;
+        tblkIdx++;
+      } else {
+        if (tsdbLoadBlockData(pHelper, pCompBlock, NULL) < 0) return -1;
+        int round = 0;
+        int dIter = 0;
+        while (true) {
+          tdResetDataCols(pDataCols);
+          int rowsRead =
+              tsdbLoadAndMergeFromCache(pDataCols0, &dIter, pCommitIter, pDataCols, maxKey, defaultRowsInBlock);
+          if (rowsRead == 0) break;
+
+          if (tsdbWriteBlockToProperFile(pHelper, pDataCols, &compBlock) < 0) return -1;
+          if (round == 0) {
+            if (tsdbUpdateSuperBlock(pHelper, &compBlock, tblkIdx) < 0) return -1;
+          } else {
+            if (tsdbInsertSuperBlock(pHelper, &compBlock, tblkIdx) < 0) return -1;
+          }
+
+          tblkIdx++;
+          round++;
+        }
+      }
+      if (pHelper->hasOldLastBlock) pHelper->hasOldLastBlock = false;
+    }
+  } else {
+    TSKEY keyLimit = (tblkIdx == pIdx->numOfBlocks - 1) ? maxKey : (pCompBlock[1].keyFirst - 1);
+    TSKEY blkKeyFirst = pCompBlock->keyFirst;
+    TSKEY blkKeyLast = pCompBlock->keyLast;
+
+    if (keyFirst < blkKeyFirst) {
+      while (true) {
+        tdResetDataCols(pDataCols);
+        int rowsRead =
+            tsdbLoadDataFromCache(pTable, pCommitIter->pIter, blkKeyFirst - 1, defaultRowsInBlock, pDataCols, NULL, 0);
+        if (rowsRead == 0) break;
+
+        ASSERT(rowsRead == pDataCols->numOfRows);
+        if (tsdbWriteBlockToFile(pHelper, helperDataF(pHelper), pDataCols, &compBlock, false, true) < 0) return -1;
+        if (tsdbInsertSuperBlock(pHelper, &compBlock, tblkIdx) < 0) return -1;
+        tblkIdx++;
+      }
+      ASSERT(tblkIdx == 0 || (tsdbNextIterKey(pCommitIter->pIter) < 0 ||
+                              tsdbNextIterKey(pCommitIter->pIter) > blockAtIdx(pHelper, tblkIdx - 1)->keyLast));
+    } else {
+      ASSERT(keyFirst <= blkKeyLast);
+      int16_t colId = 0;
+      if (tsdbLoadBlockDataCols(pHelper, pCompBlock, NULL, &colId, 1) < 0) return -1;
+
+      slIter = *(pCommitIter->pIter);
+      int rows1 = (pCfg->maxRowsPerFileBlock - pCompBlock->numOfRows);
+      int rows2 = tsdbLoadDataFromCache(pTable, &slIter, blkKeyLast, INT_MAX, NULL, pDataCols0->cols[0].pData,
+                                        pDataCols0->numOfRows);
+
+      if (rows2 == 0) {  // all filtered out
+        *(pCommitIter->pIter) = slIter;
+        ASSERT(tblkIdx == 0 || (tsdbNextIterKey(pCommitIter->pIter) < 0 ||
+                                tsdbNextIterKey(pCommitIter->pIter) > blockAtIdx(pHelper, tblkIdx - 1)->keyLast));
+      } else {
+        int rows3 = tsdbLoadDataFromCache(pTable, &slIter, keyLimit, INT_MAX, NULL, NULL, 0) + rows2;
+
+        if (pCompBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS && rows1 >= rows2) {
+          int rows = (rows1 >= rows3) ? rows3 : rows2;
+          tdResetDataCols(pDataCols);
+          int rowsRead = tsdbLoadDataFromCache(pTable, pCommitIter->pIter, keyLimit, rows, pDataCols,
+                                               pDataCols0->cols[0].pData, pDataCols0->numOfRows);
+          ASSERT(rowsRead == rows && rowsRead == pDataCols->numOfRows);
+          if (tsdbWriteBlockToFile(pHelper, helperDataF(pHelper), pDataCols, &compBlock, false, false) < 0)
+            return -1;
+          if (tsdbAddSubBlock(pHelper, &compBlock, tblkIdx, rowsRead) < 0) return -1;
+          tblkIdx++;
+          ASSERT(tblkIdx == 0 || (tsdbNextIterKey(pCommitIter->pIter) < 0 ||
+                                  tsdbNextIterKey(pCommitIter->pIter) > blockAtIdx(pHelper, tblkIdx - 1)->keyLast));
+        } else {
+          if (tsdbLoadBlockData(pHelper, pCompBlock, NULL) < 0) return -1;
+          int round = 0;
+          int dIter = 0;
+          while (true) {
+            int rowsRead =
+                tsdbLoadAndMergeFromCache(pDataCols0, &dIter, pCommitIter, pDataCols, keyLimit, defaultRowsInBlock);
+            if (rowsRead == 0) break;
+
+            if (tsdbWriteBlockToFile(pHelper, helperDataF(pHelper), pDataCols, &compBlock, false, true) < 0)
+              return -1;
+            if (round == 0) {
+              if (tsdbUpdateSuperBlock(pHelper, &compBlock, tblkIdx) < 0) return -1;
+            } else {
+              if (tsdbInsertSuperBlock(pHelper, &compBlock, tblkIdx) < 0) return -1;
+            }
+
+            round++;
+            tblkIdx++;
+          }
+          ASSERT(tblkIdx == 0 || (tsdbNextIterKey(pCommitIter->pIter) < 0 ||
+                                  tsdbNextIterKey(pCommitIter->pIter) > blockAtIdx(pHelper, tblkIdx - 1)->keyLast));
+        }
+      }
+    }
+  }
+
+  *blkIdx = tblkIdx;
+  return 0;
+}
+
+static int tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIter *pCommitIter, SDataCols *pTarget,
+                                     TSKEY maxKey, int maxRows) {
+  int       numOfRows = 0;
+  TSKEY     key1 = INT64_MAX;
+  TSKEY     key2 = INT64_MAX;
+  STSchema *pSchema = NULL;
+
+  ASSERT(maxRows > 0 && dataColsKeyLast(pDataCols) <= maxKey);
+  tdResetDataCols(pTarget);
+
+  while (true) {
+    key1 = (*iter >= pDataCols->numOfRows) ? INT64_MAX : dataColsKeyAt(pDataCols, *iter);
+    SDataRow row = tsdbNextIterRow(pCommitIter->pIter);
+    key2 = (row == NULL || dataRowKey(row) > maxKey) ? INT64_MAX : dataRowKey(row);
+
+    if (key1 == INT64_MAX && key2 == INT64_MAX) break;
+
+    if (key1 <= key2) {
+      for (int i = 0; i < pDataCols->numOfCols; i++) {
+        dataColAppendVal(pTarget->cols + i, tdGetColDataOfRow(pDataCols->cols + i, *iter), pTarget->numOfRows,
+                         pTarget->maxPoints);
+      }
+      pTarget->numOfRows++;
+      (*iter)++;
+      if (key1 == key2) tSkipListIterNext(pCommitIter->pIter);
+    } else {
+      if (pSchema == NULL || schemaVersion(pSchema) != dataRowVersion(row)) {
+        pSchema = tsdbGetTableSchemaImpl(pCommitIter->pTable, false, false, dataRowVersion(row));
+        ASSERT(pSchema != NULL);
+      }
+
+      tdAppendDataRowToDataCol(row, pSchema, pTarget);
+      tSkipListIterNext(pCommitIter->pIter);
+    }
+
+    numOfRows++;
+    if (numOfRows >= maxRows) break;
+    ASSERT(numOfRows == pTarget->numOfRows && numOfRows <= pTarget->maxPoints);
+  }
+
+  return numOfRows;
+}
+
+static int tsdbWriteBlockToProperFile(SRWHelper *pHelper, SDataCols *pDataCols, SCompBlock *pCompBlock) {
+  STsdbCfg *pCfg = &(pHelper->pRepo->config);
+  SFile *   pFile = NULL;
+  bool      isLast = false;
+
+  ASSERT(pDataCols->numOfRows > 0);
+
+  if (pDataCols->numOfRows >= pCfg->minRowsPerFileBlock) {
+    pFile = helperDataF(pHelper);
+  } else {
+    isLast = true;
+    pFile = TSDB_NLAST_FILE_OPENED(pHelper) ? helperNewLastF(pHelper) : helperLastF(pHelper);
+  }
+
+  ASSERT(pFile->fd > 0);
+
+  if (tsdbWriteBlockToFile(pHelper, pFile, pDataCols, pCompBlock, isLast, true) < 0) return -1;
+
+  return 0;
+}
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
new file mode 100644
index 0000000000000000000000000000000000000000..a3bc0de2722d333818829bd482a7d11a9f87fc8e
--- /dev/null
+++ b/src/tsdb/src/tsdbRead.c
@@ -0,0 +1,2713 @@
+/*
+ * 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 "os.h"
+#include "tulog.h"
+#include "talgo.h"
+#include "tcompare.h"
+#include "exception.h"
+
+#include "../../query/inc/qAst.h"  // todo move to common module
+#include "tlosertree.h"
+#include "tsdb.h"
+#include "tsdbMain.h"
+
+#define EXTRA_BYTES 2
+#define ASCENDING_TRAVERSE(o)   (o == TSDB_ORDER_ASC)
+#define QH_GET_NUM_OF_COLS(handle) ((size_t)(taosArrayGetSize((handle)->pColumns)))
+
+#define GET_FILE_DATA_BLOCK_INFO(_checkInfo, _block)                                   \
+  ((SDataBlockInfo){.window = {.skey = (_block)->keyFirst, .ekey = (_block)->keyLast}, \
+                    .numOfCols = (_block)->numOfCols,                                  \
+                    .rows = (_block)->numOfRows,                                       \
+                    .tid = (_checkInfo)->tableId.tid,                                  \
+                    .uid = (_checkInfo)->tableId.uid})
+
+
+enum {
+  TSDB_QUERY_TYPE_ALL      = 1,
+  TSDB_QUERY_TYPE_LAST     = 2,
+  TSDB_QUERY_TYPE_EXTERNAL = 3,
+};
+
+typedef struct SQueryFilePos {
+  int32_t fid;
+  int32_t slot;
+  int32_t pos;
+  int64_t lastKey;
+  int32_t rows;
+  bool    mixBlock;
+  bool    blockCompleted;
+  STimeWindow win;
+} SQueryFilePos;
+
+typedef struct SDataBlockLoadInfo {
+  SFileGroup* fileGroup;
+  int32_t     slot;
+  int32_t     tid;
+  SArray*     pLoadedCols;
+} SDataBlockLoadInfo;
+
+typedef struct SLoadCompBlockInfo {
+  int32_t tid; /* table tid */
+  int32_t fileId;
+} SLoadCompBlockInfo;
+
+typedef struct STableCheckInfo {
+  STableId      tableId;
+  TSKEY         lastKey;
+  STable*       pTableObj;
+  SCompInfo*    pCompInfo;
+  int32_t       compSize;
+  int32_t       numOfBlocks;    // number of qualified data blocks not the original blocks
+  SDataCols*    pDataCols;
+  int32_t       chosen;         // indicate which iterator should move forward
+  bool          initBuf;        // whether to initialize the in-memory skip list iterator or not
+  SSkipListIterator* iter;      // mem buffer skip list iterator
+  SSkipListIterator* iiter;     // imem buffer skip list iterator
+} STableCheckInfo;
+
+typedef struct STableBlockInfo {
+  SCompBlock*        compBlock;
+  STableCheckInfo*   pTableCheckInfo;
+} STableBlockInfo;
+
+typedef struct SBlockOrderSupporter {
+  int32_t             numOfTables;
+  STableBlockInfo**   pDataBlockInfo;
+  int32_t*            blockIndexArray;
+  int32_t*            numOfBlocksPerTable;
+} SBlockOrderSupporter;
+
+typedef struct SIOCostSummary {
+  int64_t blockLoadTime;
+  int64_t statisInfoLoadTime;
+  int64_t checkForNextTime;
+} SIOCostSummary;
+
+typedef struct STsdbQueryHandle {
+  STsdbRepo*     pTsdb;
+  SQueryFilePos  cur;              // current position
+  int16_t        order;
+  STimeWindow    window;           // the primary query time window that applies to all queries
+  SDataStatis*   statis;           // query level statistics, only one table block statistics info exists at any time
+  int32_t        numOfBlocks;
+  SArray*        pColumns;         // column list, SColumnInfoData array list
+  bool           locateStart;
+  int32_t        outputCapacity;
+  int32_t        realNumOfRows;
+  SArray*        pTableCheckInfo;  // SArray<STableCheckInfo>
+  int32_t        activeIndex;
+  bool           checkFiles;       // check file stage
+  void*          qinfo;            // query info handle, for debug purpose
+  int32_t        type;             // query type: retrieve all data blocks, 2. retrieve only last row, 3. retrieve direct prev|next rows
+  SFileGroup*    pFileGroup;
+  SFileGroupIter fileIter;
+  SRWHelper      rhelper;
+  STableBlockInfo* pDataBlockInfo;
+  int32_t        allocSize;        // allocated data block size
+  SMemTable*     mem;              // mem-table
+  SMemTable*     imem;             // imem-table, acquired from snapshot
+  SArray*        defaultLoadColumn;// default load column
+  SDataBlockLoadInfo dataBlockLoadInfo; /* record current block load information */
+  SLoadCompBlockInfo compBlockLoadInfo; /* record current compblock information in SQuery */
+
+  SIOCostSummary cost;
+} STsdbQueryHandle;
+
+typedef struct STableGroupSupporter {
+  int32_t    numOfCols;
+  SColIndex* pCols;
+  STSchema*  pTagSchema;
+} STableGroupSupporter;
+
+static STimeWindow changeTableGroupByLastrow(STableGroupInfo *groupList);
+
+static void    changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle);
+static void    doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, SCompBlock* pBlock);
+static int32_t binarySearchForKey(char* pValue, int num, TSKEY key, int order);
+static int     tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win,
+                                     STsdbQueryHandle* pQueryHandle);
+static int     tsdbCheckInfoCompar(const void* key1, const void* key2);
+
+static void tsdbInitDataBlockLoadInfo(SDataBlockLoadInfo* pBlockLoadInfo) {
+  pBlockLoadInfo->slot = -1;
+  pBlockLoadInfo->tid = -1;
+  pBlockLoadInfo->fileGroup = NULL;
+}
+
+static void tsdbInitCompBlockLoadInfo(SLoadCompBlockInfo* pCompBlockLoadInfo) {
+  pCompBlockLoadInfo->tid = -1;
+  pCompBlockLoadInfo->fileId = -1;
+}
+
+static SArray* getColumnIdList(STsdbQueryHandle* pQueryHandle) {
+  size_t numOfCols = QH_GET_NUM_OF_COLS(pQueryHandle);
+  assert(numOfCols <= TSDB_MAX_COLUMNS);
+
+  SArray* pIdList = taosArrayInit(numOfCols, sizeof(int16_t));
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i);
+    taosArrayPush(pIdList, &pCol->info.colId);
+  }
+
+  return pIdList;
+}
+
+static SArray* getDefaultLoadColumns(STsdbQueryHandle* pQueryHandle, bool loadTS) {
+  SArray* pLocalIdList = getColumnIdList(pQueryHandle);
+
+  // check if the primary time stamp column needs to load
+  int16_t colId = *(int16_t*)taosArrayGet(pLocalIdList, 0);
+
+  // the primary timestamp column does not be included in the the specified load column list, add it
+  if (loadTS && colId != 0) {
+    int16_t columnId = 0;
+    taosArrayInsert(pLocalIdList, 0, &columnId);
+  }
+
+  return pLocalIdList;
+}
+
+TsdbQueryHandleT* tsdbQueryTables(TSDB_REPO_T* tsdb, STsdbQueryCond* pCond, STableGroupInfo* groupList, void* qinfo) {
+  STsdbQueryHandle* pQueryHandle = calloc(1, sizeof(STsdbQueryHandle));
+  if (pQueryHandle == NULL) {
+    goto out_of_memory;
+  }
+
+  pQueryHandle->order       = pCond->order;
+  pQueryHandle->window      = pCond->twindow;
+  pQueryHandle->pTsdb       = tsdb;
+  pQueryHandle->type        = TSDB_QUERY_TYPE_ALL;
+  pQueryHandle->cur.fid     = -1;
+  pQueryHandle->cur.win     = TSWINDOW_INITIALIZER;
+  pQueryHandle->checkFiles  = true;
+  pQueryHandle->activeIndex = 0;   // current active table index
+  pQueryHandle->qinfo       = qinfo;
+  pQueryHandle->outputCapacity = ((STsdbRepo*)tsdb)->config.maxRowsPerFileBlock;
+  pQueryHandle->allocSize   = 0;
+  pQueryHandle->locateStart = false;
+
+  if (tsdbInitReadHelper(&pQueryHandle->rhelper, (STsdbRepo*) tsdb) != 0) {
+    goto out_of_memory;
+  }
+
+  tsdbTakeMemSnapshot(pQueryHandle->pTsdb, &pQueryHandle->mem, &pQueryHandle->imem);
+
+  size_t sizeOfGroup = taosArrayGetSize(groupList->pGroupList);
+  assert(sizeOfGroup >= 1 && pCond != NULL && pCond->numOfCols > 0);
+
+  if (ASCENDING_TRAVERSE(pCond->order)) {
+    assert(pQueryHandle->window.skey <= pQueryHandle->window.ekey);
+  } else {
+    assert(pQueryHandle->window.skey >= pQueryHandle->window.ekey);
+  }
+
+  // allocate buffer in order to load data blocks from file
+  int32_t numOfCols = pCond->numOfCols;
+  
+  pQueryHandle->statis = calloc(numOfCols, sizeof(SDataStatis));
+  if (pQueryHandle->statis == NULL) {
+    goto out_of_memory;
+  }
+
+  pQueryHandle->pColumns = taosArrayInit(numOfCols, sizeof(SColumnInfoData));  // todo: use list instead of array?
+  if (pQueryHandle->pColumns == NULL) {
+    goto out_of_memory;
+  }
+
+  for (int32_t i = 0; i < numOfCols; ++i) {
+    SColumnInfoData  colInfo = {{0}, 0};
+  
+    colInfo.info = pCond->colList[i];
+    colInfo.pData = calloc(1, EXTRA_BYTES + pQueryHandle->outputCapacity * pCond->colList[i].bytes);
+    if (colInfo.pData == NULL) {
+      goto out_of_memory;
+    }
+    taosArrayPush(pQueryHandle->pColumns, &colInfo);
+    pQueryHandle->statis[i].colId = colInfo.info.colId;
+  }
+
+  pQueryHandle->pTableCheckInfo = taosArrayInit(groupList->numOfTables, sizeof(STableCheckInfo));
+  if (pQueryHandle->pTableCheckInfo == NULL) {
+    goto out_of_memory;
+  }
+
+  STsdbMeta* pMeta = tsdbGetMeta(tsdb);
+  assert(pMeta != NULL && sizeOfGroup >= 1 && pCond != NULL && pCond->numOfCols > 0);
+
+  // todo apply the lastkey of table check to avoid to load header file
+  for (int32_t i = 0; i < sizeOfGroup; ++i) {
+    SArray* group = *(SArray**) taosArrayGet(groupList->pGroupList, i);
+
+    size_t gsize = taosArrayGetSize(group);
+    assert(gsize > 0);
+
+    for (int32_t j = 0; j < gsize; ++j) {
+      STableKeyInfo* pKeyInfo = (STableKeyInfo*) taosArrayGet(group, j);
+
+      STableCheckInfo info = { .lastKey = pKeyInfo->lastKey, .pTableObj = pKeyInfo->pTable };
+      info.tableId = ((STable*)(pKeyInfo->pTable))->tableId;
+
+      assert(info.pTableObj != NULL && (info.pTableObj->type == TSDB_NORMAL_TABLE ||
+      info.pTableObj->type == TSDB_CHILD_TABLE || info.pTableObj->type == TSDB_STREAM_TABLE));
+
+      info.tableId.tid = info.pTableObj->tableId.tid;
+      info.tableId.uid = info.pTableObj->tableId.uid;
+
+      if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+        assert(info.lastKey >= pQueryHandle->window.skey);
+      } else {
+        assert(info.lastKey <= pQueryHandle->window.skey);
+      }
+
+      taosArrayPush(pQueryHandle->pTableCheckInfo, &info);
+      tsdbDebug("%p check table uid:%"PRId64", tid:%d from lastKey:%"PRId64" %p", pQueryHandle, info.tableId.uid,
+          info.tableId.tid, info.lastKey, qinfo);
+    }
+  }
+  
+  taosArraySort(pQueryHandle->pTableCheckInfo, tsdbCheckInfoCompar);
+  pQueryHandle->defaultLoadColumn = getDefaultLoadColumns(pQueryHandle, true);
+
+  tsdbDebug("%p total numOfTable:%" PRIzu " in query, %p", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo), pQueryHandle->qinfo);
+
+  tsdbInitDataBlockLoadInfo(&pQueryHandle->dataBlockLoadInfo);
+  tsdbInitCompBlockLoadInfo(&pQueryHandle->compBlockLoadInfo);
+
+  return (TsdbQueryHandleT) pQueryHandle;
+
+out_of_memory:
+  tsdbCleanupQueryHandle(pQueryHandle);
+  terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+  return NULL;
+}
+
+TsdbQueryHandleT tsdbQueryLastRow(TSDB_REPO_T *tsdb, STsdbQueryCond *pCond, STableGroupInfo *groupList, void* qinfo) {
+  pCond->twindow = changeTableGroupByLastrow(groupList);
+
+  // no qualified table
+  if (groupList->numOfTables == 0) {
+    return NULL;
+  }
+
+  STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, groupList, qinfo);
+
+  assert(pCond->order == TSDB_ORDER_ASC && pCond->twindow.skey <= pCond->twindow.ekey);
+  return pQueryHandle;
+}
+
+SArray* tsdbGetQueriedTableList(TsdbQueryHandleT *pHandle) {
+  assert(pHandle != NULL);
+
+  STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) pHandle;
+
+  size_t size = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+  SArray* res = taosArrayInit(size, POINTER_BYTES);
+
+  for(int32_t i = 0; i < size; ++i) {
+    STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+    taosArrayPush(res, &pCheckInfo->pTableObj);
+  }
+
+  return res;
+}
+
+TsdbQueryHandleT tsdbQueryRowsInExternalWindow(TSDB_REPO_T *tsdb, STsdbQueryCond* pCond, STableGroupInfo *groupList, void* qinfo) {
+  STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, groupList, qinfo);
+  if (pQueryHandle != NULL) {
+    pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL;
+    changeQueryHandleForInterpQuery(pQueryHandle);
+  }
+  return pQueryHandle;
+}
+
+static bool initTableMemIterator(STsdbQueryHandle* pHandle, STableCheckInfo* pCheckInfo) {
+  STable* pTable = pCheckInfo->pTableObj;
+  assert(pTable != NULL);
+
+  if (pCheckInfo->initBuf) {
+    return true;
+  }
+
+  pCheckInfo->initBuf = true;
+  int32_t order = pHandle->order;
+
+  // no data in buffer, abort
+  if (pHandle->mem == NULL && pHandle->imem == NULL) {
+    return false;
+  }
+
+  assert(pCheckInfo->iter == NULL && pCheckInfo->iiter == NULL);
+
+  STableData* pMem = NULL;
+  STableData* pIMem = NULL;
+
+  if (pHandle->mem && pCheckInfo->tableId.tid < pHandle->mem->maxTables) {
+    pMem = pHandle->mem->tData[pCheckInfo->tableId.tid];
+    if (pMem != NULL && pMem->uid == pCheckInfo->tableId.uid) { // check uid
+      pCheckInfo->iter =
+          tSkipListCreateIterFromVal(pMem->pData, (const char*)&pCheckInfo->lastKey, TSDB_DATA_TYPE_TIMESTAMP, order);
+    }
+  }
+
+  if (pHandle->imem && pCheckInfo->tableId.tid < pHandle->imem->maxTables) {
+    pIMem = pHandle->imem->tData[pCheckInfo->tableId.tid];
+    if (pIMem != NULL && pIMem->uid == pCheckInfo->tableId.uid) { // check uid
+      pCheckInfo->iiter =
+          tSkipListCreateIterFromVal(pIMem->pData, (const char*)&pCheckInfo->lastKey, TSDB_DATA_TYPE_TIMESTAMP, order);
+    }
+  }
+
+  // both iterators are NULL, no data in buffer right now
+  if (pCheckInfo->iter == NULL && pCheckInfo->iiter == NULL) {
+    return false;
+  }
+
+  bool memEmpty  = (pCheckInfo->iter == NULL) || (pCheckInfo->iter != NULL && !tSkipListIterNext(pCheckInfo->iter));
+  bool imemEmpty = (pCheckInfo->iiter == NULL) || (pCheckInfo->iiter != NULL && !tSkipListIterNext(pCheckInfo->iiter));
+  if (memEmpty && imemEmpty) { // buffer is empty
+    return false;
+  }
+
+  if (!memEmpty) {
+    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
+    assert(node != NULL);
+
+    SDataRow row = *(SDataRow *)SL_GET_NODE_DATA(node);
+    TSKEY key = dataRowKey(row);  // first timestamp in buffer
+    tsdbDebug("%p uid:%" PRId64 ", tid:%d check data in mem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
+              "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%"PRId64", %p",
+              pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, key, order, pMem->keyFirst, pMem->keyLast,
+              pCheckInfo->lastKey, pMem->numOfRows, pHandle->qinfo);
+
+    if (ASCENDING_TRAVERSE(order)) {
+      assert(pCheckInfo->lastKey <= key);
+    } else {
+      assert(pCheckInfo->lastKey >= key);
+    }
+
+  } else {
+    tsdbDebug("%p uid:%"PRId64", tid:%d no data in mem, %p", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid,
+        pHandle->qinfo);
+  }
+
+  if (!imemEmpty) {
+    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
+    assert(node != NULL);
+
+    SDataRow row = *(SDataRow *)SL_GET_NODE_DATA(node);
+    TSKEY key = dataRowKey(row);  // first timestamp in buffer
+    tsdbDebug("%p uid:%" PRId64 ", tid:%d check data in imem from skey:%" PRId64 ", order:%d, ts range in buf:%" PRId64
+              "-%" PRId64 ", lastKey:%" PRId64 ", numOfRows:%"PRId64", %p",
+              pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, key, order, pIMem->keyFirst, pIMem->keyLast,
+              pCheckInfo->lastKey, pIMem->numOfRows, pHandle->qinfo);
+
+    if (ASCENDING_TRAVERSE(order)) {
+      assert(pCheckInfo->lastKey <= key);
+    } else {
+      assert(pCheckInfo->lastKey >= key);
+    }
+  } else {
+    tsdbDebug("%p uid:%"PRId64", tid:%d no data in imem, %p", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid,
+        pHandle->qinfo);
+  }
+
+  return true;
+}
+
+static void destroyTableMemIterator(STableCheckInfo* pCheckInfo) {
+  tSkipListDestroyIter(pCheckInfo->iter);
+  tSkipListDestroyIter(pCheckInfo->iiter);
+}
+
+static SDataRow getSDataRowInTableMem(STableCheckInfo* pCheckInfo, int32_t order) {
+  SDataRow rmem = NULL, rimem = NULL;
+  if (pCheckInfo->iter) {
+    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iter);
+    if (node != NULL) {
+      rmem = *(SDataRow *)SL_GET_NODE_DATA(node);
+    }
+  }
+
+  if (pCheckInfo->iiter) {
+    SSkipListNode* node = tSkipListIterGet(pCheckInfo->iiter);
+    if (node != NULL) {
+      rimem = *(SDataRow *)SL_GET_NODE_DATA(node);
+    }
+  }
+
+  if (rmem == NULL && rimem == NULL) {
+    return NULL;
+  }
+
+  if (rmem != NULL && rimem == NULL) {
+    pCheckInfo->chosen = 0;
+    return rmem;
+  }
+
+  if (rmem == NULL && rimem != NULL) {
+    pCheckInfo->chosen = 1;
+    return rimem;
+  }
+
+  TSKEY r1 = dataRowKey(rmem);
+  TSKEY r2 = dataRowKey(rimem);
+
+  if (r1 == r2) { // data ts are duplicated, ignore the data in mem
+    tSkipListIterNext(pCheckInfo->iter);
+    pCheckInfo->chosen = 1;
+    return rimem;
+  } else {
+    if (ASCENDING_TRAVERSE(order)) {
+      if (r1 < r2) {
+        pCheckInfo->chosen = 0;
+        return rmem;
+      } else {
+        pCheckInfo->chosen = 1;
+        return rimem;
+      }
+    } else {
+      if (r1 < r2) {
+        pCheckInfo->chosen = 1;
+        return rimem;
+      } else {
+        pCheckInfo->chosen = 0;
+        return rmem;
+      }
+    }
+  }
+}
+
+static bool moveToNextRowInMem(STableCheckInfo* pCheckInfo) {
+  bool hasNext = false;
+  if (pCheckInfo->chosen == 0) {
+    if (pCheckInfo->iter != NULL) {
+      hasNext = tSkipListIterNext(pCheckInfo->iter);
+    }
+
+    if (hasNext) {
+      return hasNext;
+    }
+
+    if (pCheckInfo->iiter != NULL) {
+      return tSkipListIterGet(pCheckInfo->iiter) != NULL;
+    }
+  } else { //pCheckInfo->chosen == 1
+    if (pCheckInfo->iiter != NULL) {
+      hasNext = tSkipListIterNext(pCheckInfo->iiter);
+    }
+
+    if (hasNext) {
+      return hasNext;
+    }
+
+    if (pCheckInfo->iter != NULL) {
+      return tSkipListIterGet(pCheckInfo->iter) != NULL;
+    }
+  }
+
+  return hasNext;
+}
+
+static bool hasMoreDataInCache(STsdbQueryHandle* pHandle) {
+  size_t size = taosArrayGetSize(pHandle->pTableCheckInfo);
+  assert(pHandle->activeIndex < size && pHandle->activeIndex >= 0 && size >= 1);
+  pHandle->cur.fid = -1;
+
+  STableCheckInfo* pCheckInfo = taosArrayGet(pHandle->pTableCheckInfo, pHandle->activeIndex);
+
+  STable* pTable = pCheckInfo->pTableObj;
+  assert(pTable != NULL);
+
+  if (!pCheckInfo->initBuf) {
+    initTableMemIterator(pHandle, pCheckInfo);
+  }
+
+  SDataRow row = getSDataRowInTableMem(pCheckInfo, pHandle->order);
+  if (row == NULL) {
+    return false;
+  }
+
+  pCheckInfo->lastKey = dataRowKey(row);  // first timestamp in buffer
+  tsdbDebug("%p uid:%" PRId64", tid:%d check data in buffer from skey:%" PRId64 ", order:%d, %p", pHandle,
+      pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, pCheckInfo->lastKey, pHandle->order, pHandle->qinfo);
+
+  // all data in mem are checked already.
+  if ((pCheckInfo->lastKey > pHandle->window.ekey && ASCENDING_TRAVERSE(pHandle->order)) ||
+      (pCheckInfo->lastKey < pHandle->window.ekey && !ASCENDING_TRAVERSE(pHandle->order))) {
+    return false;
+  }
+
+  int32_t step = ASCENDING_TRAVERSE(pHandle->order)? 1:-1;
+  STimeWindow* win = &pHandle->cur.win;
+  pHandle->cur.rows = tsdbReadRowsFromCache(pCheckInfo, pHandle->window.ekey, pHandle->outputCapacity, win, pHandle);
+
+  // update the last key value
+  pCheckInfo->lastKey = win->ekey + step;
+  pHandle->cur.lastKey = win->ekey + step;
+  pHandle->cur.mixBlock = true;
+
+  if (!ASCENDING_TRAVERSE(pHandle->order)) {
+    SWAP(win->skey, win->ekey, TSKEY);
+  }
+
+  return true;
+}
+
+static int32_t getFileIdFromKey(TSKEY key, int32_t daysPerFile, int32_t precision) {
+  assert(precision >= TSDB_TIME_PRECISION_MICRO || precision <= TSDB_TIME_PRECISION_NANO);
+  if (key == TSKEY_INITIAL_VAL) {
+    return INT32_MIN;
+  }
+
+  int64_t fid = (int64_t)(key / (daysPerFile * tsMsPerDay[precision]));  // set the starting fileId
+  if (fid < 0L && llabs(fid) > INT32_MAX) { // data value overflow for INT32
+    fid = INT32_MIN;
+  }
+
+  if (fid > 0L && fid > INT32_MAX) {
+    fid = INT32_MAX;
+  }
+
+  return (int32_t)fid;
+}
+
+static int32_t binarySearchForBlock(SCompBlock* pBlock, int32_t numOfBlocks, TSKEY skey, int32_t order) {
+  int32_t firstSlot = 0;
+  int32_t lastSlot = numOfBlocks - 1;
+
+  int32_t midSlot = firstSlot;
+
+  while (1) {
+    numOfBlocks = lastSlot - firstSlot + 1;
+    midSlot = (firstSlot + (numOfBlocks >> 1));
+
+    if (numOfBlocks == 1) break;
+
+    if (skey > pBlock[midSlot].keyLast) {
+      if (numOfBlocks == 2) break;
+      if ((order == TSDB_ORDER_DESC) && (skey < pBlock[midSlot + 1].keyFirst)) break;
+      firstSlot = midSlot + 1;
+    } else if (skey < pBlock[midSlot].keyFirst) {
+      if ((order == TSDB_ORDER_ASC) && (skey > pBlock[midSlot - 1].keyLast)) break;
+      lastSlot = midSlot - 1;
+    } else {
+      break;  // got the slot
+    }
+  }
+
+  return midSlot;
+}
+
+static int32_t getFileCompInfo(STsdbQueryHandle* pQueryHandle, int32_t* numOfBlocks) {
+  // load all the comp offset value for all tables in this file
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  *numOfBlocks = 0;
+  size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+
+  for (int32_t i = 0; i < numOfTables; ++i) {
+    STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+    pCheckInfo->numOfBlocks = 0;
+
+    if (tsdbSetHelperTable(&pQueryHandle->rhelper, pCheckInfo->pTableObj, pQueryHandle->pTsdb) != TSDB_CODE_SUCCESS) {
+      code = terrno;
+      break;
+    }
+
+    SCompIdx* compIndex = &pQueryHandle->rhelper.curCompIdx;
+
+    // no data block in this file, try next file
+    if (compIndex->len == 0 || compIndex->numOfBlocks == 0 || compIndex->uid != pCheckInfo->tableId.uid) {
+      continue; // no data blocks in the file belongs to pCheckInfo->pTable
+    }
+
+    if (pCheckInfo->compSize < (int32_t)compIndex->len) {
+      assert(compIndex->len > 0);
+
+      char* t = realloc(pCheckInfo->pCompInfo, compIndex->len);
+      if (t == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        code = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        break;
+      }
+
+      pCheckInfo->pCompInfo = (SCompInfo*) t;
+      pCheckInfo->compSize = compIndex->len;
+    }
+
+    tsdbLoadCompInfo(&(pQueryHandle->rhelper), (void *)(pCheckInfo->pCompInfo));
+    SCompInfo* pCompInfo = pCheckInfo->pCompInfo;
+
+    TSKEY s = TSKEY_INITIAL_VAL, e = TSKEY_INITIAL_VAL;
+
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      assert(pCheckInfo->lastKey <= pQueryHandle->window.ekey && pQueryHandle->window.skey <= pQueryHandle->window.ekey);
+    } else {
+      assert(pCheckInfo->lastKey >= pQueryHandle->window.ekey && pQueryHandle->window.skey >= pQueryHandle->window.ekey);
+    }
+
+    s = MIN(pCheckInfo->lastKey, pQueryHandle->window.ekey);
+    e = MAX(pCheckInfo->lastKey, pQueryHandle->window.ekey);
+
+    // discard the unqualified data block based on the query time window
+    int32_t start = binarySearchForBlock(pCompInfo->blocks, compIndex->numOfBlocks, s, TSDB_ORDER_ASC);
+    int32_t end = start;
+
+    if (s > pCompInfo->blocks[start].keyLast) {
+      continue;
+    }
+
+    // todo speedup the procedure of located end block
+    while (end < (int32_t)compIndex->numOfBlocks && (pCompInfo->blocks[end].keyFirst <= e)) {
+      end += 1;
+    }
+
+    pCheckInfo->numOfBlocks = (end - start);
+
+    if (start > 0) {
+      memmove(pCompInfo->blocks, &pCompInfo->blocks[start], pCheckInfo->numOfBlocks * sizeof(SCompBlock));
+    }
+
+    (*numOfBlocks) += pCheckInfo->numOfBlocks;
+  }
+
+  return code;
+}
+
+static int32_t doLoadFileDataBlock(STsdbQueryHandle* pQueryHandle, SCompBlock* pBlock, STableCheckInfo* pCheckInfo, int32_t slotIndex) {
+  STsdbRepo *pRepo = pQueryHandle->pTsdb;
+  int64_t    st = taosGetTimestampUs();
+
+  if (pCheckInfo->pDataCols == NULL) {
+    STsdbMeta* pMeta = tsdbGetMeta(pRepo);
+
+    pCheckInfo->pDataCols = tdNewDataCols(pMeta->maxRowBytes, pMeta->maxCols, pRepo->config.maxRowsPerFileBlock);
+    if (pCheckInfo->pDataCols == NULL) {
+      tsdbError("%p failed to malloc buf, %p", pQueryHandle, pQueryHandle->qinfo);
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return terrno;
+    }
+  }
+
+  STSchema* pSchema = tsdbGetTableSchema(pCheckInfo->pTableObj);
+  tdInitDataCols(pCheckInfo->pDataCols, pSchema);
+  tdInitDataCols(pQueryHandle->rhelper.pDataCols[0], pSchema);
+  tdInitDataCols(pQueryHandle->rhelper.pDataCols[1], pSchema);
+
+  int16_t* colIds = pQueryHandle->defaultLoadColumn->pData;
+
+  int32_t ret = tsdbLoadBlockDataCols(&(pQueryHandle->rhelper), pBlock, pCheckInfo->pCompInfo, colIds, (int)(QH_GET_NUM_OF_COLS(pQueryHandle)));
+  if (ret != TSDB_CODE_SUCCESS) {
+    return terrno;
+  }
+
+  SDataBlockLoadInfo* pBlockLoadInfo = &pQueryHandle->dataBlockLoadInfo;
+
+  pBlockLoadInfo->fileGroup = pQueryHandle->pFileGroup;
+  pBlockLoadInfo->slot = pQueryHandle->cur.slot;
+  pBlockLoadInfo->tid = pCheckInfo->pTableObj->tableId.tid;
+
+  SDataCols* pCols = pQueryHandle->rhelper.pDataCols[0];
+  assert(pCols->numOfRows != 0 && pCols->numOfRows <= pBlock->numOfRows);
+
+  pBlock->numOfRows = pCols->numOfRows;
+
+  int64_t elapsedTime = (taosGetTimestampUs() - st);
+  pQueryHandle->cost.blockLoadTime += elapsedTime;
+
+  tsdbDebug("%p load file block into buffer, index:%d, brange:%"PRId64"-%"PRId64" , rows:%d, elapsed time:%"PRId64 " us, %p",
+      pQueryHandle, slotIndex, pBlock->keyFirst, pBlock->keyLast, pBlock->numOfRows, elapsedTime, pQueryHandle->qinfo);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t getEndPosInDataBlock(STsdbQueryHandle* pQueryHandle, SDataBlockInfo* pBlockInfo);
+static int32_t doCopyRowsFromFileBlock(STsdbQueryHandle* pQueryHandle, int32_t capacity, int32_t numOfRows, int32_t start, int32_t end);
+static void moveDataToFront(STsdbQueryHandle* pQueryHandle, int32_t numOfRows, int32_t numOfCols);
+static void doCheckGeneratedBlockRange(STsdbQueryHandle* pQueryHandle);
+static void copyAllRemainRowsFromFileBlock(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, SDataBlockInfo* pBlockInfo, int32_t endPos);
+
+static int32_t handleDataMergeIfNeeded(STsdbQueryHandle* pQueryHandle, SCompBlock* pBlock, STableCheckInfo* pCheckInfo){
+  SQueryFilePos* cur = &pQueryHandle->cur;
+  SDataBlockInfo binfo = GET_FILE_DATA_BLOCK_INFO(pCheckInfo, pBlock);
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  /*bool hasData = */ initTableMemIterator(pQueryHandle, pCheckInfo);
+  SDataRow row = getSDataRowInTableMem(pCheckInfo, pQueryHandle->order);
+
+  assert(cur->pos >= 0 && cur->pos <= binfo.rows);
+
+  TSKEY key = (row != NULL)? dataRowKey(row):TSKEY_INITIAL_VAL;
+  tsdbDebug("%p key in mem:%"PRId64", %p", pQueryHandle, key, pQueryHandle->qinfo);
+
+  if ((ASCENDING_TRAVERSE(pQueryHandle->order) && (key != TSKEY_INITIAL_VAL && key <= binfo.window.ekey)) ||
+      (!ASCENDING_TRAVERSE(pQueryHandle->order) && (key != TSKEY_INITIAL_VAL && key >= binfo.window.skey))) {
+
+    if ((ASCENDING_TRAVERSE(pQueryHandle->order) && (key != TSKEY_INITIAL_VAL && key < binfo.window.skey)) ||
+        (!ASCENDING_TRAVERSE(pQueryHandle->order) && (key != TSKEY_INITIAL_VAL && key > binfo.window.ekey))) {
+
+      // do not load file block into buffer
+      int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order) ? 1 : -1;
+
+      TSKEY maxKey = ASCENDING_TRAVERSE(pQueryHandle->order)? (binfo.window.skey - step):(binfo.window.ekey - step);
+      cur->rows = tsdbReadRowsFromCache(pCheckInfo, maxKey, pQueryHandle->outputCapacity, &cur->win, pQueryHandle);
+      pQueryHandle->realNumOfRows = cur->rows;
+
+      // update the last key value
+      pCheckInfo->lastKey = cur->win.ekey + step;
+      if (!ASCENDING_TRAVERSE(pQueryHandle->order)) {
+        SWAP(cur->win.skey, cur->win.ekey, TSKEY);
+      }
+
+      cur->mixBlock = true;
+      cur->blockCompleted = false;
+      return code;
+    }
+
+    // return error, add test cases
+    if ((code = doLoadFileDataBlock(pQueryHandle, pBlock, pCheckInfo, cur->slot)) != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+  } else {
+    /*
+     * no data in cache, only load data from file
+     * during the query processing, data in cache will not be checked anymore.
+     *
+     * Here the buffer is not enough, so only part of file block can be loaded into memory buffer
+     */
+    assert(pQueryHandle->outputCapacity >= binfo.rows);
+    int32_t endPos = getEndPosInDataBlock(pQueryHandle, &binfo);
+
+    if ((cur->pos == 0 && endPos == binfo.rows -1 && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+        (cur->pos == (binfo.rows - 1) && endPos == 0 && (!ASCENDING_TRAVERSE(pQueryHandle->order)))) {
+      pQueryHandle->realNumOfRows = binfo.rows;
+
+      cur->rows = binfo.rows;
+      cur->win  = binfo.window;
+      cur->mixBlock = false;
+      cur->blockCompleted = true;
+
+      if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+        cur->lastKey = binfo.window.ekey + 1;
+        cur->pos = binfo.rows;
+      } else {
+        cur->lastKey = binfo.window.skey - 1;
+        cur->pos = -1;
+      }
+    } else { // partially copy to dest buffer
+      copyAllRemainRowsFromFileBlock(pQueryHandle, pCheckInfo, &binfo, endPos);
+      cur->mixBlock = true;
+    }
+
+    assert(cur->blockCompleted);
+    tsdbDebug("create data block from remain file block, brange:%"PRId64"-%"PRId64", rows:%d, lastKey:%"PRId64", %p",
+        cur->win.skey, cur->win.ekey, cur->rows, cur->lastKey, pQueryHandle);
+  }
+
+  return code;
+}
+
+static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SCompBlock* pBlock, STableCheckInfo* pCheckInfo, bool* exists) {
+  SQueryFilePos* cur = &pQueryHandle->cur;
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    // query ended in/started from current block
+    if (pQueryHandle->window.ekey < pBlock->keyLast || pCheckInfo->lastKey > pBlock->keyFirst) {
+      if ((code = doLoadFileDataBlock(pQueryHandle, pBlock, pCheckInfo, cur->slot)) != TSDB_CODE_SUCCESS) {
+        *exists = false;
+        return code;
+      }
+
+      SDataCols* pTSCol = pQueryHandle->rhelper.pDataCols[0];
+      assert(pTSCol->cols->type == TSDB_DATA_TYPE_TIMESTAMP && pTSCol->numOfRows == pBlock->numOfRows);
+
+      if (pCheckInfo->lastKey > pBlock->keyFirst) {
+        cur->pos =
+            binarySearchForKey(pTSCol->cols[0].pData, pBlock->numOfRows, pCheckInfo->lastKey, pQueryHandle->order);
+      } else {
+        cur->pos = 0;
+      }
+
+      assert(pCheckInfo->lastKey <= pBlock->keyLast);
+      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+    } else {  // the whole block is loaded in to buffer
+      cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows - 1);
+      code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
+    }
+  } else {  //desc order, query ended in current block
+    if (pQueryHandle->window.ekey > pBlock->keyFirst || pCheckInfo->lastKey < pBlock->keyLast) {
+      if ((code = doLoadFileDataBlock(pQueryHandle, pBlock, pCheckInfo, cur->slot)) != TSDB_CODE_SUCCESS) {
+        *exists = false;
+        return code;
+      }
+
+      SDataCols* pTSCol = pQueryHandle->rhelper.pDataCols[0];
+      if (pCheckInfo->lastKey < pBlock->keyLast) {
+        cur->pos = binarySearchForKey(pTSCol->cols[0].pData, pBlock->numOfRows, pCheckInfo->lastKey, pQueryHandle->order);
+      } else {
+        cur->pos = pBlock->numOfRows - 1;
+      }
+
+      assert(pCheckInfo->lastKey >= pBlock->keyFirst);
+      doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
+    } else {
+      cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows-1);
+      code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
+    }
+  }
+
+  *exists = pQueryHandle->realNumOfRows > 0;
+  return code;
+}
+
+static int doBinarySearchKey(char* pValue, int num, TSKEY key, int order) {
+  int    firstPos, lastPos, midPos = -1;
+  int    numOfRows;
+  TSKEY* keyList;
+
+  assert(order == TSDB_ORDER_ASC || order == TSDB_ORDER_DESC);
+
+  if (num <= 0) return -1;
+
+  keyList = (TSKEY*)pValue;
+  firstPos = 0;
+  lastPos = num - 1;
+
+  if (order == TSDB_ORDER_DESC) {
+    // find the first position which is smaller than the key
+    while (1) {
+      if (key >= keyList[lastPos]) return lastPos;
+      if (key == keyList[firstPos]) return firstPos;
+      if (key < keyList[firstPos]) return firstPos - 1;
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+
+  } else {
+    // find the first position which is bigger than the key
+    while (1) {
+      if (key <= keyList[firstPos]) return firstPos;
+      if (key == keyList[lastPos]) return lastPos;
+
+      if (key > keyList[lastPos]) {
+        lastPos = lastPos + 1;
+        if (lastPos >= num)
+          return -1;
+        else
+          return lastPos;
+      }
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+  }
+
+  return midPos;
+}
+
+int32_t doCopyRowsFromFileBlock(STsdbQueryHandle* pQueryHandle, int32_t capacity, int32_t numOfRows, int32_t start, int32_t end) {
+  char* pData = NULL;
+  int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order)? 1 : -1;
+
+  SDataCols* pCols = pQueryHandle->rhelper.pDataCols[0];
+  TSKEY* tsArray = pCols->cols[0].pData;
+
+  int32_t num = end - start + 1;
+  assert(num >= 0);
+
+  if (num == 0) {
+    return numOfRows;
+  }
+
+  int32_t requiredNumOfCols = (int32_t)taosArrayGetSize(pQueryHandle->pColumns);
+
+  //data in buffer has greater timestamp, copy data in file block
+  int32_t i = 0, j = 0;
+  while(i < requiredNumOfCols && j < pCols->numOfCols) {
+    SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+
+    SDataCol* src = &pCols->cols[j];
+    if (src->colId < pColInfo->info.colId) {
+      j++;
+      continue;
+    }
+
+    int32_t bytes = pColInfo->info.bytes;
+
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      pData = (char*)pColInfo->pData + numOfRows * pColInfo->info.bytes;
+    } else {
+      pData = (char*)pColInfo->pData + (capacity - numOfRows - num) * pColInfo->info.bytes;
+    }
+
+    if (pColInfo->info.colId == src->colId) {
+
+      if (pColInfo->info.type != TSDB_DATA_TYPE_BINARY && pColInfo->info.type != TSDB_DATA_TYPE_NCHAR) {
+        memmove(pData, (char*)src->pData + bytes * start, bytes * num);
+      } else {  // handle the var-string
+        char* dst = pData;
+
+        // todo refactor, only copy one-by-one
+        for (int32_t k = start; k < num + start; ++k) {
+          char* p = tdGetColDataOfRow(src, k);
+          memcpy(dst, p, varDataTLen(p));
+          dst += bytes;
+        }
+      }
+
+      j++;
+      i++;
+    } else { // pColInfo->info.colId < src->colId, it is a NULL data
+      if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+        char* dst = pData;
+
+        for(int32_t k = start; k < num + start; ++k) {
+          setVardataNull(dst, pColInfo->info.type);
+          dst += bytes;
+        }
+      } else {
+        setNullN(pData, pColInfo->info.type, pColInfo->info.bytes, num);
+      }
+      i++;
+    }
+  }
+
+  while (i < requiredNumOfCols) { // the remain columns are all null data
+    SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      pData = (char*)pColInfo->pData + numOfRows * pColInfo->info.bytes;
+    } else {
+      pData = (char*)pColInfo->pData + (capacity - numOfRows - num) * pColInfo->info.bytes;
+    }
+
+    if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+      char* dst = pData;
+
+      for(int32_t k = start; k < num + start; ++k) {
+        setVardataNull(dst, pColInfo->info.type);
+        dst += pColInfo->info.bytes;
+      }
+    } else {
+      setNullN(pData, pColInfo->info.type, pColInfo->info.bytes, num);
+    }
+
+    i++;
+  }
+
+  pQueryHandle->cur.win.ekey = tsArray[end];
+  pQueryHandle->cur.lastKey = tsArray[end] + step;
+
+  return numOfRows + num;
+}
+
+static void copyOneRowFromMem(STsdbQueryHandle* pQueryHandle, int32_t capacity, int32_t numOfRows, SDataRow row,
+                              int32_t numOfCols, STable* pTable) {
+  char* pData = NULL;
+
+  // the schema version info is embeded in SDataRow
+  STSchema* pSchema = tsdbGetTableSchemaByVersion(pTable, dataRowVersion(row));
+  int32_t numOfRowCols = schemaNCols(pSchema);
+
+  int32_t i = 0, j = 0;
+  while(i < numOfCols && j < numOfRowCols) {
+    SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+    if (pSchema->columns[j].colId < pColInfo->info.colId) {
+      j++;
+      continue;
+    }
+
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      pData = (char*)pColInfo->pData + numOfRows * pColInfo->info.bytes;
+    } else {
+      pData = (char*)pColInfo->pData + (capacity - numOfRows - 1) * pColInfo->info.bytes;
+    }
+
+    if (pSchema->columns[j].colId == pColInfo->info.colId) {
+      void* value = tdGetRowDataOfCol(row, (int8_t)pColInfo->info.type, TD_DATA_ROW_HEAD_SIZE + pSchema->columns[j].offset);
+      if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+        memcpy(pData, value, varDataTLen(value));
+      } else {
+        memcpy(pData, value, pColInfo->info.bytes);
+      }
+
+      j++;
+      i++;
+    } else { // pColInfo->info.colId < pSchema->columns[j].colId, it is a NULL data
+      if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+        setVardataNull(pData, pColInfo->info.type);
+      } else {
+        setNull(pData, pColInfo->info.type, pColInfo->info.bytes);
+      }
+      i++;
+    }
+  }
+
+  while (i < numOfCols) { // the remain columns are all null data
+    SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      pData = (char*)pColInfo->pData + numOfRows * pColInfo->info.bytes;
+    } else {
+      pData = (char*)pColInfo->pData + (capacity - numOfRows - 1) * pColInfo->info.bytes;
+    }
+
+    if (pColInfo->info.type == TSDB_DATA_TYPE_BINARY || pColInfo->info.type == TSDB_DATA_TYPE_NCHAR) {
+      setVardataNull(pData, pColInfo->info.type);
+    } else {
+      setNull(pData, pColInfo->info.type, pColInfo->info.bytes);
+    }
+
+    i++;
+  }
+}
+
+static void moveDataToFront(STsdbQueryHandle* pQueryHandle, int32_t numOfRows, int32_t numOfCols) {
+  if (numOfRows == 0 || ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    return;
+  }
+
+  // if the buffer is not full in case of descending order query, move the data in the front of the buffer
+  if (numOfRows < pQueryHandle->outputCapacity) {
+    int32_t emptySize = pQueryHandle->outputCapacity - numOfRows;
+    for(int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+      memmove((char*)pColInfo->pData, (char*)pColInfo->pData + emptySize * pColInfo->info.bytes, numOfRows * pColInfo->info.bytes);
+    }
+  }
+}
+
+static void getQualifiedRowsPos(STsdbQueryHandle* pQueryHandle, int32_t startPos, int32_t endPos, int32_t numOfExisted,
+                                int32_t* start, int32_t* end) {
+  *start = -1;
+
+  if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    int32_t remain = endPos - startPos + 1;
+    if (remain + numOfExisted > pQueryHandle->outputCapacity) {
+      *end = (pQueryHandle->outputCapacity - numOfExisted) + startPos - 1;
+    } else {
+      *end = endPos;
+    }
+
+    *start = startPos;
+  } else {
+    int32_t remain = (startPos - endPos) + 1;
+    if (remain + numOfExisted > pQueryHandle->outputCapacity) {
+      *end = startPos + 1 - (pQueryHandle->outputCapacity - numOfExisted);
+    } else {
+      *end = endPos;
+    }
+
+    *start = *end;
+    *end = startPos;
+  }
+}
+
+static void updateInfoAfterMerge(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, int32_t numOfRows, int32_t endPos) {
+  SQueryFilePos* cur = &pQueryHandle->cur;
+
+  pCheckInfo->lastKey = cur->lastKey;
+  pQueryHandle->realNumOfRows = numOfRows;
+  cur->rows = numOfRows;
+  cur->pos = endPos;
+}
+
+static void doCheckGeneratedBlockRange(STsdbQueryHandle* pQueryHandle) {
+  SQueryFilePos* cur = &pQueryHandle->cur;
+
+  if (cur->rows > 0) {
+    if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+      assert(cur->win.skey >= pQueryHandle->window.skey && cur->win.ekey <= pQueryHandle->window.ekey);
+    } else {
+      assert(cur->win.skey >= pQueryHandle->window.ekey && cur->win.ekey <= pQueryHandle->window.skey);
+    }
+
+    SColumnInfoData* pColInfoData = taosArrayGet(pQueryHandle->pColumns, 0);
+    assert(cur->win.skey == ((TSKEY*)pColInfoData->pData)[0] && cur->win.ekey == ((TSKEY*)pColInfoData->pData)[cur->rows-1]);
+  } else {
+    cur->win = pQueryHandle->window;
+
+    int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order)? 1:-1;
+    cur->lastKey = pQueryHandle->window.ekey + step;
+  }
+}
+
+static void copyAllRemainRowsFromFileBlock(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, SDataBlockInfo* pBlockInfo, int32_t endPos) {
+  SQueryFilePos* cur = &pQueryHandle->cur;
+
+  SDataCols* pCols = pQueryHandle->rhelper.pDataCols[0];
+  TSKEY* tsArray = pCols->cols[0].pData;
+
+  int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order)? 1:-1;
+  int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle));
+
+  int32_t pos = cur->pos;
+
+  int32_t start = cur->pos;
+  int32_t end = endPos;
+
+  if (!ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    assert(start >= end);
+    SWAP(start, end, int32_t);
+  }
+
+  assert(pQueryHandle->outputCapacity >= (end - start + 1));
+  int32_t numOfRows = doCopyRowsFromFileBlock(pQueryHandle, pQueryHandle->outputCapacity, 0, start, end);
+
+  // the time window should always be ascending order: skey <= ekey
+  cur->win = (STimeWindow) {.skey = tsArray[start], .ekey = tsArray[end]};
+  cur->mixBlock = (numOfRows != pBlockInfo->rows);
+  cur->lastKey = tsArray[endPos] + step;
+  cur->blockCompleted = true;
+
+  // if the buffer is not full in case of descending order query, move the data in the front of the buffer
+  moveDataToFront(pQueryHandle, numOfRows, numOfCols);
+
+  // The value of pos may be -1 or pBlockInfo->rows, and it is invalid in both cases.
+  pos = endPos + step;
+  updateInfoAfterMerge(pQueryHandle, pCheckInfo, numOfRows, pos);
+  doCheckGeneratedBlockRange(pQueryHandle);
+
+  tsdbDebug("%p uid:%" PRIu64",tid:%d data block created, mixblock:%d, brange:%"PRIu64"-%"PRIu64" rows:%d, %p",
+            pQueryHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, cur->mixBlock, cur->win.skey,
+            cur->win.ekey, cur->rows, pQueryHandle->qinfo);
+}
+
+int32_t getEndPosInDataBlock(STsdbQueryHandle* pQueryHandle, SDataBlockInfo* pBlockInfo) {
+  // NOTE: reverse the order to find the end position in data block
+  int32_t endPos = -1;
+  int32_t order = ASCENDING_TRAVERSE(pQueryHandle->order)? TSDB_ORDER_DESC : TSDB_ORDER_ASC;
+
+  SQueryFilePos* cur = &pQueryHandle->cur;
+  SDataCols* pCols = pQueryHandle->rhelper.pDataCols[0];
+
+  if (ASCENDING_TRAVERSE(pQueryHandle->order) && pQueryHandle->window.ekey >= pBlockInfo->window.ekey) {
+    endPos = pBlockInfo->rows - 1;
+    cur->mixBlock = (cur->pos != 0);
+  } else if (!ASCENDING_TRAVERSE(pQueryHandle->order) && pQueryHandle->window.ekey <= pBlockInfo->window.skey) {
+    endPos = 0;
+    cur->mixBlock = (cur->pos != pBlockInfo->rows - 1);
+  } else {
+    assert(pCols->numOfRows > 0);
+    endPos = doBinarySearchKey(pCols->cols[0].pData, pCols->numOfRows, pQueryHandle->window.ekey, order);
+    cur->mixBlock = true;
+  }
+
+  return endPos;
+}
+
+// only return the qualified data to client in terms of query time window, data rows in the same block but do not
+// be included in the query time window will be discarded
+static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, SCompBlock* pBlock) {
+  SQueryFilePos* cur = &pQueryHandle->cur;
+  SDataBlockInfo blockInfo = GET_FILE_DATA_BLOCK_INFO(pCheckInfo, pBlock);
+
+  initTableMemIterator(pQueryHandle, pCheckInfo);
+
+  SDataCols* pCols = pQueryHandle->rhelper.pDataCols[0];
+  assert(pCols->cols[0].type == TSDB_DATA_TYPE_TIMESTAMP && pCols->cols[0].colId == PRIMARYKEY_TIMESTAMP_COL_INDEX &&
+      cur->pos >= 0 && cur->pos < pBlock->numOfRows);
+
+  TSKEY* tsArray = pCols->cols[0].pData;
+
+  // for search the endPos, so the order needs to reverse
+  int32_t order = (pQueryHandle->order == TSDB_ORDER_ASC)? TSDB_ORDER_DESC:TSDB_ORDER_ASC;
+
+  int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order)? 1:-1;
+  int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle));
+
+  STable* pTable = pCheckInfo->pTableObj;
+  int32_t endPos = getEndPosInDataBlock(pQueryHandle, &blockInfo);
+
+  tsdbDebug("%p uid:%" PRIu64",tid:%d start merge data block, file block range:%"PRIu64"-%"PRIu64" rows:%d, start:%d,"
+            "end:%d, %p",
+            pQueryHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, blockInfo.window.skey, blockInfo.window.ekey,
+            blockInfo.rows, cur->pos, endPos, pQueryHandle->qinfo);
+
+  // compared with the data from in-memory buffer, to generate the correct timestamp array list
+  int32_t numOfRows = 0;
+
+  int32_t pos = cur->pos;
+  cur->win = TSWINDOW_INITIALIZER;
+
+  // no data in buffer, load data from file directly
+  if (pCheckInfo->iiter == NULL && pCheckInfo->iter == NULL) {
+    copyAllRemainRowsFromFileBlock(pQueryHandle, pCheckInfo, &blockInfo, endPos);
+    return;
+  } else if (pCheckInfo->iter != NULL || pCheckInfo->iiter != NULL) {
+    SSkipListNode* node = NULL;
+    do {
+      SDataRow row = getSDataRowInTableMem(pCheckInfo, pQueryHandle->order);
+      if (row == NULL) {
+        break;
+      }
+
+      TSKEY key = dataRowKey(row);
+      if ((key > pQueryHandle->window.ekey && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          (key < pQueryHandle->window.ekey && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        break;
+      }
+
+      if (((tsArray[pos] > pQueryHandle->window.ekey || pos > endPos) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          ((tsArray[pos] < pQueryHandle->window.ekey || pos < endPos) && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        break;
+      }
+
+      if ((key < tsArray[pos] && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          (key > tsArray[pos] && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        copyOneRowFromMem(pQueryHandle, pQueryHandle->outputCapacity, numOfRows, row, numOfCols, pTable);
+        numOfRows += 1;
+        if (cur->win.skey == TSKEY_INITIAL_VAL) {
+          cur->win.skey = key;
+        }
+
+        cur->win.ekey = key;
+        cur->lastKey  = key + step;
+        cur->mixBlock = true;
+
+        moveToNextRowInMem(pCheckInfo);
+      } else if (key == tsArray[pos]) {  // data in buffer has the same timestamp of data in file block, ignore it
+        moveToNextRowInMem(pCheckInfo);
+      } else if ((key > tsArray[pos] && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+                  (key < tsArray[pos] && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        if (cur->win.skey == TSKEY_INITIAL_VAL) {
+          cur->win.skey = tsArray[pos];
+        }
+
+        int32_t end = doBinarySearchKey(pCols->cols[0].pData, pCols->numOfRows, key, order);
+        assert(end != -1);
+
+        if (tsArray[end] == key) { // the value of key in cache equals to the end timestamp value, ignore it
+          moveToNextRowInMem(pCheckInfo);
+        }
+
+        int32_t qstart = 0, qend = 0;
+        getQualifiedRowsPos(pQueryHandle, pos, end, numOfRows, &qstart, &qend);
+
+        numOfRows = doCopyRowsFromFileBlock(pQueryHandle, pQueryHandle->outputCapacity, numOfRows, qstart, qend);
+        pos += (qend - qstart + 1) * step;
+
+        cur->win.ekey = ASCENDING_TRAVERSE(pQueryHandle->order)? tsArray[qend]:tsArray[qstart];
+        cur->lastKey  = cur->win.ekey + step;
+      }
+    } while (numOfRows < pQueryHandle->outputCapacity);
+
+    if (numOfRows < pQueryHandle->outputCapacity) {
+      /**
+       * if cache is empty, load remain file block data. In contrast, if there are remain data in cache, do NOT
+       * copy them all to result buffer, since it may be overlapped with file data block.
+       */
+      if (node == NULL ||
+          ((dataRowKey(*(SDataRow *)SL_GET_NODE_DATA(node)) > pQueryHandle->window.ekey) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          ((dataRowKey(*(SDataRow *)SL_GET_NODE_DATA(node)) < pQueryHandle->window.ekey) && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        // no data in cache or data in cache is greater than the ekey of time window, load data from file block
+        if (cur->win.skey == TSKEY_INITIAL_VAL) {
+          cur->win.skey = tsArray[pos];
+        }
+
+        int32_t start = -1, end = -1;
+        getQualifiedRowsPos(pQueryHandle, pos, endPos, numOfRows, &start, &end);
+
+        numOfRows = doCopyRowsFromFileBlock(pQueryHandle, pQueryHandle->outputCapacity, numOfRows, start, end);
+        pos += (end - start + 1) * step;
+
+        cur->win.ekey = ASCENDING_TRAVERSE(pQueryHandle->order)? tsArray[end]:tsArray[start];
+        cur->lastKey  = cur->win.ekey + step;
+        cur->mixBlock = true;
+      }
+    }
+  }
+
+  cur->blockCompleted =
+      (((pos > endPos || cur->lastKey > pQueryHandle->window.ekey) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+       ((pos < endPos || cur->lastKey < pQueryHandle->window.ekey) && !ASCENDING_TRAVERSE(pQueryHandle->order)));
+
+  if (!ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    SWAP(cur->win.skey, cur->win.ekey, TSKEY);
+  }
+
+  moveDataToFront(pQueryHandle, numOfRows, numOfCols);
+  updateInfoAfterMerge(pQueryHandle, pCheckInfo, numOfRows, pos);
+  doCheckGeneratedBlockRange(pQueryHandle);
+
+  tsdbDebug("%p uid:%" PRIu64",tid:%d data block created, mixblock:%d, brange:%"PRIu64"-%"PRIu64" rows:%d, %p",
+      pQueryHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, cur->mixBlock, cur->win.skey,
+      cur->win.ekey, cur->rows, pQueryHandle->qinfo);
+}
+
+int32_t binarySearchForKey(char* pValue, int num, TSKEY key, int order) {
+  int    firstPos, lastPos, midPos = -1;
+  int    numOfRows;
+  TSKEY* keyList;
+
+  if (num <= 0) return -1;
+
+  keyList = (TSKEY*)pValue;
+  firstPos = 0;
+  lastPos = num - 1;
+
+  if (order == TSDB_ORDER_DESC) {
+    // find the first position which is smaller than the key
+    while (1) {
+      if (key >= keyList[lastPos]) return lastPos;
+      if (key == keyList[firstPos]) return firstPos;
+      if (key < keyList[firstPos]) return firstPos - 1;
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+
+  } else {
+    // find the first position which is bigger than the key
+    while (1) {
+      if (key <= keyList[firstPos]) return firstPos;
+      if (key == keyList[lastPos]) return lastPos;
+
+      if (key > keyList[lastPos]) {
+        lastPos = lastPos + 1;
+        if (lastPos >= num)
+          return -1;
+        else
+          return lastPos;
+      }
+
+      numOfRows = lastPos - firstPos + 1;
+      midPos = (numOfRows >> 1) + firstPos;
+
+      if (key < keyList[midPos]) {
+        lastPos = midPos - 1;
+      } else if (key > keyList[midPos]) {
+        firstPos = midPos + 1;
+      } else {
+        break;
+      }
+    }
+  }
+
+  return midPos;
+}
+
+static void cleanBlockOrderSupporter(SBlockOrderSupporter* pSupporter, int32_t numOfTables) {
+  taosTFree(pSupporter->numOfBlocksPerTable);
+  taosTFree(pSupporter->blockIndexArray);
+
+  for (int32_t i = 0; i < numOfTables; ++i) {
+    STableBlockInfo* pBlockInfo = pSupporter->pDataBlockInfo[i];
+    taosTFree(pBlockInfo);
+  }
+
+  taosTFree(pSupporter->pDataBlockInfo);
+}
+
+static int32_t dataBlockOrderCompar(const void* pLeft, const void* pRight, void* param) {
+  int32_t leftTableIndex = *(int32_t*)pLeft;
+  int32_t rightTableIndex = *(int32_t*)pRight;
+
+  SBlockOrderSupporter* pSupporter = (SBlockOrderSupporter*)param;
+
+  int32_t leftTableBlockIndex = pSupporter->blockIndexArray[leftTableIndex];
+  int32_t rightTableBlockIndex = pSupporter->blockIndexArray[rightTableIndex];
+
+  if (leftTableBlockIndex > pSupporter->numOfBlocksPerTable[leftTableIndex]) {
+    /* left block is empty */
+    return 1;
+  } else if (rightTableBlockIndex > pSupporter->numOfBlocksPerTable[rightTableIndex]) {
+    /* right block is empty */
+    return -1;
+  }
+
+  STableBlockInfo* pLeftBlockInfoEx = &pSupporter->pDataBlockInfo[leftTableIndex][leftTableBlockIndex];
+  STableBlockInfo* pRightBlockInfoEx = &pSupporter->pDataBlockInfo[rightTableIndex][rightTableBlockIndex];
+
+  //    assert(pLeftBlockInfoEx->compBlock->offset != pRightBlockInfoEx->compBlock->offset);
+#if 0	// TODO: temporarily comment off requested by Dr. Liao
+  if (pLeftBlockInfoEx->compBlock->offset == pRightBlockInfoEx->compBlock->offset &&
+      pLeftBlockInfoEx->compBlock->last == pRightBlockInfoEx->compBlock->last) {
+    tsdbError("error in header file, two block with same offset:%" PRId64, (int64_t)pLeftBlockInfoEx->compBlock->offset);
+  }
+#endif
+
+  return pLeftBlockInfoEx->compBlock->offset > pRightBlockInfoEx->compBlock->offset ? 1 : -1;
+}
+
+static int32_t createDataBlocksInfo(STsdbQueryHandle* pQueryHandle, int32_t numOfBlocks, int32_t* numOfAllocBlocks) {
+  size_t size = sizeof(STableBlockInfo) * numOfBlocks;
+
+  if (pQueryHandle->allocSize < size) {
+    pQueryHandle->allocSize = (int32_t)size;
+    char* tmp = realloc(pQueryHandle->pDataBlockInfo, pQueryHandle->allocSize);
+    if (tmp == NULL) {
+      return TSDB_CODE_TDB_OUT_OF_MEMORY;
+    }
+
+    pQueryHandle->pDataBlockInfo = (STableBlockInfo*) tmp;
+  }
+
+  memset(pQueryHandle->pDataBlockInfo, 0, size);
+  *numOfAllocBlocks = numOfBlocks;
+
+  int32_t numOfTables = (int32_t)taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+
+  SBlockOrderSupporter sup = {0};
+  sup.numOfTables = numOfTables;
+  sup.numOfBlocksPerTable = calloc(1, sizeof(int32_t) * numOfTables);
+  sup.blockIndexArray = calloc(1, sizeof(int32_t) * numOfTables);
+  sup.pDataBlockInfo = calloc(1, POINTER_BYTES * numOfTables);
+
+  if (sup.numOfBlocksPerTable == NULL || sup.blockIndexArray == NULL || sup.pDataBlockInfo == NULL) {
+    cleanBlockOrderSupporter(&sup, 0);
+    return TSDB_CODE_TDB_OUT_OF_MEMORY;
+  }
+
+  int32_t cnt = 0;
+  int32_t numOfQualTables = 0;
+
+  for (int32_t j = 0; j < numOfTables; ++j) {
+    STableCheckInfo* pTableCheck = (STableCheckInfo*)taosArrayGet(pQueryHandle->pTableCheckInfo, j);
+    if (pTableCheck->numOfBlocks <= 0) {
+      continue;
+    }
+
+    SCompBlock* pBlock = pTableCheck->pCompInfo->blocks;
+    sup.numOfBlocksPerTable[numOfQualTables] = pTableCheck->numOfBlocks;
+
+    char* buf = calloc(1, sizeof(STableBlockInfo) * pTableCheck->numOfBlocks);
+    if (buf == NULL) {
+      cleanBlockOrderSupporter(&sup, numOfQualTables);
+      return TSDB_CODE_TDB_OUT_OF_MEMORY;
+    }
+
+    sup.pDataBlockInfo[numOfQualTables] = (STableBlockInfo*)buf;
+
+    for (int32_t k = 0; k < pTableCheck->numOfBlocks; ++k) {
+      STableBlockInfo* pBlockInfo = &sup.pDataBlockInfo[numOfQualTables][k];
+
+      pBlockInfo->compBlock = &pBlock[k];
+      pBlockInfo->pTableCheckInfo = pTableCheck;
+      cnt++;
+    }
+
+    numOfQualTables++;
+  }
+
+  assert(numOfBlocks == cnt);
+
+  // since there is only one table qualified, blocks are not sorted
+  if (numOfQualTables == 1) {
+    memcpy(pQueryHandle->pDataBlockInfo, sup.pDataBlockInfo[0], sizeof(STableBlockInfo) * numOfBlocks);
+    cleanBlockOrderSupporter(&sup, numOfQualTables);
+
+    tsdbDebug("%p create data blocks info struct completed for 1 table, %d blocks not sorted %p ", pQueryHandle, cnt,
+        pQueryHandle->qinfo);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  tsdbDebug("%p create data blocks info struct completed, %d blocks in %d tables %p", pQueryHandle, cnt,
+      numOfQualTables, pQueryHandle->qinfo);
+
+  assert(cnt <= numOfBlocks && numOfQualTables <= numOfTables);  // the pTableQueryInfo[j]->numOfBlocks may be 0
+  sup.numOfTables = numOfQualTables;
+
+  SLoserTreeInfo* pTree = NULL;
+  uint8_t ret = tLoserTreeCreate(&pTree, sup.numOfTables, &sup, dataBlockOrderCompar);
+  if (ret != TSDB_CODE_SUCCESS) {
+    cleanBlockOrderSupporter(&sup, numOfTables);
+    return TSDB_CODE_TDB_OUT_OF_MEMORY;
+  }
+
+  int32_t numOfTotal = 0;
+
+  while (numOfTotal < cnt) {
+    int32_t pos = pTree->pNode[0].index;
+    int32_t index = sup.blockIndexArray[pos]++;
+
+    STableBlockInfo* pBlocksInfo = sup.pDataBlockInfo[pos];
+    pQueryHandle->pDataBlockInfo[numOfTotal++] = pBlocksInfo[index];
+
+    // set data block index overflow, in order to disable the offset comparator
+    if (sup.blockIndexArray[pos] >= sup.numOfBlocksPerTable[pos]) {
+      sup.blockIndexArray[pos] = sup.numOfBlocksPerTable[pos] + 1;
+    }
+
+    tLoserTreeAdjust(pTree, pos + sup.numOfTables);
+  }
+
+  /*
+   * available when no import exists
+   * for(int32_t i = 0; i < cnt - 1; ++i) {
+   *   assert((*pDataBlockInfo)[i].compBlock->offset < (*pDataBlockInfo)[i+1].compBlock->offset);
+   * }
+   */
+
+  tsdbDebug("%p %d data blocks sort completed, %p", pQueryHandle, cnt, pQueryHandle->qinfo);
+  cleanBlockOrderSupporter(&sup, numOfTables);
+  free(pTree);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t getDataBlocksInFilesImpl(STsdbQueryHandle* pQueryHandle, bool* exists) {
+  pQueryHandle->numOfBlocks = 0;
+  SQueryFilePos* cur = &pQueryHandle->cur;
+
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  int32_t numOfBlocks = 0;
+  int32_t numOfTables = (int32_t)taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+
+  STsdbCfg* pCfg = &pQueryHandle->pTsdb->config;
+  STimeWindow win = TSWINDOW_INITIALIZER;
+
+  while (true) {
+    pthread_rwlock_rdlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+
+    if ((pQueryHandle->pFileGroup = tsdbGetFileGroupNext(&pQueryHandle->fileIter)) == NULL) {
+      pthread_rwlock_unlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+      break;
+    }
+
+    tsdbGetFidKeyRange(pCfg->daysPerFile, pCfg->precision, pQueryHandle->pFileGroup->fileId, &win.skey, &win.ekey);
+
+    // current file are not overlapped with query time window, ignore remain files
+    if ((ASCENDING_TRAVERSE(pQueryHandle->order) && win.skey > pQueryHandle->window.ekey) ||
+        (!ASCENDING_TRAVERSE(pQueryHandle->order) && win.ekey < pQueryHandle->window.ekey)) {
+      pthread_rwlock_unlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+      tsdbDebug("%p remain files are not qualified for qrange:%" PRId64 "-%" PRId64 ", ignore, %p", pQueryHandle,
+                pQueryHandle->window.skey, pQueryHandle->window.ekey, pQueryHandle->qinfo);
+      pQueryHandle->pFileGroup = NULL;
+      assert(pQueryHandle->numOfBlocks == 0);
+      break;
+    }
+
+    if (tsdbSetAndOpenHelperFile(&pQueryHandle->rhelper, pQueryHandle->pFileGroup) < 0) {
+      pthread_rwlock_unlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+      code = terrno;
+      break;
+    }
+
+    pthread_rwlock_unlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+
+    if (tsdbLoadCompIdx(&pQueryHandle->rhelper, NULL) < 0) {
+      code = terrno;
+      break;
+    }
+
+    if ((code = getFileCompInfo(pQueryHandle, &numOfBlocks)) != TSDB_CODE_SUCCESS) {
+      break;
+    }
+
+    tsdbDebug("%p %d blocks found in file for %d table(s), fid:%d, %p", pQueryHandle, numOfBlocks, numOfTables,
+              pQueryHandle->pFileGroup->fileId, pQueryHandle->qinfo);
+
+    assert(numOfBlocks >= 0);
+    if (numOfBlocks == 0) {
+      continue;
+    }
+
+    // todo return error code to query engine
+    if ((code = createDataBlocksInfo(pQueryHandle, numOfBlocks, &pQueryHandle->numOfBlocks)) != TSDB_CODE_SUCCESS) {
+      break;
+    }
+
+    assert(numOfBlocks >= pQueryHandle->numOfBlocks);
+    if (pQueryHandle->numOfBlocks > 0) {
+      break;
+    }
+  }
+
+  // no data in file anymore
+  if (pQueryHandle->numOfBlocks <= 0 || code != TSDB_CODE_SUCCESS) {
+    if (code == TSDB_CODE_SUCCESS) {
+      assert(pQueryHandle->pFileGroup == NULL);
+    }
+
+    cur->fid = -1;  // denote that there are no data in file anymore
+    *exists = false;
+    return code;
+  }
+
+  assert(pQueryHandle->pFileGroup != NULL && pQueryHandle->numOfBlocks > 0);
+  cur->slot = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:pQueryHandle->numOfBlocks-1;
+  cur->fid = pQueryHandle->pFileGroup->fileId;
+
+  STableBlockInfo* pBlockInfo = &pQueryHandle->pDataBlockInfo[cur->slot];
+  return loadFileDataBlock(pQueryHandle, pBlockInfo->compBlock, pBlockInfo->pTableCheckInfo, exists);
+}
+
+static int32_t getDataBlocksInFiles(STsdbQueryHandle* pQueryHandle, bool* exists) {
+  STsdbFileH*    pFileHandle = tsdbGetFile(pQueryHandle->pTsdb);
+  SQueryFilePos* cur = &pQueryHandle->cur;
+
+  // find the start data block in file
+  if (!pQueryHandle->locateStart) {
+    pQueryHandle->locateStart = true;
+    STsdbCfg* pCfg = &pQueryHandle->pTsdb->config;
+    int32_t fid = getFileIdFromKey(pQueryHandle->window.skey, pCfg->daysPerFile, pCfg->precision);
+
+    pthread_rwlock_rdlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+    tsdbInitFileGroupIter(pFileHandle, &pQueryHandle->fileIter, pQueryHandle->order);
+    tsdbSeekFileGroupIter(&pQueryHandle->fileIter, fid);
+    pthread_rwlock_unlock(&pQueryHandle->pTsdb->tsdbFileH->fhlock);
+
+    return getDataBlocksInFilesImpl(pQueryHandle, exists);
+  } else {
+    // check if current file block is all consumed
+    STableBlockInfo* pBlockInfo = &pQueryHandle->pDataBlockInfo[cur->slot];
+    STableCheckInfo* pCheckInfo = pBlockInfo->pTableCheckInfo;
+
+    // current block is done, try next
+    if ((!cur->mixBlock) || cur->blockCompleted) {
+      if ((cur->slot == pQueryHandle->numOfBlocks - 1 && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+          (cur->slot == 0 && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        // all data blocks in current file has been checked already, try next file if exists
+        return getDataBlocksInFilesImpl(pQueryHandle, exists);
+      } else {
+        // next block of the same file
+        int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order) ? 1 : -1;
+        cur->slot += step;
+
+        cur->mixBlock = false;
+        cur->blockCompleted = false;
+
+        STableBlockInfo* pNext = &pQueryHandle->pDataBlockInfo[cur->slot];
+        return loadFileDataBlock(pQueryHandle, pNext->compBlock, pNext->pTableCheckInfo, exists);
+      }
+    } else {
+      tsdbDebug("%p continue in current data block, index:%d, pos:%d, %p", pQueryHandle, cur->slot, cur->pos, pQueryHandle->qinfo);
+      int32_t code = handleDataMergeIfNeeded(pQueryHandle, pBlockInfo->compBlock, pCheckInfo);
+      *exists = pQueryHandle->realNumOfRows > 0;
+
+      return code;
+    }
+  }
+}
+
+static bool doHasDataInBuffer(STsdbQueryHandle* pQueryHandle) {
+  size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+  
+  while (pQueryHandle->activeIndex < numOfTables) {
+    if (hasMoreDataInCache(pQueryHandle)) {
+      return true;
+    }
+
+    pQueryHandle->activeIndex += 1;
+  }
+
+  return false;
+}
+
+static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) {
+  // filter the queried time stamp in the first place
+  STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle;
+  pQueryHandle->order = TSDB_ORDER_DESC;
+
+  assert(pQueryHandle->window.skey == pQueryHandle->window.ekey);
+
+  // starts from the buffer in case of descending timestamp order check data blocks
+  size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+
+  int32_t i = 0;
+  while(i < numOfTables) {
+    STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+
+    // the first qualified table for interpolation query
+    if (pQueryHandle->window.skey <= pCheckInfo->pTableObj->lastKey &&
+        pCheckInfo->pTableObj->lastKey != TSKEY_INITIAL_VAL) {
+      break;
+    }
+
+    i++;
+  }
+
+  // there are no data in all the tables
+  if (i == numOfTables) {
+    return;
+  }
+
+  STableCheckInfo info = *(STableCheckInfo*) taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+  taosArrayClear(pQueryHandle->pTableCheckInfo);
+
+  info.lastKey = pQueryHandle->window.skey;
+  taosArrayPush(pQueryHandle->pTableCheckInfo, &info);
+
+  // update the query time window according to the chosen last timestamp
+  pQueryHandle->window = (STimeWindow) {info.lastKey, TSKEY_INITIAL_VAL};
+}
+
+static int tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win,
+                                 STsdbQueryHandle* pQueryHandle) {
+  int     numOfRows = 0;
+  int32_t numOfCols = (int32_t)taosArrayGetSize(pQueryHandle->pColumns);
+  win->skey = TSKEY_INITIAL_VAL;
+
+  int64_t st = taosGetTimestampUs();
+  STable* pTable = pCheckInfo->pTableObj;
+
+  do {
+    SDataRow row = getSDataRowInTableMem(pCheckInfo, pQueryHandle->order);
+    if (row == NULL) {
+      break;
+    }
+
+    TSKEY key = dataRowKey(row);
+    if ((key > maxKey && ASCENDING_TRAVERSE(pQueryHandle->order)) || (key < maxKey && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+      tsdbDebug("%p key:%"PRIu64" beyond qrange:%"PRId64" - %"PRId64", no more data in buffer", pQueryHandle, key, pQueryHandle->window.skey,
+                pQueryHandle->window.ekey);
+
+      break;
+    }
+
+    if (win->skey == INT64_MIN) {
+      win->skey = key;
+    }
+
+    win->ekey = key;
+    copyOneRowFromMem(pQueryHandle, maxRowsToRead, numOfRows, row, numOfCols, pTable);
+
+    if (++numOfRows >= maxRowsToRead) {
+      moveToNextRowInMem(pCheckInfo);
+      break;
+    }
+
+  } while(moveToNextRowInMem(pCheckInfo));
+
+  assert(numOfRows <= maxRowsToRead);
+
+  // if the buffer is not full in case of descending order query, move the data in the front of the buffer
+  if (!ASCENDING_TRAVERSE(pQueryHandle->order) && numOfRows < maxRowsToRead) {
+    int32_t emptySize = maxRowsToRead - numOfRows;
+
+    for(int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+      memmove((char*)pColInfo->pData, (char*)pColInfo->pData + emptySize * pColInfo->info.bytes, numOfRows * pColInfo->info.bytes);
+    }
+  }
+
+  int64_t elapsedTime = taosGetTimestampUs() - st;
+  tsdbDebug("%p build data block from cache completed, elapsed time:%"PRId64" us, numOfRows:%d, numOfCols:%d, %p", pQueryHandle,
+            elapsedTime, numOfRows, numOfCols, pQueryHandle->qinfo);
+
+  return numOfRows;
+}
+
+static int32_t getAllTableList(STable* pSuperTable, SArray* list) {
+  SSkipListIterator* iter = tSkipListCreateIter(pSuperTable->pIndex);
+  while (tSkipListIterNext(iter)) {
+    SSkipListNode* pNode = tSkipListIterGet(iter);
+
+    STable** pTable = (STable**) SL_GET_NODE_DATA((SSkipListNode*) pNode);
+
+    STableKeyInfo info = {.pTable = *pTable, .lastKey = TSKEY_INITIAL_VAL};
+    taosArrayPush(list, &info);
+  }
+
+  tSkipListDestroyIter(iter);
+  return TSDB_CODE_SUCCESS;
+}
+
+static void destroyHelper(void* param) {
+  if (param == NULL) {
+    return;
+  }
+
+
+  tQueryInfo* pInfo = (tQueryInfo*)param;
+  if (pInfo->optr != TSDB_RELATION_IN) {
+    taosTFree(pInfo->q);
+  }
+
+  free(param);
+}
+
+// handle data in cache situation
+bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) {
+  STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle;
+
+  int64_t stime = taosGetTimestampUs();
+  int64_t elapsedTime = stime;
+
+  size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+  assert(numOfTables > 0);
+
+  SDataBlockInfo blockInfo = {{0}, 0};
+  if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) {
+    pQueryHandle->type = TSDB_QUERY_TYPE_ALL;
+    pQueryHandle->order = TSDB_ORDER_DESC;
+
+    if (!tsdbNextDataBlock(pHandle)) {
+      return false;
+    }
+
+    tsdbRetrieveDataBlockInfo(pHandle, &blockInfo);
+    /*SArray *pDataBlock = */tsdbRetrieveDataBlock(pHandle, pQueryHandle->defaultLoadColumn);
+    if (terrno != TSDB_CODE_SUCCESS) {
+      return false;
+    }
+
+    if (pQueryHandle->cur.win.ekey == pQueryHandle->window.skey) {
+      // data already retrieve, discard other data rows and return
+      int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle));
+      for (int32_t i = 0; i < numOfCols; ++i) {
+        SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i);
+        memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), pCol->info.bytes);
+      }
+
+      pQueryHandle->cur.win  = (STimeWindow){pQueryHandle->window.skey, pQueryHandle->window.skey};
+      pQueryHandle->window   = pQueryHandle->cur.win;
+      pQueryHandle->cur.rows = 1;
+      pQueryHandle->type = TSDB_QUERY_TYPE_ALL;
+      return true;
+    } else {
+      STsdbQueryHandle* pSecQueryHandle = calloc(1, sizeof(STsdbQueryHandle));
+      if (pSecQueryHandle == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        return false;
+      }
+
+      pSecQueryHandle->order       = TSDB_ORDER_ASC;
+      pSecQueryHandle->window      = (STimeWindow) {pQueryHandle->window.skey, INT64_MAX};
+      pSecQueryHandle->pTsdb       = pQueryHandle->pTsdb;
+      pSecQueryHandle->type        = TSDB_QUERY_TYPE_ALL;
+      pSecQueryHandle->cur.fid     = -1;
+      pSecQueryHandle->cur.win     = TSWINDOW_INITIALIZER;
+      pSecQueryHandle->checkFiles  = true;
+      pSecQueryHandle->activeIndex = 0;
+      pSecQueryHandle->outputCapacity = ((STsdbRepo*)pSecQueryHandle->pTsdb)->config.maxRowsPerFileBlock;
+
+      if (tsdbInitReadHelper(&pSecQueryHandle->rhelper, (STsdbRepo*) pSecQueryHandle->pTsdb) != 0) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        free(pSecQueryHandle);
+        return false;
+      }
+
+      tsdbTakeMemSnapshot(pSecQueryHandle->pTsdb, &pSecQueryHandle->mem, &pSecQueryHandle->imem);
+
+      // allocate buffer in order to load data blocks from file
+      int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle));
+
+      pSecQueryHandle->statis = calloc(numOfCols, sizeof(SDataStatis));
+      pSecQueryHandle->pColumns = taosArrayInit(numOfCols, sizeof(SColumnInfoData));
+      if (pSecQueryHandle->statis == NULL || pSecQueryHandle->pColumns == NULL) {
+        terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+        tsdbCleanupQueryHandle(pSecQueryHandle);
+        return false;
+      }
+
+      for (int32_t i = 0; i < numOfCols; ++i) {
+        SColumnInfoData colInfo = {{0}, 0};
+        SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i);
+
+        colInfo.info = pCol->info;
+        colInfo.pData = calloc(1, EXTRA_BYTES + pQueryHandle->outputCapacity * pCol->info.bytes);
+        if (colInfo.pData == NULL) {
+          terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+          tsdbCleanupQueryHandle(pSecQueryHandle);
+          return false;
+        }
+
+        taosArrayPush(pSecQueryHandle->pColumns, &colInfo);
+      }
+
+      size_t si = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+      pSecQueryHandle->pTableCheckInfo = taosArrayInit(si, sizeof(STableCheckInfo));
+      STsdbMeta* pMeta = tsdbGetMeta(pQueryHandle->pTsdb);
+      assert(pMeta != NULL);
+
+      for (int32_t j = 0; j < si; ++j) {
+        STableCheckInfo* pCheckInfo = (STableCheckInfo*) taosArrayGet(pQueryHandle->pTableCheckInfo, j);
+        STableCheckInfo info = {
+            .lastKey = pSecQueryHandle->window.skey,
+            .pTableObj = pCheckInfo->pTableObj,
+        };
+
+        info.tableId = pCheckInfo->tableId;
+
+        taosArrayPush(pSecQueryHandle->pTableCheckInfo, &info);
+      }
+
+      tsdbInitDataBlockLoadInfo(&pSecQueryHandle->dataBlockLoadInfo);
+      tsdbInitCompBlockLoadInfo(&pSecQueryHandle->compBlockLoadInfo);
+      pSecQueryHandle->defaultLoadColumn = taosArrayClone(pQueryHandle->defaultLoadColumn);
+
+      if (!tsdbNextDataBlock((void*) pSecQueryHandle)) {
+        tsdbCleanupQueryHandle(pSecQueryHandle);
+        return false;
+      }
+
+      tsdbRetrieveDataBlockInfo((void*) pSecQueryHandle, &blockInfo);
+      tsdbRetrieveDataBlock((void*) pSecQueryHandle, pSecQueryHandle->defaultLoadColumn);
+
+      for (int32_t i = 0; i < numOfCols; ++i) {
+        SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i);
+        memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), pCol->info.bytes);
+
+        SColumnInfoData* pCol1 = taosArrayGet(pSecQueryHandle->pColumns, i);
+        assert(pCol->info.colId == pCol1->info.colId);
+
+        memcpy((char*)pCol->pData + pCol->info.bytes, pCol1->pData, pCol1->info.bytes);
+      }
+
+      SColumnInfoData* pTSCol = taosArrayGet(pQueryHandle->pColumns, 0);
+
+      // it is ascending order
+      pQueryHandle->cur.win  = (STimeWindow){((TSKEY*)pTSCol->pData)[0], ((TSKEY*)pTSCol->pData)[1]};
+      pQueryHandle->window   = pQueryHandle->cur.win;
+      pQueryHandle->cur.rows = 2;
+      pQueryHandle->cur.mixBlock = true;
+      pQueryHandle->order = TSDB_ORDER_DESC;
+
+      int32_t step = -1;// one step for ascending order traverse
+      for (int32_t j = 0; j < si; ++j) {
+        STableCheckInfo* pCheckInfo = (STableCheckInfo*) taosArrayGet(pQueryHandle->pTableCheckInfo, j);
+        pCheckInfo->lastKey = pQueryHandle->cur.win.ekey + step;
+      }
+
+      tsdbCleanupQueryHandle(pSecQueryHandle);
+    }
+
+    //disable it after retrieve data
+    pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL;
+    pQueryHandle->checkFiles = false;
+    return true;
+  }
+
+  if (pQueryHandle->checkFiles) {
+    // check if the query range overlaps with the file data block
+    bool exists = true;
+
+    int32_t code = getDataBlocksInFiles(pQueryHandle, &exists);
+    if (code != TSDB_CODE_SUCCESS) {
+      pQueryHandle->activeIndex = 0;
+      pQueryHandle->checkFiles = false;
+
+      return false;
+    }
+
+    if (exists) {
+      pQueryHandle->cost.checkForNextTime += (taosGetTimestampUs() - stime);
+      return exists;
+    }
+
+    pQueryHandle->activeIndex = 0;
+    pQueryHandle->checkFiles = false;
+  }
+
+  // TODO: opt by consider the scan order
+  bool ret = doHasDataInBuffer(pQueryHandle);
+  terrno = TSDB_CODE_SUCCESS;
+
+  elapsedTime = taosGetTimestampUs() - stime;
+  pQueryHandle->cost.checkForNextTime += elapsedTime;
+  return ret;
+}
+
+STimeWindow changeTableGroupByLastrow(STableGroupInfo *groupList) {
+  STimeWindow window = {INT64_MAX, INT64_MIN};
+
+  int32_t totalNumOfTable = 0;
+
+  // NOTE: starts from the buffer in case of descending timestamp order check data blocks
+  size_t numOfGroups = taosArrayGetSize(groupList->pGroupList);
+  for(int32_t j = 0; j < numOfGroups; ++j) {
+    SArray* pGroup = taosArrayGetP(groupList->pGroupList, j);
+    TSKEY   key = TSKEY_INITIAL_VAL;
+
+    STableKeyInfo keyInfo = {0};
+
+    size_t numOfTables = taosArrayGetSize(pGroup);
+    for(int32_t i = 0; i < numOfTables; ++i) {
+      STableKeyInfo* pKeyInfo = (STableKeyInfo*) taosArrayGet(pGroup, i);
+
+      // if the lastKey equals to INT64_MIN, there is no data in this table
+      TSKEY lastKey = ((STable*)(pKeyInfo->pTable))->lastKey;
+      if (key < lastKey) {
+        key = lastKey;
+
+        keyInfo.pTable  = pKeyInfo->pTable;
+        keyInfo.lastKey = key;
+        pKeyInfo->lastKey = key;
+
+        if (key < window.skey) {
+          window.skey = key;
+        }
+
+        if (key > window.ekey) {
+          window.ekey = key;
+        }
+      }
+    }
+
+    // clear current group
+    taosArrayClear(pGroup);
+
+    // more than one table in each group, only one table left for each group
+    if (keyInfo.pTable != NULL) {
+      totalNumOfTable++;
+      taosArrayPush(pGroup, &keyInfo);
+    } else {
+      taosArrayDestroy(pGroup);
+
+      taosArrayRemove(groupList->pGroupList, j);
+      numOfGroups -= 1;
+      j -= 1;
+    }
+  }
+
+  // window does not being updated, so set the original
+  if (window.skey == INT64_MAX && window.ekey == INT64_MIN) {
+    window = TSWINDOW_INITIALIZER;
+    assert(totalNumOfTable == 0 && taosArrayGetSize(groupList->pGroupList) == 0);
+  }
+
+  groupList->numOfTables = totalNumOfTable;
+  return window;
+}
+
+void tsdbRetrieveDataBlockInfo(TsdbQueryHandleT* pQueryHandle, SDataBlockInfo* pDataBlockInfo) {
+  STsdbQueryHandle* pHandle = (STsdbQueryHandle*)pQueryHandle;
+  SQueryFilePos* cur = &pHandle->cur;
+  STable* pTable = NULL;
+
+  // there are data in file
+  if (pHandle->cur.fid >= 0) {
+    STableBlockInfo* pBlockInfo = &pHandle->pDataBlockInfo[cur->slot];
+    pTable = pBlockInfo->pTableCheckInfo->pTableObj;
+  } else {
+    STableCheckInfo* pCheckInfo = taosArrayGet(pHandle->pTableCheckInfo, pHandle->activeIndex);
+    pTable = pCheckInfo->pTableObj;
+  }
+
+  pDataBlockInfo->uid = pTable->tableId.uid;
+  pDataBlockInfo->tid = pTable->tableId.tid;
+  pDataBlockInfo->rows = cur->rows;
+  pDataBlockInfo->window = cur->win;
+  pDataBlockInfo->numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pHandle));
+}
+
+/*
+ * return null for mixed data block, if not a complete file data block, the statistics value will always return NULL
+ */
+int32_t tsdbRetrieveDataBlockStatisInfo(TsdbQueryHandleT* pQueryHandle, SDataStatis** pBlockStatis) {
+  STsdbQueryHandle* pHandle = (STsdbQueryHandle*) pQueryHandle;
+
+  SQueryFilePos* c = &pHandle->cur;
+  if (c->mixBlock) {
+    *pBlockStatis = NULL;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  STableBlockInfo* pBlockInfo = &pHandle->pDataBlockInfo[c->slot];
+  assert((c->slot >= 0 && c->slot < pHandle->numOfBlocks) || ((c->slot == pHandle->numOfBlocks) && (c->slot == 0)));
+
+  // file block with sub-blocks has no statistics data
+  if (pBlockInfo->compBlock->numOfSubBlocks > 1) {
+    *pBlockStatis = NULL;
+    return TSDB_CODE_SUCCESS;
+  }
+
+  int64_t stime = taosGetTimestampUs();
+  tsdbLoadCompData(&pHandle->rhelper, pBlockInfo->compBlock, NULL);
+
+  int16_t* colIds = pHandle->defaultLoadColumn->pData;
+
+  size_t numOfCols = QH_GET_NUM_OF_COLS(pHandle);
+  memset(pHandle->statis, 0, numOfCols * sizeof(SDataStatis));
+  for(int32_t i = 0; i < numOfCols; ++i) {
+    pHandle->statis[i].colId = colIds[i];
+  }
+
+  tsdbGetDataStatis(&pHandle->rhelper, pHandle->statis, (int)numOfCols);
+
+  // always load the first primary timestamp column data
+  SDataStatis* pPrimaryColStatis = &pHandle->statis[0];
+  assert(pPrimaryColStatis->colId == PRIMARYKEY_TIMESTAMP_COL_INDEX);
+
+  pPrimaryColStatis->numOfNull = 0;
+  pPrimaryColStatis->min = pBlockInfo->compBlock->keyFirst;
+  pPrimaryColStatis->max = pBlockInfo->compBlock->keyLast;
+
+  //update the number of NULL data rows
+  for(int32_t i = 1; i < numOfCols; ++i) {
+    if (pHandle->statis[i].numOfNull == -1) { // set the column data are all NULL
+      pHandle->statis[i].numOfNull = pBlockInfo->compBlock->numOfRows;
+    }
+
+    SColumnInfo* pColInfo = taosArrayGet(pHandle->pColumns, i);
+    if (pColInfo->type == TSDB_DATA_TYPE_TIMESTAMP) {
+      pHandle->statis[i].min = pBlockInfo->compBlock->keyFirst;
+      pHandle->statis[i].max = pBlockInfo->compBlock->keyLast;
+    }
+  }
+
+  int64_t elapsed = taosGetTimestampUs() - stime;
+  pHandle->cost.statisInfoLoadTime += elapsed;
+
+  *pBlockStatis = pHandle->statis;
+  return TSDB_CODE_SUCCESS;
+}
+
+SArray* tsdbRetrieveDataBlock(TsdbQueryHandleT* pQueryHandle, SArray* pIdList) {
+  /**
+   * In the following two cases, the data has been loaded to SColumnInfoData.
+   * 1. data is from cache, 2. data block is not completed qualified to query time range
+   */
+  STsdbQueryHandle* pHandle = (STsdbQueryHandle*)pQueryHandle;
+
+  if (pHandle->cur.fid < 0) {
+    return pHandle->pColumns;
+  } else {
+    STableBlockInfo* pBlockInfo = &pHandle->pDataBlockInfo[pHandle->cur.slot];
+    STableCheckInfo* pCheckInfo = pBlockInfo->pTableCheckInfo;
+
+    if (pHandle->cur.mixBlock) {
+      return pHandle->pColumns;
+    } else {
+      SDataBlockInfo binfo = GET_FILE_DATA_BLOCK_INFO(pCheckInfo, pBlockInfo->compBlock);
+      assert(pHandle->realNumOfRows <= binfo.rows);
+
+      // data block has been loaded, todo extract method
+      SDataBlockLoadInfo* pBlockLoadInfo = &pHandle->dataBlockLoadInfo;
+
+      if (pBlockLoadInfo->slot == pHandle->cur.slot && pBlockLoadInfo->fileGroup->fileId == pHandle->cur.fid &&
+          pBlockLoadInfo->tid == pCheckInfo->pTableObj->tableId.tid) {
+        return pHandle->pColumns;
+      } else {  // only load the file block
+        SCompBlock* pBlock = pBlockInfo->compBlock;
+        if (doLoadFileDataBlock(pHandle, pBlock, pCheckInfo, pHandle->cur.slot) != TSDB_CODE_SUCCESS) {
+          return NULL;
+        }
+
+        // todo refactor
+        int32_t numOfRows = doCopyRowsFromFileBlock(pHandle, pHandle->outputCapacity, 0, 0, pBlock->numOfRows - 1);
+
+        // if the buffer is not full in case of descending order query, move the data in the front of the buffer
+        if (!ASCENDING_TRAVERSE(pHandle->order) && numOfRows < pHandle->outputCapacity) {
+          int32_t emptySize = pHandle->outputCapacity - numOfRows;
+          int32_t reqNumOfCols = (int32_t)taosArrayGetSize(pHandle->pColumns);
+
+          for(int32_t i = 0; i < reqNumOfCols; ++i) {
+            SColumnInfoData* pColInfo = taosArrayGet(pHandle->pColumns, i);
+            memmove((char*)pColInfo->pData, (char*)pColInfo->pData + emptySize * pColInfo->info.bytes, numOfRows * pColInfo->info.bytes);
+          }
+        }
+
+        return pHandle->pColumns;
+      }
+    }
+  }
+}
+
+void filterPrepare(void* expr, void* param) {
+  tExprNode* pExpr = (tExprNode*)expr;
+  if (pExpr->_node.info != NULL) {
+    return;
+  }
+
+  pExpr->_node.info = calloc(1, sizeof(tQueryInfo));
+
+  STSchema*   pTSSchema = (STSchema*) param;
+  tQueryInfo* pInfo = pExpr->_node.info;
+  tVariant*   pCond = pExpr->_node.pRight->pVal;
+  SSchema*    pSchema = pExpr->_node.pLeft->pSchema;
+
+  pInfo->sch      = *pSchema;
+  pInfo->optr     = pExpr->_node.optr;
+  pInfo->compare  = getComparFunc(pSchema->type, pInfo->optr);
+  pInfo->indexed  = pTSSchema->columns->colId == pInfo->sch.colId;
+
+  if (pInfo->optr == TSDB_RELATION_IN) {
+    pInfo->q = (char*) pCond->arr;
+  } else {
+    pInfo->q = calloc(1, pSchema->bytes);
+    tVariantDump(pCond, pInfo->q, pSchema->type, true);
+  }
+}
+
+static int32_t tableGroupComparFn(const void *p1, const void *p2, const void *param) {
+  STableGroupSupporter* pTableGroupSupp = (STableGroupSupporter*) param;
+  STable* pTable1 = ((STableKeyInfo*) p1)->pTable;
+  STable* pTable2 = ((STableKeyInfo*) p2)->pTable;
+
+  for (int32_t i = 0; i < pTableGroupSupp->numOfCols; ++i) {
+    SColIndex* pColIndex = &pTableGroupSupp->pCols[i];
+    int32_t colIndex = pColIndex->colIndex;
+
+    assert(colIndex >= TSDB_TBNAME_COLUMN_INDEX);
+
+    char *  f1 = NULL;
+    char *  f2 = NULL;
+    int32_t type = 0;
+    int32_t bytes = 0;
+
+    if (colIndex == TSDB_TBNAME_COLUMN_INDEX) {
+      f1 = (char*) TABLE_NAME(pTable1);
+      f2 = (char*) TABLE_NAME(pTable2);
+      type = TSDB_DATA_TYPE_BINARY;
+      bytes = tGetTableNameColumnSchema().bytes;
+    } else {
+      STColumn* pCol = schemaColAt(pTableGroupSupp->pTagSchema, colIndex);
+      bytes = pCol->bytes;
+      type = pCol->type;
+      f1 = tdGetKVRowValOfCol(pTable1->tagVal, pCol->colId);
+      f2 = tdGetKVRowValOfCol(pTable2->tagVal, pCol->colId);
+    }
+
+    // this tags value may be NULL
+    if (f1 == NULL && f2 == NULL) {
+      continue;
+    }
+
+    if (f1 == NULL) {
+      return -1;
+    }
+
+    if (f2 == NULL) {
+      return 1;
+    }
+
+    int32_t ret = doCompare(f1, f2, type, bytes);
+    if (ret == 0) {
+      continue;
+    } else {
+      return ret;
+    }
+  }
+
+  return 0;
+}
+
+static int tsdbCheckInfoCompar(const void* key1, const void* key2) {
+  if (((STableCheckInfo*)key1)->tableId.tid < ((STableCheckInfo*)key2)->tableId.tid) {
+    return -1;
+  } else if (((STableCheckInfo*)key1)->tableId.tid > ((STableCheckInfo*)key2)->tableId.tid) {
+    return 1;
+  } else {
+    ASSERT(false);
+    return 0;
+  }
+}
+
+void createTableGroupImpl(SArray* pGroups, SArray* pTableList, size_t numOfTables, TSKEY skey,
+                          STableGroupSupporter* pSupp, __ext_compar_fn_t compareFn) {
+  STable* pTable = taosArrayGetP(pTableList, 0);
+
+  SArray* g = taosArrayInit(16, sizeof(STableKeyInfo));
+
+  STableKeyInfo info = {.pTable = pTable, .lastKey = skey};
+  taosArrayPush(g, &info);
+  tsdbRefTable(pTable);
+
+  for (int32_t i = 1; i < numOfTables; ++i) {
+    STable** prev = taosArrayGet(pTableList, i - 1);
+    STable** p = taosArrayGet(pTableList, i);
+
+    int32_t ret = compareFn(prev, p, pSupp);
+    assert(ret == 0 || ret == -1);
+
+    tsdbRefTable(*p);
+    assert((*p)->type == TSDB_CHILD_TABLE);
+
+    if (ret == 0) {
+      STableKeyInfo info1 = {.pTable = *p, .lastKey = skey};
+      taosArrayPush(g, &info1);
+    } else {
+      taosArrayPush(pGroups, &g);  // current group is ended, start a new group
+      g = taosArrayInit(16, sizeof(STableKeyInfo));
+
+      STableKeyInfo info1 = {.pTable = *p, .lastKey = skey};
+      taosArrayPush(g, &info1);
+    }
+  }
+
+  taosArrayPush(pGroups, &g);
+}
+
+SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pCols, int32_t numOfOrderCols, TSKEY skey) {
+  assert(pTableList != NULL);
+  SArray* pTableGroup = taosArrayInit(1, POINTER_BYTES);
+
+  size_t size = taosArrayGetSize(pTableList);
+  if (size == 0) {
+    tsdbDebug("no qualified tables");
+    return pTableGroup;
+  }
+
+  if (numOfOrderCols == 0 || size == 1) { // no group by tags clause or only one table
+    SArray* sa = taosArrayInit(size, sizeof(STableKeyInfo));
+    if (sa == NULL) {
+      taosArrayDestroy(pTableGroup);
+      return NULL;
+    }
+
+    for(int32_t i = 0; i < size; ++i) {
+      STableKeyInfo *pKeyInfo = taosArrayGet(pTableList, i);
+      assert(((STable*)pKeyInfo->pTable)->type == TSDB_CHILD_TABLE);
+
+      tsdbRefTable(pKeyInfo->pTable);
+
+      STableKeyInfo info = {.pTable = pKeyInfo->pTable, .lastKey = skey};
+      taosArrayPush(sa, &info);
+    }
+
+    taosArrayPush(pTableGroup, &sa);
+    tsdbDebug("all %" PRIzu " tables belong to one group", size);
+  } else {
+    STableGroupSupporter sup = {0};
+    sup.numOfCols = numOfOrderCols;
+    sup.pTagSchema = pTagSchema;
+    sup.pCols = pCols;
+
+    taosqsort(pTableList->pData, size, sizeof(STableKeyInfo), &sup, tableGroupComparFn);
+    createTableGroupImpl(pTableGroup, pTableList, size, skey, &sup, tableGroupComparFn);
+  }
+
+  return pTableGroup;
+}
+
+static bool indexedNodeFilterFp(const void* pNode, void* param) {
+  tQueryInfo* pInfo = (tQueryInfo*) param;
+
+  STable* pTable = *(STable**)(SL_GET_NODE_DATA((SSkipListNode*)pNode));
+
+  char*  val = NULL;
+
+  if (pInfo->sch.colId == TSDB_TBNAME_COLUMN_INDEX) {
+    val = (char*) TABLE_NAME(pTable);
+  } else {
+    val = tdGetKVRowValOfCol(pTable->tagVal, pInfo->sch.colId);
+  }
+
+  if (pInfo->optr == TSDB_RELATION_ISNULL || pInfo->optr == TSDB_RELATION_NOTNULL) {
+    if (pInfo->optr == TSDB_RELATION_ISNULL) {
+      return (val == NULL) || isNull(val, pInfo->sch.type);
+    } else if (pInfo->optr == TSDB_RELATION_NOTNULL) {
+      return (val != NULL) && (!isNull(val, pInfo->sch.type));
+    }
+  }
+
+  int32_t ret = 0;
+  if (val == NULL) { //the val is possible to be null, so check it out carefully
+    ret = -1; // val is missing in table tags value pairs
+  } else {
+    ret = pInfo->compare(val, pInfo->q);
+  }
+
+  switch (pInfo->optr) {
+    case TSDB_RELATION_EQUAL: {
+      return ret == 0;
+    }
+    case TSDB_RELATION_NOT_EQUAL: {
+      return ret != 0;
+    }
+    case TSDB_RELATION_GREATER_EQUAL: {
+      return ret >= 0;
+    }
+    case TSDB_RELATION_GREATER: {
+      return ret > 0;
+    }
+    case TSDB_RELATION_LESS_EQUAL: {
+      return ret <= 0;
+    }
+    case TSDB_RELATION_LESS: {
+      return ret < 0;
+    }
+    case TSDB_RELATION_LIKE: {
+      return ret == 0;
+    }
+    case TSDB_RELATION_IN: {
+      return ret == 1;
+    }
+
+    default:
+      assert(false);
+  }
+
+  return true;
+}
+
+static int32_t doQueryTableList(STable* pSTable, SArray* pRes, tExprNode* pExpr) {
+  // query according to the expression tree
+  SExprTraverseSupp supp = {
+      .nodeFilterFn = (__result_filter_fn_t) indexedNodeFilterFp,
+      .setupInfoFn = filterPrepare,
+      .pExtInfo = pSTable->tagSchema,
+      };
+
+  tExprTreeTraverse(pExpr, pSTable->pIndex, pRes, &supp);
+  tExprTreeDestroy(&pExpr, destroyHelper);
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, const char* pTagCond, size_t len,
+                                 int16_t tagNameRelType, const char* tbnameCond, STableGroupInfo* pGroupInfo,
+                                 SColIndex* pColIndex, int32_t numOfCols) {
+  if (tsdbRLockRepoMeta(tsdb) < 0) goto _error;
+
+  STable* pTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
+  if (pTable == NULL) {
+    tsdbError("%p failed to get stable, uid:%" PRIu64, tsdb, uid);
+    terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+    tsdbUnlockRepoMeta(tsdb);
+
+    goto _error;
+  }
+
+  if (pTable->type != TSDB_SUPER_TABLE) {
+    tsdbError("%p query normal tag not allowed, uid:%" PRIu64 ", tid:%d, name:%s", tsdb, uid, pTable->tableId.tid,
+        pTable->name->data);
+    terrno = TSDB_CODE_COM_OPS_NOT_SUPPORT; //basically, this error is caused by invalid sql issued by client
+
+    tsdbUnlockRepoMeta(tsdb);
+    goto _error;
+  }
+
+  //NOTE: not add ref count for super table
+  SArray* res = taosArrayInit(8, sizeof(STableKeyInfo));
+  STSchema* pTagSchema = tsdbGetTableTagSchema(pTable);
+
+  // no tags and tbname condition, all child tables of this stable are involved
+  if (tbnameCond == NULL && (pTagCond == NULL || len == 0)) {
+    int32_t ret = getAllTableList(pTable, res);
+    if (ret != TSDB_CODE_SUCCESS) {
+      tsdbUnlockRepoMeta(tsdb);
+      goto _error;
+    }
+
+    pGroupInfo->numOfTables = taosArrayGetSize(res);
+    pGroupInfo->pGroupList  = createTableGroup(res, pTagSchema, pColIndex, numOfCols, skey);
+
+    tsdbDebug("%p no table name/tag condition, all tables belong to one group, numOfTables:%" PRIzu "", tsdb, pGroupInfo->numOfTables);
+    taosArrayDestroy(res);
+
+    if (tsdbUnlockRepoMeta(tsdb) < 0) goto _error;
+    return ret;
+  }
+
+  int32_t ret = TSDB_CODE_SUCCESS;
+  tExprNode* expr = NULL;
+
+  TRY(TSDB_MAX_TAG_CONDITIONS) {
+    expr = exprTreeFromTableName(tbnameCond);
+    if (expr == NULL) {
+      expr = exprTreeFromBinary(pTagCond, len);
+    } else {
+      CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, expr, NULL);
+      tExprNode* tagExpr = exprTreeFromBinary(pTagCond, len);
+      if (tagExpr != NULL) {
+        CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, tagExpr, NULL);
+        tExprNode* tbnameExpr = expr;
+        expr = calloc(1, sizeof(tExprNode));
+        if (expr == NULL) {
+          THROW( TSDB_CODE_TDB_OUT_OF_MEMORY );
+        }
+        expr->nodeType = TSQL_NODE_EXPR;
+        expr->_node.optr = (uint8_t)tagNameRelType;
+        expr->_node.pLeft = tagExpr;
+        expr->_node.pRight = tbnameExpr;
+      }
+    }
+    CLEANUP_EXECUTE();
+
+  } CATCH( code ) {
+    CLEANUP_EXECUTE();
+    terrno = code;
+    tsdbUnlockRepoMeta(tsdb);     // unlock tsdb in any cases
+
+    goto _error;
+    // TODO: more error handling
+  } END_TRY
+
+  doQueryTableList(pTable, res, expr);
+  pGroupInfo->numOfTables = taosArrayGetSize(res);
+  pGroupInfo->pGroupList  = createTableGroup(res, pTagSchema, pColIndex, numOfCols, skey);
+
+  tsdbDebug("%p stable tid:%d, uid:%"PRIu64" query, numOfTables:%" PRIzu ", belong to %" PRIzu " groups", tsdb, pTable->tableId.tid,
+      pTable->tableId.uid, pGroupInfo->numOfTables, taosArrayGetSize(pGroupInfo->pGroupList));
+
+  taosArrayDestroy(res);
+
+  if (tsdbUnlockRepoMeta(tsdb) < 0) goto _error;
+  return ret;
+
+  _error:
+  return terrno;
+}
+
+int32_t tsdbGetOneTableGroup(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY startKey, STableGroupInfo* pGroupInfo) {
+  if (tsdbRLockRepoMeta(tsdb) < 0) goto _error;
+
+  STable* pTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
+  if (pTable == NULL) {
+    terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
+    tsdbUnlockRepoMeta(tsdb);
+    goto _error;
+  }
+
+  assert(pTable->type == TSDB_CHILD_TABLE || pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_STREAM_TABLE);
+  tsdbRefTable(pTable);
+  if (tsdbUnlockRepoMeta(tsdb) < 0) goto _error;
+
+  pGroupInfo->numOfTables = 1;
+  pGroupInfo->pGroupList = taosArrayInit(1, POINTER_BYTES);
+
+  SArray* group = taosArrayInit(1, sizeof(STableKeyInfo));
+
+  STableKeyInfo info = {.pTable = pTable, .lastKey = startKey};
+  taosArrayPush(group, &info);
+
+  taosArrayPush(pGroupInfo->pGroupList, &group);
+
+  return TSDB_CODE_SUCCESS;
+
+  _error:
+  return terrno;
+}
+
+int32_t tsdbGetTableGroupFromIdList(TSDB_REPO_T* tsdb, SArray* pTableIdList, STableGroupInfo* pGroupInfo) {
+  if (tsdbRLockRepoMeta(tsdb) < 0) {
+    return terrno;
+  }
+
+  assert(pTableIdList != NULL);
+  size_t size = taosArrayGetSize(pTableIdList);
+  pGroupInfo->pGroupList = taosArrayInit(1, POINTER_BYTES);
+  SArray* group = taosArrayInit(1, sizeof(STableKeyInfo));
+
+  int32_t i = 0;
+  for(; i < size; ++i) {
+    STableIdInfo *id = taosArrayGet(pTableIdList, i);
+
+    STable* pTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), id->uid);
+    if (pTable == NULL) {
+      tsdbWarn("table uid:%"PRIu64", tid:%d has been drop already", id->uid, id->tid);
+      continue;
+    }
+
+    if (pTable->type == TSDB_SUPER_TABLE) {
+      tsdbError("direct query on super tale is not allowed, table uid:%"PRIu64", tid:%d", id->uid, id->tid);
+      terrno = TSDB_CODE_QRY_INVALID_MSG;
+    }
+
+    tsdbRefTable(pTable);
+
+    STableKeyInfo info = {.pTable = pTable, .lastKey = id->key};
+    taosArrayPush(group, &info);
+  }
+
+  if (tsdbUnlockRepoMeta(tsdb) < 0) {
+    taosArrayDestroy(group);
+    return terrno;
+  }
+
+  pGroupInfo->numOfTables = i;
+  taosArrayPush(pGroupInfo->pGroupList, &group);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle) {
+  STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*)queryHandle;
+  if (pQueryHandle == NULL) {
+    return;
+  }
+  
+  if (pQueryHandle->pTableCheckInfo != NULL) {
+    size_t size = taosArrayGetSize(pQueryHandle->pTableCheckInfo);
+    for (int32_t i = 0; i < size; ++i) {
+      STableCheckInfo* pTableCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i);
+      destroyTableMemIterator(pTableCheckInfo);
+
+      tdFreeDataCols(pTableCheckInfo->pDataCols);
+      pTableCheckInfo->pDataCols = NULL;
+      taosTFree(pTableCheckInfo->pCompInfo);
+    }
+    taosArrayDestroy(pQueryHandle->pTableCheckInfo);
+  }
+
+  if (pQueryHandle->pColumns != NULL) {
+    size_t cols = taosArrayGetSize(pQueryHandle->pColumns);
+    for (int32_t i = 0; i < cols; ++i) {
+      SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i);
+      taosTFree(pColInfo->pData);
+    }
+    taosArrayDestroy(pQueryHandle->pColumns);
+  }
+
+  taosArrayDestroy(pQueryHandle->defaultLoadColumn);
+  taosTFree(pQueryHandle->pDataBlockInfo);
+  taosTFree(pQueryHandle->statis);
+
+  // todo check error
+  tsdbUnTakeMemSnapShot(pQueryHandle->pTsdb, pQueryHandle->mem, pQueryHandle->imem);
+
+  tsdbDestroyHelper(&pQueryHandle->rhelper);
+
+  SIOCostSummary* pCost = &pQueryHandle->cost;
+  tsdbDebug("%p :io-cost summary: statis-info:%"PRId64" us, datablock:%" PRId64" us, check data:%"PRId64" us, %p",
+      pQueryHandle, pCost->statisInfoLoadTime, pCost->blockLoadTime, pCost->checkForNextTime, pQueryHandle->qinfo);
+
+  taosTFree(pQueryHandle);
+}
+
+void tsdbDestroyTableGroup(STableGroupInfo *pGroupList) {
+  assert(pGroupList != NULL);
+
+  size_t numOfGroup = taosArrayGetSize(pGroupList->pGroupList);
+
+  for(int32_t i = 0; i < numOfGroup; ++i) {
+    SArray* p = taosArrayGetP(pGroupList->pGroupList, i);
+
+    size_t numOfTables = taosArrayGetSize(p);
+    for(int32_t j = 0; j < numOfTables; ++j) {
+      STable* pTable = taosArrayGetP(p, j);
+      assert(pTable != NULL);
+
+      tsdbUnRefTable(pTable);
+    }
+
+    taosArrayDestroy(p);
+  }
+
+  taosArrayDestroy(pGroupList->pGroupList);
+  pGroupList->numOfTables = 0;
+}
diff --git a/src/tsdb/src/tsdbRecover.c b/src/tsdb/src/tsdbRecover.c
new file mode 100644
index 0000000000000000000000000000000000000000..6dea4a4e57392be988126c579648f39a8270b9bf
--- /dev/null
+++ b/src/tsdb/src/tsdbRecover.c
@@ -0,0 +1,14 @@
+/*
+ * 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/>.
+ */
\ No newline at end of file
diff --git a/src/tsdb/src/tsdbScan.c b/src/tsdb/src/tsdbScan.c
new file mode 100644
index 0000000000000000000000000000000000000000..91f67878740c90d56a8c5c124be23c1f53e7da40
--- /dev/null
+++ b/src/tsdb/src/tsdbScan.c
@@ -0,0 +1,36 @@
+/*
+ * 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 "tsdbMain.h"
+
+#ifndef _TSDB_PLUGINS
+
+int tsdbScanFGroup(STsdbScanHandle* pScanHandle, char* rootDir, int fid) { return 0; }
+
+STsdbScanHandle* tsdbNewScanHandle() { return NULL; }
+
+void tsdbSetScanLogStream(STsdbScanHandle* pScanHandle, FILE* fLogStream) {}
+
+int tsdbSetAndOpenScanFile(STsdbScanHandle* pScanHandle, char* rootDir, int fid) { return 0; }
+
+int tsdbScanSCompIdx(STsdbScanHandle* pScanHandle) { return 0; }
+
+int tsdbScanSCompBlock(STsdbScanHandle* pScanHandle, int idx) { return 0; }
+
+int tsdbCloseScanFile(STsdbScanHandle* pScanHandle) { return 0; }
+
+void tsdbFreeScanHandle(STsdbScanHandle* pScanHandle) {}
+
+#endif
\ No newline at end of file
diff --git a/src/tsdb/tests/CMakeLists.txt b/src/tsdb/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a3477aef95f9e54484c106ba2afb853b48456be0
--- /dev/null
+++ b/src/tsdb/tests/CMakeLists.txt
@@ -0,0 +1,6 @@
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+
+add_executable(tsdbTests ${SOURCE_LIST})
+target_link_libraries(tsdbTests gtest gtest_main pthread common tsdb tutil trpc)
+
+add_test(NAME unit COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tsdbTests)
\ No newline at end of file
diff --git a/src/tsdb/tests/tsdbTests.cpp b/src/tsdb/tests/tsdbTests.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..605586515b7b1626751c01a550925c6e9ac4e183
--- /dev/null
+++ b/src/tsdb/tests/tsdbTests.cpp
@@ -0,0 +1,163 @@
+#include <gtest/gtest.h>
+#include <stdlib.h>
+#include <sys/time.h>
+
+#include "tsdb.h"
+#include "tsdbMain.h"
+
+static double getCurTime() {
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  return tv.tv_sec + tv.tv_usec * 1E-6;
+}
+
+typedef struct {
+  TSDB_REPO_T *pRepo;
+  bool       isAscend;
+  int        tid;
+  uint64_t   uid;
+  int        sversion;
+  TSKEY      startTime;
+  TSKEY      interval;
+  int        totalRows;
+  int        rowsPerSubmit;
+  STSchema * pSchema;
+} SInsertInfo;
+
+static int insertData(SInsertInfo *pInfo) {
+  SSubmitMsg *pMsg =
+      (SSubmitMsg *)malloc(sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + dataRowMaxBytesFromSchema(pInfo->pSchema) * pInfo->rowsPerSubmit);
+  if (pMsg == NULL) return -1;
+  TSKEY start_time = pInfo->startTime;
+
+  // Loop to write data
+  double stime = getCurTime();
+
+  for (int k = 0; k < pInfo->totalRows/pInfo->rowsPerSubmit; k++) {
+    memset((void *)pMsg, 0, sizeof(SSubmitMsg));
+    SSubmitBlk *pBlock = (SSubmitBlk *)pMsg->blocks;
+    pBlock->uid = pInfo->uid;
+    pBlock->tid = pInfo->tid;
+    pBlock->sversion = pInfo->sversion;
+    pBlock->dataLen = 0;
+    pBlock->schemaLen = 0;
+    pBlock->numOfRows = 0;
+    for (int i = 0; i < pInfo->rowsPerSubmit; i++) {
+      // start_time += 1000;
+      if (pInfo->isAscend) {
+        start_time += pInfo->interval;
+      } else {
+        start_time -= pInfo->interval;
+      }
+      SDataRow row = (SDataRow)(pBlock->data + pBlock->dataLen);
+      tdInitDataRow(row, pInfo->pSchema);
+
+      for (int j = 0; j < schemaNCols(pInfo->pSchema); j++) {
+        STColumn *pTCol = schemaColAt(pInfo->pSchema, j);
+        if (j == 0) {  // Just for timestamp
+          tdAppendColVal(row, (void *)(&start_time), pTCol->type, pTCol->bytes, pTCol->offset);
+        } else {  // For int
+          int val = 10;
+          tdAppendColVal(row, (void *)(&val), pTCol->type, pTCol->bytes, pTCol->offset);
+        }
+      }
+      pBlock->dataLen += dataRowLen(row);
+      pBlock->numOfRows++;
+    }
+    pMsg->length = sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + pBlock->dataLen;
+    pMsg->numOfBlocks = 1;
+
+    pBlock->dataLen = htonl(pBlock->dataLen);
+    pBlock->numOfRows = htonl(pBlock->numOfRows);
+    pBlock->schemaLen = htonl(pBlock->schemaLen);
+    pBlock->uid = htobe64(pBlock->uid);
+    pBlock->tid = htonl(pBlock->tid);
+
+    pBlock->sversion = htonl(pBlock->sversion);
+    pBlock->padding = htonl(pBlock->padding);
+
+    pMsg->length = htonl(pMsg->length);
+    pMsg->numOfBlocks = htonl(pMsg->numOfBlocks);
+
+    if (tsdbInsertData(pInfo->pRepo, pMsg, NULL) < 0) {
+      taosTFree(pMsg);
+      return -1;
+    }
+  }
+
+  double etime = getCurTime();
+
+  printf("Spent %f seconds to write %d records\n", etime - stime, pInfo->totalRows);
+  taosTFree(pMsg);
+  return 0;
+}
+
+static void tsdbSetCfg(STsdbCfg *pCfg, int32_t tsdbId, int32_t cacheBlockSize, int32_t totalBlocks, int32_t maxTables,
+                       int32_t daysPerFile, int32_t keep, int32_t minRows, int32_t maxRows, int8_t precision,
+                       int8_t compression) {
+  pCfg->tsdbId = tsdbId;
+  pCfg->cacheBlockSize = cacheBlockSize;
+  pCfg->totalBlocks = totalBlocks;
+  // pCfg->maxTables = maxTables;
+  pCfg->daysPerFile = daysPerFile;
+  pCfg->keep = keep;
+  pCfg->minRowsPerFileBlock = minRows;
+  pCfg->maxRowsPerFileBlock = maxRows;
+  pCfg->precision = precision;
+  pCfg->compression = compression;
+}
+
+static void tsdbSetTableCfg(STableCfg *pCfg) {
+  STSchemaBuilder schemaBuilder = {0};
+
+  pCfg->type = TSDB_NORMAL_TABLE;
+  pCfg->superUid = TSDB_INVALID_SUPER_TABLE_ID;
+  pCfg->tableId.tid = 1;
+  pCfg->tableId.uid = 5849583783847394;
+  tdInitTSchemaBuilder(&schemaBuilder, 0);
+
+  int colId = 0;
+  for (int i = 0; i < 5; i++) {
+    tdAddColToSchema(&schemaBuilder, (colId == 0) ? TSDB_DATA_TYPE_TIMESTAMP : TSDB_DATA_TYPE_INT, colId, 0);
+    colId++;
+  }
+
+  pCfg->schema = tdGetSchemaFromBuilder(&schemaBuilder);
+  pCfg->name = strdup("t1");
+
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+}
+
+TEST(TsdbTest, testInsertSpeed) {
+  int         vnode = 1;
+  int         ret = 0;
+  STsdbCfg    tsdbCfg;
+  STableCfg   tableCfg;
+  std::string testDir = "./test";
+  char *      rootDir = strdup((testDir + "/vnode" + std::to_string(vnode)).c_str());
+
+  tsdbDebugFlag = 131; //NOTE: you must set the flag
+
+  taosRemoveDir(rootDir);
+
+  // Create and open repository
+  tsdbSetCfg(&tsdbCfg, 1, 16, 4, -1, -1, -1, -1, -1, -1, -1);
+  tsdbCreateRepo(rootDir, &tsdbCfg);
+  TSDB_REPO_T *repo = tsdbOpenRepo(rootDir, NULL);
+  ASSERT_NE(repo, nullptr);
+
+  // Create table
+  tsdbSetTableCfg(&tableCfg);
+  tsdbCreateTable(repo, &tableCfg);
+
+  // Insert data
+  SInsertInfo iInfo = {repo, true, 1, 5849583783847394, 0, 1590000000000, 10, 10000000, 100, tableCfg.schema};
+
+  insertData(&iInfo);
+
+  tsdbCloseRepo(repo, 1);
+}
+
+static char *getTKey(const void *data) {
+  return (char *)data;
+}
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 76664ef9ec2e0c42642fc3beb49bfa865cc96d6a..89c8e3dc39211eca1b6c877f7789ad4313917ea2 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,113 +1,31 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_LIBRARY(tutil ${SRC})
+TARGET_LINK_LIBRARIES(tutil pthread osdetail lz4 z)
+  
+IF (TD_LINUX)
+  TARGET_LINK_LIBRARIES(tutil m rt)
+  ADD_SUBDIRECTORY(tests)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(tutil ${SRC})
-  TARGET_LINK_LIBRARIES(tutil pthread os m rt)
-  IF (TD_CLUSTER) 
-    ADD_DEFINITIONS(-DUSE_LIBICONV)
-    TARGET_LINK_LIBRARIES(tutil iconv)
-  ELSE()
-    FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/)
-    IF (ICONV_INCLUDE_EXIST)
-      ADD_DEFINITIONS(-DUSE_LIBICONV)
-      FIND_PATH(ICONV_LIBRARY_A_EXIST libiconv.a /usr/lib/ /usr/local/lib/ /lib64)
-      FIND_PATH(ICONV_LIBRARY_SO_EXIST libiconv.so /usr/lib/ /usr/local/lib/ /lib64)
-      IF (ICONV_LIBRARY_A_EXIST OR ICONV_LIBRARY_SO_EXIST)
-        MESSAGE(STATUS "Use the installed libiconv library")
-        TARGET_LINK_LIBRARIES(tutil iconv)
-      ELSE ()
-        # libiconv library is already included in GLIBC,
-        MESSAGE(STATUS "Use the iconv functions in GLIBC")
-      ENDIF ()
+  FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/)
+  IF (ICONV_INCLUDE_EXIST)
+    FIND_PATH(ICONV_LIBRARY_A_EXIST libiconv.a /usr/lib/ /usr/local/lib/ /lib64)
+    FIND_PATH(ICONV_LIBRARY_SO_EXIST libiconv.so /usr/lib/ /usr/local/lib/ /lib64)
+    IF (ICONV_LIBRARY_A_EXIST OR ICONV_LIBRARY_SO_EXIST)
+      MESSAGE(STATUS "Use the installed libiconv library")
+      TARGET_LINK_LIBRARIES(tutil iconv)
     ELSE ()
-      MESSAGE(STATUS "Failed to find iconv, use default encoding method")
+      # libiconv library is already included in GLIBC,
+      MESSAGE(STATUS "Use the iconv functions in GLIBC")
     ENDIF ()
+  ELSE ()
+    MESSAGE(STATUS "Failed to find iconv, use default encoding method")
   ENDIF ()
-ELSEIF (TD_WINDOWS_64)
-  ADD_DEFINITIONS(-DUSE_LIBICONV)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  LIST(APPEND SRC ./src/hash.c)
-  LIST(APPEND SRC ./src/ihash.c)
-  LIST(APPEND SRC ./src/lz4.c)
-  LIST(APPEND SRC ./src/shash.c)
-  LIST(APPEND SRC ./src/tbase64.c)
-  LIST(APPEND SRC ./src/tcache.c)
-  LIST(APPEND SRC ./src/tcompression.c)
-  LIST(APPEND SRC ./src/textbuffer.c)
-  LIST(APPEND SRC ./src/tglobalcfg.c)
-  LIST(APPEND SRC ./src/thash.c)
-  LIST(APPEND SRC ./src/thashutil.c)
-  LIST(APPEND SRC ./src/thistogram.c)
-  LIST(APPEND SRC ./src/tidpool.c)
-  LIST(APPEND SRC ./src/tinterpolation.c)
-  LIST(APPEND SRC ./src/tlog.c)
-  LIST(APPEND SRC ./src/tlosertree.c)
-  LIST(APPEND SRC ./src/tmd5.c)
-  LIST(APPEND SRC ./src/tmem.c)
-  LIST(APPEND SRC ./src/tmempool.c)
-  LIST(APPEND SRC ./src/tmodule.c)
-  LIST(APPEND SRC ./src/tnote.c)
-  LIST(APPEND SRC ./src/tsched.c)
-  LIST(APPEND SRC ./src/tskiplist.c)
-  LIST(APPEND SRC ./src/tsocket.c)
-  LIST(APPEND SRC ./src/tstrbuild.c)
-  LIST(APPEND SRC ./src/ttime.c)
-  LIST(APPEND SRC ./src/ttimer.c)
-  LIST(APPEND SRC ./src/ttokenizer.c)
-  LIST(APPEND SRC ./src/ttypes.c)
-  LIST(APPEND SRC ./src/tutil.c)
-  LIST(APPEND SRC ./src/version.c)
-  ADD_LIBRARY(tutil ${SRC}) 
-  TARGET_LINK_LIBRARIES(tutil iconv regex pthread os winmm IPHLPAPI ws2_32)
-ELSEIF(TD_DARWIN_64)
-  ADD_DEFINITIONS(-DUSE_LIBICONV)
-  LIST(APPEND SRC ./src/hash.c)
-  LIST(APPEND SRC ./src/ihash.c)
-  LIST(APPEND SRC ./src/lz4.c)
-  LIST(APPEND SRC ./src/shash.c)
-  LIST(APPEND SRC ./src/tbase64.c)
-  LIST(APPEND SRC ./src/tcache.c)
-  LIST(APPEND SRC ./src/tcompression.c)
-  LIST(APPEND SRC ./src/textbuffer.c)
-  LIST(APPEND SRC ./src/tglobalcfg.c)
-  LIST(APPEND SRC ./src/thash.c)
-  LIST(APPEND SRC ./src/thashutil.c)
-  LIST(APPEND SRC ./src/thistogram.c)
-  LIST(APPEND SRC ./src/tidpool.c)
-  LIST(APPEND SRC ./src/tinterpolation.c)
-  LIST(APPEND SRC ./src/tlog.c)
-  LIST(APPEND SRC ./src/tlosertree.c)
-  LIST(APPEND SRC ./src/tmd5.c)
-  LIST(APPEND SRC ./src/tmem.c)
-  LIST(APPEND SRC ./src/tmempool.c)
-  LIST(APPEND SRC ./src/tmodule.c)
-  LIST(APPEND SRC ./src/tnote.c)
-  LIST(APPEND SRC ./src/tsched.c)
-  LIST(APPEND SRC ./src/tskiplist.c)
-  LIST(APPEND SRC ./src/tsocket.c)
-  LIST(APPEND SRC ./src/tstrbuild.c)
-  LIST(APPEND SRC ./src/ttime.c)
-  LIST(APPEND SRC ./src/ttimer.c)
-  LIST(APPEND SRC ./src/ttokenizer.c)
-  LIST(APPEND SRC ./src/ttypes.c)
-  LIST(APPEND SRC ./src/tutil.c)
-  LIST(APPEND SRC ./src/version.c)
-  LIST(APPEND SRC ./src/hash.c)
-  ADD_LIBRARY(tutil ${SRC})
-  TARGET_LINK_LIBRARIES(tutil iconv pthread os)
-ENDIF()
-
-IF (TD_CLUSTER) 
-  TARGET_LINK_LIBRARIES(tutil tutil_cluster)
-ENDIF ()
-
-
 
+ELSEIF (TD_WINDOWS)
+  TARGET_LINK_LIBRARIES(tutil iconv regex winmm IPHLPAPI ws2_32 wepoll)
+ELSEIF(TD_DARWIN)
+  TARGET_LINK_LIBRARIES(tutil iconv)
+ENDIF()
diff --git a/src/inc/buildInfo.h b/src/util/inc/buildInfo.h
similarity index 100%
rename from src/inc/buildInfo.h
rename to src/util/inc/buildInfo.h
diff --git a/src/util/inc/exception.h b/src/util/inc/exception.h
new file mode 100644
index 0000000000000000000000000000000000000000..38f94bfe283e41e4418ed6ab1673efb82acc44a0
--- /dev/null
+++ b/src/util/inc/exception.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2020 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_EXCEPTION_H
+#define TDENGINE_EXCEPTION_H
+
+#include <setjmp.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * cleanup actions
+ */
+typedef struct SCleanupAction {
+    bool failOnly;
+    uint8_t wrapper;
+    uint16_t reserved;
+    void* func;
+    union {
+        void* Ptr;
+        bool Bool;
+        char Char;
+        int8_t Int8;
+        uint8_t Uint8;
+        int16_t Int16;
+        uint16_t Uint16;
+        int Int;
+        unsigned int Uint;
+        int32_t Int32;
+        uint32_t Uint32;
+        int64_t Int64;
+        uint64_t Uint64;
+        float Float;
+        double Double;
+    } arg1, arg2;
+} SCleanupAction;
+
+
+/*
+ * exception hander registration
+ */
+typedef struct SExceptionNode {
+   struct SExceptionNode* prev;
+   jmp_buf jb;
+   int32_t code;
+   int32_t maxCleanupAction;
+   int32_t numCleanupAction;
+   SCleanupAction* cleanupActions;
+} SExceptionNode;
+
+////////////////////////////////////////////////////////////////////////////////
+// functions & macros for auto-cleanup
+
+void cleanupPush_void_ptr_ptr   ( bool failOnly, void* func, void* arg1, void* arg2 );
+void cleanupPush_void_ptr_bool  ( bool failOnly, void* func, void* arg1, bool arg2 );
+void cleanupPush_void_ptr       ( bool failOnly, void* func, void* arg );
+void cleanupPush_int_int        ( bool failOnly, void* func, int arg );
+void cleanupPush_void           ( bool failOnly, void* func );
+void cleanupPush_int_ptr        ( bool failOnly, void* func, void* arg );
+
+int32_t cleanupGetActionCount();
+void cleanupExecuteTo( int32_t anchor, bool failed );
+void cleanupExecute( SExceptionNode* node, bool failed );
+bool cleanupExceedLimit();
+
+#define CLEANUP_PUSH_VOID_PTR_PTR( failOnly, func, arg1, arg2 )  cleanupPush_void_ptr_ptr( (failOnly), (void*)(func), (void*)(arg1), (void*)(arg2) )
+#define CLEANUP_PUSH_VOID_PTR_BOOL( failOnly, func, arg1, arg2 ) cleanupPush_void_ptr_bool( (failOnly), (void*)(func), (void*)(arg1), (bool)(arg2) )
+#define CLEANUP_PUSH_VOID_PTR( failOnly, func, arg )             cleanupPush_void_ptr( (failOnly), (void*)(func), (void*)(arg) )
+#define CLEANUP_PUSH_INT_INT( failOnly, func, arg )              cleanupPush_void_ptr( (failOnly), (void*)(func), (int)(arg) )
+#define CLEANUP_PUSH_VOID( failOnly, func )                      cleanupPush_void( (failOnly), (void*)(func) )
+#define CLEANUP_PUSH_INT_PTR( failOnly, func, arg )              cleanupPush_int_ptr( (failOnly), (void*)(func), (void*)(arg) )
+#define CLEANUP_PUSH_FREE( failOnly, arg )                       cleanupPush_void_ptr( (failOnly), free, (void*)(arg) )
+#define CLEANUP_PUSH_CLOSE( failOnly, arg )                      cleanupPush_int_int( (failOnly), close, (int)(arg) )
+#define CLEANUP_PUSH_FCLOSE( failOnly, arg )                     cleanupPush_int_ptr( (failOnly), fclose, (void*)(arg) )
+
+#define CLEANUP_GET_ANCHOR()          cleanupGetActionCount()
+#define CLEANUP_EXECUTE_TO( anchor, failed )  cleanupExecuteTo( (anchor), (failed) )
+#define CLEANUP_EXCEED_LIMIT()        cleanupExceedLimit() 
+
+////////////////////////////////////////////////////////////////////////////////
+// functions & macros for exception handling
+
+void exceptionPushNode( SExceptionNode* node );
+int32_t exceptionPopNode();
+void exceptionThrow( int32_t code );
+
+#define TRY(maxCleanupActions) do { \
+    SExceptionNode exceptionNode = { 0 }; \
+    SCleanupAction cleanupActions[(maxCleanupActions) > 0 ? (maxCleanupActions) : 1]; \
+    exceptionNode.maxCleanupAction = (maxCleanupActions) > 0 ? (maxCleanupActions) : 1; \
+    exceptionNode.cleanupActions = cleanupActions; \
+    exceptionPushNode( &exceptionNode ); \
+    int caughtException = setjmp( exceptionNode.jb ); \
+    if( caughtException == 0 )
+
+#define CATCH( code ) int32_t code = exceptionPopNode(); \
+    if( caughtException == 1 )
+
+#define FINALLY( code ) int32_t code = exceptionPopNode();
+
+#define END_TRY } while( 0 );
+
+#define THROW( x )          exceptionThrow( (x) )
+#define CAUGHT_EXCEPTION()  ((bool)(caughtException == 1))
+#define CLEANUP_EXECUTE()   cleanupExecute( &exceptionNode, CAUGHT_EXCEPTION() )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/hash.h b/src/util/inc/hash.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a58bec8830faab4cf9909bd417a44e2e8881570
--- /dev/null
+++ b/src/util/inc/hash.h
@@ -0,0 +1,182 @@
+/*
+ * 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_HASH_H
+#define TDENGINE_HASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tarray.h"
+#include "hashfunc.h"
+#include "tlockfree.h"
+
+#define HASH_MAX_CAPACITY (1024 * 1024 * 16)
+#define HASH_DEFAULT_LOAD_FACTOR (0.75)
+#define HASH_INDEX(v, c) ((v) & ((c)-1))
+
+typedef void (*_hash_free_fn_t)(void *param);
+
+typedef struct SHashNode {
+  char             *key;
+//  struct SHashNode *prev;
+  struct SHashNode *next;
+  uint32_t          hashVal;  // the hash value of key, if hashVal == HASH_VALUE_IN_TRASH, this node is moved to trash
+  uint32_t          keyLen;   // length of the key
+  char             *data;
+} SHashNode;
+
+typedef enum SHashLockTypeE {
+  HASH_NO_LOCK     = 0,
+  HASH_ENTRY_LOCK  = 1,
+} SHashLockTypeE;
+
+typedef struct SHashEntry {
+  int32_t    num;      // number of elements in current entry
+  SRWLatch   latch;    // entry latch
+  SHashNode *next;
+} SHashEntry;
+
+typedef struct SHashObj {
+  SHashEntry    **hashList;
+  size_t          capacity;     // number of slots
+  size_t          size;         // number of elements in hash table
+  _hash_fn_t      hashFp;       // hash function
+  _hash_free_fn_t freeFp;       // hash node free callback function
+
+  SRWLatch        lock;         // read-write spin lock
+  SHashLockTypeE  type;         // lock type
+  bool            enableUpdate; // enable update
+  SArray         *pMemBlock;    // memory block allocated for SHashEntry
+} SHashObj;
+
+typedef struct SHashMutableIterator {
+  SHashObj  *pHashObj;
+  int32_t    entryIndex;
+  SHashNode *pCur;
+  SHashNode *pNext;           // current node can be deleted for mutable iterator, so keep the next one before return current
+  size_t     numOfChecked;    // already check number of elements in hash table
+  size_t     numOfEntries;    // number of entries while the iterator is created
+} SHashMutableIterator;
+
+/**
+ * init the hash table
+ *
+ * @param capacity    initial capacity of the hash table
+ * @param fn          hash function to generate the hash value
+ * @param threadsafe  thread safe or not
+ * @return
+ */
+SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTypeE type);
+
+/**
+ * return the size of hash table
+ * @param pHashObj
+ * @return
+ */
+size_t taosHashGetSize(const SHashObj *pHashObj);
+
+/**
+ * put element into hash table, if the element with the same key exists, update it
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ * @param data
+ * @param size
+ * @return
+ */
+int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t size);
+
+/**
+ * return the payload data with the specified key
+ *
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ * @return
+ */
+void *taosHashGet(SHashObj *pHashObj, const void *key, size_t keyLen);
+
+/**
+ * apply the udf before return the result
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ * @param fp
+ * @param d
+ * @param dsize
+ * @return
+ */
+void* taosHashGetCB(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void* d, size_t dsize);
+
+/**
+ * remove item with the specified key
+ * @param pHashObj
+ * @param key
+ * @param keyLen
+ */
+int32_t taosHashRemove(SHashObj *pHashObj, const void *key, size_t keyLen);
+
+int32_t taosHashRemoveWithData(SHashObj *pHashObj, const void *key, size_t keyLen, void* data, size_t dsize);
+
+int32_t taosHashCondTraverse(SHashObj *pHashObj, bool (*fp)(void *, void *), void *param);
+
+/**
+ * clean up hash table
+ * @param handle
+ */
+void taosHashCleanup(SHashObj *pHashObj);
+
+/**
+ *
+ * @param pHashObj
+ * @return
+ */
+SHashMutableIterator* taosHashCreateIter(SHashObj *pHashObj);
+
+/**
+ *
+ * @param iter
+ * @return
+ */
+bool taosHashIterNext(SHashMutableIterator *iter);
+
+/**
+ *
+ * @param iter
+ * @return
+ */
+void *taosHashIterGet(SHashMutableIterator *iter);
+
+/**
+ *
+ * @param iter
+ * @return
+ */
+void* taosHashDestroyIter(SHashMutableIterator* iter);
+
+/**
+ *
+ * @param pHashObj
+ * @return
+ */
+int32_t taosHashGetMaxOverflowLinkLength(const SHashObj *pHashObj);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_HASH_H
diff --git a/src/inc/hashutil.h b/src/util/inc/hashfunc.h
similarity index 100%
rename from src/inc/hashutil.h
rename to src/util/inc/hashfunc.h
diff --git a/src/util/inc/talgo.h b/src/util/inc/talgo.h
new file mode 100644
index 0000000000000000000000000000000000000000..9e3692225b6413353bf269d9ba1fbc8651273eb5
--- /dev/null
+++ b/src/util/inc/talgo.h
@@ -0,0 +1,65 @@
+/*
+ * 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_TALGO_H
+#define TDENGINE_TALGO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __COMPAR_FN_T
+# define __COMPAR_FN_T
+typedef int (*__compar_fn_t) (const void *, const void *);
+#endif
+
+#define TD_EQ 0x1
+#define TD_GT 0x2
+#define TD_LT 0x4
+#define TD_GE (TD_EQ | TD_GT)
+#define TD_LE (TD_EQ | TD_LT)
+
+#define elePtrAt(base, size, idx) (void *)((char *)(base) + (size) * (idx))
+
+typedef int32_t (*__ext_compar_fn_t)(const void *p1, const void *p2, const void *param);
+
+/**
+ * quick sort, with the compare function requiring additional parameters support
+ *
+ * @param src
+ * @param numOfElem
+ * @param size
+ * @param param
+ * @param comparFn
+ */
+void taosqsort(void *src, size_t numOfElem, size_t size, const void* param, __ext_compar_fn_t comparFn);
+
+/**
+ * binary search, with range support
+ *
+ * @param key
+ * @param base
+ * @param nmemb
+ * @param size
+ * @param fn
+ * @param flags
+ * @return
+ */
+void *taosbsearch(const void *key, const void *base, size_t nmemb, size_t size, __compar_fn_t fn, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // TDENGINE_TALGO_H
diff --git a/src/util/inc/tarray.h b/src/util/inc/tarray.h
new file mode 100644
index 0000000000000000000000000000000000000000..71838af15064ec3d84662dff031d40d2156924eb
--- /dev/null
+++ b/src/util/inc/tarray.h
@@ -0,0 +1,152 @@
+/*
+ * 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_TAOSARRAY_H
+#define TDENGINE_TAOSARRAY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+
+#define TARRAY_MIN_SIZE 8
+#define TARRAY_GET_ELEM(array, index) ((void*)((char*)((array)->pData) + (index) * (array)->elemSize))
+
+typedef struct SArray {
+  size_t size;
+  size_t capacity;
+  size_t elemSize;
+  void*  pData;
+} SArray;
+
+/**
+ *
+ * @param size
+ * @param elemSize
+ * @return
+ */
+void* taosArrayInit(size_t size, size_t elemSize);
+
+/**
+ *
+ * @param pArray
+ * @param pData
+ * @return
+ */
+void* taosArrayPush(SArray* pArray, void* pData);
+
+/**
+ *
+ * @param pArray
+ */
+void* taosArrayPop(SArray* pArray);
+
+/**
+ * get the data from array
+ * @param pArray
+ * @param index
+ * @return
+ */
+void* taosArrayGet(const SArray* pArray, size_t index);
+
+/**
+ * get the pointer data from the array
+ * @param pArray
+ * @param index
+ * @return
+ */
+void* taosArrayGetP(const SArray* pArray, size_t index);
+
+/**
+ * return the size of array
+ * @param pArray
+ * @return
+ */
+size_t taosArrayGetSize(const SArray* pArray);
+
+/**
+ * insert data into array
+ * @param pArray
+ * @param index
+ * @param pData
+ */
+void* taosArrayInsert(SArray* pArray, size_t index, void* pData);
+
+/**
+ * remove data entry of the given index
+ * @param pArray
+ * @param index
+ */
+void taosArrayRemove(SArray* pArray, size_t index);
+
+/**
+ * copy the whole array from source to destination
+ * @param pDst
+ * @param pSrc
+ */
+void taosArrayCopy(SArray* pDst, const SArray* pSrc);
+
+/**
+ * clone a new array
+ * @param pSrc
+ */
+SArray* taosArrayClone(const SArray* pSrc);
+
+/**
+ * clear the array (remove all element)
+ * @param pArray
+ */
+void taosArrayClear(SArray* pArray);
+
+/**
+ * destroy array list
+ * @param pArray
+ */
+void taosArrayDestroy(SArray* pArray);
+
+/**
+ * sort the array
+ * @param pArray
+ * @param compar
+ */
+void taosArraySort(SArray* pArray, int (*compar)(const void*, const void*));
+
+/**
+ * sort string array
+ * @param pArray
+ */
+void taosArraySortString(SArray* pArray, __compar_fn_t comparFn);
+
+/**
+ * search the array
+ * @param pArray
+ * @param compar
+ * @param key
+ */
+void* taosArraySearch(const SArray* pArray, const void* key, __compar_fn_t comparFn);
+
+/**
+ * search the array
+ * @param pArray
+ * @param key
+ */
+char* taosArraySearchString(const SArray* pArray, const char* key, __compar_fn_t comparFn);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TAOSARRAY_H
diff --git a/src/util/inc/tbuffer.h b/src/util/inc/tbuffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..e2bdb815d7ac8ecd09b62a3a62897b78ebf3c4b7
--- /dev/null
+++ b/src/util/inc/tbuffer.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2020 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_TBUFFER_H
+#define TDENGINE_TBUFFER_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// usage example
+/*
+#include <stdio.h>
+#include "exception.h"
+
+int main( int argc, char** argv ) {
+  SBufferWriter bw = tbufInitWriter( NULL, false );
+
+  TRY( 1 ) {
+    //--------------------- write ------------------------
+    // reserve 1024 bytes for the buffer to improve performance
+    tbufEnsureCapacity( &bw, 1024 );
+
+    // reserve space for the interger count
+    size_t pos = tbufReserve( &bw, sizeof(int32_t) );
+    // write 5 integers to the buffer
+    for( int i = 0; i < 5; i++) {
+      tbufWriteInt32( &bw, i );
+    }
+    // write the integer count to buffer at reserved position
+    tbufWriteInt32At( &bw, pos, 5 );
+
+    // write a string to the buffer
+    tbufWriteString( &bw, "this is a string.\n" );
+    // acquire the result and close the write buffer
+    size_t size = tbufTell( &bw );
+    char*  data = tbufGetData( &bw, false );
+
+    //------------------------ read -----------------------
+    SBufferReader br = tbufInitReader( data, size, false );
+    // read & print out all integers
+    int32_t count = tbufReadInt32( &br );
+    for( int i = 0; i < count; i++ ) {
+      printf( "%d\n", tbufReadInt32(&br) );
+    }
+    // read & print out a string
+    puts( tbufReadString(&br, NULL) );
+    // try read another integer, this result in an error as there no this integer
+    tbufReadInt32( &br );
+    printf( "you should not see this message.\n" );
+  } CATCH( code ) {
+    printf( "exception code is: %d, you will see this message after print out 5 integers and a string.\n", code );
+  } END_TRY
+
+  tbufCloseWriter( &bw );
+  return 0;
+}
+*/
+
+typedef struct {
+  bool endian;
+  const char* data;
+  size_t pos;
+  size_t size;
+} SBufferReader;
+
+typedef struct {
+  bool endian;
+  char* data;
+  size_t pos;
+  size_t size;
+  void* (*allocator)( void*, size_t );
+} SBufferWriter;
+
+////////////////////////////////////////////////////////////////////////////////
+// common functions & macros for both reader & writer
+
+#define tbufTell( buf ) ((buf)->pos)
+
+
+////////////////////////////////////////////////////////////////////////////////
+// reader functions & macros
+
+// *Endian*, if true, reader functions of primitive types will do 'ntoh' automatically
+#define tbufInitReader( Data, Size, Endian ) {.endian = (Endian), .data = (Data), .pos = 0, .size = ((Data) == NULL ? 0 :(Size))}
+
+size_t      tbufSkip( SBufferReader* buf, size_t size );
+
+const char* tbufRead( SBufferReader* buf, size_t size );
+void        tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size );
+const char* tbufReadString( SBufferReader* buf, size_t* len );
+size_t      tbufReadToString( SBufferReader* buf, char* dst, size_t size );
+const char* tbufReadBinary( SBufferReader* buf, size_t *len );
+size_t      tbufReadToBinary( SBufferReader* buf, void* dst, size_t size );
+
+bool     tbufReadBool( SBufferReader* buf );
+char     tbufReadChar( SBufferReader* buf );
+int8_t   tbufReadInt8( SBufferReader* buf );
+uint8_t  tbufReadUint8( SBufferReader* buf );
+int16_t  tbufReadInt16( SBufferReader* buf );
+uint16_t tbufReadUint16( SBufferReader* buf );
+int32_t  tbufReadInt32( SBufferReader* buf );
+uint32_t tbufReadUint32( SBufferReader* buf );
+int64_t  tbufReadInt64( SBufferReader* buf );
+uint64_t tbufReadUint64( SBufferReader* buf );
+float    tbufReadFloat( SBufferReader* buf );
+double   tbufReadDouble( SBufferReader* buf );
+
+
+////////////////////////////////////////////////////////////////////////////////
+// writer functions & macros
+
+// *Allocator*, function to allocate memory, will use 'realloc' if NULL
+// *Endian*, if true, writer functions of primitive types will do 'hton' automatically
+#define tbufInitWriter( Allocator, Endian ) {.endian = (Endian), .data = NULL, .pos = 0, .size = 0, .allocator = ((Allocator) == NULL ? realloc : (Allocator))}
+void   tbufCloseWriter( SBufferWriter* buf );
+
+void   tbufEnsureCapacity( SBufferWriter* buf, size_t size );
+size_t tbufReserve( SBufferWriter* buf, size_t size );
+char*  tbufGetData( SBufferWriter* buf, bool takeOver );
+
+void   tbufWrite( SBufferWriter* buf, const void* data, size_t size );
+void   tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size );
+void   tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len );
+void   tbufWriteString( SBufferWriter* buf, const char* str );
+// the prototype of tbufWriteBinary and tbufWrite are identical
+// the difference is: tbufWriteBinary writes the length of the data to the buffer
+// first, then the actual data, which means the reader don't need to know data
+// size before read. Write only write the data itself, which means the reader
+// need to know data size before read.
+void   tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len );
+
+void tbufWriteBool( SBufferWriter* buf, bool data );
+void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data );
+void tbufWriteChar( SBufferWriter* buf, char data );
+void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data );
+void tbufWriteInt8( SBufferWriter* buf, int8_t data );
+void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data );
+void tbufWriteUint8( SBufferWriter* buf, uint8_t data );
+void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data );
+void tbufWriteInt16( SBufferWriter* buf, int16_t data );
+void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data );
+void tbufWriteUint16( SBufferWriter* buf, uint16_t data );
+void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data );
+void tbufWriteInt32( SBufferWriter* buf, int32_t data );
+void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data );
+void tbufWriteUint32( SBufferWriter* buf, uint32_t data );
+void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data );
+void tbufWriteInt64( SBufferWriter* buf, int64_t data );
+void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data );
+void tbufWriteUint64( SBufferWriter* buf, uint64_t data );
+void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data );
+void tbufWriteFloat( SBufferWriter* buf, float data );
+void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data );
+void tbufWriteDouble( SBufferWriter* buf, double data );
+void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h
new file mode 100644
index 0000000000000000000000000000000000000000..af5f30c7c3858ee37af253589cdd5e4323ad1d69
--- /dev/null
+++ b/src/util/inc/tcache.h
@@ -0,0 +1,176 @@
+/*
+ * 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_TCACHE_H
+#define TDENGINE_TCACHE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "tlockfree.h"
+#include "hash.h"
+
+typedef void (*__cache_free_fn_t)(void*);
+
+typedef struct SCacheStatis {
+  int64_t missCount;
+  int64_t hitCount;
+  int64_t totalAccess;
+  int64_t refreshCount;
+} SCacheStatis;
+
+struct STrashElem;
+
+typedef struct SCacheDataNode {
+  uint64_t           addedTime;    // the added time when this element is added or updated into cache
+  uint64_t           lifespan;     // life duration when this element should be remove from cache
+  uint64_t           expireTime;   // expire time
+  uint64_t           signature;
+  struct STrashElem *pTNodeHeader; // point to trash node head
+  uint16_t           keySize: 15;  // max key size: 32kb
+  bool               inTrashcan: 1;// denote if it is in trash or not
+  uint32_t           size;         // allocated size for current SCacheDataNode
+  T_REF_DECLARE()
+  char              *key;
+  char               data[];
+} SCacheDataNode;
+
+typedef struct STrashElem {
+  struct STrashElem *prev;
+  struct STrashElem *next;
+  SCacheDataNode    *pData;
+} STrashElem;
+
+/*
+ * to accommodate the old data which has the same key value of new one in hashList
+ * when an new node is put into cache, if an existed one with the same key:
+ * 1. if the old one does not be referenced, update it.
+ * 2. otherwise, move the old one to pTrash, addedTime the new one.
+ *
+ * when the node in pTrash does not be referenced, it will be release at the expired expiredTime
+ */
+typedef struct {
+  int64_t         totalSize;          // total allocated buffer in this hash table, SCacheObj is not included.
+  int64_t         refreshTime;
+  STrashElem *    pTrash;
+  char*           name;
+  SCacheStatis    statistics;
+  SHashObj *      pHashTable;
+  __cache_free_fn_t freeFp;
+  uint32_t        numOfElemsInTrash;  // number of element in trash
+  uint8_t         deleting;           // set the deleting flag to stop refreshing ASAP.
+  pthread_t       refreshWorker;
+  bool            extendLifespan;     // auto extend life span when one item is accessed.
+#if defined(LINUX)
+  pthread_rwlock_t lock;
+#else
+  pthread_mutex_t  lock;
+#endif
+} SCacheObj;
+
+/**
+ * initialize the cache object
+ * @param keyType              key type
+ * @param refreshTimeInSeconds refresh operation interval time, the maximum survival time when one element is expired
+ *                             and not referenced by other objects
+ * @param extendLifespan       auto extend lifespan, if accessed
+ * @param fn                   free resource callback function
+ * @return
+ */
+SCacheObj *taosCacheInit(int32_t keyType, int64_t refreshTimeInSeconds, bool extendLifespan, __cache_free_fn_t fn, const char *cacheName);
+
+/**
+ * add data into cache
+ *
+ * @param handle        cache object
+ * @param key           key
+ * @param pData         cached data
+ * @param dataSize      data size
+ * @param keepTime      survival time in second
+ * @return              cached element
+ */
+void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int durationMS);
+
+/**
+ * get data from cache
+ * @param pCacheObj     cache object
+ * @param key           key
+ * @return              cached data or NULL
+ */
+void *taosCacheAcquireByKey(SCacheObj *pCacheObj, const void *key, size_t keyLen);
+
+/**
+ * Add one reference count for the exist data, and assign this data for a new owner.
+ * The new owner needs to invoke the taosCacheRelease when it does not need this data anymore.
+ * This procedure is a faster version of taosCacheAcquireByKey function, which avoids the sideeffect of the problem of
+ * the data is moved to trash, and taosCacheAcquireByKey will fail to retrieve it again.
+ *
+ * @param handle
+ * @param data
+ * @return
+ */
+void *taosCacheAcquireByData(SCacheObj *pCacheObj, void *data);
+
+/**
+ * transfer the ownership of data in cache to another object without increasing reference count.
+ * @param handle
+ * @param data
+ * @return
+ */
+void *taosCacheTransfer(SCacheObj *pCacheObj, void **data);
+
+/**
+ * remove data in cache, the data will not be removed immediately.
+ * if it is referenced by other object, it will be remain in cache
+ * @param handle    cache object
+ * @param data      not the key, actually referenced data
+ * @param _remove   force model, reduce the ref count and move the data into pTrash
+ */
+void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove);
+
+/**
+ *  move all data node into trash, clear node in trash can if it is not referenced by any clients
+ * @param handle
+ */
+void taosCacheEmpty(SCacheObj *pCacheObj);
+
+/**
+ * release all allocated memory and destroy the cache object.
+ *
+ * This function only set the deleting flag, and the specific work of clean up cache is delegated to
+ * taosCacheRefresh function, which will executed every SCacheObj->refreshTime sec.
+ *
+ * If the value of SCacheObj->refreshTime is too large, the taosCacheRefresh function may not be invoked
+ * before the main thread terminated, in which case all allocated resources are simply recycled by OS.
+ *
+ * @param handle
+ */
+void taosCacheCleanup(SCacheObj *pCacheObj);
+
+/**
+ *
+ * @param pCacheObj
+ * @param fp
+ * @return
+ */
+void taosCacheRefresh(SCacheObj *pCacheObj, __cache_free_fn_t fp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TCACHE_H
diff --git a/src/util/inc/tchecksum.h b/src/util/inc/tchecksum.h
new file mode 100644
index 0000000000000000000000000000000000000000..495aaf33e8fca3594c45f1cfe6fc6acc59fa59d5
--- /dev/null
+++ b/src/util/inc/tchecksum.h
@@ -0,0 +1,68 @@
+/*
+ * 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_TCHECKSUM_H
+#define TDENGINE_TCHECKSUM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <assert.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#include "tcrc32c.h"
+#include "tutil.h"
+
+typedef uint32_t TSCKSUM;
+
+static FORCE_INLINE TSCKSUM taosCalcChecksum(TSCKSUM csi, const uint8_t *stream, uint32_t ssize) {
+  return (*crc32c)(csi, stream, (size_t)ssize);
+}
+
+static FORCE_INLINE int taosCalcChecksumAppend(TSCKSUM csi, uint8_t *stream, uint32_t ssize) {
+  if (ssize < sizeof(TSCKSUM)) return -1;
+
+  *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) = (*crc32c)(csi, stream, (size_t)(ssize - sizeof(TSCKSUM)));
+
+  return 0;
+}
+
+static FORCE_INLINE int taosCheckChecksum(const uint8_t *stream, uint32_t ssize, TSCKSUM checksum) {
+  if (ssize < 0) return 0;
+  return (checksum == (*crc32c)(0, stream, (size_t)ssize));
+}
+
+static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t ssize) {
+  if (ssize < sizeof(TSCKSUM)) return 0;
+
+#if (_WIN64)
+  return 1;
+#else
+  return *((TSCKSUM *)(stream + ssize - sizeof(TSCKSUM))) == (*crc32c)(0, stream, (size_t)(ssize - sizeof(TSCKSUM)));
+#endif
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TCHECKSUM_H
diff --git a/src/util/inc/tcoding.h b/src/util/inc/tcoding.h
new file mode 100644
index 0000000000000000000000000000000000000000..ff34c1560703a820b296911065c42e224fefcc03
--- /dev/null
+++ b/src/util/inc/tcoding.h
@@ -0,0 +1,371 @@
+/*
+ * 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 _TD_CODING_H_
+#define _TD_CODING_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <string.h>
+
+#include "tutil.h"
+
+// TODO: move this to a platform file
+#define ENCODE_LIMIT (((uint8_t)1) << 7)
+static const int32_t TNUMBER = 1;
+#define IS_LITTLE_ENDIAN() (*(uint8_t *)(&TNUMBER) != 0)
+
+#define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
+#define ZIGZAGD(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
+
+// ---- Fixed U8
+static FORCE_INLINE int taosEncodeFixedU8(void **buf, uint8_t value) {
+  if (buf != NULL) {
+    ((uint8_t *)(*buf))[0] = value;
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+
+  return (int)sizeof(value);
+}
+
+static FORCE_INLINE void *taosDecodeFixedU8(void *buf, uint8_t *value) {
+  *value = ((uint8_t *)buf)[0];
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I8
+static FORCE_INLINE int taosEncodeFixedI8(void **buf, int8_t value) {
+  if (buf != NULL) {
+    ((int8_t *)(*buf))[0] = value;
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+  return (int)sizeof(value);
+}
+
+static FORCE_INLINE void *taosDecodeFixedI8(void *buf, int8_t *value) {
+  *value = ((int8_t *)buf)[0];
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed U16
+static FORCE_INLINE int taosEncodeFixedU16(void **buf, uint16_t value) {
+  if (buf != NULL) {
+    if (IS_LITTLE_ENDIAN()) {
+      memcpy(*buf, &value, sizeof(value));
+    } else {
+      ((uint8_t *)(*buf))[0] = value & 0xff;
+      ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
+    }
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+
+  return (int)sizeof(value);
+}
+
+static FORCE_INLINE void *taosDecodeFixedU16(void *buf, uint16_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[1];
+  }
+
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I16
+static FORCE_INLINE int taosEncodeFixedI16(void **buf, int16_t value) {
+  return taosEncodeFixedU16(buf, ZIGZAGE(int16_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI16(void *buf, int16_t *value) {
+  uint16_t tvalue = 0;
+  void *   ret = taosDecodeFixedU16(buf, &tvalue);
+  *value = ZIGZAGD(int16_t, tvalue);
+  return ret;
+}
+
+// ---- Fixed U32
+static FORCE_INLINE int taosEncodeFixedU32(void **buf, uint32_t value) {
+  if (buf != NULL) {
+    if (IS_LITTLE_ENDIAN()) {
+      memcpy(*buf, &value, sizeof(value));
+    } else {
+      ((uint8_t *)(*buf))[0] = value & 0xff;
+      ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
+      ((uint8_t *)(*buf))[2] = (value >> 16) & 0xff;
+      ((uint8_t *)(*buf))[3] = (value >> 24) & 0xff;
+    }
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+
+  return (int)sizeof(value);
+}
+
+static FORCE_INLINE void *taosDecodeFixedU32(void *buf, uint32_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[3];
+  }
+
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I32
+static FORCE_INLINE int taosEncodeFixedI32(void **buf, int32_t value) {
+  return taosEncodeFixedU32(buf, ZIGZAGE(int32_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI32(void *buf, int32_t *value) {
+  uint32_t tvalue = 0;
+  void *   ret = taosDecodeFixedU32(buf, &tvalue);
+  *value = ZIGZAGD(int32_t, tvalue);
+  return ret;
+}
+
+// ---- Fixed U64
+static FORCE_INLINE int taosEncodeFixedU64(void **buf, uint64_t value) {
+  if (buf != NULL) {
+    if (IS_LITTLE_ENDIAN()) {
+      memcpy(*buf, &value, sizeof(value));
+    } else {
+      ((uint8_t *)(*buf))[0] = value & 0xff;
+      ((uint8_t *)(*buf))[1] = (value >> 8) & 0xff;
+      ((uint8_t *)(*buf))[2] = (value >> 16) & 0xff;
+      ((uint8_t *)(*buf))[3] = (value >> 24) & 0xff;
+      ((uint8_t *)(*buf))[4] = (value >> 32) & 0xff;
+      ((uint8_t *)(*buf))[5] = (value >> 40) & 0xff;
+      ((uint8_t *)(*buf))[6] = (value >> 48) & 0xff;
+      ((uint8_t *)(*buf))[7] = (value >> 56) & 0xff;
+    }
+
+    *buf = POINTER_SHIFT(*buf, sizeof(value));
+  }
+
+  return (int)sizeof(value);
+}
+
+static FORCE_INLINE void *taosDecodeFixedU64(void *buf, uint64_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[7] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[6] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[5] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[4] = ((uint8_t *)buf)[3];
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[4];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[5];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[6];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[7];
+  }
+
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I64
+static FORCE_INLINE int taosEncodeFixedI64(void **buf, int64_t value) {
+  return taosEncodeFixedU64(buf, ZIGZAGE(int64_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI64(void *buf, int64_t *value) {
+  uint64_t tvalue = 0;
+  void *   ret = taosDecodeFixedU64(buf, &tvalue);
+  *value = ZIGZAGD(int64_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U16
+static FORCE_INLINE int taosEncodeVariantU16(void **buf, uint16_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    if (buf != NULL) ((uint8_t *)(*buf))[i] = (uint8_t)(value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 3);
+  }
+
+  if (buf != NULL) {
+    ((uint8_t *)(*buf))[i] = (uint8_t)value;
+    *buf = POINTER_SHIFT(*buf, i + 1);
+  }
+
+  return i + 1;
+}
+
+static FORCE_INLINE void *taosDecodeVariantU16(void *buf, uint16_t *value) {
+  int      i = 0;
+  uint16_t tval = 0;
+  *value = 0;
+  while (i < 3) {
+    tval = (uint16_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
+
+// ---- Variant I16
+static FORCE_INLINE int taosEncodeVariantI16(void **buf, int16_t value) {
+  return taosEncodeVariantU16(buf, ZIGZAGE(int16_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI16(void *buf, int16_t *value) {
+  uint16_t tvalue = 0;
+  void *   ret = taosDecodeVariantU16(buf, &tvalue);
+  *value = ZIGZAGD(int16_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U32
+static FORCE_INLINE int taosEncodeVariantU32(void **buf, uint32_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    if (buf != NULL) ((uint8_t *)(*buf))[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 5);
+  }
+
+  if (buf != NULL) {
+    ((uint8_t *)(*buf))[i] = value;
+    *buf = POINTER_SHIFT(*buf, i + 1);
+  }
+
+  return i + 1;
+}
+
+static FORCE_INLINE void *taosDecodeVariantU32(void *buf, uint32_t *value) {
+  int      i = 0;
+  uint32_t tval = 0;
+  *value = 0;
+  while (i < 5) {
+    tval = (uint32_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
+
+// ---- Variant I32
+static FORCE_INLINE int taosEncodeVariantI32(void **buf, int32_t value) {
+  return taosEncodeVariantU32(buf, ZIGZAGE(int32_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI32(void *buf, int32_t *value) {
+  uint32_t tvalue = 0;
+  void *   ret = taosDecodeVariantU32(buf, &tvalue);
+  *value = ZIGZAGD(int32_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U64
+static FORCE_INLINE int taosEncodeVariantU64(void **buf, uint64_t value) {
+  int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    if (buf != NULL) ((uint8_t *)(*buf))[i] = (uint8_t)(value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 10);
+  }
+
+  if (buf != NULL) {
+    ((uint8_t *)(*buf))[i] = (uint8_t)value;
+    *buf = POINTER_SHIFT(*buf, i + 1);
+  }
+
+  return i + 1;
+}
+
+static FORCE_INLINE void *taosDecodeVariantU64(void *buf, uint64_t *value) {
+  int      i = 0;
+  uint64_t tval = 0;
+  *value = 0;
+  while (i < 10) {
+    tval = (uint64_t)(((uint8_t *)buf)[i]);
+    if (tval < ENCODE_LIMIT) {
+      (*value) |= (tval << (7 * i));
+      return POINTER_SHIFT(buf, i + 1);
+    } else {
+      (*value) |= ((tval & (ENCODE_LIMIT - 1)) << (7 * i));
+      i++;
+    }
+  }
+
+  return NULL;  // error happened
+}
+
+// ---- Variant I64
+static FORCE_INLINE int taosEncodeVariantI64(void **buf, int64_t value) {
+  return taosEncodeVariantU64(buf, ZIGZAGE(int64_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI64(void *buf, int64_t *value) {
+  uint64_t tvalue = 0;
+  void *   ret = taosDecodeVariantU64(buf, &tvalue);
+  *value = ZIGZAGD(int64_t, tvalue);
+  return ret;
+}
+
+// ---- string
+static FORCE_INLINE int taosEncodeString(void **buf, char *value) {
+  int    tlen = 0;
+  size_t size = strlen(value);
+
+  tlen += taosEncodeVariantU64(buf, size);
+  if (buf != NULL) {
+    memcpy(*buf, value, size);
+    *buf = POINTER_SHIFT(*buf, size);
+  }
+  tlen += (int)size;
+
+  return tlen;
+}
+
+static FORCE_INLINE void *taosDecodeString(void *buf, char **value) {
+  uint64_t size = 0;
+
+  buf = taosDecodeVariantU64(buf, &size);
+  *value = (char *)malloc((size_t)size + 1);
+  if (*value == NULL) return NULL;
+  memcpy(*value, buf, (size_t)size);
+
+  (*value)[size] = '\0';
+
+  return POINTER_SHIFT(buf, size);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/util/inc/tcompare.h b/src/util/inc/tcompare.h
new file mode 100644
index 0000000000000000000000000000000000000000..5e951923c1513a4e90b8d9cccea15cbeb5664ee5
--- /dev/null
+++ b/src/util/inc/tcompare.h
@@ -0,0 +1,53 @@
+/*
+ * 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_TCOMPARE_H
+#define TDENGINE_TCOMPARE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+
+#define TSDB_PATTERN_MATCH 0
+#define TSDB_PATTERN_NOMATCH 1
+#define TSDB_PATTERN_NOWILDCARDMATCH 2
+#define TSDB_PATTERN_STRING_MAX_LEN 20
+
+#define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_' }
+
+typedef struct SPatternCompareInfo {
+  char matchAll;  // symbol for match all wildcard, default: '%'
+  char matchOne;  // symbol for match one wildcard, default: '_'
+} SPatternCompareInfo;
+
+int patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo);
+
+int WCSPatternMatch(const wchar_t *pattern, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo);
+
+int32_t doCompare(const char* a, const char* b, int32_t type, size_t size);
+
+__compar_fn_t getKeyComparFunc(int32_t keyType);
+
+__compar_fn_t getComparFunc(int32_t type, int32_t optr);
+
+int32_t taosArrayCompareString(const void* a, const void* b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TCOMPARE_H
diff --git a/src/util/inc/tconfig.h b/src/util/inc/tconfig.h
new file mode 100644
index 0000000000000000000000000000000000000000..0520cf29a87c9d4727ef6db48d8f5712ac845b89
--- /dev/null
+++ b/src/util/inc/tconfig.h
@@ -0,0 +1,89 @@
+/*
+ * 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_CFG_H
+#define TDENGINE_CFG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TSDB_CFG_MAX_NUM    110
+#define TSDB_CFG_PRINT_LEN  23
+#define TSDB_CFG_OPTION_LEN 24
+#define TSDB_CFG_VALUE_LEN  41
+
+#define TSDB_CFG_CTYPE_B_CONFIG    1U   // can be configured from file
+#define TSDB_CFG_CTYPE_B_SHOW      2U   // can displayed by "show configs" commands
+#define TSDB_CFG_CTYPE_B_LOG       4U   // is a log type configuration
+#define TSDB_CFG_CTYPE_B_CLIENT    8U   // can be displayed in the client log
+#define TSDB_CFG_CTYPE_B_OPTION    16U  // can be configured by taos_options function
+#define TSDB_CFG_CTYPE_B_NOT_PRINT 32U  // such as password
+
+enum {
+  TAOS_CFG_CSTATUS_NONE,     // not configured
+  TAOS_CFG_CSTATUS_DEFAULT,  // use system default value
+  TAOS_CFG_CSTATUS_FILE,     // configured from file
+  TAOS_CFG_CSTATUS_OPTION,   // configured by taos_options function
+  TAOS_CFG_CSTATUS_ARG,      // configured by program argument
+};
+
+enum {
+  TAOS_CFG_VTYPE_INT16,
+  TAOS_CFG_VTYPE_INT32,
+  TAOS_CFG_VTYPE_FLOAT,
+  TAOS_CFG_VTYPE_STRING,
+  TAOS_CFG_VTYPE_IPSTR,
+  TAOS_CFG_VTYPE_DIRECTORY,
+};
+
+enum {
+  TAOS_CFG_UTYPE_NONE,
+  TAOS_CFG_UTYPE_PERCENT,
+  TAOS_CFG_UTYPE_GB,
+  TAOS_CFG_UTYPE_Mb,
+  TAOS_CFG_UTYPE_BYTE,
+  TAOS_CFG_UTYPE_SECOND,
+  TAOS_CFG_UTYPE_MS
+};
+
+typedef struct {
+  char *   option;
+  void *   ptr;
+  float    minValue;
+  float    maxValue;
+  int8_t   cfgType;
+  int8_t   cfgStatus;
+  int8_t   unitType;
+  int8_t   valType;
+  int32_t  ptrLength;
+} SGlobalCfg;
+
+extern SGlobalCfg tsGlobalConfig[];
+extern int32_t    tsGlobalConfigNum;
+extern char *     tsCfgStatusStr[];
+
+void taosReadGlobalLogCfg();
+bool taosReadGlobalCfg();
+void taosPrintGlobalCfg();
+
+void taosInitConfigOption(SGlobalCfg cfg);
+SGlobalCfg * taosGetConfigOption(const char *option);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TGLOBALCFG_H
diff --git a/src/inc/tcrc32c.h b/src/util/inc/tcrc32c.h
similarity index 100%
rename from src/inc/tcrc32c.h
rename to src/util/inc/tcrc32c.h
diff --git a/src/util/inc/tidpool.h b/src/util/inc/tidpool.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf352516310a1356f37359ab3052814d726ab8f0
--- /dev/null
+++ b/src/util/inc/tidpool.h
@@ -0,0 +1,43 @@
+/*
+ * 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_TIDPOOL_H
+#define TDENGINE_TIDPOOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *taosInitIdPool(int maxId);
+
+int taosUpdateIdPool(void *handle, int maxId);
+
+int taosIdPoolMaxSize(void *handle);
+
+int taosAllocateId(void *handle);
+
+void taosFreeId(void *handle, int id);
+
+void taosIdPoolCleanUp(void *handle);
+
+int taosIdPoolNumOfUsed(void *handle);
+
+void taosIdPoolMarkStatus(void *handle, int id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/tkey.h b/src/util/inc/tkey.h
new file mode 100644
index 0000000000000000000000000000000000000000..28a0d3a84e467f2771c5f7c0848fb7cedbade325
--- /dev/null
+++ b/src/util/inc/tkey.h
@@ -0,0 +1,36 @@
+/*
+ * 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_TKEY_H
+#define TDENGINE_TKEY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "tmd5.h"
+#include "tutil.h"
+
+unsigned char *base64_decode(const char *value, int inlen, int *outlen);
+char *base64_encode(const unsigned char *value, int vlen);
+char *taosDesEncode(int64_t key, char *src, int len);
+char *taosDesDecode(int64_t key, char *src, int len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/util/inc/tkvstore.h b/src/util/inc/tkvstore.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2b0ff05f58478e3778d3abab72ae3511f683aca
--- /dev/null
+++ b/src/util/inc/tkvstore.h
@@ -0,0 +1,67 @@
+/*
+ * 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 _TD_KVSTORE_H_
+#define _TD_KVSTORE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define KVSTORE_FILE_VERSION ((uint32_t)0)
+
+typedef int (*iterFunc)(void *, void *cont, int contLen);
+typedef void (*afterFunc)(void *);
+
+typedef struct {
+  int64_t  size;  // including 512 bytes of header size
+  int64_t  tombSize;
+  int64_t  nRecords;
+  int64_t  nDels;
+  uint32_t magic;
+} SStoreInfo;
+
+typedef struct {
+  char *     fname;
+  int        fd;
+  char *     fsnap;
+  int        sfd;
+  char *     fnew;
+  int        nfd;
+  SHashObj * map;
+  iterFunc   iFunc;
+  afterFunc  aFunc;
+  void *     appH;
+  SStoreInfo info;
+} SKVStore;
+
+#define KVSTORE_MAGIC(s) (s)->info.magic
+
+int       tdCreateKVStore(char *fname);
+int       tdDestroyKVStore(char *fname);
+SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH);
+void      tdCloseKVStore(SKVStore *pStore);
+int       tdKVStoreStartCommit(SKVStore *pStore);
+int       tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLen);
+int       tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid);
+int       tdKVStoreEndCommit(SKVStore *pStore);
+void      tsdbGetStoreInfo(char *fname, uint32_t *magic, int64_t *size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/util/inc/tlist.h b/src/util/inc/tlist.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8380294da47de1c9eb65059263ac820f3d816be
--- /dev/null
+++ b/src/util/inc/tlist.h
@@ -0,0 +1,72 @@
+/*
+ * 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 _TD_LIST_
+#define _TD_LIST_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum { TD_LIST_FORWARD, TD_LIST_BACKWARD } TD_LIST_DIRECTION_T;
+
+typedef struct _list_node {
+  struct _list_node *next;
+  struct _list_node *prev;
+  char               data[];
+} SListNode;
+
+typedef struct {
+  struct _list_node *head;
+  struct _list_node *tail;
+  int                numOfEles;
+  int                eleSize;
+} SList;
+
+typedef struct {
+  SListNode *         next;
+  TD_LIST_DIRECTION_T direction;
+} SListIter;
+
+#define listHead(l) (l)->head
+#define listTail(l) (l)->tail
+#define listNEles(l) (l)->numOfEles
+#define listEleSize(l) (l)->eleSize
+#define isListEmpty(l) ((l)->numOfEles == 0)
+#define listNodeFree(n) free(n);
+
+SList *    tdListNew(int eleSize);
+void       tdListFree(SList *list);
+void       tdListEmpty(SList *list);
+void       tdListPrependNode(SList *list, SListNode *node);
+void       tdListAppendNode(SList *list, SListNode *node);
+int        tdListPrepend(SList *list, void *data);
+int        tdListAppend(SList *list, void *data);
+SListNode *tdListPopHead(SList *list);
+SListNode *tdListPopTail(SList *list);
+SListNode *tdListGetHead(SList *list);
+SListNode *tsListGetTail(SList *list);
+SListNode *tdListPopNode(SList *list, SListNode *node);
+void       tdListMove(SList *src, SList *dst);
+void       tdListDiscard(SList *list);
+
+void       tdListNodeGetData(SList *list, SListNode *node, void *target);
+void       tdListInitIter(SList *list, SListIter *pIter, TD_LIST_DIRECTION_T direction);
+SListNode *tdListNext(SListIter *pIter);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/util/inc/tlockfree.h b/src/util/inc/tlockfree.h
new file mode 100644
index 0000000000000000000000000000000000000000..e960b601caf6322938f4b0da3953e0b3ba454ce3
--- /dev/null
+++ b/src/util/inc/tlockfree.h
@@ -0,0 +1,114 @@
+/*
+ * 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 __TD_LOCK_FREE_H__
+#define __TD_LOCK_FREE_H__
+
+#include "os.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// reference counting
+typedef void (*_ref_fn_t)(const void* pObj);
+
+#define T_REF_DECLARE() \
+  struct {              \
+    int32_t val;        \
+  } _ref;
+
+#define T_REF_REGISTER_FUNC(s, e) \
+  struct {                        \
+    _ref_fn_t start;              \
+    _ref_fn_t end;                \
+  } _ref_func = {.begin = (s), .end = (e)};
+
+// set the initial reference count value
+#define T_REF_INIT_VAL(x, _v)                \
+  do {                                       \
+    assert(_v >= 0);                         \
+    atomic_store_32(&((x)->_ref.val), (_v)); \
+  } while (0)
+
+// increase the reference count by 1
+#define T_REF_INC(x) (atomic_add_fetch_32(&((x)->_ref.val), 1))
+
+#define T_REF_INC_WITH_CB(x, p)                           \
+  do {                                                    \
+    int32_t v = atomic_add_fetch_32(&((x)->_ref.val), 1); \
+    if (v == 1 && (p)->_ref_func.begin != NULL) {         \
+      (p)->_ref_func.begin((x));                          \
+    }                                                     \
+  } while (0)
+
+#define T_REF_DEC(x) (atomic_sub_fetch_32(&((x)->_ref.val), 1))
+
+#define T_REF_DEC_WITH_CB(x, p)                           \
+  do {                                                    \
+    int32_t v = atomic_sub_fetch_32(&((x)->_ref.val), 1); \
+    if (v == 0 && (p)->_ref_func.end != NULL) {           \
+      (p)->_ref_func.end((x));                            \
+    }                                                     \
+  } while (0)
+
+#define T_REF_VAL_CHECK(x) assert((x)->_ref.val >= 0);
+
+#define T_REF_VAL_GET(x) (x)->_ref.val
+
+
+
+// single writer multiple reader lock
+typedef int32_t SRWLatch;
+
+void taosInitRWLatch(SRWLatch *pLatch);
+void taosWLockLatch(SRWLatch *pLatch);
+void taosWUnLockLatch(SRWLatch *pLatch);
+void taosRLockLatch(SRWLatch *pLatch);
+void taosRUnLockLatch(SRWLatch *pLatch);
+
+
+
+// copy on read
+#define taosCorBeginRead(x) for (uint32_t i_ = 1; 1; ++i_) { \
+    int32_t old_ = atomic_add_fetch_32((x), 0); \
+    if (old_ & 0x00000001) { \
+      if (i_ % 1000 == 0) { \
+        sched_yield(); \
+      } \
+      continue; \
+    }
+
+#define taosCorEndRead(x) \
+    if (atomic_add_fetch_32((x), 0) == old_) { \
+      break; \
+    } \
+  }
+
+#define taosCorBeginWrite(x) taosCorBeginRead(x) \
+    if (atomic_val_compare_exchange_32((x), old_, old_ + 1) != old_) { \
+        continue; \
+    }
+
+#define taosCorEndWrite(x) atomic_add_fetch_32((x), 1); \
+    break; \
+  }
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/tlog.h b/src/util/inc/tlog.h
new file mode 100644
index 0000000000000000000000000000000000000000..1f6a81d4b49a8a44f5c60da9a6c901be96e5d8f6
--- /dev/null
+++ b/src/util/inc/tlog.h
@@ -0,0 +1,56 @@
+/*
+ * 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_TLOG_H
+#define TDENGINE_TLOG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DEBUG_FATAL 1U
+#define DEBUG_ERROR DEBUG_FATAL
+#define DEBUG_WARN  2U
+#define DEBUG_INFO  DEBUG_WARN
+#define DEBUG_DEBUG 4U
+#define DEBUG_TRACE 8U
+#define DEBUG_DUMP  16U
+
+#define DEBUG_SCREEN 64U
+#define DEBUG_FILE   128U
+
+int32_t taosInitLog(char *logName, int32_t numOfLogLines, int32_t maxFiles);
+void    taosCloseLog();
+void    taosResetLog();
+
+void    taosPrintLog(const char *flags, int32_t dflag, const char *format, ...)
+#ifdef __GNUC__
+ __attribute__((format(printf, 3, 4)))
+#endif
+;
+
+void    taosPrintLongString(const char * flags, int32_t dflag, const char *format, ...)
+#ifdef __GNUC__
+ __attribute__((format(printf, 3, 4)))
+#endif
+;
+
+void    taosDumpData(unsigned char *msg, int32_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/tlosertree.h b/src/util/inc/tlosertree.h
new file mode 100644
index 0000000000000000000000000000000000000000..4c731625dd5c7950c321b2180ca913e49362059b
--- /dev/null
+++ b/src/util/inc/tlosertree.h
@@ -0,0 +1,55 @@
+/*
+ * 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_TLOSERTREE_H
+#define TDENGINE_TLOSERTREE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+typedef int (*__merge_compare_fn_t)(const void *, const void *, void *param);
+
+typedef struct SLoserTreeNode {
+  int32_t index;
+  void *  pData;
+} SLoserTreeNode;
+
+typedef struct SLoserTreeInfo {
+  int32_t              numOfEntries;
+  int32_t              totalEntries;
+  __merge_compare_fn_t comparFn;
+  void *               param;
+
+  SLoserTreeNode *pNode;
+} SLoserTreeInfo;
+
+uint32_t tLoserTreeCreate(SLoserTreeInfo **pTree, int32_t numOfEntries, void *param, __merge_compare_fn_t compareFn);
+
+void tLoserTreeInit(SLoserTreeInfo *pTree);
+
+void tLoserTreeAdjust(SLoserTreeInfo *pTree, int32_t idx);
+
+void tLoserTreeRebuild(SLoserTreeInfo *pTree);
+
+void tLoserTreeDisplay(SLoserTreeInfo *pTree);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TLOSERTREE_H
diff --git a/src/inc/tmd5.h b/src/util/inc/tmd5.h
similarity index 100%
rename from src/inc/tmd5.h
rename to src/util/inc/tmd5.h
diff --git a/src/inc/tmempool.h b/src/util/inc/tmempool.h
similarity index 100%
rename from src/inc/tmempool.h
rename to src/util/inc/tmempool.h
diff --git a/src/util/inc/tnettest.h b/src/util/inc/tnettest.h
new file mode 100644
index 0000000000000000000000000000000000000000..3fe1dfa9204fbbf85f193078b17e0bb4f9643848
--- /dev/null
+++ b/src/util/inc/tnettest.h
@@ -0,0 +1,29 @@
+/*
+ * 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_TNETTEST_H
+#define TDENGINE_TNETTEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void taosNetTest(const char* host, uint16_t port, uint16_t endPort, int pktLen, const char* netTestRole);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TNETTEST_H
diff --git a/src/util/inc/tnote.h b/src/util/inc/tnote.h
new file mode 100644
index 0000000000000000000000000000000000000000..552224abf035af6140b46d46ec8bff0e33a15524
--- /dev/null
+++ b/src/util/inc/tnote.h
@@ -0,0 +1,63 @@
+/*
+ * 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_TNOTE_H
+#define TDENGINE_TNOTE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "tutil.h"
+#include "tglobal.h"
+
+#define MAX_NOTE_LINE_SIZE 66000
+#define NOTE_FILE_NAME_LEN 300
+  
+typedef struct _taosNoteInfo {
+  int  taosNoteFileNum ;
+  int  taosNoteMaxLines;
+  int  taosNoteLines;
+  char taosNoteName[NOTE_FILE_NAME_LEN];
+  int  taosNoteFlag;
+  int  taosNoteFd;
+  int  taosNoteOpenInProgress;
+  pthread_mutex_t taosNoteMutex;
+}taosNoteInfo;
+  
+void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...);
+
+extern taosNoteInfo  m_HttpNote;
+extern taosNoteInfo  m_TscNote;
+
+extern int   tsHttpEnableRecordSql;
+extern int   tsTscEnableRecordSql;
+
+#define taosNotePrintHttp(...)               \
+  if (tsHttpEnableRecordSql) {               \
+    taosNotePrint(&m_HttpNote, __VA_ARGS__); \
+  }
+    
+#define taosNotePrintTsc(...)                 \
+    if (tsTscEnableRecordSql) {               \
+      taosNotePrint(&m_TscNote, __VA_ARGS__); \
+    }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/util/inc/tqueue.h b/src/util/inc/tqueue.h
new file mode 100644
index 0000000000000000000000000000000000000000..8493a64315966aa32b58359652d0f429e8e0916a
--- /dev/null
+++ b/src/util/inc/tqueue.h
@@ -0,0 +1,59 @@
+/*
+ * 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 TAOS_QUEUE_H
+#define TAOS_QUEUE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void* taos_queue;
+typedef void* taos_qset;
+typedef void* taos_qall;
+
+taos_queue taosOpenQueue();
+void       taosCloseQueue(taos_queue);
+void      *taosAllocateQitem(int size);
+void       taosFreeQitem(void *item);
+int        taosWriteQitem(taos_queue, int type, void *item);
+int        taosReadQitem(taos_queue, int *type, void **pitem);
+
+taos_qall  taosAllocateQall();
+void       taosFreeQall(taos_qall);
+int        taosReadAllQitems(taos_queue, taos_qall);
+int        taosGetQitem(taos_qall, int *type, void **pitem);
+void       taosResetQitems(taos_qall);
+
+taos_qset  taosOpenQset();
+void       taosCloseQset();
+void       taosQsetThreadResume(taos_qset param);
+int        taosAddIntoQset(taos_qset, taos_queue, void *ahandle);
+void       taosRemoveFromQset(taos_qset, taos_queue);
+int        taosGetQueueNumber(taos_qset);
+
+int        taosReadQitemFromQset(taos_qset, int *type, void **pitem, void **handle);
+int        taosReadAllQitemsFromQset(taos_qset, taos_qall, void **handle);
+
+int        taosGetQueueItemsNumber(taos_queue param);
+int        taosGetQsetItemsNumber(taos_qset param);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/src/util/inc/tsched.h b/src/util/inc/tsched.h
new file mode 100644
index 0000000000000000000000000000000000000000..3e481cbc327b495975fb03bc4e4d850e4372f044
--- /dev/null
+++ b/src/util/inc/tsched.h
@@ -0,0 +1,40 @@
+/*
+ * 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_TSCHED_H
+#define TDENGINE_TSCHED_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SSchedMsg {
+  void (*fp)(struct SSchedMsg *);
+  void (*tfp)(void *, void *);
+  void *msg;
+  void *ahandle;
+  void *thandle;
+} SSchedMsg;
+
+void *taosInitScheduler(int queueSize, int numOfThreads, const char *label);
+void *taosInitSchedulerWithInfo(int queueSize, int numOfThreads, const char *label, void *tmrCtrl);
+int  taosScheduleTask(void *qhandle, SSchedMsg *pMsg);
+void taosCleanUpScheduler(void *param);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCHED_H
diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h
new file mode 100644
index 0000000000000000000000000000000000000000..37d1e7b5909cf68f4dc7a25803f94442dc2cf7b0
--- /dev/null
+++ b/src/util/inc/tscompression.h
@@ -0,0 +1,272 @@
+/*
+ * 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_TSCOMPRESSION_H
+#define TDENGINE_TSCOMPRESSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taosdef.h"
+#include "tutil.h"
+
+#define COMP_OVERFLOW_BYTES 2
+#define BITS_PER_BYTE 8
+// Masks
+#define INT64MASK(_x) ((1ul << _x) - 1)
+#define INT32MASK(_x) (((uint32_t)1 << _x) - 1)
+#define INT8MASK(_x) (((uint8_t)1 << _x) - 1)
+// Compression algorithm
+#define NO_COMPRESSION 0
+#define ONE_STAGE_COMP 1
+#define TWO_STAGE_COMP 2
+
+extern int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type);
+extern int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type);
+extern int tsCompressBoolImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressBoolImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize);
+extern int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize);
+extern int tsCompressTimestampImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressDoubleImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output);
+extern int tsCompressFloatImp(const char *const input, const int nelements, char *const output);
+extern int tsDecompressFloatImp(const char *const input, const int nelements, char *const output);
+
+static FORCE_INLINE int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                      char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output,
+                        int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                       char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output,
+                         int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
+                  char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output,
+                    int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, 
+                   char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressBoolImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressBoolImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output,
+                     int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressBoolImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressBoolImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+  return tsCompressStringImp(input, inputSize, output, outputSize);
+}
+
+static FORCE_INLINE int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  return tsDecompressStringImp(input, compressedSize, output, outputSize);
+}
+
+static FORCE_INLINE int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                    char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressFloatImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressFloatImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output,
+                      int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressFloatImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressFloatImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                     char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressDoubleImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressDoubleImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output,
+                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressDoubleImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressDoubleImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
+                        char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsCompressTimestampImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    int len = tsCompressTimestampImp(input, nelements, buffer);
+    return tsCompressStringImp(buffer, len, output, outputSize);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output,
+                          int outputSize, char algorithm, char *const buffer, int bufferSize) {
+  if (algorithm == ONE_STAGE_COMP) {
+    return tsDecompressTimestampImp(input, nelements, output);
+  } else if (algorithm == TWO_STAGE_COMP) {
+    if (tsDecompressStringImp(input, compressedSize, buffer, bufferSize) < 0) return -1;
+    return tsDecompressTimestampImp(buffer, nelements, output);
+  } else {
+    assert(0);
+    return -1;
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCOMPRESSION_H
\ No newline at end of file
diff --git a/src/util/inc/tskiplist.h b/src/util/inc/tskiplist.h
new file mode 100644
index 0000000000000000000000000000000000000000..a14a8565617bc08eefc989168a93f523f2e6caff
--- /dev/null
+++ b/src/util/inc/tskiplist.h
@@ -0,0 +1,255 @@
+/*
+ * 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_TSKIPLIST_H
+#define TDENGINE_TSKIPLIST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "taosdef.h"
+#include "tarray.h"
+
+#define MAX_SKIP_LIST_LEVEL 15
+#define SKIP_LIST_RECORD_PERFORMANCE 0
+
+typedef char *SSkipListKey;
+typedef char *(*__sl_key_fn_t)(const void *);
+
+/**
+ * the skip list node is located in a consecutive memory area,
+ * the format of skip list node is as follows:
+ * +------------+-----------------------+------------------------+-----+------+
+ * | node level | forward pointer array | backward pointer array | key | data |
+ * +------------+-----------------------+------------------------+-----+------+
+ */
+typedef struct SSkipListNode {
+  uint8_t level;
+} SSkipListNode;
+
+#define SL_NODE_HEADER_SIZE(_l) (sizeof(SSkipListNode) + ((_l) << 1u) * POINTER_BYTES)
+
+#define SL_GET_FORWARD_POINTER(n, _l) ((SSkipListNode **)((char *)(n) + sizeof(SSkipListNode)))[(_l)]
+#define SL_GET_BACKWARD_POINTER(n, _l) \
+  ((SSkipListNode **)((char *)(n) + sizeof(SSkipListNode) + ((n)->level) * POINTER_BYTES))[(_l)]
+
+#define SL_GET_NODE_DATA(n) ((char *)(n) + SL_NODE_HEADER_SIZE((n)->level))
+#define SL_GET_NODE_KEY(s, n) ((s)->keyFn(SL_GET_NODE_DATA(n)))
+
+#define SL_GET_SL_MIN_KEY(s) (SL_GET_NODE_KEY((s), SL_GET_FORWARD_POINTER((s)->pHead, 0)))
+#define SL_GET_SL_MAX_KEY(s) (SL_GET_NODE_KEY((s), SL_GET_BACKWARD_POINTER((s)->pTail, 0)))
+
+#define SL_GET_NODE_LEVEL(n) *(uint8_t *)((n))
+
+/*
+ * @version 0.3
+ * @date   2017/11/12
+ * the simple version of skip list.
+ *
+ * for multi-thread safe purpose, we employ pthread_rwlock_t to guarantee to generate
+ * deterministic result. Later, we will remove the lock in SkipList to further enhance the performance.
+ * In this case, one should use the concurrent skip list (by using michael-scott algorithm) instead of
+ * this simple version in a multi-thread environment, to achieve higher performance of read/write operations.
+ *
+ * Note: Duplicated primary key situation.
+ * In case of duplicated primary key, two ways can be employed to handle this situation:
+ * 1. add as normal insertion without special process.
+ * 2. add an overflow pointer at each list node, all nodes with the same key will be added in the overflow pointer.
+ *    In this case, the total steps of each search will be reduced significantly.
+ *    Currently, we implement the skip list in a line with the first means, maybe refactor it soon.
+ *
+ *    Memory consumption: the memory alignment causes many memory wasted. So, employ a memory
+ *    pool will significantly reduce the total memory consumption, as well as the calloc/malloc operation costs.
+ *
+ */
+
+// state struct, record following information:
+// number of links in each level.
+// avg search steps, for latest 1000 queries
+// avg search rsp time, for latest 1000 queries
+// total memory size
+typedef struct tSkipListState {
+  // in bytes, sizeof(SSkipList)+sizeof(SSkipListNode)*SSkipList->nSize
+  uint64_t nTotalMemSize;
+  uint64_t nLevelNodeCnt[MAX_SKIP_LIST_LEVEL];
+  uint64_t queryCount;  // total query count
+
+  /*
+   * only record latest 1000 queries
+   * when the value==1000, = 0,
+   * nTotalStepsForQueries = 0,
+   * nTotalElapsedTimeForQueries = 0
+   */
+  uint64_t nRecQueries;
+  uint16_t nTotalStepsForQueries;
+  uint64_t nTotalElapsedTimeForQueries;
+
+  uint16_t nInsertObjs;
+  uint16_t nTotalStepsForInsert;
+  uint64_t nTotalElapsedTimeForInsert;
+} tSkipListState;
+
+typedef struct SSkipListKeyInfo {
+  uint8_t dupKey : 2;  // if allow duplicated key in the skip list
+  uint8_t type : 4;    // key type
+  uint8_t freeNode:2;  // free node when destroy the skiplist
+  uint8_t len;         // maximum key length, used in case of string key
+} SSkipListKeyInfo;
+
+typedef struct SSkipList {
+  __compar_fn_t     comparFn;
+  __sl_key_fn_t     keyFn;
+  uint32_t          size;
+  uint8_t           maxLevel;
+  uint8_t           level;
+  SSkipListKeyInfo  keyInfo;
+  pthread_rwlock_t *lock;
+  SSkipListNode *   pHead;    // point to the first element
+  SSkipListNode *   pTail;    // point to the last element
+#if SKIP_LIST_RECORD_PERFORMANCE
+  tSkipListState state;  // skiplist state
+#endif
+} SSkipList;
+
+/*
+ * iterate the skiplist
+ * this will cause the multi-thread problem, when the skiplist is destroyed, the iterate may
+ * continue iterating the skiplist, so add the reference count for skiplist
+ * TODO add the ref for skip list when one iterator is created
+ */
+typedef struct SSkipListIterator {
+  SSkipList *    pSkipList;
+  SSkipListNode *cur;
+  int32_t        step;          // the number of nodes that have been checked already
+  int32_t        order;         // order of the iterator
+  SSkipListNode *next;          // next points to the true qualified node in skip list
+} SSkipListIterator;
+
+/**
+ *
+ * @param nMaxLevel   maximum skip list level
+ * @param keyType     type of key
+ * @param dupKey      allow the duplicated key in the skip list
+ * @return
+ */
+SSkipList *tSkipListCreate(uint8_t nMaxLevel, uint8_t keyType, uint8_t keyLen, uint8_t dupKey, uint8_t threadsafe,
+    uint8_t freeNode, __sl_key_fn_t fn);
+
+/**
+ *
+ * @param pSkipList
+ * @return                NULL will always be returned
+ */
+void *tSkipListDestroy(SSkipList *pSkipList);
+
+/**
+ *
+ * @param pSkipList
+ * @param level
+ * @param headSize
+ */
+void tSkipListNewNodeInfo(SSkipList *pSkipList, int32_t *level, int32_t *headSize);
+
+/**
+ * put the skip list node into the skip list.
+ * If failed, NULL will be returned, otherwise, the pNode will be returned.
+ *
+ * @param pSkipList
+ * @param pNode
+ * @return
+ */
+SSkipListNode *tSkipListPut(SSkipList *pSkipList, SSkipListNode *pNode);
+
+/**
+ * get *all* nodes which key are equivalent to pKey
+ *
+ * @param pSkipList
+ * @param pKey
+ * @return
+ */
+SArray *tSkipListGet(SSkipList *pSkipList, SSkipListKey pKey);
+
+/**
+ * get the size of skip list
+ * @param pSkipList
+ * @return
+ */
+size_t tSkipListGetSize(const SSkipList *pSkipList);
+
+/**
+ * display skip list of the given level, for debug purpose only
+ * @param pSkipList
+ * @param nlevel
+ */
+void tSkipListPrint(SSkipList *pSkipList, int16_t nlevel);
+
+/**
+ * create skiplist iterator
+ * @param pSkipList
+ * @return
+ */
+SSkipListIterator *tSkipListCreateIter(SSkipList *pSkipList);
+
+/**
+ * create skip list iterator from the given node and specified the order
+ * @param pSkipList
+ * @param pNode     start position, instead of the first node in skip list
+ * @param order     traverse order of the iterator
+ * @return
+ */
+SSkipListIterator *tSkipListCreateIterFromVal(SSkipList* pSkipList, const char* val, int32_t type, int32_t order);
+
+/**
+ * forward the skip list iterator
+ * @param iter
+ * @return
+ */
+bool tSkipListIterNext(SSkipListIterator *iter);
+
+/**
+ * get the element of skip list node
+ * @param iter
+ * @return
+ */
+SSkipListNode *tSkipListIterGet(SSkipListIterator *iter);
+
+/**
+ * destroy the skip list node
+ * @param iter
+ * @return
+ */
+void *tSkipListDestroyIter(SSkipListIterator *iter);
+
+/*
+ * remove nodes of the pKey value.
+ * If more than one node has the same value, all will be removed
+ *
+ * @Return
+ * the count of removed nodes
+ */
+uint32_t tSkipListRemove(SSkipList *pSkipList, SSkipListKey key);
+
+/*
+ * remove the specified node in parameters
+ */
+void tSkipListRemoveNode(SSkipList *pSkipList, SSkipListNode *pNode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSKIPLIST_H
diff --git a/src/util/inc/tsocket.h b/src/util/inc/tsocket.h
new file mode 100644
index 0000000000000000000000000000000000000000..f14e8dbb356e131bbd580f8c5310bea944e71033
--- /dev/null
+++ b/src/util/inc/tsocket.h
@@ -0,0 +1,44 @@
+/*
+ * 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_TSOCKET_H
+#define TDENGINE_TSOCKET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int taosReadn(SOCKET sock, char *buffer, int len);
+int taosWriteMsg(SOCKET fd, void *ptr, int nbytes);
+int taosReadMsg(SOCKET fd, void *ptr, int nbytes);
+int taosNonblockwrite(SOCKET fd, char *ptr, int nbytes);
+int taosCopyFds(SOCKET sfd, SOCKET dfd, int64_t len);
+int taosSetNonblocking(SOCKET sock, int on);
+
+SOCKET taosOpenUdpSocket(uint32_t localIp, uint16_t localPort);
+SOCKET taosOpenTcpClientSocket(uint32_t ip, uint16_t port, uint32_t localIp);
+SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port);
+int  taosKeepTcpAlive(SOCKET sockFd);
+
+int      taosGetFqdn(char *);
+uint32_t taosGetIpFromFqdn(const char *);
+void     tinet_ntoa(char *ipstr, unsigned int ip);
+uint32_t ip2uint(const char *const ip_addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSOCKET_H
diff --git a/src/util/inc/tstoken.h b/src/util/inc/tstoken.h
new file mode 100644
index 0000000000000000000000000000000000000000..7aeb2da6b658f4b8fd1cc7e03583a3cc676ea237
--- /dev/null
+++ b/src/util/inc/tstoken.h
@@ -0,0 +1,189 @@
+/*
+ * 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_TTOKEN_H
+#define TDENGINE_TTOKEN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "tutil.h"
+#include "ttokendef.h"
+
+#define TSQL_TBNAME   "TBNAME"
+#define TSQL_TBNAME_L "tbname"
+
+// used to denote the minimum unite in sql parsing
+typedef struct SStrToken {
+  uint32_t n;
+  uint32_t type;
+  char *   z;
+} SStrToken;
+
+/**
+ * tokenizer for sql string
+ * @param z
+ * @param tokenType
+ * @return
+ */
+uint32_t tSQLGetToken(char *z, uint32_t *tokenType);
+
+/**
+ * enhanced tokenizer for sql string.
+ *
+ * @param str
+ * @param i
+ * @param isPrevOptr
+ * @param numOfIgnoreToken
+ * @param ignoreTokenTypes
+ * @return
+ */
+SStrToken tStrGetToken(char *str, int32_t *i, bool isPrevOptr, uint32_t numOfIgnoreToken, uint32_t *ignoreTokenTypes);
+
+/**
+ * check if it is a keyword or not
+ * @param z
+ * @param len
+ * @return
+ */
+bool isKeyWord(const char *z, int32_t len);
+
+/**
+ * check if it is a number or not
+ * @param pToken
+ * @return
+ */
+#define isNumber(tk) \
+((tk)->type == TK_INTEGER || (tk)->type == TK_FLOAT || (tk)->type == TK_HEX || (tk)->type == TK_BIN)
+
+
+/**
+ * check if it is a token or not
+ * @param pToken
+ * @return        token type, if it is not a number, TK_ILLEGAL will return
+ */
+static FORCE_INLINE int32_t isValidNumber(const SStrToken* pToken) {
+  const char* z = pToken->z;
+  int32_t type = TK_ILLEGAL;
+
+  uint32_t i = 0;
+  for(; i < pToken->n; ++i) {
+    switch (z[i]) {
+      case '+':
+      case '-': {
+        break;
+      }
+
+      case '.': {
+        /*
+         * handle the the float number with out integer part
+         * .123
+         * .123e4
+         */
+        if (!isdigit(z[i+1])) {
+          return TK_ILLEGAL;
+        }
+
+        for (i += 2; isdigit(z[i]); i++) {
+        }
+
+        if ((z[i] == 'e' || z[i] == 'E') &&
+            (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
+          i += 2;
+          while (isdigit(z[i])) {
+            i++;
+          }
+        }
+
+        type = TK_FLOAT;
+        goto _end;
+        break;
+      }
+
+      case '0': {
+        char next = z[i + 1];
+        if (next == 'b') { // bin number
+          type = TK_BIN;
+          for (i += 2; (z[i] == '0' || z[i] == '1'); ++i) {
+          }
+
+          goto _end;
+        } else if (next == 'x') {  //hex number
+          type = TK_HEX;
+          for (i += 2; isdigit(z[i]) || (z[i] >= 'a' && z[i] <= 'f') || (z[i] >= 'A' && z[i] <= 'F'); ++i) {
+          }
+
+          goto _end;
+        }
+      }
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+      case '8':
+      case '9': {
+        type = TK_INTEGER;
+        for (; isdigit(z[i]); i++) {
+        }
+
+        int32_t seg = 0;
+        while (z[i] == '.' && isdigit(z[i + 1])) {
+          i += 2;
+
+          while (isdigit(z[i])) {
+            i++;
+          }
+
+          seg++;
+          type = TK_FLOAT;
+        }
+
+        if (seg > 1) {
+          return TK_ILLEGAL;
+        }
+
+        if ((z[i] == 'e' || z[i] == 'E') &&
+            (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
+          i += 2;
+          while (isdigit(z[i])) {
+            i++;
+          }
+
+          type = TK_FLOAT;
+        }
+
+        goto _end;
+      }
+      default:
+        return TK_ILLEGAL;
+    }
+  }
+
+  _end:
+  return (i < pToken->n)? TK_ILLEGAL:type;
+}
+
+void taosCleanupKeywordsTable();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TTOKEN_H
diff --git a/src/inc/tstrbuild.h b/src/util/inc/tstrbuild.h
similarity index 100%
rename from src/inc/tstrbuild.h
rename to src/util/inc/tstrbuild.h
diff --git a/src/util/inc/ttimer.h b/src/util/inc/ttimer.h
new file mode 100644
index 0000000000000000000000000000000000000000..6992f5ab6ea792f6cdadd0af217fa5cb8b02dbc5
--- /dev/null
+++ b/src/util/inc/ttimer.h
@@ -0,0 +1,51 @@
+/*
+ * 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_TTIMER_H
+#define TDENGINE_TTIMER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *tmr_h;
+typedef void (*TAOS_TMR_CALLBACK)(void *, void *);
+
+extern int      taosTmrThreads;
+extern uint32_t tsMaxTmrCtrl;
+
+#define MSECONDS_PER_TICK 5
+
+void *taosTmrInit(int maxTmr, int resoultion, int longest, const char *label);
+
+tmr_h taosTmrStart(TAOS_TMR_CALLBACK fp, int mseconds, void *param, void *handle);
+
+bool taosTmrStop(tmr_h tmrId);
+
+bool taosTmrStopA(tmr_h *timerId);
+
+bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void *param, void *handle, tmr_h *pTmrId);
+
+void taosTmrCleanUp(void *handle);
+
+int32_t taosInitTimer(void (*callback)(int), int32_t ms);
+
+void taosUninitTimer();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TTIMER_H
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
new file mode 100644
index 0000000000000000000000000000000000000000..fe5c038c5169d88814c7807d550ebadaba8ebacd
--- /dev/null
+++ b/src/util/inc/tutil.h
@@ -0,0 +1,59 @@
+/*
+ * 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_TUTIL_H
+#define TDENGINE_TUTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "os.h"
+#include "tmd5.h"
+#include "tcrc32c.h"
+#include "taosdef.h"
+
+int32_t strdequote(char *src);
+size_t  strtrim(char *src);
+char *  strnchr(char *haystack, char needle, int32_t len, bool skipquote);
+char ** strsplit(char *src, const char *delim, int32_t *num);
+char *  strtolower(char *dst, const char *src);
+char *  strntolower(char *dst, const char *src, int32_t n);
+int64_t strnatoi(char *num, int32_t len);
+char *  strbetween(char *string, char *begin, char *end);
+char *  paGetToken(char *src, char **token, int32_t *tokenLen);
+
+int32_t taosByteArrayToHexStr(char bytes[], int32_t len, char hexstr[]);
+int32_t taosHexStrToByteArray(char hexstr[], char bytes[]);
+
+bool taosGetVersionNumber(char *versionStr, int *versionNubmer);
+int  taosCheckVersion(char *input_client_version, char *input_server_version, int compared_segments);
+
+char *   taosIpStr(uint32_t ipInt);
+uint32_t ip2uint(const char *const ip_addr);
+
+static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *target) {
+  MD5_CTX context;
+  MD5Init(&context);
+  MD5Update(&context, inBuf, (unsigned int)inLen);
+  MD5Final(&context);
+  memcpy(target, context.digest, TSDB_KEY_LEN);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TUTIL_H
diff --git a/src/util/src/exception.c b/src/util/src/exception.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b716b6aba31d3554b252e1b9be46d9341391f13
--- /dev/null
+++ b/src/util/src/exception.c
@@ -0,0 +1,152 @@
+#include "os.h"
+#include "exception.h"
+
+
+static threadlocal SExceptionNode* expList;
+
+void exceptionPushNode( SExceptionNode* node ) {
+    node->prev = expList;
+    expList = node;
+}
+
+int32_t exceptionPopNode() {
+    SExceptionNode* node = expList;
+    expList = node->prev;
+    return node->code;
+}
+
+void exceptionThrow( int32_t code ) {
+    expList->code = code;
+    longjmp( expList->jb, 1 );
+}
+
+
+
+static void cleanupWrapper_void_ptr_ptr( SCleanupAction* ca ) {
+    void (*func)( void*, void* ) = ca->func;
+    func( ca->arg1.Ptr, ca->arg2.Ptr );
+}
+
+static void cleanupWrapper_void_ptr_bool( SCleanupAction* ca ) {
+    void (*func)( void*, bool ) = ca->func;
+    func( ca->arg1.Ptr, ca->arg2.Bool );
+}
+
+static void cleanupWrapper_void_ptr( SCleanupAction* ca ) {
+    void (*func)( void* ) = ca->func;
+    func( ca->arg1.Ptr );
+}
+
+static void cleanupWrapper_int_int( SCleanupAction* ca ) {
+    int (*func)( int ) = ca->func;
+    func( ca->arg1.Int );
+}
+
+static void cleanupWrapper_void( SCleanupAction* ca ) {
+    void (*func)() = ca->func;
+    func();
+}
+
+static void cleanupWrapper_int_ptr( SCleanupAction* ca ) {
+    int (*func)( void* ) = ca->func;
+    func( ca->arg1.Ptr );
+}
+
+typedef void (*wrapper)(SCleanupAction*);
+static wrapper wrappers[] = {
+    cleanupWrapper_void_ptr_ptr,
+    cleanupWrapper_void_ptr_bool,
+    cleanupWrapper_void_ptr,
+    cleanupWrapper_int_int,
+    cleanupWrapper_void,
+    cleanupWrapper_int_ptr,
+};
+
+
+void cleanupPush_void_ptr_ptr( bool failOnly, void* func, void* arg1, void* arg2 ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 0;
+    ca->failOnly = failOnly;
+    ca->func = func;
+    ca->arg1.Ptr = arg1;
+    ca->arg2.Ptr = arg2;
+}
+
+void cleanupPush_void_ptr_bool( bool failOnly, void* func, void* arg1, bool arg2 ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 1;
+    ca->failOnly = failOnly;
+    ca->func = func;
+    ca->arg1.Ptr = arg1;
+    ca->arg2.Bool = arg2;
+}
+
+void cleanupPush_void_ptr( bool failOnly, void* func, void* arg ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 2;
+    ca->failOnly = failOnly;
+    ca->func = func;
+    ca->arg1.Ptr = arg;
+}
+
+void cleanupPush_int_int( bool failOnly, void* func, int arg ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 3;
+    ca->failOnly = failOnly;
+    ca->func = func;
+    ca->arg1.Int = arg;
+}
+
+void cleanupPush_void( bool failOnly, void* func ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 4;
+    ca->failOnly = failOnly;
+    ca->func = func;
+}
+
+void cleanupPush_int_ptr( bool failOnly, void* func, void* arg ) {
+    assert( expList->numCleanupAction < expList->maxCleanupAction );
+
+    SCleanupAction *ca = expList->cleanupActions + expList->numCleanupAction++;
+    ca->wrapper = 5;
+    ca->failOnly = failOnly;
+    ca->func = func;
+    ca->arg1.Ptr = arg;
+}
+
+
+int32_t cleanupGetActionCount() {
+    return expList->numCleanupAction;
+}
+
+
+static void doExecuteCleanup( SExceptionNode* node, int32_t anchor, bool failed ) {
+    while( node->numCleanupAction > anchor ) {
+        --node->numCleanupAction;
+        SCleanupAction *ca = node->cleanupActions + node->numCleanupAction;
+        if( failed || !(ca->failOnly) ) {
+            wrappers[ca->wrapper]( ca );
+        }
+    }
+}
+
+void cleanupExecuteTo( int32_t anchor, bool failed ) {
+    doExecuteCleanup( expList, anchor, failed );
+}
+
+void cleanupExecute( SExceptionNode* node, bool failed ) {
+    doExecuteCleanup( node, 0, failed );
+}
+bool cleanupExceedLimit() {
+  return expList->numCleanupAction >= expList->maxCleanupAction;
+}
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index 506829368812325d4c77492ea9411d9952944034..7427a2e4f345887888afe6a6e2901ef8e0d21252 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -14,532 +14,787 @@
  */
 
 #include "os.h"
-
 #include "hash.h"
-#include "tlog.h"
-#include "ttime.h"
-#include "tutil.h"
-
-static FORCE_INLINE void __wr_lock(void *lock) {
-#if defined              LINUX
-  pthread_rwlock_wrlock(lock);
-#else
-  pthread_mutex_lock(lock);
-#endif
+#include "tulog.h"
+#include "taosdef.h"
+
+#define HASH_NEED_RESIZE(_h) ((_h)->size >= (_h)->capacity * HASH_DEFAULT_LOAD_FACTOR)
+
+#define DO_FREE_HASH_NODE(_n) \
+  do {                        \
+    taosTFree((_n)->data);    \
+    taosTFree(_n);            \
+  } while (0)
+
+#define FREE_HASH_NODE(_h, _n)  \
+  do {                          \
+    if ((_h)->freeFp) {         \
+      (_h)->freeFp((_n)->data); \
+    }                           \
+                                \
+    DO_FREE_HASH_NODE(_n);      \
+  } while (0);
+
+static FORCE_INLINE void __wr_lock(void *lock, int32_t type) {
+  if (type == HASH_NO_LOCK) {
+    return;
+  }
+  taosWLockLatch(lock);
 }
 
-static FORCE_INLINE void __rd_lock(void *lock) {
-#if defined              LINUX
-  pthread_rwlock_rdlock(lock);
-#else
-  pthread_mutex_lock(lock);
-#endif
-}
+static FORCE_INLINE void __rd_lock(void *lock, int32_t type) {
+  if (type == HASH_NO_LOCK) {
+    return;
+  }
 
-static FORCE_INLINE void __unlock(void *lock) {
-#if defined              LINUX
-  pthread_rwlock_unlock(lock);
-#else
-  pthread_mutex_unlock(lock);
-#endif
+  taosRLockLatch(lock);
 }
 
-static FORCE_INLINE int32_t __lock_init(void *lock) {
-#if defined                 LINUX
-  return pthread_rwlock_init(lock, NULL);
-#else
-  return pthread_mutex_init(lock, NULL);
-#endif
+static FORCE_INLINE void __rd_unlock(void *lock, int32_t type) {
+  if (type == HASH_NO_LOCK) {
+    return;
+  }
+
+  taosRUnLockLatch(lock);
 }
 
-static FORCE_INLINE void __lock_destroy(void *lock) {
-#if defined              LINUX
-  pthread_rwlock_destroy(lock);
-#else
-  pthread_mutex_destroy(lock);
-#endif
+static FORCE_INLINE void __wr_unlock(void *lock, int32_t type) {
+  if (type == HASH_NO_LOCK) {
+    return;
+  }
+
+  taosWUnLockLatch(lock);
 }
 
 static FORCE_INLINE int32_t taosHashCapacity(int32_t length) {
   int32_t len = MIN(length, HASH_MAX_CAPACITY);
 
-  uint32_t i = 4;
-  while (i < len) i = (i << 1U);
+  int32_t i = 4;
+  while (i < len) i = (i << 1u);
   return i;
 }
 
+static FORCE_INLINE SHashNode *doSearchInEntryList(SHashEntry *pe, const void *key, size_t keyLen, uint32_t hashVal) {
+  SHashNode *pNode = pe->next;
+  while (pNode) {
+    if ((pNode->keyLen == keyLen) && (memcmp(pNode->key, key, keyLen) == 0)) {
+      assert(pNode->hashVal == hashVal);
+      break;
+    }
+
+    pNode = pNode->next;
+  }
+
+  return pNode;
+}
+
 /**
- * hash key function
+ * Resize the hash list if the threshold is reached
  *
- * @param key    key string
- * @param len    length of key
- * @return       hash value
+ * @param pHashObj
  */
-static FORCE_INLINE uint32_t taosHashKey(const char *key, uint32_t len) { return MurmurHash3_32(key, len); }
+static void taosHashTableResize(SHashObj *pHashObj);
 
 /**
- * inplace update node in hash table
- * @param pObj      hash table object
- * @param pNode     data node
+ * @param key      key of object for hash, usually a null-terminated string
+ * @param keyLen   length of key
+ * @param pData    actually data. Requires a consecutive memory block, no pointer is allowed in pData.
+ *                 Pointer copy causes memory access error.
+ * @param dsize    size of data
+ * @return         SHashNode
  */
-static void doUpdateHashTable(HashObj *pObj, SHashNode *pNode) {
-  if (pNode->prev1) {
-    pNode->prev1->next = pNode;
-  }
+static SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, size_t dsize, uint32_t hashVal);
 
-  if (pNode->next) {
-    (pNode->next)->prev = pNode;
-  }
+/**
+ * Update the hash node
+ *
+ * @param pNode   hash node
+ * @param key     key for generate hash value
+ * @param keyLen  key length
+ * @param pData   actual data
+ * @param dsize   size of actual data
+ * @return        hash node
+ */
+static FORCE_INLINE SHashNode *doUpdateHashNode(SHashNode *pNode, SHashNode *pNewNode) {
+  assert(pNode->keyLen == pNewNode->keyLen);
+  SWAP(pNode->key, pNewNode->key, void *);
+  SWAP(pNode->data, pNewNode->data, void *);
 
-  pTrace("key:%s %p update hash table", pNode->key, pNode);
+  return pNewNode;
 }
 
 /**
- * get SHashNode from hashlist, nodes from trash are not included.
- * @param pObj      Cache objection
- * @param key       key for hash
- * @param keyLen    key length
+ * insert the hash node at the front of the linked list
+ *
+ * @param pHashObj
+ * @param pNode
+ */
+static void pushfrontNodeInEntryList(SHashEntry *pEntry, SHashNode *pNode);
+
+/**
+ * Get the next element in hash table for iterator
+ * @param pIter
  * @return
  */
-static SHashNode *doGetNodeFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen, uint32_t *hashVal) {
-  uint32_t hash = (*pObj->hashFp)(key, keyLen);
+static SHashNode *getNextHashNode(SHashMutableIterator *pIter);
+
+SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTypeE type) {
+  if (capacity == 0 || fn == NULL) {
+    return NULL;
+  }
 
-  int32_t     slot = HASH_INDEX(hash, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[slot];
+  SHashObj *pHashObj = (SHashObj *)calloc(1, sizeof(SHashObj));
+  if (pHashObj == NULL) {
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
+  }
 
-  SHashNode *pNode = pEntry->next;
-  while (pNode) {
-    if ((pNode->keyLen == keyLen) && (memcmp(pNode->key, key, keyLen) == 0)) {
-      break;
+  // the max slots is not defined by user
+  pHashObj->capacity = taosHashCapacity((int32_t)capacity);
+  assert((pHashObj->capacity & (pHashObj->capacity - 1)) == 0);
+
+  pHashObj->hashFp = fn;
+  pHashObj->type = type;
+  pHashObj->enableUpdate = update;
+
+  pHashObj->hashList = (SHashEntry **)calloc(pHashObj->capacity, sizeof(void *));
+  if (pHashObj->hashList == NULL) {
+    free(pHashObj);
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
+  } else {
+    pHashObj->pMemBlock = taosArrayInit(8, sizeof(void *));
+
+    void *p = calloc(pHashObj->capacity, sizeof(SHashEntry));
+    for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+      pHashObj->hashList[i] = (void *)((char *)p + i * sizeof(SHashEntry));
     }
 
-    pNode = pNode->next;
+    taosArrayPush(pHashObj->pMemBlock, &p);
   }
 
-  if (pNode) {
-    assert(HASH_INDEX(pNode->hashVal, pObj->capacity) == slot);
+  return pHashObj;
+}
+
+size_t taosHashGetSize(const SHashObj *pHashObj) { return (pHashObj == NULL) ? 0 : pHashObj->size; }
+
+int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t size) {
+  uint32_t   hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
+  SHashNode *pNewNode = doCreateHashNode(key, keyLen, data, size, hashVal);
+  if (pNewNode == NULL) {
+    return -1;
   }
 
-  // return the calculated hash value, to avoid calculating it again in other functions
-  if (hashVal != NULL) {
-    *hashVal = hash;
+  // need the resize process, write lock applied
+  if (HASH_NEED_RESIZE(pHashObj)) {
+    __wr_lock(&pHashObj->lock, pHashObj->type);
+    taosHashTableResize(pHashObj);
+    __wr_unlock(&pHashObj->lock, pHashObj->type);
   }
 
-  return pNode;
-}
+  __rd_lock(&pHashObj->lock, pHashObj->type);
 
-/**
- * resize the hash list if the threshold is reached
- *
- * @param pObj
- */
-static void taosHashTableResize(HashObj *pObj) {
-  if (pObj->size < pObj->capacity * HASH_DEFAULT_LOAD_FACTOR) {
-    return;
-  }
+  int32_t     slot = HASH_INDEX(hashVal, pHashObj->capacity);
+  SHashEntry *pe = pHashObj->hashList[slot];
 
-  // double the original capacity
-  SHashNode *pNode = NULL;
-  SHashNode *pNext = NULL;
+  if (pHashObj->type == HASH_ENTRY_LOCK) {
+    taosWLockLatch(&pe->latch);
+  }
 
-  int32_t newSize = pObj->capacity << 1U;
-  if (newSize > HASH_MAX_CAPACITY) {
-    pTrace("current capacity:%d, maximum capacity:%d, no resize applied due to limitation is reached", pObj->capacity,
-           HASH_MAX_CAPACITY);
-    return;
+  SHashNode *pNode = pe->next;
+  if (pe->num > 0) {
+    assert(pNode != NULL);
+  } else {
+    assert(pNode == NULL);
   }
 
-  int64_t st = taosGetTimestampUs();
+  while (pNode) {
+    if ((pNode->keyLen == keyLen) && (memcmp(pNode->key, key, keyLen) == 0)) {
+      assert(pNode->hashVal == hashVal);
+      break;
+    }
 
-  SHashEntry **pNewEntry = realloc(pObj->hashList, sizeof(SHashEntry*) * newSize);
-  if (pNewEntry == NULL) {
-    pTrace("cache resize failed due to out of memory, capacity remain:%d", pObj->capacity);
-    return;
+    pNode = pNode->next;
   }
 
-  pObj->hashList = pNewEntry;
-  for(int32_t i = pObj->capacity; i < newSize; ++i) {
-    pObj->hashList[i] = calloc(1, sizeof(SHashEntry));
-  }
-  
-  pObj->capacity = newSize;
+  if (pNode == NULL) {
+    // no data in hash table with the specified key, add it into hash table
+    pushfrontNodeInEntryList(pe, pNewNode);
 
-  for (int32_t i = 0; i < pObj->capacity; ++i) {
-    SHashEntry *pEntry = pObj->hashList[i];
+    if (pe->num == 0) {
+      assert(pe->next == NULL);
+    } else {
+      assert(pe->next != NULL);
+    }
 
-    pNode = pEntry->next;
-    if (pNode != NULL) {
-      assert(pNode->prev1 == pEntry && pEntry->num > 0);
+    if (pHashObj->type == HASH_ENTRY_LOCK) {
+      taosWUnLockLatch(&pe->latch);
     }
-    
-    while (pNode) {
-      int32_t j = HASH_INDEX(pNode->hashVal, pObj->capacity);
-      if (j == i) {  // this key resides in the same slot, no need to relocate it
-        pNode = pNode->next;
-      } else {
-        pNext = pNode->next;
 
-        // remove from current slot
-        assert(pNode->prev1 != NULL);
-        
-        if (pNode->prev1 == pEntry) { // first node of the overflow linked list
-          pEntry->next = pNode->next;
-        } else {
-          pNode->prev->next = pNode->next;
-        }
-        
-        pEntry->num--;
-        assert(pEntry->num >= 0);
+    // enable resize
+    __rd_unlock(&pHashObj->lock, pHashObj->type);
+    atomic_add_fetch_64(&pHashObj->size, 1);
 
-        if (pNode->next != NULL) {
-          (pNode->next)->prev = pNode->prev;
-        }
+    return 0;
+  } else {
+    // not support the update operation, return error
+    if (pHashObj->enableUpdate) {
+      doUpdateHashNode(pNode, pNewNode);
+    }
 
-        // added into new slot
-        pNode->next = NULL;
-        pNode->prev1 = NULL;
+    if (pHashObj->type == HASH_ENTRY_LOCK) {
+      taosWUnLockLatch(&pe->latch);
+    }
 
-        SHashEntry *pNewIndexEntry = pObj->hashList[j];
+    // enable resize
+    __rd_unlock(&pHashObj->lock, pHashObj->type);
 
-        if (pNewIndexEntry->next != NULL) {
-          assert(pNewIndexEntry->next->prev1 == pNewIndexEntry);
-          
-          pNewIndexEntry->next->prev = pNode;
-        }
-  
-        pNode->next = pNewIndexEntry->next;
-        pNode->prev1 = pNewIndexEntry;
-        
-        pNewIndexEntry->next = pNode;
-        pNewIndexEntry->num++;
-
-        // continue
-        pNode = pNext;
-      }
-    }
+    DO_FREE_HASH_NODE(pNewNode);
+    return pHashObj->enableUpdate ? 0 : -1;
   }
+}
 
-  int64_t et = taosGetTimestampUs();
-
-  pTrace("hash table resize completed, new capacity:%d, load factor:%f, elapsed time:%fms", pObj->capacity,
-         ((double)pObj->size) / pObj->capacity, (et - st) / 1000.0);
+void *taosHashGet(SHashObj *pHashObj, const void *key, size_t keyLen) {
+  return taosHashGetCB(pHashObj, key, keyLen, NULL, NULL, 0);
 }
 
-/**
- * @param capacity maximum slots available for hash elements
- * @param fn       hash function
- * @return
- */
-void *taosInitHashTable(uint32_t capacity, _hash_fn_t fn, bool multithreadSafe) {
-  if (capacity == 0 || fn == NULL) {
+void* taosHashGetCB(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void* d, size_t dsize) {
+  if (pHashObj->size <= 0 || keyLen == 0 || key == NULL) {
     return NULL;
   }
 
-  HashObj *pObj = (HashObj *)calloc(1, sizeof(HashObj));
-  if (pObj == NULL) {
-    pError("failed to allocate memory, reason:%s", strerror(errno));
-    return NULL;
-  }
+  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
 
-  // the max slots is not defined by user
-  pObj->capacity = taosHashCapacity(capacity);
-  assert((pObj->capacity & (pObj->capacity - 1)) == 0);
+  // only add the read lock to disable the resize process
+  __rd_lock(&pHashObj->lock, pHashObj->type);
 
-  pObj->hashFp = fn;
+  int32_t     slot = HASH_INDEX(hashVal, pHashObj->capacity);
+  SHashEntry *pe = pHashObj->hashList[slot];
 
-  pObj->hashList = (SHashEntry **)calloc(pObj->capacity, sizeof(SHashEntry*));
-  if (pObj->hashList == NULL) {
-    free(pObj);
-    pError("failed to allocate memory, reason:%s", strerror(errno));
+  // no data, return directly
+  if (atomic_load_32(&pe->num) == 0) {
+    __rd_unlock(&pHashObj->lock, pHashObj->type);
     return NULL;
   }
-  
-  for(int32_t i = 0; i < pObj->capacity; ++i) {
-    pObj->hashList[i] = calloc(1, sizeof(SHashEntry));
-  }
 
-  if (multithreadSafe && (__lock_init(pObj) != 0)) {
-    free(pObj->hashList);
-    free(pObj);
+  char *data = NULL;
 
-    pError("failed to init lock, reason:%s", strerror(errno));
-    return NULL;
+  // lock entry
+  if (pHashObj->type == HASH_ENTRY_LOCK) {
+    taosRLockLatch(&pe->latch);
   }
 
-  return (void *)pObj;
-}
-
-/**
- * @param key      key of object for hash, usually a null-terminated string
- * @param keyLen   length of key
- * @param pData    actually data. required a consecutive memory block, no pointer is allowed
- *                 in pData. Pointer copy causes memory access error.
- * @param size     size of block
- * @return         SHashNode
- */
-static SHashNode *doCreateHashNode(const char *key, uint32_t keyLen, const char *pData, size_t dataSize,
-                                   uint32_t hashVal) {
-  size_t totalSize = dataSize + sizeof(SHashNode) + keyLen;
-
-  SHashNode *pNewNode = calloc(1, totalSize);
-  if (pNewNode == NULL) {
-    pError("failed to allocate memory, reason:%s", strerror(errno));
-    return NULL;
+  if (pe->num > 0) {
+    assert(pe->next != NULL);
+  } else {
+    assert(pe->next == NULL);
   }
 
-  memcpy(pNewNode->data, pData, dataSize);
+  SHashNode *pNode = doSearchInEntryList(pe, key, keyLen, hashVal);
+  if (pNode != NULL) {
+    if (fp != NULL) {
+      fp(pNode->data);
+    }
 
-  pNewNode->key = pNewNode->data + dataSize;
-  memcpy(pNewNode->key, key, keyLen);
-  pNewNode->keyLen = keyLen;
+    if (d != NULL) {
+      memcpy(d, pNode->data, dsize);
+    } else {
+      data = pNode->data;
+    }
+  }
 
-  pNewNode->hashVal = hashVal;
+  if (pHashObj->type == HASH_ENTRY_LOCK) {
+    taosRUnLockLatch(&pe->latch);
+  }
 
-  return pNewNode;
+  __rd_unlock(&pHashObj->lock, pHashObj->type);
+  return data;
 }
 
-static SHashNode *doUpdateHashNode(SHashNode *pNode, const char *key, uint32_t keyLen, const char *pData,
-                                   size_t dataSize) {
-  size_t size = dataSize + sizeof(SHashNode) + keyLen;
+int32_t taosHashRemove(SHashObj *pHashObj, const void *key, size_t keyLen) {
+  return taosHashRemoveWithData(pHashObj, key, keyLen, NULL, 0);
+}
 
-  SHashNode *pNewNode = (SHashNode *)realloc(pNode, size);
-  if (pNewNode == NULL) {
-    return NULL;
+int32_t taosHashRemoveWithData(SHashObj *pHashObj, const void *key, size_t keyLen, void *data, size_t dsize) {
+  if (pHashObj == NULL || pHashObj->size <= 0) {
+    return -1;
   }
 
-  memcpy(pNewNode->data, pData, dataSize);
+  uint32_t hashVal = (*pHashObj->hashFp)(key, (uint32_t)keyLen);
 
-  pNewNode->key = pNewNode->data + dataSize;
+  // disable the resize process
+  __rd_lock(&pHashObj->lock, pHashObj->type);
 
-  assert(memcmp(pNewNode->key, key, keyLen) == 0 && keyLen == pNewNode->keyLen);
+  int32_t     slot = HASH_INDEX(hashVal, pHashObj->capacity);
+  SHashEntry *pe = pHashObj->hashList[slot];
 
-  memcpy(pNewNode->key, key, keyLen);
-  return pNewNode;
-}
-
-/**
- * insert the hash node at the front of the linked list
- *
- * @param pObj
- * @param pNode
- */
-static void doAddToHashTable(HashObj *pObj, SHashNode *pNode) {
-  assert(pNode != NULL);
+  // no data, return directly
+  if (pe->num == 0) {
+    __rd_unlock(&pHashObj->lock, pHashObj->type);
+    return -1;
+  }
 
-  int32_t     index = HASH_INDEX(pNode->hashVal, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[index];
-  
-  pNode->next = pEntry->next;
+  if (pHashObj->type == HASH_ENTRY_LOCK) {
+    taosWLockLatch(&pe->latch);
+  }
 
-  if (pEntry->next) {
-    pEntry->next->prev = pNode;
+  if (pe->num == 0) {
+    assert(pe->next == NULL);
+  } else {
+    assert(pe->next != NULL);
   }
 
-  pEntry->next = pNode;
-  pNode->prev1 = pEntry;
-  
-  pEntry->num++;
-  pObj->size++;
-  
-//  char key[512] = {0};
-//  memcpy(key, pNode->key, MIN(512, pNode->keyLen));
-//  pTrace("key:%s %p add to hash table", key, pNode);
-}
+  // double check after locked
+  if (pe->num == 0) {
+    assert(pe->next == NULL);
+    taosWUnLockLatch(&pe->latch);
 
-/**
- * add data node into hash table
- * @param pObj    hash object
- * @param pNode   hash node
- */
-int32_t taosAddToHashTable(HashObj *pObj, const char *key, uint32_t keyLen, void *data, uint32_t size) {
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
+    __rd_unlock(&pHashObj->lock, pHashObj->type);
+    return -1;
   }
 
-  uint32_t   hashVal = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &hashVal);
+  SHashNode *pNode = pe->next;
+  SHashNode *pRes = NULL;
 
-  if (pNode == NULL) {  // no data in hash table with the specified key, add it into hash table
-    taosHashTableResize(pObj);
-
-    SHashNode *pNewNode = doCreateHashNode(key, keyLen, data, size, hashVal);
-    if (pNewNode == NULL) {
-      if (pObj->multithreadSafe) {
-        __unlock(&pObj->lock);
+  // remove it
+  if ((pNode->keyLen == keyLen) && (memcmp(pNode->key, key, keyLen) == 0)) {
+    pe->num -= 1;
+    pRes = pNode;
+    pe->next = pNode->next;
+  } else {
+    while (pNode->next != NULL) {
+      if (((pNode->next)->keyLen == keyLen) && (memcmp((pNode->next)->key, key, keyLen) == 0)) {
+        assert((pNode->next)->hashVal == hashVal);
+        break;
       }
 
-      return -1;
+      pNode = pNode->next;
     }
 
-    doAddToHashTable(pObj, pNewNode);
-  } else {
-    SHashNode *pNewNode = doUpdateHashNode(pNode, key, keyLen, data, size);
-    if (pNewNode == NULL) {
-      if (pObj->multithreadSafe) {
-        __unlock(&pObj->lock);
-      }
 
-      return -1;
+    if (pNode->next != NULL) {
+      pe->num -= 1;
+      pRes = pNode->next;
+      pNode->next = pNode->next->next;
     }
-
-    doUpdateHashTable(pObj, pNewNode);
   }
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
+  if (pe->num == 0) {
+    assert(pe->next == NULL);
+  } else {
+    assert(pe->next != NULL);
   }
 
-  return 0;
-}
-
-char *taosGetDataFromHash(HashObj *pObj, const char *key, uint32_t keyLen) {
-  if (pObj->multithreadSafe) {
-    __rd_lock(&pObj->lock);
+  if (pHashObj->type == HASH_ENTRY_LOCK) {
+    taosWUnLockLatch(&pe->latch);
   }
 
-  uint32_t   hashVal = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &hashVal);
+  __rd_unlock(&pHashObj->lock, pHashObj->type);
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
+  if (data != NULL && pRes != NULL) {
+    memcpy(data, pRes->data, dsize);
   }
 
-  if (pNode != NULL) {
-    assert(pNode->hashVal == hashVal);
-
-    return pNode->data;
+  if (pRes != NULL) {
+    atomic_sub_fetch_64(&pHashObj->size, 1);
+    FREE_HASH_NODE(pHashObj, pRes);
+    return 0;
   } else {
-    return NULL;
+    return -1;
   }
 }
 
-/**
- * remove node in hash list
- * @param pObj
- * @param pNode
- */
-void taosDeleteFromHashTable(HashObj *pObj, const char *key, uint32_t keyLen) {
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
+int32_t taosHashCondTraverse(SHashObj *pHashObj, bool (*fp)(void *, void *), void *param) {
+  if (pHashObj == NULL || pHashObj->size == 0) {
+    return 0;
   }
 
-  uint32_t val = 0;
-  SHashNode *pNode = doGetNodeFromHashTable(pObj, key, keyLen, &val);
-  if (pNode == NULL) {
-    if (pObj->multithreadSafe) {
-      __unlock(&pObj->lock);
-    }
+  // disable the resize process
+  __rd_lock(&pHashObj->lock, pHashObj->type);
 
-    return;
-  }
+  int32_t numOfEntries = (int32_t)pHashObj->capacity;
+  for (int32_t i = 0; i < numOfEntries; ++i) {
+    SHashEntry *pEntry = pHashObj->hashList[i];
+    if (pEntry->num == 0) {
+      continue;
+    }
 
-  SHashNode *pNext = pNode->next;
-  if (pNode->prev != NULL) {
-    int32_t slot = HASH_INDEX(val, pObj->capacity);
-    if (pObj->hashList[slot]->next == pNode) {
-      pObj->hashList[slot]->next = pNext;
-    } else {
-      pNode->prev->next = pNext;
+    if (pHashObj->type == HASH_ENTRY_LOCK) {
+      taosWLockLatch(&pEntry->latch);
     }
-  }
-  
-  if (pNext != NULL) {
-    pNext->prev = pNode->prev;
-  }
 
-  uint32_t    index = HASH_INDEX(pNode->hashVal, pObj->capacity);
-  SHashEntry *pEntry = pObj->hashList[index];
-  pEntry->num--;
+    // todo remove the first node
+    SHashNode *pNode = NULL;
+    while((pNode = pEntry->next) != NULL) {
+      if (fp && (!fp(param, pNode->data))) {
+        pEntry->num -= 1;
+        atomic_sub_fetch_64(&pHashObj->size, 1);
 
-  pObj->size--;
+        pEntry->next = pNode->next;
 
-  pNode->next = NULL;
-  pNode->prev = NULL;
+        if (pEntry->num == 0) {
+          assert(pEntry->next == NULL);
+        } else {
+          assert(pEntry->next != NULL);
+        }
 
-  pTrace("key:%s %p remove from hash table", pNode->key, pNode);
-  tfree(pNode);
+        FREE_HASH_NODE(pHashObj, pNode);
+      } else {
+        break;
+      }
+    }
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
+    // handle the following node
+    if (pNode != NULL) {
+      assert(pNode == pEntry->next);
+      SHashNode *pNext = NULL;
+
+      while ((pNext = pNode->next) != NULL) {
+        // not qualified, remove it
+        if (fp && (!fp(param, pNext->data))) {
+          pNode->next = pNext->next;
+          pEntry->num -= 1;
+          atomic_sub_fetch_64(&pHashObj->size, 1);
+
+          if (pEntry->num == 0) {
+            assert(pEntry->next == NULL);
+          } else {
+            assert(pEntry->next != NULL);
+          }
+
+          FREE_HASH_NODE(pHashObj, pNext);
+        } else {
+          pNode = pNext;
+        }
+      }
+    }
+
+    if (pHashObj->type == HASH_ENTRY_LOCK) {
+      taosWUnLockLatch(&pEntry->latch);
+    }
   }
+
+  __rd_unlock(&pHashObj->lock, pHashObj->type);
+  return 0;
 }
 
-void taosCleanUpHashTable(void *handle) {
-  HashObj *pObj = (HashObj *)handle;
-  if (pObj == NULL || pObj->capacity <= 0) return;
+void taosHashCleanup(SHashObj *pHashObj) {
+  if (pHashObj == NULL) {
+    return;
+  }
 
   SHashNode *pNode, *pNext;
 
-  if (pObj->multithreadSafe) {
-    __wr_lock(&pObj->lock);
-  }
+  __wr_lock(&pHashObj->lock, pHashObj->type);
+
+  if (pHashObj->hashList) {
+    for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+      SHashEntry *pEntry = pHashObj->hashList[i];
+      if (pEntry->num == 0) {
+        assert(pEntry->next == 0);
+        continue;
+      }
 
-  if (pObj->hashList) {
-    for (int32_t i = 0; i < pObj->capacity; ++i) {
-      SHashEntry *pEntry = pObj->hashList[i];
       pNode = pEntry->next;
+      assert(pNode != NULL);
 
       while (pNode) {
         pNext = pNode->next;
-        free(pNode);
+        FREE_HASH_NODE(pHashObj, pNode);
+
         pNode = pNext;
       }
-      
-      tfree(pEntry);
     }
 
-    free(pObj->hashList);
+    free(pHashObj->hashList);
+  }
+
+  __wr_unlock(&pHashObj->lock, pHashObj->type);
+
+  // destroy mem block
+  size_t memBlock = taosArrayGetSize(pHashObj->pMemBlock);
+  for (int32_t i = 0; i < memBlock; ++i) {
+    void *p = taosArrayGetP(pHashObj->pMemBlock, i);
+    taosTFree(p);
   }
 
-  if (pObj->multithreadSafe) {
-    __unlock(&pObj->lock);
-    __lock_destroy(&pObj->lock);
+  taosArrayDestroy(pHashObj->pMemBlock);
+
+  memset(pHashObj, 0, sizeof(SHashObj));
+  free(pHashObj);
+}
+
+SHashMutableIterator *taosHashCreateIter(SHashObj *pHashObj) {
+  SHashMutableIterator *pIter = calloc(1, sizeof(SHashMutableIterator));
+  if (pIter == NULL) {
+    return NULL;
   }
 
-  memset(pObj, 0, sizeof(HashObj));
-  free(pObj);
+  pIter->pHashObj = pHashObj;
+
+  // keep it in local variable, in case the resize operation expand the size
+  pIter->numOfEntries = pHashObj->capacity;
+  return pIter;
+}
+
+bool taosHashIterNext(SHashMutableIterator *pIter) {
+  if (pIter == NULL) {
+    return false;
+  }
+
+  size_t size = taosHashGetSize(pIter->pHashObj);
+  if (size == 0) {
+    return false;
+  }
+
+  // check the first one
+  if (pIter->numOfChecked == 0) {
+    assert(pIter->pCur == NULL && pIter->pNext == NULL);
+
+    while (1) {
+      SHashEntry *pEntry = pIter->pHashObj->hashList[pIter->entryIndex];
+      if (pEntry->num == 0) {
+        assert(pEntry->next == NULL);
+
+        pIter->entryIndex++;
+        continue;
+      }
+
+      if (pIter->pHashObj->type == HASH_ENTRY_LOCK) {
+        taosRLockLatch(&pEntry->latch);
+      }
+
+      pIter->pCur = pEntry->next;
+
+      if (pIter->pCur->next) {
+        pIter->pNext = pIter->pCur->next;
+
+        if (pIter->pHashObj->type == HASH_ENTRY_LOCK) {
+          taosRUnLockLatch(&pEntry->latch);
+        }
+      } else {
+        if (pIter->pHashObj->type == HASH_ENTRY_LOCK) {
+          taosRUnLockLatch(&pEntry->latch);
+        }
+
+        pIter->pNext = getNextHashNode(pIter);
+      }
+
+      break;
+    }
+
+    pIter->numOfChecked++;
+    return true;
+  } else {
+    assert(pIter->pCur != NULL);
+    if (pIter->pNext) {
+      pIter->pCur = pIter->pNext;
+    } else {  // no more data in the hash list
+      return false;
+    }
+
+    pIter->numOfChecked++;
+
+    if (pIter->pCur->next) {
+      pIter->pNext = pIter->pCur->next;
+    } else {
+      pIter->pNext = getNextHashNode(pIter);
+    }
+
+    return true;
+  }
+}
+
+void *taosHashIterGet(SHashMutableIterator *iter) { return (iter == NULL) ? NULL : iter->pCur->data; }
+
+void *taosHashDestroyIter(SHashMutableIterator *iter) {
+  if (iter == NULL) {
+    return NULL;
+  }
+
+  free(iter);
+  return NULL;
 }
 
 // for profile only
-int32_t taosGetHashMaxOverflowLength(HashObj* pObj) {
-  if (pObj == NULL || pObj->size == 0) {
+int32_t taosHashGetMaxOverflowLinkLength(const SHashObj *pHashObj) {
+  if (pHashObj == NULL || pHashObj->size == 0) {
     return 0;
   }
-  
+
   int32_t num = 0;
-  
-  for(int32_t i = 0; i < pObj->size; ++i) {
-    SHashEntry *pEntry = pObj->hashList[i];
+
+  for (int32_t i = 0; i < pHashObj->size; ++i) {
+    SHashEntry *pEntry = pHashObj->hashList[i];
     if (num < pEntry->num) {
       num = pEntry->num;
     }
   }
-  
+
   return num;
 }
 
-int32_t taosCheckHashTable(HashObj *pObj) {
-  for(int32_t i = 0; i < pObj->capacity; ++i) {
-    SHashEntry *pEntry = pObj->hashList[i];
-    
-    SHashNode* pNode = pEntry->next;
+void taosHashTableResize(SHashObj *pHashObj) {
+  if (!HASH_NEED_RESIZE(pHashObj)) {
+    return;
+  }
+
+  // double the original capacity
+  SHashNode *pNode = NULL;
+  SHashNode *pNext = NULL;
+
+  int32_t newSize = (int32_t)(pHashObj->capacity << 1u);
+  if (newSize > HASH_MAX_CAPACITY) {
+    //    uDebug("current capacity:%d, maximum capacity:%d, no resize applied due to limitation is reached",
+    //           pHashObj->capacity, HASH_MAX_CAPACITY);
+    return;
+  }
+
+  int64_t st = taosGetTimestampUs();
+  void *pNewEntryList = realloc(pHashObj->hashList, sizeof(void *) * newSize);
+  if (pNewEntryList == NULL) {  // todo handle error
+    //    uDebug("cache resize failed due to out of memory, capacity remain:%d", pHashObj->capacity);
+    return;
+  }
+
+  pHashObj->hashList = pNewEntryList;
+
+  size_t inc = newSize - pHashObj->capacity;
+  void * p = calloc(inc, sizeof(SHashEntry));
+
+  for (int32_t i = 0; i < inc; ++i) {
+    pHashObj->hashList[i + pHashObj->capacity] = (void *)((char *)p + i * sizeof(SHashEntry));
+  }
+
+  taosArrayPush(pHashObj->pMemBlock, &p);
+
+  pHashObj->capacity = newSize;
+  for (int32_t i = 0; i < pHashObj->capacity; ++i) {
+    SHashEntry *pe = pHashObj->hashList[i];
+
+    if (pe->num == 0) {
+      assert(pe->next == NULL);
+    } else {
+      assert(pe->next != NULL);
+    }
+
+    if (pe->num == 0) {
+      assert(pe->next == NULL);
+      continue;
+    }
+
+    while ((pNode = pe->next) != NULL) {
+      int32_t j = HASH_INDEX(pNode->hashVal, pHashObj->capacity);
+      if (j != i) {
+        pe->num -= 1;
+        pe->next = pNode->next;
+
+        if (pe->num == 0) {
+          assert(pe->next == NULL);
+        } else {
+          assert(pe->next != NULL);
+        }
+
+        SHashEntry *pNewEntry = pHashObj->hashList[j];
+        pushfrontNodeInEntryList(pNewEntry, pNode);
+      } else {
+        break;
+      }
+    }
+
     if (pNode != NULL) {
-      assert(pEntry == pNode->prev1);
-      int32_t num = 1;
-      
-      SHashNode* pNext = pNode->next;
-      
-      while(pNext) {
-        assert(pNext->prev == pNode);
-        
-        pNode = pNext;
-        pNext = pNext->next;
-        num ++;
+      while ((pNext = pNode->next) != NULL) {
+        int32_t j = HASH_INDEX(pNext->hashVal, pHashObj->capacity);
+        if (j != i) {
+          pe->num -= 1;
+
+          pNode->next = pNext->next;
+          pNext->next = NULL;
+
+          // added into new slot
+          SHashEntry *pNewEntry = pHashObj->hashList[j];
+
+          if (pNewEntry->num == 0) {
+            assert(pNewEntry->next == NULL);
+          } else {
+            assert(pNewEntry->next != NULL);
+          }
+
+          pushfrontNodeInEntryList(pNewEntry, pNext);
+        } else {
+          pNode = pNext;
+        }
       }
-      
-      assert(num == pEntry->num);
+
+      if (pe->num == 0) {
+        assert(pe->next == NULL);
+      } else {
+        assert(pe->next != NULL);
+      }
+
     }
+
   }
-  
-  return 0;
+
+  int64_t et = taosGetTimestampUs();
+
+  uDebug("hash table resize completed, new capacity:%"PRId64", load factor:%f, elapsed time:%fms", pHashObj->capacity,
+           ((double)pHashObj->size) / pHashObj->capacity, (et - st) / 1000.0);
+}
+
+SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, size_t dsize, uint32_t hashVal) {
+  SHashNode *pNewNode = calloc(1, sizeof(SHashNode));
+
+  if (pNewNode == NULL) {
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
+  }
+
+  pNewNode->data = malloc(dsize + keyLen);
+  memcpy(pNewNode->data, pData, dsize);
+
+  pNewNode->key = pNewNode->data + dsize;
+  memcpy(pNewNode->key, key, keyLen);
+
+  pNewNode->keyLen = (uint32_t)keyLen;
+  pNewNode->hashVal = hashVal;
+  return pNewNode;
+}
+
+void pushfrontNodeInEntryList(SHashEntry *pEntry, SHashNode *pNode) {
+  assert(pNode != NULL && pEntry != NULL);
+
+  pNode->next = pEntry->next;
+  pEntry->next = pNode;
+
+  pEntry->num += 1;
+}
+
+SHashNode *getNextHashNode(SHashMutableIterator *pIter) {
+  assert(pIter != NULL);
+
+  pIter->entryIndex++;
+  SHashNode *p = NULL;
+
+  while (pIter->entryIndex < pIter->numOfEntries) {
+    SHashEntry *pEntry = pIter->pHashObj->hashList[pIter->entryIndex];
+    if (pEntry->num == 0) {
+      pIter->entryIndex++;
+      continue;
+    }
+
+    if (pIter->pHashObj->type == HASH_ENTRY_LOCK) {
+      taosRLockLatch(&pEntry->latch);
+    }
+
+    p = pEntry->next;
+
+    if (pIter->pHashObj->type == HASH_ENTRY_LOCK) {
+      taosRUnLockLatch(&pEntry->latch);
+    }
+
+    return p;
+  }
+
+  return NULL;
 }
diff --git a/src/util/src/ihash.c b/src/util/src/ihash.c
deleted file mode 100644
index 8c492b03f867036d3fcb3a52f872f57142cba7ec..0000000000000000000000000000000000000000
--- a/src/util/src/ihash.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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 "os.h"
-
-typedef struct _str_node_t {
-  uint64_t             key;
-  struct _str_node_t *prev;
-  struct _str_node_t *next;
-  char                data[];
-} IHashNode;
-
-typedef struct {
-  IHashNode **hashList;
-  int32_t     maxSessions;
-  int32_t     dataSize;
-  int32_t (*hashFp)(void *, uint64_t key);
-  pthread_mutex_t mutex;
-} IHashObj;
-
-int32_t taosHashInt(void *handle, uint64_t key) {
-  IHashObj *pObj = (IHashObj *)handle;
-  int32_t   hash = key % pObj->maxSessions;
-  return hash;
-}
-
-char *taosAddIntHash(void *handle, uint64_t key, char *pData) {
-  int32_t    hash;
-  IHashNode *pNode;
-  IHashObj * pObj;
-
-  pObj = (IHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = (*pObj->hashFp)(pObj, key);
-
-  pNode = (IHashNode *)malloc(sizeof(IHashNode) + (size_t)pObj->dataSize);
-  if (pNode == NULL)
-    return NULL;
-  
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode->key = key;
-  if (pData != NULL) {
-    memcpy(pNode->data, pData, (size_t)pObj->dataSize);
-  }
-  pNode->prev = 0;
-  pNode->next = pObj->hashList[hash];
-
-  if (pObj->hashList[hash] != 0) (pObj->hashList[hash])->prev = pNode;
-  pObj->hashList[hash] = pNode;
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  return (char *)pNode->data;
-}
-
-void taosDeleteIntHash(void *handle, uint64_t key) {
-  int32_t    hash;
-  IHashNode *pNode;
-  IHashObj * pObj;
-
-  pObj = (IHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  hash = (*(pObj->hashFp))(pObj, key);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->hashList[hash];
-  while (pNode) {
-    if (pNode->key == key) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->hashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    free(pNode);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-}
-
-char *taosGetIntHashData(void *handle, uint64_t key) {
-  int32_t    hash;
-  IHashNode *pNode;
-  IHashObj * pObj;
-
-  pObj = (IHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-
-  hash = (*pObj->hashFp)(pObj, key);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->hashList[hash];
-
-  while (pNode) {
-    if (pNode->key == key) {
-      break;
-    }
-
-    pNode = pNode->next;
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  if (pNode) return pNode->data;
-
-  return NULL;
-}
-
-void *taosInitIntHash(int32_t maxSessions, int32_t dataSize, int32_t (*fp)(void *, uint64_t)) {
-  IHashObj *pObj;
-
-  pObj = (IHashObj *)malloc(sizeof(IHashObj));
-  if (pObj == NULL) {
-    return NULL;
-  }
-
-  memset(pObj, 0, sizeof(IHashObj));
-  pObj->maxSessions = maxSessions;
-  pObj->dataSize = dataSize;
-  pObj->hashFp = fp;
-
-  pObj->hashList = (IHashNode **)malloc(sizeof(IHashNode *) * (size_t)maxSessions);
-  if (pObj->hashList == NULL) {
-    free(pObj);
-    return NULL;
-  }
-  memset(pObj->hashList, 0, sizeof(IHashNode *) * (size_t)maxSessions);
-
-  pthread_mutex_init(&pObj->mutex, NULL);
-
-  return pObj;
-}
-
-void taosCleanUpIntHash(void *handle) {
-  IHashObj * pObj;
-  IHashNode *pNode, *pNext;
-
-  pObj = (IHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions <= 0) return;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  if (pObj->hashList) {
-    for (int32_t i = 0; i < pObj->maxSessions; ++i) {
-      pNode = pObj->hashList[i];
-      while (pNode) {
-        pNext = pNode->next;
-        free(pNode);
-        pNode = pNext;
-      }
-    }
-
-    free(pObj->hashList);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  pthread_mutex_destroy(&pObj->mutex);
-
-  memset(pObj, 0, sizeof(IHashObj));
-  free(pObj);
-}
diff --git a/src/util/src/shash.c b/src/util/src/shash.c
deleted file mode 100644
index 5be0dfa9739157ab231bdad7c52d7e15416736dd..0000000000000000000000000000000000000000
--- a/src/util/src/shash.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * 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 <ctype.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "shash.h"
-#include "tlog.h"
-
-typedef struct _str_node_t {
-  char *              string;
-  struct _str_node_t *prev;
-  struct _str_node_t *next;
-  char                data[];
-} SHashNode;
-
-typedef struct {
-  SHashNode **hashList;
-  uint32_t    maxSessions;
-  uint32_t    dataSize;
-  uint32_t (*hashFp)(void *, char *string);
-  pthread_mutex_t mutex;
-} SHashObj;
-
-uint32_t taosHashString(void *handle, char *string) {
-  SHashObj *pObj = (SHashObj *)handle;
-  uint32_t  hash = 0, hashv;
-  char *    c;
-
-  c = string;
-  while (*c) {
-    hash += *((int *)c);
-    c += 4;
-  }
-
-  hashv = hash / pObj->maxSessions;
-  hash = (hashv + hash % pObj->maxSessions) % pObj->maxSessions;
-
-  return hash;
-}
-
-uint32_t taosHashStringStep1(void *handle, char *string) {
-  SHashObj *pObj = (SHashObj *)handle;
-  uint32_t  hash = 0, hashv;
-  char *    c;
-
-  c = string;
-  while (*c) {
-    hash += *c;
-    c++;
-  }
-
-  hashv = hash / pObj->maxSessions;
-  hash = (hashv + hash % pObj->maxSessions) % pObj->maxSessions;
-
-  return hash;
-}
-
-void *taosAddStrHashWithSize(void *handle, char *string, char *pData, int dataSize) {
-  uint32_t   hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-  if (string == NULL || string[0] == 0) return NULL;
-
-  hash = (*pObj->hashFp)(pObj, string);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = (SHashNode *)malloc(sizeof(SHashNode) + (size_t)dataSize + strlen(string) + 1);
-  memcpy(pNode->data, pData, (size_t)dataSize);
-  pNode->prev = 0;
-  pNode->next = pObj->hashList[hash];
-  pNode->string = pNode->data + dataSize;
-  strcpy(pNode->string, string);
-
-  if (pObj->hashList[hash] != 0) (pObj->hashList[hash])->prev = pNode;
-  pObj->hashList[hash] = pNode;
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  pTrace("hash:%d:%s is added", hash, string);
-
-  return pNode->data;
-}
-
-void *taosAddStrHash(void *handle, char *string, char *pData) {
-  if (string == NULL || string[0] == 0) return NULL;
-
-  SHashObj *pObj = (SHashObj *)handle;
-  return taosAddStrHashWithSize(handle, string, pData, pObj->dataSize);
-}
-
-void taosDeleteStrHashNode(void *handle, char *string, void *pDeleteNode) {
-  uint32_t   hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-  bool       find = false;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-  if (string == NULL || string[0] == 0) return;
-
-  hash = (*(pObj->hashFp))(pObj, string);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->hashList[hash];
-
-  while (pNode) {
-    if (strcmp(pNode->string, string) != 0) continue;
-    if (pNode->data == pDeleteNode) {
-      find = true;
-      break;
-    }
-
-    pNode = pNode->next;
-  }
-
-  if (find) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->hashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    pTrace("hash:%d:%s:%p is removed", hash, string, pNode);
-
-    free(pNode);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-}
-
-void taosDeleteStrHash(void *handle, char *string) {
-  uint32_t   hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-  if (string == NULL || string[0] == 0) return;
-
-  hash = (*(pObj->hashFp))(pObj, string);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->hashList[hash];
-  while (pNode) {
-    if (strcmp(pNode->string, string) == 0) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->hashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    pTrace("hash:%d:%s:%p is removed", hash, string, pNode);
-
-    free(pNode);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-}
-
-void *taosGetStrHashData(void *handle, char *string) {
-  uint32_t   hash;
-  SHashNode *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return NULL;
-  if (string == NULL || string[0] == 0) return NULL;
-
-  hash = (*pObj->hashFp)(pObj, string);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->hashList[hash];
-
-  while (pNode) {
-    if (strcmp(pNode->string, string) == 0) {
-      pTrace("hash:%d:%s is retrieved", hash, string);
-      break;
-    }
-
-    pNode = pNode->next;
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  if (pNode) return pNode->data;
-
-  return NULL;
-}
-
-void *taosInitStrHash(uint32_t maxSessions, uint32_t dataSize, uint32_t (*fp)(void *, char *)) {
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)malloc(sizeof(SHashObj));
-  if (pObj == NULL) {
-    return NULL;
-  }
-
-  memset(pObj, 0, sizeof(SHashObj));
-  pObj->maxSessions = maxSessions;
-  pObj->dataSize = dataSize;
-  pObj->hashFp = fp;
-
-  pObj->hashList = (SHashNode **)malloc(sizeof(SHashNode *) * (size_t)maxSessions);
-  if (pObj->hashList == NULL) {
-    free(pObj);
-    return NULL;
-  }
-  memset(pObj->hashList, 0, sizeof(SHashNode *) * (size_t)maxSessions);
-
-  pthread_mutex_init(&pObj->mutex, NULL);
-
-  return pObj;
-}
-
-void taosCleanUpStrHashWithFp(void *handle, void (*fp)(char *)) {
-  SHashObj * pObj;
-  SHashNode *pNode, *pNext;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions <= 0) return;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  if (pObj->hashList) {
-    for (int i = 0; i < pObj->maxSessions; ++i) {
-      pNode = pObj->hashList[i];
-      while (pNode) {
-        pNext = pNode->next;
-        if (fp != NULL) fp(pNode->data);
-        free(pNode);
-        pNode = pNext;
-      }
-    }
-
-    free(pObj->hashList);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  pthread_mutex_destroy(&pObj->mutex);
-
-  memset(pObj, 0, sizeof(SHashObj));
-  free(pObj);
-}
-
-void taosCleanUpStrHash(void *handle) { taosCleanUpStrHashWithFp(handle, NULL); }
-
-char *taosVisitStrHashWithFp(void *handle, int (*fp)(char *)) {
-  SHashObj * pObj;
-  SHashNode *pNode, *pNext;
-  char *     pData = NULL;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions <= 0) return NULL;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  if (pObj->hashList) {
-    for (int i = 0; i < pObj->maxSessions; ++i) {
-      pNode = pObj->hashList[i];
-      while (pNode) {
-        pNext = pNode->next;
-        int flag = fp(pNode->data);
-        if (flag) {
-          pData = pNode->data;
-          goto VisitEnd;
-        }
-
-        pNode = pNext;
-      }
-    }
-  }
-
-VisitEnd:
-
-  pthread_mutex_unlock(&pObj->mutex);
-  return pData;
-}
diff --git a/src/util/src/talgo.c b/src/util/src/talgo.c
new file mode 100644
index 0000000000000000000000000000000000000000..4b96e62e91ff440684328d7e7ea8c8c6cd783caa
--- /dev/null
+++ b/src/util/src/talgo.c
@@ -0,0 +1,227 @@
+/*
+ * 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 "os.h"
+#include "tutil.h"
+#include "talgo.h"
+
+#define doswap(__left, __right, __size, __buf) do {\
+  memcpy((__buf), (__left), (__size));\
+  memcpy((__left), (__right),(__size));\
+  memcpy((__right), (__buf), (__size));\
+} while (0);
+
+static void median(void *src, size_t size, size_t s, size_t e, const void *param, __ext_compar_fn_t comparFn, void* buf) {
+  int32_t mid = ((int32_t)(e - s) >> 1u) + (int32_t)s;
+  
+  if (comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, s), param) == 1) {
+    doswap(elePtrAt(src, size, mid), elePtrAt(src, size, s), size, buf);
+  }
+  
+  if (comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, e), param) == 1) {
+    doswap(elePtrAt(src, size, mid), elePtrAt(src, size, s), size, buf);
+    doswap(elePtrAt(src, size, mid), elePtrAt(src, size, e), size, buf);
+  } else if (comparFn(elePtrAt(src, size, s), elePtrAt(src, size, e), param) == 1) {
+    doswap(elePtrAt(src, size, s), elePtrAt(src, size, e), size, buf);
+  }
+  
+  assert(comparFn(elePtrAt(src, size, mid), elePtrAt(src, size, s), param) <= 0 && comparFn(elePtrAt(src, size, s), elePtrAt(src, size, e), param) <= 0);
+
+#ifdef _DEBUG_VIEW
+//  tTagsPrints(src[s], pOrderDesc->pColumnModel, &pOrderDesc->orderIdx);
+//  tTagsPrints(src[mid], pOrderDesc->pColumnModel, &pOrderDesc->orderIdx);
+//  tTagsPrints(src[e], pOrderDesc->pColumnModel, &pOrderDesc->orderIdx);
+#endif
+}
+
+static void tInsertSort(void *src, size_t size, int32_t s, int32_t e, const void *param, __ext_compar_fn_t comparFn,
+                        void* buf) {
+  for (int32_t i = s + 1; i <= e; ++i) {
+    for (int32_t j = i; j > s; --j) {
+      if (comparFn(elePtrAt(src, size, j), elePtrAt(src, size, j - 1), param) == -1) {
+        doswap(elePtrAt(src, size, j), elePtrAt(src, size, j - 1), size, buf);
+      } else {
+        break;
+      }
+    }
+  }
+}
+
+static void tqsortImpl(void *src, int32_t start, int32_t end, size_t size, const void *param, __ext_compar_fn_t comparFn,
+                void* buf) {
+  // short array sort, incur another sort procedure instead of quick sort process
+  const int32_t THRESHOLD_SIZE = 6;
+  if (end - start + 1 <= THRESHOLD_SIZE) {
+    tInsertSort(src, size, start, end, param, comparFn, buf);
+    return;
+  }
+  
+  median(src, size, start, end, param, comparFn, buf);
+  
+  int32_t s = start, e = end;
+  int32_t endRightS = end, startLeftS = start;
+  
+  while (s < e) {
+    while (e > s) {
+      int32_t ret = comparFn(elePtrAt(src, size, e), elePtrAt(src, size, s), param);
+      if (ret < 0) {
+        break;
+      }
+      
+      //move the data that equals to pivotal value to the right end of the list
+      if (ret == 0 && e != endRightS) {
+        doswap(elePtrAt(src, size, e), elePtrAt(src, size, endRightS), size, buf);
+        endRightS--;
+      }
+      
+      e--;
+    }
+    
+    if (e != s) {
+      doswap(elePtrAt(src, size, e), elePtrAt(src, size, s), size, buf);
+    }
+    
+    while (s < e) {
+      int32_t ret = comparFn(elePtrAt(src, size, s), elePtrAt(src, size, e), param);
+      if (ret > 0) {
+        break;
+      }
+      
+      if (ret == 0 && s != startLeftS) {
+        doswap(elePtrAt(src, size, s), elePtrAt(src, size, startLeftS), size, buf);
+        startLeftS++;
+      }
+      s++;
+    }
+    
+    if (e != s) {
+      doswap(elePtrAt(src, size, s), elePtrAt(src, size, e), size, buf);
+    }
+  }
+  
+  int32_t rightPartStart = e + 1;
+  if (endRightS != end && e < end) {
+    int32_t left = rightPartStart;
+    int32_t right = end;
+    
+    while (right > endRightS && left <= endRightS) {
+      doswap(elePtrAt(src, size, left), elePtrAt(src, size, right), size, buf);
+      
+      left++;
+      right--;
+    }
+    
+    rightPartStart += (end - endRightS);
+  }
+  
+  int32_t leftPartEnd = e - 1;
+  if (startLeftS != end && s > start) {
+    int32_t left = start;
+    int32_t right = leftPartEnd;
+    
+    while (left < startLeftS && right >= startLeftS) {
+      doswap(elePtrAt(src, size, left), elePtrAt(src, size, right), size, buf);
+      
+      left++;
+      right--;
+    }
+    
+    leftPartEnd -= (startLeftS - start);
+  }
+  
+  if (leftPartEnd > start) {
+    tqsortImpl(src, start, leftPartEnd, size, param, comparFn, buf);
+  }
+  
+  if (rightPartStart < end) {
+    tqsortImpl(src, rightPartStart, end, size, param, comparFn, buf);
+  }
+}
+
+void taosqsort(void *src, size_t numOfElem, size_t size, const void* param, __ext_compar_fn_t comparFn) {
+  char *buf = calloc(1, size);   // prepare the swap buffer
+  tqsortImpl(src, 0, (int32_t)numOfElem - 1, (int32_t)size, param, comparFn, buf);
+  taosTFree(buf);
+}
+
+void * taosbsearch(const void *key, const void *base, size_t nmemb, size_t size, __compar_fn_t compar, int flags) {
+  // TODO: need to check the correctness of this function
+  int l = 0;
+  int r = (int)nmemb;
+  int idx = 0;
+  int comparison;
+  
+  if (flags == TD_EQ) {
+    return bsearch(key, base, nmemb, size, compar);
+  } else if (flags == TD_GE) {
+    if (nmemb <= 0) return NULL;
+    if ((*compar)(key, elePtrAt(base, size, 0)) <= 0) return elePtrAt(base, size, 0);
+    if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) > 0) return NULL;
+    
+    while (l < r) {
+      idx = (l + r) / 2;
+      comparison = (*compar)(key, elePtrAt(base, size, idx));
+      if (comparison < 0) {
+        r = idx;
+      } else if (comparison > 0) {
+        l = idx + 1;
+      } else {
+        return elePtrAt(base, size, idx);
+      }
+    }
+    
+    if ((*compar)(key, elePtrAt(base, size, idx)) < 0) {
+      return elePtrAt(base, size, idx);
+    } else {
+      if (idx + 1 > nmemb - 1) {
+        return NULL;
+      } else {
+        return elePtrAt(base, size, idx + 1);
+      }
+    }
+  } else if (flags == TD_LE) {
+    if (nmemb <= 0) return NULL;
+    if ((*compar)(key, elePtrAt(base, size, nmemb - 1)) >= 0) return elePtrAt(base, size, nmemb - 1);
+    if ((*compar)(key, elePtrAt(base, size, 0)) < 0) return NULL;
+    
+    while (l < r) {
+      idx = (l + r) / 2;
+      comparison = (*compar)(key, elePtrAt(base, size, idx));
+      if (comparison < 0) {
+        r = idx;
+      } else if (comparison > 0) {
+        l = idx + 1;
+      } else {
+        return elePtrAt(base, size, idx);
+      }
+    }
+    
+    if ((*compar)(key, elePtrAt(base, size, idx)) > 0) {
+      return elePtrAt(base, size, idx);
+    } else {
+      if (idx == 0) {
+        return NULL;
+      } else {
+        return elePtrAt(base, size, idx - 1);
+      }
+    }
+    
+  } else {
+    assert(0);
+    return NULL;
+  }
+  
+  return NULL;
+}
diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
new file mode 100644
index 0000000000000000000000000000000000000000..65147b38def067bdca5de7c403835f8505a9b98e
--- /dev/null
+++ b/src/util/src/tarray.c
@@ -0,0 +1,220 @@
+/*
+ * 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 "tarray.h"
+
+void* taosArrayInit(size_t size, size_t elemSize) {
+  assert(elemSize > 0);
+
+  if (size < TARRAY_MIN_SIZE) {
+    size = TARRAY_MIN_SIZE;
+  }
+
+  SArray* pArray = calloc(1, sizeof(SArray));
+  if (pArray == NULL) {
+    return NULL;
+  }
+
+  pArray->pData = calloc(size, elemSize);
+  if (pArray->pData == NULL) {
+    free(pArray);
+    return NULL;
+  }
+
+  pArray->capacity = size;
+  pArray->elemSize = elemSize;
+  return pArray;
+}
+
+static int32_t taosArrayResize(SArray* pArray) {
+  assert(pArray->size >= pArray->capacity);
+
+  size_t size = pArray->capacity;
+  size = (size << 1u);
+
+  void* tmp = realloc(pArray->pData, size * pArray->elemSize);
+  if (tmp == NULL) {  // reallocate failed, the original buffer remains
+    return -1;
+  }
+
+  pArray->pData = tmp;
+  pArray->capacity = size;
+  
+  return 0;
+}
+
+void* taosArrayPush(SArray* pArray, void* pData) {
+  if (pArray == NULL || pData == NULL) {
+    return NULL;
+  }
+
+  if (pArray->size >= pArray->capacity) {
+    int32_t ret = taosArrayResize(pArray);
+    
+    // failed to push data into buffer due to the failure of memory allocation
+    if (ret != 0) {
+      return NULL;
+    }
+  }
+
+  void* dst = TARRAY_GET_ELEM(pArray, pArray->size);
+  memcpy(dst, pData, pArray->elemSize);
+
+  pArray->size += 1;
+  return dst;
+}
+
+void* taosArrayPop(SArray* pArray) {
+  assert( pArray != NULL );
+
+  if (pArray->size == 0) {
+    return NULL;
+  }
+  pArray->size -= 1;
+  return TARRAY_GET_ELEM(pArray, pArray->size);
+}
+
+void* taosArrayGet(const SArray* pArray, size_t index) {
+  assert(index < pArray->size);
+  return TARRAY_GET_ELEM(pArray, index);
+}
+
+void* taosArrayGetP(const SArray* pArray, size_t index) {
+  assert(index < pArray->size);
+  
+  void* d = TARRAY_GET_ELEM(pArray, index);
+  
+  return *(void**)d;
+}
+
+size_t taosArrayGetSize(const SArray* pArray) { return pArray->size; }
+
+void* taosArrayInsert(SArray* pArray, size_t index, void* pData) {
+  if (pArray == NULL || pData == NULL) {
+    return NULL;
+  }
+
+  if (index >= pArray->size) {
+    return taosArrayPush(pArray, pData);
+  }
+
+  if (pArray->size >= pArray->capacity) {
+    int32_t ret = taosArrayResize(pArray);
+    
+    if (ret < 0) {
+      return NULL;
+    }
+  }
+
+  void* dst = TARRAY_GET_ELEM(pArray, index);
+
+  int32_t remain = (int32_t)(pArray->size - index);
+  memmove((char*)dst + pArray->elemSize, (char*)dst, pArray->elemSize * remain);
+  memcpy(dst, pData, pArray->elemSize);
+
+  pArray->size += 1;
+  
+  return dst;
+}
+
+void taosArrayRemove(SArray* pArray, size_t index) {
+  assert(index < pArray->size);
+  
+  if (index == pArray->size - 1) {
+    taosArrayPop(pArray);
+    return;
+  }
+  
+  size_t remain = pArray->size - index - 1;
+  memmove((char*)pArray->pData + index * pArray->elemSize, (char*)pArray->pData + (index + 1) * pArray->elemSize, remain * pArray->elemSize);
+  pArray->size -= 1;
+}
+
+void taosArrayCopy(SArray* pDst, const SArray* pSrc) {
+  assert(pSrc != NULL && pDst != NULL);
+  
+  if (pDst->capacity < pSrc->size) {
+    void* pData = realloc(pDst->pData, pSrc->size * pSrc->elemSize);
+    if (pData == NULL) { // todo handle oom
+    
+    } else {
+      pDst->pData = pData;
+      pDst->capacity = pSrc->size;
+    }
+  }
+  
+  memcpy(pDst->pData, pSrc->pData, pSrc->elemSize * pSrc->size);
+  pDst->elemSize = pSrc->elemSize;
+  pDst->capacity = pSrc->size;
+  pDst->size = pSrc->size;
+}
+
+SArray* taosArrayClone(const SArray* pSrc) {
+  assert(pSrc != NULL);
+  
+  if (pSrc->size == 0) { // empty array list
+    return taosArrayInit(8, pSrc->elemSize);
+  }
+  
+  SArray* dst = taosArrayInit(pSrc->size, pSrc->elemSize);
+  
+  memcpy(dst->pData, pSrc->pData, pSrc->elemSize * pSrc->size);
+  dst->size = pSrc->size;
+  return dst;
+}
+
+void taosArrayClear(SArray* pArray) {
+  assert( pArray != NULL );
+  pArray->size = 0;
+}
+
+void taosArrayDestroy(SArray* pArray) {
+  if (pArray == NULL) {
+    return;
+  }
+
+  free(pArray->pData);
+  free(pArray);
+}
+
+void taosArraySort(SArray* pArray, int (*compar)(const void*, const void*)) {
+  assert(pArray != NULL);
+  assert(compar != NULL);
+
+  qsort(pArray->pData, pArray->size, pArray->elemSize, compar);
+}
+
+void* taosArraySearch(const SArray* pArray, const void* key, __compar_fn_t comparFn) {
+  assert(pArray != NULL && comparFn != NULL);
+  assert(key != NULL);
+
+  return bsearch(key, pArray->pData, pArray->size, pArray->elemSize, comparFn);
+}
+
+void taosArraySortString(SArray* pArray, __compar_fn_t comparFn) {
+  assert(pArray != NULL);
+  qsort(pArray->pData, pArray->size, pArray->elemSize, comparFn);
+}
+
+char* taosArraySearchString(const SArray* pArray, const char* key, __compar_fn_t comparFn) {
+  assert(pArray != NULL);
+  assert(key != NULL);
+
+  void* p = bsearch(&key, pArray->pData, pArray->size, pArray->elemSize, comparFn);
+  if (p == NULL) {
+    return NULL;
+  }
+  return *(char**)p;
+}
\ No newline at end of file
diff --git a/src/util/src/tbuffer.c b/src/util/src/tbuffer.c
new file mode 100644
index 0000000000000000000000000000000000000000..240f744ea3083e1b21f60076032483f828298167
--- /dev/null
+++ b/src/util/src/tbuffer.c
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2020 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 "os.h"
+#include <stdlib.h>
+#include <memory.h>
+#include <assert.h>
+#include "tbuffer.h"
+#include "exception.h"
+#include <taoserror.h>
+
+////////////////////////////////////////////////////////////////////////////////
+// reader functions
+
+size_t tbufSkip(SBufferReader* buf, size_t size) {
+  if( (buf->pos + size) > buf->size ) {
+    THROW( TSDB_CODE_COM_MEMORY_CORRUPTED );
+  }
+  size_t old = buf->pos;
+  buf->pos += size;
+  return old;
+}
+
+const char* tbufRead( SBufferReader* buf, size_t size ) {
+  const char* ret = buf->data + buf->pos;
+  tbufSkip( buf, size );
+  return ret;
+}
+
+void tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size ) {
+  assert( dst != NULL );
+  // always using memcpy, leave optimization to compiler
+  memcpy( dst, tbufRead(buf, size), size );
+}
+
+static size_t tbufReadLength( SBufferReader* buf ) {
+  // maximum length is 65535, if larger length is required
+  // this function and the corresponding write function need to be
+  // revised.
+  uint16_t l = tbufReadUint16( buf );
+  return l;
+}
+
+const char* tbufReadString( SBufferReader* buf, size_t* len ) {
+  size_t l = tbufReadLength( buf );
+  const char* ret = buf->data + buf->pos;
+  tbufSkip( buf, l + 1 );
+  if( ret[l] != 0 ) {
+    THROW( TSDB_CODE_COM_MEMORY_CORRUPTED );
+  }
+  if( len != NULL ) {
+    *len = l;
+  }
+  return ret;
+}
+
+size_t tbufReadToString( SBufferReader* buf, char* dst, size_t size ) {
+  assert( dst != NULL );
+  size_t len;
+  const char* str = tbufReadString( buf, &len );
+  if (len >= size) {
+    len = size - 1;
+  }
+  memcpy( dst, str, len );
+  dst[len] = 0;
+  return len;
+}
+
+const char* tbufReadBinary( SBufferReader* buf, size_t *len ) {
+  size_t l = tbufReadLength( buf );
+  const char* ret = buf->data + buf->pos;
+  tbufSkip( buf, l );
+  if( len != NULL ) {
+    *len = l;
+  }
+  return ret;
+}
+
+size_t tbufReadToBinary( SBufferReader* buf, void* dst, size_t size ) {
+  assert( dst != NULL );
+  size_t len;
+  const char* data = tbufReadBinary( buf, &len );
+  if( len >= size ) {
+    len = size;
+  }
+  memcpy( dst, data, len );
+  return len;
+}
+
+bool tbufReadBool( SBufferReader* buf ) {
+  bool ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  return ret;
+}
+
+char tbufReadChar( SBufferReader* buf ) {
+  char ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  return ret;
+}
+
+int8_t tbufReadInt8( SBufferReader* buf ) {
+  int8_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  return ret;
+}
+
+uint8_t tbufReadUint8( SBufferReader* buf ) {
+  uint8_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  return ret;
+}
+
+int16_t tbufReadInt16( SBufferReader* buf ) {
+  int16_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return (int16_t)ntohs( ret );
+  }
+  return ret;
+}
+
+uint16_t tbufReadUint16( SBufferReader* buf ) {
+  uint16_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return ntohs( ret );
+  }
+  return ret;
+}
+
+int32_t tbufReadInt32( SBufferReader* buf ) {
+  int32_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return (int32_t)ntohl( ret );
+  }
+  return ret;
+}
+
+uint32_t tbufReadUint32( SBufferReader* buf ) {
+  uint32_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return ntohl( ret );
+  }
+  return ret;
+}
+
+int64_t tbufReadInt64( SBufferReader* buf ) {
+  int64_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return (int64_t)htobe64( ret ); // TODO: ntohll
+  }
+  return ret;
+}
+
+uint64_t tbufReadUint64( SBufferReader* buf ) {
+  uint64_t ret;
+  tbufReadToBuffer( buf, &ret, sizeof(ret) );
+  if( buf->endian ) {
+    return htobe64( ret ); // TODO: ntohll
+  }
+  return ret;
+}
+
+float tbufReadFloat( SBufferReader* buf ) {
+  uint32_t ret = tbufReadUint32( buf );
+  return *(float*)( &ret );
+}
+
+double tbufReadDouble(SBufferReader* buf) {
+  uint64_t ret = tbufReadUint64( buf );
+  return *(double*)( &ret );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// writer functions
+
+void tbufCloseWriter( SBufferWriter* buf ) {
+  (*buf->allocator)( buf->data, 0 );
+  buf->data = NULL;
+  buf->pos = 0;
+  buf->size = 0;
+}
+
+void tbufEnsureCapacity( SBufferWriter* buf, size_t size ) {
+  size += buf->pos;
+  if( size > buf->size ) {
+    size_t nsize = size + buf->size;
+    char* data = (*buf->allocator)( buf->data, nsize );
+    // TODO: the exception should be thrown by the allocator function
+    if( data == NULL ) {
+      THROW( TSDB_CODE_COM_OUT_OF_MEMORY );
+    }
+    buf->data = data;
+    buf->size = nsize;
+  }
+}
+
+size_t tbufReserve( SBufferWriter* buf, size_t size ) {
+  tbufEnsureCapacity( buf, size );
+  size_t old = buf->pos;
+  buf->pos += size;
+  return old;
+}
+
+char* tbufGetData( SBufferWriter* buf, bool takeOver ) {
+  char* ret = buf->data;
+  if( takeOver ) {
+    buf->pos = 0;
+    buf->size = 0;
+    buf->data = NULL;
+  }
+  return ret;
+}
+
+void tbufWrite( SBufferWriter* buf, const void* data, size_t size ) {
+  assert( data != NULL );
+  tbufEnsureCapacity( buf, size );
+  memcpy( buf->data + buf->pos, data, size );
+  buf->pos += size;
+}
+
+void tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size ) {
+  assert( data != NULL );
+  // this function can only be called to fill the gap on previous writes,
+  // so 'pos + size <= buf->pos' must be true
+  assert( pos + size <= buf->pos );
+  memcpy( buf->data + pos, data, size );
+}
+
+static void tbufWriteLength( SBufferWriter* buf, size_t len ) {
+  // maximum length is 65535, if larger length is required
+  // this function and the corresponding read function need to be
+  // revised.
+  assert( len <= 0xffff );
+  tbufWriteUint16( buf, (uint16_t)len );
+}
+
+void tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len ) {
+  tbufWriteLength( buf, len );
+  tbufWrite( buf, str, len );
+  tbufWriteChar( buf, '\0' );
+}
+
+void tbufWriteString( SBufferWriter* buf, const char* str ) {
+  tbufWriteStringLen( buf, str, strlen(str) );
+}
+
+void tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len ) {
+  tbufWriteLength( buf, len );
+  tbufWrite( buf, data, len );
+}
+
+void tbufWriteBool( SBufferWriter* buf, bool data ) {
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data ) {
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteChar( SBufferWriter* buf, char data ) {
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data ) {
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteInt8( SBufferWriter* buf, int8_t data ) {
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data ) {
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteUint8( SBufferWriter* buf, uint8_t data ) {
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data ) {
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteInt16( SBufferWriter* buf, int16_t data ) {
+  if( buf->endian ) {
+    data = (int16_t)htons( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data ) {
+  if( buf->endian ) {
+    data = (int16_t)htons( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteUint16( SBufferWriter* buf, uint16_t data ) {
+  if( buf->endian ) {
+    data = htons( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data ) {
+  if( buf->endian ) {
+    data = htons( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteInt32( SBufferWriter* buf, int32_t data ) {
+  if( buf->endian ) {
+    data = (int32_t)htonl( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data ) {
+  if( buf->endian ) {
+    data = (int32_t)htonl( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteUint32( SBufferWriter* buf, uint32_t data ) {
+  if( buf->endian ) {
+    data = htonl( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data ) {
+  if( buf->endian ) {
+    data = htonl( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteInt64( SBufferWriter* buf, int64_t data ) {
+  if( buf->endian ) {
+    data = (int64_t)htobe64( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data ) {
+  if( buf->endian ) {
+    data = (int64_t)htobe64( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteUint64( SBufferWriter* buf, uint64_t data ) {
+  if( buf->endian ) {
+    data = htobe64( data );
+  }
+  tbufWrite( buf, &data, sizeof(data) );
+}
+
+void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data ) {
+  if( buf->endian ) {
+    data = htobe64( data );
+  }
+  tbufWriteAt( buf, pos, &data, sizeof(data) );
+}
+
+void tbufWriteFloat( SBufferWriter* buf, float data ) {
+  tbufWriteUint32( buf, *(uint32_t*)(&data) );
+}
+
+void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data ) {
+  tbufWriteUint32At( buf, pos, *(uint32_t*)(&data) );
+}
+
+void tbufWriteDouble( SBufferWriter* buf, double data ) {
+  tbufWriteUint64( buf, *(uint64_t*)(&data) );
+}
+
+void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data ) {
+  tbufWriteUint64At( buf, pos, *(uint64_t*)(&data) );
+}
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index e6213c45a41f104e6d948c2b46e281e9909ea2b8..2637699adb1c6b7508418fe10e189ff37a969b2a 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -13,935 +13,677 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
-
-#include "tcache.h"
-#include "tlog.h"
-#include "ttime.h"
+#include "tulog.h"
 #include "ttimer.h"
 #include "tutil.h"
-#include "hashutil.h"
-
-#define HASH_MAX_CAPACITY   (1024*1024*16)
-#define HASH_VALUE_IN_TRASH (-1)
-#define HASH_DEFAULT_LOAD_FACTOR (0.75)
-#define HASH_INDEX(v, c) ((v) & ((c)-1))
-
-/**
- * todo: refactor to extract the hash table out of cache structure
- */
-typedef struct SCacheStatis {
-  int64_t missCount;
-  int64_t hitCount;
-  int64_t totalAccess;
-  int64_t refreshCount;
-  int32_t numOfCollision;
-  int32_t numOfResize;
-  int64_t resizeTime;
-} SCacheStatis;
-
-typedef struct _cache_node_t {
-  char *                key;  // null-terminated string
-  struct _cache_node_t *prev;
-  struct _cache_node_t *next;
-  uint64_t              addTime;  // the time when this element is added or updated into cache
-  uint64_t              time;     // end time when this element should be remove from cache
-  uint64_t              signature;
-
-  /*
-   * reference count for this object
-   * if this value is larger than 0, this value will never be released
-   */
-  uint32_t refCount;
-  uint32_t hashVal;   // the hash value of key, if hashVal == HASH_VALUE_IN_TRASH, this node is moved to trash
-  uint32_t nodeSize;  // allocated size for current SDataNode
-  char     data[];
-} SDataNode;
-
-typedef uint32_t (*_hashFunc)(const char *, uint32_t);
-
-typedef struct {
-  SDataNode **hashList;
-  int         capacity;
-  int         size;
-  int64_t     totalSize;  // total allocated buffer in this hash table, SCacheObj is not included.
-  int64_t     refreshTime;
-
-  /*
-   * to accommodate the old datanode which has the same key value of new one in hashList
-   * when an new node is put into cache, if an existed one with the same key:
-   * 1. if the old one does not be referenced, update it.
-   * 2. otherwise, move the old one to pTrash, add the new one.
-   *
-   * when the node in pTrash does not be referenced, it will be release at the expired time
-   */
-  SDataNode *  pTrash;
-  void *       tmrCtrl;
-  void *       pTimer;
-  SCacheStatis statistics;
-  _hashFunc    hashFp;
-  int          numOfElemsInTrash;  // number of element in trash
-  int16_t      deleting;           // set the deleting flag to stop refreshing asap.
-
-#if defined        LINUX
-  pthread_rwlock_t lock;
-#else
-  pthread_mutex_t lock;
-#endif
-
-} SCacheObj;
-
-static FORCE_INLINE void __cache_wr_lock(SCacheObj *pObj) {
-#if defined LINUX
-  pthread_rwlock_wrlock(&pObj->lock);
-#else
-  pthread_mutex_lock(&pObj->lock);
-#endif
-}
+#include "tcache.h"
+#include "hash.h"
+#include "hashfunc.h"
 
-static FORCE_INLINE void __cache_rd_lock(SCacheObj *pObj) {
-#if defined LINUX
-  pthread_rwlock_rdlock(&pObj->lock);
+static FORCE_INLINE void __cache_wr_lock(SCacheObj *pCacheObj) {
+#if defined(LINUX)
+  pthread_rwlock_wrlock(&pCacheObj->lock);
 #else
-  pthread_mutex_lock(&pObj->lock);
+  pthread_mutex_lock(&pCacheObj->lock);
 #endif
 }
 
-static FORCE_INLINE void __cache_unlock(SCacheObj *pObj) {
-#if defined LINUX
-  pthread_rwlock_unlock(&pObj->lock);
+static FORCE_INLINE void __cache_unlock(SCacheObj *pCacheObj) {
+#if defined(LINUX)
+  pthread_rwlock_unlock(&pCacheObj->lock);
 #else
-  pthread_mutex_unlock(&pObj->lock);
+  pthread_mutex_unlock(&pCacheObj->lock);
 #endif
 }
 
-static FORCE_INLINE int32_t __cache_lock_init(SCacheObj *pObj) {
-#if defined LINUX
-  return pthread_rwlock_init(&pObj->lock, NULL);
+static FORCE_INLINE int32_t __cache_lock_init(SCacheObj *pCacheObj) {
+#if defined(LINUX)
+  return pthread_rwlock_init(&pCacheObj->lock, NULL);
 #else
-  return pthread_mutex_init(&pObj->lock, NULL);
+  return pthread_mutex_init(&pCacheObj->lock, NULL);
 #endif
 }
 
-static FORCE_INLINE void __cache_lock_destroy(SCacheObj *pObj) {
-#if defined LINUX
-  pthread_rwlock_destroy(&pObj->lock);
+static FORCE_INLINE void __cache_lock_destroy(SCacheObj *pCacheObj) {
+#if defined(LINUX)
+  pthread_rwlock_destroy(&pCacheObj->lock);
 #else
-  pthread_mutex_destroy(&pObj->lock);
+  pthread_mutex_destroy(&pCacheObj->lock);
 #endif
 }
 
-static FORCE_INLINE int32_t taosHashTableLength(int32_t length) {
-  int32_t trueLength = MIN(length, HASH_MAX_CAPACITY);
-
-  int32_t i = 4;
-  while (i < trueLength) i = (i << 1);
-  return i;
-}
-
 /**
  * @param key      key of object for hash, usually a null-terminated string
  * @param keyLen   length of key
  * @param pData    actually data. required a consecutive memory block, no pointer is allowed
  *                 in pData. Pointer copy causes memory access error.
  * @param size     size of block
- * @param lifespan total survial time from now
- * @return         SDataNode
+ * @param lifespan total survial expiredTime from now
+ * @return         SCacheDataNode
  */
-static SDataNode *taosCreateHashNode(const char *key, uint32_t keyLen, const char *pData, size_t dataSize,
-                                     uint64_t lifespan) {
-  size_t totalSize = dataSize + sizeof(SDataNode) + keyLen;
-
-  SDataNode *pNewNode = calloc(1, totalSize);
-  if (pNewNode == NULL) {
-    pError("failed to allocate memory, reason:%s", strerror(errno));
-    return NULL;
-  }
-
-  memcpy(pNewNode->data, pData, dataSize);
-  pNewNode->addTime = (uint64_t)taosGetTimestampMs();
-  pNewNode->time = pNewNode->addTime + lifespan;
-
-  pNewNode->key = pNewNode->data + dataSize;
-  strcpy(pNewNode->key, key);
-
-  pNewNode->signature = (uint64_t)pNewNode;
-  pNewNode->nodeSize = (uint32_t)totalSize;
-
-  return pNewNode;
-}
-
-/**
- * hash key function
- *
- * @param key    key string
- * @param len    length of key
- * @return       hash value
- */
-static FORCE_INLINE uint32_t taosHashKey(const char *key, uint32_t len) { return MurmurHash3_32(key, len); }
+static SCacheDataNode *taosCreateCacheNode(const char *key, size_t keyLen, const char *pData, size_t size, uint64_t duration);
 
 /**
- * add object node into trash, and this object is closed for referencing if it is add to trash
+ * addedTime object node into trash, and this object is closed for referencing if it is addedTime to trash
  * It will be removed until the pNode->refCount == 0
- * @param pObj    Cache object
+ * @param pCacheObj    Cache object
  * @param pNode   Cache slot object
  */
-static void taosAddToTrash(SCacheObj *pObj, SDataNode *pNode) {
-  if (pNode->hashVal == HASH_VALUE_IN_TRASH) { /* node is already in trash */
-    return;
-  }
-
-  pNode->next = pObj->pTrash;
-  if (pObj->pTrash) {
-    pObj->pTrash->prev = pNode;
-  }
-
-  pNode->prev = NULL;
-  pObj->pTrash = pNode;
-
-  pNode->hashVal = HASH_VALUE_IN_TRASH;
-  pObj->numOfElemsInTrash++;
+static void taosAddToTrashcan(SCacheObj *pCacheObj, SCacheDataNode *pNode);
 
-  pTrace("key:%s %p move to trash, numOfElem in trash:%d", pNode->key, pNode, pObj->numOfElemsInTrash);
-}
-
-static void taosRemoveFromTrash(SCacheObj *pObj, SDataNode *pNode) {
-  if (pNode->signature != (uint64_t)pNode) {
-    pError("key:sig:%d %p data has been released, ignore", pNode->signature, pNode);
-    return;
-  }
-
-  pObj->numOfElemsInTrash--;
-  if (pNode->prev) {
-    pNode->prev->next = pNode->next;
-  } else {
-    /* pnode is the header, update header */
-    pObj->pTrash = pNode->next;
-  }
-
-  if (pNode->next) {
-    pNode->next->prev = pNode->prev;
-  }
-
-  pNode->signature = 0;
-  free(pNode);
-}
 /**
  * remove nodes in trash with refCount == 0 in cache
  * @param pNode
- * @param pObj
+ * @param pCacheObj
  * @param force   force model, if true, remove data in trash without check refcount.
  *                may cause corruption. So, forece model only applys before cache is closed
  */
-static void taosClearCacheTrash(SCacheObj *pObj, bool force) {
-  __cache_wr_lock(pObj);
-
-  if (pObj->numOfElemsInTrash == 0) {
-    if (pObj->pTrash != NULL) {
-      pError("key:inconsistency data in cache, numOfElem in trash:%d", pObj->numOfElemsInTrash);
-    }
-    pObj->pTrash = NULL;
+static void taosTrashcanEmpty(SCacheObj *pCacheObj, bool force);
 
-    __cache_unlock(pObj);
+/**
+ * release node
+ * @param pCacheObj      cache object
+ * @param pNode          data node
+ */
+static FORCE_INLINE void taosCacheReleaseNode(SCacheObj *pCacheObj, SCacheDataNode *pNode) {
+  if (pNode->signature != (uint64_t)pNode) {
+    uError("key:%s, %p data is invalid, or has been released", pNode->key, pNode);
     return;
   }
 
-  SDataNode *pNode = pObj->pTrash;
+  pCacheObj->totalSize -= pNode->size;
+  int32_t size = (int32_t)taosHashGetSize(pCacheObj->pHashTable);
+  assert(size > 0);
 
-  while (pNode) {
-    if (pNode->refCount < 0) {
-      pError("key:%s %p in trash released more than referenced, removed", pNode->key, pNode);
-      pNode->refCount = 0;
-    }
-
-    if (pNode->next == pNode) {
-      pNode->next = NULL;
-    }
+  uDebug("cache:%s, key:%p, %p is destroyed from cache, size:%dbytes, totalNum:%d size:%" PRId64 "bytes",
+         pCacheObj->name, pNode->key, pNode->data, pNode->size, size - 1, pCacheObj->totalSize);
 
-    if (force || (pNode->refCount == 0)) {
-      pTrace("key:%s %p removed from trash. numOfElem in trash:%d", pNode->key, pNode, pObj->numOfElemsInTrash - 1)
-      SDataNode *pTmp = pNode;
-      pNode = pNode->next;
-      taosRemoveFromTrash(pObj, pTmp);
-    } else {
-      pNode = pNode->next;
-    }
+  if (pCacheObj->freeFp) {
+    pCacheObj->freeFp(pNode->data);
   }
 
-  assert(pObj->numOfElemsInTrash >= 0);
-  __cache_unlock(pObj);
+  free(pNode);
 }
 
-/**
- * add data node into cache
- * @param pObj    cache object
- * @param pNode   Cache slot object
- */
-static void taosAddNodeToHashTable(SCacheObj *pObj, SDataNode *pNode) {
-  int32_t slotIndex = HASH_INDEX(pNode->hashVal, pObj->capacity);
-  pNode->next = pObj->hashList[slotIndex];
-
-  if (pObj->hashList[slotIndex] != NULL) {
-    (pObj->hashList[slotIndex])->prev = pNode;
-    pObj->statistics.numOfCollision++;
+static FORCE_INLINE void doRemoveElemInTrashcan(SCacheObj* pCacheObj, STrashElem *pElem) {
+  if (pElem->pData->signature != (uint64_t) pElem->pData) {
+    uWarn("key:sig:0x%" PRIx64 " %p data has been released, ignore", pElem->pData->signature, pElem->pData);
+    return;
   }
-  pObj->hashList[slotIndex] = pNode;
-
-  pObj->size++;
-  pObj->totalSize += pNode->nodeSize;
-
-  pTrace("key:%s %p add to hash table", pNode->key, pNode);
-}
-
-/**
- * remove node in hash list
- * @param pObj
- * @param pNode
- */
-static void taosRemoveNodeInHashTable(SCacheObj *pObj, SDataNode *pNode) {
-  if (pNode->hashVal == HASH_VALUE_IN_TRASH) return;
 
-  SDataNode *pNext = pNode->next;
-  if (pNode->prev != NULL) {
-    pNode->prev->next = pNext;
-  } else { /* the node is in hashlist, remove it */
-    pObj->hashList[HASH_INDEX(pNode->hashVal, pObj->capacity)] = pNext;
+  pCacheObj->numOfElemsInTrash--;
+  if (pElem->prev) {
+    pElem->prev->next = pElem->next;
+  } else { // pnode is the header, update header
+    pCacheObj->pTrash = pElem->next;
   }
 
-  if (pNext != NULL) {
-    pNext->prev = pNode->prev;
+  if (pElem->next) {
+    pElem->next->prev = pElem->prev;
   }
-
-  pObj->size--;
-  pObj->totalSize -= pNode->nodeSize;
-
-  pNode->next = NULL;
-  pNode->prev = NULL;
-
-  pTrace("key:%s %p remove from hashtable", pNode->key, pNode);
 }
 
-/**
- * in-place node in hashlist
- * @param pObj      cache object
- * @param pNode     data node
- */
-static void taosUpdateInHashTable(SCacheObj *pObj, SDataNode *pNode) {
-  assert(pNode->hashVal >= 0);
-
-  if (pNode->prev) {
-    pNode->prev->next = pNode;
-  } else {
-    pObj->hashList[HASH_INDEX(pNode->hashVal, pObj->capacity)] = pNode;
+static FORCE_INLINE void doDestroyTrashcanElem(SCacheObj* pCacheObj, STrashElem *pElem) {
+  if (pCacheObj->freeFp) {
+    pCacheObj->freeFp(pElem->pData->data);
   }
 
-  if (pNode->next) {
-    (pNode->next)->prev = pNode;
-  }
-
-  pTrace("key:%s %p update hashtable", pNode->key, pNode);
+  free(pElem->pData);
+  free(pElem);
 }
 
 /**
- * get SDataNode from hashlist, nodes from trash are not included.
- * @param pObj      Cache objection
- * @param key       key for hash
- * @param keyLen    key length
- * @return
+ * do cleanup the taos cache
+ * @param pCacheObj
  */
-static SDataNode *taosGetNodeFromHashTable(SCacheObj *pObj, const char *key, uint32_t keyLen) {
-  uint32_t hash = (*pObj->hashFp)(key, keyLen);
-
-  int32_t    slot = HASH_INDEX(hash, pObj->capacity);
-  SDataNode *pNode = pObj->hashList[slot];
-
-  while (pNode) {
-    if (strcmp(pNode->key, key) == 0) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    assert(HASH_INDEX(pNode->hashVal, pObj->capacity) == slot);
-  }
-
-  return pNode;
-}
+static void doCleanupDataCache(SCacheObj *pCacheObj);
 
 /**
- * resize the hash list if the threshold is reached
- *
- * @param pObj
+ * refresh cache to remove data in both hash list and trash, if any nodes' refcount == 0, every pCacheObj->refreshTime
+ * @param handle   Cache object handle
  */
-static void taosHashTableResize(SCacheObj *pObj) {
-  if (pObj->size < pObj->capacity * HASH_DEFAULT_LOAD_FACTOR) {
-    return;
-  }
-
-  // double the original capacity
-  pObj->statistics.numOfResize++;
-  SDataNode *pNode = NULL;
-  SDataNode *pNext = NULL;
+static void* taosCacheTimedRefresh(void *handle);
 
-  int32_t newSize = pObj->capacity << 1;
-  if (newSize > HASH_MAX_CAPACITY) {
-    pTrace("current capacity:%d, maximum capacity:%d, no resize applied due to limitation is reached",
-           pObj->capacity, HASH_MAX_CAPACITY);
-    return;
+SCacheObj *taosCacheInit(int32_t keyType, int64_t refreshTimeInSeconds, bool extendLifespan, __cache_free_fn_t fn, const char* cacheName) {
+  if (refreshTimeInSeconds <= 0) {
+    return NULL;
   }
-
-  int64_t     st = taosGetTimestampUs();
-  SDataNode **pList = realloc(pObj->hashList, sizeof(SDataNode *) * newSize);
-  if (pList == NULL) {
-    pTrace("cache resize failed due to out of memory, capacity remain:%d", pObj->capacity);
-    return;
+  
+  SCacheObj *pCacheObj = (SCacheObj *)calloc(1, sizeof(SCacheObj));
+  if (pCacheObj == NULL) {
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
+  }
+  
+  pCacheObj->pHashTable = taosHashInit(4096, taosGetDefaultHashFunction(keyType), false, HASH_ENTRY_LOCK);
+  pCacheObj->name = strdup(cacheName);
+  if (pCacheObj->pHashTable == NULL) {
+    free(pCacheObj);
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
+  }
+  
+  // set free cache node callback function
+  pCacheObj->freeFp = fn;
+  pCacheObj->refreshTime = refreshTimeInSeconds * 1000;
+  pCacheObj->extendLifespan = extendLifespan;
+
+  if (__cache_lock_init(pCacheObj) != 0) {
+    taosHashCleanup(pCacheObj->pHashTable);
+    free(pCacheObj);
+    
+    uError("failed to init lock, reason:%s", strerror(errno));
+    return NULL;
   }
 
-  pObj->hashList = pList;
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
 
-  int32_t inc = newSize - pObj->capacity;
-  memset(&pObj->hashList[pObj->capacity], 0, inc * sizeof(SDataNode *));
+  pthread_create(&pCacheObj->refreshWorker, &thattr, taosCacheTimedRefresh, pCacheObj);
 
-  pObj->capacity = newSize;
+  pthread_attr_destroy(&thattr);
+  return pCacheObj;
+}
 
-  for (int32_t i = 0; i < pObj->capacity; ++i) {
-    pNode = pObj->hashList[i];
+void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int durationMS) {
+  if (pCacheObj == NULL || pCacheObj->pHashTable == NULL || pCacheObj->deleting == 1) {
+    return NULL;
+  }
 
-    while (pNode) {
-      int32_t j = HASH_INDEX(pNode->hashVal, pObj->capacity);
-      if (j == i) {  // this key resides in the same slot, no need to relocate it
-        pNode = pNode->next;
-      } else {
-        pNext = pNode->next;
+  SCacheDataNode *pNode1 = taosCreateCacheNode(key, keyLen, pData, dataSize, durationMS);
+  if (pNode1 == NULL) {
+    uError("cache:%s, key:%p, failed to added into cache, out of memory", pCacheObj->name, key);
+    return NULL;
+  }
 
-        // remove from current slot
-        if (pNode->prev != NULL) {
-          pNode->prev->next = pNode->next;
+  T_REF_INC(pNode1);
+
+  int32_t succ = taosHashPut(pCacheObj->pHashTable, key, keyLen, &pNode1, sizeof(void *));
+  if (succ == 0) {
+    atomic_add_fetch_64(&pCacheObj->totalSize, pNode1->size);
+    uDebug("cache:%s, key:%p, %p added into cache, added:%" PRIu64 ", expire:%" PRIu64
+           ", totalNum:%d totalSize:%" PRId64 "bytes size:%" PRId64 "bytes",
+           pCacheObj->name, key, pNode1->data, pNode1->addedTime, pNode1->expireTime,
+           (int32_t)taosHashGetSize(pCacheObj->pHashTable), pCacheObj->totalSize, (int64_t)dataSize);
+  } else {  // duplicated key exists
+    while (1) {
+      SCacheDataNode* p = NULL;
+      int32_t ret = taosHashRemoveWithData(pCacheObj->pHashTable, key, keyLen, (void*) &p, sizeof(void*));
+
+      // add to trashcan
+      if (ret == 0) {
+        if (T_REF_VAL_GET(p) == 0) {
+          if (pCacheObj->freeFp) {
+            pCacheObj->freeFp(p->data);
+          }
+
+          taosTFree(p);
         } else {
-          pObj->hashList[i] = pNode->next;
+          taosAddToTrashcan(pCacheObj, p);
+          uDebug("cache:%s, key:%p, %p exist in cache, updated old:%p", pCacheObj->name, key, pNode1->data, p->data);
         }
+      }
 
-        if (pNode->next != NULL) {
-          (pNode->next)->prev = pNode->prev;
-        }
+      assert(T_REF_VAL_GET(pNode1) == 1);
 
-        // added into new slot
-        pNode->next = NULL;
-        pNode->prev = NULL;
+      ret = taosHashPut(pCacheObj->pHashTable, key, keyLen, &pNode1, sizeof(void *));
+      if (ret == 0) {
+        atomic_add_fetch_64(&pCacheObj->totalSize, pNode1->size);
 
-        pNode->next = pObj->hashList[j];
+        uDebug("cache:%s, key:%p, %p added into cache, added:%" PRIu64 ", expire:%" PRIu64
+               ", totalNum:%d totalSize:%" PRId64 "bytes size:%" PRId64 "bytes",
+               pCacheObj->name, key, pNode1->data, pNode1->addedTime, pNode1->expireTime,
+               (int32_t)taosHashGetSize(pCacheObj->pHashTable), pCacheObj->totalSize, (int64_t)dataSize);
 
-        if (pObj->hashList[j] != NULL) {
-          (pObj->hashList[j])->prev = pNode;
-        }
-        pObj->hashList[j] = pNode;
+        return pNode1->data;
 
-        // continue
-        pNode = pNext;
+      } else {
+        // failed, try again
       }
     }
   }
 
-  int64_t et = taosGetTimestampUs();
-  pObj->statistics.resizeTime += (et - st);
-
-  pTrace("cache resize completed, new capacity:%d, load factor:%f, elapsed time:%fms", pObj->capacity,
-         ((double)pObj->size) / pObj->capacity, (et - st) / 1000.0);
+  return pNode1->data;
 }
 
-/**
- * release node
- * @param pObj      cache object
- * @param pNode     data node
- */
-static FORCE_INLINE void taosCacheReleaseNode(SCacheObj *pObj, SDataNode *pNode) {
-  taosRemoveNodeInHashTable(pObj, pNode);
-  if (pNode->signature != (uint64_t)pNode) {
-    pError("key:%s, %p data is invalid, or has been released", pNode->key, pNode);
-    return;
-  }
+static void incRefFn(void* ptNode) {
+  assert(ptNode != NULL);
 
-  pTrace("key:%s is removed from cache,total:%d,size:%ldbytes", pNode->key, pObj->size, pObj->totalSize);
-  pNode->signature = 0;
-  free(pNode);
-}
+  SCacheDataNode** p = (SCacheDataNode**) ptNode;
+  assert(T_REF_VAL_GET(*p) >= 0);
 
-/**
- * move the old node into trash
- * @param pObj
- * @param pNode
- */
-static FORCE_INLINE void taosCacheMoveNodeToTrash(SCacheObj *pObj, SDataNode *pNode) {
-  taosRemoveNodeInHashTable(pObj, pNode);
-  taosAddToTrash(pObj, pNode);
+  int32_t ret = T_REF_INC(*p);
+  assert(ret > 0);
 }
 
-/**
- * update data in cache
- * @param pObj
- * @param pNode
- * @param key
- * @param keyLen
- * @param pData
- * @param dataSize
- * @return
- */
-static SDataNode *taosUpdateCacheImpl(SCacheObj *pObj, SDataNode *pNode, char *key, int32_t keyLen, void *pData,
-                                      uint32_t dataSize, uint64_t keepTime) {
-  SDataNode *pNewNode = NULL;
-
-  // only a node is not referenced by any other object, in-place update it
-  if (pNode->refCount == 0) {
-    size_t newSize = sizeof(SDataNode) + dataSize + keyLen;
-
-    pNewNode = (SDataNode *)realloc(pNode, newSize);
-    if (pNewNode == NULL) {
-      return NULL;
-    }
-
-    pNewNode->signature = (uint64_t)pNewNode;
-    memcpy(pNewNode->data, pData, dataSize);
+void *taosCacheAcquireByKey(SCacheObj *pCacheObj, const void *key, size_t keyLen) {
+  if (pCacheObj == NULL || pCacheObj->deleting == 1) {
+    return NULL;
+  }
 
-    pNewNode->key = pNewNode->data + dataSize;
-    strcpy(pNewNode->key, key);
+  if (taosHashGetSize(pCacheObj->pHashTable) == 0) {
+    atomic_add_fetch_32(&pCacheObj->statistics.missCount, 1);
+    return NULL;
+  }
 
-    // update the timestamp information for updated key/value
-    pNewNode->addTime = taosGetTimestampMs();
-    pNewNode->time = pNewNode->addTime + keepTime;
+  SCacheDataNode* ptNode = NULL;
+  taosHashGetCB(pCacheObj->pHashTable, key, keyLen, incRefFn, &ptNode, sizeof(void*));
 
-    atomic_add_fetch_32(&pNewNode->refCount, 1);
+  void* pData = (ptNode != NULL)? ptNode->data:NULL;
 
-    // the address of this node may be changed, so the prev and next element should update the corresponding pointer
-    taosUpdateInHashTable(pObj, pNewNode);
+  if (pData != NULL) {
+    atomic_add_fetch_32(&pCacheObj->statistics.hitCount, 1);
+    uDebug("cache:%s, key:%p, %p is retrieved from cache, refcnt:%d", pCacheObj->name, key, pData, T_REF_VAL_GET(ptNode));
   } else {
-    int32_t hashVal = pNode->hashVal;
-    taosCacheMoveNodeToTrash(pObj, pNode);
-
-    pNewNode = taosCreateHashNode(key, keyLen, pData, dataSize, keepTime);
-    if (pNewNode == NULL) {
-      return NULL;
-    }
-
-    atomic_add_fetch_32(&pNewNode->refCount, 1);
-
-    assert(hashVal == (*pObj->hashFp)(key, keyLen - 1));
-    pNewNode->hashVal = hashVal;
-
-    // add new element to hashtable
-    taosAddNodeToHashTable(pObj, pNewNode);
+    atomic_add_fetch_32(&pCacheObj->statistics.missCount, 1);
+    uDebug("cache:%s, key:%p, not in cache, retrieved failed", pCacheObj->name, key);
   }
 
-  return pNewNode;
+  atomic_add_fetch_32(&pCacheObj->statistics.totalAccess, 1);
+  return pData;
 }
 
-/**
- * add data into hash table
- * @param key
- * @param pData
- * @param size
- * @param pObj
- * @param keyLen
- * @param pNode
- * @return
- */
-static FORCE_INLINE SDataNode *taosAddToCacheImpl(SCacheObj *pObj, char *key, uint32_t keyLen, const char *pData,
-                                                  int dataSize, uint64_t lifespan) {
-  SDataNode *pNode = taosCreateHashNode(key, keyLen, pData, dataSize, lifespan);
-  if (pNode == NULL) {
+void *taosCacheAcquireByData(SCacheObj *pCacheObj, void *data) {
+  if (pCacheObj == NULL || data == NULL) return NULL;
+  
+  size_t          offset = offsetof(SCacheDataNode, data);
+  SCacheDataNode *ptNode = (SCacheDataNode *)((char *)data - offset);
+  
+  if (ptNode->signature != (uint64_t)ptNode) {
+    uError("cache:%s, key: %p the data from cache is invalid", pCacheObj->name, ptNode);
     return NULL;
   }
 
-  atomic_add_fetch_32(&pNode->refCount, 1);
-  pNode->hashVal = (*pObj->hashFp)(key, keyLen - 1);
-  taosAddNodeToHashTable(pObj, pNode);
+  int32_t ref = T_REF_INC(ptNode);
+  uDebug("cache:%s, data: %p acquired by data in cache, refcnt:%d", pCacheObj->name, ptNode->data, ref);
 
-  return pNode;
+  // the data if referenced by at least one object, so the reference count must be greater than the value of 2.
+  assert(ref >= 2);
+  return data;
 }
 
-/**
- * add data into cache
- *
- * @param handle        cache object
- * @param key           key
- * @param pData         cached data
- * @param dataSize      data size
- * @param keepTime      survival time in second
- * @return              cached element
- */
-void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, int keepTime) {
-  SDataNode *pNode;
-  SCacheObj *pObj;
-
-  pObj = (SCacheObj *)handle;
-  if (pObj == NULL || pObj->capacity == 0) return NULL;
+void *taosCacheTransfer(SCacheObj *pCacheObj, void **data) {
+  if (pCacheObj == NULL || data == NULL || (*data) == NULL) return NULL;
+  
+  size_t          offset = offsetof(SCacheDataNode, data);
+  SCacheDataNode *ptNode = (SCacheDataNode *)((char *)(*data) - offset);
+  
+  if (ptNode->signature != (uint64_t)ptNode) {
+    uError("cache:%s, key: %p the data from cache is invalid", pCacheObj->name, ptNode);
+    return NULL;
+  }
+  
+  assert(T_REF_VAL_GET(ptNode) >= 1);
+  
+  char *d = *data;
+  
+  // clear its reference to old area
+  *data = NULL;
+  
+  return d;
+}
 
-  uint32_t keyLen = (uint32_t)strlen(key) + 1;
+void taosCacheRelease(SCacheObj *pCacheObj, void **data, bool _remove) {
+  if (pCacheObj == NULL || taosHashGetSize(pCacheObj->pHashTable) + pCacheObj->numOfElemsInTrash == 0) {
+    return;
+  }
 
-  __cache_wr_lock(pObj);
+  if ((*data) == NULL) {
+    uError("cache:%s, NULL data to release", pCacheObj->name);
+    return;
+  }
+  
+  size_t offset = offsetof(SCacheDataNode, data);
+  
+  SCacheDataNode *pNode = (SCacheDataNode *)((char *)(*data) - offset);
+  if (pNode->signature != (uint64_t)pNode) {
+    uError("cache:%s, %p, release invalid cache data", pCacheObj->name, pNode);
+    return;
+  }
 
-  SDataNode *pOldNode = taosGetNodeFromHashTable(pObj, key, keyLen - 1);
+  *data = NULL;
 
-  if (pOldNode == NULL) {  // do add to cache
-    // check if the threshold is reached
-    taosHashTableResize(pObj);
+  // note: extend lifespan before dec ref count
+  bool inTrashcan = pNode->inTrashcan;
 
-    pNode = taosAddToCacheImpl(pObj, key, keyLen, pData, dataSize, keepTime * 1000L);
-    if (NULL != pNode) {
-      pTrace(
-          "key:%s %p added into cache, slot:%d, addTime:%" PRIu64 ", expireTime:%" PRIu64 ", cache total:%d, "
-          "size:%" PRId64 " bytes, collision:%d",
-          pNode->key, pNode, HASH_INDEX(pNode->hashVal, pObj->capacity), pNode->addTime, pNode->time, pObj->size,
-          pObj->totalSize, pObj->statistics.numOfCollision);
-    }
-  } else {  // old data exists, update the node
-    pNode = taosUpdateCacheImpl(pObj, pOldNode, key, keyLen, pData, dataSize, keepTime * 1000L);
-    pTrace("key:%s %p exist in cache, updated", key, pNode);
+  if (pCacheObj->extendLifespan && (!inTrashcan) && (!_remove)) {
+    atomic_store_64(&pNode->expireTime, pNode->lifespan + taosGetTimestampMs());
+    uDebug("cache:%s data:%p extend expire time: %"PRId64, pCacheObj->name, pNode->data, pNode->expireTime);
   }
 
-  __cache_unlock(pObj);
-
-  return (pNode != NULL) ? pNode->data : NULL;
-}
+  if (_remove) {
+    // NOTE: once refcount is decrease, pNode may be freed by other thread immediately.
+    char* key = pNode->key;
+    char* d = pNode->data;
 
-static FORCE_INLINE void taosDecRef(SDataNode *pNode) {
-  if (pNode == NULL) {
-    return;
-  }
+    int32_t ref = T_REF_VAL_GET(pNode);
+    uDebug("cache:%s, key:%p, %p is released, refcnt:%d, in trashcan:%d", pCacheObj->name, key, d, ref - 1, inTrashcan);
 
-  if (pNode->refCount > 0) {
-    atomic_sub_fetch_32(&pNode->refCount, 1);
-    pTrace("key:%s is released by app.refcnt:%d", pNode->key, pNode->refCount);
-  } else {
     /*
-     * safety check.
-     * app may false releases cached object twice, to decrease the refcount more than acquired
+     * If it is not referenced by other users, remove it immediately. Otherwise move this node to trashcan wait for all users
+     * releasing this resources.
+     *
+     * NOTE: previous ref is 0, and current ref is still 0, remove it. If previous is not 0, there is another thread
+     * that tries to do the same thing.
      */
-    pError("key:%s is released by app more than referenced.refcnt:%d", pNode->key, pNode->refCount);
-  }
-}
+    if (inTrashcan) {
+      ref = T_REF_VAL_GET(pNode);
 
-/**
- * remove data in cache, the data will not be removed immediately.
- * if it is referenced by other object, it will be remain in cache
- * @param handle
- * @param data
- */
-void taosRemoveDataFromCache(void *handle, void **data, bool _remove) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL || pObj->capacity == 0 || (*data) == NULL || (pObj->size + pObj->numOfElemsInTrash == 0)) return;
+      if (ref == 1) {
+        // If it is the last ref, remove it from trashcan linked-list first, and then destroy it.Otherwise, it may be
+        // destroyed by refresh worker if decrease ref count before removing it from linked-list.
+        assert(pNode->pTNodeHeader->pData == pNode);
 
-  size_t     offset = offsetof(SDataNode, data);
-  SDataNode *pNode = (SDataNode *)((char *)(*data) - offset);
+        __cache_wr_lock(pCacheObj);
+        doRemoveElemInTrashcan(pCacheObj, pNode->pTNodeHeader);
+        __cache_unlock(pCacheObj);
 
-  if (pNode->signature != (uint64_t)pNode) {
-    pError("key: %p release invalid cache data", pNode);
-    return;
-  }
+        ref = T_REF_DEC(pNode);
+        assert(ref == 0);
 
-  *data = NULL;
+        doDestroyTrashcanElem(pCacheObj, pNode->pTNodeHeader);
+      } else {
+        ref = T_REF_DEC(pNode);
+        assert(ref >= 0);
+      }
+    } else {
+      // NOTE: remove it from hash in the first place, otherwise, the pNode may have been released by other thread
+      // when reaches here.
+      SCacheDataNode *p = NULL;
+      int32_t ret = taosHashRemoveWithData(pCacheObj->pHashTable, pNode->key, pNode->keySize, &p, sizeof(void *));
+      ref = T_REF_DEC(pNode);
+
+      // successfully remove from hash table, if failed, this node must have been move to trash already, do nothing.
+      // note that the remove operation can be executed only once.
+      if (ret == 0) {
+        if (p != pNode) {
+          uDebug( "cache:%s, key:%p, successfully removed a new entry:%p, refcnt:%d, prev entry:%p has been removed by "
+              "others already", pCacheObj->name, pNode->key, p->data, T_REF_VAL_GET(p), pNode->data);
+
+          assert(p->pTNodeHeader == NULL);
+          taosAddToTrashcan(pCacheObj, p);
+        } else {
+          uDebug("cache:%s, key:%p, %p successfully removed from hash table, refcnt:%d", pCacheObj->name, pNode->key,
+                 pNode->data, ref);
+          if (ref > 0) {
+            assert(pNode->pTNodeHeader == NULL);
 
-  if (_remove) {
-    __cache_wr_lock(pObj);
-    // pNode may be released immediately by other thread after the reference count of pNode is set to 0,
-    // So we need to lock it in the first place.
-    taosDecRef(pNode);
-    taosCacheMoveNodeToTrash(pObj, pNode);
+            taosAddToTrashcan(pCacheObj, pNode);
+          } else {  // ref == 0
+            atomic_sub_fetch_64(&pCacheObj->totalSize, pNode->size);
+
+            int32_t size = (int32_t)taosHashGetSize(pCacheObj->pHashTable);
+            uDebug("cache:%s, key:%p, %p is destroyed from cache, size:%dbytes, totalNum:%d size:%" PRId64 "bytes",
+                   pCacheObj->name, pNode->key, pNode->data, pNode->size, size, pCacheObj->totalSize);
+
+            if (pCacheObj->freeFp) {
+              pCacheObj->freeFp(pNode->data);
+            }
+
+            free(pNode);
+          }
+        }
+      } else {
+        uDebug("cache:%s, key:%p, %p has been removed from hash table by others already, refcnt:%d",
+               pCacheObj->name, pNode->key, pNode->data, ref);
+      }
+    }
 
-    __cache_unlock(pObj);
   } else {
-    taosDecRef(pNode);
+    // NOTE: once refcount is decrease, pNode may be freed by other thread immediately.
+    char* key = pNode->key;
+    char* p = pNode->data;
+
+//    int32_t ref = T_REF_VAL_GET(pNode);
+//
+//    if (ref == 1 && inTrashcan) {
+//      // If it is the last ref, remove it from trashcan linked-list first, and then destroy it.Otherwise, it may be
+//      // destroyed by refresh worker if decrease ref count before removing it from linked-list.
+//      assert(pNode->pTNodeHeader->pData == pNode);
+//
+//      __cache_wr_lock(pCacheObj);
+//      doRemoveElemInTrashcan(pCacheObj, pNode->pTNodeHeader);
+//      __cache_unlock(pCacheObj);
+//
+//      ref = T_REF_DEC(pNode);
+//      assert(ref == 0);
+//
+//      doDestroyTrashcanElem(pCacheObj, pNode->pTNodeHeader);
+//    } else {
+//      ref = T_REF_DEC(pNode);
+//      assert(ref >= 0);
+//    }
+
+    int32_t ref = T_REF_DEC(pNode);
+    uDebug("cache:%s, key:%p, %p released, refcnt:%d, data in trashcan:%d", pCacheObj->name, key, p, ref, inTrashcan);
   }
 }
 
-/**
- * get data from cache
- * @param handle        cache object
- * @param key           key
- * @return              cached data or NULL
- */
-void *taosGetDataFromCache(void *handle, char *key) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL || pObj->capacity == 0) return NULL;
+typedef struct SHashTravSupp {
+  SCacheObj* pCacheObj;
+  int64_t    time;
+  __cache_free_fn_t fp;
+} SHashTravSupp;
 
-  uint32_t keyLen = (uint32_t)strlen(key);
+static bool travHashTableEmptyFn(void* param, void* data) {
+  SHashTravSupp* ps = (SHashTravSupp*) param;
+  SCacheObj* pCacheObj= ps->pCacheObj;
 
-  __cache_rd_lock(pObj);
+  SCacheDataNode *pNode = *(SCacheDataNode **) data;
 
-  SDataNode *ptNode = taosGetNodeFromHashTable(handle, key, keyLen);
-  if (ptNode != NULL) {
-    atomic_add_fetch_32(&ptNode->refCount, 1);
+  if (T_REF_VAL_GET(pNode) == 0) {
+    taosCacheReleaseNode(pCacheObj, pNode);
+  } else { // do add to trashcan
+    taosAddToTrashcan(pCacheObj, pNode);
   }
 
-  __cache_unlock(pObj);
+  // this node should be remove from hash table
+  return false;
+}
 
-  if (ptNode != NULL) {
-    atomic_add_fetch_32(&pObj->statistics.hitCount, 1);
-    pTrace("key:%s is retrieved from cache,refcnt:%d", key, ptNode->refCount);
-  } else {
-    atomic_add_fetch_32(&pObj->statistics.missCount, 1);
-    pTrace("key:%s not in cache,retrieved failed", key);
-  }
+void taosCacheEmpty(SCacheObj *pCacheObj) {
+  SHashTravSupp sup = {.pCacheObj = pCacheObj, .fp = NULL, .time = taosGetTimestampMs()};
 
-  atomic_add_fetch_32(&pObj->statistics.totalAccess, 1);
-  return (ptNode != NULL) ? ptNode->data : NULL;
+  taosHashCondTraverse(pCacheObj->pHashTable, travHashTableEmptyFn, &sup);
+  taosTrashcanEmpty(pCacheObj, false);
 }
 
-/**
- * update data in cache
- * @param handle hash object handle(pointer)
- * @param key    key for hash
- * @param pData  actually data
- * @param size   length of data
- * @return       new referenced data
- */
-void *taosUpdateDataFromCache(void *handle, char *key, char *pData, int size, int duration) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL || pObj->capacity == 0) return NULL;
-
-  SDataNode *pNew = NULL;
+void taosCacheCleanup(SCacheObj *pCacheObj) {
+  if (pCacheObj == NULL) {
+    return;
+  }
 
-  uint32_t keyLen = strlen(key) + 1;
+  pCacheObj->deleting = 1;
+  pthread_join(pCacheObj->refreshWorker, NULL);
 
-  __cache_wr_lock(pObj);
+  uInfo("cache:%s will be cleaned up", pCacheObj->name);
+  doCleanupDataCache(pCacheObj);
+}
 
-  SDataNode *pNode = taosGetNodeFromHashTable(handle, key, keyLen - 1);
+SCacheDataNode *taosCreateCacheNode(const char *key, size_t keyLen, const char *pData, size_t size, uint64_t duration) {
+  size_t totalSize = size + sizeof(SCacheDataNode) + keyLen;
 
-  if (pNode == NULL) {  // object has been released, do add operation
-    pNew = taosAddToCacheImpl(pObj, key, keyLen, pData, size, duration * 1000L);
-    pWarn("key:%s does not exist, update failed,do add to cache.total:%d,size:%ldbytes", key, pObj->size,
-          pObj->totalSize);
-  } else {
-    pNew = taosUpdateCacheImpl(pObj, pNode, key, keyLen, pData, size, duration * 1000L);
-    pTrace("key:%s updated.expireTime:%" PRIu64 ".refCnt:%d", key, pNode->time, pNode->refCount);
+  SCacheDataNode *pNewNode = calloc(1, totalSize);
+  if (pNewNode == NULL) {
+    uError("failed to allocate memory, reason:%s", strerror(errno));
+    return NULL;
   }
 
-  __cache_unlock(pObj);
-  return (pNew != NULL) ? pNew->data : NULL;
-}
+  memcpy(pNewNode->data, pData, size);
 
-static void doCleanUpDataCache(SCacheObj* pObj) {
-  SDataNode *pNode, *pNext;
+  pNewNode->key = (char *)pNewNode + sizeof(SCacheDataNode) + size;
+  pNewNode->keySize = (uint16_t)keyLen;
 
-  __cache_wr_lock(pObj);
+  memcpy(pNewNode->key, key, keyLen);
 
-  if (pObj->hashList && pObj->size > 0) {
-    for (int i = 0; i < pObj->capacity; ++i) {
-      pNode = pObj->hashList[i];
-      while (pNode) {
-        pNext = pNode->next;
-        free(pNode);
-        pNode = pNext;
-      }
-    }
+  pNewNode->addedTime    = (uint64_t)taosGetTimestampMs();
+  pNewNode->lifespan     = duration;
+  pNewNode->expireTime   = pNewNode->addedTime + pNewNode->lifespan;
+  pNewNode->signature    = (uint64_t)pNewNode;
+  pNewNode->size         = (uint32_t)totalSize;
+
+  return pNewNode;
+}
 
-    tfree(pObj->hashList);
+void taosAddToTrashcan(SCacheObj *pCacheObj, SCacheDataNode *pNode) {
+  if (pNode->inTrashcan) { /* node is already in trash */
+    assert(pNode->pTNodeHeader != NULL && pNode->pTNodeHeader->pData == pNode);
+    return;
   }
 
-  __cache_unlock(pObj);
+  STrashElem *pElem = calloc(1, sizeof(STrashElem));
+  pElem->pData = pNode;
+  pElem->prev  = NULL;
+  pNode->inTrashcan = true;
+  pNode->pTNodeHeader = pElem;
 
-  taosClearCacheTrash(pObj, true);
-  __cache_lock_destroy(pObj);
+  __cache_wr_lock(pCacheObj);
+  pElem->next = pCacheObj->pTrash;
+  if (pCacheObj->pTrash) {
+    pCacheObj->pTrash->prev = pElem;
+  }
 
-  memset(pObj, 0, sizeof(SCacheObj));
+  pCacheObj->pTrash = pElem;
+  pCacheObj->numOfElemsInTrash++;
+  __cache_unlock(pCacheObj);
 
-  free(pObj);
+  uDebug("cache:%s key:%p, %p move to trashcan, numOfElem in trashcan:%d", pCacheObj->name, pNode->key, pNode->data,
+      pCacheObj->numOfElemsInTrash);
 }
 
-/**
- * refresh cache to remove data in both hash list and trash, if any nodes' refcount == 0, every pObj->refreshTime
- * @param handle   Cache object handle
- */
-void taosRefreshDataCache(void *handle, void *tmrId) {
-  SDataNode *pNode, *pNext;
-  SCacheObj *pObj = (SCacheObj *)handle;
+void taosTrashcanEmpty(SCacheObj *pCacheObj, bool force) {
+  __cache_wr_lock(pCacheObj);
 
-  if (pObj == NULL || pObj->capacity <= 0) {
-    pTrace("object is destroyed. no refresh retry");
-    return;
-  }
+  if (pCacheObj->numOfElemsInTrash == 0) {
+    if (pCacheObj->pTrash != NULL) {
+      uError("cache:%s, key:inconsistency data in cache, numOfElem in trashcan:%d", pCacheObj->name, pCacheObj->numOfElemsInTrash);
+    }
 
-  if (pObj->deleting == 1) {
-    doCleanUpDataCache(pObj);
+    pCacheObj->pTrash = NULL;
+    __cache_unlock(pCacheObj);
     return;
   }
 
-  uint64_t time = taosGetTimestampMs();
-  uint32_t numOfCheck = 0;
-  pObj->statistics.refreshCount++;
-
-  int32_t num = pObj->size;
+  STrashElem *pElem = pCacheObj->pTrash;
 
-  for (int i = 0; i < pObj->capacity; ++i) {
-    // in deleting process, quit refreshing immediately
-    if (pObj->deleting == 1) {
-      break;
+  while (pElem) {
+    T_REF_VAL_CHECK(pElem->pData);
+    if (pElem->next == pElem) {
+      pElem->next = NULL;
     }
 
-    __cache_wr_lock(pObj);
-    pNode = pObj->hashList[i];
-
-    while (pNode) {
-      numOfCheck++;
-      pNext = pNode->next;
+    if (force || (T_REF_VAL_GET(pElem->pData) == 0)) {
+      uDebug("cache:%s, key:%p, %p removed from trashcan. numOfElem in trashcan:%d", pCacheObj->name, pElem->pData->key, pElem->pData->data,
+             pCacheObj->numOfElemsInTrash - 1);
 
-      if (pNode->time <= time && pNode->refCount <= 0) {
-        taosCacheReleaseNode(pObj, pNode);
-      }
-      pNode = pNext;
-    }
+      STrashElem *p = pElem;
+      pElem = pElem->next;
 
-    /* all data have been checked, not need to iterate further */
-    if (numOfCheck == num || pObj->size <= 0) {
-      __cache_unlock(pObj);
-      break;
+      doRemoveElemInTrashcan(pCacheObj, p);
+      doDestroyTrashcanElem(pCacheObj, p);
+    } else {
+      pElem = pElem->next;
     }
-
-    __cache_unlock(pObj);
   }
 
-  if (pObj->deleting == 1) { // clean up resources and abort
-    doCleanUpDataCache(pObj);
-  } else {
-    taosClearCacheTrash(pObj, false);
-    taosTmrReset(taosRefreshDataCache, pObj->refreshTime, pObj, pObj->tmrCtrl, &pObj->pTimer);
-  }
+  __cache_unlock(pCacheObj);
 }
 
-/**
- *
- * @param handle
- * @param tmrId
- */
-void taosClearDataCache(void *handle) {
-  SDataNode *pNode, *pNext;
-  SCacheObj *pObj = (SCacheObj *)handle;
+void doCleanupDataCache(SCacheObj *pCacheObj) {
+  SHashTravSupp sup = {.pCacheObj = pCacheObj, .fp = NULL, .time = taosGetTimestampMs()};
+  taosHashCondTraverse(pCacheObj->pHashTable, travHashTableEmptyFn, &sup);
 
-  int32_t capacity = pObj->capacity;
+  // todo memory leak if there are object with refcount greater than 0 in hash table?
+  taosHashCleanup(pCacheObj->pHashTable);
+  taosTrashcanEmpty(pCacheObj, true);
 
-  for (int i = 0; i < capacity; ++i) {
-    __cache_wr_lock(pObj);
+  __cache_lock_destroy(pCacheObj);
+  
+  taosTFree(pCacheObj->name);
+  memset(pCacheObj, 0, sizeof(SCacheObj));
+  free(pCacheObj);
+}
 
-    pNode = pObj->hashList[i];
+bool travHashTableFn(void* param, void* data) {
+  SHashTravSupp* ps = (SHashTravSupp*) param;
+  SCacheObj*     pCacheObj= ps->pCacheObj;
 
-    while (pNode) {
-      pNext = pNode->next;
-      taosCacheMoveNodeToTrash(pObj, pNode);
-      pNode = pNext;
-    }
+  SCacheDataNode* pNode = *(SCacheDataNode **) data;
+  if ((int64_t)pNode->expireTime < ps->time && T_REF_VAL_GET(pNode) <= 0) {
+    taosCacheReleaseNode(pCacheObj, pNode);
 
-    pObj->hashList[i] = NULL;
+    // this node should be remove from hash table
+    return false;
+  }
 
-    __cache_unlock(pObj);
+  if (ps->fp) {
+    (ps->fp)(pNode->data);
   }
 
-  taosClearCacheTrash(pObj, false);
+  // do not remove element in hash table
+  return true;
 }
 
-/**
- * @param capacity          maximum slots available for hash elements
- * @param tmrCtrl           timer ctrl
- * @param refreshTime       refresh operation interval time, the maximum survival time when one element is expired and
- *                          not referenced by other objects
- * @return
- */
-void *taosInitDataCache(int capacity, void *tmrCtrl, int64_t refreshTime) {
-  if (tmrCtrl == NULL || refreshTime <= 0 || capacity <= 0) {
-    return NULL;
-  }
+static void doCacheRefresh(SCacheObj* pCacheObj, int64_t time, __cache_free_fn_t fp) {
+  assert(pCacheObj != NULL);
+
+  SHashTravSupp sup = {.pCacheObj = pCacheObj, .fp = fp, .time = time};
+  taosHashCondTraverse(pCacheObj->pHashTable, travHashTableFn, &sup);
+}
 
-  SCacheObj *pObj = (SCacheObj *)calloc(1, sizeof(SCacheObj));
-  if (pObj == NULL) {
-    pError("failed to allocate memory, reason:%s", strerror(errno));
+void* taosCacheTimedRefresh(void *handle) {
+  SCacheObj* pCacheObj = handle;
+  if (pCacheObj == NULL) {
+    uDebug("object is destroyed. no refresh retry");
     return NULL;
   }
 
-  // the max slots is not defined by user
-  pObj->capacity = taosHashTableLength(capacity);
-  assert((pObj->capacity & (pObj->capacity - 1)) == 0);
+  const int32_t SLEEP_DURATION = 500; //500 ms
+  int64_t totalTick = pCacheObj->refreshTime / SLEEP_DURATION;
 
-  pObj->hashFp = taosHashKey;
-  pObj->refreshTime = refreshTime * 1000;
+  int64_t count = 0;
+  while(1) {
+    taosMsleep(500);
 
-  pObj->hashList = (SDataNode **)calloc(1, sizeof(SDataNode *) * pObj->capacity);
-  if (pObj->hashList == NULL) {
-    free(pObj);
-    pError("failed to allocate memory, reason:%s", strerror(errno));
-    return NULL;
-  }
+    // check if current cache object will be deleted every 500ms.
+    if (pCacheObj->deleting) {
+      uDebug("%s refresh threads quit", pCacheObj->name);
+      break;
+    }
 
-  pObj->tmrCtrl = tmrCtrl;
-  taosTmrReset(taosRefreshDataCache, pObj->refreshTime, pObj, pObj->tmrCtrl, &pObj->pTimer);
+    if (++count < totalTick) {
+      continue;
+    }
 
-  if (__cache_lock_init(pObj) != 0) {
-    taosTmrStopA(&pObj->pTimer);
-    free(pObj->hashList);
-    free(pObj);
+    // reset the count value
+    count = 0;
+    size_t elemInHash = taosHashGetSize(pCacheObj->pHashTable);
+    if (elemInHash + pCacheObj->numOfElemsInTrash == 0) {
+      continue;
+    }
 
-    pError("failed to init lock, reason:%s", strerror(errno));
-    return NULL;
-  }
+    pCacheObj->statistics.refreshCount++;
 
-  return (void *)pObj;
-}
+    // refresh data in hash table
+    if (elemInHash > 0) {
+      int64_t now = taosGetTimestampMs();
+      doCacheRefresh(pCacheObj, now, NULL);
+    }
 
-/**
- * release all allocated memory and destroy the cache object.
- *
- * This function only set the deleting flag, and the specific work of clean up cache is delegated to
- * taosRefreshDataCache function, which will executed every SCacheObj->refreshTime sec.
- *
- * If the value of SCacheObj->refreshTime is too large, the taosRefreshDataCache function may not be invoked
- * before the main thread terminated, in which case all allocated resources are simply recycled by OS.
- *
- * @param handle
- */
-void taosCleanUpDataCache(void *handle) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL) {
-    return;
+    taosTrashcanEmpty(pCacheObj, false);
   }
 
-  pObj->deleting = 1;
+  return NULL;
 }
 
-void* taosGetDataFromExists(void* handle, void* data) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL || data == NULL) return NULL;
-  
-  size_t     offset = offsetof(SDataNode, data);
-  SDataNode *ptNode = (SDataNode *)((char *)data - offset);
-  
-  if (ptNode->signature != (uint64_t) ptNode) {
-    pError("key: %p the data from cache is invalid", ptNode);
-    return NULL;
+void taosCacheRefresh(SCacheObj *pCacheObj, __cache_free_fn_t fp) {
+  if (pCacheObj == NULL) {
+    return;
   }
-  
-  int32_t ref = atomic_add_fetch_32(&ptNode->refCount, 1);
-  pTrace("%p add ref data in cache, refCnt:%d", data, ref)
-  
-  // the data if referenced by at least one object, so the reference count must be greater than the value of 2.
-  assert(ref >= 2);
-  return data;
-}
 
-void* taosTransferDataInCache(void* handle, void** data) {
-  SCacheObj *pObj = (SCacheObj *)handle;
-  if (pObj == NULL || data == NULL) return NULL;
-  
-  size_t     offset = offsetof(SDataNode, data);
-  SDataNode *ptNode = (SDataNode *)((char *)(*data) - offset);
-  
-  if (ptNode->signature != (uint64_t) ptNode) {
-    pError("key: %p the data from cache is invalid", ptNode);
-    return NULL;
-  }
-  
-  assert(ptNode->refCount >= 1);
-  
-  char* d = *data;
-  
-  // clear its reference to old area
-  *data = NULL;
-  
-  return d;
+  int64_t now = taosGetTimestampMs();
+  doCacheRefresh(pCacheObj, now, fp);
 }
diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba711ced8ff074e639a046c5dd9908865a3e9468
--- /dev/null
+++ b/src/util/src/tcompare.c
@@ -0,0 +1,392 @@
+#include "taosdef.h"
+#include "tcompare.h"
+#include "tarray.h"
+#include "tutil.h"
+
+int32_t compareInt32Val(const void *pLeft, const void *pRight) {
+  int32_t left = GET_INT32_VAL(pLeft), right = GET_INT32_VAL(pRight);
+  if (left > right) return 1;
+  if (left < right) return -1;
+  return 0;
+}
+
+int32_t compareInt64Val(const void *pLeft, const void *pRight) {
+  int64_t left = GET_INT64_VAL(pLeft), right = GET_INT64_VAL(pRight);
+  if (left > right) return 1;
+  if (left < right) return -1;
+  return 0;
+}
+
+int32_t compareInt16Val(const void *pLeft, const void *pRight) {
+  int16_t left = GET_INT16_VAL(pLeft), right = GET_INT16_VAL(pRight);
+  if (left > right) return 1;
+  if (left < right) return -1;
+  return 0;
+}
+
+int32_t compareInt8Val(const void *pLeft, const void *pRight) {
+  int8_t left = GET_INT8_VAL(pLeft), right = GET_INT8_VAL(pRight);
+  if (left > right) return 1;
+  if (left < right) return -1;
+  return 0;
+}
+
+int32_t compareIntDoubleVal(const void *pLeft, const void *pRight) {
+  int64_t lhs = GET_INT64_VAL(pLeft);
+  double  rhs = GET_DOUBLE_VAL(pRight);
+  if (fabs(lhs - rhs) < FLT_EPSILON) {
+    return 0;
+  } else {
+    return (lhs > rhs) ? 1 : -1;
+  }
+}
+
+int32_t compareDoubleIntVal(const void *pLeft, const void *pRight) {
+  double  lhs = GET_DOUBLE_VAL(pLeft);
+  int64_t rhs = GET_INT64_VAL(pRight);
+  if (fabs(lhs - rhs) < FLT_EPSILON) {
+    return 0;
+  } else {
+    return (lhs > rhs) ? 1 : -1;
+  }
+}
+
+int32_t compareFloatVal(const void *pLeft, const void *pRight) {
+  float ret = GET_FLOAT_VAL(pLeft) - GET_FLOAT_VAL(pRight);
+  if (fabs(ret) < FLT_EPSILON) {
+    return 0;
+  } else {
+    return ret > 0? 1 : -1;
+  }
+}
+
+int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
+  double ret = GET_DOUBLE_VAL(pLeft) - GET_DOUBLE_VAL(pRight);
+  if (fabs(ret) < FLT_EPSILON) {
+    return 0;
+  } else {
+    return ret > 0? 1 : -1;
+  }
+}
+
+int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight) {
+  int32_t len1 = varDataLen(pLeft);
+  int32_t len2 = varDataLen(pRight);
+  
+  if (len1 != len2) {
+    return len1 > len2? 1:-1;
+  } else {
+    int32_t ret = strncmp(varDataVal(pLeft), varDataVal(pRight), len1);
+    if (ret == 0) {
+      return 0;
+    } else {
+      return ret > 0 ? 1:-1;
+    }
+  }
+}
+
+int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight) {
+  int32_t len1 = varDataLen(pLeft);
+  int32_t len2 = varDataLen(pRight);
+  
+  if (len1 != len2) {
+    return len1 > len2? 1:-1;
+  } else {
+    int32_t ret = wcsncmp(varDataVal(pLeft), varDataVal(pRight), len1/TSDB_NCHAR_SIZE);
+    if (ret == 0) {
+      return 0;
+    } else {
+      return ret > 0 ? 1 : -1;
+    }
+  }
+}
+
+/*
+ * Compare two strings
+ *    TSDB_MATCH:            Match
+ *    TSDB_NOMATCH:          No match
+ *    TSDB_NOWILDCARDMATCH:  No match in spite of having * or % wildcards.
+ * Like matching rules:
+ *      '%': Matches zero or more characters
+ *      '_': Matches one character
+ *
+ */
+int patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
+  char c, c1;
+  
+  int32_t i = 0;
+  int32_t j = 0;
+  
+  while ((c = patterStr[i++]) != 0) {
+    if (c == pInfo->matchAll) { /* Match "*" */
+      
+      while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
+        if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
+          // empty string, return not match
+          return TSDB_PATTERN_NOWILDCARDMATCH;
+        }
+      }
+      
+      if (c == 0) {
+        return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */
+      }
+      
+      char next[3] = {toupper(c), tolower(c), 0};
+      while (1) {
+        size_t n = strcspn(str, next);
+        str += n;
+        
+        if (str[0] == 0 || (n >= size)) {
+          break;
+        }
+        
+        int32_t ret = patternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
+        if (ret != TSDB_PATTERN_NOMATCH) {
+          return ret;
+        }
+      }
+      return TSDB_PATTERN_NOWILDCARDMATCH;
+    }
+    
+    c1 = str[j++];
+    
+    if (j <= size) {
+      if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
+        continue;
+      }
+    }
+    
+    return TSDB_PATTERN_NOMATCH;
+  }
+  
+  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
+}
+
+int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo) {
+  wchar_t c, c1;
+  wchar_t matchOne = L'_';  // "_"
+  wchar_t matchAll = L'%';  // "%"
+  
+  int32_t i = 0;
+  int32_t j = 0;
+  
+  while ((c = patterStr[i++]) != 0) {
+    if (c == matchAll) { /* Match "%" */
+      
+      while ((c = patterStr[i++]) == matchAll || c == matchOne) {
+        if (c == matchOne && (j > size || str[j++] == 0)) {
+          return TSDB_PATTERN_NOWILDCARDMATCH;
+        }
+      }
+      if (c == 0) {
+        return TSDB_PATTERN_MATCH;
+      }
+      
+      wchar_t accept[3] = {towupper(c), towlower(c), 0};
+      while (1) {
+        size_t n = wcscspn(str, accept);
+        
+        str += n;
+        if (str[0] == 0 || (n >= size)) {
+          break;
+        }
+        
+        int32_t ret = WCSPatternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
+        if (ret != TSDB_PATTERN_NOMATCH) {
+          return ret;
+        }
+      }
+      
+      return TSDB_PATTERN_NOWILDCARDMATCH;
+    }
+    
+    c1 = str[j++];
+    
+    if (j <= size) {
+      if (c == c1 || towlower(c) == towlower(c1) || (c == matchOne && c1 != 0)) {
+        continue;
+      }
+    }
+    
+    return TSDB_PATTERN_NOMATCH;
+  }
+  
+  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
+}
+
+static int32_t compareStrPatternComp(const void* pLeft, const void* pRight) {
+  SPatternCompareInfo pInfo = {'%', '_'};
+  
+  char pattern[128] = {0};
+  memcpy(pattern, varDataVal(pRight), varDataLen(pRight));
+  assert(varDataLen(pRight) < 128);
+
+  size_t sz = varDataLen(pLeft);
+  char *buf = malloc(sz + 1); 
+  memcpy(buf, varDataVal(pLeft), sz); 
+  buf[sz] = 0;
+
+  int32_t ret = patternMatch(pattern, buf, sz, &pInfo);
+  free(buf);
+  return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
+}
+
+int32_t taosArrayCompareString(const void* a, const void* b) {
+  const char* x = *(const char**)a;
+  const char* y = *(const char**)b;
+  
+  return compareLenPrefixedStr(x, y);
+}
+
+static int32_t compareFindStrInArray(const void* pLeft, const void* pRight) {
+  const SArray* arr = (const SArray*) pRight;
+  return taosArraySearchString(arr, pLeft, taosArrayCompareString) == NULL ? 0 : 1;
+}
+
+static int32_t compareWStrPatternComp(const void* pLeft, const void* pRight) {
+  SPatternCompareInfo pInfo = {'%', '_'};
+
+  wchar_t pattern[128] = {0};
+  assert(TSDB_PATTERN_STRING_MAX_LEN < 128);
+
+  memcpy(pattern, varDataVal(pRight), varDataLen(pRight));
+  assert(varDataLen(pRight) < 128);
+  
+  int32_t ret = WCSPatternMatch(pattern, varDataVal(pLeft), varDataLen(pLeft)/TSDB_NCHAR_SIZE, &pInfo);
+  return (ret == TSDB_PATTERN_MATCH) ? 0 : 1;
+}
+
+__compar_fn_t getComparFunc(int32_t type, int32_t optr) {
+  __compar_fn_t comparFn = NULL;
+  
+  switch (type) {
+    case TSDB_DATA_TYPE_SMALLINT: {
+      comparFn = compareInt16Val;  break;
+    }
+    
+    case TSDB_DATA_TYPE_INT: {
+      comparFn = compareInt32Val;  break;
+    }
+    
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP: {
+      comparFn = compareInt64Val;  break;
+    }
+
+    case TSDB_DATA_TYPE_BOOL:
+    case TSDB_DATA_TYPE_TINYINT:{
+      comparFn = compareInt8Val;   break;
+    }
+
+    case TSDB_DATA_TYPE_FLOAT: {
+      comparFn = compareFloatVal;  break;
+    }
+    
+    case TSDB_DATA_TYPE_DOUBLE: {
+      comparFn = compareDoubleVal; break;
+    }
+
+    case TSDB_DATA_TYPE_BINARY: {
+      if (optr == TSDB_RELATION_LIKE) { /* wildcard query using like operator */
+        comparFn = compareStrPatternComp;
+      } else if (optr == TSDB_RELATION_IN) {
+        comparFn = compareFindStrInArray;
+      } else { /* normal relational comparFn */
+        comparFn = compareLenPrefixedStr;
+      }
+    
+      break;
+    }
+  
+    case TSDB_DATA_TYPE_NCHAR: {
+      if (optr == TSDB_RELATION_LIKE) {
+        comparFn = compareWStrPatternComp;
+      } else {
+        comparFn = compareLenPrefixedWStr;
+      }
+    
+      break;
+    }
+    
+    default:
+      comparFn = compareInt32Val;
+      break;
+  }
+  
+  return comparFn;
+}
+
+__compar_fn_t getKeyComparFunc(int32_t keyType) {
+  __compar_fn_t comparFn = NULL;
+  
+  switch (keyType) {
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_BOOL:
+      comparFn = compareInt8Val;
+      break;
+    case TSDB_DATA_TYPE_SMALLINT:
+      comparFn = compareInt16Val;
+      break;
+    case TSDB_DATA_TYPE_INT:
+      comparFn = compareInt32Val;
+      break;
+    case TSDB_DATA_TYPE_BIGINT:
+    case TSDB_DATA_TYPE_TIMESTAMP:
+      comparFn = compareInt64Val;
+      break;
+    case TSDB_DATA_TYPE_FLOAT:
+      comparFn = compareFloatVal;
+      break;
+    case TSDB_DATA_TYPE_DOUBLE:
+      comparFn = compareDoubleVal;
+      break;
+    
+    case TSDB_DATA_TYPE_BINARY:
+      comparFn = compareLenPrefixedStr;
+      break;
+    
+    case TSDB_DATA_TYPE_NCHAR:
+      comparFn = compareLenPrefixedWStr;
+      break;
+    
+    default:
+      comparFn = compareInt32Val;
+      break;
+  }
+  
+  return comparFn;
+}
+
+int32_t doCompare(const char* f1, const char* f2, int32_t type, size_t size) {
+  switch (type) {
+    case TSDB_DATA_TYPE_INT:        DEFAULT_COMP(GET_INT32_VAL(f1), GET_INT32_VAL(f2));
+    case TSDB_DATA_TYPE_DOUBLE:     DEFAULT_COMP(GET_DOUBLE_VAL(f1), GET_DOUBLE_VAL(f2));
+    case TSDB_DATA_TYPE_FLOAT:      DEFAULT_COMP(GET_FLOAT_VAL(f1), GET_FLOAT_VAL(f2));
+    case TSDB_DATA_TYPE_BIGINT:     DEFAULT_COMP(GET_INT64_VAL(f1), GET_INT64_VAL(f2));
+    case TSDB_DATA_TYPE_SMALLINT:   DEFAULT_COMP(GET_INT16_VAL(f1), GET_INT16_VAL(f2));
+    case TSDB_DATA_TYPE_TINYINT:
+    case TSDB_DATA_TYPE_BOOL:       DEFAULT_COMP(GET_INT8_VAL(f1), GET_INT8_VAL(f2));
+    case TSDB_DATA_TYPE_NCHAR: {
+      int32_t ret = wcsncmp((wchar_t*) f1, (wchar_t*) f2, size/TSDB_NCHAR_SIZE);
+      if (ret == 0) {
+        return ret;
+      }
+      return (ret < 0) ? -1 : 1;
+    }
+    default: {  // todo refactor
+      tstr* t1 = (tstr*) f1;
+      tstr* t2 = (tstr*) f2;
+      
+      if (t1->len != t2->len) {
+        return t1->len > t2->len? 1:-1;
+      } else {
+        int32_t ret = strncmp(t1->data, t2->data, t1->len);
+        if (ret == 0) {
+          return 0;
+        } else {
+          return ret < 0? -1:1;
+        }
+      }
+    }
+  }
+}
diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c
index 0f0c7bed347fce36ea8054ce523619998a1f6327..1a5d28625f7061a4eec1ca41e654c2683c3ba9d5 100644
--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
@@ -47,237 +47,19 @@
  *
  */
 
-#include "os.h"
 #include "lz4.h"
+#include "os.h"
+#include "taosdef.h"
 #include "tscompression.h"
-#include "tsdb.h"
-#include "ttypes.h"
+#include "tulog.h"
 
-const int TEST_NUMBER = 1;
+static const int TEST_NUMBER = 1;
 #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0)
 #define SIMPLE8B_MAX_INT64 ((uint64_t)2305843009213693951L)
 
-// Function declarations
-int tsCompressINTImp(const char *const input, const int nelements, char *const output, const char type);
-int tsDecompressINTImp(const char *const input, const int nelements, char *const output, const char type);
-int tsCompressBoolImp(const char *const input, const int nelements, char *const output);
-int tsDecompressBoolImp(const char *const input, const int nelements, char *const output);
-int tsCompressStringImp(const char *const input, int inputSize, char *const output, int outputSize);
-int tsDecompressStringImp(const char *const input, int compressedSize, char *const output, int outputSize);
-int tsCompressTimestampImp(const char *const input, const int nelements, char *const output);
-int tsDecompressTimestampImp(const char *const input, const int nelements, char *const output);
-int tsCompressDoubleImp(const char *const input, const int nelements, char *const output);
-int tsDecompressDoubleImp(const char *const input, const int nelements, char *const output);
-int tsCompressFloatImp(const char *const input, const int nelements, char *const output);
-int tsDecompressFloatImp(const char *const input, const int nelements, char *const output);
-
-/* ----------------------------------------------Compression function used by
- * others ---------------------------------------------- */
-int tsCompressTinyint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
-                      char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_TINYINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressTinyint(const char *const input, int compressedSize, const int nelements, char *const output,
-                        int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_TINYINT);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressSmallint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
-                       char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_SMALLINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressSmallint(const char *const input, int compressedSize, const int nelements, char *const output,
-                         int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_SMALLINT);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressInt(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, char algorithm,
-                  char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_INT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressInt(const char *const input, int compressedSize, const int nelements, char *const output,
-                    int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_INT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_INT);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressBigint(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
-                     char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressINTImp(input, nelements, buffer, TSDB_DATA_TYPE_BIGINT);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressBigint(const char *const input, int compressedSize, const int nelements, char *const output,
-                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressINTImp(input, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressINTImp(buffer, nelements, output, TSDB_DATA_TYPE_BIGINT);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressBool(const char *const input, int inputSize, const int nelements, char *const output, int outputSize, 
-                   char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressBoolImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressBool(const char *const input, int compressedSize, const int nelements, char *const output,
-                     int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressBoolImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressBoolImp(buffer, nelements, output);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressString(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
-                     char algorithm, char *const buffer, int bufferSize) {
-  return tsCompressStringImp(input, inputSize, output, outputSize);
-}
-
-int tsDecompressString(const char *const input, int compressedSize, const int nelements, char *const output,
-                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  return tsDecompressStringImp(input, compressedSize, output, outputSize);
-}
-
-int tsCompressFloat(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
-                    char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressFloatImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressFloatImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressFloat(const char *const input, int compressedSize, const int nelements, char *const output,
-                      int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressFloatImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressFloatImp(buffer, nelements, output);
-  } else {
-    assert(0);
-  }
-}
-int tsCompressDouble(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
-                     char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressDoubleImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressDoubleImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressDouble(const char *const input, int compressedSize, const int nelements, char *const output,
-                       int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressDoubleImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressDoubleImp(buffer, nelements, output);
-  } else {
-    assert(0);
-  }
-}
-
-int tsCompressTimestamp(const char *const input, int inputSize, const int nelements, char *const output, int outputSize,
-                        char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsCompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    int len = tsCompressTimestampImp(input, nelements, buffer);
-    return tsCompressStringImp(buffer, len, output, outputSize);
-  } else {
-    assert(0);
-  }
-}
-
-int tsDecompressTimestamp(const char *const input, int compressedSize, const int nelements, char *const output,
-                          int outputSize, char algorithm, char *const buffer, int bufferSize) {
-  if (algorithm == ONE_STAGE_COMP) {
-    return tsDecompressTimestampImp(input, nelements, output);
-  } else if (algorithm == TWO_STAGE_COMP) {
-    tsDecompressStringImp(input, compressedSize, buffer, bufferSize);
-    return tsDecompressTimestampImp(buffer, nelements, output);
-  } else {
-    assert(0);
-  }
-}
-
-bool safeInt64Add(int64_t a, int64_t b) {
-  if ((a > 0 && b > INT64_MAX - a) || (a < 0 && b < INT64_MIN - a)) return false;
-  return true;
-}
+#define safeInt64Add(a, b) (((a >= 0) && (b <= INT64_MAX - a)) || ((a < 0) && (b >= INT64_MIN - a)))
+#define ZIGZAG_ENCODE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
+#define ZIGZAG_DECODE(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
 
 /*
  * Compress Integer (Simple8B).
@@ -307,8 +89,8 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
       word_length = CHAR_BYTES;
       break;
     default:
-      perror("Wrong integer types.\n");
-      exit(1);
+      uError("Invalid compress integer type:%d", type);
+      return -1;
   }
 
   int     byte_limit = nelements * word_length + 1;
@@ -343,11 +125,11 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
 
       int64_t diff = curr_value - prev_value_tmp;
       // Zigzag encode the value.
-      uint64_t zigzag_value = (diff >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (diff << 1);
+      uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, diff);
 
       if (zigzag_value >= SIMPLE8B_MAX_INT64) goto _copy_and_exit;
 
-      char tmp_bit;
+      int64_t tmp_bit;
       if (zigzag_value == 0) {
         // Take care here, __builtin_clzl give wrong anser for value 0;
         tmp_bit = 0;
@@ -389,7 +171,7 @@ int tsCompressINTImp(const char *const input, const int nelements, char *const o
           break;
       }
       int64_t  diff = curr_value - prev_value;
-      uint64_t zigzag_value = (diff >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (diff << 1);
+      uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, diff);
       buffer |= ((zigzag_value & INT64MASK(bit)) << (bit * k + 4));
       i++;
       prev_value = curr_value;
@@ -428,8 +210,8 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
       word_length = CHAR_BYTES;
       break;
     default:
-      perror("Wrong integer types.\n");
-      exit(1);
+      uError("Invalid decompress integer type:%d", type);
+      return -1;
   }
 
   // If not compressed.
@@ -466,30 +248,30 @@ int tsDecompressINTImp(const char *const input, const int nelements, char *const
       } else {
         zigzag_value = ((w >> (4 + bit * i)) & INT64MASK(bit));
       }
-      int64_t diff = (zigzag_value >> 1) ^ -(zigzag_value & 1);
+      int64_t diff = ZIGZAG_DECODE(int64_t, zigzag_value);
       int64_t curr_value = diff + prev_value;
       prev_value = curr_value;
 
       switch (type) {
         case TSDB_DATA_TYPE_BIGINT:
-          *((int64_t *)output + _pos) = curr_value;
+          *((int64_t *)output + _pos) = (int64_t)curr_value;
           _pos++;
           break;
         case TSDB_DATA_TYPE_INT:
-          *((int32_t *)output + _pos) = curr_value;
+          *((int32_t *)output + _pos) = (int32_t)curr_value;
           _pos++;
           break;
         case TSDB_DATA_TYPE_SMALLINT:
-          *((int16_t *)output + _pos) = curr_value;
+          *((int16_t *)output + _pos) = (int16_t)curr_value;
           _pos++;
           break;
         case TSDB_DATA_TYPE_TINYINT:
-          *((int8_t *)output + _pos) = curr_value;
+          *((int8_t *)output + _pos) = (int8_t)curr_value;
           _pos++;
           break;
         default:
           perror("Wrong integer types.\n");
-          exit(1);
+          return -1;
       }
       count++;
       if (count == nelements) break;
@@ -526,8 +308,8 @@ int tsCompressBoolImp(const char *const input, const int nelements, char *const
       /* t = (~((( uint8_t)1) << (7-i%BITS_PER_BYTE))); */
       output[pos] |= t;
     } else {
-      perror("Wrong bool value.\n");
-      exit(1);
+      uError("Invalid compress bool value:%d", output[pos]);
+      return -1;
     }
   }
 
@@ -582,8 +364,8 @@ int tsCompressBoolRLEImp(const char *const input, const int nelements, char *con
     } else if (num == 0) {
       output[_pos++] = (counter << 1) | INT8MASK(0);
     } else {
-      perror("Wrong bool value!\n");
-      exit(1);
+      uError("Invalid compress bool value:%d", output[_pos]);
+      return -1;
     }
   }
 
@@ -632,10 +414,8 @@ int tsDecompressStringImp(const char *const input, int compressedSize, char *con
     /* It is compressed by LZ4 algorithm */
     const int decompressed_size = LZ4_decompress_safe(input + 1, output, compressedSize - 1, outputSize);
     if (decompressed_size < 0) {
-      char msg[128] = {0};
-      sprintf(msg, "decomp_size:%d, Error decompress in LZ4 algorithm!\n", decompressed_size);
-      perror(msg);
-      exit(EXIT_FAILURE);
+      uError("Failed to decompress string with LZ4 algorithm, decompressed size:%d", decompressed_size);
+      return -1;
     }
 
     return decompressed_size;
@@ -644,8 +424,8 @@ int tsDecompressStringImp(const char *const input, int compressedSize, char *con
     memcpy(output, input + 1, compressedSize - 1);
     return compressedSize - 1;
   } else {
-    perror("Wrong compressed string indicator!\n");
-    exit(EXIT_FAILURE);
+    uError("Invalid decompress string indicator:%d", input[0]);
+    return -1;
   }
 }
 
@@ -672,21 +452,21 @@ int tsCompressTimestampImp(const char *const input, const int nelements, char *c
     if (!safeInt64Add(curr_delta, -prev_delta)) goto _exit_over;
     int64_t delta_of_delta = curr_delta - prev_delta;
     // zigzag encode the value.
-    uint64_t zigzag_value = (delta_of_delta >> (LONG_BYTES * BITS_PER_BYTE - 1)) ^ (delta_of_delta << 1);
+    uint64_t zigzag_value = ZIGZAG_ENCODE(int64_t, delta_of_delta);
     if (i % 2 == 0) {
       flags = 0;
       dd1 = zigzag_value;
       if (dd1 == 0) {
         flag1 = 0;
       } else {
-        flag1 = LONG_BYTES - BUILDIN_CLZL(dd1) / BITS_PER_BYTE;
+        flag1 = (uint8_t)(LONG_BYTES - BUILDIN_CLZL(dd1) / BITS_PER_BYTE);
       }
     } else {
       dd2 = zigzag_value;
       if (dd2 == 0) {
         flag2 = 0;
       } else {
-        flag2 = LONG_BYTES - BUILDIN_CLZL(dd2) / BITS_PER_BYTE;
+        flag2 = (uint8_t)(LONG_BYTES - BUILDIN_CLZL(dd2) / BITS_PER_BYTE);
       }
       flags = flag1 | (flag2 << 4);
       // Encode the flag.
@@ -769,11 +549,11 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
         delta_of_delta = 0;
       } else {
         if (is_bigendian()) {
-          memcpy(&dd1 + LONG_BYTES - nbytes, input + ipos, nbytes);
+          memcpy(((char *)(&dd1)) + LONG_BYTES - nbytes, input + ipos, nbytes);
         } else {
           memcpy(&dd1, input + ipos, nbytes);
         }
-        delta_of_delta = (dd1 >> 1) ^ -(dd1 & 1);
+        delta_of_delta = ZIGZAG_DECODE(int64_t, dd1);
       }
       ipos += nbytes;
       if (opos == 0) {
@@ -794,12 +574,12 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
         delta_of_delta = 0;
       } else {
         if (is_bigendian()) {
-          memcpy(&dd2 + LONG_BYTES - nbytes, input + ipos, nbytes);
+          memcpy(((char *)(&dd2)) + LONG_BYTES - nbytes, input + ipos, nbytes);
         } else {
           memcpy(&dd2, input + ipos, nbytes);
         }
         // zigzag_decoding
-        delta_of_delta = (dd2 >> 1) ^ -(dd2 & 1);
+        delta_of_delta = ZIGZAG_DECODE(int64_t, dd2);
       }
       ipos += nbytes;
       prev_delta = delta_of_delta + prev_delta;
@@ -810,6 +590,7 @@ int tsDecompressTimestampImp(const char *const input, const int nelements, char
 
   } else {
     assert(0);
+    return -1;
   }
 }
 /* --------------------------------------------Double Compression
@@ -861,12 +642,12 @@ int tsCompressDoubleImp(const char *const input, const int nelements, char *cons
     uint8_t flag;
 
     if (trailing_zeros > leading_zeros) {
-      nbytes = LONG_BYTES - trailing_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(LONG_BYTES - trailing_zeros / BITS_PER_BYTE);
 
       if (nbytes > 0) nbytes--;
       flag = ((uint8_t)1 << 3) | nbytes;
     } else {
-      nbytes = LONG_BYTES - leading_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(LONG_BYTES - leading_zeros / BITS_PER_BYTE);
       if (nbytes > 0) nbytes--;
       flag = nbytes;
     }
@@ -1008,12 +789,12 @@ int tsCompressFloatImp(const char *const input, const int nelements, char *const
     uint8_t flag;
 
     if (trailing_zeros > leading_zeros) {
-      nbytes = FLOAT_BYTES - trailing_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(FLOAT_BYTES - trailing_zeros / BITS_PER_BYTE);
 
       if (nbytes > 0) nbytes--;
       flag = ((uint8_t)1 << 3) | nbytes;
     } else {
-      nbytes = FLOAT_BYTES - leading_zeros / BITS_PER_BYTE;
+      nbytes = (uint8_t)(FLOAT_BYTES - leading_zeros / BITS_PER_BYTE);
       if (nbytes > 0) nbytes--;
       flag = nbytes;
     }
diff --git a/src/util/src/tconfig.c b/src/util/src/tconfig.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ec55841a060a49f4aa9e29981fa426e42d29d5c
--- /dev/null
+++ b/src/util/src/tconfig.c
@@ -0,0 +1,400 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tkey.h"
+#include "tulog.h"
+#include "tsocket.h"
+#include "tsystem.h"
+#include "tutil.h"
+
+SGlobalCfg tsGlobalConfig[TSDB_CFG_MAX_NUM] = {{0}};
+int32_t    tsGlobalConfigNum = 0;
+
+static char *tsGlobalUnit[] = {
+  " ", 
+  "(%)", 
+  "(GB)", 
+  "(Mb)", 
+  "(byte)", 
+  "(s)", 
+  "(ms)"
+};
+
+char *tsCfgStatusStr[] = {
+  "none", 
+  "system default", 
+  "config file", 
+  "taos_options", 
+  "program argument list"
+};
+
+static void taosReadFloatConfig(SGlobalCfg *cfg, char *input_value) {
+  float  value = (float)atof(input_value);
+  float *option = (float *)cfg->ptr;
+  if (value < cfg->minValue || value > cfg->maxValue) {
+    uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%f",
+           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      *option = value;
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %f", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], *option);
+    }
+  }
+}
+
+static void taosReadInt32Config(SGlobalCfg *cfg, char *input_value) {
+  int32_t  value = atoi(input_value);
+  int32_t *option = (int32_t *)cfg->ptr;
+  if (value < cfg->minValue || value > cfg->maxValue) {
+    uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
+           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      *option = value;
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], *option);
+    }
+  }
+}
+
+static void taosReadInt16Config(SGlobalCfg *cfg, char *input_value) {
+  int32_t  value = atoi(input_value);
+  int16_t *option = (int16_t *)cfg->ptr;
+  if (value < cfg->minValue || value > cfg->maxValue) {
+    uError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
+           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      *option = (int16_t)value;
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], *option);
+    }
+  }
+}
+
+static void taosReadDirectoryConfig(SGlobalCfg *cfg, char *input_value) {
+  int   length = (int)strlen(input_value);
+  char *option = (char *)cfg->ptr;
+  if (length <= 0 || length > cfg->ptrLength) {
+    uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
+           cfg->option, input_value, cfg->ptrLength, option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      wordexp_t full_path;
+      if (0 != wordexp(input_value, &full_path, 0)) {
+        printf("\nconfig dir: %s wordexp fail! reason:%s\n", input_value, strerror(errno));
+        wordfree(&full_path);
+        return;
+      }
+      
+      if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
+        strcpy(option, full_path.we_wordv[0]);
+      }
+      
+      wordfree(&full_path);
+
+      int code = taosMkDir(option, 0755);
+      if (code != 0) {
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        uError("config option:%s, input value:%s, directory not exist, create fail:%s",
+             cfg->option, input_value, strerror(errno)); 
+      }
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], option);
+    }
+  }
+}
+
+static void taosReadIpStrConfig(SGlobalCfg *cfg, char *input_value) {
+  uint32_t value = taosInetAddr(input_value);
+  char *   option = (char *)cfg->ptr;
+  if (value == INADDR_NONE) {
+    uError("config option:%s, input value:%s, is not a valid ip address, use default value:%s",
+           cfg->option, input_value, option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      strncpy(option, input_value, cfg->ptrLength);
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], option);
+    }
+  }
+}
+
+static void taosReadStringConfig(SGlobalCfg *cfg, char *input_value) {
+  int   length = (int) strlen(input_value);
+  char *option = (char *)cfg->ptr;
+  if (length <= 0 || length > cfg->ptrLength) {
+    uError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
+           cfg->option, input_value, cfg->ptrLength, option);
+  } else {
+    if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_FILE) {
+      strncpy(option, input_value, cfg->ptrLength);
+      cfg->cfgStatus = TAOS_CFG_CSTATUS_FILE;
+    } else {
+      uWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
+            tsCfgStatusStr[cfg->cfgStatus], option);
+    }
+  }
+}
+
+static void taosReadLogOption(char *option, char *value) {
+  for (int i = 0; i < tsGlobalConfigNum; ++i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_CONFIG) || !(cfg->cfgType & TSDB_CFG_CTYPE_B_LOG)) continue;
+    if (strcasecmp(cfg->option, option) != 0) continue;
+
+    switch (cfg->valType) {
+      case TAOS_CFG_VTYPE_INT32:
+        taosReadInt32Config(cfg, value);
+        if (strcasecmp(cfg->option, "debugFlag") == 0) {
+          taosSetAllDebugFlag();
+        }
+        break;
+      case TAOS_CFG_VTYPE_DIRECTORY:
+        taosReadDirectoryConfig(cfg, value);
+        break;
+      default:
+        break;
+    }
+    break;
+  }
+}
+
+SGlobalCfg *taosGetConfigOption(const char *option) {
+  taosInitGlobalCfg();
+  for (int i = 0; i < tsGlobalConfigNum; ++i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (strcasecmp(cfg->option, option) != 0) continue;
+    return cfg;
+  }
+  return NULL;
+}
+
+static void taosReadConfigOption(const char *option, char *value) {
+  for (int i = 0; i < tsGlobalConfigNum; ++i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_CONFIG)) continue;
+    if (strcasecmp(cfg->option, option) != 0) continue;
+
+    switch (cfg->valType) {
+      case TAOS_CFG_VTYPE_INT16:
+        taosReadInt16Config(cfg, value);
+        break;
+      case TAOS_CFG_VTYPE_INT32:
+        taosReadInt32Config(cfg, value);
+        break;
+      case TAOS_CFG_VTYPE_FLOAT:
+        taosReadFloatConfig(cfg, value);
+        break;
+      case TAOS_CFG_VTYPE_STRING:
+        taosReadStringConfig(cfg, value);
+        break;
+      case TAOS_CFG_VTYPE_IPSTR:
+        taosReadIpStrConfig(cfg, value);
+        break;
+      case TAOS_CFG_VTYPE_DIRECTORY:
+        taosReadDirectoryConfig(cfg, value);
+        break;
+      default:
+        uError("config option:%s, input value:%s, can't be recognized", option, value);
+        break;
+    }
+    break;
+  }
+}
+
+void taosInitConfigOption(SGlobalCfg cfg) {
+  tsGlobalConfig[tsGlobalConfigNum++] = cfg;
+}
+
+void taosReadGlobalLogCfg() {
+  FILE * fp;
+  char * line, *option, *value;
+  int    olen, vlen;
+  char   fileName[PATH_MAX] = {0};
+
+  mDebugFlag = 135;
+  sdbDebugFlag = 135;
+
+  wordexp_t full_path;
+  if ( 0 != wordexp(configDir, &full_path, 0)) {
+    printf("\nconfig file: %s wordexp fail! reason:%s\n", configDir, strerror(errno));
+    wordfree(&full_path);
+    return;
+  }
+  
+  if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {    
+    if (strlen(full_path.we_wordv[0]) >= TSDB_FILENAME_LEN) {
+      printf("\nconfig file: %s path overflow max len %d, all variables are set to default\n", full_path.we_wordv[0], TSDB_FILENAME_LEN - 1);
+      wordfree(&full_path);
+      return;
+    }
+    strcpy(configDir, full_path.we_wordv[0]);
+  } else {
+    #ifdef _TD_POWER_
+    printf("configDir:%s not there, use default value: /etc/power", configDir);
+    strcpy(configDir, "/etc/power");
+    #else
+    printf("configDir:%s not there, use default value: /etc/taos", configDir);
+    strcpy(configDir, "/etc/taos");
+    #endif
+  }
+  wordfree(&full_path);
+
+  taosReadLogOption("logDir", tsLogDir);
+  
+  sprintf(fileName, "%s/taos.cfg", configDir);
+  fp = fopen(fileName, "r");
+  if (fp == NULL) {
+    printf("\nconfig file:%s not found, all variables are set to default\n", fileName);
+    return;
+  }
+  
+  size_t len = 1024;
+  line = calloc(1, len);
+  
+  while (!feof(fp)) {
+    memset(line, 0, len);
+    
+    option = value = NULL;
+    olen = vlen = 0;
+
+    taosGetline(&line, &len, fp);
+    line[len - 1] = 0;
+
+    paGetToken(line, &option, &olen);
+    if (olen == 0) continue;
+    option[olen] = 0;
+
+    paGetToken(option + olen + 1, &value, &vlen);
+    if (vlen == 0) continue;
+    value[vlen] = 0;
+
+    taosReadLogOption(option, value);
+  }
+
+  taosTFree(line);
+  fclose(fp);
+}
+
+bool taosReadGlobalCfg() {
+  char * line, *option, *value, *value1;
+  int    olen, vlen, vlen1;
+  char   fileName[PATH_MAX] = {0};
+
+  sprintf(fileName, "%s/taos.cfg", configDir);
+  FILE* fp = fopen(fileName, "r");
+  if (fp == NULL) {
+    struct stat s;
+    if (stat(configDir, &s) != 0 || (!S_ISREG(s.st_mode) && !S_ISLNK(s.st_mode))) {
+      //return true to follow behavior before file support
+      return true;
+    }
+    fp = fopen(configDir, "r");
+    if (fp == NULL) {
+      return false;
+    }
+  }
+  
+  size_t len = 1024;
+  line = calloc(1, len);
+  
+  while (!feof(fp)) {
+    memset(line, 0, len);
+
+    option = value = NULL;
+    olen = vlen = 0;
+
+    taosGetline(&line, &len, fp);
+    line[len - 1] = 0;
+    
+    paGetToken(line, &option, &olen);
+    if (olen == 0) continue;
+    option[olen] = 0;
+
+    paGetToken(option + olen + 1, &value, &vlen);
+    if (vlen == 0) continue;
+    value[vlen] = 0;
+
+    // For dataDir, the format is:
+    // dataDir    /mnt/disk1    0
+    paGetToken(value + vlen + 1, &value1, &vlen1);
+    
+    taosReadConfigOption(option, value);
+  }
+
+  fclose(fp);
+
+  taosTFree(line);
+  
+  return true;
+}
+
+void taosPrintGlobalCfg() {
+  uInfo("   taos config & system info:");
+  uInfo("==================================");
+
+  for (int i = 0; i < tsGlobalConfigNum; ++i) {
+    SGlobalCfg *cfg = tsGlobalConfig + i;
+    if (tscEmbedded == 0 && !(cfg->cfgType & TSDB_CFG_CTYPE_B_CLIENT)) continue;
+    if (cfg->cfgType & TSDB_CFG_CTYPE_B_NOT_PRINT) continue;
+    
+    int optionLen = (int)strlen(cfg->option);
+    int blankLen = TSDB_CFG_PRINT_LEN - optionLen;
+    blankLen = blankLen < 0 ? 0 : blankLen;
+
+    char blank[TSDB_CFG_PRINT_LEN];
+    memset(blank, ' ', TSDB_CFG_PRINT_LEN);
+    blank[blankLen] = 0;
+
+    switch (cfg->valType) {
+      case TAOS_CFG_VTYPE_INT16:
+        uInfo(" %s:%s%d%s", cfg->option, blank, *((int16_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
+      case TAOS_CFG_VTYPE_INT32:
+        uInfo(" %s:%s%d%s", cfg->option, blank, *((int32_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
+      case TAOS_CFG_VTYPE_FLOAT:
+        uInfo(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
+        break;
+      case TAOS_CFG_VTYPE_STRING:
+      case TAOS_CFG_VTYPE_IPSTR:
+      case TAOS_CFG_VTYPE_DIRECTORY:
+        uInfo(" %s:%s%s%s", cfg->option, blank, (char *)cfg->ptr, tsGlobalUnit[cfg->unitType]);
+        break;
+      default:
+        break;
+    }
+  }
+
+  taosPrintOsInfo();
+}
diff --git a/src/util/src/tcrc32c.c b/src/util/src/tcrc32c.c
index 546693c4bbc82750b7bbc1a117469fb816fd0362..502116f9c27be1900f1c02d4bc9f2281fd9235af 100644
--- a/src/util/src/tcrc32c.c
+++ b/src/util/src/tcrc32c.c
@@ -736,7 +736,7 @@ static uint32_t table[16][256] = {
      0x9c221d09, 0x6e2e10f7, 0x7dd67004, 0x8fda7dfa}
 
 };
-
+#ifndef _TD_ARM_
 static uint32_t long_shifts[4][256] = {
     {0x00000000, 0xe040e0ac, 0xc56db7a9, 0x252d5705, 0x8f3719a3, 0x6f77f90f,
      0x4a5aae0a, 0xaa1a4ea6, 0x1b8245b7, 0xfbc2a51b, 0xdeeff21e, 0x3eaf12b2,
@@ -1090,7 +1090,7 @@ static uint32_t short_shifts[4][256] = {
      0x3c3f083d, 0x1984fde6, 0x7748e38b, 0x52f31650, 0xaad0df51, 0x8f6b2a8a,
      0xe1a734e7, 0xc41cc13c, 0x140cd014, 0x31b725cf, 0x5f7b3ba2, 0x7ac0ce79,
      0x82e30778, 0xa758f2a3, 0xc994ecce, 0xec2f1915}};
-
+#endif
 #if 0
 static uint32_t append_trivial(uint32_t crc, crc_stream input, size_t length) {
   for (size_t i = 0; i < length; ++i) {
@@ -1187,13 +1187,13 @@ uint32_t crc32c_sf(uint32_t crci, crc_stream input, size_t length) {
   }
   return (uint32_t)crc ^ 0xffffffff;
 }
-
+#ifndef _TD_ARM_
 /* Apply the zeros operator table to crc. */
 static uint32_t shift_crc(uint32_t shift_table[][256], uint32_t crc) {
   return shift_table[0][crc & 0xff] ^ shift_table[1][(crc >> 8) & 0xff] ^
          shift_table[2][(crc >> 16) & 0xff] ^ shift_table[3][crc >> 24];
 }
-
+#endif
 /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
    version.  Otherwise, use the software version. */
 uint32_t (*crc32c)(uint32_t crci, crc_stream bytes, size_t len) = crc32c_sf;
@@ -1353,12 +1353,12 @@ uint32_t crc32c_hw(uint32_t crc, crc_stream buf, size_t len) {
 #endif // #ifndef _TD_ARM_
 
 void taosResolveCRC() {
-#ifndef _TD_ARM_
+#if defined _TD_ARM_ || defined WINDOWS
+  crc32c = crc32c_sf;
+#else
   int sse42;
   SSE42(sse42);
   crc32c = sse42 ? crc32c_hw : crc32c_sf;
-#else
-  crc32c = crc32c_sf;
 #endif  
   /* return sse42 ? crc32c_hw(crci, bytes, len) : crc32c_sf(crci, bytes, len);
    */
diff --git a/src/util/src/tdes.c b/src/util/src/tdes.c
index 6f72dec574f4684bb830e9193a1e30aebfeee565..871ae15a8ad9d5d39ed5bf44e1b565f0ac4f08ff 100644
--- a/src/util/src/tdes.c
+++ b/src/util/src/tdes.c
@@ -1,8 +1,5 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+
+#include "os.h"
 #include "tkey.h"
 
 #define ENCRYPTION_MODE 1
@@ -18,6 +15,7 @@ void generate_key(unsigned char* key);
 void generate_sub_keys(unsigned char* main_key, key_set* key_sets);
 void process_message(unsigned char* message_piece, unsigned char* processed_piece, key_set* key_sets, int mode);
 
+#if 0
 int64_t taosDesGenKey() {
   unsigned int iseed = (unsigned int)time(NULL);
   srand(iseed);
@@ -27,12 +25,13 @@ int64_t taosDesGenKey() {
 
   return *((int64_t*)key);
 }
+#endif
 
 char* taosDesImp(unsigned char* key, char* src, unsigned int len, int process_mode) {
   unsigned int  number_of_blocks = len / 8;
   unsigned char data_block[9] = {0};
   unsigned char processed_block[9] = {0};
-  key_set       key_sets[17] = {0};
+  key_set       key_sets[17]; memset(key_sets, 0, sizeof(key_sets));
   char*         dest = calloc(len + 1, 1);
   generate_sub_keys(key, key_sets);
 
@@ -138,7 +137,7 @@ void print_char_as_binary(char input) {
 void generate_key(unsigned char* key) {
   int i;
   for (i = 0; i < 8; i++) {
-    key[i] = rand() % 255;
+    key[i] = taosRand() % 255;
   }
 }
 
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
new file mode 100644
index 0000000000000000000000000000000000000000..1eb6893cbc639be013104fe636f6af373a61b3c3
--- /dev/null
+++ b/src/util/src/terror.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2020 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 <stdint.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define TAOS_ERROR_C
+ 
+typedef struct {
+    int32_t val;
+    const char* str;
+} STaosError;
+ 
+
+#include "os.h"
+#include "taoserror.h"
+
+
+static threadlocal int32_t tsErrno;
+int32_t* taosGetErrno() {
+  return &tsErrno;
+}
+
+
+static int tsCompareTaosError(const void* a, const void* b) {
+  const STaosError* x = (const STaosError*)a;
+  const STaosError* y = (const STaosError*)b;
+  if (x->val < y->val) {
+    return -1;
+  }
+  if (x->val > y->val) {
+    return 1;
+  }
+  return 0;
+}
+
+static pthread_once_t tsErrorInit = PTHREAD_ONCE_INIT;
+static void tsSortError(void) {
+  qsort(errors, sizeof(errors)/sizeof(errors[0]), sizeof(errors[0]), tsCompareTaosError);
+}
+
+
+const char* tstrerror(int32_t err) {
+  pthread_once(&tsErrorInit, tsSortError);
+
+  // this is a system errno
+  if ((err & 0x00ff0000) == 0x00ff0000) {
+    return strerror(err & 0x0000ffff);
+  }
+
+  size_t s = 0, e = sizeof(errors)/sizeof(errors[0]);
+  while (s < e) {
+    size_t mid = (s + e) / 2;
+    int32_t val = errors[mid].val;
+    if (err > val) {
+      s = mid + 1;
+    } else if (err < val) {
+      e = mid;
+    } else if (err == val) {
+      return errors[mid].str;
+    } else {
+      break;
+    }
+  }
+
+  return "";
+}
diff --git a/src/util/src/textbuffer.c b/src/util/src/textbuffer.c
deleted file mode 100644
index e1c571f4c28a3b40ba7f7d2cdd33be5e4d965946..0000000000000000000000000000000000000000
--- a/src/util/src/textbuffer.c
+++ /dev/null
@@ -1,2013 +0,0 @@
-/*
- * 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 "os.h"
-#include "taos.h"
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "tlog.h"
-#include "tsqlfunction.h"
-#include "ttime.h"
-#include "ttypes.h"
-#include "tutil.h"
-
-#define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
-  (data + (schema)->colOffset[colId] * (allrow) + (rowId) * (schema)->pFields[colId].bytes)
-
-int32_t tmpFileSerialNum = 0;
-
-void getTmpfilePath(const char *fileNamePrefix, char *dstPath) {
-  const char* tdengineTmpFileNamePrefix = "tdengine-";
-
-  char tmpPath[MAX_TMPFILE_PATH_LENGTH] = {0};
-
-#ifdef WINDOWS
-  char *tmpDir = getenv("tmp");
-  if (tmpDir == NULL) {
-    tmpDir = "";
-  }
-#else
-  char *tmpDir = "/tmp/";
-#endif
-
-  strcpy(tmpPath, tmpDir);
-  strcat(tmpPath, tdengineTmpFileNamePrefix);
-  strcat(tmpPath, fileNamePrefix);
-  strcat(tmpPath, "-%llu-%u");
-  snprintf(dstPath, MAX_TMPFILE_PATH_LENGTH, tmpPath, taosGetPthreadId(), atomic_add_fetch_32(&tmpFileSerialNum, 1));
-}
-
-/*
- * tColModel is deeply copy
- */
-void tExtMemBufferCreate(tExtMemBuffer **pMemBuffer, int32_t nBufferSize, int32_t elemSize, const char *tmpDataFilePath,
-                         tColModel *pModel) {
-  (*pMemBuffer) = (tExtMemBuffer *)calloc(1, sizeof(tExtMemBuffer));
-
-  (*pMemBuffer)->nPageSize = DEFAULT_PAGE_SIZE;
-  (*pMemBuffer)->nMaxSizeInPages = ALIGN8(nBufferSize) / (*pMemBuffer)->nPageSize;
-  (*pMemBuffer)->nElemSize = elemSize;
-
-  (*pMemBuffer)->numOfElemsPerPage = ((*pMemBuffer)->nPageSize - sizeof(tFilePage)) / (*pMemBuffer)->nElemSize;
-
-  strcpy((*pMemBuffer)->dataFilePath, tmpDataFilePath);
-
-  tFileMeta *pFMeta = &(*pMemBuffer)->fileMeta;
-
-  pFMeta->numOfElemsInFile = 0;
-  pFMeta->nFileSize = 0;
-  pFMeta->nPageSize = DEFAULT_PAGE_SIZE;
-
-  pFMeta->flushoutData.nAllocSize = 4;
-  pFMeta->flushoutData.nLength = 0;
-  pFMeta->flushoutData.pFlushoutInfo = (tFlushoutInfo *)calloc(4, sizeof(tFlushoutInfo));
-
-  (*pMemBuffer)->pColModel = tColModelCreate(pModel->pFields, pModel->numOfCols, (*pMemBuffer)->numOfElemsPerPage);
-}
-
-void tExtMemBufferDestroy(tExtMemBuffer **pMemBuffer) {
-  if ((*pMemBuffer) == NULL) {
-    return;
-  }
-
-  // release flush out info link
-  tFileMeta *pFileMeta = &(*pMemBuffer)->fileMeta;
-  if (pFileMeta->flushoutData.nAllocSize != 0 && pFileMeta->flushoutData.pFlushoutInfo != NULL) {
-    tfree(pFileMeta->flushoutData.pFlushoutInfo);
-  }
-
-  // release all in-memory buffer pages
-  tFilePagesItem *pFilePages = (*pMemBuffer)->pHead;
-  while (pFilePages != NULL) {
-    tFilePagesItem *pTmp = pFilePages;
-    pFilePages = pFilePages->pNext;
-    tfree(pTmp);
-  }
-
-  // close temp file
-  if ((*pMemBuffer)->dataFile != 0) {
-    if (fclose((*pMemBuffer)->dataFile) != 0) {
-      pError("failed to close file:%s, reason:%s", (*pMemBuffer)->dataFilePath, strerror(errno));
-    }
-    
-    pTrace("remove temp file:%s for external buffer", (*pMemBuffer)->dataFilePath);
-    unlink((*pMemBuffer)->dataFilePath);
-  }
-
-  tColModelDestroy((*pMemBuffer)->pColModel);
-
-  tfree(*pMemBuffer);
-}
-
-/*
- * alloc more memory for flush out info entries.
- */
-static bool allocFlushoutInfoEntries(tFileMeta *pFileMeta) {
-  pFileMeta->flushoutData.nAllocSize = pFileMeta->flushoutData.nAllocSize << 1;
-
-  tFlushoutInfo *tmp = (tFlushoutInfo *)realloc(pFileMeta->flushoutData.pFlushoutInfo,
-                                                sizeof(tFlushoutInfo) * pFileMeta->flushoutData.nAllocSize);
-  if (tmp == NULL) {
-    pError("out of memory!\n");
-    return false;
-  }
-
-  pFileMeta->flushoutData.pFlushoutInfo = tmp;
-  return true;
-}
-
-bool tExtMemBufferAlloc(tExtMemBuffer *pMemBuffer) {
-  if (pMemBuffer->numOfPagesInMem > 0 && pMemBuffer->numOfPagesInMem == pMemBuffer->nMaxSizeInPages) {
-    /*
-     * the in-mem buffer is full.
-     * To flush data to disk to accommodate more data
-     */
-    if (!tExtMemBufferFlush(pMemBuffer)) {
-      return false;
-    }
-  }
-
-  /*
-   * We do not recycle the file page structure. And in flush data operations, all
-   * filepage that are full of data are destroyed after data being flushed to disk.
-   *
-   * The memory buffer pages may be recycle in order to avoid unnecessary memory
-   * allocation later.
-   */
-  tFilePagesItem *item = (tFilePagesItem *)calloc(1, pMemBuffer->nPageSize + sizeof(tFilePagesItem));
-  if (item == NULL) {
-    return false;
-  }
-
-  item->pNext = NULL;
-  item->item.numOfElems = 0;
-
-  if (pMemBuffer->pTail != NULL) {
-    pMemBuffer->pTail->pNext = item;
-    pMemBuffer->pTail = item;
-  } else {
-    pMemBuffer->pTail = item;
-    pMemBuffer->pHead = item;
-  }
-
-  pMemBuffer->numOfPagesInMem += 1;
-
-  return true;
-}
-
-/*
- * put elements into buffer
- */
-int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRows) {
-  if (numOfRows == 0) {
-    return pMemBuffer->numOfPagesInMem;
-  }
-
-  tFilePagesItem *pLast = pMemBuffer->pTail;
-  if (pLast == NULL) {
-    if (!tExtMemBufferAlloc(pMemBuffer)) {
-      return -1;
-    }
-
-    pLast = pMemBuffer->pTail;
-  }
-
-  if (pLast->item.numOfElems + numOfRows <= pMemBuffer->numOfElemsPerPage) {
-    // enough space for records
-    tColModelAppend(pMemBuffer->pColModel, &pLast->item, data, 0, numOfRows, numOfRows);
-    pMemBuffer->numOfElemsInBuffer += numOfRows;
-    pMemBuffer->numOfAllElems += numOfRows;
-  } else {
-    int32_t numOfRemainEntries = pMemBuffer->numOfElemsPerPage - pLast->item.numOfElems;
-    tColModelAppend(pMemBuffer->pColModel, &pLast->item, data, 0, numOfRemainEntries, numOfRows);
-
-    pMemBuffer->numOfElemsInBuffer += numOfRemainEntries;
-    pMemBuffer->numOfAllElems += numOfRemainEntries;
-
-    int32_t hasWritten = numOfRemainEntries;
-    int32_t remain = numOfRows - numOfRemainEntries;
-
-    while (remain > 0) {
-      if (!tExtMemBufferAlloc(pMemBuffer)) {
-        // failed to allocate memory buffer
-        return -1;
-      }
-
-      int32_t numOfWriteElems = 0;
-      if (remain > pMemBuffer->numOfElemsPerPage) {
-        numOfWriteElems = pMemBuffer->numOfElemsPerPage;
-      } else {
-        numOfWriteElems = remain;
-      }
-
-      pMemBuffer->numOfAllElems += numOfWriteElems;
-
-      pLast = pMemBuffer->pTail;
-      tColModelAppend(pMemBuffer->pColModel, &pLast->item, data, hasWritten, numOfWriteElems, numOfRows);
-
-      remain -= numOfWriteElems;
-      pMemBuffer->numOfElemsInBuffer += numOfWriteElems;
-      hasWritten += numOfWriteElems;
-    }
-  }
-
-  return pMemBuffer->numOfPagesInMem;
-}
-
-static bool tExtMemBufferUpdateFlushoutInfo(tExtMemBuffer *pMemBuffer) {
-  tFileMeta *pFileMeta = &pMemBuffer->fileMeta;
-
-  if (pMemBuffer->flushModel == MULTIPLE_APPEND_MODEL) {
-    if (pFileMeta->flushoutData.nLength == pFileMeta->flushoutData.nAllocSize && !allocFlushoutInfoEntries(pFileMeta)) {
-      return false;
-    }
-
-    tFlushoutInfo *pFlushoutInfo = &pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength];
-    if (pFileMeta->flushoutData.nLength == 0) {
-      pFlushoutInfo->startPageId = 0;
-    } else {
-      pFlushoutInfo->startPageId =
-          pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength - 1].startPageId +
-          pFileMeta->flushoutData.pFlushoutInfo[pFileMeta->flushoutData.nLength - 1].numOfPages;
-    }
-
-    // only the page still in buffer is flushed out to disk
-    pFlushoutInfo->numOfPages = pMemBuffer->numOfPagesInMem;
-    pFileMeta->flushoutData.nLength += 1;
-  } else {
-    // always update the first flushout array in single_flush_model
-    pFileMeta->flushoutData.nLength = 1;
-    tFlushoutInfo *pFlushoutInfo = &pFileMeta->flushoutData.pFlushoutInfo[0];
-    pFlushoutInfo->numOfPages += pMemBuffer->numOfPagesInMem;
-  }
-
-  return true;
-}
-
-static void tExtMemBufferClearFlushoutInfo(tExtMemBuffer *pMemBuffer) {
-  tFileMeta *pFileMeta = &pMemBuffer->fileMeta;
-
-  pFileMeta->flushoutData.nLength = 0;
-  memset(pFileMeta->flushoutData.pFlushoutInfo, 0, sizeof(tFlushoutInfo) * pFileMeta->flushoutData.nAllocSize);
-}
-
-bool tExtMemBufferFlush(tExtMemBuffer *pMemBuffer) {
-  if (pMemBuffer->numOfAllElems == 0) {
-    return true;
-  }
-
-  if (pMemBuffer->dataFile == NULL) {
-    if ((pMemBuffer->dataFile = fopen(pMemBuffer->dataFilePath, "wb+")) == NULL) {
-      return false;
-    }
-  }
-
-  if (pMemBuffer->numOfElemsInBuffer == 0) {
-    /* all data has been flushed to disk, ignore flush operation */
-    return true;
-  }
-
-  bool            ret = true;
-  tFilePagesItem *first = pMemBuffer->pHead;
-
-  while (first != NULL) {
-    size_t retVal = fwrite((char *)&(first->item), pMemBuffer->nPageSize, 1, pMemBuffer->dataFile);
-    if (retVal <= 0) {  // failed to write to buffer, may be not enough space
-      ret = false;
-    }
-
-    pMemBuffer->fileMeta.numOfElemsInFile += first->item.numOfElems;
-    pMemBuffer->fileMeta.nFileSize += 1;
-
-    tFilePagesItem *ptmp = first;
-    first = first->pNext;
-
-    tfree(ptmp);  // release all data in memory buffer
-  }
-
-  fflush(pMemBuffer->dataFile);  // flush to disk
-
-  tExtMemBufferUpdateFlushoutInfo(pMemBuffer);
-
-  pMemBuffer->numOfElemsInBuffer = 0;
-  pMemBuffer->numOfPagesInMem = 0;
-  pMemBuffer->pHead = NULL;
-  pMemBuffer->pTail = NULL;
-
-  return ret;
-}
-
-void tExtMemBufferClear(tExtMemBuffer *pMemBuffer) {
-  if (pMemBuffer == NULL || pMemBuffer->numOfAllElems == 0) return;
-
-  /*
-   * release all data in memory buffer
-   */
-  tFilePagesItem *first = pMemBuffer->pHead;
-  while (first != NULL) {
-    tFilePagesItem *ptmp = first;
-    first = first->pNext;
-    tfree(ptmp);
-  }
-
-  pMemBuffer->fileMeta.numOfElemsInFile = 0;
-  pMemBuffer->fileMeta.nFileSize = 0;
-
-  pMemBuffer->numOfElemsInBuffer = 0;
-  pMemBuffer->numOfPagesInMem = 0;
-  pMemBuffer->pHead = NULL;
-  pMemBuffer->pTail = NULL;
-
-  tExtMemBufferClearFlushoutInfo(pMemBuffer);
-
-  if (pMemBuffer->dataFile != NULL) {
-    // reset the write pointer to the header
-    fseek(pMemBuffer->dataFile, 0, SEEK_SET);
-  }
-}
-
-bool tExtMemBufferLoadData(tExtMemBuffer *pMemBuffer, tFilePage *pFilePage, int32_t flushoutId, int32_t pageIdx) {
-  if (flushoutId < 0 || flushoutId > pMemBuffer->fileMeta.flushoutData.nLength) {
-    return false;
-  }
-
-  tFlushoutInfo *pInfo = &(pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[flushoutId]);
-  if (pageIdx > (int32_t)pInfo->numOfPages) {
-    return false;
-  }
-
-  size_t ret = fseek(pMemBuffer->dataFile, (pInfo->startPageId + pageIdx) * pMemBuffer->nPageSize, SEEK_SET);
-  ret = fread(pFilePage, pMemBuffer->nPageSize, 1, pMemBuffer->dataFile);
-
-  return (ret > 0);
-}
-
-bool tExtMemBufferIsAllDataInMem(tExtMemBuffer *pMemBuffer) { return (pMemBuffer->fileMeta.nFileSize == 0); }
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// TODO safty check in result
-void tBucketBigIntHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx) {
-  int64_t v = *(int64_t *)value;
-
-  if (pBucket->nRange.i64MaxVal == INT64_MIN) {
-    if (v >= 0) {
-      *segIdx = ((v >> (64 - 9)) >> 6) + 8;
-      *slotIdx = (v >> (64 - 9)) & 0x3F;
-    } else {  // v<0
-      *segIdx = ((-v) >> (64 - 9)) >> 6;
-      *slotIdx = ((-v) >> (64 - 9)) & 0x3F;
-      *segIdx = 7 - (*segIdx);
-    }
-  } else {
-    // todo hash for bigint and float and double
-    int64_t span = pBucket->nRange.i64MaxVal - pBucket->nRange.i64MinVal;
-    if (span < pBucket->nTotalSlots) {
-      int32_t delta = (int32_t)(v - pBucket->nRange.i64MinVal);
-      *segIdx = delta / pBucket->nSlotsOfSeg;
-      *slotIdx = delta % pBucket->nSlotsOfSeg;
-    } else {
-      double x = (double)span / pBucket->nTotalSlots;
-      double posx = (v - pBucket->nRange.i64MinVal) / x;
-      if (v == pBucket->nRange.i64MaxVal) {
-        posx -= 1;
-      }
-
-      *segIdx = ((int32_t)posx) / pBucket->nSlotsOfSeg;
-      *slotIdx = ((int32_t)posx) % pBucket->nSlotsOfSeg;
-    }
-  }
-}
-
-// todo refactor to more generic
-void tBucketIntHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx) {
-  int32_t v = *(int32_t *)value;
-
-  if (pBucket->nRange.iMaxVal == INT32_MIN) {
-    /*
-     * taking negative integer into consideration,
-     * there is only half of pBucket->segs available for non-negative integer
-     */
-    //        int32_t numOfSlots = pBucket->nTotalSlots>>1;
-    //        int32_t bits = bitsOfNumber(numOfSlots)-1;
-
-    if (v >= 0) {
-      *segIdx = ((v >> (32 - 9)) >> 6) + 8;
-      *slotIdx = (v >> (32 - 9)) & 0x3F;
-    } else {  // v<0
-      *segIdx = ((-v) >> (32 - 9)) >> 6;
-      *slotIdx = ((-v) >> (32 - 9)) & 0x3F;
-      *segIdx = 7 - (*segIdx);
-    }
-  } else {
-    // divide a range of [iMinVal, iMaxVal] into 1024 buckets
-    int32_t span = pBucket->nRange.iMaxVal - pBucket->nRange.iMinVal;
-    if (span < pBucket->nTotalSlots) {
-      int32_t delta = v - pBucket->nRange.iMinVal;
-      *segIdx = delta / pBucket->nSlotsOfSeg;
-      *slotIdx = delta % pBucket->nSlotsOfSeg;
-    } else {
-      double x = (double)span / pBucket->nTotalSlots;
-      double posx = (v - pBucket->nRange.iMinVal) / x;
-      if (v == pBucket->nRange.iMaxVal) {
-        posx -= 1;
-      }
-      *segIdx = ((int32_t)posx) / pBucket->nSlotsOfSeg;
-      *slotIdx = ((int32_t)posx) % pBucket->nSlotsOfSeg;
-    }
-  }
-}
-
-void tBucketDoubleHash(tMemBucket *pBucket, void *value, int16_t *segIdx, int16_t *slotIdx) {
-  //double v = *(double *)value;
-  double v = GET_DOUBLE_VAL(value);
-
-  if (pBucket->nRange.dMinVal == DBL_MAX) {
-    /*
-     * taking negative integer into consideration,
-     * there is only half of pBucket->segs available for non-negative integer
-     */
-    double x = DBL_MAX / (pBucket->nTotalSlots >> 1);
-    double posx = (v + DBL_MAX) / x;
-    *segIdx = ((int32_t)posx) / pBucket->nSlotsOfSeg;
-    *slotIdx = ((int32_t)posx) % pBucket->nSlotsOfSeg;
-  } else {
-    // divide a range of [dMinVal, dMaxVal] into 1024 buckets
-    double span = pBucket->nRange.dMaxVal - pBucket->nRange.dMinVal;
-    if (span < pBucket->nTotalSlots) {
-      int32_t delta = (int32_t)(v - pBucket->nRange.dMinVal);
-      *segIdx = delta / pBucket->nSlotsOfSeg;
-      *slotIdx = delta % pBucket->nSlotsOfSeg;
-    } else {
-      double x = span / pBucket->nTotalSlots;
-      double posx = (v - pBucket->nRange.dMinVal) / x;
-      if (v == pBucket->nRange.dMaxVal) {
-        posx -= 1;
-      }
-      *segIdx = ((int32_t)posx) / pBucket->nSlotsOfSeg;
-      *slotIdx = ((int32_t)posx) % pBucket->nSlotsOfSeg;
-    }
-
-    if (*segIdx < 0 || *segIdx > 16 || *slotIdx < 0 || *slotIdx > 64) {
-      pError("error in hash process. segment is: %d, slot id is: %d\n", *segIdx, *slotIdx);
-    }
-  }
-}
-
-tMemBucket* tMemBucketCreate(int32_t totalSlots, int32_t nBufferSize, int16_t nElemSize, int16_t dataType, tOrderDescriptor *pDesc) {
-  tMemBucket* pBucket = (tMemBucket *)malloc(sizeof(tMemBucket));
-
-  pBucket->nTotalSlots = totalSlots;
-  pBucket->nSlotsOfSeg = 1 << 6;  // 64 Segments, 16 slots each seg.
-  pBucket->dataType = dataType;
-  pBucket->nElemSize = nElemSize;
-  pBucket->nPageSize = DEFAULT_PAGE_SIZE;
-
-  pBucket->numOfElems = 0;
-  pBucket->numOfSegs = pBucket->nTotalSlots / pBucket->nSlotsOfSeg;
-
-  pBucket->nTotalBufferSize = nBufferSize;
-
-  pBucket->maxElemsCapacity = pBucket->nTotalBufferSize / pBucket->nElemSize;
-
-  pBucket->numOfTotalPages = pBucket->nTotalBufferSize / pBucket->nPageSize;
-  pBucket->numOfAvailPages = pBucket->numOfTotalPages;
-
-  pBucket->pOrderDesc = pDesc;
-
-  switch (pBucket->dataType) {
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_TINYINT: {
-      pBucket->nRange.iMinVal = INT32_MAX;
-      pBucket->nRange.iMaxVal = INT32_MIN;
-      pBucket->HashFunc = tBucketIntHash;
-      break;
-    };
-    case TSDB_DATA_TYPE_DOUBLE:
-    case TSDB_DATA_TYPE_FLOAT: {
-      pBucket->nRange.dMinVal = DBL_MAX;
-      pBucket->nRange.dMaxVal = -DBL_MAX;
-      pBucket->HashFunc = tBucketDoubleHash;
-      break;
-    };
-    case TSDB_DATA_TYPE_BIGINT: {
-      pBucket->nRange.i64MinVal = INT64_MAX;
-      pBucket->nRange.i64MaxVal = INT64_MIN;
-      pBucket->HashFunc = tBucketBigIntHash;
-      break;
-    };
-    default: {
-      pError("MemBucket:%p,not support data type %d,failed", *pBucket, pBucket->dataType);
-      tfree(pBucket);
-      return NULL;
-    }
-  }
-
-  if (pDesc->pSchema->numOfCols != 1 || pDesc->pSchema->colOffset[0] != 0) {
-    pError("MemBucket:%p,only consecutive data is allowed,invalid numOfCols:%d or offset:%d",
-           pBucket, pDesc->pSchema->numOfCols, pDesc->pSchema->colOffset[0]);
-    tfree(pBucket);
-    return NULL;
-  }
-
-  if (pDesc->pSchema->pFields[0].type != dataType) {
-    pError("MemBucket:%p,data type is not consistent,%d in schema, %d in param", pBucket,
-           pDesc->pSchema->pFields[0].type, dataType);
-    tfree(pBucket);
-    return NULL;
-  }
-
-  if (pBucket->numOfTotalPages < pBucket->nTotalSlots) {
-    pWarn("MemBucket:%p,total buffer pages %d are not enough for all slots", pBucket, pBucket->numOfTotalPages);
-  }
-
-  pBucket->pSegs = (tMemBucketSegment *)malloc(pBucket->numOfSegs * sizeof(tMemBucketSegment));
-
-  for (int32_t i = 0; i < pBucket->numOfSegs; ++i) {
-    pBucket->pSegs[i].numOfSlots = pBucket->nSlotsOfSeg;
-    pBucket->pSegs[i].pBuffer = NULL;
-    pBucket->pSegs[i].pBoundingEntries = NULL;
-  }
-
-  pTrace("MemBucket:%p,created,buffer size:%d,elem size:%d", pBucket, pBucket->numOfTotalPages * DEFAULT_PAGE_SIZE,
-         pBucket->nElemSize);
-
-  return pBucket;
-}
-
-void tMemBucketDestroy(tMemBucket *pBucket) {
-  if (pBucket == NULL) {
-    return;
-  }
-
-  if (pBucket->pSegs) {
-    for (int32_t i = 0; i < pBucket->numOfSegs; ++i) {
-      tMemBucketSegment *pSeg = &(pBucket->pSegs[i]);
-      tfree(pSeg->pBoundingEntries);
-
-      if (pSeg->pBuffer == NULL || pSeg->numOfSlots == 0) {
-        continue;
-      }
-
-      for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-        if (pSeg->pBuffer[j] != NULL) {
-          tExtMemBufferDestroy(&pSeg->pBuffer[j]);
-        }
-      }
-      tfree(pSeg->pBuffer);
-    }
-  }
-
-  tfree(pBucket->pSegs);
-  tfree(pBucket);
-}
-
-/*
- * find the slots which accounts for largest proportion of total in-memory buffer
- */
-static void tBucketGetMaxMemSlot(tMemBucket *pBucket, int16_t *segIdx, int16_t *slotIdx) {
-  *segIdx = -1;
-  *slotIdx = -1;
-
-  int32_t val = 0;
-  for (int32_t k = 0; k < pBucket->numOfSegs; ++k) {
-    tMemBucketSegment *pSeg = &pBucket->pSegs[k];
-    for (int32_t i = 0; i < pSeg->numOfSlots; ++i) {
-      if (pSeg->pBuffer == NULL || pSeg->pBuffer[i] == NULL) {
-        continue;
-      }
-
-      if (val < pSeg->pBuffer[i]->numOfPagesInMem) {
-        val = pSeg->pBuffer[i]->numOfPagesInMem;
-        *segIdx = k;
-        *slotIdx = i;
-      }
-    }
-  }
-}
-
-static void resetBoundingBox(tMemBucketSegment *pSeg, int32_t type) {
-  switch (type) {
-    case TSDB_DATA_TYPE_BIGINT: {
-      for (int32_t i = 0; i < pSeg->numOfSlots; ++i) {
-        pSeg->pBoundingEntries[i].i64MaxVal = INT64_MIN;
-        pSeg->pBoundingEntries[i].i64MinVal = INT64_MAX;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_TINYINT: {
-      for (int32_t i = 0; i < pSeg->numOfSlots; ++i) {
-        pSeg->pBoundingEntries[i].iMaxVal = INT32_MIN;
-        pSeg->pBoundingEntries[i].iMinVal = INT32_MAX;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_DOUBLE:
-    case TSDB_DATA_TYPE_FLOAT: {
-      for (int32_t i = 0; i < pSeg->numOfSlots; ++i) {
-        pSeg->pBoundingEntries[i].dMaxVal = -DBL_MAX;
-        pSeg->pBoundingEntries[i].dMinVal = DBL_MAX;
-      }
-      break;
-    }
-  }
-}
-
-void tMemBucketUpdateBoundingBox(MinMaxEntry *r, char *data, int32_t dataType) {
-  switch (dataType) {
-    case TSDB_DATA_TYPE_INT: {
-      int32_t val = *(int32_t *)data;
-      if (r->iMinVal > val) {
-        r->iMinVal = val;
-      }
-
-      if (r->iMaxVal < val) {
-        r->iMaxVal = val;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_BIGINT: {
-      int64_t val = *(int64_t *)data;
-      if (r->i64MinVal > val) {
-        r->i64MinVal = val;
-      }
-
-      if (r->i64MaxVal < val) {
-        r->i64MaxVal = val;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_SMALLINT: {
-      int32_t val = *(int16_t *)data;
-      if (r->iMinVal > val) {
-        r->iMinVal = val;
-      }
-
-      if (r->iMaxVal < val) {
-        r->iMaxVal = val;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_TINYINT: {
-      int32_t val = *(int8_t *)data;
-      if (r->iMinVal > val) {
-        r->iMinVal = val;
-      }
-
-      if (r->iMaxVal < val) {
-        r->iMaxVal = val;
-      }
-
-      break;
-    };
-    case TSDB_DATA_TYPE_DOUBLE: {
-      //double val = *(double *)data;
-      double val = GET_DOUBLE_VAL(data);
-      if (r->dMinVal > val) {
-        r->dMinVal = val;
-      }
-
-      if (r->dMaxVal < val) {
-        r->dMaxVal = val;
-      }
-      break;
-    };
-    case TSDB_DATA_TYPE_FLOAT: {
-      //double val = *(float *)data;
-      double val = GET_FLOAT_VAL(data);
-
-      if (r->dMinVal > val) {
-        r->dMinVal = val;
-      }
-
-      if (r->dMaxVal < val) {
-        r->dMaxVal = val;
-      }
-      break;
-    };
-    default: { assert(false); }
-  }
-}
-
-/*
- * in memory bucket, we only accept the simple data consecutive put in a row/column
- * no column-model in this case.
- */
-void tMemBucketPut(tMemBucket *pBucket, void *data, int32_t numOfRows) {
-  pBucket->numOfElems += numOfRows;
-  int16_t segIdx = 0, slotIdx = 0;
-
-  for (int32_t i = 0; i < numOfRows; ++i) {
-    char *d = (char *)data + i * tDataTypeDesc[pBucket->dataType].nSize;
-
-    switch (pBucket->dataType) {
-      case TSDB_DATA_TYPE_SMALLINT: {
-        int32_t val = *(int16_t *)d;
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-      case TSDB_DATA_TYPE_TINYINT: {
-        int32_t val = *(int8_t *)d;
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-      case TSDB_DATA_TYPE_INT: {
-        int32_t val = *(int32_t *)d;
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-      case TSDB_DATA_TYPE_BIGINT: {
-        int64_t val = *(int64_t *)d;
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-      case TSDB_DATA_TYPE_DOUBLE: {
-        //double val = *(double *)d;
-        double val = GET_DOUBLE_VAL(d);
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-      case TSDB_DATA_TYPE_FLOAT: {
-        //double val = *(float *)d;
-        double val = GET_FLOAT_VAL(d);
-        (pBucket->HashFunc)(pBucket, &val, &segIdx, &slotIdx);
-        break;
-      }
-    }
-
-    tMemBucketSegment *pSeg = &pBucket->pSegs[segIdx];
-    if (pSeg->pBoundingEntries == NULL) {
-      pSeg->pBoundingEntries = (MinMaxEntry *)malloc(sizeof(MinMaxEntry) * pBucket->nSlotsOfSeg);
-      resetBoundingBox(pSeg, pBucket->dataType);
-    }
-
-    if (pSeg->pBuffer == NULL) {
-      pSeg->pBuffer = (tExtMemBuffer **)calloc(pBucket->nSlotsOfSeg, sizeof(void *));
-    }
-
-    if (pSeg->pBuffer[slotIdx] == NULL) {
-      char    name[MAX_TMPFILE_PATH_LENGTH] = {0};
-      getTmpfilePath("tb_ex_bk_%lld_%lld_%d_%d", name);
-
-      tExtMemBufferCreate(&pSeg->pBuffer[slotIdx], pBucket->numOfTotalPages * pBucket->nPageSize, pBucket->nElemSize,
-                          name, pBucket->pOrderDesc->pSchema);
-      pSeg->pBuffer[slotIdx]->flushModel = SINGLE_APPEND_MODEL;
-      pBucket->pOrderDesc->pSchema->maxCapacity = pSeg->pBuffer[slotIdx]->numOfElemsPerPage;
-    }
-
-    tMemBucketUpdateBoundingBox(&pSeg->pBoundingEntries[slotIdx], d, pBucket->dataType);
-
-    // ensure available memory pages to allocate
-    int16_t cseg = 0, cslot = 0;
-    if (pBucket->numOfAvailPages == 0) {
-      pTrace("MemBucket:%p,max avail size:%d, no avail memory pages,", pBucket, pBucket->numOfTotalPages);
-
-      tBucketGetMaxMemSlot(pBucket, &cseg, &cslot);
-      if (cseg == -1 || cslot == -1) {
-        pError("MemBucket:%p,failed to find appropriated avail buffer", pBucket);
-        return;
-      }
-
-      if (cseg != segIdx || cslot != slotIdx) {
-        pBucket->numOfAvailPages += pBucket->pSegs[cseg].pBuffer[cslot]->numOfPagesInMem;
-
-        int32_t avail = pBucket->pSegs[cseg].pBuffer[cslot]->numOfPagesInMem;
-        UNUSED(avail);
-        tExtMemBufferFlush(pBucket->pSegs[cseg].pBuffer[cslot]);
-
-        pTrace("MemBucket:%p,seg:%d,slot:%d flushed to disk,new avail pages:%d", pBucket, cseg, cslot,
-               pBucket->numOfAvailPages);
-      } else {
-        pTrace("MemBucket:%p,failed to choose slot to flush to disk seg:%d,slot:%d",
-               pBucket, cseg, cslot);
-      }
-    }
-    int16_t consumedPgs = pSeg->pBuffer[slotIdx]->numOfPagesInMem;
-
-    int16_t newPgs = tExtMemBufferPut(pSeg->pBuffer[slotIdx], d, 1);
-    /*
-     * trigger 1. page re-allocation, to reduce the available pages
-     *         2. page flushout, to increase the available pages
-     */
-    pBucket->numOfAvailPages += (consumedPgs - newPgs);
-  }
-}
-
-void releaseBucket(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx) {
-  if (segIdx < 0 || segIdx > pMemBucket->numOfSegs || slotIdx < 0) {
-    return;
-  }
-
-  tMemBucketSegment *pSeg = &pMemBucket->pSegs[segIdx];
-  if (slotIdx < 0 || slotIdx >= pSeg->numOfSlots || pSeg->pBuffer[slotIdx] == NULL) {
-    return;
-  }
-
-  tExtMemBufferDestroy(&pSeg->pBuffer[slotIdx]);
-}
-
-static FORCE_INLINE int32_t primaryKeyComparator(int64_t f1, int64_t f2, int32_t colIdx, int32_t tsOrder) {
-  if (f1 == f2) {
-    return 0;
-  }
-
-  if (colIdx == 0 && tsOrder == TSQL_SO_DESC) {  // primary column desc order
-    return (f1 < f2) ? 1 : -1;
-  } else {  // asc
-    return (f1 < f2) ? -1 : 1;
-  }
-}
-
-// todo refactor
-static FORCE_INLINE int32_t columnValueAscendingComparator(char *f1, char *f2, int32_t type, int32_t bytes) {
-  switch (type) {
-    case TSDB_DATA_TYPE_INT: {
-      int32_t first = *(int32_t *)f1;
-      int32_t second = *(int32_t *)f2;
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_DOUBLE: {
-      //double first = *(double *)f1;
-      double first = GET_DOUBLE_VAL(f1);
-      //double second = *(double *)f2;
-      double second = GET_DOUBLE_VAL(f2);
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_FLOAT: {
-      //float first = *(float *)f1;
-      //float second = *(float *)f2;
-      float first = GET_FLOAT_VAL(f1);
-      float second = GET_FLOAT_VAL(f2);
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_BIGINT: {
-      int64_t first = *(int64_t *)f1;
-      int64_t second = *(int64_t *)f2;
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_SMALLINT: {
-      int16_t first = *(int16_t *)f1;
-      int16_t second = *(int16_t *)f2;
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT: {
-      int8_t first = *(int8_t *)f1;
-      int8_t second = *(int8_t *)f2;
-      if (first == second) {
-        return 0;
-      }
-      return (first < second) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_BINARY: {
-      int32_t ret = strncmp(f1, f2, bytes);
-      if (ret == 0) {
-        return 0;
-      }
-      return (ret < 0) ? -1 : 1;
-    };
-    case TSDB_DATA_TYPE_NCHAR: {
-      int32_t ret = tasoUcs4Compare(f1, f2, bytes);
-      if (ret == 0) {
-        return 0;
-      }
-      return (ret < 0) ? -1 : 1;
-    };
-  }
-
-  return 0;
-}
-
-int32_t compare_a(tOrderDescriptor *pDescriptor, int32_t numOfRows1, int32_t s1, char *data1, int32_t numOfRows2,
-                  int32_t s2, char *data2) {
-  assert(numOfRows1 == numOfRows2);
-
-  int32_t cmpCnt = pDescriptor->orderIdx.numOfOrderedCols;
-  for (int32_t i = 0; i < cmpCnt; ++i) {
-    int32_t colIdx = pDescriptor->orderIdx.pData[i];
-
-    char *f1 = COLMODEL_GET_VAL(data1, pDescriptor->pSchema, numOfRows1, s1, colIdx);
-    char *f2 = COLMODEL_GET_VAL(data2, pDescriptor->pSchema, numOfRows2, s2, colIdx);
-
-    if (pDescriptor->pSchema->pFields[colIdx].type == TSDB_DATA_TYPE_TIMESTAMP) {
-      int32_t ret = primaryKeyComparator(*(int64_t *)f1, *(int64_t *)f2, colIdx, pDescriptor->tsOrder);
-      if (ret == 0) {
-        continue;
-      } else {
-        return ret;
-      }
-    } else {
-      SSchema *pSchema = &pDescriptor->pSchema->pFields[colIdx];
-      int32_t  ret = columnValueAscendingComparator(f1, f2, pSchema->type, pSchema->bytes);
-      if (ret == 0) {
-        continue;
-      } else {
-        return ret;
-      }
-    }
-  }
-
-  return 0;
-}
-
-int32_t compare_d(tOrderDescriptor *pDescriptor, int32_t numOfRows1, int32_t s1, char *data1, int32_t numOfRows2,
-                  int32_t s2, char *data2) {
-  assert(numOfRows1 == numOfRows2);
-
-  int32_t cmpCnt = pDescriptor->orderIdx.numOfOrderedCols;
-  for (int32_t i = 0; i < cmpCnt; ++i) {
-    int32_t colIdx = pDescriptor->orderIdx.pData[i];
-
-    char *f1 = COLMODEL_GET_VAL(data1, pDescriptor->pSchema, numOfRows1, s1, colIdx);
-    char *f2 = COLMODEL_GET_VAL(data2, pDescriptor->pSchema, numOfRows2, s2, colIdx);
-
-    if (pDescriptor->pSchema->pFields[colIdx].type == TSDB_DATA_TYPE_TIMESTAMP) {
-      int32_t ret = primaryKeyComparator(*(int64_t *)f1, *(int64_t *)f2, colIdx, pDescriptor->tsOrder);
-      if (ret == 0) {
-        continue;
-      } else {
-        return ret;
-      }
-    } else {
-      SSchema *pSchema = &pDescriptor->pSchema->pFields[colIdx];
-      int32_t  ret = columnValueAscendingComparator(f1, f2, pSchema->type, pSchema->bytes);
-      if (ret == 0) {
-        continue;
-      } else {
-        return -ret;  // descending order
-      }
-    }
-  }
-
-  return 0;
-}
-FORCE_INLINE int32_t compare_sa(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t idx1, int32_t idx2,
-                                char *data) {
-  return compare_a(pDescriptor, numOfRows, idx1, data, numOfRows, idx2, data);
-}
-
-FORCE_INLINE int32_t compare_sd(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t idx1, int32_t idx2,
-                                char *data) {
-  return compare_d(pDescriptor, numOfRows, idx1, data, numOfRows, idx2, data);
-}
-
-static void swap(tOrderDescriptor *pDescriptor, int32_t count, int32_t s1, char *data1, int32_t s2) {
-  for (int32_t i = 0; i < pDescriptor->pSchema->numOfCols; ++i) {
-    void *first = COLMODEL_GET_VAL(data1, pDescriptor->pSchema, count, s1, i);
-    void *second = COLMODEL_GET_VAL(data1, pDescriptor->pSchema, count, s2, i);
-
-    tsDataSwap(first, second, pDescriptor->pSchema->pFields[i].type, pDescriptor->pSchema->pFields[i].bytes);
-  }
-}
-
-static void tColDataInsertSort(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
-                               __col_compar_fn_t compareFn) {
-  for (int32_t i = start + 1; i <= end; ++i) {
-    for (int32_t j = i; j > start; --j) {
-      if (compareFn(pDescriptor, numOfRows, j, j - 1, data) == -1) {
-        swap(pDescriptor, numOfRows, j - 1, data, j);
-      } else {
-        break;
-      }
-    }
-  }
-}
-
-static void UNUSED_FUNC tSortDataPrint(int32_t type, char *prefix, char *startx, char *midx, char *endx) {
-  switch (type) {
-    case TSDB_DATA_TYPE_INT:
-      printf("%s:(%d, %d, %d)\n", prefix, *(int32_t *)startx, *(int32_t *)midx, *(int32_t *)endx);
-      break;
-    case TSDB_DATA_TYPE_TINYINT:
-      printf("%s:(%d, %d, %d)\n", prefix, *(int8_t *)startx, *(int8_t *)midx, *(int8_t *)endx);
-      break;
-    case TSDB_DATA_TYPE_SMALLINT:
-      printf("%s:(%d, %d, %d)\n", prefix, *(int16_t *)startx, *(int16_t *)midx, *(int16_t *)endx);
-      break;
-    case TSDB_DATA_TYPE_TIMESTAMP:
-    case TSDB_DATA_TYPE_BIGINT:
-      printf("%s:(%" PRId64 ", %" PRId64 ", %" PRId64 ")\n", prefix, *(int64_t *)startx, *(int64_t *)midx, *(int64_t *)endx);
-      break;
-    case TSDB_DATA_TYPE_FLOAT:
-      printf("%s:(%f, %f, %f)\n", prefix, *(float *)startx, *(float *)midx, *(float *)endx);
-      break;
-    case TSDB_DATA_TYPE_DOUBLE:
-      printf("%s:(%lf, %lf, %lf)\n", prefix, *(double *)startx, *(double *)midx, *(double *)endx);
-      break;
-    case TSDB_DATA_TYPE_BINARY:
-      printf("%s:(%s, %s, %s)\n", prefix, startx, midx, endx);
-      break;
-  }
-}
-
-static void median(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
-                   __col_compar_fn_t compareFn) {
-  int32_t midIdx = ((end - start) >> 1) + start;
-
-#if defined(_DEBUG_VIEW)
-  int32_t f = pDescriptor->orderIdx.pData[0];
-
-  char *midx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, midIdx, f);
-  char *startx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, start, f);
-  char *endx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, end, f);
-
-  int32_t colIdx = pDescriptor->orderIdx.pData[0];
-  tSortDataPrint(pDescriptor->pSchema->pFields[colIdx].type, "before", startx, midx, endx);
-#endif
-
-  if (compareFn(pDescriptor, numOfRows, midIdx, start, data) == 1) {
-    swap(pDescriptor, numOfRows, start, data, midIdx);
-  }
-
-  if (compareFn(pDescriptor, numOfRows, midIdx, end, data) == 1) {
-    swap(pDescriptor, numOfRows, midIdx, data, start);
-    swap(pDescriptor, numOfRows, midIdx, data, end);
-  } else if (compareFn(pDescriptor, numOfRows, start, end, data) == 1) {
-    swap(pDescriptor, numOfRows, start, data, end);
-  }
-
-  assert(compareFn(pDescriptor, numOfRows, midIdx, start, data) <= 0 &&
-         compareFn(pDescriptor, numOfRows, start, end, data) <= 0);
-
-#if defined(_DEBUG_VIEW)
-  midx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, midIdx, f);
-  startx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, start, f);
-  endx = COLMODEL_GET_VAL(data, pDescriptor->pSchema, numOfRows, end, f);
-  tSortDataPrint(pDescriptor->pSchema->pFields[colIdx].type, "after", startx, midx, endx);
-#endif
-}
-
-static UNUSED_FUNC void tRowModelDisplay(tOrderDescriptor *pDescriptor, int32_t numOfRows, char *d, int32_t len) {
-  int32_t colIdx = pDescriptor->orderIdx.pData[0];
-
-  for (int32_t i = 0; i < len; ++i) {
-    char *startx = COLMODEL_GET_VAL(d, pDescriptor->pSchema, numOfRows, i, colIdx);
-
-    switch (pDescriptor->pSchema->pFields[colIdx].type) {
-      case TSDB_DATA_TYPE_DOUBLE:
-        printf("%lf\t", *(double *)startx);
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        printf("%f\t", *(float *)startx);
-        break;
-      case TSDB_DATA_TYPE_INT:
-        printf("%d\t", *(int32_t *)startx);
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        printf("%d\t", *(int16_t *)startx);
-        break;
-      case TSDB_DATA_TYPE_TINYINT:
-      case TSDB_DATA_TYPE_BOOL:
-        printf("%d\t", *(int8_t *)startx);
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-      case TSDB_DATA_TYPE_BIGINT:
-        printf("%" PRId64 "\t", *(int64_t *)startx);
-        break;
-      case TSDB_DATA_TYPE_BINARY:
-        printf("%s\t", startx);
-        break;
-      default:
-        assert(false);
-    }
-  }
-  printf("\n");
-}
-
-static int32_t qsort_call = 0;
-
-void tColDataQSort(tOrderDescriptor *pDescriptor, int32_t numOfRows, int32_t start, int32_t end, char *data,
-                   int32_t orderType) {
-  // short array sort, incur another sort procedure instead of quick sort process
-  __col_compar_fn_t compareFn = (orderType == TSQL_SO_ASC) ? compare_sa : compare_sd;
-
-  if (end - start + 1 <= 8) {
-    tColDataInsertSort(pDescriptor, numOfRows, start, end, data, compareFn);
-    return;
-  }
-
-#ifdef _DEBUG_VIEW
-  printf("before sort:\n");
-  tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
-#endif
-
-  int32_t s = start, e = end;
-  median(pDescriptor, numOfRows, start, end, data, compareFn);
-
-#ifdef _DEBUG_VIEW
-  printf("%s called: %d\n", __FUNCTION__, qsort_call++);
-#endif
-
-  UNUSED(qsort_call);
-
-  int32_t end_same = end;
-  int32_t start_same = start;
-
-  while (s < e) {
-    while (e > s) {
-      int32_t ret = compareFn(pDescriptor, numOfRows, e, s, data);
-      if (ret < 0) {
-        break;
-      }
-
-      if (ret == 0 && e != end_same) {
-        swap(pDescriptor, numOfRows, e, data, end_same--);
-      }
-      e--;
-    }
-
-    if (e != s) {
-      swap(pDescriptor, numOfRows, s, data, e);
-    }
-
-#ifdef _DEBUG_VIEW
-    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
-#endif
-
-    while (s < e) {
-      int32_t ret = compareFn(pDescriptor, numOfRows, s, e, data);
-      if (ret > 0) {
-        break;
-      }
-
-      if (ret == 0 && s != start_same) {
-        swap(pDescriptor, numOfRows, s, data, start_same++);
-      }
-      s++;
-    }
-
-    if (s != e) {
-      swap(pDescriptor, numOfRows, s, data, e);
-    }
-#ifdef _DEBUG_VIEW
-    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
-#endif
-  }
-
-  int32_t rightx = e + 1;
-  if (end_same != end && e < end) {  // move end data to around the pivotal
-    int32_t left = e + 1;
-    int32_t right = end;
-
-    while (right > end_same && left <= end_same) {
-      swap(pDescriptor, numOfRows, left++, data, right--);
-    }
-
-    // (pivotal+1) + steps of number that are identical pivotal
-    rightx += (end - end_same);
-
-#ifdef _DEBUG_VIEW
-    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
-#endif
-  }
-
-  int32_t leftx = e - 1;
-  if (start_same != start && s > start) {
-    int32_t left = start;
-    int32_t right = e - 1;
-
-    while (left < start_same && right >= start_same) {
-      swap(pDescriptor, numOfRows, left++, data, right--);
-    }
-
-    // (pivotal-1) - steps of number that are identical pivotal
-    leftx -= (start_same - start);
-
-#ifdef _DEBUG_VIEW
-    tRowModelDisplay(pDescriptor, numOfRows, data, end - start + 1);
-#endif
-  }
-
-  if (leftx > start) {
-    tColDataQSort(pDescriptor, numOfRows, start, leftx, data, orderType);
-  }
-
-  if (rightx < end) {
-    tColDataQSort(pDescriptor, numOfRows, rightx, end, data, orderType);
-  }
-}
-
-tExtMemBuffer *releaseBucketsExceptFor(tMemBucket *pMemBucket, int16_t segIdx, int16_t slotIdx) {
-  tExtMemBuffer *pBuffer = NULL;
-
-  for (int32_t i = 0; i < pMemBucket->numOfSegs; ++i) {
-    tMemBucketSegment *pSeg = &pMemBucket->pSegs[i];
-
-    for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-      if (i == segIdx && j == slotIdx) {
-        pBuffer = pSeg->pBuffer[j];
-      } else {
-        if (pSeg->pBuffer && pSeg->pBuffer[j]) {
-          tExtMemBufferDestroy(&pSeg->pBuffer[j]);
-        }
-      }
-    }
-  }
-
-  return pBuffer;
-}
-
-static tFilePage *loadIntoBucketFromDisk(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx,
-                                         tOrderDescriptor *pDesc) {
-  // release all data in other slots
-  tExtMemBuffer *pMemBuffer = pMemBucket->pSegs[segIdx].pBuffer[slotIdx];
-  tFilePage *    buffer = (tFilePage *)calloc(1, pMemBuffer->nElemSize * pMemBuffer->numOfAllElems + sizeof(tFilePage));
-  int32_t        oldCapacity = pDesc->pSchema->maxCapacity;
-  pDesc->pSchema->maxCapacity = pMemBuffer->numOfAllElems;
-
-  if (!tExtMemBufferIsAllDataInMem(pMemBuffer)) {
-    pMemBuffer = releaseBucketsExceptFor(pMemBucket, segIdx, slotIdx);
-    assert(pMemBuffer->numOfAllElems > 0);
-
-    // load data in disk to memory
-    tFilePage *pPage = (tFilePage *)calloc(1, pMemBuffer->nPageSize);
-
-    for (int32_t i = 0; i < pMemBuffer->fileMeta.flushoutData.nLength; ++i) {
-      tFlushoutInfo *pFlushInfo = &pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[i];
-
-      int32_t ret = fseek(pMemBuffer->dataFile, pFlushInfo->startPageId * pMemBuffer->nPageSize, SEEK_SET);
-      UNUSED(ret);
-
-      for (uint32_t j = 0; j < pFlushInfo->numOfPages; ++j) {
-        ret = fread(pPage, pMemBuffer->nPageSize, 1, pMemBuffer->dataFile);
-        UNUSED(ret);
-        assert(pPage->numOfElems > 0);
-
-        tColModelAppend(pDesc->pSchema, buffer, pPage->data, 0, pPage->numOfElems, pPage->numOfElems);
-        printf("id: %d  count: %" PRIu64 "\n", j, buffer->numOfElems);
-      }
-    }
-    tfree(pPage);
-
-    assert(buffer->numOfElems == pMemBuffer->fileMeta.numOfElemsInFile);
-  }
-
-  // load data in pMemBuffer to buffer
-  tFilePagesItem *pListItem = pMemBuffer->pHead;
-  while (pListItem != NULL) {
-    tColModelAppend(pDesc->pSchema, buffer, pListItem->item.data, 0, pListItem->item.numOfElems,
-                    pListItem->item.numOfElems);
-    pListItem = pListItem->pNext;
-  }
-
-  tColDataQSort(pDesc, buffer->numOfElems, 0, buffer->numOfElems - 1, buffer->data, TSQL_SO_ASC);
-
-  pDesc->pSchema->maxCapacity = oldCapacity;  // restore value
-  return buffer;
-}
-
-double findOnlyResult(tMemBucket *pMemBucket) {
-  assert(pMemBucket->numOfElems == 1);
-
-  for (int32_t i = 0; i < pMemBucket->numOfSegs; ++i) {
-    tMemBucketSegment *pSeg = &pMemBucket->pSegs[i];
-    if (pSeg->pBuffer) {
-      for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-        tExtMemBuffer *pBuffer = pSeg->pBuffer[j];
-        if (pBuffer) {
-          assert(pBuffer->numOfAllElems == 1);
-          tFilePage *pPage = &pBuffer->pHead->item;
-          if (pBuffer->numOfElemsInBuffer == 1) {
-            switch (pMemBucket->dataType) {
-              case TSDB_DATA_TYPE_INT:
-                return *(int32_t *)pPage->data;
-              case TSDB_DATA_TYPE_SMALLINT:
-                return *(int16_t *)pPage->data;
-              case TSDB_DATA_TYPE_TINYINT:
-                return *(int8_t *)pPage->data;
-              case TSDB_DATA_TYPE_BIGINT:
-                return (double)(*(int64_t *)pPage->data);
-              case TSDB_DATA_TYPE_DOUBLE: {
-		double dv = GET_DOUBLE_VAL(pPage->data);				  
-                //return *(double *)pPage->data;
-		return dv;
-	      }
-              case TSDB_DATA_TYPE_FLOAT: {
-		float fv = GET_FLOAT_VAL(pPage->data);
-                //return *(float *)pPage->data;
-		return fv;
-	      }
-              default:
-                return 0;
-            }
-          }
-        }
-      }
-    }
-  }
-  return 0;
-}
-
-/*
- * deep copy of sschema
- */
-tColModel *tColModelCreate(SSchema *field, int32_t numOfCols, int32_t maxCapacity) {
-  tColModel *pSchema =
-      (tColModel *)calloc(1, sizeof(tColModel) + numOfCols * sizeof(SSchema) + numOfCols * sizeof(int16_t));
-  if (pSchema == NULL) {
-    return NULL;
-  }
-
-  pSchema->pFields = (SSchema *)(&pSchema[1]);
-  memcpy(pSchema->pFields, field, sizeof(SSchema) * numOfCols);
-
-  pSchema->colOffset = (int16_t *)(&pSchema->pFields[numOfCols]);
-  pSchema->colOffset[0] = 0;
-  for (int32_t i = 1; i < numOfCols; ++i) {
-    pSchema->colOffset[i] = pSchema->colOffset[i - 1] + pSchema->pFields[i - 1].bytes;
-  }
-
-  pSchema->numOfCols = numOfCols;
-  pSchema->maxCapacity = maxCapacity;
-
-  return pSchema;
-}
-
-void tColModelDestroy(tColModel *pModel) {
-  if (pModel == NULL) {
-    return;
-  }
-
-  tfree(pModel);
-}
-
-static void printBinaryData(char *data, int32_t len) {
-  bool isCharString = true;
-  for (int32_t i = 0; i < len; ++i) {
-    if ((data[i] <= 'Z' && data[i] >= 'A') || (data[i] <= 'z' && data[i] >= 'a') ||
-        (data[i] >= '0' && data[i] <= '9')) {
-      continue;
-    } else if (data[i] == 0) {
-      break;
-    } else {
-      isCharString = false;
-      break;
-    }
-  }
-
-  if (len == 50) {  // probably the avg intermediate result
-    printf("%lf,%" PRId64 "\t", *(double *)data, *(int64_t *)(data + sizeof(double)));
-  } else if (data[8] == ',') {  // in TSDB_FUNC_FIRST_DST/TSDB_FUNC_LAST_DST,
-                                // the value is seperated by ','
-    //printf("%" PRId64 ",%0x\t", *(int64_t *)data, data + sizeof(int64_t) + 1);
-    printf("%" PRId64 ", HEX: ", *(int64_t *)data);
-    int32_t tmp_len = len - sizeof(int64_t) - 1;
-    for (int32_t i = 0; i < tmp_len; ++i) {
-      printf("%0x ", *(data + sizeof(int64_t) + 1 + i));
-    }
-    printf("\t");
-  } else if (isCharString) {
-    printf("%s\t", data);
-  }
-}
-
-// todo cast to struct to extract data
-static void printBinaryDataEx(char *data, int32_t len, SSrcColumnInfo *param) {
-  if (param->functionId == TSDB_FUNC_LAST_DST) {
-    switch (param->type) {
-      case TSDB_DATA_TYPE_TINYINT:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int8_t *) (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int16_t *) (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-      case TSDB_DATA_TYPE_BIGINT:printf("%" PRId64 ",%" PRId64 "\t", *(int64_t *) data, *(int64_t *) (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_FLOAT:printf("%" PRId64 ",%f\t", *(int64_t *) data, *(float *) (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:printf("%" PRId64 ",%f\t", *(int64_t *) data, *(double *) (data + TSDB_KEYSIZE + 1));
-        break;
-      case TSDB_DATA_TYPE_BINARY:printf("%" PRId64 ",%s\t", *(int64_t *) data, (data + TSDB_KEYSIZE + 1));
-        break;
-
-      case TSDB_DATA_TYPE_INT:
-      default:printf("%" PRId64 ",%d\t", *(int64_t *) data, *(int32_t *) (data + TSDB_KEYSIZE + 1));
-        break;
-    }
-  } else if (param->functionId == TSDB_FUNC_AVG) {
-      printf("%f,%" PRId64 "\t", *(double *) data, *(int64_t *) (data + sizeof(double) + 1));
-  } else {
-    // functionId == TSDB_FUNC_MAX_DST | TSDB_FUNC_TAG
-    switch (param->type) {
-      case TSDB_DATA_TYPE_TINYINT:
-        printf("%d\t", *(int8_t *)data);
-        break;
-      case TSDB_DATA_TYPE_SMALLINT:
-        printf("%d\t", *(int16_t *)data);
-        break;
-      case TSDB_DATA_TYPE_TIMESTAMP:
-      case TSDB_DATA_TYPE_BIGINT:
-        printf("%" PRId64 "\t", *(int64_t *)data);
-        break;
-      case TSDB_DATA_TYPE_FLOAT:
-        printf("%f\t", *(float *)data);
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:
-        printf("%f\t", *(double *)data);
-        break;
-      case TSDB_DATA_TYPE_BINARY:
-        printf("%s\t", data);
-        break;
-
-      case TSDB_DATA_TYPE_INT:
-      default:
-        printf("%f\t", *(double *)data);
-        break;
-    }
-  }
-}
-
-void tColModelDisplay(tColModel *pModel, void *pData, int32_t numOfRows, int32_t totalCapacity) {
-  for (int32_t i = 0; i < numOfRows; ++i) {
-    for (int32_t j = 0; j < pModel->numOfCols; ++j) {
-      char *val = COLMODEL_GET_VAL((char *)pData, pModel, totalCapacity, i, j);
-
-      int type = pModel->pFields[j].type;
-      printf("type:%d ", type);
-
-      switch (type) {
-        case TSDB_DATA_TYPE_BIGINT:
-          printf("%" PRId64 "\t", *(int64_t *)val);
-          break;
-        case TSDB_DATA_TYPE_INT:
-          printf("%d\t", *(int32_t *)val);
-          break;
-        case TSDB_DATA_TYPE_NCHAR: {
-          char buf[4096] = {0};
-          taosUcs4ToMbs(val, pModel->pFields[j].bytes, buf);
-          printf("%s\t", buf);
-        }
-        case TSDB_DATA_TYPE_BINARY: {
-          printBinaryData(val, pModel->pFields[j].bytes);
-          break;
-        }
-        case TSDB_DATA_TYPE_DOUBLE:
-          printf("%lf\t", *(double *)val);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          printf("%" PRId64 "\t", *(int64_t *)val);
-          break;
-        case TSDB_DATA_TYPE_TINYINT:
-          printf("%d\t", *(int8_t *)val);
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          printf("%d\t", *(int16_t *)val);
-          break;
-        case TSDB_DATA_TYPE_BOOL:
-          printf("%d\t", *(int8_t *)val);
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          printf("%f\t", *(float *)val);
-          break;
-        default:
-          assert(false);
-      }
-    }
-    printf("\n");
-  }
-  printf("\n");
-}
-
-void tColModelDisplayEx(tColModel *pModel, void *pData, int32_t numOfRows, int32_t totalCapacity,
-                        SSrcColumnInfo *param) {
-  for (int32_t i = 0; i < numOfRows; ++i) {
-    for (int32_t j = 0; j < pModel->numOfCols; ++j) {
-      char *val = COLMODEL_GET_VAL((char *)pData, pModel, totalCapacity, i, j);
-
-      printf("type:%d\t", pModel->pFields[j].type);
-
-      switch (pModel->pFields[j].type) {
-        case TSDB_DATA_TYPE_BIGINT:
-          printf("%" PRId64 "\t", *(int64_t *)val);
-          break;
-        case TSDB_DATA_TYPE_INT:
-          printf("%d\t", *(int32_t *)val);
-          break;
-        case TSDB_DATA_TYPE_NCHAR: {
-          char buf[128] = {0};
-          taosUcs4ToMbs(val, pModel->pFields[j].bytes, buf);
-          printf("%s\t", buf);
-        }
-        case TSDB_DATA_TYPE_BINARY: {
-          printBinaryDataEx(val, pModel->pFields[j].bytes, &param[j]);
-          break;
-        }
-        case TSDB_DATA_TYPE_DOUBLE:
-          printf("%lf\t", *(double *)val);
-          break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          printf("%" PRId64 "\t", *(int64_t *)val);
-          break;
-        case TSDB_DATA_TYPE_TINYINT:
-          printf("%d\t", *(int8_t *)val);
-          break;
-        case TSDB_DATA_TYPE_SMALLINT:
-          printf("%d\t", *(int16_t *)val);
-          break;
-        case TSDB_DATA_TYPE_BOOL:
-          printf("%d\t", *(int8_t *)val);
-          break;
-        case TSDB_DATA_TYPE_FLOAT:
-          printf("%f\t", *(float *)val);
-          break;
-        default:
-          assert(false);
-      }
-    }
-    printf("\n");
-  }
-  printf("\n");
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-void tColModelCompact(tColModel *pModel, tFilePage *inputBuffer, int32_t maxElemsCapacity) {
-  if (inputBuffer->numOfElems == 0 || maxElemsCapacity == inputBuffer->numOfElems) {
-    return;
-  }
-
-  /* start from the second column */
-  for (int32_t i = 1; i < pModel->numOfCols; ++i) {
-    memmove(inputBuffer->data + pModel->colOffset[i] * inputBuffer->numOfElems,
-            inputBuffer->data + pModel->colOffset[i] * maxElemsCapacity,
-            pModel->pFields[i].bytes * inputBuffer->numOfElems);
-  }
-}
-
-void tColModelErase(tColModel *pModel, tFilePage *inputBuffer, int32_t maxCapacity, int32_t s, int32_t e) {
-  if (inputBuffer->numOfElems == 0 || (e - s + 1) <= 0) {
-    return;
-  }
-
-  int32_t removed = e - s + 1;
-  int32_t remain = inputBuffer->numOfElems - removed;
-  int32_t secPart = inputBuffer->numOfElems - e - 1;
-
-  /* start from the second column */
-  for (int32_t i = 0; i < pModel->numOfCols; ++i) {
-    char *startPos = inputBuffer->data + pModel->colOffset[i] * maxCapacity + s * pModel->pFields[i].bytes;
-    char *endPos = startPos + pModel->pFields[i].bytes * removed;
-
-    memmove(startPos, endPos, pModel->pFields[i].bytes * secPart);
-  }
-
-  inputBuffer->numOfElems = remain;
-}
-
-/*
- * column format data block append function
- * used in write record(s) to exist column-format block
- *
- * data in srcData must has the same schema as data in dstPage, that can be
- * described by dstModel
- */
-void tColModelAppend(tColModel *dstModel, tFilePage *dstPage, void *srcData, int32_t start, int32_t numOfRows,
-                     int32_t srcCapacity) {
-  assert(dstPage->numOfElems + numOfRows <= dstModel->maxCapacity);
-
-  for (int32_t col = 0; col < dstModel->numOfCols; ++col) {
-    char *dst = COLMODEL_GET_VAL(dstPage->data, dstModel, dstModel->maxCapacity, dstPage->numOfElems, col);
-    char *src = COLMODEL_GET_VAL((char *)srcData, dstModel, srcCapacity, start, col);
-
-    memmove(dst, src, dstModel->pFields[col].bytes * numOfRows);
-  }
-
-  dstPage->numOfElems += numOfRows;
-}
-
-tOrderDescriptor *tOrderDesCreate(int32_t *orderColIdx, int32_t numOfOrderCols, tColModel *pModel,
-                                  int32_t tsOrderType) {
-  tOrderDescriptor *desc = (tOrderDescriptor *)calloc(1, sizeof(tOrderDescriptor) + sizeof(int32_t) * numOfOrderCols);
-  if (desc == NULL) {
-    return NULL;
-  }
-
-  desc->pSchema = pModel;
-  desc->tsOrder = tsOrderType;
-
-  desc->orderIdx.numOfOrderedCols = numOfOrderCols;
-  for (int32_t i = 0; i < numOfOrderCols; ++i) {
-    desc->orderIdx.pData[i] = orderColIdx[i];
-  }
-
-  return desc;
-}
-
-void tOrderDescDestroy(tOrderDescriptor *pDesc) {
-  if (pDesc == NULL) {
-    return;
-  }
-
-  tColModelDestroy(pDesc->pSchema);
-  tfree(pDesc);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-static void findMaxMinValue(tMemBucket *pMemBucket, double *maxVal, double *minVal) {
-  *minVal = DBL_MAX;
-  *maxVal = -DBL_MAX;
-
-  for (int32_t i = 0; i < pMemBucket->numOfSegs; ++i) {
-    tMemBucketSegment *pSeg = &pMemBucket->pSegs[i];
-    if (pSeg->pBuffer == NULL) {
-      continue;
-    }
-    switch (pMemBucket->dataType) {
-      case TSDB_DATA_TYPE_INT:
-      case TSDB_DATA_TYPE_SMALLINT:
-      case TSDB_DATA_TYPE_TINYINT: {
-        for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-          double minv = pSeg->pBoundingEntries[j].iMinVal;
-          double maxv = pSeg->pBoundingEntries[j].iMaxVal;
-
-          if (*minVal > minv) {
-            *minVal = minv;
-          }
-          if (*maxVal < maxv) {
-            *maxVal = maxv;
-          }
-        }
-        break;
-      }
-      case TSDB_DATA_TYPE_DOUBLE:
-      case TSDB_DATA_TYPE_FLOAT: {
-        for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-          double minv = pSeg->pBoundingEntries[j].dMinVal;
-          double maxv = pSeg->pBoundingEntries[j].dMaxVal;
-
-          if (*minVal > minv) {
-            *minVal = minv;
-          }
-          if (*maxVal < maxv) {
-            *maxVal = maxv;
-          }
-        }
-        break;
-      }
-      case TSDB_DATA_TYPE_BIGINT: {
-        for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-          double minv = (double)pSeg->pBoundingEntries[j].i64MinVal;
-          double maxv = (double)pSeg->pBoundingEntries[j].i64MaxVal;
-
-          if (*minVal > minv) {
-            *minVal = minv;
-          }
-          if (*maxVal < maxv) {
-            *maxVal = maxv;
-          }
-        }
-        break;
-      }
-    }
-  }
-}
-
-static MinMaxEntry getMinMaxEntryOfNearestSlotInNextSegment(tMemBucket *pMemBucket, int32_t segIdx) {
-  int32_t i = segIdx + 1;
-  while (i < pMemBucket->numOfSegs && pMemBucket->pSegs[i].numOfSlots == 0) ++i;
-
-  tMemBucketSegment *pSeg = &pMemBucket->pSegs[i];
-  assert(pMemBucket->numOfSegs > i && pMemBucket->pSegs[i].pBuffer != NULL);
-
-  i = 0;
-  while (i < pMemBucket->nSlotsOfSeg && pSeg->pBuffer[i] == NULL) ++i;
-
-  assert(i < pMemBucket->nSlotsOfSeg);
-  return pSeg->pBoundingEntries[i];
-}
-
-/*
- *
- * now, we need to find the minimum value of the next slot for
- * interpolating the percentile value
- * j is the last slot of current segment, we need to get the first
- * slot of the next segment.
- */
-static MinMaxEntry getMinMaxEntryOfNextSlotWithData(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx) {
-  tMemBucketSegment *pSeg = &pMemBucket->pSegs[segIdx];
-
-  MinMaxEntry next;
-  if (slotIdx == pSeg->numOfSlots - 1) {  // find next segment with data
-    return getMinMaxEntryOfNearestSlotInNextSegment(pMemBucket, segIdx);
-  } else {
-    int32_t j = slotIdx + 1;
-    for (; j < pMemBucket->nSlotsOfSeg && pMemBucket->pSegs[segIdx].pBuffer[j] == 0; ++j) {
-    };
-
-    if (j == pMemBucket->nSlotsOfSeg) {  // current slot has no available
-                                         // slot,try next segment
-      return getMinMaxEntryOfNearestSlotInNextSegment(pMemBucket, segIdx);
-    } else {
-      next = pSeg->pBoundingEntries[slotIdx + 1];
-      assert(pSeg->pBuffer[slotIdx + 1] != NULL);
-    }
-  }
-
-  return next;
-}
-
-bool isIdenticalData(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx);
-char *getFirstElemOfMemBuffer(tMemBucketSegment *pSeg, int32_t slotIdx, tFilePage *pPage);
-
-double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction) {
-  int32_t num = 0;
-
-  for (int32_t i = 0; i < pMemBucket->numOfSegs; ++i) {
-    tMemBucketSegment *pSeg = &pMemBucket->pSegs[i];
-    for (int32_t j = 0; j < pSeg->numOfSlots; ++j) {
-      if (pSeg->pBuffer == NULL || pSeg->pBuffer[j] == NULL) {
-        continue;
-      }
-      // required value in current slot
-      if (num < (count + 1) && num + pSeg->pBuffer[j]->numOfAllElems >= (count + 1)) {
-        if (pSeg->pBuffer[j]->numOfAllElems + num == (count + 1)) {
-          /*
-           * now, we need to find the minimum value of the next slot for interpolating the percentile value
-           * j is the last slot of current segment, we need to get the first slot of the next segment.
-           *
-           */
-          MinMaxEntry next = getMinMaxEntryOfNextSlotWithData(pMemBucket, i, j);
-
-          double maxOfThisSlot = 0;
-          double minOfNextSlot = 0;
-          switch (pMemBucket->dataType) {
-            case TSDB_DATA_TYPE_INT:
-            case TSDB_DATA_TYPE_SMALLINT:
-            case TSDB_DATA_TYPE_TINYINT: {
-              maxOfThisSlot = pSeg->pBoundingEntries[j].iMaxVal;
-              minOfNextSlot = next.iMinVal;
-              break;
-            };
-            case TSDB_DATA_TYPE_FLOAT:
-            case TSDB_DATA_TYPE_DOUBLE: {
-              maxOfThisSlot = pSeg->pBoundingEntries[j].dMaxVal;
-              minOfNextSlot = next.dMinVal;
-              break;
-            };
-            case TSDB_DATA_TYPE_BIGINT: {
-              maxOfThisSlot = (double)pSeg->pBoundingEntries[j].i64MaxVal;
-              minOfNextSlot = (double)next.i64MinVal;
-              break;
-            }
-          };
-
-          assert(minOfNextSlot > maxOfThisSlot);
-
-          double val = (1 - fraction) * maxOfThisSlot + fraction * minOfNextSlot;
-          return val;
-        }
-        if (pSeg->pBuffer[j]->numOfAllElems <= pMemBucket->maxElemsCapacity) {
-          // data in buffer and file are merged together to be processed.
-          tFilePage *buffer = loadIntoBucketFromDisk(pMemBucket, i, j, pMemBucket->pOrderDesc);
-          int32_t    currentIdx = count - num;
-
-          char * thisVal = buffer->data + pMemBucket->nElemSize * currentIdx;
-          char * nextVal = thisVal + pMemBucket->nElemSize;
-          double td, nd;
-          switch (pMemBucket->dataType) {
-            case TSDB_DATA_TYPE_SMALLINT: {
-              td = *(int16_t *)thisVal;
-              nd = *(int16_t *)nextVal;
-              break;
-            }
-            case TSDB_DATA_TYPE_TINYINT: {
-              td = *(int8_t *)thisVal;
-              nd = *(int8_t *)nextVal;
-              break;
-            }
-            case TSDB_DATA_TYPE_INT: {
-              td = *(int32_t *)thisVal;
-              nd = *(int32_t *)nextVal;
-              break;
-            };
-            case TSDB_DATA_TYPE_FLOAT: {
-              //td = *(float *)thisVal;
-              //nd = *(float *)nextVal;
-              td = GET_FLOAT_VAL(thisVal);
-              nd = GET_FLOAT_VAL(nextVal);
-              break;
-            }
-            case TSDB_DATA_TYPE_DOUBLE: {
-              //td = *(double *)thisVal;
-              td = GET_DOUBLE_VAL(thisVal);
-              //nd = *(double *)nextVal;
-              nd = GET_DOUBLE_VAL(nextVal);
-              break;
-            }
-            case TSDB_DATA_TYPE_BIGINT: {
-              td = (double)*(int64_t *)thisVal;
-              nd = (double)*(int64_t *)nextVal;
-              break;
-            }
-          }
-          double val = (1 - fraction) * td + fraction * nd;
-          tfree(buffer);
-
-          return val;
-        } else {  // incur a second round bucket split
-          if (isIdenticalData(pMemBucket, i, j)) {
-            tExtMemBuffer *pMemBuffer = pSeg->pBuffer[j];
-
-            tFilePage *pPage = (tFilePage *)malloc(pMemBuffer->nPageSize);
-
-            char *thisVal = getFirstElemOfMemBuffer(pSeg, j, pPage);
-
-            double finalResult = 0.0;
-
-            switch (pMemBucket->dataType) {
-              case TSDB_DATA_TYPE_SMALLINT: {
-                finalResult = *(int16_t *)thisVal;
-                break;
-              }
-              case TSDB_DATA_TYPE_TINYINT: {
-                finalResult = *(int8_t *)thisVal;
-                break;
-              }
-              case TSDB_DATA_TYPE_INT: {
-                finalResult = *(int32_t *)thisVal;
-                break;
-              };
-              case TSDB_DATA_TYPE_FLOAT: {
-                //finalResult = *(float *)thisVal;
-                finalResult = GET_FLOAT_VAL(thisVal);
-                break;
-              }
-              case TSDB_DATA_TYPE_DOUBLE: {
-                //finalResult = *(double *)thisVal;
-                finalResult = GET_DOUBLE_VAL(thisVal);
-                break;
-              }
-              case TSDB_DATA_TYPE_BIGINT: {
-                finalResult = (double)(*(int64_t *)thisVal);
-                break;
-              }
-            }
-
-            free(pPage);
-            return finalResult;
-          }
-
-          pTrace("MemBucket:%p,start second round bucketing", pMemBucket);
-
-          if (pSeg->pBuffer[j]->numOfElemsInBuffer != 0) {
-            pTrace("MemBucket:%p,flush %d pages to disk, clear status", pMemBucket, pSeg->pBuffer[j]->numOfPagesInMem);
-
-            pMemBucket->numOfAvailPages += pSeg->pBuffer[j]->numOfPagesInMem;
-            tExtMemBufferFlush(pSeg->pBuffer[j]);
-          }
-
-          tExtMemBuffer *pMemBuffer = pSeg->pBuffer[j];
-          pSeg->pBuffer[j] = NULL;
-
-          // release all
-          for (int32_t tt = 0; tt < pMemBucket->numOfSegs; ++tt) {
-            tMemBucketSegment *pSeg = &pMemBucket->pSegs[tt];
-            for (int32_t ttx = 0; ttx < pSeg->numOfSlots; ++ttx) {
-              if (pSeg->pBuffer && pSeg->pBuffer[ttx]) {
-                tExtMemBufferDestroy(&pSeg->pBuffer[ttx]);
-              }
-            }
-          }
-
-          pMemBucket->nRange.i64MaxVal = pSeg->pBoundingEntries->i64MaxVal;
-          pMemBucket->nRange.i64MinVal = pSeg->pBoundingEntries->i64MinVal;
-          pMemBucket->numOfElems = 0;
-
-          for (int32_t tt = 0; tt < pMemBucket->numOfSegs; ++tt) {
-            tMemBucketSegment *pSeg = &pMemBucket->pSegs[tt];
-            for (int32_t ttx = 0; ttx < pSeg->numOfSlots; ++ttx) {
-              if (pSeg->pBoundingEntries) {
-                resetBoundingBox(pSeg, pMemBucket->dataType);
-              }
-            }
-          }
-
-          tFilePage *pPage = (tFilePage *)malloc(pMemBuffer->nPageSize);
-
-          tFlushoutInfo *pFlushInfo = &pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[0];
-          assert(pFlushInfo->numOfPages == pMemBuffer->fileMeta.nFileSize);
-
-          int32_t ret = fseek(pMemBuffer->dataFile, pFlushInfo->startPageId * pMemBuffer->nPageSize, SEEK_SET);
-          UNUSED(ret);
-
-          for (uint32_t jx = 0; jx < pFlushInfo->numOfPages; ++jx) {
-            ret = fread(pPage, pMemBuffer->nPageSize, 1, pMemBuffer->dataFile);
-            UNUSED(ret);
-            tMemBucketPut(pMemBucket, pPage->data, pPage->numOfElems);
-          }
-
-          fclose(pMemBuffer->dataFile);
-          if (unlink(pMemBuffer->dataFilePath) != 0) {
-            pError("MemBucket:%p,remove tmp file %s failed", pMemBucket, pMemBuffer->dataFilePath);
-          }
-          tfree(pMemBuffer);
-          tfree(pPage);
-
-          return getPercentileImpl(pMemBucket, count - num, fraction);
-        }
-      } else {
-        num += pSeg->pBuffer[j]->numOfAllElems;
-      }
-    }
-  }
-  return 0;
-}
-
-double getPercentile(tMemBucket *pMemBucket, double percent) {
-  if (pMemBucket->numOfElems == 0) {
-    return 0.0;
-  }
-
-  if (pMemBucket->numOfElems == 1) {  // return the only element
-    return findOnlyResult(pMemBucket);
-  }
-
-  percent = fabs(percent);
-
-  // validate the parameters
-  if (fabs(percent - 100.0) < DBL_EPSILON || (percent < DBL_EPSILON)) {
-    double minx = 0, maxx = 0;
-    /*
-     * find the min/max value, no need to scan all data in bucket
-     */
-    findMaxMinValue(pMemBucket, &maxx, &minx);
-
-    return fabs(percent - 100) < DBL_EPSILON ? maxx : minx;
-  }
-
-  double  percentVal = (percent * (pMemBucket->numOfElems - 1)) / ((double)100.0);
-  int32_t orderIdx = (int32_t)percentVal;
-
-  // do put data by using buckets
-  return getPercentileImpl(pMemBucket, orderIdx, percentVal - orderIdx);
-}
-
-/*
- * check if data in one slot are all identical
- * only need to compare with the bounding box
- */
-bool isIdenticalData(tMemBucket *pMemBucket, int32_t segIdx, int32_t slotIdx) {
-  tMemBucketSegment *pSeg = &pMemBucket->pSegs[segIdx];
-
-  if (pMemBucket->dataType == TSDB_DATA_TYPE_INT || pMemBucket->dataType == TSDB_DATA_TYPE_BIGINT ||
-      pMemBucket->dataType == TSDB_DATA_TYPE_SMALLINT || pMemBucket->dataType == TSDB_DATA_TYPE_TINYINT) {
-    return pSeg->pBoundingEntries[slotIdx].i64MinVal == pSeg->pBoundingEntries[slotIdx].i64MaxVal;
-  }
-
-  if (pMemBucket->dataType == TSDB_DATA_TYPE_FLOAT || pMemBucket->dataType == TSDB_DATA_TYPE_DOUBLE) {
-    return fabs(pSeg->pBoundingEntries[slotIdx].dMaxVal - pSeg->pBoundingEntries[slotIdx].dMinVal) < DBL_EPSILON;
-  }
-
-  return false;
-}
-
-/*
- * get the first element of one slot into memory.
- * if no data of current slot in memory, load it from disk
- */
-char *getFirstElemOfMemBuffer(tMemBucketSegment *pSeg, int32_t slotIdx, tFilePage *pPage) {
-  tExtMemBuffer *pMemBuffer = pSeg->pBuffer[slotIdx];
-  char *         thisVal = NULL;
-
-  if (pSeg->pBuffer[slotIdx]->numOfElemsInBuffer != 0) {
-    thisVal = pSeg->pBuffer[slotIdx]->pHead->item.data;
-  } else {
-    /*
-     * no data in memory, load one page into memory
-     */
-    tFlushoutInfo *pFlushInfo = &pMemBuffer->fileMeta.flushoutData.pFlushoutInfo[0];
-    assert(pFlushInfo->numOfPages == pMemBuffer->fileMeta.nFileSize);
-
-    fseek(pMemBuffer->dataFile, pFlushInfo->startPageId * pMemBuffer->nPageSize, SEEK_SET);
-    size_t ret = fread(pPage, pMemBuffer->nPageSize, 1, pMemBuffer->dataFile);
-    UNUSED(ret);
-    thisVal = pPage->data;
-  }
-  return thisVal;
-}
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
deleted file mode 100644
index 45efcad56394b1507c60d383a60199d0b96afb02..0000000000000000000000000000000000000000
--- a/src/util/src/tglobalcfg.c
+++ /dev/null
@@ -1,1216 +0,0 @@
-/*
- * 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 "os.h"
-#include <locale.h>
-
-#include "tglobalcfg.h"
-#include "tkey.h"
-#include "tlog.h"
-#include "tsdb.h"
-#include "tsocket.h"
-#include "tsystem.h"
-#include "tutil.h"
-
-// monitor module api
-int  (*startMonitor)() = NULL;
-void (*stopMonitor)()  = NULL;
-
-// system info, not configurable
-int64_t tsPageSize;
-int64_t tsOpenMax;
-int64_t tsStreamMax;
-int32_t tsNumOfCores = 1;
-int32_t tsAlternativeRole = 0;
-float tsTotalLogDirGB = 0;
-float tsTotalTmpDirGB = 0;
-float tsTotalDataDirGB = 0;
-float tsAvailLogDirGB = 0;
-float tsAvailTmpDirGB = 0;
-float tsAvailDataDirGB = 0;
-float tsMinimalLogDirGB = 0.1;
-float tsMinimalTmpDirGB = 0.1;
-float tsMinimalDataDirGB = 0.5;
-int32_t tsTotalMemoryMB = 0;
-int32_t tsVersion = 0;
-
-// global, not configurable
-int tscEmbedded = 0;
-
-/*
- * minmum scale for whole system, millisecond by default
- * for TSDB_TIME_PRECISION_MILLI: 86400000L
- *     TSDB_TIME_PRECISION_MICRO: 86400000000L
- */
-int64_t tsMsPerDay[] = {86400000L, 86400000000L};
-
-char  tsMasterIp[TSDB_IPv4ADDR_LEN] = {0};
-char  tsSecondIp[TSDB_IPv4ADDR_LEN] = {0};
-uint16_t tsMgmtShellPort = 6030;   // udp[6030-6034] tcp[6030]
-uint16_t tsVnodeShellPort = 6035;  // udp[6035-6039] tcp[6035]
-uint16_t tsMgmtVnodePort = 6040;   // udp[6040-6044] tcp[6040]
-uint16_t tsVnodeVnodePort = 6045;  // tcp[6045]
-uint16_t tsMgmtMgmtPort = 6050;    // udp, numOfVnodes fixed to 1, range udp[6050]
-uint16_t tsMgmtSyncPort = 6050;    // tcp, range tcp[6050]
-
-int tsStatusInterval = 1;         // second
-int tsShellActivityTimer = 3;     // second
-int tsVnodePeerHBTimer = 1;       // second
-int tsMgmtPeerHBTimer = 1;        // second
-int tsMeterMetaKeepTimer = 7200;  // second
-int tsMetricMetaKeepTimer = 600;  // second
-
-float tsNumOfThreadsPerCore = 1.0;
-float tsRatioOfQueryThreads = 0.5;
-char  tsPublicIp[TSDB_IPv4ADDR_LEN] = {0};
-char  tsPrivateIp[TSDB_IPv4ADDR_LEN] = {0};
-short tsNumOfVnodesPerCore = 8;
-short tsNumOfTotalVnodes = 0;
-short tsCheckHeaderFile = 0;
-
-#ifdef _TD_ARM_32_
-int tsSessionsPerVnode = 100;
-#else
-int tsSessionsPerVnode = 1000;
-#endif
-
-int tsCacheBlockSize = 16384;  // 256 columns
-int tsAverageCacheBlocks = TSDB_DEFAULT_AVG_BLOCKS;
-/**
- * Change the meaning of affected rows:
- * 0: affected rows not include those duplicate records
- * 1: affected rows include those duplicate records
- */
-short tsAffectedRowsMod = 0;
-
-int   tsRowsInFileBlock = 4096;
-float tsFileBlockMinPercent = 0.05;
-
-short tsNumOfBlocksPerMeter = 100;
-short tsCommitTime = 3600;  // seconds
-short tsCommitLog = 1;
-short tsCompression = TSDB_MAX_COMPRESSION_LEVEL;
-short tsDaysPerFile = 10;
-int   tsDaysToKeep = 3650;
-int   tsReplications = TSDB_REPLICA_MIN_NUM;
-
-int  tsNumOfMPeers = 3;
-int  tsMaxShellConns = 2000;
-int  tsMaxAccounts = 100;
-int  tsMaxUsers = 1000;
-int  tsMaxDbs = 1000;
-int  tsMaxTables = 650000;
-int  tsMaxDnodes = 1000;
-int  tsMaxVGroups = 1000;
-char tsMgmtZone[16] = "rzone";
-
-char tsLocalIp[TSDB_IPv4ADDR_LEN] = {0};
-char tsDefaultDB[TSDB_DB_NAME_LEN] = {0};
-char tsDefaultUser[64] = "root";
-char tsDefaultPass[64] = "taosdata";
-int  tsMaxMeterConnections = 10000;
-int  tsMaxMgmtConnections = 2000;
-int  tsMaxVnodeConnections = 10000;
-
-int tsBalanceMonitorInterval = 2;  // seconds
-int tsBalanceStartInterval = 300;  // seconds
-int tsBalancePolicy = 0;           // 1-use sys.montor
-int tsOfflineThreshold = 864000;   // seconds 10days
-int tsMgmtEqualVnodeNum = 4;
-
-int tsEnableHttpModule = 1;
-int tsEnableMonitorModule = 1;
-int tsRestRowLimit = 10240;
-int tsMaxSQLStringLen = TSDB_MAX_SQL_LEN;
-
-// the maximum number of results for projection query on super table that are returned from
-// one virtual node, to order according to timestamp
-int tsMaxNumOfOrderedResults = 100000;
-
-/*
- * denote if the server needs to compress response message at the application layer to client, including query rsp,
- * metricmeta rsp, and multi-meter query rsp message body. The client compress the submit message to server.
- *
- * 0: all data are compressed
- * -1: all data are not compressed
- * other values: if the message payload size is greater than the tsCompressMsgSize, the message will be compressed.
- */
-int tsCompressMsgSize = -1;
-
-// use UDP by default[option: udp, tcp]
-char tsSocketType[4] = "udp";
-
-// time precision, millisecond by default
-int tsTimePrecision = TSDB_TIME_PRECISION_MILLI;
-
-// 10 ms for sliding time, the value will changed in case of time precision changed
-int tsMinSlidingTime = 10;
-
-// 10 ms for interval time range, changed accordingly
-int tsMinIntervalTime = 10;
-
-// 20sec, the maximum value of stream computing delay, changed accordingly
-int tsMaxStreamComputDelay = 20000;
-
-// 10sec, the first stream computing delay time after system launched successfully, changed accordingly
-int tsStreamCompStartDelay = 10000;
-
-// the stream computing delay time after executing failed, change accordingly
-int tsStreamCompRetryDelay = 10;
-
-// The delayed computing ration. 10% of the whole computing time window by default.
-float tsStreamComputDelayRatio = 0.1;
-
-int     tsProjectExecInterval = 10000;   // every 10sec, the projection will be executed once
-int64_t tsMaxRetentWindow = 24 * 3600L;  // maximum time window tolerance
-
-char  tsHttpIp[TSDB_IPv4ADDR_LEN] = "0.0.0.0";
-uint16_t tsHttpPort = 6020;                 // only tcp, range tcp[6020]
-// uint16_t tsNginxPort = 6060;             //only tcp, range tcp[6060]
-int tsHttpCacheSessions = 100;
-int tsHttpSessionExpire = 36000;
-int tsHttpMaxThreads = 2;
-int tsHttpEnableCompress = 0;
-int tsHttpEnableRecordSql = 0;
-int tsTelegrafUseFieldNum = 0;
-
-int   tsTscEnableRecordSql = 0;
-int   tsEnableCoreFile = 0;
-int   tsAnyIp = 1;
-uint32_t tsPublicIpInt = 0;
-
-#ifdef CLUSTER
-int   tsIsCluster = 1;
-#else
-int   tsIsCluster = 0;
-#endif
-
-int tsRpcTimer = 300;
-int tsRpcMaxTime = 600;      // seconds;
-
-char tsMonitorDbName[TSDB_DB_NAME_LEN] = "log";
-int  tsMonitorInterval = 30;  // seconds
-char tsInternalPass[] = "secretkey";
-
-char tsTimezone[64] = {0};
-char tsLocale[TSDB_LOCALE_LEN] = {0};
-char tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
-
-int tsNumOfLogLines = 10000000;
-uint32_t rpcDebugFlag = 131;
-uint32_t ddebugFlag = 131;
-uint32_t mdebugFlag = 135;
-uint32_t sdbDebugFlag = 135;
-uint32_t cdebugFlag = 131;
-uint32_t jnidebugFlag = 131;
-uint32_t httpDebugFlag = 131;
-uint32_t monitorDebugFlag = 131;
-uint32_t debugFlag = 131;
-uint32_t odbcdebugFlag = 131;
-uint32_t qdebugFlag = 131;
-
-SGlobalConfig *tsGlobalConfig = NULL;
-int            tsGlobalConfigNum = 0;
-
-char *tsGlobalUnit[] = {
-    " ", "(%)", "(GB)", "(MB)", "(Mb)", "(byte)", "(s)", "(ms)",
-};
-
-char *tsCfgStatusStr[] = {"none", "system default", "config file", "taos_options", "program argument list"};
-
-void tsReadFloatConfig(SGlobalConfig *cfg, char *input_value) {
-  float  value = (float)atof(input_value);
-  float *option = (float *)cfg->ptr;
-  if (value < cfg->minValue || value > cfg->maxValue) {
-    pError("config option:%s, input value:%s, out of range[%f, %f], use default value:%f",
-           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      *option = value;
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %f", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], *option);
-    }
-  }
-}
-
-void tsReadIntConfig(SGlobalConfig *cfg, char *input_value) {
-  int32_t  value = atoi(input_value);
-  int32_t *option = (int32_t *)cfg->ptr;
-  if (value < cfg->minValue || value > cfg->maxValue) {
-    pError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
-           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      *option = value;
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], *option);
-    }
-  }
-}
-
-void tsReadUIntConfig(SGlobalConfig *cfg, char *input_value) {
-  uint32_t  value = (uint32_t)atoi(input_value);
-  uint32_t *option = (uint32_t *)cfg->ptr;
-  if (value < (uint32_t)cfg->minValue || value > (uint32_t)cfg->maxValue) {
-    pError("config option:%s, input value:%s, out of range[%f, %f], use default value:%u",
-           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      *option = value;
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %u", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], *option);
-    }
-  }
-}
-
-void tsReadShortConfig(SGlobalConfig *cfg, char *input_value) {
-  int32_t  value = atoi(input_value);
-  int16_t *option = (int16_t *)cfg->ptr;
-  if (value < cfg->minValue || value > cfg->maxValue) {
-    pError("config option:%s, input value:%s, out of range[%f, %f], use default value:%d",
-           cfg->option, input_value, cfg->minValue, cfg->maxValue, *option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      *option = (int16_t)value;
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %d", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], *option);
-    }
-  }
-}
-
-void tsReadFilePathConfig(SGlobalConfig *cfg, char *input_value) {
-  int   length = strlen(input_value);
-  char *option = (char *)cfg->ptr;
-  if (length <= 0 || length > cfg->ptrLength) {
-    pError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
-           cfg->option, input_value, cfg->ptrLength, option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      wordexp_t full_path;
-      wordexp(input_value, &full_path, 0);
-      if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
-        strcpy(option, full_path.we_wordv[0]);
-      }
-      wordfree(&full_path);
-
-      struct stat dirstat;
-      if (stat(option, &dirstat) < 0) {
-        int code = mkdir(option, 0755);
-        pPrint("config option:%s, input value:%s, directory not exist, create with return code:%d",
-               cfg->option, input_value, code);
-      }
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], option);
-    }
-  }
-}
-
-void tsExpandFilePath(char* option_name, char* input_value) {
-  wordexp_t full_path;
-  wordexp(input_value, &full_path, 0);
-  if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
-    strcpy(input_value, full_path.we_wordv[0]);
-  }
-  wordfree(&full_path);
-
-  struct stat dirstat;
-  if (stat(input_value, &dirstat) < 0) {
-    int code = mkdir(input_value, 0755);
-    pPrint("config option:%s, input value:%s, directory not exist, create with return code:%d", option_name, input_value, code);
-  }
-}
-
-void tsReadIpConfig(SGlobalConfig *cfg, char *input_value) {
-  uint32_t value = inet_addr(input_value);
-  char *   option = (char *)cfg->ptr;
-  if (value == INADDR_NONE) {
-    pError("config option:%s, input value:%s, is not a valid ip address, use default value:%s",
-           cfg->option, input_value, option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      strncpy(option, input_value, cfg->ptrLength);
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], option);
-    }
-  }
-}
-
-void tsReadStrConfig(SGlobalConfig *cfg, char *input_value) {
-  int   length = strlen(input_value);
-  char *option = (char *)cfg->ptr;
-  if (length <= 0 || length > cfg->ptrLength) {
-    pError("config option:%s, input value:%s, length out of range[0, %d], use default value:%s",
-           cfg->option, input_value, cfg->ptrLength, option);
-  } else {
-    if (cfg->cfgStatus <= TSDB_CFG_CSTATUS_FILE) {
-      strncpy(option, input_value, cfg->ptrLength);
-      cfg->cfgStatus = TSDB_CFG_CSTATUS_FILE;
-    } else {
-      pWarn("config option:%s, input value:%s, is configured by %s, use %s", cfg->option, input_value,
-            tsCfgStatusStr[cfg->cfgStatus], option);
-    }
-  }
-}
-
-void tsReadLogOption(char *option, char *value) {
-  for (int i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_CONFIG) || !(cfg->cfgType & TSDB_CFG_CTYPE_B_LOG)) continue;
-    if (strcasecmp(cfg->option, option) != 0) continue;
-
-    switch (cfg->valType) {
-      case TSDB_CFG_VTYPE_INT:
-        tsReadIntConfig(cfg, value);
-        if (strcasecmp(cfg->option, "debugFlag") == 0) {
-          tsSetAllDebugFlag();
-        }
-        break;
-      case TSDB_CFG_VTYPE_DIRECTORY:
-        tsReadFilePathConfig(cfg, value);
-        break;
-      default:
-        break;
-    }
-    break;
-  }
-}
-
-SGlobalConfig *tsGetConfigOption(const char *option) {
-  tsInitGlobalConfig();
-  for (int i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (strcasecmp(cfg->option, option) != 0) continue;
-    return cfg;
-  }
-  return NULL;
-}
-
-void tsReadConfigOption(const char *option, char *value) {
-  for (int i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_CONFIG)) continue;
-    if (strcasecmp(cfg->option, option) != 0) continue;
-
-    switch (cfg->valType) {
-      case TSDB_CFG_VTYPE_SHORT:
-        tsReadShortConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_INT:
-        tsReadIntConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_UINT:
-        tsReadUIntConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_FLOAT:
-        tsReadFloatConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_STRING:
-        tsReadStrConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_IPSTR:
-        tsReadIpConfig(cfg, value);
-        break;
-      case TSDB_CFG_VTYPE_DIRECTORY:
-        tsReadFilePathConfig(cfg, value);
-        break;
-      default:
-        pError("config option:%s, input value:%s, can't be recognized", option, value);
-        break;
-    }
-    break;
-  }
-}
-
-void tsInitConfigOption(SGlobalConfig *cfg, char *name, void *ptr, int8_t valType, int8_t cfgType, float minVal,
-                        float maxVal, uint8_t ptrLength, int8_t unitType) {
-  cfg->option = name;
-  cfg->ptr = ptr;
-  cfg->valType = valType;
-  cfg->cfgType = cfgType;
-  cfg->minValue = minVal;
-  cfg->maxValue = maxVal;
-  cfg->ptrLength = ptrLength;
-  cfg->unitType = unitType;
-  cfg->cfgStatus = TSDB_CFG_CSTATUS_NONE;
-}
-
-static void doInitGlobalConfig() {
-  tsGlobalConfig = (SGlobalConfig *) malloc(sizeof(SGlobalConfig) * TSDB_CFG_MAX_NUM);
-  memset(tsGlobalConfig, 0, sizeof(SGlobalConfig) * TSDB_CFG_MAX_NUM);
-
-  SGlobalConfig *cfg = tsGlobalConfig;
-
-  // ip address
-  tsInitConfigOption(cfg++, "masterIp", tsMasterIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "secondIp", tsSecondIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "publicIp", tsPublicIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "privateIp", tsPrivateIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "localIp", tsLocalIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "httpIp", tsHttpIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-
-  // port
-  tsInitConfigOption(cfg++, "httpPort", &tsHttpPort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "mgmtShellPort", &tsMgmtShellPort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "vnodeShellPort", &tsVnodeShellPort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "mgmtVnodePort", &tsMgmtVnodePort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "vnodeVnodePort", &tsVnodeVnodePort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "mgmtMgmtPort", &tsMgmtMgmtPort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "mgmtSyncPort", &tsMgmtSyncPort, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 65535, 0, TSDB_CFG_UTYPE_NONE);
-
-  // directory
-  tsInitConfigOption(cfg++, "configDir", configDir, TSDB_CFG_VTYPE_DIRECTORY,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_FILENAME_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "logDir", logDir, TSDB_CFG_VTYPE_DIRECTORY,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_LOG,
-                     0, 0, TSDB_FILENAME_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "scriptDir", scriptDir, TSDB_CFG_VTYPE_DIRECTORY,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_FILENAME_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "dataDir", dataDir, TSDB_CFG_VTYPE_DIRECTORY,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 0, TSDB_FILENAME_LEN, TSDB_CFG_UTYPE_NONE);
-
-  // dnode configs
-  tsInitConfigOption(cfg++, "numOfThreadsPerCore", &tsNumOfThreadsPerCore, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 10, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "ratioOfQueryThreads", &tsRatioOfQueryThreads, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0.1, 0.9, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "numOfVnodesPerCore", &tsNumOfVnodesPerCore, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 64, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "numOfTotalVnodes", &tsNumOfTotalVnodes, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, TSDB_MAX_VNODES, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "tables", &tsSessionsPerVnode, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     TSDB_MIN_TABLES_PER_VNODE, TSDB_MAX_TABLES_PER_VNODE, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "cache", &tsCacheBlockSize, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     100, 1048576, 0, TSDB_CFG_UTYPE_BYTE);
-  tsInitConfigOption(cfg++, "rows", &tsRowsInFileBlock, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     200, 1048576, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "fileBlockMinPercent", &tsFileBlockMinPercent, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 1.0, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "ablocks", &tsAverageCacheBlocks, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     TSDB_MIN_AVG_BLOCKS, TSDB_MAX_AVG_BLOCKS, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "tblocks", &tsNumOfBlocksPerMeter, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     32, 4096, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "numOfMPeers", &tsNumOfMPeers, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 3, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "balanceInterval", &tsBalanceStartInterval, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 30000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "alternativeRole", &tsAlternativeRole, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 2, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "affectedRowsMod", &tsAffectedRowsMod, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-  // 0-any, 1-mgmt, 2-dnode
-
-  // timer
-  tsInitConfigOption(cfg++, "maxTmrCtrl", &taosMaxTmrCtrl, TSDB_CFG_VTYPE_INT,
-                    TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                    8, 2048, 0, TSDB_CFG_UTYPE_NONE);
-
-  // time
-  tsInitConfigOption(cfg++, "monitorInterval", &tsMonitorInterval, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 600, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "offlineThreshold", &tsOfflineThreshold, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     5, 7200000, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "rpcTimer", &tsRpcTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     100, 3000, 0, TSDB_CFG_UTYPE_MS);
-  tsInitConfigOption(cfg++, "rpcMaxTime", &tsRpcMaxTime, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     100, 7200, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "ctime", &tsCommitTime, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     30, 40960, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "statusInterval", &tsStatusInterval, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 10, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "shellActivityTimer", &tsShellActivityTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     1, 120, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "vnodePeerHBTimer", &tsVnodePeerHBTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 10, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "mgmtPeerHBTimer", &tsMgmtPeerHBTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER, 1, 10, 0,
-                     TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "meterMetaKeepTimer", &tsMeterMetaKeepTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     1, 8640000, 0, TSDB_CFG_UTYPE_SECOND);
-  tsInitConfigOption(cfg++, "metricMetaKeepTimer", &tsMetricMetaKeepTimer, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     1, 8640000, 0, TSDB_CFG_UTYPE_SECOND);
-
-  // mgmt configs
-  tsInitConfigOption(cfg++, "mgmtZone", tsMgmtZone, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 0, 16, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxAccounts", &tsMaxAccounts, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 1000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxUsers", &tsMaxUsers, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 1000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxDbs", &tsMaxDbs, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 10000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxTables", &tsMaxTables, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 100000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxDnodes", &tsMaxDnodes, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 1000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxVGroups", &tsMaxVGroups, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 1000000, 0, TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "minSlidingTime", &tsMinSlidingTime, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 1000000, 0, TSDB_CFG_UTYPE_MS);
-  tsInitConfigOption(cfg++, "minIntervalTime", &tsMinIntervalTime, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 1000000, 0, TSDB_CFG_UTYPE_MS);
-  tsInitConfigOption(cfg++, "maxStreamCompDelay", &tsMaxStreamComputDelay, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 1000000000, 0, TSDB_CFG_UTYPE_MS);
-  tsInitConfigOption(cfg++, "maxFirstStreamCompDelay", &tsStreamCompStartDelay, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1000, 1000000000, 0, TSDB_CFG_UTYPE_MS);
-  tsInitConfigOption(cfg++, "retryStreamCompDelay", &tsStreamCompRetryDelay, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, 10, 1000000000, 0, TSDB_CFG_UTYPE_MS);
-  
-  
-  tsInitConfigOption(cfg++, "streamCompDelayRatio", &tsStreamComputDelayRatio, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW, 0.1, 0.9, 0, TSDB_CFG_UTYPE_NONE);
-  
-  tsInitConfigOption(cfg++, "clog", &tsCommitLog, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "comp", &tsCompression, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 2, 0, TSDB_CFG_UTYPE_NONE);
-
-  // database configs
-  tsInitConfigOption(cfg++, "days", &tsDaysPerFile, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 365, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "keep", &tsDaysToKeep, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     1, 365000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "replica", &tsReplications, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     1, 3, 0, TSDB_CFG_UTYPE_NONE);
-
-  // login configs
-  tsInitConfigOption(cfg++, "defaultDB", tsDefaultDB, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_DB_NAME_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "defaultUser", tsDefaultUser, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, TSDB_USER_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "defaultPass", tsDefaultPass, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_NOT_PRINT,
-                     0, 0, TSDB_PASSWORD_LEN, TSDB_CFG_UTYPE_NONE);
-  
-  // socket type, udp by default
-  tsInitConfigOption(cfg++, "sockettype", tsSocketType, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 0, 3, TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "compressMsgSize", &tsCompressMsgSize, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW,
-                     -1, 10000000, 0, TSDB_CFG_UTYPE_NONE);
-  
-  tsInitConfigOption(cfg++, "maxSQLLength", &tsMaxSQLStringLen, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW,
-                     TSDB_MAX_SQL_LEN, TSDB_MAX_ALLOWED_SQL_LEN, 0, TSDB_CFG_UTYPE_BYTE);
-  
-  tsInitConfigOption(cfg++, "maxNumOfOrderedRes", &tsMaxNumOfOrderedResults, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT | TSDB_CFG_CTYPE_B_SHOW,
-                     TSDB_MAX_SQL_LEN, TSDB_MAX_ALLOWED_SQL_LEN, 0, TSDB_CFG_UTYPE_NONE);
-  
-  // locale & charset
-  tsInitConfigOption(cfg++, "timezone", tsTimezone, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, tListLen(tsTimezone), TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "locale", tsLocale, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, tListLen(tsLocale), TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "charset", tsCharset, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, tListLen(tsCharset), TSDB_CFG_UTYPE_NONE);
-
-  // connect configs
-  tsInitConfigOption(cfg++, "maxShellConns", &tsMaxShellConns, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 50000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxMeterConnections", &tsMaxMeterConnections, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 50000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxMgmtConnections", &tsMaxMgmtConnections, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 50000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "maxVnodeConnections", &tsMaxVnodeConnections, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     10, 50000000, 0, TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "minimalLogDirGB", &tsMinimalLogDirGB, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0.001, 10000000, 0, TSDB_CFG_UTYPE_GB);
-  tsInitConfigOption(cfg++, "minimalTmpDirGB", &tsMinimalTmpDirGB, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0.001, 10000000, 0, TSDB_CFG_UTYPE_GB);
-  tsInitConfigOption(cfg++, "minimalDataDirGB", &tsMinimalDataDirGB, TSDB_CFG_VTYPE_FLOAT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0.001, 10000000, 0, TSDB_CFG_UTYPE_GB);
-
-  // module configs
-  tsInitConfigOption(cfg++, "mgmtEqualVnodeNum", &tsMgmtEqualVnodeNum, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 1000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "http", &tsEnableHttpModule, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 1, 1, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "monitor", &tsEnableMonitorModule, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 1, 1, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "monitorDbName", tsMonitorDbName, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 0, TSDB_DB_NAME_LEN, TSDB_CFG_UTYPE_NONE);
-
-  // http configs
-  tsInitConfigOption(cfg++, "httpCacheSessions", &tsHttpCacheSessions, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 100000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "httpEnableRecordSql", &tsHttpEnableRecordSql, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "telegrafUseFieldNum", &tsTelegrafUseFieldNum, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
-                     0, 1, 1, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "httpMaxThreads", &tsHttpMaxThreads, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 1000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "restfulRowLimit", &tsRestRowLimit, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 10000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "httpEnableCompress", &tsHttpEnableCompress, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 1, 1, TSDB_CFG_UTYPE_NONE);
-
-  // debug flag
-  tsInitConfigOption(cfg++, "numOfLogLines", &tsNumOfLogLines, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     10000, 2000000000, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "asyncLog", &tsAsyncLog, TSDB_CFG_VTYPE_SHORT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "debugFlag", &debugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "mDebugFlag", &mdebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "dDebugFlag", &ddebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "sdbDebugFlag", &sdbDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "rpcDebugFlag", &rpcDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "tmrDebugFlag", &tmrDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "cDebugFlag", &cdebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "jniDebugFlag", &jnidebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "odbcDebugFlag", &odbcdebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "uDebugFlag", &uDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "httpDebugFlag", &httpDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "monitorDebugFlag", &monitorDebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG,
-                     0, 255, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "qDebugFlag", &qdebugFlag, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 255, 0,
-                     TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "tscEnableRecordSql", &tsTscEnableRecordSql, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "enableCoreFile", &tsEnableCoreFile, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-
-  tsInitConfigOption(cfg++, "anyIp", &tsAnyIp, TSDB_CFG_VTYPE_INT,
-                     TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLUSTER,
-                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
-
-  // version info
-  tsInitConfigOption(cfg++, "gitinfo", gitinfo, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "gitinfoOfInternal", gitinfoOfInternal, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "buildinfo", buildinfo, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, 0, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "version", version, TSDB_CFG_VTYPE_STRING,
-                     TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
-                     0, 0, 0, TSDB_CFG_UTYPE_NONE);
-
-  tsGlobalConfigNum = (int)(cfg - tsGlobalConfig);
-  assert(tsGlobalConfigNum <= TSDB_CFG_MAX_NUM);
-}
-
-static pthread_once_t initGlobalConfig = PTHREAD_ONCE_INIT;
-void tsInitGlobalConfig() {
-  pthread_once(&initGlobalConfig, doInitGlobalConfig);
-}
-
-void tsReadGlobalLogConfig() {
-  tsInitGlobalConfig();
-
-  FILE * fp;
-  char * line, *option, *value;
-  size_t len;
-  int    olen, vlen;
-  char   fileName[128];
-
-  mdebugFlag = 135;
-  sdbDebugFlag = 135;
-
-  wordexp_t full_path;
-  wordexp(configDir, &full_path, 0);
-  if (full_path.we_wordv != NULL && full_path.we_wordv[0] != NULL) {
-    strcpy(configDir, full_path.we_wordv[0]);
-  } else {
-    printf("configDir:%s not there, use default value: /etc/taos", configDir);
-    strcpy(configDir, "/etc/taos");
-  }
-  wordfree(&full_path);
-
-  tsReadLogOption("logDir", logDir);
-  sprintf(fileName, "%s/taos.cfg", configDir);
-  fp = fopen(fileName, "r");
-  if (fp == NULL) {
-    printf("\noption file:%s not found, all options are set to system default\n", fileName);
-    return;
-  }
-
-  line = NULL;
-  while (!feof(fp)) {
-    tfree(line);
-    line = option = value = NULL;
-    len = olen = vlen = 0;
-
-    getline(&line, &len, fp);
-    if (line == NULL) break;
-
-    paGetToken(line, &option, &olen);
-    if (olen == 0) continue;
-    option[olen] = 0;
-
-    paGetToken(option + olen + 1, &value, &vlen);
-    if (vlen == 0) continue;
-    value[vlen] = 0;
-
-    tsReadLogOption(option, value);
-  }
-
-  tfree(line);
-  fclose(fp);
-}
-
-bool tsReadGlobalConfig() {
-  tsInitGlobalConfig();
-
-  FILE * fp;
-  char * line, *option, *value, *value1;
-  size_t len;
-  int    olen, vlen, vlen1;
-  char   fileName[128];
-
-  sprintf(fileName, "%s/taos.cfg", configDir);
-  fp = fopen(fileName, "r");
-  if (fp == NULL) {
-  } else {
-    line = NULL;
-    while (!feof(fp)) {
-      tfree(line);
-      line = option = value = NULL;
-      len = olen = vlen = 0;
-
-      getline(&line, &len, fp);
-      if (line == NULL) break;
-
-      paGetToken(line, &option, &olen);
-      if (olen == 0) continue;
-      option[olen] = 0;
-
-      paGetToken(option + olen + 1, &value, &vlen);
-      if (vlen == 0) continue;
-      value[vlen] = 0;
-
-      // For dataDir, the format is:
-      // dataDir    /mnt/disk1    0
-      paGetToken(value + vlen + 1, &value1, &vlen1);
-
-      tsReadConfigOption(option, value);
-    }
-
-    tfree(line);
-    fclose(fp);
-  }
-
-  tsReadGlobalConfigSpec();
-
-  if (tsPrivateIp[0] == 0) {
-    taosGetPrivateIp(tsPrivateIp);
-  }
-
-  if (tsPublicIp[0] == 0) {
-    strcpy(tsPublicIp, tsPrivateIp);
-  }
-  tsPublicIpInt = inet_addr(tsPublicIp);
-
-  if (tsLocalIp[0] == 0) {
-    strcpy(tsLocalIp, tsPrivateIp);
-  }
-
-  if (tsMasterIp[0] == 0) {
-    strcpy(tsMasterIp, tsPrivateIp);
-  }
-
-  if (tsSecondIp[0] == 0) {
-    strcpy(tsSecondIp, tsMasterIp);
-  }
-
-  taosGetSystemInfo();
-
-  tsSetLocale();
-
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  if (cfg_timezone && cfg_timezone->cfgStatus == TSDB_CFG_CSTATUS_FILE) {
-    tsSetTimeZone();
-  }
-
-  if (tsNumOfCores <= 0) {
-    tsNumOfCores = 1;
-  }
-
-  if (strlen(tsPrivateIp) == 0) {
-    pError("privateIp is null");
-    return false;
-  }
-
-  if (tscEmbedded) {
-    strcpy(tsLocalIp, tsPrivateIp);
-  }
-
-  tsVersion = 0;
-  for (int i = 0; i < 10; i++) {
-    if (version[i] >= '0' && version[i] <= '9') {
-      tsVersion = tsVersion * 10 + (version[i] - '0');
-    } else if (version[i] == 0) {
-      break;
-    }
-  }
-  tsVersion = 10 * tsVersion;
-
-  return true;
-}
-
-int tsCfgDynamicOptions(char *msg) {
-  char *option, *value;
-  int   olen, vlen, code = 0;
-  int   vint = 0;
-
-  paGetToken(msg, &option, &olen);
-  if (olen == 0) return 0;
-
-  paGetToken(option + olen + 1, &value, &vlen);
-  if (vlen == 0)
-    vint = 135;
-  else {
-    vint = atoi(value);
-  }
-
-  pPrint("change dynamic option: %s, value: %d", option, vint);
-
-  for (int i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (!(cfg->cfgType & TSDB_CFG_CTYPE_B_LOG)) continue;
-    if (cfg->valType != TSDB_CFG_VTYPE_INT) continue;
-    if (strncasecmp(option, cfg->option, olen) != 0) continue;
-    *((int *)cfg->ptr) = vint;
-
-    if (strncasecmp(cfg->option, "monitor", olen) == 0) {
-      if (0 == vint) {
-        if(stopMonitor) (void)(*stopMonitor)();
-      } else {
-        if(startMonitor) (*startMonitor)();
-      }
-      return code;
-    }
-
-    if (strncasecmp(cfg->option, "debugFlag", olen) == 0) {
-      tsSetAllDebugFlag();
-    }
-    
-    return code;
-  }
-
-  if (strncasecmp(option, "resetlog", 8) == 0) {
-    taosResetLogFile();
-    tsPrintGlobalConfig();
-    return code;
-  }
-
-  if (strncasecmp(option, "resetQueryCache", 15) == 0) {
-    if (taosLogSqlFp) {
-      pPrint("the query cache of internal client will reset");
-      taosLogSqlFp("reset query cache");
-    } else {
-      pError("reset query cache can't be executed, for monitor not initialized");
-      code = 169;
-    }
-  } else {
-    code = 169;  // INVALID_OPTION
-  }
-
-  return code;
-}
-
-void tsPrintGlobalConfig() {
-  pPrint("   taos config & system info:");
-  pPrint("==================================");
-
-  for (int i = 0; i < tsGlobalConfigNum; ++i) {
-    SGlobalConfig *cfg = tsGlobalConfig + i;
-    if (tscEmbedded == 0 && !(cfg->cfgType & TSDB_CFG_CTYPE_B_CLIENT)) continue;
-    if (cfg->cfgType & TSDB_CFG_CTYPE_B_NOT_PRINT) continue;
-    if (cfg->cfgType & TSDB_CFG_CTYPE_B_LITE) {
-#ifdef CLUSTER
-      continue;
-#endif
-    }
-    if (cfg->cfgType & TSDB_CFG_CTYPE_B_CLUSTER) {
-#ifndef CLUSTER
-      continue;
-#endif
-    }
-    
-    int optionLen = (int)strlen(cfg->option);
-    int blankLen = TSDB_CFG_PRINT_LEN - optionLen;
-    blankLen = blankLen < 0 ? 0 : blankLen;
-
-    char blank[TSDB_CFG_PRINT_LEN];
-    memset(blank, ' ', TSDB_CFG_PRINT_LEN);
-    blank[blankLen] = 0;
-
-    switch (cfg->valType) {
-      case TSDB_CFG_VTYPE_SHORT:
-        pPrint(" %s:%s%d%s", cfg->option, blank, *((int16_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
-        break;
-      case TSDB_CFG_VTYPE_INT:
-        pPrint(" %s:%s%d%s", cfg->option, blank, *((int32_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
-        break;
-      case TSDB_CFG_VTYPE_UINT:
-        pPrint(" %s:%s%d%s", cfg->option, blank, *((uint32_t *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
-        break;
-      case TSDB_CFG_VTYPE_FLOAT:
-        pPrint(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
-        break;
-      case TSDB_CFG_VTYPE_STRING:
-      case TSDB_CFG_VTYPE_IPSTR:
-      case TSDB_CFG_VTYPE_DIRECTORY:
-        pPrint(" %s:%s%s%s", cfg->option, blank, (char *)cfg->ptr, tsGlobalUnit[cfg->unitType]);
-        break;
-      default:
-        break;
-    }
-  }
-
-  tsPrintGlobalConfigSpec();
-
-  tsPrintOsInfo();
-
-  pPrint("==================================");
-}
-
-void tsSetAllDebugFlag() {
-  if (mdebugFlag != debugFlag) mdebugFlag = debugFlag;
-  if (ddebugFlag != debugFlag) ddebugFlag = debugFlag;
-  if (sdbDebugFlag != debugFlag) sdbDebugFlag = debugFlag;
-  if (rpcDebugFlag != debugFlag) rpcDebugFlag = debugFlag;
-  if (cdebugFlag != debugFlag) cdebugFlag = debugFlag;
-  if (jnidebugFlag != debugFlag) jnidebugFlag = debugFlag;
-  if (uDebugFlag != debugFlag) uDebugFlag = debugFlag;
-  if (httpDebugFlag != debugFlag) httpDebugFlag = debugFlag;
-  if (monitorDebugFlag != debugFlag) monitorDebugFlag = debugFlag;
-  if (odbcdebugFlag != debugFlag) odbcdebugFlag = debugFlag;
-  pPrint("all debug flag are set to %d", debugFlag);
-}
-
-/**
- * In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
- * both the TDengine Server and the Client may be interrupted.
- *
- * In case that the setLocale failed to be executed, the right charset needs to be set.
- */
-void tsSetLocale() {
-  char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n";
-  char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n";
-  char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
-
-  char *locale = setlocale(LC_CTYPE, tsLocale);
-
-  // default locale or user specified locale is not valid, abort launch
-  if (locale == NULL) {
-    printf(msgLocale, tsLocale);
-    pPrint(msgLocale, tsLocale);
-  }
-
-  if (strlen(tsCharset) == 0) {
-    printf("%s\n", msgCharset1);
-    pPrint(msgCharset1);
-    exit(-1);
-  }
-
-  if (!taosValidateEncodec(tsCharset)) {
-    printf(msgCharset, tsCharset);
-    pPrint(msgCharset, tsCharset);
-    exit(-1);
-  }
-}
-
-void tsSetTimeZone() {
-  SGlobalConfig *cfg_timezone = tsGetConfigOption("timezone");
-  pPrint("timezone is set to %s by %s", tsTimezone, tsCfgStatusStr[cfg_timezone->cfgStatus]);
-
-#ifdef WINDOWS
-  char winStr[TSDB_LOCALE_LEN * 2];
-  sprintf(winStr, "TZ=%s", tsTimezone);
-  putenv(winStr);
-#else
-  setenv("TZ", tsTimezone, 1);
-#endif
-  tzset();
-
-  /*
-  * get CURRENT time zone.
-  * system current time zone is affected by daylight saving time(DST)
-  *
-  * e.g., the local time zone of London in DST is GMT+01:00,
-  * otherwise is GMT+00:00
-  */
-#ifdef _MSC_VER
-#if _MSC_VER >= 1900
-  // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
-  int64_t timezone = _timezone;
-  int32_t daylight = _daylight;
-  char **tzname = _tzname;
-#endif
-#endif
-
-  int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
-  tz += daylight;
-
-  /*
-  * format:
-  * (CST, +0800)
-  * (BST, +0100)
-  */
-  sprintf(tsTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
-
-  pPrint("timezone format changed to %s", tsTimezone);
-}
-
-#ifndef CLUSTER
-
-bool tsReadGlobalConfigSpec() { return true; }
-
-void tsPrintGlobalConfigSpec() {
-  pPrint(" dataDir:                %s", dataDir);
-}
-
-#endif
diff --git a/src/util/src/thash.c b/src/util/src/thash.c
deleted file mode 100644
index e3c6fe26b4e98185d48ff55d8cbfecd08a16ddbb..0000000000000000000000000000000000000000
--- a/src/util/src/thash.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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 "os.h"
-#include "tmempool.h"
-
-typedef struct _long_hash_t {
-  unsigned int         id;
-  struct _long_hash_t *prev;
-  struct _long_hash_t *next;
-  uint64_t             cont;
-} SLongHash;
-
-typedef struct {
-  SLongHash **longHashList;
-  mpool_h     longHashMemPool;
-  int (*hashFp)(void *, uint64_t);
-  int             maxSessions;
-  pthread_mutex_t mutex;
-} SHashObj;
-
-uint64_t taosHashUInt64(uint64_t handle) {
-  uint64_t hash = handle >> 16;
-  hash += handle & 0xFFFF;
-  return hash;
-}
-
-int taosHashLong(void *handle, uint64_t ip) {
-  SHashObj *pObj = (SHashObj *)handle;
-  int       hash = 0;
-
-  hash = (int)(ip >> 16);
-  hash += (int)(ip & 0xFFFF);
-
-  hash = hash % pObj->maxSessions;
-
-  return hash;
-}
-
-int taosAddHash(void *handle, uint64_t cont, unsigned int id) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return -1;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  hash = (*pObj->hashFp)(pObj, cont);
-
-  pNode = (SLongHash *)taosMemPoolMalloc(pObj->longHashMemPool);
-  pNode->cont = cont;
-  pNode->id = id;
-  pNode->prev = 0;
-  pNode->next = pObj->longHashList[hash];
-
-  if (pObj->longHashList[hash] != 0) (pObj->longHashList[hash])->prev = pNode;
-  pObj->longHashList[hash] = pNode;
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  return 0;
-}
-
-void taosDeleteHash(void *handle, uint64_t cont) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  hash = (*pObj->hashFp)(pObj, cont);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->longHashList[hash];
-  while (pNode) {
-    if (pNode->cont == cont) break;
-
-    pNode = pNode->next;
-  }
-
-  if (pNode) {
-    if (pNode->prev) {
-      pNode->prev->next = pNode->next;
-    } else {
-      pObj->longHashList[hash] = pNode->next;
-    }
-
-    if (pNode->next) {
-      pNode->next->prev = pNode->prev;
-    }
-
-    taosMemPoolFree(pObj->longHashMemPool, (char *)pNode);
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-}
-
-int32_t taosGetIdFromHash(void *handle, uint64_t cont) {
-  int        hash;
-  SLongHash *pNode;
-  SHashObj * pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return -1;
-
-  hash = (*pObj->hashFp)(pObj, cont);
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  pNode = pObj->longHashList[hash];
-
-  while (pNode) {
-    if (pNode->cont == cont) {
-      break;
-    }
-
-    pNode = pNode->next;
-  }
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  if (pNode) return (int32_t)pNode->id;
-
-  return -1;
-}
-
-void *taosOpenHash(int maxSessions, int (*fp)(void *, uint64_t)) {
-  SLongHash **longHashList;
-  mpool_h     longHashMemPool;
-  SHashObj *  pObj;
-
-  longHashMemPool = taosMemPoolInit(maxSessions, sizeof(SLongHash));
-  if (longHashMemPool == 0) return NULL;
-
-  longHashList = calloc(sizeof(SLongHash *), (size_t)maxSessions);
-  if (longHashList == 0) {
-    taosMemPoolCleanUp(longHashMemPool);
-    return NULL;
-  }
-
-  pObj = malloc(sizeof(SHashObj));
-  if (pObj == NULL) {
-    taosMemPoolCleanUp(longHashMemPool);
-    free(longHashList);
-    return NULL;
-  }
-
-  pObj->maxSessions = maxSessions;
-  pObj->longHashMemPool = longHashMemPool;
-  pObj->longHashList = longHashList;
-  pObj->hashFp = fp;
-
-  pthread_mutex_init(&pObj->mutex, NULL);
-
-  return pObj;
-}
-
-void taosCloseHash(void *handle) {
-  SHashObj *pObj;
-
-  pObj = (SHashObj *)handle;
-  if (pObj == NULL || pObj->maxSessions == 0) return;
-
-  pthread_mutex_lock(&pObj->mutex);
-
-  if (pObj->longHashMemPool) taosMemPoolCleanUp(pObj->longHashMemPool);
-
-  if (pObj->longHashList) free(pObj->longHashList);
-
-  pthread_mutex_unlock(&pObj->mutex);
-
-  pthread_mutex_destroy(&pObj->mutex);
-
-  memset(pObj, 0, sizeof(SHashObj));
-  free(pObj);
-}
diff --git a/src/util/src/thashutil.c b/src/util/src/thashutil.c
index cf16efe2f8e539f9611952111bafc5d4ff214d3e..681d73db3d085295f514269ad6201ee6c6dd9508 100644
--- a/src/util/src/thashutil.c
+++ b/src/util/src/thashutil.c
@@ -7,10 +7,10 @@
  * MurmurHash algorithm
  *
  */
+#include "hashfunc.h"
 #include "tutil.h"
-#include "hashutil.h"
 
-#define ROTL32(x, r) ((x) << (r) | (x) >> (32 - (r)))
+#define ROTL32(x, r) ((x) << (r) | (x) >> (32u - (r)))
 
 #define FMIX32(h)      \
   do {                 \
@@ -20,12 +20,12 @@
     (h) *= 0xc2b2ae35; \
     (h) ^= (h) >> 16;  \
   } while (0)
-
-static void MurmurHash3_32_s(const void *key, int len, uint32_t seed, void *out) {
+  
+uint32_t MurmurHash3_32(const char *key, uint32_t len) {
   const uint8_t *data = (const uint8_t *)key;
-  const int      nblocks = len / 4;
+  const int nblocks = len >> 2u;
 
-  uint32_t h1 = seed;
+  uint32_t h1 = 0x12345678;
 
   const uint32_t c1 = 0xcc9e2d51;
   const uint32_t c2 = 0x1b873593;
@@ -36,11 +36,11 @@ static void MurmurHash3_32_s(const void *key, int len, uint32_t seed, void *out)
     uint32_t k1 = blocks[i];
 
     k1 *= c1;
-    k1 = ROTL32(k1, 15);
+    k1 = ROTL32(k1, 15u);
     k1 *= c2;
 
     h1 ^= k1;
-    h1 = ROTL32(h1, 13);
+    h1 = ROTL32(h1, 13u);
     h1 = h1 * 5 + 0xe6546b64;
   }
 
@@ -48,7 +48,7 @@ static void MurmurHash3_32_s(const void *key, int len, uint32_t seed, void *out)
 
   uint32_t k1 = 0;
 
-  switch (len & 3) {
+  switch (len & 3u) {
     case 3:
       k1 ^= tail[2] << 16;
     case 2:
@@ -56,7 +56,7 @@ static void MurmurHash3_32_s(const void *key, int len, uint32_t seed, void *out)
     case 1:
       k1 ^= tail[0];
       k1 *= c1;
-      k1 = ROTL32(k1, 15);
+      k1 = ROTL32(k1, 15u);
       k1 *= c2;
       h1 ^= k1;
   };
@@ -65,16 +65,7 @@ static void MurmurHash3_32_s(const void *key, int len, uint32_t seed, void *out)
 
   FMIX32(h1);
 
-  *(uint32_t *)out = h1;
-}
-
-uint32_t MurmurHash3_32(const char *key, uint32_t len) {
-  const int32_t hashSeed = 0x12345678;
-
-  uint32_t val = 0;
-  MurmurHash3_32_s(key, len, hashSeed, &val);
-
-  return val;
+  return h1;
 }
 
 uint32_t taosIntHash_32(const char *key, uint32_t UNUSED_PARAM(len)) { return *(uint32_t *)key; }
@@ -87,7 +78,7 @@ uint32_t taosIntHash_64(const char *key, uint32_t UNUSED_PARAM(len)) {
   uint64_t hash = val >> 16U;
   hash += (val & 0xFFFFU);
   
-  return hash;
+  return (uint32_t)hash;
 }
 
 _hash_fn_t taosGetDefaultHashFunction(int32_t type) {
diff --git a/src/util/src/thistogram.c b/src/util/src/thistogram.c
deleted file mode 100644
index 93046cf796220c1d0fb2a64d1b3501f254ea351d..0000000000000000000000000000000000000000
--- a/src/util/src/thistogram.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * 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 "os.h"
-
-#include "taosmsg.h"
-#include "thistogram.h"
-#include "tlosertree.h"
-#include "tsdb.h"
-
-/**
- *
- * implement the histogram and percentile_approx based on the paper:
- * Yael Ben-Haim, Elad Tom-Tov. A Streaming Parallel Decision Tree Algorithm,
- * The Journal of Machine Learning Research.Volume 11, 3/1/2010 pp.849-872
- * https://dl.acm.org/citation.cfm?id=1756034
- *
- * @data 2018-12-14
- * @version 0.1
- *
- */
-
-// SHeapEntry* tHeapCreate(int32_t numOfEntries) {
-//    SHeapEntry* pEntry = calloc(1, sizeof(SHeapEntry)*(numOfEntries + 1));
-//    return pEntry;
-//}
-//
-// int32_t tHeapPut(SHeapEntry* pEntry, int32_t maxSize, int32_t num, void*
-// pData, double v) {
-//    pEntry[num].val = v;
-//    pEntry[num].pData = pData;
-//
-//    return num;
-//}
-//
-////min heap
-// void tHeapAdjust(SHeapEntry* pEntry, int32_t index, int32_t len) {
-//    SHeapEntry* ptr = NULL;
-//
-//    int32_t end = len - 1;
-//
-//    SHeapEntry p1 = pEntry[index];
-//    int32_t next = index;
-//
-//    for(int32_t i=index; i<=(end-1)/2; ) {
-//        int32_t lc = (i<<1) + 1;
-//        int32_t rc = (i+1) << 1;
-//
-//        ptr = &pEntry[lc];
-//        next = lc;
-//
-//        if (rc < len && (pEntry[lc].val > pEntry[rc].val)) {
-//            ptr = &pEntry[rc];
-//            next = rc;
-//        }
-//
-//        if (p1.val < ptr->val) {
-//            next = i;
-//            break;
-//        }
-//        pEntry[i] = *ptr;
-//        tSkipListNode* pnode = (tSkipListNode*) pEntry[i].pData;
-//        if(pnode != NULL) {
-//            ((SHistBin*) pnode->pData)->index = i;
-//        }
-//
-//        i = next;
-//    }
-//
-//    pEntry[next] = p1;
-//
-//    tSkipListNode* pnode = (tSkipListNode*) p1.pData;
-//    if (pnode != NULL) {
-//        ((SHistBin*) pnode->pData)->index = next;
-//    }
-//}
-//
-// void tHeapSort(SHeapEntry* pEntry, int32_t len) {
-//    int32_t last = len/2 - 1;
-//
-//    for(int32_t i=last; i >= 0; --i) {
-//        tHeapAdjust(pEntry, i, len);
-//    }
-//}
-
-// typedef struct SInsertSupporter {
-//    int32_t         numOfEntries;
-//    tSkipList*      pSkipList;
-//    SLoserTreeInfo* pTree;
-//} SInsertSupporter;
-//
-// int32_t compare(const void* pleft, const void* pright, void* param) {
-//    SLoserTreeNode* left = (SLoserTreeNode*) pleft;
-//    SLoserTreeNode* right = (SLoserTreeNode *)pright;
-//
-//    SInsertSupporter* pss = (SInsertSupporter*) param;
-//
-//    tSkipListNode* pLeftNode = (tSkipListNode*) left->pData;
-//    tSkipListNode* pRightNode = (tSkipListNode*) right->pData;
-//
-//    SHistBin* pLeftBin = (SHistBin*)pLeftNode->pData;
-//    SHistBin* pRightBin = (SHistBin*)pRightNode->pData;
-//
-//    if (pLeftBin->delta == pRightBin->delta) {
-//        return 0;
-//    } else {
-//        return ((pLeftBin->delta < pRightBin->delta)? -1:1);
-//    }
-//}
-
-static int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val);
-
-SHistogramInfo* tHistogramCreate(int32_t numOfEntries) {
-  /* need one redundant slot */
-  SHistogramInfo* pHisto = malloc(sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfEntries + 1));
-
-#if !defined(USE_ARRAYLIST)
-  pHisto->pList = tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
-  SInsertSupporter* pss = malloc(sizeof(SInsertSupporter));
-  pss->numOfEntries = pHisto->maxEntries;
-  pss->pSkipList = pHisto->pList;
-
-  int32_t ret = tLoserTreeCreate1(&pHisto->pLoserTree, numOfEntries, pss, compare);
-  pss->pTree = pHisto->pLoserTree;
-#endif
-
-  return tHistogramCreateFrom(pHisto, numOfEntries);
-}
-
-SHistogramInfo* tHistogramCreateFrom(void* pBuf, int32_t numOfBins) {
-  memset(pBuf, 0, sizeof(SHistogramInfo) + sizeof(SHistBin) * (numOfBins + 1));
-
-  SHistogramInfo* pHisto = (SHistogramInfo*)pBuf;
-  pHisto->elems = (SHistBin*)((char*)pBuf + sizeof(SHistogramInfo));
-
-  pHisto->maxEntries = numOfBins;
-
-  pHisto->min = DBL_MAX;
-  pHisto->max = -DBL_MAX;
-
-  return pBuf;
-}
-
-int32_t tHistogramAdd(SHistogramInfo** pHisto, double val) {
-  if (*pHisto == NULL) {
-    *pHisto = tHistogramCreate(MAX_HISTOGRAM_BIN);
-  }
-
-#if defined(USE_ARRAYLIST)
-  int32_t idx = vnodeHistobinarySearch((*pHisto)->elems, (*pHisto)->numOfEntries, val);
-  assert(idx >= 0 && idx <= (*pHisto)->maxEntries);
-
-  if ((*pHisto)->elems[idx].val == val && idx >= 0) {
-    (*pHisto)->elems[idx].num += 1;
-
-    if ((*pHisto)->numOfEntries == 0) {
-      (*pHisto)->numOfEntries += 1;
-    }
-  } else { /* insert a new slot */
-    if ((*pHisto)->numOfElems > 1 && idx < (*pHisto)->numOfEntries) {
-      if (idx > 0) {
-        assert((*pHisto)->elems[idx - 1].val <= val);
-      }
-
-      assert((*pHisto)->elems[idx].val > val);
-    } else {
-      assert((*pHisto)->elems[(*pHisto)->numOfEntries].val < val);
-    }
-
-    histogramCreateBin(*pHisto, idx, val);
-  }
-#else
-  tSkipListKey key = tSkipListCreateKey(TSDB_DATA_TYPE_DOUBLE, &val, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-  SHistBin*    entry = calloc(1, sizeof(SHistBin));
-  entry->val = val;
-
-  tSkipListNode* pResNode = tSkipListPut((*pHisto)->pList, entry, &key, 0);
-
-  SHistBin* pEntry1 = (SHistBin*)pResNode->pData;
-  pEntry1->index = -1;
-
-  tSkipListNode* pLast = NULL;
-
-  if (pEntry1->num == 0) { /* it is a new node */
-    (*pHisto)->numOfEntries += 1;
-    pEntry1->num += 1;
-
-    /* number of entries reaches the upper limitation */
-    if (pResNode->pForward[0] != NULL) {
-      /* we need to update the last updated slot in loser tree*/
-      pEntry1->delta = ((SHistBin*)pResNode->pForward[0]->pData)->val - val;
-
-      if ((*pHisto)->ordered) {
-        int32_t         lastIndex = (*pHisto)->maxIndex;
-        SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
-
-        (*pHisto)->pLoserTree->pNode[lastIndex + pTree->numOfEntries].pData = pResNode;
-        pEntry1->index = (*pHisto)->pLoserTree->pNode[lastIndex + pTree->numOfEntries].index;
-
-        // update the loser tree
-        if ((*pHisto)->ordered) {
-          tLoserTreeAdjust(pTree, pEntry1->index + pTree->numOfEntries);
-        }
-
-        tSkipListKey kx =
-            tSkipListCreateKey(TSDB_DATA_TYPE_DOUBLE, &(*pHisto)->max, tDataTypeDesc[TSDB_DATA_TYPE_DOUBLE].nSize);
-        pLast = tSkipListGetOne((*pHisto)->pList, &kx);
-      }
-    } else {
-      /* this node located at the last position of the skiplist, we do not
-       * update the loser-tree */
-      pEntry1->delta = DBL_MAX;
-      pLast = pResNode;
-    }
-
-    if (pResNode->pBackward[0] != &(*pHisto)->pList->pHead) {
-      SHistBin* pPrevEntry = (SHistBin*)pResNode->pBackward[0]->pData;
-      pPrevEntry->delta = val - pPrevEntry->val;
-
-      SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
-      if ((*pHisto)->ordered) {
-        tLoserTreeAdjust(pTree, pPrevEntry->index + pTree->numOfEntries);
-        tLoserTreeDisplay(pTree);
-      }
-    }
-
-    if ((*pHisto)->numOfEntries >= (*pHisto)->maxEntries + 1) {
-      // set the right value for loser-tree
-      assert((*pHisto)->pLoserTree != NULL);
-      if (!(*pHisto)->ordered) {
-        tSkipListPrint((*pHisto)->pList, 1);
-
-        SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
-        tSkipListNode*  pHead = (*pHisto)->pList->pHead.pForward[0];
-
-        tSkipListNode* p1 = pHead;
-
-        printf("\n");
-        while (p1 != NULL) {
-          printf("%f\t", ((SHistBin*)(p1->pData))->delta);
-          p1 = p1->pForward[0];
-        }
-        printf("\n");
-
-        /* last one in skiplist is ignored */
-        for (int32_t i = pTree->numOfEntries; i < pTree->totalEntries; ++i) {
-          pTree->pNode[i].pData = pHead;
-          pTree->pNode[i].index = i - pTree->numOfEntries;
-          SHistBin* pBin = (SHistBin*)pHead->pData;
-          pBin->index = pTree->pNode[i].index;
-
-          pHead = pHead->pForward[0];
-        }
-
-        pLast = pHead;
-
-        for (int32_t i = 0; i < pTree->numOfEntries; ++i) {
-          pTree->pNode[i].index = -1;
-        }
-
-        tLoserTreeDisplay(pTree);
-
-        for (int32_t i = pTree->totalEntries - 1; i >= pTree->numOfEntries; i--) {
-          tLoserTreeAdjust(pTree, i);
-        }
-
-        tLoserTreeDisplay(pTree);
-        (*pHisto)->ordered = true;
-      }
-
-      printf("delta is:%lf\n", pEntry1->delta);
-
-      tSkipListPrint((*pHisto)->pList, 1);
-
-      /* the chosen node */
-      tSkipListNode* pNode = (*pHisto)->pLoserTree->pNode[0].pData;
-      SHistBin*      pEntry = (SHistBin*)pNode->pData;
-
-      tSkipListNode* pNext = pNode->pForward[0];
-      SHistBin*      pNextEntry = (SHistBin*)pNext->pData;
-      assert(pNextEntry->val - pEntry->val == pEntry->delta);
-
-      double newVal = (pEntry->val * pEntry->num + pNextEntry->val * pNextEntry->num) / (pEntry->num + pNextEntry->num);
-      pEntry->val = newVal;
-      pNode->key.dKey = newVal;
-      pEntry->num = pEntry->num + pNextEntry->num;
-
-      // update delta value in current node
-      pEntry->delta = (pNextEntry->delta + pNextEntry->val) - pEntry->val;
-
-      // reset delta value in the previous node
-      SHistBin* pPrevEntry = (SHistBin*)pNode->pBackward[0]->pData;
-      if (pPrevEntry) {
-        pPrevEntry->delta = pEntry->val - pPrevEntry->val;
-      }
-
-      SLoserTreeInfo* pTree = (*pHisto)->pLoserTree;
-      if (pNextEntry->index != -1) {
-        (*pHisto)->maxIndex = pNextEntry->index;
-
-        // set the last element in skiplist, of which delta is FLT_MAX;
-        pTree->pNode[pNextEntry->index + pTree->numOfEntries].pData = pLast;
-        ((SHistBin*)pLast->pData)->index = pNextEntry->index;
-        int32_t f = pTree->pNode[pNextEntry->index + pTree->numOfEntries].index;
-        printf("disappear index is:%d\n", f);
-      }
-
-      tLoserTreeAdjust(pTree, pEntry->index + pTree->numOfEntries);
-      // remove the next node in skiplist
-      tSkipListRemoveNode((*pHisto)->pList, pNext);
-      tSkipListPrint((*pHisto)->pList, 1);
-
-      tLoserTreeDisplay((*pHisto)->pLoserTree);
-    } else {  // add to heap
-      if (pResNode->pForward[0] != NULL) {
-        pEntry1->delta = ((SHistBin*)pResNode->pForward[0]->pData)->val - val;
-      } else {
-        pEntry1->delta = DBL_MAX;
-      }
-
-      if (pResNode->pBackward[0] != &(*pHisto)->pList->pHead) {
-        SHistBin* pPrevEntry = (SHistBin*)pResNode->pBackward[0]->pData;
-        pEntry1->delta = val - pPrevEntry->val;
-      }
-
-      printf("delta is:%9lf\n", pEntry1->delta);
-    }
-
-  } else {
-    SHistBin* pEntry = (SHistBin*)pResNode->pData;
-    assert(pEntry->val == val);
-    pEntry->num += 1;
-  }
-
-#endif
-  if (val > (*pHisto)->max) {
-    (*pHisto)->max = val;
-  }
-
-  if (val < (*pHisto)->min) {
-    (*pHisto)->min = val;
-  }
-
-  (*pHisto)->numOfElems += 1;
-  return 0;
-}
-
-int32_t vnodeHistobinarySearch(SHistBin* pEntry, int32_t len, double val) {
-  int32_t end = len - 1;
-  int32_t start = 0;
-
-  while (start <= end) {
-    int32_t mid = (end - start) / 2 + start;
-    if (pEntry[mid].val == val) {
-      return mid;
-    }
-
-    if (pEntry[mid].val < val) {
-      start = mid + 1;
-    } else {
-      end = mid - 1;
-    }
-  }
-
-  int32_t ret = start > end ? start : end;
-  if (ret < 0) {
-    return 0;
-  } else {
-    return ret;
-  }
-}
-
-static void histogramMergeImpl(SHistBin* pHistBin, int32_t* size) {
-#if defined(USE_ARRAYLIST)
-  int32_t oldSize = *size;
-
-  double  delta = DBL_MAX;
-  int32_t index = -1;
-  for (int32_t i = 1; i < oldSize; ++i) {
-    double d = pHistBin[i].val - pHistBin[i - 1].val;
-    if (d < delta) {
-      delta = d;
-      index = i - 1;
-    }
-  }
-
-  SHistBin* s1 = &pHistBin[index];
-  SHistBin* s2 = &pHistBin[index + 1];
-
-  double newVal = (s1->val * s1->num + s2->val * s2->num) / (s1->num + s2->num);
-  s1->val = newVal;
-  s1->num = s1->num + s2->num;
-
-  memmove(&pHistBin[index + 1], &pHistBin[index + 2], (oldSize - index - 2) * sizeof(SHistBin));
-  (*size) -= 1;
-#endif
-}
-
-/* optimize this procedure */
-int32_t histogramCreateBin(SHistogramInfo* pHisto, int32_t index, double val) {
-#if defined(USE_ARRAYLIST)
-  int32_t remain = pHisto->numOfEntries - index;
-  if (remain > 0) {
-    memmove(&pHisto->elems[index + 1], &pHisto->elems[index], sizeof(SHistBin) * remain);
-  }
-
-  assert(index >= 0 && index <= pHisto->maxEntries);
-
-  pHisto->elems[index].num = 1;
-  pHisto->elems[index].val = val;
-  pHisto->numOfEntries += 1;
-
-  /* we need to merge the slot */
-  if (pHisto->numOfEntries == pHisto->maxEntries + 1) {
-    histogramMergeImpl(pHisto->elems, &pHisto->numOfEntries);
-
-    pHisto->elems[pHisto->maxEntries].val = 0;
-    pHisto->elems[pHisto->maxEntries].num = 0;
-  }
-#endif
-  assert(pHisto->numOfEntries <= pHisto->maxEntries);
-  return 0;
-}
-
-void tHistogramDestroy(SHistogramInfo** pHisto) {
-  if (*pHisto == NULL) {
-    return;
-  }
-
-  free(*pHisto);
-  *pHisto = NULL;
-}
-
-void tHistogramPrint(SHistogramInfo* pHisto) {
-  printf("total entries: %d, elements: %d\n", pHisto->numOfEntries, pHisto->numOfElems);
-#if defined(USE_ARRAYLIST)
-  for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
-    printf("%d: (%f, %" PRId64 ")\n", i + 1, pHisto->elems[i].val, pHisto->elems[i].num);
-  }
-#else
-  tSkipListNode* pNode = pHisto->pList->pHead.pForward[0];
-
-  for (int32_t i = 0; i < pHisto->numOfEntries; ++i) {
-    SHistBin* pEntry = (SHistBin*)pNode->pData;
-    printf("%d: (%f, %" PRId64 ")\n", i + 1, pEntry->val, pEntry->num);
-    pNode = pNode->pForward[0];
-  }
-#endif
-}
-
-/**
- * Estimated number of points in the interval (−inf,b].
- * @param pHisto
- * @param v
- */
-int64_t tHistogramSum(SHistogramInfo* pHisto, double v) {
-#if defined(USE_ARRAYLIST)
-  int32_t slotIdx = vnodeHistobinarySearch(pHisto->elems, pHisto->numOfEntries, v);
-  if (pHisto->elems[slotIdx].val != v) {
-    slotIdx -= 1;
-
-    if (slotIdx < 0) {
-      slotIdx = 0;
-      assert(v <= pHisto->elems[slotIdx].val);
-    } else {
-      assert(v >= pHisto->elems[slotIdx].val);
-
-      if (slotIdx + 1 < pHisto->numOfEntries) {
-        assert(v < pHisto->elems[slotIdx + 1].val);
-      }
-    }
-  }
-
-  double m1 = pHisto->elems[slotIdx].num;
-  double v1 = pHisto->elems[slotIdx].val;
-
-  double m2 = pHisto->elems[slotIdx + 1].num;
-  double v2 = pHisto->elems[slotIdx + 1].val;
-
-  double estNum = m1 + (m2 - m1) * (v - v1) / (v2 - v1);
-  double s1 = (m1 + estNum) * (v - v1) / (2 * (v2 - v1));
-
-  for (int32_t i = 0; i < slotIdx; ++i) {
-    s1 += pHisto->elems[i].num;
-  }
-
-  s1 = s1 + m1 / 2;
-
-  return (int64_t)s1;
-#endif
-}
-
-double* tHistogramUniform(SHistogramInfo* pHisto, double* ratio, int32_t num) {
-#if defined(USE_ARRAYLIST)
-  double* pVal = malloc(num * sizeof(double));
-
-  for (int32_t i = 0; i < num; ++i) {
-    double numOfElem = (ratio[i] / 100) * pHisto->numOfElems;
-
-    if (numOfElem == 0) {
-      pVal[i] = pHisto->min;
-      continue;
-    } else if (numOfElem <= pHisto->elems[0].num) {
-      pVal[i] = pHisto->elems[0].val;
-      continue;
-    } else if (numOfElem == pHisto->numOfElems) {
-      pVal[i] = pHisto->max;
-      continue;
-    }
-
-    int32_t j = 0;
-    int64_t total = 0;
-
-    while (j < pHisto->numOfEntries) {
-      total += pHisto->elems[j].num;
-      if (total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem) {
-        break;
-      }
-
-      j += 1;
-    }
-
-    assert(total <= numOfElem && total + pHisto->elems[j + 1].num > numOfElem);
-
-    double delta = numOfElem - total;
-    if (fabs(delta) < FLT_EPSILON) {
-      pVal[i] = pHisto->elems[j].val;
-    }
-
-    double start = pHisto->elems[j].num;
-    double range = pHisto->elems[j + 1].num - start;
-
-    if (range == 0) {
-      pVal[i] = (pHisto->elems[j + 1].val - pHisto->elems[j].val) * delta / start + pHisto->elems[j].val;
-    } else {
-      double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
-      pVal[i] = pHisto->elems[j].val + (pHisto->elems[j + 1].val - pHisto->elems[j].val) * factor;
-    }
-  }
-#else
-  double* pVal = malloc(num * sizeof(double));
-
-  for (int32_t i = 0; i < num; ++i) {
-    double numOfElem = ratio[i] * pHisto->numOfElems;
-
-    tSkipListNode* pFirst = pHisto->pList->pHead.pForward[0];
-    SHistBin*      pEntry = (SHistBin*)pFirst->pData;
-    if (numOfElem == 0) {
-      pVal[i] = pHisto->min;
-      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
-      continue;
-    } else if (numOfElem <= pEntry->num) {
-      pVal[i] = pEntry->val;
-      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
-      continue;
-    } else if (numOfElem == pHisto->numOfElems) {
-      pVal[i] = pHisto->max;
-      printf("i/numofSlot: %f, v:%f, %f\n", ratio[i], numOfElem, pVal[i]);
-      continue;
-    }
-
-    int32_t   j = 0;
-    int64_t   total = 0;
-    SHistBin* pPrev = pEntry;
-
-    while (j < pHisto->numOfEntries) {
-      if (total <= numOfElem && total + pEntry->num > numOfElem) {
-        break;
-      }
-
-      total += pEntry->num;
-      pPrev = pEntry;
-
-      pFirst = pFirst->pForward[0];
-      pEntry = (SHistBin*)pFirst->pData;
-
-      j += 1;
-    }
-
-    assert(total <= numOfElem && total + pEntry->num > numOfElem);
-
-    double delta = numOfElem - total;
-    if (fabs(delta) < FLT_EPSILON) {
-      //                printf("i/numofSlot: %f, v:%f, %f\n",
-      //                (double)i/numOfSlots, numOfElem, pHisto->elems[j].val);
-      pVal[i] = pPrev->val;
-    }
-
-    double start = pPrev->num;
-    double range = pEntry->num - start;
-
-    if (range == 0) {
-      pVal[i] = (pEntry->val - pPrev->val) * delta / start + pPrev->val;
-    } else {
-      double factor = (-2 * start + sqrt(4 * start * start - 4 * range * (-2 * delta))) / (2 * range);
-      pVal[i] = pPrev->val + (pEntry->val - pPrev->val) * factor;
-    }
-    //            printf("i/numofSlot: %f, v:%f, %f\n", (double)i/numOfSlots,
-    //            numOfElem, val);
-  }
-#endif
-  return pVal;
-}
-
-SHistogramInfo* tHistogramMerge(SHistogramInfo* pHisto1, SHistogramInfo* pHisto2, int32_t numOfEntries) {
-  SHistogramInfo* pResHistogram = tHistogramCreate(numOfEntries);
-
-  // error in histogram info
-  if (pHisto1->numOfEntries > MAX_HISTOGRAM_BIN || pHisto2->numOfEntries > MAX_HISTOGRAM_BIN) {
-    return pResHistogram;
-  }
-
-  SHistBin* pHistoBins = calloc(1, sizeof(SHistBin) * (pHisto1->numOfEntries + pHisto2->numOfEntries));
-  int32_t i = 0, j = 0, k = 0;
-
-  while (i < pHisto1->numOfEntries && j < pHisto2->numOfEntries) {
-    if (pHisto1->elems[i].val < pHisto2->elems[j].val) {
-      pHistoBins[k++] = pHisto1->elems[i++];
-    } else if (pHisto1->elems[i].val > pHisto2->elems[j].val) {
-      pHistoBins[k++] = pHisto2->elems[j++];
-    } else {
-      pHistoBins[k] = pHisto1->elems[i++];
-      pHistoBins[k++].num += pHisto2->elems[j++].num;
-    }
-  }
-
-  if (i < pHisto1->numOfEntries) {
-    int32_t remain = pHisto1->numOfEntries - i;
-    memcpy(&pHistoBins[k], &pHisto1->elems[i], sizeof(SHistBin) * remain);
-    k += remain;
-  }
-
-  if (j < pHisto2->numOfEntries) {
-    int32_t remain = pHisto2->numOfEntries - j;
-    memcpy(&pHistoBins[k], &pHisto2->elems[j], sizeof(SHistBin) * remain);
-    k += remain;
-  }
-
-  /* update other information */
-  pResHistogram->numOfElems = pHisto1->numOfElems + pHisto2->numOfElems;
-  pResHistogram->min = (pHisto1->min < pHisto2->min) ? pHisto1->min : pHisto2->min;
-  pResHistogram->max = (pHisto1->max > pHisto2->max) ? pHisto1->max : pHisto2->max;
-
-  while (k > numOfEntries) {
-    histogramMergeImpl(pHistoBins, &k);
-  }
-
-  pResHistogram->numOfEntries = k;
-  memcpy(pResHistogram->elems, pHistoBins, sizeof(SHistBin) * k);
-
-  free(pHistoBins);
-  return pResHistogram;
-}
\ No newline at end of file
diff --git a/src/util/src/tidpool.c b/src/util/src/tidpool.c
index c50c38aa3cabd74266d4164f0ebdf4581ce670f6..53d81bb5422e5c1b3b7384a97186a93940d26408 100644
--- a/src/util/src/tidpool.c
+++ b/src/util/src/tidpool.c
@@ -14,91 +14,84 @@
  */
 
 #include "os.h"
-#include "tlog.h"
+#include "tulog.h"
+#include <stdbool.h>
 
 typedef struct {
   int             maxId;
   int             numOfFree;
   int             freeSlot;
-  int *           freeList;
+  bool *          freeList;
   pthread_mutex_t mutex;
 } id_pool_t;
 
 void *taosInitIdPool(int maxId) {
-  id_pool_t *pIdPool;
-  int *      idList, i;
-
-  if (maxId < 3) maxId = 3;
-
-  pIdPool = (id_pool_t *)malloc(sizeof(id_pool_t));
+  id_pool_t *pIdPool = calloc(1, sizeof(id_pool_t));
   if (pIdPool == NULL) return NULL;
 
-  idList = (int *)malloc(sizeof(int) * (size_t)maxId);
-  if (idList == NULL) {
+  pIdPool->freeList = calloc(maxId, sizeof(bool));
+  if (pIdPool->freeList == NULL) {
     free(pIdPool);
     return NULL;
   }
 
-  memset(pIdPool, 0, sizeof(id_pool_t));
   pIdPool->maxId = maxId;
-  pIdPool->numOfFree = maxId - 1;
+  pIdPool->numOfFree = maxId;
   pIdPool->freeSlot = 0;
-  pIdPool->freeList = idList;
 
   pthread_mutex_init(&pIdPool->mutex, NULL);
 
-  for (i = 1; i < maxId; ++i) idList[i - 1] = i;
-
-  pTrace("pool:%p is setup, maxId:%d", pIdPool, pIdPool->maxId);
+  uDebug("pool:%p is setup, maxId:%d", pIdPool, pIdPool->maxId);
 
-  return (void *)pIdPool;
+  return pIdPool;
 }
 
 int taosAllocateId(void *handle) {
-  id_pool_t *pIdPool;
-  int        id = -1;
-  if (handle == NULL) return id;
-
-  pIdPool = (id_pool_t *)handle;
-
-  if (pIdPool->maxId < 3) pError("pool:%p is messed up, maxId:%d", pIdPool, pIdPool->maxId);
+  id_pool_t *pIdPool = handle;
+  if (handle == NULL) {
+    return -1;
+  }
 
-  if (pthread_mutex_lock(&pIdPool->mutex) != 0) perror("lock pIdPool Mutex");
+  int slot = -1;
+  pthread_mutex_lock(&pIdPool->mutex);
 
   if (pIdPool->numOfFree > 0) {
-    id = pIdPool->freeList[pIdPool->freeSlot];
-    pIdPool->freeSlot = (pIdPool->freeSlot + 1) % pIdPool->maxId;
-    pIdPool->numOfFree--;
+    for (int i = 0; i < pIdPool->maxId; ++i) {
+      slot = (i + pIdPool->freeSlot) % pIdPool->maxId;
+      if (!pIdPool->freeList[slot]) {
+        pIdPool->freeList[slot] = true;
+        pIdPool->freeSlot = slot + 1;
+        pIdPool->numOfFree--;
+        break;
+      }
+    }
   }
 
-  if (pthread_mutex_unlock(&pIdPool->mutex) != 0) perror("unlock pIdPool Mutex");
-
-  return id;
+  pthread_mutex_unlock(&pIdPool->mutex);
+  return slot + 1;
 }
 
 void taosFreeId(void *handle, int id) {
-  id_pool_t *pIdPool;
-  int        slot;
+  id_pool_t *pIdPool = handle;
+  if (handle == NULL) return;
 
-  pIdPool = (id_pool_t *)handle;
-  if (pIdPool->freeList == NULL || pIdPool->maxId == 0) return;
-  if (id <= 0 || id >= pIdPool->maxId) return;
-  if (pthread_mutex_lock(&pIdPool->mutex) != 0) perror("lock pIdPool Mutex");
+  pthread_mutex_lock(&pIdPool->mutex);
 
-  slot = (pIdPool->freeSlot + pIdPool->numOfFree) % pIdPool->maxId;
-  pIdPool->freeList[slot] = id;
-  pIdPool->numOfFree++;
+  int slot = (id - 1) % pIdPool->maxId;
+  if (pIdPool->freeList[slot]) {
+    pIdPool->freeList[slot] = false;
+    pIdPool->numOfFree++;
+  }
 
-  if (pthread_mutex_unlock(&pIdPool->mutex) != 0) perror("unlock pIdPool Mutex");
+  pthread_mutex_unlock(&pIdPool->mutex);
 }
 
 void taosIdPoolCleanUp(void *handle) {
-  id_pool_t *pIdPool;
+  id_pool_t *pIdPool = handle;
 
-  if (handle == NULL) return;
-  pIdPool = (id_pool_t *)handle;
+  if (pIdPool == NULL) return;
 
-  pTrace("pool:%p is cleaned", pIdPool);
+  uDebug("pool:%p is cleaned", pIdPool);
 
   if (pIdPool->freeList) free(pIdPool->freeList);
 
@@ -110,70 +103,45 @@ void taosIdPoolCleanUp(void *handle) {
 }
 
 int taosIdPoolNumOfUsed(void *handle) {
-  id_pool_t *pIdPool = (id_pool_t *)handle;
-
-  return pIdPool->maxId - pIdPool->numOfFree - 1;
-}
-
-void taosIdPoolReinit(void *handle) {
-  id_pool_t *pIdPool;
-
-  pIdPool = (id_pool_t *)handle;
-  pIdPool->numOfFree = 0;
-  pIdPool->freeSlot = 0;
-
-  for (int i = 0; i < pIdPool->maxId; ++i) pIdPool->freeList[i] = 0;
-}
-
-void taosIdPoolMarkStatus(void *handle, int id, int status) {
-  id_pool_t *pIdPool = (id_pool_t *)handle;
-
-  pIdPool->freeList[id] = status;
+  id_pool_t *pIdPool = handle;
+  return pIdPool->maxId - pIdPool->numOfFree;
 }
 
-void taosIdPoolSetFreeList(void *handle) {
-  id_pool_t *pIdPool;
-  int        pos = 0;
-
-  pIdPool = (id_pool_t *)handle;
-  pIdPool->numOfFree = 0;
-  pIdPool->freeSlot = 0;
+void taosIdPoolMarkStatus(void *handle, int id) {
+  id_pool_t *pIdPool = handle;
+  pthread_mutex_lock(&pIdPool->mutex);
 
-  for (int i = 1; i < pIdPool->maxId; ++i) {
-    if (pIdPool->freeList[i] == 0) {
-      pIdPool->freeList[pos] = i;
-      pIdPool->numOfFree++;
-      pos++;
-    }
+  int slot = (id - 1) % pIdPool->maxId;
+  if (!pIdPool->freeList[slot]) {
+    pIdPool->freeList[slot] = true;
+    pIdPool->numOfFree--;
   }
+
+  pthread_mutex_unlock(&pIdPool->mutex);
 }
 
 int taosUpdateIdPool(id_pool_t *handle, int maxId) {
   id_pool_t *pIdPool = (id_pool_t*)handle;
   if (maxId <= pIdPool->maxId) {
-    return -1;
+    return 0;
   }
 
-  int *idList, i;
-  idList = (int *)malloc(sizeof(int) * (size_t)maxId);
+  bool *idList = calloc(maxId, sizeof(bool));
   if (idList == NULL) {
     return -1;
   }
-  for (i = 1; i < maxId; ++i) {
-    idList[i - 1] = i;
-  }
 
-  if (pthread_mutex_lock(&pIdPool->mutex) != 0) perror("lock pIdPool Mutex");
+  pthread_mutex_lock(&pIdPool->mutex);
 
-  memcpy(idList, pIdPool->freeList, sizeof(int) * (size_t)pIdPool->maxId);
+  memcpy(idList, pIdPool->freeList, sizeof(bool) * pIdPool->maxId);
   pIdPool->numOfFree += (maxId - pIdPool->maxId);
   pIdPool->maxId = maxId;
 
-  int *oldIdList = pIdPool->freeList;
+  bool *oldIdList = pIdPool->freeList;
   pIdPool->freeList = idList;
   free(oldIdList);
 
-  if (pthread_mutex_unlock(&pIdPool->mutex) != 0) perror("unlock pIdPool Mutex");
+  pthread_mutex_unlock(&pIdPool->mutex);
 
   return 0;
 }
diff --git a/src/util/src/tinterpolation.c b/src/util/src/tinterpolation.c
deleted file mode 100644
index 5df07a5c430947ecbac516cedc79238424d70c17..0000000000000000000000000000000000000000
--- a/src/util/src/tinterpolation.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * 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 <assert.h>
-#include <stdint.h>
-
-#include "os.h"
-#include "taosmsg.h"
-#include "textbuffer.h"
-#include "tinterpolation.h"
-#include "tsqlfunction.h"
-#include "ttypes.h"
-
-#define INTERPOL_IS_ASC_INTERPOL(interp) ((interp)->order == TSQL_SO_ASC)
-
-int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t timeRange, char intervalTimeUnit, int16_t precision) {
-  if (timeRange == 0) {
-    return startTime;
-  }
-
-  if (intervalTimeUnit == 'a' || intervalTimeUnit == 'm' || intervalTimeUnit == 's' || intervalTimeUnit == 'h') {
-    return (startTime / timeRange) * timeRange;
-  } else {
-    /*
-     * here we revised the start time of day according to the local time zone,
-     * but in case of DST, the start time of one day need to be dynamically decided.
-     *
-     * TODO dynamically decide the start time of a day
-     */
-
-#if defined(WINDOWS) && _MSC_VER >= 1900
-    // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
-    int64_t timezone = _timezone;
-    int32_t daylight = _daylight;
-    char**  tzname = _tzname;
-#endif
-
-    int64_t t = (precision == TSDB_TIME_PRECISION_MILLI)?MILLISECOND_PER_SECOND:MILLISECOND_PER_SECOND*1000L;
-
-    int64_t revStartime = (startTime / timeRange) * timeRange + timezone * t;
-    int64_t revEndtime = revStartime + timeRange - 1;
-    if (revEndtime < startTime) {
-      revStartime += timeRange;
-    }
-
-    return revStartime;
-  }
-}
-
-void taosInitInterpoInfo(SInterpolationInfo* pInterpoInfo, int32_t order, int64_t startTimestamp,
-                         int32_t numOfGroupbyTags, int32_t rowSize) {
-  pInterpoInfo->startTimestamp = startTimestamp;
-  pInterpoInfo->rowIdx = -1;
-  pInterpoInfo->numOfRawDataInRows = 0;
-  pInterpoInfo->numOfCurrentInterpo = 0;
-  pInterpoInfo->numOfTotalInterpo = 0;
-  pInterpoInfo->order = order;
-
-  pInterpoInfo->numOfTags = numOfGroupbyTags;
-  if (pInterpoInfo->pTags == NULL && numOfGroupbyTags > 0) {
-    pInterpoInfo->pTags = calloc(1, numOfGroupbyTags * POINTER_BYTES + rowSize);
-  }
-
-  // set the previous value to be null
-  tfree(pInterpoInfo->prevValues);
-}
-
-// the SInterpolationInfo itself will not be released
-void taosDestoryInterpoInfo(SInterpolationInfo *pInterpoInfo) {
-  if (pInterpoInfo == NULL) {
-    return;
-  }
-  
-  tfree(pInterpoInfo->prevValues);
-  tfree(pInterpoInfo->nextValues);
-  
-  tfree(pInterpoInfo->pTags);
-}
-
-void taosInterpoSetStartInfo(SInterpolationInfo* pInterpoInfo, int32_t numOfRawDataInRows, int32_t type) {
-  if (type == TSDB_INTERPO_NONE) {
-    return;
-  }
-
-  pInterpoInfo->rowIdx = 0;//INTERPOL_IS_ASC_INTERPOL(pInterpoInfo) ? 0 : numOfRawDataInRows - 1;
-  pInterpoInfo->numOfRawDataInRows = numOfRawDataInRows;
-}
-
-TSKEY taosGetRevisedEndKey(TSKEY ekey, int32_t order, int32_t timeInterval, int8_t intervalTimeUnit, int8_t precision) {
-  if (order == TSQL_SO_ASC) {
-    return ekey;
-  } else {
-    return taosGetIntervalStartTimestamp(ekey, timeInterval, intervalTimeUnit, precision);
-  }
-}
-
-int32_t taosGetNumOfResultWithInterpo(SInterpolationInfo* pInterpoInfo, TSKEY* pPrimaryKeyArray,
-                                      int32_t numOfRawDataInRows, int64_t nInterval, int64_t ekey,
-                                      int32_t maxNumOfRows) {
-  int32_t numOfRes = taosGetNumOfResWithoutLimit(pInterpoInfo, pPrimaryKeyArray, numOfRawDataInRows, nInterval, ekey);
-  return (numOfRes > maxNumOfRows) ? maxNumOfRows : numOfRes;
-}
-
-int32_t taosGetNumOfResWithoutLimit(SInterpolationInfo* pInterpoInfo, int64_t* pPrimaryKeyArray,
-                                    int32_t numOfAvailRawData, int64_t nInterval, int64_t ekey) {
-  if (numOfAvailRawData > 0) {
-    int32_t finalNumOfResult = 0;
-
-//    if (pInterpoInfo->order == TSQL_SO_ASC) {
-      // get last timestamp, calculate the result size
-      int64_t lastKey = pPrimaryKeyArray[pInterpoInfo->numOfRawDataInRows - 1];
-      finalNumOfResult = (int32_t)(labs(lastKey - pInterpoInfo->startTimestamp) / nInterval) + 1;
-//    } else {  // todo error less than one!!!
-//      TSKEY lastKey = pPrimaryKeyArray[0];
-//      finalNumOfResult = (int32_t)((pInterpoInfo->startTimestamp - lastKey) / nInterval) + 1;
-//    }
-
-    assert(finalNumOfResult >= numOfAvailRawData);
-    return finalNumOfResult;
-  } else {
-    /* reach the end of data */
-    if ((ekey < pInterpoInfo->startTimestamp && INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) ||
-        (ekey > pInterpoInfo->startTimestamp && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo))) {
-      return 0;
-    } else {
-      return (int32_t)(labs(ekey - pInterpoInfo->startTimestamp) / nInterval) + 1;
-    }
-  }
-}
-
-bool taosHasRemainsDataForInterpolation(SInterpolationInfo* pInterpoInfo) { return taosNumOfRemainPoints(pInterpoInfo) > 0; }
-
-int32_t taosNumOfRemainPoints(SInterpolationInfo* pInterpoInfo) {
-  if (pInterpoInfo->rowIdx == -1 || pInterpoInfo->numOfRawDataInRows == 0) {
-    return 0;
-  }
-
-  return INTERPOL_IS_ASC_INTERPOL(pInterpoInfo) ? (pInterpoInfo->numOfRawDataInRows - pInterpoInfo->rowIdx)
-                                                : pInterpoInfo->rowIdx + 1;
-}
-
-static double doLinearInterpolationImpl(double v1, double v2, double k1, double k2, double k) {
-  return v1 + (v2 - v1) * (k - k1) / (k2 - k1);
-}
-
-int taosDoLinearInterpolation(int32_t type, SPoint* point1, SPoint* point2, SPoint* point) {
-  switch (type) {
-    case TSDB_DATA_TYPE_INT: {
-      *(int32_t*)point->val = doLinearInterpolationImpl(*(int32_t*)point1->val, *(int32_t*)point2->val, point1->key,
-                                                        point2->key, point->key);
-      break;
-    }
-    case TSDB_DATA_TYPE_FLOAT: {
-      *(float*)point->val =
-          doLinearInterpolationImpl(*(float*)point1->val, *(float*)point2->val, point1->key, point2->key, point->key);
-      break;
-    };
-    case TSDB_DATA_TYPE_DOUBLE: {
-      *(double*)point->val =
-          doLinearInterpolationImpl(*(double*)point1->val, *(double*)point2->val, point1->key, point2->key, point->key);
-      break;
-    };
-    case TSDB_DATA_TYPE_TIMESTAMP:
-    case TSDB_DATA_TYPE_BIGINT: {
-      *(int64_t*)point->val = doLinearInterpolationImpl(*(int64_t*)point1->val, *(int64_t*)point2->val, point1->key,
-                                                        point2->key, point->key);
-      break;
-    };
-    case TSDB_DATA_TYPE_SMALLINT: {
-      *(int16_t*)point->val = doLinearInterpolationImpl(*(int16_t*)point1->val, *(int16_t*)point2->val, point1->key,
-                                                        point2->key, point->key);
-      break;
-    };
-    case TSDB_DATA_TYPE_TINYINT: {
-      *(int8_t*)point->val =
-          doLinearInterpolationImpl(*(int8_t*)point1->val, *(int8_t*)point2->val, point1->key, point2->key, point->key);
-      break;
-    };
-    default: {
-      // TODO: Deal with interpolation with bool and strings and timestamp
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-static char* getPos(char* data, int32_t bytes, int32_t order, int32_t capacity, int32_t index) {
-//  if (order == TSQL_SO_ASC) {
-    return data + index * bytes;
-//  } else {
-//    return data + (capacity - index - 1) * bytes;
-//  }
-}
-
-static void setTagsValueInInterpolation(tFilePage** data, char** pTags, tColModel* pModel, int32_t order, int32_t start,
-                                        int32_t capacity, int32_t num) {
-  for (int32_t j = 0, i = start; i < pModel->numOfCols; ++i, ++j) {
-    char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, order, capacity, num);
-    assignVal(val1, pTags[j], pModel->pFields[i].bytes, pModel->pFields[i].type);
-  }
-}
-
-static void doInterpoResultImpl(SInterpolationInfo* pInterpoInfo, int16_t interpoType, tFilePage** data,
-                                tColModel* pModel, int32_t* num, char** srcData, int64_t nInterval, int64_t* defaultVal,
-                                int64_t currentTimestamp, int32_t capacity, int32_t numOfTags, char** pTags,
-                                bool outOfBound) {
-  char** prevValues = &pInterpoInfo->prevValues;
-  char** nextValues = &pInterpoInfo->nextValues;
-
-  SPoint point1, point2, point;
-
-  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pInterpoInfo->order);
-
-  char* val = getPos(data[0]->data, TSDB_KEYSIZE, pInterpoInfo->order, capacity, *num);
-  *(TSKEY*)val = pInterpoInfo->startTimestamp;
-
-  int32_t numOfValCols = pModel->numOfCols - numOfTags;
-
-  // set the other values
-  if (interpoType == TSDB_INTERPO_PREV) {
-    char* pInterpolationData = INTERPOL_IS_ASC_INTERPOL(pInterpoInfo) ? *prevValues : *nextValues;
-    if (pInterpolationData != NULL) {
-      for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-
-        if (isNull(pInterpolationData + pModel->colOffset[i], pModel->pFields[i].type)) {
-          setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
-        } else {
-          assignVal(val1, pInterpolationData + pModel->colOffset[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
-        }
-      }
-    } else { /* no prev value yet, set the value for null */
-      for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-        setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
-      }
-    }
-
-    setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
-  } else if (interpoType == TSDB_INTERPO_LINEAR) {
-    // TODO : linear interpolation supports NULL value
-    if (*prevValues != NULL && !outOfBound) {
-      for (int32_t i = 1; i < numOfValCols; ++i) {
-        int32_t type = pModel->pFields[i].type;
-        char*   val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-
-        if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_BOOL) {
-          setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
-          continue;
-        }
-
-        point1 = (SPoint){.key = *(TSKEY*)(*prevValues), .val = *prevValues + pModel->colOffset[i]};
-        point2 = (SPoint){.key = currentTimestamp, .val = srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes};
-        point = (SPoint){.key = pInterpoInfo->startTimestamp, .val = val1};
-        taosDoLinearInterpolation(pModel->pFields[i].type, &point1, &point2, &point);
-      }
-
-      setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
-
-    } else {
-      for (int32_t i = 1; i < numOfValCols; ++i) {
-        char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-        setNull(val1, pModel->pFields[i].type, pModel->pFields[i].bytes);
-      }
-
-      setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
-    }
-  } else { /* default value interpolation */
-    for (int32_t i = 1; i < numOfValCols; ++i) {
-      char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, capacity, *num);
-      assignVal(val1, (char*)&defaultVal[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
-    }
-
-    setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, numOfValCols, capacity, *num);
-  }
-
-  pInterpoInfo->startTimestamp += (nInterval * step);
-  pInterpoInfo->numOfCurrentInterpo++;
-
-  (*num) += 1;
-}
-
-int32_t taosDoInterpoResult(SInterpolationInfo* pInterpoInfo, int16_t interpoType, tFilePage** data,
-                            int32_t numOfRawDataInRows, int32_t outputRows, int64_t nInterval,
-                            const int64_t* pPrimaryKeyArray, tColModel* pModel, char** srcData, int64_t* defaultVal,
-                            const int32_t* functionIDs, int32_t bufSize) {
-  int32_t num = 0;
-  pInterpoInfo->numOfCurrentInterpo = 0;
-
-  char** prevValues = &pInterpoInfo->prevValues;
-  char** nextValues = &pInterpoInfo->nextValues;
-
-  int32_t numOfTags = pInterpoInfo->numOfTags;
-  char**  pTags = pInterpoInfo->pTags;
-
-  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pInterpoInfo->order);
-
-  if (numOfRawDataInRows == 0) {
-    /*
-     * we need to rebuild whole data
-     * NOTE:we need to keep the last saved data, to satisfy the interpolation
-     */
-    while (num < outputRows) {
-      doInterpoResultImpl(pInterpoInfo, interpoType, data, pModel, &num, srcData, nInterval, defaultVal,
-                          pInterpoInfo->startTimestamp, bufSize, numOfTags, pTags, true);
-    }
-    pInterpoInfo->numOfTotalInterpo += pInterpoInfo->numOfCurrentInterpo;
-    return outputRows;
-
-  } else {
-    while (1) {
-      int64_t currentTimestamp = pPrimaryKeyArray[pInterpoInfo->rowIdx];
-
-      if ((pInterpoInfo->startTimestamp < currentTimestamp && INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) ||
-          (pInterpoInfo->startTimestamp > currentTimestamp && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo))) {
-        /* set the next value for interpolation */
-        if (*nextValues == NULL) {
-          *nextValues =
-              calloc(1, pModel->colOffset[pModel->numOfCols - 1] + pModel->pFields[pModel->numOfCols - 1].bytes);
-          for (int i = 1; i < pModel->numOfCols; i++) {
-            setNull(*nextValues + pModel->colOffset[i], pModel->pFields[i].type, pModel->pFields[i].bytes);
-          }
-        }
-
-        int32_t offset = pInterpoInfo->rowIdx;
-        for (int32_t tlen = 0, i = 0; i < pModel->numOfCols - numOfTags; ++i) {
-          memcpy(*nextValues + tlen, srcData[i] + offset * pModel->pFields[i].bytes, pModel->pFields[i].bytes);
-          tlen += pModel->pFields[i].bytes;
-        }
-      }
-
-      while (((pInterpoInfo->startTimestamp < currentTimestamp && INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) ||
-              (pInterpoInfo->startTimestamp > currentTimestamp && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo))) &&
-             num < outputRows) {
-        doInterpoResultImpl(pInterpoInfo, interpoType, data, pModel, &num, srcData, nInterval, defaultVal,
-                            currentTimestamp, bufSize, numOfTags, pTags, false);
-      }
-
-      /* output buffer is full, abort */
-      if ((num == outputRows && INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) ||
-          (num < 0 && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo))) {
-        pInterpoInfo->numOfTotalInterpo += pInterpoInfo->numOfCurrentInterpo;
-        return outputRows;
-      }
-
-      if (pInterpoInfo->startTimestamp == currentTimestamp) {
-        if (*prevValues == NULL) {
-          *prevValues =
-              calloc(1, pModel->colOffset[pModel->numOfCols - 1] + pModel->pFields[pModel->numOfCols - 1].bytes);
-          for (int i = 1; i < pModel->numOfCols; i++) {
-            setNull(*prevValues + pModel->colOffset[i], pModel->pFields[i].type, pModel->pFields[i].bytes);
-          }
-        }
-
-        // assign rows to dst buffer
-        int32_t i = 0;
-        for (int32_t tlen = 0; i < pModel->numOfCols - numOfTags; ++i) {
-          char* val1 = getPos(data[i]->data, pModel->pFields[i].bytes, pInterpoInfo->order, bufSize, num);
-
-          if (i == 0 ||
-              (functionIDs[i] != TSDB_FUNC_COUNT &&
-               !isNull(srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes, pModel->pFields[i].type)) ||
-              (functionIDs[i] == TSDB_FUNC_COUNT &&
-               *(int64_t*)(srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes) != 0)) {
-            assignVal(val1, srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes, pModel->pFields[i].bytes,
-                      pModel->pFields[i].type);
-            memcpy(*prevValues + tlen, srcData[i] + pInterpoInfo->rowIdx * pModel->pFields[i].bytes,
-                   pModel->pFields[i].bytes);
-          } else {  // i > 0 and isNULL, do interpolation
-            if (interpoType == TSDB_INTERPO_PREV) {
-              assignVal(val1, *prevValues + pModel->colOffset[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
-            } else if (interpoType == TSDB_INTERPO_LINEAR) {
-              // TODO:
-            } else {
-              assignVal(val1, (char*)&defaultVal[i], pModel->pFields[i].bytes, pModel->pFields[i].type);
-            }
-          }
-          tlen += pModel->pFields[i].bytes;
-        }
-
-        /* set the tag value for final result */
-        setTagsValueInInterpolation(data, pTags, pModel, pInterpoInfo->order, pModel->numOfCols - numOfTags, bufSize,
-                                    num);
-      }
-
-      pInterpoInfo->startTimestamp += (nInterval * step);
-      pInterpoInfo->rowIdx += 1;
-      num += 1;
-
-      if ((pInterpoInfo->rowIdx >= pInterpoInfo->numOfRawDataInRows && INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) ||
-          (pInterpoInfo->rowIdx < 0 && !INTERPOL_IS_ASC_INTERPOL(pInterpoInfo)) || num >= outputRows) {
-        if (pInterpoInfo->rowIdx >= pInterpoInfo->numOfRawDataInRows || pInterpoInfo->rowIdx < 0) {
-          pInterpoInfo->rowIdx = -1;
-          pInterpoInfo->numOfRawDataInRows = 0;
-
-          /* the raw data block is exhausted, next value does not exists */
-          tfree(*nextValues);
-        }
-
-        pInterpoInfo->numOfTotalInterpo += pInterpoInfo->numOfCurrentInterpo;
-        return num;
-      }
-    }
-  }
-}
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
new file mode 100644
index 0000000000000000000000000000000000000000..6ba1d87d92ecf216bfde346f9d3ff1563515d34d
--- /dev/null
+++ b/src/util/src/tkvstore.c
@@ -0,0 +1,628 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+
+#define TAOS_RANDOM_FILE_FAIL_TEST
+
+#include "os.h"
+#include "hash.h"
+#include "taoserror.h"
+#include "tchecksum.h"
+#include "tcoding.h"
+#include "tkvstore.h"
+#include "tulog.h"
+
+#define TD_KVSTORE_HEADER_SIZE 512
+#define TD_KVSTORE_MAJOR_VERSION 1
+#define TD_KVSTORE_MAINOR_VERSION 0
+#define TD_KVSTORE_SNAP_SUFFIX ".snap"
+#define TD_KVSTORE_NEW_SUFFIX ".new"
+#define TD_KVSTORE_INIT_MAGIC 0xFFFFFFFF
+
+typedef struct {
+  uint64_t uid;
+  int64_t  offset;
+  int64_t  size;
+} SKVRecord;
+
+static int       tdInitKVStoreHeader(int fd, char *fname);
+static int       tdEncodeStoreInfo(void **buf, SStoreInfo *pInfo);
+static void *    tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo);
+static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH);
+static char *    tdGetKVStoreSnapshotFname(char *fdata);
+static char *    tdGetKVStoreNewFname(char *fdata);
+static void      tdFreeKVStore(SKVStore *pStore);
+static int       tdUpdateKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo);
+static int       tdLoadKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo, uint32_t *version);
+static int       tdEncodeKVRecord(void **buf, SKVRecord *pRecord);
+static void *    tdDecodeKVRecord(void *buf, SKVRecord *pRecord);
+static int       tdRestoreKVStore(SKVStore *pStore);
+
+int tdCreateKVStore(char *fname) {
+  int fd = open(fname, O_RDWR | O_CREAT, 0755);
+  if (fd < 0) {
+    uError("failed to open file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (tdInitKVStoreHeader(fd, fname) < 0) goto _err;
+
+  if (fsync(fd) < 0) {
+    uError("failed to fsync file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (close(fd) < 0) {
+    uError("failed to close file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  return 0;
+
+_err:
+  if (fd >= 0) close(fd);
+  (void)remove(fname);
+  return -1;
+}
+
+int tdDestroyKVStore(char *fname) {
+  if (remove(fname) < 0) {
+    uError("failed to remove file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  return 0;
+}
+
+SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH) {
+  SStoreInfo info = {0};
+  uint32_t   version = 0;
+
+  SKVStore *pStore = tdNewKVStore(fname, iFunc, aFunc, appH);
+  if (pStore == NULL) return NULL;
+
+  pStore->fd = open(pStore->fname, O_RDWR);
+  if (pStore->fd < 0) {
+    uError("failed to open file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  pStore->sfd = open(pStore->fsnap, O_RDONLY);
+  if (pStore->sfd < 0) {
+    if (errno != ENOENT) {
+      uError("failed to open file %s since %s", pStore->fsnap, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+  } else {
+    uDebug("file %s exists, try to recover the KV store", pStore->fsnap);
+    if (tdLoadKVStoreHeader(pStore->sfd, pStore->fsnap, &info, &version) < 0) {
+      if (terrno != TSDB_CODE_COM_FILE_CORRUPTED) goto _err;
+    } else {
+      if (version != KVSTORE_FILE_VERSION) {
+        uError("file %s version %u is not the same as program version %u, this may cause problem", pStore->fsnap,
+               version, KVSTORE_FILE_VERSION);
+      }
+
+      if (taosFtruncate(pStore->fd, info.size) < 0) {
+        uError("failed to truncate %s to %" PRId64 " size since %s", pStore->fname, info.size, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        goto _err;
+      }
+
+      if (tdUpdateKVStoreHeader(pStore->fd, pStore->fname, &info) < 0) goto _err;
+      if (fsync(pStore->fd) < 0) {
+        uError("failed to fsync file %s since %s", pStore->fname, strerror(errno));
+        goto _err;
+      }
+    }
+
+    close(pStore->sfd);
+    pStore->sfd = -1;
+    (void)remove(pStore->fsnap);
+  }
+
+  if (tdLoadKVStoreHeader(pStore->fd, pStore->fname, &info, &version) < 0) goto _err;
+  if (version != KVSTORE_FILE_VERSION) {
+    uError("file %s version %u is not the same as program version %u, this may cause problem", pStore->fname, version,
+           KVSTORE_FILE_VERSION);
+  }
+
+  pStore->info.size = TD_KVSTORE_HEADER_SIZE;
+  pStore->info.magic = info.magic;
+
+  if (tdRestoreKVStore(pStore) < 0) goto _err;
+
+  close(pStore->fd);
+  pStore->fd = -1;
+
+  return pStore;
+
+_err:
+  if (pStore->fd > 0) {
+    close(pStore->fd);
+    pStore->fd = -1;
+  }
+  if (pStore->sfd > 0) {
+    close(pStore->sfd);
+    pStore->sfd = -1;
+  }
+  tdFreeKVStore(pStore);
+  return NULL;
+}
+
+void tdCloseKVStore(SKVStore *pStore) { tdFreeKVStore(pStore); }
+
+int tdKVStoreStartCommit(SKVStore *pStore) {
+  ASSERT(pStore->fd < 0);
+
+  pStore->fd = open(pStore->fname, O_RDWR);
+  if (pStore->fd < 0) {
+    uError("failed to open file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  pStore->sfd = open(pStore->fsnap, O_WRONLY | O_CREAT, 0755);
+  if (pStore->sfd < 0) {
+    uError("failed to open file %s since %s", pStore->fsnap, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (taosTSendFile(pStore->sfd, pStore->fd, NULL, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) {
+    uError("failed to send file %d bytes since %s", TD_KVSTORE_HEADER_SIZE, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (fsync(pStore->sfd) < 0) {
+    uError("failed to fsync file %s since %s", pStore->fsnap, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (close(pStore->sfd) < 0) {
+    uError("failed to close file %s since %s", pStore->fsnap, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+  pStore->sfd = -1;
+
+  if (lseek(pStore->fd, 0, SEEK_END) < 0) {
+    uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  ASSERT(pStore->info.size == lseek(pStore->fd, 0, SEEK_CUR));
+
+  return 0;
+
+_err:
+  if (pStore->sfd > 0) {
+    close(pStore->sfd);
+    pStore->sfd = -1;
+    (void)remove(pStore->fsnap);
+  }
+  if (pStore->fd > 0) {
+    close(pStore->fd);
+    pStore->fd = -1;
+  }
+  return -1;
+}
+
+int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLen) {
+  SKVRecord rInfo = {0};
+  char      buf[64] = "\0";
+  char *    pBuf = buf;
+
+  rInfo.offset = lseek(pStore->fd, 0, SEEK_CUR);
+  if (rInfo.offset < 0) {
+    uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+    return -1;
+  }
+
+  rInfo.uid = uid;
+  rInfo.size = contLen;
+
+  int tlen = tdEncodeKVRecord((void *)(&pBuf), &rInfo);
+  ASSERT(tlen == POINTER_DISTANCE(pBuf, buf));
+  ASSERT(tlen == sizeof(SKVRecord));
+
+  if (taosTWrite(pStore->fd, buf, tlen) < tlen) {
+    uError("failed to write %d bytes to file %s since %s", tlen, pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosTWrite(pStore->fd, cont, contLen) < contLen) {
+    uError("failed to write %d bytes to file %s since %s", contLen, pStore->fname, strerror(errno));
+    return -1;
+  }
+
+  pStore->info.magic =
+      taosCalcChecksum(pStore->info.magic, (uint8_t *)POINTER_SHIFT(cont, contLen - sizeof(TSCKSUM)), sizeof(TSCKSUM));
+  pStore->info.size += (sizeof(SKVRecord) + contLen);
+  SKVRecord *pRecord = taosHashGet(pStore->map, (void *)&uid, sizeof(uid));
+  if (pRecord != NULL) {  // just to insert
+    pStore->info.tombSize += pRecord->size;
+  } else {
+    pStore->info.nRecords++;
+  }
+
+  taosHashPut(pStore->map, (void *)(&uid), sizeof(uid), (void *)(&rInfo), sizeof(rInfo));
+  uTrace("put uid %" PRIu64 " into kvStore %s", uid, pStore->fname);
+
+  return 0;
+}
+
+int tdDropKVStoreRecord(SKVStore *pStore, uint64_t uid) {
+  SKVRecord rInfo = {0};
+  char      buf[128] = "\0";
+
+  SKVRecord *pRecord = taosHashGet(pStore->map, (void *)(&uid), sizeof(uid));
+  if (pRecord == NULL) {
+    uError("failed to drop KV store record with key %" PRIu64 " since not find", uid);
+    return -1;
+  }
+
+  rInfo.offset = -pRecord->offset;
+  rInfo.uid = pRecord->uid;
+  rInfo.size = pRecord->size;
+
+  void *pBuf = buf;
+  tdEncodeKVRecord(&pBuf, &rInfo);
+
+  if (taosTWrite(pStore->fd, buf, POINTER_DISTANCE(pBuf, buf)) < POINTER_DISTANCE(pBuf, buf)) {
+    uError("failed to write %" PRId64 " bytes to file %s since %s", (int64_t)(POINTER_DISTANCE(pBuf, buf)), pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  pStore->info.magic = taosCalcChecksum(pStore->info.magic, (uint8_t *)buf, (uint32_t)POINTER_DISTANCE(pBuf, buf));
+  pStore->info.size += POINTER_DISTANCE(pBuf, buf);
+  pStore->info.nDels++;
+  pStore->info.nRecords--;
+  pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) * 2);
+
+  taosHashRemove(pStore->map, (void *)(&uid), sizeof(uid));
+  uDebug("drop uid %" PRIu64 " from KV store %s", uid, pStore->fname);
+
+  return 0;
+}
+
+int tdKVStoreEndCommit(SKVStore *pStore) {
+  ASSERT(pStore->fd > 0);
+
+  if (tdUpdateKVStoreHeader(pStore->fd, pStore->fname, &(pStore->info)) < 0) return -1;
+
+  if (fsync(pStore->fd) < 0) {
+    uError("failed to fsync file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (close(pStore->fd) < 0) {
+    uError("failed to close file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+  pStore->fd = -1;
+
+  (void)remove(pStore->fsnap);
+  return 0;
+}
+
+void tsdbGetStoreInfo(char *fname, uint32_t *magic, int64_t *size) {
+  char       buf[TD_KVSTORE_HEADER_SIZE] = "\0";
+  SStoreInfo info = {0};
+
+  int fd = open(fname, O_RDONLY);
+  if (fd < 0) goto _err;
+
+  if (taosTRead(fd, buf, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) goto _err;
+  if (!taosCheckChecksumWhole((uint8_t *)buf, TD_KVSTORE_HEADER_SIZE)) goto _err;
+
+  void *pBuf = (void *)buf;
+  pBuf = tdDecodeStoreInfo(pBuf, &info);
+  off_t offset = lseek(fd, 0, SEEK_END);
+  if (offset < 0) goto _err;
+  close(fd);
+
+  *magic = info.magic;
+  *size = offset;
+
+  return;
+
+_err:
+  if (fd >= 0) close(fd);
+  *magic = TD_KVSTORE_INIT_MAGIC;
+  *size = 0;
+}
+
+static int tdLoadKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo, uint32_t *version) {
+  char buf[TD_KVSTORE_HEADER_SIZE] = "\0";
+
+  if (lseek(fd, 0, SEEK_SET) < 0) {
+    uError("failed to lseek file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosTRead(fd, buf, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) {
+    uError("failed to read %d bytes from file %s since %s", TD_KVSTORE_HEADER_SIZE, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (!taosCheckChecksumWhole((uint8_t *)buf, TD_KVSTORE_HEADER_SIZE)) {
+    uError("file %s is broken", fname);
+    terrno = TSDB_CODE_COM_FILE_CORRUPTED;
+    return -1;
+  }
+
+  void *pBuf = (void *)buf;
+  pBuf = tdDecodeStoreInfo(pBuf, pInfo);
+  pBuf = taosDecodeFixedU32(pBuf, version);
+
+  return 0;
+}
+
+static int tdUpdateKVStoreHeader(int fd, char *fname, SStoreInfo *pInfo) {
+  char buf[TD_KVSTORE_HEADER_SIZE] = "\0";
+
+  if (lseek(fd, 0, SEEK_SET) < 0) {
+    uError("failed to lseek file %s since %s", fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  void *pBuf = buf;
+  tdEncodeStoreInfo(&pBuf, pInfo);
+  taosEncodeFixedU32(&pBuf, KVSTORE_FILE_VERSION);
+  ASSERT(POINTER_DISTANCE(pBuf, buf) + sizeof(TSCKSUM) <= TD_KVSTORE_HEADER_SIZE);
+
+  taosCalcChecksumAppend(0, (uint8_t *)buf, TD_KVSTORE_HEADER_SIZE);
+  if (taosTWrite(fd, buf, TD_KVSTORE_HEADER_SIZE) < TD_KVSTORE_HEADER_SIZE) {
+    uError("failed to write %d bytes to file %s since %s", TD_KVSTORE_HEADER_SIZE, fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  return 0;
+}
+
+static int tdInitKVStoreHeader(int fd, char *fname) {
+  SStoreInfo info = {TD_KVSTORE_HEADER_SIZE, 0, 0, 0, TD_KVSTORE_INIT_MAGIC};
+
+  return tdUpdateKVStoreHeader(fd, fname, &info);
+}
+
+static int tdEncodeStoreInfo(void **buf, SStoreInfo *pInfo) {
+  int tlen = 0;
+  tlen += taosEncodeVariantI64(buf, pInfo->size);
+  tlen += taosEncodeVariantI64(buf, pInfo->tombSize);
+  tlen += taosEncodeVariantI64(buf, pInfo->nRecords);
+  tlen += taosEncodeVariantI64(buf, pInfo->nDels);
+  tlen += taosEncodeFixedU32(buf, pInfo->magic);
+
+  return tlen;
+}
+
+static void *tdDecodeStoreInfo(void *buf, SStoreInfo *pInfo) {
+  buf = taosDecodeVariantI64(buf, &(pInfo->size));
+  buf = taosDecodeVariantI64(buf, &(pInfo->tombSize));
+  buf = taosDecodeVariantI64(buf, &(pInfo->nRecords));
+  buf = taosDecodeVariantI64(buf, &(pInfo->nDels));
+  buf = taosDecodeFixedU32(buf, &(pInfo->magic));
+
+  return buf;
+}
+
+static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH) {
+  SKVStore *pStore = (SKVStore *)calloc(1, sizeof(SKVStore));
+  if (pStore == NULL) goto _err;
+
+  pStore->fname = strdup(fname);
+  if (pStore->fname == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  pStore->fsnap = tdGetKVStoreSnapshotFname(fname);
+  if (pStore->fsnap == NULL) {
+    goto _err;
+  }
+
+  pStore->fnew = tdGetKVStoreNewFname(fname);
+  if (pStore->fnew == NULL) goto _err;
+
+  pStore->fd = -1;
+  pStore->sfd = -1;
+  pStore->nfd = -1;
+  pStore->iFunc = iFunc;
+  pStore->aFunc = aFunc;
+  pStore->appH = appH;
+  pStore->map = taosHashInit(4096, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);
+  if (pStore->map == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  return pStore;
+
+_err:
+  tdFreeKVStore(pStore);
+  return NULL;
+}
+
+static void tdFreeKVStore(SKVStore *pStore) {
+  if (pStore) {
+    taosTFree(pStore->fname);
+    taosTFree(pStore->fsnap);
+    taosTFree(pStore->fnew);
+    taosHashCleanup(pStore->map);
+    free(pStore);
+  }
+}
+
+static char *tdGetKVStoreSnapshotFname(char *fdata) {
+  size_t size = strlen(fdata) + strlen(TD_KVSTORE_SNAP_SUFFIX) + 1;
+  char * fname = malloc(size);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    return NULL;
+  }
+  sprintf(fname, "%s%s", fdata, TD_KVSTORE_SNAP_SUFFIX);
+  return fname;
+}
+
+static char *tdGetKVStoreNewFname(char *fdata) {
+  size_t size = strlen(fdata) + strlen(TD_KVSTORE_NEW_SUFFIX) + 1;
+  char * fname = malloc(size);
+  if (fname == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    return NULL;
+  }
+  sprintf(fname, "%s%s", fdata, TD_KVSTORE_NEW_SUFFIX);
+  return fname;
+}
+
+static int tdEncodeKVRecord(void **buf, SKVRecord *pRecord) {
+  int tlen = 0;
+  tlen += taosEncodeFixedU64(buf, pRecord->uid);
+  tlen += taosEncodeFixedI64(buf, pRecord->offset);
+  tlen += taosEncodeFixedI64(buf, pRecord->size);
+
+  return tlen;
+}
+
+static void *tdDecodeKVRecord(void *buf, SKVRecord *pRecord) {
+  buf = taosDecodeFixedU64(buf, &(pRecord->uid));
+  buf = taosDecodeFixedI64(buf, &(pRecord->offset));
+  buf = taosDecodeFixedI64(buf, &(pRecord->size));
+
+  return buf;
+}
+
+static int tdRestoreKVStore(SKVStore *pStore) {
+  char                  tbuf[128] = "\0";
+  void *                buf = NULL;
+  int64_t               maxBufSize = 0;
+  SKVRecord             rInfo = {0};
+  SHashMutableIterator *pIter = NULL;
+
+  ASSERT(TD_KVSTORE_HEADER_SIZE == lseek(pStore->fd, 0, SEEK_CUR));
+  ASSERT(pStore->info.size == TD_KVSTORE_HEADER_SIZE);
+
+  while (true) {
+    ssize_t tsize = taosTRead(pStore->fd, tbuf, sizeof(SKVRecord));
+    if (tsize == 0) break;
+    if (tsize < sizeof(SKVRecord)) {
+      uError("failed to read %" PRIzu " bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord), pStore->fname,
+             pStore->info.size, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    char *pBuf = tdDecodeKVRecord(tbuf, &rInfo);
+    ASSERT(POINTER_DISTANCE(pBuf, tbuf) == sizeof(SKVRecord));
+    ASSERT((rInfo.offset > 0) ? (pStore->info.size == rInfo.offset) : true);
+
+    if (rInfo.offset < 0) {
+      taosHashRemove(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid));
+      pStore->info.size += sizeof(SKVRecord);
+      pStore->info.nRecords--;
+      pStore->info.nDels++;
+      pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) * 2);
+    } else {
+      ASSERT(rInfo.offset > 0 && rInfo.size > 0);
+      if (taosHashPut(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid), &rInfo, sizeof(rInfo)) < 0) {
+        uError("failed to put record in KV store %s", pStore->fname);
+        terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+        goto _err;
+      }
+
+      maxBufSize = MAX(maxBufSize, rInfo.size);
+
+      if (lseek(pStore->fd, (off_t)rInfo.size, SEEK_CUR) < 0) {
+        uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+        goto _err;
+      }
+
+      pStore->info.size += (sizeof(SKVRecord) + rInfo.size);
+      pStore->info.nRecords++;
+    }
+  }
+
+  buf = malloc((size_t)maxBufSize);
+  if (buf == NULL) {
+    uError("failed to allocate %" PRId64 " bytes in KV store %s", maxBufSize, pStore->fname);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  pIter = taosHashCreateIter(pStore->map);
+  if (pIter == NULL) {
+    uError("failed to create hash iter while opening KV store %s", pStore->fname);
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  while (taosHashIterNext(pIter)) {
+    SKVRecord *pRecord = taosHashIterGet(pIter);
+
+    if (lseek(pStore->fd, (off_t)(pRecord->offset + sizeof(SKVRecord)), SEEK_SET) < 0) {
+      uError("failed to lseek file %s since %s, offset %" PRId64, pStore->fname, strerror(errno), pRecord->offset);
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    if (taosTRead(pStore->fd, buf, (size_t)pRecord->size) < pRecord->size) {
+      uError("failed to read %" PRId64 " bytes from file %s since %s, offset %" PRId64, pRecord->size, pStore->fname,
+             strerror(errno), pRecord->offset);
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      goto _err;
+    }
+
+    if (pStore->iFunc) {
+      if ((*pStore->iFunc)(pStore->appH, buf, (int)pRecord->size) < 0) {
+        uError("failed to restore record uid %" PRIu64 " in kv store %s at offset %" PRId64 " size %" PRId64
+               " since %s",
+               pRecord->uid, pStore->fname, pRecord->offset, pRecord->size, tstrerror(terrno));
+        goto _err;
+      }
+    }
+  }
+
+  if (pStore->aFunc) (*pStore->aFunc)(pStore->appH);
+
+  taosHashDestroyIter(pIter);
+  taosTFree(buf);
+  return 0;
+
+_err:
+  taosHashDestroyIter(pIter);
+  taosTFree(buf);
+  return -1;
+}
diff --git a/src/util/src/tlist.c b/src/util/src/tlist.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c2ad83de117aaf528565a711a2aa3732984e0a9
--- /dev/null
+++ b/src/util/src/tlist.c
@@ -0,0 +1,198 @@
+/*
+ * 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 <stdlib.h>
+#include <string.h>
+
+#include "tlist.h"
+
+SList *tdListNew(int eleSize) {
+  SList *list = (SList *)malloc(sizeof(SList));
+  if (list == NULL) return NULL;
+
+  list->eleSize = eleSize;
+  list->numOfEles = 0;
+  list->head = list->tail = NULL;
+  return list;
+}
+
+void tdListEmpty(SList *list) {
+  SListNode *node = list->head;
+  while (node) {
+    list->head = node->next;
+    free(node);
+    node = list->head;
+  }
+  list->head = list->tail = 0;
+  list->numOfEles = 0;
+}
+
+void tdListFree(SList *list) {
+  if (list) {
+    tdListEmpty(list);
+    free(list);
+  }
+}
+
+void tdListPrependNode(SList *list, SListNode *node) {
+  if (list->head == NULL) {
+    list->head = node;
+    list->tail = node;
+  } else {
+    node->next = list->head;
+    node->prev = NULL;
+    list->head->prev = node;
+    list->head = node;
+  }
+  list->numOfEles++;
+}
+
+void tdListAppendNode(SList *list, SListNode *node) {
+  if (list->head == NULL) {
+    list->head = node;
+    list->tail = node;
+  } else {
+    node->prev = list->tail;
+    node->next = NULL;
+    list->tail->next = node;
+    list->tail = node;
+  }
+
+  list->numOfEles++;
+}
+
+int tdListPrepend(SList *list, void *data) {
+  SListNode *node = (SListNode *)malloc(sizeof(SListNode) + list->eleSize);
+  if (node == NULL) return -1;
+
+  node->next = node->prev = NULL;
+  memcpy((void *)(node->data), data, list->eleSize);
+  tdListPrependNode(list, node);
+
+  return 0;
+}
+
+int tdListAppend(SList *list, void *data) {
+  SListNode *node = (SListNode *)calloc(1, sizeof(SListNode) + list->eleSize);
+  if (node == NULL) return -1;
+
+  memcpy((void *)(node->data), data, list->eleSize);
+  tdListAppendNode(list, node);
+
+  return 0;
+}
+
+SListNode *tdListPopHead(SList *list) {
+  if (list->head == NULL) return NULL;
+  SListNode *node = list->head;
+  if (node->next == NULL) {
+    list->head = NULL;
+    list->tail = NULL;
+  } else {
+    list->head = node->next;
+  }
+  list->numOfEles--;
+  node->next = NULL;
+  node->prev = NULL;
+  return node;
+}
+
+SListNode *tdListPopTail(SList *list) {
+  if (list->tail == NULL) return NULL;
+  SListNode *node = list->tail;
+  if (node->prev == NULL) {
+    list->head = NULL;
+    list->tail = NULL;
+  } else {
+    list->tail = node->prev;
+  }
+  list->numOfEles--;
+  node->next = node->prev = NULL;
+  return node;
+}
+
+SListNode *tdListGetHead(SList *list) {
+  if (list == NULL || list->numOfEles == 0) {
+    return NULL;
+  }
+
+  return list->head;
+}
+
+SListNode *tsListGetTail(SList *list) {
+  if (list == NULL || list->numOfEles == 0) {
+    return NULL;
+  }
+
+  return list->tail;
+}
+
+SListNode *tdListPopNode(SList *list, SListNode *node) {
+  if (list->head == node) {
+    list->head = node->next;
+  }
+  if (list->tail == node) {
+    list->tail = node->prev;
+  }
+
+  if (node->prev != NULL) {
+    node->prev->next = node->next;
+  }
+  if (node->next != NULL) {
+    node->next->prev = node->prev;
+  }
+  list->numOfEles--;
+  node->next = node->prev = NULL;
+
+  return node;
+}
+
+// Move all node elements from src to dst, the dst is assumed as an empty list
+void tdListMove(SList *src, SList *dst) {
+  // assert(dst->eleSize == src->eleSize);
+  SListNode *node = NULL;
+  while ((node = tdListPopHead(src)) != NULL) {
+    tdListAppendNode(dst, node);
+  }
+}
+
+void tdListDiscard(SList *list) {
+  if (list) {
+    list->head = list->tail = NULL;
+    list->numOfEles = 0;
+  }
+}
+
+void tdListNodeGetData(SList *list, SListNode *node, void *target) { memcpy(target, node->data, list->eleSize); }
+
+void tdListInitIter(SList *list, SListIter *pIter, TD_LIST_DIRECTION_T direction) {
+  pIter->direction = direction;
+  if (direction == TD_LIST_FORWARD) {
+    pIter->next = list->head;
+  } else {
+    pIter->next = list->tail;
+  }
+}
+
+SListNode *tdListNext(SListIter *pIter) {
+  SListNode *node = pIter->next;
+  if (node == NULL) return NULL;
+  if (pIter->direction == TD_LIST_FORWARD) {
+    pIter->next = node->next;
+  } else {
+    pIter->next = node->prev;
+  }
+
+  return node;
+}
\ No newline at end of file
diff --git a/src/util/src/tlockfree.c b/src/util/src/tlockfree.c
new file mode 100644
index 0000000000000000000000000000000000000000..3161518a3642632486a1a746e4cebb30f2e81b72
--- /dev/null
+++ b/src/util/src/tlockfree.c
@@ -0,0 +1,79 @@
+/*
+ * 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/>.
+ */
+// #define _GNU_SOURCE
+// #include <pthread.h>
+
+#include "tlockfree.h"
+
+#define TD_RWLATCH_WRITE_FLAG 0x40000000
+
+void taosInitRWLatch(SRWLatch *pLatch) { *pLatch = 0; }
+
+void taosWLockLatch(SRWLatch *pLatch) {
+  SRWLatch oLatch, nLatch;
+  int      nLoops = 0;
+
+  // Set write flag
+  while (1) {
+    oLatch = atomic_load_32(pLatch);
+    if (oLatch & TD_RWLATCH_WRITE_FLAG) {
+      nLoops++;
+      if (nLoops > 1000) {
+        sched_yield();
+        nLoops = 0;
+      }
+      continue;
+    }
+
+    nLatch = oLatch | TD_RWLATCH_WRITE_FLAG;
+    if (atomic_val_compare_exchange_32(pLatch, oLatch, nLatch) == oLatch) break;
+  }
+
+  // wait for all reads end
+  nLoops = 0;
+  while (1) {
+    oLatch = atomic_load_32(pLatch);
+    if (oLatch == TD_RWLATCH_WRITE_FLAG) break;
+    nLoops++;
+    if (nLoops > 1000) {
+      sched_yield();
+      nLoops = 0;
+    }
+  }
+}
+
+void taosWUnLockLatch(SRWLatch *pLatch) { atomic_store_32(pLatch, 0); }
+
+void taosRLockLatch(SRWLatch *pLatch) {
+  SRWLatch oLatch, nLatch;
+  int      nLoops = 0;
+
+  while (1) {
+    oLatch = atomic_load_32(pLatch);
+    if (oLatch & TD_RWLATCH_WRITE_FLAG) {
+      nLoops++;
+      if (nLoops > 1000) {
+        sched_yield();
+        nLoops = 0;
+      }
+      continue;
+    }
+
+    nLatch = oLatch + 1;
+    if (atomic_val_compare_exchange_32(pLatch, oLatch, nLatch) == oLatch) break;
+  }
+}
+
+void taosRUnLockLatch(SRWLatch *pLatch) { atomic_fetch_sub_32(pLatch, 1); }
\ No newline at end of file
diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c
index 21818e572f3fc49a2841c2f494362e2a7103f9f0..09b0933fd6e32e9b65c8c7acbb81fbfe7d5c005b 100644
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@@ -13,7 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "os.h"
+#include "tulog.h"
 #include "tlog.h"
 #include "tutil.h"
 
@@ -25,100 +27,101 @@
 #define MAX_LOGLINE_DUMP_CONTENT_SIZE (MAX_LOGLINE_DUMP_SIZE - 100)
 
 #define LOG_FILE_NAME_LEN          300
-#define TSDB_DEFAULT_LOG_BUF_SIZE (512 * 1024)   // 512K
+#define TSDB_DEFAULT_LOG_BUF_SIZE (512 * 1024)  // 512K
 #define TSDB_MIN_LOG_BUF_SIZE      1024         // 1K
 #define TSDB_MAX_LOG_BUF_SIZE     (1024 * 1024) // 1M
 #define TSDB_DEFAULT_LOG_BUF_UNIT  1024         // 1K
 
+#define LOG_BUF_BUFFER(x) ((x)->buffer)
+#define LOG_BUF_START(x)  ((x)->buffStart)
+#define LOG_BUF_END(x)    ((x)->buffEnd)
+#define LOG_BUF_SIZE(x)   ((x)->buffSize)
+#define LOG_BUF_MUTEX(x)  ((x)->buffMutex)
+
 typedef struct {
   char *          buffer;
-  int             buffStart;
-  int             buffEnd;
-  int             buffSize;
-  int             fd;
-  int             stop;
+  int32_t         buffStart;
+  int32_t         buffEnd;
+  int32_t         buffSize;
+  int32_t         fd;
+  int32_t         stop;
   pthread_t       asyncThread;
   pthread_mutex_t buffMutex;
-  tsem_t           buffNotEmpty;
+  tsem_t          buffNotEmpty;
 } SLogBuff;
 
-uint32_t uDebugFlag = 131;  // all the messages
-short tsAsyncLog = 1;
-
-static pid_t       logPid = 0;
-static SLogBuff *logHandle = NULL;
-static int       taosLogFileNum = 1;
-static int       taosLogMaxLines = 0;
-static int       taosLogLines = 0;
-static char      taosLogName[LOG_FILE_NAME_LEN];
-static int       taosLogFlag = 0;
-// static int  logFd = -1;
-static int             openInProgress = 0;
-static pthread_mutex_t logMutex;
-void (*taosLogFp)(int level, const char *const format, ...) = NULL;
-void (*taosLogSqlFp)(char *sql) = NULL;
-void (*taosLogAcctFp)(char *acctId, int64_t currentPointsPerSecond, int64_t maxPointsPerSecond, int64_t totalTimeSeries,
-                      int64_t maxTimeSeries, int64_t totalStorage, int64_t maxStorage, int64_t totalQueryTime,
-                      int64_t maxQueryTime, int64_t totalInbound, int64_t maxInbound, int64_t totalOutbound,
-                      int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs, int64_t totalUsers, int64_t maxUsers,
-                      int64_t totalStreams, int64_t maxStreams, int64_t totalConns, int64_t maxConns,
-                      int8_t accessState) = NULL;
-void *taosAsyncOutputLog(void *param);
-int taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int msgLen);
-SLogBuff *taosLogBuffNew(int bufSize);
-void taosLogBuffDestroy(SLogBuff *tLogBuff);
-
-int taosStartLog() {
-  pthread_attr_t threadAttr;
+typedef struct {
+  int32_t fileNum;
+  int32_t maxLines;
+  int32_t lines;
+  int32_t flag;
+  int32_t openInProgress;
+  pid_t   pid;
+  char    logName[LOG_FILE_NAME_LEN];
+  SLogBuff *      logHandle;
+  pthread_mutex_t logMutex;
+} SLogObj;
+
+int32_t tsLogKeepDays = 0;
+int32_t tsAsyncLog = 1;
+float   tsTotalLogDirGB = 0;
+float   tsAvailLogDirGB = 0;
+float   tsMinimalLogDirGB = 0.1f;
+#ifdef _TD_POWER_
+char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/power";
+#else
+char    tsLogDir[TSDB_FILENAME_LEN] = "/var/log/taos";
+#endif
 
-  pthread_attr_init(&threadAttr);
+static SLogObj   tsLogObj = { .fileNum = 1 };
+static void *    taosAsyncOutputLog(void *param);
+static int32_t   taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int32_t msgLen);
+static SLogBuff *taosLogBuffNew(int32_t bufSize);
+static void      taosCloseLogByFd(int32_t oldFd);
+static int32_t   taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum);
+extern void      taosPrintGlobalCfg();
 
-  if (pthread_create(&(logHandle->asyncThread), &threadAttr, taosAsyncOutputLog, logHandle) != 0) {
+static int32_t taosStartLog() {
+  pthread_attr_t threadAttr;
+  pthread_attr_init(&threadAttr);
+  if (pthread_create(&(tsLogObj.logHandle->asyncThread), &threadAttr, taosAsyncOutputLog, tsLogObj.logHandle) != 0) {
     return -1;
   }
-
   pthread_attr_destroy(&threadAttr);
-
   return 0;
 }
 
-int taosInitLog(char *logName, int numOfLogLines, int maxFiles) {
-
-#ifdef LINUX
-  logPid = (pid_t)syscall(SYS_gettid);
-#endif
-
-  logHandle = taosLogBuffNew(TSDB_DEFAULT_LOG_BUF_SIZE);
-  if (logHandle == NULL) return -1;
-
-  if (taosOpenLogFileWithMaxLines(logName, numOfLogLines, maxFiles) < 0) return -1;
-
+int32_t taosInitLog(char *logName, int numOfLogLines, int maxFiles) {
+  tsLogObj.logHandle = taosLogBuffNew(TSDB_DEFAULT_LOG_BUF_SIZE);
+  if (tsLogObj.logHandle == NULL) return -1;
+  if (taosOpenLogFile(logName, numOfLogLines, maxFiles) < 0) return -1;
   if (taosStartLog() < 0) return -1;
   return 0;
 }
 
-void taosStopLog() {
-  if (logHandle) logHandle->stop = 1;
+static void taosStopLog() {
+  if (tsLogObj.logHandle) {
+    tsLogObj.logHandle->stop = 1;
+  }
 }
 
-void taosCloseLogger() {
+void taosCloseLog() {
   taosStopLog();
-  tsem_post(&(logHandle->buffNotEmpty));
-  if (taosCheckPthreadValid(logHandle->asyncThread)) {
-    pthread_join(logHandle->asyncThread, NULL);
+  tsem_post(&(tsLogObj.logHandle->buffNotEmpty));
+  if (taosCheckPthreadValid(tsLogObj.logHandle->asyncThread)) {
+    pthread_join(tsLogObj.logHandle->asyncThread, NULL);
   }
-  // In case that other threads still use log resources causing invalid write in
-  // valgrind, we comment two lines below.
-  // taosLogBuffDestroy(logHandle);
+  // In case that other threads still use log resources causing invalid write in valgrind
+  // we comment two lines below.
+  // taosLogBuffDestroy(tsLogObj.logHandle);
   // taosCloseLog();
 }
 
-void taosCloseLogByFd(int oldFd);
-bool taosLockFile(int fd) {
+static bool taosLockFile(int32_t fd) {
   if (fd < 0) return false;
 
-  if (taosLogFileNum > 1) {
-    int ret = flock(fd, LOCK_EX | LOCK_NB);
+  if (tsLogObj.fileNum > 1) {
+    int32_t ret = flock(fd, LOCK_EX | LOCK_NB);
     if (ret == 0) {
       return true;
     }
@@ -127,44 +130,74 @@ bool taosLockFile(int fd) {
   return false;
 }
 
-void taosUnLockFile(int fd) {
+static void taosUnLockFile(int32_t fd) {
   if (fd < 0) return;
 
-  if (taosLogFileNum > 1) {
+  if (tsLogObj.fileNum > 1) {
     flock(fd, LOCK_UN | LOCK_NB);
   }
 }
 
-void *taosThreadToOpenNewFile(void *param) {
-  char name[LOG_FILE_NAME_LEN];
+static void taosKeepOldLog(char *oldName) {
+  if (tsLogKeepDays == 0) return;
+
+  int64_t fileSec = taosGetTimestampSec();
+  char    fileName[LOG_FILE_NAME_LEN + 20];
+  snprintf(fileName, LOG_FILE_NAME_LEN + 20, "%s.%" PRId64, tsLogObj.logName, fileSec);
+
+  taosRename(oldName, fileName);
+  if (tsLogKeepDays < 0) {
+    char compressFileName[LOG_FILE_NAME_LEN + 20];
+    snprintf(compressFileName, LOG_FILE_NAME_LEN + 20, "%s.%" PRId64 ".gz", tsLogObj.logName, fileSec);
+    if (taosCompressFile(fileName, compressFileName) == 0) {
+      (void)remove(fileName);
+    }
+  }
+
+  taosRemoveOldLogFiles(tsLogDir, ABS(tsLogKeepDays));
+}
+
+static void *taosThreadToOpenNewFile(void *param) {
+  char keepName[LOG_FILE_NAME_LEN + 20];
+  sprintf(keepName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
 
-  taosLogFlag ^= 1;
-  taosLogLines = 0;
-  sprintf(name, "%s.%d", taosLogName, taosLogFlag);
+  tsLogObj.flag ^= 1;
+  tsLogObj.lines = 0;
+  char name[LOG_FILE_NAME_LEN + 20];
+  sprintf(name, "%s.%d", tsLogObj.logName, tsLogObj.flag);
 
   umask(0);
 
-  int fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
-  taosLockFile(fd);
-  lseek(fd, 0, SEEK_SET);
+  int32_t fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+  if (fd < 0) {
+    uError("open new log file fail! fd:%d reason:%s", fd, strerror(errno));
+    return NULL;
+  }
 
-  int oldFd = logHandle->fd;
-  logHandle->fd = fd;
-  taosLogLines = 0;
-  openInProgress = 0;
-  pPrint("new log file is opened!!!");
+  taosLockFile(fd);
+  (void)lseek(fd, 0, SEEK_SET);
 
+  int32_t oldFd = tsLogObj.logHandle->fd;
+  tsLogObj.logHandle->fd = fd;
+  tsLogObj.lines = 0;
+  tsLogObj.openInProgress = 0;
   taosCloseLogByFd(oldFd);
+  
+  uInfo("   new log file:%d is opened", tsLogObj.flag);
+  uInfo("==================================");
+  taosPrintGlobalCfg();
+  taosKeepOldLog(keepName);
+
   return NULL;
 }
 
-int taosOpenNewLogFile() {
-  pthread_mutex_lock(&logMutex);
+static int32_t taosOpenNewLogFile() {
+  pthread_mutex_lock(&tsLogObj.logMutex);
 
-  if (taosLogLines > taosLogMaxLines && openInProgress == 0) {
-    openInProgress = 1;
+  if (tsLogObj.lines > tsLogObj.maxLines && tsLogObj.openInProgress == 0) {
+    tsLogObj.openInProgress = 1;
 
-    pPrint("open new log file ......");
+    uInfo("open new log file ......");
     pthread_t      thread;
     pthread_attr_t attr;
     pthread_attr_init(&attr);
@@ -174,50 +207,49 @@ int taosOpenNewLogFile() {
     pthread_attr_destroy(&attr);
   }
 
-  pthread_mutex_unlock(&logMutex);
+  pthread_mutex_unlock(&tsLogObj.logMutex);
 
   return 0;
 }
 
-void taosResetLogFile() {
-  char lastName[LOG_FILE_NAME_LEN];
-  sprintf(lastName, "%s.%d", taosLogName, taosLogFlag);
+void taosResetLog() {
+  char lastName[LOG_FILE_NAME_LEN + 20];
+  sprintf(lastName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
 
   // force create a new log file
-  taosLogLines = taosLogMaxLines + 10;
+  tsLogObj.lines = tsLogObj.maxLines + 10;
 
   taosOpenNewLogFile();
-  remove(lastName);
+  (void)remove(lastName);
 
-  pPrint("==================================");
-  pPrint("   reset log file ");
+  uInfo("==================================");
+  uInfo("   reset log file ");
 }
 
-bool taosCheckFileIsOpen(char *logFileName) {
-  int exist = access(logFileName, F_OK);
-  if (exist != 0) {
-    return false;
-  }
-
-  int fd = open(logFileName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
+static bool taosCheckFileIsOpen(char *logFileName) {
+  int32_t fd = open(logFileName, O_WRONLY, S_IRWXU | S_IRWXG | S_IRWXO);
   if (fd < 0) {
-    printf("\nfailed to open log file:%s, reason:%s\n", logFileName, strerror(errno));
-    return true;
+    if (errno == ENOENT) {
+      return false;
+    } else {
+      printf("\nfailed to open log file:%s, reason:%s\n", logFileName, strerror(errno));
+      return true;
+    }
   }
 
   if (taosLockFile(fd)) {
     taosUnLockFile(fd);
-    tclose(fd);
+    taosClose(fd);
     return false;
   } else {
-    tclose(fd);
+    taosClose(fd);
     return true;
   }
 }
 
-void taosGetLogFileName(char *fn) {
-  if (taosLogFileNum > 1) {
-    for (int i = 0; i < taosLogFileNum; i++) {
+static void taosGetLogFileName(char *fn) {
+  if (tsLogObj.fileNum > 1) {
+    for (int32_t i = 0; i < tsLogObj.fileNum; i++) {
       char fileName[LOG_FILE_NAME_LEN];
 
       sprintf(fileName, "%s%d.0", fn, i);
@@ -227,16 +259,18 @@ void taosGetLogFileName(char *fn) {
       bool file2open = taosCheckFileIsOpen(fileName);
 
       if (!file1open && !file2open) {
-        sprintf(taosLogName, "%s%d", fn, i);
+        sprintf(tsLogObj.logName, "%s%d", fn, i);
         return;
       }
     }
   }
 
-  strcpy(taosLogName, fn);
+  if (strlen(fn) < LOG_FILE_NAME_LEN) {
+    strcpy(tsLogObj.logName, fn);
+  }
 }
 
-int taosOpenLogFileWithMaxLines(char *fn, int maxLines, int maxFileNum) {
+static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
 #ifdef WINDOWS
   /*
   * always set maxFileNum to 1
@@ -245,89 +279,82 @@ int taosOpenLogFileWithMaxLines(char *fn, int maxLines, int maxFileNum) {
   maxFileNum = 1;
 #endif
 
-  char        name[LOG_FILE_NAME_LEN] = "\0";
+  char        name[LOG_FILE_NAME_LEN + 50] = "\0";
   struct stat logstat0, logstat1;
-  int         size;
+  int32_t     size;
 
-  taosLogMaxLines = maxLines;
-  taosLogFileNum = maxFileNum;
+  tsLogObj.maxLines = maxLines;
+  tsLogObj.fileNum = maxFileNum;
   taosGetLogFileName(fn);
 
-  strcpy(name, fn);
-  strcat(name, ".0");
+  if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) {
+    strcpy(name, fn);
+    strcat(name, ".0");
+  }
+
+  if (strlen(fn) < LOG_FILE_NAME_LEN + 50 - 2) {
+    strcpy(name, fn);
+    strcat(name, ".1");
+  }
 
+  bool log0Exist = stat(name, &logstat0) >= 0;
+  bool log1Exist = stat(name, &logstat1) >= 0;
+  
   // if none of the log files exist, open 0, if both exists, open the old one
-  if (stat(name, &logstat0) < 0) {
-    taosLogFlag = 0;
+  if (!log0Exist && !log1Exist) {
+    tsLogObj.flag = 0;
+  } else if (!log1Exist) {
+    tsLogObj.flag = 0;
+  } else if (!log0Exist) {
+    tsLogObj.flag = 1;
   } else {
-    strcpy(name, fn);
-    strcat(name, ".1");
-    if (stat(name, &logstat1) < 0) {
-      taosLogFlag = 1;
-    } else {
-      taosLogFlag = (logstat0.st_mtime > logstat1.st_mtime) ? 0 : 1;
-    }
+    tsLogObj.flag = (logstat0.st_mtime > logstat1.st_mtime) ? 0 : 1;
   }
 
-  sprintf(name, "%s.%d", taosLogName, taosLogFlag);
-  pthread_mutex_init(&logMutex, NULL);
+  char fileName[LOG_FILE_NAME_LEN + 50] = "\0";
+  sprintf(fileName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
+  pthread_mutex_init(&tsLogObj.logMutex, NULL);
 
   umask(0);
-  logHandle->fd = open(name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
+  tsLogObj.logHandle->fd = open(fileName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
 
-  if (logHandle->fd < 0) {
-    printf("\nfailed to open log file:%s, reason:%s\n", name, strerror(errno));
+  if (tsLogObj.logHandle->fd < 0) {
+    printf("\nfailed to open log file:%s, reason:%s\n", fileName, strerror(errno));
     return -1;
   }
-  taosLockFile(logHandle->fd);
+  taosLockFile(tsLogObj.logHandle->fd);
 
   // only an estimate for number of lines
   struct stat filestat;
-  fstat(logHandle->fd, &filestat);
-  size = (int)filestat.st_size;
-  taosLogLines = size / 60;
+  if (fstat(tsLogObj.logHandle->fd, &filestat) < 0) {
+    printf("\nfailed to fstat log file:%s, reason:%s\n", fileName, strerror(errno));
+    return -1;
+  }
+  size = (int32_t)filestat.st_size;
+  tsLogObj.lines = size / 60;
 
-  lseek(logHandle->fd, 0, SEEK_END);
+  lseek(tsLogObj.logHandle->fd, 0, SEEK_END);
 
   sprintf(name, "==================================================\n");
-  twrite(logHandle->fd, name, (uint32_t)strlen(name));
+  taosTWrite(tsLogObj.logHandle->fd, name, (uint32_t)strlen(name));
   sprintf(name, "                new log file                      \n");
-  twrite(logHandle->fd, name, (uint32_t)strlen(name));
+  taosTWrite(tsLogObj.logHandle->fd, name, (uint32_t)strlen(name));
   sprintf(name, "==================================================\n");
-  twrite(logHandle->fd, name, (uint32_t)strlen(name));
+  taosTWrite(tsLogObj.logHandle->fd, name, (uint32_t)strlen(name));
 
   return 0;
 }
 
-char *tprefix(char *prefix) {
-  struct tm      Tm, *ptm;
-  struct timeval timeSecs;
-  time_t         curTime;
-
-  gettimeofday(&timeSecs, NULL);
-  curTime = timeSecs.tv_sec;
-  ptm = localtime_r(&curTime, &Tm);
-
-#ifndef LINUX
-  sprintf(prefix, "%02d/%02d %02d:%02d:%02d.%06d 0x%lld ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
-          ptm->tm_sec, (int)timeSecs.tv_usec, taosGetPthreadId());
-#else
-  sprintf(prefix, "%02d/%02d %02d:%02d:%02d.%06d %d 0x%lx ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
-          ptm->tm_sec, (int)timeSecs.tv_usec, logPid, pthread_self());
-#endif
-  return prefix;
-}
-
-void tprintf(const char *const flags, int dflag, const char *const format, ...) {
+void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
   if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop print log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB);
+    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop print log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB);
     fflush(stdout);
     return;
   }
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_BUFFER_SIZE] = { 0 };
-  int            len;
+  int32_t        len;
   struct tm      Tm, *ptm;
   struct timeval timeSecs;
   time_t         curTime;
@@ -335,19 +362,15 @@ void tprintf(const char *const flags, int dflag, const char *const format, ...)
   gettimeofday(&timeSecs, NULL);
   curTime = timeSecs.tv_sec;
   ptm = localtime_r(&curTime, &Tm);
-#ifndef LINUX
-  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%lld ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
-                ptm->tm_min, ptm->tm_sec, (int)timeSecs.tv_usec, taosGetPthreadId());
-#else
-  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d %d %lx ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
-                ptm->tm_sec, (int)timeSecs.tv_usec, logPid, pthread_self());
-#endif
+
+  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%08" PRIx64 " ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
+                ptm->tm_min, ptm->tm_sec, (int32_t)timeSecs.tv_usec, taosGetPthreadId());
   len += sprintf(buffer + len, "%s", flags);
 
   va_start(argpointer, format);
-  int writeLen = vsnprintf(buffer + len, MAX_LOGLINE_CONTENT_SIZE, format, argpointer);
+  int32_t writeLen = vsnprintf(buffer + len, MAX_LOGLINE_CONTENT_SIZE, format, argpointer);
   if (writeLen <= 0) {
-    char tmp[MAX_LOGLINE_DUMP_BUFFER_SIZE];
+    char tmp[MAX_LOGLINE_DUMP_BUFFER_SIZE] = {0};
     writeLen = vsnprintf(tmp, MAX_LOGLINE_DUMP_CONTENT_SIZE, format, argpointer);
     strncpy(buffer + len, tmp, MAX_LOGLINE_CONTENT_SIZE);
     len += MAX_LOGLINE_CONTENT_SIZE;
@@ -363,32 +386,32 @@ void tprintf(const char *const flags, int dflag, const char *const format, ...)
   buffer[len++] = '\n';
   buffer[len] = 0;
 
-  if ((dflag & DEBUG_FILE) && logHandle && logHandle->fd >= 0) {
+  if ((dflag & DEBUG_FILE) && tsLogObj.logHandle && tsLogObj.logHandle->fd >= 0) {
     if (tsAsyncLog) {
-      taosPushLogBuffer(logHandle, buffer, len);
+      taosPushLogBuffer(tsLogObj.logHandle, buffer, len);
     } else {
-      twrite(logHandle->fd, buffer, len);
+      taosTWrite(tsLogObj.logHandle->fd, buffer, len);
     }
 
-    if (taosLogMaxLines > 0) {
-      atomic_add_fetch_32(&taosLogLines, 1);
+    if (tsLogObj.maxLines > 0) {
+      atomic_add_fetch_32(&tsLogObj.lines, 1);
 
-      if ((taosLogLines > taosLogMaxLines) && (openInProgress == 0)) taosOpenNewLogFile();
+      if ((tsLogObj.lines > tsLogObj.maxLines) && (tsLogObj.openInProgress == 0)) taosOpenNewLogFile();
     }
   }
 
-  if (dflag & DEBUG_SCREEN) twrite(1, buffer, (unsigned int)len);
+  if (dflag & DEBUG_SCREEN) taosTWrite(1, buffer, (uint32_t)len);
 }
 
-void taosDumpData(unsigned char *msg, int len) {
+void taosDumpData(unsigned char *msg, int32_t len) {
   if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop dump log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB);
+    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop dump log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB);
     fflush(stdout);
     return;
   }
 
   char temp[256];
-  int  i, pos = 0, c = 0;
+  int32_t  i, pos = 0, c = 0;
 
   for (i = 0; i < len; ++i) {
     sprintf(temp + pos, "%02x ", msg[i]);
@@ -396,7 +419,7 @@ void taosDumpData(unsigned char *msg, int len) {
     pos += 3;
     if (c >= 16) {
       temp[pos++] = '\n';
-      twrite(logHandle->fd, temp, (unsigned int)pos);
+      taosTWrite(tsLogObj.logHandle->fd, temp, (uint32_t)pos);
       c = 0;
       pos = 0;
     }
@@ -404,21 +427,21 @@ void taosDumpData(unsigned char *msg, int len) {
 
   temp[pos++] = '\n';
 
-  twrite(logHandle->fd, temp, (unsigned int)pos);
+  taosTWrite(tsLogObj.logHandle->fd, temp, (uint32_t)pos);
 
   return;
 }
 
-void taosPrintLongString(const char *const flags, int dflag, const char *const format, ...) {
+void taosPrintLongString(const char *flags, int32_t dflag, const char *format, ...) {
   if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop write log.\n", logDir, tsAvailLogDirGB, tsTotalLogDirGB);
+    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop write log.\n", tsLogDir, tsAvailLogDirGB, tsTotalLogDirGB);
     fflush(stdout);
     return;
   }
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_DUMP_BUFFER_SIZE];
-  int            len;
+  int32_t        len;
   struct tm      Tm, *ptm;
   struct timeval timeSecs;
   time_t         curTime;
@@ -426,13 +449,9 @@ void taosPrintLongString(const char *const flags, int dflag, const char *const f
   gettimeofday(&timeSecs, NULL);
   curTime = timeSecs.tv_sec;
   ptm = localtime_r(&curTime, &Tm);
-#ifndef LINUX
-  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%lld ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
-                ptm->tm_min, ptm->tm_sec, (int)timeSecs.tv_usec, taosGetPthreadId());
-#else
-  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d %d %lx ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
-                ptm->tm_sec, (int)timeSecs.tv_usec, logPid, pthread_self());
-#endif
+
+  len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d 0x%08" PRIx64 " ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
+                ptm->tm_min, ptm->tm_sec, (int32_t)timeSecs.tv_usec, taosGetPthreadId());
   len += sprintf(buffer + len, "%s", flags);
 
   va_start(argpointer, format);
@@ -444,35 +463,37 @@ void taosPrintLongString(const char *const flags, int dflag, const char *const f
   buffer[len++] = '\n';
   buffer[len] = 0;
 
-  if ((dflag & DEBUG_FILE) && logHandle && logHandle->fd >= 0) {
-    taosPushLogBuffer(logHandle, buffer, len);
-
-    if (taosLogMaxLines > 0) {
-      atomic_add_fetch_32(&taosLogLines, 1);
+  if ((dflag & DEBUG_FILE) && tsLogObj.logHandle && tsLogObj.logHandle->fd >= 0) {
+    if (tsAsyncLog) {
+      taosPushLogBuffer(tsLogObj.logHandle, buffer, len);
+    } else {
+      taosTWrite(tsLogObj.logHandle->fd, buffer, len);
+    }
+    
+    if (tsLogObj.maxLines > 0) {
+      atomic_add_fetch_32(&tsLogObj.lines, 1);
 
-      if ((taosLogLines > taosLogMaxLines) && (openInProgress == 0)) taosOpenNewLogFile();
+      if ((tsLogObj.lines > tsLogObj.maxLines) && (tsLogObj.openInProgress == 0)) taosOpenNewLogFile();
     }
   }
 
-  if (dflag & DEBUG_SCREEN) twrite(1, buffer, (unsigned int)len);
+  if (dflag & DEBUG_SCREEN) taosTWrite(1, buffer, (uint32_t)len);
 }
 
-void taosCloseLog() { taosCloseLogByFd(logHandle->fd); }
+#if 0
+void taosCloseLog() { 
+  taosCloseLogByFd(tsLogObj.logHandle->fd); 
+}
+#endif
 
-void taosCloseLogByFd(int fd) {
+static void taosCloseLogByFd(int32_t fd) {
   if (fd >= 0) {
     taosUnLockFile(fd);
-    tclose(fd);
+    taosClose(fd);
   }
 }
 
-#define LOG_BUF_BUFFER(x) ((x)->buffer)
-#define LOG_BUF_START(x) ((x)->buffStart)
-#define LOG_BUF_END(x) ((x)->buffEnd)
-#define LOG_BUF_SIZE(x) ((x)->buffSize)
-#define LOG_BUF_MUTEX(x) ((x)->buffMutex)
-
-SLogBuff *taosLogBuffNew(int bufSize) {
+static SLogBuff *taosLogBuffNew(int32_t bufSize) {
   SLogBuff *tLogBuff = NULL;
 
   if (bufSize < TSDB_MIN_LOG_BUF_SIZE || bufSize > TSDB_MAX_LOG_BUF_SIZE) return NULL;
@@ -493,22 +514,24 @@ SLogBuff *taosLogBuffNew(int bufSize) {
   return tLogBuff;
 
 _err:
-  tfree(LOG_BUF_BUFFER(tLogBuff));
-  tfree(tLogBuff);
+  taosTFree(LOG_BUF_BUFFER(tLogBuff));
+  taosTFree(tLogBuff);
   return NULL;
 }
 
-void taosLogBuffDestroy(SLogBuff *tLogBuff) {
+#if 0
+static void taosLogBuffDestroy(SLogBuff *tLogBuff) {
   tsem_destroy(&(tLogBuff->buffNotEmpty));
   pthread_mutex_destroy(&(tLogBuff->buffMutex));
   free(tLogBuff->buffer);
-  tfree(tLogBuff);
+  taosTFree(tLogBuff);
 }
+#endif
 
-int taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int msgLen) {
-  int start = 0;
-  int end = 0;
-  int remainSize = 0;
+static int32_t taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int32_t msgLen) {
+  int32_t start = 0;
+  int32_t end = 0;
+  int32_t remainSize = 0;
 
   if (tLogBuff == NULL || tLogBuff->stop) return -1;
 
@@ -544,10 +567,10 @@ int taosPushLogBuffer(SLogBuff *tLogBuff, char *msg, int msgLen) {
   return 0;
 }
 
-int taosPollLogBuffer(SLogBuff *tLogBuff, char *buf, int bufSize) {
-  int start = LOG_BUF_START(tLogBuff);
-  int end = LOG_BUF_END(tLogBuff);
-  int pollSize = 0;
+static int32_t taosPollLogBuffer(SLogBuff *tLogBuff, char *buf, int32_t bufSize) {
+  int32_t start = LOG_BUF_START(tLogBuff);
+  int32_t end = LOG_BUF_END(tLogBuff);
+  int32_t pollSize = 0;
 
   if (start == end) {
     return 0;
@@ -559,7 +582,7 @@ int taosPollLogBuffer(SLogBuff *tLogBuff, char *buf, int bufSize) {
   } else {
     pollSize = MIN(end + LOG_BUF_SIZE(tLogBuff) - start, bufSize);
     if (pollSize > LOG_BUF_SIZE(tLogBuff) - start) {
-      int tsize = LOG_BUF_SIZE(tLogBuff) - start;
+      int32_t tsize = LOG_BUF_SIZE(tLogBuff) - start;
       memcpy(buf, LOG_BUF_BUFFER(tLogBuff) + start, tsize);
       memcpy(buf + tsize, LOG_BUF_BUFFER(tLogBuff), pollSize - tsize);
 
@@ -570,9 +593,9 @@ int taosPollLogBuffer(SLogBuff *tLogBuff, char *buf, int bufSize) {
   }
 }
 
-void *taosAsyncOutputLog(void *param) {
+static void *taosAsyncOutputLog(void *param) {
   SLogBuff *tLogBuff = (SLogBuff *)param;
-  int       log_size = 0;
+  int32_t   log_size = 0;
 
   char tempBuffer[TSDB_DEFAULT_LOG_BUF_UNIT];
 
@@ -583,7 +606,7 @@ void *taosAsyncOutputLog(void *param) {
     while (1) {
       log_size = taosPollLogBuffer(tLogBuff, tempBuffer, TSDB_DEFAULT_LOG_BUF_UNIT);
       if (log_size) {
-        twrite(tLogBuff->fd, tempBuffer, log_size);
+        taosTWrite(tLogBuff->fd, tempBuffer, log_size);
         LOG_BUF_START(tLogBuff) = (LOG_BUF_START(tLogBuff) + log_size) % LOG_BUF_SIZE(tLogBuff);
       } else {
         break;
diff --git a/src/util/src/tlosertree.c b/src/util/src/tlosertree.c
index 4fe68970b9504d81cdbc779425c9439d32ff597c..fa7e4fc34068075ce8e4a8ec0c327fb6f1935be4 100644
--- a/src/util/src/tlosertree.c
+++ b/src/util/src/tlosertree.c
@@ -13,10 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "tlosertree.h"
 #include "os.h"
 #include "taosmsg.h"
-#include "tlog.h"
-#include "tlosertree.h"
+#include "tulog.h"
 
 // set initial value for loser tree
 void tLoserTreeInit(SLoserTreeInfo* pTree) {
@@ -40,13 +40,13 @@ void tLoserTreeDisplay(SLoserTreeInfo* pTree) {
   printf("\n");
 }
 
-uint8_t tLoserTreeCreate(SLoserTreeInfo** pTree, int32_t numOfEntries, void* param, __merge_compare_fn_t compareFn) {
+uint32_t tLoserTreeCreate(SLoserTreeInfo** pTree, int32_t numOfEntries, void* param, __merge_compare_fn_t compareFn) {
   int32_t totalEntries = numOfEntries << 1;
 
   *pTree = (SLoserTreeInfo*)calloc(1, sizeof(SLoserTreeInfo) + sizeof(SLoserTreeNode) * totalEntries);
   if ((*pTree) == NULL) {
-    pError("allocate memory for loser-tree failed. reason:%s", strerror(errno));
-    return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    uError("allocate memory for loser-tree failed. reason:%s", strerror(errno));
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
   }
 
   (*pTree)->pNode = (SLoserTreeNode*)(((char*)(*pTree)) + sizeof(SLoserTreeInfo));
@@ -54,7 +54,7 @@ uint8_t tLoserTreeCreate(SLoserTreeInfo** pTree, int32_t numOfEntries, void* par
   (*pTree)->numOfEntries = numOfEntries;
   (*pTree)->totalEntries = totalEntries;
   (*pTree)->param = param;
-  (*pTree)->comparaFn = compareFn;
+  (*pTree)->comparFn = compareFn;
 
   // set initial value for loser tree
   tLoserTreeInit(*pTree);
@@ -95,7 +95,7 @@ void tLoserTreeAdjust(SLoserTreeInfo* pTree, int32_t idx) {
       return;
     }
 
-    int32_t ret = pTree->comparaFn(&pTree->pNode[parentId], &kLeaf, pTree->param);
+    int32_t ret = pTree->comparFn(&pTree->pNode[parentId], &kLeaf, pTree->param);
     if (ret < 0) {
       SLoserTreeNode t = pTree->pNode[parentId];
       pTree->pNode[parentId] = kLeaf;
diff --git a/src/util/src/tmd5.c b/src/util/src/tmd5.c
index 90b41dacf40c79b0ab3d173368943fd786c15270..4971ed7a1200d9fb69fb1b49746414ed792d5079 100644
--- a/src/util/src/tmd5.c
+++ b/src/util/src/tmd5.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 /* forward declaration */
 static void Transform(uint32_t *buf, uint32_t *in);
diff --git a/src/util/src/tmem.c b/src/util/src/tmem.c
deleted file mode 100644
index 2625e4e5e6a645c4de2bd97534324b037acb4aaa..0000000000000000000000000000000000000000
--- a/src/util/src/tmem.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * 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 "os.h"
-#include "tlog.h"
-
-#define TAOS_MEM_CHECK_IMPL
-#include "tutil.h"
-
-
-#ifdef TAOS_MEM_CHECK
-
-static int allocMode = TAOS_ALLOC_MODE_DEFAULT;
-static FILE* fpAllocLog = NULL;
-
-////////////////////////////////////////////////////////////////////////////////
-// memory allocator which fails randomly
-
-extern int32_t taosGetTimestampSec();
-static int32_t startTime = INT32_MAX;;
-
-static bool random_alloc_fail(size_t size, const char* file, uint32_t line) {
-  if (taosGetTimestampSec() < startTime) {
-    return false;
-  }
-
-  if (size < 100 * (size_t)1024) {
-    return false;
-  }
-
-  if (rand() % 20 != 0) {
-    return false;
-  }
-
-  if (fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: memory allocation of %zu bytes will fail.\n", file, line, size);
-  }
-
-  return true;
-}
-
-static void* malloc_random(size_t size, const char* file, uint32_t line) {
-  return random_alloc_fail(size, file, line) ? NULL : malloc(size);
-}
-
-static void* calloc_random(size_t num, size_t size, const char* file, uint32_t line) {
-  return random_alloc_fail(num * size, file, line) ? NULL : calloc(num, size);
-}
-
-static void* realloc_random(void* ptr, size_t size, const char* file, uint32_t line) {
-  return random_alloc_fail(size, file, line) ? NULL : realloc(ptr, size);
-}
-
-static char* strdup_random(const char* str, const char* file, uint32_t line) {
-  size_t len = strlen(str);
-  return random_alloc_fail(len + 1, file, line) ? NULL : strdup(str);
-}
-
-static char* strndup_random(const char* str, size_t size, const char* file, uint32_t line) {
-  size_t len = strlen(str);
-  if (len > size) {
-    len = size;
-  }
-  return random_alloc_fail(len + 1, file, line) ? NULL : strndup(str, len);
-}
-
-static ssize_t getline_random(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
-  return random_alloc_fail(*n, file, line) ? -1 : getline(lineptr, n, stream);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// memory allocator with leak detection
-
-#define MEMBLK_MAGIC 0x55AA
-
-typedef struct SMemBlock {
-  const char* file;
-  uint16_t line;
-  uint16_t magic;
-  uint32_t size;
-  struct SMemBlock* prev;
-  struct SMemBlock* next;
-  // TODO: need pading in 32bit platform
-  char data[0];
-} SMemBlock;
-
-static SMemBlock *blocks = NULL;
-static uintptr_t lock = 0;
-
-static void add_mem_block(SMemBlock* blk) {
-  blk->prev = NULL;
-  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
-  blk->next = blocks;
-  if (blocks != NULL) {
-    blocks->prev = blk;
-  }
-  blocks = blk;
-  atomic_store_ptr(&lock, 0);
-}
-
-static void remove_mem_block(SMemBlock* blk) {
-  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
-
-  if (blocks == blk) {
-    blocks = blk->next;
-  }
-  if (blk->prev != NULL) {
-    blk->prev->next = blk->next;
-  }
-  if (blk->next != NULL) {
-    blk->next->prev = blk->prev;
-  }
-
-  atomic_store_ptr(&lock, 0);
-
-  blk->prev = NULL;
-  blk->next = NULL;
-}
-
-static void free_detect_leak(void* ptr, const char* file, uint32_t line) {
-  if (ptr == NULL) {
-    return;
-  }
-
-  SMemBlock* blk = (SMemBlock*)(((char*)ptr) - sizeof(SMemBlock));
-  if (blk->magic != MEMBLK_MAGIC) {
-    if (fpAllocLog != NULL) {
-      fprintf(fpAllocLog, "%s:%d: memory is allocated by default allocator.\n", file, line);
-    }
-    free(ptr);
-    return;
-  }
-
-  remove_mem_block(blk);
-  free(blk);
-}
-
-static void* malloc_detect_leak(size_t size, const char* file, uint32_t line) {
-  if (size == 0) {
-    return NULL;
-  }
-
-  SMemBlock *blk = (SMemBlock*)malloc(size + sizeof(SMemBlock));
-  if (blk == NULL) {
-    return NULL;
-  }
-
-  if (line > UINT16_MAX && fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: line number too large.\n", file, line);
-  }
-
-  if (size > UINT32_MAX && fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: size too large: %zu.\n", file, line, size);
-  }
-
-  blk->file = file;
-  blk->line = (uint16_t)line;
-  blk->magic = MEMBLK_MAGIC;
-  blk->size = size;
-  add_mem_block(blk);
-
-  return blk->data;
-}
-
-static void* calloc_detect_leak(size_t num, size_t size, const char* file, uint32_t line) {
-  size *= num;
-  void* p = malloc_detect_leak(size, file, line);
-  if (p != NULL) {
-    memset(p, 0, size);
-  }
-  return p;
-}
-
-static void* realloc_detect_leak(void* ptr, size_t size, const char* file, uint32_t line) {
-  if (size == 0) {
-    free_detect_leak(ptr, file, line);
-    return NULL;
-  }
-
-  if (ptr == NULL) {
-    return malloc_detect_leak(size, file, line);
-  }
-
-  SMemBlock* blk = ((char*)ptr) - sizeof(SMemBlock);
-  if (blk->magic != MEMBLK_MAGIC) {
-    if (fpAllocLog != NULL) {
-      fprintf(fpAllocLog, "%s:%d: memory is allocated by default allocator.\n", file, line);
-    }
-    return realloc(ptr, size);
-  }
-
-  remove_mem_block(blk);
-
-  void* p = realloc(blk, size + sizeof(SMemBlock));
-  if (p == NULL) {
-    add_mem_block(blk);
-    return NULL;
-  }
-
-  if (size > UINT32_MAX && fpAllocLog != NULL) {
-    fprintf(fpAllocLog, "%s:%d: size too large: %zu.\n", file, line, size);
-  }
-
-  blk = (SMemBlock*)p;
-  blk->size = size;
-  add_mem_block(blk);
-  return blk->data;
-}
-
-static char* strdup_detect_leak(const char* str, const char* file, uint32_t line) {
-  size_t len = strlen(str);
-  char *p = malloc_detect_leak(len + 1, file, line);
-  if (p != NULL) {
-    memcpy(p, str, len);
-    p[len] = 0;
-  }
-  return p;
-}
-
-static char* strndup_detect_leak(const char* str, size_t size, const char* file, uint32_t line) {
-  size_t len = strlen(str);
-  if (len > size) {
-    len = size;
-  }
-  char *p = malloc_detect_leak(len + 1, file, line);
-  if (p != NULL) {
-    memcpy(p, str, len);
-    p[len] = 0;
-  }
-  return p;
-}
-
-static ssize_t getline_detect_leak(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
-  char* buf = NULL;
-  size_t bufSize = 0;
-  ssize_t size = getline(&buf, &bufSize, stream);
-  if (size != -1) {
-    if (*n < size + 1) {
-      void* p = realloc_detect_leak(*lineptr, size + 1, file, line);
-      if (p == NULL) {
-        free(buf);
-        return -1;
-      }
-      *lineptr = (char*)p;
-      *n = size + 1;
-    }
-    memcpy(*lineptr, buf, size + 1);
-  }
-
-  free(buf);
-  return size;
-}
-
-static void dump_memory_leak() {
-  const char* hex = "0123456789ABCDEF";
-  const char* fmt = ":%d: addr=%p, size=%d, content(first 16 bytes)=";
-  size_t numOfBlk = 0, totalSize = 0;
-
-  if (fpAllocLog == NULL) {
-    return;
-  }
-
-  fputs("memory blocks allocated but not freed before exit:\n", fpAllocLog);
-
-  while (atomic_val_compare_exchange_ptr(&lock, 0, 1) != 0);
-
-  for (SMemBlock* blk = blocks; blk != NULL; blk = blk->next) {
-    ++numOfBlk;
-    totalSize += blk->size;
-
-    fputs(blk->file, fpAllocLog);
-    fprintf(fpAllocLog, fmt, blk->line, blk->data, blk->size);
-
-    char sep = '\'';
-    size_t size = blk->size > 16 ? 16 : blk->size;
-    for (size_t i = 0; i < size; ++i) {
-      uint8_t c = (uint8_t)(blk->data[i]);
-      fputc(sep, fpAllocLog);
-      sep = ' ';
-      fputc(hex[c >> 4], fpAllocLog);
-      fputc(hex[c & 0x0f], fpAllocLog);
-    }
-
-    fputs("'\n", fpAllocLog);
-  }
-
-  atomic_store_ptr(&lock, 0);
-
-  fprintf(fpAllocLog, "\nnumber of blocks: %zu, total bytes: %zu\n", numOfBlk, totalSize);
-  fflush(fpAllocLog);
-}
-
-static void dump_memory_leak_on_sig(int sig) {
-  fprintf(fpAllocLog, "signal %d received.\n", sig);
-
-  // restore default signal handler
-  struct sigaction act = {0};
-  act.sa_handler = SIG_DFL;
-  sigaction(sig, &act, NULL);
-
-  dump_memory_leak();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// interface functions
-
-void* taos_malloc(size_t size, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return malloc(size);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return malloc_random(size, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return malloc_detect_leak(size, file, line);
-  }
-  return malloc(size);
-}
-
-void* taos_calloc(size_t num, size_t size, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return calloc(num, size);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return calloc_random(num, size, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return calloc_detect_leak(num, size, file, line);
-  }
-  return calloc(num, size);
-}
-
-void* taos_realloc(void* ptr, size_t size, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return realloc(ptr, size);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return realloc_random(ptr, size, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return realloc_detect_leak(ptr, size, file, line);
-  }
-  return realloc(ptr, size);
-}
-
-void  taos_free(void* ptr, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return free(ptr);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return free(ptr);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return free_detect_leak(ptr, file, line);
-  }
-  return free(ptr);
-}
-
-char* taos_strdup(const char* str, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return strdup(str);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return strdup_random(str, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return strdup_detect_leak(str, file, line);
-  }
-  return strdup(str);
-}
-
-char* taos_strndup(const char* str, size_t size, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return strndup(str, size);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return strndup_random(str, size, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return strndup_detect_leak(str, size, file, line);
-  }
-  return strndup(str, size);
-}
-
-ssize_t taos_getline(char **lineptr, size_t *n, FILE *stream, const char* file, uint32_t line) {
-  switch (allocMode) {
-    case TAOS_ALLOC_MODE_DEFAULT:
-      return getline(lineptr, n, stream);
-
-    case TAOS_ALLOC_MODE_RANDOM_FAIL:
-      return getline_random(lineptr, n, stream, file, line);
-
-    case TAOS_ALLOC_MODE_DETECT_LEAK:
-      return getline_detect_leak(lineptr, n, stream, file, line);
-  }
-  return getline(lineptr, n, stream);
-}
-
-static void close_alloc_log() {
-  if (fpAllocLog != NULL) {
-    if (fpAllocLog != stdout) {
-      fclose(fpAllocLog);
-    }
-    fpAllocLog = NULL;
-  }
-}
-
-void taosSetAllocMode(int mode, const char* path, bool autoDump) {
-  assert(mode >= TAOS_ALLOC_MODE_DEFAULT);
-  assert(mode <= TAOS_ALLOC_MODE_DETECT_LEAK);
-
-  if (fpAllocLog != NULL || allocMode != TAOS_ALLOC_MODE_DEFAULT) {
-    printf("memory allocation mode can only be set once.\n");
-    return;
-  }
-
-  if (path == NULL || path[0] == 0) {
-    fpAllocLog = stdout;
-  } else if ((fpAllocLog = fopen(path, "w")) != NULL) {
-    atexit(close_alloc_log);
-  } else {
-    printf("failed to open memory allocation log file '%s', errno=%d\n", path, errno);
-    return;
-  }
-
-  allocMode = mode;
-
-  if (mode == TAOS_ALLOC_MODE_RANDOM_FAIL) {
-    startTime = taosGetTimestampSec() + 10;
-    return;
-  }
-
-  if (autoDump && mode == TAOS_ALLOC_MODE_DETECT_LEAK) {
-    atexit(dump_memory_leak);
-
-    struct sigaction act = {0};
-    act.sa_handler = dump_memory_leak_on_sig;
-    sigaction(SIGFPE, &act, NULL);
-    sigaction(SIGSEGV, &act, NULL);
-    sigaction(SIGILL, &act, NULL);
-  }
-}
-
-void taosDumpMemoryLeak() {
-  dump_memory_leak();
-  close_alloc_log();
-}
-
-#else // 'TAOS_MEM_CHECK' not defined
-
-void taosSetAllocMode(int mode, const char* path, bool autoDump) {
-  // do nothing
-}
-
-void taosDumpMemoryLeak() {
-  // do nothing
-}
-
-#endif // TAOS_MEM_CHECK
diff --git a/src/util/src/tmempool.c b/src/util/src/tmempool.c
index f2cf31783c4430d5d34fc3d431d26af8c8b7013e..a3d10355003c85d993b3a37190081436c0fb19ab 100644
--- a/src/util/src/tmempool.c
+++ b/src/util/src/tmempool.c
@@ -13,12 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tlog.h"
+#include "os.h"
+#include "tulog.h"
 #include "tmempool.h"
 #include "tutil.h"
 
@@ -37,13 +33,13 @@ mpool_h taosMemPoolInit(int numOfBlock, int blockSize) {
   pool_t *pool_p;
 
   if (numOfBlock <= 1 || blockSize <= 1) {
-    pError("invalid parameter in memPoolInit\n");
+    uError("invalid parameter in memPoolInit\n");
     return NULL;
   }
 
   pool_p = (pool_t *)malloc(sizeof(pool_t));
   if (pool_p == NULL) {
-    pError("mempool malloc failed\n");
+    uError("mempool malloc failed\n");
     return NULL;
   } else {
     memset(pool_p, 0, sizeof(pool_t));
@@ -55,10 +51,10 @@ mpool_h taosMemPoolInit(int numOfBlock, int blockSize) {
   pool_p->freeList = (int *)malloc(sizeof(int) * (size_t)numOfBlock);
 
   if (pool_p->pool == NULL || pool_p->freeList == NULL) {
-    pError("failed to allocate memory\n");
-    tfree(pool_p->freeList);
-    tfree(pool_p->pool);
-    tfree(pool_p);
+    uError("failed to allocate memory\n");
+    taosTFree(pool_p->freeList);
+    taosTFree(pool_p->pool);
+    taosTFree(pool_p);
     return NULL;
   }
 
@@ -88,7 +84,7 @@ char *taosMemPoolMalloc(mpool_h handle) {
 
   pthread_mutex_unlock(&(pool_p->mutex));
 
-  if (pos == NULL) pTrace("mempool: out of memory");
+  if (pos == NULL) uDebug("mempool: out of memory");
   return pos;
 }
 
@@ -100,13 +96,13 @@ void taosMemPoolFree(mpool_h handle, char *pMem) {
 
   index = (int)(pMem - pool_p->pool) % pool_p->blockSize;
   if (index != 0) {
-    pError("invalid free address:%p\n", pMem);
+    uError("invalid free address:%p\n", pMem);
     return;
   }
 
   index = (int)((pMem - pool_p->pool) / pool_p->blockSize);
   if (index < 0 || index >= pool_p->numOfBlock) {
-    pError("mempool: error, invalid address:%p\n", pMem);
+    uError("mempool: error, invalid address:%p\n", pMem);
     return;
   }
 
diff --git a/src/util/src/tmodule.c b/src/util/src/tmodule.c
deleted file mode 100644
index 54669a20bed2bae1474222fe95790414aceee215..0000000000000000000000000000000000000000
--- a/src/util/src/tmodule.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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 "os.h"
-#include "tmodule.h"
-#include "tutil.h"
-
-void *taosProcessQueue(void *param);
-
-char *taosDisplayModuleStatus(int moduleNum) {
-  static char status[256];
-  int         i;
-
-  status[0] = 0;
-
-  for (i = 1; i < moduleNum; ++i)
-    if (taosCheckPthreadValid(moduleObj[i].thread)) sprintf(status + strlen(status), "%s ", moduleObj[i].name);
-
-  if (status[0] == 0)
-    sprintf(status, "all module is down");
-  else
-    sprintf(status, " is(are) up");
-
-  return status;
-}
-
-int taosInitModule(module_t *pMod) {
-  pthread_attr_t attr;
-
-  if (pthread_mutex_init(&pMod->queueMutex, NULL) < 0) {
-    printf("ERROR: init %s queueMutex failed, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  if (pthread_mutex_init(&pMod->stmMutex, NULL) < 0) {
-    printf("ERROR: init %s stmMutex failed, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  if (tsem_init(&pMod->emptySem, 0, (unsigned int)pMod->queueSize) != 0) {
-    printf("ERROR: init %s empty semaphore failed, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  if (tsem_init(&pMod->fullSem, 0, 0) != 0) {
-    printf("ERROR: init %s full semaphore failed, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  if ((pMod->queue = (msg_t *)malloc((size_t)pMod->queueSize * sizeof(msg_t))) == NULL) {
-    printf("ERROR: %s no enough memory, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  memset(pMod->queue, 0, (size_t)pMod->queueSize * sizeof(msg_t));
-  pMod->fullSlot = 0;
-  pMod->emptySlot = 0;
-
-  pthread_attr_init(&attr);
-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-
-  if (pthread_create(&pMod->thread, &attr, taosProcessQueue, (void *)pMod) != 0) {
-    printf("ERROR: %s failed to create thread, reason:%s\n", pMod->name, strerror(errno));
-    taosCleanUpModule(pMod);
-    return -1;
-  }
-
-  if (pMod->init) return (*(pMod->init))();
-
-  return 0;
-}
-
-void *taosProcessQueue(void *param) {
-  msg_t     msg;
-  module_t *pMod = (module_t *)param;
-  int       oldType;
-
-  pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldType);
-
-  signal(SIGINT, SIG_IGN);
-
-  while (1) {
-    if (tsem_wait(&pMod->fullSem) != 0)
-      printf("ERROR: wait %s fullSem failed, reason:%s\n", pMod->name, strerror(errno));
-
-    if (pthread_mutex_lock(&pMod->queueMutex) != 0)
-      printf("ERROR: lock %s queueMutex failed, reason:%s\n", pMod->name, strerror(errno));
-
-    msg = pMod->queue[pMod->fullSlot];
-    memset(&(pMod->queue[pMod->fullSlot]), 0, sizeof(msg_t));
-    pMod->fullSlot = (pMod->fullSlot + 1) % pMod->queueSize;
-
-    if (pthread_mutex_unlock(&pMod->queueMutex) != 0)
-      printf("ERROR: unlock %s queueMutex failed, reason:%s\n", pMod->name, strerror(errno));
-
-    if (tsem_post(&pMod->emptySem) != 0)
-      printf("ERROR: post %s emptySem failed, reason:%s\n", pMod->name, strerror(errno));
-
-    /* process the message */
-    if (msg.cid < 0 || msg.cid >= maxCid) {
-      /*printf("ERROR: cid:%d is out of range, msg is discarded\n", msg.cid);*/
-      continue;
-    }
-
-    /*
-        if ( pthread_mutex_lock ( &(pMod->stmMutex)) != 0 )
-          printf("ERROR: lock %s stmMutex failed, reason:%s\n", pMod->name,
-       strerror(errno));
-    */
-    (*(pMod->processMsg))(&msg);
-
-    tfree(msg.msg);
-    /*
-        if ( pthread_mutex_unlock ( &(pMod->stmMutex)) != 0 )
-          printf("ERROR: unlock %s stmMutex failed, reason:%s\n", pMod->name,
-       strerror(errno));
-    */
-  }
-}
-
-int taosSendMsgToModule(module_t *pMod, int cid, int mid, int tid, char *msg) {
-  if (tsem_wait(&pMod->emptySem) != 0)
-    printf("ERROR: wait %s emptySem failed, reason:%s\n", pMod->name, strerror(errno));
-
-  if (pthread_mutex_lock(&pMod->queueMutex) != 0)
-    printf("ERROR: lock %s queueMutex failed, reason:%s\n", pMod->name, strerror(errno));
-
-  pMod->queue[pMod->emptySlot].cid = cid;
-  pMod->queue[pMod->emptySlot].mid = mid;
-  pMod->queue[pMod->emptySlot].tid = tid;
-  pMod->queue[pMod->emptySlot].msg = msg;
-  pMod->emptySlot = (pMod->emptySlot + 1) % pMod->queueSize;
-
-  if (pthread_mutex_unlock(&pMod->queueMutex) != 0)
-    printf("ERROR: unlock %s queueMutex failed, reason:%s\n", pMod->name, strerror(errno));
-
-  if (tsem_post(&pMod->fullSem) != 0) printf("ERROR: post %s fullSem failed, reason:%s\n", pMod->name, strerror(errno));
-
-  return 0;
-}
-
-void taosCleanUpModule(module_t *pMod) {
-  int i;
-
-  if (pMod->cleanUp) pMod->cleanUp();
-
-  if (taosCheckPthreadValid(pMod->thread)) {
-    pthread_cancel(pMod->thread);
-    pthread_join(pMod->thread, NULL);
-  }
-
-  taosResetPthread(&pMod->thread);
-  tsem_destroy(&pMod->emptySem);
-  tsem_destroy(&pMod->fullSem);
-  pthread_mutex_destroy(&pMod->queueMutex);
-  pthread_mutex_destroy(&pMod->stmMutex);
-
-  for (i = 0; i < pMod->queueSize; ++i) {
-    tfree(pMod->queue[i].msg);
-  }
-
-  tfree(pMod->queue);
-
-  memset(pMod, 0, sizeof(module_t));
-}
diff --git a/src/util/src/tnettest.c b/src/util/src/tnettest.c
new file mode 100644
index 0000000000000000000000000000000000000000..3793f3d3a944cc5c8d86c0dc0c0fa5bfe3cee764
--- /dev/null
+++ b/src/util/src/tnettest.c
@@ -0,0 +1,423 @@
+/*
+ * 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 "os.h"
+#include "taosdef.h"
+#include "taoserror.h"
+#include "tulog.h"
+#include "tconfig.h"
+#include "tglobal.h"
+#include "tsocket.h"
+
+#define    MAX_PKG_LEN          (64*1000)
+#define    BUFFER_SIZE          (MAX_PKG_LEN + 1024)
+
+typedef struct {
+  uint32_t hostIp;
+  uint16_t port;
+  uint16_t pktLen;
+} info_s;
+
+static char serverFqdn[TSDB_FQDN_LEN];
+static uint16_t g_startPort = 0;
+static uint16_t g_endPort   = 6042;
+
+static void *bindUdpPort(void *sarg) {
+  info_s *pinfo = (info_s *)sarg;
+  int     port = pinfo->port;
+  SOCKET  serverSocket;
+
+  struct sockaddr_in server_addr;
+  struct sockaddr_in clientAddr;
+  char               buffer[BUFFER_SIZE];
+  int                iDataNum;
+    
+  if ((serverSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+    perror("socket");
+    return NULL;
+  }
+
+  bzero(&server_addr, sizeof(server_addr));
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port = htons(port);
+  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+    perror("connect");
+    return NULL;
+  }
+
+  socklen_t sin_size;
+
+  while (1) {
+    memset(buffer, 0, BUFFER_SIZE);
+
+    sin_size = sizeof(*(struct sockaddr *)&server_addr);
+
+    iDataNum = recvfrom(serverSocket, buffer, BUFFER_SIZE, 0, (struct sockaddr *)&clientAddr, &sin_size);
+
+    if (iDataNum < 0) {
+      perror("recvfrom null");
+      continue;
+    }
+    if (iDataNum > 0) {
+      printf("recv Client: %s pkg from UDP port: %d, pkg len: %d\n", taosInetNtoa(clientAddr.sin_addr), port, iDataNum);
+      //printf("Read msg from udp:%s ... %s\n", buffer, buffer+iDataNum-16);
+
+      sendto(serverSocket, buffer, iDataNum, 0, (struct sockaddr *)&clientAddr, (int)sin_size);
+    }
+  }
+
+  taosCloseSocket(serverSocket);
+  return NULL;
+}
+
+static void *bindTcpPort(void *sarg) {
+  info_s *pinfo = (info_s *)sarg;
+  int     port = pinfo->port;
+  SOCKET  serverSocket;
+
+  struct sockaddr_in server_addr;
+  struct sockaddr_in clientAddr;
+  int                addr_len = sizeof(clientAddr);
+  SOCKET             client;
+  char               buffer[BUFFER_SIZE];
+  int                iDataNum = 0;
+
+  if ((serverSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
+    printf("socket() fail: %s", strerror(errno));
+    return NULL;
+  }
+
+  bzero(&server_addr, sizeof(server_addr));
+  server_addr.sin_family = AF_INET;
+  server_addr.sin_port = htons(port);
+  server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+  if (bind(serverSocket, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+    printf("port:%d bind() fail: %s", port, strerror(errno));
+    return NULL;
+  }
+
+  if (listen(serverSocket, 5) < 0) {
+    printf("listen() fail: %s", strerror(errno));
+    return NULL;
+  }
+
+  //printf("Bind port: %d success\n", port);
+  while (1) {
+    client = accept(serverSocket, (struct sockaddr *)&clientAddr, (socklen_t *)&addr_len);
+    if (client < 0) {
+      printf("accept() fail: %s", strerror(errno));
+      continue;
+    }
+
+    iDataNum = 0;
+    memset(buffer, 0, BUFFER_SIZE);
+    int   nleft, nread;
+    char *ptr = buffer;
+    nleft = pinfo->pktLen;
+    while (nleft > 0) {
+      nread = recv(client, ptr, BUFFER_SIZE, 0);
+
+      if (nread == 0) {
+        break;
+      } else if (nread < 0) {
+        if (errno == EINTR) {
+          continue;
+        } else {
+          printf("recv Client: %s pkg from TCP port: %d fail:%s.\n", taosInetNtoa(clientAddr.sin_addr), port, strerror(errno));
+          taosCloseSocket(serverSocket);
+          return NULL;
+        }
+      } else {
+        nleft -= nread;
+        ptr += nread;
+        iDataNum += nread;
+      }      
+    }
+    
+    printf("recv Client: %s pkg from TCP port: %d, pkg len: %d\n", taosInetNtoa(clientAddr.sin_addr), port, iDataNum);
+    if (iDataNum > 0) {
+      send(client, buffer, iDataNum, 0);
+    }
+  }
+  
+  taosCloseSocket(serverSocket);
+  return NULL;
+}
+
+static int checkTcpPort(info_s *info) {
+  struct sockaddr_in serverAddr;
+  SOCKET             clientSocket;
+  char               sendbuf[BUFFER_SIZE];
+  char               recvbuf[BUFFER_SIZE];
+  int                iDataNum = 0;
+  if ((clientSocket = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+    printf("socket() fail: %s\n", strerror(errno));
+    return -1;
+  }
+
+  // set send and recv overtime
+  struct timeval timeout;  
+  timeout.tv_sec = 2;  //s
+  timeout.tv_usec = 0; //us  
+  if (setsockopt(clientSocket, SOL_SOCKET,SO_SNDTIMEO, (char *)&timeout, sizeof(struct timeval)) == -1) {
+    perror("setsockopt send timer failed:");
+  }
+  if (setsockopt(clientSocket, SOL_SOCKET,SO_RCVTIMEO, (char *)&timeout, sizeof(struct timeval)) == -1) {
+    perror("setsockopt recv timer failed:");
+  }
+
+  serverAddr.sin_family = AF_INET;
+  serverAddr.sin_port = htons(info->port);
+
+  serverAddr.sin_addr.s_addr = info->hostIp;
+
+  //printf("=================================\n");
+  if (connect(clientSocket, (struct sockaddr *)&serverAddr, sizeof(serverAddr)) < 0) {
+    printf("connect() fail: %s\t", strerror(errno));
+    return -1;
+  }
+  //printf("Connect to: %s:%d...success\n", host, port);
+  memset(sendbuf, 0, BUFFER_SIZE);
+  memset(recvbuf, 0, BUFFER_SIZE);
+
+  struct in_addr ipStr;
+  memcpy(&ipStr, &info->hostIp, 4);
+  sprintf(sendbuf, "client send tcp pkg to %s:%d, content: 1122334455", taosInetNtoa(ipStr), info->port);
+  sprintf(sendbuf + info->pktLen - 16, "1122334455667788");
+
+  send(clientSocket, sendbuf, info->pktLen, 0);
+
+  memset(recvbuf, 0, BUFFER_SIZE);
+  int   nleft, nread;
+  char *ptr = recvbuf;
+  nleft = info->pktLen;
+  while (nleft > 0) {
+    nread = recv(clientSocket, ptr, BUFFER_SIZE, 0);;
+  
+    if (nread == 0) {
+      break;
+    } else if (nread < 0) {
+      if (errno == EINTR) {
+        continue;
+      } else {
+        printf("recv ack pkg from TCP port: %d fail:%s.\n", info->port, strerror(errno));
+        taosCloseSocket(clientSocket);
+        return -1;
+      }
+    } else {
+      nleft -= nread;
+      ptr += nread;
+      iDataNum += nread;
+    }      
+  }
+
+  if (iDataNum < info->pktLen) {
+    printf("recv ack pkg len: %d, less than req pkg len: %d from tcp port: %d\n", iDataNum, info->pktLen, info->port);
+    return -1;
+  }
+  //printf("Read ack pkg len:%d from tcp port: %d, buffer: %s  %s\n", info->pktLen, port, recvbuf, recvbuf+iDataNum-8);
+
+  taosCloseSocket(clientSocket);
+  return 0;
+}
+
+static int checkUdpPort(info_s *info) {
+  struct sockaddr_in serverAddr;
+  SOCKET             clientSocket;
+  char               sendbuf[BUFFER_SIZE];
+  char               recvbuf[BUFFER_SIZE];
+  int                iDataNum = 0;
+  if ((clientSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+    perror("socket");
+    return -1;
+  }
+
+  // set overtime 
+  struct timeval timeout;
+  timeout.tv_sec = 2;  //s
+  timeout.tv_usec = 0; //us
+  if (setsockopt(clientSocket, SOL_SOCKET,SO_SNDTIMEO, (char *)&timeout, sizeof(struct timeval)) == -1) {
+    perror("setsockopt send timer failed:");
+  }
+  if (setsockopt(clientSocket, SOL_SOCKET,SO_RCVTIMEO, (char *)&timeout, sizeof(struct timeval)) == -1) {
+    perror("setsockopt recv timer failed:");
+  }
+  
+  serverAddr.sin_family = AF_INET;
+  serverAddr.sin_port = htons(info->port);
+  serverAddr.sin_addr.s_addr = info->hostIp;
+  
+  memset(sendbuf, 0, BUFFER_SIZE);
+  memset(recvbuf, 0, BUFFER_SIZE);
+
+  struct in_addr ipStr;
+  memcpy(&ipStr, &info->hostIp, 4);
+  sprintf(sendbuf, "client send udp pkg to %s:%d, content: 1122334455", taosInetNtoa(ipStr), info->port);
+  sprintf(sendbuf + info->pktLen - 16, "1122334455667788");
+
+  socklen_t sin_size = sizeof(*(struct sockaddr *)&serverAddr);
+
+  int code = sendto(clientSocket, sendbuf, info->pktLen, 0, (struct sockaddr *)&serverAddr, (int)sin_size);
+  if (code < 0) {
+    perror("sendto");
+    return -1;
+  }
+
+  iDataNum = recvfrom(clientSocket, recvbuf, BUFFER_SIZE, 0, (struct sockaddr *)&serverAddr, &sin_size);
+
+  if (iDataNum < info->pktLen) {
+    printf("Read ack pkg len: %d, less than req pkg len: %d from udp port: %d\t\t", iDataNum, info->pktLen, info->port);
+    return -1;
+  }
+  
+  //printf("Read ack pkg len:%d from udp port: %d, buffer: %s  %s\n", info->pktLen, port, recvbuf, recvbuf+iDataNum-8);
+  taosCloseSocket(clientSocket);
+  return 0;
+}
+
+static void checkPort(uint32_t hostIp, uint16_t startPort, uint16_t maxPort, uint16_t pktLen) {
+  int ret;
+  info_s info;
+  memset(&info, 0, sizeof(info_s));
+  info.hostIp   = hostIp;
+  info.pktLen   = pktLen;
+
+  for (uint16_t port = startPort; port <= maxPort; port++) {
+    //printf("test: %s:%d\n", info.host, port);
+    printf("\n");
+
+    info.port = port;
+    ret = checkTcpPort(&info);
+    if (ret != 0) {
+      printf("tcp port:%d test fail.\t\n", port);
+    } else {
+      printf("tcp port:%d test ok.\t\t", port);
+    }
+    
+    ret = checkUdpPort(&info);
+    if (ret != 0) {
+      printf("udp port:%d test fail.\t\n", port);
+    } else {
+      printf("udp port:%d test ok.\t\t", port);
+    }
+  }
+  
+  printf("\n");
+  return ;
+}
+
+static void taosNetTestClient(const char* serverFqdn, uint16_t startPort, uint16_t endPort, int pktLen) {
+  uint32_t serverIp = taosGetIpFromFqdn(serverFqdn);
+  if (serverIp == 0xFFFFFFFF) {
+    printf("Failed to resolve FQDN:%s", serverFqdn); 
+    exit(-1);
+  }
+
+  checkPort(serverIp, startPort, endPort, pktLen);
+
+  return;
+}
+
+
+
+static void taosNetTestServer(uint16_t startPort, uint16_t endPort, int pktLen) {
+
+  int port = startPort;
+  int num = endPort - startPort + 1;
+
+  if (num < 0) {
+    num = 1;
+  }
+  
+  pthread_t *pids = malloc(2 * num * sizeof(pthread_t));
+  info_s *     tinfos = malloc(num * sizeof(info_s));
+  info_s *     uinfos = malloc(num * sizeof(info_s));
+
+  for (size_t i = 0; i < num; i++) {
+    info_s *tcpInfo = tinfos + i;
+    tcpInfo->port = (uint16_t)(port + i);
+    tcpInfo->pktLen = pktLen;
+
+    if (pthread_create(pids + i, NULL, bindTcpPort, tcpInfo) != 0) 
+    {
+      printf("create thread fail, port:%d.\n", port);
+      exit(-1);
+    }
+
+    info_s *udpInfo = uinfos + i;
+    udpInfo->port = (uint16_t)(port + i);
+    if (pthread_create(pids + num + i, NULL, bindUdpPort, udpInfo) != 0)
+    {                          
+      printf("create thread fail, port:%d.\n", port);
+      exit(-1);
+    }
+  }
+  
+  for (int i = 0; i < num; i++) {
+    pthread_join(pids[i], NULL);
+    pthread_join(pids[(num + i)], NULL);
+  }
+}
+
+
+void taosNetTest(const char* host, uint16_t port, uint16_t endPort, int pktLen, const char* netTestRole) {
+  if (pktLen > MAX_PKG_LEN) {
+    printf("test packet len overflow: %d, max len not greater than %d bytes\n", pktLen, MAX_PKG_LEN);
+    exit(-1);
+  }
+  
+  if (port && endPort) {
+    if (port > endPort) {
+      printf("endPort[%d] must not lesss port[%d]\n", endPort, port);
+      exit(-1);
+    }
+  }  
+ 
+  if (host && host[0] != 0) {
+    if (strlen(host) >= TSDB_EP_LEN) {
+      printf("host invalid: %s\n", host);
+      exit(-1);
+    }
+
+    taosGetFqdnPortFromEp(host, serverFqdn, &g_startPort);
+  } else {
+    tstrncpy(serverFqdn, "127.0.0.1", TSDB_IPv4ADDR_LEN);    
+    g_startPort = tsServerPort;
+  }
+  
+  if (port) {
+    g_startPort = port;
+  }
+  
+  if (endPort) {
+    g_endPort = endPort;
+  }
+  
+  if (port > endPort) {
+    printf("endPort[%d] must not lesss port[%d]\n", g_endPort, g_startPort);
+    exit(-1);
+  }
+  
+  if (0 == strcmp("client", netTestRole)) {
+    printf("host: %s\tstart port: %d\tend port: %d\tpacket len: %d\n", serverFqdn, g_startPort, g_endPort, pktLen);
+    taosNetTestClient(serverFqdn, g_startPort, g_endPort, pktLen);
+  } else if (0 == strcmp("server", netTestRole)) {
+    taosNetTestServer(g_startPort, g_endPort, pktLen);
+  }
+}
+
diff --git a/src/util/src/tnote.c b/src/util/src/tnote.c
index 7a133590d2a450d8e8b688bc63515c0ad9e81912..4f05277a847a07831371278915011ebc4da400c6 100644
--- a/src/util/src/tnote.c
+++ b/src/util/src/tnote.c
@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "os.h"
 #include "tnote.h"
 
 taosNoteInfo  m_HttpNote;
@@ -27,10 +28,10 @@ void taosInitNote(int numOfNoteLines, int maxNotes, char* lable)
 
     if (strcasecmp(lable, "http_note") == 0) {
         pNote = &m_HttpNote;
-        sprintf(temp, "%s/httpnote", logDir);
+        sprintf(temp, "%s/httpnote", tsLogDir);
     } else if (strcasecmp(lable, "tsc_note") == 0) {
         pNote = &m_TscNote;        
-        sprintf(temp, "%s/tscnote-%d", logDir, getpid());
+        sprintf(temp, "%s/tscnote-%d", tsLogDir, getpid());
     } else {
         return;
     }
@@ -77,7 +78,7 @@ void taosUnLockNote(int fd, taosNoteInfo * pNote)
 
 void *taosThreadToOpenNewNote(void *param)
 {
-    char name[NOTE_FILE_NAME_LEN];
+    char name[NOTE_FILE_NAME_LEN * 2];
     taosNoteInfo * pNote = (taosNoteInfo *)param;
 
     pNote->taosNoteFlag ^= 1;
@@ -87,8 +88,12 @@ void *taosThreadToOpenNewNote(void *param)
     umask(0);
 
     int fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
+    if (fd < 0) {
+      return NULL;
+    }
+
     taosLockNote(fd, pNote);
-    lseek(fd, 0, SEEK_SET);
+    (void)lseek(fd, 0, SEEK_SET);
 
     int oldFd = pNote->taosNoteFd;
     pNote->taosNoteFd = fd;
@@ -124,10 +129,12 @@ int taosOpenNewNote(taosNoteInfo * pNote)
 
 bool taosCheckNoteIsOpen(char *noteName, taosNoteInfo * pNote)
 {
+    /*
     int exist = access(noteName, F_OK);
     if (exist != 0) {
         return false;
     }
+    */
 
     int fd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
     if (fd < 0) {
@@ -165,12 +172,14 @@ void taosGetNoteName(char *fn, taosNoteInfo * pNote)
         }
     }
 
-    strcpy(pNote->taosNoteName, fn);
+    if (strlen(fn) < NOTE_FILE_NAME_LEN) {
+      strcpy(pNote->taosNoteName, fn);
+    }
 }
 
 int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInfo * pNote)
 {
-    char name[NOTE_FILE_NAME_LEN] = "\0";
+    char name[NOTE_FILE_NAME_LEN * 2] = "\0";
     struct stat  notestat0, notestat1;
     int size;
 
@@ -178,14 +187,18 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf
     pNote->taosNoteFileNum = maxNoteNum;
     taosGetNoteName(fn, pNote);
 
+    if (strlen(fn) > NOTE_FILE_NAME_LEN * 2 - 2) {
+      fprintf(stderr, "the len of file name overflow:%s\n", fn);
+      return -1;
+    } 
+
     strcpy(name, fn);
     strcat(name, ".0");
 
     // if none of the note files exist, open 0, if both exists, open the old one
     if (stat(name, &notestat0) < 0) {
         pNote->taosNoteFlag = 0;
-    }
-    else {
+    } else {
         strcpy(name, fn);
         strcat(name, ".1");
         if (stat(name, &notestat1) < 0) {
@@ -196,21 +209,25 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf
         }
     }
 
-    sprintf(name, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag);
+    char noteName[NOTE_FILE_NAME_LEN * 2] = "\0";
+    sprintf(noteName, "%s.%d", pNote->taosNoteName, pNote->taosNoteFlag);
     pthread_mutex_init(&pNote->taosNoteMutex, NULL);
 
     umask(0);
-    pNote->taosNoteFd = open(name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
+    pNote->taosNoteFd = open(noteName, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
 
     if (pNote->taosNoteFd < 0) {
-        fprintf(stderr, "failed to open note file:%s reason:%s\n", name, strerror(errno));
+        fprintf(stderr, "failed to open note file:%s reason:%s\n", noteName, strerror(errno));
         return -1;
     }
     taosLockNote(pNote->taosNoteFd, pNote);
 
     // only an estimate for number of lines
     struct stat filestat;
-    fstat(pNote->taosNoteFd, &filestat);
+    if (fstat(pNote->taosNoteFd, &filestat) < 0) {
+      fprintf(stderr, "failed to fstat note file:%s reason:%s\n", noteName, strerror(errno));
+      return -1;
+    }    
     size = (int)filestat.st_size;
     pNote->taosNoteLines = size / 60;
 
@@ -222,7 +239,7 @@ int taosOpenNoteWithMaxLines(char *fn, int maxLines, int maxNoteNum, taosNoteInf
 void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...)
 {
     va_list argpointer;
-    char    buffer[MAX_NOTE_LINE_SIZE];
+    char    buffer[MAX_NOTE_LINE_SIZE+2];
     int     len;
     struct  tm      Tm, *ptm;
     struct  timeval timeSecs;
@@ -236,7 +253,7 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...)
                 ptm->tm_min, ptm->tm_sec, (int)timeSecs.tv_usec, taosGetPthreadId());
 #else
   len = sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d %lx ", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min,
-                ptm->tm_sec, (int)timeSecs.tv_usec, pthread_self());
+                ptm->tm_sec, (int)timeSecs.tv_usec, (unsigned long int)pthread_self());
 #endif
     va_start(argpointer, format);
     len += vsnprintf(buffer + len, MAX_NOTE_LINE_SIZE - len, format, argpointer);
@@ -248,7 +265,7 @@ void taosNotePrint(taosNoteInfo * pNote, const char * const format, ...)
     buffer[len] = 0;
 
     if (pNote->taosNoteFd >= 0)  {
-        twrite(pNote->taosNoteFd, buffer, (unsigned int)len);
+        taosTWrite(pNote->taosNoteFd, buffer, (unsigned int)len);
 
         if (pNote->taosNoteMaxLines > 0) {
             pNote->taosNoteLines++;
diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c6d6243eb4f677e9a5436b4449e07df011d2b52
--- /dev/null
+++ b/src/util/src/tqueue.c
@@ -0,0 +1,434 @@
+/*
+ * 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 "os.h"
+#include "tulog.h"
+#include "taoserror.h"
+#include "tqueue.h"
+
+typedef struct STaosQnode {
+  int                 type;
+  struct STaosQnode  *next;
+  char                item[];
+} STaosQnode;
+
+typedef struct STaosQueue {
+  int32_t             itemSize;
+  int32_t             numOfItems;
+  struct STaosQnode  *head;
+  struct STaosQnode  *tail;
+  struct STaosQueue  *next;    // for queue set
+  struct STaosQset   *qset;    // for queue set
+  void               *ahandle; // for queue set
+  pthread_mutex_t     mutex;  
+} STaosQueue;
+
+typedef struct STaosQset {
+  STaosQueue        *head;
+  STaosQueue        *current;
+  pthread_mutex_t    mutex;
+  int32_t            numOfQueues;
+  int32_t            numOfItems;
+  tsem_t             sem;
+} STaosQset;
+
+typedef struct STaosQall {
+  STaosQnode   *current;
+  STaosQnode   *start;
+  int32_t       itemSize;
+  int32_t       numOfItems;
+} STaosQall; 
+  
+taos_queue taosOpenQueue() {
+  
+  STaosQueue *queue = (STaosQueue *) calloc(sizeof(STaosQueue), 1);
+  if (queue == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pthread_mutex_init(&queue->mutex, NULL);
+
+  uTrace("queue:%p is openned", queue);
+  return queue;
+}
+
+void taosCloseQueue(taos_queue param) {
+  if (param == NULL) return;
+  STaosQueue *queue = (STaosQueue *)param;
+  STaosQnode *pTemp;
+  STaosQset  *qset;
+
+  pthread_mutex_lock(&queue->mutex);
+  STaosQnode *pNode = queue->head;  
+  queue->head = NULL;
+  qset = queue->qset;
+  pthread_mutex_unlock(&queue->mutex);
+
+  if (queue->qset) taosRemoveFromQset(qset, queue); 
+
+  pthread_mutex_lock(&queue->mutex);
+
+  while (pNode) {
+    pTemp = pNode;
+    pNode = pNode->next;
+    free (pTemp);
+  }
+
+  pthread_mutex_unlock(&queue->mutex);
+  pthread_mutex_destroy(&queue->mutex);
+  free(queue);
+
+  uTrace("queue:%p is closed", queue);
+}
+
+void *taosAllocateQitem(int size) {
+  STaosQnode *pNode = (STaosQnode *)calloc(sizeof(STaosQnode) + size, 1);
+  
+  if (pNode == NULL) return NULL;
+  uTrace("item:%p, node:%p is allocated", pNode->item, pNode);
+  return (void *)pNode->item;
+}
+
+void taosFreeQitem(void *param) {
+  if (param == NULL) return;
+
+  char *temp = (char *)param;
+  temp -= sizeof(STaosQnode);
+  uTrace("item:%p, node:%p is freed", param, temp);
+  free(temp);
+}
+
+int taosWriteQitem(taos_queue param, int type, void *item) {
+  STaosQueue *queue = (STaosQueue *)param;
+  STaosQnode *pNode = (STaosQnode *)(((char *)item) - sizeof(STaosQnode));
+  pNode->type = type;
+  pNode->next = NULL;
+
+  pthread_mutex_lock(&queue->mutex);
+
+  if (queue->tail) {
+    queue->tail->next = pNode;
+    queue->tail = pNode;
+  } else {
+    queue->head = pNode;
+    queue->tail = pNode; 
+  }
+
+  queue->numOfItems++;
+  if (queue->qset) atomic_add_fetch_32(&queue->qset->numOfItems, 1);
+  uTrace("item:%p is put into queue:%p, type:%d items:%d", item, queue, type, queue->numOfItems);
+
+  pthread_mutex_unlock(&queue->mutex);
+
+  if (queue->qset) tsem_post(&queue->qset->sem);
+
+  return 0;
+}
+
+int taosReadQitem(taos_queue param, int *type, void **pitem) {
+  STaosQueue *queue = (STaosQueue *)param;
+  STaosQnode *pNode = NULL;
+  int         code = 0;
+
+  pthread_mutex_lock(&queue->mutex);
+
+  if (queue->head) {
+      pNode = queue->head;
+      *pitem = pNode->item;
+      *type = pNode->type;
+      queue->head = pNode->next;
+      if (queue->head == NULL) 
+        queue->tail = NULL;
+      queue->numOfItems--;
+      if (queue->qset) atomic_sub_fetch_32(&queue->qset->numOfItems, 1);
+      code = 1;
+      uDebug("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
+  } 
+
+  pthread_mutex_unlock(&queue->mutex);
+
+  return code;
+}
+
+void *taosAllocateQall() {
+  void *p = calloc(sizeof(STaosQall), 1);
+  return p;
+}
+
+void taosFreeQall(void *param) {
+  free(param);
+}
+
+int taosReadAllQitems(taos_queue param, taos_qall p2) {
+  STaosQueue *queue = (STaosQueue *)param;
+  STaosQall  *qall = (STaosQall *)p2;
+  int         code = 0;
+
+  pthread_mutex_lock(&queue->mutex);
+
+  if (queue->head) {
+    memset(qall, 0, sizeof(STaosQall));
+    qall->current = queue->head;
+    qall->start = queue->head;
+    qall->numOfItems = queue->numOfItems;
+    qall->itemSize = queue->itemSize;
+    code = qall->numOfItems;
+
+    queue->head = NULL;
+    queue->tail = NULL;
+    queue->numOfItems = 0;
+    if (queue->qset) atomic_sub_fetch_32(&queue->qset->numOfItems, qall->numOfItems);
+  } 
+
+  pthread_mutex_unlock(&queue->mutex);
+  
+  return code; 
+}
+
+int taosGetQitem(taos_qall param, int *type, void **pitem) {
+  STaosQall  *qall = (STaosQall *)param;
+  STaosQnode *pNode;
+  int         num = 0;
+
+  pNode = qall->current;
+  if (pNode)
+    qall->current = pNode->next;
+ 
+  if (pNode) {
+    *pitem = pNode->item;
+    *type = pNode->type;
+    num = 1;
+    uTrace("item:%p is fetched, type:%d", *pitem, *type);
+  }
+
+  return num;
+}
+
+void taosResetQitems(taos_qall param) {
+  STaosQall  *qall = (STaosQall *)param;
+  qall->current = qall->start;
+}
+
+taos_qset taosOpenQset() {
+
+  STaosQset *qset = (STaosQset *) calloc(sizeof(STaosQset), 1);
+  if (qset == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pthread_mutex_init(&qset->mutex, NULL);
+  tsem_init(&qset->sem, 0, 0);
+
+  uTrace("qset:%p is openned", qset);
+  return qset;
+}
+
+void taosCloseQset(taos_qset param) {
+  if (param == NULL) return;
+  STaosQset *qset = (STaosQset *)param;
+
+  // remove all the queues from qset
+  pthread_mutex_lock(&qset->mutex);
+  while (qset->head) {
+    STaosQueue *queue = qset->head;
+    qset->head = qset->head->next;
+
+    queue->qset = NULL;
+    queue->next = NULL;
+  }
+  pthread_mutex_unlock(&qset->mutex);
+
+  pthread_mutex_destroy(&qset->mutex);
+  tsem_destroy(&qset->sem);
+  free(qset);
+  uTrace("qset:%p is closed", qset);
+}
+
+// tsem_post 'qset->sem', so that reader threads waiting for it
+// resumes execution and return, should only be used to signal the
+// thread to exit.
+void taosQsetThreadResume(taos_qset param) {
+  STaosQset *qset = (STaosQset *)param;
+  tsem_post(&qset->sem);
+}
+
+int taosAddIntoQset(taos_qset p1, taos_queue p2, void *ahandle) {
+  STaosQueue *queue = (STaosQueue *)p2;
+  STaosQset  *qset = (STaosQset *)p1;
+
+  if (queue->qset) return -1; 
+
+  pthread_mutex_lock(&qset->mutex);
+
+  queue->next = qset->head;
+  queue->ahandle = ahandle;
+  qset->head = queue;
+  qset->numOfQueues++;
+
+  pthread_mutex_lock(&queue->mutex);
+  atomic_add_fetch_32(&qset->numOfItems, queue->numOfItems);
+  queue->qset = qset;
+  pthread_mutex_unlock(&queue->mutex);
+
+  pthread_mutex_unlock(&qset->mutex);
+
+  uTrace("queue:%p is added into qset:%p", queue, qset);
+  return 0;
+}
+
+void taosRemoveFromQset(taos_qset p1, taos_queue p2) {
+  STaosQueue *queue = (STaosQueue *)p2;
+  STaosQset  *qset = (STaosQset *)p1;
+ 
+  STaosQueue *tqueue = NULL;
+
+  pthread_mutex_lock(&qset->mutex);
+
+  if (qset->head) {
+    if (qset->head == queue) {
+      qset->head = qset->head->next;
+      tqueue = queue;
+    } else {
+      STaosQueue *prev = qset->head;
+      tqueue = qset->head->next;
+      while (tqueue) {
+        assert(tqueue->qset);
+        if (tqueue== queue) {
+          prev->next = tqueue->next;
+          break;
+        } else {
+          prev = tqueue;
+          tqueue = tqueue->next;
+        }
+      }
+    }
+
+    if (tqueue) {
+      if (qset->current == queue) qset->current = tqueue->next;
+      qset->numOfQueues--;
+
+      pthread_mutex_lock(&queue->mutex);
+      atomic_sub_fetch_32(&qset->numOfItems, queue->numOfItems);
+      queue->qset = NULL;
+      queue->next = NULL;
+      pthread_mutex_unlock(&queue->mutex);
+    }
+  } 
+  
+  pthread_mutex_unlock(&qset->mutex);
+
+  uTrace("queue:%p is removed from qset:%p", queue, qset);
+}
+
+int taosGetQueueNumber(taos_qset param) {
+  return ((STaosQset *)param)->numOfQueues;
+}
+
+int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phandle) {
+  STaosQset  *qset = (STaosQset *)param;
+  STaosQnode *pNode = NULL;
+  int         code = 0;
+   
+  tsem_wait(&qset->sem);
+
+  pthread_mutex_lock(&qset->mutex);
+
+  for(int i=0; i<qset->numOfQueues; ++i) {
+    if (qset->current == NULL) 
+      qset->current = qset->head;   
+    STaosQueue *queue = qset->current;
+    if (queue) qset->current = queue->next;
+    if (queue == NULL) break;
+    if (queue->head == NULL) continue;
+
+    pthread_mutex_lock(&queue->mutex);
+
+    if (queue->head) {
+        pNode = queue->head;
+        *pitem = pNode->item;
+        *type = pNode->type;
+        *phandle = queue->ahandle;
+        queue->head = pNode->next;
+        if (queue->head == NULL) 
+          queue->tail = NULL;
+        queue->numOfItems--;
+        atomic_sub_fetch_32(&qset->numOfItems, 1);
+        code = 1;
+        uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
+    } 
+
+    pthread_mutex_unlock(&queue->mutex);
+    if (pNode) break;
+  }
+
+  pthread_mutex_unlock(&qset->mutex);
+
+  return code; 
+}
+
+int taosReadAllQitemsFromQset(taos_qset param, taos_qall p2, void **phandle) {
+  STaosQset  *qset = (STaosQset *)param;
+  STaosQueue *queue;
+  STaosQall  *qall = (STaosQall *)p2;
+  int         code = 0;
+
+  tsem_wait(&qset->sem);
+  pthread_mutex_lock(&qset->mutex);
+
+  for(int i=0; i<qset->numOfQueues; ++i) {
+    if (qset->current == NULL) 
+      qset->current = qset->head;   
+    queue = qset->current;
+    if (queue) qset->current = queue->next;
+    if (queue == NULL) break;
+    if (queue->head == NULL) continue;
+
+    pthread_mutex_lock(&queue->mutex);
+
+    if (queue->head) {
+      qall->current = queue->head;
+      qall->start = queue->head;
+      qall->numOfItems = queue->numOfItems;
+      qall->itemSize = queue->itemSize;
+      code = qall->numOfItems;
+      *phandle = queue->ahandle;
+          
+      queue->head = NULL;
+      queue->tail = NULL;
+      queue->numOfItems = 0;
+      atomic_sub_fetch_32(&qset->numOfItems, qall->numOfItems);
+      for (int j=1; j<qall->numOfItems; ++j) tsem_wait(&qset->sem);
+    } 
+
+    pthread_mutex_unlock(&queue->mutex);
+
+    if (code != 0) break;  
+  }
+
+  pthread_mutex_unlock(&qset->mutex);
+  return code;
+}
+
+int taosGetQueueItemsNumber(taos_queue param) {
+  STaosQueue *queue = (STaosQueue *)param;
+  return queue->numOfItems;
+}
+
+int taosGetQsetItemsNumber(taos_qset param) {
+  STaosQset *qset = (STaosQset *)param;
+  return qset->numOfItems;
+}
diff --git a/src/util/src/tsched.c b/src/util/src/tsched.c
index 56d16eeb7196bebaf871615ed93f06b424079180..f014dd0fab5494bd85f197e2c79fac53359e8edf 100644
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
@@ -14,14 +14,16 @@
  */
 
 #include "os.h"
-#include "tlog.h"
+#include "taosdef.h"
+#include "tutil.h"
+#include "tulog.h"
 #include "tsched.h"
 #include "ttimer.h"
 
 #define DUMP_SCHEDULER_TIME_WINDOW 30000 //every 30sec, take a snap shot of task queue.
 
 typedef struct {
-  char            label[16];
+  char            label[TSDB_LABEL_LEN];
   tsem_t          emptySem;
   tsem_t          fullSem;
   pthread_mutex_t queueMutex;
@@ -31,7 +33,7 @@ typedef struct {
   int             numOfThreads;
   pthread_t *     qthread;
   SSchedMsg *     queue;
-  
+  bool            stop;
   void*           pTmrCtrl;
   void*           pTimer;
 } SSchedQueue;
@@ -40,66 +42,68 @@ static void *taosProcessSchedQueue(void *param);
 static void taosDumpSchedulerStatus(void *qhandle, void *tmrId);
 
 void *taosInitScheduler(int queueSize, int numOfThreads, const char *label) {
-  pthread_attr_t attr;
-  SSchedQueue *  pSched = (SSchedQueue *)malloc(sizeof(SSchedQueue));
+  SSchedQueue *pSched = (SSchedQueue *)calloc(sizeof(SSchedQueue), 1);
   if (pSched == NULL) {
-    pError("%s: no enough memory for pSched, reason: %s", label, strerror(errno));
-    goto _error;
+    uError("%s: no enough memory for pSched", label);
+    return NULL;
   }
 
-  memset(pSched, 0, sizeof(SSchedQueue));
-  pSched->queueSize = queueSize;
-  strncpy(pSched->label, label, sizeof(pSched->label)); // fix buffer overflow
-  pSched->label[sizeof(pSched->label)-1] = '\0';
-
-  if (pthread_mutex_init(&pSched->queueMutex, NULL) < 0) {
-    pError("init %s:queueMutex failed, reason:%s", pSched->label, strerror(errno));
-    goto _error;
-  }
-
-  if (tsem_init(&pSched->emptySem, 0, (unsigned int)pSched->queueSize) != 0) {
-    pError("init %s:empty semaphore failed, reason:%s", pSched->label, strerror(errno));
-    goto _error;
+  pSched->queue = (SSchedMsg *)calloc(sizeof(SSchedMsg), queueSize);
+  if (pSched->queue == NULL) {
+    uError("%s: no enough memory for queue", label);
+    taosCleanUpScheduler(pSched);
+    return NULL;
   }
 
-  if (tsem_init(&pSched->fullSem, 0, 0) != 0) {
-    pError("init %s:full semaphore failed, reason:%s", pSched->label, strerror(errno));
-    goto _error;
+  pSched->qthread = calloc(sizeof(pthread_t), numOfThreads);
+  if (pSched->qthread == NULL) {
+    uError("%s: no enough memory for qthread", label);
+    taosCleanUpScheduler(pSched);
+    return NULL;
   }
 
-  if ((pSched->queue = (SSchedMsg *)malloc((size_t)pSched->queueSize * sizeof(SSchedMsg))) == NULL) {
-    pError("%s: no enough memory for queue, reason:%s", pSched->label, strerror(errno));
-    goto _error;
-  }
+  pSched->queueSize = queueSize;
+  tstrncpy(pSched->label, label, sizeof(pSched->label)); // fix buffer overflow
 
-  memset(pSched->queue, 0, (size_t)pSched->queueSize * sizeof(SSchedMsg));
   pSched->fullSlot = 0;
   pSched->emptySlot = 0;
 
-  pSched->qthread = malloc(sizeof(pthread_t) * (size_t)numOfThreads);
-  if (pSched->qthread == NULL) {
-    pError("%s: no enough memory for qthread, reason: %s", pSched->label, strerror(errno));
-    goto _error;
+  if (pthread_mutex_init(&pSched->queueMutex, NULL) < 0) {
+    uError("init %s:queueMutex failed(%s)", label, strerror(errno));
+    taosCleanUpScheduler(pSched);
+    return NULL;
   }
 
-  pthread_attr_init(&attr);
-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+  if (tsem_init(&pSched->emptySem, 0, (unsigned int)pSched->queueSize) != 0) {
+    uError("init %s:empty semaphore failed(%s)", label, strerror(errno));
+    taosCleanUpScheduler(pSched);
+    return NULL;
+  }
 
+  if (tsem_init(&pSched->fullSem, 0, 0) != 0) {
+    uError("init %s:full semaphore failed(%s)", label, strerror(errno));
+    taosCleanUpScheduler(pSched);
+    return NULL;
+  }
+
+  pSched->stop = false;
   for (int i = 0; i < numOfThreads; ++i) {
-    if (pthread_create(pSched->qthread + i, &attr, taosProcessSchedQueue, (void *)pSched) != 0) {
-      pError("%s: failed to create rpc thread, reason:%s", pSched->label, strerror(errno));
-      goto _error;
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+    int code = pthread_create(pSched->qthread + i, &attr, taosProcessSchedQueue, (void *)pSched);
+    pthread_attr_destroy(&attr);
+    if (code != 0) {
+      uError("%s: failed to create rpc thread(%s)", label, strerror(errno));
+      taosCleanUpScheduler(pSched);
+      return NULL;
     }
     ++pSched->numOfThreads;
   }
 
-  pTrace("%s scheduler is initialized, numOfThreads:%d", pSched->label, pSched->numOfThreads);
+  uDebug("%s scheduler is initialized, numOfThreads:%d", label, pSched->numOfThreads);
 
   return (void *)pSched;
-
-_error:
-  taosCleanUpScheduler(pSched);
-  return NULL;
 }
 
 void *taosInitSchedulerWithInfo(int queueSize, int numOfThreads, const char *label, void *tmrCtrl) {
@@ -119,26 +123,24 @@ void *taosProcessSchedQueue(void *param) {
 
   while (1) {
     if (tsem_wait(&pSched->fullSem) != 0) {
-      if (errno == EINTR) {
-        /* sem_wait is interrupted by interrupt, ignore and continue */
-        pTrace("wait %s fullSem was interrupted", pSched->label);
-        continue;
-      }
-      pError("wait %s fullSem failed, errno:%d, reason:%s", pSched->label, errno, strerror(errno));
+      uError("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
+    }
+    if (pSched->stop) {
+      break;
     }
 
     if (pthread_mutex_lock(&pSched->queueMutex) != 0)
-      pError("lock %s queueMutex failed, reason:%s", pSched->label, strerror(errno));
+      uError("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
 
     msg = pSched->queue[pSched->fullSlot];
     memset(pSched->queue + pSched->fullSlot, 0, sizeof(SSchedMsg));
     pSched->fullSlot = (pSched->fullSlot + 1) % pSched->queueSize;
 
     if (pthread_mutex_unlock(&pSched->queueMutex) != 0)
-      pError("unlock %s queueMutex failed, reason:%s\n", pSched->label, strerror(errno));
+      uError("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
 
     if (tsem_post(&pSched->emptySem) != 0)
-      pError("post %s emptySem failed, reason:%s\n", pSched->label, strerror(errno));
+      uError("post %s emptySem failed(%s)", pSched->label, strerror(errno));
 
     if (msg.fp)
       (*(msg.fp))(&msg);
@@ -152,28 +154,25 @@ void *taosProcessSchedQueue(void *param) {
 int taosScheduleTask(void *qhandle, SSchedMsg *pMsg) {
   SSchedQueue *pSched = (SSchedQueue *)qhandle;
   if (pSched == NULL) {
-    pError("sched is not ready, msg:%p is dropped", pMsg);
+    uError("sched is not ready, msg:%p is dropped", pMsg);
     return 0;
   }
 
-  while (tsem_wait(&pSched->emptySem) != 0) {
-    if (errno != EINTR) {
-      pError("wait %s emptySem failed, reason:%s", pSched->label, strerror(errno));
-      break;
-    }
-    pTrace("wait %s emptySem was interrupted", pSched->label);
+  if (tsem_wait(&pSched->emptySem) != 0) {
+    uError("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
   }
 
   if (pthread_mutex_lock(&pSched->queueMutex) != 0)
-    pError("lock %s queueMutex failed, reason:%s", pSched->label, strerror(errno));
+    uError("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
 
   pSched->queue[pSched->emptySlot] = *pMsg;
   pSched->emptySlot = (pSched->emptySlot + 1) % pSched->queueSize;
 
   if (pthread_mutex_unlock(&pSched->queueMutex) != 0)
-    pError("unlock %s queueMutex failed, reason:%s", pSched->label, strerror(errno));
+    uError("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
 
-  if (tsem_post(&pSched->fullSem) != 0) pError("post %s fullSem failed, reason:%s", pSched->label, strerror(errno));
+  if (tsem_post(&pSched->fullSem) != 0) 
+    uError("post %s fullSem failed(%s)", pSched->label, strerror(errno));
 
   return 0;
 }
@@ -182,11 +181,16 @@ void taosCleanUpScheduler(void *param) {
   SSchedQueue *pSched = (SSchedQueue *)param;
   if (pSched == NULL) return;
 
+  pSched->stop = true;
   for (int i = 0; i < pSched->numOfThreads; ++i) {
-    pthread_cancel(pSched->qthread[i]);
+  if (taosCheckPthreadValid(pSched->qthread[i])) {
+      tsem_post(&pSched->fullSem);
+    }
   }
   for (int i = 0; i < pSched->numOfThreads; ++i) {
-    pthread_join(pSched->qthread[i], NULL);
+    if (taosCheckPthreadValid(pSched->qthread[i])) {
+      pthread_join(pSched->qthread[i], NULL);
+    }
   }
 
   tsem_destroy(&pSched->emptySem);
@@ -197,8 +201,8 @@ void taosCleanUpScheduler(void *param) {
     taosTmrStopA(&pSched->pTimer);
   }
 
-  free(pSched->queue);
-  free(pSched->qthread);
+  if (pSched->queue) free(pSched->queue);
+  if (pSched->qthread) free(pSched->qthread);
   free(pSched); // fix memory leak
 }
 
@@ -211,7 +215,7 @@ void taosDumpSchedulerStatus(void *qhandle, void *tmrId) {
   
   int32_t size = ((pSched->emptySlot - pSched->fullSlot) + pSched->queueSize) % pSched->queueSize;
   if (size > 0) {
-    pTrace("scheduler:%s, current tasks in queue:%d, task thread:%d", pSched->label, size, pSched->numOfThreads);
+    uDebug("scheduler:%s, current tasks in queue:%d, task thread:%d", pSched->label, size, pSched->numOfThreads);
   }
   
   taosTmrReset(taosDumpSchedulerStatus, DUMP_SCHEDULER_TIME_WINDOW, pSched, pSched->pTmrCtrl, &pSched->pTimer);
diff --git a/src/util/src/tskiplist.c b/src/util/src/tskiplist.c
index 01c91b6c6565e1dc2b0b1cd20eb8c7324eb70ea4..bacdaef6c8da1e42218331aaa34d25aa40ab5dc4 100644
--- a/src/util/src/tskiplist.c
+++ b/src/util/src/tskiplist.c
@@ -5,6 +5,7 @@
  * 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.
@@ -13,832 +14,735 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 #include "os.h"
-
-#include "tlog.h"
-#include "tsdb.h"
+#include "tulog.h"
 #include "tskiplist.h"
 #include "tutil.h"
+#include "tcompare.h"
 
-static FORCE_INLINE void recordNodeEachLevel(tSkipList *pSkipList, int32_t nLevel) {  // record link count in each level
-  for (int32_t i = 0; i < nLevel; ++i) {
+UNUSED_FUNC static FORCE_INLINE void recordNodeEachLevel(SSkipList *pSkipList, int32_t level) {  // record link count in each level
+#if SKIP_LIST_RECORD_PERFORMANCE
+  for (int32_t i = 0; i < level; ++i) {
     pSkipList->state.nLevelNodeCnt[i]++;
   }
+#endif
 }
 
-static FORCE_INLINE void removeNodeEachLevel(tSkipList *pSkipList, int32_t nLevel) {
-  for (int32_t i = 0; i < nLevel; ++i) {
+UNUSED_FUNC static FORCE_INLINE void removeNodeEachLevel(SSkipList *pSkipList, int32_t level) {
+#if SKIP_LIST_RECORD_PERFORMANCE
+  for (int32_t i = 0; i < level; ++i) {
     pSkipList->state.nLevelNodeCnt[i]--;
   }
+#endif
 }
 
-static FORCE_INLINE int32_t getSkipListNodeRandomHeight(tSkipList *pSkipList) {
+static FORCE_INLINE int32_t getSkipListNodeRandomHeight(SSkipList *pSkipList) {
   const uint32_t factor = 4;
 
   int32_t n = 1;
-  while ((rand() % factor) == 0 && n <= pSkipList->nMaxLevel) {
+  while ((rand() % factor) == 0 && n <= pSkipList->maxLevel) {
     n++;
   }
 
   return n;
 }
 
-static FORCE_INLINE int32_t getSkipListNodeLevel(tSkipList *pSkipList) {
-  int32_t nLevel = getSkipListNodeRandomHeight(pSkipList);
-  if (pSkipList->nSize == 0) {
-    nLevel = 1;
-    pSkipList->nLevel = 1;
+static FORCE_INLINE int32_t getSkipListRandLevel(SSkipList *pSkipList) {
+  int32_t level = getSkipListNodeRandomHeight(pSkipList);
+  if (pSkipList->size == 0) {
+    level = 1;
+    pSkipList->level = 1;
   } else {
-    if (nLevel > pSkipList->nLevel && pSkipList->nLevel < pSkipList->nMaxLevel) {
-      nLevel = (++pSkipList->nLevel);
+    if (level > pSkipList->level) {
+      if (pSkipList->level < pSkipList->maxLevel) {
+        level = (++pSkipList->level);
+      } else {
+        level = pSkipList->level;
+      }
     }
   }
-  return nLevel;
-}
-
-void tSkipListDoInsert(tSkipList *pSkipList, tSkipListNode **forward, int32_t nLevel, tSkipListNode *pNode);
-
-void tSkipListDoRecordPut(tSkipList *pSkipList) {
-  const int32_t MAX_RECORD_NUM = 1000;
-
-  if (pSkipList->state.nInsertObjs == MAX_RECORD_NUM) {
-    pSkipList->state.nInsertObjs = 1;
-    pSkipList->state.nTotalStepsForInsert = 0;
-    pSkipList->state.nTotalElapsedTimeForInsert = 0;
-  } else {
-    pSkipList->state.nInsertObjs++;
-  }
-}
-
-int32_t compareIntVal(const void *pLeft, const void *pRight) {
-  int64_t lhs = ((tSkipListKey *)pLeft)->i64Key;
-  int64_t rhs = ((tSkipListKey *)pRight)->i64Key;
-
-  DEFAULT_COMP(lhs, rhs);
-}
-
-int32_t compareIntDoubleVal(const void *pLeft, const void *pRight) {
-  int64_t lhs = ((tSkipListKey *)pLeft)->i64Key;
-  double  rhs = ((tSkipListKey *)pRight)->dKey;
-  if (fabs(lhs - rhs) < FLT_EPSILON) {
-    return 0;
-  } else {
-    return (lhs > rhs) ? 1 : -1;
-  }
-}
-
-int32_t compareDoubleIntVal(const void *pLeft, const void *pRight) {
-  double  lhs = ((tSkipListKey *)pLeft)->dKey;
-  int64_t rhs = ((tSkipListKey *)pRight)->i64Key;
-  if (fabs(lhs - rhs) < FLT_EPSILON) {
-    return 0;
+  
+  assert(level <= pSkipList->maxLevel);
+  return level;
+}
+
+#define DO_MEMSET_PTR_AREA(n) do {\
+int32_t _l = (n)->level;\
+memset(pNode, 0, SL_NODE_HEADER_SIZE(_l));\
+(n)->level = _l;\
+} while(0)
+
+static void tSkipListDoInsert(SSkipList *pSkipList, SSkipListNode **forward, SSkipListNode *pNode);
+static SSkipListNode* tSkipListPushBack(SSkipList *pSkipList, SSkipListNode *pNode);
+static SSkipListNode* tSkipListPushFront(SSkipList* pSkipList, SSkipListNode *pNode);
+static SSkipListIterator* doCreateSkipListIterator(SSkipList *pSkipList, int32_t order);
+
+
+// when order is TSDB_ORDER_ASC, return the last node with key less than val
+// when order is TSDB_ORDER_DESC, return the first node with key large than val
+static SSkipListNode* getPriorNode(SSkipList* pSkipList, const char* val, int32_t order, SSkipListNode** pCur) {
+  __compar_fn_t comparFn = pSkipList->comparFn;
+  SSkipListNode *pNode = NULL;
+  if (pCur != NULL) {
+    *pCur = NULL;
+  }
+
+  if (order == TSDB_ORDER_ASC) {
+    pNode = pSkipList->pHead;
+    for (int32_t i = pSkipList->level - 1; i >= 0; --i) {
+      SSkipListNode *p = SL_GET_FORWARD_POINTER(pNode, i);
+      while (p != pSkipList->pTail) {
+        char *key = SL_GET_NODE_KEY(pSkipList, p);
+        if (comparFn(key, val) < 0) {
+          pNode = p;
+          p = SL_GET_FORWARD_POINTER(p, i);
+        } else {
+          if (pCur != NULL) {
+            *pCur = p;
+          }
+          break;
+        }
+      }
+    }
   } else {
-    return (lhs > rhs) ? 1 : -1;
+    pNode = pSkipList->pTail;
+    for (int32_t i = pSkipList->level - 1; i >= 0; --i) {
+      SSkipListNode *p = SL_GET_BACKWARD_POINTER(pNode, i);
+      while (p != pSkipList->pHead) {
+        char *key = SL_GET_NODE_KEY(pSkipList, p);
+        if (comparFn(key, val) > 0) {
+          pNode = p;
+          p = SL_GET_BACKWARD_POINTER(p, i);
+        } else {
+          if (pCur != NULL) {
+            *pCur = p;
+          }
+          break;
+        }
+      }
+    }
   }
-}
 
-int32_t compareDoubleVal(const void *pLeft, const void *pRight) {
-  double ret = (((tSkipListKey *)pLeft)->dKey - ((tSkipListKey *)pRight)->dKey);
-  if (fabs(ret) < FLT_EPSILON) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
-  }
+  return pNode;
 }
 
-int32_t compareStrVal(const void *pLeft, const void *pRight) {
-  tSkipListKey *pL = (tSkipListKey *)pLeft;
-  tSkipListKey *pR = (tSkipListKey *)pRight;
-
-  if (pL->nLen == 0 && pR->nLen == 0) {
-    return 0;
-  }
 
-  //handle only one-side bound compare situation, there is only lower bound or only upper bound
-  if (pL->nLen == -1) {
-    return 1;  // no lower bound, lower bound is minimum, always return -1;
-  } else if (pR->nLen == -1) {
-    return -1;  // no upper bound, upper bound is maximum situation, always return 1;
+static bool initForwardBackwardPtr(SSkipList* pSkipList) {
+  uint32_t maxLevel = pSkipList->maxLevel;
+  
+  // head info
+  pSkipList->pHead = (SSkipListNode *)calloc(1, SL_NODE_HEADER_SIZE(maxLevel) * 2);
+  if (pSkipList->pHead == NULL) {
+    return false;
   }
-
-  int32_t ret = strcmp(((tSkipListKey *)pLeft)->pz, ((tSkipListKey *)pRight)->pz);
-
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
+  
+  pSkipList->pHead->level = pSkipList->maxLevel;
+  
+  // tail info
+  pSkipList->pTail = (SSkipListNode*) ((char*) pSkipList->pHead + SL_NODE_HEADER_SIZE(maxLevel));
+  pSkipList->pTail->level = pSkipList->maxLevel;
+  
+  for (uint32_t i = 0; i < maxLevel; ++i) {
+    SL_GET_FORWARD_POINTER(pSkipList->pHead, i) = pSkipList->pTail;
+    SL_GET_BACKWARD_POINTER(pSkipList->pTail, i) = pSkipList->pHead;
   }
+  
+  return true;
 }
 
-int32_t compareWStrVal(const void *pLeft, const void *pRight) {
-  tSkipListKey *pL = (tSkipListKey *)pLeft;
-  tSkipListKey *pR = (tSkipListKey *)pRight;
-
-  if (pL->nLen == 0 && pR->nLen == 0) {
-    return 0;
+SSkipList *tSkipListCreate(uint8_t maxLevel, uint8_t keyType, uint8_t keyLen, uint8_t dupKey, uint8_t lock,
+    uint8_t freeNode, __sl_key_fn_t fn) {
+  SSkipList *pSkipList = (SSkipList *)calloc(1, sizeof(SSkipList));
+  if (pSkipList == NULL) {
+    return NULL;
   }
 
-  //handle only one-side bound compare situation, there is only lower bound or only upper bound
-  if (pL->nLen == -1) {
-    return 1;  // no lower bound, lower bound is minimum, always return -1;
-  } else if (pR->nLen == -1) {
-    return -1;  // no upper bound, upper bound is maximum situation, always return 1;
+  if (maxLevel > MAX_SKIP_LIST_LEVEL) {
+    maxLevel = MAX_SKIP_LIST_LEVEL;
   }
 
-  int32_t ret = wcscmp(((tSkipListKey *)pLeft)->wpz, ((tSkipListKey *)pRight)->wpz);
-
-  if (ret == 0) {
-    return 0;
-  } else {
-    return ret > 0 ? 1 : -1;
+  pSkipList->keyInfo.type = keyType;
+  pSkipList->keyInfo.len = keyLen;
+  pSkipList->keyInfo.dupKey = dupKey;
+  pSkipList->keyInfo.freeNode = freeNode;
+  
+  pSkipList->keyFn    = fn;
+  pSkipList->comparFn = getKeyComparFunc(keyType);
+  pSkipList->maxLevel = maxLevel;
+  pSkipList->level    = 1;
+  
+  if (!initForwardBackwardPtr(pSkipList)) {
+    taosTFree(pSkipList);
+    return NULL;
   }
-}
-
-static __compar_fn_t getKeyFilterComparator(tSkipList *pSkipList, int32_t filterDataType) {
-  __compar_fn_t comparator = NULL;
-
-  switch (pSkipList->keyType) {
-    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 (filterDataType >= TSDB_DATA_TYPE_BOOL && filterDataType <= TSDB_DATA_TYPE_BIGINT) {
-        comparator = compareIntVal;
-      } else if (filterDataType >= TSDB_DATA_TYPE_FLOAT && filterDataType <= TSDB_DATA_TYPE_DOUBLE) {
-        comparator = compareIntDoubleVal;
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE: {
-      if (filterDataType >= TSDB_DATA_TYPE_BOOL && filterDataType <= TSDB_DATA_TYPE_BIGINT) {
-        comparator = compareDoubleIntVal;
-      } else if (filterDataType >= TSDB_DATA_TYPE_FLOAT && filterDataType <= TSDB_DATA_TYPE_DOUBLE) {
-        comparator = compareDoubleVal;
-      }
-      break;
+  
+  if (lock) {
+    pSkipList->lock = calloc(1, sizeof(pthread_rwlock_t));
+
+    if (pthread_rwlock_init(pSkipList->lock, NULL) != 0) {
+      taosTFree(pSkipList->pHead);
+      taosTFree(pSkipList);
+      
+      return NULL;
     }
-    case TSDB_DATA_TYPE_BINARY:
-      comparator = compareStrVal;
-      break;
-    case TSDB_DATA_TYPE_NCHAR:
-      comparator = compareWStrVal;
-      break;
-    default:
-      comparator = compareIntVal;
-      break;
   }
 
-  return comparator;
-}
-
-static __compar_fn_t getKeyComparator(int32_t keyType) {
-  __compar_fn_t comparator = NULL;
-
-  switch (keyType) {
-    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:
-      comparator = compareIntVal;
-      break;
-
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE:
-      comparator = compareDoubleVal;
-      break;
+  srand((uint32_t)time(NULL));
 
-    case TSDB_DATA_TYPE_BINARY:
-      comparator = compareStrVal;
-      break;
-
-    case TSDB_DATA_TYPE_NCHAR:
-      comparator = compareWStrVal;
-      break;
-
-    default:
-      comparator = compareIntVal;
-      break;
-  }
+#if SKIP_LIST_RECORD_PERFORMANCE
+  pSkipList->state.nTotalMemSize += sizeof(SSkipList);
+#endif
 
-  return comparator;
+  return pSkipList;
 }
 
-tSkipList* tSkipListCreate(int16_t nMaxLevel, int16_t keyType, int16_t nMaxKeyLen) {
-  tSkipList *pSkipList = (tSkipList *)calloc(1, sizeof(tSkipList));
+void *tSkipListDestroy(SSkipList *pSkipList) {
   if (pSkipList == NULL) {
     return NULL;
   }
 
-  pSkipList->keyType = keyType;
-
-  pSkipList->comparator = getKeyComparator(keyType);
-  pSkipList->pHead.pForward = (tSkipListNode **)calloc(1, POINTER_BYTES * MAX_SKIP_LIST_LEVEL);
-
-  pSkipList->nMaxLevel = MAX_SKIP_LIST_LEVEL;
-  pSkipList->nLevel = 1;
-
-  pSkipList->nMaxKeyLen = nMaxKeyLen;
-  pSkipList->nMaxLevel = nMaxLevel;
-
-  if (pthread_rwlock_init(&pSkipList->lock, NULL) != 0) {
-    tfree(pSkipList->pHead.pForward);
-    tfree(pSkipList);
-    return NULL;
+  if (pSkipList->lock) {
+    pthread_rwlock_wrlock(pSkipList->lock);
   }
 
-  srand(time(NULL));
-  pSkipList->state.nTotalMemSize += sizeof(tSkipList);
-  return pSkipList;
-}
-
-static void doRemove(tSkipList *pSkipList, tSkipListNode *pNode, tSkipListNode *forward[]) {
-  int32_t level = pNode->nLevel;
-  for (int32_t j = level - 1; j >= 0; --j) {
-    if ((forward[j]->pForward[j] != NULL) && (forward[j]->pForward[j]->pForward[j])) {
-      forward[j]->pForward[j]->pForward[j]->pBackward[j] = forward[j];
-    }
+  if (pSkipList->keyInfo.freeNode) {
+    SSkipListNode *pNode = SL_GET_FORWARD_POINTER(pSkipList->pHead, 0);
 
-    if (forward[j]->pForward[j] != NULL) {
-      forward[j]->pForward[j] = forward[j]->pForward[j]->pForward[j];
+    while (pNode != pSkipList->pTail) {
+      SSkipListNode *pTemp = pNode;
+      pNode = SL_GET_FORWARD_POINTER(pNode, 0);
+      taosTFree(pTemp);
     }
   }
 
-  pSkipList->state.nTotalMemSize -= (sizeof(tSkipListNode) + POINTER_BYTES * pNode->nLevel * 2);
-  removeNodeEachLevel(pSkipList, pNode->nLevel);
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
+    pthread_rwlock_destroy(pSkipList->lock);
 
-  tfree(pNode);
-  --pSkipList->nSize;
-}
-
-static size_t getOneNodeSize(const tSkipListKey *pKey, int32_t nLevel) {
-  size_t size = sizeof(tSkipListNode) + sizeof(intptr_t) * (nLevel << 1);
-  if (pKey->nType == TSDB_DATA_TYPE_BINARY) {
-    size += pKey->nLen + 1;
-  } else if (pKey->nType == TSDB_DATA_TYPE_NCHAR) {
-    size += (pKey->nLen + 1) * TSDB_NCHAR_SIZE;
+    taosTFree(pSkipList->lock);
   }
 
-  return size;
+  taosTFree(pSkipList->pHead);
+  taosTFree(pSkipList);
+  return NULL;
 }
 
-static tSkipListNode *tSkipListCreateNode(void *pData, const tSkipListKey *pKey, int32_t nLevel) {
-  size_t         nodeSize = getOneNodeSize(pKey, nLevel);
-  tSkipListNode *pNode = (tSkipListNode *)calloc(1, nodeSize);
-
-  pNode->pForward = (tSkipListNode **)(&pNode[1]);
-  pNode->pBackward = (pNode->pForward + nLevel);
-
-  pNode->pData = pData;
-
-  pNode->key = *pKey;
-  if (pKey->nType == TSDB_DATA_TYPE_BINARY) {
-    pNode->key.pz = (char *)(pNode->pBackward + nLevel);
-
-    strcpy(pNode->key.pz, pKey->pz);
-    pNode->key.pz[pKey->nLen] = 0;
-  } else if (pKey->nType == TSDB_DATA_TYPE_NCHAR) {
-    pNode->key.wpz = (wchar_t *)(pNode->pBackward + nLevel);
-    wcsncpy(pNode->key.wpz, pKey->wpz, pKey->nLen);
-    pNode->key.wpz[pKey->nLen] = 0;
+void tSkipListNewNodeInfo(SSkipList *pSkipList, int32_t *level, int32_t *headSize) {
+  if (pSkipList == NULL) {
+    *level = 1;
+    *headSize = SL_NODE_HEADER_SIZE(*level);
+    return;
   }
 
-  pNode->nLevel = nLevel;
-  return pNode;
-}
-
-tSkipListKey tSkipListCreateKey(int32_t type, char *val, size_t keyLength) {
-  tSkipListKey k = {0};
-  tVariantCreateFromBinary(&k, val, (uint32_t) keyLength, (uint32_t) type);
-  return k;
+  *level = getSkipListRandLevel(pSkipList);
+  *headSize = SL_NODE_HEADER_SIZE(*level);
 }
 
-void tSkipListDestroyKey(tSkipListKey *pKey) { tVariantDestroy(pKey); }
-
-void* tSkipListDestroy(tSkipList *pSkipList) {
-  if (pSkipList == NULL) {
+SSkipListNode *tSkipListPut(SSkipList *pSkipList, SSkipListNode *pNode) {
+  if (pSkipList == NULL || pNode == NULL) {
     return NULL;
   }
 
-  pthread_rwlock_wrlock(&pSkipList->lock);
-  tSkipListNode *pNode = pSkipList->pHead.pForward[0];
-  while (pNode) {
-    tSkipListNode *pTemp = pNode;
-    pNode = pNode->pForward[0];
-    tfree(pTemp);
+  if (pSkipList->lock) {
+    pthread_rwlock_wrlock(pSkipList->lock);
   }
-
-  tfree(pSkipList->pHead.pForward);
-  pthread_rwlock_unlock(&pSkipList->lock);
-
-  pthread_rwlock_destroy(&pSkipList->lock);
-  tfree(pSkipList);
-
-  return NULL;
-}
-
-tSkipListNode *tSkipListPut(tSkipList *pSkipList, void *pData, tSkipListKey *pKey, int32_t insertIdenticalKey) {
-  if (pSkipList == NULL) {
-    return NULL;
+  
+  // if the new key is greater than the maximum key of skip list, push back this node at the end of skip list
+  char *newDatakey = SL_GET_NODE_KEY(pSkipList, pNode);
+  if (pSkipList->size == 0 || pSkipList->comparFn(SL_GET_SL_MAX_KEY(pSkipList), newDatakey) < 0) {
+    return tSkipListPushBack(pSkipList, pNode);
   }
+  
+  // if the new key is less than the minimum key of skip list, push front this node at the front of skip list
+  assert(pSkipList->size > 0);
+  char* minKey = SL_GET_SL_MIN_KEY(pSkipList);
+  if (pSkipList->comparFn(newDatakey, minKey) < 0) {
+    return tSkipListPushFront(pSkipList, pNode);
+  }
+  
+  // find the appropriated position to insert data
+  SSkipListNode *px = pSkipList->pHead;
+  SSkipListNode *forward[MAX_SKIP_LIST_LEVEL] = {0};
 
-  pthread_rwlock_wrlock(&pSkipList->lock);
-
-  // record one node is put into skiplist
-  tSkipListDoRecordPut(pSkipList);
-
-  tSkipListNode *px = &pSkipList->pHead;
-
-  tSkipListNode *forward[MAX_SKIP_LIST_LEVEL] = {0};
-  for (int32_t i = pSkipList->nLevel - 1; i >= 0; --i) {
-    while (px->pForward[i] != NULL && (pSkipList->comparator(&px->pForward[i]->key, pKey) < 0)) {
-      px = px->pForward[i];
+  int32_t ret = -1;
+  for (int32_t i = pSkipList->level - 1; i >= 0; --i) {
+    SSkipListNode *p = SL_GET_FORWARD_POINTER(px, i);
+    while (p != pSkipList->pTail) {
+      char *key = SL_GET_NODE_KEY(pSkipList, p);
+
+      // if the forward element is less than the specified key, forward one step
+      ret = pSkipList->comparFn(key, newDatakey);
+      if (ret < 0) {
+        px = p;
+        p = SL_GET_FORWARD_POINTER(px, i);
+      } else {
+        break;
+      }
     }
-
-    pSkipList->state.nTotalStepsForInsert++;
+    
     forward[i] = px;
   }
 
-  // if the skiplist does not allowed identical key inserted, the new data will be discarded.
-  if ((insertIdenticalKey == 0) && forward[0] != &pSkipList->pHead &&
-      (pSkipList->comparator(&forward[0]->key, pKey) == 0)) {
-    pthread_rwlock_unlock(&pSkipList->lock);
-    return forward[0];
-  }
-
-  int32_t nLevel = getSkipListNodeLevel(pSkipList);
-  recordNodeEachLevel(pSkipList, nLevel);
-
-  tSkipListNode *pNode = tSkipListCreateNode(pData, pKey, nLevel);
-  tSkipListDoInsert(pSkipList, forward, nLevel, pNode);
-
-  pSkipList->nSize += 1;
-
-  //    char tmpstr[512] = {0};
-  //    tVariantToString(&pNode->key, tmpstr);
-  //    pTrace("skiplist:%p, node added, key:%s, total list len:%d", pSkipList,
-  //    tmpstr, pSkipList->nSize);
-
-  pSkipList->state.nTotalMemSize += getOneNodeSize(pKey, nLevel);
-  pthread_rwlock_unlock(&pSkipList->lock);
-
-  return pNode;
-}
-
-void tSkipListDoInsert(tSkipList *pSkipList, tSkipListNode **forward, int32_t nLevel, tSkipListNode *pNode) {
-  for (int32_t i = 0; i < nLevel; ++i) {
-    tSkipListNode *x = forward[i];
-    if (x != NULL) {
-      pNode->pBackward[i] = x;
-      if (x->pForward[i]) x->pForward[i]->pBackward[i] = pNode;
-
-      pNode->pForward[i] = x->pForward[i];
-      x->pForward[i] = pNode;
-    } else {
-      pSkipList->pHead.pForward[i] = pNode;
-      pNode->pBackward[i] = &(pSkipList->pHead);
+  // if the skip list does not allowed identical key inserted, the new data will be discarded.
+  if (pSkipList->keyInfo.dupKey == 0 && ret == 0) {
+    if (pSkipList->lock) {
+      pthread_rwlock_unlock(pSkipList->lock);
     }
+
+    return NULL;
   }
+  
+  tSkipListDoInsert(pSkipList, forward, pNode);
+  return pNode;
 }
 
-tSkipListNode *tSkipListGetOne(tSkipList *pSkipList, tSkipListKey *pKey) {
-  int32_t sLevel = pSkipList->nLevel - 1;
-  int32_t ret = -1;
-
-  tSkipListNode *x = &pSkipList->pHead;
 
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  pSkipList->state.queryCount++;
 
-  __compar_fn_t filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-  for (int32_t i = sLevel; i >= 0; --i) {
-    while (x->pForward[i] != NULL && (ret = filterComparator(&x->pForward[i]->key, pKey)) < 0) {
-      x = x->pForward[i];
-    }
+SArray* tSkipListGet(SSkipList *pSkipList, SSkipListKey key) {
+  SArray* sa = taosArrayInit(1, POINTER_BYTES);
 
-    if (ret == 0) {
-      pthread_rwlock_unlock(&pSkipList->lock);
-      return x->pForward[i];
-    }
+  if (pSkipList->lock) {
+    pthread_rwlock_wrlock(pSkipList->lock);
   }
 
-  pthread_rwlock_unlock(&pSkipList->lock);
-  return NULL;
-}
-
-static int32_t tSkipListEndParQuery(tSkipList *pSkipList, tSkipListNode *pStartNode, tSkipListKey *pEndKey,
-                                    int32_t cond, tSkipListNode ***pRes) {
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  tSkipListNode *p = pStartNode;
-  int32_t        numOfRes = 0;
-
-  __compar_fn_t filterComparator = getKeyFilterComparator(pSkipList, pEndKey->nType);
-  while (p != NULL) {
-    int32_t ret = filterComparator(&p->key, pEndKey);
-    if (ret > 0) {
+  SSkipListNode* pNode = getPriorNode(pSkipList, key, TSDB_ORDER_ASC, NULL);
+  while (1) {
+    SSkipListNode *p = SL_GET_FORWARD_POINTER(pNode, 0);
+    if (p == pSkipList->pTail) {
       break;
     }
-
-    if (ret < 0) {
-      numOfRes++;
-      p = p->pForward[0];
-    } else if (ret == 0) {
-      if (cond == TSDB_RELATION_LESS_EQUAL) {
-        numOfRes++;
-        p = p->pForward[0];
-      } else {
-        break;
-      }
+    if (pSkipList->comparFn(key, SL_GET_NODE_KEY(pSkipList, p)) != 0) {
+      break;
     }
+    taosArrayPush(sa, &p);
+    pNode = p;
   }
 
-  (*pRes) = (tSkipListNode **)malloc(POINTER_BYTES * numOfRes);
-  for (int32_t i = 0; i < numOfRes; ++i) {
-    (*pRes)[i] = pStartNode;
-    pStartNode = pStartNode->pForward[0];
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
   }
-  pthread_rwlock_unlock(&pSkipList->lock);
 
-  return numOfRes;
+  return sa;
 }
 
-/*
- * maybe return the copy of tSkipListNode would be better
- */
-int32_t tSkipListGets(tSkipList *pSkipList, tSkipListKey *pKey, tSkipListNode ***pRes) {
-  (*pRes) = NULL;
 
-  tSkipListNode *pNode = tSkipListGetOne(pSkipList, pKey);
-  if (pNode == NULL) {
-    return 0;
-  }
 
-  __compar_fn_t filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-  // backward check if previous nodes are with the same value.
-  tSkipListNode *pPrev = pNode->pBackward[0];
-  while ((pPrev != &pSkipList->pHead) && filterComparator(&pPrev->key, pKey) == 0) {
-    pPrev = pPrev->pBackward[0];
+size_t tSkipListGetSize(const SSkipList* pSkipList) {
+  if (pSkipList == NULL) {
+    return 0;
   }
-
-  return tSkipListEndParQuery(pSkipList, pPrev->pForward[0], &pNode->key, TSDB_RELATION_LESS_EQUAL, pRes);
-}
-
-static tSkipListNode *tSkipListParQuery(tSkipList *pSkipList, tSkipListKey *pKey, int32_t cond) {
-  int32_t sLevel = pSkipList->nLevel - 1;
-  int32_t ret = -1;
-
-  tSkipListNode *x = &pSkipList->pHead;
-  __compar_fn_t  filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-  pthread_rwlock_rdlock(&pSkipList->lock);
-
-  if (cond == TSDB_RELATION_LARGE_EQUAL || cond == TSDB_RELATION_LARGE) {
-    for (int32_t i = sLevel; i >= 0; --i) {
-      while (x->pForward[i] != NULL && (ret = filterComparator(&x->pForward[i]->key, pKey)) < 0) {
-        x = x->pForward[i];
-      }
+  
+  return pSkipList->size;
+}
+
+// static int32_t tSkipListEndParQuery(SSkipList *pSkipList, SSkipListNode *pStartNode, SSkipListKey *pEndKey,
+//                                    int32_t cond, SSkipListNode ***pRes) {
+//  pthread_rwlock_rdlock(&pSkipList->lock);
+//  SSkipListNode *p = pStartNode;
+//  int32_t        numOfRes = 0;
+//
+//  __compar_fn_t filterComparFn = getComparFunc(pSkipList, pEndKey->nType);
+//  while (p != NULL) {
+//    int32_t ret = filterComparFn(&p->key, pEndKey);
+//    if (ret > 0) {
+//      break;
+//    }
+//
+//    if (ret < 0) {
+//      numOfRes++;
+//      p = p->pForward[0];
+//    } else if (ret == 0) {
+//      if (cond == TSDB_RELATION_LESS_EQUAL) {
+//        numOfRes++;
+//        p = p->pForward[0];
+//      } else {
+//        break;
+//      }
+//    }
+//  }
+//
+//  (*pRes) = (SSkipListNode **)malloc(POINTER_BYTES * numOfRes);
+//  for (int32_t i = 0; i < numOfRes; ++i) {
+//    (*pRes)[i] = pStartNode;
+//    pStartNode = pStartNode->pForward[0];
+//  }
+//  pthread_rwlock_unlock(&pSkipList->lock);
+//
+//  return numOfRes;
+//}
+//
+///*
+// * maybe return the copy of SSkipListNode would be better
+// */
+// int32_t tSkipListGets(SSkipList *pSkipList, SSkipListKey *pKey, SSkipListNode ***pRes) {
+//  (*pRes) = NULL;
+//
+//  SSkipListNode *pNode = tSkipListGet(pSkipList, pKey);
+//  if (pNode == NULL) {
+//    return 0;
+//  }
+//
+//  __compar_fn_t filterComparFn = getComparFunc(pSkipList, pKey->nType);
+//
+//  // backward check if previous nodes are with the same value.
+//  SSkipListNode *pPrev = pNode->pBackward[0];
+//  while ((pPrev != &pSkipList->pHead) && filterComparFn(&pPrev->key, pKey) == 0) {
+//    pPrev = pPrev->pBackward[0];
+//  }
+//
+//  return tSkipListEndParQuery(pSkipList, pPrev->pForward[0], &pNode->key, TSDB_RELATION_LESS_EQUAL, pRes);
+//}
+//
+// static SSkipListNode *tSkipListParQuery(SSkipList *pSkipList, SSkipListKey *pKey, int32_t cond) {
+//  int32_t sLevel = pSkipList->level - 1;
+//  int32_t ret = -1;
+//
+//  SSkipListNode *x = &pSkipList->pHead;
+//  __compar_fn_t  filterComparFn = getComparFunc(pSkipList, pKey->nType);
+//
+//  pthread_rwlock_rdlock(&pSkipList->lock);
+//
+//  if (cond == TSDB_RELATION_GREATER_EQUAL || cond == TSDB_RELATION_GREATER) {
+//    for (int32_t i = sLevel; i >= 0; --i) {
+//      while (x->pForward[i] != NULL && (ret = filterComparFn(&x->pForward[i]->key, pKey)) < 0) {
+//        x = x->pForward[i];
+//      }
+//    }
+//
+//    // backward check if previous nodes are with the same value.
+//    if (cond == TSDB_RELATION_GREATER_EQUAL && ret == 0) {
+//      SSkipListNode *pNode = x->pForward[0];
+//      while ((pNode->pBackward[0] != &pSkipList->pHead) && (filterComparFn(&pNode->pBackward[0]->key, pKey) == 0)) {
+//        pNode = pNode->pBackward[0];
+//      }
+//      pthread_rwlock_unlock(&pSkipList->lock);
+//      return pNode;
+//    }
+//
+//    if (ret > 0 || cond == TSDB_RELATION_GREATER_EQUAL) {
+//      pthread_rwlock_unlock(&pSkipList->lock);
+//      return x->pForward[0];
+//    } else {  // cond == TSDB_RELATION_GREATER && ret == 0
+//      SSkipListNode *pn = x->pForward[0];
+//      while (pn != NULL && filterComparFn(&pn->key, pKey) == 0) {
+//        pn = pn->pForward[0];
+//      }
+//      pthread_rwlock_unlock(&pSkipList->lock);
+//      return pn;
+//    }
+//  }
+//
+//  pthread_rwlock_unlock(&pSkipList->lock);
+//  return NULL;
+//}
+//
+//
+// static bool removeSupport(SSkipList *pSkipList, SSkipListNode **forward, SSkipListKey *pKey) {
+//  __compar_fn_t filterComparFn = getComparFunc(pSkipList, pKey->nType);
+//
+//  if (filterComparFn(&forward[0]->pForward[0]->key, pKey) == 0) {
+//    SSkipListNode *p = forward[0]->pForward[0];
+//    doRemove(pSkipList, p, forward);
+//  } else {  // failed to find the node of specified value,abort
+//    return false;
+//  }
+//
+//  // compress the minimum level of skip list
+//  while (pSkipList->level > 0 && SL_GET_FORWARD_POINTER(pSkipList->pHead, pSkipList->level - 1) == NULL) {
+//    pSkipList->level -= 1;
+//  }
+//
+//  return true;
+//}
+
+uint32_t tSkipListRemove(SSkipList *pSkipList, SSkipListKey key) {
+  uint32_t count = 0;
+
+  if (pSkipList->lock) {
+    pthread_rwlock_wrlock(pSkipList->lock);
+  }
+
+  SSkipListNode* pNode = getPriorNode(pSkipList, key, TSDB_ORDER_ASC, NULL);
+  while (1) {
+    SSkipListNode *p = SL_GET_FORWARD_POINTER(pNode, 0);
+    if (p == pSkipList->pTail) {
+      break;
     }
-
-    // backward check if previous nodes are with the same value.
-    if (cond == TSDB_RELATION_LARGE_EQUAL && ret == 0) {
-      tSkipListNode *pNode = x->pForward[0];
-      while ((pNode->pBackward[0] != &pSkipList->pHead) && (filterComparator(&pNode->pBackward[0]->key, pKey) == 0)) {
-        pNode = pNode->pBackward[0];
-      }
-      pthread_rwlock_unlock(&pSkipList->lock);
-      return pNode;
+    if (pSkipList->comparFn(key, SL_GET_NODE_KEY(pSkipList, p)) != 0) {
+      break;
     }
 
-    if (ret > 0 || cond == TSDB_RELATION_LARGE_EQUAL) {
-      pthread_rwlock_unlock(&pSkipList->lock);
-      return x->pForward[0];
-    } else {  // cond == TSDB_RELATION_LARGE && ret == 0
-      tSkipListNode *pn = x->pForward[0];
-      while (pn != NULL && filterComparator(&pn->key, pKey) == 0) {
-        pn = pn->pForward[0];
-      }
-      pthread_rwlock_unlock(&pSkipList->lock);
-      return pn;
+    for (int32_t j = p->level - 1; j >= 0; --j) {
+      SSkipListNode* prev = SL_GET_BACKWARD_POINTER(p, j);
+      SSkipListNode* next = SL_GET_FORWARD_POINTER(p, j);
+      SL_GET_FORWARD_POINTER(prev, j)  = next;
+      SL_GET_BACKWARD_POINTER(next, j) = prev;
     }
-  }
 
-  pthread_rwlock_unlock(&pSkipList->lock);
-  return NULL;
-}
+    if (pSkipList->keyInfo.freeNode) {
+      taosTFree(p);
+    }
 
-int32_t tSkipListIterateList(tSkipList *pSkipList, tSkipListNode ***pRes, bool (*fp)(tSkipListNode *, void *),
-                             void *param) {
-  (*pRes) = (tSkipListNode **)calloc(1, POINTER_BYTES * pSkipList->nSize);
-  if (NULL == *pRes) {
-    pError("error skiplist %p, malloc failed", pSkipList);
-    return -1;
+    ++count;
   }
-  
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  tSkipListNode *pStartNode = pSkipList->pHead.pForward[0];
-  int32_t        num = 0;
 
-  for (int32_t i = 0; i < pSkipList->nSize; ++i) {
-    if (pStartNode == NULL) {
-      pError("error skiplist %p, required length:%d, actual length:%d", pSkipList, pSkipList->nSize, i - 1);
-#ifdef _DEBUG_VIEW
-      tSkipListPrint(pSkipList, 1);
-#endif
+  // compress the minimum level of skip list
+  while (pSkipList->level > 0) {
+    if (SL_GET_FORWARD_POINTER(pSkipList->pHead, pSkipList->level - 1) != NULL) {
       break;
     }
-
-    if (fp == NULL || (fp != NULL && fp(pStartNode, param) == true)) {
-      (*pRes)[num++] = pStartNode;
-    }
-
-    pStartNode = pStartNode->pForward[0];
+    pSkipList->level--;
   }
 
-  pthread_rwlock_unlock(&pSkipList->lock);
+  pSkipList->size -= count;
 
-  if (num == 0) {
-    free(*pRes);
-    *pRes = NULL;
-  } else if (num < pSkipList->nSize) { // free unused memory
-    char* tmp = realloc((*pRes), num * POINTER_BYTES);
-    assert(tmp != NULL);
-
-    *pRes = (tSkipListNode**)tmp;
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
   }
 
-  return num;
+  return count;
 }
 
-int32_t tSkipListIteratorReset(tSkipList *pSkipList, SSkipListIterator* iter) {
-  if (pSkipList == NULL) {
-    return -1;
+void tSkipListRemoveNode(SSkipList *pSkipList, SSkipListNode *pNode) {
+  int32_t level = pNode->level;
+  
+  if (pSkipList->lock) {
+    pthread_rwlock_wrlock(pSkipList->lock);
   }
 
-  iter->pSkipList = pSkipList;
-
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  iter->cur = NULL;//pSkipList->pHead.pForward[0];
-  iter->num = pSkipList->nSize;
-  pthread_rwlock_unlock(&pSkipList->lock);
-
-  return 0;
+  for (int32_t j = level - 1; j >= 0; --j) {
+    SSkipListNode* prev = SL_GET_BACKWARD_POINTER(pNode, j);
+    SSkipListNode* next = SL_GET_FORWARD_POINTER(pNode, j);
+    
+    SL_GET_FORWARD_POINTER(prev, j)  = next;
+    SL_GET_BACKWARD_POINTER(next, j) = prev;
+  }
+  
+  if (pSkipList->keyInfo.freeNode) {
+    taosTFree(pNode);
+  }
+  
+  atomic_sub_fetch_32(&pSkipList->size, 1);
+  
+  // compress the minimum level of skip list
+  while (pSkipList->level > 0 && SL_GET_FORWARD_POINTER(pSkipList->pHead, pSkipList->level - 1) == NULL) {
+    pSkipList->level -= 1;
+  }
+  
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
+  }
 }
 
-bool tSkipListIteratorNext(SSkipListIterator* iter) {
-  if (iter->num == 0 || iter->pSkipList == NULL) {
-    return false;
+SSkipListIterator* tSkipListCreateIter(SSkipList *pSkipList) {
+  if (pSkipList == NULL) {
+    return NULL;
   }
+  
+  return doCreateSkipListIterator(pSkipList, TSDB_ORDER_ASC);
+}
 
-  tSkipList* pSkipList = iter->pSkipList;
+SSkipListIterator *tSkipListCreateIterFromVal(SSkipList* pSkipList, const char* val, int32_t type, int32_t order) {
+  assert(order == TSDB_ORDER_ASC || order == TSDB_ORDER_DESC);
+  assert(pSkipList != NULL);
 
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  if (iter->cur == NULL) {
-    iter->cur = pSkipList->pHead.pForward[0];
-  } else {
-    iter->cur = iter->cur->pForward[0];
+  SSkipListIterator* iter = doCreateSkipListIterator(pSkipList, order);
+  if (val == NULL) {
+    return iter;
   }
 
-  pthread_rwlock_unlock(&pSkipList->lock);
+  if (pSkipList->lock) {
+    pthread_rwlock_rdlock(pSkipList->lock);
+  }
 
-  return iter->cur != NULL;
-}
+  iter->cur = getPriorNode(pSkipList, val, order, &iter->next);
 
-tSkipListNode* tSkipListIteratorGet(SSkipListIterator* iter) {
-  return iter->cur;
-}
-
-int32_t tSkipListRangeQuery(tSkipList *pSkipList, tSKipListQueryCond *pCond, tSkipListNode ***pRes) {
-  pSkipList->state.queryCount++;
-  tSkipListNode *pStart = tSkipListParQuery(pSkipList, &pCond->lowerBnd, pCond->lowerBndRelOptr);
-  if (pStart == 0) {
-    *pRes = NULL;
-    return 0;
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
   }
 
-  return tSkipListEndParQuery(pSkipList, pStart, &pCond->upperBnd, pCond->upperBndRelOptr, pRes);
+  return iter;
 }
 
-static bool removeSupport(tSkipList *pSkipList, tSkipListNode **forward, tSkipListKey *pKey) {
-  __compar_fn_t filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-  if (filterComparator(&forward[0]->pForward[0]->key, pKey) == 0) {
-    tSkipListNode *p = forward[0]->pForward[0];
-    doRemove(pSkipList, p, forward);
-  } else {  // failed to find the node of specified value,abort
+bool tSkipListIterNext(SSkipListIterator *iter) {
+  if (iter->pSkipList == NULL) {
     return false;
   }
-
-  // compress the minimum level of skip list
-  while (pSkipList->nLevel > 0 && pSkipList->pHead.pForward[pSkipList->nLevel - 1] == NULL) {
-    pSkipList->nLevel -= 1;
+  
+  SSkipList *pSkipList = iter->pSkipList;
+  
+  if (pSkipList->lock) {
+    pthread_rwlock_rdlock(pSkipList->lock);
   }
+  
+  if (iter->order == TSDB_ORDER_ASC) {  // ascending order iterate
+    iter->cur = SL_GET_FORWARD_POINTER(iter->cur, 0);
 
-  return true;
-}
+    // a new node is inserted into between iter->cur and iter->next, ignore it
+    if (iter->cur != iter->next && (iter->next != NULL)) {
+      iter->cur = iter->next;
+    }
 
-void tSkipListRemoveNode(tSkipList *pSkipList, tSkipListNode *pNode) {
-  tSkipListNode *forward[MAX_SKIP_LIST_LEVEL] = {0};
+    iter->next = SL_GET_FORWARD_POINTER(iter->cur, 0);
+  } else { // descending order iterate
+    iter->cur = SL_GET_BACKWARD_POINTER(iter->cur, 0);
 
-  pthread_rwlock_rdlock(&pSkipList->lock);
-  for (int32_t i = 0; i < pNode->nLevel; ++i) {
-    forward[i] = pNode->pBackward[i];
-  }
+    // a new node is inserted into between iter->cur and iter->next, ignore it
+    if (iter->cur != iter->next && (iter->next != NULL)) {
+      iter->cur = iter->next;
+    }
 
-  removeSupport(pSkipList, forward, &pNode->key);
-  pthread_rwlock_unlock(&pSkipList->lock);
+    iter->next = SL_GET_BACKWARD_POINTER(iter->cur, 0);
+  }
+  
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
+  }
+  
+  iter->step += 1;
+  return (iter->order == TSDB_ORDER_ASC)? (iter->cur != pSkipList->pTail) : (iter->cur != pSkipList->pHead);
 }
 
-bool tSkipListRemove(tSkipList *pSkipList, tSkipListKey *pKey) {
-  tSkipListNode *forward[MAX_SKIP_LIST_LEVEL] = {0};
-  __compar_fn_t  filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-  pthread_rwlock_rdlock(&pSkipList->lock);
-
-  tSkipListNode *x = &pSkipList->pHead;
-  for (int32_t i = pSkipList->nLevel - 1; i >= 0; --i) {
-    while (x->pForward[i] != NULL && (filterComparator(&x->pForward[i]->key, pKey) < 0)) {
-      x = x->pForward[i];
-    }
-    forward[i] = x;
+SSkipListNode *tSkipListIterGet(SSkipListIterator *iter) {
+  if (iter == NULL || iter->cur == iter->pSkipList->pTail || iter->cur == iter->pSkipList->pHead) {
+    return NULL;
+  } else {
+    return iter->cur;
   }
+}
 
-  bool ret = removeSupport(pSkipList, forward, pKey);
-  pthread_rwlock_unlock(&pSkipList->lock);
-
-  return ret;
+void* tSkipListDestroyIter(SSkipListIterator* iter) {
+  if (iter == NULL) {
+    return NULL;
+  }
+  
+  taosTFree(iter);
+  return NULL;
 }
 
-void tSkipListPrint(tSkipList *pSkipList, int16_t nlevel) {
-  if (pSkipList == NULL || pSkipList->nLevel < nlevel || nlevel <= 0) {
+// bool tSkipListRemove(SSkipList *pSkipList, SSkipListKey *pKey) {
+//  SSkipListNode *forward[MAX_SKIP_LIST_LEVEL] = {0};
+//  __compar_fn_t  filterComparFn = getComparFunc(pSkipList, pKey->nType);
+//
+//  pthread_rwlock_rdlock(&pSkipList->lock);
+//
+//  SSkipListNode *x = &pSkipList->pHead;
+//  for (int32_t i = pSkipList->level - 1; i >= 0; --i) {
+//    while (x->pForward[i] != NULL && (filterComparFn(&x->pForward[i]->key, pKey) < 0)) {
+//      x = x->pForward[i];
+//    }
+//    forward[i] = x;
+//  }
+//
+//  bool ret = removeSupport(pSkipList, forward, pKey);
+//  pthread_rwlock_unlock(&pSkipList->lock);
+//
+//  return ret;
+//}
+
+void tSkipListPrint(SSkipList *pSkipList, int16_t nlevel) {
+  if (pSkipList == NULL || pSkipList->level < nlevel || nlevel <= 0) {
     return;
   }
 
-  tSkipListNode *p = pSkipList->pHead.pForward[nlevel - 1];
-  int32_t        id = 1;
-  while (p) {
-    switch (pSkipList->keyType) {
+  SSkipListNode *p = SL_GET_FORWARD_POINTER(pSkipList->pHead, nlevel - 1);
+  
+  int32_t id = 1;
+  char* prev = NULL;
+  
+  while (p != pSkipList->pTail) {
+    char *key = SL_GET_NODE_KEY(pSkipList, p);
+    if (prev != NULL) {
+      assert(pSkipList->comparFn(prev, key) < 0);
+    }
+    
+    switch (pSkipList->keyInfo.type) {
       case TSDB_DATA_TYPE_INT:
+        fprintf(stdout, "%d: %d\n", id++, *(int32_t *)key);
+        break;
       case TSDB_DATA_TYPE_SMALLINT:
       case TSDB_DATA_TYPE_TINYINT:
       case TSDB_DATA_TYPE_BIGINT:
-        fprintf(stdout, "%d: %" PRId64 " \n", id++, p->key.i64Key);
+        fprintf(stdout, "%d: %" PRId64 " \n", id++, *(int64_t *)key);
         break;
       case TSDB_DATA_TYPE_BINARY:
-        fprintf(stdout, "%d: %s \n", id++, p->key.pz);
+        fprintf(stdout, "%d: %s \n", id++, key);
         break;
       case TSDB_DATA_TYPE_DOUBLE:
-        fprintf(stdout, "%d: %lf \n", id++, p->key.dKey);
+        fprintf(stdout, "%d: %lf \n", id++, *(double *)key);
         break;
       default:
         fprintf(stdout, "\n");
     }
-    p = p->pForward[nlevel - 1];
-  }
-}
 
-/*
- * query processor based on query condition
- */
-int32_t tSkipListQuery(tSkipList *pSkipList, tSKipListQueryCond *pQueryCond, tSkipListNode ***pResult) {
-  // query condition check
-  int32_t       rel = 0;
-  __compar_fn_t comparator = getKeyComparator(pQueryCond->lowerBnd.nType);
-
-  if (pSkipList == NULL || pQueryCond == NULL || pSkipList->nSize == 0 ||
-      (((rel = comparator(&pQueryCond->lowerBnd, &pQueryCond->upperBnd)) > 0 &&
-        pQueryCond->lowerBnd.nType != TSDB_DATA_TYPE_NCHAR && pQueryCond->lowerBnd.nType != TSDB_DATA_TYPE_BINARY))) {
-    (*pResult) = NULL;
-    return 0;
-  }
-
-  if (rel == 0) {
-    /*
-     * 0 means: pQueryCond->lowerBnd == pQueryCond->upperBnd
-     * point query
-     */
-    if (pQueryCond->lowerBndRelOptr == TSDB_RELATION_LARGE_EQUAL &&
-        pQueryCond->upperBndRelOptr == TSDB_RELATION_LESS_EQUAL) {  // point query
-      return tSkipListGets(pSkipList, &pQueryCond->lowerBnd, pResult);
-    } else {
-      (*pResult) = NULL;
-      return 0;
-    }
-  } else {
-    /* range query, query operation code check */
-    return tSkipListRangeQuery(pSkipList, pQueryCond, pResult);
+    prev = SL_GET_NODE_KEY(pSkipList, p);
+    
+    p = SL_GET_FORWARD_POINTER(p, nlevel - 1);
   }
 }
 
-typedef struct MultipleQueryResult {
-  int32_t         len;
-  tSkipListNode **pData;
-} MultipleQueryResult;
-
-static int32_t mergeQueryResult(MultipleQueryResult *pResults, int32_t numOfResSet, tSkipListNode ***pRes) {
-  int32_t total = 0;
-  for (int32_t i = 0; i < numOfResSet; ++i) {
-    total += pResults[i].len;
+void tSkipListDoInsert(SSkipList *pSkipList, SSkipListNode **forward, SSkipListNode *pNode) {
+  DO_MEMSET_PTR_AREA(pNode);
+  
+  for (int32_t i = 0; i < pNode->level; ++i) {
+    SSkipListNode *x = forward[i];
+    SL_GET_BACKWARD_POINTER(pNode, i) = x;
+    
+    SSkipListNode *next = SL_GET_FORWARD_POINTER(x, i);
+    SL_GET_BACKWARD_POINTER(next, i) = pNode;
+    
+    SL_GET_FORWARD_POINTER(pNode, i) = next;
+    SL_GET_FORWARD_POINTER(x, i) = pNode;
   }
-
-  (*pRes) = malloc(POINTER_BYTES * total);
-  int32_t idx = 0;
-
-  for (int32_t i = 0; i < numOfResSet; ++i) {
-    MultipleQueryResult *pOneResult = &pResults[i];
-    for (int32_t j = 0; j < pOneResult->len; ++j) {
-      (*pRes)[idx++] = pOneResult->pData[j];
-    }
+  
+  atomic_add_fetch_32(&pSkipList->size, 1);
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
   }
-
-  return total;
 }
 
-static void removeDuplicateKey(tSkipListKey *pKey, int32_t *numOfKey, __compar_fn_t comparator) {
-  if (*numOfKey == 1) {
-    return;
-  }
-
-  qsort(pKey, *numOfKey, sizeof(pKey[0]), comparator);
-  int32_t i = 0, j = 1;
-
-  while (i < (*numOfKey) && j < (*numOfKey)) {
-    int32_t ret = comparator(&pKey[i], &pKey[j]);
-    if (ret == 0) {
-      j++;
-    } else {
-      pKey[i + 1] = pKey[j];
-      i++;
-      j++;
-    }
+SSkipListNode* tSkipListPushFront(SSkipList* pSkipList, SSkipListNode *pNode) {
+  SSkipListNode* forward[MAX_SKIP_LIST_LEVEL] = {0};
+  for(int32_t i = 0; i < pSkipList->level; ++i) {
+    forward[i] = pSkipList->pHead;
   }
-
-  (*numOfKey) = i + 1;
+  
+  tSkipListDoInsert(pSkipList, forward, pNode);
+  return pNode;
 }
 
-int32_t mergeResult(const tSkipListKey *pKey, int32_t numOfKey, tSkipListNode ***pRes, __compar_fn_t comparator,
-                    tSkipListNode *pNode) {
-  int32_t i = 0, j = 0;
-  // merge two sorted arrays in O(n) time
-  while (i < numOfKey && pNode != NULL) {
-    int32_t ret = comparator(&pNode->key, &pKey[i]);
-    if (ret < 0) {
-      (*pRes)[j++] = pNode;
-      pNode = pNode->pForward[0];
-    } else if (ret == 0) {
-      pNode = pNode->pForward[0];
-    } else {  // pNode->key > pkey[i]
-      i++;
-    }
+SSkipListNode* tSkipListPushBack(SSkipList *pSkipList, SSkipListNode *pNode) {
+  // do clear pointer area
+  DO_MEMSET_PTR_AREA(pNode);
+  
+  for(int32_t i = 0; i < pNode->level; ++i) {
+    SSkipListNode* prev = SL_GET_BACKWARD_POINTER(pSkipList->pTail, i);
+    SL_GET_FORWARD_POINTER(prev, i) = pNode;
+    SL_GET_FORWARD_POINTER(pNode, i) = pSkipList->pTail;
+    
+    SL_GET_BACKWARD_POINTER(pNode, i) = prev;
+    SL_GET_BACKWARD_POINTER(pSkipList->pTail, i) = pNode;
   }
-
-  while (pNode != NULL) {
-    (*pRes)[j++] = pNode;
-    pNode = pNode->pForward[0];
+  
+  atomic_add_fetch_32(&pSkipList->size, 1);
+  if (pSkipList->lock) {
+    pthread_rwlock_unlock(pSkipList->lock);
   }
-  return j;
+  
+  return pNode;
 }
 
-int32_t tSkipListPointQuery(tSkipList *pSkipList, tSkipListKey *pKey, int32_t numOfKey, tSkipListPointQueryType type,
-                            tSkipListNode ***pRes) {
-  if (numOfKey == 0 || pKey == NULL || pSkipList == NULL || pSkipList->nSize == 0 ||
-      (type != INCLUDE_POINT_QUERY && type != EXCLUDE_POINT_QUERY)) {
-    (*pRes) = NULL;
-    return 0;
+SSkipListIterator* doCreateSkipListIterator(SSkipList *pSkipList, int32_t order) {
+  SSkipListIterator* iter = calloc(1, sizeof(SSkipListIterator));
+  
+  iter->pSkipList = pSkipList;
+  iter->order = order;
+  if(order == TSDB_ORDER_ASC) {
+    iter->cur = pSkipList->pHead;
+    iter->next = SL_GET_FORWARD_POINTER(iter->cur, 0);
+  } else {
+    iter->cur = pSkipList->pTail;
+    iter->next = SL_GET_BACKWARD_POINTER(iter->cur, 0);
   }
 
-  __compar_fn_t comparator = getKeyComparator(pKey->nType);
-  removeDuplicateKey(pKey, &numOfKey, comparator);
-
-  if (type == INCLUDE_POINT_QUERY) {
-    if (numOfKey == 1) {
-      return tSkipListGets(pSkipList, &pKey[0], pRes);
-    } else {
-      MultipleQueryResult *pTempResult = (MultipleQueryResult *)malloc(sizeof(MultipleQueryResult) * numOfKey);
-      for (int32_t i = 0; i < numOfKey; ++i) {
-        pTempResult[i].len = tSkipListGets(pSkipList, &pKey[i], &pTempResult[i].pData);
-      }
-      int32_t num = mergeQueryResult(pTempResult, numOfKey, pRes);
-
-      for (int32_t i = 0; i < numOfKey; ++i) {
-        free(pTempResult[i].pData);
-      }
-      free(pTempResult);
-      return num;
-    }
-  } else {  // exclude query
-    *pRes = malloc(POINTER_BYTES * pSkipList->nSize);
-
-    __compar_fn_t filterComparator = getKeyFilterComparator(pSkipList, pKey->nType);
-
-    tSkipListNode *pNode = pSkipList->pHead.pForward[0];
-    int32_t        retLen = mergeResult(pKey, numOfKey, pRes, filterComparator, pNode);
-
-    if (retLen < pSkipList->nSize) {
-      (*pRes) = realloc(*pRes, POINTER_BYTES * retLen);
-    }
-    return retLen;
-  }
-}
+  return iter;
+}
\ No newline at end of file
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index 7ab004646e3094d1a231e30eafaf6a966f0bba8b..4cf73e6dff8aa534e87145a3e1cb04e48d759c65 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -14,92 +14,60 @@
  */
 
 #include "os.h"
-#include "tglobalcfg.h"
-#include "tlog.h"
+#include "tulog.h"
 #include "tsocket.h"
-#include "tutil.h"
+#include "taoserror.h"
 
-/*
- * Function to get the public ip address of current machine. If get IP
- * successfully, return 0, else, return -1. The return values is ip.
- *
- * Use:
- * if (taosGetPublicIp(ip) != 0) {
- *     perror("Fail to get public IP address\n");
- *     exit(EXIT_FAILURE);
- * }
- */
-int taosGetPublicIp(char *const ip) {
-  /* bool flag; */
-  int                flag;
-  int                sock;
-  char **            pptr = NULL;
-  struct sockaddr_in destAddr;
-  struct hostent *   ptr = NULL;
-  char               destIP[128];
-  char               szBuffer[] = {
-      "GET / HTTP/1.1\nHost: ident.me\nUser-Agent: curl/7.47.0\nAccept: "
-      "*/*\n\n"};
-  char res[1024];
-
-  // Create socket
-  sock = (int)socket(AF_INET, SOCK_STREAM, 0);
-  if (sock == -1) {
+int taosGetFqdn(char *fqdn) {
+  char hostname[1024];
+  hostname[1023] = '\0';
+  if (gethostname(hostname, 1023) == -1) {
+    uError("failed to get hostname, reason:%s", strerror(errno));
     return -1;
   }
 
-  bzero((void *)&destAddr, sizeof(destAddr));
-  destAddr.sin_family = AF_INET;
-  destAddr.sin_port = htons(80);
-
-  ptr = gethostbyname("ident.me");
-  if (ptr == NULL) {
-    return -1;
-  }
-
-  // Loop to find a valid IP address
-  for (flag = 0, pptr = ptr->h_addr_list; NULL != *pptr; ++pptr) {
-    inet_ntop(ptr->h_addrtype, *pptr, destIP, sizeof(destIP));
-    destAddr.sin_addr.s_addr = inet_addr(destIP);
-    if (connect(sock, (struct sockaddr *)&destAddr, sizeof(struct sockaddr)) != -1) {
-      flag = 1;
-      break;
-    }
-  }
-
-  // Check if the host is available.
-  if (flag == 0) {
+  struct addrinfo hints = {0};
+  struct addrinfo *result = NULL;
+  hints.ai_flags = AI_CANONNAME;
+  int ret = getaddrinfo(hostname, NULL, &hints, &result);
+  if (!result) {
+    uError("failed to get fqdn, code:%d, reason:%s", ret, gai_strerror(ret));
     return -1;
   }
 
-  // Check send.
-  if (strlen(szBuffer) != taosWriteSocket(sock, szBuffer, (size_t)strlen(szBuffer))) {
-    return -1;
-  }
-
-  // Receive response.
-  if (taosReadSocket(sock, res, 1024) == -1) {
-    return -1;
-  }
-
-  // Extract the IP address from the response.
-  int c_start = 0, c_end = 0;
-  for (; c_start < (int)strlen(res); c_start = c_end + 1) {
-    for (c_end = c_start; c_end < (int)strlen(res) && res[c_end] != '\n'; c_end++) {
-    }
-
-    if (c_end >= (int)strlen(res)) {
-      return -1;
-    }
+  strcpy(fqdn, result->ai_canonname);
+  freeaddrinfo(result);
+  return 0;
+}
 
-    if (res[c_start] >= '0' && res[c_start] <= '9') {
-      strncpy(ip, res + c_start, (size_t)(c_end - c_start));
-      ip[c_end - c_start] = '\0';
-      break;
+uint32_t taosGetIpFromFqdn(const char *fqdn) {
+  struct addrinfo hints = {0};
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+
+  struct addrinfo *result = NULL;
+
+  int32_t ret = getaddrinfo(fqdn, NULL, &hints, &result);
+  if (result) {
+    struct sockaddr *sa = result->ai_addr;
+    struct sockaddr_in *si = (struct sockaddr_in*)sa;
+    struct in_addr ia = si->sin_addr;
+    uint32_t ip = ia.s_addr;
+    freeaddrinfo(result);
+    return ip;
+  } else {
+#ifdef EAI_SYSTEM
+    if (ret == EAI_SYSTEM) {
+      uError("failed to get the ip address, fqdn:%s, code:%d, reason:%s", fqdn, ret, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+    } else {
+      uError("failed to get the ip address, fqdn:%s, code:%d, reason:%s", fqdn, ret, gai_strerror(ret));
     }
+#else
+    uError("failed to get the ip address, fqdn:%s, code:%d, reason:%s", fqdn, ret, gai_strerror(ret));
+#endif
+    return 0xFFFFFFFF;
   }
-
-  return 0;
 }
 
 // Function converting an IP address string to an unsigned int.
@@ -107,7 +75,7 @@ uint32_t ip2uint(const char *const ip_addr) {
   char ip_addr_cpy[20];
   char ip[5];
 
-  strcpy(ip_addr_cpy, ip_addr);
+  tstrncpy(ip_addr_cpy, ip_addr, sizeof(ip_addr_cpy));
 
   char *s_start, *s_end;
   s_start = ip_addr_cpy;
@@ -130,7 +98,7 @@ uint32_t ip2uint(const char *const ip_addr) {
   return *((unsigned int *)ip);
 }
 
-int taosWriteMsg(int fd, void *buf, int nbytes) {
+int taosWriteMsg(SOCKET fd, void *buf, int nbytes) {
   int   nleft, nwritten;
   char *ptr = (char *)buf;
 
@@ -152,7 +120,7 @@ int taosWriteMsg(int fd, void *buf, int nbytes) {
   return (nbytes - nleft);
 }
 
-int taosReadMsg(int fd, void *buf, int nbytes) {
+int taosReadMsg(SOCKET fd, void *buf, int nbytes) {
   int   nleft, nread;
   char *ptr = (char *)buf;
 
@@ -179,7 +147,7 @@ int taosReadMsg(int fd, void *buf, int nbytes) {
   return (nbytes - nleft);
 }
 
-int taosNonblockwrite(int fd, char *ptr, int nbytes) {
+int taosNonblockwrite(SOCKET fd, char *ptr, int nbytes) {
   taosSetNonblocking(fd, 1);
 
   int            nleft, nwritten, nready;
@@ -192,23 +160,23 @@ int taosNonblockwrite(int fd, char *ptr, int nbytes) {
     tv.tv_usec = 0;
     FD_ZERO(&fset);
     FD_SET(fd, &fset);
-    if ((nready = select(fd + 1, NULL, &fset, NULL, &tv)) == 0) {
+    if ((nready = select((int)(fd + 1), NULL, &fset, NULL, &tv)) == 0) {
       errno = ETIMEDOUT;
-      pError("fd %d timeout, no enough space to write", fd);
+      uError("fd %d timeout, no enough space to write", fd);
       break;
 
     } else if (nready < 0) {
       if (errno == EINTR) continue;
 
-      pError("select error, %d (%s)", errno, strerror(errno));
+      uError("select error, %d (%s)", errno, strerror(errno));
       return -1;
     }
 
-    nwritten = (int)send(fd, ptr, (size_t)nleft, MSG_NOSIGNAL);
+    nwritten = (int)taosSend(fd, ptr, (size_t)nleft, MSG_NOSIGNAL);
     if (nwritten <= 0) {
       if (errno == EAGAIN || errno == EINTR) continue;
 
-      pError("write error, %d (%s)", errno, strerror(errno));
+      uError("write error, %d (%s)", errno, strerror(errno));
       return -1;
     }
 
@@ -221,7 +189,7 @@ int taosNonblockwrite(int fd, char *ptr, int nbytes) {
   return (nbytes - nleft);
 }
 
-int taosReadn(int fd, char *ptr, int nbytes) {
+int taosReadn(SOCKET fd, char *ptr, int nbytes) {
   int nread, nready, nleft = nbytes;
 
   fd_set         fset;
@@ -232,23 +200,23 @@ int taosReadn(int fd, char *ptr, int nbytes) {
     tv.tv_usec = 0;
     FD_ZERO(&fset);
     FD_SET(fd, &fset);
-    if ((nready = select(fd + 1, NULL, &fset, NULL, &tv)) == 0) {
+    if ((nready = select((int)(fd + 1), NULL, &fset, NULL, &tv)) == 0) {
       errno = ETIMEDOUT;
-      pError("fd %d timeout\n", fd);
+      uError("fd %d timeout\n", fd);
       break;
     } else if (nready < 0) {
       if (errno == EINTR) continue;
-      pError("select error, %d (%s)", errno, strerror(errno));
+      uError("select error, %d (%s)", errno, strerror(errno));
       return -1;
     }
 
     if ((nread = (int)taosReadSocket(fd, ptr, (size_t)nleft)) < 0) {
       if (errno == EINTR) continue;
-      pError("read error, %d (%s)", errno, strerror(errno));
+      uError("read error, %d (%s)", errno, strerror(errno));
       return -1;
 
     } else if (nread == 0) {
-      pError("fd %d EOF", fd);
+      uError("fd %d EOF", fd);
       break;  // EOF
     }
 
@@ -259,65 +227,39 @@ int taosReadn(int fd, char *ptr, int nbytes) {
   return (nbytes - nleft);
 }
 
-int taosOpenUdpSocket(char *ip, uint16_t port) {
+SOCKET taosOpenUdpSocket(uint32_t ip, uint16_t port) {
   struct sockaddr_in localAddr;
-  int                sockFd;
-  int                ttl = 128;
-  int                reuse, nocheck;
-  int                bufSize = 8192000;
+  SOCKET             sockFd;
+  int                bufSize = 1024000;
 
-  pTrace("open udp socket:%s:%hu", ip, port);
+  uDebug("open udp socket:0x%x:%hu", ip, port);
 
   memset((char *)&localAddr, 0, sizeof(localAddr));
   localAddr.sin_family = AF_INET;
-  localAddr.sin_addr.s_addr = inet_addr(ip);
+  localAddr.sin_addr.s_addr = ip;
   localAddr.sin_port = (uint16_t)htons(port);
 
-  if ((sockFd = (int)socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-    pError("failed to open udp socket: %d (%s)", errno, strerror(errno));
-    return -1;
-  }
-
-  reuse = 1;
-  if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    pError("setsockopt SO_REUSEADDR failed): %d (%s)", errno, strerror(errno));
-    close(sockFd);
-    return -1;
-  };
-
-  nocheck = 1;
-  if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_NO_CHECK, (void *)&nocheck, sizeof(nocheck)) < 0) {
-    if (!taosSkipSocketCheck()) {
-      pError("setsockopt SO_NO_CHECK failed: %d (%s)", errno, strerror(errno));
-      close(sockFd);
-      return -1;
-    } else {
-      pPrint("Skipping setsockopt SO_NO_CHECK error: %d (%s)", errno, strerror(errno));
-    }
-  }
-
-  ttl = 128;
-  if (taosSetSockOpt(sockFd, IPPROTO_IP, IP_TTL, (void *)&ttl, sizeof(ttl)) < 0) {
-    pError("setsockopt IP_TTL failed: %d (%s)", errno, strerror(errno));
-    close(sockFd);
+  if ((sockFd = (int)socket(AF_INET, SOCK_DGRAM, 0)) <= 2) {
+    uError("failed to open udp socket: %d (%s)", errno, strerror(errno));
+    taosCloseSocketNoCheck(sockFd);
     return -1;
   }
 
   if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_SNDBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    pError("failed to set the send buffer size for UDP socket\n");
-    close(sockFd);
+    uError("failed to set the send buffer size for UDP socket\n");
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_RCVBUF, (void *)&bufSize, sizeof(bufSize)) != 0) {
-    pError("failed to set the receive buffer size for UDP socket\n");
-    close(sockFd);
+    uError("failed to set the receive buffer size for UDP socket\n");
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   /* bind socket to local address */
   if (bind(sockFd, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0) {
-    pError("failed to bind udp socket: %d (%s), %s:%hu", errno, strerror(errno), ip, port);
+    uError("failed to bind udp socket: %d (%s), 0x%x:%hu", errno, strerror(errno), ip, port);
     taosCloseSocket(sockFd);
     return -1;
   }
@@ -325,173 +267,154 @@ int taosOpenUdpSocket(char *ip, uint16_t port) {
   return sockFd;
 }
 
-int taosOpenTcpClientSocket(char *destIp, uint16_t destPort, char *clientIp) {
-  int                sockFd = 0;
+SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clientIp) {
+  SOCKET             sockFd = 0;
   struct sockaddr_in serverAddr, clientAddr;
   int                ret;
 
-  pTrace("open tcp client socket:%s:%d", destIp, destPort);
+  sockFd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-  sockFd = (int)socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (sockFd <= 2) {
+    uError("failed to open the socket: %d (%s)", errno, strerror(errno));
+    taosCloseSocketNoCheck(sockFd);
+    return -1;
+  }
 
-  if (sockFd < 0) {
-    pError("failed to open the socket: %d (%s)", errno, strerror(errno));
+  /* set REUSEADDR option, so the portnumber can be re-used */
+  int reuse = 1;
+  if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
+    uError("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
-  if (clientIp && clientIp[0] && clientIp[0] != '0') {
+  if (clientIp != 0) {
     memset((char *)&clientAddr, 0, sizeof(clientAddr));
     clientAddr.sin_family = AF_INET;
-    clientAddr.sin_addr.s_addr = inet_addr(clientIp);
+    clientAddr.sin_addr.s_addr = clientIp;
     clientAddr.sin_port = 0;
 
     /* bind socket to client address */
     if (bind(sockFd, (struct sockaddr *)&clientAddr, sizeof(clientAddr)) < 0) {
-      pError("bind tcp client socket failed, client(%s:0), dest(%s:%d), reason:%d(%s)",
-             clientIp, destIp, destPort, errno, strerror(errno));
-      close(sockFd);
+      uError("bind tcp client socket failed, client(0x%x:0), dest(0x%x:%d), reason:(%s)",
+             clientIp, destIp, destPort, strerror(errno));
+      taosCloseSocket(sockFd);
       return -1;
     }
   }
 
   memset((char *)&serverAddr, 0, sizeof(serverAddr));
   serverAddr.sin_family = AF_INET;
-  serverAddr.sin_addr.s_addr = inet_addr(destIp);
+  serverAddr.sin_addr.s_addr = destIp;
   serverAddr.sin_port = (uint16_t)htons((uint16_t)destPort);
 
   ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
 
   if (ret != 0) {
-    pError("failed to connect socket, ip:%s, port:%hu, reason: %s", destIp, destPort, strerror(errno));
+    //uError("failed to connect socket, ip:0x%x, port:%hu(%s)", destIp, destPort, strerror(errno));
     taosCloseSocket(sockFd);
     sockFd = -1;
+  } else {
+    taosKeepTcpAlive(sockFd);
   }
 
   return sockFd;
 }
 
-void taosCloseTcpSocket(int sockFd) {
-  struct linger linger;
-  linger.l_onoff = 1;
-  linger.l_linger = 0;
-  if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger)) < 0) {
-    pError("setsockopt SO_LINGER failed: %d (%s)", errno, strerror(errno));
-  }
-
-  taosCloseSocket(sockFd);
-}
-
-int taosKeepTcpAlive(int sockFd) {
+int taosKeepTcpAlive(SOCKET sockFd) {
   int alive = 1;
   if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_KEEPALIVE, (void *)&alive, sizeof(alive)) < 0) {
-    pError("fd:%d setsockopt SO_KEEPALIVE failed: %d (%s)", sockFd, errno, strerror(errno));
-    close(sockFd);
+    uError("fd:%d setsockopt SO_KEEPALIVE failed: %d (%s)", sockFd, errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   int probes = 3;
   if (taosSetSockOpt(sockFd, SOL_TCP, TCP_KEEPCNT, (void *)&probes, sizeof(probes)) < 0) {
-    pError("fd:%d setsockopt SO_KEEPCNT failed: %d (%s)", sockFd, errno, strerror(errno));
-    close(sockFd);
+    uError("fd:%d setsockopt SO_KEEPCNT failed: %d (%s)", sockFd, errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   int alivetime = 10;
   if (taosSetSockOpt(sockFd, SOL_TCP, TCP_KEEPIDLE, (void *)&alivetime, sizeof(alivetime)) < 0) {
-    pError("fd:%d setsockopt SO_KEEPIDLE failed: %d (%s)", sockFd, errno, strerror(errno));
-    close(sockFd);
+    uError("fd:%d setsockopt SO_KEEPIDLE failed: %d (%s)", sockFd, errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   int interval = 3;
   if (taosSetSockOpt(sockFd, SOL_TCP, TCP_KEEPINTVL, (void *)&interval, sizeof(interval)) < 0) {
-    pError("fd:%d setsockopt SO_KEEPINTVL failed: %d (%s)", sockFd, errno, strerror(errno));
-    close(sockFd);
+    uError("fd:%d setsockopt SO_KEEPINTVL failed: %d (%s)", sockFd, errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   int nodelay = 1;
   if (taosSetSockOpt(sockFd, IPPROTO_TCP, TCP_NODELAY, (void *)&nodelay, sizeof(nodelay)) < 0) {
-    pError("fd:%d setsockopt TCP_NODELAY failed %d (%s)", sockFd, errno, strerror(errno));
-    close(sockFd);
+    uError("fd:%d setsockopt TCP_NODELAY failed %d (%s)", sockFd, errno, strerror(errno));
+    taosCloseSocket(sockFd);
+    return -1;
+  }
+
+  struct linger linger = {0};
+  linger.l_onoff = 1;
+  linger.l_linger = 3;
+  if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger)) < 0) {
+    uError("setsockopt SO_LINGER failed: %d (%s)", errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
   return 0;
 }
 
-int taosOpenTcpServerSocket(char *ip, uint16_t port) {
+SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port) {
   struct sockaddr_in serverAdd;
-  int                sockFd;
+  SOCKET            sockFd;
   int                reuse;
 
-  pTrace("open tcp server socket:%s:%hu", ip, port);
+  uDebug("open tcp server socket:0x%x:%hu", ip, port);
 
   bzero((char *)&serverAdd, sizeof(serverAdd));
   serverAdd.sin_family = AF_INET;
-  serverAdd.sin_addr.s_addr = inet_addr(ip);
+  serverAdd.sin_addr.s_addr = ip;
   serverAdd.sin_port = (uint16_t)htons(port);
 
-  if ((sockFd = (int)socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-    pError("failed to open TCP socket: %d (%s)", errno, strerror(errno));
+  if ((sockFd = (int)socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) <= 2) {
+    uError("failed to open TCP socket: %d (%s)", errno, strerror(errno));
+    taosCloseSocketNoCheck(sockFd);
     return -1;
   }
 
   /* set REUSEADDR option, so the portnumber can be re-used */
   reuse = 1;
   if (taosSetSockOpt(sockFd, SOL_SOCKET, SO_REUSEADDR, (void *)&reuse, sizeof(reuse)) < 0) {
-    pError("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
-    close(sockFd);
+    uError("setsockopt SO_REUSEADDR failed: %d (%s)", errno, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
-  };
+  }
 
   /* bind socket to server address */
   if (bind(sockFd, (struct sockaddr *)&serverAdd, sizeof(serverAdd)) < 0) {
-    pError("bind tcp server socket failed, %s:%hu, reason:%d(%s)", ip, port, errno, strerror(errno));
-    close(sockFd);
-    return -1;
-  }
-
-  if (taosKeepTcpAlive(sockFd) < 0) return -1;
-
-  if (listen(sockFd, 10) < 0) {
-    pError("listen tcp server socket failed, %s:%hu, reason:%d(%s)", ip, port, errno, strerror(errno));
-    return -1;
-  }
-
-  return sockFd;
-}
-
-int taosOpenRawSocket(char *ip) {
-  int                fd, hold;
-  struct sockaddr_in rawAdd;
-
-  pTrace("open udp raw socket:%s", ip);
-
-  fd = (int)socket(AF_INET, SOCK_RAW, IPPROTO_UDP);
-  if (fd < 0) {
-    pError("failed to open raw socket: %d (%s)", errno, strerror(errno));
+    uError("bind tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
-  hold = 1;
-  if (taosSetSockOpt(fd, IPPROTO_IP, IP_HDRINCL, (void *)&hold, sizeof(hold)) < 0) {
-    pError("failed to set hold option: %d (%s)", errno, strerror(errno));
-    close(fd);
+  if (taosKeepTcpAlive(sockFd) < 0) {
+    uError("failed to set tcp server keep-alive option, 0x%x:%hu(%s)", ip, port, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
-  bzero((char *)&rawAdd, sizeof(rawAdd));
-  rawAdd.sin_family = AF_INET;
-  rawAdd.sin_addr.s_addr = inet_addr(ip);
-
-  if (bind(fd, (struct sockaddr *)&rawAdd, sizeof(rawAdd)) < 0) {
-    pError("failed to bind RAW socket: %d (%s)", errno, strerror(errno));
-    close(fd);
+  if (listen(sockFd, 10) < 0) {
+    uError("listen tcp server socket failed, 0x%x:%hu(%s)", ip, port, strerror(errno));
+    taosCloseSocket(sockFd);
     return -1;
   }
 
-  return fd;
+  return sockFd;
 }
 
 void tinet_ntoa(char *ipstr, unsigned int ip) {
@@ -501,7 +424,7 @@ void tinet_ntoa(char *ipstr, unsigned int ip) {
 #define COPY_SIZE 32768
 // sendfile shall be used
 
-int taosCopyFds(int sfd, int dfd, int64_t len) {
+int taosCopyFds(SOCKET sfd, SOCKET dfd, int64_t len) {
   int64_t leftLen;
   int     readLen, writeLen;
   char    temp[COPY_SIZE];
@@ -516,7 +439,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) {
 
     int retLen = taosReadMsg(sfd, temp, (int)readLen);
     if (readLen != retLen) {
-      pError("read error, readLen:%d retLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, retLen, len, leftLen,
+      uError("read error, readLen:%d retLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, retLen, len, leftLen,
              strerror(errno));
       return -1;
     }
@@ -524,7 +447,7 @@ int taosCopyFds(int sfd, int dfd, int64_t len) {
     writeLen = taosWriteMsg(dfd, temp, readLen);
 
     if (readLen != writeLen) {
-      pError("copy error, readLen:%d writeLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, writeLen, len, leftLen,
+      uError("copy error, readLen:%d writeLen:%d len:%" PRId64 " leftLen:%" PRId64 ", reason:%s", readLen, writeLen, len, leftLen,
              strerror(errno));
       return -1;
     }
diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c
deleted file mode 100644
index 65c5d0ea4c86f2cd05628bbc2f9e35da89d0d7c6..0000000000000000000000000000000000000000
--- a/src/util/src/ttime.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * 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/>.
- */
-
-#define _XOPEN_SOURCE
-#define _DEFAULT_SOURCE
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "tsdb.h"
-#include "ttime.h"
-#include "tutil.h"
-
-/*
- * mktime64 - Converts date to seconds.
- * Converts Gregorian date to seconds since 1970-01-01 00:00:00.
- * Assumes input in normal date format, i.e. 1980-12-31 23:59:59
- * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
- *
- * [For the Julian calendar (which was used in Russia before 1917,
- * Britain & colonies before 1752, anywhere else before 1582,
- * and is still in use by some communities) leave out the
- * -year/100+year/400 terms, and add 10.]
- *
- * This algorithm was first published by Gauss (I think).
- *
- * A leap second can be indicated by calling this function with sec as
- * 60 (allowable under ISO 8601).  The leap second is treated the same
- * as the following second since they don't exist in UNIX time.
- *
- * An encoding of midnight at the end of the day as 24:00:00 - ie. midnight
- * tomorrow - (allowable under ISO 8601) is supported.
- */
-int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
-		const unsigned int day, const unsigned int hour,
-		const unsigned int min, const unsigned int sec)
-{
-	unsigned int mon = mon0, year = year0;
-
-	/* 1..12 -> 11,12,1..10 */
-	if (0 >= (int) (mon -= 2)) {
-		mon += 12;	/* Puts Feb last since it has leap day */
-		year -= 1;
-	}
-
-  int64_t res = (((((int64_t) (year/4 - year/100 + year/400 + 367*mon/12 + day) +
-		  year*365 - 719499)*24 + hour)*60 + min)*60 + sec);
-
-	return (res + timezone);
-}
-// ==== mktime() kernel code =================//
-static int64_t m_deltaUtc = 0;
-void deltaToUtcInitOnce() {  
-  struct tm tm = {0};
-  
-  (void)strptime("1970-01-01 00:00:00", (const char *)("%Y-%m-%d %H:%M:%S"), &tm);
-  m_deltaUtc = (int64_t)mktime(&tm);
-  //printf("====delta:%lld\n\n", seconds);	
-  return;
-}
-
-int64_t user_mktime(struct tm * tm)
-{
-#define TAOS_MINUTE   60
-#define TAOS_HOUR     (60*TAOS_MINUTE)
-#define TAOS_DAY      (24*TAOS_HOUR)
-#define TAOS_YEAR     (365*TAOS_DAY)
-  
-static int month[12] = {
-  0,
-  TAOS_DAY*(31),
-  TAOS_DAY*(31+29),
-  TAOS_DAY*(31+29+31),
-  TAOS_DAY*(31+29+31+30),
-  TAOS_DAY*(31+29+31+30+31),
-  TAOS_DAY*(31+29+31+30+31+30),
-  TAOS_DAY*(31+29+31+30+31+30+31),
-  TAOS_DAY*(31+29+31+30+31+30+31+31),
-  TAOS_DAY*(31+29+31+30+31+30+31+31+30),
-  TAOS_DAY*(31+29+31+30+31+30+31+31+30+31),
-  TAOS_DAY*(31+29+31+30+31+30+31+31+30+31+30)
-};
-
-  int64_t res;
-  int     year;
-  
-  year= tm->tm_year - 70; 
-  res= TAOS_YEAR*year + TAOS_DAY*((year+1)/4);
-  res+= month[tm->tm_mon];
-  
-  if(tm->tm_mon > 1 && ((year+2)%4)) {  
-    res-= TAOS_DAY;
-  }
-  
-  res+= TAOS_DAY*(tm->tm_mday-1);  
-  res+= TAOS_HOUR*tm->tm_hour;  
-  res+= TAOS_MINUTE*tm->tm_min;  
-  res+= tm->tm_sec;
-  
-  return res + m_deltaUtc;
-
-}
-
-
-static int64_t parseFraction(char* str, char** end, int32_t timePrec);
-static int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec);
-static int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec);
-
-int32_t taosGetTimestampSec() { return (int32_t)time(NULL); }
-
-int64_t taosGetTimestampMs() {
-  struct timeval systemTime;
-  gettimeofday(&systemTime, NULL);
-  return (int64_t)systemTime.tv_sec * 1000L + (uint64_t)systemTime.tv_usec / 1000;
-}
-
-int64_t taosGetTimestampUs() {
-  struct timeval systemTime;
-  gettimeofday(&systemTime, NULL);
-  return (int64_t)systemTime.tv_sec * 1000000L + (uint64_t)systemTime.tv_usec;
-}
-
-/*
- * If tsTimePrecision == 1, taosGetTimestamp will return timestamp in microsecond.
- * Otherwise, it will return timestamp in millisecond.
- */
-int64_t taosGetTimestamp(int32_t precision) {
-  if (precision == TSDB_TIME_PRECISION_MICRO) {
-    return taosGetTimestampUs();
-  } else {
-    return taosGetTimestampMs();
-  }
-}
-
-int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePrec) {
-  /* parse datatime string in with tz */
-  if (strnchr(timestr, 'T', len, false) != NULL) {
-    return parseTimeWithTz(timestr, time, timePrec);
-  } else {
-    return parseLocaltime(timestr, time, timePrec);
-  }
-}
-
-char* forwardToTimeStringEnd(char* str) {
-  int32_t i = 0;
-  int32_t numOfSep = 0;
-
-  while (str[i] != 0 && numOfSep < 2) {
-    if (str[i++] == ':') {
-      numOfSep++;
-    }
-  }
-
-  while (str[i] >= '0' && str[i] <= '9') {
-    i++;
-  }
-
-  return &str[i];
-}
-
-int64_t parseFraction(char* str, char** end, int32_t timePrec) {
-  int32_t i = 0;
-  int64_t fraction = 0;
-
-  const int32_t MILLI_SEC_FRACTION_LEN = 3;
-  const int32_t MICRO_SEC_FRACTION_LEN = 6;
-
-  int32_t factor[6] = {1, 10, 100, 1000, 10000, 100000};
-  int32_t times = 1;
-
-  while (str[i] >= '0' && str[i] <= '9') {
-    i++;
-  }
-
-  int32_t totalLen = i;
-  if (totalLen <= 0) {
-    return -1;
-  }
-
-  /* parse the fraction */
-  if (timePrec == TSDB_TIME_PRECISION_MILLI) {
-    /* only use the initial 3 bits */
-    if (i >= MILLI_SEC_FRACTION_LEN) {
-      i = MILLI_SEC_FRACTION_LEN;
-    }
-
-    times = MILLI_SEC_FRACTION_LEN - i;
-  } else {
-    assert(timePrec == TSDB_TIME_PRECISION_MICRO);
-    if (i >= MICRO_SEC_FRACTION_LEN) {
-      i = MICRO_SEC_FRACTION_LEN;
-    }
-    times = MICRO_SEC_FRACTION_LEN - i;
-  }
-
-  fraction = strnatoi(str, i) * factor[times];
-  *end = str + totalLen;
-
-  return fraction;
-}
-
-int32_t parseTimezone(char* str, int64_t* tzOffset) {
-  int64_t hour = 0;
-
-  int32_t i = 0;
-  if (str[i] != '+' && str[i] != '-') {
-    return -1;
-  }
-
-  i++;
-
-  char* sep = strchr(&str[i], ':');
-  if (sep != NULL) {
-    int32_t len = sep - &str[i];
-
-    hour = strnatoi(&str[i], len);
-    i += len + 1;
-  } else {
-    hour = strnatoi(&str[i], 2);
-    i += 2;
-  }
-
-  int64_t minute = strnatoi(&str[i], 2);
-  if (minute > 59) {
-    return -1;
-  }
-
-  if (str[0] == '+') {
-    *tzOffset = -(hour * 3600 + minute * 60);
-  } else {
-    *tzOffset = hour * 3600 + minute * 60;
-  }
-
-  return 0;
-}
-
-/*
- * rfc3339 format:
- * 2013-04-12T15:52:01+08:00
- * 2013-04-12T15:52:01.123+08:00
- *
- * 2013-04-12T15:52:01Z
- * 2013-04-12T15:52:01.123Z
- *
- * iso-8601 format:
- * 2013-04-12T15:52:01+0800
- * 2013-04-12T15:52:01.123+0800
- */
-int32_t parseTimeWithTz(char* timestr, int64_t* time, int32_t timePrec) {
-  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
-  int64_t tzOffset = 0;
-
-  struct tm tm = {0};
-  char*     str = strptime(timestr, "%Y-%m-%dT%H:%M:%S", &tm);
-  if (str == NULL) {
-    return -1;
-  }
-
-/* mktime will be affected by TZ, set by using taos_options */
-#ifdef WINDOWS
-  int64_t seconds = gmtime(&tm); 
-#else
-  int64_t seconds = timegm(&tm);
-#endif
-
-  int64_t fraction = 0;
-  str = forwardToTimeStringEnd(timestr);
-
-  if (str[0] == 'Z' || str[0] == 'z') {
-    /* utc time, no millisecond, return directly*/
-    *time = seconds * factor;
-  } else if (str[0] == '.') {
-    str += 1;
-    if ((fraction = parseFraction(str, &str, timePrec)) < 0) {
-      return -1;
-    }
-
-    *time = seconds * factor + fraction;
-
-    char seg = str[0];
-    if (seg != 'Z' && seg != 'z' && seg != '+' && seg != '-') {
-      return -1;
-    } else if (seg == '+' || seg == '-') {
-      // parse the timezone
-      if (parseTimezone(str, &tzOffset) == -1) {
-        return -1;
-      }
-
-      *time += tzOffset * factor;
-    }
-
-  } else if (str[0] == '+' || str[0] == '-') {
-    *time = seconds * factor + fraction;
-
-    // parse the timezone
-    if (parseTimezone(str, &tzOffset) == -1) {
-      return -1;
-    }
-
-    *time += tzOffset * factor;
-  } else {
-    return -1;
-  }
-
-  return 0;
-}
-
-int32_t parseLocaltime(char* timestr, int64_t* time, int32_t timePrec) {
-  *time = 0;
-  struct tm tm = {0};
-
-  char* str = strptime(timestr, "%Y-%m-%d %H:%M:%S", &tm);
-  if (str == NULL) {
-    return -1;
-  }
-
-  /* mktime will be affected by TZ, set by using taos_options */
-  //int64_t seconds = mktime(&tm);
-  //int64_t seconds = (int64_t)user_mktime(&tm);
-  int64_t seconds = user_mktime64(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-  
-  int64_t fraction = 0;
-
-  if (*str == '.') {
-    /* parse the second fraction part */
-    if ((fraction = parseFraction(str + 1, &str, timePrec)) < 0) {
-      return -1;
-    }
-  }
-
-  int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : 1000000;
-  *time = factor * seconds + fraction;
-
-  return 0;
-}
-
-static 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;
-}
-
-/*
- * a - Millionseconds
- * s - Seconds
- * m - Minutes
- * h - Hours
- * d - Days (24 hours)
- * w - Weeks (7 days)
- * n - Months (30 days)
- * y - Years (365 days)
- */
-int32_t getTimestampInUsFromStr(char* token, int32_t tokenlen, int64_t* ts) {
-  errno = 0;
-  char* endPtr = NULL;
-
-  /* get the basic numeric value */
-  int64_t timestamp = strtoll(token, &endPtr, 10);
-  if (errno != 0) {
-    return -1;
-  }
-
-  return getTimestampInUsFromStrImpl(timestamp, token[tokenlen - 1], ts);
-}
diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index ccac1de518af34c30cca8df05c8fca9f781bdd4e..0222a6d80a3f36bacde9847b1cc326fe22aa389a 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -16,10 +16,17 @@
 #include "os.h"
 #include "tlog.h"
 #include "tsched.h"
-#include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
 
+extern int32_t tscEmbedded;
+
+#define tmrFatal(...) { if (tmrDebugFlag & DEBUG_FATAL) { taosPrintLog("TMR FATAL ", tscEmbedded ? 255 : tmrDebugFlag, __VA_ARGS__); }}
+#define tmrError(...) { if (tmrDebugFlag & DEBUG_ERROR) { taosPrintLog("TMR ERROR ", tscEmbedded ? 255 : tmrDebugFlag, __VA_ARGS__); }}
+#define tmrWarn(...)  { if (tmrDebugFlag & DEBUG_WARN)  { taosPrintLog("TMR WARN ", tscEmbedded ? 255 : tmrDebugFlag, __VA_ARGS__); }}
+#define tmrInfo(...)  { if (tmrDebugFlag & DEBUG_INFO)  { taosPrintLog("TMR ", tscEmbedded ? 255 : tmrDebugFlag, __VA_ARGS__); }}
+#define tmrDebug(...) { if (tmrDebugFlag & DEBUG_DEBUG) { taosPrintLog("TMR ", tmrDebugFlag, __VA_ARGS__); }}
+#define tmrTrace(...) { if (tmrDebugFlag & DEBUG_TRACE) { taosPrintLog("TMR ", tmrDebugFlag, __VA_ARGS__); }}
 
 #define TIMER_STATE_WAITING 0
 #define TIMER_STATE_EXPIRED 1
@@ -75,8 +82,8 @@ typedef struct time_wheel_t {
   tmr_obj_t**     slots;
 } time_wheel_t;
 
-uint32_t tmrDebugFlag = DEBUG_ERROR | DEBUG_WARN | DEBUG_FILE;
-uint32_t taosMaxTmrCtrl = 512;
+int32_t tmrDebugFlag = 131;
+uint32_t tsMaxTmrCtrl = 512;
 
 static pthread_once_t  tmrModuleInit = PTHREAD_ONCE_INIT;
 static pthread_mutex_t tmrCtrlMutex;
@@ -86,7 +93,6 @@ static void*           tmrQhandle;
 static int             numOfTmrCtrl = 0;
 
 int taosTmrThreads = 1;
-
 static uintptr_t nextTimerId = 0;
 
 static time_wheel_t wheels[] = {
@@ -126,7 +132,7 @@ static void unlockTimerList(timer_list_t* list) {
   int64_t tid = taosGetPthreadId();
   if (atomic_val_compare_exchange_64(&(list->lockedBy), tid, 0) != tid) {
     assert(false);
-    tmrError("%d trying to unlock a timer list not locked by current thread.", tid);
+    tmrError("%" PRId64 " trying to unlock a timer list not locked by current thread.", tid);
   }
 }
 
@@ -254,13 +260,13 @@ static void processExpiredTimer(void* handle, void* arg) {
   uint8_t state = atomic_val_compare_exchange_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_EXPIRED);
   if (state == TIMER_STATE_WAITING) {
     const char* fmt = "%s timer[id=%" PRIuPTR ", fp=%p, param=%p] execution start.";
-    tmrTrace(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
+    tmrDebug(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
 
     (*timer->fp)(timer->param, (tmr_h)timer->id);
     atomic_store_8(&timer->state, TIMER_STATE_STOPPED);
 
     fmt = "%s timer[id=%" PRIuPTR ", fp=%p, param=%p] execution end.";
-    tmrTrace(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
+    tmrDebug(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
   }
   removeTimer(timer->id);
   timerDecRef(timer);
@@ -272,16 +278,17 @@ static void addToExpired(tmr_obj_t* head) {
   while (head != NULL) {
     uintptr_t id = head->id;
     tmr_obj_t* next = head->next;
-    tmrTrace(fmt, head->ctrl->label, id, head->fp, head->param);
+    tmrDebug(fmt, head->ctrl->label, id, head->fp, head->param);
 
     SSchedMsg  schedMsg;
     schedMsg.fp = NULL;
     schedMsg.tfp = processExpiredTimer;
+    schedMsg.msg = NULL;
     schedMsg.ahandle = head;
     schedMsg.thandle = NULL;
     taosScheduleTask(tmrQhandle, &schedMsg);
 
-    tmrTrace("timer[id=%" PRIuPTR "] has been added to queue.", id);
+    tmrDebug("timer[id=%" PRIuPTR "] has been added to queue.", id);
     head = next;
   }
 }
@@ -296,7 +303,7 @@ static uintptr_t doStartTimer(tmr_obj_t* timer, TAOS_TMR_CALLBACK fp, int msecon
   addTimer(timer);
 
   const char* fmt = "%s timer[id=%" PRIuPTR ", fp=%p, param=%p] started";
-  tmrTrace(fmt, ctrl->label, timer->id, timer->fp, timer->param);
+  tmrDebug(fmt, ctrl->label, timer->id, timer->fp, timer->param);
 
   if (mseconds == 0) {
     timer->wheel = tListLen(wheels);
@@ -371,8 +378,8 @@ static void taosTimerLoopFunc(int signo) {
 
         timer = next;
       }
-      pthread_mutex_unlock(&wheel->mutex);
       wheel->nextScanAt += wheel->resolution;
+      pthread_mutex_unlock(&wheel->mutex);
     }
 
     addToExpired(expired);
@@ -389,27 +396,27 @@ static bool doStopTimer(tmr_obj_t* timer, uint8_t state) {
       reusable = true;
     }
     const char* fmt = "%s timer[id=%" PRIuPTR ", fp=%p, param=%p] is cancelled.";
-    tmrTrace(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
+    tmrDebug(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
     return reusable;
   }
-  
+
   if (state != TIMER_STATE_EXPIRED) {
     // timer already stopped or cancelled, has nothing to do in this case
     return false;
   }
-  
+
   if (timer->executedBy == taosGetPthreadId()) {
     // taosTmrReset is called in the timer callback, should do nothing in this
     // case to avoid dead lock. note taosTmrReset must be the last statement
     // of the callback funtion, will be a bug otherwise.
     return false;
   }
-  
+
   // timer callback is executing in another thread, we SHOULD wait it to stop,
   // BUT this may result in dead lock if current thread are holding a lock which
   // the timer callback need to acquire. so, we HAVE TO return directly.
   const char* fmt = "%s timer[id=%" PRIuPTR ", fp=%p, param=%p] is executing and cannot be stopped.";
-  tmrTrace(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
+  tmrDebug(fmt, timer->ctrl->label, timer->id, timer->fp, timer->param);
   return false;
 }
 
@@ -418,7 +425,7 @@ bool taosTmrStop(tmr_h timerId) {
 
   tmr_obj_t* timer = findTimer(id);
   if (timer == NULL) {
-    tmrTrace("timer[id=%" PRIuPTR "] does not exist", id);
+    tmrDebug("timer[id=%" PRIuPTR "] does not exist", id);
     return false;
   }
 
@@ -438,14 +445,14 @@ bool taosTmrStopA(tmr_h* timerId) {
 bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle, tmr_h* pTmrId) {
   tmr_ctrl_t* ctrl = (tmr_ctrl_t*)handle;
   if (ctrl == NULL || ctrl->label[0] == 0) {
-    return NULL;
+    return false;
   }
 
   uintptr_t  id = (uintptr_t)*pTmrId;
   bool       stopped = false;
   tmr_obj_t* timer = findTimer(id);
   if (timer == NULL) {
-    tmrTrace("%s timer[id=%" PRIuPTR "] does not exist", ctrl->label, id);
+    tmrDebug("%s timer[id=%" PRIuPTR "] does not exist", ctrl->label, id);
   } else {
     uint8_t state = atomic_val_compare_exchange_8(&timer->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
     if (!doStopTimer(timer, state)) {
@@ -460,7 +467,7 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
     return stopped;
   }
 
-  tmrTrace("%s timer[id=%" PRIuPTR "] is reused", ctrl->label, timer->id);
+  tmrDebug("%s timer[id=%" PRIuPTR "] is reused", ctrl->label, timer->id);
 
   // wait until there's no other reference to this timer,
   // so that we can reuse this timer safely.
@@ -478,16 +485,17 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
 }
 
 static void taosTmrModuleInit(void) {
-  tmrCtrls = malloc(sizeof(tmr_ctrl_t) * taosMaxTmrCtrl);
+  tmrCtrls = malloc(sizeof(tmr_ctrl_t) * tsMaxTmrCtrl);
   if (tmrCtrls == NULL) {
     tmrError("failed to allocate memory for timer controllers.");
     return;
   }
 
-  for (int i = 0; i < taosMaxTmrCtrl - 1; ++i) {
+  for (uint32_t i = 0; i < tsMaxTmrCtrl - 1; ++i) {
     tmr_ctrl_t* ctrl = tmrCtrls + i;
     ctrl->next = ctrl + 1;
   }
+  (tmrCtrls + tsMaxTmrCtrl - 1)->next = NULL;
   unusedTmrCtrl = tmrCtrls;
 
   pthread_mutex_init(&tmrCtrlMutex, NULL);
@@ -519,7 +527,7 @@ static void taosTmrModuleInit(void) {
   tmrQhandle = taosInitScheduler(10000, taosTmrThreads, "tmr");
   taosInitTimer(taosTimerLoopFunc, MSECONDS_PER_TICK);
 
-  tmrTrace("timer module is initialized, number of threads: %d", taosTmrThreads);
+  tmrDebug("timer module is initialized, number of threads: %d", taosTmrThreads);
 }
 
 void* taosTmrInit(int maxNumOfTmrs, int resolution, int longest, const char* label) {
@@ -538,9 +546,8 @@ void* taosTmrInit(int maxNumOfTmrs, int resolution, int longest, const char* lab
     return NULL;
   }
 
-  strncpy(ctrl->label, label, sizeof(ctrl->label));
-  ctrl->label[sizeof(ctrl->label) - 1] = 0;
-  tmrTrace("%s timer controller is initialized, number of timer controllers: %d.", label, numOfTmrCtrl);
+  tstrncpy(ctrl->label, label, sizeof(ctrl->label));
+  tmrDebug("%s timer controller is initialized, number of timer controllers: %d.", label, numOfTmrCtrl);
   return ctrl;
 }
 
@@ -550,7 +557,7 @@ void taosTmrCleanUp(void* handle) {
     return;
   }
 
-  tmrTrace("%s timer controller is cleaned up.", ctrl->label);
+  tmrDebug("%s timer controller is cleaned up.", ctrl->label);
   ctrl->label[0] = 0;
 
   pthread_mutex_lock(&tmrCtrlMutex);
@@ -558,4 +565,32 @@ void taosTmrCleanUp(void* handle) {
   numOfTmrCtrl--;
   unusedTmrCtrl = ctrl;
   pthread_mutex_unlock(&tmrCtrlMutex);
+
+  if (numOfTmrCtrl <=0) {
+    taosUninitTimer();
+
+    taosCleanUpScheduler(tmrQhandle);
+
+    for (int i = 0; i < tListLen(wheels); i++) {
+      time_wheel_t* wheel = wheels + i;
+      pthread_mutex_destroy(&wheel->mutex);
+      free(wheel->slots);
+    }
+
+    pthread_mutex_destroy(&tmrCtrlMutex);
+
+    for (size_t i = 0; i < timerMap.size; i++) {
+      timer_list_t* list = timerMap.slots + i;
+      tmr_obj_t* t = list->timers;
+      while (t != NULL) {
+        tmr_obj_t* next = t->mnext;
+        free(t);
+        t = next;
+      }
+    }
+    free(timerMap.slots);
+    free(tmrCtrls);
+
+    tmrDebug("timer module is cleaned up");
+  }
 }
diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c
deleted file mode 100644
index a1e7a6828c87e846fd1600a33a06d8b171b4523e..0000000000000000000000000000000000000000
--- a/src/util/src/ttokenizer.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- * 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 "os.h"
-#include "hashutil.h"
-#include "shash.h"
-#include "tutil.h"
-#include "tsqldef.h"
-#include "tstoken.h"
-#include "ttypes.h"
-#include "hash.h"
-
-// All the keywords of the SQL language are stored in a hash table
-typedef struct SKeyword {
-  const char* name;  // The keyword name
-  uint8_t     type;  // type
-  uint8_t     len;   // length
-} SKeyword;
-
-// keywords in sql string
-static SKeyword keywordTable[] = {
-    {"ID",           TK_ID},
-    {"BOOL",         TK_BOOL},
-    {"TINYINT",      TK_TINYINT},
-    {"SMALLINT",     TK_SMALLINT},
-    {"INTEGER",      TK_INTEGER},
-    {"INT",          TK_INTEGER},
-    {"BIGINT",       TK_BIGINT},
-    {"FLOAT",        TK_FLOAT},
-    {"DOUBLE",       TK_DOUBLE},
-    {"STRING",       TK_STRING},
-    {"TIMESTAMP",    TK_TIMESTAMP},
-    {"BINARY",       TK_BINARY},
-    {"NCHAR",        TK_NCHAR},
-    {"OR",           TK_OR},
-    {"AND",          TK_AND},
-    {"NOT",          TK_NOT},
-    {"EQ",           TK_EQ},
-    {"NE",           TK_NE},
-    {"ISNULL",       TK_ISNULL},
-    {"NOTNULL",      TK_NOTNULL},
-    {"IS",           TK_IS},
-    {"LIKE",         TK_LIKE},
-    {"GLOB",         TK_GLOB},
-    {"BETWEEN",      TK_BETWEEN},
-    {"IN",           TK_IN},
-    {"GT",           TK_GT},
-    {"GE",           TK_GE},
-    {"LT",           TK_LT},
-    {"LE",           TK_LE},
-    {"BITAND",       TK_BITAND},
-    {"BITOR",        TK_BITOR},
-    {"LSHIFT",       TK_LSHIFT},
-    {"RSHIFT",       TK_RSHIFT},
-    {"PLUS",         TK_PLUS},
-    {"MINUS",        TK_MINUS},
-    {"DIVIDE",       TK_DIVIDE},
-    {"TIMES",        TK_TIMES},
-    {"STAR",         TK_STAR},
-    {"SLASH",        TK_SLASH},
-    {"REM ",         TK_REM},
-    {"CONCAT",       TK_CONCAT},
-    {"UMINUS",       TK_UMINUS},
-    {"UPLUS",        TK_UPLUS},
-    {"BITNOT",       TK_BITNOT},
-    {"SHOW",         TK_SHOW},
-    {"DATABASES",    TK_DATABASES},
-    {"MNODES",       TK_MNODES},
-    {"DNODES",       TK_DNODES},
-    {"ACCOUNTS",     TK_ACCOUNTS},
-    {"USERS",        TK_USERS},
-    {"MODULES",      TK_MODULES},
-    {"QUERIES",      TK_QUERIES},
-    {"CONNECTIONS",  TK_CONNECTIONS},
-    {"STREAMS",      TK_STREAMS},
-    {"CONFIGS",      TK_CONFIGS},
-    {"SCORES",       TK_SCORES},
-    {"GRANTS",       TK_GRANTS},
-    {"DOT",          TK_DOT},
-    {"TABLES",       TK_TABLES},
-    {"STABLES",      TK_STABLES},
-    {"VGROUPS",      TK_VGROUPS},
-    {"DROP",         TK_DROP},
-    {"TABLE",        TK_TABLE},
-    {"DATABASE",     TK_DATABASE},
-    {"DNODE",        TK_DNODE},
-    {"USER",         TK_USER},
-    {"ACCOUNT",      TK_ACCOUNT},
-    {"USE",          TK_USE},
-    {"DESCRIBE",     TK_DESCRIBE},
-    {"ALTER",        TK_ALTER},
-    {"PASS",         TK_PASS},
-    {"PRIVILEGE",    TK_PRIVILEGE},
-    {"LOCAL",        TK_LOCAL},
-    {"IF",           TK_IF},
-    {"EXISTS",       TK_EXISTS},
-    {"CREATE",       TK_CREATE},
-    {"PPS",          TK_PPS},
-    {"TSERIES",      TK_TSERIES},
-    {"DBS",          TK_DBS},
-    {"STORAGE",      TK_STORAGE},
-    {"QTIME",        TK_QTIME},
-    {"CONNS",        TK_CONNS},
-    {"STATE",        TK_STATE},
-    {"KEEP",         TK_KEEP},
-    {"REPLICA",      TK_REPLICA},
-    {"DAYS",         TK_DAYS},
-    {"ROWS",         TK_ROWS},
-    {"CACHE",        TK_CACHE},
-    {"ABLOCKS",      TK_ABLOCKS},
-    {"TBLOCKS",      TK_TBLOCKS},
-    {"CTIME",        TK_CTIME},
-    {"CLOG",         TK_CLOG},
-    {"COMP",         TK_COMP},
-    {"PRECISION",    TK_PRECISION},
-    {"LP",           TK_LP},
-    {"RP",           TK_RP},
-    {"TAGS",         TK_TAGS},
-    {"USING",        TK_USING},
-    {"AS",           TK_AS},
-    {"COMMA",        TK_COMMA},
-    {"NULL",         TK_NULL},
-    {"SELECT",       TK_SELECT},
-    {"FROM",         TK_FROM},
-    {"VARIABLE",     TK_VARIABLE},
-    {"INTERVAL",     TK_INTERVAL},
-    {"FILL",         TK_FILL},
-    {"SLIDING",      TK_SLIDING},
-    {"ORDER",        TK_ORDER},
-    {"BY",           TK_BY},
-    {"ASC",          TK_ASC},
-    {"DESC",         TK_DESC},
-    {"GROUP",        TK_GROUP},
-    {"HAVING",       TK_HAVING},
-    {"LIMIT",        TK_LIMIT},
-    {"OFFSET",       TK_OFFSET},
-    {"SLIMIT",       TK_SLIMIT},
-    {"SOFFSET",      TK_SOFFSET},
-    {"WHERE",        TK_WHERE},
-    {"NOW",          TK_NOW},
-    {"INSERT",       TK_INSERT},
-    {"INTO",         TK_INTO},
-    {"VALUES",       TK_VALUES},
-    {"RESET",        TK_RESET},
-    {"QUERY",        TK_QUERY},
-    {"ADD",          TK_ADD},
-    {"COLUMN",       TK_COLUMN},
-    {"TAG",          TK_TAG},
-    {"CHANGE",       TK_CHANGE},
-    {"SET",          TK_SET},
-    {"KILL",         TK_KILL},
-    {"CONNECTION",   TK_CONNECTION},
-    {"COLON",        TK_COLON},
-    {"STREAM",       TK_STREAM},
-    {"ABORT",        TK_ABORT},
-    {"AFTER",        TK_AFTER},
-    {"ATTACH",       TK_ATTACH},
-    {"BEFORE",       TK_BEFORE},
-    {"BEGIN",        TK_BEGIN},
-    {"CASCADE",      TK_CASCADE},
-    {"CLUSTER",      TK_CLUSTER},
-    {"CONFLICT",     TK_CONFLICT},
-    {"COPY",         TK_COPY},
-    {"DEFERRED",     TK_DEFERRED},
-    {"DELIMITERS",   TK_DELIMITERS},
-    {"DETACH",       TK_DETACH},
-    {"EACH",         TK_EACH},
-    {"END",          TK_END},
-    {"EXPLAIN",      TK_EXPLAIN},
-    {"FAIL",         TK_FAIL},
-    {"FOR",          TK_FOR},
-    {"IGNORE",       TK_IGNORE},
-    {"IMMEDIATE",    TK_IMMEDIATE},
-    {"INITIALLY",    TK_INITIALLY},
-    {"INSTEAD",      TK_INSTEAD},
-    {"MATCH",        TK_MATCH},
-    {"KEY",          TK_KEY},
-    {"OF",           TK_OF},
-    {"RAISE",        TK_RAISE},
-    {"REPLACE",      TK_REPLACE},
-    {"RESTRICT",     TK_RESTRICT},
-    {"ROW",          TK_ROW},
-    {"STATEMENT",    TK_STATEMENT},
-    {"TRIGGER",      TK_TRIGGER},
-    {"VIEW",         TK_VIEW},
-    {"ALL",          TK_ALL},
-    {"COUNT",        TK_COUNT},
-    {"SUM",          TK_SUM},
-    {"AVG",          TK_AVG},
-    {"MIN",          TK_MIN},
-    {"MAX",          TK_MAX},
-    {"FIRST",        TK_FIRST},
-    {"LAST",         TK_LAST},
-    {"TOP",          TK_TOP},
-    {"BOTTOM",       TK_BOTTOM},
-    {"STDDEV",       TK_STDDEV},
-    {"PERCENTILE",   TK_PERCENTILE},
-    {"APERCENTILE",  TK_APERCENTILE},
-    {"LEASTSQUARES", TK_LEASTSQUARES},
-    {"HISTOGRAM",    TK_HISTOGRAM},
-    {"DIFF",         TK_DIFF},
-    {"SPREAD",       TK_SPREAD},
-    {"TWA",          TK_TWA},
-    {"INTERP",       TK_INTERP},
-    {"LAST_ROW",     TK_LAST_ROW},
-    {"SEMI",         TK_SEMI},
-    {"NONE",         TK_NONE},
-    {"PREV",         TK_PREV},
-    {"LINEAR",       TK_LINEAR},
-    {"IMPORT",       TK_IMPORT},
-    {"METRIC",       TK_METRIC},
-    {"TBNAME",       TK_TBNAME},
-    {"JOIN",         TK_JOIN},
-    {"METRICS",      TK_METRICS},
-    {"STABLE",       TK_STABLE},
-    {"FILE",         TK_FILE},
-    {"VNODES",       TK_VNODES},
-    {"UNION",        TK_UNION},
-    {"RATE",         TK_RATE},
-    {"IRATE",        TK_IRATE},
-    {"SUM_RATE",     TK_SUM_RATE},
-    {"AVG_RATE",     TK_AVG_RATE},
-    {"AVG_IRATE",    TK_AVG_IRATE},
-};
-
-static const char isIdChar[] = {
-    /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1x */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2x */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */
-    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */
-    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6x */
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 7x */
-};
-
-static void* KeywordHashTable = NULL;
-
-static void doInitKeywordsTable() {
-  int numOfEntries = tListLen(keywordTable);
-  
-  KeywordHashTable = taosInitHashTable(numOfEntries, MurmurHash3_32, false);
-  for (int32_t i = 0; i < numOfEntries; i++) {
-    keywordTable[i].len = strlen(keywordTable[i].name);
-    void* ptr = &keywordTable[i];
-    taosAddToHashTable(KeywordHashTable, keywordTable[i].name, keywordTable[i].len, (void*)&ptr, POINTER_BYTES);
-  }
-}
-
-static pthread_once_t keywordsHashTableInit = PTHREAD_ONCE_INIT;
-
-int tSQLKeywordCode(const char* z, int n) {
-  pthread_once(&keywordsHashTableInit, doInitKeywordsTable);
-
-  char key[128] = {0};
-  for (int32_t j = 0; j < n; ++j) {
-    if (z[j] >= 'a' && z[j] <= 'z') {
-      key[j] = (char)(z[j] & 0xDF);  // touppercase and set the null-terminated
-    } else {
-      key[j] = z[j];
-    }
-  }
-
-  SKeyword** pKey = (SKeyword**)taosGetDataFromHash(KeywordHashTable, key, n);
-  if (pKey != NULL) {
-    return (*pKey)->type;
-  } else {
-    return TK_ID;
-  }
-}
-
-/*
- * Return the length of the token that begins at z[0].
- * Store the token type in *type before returning.
- */
-uint32_t tSQLGetToken(char* z, uint32_t* tokenType) {
-  uint32_t i;
-  switch (*z) {
-    case ' ':
-    case '\t':
-    case '\n':
-    case '\f':
-    case '\r': {
-      for (i = 1; isspace(z[i]); i++) {
-      }
-      *tokenType = TK_SPACE;
-      return i;
-    }
-    case ':': {
-      *tokenType = TK_COLON;
-      return 1;
-    }
-    case '-': {
-      if (z[1] == '-') {
-        for (i = 2; z[i] && z[i] != '\n'; i++) {
-        }
-        *tokenType = TK_COMMENT;
-        return i;
-      }
-      *tokenType = TK_MINUS;
-      return 1;
-    }
-    case '(': {
-      *tokenType = TK_LP;
-      return 1;
-    }
-    case ')': {
-      *tokenType = TK_RP;
-      return 1;
-    }
-    case ';': {
-      *tokenType = TK_SEMI;
-      return 1;
-    }
-    case '+': {
-      *tokenType = TK_PLUS;
-      return 1;
-    }
-    case '*': {
-      *tokenType = TK_STAR;
-      return 1;
-    }
-    case '/': {
-      if (z[1] != '*' || z[2] == 0) {
-        *tokenType = TK_SLASH;
-        return 1;
-      }
-      for (i = 3; z[i] && (z[i] != '/' || z[i - 1] != '*'); i++) {
-      }
-      if (z[i]) i++;
-      *tokenType = TK_COMMENT;
-      return i;
-    }
-    case '%': {
-      *tokenType = TK_REM;
-      return 1;
-    }
-    case '=': {
-      *tokenType = TK_EQ;
-      return 1 + (z[1] == '=');
-    }
-    case '<': {
-      if (z[1] == '=') {
-        *tokenType = TK_LE;
-        return 2;
-      } else if (z[1] == '>') {
-        *tokenType = TK_NE;
-        return 2;
-      } else if (z[1] == '<') {
-        *tokenType = TK_LSHIFT;
-        return 2;
-      } else {
-        *tokenType = TK_LT;
-        return 1;
-      }
-    }
-    case '>': {
-      if (z[1] == '=') {
-        *tokenType = TK_GE;
-        return 2;
-      } else if (z[1] == '>') {
-        *tokenType = TK_RSHIFT;
-        return 2;
-      } else {
-        *tokenType = TK_GT;
-        return 1;
-      }
-    }
-    case '!': {
-      if (z[1] != '=') {
-        *tokenType = TK_ILLEGAL;
-        return 2;
-      } else {
-        *tokenType = TK_NE;
-        return 2;
-      }
-    }
-    case '|': {
-      if (z[1] != '|') {
-        *tokenType = TK_BITOR;
-        return 1;
-      } else {
-        *tokenType = TK_CONCAT;
-        return 2;
-      }
-    }
-    case ',': {
-      *tokenType = TK_COMMA;
-      return 1;
-    }
-    case '&': {
-      *tokenType = TK_BITAND;
-      return 1;
-    }
-    case '~': {
-      *tokenType = TK_BITNOT;
-      return 1;
-    }
-    case '?': {
-      *tokenType = TK_QUESTION;
-      return 1;
-    }
-    case '\'':
-    case '"': {
-      int  delim = z[0];
-      bool strEnd = false;
-      for (i = 1; z[i]; i++) {
-        if (z[i] == '\\') { 
-          i++;
-          continue;
-        }
-        
-        if (z[i] == delim ) {
-          if (z[i + 1] == delim) {
-            i++;
-          } else {
-            strEnd = true;
-            break;
-          }
-        }
-      }
-      
-      if (z[i]) i++;
-
-      if (strEnd) {
-        *tokenType = TK_STRING;
-        return i;
-      }
-
-      break;
-    }
-    case '.': {
-      /*
-       * handle the the float number with out integer part
-       * .123
-       * .123e4
-       */
-      if (isdigit(z[1])) {
-        for (i = 2; isdigit(z[i]); i++) {
-        }
-
-        if ((z[i] == 'e' || z[i] == 'E') &&
-            (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
-          i += 2;
-          while (isdigit(z[i])) {
-            i++;
-          }
-        }
-
-        *tokenType = TK_FLOAT;
-        return i;
-      } else {
-        *tokenType = TK_DOT;
-        return 1;
-      }
-    }
-
-    case '0': {
-      char next = z[1];
-
-      if (next == 'b') { // bin number
-        *tokenType = TK_BIN;
-        for (i = 2; (z[i] == '0' || z[i] == '1'); ++i) {
-        }
-
-        if (i == 2) {
-          break;
-        }
-
-        return i;
-      } else if (next == 'x') {  //hex number
-        *tokenType = TK_HEX;
-        for (i = 2; isdigit(z[i]) || (z[i] >= 'a' && z[i] <= 'f') || (z[i] >= 'A' && z[i] <= 'F'); ++i) {
-        }
-
-        if (i == 2) {
-          break;
-        }
-
-        return i;
-      }
-    }
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9': {
-      *tokenType = TK_INTEGER;
-      for (i = 1; isdigit(z[i]); i++) {
-      }
-
-      /* here is the 1a/2s/3m/9y */
-      if ((z[i] == 'a' || z[i] == 's' || z[i] == 'm' || z[i] == 'h' || z[i] == 'd' || z[i] == 'n' || z[i] == 'y' ||
-          z[i] == 'w' || z[i] == 'A' || z[i] == 'S' || z[i] == 'M' || z[i] == 'H' || z[i] == 'D' || z[i] == 'N' ||
-          z[i] == 'Y' || z[i] == 'W') &&
-          (isIdChar[(uint8_t)z[i + 1]] == 0)) {
-        *tokenType = TK_VARIABLE;
-        i += 1;
-        return i;
-      }
-
-      int32_t seg = 1;
-      while (z[i] == '.' && isdigit(z[i + 1])) {
-        i += 2;
-        while (isdigit(z[i])) {
-          i++;
-        }
-        *tokenType = TK_FLOAT;
-        seg++;
-      }
-
-      if (seg == 4) {  // ip address
-        *tokenType = TK_IPTOKEN;
-        return i;
-      }
-
-      if ((z[i] == 'e' || z[i] == 'E') &&
-          (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
-        i += 2;
-        while (isdigit(z[i])) {
-          i++;
-        }
-        *tokenType = TK_FLOAT;
-      }
-      return i;
-    }
-    case '[': {
-      for (i = 1; z[i] && z[i - 1] != ']'; i++) {
-      }
-      *tokenType = TK_ID;
-      return i;
-    }
-    case 'T':
-    case 't':
-    case 'F':
-    case 'f': {
-      for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t) z[i]]; i++) {
-      }
-
-      if ((i == 4 && strncasecmp(z, "true", 4) == 0) || (i == 5 && strncasecmp(z, "false", 5) == 0)) {
-        *tokenType = TK_BOOL;
-        return i;
-      }
-    }
-    default: {
-      if (((*z & 0x80) != 0) || !isIdChar[(uint8_t) *z]) {
-        break;
-      }
-      for (i = 1; ((z[i] & 0x80) == 0) && isIdChar[(uint8_t) z[i]]; i++) {
-      }
-      *tokenType = tSQLKeywordCode(z, i);
-      return i;
-    }
-  }
-
-  *tokenType = TK_ILLEGAL;
-  return 0;
-}
-
-SSQLToken tStrGetToken(char* str, int32_t* i, bool isPrevOptr, uint32_t numOfIgnoreToken, uint32_t* ignoreTokenTypes) {
-  SSQLToken t0 = {0};
-
-  // here we reach the end of sql string, null-terminated string
-  if (str[*i] == 0) {
-    t0.n = 0;
-    return t0;
-  }
-
-  // IGNORE TK_SPACE, TK_COMMA, and specified tokens
-  while (1) {
-    *i += t0.n;
-
-    bool hasComma = false;
-    while ((str[*i] == ' ' || str[*i] == '\n' || str[*i] == '\r' || str[*i] == '\t' || str[*i] == '\f')
-        || str[*i] == ',') {
-      if (str[*i] == ',') {
-        if (false == hasComma) {
-          hasComma = true;
-        } else {  // comma only allowed once
-          t0.n = 0;
-          return t0;
-        }
-      }
-      (*i)++;
-    }
-
-    t0.n = tSQLGetToken(&str[*i], &t0.type);
-
-    bool ignoreFlag = false;
-    for (uint32_t k = 0; k < numOfIgnoreToken; k++) {
-      if (t0.type == ignoreTokenTypes[k]) {
-        ignoreFlag = true;
-        break;
-      }
-    }
-
-    if (!ignoreFlag) {
-      break;
-    }
-  }
-
-  if (t0.type == TK_SEMI) {
-    t0.n = 0;
-    return t0;
-  }
-
-  uint32_t type = 0;
-  int32_t  len;
-
-  // support parse the 'db.tbl' format, notes: There should be no space on either side of the dot!
-  if ('.' == str[*i + t0.n]) {
-    len = tSQLGetToken(&str[*i + t0.n + 1], &type);
-
-    // only id and string are valid
-    if ((TK_STRING != t0.type) && (TK_ID != t0.type)) {
-      t0.type = TK_ILLEGAL;
-      t0.n = 0;
-
-      return t0;
-    }
-
-    t0.n += len + 1;
-
-  } else {
-    // support parse the -/+number format
-    if ((isPrevOptr) && (t0.type == TK_MINUS || t0.type == TK_PLUS)) {
-      len = tSQLGetToken(&str[*i + t0.n], &type);
-      if (type == TK_INTEGER || type == TK_FLOAT) {
-        t0.type = type;
-        t0.n += len;
-      }
-    }
-  }
-
-  t0.z = str + (*i);
-  *i += t0.n;
-
-  return t0;
-}
-
-FORCE_INLINE bool isKeyWord(const char* z, int32_t len) { return (tSQLKeywordCode((char*)z, len) != TK_ID); }
-
-FORCE_INLINE bool isNumber(const SSQLToken* pToken) {
-  return (pToken->type == TK_INTEGER || pToken->type == TK_FLOAT || pToken->type == TK_HEX || pToken->type == TK_BIN);
-}
-
-int32_t isValidNumber(const SSQLToken* pToken) {
-  const char* z = pToken->z;
-  int32_t type = TK_ILLEGAL;
-
-  int32_t i = 0;
-  for(; i < pToken->n; ++i) {
-    switch (z[i]) {
-      case '+':
-      case '-': {
-        break;
-      }
-      case '.': {
-          /*
-           * handle the the float number with out integer part
-           * .123
-           * .123e4
-           */
-          if (!isdigit(z[i+1])) {
-            return TK_ILLEGAL;
-          }
-
-          for (i += 2; isdigit(z[i]); i++) {
-          }
-
-          if ((z[i] == 'e' || z[i] == 'E') &&
-              (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
-            i += 2;
-            while (isdigit(z[i])) {
-              i++;
-            }
-          }
-
-          type = TK_FLOAT;
-          goto _end;
-      }
-
-      case '0': {
-        char next = z[i + 1];
-        if (next == 'b') { // bin number
-          type = TK_BIN;
-          for (i += 2; (z[i] == '0' || z[i] == '1'); ++i) {
-          }
-
-          goto _end;
-        } else if (next == 'x') {  //hex number
-          type = TK_HEX;
-          for (i += 2; isdigit(z[i]) || (z[i] >= 'a' && z[i] <= 'f') || (z[i] >= 'A' && z[i] <= 'F'); ++i) {
-          }
-
-          goto _end;
-        }
-      }
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-      case '8':
-      case '9': {
-        type = TK_INTEGER;
-        for (; isdigit(z[i]); i++) {
-        }
-
-        int32_t seg = 0;
-        while (z[i] == '.' && isdigit(z[i + 1])) {
-          i += 2;
-
-          while (isdigit(z[i])) {
-            i++;
-          }
-
-          seg++;
-          type = TK_FLOAT;
-        }
-
-        if (seg > 1) {
-          return TK_ILLEGAL;
-        }
-
-        if ((z[i] == 'e' || z[i] == 'E') &&
-            (isdigit(z[i + 1]) || ((z[i + 1] == '+' || z[i + 1] == '-') && isdigit(z[i + 2])))) {
-          i += 2;
-          while (isdigit(z[i])) {
-            i++;
-          }
-
-          type = TK_FLOAT;
-        }
-
-        goto _end;
-      }
-      default:
-        return TK_ILLEGAL;
-    }
-  }
-
-  _end:
-  if (i < pToken->n) {
-    return TK_ILLEGAL;
-  } else {
-    return type;
-  }
-}
\ No newline at end of file
diff --git a/src/util/src/ttypes.c b/src/util/src/ttypes.c
deleted file mode 100644
index ae994cb77b7cdb27f3e857115d6d1db7df9bd9b0..0000000000000000000000000000000000000000
--- a/src/util/src/ttypes.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/*
- * 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 "os.h"
-#include "taos.h"
-#include "tsdb.h"
-#include "tsqldef.h"
-#include "ttypes.h"
-#include "tutil.h"
-
-tDataDescriptor tDataTypeDesc[11] = {
-  {TSDB_DATA_TYPE_NULL,      6, 1,            "NOTYPE"},
-  {TSDB_DATA_TYPE_BOOL,      4, CHAR_BYTES,   "BOOL"},
-  {TSDB_DATA_TYPE_TINYINT,   7, CHAR_BYTES,   "TINYINT"},
-  {TSDB_DATA_TYPE_SMALLINT,  8, SHORT_BYTES,  "SMALLINT"},
-  {TSDB_DATA_TYPE_INT,       3, INT_BYTES,    "INT"},
-  {TSDB_DATA_TYPE_BIGINT,    6, LONG_BYTES,   "BIGINT"},
-  {TSDB_DATA_TYPE_FLOAT,     5, FLOAT_BYTES,  "FLOAT"},
-  {TSDB_DATA_TYPE_DOUBLE,    6, DOUBLE_BYTES, "DOUBLE"},
-  {TSDB_DATA_TYPE_BINARY,    6, 0,            "BINARY"},
-  {TSDB_DATA_TYPE_TIMESTAMP, 9, LONG_BYTES,   "TIMESTAMP"},
-  {TSDB_DATA_TYPE_NCHAR,     5, 8,            "NCHAR"},
-};
-
-char tTokenTypeSwitcher[13] = {
-    TSDB_DATA_TYPE_NULL,    // no type
-    TSDB_DATA_TYPE_BINARY,  // TK_ID
-    TSDB_DATA_TYPE_BOOL,    // TK_BOOL
-    TSDB_DATA_TYPE_BIGINT,  // TK_TINYINT
-    TSDB_DATA_TYPE_BIGINT,  // TK_SMALLINT
-    TSDB_DATA_TYPE_BIGINT,  // TK_INTEGER
-    TSDB_DATA_TYPE_BIGINT,  // TK_BIGINT
-    TSDB_DATA_TYPE_DOUBLE,  // TK_FLOAT
-    TSDB_DATA_TYPE_DOUBLE,  // TK_DOUBLE
-    TSDB_DATA_TYPE_BINARY,  // TK_STRING
-    TSDB_DATA_TYPE_BIGINT,  // TK_TIMESTAMP
-    TSDB_DATA_TYPE_BINARY,  // TK_BINARY
-    TSDB_DATA_TYPE_NCHAR,   // TK_NCHAR
-};
-
-bool isValidDataType(int32_t type, int32_t length) {
-  if (type < TSDB_DATA_TYPE_BOOL || type > TSDB_DATA_TYPE_NCHAR) {
-    return false;
-  }
-
-  if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-//    return length >= 0 && length <= TSDB_MAX_BINARY_LEN;
-  }
-
-  return true;
-}
-
-// todo support scientific expression number and oct number
-void tVariantCreate(tVariant *pVar, SSQLToken *token) { tVariantCreateFromString(pVar, token->z, token->n, token->type); }
-
-void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type) {
-  memset(pVar, 0, sizeof(tVariant));
-  
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL: {
-      int32_t k = strncasecmp(pz, "true", 4);
-      if (k == 0) {
-        pVar->i64Key = TSDB_TRUE;
-      } else {
-        assert(strncasecmp(pz, "false", 5) == 0);
-        pVar->i64Key = TSDB_FALSE;
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_INT:
-      pVar->i64Key = strtoll(pz, NULL, 10);
-      break;
-    case TSDB_DATA_TYPE_DOUBLE:
-    case TSDB_DATA_TYPE_FLOAT:
-      pVar->dKey = strtod(pz, NULL);
-      break;
-    case TSDB_DATA_TYPE_BINARY: {
-      pVar->pz = strndup(pz, len);
-      pVar->nLen = strdequote(pVar->pz);
-      break;
-    }
-
-    default: {  // nType == 0 means the null value
-      type = TSDB_DATA_TYPE_NULL;
-    }
-  }
-
-  pVar->nType = type;
-}
-
-/**
- * create tVariant from binary string, not ascii data
- * @param pVar
- * @param pz
- * @param len
- * @param type
- */
-void tVariantCreateFromBinary(tVariant *pVar, char *pz, uint32_t len, uint32_t type) {
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT: {
-      pVar->i64Key = GET_INT8_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_SMALLINT: {
-      pVar->i64Key = GET_INT16_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_INT: {
-      pVar->i64Key = GET_INT32_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TIMESTAMP: {
-      pVar->i64Key = GET_INT64_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_DOUBLE: {
-      pVar->dKey = GET_DOUBLE_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_FLOAT: {
-      pVar->dKey = GET_FLOAT_VAL(pz);
-      break;
-    }
-    case TSDB_DATA_TYPE_NCHAR: { // here we get the nchar length from raw binary bits length
-      pVar->nLen = len / TSDB_NCHAR_SIZE;
-      pVar->wpz = calloc(1, (pVar->nLen + 1) * TSDB_NCHAR_SIZE);
-
-      wcsncpy(pVar->wpz, (wchar_t *)pz, pVar->nLen);
-      pVar->wpz[pVar->nLen] = 0;
-
-      break;
-    }
-    case TSDB_DATA_TYPE_BINARY: {
-      pVar->pz = strndup(pz, len);
-      pVar->nLen = strdequote(pVar->pz);
-
-      break;
-    }
-
-    default:
-      pVar->i64Key = GET_INT32_VAL(pVar);
-  }
-
-  pVar->nType = type;
-}
-
-void tVariantDestroy(tVariant *pVar) {
-  if (pVar == NULL) return;
-
-  if (pVar->nType == TSDB_DATA_TYPE_BINARY || pVar->nType == TSDB_DATA_TYPE_NCHAR) {
-    tfree(pVar->pz);
-    pVar->nLen = 0;
-  }
-}
-
-void tVariantAssign(tVariant *pDst, const tVariant *pSrc) {
-  if (pSrc == NULL || pDst == NULL) return;
-
-  *pDst = *pSrc;
-
-  if (pSrc->nType == TSDB_DATA_TYPE_BINARY || pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
-    int32_t len = pSrc->nLen + 1;
-    if (pSrc->nType == TSDB_DATA_TYPE_NCHAR) {
-      len = len * TSDB_NCHAR_SIZE;
-    }
-
-    pDst->pz = calloc(1, len);
-    memcpy(pDst->pz, pSrc->pz, len);
-  }
-}
-
-int32_t tVariantToString(tVariant *pVar, char *dst) {
-  if (pVar == NULL || dst == NULL) return 0;
-
-  switch (pVar->nType) {
-    case TSDB_DATA_TYPE_BINARY: {
-      int32_t len = sprintf(dst, "\'%s\'", pVar->pz);
-      assert(len <= pVar->nLen + sizeof("\'") * 2);  // two more chars
-      return len;
-    }
-
-    case TSDB_DATA_TYPE_NCHAR: {
-      dst[0] = '\'';
-      taosUcs4ToMbs(pVar->wpz, (wcslen(pVar->wpz) + 1) * TSDB_NCHAR_SIZE, dst + 1);
-      int32_t len = strlen(dst);
-      dst[len] = '\'';
-      dst[len + 1] = 0;
-      return len + 1;
-    }
-
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT:
-    case TSDB_DATA_TYPE_INT:
-      return sprintf(dst, "%d", (int32_t)pVar->i64Key);
-
-    case TSDB_DATA_TYPE_BIGINT:
-      return sprintf(dst, "%" PRId64, pVar->i64Key);
-
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE:
-      return sprintf(dst, "%.9lf", pVar->dKey);
-
-    default:
-      return 0;
-  }
-}
-
-#if 0
-static int32_t doConvertToInteger(tVariant *pVariant, char *pDest, int32_t type, bool releaseVariantPtr) {
-  if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-    setNull(pDest, type, tDataTypeDesc[type].nSize);
-    return 0;
-  }
-
-  if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-    *((int64_t *)pDest) = pVariant->i64Key;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-    if ((pVariant->dKey < INT64_MIN) || (pVariant->dKey > INT64_MAX)) {
-      return -1;
-    }
-
-    *((int64_t *)pDest) = (int64_t)pVariant->dKey;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-    errno = 0;
-    char *endPtr = NULL;
-
-    SSQLToken token = {0};
-    token.n = tSQLGetToken(pVariant->pz, &token.type);
-
-    if (token.type == TK_MINUS || token.type == TK_PLUS) {
-      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
-    }
-
-    if (token.type == TK_FLOAT) {
-      double v = strtod(pVariant->pz, &endPtr);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-        return -1;
-      }
-
-      if ((v < INT64_MIN) || (v > INT64_MAX)) {
-        return -1;
-      }
-
-      *((int64_t *)pDest) = (int64_t)v;
-    } else if (token.type == TK_INTEGER) {
-      int64_t val = strtoll(pVariant->pz, &endPtr, 10);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if (errno == ERANGE) {
-        return -1;  // data overflow
-      }
-
-      *((int64_t *)pDest) = val;
-    } else if (token.type == TK_NULL) {
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-      setNull(pDest, type, tDataTypeDesc[type].nSize);
-    } else {
-      return -1;
-    }
-
-  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
-    errno = 0;
-    wchar_t *endPtr = NULL;
-
-    SSQLToken token = {0};
-    token.n = tSQLGetToken(pVariant->pz, &token.type);
-
-    if (token.type == TK_MINUS || token.type == TK_PLUS) {
-      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
-    }
-
-    if (token.type == TK_FLOAT) {
-      double v = wcstod(pVariant->wpz, &endPtr);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-        return -1;
-      }
-
-      if ((v < INT64_MIN) || (v > INT64_MAX)) {
-        return -1;
-      }
-
-      *((int64_t *)pDest) = (int64_t)v;
-    } else if (token.type == TK_NULL) {
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-      setNull(pDest, type, tDataTypeDesc[type].nSize);
-    } else {
-      int64_t val = wcstoll(pVariant->wpz, &endPtr, 10);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if (errno == ERANGE) {
-        return -1;  // data overflow
-      }
-
-      *((int64_t *)pDest) = val;
-    }
-  }
-
-  return 0;
-}
-#endif
-static FORCE_INLINE int32_t convertToBoolImpl(char *pStr, int32_t len) {
-  if ((strncasecmp(pStr, "true", len) == 0) && (len == 4)) {
-    return TSDB_TRUE;
-  } else if ((strncasecmp(pStr, "false", len) == 0) && (len == 5)) {
-    return TSDB_FALSE;
-  } else if (strcasecmp(pStr, TSDB_DATA_NULL_STR_L) == 0) {
-    return TSDB_DATA_BOOL_NULL;
-  } else {
-    return -1;
-  }
-}
-
-static FORCE_INLINE int32_t wcsconvertToBoolImpl(wchar_t *pstr, int32_t len) {
-  if ((wcsncasecmp(pstr, L"true", len) == 0) && (len == 4)) {
-    return TSDB_TRUE;
-  } else if (wcsncasecmp(pstr, L"false", len) == 0 && (len == 5)) {
-    return TSDB_FALSE;
-  } else {
-    return -1;
-  }
-}
-
-static int32_t toBinary(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
-  const int32_t INITIAL_ALLOC_SIZE = 20;
-  char *        pBuf = NULL;
-
-  if (*pDest == pVariant->pz) {
-    pBuf = calloc(1, INITIAL_ALLOC_SIZE);
-  }
-
-  if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
-    size_t newSize = pVariant->nLen * TSDB_NCHAR_SIZE;
-    if (pBuf != NULL) {
-      if (newSize > INITIAL_ALLOC_SIZE) {
-        pBuf = realloc(pBuf, newSize + 1);
-      }
-
-      taosUcs4ToMbs(pVariant->wpz, newSize, pBuf);
-      free(pVariant->wpz);
-
-      /* terminated string */
-      pBuf[newSize] = 0;
-    } else {
-      taosUcs4ToMbs(pVariant->wpz, newSize, *pDest);
-    }
-
-  } else {
-    if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-      sprintf(pBuf == NULL ? *pDest : pBuf, "%" PRId64, pVariant->i64Key);
-    } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-      sprintf(pBuf == NULL ? *pDest : pBuf, "%lf", pVariant->dKey);
-    } else if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
-      sprintf(pBuf == NULL ? *pDest : pBuf, "%s", (pVariant->i64Key == TSDB_TRUE) ? "TRUE" : "FALSE");
-    } else if (pVariant->nType == 0) {  // null data
-      setNull(pBuf == NULL ? *pDest : pBuf, TSDB_DATA_TYPE_BINARY, 0);
-    }
-  }
-
-  if (pBuf != NULL) {
-    *pDest = pBuf;
-  }
-
-  *pDestSize = strlen(*pDest);
-  return 0;
-}
-
-static int32_t toNchar(tVariant *pVariant, char **pDest, int32_t *pDestSize) {
-  char tmpBuf[40] = {0};
-
-  char *  pDst = tmpBuf;
-  int32_t nLen = 0;
-
-  if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-    nLen = sprintf(pDst, "%" PRId64, pVariant->i64Key);
-  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-    nLen = sprintf(pDst, "%lf", pVariant->dKey);
-  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-    pDst = pVariant->pz;
-    nLen = pVariant->nLen;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
-    nLen = sprintf(pDst, "%s", (pVariant->i64Key == TSDB_TRUE) ? "TRUE" : "FALSE");
-  }
-
-  if (*pDest == pVariant->pz) {
-    wchar_t *pWStr = calloc(1, (nLen + 1) * TSDB_NCHAR_SIZE);
-    taosMbsToUcs4(pDst, nLen, (char *)pWStr, (nLen + 1) * TSDB_NCHAR_SIZE);
-
-    // free the binary buffer in the first place
-    if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-      free(pVariant->wpz);
-    }
-
-    pVariant->wpz = pWStr;
-    *pDestSize = wcslen(pVariant->wpz);
-
-    // shrink the allocate memory, no need to check here.
-    char* tmp = realloc(pVariant->wpz, (*pDestSize + 1)*TSDB_NCHAR_SIZE);
-    assert(tmp != NULL);
-
-    pVariant->wpz = (wchar_t *)tmp;
-  } else {
-    taosMbsToUcs4(pDst, nLen, *pDest, (nLen + 1) * TSDB_NCHAR_SIZE);
-  }
-
-  return 0;
-}
-
-static FORCE_INLINE int32_t convertToDouble(char *pStr, int32_t len, double *value) {
-  SSQLToken stoken = {.z = pStr, .n = len};
-
-  if (TK_ILLEGAL == isValidNumber(&stoken)) {
-    return -1;
-  }
-
-  *value = strtod(pStr, NULL);
-
-  return 0;
-}
-
-static FORCE_INLINE int32_t convertToInteger(tVariant *pVariant, int64_t *result, int32_t type, int64_t lowBnd,
-                                             int64_t upperBnd, bool releaseVariantPtr) {
-  if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-    setNull((char *)result, type, tDataTypeDesc[type].nSize);
-    return 0;
-  }
-
-  if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-    *result = pVariant->i64Key;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-    *result = (int64_t)pVariant->dKey;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-    errno = 0;
-    char *endPtr = NULL;
-
-    SSQLToken token = {0};
-    token.n = tSQLGetToken(pVariant->pz, &token.type);
-
-    if (token.type == TK_MINUS || token.type == TK_PLUS) {
-      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
-    }
-
-    if (token.type == TK_NULL) {
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-      setNull((char *)result, type, tDataTypeDesc[type].nSize);
-      return 0;
-    }
-
-    SSQLToken sToken = {.z = pVariant->pz, .n = pVariant->nLen};
-    if (TK_ILLEGAL == isValidNumber(&sToken)) {
-      return -1;
-    }
-
-    if (token.type == TK_FLOAT) {
-      double v = strtod(pVariant->pz, &endPtr);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-        return -1;
-      }
-
-      *result = (int64_t)v;
-    } else if (token.type == TK_INTEGER) {
-      int64_t val = strtoll(pVariant->pz, &endPtr, 10);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if (errno == ERANGE) {
-        return -1;  // data overflow
-      }
-
-      *result = val;
-    } else {
-      return -1;
-    }
-  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
-    errno = 0;
-    wchar_t *endPtr = NULL;
-
-    SSQLToken token = {0};
-    token.n = tSQLGetToken(pVariant->pz, &token.type);
-
-    if (token.type == TK_MINUS || token.type == TK_PLUS) {
-      token.n = tSQLGetToken(pVariant->pz + token.n, &token.type);
-    }
-
-    if (token.type == TK_FLOAT) {
-      double v = wcstod(pVariant->wpz, &endPtr);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-        return -1;
-      }
-
-      *result = (int64_t)v;
-    } else if (token.type == TK_NULL) {
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-      setNull((char *)result, type, tDataTypeDesc[type].nSize);
-      return 0;
-    } else {
-      int64_t val = wcstoll(pVariant->wpz, &endPtr, 10);
-      if (releaseVariantPtr) {
-        free(pVariant->pz);
-        pVariant->nLen = 0;
-      }
-
-      if (errno == ERANGE) {
-        return -1;  // data overflow
-      }
-
-      *result = val;
-    }
-  }
-
-  if ((*result <= lowBnd) || (*result > upperBnd)) {
-    return -1;
-  }
-
-  return 0;
-}
-
-static int32_t convertToBool(tVariant *pVariant, int64_t *pDest) {
-  if (pVariant->nType == TSDB_DATA_TYPE_BOOL) {
-    *pDest = pVariant->i64Key;  // in order to be compatible to null of bool
-  } else if (pVariant->nType >= TSDB_DATA_TYPE_TINYINT && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-    *pDest = ((pVariant->i64Key != 0) ? TSDB_TRUE : TSDB_FALSE);
-  } else if (pVariant->nType == TSDB_DATA_TYPE_FLOAT || pVariant->nType == TSDB_DATA_TYPE_DOUBLE) {
-    *pDest = ((pVariant->dKey != 0) ? TSDB_TRUE : TSDB_FALSE);
-  } else if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-    int32_t ret = 0;
-    if ((ret = convertToBoolImpl(pVariant->pz, pVariant->nLen)) < 0) {
-      return ret;
-    }
-
-    *pDest = ret;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
-    int32_t ret = 0;
-    if ((ret = wcsconvertToBoolImpl(pVariant->wpz, pVariant->nLen)) < 0) {
-      return ret;
-    }
-    *pDest = ret;
-  } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-    *pDest = TSDB_DATA_BOOL_NULL;
-  }
-
-  assert(*pDest == TSDB_TRUE || *pDest == TSDB_FALSE || *pDest == TSDB_DATA_BOOL_NULL);
-  return 0;
-}
-
-/*
- * transfer data from variant serve as the implicit data conversion: from input sql string pVariant->nType
- * to column type defined in schema
- *
- * todo handle the return value
- */
-int32_t tVariantDump(tVariant *pVariant, char *payload, char type) {
-  if (pVariant == NULL || (pVariant->nType != 0 && !isValidDataType(pVariant->nType, pVariant->nLen))) {
-    return -1;
-  }
-
-  errno = 0;  // reset global error code
-
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL: {
-      int64_t dst = 0;
-      if (convertToBool(pVariant, &dst) < 0) {
-        return -1;
-      }
-      *(int8_t *)payload = (int8_t)dst;
-      break;
-    }
-
-    case TSDB_DATA_TYPE_TINYINT: {
-      int64_t result = 0;
-      if (convertToInteger(pVariant, &result, type, INT8_MIN, INT8_MAX, false) < 0) {
-        return -1;
-      }
-
-      *((int8_t *)payload) = (int8_t)result;
-      break;
-    }
-
-    case TSDB_DATA_TYPE_SMALLINT: {
-      int64_t result = 0;
-      if (convertToInteger(pVariant, &result, type, INT16_MIN, INT16_MAX, false) < 0) {
-        return -1;
-      }
-
-      *((int16_t *)payload) = (int16_t)result;
-      break;
-    }
-
-    case TSDB_DATA_TYPE_INT: {
-      int64_t result = 0;
-      if (convertToInteger(pVariant, &result, type, INT32_MIN, INT32_MAX, false) < 0) {
-        return -1;
-      }
-
-      *((int32_t *)payload) = (int32_t)result;
-      break;
-    }
-
-    case TSDB_DATA_TYPE_BIGINT: {
-      int64_t result = 0;
-      if (convertToInteger(pVariant, &result, type, INT64_MIN, INT64_MAX, false) < 0) {
-        return -1;
-      }
-
-      *((int64_t *)payload) = (int64_t)result;
-      break;
-    }
-
-    case TSDB_DATA_TYPE_FLOAT: {
-      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-        if (strncasecmp(TSDB_DATA_NULL_STR_L, pVariant->pz, pVariant->nLen) == 0 &&
-            strlen(TSDB_DATA_NULL_STR_L) == pVariant->nLen) {
-          *((int32_t *)payload) = TSDB_DATA_FLOAT_NULL;
-          return 0;
-        } else {
-          double  value;
-          int32_t ret;
-          ret = convertToDouble(pVariant->pz, pVariant->nLen, &value);
-          if ((errno == ERANGE && (float)value == -1) || (ret != 0)) {
-            return -1;
-          }
-
-#ifdef _TD_ARM_32_
-          //memcpy(&payload, &value, sizeof(float));
-          float fv = (float)value;
-          SET_FLOAT_VAL_ALIGN(payload, &fv);
-#else
-          *((float *)payload) = (float)value;
-#endif
-        }
-      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-#ifdef _TD_ARM_32_
-        //memcpy(&payload, &pVariant->i64Key, sizeof(float));
-        float fv = (float)pVariant->i64Key;
-        SET_FLOAT_VAL_ALIGN(payload, &fv);
-#else
-        *((float *)payload) = pVariant->i64Key;
-#endif
-      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-#ifdef _TD_ARM_32_
-        //memcpy(&payload, &pVariant->dKey, sizeof(float));
-        float fv = (float)pVariant->dKey;
-        SET_FLOAT_VAL_ALIGN(payload, &fv);
-#else
-        *((float *)payload) = (float)pVariant->dKey;
-#endif
-      } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-        *((int32_t *)payload) = TSDB_DATA_FLOAT_NULL;
-        return 0;
-      }
-
-#ifdef _TD_ARM_32_
-      float fv = GET_FLOAT_VAL(payload);
-      if (isinf(fv) || isnan(fv) || fv > FLT_MAX || fv < -FLT_MAX) {
-        return -1;
-      }
-#else
-      if (isinf(*((float *)payload)) || isnan(*((float *)payload)) || *((float *)payload) > FLT_MAX ||
-          *((float *)payload) < -FLT_MAX) {
-        return -1;
-      }
-#endif
-      break;
-    }
-    case TSDB_DATA_TYPE_DOUBLE: {
-      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-        if (strncasecmp(TSDB_DATA_NULL_STR_L, pVariant->pz, pVariant->nLen) == 0 &&
-            strlen(TSDB_DATA_NULL_STR_L) == pVariant->nLen) {
-          *((int64_t *)payload) = TSDB_DATA_DOUBLE_NULL;
-          return 0;
-        } else {
-          double  value = 0;
-          int32_t ret;
-          ret = convertToDouble(pVariant->pz, pVariant->nLen, &value);
-          if ((errno == ERANGE && value == -1) || (ret != 0)) {
-            return -1;
-          }
-
-#ifdef _TD_ARM_32_
-          SET_DOUBLE_VAL_ALIGN(payload, &value);
-#else
-          *((double *)payload) = value;
-#endif
-        }
-      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-#ifdef _TD_ARM_32_
-        double dv = (double)(pVariant->i64Key);
-        SET_DOUBLE_VAL_ALIGN(payload, &dv);
-#else
-        *((double *)payload) = pVariant->i64Key;
-#endif
-      } else if (pVariant->nType == TSDB_DATA_TYPE_DOUBLE || pVariant->nType == TSDB_DATA_TYPE_FLOAT) {
-#ifdef _TD_ARM_32_
-        double dv = (double)(pVariant->dKey);
-        SET_DOUBLE_VAL_ALIGN(payload, &dv);
-#else
-        *((double *)payload) = pVariant->dKey;
-#endif
-      } else if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-        *((int64_t *)payload) = TSDB_DATA_DOUBLE_NULL;
-        return 0;
-      }
-
-#ifdef _TD_ARM_32_
-      double dv = GET_DOUBLE_VAL(payload);
-      if (isinf(dv) || isnan(dv) || dv > DBL_MAX || dv < -DBL_MAX) {
-        return -1;
-      }
-#else
-      if (isinf(*((double *)payload)) || isnan(*((double *)payload)) || *((double *)payload) > DBL_MAX ||
-          *((double *)payload) < -DBL_MAX) {
-        return -1;
-      }
-#endif
-      break;
-    }
-
-    case TSDB_DATA_TYPE_BINARY: {
-      if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-        *payload = TSDB_DATA_BINARY_NULL;
-      } else {
-        if (pVariant->nType != TSDB_DATA_TYPE_BINARY) {
-          toBinary(pVariant, &payload, &pVariant->nLen);
-        } else {
-          strncpy(payload, pVariant->pz, pVariant->nLen);
-        }
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_TIMESTAMP: {
-      if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-        *((int64_t *)payload) = TSDB_DATA_BIGINT_NULL;
-      } else {
-        *((int64_t *)payload) = pVariant->i64Key;
-      }
-      break;
-    }
-    case TSDB_DATA_TYPE_NCHAR: {
-      if (pVariant->nType == TSDB_DATA_TYPE_NULL) {
-        *(uint32_t *)payload = TSDB_DATA_NCHAR_NULL;
-      } else {
-        if (pVariant->nType != TSDB_DATA_TYPE_NCHAR) {
-          toNchar(pVariant, &payload, &pVariant->nLen);
-        } else {
-          wcsncpy((wchar_t *)payload, pVariant->wpz, pVariant->nLen);
-        }
-      }
-      break;
-    }
-  }
-
-  return 0;
-}
-
-/*
- * In variant, bool/smallint/tinyint/int/bigint share the same attribution of
- * structure, also ignore the convert the type required
- *
- * It is actually the bigint/binary/bool/nchar type transfer
- */
-int32_t tVariantTypeSetType(tVariant *pVariant, char type) {
-  if (pVariant == NULL || pVariant->nType == 0) {  // value is not set
-    return 0;
-  }
-
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL: {  // bool
-      if (convertToBool(pVariant, &pVariant->i64Key) < 0) {
-        return -1;
-      }
-
-      pVariant->nType = type;
-      break;
-    }
-    case TSDB_DATA_TYPE_INT:
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TINYINT:
-    case TSDB_DATA_TYPE_SMALLINT: {
-      convertToInteger(pVariant, &(pVariant->i64Key), type, INT64_MIN, INT64_MAX, true);
-      pVariant->nType = TSDB_DATA_TYPE_BIGINT;
-      break;
-    }
-    case TSDB_DATA_TYPE_FLOAT:
-    case TSDB_DATA_TYPE_DOUBLE: {
-      if (pVariant->nType == TSDB_DATA_TYPE_BINARY) {
-        errno = 0;
-        double v = strtod(pVariant->pz, NULL);
-        if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-          free(pVariant->pz);
-          return -1;
-        }
-
-        free(pVariant->pz);
-        pVariant->dKey = v;
-      } else if (pVariant->nType == TSDB_DATA_TYPE_NCHAR) {
-        errno = 0;
-        double v = wcstod(pVariant->wpz, NULL);
-        if ((errno == ERANGE && v == -1) || (isinf(v) || isnan(v))) {
-          free(pVariant->pz);
-          return -1;
-        }
-
-        free(pVariant->pz);
-        pVariant->dKey = v;
-      } else if (pVariant->nType >= TSDB_DATA_TYPE_BOOL && pVariant->nType <= TSDB_DATA_TYPE_BIGINT) {
-        pVariant->dKey = pVariant->i64Key;
-      }
-
-      pVariant->nType = TSDB_DATA_TYPE_DOUBLE;
-      break;
-    }
-    case TSDB_DATA_TYPE_BINARY: {
-      if (pVariant->nType != TSDB_DATA_TYPE_BINARY) {
-        toBinary(pVariant, &pVariant->pz, &pVariant->nLen);
-      }
-      pVariant->nType = type;
-      break;
-    }
-    case TSDB_DATA_TYPE_NCHAR: {
-      if (pVariant->nType != TSDB_DATA_TYPE_NCHAR) {
-        toNchar(pVariant, &pVariant->pz, &pVariant->nLen);
-      }
-      pVariant->nType = type;
-      break;
-    }
-  }
-
-  return 0;
-}
-
-bool isNull(const char *val, int32_t type) {
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL:
-      return *(uint8_t *)val == TSDB_DATA_BOOL_NULL;
-    case TSDB_DATA_TYPE_TINYINT:
-      return *(uint8_t *)val == TSDB_DATA_TINYINT_NULL;
-    case TSDB_DATA_TYPE_SMALLINT:
-      return *(uint16_t *)val == TSDB_DATA_SMALLINT_NULL;
-    case TSDB_DATA_TYPE_INT:
-      return *(uint32_t *)val == TSDB_DATA_INT_NULL;
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TIMESTAMP:
-      return *(uint64_t *)val == TSDB_DATA_BIGINT_NULL;
-    case TSDB_DATA_TYPE_FLOAT:
-      return *(uint32_t *)val == TSDB_DATA_FLOAT_NULL;
-    case TSDB_DATA_TYPE_DOUBLE:
-      return *(uint64_t *)val == TSDB_DATA_DOUBLE_NULL;
-    case TSDB_DATA_TYPE_NCHAR:
-      return *(uint32_t *)val == TSDB_DATA_NCHAR_NULL;
-    case TSDB_DATA_TYPE_BINARY:
-      return *(uint8_t *)val == TSDB_DATA_BINARY_NULL;
-    default:
-      return false;
-  };
-}
-
-void setNull(char *val, int32_t type, int32_t bytes) { setNullN(val, type, bytes, 1); }
-
-void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems) {
-  switch (type) {
-    case TSDB_DATA_TYPE_BOOL:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint8_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_BOOL_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_TINYINT:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint8_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_TINYINT_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_SMALLINT:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint16_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_SMALLINT_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_INT:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint32_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_INT_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TIMESTAMP:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint64_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_BIGINT_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_FLOAT:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint32_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_FLOAT_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_DOUBLE:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint64_t *)(val + i * tDataTypeDesc[type].nSize) = TSDB_DATA_DOUBLE_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_NCHAR:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint32_t *)(val + i * bytes) = TSDB_DATA_NCHAR_NULL;
-      }
-      break;
-    case TSDB_DATA_TYPE_BINARY:
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint8_t *)(val + i * bytes) = TSDB_DATA_BINARY_NULL;
-      }
-      break;
-    default: {
-      for (int32_t i = 0; i < numOfElems; ++i) {
-        *(uint32_t *)(val + i * tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize) = TSDB_DATA_INT_NULL;
-      }
-      break;
-    }
-  }
-}
-
-void assignVal(char *val, const char *src, int32_t len, int32_t type) {
-  switch (type) {
-    case TSDB_DATA_TYPE_INT: {
-      *((int32_t *)val) = GET_INT32_VAL(src);
-      break;
-    }
-    case TSDB_DATA_TYPE_FLOAT: {
-      #ifdef _TD_ARM_32_
-      float fv = GET_FLOAT_VAL(src);
-      SET_FLOAT_VAL_ALIGN(val, &fv);
-      #else
-      *((float *)val) = GET_FLOAT_VAL(src);
-      #endif
-      break;
-    };
-    case TSDB_DATA_TYPE_DOUBLE: {
-      #ifdef _TD_ARM_32_
-      double dv = GET_DOUBLE_VAL(src);
-      SET_DOUBLE_VAL_ALIGN(val, &dv);
-      #else
-      *((double *)val) = GET_DOUBLE_VAL(src);
-      #endif
-      break;
-    };
-    case TSDB_DATA_TYPE_TIMESTAMP:
-    case TSDB_DATA_TYPE_BIGINT: {
-      *((int64_t *)val) = GET_INT64_VAL(src);
-      break;
-    };
-    case TSDB_DATA_TYPE_SMALLINT: {
-      *((int16_t *)val) = GET_INT16_VAL(src);
-      break;
-    };
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT: {
-      *((int8_t *)val) = GET_INT8_VAL(src);
-      break;
-    };
-    case TSDB_DATA_TYPE_BINARY: {
-      strncpy(val, src, len);
-      break;
-    };
-    case TSDB_DATA_TYPE_NCHAR: {
-      wcsncpy((wchar_t*)val, (wchar_t*)src, len / TSDB_NCHAR_SIZE);
-      break;
-    };
-    default: {
-      memcpy(val, src, len);
-      break;
-    }
-  }
-}
-
-void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size) {
-  char tmpBuf[4096] = {0};
-
-  switch (type) {
-    case TSDB_DATA_TYPE_INT: {
-      SWAP(*(int32_t *)(pLeft), *(int32_t *)(pRight), int32_t);
-      break;
-    }
-
-    case TSDB_DATA_TYPE_BIGINT:
-    case TSDB_DATA_TYPE_TIMESTAMP: {
-      SWAP(*(int64_t *)(pLeft), *(int64_t *)(pRight), int64_t);
-      break;
-    }
-    case TSDB_DATA_TYPE_DOUBLE: {
-      SWAP(*(double *)(pLeft), *(double *)(pRight), double);
-      break;
-    }
-    case TSDB_DATA_TYPE_SMALLINT: {
-      SWAP(*(int16_t *)(pLeft), *(int16_t *)(pRight), int16_t);
-      break;
-    }
-
-    case TSDB_DATA_TYPE_FLOAT: {
-      SWAP(*(float *)(pLeft), *(float *)(pRight), float);
-      break;
-    }
-
-    case TSDB_DATA_TYPE_BOOL:
-    case TSDB_DATA_TYPE_TINYINT: {
-      SWAP(*(int8_t *)(pLeft), *(int8_t *)(pRight), int8_t);
-      break;
-    }
-
-    default: {
-      assert(size <= 4096);
-      memcpy(tmpBuf, pLeft, size);
-      memcpy(pLeft, pRight, size);
-      memcpy(pRight, tmpBuf, size);
-      break;
-    }
-  }
-}
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index 21d147d9473fb643df3bdc719aa19699619ea2d7..6c4af437b27b6623aeebb404e0dad1c70241cf47 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -14,17 +14,11 @@
  */
 
 #include "os.h"
-
-#ifdef USE_LIBICONV
-#include "iconv.h"
-#endif
-
 #include "tcrc32c.h"
-#include "tglobalcfg.h"
-#include "ttime.h"
-#include "ttypes.h"
+#include "tglobal.h"
+#include "taosdef.h"
 #include "tutil.h"
-#include "tlog.h"
+#include "tulog.h"
 #include "taoserror.h"
 
 int32_t strdequote(char *z) {
@@ -58,7 +52,7 @@ int32_t strdequote(char *z) {
   return j + 1;  // only one quote, do nothing
 }
 
-void strtrim(char *z) {
+size_t strtrim(char *z) {
   int32_t i = 0;
   int32_t j = 0;
 
@@ -69,7 +63,7 @@ void strtrim(char *z) {
 
   if (z[j] == 0) {
     z[0] = 0;
-    return;
+    return 0;
   }
 
   delta = j;
@@ -87,9 +81,12 @@ void strtrim(char *z) {
 
   if (stop > 0) {
     z[stop - delta] = 0;
+    return (stop - delta);
   } else if (j != i) {
     z[i] = 0;
   }
+  
+  return i;
 }
 
 char **strsplit(char *z, const char *delim, int32_t *num) {
@@ -162,9 +159,39 @@ char* strtolower(char *dst, const char *src) {
   return dst;
 }
 
+char* strntolower(char *dst, const char *src, int32_t n) {
+  int esc = 0;
+  char quote = 0, *p = dst, c;
+
+  assert(dst != NULL);
+  if (n == 0) {
+    *p = 0;
+    return dst;
+  } 
+  for (c = *src++; n-- > 0; c = *src++) {
+    if (esc) {
+      esc = 0;
+    } else if (quote) {
+      if (c == '\\') {
+        esc = 1;
+      } else if (c == quote) {
+        quote = 0;
+      }
+    } else if (c >= 'A' && c <= 'Z') {
+      c -= 'A' - 'a';
+    } else if (c == '\'' || c == '"') {
+      quote = c;
+    }
+    *p++ = c;
+  }
+
+  *p = 0;
+  return dst;
+}
+
 char *paGetToken(char *string, char **token, int32_t *tokenLen) {
   char quote = 0;
-
+  
   while (*string != 0) {
     if (*string == ' ' || *string == '\t') {
       ++string;
@@ -241,92 +268,18 @@ int64_t strnatoi(char *num, int32_t len) {
   return ret;
 }
 
-FORCE_INLINE size_t getLen(size_t old, size_t size) {
-  if (old == 1) {
-    old = 2;
-  }
-
-  while (old < size) {
-    old = (old * 1.5);
-  }
-
-  return old;
-}
-
-static char *ensureSpace(char *dest, size_t *curSize, size_t size) {
-  if (*curSize < size) {
-    *curSize = getLen(*curSize, size);
-
-    char *tmp = realloc(dest, *curSize);
-    if (tmp == NULL) {
-      free(dest);
-      return NULL;
-    }
-
-    return tmp;
-  }
-
-  return dest;
-}
-
-char *strreplace(const char *str, const char *pattern, const char *rep) {
-  if (str == NULL || pattern == NULL || rep == NULL) {
-    return NULL;
-  }
-
-  const char *s = str;
-
-  size_t oldLen = strlen(str);
-  size_t newLen = oldLen;
-
-  size_t repLen = strlen(rep);
-  size_t patternLen = strlen(pattern);
-
-  char *dest = calloc(1, oldLen + 1);
-  if (dest == NULL) {
-    return NULL;
-  }
-
-  if (patternLen == 0) {
-    return strcpy(dest, str);
-  }
-
-  int32_t start = 0;
-
-  while (1) {
-    char *p = strstr(str, pattern);
-    if (p == NULL) {  // remain does not contain pattern
-      size_t remain = (oldLen - (str - s));
-      size_t size = remain + start + 1;
-
-      dest = ensureSpace(dest, &newLen, size);
-      if (dest == NULL) {
-        return NULL;
-      }
-
-      strcpy(dest + start, str);
-      dest[start + remain] = 0;
-      break;
-    }
-
-    size_t len = p - str;
-    size_t size = start + len + repLen + 1;
-
-    dest = ensureSpace(dest, &newLen, size);
-    if (dest == NULL) {
-      return NULL;
+char *strbetween(char *string, char *begin, char *end) {
+  char *result = NULL;
+  char *_begin = strstr(string, begin);
+  if (_begin != NULL) {
+    char *_end = strstr(_begin + strlen(begin), end);
+    int   size = (int)(_end - _begin);
+    if (_end != NULL && size > 0) {
+      result = (char *)calloc(1, size);
+      memcpy(result, _begin + strlen(begin), size - +strlen(begin));
     }
-
-    memcpy(dest + start, str, len);
-
-    str += (len + patternLen);
-    start += len;
-
-    memcpy(dest + start, rep, repLen);
-    start += repLen;
   }
-
-  return dest;
+  return result;
 }
 
 int32_t taosByteArrayToHexStr(char bytes[], int32_t len, char hexstr[]) {
@@ -334,7 +287,7 @@ int32_t taosByteArrayToHexStr(char bytes[], int32_t len, char hexstr[]) {
   char    hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
   for (i = 0; i < len; i++) {
-    hexstr[i * 2] = hexval[((bytes[i] >> 4) & 0xF)];
+    hexstr[i * 2] = hexval[((bytes[i] >> 4u) & 0xF)];
     hexstr[(i * 2) + 1] = hexval[(bytes[i]) & 0x0F];
   }
 
@@ -373,137 +326,13 @@ int32_t taosHexStrToByteArray(char hexstr[], char bytes[]) {
   return 0;
 }
 
-// rename file name
-int32_t taosFileRename(char *fullPath, char *suffix, char delimiter, char **dstPath) {
-  int32_t ts = taosGetTimestampSec();
-
-  char fname[PATH_MAX] = {0};  // max file name length must be less than 255
-
-  char *delimiterPos = strrchr(fullPath, delimiter);
-  if (delimiterPos == NULL) return -1;
-
-  int32_t fileNameLen = 0;
-  if (suffix)
-    fileNameLen = snprintf(fname, PATH_MAX, "%s.%d.%s", delimiterPos + 1, ts, suffix);
-  else
-    fileNameLen = snprintf(fname, PATH_MAX, "%s.%d", delimiterPos + 1, ts);
-
-  size_t len = (size_t)((delimiterPos - fullPath) + fileNameLen + 1);
-  if (*dstPath == NULL) {
-    *dstPath = calloc(1, len + 1);
-    if (*dstPath == NULL) return -1;
-  }
-
-  strncpy(*dstPath, fullPath, (size_t)(delimiterPos - fullPath + 1));
-  strncat(*dstPath, fname, (size_t)fileNameLen);
-  (*dstPath)[len] = 0;
-
-  return rename(fullPath, *dstPath);
-}
-
-int tasoUcs4Compare(void* f1_ucs4, void *f2_ucs4, int bytes) {
-#if defined WINDOWS
-  for (int i = 0; i < bytes; ++i) {
-    int32_t f1 = *(int32_t*)((char*)f1_ucs4 + i * 4);
-    int32_t f2 = *(int32_t*)((char*)f2_ucs4 + i * 4);
-
-    if ((f1 == 0 && f2 != 0) || (f1 != 0 && f2 == 0)) {
-      return f1 - f2;
-    }
-    else if (f1 == 0 && f2 == 0) {
-      return 0;
-    }
-
-    if (f1 != f2) {
-      return f1 - f2;
-    }
-  }
-  return 0;
-
-#if 0
-  int32_t ucs4_max_len = bytes + 4;
-  char *f1_mbs = calloc(bytes, 1);
-  char *f2_mbs = calloc(bytes, 1);
-  if (!taosUcs4ToMbs(f1_ucs4, ucs4_max_len, f1_mbs)) {
-    return -1;
-  }
-  if (!taosUcs4ToMbs(f2_ucs4, ucs4_max_len, f2_mbs)) {
-    return -1;
-  }
-  int32_t ret = strcmp(f1_mbs, f2_mbs);
-  free(f1_mbs);
-  free(f2_mbs);
-  return ret;
-#endif
-
-#else
-  return wcsncmp((wchar_t *)f1_ucs4, (wchar_t *)f2_ucs4, bytes / TSDB_NCHAR_SIZE);
-#endif
-}
-
-bool taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs) {
-#ifdef USE_LIBICONV
-  iconv_t cd = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
-  size_t ucs4_input_len = ucs4_max_len;
-  size_t outLen = ucs4_max_len;
-  if (iconv(cd, (char **)&ucs4, &ucs4_input_len, &mbs, &outLen) == -1) {
-    iconv_close(cd);
-    return false;
-  }
-  iconv_close(cd);
-  return true;
-#else
-  mbstate_t state = {0};
-  int32_t len = (int32_t) wcsnrtombs(NULL, (const wchar_t **) &ucs4, ucs4_max_len / 4, 0, &state);
-  if (len < 0) {
-    return false;
-  }
-  memset(&state, 0, sizeof(state));
-  len = wcsnrtombs(mbs, (const wchar_t **) &ucs4, ucs4_max_len / 4, (size_t) len, &state);
-  if (len < 0) {
-    return false;
-  }
-  return true;
-#endif
-}
-
-bool taosMbsToUcs4(char *mbs, int32_t mbs_len, char *ucs4, int32_t ucs4_max_len) {
-  memset(ucs4, 0, ucs4_max_len);
-#ifdef USE_LIBICONV
-  iconv_t cd = iconv_open(DEFAULT_UNICODE_ENCODEC, tsCharset);
-  size_t ucs4_input_len = mbs_len;
-  size_t outLen = ucs4_max_len;
-  if (iconv(cd, &mbs, &ucs4_input_len, &ucs4, &outLen) == -1) {
-    iconv_close(cd);
-    return false;
-  }
-  iconv_close(cd);
-  return true;
-#else
-  mbstate_t state = {0};
-  int32_t len = mbsnrtowcs((wchar_t *) ucs4, (const char **) &mbs, mbs_len, ucs4_max_len / 4, &state);
-  return len >= 0;
-#endif
-}
-
-bool taosValidateEncodec(const char *encodec) {
-#ifdef USE_LIBICONV
-  iconv_t cd = iconv_open(encodec, DEFAULT_UNICODE_ENCODEC);
-  if (cd == (iconv_t)(-1)) {
-    return false;
-  }
-  iconv_close(cd);
-#endif
-  return true;
-}
-
 bool taosGetVersionNumber(char *versionStr, int *versionNubmer) {
   if (versionStr == NULL || versionNubmer == NULL) {
     return false;
   }
 
-  int versionNumberPos[4] = {0};
-  int len = strlen(versionStr);
+  int versionNumberPos[5] = {0};
+  int len = (int)strlen(versionStr);
   int dot = 0;
   for (int pos = 0; pos < len && dot < 4; ++pos) {
     if (versionStr[pos] == '.') {
@@ -527,28 +356,28 @@ bool taosGetVersionNumber(char *versionStr, int *versionNubmer) {
 }
 
 int taosCheckVersion(char *input_client_version, char *input_server_version, int comparedSegments) {
-  char client_version[64] = {0};
-  char server_version[64] = {0};
+  char client_version[TSDB_VERSION_LEN] = {0};
+  char server_version[TSDB_VERSION_LEN] = {0};
   int clientVersionNumber[4] = {0};
   int serverVersionNumber[4] = {0};
 
-  strcpy(client_version, input_client_version);
-  strcpy(server_version, input_server_version);
+  tstrncpy(client_version, input_client_version, sizeof(client_version));
+  tstrncpy(server_version, input_server_version, sizeof(server_version));
 
   if (!taosGetVersionNumber(client_version, clientVersionNumber)) {
-    pError("invalid client version:%s", client_version);
-    return TSDB_CODE_INVALID_CLIENT_VERSION;
+    uError("invalid client version:%s", client_version);
+    return TSDB_CODE_TSC_INVALID_VERSION;
   }
 
   if (!taosGetVersionNumber(server_version, serverVersionNumber)) {
-    pError("invalid server version:%s", server_version);
-    return TSDB_CODE_INVALID_CLIENT_VERSION;
+    uError("invalid server version:%s", server_version);
+    return TSDB_CODE_TSC_INVALID_VERSION;
   }
 
   for(int32_t i = 0; i < comparedSegments; ++i) {
     if (clientVersionNumber[i] != serverVersionNumber[i]) {
-      tscError("the %d-th number of server version:%s not matched with client version:%s", i, server_version, version);
-      return TSDB_CODE_INVALID_CLIENT_VERSION;
+      uError("the %d-th number of server version:%s not matched with client version:%s", i, server_version, version);
+      return TSDB_CODE_TSC_INVALID_VERSION;
     }
   }
 
@@ -560,14 +389,11 @@ char *taosIpStr(uint32_t ipInt) {
   static int ipStrIndex = 0;
 
   char *ipStr = ipStrArray[(ipStrIndex++) % 3];
-  sprintf(ipStr, "0x%x:%u.%u.%u.%u", ipInt, ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, (uint8_t)(ipInt >> 24));
+  //sprintf(ipStr, "0x%x:%u.%u.%u.%u", ipInt, ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, (uint8_t)(ipInt >> 24));
+  sprintf(ipStr, "%u.%u.%u.%u", ipInt & 0xFF, (ipInt >> 8) & 0xFF, (ipInt >> 16) & 0xFF, (uint8_t)(ipInt >> 24));
   return ipStr;
 }
 
-#ifndef CLUSTER
-void taosCleanupTier() {}
-#endif
-
 FORCE_INLINE float taos_align_get_float(const char* pBuf) {
   float fv = 0; 
   *(int32_t*)(&fv) = *(int32_t*)pBuf;
@@ -579,22 +405,3 @@ FORCE_INLINE double taos_align_get_double(const char* pBuf) {
   *(int64_t*)(&dv) = *(int64_t*)pBuf;
   return dv; 
 }
-
-typedef struct CharsetPair {
-  char *oldCharset;
-  char *newCharset;
-} CharsetPair;
-
-char *taosCharsetReplace(char *charsetstr) {
-  CharsetPair charsetRep[] = {
-      { "utf8", "UTF-8" }, { "936", "CP936" },
-  };
-
-  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
-    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
-      return strdup(charsetRep[i].newCharset);
-    }
-  }
-
-  return strdup(charsetstr);
-}
diff --git a/src/util/src/version.c b/src/util/src/version.c
deleted file mode 100644
index d1294801ee7e29cdc91e8096889e7b06baf7bb67..0000000000000000000000000000000000000000
--- a/src/util/src/version.c
+++ /dev/null
@@ -1,7 +0,0 @@
-char version[64] = "1.6.5.4";
-char compatible_version[64] = "1.6.1.0";
-char gitinfo[128] = "3264067e97300c84caa61ac909d548c9ca56de6b";
-char gitinfoOfInternal[128] = "da88f4a2474737d1f9c76adcf0ff7fd0975e7342";
-char buildinfo[512] = "Built by root at 2020-02-05 14:38";
-
-void libtaos_1_6_5_4_Linux_x64() {};
diff --git a/src/util/src/version.c.in b/src/util/src/version.c.in
new file mode 100644
index 0000000000000000000000000000000000000000..21c78a0eb4cad28ea1cdffcd58dc795ebd1000e5
--- /dev/null
+++ b/src/util/src/version.c.in
@@ -0,0 +1,7 @@
+char version[12] = "${TD_VER_NUMBER}";
+char compatible_version[12] = "${TD_VER_COMPATIBLE}";
+char gitinfo[48] = "${TD_VER_GIT}";
+char gitinfoOfInternal[48] = "${TD_VER_GIT_INTERNAL}";
+char buildinfo[64] = "Built at ${TD_VER_DATE}";
+
+void libtaos_${TD_LIB_VER_NUMBER}_${TD_VER_OSTYPE}_${TD_VER_CPUTYPE}_${TD_VER_VERTYPE}() {};
diff --git a/src/util/tests/CMakeLists.txt b/src/util/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8687a8005ddeda7320c60c9ef90dd221f56b971f
--- /dev/null
+++ b/src/util/tests/CMakeLists.txt
@@ -0,0 +1,15 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest)
+FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib)
+
+IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
+    MESSAGE(STATUS "gTest library found, build unit test")
+
+    INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
+    AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+
+    ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
+    TARGET_LINK_LIBRARIES(utilTest tutil common osdetail gtest pthread gcov)
+ENDIF()
diff --git a/src/util/tests/cacheTest.cpp b/src/util/tests/cacheTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0a4791f6a99d9fa88280a7c504b401c3b9b696bf
--- /dev/null
+++ b/src/util/tests/cacheTest.cpp
@@ -0,0 +1,128 @@
+#include "os.h"
+#include <iostream>
+#include <gtest/gtest.h>
+
+#include "taos.h"
+#include "tcache.h"
+
+namespace {
+int32_t tsMaxMgmtConnections = 10000;
+int32_t tsMaxMeterConnections = 200;
+}
+// test cache
+TEST(testCase, client_cache_test) {
+  const int32_t REFRESH_TIME_IN_SEC = 2;
+  SCacheObj* tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, REFRESH_TIME_IN_SEC, 0, NULL, "test");
+
+  const char* key1 = "test1";
+  char data1[] = "test11";
+
+  char* cachedObj = (char*) taosCachePut(tscMetaCache, key1, strlen(key1), data1, strlen(data1)+1, 1);
+  sleep(REFRESH_TIME_IN_SEC+1);
+
+  printf("obj is still valid: %s\n", cachedObj);
+
+  char data2[] = "test22";
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj, false);
+
+  /* the object is cleared by cache clean operation */
+  cachedObj = (char*) taosCachePut(tscMetaCache, key1, strlen(key1), data2, strlen(data2)+1, 20);
+  printf("after updated: %s\n", cachedObj);
+
+  printf("start to remove data from cache\n");
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj, false);
+  printf("end of removing data from cache\n");
+
+  const char* key3 = "test2";
+  const char* data3 = "kkkkkkk";
+
+  char* cachedObj2 = (char*) taosCachePut(tscMetaCache, key3, strlen(key3), data3, strlen(data3) + 1, 1);
+  printf("%s\n", cachedObj2);
+
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj2, false);
+
+  sleep(3);
+  char* d = (char*) taosCacheAcquireByKey(tscMetaCache, key3, strlen(key3));
+//    assert(d == NULL);
+
+  char key5[] = "test5";
+  char data5[] = "data5kkkkk";
+  cachedObj2 = (char*) taosCachePut(tscMetaCache, key5, strlen(key5), data5, strlen(data5) + 1, 20);
+
+  const char* data6= "new Data after updated";
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj2, false);
+
+  cachedObj2 = (char*) taosCachePut(tscMetaCache, key5, strlen(key5), data6, strlen(data6) + 1, 20);
+  printf("%s\n", cachedObj2);
+
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj2, true);
+
+  const char* data7 = "add call update procedure";
+  cachedObj2 = (char*) taosCachePut(tscMetaCache, key5, strlen(key5), data7, strlen(data7) + 1, 20);
+  printf("%s\n=======================================\n\n", cachedObj2);
+
+  char* cc = (char*) taosCacheAcquireByKey(tscMetaCache, key5, strlen(key5));
+
+  taosCacheRelease(tscMetaCache, (void**) &cachedObj2, true);
+  taosCacheRelease(tscMetaCache, (void**) &cc, false);
+
+  const char* data8 = "ttft";
+  const char* key6 = "key6";
+
+  char* ft = (char*) taosCachePut(tscMetaCache, key6, strlen(key6), data8, strlen(data8), 20);
+  taosCacheRelease(tscMetaCache, (void**) &ft, false);
+
+  /**
+   * 140ns
+   */
+  uint64_t startTime = taosGetTimestampUs();
+  printf("Cache Performance Test\nstart time:%" PRIu64 "\n", startTime);
+  for(int32_t i=0; i<1000; ++i) {
+    char* dd = (char*) taosCacheAcquireByKey(tscMetaCache, key6, strlen(key6));
+    if (dd != NULL) {
+//      printf("get the data\n");
+    } else {
+      printf("data has been released\n");
+    }
+
+    taosCacheRelease(tscMetaCache, (void**) &dd, false);
+  }
+
+  uint64_t endTime = taosGetTimestampUs();
+  int64_t el = endTime - startTime;
+
+  printf("End of Test, %" PRIu64 "\nTotal Elapsed Time:%" PRIu64 " us.avg:%f us\n", endTime, el, el/1000.0);
+
+  taosCacheCleanup(tscMetaCache);
+}
+
+TEST(testCase, cache_resize_test) {
+  const int32_t REFRESH_TIME_IN_SEC = 2;
+  auto* pCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, REFRESH_TIME_IN_SEC, false, NULL, "test");
+
+  char key[256] = {0};
+  char data[1024] = "abcdefghijk";
+  int32_t len = strlen(data);
+
+  uint64_t startTime = taosGetTimestampUs();
+  int32_t num = 10000;
+
+  for(int32_t i = 0; i < num; ++i) {
+    int32_t len = sprintf(key, "abc_%7d", i);
+    taosCachePut(pCache, key, strlen(key), data, len, 3600);
+  }
+  uint64_t endTime = taosGetTimestampUs();
+
+  printf("add %d object cost:%" PRIu64 " us, avg:%f us\n", num, endTime - startTime, (endTime-startTime)/(double)num);
+
+  startTime = taosGetTimestampUs();
+  for(int32_t i = 0; i < num; ++i) {
+    int32_t len = sprintf(key, "abc_%7d", i);
+    void* k = taosCacheAcquireByKey(pCache, key, len);
+    assert(k != 0);
+  }
+  endTime = taosGetTimestampUs();
+  printf("retrieve %d object cost:%" PRIu64 " us,avg:%f\n", num, endTime - startTime, (endTime - startTime)/(double)num);
+
+  taosCacheCleanup(pCache);
+}
\ No newline at end of file
diff --git a/src/util/tests/codingTests.cpp b/src/util/tests/codingTests.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0cd9524646f0bae67c8e24234d1a204302f90350
--- /dev/null
+++ b/src/util/tests/codingTests.cpp
@@ -0,0 +1,262 @@
+#include <gtest/gtest.h>
+#include <stdlib.h>
+#include <time.h>
+#include <random>
+
+#include "tcoding.h"
+
+static bool test_fixed_uint16(uint16_t value) {
+  char     buf[20] = "\0";
+  uint16_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedU16(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedU16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_fixed_int16(int16_t value) {
+  char    buf[20] = "\0";
+  int16_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedI16(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedI16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_fixed_uint32(uint32_t value) {
+  char     buf[20] = "\0";
+  uint32_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedU32(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedU32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_fixed_int32(int32_t value) {
+  char    buf[20] = "\0";
+  int32_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedI32(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedI32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_fixed_uint64(uint64_t value) {
+  char     buf[20] = "\0";
+  uint64_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedU64(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedU64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_fixed_int64(int64_t value) {
+  char    buf[20] = "\0";
+  int64_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeFixedI64(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeFixedI64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_uint16(uint16_t value) {
+  char     buf[20] = "\0";
+  uint16_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantU16(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantU16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_int16(int16_t value) {
+  char    buf[20] = "\0";
+  int16_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantI16(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantI16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_uint32(uint32_t value) {
+  char     buf[20] = "\0";
+  uint32_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantU32(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantU32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_int32(int32_t value) {
+  char    buf[20] = "\0";
+  int32_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantI32(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantI32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_uint64(uint64_t value) {
+  char     buf[20] = "\0";
+  uint64_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantU64(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantU64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+static bool test_variant_int64(int64_t value) {
+  char    buf[20] = "\0";
+  int64_t value_check = 0;
+
+  void *pBuf = (void *)buf;
+
+  int   tlen = taosEncodeVariantI64(static_cast<void **>(&pBuf), value);
+  void *ptr = taosDecodeVariantI64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr != NULL) && (value == value_check) && (pBuf == ptr) && POINTER_DISTANCE(pBuf, buf) == tlen);
+}
+
+TEST(codingTest, fixed_encode_decode) {
+  srand(time(0));
+
+  // uint16_t
+  for (uint16_t value = 0; value <= UINT16_MAX; value++) {
+    ASSERT_TRUE(test_fixed_uint16(value));
+    if (value == UINT16_MAX) break;
+  }
+
+  // int16_t
+  for (int16_t value = INT16_MIN; value <= INT16_MAX; value++) {
+    ASSERT_TRUE(test_fixed_int16(value));
+    if (value == INT16_MAX) break;
+  }
+
+  std::mt19937 gen32(std::random_device{}());
+  // uint32_t
+  ASSERT_TRUE(test_fixed_uint32(0));
+  ASSERT_TRUE(test_fixed_uint32(UINT32_MAX));
+  std::uniform_int_distribution<uint32_t> distr1(0, UINT32_MAX);
+
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_uint32(distr1(gen32)));
+  }
+
+  // int32_t
+  ASSERT_TRUE(test_fixed_int32(INT32_MIN));
+  ASSERT_TRUE(test_fixed_int32(INT32_MAX));
+  std::uniform_int_distribution<int32_t> distr2(INT32_MIN, INT32_MAX);
+
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_int32(distr2(gen32)));
+  }
+
+  std::mt19937_64 gen64(std::random_device{}());
+  // uint64_t
+  std::uniform_int_distribution<uint64_t> distr3(0, UINT64_MAX);
+
+  ASSERT_TRUE(test_fixed_uint64(0));
+  ASSERT_TRUE(test_fixed_uint64(UINT64_MAX));
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_uint64(distr3(gen64)));
+  }
+
+  // int64_t
+  std::uniform_int_distribution<int64_t> distr4(INT64_MIN, INT64_MAX);
+
+  ASSERT_TRUE(test_fixed_int64(INT64_MIN));
+  ASSERT_TRUE(test_fixed_int64(INT64_MAX));
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_int64(distr4(gen64)));
+  }
+}
+
+TEST(codingTest, variant_encode_decode) {
+  srand(time(0));
+
+  // uint16_t
+  for (uint16_t value = 0; value <= UINT16_MAX; value++) {
+    ASSERT_TRUE(test_variant_uint16(value));
+    if (value == UINT16_MAX) break;
+  }
+
+  // int16_t
+  for (int16_t value = INT16_MIN; value <= INT16_MAX; value++) {
+    ASSERT_TRUE(test_variant_int16(value));
+    if (value == INT16_MAX) break;
+  }
+
+  std::mt19937 gen32(std::random_device{}());
+  // uint32_t
+  std::uniform_int_distribution<uint32_t> distr1(0, UINT32_MAX);
+  ASSERT_TRUE(test_variant_uint32(0));
+  ASSERT_TRUE(test_variant_uint32(UINT32_MAX));
+
+  for (int i = 0; i < 5000000; i++) {
+    ASSERT_TRUE(test_variant_uint32(distr1(gen32)));
+  }
+
+  // int32_t
+  std::uniform_int_distribution<int32_t> distr2(INT32_MIN, INT32_MAX);
+  ASSERT_TRUE(test_variant_int32(INT32_MIN));
+  ASSERT_TRUE(test_variant_int32(INT32_MAX));
+
+  for (int i = 0; i < 5000000; i++) {
+    ASSERT_TRUE(test_variant_int32(distr2(gen32)));
+  }
+
+  std::mt19937_64 gen64(std::random_device{}());
+  // uint64_t
+  std::uniform_int_distribution<uint64_t> distr3(0, UINT64_MAX);
+
+  ASSERT_TRUE(test_variant_uint64(0));
+  ASSERT_TRUE(test_variant_uint64(UINT64_MAX));
+  for (int i = 0; i < 5000000; i++) {
+    // uint64_t value = gen();
+    // printf("%ull\n", value);
+    ASSERT_TRUE(test_variant_uint64(distr3(gen64)));
+  }
+
+  // int64_t
+  std::uniform_int_distribution<int64_t> distr4(INT64_MIN, INT64_MAX);
+
+  ASSERT_TRUE(test_variant_int64(INT64_MIN));
+  ASSERT_TRUE(test_variant_int64(INT64_MAX));
+  for (int i = 0; i < 5000000; i++) {
+    // uint64_t value = gen();
+    // printf("%ull\n", value);
+    ASSERT_TRUE(test_variant_int64(distr4(gen64)));
+  }
+}
\ No newline at end of file
diff --git a/src/util/tests/hashTest.cpp b/src/util/tests/hashTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bc3fed74c4eb9dbb5ac1eceb26c497300e6bcf67
--- /dev/null
+++ b/src/util/tests/hashTest.cpp
@@ -0,0 +1,156 @@
+#include "os.h"
+#include <gtest/gtest.h>
+#include <limits.h>
+#include <taosdef.h>
+#include <iostream>
+
+#include "hash.h"
+#include "taos.h"
+
+namespace {
+// the simple test code for basic operations
+void simpleTest() {
+  SHashObj* hashTable = (SHashObj*) taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_ENTRY_LOCK);
+  ASSERT_EQ(taosHashGetSize(hashTable), 0);
+  
+  // put 400 elements in the hash table
+  for(int32_t i = -200; i < 200; ++i) {
+    taosHashPut(hashTable, (const char*) &i, sizeof(int32_t), (char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 400);
+  
+  for(int32_t i = 0; i < 200; ++i) {
+    char* p = (char*) taosHashGet(hashTable, (const char*) &i, sizeof(int32_t));
+    ASSERT_TRUE(p != nullptr);
+    ASSERT_EQ(*reinterpret_cast<int32_t*>(p), i);
+  }
+  
+  for(int32_t i = 1000; i < 2000; ++i) {
+    taosHashRemove(hashTable, (const char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 400);
+  
+  for(int32_t i = 0; i < 100; ++i) {
+    taosHashRemove(hashTable, (const char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 300);
+  
+  for(int32_t i = 100; i < 150; ++i) {
+    taosHashRemove(hashTable, (const char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 250);
+  taosHashCleanup(hashTable);
+}
+
+void stringKeyTest() {
+  auto* hashTable = (SHashObj*) taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
+  ASSERT_EQ(taosHashGetSize(hashTable), 0);
+  
+  char key[128] = {0};
+  
+  // put 200 elements in the hash table
+  for(int32_t i = 0; i < 1000; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+    taosHashPut(hashTable, key, len, (char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 1000);
+  
+  for(int32_t i = 0; i < 1000; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+    
+    char* p = (char*) taosHashGet(hashTable, key, len);
+    ASSERT_TRUE(p != nullptr);
+    
+    ASSERT_EQ(*reinterpret_cast<int32_t*>(p), i);
+  }
+  
+  for(int32_t i = 500; i < 1000; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+    
+    taosHashRemove(hashTable, key, len);
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 500);
+  
+  for(int32_t i = 0; i < 499; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+  
+    taosHashRemove(hashTable, key, len);
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), 1);
+  
+  taosHashCleanup(hashTable);
+}
+
+void functionTest() {
+
+}
+
+/**
+ * evaluate the performance issue, by add 10million elements in to hash table in
+ * a single threads situation
+ */
+void noLockPerformanceTest() {
+  auto* hashTable = (SHashObj*) taosHashInit(4096, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
+  ASSERT_EQ(taosHashGetSize(hashTable), 0);
+  
+  char key[128] = {0};
+  int32_t num = 5000000;
+  
+  int64_t st = taosGetTimestampUs();
+  
+  // put 10M elements in the hash table
+  for(int32_t i = 0; i < num; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+    taosHashPut(hashTable, key, len, (char*) &i, sizeof(int32_t));
+  }
+  
+  ASSERT_EQ(taosHashGetSize(hashTable), num);
+  
+  int64_t et = taosGetTimestampUs();
+  printf("Elpased time:%" PRId64 " us to add %d elements, avg cost:%lf us\n", et - st, num, (et - st)/(double) num);
+  
+  st = taosGetTimestampUs();
+  for(int32_t i = 0; i < num; ++i) {
+    int32_t len = sprintf(key, "%d_1_%dabcefg_", i, i + 10);
+    char* p = (char*) taosHashGet(hashTable, key, len);
+    ASSERT_TRUE(p != nullptr);
+    
+    ASSERT_EQ(*reinterpret_cast<int32_t*>(p), i);
+  }
+  
+  et = taosGetTimestampUs();
+  printf("Elpased time:%" PRId64 " us to fetch all %d elements, avg cost:%lf us\n", et - st, num, (et - st)/(double) num);
+  
+  printf("The maximum length of overflow linklist in hash table is:%d\n", taosHashGetMaxOverflowLinkLength(hashTable));
+  taosHashCleanup(hashTable);
+}
+
+void multithreadsTest() {
+  //todo
+}
+
+// check the function robustness
+void invalidOperationTest() {
+
+}
+
+}
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+
+TEST(testCase, hashTest) {
+  simpleTest();
+  stringKeyTest();
+  noLockPerformanceTest();
+  multithreadsTest();
+}
diff --git a/src/util/tests/skiplistTest.cpp b/src/util/tests/skiplistTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..77174f69fda1a49975c44717d8993996274ca4c9
--- /dev/null
+++ b/src/util/tests/skiplistTest.cpp
@@ -0,0 +1,377 @@
+#include <gtest/gtest.h>
+#include <limits.h>
+#include <taosdef.h>
+#include <iostream>
+
+#include "os.h"
+#include "taosmsg.h"
+#include "tskiplist.h"
+#include "tutil.h"
+
+namespace {
+
+char* getkey(const void* data) { return (char*)(data); }
+
+void doubleSkipListTest() {
+  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_DOUBLE, sizeof(double), 0, false, true, getkey);
+
+  double  doubleVal[1000] = {0};
+  int32_t size = 20000;
+
+  printf("generated %d keys is: \n", size);
+
+  for (int32_t i = 0; i < size; ++i) {
+    if (i < 1000) {
+      doubleVal[i] = i * 0.997;
+    }
+
+    int32_t level = 0;
+    int32_t size = 0;
+
+    tSkipListNewNodeInfo(pSkipList, &level, &size);
+    auto d = (SSkipListNode*)calloc(1, size + sizeof(double) * 2);
+    d->level = level;
+
+    double* key = (double*)SL_GET_NODE_KEY(pSkipList, d);
+    key[0] = i * 0.997;
+    key[1] = i * 0.997;
+
+    tSkipListPut(pSkipList, d);
+  }
+
+  printf("the first level of skip list is:\n");
+  tSkipListPrint(pSkipList, 1);
+
+#if 0
+  SSkipListNode **pNodes = NULL;
+  SSkipListKey    sk;
+  for (int32_t i = 0; i < 100; ++i) {
+    sk.nType = TSDB_DATA_TYPE_DOUBLE;
+    int32_t idx = abs((i * rand()) % 1000);
+
+    sk.dKey = doubleVal[idx];
+
+    int32_t size = tSkipListGets(pSkipList, &sk, &pNodes);
+
+    printf("the query result size is: %d\n", size);
+    for (int32_t j = 0; j < size; ++j) {
+      printf("the result is: %lf\n", pNodes[j]->key.dKey);
+    }
+
+    if (size > 0) {
+      taosTFree(pNodes);
+    }
+  }
+
+#endif
+
+  printf("double test end...\n");
+  tSkipListDestroy(pSkipList);
+}
+
+void randKeyTest() {
+  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_INT, sizeof(int32_t), 0, false, true, getkey);
+
+  int32_t size = 200000;
+  srand(time(NULL));
+
+  printf("generated %d keys is: \n", size);
+
+  for (int32_t i = 0; i < size; ++i) {
+    int32_t level = 0;
+    int32_t s = 0;
+
+    tSkipListNewNodeInfo(pSkipList, &level, &s);
+    auto d = (SSkipListNode*)calloc(1, s + sizeof(int32_t) * 2);
+    d->level = level;
+
+    int32_t* key = (int32_t*)SL_GET_NODE_KEY(pSkipList, d);
+    key[0] = rand() % 1000000000;
+
+    key[1] = key[0];
+
+    tSkipListPut(pSkipList, d);
+  }
+
+  printf("the first level of skip list is:\n");
+  tSkipListPrint(pSkipList, 1);
+
+  printf("the sec level of skip list is:\n");
+  tSkipListPrint(pSkipList, 2);
+
+  printf("the 5 level of skip list is:\n");
+  tSkipListPrint(pSkipList, 5);
+
+  tSkipListDestroy(pSkipList);
+}
+
+void stringKeySkiplistTest() {
+  const int32_t max_key_size = 12;
+
+  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_BINARY, max_key_size, 0, false, true, getkey);
+
+  int32_t level = 0;
+  int32_t headsize = 0;
+  tSkipListNewNodeInfo(pSkipList, &level, &headsize);
+
+  auto pNode = (SSkipListNode*)calloc(1, headsize + max_key_size + sizeof(double));
+  pNode->level = level;
+
+  char* d = SL_GET_NODE_DATA(pNode);
+  strncpy(d, "nyse", 5);
+
+  *(double*)(d + max_key_size) = 12;
+
+  tSkipListPut(pSkipList, pNode);
+
+  tSkipListNewNodeInfo(pSkipList, &level, &headsize);
+
+  pNode = (SSkipListNode*)calloc(1, headsize + max_key_size + sizeof(double));
+  pNode->level = level;
+
+  d = SL_GET_NODE_DATA(pNode);
+  strncpy(d, "beijing", 8);
+
+  *(double*)(d + max_key_size) = 911;
+
+  tSkipListPut(pSkipList, pNode);
+
+  printf("level one------------------\n");
+  tSkipListPrint(pSkipList, 1);
+
+#if 0
+  SSkipListNode **pRes = NULL;
+  int32_t ret = tSkipListGets(pSkipList, &key1, &pRes);
+
+  assert(ret == 1);
+  assert(strcmp(pRes[0]->key.pz, "beijing") == 0);
+  assert(pRes[0]->key.nType == TSDB_DATA_TYPE_BINARY);
+
+  tSkipListDestroyKey(&key1);
+  tSkipListDestroyKey(&key);
+
+  tSkipListDestroy(pSkipList);
+
+  free(pRes);
+#endif
+
+  tSkipListDestroy(pSkipList);
+
+  int64_t s = taosGetTimestampUs();
+  pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_BINARY, 20, 0, false, true, getkey);
+  char k[256] = {0};
+
+  int32_t total = 10000;
+  for (int32_t i = 0; i < total; ++i) {
+    int32_t n = sprintf(k, "abc_%d_%d", i, i);
+    tSkipListNewNodeInfo(pSkipList, &level, &headsize);
+
+    auto pNode = (SSkipListNode*)calloc(1, headsize + 20 + sizeof(double));
+    pNode->level = level;
+
+    char* d = SL_GET_NODE_DATA(pNode);
+    strncpy(d, k, strlen(k));
+
+    tSkipListPut(pSkipList, pNode);
+  }
+
+  int64_t e = taosGetTimestampUs();
+  printf("elapsed time:%" PRIu64 " us to insert %d data, avg:%f us\n", (e - s), total, (double)(e - s) / total);
+
+  printf("level two------------------\n");
+  tSkipListPrint(pSkipList, 1);
+
+#if 0
+  SSkipListNode **pres = NULL;
+
+  s = taosGetTimestampMs();
+  for (int32_t j = 0; j < total; ++j) {
+    int32_t n = sprintf(k, "abc_%d_%d", j, j);
+    key = tSkipListCreateKey(TSDB_DATA_TYPE_BINARY, k, n);
+
+    int32_t num = tSkipListGets(pSkipList, &key, &pres);
+    assert(num > 0);
+
+    //    tSkipListRemove(pSkipList, &key);
+    tSkipListRemoveNode(pSkipList, pres[0]);
+
+    if (num > 0) {
+      taosTFree(pres);
+    }
+  }
+
+  e = taosGetTimestampMs();
+  printf("elapsed time:%lldms\n", e - s);
+#endif
+  tSkipListDestroy(pSkipList);
+}
+
+void skiplistPerformanceTest() {
+  SSkipList* pSkipList = tSkipListCreate(10, TSDB_DATA_TYPE_DOUBLE, sizeof(double), 0, false, false, getkey);
+
+  int32_t size = 1000000;
+  int64_t prev = taosGetTimestampMs();
+  int64_t s = prev;
+
+  int32_t level = 0;
+  int32_t headsize = 0;
+
+  int32_t unit = MAX_SKIP_LIST_LEVEL * POINTER_BYTES * 2 + sizeof(double) * 2 + sizeof(int16_t);
+
+  char* total = (char*)calloc(1, unit * size);
+  char* p = total;
+
+  for (int32_t i = 0; i < size; ++i) {
+    tSkipListNewNodeInfo(pSkipList, &level, &headsize);
+
+    SSkipListNode* d = (SSkipListNode*)p;
+    p += headsize + sizeof(double) * 2;
+
+    d->level = level;
+    double* v = (double*)SL_GET_NODE_DATA(d);
+    v[0] = i * 0.997;
+    v[1] = i * 0.997;
+
+    tSkipListPut(pSkipList, d);
+
+    if (i % 100000 == 0) {
+      int64_t cur = taosGetTimestampMs();
+
+      int64_t elapsed = cur - prev;
+      printf("add %d, elapsed time: %" PRIu64 " ms, avg elapsed:%f ms, total:%d\n", 100000, elapsed, elapsed / 100000.0, i);
+      prev = cur;
+    }
+  }
+
+  int64_t e = taosGetTimestampMs();
+  printf("total:%" PRIu64 " ms, avg:%f\n", e - s, (e - s) / (double)size);
+  printf("max level of skiplist:%d, actually level:%d\n ", pSkipList->maxLevel, pSkipList->level);
+
+  assert(tSkipListGetSize(pSkipList) == size);
+
+  //  printf("the level of skiplist is:\n");
+  //
+  //  printf("level two------------------\n");
+  //  tSkipListPrint(pSkipList, 2);
+  //
+  //  printf("level three------------------\n");
+  //  tSkipListPrint(pSkipList, 3);
+  //
+  //  printf("level four------------------\n");
+  //  tSkipListPrint(pSkipList, 4);
+  //
+  //  printf("level nine------------------\n");
+  //  tSkipListPrint(pSkipList, 10);
+
+  int64_t st = taosGetTimestampMs();
+#if 0
+  for (int32_t i = 0; i < 100000; i += 1) {
+    key.dKey = i * 0.997;
+    tSkipListRemove(pSkipList, &key);
+  }
+#endif
+
+  int64_t et = taosGetTimestampMs();
+  printf("delete %d data from skiplist, elapased time:%" PRIu64 "ms\n", 10000, et - st);
+  assert(tSkipListGetSize(pSkipList) == size);
+
+  tSkipListDestroy(pSkipList);
+  taosTFree(total);
+}
+
+// todo not support duplicated key yet
+void duplicatedKeyTest() {
+  SSkipList *pSkipList = tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_INT, sizeof(int), true, false, true, getkey);
+
+  for (int32_t i = 0; i < 200; ++i) {
+    for (int32_t j = 0; j < 5; ++j) {
+      int32_t level, size;
+      tSkipListNewNodeInfo(pSkipList, &level, &size);
+      SSkipListNode* d = (SSkipListNode*)calloc(1, size + sizeof(int32_t));
+      d->level = level;
+      int32_t* key = (int32_t*)SL_GET_NODE_KEY(pSkipList, d);
+      key[0] = i;
+      tSkipListPut(pSkipList, d);
+    }
+  }
+
+  for (int32_t i = 0; i < 100; ++i) {
+    SSkipListKey key;
+    SArray*  nodes = tSkipListGet(pSkipList, (char*)(&i));
+    assert( taosArrayGetSize(nodes) == 5 );
+    taosArrayDestroy(nodes);
+  }
+
+  int32_t key = 101;
+  uint32_t num = tSkipListRemove(pSkipList, (char*)(&key));
+  assert(num == 5);
+
+  SArray*  nodes = tSkipListGet(pSkipList, (char*)(&key));
+  assert( taosArrayGetSize(nodes) == 0 );
+  taosArrayDestroy(nodes);
+
+  key = 102;
+  SSkipListIterator* iter = tSkipListCreateIterFromVal(pSkipList, (char*)(&key), TSDB_DATA_TYPE_INT, TSDB_ORDER_ASC);
+  for(int i = 0; i < 6; i++) {
+    assert(tSkipListIterNext(iter) == true);
+    SSkipListNode* node = tSkipListIterGet(iter);
+    int32_t* val = (int32_t*)SL_GET_NODE_KEY(pSkipList, node);
+    assert((i < 5) == ((*val) == key));
+  }
+  tSkipListDestroyIter(iter);
+
+  iter = tSkipListCreateIterFromVal(pSkipList, (char*)(&key), TSDB_DATA_TYPE_INT, TSDB_ORDER_DESC);
+  for(int i = 0; i < 6; i++) {
+    assert(tSkipListIterNext(iter) == true);
+    SSkipListNode* node = tSkipListIterGet(iter);
+    int32_t* val = (int32_t*)SL_GET_NODE_KEY(pSkipList, node);
+    assert((i < 5) == ((*val) == key));
+  }
+  tSkipListDestroyIter(iter);
+
+  tSkipListDestroy(pSkipList);
+}
+
+}  // namespace
+
+TEST(testCase, skiplist_test) {
+  assert(sizeof(SSkipListKey) == 8);
+  srand(time(NULL));
+
+  stringKeySkiplistTest();
+  doubleSkipListTest();
+  skiplistPerformanceTest();
+  duplicatedKeyTest();
+  randKeyTest();
+
+  //  tSKipListQueryCond q;
+  //  q.upperBndRelOptr = true;
+  //  q.lowerBndRelOptr = true;
+  //  q.upperBnd.nType = TSDB_DATA_TYPE_DOUBLE;
+  //  q.lowerBnd.nType = TSDB_DATA_TYPE_DOUBLE;
+  //  q.lowerBnd.dKey = 120;
+  //  q.upperBnd.dKey = 171.989;
+  /*
+      int32_t size = tSkipListQuery(pSkipList, &q, &pNodes);
+      for (int32_t i = 0; i < size; ++i) {
+          printf("-----%lf\n", pNodes[i]->key.dKey);
+      }
+      printf("the range query result size is: %d\n", size);
+      taosTFree(pNodes);
+
+      SSkipListKey *pKeys = malloc(sizeof(SSkipListKey) * 20);
+      for (int32_t i = 0; i < 8; i += 2) {
+          pKeys[i].dKey = i * 0.997;
+          pKeys[i].nType = TSDB_DATA_TYPE_DOUBLE;
+          printf("%lf ", pKeys[i].dKey);
+      }
+
+      int32_t r = tSkipListPointQuery(pSkipList, pKeys, 8, EXCLUDE_POINT_QUERY, &pNodes);
+      printf("\nthe exclude query result is: %d\n", r);
+      for (int32_t i = 0; i < r; ++i) {
+  //        printf("%lf ", pNodes[i]->key.dKey);
+      }
+      taosTFree(pNodes);
+
+      free(pKeys);*/
+}
diff --git a/src/util/tests/stringTest.cpp b/src/util/tests/stringTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..95fba0cd3e2b62da2b2dadb0b7e592aef5893543
--- /dev/null
+++ b/src/util/tests/stringTest.cpp
@@ -0,0 +1,180 @@
+#include <gtest/gtest.h>
+#include <limits.h>
+#include <taosdef.h>
+#include <iostream>
+
+#include "taos.h"
+#include "tutil.h"
+
+TEST(testCase, string_dequote_test) {
+  char    t1[] = "'abc'";
+  int32_t len = strdequote(t1);
+
+  EXPECT_EQ(3, len);
+  EXPECT_STRCASEEQ(t1, "abc");
+
+  char t2[] = "\"abc\"";
+  len = strdequote(t2);
+
+  EXPECT_EQ(3, len);
+  EXPECT_STRCASEEQ(t1, "abc");
+
+  char t21[] = " abc ";
+  int32_t lx = strtrim(t21);
+
+  EXPECT_STREQ("abc", t21);
+  EXPECT_EQ(3, lx);
+}
+
+#if 0
+TEST(testCase, string_replace_test) {
+  char  t3[] = "abc01abc02abc";
+  char* ret = strreplace(t3, "abc", "7");
+
+  EXPECT_EQ(strlen(ret), 7);
+  EXPECT_STREQ("7017027", ret);
+  free(ret);
+
+  char t4[] = "a01a02b03c04d05";
+  ret = strreplace(t4, "0", "9999999999");
+
+  EXPECT_EQ(strlen(ret), 5 * 10 + 10);
+  EXPECT_STREQ("a99999999991a99999999992b99999999993c99999999994d99999999995", ret);
+  free(ret);
+
+  char t5[] = "abc";
+  ret = strreplace(t5, "abc", "12345678901234567890");
+
+  EXPECT_EQ(strlen(ret), 20);
+  EXPECT_STREQ("12345678901234567890", ret);
+  free(ret);
+
+  char t6[] = "abc";
+  ret = strreplace(t6, "def", "abc");
+
+  EXPECT_EQ(strlen(ret), 3);
+  EXPECT_STREQ("abc", ret);
+  free(ret);
+
+  char t7[] = "abcde000000000000001234";
+  ret = strreplace(t7, "ab", "0000000");
+
+  EXPECT_EQ(strlen(ret), 28);
+  EXPECT_STREQ("0000000cde000000000000001234", ret);
+  free(ret);
+
+  char t8[] = "abc\ndef";
+  char t[] = {10, 0};
+
+  char    f1[] = "\\n";
+  int32_t fx = strlen(f1);
+  ret = strreplace(t8, "\n", "\\n");
+
+  EXPECT_EQ(strlen(ret), 8);
+  EXPECT_STREQ("abc\\ndef", ret);
+  free(ret);
+
+  char t9[] = "abc\\ndef";
+  ret = strreplace(t9, "\\n", "\n");
+
+  EXPECT_EQ(strlen(ret), 7);
+  EXPECT_STREQ("abc\ndef", ret);
+  free(ret);
+
+  char t10[] = "abcdef";
+  ret = strreplace(t10, "", "0");
+
+  EXPECT_EQ(strlen(ret), 6);
+  EXPECT_STREQ("abcdef", ret);
+  free(ret);
+}
+#endif
+
+TEST(testCase, string_tolower_test) {
+  char t[1024] = {1};
+  memset(t, 1, tListLen(t));
+
+  const char* a1 = "ABC";
+  strtolower(t, a1);
+  EXPECT_STREQ(t, "abc");
+
+  memset(t, 1, tListLen(t));
+  const char* a2 = "ABC\'ABC\'D";
+  strtolower(t, a2);
+  EXPECT_STREQ(t, "abc\'ABC\'d");
+
+  memset(t, 1, tListLen(t));
+  const char* a3 = "";
+  strtolower(t, a3);
+  EXPECT_STREQ(t, "");
+
+  memset(t, 1, tListLen(t));
+  const char* a4 = "\"AbcDEF\"";
+  strtolower(t, a4);
+  EXPECT_STREQ(t, a4);
+
+  memset(t, 1, tListLen(t));
+  const char* a5 = "1234\"AbcDEF\"456";
+  strtolower(t, a5);
+  EXPECT_STREQ(t, a5);
+
+  memset(t, 1, tListLen(t));
+  const char* a6 = "1234";
+  strtolower(t, a6);
+  EXPECT_STREQ(t, a6);
+}
+
+TEST(testCase, string_strnchr_test) {
+  char t[1024] = {0};
+  memset(t, 1, tListLen(t));
+
+  char a1[] = "AB.C";
+  EXPECT_TRUE(strnchr(a1, '.', strlen(a1), true) != NULL);
+
+  char a2[] = "abc.";
+  EXPECT_TRUE(strnchr(a2, '.', strlen(a2), true) != NULL);
+
+  char a8[] = "abc.";
+  EXPECT_TRUE(strnchr(a8, '.', 1, true) == NULL);
+
+  char a3[] = ".abc";
+  EXPECT_TRUE(strnchr(a3, '.', strlen(a3), true) != NULL);
+
+  char a4[] = "'.abc'";
+  EXPECT_TRUE(strnchr(a4, '.', strlen(a4), true) == NULL);
+
+  char a5[] = "'.abc.'abc";
+  EXPECT_TRUE(strnchr(a5, '.', strlen(a5), true) == NULL);
+
+  char a6[] = "0123456789.";
+  EXPECT_TRUE(strnchr(a6, '.', strlen(a6), true) != NULL);
+
+  char a7[] = "0123456789.";
+  EXPECT_TRUE(strnchr(a7, '.', 3, true) == NULL);
+
+  char a9[] = "0123456789.";
+  EXPECT_TRUE(strnchr(a9, '.', 0, true) == NULL);
+
+  char a10[] = "0123456789'.'";
+  EXPECT_TRUE(strnchr(a10, '.', strlen(a10), true) == NULL);
+}
+
+// TEST(testCase, cache_resize_test) {
+//   char a11[] = "abc'.'";
+//   EXPECT_TRUE(strnchr(a11, '.', strlen(a11), false) != NULL);
+
+//   char a12[] = "abc'-'";
+//   EXPECT_TRUE(strnchr(a12, '-', strlen(a12), false) != NULL);
+
+//   char a15[] = "abc'-'";
+//   EXPECT_TRUE(strnchr(a15, '-', strlen(a15), true) == NULL);
+
+//   char a13[] = "'-'";
+//   EXPECT_TRUE(strnchr(a13, '-', strlen(a13), false) != NULL);
+
+//   char a14[] = "'-'";
+//   EXPECT_TRUE(strnchr(a14, '-', strlen(a14), true) == NULL);
+
+//   char a16[] = "'-'.";
+//   EXPECT_TRUE(strnchr(a16, '.', strlen(a16), true) != NULL);
+// }
\ No newline at end of file
diff --git a/src/util/tests/taosbsearchTest.cpp b/src/util/tests/taosbsearchTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0b250c9ecc277506fc2ba4fd7cac49b2bf57fe7f
--- /dev/null
+++ b/src/util/tests/taosbsearchTest.cpp
@@ -0,0 +1,414 @@
+#include <gtest/gtest.h>
+
+#include "talgo.h"
+
+static int compareFunc(const void *arg1, const void *arg2) { return (*(int *)arg1) - (*(int *)arg2); }
+
+TEST(testCase, taosbsearch_equal) {
+    // For equal test
+    int   key = 3;
+    void *pRet = NULL;
+
+    pRet = taosbsearch((void *)&key, NULL, 0, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 1 element
+    int array1[1] = {5};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 5;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_NE(pRet, nullptr);
+    ASSERT_EQ(*(int *)pRet, key);
+
+    // 2 element
+    int array2[2] = {3, 6};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(*(int *)pRet, key);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 3 element
+    int array3[3] = {3, 6, 8};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_EQ);
+    ASSERT_EQ(pRet, nullptr);
+}
+
+TEST(testCase, taosbsearch_greater_or_equal) {
+    // For equal test
+    int   key = 3;
+    void *pRet = NULL;
+
+    pRet = taosbsearch((void *)&key, NULL, 0, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 1 element
+    int array1[1] = {5};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 5);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 5;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_GE);
+    ASSERT_NE(pRet, nullptr);
+    ASSERT_EQ(*(int *)pRet, 5);
+
+    // 2 element
+    int array2[2] = {3, 6};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 3 element
+    int array3[3] = {3, 6, 8};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 4 element
+    int array4[4] = {3, 6, 8, 11};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 11;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 13;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 5 element
+    int array5[5] = {3, 6, 8, 11, 15};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 11;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 13;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 15);
+
+    key = 15;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(*(int *)pRet, 15);
+
+    key = 17;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_GE);
+    ASSERT_EQ(pRet, nullptr);
+}
+
+TEST(testCase, taosbsearch_less_or_equal) {
+    // For equal test
+    int   key = 3;
+    void *pRet = NULL;
+
+    pRet = taosbsearch((void *)&key, NULL, 0, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    // 1 element
+    int array1[1] = {5};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 5);
+
+    key = 5;
+    pRet = taosbsearch((void *)&key, (void *)array1, 1, sizeof(int), compareFunc, TD_LE);
+    ASSERT_NE(pRet, nullptr);
+    ASSERT_EQ(*(int *)pRet, 5);
+
+    // 2 element
+    int array2[2] = {3, 6};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array2, 2, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    // 3 element
+    int array3[3] = {3, 6, 8};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array3, 3, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    // 4 element
+    int array4[4] = {3, 6, 8, 11};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 11;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 13;
+    pRet = taosbsearch((void *)&key, (void *)array4, 4, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    // 5 element
+    int array5[5] = {3, 6, 8, 11, 15};
+
+    key = 1;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(pRet, nullptr);
+
+    key = 3;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 4;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 3);
+
+    key = 6;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 7;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 6);
+
+    key = 8;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 9;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 8);
+
+    key = 11;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 13;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 11);
+
+    key = 15;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 15);
+
+    key = 17;
+    pRet = taosbsearch((void *)&key, (void *)array5, 5, sizeof(int), compareFunc, TD_LE);
+    ASSERT_EQ(*(int *)pRet, 15);
+}
\ No newline at end of file
diff --git a/src/vnode/CMakeLists.txt b/src/vnode/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..09cfa632fbfaaa77b32c09b49f051c0714b33564
--- /dev/null
+++ b/src/vnode/CMakeLists.txt
@@ -0,0 +1,14 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
+INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(vnode ${SRC})
+  TARGET_LINK_LIBRARIES(vnode tsdb tcq)
+ENDIF ()
diff --git a/src/vnode/inc/vnodeInt.h b/src/vnode/inc/vnodeInt.h
new file mode 100644
index 0000000000000000000000000000000000000000..38f7c8e6056644591993027b410283b41fb8560c
--- /dev/null
+++ b/src/vnode/inc/vnodeInt.h
@@ -0,0 +1,72 @@
+/*
+ * 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_VNODE_INT_H
+#define TDENGINE_VNODE_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tlog.h"
+#include "tsync.h"
+#include "twal.h"
+#include "tcq.h"
+
+extern int32_t vDebugFlag;
+
+#define vFatal(...) { if (vDebugFlag & DEBUG_FATAL) { taosPrintLog("VND FATAL ", 255, __VA_ARGS__); }}
+#define vError(...) { if (vDebugFlag & DEBUG_ERROR) { taosPrintLog("VND ERROR ", 255, __VA_ARGS__); }}
+#define vWarn(...)  { if (vDebugFlag & DEBUG_WARN)  { taosPrintLog("VND WARN ", 255, __VA_ARGS__); }}
+#define vInfo(...)  { if (vDebugFlag & DEBUG_INFO)  { taosPrintLog("VND ", 255, __VA_ARGS__); }}
+#define vDebug(...) { if (vDebugFlag & DEBUG_DEBUG) { taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }}
+#define vTrace(...) { if (vDebugFlag & DEBUG_TRACE) { taosPrintLog("VND ", vDebugFlag, __VA_ARGS__); }}
+
+typedef struct {
+  int32_t      vgId;      // global vnode group ID
+  int32_t      refCount;  // reference count
+  int32_t      delay;
+  int8_t       status; 
+  int8_t       role;   
+  int8_t       accessState;
+  int64_t      version;   // current version 
+  int64_t      fversion;  // version on saved data file
+  void        *wqueue;
+  void        *rqueue;
+  void        *wal;
+  void        *tsdb;
+  void        *sync;
+  void        *events;
+  void        *cq;  // continuous query
+  int32_t      cfgVersion;
+  STsdbCfg     tsdbCfg;
+  SSyncCfg     syncCfg;
+  SWalCfg      walCfg;
+  void        *qMgmt;
+  char        *rootDir;
+  tsem_t       sem;
+  int8_t       dropped;
+  char         db[TSDB_DB_NAME_LEN];
+} SVnodeObj;
+
+int  vnodeWriteToQueue(void *param, void *pHead, int type);
+void vnodeInitWriteFp(void);
+void vnodeInitReadFp(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..d89c383d6a4147ae6a2501fca0c73481f1a437f0
--- /dev/null
+++ b/src/vnode/src/vnodeMain.c
@@ -0,0 +1,1004 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#include "tcache.h"
+#include "cJSON.h"
+#include "dnode.h"
+#include "hash.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tglobal.h"
+#include "trpc.h"
+#include "tsdb.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "vnode.h"
+#include "vnodeInt.h"
+#include "query.h"
+#include "dnode.h"
+
+#define TSDB_VNODE_VERSION_CONTENT_LEN 31
+
+static SHashObj*tsDnodeVnodesHash;
+static void     vnodeCleanUp(SVnodeObj *pVnode);
+static int32_t  vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg);
+static int32_t  vnodeReadCfg(SVnodeObj *pVnode);
+static int32_t  vnodeSaveVersion(SVnodeObj *pVnode);
+static int32_t  vnodeReadVersion(SVnodeObj *pVnode);
+static int      vnodeProcessTsdbStatus(void *arg, int status);
+static uint32_t vnodeGetFileInfo(void *ahandle, char *name, uint32_t *index, uint32_t eindex, int64_t *size, uint64_t *fversion);
+static int      vnodeGetWalInfo(void *ahandle, char *name, uint32_t *index);
+static void     vnodeNotifyRole(void *ahandle, int8_t role);
+static void     vnodeCtrlFlow(void *handle, int32_t mseconds); 
+static int      vnodeNotifyFileSynced(void *ahandle, uint64_t fversion);
+
+#ifndef _SYNC
+tsync_h syncStart(const SSyncInfo *info) { return NULL; }
+int32_t syncForwardToPeer(tsync_h shandle, void *pHead, void *mhandle, int qtype) { return 0; }
+void    syncStop(tsync_h shandle) {}
+int32_t syncReconfig(tsync_h shandle, const SSyncCfg * cfg) { return 0; }
+int     syncGetNodesRole(tsync_h shandle, SNodesRole * cfg) { return 0; }
+void    syncConfirmForward(tsync_h shandle, uint64_t version, int32_t code) {}
+#endif
+
+int32_t vnodeInitResources() {
+  int code = syncInit();
+  if (code != 0) return code;
+
+  vnodeInitWriteFp();
+  vnodeInitReadFp();
+
+  tsDnodeVnodesHash = taosHashInit(TSDB_MIN_VNODES, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, true);
+  if (tsDnodeVnodesHash == NULL) {
+    vError("failed to init vnode list");
+    return TSDB_CODE_VND_OUT_OF_MEMORY;
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void vnodeCleanupResources() {
+  if (tsDnodeVnodesHash != NULL) {
+    taosHashCleanup(tsDnodeVnodesHash);
+    tsDnodeVnodesHash = NULL;
+  }
+
+  syncCleanUp();
+}
+
+int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) {
+  int32_t code;
+
+  SVnodeObj *pTemp = (SVnodeObj *)taosHashGet(tsDnodeVnodesHash, (const char *)&pVnodeCfg->cfg.vgId, sizeof(int32_t));
+  if (pTemp != NULL) {
+    vInfo("vgId:%d, vnode already exist, pVnode:%p", pVnodeCfg->cfg.vgId, pTemp);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (mkdir(tsVnodeDir, 0755) != 0 && errno != EEXIST) {
+    vError("vgId:%d, failed to create vnode, reason:%s dir:%s", pVnodeCfg->cfg.vgId, strerror(errno), tsVnodeDir);
+    if (errno == EACCES) {
+      return TSDB_CODE_VND_NO_DISK_PERMISSIONS;
+    } else if (errno == ENOSPC) {
+      return TSDB_CODE_VND_NO_DISKSPACE;
+    } else if (errno == ENOENT) {
+      return TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR;
+    } else {
+      return TSDB_CODE_VND_INIT_FAILED;
+    }
+  }
+
+  char rootDir[TSDB_FILENAME_LEN] = {0};
+  sprintf(rootDir, "%s/vnode%d", tsVnodeDir, pVnodeCfg->cfg.vgId);
+  if (mkdir(rootDir, 0755) != 0 && errno != EEXIST) {
+    vError("vgId:%d, failed to create vnode, reason:%s dir:%s", pVnodeCfg->cfg.vgId, strerror(errno), rootDir);
+    if (errno == EACCES) {
+      return TSDB_CODE_VND_NO_DISK_PERMISSIONS;
+    } else if (errno == ENOSPC) {
+      return TSDB_CODE_VND_NO_DISKSPACE;
+    } else if (errno == ENOENT) {
+      return TSDB_CODE_VND_NO_SUCH_FILE_OR_DIR;
+    } else {
+      return TSDB_CODE_VND_INIT_FAILED;
+    }
+  }
+
+  code = vnodeSaveCfg(pVnodeCfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    vError("vgId:%d, failed to save vnode cfg, reason:%s", pVnodeCfg->cfg.vgId, tstrerror(code));
+    return code;
+  }
+
+  STsdbCfg tsdbCfg = {0};
+  tsdbCfg.tsdbId              = pVnodeCfg->cfg.vgId;
+  tsdbCfg.cacheBlockSize      = pVnodeCfg->cfg.cacheBlockSize;
+  tsdbCfg.totalBlocks         = pVnodeCfg->cfg.totalBlocks;
+  // tsdbCfg.maxTables           = pVnodeCfg->cfg.maxTables;
+  tsdbCfg.daysPerFile         = pVnodeCfg->cfg.daysPerFile;
+  tsdbCfg.keep                = pVnodeCfg->cfg.daysToKeep;
+  tsdbCfg.minRowsPerFileBlock = pVnodeCfg->cfg.minRowsPerFileBlock;
+  tsdbCfg.maxRowsPerFileBlock = pVnodeCfg->cfg.maxRowsPerFileBlock;
+  tsdbCfg.precision           = pVnodeCfg->cfg.precision;
+  tsdbCfg.compression         = pVnodeCfg->cfg.compression;
+
+  char tsdbDir[TSDB_FILENAME_LEN] = {0};
+  sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId);
+  if (tsdbCreateRepo(tsdbDir, &tsdbCfg) < 0) {
+    vError("vgId:%d, failed to create tsdb in vnode, reason:%s", pVnodeCfg->cfg.vgId, tstrerror(terrno));
+    return TSDB_CODE_VND_INIT_FAILED;
+  }
+
+  vInfo("vgId:%d, vnode is created, walLevel:%d fsyncPeriod:%d", pVnodeCfg->cfg.vgId, pVnodeCfg->cfg.walLevel, pVnodeCfg->cfg.fsyncPeriod);
+  code = vnodeOpen(pVnodeCfg->cfg.vgId, rootDir);
+
+  return code;
+}
+
+int32_t vnodeDrop(int32_t vgId) {
+  SVnodeObj **ppVnode = (SVnodeObj **)taosHashGet(tsDnodeVnodesHash, (const char *)&vgId, sizeof(int32_t));
+  if (ppVnode == NULL || *ppVnode == NULL) {
+    vDebug("vgId:%d, failed to drop, vgId not find", vgId);
+    return TSDB_CODE_VND_INVALID_VGROUP_ID;
+  }
+
+  SVnodeObj *pVnode = *ppVnode;
+  vTrace("vgId:%d, vnode will be dropped, refCount:%d", pVnode->vgId, pVnode->refCount);
+  pVnode->dropped = 1;
+  vnodeCleanUp(pVnode);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t vnodeAlter(void *param, SMDCreateVnodeMsg *pVnodeCfg) {
+  SVnodeObj *pVnode = param;
+
+  // vnode in non-ready state and still needs to return success instead of TSDB_CODE_VND_INVALID_STATUS
+  // cfgVersion can be corrected by status msg
+  if (atomic_val_compare_exchange_8(&pVnode->status, TAOS_VN_STATUS_READY, TAOS_VN_STATUS_UPDATING) != TAOS_VN_STATUS_READY) {
+    vDebug("vgId:%d, vnode is not ready, do alter operation later", pVnode->vgId);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  int32_t code = vnodeSaveCfg(pVnodeCfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    pVnode->status = TAOS_VN_STATUS_READY;
+    return code; 
+  }
+
+  code = vnodeReadCfg(pVnode);
+  if (code != TSDB_CODE_SUCCESS) {
+    pVnode->status = TAOS_VN_STATUS_READY;
+    return code; 
+  }
+
+  code = walAlter(pVnode->wal, &pVnode->walCfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    pVnode->status = TAOS_VN_STATUS_READY;
+    return code;
+  }
+
+  code = syncReconfig(pVnode->sync, &pVnode->syncCfg);
+  if (code != TSDB_CODE_SUCCESS) {
+    pVnode->status = TAOS_VN_STATUS_READY;
+    return code; 
+  } 
+
+  if (pVnode->tsdb) {
+    code = tsdbConfigRepo(pVnode->tsdb, &pVnode->tsdbCfg);
+    if (code != TSDB_CODE_SUCCESS) {
+      pVnode->status = TAOS_VN_STATUS_READY;
+      return code; 
+    }
+  }
+
+  pVnode->status = TAOS_VN_STATUS_READY;
+  vDebug("vgId:%d, vnode is altered", pVnode->vgId);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t vnodeOpen(int32_t vnode, char *rootDir) {
+  char temp[TSDB_FILENAME_LEN];
+
+  SVnodeObj *pVnode = calloc(sizeof(SVnodeObj), 1);
+  if (pVnode == NULL) {
+    vError("vgId:%d, failed to open vnode since no enough memory", vnode);
+    return TAOS_SYSTEM_ERROR(errno);
+  }
+
+  atomic_add_fetch_32(&pVnode->refCount, 1);
+
+  pVnode->vgId     = vnode;
+  pVnode->status   = TAOS_VN_STATUS_INIT;
+  pVnode->version  = 0;  
+  pVnode->tsdbCfg.tsdbId = pVnode->vgId;
+  pVnode->rootDir = strdup(rootDir);
+  pVnode->accessState = TSDB_VN_ALL_ACCCESS;
+  tsem_init(&pVnode->sem, 0, 0);
+
+  int32_t code = vnodeReadCfg(pVnode);
+  if (code != TSDB_CODE_SUCCESS) {
+    vnodeCleanUp(pVnode);
+    return code;
+  } 
+
+  code = vnodeReadVersion(pVnode);
+  if (code != TSDB_CODE_SUCCESS) {
+    vnodeCleanUp(pVnode);
+    return code;
+  }
+
+  pVnode->fversion = pVnode->version;
+  
+  pVnode->wqueue = dnodeAllocateVnodeWqueue(pVnode);
+  pVnode->rqueue = dnodeAllocateVnodeRqueue(pVnode);
+  if (pVnode->wqueue == NULL || pVnode->rqueue == NULL) {
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+
+  SCqCfg cqCfg = {0};
+  sprintf(cqCfg.user, "_root");
+  strcpy(cqCfg.pass, tsInternalPass);
+  strcpy(cqCfg.db, pVnode->db);
+  cqCfg.vgId = vnode;
+  cqCfg.cqWrite = vnodeWriteToQueue;
+  pVnode->cq = cqOpen(pVnode, &cqCfg);
+  if (pVnode->cq == NULL) {
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+
+  STsdbAppH appH = {0};
+  appH.appH = (void *)pVnode;
+  appH.notifyStatus = vnodeProcessTsdbStatus;
+  appH.cqH = pVnode->cq;
+  appH.cqCreateFunc = cqCreate;
+  appH.cqDropFunc = cqDrop;
+  sprintf(temp, "%s/tsdb", rootDir);
+
+  terrno = 0;
+  pVnode->tsdb = tsdbOpenRepo(temp, &appH);
+  if (pVnode->tsdb == NULL) {
+    vnodeCleanUp(pVnode);
+    return terrno;
+  } else if (terrno != TSDB_CODE_SUCCESS && pVnode->syncCfg.replica <= 1) {
+    vError("vgId:%d, failed to open tsdb, replica:%d reason:%s", pVnode->vgId, pVnode->syncCfg.replica,
+           tstrerror(terrno));
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+
+  sprintf(temp, "%s/wal", rootDir);
+  pVnode->wal = walOpen(temp, &pVnode->walCfg);
+  if (pVnode->wal == NULL) { 
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+
+  walRestore(pVnode->wal, pVnode, vnodeWriteToQueue);
+
+  SSyncInfo syncInfo;
+  syncInfo.vgId = pVnode->vgId;
+  syncInfo.version = pVnode->version;
+  syncInfo.syncCfg = pVnode->syncCfg;
+  sprintf(syncInfo.path, "%s", rootDir);
+  syncInfo.ahandle = pVnode;
+  syncInfo.getWalInfo = vnodeGetWalInfo;
+  syncInfo.getFileInfo = vnodeGetFileInfo;
+  syncInfo.writeToCache = vnodeWriteToQueue;
+  syncInfo.confirmForward = dnodeSendRpcVnodeWriteRsp; 
+  syncInfo.notifyRole = vnodeNotifyRole;
+  syncInfo.notifyFlowCtrl = vnodeCtrlFlow;
+  syncInfo.notifyFileSynced = vnodeNotifyFileSynced;
+  pVnode->sync = syncStart(&syncInfo);
+
+#ifndef _SYNC
+  pVnode->role = TAOS_SYNC_ROLE_MASTER;
+#else
+  if (pVnode->sync == NULL) {
+    vError("vgId:%d, failed to open sync module, replica:%d reason:%s", pVnode->vgId, pVnode->syncCfg.replica,
+           tstrerror(terrno));
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+#endif  
+
+  pVnode->qMgmt = qOpenQueryMgmt(pVnode->vgId);
+  if (pVnode->qMgmt == NULL) {
+    vnodeCleanUp(pVnode);
+    return terrno;
+  }
+
+  pVnode->events = NULL;
+  pVnode->status = TAOS_VN_STATUS_READY;
+  vDebug("vgId:%d, vnode is opened in %s, pVnode:%p", pVnode->vgId, rootDir, pVnode);
+
+  taosHashPut(tsDnodeVnodesHash, (const char *)&pVnode->vgId, sizeof(int32_t), (char *)(&pVnode), sizeof(SVnodeObj *));
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t vnodeClose(int32_t vgId) {
+  SVnodeObj **ppVnode = (SVnodeObj **)taosHashGet(tsDnodeVnodesHash, (const char *)&vgId, sizeof(int32_t));
+  if (ppVnode == NULL || *ppVnode == NULL) return 0;
+
+  SVnodeObj *pVnode = *ppVnode;
+  vDebug("vgId:%d, vnode will be closed", pVnode->vgId);
+  vnodeCleanUp(pVnode);
+
+  return 0;
+}
+
+void vnodeRelease(void *pVnodeRaw) {
+  SVnodeObj *pVnode = pVnodeRaw;
+  int32_t    vgId = pVnode->vgId;
+
+  int32_t refCount = atomic_sub_fetch_32(&pVnode->refCount, 1);
+  assert(refCount >= 0);
+
+  if (refCount > 0) {
+    vDebug("vgId:%d, release vnode, refCount:%d", vgId, refCount);
+    if (pVnode->status == TAOS_VN_STATUS_RESET && refCount == 2) 
+      tsem_post(&pVnode->sem);
+    return;
+  }
+
+  qCleanupQueryMgmt(pVnode->qMgmt);
+  pVnode->qMgmt = NULL;
+
+  if (pVnode->tsdb)
+    tsdbCloseRepo(pVnode->tsdb, 1);
+  pVnode->tsdb = NULL;
+
+  // stop continuous query
+  if (pVnode->cq) {
+    void *cq = pVnode->cq;
+    pVnode->cq = NULL;
+    cqClose(cq);
+  }
+
+  if (pVnode->wal) 
+    walClose(pVnode->wal);
+  pVnode->wal = NULL;
+
+  if (pVnode->wqueue) 
+    dnodeFreeVnodeWqueue(pVnode->wqueue);
+  pVnode->wqueue = NULL;
+
+  if (pVnode->rqueue) 
+    dnodeFreeVnodeRqueue(pVnode->rqueue);
+  pVnode->rqueue = NULL;
+ 
+  taosTFree(pVnode->rootDir);
+
+  if (pVnode->dropped) {
+    char rootDir[TSDB_FILENAME_LEN] = {0};    
+    char newDir[TSDB_FILENAME_LEN] = {0};
+    sprintf(rootDir, "%s/vnode%d", tsVnodeDir, vgId);
+    sprintf(newDir, "%s/vnode%d", tsVnodeBakDir, vgId);
+
+    if (0 == tsEnableVnodeBak) {
+      vInfo("vgId:%d, vnode backup not enabled", pVnode->vgId);
+    } else {
+      taosRemoveDir(newDir);
+      taosRename(rootDir, newDir);
+    }
+
+    taosRemoveDir(rootDir);
+    dnodeSendStatusMsgToMnode();
+  }
+
+  tsem_destroy(&pVnode->sem);
+  free(pVnode);
+
+  int32_t count = taosHashGetSize(tsDnodeVnodesHash);
+  vDebug("vgId:%d, vnode is released, vnodes:%d", vgId, count);
+}
+
+void *vnodeAcquire(int32_t vgId) {
+  SVnodeObj **ppVnode = (SVnodeObj **)taosHashGet(tsDnodeVnodesHash, (const char *)&vgId, sizeof(int32_t));
+  if (ppVnode == NULL || *ppVnode == NULL) {
+    terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
+    vInfo("vgId:%d, not exist", vgId);
+    return NULL;
+  }
+
+  SVnodeObj *pVnode = *ppVnode;
+  atomic_add_fetch_32(&pVnode->refCount, 1);
+  vDebug("vgId:%d, get vnode, refCount:%d", pVnode->vgId, pVnode->refCount);
+
+  return pVnode;
+}
+
+void *vnodeAcquireRqueue(int32_t vgId) {
+  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  if (pVnode == NULL) return NULL;
+
+  if (pVnode->status == TAOS_VN_STATUS_RESET) {           
+    terrno = TSDB_CODE_APP_NOT_READY;
+    vInfo("vgId:%d, status is in reset", vgId);
+    vnodeRelease(pVnode);
+    return NULL;
+  }
+
+  return pVnode->rqueue;
+}
+
+void *vnodeAcquireWqueue(int32_t vgId) {
+  SVnodeObj *pVnode = vnodeAcquire(vgId);
+  if (pVnode == NULL) return NULL;
+
+  if (pVnode->status == TAOS_VN_STATUS_RESET) {           
+    terrno = TSDB_CODE_APP_NOT_READY;
+    vInfo("vgId:%d, status is in reset", vgId);
+    vnodeRelease(pVnode);
+    return NULL;
+  }
+  
+  return pVnode->wqueue;
+}
+
+void *vnodeGetWal(void *pVnode) {
+  return ((SVnodeObj *)pVnode)->wal;
+}
+
+static void vnodeBuildVloadMsg(SVnodeObj *pVnode, SDMStatusMsg *pStatus) {
+  int64_t totalStorage = 0;
+  int64_t compStorage = 0;
+  int64_t pointsWritten = 0;
+
+  if (pVnode->status != TAOS_VN_STATUS_READY) return;
+  if (pStatus->openVnodes >= TSDB_MAX_VNODES) return;
+
+  if (pVnode->tsdb) {
+    tsdbReportStat(pVnode->tsdb, &pointsWritten, &totalStorage, &compStorage);
+  }
+
+  SVnodeLoad *pLoad = &pStatus->load[pStatus->openVnodes++];
+  pLoad->vgId = htonl(pVnode->vgId);
+  pLoad->cfgVersion = htonl(pVnode->cfgVersion);
+  pLoad->totalStorage = htobe64(totalStorage);
+  pLoad->compStorage = htobe64(compStorage);
+  pLoad->pointsWritten = htobe64(pointsWritten);
+  pLoad->status = pVnode->status;
+  pLoad->role = pVnode->role;
+  pLoad->replica = pVnode->syncCfg.replica;  
+}
+
+int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes) {
+  SHashMutableIterator *pIter = taosHashCreateIter(tsDnodeVnodesHash);
+  while (taosHashIterNext(pIter)) {
+    SVnodeObj **pVnode = taosHashIterGet(pIter);
+    if (pVnode == NULL) continue;
+    if (*pVnode == NULL) continue;
+
+    (*numOfVnodes)++;
+    if (*numOfVnodes >= TSDB_MAX_VNODES) {
+      vError("vgId:%d, too many open vnodes, exist:%d max:%d", (*pVnode)->vgId, *numOfVnodes, TSDB_MAX_VNODES);
+      continue;
+    } else {
+      vnodeList[*numOfVnodes - 1] = (*pVnode)->vgId;
+    }
+  }
+
+  taosHashDestroyIter(pIter);
+  return TSDB_CODE_SUCCESS;
+}
+
+void vnodeBuildStatusMsg(void *param) {
+  SDMStatusMsg *pStatus = param;
+  SHashMutableIterator *pIter = taosHashCreateIter(tsDnodeVnodesHash);
+
+  while (taosHashIterNext(pIter)) {
+    SVnodeObj **pVnode = taosHashIterGet(pIter);
+    if (pVnode == NULL) continue;
+    if (*pVnode == NULL) continue;
+
+    vnodeBuildVloadMsg(*pVnode, pStatus);
+  }
+
+  taosHashDestroyIter(pIter);
+}
+
+void vnodeSetAccess(SDMVgroupAccess *pAccess, int32_t numOfVnodes) {
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    pAccess[i].vgId = htonl(pAccess[i].vgId);
+    SVnodeObj *pVnode = vnodeAcquire(pAccess[i].vgId);
+    if (pVnode != NULL) {
+      pVnode->accessState = pAccess[i].accessState;
+      if (pVnode->accessState != TSDB_VN_ALL_ACCCESS) {
+        vDebug("vgId:%d, access state is set to %d", pAccess[i].vgId, pVnode->accessState)
+      }
+      vnodeRelease(pVnode);
+    }
+  }
+}
+
+static void vnodeCleanUp(SVnodeObj *pVnode) {
+  // remove from hash, so new messages wont be consumed
+  taosHashRemove(tsDnodeVnodesHash, (const char *)&pVnode->vgId, sizeof(int32_t));
+  int i = 0;
+
+  if (pVnode->status != TAOS_VN_STATUS_INIT) {
+    // it may be in updateing or reset state, then it shall wait
+    while (atomic_val_compare_exchange_8(&pVnode->status, TAOS_VN_STATUS_READY, TAOS_VN_STATUS_CLOSING) != TAOS_VN_STATUS_READY) {
+      if (++i % 1000 == 0) {
+        sched_yield();
+      }
+    }
+  }
+
+  // stop replication module
+  if (pVnode->sync) {
+    void *sync = pVnode->sync;
+    pVnode->sync = NULL;
+    syncStop(sync);
+  }
+
+  vTrace("vgId:%d, vnode will cleanup, refCount:%d", pVnode->vgId, pVnode->refCount);
+
+  // release local resources only after cutting off outside connections
+  qQueryMgmtNotifyClosed(pVnode->qMgmt);
+  vnodeRelease(pVnode);
+}
+
+// TODO: this is a simple implement
+static int vnodeProcessTsdbStatus(void *arg, int status) {
+  SVnodeObj *pVnode = arg;
+
+  if (status == TSDB_STATUS_COMMIT_START) {
+    pVnode->fversion = pVnode->version; 
+    return walRenew(pVnode->wal);
+  }
+
+  if (status == TSDB_STATUS_COMMIT_OVER)
+    return vnodeSaveVersion(pVnode);
+
+  return 0; 
+}
+
+static uint32_t vnodeGetFileInfo(void *ahandle, char *name, uint32_t *index, uint32_t eindex, int64_t *size, uint64_t *fversion) {
+  SVnodeObj *pVnode = ahandle;
+  *fversion = pVnode->fversion;
+  return tsdbGetFileInfo(pVnode->tsdb, name, index, eindex, size);
+}
+
+static int vnodeGetWalInfo(void *ahandle, char *name, uint32_t *index) {
+  SVnodeObj *pVnode = ahandle;
+  return walGetWalFile(pVnode->wal, name, index);
+}
+
+static void vnodeNotifyRole(void *ahandle, int8_t role) {
+  SVnodeObj *pVnode = ahandle;
+  vInfo("vgId:%d, sync role changed from %s to %s", pVnode->vgId, syncRole[pVnode->role], syncRole[role]);
+  pVnode->role = role;
+  dnodeSendStatusMsgToMnode();
+
+  if (pVnode->role == TAOS_SYNC_ROLE_MASTER)
+    cqStart(pVnode->cq);
+  else
+    cqStop(pVnode->cq);
+}
+
+static void vnodeCtrlFlow(void *ahandle, int32_t mseconds) {
+  SVnodeObj *pVnode = ahandle;
+  if (pVnode->delay != mseconds) 
+    vInfo("vgId:%d, sync flow control, mseconds:%d", pVnode->vgId, mseconds);
+  pVnode->delay = mseconds;
+}
+
+static int vnodeResetTsdb(SVnodeObj *pVnode)
+{
+  char rootDir[128] = "\0";
+  sprintf(rootDir, "%s/tsdb", pVnode->rootDir);
+
+  if (atomic_val_compare_exchange_8(&pVnode->status, TAOS_VN_STATUS_READY, TAOS_VN_STATUS_RESET) != TAOS_VN_STATUS_READY)
+    return -1;
+
+  void *tsdb = pVnode->tsdb;
+  pVnode->tsdb = NULL;
+
+  // acquire vnode
+  int32_t refCount = atomic_add_fetch_32(&pVnode->refCount, 1); 
+
+  if (refCount > 2) 
+    tsem_wait(&pVnode->sem);
+
+  // close tsdb, then open tsdb
+  tsdbCloseRepo(tsdb, 0);
+  STsdbAppH appH = {0};
+  appH.appH = (void *)pVnode;
+  appH.notifyStatus = vnodeProcessTsdbStatus;
+  appH.cqH = pVnode->cq;
+  appH.cqCreateFunc = cqCreate;
+  appH.cqDropFunc = cqDrop;
+  pVnode->tsdb = tsdbOpenRepo(rootDir, &appH);
+
+  pVnode->status = TAOS_VN_STATUS_READY;
+  vnodeRelease(pVnode);  
+
+  return 0;
+}
+
+static int vnodeNotifyFileSynced(void *ahandle, uint64_t fversion) {
+  SVnodeObj *pVnode = ahandle;
+  vDebug("vgId:%d, data file is synced, fversion:%" PRId64, pVnode->vgId, fversion);
+
+  pVnode->fversion = fversion;
+  pVnode->version = fversion;
+  vnodeSaveVersion(pVnode);
+
+  return vnodeResetTsdb(pVnode);
+}
+
+static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
+  char cfgFile[TSDB_FILENAME_LEN + 30] = {0};
+  sprintf(cfgFile, "%s/vnode%d/config.json", tsVnodeDir, pVnodeCfg->cfg.vgId);
+  FILE *fp = fopen(cfgFile, "w");
+  if (!fp) {
+    vError("vgId:%d, failed to open vnode cfg file for write, file:%s error:%s", pVnodeCfg->cfg.vgId, cfgFile,
+           strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return terrno;
+  }
+
+  int32_t len = 0;
+  int32_t maxLen = 1000;
+  char *  content = calloc(1, maxLen + 1);
+  if (content == NULL) {
+    fclose(fp);
+    return TSDB_CODE_VND_OUT_OF_MEMORY;
+  }
+
+  len += snprintf(content + len, maxLen - len, "{\n");
+  len += snprintf(content + len, maxLen - len, "  \"db\": \"%s\",\n", pVnodeCfg->db);
+  len += snprintf(content + len, maxLen - len, "  \"cfgVersion\": %d,\n", pVnodeCfg->cfg.cfgVersion);
+  len += snprintf(content + len, maxLen - len, "  \"cacheBlockSize\": %d,\n", pVnodeCfg->cfg.cacheBlockSize);
+  len += snprintf(content + len, maxLen - len, "  \"totalBlocks\": %d,\n", pVnodeCfg->cfg.totalBlocks);
+  // len += snprintf(content + len, maxLen - len, "  \"maxTables\": %d,\n", pVnodeCfg->cfg.maxTables);
+  len += snprintf(content + len, maxLen - len, "  \"daysPerFile\": %d,\n", pVnodeCfg->cfg.daysPerFile);
+  len += snprintf(content + len, maxLen - len, "  \"daysToKeep\": %d,\n", pVnodeCfg->cfg.daysToKeep);
+  len += snprintf(content + len, maxLen - len, "  \"daysToKeep1\": %d,\n", pVnodeCfg->cfg.daysToKeep1);
+  len += snprintf(content + len, maxLen - len, "  \"daysToKeep2\": %d,\n", pVnodeCfg->cfg.daysToKeep2);
+  len += snprintf(content + len, maxLen - len, "  \"minRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.minRowsPerFileBlock);
+  len += snprintf(content + len, maxLen - len, "  \"maxRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.maxRowsPerFileBlock);
+  // len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);
+  len += snprintf(content + len, maxLen - len, "  \"precision\": %d,\n", pVnodeCfg->cfg.precision);
+  len += snprintf(content + len, maxLen - len, "  \"compression\": %d,\n", pVnodeCfg->cfg.compression);
+  len += snprintf(content + len, maxLen - len, "  \"walLevel\": %d,\n", pVnodeCfg->cfg.walLevel);
+  len += snprintf(content + len, maxLen - len, "  \"fsync\": %d,\n", pVnodeCfg->cfg.fsyncPeriod);
+  len += snprintf(content + len, maxLen - len, "  \"replica\": %d,\n", pVnodeCfg->cfg.replications);
+  len += snprintf(content + len, maxLen - len, "  \"wals\": %d,\n", pVnodeCfg->cfg.wals);
+  len += snprintf(content + len, maxLen - len, "  \"quorum\": %d,\n", pVnodeCfg->cfg.quorum);
+
+  len += snprintf(content + len, maxLen - len, "  \"nodeInfos\": [{\n");
+
+  vInfo("vgId:%d, save vnode cfg, replica:%d", pVnodeCfg->cfg.vgId, pVnodeCfg->cfg.replications);
+  for (int32_t i = 0; i < pVnodeCfg->cfg.replications; i++) {
+    len += snprintf(content + len, maxLen - len, "    \"nodeId\": %d,\n", pVnodeCfg->nodes[i].nodeId);
+    len += snprintf(content + len, maxLen - len, "    \"nodeEp\": \"%s\"\n", pVnodeCfg->nodes[i].nodeEp);
+    vInfo("vgId:%d, save vnode cfg, nodeId:%d nodeEp:%s", pVnodeCfg->cfg.vgId, pVnodeCfg->nodes[i].nodeId,
+          pVnodeCfg->nodes[i].nodeEp);
+
+    if (i < pVnodeCfg->cfg.replications - 1) {
+      len += snprintf(content + len, maxLen - len, "  },{\n");
+    } else {
+      len += snprintf(content + len, maxLen - len, "  }]\n");
+    }
+  }
+  len += snprintf(content + len, maxLen - len, "}\n");
+
+  fwrite(content, 1, len, fp);
+  fflush(fp);
+  fclose(fp);
+  free(content);
+
+  vInfo("vgId:%d, save vnode cfg successed", pVnodeCfg->cfg.vgId);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
+  cJSON  *root = NULL;
+  char   *content = NULL;
+  char    cfgFile[TSDB_FILENAME_LEN + 30] = {0};
+  int     maxLen = 1000;
+
+  terrno = TSDB_CODE_VND_APP_ERROR;
+  sprintf(cfgFile, "%s/vnode%d/config.json", tsVnodeDir, pVnode->vgId);
+  FILE *fp = fopen(cfgFile, "r");
+  if (!fp) {
+    vError("vgId:%d, failed to open vnode cfg file:%s to read, error:%s", pVnode->vgId,
+           cfgFile, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto PARSE_OVER;
+  }
+
+  content = calloc(1, maxLen + 1);
+  if (content == NULL) goto PARSE_OVER;
+  int len = fread(content, 1, maxLen, fp);
+  if (len <= 0) {
+    vError("vgId:%d, failed to read vnode cfg, content is null", pVnode->vgId);
+    free(content);
+    fclose(fp);
+    return errno;
+  }
+
+  root = cJSON_Parse(content);
+  if (root == NULL) {
+    vError("vgId:%d, failed to read vnode cfg, invalid json format", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+
+  cJSON *db = cJSON_GetObjectItem(root, "db");
+  if (!db || db->type != cJSON_String || db->valuestring == NULL) {
+    vError("vgId:%d, failed to read vnode cfg, db not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  strcpy(pVnode->db, db->valuestring);
+  
+  cJSON *cfgVersion = cJSON_GetObjectItem(root, "cfgVersion");
+  if (!cfgVersion || cfgVersion->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, cfgVersion not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->cfgVersion = cfgVersion->valueint;
+
+  cJSON *cacheBlockSize = cJSON_GetObjectItem(root, "cacheBlockSize");
+  if (!cacheBlockSize || cacheBlockSize->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, cacheBlockSize not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.cacheBlockSize = cacheBlockSize->valueint;
+
+  cJSON *totalBlocks = cJSON_GetObjectItem(root, "totalBlocks");
+  if (!totalBlocks || totalBlocks->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, totalBlocks not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.totalBlocks = totalBlocks->valueint;
+
+  // cJSON *maxTables = cJSON_GetObjectItem(root, "maxTables");
+  // if (!maxTables || maxTables->type != cJSON_Number) {
+  //   vError("vgId:%d, failed to read vnode cfg, maxTables not found", pVnode->vgId);
+  //   goto PARSE_OVER;
+  // }
+  // pVnode->tsdbCfg.maxTables = maxTables->valueint;
+
+  cJSON *daysPerFile = cJSON_GetObjectItem(root, "daysPerFile");
+  if (!daysPerFile || daysPerFile->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, daysPerFile not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.daysPerFile = daysPerFile->valueint;
+
+  cJSON *daysToKeep = cJSON_GetObjectItem(root, "daysToKeep");
+  if (!daysToKeep || daysToKeep->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, daysToKeep not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.keep = daysToKeep->valueint;
+
+  cJSON *daysToKeep1 = cJSON_GetObjectItem(root, "daysToKeep1");
+  if (!daysToKeep1 || daysToKeep1->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, daysToKeep1 not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.keep1 = daysToKeep1->valueint;
+
+  cJSON *daysToKeep2 = cJSON_GetObjectItem(root, "daysToKeep2");
+  if (!daysToKeep2 || daysToKeep2->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, daysToKeep2 not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.keep2 = daysToKeep2->valueint;
+
+  cJSON *minRowsPerFileBlock = cJSON_GetObjectItem(root, "minRowsPerFileBlock");
+  if (!minRowsPerFileBlock || minRowsPerFileBlock->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, minRowsPerFileBlock not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.minRowsPerFileBlock = minRowsPerFileBlock->valueint;
+
+  cJSON *maxRowsPerFileBlock = cJSON_GetObjectItem(root, "maxRowsPerFileBlock");
+  if (!maxRowsPerFileBlock || maxRowsPerFileBlock->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, maxRowsPerFileBlock not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.maxRowsPerFileBlock = maxRowsPerFileBlock->valueint;
+
+  // cJSON *commitTime = cJSON_GetObjectItem(root, "commitTime");
+  // if (!commitTime || commitTime->type != cJSON_Number) {
+  //   vError("vgId:%d, failed to read vnode cfg, commitTime not found", pVnode->vgId);
+  //   goto PARSE_OVER;
+  // }
+  // pVnode->tsdbCfg.commitTime = (int8_t)commitTime->valueint;
+
+  cJSON *precision = cJSON_GetObjectItem(root, "precision");
+  if (!precision || precision->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, precision not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.precision = (int8_t)precision->valueint;
+
+  cJSON *compression = cJSON_GetObjectItem(root, "compression");
+  if (!compression || compression->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, compression not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->tsdbCfg.compression = (int8_t)compression->valueint;
+
+  cJSON *walLevel = cJSON_GetObjectItem(root, "walLevel");
+  if (!walLevel || walLevel->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, walLevel not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->walCfg.walLevel = (int8_t) walLevel->valueint;
+
+  cJSON *fsyncPeriod = cJSON_GetObjectItem(root, "fsync");
+  if (!walLevel || walLevel->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, fsyncPeriod not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->walCfg.fsyncPeriod = fsyncPeriod->valueint;
+
+  cJSON *wals = cJSON_GetObjectItem(root, "wals");
+  if (!wals || wals->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, wals not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->walCfg.wals = (int8_t)wals->valueint;
+  pVnode->walCfg.keep = 0;
+
+  cJSON *replica = cJSON_GetObjectItem(root, "replica");
+  if (!replica || replica->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode cfg, replica not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->syncCfg.replica = (int8_t)replica->valueint;
+
+  cJSON *quorum = cJSON_GetObjectItem(root, "quorum");
+  if (!quorum || quorum->type != cJSON_Number) {
+    vError("vgId: %d, failed to read vnode cfg, quorum not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->syncCfg.quorum = (int8_t)quorum->valueint;
+
+  cJSON *nodeInfos = cJSON_GetObjectItem(root, "nodeInfos");
+  if (!nodeInfos || nodeInfos->type != cJSON_Array) {
+    vError("vgId:%d, failed to read vnode cfg, nodeInfos not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+
+  int size = cJSON_GetArraySize(nodeInfos);
+  if (size != pVnode->syncCfg.replica) {
+    vError("vgId:%d, failed to read vnode cfg, nodeInfos size not matched", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+
+  for (int i = 0; i < size; ++i) {
+    cJSON *nodeInfo = cJSON_GetArrayItem(nodeInfos, i);
+    if (nodeInfo == NULL) continue;
+
+    cJSON *nodeId = cJSON_GetObjectItem(nodeInfo, "nodeId");
+    if (!nodeId || nodeId->type != cJSON_Number) {
+      vError("vgId:%d, failed to read vnode cfg, nodeId not found", pVnode->vgId);
+      goto PARSE_OVER;
+    }
+    pVnode->syncCfg.nodeInfo[i].nodeId = nodeId->valueint;
+
+    cJSON *nodeEp = cJSON_GetObjectItem(nodeInfo, "nodeEp");
+    if (!nodeEp || nodeEp->type != cJSON_String || nodeEp->valuestring == NULL) {
+      vError("vgId:%d, failed to read vnode cfg, nodeFqdn not found", pVnode->vgId);
+      goto PARSE_OVER;
+    }
+
+    taosGetFqdnPortFromEp(nodeEp->valuestring, pVnode->syncCfg.nodeInfo[i].nodeFqdn, &pVnode->syncCfg.nodeInfo[i].nodePort);
+    pVnode->syncCfg.nodeInfo[i].nodePort += TSDB_PORT_SYNC;
+  }
+
+  terrno = TSDB_CODE_SUCCESS;
+
+  vInfo("vgId:%d, read vnode cfg successfully, replcia:%d", pVnode->vgId, pVnode->syncCfg.replica);
+  for (int32_t i = 0; i < pVnode->syncCfg.replica; i++) {
+    vInfo("vgId:%d, dnode:%d, %s:%d", pVnode->vgId, pVnode->syncCfg.nodeInfo[i].nodeId,
+           pVnode->syncCfg.nodeInfo[i].nodeFqdn, pVnode->syncCfg.nodeInfo[i].nodePort);
+  }
+
+PARSE_OVER:
+  taosTFree(content);
+  cJSON_Delete(root);
+  if (fp) fclose(fp);
+  return terrno;
+}
+
+static int32_t vnodeSaveVersion(SVnodeObj *pVnode) {
+  char versionFile[TSDB_FILENAME_LEN + 30] = {0};
+  sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId);
+  FILE *fp = fopen(versionFile, "w");
+  if (!fp) {
+    vError("vgId:%d, failed to open vnode version file for write, file:%s error:%s", pVnode->vgId,
+           versionFile, strerror(errno));
+    return TAOS_SYSTEM_ERROR(errno); 
+  }
+
+  int32_t len = 0;
+  int32_t maxLen = 30;
+  char content[TSDB_VNODE_VERSION_CONTENT_LEN] = {0};
+
+  len += snprintf(content + len, maxLen - len, "{\n");
+  len += snprintf(content + len, maxLen - len, "  \"version\": %" PRId64 "\n", pVnode->fversion);
+  len += snprintf(content + len, maxLen - len, "}\n");
+
+  fwrite(content, 1, len, fp);
+  fclose(fp);
+
+  vInfo("vgId:%d, save vnode version:%" PRId64 " succeed", pVnode->vgId, pVnode->fversion);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t vnodeReadVersion(SVnodeObj *pVnode) {
+  char    versionFile[TSDB_FILENAME_LEN + 30] = {0};
+  char   *content = NULL;
+  cJSON  *root = NULL;
+  int     maxLen = 100;
+
+  terrno = TSDB_CODE_VND_APP_ERROR;
+  sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId);
+  FILE *fp = fopen(versionFile, "r");
+  if (!fp) {
+    if (errno != ENOENT) {
+      vError("vgId:%d, failed to open version file:%s error:%s", pVnode->vgId, versionFile, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+    } else {
+      terrno = TSDB_CODE_SUCCESS;
+    }
+    goto PARSE_OVER;
+  }
+
+  content = calloc(1, maxLen + 1);
+  int   len = fread(content, 1, maxLen, fp);
+  if (len <= 0) {
+    vError("vgId:%d, failed to read vnode version, content is null", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+
+  root = cJSON_Parse(content);
+  if (root == NULL) {
+    vError("vgId:%d, failed to read vnode version, invalid json format", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+
+  cJSON *ver = cJSON_GetObjectItem(root, "version");
+  if (!ver || ver->type != cJSON_Number) {
+    vError("vgId:%d, failed to read vnode version, version not found", pVnode->vgId);
+    goto PARSE_OVER;
+  }
+  pVnode->version = ver->valueint;
+
+  terrno = TSDB_CODE_SUCCESS;
+  vInfo("vgId:%d, read vnode version successfully, version:%" PRId64, pVnode->vgId, pVnode->version);
+
+PARSE_OVER:
+  taosTFree(content);
+  cJSON_Delete(root);
+  if(fp) fclose(fp);
+  return terrno;
+}
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
new file mode 100644
index 0000000000000000000000000000000000000000..58e97075ac3f98197a6b6e17ac135d8bf9405b66
--- /dev/null
+++ b/src/vnode/src/vnodeRead.c
@@ -0,0 +1,307 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+//#include <dnode.h>
+#include "os.h"
+
+#include "tglobal.h"
+#include "taoserror.h"
+#include "taosmsg.h"
+#include "tcache.h"
+#include "query.h"
+#include "trpc.h"
+#include "tsdb.h"
+#include "vnode.h"
+#include "vnodeInt.h"
+#include "tqueue.h"
+
+static int32_t (*vnodeProcessReadMsgFp[TSDB_MSG_TYPE_MAX])(SVnodeObj *pVnode, SReadMsg *pReadMsg);
+static int32_t  vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg);
+static int32_t  vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg);
+static int32_t  vnodeNotifyCurrentQhandle(void* handle, void* qhandle, int32_t vgId);
+
+void vnodeInitReadFp(void) {
+  vnodeProcessReadMsgFp[TSDB_MSG_TYPE_QUERY] = vnodeProcessQueryMsg;
+  vnodeProcessReadMsgFp[TSDB_MSG_TYPE_FETCH] = vnodeProcessFetchMsg;
+}
+
+int32_t vnodeProcessRead(void *param, SReadMsg *pReadMsg) {
+  SVnodeObj *pVnode = (SVnodeObj *)param;
+  int msgType = pReadMsg->rpcMsg.msgType;
+
+  if (vnodeProcessReadMsgFp[msgType] == NULL) {
+    vDebug("vgId:%d, msgType:%s not processed, no handle", pVnode->vgId, taosMsg[msgType]);
+    return TSDB_CODE_VND_MSG_NOT_PROCESSED;
+  }
+
+  if (pVnode->status != TAOS_VN_STATUS_READY) {
+    vDebug("vgId:%d, msgType:%s not processed, vnode status is %d", pVnode->vgId, taosMsg[msgType], pVnode->status);
+    return TSDB_CODE_APP_NOT_READY; 
+  }
+
+  // tsdb may be in reset state  
+  if (pVnode->tsdb == NULL) return TSDB_CODE_APP_NOT_READY;
+  if (pVnode->status == TAOS_VN_STATUS_CLOSING)
+    return TSDB_CODE_APP_NOT_READY;
+
+  // TODO: Later, let slave to support query
+  // if (pVnode->syncCfg.replica > 1 && pVnode->role != TAOS_SYNC_ROLE_MASTER) {
+  if (pVnode->role != TAOS_SYNC_ROLE_SLAVE && pVnode->role != TAOS_SYNC_ROLE_MASTER) { 
+    vDebug("vgId:%d, msgType:%s not processed, replica:%d role:%d", pVnode->vgId, taosMsg[msgType], pVnode->syncCfg.replica, pVnode->role);
+    return TSDB_CODE_APP_NOT_READY;
+  }
+
+  return (*vnodeProcessReadMsgFp[msgType])(pVnode, pReadMsg);
+}
+
+static void vnodePutItemIntoReadQueue(SVnodeObj *pVnode, void **qhandle) {
+  SReadMsg *pRead = (SReadMsg *)taosAllocateQitem(sizeof(SReadMsg));
+  pRead->rpcMsg.msgType = TSDB_MSG_TYPE_QUERY;
+  pRead->pCont = qhandle;
+  pRead->contLen = 0;
+  pRead->rpcMsg.handle = NULL;
+
+  atomic_add_fetch_32(&pVnode->refCount, 1);
+
+  vDebug("QInfo:%p add to vread queue for exec query, msg:%p", *qhandle, pRead);
+  taosWriteQitem(pVnode->rqueue, TAOS_QTYPE_QUERY, pRead);
+}
+
+static int32_t vnodeDumpQueryResult(SRspRet *pRet, void* pVnode, void** handle, bool* freeHandle) {
+  bool continueExec = false;
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  if ((code = qDumpRetrieveResult(*handle, (SRetrieveTableRsp **)&pRet->rsp, &pRet->len, &continueExec)) == TSDB_CODE_SUCCESS) {
+    if (continueExec) {
+      *freeHandle = false;
+      vnodePutItemIntoReadQueue(pVnode, handle);
+      pRet->qhandle = *handle;
+    } else {
+      *freeHandle = true;
+      vDebug("QInfo:%p exec completed, free handle:%d", *handle, *freeHandle);
+    }
+  } else {
+    SRetrieveTableRsp *pRsp = (SRetrieveTableRsp *)rpcMallocCont(sizeof(SRetrieveTableRsp));
+    memset(pRsp, 0, sizeof(SRetrieveTableRsp));
+    pRsp->completed = true;
+
+    pRet->rsp = pRsp;
+    pRet->len = sizeof(SRetrieveTableRsp);
+    *freeHandle = true;
+  }
+
+  return code;
+}
+
+static void vnodeBuildNoResultQueryRsp(SRspRet* pRet) {
+  pRet->rsp = (SRetrieveTableRsp *)rpcMallocCont(sizeof(SRetrieveTableRsp));
+  pRet->len = sizeof(SRetrieveTableRsp);
+
+  memset(pRet->rsp, 0, sizeof(SRetrieveTableRsp));
+  SRetrieveTableRsp* pRsp = pRet->rsp;
+
+  pRsp->completed = true;
+}
+
+static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
+  void    *pCont = pReadMsg->pCont;
+  int32_t  contLen = pReadMsg->contLen;
+  SRspRet *pRet = &pReadMsg->rspRet;
+
+  SQueryTableMsg* pQueryTableMsg = (SQueryTableMsg*) pCont;
+  memset(pRet, 0, sizeof(SRspRet));
+
+  // qHandle needs to be freed correctly
+  if (pReadMsg->rpcMsg.code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+    SRetrieveTableMsg* killQueryMsg = (SRetrieveTableMsg*) pReadMsg->pCont;
+    killQueryMsg->free = htons(killQueryMsg->free);
+    killQueryMsg->qhandle = htobe64(killQueryMsg->qhandle);
+
+    vWarn("QInfo:%p connection %p broken, kill query", (void*) killQueryMsg->qhandle, pReadMsg->rpcMsg.handle);
+    assert(pReadMsg->rpcMsg.contLen > 0 && killQueryMsg->free == 1);
+
+    void** qhandle = qAcquireQInfo(pVnode->qMgmt, (uint64_t) killQueryMsg->qhandle);
+    if (qhandle == NULL || *qhandle == NULL) {
+      vWarn("QInfo:%p invalid qhandle, no matched query handle, conn:%p", (void*) killQueryMsg->qhandle, pReadMsg->rpcMsg.handle);
+    } else {
+      assert(*qhandle == (void*) killQueryMsg->qhandle);
+
+      qKillQuery(*qhandle);
+      qReleaseQInfo(pVnode->qMgmt, (void**) &qhandle, true);
+    }
+
+    return TSDB_CODE_TSC_QUERY_CANCELLED;
+  }
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  void**  handle = NULL;
+
+  if (contLen != 0) {
+    qinfo_t pQInfo = NULL;
+    code = qCreateQueryInfo(pVnode->tsdb, pVnode->vgId, pQueryTableMsg, &pQInfo);
+
+    SQueryTableRsp *pRsp = (SQueryTableRsp *) rpcMallocCont(sizeof(SQueryTableRsp));
+    pRsp->code    = code;
+    pRsp->qhandle = 0;
+
+    pRet->len = sizeof(SQueryTableRsp);
+    pRet->rsp = pRsp;
+    int32_t vgId = pVnode->vgId;
+
+    // current connect is broken
+    if (code == TSDB_CODE_SUCCESS) {
+      handle = qRegisterQInfo(pVnode->qMgmt, (uint64_t) pQInfo);
+      if (handle == NULL) {  // failed to register qhandle, todo add error test case
+        vError("vgId:%d QInfo:%p register qhandle failed, return to app, code:%s", pVnode->vgId, (void *)pQInfo,
+               tstrerror(pRsp->code));
+        pRsp->code = TSDB_CODE_QRY_INVALID_QHANDLE;
+        qDestroyQueryInfo(pQInfo);  // destroy it directly
+      } else {
+        assert(*handle == pQInfo);
+        pRsp->qhandle = htobe64((uint64_t) pQInfo);
+      }
+
+      if (handle != NULL && vnodeNotifyCurrentQhandle(pReadMsg->rpcMsg.handle, *handle, pVnode->vgId) != TSDB_CODE_SUCCESS) {
+        vError("vgId:%d, QInfo:%p, query discarded since link is broken, %p", pVnode->vgId, *handle, pReadMsg->rpcMsg.handle);
+        pRsp->code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+        qReleaseQInfo(pVnode->qMgmt, (void**) &handle, true);
+        return pRsp->code;
+      }
+    } else {
+      assert(pQInfo == NULL);
+    }
+
+    if (handle != NULL) {
+      vDebug("vgId:%d, QInfo:%p, dnode query msg disposed, create qhandle and returns to app", vgId, *handle);
+      vnodePutItemIntoReadQueue(pVnode, handle);
+    }
+  } else {
+    assert(pCont != NULL);
+    void** qhandle = (void**) pCont;
+
+    vDebug("vgId:%d, QInfo:%p, dnode continues to exec query", pVnode->vgId, *qhandle);
+
+    bool freehandle = false;
+    bool buildRes = qTableQuery(*qhandle); // do execute query
+
+    // build query rsp, the retrieve request has reached here already
+    if (buildRes) {
+      // update the connection info according to the retrieve connection
+      pReadMsg->rpcMsg.handle = qGetResultRetrieveMsg(*qhandle);
+      assert(pReadMsg->rpcMsg.handle != NULL);
+
+      vDebug("vgId:%d, QInfo:%p, start to build retrieval rsp after query paused, %p", pVnode->vgId, *qhandle,
+             pReadMsg->rpcMsg.handle);
+
+      // set the real rsp error code
+      pReadMsg->rpcMsg.code = vnodeDumpQueryResult(&pReadMsg->rspRet, pVnode, qhandle, &freehandle);
+
+      // NOTE: set return code to be TSDB_CODE_QRY_HAS_RSP to notify dnode to return msg to client
+      code = TSDB_CODE_QRY_HAS_RSP;
+    } else {
+      freehandle = qQueryCompleted(*qhandle);
+    }
+
+    // NOTE: if the qhandle is not put into vread queue or query is completed, free the qhandle.
+    // If the building of result is not required, simply free it. Otherwise, mandatorily free the qhandle
+    if (freehandle || (!buildRes)) {
+      qReleaseQInfo(pVnode->qMgmt, (void **)&qhandle, freehandle);
+    }
+  }
+
+  return code;
+}
+
+static int32_t vnodeProcessFetchMsg(SVnodeObj *pVnode, SReadMsg *pReadMsg) {
+  void *   pCont = pReadMsg->pCont;
+  SRspRet *pRet = &pReadMsg->rspRet;
+
+  SRetrieveTableMsg *pRetrieve = pCont;
+  pRetrieve->free = htons(pRetrieve->free);
+  pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
+
+  vDebug("vgId:%d, QInfo:%p, retrieve msg is disposed, free:%d, conn:%p", pVnode->vgId, (void*) pRetrieve->qhandle, pRetrieve->free, pReadMsg->rpcMsg.handle);
+
+  memset(pRet, 0, sizeof(SRspRet));
+
+  int32_t code = TSDB_CODE_SUCCESS;
+  void** handle = qAcquireQInfo(pVnode->qMgmt, pRetrieve->qhandle);
+  if (handle == NULL || (*handle) != (void*) pRetrieve->qhandle) {
+    code = TSDB_CODE_QRY_INVALID_QHANDLE;
+    vDebug("vgId:%d, invalid qhandle in retrieving result, QInfo:%p", pVnode->vgId, (void*) pRetrieve->qhandle);
+    
+    vnodeBuildNoResultQueryRsp(pRet);
+    return code;
+  }
+
+  if (pRetrieve->free == 1) {
+    vWarn("vgId:%d, QInfo:%p, retrieve msg received to kill query and free qhandle", pVnode->vgId, *handle);
+    qKillQuery(*handle);
+    qReleaseQInfo(pVnode->qMgmt, (void**) &handle, true);
+
+    vnodeBuildNoResultQueryRsp(pRet);
+    code = TSDB_CODE_TSC_QUERY_CANCELLED;
+    return code;
+  }
+
+  // register the qhandle to connect to quit query immediate if connection is broken
+  if (vnodeNotifyCurrentQhandle(pReadMsg->rpcMsg.handle, *handle, pVnode->vgId) != TSDB_CODE_SUCCESS) {
+    vError("vgId:%d, QInfo:%p, retrieve discarded since link is broken, %p", pVnode->vgId, *handle, pReadMsg->rpcMsg.handle);
+    code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
+    qReleaseQInfo(pVnode->qMgmt, (void**) &handle, true);
+    return code;
+  }
+
+  bool freeHandle = true;
+  bool buildRes   = false;
+
+  code = qRetrieveQueryResultInfo(*handle, &buildRes, pReadMsg->rpcMsg.handle);
+  if (code != TSDB_CODE_SUCCESS) {
+    //TODO handle malloc failure
+    pRet->rsp = (SRetrieveTableRsp *)rpcMallocCont(sizeof(SRetrieveTableRsp));
+    pRet->len = sizeof(SRetrieveTableRsp);
+    memset(pRet->rsp, 0, sizeof(SRetrieveTableRsp));
+    freeHandle = true;
+  } else { // result is not ready, return immediately
+    if (!buildRes) {
+      qReleaseQInfo(pVnode->qMgmt, (void**) &handle, false);
+      return TSDB_CODE_QRY_NOT_READY;
+    }
+
+    code = vnodeDumpQueryResult(pRet, pVnode, handle, &freeHandle);
+  }
+
+  // If qhandle is not added into vread queue, the query should be completed already or paused with error.
+  // Here free qhandle immediately
+  if (freeHandle) {
+    qReleaseQInfo(pVnode->qMgmt, (void**) &handle, true);
+  }
+
+  return code;
+}
+
+// notify connection(handle) that current qhandle is created, if current connection from
+// client is broken, the query needs to be killed immediately.
+int32_t vnodeNotifyCurrentQhandle(void* handle, void* qhandle, int32_t vgId) {
+  SRetrieveTableMsg* killQueryMsg = rpcMallocCont(sizeof(SRetrieveTableMsg));
+  killQueryMsg->qhandle = htobe64((uint64_t) qhandle);
+  killQueryMsg->free = htons(1);
+  killQueryMsg->header.vgId = htonl(vgId);
+  killQueryMsg->header.contLen = htonl(sizeof(SRetrieveTableMsg));
+
+  vDebug("QInfo:%p register qhandle to connect:%p", qhandle, handle);
+  return rpcReportProgress(handle, (char*) killQueryMsg, sizeof(SRetrieveTableMsg));
+}
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c310439bb0904da9252cb1c29e1652472f60df7
--- /dev/null
+++ b/src/vnode/src/vnodeWrite.c
@@ -0,0 +1,207 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taosmsg.h"
+#include "taoserror.h"
+#include "tqueue.h"
+#include "trpc.h"
+#include "tutil.h"
+#include "tsdb.h"
+#include "twal.h"
+#include "tdataformat.h"
+#include "vnode.h"
+#include "vnodeInt.h"
+#include "tcq.h"
+
+static int32_t (*vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MAX])(SVnodeObj *, void *, SRspRet *);
+static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessUpdateTagValMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet);
+
+void vnodeInitWriteFp(void) {
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_SUBMIT]          = vnodeProcessSubmitMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_CREATE_TABLE] = vnodeProcessCreateTableMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE]   = vnodeProcessDropTableMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_ALTER_TABLE]  = vnodeProcessAlterTableMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE]  = vnodeProcessDropStableMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_UPDATE_TAG_VAL]  = vnodeProcessUpdateTagValMsg;
+}
+
+int32_t vnodeProcessWrite(void *param1, int qtype, void *param2, void *item) {
+  int32_t    code = 0;
+  SVnodeObj *pVnode = (SVnodeObj *)param1;
+  SWalHead  *pHead = param2;
+
+  if (vnodeProcessWriteMsgFp[pHead->msgType] == NULL) {
+    vDebug("vgId:%d, msgType:%s not processed, no handle", pVnode->vgId, taosMsg[pHead->msgType]);
+    return TSDB_CODE_VND_MSG_NOT_PROCESSED; 
+  }
+
+  if (!(pVnode->accessState & TSDB_VN_WRITE_ACCCESS)) {
+    vDebug("vgId:%d, msgType:%s not processed, no write auth", pVnode->vgId, taosMsg[pHead->msgType]);
+    return TSDB_CODE_VND_NO_WRITE_AUTH;
+  }
+
+  // tsdb may be in reset state 
+  if (pVnode->tsdb == NULL) return TSDB_CODE_APP_NOT_READY;
+  if (pVnode->status == TAOS_VN_STATUS_CLOSING) 
+    return TSDB_CODE_APP_NOT_READY;
+  
+  if (pHead->version == 0) { // from client or CQ 
+    if (pVnode->status != TAOS_VN_STATUS_READY) {
+      vDebug("vgId:%d, msgType:%s not processed, vnode status is %d", pVnode->vgId, taosMsg[pHead->msgType], pVnode->status);
+      return TSDB_CODE_APP_NOT_READY;  // it may be in deleting or closing state
+    }
+
+    if (pVnode->role != TAOS_SYNC_ROLE_MASTER) {
+      vDebug("vgId:%d, msgType:%s not processed, replica:%d role:%d", pVnode->vgId, taosMsg[pHead->msgType], pVnode->syncCfg.replica, pVnode->role);
+      return TSDB_CODE_APP_NOT_READY;
+    }
+
+    // assign version
+    pVnode->version++;
+    pHead->version = pVnode->version;
+    if (pVnode->delay) usleep(pVnode->delay*1000);
+
+  } else { // from wal or forward 
+    // for data from WAL or forward, version may be smaller
+    if (pHead->version <= pVnode->version) return 0;
+  }
+
+  pVnode->version = pHead->version;
+
+  // write into WAL
+  code = walWrite(pVnode->wal, pHead);
+  if (code < 0) return code;
+
+  // forward to peers, even it is WAL/FWD, it shall be called to update version in sync 
+  int32_t syncCode = 0;
+  syncCode = syncForwardToPeer(pVnode->sync, pHead, item, qtype);
+  if (syncCode < 0) return syncCode;
+
+  // write data locally 
+  code = (*vnodeProcessWriteMsgFp[pHead->msgType])(pVnode, pHead->cont, item);
+  if (code < 0) return code;
+
+  return syncCode;
+}
+
+void vnodeConfirmForward(void *param, uint64_t version, int32_t code) {
+  SVnodeObj *pVnode = (SVnodeObj *)param;
+  syncConfirmForward(pVnode->sync, version, code);
+}
+
+static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  int32_t code = TSDB_CODE_SUCCESS;
+
+  vTrace("vgId:%d, submit msg is processed", pVnode->vgId);
+
+  // save insert result into item
+  SShellSubmitRspMsg *pRsp = NULL;
+  if (pRet) {  
+    pRet->len = sizeof(SShellSubmitRspMsg);
+    pRet->rsp = rpcMallocCont(pRet->len);
+    pRsp = pRet->rsp;
+  }
+
+  if (tsdbInsertData(pVnode->tsdb, pCont, pRsp) < 0) code = terrno;
+  
+  return code;
+}
+
+static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  int code = TSDB_CODE_SUCCESS;
+
+  STableCfg *pCfg = tsdbCreateTableCfgFromMsg((SMDCreateTableMsg *)pCont);
+  if (pCfg == NULL) {
+    ASSERT(terrno != 0);
+    return terrno;
+  }
+
+  if (tsdbCreateTable(pVnode->tsdb, pCfg) < 0) {
+    code = terrno;
+    ASSERT(code != 0);
+  }
+
+  tsdbClearTableCfg(pCfg);
+  return code;
+}
+
+static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  SMDDropTableMsg *pTable = pCont;
+  int32_t          code = TSDB_CODE_SUCCESS;
+
+  vDebug("vgId:%d, table:%s, start to drop", pVnode->vgId, pTable->tableId);
+  STableId tableId = {.uid = htobe64(pTable->uid), .tid = htonl(pTable->sid)};
+
+  if (tsdbDropTable(pVnode->tsdb, tableId) < 0) code = terrno;
+
+  return code;
+}
+
+static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  // TODO: disposed in tsdb
+  // STableCfg *pCfg = tsdbCreateTableCfgFromMsg((SMDCreateTableMsg *)pCont);
+  // if (pCfg == NULL) return terrno;
+  // if (tsdbCreateTable(pVnode->tsdb, pCfg) < 0) code = terrno;
+
+  // tsdbClearTableCfg(pCfg);
+  vDebug("vgId:%d, alter table msg is received", pVnode->vgId);
+  return TSDB_CODE_SUCCESS;
+}
+
+static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  SMDDropSTableMsg *pTable = pCont;
+  int32_t           code = TSDB_CODE_SUCCESS;
+
+  vDebug("vgId:%d, stable:%s, start to drop", pVnode->vgId, pTable->tableId);
+
+  STableId stableId = {.uid = htobe64(pTable->uid), .tid = -1};
+
+  if (tsdbDropTable(pVnode->tsdb, stableId) < 0) code = terrno;
+
+  vDebug("vgId:%d, stable:%s, drop stable result:%s", pVnode->vgId, pTable->tableId, tstrerror(code));
+
+  return code;
+}
+
+static int32_t vnodeProcessUpdateTagValMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  if (tsdbUpdateTableTagValue(pVnode->tsdb, (SUpdateTableTagValMsg *)pCont) < 0) {
+    return terrno;
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
+int vnodeWriteToQueue(void *param, void *data, int type) {
+  SVnodeObj *pVnode = param;
+  SWalHead *pHead = data;
+
+  int size = sizeof(SWalHead) + pHead->len;
+  SWalHead *pWal = (SWalHead *)taosAllocateQitem(size);
+  memcpy(pWal, pHead, size);
+
+  atomic_add_fetch_32(&pVnode->refCount, 1);
+  vDebug("vgId:%d, get vnode wqueue, refCount:%d", pVnode->vgId, pVnode->refCount);
+
+  taosWriteQitem(pVnode->wqueue, type, pWal);
+
+  return 0;
+}
+
diff --git a/src/wal/CMakeLists.txt b/src/wal/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..359e09287a9409a7acffe27d934884cce0510bb0
--- /dev/null
+++ b/src/wal/CMakeLists.txt
@@ -0,0 +1,11 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(inc)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SRC)
+
+IF (TD_LINUX)
+  ADD_LIBRARY(twal ${SRC})
+  TARGET_LINK_LIBRARIES(twal tutil common)
+  ADD_SUBDIRECTORY(test)
+ENDIF ()  
diff --git a/src/wal/src/walMain.c b/src/wal/src/walMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..a90c1b171c2c492a029ec0b56810518de1532f51
--- /dev/null
+++ b/src/wal/src/walMain.c
@@ -0,0 +1,533 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+
+#define TAOS_RANDOM_FILE_FAIL_TEST
+
+#include "os.h"
+#include "tlog.h"
+#include "tchecksum.h"
+#include "tutil.h"
+#include "ttimer.h"
+#include "taoserror.h"
+#include "twal.h"
+#include "tqueue.h"
+
+#define walPrefix "wal"
+
+#define wFatal(...) { if (wDebugFlag & DEBUG_FATAL) { taosPrintLog("WAL FATAL ", 255, __VA_ARGS__); }}
+#define wError(...) { if (wDebugFlag & DEBUG_ERROR) { taosPrintLog("WAL ERROR ", 255, __VA_ARGS__); }}
+#define wWarn(...)  { if (wDebugFlag & DEBUG_WARN)  { taosPrintLog("WAL WARN ", 255, __VA_ARGS__); }}
+#define wInfo(...)  { if (wDebugFlag & DEBUG_INFO)  { taosPrintLog("WAL ", 255, __VA_ARGS__); }}
+#define wDebug(...) { if (wDebugFlag & DEBUG_DEBUG) { taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); }}
+#define wTrace(...) { if (wDebugFlag & DEBUG_TRACE) { taosPrintLog("WAL ", wDebugFlag, __VA_ARGS__); }}
+
+typedef struct {
+  uint64_t version;
+  int      fd;
+  int      keep;
+  int      level;
+  int32_t  fsyncPeriod;
+  void    *timer;
+  void    *signature;
+  int      max;  // maximum number of wal files
+  uint32_t id;   // increase continuously
+  int      num;  // number of wal files
+  char     path[TSDB_FILENAME_LEN];
+  char     name[TSDB_FILENAME_LEN+16];
+  pthread_mutex_t mutex;
+} SWal;
+
+static void    *walTmrCtrl = NULL;
+static int     tsWalNum = 0;
+static pthread_once_t walModuleInit = PTHREAD_ONCE_INIT;
+static uint32_t walSignature = 0xFAFBFDFE;
+static int  walHandleExistingFiles(const char *path);
+static int  walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp);
+static int  walRemoveWalFiles(const char *path);
+static void walProcessFsyncTimer(void *param, void *tmrId);
+static void walRelease(SWal *pWal);
+
+static void walModuleInitFunc() {
+  walTmrCtrl = taosTmrInit(1000, 100, 300000, "WAL");
+  if (walTmrCtrl == NULL) 
+    walModuleInit = PTHREAD_ONCE_INIT;
+  else
+    wDebug("WAL module is initialized");
+}
+
+static inline bool walNeedFsyncTimer(SWal *pWal) {
+  if (pWal->fsyncPeriod > 0 && pWal->level == TAOS_WAL_FSYNC) {
+    return true;
+  }
+  return false;
+}
+
+void *walOpen(const char *path, const SWalCfg *pCfg) {
+  SWal *pWal = calloc(sizeof(SWal), 1);
+  if (pWal == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  pthread_once(&walModuleInit, walModuleInitFunc);
+  if (walTmrCtrl == NULL) {
+    free(pWal);
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return NULL;
+  }
+
+  atomic_add_fetch_32(&tsWalNum, 1);    
+  pWal->fd = -1;
+  pWal->max = pCfg->wals;
+  pWal->id = 0;
+  pWal->num = 0;
+  pWal->level = pCfg->walLevel;
+  pWal->keep = pCfg->keep;
+  pWal->fsyncPeriod = pCfg->fsyncPeriod;
+  pWal->signature = pWal;
+  tstrncpy(pWal->path, path, sizeof(pWal->path));
+  pthread_mutex_init(&pWal->mutex, NULL);
+
+  if (walNeedFsyncTimer(pWal)) {
+    pWal->timer = taosTmrStart(walProcessFsyncTimer, pWal->fsyncPeriod, pWal, walTmrCtrl);
+    if (pWal->timer == NULL) {
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      walRelease(pWal);
+      return NULL;
+    }
+  }
+
+  if (taosMkDir(path, 0755) != 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    wError("wal:%s, failed to create directory(%s)", path, strerror(errno));
+    walRelease(pWal);
+    pWal = NULL;
+  }
+     
+  if (pCfg->keep == 1) return pWal;
+
+  if (walHandleExistingFiles(path) == 0) 
+    walRenew(pWal);
+
+  if (pWal && pWal->fd <0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    wError("wal:%s, failed to open(%s)", path, strerror(errno));
+    walRelease(pWal);
+    pWal = NULL;
+  } 
+
+  if (pWal) wDebug("wal:%s, it is open, level:%d fsyncPeriod:%d", path, pWal->level, pWal->fsyncPeriod);
+  return pWal;
+}
+
+int walAlter(twalh wal, const SWalCfg *pCfg) {
+  SWal *pWal = wal;
+  if (pWal == NULL) {
+    return TSDB_CODE_WAL_APP_ERROR;
+  }
+
+  if (pWal->level == pCfg->walLevel && pWal->fsyncPeriod == pCfg->fsyncPeriod) {
+    wDebug("wal:%s, old walLevel:%d fsync:%d, new walLevel:%d fsync:%d not change", pWal->name, pWal->level,
+           pWal->fsyncPeriod, pCfg->walLevel, pCfg->fsyncPeriod);
+    return TSDB_CODE_SUCCESS;
+  }
+
+  wInfo("wal:%s, change old walLevel:%d fsync:%d, new walLevel:%d fsync:%d", pWal->name, pWal->level, pWal->fsyncPeriod,
+        pCfg->walLevel, pCfg->fsyncPeriod);
+
+  pthread_mutex_lock(&pWal->mutex);
+  pWal->level = pCfg->walLevel;
+  pWal->fsyncPeriod = pCfg->fsyncPeriod;
+  if (walNeedFsyncTimer(pWal)) {
+    wInfo("wal:%s, reset fsync timer, walLevel:%d fsyncPeriod:%d", pWal->name, pWal->level, pWal->fsyncPeriod);
+    taosTmrReset(walProcessFsyncTimer, pWal->fsyncPeriod, pWal, &pWal->timer,walTmrCtrl);
+  } else {
+    wInfo("wal:%s, stop fsync timer, walLevel:%d fsyncPeriod:%d", pWal->name, pWal->level, pWal->fsyncPeriod);
+    taosTmrStop(pWal->timer);
+    pWal->timer = NULL;
+  }
+  pthread_mutex_unlock(&pWal->mutex);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+void walClose(void *handle) {
+  if (handle == NULL) return;
+  
+  SWal *pWal = handle;  
+  taosClose(pWal->fd);
+  if (pWal->timer) taosTmrStopA(&pWal->timer);
+
+  if (pWal->keep == 0) {
+    // remove all files in the directory
+    for (int i=0; i<pWal->num; ++i) {
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", pWal->path, walPrefix, pWal->id-i);
+      if (remove(pWal->name) <0) {
+        wError("wal:%s, failed to remove", pWal->name);
+      } else {
+        wDebug("wal:%s, it is removed", pWal->name);
+      }
+    }
+  } else {
+    wDebug("wal:%s, it is closed and kept", pWal->name);
+  }
+
+  walRelease(pWal);
+}
+
+int walRenew(void *handle) {
+  if (handle == NULL) return 0;
+  SWal *pWal = handle;
+
+  terrno = 0;
+
+  pthread_mutex_lock(&pWal->mutex);
+
+  if (pWal->fd >=0) {
+    close(pWal->fd);
+    pWal->id++;
+    wDebug("wal:%s, it is closed", pWal->name);
+  }
+
+  pWal->num++;
+
+  snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", pWal->path, walPrefix, pWal->id);
+  pWal->fd = open(pWal->name, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
+
+  if (pWal->fd < 0) {
+    wError("wal:%s, failed to open(%s)", pWal->name, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+  } else {
+    wDebug("wal:%s, it is created", pWal->name);
+
+    if (pWal->num > pWal->max) {
+      // remove the oldest wal file
+      char name[TSDB_FILENAME_LEN * 3];
+      snprintf(name, sizeof(name), "%s/%s%d", pWal->path, walPrefix, pWal->id - pWal->max);
+      if (remove(name) <0) {
+        wError("wal:%s, failed to remove(%s)", name, strerror(errno));
+      } else {
+        wDebug("wal:%s, it is removed", name);
+      }
+
+      pWal->num--;
+    }
+  }  
+  
+  pthread_mutex_unlock(&pWal->mutex);
+
+  return terrno;
+}
+
+int walWrite(void *handle, SWalHead *pHead) {
+  SWal *pWal = handle;
+  if (pWal == NULL) return -1;
+
+  terrno = 0;
+
+  // no wal  
+  if (pWal->level == TAOS_WAL_NOLOG) return 0;
+  if (pHead->version <= pWal->version) return 0;
+
+  pHead->signature = walSignature;
+  taosCalcChecksumAppend(0, (uint8_t *)pHead, sizeof(SWalHead));
+  int contLen = pHead->len + sizeof(SWalHead);
+
+  if(taosTWrite(pWal->fd, pHead, contLen) != contLen) {
+    wError("wal:%s, failed to write(%s)", pWal->name, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+  } else {
+    pWal->version = pHead->version;
+  }
+
+  return terrno;
+}
+
+void walFsync(void *handle) {
+
+  SWal *pWal = handle;
+  if (pWal == NULL || pWal->level != TAOS_WAL_FSYNC || pWal->fd < 0) return;
+
+  if (pWal->fsyncPeriod == 0) {
+    if (fsync(pWal->fd) < 0) {
+      wError("wal:%s, fsync failed(%s)", pWal->name, strerror(errno));
+    }
+  }
+}
+
+int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int)) {
+  SWal    *pWal = handle;
+  struct   dirent *ent;
+  int      count = 0;
+  uint32_t maxId = 0, minId = -1, index =0;
+
+  terrno = 0;
+  int   plen = strlen(walPrefix);
+  char  opath[TSDB_FILENAME_LEN+5];
+   
+  int slen = snprintf(opath, sizeof(opath), "%s", pWal->path);
+  if ( pWal->keep == 0) 
+    strcpy(opath+slen, "/old");
+
+  DIR *dir = opendir(opath);
+  if (dir == NULL && errno == ENOENT) return 0;
+  if (dir == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return terrno;
+  }
+
+  while ((ent = readdir(dir))!= NULL) {
+    if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
+      index = atol(ent->d_name + plen);
+      if (index > maxId) maxId = index;
+      if (index < minId) minId = index;
+      count++;
+    }
+  }
+
+  closedir(dir);
+
+  if (count == 0) {
+    if (pWal->keep) terrno = walRenew(pWal);
+    return terrno;
+  }
+
+  if ( count != (maxId-minId+1) ) {
+    wError("wal:%s, messed up, count:%d max:%d min:%d", opath, count, maxId, minId);
+    terrno = TSDB_CODE_WAL_APP_ERROR;
+  } else {
+    wDebug("wal:%s, %d files will be restored", opath, count);
+
+    for (index = minId; index<=maxId; ++index) {
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", opath, walPrefix, index);
+      terrno = walRestoreWalFile(pWal, pVnode, writeFp);
+      if (terrno < 0) break;
+    }
+  }
+
+  if (terrno == 0) {
+    if (pWal->keep == 0) {
+      terrno = walRemoveWalFiles(opath);
+      if (terrno == 0) {
+        if (remove(opath) < 0) {
+          wError("wal:%s, failed to remove directory(%s)", opath, strerror(errno));
+          terrno = TAOS_SYSTEM_ERROR(errno);
+        }
+      }
+    } else { 
+      // open the existing WAL file in append mode
+      pWal->num = count;
+      pWal->id = maxId;
+      snprintf(pWal->name, sizeof(pWal->name), "%s/%s%d", opath, walPrefix, maxId);
+      pWal->fd = open(pWal->name, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU | S_IRWXG | S_IRWXO);
+      if (pWal->fd < 0) {
+        wError("wal:%s, failed to open file(%s)", pWal->name, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+      }
+    }
+  }
+
+  return terrno;
+}
+
+int walGetWalFile(void *handle, char *name, uint32_t *index) {
+  SWal   *pWal = handle;
+  int     code = 1;
+  int32_t first = 0; 
+
+  name[0] = 0;
+  if (pWal == NULL || pWal->num == 0) return 0;
+
+  pthread_mutex_lock(&(pWal->mutex));
+
+  first = pWal->id + 1 - pWal->num;
+  if (*index == 0) *index = first;  // set to first one
+
+  if (*index < first && *index > pWal->id) {
+    code = -1;  // index out of range
+  } else { 
+    sprintf(name, "wal/%s%d", walPrefix, *index);
+    code = (*index == pWal->id) ? 0:1;
+  }
+
+  pthread_mutex_unlock(&(pWal->mutex));
+
+  return code;
+}  
+
+static void walRelease(SWal *pWal) {
+
+  pthread_mutex_destroy(&pWal->mutex);
+  pWal->signature = NULL;
+  free(pWal);
+
+  if (atomic_sub_fetch_32(&tsWalNum, 1) == 0) {
+    if (walTmrCtrl) taosTmrCleanUp(walTmrCtrl);
+    walTmrCtrl = NULL;
+    walModuleInit = PTHREAD_ONCE_INIT;
+    wDebug("WAL module is cleaned up");
+  }
+}
+
+static int walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp) {
+  char *name = pWal->name;
+
+  terrno = 0;
+  char *buffer = malloc(1024000);  // size for one record
+  if (buffer == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);   
+    return terrno;
+  }
+
+  SWalHead *pHead = (SWalHead *)buffer;
+
+  int fd = open(name, O_RDONLY);
+  if (fd < 0) {
+    wError("wal:%s, failed to open for restore(%s)", name, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    free(buffer);
+    return terrno;
+  }
+
+  wDebug("wal:%s, start to restore", name);
+
+  while (1) {
+    int ret = taosTRead(fd, pHead, sizeof(SWalHead));
+    if ( ret == 0)  break;  
+
+    if (ret != sizeof(SWalHead)) {
+      wWarn("wal:%s, failed to read head, skip, ret:%d(%s)", name, ret, strerror(errno));
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      break;
+    }
+
+    if (!taosCheckChecksumWhole((uint8_t *)pHead, sizeof(SWalHead))) {
+      wWarn("wal:%s, cksum is messed up, skip the rest of file", name);
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      break;
+    } 
+
+    ret = taosTRead(fd, pHead->cont, pHead->len);
+    if ( ret != pHead->len) {
+      wWarn("wal:%s, failed to read body, skip, len:%d ret:%d", name, pHead->len, ret);
+      terrno = TAOS_SYSTEM_ERROR(errno);
+      break;
+    }
+
+    if (pWal->keep) pWal->version = pHead->version;
+    (*writeFp)(pVnode, pHead, TAOS_QTYPE_WAL);
+  }
+
+  close(fd);
+  free(buffer);
+
+  return terrno;
+}
+
+int walHandleExistingFiles(const char *path) {
+  char   oname[TSDB_FILENAME_LEN * 3];
+  char   nname[TSDB_FILENAME_LEN * 3];
+  char   opath[TSDB_FILENAME_LEN];
+
+  snprintf(opath, sizeof(opath), "%s/old", path);
+
+  struct dirent *ent;
+  DIR   *dir = opendir(path);
+  int    plen = strlen(walPrefix);
+  terrno = 0;
+
+  if (access(opath, F_OK) == 0) {
+    // old directory is there, it means restore process is not finished
+    walRemoveWalFiles(path);
+
+  } else {
+    // move all files to old directory
+    int count = 0;
+    while ((ent = readdir(dir))!= NULL) {  
+      if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
+        snprintf(oname, sizeof(oname), "%s/%s", path, ent->d_name);
+        snprintf(nname, sizeof(nname), "%s/old/%s", path, ent->d_name);
+        if (taosMkDir(opath, 0755) != 0) {
+          wError("wal:%s, failed to create directory:%s(%s)", oname, opath, strerror(errno));
+          terrno = TAOS_SYSTEM_ERROR(errno);
+          break; 
+        }
+
+        if (rename(oname, nname) < 0) {
+          wError("wal:%s, failed to move to new:%s", oname, nname);
+          terrno = TAOS_SYSTEM_ERROR(errno);
+          break;
+        } 
+
+        count++;
+      }
+    }
+
+    wDebug("wal:%s, %d files are moved for restoration", path, count);
+  }
+  
+  closedir(dir);
+  return terrno;
+}
+
+static int walRemoveWalFiles(const char *path) {
+  int    plen = strlen(walPrefix);
+  char   name[TSDB_FILENAME_LEN * 3];
+ 
+  terrno = 0;
+
+  struct dirent *ent;
+  DIR   *dir = opendir(path);
+  if (dir == NULL && errno == ENOENT) return 0;
+  if (dir == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return terrno;
+  }  
+
+  while ((ent = readdir(dir))!= NULL) {
+    if ( strncmp(ent->d_name, walPrefix, plen) == 0) {
+      snprintf(name, sizeof(name), "%s/%s", path, ent->d_name);
+      if (remove(name) <0) {
+        wError("wal:%s, failed to remove(%s)", name, strerror(errno));
+        terrno = TAOS_SYSTEM_ERROR(errno);
+      }
+    }
+  } 
+
+  closedir(dir);
+
+  return terrno;
+}
+
+static void walProcessFsyncTimer(void *param, void *tmrId) {
+  SWal *pWal = param;
+
+  if (pWal->signature != pWal) return;
+  if (pWal->fd < 0) return;
+
+  if (fsync(pWal->fd) < 0) {
+    wError("wal:%s, fsync failed(%s)", pWal->name, strerror(errno));
+  }
+
+  if (walNeedFsyncTimer(pWal)) {
+    pWal->timer = taosTmrStart(walProcessFsyncTimer, pWal->fsyncPeriod, pWal, walTmrCtrl);
+  } else {
+    wInfo("wal:%s, stop fsync timer for walLevel:%d fsyncPeriod:%d", pWal->name, pWal->level, pWal->fsyncPeriod);
+    taosTmrStop(pWal->timer);
+    pWal->timer = NULL;
+  }
+}
diff --git a/src/wal/test/CMakeLists.txt b/src/wal/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6c232ce4b91eecf7e8818922bbdbebbfe380e444
--- /dev/null
+++ b/src/wal/test/CMakeLists.txt
@@ -0,0 +1,13 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_LINUX)
+  INCLUDE_DIRECTORIES(../inc)
+
+  LIST(APPEND WALTEST_SRC ./waltest.c)
+  ADD_EXECUTABLE(waltest ${WALTEST_SRC})
+  TARGET_LINK_LIBRARIES(waltest twal osdetail tutil)
+
+ENDIF ()
+
+
diff --git a/src/wal/test/waltest.c b/src/wal/test/waltest.c
new file mode 100644
index 0000000000000000000000000000000000000000..073dbf72af02437dc494fdf18ceeebaa24777dca
--- /dev/null
+++ b/src/wal/test/waltest.c
@@ -0,0 +1,139 @@
+/*
+ * 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/>.
+ */
+
+//#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "tlog.h"
+#include "twal.h"
+
+int64_t  ver = 0;
+void    *pWal = NULL;
+
+int writeToQueue(void *pVnode, void *data, int type) {
+  // do nothing
+  SWalHead *pHead = data;
+
+  if (pHead->version > ver)
+    ver = pHead->version;
+
+  walWrite(pWal, pHead);
+
+  return 0;
+}
+
+int main(int argc, char *argv[]) {
+  char path[128] = "/home/jhtao/test/wal";
+  int  max = 3;
+  int  level = 2;
+  int  total = 5;
+  int  rows = 10000;
+  int  size = 128;
+  int  keep = 0;
+
+  for (int i=1; i<argc; ++i) {
+    if (strcmp(argv[i], "-p")==0 && i < argc-1) {
+      tstrncpy(path, argv[++i], sizeof(path));
+    } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
+      max = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-l")==0 && i < argc-1) {
+      level = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-r")==0 && i < argc-1) {
+      rows = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-k")==0 && i < argc-1) {
+      keep = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
+      total = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s")==0 && i < argc-1) {
+      size = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-v")==0 && i < argc-1) {
+      ver = atoll(argv[++i]);
+    } else if (strcmp(argv[i], "-d")==0 && i < argc-1) {
+      dDebugFlag = atoi(argv[++i]);
+    } else {
+      printf("\nusage: %s [options] \n", argv[0]);
+      printf("  [-p path]: wal file path default is:%s\n", path);
+      printf("  [-m max]: max wal files, default is:%d\n", max);
+      printf("  [-l level]: log level, default is:%d\n", level);
+      printf("  [-t total]: total wal files, default is:%d\n", total);
+      printf("  [-r rows]: rows of records per wal file, default is:%d\n", rows);
+      printf("  [-k keep]: keep the wal after closing, default is:%d\n", keep);
+      printf("  [-v version]: initial version, default is:%ld\n", ver);
+      printf("  [-d debugFlag]: debug flag, default:%d\n", dDebugFlag);
+      printf("  [-h help]: print out this help\n\n");
+      exit(0);
+    }
+  } 
+
+  taosInitLog("wal.log", 100000, 10);
+
+  SWalCfg walCfg;
+  walCfg.walLevel = level;
+  walCfg.wals = max;
+  walCfg.keep = keep;
+
+  pWal = walOpen(path, &walCfg);
+  if (pWal == NULL) {
+    printf("failed to open wal\n");
+    exit(-1);
+  }
+
+  int ret = walRestore(pWal, NULL, writeToQueue);
+  if (ret <0) {
+    printf("failed to restore wal\n");
+    exit(-1);
+  }
+
+  printf("version starts from:%ld\n", ver);
+  
+  int contLen = sizeof(SWalHead) + size;
+  SWalHead *pHead = (SWalHead *) malloc(contLen);
+
+  for (int i=0; i<total; ++i) {
+    for (int k=0; k<rows; ++k) {
+      pHead->version = ++ver;
+      pHead->len = size;
+      walWrite(pWal, pHead);
+    }
+       
+    printf("renew a wal, i:%d\n", i);
+    walRenew(pWal);
+  }
+
+  printf("%d wal files are written\n", total);
+
+  uint32_t index = 0;
+  char     name[256];
+
+  while (1) {
+    int code = walGetWalFile(pWal, name, &index);
+    if (code == -1) {
+      printf("failed to get wal file, index:%d\n", index);
+      break;
+    }
+
+    printf("index:%d wal:%s\n", index, name);
+    if (code == 0) break;
+
+    index++;
+  }
+
+  getchar();
+
+  walClose(pWal);
+
+  return 0;
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7afaf7f8b17d7793b61fe237a76163cfd7fed1c4..4e7e9a87ea6810c362bd676cd9152f61bc08e29d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,3 +10,6 @@ SET(CMAKE_C_STANDARD 11)
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 ADD_SUBDIRECTORY(examples/c)
+ADD_SUBDIRECTORY(tsim)
+ADD_SUBDIRECTORY(test/c)
+ADD_SUBDIRECTORY(comparisonTest/tdengine)
diff --git a/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
new file mode 100644
index 0000000000000000000000000000000000000000..b476c118a79a3845b88652ca229e08463077bfbe
--- /dev/null
+++ b/tests/How-To-Run-Test-And-How-To-Add-New-Test-Case.md
@@ -0,0 +1,243 @@
+### Prepare development environment
+
+1.  sudo apt install
+    build-essential cmake net-tools python-pip python-setuptools python3-pip
+    python3-setuptools valgrind psmisc curl
+
+2.  git clone <https://github.com/taosdata/TDengine>; cd TDengine
+
+3.  mkdir debug; cd debug; cmake ..; make ; sudo make install
+
+4.  pip install ../src/connector/python/linux/python2 ; pip3 install
+    ../src/connector/python/linux/python3
+
+5.  pip install numpy; pip3 install numpy (numpy is required only if you need to run querySort.py)  
+
+>   Note: Both Python2 and Python3 are currently supported by the Python test
+>   framework. Since Python2 is no longer officially supported by Python Software
+>   Foundation since January 1, 2020, it is recommended that subsequent test case
+>   development be guaranteed to run correctly on Python3. 
+
+>   For Python2, please consider being compatible if appropriate without 
+>   additional burden.
+>
+>   If you use some new Linux distribution like Ubuntu 20.04 which already do not
+>   include Python2, please do not install Python2-related packages.
+>
+>   <https://nakedsecurity.sophos.com/2020/01/03/python-is-dead-long-live-python/> 
+
+### How to run Python test suite
+
+1.  cd \<TDengine\>/tests/pytest
+
+2.  ./smoketest.sh \# for smoke test
+
+3.  ./smoketest.sh -g \# for memory leak detection test with valgrind
+
+4.  ./fulltest.sh \# for full test
+
+>   Note1: TDengine daemon's configuration and data files are stored in
+>   \<TDengine\>/sim directory. As a historical design, it's same place with
+>   TSIM script. So after the TSIM script ran with sudo privilege, the directory
+>   has been used by TSIM then the python script cannot write it by a normal
+>   user. You need to remove the directory completely first before running the
+>   Python test case. We should consider using two different locations to store
+>   for TSIM and Python script.
+
+>   Note2: if you need to debug crash problem with a core dump, you need
+>   manually edit smoketest.sh or fulltest.sh to add "ulimit -c unlimited"
+>   before the script line. Then you can look for the core file in
+>   \<TDengine\>/tests/pytest after the program crash.
+
+
+### How to add a new test case
+
+**1. TSIM test cases:**
+
+TSIM was the testing framework has been used internally. Now it still be used to run the test cases we develop in the past as a legacy system. We are turning to use Python to develop new test case and are abandoning TSIM gradually.
+
+**2. Python test cases:**
+
+**2.1 Please refer to \<TDengine\>/tests/pytest/insert/basic.py to add a new
+test case.** The new test case must implement 3 functions, where self.init()
+and self.stop() simply copy the contents of insert/basic.py and the test
+logic is implemented in self.run(). You can refer to the code in the util
+directory for more information.
+
+**2.2 Edit smoketest.sh to add the path and filename of the new test case**
+
+Note: The Python test framework may continue to be improved in the future,
+hopefully, to provide more functionality and ease of writing test cases. The
+method of writing the test case above does not exclude that it will also be
+affected.
+
+**2.3 What test.py does in detail:**
+
+test.py is the entry program for test case execution and monitoring.
+
+test.py has the following functions.
+
+\-f --file, Specifies the test case file name to be executed
+-p --path, Specifies deployment path
+
+\-m --master, Specifies the master server IP for cluster deployment 
+-c--cluster, test cluster function
+-s--stop, terminates all running nodes
+
+\-g--valgrind, load valgrind for memory leak detection test
+
+\-h--help, display help
+
+**2.4 What util/log.py does in detail:**
+
+log.py is quite simple, the main thing is that you can print the output in
+different colors as needed. The success() should be called for successful
+test case execution and the success() will print green text. The exit() will
+print red text and exit the program, exit() should be called for test
+failure.
+
+**util/log.py**
+
+...
+
+    def info(self, info):
+
+        printf("%s %s" % (datetime.datetime.now(), info))
+
+ 
+
+    def sleep(self, sec):
+
+        printf("%s sleep %d seconds" % (datetime.datetime.now(), sec))
+
+        time.sleep(sec)
+
+ 
+
+    def debug(self, err):
+
+        printf("\\033[1;36m%s %s\\033[0m" % (datetime.datetime.now(), err))
+
+ 
+
+    def success(self, info):
+
+        printf("\\033[1;32m%s %s\\033[0m" % (datetime.datetime.now(), info))
+
+ 
+
+    def notice(self, err):
+
+        printf("\\033[1;33m%s %s\\033[0m" % (datetime.datetime.now(), err))
+
+ 
+
+    def exit(self, err):
+
+        printf("\\033[1;31m%s %s\\033[0m" % (datetime.datetime.now(), err))
+
+        sys.exit(1)
+
+ 
+
+    def printNoPrefix(self, info):
+
+        printf("\\033[1;36m%s\\033[0m" % (info)
+
+...
+
+**2.5 What util/sql.py does in detail:**
+
+SQL.py is mainly used to execute SQL statements to manipulate the database,
+and the code is extracted and commented as follows:
+
+**util/sql.py**
+
+\# prepare() is mainly used to set up the environment for testing table and
+data, and to set up the database db for testing. do not call prepare() if you
+need to test the database operation command.
+
+def prepare(self):
+
+tdLog.info("prepare database:db")
+
+self.cursor.execute('reset query cache')
+
+self.cursor.execute('drop database if exists db')
+
+self.cursor.execute('create database db')
+
+self.cursor.execute('use db')
+
+...
+
+\# query() is mainly used to execute select statements for normal syntax input
+
+def query(self, sql):
+
+...
+
+\# error() is mainly used to execute the select statement with the wrong syntax
+input, the error will be caught as a reasonable behavior, if not caught it will
+prove that the test failed
+
+def error()
+
+...
+
+\# checkRows() is used to check the number of returned lines after calling
+query(select ...) after calling the query(select ...) to check the number of
+rows of returned results.
+
+def checkRows(self, expectRows):
+
+...
+
+\# checkData() is used to check the returned result data after calling
+query(select ...) after the query(select ...) is called, failure to meet
+expectation is
+
+def checkData(self, row, col, data):
+
+...
+
+\# getData() returns the result data after calling query(select ...) to return
+the resulting data after calling query(select ...)
+
+def getData(self, row, col):
+
+...
+
+\# execute() used to execute sql and return the number of affected rows
+
+def execute(self, sql):
+
+...
+
+\# executeTimes() Multiple executions of the same sql statement
+
+def executeTimes(self, sql, times):
+
+...
+
+\# CheckAffectedRows() Check if the number of affected rows is as expected
+
+def checkAffectedRows(self, expectAffectedRows):
+
+...
+
+### CI submission adoption principle.
+
+-   Every commit / PR compilation must pass. Currently, the warning is treated
+    as an error, so the warning must also be resolved.
+
+-   Test cases that already exist must pass.
+
+-   Because CI is very important to support build and automatically test
+    procedure, it is necessary to manually test the test case before adding it
+    and do as many iterations as possible to ensure that the test case provides
+    stable and reliable test results when added.
+
+>   Note: In the future, according to the requirements and test development
+>   progress will add stress testing, performance testing, code style, 
+>   and other features based on functional testing.
diff --git a/tests/comparisonTest/influxdb/main.go b/tests/comparisonTest/influxdb/main.go
index a6550013e322f56ecffb798ca79a528491fc36d8..2fb16fad89a51e6601a6f18163bac1a8c8bfdc7b 100644
--- a/tests/comparisonTest/influxdb/main.go
+++ b/tests/comparisonTest/influxdb/main.go
@@ -110,6 +110,7 @@ func writeDataImp(wInfo *WriteInfo, wg *sync.WaitGroup, arguments *ProArgs) {
         Addr:     arguments.host,
         Username: arguments.username,
         Password: arguments.password,
+	Timeout: 300 * time.Second,
     })
 
     if err != nil {
@@ -220,6 +221,7 @@ func readData(arguments *ProArgs) {
         Addr:     arguments.host,
         Username: arguments.username,
         Password: arguments.password,
+	Timeout: 300 * time.Second,
     })
 
     if err != nil {
diff --git a/tests/comparisonTest/influxdb/q1.txt b/tests/comparisonTest/influxdb/q1.txt
index 4bff11d200acbca68381688c0dfd8d3d7abd3b8d..05076529fea1f1b18eb2e8a6ca284fa59538aa5f 100644
--- a/tests/comparisonTest/influxdb/q1.txt
+++ b/tests/comparisonTest/influxdb/q1.txt
@@ -8,4 +8,3 @@ select * from devices where devgroup='60';
 select * from devices where devgroup='70';
 select * from devices where devgroup='80';
 select * from devices where devgroup='90';
-
diff --git a/tests/comparisonTest/influxdb/q2.txt b/tests/comparisonTest/influxdb/q2.txt
index c271837ede027a1dc71cc973bab087a1b322af04..10feba922c1575726e7c78cbfc1a090ab16c1a5e 100644
--- a/tests/comparisonTest/influxdb/q2.txt
+++ b/tests/comparisonTest/influxdb/q2.txt
@@ -58,4 +58,3 @@ select spread(temperature) from devices where devgroup=~/[1-7][0-9]/;
 select spread(temperature) from devices where devgroup=~/[1-8][0-9]/;
 select spread(temperature) from devices where devgroup=~/[1-9][0-9]/;
 select spread(temperature) from devices;
-
diff --git a/tests/comparisonTest/influxdb/q3.txt b/tests/comparisonTest/influxdb/q3.txt
index fd32f3ea66a567a0443085eb2c047479366121a7..ecfe80d4016d1c80749bd549b7b6ef1527a50832 100644
--- a/tests/comparisonTest/influxdb/q3.txt
+++ b/tests/comparisonTest/influxdb/q3.txt
@@ -8,4 +8,3 @@ select count(temperature), sum(temperature), mean(temperature) from devices wher
 select count(temperature), sum(temperature), mean(temperature) from devices where devgroup=~/[1-8][0-9]/ group by devgroup;
 select count(temperature), sum(temperature), mean(temperature) from devices where devgroup=~/[1-9][0-9]/ group by devgroup;
 select count(temperature), sum(temperature), mean(temperature) from devices group by devgroup;
-
diff --git a/tests/comparisonTest/influxdb/q4.txt b/tests/comparisonTest/influxdb/q4.txt
index 5b1524d60716f127736de524dba744899cfefc39..d18869ebdab71314e8d85140cf7ab6c603ccc2fe 100644
--- a/tests/comparisonTest/influxdb/q4.txt
+++ b/tests/comparisonTest/influxdb/q4.txt
@@ -8,4 +8,3 @@ select count(temperature), sum(temperature), mean(temperature) from devices wher
 select count(temperature), sum(temperature), mean(temperature) from devices where devgroup=~/[1-8][0-9]/ group by time(1m);
 select count(temperature), sum(temperature), mean(temperature) from devices where devgroup=~/[1-9][0-9]/ group by time(1m);
 select count(temperature), sum(temperature), mean(temperature) from devices group by time(1m);
-
diff --git a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
index 6f5fa6e132ea6d7a7cc6b0322dcd85f9183291f5..ae288ae294a8569d10c5c98b3e82e2833ef4ed68 100644
--- a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>18.0</version>
+      <version>29.0-jre</version>
     </dependency>
 
     <dependency>
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.10.1</version>
+      <version>2.10.0.pr1</version>
     </dependency>
 
     <dependency>
@@ -206,16 +206,6 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.25</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.21</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.7</version>
-    </dependency>
 
     <dependency> 
       <groupId>org.apache.logging.log4j</groupId>
diff --git a/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/OpentsdbTest.java b/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/OpentsdbTest.java
index e1a20dfb4908182e3471cac834c57b477b124998..0e82c480ece8063bd78090d4bb67d87ffa698cc3 100644
--- a/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/OpentsdbTest.java
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/OpentsdbTest.java
@@ -1,6 +1,5 @@
 import com.stumbleupon.async.Callback;
 import com.stumbleupon.async.Deferred;
-import lombok.extern.slf4j.Slf4j;
 
 import net.opentsdb.core.TSDB;
 import net.opentsdb.uid.NoSuchUniqueName;
@@ -40,13 +39,19 @@ import java.util.concurrent.*;
 import java.math.*;
 import java.lang.reflect.Method;
 
+import org.apache.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Level;
 
-public class OpentsdbTest{
 
+public class OpentsdbTest{
   //static { System.setProperty("logback.configurationFile", "/home/ubuntu/fang/opentsdb/opentsdbtest/logback.xml");}
   static { System.setProperty("logback.configurationFile", "/etc/opentsdb/logback.xml");}
 
   public static void main(String args[]) {  
+
+    Logger logger = LogManager.getLogger(OpentsdbTest.class);
+    logger.setLevel(Level.OFF);
     // begin to parse argument
     String datadir = "/home/ubuntu/testdata";
     String sqlchoice  = "q1";
@@ -156,7 +161,7 @@ public class OpentsdbTest{
           }
           switch (sqlchoice) {
             case "q1":
-              get_url = "http://192.168.1.114:4242/api/query?";
+              get_url = "http://127.0.0.1:4242/api/query?";
               /*
               get_url = get_url + "start=1563249700&m=none:temperature{devgroup=";
               get_url = get_url + String.valueOf(ig-10) +"}";
@@ -193,7 +198,7 @@ public class OpentsdbTest{
             case "q2":
               //count
               startTime = System.currentTimeMillis();
-              get_url = "http://192.168.1.114:4242/api/query?";
+              get_url = "http://127.0.0.1:4242/api/query?";
               httpPost = new HttpPost(get_url);
               qjson = "  {\n" +
               "   \"start\": 1563249700,\n" +
@@ -346,7 +351,7 @@ public class OpentsdbTest{
               break;
             case "q3":
               startTime = System.currentTimeMillis();
-              get_url = "http://192.168.1.114:4242/api/query?";
+              get_url = "http://127.0.0.1:4242/api/query?";
               httpPost = new HttpPost(get_url);
               qjson = "  {\n" +
               "   \"start\": 1563249700,\n" +
@@ -406,7 +411,7 @@ public class OpentsdbTest{
               break;
             case "q4":
               startTime = System.currentTimeMillis();
-              get_url = "http://192.168.1.114:4242/api/query?";
+              get_url = "http://127.0.0.1:4242/api/query?";
               httpPost = new HttpPost(get_url);
               qjson = "  {\n" +
               "   \"start\": 1563249700,\n" +
diff --git a/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/WriteThread.java b/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/WriteThread.java
index f6f9ef69055fd9eee591102b598adb31ea09410c..569925ccc61b304267ac68a4a33d1ba20302c6d7 100644
--- a/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/WriteThread.java
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/src/main/java/com/opentsdb/test/WriteThread.java
@@ -1,6 +1,5 @@
 import com.stumbleupon.async.Callback;
 import com.stumbleupon.async.Deferred;
-import lombok.extern.slf4j.Slf4j;
 
 import net.opentsdb.core.TSDB;
 import net.opentsdb.uid.NoSuchUniqueName;
@@ -64,7 +63,7 @@ public class WriteThread extends Thread {
   public void run() { 
     StringEntity stringEntity;
     String port = "4242";
-    String put_url = "http://192.168.1.114:"+port+"/api/put?summary";
+    String put_url = "http://127.0.0.1:"+port+"/api/put?summary";
     try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
       /*
       httpclient.getHttpConnectionManager().getParams()
@@ -152,4 +151,4 @@ public class WriteThread extends Thread {
         System.out.println("failed to connect");
     }
   }//end run
-}//end class
\ No newline at end of file
+}//end class
diff --git a/tests/comparisonTest/tdengine/CMakeLists.txt b/tests/comparisonTest/tdengine/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..990612b8c37a47fb9f4dc29e25f3e5c6840ff199
--- /dev/null
+++ b/tests/comparisonTest/tdengine/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+IF (TD_LINUX)
+  add_executable(tdengineTest tdengineTest.c)
+  target_link_libraries(tdengineTest taos_static tutil common pthread)
+ENDIF()
diff --git a/tests/comparisonTest/tdengine/q5.txt b/tests/comparisonTest/tdengine/q5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5f36955dd6a426cd3fae0a15d264facf4633502f
--- /dev/null
+++ b/tests/comparisonTest/tdengine/q5.txt
@@ -0,0 +1 @@
+select * from db.devices;
diff --git a/tests/comparisonTest/tdengine/tdengineTest.c b/tests/comparisonTest/tdengine/tdengineTest.c
index a2b048214f6a3189e95cb289fdd425dba6eede52..3d78a3d0a54ac571aceb13c1bb9a6f133589bd86 100644
--- a/tests/comparisonTest/tdengine/tdengineTest.c
+++ b/tests/comparisonTest/tdengine/tdengineTest.c
@@ -7,13 +7,15 @@
 #include <time.h>
 #include <pthread.h>
 #include <sys/time.h>
+#include <inttypes.h>
 
 typedef struct {
   char sql[256];
   char dataDir[256];
   int filesNum;
-  int writeClients;
+  int clients;
   int rowsPerRequest;
+  int write;
 } ProArgs;
 
 typedef struct {
@@ -40,7 +42,7 @@ int main(int argc, char *argv[]) {
   statis.totalRows = 0;
   parseArg(argc, argv);
 
-  if (arguments.writeClients > 0) {
+  if (arguments.write) {
     writeData();
   } else {
     readData();
@@ -51,7 +53,7 @@ void parseArg(int argc, char *argv[]) {
   strcpy(arguments.sql, "./sqlCmd.txt");
   strcpy(arguments.dataDir, "./testdata");
   arguments.filesNum = 2;
-  arguments.writeClients = 0;
+  arguments.clients = 1;
   arguments.rowsPerRequest = 100;
 
   for (int i = 1; i < argc; ++i) {
@@ -82,12 +84,12 @@ void parseArg(int argc, char *argv[]) {
         exit(EXIT_FAILURE);
       }
     }
-    else if (strcmp(argv[i], "-writeClients") == 0) {
+    else if (strcmp(argv[i], "-clients") == 0) {
       if (i < argc - 1) {
-        arguments.writeClients = atoi(argv[++i]);
+        arguments.clients = atoi(argv[++i]);
       }
       else {
-        fprintf(stderr, "'-writeClients' requires a parameter, default:%d\n", arguments.writeClients);
+        fprintf(stderr, "'-clients' requires a parameter, default:%d\n", arguments.clients);
         exit(EXIT_FAILURE);
       }
     }
@@ -100,6 +102,9 @@ void parseArg(int argc, char *argv[]) {
         exit(EXIT_FAILURE);
       }
     }
+    else if (strcmp(argv[i], "-w") == 0) {
+      arguments.write = 1;
+    }
   }
 }
 
@@ -123,19 +128,21 @@ void writeDataImp(void *param) {
   if (taos == NULL)
     taos_error(taos);
 
-  int code = taos_query(taos, "use db");
+  TAOS_RES* result = taos_query(taos, "use db");
+  int32_t code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
-  char sql[65000];
+  char *sql = calloc(1, 8*1024*1024);
   int sqlLen = 0;
   int lastMachineid = 0;
   int counter = 0;
   int totalRecords = 0;
 
   for (int j = pThread->sID; j <= pThread->eID; j++) {
-    char fileName[256];
+    char fileName[300];
     sprintf(fileName, "%s/testdata%d.csv", arguments.dataDir, j);
 
     FILE *fp = fopen(fileName, "r");
@@ -162,7 +169,7 @@ void writeDataImp(void *param) {
       int64_t timestamp;
       int temperature;
       float humidity;
-      sscanf(line, "%d%s%d%lld%d%f", &machineid, machinename, &machinegroup, &timestamp, &temperature, &humidity);
+      sscanf(line, "%d%s%d%" PRId64 "%d%f", &machineid, machinename, &machinegroup, &timestamp, &temperature, &humidity);
 
       if (counter == 0) {
         sqlLen = sprintf(sql, "insert into");
@@ -174,14 +181,16 @@ void writeDataImp(void *param) {
                           machineid, machineid, machinename, machinegroup);
       }
 
-      sqlLen += sprintf(sql + sqlLen, "(%lld,%d,%f)", timestamp, temperature, humidity);
+      sqlLen += sprintf(sql + sqlLen, "(%" PRId64 ",%d,%f)", timestamp, temperature, humidity);
       counter++;
 
       if (counter >= arguments.rowsPerRequest) {
-        int code = taos_query(taos, sql);
+        TAOS_RES *result = taos_query(taos, sql);
+        int32_t   code = taos_errno(result);
         if (code != 0) {
-          printf("thread:%d error:%d reason:%s\n", pThread->pid, code, taos_errstr(taos));
+          printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
         }
+        taos_free_result(result);
 
         totalRecords += counter;
         counter = 0;
@@ -194,20 +203,23 @@ void writeDataImp(void *param) {
   }
 
   if (counter > 0) {
-    int code = taos_query(taos, sql);
+    TAOS_RES *result = taos_query(taos, sql);
+    int32_t   code = taos_errno(result);
     if (code != 0) {
-      printf("thread:%d error:%d reason:%s\n", pThread->pid, code, taos_errstr(taos));
+      printf("thread:%d error:%d reason:%s\n", pThread->threadId, code, taos_errstr(taos));
     }
+    taos_free_result(result);
 
     totalRecords += counter;
   }
 
   __sync_fetch_and_add(&statis.totalRows, totalRecords);
+  free(sql);
 }
 
 void writeData() {
   printf("write data\n");
-  printf("---- writeClients: %d\n", arguments.writeClients);
+  printf("---- clients: %d\n", arguments.clients);
   printf("---- dataDir: %s\n", arguments.dataDir);
   printf("---- numOfFiles: %d\n", arguments.filesNum);
   printf("---- rowsPerRequest: %d\n", arguments.rowsPerRequest);
@@ -215,28 +227,32 @@ void writeData() {
   taos_init();
 
   void *taos = taos_connect("127.0.0.1", "root", "taosdata", NULL, 0);
-  if (taos == NULL)
-    taos_error(taos);
+  if (taos == NULL) taos_error(taos);
 
-  int code = taos_query(taos, "create database if not exists db");
+  TAOS_RES *result = taos_query(taos, "create database if not exists db");
+  int32_t   code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
-  code = taos_query(taos, "create table if not exists db.devices(ts timestamp, temperature int, humidity float) "
-    "tags(devid int, devname binary(16), devgroup int)");
+  result = taos_query(taos,
+                      "create table if not exists db.devices(ts timestamp, temperature int, humidity float) "
+                      "tags(devid int, devname binary(16), devgroup int)");
+  code = taos_errno(result);
   if (code != 0) {
     taos_error(taos);
   }
+  taos_free_result(result);
 
   int64_t st = getTimeStampMs();
 
-  int a = arguments.filesNum / arguments.writeClients;
-  int b = arguments.filesNum % arguments.writeClients;
+  int a = arguments.filesNum / arguments.clients;
+  int b = arguments.filesNum % arguments.clients;
   int last = 0;
 
-  ThreadObj *threads = calloc((size_t)arguments.writeClients, sizeof(ThreadObj));
-  for (int i = 0; i < arguments.writeClients; ++i) {
+  ThreadObj *threads = calloc((size_t)arguments.clients, sizeof(ThreadObj));
+  for (int i = 0; i < arguments.clients; ++i) {
     ThreadObj *pthread = threads + i;
     pthread_attr_t thattr;
     pthread->threadId = i + 1;
@@ -252,7 +268,7 @@ void writeData() {
     pthread_create(&pthread->pid, &thattr, (void *(*)(void *))writeDataImp, pthread);
   }
 
-  for (int i = 0; i < arguments.writeClients; i++) {
+  for (int i = 0; i < arguments.clients; i++) {
     pthread_join(threads[i].pid, NULL);
   }
 
@@ -260,17 +276,15 @@ void writeData() {
   float seconds = (float)elapsed / 1000;
   float rs = (float)statis.totalRows / seconds;
 
+  free(threads);
+
   printf("---- Spent %f seconds to insert %ld records, speed: %f Rows/Second\n", seconds, statis.totalRows, rs);
 }
 
-void readData() {
-  printf("read data\n");
-  printf("---- sql: %s\n", arguments.sql);
-
-  void *taos = taos_connect("127.0.0.1", "root", "taosdata", NULL, 0);
-  if (taos == NULL)
-    taos_error(taos);
-
+void readDataImp(void *param)
+{
+  ThreadObj *pThread = (ThreadObj *)param;
+  printf("Thread %d\n", pThread->threadId);
   FILE *fp = fopen(arguments.sql, "r");
   if (fp == NULL) {
     printf("failed to open file %s\n", arguments.sql);
@@ -278,6 +292,10 @@ void readData() {
   }
   printf("open file %s success\n", arguments.sql);
 
+  void *taos = taos_connect("127.0.0.1", "root", "taosdata", NULL, 0);
+  if (taos == NULL)
+    taos_error(taos);
+
   char *line = NULL;
   size_t len = 0;
   while (!feof(fp)) {
@@ -292,17 +310,12 @@ void readData() {
 
     int64_t st = getTimeStampMs();
 
-    int code = taos_query(taos, line);
+    TAOS_RES *result = taos_query(taos, line);
+    int32_t   code = taos_errno(result);
     if (code != 0) {
       taos_error(taos);
     }
 
-    void *result = taos_use_result(taos);
-    if (result == NULL) {
-      printf("failed to get result, reason:%s\n", taos_errstr(taos));
-      exit(1);
-    }
-
     TAOS_ROW row;
     int rows = 0;
     //int num_fields = taos_field_count(taos);
@@ -318,9 +331,36 @@ void readData() {
 
     int64_t elapsed = getTimeStampMs() - st;
     float seconds = (float)elapsed / 1000;
-    printf("---- Spent %f seconds to query: %s", seconds, line);
+    printf("---- Spent %f seconds to retrieve %d records, Thread:%d query: %s\n", seconds, rows, pThread->threadId, line);
   }
 
   fclose(fp);
 }
 
+void readData() {
+  printf("read data\n");
+  printf("---- sql: %s\n", arguments.sql);
+  printf("---- clients: %d\n", arguments.clients);
+
+  void *taos = taos_connect("127.0.0.1", "root", "taosdata", NULL, 0);
+  if (taos == NULL)
+    taos_error(taos);
+
+  ThreadObj *threads = calloc((size_t)arguments.clients, sizeof(ThreadObj));
+
+  for (int i = 0; i < arguments.clients; ++i) {
+    ThreadObj *pthread = threads + i;
+    pthread_attr_t thattr;
+    pthread->threadId = i + 1;
+    pthread_attr_init(&thattr);
+    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+    pthread_create(&pthread->pid, &thattr, (void *(*)(void *))readDataImp, pthread);
+  }
+
+  for (int i = 0; i < arguments.clients; i++) {
+    pthread_join(threads[i].pid, NULL);
+  }
+
+  free(threads);
+}
+
diff --git a/tests/examples/C#/TDengineDriver.cs b/tests/examples/C#/TDengineDriver.cs
index a11dae8e48adfc0509addae78e3a7211a841d131..b6f143e1813d60c1ac4ae8356efdca4929c51345 100644
--- a/tests/examples/C#/TDengineDriver.cs
+++ b/tests/examples/C#/TDengineDriver.cs
@@ -20,16 +20,17 @@ using System.Runtime.InteropServices;
 namespace TDengineDriver
 {
   enum TDengineDataType {
-    TSDB_DATA_TYPE_BOOL = 1,
-    TSDB_DATA_TYPE_TINYINT = 2,
-    TSDB_DATA_TYPE_SMALLINT = 3,
-    TSDB_DATA_TYPE_INT = 4,
-    TSDB_DATA_TYPE_BIGINT = 5,
-    TSDB_DATA_TYPE_FLOAT = 6,
-    TSDB_DATA_TYPE_DOUBLE = 7,
-    TSDB_DATA_TYPE_BINARY = 8,
-    TSDB_DATA_TYPE_TIMESTAMP = 9,
-    TSDB_DATA_TYPE_NCHAR = 10
+    TSDB_DATA_TYPE_NULL = 0,     // 1 bytes
+    TSDB_DATA_TYPE_BOOL = 1,     // 1 bytes
+    TSDB_DATA_TYPE_TINYINT = 2,  // 1 bytes
+    TSDB_DATA_TYPE_SMALLINT = 3, // 2 bytes
+    TSDB_DATA_TYPE_INT = 4,      // 4 bytes
+    TSDB_DATA_TYPE_BIGINT = 5,   // 8 bytes
+    TSDB_DATA_TYPE_FLOAT = 6,    // 4 bytes
+    TSDB_DATA_TYPE_DOUBLE = 7,   // 8 bytes
+    TSDB_DATA_TYPE_BINARY = 8,   // string
+    TSDB_DATA_TYPE_TIMESTAMP = 9,// 8 bytes
+    TSDB_DATA_TYPE_NCHAR = 10    // unicode string
   }
 
   enum TDengineInitOption
@@ -79,56 +80,53 @@ namespace TDengineDriver
   class TDengine
   {
     public const int TSDB_CODE_SUCCESS = 0;
-    public const int TSDB_CODE_DB_ALREADY_EXIST = 33;
-    public const int TSDB_CODE_TABLE_ALREADY_EXIST = 34;
-    
-    [DllImport("taos.dll", EntryPoint = "taos_init", CallingConvention = CallingConvention.StdCall)]
+
+    [DllImport("taos.dll", EntryPoint = "taos_init", CallingConvention = CallingConvention.Cdecl)]
     static extern public void Init();
 
-    [DllImport("taos.dll", EntryPoint = "taos_options", CallingConvention = CallingConvention.StdCall)]
+    [DllImport("taos.dll", EntryPoint = "taos_cleanup", CallingConvention = CallingConvention.Cdecl)]
+    static extern public void Cleanup();
+
+    [DllImport("taos.dll", EntryPoint = "taos_options", CallingConvention = CallingConvention.Cdecl)]
     static extern public void Options(int option, string value);
 
-    [DllImport("taos.dll", EntryPoint = "taos_connect", CallingConvention = CallingConvention.StdCall)]
-    static extern public long Connect(string ip, string user, string password, string db, int port);
+    [DllImport("taos.dll", EntryPoint = "taos_connect", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr Connect(string ip, string user, string password, string db, short port);
 
-    [DllImport("taos.dll", EntryPoint = "taos_errstr", CallingConvention = CallingConvention.StdCall)]
-    static extern private IntPtr taos_errstr(long taos);
-    static public string Error(long conn)
+    [DllImport("taos.dll", EntryPoint = "taos_errstr", CallingConvention = CallingConvention.Cdecl)]
+    static extern private IntPtr taos_errstr(IntPtr res);
+    static public string Error(IntPtr res)
     {
-      IntPtr errPtr = taos_errstr(conn);
+      IntPtr errPtr = taos_errstr(res);
       return Marshal.PtrToStringAnsi(errPtr);
     }
 
-    [DllImport("taos.dll", EntryPoint = "taos_errno", CallingConvention = CallingConvention.StdCall)]
-    static extern public int ErrorNo(long taos);
-
-    [DllImport("taos.dll", EntryPoint = "taos_query", CallingConvention = CallingConvention.StdCall)]
-    static extern public int Query(long taos, string sqlstr);
+    [DllImport("taos.dll", EntryPoint = "taos_errno", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int ErrorNo(IntPtr res);
 
-    [DllImport("taos.dll", EntryPoint = "taos_affected_rows", CallingConvention = CallingConvention.StdCall)]
-    static extern public int AffectRows(long taos);
+    [DllImport("taos.dll", EntryPoint = "taos_query", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr Query(IntPtr conn, string sqlstr);
 
-    [DllImport("taos.dll", EntryPoint = "taos_use_result", CallingConvention = CallingConvention.StdCall)]
-    static extern public long UseResult(long taos);
+    [DllImport("taos.dll", EntryPoint = "taos_affected_rows", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int AffectRows(IntPtr res);
 
-    [DllImport("taos.dll", EntryPoint = "taos_field_count", CallingConvention = CallingConvention.StdCall)]
-    static extern public int FieldCount(long taos);
+    [DllImport("taos.dll", EntryPoint = "taos_field_count", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int FieldCount(IntPtr res);
 
-    [DllImport("taos.dll", EntryPoint = "taos_fetch_fields", CallingConvention = CallingConvention.StdCall)]
-    static extern private IntPtr taos_fetch_fields(long res);
-    static public List<TDengineMeta> FetchFields(long taos)
+    [DllImport("taos.dll", EntryPoint = "taos_fetch_fields", CallingConvention = CallingConvention.Cdecl)]
+    static extern private IntPtr taos_fetch_fields(IntPtr res);
+    static public List<TDengineMeta> FetchFields(IntPtr res)
     {
       const int fieldSize = 68;
 
       List<TDengineMeta> metas = new List<TDengineMeta>();
-      long result = TDengine.UseResult(taos);
-      if (result == 0)
+      if (res == IntPtr.Zero)
       {
         return metas;
       }
 
-      int fieldCount = FieldCount(taos);
-      IntPtr fieldsPtr = taos_fetch_fields(result);
+      int fieldCount = FieldCount(res);
+      IntPtr fieldsPtr = taos_fetch_fields(res);
   
       for (int i = 0; i < fieldCount; ++i)
       {
@@ -136,21 +134,21 @@ namespace TDengineDriver
         
         TDengineMeta meta = new TDengineMeta();
         meta.name = Marshal.PtrToStringAnsi(fieldsPtr + offset);
-        meta.size = Marshal.ReadInt16(fieldsPtr + offset + 64);
-        meta.type = Marshal.ReadByte(fieldsPtr + offset + 66);
+        meta.type = Marshal.ReadByte(fieldsPtr + offset + 65);
+        meta.size = Marshal.ReadInt16(fieldsPtr + offset + 66);
         metas.Add(meta);
       }
 
       return metas;
     }
 
-    [DllImport("taos.dll", EntryPoint = "taos_fetch_row", CallingConvention = CallingConvention.StdCall)]
-    static extern public IntPtr FetchRows(long res);
+    [DllImport("taos.dll", EntryPoint = "taos_fetch_row", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr FetchRows(IntPtr res);
 
-    [DllImport("taos.dll", EntryPoint = "taos_free_result", CallingConvention = CallingConvention.StdCall)]
-    static extern public IntPtr FreeResult(long res);
+    [DllImport("taos.dll", EntryPoint = "taos_free_result", CallingConvention = CallingConvention.Cdecl)]
+    static extern public IntPtr FreeResult(IntPtr res);
 
-    [DllImport("taos.dll", EntryPoint = "taos_close", CallingConvention = CallingConvention.StdCall)]
-    static extern public int Close(long taos);
+    [DllImport("taos.dll", EntryPoint = "taos_close", CallingConvention = CallingConvention.Cdecl)]
+    static extern public int Close(IntPtr taos);
   }
 }
\ No newline at end of file
diff --git a/tests/examples/C#/TDengineTest.cs b/tests/examples/C#/TDengineTest.cs
index 235775f68fcb7280b491f347a0962010af535e29..6b3f1160adc08fd18a16a1292b08a8b798ce389d 100644
--- a/tests/examples/C#/TDengineTest.cs
+++ b/tests/examples/C#/TDengineTest.cs
@@ -28,7 +28,7 @@ namespace TDengineDriver
     private string configDir;
     private string user;
     private string password;
-    private int port = 0;
+    private short  port = 0;
 
     //sql parameters
     private string dbName;
@@ -43,7 +43,7 @@ namespace TDengineDriver
     private long batchRows;
     private long beginTimestamp = 1551369600000L;
 
-    private long conn = 0;
+    private IntPtr conn = IntPtr.Zero;
     private long rowsInserted = 0;
 
     static void Main(string[] args)
@@ -191,7 +191,7 @@ namespace TDengineDriver
     {
       string db = "";
       this.conn = TDengine.Connect(this.host, this.user, this.password, db, this.port);
-      if (this.conn == 0)
+      if (this.conn == IntPtr.Zero)
       {
         Console.WriteLine("Connect to TDengine failed");
         ExitProgram();
@@ -211,58 +211,62 @@ namespace TDengineDriver
 
       StringBuilder sql = new StringBuilder();
       sql.Append("create database if not exists ").Append(this.dbName);
-      int code = TDengine.Query(this.conn, sql.ToString());
-      if (code == TDengine.TSDB_CODE_SUCCESS)
+      IntPtr res = TDengine.Query(this.conn, sql.ToString());
+      if (res != IntPtr.Zero)
       {
         Console.WriteLine(sql.ToString() + " success");
       }
       else
       {
-        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(conn));
+        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
         ExitProgram();
       }
+      TDengine.FreeResult(res);
 
       sql.Clear();
       sql.Append("use ").Append(this.dbName);
-      code = TDengine.Query(this.conn, sql.ToString());
-      if (code == TDengine.TSDB_CODE_SUCCESS)
+      res = TDengine.Query(this.conn, sql.ToString());
+      if (res != IntPtr.Zero)
       {
         Console.WriteLine(sql.ToString() + " success");
       }
       else
       {
-        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(this.conn));
+        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
         ExitProgram();
       }
+      TDengine.FreeResult(res);
 
       sql.Clear();
-      sql.Append("create table if not exists ").Append(this.stableName).Append("(ts timestamp, v1 int) tags(t1 int)");
-      code = TDengine.Query(this.conn, sql.ToString());
-      if (code == TDengine.TSDB_CODE_SUCCESS)
+      sql.Append("create table if not exists ").Append(this.stableName).Append("(ts timestamp, v1 bool, v2 tinyint, v3 smallint, v4 int, v5 bigint, v6 float, v7 double, v8 binary(10), v9 nchar(10)) tags(t1 int)");
+      res = TDengine.Query(this.conn, sql.ToString());
+      if (res != IntPtr.Zero)
       {
         Console.WriteLine(sql.ToString() + " success");
       }
       else
       {
-        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(this.conn));
+        Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
         ExitProgram();
       }
+      TDengine.FreeResult(res);
 
       for (int i = 0; i < this.tableCount; i++)
       {
         sql.Clear();
         sql = sql.Append("create table if not exists ").Append(this.tablePrefix).Append(i)
           .Append(" using ").Append(this.stableName).Append(" tags(").Append(i).Append(")");
-        code = TDengine.Query(this.conn, sql.ToString());
-        if (code == TDengine.TSDB_CODE_SUCCESS)
+        res = TDengine.Query(this.conn, sql.ToString());
+        if (res != IntPtr.Zero)
         {
           Console.WriteLine(sql.ToString() + " success");
         }
         else
         {
-          Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(this.conn));
+          Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
           ExitProgram();
         }
+        TDengine.FreeResult(res);
       }
 
       Console.WriteLine("create db and table success");
@@ -287,16 +291,22 @@ namespace TDengineDriver
           for (int batch = 0; batch < this.batchRows; ++batch)
           {
             long rows = loop * this.batchRows + batch;
-            sql.Append("(").Append(this.beginTimestamp + rows).Append(",").Append(rows).Append(")");
+            sql.Append("(")
+               .Append(this.beginTimestamp + rows)
+               .Append(", 1, 2, 3,")
+               .Append(rows)
+               .Append(", 5, 6, 7, 'abc', 'def')");
           }
-          int code = TDengine.Query(conn, sql.ToString());
-          if (code != TDengine.TSDB_CODE_SUCCESS)
+          IntPtr res = TDengine.Query(this.conn, sql.ToString());
+          if (res == IntPtr.Zero)
           {
-            Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(conn));
+            Console.WriteLine(sql.ToString() + " failure, reason: " + TDengine.Error(res));
           }
 
-          int affectRows = TDengine.AffectRows(conn);
+          int affectRows = TDengine.AffectRows(res);
           this.rowsInserted += affectRows;
+
+          TDengine.FreeResult(res);
         }
       }
 
@@ -316,51 +326,45 @@ namespace TDengineDriver
 
       System.DateTime start = new System.DateTime();
       long queryRows = 0;
-
-      for (int i = 0; i < this.tableCount; ++i)
+      
+      for (int i = 0; i < 1/*this.tableCount*/; ++i)
       {
         String sql = "select * from " + this.dbName + "." + tablePrefix + i;
         Console.WriteLine(sql);
 
-        int code = TDengine.Query(conn, sql);
-        if (code != TDengine.TSDB_CODE_SUCCESS)
+        IntPtr res = TDengine.Query(conn, sql);
+        if (res == IntPtr.Zero)
         {
-          Console.WriteLine(sql + " failure, reason: " + TDengine.Error(conn));
+          Console.WriteLine(sql + " failure, reason: " + TDengine.Error(res));
           ExitProgram();
         }
 
-        int fieldCount = TDengine.FieldCount(conn);
-        //Console.WriteLine("field count: " + fieldCount);
+        int fieldCount = TDengine.FieldCount(res);
+        Console.WriteLine("field count: " + fieldCount);
 
-        List<TDengineMeta> metas = TDengine.FetchFields(conn);
+        List<TDengineMeta> metas = TDengine.FetchFields(res);
         for (int j = 0; j < metas.Count; j++)
         {
           TDengineMeta meta = (TDengineMeta)metas[j];
-          //Console.WriteLine("index:" + j + ", type:" + meta.type + ", typename:" + meta.TypeName() + ", name:" + meta.name + ", size:" + meta.size);
-        }
-
-        long result = TDengine.UseResult(conn);
-        if (result == 0)
-        {
-          Console.WriteLine(sql + " result set is null");
-          return;
+          Console.WriteLine("index:" + j + ", type:" + meta.type + ", typename:" + meta.TypeName() + ", name:" + meta.name + ", size:" + meta.size);
         }
 
         IntPtr rowdata;
-        while ((rowdata = TDengine.FetchRows(result)) != IntPtr.Zero)
+        StringBuilder builder = new StringBuilder();
+        while ((rowdata = TDengine.FetchRows(res)) != IntPtr.Zero)
         {
           queryRows++;
           for (int fields = 0; fields < fieldCount; ++fields)
           {
             TDengineMeta meta = metas[fields];
-            int offset = 8 * fields;
+            int offset = IntPtr.Size * fields;
             IntPtr data = Marshal.ReadIntPtr(rowdata, offset);
 
-            //Console.Write("---");
+            builder.Append("---");
 
             if (data == IntPtr.Zero)
             {
-              //Console.Write("NULL");
+              builder.Append("NULL");
               continue;
             }
 
@@ -368,55 +372,61 @@ namespace TDengineDriver
             {
               case TDengineDataType.TSDB_DATA_TYPE_BOOL:
                 bool v1 = Marshal.ReadByte(data) == 0 ? false : true;
-                //Console.Write(v1);
+                builder.Append(v1);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_TINYINT:
                 byte v2 = Marshal.ReadByte(data);
-                //Console.Write(v2);
+                builder.Append(v2);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_SMALLINT:
                 short v3 = Marshal.ReadInt16(data);
-                //Console.Write(v3);
+                builder.Append(v3);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_INT:
                 int v4 = Marshal.ReadInt32(data);
-                //Console.Write(v4);
+                builder.Append(v4);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_BIGINT:
                 long v5 = Marshal.ReadInt64(data);
-                //Console.Write(v5);
+                builder.Append(v5);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_FLOAT:
                 float v6 = (float)Marshal.PtrToStructure(data, typeof(float));
-                //Console.Write(v6);
+                builder.Append(v6);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_DOUBLE:
                 double v7 = (double)Marshal.PtrToStructure(data, typeof(double));
-                //Console.Write(v7);
+                builder.Append(v7);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_BINARY:
                 string v8 = Marshal.PtrToStringAnsi(data);
-                //Console.Write(v8);
+                builder.Append(v8);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_TIMESTAMP:
                 long v9 = Marshal.ReadInt64(data);
-                //Console.Write(v9);
+                builder.Append(v9);
                 break;
               case TDengineDataType.TSDB_DATA_TYPE_NCHAR:
                 string v10 = Marshal.PtrToStringAnsi(data);
-                //Console.Write(v10);
+                builder.Append(v10);
                 break;
             }
           }
-          //Console.WriteLine("---");
+          builder.Append("---");
+
+          if (queryRows <= 10)
+          {
+            Console.WriteLine(builder.ToString());
+          }
+          builder.Clear();
         }
 
-        if (TDengine.ErrorNo(conn) != 0)
+        if (TDengine.ErrorNo(res) != 0)
         {
-          Console.Write("Query is not complete， Error {0:G}", TDengine.ErrorNo(conn), TDengine.Error(conn));
+          Console.Write("Query is not complete, Error {0:G}", TDengine.ErrorNo(res), TDengine.Error(res));
         }
 
-        TDengine.FreeResult(result);
+        TDengine.FreeResult(res);
       }
 
       System.DateTime end = new System.DateTime();
@@ -428,14 +438,15 @@ namespace TDengineDriver
 
     public void CloseConnection()
     {
-      if (conn != 0)
+      if (this.conn != IntPtr.Zero)
       {
-        TDengine.Close(conn);
+        TDengine.Close(this.conn);
       }
     }
 
     static void ExitProgram()
     {
+      TDengine.Cleanup();
       System.Environment.Exit(0);
     }
   }
diff --git a/tests/examples/JDBC/JDBCDemo/.gitignore b/tests/examples/JDBC/JDBCDemo/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b79f223d17fd22185243066700aede395f6328fd
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/.gitignore
@@ -0,0 +1,19 @@
+# custom
+/out/
+/logs/
+*.jar
+
+# Created by .ignore support plugin (hsz.mobi)
+.gitignore
+
+# Build Artifacts
+.gradle/*
+build/*
+target/*
+bin/*
+dependency-reduced-pom.xml
+
+# Eclipse Project Files
+.classpath
+.project
+.settings/*
diff --git a/tests/examples/JDBC/JDBCDemo/pom.xml b/tests/examples/JDBC/JDBCDemo/pom.xml
index d015c62772d615fb6afb275856da5a81c339644c..21130746741209b1b9e89d00a73c7e52e496b519 100644
--- a/tests/examples/JDBC/JDBCDemo/pom.xml
+++ b/tests/examples/JDBC/JDBCDemo/pom.xml
@@ -9,21 +9,20 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugins</artifactId>
-                    <version>30</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugins</artifactId>
+                <version>30</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -48,6 +47,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -63,7 +63,12 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>1.0.1</version>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCConnectorChecker.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCConnectorChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..74e586d7fdf1a0f8ad65a807134caae7e05f6d4a
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCConnectorChecker.java
@@ -0,0 +1,172 @@
+package com.taosdata.example;
+
+import com.taosdata.jdbc.TSDBDriver;
+
+import java.sql.*;
+import java.util.Properties;
+
+public class JDBCConnectorChecker {
+    private static String host;
+    private static String dbName = "test";
+    private static String tbName = "weather";
+    private Connection connection;
+
+    /**
+     * get connection
+     **/
+    private void init() {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            Properties properties = new Properties();
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, host);
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            System.out.println("get connection starting...");
+            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
+            if (connection != null)
+                System.out.println("[ OK ] Connection established.");
+        } catch (ClassNotFoundException | SQLException e) {
+            throw new RuntimeException("connection failed: " + host);
+        }
+    }
+
+    /**
+     * create database
+     */
+    private void createDatabase() {
+        String sql = "create database if not exists " + dbName;
+        exuete(sql);
+    }
+
+    /**
+     * use database
+     */
+    private void useDatabase() {
+        String sql = "use " + dbName;
+        exuete(sql);
+    }
+
+    /**
+     * select
+     */
+    private void checkSelect() {
+        final String sql = "select * from test.weather";
+        executeQuery(sql);
+    }
+
+    private void executeQuery(String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            ResultSet resultSet = statement.executeQuery(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, true, (end - start));
+            printResult(resultSet);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void printResult(ResultSet resultSet) throws SQLException {
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        while (resultSet.next()) {
+            for (int i = 1; i <= metaData.getColumnCount(); i++) {
+                String columnLabel = metaData.getColumnLabel(i);
+                String value = resultSet.getString(i);
+                System.out.printf("%s: %s\t", columnLabel, value);
+            }
+            System.out.println();
+        }
+    }
+
+    private String formatString(String str) {
+        StringBuilder sb = new StringBuilder();
+        int blankCnt = (26 - str.length()) / 2;
+        for (int j = 0; j < blankCnt; j++)
+            sb.append(" ");
+        sb.append(str);
+        for (int j = 0; j < blankCnt; j++)
+            sb.append(" ");
+        sb.append("|");
+        return sb.toString();
+    }
+
+
+    /**
+     * insert
+     */
+    private void checkInsert() {
+        final String sql = "insert into test.weather (ts, temperature, humidity) values(now, 20.5, 34)";
+        exuete(sql);
+    }
+
+    /**
+     * create table
+     */
+    private void createTable() {
+        final String sql = "create table if not exists " + dbName + "." + tbName + " (ts timestamp, temperature float, humidity int)";
+        exuete(sql);
+    }
+
+    private final void printSql(String sql, boolean succeed, long cost) {
+        System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
+    }
+
+    private final void exuete(String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            boolean execute = statement.execute(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, execute, (end - start));
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void close() {
+        try {
+            if (connection != null) {
+                this.connection.close();
+                System.out.println("connection closed.");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void checkDropTable() {
+        final String sql = "drop table if exists " + dbName + "." + tbName + "";
+        exuete(sql);
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if ("-host".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                host = args[++i];
+            }
+            if ("-db".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                dbName = args[++i];
+            }
+            if ("-t".equalsIgnoreCase(args[i]) && i < args.length - 1) {
+                tbName = args[++i];
+            }
+        }
+
+        if (host == null) {
+            System.out.println("Usage: java -jar JDBCConnectorChecker.jar -host <hostname>");
+            return;
+        }
+
+        JDBCConnectorChecker checker = new JDBCConnectorChecker();
+        checker.init();
+        checker.createDatabase();
+        checker.useDatabase();
+        checker.checkDropTable();
+        checker.createTable();
+        checker.checkInsert();
+        checker.checkSelect();
+        checker.checkDropTable();
+        checker.close();
+    }
+
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/JdbcTaosdemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/JdbcTaosdemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..c30d85a084d7175e9e6861ad33d7374a868553d9
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/JdbcTaosdemo.java
@@ -0,0 +1,279 @@
+package com.taosdata.example.jdbcTaosdemo;
+
+import com.taosdata.example.jdbcTaosdemo.domain.JdbcTaosdemoConfig;
+import com.taosdata.example.jdbcTaosdemo.task.CreateTableTask;
+import com.taosdata.example.jdbcTaosdemo.task.InsertTableDatetimeTask;
+import com.taosdata.example.jdbcTaosdemo.task.InsertTableTask;
+import com.taosdata.example.jdbcTaosdemo.utils.ConnectionFactory;
+import com.taosdata.example.jdbcTaosdemo.utils.SqlSpeller;
+import com.taosdata.example.jdbcTaosdemo.utils.TimeStampUtil;
+import org.apache.log4j.Logger;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class JdbcTaosdemo {
+
+    private static Logger logger = Logger.getLogger(JdbcTaosdemo.class);
+    private final JdbcTaosdemoConfig config;
+    private Connection connection;
+
+    public JdbcTaosdemo(JdbcTaosdemoConfig config) {
+        this.config = config;
+    }
+
+    public static void main(String[] args) {
+        JdbcTaosdemoConfig config = new JdbcTaosdemoConfig(args);
+
+        boolean isHelp = Arrays.asList(args).contains("--help");
+        if (isHelp) {
+            JdbcTaosdemoConfig.printHelp();
+            return;
+        }
+        if (config.getHost() == null) {
+            JdbcTaosdemoConfig.printHelp();
+            return;
+        }
+
+        JdbcTaosdemo taosdemo = new JdbcTaosdemo(config);
+        taosdemo.init();
+        taosdemo.dropDatabase();
+        taosdemo.createDatabase();
+        taosdemo.useDatabase();
+        taosdemo.createSuperTable();
+        taosdemo.createTableMultiThreads();
+
+        boolean infinite = Arrays.asList(args).contains("--infinite");
+        if (infinite) {
+            logger.info("!!! Infinite Insert Mode Started. !!!!");
+            taosdemo.insertInfinite();
+        } else {
+            taosdemo.insertMultiThreads();
+            // single table select
+            taosdemo.selectFromTableLimit();
+            taosdemo.selectCountFromTable();
+            taosdemo.selectAvgMinMaxFromTable();
+            // super table select
+            taosdemo.selectFromSuperTableLimit();
+            taosdemo.selectCountFromSuperTable();
+            taosdemo.selectAvgMinMaxFromSuperTable();
+            // drop super table
+            if (config.isDeleteTable())
+                taosdemo.dropSuperTable();
+            taosdemo.close();
+        }
+    }
+
+
+    /**
+     * establish the connection
+     */
+    private void init() {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            connection = ConnectionFactory.build(config);
+            if (connection != null)
+                logger.info("[ OK ] Connection established.");
+        } catch (ClassNotFoundException | SQLException e) {
+            logger.error(e.getMessage());
+            throw new RuntimeException("connection failed: " + config.getHost());
+        }
+    }
+
+    /**
+     * create database
+     */
+    private void createDatabase() {
+        String sql = SqlSpeller.createDatabaseSQL(config.getDbName(), config.getKeep(), config.getDays());
+        execute(sql);
+    }
+
+    /**
+     * drop database
+     */
+    private void dropDatabase() {
+        String sql = SqlSpeller.dropDatabaseSQL(config.getDbName());
+        execute(sql);
+    }
+
+    /**
+     * use database
+     */
+    private void useDatabase() {
+        String sql = SqlSpeller.useDatabaseSQL(config.getDbName());
+        execute(sql);
+    }
+
+    /**
+     * create super table
+     */
+    private void createSuperTable() {
+        String sql = SqlSpeller.createSuperTableSQL(config.getStbName());
+        execute(sql);
+    }
+
+    /**
+     * create table use super table with multi threads
+     */
+    private void createTableMultiThreads() {
+        try {
+            final int tableSize = config.getNumberOfTable() / config.getNumberOfThreads();
+            List<Thread> threads = new ArrayList<>();
+            for (int i = 0; i < config.getNumberOfThreads(); i++) {
+                Thread thread = new Thread(new CreateTableTask(config, i * tableSize, tableSize), "Thread-" + i);
+                threads.add(thread);
+                thread.start();
+            }
+            for (Thread thread : threads) {
+                thread.join();
+            }
+            logger.info("<<< Multi Threads create table finished.");
+        } catch (InterruptedException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * insert data infinitely
+     */
+    private void insertInfinite() {
+        try {
+            final long startDatetime = TimeStampUtil.datetimeToLong("2005-01-01 00:00:00.000");
+            final long finishDatetime = TimeStampUtil.datetimeToLong("2030-01-01 00:00:00.000");
+
+            final int tableSize = config.getNumberOfTable() / config.getNumberOfThreads();
+            List<Thread> threads = new ArrayList<>();
+            for (int i = 0; i < config.getNumberOfThreads(); i++) {
+                Thread thread = new Thread(new InsertTableDatetimeTask(config, i * tableSize, tableSize, startDatetime, finishDatetime), "Thread-" + i);
+                threads.add(thread);
+                thread.start();
+            }
+            for (Thread thread : threads) {
+                thread.join();
+            }
+            logger.info("<<< Multi Threads insert table finished.");
+        } catch (InterruptedException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private void insertMultiThreads() {
+        try {
+            final int tableSize = config.getNumberOfTable() / config.getNumberOfThreads();
+            final int numberOfRecordsPerTable = config.getNumberOfRecordsPerTable();
+            List<Thread> threads = new ArrayList<>();
+            for (int i = 0; i < config.getNumberOfThreads(); i++) {
+                Thread thread = new Thread(new InsertTableTask(config, i * tableSize, tableSize, numberOfRecordsPerTable), "Thread-" + i);
+                threads.add(thread);
+                thread.start();
+            }
+            for (Thread thread : threads) {
+                thread.join();
+            }
+            logger.info("<<< Multi Threads insert table finished.");
+        } catch (InterruptedException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private void selectFromTableLimit() {
+        String sql = SqlSpeller.selectFromTableLimitSQL(config.getDbName(), config.getTbPrefix(), 1, 10, 0);
+        executeQuery(sql);
+    }
+
+    private void selectCountFromTable() {
+        String sql = SqlSpeller.selectCountFromTableSQL(config.getDbName(), config.getTbPrefix(), 1);
+        executeQuery(sql);
+    }
+
+    private void selectAvgMinMaxFromTable() {
+        String sql = SqlSpeller.selectAvgMinMaxFromTableSQL("current", config.getDbName(), config.getTbPrefix(), 1);
+        executeQuery(sql);
+    }
+
+    private void selectFromSuperTableLimit() {
+        String sql = SqlSpeller.selectFromSuperTableLimitSQL(config.getDbName(), config.getStbName(), 10, 0);
+        executeQuery(sql);
+    }
+
+    private void selectCountFromSuperTable() {
+        String sql = SqlSpeller.selectCountFromSuperTableSQL(config.getDbName(), config.getStbName());
+        executeQuery(sql);
+    }
+
+    private void selectAvgMinMaxFromSuperTable() {
+        String sql = SqlSpeller.selectAvgMinMaxFromSuperTableSQL("current", config.getDbName(), config.getStbName());
+        executeQuery(sql);
+    }
+
+    private void close() {
+        try {
+            if (connection != null) {
+                this.connection.close();
+                logger.info("connection closed.");
+            }
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * drop super table
+     */
+    private void dropSuperTable() {
+        String sql = SqlSpeller.dropSuperTableSQL(config.getDbName(), config.getStbName());
+        execute(sql);
+    }
+
+    /**
+     * execute sql, use this method when sql is create, alter, drop..
+     */
+    private void execute(String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            boolean execute = statement.execute(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, execute, (end - start));
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private static void printSql(String sql, boolean succeed, long cost) {
+        System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
+    }
+
+    private void executeQuery(String sql) {
+        try (Statement statement = connection.createStatement()) {
+            long start = System.currentTimeMillis();
+            ResultSet resultSet = statement.executeQuery(sql);
+            long end = System.currentTimeMillis();
+            printSql(sql, true, (end - start));
+            printResult(resultSet);
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private static void printResult(ResultSet resultSet) throws SQLException {
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        while (resultSet.next()) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 1; i <= metaData.getColumnCount(); i++) {
+                String columnLabel = metaData.getColumnLabel(i);
+                String value = resultSet.getString(i);
+                sb.append(columnLabel + ": " + value + "\t");
+            }
+            System.out.println(sb.toString());
+        }
+    }
+
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/domain/JdbcTaosdemoConfig.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/domain/JdbcTaosdemoConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cca9a3d7a8b45be5d733b9f7a4836eb89c828c3
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/domain/JdbcTaosdemoConfig.java
@@ -0,0 +1,153 @@
+package com.taosdata.example.jdbcTaosdemo.domain;
+
+public final class JdbcTaosdemoConfig {
+
+    //The host to connect to TDengine. Must insert one
+    private String host;
+    //The TCP/IP port number to use for the connection. Default is 6030.
+    private int port = 6030;
+    //The TDengine user name to use when connecting to the server. Default is 'root'
+    private String user = "root";
+    //The password to use when connecting to the server. Default is 'taosdata'
+    private String password = "taosdata";
+
+    //Destination database. Default is 'test'
+    private String dbName = "test";
+    //keep
+    private int keep = 365 * 20;
+    //days
+    private int days = 30;
+
+    //Super table Name. Default is 'meters'
+    private String stbName = "meters";
+    //Table name prefix. Default is 'd'
+    private String tbPrefix = "d";
+    //The number of tables. Default is 10.
+    private int numberOfTable = 10;
+    //The number of records per table. Default is 2
+    private int numberOfRecordsPerTable = 2;
+    //The number of records per request. Default is 100
+    private int numberOfRecordsPerRequest = 100;
+
+    //The number of threads. Default is 1.
+    private int numberOfThreads = 1;
+    //Delete data. Default is false
+    private boolean deleteTable = false;
+
+    public static void printHelp() {
+        System.out.println("Usage: java -jar JDBCConnectorChecker.jar [OPTION...]");
+        System.out.println("-h    host                       The host to connect to TDengine. you must input one");
+        System.out.println("-p    port                       The TCP/IP port number to use for the connection. Default is 6030");
+        System.out.println("-u    user                       The TDengine user name to use when connecting to the server. Default is 'root'");
+        System.out.println("-P    password                   The password to use when connecting to the server.Default is 'taosdata'");
+        System.out.println("-d    database                   Destination database. Default is 'test'");
+        System.out.println("-m    tablePrefix                Table prefix name. Default is 'd'");
+        System.out.println("-t    num_of_tables              The number of tables. Default is 10");
+        System.out.println("-n    num_of_records_per_table   The number of records per table. Default is 2");
+        System.out.println("-r    num_of_records_per_req     The number of records per request. Default is 100");
+        System.out.println("-T    num_of_threads             The number of threads. Default is 1");
+        System.out.println("-D    delete table               Delete data methods. Default is false");
+        System.out.println("--help                           Give this help list");
+//        System.out.println("--infinite                       infinite insert mode");
+    }
+
+    /**
+     * parse args from command line
+     *
+     * @param args command line args
+     * @return JdbcTaosdemoConfig
+     */
+    public JdbcTaosdemoConfig(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if ("-h".equals(args[i]) && i < args.length - 1) {
+                host = args[++i];
+            }
+            if ("-p".equals(args[i]) && i < args.length - 1) {
+                port = Integer.parseInt(args[++i]);
+            }
+            if ("-u".equals(args[i]) && i < args.length - 1) {
+                user = args[++i];
+            }
+            if ("-P".equals(args[i]) && i < args.length - 1) {
+                password = args[++i];
+            }
+            if ("-d".equals(args[i]) && i < args.length - 1) {
+                dbName = args[++i];
+            }
+            if ("-m".equals(args[i]) && i < args.length - 1) {
+                tbPrefix = args[++i];
+            }
+            if ("-t".equals(args[i]) && i < args.length - 1) {
+                numberOfTable = Integer.parseInt(args[++i]);
+            }
+            if ("-n".equals(args[i]) && i < args.length - 1) {
+                numberOfRecordsPerTable = Integer.parseInt(args[++i]);
+            }
+            if ("-r".equals(args[i]) && i < args.length - 1) {
+                numberOfRecordsPerRequest = Integer.parseInt(args[++i]);
+            }
+            if ("-T".equals(args[i]) && i < args.length - 1) {
+                numberOfThreads = Integer.parseInt(args[++i]);
+            }
+            if ("-D".equals(args[i]) && i < args.length - 1) {
+                deleteTable = Boolean.parseBoolean(args[++i]);
+            }
+        }
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public int getKeep() {
+        return keep;
+    }
+
+    public int getDays() {
+        return days;
+    }
+
+    public String getStbName() {
+        return stbName;
+    }
+
+    public String getTbPrefix() {
+        return tbPrefix;
+    }
+
+    public int getNumberOfTable() {
+        return numberOfTable;
+    }
+
+    public int getNumberOfRecordsPerTable() {
+        return numberOfRecordsPerTable;
+    }
+
+    public int getNumberOfThreads() {
+        return numberOfThreads;
+    }
+
+    public boolean isDeleteTable() {
+        return deleteTable;
+    }
+
+    public int getNumberOfRecordsPerRequest() {
+        return numberOfRecordsPerRequest;
+    }
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/CreateTableTask.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/CreateTableTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..1da2c8647efe0e9204f1a591ba9431a489c91cb0
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/CreateTableTask.java
@@ -0,0 +1,42 @@
+package com.taosdata.example.jdbcTaosdemo.task;
+
+import com.taosdata.example.jdbcTaosdemo.domain.JdbcTaosdemoConfig;
+import com.taosdata.example.jdbcTaosdemo.utils.ConnectionFactory;
+import com.taosdata.example.jdbcTaosdemo.utils.SqlSpeller;
+import org.apache.log4j.Logger;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class CreateTableTask implements Runnable {
+
+    private static Logger logger = Logger.getLogger(CreateTableTask.class);
+    private final JdbcTaosdemoConfig config;
+    private final int startIndex;
+    private final int tableNumber;
+
+    public CreateTableTask(JdbcTaosdemoConfig config, int startIndex, int tableNumber) {
+        this.config = config;
+        this.startIndex = startIndex;
+        this.tableNumber = tableNumber;
+    }
+
+    @Override
+    public void run() {
+        try {
+            Connection connection = ConnectionFactory.build(config);
+            for (int i = startIndex; i < startIndex + tableNumber; i++) {
+                Statement statement = connection.createStatement();
+                String sql = SqlSpeller.createTableSQL(i + 1, config.getDbName(), config.getStbName());
+                statement.execute(sql);
+                statement.close();
+                logger.info(">>> " + sql);
+            }
+            connection.close();
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableDatetimeTask.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableDatetimeTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f60c25646573223a9cbfd820c8eb37e4f6f6c8c
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableDatetimeTask.java
@@ -0,0 +1,49 @@
+package com.taosdata.example.jdbcTaosdemo.task;
+
+import com.taosdata.example.jdbcTaosdemo.domain.JdbcTaosdemoConfig;
+import com.taosdata.example.jdbcTaosdemo.utils.ConnectionFactory;
+import com.taosdata.example.jdbcTaosdemo.utils.SqlSpeller;
+import org.apache.log4j.Logger;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class InsertTableDatetimeTask implements Runnable {
+    private static Logger logger = Logger.getLogger(InsertTableDatetimeTask.class);
+
+    private final JdbcTaosdemoConfig config;
+    private final int startTableIndex;
+    private final int tableNumber;
+    private final long startDatetime;
+    private final long finishedDatetime;
+
+    public InsertTableDatetimeTask(JdbcTaosdemoConfig config, int startTableIndex, int tableNumber, long startDatetime, long finishedDatetime) {
+        this.config = config;
+        this.startTableIndex = startTableIndex;
+        this.tableNumber = tableNumber;
+        this.startDatetime = startDatetime;
+        this.finishedDatetime = finishedDatetime;
+    }
+
+    @Override
+    public void run() {
+        try {
+            Connection connection = ConnectionFactory.build(config);
+            int valuesCount = config.getNumberOfRecordsPerRequest();
+            for (long ts = startDatetime; ts < finishedDatetime; ts += valuesCount) {
+                for (int i = startTableIndex; i < startTableIndex + tableNumber; i++) {
+                    String sql = SqlSpeller.insertBatchSizeRowsSQL(config.getDbName(), config.getTbPrefix(), i + 1, ts, valuesCount);
+                    Statement statement = connection.createStatement();
+                    statement.execute(sql);
+                    statement.close();
+                    logger.info(Thread.currentThread().getName() + ">>> " + sql);
+                }
+            }
+            connection.close();
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableTask.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6d6ebbff1ac08e68e3e8034a59f84189ad86bf4
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/task/InsertTableTask.java
@@ -0,0 +1,52 @@
+package com.taosdata.example.jdbcTaosdemo.task;
+
+import com.taosdata.example.jdbcTaosdemo.domain.JdbcTaosdemoConfig;
+import com.taosdata.example.jdbcTaosdemo.utils.ConnectionFactory;
+import com.taosdata.example.jdbcTaosdemo.utils.SqlSpeller;
+import com.taosdata.example.jdbcTaosdemo.utils.TimeStampUtil;
+import org.apache.log4j.Logger;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class InsertTableTask implements Runnable {
+    private static final Logger logger = Logger.getLogger(InsertTableTask.class);
+    private static AtomicLong beginTimestamp = new AtomicLong(TimeStampUtil.datetimeToLong("2005-01-01 00:00:00.000"));
+
+    private final JdbcTaosdemoConfig config;
+    private final int startIndex;
+    private final int tableNumber;
+    private final int recordsNumber;
+
+    public InsertTableTask(JdbcTaosdemoConfig config, int startIndex, int tableNumber, int recordsNumber) {
+        this.config = config;
+        this.startIndex = startIndex;
+        this.tableNumber = tableNumber;
+        this.recordsNumber = recordsNumber;
+    }
+
+    @Override
+    public void run() {
+        try {
+            Connection connection = ConnectionFactory.build(config);
+            // iterate insert
+            for (int j = 0; j < recordsNumber; j++) {
+                long ts = beginTimestamp.getAndIncrement();
+                // insert data into echo table
+                for (int i = startIndex; i < startIndex + tableNumber; i++) {
+                    String sql = SqlSpeller.insertOneRowSQL(config.getDbName(), config.getTbPrefix(), i + 1, ts);
+                    Statement statement = connection.createStatement();
+                    statement.execute(sql);
+                    statement.close();
+                    logger.info(Thread.currentThread().getName() + ">>> " + sql);
+                }
+            }
+            connection.close();
+        } catch (SQLException e) {
+            logger.error(e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/ConnectionFactory.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/ConnectionFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..52691f4de722db2eb17e7061e09ff0e59a390077
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/ConnectionFactory.java
@@ -0,0 +1,32 @@
+package com.taosdata.example.jdbcTaosdemo.utils;
+
+import com.taosdata.example.jdbcTaosdemo.domain.JdbcTaosdemoConfig;
+import com.taosdata.jdbc.TSDBDriver;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class ConnectionFactory {
+
+    public static Connection build(JdbcTaosdemoConfig config) throws SQLException {
+        return build(config.getHost(), config.getPort(), config.getDbName(), config.getUser(), config.getPassword());
+    }
+
+    public static Connection build(String host, int port, String dbName) throws SQLException {
+        return build(host, port, dbName, "root", "taosdata");
+    }
+
+    private static Connection build(String host, int port, String dbName, String user, String password) throws SQLException {
+        Properties properties = new Properties();
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER, user);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD, password);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        return DriverManager.getConnection("jdbc:TAOS://" + host + ":" + port + "/" + dbName + "", properties);
+    }
+
+
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/SqlSpeller.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/SqlSpeller.java
new file mode 100644
index 0000000000000000000000000000000000000000..7af97f3b1baa0206f6f29b18a1ae59d2182c5423
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/SqlSpeller.java
@@ -0,0 +1,82 @@
+package com.taosdata.example.jdbcTaosdemo.utils;
+
+import java.util.Random;
+
+public class SqlSpeller {
+    private static final Random random = new Random(System.currentTimeMillis());
+    private static final String[] locations = {
+            "Beijing", "Shanghai", "Guangzhou", "Shenzhen",
+            "HangZhou", "Tianjin", "Wuhan", "Changsha", "Nanjing", "Xian"
+    };
+
+    public static String createDatabaseSQL(String dbName, int keep, int days) {
+        return "create database if not exists " + dbName + " keep " + keep + " days " + days;
+    }
+
+    public static String dropDatabaseSQL(String dbName) {
+        return "drop database if exists " + dbName;
+    }
+
+    public static String useDatabaseSQL(String dbName) {
+        return "use " + dbName;
+    }
+
+    public static String createSuperTableSQL(String superTableName) {
+        return "create table if not exists " + superTableName + "(ts timestamp, current float, voltage int, phase float) tags(location binary(64), groupId int)";
+    }
+
+    public static String dropSuperTableSQL(String dbName, String superTableName) {
+        return "drop table if exists " + dbName + "." + superTableName;
+    }
+
+    public static String createTableSQL(int tableIndex, String dbName, String superTableName) {
+        String location = locations[random.nextInt(locations.length)];
+        return "create table d" + tableIndex + " using " + dbName + "." + superTableName + " tags('" + location + "'," + tableIndex + ")";
+    }
+
+    public static String insertOneRowSQL(String dbName, String tbPrefix, int tableIndex, long ts) {
+        float current = 10 + random.nextFloat();
+        int voltage = 200 + random.nextInt(20);
+        float phase = random.nextFloat();
+        String sql = "insert into " + dbName + "." + tbPrefix + "" + tableIndex + " " + "values(" + ts + ", " + current + ", " + voltage + ", " + phase + ")";
+        return sql;
+    }
+
+    public static String insertBatchSizeRowsSQL(String dbName, String tbPrefix, int tbIndex, long ts, int valuesCount) {
+        float current = 10 + random.nextFloat();
+        int voltage = 200 + random.nextInt(20);
+        float phase = random.nextFloat();
+        StringBuilder sb = new StringBuilder();
+        sb.append("insert into " + dbName + "." + tbPrefix + "" + tbIndex + " " + "values");
+        for (int i = 0; i < valuesCount; i++) {
+            sb.append("(" + (ts + i) + ", " + current + ", " + voltage + ", " + phase + ") ");
+        }
+        return sb.toString();
+    }
+
+    public static String selectFromTableLimitSQL(String dbName, String tbPrefix, int tbIndex, int limit, int offset) {
+        return "select * from " + dbName + "." + tbPrefix + "" + tbIndex + " limit " + limit + " offset " + offset;
+    }
+
+    public static String selectCountFromTableSQL(String dbName, String tbPrefix, int tbIndex) {
+        return "select count(*) from " + dbName + "." + tbPrefix + "" + tbIndex;
+    }
+
+    public static String selectAvgMinMaxFromTableSQL(String field, String dbName, String tbPrefix, int tbIndex) {
+        return "select avg(" + field + "),min(" + field + "),max(" + field + ") from " + dbName + "." + tbPrefix + "" + tbIndex;
+    }
+
+    public static String selectFromSuperTableLimitSQL(String dbName, String stbName, int limit, int offset) {
+        return "select * from " + dbName + "." + stbName + " limit " + limit + " offset " + offset;
+    }
+
+    public static String selectCountFromSuperTableSQL(String dbName, String stableName) {
+        return "select count(*) from " + dbName + "." + stableName;
+    }
+
+    public static String selectAvgMinMaxFromSuperTableSQL(String field, String dbName, String stbName) {
+        return "select avg(" + field + "),min(" + field + "),max(" + field + ") from " + dbName + "." + stbName + "";
+    }
+
+
+}
\ No newline at end of file
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/TimeStampUtil.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/TimeStampUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..d00471f58147f9c66f3747c1f8a1eadbae3a6dab
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/jdbcTaosdemo/utils/TimeStampUtil.java
@@ -0,0 +1,35 @@
+package com.taosdata.example.jdbcTaosdemo.utils;
+
+import java.sql.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class TimeStampUtil {
+    private static final String datetimeFormat = "yyyy-MM-dd HH:mm:ss.SSS";
+
+    public static long datetimeToLong(String dateTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat(datetimeFormat);
+        try {
+            return sdf.parse(dateTime).getTime();
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String longToDatetime(long time) {
+        SimpleDateFormat sdf = new SimpleDateFormat(datetimeFormat);
+        return sdf.format(new Date(time));
+    }
+
+    public static void main(String[] args) {
+        final String startTime = "2005-01-01 00:00:00.000";
+
+        long start = TimeStampUtil.datetimeToLong(startTime);
+        System.out.println(start);
+
+        String datetime = TimeStampUtil.longToDatetime(1519833600000L);
+        System.out.println(datetime);
+    }
+
+
+}
diff --git a/tests/examples/JDBC/JDBCDemo/src/main/resources/log4j.properties b/tests/examples/JDBC/JDBCDemo/src/main/resources/log4j.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b445e5f52edf1a2b19c35c1be187716d17cdd7b1
--- /dev/null
+++ b/tests/examples/JDBC/JDBCDemo/src/main/resources/log4j.properties
@@ -0,0 +1,21 @@
+### 设置###
+log4j.rootLogger=debug,stdout,DebugLog,ErrorLog
+### 输出信息到控制抬 ###
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
+### 输出DEBUG 级别以上的日志到=logs/error.log ###
+log4j.appender.DebugLog=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DebugLog.File=logs/debug.log
+log4j.appender.DebugLog.Append=true
+log4j.appender.DebugLog.Threshold=DEBUG 
+log4j.appender.DebugLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.DebugLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
+### 输出ERROR 级别以上的日志到=logs/error.log ###
+log4j.appender.ErrorLog=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ErrorLog.File=logs/error.log 
+log4j.appender.ErrorLog.Append=true
+log4j.appender.ErrorLog.Threshold=ERROR 
+log4j.appender.ErrorLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.ErrorLog.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n
\ No newline at end of file
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/pom.xml b/tests/examples/JDBC/SpringJdbcTemplate/pom.xml
index 45abc5354abf623082f6f317c19c9adedf17a097..15aed1cf03b4e10e5a69e16be99ea2320a24609e 100644
--- a/tests/examples/JDBC/SpringJdbcTemplate/pom.xml
+++ b/tests/examples/JDBC/SpringJdbcTemplate/pom.xml
@@ -1,85 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.taosdata.jdbc</groupId>
-  <artifactId>SpringJdbcTemplate</artifactId>
-  <version>1.0-SNAPSHOT</version>
+    <groupId>com.taosdata.jdbc</groupId>
+    <artifactId>SpringJdbcTemplate</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
-  <name>SpringJdbcTemplate</name>
-  <url>http://www.taosdata.com</url>
+    <name>SpringJdbcTemplate</name>
+    <url>http://www.taosdata.com</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
-  <dependencies>
+    <dependencies>
 
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>4.3.2.RELEASE</version>
-    </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>5.2.8.RELEASE</version>
+        </dependency>
 
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>4.3.2.RELEASE</version>
-    </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>5.1.9.RELEASE</version>
+        </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.9.RELEASE</version>
+        </dependency>
 
-    <dependency>
-      <groupId>com.taosdata.jdbc</groupId>
-      <artifactId>taos-jdbcdriver</artifactId>
-      <version>1.0.3</version>
-    </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
 
-  </dependencies>
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>2.0.4</version>
+        </dependency>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>com.taosdata.jdbc.App</mainClass>
-            </manifest>
-          </archive>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.taosdata.jdbc.example.jdbcTemplate.App</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/App.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/App.java
deleted file mode 100644
index 3230af46a8016fee3d58c89ea3b2c1ddcf39cea5..0000000000000000000000000000000000000000
--- a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/App.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.taosdata.jdbc;
-
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Map;
-
-public class App {
-
-    public static void main( String[] args ) {
-
-        ApplicationContext ctx = new ClassPathXmlApplicationContext("applicationContext.xml");
-
-        JdbcTemplate jdbcTemplate = (JdbcTemplate) ctx.getBean("jdbcTemplate");
-
-        // create database
-        jdbcTemplate.execute("create database if not exists db ");
-
-        // create table
-        jdbcTemplate.execute("create table if not exists db.tb (ts timestamp, temperature int, humidity float)");
-
-        String insertSql = "insert into db.tb values(now, 23, 10.3) (now + 1s, 20, 9.3)";
-
-        // insert rows
-        int affectedRows = jdbcTemplate.update(insertSql);
-
-        System.out.println("insert success " + affectedRows + " rows.");
-
-        // query for list
-        List<Map<String, Object>> resultList =  jdbcTemplate.queryForList("select * from db.tb");
-
-        if(!CollectionUtils.isEmpty(resultList)){
-            for (Map<String, Object> row : resultList){
-                System.out.printf("%s, %d, %s\n", row.get("ts"), row.get("temperature"), row.get("humidity"));
-            }
-        }
-
-    }
-
-}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/App.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/App.java
new file mode 100644
index 0000000000000000000000000000000000000000..a03ca3924f9d86199c461a21d887b78e433ef6fe
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/App.java
@@ -0,0 +1,48 @@
+package com.taosdata.jdbc.example.jdbcTemplate;
+
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+public class App {
+
+    private static Random random = new Random(System.currentTimeMillis());
+
+    public static void main(String[] args) {
+
+        ApplicationContext ctx = new ClassPathXmlApplicationContext("applicationContext.xml");
+
+        ExecuteAsStatement executor = ctx.getBean(ExecuteAsStatement.class);
+        // drop database
+        executor.doExecute("drop database if exists test");
+        // create database
+        executor.doExecute("create database if not exists test");
+        //use database
+        executor.doExecute("use test");
+        // create table
+        executor.doExecute("create table if not exists test.weather (ts timestamp, temperature int, humidity float)");
+
+        WeatherDao weatherDao = ctx.getBean(WeatherDao.class);
+        Weather weather = new Weather(new Timestamp(new Date().getTime()), random.nextFloat() * 50.0f, random.nextInt(100));
+        // insert rows
+        int affectedRows = weatherDao.add(weather);
+        System.out.println("insert success " + affectedRows + " rows.");
+
+        // query for list
+        int limit = 10, offset = 0;
+        List<Weather> weatherList = weatherDao.queryForList(limit, offset);
+        for (Weather w : weatherList) {
+            System.out.println(w);
+        }
+
+    }
+
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/ExecuteAsStatement.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/ExecuteAsStatement.java
new file mode 100644
index 0000000000000000000000000000000000000000..f146684cc01f75a211182a90e5cfee4058aea413
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/ExecuteAsStatement.java
@@ -0,0 +1,6 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao;
+
+public interface ExecuteAsStatement{
+
+    void doExecute(String sql);
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/WeatherDao.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/WeatherDao.java
new file mode 100644
index 0000000000000000000000000000000000000000..28962ee1e6803898a0ec24e2231a62d91bcbf6d6
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/WeatherDao.java
@@ -0,0 +1,17 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao;
+
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+
+import java.util.List;
+
+public interface WeatherDao {
+
+
+    int add(Weather weather);
+
+    int[] batchInsert(List<Weather> weatherList);
+
+    List<Weather> queryForList(int limit, int offset);
+
+    int count();
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/ExecuteAsStatementImpl.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/ExecuteAsStatementImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..2700e701cc42034975ff902ebe1da01f040b5a69
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/ExecuteAsStatementImpl.java
@@ -0,0 +1,19 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao.impl;
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public class ExecuteAsStatementImpl implements ExecuteAsStatement {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public void doExecute(String sql) {
+        jdbcTemplate.execute(sql);
+    }
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/WeatherDaoImpl.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/WeatherDaoImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e0e0ab68c63bdb87ad172f277fe2a65df79d229
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/dao/impl/WeatherDaoImpl.java
@@ -0,0 +1,64 @@
+package com.taosdata.jdbc.example.jdbcTemplate.dao.impl;
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class WeatherDaoImpl implements WeatherDao {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public int add(Weather weather) {
+        return jdbcTemplate.update(
+                "insert into test.weather(ts, temperature, humidity) VALUES(?,?,?)",
+                weather.getTs(), weather.getTemperature(), weather.getHumidity()
+        );
+    }
+
+    @Override
+    public int[] batchInsert(List<Weather> weatherList) {
+        return jdbcTemplate.batchUpdate("insert into test.weather(ts, temperature, humidity) values( ?, ?, ?)", new BatchPreparedStatementSetter() {
+            @Override
+            public void setValues(PreparedStatement ps, int i) throws SQLException {
+                ps.setTimestamp(1, weatherList.get(i).getTs());
+                ps.setFloat(2, weatherList.get(i).getTemperature());
+                ps.setInt(3, weatherList.get(i).getHumidity());
+            }
+
+            @Override
+            public int getBatchSize() {
+                return weatherList.size();
+            }
+        });
+    }
+
+    @Override
+    public List<Weather> queryForList(int limit, int offset) {
+        return jdbcTemplate.query("select * from test.weather limit ? offset ?", (rs, rowNum) -> {
+            Timestamp ts = rs.getTimestamp("ts");
+            float temperature = rs.getFloat("temperature");
+            int humidity = rs.getInt("humidity");
+            return new Weather(ts, temperature, humidity);
+        }, limit, offset);
+    }
+
+    @Override
+    public int count() {
+        return jdbcTemplate.queryForObject("select count(*) from test.weather", Integer.class);
+    }
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/domain/Weather.java b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/domain/Weather.java
new file mode 100644
index 0000000000000000000000000000000000000000..023b301481829b8d73a8af566d418aa8232ef899
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/java/com/taosdata/jdbc/example/jdbcTemplate/domain/Weather.java
@@ -0,0 +1,54 @@
+package com.taosdata.jdbc.example.jdbcTemplate.domain;
+
+import java.sql.Timestamp;
+
+public class Weather {
+
+    private Timestamp ts;
+    private float temperature;
+    private int humidity;
+
+    public Weather() {
+    }
+
+    public Weather(Timestamp ts, float temperature, int humidity) {
+        this.ts = ts;
+        this.temperature = temperature;
+        this.humidity = humidity;
+    }
+
+    @Override
+    public String toString() {
+        return "Weather{" +
+                "ts=" + ts +
+                ", temperature=" + temperature +
+                ", humidity=" + humidity +
+                '}';
+    }
+
+    public Timestamp getTs() {
+        return ts;
+    }
+
+    public void setTs(Timestamp ts) {
+        this.ts = ts;
+    }
+
+    public float getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(float temperature) {
+        this.temperature = temperature;
+    }
+
+    public int getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(int humidity) {
+        this.humidity = humidity;
+    }
+
+
+}
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/main/resources/applicationContext.xml b/tests/examples/JDBC/SpringJdbcTemplate/src/main/resources/applicationContext.xml
index 41128148ec3fb69f342c634cc8e9dd9fbd3c0037..19ac433385fabe53548dcba25d5bb10965df17af 100644
--- a/tests/examples/JDBC/SpringJdbcTemplate/src/main/resources/applicationContext.xml
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/main/resources/applicationContext.xml
@@ -5,20 +5,21 @@
        xsi:schemaLocation="
 	http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-	"
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
        default-autowire="byName">
 
     <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
         <property name="driverClassName" value="com.taosdata.jdbc.TSDBDriver"></property>
-        <property name="url" value="jdbc:TAOS://127.0.0.1:6030/log"></property>
+        <property name="url" value="jdbc:TAOS://192.168.236.137:6030/"></property>
         <property name="username" value="root"></property>
         <property name="password" value="taosdata"></property>
     </bean>
 
 
-    <bean id = "jdbcTemplate"  class="org.springframework.jdbc.core.JdbcTemplate" >
-        <property name="dataSource" ref = "dataSource" ></property>
+    <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="dataSource"></property>
     </bean>
 
+    <context:component-scan base-package="com.taosdata.jdbc.example.jdbcTemplate"/>
+
 </beans>
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/AppTest.java b/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/AppTest.java
index d6a699598e73470663af4eb04e03a9a6b083bc4c..d0219f3db73d0c260420b642f997663acdd36f87 100644
--- a/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/AppTest.java
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/AppTest.java
@@ -7,14 +7,12 @@ import org.junit.Test;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-{
+public class AppTest {
     /**
      * Rigorous Test :-)
      */
     @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertTrue( true );
+    public void shouldAnswerWithTrue() {
+        assertTrue(true);
     }
 }
diff --git a/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/example/jdbcTemplate/BatcherInsertTest.java b/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/example/jdbcTemplate/BatcherInsertTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f2446eb7049ae44ff3e142d62a2e51ab71b6f16
--- /dev/null
+++ b/tests/examples/JDBC/SpringJdbcTemplate/src/test/java/com/taosdata/jdbc/example/jdbcTemplate/BatcherInsertTest.java
@@ -0,0 +1,64 @@
+package com.taosdata.jdbc.example.jdbcTemplate;
+
+
+import com.taosdata.jdbc.example.jdbcTemplate.dao.ExecuteAsStatement;
+import com.taosdata.jdbc.example.jdbcTemplate.dao.WeatherDao;
+import com.taosdata.jdbc.example.jdbcTemplate.domain.Weather;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({"classpath:applicationContext.xml"})
+public class BatcherInsertTest {
+
+
+    @Autowired
+    private WeatherDao weatherDao;
+    @Autowired
+    private ExecuteAsStatement executor;
+
+    private static final int numOfRecordsPerTable = 1000;
+    private static long ts = 1496732686000l;
+    private static Random random = new Random(System.currentTimeMillis());
+
+    @Before
+    public void before() {
+        // drop database
+        executor.doExecute("drop database if exists test");
+        // create database
+        executor.doExecute("create database if not exists test");
+        //use database
+        executor.doExecute("use test");
+        // create table
+        executor.doExecute("create table if not exists test.weather (ts timestamp, temperature int, humidity float)");
+    }
+
+    @Test
+    public void batchInsert() {
+        List<Weather> weatherList = new ArrayList<>();
+        for (int i = 0; i < numOfRecordsPerTable; i++) {
+            ts += 1000;
+            Weather weather = new Weather(new Timestamp(ts), random.nextFloat() * 50.0f, random.nextInt(100));
+            weatherList.add(weather);
+        }
+        long start = System.currentTimeMillis();
+        weatherDao.batchInsert(weatherList);
+        long end = System.currentTimeMillis();
+        System.out.println("batch insert(" + numOfRecordsPerTable + " rows) time cost ==========> " + (end - start) + " ms");
+
+        int count = weatherDao.count();
+        assertEquals(count, numOfRecordsPerTable);
+    }
+
+}
diff --git a/tests/examples/JDBC/springbootdemo/pom.xml b/tests/examples/JDBC/springbootdemo/pom.xml
index 74522979c068120ac175f324dced6e8cd66ca1d8..881ea0d6bf485891a29427853bd1bbf9b294c2d8 100644
--- a/tests/examples/JDBC/springbootdemo/pom.xml
+++ b/tests/examples/JDBC/springbootdemo/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>1.0.3</version>
+            <version>2.0.4</version>
         </dependency>
 
         <dependency>
@@ -76,6 +76,24 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/tests/examples/JDBC/springbootdemo/readme.md b/tests/examples/JDBC/springbootdemo/readme.md
index 64aabedcdce5d16a610f4f2b084b8d62d54ff133..ac3bb44ef95c251e25c664cd50414494e19f6820 100644
--- a/tests/examples/JDBC/springbootdemo/readme.md
+++ b/tests/examples/JDBC/springbootdemo/readme.md
@@ -14,7 +14,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000
 
-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/RainStationController.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/RainStationController.java
new file mode 100644
index 0000000000000000000000000000000000000000..844ac21bb8855de06edcc586deb713bcad686385
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/RainStationController.java
@@ -0,0 +1,28 @@
+package com.taosdata.jdbc.springbootdemo.controller;
+
+
+import com.taosdata.jdbc.springbootdemo.domain.Rainfall;
+import com.taosdata.jdbc.springbootdemo.service.RainStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/rainstation")
+public class RainStationController {
+
+    @Autowired
+    private RainStationService service;
+
+    @GetMapping("/init")
+    public boolean init() {
+        service.init();
+        service.createTable();
+        return true;
+    }
+
+    @PostMapping("/insert")
+    public int insert(@RequestBody Rainfall rainfall){
+        return service.insert(rainfall);
+    }
+
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/WeatherController.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/WeatherController.java
index 9123abd97b82fe1d4267c7341f3ea87bd5127caa..56a58fbb4d9a783a34989eae00369ff7b307acaf 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/WeatherController.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/controller/WeatherController.java
@@ -16,43 +16,47 @@ public class WeatherController {
 
     /**
      * create database and table
+     *
      * @return
      */
     @GetMapping("/init")
-    public boolean init(){
+    public boolean init() {
         return weatherService.init();
     }
 
     /**
      * Pagination Query
+     *
      * @param limit
      * @param offset
      * @return
      */
     @GetMapping("/{limit}/{offset}")
-    public List<Weather> queryWeather(@PathVariable Long limit, @PathVariable Long offset){
+    public List<Weather> queryWeather(@PathVariable Long limit, @PathVariable Long offset) {
         return weatherService.query(limit, offset);
     }
 
     /**
      * upload single weather info
+     *
      * @param temperature
      * @param humidity
      * @return
      */
     @PostMapping("/{temperature}/{humidity}")
-    public int saveWeather(@PathVariable int temperature, @PathVariable float humidity){
+    public int saveWeather(@PathVariable int temperature, @PathVariable float humidity) {
 
         return weatherService.save(temperature, humidity);
     }
 
     /**
      * upload multi weather info
+     *
      * @param weatherList
      * @return
      */
     @PostMapping("/batch")
-    public int batchSaveWeather(@RequestBody List<Weather> weatherList){
+    public int batchSaveWeather(@RequestBody List<Weather> weatherList) {
 
         return weatherService.save(weatherList);
     }
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9266acb3028c453062ce6e56ccade53c405f742
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.java
@@ -0,0 +1,15 @@
+package com.taosdata.jdbc.springbootdemo.dao;
+
+import java.util.Map;
+
+public interface DatabaseMapper {
+
+    int createDatabase(String dbname);
+
+    int dropDatabase(String dbname);
+
+    int creatDatabaseWithParameters(Map<String,String> map);
+
+    int useDatabase(String dbname);
+
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..329f75b582a276bed522e671d0c9f868b837c172
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/DatabaseMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.taosdata.jdbc.springbootdemo.dao.DatabaseMapper">
+
+    <update id="createDatabase" parameterType="java.lang.String">
+        create database if not exists ${dbname}
+    </update>
+
+    <update id="dropDatabase" parameterType="java.lang.String">
+        DROP database if exists ${dbname}
+    </update>
+    
+    
+    <update id="creatDatabaseWithParameters" parameterType="map">
+        CREATE database if not EXISTS ${dbname}
+        <if test="keep != null">
+            KEEP ${keep}
+        </if>
+        <if test="days != null">
+            DAYS ${days}
+        </if>
+        <if test="replica != null">
+            REPLICA ${replica}
+        </if>
+        <if test="cache != null">
+            cache ${cache}
+        </if>
+        <if test="blocks != null">
+            blocks ${blocks}
+        </if>
+        <if test="minrows != null">
+            minrows ${minrows}
+        </if>
+        <if test="maxrows != null">
+            maxrows ${maxrows}
+        </if>
+    </update>
+
+    <update id="useDatabase" parameterType="java.lang.String">
+        use ${dbname}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0efbf40ba477d9b8f410e0806be38701d274394
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.java
@@ -0,0 +1,9 @@
+package com.taosdata.jdbc.springbootdemo.dao;
+
+import java.util.Map;
+
+public interface RainfallMapper {
+
+
+    int save(Map<String, Object> map);
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..319b4f397434f1b7623c31250c8ba798c0499d86
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/RainfallMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.taosdata.jdbc.springbootdemo.dao.RainfallMapper">
+
+    <insert id="save" parameterType="map">
+        INSERT INTO ${table} using ${dbname}.${stable} tags(#{values.station_code}, #{values.station_name}) (ts, name, code, rainfall) values (#{values.ts}, #{values.name}, #{values.code}, #{values.rainfall})
+    </insert>
+
+
+</mapper>
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..7601bf974c7c727b2a46171b145bdcec662dc258
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.java
@@ -0,0 +1,8 @@
+package com.taosdata.jdbc.springbootdemo.dao;
+
+import com.taosdata.jdbc.springbootdemo.domain.TableMetadata;
+
+public interface TableMapper {
+
+    boolean createSTable(TableMetadata tableMetadata);
+}
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a272eadb4abd7637735a834ec445c822073486f
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/TableMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.taosdata.jdbc.springbootdemo.dao.TableMapper">
+
+    <update id="createSTable" parameterType="com.taosdata.jdbc.springbootdemo.domain.TableMetadata">
+        create table if not exists ${dbname}.${tablename}
+        <foreach collection="fields" item="field" index="index" open="(" close=")" separator=",">
+            ${field.name} ${field.type}
+        </foreach>
+        TAGS
+        <foreach collection="tags" item="tag" index="index" open="(" close=")" separator=",">
+            ${tag.name} ${tag.type}
+        </foreach>
+    </update>
+
+    <update id="dropTable" parameterType="java.lang.String">
+        drop ${tablename}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/resources/mapper/WeatherMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/WeatherMapper.xml
similarity index 100%
rename from tests/examples/JDBC/springbootdemo/src/main/resources/mapper/WeatherMapper.xml
rename to tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/dao/WeatherMapper.xml
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/FieldMetadata.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/FieldMetadata.java
new file mode 100644
index 0000000000000000000000000000000000000000..619b5a303d715132d6a428770a27d069a9b9dcaa
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/FieldMetadata.java
@@ -0,0 +1,28 @@
+package com.taosdata.jdbc.springbootdemo.domain;
+
+public class FieldMetadata {
+
+    private String name;
+    private String type;
+
+    public FieldMetadata(String name, String type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Rainfall.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Rainfall.java
new file mode 100644
index 0000000000000000000000000000000000000000..93e199d7e66582e7f8d771994b358a2c58f5dae2
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Rainfall.java
@@ -0,0 +1,64 @@
+package com.taosdata.jdbc.springbootdemo.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.sql.Timestamp;
+
+public class Rainfall {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
+    private Timestamp ts;
+    private String name;
+    private String code;
+    private float rainfall;
+    private String station_code;
+    private String station_name;
+
+    public Timestamp getTs() {
+        return ts;
+    }
+
+    public void setTs(Timestamp ts) {
+        this.ts = ts;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public float getRainfall() {
+        return rainfall;
+    }
+
+    public void setRainfall(float rainfall) {
+        this.rainfall = rainfall;
+    }
+
+    public String getStation_code() {
+        return station_code;
+    }
+
+    public void setStation_code(String station_code) {
+        this.station_code = station_code;
+    }
+
+    public String getStation_name() {
+        return station_name;
+    }
+
+    public void setStation_name(String station_name) {
+        this.station_name = station_name;
+    }
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TableMetadata.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TableMetadata.java
new file mode 100644
index 0000000000000000000000000000000000000000..74bb434f08484af6c244dd884570c974ab93e634
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TableMetadata.java
@@ -0,0 +1,43 @@
+package com.taosdata.jdbc.springbootdemo.domain;
+
+import java.util.List;
+
+public class TableMetadata {
+
+    private String dbname;
+    private String tablename;
+    private List<FieldMetadata> fields;
+    private List<TagMetadata> tags;
+
+    public String getDbname() {
+        return dbname;
+    }
+
+    public void setDbname(String dbname) {
+        this.dbname = dbname;
+    }
+
+    public String getTablename() {
+        return tablename;
+    }
+
+    public void setTablename(String tablename) {
+        this.tablename = tablename;
+    }
+
+    public List<FieldMetadata> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<FieldMetadata> fields) {
+        this.fields = fields;
+    }
+
+    public List<TagMetadata> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<TagMetadata> tags) {
+        this.tags = tags;
+    }
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TagMetadata.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TagMetadata.java
new file mode 100644
index 0000000000000000000000000000000000000000..755ecc0075506c4ba2c99eafa47593a69a50bd84
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/TagMetadata.java
@@ -0,0 +1,27 @@
+package com.taosdata.jdbc.springbootdemo.domain;
+
+public class TagMetadata {
+    private String name;
+    private String type;
+
+    public TagMetadata(String name, String type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Weather.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Weather.java
index 9547a8a89bf4aaff73696091e54f5bb460dcb796..cd7de447eade4a126c86c38c703d6a4de444c557 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Weather.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/domain/Weather.java
@@ -1,9 +1,12 @@
 package com.taosdata.jdbc.springbootdemo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.sql.Timestamp;
 
 public class Weather {
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
     private Timestamp ts;
 
     private int temperature;
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/RainStationService.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/RainStationService.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ea63c1760d4aef9e11a076eaff0c19df3a3a73c
--- /dev/null
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/RainStationService.java
@@ -0,0 +1,72 @@
+package com.taosdata.jdbc.springbootdemo.service;
+
+import com.taosdata.jdbc.springbootdemo.dao.DatabaseMapper;
+import com.taosdata.jdbc.springbootdemo.dao.RainfallMapper;
+import com.taosdata.jdbc.springbootdemo.dao.TableMapper;
+import com.taosdata.jdbc.springbootdemo.domain.FieldMetadata;
+import com.taosdata.jdbc.springbootdemo.domain.Rainfall;
+import com.taosdata.jdbc.springbootdemo.domain.TableMetadata;
+import com.taosdata.jdbc.springbootdemo.domain.TagMetadata;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class RainStationService {
+
+    @Autowired
+    private DatabaseMapper databaseMapper;
+    @Autowired
+    private TableMapper tableMapper;
+    @Autowired
+    private RainfallMapper rainfallMapper;
+
+    public boolean init() {
+        databaseMapper.dropDatabase("rainstation");
+
+        Map<String, String> map = new HashMap<>();
+        map.put("dbname", "rainstation");
+        map.put("keep", "36500");
+        map.put("days", "30");
+        map.put("blocks", "4");
+        databaseMapper.creatDatabaseWithParameters(map);
+
+        databaseMapper.useDatabase("rainstation");
+        return true;
+    }
+
+    public boolean createTable() {
+        TableMetadata tableMetadata = new TableMetadata();
+        tableMetadata.setDbname("rainstation");
+        tableMetadata.setTablename("monitoring");
+
+        List<FieldMetadata> fields = new ArrayList<>();
+        fields.add(new FieldMetadata("ts", "timestamp"));
+        fields.add(new FieldMetadata("name", "NCHAR(10)"));
+        fields.add(new FieldMetadata("code", " BINARY(8)"));
+        fields.add(new FieldMetadata("rainfall", "float"));
+        tableMetadata.setFields(fields);
+
+        List<TagMetadata> tags = new ArrayList<>();
+        tags.add(new TagMetadata("station_code", "BINARY(8)"));
+        tags.add(new TagMetadata("station_name", "NCHAR(10)"));
+        tableMetadata.setTags(tags);
+
+        tableMapper.createSTable(tableMetadata);
+        return true;
+    }
+
+
+    public int insert(Rainfall rainfall) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dbname", "rainstation");
+        map.put("table", "S_53646");
+        map.put("stable", "monitoring");
+        map.put("values", rainfall);
+        return rainfallMapper.save(map);
+    }
+}
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/WeatherService.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/WeatherService.java
index 396d70bf9246bfd7e293cccec5b00f2d4aac4963..b950a9a4e42e306320415c7be556ba78c2f25a27 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/WeatherService.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/jdbc/springbootdemo/service/WeatherService.java
@@ -14,10 +14,8 @@ public class WeatherService {
     private WeatherMapper weatherMapper;
 
     public boolean init() {
-
         weatherMapper.createDB();
         weatherMapper.createTable();
-
         return true;
     }
 
diff --git a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
index dc77e144f0ffbe131f7eda69b7bb66fd7870c05e..683884fcdd852fd1a72c685b40c6a8517ed92ff4 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 # datasource config
 spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
-spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/log
+spring.datasource.url=jdbc:TAOS://localhost:6030/log
 spring.datasource.username=root
 spring.datasource.password=taosdata
 
@@ -10,7 +10,7 @@ spring.datasource.druid.max-active=5
 # max wait time for get connection, ms
 spring.datasource.druid.max-wait=60000
 
-spring.datasource.druid.validation-query=describe log.dn
+spring.datasource.druid.validation-query=select server_status();
 spring.datasource.druid.validation-query-timeout=5000
 spring.datasource.druid.test-on-borrow=false
 spring.datasource.druid.test-on-return=false
@@ -23,4 +23,4 @@ spring.datasource.druid.max-evictable-idle-time-millis=900000
 #mybatis
 mybatis.mapper-locations=classpath:mapper/*.xml
 
-logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
\ No newline at end of file
+logging.level.com.taosdata.jdbc.springbootdemo.dao=debug
diff --git a/tests/examples/c/CMakeLists.txt b/tests/examples/c/CMakeLists.txt
index 287fca7d410b88d240642a57ec194b3d0c686975..59bcb6eaff349e8b20fa13995d1a7297f9185a50 100644
--- a/tests/examples/c/CMakeLists.txt
+++ b/tests/examples/c/CMakeLists.txt
@@ -1,16 +1,8 @@
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
-  INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/pthread)
+IF (TD_LINUX)
+  INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc  ${TD_COMMUNITY_DIR}/inc)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(demo demo.c)
+  TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
 ENDIF ()
-
-INCLUDE_DIRECTORIES(. ${TD_ROOT_DIR}/src/inc ${TD_ROOT_DIR}/src/client/inc  ${TD_OS_DIR}/inc)
-AUX_SOURCE_DIRECTORY(. SRC)
-#ADD_EXECUTABLE(demo ${SRC})
-#TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
-
-
-
-
-
-
diff --git a/tests/examples/c/apitest.c b/tests/examples/c/apitest.c
new file mode 100644
index 0000000000000000000000000000000000000000..759e16d1de285c9490d7f1af7a94de81dbadb6e4
--- /dev/null
+++ b/tests/examples/c/apitest.c
@@ -0,0 +1,474 @@
+// sample code to verify all TDengine API
+// to compile: gcc -o apitest apitest.c -ltaos
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <taos.h>
+#include <unistd.h>
+
+
+static void prepare_data(TAOS* taos) {
+  taos_query(taos, "drop database if exists test;");
+  usleep(100000);
+  taos_query(taos, "create database test;");
+  usleep(100000);
+  taos_select_db(taos, "test");
+
+  taos_query(taos, "create table meters(ts timestamp, a int) tags(area int);");
+
+  taos_query(taos, "create table t0 using meters tags(0);");
+  taos_query(taos, "create table t1 using meters tags(1);");
+  taos_query(taos, "create table t2 using meters tags(2);");
+  taos_query(taos, "create table t3 using meters tags(3);");
+  taos_query(taos, "create table t4 using meters tags(4);");
+  taos_query(taos, "create table t5 using meters tags(5);");
+  taos_query(taos, "create table t6 using meters tags(6);");
+  taos_query(taos, "create table t7 using meters tags(7);");
+  taos_query(taos, "create table t8 using meters tags(8);");
+  taos_query(taos, "create table t9 using meters tags(9);");
+
+  TAOS_RES* res = taos_query(taos, "insert into t0 values('2020-01-01 00:00:00.000', 0)"
+    " ('2020-01-01 00:01:00.000', 0)"
+    " ('2020-01-01 00:02:00.000', 0)"
+    " t1 values('2020-01-01 00:00:00.000', 0)"
+    " ('2020-01-01 00:01:00.000', 0)"
+    " ('2020-01-01 00:02:00.000', 0)"
+    " ('2020-01-01 00:03:00.000', 0)"
+    " t2 values('2020-01-01 00:00:00.000', 0)"
+    " ('2020-01-01 00:01:00.000', 0)"
+    " ('2020-01-01 00:01:01.000', 0)"
+    " ('2020-01-01 00:01:02.000', 0)"
+    " t3 values('2020-01-01 00:01:02.000', 0)"
+    " t4 values('2020-01-01 00:01:02.000', 0)"
+    " t5 values('2020-01-01 00:01:02.000', 0)"
+    " t6 values('2020-01-01 00:01:02.000', 0)"
+    " t7 values('2020-01-01 00:01:02.000', 0)"
+    " t8 values('2020-01-01 00:01:02.000', 0)"
+    " t9 values('2020-01-01 00:01:02.000', 0)");
+  int affected = taos_affected_rows(res);
+  if (affected != 18) {
+    printf("\033[31m%d rows affected by last insert statement, but it should be 18\033[0m\n", affected);
+  }
+  // super tables subscription
+  usleep(1000000);
+}
+
+
+static int print_result(TAOS_RES* res, int blockFetch) {
+  TAOS_ROW    row = NULL;
+  int         num_fields = taos_num_fields(res);
+  TAOS_FIELD* fields = taos_fetch_fields(res);
+  int         nRows = 0;
+
+  if (blockFetch) {
+    int rows = 0;
+    while ((rows = taos_fetch_block(res, &row))) {
+      for (int i = 0; i < rows; i++) {
+        char temp[256];
+        taos_print_row(temp, row + i, fields, num_fields);
+        puts(temp);
+      }
+      nRows += rows;
+    }
+  } else {
+    while ((row = taos_fetch_row(res))) {
+      char temp[256];
+      taos_print_row(temp, row, fields, num_fields);
+      puts(temp);
+      nRows++;
+    }
+  }
+
+  printf("%d rows consumed.\n", nRows);
+  return nRows;
+}
+
+
+static void check_row_count(int line, TAOS_RES* res, int expected) {
+  int actual = print_result(res, expected % 2);
+  if (actual != expected) {
+    printf("\033[31mline %d: row count mismatch, expected: %d, actual: %d\033[0m\n", line, expected, actual);
+  } else {
+    printf("line %d: %d rows consumed as expected\n", line, actual);
+  }
+}
+
+
+static void verify_query(TAOS* taos) {
+  prepare_data(taos);
+
+  int code = taos_load_table_info(taos, "t0,t1,t2,t3,t4,t5,t6,t7,t8,t9");
+  if (code != 0) {
+    printf("\033[31mfailed to load table info: 0x%08x\033[0m\n", code);
+  }
+
+  code = taos_validate_sql(taos, "select * from nonexisttable");
+  if (code == 0) {
+    printf("\033[31mimpossible, the table does not exists\033[0m\n");
+  }
+
+  code = taos_validate_sql(taos, "select * from meters");
+  if (code != 0) {
+    printf("\033[31mimpossible, the table does exists: 0x%08x\033[0m\n", code);
+  }
+
+  TAOS_RES* res = taos_query(taos, "select * from meters");
+  check_row_count(__LINE__, res, 18);
+  printf("result precision is: %d\n",  taos_result_precision(res));
+  int c = taos_field_count(res);
+  printf("field count is: %d\n",  c);
+  int* lengths = taos_fetch_lengths(res);
+  for (int i = 0; i < c; i++) {
+    printf("length of column %d is %d\n", i, lengths[i]);
+  }
+  taos_free_result(res);
+
+  res = taos_query(taos, "select * from t0");
+  check_row_count(__LINE__, res, 3);
+  taos_free_result(res);
+
+  res = taos_query(taos, "select * from nonexisttable");
+  code = taos_errno(res);
+  printf("code=%d, error msg=%s\n", code, taos_errstr(res));
+  taos_free_result(res);
+
+  res = taos_query(taos, "select * from meters");
+  taos_stop_query(res);
+}
+
+
+void subscribe_callback(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code) {
+  int rows = print_result(res, *(int*)param);
+  printf("%d rows consumed in subscribe_callback\n", rows);
+}
+
+static void verify_subscribe(TAOS* taos) {
+  prepare_data(taos);
+
+  TAOS_SUB* tsub = taos_subscribe(taos, 0, "test", "select * from meters;", NULL, NULL, 0);
+  TAOS_RES* res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 18);
+
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 0);
+
+  taos_query(taos, "insert into t0 values('2020-01-01 00:02:00.001', 0);");
+  taos_query(taos, "insert into t8 values('2020-01-01 00:01:03.000', 0);");
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 2);
+
+  taos_query(taos, "insert into t2 values('2020-01-01 00:01:02.001', 0);");
+  taos_query(taos, "insert into t1 values('2020-01-01 00:03:00.001', 0);");
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 2);
+
+  taos_query(taos, "insert into t1 values('2020-01-01 00:03:00.002', 0);");
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 1);
+
+  // keep progress information and restart subscription
+  taos_unsubscribe(tsub, 1);
+  taos_query(taos, "insert into t0 values('2020-01-01 00:04:00.000', 0);");
+  tsub = taos_subscribe(taos, 1, "test", "select * from meters;", NULL, NULL, 0);
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 24);
+
+  // keep progress information and continue previous subscription
+  taos_unsubscribe(tsub, 1);
+  tsub = taos_subscribe(taos, 0, "test", "select * from meters;", NULL, NULL, 0);
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 0);
+
+  // don't keep progress information and continue previous subscription
+  taos_unsubscribe(tsub, 0);
+  tsub = taos_subscribe(taos, 0, "test", "select * from meters;", NULL, NULL, 0);
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 24);
+
+  // single meter subscription
+
+  taos_unsubscribe(tsub, 0);
+  tsub = taos_subscribe(taos, 0, "test", "select * from t0;", NULL, NULL, 0);
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 5);
+
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 0);
+
+  taos_query(taos, "insert into t0 values('2020-01-01 00:04:00.001', 0);");
+  res = taos_consume(tsub);
+  check_row_count(__LINE__, res, 1);
+
+  taos_unsubscribe(tsub, 0);
+
+  int blockFetch = 0;
+  tsub = taos_subscribe(taos, 1, "test", "select * from meters;", subscribe_callback, &blockFetch, 1000);
+  usleep(2000000);
+  taos_query(taos, "insert into t0 values('2020-01-01 00:05:00.001', 0);");
+  usleep(2000000);
+  taos_unsubscribe(tsub, 0);
+}
+
+
+void verify_prepare(TAOS* taos) {
+  TAOS_RES* result = taos_query(taos, "drop database if exists test;");
+  usleep(100000);
+  taos_query(taos, "create database test;");
+
+  int code = taos_errno(result);
+  if (code != 0) {
+    printf("\033[31mfailed to create database, reason:%s\033[0m\n", taos_errstr(result));
+    taos_free_result(result);
+    return;
+  }
+  taos_free_result(result);
+
+  usleep(100000);
+  taos_select_db(taos, "test");
+
+  // create table
+  const char* sql = "create table m1 (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(40), blob nchar(10))";
+  result = taos_query(taos, sql);
+  code = taos_errno(result);
+  if (code != 0) {
+    printf("\033[31mfailed to create table, reason:%s\033[0m\n", taos_errstr(result));
+    taos_free_result(result);
+    return;
+  }
+  taos_free_result(result);
+
+  // insert 10 records
+  struct {
+      int64_t ts;
+      int8_t b;
+      int8_t v1;
+      int16_t v2;
+      int32_t v4;
+      int64_t v8;
+      float f4;
+      double f8;
+      char bin[40];
+      char blob[80];
+  } v = {0};
+
+  TAOS_STMT* stmt = taos_stmt_init(taos);
+  TAOS_BIND params[10];
+  params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+  params[0].buffer_length = sizeof(v.ts);
+  params[0].buffer = &v.ts;
+  params[0].length = &params[0].buffer_length;
+  params[0].is_null = NULL;
+
+  params[1].buffer_type = TSDB_DATA_TYPE_BOOL;
+  params[1].buffer_length = sizeof(v.b);
+  params[1].buffer = &v.b;
+  params[1].length = &params[1].buffer_length;
+  params[1].is_null = NULL;
+
+  params[2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+  params[2].buffer_length = sizeof(v.v1);
+  params[2].buffer = &v.v1;
+  params[2].length = &params[2].buffer_length;
+  params[2].is_null = NULL;
+
+  params[3].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+  params[3].buffer_length = sizeof(v.v2);
+  params[3].buffer = &v.v2;
+  params[3].length = &params[3].buffer_length;
+  params[3].is_null = NULL;
+
+  params[4].buffer_type = TSDB_DATA_TYPE_INT;
+  params[4].buffer_length = sizeof(v.v4);
+  params[4].buffer = &v.v4;
+  params[4].length = &params[4].buffer_length;
+  params[4].is_null = NULL;
+
+  params[5].buffer_type = TSDB_DATA_TYPE_BIGINT;
+  params[5].buffer_length = sizeof(v.v8);
+  params[5].buffer = &v.v8;
+  params[5].length = &params[5].buffer_length;
+  params[5].is_null = NULL;
+
+  params[6].buffer_type = TSDB_DATA_TYPE_FLOAT;
+  params[6].buffer_length = sizeof(v.f4);
+  params[6].buffer = &v.f4;
+  params[6].length = &params[6].buffer_length;
+  params[6].is_null = NULL;
+
+  params[7].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+  params[7].buffer_length = sizeof(v.f8);
+  params[7].buffer = &v.f8;
+  params[7].length = &params[7].buffer_length;
+  params[7].is_null = NULL;
+
+  params[8].buffer_type = TSDB_DATA_TYPE_BINARY;
+  params[8].buffer_length = sizeof(v.bin);
+  params[8].buffer = v.bin;
+  params[8].length = &params[8].buffer_length;
+  params[8].is_null = NULL;
+
+  strcpy(v.blob, "一二三四五六七八九十");
+  params[9].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  params[9].buffer_length = strlen(v.blob);
+  params[9].buffer = v.blob;
+  params[9].length = &params[9].buffer_length;
+  params[9].is_null = NULL;
+
+  int is_null = 1;
+
+  sql = "insert into m1 values(?,?,?,?,?,?,?,?,?,?)";
+  code = taos_stmt_prepare(stmt, sql, 0);
+  if (code != 0){
+    printf("\033[31mfailed to execute taos_stmt_prepare. code:0x%x\033[0m\n", code);
+  }
+  v.ts = 1591060628000;
+  for (int i = 0; i < 10; ++i) {
+    v.ts += 1;
+    for (int j = 1; j < 10; ++j) {
+      params[j].is_null = ((i == j) ? &is_null : 0);
+    }
+    v.b = (int8_t)i % 2;
+    v.v1 = (int8_t)i;
+    v.v2 = (int16_t)(i * 2);
+    v.v4 = (int32_t)(i * 4);
+    v.v8 = (int64_t)(i * 8);
+    v.f4 = (float)(i * 40);
+    v.f8 = (double)(i * 80);
+    for (int j = 0; j < sizeof(v.bin) - 1; ++j) {
+      v.bin[j] = (char)(i + '0');
+    }
+
+    taos_stmt_bind_param(stmt, params);
+    taos_stmt_add_batch(stmt);
+  }
+  if (taos_stmt_execute(stmt) != 0) {
+    printf("\033[31mfailed to execute insert statement.\033[0m\n");
+    return;
+  }
+  taos_stmt_close(stmt);
+
+  // query the records
+  stmt = taos_stmt_init(taos);
+  taos_stmt_prepare(stmt, "SELECT * FROM m1 WHERE v1 > ? AND v2 < ?", 0);
+  v.v1 = 5;
+  v.v2 = 15;
+  taos_stmt_bind_param(stmt, params + 2);
+  if (taos_stmt_execute(stmt) != 0) {
+    printf("\033[31mfailed to execute select statement.\033[0m\n");
+    return;
+  }
+
+  result = taos_stmt_use_result(stmt);
+
+  TAOS_ROW    row;
+  int         rows = 0;
+  int         num_fields = taos_num_fields(result);
+  TAOS_FIELD *fields = taos_fetch_fields(result);
+  char        temp[256];
+
+  // fetch the records row by row
+  while ((row = taos_fetch_row(result))) {
+    rows++;
+    taos_print_row(temp, row, fields, num_fields);
+    printf("%s\n", temp);
+  }
+
+  taos_free_result(result);
+  taos_stmt_close(stmt);
+}
+
+void retrieve_callback(void *param, TAOS_RES *tres, int numOfRows)
+{
+  if (numOfRows > 0) {
+    printf("%d rows async retrieved\n", numOfRows);
+    taos_fetch_rows_a(tres, retrieve_callback, param);
+  } else {
+    if (numOfRows < 0) {
+      printf("\033[31masync retrieve failed, code: %d\033[0m\n", numOfRows);
+    } else {
+      printf("async retrieve completed\n");
+    }
+    taos_free_result(tres);
+  }
+}
+
+void select_callback(void *param, TAOS_RES *tres, int code)
+{
+  if (code == 0 && tres) {
+    taos_fetch_rows_a(tres, retrieve_callback, param);
+  } else {
+    printf("\033[31masync select failed, code: %d\033[0m\n", code);
+  }
+}
+
+void verify_async(TAOS* taos) {
+  prepare_data(taos);
+  taos_query_a(taos, "select * from meters", select_callback, NULL);
+  usleep(1000000);
+}
+
+void stream_callback(void *param, TAOS_RES *res, TAOS_ROW row) {
+  int         num_fields = taos_num_fields(res);
+  TAOS_FIELD* fields = taos_fetch_fields(res);
+
+  printf("got one row from stream_callback\n");
+  char temp[256];
+  taos_print_row(temp, row, fields, num_fields);
+  puts(temp);
+}
+
+void verify_stream(TAOS* taos) {
+  prepare_data(taos);
+  TAOS_STREAM* strm = taos_open_stream(
+    taos,
+    "select count(*) from meters interval(1m)",
+    stream_callback,
+    0,
+    NULL,
+    NULL);
+  printf("waiting for stream data\n"); 
+  usleep(100000);
+  taos_query(taos, "insert into t0 values(now, 0)(now+5s,1)(now+10s, 2);");
+  usleep(200000000);
+  taos_close_stream(strm);
+}
+
+int main(int argc, char *argv[]) {
+  const char* host = "127.0.0.1";
+  const char* user = "root";
+  const char* passwd = "taosdata";
+
+  taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
+  taos_init();
+
+  TAOS* taos = taos_connect(host, user, passwd, "", 0);
+  if (taos == NULL) {
+    printf("\033[31mfailed to connect to db, reason:%s\033[0m\n", taos_errstr(taos));
+    exit(1);
+  }
+
+  char* info = taos_get_server_info(taos);
+  printf("server info: %s\n", info);
+  info = taos_get_client_info(taos);
+  printf("client info: %s\n", info);
+
+  printf("************  verify query  *************\n");
+  verify_query(taos);
+
+  printf("*********  verify async query  **********\n");
+  verify_async(taos);
+
+  printf("*********** verify subscribe ************\n");
+  verify_subscribe(taos);
+
+  printf("************ verify prepare *************\n");
+  verify_prepare(taos);
+
+  printf("************ verify stream  *************\n");
+  verify_stream(taos);
+  printf("done\n");
+
+  taos_close(taos);
+  taos_cleanup();
+}
\ No newline at end of file
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index a0c4588e6f38a6c6e8f87ec2a984720833f3df3b..f0e970c3325346eb5ebd341dae8fcbc7d968a8c2 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -13,17 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// TAOS standard API example. The same syntax as MySQL, but only a subet
+// TAOS standard API example. The same syntax as MySQL, but only a subset
 // to compile: gcc -o demo demo.c -ltaos
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <taos.h>  // TAOS header file
 
-void taosMsleep(int mseconds);
-
 int main(int argc, char *argv[]) {
   TAOS *    taos;
   char      qstr[1024];
@@ -44,10 +41,12 @@ int main(int argc, char *argv[]) {
     exit(1);
   }
   printf("success to connect to server\n");
-  
+
 
   taos_query(taos, "drop database demo");
-  if (taos_query(taos, "create database demo") != 0) {
+
+  result = taos_query(taos, "create database demo");
+  if (result == NULL) {
     printf("failed to create database, reason:%s\n", taos_errstr(taos));
     exit(1);
   }
@@ -56,7 +55,7 @@ int main(int argc, char *argv[]) {
   taos_query(taos, "use demo");
 
   // create table
-  if (taos_query(taos, "create table m1 (ts timestamp, speed int)") != 0) {
+  if (taos_query(taos, "create table m1 (ts timestamp, ti tinyint, si smallint, i int, bi bigint, f float, d double, b binary(10))") == 0) {
     printf("failed to create table, reason:%s\n", taos_errstr(taos));
     exit(1);
   }
@@ -68,9 +67,10 @@ int main(int argc, char *argv[]) {
   // insert 10 records
   int i = 0;
   for (i = 0; i < 10; ++i) {
-    sprintf(qstr, "insert into m1 values (%ld, %d)", 1546300800000 + i * 1000, i * 10);
+    sprintf(qstr, "insert into m1 values (%ld, %d, %d, %d, %d, %f, %lf, '%s')", 1546300800000 + i * 1000, i, i, i, i*10000000, i*1.0, i*2.0, "hello");
+    printf("qstr: %s\n", qstr);
     if (taos_query(taos, qstr)) {
-      printf("failed to insert row: %i, reason:%s\n", i, taos_errstr(taos));
+      printf("insert row: %i, reason:%s\n", i, taos_errstr(taos));
     }
     //sleep(1);
   }
@@ -78,24 +78,19 @@ int main(int argc, char *argv[]) {
 
   // query the records
   sprintf(qstr, "SELECT * FROM m1");
-  if (taos_query(taos, qstr) != 0) {
-    printf("failed to select, reason:%s\n", taos_errstr(taos));
-    exit(1);
-  }
-
-  result = taos_use_result(taos);
-
-  if (result == NULL) {
-    printf("failed to get result, reason:%s\n", taos_errstr(taos));
+  result = taos_query(taos, qstr);
+  if (result == NULL || taos_errno(result) != 0) {
+    printf("failed to select, reason:%s\n", taos_errstr(result));
     exit(1);
   }
 
   TAOS_ROW    row;
   int         rows = 0;
-  int         num_fields = taos_field_count(taos);
+  int         num_fields = taos_field_count(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256];
+  char        temp[1024];
 
+  printf("num_fields = %d\n", num_fields);
   printf("select * from table, result:\n");
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
diff --git a/tests/examples/c/makefile b/tests/examples/c/makefile
index 0a4b8ee9d2bd00ab3daaac0c3a93497de4fd03f8..7293a22c11d7c6049c220ca0951b5969fa344114 100644
--- a/tests/examples/c/makefile
+++ b/tests/examples/c/makefile
@@ -4,22 +4,24 @@
 ROOT=./
 TARGET=exe
 LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
-#LFLAGS = '-Wl,-rpath,/home/zbm/project/td/debug/build/lib/' -L/home/zbm/project/td/debug/build/lib -ltaos -lpthread -lm -lrt
-CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion -Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX -msse4.2 -Wno-unused-function -D_M_X64 \
-	-I/usr/local/taos/include -std=gnu99
+CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
+	-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
+	-msse4.2 -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99
 
 all: $(TARGET)
 
 exe:
-	gcc $(CFLAGS) ./asyncdemo.c -o $(ROOT)/asyncdemo $(LFLAGS)
-	gcc $(CFLAGS) ./demo.c -o $(ROOT)/demo $(LFLAGS)
-	gcc $(CFLAGS) ./prepare.c -o $(ROOT)/prepare $(LFLAGS)
-	gcc $(CFLAGS) ./stream.c -o $(ROOT)/stream $(LFLAGS)
+	gcc $(CFLAGS) ./asyncdemo.c -o $(ROOT)asyncdemo $(LFLAGS)
+	gcc $(CFLAGS) ./demo.c -o $(ROOT)demo $(LFLAGS)
+	gcc $(CFLAGS) ./prepare.c -o $(ROOT)prepare $(LFLAGS)
+	gcc $(CFLAGS) ./stream.c -o $(ROOT)stream $(LFLAGS)
 	gcc $(CFLAGS) ./subscribe.c -o $(ROOT)subscribe $(LFLAGS)
+	gcc $(CFLAGS) ./apitest.c -o $(ROOT)apitest $(LFLAGS)
 
 clean:
-	rm $(ROOT)/asyncdemo
-	rm $(ROOT)/demo
-	rm $(ROOT)/prepare
-	rm $(ROOT)/stream
-	rm $(ROOT)/subscribe
+	rm $(ROOT)asyncdemo
+	rm $(ROOT)demo
+	rm $(ROOT)prepare
+	rm $(ROOT)stream
+	rm $(ROOT)subscribe
+	rm $(ROOT)apitest
diff --git a/tests/examples/c/prepare.c b/tests/examples/c/prepare.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a70b744ee8561459318aa456160a54b8c6270a8
--- /dev/null
+++ b/tests/examples/c/prepare.c
@@ -0,0 +1,209 @@
+// TAOS standard API example. The same syntax as MySQL, but only a subet 
+// to compile: gcc -o prepare prepare.c -ltaos
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "taos.h"
+
+
+void taosMsleep(int mseconds);
+
+int main(int argc, char *argv[])
+{
+  TAOS     *taos;
+  TAOS_RES *result;
+  int      code;
+  TAOS_STMT *stmt;
+
+  // connect to server
+  if (argc < 2) {
+    printf("please input server ip \n");
+    return 0;
+  }
+
+  // init TAOS
+  taos_init();
+
+  taos = taos_connect(argv[1], "root", "taosdata", NULL, 0);
+  if (taos == NULL) {
+    printf("failed to connect to db, reason:%s\n", taos_errstr(taos));
+    exit(1);
+  }   
+
+  result = taos_query(taos, "drop database demo"); 
+  taos_free_result(result);
+
+  result = taos_query(taos, "create database demo");
+  code = taos_errno(result);
+  if (code != 0) {
+    printf("failed to create database, reason:%s\n", taos_errstr(result));
+    taos_free_result(result);
+    exit(1);
+  }
+  taos_free_result(result);
+
+  result = taos_query(taos, "use demo");
+  taos_free_result(result);
+
+  // create table
+  const char* sql = "create table m1 (ts timestamp, b bool, v1 tinyint, v2 smallint, v4 int, v8 bigint, f4 float, f8 double, bin binary(40), blob nchar(10))";
+  result = taos_query(taos, sql);
+  code = taos_errno(result);
+  if (code != 0) {
+    printf("failed to create table, reason:%s\n", taos_errstr(result));
+    taos_free_result(result);
+    exit(1);
+  }
+  taos_free_result(result);
+
+  // sleep for one second to make sure table is created on data node
+  // taosMsleep(1000);
+
+  // insert 10 records
+  struct {
+      int64_t ts;
+      int8_t b;
+      int8_t v1;
+      int16_t v2;
+      int32_t v4;
+      int64_t v8;
+      float f4;
+      double f8;
+      char bin[40];
+      char blob[80];
+  } v = {0};
+
+  stmt = taos_stmt_init(taos);
+  TAOS_BIND params[10];
+  params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+  params[0].buffer_length = sizeof(v.ts);
+  params[0].buffer = &v.ts;
+  params[0].length = &params[0].buffer_length;
+  params[0].is_null = NULL;
+
+  params[1].buffer_type = TSDB_DATA_TYPE_BOOL;
+  params[1].buffer_length = sizeof(v.b);
+  params[1].buffer = &v.b;
+  params[1].length = &params[1].buffer_length;
+  params[1].is_null = NULL;
+
+  params[2].buffer_type = TSDB_DATA_TYPE_TINYINT;
+  params[2].buffer_length = sizeof(v.v1);
+  params[2].buffer = &v.v1;
+  params[2].length = &params[2].buffer_length;
+  params[2].is_null = NULL;
+
+  params[3].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+  params[3].buffer_length = sizeof(v.v2);
+  params[3].buffer = &v.v2;
+  params[3].length = &params[3].buffer_length;
+  params[3].is_null = NULL;
+
+  params[4].buffer_type = TSDB_DATA_TYPE_INT;
+  params[4].buffer_length = sizeof(v.v4);
+  params[4].buffer = &v.v4;
+  params[4].length = &params[4].buffer_length;
+  params[4].is_null = NULL;
+
+  params[5].buffer_type = TSDB_DATA_TYPE_BIGINT;
+  params[5].buffer_length = sizeof(v.v8);
+  params[5].buffer = &v.v8;
+  params[5].length = &params[5].buffer_length;
+  params[5].is_null = NULL;
+
+  params[6].buffer_type = TSDB_DATA_TYPE_FLOAT;
+  params[6].buffer_length = sizeof(v.f4);
+  params[6].buffer = &v.f4;
+  params[6].length = &params[6].buffer_length;
+  params[6].is_null = NULL;
+
+  params[7].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+  params[7].buffer_length = sizeof(v.f8);
+  params[7].buffer = &v.f8;
+  params[7].length = &params[7].buffer_length;
+  params[7].is_null = NULL;
+
+  params[8].buffer_type = TSDB_DATA_TYPE_BINARY;
+  params[8].buffer_length = sizeof(v.bin);
+  params[8].buffer = v.bin;
+  params[8].length = &params[8].buffer_length;
+  params[8].is_null = NULL;
+
+  strcpy(v.blob, "一二三四五六七八九十");
+  params[9].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  params[9].buffer_length = strlen(v.blob);
+  params[9].buffer = v.blob;
+  params[9].length = &params[9].buffer_length;
+  params[9].is_null = NULL;
+
+  int is_null = 1;
+
+  sql = "insert into m1 values(?,?,?,?,?,?,?,?,?,?)";
+  code = taos_stmt_prepare(stmt, sql, 0);
+  if (code != 0){
+    printf("failed to execute taos_stmt_prepare. code:0x%x\n", code);
+  }
+  v.ts = 1591060628000;
+  for (int i = 0; i < 10; ++i) {
+    v.ts += 1;
+    for (int j = 1; j < 10; ++j) {
+      params[j].is_null = ((i == j) ? &is_null : 0);
+    }
+    v.b = (int8_t)i % 2;
+    v.v1 = (int8_t)i;
+    v.v2 = (int16_t)(i * 2);
+    v.v4 = (int32_t)(i * 4);
+    v.v8 = (int64_t)(i * 8);
+    v.f4 = (float)(i * 40);
+    v.f8 = (double)(i * 80);
+    for (int j = 0; j < sizeof(v.bin) - 1; ++j) {
+      v.bin[j] = (char)(i + '0');
+    }
+
+    taos_stmt_bind_param(stmt, params);
+    taos_stmt_add_batch(stmt);
+  }
+  if (taos_stmt_execute(stmt) != 0) {
+    printf("failed to execute insert statement.\n");
+    exit(1);
+  }
+  taos_stmt_close(stmt);
+
+  // query the records
+  stmt = taos_stmt_init(taos);
+  taos_stmt_prepare(stmt, "SELECT * FROM m1 WHERE v1 > ? AND v2 < ?", 0);
+  v.v1 = 5;
+  v.v2 = 15;
+  taos_stmt_bind_param(stmt, params + 2);
+  if (taos_stmt_execute(stmt) != 0) {
+    printf("failed to execute select statement.\n");
+    exit(1);
+  }
+
+  result = taos_stmt_use_result(stmt);
+
+  TAOS_ROW    row;
+  int         rows = 0;
+  int         num_fields = taos_num_fields(result);
+  TAOS_FIELD *fields = taos_fetch_fields(result);
+  char        temp[256];
+
+  // fetch the records row by row
+  while ((row = taos_fetch_row(result))) {
+    rows++;
+    taos_print_row(temp, row, fields, num_fields);
+    printf("%s\n", temp);
+  }
+  if (rows == 2) {
+    printf("two rows are fetched as expectation\n");
+  } else {
+    printf("expect two rows, but %d rows are fetched\n", rows);
+  }
+
+  taos_free_result(result);
+  taos_stmt_close(stmt);
+
+  return 0;
+}
+
diff --git a/tests/examples/c/stream.c b/tests/examples/c/stream.c
old mode 100755
new mode 100644
diff --git a/tests/examples/c/subscribe.c b/tests/examples/c/subscribe.c
index 0bf93f6f2ddd81e715e7d9cf0b5abfd054635060..8368af18f7831d9c2cbb7402104b1c59042eda72 100644
--- a/tests/examples/c/subscribe.c
+++ b/tests/examples/c/subscribe.c
@@ -7,28 +7,31 @@
 #include <taos.h>  // include TDengine header file
 #include <unistd.h>
 
+int nTotalRows;
+
 void print_result(TAOS_RES* res, int blockFetch) {
   TAOS_ROW    row = NULL;
   int         num_fields = taos_num_fields(res);
   TAOS_FIELD* fields = taos_fetch_fields(res);
   int         nRows = 0;
+  char        buf[4096];
 
+  
   if (blockFetch) {
     nRows = taos_fetch_block(res, &row);
     for (int i = 0; i < nRows; i++) {
-      char temp[256];
-      taos_print_row(temp, row + i, fields, num_fields);
-      puts(temp);
+      taos_print_row(buf, row + i, fields, num_fields);
+      puts(buf);
     }
   } else {
     while ((row = taos_fetch_row(res))) {
-      char temp[256];
-      taos_print_row(temp, row, fields, num_fields);
-      puts(temp);
+      taos_print_row(buf, row, fields, num_fields);
+      puts(buf);
       nRows++;
     }
   }
 
+  nTotalRows += nRows;
   printf("%d rows consumed.\n", nRows);
 }
 
@@ -52,36 +55,55 @@ void check_row_count(int line, TAOS_RES* res, int expected) {
 }
 
 
+void do_query(TAOS* taos, const char* sql) {
+  TAOS_RES* res = taos_query(taos, sql);
+  taos_free_result(res);
+}
+
+
 void run_test(TAOS* taos) {
-  taos_query(taos, "drop database if exists test;");
+  do_query(taos, "drop database if exists test;");
   
   usleep(100000);
-  taos_query(taos, "create database test tables 5;");
+  do_query(taos, "create database test;");
   usleep(100000);
-  taos_query(taos, "use test;");
+  do_query(taos, "use test;");
+
   usleep(100000);
-  taos_query(taos, "create table meters(ts timestamp, a int, b binary(20)) tags(loc binary(20), area int);");
-
-  taos_query(taos, "insert into t0 using meters tags('beijing', 0) values('2020-01-01 00:00:00.000', 0, 'china');");
-  taos_query(taos, "insert into t0 using meters tags('beijing', 0) values('2020-01-01 00:01:00.000', 0, 'china');");
-  taos_query(taos, "insert into t0 using meters tags('beijing', 0) values('2020-01-01 00:02:00.000', 0, 'china');");
-  taos_query(taos, "insert into t1 using meters tags('shanghai', 0) values('2020-01-01 00:00:00.000', 0, 'china');");
-  taos_query(taos, "insert into t1 using meters tags('shanghai', 0) values('2020-01-01 00:01:00.000', 0, 'china');");
-  taos_query(taos, "insert into t1 using meters tags('shanghai', 0) values('2020-01-01 00:02:00.000', 0, 'china');");
-  taos_query(taos, "insert into t1 using meters tags('shanghai', 0) values('2020-01-01 00:03:00.000', 0, 'china');");
-  taos_query(taos, "insert into t2 using meters tags('london', 0) values('2020-01-01 00:00:00.000', 0, 'UK');");
-  taos_query(taos, "insert into t2 using meters tags('london', 0) values('2020-01-01 00:01:00.000', 0, 'UK');");
-  taos_query(taos, "insert into t2 using meters tags('london', 0) values('2020-01-01 00:01:01.000', 0, 'UK');");
-  taos_query(taos, "insert into t2 using meters tags('london', 0) values('2020-01-01 00:01:02.000', 0, 'UK');");
-  taos_query(taos, "insert into t3 using meters tags('tianjin', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t4 using meters tags('wuhan', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t5 using meters tags('jinan', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t6 using meters tags('haikou', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t7 using meters tags('nanjing', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t8 using meters tags('lanzhou', 0) values('2020-01-01 00:01:02.000', 0, 'china');");
-  taos_query(taos, "insert into t9 using meters tags('tokyo', 0) values('2020-01-01 00:01:02.000', 0, 'japan');");
+  do_query(taos, "create table meters(ts timestamp, a int) tags(area int);");
+
+  do_query(taos, "create table t0 using meters tags(0);");
+  do_query(taos, "create table t1 using meters tags(1);");
+  do_query(taos, "create table t2 using meters tags(2);");
+  do_query(taos, "create table t3 using meters tags(3);");
+  do_query(taos, "create table t4 using meters tags(4);");
+  do_query(taos, "create table t5 using meters tags(5);");
+  do_query(taos, "create table t6 using meters tags(6);");
+  do_query(taos, "create table t7 using meters tags(7);");
+  do_query(taos, "create table t8 using meters tags(8);");
+  do_query(taos, "create table t9 using meters tags(9);");
+
+  do_query(taos, "insert into t0 values('2020-01-01 00:00:00.000', 0);");
+  do_query(taos, "insert into t0 values('2020-01-01 00:01:00.000', 0);");
+  do_query(taos, "insert into t0 values('2020-01-01 00:02:00.000', 0);");
+  do_query(taos, "insert into t1 values('2020-01-01 00:00:00.000', 0);");
+  do_query(taos, "insert into t1 values('2020-01-01 00:01:00.000', 0);");
+  do_query(taos, "insert into t1 values('2020-01-01 00:02:00.000', 0);");
+  do_query(taos, "insert into t1 values('2020-01-01 00:03:00.000', 0);");
+  do_query(taos, "insert into t2 values('2020-01-01 00:00:00.000', 0);");
+  do_query(taos, "insert into t2 values('2020-01-01 00:01:00.000', 0);");
+  do_query(taos, "insert into t2 values('2020-01-01 00:01:01.000', 0);");
+  do_query(taos, "insert into t2 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t3 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t4 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t5 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t6 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t7 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t8 values('2020-01-01 00:01:02.000', 0);");
+  do_query(taos, "insert into t9 values('2020-01-01 00:01:02.000', 0);");
 
   // super tables subscription
+  usleep(1000000);
 
   TAOS_SUB* tsub = taos_subscribe(taos, 0, "test", "select * from meters;", NULL, NULL, 0);
   TAOS_RES* res = taos_consume(tsub);
@@ -90,23 +112,23 @@ void run_test(TAOS* taos) {
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 0);
 
-  taos_query(taos, "insert into t0 values('2020-01-01 00:03:00.000', 0, 'china');");
-  taos_query(taos, "insert into t8 values('2020-01-01 00:01:03.000', 0, 'china');");
+  do_query(taos, "insert into t0 values('2020-01-01 00:02:00.001', 0);");
+  do_query(taos, "insert into t8 values('2020-01-01 00:01:03.000', 0);");
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 2);
 
-  taos_query(taos, "insert into t2 values('2020-01-01 00:01:02.001', 0, 'UK');");
-  taos_query(taos, "insert into t1 values('2020-01-01 00:03:00.001', 0, 'UK');");
+  do_query(taos, "insert into t2 values('2020-01-01 00:01:02.001', 0);");
+  do_query(taos, "insert into t1 values('2020-01-01 00:03:00.001', 0);");
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 2);
 
-  taos_query(taos, "insert into t1 values('2020-01-01 00:03:00.002', 0, 'china');");
+  do_query(taos, "insert into t1 values('2020-01-01 00:03:00.002', 0);");
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 1);
 
   // keep progress information and restart subscription
   taos_unsubscribe(tsub, 1);
-  taos_query(taos, "insert into t0 values('2020-01-01 00:04:00.000', 0, 'china');");
+  do_query(taos, "insert into t0 values('2020-01-01 00:04:00.000', 0);");
   tsub = taos_subscribe(taos, 1, "test", "select * from meters;", NULL, NULL, 0);
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 24);
@@ -133,7 +155,7 @@ void run_test(TAOS* taos) {
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 0);
 
-  taos_query(taos, "insert into t0 values('2020-01-01 00:04:00.001', 0, 'china');");
+  do_query(taos, "insert into t0 values('2020-01-01 00:04:00.001', 0);");
   res = taos_consume(tsub);
   check_row_count(__LINE__, res, 1);
 
@@ -197,7 +219,7 @@ int main(int argc, char *argv[]) {
   // init TAOS
   taos_init();
 
-  TAOS* taos = taos_connect(host, user, passwd, "test", 0);
+  TAOS* taos = taos_connect(host, user, passwd, "", 0);
   if (taos == NULL) {
     printf("failed to connect to db, reason:%s\n", taos_errstr(taos));
     exit(1);
@@ -209,6 +231,7 @@ int main(int argc, char *argv[]) {
     exit(0);
   }
 
+  taos_select_db(taos, "test");
   TAOS_SUB* tsub = NULL;
   if (async) {
     // create an asynchronized subscription, the callback function will be called every 1s
@@ -236,6 +259,7 @@ int main(int argc, char *argv[]) {
     }
   }
 
+  printf("total rows consumed: %d\n", nTotalRows);
   taos_unsubscribe(tsub, keep);
   taos_close(taos);
 
diff --git a/tests/examples/go/src/taosapp/taosapp.go b/tests/examples/go/src/taosapp/taosapp.go
index 5c7b92f6fbc22d8f5a784409b797891a19829417..30126ea571beeb84f8a46e7053ede97f8202ee71 100644
--- a/tests/examples/go/src/taosapp/taosapp.go
+++ b/tests/examples/go/src/taosapp/taosapp.go
@@ -13,13 +13,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package main
- 
+
 import (
 	"database/sql"
     "time"
     "log"
     "fmt"
-	_ "taosSql"
+	_ "github.com/taosdata/driver-go/taosSql"
 )
 
 func main() {
@@ -29,7 +29,7 @@ func main() {
 
     fmt.Printf("\n======== start demo test ========\n")
     // open connect to taos server
-    db, err := sql.Open(taosDriverName, "root:taosdata@/tcp(127.0.0.1:0)/demodb")
+    db, err := sql.Open(taosDriverName, "root:taosdata@/tcp(127.0.0.1:0)/")
     if err != nil {
         log.Fatalf("Open database error: %s\n", err)
     }
@@ -58,11 +58,11 @@ func main() {
 
 func drop_database(db *sql.DB, demodb string) {
     st := time.Now().Nanosecond()
-    res, err := db.Exec("drop database " + demodb)
-    checkErr(err)
+    res, err := db.Exec("drop database if exists " + demodb)
+    checkErr(err, "drop database if exists " + demodb)
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "drop db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
 
@@ -73,10 +73,10 @@ func create_database(db *sql.DB, demodb string) {
     st := time.Now().Nanosecond()
     // create database
     res, err := db.Exec("create database " + demodb)
-    checkErr(err)
+    checkErr(err, "create db, db.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "create db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
 
@@ -89,10 +89,10 @@ func use_database(db *sql.DB, demodb string) {
     st := time.Now().Nanosecond()
     // use database
     res, err := db.Exec("use " +  demodb)  // notes: must no quote to db name
-    checkErr(err)
+    checkErr(err, "use db db.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "use db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
 
@@ -103,10 +103,10 @@ func create_table(db *sql.DB, demot string) {
     st := time.Now().Nanosecond()
     // create table
     res, err := db.Exec("create table " + demot + " (ts timestamp, id int, name binary(8), len tinyint, flag bool, notes binary(8), fv float, dv double)")
-    checkErr(err)
+    checkErr(err, "create table db.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "create table res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("create table result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -120,10 +120,10 @@ func insert_data(db *sql.DB, demot string) {
                                       " (now+1s, 101, 'shanghai', 11, true, 'two', 789.123, 789.123)" +
                                       " (now+2s, 102, 'shenzhen', 12,  false, 'three', 456.789, 456.789)")
 
-    checkErr(err)
+    checkErr(err, "insert data, db.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "insert data res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -133,7 +133,7 @@ func select_data(db *sql.DB, demot string) {
     st := time.Now().Nanosecond()
 
     rows, err := db.Query("select * from ? " , demot)  // go text mode
-    checkErr(err)
+    checkErr(err, "select db.Query")
 
     fmt.Printf("%10s%s%8s %5s %9s%s %s %8s%s %7s%s %8s%s %4s%s %5s%s\n", " ","ts", " ", "id"," ", "name"," ","len", " ","flag"," ", "notes", " ", "fv", " ", " ", "dv")
     var affectd int
@@ -148,7 +148,7 @@ func select_data(db *sql.DB, demot string) {
         var dv float64
 
         err = rows.Scan(&ts, &id, &name, &len, &flag, &notes, &fv, &dv)
-        checkErr(err)
+        checkErr(err, "select rows.Scan")
 
         fmt.Printf("%s\t", ts)
         fmt.Printf("%d\t",id)
@@ -170,15 +170,11 @@ func select_data(db *sql.DB, demot string) {
 func drop_database_stmt(db *sql.DB,demodb string) {
     st := time.Now().Nanosecond()
     // drop test db
-    stmt, err := db.Prepare("drop database ?")
-    checkErr(err)
-    defer stmt.Close()
-
-    res, err := stmt.Exec(demodb)
-    checkErr(err)
+    res, err := db.Exec("drop database if exists " + demodb)
+    checkErr(err, "drop database " + demodb)
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "drop db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("drop database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -189,15 +185,15 @@ func create_database_stmt(db *sql.DB,demodb string)  {
     // create database
     //var stmt interface{}
     stmt, err := db.Prepare("create database ?")
-    checkErr(err)
+    checkErr(err, "create db, db.Prepare")
 
     //var res driver.Result
     res, err := stmt.Exec(demodb)
-    checkErr(err)
+    checkErr(err, "create db, stmt.Exec")
 
     //fmt.Printf("Query OK, %d row(s) affected()", res.RowsAffected())
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "create db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("create database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -208,13 +204,13 @@ func use_database_stmt (db *sql.DB,demodb string) {
     // create database
     //var stmt interface{}
     stmt, err := db.Prepare("use " + demodb)
-    checkErr(err)
+    checkErr(err, "use db, db.Prepare")
 
     res, err := stmt.Exec()
-    checkErr(err)
+    checkErr(err, "use db, stmt.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "use db, res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("use database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -224,14 +220,14 @@ func create_table_stmt (db *sql.DB,demot string)  {
     st := time.Now().Nanosecond()
     // create table
     // (ts timestamp, id int, name binary(8), len tinyint, flag bool, notes binary(8), fv float, dv double)
-    stmt, err := db.Prepare("create table ? (? timestamp, ? int, ? binary(8), ? tinyint, ? bool, ? binary(8), ? float, ? double)")
-    checkErr(err)
+    stmt, err := db.Prepare("create table ? (? timestamp, ? int, ? binary(10), ? tinyint, ? bool, ? binary(8), ? float, ? double)")
+    checkErr(err, "create table db.Prepare")
 
     res, err := stmt.Exec(demot, "ts", "id", "name", "len", "flag", "notes", "fv", "dv")
-    checkErr(err)
+    checkErr(err, "create table stmt.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "create table res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("create table result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -241,15 +237,15 @@ func insert_data_stmt(db *sql.DB,demot string)  {
     st := time.Now().Nanosecond()
     // insert data into table
     stmt, err := db.Prepare("insert into ? values(?, ?, ?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?, ?, ?)")
-    checkErr(err)
+    checkErr(err, "insert db.Prepare")
 
     res, err := stmt.Exec(demot, "now" ,    1000, "'haidian'" ,    6, true, "'AI world'",  6987.654, 321.987,
                                  "now+1s", 1001, "'changyang'" ,  7, false,  "'DeepMode'", 12356.456, 128634.456,
                                  "now+2s", 1002, "'chuangping'" , 8, true, "'database'",  3879.456, 65433478.456,)
-    checkErr(err)
+    checkErr(err, "insert data, stmt.Exec")
 
     affectd, err := res.RowsAffected()
-    checkErr(err)
+    checkErr(err, "res.RowsAffected")
 
     et := time.Now().Nanosecond()
     fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
@@ -259,12 +255,12 @@ func select_data_stmt(db *sql.DB, demot string) {
     st := time.Now().Nanosecond()
 
     stmt, err := db.Prepare("select ?, ?, ?, ?, ?, ?, ?, ? from ?" )  // go binary mode
-    checkErr(err)
+    checkErr(err, "db.Prepare")
 
     rows, err := stmt.Query("ts", "id","name","len", "flag","notes", "fv", "dv", demot)
-    checkErr(err)
+    checkErr(err, "stmt.Query")
 
-    fmt.Printf("%10s%s%8s %5s %9s%s %s %8s%s %7s%s %8s%s %11s%s %14s%s\n", " ","ts", " ", "id"," ", "name"," ","len", " ","flag"," ", "notes", " ", "fv", " ", " ", "dv")
+    fmt.Printf("%10s%s%8s %5s %8s%s %s %10s%s %7s%s %8s%s %11s%s %14s%s\n", " ","ts", " ", "id"," ", "name"," ","len", " ","flag"," ", "notes", " ", "fv", " ", " ", "dv")
     var affectd int
     for rows.Next() {
         var ts string
@@ -279,7 +275,7 @@ func select_data_stmt(db *sql.DB, demot string) {
         err = rows.Scan(&ts, &id, &name, &len, &flag, &notes, &fv, &dv)
         //fmt.Println("start scan fields from row.rs, &fv:", &fv)
         //err = rows.Scan(&fv)
-        checkErr(err)
+        checkErr(err, "rows.Scan")
 
         fmt.Printf("%s\t", ts)
         fmt.Printf("%d\t",id)
@@ -298,8 +294,9 @@ func select_data_stmt(db *sql.DB, demot string) {
     fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
 }
 
-func checkErr(err error) {
+func checkErr(err error, prompt string) {
     if err != nil {
+	fmt.Printf("%s\n", prompt)
         panic(err)
     }
 }
diff --git a/tests/examples/lua/lua_connector.c b/tests/examples/lua/lua_connector.c
index f4065bb27452fba0e4cccbd8d7024e68579f5637..143f16a799244d4b77f3d01c4d2189fa6519b0d9 100644
--- a/tests/examples/lua/lua_connector.c
+++ b/tests/examples/lua/lua_connector.c
@@ -58,8 +58,10 @@ static int l_query(lua_State *L){
   int table_index = lua_gettop(L);
 
   //  printf("receive command:%s\r\n",s);
-  if(taos_query(taos, s)!=0){
-    printf("failed, reason:%s\n", taos_errstr(taos));
+    result = taos_query(taos,s);
+    int32_t code = taos_errno(result);
+  if( code != 0){
+    printf("failed, reason:%s\n", taos_errstr(result));
     lua_pushnumber(L, -1);
     lua_setfield(L, table_index, "code");    
     lua_pushstring(L, taos_errstr(taos));
@@ -69,24 +71,13 @@ static int l_query(lua_State *L){
     
   }else{
     //printf("success to query.\n");
-    result = taos_use_result(taos);
-
-    if (result == NULL) {
-      printf("failed to get result, reason:%s\n", taos_errstr(taos));
-      lua_pushnumber(L, -2);
-      lua_setfield(L, table_index, "code");    
-      lua_pushstring(L, taos_errstr(taos));
-      lua_setfield(L, table_index, "error");    
-      return 1;
-    }
-
     TAOS_ROW    row;
     int         rows = 0;
-    int         num_fields = taos_field_count(taos);
+    int         num_fields = taos_field_count(result);
     TAOS_FIELD *fields = taos_fetch_fields(result);
     char        temp[256];
 
-    int affectRows = taos_affected_rows(taos);
+    int affectRows = taos_affected_rows(result);
     //    printf(" affect rows:%d\r\n", affectRows);
     lua_pushnumber(L, 0);
     lua_setfield(L, table_index, "code");
@@ -155,15 +146,13 @@ static int l_query(lua_State *L){
 }
 
 void stream_cb(void *param, TAOS_RES *result, TAOS_ROW row){
-
   struct cb_param* p = (struct cb_param*) param;
   TAOS_FIELD *fields = taos_fetch_fields(result);
   int         numFields = taos_num_fields(result);
 
+  printf("\nnumfields:%d\n", numFields);
   printf("\n\r-----------------------------------------------------------------------------------\n");
 
-  // printf("r:%d, L:%d\n",p->callback, p->state);
-
   lua_State *L = p->state;
   lua_rawgeti(L, LUA_REGISTRYINDEX, p->callback);
 
diff --git a/tests/examples/lua/test.lua b/tests/examples/lua/test.lua
index 38ae1c82f2b1bbcb473257200241fb20ab44878b..4d5f9fe7d36f99f9a9452e8137bf298361a05685 100644
--- a/tests/examples/lua/test.lua
+++ b/tests/examples/lua/test.lua
@@ -15,7 +15,7 @@ else
    conn = res.conn
 end
 
-local res = driver.query(conn,"drop database demo")
+local res = driver.query(conn,"drop database if exists demo")
 
 res = driver.query(conn,"create database demo")
 if res.code ~=0 then
@@ -106,7 +106,7 @@ end
 
 --From now on we begin continous query in an definite (infinite if you want) loop.
 local loop_index = 0
-while loop_index < 20 do
+while loop_index < 10 do
    local t = os.time()*1000
    local v = loop_index
    res = driver.query(conn,string.format("INSERT INTO therm1 VALUES (%d, %d)",t,v))
diff --git a/tests/examples/nodejs/node-example-raw.js b/tests/examples/nodejs/node-example-raw.js
index 71425a89865fcdc4fd40f2b74076a510198d79b3..058a50c4c3f0f7d44da4bdcc4fc54b81d7e1bc38 100644
--- a/tests/examples/nodejs/node-example-raw.js
+++ b/tests/examples/nodejs/node-example-raw.js
@@ -5,7 +5,7 @@
 */
 
 // Get the td-connector package
-const taos = require('td-connector');
+const taos = require('td2.0-connector');
 
 /* We will connect to TDengine by passing an object comprised of connection options to taos.connect and store the
  * connection to the variable conn
@@ -26,7 +26,7 @@ var c1 = conn.cursor();
 // c1.execute(query) will execute the query
 // Let's create a database named db
 try {
-  c1.execute('create database db;');
+  c1.execute('create database if not exists db;');
 }
 catch(err) {
   conn.close();
diff --git a/tests/examples/nodejs/node-example.js b/tests/examples/nodejs/node-example.js
index 117977cc4f60ef4a55537b6c9943760a8e72cb1d..bfdd9e49a08fc1d6c20f3bdafbb84a500986b9fd 100644
--- a/tests/examples/nodejs/node-example.js
+++ b/tests/examples/nodejs/node-example.js
@@ -1,7 +1,7 @@
 /* This example is to show the preferred way to use the td-connector */
 /* To run, enter node path/to/node-example.js */
 // Get the td-connector package
-const taos = require('td-connector');
+const taos = require('td2.0-connector');
 
 /* We will connect to TDengine by passing an object comprised of connection options to taos.connect and store the
  * connection to the variable conn
@@ -22,8 +22,9 @@ var c1 = conn.cursor();
 // c1.query(query) will return a TaosQuery object, of which then we can execute. The execute function then returns a promise
 // Let's create a database named db
 try {
-  var query = c1.query('create database db;');
-  query.execute();
+	c1.execute('create database if not exists db;');
+  //var query = c1.query('create database if not exists db;');
+  //query.execute();
 }
 catch(err) {
   conn.close();
@@ -71,6 +72,28 @@ catch (err) {
   throw err;
 }
 
+
+Date.prototype.Format = function(fmt){
+    var o = {
+    	'M+': this.getMonth() + 1,
+    	'd+': this.getDate(),
+    	'H+': this.getHours(),
+    	'm+': this.getMinutes(),
+        's+': this.getSeconds(),
+    	'S+': this.getMilliseconds()
+	};
+	if (/(y+)/.test(fmt)) {
+		fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    for (var k in o) {
+		if (new RegExp('(' + k + ')').test(fmt)) {
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(String(o[k]).length)));
+        }
+    }
+    return fmt;
+}
+
+
 // Let's try to insert some random generated data to test with
 // We will use the bind function of the TaosQuery object to easily bind values to question marks in the query
 // For Timestamps, a normal Datetime object or TaosTimestamp or milliseconds can be passed in through the bind function
@@ -79,17 +102,21 @@ let interval = 1000;
 try {
   for (let i = 0; i < 1000; i++) {
     stime.setMilliseconds(stime.getMilliseconds() + interval);
+    
+    //console.log(stime.Format('yyyy-MM-dd HH:mm:ss.SSS'));    
+
     let insertData = [stime,
                       parseInt(Math.random()*100),
                       parseInt(Math.random()*300),
                       parseFloat(Math.random()*10 + 30),
-                      "\"random note!\""];
+                      "Note"];
     //c1.execute('insert into db.weather values(' + insertData.join(',') + ' );');
-    var query = c1.query('insert into db.weather values(?, ?, ?, ?, ?);').bind(insertData);
-    query.execute();
+    
+    //var query = c1.query('insert into db.weather values(?, ?, ?, ?, ?);').bind(insertData);
+    //query.execute();
+    c1.execute('insert into db.weather values(\"'+stime.Format('yyyy-MM-dd HH:mm:ss.SSS')+'\",'+parseInt(Math.random() * 100)+','+parseInt(Math.random() * 300)+','+parseFloat(Math.random()*10 + 30)+',"Note");');
   }
-}
-catch (err) {
+}catch (err) {
   conn.close();
   throw err;
 }
@@ -98,7 +125,8 @@ catch (err) {
 var retrievedData;
 try {
   c1.query('select * from db.weather limit 5 offset 100;', true).then(function(result){
-    result.pretty();
+    //result.pretty();
+	console.log('=========>'+JSON.stringify(result));
     // Neat!
   });
 
diff --git a/tests/examples/python/read_example.py b/tests/examples/python/read_example.py
index a96115dfb256aed446da05bb8a1e2fd46b8a8437..73052ab2df54fcee8fb01573e23eb7b29ed11712 100644
--- a/tests/examples/python/read_example.py
+++ b/tests/examples/python/read_example.py
@@ -22,14 +22,17 @@ if __name__ == '__main__':
     # @password : Password 
     # @database : Database to use when connecting to TDengine server
     # @config   : Configuration directory
-    conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
-
+    if len(sys.argv)>1:
+        hostname=sys.argv[1]
+        conn = taos.connect(host=hostname, user="root", password="taosdata", config="/etc/taos")
+    else:
+        conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
+   
     # Generate a cursor object to run SQL commands
     c1 = conn.cursor()
-
     # Create a database named db
     try:
-        c1.execute('create database db')
+        c1.execute('create database if not exists db ')
     except Exception as err:
         conn.close()
         raise(err)
@@ -50,9 +53,11 @@ if __name__ == '__main__':
         raise(err)
 
     # insert data 
-    for i in range(10000):
+    for i in range(10):
         try:
-           c1.execute("insert into t values ('%s', %d, %f, '%s')" % (start_time, random.randint(1,10), random.randint(1,10)/10.0, 'hello'))
+           value = c1.execute("insert into t values ('%s', %d, %f, '%s')" % (start_time, random.randint(1,10), random.randint(1,10)/10.0, 'hello'))
+           #if insert, value is the affected rows
+           print(value)
         except Exception as err:
             conn.close()
             raise(err)
@@ -70,6 +75,11 @@ if __name__ == '__main__':
     # Use fetchall to fetch data in a list
     data = c1.fetchall()
 
+    for col in data:
+        print(col)
+
+    print('Another query method ')
+
     try:
         c1.execute('select * from db.t')
     except Exception as err:
diff --git a/tests/gotest/batchtest.sh b/tests/gotest/batchtest.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a027dd0d7ce04c599233157bdd618fad3885c809
--- /dev/null
+++ b/tests/gotest/batchtest.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+bash ./case001/case001.sh
+#bash ./case002/case002.sh
+#bash ./case003/case003.sh
diff --git a/tests/gotest/case001/case001.go b/tests/gotest/case001/case001.go
new file mode 100644
index 0000000000000000000000000000000000000000..1d5ede6d21a0bacad34cb807a16b50e0ae643512
--- /dev/null
+++ b/tests/gotest/case001/case001.go
@@ -0,0 +1,308 @@
+/*
+ * 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/>.
+ */
+package main
+
+import (
+	"database/sql"
+	"fmt"
+	_ "github.com/taosdata/driver-go/taosSql"
+	"log"
+	"time"
+)
+
+func main() {
+	taosDriverName := "taosSql"
+	demodb := "demodb"
+	demot := "demot"
+
+	fmt.Printf("\n======== start demo test ========\n")
+	// open connect to taos server
+	db, err := sql.Open(taosDriverName, "root:taosdata@/tcp(192.168.1.217:7100)/")
+	if err != nil {
+		log.Fatalf("Open database error: %s\n", err)
+	}
+	defer db.Close()
+
+	drop_database(db, demodb)
+	create_database(db, demodb)
+	use_database(db, demodb)
+	create_table(db, demot)
+	insert_data(db, demot)
+	select_data(db, demot)
+
+	fmt.Printf("\n======== start stmt mode test ========\n")
+
+	demodbStmt := "demodbStmt"
+	demotStmt := "demotStmt"
+	drop_database_stmt(db, demodbStmt)
+	create_database_stmt(db, demodbStmt)
+	use_database_stmt(db, demodbStmt)
+	create_table_stmt(db, demotStmt)
+	insert_data_stmt(db, demotStmt)
+	select_data_stmt(db, demotStmt)
+
+	fmt.Printf("\n======== end demo test ========\n")
+}
+
+func drop_database(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	res, err := db.Exec("drop database if exists " + demodb)
+	checkErr(err, "drop database if exists "+demodb)
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "drop db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+
+	fmt.Printf("drop database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+
+	//sleep 50毫秒
+	time.Sleep(time.Duration(50)* time.Millisecond)
+}
+
+func create_database(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	// create database
+	res, err := db.Exec("create database " + demodb)
+	checkErr(err, "create db, db.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "create db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+
+	fmt.Printf("create database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+
+	return
+}
+
+func use_database(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	// use database
+	res, err := db.Exec("use " + demodb) // notes: must no quote to db name
+	checkErr(err, "use db db.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "use db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+
+	fmt.Printf("use database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func create_table(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+	// create table
+	res, err := db.Exec("create table " + demot + " (ts timestamp, id int, name binary(8), len tinyint, flag bool, notes binary(8), fv float, dv double)")
+	checkErr(err, "create table db.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "create table res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("create table result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func insert_data(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+	// insert data
+	res, err := db.Exec("insert into " + demot +
+		" values (now, 100, 'beijing', 10,  true, 'one', 123.456, 123.456)" +
+		" (now+1s, 101, 'shanghai', 11, true, 'two', 789.123, 789.123)" +
+		" (now+2s, 102, 'shenzhen', 12,  false, 'three', 456.789, 456.789)")
+
+	checkErr(err, "insert data, db.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "insert data res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func select_data(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+
+	rows, err := db.Query("select * from ? ", demot) // go text mode
+	checkErr(err, "select db.Query")
+
+	fmt.Printf("%10s%s%8s %5s %9s%s %s %8s%s %7s%s %8s%s %4s%s %5s%s\n", " ", "ts", " ", "id", " ", "name", " ", "len", " ", "flag", " ", "notes", " ", "fv", " ", " ", "dv")
+	var affectd int
+
+	//decoder := mahonia.NewDecoder("gbk") // 把原来ANSI格式的文本文件里的字符，用gbk进行解码。
+
+	for rows.Next() {
+		var ts string
+		var name string
+		var id int
+		var len int8
+		var flag bool
+		var notes string
+		var fv float32
+		var dv float64
+
+		err = rows.Scan(&ts, &id, &name, &len, &flag, &notes, &fv, &dv)
+		checkErr(err, "select rows.Scan")
+
+		fmt.Printf("%s|\t", ts)
+		fmt.Printf("%d|\t", id)
+		fmt.Printf("%10s|\t", name)
+		fmt.Printf("%d|\t", len)
+		fmt.Printf("%t|\t", flag)
+		fmt.Printf("%s|\t", notes)
+		fmt.Printf("%06.3f|\t", fv)
+		fmt.Printf("%09.6f|\n\n", dv)
+
+		affectd++
+	}
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("select data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+	//fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1E9)
+}
+
+func drop_database_stmt(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	// drop test db
+	res, err := db.Exec("drop database if exists " + demodb)
+	checkErr(err, "drop database "+demodb)
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "drop db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("drop database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func create_database_stmt(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	// create database
+	//var stmt interface{}
+	stmt, err := db.Prepare("create database ?")
+	checkErr(err, "create db, db.Prepare")
+
+	//var res driver.Result
+	res, err := stmt.Exec(demodb)
+	checkErr(err, "create db, stmt.Exec")
+
+	//fmt.Printf("Query OK, %d row(s) affected()", res.RowsAffected())
+	affectd, err := res.RowsAffected()
+	checkErr(err, "create db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("create database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func use_database_stmt(db *sql.DB, demodb string) {
+	st := time.Now().Nanosecond()
+	// create database
+	//var stmt interface{}
+	stmt, err := db.Prepare("use " + demodb)
+	checkErr(err, "use db, db.Prepare")
+
+	res, err := stmt.Exec()
+	checkErr(err, "use db, stmt.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "use db, res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("use database result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func create_table_stmt(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+	// create table
+	// (ts timestamp, id int, name binary(8), len tinyint, flag bool, notes binary(8), fv float, dv double)
+	stmt, err := db.Prepare("create table ? (? timestamp, ? int, ? binary(10), ? tinyint, ? bool, ? binary(8), ? float, ? double)")
+	checkErr(err, "create table db.Prepare")
+
+	res, err := stmt.Exec(demot, "ts", "id", "name", "len", "flag", "notes", "fv", "dv")
+	checkErr(err, "create table stmt.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "create table res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("create table result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func insert_data_stmt(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+	// insert data into table
+	stmt, err := db.Prepare("insert into ? values(?, ?, ?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?, ?, ?) (?, ?, ?, ?, ?, ?, ?, ?)")
+	checkErr(err, "insert db.Prepare")
+
+	res, err := stmt.Exec(demot, "now", 1000, "'haidian'", 6, true, "'AI world'", 6987.654, 321.987,
+		"now+1s", 1001, "'changyang'", 7, false, "'DeepMode'", 12356.456, 128634.456,
+		"now+2s", 1002, "'chuangping'", 8, true, "'database'", 3879.456, 65433478.456)
+	checkErr(err, "insert data, stmt.Exec")
+
+	affectd, err := res.RowsAffected()
+	checkErr(err, "res.RowsAffected")
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("insert data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func select_data_stmt(db *sql.DB, demot string) {
+	st := time.Now().Nanosecond()
+
+	stmt, err := db.Prepare("select ?, ?, ?, ?, ?, ?, ?, ? from ?") // go binary mode
+	checkErr(err, "db.Prepare")
+
+	rows, err := stmt.Query("ts", "id", "name", "len", "flag", "notes", "fv", "dv", demot)
+	checkErr(err, "stmt.Query")
+
+	fmt.Printf("%10s%s%8s %5s %8s%s %s %10s%s %7s%s %8s%s %11s%s %14s%s\n", " ", "ts", " ", "id", " ", "name", " ", "len", " ", "flag", " ", "notes", " ", "fv", " ", " ", "dv")
+	var affectd int
+	for rows.Next() {
+		var ts string
+		var name string
+		var id int
+		var len int8
+		var flag bool
+		var notes string
+		var fv float32
+		var dv float64
+
+		err = rows.Scan(&ts, &id, &name, &len, &flag, &notes, &fv, &dv)
+		//fmt.Println("start scan fields from row.rs, &fv:", &fv)
+		//err = rows.Scan(&fv)
+		checkErr(err, "rows.Scan")
+
+		fmt.Printf("%s|\t", ts)
+		fmt.Printf("%d|\t", id)
+		fmt.Printf("%10s|\t", name)
+		fmt.Printf("%d|\t", len)
+		fmt.Printf("%t|\t", flag)
+		fmt.Printf("%s|\t", notes)
+		fmt.Printf("%06.3f|\t", fv)
+		fmt.Printf("%09.6f|\n", dv)
+
+		affectd++
+
+	}
+
+	et := time.Now().Nanosecond()
+	fmt.Printf("select data result:\n %d row(s) affectd (%6.6fs)\n\n", affectd, (float32(et-st))/1e9)
+}
+
+func checkErr(err error, prompt string) {
+	if err != nil {
+		fmt.Printf("%s\n", prompt)
+		panic(err)
+	}
+}
diff --git a/tests/gotest/case001/case001.sh b/tests/gotest/case001/case001.sh
new file mode 100644
index 0000000000000000000000000000000000000000..5a9034c4d18e257eaaf9324c570fbc17b01c548b
--- /dev/null
+++ b/tests/gotest/case001/case001.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+##################################################
+# 
+# Do go test 
+#
+##################################################
+
+set +e
+#set -x
+
+script_dir="$(dirname $(readlink -f $0))"
+#echo "pwd: $script_dir, para0: $0"
+
+execName=$0
+execName=`echo ${execName##*/}`
+goName=`echo ${execName%.*}`
+
+###### step 1: start one taosd
+scriptDir=$script_dir/../../script/sh
+bash $scriptDir/stop_dnodes.sh
+bash $scriptDir/deploy.sh -n dnode1 -i 1
+bash $scriptDir/cfg.sh -n dnode1 -c walLevel -v 0
+bash $scriptDir/exec.sh -n dnode1 -s start
+
+###### step 2: set config item
+TAOS_CFG=/etc/taos/taos.cfg
+HOSTNAME=`hostname -f`
+
+if [ ! -f ${TAOS_CFG} ]; then
+  touch -f $TAOS_CFG
+fi 
+
+echo " "                                           > $TAOS_CFG
+echo "firstEp            ${HOSTNAME}:7100"        >> $TAOS_CFG
+echo "secondEp           ${HOSTNAME}:7200"        >> $TAOS_CFG
+echo "serverPort         7100"                    >> $TAOS_CFG
+#echo "dataDir            $DATA_DIR"              >> $TAOS_CFG
+#echo "logDir             $LOG_DIR"               >> $TAOS_CFG
+#echo "scriptDir          ${CODE_DIR}/../script"  >> $TAOS_CFG
+echo "numOfLogLines      100000000"               >> $TAOS_CFG
+echo "dDebugFlag         135"                     >> $TAOS_CFG
+echo "mDebugFlag         135"                     >> $TAOS_CFG
+echo "sdbDebugFlag       135"                     >> $TAOS_CFG
+echo "rpcDebugFlag       135"                     >> $TAOS_CFG
+echo "tmrDebugFlag       131"                     >> $TAOS_CFG
+echo "cDebugFlag         135"                     >> $TAOS_CFG
+echo "httpDebugFlag      135"                     >> $TAOS_CFG
+echo "monitorDebugFlag   135"                     >> $TAOS_CFG
+echo "udebugFlag         135"                     >> $TAOS_CFG
+echo "tablemetakeeptimer 5"                       >> $TAOS_CFG
+echo "wal                0"                       >> $TAOS_CFG
+echo "asyncLog           0"                       >> $TAOS_CFG
+echo "locale             en_US.UTF-8"             >> $TAOS_CFG
+echo "enableCoreFile     1"                       >> $TAOS_CFG
+echo " "                                          >> $TAOS_CFG  
+
+ulimit -n 600000
+ulimit -c unlimited
+#
+##sudo sysctl -w kernel.core_pattern=$TOP_DIR/core.%p.%e
+#
+
+###### step 3: start build
+cd $script_dir
+rm -f go.*
+go mod init $goName
+go build 
+sleep  1s
+sudo ./$goName
diff --git a/tests/gotest/test.sh b/tests/gotest/test.sh
new file mode 100644
index 0000000000000000000000000000000000000000..fe80d4429546513521286db657a961e0ca8ffc14
--- /dev/null
+++ b/tests/gotest/test.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+##################################################
+# 
+# Do go test 
+#
+##################################################
+
+set +e
+#set -x
+
+FILE_NAME=
+RELEASE=0
+while getopts "f:" arg
+do
+  case $arg in
+    f)
+      FILE_NAME=$OPTARG
+      echo "input file: $FILE_NAME"
+      ;;
+    ?)
+      echo "unknow argument"
+      ;;
+  esac
+done
+
+# start one taosd
+bash ../script/sh/stop_dnodes.sh
+bash ../script/sh/deploy.sh -n dnode1 -i 1
+bash ../script/sh/cfg.sh -n dnode1 -c walLevel -v 0
+bash ../script/sh/exec.sh -n dnode1 -s start
+
+# start build test go file
+caseDir=`echo ${FILE_NAME%/*}`
+echo "caseDir: $caseDir"
+cd $caseDir
+rm go.*
+go mod init $caseDir
+go build 
+sleep 1s
+./$caseDir
+
diff --git a/tests/perftest-scripts/cassandraTestQ1Loop.sh b/tests/perftest-scripts/cassandraTestQ1Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e65ec2575c8070041c93a369dbb1b261d9cb37b2
--- /dev/null
+++ b/tests/perftest-scripts/cassandraTestQ1Loop.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+CASTESTQ1OUT=cassandraTestQ1.out
+
+function runTest {
+  totalG0=0
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q1.txt"
+    java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q1.txt \
+      > $CASTESTQ1OUT
+    G0=`grep "devgroup=0" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG0=`echo "scale=4; $totalG0 + $G0" | bc`
+    G10=`grep "devgroup=10" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup=20" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup=30" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup=40" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup=50" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup=60" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup=70" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup=80" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup=90" $CASTESTQ1OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+  done
+  avgG0=`echo "scale=4; x = $totalG0 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, G-0, G-10, G-20, G-30, G-40, G-50, G-60, G-70, G-80, G-90"
+  echo "Cassandra, $avgG0, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90"
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+CASTEST_DIR=$WORK_DIR/tests/comparisonTest/cassandra
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/cassandraTestQ2Loop.sh b/tests/perftest-scripts/cassandraTestQ2Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..76e42cf89d6a8f0d1a395b41d9a357def3d37efb
--- /dev/null
+++ b/tests/perftest-scripts/cassandraTestQ2Loop.sh
@@ -0,0 +1,278 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+CASTESTQ2OUT=cassandraTestQ2.out
+
+function runTest {
+  totalCount10=0
+  totalCount20=0
+  totalCount30=0
+  totalCount40=0
+  totalCount50=0
+  totalCount60=0
+  totalCount70=0
+  totalCount80=0
+  totalCount90=0
+  totalCount100=0
+
+  totalAvg10=0
+  totalAvg20=0
+  totalAvg30=0
+  totalAvg40=0
+  totalAvg50=0
+  totalAvg60=0
+  totalAvg70=0
+  totalAvg80=0
+  totalAvg90=0
+  totalAvg100=0
+
+  totalSum10=0
+  totalSum20=0
+  totalSum30=0
+  totalSum40=0
+  totalSum50=0
+  totalSum60=0
+  totalSum70=0
+  totalSum80=0
+  totalSum90=0
+  totalSum100=0
+
+  totalMax10=0
+  totalMax20=0
+  totalMax30=0
+  totalMax40=0
+  totalMax50=0
+  totalMax60=0
+  totalMax70=0
+  totalMax80=0
+  totalMax90=0
+  totalMax100=0
+
+  totalMin10=0
+  totalMin20=0
+  totalMin30=0
+  totalMin40=0
+  totalMin50=0
+  totalMin60=0
+  totalMin70=0
+  totalMin80=0
+  totalMin90=0
+  totalMin100=0
+
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q2.txt"
+    java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q2.txt \
+      > $CASTESTQ2OUT
+
+    Count10=`cat $CASTESTQ2OUT | grep count | grep "devgroup<10" | awk '{print $2}'`
+    totalCount10=`echo "scale=4; $totalCount10 + $Count10" | bc`
+    Count20=`cat $CASTESTQ2OUT | grep count | grep "devgroup<20" | awk '{print $2}'`
+    totalCount20=`echo "scale=4; $totalCount20 + $Count20" | bc`
+    Count30=`cat $CASTESTQ2OUT | grep count | grep "devgroup<30" | awk '{print $2}'`
+    totalCount30=`echo "scale=4; $totalCount30 + $Count30" | bc`
+    Count40=`cat $CASTESTQ2OUT | grep count | grep "devgroup<40" | awk '{print $2}'`
+    totalCount40=`echo "scale=4; $totalCount40 + $Count40" | bc`
+    Count50=`cat $CASTESTQ2OUT | grep count | grep "devgroup<50" | awk '{print $2}'`
+    totalCount50=`echo "scale=4; $totalCount50 + $Count50" | bc`
+    Count60=`cat $CASTESTQ2OUT | grep count | grep "devgroup<60" | awk '{print $2}'`
+    totalCount60=`echo "scale=4; $totalCount60 + $Count60" | bc`
+    Count70=`cat $CASTESTQ2OUT | grep count | grep "devgroup<70" | awk '{print $2}'`
+    totalCount70=`echo "scale=4; $totalCount70 + $Count70" | bc`
+    Count80=`cat $CASTESTQ2OUT | grep count | grep "devgroup<80" | awk '{print $2}'`
+    totalCount80=`echo "scale=4; $totalCount80 + $Count80" | bc`
+    Count90=`cat $CASTESTQ2OUT | grep count | grep "devgroup<90" | awk '{print $2}'`
+    totalCount90=`echo "scale=4; $totalCount90 + $Count90" | bc`
+    Count100=`cat $CASTESTQ2OUT | grep count | grep "test allow filtering;" | awk '{print $2}'`
+    totalCount100=`echo "scale=4; $totalCount100 + $Count100" | bc`
+
+    Avg10=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<10" | awk '{print $2}'`
+    totalAvg10=`echo "scale=4; $totalAvg10 + $Avg10" | bc`
+    Avg20=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<20" | awk '{print $2}'`
+    totalAvg20=`echo "scale=4; $totalAvg20 + $Avg20" | bc`
+    Avg30=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<30" | awk '{print $2}'`
+    totalAvg30=`echo "scale=4; $totalAvg30 + $Avg30" | bc`
+    Avg40=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<40" | awk '{print $2}'`
+    totalAvg40=`echo "scale=4; $totalAvg40 + $Avg40" | bc`
+    Avg50=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<50" | awk '{print $2}'`
+    totalAvg50=`echo "scale=4; $totalAvg50 + $Avg50" | bc`
+    Avg60=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<60" | awk '{print $2}'`
+    totalAvg60=`echo "scale=4; $totalAvg60 + $Avg60" | bc`
+    Avg70=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<70" | awk '{print $2}'`
+    totalAvg70=`echo "scale=4; $totalAvg70 + $Avg70" | bc`
+    Avg80=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<80" | awk '{print $2}'`
+    totalAvg80=`echo "scale=4; $totalAvg80 + $Avg80" | bc`
+    Avg90=`cat $CASTESTQ2OUT | grep avg | grep "devgroup<90" | awk '{print $2}'`
+    totalAvg90=`echo "scale=4; $totalAvg90 + $Avg90" | bc`
+    Avg100=`cat $CASTESTQ2OUT | grep avg | grep "test allow filtering;" | awk '{print $2}'`
+    totalAvg100=`echo "scale=4; $totalAvg100 + $Avg100" | bc`
+
+    Sum10=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<10" | awk '{print $2}'`
+    totalSum10=`echo "scale=4; $totalSum10 + $Sum10" | bc`
+    Sum20=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<20" | awk '{print $2}'`
+    totalSum20=`echo "scale=4; $totalSum20 + $Sum20" | bc`
+    Sum30=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<30" | awk '{print $2}'`
+    totalSum30=`echo "scale=4; $totalSum30 + $Sum30" | bc`
+    Sum40=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<40" | awk '{print $2}'`
+    totalSum40=`echo "scale=4; $totalSum40 + $Sum40" | bc`
+    Sum50=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<50" | awk '{print $2}'`
+    totalSum50=`echo "scale=4; $totalSum50 + $Sum50" | bc`
+    Sum60=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<60" | awk '{print $2}'`
+    totalSum60=`echo "scale=4; $totalSum60 + $Sum60" | bc`
+    Sum70=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<70" | awk '{print $2}'`
+    totalSum70=`echo "scale=4; $totalSum70 + $Sum70" | bc`
+    Sum80=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<80" | awk '{print $2}'`
+    totalSum80=`echo "scale=4; $totalSum80 + $Sum80" | bc`
+    Sum90=`cat $CASTESTQ2OUT | grep sum | grep "devgroup<90" | awk '{print $2}'`
+    totalSum90=`echo "scale=4; $totalSum90 + $Sum90" | bc`
+    Sum100=`cat $CASTESTQ2OUT | grep sum | grep "test allow filtering;" | awk '{print $2}'`
+    totalSum100=`echo "scale=4; $totalSum100 + $Sum100" | bc`
+
+    Max10=`cat $CASTESTQ2OUT | grep max | grep "devgroup<10" | awk '{print $2}'`
+    totalMax10=`echo "scale=4; $totalMax10 + $Max10" | bc`
+    Max20=`cat $CASTESTQ2OUT | grep max | grep "devgroup<20" | awk '{print $2}'`
+    totalMax20=`echo "scale=4; $totalMax20 + $Max20" | bc`
+    Max30=`cat $CASTESTQ2OUT | grep max | grep "devgroup<30" | awk '{print $2}'`
+    totalMax30=`echo "scale=4; $totalMax30 + $Max30" | bc`
+    Max40=`cat $CASTESTQ2OUT | grep max | grep "devgroup<40" | awk '{print $2}'`
+    totalMax40=`echo "scale=4; $totalMax40 + $Max40" | bc`
+    Max50=`cat $CASTESTQ2OUT | grep max | grep "devgroup<50" | awk '{print $2}'`
+    totalMax50=`echo "scale=4; $totalMax50 + $Max50" | bc`
+    Max60=`cat $CASTESTQ2OUT | grep max | grep "devgroup<60" | awk '{print $2}'`
+    totalMax60=`echo "scale=4; $totalMax60 + $Max60" | bc`
+    Max70=`cat $CASTESTQ2OUT | grep max | grep "devgroup<70" | awk '{print $2}'`
+    totalMax70=`echo "scale=4; $totalMax70 + $Max70" | bc`
+    Max80=`cat $CASTESTQ2OUT | grep max | grep "devgroup<80" | awk '{print $2}'`
+    totalMax80=`echo "scale=4; $totalMax80 + $Max80" | bc`
+    Max90=`cat $CASTESTQ2OUT | grep max | grep "devgroup<90" | awk '{print $2}'`
+    totalMax90=`echo "scale=4; $totalMax90 + $Max90" | bc`
+    Max100=`cat $CASTESTQ2OUT | grep max | grep "test allow filtering;" | awk '{print $2}'`
+    totalMax100=`echo "scale=4; $totalMax100 + $Max100" | bc`
+
+    Min10=`cat $CASTESTQ2OUT | grep min | grep "devgroup<10" | awk '{print $2}'`
+    totalMin10=`echo "scale=4; $totalMin10 + $Min10" | bc`
+    Min20=`cat $CASTESTQ2OUT | grep min | grep "devgroup<20" | awk '{print $2}'`
+    totalMin20=`echo "scale=4; $totalMin20 + $Min20" | bc`
+    Min30=`cat $CASTESTQ2OUT | grep min | grep "devgroup<30" | awk '{print $2}'`
+    totalMin30=`echo "scale=4; $totalMin30 + $Min30" | bc`
+    Min40=`cat $CASTESTQ2OUT | grep min | grep "devgroup<40" | awk '{print $2}'`
+    totalMin40=`echo "scale=4; $totalMin40 + $Min40" | bc`
+    Min50=`cat $CASTESTQ2OUT | grep min | grep "devgroup<50" | awk '{print $2}'`
+    totalMin50=`echo "scale=4; $totalMin50 + $Min50" | bc`
+    Min60=`cat $CASTESTQ2OUT | grep min | grep "devgroup<60" | awk '{print $2}'`
+    totalMin60=`echo "scale=4; $totalMin60 + $Min60" | bc`
+    Min70=`cat $CASTESTQ2OUT | grep min | grep "devgroup<70" | awk '{print $2}'`
+    totalMin70=`echo "scale=4; $totalMin70 + $Min70" | bc`
+    Min80=`cat $CASTESTQ2OUT | grep min | grep "devgroup<80" | awk '{print $2}'`
+    totalMin80=`echo "scale=4; $totalMin80 + $Min80" | bc`
+    Min90=`cat $CASTESTQ2OUT | grep min | grep "devgroup<90" | awk '{print $2}'`
+    totalMin90=`echo "scale=4; $totalMin90 + $Min90" | bc`
+    Min100=`cat $CASTESTQ2OUT | grep min | grep "test allow filtering;" | awk '{print $2}'`
+    totalMin100=`echo "scale=4; $totalMin100 + $Min100" | bc`
+
+  done
+  avgCount10=`echo "scale=4; x = $totalCount10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount20=`echo "scale=4; x = $totalCount20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount30=`echo "scale=4; x = $totalCount30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount40=`echo "scale=4; x = $totalCount40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount50=`echo "scale=4; x = $totalCount50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount60=`echo "scale=4; x = $totalCount60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount70=`echo "scale=4; x = $totalCount70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount80=`echo "scale=4; x = $totalCount80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount90=`echo "scale=4; x = $totalCount90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount100=`echo "scale=4; x = $totalCount100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgAvg10=`echo "scale=4; x = $totalAvg10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg20=`echo "scale=4; x = $totalAvg20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg30=`echo "scale=4; x = $totalAvg30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg40=`echo "scale=4; x = $totalAvg40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg50=`echo "scale=4; x = $totalAvg50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg60=`echo "scale=4; x = $totalAvg60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg70=`echo "scale=4; x = $totalAvg70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg80=`echo "scale=4; x = $totalAvg80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg90=`echo "scale=4; x = $totalAvg90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg100=`echo "scale=4; x = $totalAvg100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSum10=`echo "scale=4; x = $totalSum10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum20=`echo "scale=4; x = $totalSum20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum30=`echo "scale=4; x = $totalSum30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum40=`echo "scale=4; x = $totalSum40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum50=`echo "scale=4; x = $totalSum50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum60=`echo "scale=4; x = $totalSum60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum70=`echo "scale=4; x = $totalSum70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum80=`echo "scale=4; x = $totalSum80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum90=`echo "scale=4; x = $totalSum90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum100=`echo "scale=4; x = $totalSum100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMax10=`echo "scale=4; x = $totalMax10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax20=`echo "scale=4; x = $totalMax20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax30=`echo "scale=4; x = $totalMax30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax40=`echo "scale=4; x = $totalMax40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax50=`echo "scale=4; x = $totalMax50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax60=`echo "scale=4; x = $totalMax60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax70=`echo "scale=4; x = $totalMax70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax80=`echo "scale=4; x = $totalMax80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax90=`echo "scale=4; x = $totalMax90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax100=`echo "scale=4; x = $totalMax100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMin10=`echo "scale=4; x = $totalMin10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin20=`echo "scale=4; x = $totalMin20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin30=`echo "scale=4; x = $totalMin30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin40=`echo "scale=4; x = $totalMin40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin50=`echo "scale=4; x = $totalMin50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin60=`echo "scale=4; x = $totalMin60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin70=`echo "scale=4; x = $totalMin70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin80=`echo "scale=4; x = $totalMin80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin90=`echo "scale=4; x = $totalMin90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin100=`echo "scale=4; x = $totalMin100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Count, $avgCount10, $avgCount20, $avgCount30, $avgCount40, $avgCount50, $avgCount60, $avgCount70, $avgCount80, $avgCount90, $avgCount100"
+  echo "Avg, $avgAvg10, $avgAvg20, $avgAvg30, $avgAvg40, $avgAvg50, $avgAvg60, $avgAvg70, $avgAvg80, $avgAvg90, $avgAvg100"
+  echo "Sum, $avgSum10, $avgSum20, $avgSum30, $avgSum40, $avgSum50, $avgSum60, $avgSum70, $avgSum80, $avgSum90, $avgSum100"
+  echo "Max, $avgMax10, $avgMax20, $avgMax30, $avgMax40, $avgMax50, $avgMax60, $avgMax70, $avgMax80, $avgMax90, $avgMax100"
+  echo "Min, $avgMin10, $avgMin20, $avgMin30, $avgMin40, $avgMin50, $avgMin60, $avgMin70, $avgMin80, $avgMin90, $avgMin100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+CASTEST_DIR=$WORK_DIR/tests/comparisonTest/cassandra
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/cassandraTestQ3Loop.sh b/tests/perftest-scripts/cassandraTestQ3Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ce81fcb818bd90bd99ab9b31a58db611445efffd
--- /dev/null
+++ b/tests/perftest-scripts/cassandraTestQ3Loop.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+CASTESTQ3OUT=cassandraTestQ3.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q3.txt"
+    java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q3.txt \
+      > $CASTESTQ3OUT
+    G10=`grep "devgroup<10" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup<20" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup<30" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup<40" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup<50" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup<60" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup<70" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup<80" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup<90" $CASTESTQ3OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep "test group by " $CASTESTQ3OUT| awk '{print $2}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Cassandra, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+CASTEST_DIR=$WORK_DIR/tests/comparisonTest/cassandra
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/cassandraTestQ4Loop.sh b/tests/perftest-scripts/cassandraTestQ4Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..85e45787b89a7700f0b6de3eb87ee8143f05ca92
--- /dev/null
+++ b/tests/perftest-scripts/cassandraTestQ4Loop.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+CASTESTQ4OUT=cassandraTestQ4.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    if $regeneratedata ; then
+      printTo "java -jar $CASTEST_DIR/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+        -datadir $DATA_DIR \
+        -numofFiles 100 \
+        -rowsperrequest 100 \
+        -writeclients 4 \
+        -conf $CASTEST_DIR/application.conf \
+        -timetest"
+      java -jar $CASTEST_DIR/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+        -datadir $DATA_DIR \
+        -numofFiles 100 \
+        -rowsperrequest 100 \
+        -writeclients 4 \
+        -conf $CASTEST_DIR/application.conf \
+        -timetest
+    fi 
+
+    printTo "loop i:$i, java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q4.txt"
+    java -jar \
+      $CASTEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -conf $CASTEST_DIR/application.conf \
+      -sql $CASTEST_DIR/q4.txt \
+      > $CASTESTQ4OUT
+    G10=`grep "devgroup<10" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup<20" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup<30" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup<40" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup<50" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup<60" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup<70" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup<80" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup<90" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep "test group by minute;" $CASTESTQ4OUT| awk '{print $2}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Cassandra, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+regeneratedata=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -r)
+      regeneratedata=true
+      ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+CASTEST_DIR=$WORK_DIR/tests/comparisonTest/cassandra
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/cassandraTestWriteLoop.sh b/tests/perftest-scripts/cassandraTestWriteLoop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d20b6204124696b994817c141f1cfc310a4f062d
--- /dev/null
+++ b/tests/perftest-scripts/cassandraTestWriteLoop.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=1
+NUM_OF_FILES=100
+
+rowsPerRequest=(1 10 50 100 500 1000 2000)
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+function runTest {
+  declare -A avgRPR
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      avgRPR[$r,$c]=0
+    done
+  done
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      totalRPR=0
+      OUT_FILE=cassandraWrite-rows${rowsPerRequest[$r]}-clients$c.out
+      for i in `seq 1 $NUM_LOOP`; do
+        printTo "loop i:$i, java -jar $CAS_TEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+            -datadir $DATA_DIR \
+            -numofFiles $NUM_OF_FILES \
+            -rowsperrequest ${rowsPerRequest[$r]} \
+            -writeclients $c \
+            -conf $CAS_TEST_DIR/application.conf"
+        java -jar $CAS_TEST_DIR/cassandratest/target/cassandratest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+            -datadir $DATA_DIR \
+            -numofFiles $NUM_OF_FILES \
+            -rowsperrequest ${rowsPerRequest[$r]} \
+            -writeclients $c \
+            -conf $CAS_TEST_DIR/application.conf \
+            2>&1 | tee $OUT_FILE
+        RPR=`cat $OUT_FILE | grep "insertation speed:" | awk '{print $(NF-1)}'`
+        totalRPR=`echo "scale=4; $totalRPR + $RPR" | bc`
+        printTo "r:$r rows:${rowsPerRequest[$r]}, clients:$c, i:$i RPR:$RPR"
+      done
+      avgRPR[$r,$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      printTo "r:$r c:$c avgRPR:${avgRPR[$r,$c]}"
+    done
+  done
+
+  printf "R/R, "
+  for c in `seq 1 $clients`; do
+    if [ "$c" == "1" ]; then
+      printf "$c client, "
+    else
+      printf "$c clients, "
+    fi
+  done
+  printf "\n"
+
+  for r in ${!rowsPerRequest[@]}; do
+    printf "${rowsPerRequest[$r]}, "
+    for c in `seq 1 $clients`; do
+      printf "${avgRPR[$r,$c]}, "
+    done
+    printf "\n"
+  done
+}
+
+################ Main ################
+
+verbose=false
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+printTo "Cassandra Test begin.."
+
+WORK_DIR=/mnt/root/TDengine
+CAS_TEST_DIR=$WORK_DIR/tests/comparisonTest/cassandra
+
+runTest
+
+printTo "Cassandra Test done!"
diff --git a/tests/perftest-scripts/coverage_test.sh b/tests/perftest-scripts/coverage_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5085ec89d00def1a2147f24ccbeb488406541775
--- /dev/null
+++ b/tests/perftest-scripts/coverage_test.sh
@@ -0,0 +1,217 @@
+#!/bin/bash
+
+today=`date +"%Y%m%d"`
+TDENGINE_DIR=/home/shuduo/work/taosdata/TDengine.cover
+TDENGINE_COVERAGE_REPORT=$TDENGINE_DIR/tests/coverage-report-$today.log
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+function buildTDengine {
+	echo "check if TDengine need build"
+	cd $TDENGINE_DIR
+  git remote prune origin > /dev/null
+	git remote update > /dev/null
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+
+	# reset counter
+	lcov -d . --zerocounters
+
+	cd $TDENGINE_DIR/debug
+
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "repo up-to-date"
+	else
+		echo "repo need to pull"
+    git reset --hard
+		git pull
+  fi
+
+  [ -d $TDENGINE_DIR/debug ] || mkdir $TDENGINE_DIR/debug
+  cd $TDENGINE_DIR/debug
+  [ -f $TDENGINE_DIR/debug/build/bin/taosd ] || need_rebuild=true
+
+  if $need_rebuild ; then
+    echo "rebuild.."
+		LOCAL_COMMIT=`git rev-parse --short @`
+
+		rm -rf *
+		cmake -DCOVER=true -DRANDOM_FILE_FAIL=true .. > /dev/null
+		make > /dev/null
+	fi
+
+	make install > /dev/null
+}
+
+function runGeneralCaseOneByOne {
+	while read -r line; do
+		if [[ $line =~ ^./test.sh* ]]; then
+			case=`echo $line | grep sim$ |awk '{print $NF}'`
+
+			if [ -n "$case" ]; then
+				./test.sh -f $case > /dev/null 2>&1 && \
+				echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_COVERAGE_REPORT || \
+				echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_COVERAGE_REPORT
+			fi
+		fi
+	done < $1
+}
+
+function runTest {
+	echo "run Test"
+
+	cd $TDENGINE_DIR/tests/script
+
+	[ -d ../../sim ] && rm -rf ../../sim
+	[ -f $TDENGINE_COVERAGE_REPORT ] && rm $TDENGINE_COVERAGE_REPORT
+
+	runGeneralCaseOneByOne jenkins/basic.txt
+
+	sed -i "1i\SIM cases test result" $TDENGINE_COVERAGE_REPORT
+
+	totalSuccess=`grep 'success' $TDENGINE_COVERAGE_REPORT | wc -l`
+	if [ "$totalSuccess" -gt "0" ]; then
+		sed -i -e "2i\ ### Total $totalSuccess SIM test case(s) succeed! ###"  $TDENGINE_COVERAGE_REPORT
+	fi
+
+	totalFailed=`grep 'failed\|fault' $TDENGINE_COVERAGE_REPORT | wc -l`
+	if [ "$totalFailed" -ne "0" ]; then
+		sed -i '3i\### Total $totalFailed SIM test case(s) failed! ###'  $TDENGINE_COVERAGE_REPORT
+	else
+		sed -i '3i\\n'  $TDENGINE_COVERAGE_REPORT
+	fi
+
+	cd $TDENGINE_DIR/tests
+	rm -rf ../sim
+	./test-all.sh full python | tee -a $TDENGINE_COVERAGE_REPORT
+	
+	sed -i "4i\Python cases test result" $TDENGINE_COVERAGE_REPORT
+	totalPySuccess=`grep 'python case(s) succeed!' $TDENGINE_COVERAGE_REPORT | awk '{print $4}'`
+	if [ "$totalPySuccess" -gt "0" ]; then
+                sed -i -e "5i\ ### Total $totalPySuccess Python test case(s) succeed! ###"  $TDENGINE_COVERAGE_REPORT
+        fi
+
+	totalPyFailed=`grep 'python case(s) failed!' $TDENGINE_COVERAGE_REPORT | awk '{print $4}'`
+        if [ -z $totalPyFailed ]; then
+		sed -i '6i\\n'  $TDENGINE_COVERAGE_REPORT
+        else
+		sed -i '6i\### Total $totalPyFailed Python test case(s) failed! ###'  $TDENGINE_COVERAGE_REPORT
+        fi
+
+	# Test Connector
+	stopTaosd
+	$TDENGINE_DIR/debug/build/bin/taosd -c $TDENGINE_DIR/debug/test/cfg > /dev/null &
+	sleep 10
+
+	cd $TDENGINE_DIR/src/connector/jdbc
+	mvn clean package > /dev/null 2>&1
+	mvn test > /dev/null 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
+
+	# Test C Demo
+	stopTaosd
+	$TDENGINE_DIR/debug/build/bin/taosd -c $TDENGINE_DIR/debug/test/cfg > /dev/null &
+	sleep 10
+	yes | $TDENGINE_DIR/debug/build/bin/demo 127.0.0.1 > /dev/null 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
+
+	# Test waltest
+	dataDir=`grep dataDir $TDENGINE_DIR/debug/test/cfg/taos.cfg|awk '{print $2}'`
+	walDir=`find $dataDir -name "wal"|head -n1`
+	echo "dataDir: $dataDir" | tee -a $TDENGINE_COVERAGE_REPORT
+	echo "walDir: $walDir" | tee -a $TDENGINE_COVERAGE_REPORT
+	if [ -n "$walDir" ]; then
+		yes | $TDENGINE_DIR/debug/build/bin/waltest -p $walDir > dev/null 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
+	fi
+
+  # run Unit Test
+  echo "Run Unit Test: utilTest, queryTest and cliTest"
+  $TDENGINE_DIR/debug/build/bin/utilTest > /dev/null 2>&1 && echo "utilTest pass!" || echo "utilTest failed!"
+  $TDENGINE_DIR/debug/build/bin/queryTest > /dev/null 2>&1 && echo "queryTest pass!" || echo "queryTest failed!"
+  $TDENGINE_DIR/debug/build/bin/cliTest > /dev/null 2>&1 && echo "cliTest pass!" || echo "cliTest failed!"
+
+	stopTaosd
+}
+
+function lcovFunc {
+	echo "collect data by lcov"
+	cd $TDENGINE_DIR
+
+	# collect data
+	lcov -d . --capture --rc lcov_branch_coverage=1 --rc genhtml_branch_coverage=1 --no-external -b $TDENGINE_DIR -o coverage.info
+
+	# remove exclude paths
+	lcov --remove coverage.info \
+    '*/tests/*' '*/test/*' '*/deps/*' '*/plugins/*' '*/taosdef.h' \
+    --rc lcov_branch_coverage=1 -o coverage.info
+
+	# generate result
+	lcov -l --rc lcov_branch_coverage=1 coverage.info | tee -a $TDENGINE_COVERAGE_REPORT
+
+	# push result to coveralls.io
+	coveralls-lcov coverage.info | tee -a $TDENGINE_COVERAGE_REPORT
+}
+
+function sendReport {
+	echo "send report"
+	receiver="sdsang@taosdata.com, sangshuduo@gmail.com, pxiao@taosdata.com"
+	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
+
+	cd $TDENGINE_DIR
+
+	sed -i 's/\x1b\[[0-9;]*m//g' $TDENGINE_COVERAGE_REPORT
+	BODY_CONTENT=`cat $TDENGINE_COVERAGE_REPORT`
+	echo -e "to: ${receiver}\nsubject: Coverage test report ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
+	(cat - && uuencode $TDENGINE_COVERAGE_REPORT coverage-report-$today.log) | \
+	ssmtp "${receiver}" && echo "Report Sent!"
+}
+
+function stopTaosd {
+	echo "Stop taosd"
+        systemctl stop taosd
+  	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+    pkill -TERM -x taosd
+    sleep 1
+  	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+}
+
+function runTestRandomFail {
+  exec_random_fail_sh=$1
+  default_exec_sh=$TDENGINE_DIR/tests/script/sh/exec.sh
+	[ -f $exec_random_fail_sh ] && cp $exec_random_fail_sh $default_exec_sh || exit 1
+
+  dnodes_random_fail_py=$TDENGINE_DIR/tests/pytest/util/dnodes-no-random-fail.py
+  default_dnodes_py=$TDENGINE_DIR/tests/pytest/util/dnodes.py
+	[ -f $dnodes_random_fail_py ] && cp $dnodes_random_fail_py $default_dnodes_py || exit 1
+
+  runTest NoRandomFail
+}
+
+WORK_DIR=/home/shuduo/work/taosdata
+
+date >> $WORK_DIR/cron.log
+echo "Run Coverage Test" | tee -a $WORK_DIR/cron.log
+
+rm /tmp/core-*
+
+stopTaosd
+buildTDengine
+
+runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-random-fail.sh 
+runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-default.sh 
+runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-no-random-fail.sh 
+
+lcovFunc
+sendReport
+stopTaosd
+
+date >> $WORK_DIR/cron.log
+echo "End of Coverage Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/full_test.sh b/tests/perftest-scripts/full_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1738f69f35207161121c5cbd00816ae37a46745e
--- /dev/null
+++ b/tests/perftest-scripts/full_test.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+today=`date +"%Y%m%d"`
+TDENGINE_DIR=/home/shuduo/work/taosdata/TDengine.orig
+TDENGINE_FULLTEST_REPORT=$TDENGINE_DIR/tests/full-report-$today.log
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+function buildTDengine {
+  echo "check if TDengine need build"
+
+  need_rebuild=false
+
+  if [ ! -d $TDENGINE_DIR ]; then
+    echo "No TDengine source code found!"
+    git clone https://github.com/taosdata/TDengine $TDENGINE_DIR
+    need_rebuild=true
+  fi
+
+  cd $TDENGINE_DIR
+  git remote prune origin > /dev/null
+  git remote update > /dev/null
+  REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+  LOCAL_COMMIT=`git rev-parse --short @`
+  echo " LOCAL: $LOCAL_COMMIT"
+  echo "REMOTE: $REMOTE_COMMIT"
+
+  if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+    echo "repo up-to-date"
+  else
+    echo "repo need to pull"
+    git pull
+    need_rebuild=true
+  fi
+
+  [ -d $TDENGINE_DIR/debug ] || mkdir $TDENGINE_DIR/debug
+  cd $TDENGINE_DIR/debug
+  [ -f $TDENGINE_DIR/debug/build/bin/taosd ] || need_rebuild=true
+
+  if $need_rebuild ; then
+    echo "rebuild.."
+
+    LOCAL_COMMIT=`git rev-parse --short @`
+    rm -rf *
+    cmake .. > /dev/null
+    make > /dev/null
+  fi
+
+  make install > /dev/null
+}
+
+function runGeneralCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^./test.sh* ]]; then
+      general_case=`echo $line | grep -w general`
+
+      if [ -n "$general_case" ]; then
+        case=`echo $line | awk '{print $NF}'`
+
+        start_time=`date +%s`
+        ./test.sh -f $case > /dev/null 2>&1 && ret=0 || ret = 1
+        end_time=`date +%s`
+
+        if [[ ret -eq 0 ]]; then
+          echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_FULLTEST_REPORT
+        else
+          casename=`echo $case|sed 's/\//\-/g'`
+          find $TDENGINE_DIR/sim -name "*log" -exec tar czf $TDENGINE_DIR/fulltest-$today-$casename.log.tar.gz {} +
+          echo -e "${RED}$case failed and log saved${NC}" | tee -a $TDENGINE_FULLTEST_REPORT
+        fi
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_FULLTEST_REPORT
+      fi
+    fi
+  done < $1
+}
+
+function runPyCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^python.* ]]; then
+      if [[ $line != *sleep* ]]; then
+        case=`echo $line|awk '{print $NF}'`
+        start_time=`date +%s`
+        $line > /dev/null 2>&1 && ret=0 || ret=1
+        end_time=`date +%s`
+
+        if [[ ret -eq 0 ]]; then
+          echo -e "${GREEN}$case success${NC}" | tee -a pytest-out.log
+        else
+          casename=`echo $case|sed 's/\//\-/g'`
+          find $TDENGINE_DIR/sim -name "*log" -exec tar czf $TDENGINE_DIR/fulltest-$today-$casename.log.tar.gz {} +
+          echo -e "${RED}$case failed and log saved${NC}" | tee -a pytest-out.log
+        fi
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+      else
+        $line > /dev/null 2>&1
+      fi
+    fi
+  done < $1
+}
+
+function runTest {
+  echo "Run Test"
+  cd $TDENGINE_DIR/tests/script
+
+  [ -d $TDENGINE_DIR/sim ] && rm -rf $TDENGINE_DIR/sim
+  [ -f $TDENGINE_FULLTEST_REPORT ] && rm $TDENGINE_FULLTEST_REPORT
+
+  runGeneralCaseOneByOne jenkins/basic.txt
+
+  totalSuccess=`grep 'success' $TDENGINE_FULLTEST_REPORT | wc -l`
+
+  if [ "$totalSuccess" -gt "0" ]; then
+    echo -e "\n${GREEN} ### Total $totalSuccess SIM case(s) succeed! ### ${NC}" \
+      | tee -a $TDENGINE_FULLTEST_REPORT
+  fi
+
+  totalFailed=`grep 'failed\|fault' $TDENGINE_FULLTEST_REPORT | wc -l`
+  if [ "$totalFailed" -ne "0" ]; then
+    echo -e "${RED} ### Total $totalFailed SIM case(s) failed! ### ${NC}\n" \
+    | tee -a $TDENGINE_FULLTEST_REPORT
+  fi
+
+  cd $TDENGINE_DIR/tests/pytest
+  [ -d $TDENGINE_DIR/sim ] && rm -rf $TDENGINE_DIR/sim
+  [ -f pytest-out.log ] && rm -f pytest-out.log
+  runPyCaseOneByOne fulltest.sh
+
+  totalPySuccess=`grep 'success' pytest-out.log | wc -l`
+  totalPyFailed=`grep 'failed\|fault' pytest-out.log | wc -l`
+
+  cat pytest-out.log >> $TDENGINE_FULLTEST_REPORT
+  if [ "$totalPySuccess" -gt "0" ]; then
+    echo -e "\n${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}" \
+      | tee -a $TDENGINE_FULLTEST_REPORT
+  fi
+
+  if [ "$totalPyFailed" -ne "0" ]; then
+    echo -e "\n${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" \
+      | tee -a $TDENGINE_FULLTEST_REPORT
+  fi
+}
+
+function sendReport {
+  echo "Send Report"
+  receiver="sdsang@taosdata.com, sangshuduo@gmail.com, pxiao@taosdata.com"
+  mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
+
+  cd $TDENGINE_DIR/tests
+
+  sed -i 's/\x1b\[[0-9;]*m//g' $TDENGINE_FULLTEST_REPORT
+  BODY_CONTENT=`cat $TDENGINE_FULLTEST_REPORT`
+
+  cd $TDENGINE_DIR
+  tar czf fulltest-$today.tar.gz fulltest-$today-*.log.tar.gz
+
+  echo -e "to: ${receiver}\nsubject: Full test report ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
+  (cat - && uuencode $TDENGINE_FULLTEST_REPORT fulltest-report-$today.log) | \
+  (cat - && uuencode $TDENGINE_DIR/fulltest-$today.tar.gz fulltest-$today.tar.gz) | \
+  ssmtp "${receiver}" && echo "Report Sent!"
+}
+
+function stopTaosd {
+  echo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+}
+
+WORK_DIR=/home/shuduo/work/taosdata
+
+date >> $WORK_DIR/cron.log
+echo "Run Full Test" | tee -a $WORK_DIR/cron.log
+
+stopTaosd
+buildTDengine
+runTest
+sendReport
+stopTaosd
+
+date >> $WORK_DIR/cron.log
+echo "End of Full Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/influxdbTestQ1Loop.sh b/tests/perftest-scripts/influxdbTestQ1Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..86735899c804485dff7a7f69a4b2610ef4e7c942
--- /dev/null
+++ b/tests/perftest-scripts/influxdbTestQ1Loop.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+INFLUXDBTESTQ1OUT=influxdbTestQ1.out
+
+function runTest {
+  totalG0=0
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $INFLUXDBTEST_DIR/infludbTest \
+      -sql $INFLUXDBTEST_DIR/q1.txt"
+    $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q1.txt 2>&1 \
+      | tee $INFLUXDBTESTQ1OUT
+    G0=`grep "devgroup='0'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG0=`echo "scale=4; $totalG0 + $G0" | bc`
+    G10=`grep "devgroup='10'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup='20'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup='30'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup='40'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup='50'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup='60'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup='70'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup='80'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup='90'" $INFLUXDBTESTQ1OUT| awk '{print $5}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+  done
+  avgG0=`echo "scale=4; x = $totalG0 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, G-0, G-10, G-20, G-30, G-40, G-50, G-60, G-70, G-80, G-90"
+  echo "InfluxDB, $avgG0, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90"
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+INFLUXDBTEST_DIR=$WORK_DIR/tests/comparisonTest/influxdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/influxdbTestQ2Loop.sh b/tests/perftest-scripts/influxdbTestQ2Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..394b47b125e13c0f5672ec66afec8aafd69fa5f7
--- /dev/null
+++ b/tests/perftest-scripts/influxdbTestQ2Loop.sh
@@ -0,0 +1,318 @@
+#!/bin/bash 
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+INFLUXDBTESTQ2OUT=influxdbTestQ2.out
+
+function runTest {
+  totalCount10=0
+  totalCount20=0
+  totalCount30=0
+  totalCount40=0
+  totalCount50=0
+  totalCount60=0
+  totalCount70=0
+  totalCount80=0
+  totalCount90=0
+  totalCount100=0
+
+  totalMean10=0
+  totalMean20=0
+  totalMean30=0
+  totalMean40=0
+  totalMean50=0
+  totalMean60=0
+  totalMean70=0
+  totalMean80=0
+  totalMean90=0
+  totalMean100=0
+
+  totalSum10=0
+  totalSum20=0
+  totalSum30=0
+  totalSum40=0
+  totalSum50=0
+  totalSum60=0
+  totalSum70=0
+  totalSum80=0
+  totalSum90=0
+  totalSum100=0
+
+  totalMax10=0
+  totalMax20=0
+  totalMax30=0
+  totalMax40=0
+  totalMax50=0
+  totalMax60=0
+  totalMax70=0
+  totalMax80=0
+  totalMax90=0
+  totalMax100=0
+
+  totalMin10=0
+  totalMin20=0
+  totalMin30=0
+  totalMin40=0
+  totalMin50=0
+  totalMin60=0
+  totalMin70=0
+  totalMin80=0
+  totalMin90=0
+  totalMin100=0
+
+  totalSpread10=0
+  totalSpread20=0
+  totalSpread30=0
+  totalSpread40=0
+  totalSpread50=0
+  totalSpread60=0
+  totalSpread70=0
+  totalSpread80=0
+  totalSpread90=0
+  totalSpread100=0
+
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q2.txt"
+    $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q2.txt 2>&1 \
+      | tee $INFLUXDBTESTQ2OUT
+
+    Count10=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalCount10=`echo "scale=4; $totalCount10 + $Count10" | bc`
+    Count20=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalCount20=`echo "scale=4; $totalCount20 + $Count20" | bc`
+    Count30=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalCount30=`echo "scale=4; $totalCount30 + $Count30" | bc`
+    Count40=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalCount40=`echo "scale=4; $totalCount40 + $Count40" | bc`
+    Count50=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalCount50=`echo "scale=4; $totalCount50 + $Count50" | bc`
+    Count60=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalCount60=`echo "scale=4; $totalCount60 + $Count60" | bc`
+    Count70=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalCount70=`echo "scale=4; $totalCount70 + $Count70" | bc`
+    Count80=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalCount80=`echo "scale=4; $totalCount80 + $Count80" | bc`
+    Count90=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalCount90=`echo "scale=4; $totalCount90 + $Count90" | bc`
+    Count100=`cat $INFLUXDBTESTQ2OUT | grep count | grep "devices;" | awk '{print $5}'`
+    totalCount100=`echo "scale=4; $totalCount100 + $Count100" | bc`
+
+    Mean10=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalMean10=`echo "scale=4; $totalMean10 + $Mean10" | bc`
+    Mean20=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalMean20=`echo "scale=4; $totalMean20 + $Mean20" | bc`
+    Mean30=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalMean30=`echo "scale=4; $totalMean30 + $Mean30" | bc`
+    Mean40=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalMean40=`echo "scale=4; $totalMean40 + $Mean40" | bc`
+    Mean50=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalMean50=`echo "scale=4; $totalMean50 + $Mean50" | bc`
+    Mean60=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalMean60=`echo "scale=4; $totalMean60 + $Mean60" | bc`
+    Mean70=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalMean70=`echo "scale=4; $totalMean70 + $Mean70" | bc`
+    Mean80=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalMean80=`echo "scale=4; $totalMean80 + $Mean80" | bc`
+    Mean90=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalMean90=`echo "scale=4; $totalMean90 + $Mean90" | bc`
+    Mean100=`cat $INFLUXDBTESTQ2OUT | grep mean | grep "devices;" | awk '{print $5}'`
+    totalMean100=`echo "scale=4; $totalMean100 + $Mean100" | bc`
+
+    Sum10=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalSum10=`echo "scale=4; $totalSum10 + $Sum10" | bc`
+    Sum20=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalSum20=`echo "scale=4; $totalSum20 + $Sum20" | bc`
+    Sum30=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalSum30=`echo "scale=4; $totalSum30 + $Sum30" | bc`
+    Sum40=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalSum40=`echo "scale=4; $totalSum40 + $Sum40" | bc`
+    Sum50=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalSum50=`echo "scale=4; $totalSum50 + $Sum50" | bc`
+    Sum60=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalSum60=`echo "scale=4; $totalSum60 + $Sum60" | bc`
+    Sum70=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalSum70=`echo "scale=4; $totalSum70 + $Sum70" | bc`
+    Sum80=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalSum80=`echo "scale=4; $totalSum80 + $Sum80" | bc`
+    Sum90=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalSum90=`echo "scale=4; $totalSum90 + $Sum90" | bc`
+    Sum100=`cat $INFLUXDBTESTQ2OUT | grep sum | grep "devices;" | awk '{print $5}'`
+    totalSum100=`echo "scale=4; $totalSum100 + $Sum100" | bc`
+
+    Max10=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalMax10=`echo "scale=4; $totalMax10 + $Max10" | bc`
+    Max20=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalMax20=`echo "scale=4; $totalMax20 + $Max20" | bc`
+    Max30=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalMax30=`echo "scale=4; $totalMax30 + $Max30" | bc`
+    Max40=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalMax40=`echo "scale=4; $totalMax40 + $Max40" | bc`
+    Max50=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalMax50=`echo "scale=4; $totalMax50 + $Max50" | bc`
+    Max60=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalMax60=`echo "scale=4; $totalMax60 + $Max60" | bc`
+    Max70=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalMax70=`echo "scale=4; $totalMax70 + $Max70" | bc`
+    Max80=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalMax80=`echo "scale=4; $totalMax80 + $Max80" | bc`
+    Max90=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalMax90=`echo "scale=4; $totalMax90 + $Max90" | bc`
+    Max100=`cat $INFLUXDBTESTQ2OUT | grep max | grep "devices;" | awk '{print $5}'`
+    totalMax100=`echo "scale=4; $totalMax100 + $Max100" | bc`
+
+    Min10=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalMin10=`echo "scale=4; $totalMin10 + $Min10" | bc`
+    Min20=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalMin20=`echo "scale=4; $totalMin20 + $Min20" | bc`
+    Min30=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalMin30=`echo "scale=4; $totalMin30 + $Min30" | bc`
+    Min40=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalMin40=`echo "scale=4; $totalMin40 + $Min40" | bc`
+    Min50=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalMin50=`echo "scale=4; $totalMin50 + $Min50" | bc`
+    Min60=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalMin60=`echo "scale=4; $totalMin60 + $Min60" | bc`
+    Min70=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalMin70=`echo "scale=4; $totalMin70 + $Min70" | bc`
+    Min80=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalMin80=`echo "scale=4; $totalMin80 + $Min80" | bc`
+    Min90=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalMin90=`echo "scale=4; $totalMin90 + $Min90" | bc`
+    Min100=`cat $INFLUXDBTESTQ2OUT | grep min | grep "devices;" | awk '{print $5}'`
+    totalMin100=`echo "scale=4; $totalMin100 + $Min100" | bc`
+
+    Spread10=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-1\]" | awk '{print $5}'`
+    totalSpread10=`echo "scale=4; $totalSpread10 + $Spread10" | bc`
+    Spread20=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-2\]" | awk '{print $5}'`
+    totalSpread20=`echo "scale=4; $totalSpread20 + $Spread20" | bc`
+    Spread30=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-3\]" | awk '{print $5}'`
+    totalSpread30=`echo "scale=4; $totalSpread30 + $Spread30" | bc`
+    Spread40=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-4\]" | awk '{print $5}'`
+    totalSpread40=`echo "scale=4; $totalSpread40 + $Spread40" | bc`
+    Spread50=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-5\]" | awk '{print $5}'`
+    totalSpread50=`echo "scale=4; $totalSpread50 + $Spread50" | bc`
+    Spread60=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-6\]" | awk '{print $5}'`
+    totalSpread60=`echo "scale=4; $totalSpread60 + $Spread60" | bc`
+    Spread70=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-7\]" | awk '{print $5}'`
+    totalSpread70=`echo "scale=4; $totalSpread70 + $Spread70" | bc`
+    Spread80=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-8\]" | awk '{print $5}'`
+    totalSpread80=`echo "scale=4; $totalSpread80 + $Spread80" | bc`
+    Spread90=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devgroup=~\/\[1-9\]" | awk '{print $5}'`
+    totalSpread90=`echo "scale=4; $totalSpread90 + $Spread90" | bc`
+    Spread100=`cat $INFLUXDBTESTQ2OUT | grep spread | grep "devices;" | awk '{print $5}'`
+    totalSpread100=`echo "scale=4; $totalSpread100 + $Spread100" | bc`
+
+  done
+  avgCount10=`echo "scale=4; x = $totalCount10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount20=`echo "scale=4; x = $totalCount20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount30=`echo "scale=4; x = $totalCount30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount40=`echo "scale=4; x = $totalCount40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount50=`echo "scale=4; x = $totalCount50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount60=`echo "scale=4; x = $totalCount60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount70=`echo "scale=4; x = $totalCount70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount80=`echo "scale=4; x = $totalCount80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount90=`echo "scale=4; x = $totalCount90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount100=`echo "scale=4; x = $totalCount100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMean10=`echo "scale=4; x = $totalMean10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean20=`echo "scale=4; x = $totalMean20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean30=`echo "scale=4; x = $totalMean30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean40=`echo "scale=4; x = $totalMean40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean50=`echo "scale=4; x = $totalMean50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean60=`echo "scale=4; x = $totalMean60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean70=`echo "scale=4; x = $totalMean70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean80=`echo "scale=4; x = $totalMean80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean90=`echo "scale=4; x = $totalMean90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMean100=`echo "scale=4; x = $totalMean100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSum10=`echo "scale=4; x = $totalSum10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum20=`echo "scale=4; x = $totalSum20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum30=`echo "scale=4; x = $totalSum30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum40=`echo "scale=4; x = $totalSum40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum50=`echo "scale=4; x = $totalSum50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum60=`echo "scale=4; x = $totalSum60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum70=`echo "scale=4; x = $totalSum70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum80=`echo "scale=4; x = $totalSum80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum90=`echo "scale=4; x = $totalSum90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum100=`echo "scale=4; x = $totalSum100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMax10=`echo "scale=4; x = $totalMax10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax20=`echo "scale=4; x = $totalMax20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax30=`echo "scale=4; x = $totalMax30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax40=`echo "scale=4; x = $totalMax40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax50=`echo "scale=4; x = $totalMax50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax60=`echo "scale=4; x = $totalMax60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax70=`echo "scale=4; x = $totalMax70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax80=`echo "scale=4; x = $totalMax80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax90=`echo "scale=4; x = $totalMax90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax100=`echo "scale=4; x = $totalMax100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMin10=`echo "scale=4; x = $totalMin10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin20=`echo "scale=4; x = $totalMin20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin30=`echo "scale=4; x = $totalMin30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin40=`echo "scale=4; x = $totalMin40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin50=`echo "scale=4; x = $totalMin50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin60=`echo "scale=4; x = $totalMin60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin70=`echo "scale=4; x = $totalMin70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin80=`echo "scale=4; x = $totalMin80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin90=`echo "scale=4; x = $totalMin90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin100=`echo "scale=4; x = $totalMin100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSpread10=`echo "scale=4; x = $totalSpread10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread20=`echo "scale=4; x = $totalSpread20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread30=`echo "scale=4; x = $totalSpread30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread40=`echo "scale=4; x = $totalSpread40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread50=`echo "scale=4; x = $totalSpread50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread60=`echo "scale=4; x = $totalSpread60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread70=`echo "scale=4; x = $totalSpread70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread80=`echo "scale=4; x = $totalSpread80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread90=`echo "scale=4; x = $totalSpread90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread100=`echo "scale=4; x = $totalSpread100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Count, $avgCount10, $avgCount20, $avgCount30, $avgCount40, $avgCount50, $avgCount60, $avgCount70, $avgCount80, $avgCount90, $avgCount100"
+  echo "Mean, $avgMean10, $avgMean20, $avgMean30, $avgMean40, $avgMean50, $avgMean60, $avgMean70, $avgMean80, $avgMean90, $avgMean100"
+  echo "Sum, $avgSum10, $avgSum20, $avgSum30, $avgSum40, $avgSum50, $avgSum60, $avgSum70, $avgSum80, $avgSum90, $avgSum100"
+  echo "Max, $avgMax10, $avgMax20, $avgMax30, $avgMax40, $avgMax50, $avgMax60, $avgMax70, $avgMax80, $avgMax90, $avgMax100"
+  echo "Min, $avgMin10, $avgMin20, $avgMin30, $avgMin40, $avgMin50, $avgMin60, $avgMin70, $avgMin80, $avgMin90, $avgMin100"
+  echo "Spread, $avgSpread10, $avgSpread20, $avgSpread30, $avgSpread40, $avgSpread50, $avgSpread60, $avgSpread70, $avgSpread80, $avgSpread90, $avgSpread100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+INFLUXDBTEST_DIR=$WORK_DIR/tests/comparisonTest/influxdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/influxdbTestQ3Loop.sh b/tests/perftest-scripts/influxdbTestQ3Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e1cfb848faff6c42b98584c80040c7b721c0bfdf
--- /dev/null
+++ b/tests/perftest-scripts/influxdbTestQ3Loop.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+INFLUXDBTESTQ3OUT=opentsdbTestQ3.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q3.txt"
+    $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q3.txt 2>&1 \
+      | tee $INFLUXDBTESTQ3OUT
+    G10=`grep -w "devgroup=~\/\[1-1\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep -w "devgroup=~\/\[1-2\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep -w "devgroup=~\/\[1-3\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep -w "devgroup=~\/\[1-4\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep -w "devgroup=~\/\[1-5\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep -w "devgroup=~\/\[1-6\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep -w "devgroup=~\/\[1-7\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep -w "devgroup=~\/\[1-8\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep -w "devgroup=~\/\[1-9\]" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep -w "devices group by devgroup;" $INFLUXDBTESTQ3OUT| awk '{print $5}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "InfluxDB, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+INFLUXDBTEST_DIR=$WORK_DIR/tests/comparisonTest/influxdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/influxdbTestQ4Loop.sh b/tests/perftest-scripts/influxdbTestQ4Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..eb7cfc55569ec5760cb48b2ff6326104e09fccb0
--- /dev/null
+++ b/tests/perftest-scripts/influxdbTestQ4Loop.sh
@@ -0,0 +1,101 @@
+#!/bin/bash -x
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+INFLUXDBTESTQ4OUT=influxdbTestQ4.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q4.txt"
+
+    $INFLUXDBTEST_DIR/influxdbTest \
+      -sql $INFLUXDBTEST_DIR/q4.txt 2>&1 | 
+      tee $INFLUXDBTESTQ4OUT
+    G10=`grep -w "devgroup=~\/\[1-1\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep -w "devgroup=~\/\[1-2\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep -w "devgroup=~\/\[1-3\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep -w "devgroup=~\/\[1-4\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep -w "devgroup=~\/\[1-5\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep -w "devgroup=~\/\[1-6\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep -w "devgroup=~\/\[1-7\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep -w "devgroup=~\/\[1-8\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep -w "devgroup=~\/\[1-9\]" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep -w "devices group by time" $INFLUXDBTESTQ4OUT| awk '{print $5}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "InfluxDB, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+verbose=false
+regeneratedata=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -r)
+      regeneratedata=true
+      ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+INFLUXDBTEST_DIR=$WORK_DIR/tests/comparisonTest/influxdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/influxdbTestWriteLoop.sh b/tests/perftest-scripts/influxdbTestWriteLoop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..89eabbd7eca5ce4668a02349816bb38f56847133
--- /dev/null
+++ b/tests/perftest-scripts/influxdbTestWriteLoop.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=1
+NUM_OF_FILES=100
+
+rowsPerRequest=(1 100 1000 10000 20000 50000 100000)
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+function runTest {
+  declare -A avgRPR
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      avgRPR[$r, $c]=0
+    done
+  done
+
+  for r in ${!rowsPerRequest[@]}; do
+    if [ "$r" == "1" ] || [ "$r" == "100" ] || [ "$r" == "1000" ]; then
+      NUM_OF_FILES=$clients
+    else
+      NUM_OF_FILES=100
+    fi
+
+    for c in `seq 1 $clients`; do
+      totalRPR=0
+      OUTPUT_FILE=influxdbTestWrite-RPR${rowsPerRequest[$r]}-clients$c.out
+      for i in `seq 1 $NUM_LOOP`; do
+        printTo "loop i:$i, $INF_TEST_DIR/influxdbTest \
+	      -dataDir $DATA_DIR \
+	      -numOfFiles $NUM_OF_FILES \
+	      -writeClients $c \
+	      -rowsPerRequest $r"
+        $INF_TEST_DIR/influxdbTest \
+          -dataDir $DATA_DIR \
+          -numOfFiles $NUM_OF_FILES \
+          -writeClients $c \
+          -rowsPerRequest $r 2>&1 \
+          | tee $OUTPUT_FILE
+        RPR=`cat $OUTPUT_FILE  | grep speed | awk '{print $(NF-1)}'`
+        totalRPR=`echo "scale=4; $totalRPR + $RPR" | bc`
+        printTo "rows:$r, clients:$c, i:$i RPR:$RPR"
+      done
+      avgRPR[$r,$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      printTo "r:$r c:$c avgRPR:${avgRPR[$r, $c]}"
+    done
+  done
+
+  printf "R/R, "
+  for c in `seq 1 $clients`; do
+    if [ "$c" == "1" ]; then
+      printf "$c client, "
+    else
+      printf "$c clients, "
+    fi
+  done
+  printf "\n"
+
+  for r in ${!rowsPerRequest[@]}; do
+    printf "${rowsPerRequest[$r]}, "
+    for c in `seq 1 $clients`; do
+      printf "${avgRPR[$r,$c]}, "
+    done
+    printf "\n"
+  done
+}
+
+################ Main ################
+
+verbose=false
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+
+INF_TEST_DIR=$WORK_DIR/tests/comparisonTest/influxdb
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/opentsdbTestQ1Loop.sh b/tests/perftest-scripts/opentsdbTestQ1Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2f9ca0dfdb7b851739e97c0d056017255292e288
--- /dev/null
+++ b/tests/perftest-scripts/opentsdbTestQ1Loop.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TSDBTESTQ1OUT=opentsdbTestQ1.out
+
+function runTest {
+  totalG0=0
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q1"
+    java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q1 2>&1 \
+      | tee $TSDBTESTQ1OUT
+    G0=`grep "devgroup = 0" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG0=`echo "scale=4; $totalG0 + $G0" | bc`
+    G10=`grep "devgroup = 10" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup = 20" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup = 30" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup = 40" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup = 50" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup = 60" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup = 70" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup = 80" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup = 90" $TSDBTESTQ1OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+  done
+  avgG0=`echo "scale=4; x = $totalG0 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, G-0, G-10, G-20, G-30, G-40, G-50, G-60, G-70, G-80, G-90"
+  echo "OpenTSDB, $avgG0, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90"
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+TSDBTEST_DIR=$WORK_DIR/tests/comparisonTest/opentsdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/opentsdbTestQ2Loop.sh b/tests/perftest-scripts/opentsdbTestQ2Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..db2d0435a3322e10a27f3cbe4a52ea8d623e6690
--- /dev/null
+++ b/tests/perftest-scripts/opentsdbTestQ2Loop.sh
@@ -0,0 +1,276 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TSDBTESTQ2OUT=opentsdbTestQ2.out
+
+function runTest {
+  totalCount10=0
+  totalCount20=0
+  totalCount30=0
+  totalCount40=0
+  totalCount50=0
+  totalCount60=0
+  totalCount70=0
+  totalCount80=0
+  totalCount90=0
+  totalCount100=0
+
+  totalAvg10=0
+  totalAvg20=0
+  totalAvg30=0
+  totalAvg40=0
+  totalAvg50=0
+  totalAvg60=0
+  totalAvg70=0
+  totalAvg80=0
+  totalAvg90=0
+  totalAvg100=0
+
+  totalSum10=0
+  totalSum20=0
+  totalSum30=0
+  totalSum40=0
+  totalSum50=0
+  totalSum60=0
+  totalSum70=0
+  totalSum80=0
+  totalSum90=0
+  totalSum100=0
+
+  totalMax10=0
+  totalMax20=0
+  totalMax30=0
+  totalMax40=0
+  totalMax50=0
+  totalMax60=0
+  totalMax70=0
+  totalMax80=0
+  totalMax90=0
+  totalMax100=0
+
+  totalMin10=0
+  totalMin20=0
+  totalMin30=0
+  totalMin40=0
+  totalMin50=0
+  totalMin60=0
+  totalMin70=0
+  totalMin80=0
+  totalMin90=0
+  totalMin100=0
+
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q2"
+    java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q2 2>&1 \
+      | tee $TSDBTESTQ2OUT
+
+    Count10=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 10" | awk '{print $2}'`
+    totalCount10=`echo "scale=4; $totalCount10 + $Count10" | bc`
+    Count20=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 20" | awk '{print $2}'`
+    totalCount20=`echo "scale=4; $totalCount20 + $Count20" | bc`
+    Count30=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 30" | awk '{print $2}'`
+    totalCount30=`echo "scale=4; $totalCount30 + $Count30" | bc`
+    Count40=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 40" | awk '{print $2}'`
+    totalCount40=`echo "scale=4; $totalCount40 + $Count40" | bc`
+    Count50=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 50" | awk '{print $2}'`
+    totalCount50=`echo "scale=4; $totalCount50 + $Count50" | bc`
+    Count60=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 60" | awk '{print $2}'`
+    totalCount60=`echo "scale=4; $totalCount60 + $Count60" | bc`
+    Count70=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 70" | awk '{print $2}'`
+    totalCount70=`echo "scale=4; $totalCount70 + $Count70" | bc`
+    Count80=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 80" | awk '{print $2}'`
+    totalCount80=`echo "scale=4; $totalCount80 + $Count80" | bc`
+    Count90=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 90" | awk '{print $2}'`
+    totalCount90=`echo "scale=4; $totalCount90 + $Count90" | bc`
+    Count100=`cat $TSDBTESTQ2OUT | grep count | grep "devgroup < 100" | awk '{print $2}'`
+    totalCount100=`echo "scale=4; $totalCount100 + $Count100" | bc`
+
+    Avg10=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 10" | awk '{print $2}'`
+    totalAvg10=`echo "scale=4; $totalAvg10 + $Avg10" | bc`
+    Avg20=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 20" | awk '{print $2}'`
+    totalAvg20=`echo "scale=4; $totalAvg20 + $Avg20" | bc`
+    Avg30=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 30" | awk '{print $2}'`
+    totalAvg30=`echo "scale=4; $totalAvg30 + $Avg30" | bc`
+    Avg40=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 40" | awk '{print $2}'`
+    totalAvg40=`echo "scale=4; $totalAvg40 + $Avg40" | bc`
+    Avg50=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 50" | awk '{print $2}'`
+    totalAvg50=`echo "scale=4; $totalAvg50 + $Avg50" | bc`
+    Avg60=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 60" | awk '{print $2}'`
+    totalAvg60=`echo "scale=4; $totalAvg60 + $Avg60" | bc`
+    Avg70=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 70" | awk '{print $2}'`
+    totalAvg70=`echo "scale=4; $totalAvg70 + $Avg70" | bc`
+    Avg80=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 80" | awk '{print $2}'`
+    totalAvg80=`echo "scale=4; $totalAvg80 + $Avg80" | bc`
+    Avg90=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 90" | awk '{print $2}'`
+    totalAvg90=`echo "scale=4; $totalAvg90 + $Avg90" | bc`
+    Avg100=`cat $TSDBTESTQ2OUT | grep avg | grep "devgroup < 100" | awk '{print $2}'`
+    totalAvg100=`echo "scale=4; $totalAvg100 + $Avg100" | bc`
+
+    Sum10=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 10" | awk '{print $2}'`
+    totalSum10=`echo "scale=4; $totalSum10 + $Sum10" | bc`
+    Sum20=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 20" | awk '{print $2}'`
+    totalSum20=`echo "scale=4; $totalSum20 + $Sum20" | bc`
+    Sum30=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 30" | awk '{print $2}'`
+    totalSum30=`echo "scale=4; $totalSum30 + $Sum30" | bc`
+    Sum40=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 40" | awk '{print $2}'`
+    totalSum40=`echo "scale=4; $totalSum40 + $Sum40" | bc`
+    Sum50=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 50" | awk '{print $2}'`
+    totalSum50=`echo "scale=4; $totalSum50 + $Sum50" | bc`
+    Sum60=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 60" | awk '{print $2}'`
+    totalSum60=`echo "scale=4; $totalSum60 + $Sum60" | bc`
+    Sum70=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 70" | awk '{print $2}'`
+    totalSum70=`echo "scale=4; $totalSum70 + $Sum70" | bc`
+    Sum80=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 80" | awk '{print $2}'`
+    totalSum80=`echo "scale=4; $totalSum80 + $Sum80" | bc`
+    Sum90=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 90" | awk '{print $2}'`
+    totalSum90=`echo "scale=4; $totalSum90 + $Sum90" | bc`
+    Sum100=`cat $TSDBTESTQ2OUT | grep sum | grep "devgroup < 100" | awk '{print $2}'`
+    totalSum100=`echo "scale=4; $totalSum100 + $Sum100" | bc`
+
+    Max10=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 10" | awk '{print $2}'`
+    totalMax10=`echo "scale=4; $totalMax10 + $Max10" | bc`
+    Max20=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 20" | awk '{print $2}'`
+    totalMax20=`echo "scale=4; $totalMax20 + $Max20" | bc`
+    Max30=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 30" | awk '{print $2}'`
+    totalMax30=`echo "scale=4; $totalMax30 + $Max30" | bc`
+    Max40=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 40" | awk '{print $2}'`
+    totalMax40=`echo "scale=4; $totalMax40 + $Max40" | bc`
+    Max50=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 50" | awk '{print $2}'`
+    totalMax50=`echo "scale=4; $totalMax50 + $Max50" | bc`
+    Max60=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 60" | awk '{print $2}'`
+    totalMax60=`echo "scale=4; $totalMax60 + $Max60" | bc`
+    Max70=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 70" | awk '{print $2}'`
+    totalMax70=`echo "scale=4; $totalMax70 + $Max70" | bc`
+    Max80=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 80" | awk '{print $2}'`
+    totalMax80=`echo "scale=4; $totalMax80 + $Max80" | bc`
+    Max90=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 90" | awk '{print $2}'`
+    totalMax90=`echo "scale=4; $totalMax90 + $Max90" | bc`
+    Max100=`cat $TSDBTESTQ2OUT | grep max | grep "devgroup < 100" | awk '{print $2}'`
+    totalMax100=`echo "scale=4; $totalMax100 + $Max100" | bc`
+
+    Min10=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 10" | awk '{print $2}'`
+    totalMin10=`echo "scale=4; $totalMin10 + $Min10" | bc`
+    Min20=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 20" | awk '{print $2}'`
+    totalMin20=`echo "scale=4; $totalMin20 + $Min20" | bc`
+    Min30=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 30" | awk '{print $2}'`
+    totalMin30=`echo "scale=4; $totalMin30 + $Min30" | bc`
+    Min40=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 40" | awk '{print $2}'`
+    totalMin40=`echo "scale=4; $totalMin40 + $Min40" | bc`
+    Min50=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 50" | awk '{print $2}'`
+    totalMin50=`echo "scale=4; $totalMin50 + $Min50" | bc`
+    Min60=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 60" | awk '{print $2}'`
+    totalMin60=`echo "scale=4; $totalMin60 + $Min60" | bc`
+    Min70=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 70" | awk '{print $2}'`
+    totalMin70=`echo "scale=4; $totalMin70 + $Min70" | bc`
+    Min80=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 80" | awk '{print $2}'`
+    totalMin80=`echo "scale=4; $totalMin80 + $Min80" | bc`
+    Min90=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 90" | awk '{print $2}'`
+    totalMin90=`echo "scale=4; $totalMin90 + $Min90" | bc`
+    Min100=`cat $TSDBTESTQ2OUT | grep min | grep "devgroup < 100" | awk '{print $2}'`
+    totalMin100=`echo "scale=4; $totalMin100 + $Min100" | bc`
+
+  done
+  avgCount10=`echo "scale=4; x = $totalCount10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount20=`echo "scale=4; x = $totalCount20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount30=`echo "scale=4; x = $totalCount30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount40=`echo "scale=4; x = $totalCount40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount50=`echo "scale=4; x = $totalCount50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount60=`echo "scale=4; x = $totalCount60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount70=`echo "scale=4; x = $totalCount70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount80=`echo "scale=4; x = $totalCount80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount90=`echo "scale=4; x = $totalCount90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount100=`echo "scale=4; x = $totalCount100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgAvg10=`echo "scale=4; x = $totalAvg10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg20=`echo "scale=4; x = $totalAvg20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg30=`echo "scale=4; x = $totalAvg30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg40=`echo "scale=4; x = $totalAvg40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg50=`echo "scale=4; x = $totalAvg50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg60=`echo "scale=4; x = $totalAvg60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg70=`echo "scale=4; x = $totalAvg70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg80=`echo "scale=4; x = $totalAvg80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg90=`echo "scale=4; x = $totalAvg90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg100=`echo "scale=4; x = $totalAvg100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSum10=`echo "scale=4; x = $totalSum10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum20=`echo "scale=4; x = $totalSum20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum30=`echo "scale=4; x = $totalSum30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum40=`echo "scale=4; x = $totalSum40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum50=`echo "scale=4; x = $totalSum50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum60=`echo "scale=4; x = $totalSum60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum70=`echo "scale=4; x = $totalSum70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum80=`echo "scale=4; x = $totalSum80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum90=`echo "scale=4; x = $totalSum90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum100=`echo "scale=4; x = $totalSum100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMax10=`echo "scale=4; x = $totalMax10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax20=`echo "scale=4; x = $totalMax20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax30=`echo "scale=4; x = $totalMax30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax40=`echo "scale=4; x = $totalMax40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax50=`echo "scale=4; x = $totalMax50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax60=`echo "scale=4; x = $totalMax60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax70=`echo "scale=4; x = $totalMax70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax80=`echo "scale=4; x = $totalMax80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax90=`echo "scale=4; x = $totalMax90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax100=`echo "scale=4; x = $totalMax100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMin10=`echo "scale=4; x = $totalMin10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin20=`echo "scale=4; x = $totalMin20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin30=`echo "scale=4; x = $totalMin30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin40=`echo "scale=4; x = $totalMin40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin50=`echo "scale=4; x = $totalMin50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin60=`echo "scale=4; x = $totalMin60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin70=`echo "scale=4; x = $totalMin70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin80=`echo "scale=4; x = $totalMin80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin90=`echo "scale=4; x = $totalMin90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin100=`echo "scale=4; x = $totalMin100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Count, $avgCount10, $avgCount20, $avgCount30, $avgCount40, $avgCount50, $avgCount60, $avgCount70, $avgCount80, $avgCount90, $avgCount100"
+  echo "Avg, $avgAvg10, $avgAvg20, $avgAvg30, $avgAvg40, $avgAvg50, $avgAvg60, $avgAvg70, $avgAvg80, $avgAvg90, $avgAvg100"
+  echo "Sum, $avgSum10, $avgSum20, $avgSum30, $avgSum40, $avgSum50, $avgSum60, $avgSum70, $avgSum80, $avgSum90, $avgSum100"
+  echo "Max, $avgMax10, $avgMax20, $avgMax30, $avgMax40, $avgMax50, $avgMax60, $avgMax70, $avgMax80, $avgMax90, $avgMax100"
+  echo "Min, $avgMin10, $avgMin20, $avgMin30, $avgMin40, $avgMin50, $avgMin60, $avgMin70, $avgMin80, $avgMin90, $avgMin100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+TSDBTEST_DIR=$WORK_DIR/tests/comparisonTest/opentsdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/opentsdbTestQ3Loop.sh b/tests/perftest-scripts/opentsdbTestQ3Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6f69cf85a0d9d3a196991b40655d9c90e6865253
--- /dev/null
+++ b/tests/perftest-scripts/opentsdbTestQ3Loop.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TSDBTESTQ3OUT=opentsdbTestQ3.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q3"
+    java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q3 2>&1 \
+      | tee $TSDBTESTQ3OUT
+    G10=`grep -w "devgroup < 10" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep -w "devgroup < 20" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep -w "devgroup < 30" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep -w "devgroup < 40" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep -w "devgroup < 50" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep -w "devgroup < 60" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep -w "devgroup < 70" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep -w "devgroup < 80" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep -w "devgroup < 90" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep -w "devgroup < 100" $TSDBTESTQ3OUT| awk '{print $2}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "OpenTSDB, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+TSDBTEST_DIR=$WORK_DIR/tests/comparisonTest/opentsdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/opentsdbTestQ4Loop.sh b/tests/perftest-scripts/opentsdbTestQ4Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4341f2165ce05da20d268b991f596d6636f3bdb2
--- /dev/null
+++ b/tests/perftest-scripts/opentsdbTestQ4Loop.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TSDBTESTQ4OUT=opentsdbTestQ4.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q4"
+
+    java -jar \
+      $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+      -sql q4 2>&1 | 
+      tee $TSDBTESTQ4OUT
+    G10=`grep -w "devgroup < 10" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep -w "devgroup < 20" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep -w "devgroup < 30" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep -w "devgroup < 40" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep -w "devgroup < 50" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep -w "devgroup < 60" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep -w "devgroup < 70" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep -w "devgroup < 80" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep -w "devgroup < 90" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep -w "devgroup < 100" $TSDBTESTQ4OUT| awk '{print $2}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "OpenTSDB, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+################ Main ################
+
+verbose=false
+regeneratedata=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -r)
+      regeneratedata=true
+      ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+TSDBTEST_DIR=$WORK_DIR/tests/comparisonTest/opentsdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/opentsdbTestWriteLoop.sh b/tests/perftest-scripts/opentsdbTestWriteLoop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8bbd5aa9bd7a63294a04ff50714f3744ddb8b4c4
--- /dev/null
+++ b/tests/perftest-scripts/opentsdbTestWriteLoop.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=1
+NUM_OF_FILES=100
+
+rowsPerRequest=(1 10 50 100 500 1000 2000)
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+function runTest {
+  declare -A avgRPR
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      avgRPR[$r, $c]=0
+    done
+  done
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      totalRPR=0
+      OUT_FILE=opentsdbWrite-rows${rowsPerRequest[$r]}-clients$c.out
+      for i in `seq 1 $NUM_LOOP`; do
+        printTo "loop i:$i java -jar \
+          $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+          -dataDir $DATA_DIR \
+          -numOfFiles $NUM_OF_FILES \
+          -writeClients $c \
+          -rowsPerRequest $r"
+        java -jar \
+          $TSDBTEST_DIR/opentsdbtest/target/opentsdbtest-1.0-SNAPSHOT-jar-with-dependencies.jar \
+          -dataDir $DATA_DIR \
+          -numOfFiles $NUM_OF_FILES \
+          -writeClients $c \
+          -rowsPerRequest ${rowsPerRequest[$r]} \
+          2>&1 | tee $OUT_FILE
+        RPR=`cat $OUT_FILE | grep speed | awk '{print $(NF-1)}'`
+        totalRPR=`echo "scale=4; $totalRPR + $RPR" | bc`
+        printTo "r:$r rows:${rowsPerRequest[$r]}, clients:$c, i:$i RPR:$RPR"
+      done
+      avgRPR[$r,$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      printTo "r:$r c:$c avgRPR:${avgRPR[$r, $c]}"
+    done
+  done
+
+  printf "R/R, "
+  for c in `seq 1 $clients`; do
+    if [ "$c" == "1" ]; then
+      printf "$c client, "
+    else
+      printf "$c clients, "
+    fi
+  done
+  printf "\n"
+
+  for r in ${!rowsPerRequest[@]}; do
+    printf "${rowsPerRequest[$r]}, "
+    for c in `seq 1 $clients`; do
+      printf "${avgRPR[$r,$c]}, "
+    done
+    printf "\n"
+  done
+}
+
+################ Main ################
+
+verbose=false
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+WORK_DIR=/mnt/root/TDengine
+TSDBTEST_DIR=$WORK_DIR/tests/comparisonTest/opentsdb
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/perftest-consistent-inserting-data.sh b/tests/perftest-scripts/perftest-consistent-inserting-data.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bfed398b963e0902c1fe7a690b0b38bb43bdbc52
--- /dev/null
+++ b/tests/perftest-scripts/perftest-consistent-inserting-data.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+ulimit -c unlimited
+
+function buildTDengine {
+	cd /root/TDengine
+
+	git remote update
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "repo up-to-date"
+	else
+		echo "repo need to pull"
+		git pull
+
+		LOCAL_COMMIT=`git rev-parse --short @`
+		cd debug
+		rm -rf *
+		cmake ..
+		make > /dev/null
+		make install
+	fi
+}
+
+function restartTaosd {
+	systemctl stop taosd
+	pkill -KILL -x taosd
+	sleep 10
+	
+	rm -rf /var/lib/taos/data/*
+	rm -rf /var/lib/taos/log/*
+	
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+buildTDengine
+restartTaosd
+cd /root/TDengine/tests/pytest/insert
+python3 writeDBNonStop.py
\ No newline at end of file
diff --git a/tests/perftest-scripts/perftest-csv2png.gnuplot b/tests/perftest-scripts/perftest-csv2png.gnuplot
new file mode 100644
index 0000000000000000000000000000000000000000..eabab268cab099e0ad06b8999961ddc5cf7b85d8
--- /dev/null
+++ b/tests/perftest-scripts/perftest-csv2png.gnuplot
@@ -0,0 +1,33 @@
+#!/user/bin/gnuplot
+reset
+set terminal png
+
+set title filename font ",20"
+
+set ylabel "Time in Seconds"
+
+set xdata time
+set timefmt "%Y%m%d"
+set format x "%Y-%m-%d"
+set xlabel "Date"
+
+set style data linespoints
+
+set terminal pngcairo size 1024,768 enhanced font 'Segoe UI, 10'
+set output filename . '.png'
+set datafile separator ','
+
+set key reverse Left outside
+set grid
+
+# plot 'perftest-influx-report.csv'	using 1:2  title "InfluxDB Write", \
+# 	""			using 1:3 title "InfluxDB Query case1", \
+# 	""			using 1:4 title "InfluxDB Query case2", \
+# 	""			using 1:5 title "InfluxDB Query case3", \
+# 	""			using 1:6 title "InfluxDB Query case4"
+# 
+plot filename . '.csv' 	using 1:2  title "TDengine Write", \
+	""			using 1:3 title "TDengine Query case1", \
+	""			using 1:4 title "TDengine Query case2", \
+	""			using 1:5 title "TDengine Query case3", \
+	""			using 1:6 title "TDengine Query case4"
diff --git a/tests/perftest-scripts/perftest-daily.sh b/tests/perftest-scripts/perftest-daily.sh
new file mode 100755
index 0000000000000000000000000000000000000000..beac8de15aa2ed6490bae2854b0c9d046d97e134
--- /dev/null
+++ b/tests/perftest-scripts/perftest-daily.sh
@@ -0,0 +1,210 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function setMaxTablesPerVnode {
+	echo "/etc/taos/taos.cfg maxTablesPerVnode will be set to $1"
+
+	hasText=`grep "maxTablesPerVnode" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "maxTablesPerVnode $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^maxTablesPerVnode.*$/maxTablesPerVnode '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setMaxConnections {
+	echo "/etc/taos/taos.cfg maxConnection will be set to $1"
+
+	hasText=`grep "maxConnections" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "maxConnections $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^maxConnections.*$/maxConnections '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setQDebugFlag {
+	echo "/etc/taos/taos.cfg qDebugFlag will be set to $1"
+
+	hasText=`grep -w "qDebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "qDebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^qDebugFlag.*$/qDebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setDebugFlag {
+	echo "/etc/taos/taos.cfg DebugFlag will be set to $1"
+
+	hasText=`grep -w "DebugFlag" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "DebugFlag $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^DebugFlag.*$/DebugFlag '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function setWal {
+	echo "/etc/taos/taos.cfg walLevel will be set to $1"
+
+	hasText=`grep "walLevel" /etc/taos/taos.cfg`
+	if [[ -z "$hasText" ]]; then
+		echo "walLevel $1" >> /etc/taos/taos.cfg
+	else
+		sed -i 's/^walLevel.*$/walLevel '"$1"'/g' /etc/taos/taos.cfg
+	fi
+}
+
+function collectSysInfo {
+	rm sysinfo.log
+	grep model /proc/cpuinfo | tail -n1 | tee sysinfo.log
+	grep cores /proc/cpuinfo | tail -n1 | tee -a sysinfo.log
+	grep MemTotal /proc/meminfo | tee -a sysinfo.log
+	grep "^[^#;]" /etc/taos/taos.cfg | tee taos.cfg
+}
+
+function buildTDengine {
+	echoInfo "Build TDengine"
+	cd $WORK_DIR/TDengine
+
+	git remote update > /dev/null
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "repo up-to-date"
+	else
+		echo "repo need to pull"
+		git pull > /dev/null
+
+		LOCAL_COMMIT=`git rev-parse --short @`
+		cd debug
+		rm -rf *
+		cmake .. > /dev/null
+		make > /dev/null
+		make install
+	fi
+}
+
+function sendReport {
+	receiver="sdsang@taosdata.com, sangshuduo@gmail.com"
+	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
+
+	echo -e "to: ${receiver}\nsubject: Perf test report ${today}, commit ID: ${LOCAL_COMMIT}\n" | \
+		(cat - && uuencode perftest-1d-wal1-$today.log perftest-1d-wal1-$today.log)| \
+		(cat - && uuencode perftest-1d-wal1-report.csv perftest-1d-wal1-report-$today.csv) | \
+		(cat - && uuencode perftest-1d-wal1-report.png perftest-1d-wal1-report-$today.png) | \
+		(cat - && uuencode perftest-13d-wal1-$today.log perftest-13d-wal1-$today.log)| \
+		(cat - && uuencode perftest-13d-wal1-report.csv perftest-13d-wal1-report-$today.csv) | \
+		(cat - && uuencode perftest-13d-wal1-report.png perftest-13d-wal1-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-$today.log perftest-var10k-int10s-wal1-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.csv perftest-var10k-int10s-wal1-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal1-report.png perftest-var10k-int10s-wal1-report-$today.png) | \
+		(cat - && uuencode taosdemo-wal1-$today.log taosdemo-wal1-$today.log) | \
+		(cat - && uuencode taosdemo-wal1-report.csv taosdemo-wal1-report-$today.csv) | \
+		(cat - && uuencode taosdemo-wal1-report.png taosdemo-wal1-report-$today.png) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.csv taosdemo-rps-wal1-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal1-report.png taosdemo-rps-wal1-report-$today.png) | \
+		(cat - && uuencode perftest-1d-wal2-$today.log perftest-1d-wal2-$today.log)| \
+		(cat - && uuencode perftest-1d-wal2-report.csv perftest-1d-wal2-report-$today.csv) | \
+		(cat - && uuencode perftest-1d-wal2-report.png perftest-1d-wal2-report-$today.png) | \
+		(cat - && uuencode perftest-13d-wal2-$today.log perftest-13d-wal2-$today.log)| \
+		(cat - && uuencode perftest-13d-wal2-report.csv perftest-13d-wal2-report-$today.csv) | \
+		(cat - && uuencode perftest-13d-wal2-report.png perftest-13d-wal2-report-$today.png) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-$today.log perftest-var10k-int10s-wal2-$today.log)| \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.csv perftest-var10k-int10s-wal2-report-$today.csv) | \
+		(cat - && uuencode perftest-var10k-int10s-wal2-report.png perftest-var10k-int10s-wal2-report-$today.png) | \
+		(cat - && uuencode taosdemo-wal2-$today.log taosdemo-wal2-$today.log) | \
+		(cat - && uuencode taosdemo-wal2-report.csv taosdemo-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-wal2-report.png taosdemo-wal2-report-$today.png) | \
+		(cat - && uuencode taosdemo-rps-wal2-report.csv taosdemo-rps-wal2-report-$today.csv) | \
+		(cat - && uuencode taosdemo-rps-wal2-report.png taosdemo-rps-wal2-report-$today.png) | \
+		(cat - && uuencode sysinfo.log sysinfo.txt) | \
+		(cat - && uuencode taos.cfg taos-cfg-$today.txt) | \
+		ssmtp "${receiver}"
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+echo -e "cron-ran-at-${today}" >> $WORK_DIR/cron.log
+
+buildTDengine
+
+############################
+setMaxConnections 1000
+setMaxTablesPerVnode 6000
+setDebugFlag 131
+setQDebugFlag 131
+
+############################
+setWal "2"
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-taosdemo.sh "wal2"
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
+
+#############################
+setWal "1"
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-taosdemo.sh "wal1"
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-1d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-13d.sh
+date >> $WORK_DIR/cron.log
+
+cd $WORK_DIR
+date >> $WORK_DIR/cron.log
+./perftest-tsdb-compare-var10k-int10s.sh
+date >> $WORK_DIR/cron.log
+
+#############################
+collectSysInfo
+
+echoInfo "Send Report"
+sendReport
+echoInfo "End of Test"
diff --git a/tests/perftest-scripts/perftest-taosdemo.sh b/tests/perftest-scripts/perftest-taosdemo.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ae9e8dd7371cca2f522810da6d7816adba86a862
--- /dev/null
+++ b/tests/perftest-scripts/perftest-taosdemo.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TDENGINE_DIR=/root/TDengine
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes 
+function red_echo      { echo -e "\033[31m$@\033[0m";   }
+function green_echo    { echo -e "\033[32m$@\033[0m";   }
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }
+# Coloured Printfs
+function red_printf    { printf "\033[31m$@\033[0m";    }
+function green_printf  { printf "\033[32m$@\033[0m";    }
+function yellow_printf { printf "\033[33m$@\033[0m";    }
+function white_printf  { printf "\033[1;37m$@\033[0m";  }
+# Debugging Outputs
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runCreateTableOnly {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -n 0 2>&1 | tee taosdemo-$walPostfix-$today.log"
+	demoCreateTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
+}
+
+function runDeleteTableOnly {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo -t 0 -D 1 2>&1 | tee taosdemo-$walPostfix-$today.log"
+	demoDeleteTableOnly=`grep "Total:" totaltime.out|awk '{print $2}'`
+}
+
+function runCreateTableThenInsert {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	/usr/bin/time -f "Total: %e" -o totaltime.out bash -c "yes | taosdemo 2>&1 | tee -a taosdemo-$walPostfix-$today.log"
+	demoTableAndInsert=`grep "Total:" totaltime.out|awk '{print $2}'`	
+	demoRPS=`grep "records\/second" taosdemo-$walPostfix-$today.log | tail -n1 | awk '{print $13}'`	
+}
+
+function queryPerformance {
+	echoInfo "Restart Taosd"
+	restartTaosd
+	
+	cd $TDENGINE_DIR/tests/pytest
+	python3 query/queryPerformance.py
+}
+
+function generateTaosdemoPlot {
+	echo "${today} $walPostfix, demoCreateTableOnly: ${demoCreateTableOnly}, demoDeleteTableOnly: ${demoDeleteTableOnly}, demoTableAndInsert: ${demoTableAndInsert}" | tee -a taosdemo-$today.log
+	echo "${today}, ${demoCreateTableOnly}, ${demoDeleteTableOnly}, ${demoTableAndInsert}">> taosdemo-$walPostfix-report.csv
+	echo "${today}, ${demoRPS}" >> taosdemo-rps-$walPostfix-report.csv
+	
+	csvLines=`cat taosdemo-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' taosdemo-$walPostfix-report.csv
+	fi
+
+	csvLines=`cat taosdemo-rps-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' taosdemo-rps-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='taosdemo-$walPostfix-report'" -p taosdemo-csv2png.gnuplot
+	gnuplot -e "filename='taosdemo-rps-$walPostfix-report'" -p taosdemo-rps-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+
+cd $WORK_DIR
+echoInfo "Test Create Table Only "
+runCreateTableOnly
+echoInfo "Test Delete Table Only"
+runDeleteTableOnly
+echoInfo "Test Create Table then Insert data"
+runCreateTableThenInsert
+echoInfo "Query Performance for 10 Billion Records"
+queryPerformance
+echoInfo "Generate plot for taosdemo"
+generateTaosdemoPlot
+
+
+tar czf $WORK_DIR/taos-log-taosdemo-$today.tar.gz $logDir/*
+
+echoInfo "End of TaosDemo Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-13d.sh b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
new file mode 100755
index 0000000000000000000000000000000000000000..110ab9e5fa6463db9f55c8320b1fd3e36380d7a1
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-13d.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTest13d {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 13 -w -q 2>&1 | tee $WORK_DIR/perftest-13d-$walPostfix-$today.log
+}
+
+function generatePerfPlot13d {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-13d-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-13d-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-13d-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 13 days data"
+runPerfTest13d $1
+echoInfo "Generate plot of 13 days data"
+generatePerfPlot13d $1
+
+tar czf $WORK_DIR/taos-log-13d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 13-days-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-1d.sh b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9e8bc697bc18e0e5c3a6d5957fed948192c09241
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-1d.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTest1d {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -d 1 -w -q 2>&1 | tee $WORK_DIR/perftest-1d-$walPostfix-$today.log
+}
+
+function generatePerfPlot1d {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-1d-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-1d-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-1d-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 1 day data"
+runPerfTest1d
+echoInfo "Generate plot of 1 day data"
+generatePerfPlot1d
+
+tar czf $WORK_DIR/taos-log-1d-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare 1-day-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5fc5b9d03a4339263eb07a9af9b76ee2fc324f1b
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int100s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -i 100 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int100s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int100s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int100s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int100s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int100s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int100s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bafa04f174955d9938810f9b5bc353a0b712c3c3
--- /dev/null
+++ b/tests/perftest-scripts/perftest-tsdb-compare-var10k-int10s.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+WORK_DIR=/mnt/root
+TSDB_CMP_DIR=timeseriesdatabase-comparisons/build/tsdbcompare
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+logDir=`grep "^logDir" /etc/taos/taos.cfg | awk '{print $2}'`
+dataDir=`grep "^dataDir" /etc/taos/taos.cfg | awk '{print $2}'`
+
+# Coloured Echoes                                                                                                       #
+function red_echo      { echo -e "\033[31m$@\033[0m";   }                                                               #
+function green_echo    { echo -e "\033[32m$@\033[0m";   }                                                               #
+function yellow_echo   { echo -e "\033[33m$@\033[0m";   }                                                               #
+function white_echo    { echo -e "\033[1;37m$@\033[0m"; }                                                               #
+# Coloured Printfs                                                                                                      #
+function red_printf    { printf "\033[31m$@\033[0m";    }                                                               #
+function green_printf  { printf "\033[32m$@\033[0m";    }                                                               #
+function yellow_printf { printf "\033[33m$@\033[0m";    }                                                               #
+function white_printf  { printf "\033[1;37m$@\033[0m";  }                                                               #
+# Debugging Outputs                                                                                                     #
+function white_brackets { local args="$@"; white_printf "["; printf "${args}"; white_printf "]"; }                      #
+function echoInfo   { local args="$@"; white_brackets $(green_printf "INFO") && echo " ${args}"; }                      #
+function echoWarn   { local args="$@";  echo "$(white_brackets "$(yellow_printf "WARN")" && echo " ${args}";)" 1>&2; }  #
+function echoError  { local args="$@"; echo "$(white_brackets "$(red_printf    "ERROR")" && echo " ${args}";)" 1>&2; }  #
+
+function restartTaosd {
+        echo "Stop taosd"
+	systemctl stop taosd
+	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosd
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+
+	rm -rf $logDir/*
+	rm -rf $dataDir/*
+	
+        echo "Start taosd"
+	taosd 2>&1 > /dev/null &
+	sleep 10
+}
+
+function runPerfTestVar10K {
+	echoInfo "Restart Taosd"
+	restartTaosd
+
+	cd $WORK_DIR/$TSDB_CMP_DIR
+	./runTDengine.sh -v 10000 -w -q 2>&1 | tee $WORK_DIR/perftest-var10k-int10s-$walPostfix-$today.log
+}
+
+function generatePerfPlotVar10K {
+	cd $WORK_DIR
+
+	csvLines=`cat perftest-var10k-int10s-$walPostfix-report.csv | wc -l`
+
+	if [ "$csvLines" -gt "10" ]; then
+		sed -i '1d' perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+
+	gnuplot -e "filename='perftest-var10k-int10s-$walPostfix-report'" -p perftest-csv2png.gnuplot
+}
+
+today=`date +"%Y%m%d"`
+cd $WORK_DIR
+
+echoInfo "run Performance Test with 10K tables data"
+runPerfTestVar10K
+echoInfo "Generate plot of 10K tables data"
+generatePerfPlotVar10K
+
+tar czf $WORK_DIR/taos-log-var10k-int10s-$today.tar.gz $logDir/*
+
+echoInfo "End of TSDB-Compare var10k-int10s-tables-data Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/run-csv.sh b/tests/perftest-scripts/run-csv.sh
new file mode 100755
index 0000000000000000000000000000000000000000..afa1d5df5de0c9780d65ff12ae680a323851444f
--- /dev/null
+++ b/tests/perftest-scripts/run-csv.sh
@@ -0,0 +1,209 @@
+#!/bin/bash
+
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+docker rm -f `docker ps -a -q`
+#set -x
+echo
+echo "---------------Generating Data-----------------"
+echo
+echo "Prepare data for InfluxDB...."
+#bin/bulk_data_gen -seed 123 -format influx-bulk -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z" >data/influx.dat
+bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval 1s -scale-var 10 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z" >data/influx.dat
+
+echo 
+echo "Prepare data for TDengine...."
+#bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > data/tdengine.dat
+bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval 1s -tdschema-file config/TDengineSchema.toml -scale-var 10 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > data/tdengine.dat
+
+
+
+docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 tsdbcomp >>/dev/null 2>&1
+
+
+TDENGINE=`docker run -d --net tsdbcomp --ip 172.15.1.6 -p 6030:6030 -p 6020:6020 -p 6031:6031 -p 6032:6032 -p 6033:6033 -p 6034:6034 -p 6035:6035 -p 6036:6036 -p 6037:6037 -p 6038:6038 -p 6039:6039 tdengine/tdengine:1.6.4.5` 
+echo
+echo "------------------Writing Data-----------------"
+echo
+sleep 5
+echo
+echo -e "Start test TDengine, result in ${GREEN}Green line${NC}"
+
+TDENGINERES=`cat data/tdengine.dat |bin/bulk_load_tdengine --url 172.15.1.6:0 --batch-size 300   -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+#TDENGINERES=`cat data/tdengine.dat |gunzip|bin/bulk_load_tdengine --url 172.15.1.6:0 --batch-size 300   -do-load -report-tags n1 -workers 10 -fileout=false| grep loaded`
+echo
+echo -e "${GREEN}TDengine writing result:${NC}"
+echo -e "${GREEN}$TDENGINERES${NC}"
+DATA=`echo $TDENGINERES|awk '{print($2)}'`
+TMP=`echo $TDENGINERES|awk '{print($5)}'`
+TDWTM=`echo ${TMP%s*}`
+
+
+INFLUX=`docker run -d -p 8086:8086 --net tsdbcomp --ip 172.15.1.5 influxdb` >>/dev/null 2>&1
+sleep 10
+echo
+echo -e "Start test InfluxDB, result in ${GREEN}Green line${NC}"
+
+
+INFLUXRES=`cat data/influx.dat  |bin/bulk_load_influx --batch-size=5000 --workers=20 --urls="http://172.15.1.5:8086" | grep loaded`
+
+
+echo
+echo -e "${GREEN}InfluxDB writing result:${NC}"
+echo -e "${GREEN}$INFLUXRES${NC}"
+
+TMP=`echo $INFLUXRES|awk '{print($5)}'`
+IFWTM=`echo ${TMP%s*}`
+
+echo
+echo "------------------Querying Data-----------------"
+echo
+
+sleep 10
+echo 
+echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://172.15.1.6:6020" -workers 50 -print-interval 0|grep wall`
+echo
+echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+echo -e "${GREEN}$TDQS1${NC}"
+TMP=`echo $TDQS1|awk '{print($4)}'`
+TDQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://172.15.1.6:6020" -workers 50 -print-interval 0|grep wall`
+
+echo
+echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+echo -e "${GREEN}$TDQS2${NC}"
+TMP=`echo $TDQS2|awk '{print($4)}'`
+TDQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://172.15.1.6:6020" -workers 50 -print-interval 0|grep wall`
+echo
+echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+echo -e "${GREEN}$TDQS3${NC}"
+TMP=`echo $TDQS3|awk '{print($4)}'`
+TDQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://172.15.1.6:6020" -workers 50 -print-interval 0|grep wall`
+echo
+echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+echo -e "${GREEN}$TDQS4${NC}"
+TMP=`echo $TDQS4|awk '{print($4)}'`
+TDQ4=`echo ${TMP%s*}`
+
+sleep 10
+
+echo 
+echo  "start query test, query max from 8 hosts group by 1hour, Influxdb"
+echo
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+IFQS1=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 1 result:${NC}"
+echo -e "${GREEN}$IFQS1${NC}"
+TMP=`echo $IFQS1|awk '{print($4)}'`
+IFQ1=`echo ${TMP%s*}`
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+IFQS2=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 2 result:${NC}"
+echo -e "${GREEN}$IFQS2${NC}"
+TMP=`echo $IFQS2|awk '{print($4)}'`
+IFQ2=`echo ${TMP%s*}`
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+#INFLUXQUERY=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+IFQS3=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 3 result:${NC}"
+echo -e "${GREEN}$IFQS3${NC}"
+TMP=`echo $IFQS3|awk '{print($4)}'`
+IFQ3=`echo ${TMP%s*}`
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+#INFLUXQUERY=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+IFQS4=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 4 result:${NC}"
+echo -e "${GREEN}$IFQS4${NC}"
+TMP=`echo $IFQS4|awk '{print($4)}'`
+IFQ4=`echo ${TMP%s*}`
+
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+echo -e "       Writing $DATA records test takes:          "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFWTM 
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDWTM
+echo    "------------------------------------------------------"
+echo    "                   Query test cases:                "
+echo    " case 1: select the max(value) from all data    "
+echo    " filtered out 8 hosts                                 "
+echo    "       Query test case 1 takes:                      "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ1 
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ1
+echo    "------------------------------------------------------"
+echo    " case 2: select the max(value) from all data          "
+echo    " filtered out 8 hosts with an interval of 1 hour     "
+echo    " case 2 takes:                                       "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ2 
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ2
+echo    "------------------------------------------------------"
+echo    " case 3: select the max(value) from random 12 hours"
+echo    " data filtered out 8 hosts with an interval of 10 min         "
+echo    " filtered out 8 hosts interval(1h)                   "
+echo    " case 3 takes:                                       "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ3 
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ3
+echo    "------------------------------------------------------"
+echo    " case 4: select the max(value) from random 1 hour data  "
+echo    " data filtered out 8 hosts with an interval of 1 min         "
+echo    " case 4 takes:                                        "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ4 
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ4
+echo    "------------------------------------------------------"
+echo
+docker stop $INFLUX >>/dev/null 2>&1
+docker container rm -f $INFLUX >>/dev/null 2>&1
+docker stop $TDENGINE >>/dev/null 2>&1
+docker container rm -f $TDENGINE >>/dev/null 2>&1
+docker network rm tsdbcomp >>/dev/null 2>&1
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
+
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${IFWTM}, ${IFQ1}, ${IFQ2}, ${IFQ3}, ${IFQ4}" >> /root/perftest-influx-report.csv
+
diff --git a/tests/perftest-scripts/runInfluxdb-13d-csv.sh b/tests/perftest-scripts/runInfluxdb-13d-csv.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2eb36068688e8e180165c487bdeacbba9a9e7b73
--- /dev/null
+++ b/tests/perftest-scripts/runInfluxdb-13d-csv.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+docker rm -f `docker ps -a -q`
+#set -x
+echo
+echo "---------------Generating Data-----------------"
+echo
+echo "Prepare data for InfluxDB...."
+#bin/bulk_data_gen -seed 123 -format influx-bulk -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z" >data/influx.dat
+bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval 1s -scale-var 10 -use-case devops -timestamp-start "2018-01-02T00:00:00Z" -timestamp-end "2018-01-15T00:00:00Z" > /mnt/data/influx.dat
+
+docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 tsdbcomp >>/dev/null 2>&1
+
+INFLUX=`docker run -d -p 8086:8086 --net tsdbcomp --ip 172.15.1.5 influxdb` >>/dev/null 2>&1
+sleep 10
+echo
+echo -e "Start test InfluxDB, result in ${GREEN}Green line${NC}"
+
+
+INFLUXRES=`cat /mnt/data/influx.dat  |bin/bulk_load_influx --batch-size=5000 --workers=20 --urls="http://172.15.1.5:8086" | grep loaded`
+
+
+echo
+echo -e "${GREEN}InfluxDB writing result:${NC}"
+echo -e "${GREEN}$INFLUXRES${NC}"
+DATA=`echo $INFLUXRES|awk '{print($2)}'`
+TMP=`echo $INFLUXRES|awk '{print($5)}'`
+IFWTM=`echo ${TMP%s*}`
+
+echo
+echo "------------------Querying Data-----------------"
+echo
+
+sleep 10
+
+echo 
+echo  "start query test, query max from 8 hosts group by 1hour, Influxdb"
+echo
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+IFQS1=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 1 result:${NC}"
+echo -e "${GREEN}$IFQS1${NC}"
+TMP=`echo $IFQS1|awk '{print($4)}'`
+IFQ1=`echo ${TMP%s*}`
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+IFQS2=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 2 result:${NC}"
+echo -e "${GREEN}$IFQS2${NC}"
+TMP=`echo $IFQS2|awk '{print($4)}'`
+IFQ2=`echo ${TMP%s*}`
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+#INFLUXQUERY=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+IFQS3=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 3 result:${NC}"
+echo -e "${GREEN}$IFQS3${NC}"
+TMP=`echo $IFQS3|awk '{print($4)}'`
+IFQ3=`echo ${TMP%s*}`
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+#INFLUXQUERY=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+IFQS4=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+echo -e "${GREEN}InfluxDB query test case 4 result:${NC}"
+echo -e "${GREEN}$IFQS4${NC}"
+TMP=`echo $IFQS4|awk '{print($4)}'`
+IFQ4=`echo ${TMP%s*}`
+
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+echo -e "       Writing $DATA records test takes:          "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFWTM 
+echo    "------------------------------------------------------"
+echo    "                   Query test cases:                "
+echo    " case 1: select the max(value) from all data    "
+echo    " filtered out 8 hosts                                 "
+echo    "       Query test case 1 takes:                      "
+printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ1 
+echo    "------------------------------------------------------"
+echo    " case 2: select the max(value) from all data          "
+echo    " filtered out 8 hosts with an interval of 1 hour     "
+echo    " case 2 takes:                                       "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ2 
+echo    "------------------------------------------------------"
+echo    " case 3: select the max(value) from random 12 hours"
+echo    " data filtered out 8 hosts with an interval of 10 min         "
+echo    " filtered out 8 hosts interval(1h)                   "
+echo    " case 3 takes:                                       "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ3 
+echo    "------------------------------------------------------"
+echo    " case 4: select the max(value) from random 1 hour data  "
+echo    " data filtered out 8 hosts with an interval of 1 min         "
+echo    " case 4 takes:                                        "
+printf  "       InfluxDB           |       %-4.2f Seconds    \n" $IFQ4 
+echo    "------------------------------------------------------"
+echo
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${IFWTM}, ${IFQ1}, ${IFQ2}, ${IFQ3}, ${IFQ4}" >> /root/perftest-influxdb-report-13d.csv
+
+docker stop $INFLUX >>/dev/null 2>&1
+docker container rm -f $INFLUX >>/dev/null 2>&1
+docker network rm tsdbcomp >>/dev/null 2>&1
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
+
diff --git a/tests/perftest-scripts/runInfluxdb.sh b/tests/perftest-scripts/runInfluxdb.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e8975b05cf43671c174fb95942da89ef8ae4631b
--- /dev/null
+++ b/tests/perftest-scripts/runInfluxdb.sh
@@ -0,0 +1,251 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for InfluxDB...."
+
+	echo "bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format influx-bulk -sampling-interval $interval_s \
+		-scale-var $scalevar -use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END > $DATA_FILE
+}
+
+function do_write {
+	echo "cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls=http://172.15.1.5:8086 | grep loaded"
+	INFLUXRES=`cat $DATA_FILE | bin/bulk_load_influx \
+		--batch-size=$batch --workers=20 --urls="http://172.15.1.5:8086" | grep loaded`
+
+	echo -e "${GREEN}InfluxDB writing result:${NC}"
+	echo -e "${GREEN}$INFLUXRES${NC}"
+	DATA=`echo $INFLUXRES|awk '{print($2)}'`
+	TMP=`echo $INFLUXRES|awk '{print($5)}'`
+	IFWTM=`echo ${TMP%s*}`
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, InfluxDB"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "IFQS1=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall"
+
+	IFQS1=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-all -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 1 result:${NC}"
+	echo -e "${GREEN}$IFQS1${NC}"
+	TMP=`echo $IFQS1|awk '{print($4)}'`
+	IFQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "IFQS2=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS2=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 2 result:${NC}"
+	echo -e "${GREEN}$IFQS2${NC}"
+	TMP=`echo $IFQS2|awk '{print($4)}'`
+	IFQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "IFQS3=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS3=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 3 result:${NC}"
+	echo -e "${GREEN}$IFQS3${NC}"
+	TMP=`echo $IFQS3|awk '{print($4)}'`
+	IFQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "IFQS4=bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr -scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  -urls=http://172.15.1.5:8086  -workers 50 -print-interval 0|grep wall"
+
+	IFQS4=`bin/bulk_query_gen  -seed 123 -format influx-http -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_influxdb  \
+		-urls="http://172.15.1.5:8086"  -workers 50 -print-interval 0|grep wall`
+	echo -e "${GREEN}InfluxDB query test case 4 result:${NC}"
+	echo -e "${GREEN}$IFQS4${NC}"
+	TMP=`echo $IFQS4|awk '{print($4)}'`
+	IFQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int100s.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/influxdb-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-var10k-int10s.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-1d.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/influxdb-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-influxdb-report-13d.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+docker network create --ip-range 172.15.1.255/24 --subnet 172.15.1.1/16 tsdbcomp >>/dev/null 2>&1
+INFLUX=`docker run -d -p 8086:8086 --net tsdbcomp --ip 172.15.1.5 influxdb` >>/dev/null 2>&1
+sleep 10
+
+if $dowrite;
+then
+	echo -e "Start test InfluxDB writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test InfluxDB query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       InfluxDB           |       %-4.5f Seconds    \n" $IFQ4
+	echo    "------------------------------------------------------"
+fi
+
+docker stop $INFLUX >>/dev/null 2>&1
+docker container rm -f $INFLUX >>/dev/null 2>&1
+docker network rm tsdbcomp >>/dev/null 2>&1
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${IFWTM}, ${IFQ1}, ${IFQ2}, ${IFQ3}, ${IFQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/runTDengine.sh b/tests/perftest-scripts/runTDengine.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6c5cf4e55ecb263501e90a91866d14289de9184b
--- /dev/null
+++ b/tests/perftest-scripts/runTDengine.sh
@@ -0,0 +1,283 @@
+#!/bin/bash
+#set -x
+
+WORK_DIR=/mnt/root
+DATA_DIR=/mnt/data
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+# default value
+DEFAULT_BATCH=5000
+DEFAULT_DAYS=1
+DEFAULT_INTERVAL=1
+DEFAULT_SCALEVAR=10
+DEFAULT_DOPREPARE=false
+DEFAULT_DOWRITE=false
+DEFAULT_DOQUERY=false
+
+# function 
+function do_prepare {
+	echo
+	echo "---------------Generating Data-----------------"
+	echo
+
+	echo 
+	echo "Prepare data for TDengine...."
+
+	# bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > $DATA_DIR/tdengine.dat
+	echo "bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \ 
+		-timestamp-end $TIME_END \ 
+	       	> $DATA_FILE"
+
+	bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval $interval_s \
+		-tdschema-file config/TDengineSchema.toml -scale-var $scalevar \
+		-use-case devops -timestamp-start $TIME_START \
+		-timestamp-end $TIME_END  \
+		> $DATA_FILE
+}
+
+function do_write {
+	echo "TDENGINERES=cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded"
+
+	TDENGINERES=`cat $DATA_FILE |bin/bulk_load_tdengine --url 127.0.0.1:0 \
+		--batch-size $batch -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+
+	echo
+	echo -e "${GREEN}TDengine writing result:${NC}"
+	echo -e "${GREEN}$TDENGINERES${NC}"
+	DATA=`echo $TDENGINERES|awk '{print($2)}'`
+	TMP=`echo $TDENGINERES|awk '{print($5)}'`
+	TDWTM=`echo ${TMP%s*}`
+
+}
+
+function do_query {
+
+	echo
+	echo "------------------Querying Data-----------------"
+	echo
+
+	echo 
+	echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+	echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+	echo "TDQS1=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+	echo -e "${GREEN}$TDQS1${NC}"
+	TMP=`echo $TDQS1|awk '{print($4)}'`
+	TDQ1=`echo ${TMP%s*}`
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+	echo "TDQS2=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+
+	echo
+	echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+	echo -e "${GREEN}$TDQS2${NC}"
+	TMP=`echo $TDQS2|awk '{print($4)}'`
+	TDQ2=`echo ${TMP%s*}`
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+	echo "TDQS3=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+	echo -e "${GREEN}$TDQS3${NC}"
+	TMP=`echo $TDQS3|awk '{print($4)}'`
+	TDQ3=`echo ${TMP%s*}`
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+	echo "TDQS4=bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls=http://127.0.0.1:6020 -workers 50 -print-interval 0|grep wall"
+
+	TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr \
+		-scale-var $scalevar -queries 1000 | bin/query_benchmarker_tdengine  \
+		-urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+	echo -e "${GREEN}$TDQS4${NC}"
+	TMP=`echo $TDQS4|awk '{print($4)}'`
+	TDQ4=`echo ${TMP%s*}`
+
+}
+
+batch=$DEFAULT_BATCH
+days=$DEFAULT_DAYS
+interval=$DEFAULT_INTERVAL
+scalevar=$DEFAULT_SCALEVAR
+doprepare=$DEFAULT_DOPREPARE
+dowrite=$DEFAULT_DOWRITE
+doquery=$DEFAULT_DOQUERY
+
+help="$(basename "$0") [-h] [-b batchsize] [-d data-of-days] [-i interval] [-v scalevar] [-p false for don't prepare] [-w false for don't do write] [-q false for don't do query]"
+
+while getopts ':b:d:i:v:pwqh' flag; do
+	case "${flag}" in
+		b) batch=${OPTARG};;
+		d) days=${OPTARG};;
+		i) interval=${OPTARG};;
+		v) scalevar=${OPTARG};;
+		p) doprepare=${OPTARG};;
+		w) dowrite=${OPTARG};;
+		q) doquery=${OPTARG};;
+		:) echo -e "{RED}Missing argument!{NC}"
+			echo "$help"
+			exit 1
+			;;
+		h) echo "$help"
+			exit 1
+			;;
+	esac
+done
+
+walLevel=`grep "^walLevel" /etc/taos/taos.cfg | awk '{print $2}'`
+if [[ "$walLevel" -eq "2" ]]; then
+	walPostfix="wal2"
+elif [[ "$walLevel" -eq "1" ]]; then
+	walPostfix="wal1"
+else
+	echo -e "${RED}wrong walLevel $walLevel found! ${NC}"
+	exit 1
+fi
+
+echo -e "${GREEN} $walPostfix found! ${NC}"
+
+if [[ $scalevar -eq 10000 ]]
+then
+	TIME_START="2018-01-01T00:00:00Z"
+	TIME_END="2018-01-02T00:00:00Z"
+
+	if [[ $interval -eq 100 ]]
+	then
+		interval_s=100s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int100s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int100s-$walPostfix-report.csv
+	else
+		interval_s=10s
+		DATA_FILE=$DATA_DIR/tdengine-var10k-int10s.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-var10k-int10s-$walPostfix-report.csv
+	fi
+else
+	if [[ $days -eq 1 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-02T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-1d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-1d-$walPostfix-report.csv
+	elif [[ $days -eq 13 ]]
+	then
+		TIME_START="2018-01-01T00:00:00Z"
+		TIME_END="2018-01-14T00:00:00Z"
+		DATA_FILE=$DATA_DIR/tdengine-13d.dat
+		RECORD_CSV_FILE=$WORK_DIR/perftest-13d-$walPostfix-report.csv
+	else
+		echo -e "{RED} don't support input $days{NC}"
+		exit 1
+	fi
+
+	interval_s=${interval}s
+fi
+
+echo "TIME_START: $TIME_START, TIME_END: $TIME_END, DATA_FILE: $DATA_FILE"
+echo "doprepare: $doprepare, dowrite: $dowrite, doquery: $doquery"
+
+if $doprepare;
+then
+	do_prepare
+fi
+
+echo
+
+if $dowrite;
+then
+	echo -e "Start test TDengine writting, result in ${GREEN}Green line${NC}"
+	do_write
+fi
+
+if $doquery;
+then
+	echo -e "Start test TDengine query, result in ${GREEN}Green line${NC}"
+	do_query
+fi
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+if $dowrite;
+then
+	echo -e "       Writing $DATA records test takes:          "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDWTM
+	echo    "------------------------------------------------------"
+fi
+
+if $doquery;
+then
+	echo    "                   Query test cases:                "
+	echo    " case 1: select the max(value) from all data    "
+	echo    " filtered out 8 hosts                                 "
+	echo    "       Query test case 1 takes:                      "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ1
+	echo    "------------------------------------------------------"
+	echo    " case 2: select the max(value) from all data          "
+	echo    " filtered out 8 hosts with an interval of 1 hour     "
+	echo    " case 2 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ2
+	echo    "------------------------------------------------------"
+	echo    " case 3: select the max(value) from random 12 hours"
+	echo    " data filtered out 8 hosts with an interval of 10 min         "
+	echo    " filtered out 8 hosts interval(1h)                   "
+	echo    " case 3 takes:                                       "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ3
+	echo    "------------------------------------------------------"
+	echo    " case 4: select the max(value) from random 1 hour data  "
+	echo    " data filtered out 8 hosts with an interval of 1 min         "
+	echo    " case 4 takes:                                        "
+	printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ4
+	echo    "------------------------------------------------------"
+fi
+
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
+today=`date +"%Y%m%d"`
+echo "${today}, ${TDWTM}, ${TDQ1}, ${TDQ2}, ${TDQ3}, ${TDQ4}" >> $RECORD_CSV_FILE
diff --git a/tests/perftest-scripts/runreal-13d-csv.sh b/tests/perftest-scripts/runreal-13d-csv.sh
new file mode 100755
index 0000000000000000000000000000000000000000..48ef01e6a08b37e9bceb2bb599f7ded6bee2dcd1
--- /dev/null
+++ b/tests/perftest-scripts/runreal-13d-csv.sh
@@ -0,0 +1,149 @@
+#!/bin/bash
+
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+#set -x
+echo
+echo "---------------Generating Data-----------------"
+echo
+
+echo 
+echo "Prepare data for TDengine...."
+#bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > data/tdengine.dat
+bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval 1s -tdschema-file config/TDengineSchema.toml -scale-var 10 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-14T00:00:00Z"  > /mnt/data/tdengine.dat
+
+
+echo
+echo -e "Start test TDengine, result in ${GREEN}Green line${NC}"
+
+for i in {1..5}; do
+	TDENGINERES=`cat /mnt/data/tdengine.dat |bin/bulk_load_tdengine --url 127.0.0.1:0 --batch-size 5000 -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+#TDENGINERES=`cat data/tdengine.dat |gunzip|bin/bulk_load_tdengine --url 127.0.0.1:0 --batch-size 300   -do-load -report-tags n1 -workers 10 -fileout=false| grep loaded`
+	echo
+	echo -e "${GREEN}TDengine writing result:${NC}"
+	echo -e "${GREEN}$TDENGINERES${NC}"
+	DATA=`echo $TDENGINERES|awk '{print($2)}'`
+	TMP=`echo $TDENGINERES|awk '{print($5)}'`
+	TDWTM=`echo ${TMP%s*}`
+
+	[ -z "$TDWTM" ] || break
+done
+
+
+
+echo
+echo "------------------Querying Data-----------------"
+echo
+
+sleep 10
+echo 
+echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+for i in {1..5}; do
+	TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+	echo -e "${GREEN}$TDQS1${NC}"
+	TMP=`echo $TDQS1|awk '{print($4)}'`
+	TDQ1=`echo ${TMP%s*}`
+
+	[ -z "$TDQ1" ] || break
+done
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+for i in {1..5}; do
+	TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+
+	echo
+	echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+	echo -e "${GREEN}$TDQS2${NC}"
+	TMP=`echo $TDQS2|awk '{print($4)}'`
+	TDQ2=`echo ${TMP%s*}`
+
+	[ -z "$TDQ2" ] || break
+done
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+for i in {1..5}; do
+	TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+	echo -e "${GREEN}$TDQS3${NC}"
+	TMP=`echo $TDQS3|awk '{print($4)}'`
+	TDQ3=`echo ${TMP%s*}`
+
+	[ -z "$TDQ3" ] || break
+done
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+for i in {1..5}; do
+	TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+	echo -e "${GREEN}$TDQS4${NC}"
+	TMP=`echo $TDQS4|awk '{print($4)}'`
+	TDQ4=`echo ${TMP%s*}`
+
+	[ -z "$TDQ4" ] || break
+done
+
+sleep 10
+
+
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+echo -e "       Writing $DATA records test takes:          "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDWTM
+echo    "------------------------------------------------------"
+echo    "                   Query test cases:                "
+echo    " case 1: select the max(value) from all data    "
+echo    " filtered out 8 hosts                                 "
+echo    "       Query test case 1 takes:                      "
+printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ1
+echo    "------------------------------------------------------"
+echo    " case 2: select the max(value) from all data          "
+echo    " filtered out 8 hosts with an interval of 1 hour     "
+echo    " case 2 takes:                                       "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ2
+echo    "------------------------------------------------------"
+echo    " case 3: select the max(value) from random 12 hours"
+echo    " data filtered out 8 hosts with an interval of 10 min         "
+echo    " filtered out 8 hosts interval(1h)                   "
+echo    " case 3 takes:                                       "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ3
+echo    "------------------------------------------------------"
+echo    " case 4: select the max(value) from random 1 hour data  "
+echo    " data filtered out 8 hosts with an interval of 1 min         "
+echo    " case 4 takes:                                        "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ4
+echo    "------------------------------------------------------"
+echo
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${TDWTM}, ${TDQ1}, ${TDQ2}, ${TDQ3}, ${TDQ4}" >> /root/perftest-13d-$1-report.csv
+
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
diff --git a/tests/perftest-scripts/runreal-1d-csv.sh b/tests/perftest-scripts/runreal-1d-csv.sh
new file mode 100755
index 0000000000000000000000000000000000000000..20c8b4138c5625e816cbe08a368d9f5fc7fc67dc
--- /dev/null
+++ b/tests/perftest-scripts/runreal-1d-csv.sh
@@ -0,0 +1,149 @@
+#!/bin/bash
+
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+#set -x
+echo
+echo "---------------Generating Data-----------------"
+echo
+
+echo 
+echo "Prepare data for TDengine...."
+#bin/bulk_data_gen -seed 123 -format tdengine -tdschema-file config/TDengineSchema.toml -scale-var 100 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > data/tdengine.dat
+bin/bulk_data_gen -seed 123 -format tdengine -sampling-interval 1s -tdschema-file config/TDengineSchema.toml -scale-var 10 -use-case devops -timestamp-start "2018-01-01T00:00:00Z" -timestamp-end "2018-01-02T00:00:00Z"  > data/tdengine.dat
+
+
+echo
+echo -e "Start test TDengine, result in ${GREEN}Green line${NC}"
+
+for i in {1..5}; do
+	TDENGINERES=`cat data/tdengine.dat |bin/bulk_load_tdengine --url 127.0.0.1:0 --batch-size 300   -do-load -report-tags n1 -workers 20 -fileout=false| grep loaded`
+#TDENGINERES=`cat data/tdengine.dat |gunzip|bin/bulk_load_tdengine --url 127.0.0.1:0 --batch-size 300   -do-load -report-tags n1 -workers 10 -fileout=false| grep loaded`
+	echo
+	echo -e "${GREEN}TDengine writing result:${NC}"
+	echo -e "${GREEN}$TDENGINERES${NC}"
+	DATA=`echo $TDENGINERES|awk '{print($2)}'`
+	TMP=`echo $TDENGINERES|awk '{print($5)}'`
+	TDWTM=`echo ${TMP%s*}`
+
+	[ -z "$TDWTM" ] || break
+done
+
+
+
+echo
+echo "------------------Querying Data-----------------"
+echo
+
+sleep 10
+echo 
+echo  "start query test, query max from 8 hosts group by 1 hour, TDengine"
+echo
+
+#Test case 1
+#测试用例1，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') ;
+# a,b,c,d,e,f,g,h are random 8 numbers.
+for i in {1..5}; do
+	TDQS1=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-all -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 1 result:${NC}"
+	echo -e "${GREEN}$TDQS1${NC}"
+	TMP=`echo $TDQS1|awk '{print($4)}'`
+	TDQ1=`echo ${TMP%s*}`
+
+	[ -z "$TDQ1" ] || break
+done
+
+#Test case 2
+#测试用例2，查询所有数据中，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1小时为粒度，查询每1小时的最大值。
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') interval(1h);
+# a,b,c,d,e,f,g,h are random 8 numbers
+for i in {1..5}; do
+	TDQS2=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-allbyhr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+
+	echo
+	echo -e "${GREEN}TDengine query test case 2 result:${NC}"
+	echo -e "${GREEN}$TDQS2${NC}"
+	TMP=`echo $TDQS2|awk '{print($4)}'`
+	TDQ2=`echo ${TMP%s*}`
+
+	[ -z "$TDQ2" ] || break
+done
+
+#Test case 3
+#测试用例3，测试用例3，随机查询12个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以10分钟为粒度，查询每10分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =12 hour
+for i in {1..5}; do
+	TDQS3=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-12-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 3 result:${NC}"
+	echo -e "${GREEN}$TDQS3${NC}"
+	TMP=`echo $TDQS3|awk '{print($4)}'`
+	TDQ3=`echo ${TMP%s*}`
+
+	[ -z "$TDQ3" ] || break
+done
+
+#Test case 4
+#测试用例4，随机查询1个小时的数据，用8个hostname标签进行匹配，匹配出这8个hostname对应的模拟服务器CPU数据中的usage_user这个监控数据，以1分钟为粒度，查询每1分钟的最大值
+#select max(usage_user) from cpu where(hostname='host_a' and hostname='host_b'and hostname='host_c'and hostname='host_d'and hostname='host_e'and hostname='host_f' and hostname='host_g'and hostname='host_h') and time >x and time <y interval(10m);
+# a,b,c,d,e,f,g,h are random 8 numbers, y-x =1 hours
+for i in {1..5}; do
+	TDQS4=`bin/bulk_query_gen  -seed 123 -format tdengine -query-type 8-host-1-hr -scale-var 10 -queries 1000 | bin/query_benchmarker_tdengine  -urls="http://127.0.0.1:6020" -workers 50 -print-interval 0|grep wall`
+	echo
+	echo -e "${GREEN}TDengine query test case 4 result:${NC}"
+	echo -e "${GREEN}$TDQS4${NC}"
+	TMP=`echo $TDQS4|awk '{print($4)}'`
+	TDQ4=`echo ${TMP%s*}`
+
+	[ -z "$TDQ4" ] || break
+done
+
+sleep 10
+
+
+
+echo
+echo
+echo    "======================================================"
+echo    "             tsdb performance comparision             "
+echo    "======================================================"
+echo -e "       Writing $DATA records test takes:          "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDWTM
+echo    "------------------------------------------------------"
+echo    "                   Query test cases:                "
+echo    " case 1: select the max(value) from all data    "
+echo    " filtered out 8 hosts                                 "
+echo    "       Query test case 1 takes:                      "
+printf  "       TDengine           |       %-4.5f Seconds    \n" $TDQ1
+echo    "------------------------------------------------------"
+echo    " case 2: select the max(value) from all data          "
+echo    " filtered out 8 hosts with an interval of 1 hour     "
+echo    " case 2 takes:                                       "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ2
+echo    "------------------------------------------------------"
+echo    " case 3: select the max(value) from random 12 hours"
+echo    " data filtered out 8 hosts with an interval of 10 min         "
+echo    " filtered out 8 hosts interval(1h)                   "
+echo    " case 3 takes:                                       "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ3
+echo    "------------------------------------------------------"
+echo    " case 4: select the max(value) from random 1 hour data  "
+echo    " data filtered out 8 hosts with an interval of 1 min         "
+echo    " case 4 takes:                                        "
+printf  "       TDengine           |       %-4.2f Seconds    \n" $TDQ4
+echo    "------------------------------------------------------"
+echo
+
+today=`date +"%Y%m%d"`
+echo "${today}, ${TDWTM}, ${TDQ1}, ${TDQ2}, ${TDQ3}, ${TDQ4}" >> /root/perftest-1d-$1-report.csv
+
+#bulk_query_gen/bulk_query_gen  -format influx-http -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_influxdb/query_benchmarker_influxdb  -urls="http://172.26.89.231:8086" 
+#bulk_query_gen/bulk_query_gen  -format tdengine -query-type 1-host-1-hr -scale-var 10 -queries 1000 | query_benchmarker_tdengine/query_benchmarker_tdengine  -urls="http://172.26.89.231:6020" 
diff --git a/tests/perftest-scripts/taosdemo-csv2png.gnuplot b/tests/perftest-scripts/taosdemo-csv2png.gnuplot
new file mode 100644
index 0000000000000000000000000000000000000000..7cdcb84fce7cdf52dd223e1af6f6d68a46b13893
--- /dev/null
+++ b/tests/perftest-scripts/taosdemo-csv2png.gnuplot
@@ -0,0 +1,26 @@
+#!/user/bin/gnuplot
+reset
+set terminal png
+
+set title filename font ",20"
+
+set ylabel "Time in Seconds"
+
+set xdata time
+set timefmt "%Y%m%d"
+set format x "%Y-%m-%d"
+set xlabel "Date"
+
+set style data linespoints
+
+set terminal pngcairo size 1024,768 enhanced font 'Segoe UI, 10'
+set output filename . '.png'
+set datafile separator ','
+
+set key reverse Left outside
+set grid
+
+
+plot filename . '.csv' 	using 1:2  title "Create 10,000 Tables", \
+	""			using 1:3 title "Delete 10,000 Tables", \
+	""			using 1:4 title "Create 10,000 Tables and Insert 100,000 records"
diff --git a/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
new file mode 100644
index 0000000000000000000000000000000000000000..a7fcb4bd43b17a03f92a432446971412dcfcc54c
--- /dev/null
+++ b/tests/perftest-scripts/taosdemo-rps-csv2png.gnuplot
@@ -0,0 +1,24 @@
+#!/user/bin/gnuplot
+reset
+set terminal png
+
+set title filename font ",20"
+
+set ylabel "Time in Seconds"
+
+set xdata time
+set timefmt "%Y%m%d"
+set format x "%Y-%m-%d"
+set xlabel "Date"
+
+set style data linespoints
+
+set terminal pngcairo size 1024,768 enhanced font 'Segoe UI, 10'
+set output filename . '.png'
+set datafile separator ','
+
+set key reverse Left outside
+set grid
+
+
+plot filename . '.csv' 	using 1:2  title "Request Per Second"
diff --git a/tests/perftest-scripts/tdengineTestQ1Loop.sh b/tests/perftest-scripts/tdengineTestQ1Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fb2810b00e194bf4d232f19fb353bbad02261ac9
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestQ1Loop.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TDTESTQ1OUT=tdengineTestQ1.out
+
+function runTest {
+  totalG0=0
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -sql q1.txt"
+    restartTaosd
+    $TDTEST_DIR/tdengineTest \
+      -sql $TDTEST_DIR/q1.txt > $TDTESTQ1OUT
+    G0=`grep "devgroup=0" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG0=`echo "scale=4; $totalG0 + $G0" | bc`
+    printTo "i: $i, G0: $G0, totalG0:$totalG0"
+    G10=`grep "devgroup=10" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    printTo "i: $i, G10: $G10, totalG10:$totalG10"
+    G20=`grep "devgroup=20" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup=30" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup=40" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup=50" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup=60" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup=70" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup=80" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup=90" $TDTESTQ1OUT| awk '{print $3}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    printTo "i: $i, G90: $G90, totalG90:$totalG90"
+  done
+  avgG0=`echo "scale=4; x = $totalG0 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, G-0, G-10, G-20, G-30, G-40, G-50, G-60, G-70, G-80, G-90"
+  echo "TDengine, $avgG0, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90"
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      ;;
+
+    master)
+      master=true
+      develop=false
+      ;;
+
+    develop)
+      master=false
+      develop=true
+      ;;
+    *)
+      ;;
+  esac
+done
+
+if $master ; then
+  echo "Test master branch.."
+  cp /mnt/root/cfg/master/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine.master
+else
+  echo "Test develop branch.."
+  cp /mnt/root/cfg/10billion/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/tdengineTestQ2Loop.sh b/tests/perftest-scripts/tdengineTestQ2Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ede9d98f98ab974c6a763bd33f139a136edb6206
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestQ2Loop.sh
@@ -0,0 +1,348 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TDTESTQ2OUT=tdengineTestQ2.out
+
+function runTest {
+  totalCount10=0
+  totalCount20=0
+  totalCount30=0
+  totalCount40=0
+  totalCount50=0
+  totalCount60=0
+  totalCount70=0
+  totalCount80=0
+  totalCount90=0
+  totalCount100=0
+
+  totalAvg10=0
+  totalAvg20=0
+  totalAvg30=0
+  totalAvg40=0
+  totalAvg50=0
+  totalAvg60=0
+  totalAvg70=0
+  totalAvg80=0
+  totalAvg90=0
+  totalAvg100=0
+
+  totalSum10=0
+  totalSum20=0
+  totalSum30=0
+  totalSum40=0
+  totalSum50=0
+  totalSum60=0
+  totalSum70=0
+  totalSum80=0
+  totalSum90=0
+  totalSum100=0
+
+  totalMax10=0
+  totalMax20=0
+  totalMax30=0
+  totalMax40=0
+  totalMax50=0
+  totalMax60=0
+  totalMax70=0
+  totalMax80=0
+  totalMax90=0
+  totalMax100=0
+
+  totalMin10=0
+  totalMin20=0
+  totalMin30=0
+  totalMin40=0
+  totalMin50=0
+  totalMin60=0
+  totalMin70=0
+  totalMin80=0
+  totalMin90=0
+  totalMin100=0
+
+  totalSpread10=0
+  totalSpread20=0
+  totalSpread30=0
+  totalSpread40=0
+  totalSpread50=0
+  totalSpread60=0
+  totalSpread70=0
+  totalSpread80=0
+  totalSpread90=0
+  totalSpread100=0
+
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -sql q2.txt"
+    restartTaosd
+    $TDTEST_DIR/tdengineTest \
+      -sql $TDTEST_DIR/q2.txt > $TDTESTQ2OUT
+
+    Count10=`cat $TDTESTQ2OUT | grep "count" | grep "devgroup<10;" | awk '{print $3}'`
+    totalCount10=`echo "scale=4; $totalCount10 + $Count10" | bc`
+    Count20=`cat $TDTESTQ2OUT | grep "count" | grep "devgroup<20;" | awk '{print $3}'`
+    totalCount20=`echo "scale=4; $totalCount20 + $Count20" | bc`
+    Count30=`cat $TDTESTQ2OUT | grep count | grep "devgroup<30;" | awk '{print $3}'`
+    totalCount30=`echo "scale=4; $totalCount30 + $Count30" | bc`
+    Count40=`cat $TDTESTQ2OUT | grep count | grep "devgroup<40;" | awk '{print $3}'`
+    totalCount40=`echo "scale=4; $totalCount40 + $Count40" | bc`
+    Count50=`cat $TDTESTQ2OUT | grep count | grep "devgroup<50;" | awk '{print $3}'`
+    totalCount50=`echo "scale=4; $totalCount50 + $Count50" | bc`
+    Count60=`cat $TDTESTQ2OUT | grep count | grep "devgroup<60;" | awk '{print $3}'`
+    totalCount60=`echo "scale=4; $totalCount60 + $Count60" | bc`
+    Count70=`cat $TDTESTQ2OUT | grep count | grep "devgroup<70;" | awk '{print $3}'`
+    totalCount70=`echo "scale=4; $totalCount70 + $Count70" | bc`
+    Count80=`cat $TDTESTQ2OUT | grep count | grep "devgroup<80;" | awk '{print $3}'`
+    totalCount80=`echo "scale=4; $totalCount80 + $Count80" | bc`
+    Count90=`cat $TDTESTQ2OUT | grep count | grep "devgroup<90;" | awk '{print $3}'`
+    totalCount90=`echo "scale=4; $totalCount90 + $Count90" | bc`
+    Count100=`cat $TDTESTQ2OUT | grep count | grep "db.devices;" | awk '{print $3}'`
+    totalCount100=`echo "scale=4; $totalCount100 + $Count100" | bc`
+
+    Avg10=`cat $TDTESTQ2OUT | grep "avg" | grep "devgroup<10;" | awk '{print $3}'`
+    totalAvg10=`echo "scale=4; $totalAvg10 + $Avg10" | bc`
+    Avg20=`cat $TDTESTQ2OUT | grep "avg" | grep "devgroup<20;" | awk '{print $3}'`
+    totalAvg20=`echo "scale=4; $totalAvg20 + $Avg20" | bc`
+    Avg30=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<30;" | awk '{print $3}'`
+    totalAvg30=`echo "scale=4; $totalAvg30 + $Avg30" | bc`
+    Avg40=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<40;" | awk '{print $3}'`
+    totalAvg40=`echo "scale=4; $totalAvg40 + $Avg40" | bc`
+    Avg50=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<50;" | awk '{print $3}'`
+    totalAvg50=`echo "scale=4; $totalAvg50 + $Avg50" | bc`
+    Avg60=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<60;" | awk '{print $3}'`
+    totalAvg60=`echo "scale=4; $totalAvg60 + $Avg60" | bc`
+    Avg70=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<70;" | awk '{print $3}'`
+    totalAvg70=`echo "scale=4; $totalAvg70 + $Avg70" | bc`
+    Avg80=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<80;" | awk '{print $3}'`
+    totalAvg80=`echo "scale=4; $totalAvg80 + $Avg80" | bc`
+    Avg90=`cat $TDTESTQ2OUT | grep avg | grep "devgroup<90;" | awk '{print $3}'`
+    totalAvg90=`echo "scale=4; $totalAvg90 + $Avg90" | bc`
+    Avg100=`cat $TDTESTQ2OUT | grep avg | grep "db.devices;" | awk '{print $3}'`
+    totalAvg100=`echo "scale=4; $totalAvg100 + $Avg100" | bc`
+
+    Sum10=`cat $TDTESTQ2OUT | grep "sum" | grep "devgroup<10;" | awk '{print $3}'`
+    totalSum10=`echo "scale=4; $totalSum10 + $Sum10" | bc`
+    Sum20=`cat $TDTESTQ2OUT | grep "sum" | grep "devgroup<20;" | awk '{print $3}'`
+    totalSum20=`echo "scale=4; $totalSum20 + $Sum20" | bc`
+    Sum30=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<30;" | awk '{print $3}'`
+    totalSum30=`echo "scale=4; $totalSum30 + $Sum30" | bc`
+    Sum40=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<40;" | awk '{print $3}'`
+    totalSum40=`echo "scale=4; $totalSum40 + $Sum40" | bc`
+    Sum50=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<50;" | awk '{print $3}'`
+    totalSum50=`echo "scale=4; $totalSum50 + $Sum50" | bc`
+    Sum60=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<60;" | awk '{print $3}'`
+    totalSum60=`echo "scale=4; $totalSum60 + $Sum60" | bc`
+    Sum70=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<70;" | awk '{print $3}'`
+    totalSum70=`echo "scale=4; $totalSum70 + $Sum70" | bc`
+    Sum80=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<80;" | awk '{print $3}'`
+    totalSum80=`echo "scale=4; $totalSum80 + $Sum80" | bc`
+    Sum90=`cat $TDTESTQ2OUT | grep sum | grep "devgroup<90;" | awk '{print $3}'`
+    totalSum90=`echo "scale=4; $totalSum90 + $Sum90" | bc`
+    Sum100=`cat $TDTESTQ2OUT | grep sum | grep "db.devices;" | awk '{print $3}'`
+    totalSum100=`echo "scale=4; $totalSum100 + $Sum100" | bc`
+
+    Max10=`cat $TDTESTQ2OUT | grep "max" | grep "devgroup<10;" | awk '{print $3}'`
+    totalMax10=`echo "scale=4; $totalMax10 + $Max10" | bc`
+    Max20=`cat $TDTESTQ2OUT | grep "max" | grep "devgroup<20;" | awk '{print $3}'`
+    totalMax20=`echo "scale=4; $totalMax20 + $Max20" | bc`
+    Max30=`cat $TDTESTQ2OUT | grep max | grep "devgroup<30;" | awk '{print $3}'`
+    totalMax30=`echo "scale=4; $totalMax30 + $Max30" | bc`
+    Max40=`cat $TDTESTQ2OUT | grep max | grep "devgroup<40;" | awk '{print $3}'`
+    totalMax40=`echo "scale=4; $totalMax40 + $Max40" | bc`
+    Max50=`cat $TDTESTQ2OUT | grep max | grep "devgroup<50;" | awk '{print $3}'`
+    totalMax50=`echo "scale=4; $totalMax50 + $Max50" | bc`
+    Max60=`cat $TDTESTQ2OUT | grep max | grep "devgroup<60;" | awk '{print $3}'`
+    totalMax60=`echo "scale=4; $totalMax60 + $Max60" | bc`
+    Max70=`cat $TDTESTQ2OUT | grep max | grep "devgroup<70;" | awk '{print $3}'`
+    totalMax70=`echo "scale=4; $totalMax70 + $Max70" | bc`
+    Max80=`cat $TDTESTQ2OUT | grep max | grep "devgroup<80;" | awk '{print $3}'`
+    totalMax80=`echo "scale=4; $totalMax80 + $Max80" | bc`
+    Max90=`cat $TDTESTQ2OUT | grep max | grep "devgroup<90;" | awk '{print $3}'`
+    totalMax90=`echo "scale=4; $totalMax90 + $Max90" | bc`
+    Max100=`cat $TDTESTQ2OUT | grep max | grep "db.devices;" | awk '{print $3}'`
+    totalMax100=`echo "scale=4; $totalMax100 + $Max100" | bc`
+
+    Min10=`cat $TDTESTQ2OUT | grep "min" | grep "devgroup<10;" | awk '{print $3}'`
+    totalMin10=`echo "scale=4; $totalMin10 + $Min10" | bc`
+    Min20=`cat $TDTESTQ2OUT | grep "min" | grep "devgroup<20;" | awk '{print $3}'`
+    totalMin20=`echo "scale=4; $totalMin20 + $Min20" | bc`
+    Min30=`cat $TDTESTQ2OUT | grep min | grep "devgroup<30;" | awk '{print $3}'`
+    totalMin30=`echo "scale=4; $totalMin30 + $Min30" | bc`
+    Min40=`cat $TDTESTQ2OUT | grep min | grep "devgroup<40;" | awk '{print $3}'`
+    totalMin40=`echo "scale=4; $totalMin40 + $Min40" | bc`
+    Min50=`cat $TDTESTQ2OUT | grep min | grep "devgroup<50;" | awk '{print $3}'`
+    totalMin50=`echo "scale=4; $totalMin50 + $Min50" | bc`
+    Min60=`cat $TDTESTQ2OUT | grep min | grep "devgroup<60;" | awk '{print $3}'`
+    totalMin60=`echo "scale=4; $totalMin60 + $Min60" | bc`
+    Min70=`cat $TDTESTQ2OUT | grep min | grep "devgroup<70;" | awk '{print $3}'`
+    totalMin70=`echo "scale=4; $totalMin70 + $Min70" | bc`
+    Min80=`cat $TDTESTQ2OUT | grep min | grep "devgroup<80;" | awk '{print $3}'`
+    totalMin80=`echo "scale=4; $totalMin80 + $Min80" | bc`
+    Min90=`cat $TDTESTQ2OUT | grep min | grep "devgroup<90;" | awk '{print $3}'`
+    totalMin90=`echo "scale=4; $totalMin90 + $Min90" | bc`
+    Min100=`cat $TDTESTQ2OUT | grep min | grep "db.devices;" | awk '{print $3}'`
+    totalMin100=`echo "scale=4; $totalMin100 + $Min100" | bc`
+
+    Spread10=`cat $TDTESTQ2OUT | grep "spread" | grep "devgroup<10;" | awk '{print $3}'`
+    totalSpread10=`echo "scale=4; $totalSpread10 + $Spread10" | bc`
+    Spread20=`cat $TDTESTQ2OUT | grep "spread" | grep "devgroup<20;" | awk '{print $3}'`
+    totalSpread20=`echo "scale=4; $totalSpread20 + $Spread20" | bc`
+    Spread30=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<30;" | awk '{print $3}'`
+    totalSpread30=`echo "scale=4; $totalSpread30 + $Spread30" | bc`
+    Spread40=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<40;" | awk '{print $3}'`
+    totalSpread40=`echo "scale=4; $totalSpread40 + $Spread40" | bc`
+    Spread50=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<50;" | awk '{print $3}'`
+    totalSpread50=`echo "scale=4; $totalSpread50 + $Spread50" | bc`
+    Spread60=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<60;" | awk '{print $3}'`
+    totalSpread60=`echo "scale=4; $totalSpread60 + $Spread60" | bc`
+    Spread70=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<70;" | awk '{print $3}'`
+    totalSpread70=`echo "scale=4; $totalSpread70 + $Spread70" | bc`
+    Spread80=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<80;" | awk '{print $3}'`
+    totalSpread80=`echo "scale=4; $totalSpread80 + $Spread80" | bc`
+    Spread90=`cat $TDTESTQ2OUT | grep spread | grep "devgroup<90;" | awk '{print $3}'`
+    totalSpread90=`echo "scale=4; $totalSpread90 + $Spread90" | bc`
+    Spread100=`cat $TDTESTQ2OUT | grep spread | grep "db.devices;" | awk '{print $3}'`
+    totalSpread100=`echo "scale=4; $totalSpread100 + $Spread100" | bc`
+
+  done
+  avgCount10=`echo "scale=4; x = $totalCount10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount20=`echo "scale=4; x = $totalCount20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount30=`echo "scale=4; x = $totalCount30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount40=`echo "scale=4; x = $totalCount40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount50=`echo "scale=4; x = $totalCount50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount60=`echo "scale=4; x = $totalCount60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount70=`echo "scale=4; x = $totalCount70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount80=`echo "scale=4; x = $totalCount80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount90=`echo "scale=4; x = $totalCount90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgCount100=`echo "scale=4; x = $totalCount100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgAvg10=`echo "scale=4; x = $totalAvg10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg20=`echo "scale=4; x = $totalAvg20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg30=`echo "scale=4; x = $totalAvg30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg40=`echo "scale=4; x = $totalAvg40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg50=`echo "scale=4; x = $totalAvg50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg60=`echo "scale=4; x = $totalAvg60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg70=`echo "scale=4; x = $totalAvg70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg80=`echo "scale=4; x = $totalAvg80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg90=`echo "scale=4; x = $totalAvg90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgAvg100=`echo "scale=4; x = $totalAvg100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSum10=`echo "scale=4; x = $totalSum10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum20=`echo "scale=4; x = $totalSum20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum30=`echo "scale=4; x = $totalSum30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum40=`echo "scale=4; x = $totalSum40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum50=`echo "scale=4; x = $totalSum50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum60=`echo "scale=4; x = $totalSum60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum70=`echo "scale=4; x = $totalSum70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum80=`echo "scale=4; x = $totalSum80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum90=`echo "scale=4; x = $totalSum90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSum100=`echo "scale=4; x = $totalSum100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMax10=`echo "scale=4; x = $totalMax10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax20=`echo "scale=4; x = $totalMax20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax30=`echo "scale=4; x = $totalMax30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax40=`echo "scale=4; x = $totalMax40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax50=`echo "scale=4; x = $totalMax50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax60=`echo "scale=4; x = $totalMax60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax70=`echo "scale=4; x = $totalMax70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax80=`echo "scale=4; x = $totalMax80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax90=`echo "scale=4; x = $totalMax90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMax100=`echo "scale=4; x = $totalMax100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgMin10=`echo "scale=4; x = $totalMin10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin20=`echo "scale=4; x = $totalMin20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin30=`echo "scale=4; x = $totalMin30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin40=`echo "scale=4; x = $totalMin40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin50=`echo "scale=4; x = $totalMin50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin60=`echo "scale=4; x = $totalMin60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin70=`echo "scale=4; x = $totalMin70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin80=`echo "scale=4; x = $totalMin80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin90=`echo "scale=4; x = $totalMin90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgMin100=`echo "scale=4; x = $totalMin100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  avgSpread10=`echo "scale=4; x = $totalSpread10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread20=`echo "scale=4; x = $totalSpread20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread30=`echo "scale=4; x = $totalSpread30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread40=`echo "scale=4; x = $totalSpread40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread50=`echo "scale=4; x = $totalSpread50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread60=`echo "scale=4; x = $totalSpread60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread70=`echo "scale=4; x = $totalSpread70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread80=`echo "scale=4; x = $totalSpread80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread90=`echo "scale=4; x = $totalSpread90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgSpread100=`echo "scale=4; x = $totalSpread100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "Count, $avgCount10, $avgCount20, $avgCount30, $avgCount40, $avgCount50, $avgCount60, $avgCount70, $avgCount80, $avgCount90, $avgCount100"
+  echo "Avg, $avgAvg10, $avgAvg20, $avgAvg30, $avgAvg40, $avgAvg50, $avgAvg60, $avgAvg70, $avgAvg80, $avgAvg90, $avgAvg100"
+  echo "Sum, $avgSum10, $avgSum20, $avgSum30, $avgSum40, $avgSum50, $avgSum60, $avgSum70, $avgSum80, $avgSum90, $avgSum100"
+  echo "Max, $avgMax10, $avgMax20, $avgMax30, $avgMax40, $avgMax50, $avgMax60, $avgMax70, $avgMax80, $avgMax90, $avgMax100"
+  echo "Min, $avgMin10, $avgMin20, $avgMin30, $avgMin40, $avgMin50, $avgMin60, $avgMin70, $avgMin80, $avgMin90, $avgMin100"
+  echo "Spread, $avgSpread10, $avgSpread20, $avgSpread30, $avgSpread40, $avgSpread50, $avgSpread60, $avgSpread70, $avgSpread80, $avgSpread90, $avgSpread100"
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      ;;
+
+    master)
+      master=true
+      develop=false
+      ;;
+
+    develop)
+      master=false
+      develop=true
+      ;;
+    *)
+      ;;
+  esac
+done
+
+if $master ; then
+  echo "Test master branch.."
+  cp /mnt/root/cfg/master/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine.master
+else
+  echo "Test develop branch.."
+  cp /mnt/root/cfg/10billion/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/tdengineTestQ3Loop.sh b/tests/perftest-scripts/tdengineTestQ3Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f59f6372586c857096ece51f0626f365d290ad73
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestQ3Loop.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TDTESTQ3OUT=tdengineTestQ3.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -sql q3.txt"
+    restartTaosd
+    $TDTEST_DIR/tdengineTest \
+      -sql $TDTEST_DIR/q3.txt > $TDTESTQ3OUT
+    G10=`grep "devgroup<10" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup<20" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup<30" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup<40" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup<50" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup<60" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup<70" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup<80" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup<90" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep "db.devices group by devgroup;" $TDTESTQ3OUT| awk '{print $3}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "TDengine, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      ;;
+
+    master)
+      master=true
+      develop=false
+      ;;
+
+    develop)
+      master=false
+      develop=true
+      ;;
+    *)
+      ;;
+  esac
+done
+
+if $master ; then
+  echo "Test master branch.."
+  cp /mnt/root/cfg/master/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine.master
+else
+  echo "Test develop branch.."
+  cp /mnt/root/cfg/10billion/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/tdengineTestQ4Loop.sh b/tests/perftest-scripts/tdengineTestQ4Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8ea3cb402335bd9fea808316f0ba504451dbf2bc
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestQ4Loop.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TDTESTQ4OUT=tdengineTestQ4.out
+
+function runTest {
+  totalG10=0
+  totalG20=0
+  totalG30=0
+  totalG40=0
+  totalG50=0
+  totalG60=0
+  totalG70=0
+  totalG80=0
+  totalG90=0
+  totalG100=0
+  for i in `seq 1 $NUM_LOOP`; do
+    printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -sql q4.txt"
+    restartTaosd
+    $TDTEST_DIR/tdengineTest \
+      -sql $TDTEST_DIR/q4.txt > $TDTESTQ4OUT
+    G10=`grep "devgroup<10" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG10=`echo "scale=4; $totalG10 + $G10" | bc`
+    G20=`grep "devgroup<20" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG20=`echo "scale=4; $totalG20 + $G20" | bc`
+    G30=`grep "devgroup<30" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG30=`echo "scale=4; $totalG30 + $G30" | bc`
+    G40=`grep "devgroup<40" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG40=`echo "scale=4; $totalG40 + $G40" | bc`
+    G50=`grep "devgroup<50" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG50=`echo "scale=4; $totalG50 + $G50" | bc`
+    G60=`grep "devgroup<60" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG60=`echo "scale=4; $totalG60 + $G60" | bc`
+    G70=`grep "devgroup<70" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG70=`echo "scale=4; $totalG70 + $G70" | bc`
+    G80=`grep "devgroup<80" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG80=`echo "scale=4; $totalG80 + $G80" | bc`
+    G90=`grep "devgroup<90" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG90=`echo "scale=4; $totalG90 + $G90" | bc`
+    G100=`grep "db.devices interval" $TDTESTQ4OUT| awk '{print $3}'`
+    totalG100=`echo "scale=4; $totalG100 + $G100" | bc`
+  done
+  avgG10=`echo "scale=4; x = $totalG10 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG20=`echo "scale=4; x = $totalG20 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG30=`echo "scale=4; x = $totalG30 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG40=`echo "scale=4; x = $totalG40 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG50=`echo "scale=4; x = $totalG50 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG60=`echo "scale=4; x = $totalG60 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG70=`echo "scale=4; x = $totalG70 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG80=`echo "scale=4; x = $totalG80 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG90=`echo "scale=4; x = $totalG90 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  avgG100=`echo "scale=4; x = $totalG100 / $NUM_LOOP; if(x<1) print 0; x" | bc`
+  echo "Latency, 10%, 20%, 30%, 40%, 50%, 60%, 70%, 80%, 90%, 100%"
+  echo "TDengine, $avgG10, $avgG20, $avgG30, $avgG40, $avgG50, $avgG60, $avgG70, $avgG80, $avgG90, $avgG100"
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+for arg in "$@"
+do
+  case $arg in
+    -v)
+      verbose=true
+      ;;
+
+    master)
+      master=true
+      develop=false
+      ;;
+
+    develop)
+      master=false
+      develop=true
+      ;;
+    *)
+      ;;
+  esac
+done
+
+if $master ; then
+  echo "Test master branch.."
+  cp /mnt/root/cfg/master/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine.master
+else
+  echo "Test develop branch.."
+  cp /mnt/root/cfg/10billion/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/tdengineTestQ5Loop.sh b/tests/perftest-scripts/tdengineTestQ5Loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9eff74f563fdd21fddd885324096daef26170f94
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestQ5Loop.sh
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+TDTESTQ5OUT=tdengineTestQ5.out
+
+function runTest {
+  totalThroughput=0
+  for i in `seq 1 $NUM_LOOP`; do
+    for c in `seq 1 $clients`; do
+      records[$c]=0
+      spentTime[$c]=0
+      throughput[$c]=0
+    done
+    printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -clients $clients -sql q5.txt"
+    restartTaosd
+    beginMS=`date +%s%3N`
+    $TDTEST_DIR/tdengineTest \
+      -clients $clients -sql $TDTEST_DIR/q5.txt > $TDTESTQ5OUT
+    endMS=`date +%s%3N`
+    totalRecords=0
+    for c in `seq 1 $clients`; do
+      records[$c]=`grep Thread:$c $TDTESTQ5OUT | awk '{print $7}'`
+      totalRecords=`echo "$totalRecords + ${records[$c]}"|bc`
+    done
+    spending=`echo "scale=4; x = ($endMS - $beginMS)/1000; if (x<1) print 0; x"|bc`
+    throughput=`echo "scale=4; x= $totalRecords / $spending; if (x<1) print 0; x" | bc`
+    printTo "spending: $spending sec, throughput: $throughput"
+    totalThroughput=`echo "scale=4; x = $totalThroughput + $throughput; if(x<1) print 0; x"|bc`
+  done
+  avgThrougput=`echo "scale=4; x = $totalThroughput / $NUM_LOOP; if (x<1) print 0; x"|bc`
+  echo "avg Throughput: $avgThrougput"
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+master=false
+develop=true
+verbose=false
+
+clients=1
+
+while : ; do
+  case $1 in
+    -v)
+      verbose=true
+      shift ;;
+
+    master)
+      master=true
+      develop=false
+      shift ;;
+
+    develop)
+      master=false
+      develop=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+if $master ; then
+  printTo "Test master branch.."
+  cp /mnt/root/cfg/master/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine.master
+else
+  printTo "Test develop branch.."
+  cp /mnt/root/cfg/10billion/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+runTest
+
+printTo "Test done!"
diff --git a/tests/perftest-scripts/tdengineTestWriteLoop.sh b/tests/perftest-scripts/tdengineTestWriteLoop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..cb9d87d0c19fc171ee87c35b96ad47cd8dbf3cf7
--- /dev/null
+++ b/tests/perftest-scripts/tdengineTestWriteLoop.sh
@@ -0,0 +1,172 @@
+#!/bin/bash
+
+DATA_DIR=/mnt/root/testdata
+NUM_LOOP=5
+NUM_OF_FILES=100
+
+rowsPerRequest=(1 100 500 1000 2000)
+
+function printTo {
+  if $verbose ; then
+    echo $1
+  fi
+}
+
+function runTest {
+  declare -A avgRPR
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      avgRPR[$r,$c]=0
+    done
+  done
+
+  for r in ${!rowsPerRequest[@]}; do
+    for c in `seq 1 $clients`; do
+      totalRPR=0
+      if $v16 ; then
+        OUTPUT_FILE=tdengineTestWrite-v16-RPR${rowsPerRequest[$r]}-clients$c.out
+      else
+        OUTPUT_FILE=tdengineTestWrite-v20-RPR${rowsPerRequest[$r]}-clients$c.out
+      fi
+
+      for i in `seq 1 $NUM_LOOP`; do
+        if ! $printresultonly ; then
+          restartTaosd
+          $TAOSD_DIR/taos -s "drop database db" > /dev/null 2>&1
+
+          if $v16 ; then
+            printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+	      -dataDir $DATA_DIR \
+	      -numOfFiles $NUM_OF_FILES \
+	      -writeClients $c \
+	      -rowsPerRequest ${rowsPerRequest[$r]} \
+              | tee $OUTPUT_FILE"
+            $TDTEST_DIR/tdengineTest \
+              -dataDir $DATA_DIR \
+              -numOfFiles $NUM_OF_FILES \
+              -writeClients $c \
+              -rowsPerRequest ${rowsPerRequest[$r]} \
+              | tee $OUTPUT_FILE
+          else
+            printTo "loop i:$i, $TDTEST_DIR/tdengineTest \
+              -dataDir $DATA_DIR \
+              -numOfFiles $NUM_OF_FILES \
+              -w -clients $c \
+              -rowsPerRequest ${rowsPerRequest[$r]} \
+              | tee $OUTPUT_FILE"
+            $TDTEST_DIR/tdengineTest \
+              -dataDir $DATA_DIR \
+              -numOfFiles $NUM_OF_FILES \
+              -w -clients $c \
+              -rowsPerRequest ${rowsPerRequest[$r]} \
+	      | tee $OUTPUT_FILE
+          fi
+        fi
+
+        RPR=`cat $OUTPUT_FILE  | grep speed | awk '{print $(NF-1)}'`
+        totalRPR=`echo "scale=4; $totalRPR + $RPR" | bc`
+        printTo "rows:${rowsPerRequest[$r]}, clients:$c, i:$i RPR:$RPR"
+      done
+      avgRPR[$r,$c]=`echo "scale=4; $totalRPR / $NUM_LOOP" | bc`
+      printTo "r:${rowsPerRequest[$r]} c:$c avgRPR:${avgRPR[$r,$c]}"
+    done
+  done
+
+  printf "R/R, "
+  for c in `seq 1 $clients`; do
+    if [ "$c" == "1" ]; then
+      printf "$c client, "
+    else
+      printf "$c clients, "
+    fi
+  done
+  printf "\n"
+
+  for r in ${!rowsPerRequest[@]}; do
+    printf "${rowsPerRequest[$r]}, "
+    for c in `seq 1 $clients`; do
+      printf "${avgRPR[$r,$c]}, "
+    done
+    printf "\n"
+  done
+}
+
+function restartTaosd {
+  printTo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    pkill -TERM -x taosd
+    sleep 1
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  done
+
+  printTo "Start taosd"
+  $TAOSD_DIR/taosd > /dev/null 2>&1 &
+  sleep 10
+}
+
+################ Main ################
+
+v16=false
+v20=true
+verbose=false
+clients=1
+printresultonly=false
+
+while : ; do
+  case $1 in
+    printresultonly)
+      printresultonly=true
+      shift ;;
+
+    -v)
+      verbose=true
+      shift ;;
+
+    v16)
+      v16=true
+      v20=false
+      shift ;;
+
+    v20)
+      v16=false
+      v20=true
+      shift ;;
+
+    -c)
+      clients=$2
+      shift 2;;
+
+    -n)
+      NUM_LOOP=$2
+      shift 2;;
+
+    *)
+      break ;;
+  esac
+done
+
+if $v16 ; then
+  echo "Test v16 branch.."
+  WORK_DIR=/mnt/root/TDengine.v16
+  cp /mnt/root/cfg/v16/taos.cfg /etc/taos/taos.cfg
+else
+  echo "Test v20 branch.."
+  cp /mnt/root/cfg/v20/taos.cfg /etc/taos/taos.cfg
+  WORK_DIR=/mnt/root/TDengine
+fi
+
+TAOSD_DIR=$WORK_DIR/debug/build/bin
+TDTEST_DIR=$WORK_DIR/tests/comparisonTest/tdengine
+
+if [ ! -f $TDTEST_DIR/tdengineTest ]; then
+  echo "Please build tdengineTest first!"
+  exit 1
+fi
+
+runTest
+
+echo "Test done!"
diff --git a/tests/perftest-scripts/tdinternal_coverage_test.sh b/tests/perftest-scripts/tdinternal_coverage_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..654c06cd0b8ae28bdb05520ffb4d041ca9b82110
--- /dev/null
+++ b/tests/perftest-scripts/tdinternal_coverage_test.sh
@@ -0,0 +1,193 @@
+#!/bin/bash
+
+today=`date +"%Y%m%d"`
+TDINTERNAL_DIR=/home/shuduo/work/taosdata/TDinternal.cover
+TDINTERNAL_COVERAGE_REPORT=$TDINTERNAL_DIR/community/tests/tdinternal-coverage-report-$today.log
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+function buildTDinternal {
+	echo "check if TDinternal need build"
+	cd $TDINTERNAL_DIR
+	NEED_COMPILE=0
+#	git remote update
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "TDinternal repo is up-to-date"
+	else
+		echo "repo need to pull"
+#		git pull
+
+#		NEED_COMPILE=1
+	fi
+
+  lcov -d . --zerocounters
+#	git submodule update --init --recursive
+	cd $TDINTERNAL_DIR/community
+	TDENGINE_REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	TDENGINE_LOCAL_COMMIT=`git rev-parse --short @`
+	if [ "$TDENGINE_LOCAL_COMMIT" == "$TDENGINE_REMOTE_COMMIT" ]; then
+		echo "community repo is up-to-date"
+	else
+		echo "repo need to pull"
+#		git checkout develop
+#		git pull
+#		NEED_COMPILE=1
+	fi
+
+	cd $TDINTERNAL_DIR/debug
+
+	if [[ $NEED_COMPILE -eq 1 ]]; then
+		LOCAL_COMMIT=`git rev-parse --short @`
+		rm -rf *
+		cmake .. > /dev/null
+		make > /dev/null
+	fi
+
+	make install > /dev/null
+}
+
+function runUniqueCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^./test.sh* ]]; then
+      case=`echo $line | awk '{print $NF}'`
+      start_time=`date +%s`
+      ./test.sh -f $case > /dev/null 2>&1 && \
+        echo -e "${GREEN}$case success${NC}" | tee -a $TDINTERNAL_COVERAGE_REPORT || \
+        echo -e "${RED}$case failed${NC}" | tee -a $TDINTERNAL_COVERAGE_REPORT
+      end_time=`date +%s`
+      echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDINTERNAL_COVERAGE_REPORT
+    fi
+  done < $1
+}
+
+function runTest {
+	echo "Run Test"
+	cd $TDINTERNAL_DIR/community/tests/script
+	[ -d ../../sim ] && rm -rf ../../sim
+
+	[ -f $TDINTERNAL_COVERAGE_REPORT ] && rm $TDINTERNAL_COVERAGE_REPORT
+
+	runUniqueCaseOneByOne jenkins/basic.txt
+
+	totalSuccess=`grep 'success' $TDINTERNAL_COVERAGE_REPORT | wc -l`
+
+	if [ "$totalSuccess" -gt "0" ]; then
+		echo -e "\n${GREEN} ### Total $totalSuccess TDinternal case(s) succeed! ### ${NC}" | tee -a $TDINTERNAL_COVERAGE_REPORT
+	fi
+
+	totalFailed=`grep 'failed\|fault' $TDINTERNAL_COVERAGE_REPORT | wc -l`
+	if [ "$totalFailed" -ne "0" ]; then
+		echo -e "${RED} ### Total $totalFailed TDinternal case(s) failed! ### ${NC}\n" | tee -a $TDINTERNAL_COVERAGE_REPORT
+#  exit $totalPyFailed
+	fi
+
+	# Test Python test case
+	cd $TDINTERNAL_DIR/community/tests
+	/usr/bin/time -f "Total spent: %e" ./test-all.sh full python | tee -a $TDINTERNAL_COVERAGE_REPORT
+
+	# Test Connector
+	stopTaosd
+	$TDINTERNAL_DIR/debug/build/bin/taosd -c $TDINTERNAL_DIR/debug/test/cfg > /dev/null &
+	sleep 10
+
+	cd $TDINTERNAL_DIR/community/src/connector/jdbc
+	mvn clean package > /dev/null
+	mvn test > /dev/null | tee -a $TDINTERNAL_COVERAGE_REPORT
+
+	# Test C Demo
+	stopTaosd
+	$TDINTERNAL_DIR/debug/build/bin/taosd -c $TDINTERNAL_DIR/debug/test/cfg > /dev/null &
+	sleep 10
+	yes | $TDINTERNAL_DIR/debug/build/bin/demo 127.0.0.1 > /dev/null | tee -a $TDINTERNAL_COVERAGE_REPORT
+
+	# Test waltest
+	dataDir=`grep dataDir $TDINTERNAL_DIR/debug/test/cfg/taos.cfg|awk '{print $2}'`
+	walDir=`find $dataDir -name "wal"|head -n1`
+	echo "dataDir: $dataDir" | tee -a $TDINTERNAL_COVERAGE_REPORT
+  echo "walDir: $walDir" | tee -a $TDINTERNAL_COVERAGE_REPORT
+	if [ -n "$walDir" ]; then
+		yes | $TDINTERNAL_DIR/debug/build/bin/waltest -p $walDir > /dev/null | tee -a $TDINTERNAL_COVERAGE_REPORT
+	fi
+
+  # run Unit Test
+  echo "Run Unit Test: utilTest, queryTest and cliTest"
+  $TDINTERNAL_DIR/debug/build/bin/utilTest > /dev/null 2>&1 && echo "utilTest pass!" || echo "utilTest failed!"
+  $TDINTERNAL_DIR/debug/build/bin/queryTest > /dev/null 2>&1 && echo "queryTest pass!" || echo "queryTest failed!"
+  $TDINTERNAL_DIR/debug/build/bin/cliTest > /dev/null 2>&1 && echo "cliTest pass!" || echo "cliTest failed!"
+
+	stopTaosd
+}
+
+function sendReport {
+	echo "Send Report"
+	receiver="sdsang@taosdata.com, sangshuduo@gmail.com, pxiao@taosdata.com"
+	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
+
+	cd $TDINTERNAL_DIR
+
+	sed -i 's/\x1b\[[0-9;]*m//g' $TDINTERNAL_COVERAGE_REPORT
+
+	BODY_CONTENT=`cat $TDINTERNAL_COVERAGE_REPORT`
+	echo -e "to: ${receiver}\nsubject: TDinternal coverage test report ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
+	(cat - && uuencode tdinternal-coverage-report-$today.tar.gz tdinternal-coverage-report-$today.tar.gz) | \
+	(cat - && uuencode $TDINTERNAL_COVERAGE_REPORT tdinternal-coverage-report-$today.log) | \
+	ssmtp "${receiver}" && echo "Report Sent!"
+}
+
+function lcovFunc {
+	echo "collect data by lcov"
+	cd $TDINTERNAL_DIR
+
+	sed -i 's/\x1b\[[0-9;]*m//g' $TDINTERNAL_COVERAGE_REPORT
+	# collect data
+	lcov -d . --capture --rc lcov_branch_coverage=1 --rc genhtmml_branch_coverage=1 --no-external -b $TDINTERNAL_DIR -o coverage.info
+
+	# remove exclude paths
+	lcov --remove coverage.info '*/tests/*' '*/test/*' '*/deps/*' '*/plugins/*' '*/taosdef.h' \
+    --rc lcov_branch_coverage=1 -o coverage.info
+
+	# generate result
+	lcov -l --rc lcov_branch_coverage=1 coverage.info | tee -a $TDINTERNAL_COVERAGE_REPORT
+
+	genhtml -o html coverage.info
+
+	tar czf tdinternal-coverage-report-$today.tar.gz html coverage.info $TDINTERNAL_COVERAGE_REPORT
+	# push result to coveralls.io
+#	coveralls-lcov coverage.info | tee -a tdinternal-coverage-report-$today.log
+}
+
+function stopTaosd {
+	echo "Stop taosd"
+        systemctl stop taosd
+  	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+        	pkill -TERM -x taosd
+        	sleep 1
+  		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+}
+
+WORK_DIR=/home/shuduo/work/taosdata
+
+date >> $WORK_DIR/cron.log
+echo "Run Coverage Test for TDinternal" | tee -a $WORK_DIR/cron.log
+
+stopTaosd
+buildTDinternal
+runTest
+lcovFunc
+sendReport
+stopTaosd
+
+date >> $WORK_DIR/cron.log
+echo "End of TDinternal Coverage Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/perftest-scripts/tdinternal_test.sh b/tests/perftest-scripts/tdinternal_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4de0549be06f2da7b17924a6dd87c18e007ebcc0
--- /dev/null
+++ b/tests/perftest-scripts/tdinternal_test.sh
@@ -0,0 +1,179 @@
+#!/bin/bash
+
+today=`date +"%Y%m%d"`
+TDINTERNAL_DIR=/home/shuduo/work/taosdata/TDinternal
+TDINTERNAL_TEST_REPORT=$TDINTERNAL_DIR/community/tests/tdinternal-report-$today.log
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+function buildTDinternal {
+	echo "check if TDinternal need build"
+	cd $TDINTERNAL_DIR
+	NEED_COMPILE=0
+#	git remote update
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "TDinternal repo is up-to-date"
+	else
+		echo "repo need to pull"
+#		git pull
+
+#		NEED_COMPILE=1
+	fi
+
+#	git submodule update --init --recursive
+	cd $TDINTERNAL_DIR/community
+	TDENGINE_REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	TDENGINE_LOCAL_COMMIT=`git rev-parse --short @`
+	if [ "$TDENGINE_LOCAL_COMMIT" == "$TDENGINE_REMOTE_COMMIT" ]; then
+		echo "community repo is up-to-date"
+	else
+		echo "repo need to pull"
+#		git checkout develop
+#		git pull
+#		NEED_COMPILE=1
+	fi
+
+	cd $TDINTERNAL_DIR/debug
+
+	if [[ $NEED_COMPILE -eq 1 ]]; then
+		LOCAL_COMMIT=`git rev-parse --short @`
+		rm -rf *
+		cmake .. > /dev/null
+		make > /dev/null
+	fi
+
+	make install > /dev/null
+}
+
+function runUniqueCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^./test.sh* ]]; then
+      case=`echo $line | awk '{print $NF}'`
+      start_time=`date +%s`
+      ./test.sh -f $case > /dev/null 2>&1 && \
+        echo -e "${GREEN}$case success${NC}" | tee -a $TDINTERNAL_TEST_REPORT || \
+        echo -e "${RED}$case failed${NC}" | tee -a $TDINTERNAL_TEST_REPORT
+      end_time=`date +%s`
+      echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDINTERNAL_TEST_REPORT
+    fi
+  done < $1
+}
+
+function runPyCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^python.* ]]; then
+      if [[ $line != *sleep* ]]; then
+        case=`echo $line|awk '{print $NF}'`
+        start_time=`date +%s`
+        $line > /dev/null 2>&1 && ret=0 || ret=1
+        end_time=`date +%s`
+
+        if [[ ret -eq 0 ]]; then
+          echo -e "${GREEN}$case success${NC}" | tee -a pytest-out.log
+        else
+          casename=`echo $case|sed 's/\//\-/g'`
+          find $TDINTERNAL_DIR/community/sim -name "*log" -exec tar czf $TDINTERNAL_DIR/fulltest-$today-$casename.log.tar.gz {} +
+          echo -e "${RED}$case failed and log saved${NC}" | tee -a pytest-out.log
+        fi
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+      else
+        $line > /dev/null 2>&1
+      fi
+    fi
+  done < $1
+}
+
+function runTest {
+	echo "Run Test"
+	cd $TDINTERNAL_DIR/community/tests/script
+	[ -d $TDINTERNAL_DIR/sim ] && rm -rf $TDINTERNAL_DIR/sim
+
+	[ -f $TDINTERNAL_TEST_REPORT ] && rm $TDINTERNAL_TEST_REPORT
+
+	runUniqueCaseOneByOne jenkins/basic.txt
+
+	totalSuccess=`grep 'success' $TDINTERNAL_TEST_REPORT | wc -l`
+
+	if [ "$totalSuccess" -gt "0" ]; then
+		echo -e "\n${GREEN} ### Total $totalSuccess TDinternal case(s) succeed! ### ${NC}" | tee -a $TDINTERNAL_TEST_REPORT
+	fi
+
+	totalFailed=`grep 'failed\|fault' $TDINTERNAL_TEST_REPORT | wc -l`
+	if [ "$totalFailed" -ne "0" ]; then
+		echo -e "${RED} ### Total $totalFailed TDinternal case(s) failed! ### ${NC}\n" | tee -a $TDINTERNAL_TEST_REPORT
+#  exit $totalPyFailed
+	fi
+
+	cd $TDINTERNAL_DIR/community/tests/pytest
+  [ -d $TDINTERNAL_DIR/community/sim ] && rm -rf $TDINTERNAL_DIR/community/sim
+  [ -f pytest-out.log ] && rm -f pytest-out.log
+
+	/usr/bin/time -f "Total spent: %e" ./test-all.sh full python | tee -a $TDINTERNAL_TEST_REPORT
+  runPyCaseOneByOne fulltest.sh
+
+  totalPySuccess=`grep 'success' pytest-out.log | wc -l`
+  totalPyFailed=`grep 'failed\|fault' pytest-out.log | wc -l`
+
+  cat pytest-out.log >> $TDINTERNAL_TEST_REPORT
+  if [ "$totalPySuccess" -gt "0" ]; then
+    echo -e "\n${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}" \
+      | tee -a $TDINTERNAL_TEST_REPORT
+  fi
+
+  if [ "$totalPyFailed" -ne "0" ]; then
+    echo -e "\n${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" \
+      | tee -a $TDINTERNAL_TEST_REPORT
+  fi
+}
+
+function sendReport {
+	echo "Send Report"
+	receiver="sdsang@taosdata.com, sangshuduo@gmail.com, pxiao@taosdata.com"
+	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
+
+	cd $TDINTERNAL_DIR
+
+	sed -i 's/\x1b\[[0-9;]*m//g' $TDINTERNAL_TEST_REPORT
+	BODY_CONTENT=`cat $TDINTERNAL_TEST_REPORT`
+
+  cd $TDINTERNAL_DIR
+  tar czf fulltest-$today.tar.gz fulltest-$today-*.log.tar.gz
+
+	echo -e "to: ${receiver}\nsubject: TDinternal test report ${today}, commit ID: ${LOCAL_COMMIT}\n\n${today}:\n${BODY_CONTENT}" | \
+	(cat - && uuencode $TDINTERNAL_TEST_REPORT tdinternal-report-$today.log) | \
+	ssmtp "${receiver}" && echo "Report Sent!"
+}
+
+function stopTaosd {
+	echo "Stop taosd"
+        systemctl stop taosd
+  	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+        	pkill -KILL -x taosd
+        	sleep 1
+  		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+}
+
+WORK_DIR=/home/shuduo/work/taosdata
+
+date >> $WORK_DIR/cron.log
+echo "Run Test for TDinternal" | tee -a $WORK_DIR/cron.log
+
+buildTDinternal
+runTest
+sendReport
+stopTaosd
+
+date >> $WORK_DIR/cron.log
+echo "End of TDinternal Test" | tee -a $WORK_DIR/cron.log
diff --git a/tests/pytest/account/__init__.py b/tests/pytest/account/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/account/account_create.py b/tests/pytest/account/account_create.py
new file mode 100644
index 0000000000000000000000000000000000000000..85adfff19994a3fbb12611e28d9872fb6cb1aeca
--- /dev/null
+++ b/tests/pytest/account/account_create.py
@@ -0,0 +1,41 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        try:
+            tdSql.execute("create account a&cc PASS 'pass123'")
+        except Exception as e:
+            print("create account a&cc PASS 'pass123'")
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/account/account_del.py b/tests/pytest/account/account_del.py
new file mode 100644
index 0000000000000000000000000000000000000000..7f05a39765099e896a56af9cfafcfce3957076e1
--- /dev/null
+++ b/tests/pytest/account/account_del.py
@@ -0,0 +1,52 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        print("==========step1")
+        print("drop built-in account")
+        try:
+            tdSql.execute("drop account root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+
+        print("==========step2")
+        print("drop built-in user")
+        try:
+            tdSql.execute("drop user root")
+        except Exception as e:
+            if len(e.args) > 0 and 'no rights' != e.args[0]:
+                tdLog.exit(e)
+            return
+
+        tdLog.exit("drop built-in user is error.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/alter/__init__.py b/tests/pytest/alter/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/alter/alter_replica.py b/tests/pytest/alter/alter_replica.py
new file mode 100644
index 0000000000000000000000000000000000000000..6cf0f65825920a10ab1a8de175325e535f5828e6
--- /dev/null
+++ b/tests/pytest/alter/alter_replica.py
@@ -0,0 +1,129 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self):
+        tdLog.debug("start to execute %s" % __file__)
+        tdLog.info("prepare cluster")
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        tdSql.init(self.conn.cursor())
+        tdSql.execute('reset query cache')
+        tdSql.execute('create dnode 192.168.0.2')
+        tdDnodes.deploy(2)
+        tdDnodes.start(2)
+
+        self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        tdSql.init(self.conn.cursor())
+        tdSql.execute('reset query cache')
+        tdSql.execute('create dnode 192.168.0.3')
+        tdDnodes.deploy(3)
+        tdDnodes.start(3)
+
+    def run(self):
+        tdSql.execute('create database db replica 3 days 7')
+        tdSql.execute('use db')
+        for tid in range(1, 11):
+            tdSql.execute('create table tb%d(ts timestamp, i int)' % tid)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step1")
+        startTime = 1520000010000
+        for rid in range(1, 11):
+            for tid in range(1, 11):
+                tdSql.execute(
+                    'insert into tb%d values(%ld, %d)' %
+                    (tid, startTime, rid))
+            startTime += 1
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step2")
+        tdSql.execute('alter database db replica 2')
+        tdLog.sleep(10)
+
+        tdLog.info("================= step3")
+        for rid in range(1, 11):
+            for tid in range(1, 11):
+                tdSql.execute(
+                    'insert into tb%d values(%ld, %d)' %
+                    (tid, startTime, rid))
+            startTime += 1
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step4")
+        tdSql.execute('alter database db replica 1')
+        tdLog.sleep(10)
+
+        tdLog.info("================= step5")
+        for rid in range(1, 11):
+            for tid in range(1, 11):
+                tdSql.execute(
+                    'insert into tb%d values(%ld, %d)' %
+                    (tid, startTime, rid))
+            startTime += 1
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(30)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step6")
+        tdSql.execute('alter database db replica 2')
+        tdLog.sleep(10)
+
+        tdLog.info("================= step7")
+        for rid in range(1, 11):
+            for tid in range(1, 11):
+                tdSql.execute(
+                    'insert into tb%d values(%ld, %d)' %
+                    (tid, startTime, rid))
+            startTime += 1
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(40)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step8")
+        tdSql.execute('alter database db replica 3')
+        tdLog.sleep(10)
+
+        tdLog.info("================= step9")
+        for rid in range(1, 11):
+            for tid in range(1, 11):
+                tdSql.execute(
+                    'insert into tb%d values(%ld, %d)' %
+                    (tid, startTime, rid))
+            startTime += 1
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(50)
+        tdLog.sleep(5)
+
+    def stop(self):
+        tdSql.close()
+        self.conn.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addCluster(__file__, TDTestCase())
diff --git a/tests/pytest/alter/alter_stable.py b/tests/pytest/alter/alter_stable.py
new file mode 100644
index 0000000000000000000000000000000000000000..6852f4ef4ab6730f6423ba388d4f088ca229312e
--- /dev/null
+++ b/tests/pytest/alter/alter_stable.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.types = [
+            "int",
+            "bigint",
+            "float",
+            "double",
+            "smallint",
+            "tinyint",
+            "binary(10)",
+            "nchar(10)",
+            "timestamp"]
+        self.rowNum = 300
+        self.ts = 1537146000000
+        self.step = 1000
+        self.sqlHead = "select count(*), count(c1) "
+        self.sqlTail = " from stb"
+
+    def addColumnAndCount(self):
+        for colIdx in range(len(self.types)):
+            tdSql.execute(
+                "alter table stb add column c%d %s" %
+                (colIdx + 2, self.types[colIdx]))
+            self.sqlHead = self.sqlHead + ",count(c%d) " % (colIdx + 2)
+            tdSql.query(self.sqlHead + self.sqlTail)
+
+            # count non-NULL values in each column
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 1))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 1))
+            for i in range(2, colIdx + 2):
+                print("check1: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 2))
+
+            # insert more rows
+            for k in range(self.rowNum):
+                self.ts += self.step
+                sql = "insert into tb values (%d, %d" % (self.ts, colIdx + 2)
+                for j in range(colIdx + 1):
+                    sql += ", %d" % (colIdx + 2)
+                sql += ")"
+                tdSql.execute(sql)
+
+            # count non-NULL values in each column
+            tdSql.query(self.sqlHead + self.sqlTail)
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 2))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 2))
+            for i in range(2, colIdx + 2):
+                print("check2: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 3))
+
+    def dropColumnAndCount(self):
+        tdSql.query(self.sqlHead + self.sqlTail)
+        res = []
+        for i in range(len(self.types)):
+            res.append(tdSql.getData(0, i + 2))
+
+        print(res)
+
+        for colIdx in range(len(self.types), 0, -1):
+            tdSql.execute("alter table stb drop column c%d" % (colIdx + 2))
+            # self.sqlHead = self.sqlHead + ",count(c%d) " %(colIdx + 2)
+            tdSql.query(self.sqlHead + self.sqlTail)
+
+            # count non-NULL values in each column
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 1))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 1))
+            for i in range(2, colIdx + 2):
+                print("check1: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 2))
+
+            # insert more rows
+            for k in range(self.rowNum):
+                self.ts += self.step
+                sql = "insert into tb values (%d, %d" % (self.ts, colIdx + 2)
+                for j in range(colIdx + 1):
+                    sql += ", %d" % (colIdx + 2)
+                sql += ")"
+                tdSql.execute(sql)
+
+            # count non-NULL values in each column
+            tdSql.query(self.sqlHead + self.sqlTail)
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 2))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 2))
+            for i in range(2, colIdx + 2):
+                print("check2: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 3))
+
+    def run(self):
+        # Setup params
+        db = "db"
+
+        # Create db
+        tdSql.execute("drop database if exists %s" % (db))
+        tdSql.execute("reset query cache")
+        tdSql.execute("create database %s maxrows 200 maxtables 4" % (db))
+        tdSql.execute("use %s" % (db))
+
+        # Create a table with one colunm of int type and insert 300 rows
+        tdLog.info("Create stb and tb")
+        tdSql.execute("create table stb (ts timestamp, c1 int) tags (tg1 int)")
+        tdSql.execute("create table tb using stb tags (0)")
+        tdLog.info("Insert %d rows into tb" % (self.rowNum))
+        for k in range(1, self.rowNum + 1):
+            self.ts += self.step
+            tdSql.execute("insert into tb values (%d, 1)" % (self.ts))
+
+        # Alter tb and add a column of smallint type, then query tb to see if
+        # all added column are NULL
+        self.addColumnAndCount()
+        tdDnodes.stop(1)
+        time.sleep(5)
+        tdDnodes.start(1)
+        time.sleep(5)
+        tdSql.query(self.sqlHead + self.sqlTail)
+        for i in range(2, len(self.types) + 2):
+            tdSql.checkData(0, i, self.rowNum * (len(self.types) + 2 - i))
+
+        self.dropColumnAndCount()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+#tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/alter/alter_table.py b/tests/pytest/alter/alter_table.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d4f72556b4d1d4ae1a439ab6a56b2925e3d63aa
--- /dev/null
+++ b/tests/pytest/alter/alter_table.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.types = [
+            "int",
+            "bigint",
+            "float",
+            "double",
+            "smallint",
+            "tinyint",
+            "binary(10)",
+            "nchar(10)",
+            "timestamp"]
+        self.rowNum = 300
+        self.ts = 1537146000000
+        self.step = 1000
+        self.sqlHead = "select count(*), count(c1) "
+        self.sqlTail = " from tb"
+
+    def addColumnAndCount(self):
+        for colIdx in range(len(self.types)):
+            tdSql.execute(
+                "alter table tb add column c%d %s" %
+                (colIdx + 2, self.types[colIdx]))
+            self.sqlHead = self.sqlHead + ",count(c%d) " % (colIdx + 2)
+            tdSql.query(self.sqlHead + self.sqlTail)
+
+            # count non-NULL values in each column
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 1))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 1))
+            for i in range(2, colIdx + 2):
+                print("check1: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 2))
+
+            # insert more rows
+            for k in range(self.rowNum):
+                self.ts += self.step
+                sql = "insert into tb values (%d, %d" % (self.ts, colIdx + 2)
+                for j in range(colIdx + 1):
+                    sql += ", %d" % (colIdx + 2)
+                sql += ")"
+                tdSql.execute(sql)
+
+            # count non-NULL values in each column
+            tdSql.query(self.sqlHead + self.sqlTail)
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 2))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 2))
+            for i in range(2, colIdx + 2):
+                print("check2: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 3))
+
+    def dropColumnAndCount(self):
+
+        tdSql.query(self.sqlHead + self.sqlTail)
+        res = []
+        for i in range(len(self.types)):
+            res[i] = tdSql.getData(0, i + 2)
+
+        print(res.join)
+
+        for colIdx in range(len(self.types), 0, -1):
+            tdSql.execute("alter table tb drop column c%d" % (colIdx + 2))
+            # self.sqlHead = self.sqlHead + ",count(c%d) " %(colIdx + 2)
+            tdSql.query(self.sqlHead + self.sqlTail)
+
+            # count non-NULL values in each column
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 1))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 1))
+            for i in range(2, colIdx + 2):
+                print("check1: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 2))
+
+            # insert more rows
+            for k in range(self.rowNum):
+                self.ts += self.step
+                sql = "insert into tb values (%d, %d" % (self.ts, colIdx + 2)
+                for j in range(colIdx + 1):
+                    sql += ", %d" % (colIdx + 2)
+                sql += ")"
+                tdSql.execute(sql)
+
+            # count non-NULL values in each column
+            tdSql.query(self.sqlHead + self.sqlTail)
+            tdSql.checkData(0, 0, self.rowNum * (colIdx + 2))
+            tdSql.checkData(0, 1, self.rowNum * (colIdx + 2))
+            for i in range(2, colIdx + 2):
+                print("check2: i=%d colIdx=%d" % (i, colIdx))
+                tdSql.checkData(0, i, self.rowNum * (colIdx - i + 3))
+
+    def run(self):
+        # Setup params
+        db = "db"
+
+        # Create db
+        tdSql.execute("drop database if exists %s" % (db))
+        tdSql.execute("reset query cache")
+        tdSql.execute("create database %s maxrows 200 maxtables 4" % (db))
+        tdSql.execute("use %s" % (db))
+
+        # Create a table with one colunm of int type and insert 300 rows
+        tdLog.info("Create table tb")
+        tdSql.execute("create table tb (ts timestamp, c1 int)")
+        tdLog.info("Insert %d rows into tb" % (self.rowNum))
+        for k in range(1, self.rowNum + 1):
+            self.ts += self.step
+            tdSql.execute("insert into tb values (%d, 1)" % (self.ts))
+
+        # Alter tb and add a column of smallint type, then query tb to see if
+        # all added column are NULL
+        self.addColumnAndCount()
+        tdDnodes.stop(1)
+        time.sleep(5)
+        tdDnodes.start(1)
+        time.sleep(5)
+        tdSql.query(self.sqlHead + self.sqlTail)
+        for i in range(2, len(self.types) + 2):
+            tdSql.checkData(0, i, self.rowNum * (len(self.types) + 2 - i))
+
+        self.dropColumnAndCount()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+#tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/alter/alter_table_crash.py b/tests/pytest/alter/alter_table_crash.py
new file mode 100644
index 0000000000000000000000000000000000000000..d1af022e35e636b15bc6e0fa175c7c41ed1ff640
--- /dev/null
+++ b/tests/pytest/alter/alter_table_crash.py
@@ -0,0 +1,83 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============Case 1: add column, restart taosd, drop the same colum then add it back")
+        tdSql.execute(
+            "create table st(ts timestamp, speed int) tags(loc nchar(20))")
+        tdSql.execute(
+            "insert into t1 using st tags('beijing') values(now, 1)")
+        tdSql.execute(
+            "alter table st add column tbcol binary(20)")
+
+        # restart taosd
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+
+        tdSql.execute(
+            "alter table st drop column tbcol")
+        tdSql.execute(
+            "alter table st add column tbcol binary(20)")
+
+        tdSql.query("select * from st")
+        tdSql.checkRows(1)
+
+        print("==============Case 2: keep adding columns, restart taosd")
+        tdSql.execute(
+            "create table dt(ts timestamp, tbcol1 tinyint) tags(tgcol1 tinyint)")
+        tdSql.execute(
+            "alter table dt add column tbcol2 int")
+        tdSql.execute(
+            "alter table dt add column tbcol3 smallint")
+        tdSql.execute(
+            "alter table dt add column tbcol4 bigint")
+        tdSql.execute(
+            "alter table dt add column tbcol5 float")
+        tdSql.execute(
+            "alter table dt add column tbcol6 double")
+        tdSql.execute(
+            "alter table dt add column tbcol7 bool")
+        tdSql.execute(
+            "alter table dt add column tbcol8 nchar(20)")
+        tdSql.execute(
+            "alter table dt add column tbcol9 binary(20)")
+
+        # restart taosd
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+
+        tdSql.query("select * from dt")
+        tdSql.checkRows(0)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/alter/file_corrupt.py b/tests/pytest/alter/file_corrupt.py
new file mode 100644
index 0000000000000000000000000000000000000000..28d50cdd38c9e7359f67996713f746fb0c213edb
--- /dev/null
+++ b/tests/pytest/alter/file_corrupt.py
@@ -0,0 +1,77 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        tdSql.execute(
+            'create table st (ts timestamp, v1 int, v2 int, v3 int, v4 int, v5 int) tags (t int)')
+
+        totalTables = 100
+        batchSize = 500
+        totalBatch = 60
+
+        tdLog.info(
+            "create %d tables, insert %d rows per table" %
+            (totalTables, batchSize * totalBatch))
+
+        for t in range(0, totalTables):
+            tdSql.execute('create table t%d using st tags(%d)' % (t, t))
+            # 2019-06-10 00:00:00
+            beginTs = 1560096000000
+            interval = 10000
+            for r in range(0, totalBatch):
+                sql = 'insert into t%d values ' % (t)
+                for b in range(0, batchSize):
+                    ts = beginTs + (r * batchSize + b) * interval
+                    sql += '(%d, 1, 2, 3, 4, 5)' % (ts)
+                tdSql.execute(sql)
+
+        tdLog.info("insert data finished")
+        tdSql.execute('alter table st add column v6 int')
+        tdLog.sleep(5)
+        tdLog.info("alter table finished")
+
+        tdSql.query("select count(*) from t50")
+        tdSql.checkData(0, 0, (int)(batchSize * totalBatch))
+
+        tdLog.info("insert")
+        tdSql.execute(
+            "insert into t50 values ('2019-06-13 07:59:55.000', 1, 2, 3, 4, 5, 6)")
+
+        tdLog.info("import")
+        tdSql.execute(
+            "import into t50 values ('2019-06-13 07:59:55.000', 1, 2, 3, 4, 5, 6)")
+
+        tdLog.info("query")
+        tdSql.query("select count(*) from t50")
+        tdSql.checkData(0, 0, batchSize * totalBatch + 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/client/alterDatabase.py b/tests/pytest/client/alterDatabase.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa397d16c57625d53f6f1b2772afa99ade314e1a
--- /dev/null
+++ b/tests/pytest/client/alterDatabase.py
@@ -0,0 +1,55 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.query('select database()')
+        tdSql.checkData(0, 0, "db")        
+        
+        tdSql.execute("alter database db comp 2")
+        tdSql.query("show databases")
+        tdSql.checkData(0, 14, 2)
+
+        tdSql.execute("alter database db keep 365")
+        tdSql.query("show databases")
+        tdSql.checkData(0, 7, "3650,3650,365")
+
+        tdSql.execute("alter database db quorum 2")
+        tdSql.query("show databases")
+        tdSql.checkData(0, 5, 2)
+
+        tdSql.execute("alter database db blocks 100")
+        tdSql.query("show databases")
+        tdSql.checkData(0, 9, 100)
+
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/pytest/client/client.py b/tests/pytest/client/client.py
new file mode 100644
index 0000000000000000000000000000000000000000..b40511094b3bf76825c2572c8ad747807a3f2d65
--- /dev/null
+++ b/tests/pytest/client/client.py
@@ -0,0 +1,55 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        ret = tdSql.query('select database()')
+        tdSql.checkData(0, 0, "db")        
+        
+        ret = tdSql.query('select server_status()')
+        tdSql.checkData(0, 0, 1)
+
+        ret = tdSql.query('select server_status() as result')
+        tdSql.checkData(0, 0, 1)
+
+        ret = tdSql.query('show dnodes')
+
+        ret = tdSql.execute('alter dnode "%s" debugFlag 135' % tdSql.getData(0,0))
+        tdLog.info('alter dnode "%s" debugFlag 135 -> ret: %d' % (tdSql.getData(0, 0), ret))
+
+        ret = tdSql.query('show mnodes')
+        tdSql.checkRows(1)
+
+        ret = tdSql.query('show vgroups')
+        tdSql.checkRows(0)        
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/client/twoClients.py b/tests/pytest/client/twoClients.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a1b36c55438f8ea4050bb804b739be71c570960
--- /dev/null
+++ b/tests/pytest/client/twoClients.py
@@ -0,0 +1,96 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+sys.path.insert(0, os.getcwd())
+from util.log import *
+from util.sql import *
+from util.dnodes import *
+import taos
+
+
+class TwoClients:
+    def initConnection(self):
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/home/xp/git/TDengine/sim/dnode1/cfg"        
+    
+    def run(self):
+        tdDnodes.init("")
+        tdDnodes.setTestCluster(False)
+        tdDnodes.setValgrind(False)
+
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        
+        # first client create a stable and insert data
+        conn1 = taos.connect(self.host, self.user, self.password, self.config)
+        cursor1 = conn1.cursor()
+        cursor1.execute("drop database if exists db")
+        cursor1.execute("create database db")
+        cursor1.execute("use db")
+        cursor1.execute("create table tb (ts timestamp, id int) tags(loc nchar(30))")
+        cursor1.execute("insert into t0 using tb tags('beijing') values(now, 1)")
+
+        # second client alter the table created by cleint
+        conn2 = taos.connect(self.host, self.user, self.password, self.config)
+        cursor2 = conn2.cursor() 
+        cursor2.execute("use db")       
+        cursor2.execute("alter table tb add column name nchar(30)")
+        
+        # first client should not be able to use the origin metadata
+        tdSql.init(cursor1, True)
+        tdSql.error("insert into t0 values(now, 2)")
+
+        # first client should be able to insert data with udpated medadata
+        tdSql.execute("insert into t0 values(now, 2, 'test')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+
+        # second client drop the table 
+        cursor2.execute("drop table t0")
+        cursor2.execute("create table t0 using tb tags('beijing')")
+
+        tdSql.execute("insert into t0 values(now, 2, 'test')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+
+        # error expected for two clients drop the same cloumn
+        cursor2.execute("alter table tb drop column name")
+        tdSql.error("alter table tb drop column name")
+
+        cursor2.execute("alter table tb add column speed int")
+        tdSql.error("alter table tb add column speed int")
+
+
+        tdSql.execute("alter table tb add column size int")
+        tdSql.query("describe tb")
+        tdSql.checkRows(5)
+        tdSql.checkData(0, 0, "ts")
+        tdSql.checkData(1, 0, "id")
+        tdSql.checkData(2, 0, "speed")
+        tdSql.checkData(3, 0, "size")
+        tdSql.checkData(4, 0, "loc")
+
+
+        cursor1.close()
+        cursor2.close()
+        conn1.close()
+        conn2.close()
+        
+clients = TwoClients()
+clients.initConnection()
+clients.run()
\ No newline at end of file
diff --git a/tests/pytest/client/version.py b/tests/pytest/client/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..93b302f619d2ab6da2a3a24950ae70999e968425
--- /dev/null
+++ b/tests/pytest/client/version.py
@@ -0,0 +1,53 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        sql = "select server_version()"
+        ret = tdSql.query(sql)
+        version = tdSql.getData(0, 0)[0:3]        
+        expectedVersion = "2.0"
+        if(version == expectedVersion):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion))
+        else:
+            tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion))
+
+        sql = "select client_version()"
+        ret = tdSql.query(sql)
+        version = tdSql.getData(0, 0)[0:3]        
+        expectedVersion = "2.0"
+        if(version == expectedVersion):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion))
+        else:
+            tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion))
+      
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/crash_gen.py b/tests/pytest/crash_gen.py
new file mode 100755
index 0000000000000000000000000000000000000000..1ea19dfac35678bc632357db8368fc61b359dd65
--- /dev/null
+++ b/tests/pytest/crash_gen.py
@@ -0,0 +1,2962 @@
+# -----!/usr/bin/python3.7
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+# For type hinting before definition, ref:
+# https://stackoverflow.com/questions/33533148/how-do-i-specify-that-the-return-type-of-a-method-is-the-same-as-the-class-itsel
+from __future__ import annotations
+import taos
+import crash_gen
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.log import *
+from queue import Queue, Empty
+from typing import IO
+from typing import Set
+from typing import Dict
+from typing import List
+from requests.auth import HTTPBasicAuth
+import textwrap
+import datetime
+import logging
+import time
+import random
+import threading
+import requests
+import copy
+import argparse
+import getopt
+
+import sys
+import os
+import io
+import signal
+import traceback
+
+try:
+    import psutil
+except:
+    print("Psutil module needed, please install: sudo pip3 install psutil")
+    sys.exit(-1)
+
+# Require Python 3
+if sys.version_info[0] < 3:
+    raise Exception("Must be using Python 3")
+
+
+# Global variables, tried to keep a small number.
+
+# Command-line/Environment Configurations, will set a bit later
+# ConfigNameSpace = argparse.Namespace
+gConfig = argparse.Namespace()  # Dummy value, will be replaced later
+gSvcMgr = None # TODO: refactor this hack, use dep injection
+logger = None
+
+def runThread(wt: WorkerThread):
+    wt.run()
+
+class CrashGenError(Exception):
+    def __init__(self, msg=None, errno=None):
+        self.msg = msg
+        self.errno = errno
+
+    def __str__(self):
+        return self.msg
+
+
+class WorkerThread:
+    def __init__(self, pool: ThreadPool, tid, tc: ThreadCoordinator,
+                 # te: TaskExecutor,
+                 ):  # note: main thread context!
+        # self._curStep = -1
+        self._pool = pool
+        self._tid = tid
+        self._tc = tc  # type: ThreadCoordinator
+        # self.threadIdent = threading.get_ident()
+        self._thread = threading.Thread(target=runThread, args=(self,))
+        self._stepGate = threading.Event()
+
+        # Let us have a DB connection of our own
+        if (gConfig.per_thread_db_connection):  # type: ignore
+            # print("connector_type = {}".format(gConfig.connector_type))
+            if gConfig.connector_type == 'native':
+                self._dbConn = DbConn.createNative() 
+            elif gConfig.connector_type == 'rest':
+                self._dbConn = DbConn.createRest() 
+            elif gConfig.connector_type == 'mixed':
+                if Dice.throw(2) == 0: # 1/2 chance
+                    self._dbConn = DbConn.createNative() 
+                else:
+                    self._dbConn = DbConn.createRest() 
+            else:
+                raise RuntimeError("Unexpected connector type: {}".format(gConfig.connector_type))
+
+        self._dbInUse = False  # if "use db" was executed already
+
+    def logDebug(self, msg):
+        logger.debug("    TRD[{}] {}".format(self._tid, msg))
+
+    def logInfo(self, msg):
+        logger.info("    TRD[{}] {}".format(self._tid, msg))
+
+    def dbInUse(self):
+        return self._dbInUse
+
+    def useDb(self):
+        if (not self._dbInUse):
+            self.execSql("use db")
+        self._dbInUse = True
+
+    def getTaskExecutor(self):
+        return self._tc.getTaskExecutor()
+
+    def start(self):
+        self._thread.start()  # AFTER the thread is recorded
+
+    def run(self):
+        # initialization after thread starts, in the thread context
+        # self.isSleeping = False
+        logger.info("Starting to run thread: {}".format(self._tid))
+
+        if (gConfig.per_thread_db_connection):  # type: ignore
+            logger.debug("Worker thread openning database connection")
+            self._dbConn.open()
+
+        self._doTaskLoop()
+
+        # clean up
+        if (gConfig.per_thread_db_connection):  # type: ignore
+            if self._dbConn.isOpen: #sometimes it is not open
+                self._dbConn.close()
+            else:
+                logger.warning("Cleaning up worker thread, dbConn already closed")
+
+    def _doTaskLoop(self):
+        # while self._curStep < self._pool.maxSteps:
+        # tc = ThreadCoordinator(None)
+        while True:
+            tc = self._tc  # Thread Coordinator, the overall master
+            try:
+                tc.crossStepBarrier()  # shared barrier first, INCLUDING the last one
+            except threading.BrokenBarrierError as err: # main thread timed out
+                print("_bto", end="")
+                logger.debug("[TRD] Worker thread exiting due to main thread barrier time-out")
+                break
+
+            logger.debug("[TRD] Worker thread [{}] exited barrier...".format(self._tid))
+            self.crossStepGate()   # then per-thread gate, after being tapped
+            logger.debug("[TRD] Worker thread [{}] exited step gate...".format(self._tid))
+            if not self._tc.isRunning():
+                print("_wts", end="")
+                logger.debug("[TRD] Thread Coordinator not running any more, worker thread now stopping...")
+                break
+
+            # Before we fetch the task and run it, let's ensure we properly "use" the database
+            try:
+                if (gConfig.per_thread_db_connection):  # most likely TRUE
+                    if not self._dbConn.isOpen:  # might have been closed during server auto-restart
+                        self._dbConn.open()
+                self.useDb() # might encounter exceptions. TODO: catch
+            except taos.error.ProgrammingError as err:
+                errno = Helper.convertErrno(err.errno)
+                if errno in [0x383, 0x386, 0x00B, 0x014]  : # invalid database, dropping, Unable to establish connection, Database not ready
+                    # ignore
+                    dummy = 0
+                else:
+                    print("\nCaught programming error. errno=0x{:X}, msg={} ".format(errno, err.msg))
+                    raise
+
+            # Fetch a task from the Thread Coordinator
+            logger.debug( "[TRD] Worker thread [{}] about to fetch task".format(self._tid))
+            task = tc.fetchTask()
+
+            # Execute such a task
+            logger.debug(
+                "[TRD] Worker thread [{}] about to execute task: {}".format(
+                    self._tid, task.__class__.__name__))
+            task.execute(self)
+            tc.saveExecutedTask(task)
+            logger.debug("[TRD] Worker thread [{}] finished executing task".format(self._tid))
+
+            self._dbInUse = False  # there may be changes between steps
+        # print("_wtd", end=None) # worker thread died
+
+    def verifyThreadSelf(self):  # ensure we are called by this own thread
+        if (threading.get_ident() != self._thread.ident):
+            raise RuntimeError("Unexpectly called from other threads")
+
+    def verifyThreadMain(self):  # ensure we are called by the main thread
+        if (threading.get_ident() != threading.main_thread().ident):
+            raise RuntimeError("Unexpectly called from other threads")
+
+    def verifyThreadAlive(self):
+        if (not self._thread.is_alive()):
+            raise RuntimeError("Unexpected dead thread")
+
+    # A gate is different from a barrier in that a thread needs to be "tapped"
+    def crossStepGate(self):
+        self.verifyThreadAlive()
+        self.verifyThreadSelf()  # only allowed by ourselves
+
+        # Wait again at the "gate", waiting to be "tapped"
+        logger.debug(
+            "[TRD] Worker thread {} about to cross the step gate".format(
+                self._tid))
+        self._stepGate.wait()
+        self._stepGate.clear()
+
+        # self._curStep += 1  # off to a new step...
+
+    def tapStepGate(self):  # give it a tap, release the thread waiting there
+        # self.verifyThreadAlive()
+        self.verifyThreadMain()  # only allowed for main thread
+
+        if self._thread.is_alive():
+            logger.debug("[TRD] Tapping worker thread {}".format(self._tid))
+            self._stepGate.set()  # wake up!
+            time.sleep(0)  # let the released thread run a bit
+        else:
+            print("_tad", end="") # Thread already dead
+
+    def execSql(self, sql):  # TODO: expose DbConn directly
+        return self.getDbConn().execute(sql)
+
+    def querySql(self, sql):  # TODO: expose DbConn directly
+        return self.getDbConn().query(sql)
+
+    def getQueryResult(self):
+        return self.getDbConn().getQueryResult()
+
+    def getDbConn(self):
+        if (gConfig.per_thread_db_connection):
+            return self._dbConn
+        else:
+            return self._tc.getDbManager().getDbConn()
+
+    # def querySql(self, sql): # not "execute", since we are out side the DB context
+    #     if ( gConfig.per_thread_db_connection ):
+    #         return self._dbConn.query(sql)
+    #     else:
+    #         return self._tc.getDbState().getDbConn().query(sql)
+
+# The coordinator of all worker threads, mostly running in main thread
+
+
+class ThreadCoordinator:
+    WORKER_THREAD_TIMEOUT = 60 # one minute
+
+    def __init__(self, pool: ThreadPool, dbManager):
+        self._curStep = -1  # first step is 0
+        self._pool = pool
+        # self._wd = wd
+        self._te = None  # prepare for every new step
+        self._dbManager = dbManager
+        self._executedTasks: List[Task] = []  # in a given step
+        self._lock = threading.RLock()  # sync access for a few things
+
+        self._stepBarrier = threading.Barrier(
+            self._pool.numThreads + 1)  # one barrier for all threads
+        self._execStats = ExecutionStats()
+        self._runStatus = MainExec.STATUS_RUNNING
+
+    def getTaskExecutor(self):
+        return self._te
+
+    def getDbManager(self) -> DbManager:
+        return self._dbManager
+
+    def crossStepBarrier(self, timeout=None):
+        self._stepBarrier.wait(timeout) 
+
+    def requestToStop(self):
+        self._runStatus = MainExec.STATUS_STOPPING
+        self._execStats.registerFailure("User Interruption")
+
+    def _runShouldEnd(self, transitionFailed, hasAbortedTask, workerTimeout):
+        maxSteps = gConfig.max_steps  # type: ignore
+        if self._curStep >= (maxSteps - 1): # maxStep==10, last curStep should be 9
+            return True
+        if self._runStatus != MainExec.STATUS_RUNNING:
+            return True
+        if transitionFailed:
+            return True
+        if hasAbortedTask:
+            return True
+        if workerTimeout:
+            return True
+        return False
+
+    def _hasAbortedTask(self): # from execution of previous step
+        for task in self._executedTasks:
+            if task.isAborted():
+                # print("Task aborted: {}".format(task))
+                # hasAbortedTask = True
+                return True
+        return False
+
+    def _releaseAllWorkerThreads(self, transitionFailed):
+        self._curStep += 1  # we are about to get into next step. TODO: race condition here!
+        # Now not all threads had time to go to sleep
+        logger.debug(
+            "--\r\n\n--> Step {} starts with main thread waking up".format(self._curStep))
+
+        # A new TE for the new step
+        self._te = None # set to empty first, to signal worker thread to stop
+        if not transitionFailed:  # only if not failed
+            self._te = TaskExecutor(self._curStep)
+
+        logger.debug("[TRD] Main thread waking up at step {}, tapping worker threads".format(
+                self._curStep))  # Now not all threads had time to go to sleep
+        # Worker threads will wake up at this point, and each execute it's own task
+        self.tapAllThreads() # release all worker thread from their "gate"
+
+    def _syncAtBarrier(self):
+         # Now main thread (that's us) is ready to enter a step
+        # let other threads go past the pool barrier, but wait at the
+        # thread gate
+        logger.debug("[TRD] Main thread about to cross the barrier")
+        self.crossStepBarrier(timeout=self.WORKER_THREAD_TIMEOUT)
+        self._stepBarrier.reset()  # Other worker threads should now be at the "gate"
+        logger.debug("[TRD] Main thread finished crossing the barrier")
+
+    def _doTransition(self):
+        transitionFailed = False
+        try:
+            sm = self._dbManager.getStateMachine()
+            logger.debug("[STT] starting transitions")
+            # at end of step, transiton the DB state
+            sm.transition(self._executedTasks)
+            logger.debug("[STT] transition ended")
+            # Due to limitation (or maybe not) of the Python library,
+            # we cannot share connections across threads
+            # Here we are in main thread, we cannot operate the connections created in workers
+            # Moving below to task loop
+            # if sm.hasDatabase():
+            #     for t in self._pool.threadList:
+            #         logger.debug("[DB] use db for all worker threads")
+            #         t.useDb()
+                    # t.execSql("use db") # main thread executing "use
+                    # db" on behalf of every worker thread
+        except taos.error.ProgrammingError as err:
+            if (err.msg == 'network unavailable'):  # broken DB connection
+                logger.info("DB connection broken, execution failed")
+                traceback.print_stack()
+                transitionFailed = True
+                self._te = None  # Not running any more
+                self._execStats.registerFailure("Broken DB Connection")
+                # continue # don't do that, need to tap all threads at
+                # end, and maybe signal them to stop
+            else:
+                raise
+        return transitionFailed
+
+        self.resetExecutedTasks()  # clear the tasks after we are done
+        # Get ready for next step
+        logger.debug("<-- Step {} finished, trasition failed = {}".format(self._curStep, transitionFailed))
+        return transitionFailed
+
+    def run(self):
+        self._pool.createAndStartThreads(self)
+
+        # Coordinate all threads step by step
+        self._curStep = -1  # not started yet
+        
+        self._execStats.startExec()  # start the stop watch
+        transitionFailed = False
+        hasAbortedTask = False
+        workerTimeout = False
+        while not self._runShouldEnd(transitionFailed, hasAbortedTask, workerTimeout):
+            if not gConfig.debug: # print this only if we are not in debug mode                
+                print(".", end="", flush=True)
+                        
+            try:
+                self._syncAtBarrier() # For now just cross the barrier
+            except threading.BrokenBarrierError as err:
+                logger.info("Main loop aborted, caused by worker thread time-out")
+                self._execStats.registerFailure("Aborted due to worker thread timeout")
+                print("\n\nWorker Thread time-out detected, important thread info:")
+                ts = ThreadStacks()
+                ts.print(filterInternal=True)
+                workerTimeout = True
+                break
+
+            # At this point, all threads should be pass the overall "barrier" and before the per-thread "gate"
+            # We use this period to do house keeping work, when all worker
+            # threads are QUIET.
+            hasAbortedTask = self._hasAbortedTask() # from previous step
+            if hasAbortedTask: 
+                logger.info("Aborted task encountered, exiting test program")
+                self._execStats.registerFailure("Aborted Task Encountered")
+                break # do transition only if tasks are error free
+
+            # Ending previous step
+            try:
+                transitionFailed = self._doTransition() # To start, we end step -1 first
+            except taos.error.ProgrammingError as err:
+                transitionFailed = True
+                errno2 = Helper.convertErrno(err.errno)  # correct error scheme
+                errMsg = "Transition failed: errno=0x{:X}, msg: {}".format(errno2, err)
+                logger.info(errMsg)
+                self._execStats.registerFailure(errMsg)
+
+            # Then we move on to the next step
+            self._releaseAllWorkerThreads(transitionFailed)                    
+
+        if hasAbortedTask or transitionFailed : # abnormal ending, workers waiting at "gate"
+            logger.debug("Abnormal ending of main thraed")
+        elif workerTimeout:
+            logger.debug("Abnormal ending of main thread, due to worker timeout")
+        else: # regular ending, workers waiting at "barrier"
+            logger.debug("Regular ending, main thread waiting for all worker threads to stop...")
+            self._syncAtBarrier()
+
+        self._te = None  # No more executor, time to end
+        logger.debug("Main thread tapping all threads one last time...")
+        self.tapAllThreads()  # Let the threads run one last time
+
+        logger.debug("\r\n\n--> Main thread ready to finish up...")
+        logger.debug("Main thread joining all threads")
+        self._pool.joinAll()  # Get all threads to finish
+        logger.info("\nAll worker threads finished")
+        self._execStats.endExec()
+
+    def printStats(self):
+        self._execStats.printStats()
+
+    def isFailed(self):
+        return self._execStats.isFailed()
+
+    def getExecStats(self):
+        return self._execStats
+
+    def tapAllThreads(self):  # in a deterministic manner
+        wakeSeq = []
+        for i in range(self._pool.numThreads):  # generate a random sequence
+            if Dice.throw(2) == 1:
+                wakeSeq.append(i)
+            else:
+                wakeSeq.insert(0, i)
+        logger.debug(
+            "[TRD] Main thread waking up worker threads: {}".format(
+                str(wakeSeq)))
+        # TODO: set dice seed to a deterministic value
+        for i in wakeSeq:
+            # TODO: maybe a bit too deep?!
+            self._pool.threadList[i].tapStepGate()
+            time.sleep(0)  # yield
+
+    def isRunning(self):
+        return self._te is not None
+
+    def fetchTask(self) -> Task:
+        if (not self.isRunning()):  # no task
+            raise RuntimeError("Cannot fetch task when not running")
+        # return self._wd.pickTask()
+        # Alternatively, let's ask the DbState for the appropriate task
+        # dbState = self.getDbState()
+        # tasks = dbState.getTasksAtState() # TODO: create every time?
+        # nTasks = len(tasks)
+        # i = Dice.throw(nTasks)
+        # logger.debug(" (dice:{}/{}) ".format(i, nTasks))
+        # # return copy.copy(tasks[i]) # Needs a fresh copy, to save execution results, etc.
+        # return tasks[i].clone() # TODO: still necessary?
+        # pick a task type for current state
+        taskType = self.getDbManager().getStateMachine().pickTaskType()
+        return taskType(
+            self.getDbManager(),
+            self._execStats)  # create a task from it
+
+    def resetExecutedTasks(self):
+        self._executedTasks = []  # should be under single thread
+
+    def saveExecutedTask(self, task):
+        with self._lock:
+            self._executedTasks.append(task)
+
+# We define a class to run a number of threads in locking steps.
+
+class Helper:
+    @classmethod
+    def convertErrno(cls, errno):
+        return errno if (errno > 0) else 0x80000000 + errno
+
+class ThreadPool:
+    def __init__(self, numThreads, maxSteps):
+        self.numThreads = numThreads
+        self.maxSteps = maxSteps
+        # Internal class variables
+        self.curStep = 0
+        self.threadList = []  # type: List[WorkerThread]
+
+    # starting to run all the threads, in locking steps
+    def createAndStartThreads(self, tc: ThreadCoordinator):
+        for tid in range(0, self.numThreads):  # Create the threads
+            workerThread = WorkerThread(self, tid, tc)
+            self.threadList.append(workerThread)
+            workerThread.start()  # start, but should block immediately before step 0
+
+    def joinAll(self):
+        for workerThread in self.threadList:
+            logger.debug("Joining thread...")
+            workerThread._thread.join()
+
+# A queue of continguous POSITIVE integers, used by DbManager to generate continuous numbers
+# for new table names
+
+
+class LinearQueue():
+    def __init__(self):
+        self.firstIndex = 1  # 1st ever element
+        self.lastIndex = 0
+        self._lock = threading.RLock()  # our functions may call each other
+        self.inUse = set()  # the indexes that are in use right now
+
+    def toText(self):
+        return "[{}..{}], in use: {}".format(
+            self.firstIndex, self.lastIndex, self.inUse)
+
+    # Push (add new element, largest) to the tail, and mark it in use
+    def push(self):
+        with self._lock:
+            # if ( self.isEmpty() ):
+            #     self.lastIndex = self.firstIndex
+            #     return self.firstIndex
+            # Otherwise we have something
+            self.lastIndex += 1
+            self.allocate(self.lastIndex)
+            # self.inUse.add(self.lastIndex) # mark it in use immediately
+            return self.lastIndex
+
+    def pop(self):
+        with self._lock:
+            if (self.isEmpty()):
+                # raise RuntimeError("Cannot pop an empty queue")
+                return False  # TODO: None?
+
+            index = self.firstIndex
+            if (index in self.inUse):
+                return False
+
+            self.firstIndex += 1
+            return index
+
+    def isEmpty(self):
+        return self.firstIndex > self.lastIndex
+
+    def popIfNotEmpty(self):
+        with self._lock:
+            if (self.isEmpty()):
+                return 0
+            return self.pop()
+
+    def allocate(self, i):
+        with self._lock:
+            # logger.debug("LQ allocating item {}".format(i))
+            if (i in self.inUse):
+                raise RuntimeError(
+                    "Cannot re-use same index in queue: {}".format(i))
+            self.inUse.add(i)
+
+    def release(self, i):
+        with self._lock:
+            # logger.debug("LQ releasing item {}".format(i))
+            self.inUse.remove(i)  # KeyError possible, TODO: why?
+
+    def size(self):
+        return self.lastIndex + 1 - self.firstIndex
+
+    def pickAndAllocate(self):
+        if (self.isEmpty()):
+            return None
+        with self._lock:
+            cnt = 0  # counting the interations
+            while True:
+                cnt += 1
+                if (cnt > self.size() * 10):  # 10x iteration already
+                    # raise RuntimeError("Failed to allocate LinearQueue element")
+                    return None
+                ret = Dice.throwRange(self.firstIndex, self.lastIndex + 1)
+                if (ret not in self.inUse):
+                    self.allocate(ret)
+                    return ret
+
+
+class DbConn:
+    TYPE_NATIVE = "native-c"
+    TYPE_REST =   "rest-api"
+    TYPE_INVALID = "invalid"
+
+    @classmethod
+    def create(cls, connType):
+        if connType == cls.TYPE_NATIVE:
+            return DbConnNative()
+        elif connType == cls.TYPE_REST:
+            return DbConnRest()
+        else:
+            raise RuntimeError(
+                "Unexpected connection type: {}".format(connType))
+
+    @classmethod
+    def createNative(cls):
+        return cls.create(cls.TYPE_NATIVE)
+
+    @classmethod
+    def createRest(cls):
+        return cls.create(cls.TYPE_REST)
+
+    def __init__(self):
+        self.isOpen = False
+        self._type = self.TYPE_INVALID
+        self._lastSql = None
+
+    def getLastSql(self):
+        return self._lastSql
+
+    def open(self):
+        if (self.isOpen):
+            raise RuntimeError("Cannot re-open an existing DB connection")
+
+        # below implemented by child classes
+        self.openByType()
+
+        logger.debug("[DB] data connection opened, type = {}".format(self._type))
+        self.isOpen = True
+
+    def resetDb(self):  # reset the whole database, etc.
+        if (not self.isOpen):
+            raise RuntimeError("Cannot reset database until connection is open")
+        # self._tdSql.prepare() # Recreate database, etc.
+
+        self.execute('drop database if exists db')
+        logger.debug("Resetting DB, dropped database")
+        # self._cursor.execute('create database db')
+        # self._cursor.execute('use db')
+        # tdSql.execute('show databases')
+
+    def queryScalar(self, sql) -> int:
+        return self._queryAny(sql)
+
+    def queryString(self, sql) -> str:
+        return self._queryAny(sql)
+
+    def _queryAny(self, sql):  # actual query result as an int
+        if (not self.isOpen):
+            raise RuntimeError("Cannot query database until connection is open")
+        nRows = self.query(sql)
+        if nRows != 1:
+            raise RuntimeError("Unexpected result for query: {}, rows = {}".format(sql, nRows))
+        if self.getResultRows() != 1 or self.getResultCols() != 1:
+            raise RuntimeError("Unexpected result set for query: {}".format(sql))
+        return self.getQueryResult()[0][0]
+
+    def use(self, dbName):
+        self.execute("use {}".format(dbName))
+
+    def hasDatabases(self):
+        return self.query("show databases") > 1 # We now have a "log" database by default
+
+    def hasTables(self):
+        return self.query("show tables") > 0
+
+    def execute(self, sql):
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+    def query(self, sql) -> int: # return num rows returned
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+    def openByType(self):
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+    def getQueryResult(self):
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+    def getResultRows(self):
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+    def getResultCols(self):
+        raise RuntimeError("Unexpected execution, should be overriden")
+
+# Sample: curl -u root:taosdata -d "show databases" localhost:6020/rest/sql
+
+
+class DbConnRest(DbConn):
+    def __init__(self):
+        super().__init__()
+        self._type = self.TYPE_REST
+        self._url = "http://localhost:6041/rest/sql"  # fixed for now
+        self._result = None
+
+    def openByType(self):  # Open connection
+        pass  # do nothing, always open
+
+    def close(self):
+        if (not self.isOpen):
+            raise RuntimeError("Cannot clean up database until connection is open")
+        # Do nothing for REST
+        logger.debug("[DB] REST Database connection closed")
+        self.isOpen = False
+
+    def _doSql(self, sql):
+        self._lastSql = sql # remember this, last SQL attempted
+        try:
+            r = requests.post(self._url, 
+                data = sql,
+                auth = HTTPBasicAuth('root', 'taosdata'))         
+        except:
+            print("REST API Failure (TODO: more info here)")
+            raise
+        rj = r.json()
+        # Sanity check for the "Json Result"
+        if ('status' not in rj):
+            raise RuntimeError("No status in REST response")
+
+        if rj['status'] == 'error':  # clearly reported error
+            if ('code' not in rj):  # error without code
+                raise RuntimeError("REST error return without code")
+            errno = rj['code']  # May need to massage this in the future
+            # print("Raising programming error with REST return: {}".format(rj))
+            raise taos.error.ProgrammingError(
+                rj['desc'], errno)  # todo: check existance of 'desc'
+
+        if rj['status'] != 'succ':  # better be this
+            raise RuntimeError(
+                "Unexpected REST return status: {}".format(
+                    rj['status']))
+
+        nRows = rj['rows'] if ('rows' in rj) else 0
+        self._result = rj
+        return nRows
+
+    def execute(self, sql):
+        if (not self.isOpen):
+            raise RuntimeError(
+                "Cannot execute database commands until connection is open")
+        logger.debug("[SQL-REST] Executing SQL: {}".format(sql))
+        nRows = self._doSql(sql)
+        logger.debug(
+            "[SQL-REST] Execution Result, nRows = {}, SQL = {}".format(nRows, sql))
+        return nRows
+
+    def query(self, sql):  # return rows affected
+        return self.execute(sql)
+
+    def getQueryResult(self):
+        return self._result['data']
+
+    def getResultRows(self):
+        print(self._result)
+        raise RuntimeError("TBD")
+        # return self._tdSql.queryRows
+
+    def getResultCols(self):
+        print(self._result)
+        raise RuntimeError("TBD")
+
+    # Duplicate code from TDMySQL, TODO: merge all this into DbConnNative
+
+
+class MyTDSql:
+    def __init__(self, hostAddr, cfgPath):
+        # Make the DB connection
+        self._conn = taos.connect(host=hostAddr, config=cfgPath) 
+        self._cursor = self._conn.cursor()
+
+        self.queryRows = 0
+        self.queryCols = 0
+        self.affectedRows = 0
+
+    # def init(self, cursor, log=True):
+    #     self.cursor = cursor
+        # if (log):
+        #     caller = inspect.getframeinfo(inspect.stack()[1][0])
+        #     self.cursor.log(caller.filename + ".sql")
+
+    def close(self):
+        self._conn.close() # TODO: very important, cursor close does NOT close DB connection!
+        self._cursor.close()
+
+    def query(self, sql):
+        self.sql = sql
+        try:
+            self._cursor.execute(sql)
+            self.queryResult = self._cursor.fetchall()
+            self.queryRows = len(self.queryResult)
+            self.queryCols = len(self._cursor.description)
+        except Exception as e:
+            # caller = inspect.getframeinfo(inspect.stack()[1][0])
+            # args = (caller.filename, caller.lineno, sql, repr(e))
+            # tdLog.exit("%s(%d) failed: sql:%s, %s" % args)
+            raise
+        return self.queryRows
+
+    def execute(self, sql):
+        self.sql = sql
+        try:
+            self.affectedRows = self._cursor.execute(sql)
+        except Exception as e:
+            # caller = inspect.getframeinfo(inspect.stack()[1][0])
+            # args = (caller.filename, caller.lineno, sql, repr(e))
+            # tdLog.exit("%s(%d) failed: sql:%s, %s" % args)
+            raise
+        return self.affectedRows
+
+
+class DbConnNative(DbConn):
+    # Class variables
+    _lock = threading.Lock()
+    _connInfoDisplayed = False
+    totalConnections = 0 # Not private
+
+    def __init__(self):
+        super().__init__()
+        self._type = self.TYPE_NATIVE
+        self._conn = None
+        # self._cursor = None        
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("communit")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        buildPath = None
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        if buildPath == None:
+            raise RuntimeError("Failed to determine buildPath, selfPath={}, projPath={}"
+                .format(selfPath, projPath))
+        return buildPath
+
+    
+    def openByType(self):  # Open connection
+        cfgPath = self.getBuildPath() + "/test/cfg"
+        hostAddr = "127.0.0.1"
+
+        cls = self.__class__ # Get the class, to access class variables
+        with cls._lock: # force single threading for opening DB connections. # TODO: whaaat??!!!
+            if not cls._connInfoDisplayed:
+                cls._connInfoDisplayed = True # updating CLASS variable
+                logger.info("Initiating TAOS native connection to {}, using config at {}".format(hostAddr, cfgPath))                    
+            # Make the connection         
+            # self._conn = taos.connect(host=hostAddr, config=cfgPath)  # TODO: make configurable
+            # self._cursor = self._conn.cursor()
+            # Record the count in the class
+            self._tdSql = MyTDSql(hostAddr, cfgPath) # making DB connection
+            cls.totalConnections += 1 
+        
+        self._tdSql.execute('reset query cache')
+        # self._cursor.execute('use db') # do this at the beginning of every
+
+        # Open connection
+        # self._tdSql = MyTDSql()
+        # self._tdSql.init(self._cursor)
+        
+    def close(self):
+        if (not self.isOpen):
+            raise RuntimeError("Cannot clean up database until connection is open")
+        self._tdSql.close()
+        # Decrement the class wide counter
+        cls = self.__class__ # Get the class, to access class variables
+        with cls._lock:
+            cls.totalConnections -= 1
+
+        logger.debug("[DB] Database connection closed")
+        self.isOpen = False
+
+    def execute(self, sql):
+        if (not self.isOpen):
+            raise RuntimeError("Cannot execute database commands until connection is open")
+        logger.debug("[SQL] Executing SQL: {}".format(sql))
+        self._lastSql = sql
+        nRows = self._tdSql.execute(sql)
+        logger.debug(
+            "[SQL] Execution Result, nRows = {}, SQL = {}".format(
+                nRows, sql))
+        return nRows
+
+    def query(self, sql):  # return rows affected
+        if (not self.isOpen):
+            raise RuntimeError(
+                "Cannot query database until connection is open")
+        logger.debug("[SQL] Executing SQL: {}".format(sql))
+        self._lastSql = sql
+        nRows = self._tdSql.query(sql)
+        logger.debug(
+            "[SQL] Query Result, nRows = {}, SQL = {}".format(
+                nRows, sql))
+        return nRows
+        # results are in: return self._tdSql.queryResult
+
+    def getQueryResult(self):
+        return self._tdSql.queryResult
+
+    def getResultRows(self):
+        return self._tdSql.queryRows
+
+    def getResultCols(self):
+        return self._tdSql.queryCols
+
+
+class AnyState:
+    STATE_INVALID = -1
+    STATE_EMPTY = 0  # nothing there, no even a DB
+    STATE_DB_ONLY = 1  # we have a DB, but nothing else
+    STATE_TABLE_ONLY = 2  # we have a table, but totally empty
+    STATE_HAS_DATA = 3  # we have some data in the table
+    _stateNames = ["Invalid", "Empty", "DB_Only", "Table_Only", "Has_Data"]
+
+    STATE_VAL_IDX = 0
+    CAN_CREATE_DB = 1
+    CAN_DROP_DB = 2
+    CAN_CREATE_FIXED_SUPER_TABLE = 3
+    CAN_DROP_FIXED_SUPER_TABLE = 4
+    CAN_ADD_DATA = 5
+    CAN_READ_DATA = 6
+
+    def __init__(self):
+        self._info = self.getInfo()
+
+    def __str__(self):
+        # -1 hack to accomodate the STATE_INVALID case
+        return self._stateNames[self._info[self.STATE_VAL_IDX] + 1]
+
+    def getInfo(self):
+        raise RuntimeError("Must be overriden by child classes")
+
+    def equals(self, other):
+        if isinstance(other, int):
+            return self.getValIndex() == other
+        elif isinstance(other, AnyState):
+            return self.getValIndex() == other.getValIndex()
+        else:
+            raise RuntimeError(
+                "Unexpected comparison, type = {}".format(
+                    type(other)))
+
+    def verifyTasksToState(self, tasks, newState):
+        raise RuntimeError("Must be overriden by child classes")
+
+    def getValIndex(self):
+        return self._info[self.STATE_VAL_IDX]
+
+    def getValue(self):
+        return self._info[self.STATE_VAL_IDX]
+
+    def canCreateDb(self):
+        return self._info[self.CAN_CREATE_DB]
+
+    def canDropDb(self):
+        return self._info[self.CAN_DROP_DB]
+
+    def canCreateFixedSuperTable(self):
+        return self._info[self.CAN_CREATE_FIXED_SUPER_TABLE]
+
+    def canDropFixedSuperTable(self):
+        return self._info[self.CAN_DROP_FIXED_SUPER_TABLE]
+
+    def canAddData(self):
+        return self._info[self.CAN_ADD_DATA]
+
+    def canReadData(self):
+        return self._info[self.CAN_READ_DATA]
+
+    def assertAtMostOneSuccess(self, tasks, cls):
+        sCnt = 0
+        for task in tasks:
+            if not isinstance(task, cls):
+                continue
+            if task.isSuccess():
+                # task.logDebug("Task success found")
+                sCnt += 1
+                if (sCnt >= 2):
+                    raise RuntimeError(
+                        "Unexpected more than 1 success with task: {}".format(cls))
+
+    def assertIfExistThenSuccess(self, tasks, cls):
+        sCnt = 0
+        exists = False
+        for task in tasks:
+            if not isinstance(task, cls):
+                continue
+            exists = True  # we have a valid instance
+            if task.isSuccess():
+                sCnt += 1
+        if (exists and sCnt <= 0):
+            raise RuntimeError(
+                "Unexpected zero success for task: {}".format(cls))
+
+    def assertNoTask(self, tasks, cls):
+        for task in tasks:
+            if isinstance(task, cls):
+                raise CrashGenError(
+                    "This task: {}, is not expected to be present, given the success/failure of others".format(cls.__name__))
+
+    def assertNoSuccess(self, tasks, cls):
+        for task in tasks:
+            if isinstance(task, cls):
+                if task.isSuccess():
+                    raise RuntimeError(
+                        "Unexpected successful task: {}".format(cls))
+
+    def hasSuccess(self, tasks, cls):
+        for task in tasks:
+            if not isinstance(task, cls):
+                continue
+            if task.isSuccess():
+                return True
+        return False
+
+    def hasTask(self, tasks, cls):
+        for task in tasks:
+            if isinstance(task, cls):
+                return True
+        return False
+
+
+class StateInvalid(AnyState):
+    def getInfo(self):
+        return [
+            self.STATE_INVALID,
+            False, False,  # can create/drop Db
+            False, False,  # can create/drop fixed table
+            False, False,  # can insert/read data with fixed table
+        ]
+
+    # def verifyTasksToState(self, tasks, newState):
+
+
+class StateEmpty(AnyState):
+    def getInfo(self):
+        return [
+            self.STATE_EMPTY,
+            True, False,  # can create/drop Db
+            False, False,  # can create/drop fixed table
+            False, False,  # can insert/read data with fixed table
+        ]
+
+    def verifyTasksToState(self, tasks, newState):
+        if (self.hasSuccess(tasks, TaskCreateDb)
+                ):  # at EMPTY, if there's succes in creating DB
+            if (not self.hasTask(tasks, TaskDropDb)):  # and no drop_db tasks
+                # we must have at most one. TODO: compare numbers
+                self.assertAtMostOneSuccess(tasks, TaskCreateDb)
+
+
+class StateDbOnly(AnyState):
+    def getInfo(self):
+        return [
+            self.STATE_DB_ONLY,
+            False, True,
+            True, False,
+            False, False,
+        ]
+
+    def verifyTasksToState(self, tasks, newState):
+        if (not self.hasTask(tasks, TaskCreateDb)):
+            # only if we don't create any more
+            self.assertAtMostOneSuccess(tasks, TaskDropDb)
+
+        # TODO: restore the below, the problem exists, although unlikely in real-world
+        # if (gSvcMgr!=None) and gSvcMgr.isRestarting():     
+        # if (gSvcMgr == None) or (not gSvcMgr.isRestarting()) : 
+        #     self.assertIfExistThenSuccess(tasks, TaskDropDb)       
+
+
+class StateSuperTableOnly(AnyState):
+    def getInfo(self):
+        return [
+            self.STATE_TABLE_ONLY,
+            False, True,
+            False, True,
+            True, True,
+        ]
+
+    def verifyTasksToState(self, tasks, newState):
+        if (self.hasSuccess(tasks, TaskDropSuperTable)
+                ):  # we are able to drop the table
+            #self.assertAtMostOneSuccess(tasks, TaskDropSuperTable)
+            # we must have had recreted it
+            self.hasSuccess(tasks, TaskCreateSuperTable)
+
+            # self._state = self.STATE_DB_ONLY
+        # elif ( self.hasSuccess(tasks, AddFixedDataTask) ): # no success dropping the table, but added data
+        #     self.assertNoTask(tasks, DropFixedTableTask) # not true in massively parrallel cases
+            # self._state = self.STATE_HAS_DATA
+        # elif ( self.hasSuccess(tasks, ReadFixedDataTask) ): # no success in prev cases, but was able to read data
+            # self.assertNoTask(tasks, DropFixedTableTask)
+            # self.assertNoTask(tasks, AddFixedDataTask)
+            # self._state = self.STATE_TABLE_ONLY # no change
+        # else: # did not drop table, did not insert data, did not read successfully, that is impossible
+        #     raise RuntimeError("Unexpected no-success scenarios")
+        # TODO: need to revamp!!
+
+
+class StateHasData(AnyState):
+    def getInfo(self):
+        return [
+            self.STATE_HAS_DATA,
+            False, True,
+            False, True,
+            True, True,
+        ]
+
+    def verifyTasksToState(self, tasks, newState):
+        if (newState.equals(AnyState.STATE_EMPTY)):
+            self.hasSuccess(tasks, TaskDropDb)
+            if (not self.hasTask(tasks, TaskCreateDb)):
+                self.assertAtMostOneSuccess(tasks, TaskDropDb)  # TODO: dicy
+        elif (newState.equals(AnyState.STATE_DB_ONLY)):  # in DB only
+            if (not self.hasTask(tasks, TaskCreateDb)
+                ):  # without a create_db task
+                # we must have drop_db task
+                self.assertNoTask(tasks, TaskDropDb)
+            self.hasSuccess(tasks, TaskDropSuperTable)
+            # self.assertAtMostOneSuccess(tasks, DropFixedSuperTableTask) # TODO: dicy
+        # elif ( newState.equals(AnyState.STATE_TABLE_ONLY) ): # data deleted
+            # self.assertNoTask(tasks, TaskDropDb)
+            # self.assertNoTask(tasks, TaskDropSuperTable)
+            # self.assertNoTask(tasks, TaskAddData)
+            # self.hasSuccess(tasks, DeleteDataTasks)
+        else:  # should be STATE_HAS_DATA
+            if (not self.hasTask(tasks, TaskCreateDb)
+                ):  # only if we didn't create one
+                # we shouldn't have dropped it
+                self.assertNoTask(tasks, TaskDropDb)
+            if (not self.hasTask(tasks, TaskCreateSuperTable)
+                    ):  # if we didn't create the table
+                # we should not have a task that drops it
+                self.assertNoTask(tasks, TaskDropSuperTable)
+            # self.assertIfExistThenSuccess(tasks, ReadFixedDataTask)
+
+
+class StateMechine:
+    def __init__(self, dbConn):
+        self._dbConn = dbConn
+        self._curState = self._findCurrentState()  # starting state
+        # transitition target probabilities, indexed with value of STATE_EMPTY,
+        # STATE_DB_ONLY, etc.
+        self._stateWeights = [1, 2, 10, 40]
+
+    def getCurrentState(self):
+        return self._curState
+
+    def hasDatabase(self):
+        return self._curState.canDropDb()  # ha, can drop DB means it has one
+
+    # May be slow, use cautionsly...
+    def getTaskTypes(self):  # those that can run (directly/indirectly) from the current state
+        def typesToStrings(types):
+            ss = []
+            for t in types:
+                ss.append(t.__name__)
+            return ss
+
+        allTaskClasses = StateTransitionTask.__subclasses__()  # all state transition tasks
+        firstTaskTypes = []
+        for tc in allTaskClasses:
+            # t = tc(self) # create task object
+            if tc.canBeginFrom(self._curState):
+                firstTaskTypes.append(tc)
+        # now we have all the tasks that can begin directly from the current
+        # state, let's figure out the INDIRECT ones
+        taskTypes = firstTaskTypes.copy()  # have to have these
+        for task1 in firstTaskTypes:  # each task type gathered so far
+            endState = task1.getEndState()  # figure the end state
+            if endState is None:  # does not change end state
+                continue  # no use, do nothing
+            for tc in allTaskClasses:  # what task can further begin from there?
+                if tc.canBeginFrom(endState) and (tc not in firstTaskTypes):
+                    taskTypes.append(tc)  # gather it
+
+        if len(taskTypes) <= 0:
+            raise RuntimeError(
+                "No suitable task types found for state: {}".format(
+                    self._curState))
+        logger.debug(
+            "[OPS] Tasks found for state {}: {}".format(
+                self._curState,
+                typesToStrings(taskTypes)))
+        return taskTypes
+
+    def _findCurrentState(self):
+        dbc = self._dbConn
+        ts = time.time()  # we use this to debug how fast/slow it is to do the various queries to find the current DB state
+        if not dbc.hasDatabases():  # no database?!
+            logger.debug( "[STT] empty database found, between {} and {}".format(ts, time.time()))
+            return StateEmpty()
+        # did not do this when openning connection, and this is NOT the worker
+        # thread, which does this on their own
+        dbc.use("db")
+        if not dbc.hasTables():  # no tables
+            logger.debug("[STT] DB_ONLY found, between {} and {}".format(ts, time.time()))
+            return StateDbOnly()
+
+        sTable = DbManager.getFixedSuperTable()
+        if sTable.hasRegTables(dbc):  # no regular tables
+            logger.debug("[STT] SUPER_TABLE_ONLY found, between {} and {}".format(ts, time.time()))
+            return StateSuperTableOnly()
+        else:  # has actual tables
+            logger.debug("[STT] HAS_DATA found, between {} and {}".format(ts, time.time()))
+            return StateHasData()
+
+    def transition(self, tasks):
+        if (len(tasks) == 0):  # before 1st step, or otherwise empty
+            logger.debug("[STT] Starting State: {}".format(self._curState))
+            return  # do nothing
+
+        # this should show up in the server log, separating steps
+        self._dbConn.execute("show dnodes")
+
+        # Generic Checks, first based on the start state
+        if self._curState.canCreateDb():
+            self._curState.assertIfExistThenSuccess(tasks, TaskCreateDb)
+            # self.assertAtMostOneSuccess(tasks, CreateDbTask) # not really, in
+            # case of multiple creation and drops
+
+        if self._curState.canDropDb():
+            if gSvcMgr == None: # only if we are running as client-only
+                self._curState.assertIfExistThenSuccess(tasks, TaskDropDb)
+            # self.assertAtMostOneSuccess(tasks, DropDbTask) # not really in
+            # case of drop-create-drop
+
+        # if self._state.canCreateFixedTable():
+            # self.assertIfExistThenSuccess(tasks, CreateFixedTableTask) # Not true, DB may be dropped
+            # self.assertAtMostOneSuccess(tasks, CreateFixedTableTask) # not
+            # really, in case of create-drop-create
+
+        # if self._state.canDropFixedTable():
+            # self.assertIfExistThenSuccess(tasks, DropFixedTableTask) # Not True, the whole DB may be dropped
+            # self.assertAtMostOneSuccess(tasks, DropFixedTableTask) # not
+            # really in case of drop-create-drop
+
+        # if self._state.canAddData():
+        # self.assertIfExistThenSuccess(tasks, AddFixedDataTask)  # not true
+        # actually
+
+        # if self._state.canReadData():
+            # Nothing for sure
+
+        newState = self._findCurrentState()
+        logger.debug("[STT] New DB state determined: {}".format(newState))
+        # can old state move to new state through the tasks?
+        self._curState.verifyTasksToState(tasks, newState)
+        self._curState = newState
+
+    def pickTaskType(self):
+        # all the task types we can choose from at curent state
+        taskTypes = self.getTaskTypes()
+        weights = []
+        for tt in taskTypes:
+            endState = tt.getEndState()
+            if endState is not None:
+                # TODO: change to a method
+                weights.append(self._stateWeights[endState.getValIndex()])
+            else:
+                # read data task, default to 10: TODO: change to a constant
+                weights.append(10)
+        i = self._weighted_choice_sub(weights)
+        # logger.debug(" (weighted random:{}/{}) ".format(i, len(taskTypes)))
+        return taskTypes[i]
+
+    # ref:
+    # https://eli.thegreenplace.net/2010/01/22/weighted-random-generation-in-python/
+    def _weighted_choice_sub(self, weights):
+        # TODO: use our dice to ensure it being determinstic?
+        rnd = random.random() * sum(weights)
+        for i, w in enumerate(weights):
+            rnd -= w
+            if rnd < 0:
+                return i
+
+# Manager of the Database Data/Connection
+
+
+class DbManager():
+    def __init__(self, resetDb=True):
+        self.tableNumQueue = LinearQueue()
+        # datetime.datetime(2019, 1, 1) # initial date time tick
+        self._lastTick = self.setupLastTick()
+        self._lastInt = 0  # next one is initial integer
+        self._lock = threading.RLock()
+
+        # self.openDbServerConnection()
+        self._dbConn = DbConn.createNative() if (
+            gConfig.connector_type == 'native') else DbConn.createRest()
+        try:
+            self._dbConn.open()  # may throw taos.error.ProgrammingError: disconnected
+        except taos.error.ProgrammingError as err:
+            # print("Error type: {}, msg: {}, value: {}".format(type(err), err.msg, err))
+            if (err.msg == 'client disconnected'):  # cannot open DB connection
+                print(
+                    "Cannot establish DB connection, please re-run script without parameter, and follow the instructions.")
+                sys.exit(2)
+            else:
+                print("Failed to connect to DB, errno = {}, msg: {}".format(Helper.convertErrno(err.errno), err.msg))
+                raise
+        except BaseException:
+            print("[=] Unexpected exception")
+            raise
+
+        if resetDb:
+            self._dbConn.resetDb()  # drop and recreate DB
+
+        # Do this after dbConn is in proper shape
+        self._stateMachine = StateMechine(self._dbConn)
+
+    def getDbConn(self):
+        return self._dbConn
+
+    def getStateMachine(self) -> StateMechine:
+        return self._stateMachine
+
+    # def getState(self):
+    #     return self._stateMachine.getCurrentState()
+
+    # We aim to create a starting time tick, such that, whenever we run our test here once
+    # We should be able to safely create 100,000 records, which will not have any repeated time stamp
+    # when we re-run the test in 3 minutes (180 seconds), basically we should expand time duration
+    # by a factor of 500.
+    # TODO: what if it goes beyond 10 years into the future
+    # TODO: fix the error as result of above: "tsdb timestamp is out of range"
+    def setupLastTick(self):
+        t1 = datetime.datetime(2020, 6, 1)
+        t2 = datetime.datetime.now()
+        # maybe a very large number, takes 69 years to exceed Python int range
+        elSec = int(t2.timestamp() - t1.timestamp())
+        elSec2 = (elSec % (8 * 12 * 30 * 24 * 60 * 60 / 500)) * \
+            500  # a number representing seconds within 10 years
+        # print("elSec = {}".format(elSec))
+        t3 = datetime.datetime(2012, 1, 1)  # default "keep" is 10 years
+        t4 = datetime.datetime.fromtimestamp(
+            t3.timestamp() + elSec2)  # see explanation above
+        logger.info("Setting up TICKS to start from: {}".format(t4))
+        return t4
+
+    def pickAndAllocateTable(self):  # pick any table, and "use" it
+        return self.tableNumQueue.pickAndAllocate()
+
+    def addTable(self):
+        with self._lock:
+            tIndex = self.tableNumQueue.push()
+        return tIndex
+
+    @classmethod
+    def getFixedSuperTableName(cls):
+        return "fs_table"
+
+    @classmethod
+    def getFixedSuperTable(cls):
+        return TdSuperTable(cls.getFixedSuperTableName())
+
+    def releaseTable(self, i):  # return the table back, so others can use it
+        self.tableNumQueue.release(i)
+
+    def getNextTick(self):
+        with self._lock:  # prevent duplicate tick
+            if Dice.throw(20) == 0:  # 1 in 20 chance
+                return self._lastTick + datetime.timedelta(0, -100) # Go back in time 100 seconds
+            else:  # regular
+                # add one second to it
+                self._lastTick += datetime.timedelta(0, 1)
+                return self._lastTick
+
+    def getNextInt(self):
+        with self._lock:
+            self._lastInt += 1
+            return self._lastInt
+
+    def getNextBinary(self):
+        return "Beijing_Shanghai_Los_Angeles_New_York_San_Francisco_Chicago_Beijing_Shanghai_Los_Angeles_New_York_San_Francisco_Chicago_{}".format(
+            self.getNextInt())
+
+    def getNextFloat(self):
+        ret = 0.9 + self.getNextInt()
+        # print("Float obtained: {}".format(ret))
+        return ret
+
+    def getTableNameToDelete(self):
+        tblNum = self.tableNumQueue.pop()  # TODO: race condition!
+        if (not tblNum):  # maybe false
+            return False
+
+        return "table_{}".format(tblNum)
+
+    def cleanUp(self):
+        self._dbConn.close()
+
+
+class TaskExecutor():
+    class BoundedList:
+        def __init__(self, size=10):
+            self._size = size
+            self._list = []
+            self._lock = threading.Lock()
+
+        def add(self, n: int):
+            with self._lock:
+                if not self._list:  # empty
+                    self._list.append(n)
+                    return
+                # now we should insert
+                nItems = len(self._list)
+                insPos = 0
+                for i in range(nItems):
+                    insPos = i
+                    if n <= self._list[i]:  # smaller than this item, time to insert
+                        break  # found the insertion point
+                    insPos += 1  # insert to the right
+
+                if insPos == 0:  # except for the 1st item, # TODO: elimiate first item as gating item
+                    return  # do nothing
+
+                # print("Inserting at postion {}, value: {}".format(insPos, n))
+                self._list.insert(insPos, n)  # insert
+
+                newLen = len(self._list)
+                if newLen <= self._size:
+                    return  # do nothing
+                elif newLen == (self._size + 1):
+                    del self._list[0]  # remove the first item
+                else:
+                    raise RuntimeError("Corrupt Bounded List")
+
+        def __str__(self):
+            return repr(self._list)
+
+    _boundedList = BoundedList()
+
+    def __init__(self, curStep):
+        self._curStep = curStep
+
+    @classmethod
+    def getBoundedList(cls):
+        return cls._boundedList
+
+    def getCurStep(self):
+        return self._curStep
+
+    def execute(self, task: Task, wt: WorkerThread):  # execute a task on a thread
+        task.execute(wt)
+
+    def recordDataMark(self, n: int):
+        # print("[{}]".format(n), end="", flush=True)
+        self._boundedList.add(n)
+
+    # def logInfo(self, msg):
+    #     logger.info("    T[{}.x]: ".format(self._curStep) + msg)
+
+    # def logDebug(self, msg):
+    #     logger.debug("    T[{}.x]: ".format(self._curStep) + msg)
+
+
+class Task():
+    taskSn = 100
+
+    @classmethod
+    def allocTaskNum(cls):
+        Task.taskSn += 1  # IMPORTANT: cannot use cls.taskSn, since each sub class will have a copy
+        # logger.debug("Allocating taskSN: {}".format(Task.taskSn))
+        return Task.taskSn
+
+    def __init__(self, dbManager: DbManager, execStats: ExecutionStats):
+        self._dbManager = dbManager
+        self._workerThread = None
+        self._err = None
+        self._aborted = False
+        self._curStep = None
+        self._numRows = None  # Number of rows affected
+
+        # Assign an incremental task serial number
+        self._taskNum = self.allocTaskNum()
+        # logger.debug("Creating new task {}...".format(self._taskNum))
+
+        self._execStats = execStats
+
+    def isSuccess(self):
+        return self._err is None
+
+    def isAborted(self):
+        return self._aborted
+
+    def clone(self):  # TODO: why do we need this again?
+        newTask = self.__class__(self._dbManager, self._execStats)
+        return newTask
+
+    def logDebug(self, msg):
+        self._workerThread.logDebug(
+            "Step[{}.{}] {}".format(
+                self._curStep, self._taskNum, msg))
+
+    def logInfo(self, msg):
+        self._workerThread.logInfo(
+            "Step[{}.{}] {}".format(
+                self._curStep, self._taskNum, msg))
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        raise RuntimeError(
+            "To be implemeted by child classes, class name: {}".format(
+                self.__class__.__name__))
+
+    def _isErrAcceptable(self, errno, msg):
+        if errno in [
+                0x05,  # TSDB_CODE_RPC_NOT_READY
+                # 0x200, # invalid SQL， TODO: re-examine with TD-934
+                0x360, 0x362, 
+                0x369, # tag already exists
+                0x36A, 0x36B, 0x36D,
+                0x381, 
+                0x380, # "db not selected"
+                0x383,
+                0x386,  # DB is being dropped?!
+                0x503,
+                0x510,  # vnode not in ready state
+                0x14,   # db not ready, errno changed
+                0x600,
+                1000  # REST catch-all error
+            ]: 
+            return True # These are the ALWAYS-ACCEPTABLE ones
+        elif (errno in [ 0x0B ]) and gConfig.auto_start_service:
+            return True # We may get "network unavilable" when restarting service
+        elif errno == 0x200 : # invalid SQL, we need to div in a bit more
+            if msg.find("invalid column name") != -1:
+                return True 
+            elif msg.find("tags number not matched") != -1: # mismatched tags after modification
+                return True
+            elif msg.find("duplicated column names") != -1: # also alter table tag issues
+                return True
+        elif (gSvcMgr!=None) and gSvcMgr.isRestarting():
+            logger.info("Ignoring error when service is restarting: errno = {}, msg = {}".format(errno, msg))
+            return True
+        
+        return False # Not an acceptable error
+
+
+    def execute(self, wt: WorkerThread):
+        wt.verifyThreadSelf()
+        self._workerThread = wt  # type: ignore
+
+        te = wt.getTaskExecutor()
+        self._curStep = te.getCurStep()
+        self.logDebug(
+            "[-] executing task {}...".format(self.__class__.__name__))
+
+        self._err = None
+        self._execStats.beginTaskType(self.__class__.__name__)  # mark beginning
+        errno2 = None
+        try:
+            self._executeInternal(te, wt)  # TODO: no return value?
+        except taos.error.ProgrammingError as err:
+            errno2 = Helper.convertErrno(err.errno)
+            if (gConfig.continue_on_exception):  # user choose to continue
+                self.logDebug("[=] Continue after TAOS exception: errno=0x{:X}, msg: {}, SQL: {}".format(
+                        errno2, err, wt.getDbConn().getLastSql()))
+                self._err = err
+            elif self._isErrAcceptable(errno2, err.__str__()):
+                self.logDebug("[=] Acceptable Taos library exception: errno=0x{:X}, msg: {}, SQL: {}".format(
+                        errno2, err, wt.getDbConn().getLastSql()))
+                print("_", end="", flush=True)
+                self._err = err
+            else: # not an acceptable error
+                errMsg = "[=] Unexpected Taos library exception ({}): errno=0x{:X}, msg: {}, SQL: {}".format(
+                    self.__class__.__name__,
+                    errno2, err, wt.getDbConn().getLastSql())
+                self.logDebug(errMsg)
+                if gConfig.debug:
+                    # raise # so that we see full stack
+                    traceback.print_exc()
+                print(
+                    "\n\n----------------------------\nProgram ABORTED Due to Unexpected TAOS Error: \n\n{}\n".format(errMsg) +
+                    "----------------------------\n")
+                # sys.exit(-1)
+                self._err = err
+                self._aborted = True
+        except Exception as e:
+            self.logInfo("Non-TAOS exception encountered")
+            self._err = e
+            self._aborted = True
+            traceback.print_exc()
+        except BaseException as e:
+            self.logInfo("Python base exception encountered")
+            self._err = e
+            self._aborted = True
+            traceback.print_exc()
+        except BaseException:
+            self.logDebug(
+                "[=] Unexpected exception, SQL: {}".format(
+                    wt.getDbConn().getLastSql()))
+            raise
+        self._execStats.endTaskType(self.__class__.__name__, self.isSuccess())
+
+        self.logDebug("[X] task execution completed, {}, status: {}".format(
+            self.__class__.__name__, "Success" if self.isSuccess() else "Failure"))
+        # TODO: merge with above.
+        self._execStats.incExecCount(self.__class__.__name__, self.isSuccess(), errno2)
+
+    def execSql(self, sql):
+        return self._dbManager.execute(sql)
+
+    def execWtSql(self, wt: WorkerThread, sql):  # execute an SQL on the worker thread
+        return wt.execSql(sql)
+
+    def queryWtSql(self, wt: WorkerThread, sql):  # execute an SQL on the worker thread
+        return wt.querySql(sql)
+
+    def getQueryResult(self, wt: WorkerThread):  # execute an SQL on the worker thread
+        return wt.getQueryResult()
+
+
+class ExecutionStats:
+    def __init__(self):
+        # total/success times for a task
+        self._execTimes: Dict[str, [int, int]] = {}
+        self._tasksInProgress = 0
+        self._lock = threading.Lock()
+        self._firstTaskStartTime = None
+        self._execStartTime = None
+        self._errors = {}
+        self._elapsedTime = 0.0  # total elapsed time
+        self._accRunTime = 0.0  # accumulated run time
+
+        self._failed = False
+        self._failureReason = None
+
+    def __str__(self):
+        return "[ExecStats: _failed={}, _failureReason={}".format(
+            self._failed, self._failureReason)
+
+    def isFailed(self):
+        return self._failed
+
+    def startExec(self):
+        self._execStartTime = time.time()
+
+    def endExec(self):
+        self._elapsedTime = time.time() - self._execStartTime
+
+    def incExecCount(self, klassName, isSuccess, eno=None):  # TODO: add a lock here
+        if klassName not in self._execTimes:
+            self._execTimes[klassName] = [0, 0]
+        t = self._execTimes[klassName]  # tuple for the data
+        t[0] += 1  # index 0 has the "total" execution times
+        if isSuccess:
+            t[1] += 1  # index 1 has the "success" execution times
+        if eno != None:             
+            if klassName not in self._errors:
+                self._errors[klassName] = {}
+            errors = self._errors[klassName]
+            errors[eno] = errors[eno]+1 if eno in errors else 1
+
+    def beginTaskType(self, klassName):
+        with self._lock:
+            if self._tasksInProgress == 0:  # starting a new round
+                self._firstTaskStartTime = time.time()  # I am now the first task
+            self._tasksInProgress += 1
+
+    def endTaskType(self, klassName, isSuccess):
+        with self._lock:
+            self._tasksInProgress -= 1
+            if self._tasksInProgress == 0:  # all tasks have stopped
+                self._accRunTime += (time.time() - self._firstTaskStartTime)
+                self._firstTaskStartTime = None
+
+    def registerFailure(self, reason):
+        self._failed = True
+        self._failureReason = reason
+
+    def printStats(self):
+        logger.info(
+            "----------------------------------------------------------------------")
+        logger.info(
+            "| Crash_Gen test {}, with the following stats:". format(
+                "FAILED (reason: {})".format(
+                    self._failureReason) if self._failed else "SUCCEEDED"))
+        logger.info("| Task Execution Times (success/total):")
+        execTimesAny = 0
+        for k, n in self._execTimes.items():
+            execTimesAny += n[0]
+            errStr = None
+            if k in self._errors:
+                errors = self._errors[k]
+                # print("errors = {}".format(errors))
+                errStrs = ["0x{:X}:{}".format(eno, n) for (eno, n) in errors.items()]
+                # print("error strings = {}".format(errStrs))
+                errStr = ", ".join(errStrs) 
+            logger.info("|    {0:<24}: {1}/{2} (Errors: {3})".format(k, n[1], n[0], errStr))
+
+        logger.info(
+            "| Total Tasks Executed (success or not): {} ".format(execTimesAny))
+        logger.info(
+            "| Total Tasks In Progress at End: {}".format(
+                self._tasksInProgress))
+        logger.info(
+            "| Total Task Busy Time (elapsed time when any task is in progress): {:.3f} seconds".format(
+                self._accRunTime))
+        logger.info(
+            "| Average Per-Task Execution Time: {:.3f} seconds".format(self._accRunTime / execTimesAny))
+        logger.info(
+            "| Total Elapsed Time (from wall clock): {:.3f} seconds".format(
+                self._elapsedTime))
+        logger.info("| Top numbers written: {}".format(TaskExecutor.getBoundedList()))
+        logger.info("| Total Number of Active DB Native Connections: {}".format(DbConnNative.totalConnections))
+        logger.info(
+            "----------------------------------------------------------------------")
+
+
+class StateTransitionTask(Task):
+    LARGE_NUMBER_OF_TABLES = 35
+    SMALL_NUMBER_OF_TABLES = 3
+    LARGE_NUMBER_OF_RECORDS = 50
+    SMALL_NUMBER_OF_RECORDS = 3
+
+    @classmethod
+    def getInfo(cls):  # each sub class should supply their own information
+        raise RuntimeError("Overriding method expected")
+
+    _endState = None
+    @classmethod
+    def getEndState(cls):  # TODO: optimize by calling it fewer times
+        raise RuntimeError("Overriding method expected")
+
+    # @classmethod
+    # def getBeginStates(cls):
+    #     return cls.getInfo()[0]
+
+    # @classmethod
+    # def getEndState(cls): # returning the class name
+    #     return cls.getInfo()[0]
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        # return state.getValue() in cls.getBeginStates()
+        raise RuntimeError("must be overriden")
+
+    @classmethod
+    def getRegTableName(cls, i):
+        return "reg_table_{}".format(i)
+
+    def execute(self, wt: WorkerThread):
+        super().execute(wt)
+
+
+class TaskCreateDb(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return StateDbOnly()
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canCreateDb()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        # self.execWtSql(wt, "create database db replica {}".format(Dice.throw(3)+1))
+        self.execWtSql(wt, "create database db")
+
+class TaskDropDb(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return StateEmpty()
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canDropDb()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        self.execWtSql(wt, "drop database db")
+        logger.debug("[OPS] database dropped at {}".format(time.time()))
+
+
+class TaskCreateSuperTable(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return StateSuperTableOnly()
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canCreateFixedSuperTable()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        if not wt.dbInUse():  # no DB yet, to the best of our knowledge
+            logger.debug("Skipping task, no DB yet")
+            return
+
+        sTable = self._dbManager.getFixedSuperTable()
+        # wt.execSql("use db")    # should always be in place
+        sTable.create(wt.getDbConn(), {'ts':'timestamp', 'speed':'int'}, {'b':'binary(200)', 'f':'float'})
+        # self.execWtSql(wt,"create table db.{} (ts timestamp, speed int) tags (b binary(200), f float) ".format(tblName))
+        # No need to create the regular tables, INSERT will do that
+        # automatically
+
+
+class TdSuperTable:
+    def __init__(self, stName):
+        self._stName = stName
+
+    def getName(self):
+        return self._stName
+
+    def create(self, dbc, cols: dict, tags: dict):
+        sql = "CREATE TABLE db.{} ({}) TAGS ({})".format(
+            self._stName,
+            ",".join(['%s %s'%(k,v) for (k,v) in cols.items()]),
+            ",".join(['%s %s'%(k,v) for (k,v) in tags.items()])
+            )
+        dbc.execute(sql)        
+
+    def getRegTables(self, dbc: DbConn):
+        try:
+            dbc.query("select TBNAME from db.{}".format(self._stName))  # TODO: analyze result set later            
+        except taos.error.ProgrammingError as err:                    
+            errno2 = Helper.convertErrno(err.errno) 
+            logger.debug("[=] Failed to get tables from super table: errno=0x{:X}, msg: {}".format(errno2, err))
+            raise
+
+        qr = dbc.getQueryResult()
+        return [v[0] for v in qr] # list transformation, ref: https://stackoverflow.com/questions/643823/python-list-transformation
+
+    def hasRegTables(self, dbc: DbConn):
+        return dbc.query("SELECT * FROM db.{}".format(self._stName)) > 0
+
+    def ensureTable(self, dbc: DbConn, regTableName: str):
+        sql = "select tbname from db.{} where tbname in ('{}')".format(self._stName, regTableName)
+        if dbc.query(sql) >= 1 : # reg table exists already
+            return
+        sql = "CREATE TABLE {} USING {} tags ({})".format(
+            regTableName, self._stName, self._getTagStrForSql(dbc)
+        )
+        dbc.execute(sql)
+
+    def _getTagStrForSql(self, dbc) :
+        tags = self._getTags(dbc)
+        tagStrs = []
+        for tagName in tags: 
+            tagType = tags[tagName]
+            if tagType == 'BINARY':
+                tagStrs.append("'Beijing-Shanghai-LosAngeles'")
+            elif tagType == 'FLOAT':
+                tagStrs.append('9.9')
+            elif tagType == 'INT':
+                tagStrs.append('88')
+            else:
+                raise RuntimeError("Unexpected tag type: {}".format(tagType))
+        return ", ".join(tagStrs)
+
+    def _getTags(self, dbc) -> dict:
+        dbc.query("DESCRIBE {}".format(self._stName))
+        stCols = dbc.getQueryResult()
+        # print(stCols)
+        ret = {row[0]:row[1] for row in stCols if row[3]=='TAG'} # name:type
+        # print("Tags retrieved: {}".format(ret))
+        return ret
+
+    def addTag(self, dbc, tagName, tagType):
+        if tagName in self._getTags(dbc): # already 
+            return
+        # sTable.addTag("extraTag", "int")
+        sql = "alter table db.{} add tag {} {}".format(self._stName, tagName, tagType)
+        dbc.execute(sql)
+
+    def dropTag(self, dbc, tagName):
+        if not tagName in self._getTags(dbc): # don't have this tag
+            return
+        sql = "alter table db.{} drop tag {}".format(self._stName, tagName)
+        dbc.execute(sql)
+
+    def changeTag(self, dbc, oldTag, newTag):
+        tags = self._getTags(dbc)
+        if not oldTag in tags: # don't have this tag
+            return
+        if newTag in tags: # already have this tag
+            return
+        sql = "alter table db.{} change tag {} {}".format(self._stName, oldTag, newTag)
+        dbc.execute(sql)
+
+class TaskReadData(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return None  # meaning doesn't affect state
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canReadData()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        sTable = self._dbManager.getFixedSuperTable()
+
+        if random.randrange(
+                5) == 0:  # 1 in 5 chance, simulate a broken connection. TODO: break connection in all situations
+            wt.getDbConn().close()
+            wt.getDbConn().open()
+        
+        dbc = wt.getDbConn()
+        for rTbName in sTable.getRegTables(dbc):  # regular tables
+            aggExpr = Dice.choice([
+                '*', 
+                'count(*)', 
+                'avg(speed)', 
+                # 'twa(speed)', # TODO: this one REQUIRES a where statement, not reasonable
+                'sum(speed)', 
+                'stddev(speed)', 
+                # SELECTOR functions
+                'min(speed)', 
+                'max(speed)', 
+                'first(speed)', 
+                'last(speed)',
+                'top(speed, 50)', # TODO: not supported?
+                'bottom(speed, 50)', # TODO: not supported?
+                'apercentile(speed, 10)', # TODO: TD-1316
+                'last_row(speed)',
+                # Transformation Functions
+                # 'diff(speed)', # TODO: no supported?!
+                'spread(speed)'
+                ]) # TODO: add more from 'top'
+            filterExpr = Dice.choice([ # TODO: add various kind of WHERE conditions
+                None
+            ])
+            try:
+                # Run the query against the regular table first
+                dbc.execute("select {} from db.{}".format(aggExpr, rTbName))
+                # Then run it against the super table
+                if aggExpr not in ['stddev(speed)']: #TODO: STDDEV not valid for super tables?!
+                    dbc.execute("select {} from db.{}".format(aggExpr, sTable.getName()))
+            except taos.error.ProgrammingError as err:                    
+                errno2 = Helper.convertErrno(err.errno)
+                logger.debug("[=] Read Failure: errno=0x{:X}, msg: {}, SQL: {}".format(errno2, err, dbc.getLastSql()))
+                raise
+
+class TaskDropSuperTable(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return StateDbOnly()
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canDropFixedSuperTable()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        # 1/2 chance, we'll drop the regular tables one by one, in a randomized
+        # sequence
+        if Dice.throw(2) == 0:
+            tblSeq = list(range(
+                2 + (self.LARGE_NUMBER_OF_TABLES if gConfig.larger_data else self.SMALL_NUMBER_OF_TABLES)))
+            random.shuffle(tblSeq)
+            tickOutput = False  # if we have spitted out a "d" character for "drop regular table"
+            isSuccess = True
+            for i in tblSeq:
+                regTableName = self.getRegTableName(
+                    i)  # "db.reg_table_{}".format(i)
+                try:
+                    self.execWtSql(wt, "drop table {}".format(
+                        regTableName))  # nRows always 0, like MySQL
+                except taos.error.ProgrammingError as err:
+                    # correcting for strange error number scheme                    
+                    errno2 = Helper.convertErrno(err.errno)
+                    if (errno2 in [0x362]):  # mnode invalid table name
+                        isSuccess = False
+                        logger.debug(
+                            "[DB] Acceptable error when dropping a table")
+                    continue  # try to delete next regular table
+
+                if (not tickOutput):
+                    tickOutput = True  # Print only one time
+                    if isSuccess:
+                        print("d", end="", flush=True)
+                    else:
+                        print("f", end="", flush=True)
+
+        # Drop the super table itself
+        tblName = self._dbManager.getFixedSuperTableName()
+        self.execWtSql(wt, "drop table db.{}".format(tblName))
+
+
+class TaskAlterTags(StateTransitionTask):
+    @classmethod
+    def getEndState(cls):
+        return None  # meaning doesn't affect state
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canDropFixedSuperTable()  # if we can drop it, we can alter tags
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        # tblName = self._dbManager.getFixedSuperTableName()
+        dbc = wt.getDbConn()
+        sTable = self._dbManager.getFixedSuperTable()
+        dice = Dice.throw(4)
+        if dice == 0:
+            sTable.addTag(dbc, "extraTag", "int")
+            # sql = "alter table db.{} add tag extraTag int".format(tblName)
+        elif dice == 1:
+            sTable.dropTag(dbc, "extraTag")
+            # sql = "alter table db.{} drop tag extraTag".format(tblName)
+        elif dice == 2:
+            sTable.dropTag(dbc, "newTag")
+            # sql = "alter table db.{} drop tag newTag".format(tblName)
+        else:  # dice == 3
+            sTable.changeTag(dbc, "extraTag", "newTag")
+            # sql = "alter table db.{} change tag extraTag newTag".format(tblName)
+
+class TaskRestartService(StateTransitionTask):
+    _isRunning = False
+    _classLock = threading.Lock()
+
+    @classmethod
+    def getEndState(cls):
+        return None  # meaning doesn't affect state
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        if gConfig.auto_start_service:
+            return state.canDropFixedSuperTable()  # Basicallly when we have the super table
+        return False # don't run this otherwise
+
+    CHANCE_TO_RESTART_SERVICE = 200
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        if not gConfig.auto_start_service: # only execute when we are in -a mode
+            print("_a", end="", flush=True)
+            return
+
+        with self._classLock:
+            if self._isRunning:
+                print("Skipping restart task, another running already")
+                return
+            self._isRunning = True
+
+        if Dice.throw(self.CHANCE_TO_RESTART_SERVICE) == 0: # 1 in N chance
+            dbc = wt.getDbConn()
+            dbc.execute("show databases") # simple delay, align timing with other workers
+            gSvcMgr.restart()
+
+        self._isRunning = False
+
+class TaskAddData(StateTransitionTask):
+    # Track which table is being actively worked on
+    activeTable: Set[int] = set()
+
+    # We use these two files to record operations to DB, useful for power-off
+    # tests
+    fAddLogReady = None
+    fAddLogDone = None
+
+    @classmethod
+    def prepToRecordOps(cls):
+        if gConfig.record_ops:
+            if (cls.fAddLogReady is None):
+                logger.info(
+                    "Recording in a file operations to be performed...")
+                cls.fAddLogReady = open("add_log_ready.txt", "w")
+            if (cls.fAddLogDone is None):
+                logger.info("Recording in a file operations completed...")
+                cls.fAddLogDone = open("add_log_done.txt", "w")
+
+    @classmethod
+    def getEndState(cls):
+        return StateHasData()
+
+    @classmethod
+    def canBeginFrom(cls, state: AnyState):
+        return state.canAddData()
+
+    def _executeInternal(self, te: TaskExecutor, wt: WorkerThread):
+        ds = self._dbManager # Quite DANGEROUS here, may result in multi-thread client access
+        tblSeq = list(range(
+                self.LARGE_NUMBER_OF_TABLES if gConfig.larger_data else self.SMALL_NUMBER_OF_TABLES))
+        random.shuffle(tblSeq)
+        for i in tblSeq:
+            if (i in self.activeTable):  # wow already active
+                print("x", end="", flush=True) # concurrent insertion
+            else:
+                self.activeTable.add(i)  # marking it active
+            
+            sTable = ds.getFixedSuperTable()
+            regTableName = self.getRegTableName(i)  # "db.reg_table_{}".format(i)
+            sTable.ensureTable(wt.getDbConn(), regTableName)  # Ensure the table exists           
+           
+            for j in range(self.LARGE_NUMBER_OF_RECORDS if gConfig.larger_data else self.SMALL_NUMBER_OF_RECORDS):  # number of records per table
+                nextInt = ds.getNextInt()
+                if gConfig.record_ops:
+                    self.prepToRecordOps()
+                    self.fAddLogReady.write("Ready to write {} to {}\n".format(nextInt, regTableName))
+                    self.fAddLogReady.flush()
+                    os.fsync(self.fAddLogReady)
+                sql = "insert into {} values ('{}', {});".format( # removed: tags ('{}', {})
+                    regTableName,
+                    # ds.getFixedSuperTableName(),
+                    # ds.getNextBinary(), ds.getNextFloat(),
+                    ds.getNextTick(), nextInt)
+                self.execWtSql(wt, sql)
+                # Successfully wrote the data into the DB, let's record it
+                # somehow
+                te.recordDataMark(nextInt)
+                if gConfig.record_ops:
+                    self.fAddLogDone.write(
+                        "Wrote {} to {}\n".format(
+                            nextInt, regTableName))
+                    self.fAddLogDone.flush()
+                    os.fsync(self.fAddLogDone)
+            self.activeTable.discard(i)  # not raising an error, unlike remove
+
+
+# Deterministic random number generator
+class Dice():
+    seeded = False  # static, uninitialized
+
+    @classmethod
+    def seed(cls, s):  # static
+        if (cls.seeded):
+            raise RuntimeError(
+                "Cannot seed the random generator more than once")
+        cls.verifyRNG()
+        random.seed(s)
+        cls.seeded = True  # TODO: protect against multi-threading
+
+    @classmethod
+    def verifyRNG(cls):  # Verify that the RNG is determinstic
+        random.seed(0)
+        x1 = random.randrange(0, 1000)
+        x2 = random.randrange(0, 1000)
+        x3 = random.randrange(0, 1000)
+        if (x1 != 864 or x2 != 394 or x3 != 776):
+            raise RuntimeError("System RNG is not deterministic")
+
+    @classmethod
+    def throw(cls, stop):  # get 0 to stop-1
+        return cls.throwRange(0, stop)
+
+    @classmethod
+    def throwRange(cls, start, stop):  # up to stop-1
+        if (not cls.seeded):
+            raise RuntimeError("Cannot throw dice before seeding it")
+        return random.randrange(start, stop)
+
+    @classmethod
+    def choice(cls, cList):
+        return random.choice(cList)
+
+
+class LoggingFilter(logging.Filter):
+    def filter(self, record: logging.LogRecord):
+        if (record.levelno >= logging.INFO):
+            return True  # info or above always log
+
+        # Commenting out below to adjust...
+
+        # if msg.startswith("[TRD]"):
+        #     return False
+        return True
+
+
+class MyLoggingAdapter(logging.LoggerAdapter):
+    def process(self, msg, kwargs):
+        return "[{}]{}".format(threading.get_ident() % 10000, msg), kwargs
+        # return '[%s] %s' % (self.extra['connid'], msg), kwargs
+
+
+class SvcManager:
+    def __init__(self):
+        print("Starting TDengine Service Manager")
+        # signal.signal(signal.SIGTERM, self.sigIntHandler) # Moved to MainExec
+        # signal.signal(signal.SIGINT, self.sigIntHandler)
+        # signal.signal(signal.SIGUSR1, self.sigUsrHandler)  # different handler!
+
+        self.inSigHandler = False
+        # self._status = MainExec.STATUS_RUNNING # set inside
+        # _startTaosService()
+        self.svcMgrThread = None
+        self._lock = threading.Lock()
+        self._isRestarting = False
+
+    def _doMenu(self):
+        choice = ""
+        while True:
+            print("\nInterrupting Service Program, Choose an Action: ")
+            print("1: Resume")
+            print("2: Terminate")
+            print("3: Restart")
+            # Remember to update the if range below
+            # print("Enter Choice: ", end="", flush=True)
+            while choice == "":
+                choice = input("Enter Choice: ")
+                if choice != "":
+                    break  # done with reading repeated input
+            if choice in ["1", "2", "3"]:
+                break  # we are done with whole method
+            print("Invalid choice, please try again.")
+            choice = ""  # reset
+        return choice
+
+    def sigUsrHandler(self, signalNumber, frame):
+        print("Interrupting main thread execution upon SIGUSR1")
+        if self.inSigHandler:  # already
+            print("Ignoring repeated SIG...")
+            return  # do nothing if it's already not running
+        self.inSigHandler = True
+
+        choice = self._doMenu()
+        if choice == "1":
+            # TODO: can the sub-process be blocked due to us not reading from
+            # queue?
+            self.sigHandlerResume()
+        elif choice == "2":
+            self.stopTaosService()
+        elif choice == "3": # Restart
+            self.restart()
+        else:
+            raise RuntimeError("Invalid menu choice: {}".format(choice))
+
+        self.inSigHandler = False
+
+    def sigIntHandler(self, signalNumber, frame):
+        print("SvcManager: INT Signal Handler starting...")
+        if self.inSigHandler:
+            print("Ignoring repeated SIG_INT...")
+            return
+        self.inSigHandler = True
+
+        self.stopTaosService()
+        print("SvcManager: INT Signal Handler returning...")
+        self.inSigHandler = False
+
+    def sigHandlerResume(self):
+        print("Resuming TDengine service manager thread (main thread)...\n\n")
+
+    def _checkServiceManagerThread(self):
+        if self.svcMgrThread:  # valid svc mgr thread
+            if self.svcMgrThread.isStopped():  # done?
+                self.svcMgrThread.procIpcBatch()  # one last time. TODO: appropriate?
+                self.svcMgrThread = None  # no more
+
+    def _procIpcAll(self):
+        while self.isRunning() or self.isRestarting() :  # for as long as the svc mgr thread is still here
+            if self.isRunning():
+                self.svcMgrThread.procIpcBatch()  # regular processing,
+                self._checkServiceManagerThread()
+            elif self.isRetarting():
+                print("Service restarting...")
+            time.sleep(0.5)  # pause, before next round
+        print(
+            "Service Manager Thread (with subprocess) has ended, main thread now exiting...")
+
+    def startTaosService(self):
+        with self._lock:
+            if self.svcMgrThread:
+                raise RuntimeError("Cannot start TAOS service when one may already be running")
+
+            # Find if there's already a taosd service, and then kill it
+            for proc in psutil.process_iter():
+                if proc.name() == 'taosd':
+                    print("Killing an existing TAOSD process in 2 seconds... press CTRL-C to interrupe")
+                    time.sleep(2.0)
+                    proc.kill()
+                # print("Process: {}".format(proc.name()))
+            
+            self.svcMgrThread = ServiceManagerThread()  # create the object
+            print("Attempting to start TAOS service started, printing out output...")
+            self.svcMgrThread.start()            
+            self.svcMgrThread.procIpcBatch(
+                trimToTarget=10,
+                forceOutput=True)  # for printing 10 lines
+            print("TAOS service started")
+
+    def stopTaosService(self, outputLines=20):
+        with self._lock:
+            if not self.isRunning():
+                logger.warning("Cannot stop TAOS service, not running")
+                return
+
+            print("Terminating Service Manager Thread (SMT) execution...")
+            self.svcMgrThread.stop()
+            if self.svcMgrThread.isStopped():
+                self.svcMgrThread.procIpcBatch(outputLines)  # one last time
+                self.svcMgrThread = None
+                print("End of TDengine Service Output")
+                print("----- TDengine Service (managed by SMT) is now terminated -----\n")
+            else:
+                print("WARNING: SMT did not terminate as expected")
+
+    def run(self):
+        self.startTaosService()
+        self._procIpcAll()  # pump/process all the messages, may encounter SIG + restart
+        if self.isRunning():  # if sig handler hasn't destroyed it by now
+            self.stopTaosService()  # should have started already
+
+    def restart(self):
+        if self._isRestarting:
+            logger.warning("Cannot restart service when it's already restarting")
+            return
+
+        self._isRestarting = True
+        if self.isRunning():
+            self.stopTaosService()
+        else:
+            logger.warning("Service not running when restart requested")
+
+        self.startTaosService()
+        self._isRestarting = False
+
+    def isRunning(self):
+        return self.svcMgrThread != None
+
+    def isRestarting(self):
+        return self._isRestarting
+
+class ServiceManagerThread:
+    MAX_QUEUE_SIZE = 10000
+
+    def __init__(self):
+        self._tdeSubProcess = None
+        self._thread = None
+        self._status = None
+
+    def getStatus(self):
+        return self._status
+
+    def isRunning(self):
+        # return self._thread and self._thread.is_alive()
+        return self._status == MainExec.STATUS_RUNNING
+
+    def isStopping(self):
+        return self._status == MainExec.STATUS_STOPPING
+
+    def isStopped(self):
+        return self._status == MainExec.STATUS_STOPPED
+
+    # Start the thread (with sub process), and wait for the sub service
+    # to become fully operational
+    def start(self):
+        if self._thread:
+            raise RuntimeError("Unexpected _thread")
+        if self._tdeSubProcess:
+            raise RuntimeError("TDengine sub process already created/running")
+
+        self._status = MainExec.STATUS_STARTING
+
+        self._tdeSubProcess = TdeSubProcess()
+        self._tdeSubProcess.start()
+
+        self._ipcQueue = Queue()
+        self._thread = threading.Thread(
+            target=self.svcOutputReader,
+            args=(self._tdeSubProcess.getStdOut(), self._ipcQueue))
+        self._thread.daemon = True  # thread dies with the program
+        self._thread.start()
+
+        self._thread2 = threading.Thread(
+            target=self.svcErrorReader,
+            args=(self._tdeSubProcess.getStdErr(), self._ipcQueue))
+        self._thread2.daemon = True  # thread dies with the program
+        self._thread2.start()
+
+        # wait for service to start
+        for i in range(0, 100):
+            time.sleep(1.0)
+            # self.procIpcBatch() # don't pump message during start up
+            print("_zz_", end="", flush=True)
+            if self._status == MainExec.STATUS_RUNNING:
+                logger.info("[] TDengine service READY to process requests")
+                return  # now we've started
+        # TODO: handle this better?
+        self.procIpcBatch(100, True) # display output before cronking out, trim to last 20 msgs, force output
+        raise RuntimeError("TDengine service did not start successfully")
+
+    def stop(self):
+        # can be called from both main thread or signal handler
+        print("Terminating TDengine service running as the sub process...")
+        if self.isStopped():
+            print("Service already stopped")
+            return
+        if self.isStopping():
+            print("Service is already being stopped")
+            return
+        # Linux will send Control-C generated SIGINT to the TDengine process
+        # already, ref:
+        # https://unix.stackexchange.com/questions/176235/fork-and-how-signals-are-delivered-to-processes
+        if not self._tdeSubProcess:
+            raise RuntimeError("sub process object missing")
+
+        self._status = MainExec.STATUS_STOPPING
+        retCode = self._tdeSubProcess.stop()
+        print("Attempted to stop sub process, got return code: {}".format(retCode))
+        if (retCode==-11): # SGV
+            logger.error("[[--ERROR--]]: TDengine service SEGV fault (check core file!)")
+
+        if self._tdeSubProcess.isRunning():  # still running
+            print("FAILED to stop sub process, it is still running... pid = {}".format(
+                    self._tdeSubProcess.getPid()))
+        else:
+            self._tdeSubProcess = None  # not running any more
+            self.join()  # stop the thread, change the status, etc.
+
+    def join(self):
+        # TODO: sanity check
+        if not self.isStopping():
+            raise RuntimeError(
+                "Unexpected status when ending svc mgr thread: {}".format(
+                    self._status))
+
+        if self._thread:
+            self._thread.join()
+            self._thread = None
+            self._status = MainExec.STATUS_STOPPED
+            # STD ERR thread
+            self._thread2.join()
+            self._thread2 = None
+        else:
+            print("Joining empty thread, doing nothing")
+
+    def _trimQueue(self, targetSize):
+        if targetSize <= 0:
+            return  # do nothing
+        q = self._ipcQueue
+        if (q.qsize() <= targetSize):  # no need to trim
+            return
+
+        logger.debug("Triming IPC queue to target size: {}".format(targetSize))
+        itemsToTrim = q.qsize() - targetSize
+        for i in range(0, itemsToTrim):
+            try:
+                q.get_nowait()
+            except Empty:
+                break  # break out of for loop, no more trimming
+
+    TD_READY_MSG = "TDengine is initialized successfully"
+
+    def procIpcBatch(self, trimToTarget=0, forceOutput=False):
+        self._trimQueue(trimToTarget)  # trim if necessary
+        # Process all the output generated by the underlying sub process,
+        # managed by IO thread
+        print("<", end="", flush=True)
+        while True:
+            try:
+                line = self._ipcQueue.get_nowait()  # getting output at fast speed
+                self._printProgress("_o")
+            except Empty:
+                # time.sleep(2.3) # wait only if there's no output
+                # no more output
+                print(".>", end="", flush=True)
+                return  # we are done with THIS BATCH
+            else:  # got line, printing out
+                if forceOutput:
+                    logger.info(line)
+                else:
+                    logger.debug(line)
+        print(">", end="", flush=True)
+
+    _ProgressBars = ["--", "//", "||", "\\\\"]
+
+    def _printProgress(self, msg):  # TODO: assuming 2 chars
+        print(msg, end="", flush=True)
+        pBar = self._ProgressBars[Dice.throw(4)]
+        print(pBar, end="", flush=True)
+        print('\b\b\b\b', end="", flush=True)
+
+    def svcOutputReader(self, out: IO, queue):
+        # Important Reference: https://stackoverflow.com/questions/375427/non-blocking-read-on-a-subprocess-pipe-in-python
+        # print("This is the svcOutput Reader...")
+        # for line in out :
+        for line in iter(out.readline, b''):
+            # print("Finished reading a line: {}".format(line))
+            # print("Adding item to queue...")
+            try:
+                line = line.decode("utf-8").rstrip()
+            except UnicodeError:
+                print("\nNon-UTF8 server output: {}\n".format(line))
+
+            # This might block, and then causing "out" buffer to block
+            queue.put(line)
+            self._printProgress("_i")
+
+            if self._status == MainExec.STATUS_STARTING:  # we are starting, let's see if we have started
+                if line.find(self.TD_READY_MSG) != -1:  # found
+                    logger.info("Waiting for the service to become FULLY READY")
+                    time.sleep(1.0) # wait for the server to truly start. TODO: remove this
+                    logger.info("Service is now FULLY READY")   
+                    self._status = MainExec.STATUS_RUNNING                 
+
+            # Trim the queue if necessary: TODO: try this 1 out of 10 times
+            self._trimQueue(self.MAX_QUEUE_SIZE * 9 // 10)  # trim to 90% size
+
+            if self.isStopping():  # TODO: use thread status instead
+                # WAITING for stopping sub process to finish its outptu
+                print("_w", end="", flush=True)
+
+            # queue.put(line)
+        # meaning sub process must have died
+        print("\nNo more output from IO thread managing TDengine service")
+        out.close()
+
+    def svcErrorReader(self, err: IO, queue):
+        for line in iter(err.readline, b''):
+            print("\nTDengine Service (taosd) ERROR (from stderr): {}".format(line))
+
+
+class TdeSubProcess:
+    def __init__(self):
+        self.subProcess = None
+
+    def getStdOut(self):
+        return self.subProcess.stdout
+
+    def getStdErr(self):
+        return self.subProcess.stderr
+
+    def isRunning(self):
+        return self.subProcess is not None
+
+    def getPid(self):
+        return self.subProcess.pid
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("communit")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root) - len("/build/bin")]
+                    break
+        return buildPath
+
+    def start(self):
+        ON_POSIX = 'posix' in sys.builtin_module_names
+
+        taosdPath = self.getBuildPath() + "/build/bin/taosd"
+        cfgPath = self.getBuildPath() + "/test/cfg"
+
+        # Delete the log files
+        logPath = self.getBuildPath() + "/test/log"
+        # ref: https://stackoverflow.com/questions/1995373/deleting-all-files-in-a-directory-with-python/1995397
+        # filelist = [ f for f in os.listdir(logPath) ] # if f.endswith(".bak") ]
+        # for f in filelist:
+        #     filePath = os.path.join(logPath, f)
+        #     print("Removing log file: {}".format(filePath))
+        #     os.remove(filePath)        
+        if os.path.exists(logPath):
+            logPathSaved = logPath + "_" + time.strftime('%Y-%m-%d-%H-%M-%S')
+            logger.info("Saving old log files to: {}".format(logPathSaved))
+            os.rename(logPath, logPathSaved)
+        # os.mkdir(logPath) # recreate, no need actually, TDengine will auto-create with proper perms
+            
+        svcCmd = [taosdPath, '-c', cfgPath]
+        # svcCmdSingle = "{} -c {}".format(taosdPath, cfgPath)
+        # svcCmd = ['vmstat', '1']
+        if self.subProcess:  # already there
+            raise RuntimeError("Corrupt process state")
+
+        # print("Starting service: {}".format(svcCmd))
+        self.subProcess = subprocess.Popen(
+            svcCmd, shell=False,
+            # svcCmdSingle, shell=True, # capture core dump?
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            # bufsize=1, # not supported in binary mode
+            close_fds=ON_POSIX
+            )  # had text=True, which interferred with reading EOF
+
+    def stop(self):
+        if not self.subProcess:
+            print("Sub process already stopped")
+            return -1
+
+        retCode = self.subProcess.poll() # contains real sub process return code
+        if retCode:  # valid return code, process ended
+            self.subProcess = None
+        else:  # process still alive, let's interrupt it
+            print(
+                "Sub process is running, sending SIG_INT and waiting for it to terminate...")
+            # sub process should end, then IPC queue should end, causing IO
+            # thread to end
+            self.subProcess.send_signal(signal.SIGINT)
+            try:
+                self.subProcess.wait(10)
+                retCode = self.subProcess.returncode
+            except subprocess.TimeoutExpired as err:
+                print("Time out waiting for TDengine service process to exit")
+                retCode = -3
+            else:
+                print("TDengine service process terminated successfully from SIG_INT")
+                retCode = -4
+                self.subProcess = None
+        return retCode
+
+class ThreadStacks: # stack info for all threads
+    def __init__(self):
+        self._allStacks = {}
+        allFrames = sys._current_frames()
+        for th in threading.enumerate():                        
+            stack = traceback.extract_stack(allFrames[th.ident])     
+            self._allStacks[th.native_id] = stack
+
+    def print(self, filteredEndName = None, filterInternal = False):
+        for thNid, stack in self._allStacks.items(): # for each thread            
+            lastFrame = stack[-1]
+            if filteredEndName: # we need to filter out stacks that match this name                
+                if lastFrame.name == filteredEndName : # end did not match
+                    continue
+            if filterInternal:
+                if lastFrame.name in ['wait', 'invoke_excepthook', 
+                    '_wait', # The Barrier exception
+                    'svcOutputReader', # the svcMgr thread
+                    '__init__']: # the thread that extracted the stack
+                    continue # ignore
+            # Now print
+            print("\n<----- Thread Info for ID: {}".format(thNid))
+            for frame in stack:
+                # print(frame)
+                print("File {filename}, line {lineno}, in {name}".format(
+                    filename=frame.filename, lineno=frame.lineno, name=frame.name))
+                print("    {}".format(frame.line))
+            print("-----> End of Thread Info\n")
+
+class ClientManager:
+    def __init__(self):
+        print("Starting service manager")
+        # signal.signal(signal.SIGTERM, self.sigIntHandler)
+        # signal.signal(signal.SIGINT, self.sigIntHandler)
+
+        self._status = MainExec.STATUS_RUNNING
+        self.tc = None
+
+        self.inSigHandler = False
+
+    def sigIntHandler(self, signalNumber, frame):
+        if self._status != MainExec.STATUS_RUNNING:
+            print("Repeated SIGINT received, forced exit...")
+            # return  # do nothing if it's already not running
+            sys.exit(-1)
+        self._status = MainExec.STATUS_STOPPING  # immediately set our status
+
+        print("ClientManager: Terminating program...")
+        self.tc.requestToStop()
+
+    def _doMenu(self):
+        choice = ""
+        while True:
+            print("\nInterrupting Client Program, Choose an Action: ")
+            print("1: Resume")
+            print("2: Terminate")
+            print("3: Show Threads")
+            # Remember to update the if range below
+            # print("Enter Choice: ", end="", flush=True)
+            while choice == "":
+                choice = input("Enter Choice: ")
+                if choice != "":
+                    break  # done with reading repeated input
+            if choice in ["1", "2", "3"]:
+                break  # we are done with whole method
+            print("Invalid choice, please try again.")
+            choice = ""  # reset
+        return choice
+
+    def sigUsrHandler(self, signalNumber, frame):
+        print("Interrupting main thread execution upon SIGUSR1")
+        if self.inSigHandler:  # already
+            print("Ignoring repeated SIG_USR1...")
+            return  # do nothing if it's already not running
+        self.inSigHandler = True
+
+        choice = self._doMenu()
+        if choice == "1":
+            print("Resuming execution...")
+            time.sleep(1.0)
+        elif choice == "2":
+            print("Not implemented yet")
+            time.sleep(1.0)
+        elif choice == "3":
+            ts = ThreadStacks()
+            ts.print()
+        else:
+            raise RuntimeError("Invalid menu choice: {}".format(choice))
+
+        self.inSigHandler = False
+
+    def _printLastNumbers(self):  # to verify data durability
+        dbManager = DbManager(resetDb=False)
+        dbc = dbManager.getDbConn()
+        if dbc.query("show databases") <= 1:  # no database (we have a default called "log")
+            return
+        dbc.execute("use db")
+        if dbc.query("show tables") == 0:  # no tables
+            return
+
+        sTbName = dbManager.getFixedSuperTableName()
+
+        # get all regular tables
+        # TODO: analyze result set later
+        dbc.query("select TBNAME from db.{}".format(sTbName))
+        rTables = dbc.getQueryResult()
+
+        bList = TaskExecutor.BoundedList()
+        for rTbName in rTables:  # regular tables
+            dbc.query("select speed from db.{}".format(rTbName[0]))
+            numbers = dbc.getQueryResult()
+            for row in numbers:
+                # print("<{}>".format(n), end="", flush=True)
+                bList.add(row[0])
+
+        print("Top numbers in DB right now: {}".format(bList))
+        print("TDengine client execution is about to start in 2 seconds...")
+        time.sleep(2.0)
+        dbManager = None  # release?
+
+    def prepare(self):
+        self._printLastNumbers()
+
+    def run(self, svcMgr):    
+        self._printLastNumbers()
+
+        dbManager = DbManager()  # Regular function
+        thPool = ThreadPool(gConfig.num_threads, gConfig.max_steps)
+        self.tc = ThreadCoordinator(thPool, dbManager)
+        
+        self.tc.run()
+        # print("exec stats: {}".format(self.tc.getExecStats()))
+        # print("TC failed = {}".format(self.tc.isFailed()))
+        if svcMgr: # gConfig.auto_start_service:
+            svcMgr.stopTaosService()
+        # Print exec status, etc., AFTER showing messages from the server
+        self.conclude()
+        # print("TC failed (2) = {}".format(self.tc.isFailed()))
+        # Linux return code: ref https://shapeshed.com/unix-exit-codes/
+        return 1 if self.tc.isFailed() else 0
+
+    def conclude(self):
+        self.tc.printStats()
+        self.tc.getDbManager().cleanUp()
+
+class MainExec:
+    STATUS_STARTING = 1
+    STATUS_RUNNING = 2
+    STATUS_STOPPING = 3
+    STATUS_STOPPED = 4
+
+    def __init__(self):        
+        self._clientMgr = None
+        self._svcMgr = None
+
+        signal.signal(signal.SIGTERM, self.sigIntHandler)
+        signal.signal(signal.SIGINT,  self.sigIntHandler)
+        signal.signal(signal.SIGUSR1, self.sigUsrHandler)  # different handler!
+
+    def sigUsrHandler(self, signalNumber, frame):
+        if self._clientMgr:
+            self._clientMgr.sigUsrHandler(signalNumber, frame)
+        elif self._svcMgr: # Only if no client mgr, we are running alone
+            self._svcMgr.sigUsrHandler(signalNumber, frame)
+        
+    def sigIntHandler(self, signalNumber, frame):
+        if self._svcMgr:
+            self._svcMgr.sigIntHandler(signalNumber, frame)
+        if self._clientMgr:
+            self._clientMgr.sigIntHandler(signalNumber, frame)
+
+    def runClient(self):
+        global gSvcMgr
+        if gConfig.auto_start_service:
+            self._svcMgr = SvcManager()
+            gSvcMgr = self._svcMgr # hack alert
+            self._svcMgr.startTaosService() # we start, don't run
+        
+        self._clientMgr = ClientManager()
+        ret = None
+        try: 
+            ret = self._clientMgr.run(self._svcMgr) # stop TAOS service inside
+        except requests.exceptions.ConnectionError as err:
+            logger.warning("Failed to open REST connection to DB: {}".format(err.getMessage()))
+            # don't raise
+        return ret
+
+    def runService(self):
+        global gSvcMgr
+        self._svcMgr = SvcManager()
+        gSvcMgr = self._svcMgr # save it in a global variable TODO: hack alert
+
+        self._svcMgr.run() # run to some end state
+        self._svcMgr = None 
+        gSvcMgr = None        
+
+    def runTemp(self):  # for debugging purposes
+        # # Hack to exercise reading from disk, imcreasing coverage. TODO: fix
+        # dbc = dbState.getDbConn()
+        # sTbName = dbState.getFixedSuperTableName()
+        # dbc.execute("create database if not exists db")
+        # if not dbState.getState().equals(StateEmpty()):
+        #     dbc.execute("use db")
+
+        # rTables = None
+        # try: # the super table may not exist
+        #     sql = "select TBNAME from db.{}".format(sTbName)
+        #     logger.info("Finding out tables in super table: {}".format(sql))
+        #     dbc.query(sql) # TODO: analyze result set later
+        #     logger.info("Fetching result")
+        #     rTables = dbc.getQueryResult()
+        #     logger.info("Result: {}".format(rTables))
+        # except taos.error.ProgrammingError as err:
+        #     logger.info("Initial Super table OPS error: {}".format(err))
+
+        # # sys.exit()
+        # if ( not rTables == None):
+        #     # print("rTables[0] = {}, type = {}".format(rTables[0], type(rTables[0])))
+        #     try:
+        #         for rTbName in rTables : # regular tables
+        #             ds = dbState
+        #             logger.info("Inserting into table: {}".format(rTbName[0]))
+        #             sql = "insert into db.{} values ('{}', {});".format(
+        #                 rTbName[0],
+        #                 ds.getNextTick(), ds.getNextInt())
+        #             dbc.execute(sql)
+        #         for rTbName in rTables : # regular tables
+        #             dbc.query("select * from db.{}".format(rTbName[0])) # TODO: check success failure
+        #         logger.info("Initial READING operation is successful")
+        #     except taos.error.ProgrammingError as err:
+        #         logger.info("Initial WRITE/READ error: {}".format(err))
+
+        # Sandbox testing code
+        # dbc = dbState.getDbConn()
+        # while True:
+        #     rows = dbc.query("show databases")
+        #     print("Rows: {}, time={}".format(rows, time.time()))
+        return
+
+
+def main():
+    # Super cool Python argument library:
+    # https://docs.python.org/3/library/argparse.html
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=textwrap.dedent('''\
+            TDengine Auto Crash Generator (PLEASE NOTICE the Prerequisites Below)
+            ---------------------------------------------------------------------
+            1. You build TDengine in the top level ./build directory, as described in offical docs
+            2. You run the server there before this script: ./build/bin/taosd -c test/cfg
+
+            '''))
+
+    # parser.add_argument('-a', '--auto-start-service', action='store_true',                        
+    #                     help='Automatically start/stop the TDengine service (default: false)')
+    # parser.add_argument('-c', '--connector-type', action='store', default='native', type=str,
+    #                     help='Connector type to use: native, rest, or mixed (default: 10)')
+    # parser.add_argument('-d', '--debug', action='store_true',                        
+    #                     help='Turn on DEBUG mode for more logging (default: false)')
+    # parser.add_argument('-e', '--run-tdengine', action='store_true',                        
+    #                     help='Run TDengine service in foreground (default: false)')
+    # parser.add_argument('-l', '--larger-data', action='store_true',                        
+    #                     help='Write larger amount of data during write operations (default: false)')
+    # parser.add_argument('-p', '--per-thread-db-connection', action='store_true',                        
+    #                     help='Use a single shared db connection (default: false)')
+    # parser.add_argument('-r', '--record-ops', action='store_true',                        
+    #                     help='Use a pair of always-fsynced fils to record operations performing + performed, for power-off tests (default: false)')                    
+    # parser.add_argument('-s', '--max-steps', action='store', default=1000, type=int,
+    #                     help='Maximum number of steps to run (default: 100)')
+    # parser.add_argument('-t', '--num-threads', action='store', default=5, type=int,
+    #                     help='Number of threads to run (default: 10)')
+    # parser.add_argument('-x', '--continue-on-exception', action='store_true',                        
+    #                     help='Continue execution after encountering unexpected/disallowed errors/exceptions (default: false)')                        
+
+    parser.add_argument(
+        '-a',
+        '--auto-start-service',
+        action='store_true',
+        help='Automatically start/stop the TDengine service (default: false)')
+    parser.add_argument(
+        '-c',
+        '--connector-type',
+        action='store',
+        default='native',
+        type=str,
+        help='Connector type to use: native, rest, or mixed (default: 10)')
+    parser.add_argument(
+        '-d',
+        '--debug',
+        action='store_true',
+        help='Turn on DEBUG mode for more logging (default: false)')
+    parser.add_argument(
+        '-e',
+        '--run-tdengine',
+        action='store_true',
+        help='Run TDengine service in foreground (default: false)')
+    parser.add_argument(
+        '-l',
+        '--larger-data',
+        action='store_true',
+        help='Write larger amount of data during write operations (default: false)')
+    parser.add_argument(
+        '-p',
+        '--per-thread-db-connection',
+        action='store_true',
+        help='Use a single shared db connection (default: false)')
+    parser.add_argument(
+        '-r',
+        '--record-ops',
+        action='store_true',
+        help='Use a pair of always-fsynced fils to record operations performing + performed, for power-off tests (default: false)')
+    parser.add_argument(
+        '-s',
+        '--max-steps',
+        action='store',
+        default=1000,
+        type=int,
+        help='Maximum number of steps to run (default: 100)')
+    parser.add_argument(
+        '-t',
+        '--num-threads',
+        action='store',
+        default=5,
+        type=int,
+        help='Number of threads to run (default: 10)')
+    parser.add_argument(
+        '-x',
+        '--continue-on-exception',
+        action='store_true',
+        help='Continue execution after encountering unexpected/disallowed errors/exceptions (default: false)')
+
+    global gConfig
+    gConfig = parser.parse_args()
+
+    # Logging Stuff
+    global logger
+    _logger = logging.getLogger('CrashGen')  # real logger
+    _logger.addFilter(LoggingFilter())
+    ch = logging.StreamHandler()
+    _logger.addHandler(ch)
+
+    # Logging adapter, to be used as a logger
+    logger = MyLoggingAdapter(_logger, [])
+
+    if (gConfig.debug):
+        logger.setLevel(logging.DEBUG)  # default seems to be INFO
+    else:
+        logger.setLevel(logging.INFO)
+
+    Dice.seed(0)  # initial seeding of dice
+
+    # Run server or client
+    mExec = MainExec()
+    if gConfig.run_tdengine:  # run server
+        mExec.runService()
+    else:
+        return mExec.runClient()
+
+
+if __name__ == "__main__":
+    exitCode = main()
+    # print("Exiting with code: {}".format(exitCode))
+    sys.exit(exitCode)
diff --git a/tests/pytest/crash_gen.sh b/tests/pytest/crash_gen.sh
new file mode 100755
index 0000000000000000000000000000000000000000..df1a9f595b986215deb69a5f9f99a3a5847f41dd
--- /dev/null
+++ b/tests/pytest/crash_gen.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# This is the script for us to try to cause the TDengine server or client to crash
+#    
+# PREPARATION
+#
+# 1. Build an compile the TDengine source code that comes with this script, in the same directory tree
+# 2. Please follow the direction in our README.md, and build TDengine in the build/ directory
+# 3. Adjust the configuration file if needed under build/test/cfg/taos.cfg
+# 4. Run the TDengine server instance: cd build; ./build/bin/taosd -c test/cfg
+# 5. Make sure you have a working Python3 environment: run /usr/bin/python3 --version, and you should get 3.6 or above
+# 6. Make sure you have the proper Python packages: # sudo apt install python3-setuptools python3-pip python3-distutils
+#
+# RUNNING THIS SCRIPT
+# 
+# This script assumes the source code directory is intact, and that the binaries has been built in the
+# build/ directory, as such, will will load the Python libraries in the directory tree, and also load
+# the TDengine client shared library (so) file, in the build/directory, as evidenced in the env
+# variables below.
+#
+# Running the script is simple, no parameter is needed (for now, but will change in the future).
+#
+# Happy Crashing...
+
+
+# Due to the heavy path name assumptions/usage, let us require that the user be in the current directory
+EXEC_DIR=`dirname "$0"`
+if [[ $EXEC_DIR != "." ]]
+then
+    echo "ERROR: Please execute `basename "$0"` in its own directory (for now anyway, pardon the dust)"
+    exit -1
+fi
+
+CURR_DIR=`pwd`
+IN_TDINTERNAL="community"
+if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  TAOS_DIR=$CURR_DIR/../../..
+else
+  TAOS_DIR=$CURR_DIR/../..
+fi
+TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+
+LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
+
+# First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
+export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3
+
+# Then let us set up the library path so that our compiled SO file can be loaded by Python
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
+
+# Now we are all let, and let's see if we can find a crash. Note we pass all params
+python3.8 ./crash_gen.py $@
diff --git a/tests/pytest/dbmgmt/__init__.py b/tests/pytest/dbmgmt/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/dbmgmt/createTableAndDropDnodes.py b/tests/pytest/dbmgmt/createTableAndDropDnodes.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e29c023abac3d46f873ec85ed79809f28c26d03
--- /dev/null
+++ b/tests/pytest/dbmgmt/createTableAndDropDnodes.py
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import threading
+import traceback
+import random
+import datetime
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+
+    def init(self):
+        tdLog.debug("start to execute %s" % __file__)
+        tdLog.info("prepare cluster")
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        tdSql.init(self.conn.cursor())
+        tdSql.execute('reset query cache')
+        tdSql.execute('create dnode 192.168.0.2')
+        tdDnodes.deploy(2)
+        tdDnodes.start(2)
+        tdSql.execute('create dnode 192.168.0.3')
+        tdDnodes.deploy(3)
+        tdDnodes.start(3)
+        time.sleep(3)
+
+        self.db = "db"
+        self.stb = "stb"
+        self.tbPrefix = "tb"
+        self.tbNum = 100000
+        self.count = 0
+        # self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        self.threadNum = 1
+        # threadLock = threading.Lock()
+        # global counter for number of tables created by all threads
+        self.global_counter = 0
+
+        tdSql.init(self.conn.cursor())
+
+    def _createTable(self, threadId):
+        print("Thread%d : createTable" % (threadId))
+        conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        cursor = conn.cursor()
+        i = 0
+        try:
+            sql = "use %s" % (self.db)
+            cursor.execute(sql)
+            while i < self.tbNum:
+                if (i % self.threadNum == threadId):
+                    cursor.execute(
+                        "create table tb%d using %s tags(%d)" %
+                        (i + 1, self.stb, i + 1))
+                    with threading.Lock():
+                        self.global_counter += 1
+                i += 1
+        except Exception as e:
+            tdLog.info(
+                "Failure when creating table tb%d, exception: %s" %
+                (i + 1, str(e)))
+        finally:
+            cursor.close()
+            conn.close()
+
+    def _interfereDnodes(self, threadId, dnodeId):
+        conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        cursor = conn.cursor()
+        # interfere dnode while creating table
+        print("Thread%d to interfere dnode%d" % (threadId, dnodeId))
+        while self.global_counter < self.tbNum * 0.05:
+            time.sleep(0.2)
+        cursor.execute("drop dnode 192.168.0.%d" % (dnodeId))
+        while self.global_counter < self.tbNum * 0.15:
+            time.sleep(0.2)
+        cursor.execute("create dnode 192.168.0.%d" % (dnodeId))
+        while self.global_counter < self.tbNum * 0.35:
+            time.sleep(0.2)
+        cursor.execute("drop dnode 192.168.0.%d" % (dnodeId))
+        while self.global_counter < self.tbNum * 0.45:
+            time.sleep(0.2)
+        cursor.execute("create dnode 192.168.0.%d" % (dnodeId))
+        while self.global_counter < self.tbNum * 0.65:
+            time.sleep(0.2)
+        cursor.execute("drop dnode 192.168.0.%d" % (dnodeId))
+        while self.global_counter < self.tbNum * 0.85:
+            time.sleep(0.2)
+        cursor.execute("create dnode 192.168.0.%d" % (dnodeId))
+
+    def run(self):
+        tdLog.info("================= creating database with replica 2")
+        threadId = 0
+        threads = []
+        try:
+            tdSql.execute("drop database if exists %s" % (self.db))
+            tdSql.execute(
+                "create database %s replica 2 cache 2048 ablocks 2.0 tblocks 10 tables 2000" %
+                (self.db))
+            tdLog.sleep(3)
+            tdSql.execute("use %s" % (self.db))
+            tdSql.execute(
+                "create table %s (ts timestamp, c1 bigint, stime timestamp) tags(tg1 bigint)" %
+                (self.stb))
+            tdLog.info("Start to create tables")
+            while threadId < self.threadNum:
+                tdLog.info("Thread-%d starts to create tables" % (threadId))
+                cThread = threading.Thread(
+                    target=self._createTable,
+                    name="thread-%d" %
+                    (threadId),
+                    args=(
+                        threadId,
+                    ))
+                cThread.start()
+                threads.append(cThread)
+                threadId += 1
+
+        except Exception as e:
+            tdLog.info("Failed to create tb%d, exception: %s" % (i, str(e)))
+            # tdDnodes.stopAll()
+        finally:
+            time.sleep(1)
+
+        threading.Thread(
+            target=self._interfereDnodes,
+            name="thread-interfereDnode%d" %
+            (3),
+            args=(
+                1,
+                3,
+            )).start()
+        for t in range(len(threads)):
+            tdLog.info("Join threads")
+            # threads[t].start()
+            threads[t].join()
+
+        tdSql.query("show stables")
+        tdSql.checkData(0, 4, self.tbNum)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addCluster(__file__, TDTestCase())
diff --git a/tests/pytest/dbmgmt/createTableAndKillDnodes.py b/tests/pytest/dbmgmt/createTableAndKillDnodes.py
new file mode 100644
index 0000000000000000000000000000000000000000..7772ecdc68e2b85206a5f9e64c10021afef38279
--- /dev/null
+++ b/tests/pytest/dbmgmt/createTableAndKillDnodes.py
@@ -0,0 +1,172 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import threading
+import traceback
+import random
+import datetime
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+
+    def init(self):
+        tdLog.debug("start to execute %s" % __file__)
+        tdLog.info("prepare cluster")
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        tdSql.init(self.conn.cursor())
+        tdSql.execute('reset query cache')
+        tdSql.execute('create dnode 192.168.0.2')
+        tdDnodes.deploy(2)
+        tdDnodes.start(2)
+        tdSql.execute('create dnode 192.168.0.3')
+        tdDnodes.deploy(3)
+        tdDnodes.start(3)
+        time.sleep(3)
+
+        self.db = "db"
+        self.stb = "stb"
+        self.tbPrefix = "tb"
+        self.tbNum = 100000
+        self.count = 0
+        # self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        self.threadNum = 1
+        # threadLock = threading.Lock()
+        # global counter for number of tables created by all threads
+        self.global_counter = 0
+
+        tdSql.init(self.conn.cursor())
+
+    def _createTable(self, threadId):
+        print("Thread%d : createTable" % (threadId))
+        conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        cursor = conn.cursor()
+        i = 0
+        try:
+            sql = "use %s" % (self.db)
+            cursor.execute(sql)
+            while i < self.tbNum:
+                if (i % self.threadNum == threadId):
+                    cursor.execute(
+                        "create table tb%d using %s tags(%d)" %
+                        (i + 1, self.stb, i + 1))
+                    with threading.Lock():
+                        self.global_counter += 1
+                    time.sleep(0.01)
+                i += 1
+        except Exception as e:
+            tdLog.info(
+                "Failure when creating table tb%d, exception: %s" %
+                (i + 1, str(e)))
+        finally:
+            cursor.close()
+            conn.close()
+
+    def _interfereDnodes(self, threadId, dnodeId):
+        # interfere dnode while creating table
+        print("Thread%d to interfere dnode%d" % (threadId, dnodeId))
+        percent = 0.05
+        loop = int(1 / (2 * percent))
+        for t in range(1, loop):
+            while self.global_counter < self.tbNum * (t * percent):
+                time.sleep(0.2)
+            tdDnodes.forcestop(dnodeId)
+            while self.global_counter < self.tbNum * ((t + 1) * percent):
+                time.sleep(0.2)
+            tdDnodes.start(dnodeId)
+
+        # while self.global_counter < self.tbNum * 0.05:
+        #     time.sleep(0.2)
+        # tdDnodes.forcestop(dnodeId)
+        # while self.global_counter < self.tbNum * 0.10:
+        #     time.sleep(0.2)
+        # tdDnodes.start(dnodeId)
+        # while self.global_counter < self.tbNum * 0.15:
+        #     time.sleep(0.2)
+        # tdDnodes.forcestop(dnodeId)
+        # while self.global_counter < self.tbNum * 0.20:
+        #     time.sleep(0.2)
+        # tdDnodes.start(dnodeId)
+        # while self.global_counter < self.tbNum * 0.25:
+        #     time.sleep(0.2)
+        # tdDnodes.forcestop(dnodeId)
+        # while self.global_counter < self.tbNum * 0.30:
+        #     time.sleep(0.2)
+        # tdDnodes.start(dnodeId)
+        # while self.global_counter < self.tbNum * 0.35:
+        #     time.sleep(0.2)
+        # tdDnodes.forcestop(dnodeId)
+        # while self.global_counter < self.tbNum * 0.40:
+        #     time.sleep(0.2)
+        # tdDnodes.start(dnodeId)
+        # while self.global_counter < self.tbNum * 0.45:
+        #     time.sleep(0.2)
+        # tdDnodes.forcestop(dnodeId)
+        # while self.global_counter < self.tbNum * 0.50:
+        #     time.sleep(0.2)
+        # tdDnodes.start(dnodeId)
+
+    def run(self):
+        tdLog.info("================= creating database with replica 2")
+        threadId = 0
+        threads = []
+        try:
+            tdSql.execute("drop database if exists %s" % (self.db))
+            tdSql.execute(
+                "create database %s replica 2 cache 1024 ablocks 2.0 tblocks 4 tables 1000" %
+                (self.db))
+            tdLog.sleep(3)
+            tdSql.execute("use %s" % (self.db))
+            tdSql.execute(
+                "create table %s (ts timestamp, c1 bigint, stime timestamp) tags(tg1 bigint)" %
+                (self.stb))
+            tdLog.info("Start to create tables")
+            while threadId < self.threadNum:
+                tdLog.info("Thread-%d starts to create tables" % (threadId))
+                cThread = threading.Thread(
+                    target=self._createTable,
+                    name="thread-%d" %
+                    (threadId),
+                    args=(
+                        threadId,
+                    ))
+                cThread.start()
+                threads.append(cThread)
+                threadId += 1
+
+        except Exception as e:
+            tdLog.info("Failed to create tb%d, exception: %s" % (i, str(e)))
+            # tdDnodes.stopAll()
+        finally:
+            time.sleep(1)
+
+        threading.Thread(
+            target=self._interfereDnodes,
+            name="thread-interfereDnode%d" %
+            (3),
+            args=(
+                1,
+                3,
+            )).start()
+        for t in range(len(threads)):
+            tdLog.info("Join threads")
+            # threads[t].start()
+            threads[t].join()
+
+        tdSql.query("show stables")
+        tdSql.checkData(0, 4, self.tbNum)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addCluster(__file__, TDTestCase())
diff --git a/tests/pytest/dbmgmt/database-name-boundary.py b/tests/pytest/dbmgmt/database-name-boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..df3b027ba7ea8f315060be2820e8bea2c17fa8cc
--- /dev/null
+++ b/tests/pytest/dbmgmt/database-name-boundary.py
@@ -0,0 +1,70 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import datetime
+import string
+import random
+import subprocess
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+
+        chars = string.ascii_uppercase + string.ascii_lowercase
+
+        getDbNameLen = "grep -w '#define TSDB_DB_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
+        dbNameMaxLen = int(subprocess.check_output(getDbNameLen, shell=True))
+        tdLog.info("DB name max length is %d" % dbNameMaxLen)
+
+        tdLog.info("=============== step1")
+        db_name = ''.join(random.choices(chars, k=(dbNameMaxLen + 1)))
+        tdLog.info('db_name length %d' % len(db_name))
+        tdLog.info('create database %s' % db_name)
+        tdSql.error('create database %s' % db_name)
+
+        tdLog.info("=============== step2")
+        db_name = ''.join(random.choices(chars, k=dbNameMaxLen))
+        tdLog.info('db_name length %d' % len(db_name))
+        tdLog.info('create database %s' % db_name)
+        tdSql.execute('create database %s' % db_name)
+
+        tdSql.query('show databases')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, db_name.lower())
+
+        tdLog.info("=============== step3")
+        db_name = ''.join(random.choices(chars, k=(dbNameMaxLen - 1)))
+        tdLog.info('db_name length %d' % len(db_name))
+        tdLog.info('create database %s' % db_name)
+        tdSql.execute('create database %s' % db_name)
+
+        tdSql.query('show databases')
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, db_name.lower())
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/dbmgmt/dropDB_memory_test.py b/tests/pytest/dbmgmt/dropDB_memory_test.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f0925c2688f524d88701ec6cf0e3b302e6a519d
--- /dev/null
+++ b/tests/pytest/dbmgmt/dropDB_memory_test.py
@@ -0,0 +1,67 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        tbNum = 10000
+        insertRows = 1
+        db = "db"
+        loop = 2
+        tdSql.execute("drop database if exists %s" % (db))
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+        for k in range(1, loop + 1):
+            tdLog.info("===========Loop%d starts============" % (k))
+            tdSql.execute(
+                "create database %s cache 163840 ablocks 40 maxtables 5000 wal 0" %
+                (db))
+            tdSql.execute("use %s" % (db))
+            tdSql.execute(
+                "create table stb (ts timestamp, c1 int) tags(t1 bigint, t2 double)")
+            for j in range(1, tbNum):
+                tdSql.execute(
+                    "create table tb%d using stb tags(%d, %d)" %
+                    (j, j, j))
+
+            for j in range(1, tbNum):
+                for i in range(0, insertRows):
+                    tdSql.execute(
+                        "insert into tb%d values (now + %dm, %d)" %
+                        (j, i, i))
+                tdSql.query("select * from tb%d" % (j))
+                tdSql.checkRows(insertRows)
+                tdLog.info("insert %d rows into tb%d" % (insertRows, j))
+            # tdSql.sleep(3)
+            tdSql.execute("drop database %s" % (db))
+            tdLog.sleep(2)
+            tdLog.info("===========Loop%d completed!=============" % (k))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+#tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b679942054c000050271fcb96328d18adea60b42
--- /dev/null
+++ b/tests/pytest/fulltest.sh
@@ -0,0 +1,203 @@
+#!/bin/bash
+ulimit -c unlimited
+
+python3 ./test.py -f insert/basic.py
+python3 ./test.py -f insert/int.py
+python3 ./test.py -f insert/float.py
+python3 ./test.py -f insert/bigint.py
+python3 ./test.py -f insert/bool.py
+python3 ./test.py -f insert/double.py
+python3 ./test.py -f insert/smallint.py
+python3 ./test.py -f insert/tinyint.py
+python3 ./test.py -f insert/date.py
+python3 ./test.py -f insert/binary.py
+python3 ./test.py -f insert/nchar.py
+#python3 ./test.py -f insert/nchar-boundary.py
+python3 ./test.py -f insert/nchar-unicode.py
+python3 ./test.py -f insert/multi.py
+python3 ./test.py -f insert/randomNullCommit.py
+python3 insert/retentionpolicy.py
+python3 ./test.py -f insert/alterTableAndInsert.py
+
+python3 ./test.py -f table/column_name.py
+python3 ./test.py -f table/column_num.py
+python3 ./test.py -f table/db_table.py
+#python3 ./test.py -f table/tablename-boundary.py
+
+# tag
+python3 ./test.py -f tag_lite/filter.py
+python3 ./test.py -f tag_lite/create-tags-boundary.py
+python3 ./test.py -f tag_lite/3.py
+python3 ./test.py -f tag_lite/4.py
+python3 ./test.py -f tag_lite/5.py
+python3 ./test.py -f tag_lite/6.py
+python3 ./test.py -f tag_lite/add.py
+python3 ./test.py -f tag_lite/bigint.py
+python3 ./test.py -f tag_lite/binary_binary.py
+python3 ./test.py -f tag_lite/binary.py
+python3 ./test.py -f tag_lite/bool_binary.py
+python3 ./test.py -f tag_lite/bool_int.py
+python3 ./test.py -f tag_lite/bool.py
+python3 ./test.py -f tag_lite/change.py
+python3 ./test.py -f tag_lite/column.py
+python3 ./test.py -f tag_lite/commit.py
+python3 ./test.py -f tag_lite/create.py
+python3 ./test.py -f tag_lite/datatype.py
+python3 ./test.py -f tag_lite/datatype-without-alter.py
+python3 ./test.py -f tag_lite/delete.py
+python3 ./test.py -f tag_lite/double.py
+python3 ./test.py -f tag_lite/float.py
+python3 ./test.py -f tag_lite/int_binary.py
+python3 ./test.py -f tag_lite/int_float.py
+python3 ./test.py -f tag_lite/int.py
+python3 ./test.py -f tag_lite/set.py
+python3 ./test.py -f tag_lite/smallint.py
+python3 ./test.py -f tag_lite/tinyint.py
+
+#python3 ./test.py -f dbmgmt/database-name-boundary.py
+
+python3 ./test.py -f import_merge/importBlock1HO.py
+python3 ./test.py -f import_merge/importBlock1HPO.py
+python3 ./test.py -f import_merge/importBlock1H.py
+python3 ./test.py -f import_merge/importBlock1S.py
+python3 ./test.py -f import_merge/importBlock1Sub.py
+python3 ./test.py -f import_merge/importBlock1TO.py
+python3 ./test.py -f import_merge/importBlock1TPO.py
+python3 ./test.py -f import_merge/importBlock1T.py
+python3 ./test.py -f import_merge/importBlock2HO.py
+python3 ./test.py -f import_merge/importBlock2HPO.py
+python3 ./test.py -f import_merge/importBlock2H.py
+python3 ./test.py -f import_merge/importBlock2S.py
+python3 ./test.py -f import_merge/importBlock2Sub.py
+python3 ./test.py -f import_merge/importBlock2TO.py
+python3 ./test.py -f import_merge/importBlock2TPO.py
+python3 ./test.py -f import_merge/importBlock2T.py
+python3 ./test.py -f import_merge/importBlockbetween.py
+python3 ./test.py -f import_merge/importCacheFileHO.py
+python3 ./test.py -f import_merge/importCacheFileHPO.py
+python3 ./test.py -f import_merge/importCacheFileH.py
+python3 ./test.py -f import_merge/importCacheFileS.py
+python3 ./test.py -f import_merge/importCacheFileSub.py
+python3 ./test.py -f import_merge/importCacheFileTO.py
+python3 ./test.py -f import_merge/importCacheFileTPO.py
+python3 ./test.py -f import_merge/importCacheFileT.py
+python3 ./test.py -f import_merge/importDataH2.py
+python3 ./test.py -f import_merge/importDataHO2.py
+python3 ./test.py -f import_merge/importDataHO.py
+python3 ./test.py -f import_merge/importDataHPO.py
+python3 ./test.py -f import_merge/importDataLastHO.py
+python3 ./test.py -f import_merge/importDataLastHPO.py
+python3 ./test.py -f import_merge/importDataLastH.py
+python3 ./test.py -f import_merge/importDataLastS.py
+python3 ./test.py -f import_merge/importDataLastSub.py
+python3 ./test.py -f import_merge/importDataLastTO.py
+python3 ./test.py -f import_merge/importDataLastTPO.py
+python3 ./test.py -f import_merge/importDataLastT.py
+python3 ./test.py -f import_merge/importDataS.py
+python3 ./test.py -f import_merge/importDataSub.py
+python3 ./test.py -f import_merge/importDataTO.py
+python3 ./test.py -f import_merge/importDataTPO.py
+python3 ./test.py -f import_merge/importDataT.py
+python3 ./test.py -f import_merge/importHeadOverlap.py
+python3 ./test.py -f import_merge/importHeadPartOverlap.py
+python3 ./test.py -f import_merge/importHead.py
+python3 ./test.py -f import_merge/importHORestart.py
+python3 ./test.py -f import_merge/importHPORestart.py
+python3 ./test.py -f import_merge/importHRestart.py
+python3 ./test.py -f import_merge/importLastHO.py
+python3 ./test.py -f import_merge/importLastHPO.py
+python3 ./test.py -f import_merge/importLastH.py
+python3 ./test.py -f import_merge/importLastS.py
+python3 ./test.py -f import_merge/importLastSub.py
+python3 ./test.py -f import_merge/importLastTO.py
+python3 ./test.py -f import_merge/importLastTPO.py
+python3 ./test.py -f import_merge/importLastT.py
+python3 ./test.py -f import_merge/importSpan.py
+python3 ./test.py -f import_merge/importSRestart.py
+python3 ./test.py -f import_merge/importSubRestart.py
+python3 ./test.py -f import_merge/importTailOverlap.py
+python3 ./test.py -f import_merge/importTailPartOverlap.py
+python3 ./test.py -f import_merge/importTail.py
+python3 ./test.py -f import_merge/importToCommit.py
+python3 ./test.py -f import_merge/importTORestart.py
+python3 ./test.py -f import_merge/importTPORestart.py
+python3 ./test.py -f import_merge/importTRestart.py
+python3 ./test.py -f import_merge/importInsertThenImport.py
+python3 ./test.py -f import_merge/importCSV.py
+# user
+python3 ./test.py -f user/user_create.py
+python3 ./test.py -f user/pass_len.py
+
+# stable
+python3 ./test.py -f stable/query_after_reset.py
+
+# table
+python3 ./test.py -f table/del_stable.py
+
+#query
+python3 ./test.py -f query/filter.py
+python3 ./test.py -f query/filterCombo.py
+python3 ./test.py -f query/queryNormal.py
+python3 ./test.py -f query/queryError.py
+python3 ./test.py -f query/filterAllIntTypes.py
+python3 ./test.py -f query/filterFloatAndDouble.py
+python3 ./test.py -f query/filterOtherTypes.py
+python3 ./test.py -f query/querySort.py
+python3 ./test.py -f query/queryJoin.py
+python3 ./test.py -f query/select_last_crash.py
+python3 ./test.py -f query/queryNullValueTest.py
+python3 ./test.py -f query/queryInsertValue.py
+python3 ./test.py -f query/queryConnection.py
+python3 ./test.py -f query/natualInterval.py
+
+#stream
+python3 ./test.py -f stream/metric_1.py
+python3 ./test.py -f stream/new.py
+python3 ./test.py -f stream/stream1.py
+python3 ./test.py -f stream/stream2.py
+python3 ./test.py -f stream/parser.py
+python3 ./test.py -f stream/history.py
+
+#alter table
+python3 ./test.py -f alter/alter_table_crash.py
+
+# client
+python3 ./test.py -f client/client.py
+python3 ./test.py -f client/version.py
+python3 ./test.py -f client/alterDatabase.py
+
+# Misc
+python3 testCompress.py
+python3 testNoCompress.py
+python3 testMinTablesPerVnode.py
+
+# functions
+python3 ./test.py -f functions/function_avg.py
+python3 ./test.py -f functions/function_bottom.py
+python3 ./test.py -f functions/function_count.py
+python3 ./test.py -f functions/function_diff.py
+python3 ./test.py -f functions/function_first.py
+python3 ./test.py -f functions/function_last.py
+python3 ./test.py -f functions/function_last_row.py
+python3 ./test.py -f functions/function_leastsquares.py
+python3 ./test.py -f functions/function_max.py
+python3 ./test.py -f functions/function_min.py
+python3 ./test.py -f functions/function_operations.py
+python3 ./test.py -f functions/function_percentile.py
+python3 ./test.py -f functions/function_spread.py
+python3 ./test.py -f functions/function_stddev.py
+python3 ./test.py -f functions/function_sum.py
+python3 ./test.py -f functions/function_top.py
+#python3 ./test.py -f functions/function_twa.py
+python3 queryCount.py
+python3 ./test.py -f query/queryGroupbyWithInterval.py
+python3 client/twoClients.py
+python3 test.py -f query/queryInterval.py
+
+# tools
+python3 test.py -f tools/taosdemo.py
+
+# subscribe
+python3 test.py -f subscribe/singlemeter.py
+#python3 test.py -f subscribe/stability.py
+python3 test.py -f subscribe/supertable.py
\ No newline at end of file
diff --git a/tests/pytest/functions/function_avg.py b/tests/pytest/functions/function_avg.py
new file mode 100644
index 0000000000000000000000000000000000000000..9481550ba3f9d912b734d19b7c794c495fffdecd
--- /dev/null
+++ b/tests/pytest/functions/function_avg.py
@@ -0,0 +1,73 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # average verifacation 
+        tdSql.error("select avg(ts) from test")
+        tdSql.error("select avg(ts) from test1")
+        tdSql.error("select avg(col7) from test")
+        tdSql.error("select avg(col7) from test1")
+        tdSql.error("select avg(col8) from test")
+        tdSql.error("select avg(col8) from test1")
+        tdSql.error("select avg(col9) from test")
+        tdSql.error("select avg(col9) from test1")
+
+        tdSql.query("select avg(col1) from test")
+        tdSql.checkData(0, 0, np.average(intData))
+        tdSql.query("select avg(col2) from test")
+        tdSql.checkData(0, 0, np.average(intData))
+        tdSql.query("select avg(col3) from test")
+        tdSql.checkData(0, 0, np.average(intData))
+        tdSql.query("select avg(col4) from test")
+        tdSql.checkData(0, 0, np.average(intData))
+        tdSql.query("select avg(col5) from test")
+        tdSql.checkData(0, 0, np.average(floatData))              
+        tdSql.query("select avg(col6) from test")
+        tdSql.checkData(0, 0, np.average(floatData))              
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_bottom.py b/tests/pytest/functions/function_bottom.py
new file mode 100644
index 0000000000000000000000000000000000000000..4074166f927acbbcbb5899a692ff87f3c187f92f
--- /dev/null
+++ b/tests/pytest/functions/function_bottom.py
@@ -0,0 +1,93 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()    
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))                            
+
+        # bottom verifacation 
+        tdSql.error("select bottom(ts, 10) from test")
+        tdSql.error("select bottom(col1, 0) from test")
+        tdSql.error("select bottom(col1, 101) from test")
+        tdSql.error("select bottom(col2, 0) from test")
+        tdSql.error("select bottom(col2, 101) from test")
+        tdSql.error("select bottom(col3, 0) from test")
+        tdSql.error("select bottom(col3, 101) from test")
+        tdSql.error("select bottom(col4, 0) from test")
+        tdSql.error("select bottom(col4, 101) from test")
+        tdSql.error("select bottom(col5, 0) from test")
+        tdSql.error("select bottom(col5, 101) from test")
+        tdSql.error("select bottom(col6, 0) from test")
+        tdSql.error("select bottom(col6, 101) from test")        
+        tdSql.error("select bottom(col7, 10) from test")        
+        tdSql.error("select bottom(col8, 10) from test")
+        tdSql.error("select bottom(col9, 10) from test")
+
+        tdSql.query("select bottom(col1, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col2, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col3, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col4, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+
+        tdSql.query("select bottom(col5, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 0.1)
+        tdSql.checkData(1, 1, 1.1)
+
+        tdSql.query("select bottom(col6, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 0.1)
+        tdSql.checkData(1, 1, 1.1)
+                   
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_count.py b/tests/pytest/functions/function_count.py
new file mode 100644
index 0000000000000000000000000000000000000000..4795a6b2dfe72bb9fa747b550be9f56c0c255d88
--- /dev/null
+++ b/tests/pytest/functions/function_count.py
@@ -0,0 +1,79 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+        
+        # Count verifacation
+        tdSql.query("select count(*) from test")        
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select count(ts) from test")        
+        tdSql.checkData(0, 0, 10)                        
+        tdSql.query("select count(col1) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col2) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col3) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col4) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col5) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col6) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col7) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col8) from test")        
+        tdSql.checkData(0, 0, 10)
+        tdSql.query("select count(col9) from test")        
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.execute("alter table test add column col10 int")
+        tdSql.query("select count(col10) from test")        
+        tdSql.checkRows(0)
+
+        tdSql.execute("insert into test1 values(now, 1, 2, 3, 4, 1.1, 2.2, false, 'test', 'test' 1)")
+        tdSql.query("select count(col10) from test")        
+        tdSql.checkData(0, 0, 1)        
+              
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_diff.py b/tests/pytest/functions/function_diff.py
new file mode 100644
index 0000000000000000000000000000000000000000..b6f496d7d68ebaa0f19dfc947d7745802198a3dc
--- /dev/null
+++ b/tests/pytest/functions/function_diff.py
@@ -0,0 +1,99 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute("insert into test1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ')" % (self.ts - 1))
+        
+        # diff verifacation 
+        tdSql.query("select diff(col1) from test1")
+        tdSql.checkRows(0)
+        
+        tdSql.query("select diff(col2) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select diff(col3) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select diff(col4) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select diff(col5) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select diff(col6) from test1")
+        tdSql.checkRows(0)
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))                                
+        
+        tdSql.error("select diff(ts) from test")
+        tdSql.error("select diff(ts) from test1")
+        tdSql.error("select diff(col1) from test")
+        tdSql.error("select diff(col2) from test")
+        tdSql.error("select diff(col3) from test")
+        tdSql.error("select diff(col4) from test")
+        tdSql.error("select diff(col5) from test")
+        tdSql.error("select diff(col6) from test")
+        tdSql.error("select diff(col7) from test")     
+        tdSql.error("select diff(col7) from test1")               
+        tdSql.error("select diff(col8) from test") 
+        tdSql.error("select diff(col8) from test1")
+        tdSql.error("select diff(col9) from test")        
+        tdSql.error("select diff(col9) from test1")
+        
+        tdSql.query("select diff(col1) from test1")
+        tdSql.checkRows(10)
+
+        tdSql.query("select diff(col2) from test1")
+        tdSql.checkRows(10)
+
+        tdSql.query("select diff(col3) from test1")
+        tdSql.checkRows(10)
+
+        tdSql.query("select diff(col4) from test1")
+        tdSql.checkRows(10)
+
+        tdSql.query("select diff(col5) from test1")
+        tdSql.checkRows(10)
+
+        tdSql.query("select diff(col6) from test1")
+        tdSql.checkRows(10)
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_first.py b/tests/pytest/functions/function_first.py
new file mode 100644
index 0000000000000000000000000000000000000000..2b78bd33d8bdb0bcd6775215b1cf0b1e398f2928
--- /dev/null
+++ b/tests/pytest/functions/function_first.py
@@ -0,0 +1,119 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute("insert into test1(ts) values(%d)" % (self.ts - 1))
+
+        # first verifacation         
+        tdSql.query("select first(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, None)
+
+        tdSql.query("select first(col1) from test1")
+        tdSql.checkRows(0)        
+
+        tdSql.query("select first(col2) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col3) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col4) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col5) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col6) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col7) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col8) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select first(col9) from test1")
+        tdSql.checkRows(0)
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))            
+
+        tdSql.query("select first(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 1)
+
+        tdSql.query("select first(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select first(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select first(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select first(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+
+        tdSql.query("select first(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0.1)
+
+        tdSql.query("select first(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0.1)
+
+        tdSql.query("select first(col7) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, False)
+
+        tdSql.query("select first(col8) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'taosdata1')
+
+        tdSql.query("select first(col9) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, '涛思数据1')
+                
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_last.py b/tests/pytest/functions/function_last.py
new file mode 100644
index 0000000000000000000000000000000000000000..337c18a28c2cd99d556e5b017377edc56671c490
--- /dev/null
+++ b/tests/pytest/functions/function_last.py
@@ -0,0 +1,119 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute("insert into test1(ts) values(%d)" % (self.ts - 1))
+
+        # last verifacation         
+        tdSql.query("select last(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, None)
+
+        tdSql.query("select last(col1) from test1")
+        tdSql.checkRows(0)        
+
+        tdSql.query("select last(col2) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col3) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col4) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col5) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col6) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col7) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col8) from test1")
+        tdSql.checkRows(0)
+
+        tdSql.query("select last(col9) from test1")
+        tdSql.checkRows(0)
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))            
+
+        tdSql.query("select last(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 10)
+
+        tdSql.query("select last(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+
+        tdSql.query("select last(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+
+        tdSql.query("select last(col7) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, True)
+
+        tdSql.query("select last(col8) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'taosdata10')
+
+        tdSql.query("select last(col9) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, '涛思数据10')
+                
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_last_row.py b/tests/pytest/functions/function_last_row.py
new file mode 100644
index 0000000000000000000000000000000000000000..ea5cf661eb9e70e2ed06ebd712b2f65dfa62beeb
--- /dev/null
+++ b/tests/pytest/functions/function_last_row.py
@@ -0,0 +1,128 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute("insert into test1(ts) values(%d)" % (self.ts - 1))
+
+        # last_row verifacation         
+        tdSql.query("select last_row(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, None)
+
+        tdSql.query("select last_row(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col7) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col8) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        tdSql.query("select last_row(col9) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, None)
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))              
+
+        tdSql.query("select last_row(*) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 10)
+
+        tdSql.query("select last_row(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last_row(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last_row(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last_row(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select last_row(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+
+        tdSql.query("select last_row(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+
+        tdSql.query("select last_row(col7) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, True)
+
+        tdSql.query("select last_row(col8) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'taosdata10')
+
+        tdSql.query("select last_row(col9) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, '涛思数据10')
+                
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_leastsquares.py b/tests/pytest/functions/function_leastsquares.py
new file mode 100644
index 0000000000000000000000000000000000000000..0ef0a2b78612dca604f7a7a7f70841c917376a17
--- /dev/null
+++ b/tests/pytest/functions/function_leastsquares.py
@@ -0,0 +1,75 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))                                   
+
+        # leastsquares verifacation 
+        tdSql.error("select leastsquares(ts, 1, 1) from test1")
+        tdSql.error("select leastsquares(col1, 1, 1) from test")
+        tdSql.error("select leastsquares(col2, 1, 1) from test")
+        tdSql.error("select leastsquares(col3, 1, 1) from test")
+        tdSql.error("select leastsquares(col4, 1, 1) from test")
+        tdSql.error("select leastsquares(col5, 1, 1) from test")
+        tdSql.error("select leastsquares(col6, 1, 1) from test")
+        tdSql.error("select leastsquares(col7, 1, 1) from test1")
+        tdSql.error("select leastsquares(col8, 1, 1) from test1")
+        tdSql.error("select leastsquares(col9, 1, 1) from test1")
+                
+        tdSql.query("select leastsquares(col1, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:0.000000}')
+
+        tdSql.query("select leastsquares(col2, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:0.000000}')
+
+        tdSql.query("select leastsquares(col3, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:0.000000}')
+
+        tdSql.query("select leastsquares(col4, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:0.000000}')
+
+        tdSql.query("select leastsquares(col5, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:-0.900000}')
+
+        tdSql.query("select leastsquares(col6, 1, 1) from test1")
+        tdSql.checkData(0, 0, '{slop:1.000000, intercept:-0.900000}')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_max.py b/tests/pytest/functions/function_max.py
new file mode 100644
index 0000000000000000000000000000000000000000..3bd5031276adfd76574a1a43e311a1d6ec81ab16
--- /dev/null
+++ b/tests/pytest/functions/function_max.py
@@ -0,0 +1,78 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # max verifacation 
+        tdSql.error("select max(ts) from test")
+        tdSql.error("select max(ts) from test1")
+        tdSql.error("select max(col7) from test")
+        tdSql.error("select max(col7) from test1")
+        tdSql.error("select max(col8) from test")
+        tdSql.error("select max(col8) from test1")
+        tdSql.error("select max(col9) from test")
+        tdSql.error("select max(col9) from test1")
+        
+        tdSql.query("select max(col1) from test1")
+        tdSql.checkData(0, 0, np.max(intData))
+
+        tdSql.query("select max(col2) from test1")
+        tdSql.checkData(0, 0, np.max(intData))
+
+        tdSql.query("select max(col3) from test1")
+        tdSql.checkData(0, 0, np.max(intData))
+
+        tdSql.query("select max(col4) from test1")
+        tdSql.checkData(0, 0, np.max(intData))
+        
+        tdSql.query("select max(col5) from test1")
+        tdSql.checkData(0, 0, np.max(floatData))
+
+        tdSql.query("select max(col6) from test1")
+        tdSql.checkData(0, 0, np.max(floatData))
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_min.py b/tests/pytest/functions/function_min.py
new file mode 100644
index 0000000000000000000000000000000000000000..bc180bc22414a4a3aa3d233438b10a04fd08bc2b
--- /dev/null
+++ b/tests/pytest/functions/function_min.py
@@ -0,0 +1,78 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # min verifacation 
+        tdSql.error("select min(ts) from test")
+        tdSql.error("select min(ts) from test1")
+        tdSql.error("select min(col7) from test")
+        tdSql.error("select min(col7) from test1")
+        tdSql.error("select min(col8) from test")
+        tdSql.error("select min(col8) from test1")
+        tdSql.error("select min(col9) from test")
+        tdSql.error("select min(col9) from test1")
+        
+        tdSql.query("select min(col1) from test1")
+        tdSql.checkData(0, 0, np.min(intData))
+
+        tdSql.query("select min(col2) from test1")
+        tdSql.checkData(0, 0, np.min(intData))
+
+        tdSql.query("select min(col3) from test1")
+        tdSql.checkData(0, 0, np.min(intData))
+
+        tdSql.query("select min(col4) from test1")
+        tdSql.checkData(0, 0, np.min(intData))
+        
+        tdSql.query("select min(col5) from test1")
+        tdSql.checkData(0, 0, np.min(floatData))
+
+        tdSql.query("select min(col6) from test1")
+        tdSql.checkData(0, 0, np.min(floatData))
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_operations.py b/tests/pytest/functions/function_operations.py
new file mode 100644
index 0000000000000000000000000000000000000000..930c23d8a60d84bcc57fa8952e4d8c8e847ec138
--- /dev/null
+++ b/tests/pytest/functions/function_operations.py
@@ -0,0 +1,77 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))                       
+
+        # min verifacation 
+        tdSql.error("select ts + col1 from test")
+        tdSql.error("select ts + col1 from test1")
+        tdSql.error("select col1 + col7 from test")
+        tdSql.error("select col1 + col7 from test1")
+        tdSql.error("select col1 + col8 from test")
+        tdSql.error("select col1 + col8 from test1")
+        tdSql.error("select col1 + col9 from test")
+        tdSql.error("select col1 + col9 from test1")
+
+        tdSql.query("select col1 + col2 from test1")
+        tdSql.checkRows(10)
+        tdSql.checkData(0, 0, 2.0)        
+
+        tdSql.query("select col1 + col2 * col3 + col3 / col4 + col5 + col6 from test1")
+        tdSql.checkRows(10)
+        tdSql.checkData(0, 0, 3.2)
+
+        tdSql.execute("insert into test1(ts, col1) values(%d, 11)" % (self.ts + 11))
+        tdSql.query("select col1 + col2 from test1")
+        tdSql.checkRows(11)
+        tdSql.checkData(10, 0, None)
+        
+        tdSql.query("select col1 + col2 * col3 from test1")
+        tdSql.checkRows(11)
+        tdSql.checkData(10, 0, None)
+
+        tdSql.query("select col1 + col2 * col3 + col3 / col4 + col5 + col6 from test1")
+        tdSql.checkRows(11)
+        tdSql.checkData(10, 0, None)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_percentile.py b/tests/pytest/functions/function_percentile.py
new file mode 100644
index 0000000000000000000000000000000000000000..aaeb94372e44282da0d83849c18e40857463b42c
--- /dev/null
+++ b/tests/pytest/functions/function_percentile.py
@@ -0,0 +1,140 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20))''')
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # percentile verifacation 
+        tdSql.error("select percentile(ts 20) from test")
+        tdSql.error("select apercentile(ts 20) from test")
+        tdSql.error("select percentile(col7 20) from test")
+        tdSql.error("select apercentile(col7 20) from test")
+        tdSql.error("select percentile(col8 20) from test")        
+        tdSql.error("select apercentile(col8 20) from test")
+        tdSql.error("select percentile(col9 20) from test")
+        tdSql.error("select apercentile(col9 20) from test")        
+
+        tdSql.query("select percentile(col1, 0) from test")        
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col1, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col1, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col1, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col1, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col1, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))  
+
+        tdSql.query("select percentile(col2, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col2, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col2, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col2, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col2, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col2, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col3, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col3, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col3, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col3, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col3, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100))
+        tdSql.query("select apercentile(col3, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col4, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 0))
+        tdSql.query("select apercentile(col4, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col4, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 50))
+        tdSql.query("select apercentile(col4, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col4, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(intData, 100)) 
+        tdSql.query("select apercentile(col4, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+
+        tdSql.query("select percentile(col5, 0) from test")        
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 0))
+        tdSql.query("select apercentile(col5, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col5, 50) from test")
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 50))
+        tdSql.query("select apercentile(col5, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))        
+        tdSql.query("select percentile(col5, 100) from test")
+        print("query result: %s" % tdSql.getData(0, 0))
+        print("array result: %s" % np.percentile(floatData, 100)) 
+        tdSql.query("select apercentile(col5, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))     
+
+        tdSql.query("select percentile(col6, 0) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 0))
+        tdSql.query("select apercentile(col6, 0) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col6, 50) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 50))
+        tdSql.query("select apercentile(col6, 50) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))
+        tdSql.query("select percentile(col6, 100) from test")
+        tdSql.checkData(0, 0, np.percentile(floatData, 100)) 
+        tdSql.query("select apercentile(col6, 100) from test")
+        print("apercentile result: %s" % tdSql.getData(0, 0))       
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_spread.py b/tests/pytest/functions/function_spread.py
new file mode 100644
index 0000000000000000000000000000000000000000..462933597388090f069f9319751aaea032ea4133
--- /dev/null
+++ b/tests/pytest/functions/function_spread.py
@@ -0,0 +1,106 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()        
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        tdSql.execute("insert into test1 values(%d, 0, 0, 0, 0, 0.0, 0.0, False, ' ', ' ')" % (self.ts - 1))
+        
+        # spread verifacation 
+        tdSql.query("select spread(ts) from test1")
+        tdSql.checkRows(1)       
+
+        tdSql.query("select spread(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        tdSql.query("select spread(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        tdSql.query("select spread(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        tdSql.query("select spread(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        tdSql.query("select spread(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        tdSql.query("select spread(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)
+
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))                                  
+       
+        tdSql.error("select spread(col7) from test")     
+        tdSql.error("select spread(col7) from test1")               
+        tdSql.error("select spread(col8) from test") 
+        tdSql.error("select spread(col8) from test1")
+        tdSql.error("select spread(col9) from test")        
+        tdSql.error("select spread(col9) from test1")
+        
+        tdSql.query("select spread(col1) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select spread(col2) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select spread(col3) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select spread(col4) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 10)
+
+        tdSql.query("select spread(col5) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+
+        tdSql.query("select spread(col6) from test1")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 9.1)
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_stddev.py b/tests/pytest/functions/function_stddev.py
new file mode 100644
index 0000000000000000000000000000000000000000..23df415aa35feecf84ba40a50604d2b86fc7f008
--- /dev/null
+++ b/tests/pytest/functions/function_stddev.py
@@ -0,0 +1,80 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # stddev verifacation 
+        tdSql.error("select stddev(ts) from test1")
+        tdSql.error("select stddev(col1) from test")
+        tdSql.error("select stddev(col2) from test")
+        tdSql.error("select stddev(col3) from test")
+        tdSql.error("select stddev(col4) from test")
+        tdSql.error("select stddev(col5) from test")
+        tdSql.error("select stddev(col6) from test")
+        tdSql.error("select stddev(col7) from test1")
+        tdSql.error("select stddev(col8) from test1")
+        tdSql.error("select stddev(col9) from test1")
+
+        tdSql.query("select stddev(col1) from test1")
+        tdSql.checkData(0, 0, np.std(intData))
+
+        tdSql.query("select stddev(col2) from test1")
+        tdSql.checkData(0, 0, np.std(intData))
+
+        tdSql.query("select stddev(col3) from test1")
+        tdSql.checkData(0, 0, np.std(intData))
+
+        tdSql.query("select stddev(col4) from test1")
+        tdSql.checkData(0, 0, np.std(intData))
+
+        tdSql.query("select stddev(col5) from test1")
+        tdSql.checkData(0, 0, np.std(floatData))
+
+        tdSql.query("select stddev(col6) from test1")
+        tdSql.checkData(0, 0, np.std(floatData))
+            
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_sum.py b/tests/pytest/functions/function_sum.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef5ddfe3158cc3c3072fb474bdc42d50a8de30f0
--- /dev/null
+++ b/tests/pytest/functions/function_sum.py
@@ -0,0 +1,69 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # sum verifacation 
+        tdSql.error("select sum(ts) from test")
+        tdSql.error("select sum(col7) from test")
+        tdSql.error("select sum(col8) from test")
+        tdSql.error("select sum(col9) from test")
+
+        tdSql.query("select sum(col1) from test")
+        tdSql.checkData(0, 0, np.sum(intData))
+        tdSql.query("select sum(col2) from test")
+        tdSql.checkData(0, 0, np.sum(intData))
+        tdSql.query("select sum(col3) from test")
+        tdSql.checkData(0, 0, np.sum(intData))
+        tdSql.query("select sum(col4) from test")
+        tdSql.checkData(0, 0, np.sum(intData))
+        tdSql.query("select sum(col5) from test")
+        tdSql.checkData(0, 0, np.sum(floatData)) 
+        tdSql.query("select sum(col6) from test")
+        tdSql.checkData(0, 0, np.sum(floatData))              
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_top.py b/tests/pytest/functions/function_top.py
new file mode 100644
index 0000000000000000000000000000000000000000..e24ff1cc5339c79e1a87653e9b528ec34f3c2ea9
--- /dev/null
+++ b/tests/pytest/functions/function_top.py
@@ -0,0 +1,98 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # top verifacation 
+        tdSql.error("select top(ts, 10) from test")
+        tdSql.error("select top(col1, 0) from test")
+        tdSql.error("select top(col1, 101) from test")
+        tdSql.error("select top(col2, 0) from test")
+        tdSql.error("select top(col2, 101) from test")
+        tdSql.error("select top(col3, 0) from test")
+        tdSql.error("select top(col3, 101) from test")
+        tdSql.error("select top(col4, 0) from test")
+        tdSql.error("select top(col4, 101) from test")
+        tdSql.error("select top(col5, 0) from test")
+        tdSql.error("select top(col5, 101) from test")
+        tdSql.error("select top(col6, 0) from test")
+        tdSql.error("select top(col6, 101) from test")        
+        tdSql.error("select top(col7, 10) from test")        
+        tdSql.error("select top(col8, 10) from test")
+        tdSql.error("select top(col9, 10) from test")
+
+        tdSql.query("select top(col1, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col2, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col3, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col4, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 9)
+        tdSql.checkData(1, 1, 10)
+
+        tdSql.query("select top(col5, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 8.1)
+        tdSql.checkData(1, 1, 9.1)
+
+        tdSql.query("select top(col6, 2) from test")
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 1, 8.1)
+        tdSql.checkData(1, 1, 9.1)
+                   
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/functions/function_twa.py b/tests/pytest/functions/function_twa.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ce4c99b6041e2cfd6bccdbc0e00e5fd8037f9d9
--- /dev/null
+++ b/tests/pytest/functions/function_twa.py
@@ -0,0 +1,135 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+        
+    def run(self):
+        tdSql.prepare()
+
+        intData = []        
+        floatData = []
+
+        tdSql.execute('''create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, 
+                    col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20))''')
+        tdSql.execute("create table test1 using test tags('beijing')")
+        for i in range(self.rowNum):
+            tdSql.execute("insert into test1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" 
+                        % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1))
+            intData.append(i + 1)            
+            floatData.append(i + 0.1)                        
+
+        # twa verifacation 
+        tdSql.error("select twa(ts) from test")
+        tdSql.error("select twa(ts) from test1")
+
+        tdSql.error("select twa(col1) from test")
+        tdSql.error("select twa(col1) from test1")
+
+        tdSql.error("select twa(col2) from test")
+        tdSql.error("select twa(col2) from test1")
+
+        tdSql.error("select twa(col3) from test")
+        tdSql.error("select twa(col3) from test1")
+
+        tdSql.error("select twa(col4) from test")
+        tdSql.error("select twa(col4) from test1")
+
+        tdSql.error("select twa(col5) from test")
+        tdSql.error("select twa(col5) from test1")
+
+        tdSql.error("select twa(col6) from test")
+        tdSql.error("select twa(col6) from test1")        
+
+        tdSql.error("select twa(col7) from test")
+        tdSql.error("select twa(col7) from test1")
+
+        tdSql.error("select twa(col8) from test")
+        tdSql.error("select twa(col8) from test1")
+
+        tdSql.error("select twa(col9) from test")
+        tdSql.error("select twa(col9) from test1")
+
+        tdSql.error("select twa(col1) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col1) from test1 where ts > %d" % self.ts)
+
+        tdSql.error("select twa(col2) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col2) from test1 where ts > %d" % self.ts)
+
+        tdSql.error("select twa(col3) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col3) from test1 where ts > %d" % self.ts)
+
+        tdSql.error("select twa(col4) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col4) from test1 where ts > %d" % self.ts)
+            
+        tdSql.error("select twa(col5) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col5) from test1 where ts > %d" % self.ts)
+
+        tdSql.error("select twa(col6) from test where ts > %d" % self.ts)
+        tdSql.error("select twa(col6) from test1 where ts > %d" % self.ts)
+
+        tdSql.error("select twa(col1) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col1) from test1 where ts < %d" % (self.ts + self.rowNum))
+
+        tdSql.error("select twa(col2) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col2) from test1 where ts < %d" % (self.ts + self.rowNum))
+
+        tdSql.error("select twa(col3) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col3) from test1 where ts < %d" % (self.ts + self.rowNum))
+
+        tdSql.error("select twa(col4) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col4) from test1 where ts < %d" % (self.ts + self.rowNum))
+
+        tdSql.error("select twa(col5) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col5) from test1 where ts < %d" % (self.ts + self.rowNum))
+
+        tdSql.error("select twa(col6) from test where ts < %d" % (self.ts + self.rowNum))
+        tdSql.error("select twa(col6) from test1 where ts < %d" % (self.ts + self.rowNum))
+        
+        tdSql.query("select twa(col1) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+        tdSql.query("select twa(col1) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+        tdSql.query("select twa(col2) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+        tdSql.query("select twa(col2) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+        tdSql.query("select twa(col3) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+        tdSql.query("select twa(col3) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+        tdSql.query("select twa(col4) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum)) 
+        tdSql.query("select twa(col4) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+        tdSql.query("select twa(col5) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum)) 
+        tdSql.query("select twa(col5) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+        tdSql.query("select twa(col6) from test where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))         
+        tdSql.query("select twa(col6) from test1 where ts > %d  and ts < %d" % (self.ts, self.ts + self.rowNum))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/__init__.py b/tests/pytest/import_merge/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/import_merge/importBlock1H.py b/tests/pytest/import_merge/importBlock1H.py
new file mode 100644
index 0000000000000000000000000000000000000000..fca37ff1b1e3a1f9129e9498076fc995ba8f0918
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1H.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(39)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1HO.py b/tests/pytest/import_merge/importBlock1HO.py
new file mode 100644
index 0000000000000000000000000000000000000000..c853d3a6afe216c9de3bc2f19eabbed56bce2bb2
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1HO.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(43)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1HPO.py b/tests/pytest/import_merge/importBlock1HPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..968f21f50f0d11f7e70c8b4fb809690ab04c6982
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1HPO.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(15, 43):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(47)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1S.py b/tests/pytest/import_merge/importBlock1S.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a0ce18edfe96512d84c3132b465c253769ff38c
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1S.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 50 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 51):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(50)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1Sub.py b/tests/pytest/import_merge/importBlock1Sub.py
new file mode 100644
index 0000000000000000000000000000000000000000..2eaf5fc26e0f901ba5dc2b0439f80c00bdada940
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1Sub.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1T.py b/tests/pytest/import_merge/importBlock1T.py
new file mode 100644
index 0000000000000000000000000000000000000000..ffac67a7e11b7e5d26c14fe3b6a97769d9bf8322
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1T.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime = self.startTime + 38
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(39)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1TO.py b/tests/pytest/import_merge/importBlock1TO.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d6c6624d94f21a4ad9252da227dd846e2363e76
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1TO.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 30
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(40)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock1TPO.py b/tests/pytest/import_merge/importBlock1TPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..e7807e892a4f0b889515674a2cde634d6cc7add9
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock1TPO.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(35, 43):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 30 data later with partly overlap")
+        startTime = self.startTime + 25
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(55)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2H.py b/tests/pytest/import_merge/importBlock2H.py
new file mode 100644
index 0000000000000000000000000000000000000000..eea1e4bcf809a5561fb4f93bf2e92832824f9d74
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2H.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2HO.py b/tests/pytest/import_merge/importBlock2HO.py
new file mode 100644
index 0000000000000000000000000000000000000000..99a9662f1c3bc38c1cb08084eeebd9fd9a8cd20a
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2HO.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(81)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2HPO.py b/tests/pytest/import_merge/importBlock2HPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..54afef6c06d4beff95a8a5e8a5e9048d5b856529
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2HPO.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(15, 81):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(85)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2S.py b/tests/pytest/import_merge/importBlock2S.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d4757709a7b58dcdecbe652c374169381f54112
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2S.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 90 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 91):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(90)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2Sub.py b/tests/pytest/import_merge/importBlock2Sub.py
new file mode 100644
index 0000000000000000000000000000000000000000..db43a492bcd5ee5fea81867d1887d47e83cc8f18
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2Sub.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2T.py b/tests/pytest/import_merge/importBlock2T.py
new file mode 100644
index 0000000000000000000000000000000000000000..c0d85fa3b07d341f90a32d14cb1a62c7467cc4c2
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2T.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime = self.startTime + 76
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2TO.py b/tests/pytest/import_merge/importBlock2TO.py
new file mode 100644
index 0000000000000000000000000000000000000000..05692c336de67d48a0f973f5c296cfff6dc0f00e
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2TO.py
@@ -0,0 +1,75 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 70
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(80)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlock2TPO.py b/tests/pytest/import_merge/importBlock2TPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..817d2db3827b7484d0134094aa2c6fb6aee61857
--- /dev/null
+++ b/tests/pytest/import_merge/importBlock2TPO.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 61):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(65, 81):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 30 data later with partly overlap")
+        startTime = self.startTime + 55
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(85)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importBlockbetween.py b/tests/pytest/import_merge/importBlockbetween.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e4ac8a7370af0c0645b0ff15aba62ff18be3ced
--- /dev/null
+++ b/tests/pytest/import_merge/importBlockbetween.py
@@ -0,0 +1,78 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data with gap between 2 blocks")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+        for rid in range(40, 78):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
+
+        tdLog.info("================= step4")
+        tdLog.info("import data into the gap between 2 blocks")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(39, 40):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCSV.py b/tests/pytest/import_merge/importCSV.py
new file mode 100644
index 0000000000000000000000000000000000000000..b4441949a1c8e83f15e07d76ceb49de0dc418afe
--- /dev/null
+++ b/tests/pytest/import_merge/importCSV.py
@@ -0,0 +1,94 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import csv 
+import random
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.csvfile = "/tmp/file.csv"
+        self.rows = 10000
+        self.ntables = 1
+        self.startTime = 1520000010000
+    def genRandomStr(self, maxLen):
+        H = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+        salt = ''
+        if maxLen <= 1:
+            maxLen = 2
+        l = random.randint(1,maxLen)
+        for i in range(l):
+            salt += random.choice(H)
+        return salt
+    def createCSVFile(self):
+        f = open(self.csvfile,'w',encoding='utf-8') 
+        csv_writer = csv.writer(f, quoting=csv.QUOTE_NONNUMERIC) 
+        for i in range(self.rows):   
+            csv_writer.writerow([self.startTime + i, 
+                                self.genRandomStr(5),
+                                self.genRandomStr(6),
+                                self.genRandomStr(7),
+                                self.genRandomStr(8),
+                                self.genRandomStr(9),
+                                self.genRandomStr(10),
+                                self.genRandomStr(11),
+                                self.genRandomStr(12),
+                                self.genRandomStr(13),
+                                self.genRandomStr(14)])
+        f.close()
+    def destroyCSVFile(self):
+        os.remove(self.csvfile) 
+    def run(self):
+        self.createCSVFile()
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+        tdSql.execute('''create table tbx (ts TIMESTAMP, 
+                         collect_area NCHAR(5), 
+                         device_id BINARY(6), 
+                         imsi BINARY(7),  
+                         imei BINARY(8),  
+                         mdn BINARY(9), 
+                         net_type BINARY(10), 
+                         mno NCHAR(11), 
+                         province NCHAR(12), 
+                         city NCHAR(13), 
+                         alarm BINARY(14))''')
+    
+        tdSql.execute("import into tbx file \'%s\'"%(self.csvfile))
+        tdSql.query('select * from tbx')
+        tdSql.checkRows(self.rows)
+
+    def stop(self):
+        self.destroyCSVFile()
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+        tdDnodes.stop(1)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileH.py b/tests/pytest/import_merge/importCacheFileH.py
new file mode 100644
index 0000000000000000000000000000000000000000..3398f7bdad8d7524e223f0a2847b579081686476
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileH.py
@@ -0,0 +1,88 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(21)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileHO.py b/tests/pytest/import_merge/importCacheFileHO.py
new file mode 100644
index 0000000000000000000000000000000000000000..19520dc3d048a267c03850b608d47db20394c43d
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileHO.py
@@ -0,0 +1,91 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileHPO.py b/tests/pytest/import_merge/importCacheFileHPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..9e0a57fb462cdb6ae1dee3c8bfee4488c99a76a0
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileHPO.py
@@ -0,0 +1,95 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 9 sequential data with gap")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 5):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(9)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 9 data again with gap")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 5):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(18)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(23)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileS.py b/tests/pytest/import_merge/importCacheFileS.py
new file mode 100644
index 0000000000000000000000000000000000000000..2f0af569e564b64cbb88c048762e8d41dcf21cbd
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileS.py
@@ -0,0 +1,91 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 30 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(30)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileSub.py b/tests/pytest/import_merge/importCacheFileSub.py
new file mode 100644
index 0000000000000000000000000000000000000000..300bb6e8d09f4484e22e64a0f2caf50cab7c8ab4
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileSub.py
@@ -0,0 +1,91 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileT.py b/tests/pytest/import_merge/importCacheFileT.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab33cf6a93c4bbd7f27967f6a70b61fc62230f65
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileT.py
@@ -0,0 +1,88 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 20
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(21)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileTO.py b/tests/pytest/import_merge/importCacheFileTO.py
new file mode 100644
index 0000000000000000000000000000000000000000..00e22da976618b4ee870a5702542f669693e3727
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileTO.py
@@ -0,0 +1,91 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 15
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importCacheFileTPO.py b/tests/pytest/import_merge/importCacheFileTPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..c6089e1d687fea6ac900931a8171e45f4923f0cb
--- /dev/null
+++ b/tests/pytest/import_merge/importCacheFileTPO.py
@@ -0,0 +1,95 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 9 sequential data with gap")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 7):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(9)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 9 data again with gap")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 7):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(18)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 20 data later with partly overlap")
+        startTime = self.startTime + 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataH2.py b/tests/pytest/import_merge/importDataH2.py
new file mode 100644
index 0000000000000000000000000000000000000000..a21f0c47be2eb11a57182d22b56d4447ff2d7ab6
--- /dev/null
+++ b/tests/pytest/import_merge/importDataH2.py
@@ -0,0 +1,94 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % (self.maxrows // 2))
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.maxrows // 2 + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(self.maxrows // 2)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step7")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.maxrows // 2 + 1)
+
+        tdLog.info("================= step8")
+        tdLog.info("import 10 data in batch before")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime - rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step9")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.maxrows // 2 + 11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataHO.py b/tests/pytest/import_merge/importDataHO.py
new file mode 100644
index 0000000000000000000000000000000000000000..fdcaedd83c99482914805cb65a067cbcbc78a128
--- /dev/null
+++ b/tests/pytest/import_merge/importDataHO.py
@@ -0,0 +1,84 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+        self.rowsPerTable = 20
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 6 data before with overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 7):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rowsPerTable + 3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataHO2.py b/tests/pytest/import_merge/importDataHO2.py
new file mode 100644
index 0000000000000000000000000000000000000000..b094701132677d6e72e834b16b7edc106682be14
--- /dev/null
+++ b/tests/pytest/import_merge/importDataHO2.py
@@ -0,0 +1,84 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+        self.rowsPerTable = 100
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 6 data before with overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(6, 0, -1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rowsPerTable + 3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataHPO.py b/tests/pytest/import_merge/importDataHPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d74c0c3522eba3687618132c27ce95f86f91b91
--- /dev/null
+++ b/tests/pytest/import_merge/importDataHPO.py
@@ -0,0 +1,86 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+        self.rowsPerTable = 20
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 10):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(14, self.rowsPerTable + 5):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 4
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(self.rowsPerTable + 8)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastH.py b/tests/pytest/import_merge/importDataLastH.py
new file mode 100644
index 0000000000000000000000000000000000000000..c8e5f62423dc21254d215fac41926aeb9ce5ba40
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastH.py
@@ -0,0 +1,80 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(206)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastHO.py b/tests/pytest/import_merge/importDataLastHO.py
new file mode 100644
index 0000000000000000000000000000000000000000..33215997a4220b65228b630ebc350bf9dae15046
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastHO.py
@@ -0,0 +1,83 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 5 data before with overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(207)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastHPO.py b/tests/pytest/import_merge/importDataLastHPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa8542f35b8e9639db20dc2e1886fca36140e825
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastHPO.py
@@ -0,0 +1,85 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(14, 209):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(210)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastS.py b/tests/pytest/import_merge/importDataLastS.py
new file mode 100644
index 0000000000000000000000000000000000000000..2f595fef542955e616ef2e6ebcce7f23bce71d80
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastS.py
@@ -0,0 +1,83 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 250 data covering the existing data")
+        startTime = self.startTime - 15
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 251):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(250)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastSub.py b/tests/pytest/import_merge/importDataLastSub.py
new file mode 100644
index 0000000000000000000000000000000000000000..bfcad2d252cccb2404b3989c474310e0a19afe2e
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastSub.py
@@ -0,0 +1,85 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastT.py b/tests/pytest/import_merge/importDataLastT.py
new file mode 100644
index 0000000000000000000000000000000000000000..08e944eb6836a6f7f938639b40a6124f7bb64ec6
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastT.py
@@ -0,0 +1,76 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 205
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(206)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastTO.py b/tests/pytest/import_merge/importDataLastTO.py
new file mode 100644
index 0000000000000000000000000000000000000000..a82c0541414298accfdfb447c318ffafd88e5852
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastTO.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 5 data later with overlap")
+        startTime = self.startTime + 203
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(208)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataLastTPO.py b/tests/pytest/import_merge/importDataLastTPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..ff75a1b2ae87891853fa93f0f49fff339cf6e488
--- /dev/null
+++ b/tests/pytest/import_merge/importDataLastTPO.py
@@ -0,0 +1,81 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.maxrows, 10 + self.maxrows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 196):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(200, 210):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data later with partly overlap")
+        startTime = self.startTime + 192
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(212)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataS.py b/tests/pytest/import_merge/importDataS.py
new file mode 100644
index 0000000000000000000000000000000000000000..37627e8d6bcc8319805275525ef7874132e0da4d
--- /dev/null
+++ b/tests/pytest/import_merge/importDataS.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import 20 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 30 data covering the existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(30)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataSub.py b/tests/pytest/import_merge/importDataSub.py
new file mode 100644
index 0000000000000000000000000000000000000000..17e2b141b7014fd2ce4d31f8c335e122aca730ba
--- /dev/null
+++ b/tests/pytest/import_merge/importDataSub.py
@@ -0,0 +1,85 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % (self.maxrows // 2))
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.maxrows // 2 + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(self.maxrows // 2)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step9")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.maxrows // 2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataT.py b/tests/pytest/import_merge/importDataT.py
new file mode 100644
index 0000000000000000000000000000000000000000..b0b7b82b790e81c475c714ba570a9a6f1801cc13
--- /dev/null
+++ b/tests/pytest/import_merge/importDataT.py
@@ -0,0 +1,76 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import 20 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 20
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(21)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataTO.py b/tests/pytest/import_merge/importDataTO.py
new file mode 100644
index 0000000000000000000000000000000000000000..c0b57136af7a51c1d184eb5789d95efc0148118c
--- /dev/null
+++ b/tests/pytest/import_merge/importDataTO.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import 20 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 6 data later with overlap")
+        startTime = self.startTime + 18
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 7):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(24)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importDataTPO.py b/tests/pytest/import_merge/importDataTPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..8a1c9264b433484e768cdfffbccdb0966e3d15cd
--- /dev/null
+++ b/tests/pytest/import_merge/importDataTPO.py
@@ -0,0 +1,82 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.maxrows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import 20 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 18):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(22, 25):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data later with partly overlap")
+        startTime = self.startTime + 15
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(35)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHORestart.py b/tests/pytest/import_merge/importHORestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..f74c4c76d616753f8cadc87ba715e473eae0fb46
--- /dev/null
+++ b/tests/pytest/import_merge/importHORestart.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 5 data before with overlap")
+        startTime = self.startTime - 2
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(12)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHPORestart.py b/tests/pytest/import_merge/importHPORestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5f79fbe6c2eb686d63f5b7de81651a98072a986
--- /dev/null
+++ b/tests/pytest/import_merge/importHPORestart.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 8 sequential data with gap")
+        startTime = self.startTime
+        for rid in range(1, 4):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+        for rid in range(6, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(8)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 8 data before with partly overlap")
+        startTime = self.startTime - 2
+        for rid in range(1, 9):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(12)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHRestart.py b/tests/pytest/import_merge/importHRestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..be67039789dd660ddb0be8d56753737010e47e79
--- /dev/null
+++ b/tests/pytest/import_merge/importHRestart.py
@@ -0,0 +1,69 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHead.py b/tests/pytest/import_merge/importHead.py
new file mode 100644
index 0000000000000000000000000000000000000000..80e6d92c69f2328bd35a43af820ca16658daf63b
--- /dev/null
+++ b/tests/pytest/import_merge/importHead.py
@@ -0,0 +1,70 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHeadOverlap.py b/tests/pytest/import_merge/importHeadOverlap.py
new file mode 100644
index 0000000000000000000000000000000000000000..535c0c285960c4657dc1cefeb0dd2cf128a2434f
--- /dev/null
+++ b/tests/pytest/import_merge/importHeadOverlap.py
@@ -0,0 +1,65 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 5 data before with overlap")
+        startTime = self.startTime - 2
+        for rid in range(1, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(12)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importHeadPartOverlap.py b/tests/pytest/import_merge/importHeadPartOverlap.py
new file mode 100644
index 0000000000000000000000000000000000000000..85ddd64f0a66c5b962d1f33d517c1d28f9521d0a
--- /dev/null
+++ b/tests/pytest/import_merge/importHeadPartOverlap.py
@@ -0,0 +1,69 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 8 sequential data with gap")
+        startTime = self.startTime
+        for rid in range(1, 4):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+        startTime += 2
+        for rid in range(6, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(8)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 8 data before with partly overlap")
+        startTime = self.startTime - 2
+        for rid in range(1, 9):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(12)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importInsertThenImport.py b/tests/pytest/import_merge/importInsertThenImport.py
new file mode 100644
index 0000000000000000000000000000000000000000..292fae8c47b398dcbacdb8b76592826bcc8b6019
--- /dev/null
+++ b/tests/pytest/import_merge/importInsertThenImport.py
@@ -0,0 +1,85 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdSql.prepare()
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("insert 100 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 101):
+            tdSql.execute(
+                'insert into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(100)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 100 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 101):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, 100 + rid))
+
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(100)
+        tdSql.checkData(0, 1, 1)
+
+        tdLog.info("================= step5")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdLog.info("import 100 sequential data again")
+        startTime = self.startTime
+        for rid in range(1, 101):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, 100 + rid))
+
+        tdLog.info("================= step7")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(100)
+        tdSql.checkData(0, 1, 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastH.py b/tests/pytest/import_merge/importLastH.py
new file mode 100644
index 0000000000000000000000000000000000000000..17fa233e3723e1d9e6cc4ec97c8eac2716751f00
--- /dev/null
+++ b/tests/pytest/import_merge/importLastH.py
@@ -0,0 +1,74 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(6)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastHO.py b/tests/pytest/import_merge/importLastHO.py
new file mode 100644
index 0000000000000000000000000000000000000000..adb44fc0eab9a4923b0896a1357b24603f1ff3fd
--- /dev/null
+++ b/tests/pytest/import_merge/importLastHO.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 4 data before with overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 5):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(7)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastHPO.py b/tests/pytest/import_merge/importLastHPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8ed2d9ef10dbaa52e92ba50625be25c495091ea
--- /dev/null
+++ b/tests/pytest/import_merge/importLastHPO.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 6 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 4):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(6, 9):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(6)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 8 data before with partly overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 9):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastS.py b/tests/pytest/import_merge/importLastS.py
new file mode 100644
index 0000000000000000000000000000000000000000..bf222a0d5f3c27c5c7774b384799a6a0aa5e4114
--- /dev/null
+++ b/tests/pytest/import_merge/importLastS.py
@@ -0,0 +1,76 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data covering existing data")
+        startTime = self.startTime - 10
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastSub.py b/tests/pytest/import_merge/importLastSub.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a6b9f41502970149257b1aef5c7a37824401768
--- /dev/null
+++ b/tests/pytest/import_merge/importLastSub.py
@@ -0,0 +1,77 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 3 data totally repetitive")
+        startTime = self.startTime + 1
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 4):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastT.py b/tests/pytest/import_merge/importLastT.py
new file mode 100644
index 0000000000000000000000000000000000000000..2b1be1fe2b37aa5e4d59bb6ecef7d0bb2180cf9d
--- /dev/null
+++ b/tests/pytest/import_merge/importLastT.py
@@ -0,0 +1,78 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 5
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(6)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastTO.py b/tests/pytest/import_merge/importLastTO.py
new file mode 100644
index 0000000000000000000000000000000000000000..ce189f63718956991982bd33296eb71bd5a82d45
--- /dev/null
+++ b/tests/pytest/import_merge/importLastTO.py
@@ -0,0 +1,81 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 5 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(5)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 4 data later with overlap")
+        startTime = self.startTime + 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 5):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(7)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importLastTPO.py b/tests/pytest/import_merge/importLastTPO.py
new file mode 100644
index 0000000000000000000000000000000000000000..627d090855ac320f56a90fb647101e8ccc315acd
--- /dev/null
+++ b/tests/pytest/import_merge/importLastTPO.py
@@ -0,0 +1,82 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.maxrows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db maxrows %d' % self.maxrows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("less than 10 rows will go to last file")
+
+        tdLog.info("================= step2")
+        tdLog.info("import 6 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 4):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(6, 9):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(6)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 8 data later with partly overlap")
+        startTime = self.startTime + 2
+        for rid in range(1, 9):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importSRestart.py b/tests/pytest/import_merge/importSRestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..29f5a19b54fb0cbf1eb81a66c66813f3fcdd9982
--- /dev/null
+++ b/tests/pytest/import_merge/importSRestart.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data cover existing data")
+        startTime = self.startTime - 5
+        for rid in range(1, 21):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importSpan.py b/tests/pytest/import_merge/importSpan.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e20e9754f86b287328aacb3e96f9ac0e7c4eee6
--- /dev/null
+++ b/tests/pytest/import_merge/importSpan.py
@@ -0,0 +1,74 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data cover existing data")
+        startTime = self.startTime - 5
+        for rid in range(1, 21):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importSubRestart.py b/tests/pytest/import_merge/importSubRestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1a6f30c436c5aa52d5ee4affa03d18c5475ced7
--- /dev/null
+++ b/tests/pytest/import_merge/importSubRestart.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 20 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 21):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 5
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTORestart.py b/tests/pytest/import_merge/importTORestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..07eb6c28cb79c16504f2acab036a3b66c3bccabf
--- /dev/null
+++ b/tests/pytest/import_merge/importTORestart.py
@@ -0,0 +1,79 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 6 data after with overlap")
+        startTime = self.startTime + 8
+        for rid in range(1, 7):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(14)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTPORestart.py b/tests/pytest/import_merge/importTPORestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..10bbf3efced90b6c255326c0e8b8e0c106a3a038
--- /dev/null
+++ b/tests/pytest/import_merge/importTPORestart.py
@@ -0,0 +1,83 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 8 sequential data with gap")
+        startTime = self.startTime
+        for rid in range(1, 6):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+        for rid in range(8, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(8)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 8 data after with partly overlap")
+        startTime = self.startTime + 3
+        for rid in range(1, 9):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTRestart.py b/tests/pytest/import_merge/importTRestart.py
new file mode 100644
index 0000000000000000000000000000000000000000..63a9368eca2b6a3377b32dc6a3948cf5a0ba1186
--- /dev/null
+++ b/tests/pytest/import_merge/importTRestart.py
@@ -0,0 +1,76 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime = self.startTime + 11
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTail.py b/tests/pytest/import_merge/importTail.py
new file mode 100644
index 0000000000000000000000000000000000000000..a552edb2449d8c8360403561398070279b7143c9
--- /dev/null
+++ b/tests/pytest/import_merge/importTail.py
@@ -0,0 +1,70 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime += 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTailOverlap.py b/tests/pytest/import_merge/importTailOverlap.py
new file mode 100644
index 0000000000000000000000000000000000000000..78e51f93f92ab510d56b55201c801cc53fbded12
--- /dev/null
+++ b/tests/pytest/import_merge/importTailOverlap.py
@@ -0,0 +1,72 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        for rid in range(1, 11):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 6 data after with overlap")
+        startTime = self.startTime + 8
+        for rid in range(1, 7):
+            tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+            startTime += 1
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(14)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importTailPartOverlap.py b/tests/pytest/import_merge/importTailPartOverlap.py
new file mode 100644
index 0000000000000000000000000000000000000000..e433cb66f37102a085c0faebbd85122b163c9c47
--- /dev/null
+++ b/tests/pytest/import_merge/importTailPartOverlap.py
@@ -0,0 +1,78 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 8 sequential data with gap")
+        startTime = self.startTime
+        for rid in range(1, 6):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+        for rid in range(8, 11):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(8)
+
+        tdLog.info("================= step4")
+        tdLog.info("import 8 data after with partly overlap")
+        startTime = self.startTime + 3
+        for rid in range(1, 9):
+            tdSql.execute(
+                'import into tb1 values(%ld, %d)' %
+                (startTime + rid, rid))
+
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/import_merge/importToCommit.py b/tests/pytest/import_merge/importToCommit.py
new file mode 100644
index 0000000000000000000000000000000000000000..7bec5fcd5d3124e588b4d6d0910e1dafc1a991bb
--- /dev/null
+++ b/tests/pytest/import_merge/importToCommit.py
@@ -0,0 +1,85 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 128')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, i int)')
+        tdLog.info(
+            "one block can import 38 records and totally there are 40 blocks")
+
+        tdLog.info("================= step2")
+        tdLog.info('insert data until the first commit')
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        dataDir = dnodesDir + '/dnode1/data/vnode'
+        startTime = self.startTime
+        rid0 = 1
+        while (True):
+            sqlcmd = 'insert into tb1 values(%ld, %d)' % (
+                startTime + rid0 * 2, rid0)
+            tdSql.execute(sqlcmd)
+            rid0 += 1
+            vnodes = os.listdir(dataDir)
+            if (len(vnodes) > 0):
+                tdLog.info("data is committed, stop inserting")
+                break
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before ")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(3, 4):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(rid0 - 1 + 1)
+
+        tdLog.info("================= step7")
+        tdSql.execute('reset query cache')
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, rid0 - 1 + 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/__init__.py b/tests/pytest/insert/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/insert/alterTableAndInsert.py b/tests/pytest/insert/alterTableAndInsert.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0447704f3cfa594f3bda01cb0dd14b2e795bb5f
--- /dev/null
+++ b/tests/pytest/insert/alterTableAndInsert.py
@@ -0,0 +1,40 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute("create table cars(ts timestamp, speed int) tags(id int)")
+        tdSql.execute("create table car0 using cars tags(0)")
+        tdSql.execute("insert into car0 values(now, 1)")
+        tdSql.execute("alter table cars add column c2 int")
+        tdSql.execute("insert into car0(ts, 'speed') values(now, 2)")
+        tdSql.checkAffectedRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/basic.py b/tests/pytest/insert/basic.py
new file mode 100644
index 0000000000000000000000000000000000000000..dcb5834d559968a964c4057c61d9b6a40cf8ab15
--- /dev/null
+++ b/tests/pytest/insert/basic.py
@@ -0,0 +1,52 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        ret = tdSql.execute('create table tb (ts timestamp, speed int)')
+
+        insertRows = 10
+        tdLog.info("insert %d rows" % (insertRows))
+        for i in range(0, insertRows):
+            ret = tdSql.execute(
+                'insert into tb values (now + %dm, %d)' %
+                (i, i))
+
+        tdLog.info("insert earlier data")
+        tdSql.execute('insert into tb values (now - 5m , 10)')
+        tdSql.execute('insert into tb values (now - 6m , 10)')
+        tdSql.execute('insert into tb values (now - 7m , 10)')
+        tdSql.execute('insert into tb values (now - 8m , 10)')
+
+        tdSql.query("select * from tb")
+        tdSql.checkRows(insertRows + 4)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/bigint.py b/tests/pytest/insert/bigint.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c7d2d0f9507e8688dd73bcefe88632361c80c70
--- /dev/null
+++ b/tests/pytest/insert/bigint.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed bigint)')
+        tdSql.execute('create table tb (ts timestamp, speed bigint)')
+        tdLog.info("insert into tb values (now, -9223372036854770000)")
+        tdSql.execute("insert into tb values (now, -9223372036854770000)")
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkData(0, 1, -9223372036854770000)')
+        tdSql.checkData(0, 1, -9223372036854770000)
+        tdLog.info('=============== step2')
+        tdLog.info("insert into tb values (now+1a, -9223372036854770000)")
+        tdSql.execute("insert into tb values (now+1a, -9223372036854770000)")
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('tdSql.checkData(0, 1, -9223372036854770000)')
+        tdSql.checkData(0, 1, -9223372036854770000)
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2a, 9223372036854770000)")
+        tdSql.execute("insert into tb values (now+2a, 9223372036854770000)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('tdSql.checkData(0, 1, 9223372036854770000)')
+        tdSql.checkData(0, 1, 9223372036854770000)
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3a, 9223372036854770000)")
+        tdSql.execute("insert into tb values (now+3a, 9223372036854770000)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        tdLog.info('tdSql.checkData(0, 1, 9223372036854770000)')
+        tdSql.checkData(0, 1, 9223372036854770000)
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/binary-boundary.py b/tests/pytest/insert/binary-boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb86ddf61c3abcd56d2bb27f7f7da5f1d22069ee
--- /dev/null
+++ b/tests/pytest/insert/binary-boundary.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed binary(4089))')
+        tdSql.error('create table tb (ts timestamp, speed binary(4089))')
+        tdLog.info('create table tb (ts timestamp, speed binary(4088))')
+        tdSql.error('create table tb (ts timestamp, speed binary(4088))')
+        tdLog.info('create table tb (ts timestamp, speed binary(4084))')
+        tdSql.execute('create table tb (ts timestamp, speed binary(4084))')
+        tdLog.info("insert into tb values (now, ) -x step1")
+        tdSql.error("insert into tb values (now, )")
+
+        with open("../../README.md", "r") as inputFile:
+            data = inputFile.read(4084).replace(
+                "\n",
+                " ").replace(
+                "\\",
+                " ").replace(
+                "\'",
+                " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+                " ")
+
+        tdLog.info("insert %d length data: %s" % (len(data), data))
+
+        tdLog.info("insert into tb values (now+2a, data)")
+        tdSql.execute("insert into tb values (now+2a, '%s')" % data)
+        tdLog.info('select speed from tb order by ts desc')
+        tdSql.query('select speed from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('==> $data01')
+        tdLog.info("tdSql.checkData(0, 1, '%s')" % data)
+        tdSql.checkData(0, 1, data)
+
+        tdLog.info(
+            'create table tb2 (ts timestamp, speed binary(2040), temp binary(2044))')
+        tdSql.execute(
+            'create table tb2 (ts timestamp, speed binary(2040), temp binary(2044))')
+        speed = inputFile.read(2044).replace(
+            "\n",
+            " ").replace(
+            "\\",
+            " ").replace(
+            "\'",
+            " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+            " ")
+        temp = inputFile.read(2040).replace(
+            "\n",
+            " ").replace(
+            "\\",
+            " ").replace(
+            "\'",
+            " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+            " ")
+        tdLog.info("insert into tb values (now+3a, speed, temp)")
+        tdSql.error(
+            "insert into tb values (now+3a, '%s', '%s')" %
+            (speed, temp))
+
+        speed = inputFile.read(2040).replace(
+            "\n",
+            " ").replace(
+            "\\",
+            " ").replace(
+            "\'",
+            " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+            " ")
+        temp = inputFile.read(2044).replace(
+            "\n",
+            " ").replace(
+            "\\",
+            " ").replace(
+            "\'",
+            " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+            " ")
+        tdLog.info("insert into tb values (now+4a, speed, temp)")
+        tdSql.error(
+            "insert into tb values (now+4a, '%s', '%s')" %
+            (speed, temp))
+
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('==> $data11')
+        tdLog.info("tdSql.checkData(1, 1, '%s')" % speed)
+        tdSql.checkData(1, 1, speed)
+
+        tdLog.info('==> $data12')
+        tdLog.info("tdSql.checkData(1, 2, '%s')" % temp)
+        tdSql.checkData(1, 1, temp)
+
+        inputFile.close()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/binary.py b/tests/pytest/insert/binary.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d583aa2cce26fb400e4a943f49cacee96c933d6
--- /dev/null
+++ b/tests/pytest/insert/binary.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed binary(5))')
+        tdSql.execute('create table tb (ts timestamp, speed binary(5))')
+        tdLog.info("insert into tb values (now, ) -x step1")
+        tdSql.error("insert into tb values (now, )")
+        tdLog.info('=============== step2')
+        tdLog.info("insert into tb values (now+1a, '1234')")
+        tdSql.execute("insert into tb values (now+1a, '1234')")
+        tdLog.info('select speed from tb order by ts desc')
+        tdSql.query('select speed from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info("tdSql.checkData(0, 0, '1234')")
+        tdSql.checkData(0, 0, '1234')
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2a, '23456')")
+        tdSql.execute("insert into tb values (now+2a, '23456')")
+        tdLog.info('select speed from tb order by ts desc')
+        tdSql.query('select speed from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('==> $data00')
+        tdLog.info("tdSql.checkData(0, 0, '23456')")
+        tdSql.checkData(0, 0, '23456')
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3a, '345678')")
+        tdSql.error("insert into tb values (now+3a, '345678')")
+        tdLog.info("insert into tb values (now+3a, '34567')")
+        tdSql.execute("insert into tb values (now+3a, '34567')")
+        tdLog.info('select speed from tb order by ts desc')
+        tdSql.query('select speed from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('==> $data00')
+        tdLog.info("tdSql.checkData(0, 0, '34567')")
+        tdSql.checkData(0, 0, '34567')
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/bool.py b/tests/pytest/insert/bool.py
new file mode 100644
index 0000000000000000000000000000000000000000..1412567cd75721d99308ddadfe7b35032207faaa
--- /dev/null
+++ b/tests/pytest/insert/bool.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed bool)')
+        tdSql.execute('create table tb (ts timestamp, speed bool)')
+        tdLog.info("insert into tb values (now, true)")
+        tdSql.execute("insert into tb values (now, true)")
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('=============== step2')
+        tdLog.info("insert into tb values (now+1m, 1)")
+        tdSql.execute("insert into tb values (now+1m, 1)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2m, 2)")
+        tdSql.execute("insert into tb values (now+2m, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3m, 0)")
+        tdSql.execute("insert into tb values (now+3m, 0)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        tdLog.info('=============== step5')
+        tdLog.info("insert into tb values (now+4m, -1)")
+        tdSql.execute("insert into tb values (now+4m, -1)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        tdLog.info('=============== step6')
+        tdLog.info("insert into tb values (now+5m, false)")
+        tdSql.execute("insert into tb values (now+5m, false)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(6)')
+        tdSql.checkRows(6)
+        tdLog.info('=============== step7')
+        tdLog.info("insert into tb values (now+6m, true)")
+        tdSql.execute("insert into tb values (now+5m, true)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(7)')
+        tdSql.checkRows(7)
+# convert end
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/date.py b/tests/pytest/insert/date.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e22e5b72ee465bfd32b9fd839c8ab0deba9267c
--- /dev/null
+++ b/tests/pytest/insert/date.py
@@ -0,0 +1,193 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM: system sh/ip.sh -i 1 -s up
+        # TSIM: system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: $i = 0
+        # TSIM: $dbPrefix = lm_da_db
+        # TSIM: $tbPrefix = lm_da_tb
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: sql create table $tb (ts timestamp, speed int)
+        tdLog.info("create table tb0 (ts timestamp, speed int)")
+        tdSql.execute('create table tb0 (ts timestamp, speed int)')
+        # TSIM: sql insert into $tb values ('2017-01-01 08:00:00.001', 1)
+        tdLog.info("insert into tb0 values ('2017-01-01 08:00:00.001', 1)")
+        tdSql.execute("insert into tb0 values ('2017-01-01 08:00:00.001', 1)")
+        # TSIM: sql select ts from $tb
+        tdLog.info('select ts from tb0')
+        tdSql.query('select ts from tb0')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data00 != @17-01-01 08:00:00.001@ then
+        tdLog.info("tdSql.checkData(0, 0, 17-01-01 08:00:00.001)")
+        expectedData = datetime.datetime.strptime(
+            "17-01-01 08:00:00.001", "%y-%m-%d %H:%M:%S.%f")
+        tdSql.checkData(0, 0, expectedData)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql insert into $tb values ('2017-08-28 00:23:46.429+ 1a', 2)
+        tdLog.info("insert into tb0 values ('2017-08-28 00:23:46.429+ 1a', 2)")
+        tdSql.execute(
+            "insert into tb0 values ('2017-08-28 00:23:46.429+ 1a', 2)")
+        # TSIM: #sql insert into $tb values ('2017-08-28 00:23:46cd .429', 2)
+        # TSIM: sql select ts from $tb
+        tdLog.info('select ts from tb0')
+        tdSql.query('select ts from tb0')
+        # TSIM: if $rows != 2 then
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: #sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
+        # TSIM: #sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
+        # TSIM: sql select ts from $tb
+        tdLog.info('select ts from tb0')
+        tdSql.query('select ts from tb0')
+        # TSIM: if $rows != 2 then
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql insert into $tb values(now, 4);
+        tdLog.info("insert into tb0 values(now, 4);")
+        tdSql.execute("insert into tb0 values(now, 4);")
+        # TSIM: sql insert into $tb values(now+1a, 5);
+        tdLog.info("insert into tb0 values(now+1a, 5);")
+        tdSql.execute("insert into tb0 values(now+1a, 5);")
+        # TSIM: sql insert into $tb values(now+1s, 6);
+        tdLog.info("insert into tb0 values(now+1s, 6);")
+        tdSql.execute("insert into tb0 values(now+1s, 6);")
+        # TSIM: sql insert into $tb values(now+1m, 7);
+        tdLog.info("insert into tb0 values(now+1m, 7);")
+        tdSql.execute("insert into tb0 values(now+1m, 7);")
+        # TSIM: sql insert into $tb values(now+1h, 8);
+        tdLog.info("insert into tb0 values(now+1h, 8);")
+        tdSql.execute("insert into tb0 values(now+1h, 8);")
+        # TSIM: sql insert into $tb values(now+1d, 9);
+        tdLog.info("insert into tb0 values(now+1d, 9);")
+        tdSql.execute("insert into tb0 values(now+1d, 9);")
+        # TSIM: sql_error insert into $tb values(now+3w, 10);
+        tdLog.info("insert into tb0 values(now+3w, 10);")
+        tdSql.error("insert into tb0 values(now+3w, 10);")
+        # TSIM: sql_error insert into $tb values(now+1n, 11);
+        tdLog.info("insert into tb0 values(now+1n, 11);")
+        tdSql.error("insert into tb0 values(now+1n, 11);")
+        # TSIM: sql_error insert into $tb values(now+1y, 12);
+        tdLog.info("insert into tb0 values(now+1y, 12);")
+        tdSql.error("insert into tb0 values(now+1y, 12);")
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql_error insert into $tb values ('9999-12-31 213:59:59.999',
+        # 13)
+        tdLog.info("insert into tb0 values ('9999-12-31 213:59:59.999', 13)")
+        tdSql.error("insert into tb0 values ('9999-12-31 213:59:59.999', 13)")
+        # TSIM: sql select ts from $tb
+        tdLog.info('select ts from tb0')
+        tdSql.query('select ts from tb0')
+        # TSIM: print $rows
+        tdLog.info('$rows')
+        # TSIM: if $rows != 8 then
+        tdLog.info('tdSql.checkRow(8)')
+        tdSql.checkRows(8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql_error insert into $tb values ('9999-12-99 23:59:59.999',
+        # 13)
+        tdLog.info("insert into tb0 values ('9999-12-99 23:59:59.999', 13)")
+        tdSql.error("insert into tb0 values ('9999-12-99 23:59:59.999', 13)")
+        # TSIM:
+        # TSIM: sql select ts from $tb
+        tdLog.info('select ts from tb0')
+        tdSql.query('select ts from tb0')
+        # TSIM: if $rows != 8 then
+        tdLog.info('tdSql.checkRow(8)')
+        tdSql.checkRows(8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 1
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $tb (ts timestamp, ts2 timestamp)
+        tdLog.info("create table tb1 (ts timestamp, ts2 timestamp)")
+        tdSql.execute('create table tb1 (ts timestamp, ts2 timestamp)')
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql insert into $tb values (now, now)
+        tdLog.info("insert into tb1 values (now, now)")
+        tdSql.execute("insert into tb1 values (now, now)")
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from tb1')
+        tdSql.query('select * from tb1')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/double.py b/tests/pytest/insert/double.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b66ed1c44c7cec645be1f0f23866c7f06501ebc
--- /dev/null
+++ b/tests/pytest/insert/double.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed double)')
+        tdSql.execute('create table tb (ts timestamp, speed double)')
+        tdLog.info('=============== step2')
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2a, 2.85)")
+        tdSql.execute("insert into tb values (now+2a, 2.85)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkData(0, 1, 2.850000000)')
+        tdSql.checkData(0, 1, 2.850000000)
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3a, 3.4)")
+        tdSql.execute("insert into tb values (now+3a, 3.4)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('tdSql.checkData(0, 1, 3.400000000)')
+        tdSql.checkData(0, 1, 3.400000000)
+        tdLog.info('=============== step5')
+        tdLog.info("insert into tb values (now+4a, a2) -x step51")
+        tdSql.error("insert into tb values (now+4a, a2)1")
+        tdLog.info("insert into tb values (now+4a, 0)")
+        tdSql.execute("insert into tb values (now+4a, 0)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('tdSql.checkData(0, 1, 0.000000000)')
+        tdSql.checkData(0, 1, 0.000000000)
+        tdLog.info('=============== step6')
+        tdLog.info("insert into tb values (now+5a, 2a) -x step6")
+        tdSql.error("insert into tb values (now+5a, 2a)")
+        tdLog.info("insert into tb values(now+5a, 2)")
+        tdSql.execute("insert into tb values(now+5a, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        tdLog.info('tdSql.checkData(0, 1, 2.000000000)')
+        tdSql.checkData(0, 1, 2.000000000)
+        tdLog.info('=============== step7')
+        tdLog.info("insert into tb values (now+6a, 2a'1) -x step7")
+        tdSql.error("insert into tb values (now+6a, 2a'1)")
+        tdLog.info("insert into tb values(now+6a, 2)")
+        tdSql.execute("insert into tb values(now+6a, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        tdLog.info('tdSql.checkData(0, 1, 2.000000000)')
+        tdSql.checkData(0, 1, 2.000000000)
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/float.py b/tests/pytest/insert/float.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b6277d43657c1da3fa5e65ddbaa073fd7a7189e
--- /dev/null
+++ b/tests/pytest/insert/float.py
@@ -0,0 +1,144 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import datetime
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        cmd = 'create table tb (ts timestamp, speed float)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = 'insert into tb values (now, -3.40E+38)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+
+        tdLog.info("=============== step2")
+        cmd = 'insert into tb values (now+1a, 3.40E+308)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = 'select * from tb order by ts desc'
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(1)
+
+        tdLog.info("=============== step3")
+        cmd = "insert into tb values (now+2a, 2.85)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        ret = tdSql.query(cmd)
+        tdSql.checkRows(2)
+
+        if ((abs(tdSql.getData(0, 1) - 2.850000)) > 1.0e-7):
+            tdLog.exit("data is not 2.850000")
+
+        tdLog.info("=============== step4")
+        cmd = "insert into tb values (now+3a, 3.4)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(3)
+        if (abs(tdSql.getData(0, 1) - 3.400000) > 1.0e-7):
+            tdLog.exit("data is not 3.400000")
+
+        tdLog.info("=============== step5")
+        cmd = "insert into tb values (now+4a, a2)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit("This test failed: \
+                       insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+4a, 0)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        tdSql.checkRows(4)
+        if (abs(tdSql.getData(0, 1) - 0.000000) != 0):
+            tdLog.exit("data is not 0.000000")
+
+        tdLog.info("=============== step6")
+        cmd = "insert into tb values (now+5a, 2a)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+5a, 2)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        ret = tdSql.query(cmd)
+        tdSql.checkRows(5)
+        if (abs(tdSql.getData(0, 1) - 2.000000) > 1.0e-7):
+            tdLog.info("data is not 2.000000")
+
+        tdLog.info("=============== step7")
+        cmd = "insert into tb values (now+6a, 2a'1)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = "insert into tb values (now+6a, 2)"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        cmd = "select * from tb order by ts desc"
+        tdLog.info(cmd)
+        tdSql.query(cmd)
+        if (abs(tdSql.getData(0, 1) - 2.000000) > 1.0e-7):
+            tdLog.exit("data is not 2.000000")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/int.py b/tests/pytest/insert/int.py
new file mode 100644
index 0000000000000000000000000000000000000000..4a94a331d63eaf04fd7d8ec37f4814b385017d22
--- /dev/null
+++ b/tests/pytest/insert/int.py
@@ -0,0 +1,183 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import datetime
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        tdSql.execute('create table tb (ts timestamp, speed int)')
+
+        cmd = 'insert into tb values (now, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(1)
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step2")
+        cmd = 'insert into tb values (now+1m, -2147483648)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: INT data overflow error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("INT data overflow error catched")
+
+        cmd = 'insert into tb values (now+1m, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(2)
+
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step3")
+        cmd = 'insert into tb values (now+2m, 2147483647)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(3)
+        if(tdSql.getData(0, 1) != 2147483647):
+            tdLog.exit("data is not 2147483647")
+
+        tdLog.info("=============== step4")
+        cmd = 'insert into tb values (now+3m, 2147483648)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: INT data overflow error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("INT data overflow error catched")
+
+        cmd = 'insert into tb values (now+3m, NULL)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(4)
+
+        if(tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not NULL")
+
+        tdLog.info("=============== step5")
+        cmd = 'insert into tb values (now+4m, a2)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+4m, 0)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(5)
+
+        if(tdSql.getData(0, 1) != 0):
+            tdLog.exit("data is not 0")
+
+        tdLog.info("=============== step6")
+        cmd = 'insert into tb values (now+5m, 2a)'
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+5m, 2)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(6)
+        if (tdSql.getData(0, 1) != 2):
+            tdLog.exit("data is not 2")
+
+        tdLog.info("=============== step7")
+        cmd = "insert into tb values (now+6m, 2a'1)"
+        tdLog.info(cmd)
+        try:
+            tdSql.execute(cmd)
+            tdLog.exit(
+                "This test failed: insert wrong data error _not_ catched")
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("insert wrong data error catched")
+
+        cmd = 'insert into tb values (now+6m, 2)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(7)
+        if (tdSql.getData(0, 1) != 2):
+            tdLog.exit("data is not 2")
+
+        tdLog.info("=============== step8")
+        cmd = 'insert into tb values (now+8m, "null")'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(8)
+
+        if (tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not null")
+
+        tdLog.info("=============== step9")
+        cmd = "insert into tb values (now+9m, 'null')"
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(9)
+        if (tdSql.getData(0, 1) is not None):
+            tdLog.exit("data is not null")
+
+        tdLog.info("=============== step10")
+        cmd = 'insert into tb values (now+10m, -123)'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from tb order by ts desc')
+        tdSql.checkRows(10)
+
+        if (tdSql.getData(0, 1) != -123):
+            tdLog.exit("data is not -123")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/multi.py b/tests/pytest/insert/multi.py
new file mode 100644
index 0000000000000000000000000000000000000000..42d699ea713006886ba14e1ceda15756d5715e51
--- /dev/null
+++ b/tests/pytest/insert/multi.py
@@ -0,0 +1,69 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdLog.info("create table")
+
+        tdSql.execute(
+            "create table if not exists st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists dev_001 using st tags('dev_01')")
+
+        print("==============step2")
+        tdLog.info("multiple inserts by insert")
+        tdSql.execute(
+            "insert INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
+        tdSql.checkAffectedRows(2)
+
+        print("==============step3")
+        tdLog.info("multiple inserts by import")
+        tdSql.execute(
+            "import INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
+        tdSql.checkAffectedRows(2)
+
+
+        tdSql.execute(
+            "CREATE TABLE if not exists dev_002 using st tags('dev_01')")
+        tdSql.execute(
+            "CREATE TABLE if not exists dev_003 using st tags('dev_01')")
+        print("==============step4")
+        tdLog.info("multiple tables inserts by insert")
+        tdSql.execute(
+            '''insert INTO dev_002 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)
+                            dev_003 VALUES ('2020-05-13 10:00:00.000', 2),('2020-05-13 10:00:00.001', 3)''')
+        tdSql.checkAffectedRows(4)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/nchar-boundary.py b/tests/pytest/insert/nchar-boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..05a66f60661c18de5a4fbf55f9850932d3d36e7a
--- /dev/null
+++ b/tests/pytest/insert/nchar-boundary.py
@@ -0,0 +1,65 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.error('create table tb (ts timestamp, col nchar(1022))')
+        tdSql.execute('create table tb (ts timestamp, col nchar(1021))')
+        tdSql.execute("insert into tb values (now, 'taosdata')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 'taosdata')
+
+        with open("../../README.md", "r") as inputFile:
+            data = inputFile.read(1021).replace(
+                "\n",
+                " ").replace(
+                "\\",
+                " ").replace(
+                "\'",
+                " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+                " ")
+
+        tdLog.info("insert %d length data: %s" % (len(data), data))
+
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 1, data)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/nchar-unicode.py b/tests/pytest/insert/nchar-unicode.py
new file mode 100644
index 0000000000000000000000000000000000000000..c417a6bca20a47a2035fbc1c75854e43147e34e3
--- /dev/null
+++ b/tests/pytest/insert/nchar-unicode.py
@@ -0,0 +1,659 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('create table tb (ts timestamp, col nchar(1021))')
+        tdSql.execute("insert into tb values (now, 'taosdata')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 'taosdata')
+
+        with open("../../README.md", "r") as inputFile:
+            data = inputFile.read(1021).replace(
+                "\n",
+                " ").replace(
+                "\\",
+                " ").replace(
+                "\'",
+                " ").replace(
+                "\"",
+                " ").replace(
+                    "[",
+                    " ").replace(
+                        "]",
+                        " ").replace(
+                            "!",
+                " ")
+
+        tdLog.info("insert %d length data: %s" % (len(data), data))
+
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 1, data)
+
+        # https://www.ltg.ed.ac.uk/~richard/unicode-sample.html
+        # Basic Latin
+        data = r'! # $ % & ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~'
+        tdLog.info("insert Basic Latin %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(3)
+        tdSql.checkData(2, 1, data)
+
+        # Latin-1 Supplement
+        data = ' ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ'
+        tdLog.info(
+            "insert Latin-1 Supplement %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(4)
+        tdSql.checkData(3, 1, data)
+
+        # Latin Extended-A
+        data = 'Ā ā Ă ă Ą ą Ć ć Ĉ ĉ Ċ ċ Č č Ď ď Đ đ Ē ē Ĕ ĕ Ė ė Ę ę Ě ě Ĝ ĝ Ğ ğ Ġ ġ Ģ ģ Ĥ ĥ Ħ ħ Ĩ ĩ Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Ł ł Ń ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ō Ŏ ŏ Ő ő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ ŝ Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ Ÿ Ź ź Ż ż Ž ž ſ'
+        tdLog.info(
+            "insert Latin Extended-A %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(5)
+        tdSql.checkData(4, 1, data)
+
+        # Latin Extended-B
+        data = 'ƀ Ɓ Ƃ ƃ Ƅ ƅ Ɔ Ƈ ƈ Ɖ Ɗ Ƌ ƌ ƍ Ǝ Ə Ɛ Ƒ ƒ Ɠ Ɣ ƕ Ɩ Ɨ Ƙ ƙ ƚ ƛ Ɯ Ɲ ƞ Ɵ Ơ ơ Ƣ ƣ Ƥ ƥ Ʀ Ƨ ƨ Ʃ ƪ ƫ Ƭ ƭ Ʈ Ư ư Ʊ Ʋ Ƴ ƴ Ƶ ƶ Ʒ Ƹ ƹ ƺ ƻ Ƽ ƽ ƾ ƿ ǀ ǁ ǂ ǃ DŽ Dž dž LJ Lj lj NJ Nj nj Ǎ ǎ Ǐ ǐ Ǒ ǒ Ǔ ǔ Ǖ ǖ Ǘ ǘ Ǚ ǚ Ǜ ǜ ǝ Ǟ ǟ Ǡ ǡ Ǣ ǣ Ǥ ǥ Ǧ ǧ Ǩ ǩ Ǫ ǫ Ǭ ǭ Ǯ ǯ ǰ DZ Dz dz Ǵ ǵ Ǻ ǻ Ǽ ǽ Ǿ ǿ Ȁ ȁ Ȃ ȃ ...'
+        tdLog.info(
+            "insert Latin Extended-B %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(6)
+        tdSql.checkData(5, 1, data)
+
+        # IPA Extensions
+        data = 'ɐ ɑ ɒ ɓ ɔ ɕ ɖ ɗ ɘ ə ɚ ɛ ɜ ɝ ɞ ɟ ɠ ɡ ɢ ɣ ɤ ɥ ɦ ɧ ɨ ɩ ɪ ɫ ɬ ɭ ɮ ɯ ɰ ɱ ɲ ɳ ɴ ɵ ɶ ɷ ɸ ɹ ɺ ɻ ɼ ɽ ɾ ɿ ʀ ʁ ʂ ʃ ʄ ʅ ʆ ʇ ʈ ʉ ʊ ʋ ʌ ʍ ʎ ʏ ʐ ʑ ʒ ʓ ʔ ʕ ʖ ʗ ʘ ʙ ʚ ʛ ʜ ʝ ʞ ʟ ʠ ʡ ʢ ʣ ʤ ʥ ʦ ʧ ʨ'
+        tdLog.info(
+            "insert IPA Extensions %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(7)
+        tdSql.checkData(6, 1, data)
+
+        # Spacing Modifier Letters
+        data = 'ʰ ʱ ʲ ʳ ʴ ʵ ʶ ʷ ʸ ʹ ʺ ʻ ʼ ʽ ʾ ʿ ˀ ˁ ˂ ˃ ˄ ˅ ˆ ˇ ˈ ˉ ˊ ˋ ˌ ˍ ˎ ˏ ː ˑ ˒ ˓ ˔ ˕ ˖ ˗ ˘ ˙ ˚ ˛ ˜ ˝ ˞ ˠ ˡ ˢ ˣ ˤ ˥ ˦ ˧ ˨ ˩'
+        tdLog.info(
+            "insert Spacing Modifier Letters %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(8)
+        tdSql.checkData(7, 1, data)
+
+        # Combining Diacritical Marks
+        data = '̀ ́ ̂ ̃ ̄ ̅ ̆ ̇ ̈ ̉ ̊ ̋ ̌ ̍ ̎ ̏ ̐ ̑ ̒ ̓ ̔ ̕ ̖ ̗ ̘ ̙ ̚ ̛ ̜ ̝ ̞ ̟ ̠ ̡ ̢ ̣ ̤ ̥ ̦ ̧ ̨ ̩ ̪ ̫ ̬ ̭ ̮ ̯ ̰ ̱ ̲ ̳ ̴ ̵ ̶ ̷ ̸ ̹ ̺ ̻ ̼ ̽ ̾ ̿ ̀ ́ ͂ ̓ ̈́ ͅ ͠ ͡'
+        tdLog.info(
+            "insert Combining Diacritical Marks %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(9)
+        tdSql.checkData(8, 1, data)
+
+        # Greek
+        data = 'ʹ ͵ ͺ ; ΄ ΅ Ά · Έ Ή Ί Ό Ύ Ώ ΐ Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ϊ ϋ ό ύ ώ ϐ ϑ ϒ ϓ ϔ ϕ ϖ Ϛ Ϝ Ϟ Ϡ Ϣ ϣ Ϥ ϥ Ϧ ϧ Ϩ ϩ Ϫ ϫ Ϭ ϭ Ϯ ϯ ϰ ϱ ϲ ϳ'
+        tdLog.info("insert Greek %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(10)
+        tdSql.checkData(9, 1, data)
+
+        # Cyrillic
+        data = 'Ё Ђ Ѓ Є Ѕ І Ї Ј Љ Њ Ћ Ќ Ў Џ А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ђ ѓ є ѕ і ї ј љ њ ћ ќ ў џ Ѡ ѡ Ѣ ѣ Ѥ ѥ Ѧ ѧ Ѩ ѩ Ѫ ѫ Ѭ ѭ Ѯ ѯ Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ Ѹ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ Ҁ ҁ ҂ ҃ ...'
+        tdLog.info("insert Cyrillic %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(11)
+        tdSql.checkData(10, 1, data)
+
+        # Armenian
+        data = 'Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ ՙ ՚ ՛ ՜ ՝ ՞ ՟ ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք օ ֆ և ։'
+        tdLog.info("insert Armenian %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(12)
+        tdSql.checkData(11, 1, data)
+
+        # Hebrew
+        data = ' ֒ ֓ ֔ ֕ ֖ ֗ ֘ ֙ ֚ ֛ ֜ ֝ ֞ ֟ ֠ ֡ ֣ ֤ ֥ ֦ ֧ ֨ ֩ ֪ ֫ ֬ ֭ ֮ ֯ ְ ֱ ֲ ֳ ִ ֵ ֶ ַ ָ ֹ ֻ ּ ֽ ־ ֿ ׀ ׁ ׂ ׃ ׄ א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן נ ס ע ף פ ץ צ ק ר ש ת װ ױ ײ ׳ ״'
+        tdLog.info("insert Hebrew %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(13)
+        tdSql.checkData(12, 1, data)
+
+        # Arabic
+        data = '، ؛ ؟ ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ـ ف ق ك ل م ن ه و ى ي ً ٌ ٍ َ ُ ِ ّ ْ ٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩ ٪ ٫ ٬ ٭ ٰ ٱ ٲ ٳ ٴ ٵ ٶ ٷ ٸ ٹ ٺ ٻ ټ ٽ پ ٿ ڀ ځ ڂ ڃ ڄ څ چ ڇ ڈ ډ ڊ ڋ ڌ ڍ ڎ ڏ ڐ ڑ ڒ ړ ڔ ڕ ږ ڗ ژ ڙ ښ ڛ ڜ ڝ ڞ ڟ ڠ ڡ ڢ ڣ ڤ ڥ ڦ ڧ ڨ ک ڪ ګ ڬ ڭ ڮ گ ڰ ڱ ...'
+        tdLog.info(
+            "FAILED: insert Arabic %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(14)
+        tdSql.checkData(13, 1, data)
+
+        # Devanagari
+        data = 'ँ ं ः अ आ इ ई उ ऊ ऋ ऌ ऍ ऎ ए ऐ ऑ ऒ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न ऩ प फ ब भ म य र ऱ ल ळ ऴ व श ष स ह ़ ऽ ा ि ी ु ू ृ ॄ ॅ ॆ े ै ॉ ॊ ो ौ ् ॐ ॑ ॒ ॓ ॔ क़ ख़ ग़ ज़ ड़ ढ़ फ़ य़ ॠ ॡ ॢ ॣ । ॥ ० १ २ ३ ४ ५ ६ ७ ८ ९ ॰'
+        tdLog.info("insert Devanagari %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(15)
+        tdSql.checkData(14, 1, data)
+
+        # Bengali
+        data = 'ঁ ং ঃ অ আ ই ঈ উ ঊ ঋ ঌ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ ় া ি ী ু ূ ৃ ৄ ে ৈ ো ৌ ্ ৗ ড় ঢ় য় ৠ ৡ ৢ ৣ ০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ ৰ ৱ ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৺'
+        tdLog.info("insert Bengali %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(16)
+        tdSql.checkData(15, 1, data)
+
+        # Gurmukhi
+        data = 'ਂ ਅ ਆ ਇ ਈ ਉ ਊ ਏ ਐ ਓ ਔ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਲ਼ ਵ ਸ਼ ਸ ਹ ਼ ਾ ਿ ੀ ੁ ੂ ੇ ੈ ੋ ੌ ੍ ਖ਼ ਗ਼ ਜ਼ ੜ ਫ਼ ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੰ ੱ ੲ ੳ ੴ'
+        tdLog.info("insert Gurmukhi %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(17)
+        tdSql.checkData(16, 1, data)
+
+        # Gujarati
+        data = 'ઁ ં ઃ અ આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન પ ફ બ ભ મ ય ર લ ળ વ શ ષ સ હ ઼ ઽ ા િ ી ુ ૂ ૃ ૄ ૅ ે ૈ ૉ ો ૌ ્ ૐ ૠ ૦ ૧ ૨ ૩ ૪ ૫ ૬ ૭ ૮ ૯'
+        tdLog.info("insert Gujarati %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(18)
+        tdSql.checkData(17, 1, data)
+
+        # Oriya
+        data = 'ଁ ଂ ଃ ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଌ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ର ଲ ଳ ଶ ଷ ସ ହ ଼ ଽ ା ି ୀ ୁ ୂ ୃ େ ୈ ୋ ୌ ୍ ୖ ୗ ଡ଼ ଢ଼ ୟ ୠ ୡ ୦ ୧ ୨ ୩ ୪ ୫ ୬ ୭ ୮ ୯ ୰'
+        tdLog.info("insert Oriya %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(19)
+        tdSql.checkData(18, 1, data)
+
+        # Tamil
+        data = 'ஂ ஃ அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஜ ஞ ட ண த ந ன ப ம ய ர ற ல ள ழ வ ஷ ஸ ஹ ா ி ீ ு ூ ெ ே ை ொ ோ ௌ ் ௗ ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ ௰ ௱ ௲'
+        tdLog.info("insert Tamil %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(20)
+        tdSql.checkData(19, 1, data)
+
+        # Telugu
+        data = 'ఁ ం ః అ ఆ ఇ ఈ ఉ ఊ ఋ ఌ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల ళ వ శ ష స హ ా ి ీ ు ూ ృ ౄ ె ే ై ొ ో ౌ ్ ౕ ౖ ౠ ౡ ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯'
+        tdLog.info("insert Telugu %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(21)
+        tdSql.checkData(20, 1, data)
+
+        # Kannada
+        data = 'ಂ ಃ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ಌ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ಳ ವ ಶ ಷ ಸ ಹ ಾ ಿ ೀ ು ೂ ೃ ೄ ೆ ೇ ೈ ೊ ೋ ೌ ್ ೕ ೖ ೞ ೠ ೡ ೦ ೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯'
+        tdLog.info("insert Kannada %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(22)
+        tdSql.checkData(21, 1, data)
+
+        # Malayalam
+        data = 'ം ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ാ ി ീ ു ൂ ൃ െ േ ൈ ൊ ോ ൌ ് ൗ ൠ ൡ ൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯'
+        tdLog.info("insert Malayalam %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(23)
+        tdSql.checkData(22, 1, data)
+
+        # Thai
+        data = 'ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ ฯ ะ ั า ำ ิ ี ึ ื ุ ู ฺ ฿ เ แ โ ใ ไ ๅ ๆ ็ ่ ้ ๊ ๋ ์ ํ ๎ ๏ ๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ ๚ ๛'
+        tdLog.info("insert Thai %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(24)
+        tdSql.checkData(23, 1, data)
+
+        # Thai
+        data = 'ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ ฯ ะ ั า ำ ิ ี ึ ื ุ ู ฺ ฿ เ แ โ ใ ไ ๅ ๆ ็ ่ ้ ๊ ๋ ์ ํ ๎ ๏ ๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ ๚ ๛'
+        tdLog.info("insert Thai %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(25)
+        tdSql.checkData(24, 1, data)
+
+        # Lao
+        data = 'ກ ຂ ຄ ງ ຈ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ສ ຫ ອ ຮ ຯ ະ ັ າ ຳ ິ ີ ຶ ື ຸ ູ ົ ຼ ຽ ເ ແ ໂ ໃ ໄ ໆ ່ ້ ໊ ໋ ໌ ໍ ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ ໜ ໝ'
+        tdLog.info("insert Lao %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(26)
+        tdSql.checkData(25, 1, data)
+
+        # Tibetan
+        data = 'ༀ ༁ ༂ ༃ ༄ ༅ ༆ ༇ ༈ ༉ ༊ ་ ༌ ། ༎ ༏ ༐ ༑ ༒ ༓ ༔ ༕ ༖ ༗ ༘ ༙ ༚ ༛ ༜ ༝ ༞ ༟ ༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩ ༪ ༫ ༬ ༭ ༮ ༯ ༰ ༱ ༲ ༳ ༴ ༵ ༶ ༷ ༸ ༹ ༺ ༻ ༼ ༽ ༾ ༿ ཀ ཁ ག གྷ ང ཅ ཆ ཇ ཉ ཊ ཋ ཌ ཌྷ ཎ ཏ ཐ ད དྷ ན པ ཕ བ བྷ མ ཙ ཚ ཛ ཛྷ ཝ ཞ ཟ འ ཡ ར ལ ཤ ཥ ས ཧ ཨ ཀྵ ཱ ི ཱི ུ ཱུ ྲྀ ཷ ླྀ ཹ ེ ཻ ོ ཽ ཾ ཿ ྀ ཱྀ ྂ ྃ ྄ ྅ ྆ ྇ ...'
+        tdLog.info("insert Tibetan %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(27)
+        tdSql.checkData(26, 1, data)
+
+        # Georgian
+        data = 'Ⴀ Ⴁ Ⴂ Ⴃ Ⴄ Ⴅ Ⴆ Ⴇ Ⴈ Ⴉ Ⴊ Ⴋ Ⴌ Ⴍ Ⴎ Ⴏ Ⴐ Ⴑ Ⴒ Ⴓ Ⴔ Ⴕ Ⴖ Ⴗ Ⴘ Ⴙ Ⴚ Ⴛ Ⴜ Ⴝ Ⴞ Ⴟ Ⴠ Ⴡ Ⴢ Ⴣ Ⴤ Ⴥ ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ ჱ ჲ ჳ ჴ ჵ ჶ ჻'
+        tdLog.info("insert Georgian %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(28)
+        tdSql.checkData(27, 1, data)
+
+        # Hangul Jamo
+        data = 'ᄀ ᄁ ᄂ ᄃ ᄄ ᄅ ᄆ ᄇ ᄈ ᄉ ᄊ ᄋ ᄌ ᄍ ᄎ ᄏ ᄐ ᄑ ᄒ ᄓ ᄔ ᄕ ᄖ ᄗ ᄘ ᄙ ᄚ ᄛ ᄜ ᄝ ᄞ ᄟ ᄠ ᄡ ᄢ ᄣ ᄤ ᄥ ᄦ ᄧ ᄨ ᄩ ᄪ ᄫ ᄬ ᄭ ᄮ ᄯ ᄰ ᄱ ᄲ ᄳ ᄴ ᄵ ᄶ ᄷ ᄸ ᄹ ᄺ ᄻ ᄼ ᄽ ᄾ ᄿ ᅀ ᅁ ᅂ ᅃ ᅄ ᅅ ᅆ ᅇ ᅈ ᅉ ᅊ ᅋ ᅌ ᅍ ᅎ ᅏ ᅐ ᅑ ᅒ ᅓ ᅔ ᅕ ᅖ ᅗ ᅘ ᅙ ᅟ ᅠ ᅡ ᅢ ᅣ ᅤ ᅥ ᅦ ᅧ ᅨ ᅩ ᅪ ᅫ ᅬ ᅭ ᅮ ᅯ ᅰ ᅱ ᅲ ᅳ ᅴ ᅵ ᅶ ᅷ ᅸ ᅹ ᅺ ᅻ ᅼ ᅽ ᅾ ᅿ ᆀ ᆁ ᆂ ᆃ ᆄ ...'
+        tdLog.info("insert Hangul Jamo %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(29)
+        tdSql.checkData(28, 1, data)
+
+        # Latin Extended Additional
+        data = 'Ḁ ḁ Ḃ ḃ Ḅ ḅ Ḇ ḇ Ḉ ḉ Ḋ ḋ Ḍ ḍ Ḏ ḏ Ḑ ḑ Ḓ ḓ Ḕ ḕ Ḗ ḗ Ḙ ḙ Ḛ ḛ Ḝ ḝ Ḟ ḟ Ḡ ḡ Ḣ ḣ Ḥ ḥ Ḧ ḧ Ḩ ḩ Ḫ ḫ Ḭ ḭ Ḯ ḯ Ḱ ḱ Ḳ ḳ Ḵ ḵ Ḷ ḷ Ḹ ḹ Ḻ ḻ Ḽ ḽ Ḿ ḿ Ṁ ṁ Ṃ ṃ Ṅ ṅ Ṇ ṇ Ṉ ṉ Ṋ ṋ Ṍ ṍ Ṏ ṏ Ṑ ṑ Ṓ ṓ Ṕ ṕ Ṗ ṗ Ṙ ṙ Ṛ ṛ Ṝ ṝ Ṟ ṟ Ṡ ṡ Ṣ ṣ Ṥ ṥ Ṧ ṧ Ṩ ṩ Ṫ ṫ Ṭ ṭ Ṯ ṯ Ṱ ṱ Ṳ ṳ Ṵ ṵ Ṷ ṷ Ṹ ṹ Ṻ ṻ Ṽ ṽ Ṿ ṿ ...'
+        tdLog.info(
+            "insert Latin Extended Additional %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(30)
+        tdSql.checkData(29, 1, data)
+
+        # Geek Extended
+        data = 'ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ...'
+        tdLog.info(
+            "insert Geek Extended %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(31)
+        tdSql.checkData(30, 1, data)
+
+        # General Punctuation
+        data = '                      ‐ ‑ ‒ – — ― ‖ ‗ ‘ ’ ‚ ‛ “ ” „ ‟ † ‡ • ‣ ․ ‥ … ‧ 
 
 '
+        tdLog.info(
+            "insert General Punctuation %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(32)
+        tdSql.checkData(31, 1, data)
+
+        # Superscripts and Subscripts
+        data = '⁰ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹ ⁺ ⁻ ⁼ ⁽ ⁾ ⁿ ₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉ ₊ ₋ ₌ ₍ ₎'
+        tdLog.info(
+            "insert Superscripts and Subscripts %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(33)
+        tdSql.checkData(32, 1, data)
+
+        # Currency Symbols
+        data = '₠ ₡ ₢ ₣ ₤ ₥ ₦ ₧ ₨ ₩ ₪ ₫'
+        tdLog.info(
+            "insert Currency Symbols %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(34)
+        tdSql.checkData(33, 1, data)
+
+        # Combining Marks for Symbols
+        data = '⃐ ⃑ ⃒ ⃓ ⃔ ⃕ ⃖ ⃗ ⃘ ⃙ ⃚ ⃛ ⃜ ⃝ ⃞ ⃟ ⃠ ⃡'
+        tdLog.info(
+            "insert Combining Marks for Symbols %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(35)
+        tdSql.checkData(34, 1, data)
+
+        # Letterlike Symbols
+        data = '℀ ℁ ℂ ℃ ℄ ℅ ℆ ℇ ℈ ℉ ℊ ℋ ℌ ℍ ℎ ℏ ℐ ℑ ℒ ℓ ℔ ℕ № ℗ ℘ ℙ ℚ ℛ ℜ ℝ ℞ ℟ ℠ ℡ ™ ℣ ℤ ℥ Ω ℧ ℨ ℩ K Å ℬ ℭ ℮ ℯ ℰ ℱ Ⅎ ℳ ℴ ℵ ℶ ℷ ℸ'
+        tdLog.info(
+            "insert Letterlike Symbols %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(36)
+        tdSql.checkData(35, 1, data)
+
+        # Number Forms
+        data = '⅓ ⅔ ⅕ ⅖ ⅗ ⅘ ⅙ ⅚ ⅛ ⅜ ⅝ ⅞ ⅟ Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ Ⅹ Ⅺ Ⅻ Ⅼ Ⅽ Ⅾ Ⅿ ⅰ ⅱ ⅲ ⅳ ⅴ ⅵ ⅶ ⅷ ⅸ ⅹ ⅺ ⅻ ⅼ ⅽ ⅾ ⅿ ↀ ↁ ↂ'
+        tdLog.info(
+            "insert Number Forms %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(37)
+        tdSql.checkData(36, 1, data)
+
+        # Arrows
+        data = '← ↑ → ↓ ↔ ↕ ↖ ↗ ↘ ↙ ↚ ↛ ↜ ↝ ↞ ↟ ↠ ↡ ↢ ↣ ↤ ↥ ↦ ↧ ↨ ↩ ↪ ↫ ↬ ↭ ↮ ↯ ↰ ↱ ↲ ↳ ↴ ↵ ↶ ↷ ↸ ↹ ↺ ↻ ↼ ↽ ↾ ↿ ⇀ ⇁ ⇂ ⇃ ⇄ ⇅ ⇆ ⇇ ⇈ ⇉ ⇊ ⇋ ⇌ ⇍ ⇎ ⇏ ⇐ ⇑ ⇒ ⇓ ⇔ ⇕ ⇖ ⇗ ⇘ ⇙ ⇚ ⇛ ⇜ ⇝ ⇞ ⇟ ⇠ ⇡ ⇢ ⇣ ⇤ ⇥ ⇦ ⇧ ⇨ ⇩ ⇪'
+        tdLog.info("insert Arrows %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(38)
+        tdSql.checkData(37, 1, data)
+
+        # Mathematical Operators
+        data = '∀ ∁ ∂ ∃ ∄ ∅ ∆ ∇ ∈ ∉ ∊ ∋ ∌ ∍ ∎ ∏ ∐ ∑ − ∓ ∔ ∕ ∖ ∗ ∘ ∙ √ ∛ ∜ ∝ ∞ ∟ ∠ ∡ ∢ ∣ ∤ ∥ ∦ ∧ ∨ ∩ ∪ ∫ ∬ ∭ ∮ ∯ ∰ ∱ ∲ ∳ ∴ ∵ ∶ ∷ ∸ ∹ ∺ ∻ ∼ ∽ ∾ ∿ ≀ ≁ ≂ ≃ ≄ ≅ ≆ ≇ ≈ ≉ ≊ ≋ ≌ ≍ ≎ ≏ ≐ ≑ ≒ ≓ ≔ ≕ ≖ ≗ ≘ ≙ ≚ ≛ ≜ ≝ ≞ ≟ ≠ ≡ ≢ ≣ ≤ ≥ ≦ ≧ ≨ ≩ ≪ ≫ ≬ ≭ ≮ ≯ ≰ ≱ ≲ ≳ ≴ ≵ ≶ ≷ ≸ ≹ ≺ ≻ ≼ ≽ ≾ ≿ ...'
+        tdLog.info(
+            "insert Mathematical Operators %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(39)
+        tdSql.checkData(38, 1, data)
+
+        # Miscellaneous Technical
+        data = '⌀ ⌂ ⌃ ⌄ ⌅ ⌆ ⌇ ⌈ ⌉ ⌊ ⌋ ⌌ ⌍ ⌎ ⌏ ⌐ ⌑ ⌒ ⌓ ⌔ ⌕ ⌖ ⌗ ⌘ ⌙ ⌚ ⌛ ⌜ ⌝ ⌞ ⌟ ⌠ ⌡ ⌢ ⌣ ⌤ ⌥ ⌦ ⌧ ⌨ 〈 〉 ⌫ ⌬ ⌭ ⌮ ⌯ ⌰ ⌱ ⌲ ⌳ ⌴ ⌵ ⌶ ⌷ ⌸ ⌹ ⌺ ⌻ ⌼ ⌽ ⌾ ⌿ ⍀ ⍁ ⍂ ⍃ ⍄ ⍅ ⍆ ⍇ ⍈ ⍉ ⍊ ⍋ ⍌ ⍍ ⍎ ⍏ ⍐ ⍑ ⍒ ⍓ ⍔ ⍕ ⍖ ⍗ ⍘ ⍙ ⍚ ⍛ ⍜ ⍝ ⍞ ⍟ ⍠ ⍡ ⍢ ⍣ ⍤ ⍥ ⍦ ⍧ ⍨ ⍩ ⍪ ⍫ ⍬ ⍭ ⍮ ⍯ ⍰ ⍱ ⍲ ⍳ ⍴ ⍵ ⍶ ⍷ ⍸ ⍹ ⍺'
+        tdLog.info(
+            "insert Miscellaneous Technical %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(40)
+        tdSql.checkData(39, 1, data)
+
+        # Control Pictures
+        data = '␀ ␁ ␂ ␃ ␄ ␅ ␆ ␇ ␈ ␉ ␊ ␋ ␌ ␍ ␎ ␏ ␐ ␑ ␒ ␓ ␔ ␕ ␖ ␗ ␘ ␙ ␚ ␛ ␜ ␝ ␞ ␟ ␠ ␡ ␢ ␣ ␤'
+        tdLog.info(
+            "insert Control Pictures %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(41)
+        tdSql.checkData(40, 1, data)
+
+        # Optical Character Recognition
+        data = '⑀ ⑁ ⑂ ⑃ ⑄ ⑅ ⑆ ⑇ ⑈ ⑉ ⑊'
+        tdLog.info(
+            "insert Optical Character Recognition %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(42)
+        tdSql.checkData(41, 1, data)
+
+        # Enclosed Alphanumerics
+        data = '① ② ③ ④ ⑤ ⑥ ⑦ ⑧ ⑨ ⑩ ⑪ ⑫ ⑬ ⑭ ⑮ ⑯ ⑰ ⑱ ⑲ ⑳ ⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⑾ ⑿ ⒀ ⒁ ⒂ ⒃ ⒄ ⒅ ⒆ ⒇ ⒈ ⒉ ⒊ ⒋ ⒌ ⒍ ⒎ ⒏ ⒐ ⒑ ⒒ ⒓ ⒔ ⒕ ⒖ ⒗ ⒘ ⒙ ⒚ ⒛ ⒜ ⒝ ⒞ ⒟ ⒠ ⒡ ⒢ ⒣ ⒤ ⒥ ⒦ ⒧ ⒨ ⒩ ⒪ ⒫ ⒬ ⒭ ⒮ ⒯ ⒰ ⒱ ⒲ ⒳ ⒴ ⒵ Ⓐ Ⓑ Ⓒ Ⓓ Ⓔ Ⓕ Ⓖ Ⓗ Ⓘ Ⓙ Ⓚ Ⓛ Ⓜ Ⓝ Ⓞ Ⓟ Ⓠ Ⓡ Ⓢ Ⓣ Ⓤ Ⓥ Ⓦ Ⓧ Ⓨ Ⓩ ⓐ ⓑ ⓒ ⓓ ⓔ ⓕ ⓖ ⓗ ⓘ ⓙ ⓚ ⓛ ⓜ ⓝ ⓞ ⓟ ...'
+        tdLog.info(
+            "insert Enclosed Alphanumerics %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(43)
+        tdSql.checkData(42, 1, data)
+
+        # Box Drawing
+        data = '─ ━ │ ┃ ┄ ┅ ┆ ┇ ┈ ┉ ┊ ┋ ┌ ┍ ┎ ┏ ┐ ┑ ┒ ┓ └ ┕ ┖ ┗ ┘ ┙ ┚ ┛ ├ ┝ ┞ ┟ ┠ ┡ ┢ ┣ ┤ ┥ ┦ ┧ ┨ ┩ ┪ ┫ ┬ ┭ ┮ ┯ ┰ ┱ ┲ ┳ ┴ ┵ ┶ ┷ ┸ ┹ ┺ ┻ ┼ ┽ ┾ ┿ ╀ ╁ ╂ ╃ ╄ ╅ ╆ ╇ ╈ ╉ ╊ ╋ ╌ ╍ ╎ ╏ ═ ║ ╒ ╓ ╔ ╕ ╖ ╗ ╘ ╙ ╚ ╛ ╜ ╝ ╞ ╟ ╠ ╡ ╢ ╣ ╤ ╥ ╦ ╧ ╨ ╩ ╪ ╫ ╬ ╭ ╮ ╯ ╰ ╱ ╲ ╳ ╴ ╵ ╶ ╷ ╸ ╹ ╺ ╻ ╼ ╽ ╾ ╿'
+        tdLog.info("insert Box Drawing %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(44)
+        tdSql.checkData(43, 1, data)
+
+        # Block Elements
+        data = '▀ ▁ ▂ ▃ ▄ ▅ ▆ ▇ █ ▉ ▊ ▋ ▌ ▍ ▎ ▏ ▐ ░ ▒ ▓ ▔ ▕'
+        tdLog.info(
+            "insert Block Elements %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(45)
+        tdSql.checkData(44, 1, data)
+
+        # Geometric Shapes
+        data = '■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ ▩ ▪ ▫ ▬ ▭ ▮ ▯ ▰ ▱ ▲ △ ▴ ▵ ▶ ▷ ▸ ▹ ► ▻ ▼ ▽ ▾ ▿ ◀ ◁ ◂ ◃ ◄ ◅ ◆ ◇ ◈ ◉ ◊ ○ ◌ ◍ ◎ ● ◐ ◑ ◒ ◓ ◔ ◕ ◖ ◗ ◘ ◙ ◚ ◛ ◜ ◝ ◞ ◟ ◠ ◡ ◢ ◣ ◤ ◥ ◦ ◧ ◨ ◩ ◪ ◫ ◬ ◭ ◮ ◯'
+        tdLog.info(
+            "insert Geometric Shapes %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(46)
+        tdSql.checkData(45, 1, data)
+
+        # Miscellaneous Symbols
+        data = '☀ ☁ ☂ ☃ ☄ ★ ☆ ☇ ☈ ☉ ☊ ☋ ☌ ☍ ☎ ☏ ☐ ☑ ☒ ☓ ☚ ☛ ☜ ☝ ☞ ☟ ☠ ☡ ☢ ☣ ☤ ☥ ☦ ☧ ☨ ☩ ☪ ☫ ☬ ☭ ☮ ☯ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷ ☸ ☹ ☺ ☻ ☼ ☽ ☾ ☿ ♀ ♁ ♂ ♃ ♄ ♅ ♆ ♇ ♈ ♉ ♊ ♋ ♌ ♍ ♎ ♏ ♐ ♑ ♒ ♓ ♔ ♕ ♖ ♗ ♘ ♙ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♡ ♢ ♣ ♤ ♥ ♦ ♧ ♨ ♩ ♪ ♫ ♬ ♭ ♮ ♯'
+        tdLog.info(
+            "insert Miscellaneous Symbols %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(47)
+        tdSql.checkData(46, 1, data)
+
+        # Dingbats
+        data = '✁ ✂ ✃ ✄ ✆ ✇ ✈ ✉ ✌ ✍ ✎ ✏ ✐ ✑ ✒ ✓ ✔ ✕ ✖ ✗ ✘ ✙ ✚ ✛ ✜ ✝ ✞ ✟ ✠ ✡ ✢ ✣ ✤ ✥ ✦ ✧ ✩ ✪ ✫ ✬ ✭ ✮ ✯ ✰ ✱ ✲ ✳ ✴ ✵ ✶ ✷ ✸ ✹ ✺ ✻ ✼ ✽ ✾ ✿ ❀ ❁ ❂ ❃ ❄ ❅ ❆ ❇ ❈ ❉ ❊ ❋ ❍ ❏ ❐ ❑ ❒ ❖ ❘ ❙ ❚ ❛ ❜ ❝ ❞ ❡ ❢ ❣ ❤ ❥ ❦ ❧ ❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿ ➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉ ➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓ ➔ ➘ ➙ ➚ ➛ ➜ ➝ ...'
+        tdLog.info("insert Dingbats %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(48)
+        tdSql.checkData(47, 1, data)
+
+        # CJK Symbols and Punctuation
+        data = '、 。 〃 〄 々 〆 〇 〈 〉 《 》 「 」 『 』 【 】 〒 〓 〔 〕 〖 〗 〘 〙 〚 〛 〜 〝 〞 〟 〠 〡 〢 〣 〤 〥 〦 〧 〨 〩 〪 〫 〬 〭 〮 〯 〰 〱 〲 〳 〴 〵 〶 〷 〿'
+        tdLog.info(
+            "insert CJK Symbols and Punctuation %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(49)
+        tdSql.checkData(48, 1, data)
+
+        # Hiragana
+        data = 'ぁ あ ぃ い ぅ う ぇ え ぉ お か が き ぎ く ぐ け げ こ ご さ ざ し じ す ず せ ぜ そ ぞ た だ ち ぢ っ つ づ て で と ど な に ぬ ね の は ば ぱ ひ び ぴ ふ ぶ ぷ へ べ ぺ ほ ぼ ぽ ま み む め も ゃ や ゅ ゆ ょ よ ら り る れ ろ ゎ わ ゐ ゑ を ん ゔ ゙ ゚ ゛ ゜ ゝ ゞ'
+        tdLog.info("insert Hiragana %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(50)
+        tdSql.checkData(49, 1, data)
+
+        # Katakana
+        data = 'ァ ア ィ イ ゥ ウ ェ エ ォ オ カ ガ キ ギ ク グ ケ ゲ コ ゴ サ ザ シ ジ ス ズ セ ゼ ソ ゾ タ ダ チ ヂ ッ ツ ヅ テ デ ト ド ナ ニ ヌ ネ ノ ハ バ パ ヒ ビ ピ フ ブ プ ヘ ベ ペ ホ ボ ポ マ ミ ム メ モ ャ ヤ ュ ユ ョ ヨ ラ リ ル レ ロ ヮ ワ ヰ ヱ ヲ ン ヴ ヵ ヶ ヷ ヸ ヹ ヺ ・ ー ヽ ヾ'
+        tdLog.info("insert Katakana %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(51)
+        tdSql.checkData(50, 1, data)
+
+        # Bopomofo
+        data = 'ㄅ ㄆ ㄇ ㄈ ㄉ ㄊ ㄋ ㄌ ㄍ ㄎ ㄏ ㄐ ㄑ ㄒ ㄓ ㄔ ㄕ ㄖ ㄗ ㄘ ㄙ ㄚ ㄛ ㄜ ㄝ ㄞ ㄟ ㄠ ㄡ ㄢ ㄣ ㄤ ㄥ ㄦ ㄧ ㄨ ㄩ ㄪ ㄫ ㄬ'
+        tdLog.info("insert Bopomofo %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(52)
+        tdSql.checkData(51, 1, data)
+
+        # Hangul Compatibility Jamo
+        data = 'ㄱ ㄲ ㄳ ㄴ ㄵ ㄶ ㄷ ㄸ ㄹ ㄺ ㄻ ㄼ ㄽ ㄾ ㄿ ㅀ ㅁ ㅂ ㅃ ㅄ ㅅ ㅆ ㅇ ㅈ ㅉ ㅊ ㅋ ㅌ ㅍ ㅎ ㅏ ㅐ ㅑ ㅒ ㅓ ㅔ ㅕ ㅖ ㅗ ㅘ ㅙ ㅚ ㅛ ㅜ ㅝ ㅞ ㅟ ㅠ ㅡ ㅢ ㅣ ㅤ ㅥ ㅦ ㅧ ㅨ ㅩ ㅪ ㅫ ㅬ ㅭ ㅮ ㅯ ㅰ ㅱ ㅲ ㅳ ㅴ ㅵ ㅶ ㅷ ㅸ ㅹ ㅺ ㅻ ㅼ ㅽ ㅾ ㅿ ㆀ ㆁ ㆂ ㆃ ㆄ ㆅ ㆆ ㆇ ㆈ ㆉ ㆊ ㆋ ㆌ ㆍ ㆎ'
+        tdLog.info(
+            "insert Hangul Compatibility Jamo %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(53)
+        tdSql.checkData(52, 1, data)
+
+        # Kanbun
+        data = '㆐ ㆑ ㆒ ㆓ ㆔ ㆕ ㆖ ㆗ ㆘ ㆙ ㆚ ㆛ ㆜ ㆝ ㆞ ㆟'
+        tdLog.info("insert Kanbun %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(54)
+        tdSql.checkData(53, 1, data)
+
+        # Enclosed CJK Letters and Months
+        data = '㈀ ㈁ ㈂ ㈃ ㈄ ㈅ ㈆ ㈇ ㈈ ㈉ ㈊ ㈋ ㈌ ㈍ ㈎ ㈏ ㈐ ㈑ ㈒ ㈓ ㈔ ㈕ ㈖ ㈗ ㈘ ㈙ ㈚ ㈛ ㈜ ㈠ ㈡ ㈢ ㈣ ㈤ ㈥ ㈦ ㈧ ㈨ ㈩ ㈪ ㈫ ㈬ ㈭ ㈮ ㈯ ㈰ ㈱ ㈲ ㈳ ㈴ ㈵ ㈶ ㈷ ㈸ ㈹ ㈺ ㈻ ㈼ ㈽ ㈾ ㈿ ㉀ ㉁ ㉂ ㉃ ㉠ ㉡ ㉢ ㉣ ㉤ ㉥ ㉦ ㉧ ㉨ ㉩ ㉪ ㉫ ㉬ ㉭ ㉮ ㉯ ㉰ ㉱ ㉲ ㉳ ㉴ ㉵ ㉶ ㉷ ㉸ ㉹ ㉺ ㉻ ㉿ ㊀ ㊁ ㊂ ㊃ ㊄ ㊅ ㊆ ㊇ ㊈ ㊉ ㊊ ㊋ ㊌ ㊍ ㊎ ㊏ ㊐ ㊑ ㊒ ㊓ ㊔ ㊕ ㊖ ㊗ ㊘ ㊙ ㊚ ㊛ ㊜ ㊝ ㊞ ㊟ ㊠ ㊡ ...'
+        tdLog.info(
+            "insert Enclosed CJK Letters and Months %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(55)
+        tdSql.checkData(54, 1, data)
+
+        # CJK Compatibility
+        data = '㌀ ㌁ ㌂ ㌃ ㌄ ㌅ ㌆ ㌇ ㌈ ㌉ ㌊ ㌋ ㌌ ㌍ ㌎ ㌏ ㌐ ㌑ ㌒ ㌓ ㌔ ㌕ ㌖ ㌗ ㌘ ㌙ ㌚ ㌛ ㌜ ㌝ ㌞ ㌟ ㌠ ㌡ ㌢ ㌣ ㌤ ㌥ ㌦ ㌧ ㌨ ㌩ ㌪ ㌫ ㌬ ㌭ ㌮ ㌯ ㌰ ㌱ ㌲ ㌳ ㌴ ㌵ ㌶ ㌷ ㌸ ㌹ ㌺ ㌻ ㌼ ㌽ ㌾ ㌿ ㍀ ㍁ ㍂ ㍃ ㍄ ㍅ ㍆ ㍇ ㍈ ㍉ ㍊ ㍋ ㍌ ㍍ ㍎ ㍏ ㍐ ㍑ ㍒ ㍓ ㍔ ㍕ ㍖ ㍗ ㍘ ㍙ ㍚ ㍛ ㍜ ㍝ ㍞ ㍟ ㍠ ㍡ ㍢ ㍣ ㍤ ㍥ ㍦ ㍧ ㍨ ㍩ ㍪ ㍫ ㍬ ㍭ ㍮ ㍯ ㍰ ㍱ ㍲ ㍳ ㍴ ㍵ ㍶ ㍻ ㍼ ㍽ ㍾ ㍿ ㎀ ㎁ ㎂ ㎃ ...'
+        tdLog.info(
+            "insert CJK Compatibility %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(56)
+        tdSql.checkData(55, 1, data)
+
+        # CJK Unified Ideographs
+        data = '一 丁 丂 七 丄 丅 丆 万 丈 三 上 下 丌 不 与 丏 丐 丑 丒 专 且 丕 世 丗 丘 丙 业 丛 东 丝 丞 丟 丠 両 丢 丣 两 严 並 丧 丨 丩 个 丫 丬 中 丮 丯 丰 丱 串 丳 临 丵 丶 丷 丸 丹 为 主 丼 丽 举 丿 乀 乁 乂 乃 乄 久 乆 乇 么 义 乊 之 乌 乍 乎 乏 乐 乑 乒 乓 乔 乕 乖 乗 乘 乙 乚 乛 乜 九 乞 也 习 乡 乢 乣 乤 乥 书 乧 乨 乩 乪 乫 乬 乭 乮 乯 买 乱 乲 乳 乴 乵 乶 乷 乸 乹 乺 乻 乼 乽 乾 乿 ...'
+        tdLog.info(
+            "insert CJK Unified Ideographs %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(57)
+        tdSql.checkData(56, 1, data)
+
+        # Hangul Syllables
+        data = '一 丁 丂 七 丄 丅 丆 万 丈 三 上 下 丌 不 与 丏 丐 丑 丒 专 且 丕 世 丗 丘 丙 业 丛 东 丝 丞 丟 丠 両 丢 丣 两 严 並 丧 丨 丩 个 丫 丬 中 丮 丯 丰 丱 串 丳 临 丵 丶 丷 丸 丹 为 主 丼 丽 举 丿 乀 乁 乂 乃 乄 久 乆 乇 么 义 乊 之 乌 乍 乎 乏 乐 乑 乒 乓 乔 乕 乖 乗 乘 乙 乚 乛 乜 九 乞 也 习 乡 乢 乣 乤 乥 书 乧 乨 乩 乪 乫 乬 乭 乮 乯 买 乱 乲 乳 乴 乵 乶 乷 乸 乹 乺 乻 乼 乽 乾 乿 ...'
+        tdLog.info(
+            "insert Hangul Syllables %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(58)
+        tdSql.checkData(57, 1, data)
+
+        # Private Use
+        data = '                                                                                                                                ...'
+        tdLog.info("insert Private Use %d length data: %s" % (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(59)
+        tdSql.checkData(58, 1, data)
+
+        # CJK Compatibility Ideographs
+        data = '豈 更 車 賈 滑 串 句 龜 龜 契 金 喇 奈 懶 癩 羅 蘿 螺 裸 邏 樂 洛 烙 珞 落 酪 駱 亂 卵 欄 爛 蘭 鸞 嵐 濫 藍 襤 拉 臘 蠟 廊 朗 浪 狼 郎 來 冷 勞 擄 櫓 爐 盧 老 蘆 虜 路 露 魯 鷺 碌 祿 綠 菉 錄 鹿 論 壟 弄 籠 聾 牢 磊 賂 雷 壘 屢 樓 淚 漏 累 縷 陋 勒 肋 凜 凌 稜 綾 菱 陵 讀 拏 樂 諾 丹 寧 怒 率 異 北 磻 便 復 不 泌 數 索 參 塞 省 葉 說 殺 辰 沈 拾 若 掠 略 亮 兩 凉 梁 糧 良 諒 量 勵 ...'
+        tdLog.info(
+            "insert CJK Compatibility Ideographs %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(60)
+        tdSql.checkData(59, 1, data)
+
+        # Alphabetic Presentation Forms
+        data = 'ff fi fl ffi ffl ſt st ﬓ ﬔ ﬕ ﬖ ﬗ ﬞ ײַ ﬠ ﬡ ﬢ ﬣ ﬤ ﬥ ﬦ ﬧ ﬨ ﬩ שׁ שׂ שּׁ שּׂ אַ אָ אּ בּ גּ דּ הּ וּ זּ טּ יּ ךּ כּ לּ מּ נּ סּ ףּ פּ צּ קּ רּ שּ תּ וֹ בֿ כֿ פֿ ﭏ'
+        tdLog.info(
+            "insert Alphabetic Presentation Forms %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(61)
+        tdSql.checkData(60, 1, data)
+
+        # Arabic Presentation Forms-A
+        data = 'ﭐ ﭑ ﭒ ﭓ ﭔ ﭕ ﭖ ﭗ ﭘ ﭙ ﭚ ﭛ ﭜ ﭝ ﭞ ﭟ ﭠ ﭡ ﭢ ﭣ ﭤ ﭥ ﭦ ﭧ ﭨ ﭩ ﭪ ﭫ ﭬ ﭭ ﭮ ﭯ ﭰ ﭱ ﭲ ﭳ ﭴ ﭵ ﭶ ﭷ ﭸ ﭹ ﭺ ﭻ ﭼ ﭽ ﭾ ﭿ ﮀ ﮁ ﮂ ﮃ ﮄ ﮅ ﮆ ﮇ ﮈ ﮉ ﮊ ﮋ ﮌ ﮍ ﮎ ﮏ ﮐ ﮑ ﮒ ﮓ ﮔ ﮕ ﮖ ﮗ ﮘ ﮙ ﮚ ﮛ ﮜ ﮝ ﮞ ﮟ ﮠ ﮡ ﮢ ﮣ ﮤ ﮥ ﮦ ﮧ ﮨ ﮩ ﮪ ﮫ ﮬ ﮭ ﮮ ﮯ ﮰ ﮱ ﯓ ﯔ ﯕ ﯖ ﯗ ﯘ ﯙ ﯚ ﯛ ﯜ ﯝ ﯞ ﯟ ﯠ ﯡ ﯢ ﯣ ﯤ ﯥ ﯦ ﯧ ﯨ ﯩ ﯪ ﯫ ﯬ ﯭ ﯮ ﯯ ﯰ ...'
+        tdLog.info(
+            "insert Arabic Presentation Forms-A %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(62)
+        tdSql.checkData(61, 1, data)
+
+        # Combining Half Marks
+        data = '︠ ︡ ︢ ︣'
+        tdLog.info(
+            "insert Combining Half Marks %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(63)
+        tdSql.checkData(62, 1, data)
+
+        # CJK Compatibility Forms
+        data = '︰ ︱ ︲ ︳ ︴ ︵ ︶ ︷ ︸ ︹ ︺ ︻ ︼ ︽ ︾ ︿ ﹀ ﹁ ﹂ ﹃ ﹄ ﹉ ﹊ ﹋ ﹌ ﹍ ﹎ ﹏'
+        tdLog.info(
+            "insert CJK Compatibility Forms %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(64)
+        tdSql.checkData(63, 1, data)
+
+        # Small Form Variants
+        data = '﹐ ﹑ ﹒ ﹔ ﹕ ﹖ ﹗ ﹘ ﹙ ﹚ ﹛ ﹜ ﹝ ﹞ ﹟ ﹠ ﹡ ﹢ ﹣ ﹤ ﹥ ﹦ ﹨ ﹩ ﹪ ﹫'
+        tdLog.info(
+            "insert Small Form Variants %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(65)
+        tdSql.checkData(64, 1, data)
+
+        # Arabic Presentation Forms-B
+        data = 'ﹰ ﹱ ﹲ ﹴ ﹶ ﹷ ﹸ ﹹ ﹺ ﹻ ﹼ ﹽ ﹾ ﹿ ﺀ ﺁ ﺂ ﺃ ﺄ ﺅ ﺆ ﺇ ﺈ ﺉ ﺊ ﺋ ﺌ ﺍ ﺎ ﺏ ﺐ ﺑ ﺒ ﺓ ﺔ ﺕ ﺖ ﺗ ﺘ ﺙ ﺚ ﺛ ﺜ ﺝ ﺞ ﺟ ﺠ ﺡ ﺢ ﺣ ﺤ ﺥ ﺦ ﺧ ﺨ ﺩ ﺪ ﺫ ﺬ ﺭ ﺮ ﺯ ﺰ ﺱ ﺲ ﺳ ﺴ ﺵ ﺶ ﺷ ﺸ ﺹ ﺺ ﺻ ﺼ ﺽ ﺾ ﺿ ﻀ ﻁ ﻂ ﻃ ﻄ ﻅ ﻆ ﻇ ﻈ ﻉ ﻊ ﻋ ﻌ ﻍ ﻎ ﻏ ﻐ ﻑ ﻒ ﻓ ﻔ ﻕ ﻖ ﻗ ﻘ ﻙ ﻚ ﻛ ﻜ ﻝ ﻞ ﻟ ﻠ ﻡ ﻢ ﻣ ﻤ ﻥ ﻦ ﻧ ﻨ ﻩ ﻪ ﻫ ﻬ ﻭ ﻮ ﻯ ﻰ ﻱ ...'
+        tdLog.info(
+            "insert Arabic Presentation Forms-B %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(66)
+        tdSql.checkData(65, 1, data)
+
+        # Halfwidth and Fullwidth Forms
+        data = '！ ＂ ＃ ＄ ％ ＆ ＇ （ ） ＊ ＋ ， － ． ／ ０ １ ２ ３ ４ ５ ６ ７ ８ ９ ： ； ＜ ＝ ＞ ？ ＠ Ａ Ｂ Ｃ Ｄ Ｅ Ｆ Ｇ Ｈ Ｉ Ｊ Ｋ Ｌ Ｍ Ｎ Ｏ Ｐ Ｑ Ｒ Ｓ Ｔ Ｕ Ｖ Ｗ Ｘ Ｙ Ｚ ［ ＼ ］ ＾ ＿ ｀ ａ ｂ ｃ ｄ ｅ ｆ ｇ ｈ ｉ ｊ ｋ ｌ ｍ ｎ ｏ ｐ ｑ ｒ ｓ ｔ ｕ ｖ ｗ ｘ ｙ ｚ ｛ ｜ ｝ ～ ｡ ｢ ｣ ､ ･ ｦ ｧ ｨ ｩ ｪ ｫ ｬ ｭ ｮ ｯ ｰ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ...'
+        tdLog.info(
+            "insert Halfwidth and Fullwidth Forms %d length data: %s" %
+            (len(data), data))
+        tdSql.execute("insert into tb values (now, '%s')" % data)
+        tdSql.query("select * from tb")
+        tdSql.checkRows(67)
+        tdSql.checkData(66, 1, data)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/nchar.py b/tests/pytest/insert/nchar.py
new file mode 100644
index 0000000000000000000000000000000000000000..3319aa3c565b76d4d7fb9c33b04549e090c8062b
--- /dev/null
+++ b/tests/pytest/insert/nchar.py
@@ -0,0 +1,46 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('create table tb (ts timestamp, col nchar(10))')
+        tdSql.execute("insert into tb values (now, 'taosdata')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 'taosdata')
+        tdSql.execute("insert into tb values (now, '涛思数据')")
+        tdSql.query("select * from tb")
+        tdSql.checkRows(2)
+        tdSql.checkData(1, 1, '涛思数据')
+
+        tdSql.error("insert into tb values (now, 'taosdata001')")
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/randomNullCommit.py b/tests/pytest/insert/randomNullCommit.py
new file mode 100644
index 0000000000000000000000000000000000000000..ecacd20daf522a7a57ef53c78af477d118d90ede
--- /dev/null
+++ b/tests/pytest/insert/randomNullCommit.py
@@ -0,0 +1,66 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        tdSql.execute(
+            'create table tb (ts timestamp, speed int, temp float, note binary(5), flag bool)')
+
+        numOfRecords = 0
+        randomList = [10, 50, 100, 500, 1000, 5000]
+        for i in range(0, 10):
+            num = random.choice(randomList)
+            tdLog.info("will insert %d records" % num)
+            for x in range(0, num):
+                tdLog.info(
+                    'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' %
+                    x)
+                tdSql.execute(
+                    'insert into tb values (now + %da, NULL, NULL, NULL, TRUE)' %
+                    x)
+
+            numOfRecords = numOfRecords + num
+
+            tdSql.query("select * from tb")
+            tdSql.checkRows(numOfRecords)
+            tdSql.checkData(numOfRecords - num, 1, None)
+            tdSql.checkData(numOfRecords - 1, 2, None)
+
+            tdLog.info("stop dnode to commit data to disk")
+            tdDnodes.stop(1)
+            tdDnodes.start(1)
+            tdLog.sleep(5)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/restful.py b/tests/pytest/insert/restful.py
new file mode 100644
index 0000000000000000000000000000000000000000..bf9bde99f0f97276e9a00aaa3290258274da988b
--- /dev/null
+++ b/tests/pytest/insert/restful.py
@@ -0,0 +1,60 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import requests, json
+import threading
+import string
+import random
+
+class RestfulInsert:
+    def init(self):
+        self.header = {'Authorization': 'Basic cm9vdDp0YW9zZGF0YQ=='}
+        self.url = "http://127.0.0.1:6041/rest/sql"
+        self.ts = 1104508800000
+        self.numOfThreads = 50
+
+    def get_random_string(self, length):
+        letters = string.ascii_lowercase
+        result_str = ''.join(random.choice(letters) for i in range(length))
+        return result_str
+
+    def insertData(self, threadID):
+        print("thread %d started" % threadID)
+        data = "create table test.tb%d(ts timestamp, name nchar(20))" % threadID
+        requests.post(self.url, data, headers = self.header)              
+        name = self.get_random_string(10)
+        start = self.ts
+        while True:
+            start += 1
+            data = "insert into test.tb%d values(%d, '%s')" % (threadID, start, name)
+            requests.post(self.url, data, headers = self.header)
+
+    def run(self):
+        data = "drop database if exists test"
+        requests.post(self.url, data, headers = self.header)
+        data = "create database test keep 7300"
+        requests.post(self.url, data, headers = self.header)
+
+        threads = []        
+        for i in range(self.numOfThreads):
+            thread = threading.Thread(target=self.insertData, args=(i,))
+            thread.start()
+            threads.append(thread)            
+        
+        for i in range(self.numOfThreads):
+            threads[i].join()
+
+ri = RestfulInsert()
+ri.init()
+ri.run()
\ No newline at end of file
diff --git a/tests/pytest/insert/retentionpolicy.py b/tests/pytest/insert/retentionpolicy.py
new file mode 100644
index 0000000000000000000000000000000000000000..c69060b5aec16b8d58aa2742e24c44d1ebe543ab
--- /dev/null
+++ b/tests/pytest/insert/retentionpolicy.py
@@ -0,0 +1,122 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import datetime
+sys.path.insert(0, os.getcwd())
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestRetetion:
+    def init(self):
+        self.queryRows=0
+        tdLog.debug("start to execute %s" % __file__)
+        tdLog.info("prepare cluster")
+        tdDnodes.init("")
+        tdDnodes.setTestCluster(False)
+        tdDnodes.setValgrind(False)
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        print(tdDnodes.getDnodesRootDir())
+        self.conn = taos.connect(config=tdDnodes.getSimCfgPath())
+        tdSql.init(self.conn.cursor())
+        tdSql.execute('reset query cache')
+    def checkRows(self, expectRows,sql):
+        if self.queryRows == expectRows:
+            tdLog.info("sql:%s, queryRows:%d == expect:%d" % (sql, self.queryRows, expectRows))
+        else:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, sql, self.queryRows, expectRows)
+            os.system("sudo timedatectl set-ntp true")
+            time.sleep(40)
+            tdLog.exit("%s(%d) failed: sql:%s, queryRows:%d != expect:%d" % args)
+
+    def run(self):
+        
+        tdLog.info("=============== step1")
+        tdSql.execute('create database test keep 3 days 1;')
+        tdSql.execute('use test;')
+        tdSql.execute('create table test(ts timestamp,i int);')
+
+        cmd = 'insert into test values(now-2d,1)(now-1d,2)(now,3)(now+1d,4);'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        tdSql.query('select * from test')
+        tdSql.checkRows(4)
+
+        tdLog.info("=============== step2")
+        tdDnodes.stop(1)
+        os.system("sudo timedatectl set-ntp false")
+        os.system("sudo date -s $(date -d \"${DATE} 2 days\" \"+%Y%m%d\")")
+        tdDnodes.start(1)
+        cmd = 'insert into test values(now,5);'
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        self.queryRows=tdSql.query('select * from test')
+        if self.queryRows==4:
+            self.checkRows(4,cmd)
+            return 0
+        else:
+            self.checkRows(5,cmd)
+        tdLog.info("=============== step3")
+        tdDnodes.stop(1)
+        os.system("sudo date -s $(date -d \"${DATE} 2 days\" \"+%Y%m%d\")")
+        tdDnodes.start(1)
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        self.queryRows=tdSql.query('select * from test')
+        if self.queryRows==4:
+            self.checkRows(4,cmd)
+            return 0
+        cmd = 'insert into test values(now-1d,6);'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        self.queryRows=tdSql.query('select * from test')
+        self.checkRows(6,cmd)
+        tdLog.info("=============== step4")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        cmd = 'insert into test values(now,7);'
+        tdLog.info(cmd)
+        tdSql.execute(cmd)
+        self.queryRows=tdSql.query('select * from test')
+        self.checkRows(7,cmd)
+
+        tdLog.info("=============== step5")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        cmd='select * from test where ts > now-1d'
+        self.queryRows=tdSql.query('select * from test where ts > now-1d')
+        self.checkRows(1,cmd)
+
+    def stop(self):
+        os.system("sudo timedatectl set-ntp true")
+        time.sleep(40)
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+clients = TDTestRetetion()
+clients.init()
+clients.run()
+clients.stop()
+
diff --git a/tests/pytest/insert/smallint.py b/tests/pytest/insert/smallint.py
new file mode 100644
index 0000000000000000000000000000000000000000..16322e9aeb801ae92b75b920922991206a4b2e35
--- /dev/null
+++ b/tests/pytest/insert/smallint.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed smallint)')
+        tdSql.execute('create table tb (ts timestamp, speed smallint)')
+        tdLog.info("insert into tb values (now, NULL)")
+        tdSql.execute("insert into tb values (now, NULL)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step2')
+        tdLog.info("insert into tb values (now+1m, -32768) -x step2")
+        tdSql.error("insert into tb values (now+1m, -32768)")
+        tdLog.info("insert into tb values (now+1m, NULL)")
+        tdSql.execute("insert into tb values (now+1m, NULL)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2m, 32767)")
+        tdSql.execute("insert into tb values (now+2m, 32767)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('tdSql.checkData(0, 1, 32767)')
+        tdSql.checkData(0, 1, 32767)
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3m, 32768) -x step4")
+        tdSql.error("insert into tb values (now+3m, 32768)")
+        tdLog.info("insert into tb values (now+3m, NULL)")
+        tdSql.execute("insert into tb values (now+3m, NULL)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step5')
+        tdLog.info("insert into tb values (now+4m, a2)")
+        tdSql.error("insert into tb values (now+4m, a2)")
+        tdLog.info("insert into tb values (now+4m, 0)")
+        tdSql.execute("insert into tb values (now+4m, 0)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        tdLog.info('tdSql.checkData(0, 1, 0)')
+        tdSql.checkData(0, 1, 0)
+        tdLog.info('=============== step6')
+        tdLog.info("insert into tb values (now+5m, 2a)")
+        tdSql.error("insert into tb values (now+5m, 2a)")
+        tdLog.info("insert into tb values (now+5m, 2)")
+        tdSql.execute("insert into tb values (now+5m, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(6)')
+        tdSql.checkRows(6)
+        tdLog.info('tdSql.checkData(0, 1, 2)')
+        tdSql.checkData(0, 1, 2)
+        tdLog.info('=============== step7')
+        tdLog.info("insert into tb values (now+6m, 2a'1)")
+        tdSql.error("insert into tb values (now+6m, 2a'1)")
+        tdLog.info("insert into tb values (now+6m, 2)")
+        tdSql.execute("insert into tb values (now+6m, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(7)')
+        tdSql.checkRows(7)
+        tdLog.info('tdSql.checkData(0, 1, 2)')
+        tdSql.checkData(0, 1, 2)
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/sparseData.py b/tests/pytest/insert/sparseData.py
new file mode 100644
index 0000000000000000000000000000000000000000..38b04b339efd2b3b465f0ff80812c627dd3826d8
--- /dev/null
+++ b/tests/pytest/insert/sparseData.py
@@ -0,0 +1,67 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        tdSql.execute(
+            'create table tb (ts timestamp, speed int, temp float, note binary(4000), flag bool)')
+
+        numOfRecords = 1000000
+        dividend = 1000
+        tdLog.info("will insert %d records" % numOfRecords)
+
+        ts = 1500000000000
+        for i in range(0, numOfRecords):
+
+            if (i % dividend):
+                print(".", end="")
+                tdSql.execute(
+                    'insert into tb values (%d + %da, NULL, NULL, NULL, TRUE)' %
+                    (ts, i))
+            else:
+                print("a", end="")
+                tdSql.execute(
+                    'insert into tb values (%d + %da, NULL, NULL, "a", FALSE)' %
+                    (ts, i))
+
+        tdSql.query("select * from tb")
+        tdSql.checkRows(numOfRecords)
+        tdSql.checkData(numOfRecords - dividend, 3, 'a')
+        tdSql.checkData(numOfRecords - dividend - 1, 3, None)
+
+        tdLog.info("stop dnode to commit data to disk")
+        tdDnodes.stop(1)
+        tdLog.info("dnodes:%d size is %d" % (1, tdDnodes.getDataSize(1)))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/tagSepcified.py b/tests/pytest/insert/tagSepcified.py
new file mode 100644
index 0000000000000000000000000000000000000000..213cf119a0d4f13756c7931aeb79b241250dbf06
--- /dev/null
+++ b/tests/pytest/insert/tagSepcified.py
@@ -0,0 +1,49 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute('create table xcxlog (ts timestamp, user_id int, path BINARY(40),scene int) tags(appid bigint, adzone_id int,ip bigint,session_id bigint)')
+        tdSql.error("insert into d1000004(user_id,path,scene,ts) using xcxlog tags(1000004,145,97160) values (97160,'pagex/goods/taoke',1086,now)")
+        tdSql.execute("insert into d1000004_145(user_id,path,scene,ts) using xcxlog(appid,adzone_id,session_id,ip) tags(1000004,145,97160,1717171445) values (97160,'pagex/goods/taoke',1086,now)")
+        
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 'd1000004_145')
+
+        tdSql.query("select * from xcxlog")
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 4, 1000004)
+        tdSql.checkData(0, 5, 145)
+        tdSql.checkData(0, 6, 1717171445)
+        tdSql.checkData(0, 7, 97160)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/tinyint.py b/tests/pytest/insert/tinyint.py
new file mode 100644
index 0000000000000000000000000000000000000000..a10c999e8c2f0fe070347651f9246e3734104eca
--- /dev/null
+++ b/tests/pytest/insert/tinyint.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb (ts timestamp, speed tinyint)')
+        tdSql.execute('create table tb (ts timestamp, speed tinyint)')
+        tdLog.info("insert into tb values (now, NULL)")
+        tdSql.execute("insert into tb values (now, NULL)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step2')
+        tdLog.info("insert into tb values (now+1m, -128)  -x step2")
+        tdSql.error("insert into tb values (now+1m, -128) ")
+        tdLog.info("insert into tb values (now+1m, NULL)")
+        tdSql.execute("insert into tb values (now+1m, NULL)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now+2m, 127)")
+        tdSql.execute("insert into tb values (now+2m, 127)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(3)')
+        tdSql.checkRows(3)
+        tdLog.info('tdSql.checkData(0, 1, 127)')
+        tdSql.checkData(0, 1, 127)
+        tdLog.info('=============== step4')
+        tdLog.info("insert into tb values (now+3m, 128) -x step4")
+        tdSql.error("insert into tb values (now+3m, 128)")
+        tdLog.info("insert into tb values (now+3m, NULL)")
+        tdSql.execute("insert into tb values (now+3m, NULL)")
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        tdLog.info('tdSql.checkData(0, 1, null)')
+        tdSql.checkData(0, 1, None)
+        tdLog.info('=============== step5')
+        tdLog.info("insert into tb values (now+4m, a2)")
+        tdSql.error("insert into tb values (now+4m, a2)")
+        tdLog.info("insert into tb values (now+4m, 0)")
+        tdSql.execute("insert into tb values (now+4m, 0)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        tdLog.info('tdSql.checkData(0, 1, 0)')
+        tdSql.checkData(0, 1, 0)
+        tdLog.info('=============== step6')
+        tdLog.info("insert into tb values (now+5m, 2a)")
+        tdSql.error("insert into tb values (now+5m, 2a)")
+        tdLog.info("insert into tb values (now+5m, 2)")
+        tdSql.execute("insert into tb values (now+5m, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(6)')
+        tdSql.checkRows(6)
+        tdLog.info('tdSql.checkData(0, 1, 2)')
+        tdSql.checkData(0, 1, 2)
+        tdLog.info('=============== step7')
+        tdLog.info("insert into tb values (now+6m, 2a'1)")
+        tdSql.error("insert into tb values (now+6m, 2a'1)")
+        tdLog.info("insert into tb values (now+6m, 2)")
+        tdSql.execute("insert into tb values (now+6m, 2)")
+        tdLog.info('select * from tb order by ts desc')
+        tdSql.query('select * from tb order by ts desc')
+        tdLog.info('tdSql.checkRow(7)')
+        tdSql.checkRows(7)
+        tdLog.info('tdSql.checkData(0, 1, 2)')
+        tdSql.checkData(0, 1, 2)
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/insert/writeDBNonStop.py b/tests/pytest/insert/writeDBNonStop.py
new file mode 100644
index 0000000000000000000000000000000000000000..bdc93f0469d8a774a3f8a8675eb65728ccb8aa8d
--- /dev/null
+++ b/tests/pytest/insert/writeDBNonStop.py
@@ -0,0 +1,83 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import time
+from datetime import datetime
+import csv
+
+
+class DBWriteNonStop:
+    def __init__(self):
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/etc/taos"
+
+    def connectDB(self):
+        self.conn = taos.connect(
+            self.host,
+            self.user,
+            self.password,
+            self.config)
+        self.cursor = self.conn.cursor()
+
+    def createTable(self):
+        self.cursor.execute("drop database if exists dbwrite")
+        self.cursor.execute("create database dbwrite")
+        self.cursor.execute("use dbwrite")
+        self.cursor.execute(
+            "create table if not exists st (ts timestamp, value nchar(50), speed int) tags(dev nchar(50))")
+
+    def writeDataToCSVFile(self, data, duration):
+        csvFile = open('/root/csvFile.csv', 'a', newline='')
+        writer = csv.writer(csvFile)
+        writer.writerow([data[0][0], data[0][1], data[0][2],
+                         data[0][3], data[0][4], data[0][5], duration])
+        csvFile.close()
+
+    def insertData(self):
+        print("===============inserting data===============")
+        i = 1
+        startTime = datetime.now()
+        while True:
+            self.cursor.execute(
+                "insert into st1 using st tags('dev_001') values(now, 'taosdata%d', %d)" %
+                (i %
+                 10000,
+                 i %
+                 100000))
+            i += 1
+            i = i % 32000000
+            endTime = datetime.now()
+            if (endTime - startTime).seconds >= 3600 * 1:
+                startTime = endTime
+                start = datetime.now()
+                self.cursor.execute(
+                    "select first(ts), last(ts), min(speed), max(speed), avg(speed), count(*) from st")
+                data = self.cursor.fetchall()
+                end = datetime.now()
+                self.writeDataToCSVFile(data, (end - start).seconds)
+            time.sleep(.001)
+
+    def closeConn(self):
+        self.cursor.close()
+        self.conn.close()
+
+
+test = DBWriteNonStop()
+test.connectDB()
+test.createTable()
+test.insertData()
+test.closeConn()
diff --git a/tests/pytest/query/__init__.py b/tests/pytest/query/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/query/filter.py b/tests/pytest/query/filter.py
new file mode 100644
index 0000000000000000000000000000000000000000..f107985f150a05cdd38a7fa1453d59d35c8a903a
--- /dev/null
+++ b/tests/pytest/query/filter.py
@@ -0,0 +1,114 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int, name nchar(16)) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype, name) VALUES('2020-05-13 10:00:00.000', 1, 'first'),('2020-05-13 10:00:00.001', 2, 'second'),
+            ('2020-05-13 10:00:00.002', 3, 'third') dev_002 VALUES('2020-05-13 10:00:00.003', 1, 'first'), ('2020-05-13 10:00:00.004', 2, 'second'),
+            ('2020-05-13 10:00:00.005', 3, 'third')""")
+
+        # > for timestamp type
+        tdSql.query("select * from db.st where ts > '2020-05-13 10:00:00.002'")
+        tdSql.checkRows(3)
+
+        # > for numeric type
+        tdSql.query("select * from db.st where tagtype > 2")
+        tdSql.checkRows(2)
+
+        # < for timestamp type
+        tdSql.query("select * from db.st where ts < '2020-05-13 10:00:00.002'")
+        tdSql.checkRows(2)
+
+        # < for numeric type
+        tdSql.query("select * from db.st where tagtype < 2")
+        tdSql.checkRows(2)
+
+        # >= for timestamp type
+        tdSql.query("select * from db.st where ts >= '2020-05-13 10:00:00.002'")
+        tdSql.checkRows(4)
+
+        # >= for numeric type
+        tdSql.query("select * from db.st where tagtype >= 2")
+        tdSql.checkRows(4)
+
+        # <= for timestamp type
+        tdSql.query("select * from db.st where ts <= '2020-05-13 10:00:00.002'")
+        tdSql.checkRows(3)
+
+        # <= for numeric type
+        tdSql.query("select * from db.st where tagtype <= 2")
+        tdSql.checkRows(4)
+
+        # = for timestamp type
+        tdSql.query("select * from db.st where ts = '2020-05-13 10:00:00.002'")
+        tdSql.checkRows(1)
+
+        # = for numeric type
+        tdSql.query("select * from db.st where tagtype = 2")
+        tdSql.checkRows(2)
+
+        # = for nchar type
+        tdSql.query("select * from db.st where name = 'first'")
+        tdSql.checkRows(2)
+
+        # <> for timestamp type
+        tdSql.query("select * from db.st where ts <> '2020-05-13 10:00:00.002'")
+        # tdSql.checkRows(4)
+
+        # <> for numeric type
+        tdSql.query("select * from db.st where tagtype <> 2")
+        tdSql.checkRows(4)
+
+        # <> for nchar type
+        tdSql.query("select * from db.st where name <> 'first'")
+        tdSql.checkRows(4)
+
+        # % for nchar type
+        tdSql.query("select * from db.st where name like 'fi%'")
+        tdSql.checkRows(2)
+
+        # - for nchar type
+        tdSql.query("select * from db.st where name like '_econd'")
+        tdSql.checkRows(2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/filterAllIntTypes.py b/tests/pytest/query/filterAllIntTypes.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d91168dae3440443be6daa96747386a687a0f58
--- /dev/null
+++ b/tests/pytest/query/filterAllIntTypes.py
@@ -0,0 +1,173 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.powers = [7, 15, 31, 63]
+        self.types = ["tinyint", "smallint", "int", "bigint"]
+        self.rowNum = 10
+        self.ts = 1537146000000
+
+    def run(self):
+        tdSql.prepare()
+
+        for i in range(len(self.powers)):
+            curType = self.types[i]
+            print("======= Verify filter for %s type =========" % (curType))
+            tdLog.debug(
+                "create table st%s(ts timestamp, num %s) tags(id %s)" %
+                (curType, curType, curType))
+            tdSql.execute(
+                "create table st%s(ts timestamp, num %s) tags(id %s)" %
+                (curType, curType, curType))
+
+            # create 10 tables, insert 10 rows for each table
+            for j in range(self.rowNum):
+                tdSql.execute(
+                    "create table st%s%d using st%s tags(%d)" %
+                    (curType, j + 1, curType, j + 1))
+                for k in range(self.rowNum):
+                    tdSql.execute(
+                        "insert into st%s%d values(%d, %d)" %
+                        (curType, j + 1, self.ts + k + 1, j * 10 + k + 1))
+
+            tdSql.error("insert into st%s10 values(%d, %d)" %
+                        (curType, self.ts + 11, pow(2, self.powers[i])))
+            tdSql.execute("insert into st%s10 values(%d, %d)" %
+                          (curType, self.ts + 12, pow(2, self.powers[i]) - 1))
+            tdSql.error("insert into st%s10 values(%d, %d)" %
+                        (curType, self.ts + 13, pow(-2, self.powers[i])))
+            tdSql.execute("insert into st%s10 values(%d, %d)" %
+                          (curType, self.ts + 14, pow(-2, self.powers[i]) + 1))
+
+            # > for int type on column
+            tdSql.query("select * from st%s where num > 50" % curType)
+            tdSql.checkRows(51)
+
+            # >= for int type on column
+            tdSql.query("select * from st%s where num >= 50" % curType)
+            tdSql.checkRows(52)
+
+            # = for int type on column
+            tdSql.query("select * from st%s where num = 50" % curType)
+            tdSql.checkRows(1)
+
+            # < for int type on column
+            tdSql.query("select * from st%s where num < 50" % curType)
+            tdSql.checkRows(50)
+
+            # <= for int type on column
+            tdSql.query("select * from st%s where num <= 50" % curType)
+            tdSql.checkRows(51)
+
+            # <> for int type on column
+            tdSql.query("select * from st%s where num <> 50" % curType)
+            tdSql.checkRows(101)
+
+            # != for int type on column
+            tdSql.query("select * from st%s where num != 50" % curType)
+            tdSql.checkRows(101)
+
+            # range for int type on column
+            tdSql.query(
+                "select * from st%s where num > 50 and num < 100" %
+                curType)
+            tdSql.checkRows(49)
+
+            tdSql.query(
+                "select * from st%s where num >= 50 and num < 100" %
+                curType)
+            tdSql.checkRows(50)
+
+            tdSql.query(
+                "select * from st%s where num > 50 and num <= 100" %
+                curType)
+            tdSql.checkRows(50)
+
+            tdSql.query(
+                "select * from st%s where num >= 50 and num <= 100" %
+                curType)
+            tdSql.checkRows(51)
+
+            # > for int type on tag
+            tdSql.query("select * from st%s where id > 5" % curType)
+            tdSql.checkRows(52)
+
+            # >= for int type on tag
+            tdSql.query("select * from st%s where id >= 5" % curType)
+            tdSql.checkRows(62)
+
+            # = for int type on tag
+            tdSql.query("select * from st%s where id = 5" % curType)
+            tdSql.checkRows(10)
+
+            # < for int type on tag
+            tdSql.query("select * from st%s where id < 5" % curType)
+            tdSql.checkRows(40)
+
+            # <= for int type on tag
+            tdSql.query("select * from st%s where id <= 5" % curType)
+            tdSql.checkRows(50)
+
+            # <> for int type on tag
+            tdSql.query("select * from st%s where id <> 5" % curType)
+            tdSql.checkRows(92)
+
+            # != for int type on tag
+            tdSql.query("select * from st%s where id != 5" % curType)
+            tdSql.checkRows(92)
+
+            # != for int type on tag
+            tdSql.query("select * from st%s where id != 5" % curType)
+            tdSql.checkRows(92)
+
+            # range for int type on tag
+            tdSql.query("select * from st%s where id > 5 and id < 7" % curType)
+            tdSql.checkRows(10)
+
+            tdSql.query(
+                "select * from st%s where id >= 5 and id < 7" %
+                curType)
+            tdSql.checkRows(20)
+
+            tdSql.query(
+                "select * from st%s where id > 5 and id <= 7" %
+                curType)
+            tdSql.checkRows(20)
+
+            tdSql.query(
+                "select * from st%s where id >= 5 and id <= 7" %
+                curType)
+            tdSql.checkRows(30)
+
+            print(
+                "======= Verify filter for %s type finished =========" %
+                curType)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/filterCombo.py b/tests/pytest/query/filterCombo.py
new file mode 100644
index 0000000000000000000000000000000000000000..e769addb525433bb05c7a287590c07f88ce86714
--- /dev/null
+++ b/tests/pytest/query/filterCombo.py
@@ -0,0 +1,63 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int, name nchar(16)) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype, name) VALUES('2020-05-13 10:00:00.000', 1, 'first'),('2020-05-13 10:00:00.001', 2, 'second'),
+            ('2020-05-13 10:00:00.002', 3, 'third') dev_002 VALUES('2020-05-13 10:00:00.003', 1, 'first'), ('2020-05-13 10:00:00.004', 2, 'second'),
+            ('2020-05-13 10:00:00.005', 3, 'third')""")
+
+        # query with filter condition A OR condition B
+        tdSql.query(
+            "select * from db.st where ts > '2020-05-13 10:00:00.002' AND tagtype < 2")
+        tdSql.checkRows(1)
+
+        # query with filter condition A OR condition B, error expected
+        tdSql.error(
+            "select * from db.st where ts > '2020-05-13 10:00:00.002' OR tagtype < 2")
+
+        # illegal condition
+        tdSql.error(
+            "select * from db.st where ts != '2020-05-13 10:00:00.002' OR tagtype < 2")        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/filterFloatAndDouble.py b/tests/pytest/query/filterFloatAndDouble.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d0e5baeca6775b129c5fc2438bb1a6bc8957b87
--- /dev/null
+++ b/tests/pytest/query/filterFloatAndDouble.py
@@ -0,0 +1,186 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+
+    def run(self):
+        tdSql.prepare()
+
+        print("======= Verify filter for float and double type =========")
+        tdLog.debug(
+            "create table st(ts timestamp, num float, speed double) tags(tagcol1 float, tagcol2 double)")
+        tdSql.execute(
+            "create table st(ts timestamp, num float, speed double) tags(tagcol1 float, tagcol2 double)")
+
+        for j in range(self.rowNum):
+            tdSql.execute("insert into st1 using st tags(1.1, 2.3) values(%d, %f, %f)" % (
+                self.ts + j + 1, 1.1 * (j + 1), 2.3 * (j + 1)))
+
+        # > for float type on column
+        tdSql.query("select * from st where num > 5.5")
+        tdSql.checkRows(5)
+
+        # >= for float type on column
+        tdSql.query("select * from st where num >= 5.5")
+        tdSql.checkRows(6)
+
+        # = for float type on column
+        tdSql.query("select * from st where num = 5.5")
+        tdSql.checkRows(1)
+
+        # <> for float type on column
+        tdSql.query("select * from st where num <> 5.5")
+        tdSql.checkRows(9)
+
+        # != for float type on column
+        tdSql.query("select * from st where num != 5.5")
+        tdSql.checkRows(9)
+
+        # <= for float type on column
+        tdSql.query("select * from st where num <= 5.5")
+        tdSql.checkRows(5)
+
+        # < for float type on column
+        tdSql.query("select * from st where num < 5.5")
+        tdSql.checkRows(4)
+
+        # range for float type on column
+        tdSql.query("select * from st where num > 5.5 and num < 11.0")
+        tdSql.checkRows(4)
+
+        tdSql.query("select * from st where num >= 5.5 and num < 11.0")
+        tdSql.checkRows(5)
+
+        tdSql.query("select * from st where num > 5.5 and num <= 11.0")
+        tdSql.checkRows(5)
+
+        tdSql.query("select * from st where num >= 5.5 and num <= 11.0")
+        tdSql.checkRows(6)
+
+        # > for float type on tag
+        tdSql.query("select * from st where tagcol1 > 1.1")
+        tdSql.checkRows(0)
+
+        # >= for float type on tag
+        tdSql.query("select * from st where tagcol1 >= 1.1")
+        tdSql.checkRows(10)
+
+        # = for float type on tag
+        tdSql.query("select * from st where tagcol1 = 1.1")
+        tdSql.checkRows(10)
+
+        # <> for float type on tag
+        tdSql.query("select * from st where tagcol1 <> 1.1")
+        tdSql.checkRows(0)
+
+        # != for float type on tag
+        tdSql.query("select * from st where tagcol1 != 1.1")
+        tdSql.checkRows(0)
+
+        # <= for float type on tag
+        tdSql.query("select * from st where tagcol1 <= 1.1")
+        tdSql.checkRows(10)
+
+        # < for float type on tag
+        tdSql.query("select * from st where tagcol1 < 1.1")
+        tdSql.checkRows(0)
+
+        # > for double type on column
+        tdSql.query("select * from st where speed > 11.5")
+        tdSql.checkRows(5)
+
+        # >= for double type on column
+        tdSql.query("select * from st where speed >= 11.5")
+        tdSql.checkRows(6)
+
+        # = for double type on column
+        tdSql.query("select * from st where speed = 11.5")
+        tdSql.checkRows(1)
+
+        # <> for double type on column
+        tdSql.query("select * from st where speed <> 11.5")
+        tdSql.checkRows(9)
+
+        # != for double type on column
+        tdSql.query("select * from st where speed != 11.5")
+        tdSql.checkRows(9)
+
+        # <= for double type on column
+        tdSql.query("select * from st where speed <= 11.5")
+        tdSql.checkRows(5)
+
+        # < for double type on column
+        tdSql.query("select * from st where speed < 11.5")
+        tdSql.checkRows(4)
+
+        # range for double type on column
+        tdSql.query("select * from st where speed > 11.5 and speed < 20.7")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from st where speed >= 11.5 and speed < 20.7")
+        tdSql.checkRows(4)
+
+        tdSql.query("select * from st where speed > 11.5 and speed <= 20.7")
+        tdSql.checkRows(4)
+
+        tdSql.query("select * from st where speed >= 11.5 and speed <= 20.7")
+        tdSql.checkRows(5)
+
+        # > for double type on tag
+        tdSql.query("select * from st where tagcol2 > 2.3")
+        tdSql.checkRows(0)
+
+        # >= for double type on tag
+        tdSql.query("select * from st where tagcol2 >= 2.3")
+        tdSql.checkRows(10)
+
+        # = for double type on tag
+        tdSql.query("select * from st where tagcol2 = 2.3")
+        tdSql.checkRows(10)
+
+        # <> for double type on tag
+        tdSql.query("select * from st where tagcol2 <> 2.3")
+        tdSql.checkRows(0)
+
+        # != for double type on tag
+        tdSql.query("select * from st where tagcol2 != 2.3")
+        tdSql.checkRows(0)
+
+        # <= for double type on tag
+        tdSql.query("select * from st where tagcol2 <= 2.3")
+        tdSql.checkRows(10)
+
+        # < for double type on tag
+        tdSql.query("select * from st where tagcol2 < 2.3")
+        tdSql.checkRows(0)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/filterOtherTypes.py b/tests/pytest/query/filterOtherTypes.py
new file mode 100644
index 0000000000000000000000000000000000000000..85d5a67bef04564741ae7c17bd12ee992fcc09f8
--- /dev/null
+++ b/tests/pytest/query/filterOtherTypes.py
@@ -0,0 +1,423 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.ts = 1537146000000
+
+    def run(self):
+        tdSql.prepare()
+
+        print("======= Verify filter for bool, nchar and binary type =========")
+        tdLog.debug(
+            "create table st(ts timestamp, tbcol1 bool, tbcol2 binary(10), tbcol3 nchar(20)) tags(tagcol1 bool, tagcol2 binary(10), tagcol3 nchar(10))")
+        tdSql.execute(
+            "create table st(ts timestamp, tbcol1 bool, tbcol2 binary(10), tbcol3 nchar(20)) tags(tagcol1 bool, tagcol2 binary(10), tagcol3 nchar(10))")
+
+        tdSql.execute("create table st1 using st tags(true, 'table1', '水表')")
+        for i in range(1, 6):
+            tdSql.execute(
+                "insert into st1 values(%d, %d, 'taosdata%d', '涛思数据%d')" %
+                (self.ts + i, i %
+                 2, i, i))
+
+        tdSql.execute("create table st2 using st tags(false, 'table2', '电表')")
+        for i in range(6, 11):
+            tdSql.execute(
+                "insert into st2 values(%d, %d, 'taosdata%d', '涛思数据%d')" %
+                (self.ts + i, i %
+                 2, i, i))
+
+        # =============Verify stable columns====================
+        # > for bool type on column
+        tdSql.error("select * from st where tbcol1 > false")
+
+        # >= for bool type on column
+        tdSql.error("select * from st where tbcol1 >= false")
+
+        # = for bool type on column
+        tdSql.query("select * from st where tbcol1 = false")
+        tdSql.checkRows(5)
+
+        # <> for bool type on column
+        tdSql.query("select * from st where tbcol1 <> true")
+        tdSql.checkRows(5)
+
+        # != for bool type on column
+        tdSql.query("select * from st where tbcol1 != true")
+        tdSql.checkRows(5)
+
+        # > for bool type on column
+        tdSql.error("select * from st where tbcol1 < true")
+
+        # >= for bool type on column
+        tdSql.error("select * from st where tbcol1 <= true")
+
+        # % for bool type on column
+        tdSql.error("select * from st where tbcol1 like '%'")
+
+        # _ for bool type on column
+        tdSql.error("select * from st where tbcol1 like '____'")
+
+        # > for nchar type on column
+        tdSql.error("select * from st where tbcol2 > 'taosdata'")
+
+        # >= for nchar type on column
+        tdSql.error("select * from st where tbcol2 >= 'taosdata'")
+
+        # = for nchar type on column
+        tdSql.query("select * from st where tbcol2 = 'taosdata1'")
+        tdSql.checkRows(1)
+
+        # <> for nchar type on column
+        tdSql.query("select * from st where tbcol2 <> 'taosdata1'")
+        tdSql.checkRows(9)
+
+        # != for nchar type on column
+        tdSql.query("select * from st where tbcol2 != 'taosdata1'")
+        tdSql.checkRows(9)
+
+        # > for nchar type on column
+        tdSql.error("select * from st where tbcol2 < 'taodata'")
+
+        # >= for nchar type on column
+        tdSql.error("select * from st where tbcol2 <= 'taodata'")
+
+        # % for nchar type on column case 1
+        tdSql.query("select * from st where tbcol2 like '%'")
+        tdSql.checkRows(10)
+
+        # % for nchar type on column case 2
+        tdSql.query("select * from st where tbcol2 like 'a%'")
+        tdSql.checkRows(0)
+
+        # % for nchar type on column case 3
+        tdSql.query("select * from st where tbcol2 like 't%_'")
+        tdSql.checkRows(10)
+
+        # % for nchar type on column case 4
+        tdSql.query("select * from st where tbcol2 like '%1'")
+        # tdSql.checkRows(2)
+
+        # _ for nchar type on column case 1
+        tdSql.query("select * from st where tbcol2 like '____________'")
+        tdSql.checkRows(0)
+
+        # _ for nchar type on column case 2
+        tdSql.query("select * from st where tbcol2 like '__________'")
+        tdSql.checkRows(1)
+
+        # _ for nchar type on column case 3
+        tdSql.query("select * from st where tbcol2 like '_________'")
+        tdSql.checkRows(9)
+
+        # _ for nchar type on column case 4
+        tdSql.query("select * from st where tbcol2 like 't________'")
+        tdSql.checkRows(9)
+
+        # _ for nchar type on column case 5
+        tdSql.query("select * from st where tbcol2 like '%________'")
+        tdSql.checkRows(10)
+
+        # > for binary type on column
+        tdSql.error("select * from st where tbcol3 > '涛思数据'")
+
+        # >= for binary type on column
+        tdSql.error("select * from st where tbcol3 >= '涛思数据'")
+
+        # = for binary type on column
+        tdSql.query("select * from st where tbcol3 = '涛思数据1'")
+        tdSql.checkRows(1)
+
+        # <> for binary type on column
+        tdSql.query("select * from st where tbcol3 <> '涛思数据1'")
+        tdSql.checkRows(9)
+
+        # != for binary type on column
+        tdSql.query("select * from st where tbcol3 != '涛思数据1'")
+        tdSql.checkRows(9)
+
+        # > for binary type on column
+        tdSql.error("select * from st where tbcol3 < '涛思数据'")
+
+        # >= for binary type on column
+        tdSql.error("select * from st where tbcol3 <= '涛思数据'")
+
+        # % for binary type on column case 1
+        tdSql.query("select * from st where tbcol3 like '%'")
+        tdSql.checkRows(10)
+
+        # % for binary type on column case 2
+        tdSql.query("select * from st where tbcol3 like '陶%'")
+        tdSql.checkRows(0)
+
+        # % for binary type on column case 3
+        tdSql.query("select * from st where tbcol3 like '涛%_'")
+        tdSql.checkRows(10)
+
+        # % for binary type on column case 4
+        tdSql.query("select * from st where tbcol3 like '%1'")
+        tdSql.checkRows(1)
+
+        # _ for binary type on column case 1
+        tdSql.query("select * from st where tbcol3 like '_______'")
+        tdSql.checkRows(0)
+
+        # _ for binary type on column case 2
+        tdSql.query("select * from st where tbcol3 like '______'")
+        tdSql.checkRows(1)
+
+        # _ for binary type on column case 2
+        tdSql.query("select * from st where tbcol3 like '_____'")
+        tdSql.checkRows(9)
+
+        # _ for binary type on column case 3
+        tdSql.query("select * from st where tbcol3 like '____'")
+        tdSql.checkRows(0)
+
+        # _ for binary type on column case 4
+        tdSql.query("select * from st where tbcol3 like 't____'")
+        tdSql.checkRows(0)
+
+        # =============Verify stable tags====================
+        # > for bool type on tag
+        tdSql.error("select * from st where tagcol1 > false")
+
+        # >= for bool type on tag
+        tdSql.error("select * from st where tagcol1 >= false")
+
+        # = for bool type on tag
+        tdSql.query("select * from st where tagcol1 = false")
+        tdSql.checkRows(5)
+
+        # <> for bool type on tag
+        tdSql.query("select * from st where tagcol1 <> true")
+        tdSql.checkRows(5)
+
+        # != for bool type on tag
+        tdSql.query("select * from st where tagcol1 != true")
+        tdSql.checkRows(5)
+
+        # > for bool type on tag
+        tdSql.error("select * from st where tagcol1 < true")
+
+        # >= for bool type on tag
+        tdSql.error("select * from st where tagcol1 <= true")
+
+        # % for bool type on tag
+        tdSql.error("select * from st where tagcol1 like '%'")
+
+        # _ for bool type on tag
+        tdSql.error("select * from st where tagcol1 like '____'")
+
+        # > for nchar type on tag
+        tdSql.query("select * from st where tagcol2 > 'table1'")
+        tdSql.checkRows(5)
+
+        # >= for nchar type on tag
+        tdSql.query("select * from st where tagcol2 >= 'table1'")
+        tdSql.checkRows(10)
+
+        # = for nchar type on tag
+        tdSql.query("select * from st where tagcol2 = 'table1'")
+        tdSql.checkRows(5)
+
+        # <> for nchar type on tag
+        tdSql.query("select * from st where tagcol2 <> 'table1'")
+        tdSql.checkRows(5)
+
+        # != for nchar type on tag
+        tdSql.query("select * from st where tagcol2 != 'table'")
+        tdSql.checkRows(10)
+
+        # > for nchar type on tag
+        tdSql.query("select * from st where tagcol2 < 'table'")
+        tdSql.checkRows(0)
+
+        # >= for nchar type on tag
+        tdSql.query("select * from st where tagcol2 <= 'table'")
+        tdSql.checkRows(0)
+
+        # % for nchar type on tag case 1
+        tdSql.query("select * from st where tagcol2 like '%'")
+        tdSql.checkRows(10)
+
+        # % for nchar type on tag case 2
+        tdSql.query("select * from st where tagcol2 like 'a%'")
+        tdSql.checkRows(0)
+
+        # % for nchar type on tag case 3
+        tdSql.query("select * from st where tagcol2 like 't%_'")
+        tdSql.checkRows(10)
+
+        # % for nchar type on tag case 4
+        tdSql.query("select * from st where tagcol2 like '%1'")
+        tdSql.checkRows(5)
+
+        # _ for nchar type on tag case 1
+        tdSql.query("select * from st where tagcol2 like '_______'")
+        tdSql.checkRows(0)
+
+        # _ for nchar type on tag case 2
+        tdSql.query("select * from st where tagcol2 like '______'")
+        tdSql.checkRows(10)
+
+        # _ for nchar type on tag case 3
+        tdSql.query("select * from st where tagcol2 like 't_____'")
+        tdSql.checkRows(10)
+
+        # _ for nchar type on tag case 4
+        tdSql.query("select * from st where tagcol2 like 's________'")
+        tdSql.checkRows(0)
+
+        # _ for nchar type on tag case 5
+        tdSql.query("select * from st where tagcol2 like '%__'")
+        tdSql.checkRows(10)
+
+        # > for binary type on tag
+        tdSql.query("select * from st where tagcol3 > '表'")
+        tdSql.checkRows(10)
+
+        # >= for binary type on tag
+        tdSql.query("select * from st where tagcol3 >= '表'")
+        tdSql.checkRows(10)
+
+        # = for binary type on tag
+        tdSql.query("select * from st where tagcol3 = '水表'")
+        tdSql.checkRows(5)
+
+        # <> for binary type on tag
+        tdSql.query("select * from st where tagcol3 <> '水表'")
+        tdSql.checkRows(5)
+
+        # != for binary type on tag
+        tdSql.query("select * from st where tagcol3 != '水表'")
+        tdSql.checkRows(5)
+
+        # > for binary type on tag
+        tdSql.query("select * from st where tagcol3 < '水表'")
+        tdSql.checkRows(0)
+
+        # >= for binary type on tag
+        tdSql.query("select * from st where tagcol3 <= '水表'")
+        tdSql.checkRows(5)
+
+        # % for binary type on tag case 1
+        tdSql.query("select * from st where tagcol3 like '%'")
+        tdSql.checkRows(10)
+
+        # % for binary type on tag case 2
+        tdSql.query("select * from st where tagcol3 like '水%'")
+        tdSql.checkRows(5)
+
+        # % for binary type on tag case 3
+        tdSql.query("select * from st where tagcol3 like '数%_'")
+        tdSql.checkRows(0)
+
+        # % for binary type on tag case 4
+        tdSql.query("select * from st where tagcol3 like '%表'")
+        tdSql.checkRows(10)
+
+        # % for binary type on tag case 5
+        tdSql.query("select * from st where tagcol3 like '%据'")
+        tdSql.checkRows(0)
+
+        # _ for binary type on tag case 1
+        tdSql.query("select * from st where tagcol3 like '__'")
+        tdSql.checkRows(10)
+
+        # _ for binary type on tag case 2
+        tdSql.query("select * from st where tagcol3 like '水_'")
+        tdSql.checkRows(5)
+
+        # _ for binary type on tag case 2
+        tdSql.query("select * from st where tagcol3 like '_表'")
+        tdSql.checkRows(10)
+
+        # _ for binary type on tag case 3
+        tdSql.query("select * from st where tagcol3 like '___'")
+        tdSql.checkRows(0)
+
+        # _ for binary type on tag case 4
+        tdSql.query("select * from st where tagcol3 like '数_'")
+        tdSql.checkRows(0)
+
+        # _ for binary type on tag case 5
+        tdSql.query("select * from st where tagcol3 like '_据'")
+        tdSql.checkRows(0)
+        
+        # test case for https://jira.taosdata.com:18080/browse/TD-857
+        tdSql.execute("create database test")
+        tdSql.execute("use test")
+        tdSql.execute("create table meters(ts timestamp, voltage int) tags(tag1 binary(20))")
+        tdSql.execute("create table t1 using meters tags('beijing')")
+        tdSql.execute("create table t2 using meters tags('nanjing')")        
+
+        tdSql.execute("insert into t1 values(1538548685000, 1) (1538548685001, 2) (1538548685002, 3)")
+        tdSql.execute("insert into t2 values(1538548685000, 4) (1538548685001, 5) (1538548685002, 6)")
+
+        tdSql.query("select * from t1 where tag1 like '%g'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from t2 where tag1 like '%g'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from meters where tag1 like '%g'")
+        tdSql.checkRows(6)
+
+        tdSql.execute("create table meters1(ts timestamp, voltage int) tags(tag1 nchar(20))")
+        tdSql.execute("create table t3 using meters1 tags('北京')")
+        tdSql.execute("create table t4 using meters1 tags('南京')")
+        tdSql.execute("create table t5 using meters1 tags('beijing')")
+        tdSql.execute("create table t6 using meters1 tags('nanjing')")        
+
+        tdSql.execute("insert into t3 values(1538548685000, 1) (1538548685001, 2) (1538548685002, 3)")
+        tdSql.execute("insert into t4 values(1538548685000, 4) (1538548685001, 5) (1538548685002, 6)")
+        tdSql.execute("insert into t5 values(1538548685000, 1) (1538548685001, 2) (1538548685002, 3)")
+        tdSql.execute("insert into t6 values(1538548685000, 1) (1538548685001, 2) (1538548685002, 3)")
+
+        tdSql.query("select * from t3 where tag1 like '%京'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from t4 where tag1 like '%京'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from meters1 where tag1 like '%京'")
+        tdSql.checkRows(6)
+        
+        tdSql.query("select * from t5 where tag1 like '%g'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from t6 where tag1 like '%g'")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from meters1 where tag1 like '%g'")
+        tdSql.checkRows(6)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/intervalOffset.py b/tests/pytest/query/intervalOffset.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d4dd720ee599274ea62c9a84c1381ea724f3759
--- /dev/null
+++ b/tests/pytest/query/intervalOffset.py
@@ -0,0 +1,225 @@
+###################################################################
+#           Copyright (c) 2020 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def general(self):
+        tdSql.execute("create table meters(ts timestamp, s int) tags(id int)")
+        tdSql.execute("create table t0 using meters tags(0)")
+        tdSql.execute("create table t1 using meters tags(1)")
+        tdSql.execute("create table t2 using meters tags(2)")
+        tdSql.execute("create table t3 using meters tags(3)")
+        tdSql.execute("create table t4 using meters tags(4)")
+
+        tdSql.execute("insert into t0 values('2019-01-01 00:00:00', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:00:01', 1)")
+        tdSql.execute("insert into t2 values('2019-01-01 00:01:00', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:01:01', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:01:02', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:01:03', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:01:30', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:01:50', 1)")
+        tdSql.execute("insert into t2 values('2019-01-01 00:02:00', 1)")
+        tdSql.execute("insert into t3 values('2019-01-01 00:02:02', 1)")
+        tdSql.execute("insert into t3 values('2019-01-01 00:02:59', 1)")
+        tdSql.execute("insert into t4 values('2019-01-01 00:02:59', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:03:10', 1)")
+        tdSql.execute("insert into t2 values('2019-01-01 00:08:00', 1)")
+        tdSql.execute("insert into t1 values('2019-01-01 00:08:00', 1)")
+
+        tdSql.query("select count(*) from meters interval(1m, 1s)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(5, 1, 2)
+
+        tdSql.query("select count(*) from meters interval(1m, 2s)")
+        tdSql.checkData(0, 1, 2)
+        tdSql.checkData(1, 1, 2)
+        tdSql.checkData(2, 1, 5)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(5, 1, 2)
+
+        tdSql.query("select count(*) from meters interval(90s, 1500a)")
+        tdSql.checkData(0, 1, 2)
+        tdSql.checkData(1, 1, 5)
+        tdSql.checkData(2, 1, 5)
+        tdSql.checkData(3, 1, 1)
+        tdSql.checkData(4, 1, 2)
+
+    def singleTable(self):
+        tdSql.execute("create table car(ts timestamp, s int)")
+        tdSql.execute("insert into car values('2019-01-01 00:00:00', 1)")
+        tdSql.execute("insert into car values('2019-05-13 12:00:00', 1)")
+        tdSql.execute("insert into car values('2019-12-31 23:59:59', 1)")
+        tdSql.execute("insert into car values('2020-01-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-03 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-04 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-05 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-31 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-29 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-15 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-31 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-05-01 12:00:00', 1)")
+
+        tdSql.query("select count(*) from car interval(1n, 10d)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 3)
+        tdSql.checkData(5, 1, 2)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from car interval(1n, 10d) order by ts desc")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+        tdSql.checkData(2, 1, 3)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 6)
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from car interval(2n, 5d)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(4, 1, 3)
+
+        tdSql.query("select count(*) from car interval(2n) order by ts desc")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 6)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 1)
+        tdSql.checkData(4, 1, 1)
+
+        tdSql.query("select count(*) from car interval(1y, 1n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 8)
+        tdSql.checkData(2, 1, 8)
+
+        tdSql.query("select count(*) from car interval(1y, 2n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 11)
+        tdSql.checkData(2, 1, 5)
+
+        tdSql.query("select count(*) from car where ts > '2019-05-14 00:00:00' interval(1y, 5d)")
+        tdSql.checkData(0, 1, 6)
+        tdSql.checkData(1, 1, 9)
+
+    def superTable(self):
+        tdSql.execute("create table cars(ts timestamp, s int) tags(id int)")
+        tdSql.execute("create table car0 using cars tags(0)")
+        tdSql.execute("create table car1 using cars tags(1)")
+        tdSql.execute("create table car2 using cars tags(2)")
+        tdSql.execute("create table car3 using cars tags(3)")
+        tdSql.execute("create table car4 using cars tags(4)")
+
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:00', 1)")
+        tdSql.execute("insert into car1 values('2019-05-13 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2019-12-31 23:59:59', 1)")
+        tdSql.execute("insert into car1 values('2020-01-01 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-02 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-03 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-04 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-05 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-31 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-02-01 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2020-02-02 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2020-02-29 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-01 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-02 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-15 12:00:00', 1)")
+        tdSql.execute("insert into car4 values('2020-03-31 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-05-01 12:00:00', 1)")
+
+        tdSql.query("select count(*) from cars interval(1n, 10d)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 3)
+        tdSql.checkData(5, 1, 2)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(1n, 10d) order by ts desc")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 2)
+        tdSql.checkData(2, 1, 3)
+        tdSql.checkData(3, 1, 3)
+        tdSql.checkData(4, 1, 6)
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(2n, 5d)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(4, 1, 3)
+
+        tdSql.query("select count(*) from cars interval(2n) order by ts desc")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 6)
+        tdSql.checkData(2, 1, 6)
+        tdSql.checkData(3, 1, 1)
+        tdSql.checkData(4, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(1y, 1n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 8)
+        tdSql.checkData(2, 1, 8)
+
+        tdSql.query("select count(*) from cars interval(1y, 2n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 11)
+        tdSql.checkData(2, 1, 5)
+
+        tdSql.query("select count(*) from cars where ts > '2019-05-14 00:00:00' interval(1y, 5d)")
+        tdSql.checkData(0, 1, 6)
+        tdSql.checkData(1, 1, 9)
+
+    def run(self):
+        tdSql.prepare()
+        self.general()
+        self.singleTable()
+        self.superTable()
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
diff --git a/tests/pytest/query/natualInterval.py b/tests/pytest/query/natualInterval.py
new file mode 100644
index 0000000000000000000000000000000000000000..434cd392bb5d6cf94ad8f762aca2921d77436637
--- /dev/null
+++ b/tests/pytest/query/natualInterval.py
@@ -0,0 +1,170 @@
+###################################################################
+#           Copyright (c) 2020 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def singleTable(self):
+        tdSql.execute("create table car(ts timestamp, s int)")
+        tdSql.execute("insert into car values('2019-01-01 00:00:00', 1)")
+        tdSql.execute("insert into car values('2019-05-13 12:00:00', 1)")
+        tdSql.execute("insert into car values('2019-12-31 23:59:59', 1)")
+        tdSql.execute("insert into car values('2020-01-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-03 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-04 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-05 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-01-31 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-02-29 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-01 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-02 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-15 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-03-31 12:00:00', 1)")
+        tdSql.execute("insert into car values('2020-05-01 12:00:00', 1)")
+
+        tdSql.query("select count(*) from car interval(1n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 1)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(4, 1, 3)
+        tdSql.checkData(5, 1, 4)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from car interval(1n) order by ts desc")
+        tdSql.checkData(6, 1, 1)
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(2, 1, 3)
+        tdSql.checkData(1, 1, 4)
+        tdSql.checkData(0, 1, 1)
+
+        tdSql.query("select count(*) from car interval(2n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 1)
+        tdSql.checkData(3, 1, 9)
+        tdSql.checkData(4, 1, 4)
+        tdSql.checkData(5, 1, 1)
+
+        tdSql.query("select count(*) from car interval(2n) order by ts desc")
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(3, 1, 1)
+        tdSql.checkData(2, 1, 9)
+        tdSql.checkData(1, 1, 4)
+        tdSql.checkData(0, 1, 1)
+
+        tdSql.query("select count(*) from car interval(1y)")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 14)
+
+        tdSql.query("select count(*) from car interval(2y)")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 14)
+
+
+    def superTable(self):
+        tdSql.execute("create table cars(ts timestamp, s int) tags(id int)")
+        tdSql.execute("create table car0 using cars tags(0)")
+        tdSql.execute("create table car1 using cars tags(1)")
+        tdSql.execute("create table car2 using cars tags(2)")
+        tdSql.execute("create table car3 using cars tags(3)")
+        tdSql.execute("create table car4 using cars tags(4)")
+
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:00', 1)")
+        tdSql.execute("insert into car1 values('2019-05-13 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2019-12-31 23:59:59', 1)")
+        tdSql.execute("insert into car1 values('2020-01-01 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-02 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-03 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-04 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-05 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-01-31 12:00:00', 1)")
+        tdSql.execute("insert into car1 values('2020-02-01 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2020-02-02 12:00:00', 1)")
+        tdSql.execute("insert into car2 values('2020-02-29 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-01 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-02 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-03-15 12:00:00', 1)")
+        tdSql.execute("insert into car4 values('2020-03-31 12:00:00', 1)")
+        tdSql.execute("insert into car3 values('2020-05-01 12:00:00', 1)")
+
+        tdSql.query("select count(*) from cars interval(1n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 1)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(4, 1, 3)
+        tdSql.checkData(5, 1, 4)
+        tdSql.checkData(6, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(1n) order by ts desc")
+        tdSql.checkData(6, 1, 1)
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(3, 1, 6)
+        tdSql.checkData(2, 1, 3)
+        tdSql.checkData(1, 1, 4)
+        tdSql.checkData(0, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(2n)")
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(1, 1, 1)
+        tdSql.checkData(2, 1, 1)
+        tdSql.checkData(3, 1, 9)
+        tdSql.checkData(4, 1, 4)
+        tdSql.checkData(5, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(2n) order by ts desc")
+        tdSql.checkData(5, 1, 1)
+        tdSql.checkData(4, 1, 1)
+        tdSql.checkData(3, 1, 1)
+        tdSql.checkData(2, 1, 9)
+        tdSql.checkData(1, 1, 4)
+        tdSql.checkData(0, 1, 1)
+
+        tdSql.query("select count(*) from cars interval(1y)")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 14)
+
+        tdSql.query("select count(*) from cars interval(2y)")
+        tdSql.checkData(0, 1, 3)
+        tdSql.checkData(1, 1, 14)
+
+
+    def run(self):
+        tdSql.prepare()
+        self.singleTable()
+        self.superTable()
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/query.py b/tests/pytest/query/query.py
new file mode 100644
index 0000000000000000000000000000000000000000..da0ef96d0efde77b716ded06cc7efaa96ea3bb7b
--- /dev/null
+++ b/tests/pytest/query/query.py
@@ -0,0 +1,53 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1),
+            ('2020-05-13 10:00:00.001', 1)
+             dev_002 VALUES('2020-05-13 10:00:00.001', 1)""")
+
+        tdSql.query("select * from db.st where ts='2020-05-13 10:00:00.000'")
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryConnection.py b/tests/pytest/query/queryConnection.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed05b5e6bda9d60701d6f957b00311e77aebe356
--- /dev/null
+++ b/tests/pytest/query/queryConnection.py
@@ -0,0 +1,52 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')        
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1),
+            ('2020-05-13 10:00:00.001', 1)
+             dev_002 VALUES('2020-05-13 10:00:00.001', 1)""")
+
+        for i in range(10):
+            for j in range(1000):
+                tdSql.query("select * from db.st")      
+            tdLog.sleep(10)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryError.py b/tests/pytest/query/queryError.py
new file mode 100644
index 0000000000000000000000000000000000000000..f1fd9c0dec480d8d4e0b49635fd23b275eeeaa24
--- /dev/null
+++ b/tests/pytest/query/queryError.py
@@ -0,0 +1,65 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int, name nchar(16)) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype, name) VALUES('2020-05-13 10:00:00.000', 1, 'first'),('2020-05-13 10:00:00.001', 2, 'second'),
+            ('2020-05-13 10:00:00.002', 3, 'third') dev_002 VALUES('2020-05-13 10:00:00.003', 1, 'first'), ('2020-05-13 10:00:00.004', 2, 'second'),
+            ('2020-05-13 10:00:00.005', 3, 'third')""")
+
+        # query first .. as ..
+        tdSql.error("select first(*) as one from st")
+
+        # query last .. as ..
+        tdSql.error("select last(*) as latest from st")
+
+        # query last row .. as ..
+        tdSql.error("select last_row as latest from st")
+
+        # query distinct on normal colnum
+        tdSql.error("select distinct tagtype from st")
+
+        # query .. order by non-time field
+        tdSql.error("select * from st order by name")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryGroupbySort.py b/tests/pytest/query/queryGroupbySort.py
new file mode 100644
index 0000000000000000000000000000000000000000..28ef897f42924d3e41c6598cac6b4c51e33d38ef
--- /dev/null
+++ b/tests/pytest/query/queryGroupbySort.py
@@ -0,0 +1,50 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1537146000000
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute(
+            "create table stb(ts timestamp,i int) tags (p_id nchar(20));")
+        tdSql.execute(
+            "insert into tb using stb tags('11231') values (%d, %d) (%d, %d) (%d, %d) (%d, %d)" 
+            % (self.ts, 12, self.ts + 1, 15, self.ts + 2, 15, self.ts + 3, 12))
+
+        tdSql.query(''' select last(ts) p_time,i from stb where p_id='11231' and ts>=%d and ts <=%d 
+            group by i order by time desc limit 100 ''' % (self.ts, self.ts + 4))
+        tdSql.checkRows(2)
+        tdSql.checkData(0, 0, "2018-09-17 09:00:00.003000")
+        tdSql.checkData(1, 0, "2018-09-17 09:00:00.002000")
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryGroupbyWithInterval.py b/tests/pytest/query/queryGroupbyWithInterval.py
new file mode 100644
index 0000000000000000000000000000000000000000..14f6999021f23764bef95afdaa33cbcb695f2f55
--- /dev/null
+++ b/tests/pytest/query/queryGroupbyWithInterval.py
@@ -0,0 +1,53 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        
+        tdSql.execute(
+            "create table stest(ts timestamp,size INT,filenum INT) tags (appname binary(500),tenant binary(500))")
+        tdSql.execute(
+            "insert into test1 using stest tags('test1','aaa') values ('2020-09-04 16:53:54.003',210,3)")
+        tdSql.execute(
+            "insert into test2 using stest tags('test1','aaa') values ('2020-09-04 16:53:56.003',210,3)")
+        tdSql.execute(
+            "insert into test11 using stest tags('test11','bbb') values ('2020-09-04 16:53:57.003',210,3)")
+        tdSql.execute(
+            "insert into test12 using stest tags('test11','bbb') values ('2020-09-04 16:53:58.003',210,3)")
+        tdSql.execute(
+            "insert into test21 using stest tags('test21','ccc') values ('2020-09-04 16:53:59.003',210,3)")
+        tdSql.execute(
+            "insert into test22 using stest tags('test21','ccc') values ('2020-09-04 16:54:54.003',210,3)")
+
+        tdSql.query("select sum(size) from stest interval(1d) group by appname")        
+        tdSql.checkRows(3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryInsertValue.py b/tests/pytest/query/queryInsertValue.py
new file mode 100644
index 0000000000000000000000000000000000000000..856801b4ee162a35e1e4e4b864860180960a1432
--- /dev/null
+++ b/tests/pytest/query/queryInsertValue.py
@@ -0,0 +1,65 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.numOfRecords = 10
+        self.ts = 1537146000000    
+    
+    def restartTaosd(self):
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdSql.execute("use db")
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdSql.execute(
+            "create table st (ts timestamp, speed int) tags(areaid int, loc nchar(20))")
+        tdSql.execute("create table t1 using st tags(1, 'beijing')")
+        tdSql.execute("insert into t1 values(now, 1)")
+        tdSql.query("select * from st")
+        tdSql.checkRows(1)
+
+        tdSql.execute("alter table st add column length int")
+        tdSql.execute("insert into t1 values(now, 1, 2)")
+        tdSql.query("select last(*) from st")
+        tdSql.checkData(0, 2, 2);
+
+        self.restartTaosd();
+
+        tdSql.query("select last(*) from st")
+        tdSql.checkData(0, 2, 2);
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryInterval.py b/tests/pytest/query/queryInterval.py
new file mode 100644
index 0000000000000000000000000000000000000000..db2c3fdeec3370779d1452e8a3875e3149f57bee
--- /dev/null
+++ b/tests/pytest/query/queryInterval.py
@@ -0,0 +1,62 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1538548685000
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute("create table st (ts timestamp, voltage int) tags (loc nchar(30))")
+        tdSql.execute("insert into t0 using st tags('beijing') values(now, 220) (now - 15d, 221) (now - 30d, 225) (now - 35d, 228) (now - 45d, 222)")
+        tdSql.execute("insert into t1 using st tags('shanghai') values(now, 220) (now - 60d, 221) (now - 50d, 225) (now - 40d, 228) (now - 20d, 222)")
+
+        tdSql.query("select avg(voltage) from st interval(1n)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 1, 223.0)
+        tdSql.checkData(1, 1, 225.0)
+        tdSql.checkData(2, 1, 220.333333)
+        
+        tdSql.query("select avg(voltage) from st interval(1n, 15d)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 1, 224.8)
+        tdSql.checkData(1, 1, 222.666666)
+        tdSql.checkData(2, 1, 220.0)
+
+        tdSql.query("select avg(voltage) from st interval(1n, 15d) group by loc")
+        tdSql.checkRows(6)
+        tdSql.checkData(0, 1, 225.0)
+        tdSql.checkData(1, 1, 223.0)
+        tdSql.checkData(2, 1, 220.0)
+        tdSql.checkData(3, 1, 224.666666)
+        tdSql.checkData(4, 1, 222.0)
+        tdSql.checkData(5, 1, 220.0)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryJoin.py b/tests/pytest/query/queryJoin.py
new file mode 100644
index 0000000000000000000000000000000000000000..17027cf498ff9e87b558866cd4d1e6a8c865afc0
--- /dev/null
+++ b/tests/pytest/query/queryJoin.py
@@ -0,0 +1,149 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("======= Step 1 prepare data=========")
+        tdSql.execute(
+            "create table stb1 (ts timestamp, c1 int, c2 float) tags(t1 int, t2 binary(10), t3 nchar(10))")
+        tdSql.execute(
+            '''insert into tb1 using stb1 tags(1,'tb1', '表1') values ('2020-04-18 15:00:00.000', 1, 0.1)
+            ('2020-04-18 15:00:01.000', 1,0.1) ('2020-04-18 15:00:03.000', 3, 0.3) ('2020-04-18 15:00:04.000', 4,0.4)''')
+        tdSql.execute(
+            '''insert into tb2 using stb1 tags(2,'tb2', '表2') values ('2020-04-18 15:00:00.000', 21, 2.1)
+            ('2020-04-18 15:00:01.000', 22,2.2) ('2020-04-18 15:00:02.000', 22, 2.1) ('2020-04-18 15:00:03.000', 23,2.2)''')
+
+        tdSql.execute(
+            "create table stb_t (ts timestamp, temperature int, humidity float) tags(id int, name binary(10), dscrption nchar(10))")
+        tdSql.execute(
+            '''insert into tb_t1 using stb_t tags(1,'tb_t1', '温度表1') values ('2020-04-18 15:00:00.000', 25, 0.5)
+            ('2020-04-18 15:00:01.000', 25, 0.5) ('2020-04-18 15:00:02.000', 26, 0.7) ('2020-04-18 15:00:03.000', 27, 0.8)''')
+        tdSql.execute(
+            '''insert into tb_t2 using stb_t tags(2,'tb_t2', '温度表2') values ('2020-04-18 15:00:00.000', 33, 0.9)
+            ('2020-04-18 15:00:01.000', 35, 1.1) ('2020-04-18 15:00:03.000', 36, 1.3) ('2020-04-18 15:00:04.000', 37, 1.4)''')
+
+        tdSql.execute(
+            "create table stb_p (ts timestamp, pressure float) tags(id int, name binary(10), dscrption nchar(10), location binary(20))")
+        tdSql.execute(
+            '''insert into tb_p1 using stb_p tags(1,'tb_p1', '压力计1', 'beijing') values ('2020-04-18 15:00:00.000', 76.6)
+            ('2020-04-18 15:00:01.000', 76.5) ('2020-04-18 15:00:01.500', 77.1) ('2020-04-18 15:00:02.000', 75.3)
+            ('2020-04-18 15:00:03.000', 75.1) ('2020-04-18 15:00:04.500', 77.3)''')
+        tdSql.execute(
+            '''insert into tb_p2 using stb_p tags(2,'tb_p2', '压力计2', 'shenzhen') values ('2020-04-18 14:59:59.000', 74.6)
+            ('2020-04-18 15:00:01.000', 74.5) ('2020-04-18 15:00:01.500', 73.6) ('2020-04-18 15:00:02.000', 74.5)
+            ('2020-04-18 15:00:02.500', 73.9) ('2020-04-18 15:00:03.000', 73.5)''')
+
+        tdSql.execute(
+            "create table stb_v (ts timestamp, velocity float) tags(id int, name binary(10), dscrption nchar(10), location binary(20))")
+        tdSql.execute(
+            '''insert into tb_v1 using stb_v tags(1,'tb_v1', '速度计1', 'beijing ') values ('2020-04-18 15:00:00.000', 176.6)
+            ('2020-04-18 15:00:01.000', 176.5)''')
+        tdSql.execute(
+            '''insert into tb_v2 using stb_v tags(2,'tb_v2', '速度计2', 'shenzhen') values ('2020-04-18 15:00:00.000', 171.6)
+            ('2020-04-18 15:00:01.000', 171.5)''')
+
+        # explicit join should not work
+        tdSql.error("select * from stb_p join stb_t on (stb_p.id = stb_t.id)")
+        tdSql.error("select * from tb1 join tb2 on (tb1.ts=tb2.ts)")
+        tdSql.error(
+            "select * from stb_p join stb_t on (stb_p.ts=stb_t.ts and stb_p.id = stb_t.id)")
+
+        # alias should not work
+        tdSql.error("select * from stb_p p join stb_t t on (p.id = t.id)")
+
+        # join queries
+        tdSql.query(
+            "select * from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+        tdSql.checkRows(6)
+
+        tdSql.error(
+            "select ts, pressure, temperature, id, dscrption from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+
+        tdSql.query("select stb_p.ts, pressure, stb_t.temperature, stb_p.id, stb_p.dscrption from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+        tdSql.checkRows(6)
+
+        tdSql.query("select stb_t.ts, stb_p.pressure, stb_t.temperature,stb_p.id,stb_p.dscrption from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+        tdSql.checkRows(6)
+
+        tdSql.error(
+            "select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id group by name")
+        tdSql.error(
+            "select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id group by stb_t.name")
+        tdSql.error(
+            "select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id group by stb_t.id")
+        tdSql.error(
+            "select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.name;")
+        tdSql.error(
+            "select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.location = stb_t.name")
+
+        tdSql.execute("alter table stb_t add tag pid int")
+        tdSql.execute("alter table tb_t1 set tag pid=2")
+        tdSql.execute("alter table tb_t2 set tag pid=1")
+
+        tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.pid")
+        tdSql.checkRows(3)
+
+        tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+        tdSql.checkRows(6)
+
+        tdSql.query("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.id, stb_p.dscrption, stb_p.pressure from stb_p, stb_t where stb_p.ts=stb_t.ts and stb_p.id = stb_t.id")
+        tdSql.checkRows(6)
+
+        tdSql.error("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_t.pid, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
+
+        # test case for https://jira.taosdata.com:18080/browse/TD-1250
+        
+        tdSql.execute("create table meters1(ts timestamp, voltage int) tags(tag1 binary(20), tag2 nchar(20))")
+        tdSql.execute("create table t1 using meters1 tags('beijing', 'chaoyang')")
+        tdSql.execute("create table t2 using meters1 tags('shanghai', 'xuhui')") 
+        tdSql.execute("insert into t1 values(1538548685000, 1) (1538548685001, 2) (1538548685002, 3)")
+        tdSql.execute("insert into t1 values(1538548685004, 4) (1538548685004, 5) (1538548685005, 6)")
+
+        tdSql.execute("create table meters2(ts timestamp, voltage int) tags(tag1 binary(20), tag2 nchar(20))")
+        tdSql.execute("create table t3 using meters2 tags('beijing', 'chaoyang')")
+        tdSql.execute("create table t4 using meters2 tags('shenzhen', 'nanshan')")        
+        tdSql.execute("insert into t3 values(1538548685000, 7) (1538548685001, 8) (1538548685002, 9)")
+        tdSql.execute("insert into t4 values(1538548685000, 10) (1538548685001, 11) (1538548685002, 12)")
+
+        tdSql.execute("create table meters3(ts timestamp, voltage int) tags(tag1 binary(20), tag2 nchar(20))")
+        
+        tdSql.query("select * from meters1, meters2 where meters1.ts = meters2.ts and meters1.tag1 = meters2.tag1")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from meters1, meters2 where meters1.ts = meters2.ts and meters1.tag2 = meters2.tag2")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from meters1, meters3 where meters1.ts = meters3.ts and meters1.tag1 = meters3.tag1")
+        tdSql.checkRows(0)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryMetaData.py b/tests/pytest/query/queryMetaData.py
new file mode 100755
index 0000000000000000000000000000000000000000..67df20cb9ad6c399715927c6be5925932e4c2f71
--- /dev/null
+++ b/tests/pytest/query/queryMetaData.py
@@ -0,0 +1,184 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import threading
+import time
+from datetime import datetime
+
+
+class MetadataQuery:
+    def initConnection(self):
+        self.tables = 100000
+        self.records = 10
+        self.numOfTherads = 20
+        self.ts = 1537146000000
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/etc/taos"
+
+    def connectDB(self):
+        self.conn = taos.connect(
+            self.host,
+            self.user,
+            self.password,
+            self.config)
+        return self.conn.cursor()
+
+    def createStable(self):
+        print("================= Create stable meters =================")
+        cursor = self.connectDB()
+        cursor.execute("drop database if exists test")
+        cursor.execute("create database test")
+        cursor.execute("use test")
+        cursor.execute('''create table if not exists meters (ts timestamp, speed int) tags(
+                    tgcol1 tinyint, tgcol2 smallint, tgcol3 int, tgcol4 bigint, tgcol5 float, tgcol6 double, tgcol7 bool, tgcol8 binary(20), tgcol9 nchar(20),
+                    tgcol10 tinyint, tgcol11 smallint, tgcol12 int, tgcol13 bigint, tgcol14 float, tgcol15 double, tgcol16 bool, tgcol17 binary(20), tgcol18 nchar(20),
+                    tgcol19 tinyint, tgcol20 smallint, tgcol21 int, tgcol22 bigint, tgcol23 float, tgcol24 double, tgcol25 bool, tgcol26 binary(20), tgcol27 nchar(20),
+                    tgcol28 tinyint, tgcol29 smallint, tgcol30 int, tgcol31 bigint, tgcol32 float, tgcol33 double, tgcol34 bool, tgcol35 binary(20), tgcol36 nchar(20),
+                    tgcol37 tinyint, tgcol38 smallint, tgcol39 int, tgcol40 bigint, tgcol41 float, tgcol42 double, tgcol43 bool, tgcol44 binary(20), tgcol45 nchar(20),
+                    tgcol46 tinyint, tgcol47 smallint, tgcol48 int, tgcol49 bigint, tgcol50 float, tgcol51 double, tgcol52 bool, tgcol53 binary(20), tgcol54 nchar(20))''')
+        cursor.close()
+        self.conn.close()
+
+    def createTablesAndInsertData(self, threadID):
+        cursor = self.connectDB()
+        cursor.execute("use test")
+
+        tablesPerThread = int(self.tables / self.numOfTherads)
+        base = threadID * tablesPerThread
+        for i in range(tablesPerThread):
+            cursor.execute(
+                '''create table t%d using meters tags(
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')''' %
+                (base + i + 1, (base + i) %
+                 100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100))
+
+            cursor.execute(
+                "insert into t%d values(%d, 1) (%d, 2) (%d, 3) (%d, 4) (%d, 5)" %
+                (base + i + 1, self.ts + 1, self.ts + 2, self.ts + 3, self.ts + 4, self.ts + 5))
+        cursor.close()
+
+    def queryData(self, query):
+        cursor = self.connectDB()
+        cursor.execute("use test")
+
+        print("================= query tag data =================")
+        startTime = datetime.now()
+        cursor.execute(query)
+        cursor.fetchall()
+        endTime = datetime.now()
+        print(
+            "Query time for the above query is %d seconds" %
+            (endTime - startTime).seconds)
+
+        cursor.close()
+        self.conn.close()
+
+
+if __name__ == '__main__':
+
+    t = MetadataQuery()
+    t.initConnection()
+    t.createStable()
+
+    print(
+        "================= Create %d tables and insert %d records into each table =================" %
+        (t.tables, t.records))
+    startTime = datetime.now()
+    threads = []
+    for i in range(t.numOfTherads):
+        thread = threading.Thread(
+            target=t.createTablesAndInsertData, args=(i,))
+        thread.start()
+        threads.append(thread)
+
+    for th in threads:
+        th.join()
+
+    endTime = datetime.now()
+    diff = (endTime - startTime).seconds
+    print(
+        "spend %d seconds to create %d tables and insert %d records into each table" %
+        (diff, t.tables, t.records))
+
+    query = '''select tgcol1, tgcol2, tgcol3, tgcol4, tgcol5, tgcol6, tgcol7, tgcol8, tgcol9,
+            tgcol10, tgcol11, tgcol12, tgcol13, tgcol14, tgcol15, tgcol16, tgcol17, tgcol18,
+             tgcol19, tgcol20, tgcol21, tgcol22, tgcol23, tgcol24, tgcol25, tgcol26, tgcol27,
+            tgcol28, tgcol29, tgcol30, tgcol31, tgcol32, tgcol33, tgcol34, tgcol35, tgcol36,
+            tgcol37, tgcol38, tgcol39, tgcol40, tgcol41, tgcol42, tgcol43, tgcol44, tgcol45,
+            tgcol46, tgcol47, tgcol48, tgcol49, tgcol50, tgcol51, tgcol52, tgcol53, tgcol54
+            from meters where tgcol1 > 10 AND tgcol1 < 100 and tgcol2 > 100 and tgcol2 < 1000 or tgcol3 > 10000 or tgcol7 = true
+            or tgcol8 like '%2' and tgcol10 < 10'''
+
+    t.queryData(query)
diff --git a/tests/pytest/query/queryMetaPerformace.py b/tests/pytest/query/queryMetaPerformace.py
new file mode 100644
index 0000000000000000000000000000000000000000..8ab7105c9d92c57ff06e39d308c9e80eb6f09814
--- /dev/null
+++ b/tests/pytest/query/queryMetaPerformace.py
@@ -0,0 +1,221 @@
+
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import threading
+import time
+from datetime import datetime
+import numpy as np
+
+
+class MyThread(threading.Thread):
+
+    def __init__(self, func, args=()):
+        super(MyThread, self).__init__()
+        self.func = func
+        self.args = args
+
+    def run(self):
+        self.result = self.func(*self.args)
+
+    def get_result(self):
+        try:
+            return self.result   # 如果子线程不使用join方法，此处可能会报没有self.result的错误
+        except Exception:
+            return None
+
+
+class MetadataQuery:
+    def initConnection(self):
+        self.tables = 100
+        self.records = 10
+        self.numOfTherads = 5
+        self.ts = 1537146000000
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/etc/taos"
+        self.conn = taos.connect(
+            self.host,
+            self.user,
+            self.password,
+            self.config)
+
+    def connectDB(self):
+        return self.conn.cursor()
+
+    def createStable(self):
+        print("================= Create stable meters =================")
+        cursor = self.connectDB()
+        cursor.execute("drop database if exists test")
+        cursor.execute("create database test")
+        cursor.execute("use test")
+        cursor.execute('''create table if not exists meters (ts timestamp, speed int) tags(
+                    tgcol1 tinyint, tgcol2 smallint, tgcol3 int, tgcol4 bigint, tgcol5 float, tgcol6 double, tgcol7 bool, tgcol8 binary(20), tgcol9 nchar(20),
+                    tgcol10 tinyint, tgcol11 smallint, tgcol12 int, tgcol13 bigint, tgcol14 float, tgcol15 double, tgcol16 bool, tgcol17 binary(20), tgcol18 nchar(20),
+                    tgcol19 tinyint, tgcol20 smallint, tgcol21 int, tgcol22 bigint, tgcol23 float, tgcol24 double, tgcol25 bool, tgcol26 binary(20), tgcol27 nchar(20),
+                    tgcol28 tinyint, tgcol29 smallint, tgcol30 int, tgcol31 bigint, tgcol32 float, tgcol33 double, tgcol34 bool, tgcol35 binary(20), tgcol36 nchar(20),
+                    tgcol37 tinyint, tgcol38 smallint, tgcol39 int, tgcol40 bigint, tgcol41 float, tgcol42 double, tgcol43 bool, tgcol44 binary(20), tgcol45 nchar(20),
+                    tgcol46 tinyint, tgcol47 smallint, tgcol48 int, tgcol49 bigint, tgcol50 float, tgcol51 double, tgcol52 bool, tgcol53 binary(20), tgcol54 nchar(20))''')
+        cursor.close()
+
+    def createTablesAndInsertData(self, threadID):
+        cursor = self.connectDB()
+        cursor.execute("use test")
+        base = threadID * self.tables
+
+        tablesPerThread = int(self.tables / self.numOfTherads)
+        for i in range(tablesPerThread):
+            cursor.execute(
+                '''create table t%d using meters tags(
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d',
+                %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')''' %
+                (base + i + 1, (base + i) %
+                 100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    100, (base + i) %
+                    10000, (base + i) %
+                    1000000, (base + i) %
+                    100000000, (base + i) %
+                    100 * 1.1, (base + i) %
+                    100 * 2.3, (base + i) %
+                    2, (base + i) %
+                    100, (base + i) %
+                    100))
+            for j in range(self.records):
+                cursor.execute(
+                    "insert into t%d values(%d, %d)" %
+                    (base + i + 1, self.ts + j, j))
+        cursor.close()
+
+    def queryWithTagId(self, threadId, tagId, queryNum):
+        print("---------thread%d start-----------" % threadId)
+        query = '''select tgcol1, tgcol2, tgcol3, tgcol4, tgcol5, tgcol6, tgcol7, tgcol8, tgcol9,
+                tgcol10, tgcol11, tgcol12, tgcol13, tgcol14, tgcol15, tgcol16, tgcol17, tgcol18,
+                tgcol19, tgcol20, tgcol21, tgcol22, tgcol23, tgcol24, tgcol25, tgcol26, tgcol27,
+                tgcol28, tgcol29, tgcol30, tgcol31, tgcol32, tgcol33, tgcol34, tgcol35, tgcol36,
+                tgcol37, tgcol38, tgcol39, tgcol40, tgcol41, tgcol42, tgcol43, tgcol44, tgcol45,
+                tgcol46, tgcol47, tgcol48, tgcol49, tgcol50, tgcol51, tgcol52, tgcol53, tgcol54
+                from meters where tgcol{id} > {condition}'''
+        latancy = []
+        cursor = self.connectDB()
+        cursor.execute("use test")
+        for i in range(queryNum):
+            startTime = time.time()
+            cursor.execute(query.format(id=tagId, condition=i))
+            cursor.fetchall()
+            latancy.append((time.time() - startTime))
+        print("---------thread%d end-----------" % threadId)
+        return latancy
+
+    def queryData(self, query):
+        cursor = self.connectDB()
+        cursor.execute("use test")
+
+        print("================= query tag data =================")
+        startTime = datetime.now()
+        cursor.execute(query)
+        cursor.fetchall()
+        endTime = datetime.now()
+        print(
+            "Query time for the above query is %d seconds" %
+            (endTime - startTime).seconds)
+
+        cursor.close()
+        # self.conn.close()
+
+
+if __name__ == '__main__':
+
+    t = MetadataQuery()
+    t.initConnection()
+
+    latancys = []
+    threads = []
+    tagId = 1
+    queryNum = 1000
+    for i in range(t.numOfTherads):
+        thread = MyThread(t.queryWithTagId, args=(i, tagId, queryNum))
+        threads.append(thread)
+        thread.start()
+    for i in range(t.numOfTherads):
+        threads[i].join()
+        latancys.extend(threads[i].get_result())
+    print("Total query: %d" % (queryNum * t.numOfTherads))
+    print(
+        "statistic(s): mean= %f, P50 = %f, P75 = %f, P95 = %f, P99 = %f" %
+        (sum(latancys) /
+         (
+            queryNum *
+            t.numOfTherads),
+            np.percentile(
+            latancys,
+            50),
+            np.percentile(
+            latancys,
+            75),
+            np.percentile(
+            latancys,
+            95),
+            np.percentile(
+            latancys,
+            99)))
diff --git a/tests/pytest/query/queryNormal.py b/tests/pytest/query/queryNormal.py
new file mode 100644
index 0000000000000000000000000000000000000000..13393117d642ec1fbdf839d59429428ffee79a27
--- /dev/null
+++ b/tests/pytest/query/queryNormal.py
@@ -0,0 +1,130 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdSql.execute(
+            "create table stb1 (ts timestamp, c1 int, c2 float) tags(t1 int, t2 binary(10), t3 nchar(10))")
+        tdSql.execute(
+            "insert into tb1 using stb1 tags(1,'tb1', '表1') values ('2020-04-18 15:00:00.000', 1, 0.1), ('2020-04-18 15:00:01.000', 2, 0.1)")
+        tdSql.execute(
+            "insert into tb2 using stb1 tags(2,'tb2', '表2') values ('2020-04-18 15:00:02.000', 3, 2.1), ('2020-04-18 15:00:03.000', 4, 2.2)")
+
+        tdSql.error("select * from tb 1")
+        
+        tdSql.query("select * from tb1 a, tb2 b where a.ts = b.ts")
+        tdSql.checkRows(0)
+
+        # join 3 tables -- bug exists
+        tdSql.error("select stb_t.ts, stb_t.dscrption, stb_t.temperature, stb_p.id, stb_p.dscrption, stb_p.pressure,stb_v.velocity from stb_p, stb_t, stb_v where stb_p.ts=stb_t.ts and stb_p.ts=stb_v.ts and stb_p.id = stb_t.id")
+
+        tdSql.error("select * from stb1 whern c1 > 'test' limit 100")
+
+        # query show stable
+        tdSql.query("show stables")
+        tdSql.checkRows(1)
+
+        # query show tables
+        tdSql.query("show tables")
+        tdSql.checkRows(2)
+
+        # query count
+        tdSql.query("select count(*) from stb1")
+        tdSql.checkData(0, 0, 4)
+
+        # query first
+        tdSql.query("select first(*) from stb1")
+        tdSql.checkData(0, 1, 1)
+
+        # query last
+        tdSql.query("select last(*) from stb1")
+        tdSql.checkData(0, 1, 4)
+
+        # query last_row
+        tdSql.query("select last_row(*) from stb1")
+        tdSql.checkData(0, 1, 4)
+
+        # query as
+        tdSql.query("select t2 as number from stb1")
+        tdSql.checkRows(2)
+
+        # query first ... as
+        tdSql.error("select first(*) as begin from stb1")        
+
+        # query last ... as
+        tdSql.error("select last(*) as end from stb1")
+
+        # query last_row ... as
+        tdSql.error("select last_row(*) as end from stb1")        
+
+        # query group .. by
+        tdSql.query("select sum(c1), t2 from stb1 group by t2")
+        tdSql.checkRows(2)
+
+        # query ... limit
+        tdSql.query("select * from stb1 limit 2")
+        tdSql.checkRows(2)
+
+        # query ... limit offset
+        tdSql.query("select * from stb1 limit 2 offset 3")
+        tdSql.checkRows(1)
+
+        # query ... alias for table ---- bug
+        tdSql.error("select t.ts from tb1 t")        
+
+        # query ... tbname
+        tdSql.query("select tbname from stb1")
+        tdSql.checkRows(2)
+
+        # query ... tbname count  ---- bug
+        tdSql.query("select count(tbname) from stb1")
+        tdSql.checkData(0, 0, 2)
+
+        # query ... select database ---- bug
+        tdSql.query("SELECT database()")
+        tdSql.checkRows(1)
+
+        # query ... select client_version ---- bug
+        tdSql.query("SELECT client_version()")
+        tdSql.checkRows(1)
+
+        # query ... select server_version ---- bug
+        tdSql.query("SELECT server_version()")
+        tdSql.checkRows(1)
+
+        # query ... select server_status ---- bug
+        tdSql.query("SELECT server_status()")
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryNullValueTest.py b/tests/pytest/query/queryNullValueTest.py
new file mode 100644
index 0000000000000000000000000000000000000000..bc0b11827e18b0b436edac1cee2f04bafb05fab3
--- /dev/null
+++ b/tests/pytest/query/queryNullValueTest.py
@@ -0,0 +1,86 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.types = ["tinyint", "smallint", "int", "bigint", "float", "double", "bool", "binary(10)", "nchar(10)"]
+        self.ts = 1537146000000
+
+    def checkNullValue(self, result):
+        mx = np.array(result)
+        [rows, cols] = mx.shape
+        for i in range(rows):
+            for j in range(cols):
+                if j + 1 < cols and mx[i, j + 1] is not None:
+                    print(mx[i, j + 1])
+                    return False
+        return True
+    
+    def run(self):
+        tdSql.prepare()
+        
+        for i in range(len(self.types)):
+            tdSql.execute("drop table if exists t0")
+            tdSql.execute("drop table if exists t1")
+            
+            print("======== checking type %s ==========" % self.types[i])
+            tdSql.execute("create table t0 (ts timestamp, col %s)" % self.types[i])
+            tdSql.execute("insert into t0 values (%d, NULL)" % (self.ts))
+            
+            tdDnodes.stop(1)
+            tdLog.sleep(10)
+            tdDnodes.start(1)
+            tdSql.execute("use db")
+            tdSql.query("select * from t0")
+            tdSql.checkRows(1)
+
+            if self.checkNullValue(tdSql.queryResult) is False:
+                tdLog.exit("no None value is detected")
+
+            tdSql.execute("create table t1 (ts timestamp, col %s)" % self.types[i])
+            tdSql.execute("insert into t1 values (%d, NULL)" % (self.ts))
+            tdDnodes.stop(1)
+            tdLog.sleep(10)
+            tdDnodes.start(1)
+            tdSql.execute("use db")
+
+            for j in range(150):
+                tdSql.execute("insert into t1 values (%d, NULL)" % (self.ts + j + 1));
+            
+            tdSql.query("select * from t1")
+            tdSql.checkRows(151)
+
+            if self.checkNullValue(tdSql.queryResult) is False:
+                tdLog.exit("no None value is detected")
+
+            print("======== None value check for type %s is OK ==========" % self.types[i])
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/queryPerformance.py b/tests/pytest/query/queryPerformance.py
new file mode 100644
index 0000000000000000000000000000000000000000..a7fc08c5a39d7b9a59068463f521d83106865c2d
--- /dev/null
+++ b/tests/pytest/query/queryPerformance.py
@@ -0,0 +1,82 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import taos
+import time
+
+
+class taosdemoQueryPerformace:
+    def initConnection(self):
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/etc/taos"
+        self.conn = taos.connect(
+            self.host,
+            self.user,
+            self.password,
+            self.config)
+
+
+    def query(self): 
+        cursor = self.conn.cursor()                  
+        cursor.execute("use test")        
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select count(*) from test.meters")
+            totalTime += time.time() - startTime
+        print("query time for: select count(*) from test.meters %f seconds" % (totalTime / 100))
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select avg(f1), max(f2), min(f3) from test.meters")
+            totalTime += time.time() - startTime
+        print("query time for: select avg(f1), max(f2), min(f3) from test.meters %f seconds" % (totalTime / 100))
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select count(*) from test.meters where loc='beijing'")
+            totalTime += time.time() - startTime
+        print("query time for: select count(*) from test.meters where loc='beijing' %f seconds" % (totalTime / 100))
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select avg(f1), max(f2), min(f3) from test.meters where areaid=10")
+            totalTime += time.time() - startTime
+        print("query time for: select avg(f1), max(f2), min(f3) from test.meters where areaid=10 %f seconds" % (totalTime / 100))
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select avg(f1), max(f2), min(f3) from test.t10 interval(10s)")
+            totalTime += time.time() - startTime
+        print("query time for: select avg(f1), max(f2), min(f3) from test.t10 interval(10s) %f seconds" % (totalTime / 100))
+
+        totalTime = 0
+        for i in range(100):
+            startTime = time.time()
+            cursor.execute("select last_row(*) from meters")
+            totalTime += time.time() - startTime
+        print("query time for: select last_row(*) from meters %f seconds" % (totalTime / 100))
+
+if __name__ == '__main__':
+    perftest = taosdemoQueryPerformace()
+    perftest.initConnection()
+    perftest.query()
\ No newline at end of file
diff --git a/tests/pytest/query/querySort.py b/tests/pytest/query/querySort.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5d3c8ce1f4eb9c1d2003bd659771562c9ea14e5
--- /dev/null
+++ b/tests/pytest/query/querySort.py
@@ -0,0 +1,125 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+import numpy as np
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 10
+        self.ts = 1537146000000
+
+    def checkColumnSorted(self, col, order):
+        frame = inspect.stack()[1]
+        callerModule = inspect.getmodule(frame[0])
+        callerFilename = callerModule.__file__
+
+        if col < 0:
+            tdLog.exit(
+                "%s failed: sql:%s, col:%d is smaller than zero" %
+                (callerFilename, tdSql.sql, col))
+        if col > tdSql.queryCols:
+            tdLog.exit(
+                "%s failed: sql:%s, col:%d is larger than queryCols:%d" %
+                (callerFilename, tdSql.sql, col, tdSql.queryCols))
+
+        matrix = np.array(tdSql.queryResult)
+        list = matrix[:, 0]
+
+        if order == "" or order.upper() == "ASC":
+            if all(sorted(list) == list):
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in accending order as expected" %
+                    (tdSql.sql, col))
+            else:
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in accesnind order" %
+                    (callerFilename, tdSql.sql, col))
+        elif order.upper() == "DESC":
+            if all(sorted(list, reverse=True) == list):
+                tdLog.info(
+                    "sql:%s, column :%d is sorted in decending order as expected" %
+                    (tdSql.sql, col))
+            else:
+                tdLog.exit(
+                    "%s failed: sql:%s, col:%d is not sorted in decending order" %
+                    (callerFilename, tdSql.sql, col))
+        else:
+            tdLog.exit(
+                "%s failed: sql:%s, the order provided for col:%d is not correct" %
+                (callerFilename, tdSql.sql, col))
+
+    def run(self):
+        tdSql.prepare()
+
+        print("======= step 1: create table and insert data =========")
+        tdLog.debug(
+            ''' create table st(ts timestamp, tbcol1 tinyint, tbcol2 smallint, tbcol3 int, tbcol4 bigint, tbcol5 float, tbcol6 double,
+                tbcol7 bool, tbcol8 nchar(20), tbcol9 binary(20)) tags(tagcol1 tinyint, tagcol2 smallint, tagcol3 int, tagcol4 bigint, tagcol5 float,
+                tagcol6 double, tagcol7 bool, tagcol8 nchar(20), tagcol9 binary(20))''')
+        tdSql.execute(
+            ''' create table st(ts timestamp, tbcol1 tinyint, tbcol2 smallint, tbcol3 int, tbcol4 bigint, tbcol5 float, tbcol6 double,
+                tbcol7 bool, tbcol8 nchar(20), tbcol9 binary(20)) tags(tagcol1 tinyint, tagcol2 smallint, tagcol3 int, tagcol4 bigint, tagcol5 float,
+                tagcol6 double, tagcol7 bool, tagcol8 nchar(20), tagcol9 binary(20))''')
+
+        for i in range(self.rowNum):
+            tdSql.execute("create table st%d using st tags(%d, %d, %d, %d, %f, %f, %d, 'tag%d', '标签%d')" % (
+                i + 1, i + 1, i + 1, i + 1, i + 1, 1.1 * (i + 1), 1.23 * (i + 1), (i + 1) % 2, i + 1, i + 1))
+            for j in range(self.rowNum):
+                tdSql.execute("insert into st%d values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d')" % (
+                    i + 1, self.ts + 10 * (i + 1) + j + 1, j + 1, j + 1, j + 1, j + 1, 1.1 * (j + 1), 1.23 * (j + 1), (j + 1) % 2, j + 1, j + 1))
+
+        print("======= step 2: verify order for each column =========")
+        # sort for timestamp in asc order
+        tdSql.query("select * from st order by ts asc")
+        self.checkColumnSorted(0, "asc")
+
+        # sort for timestamp in desc order
+        tdSql.query("select * from st order by ts desc")
+        self.checkColumnSorted(0, "desc")
+
+        for i in range(1, 10):
+            tdSql.error("select * from st order by tbcol%d" % i)
+            tdSql.error("select * from st order by tbcol%d asc" % i)
+            tdSql.error("select * from st order by tbcol%d desc" % i)
+
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d" %
+                (i, i))
+            self.checkColumnSorted(1, "")
+
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d asc" %
+                (i, i))
+            self.checkColumnSorted(1, "asc")
+
+            tdSql.query(
+                "select avg(tbcol1) from st group by tagcol%d order by tagcol%d desc" %
+                (i, i))
+            self.checkColumnSorted(1, "desc")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/select_last_crash.py b/tests/pytest/query/select_last_crash.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b580a24acd145e2e90ae6ee513e946d72820f2c
--- /dev/null
+++ b/tests/pytest/query/select_last_crash.py
@@ -0,0 +1,51 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+        self.rowNum = 5000
+        self.ts = 1537146000000
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, value nchar(50), speed int) tags(dev nchar(50))")
+        tdSql.execute(
+            "create table t1 using st tags('dev_001')")
+
+        for i in range(self.rowNum):
+            tdSql.execute(
+                "insert into t1 values(%d, 'taosdata%d', %d)" %
+                (self.ts + i, i + 1, i + 1))
+
+        tdSql.query("select last(*) from st")
+        tdSql.checkRows(1)
+        
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/query/tbname.py b/tests/pytest/query/tbname.py
new file mode 100644
index 0000000000000000000000000000000000000000..08416ba3eda378cce96fcaa8051e1d06a75d6b28
--- /dev/null
+++ b/tests/pytest/query/tbname.py
@@ -0,0 +1,80 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute(
+            'create table cars (ts timestamp, speed int) tags(id int)')
+        tdSql.execute("create table carzero using cars tags(0)")
+        tdSql.execute("create table carone using cars tags(1)")
+        tdSql.execute("create table cartwo using cars tags(2)")
+
+        tdSql.execute(
+            "insert into carzero values(now, 100) carone values(now, 110)")
+
+        tdSql.query("select * from cars where tbname in ('carzero', 'carone')")
+        tdSql.checkRows(2)
+
+        tdSql.query("select * from cars where tbname in ('carzero', 'cartwo')")
+        tdSql.checkRows(1)
+
+        tdSql.query(
+            "select * from cars where id=1 or tbname in ('carzero', 'cartwo')")
+        tdSql.checkRows(2)
+
+        tdSql.query(
+            "select * from cars where id=1 and tbname in ('carzero', 'cartwo')")
+        tdSql.checkRows(0)
+
+        tdSql.query(
+            "select * from cars where id=0 and tbname in ('carzero', 'cartwo')")
+        tdSql.checkRows(1)
+
+        """
+        tdSql.query("select * from cars where tbname like 'car%'")
+        tdSql.checkRows(2)
+
+        tdSql.cursor.execute("use db")
+        tdSql.query("select * from cars where tbname like '%o'")
+        tdSql.checkRows(1)
+
+        tdSql.query("select * from cars where id=1 and tbname like 'car%')
+        tdSql.checkRows(1)
+
+        tdSql.query("select * from cars where id = 1 and tbname like '%o')
+        tdSql.checkRows(0)
+
+        tdSql.query("select * from cars where id = 1 or tbname like '%o')
+        tdSql.checkRows(2)
+        """
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/queryCount.py b/tests/pytest/queryCount.py
new file mode 100644
index 0000000000000000000000000000000000000000..7cc8f61f4dd4790cfc8c2229675eab87b440fadf
--- /dev/null
+++ b/tests/pytest/queryCount.py
@@ -0,0 +1,91 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+import threading
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class QueryCountMultiThread:
+    def initConnection(self):        
+        self.records = 10000000
+        self.numOfTherads = 50
+        self.ts = 1537146000000
+        self.host = "127.0.0.1"
+        self.user = "root"
+        self.password = "taosdata"
+        self.config = "/home/xp/git/TDengine/sim/dnode1/cfg"
+        self.conn = taos.connect(
+            self.host,
+            self.user,
+            self.password,
+            self.config)
+
+    def insertData(self, threadID):
+        cursor = self.conn.cursor()
+        print("Thread %d: starting" % threadID)
+        base = 200000 * threadID
+        for i in range(200):                        
+            query = "insert into tb values"
+            for j in range(1000):
+                query += "(%d, %d, 'test')" % (self.ts + base + i * 1000 + j, base + i * 1000 + j)                        
+            cursor.execute(query)            
+        cursor.close()
+        print("Thread %d: finishing" % threadID)
+
+    def run(self):
+        tdDnodes.init("")
+        tdDnodes.setTestCluster(False)
+        tdDnodes.setValgrind(False)
+
+        tdDnodes.stopAll()
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        
+        cursor = self.conn.cursor()
+        cursor.execute("drop database if exists db")
+        cursor.execute("create database db")
+        cursor.execute("use db")
+        cursor.execute("create table tb (ts timestamp, id int, name nchar(30))")
+        cursor.close()
+
+        threads = []
+        for i in range(50):
+            thread = threading.Thread(target=self.insertData, args=(i,))
+            threads.append(thread)
+            thread.start()            
+        
+        for i in range(50):
+            threads[i].join()
+
+        cursor = self.conn.cursor()
+        cursor.execute("use db")
+        sql = "select count(*) from tb"
+        cursor.execute(sql)
+        data = cursor.fetchall()
+
+        if(data[0][0] == 10000000):
+            tdLog.info("sql:%s, row:%d col:%d data:%d == expect:%d" % (sql, 0, 0, data[0][0], 10000000))
+        else:            
+            tdLog.exit("queryCount.py failed: sql:%s failed, row:%d col:%d data:%d != expect:%d" % (sql, 0, 0, data[0][0], 10000000))        
+
+        cursor.close()
+        self.conn.close()
+
+q = QueryCountMultiThread()
+q.initConnection()
+q.run()
\ No newline at end of file
diff --git a/tests/pytest/random-test/random-test-multi-threading-3.py b/tests/pytest/random-test/random-test-multi-threading-3.py
new file mode 100644
index 0000000000000000000000000000000000000000..a8e2c26ae5fa4f4dffa7967b09919abfc670c8bf
--- /dev/null
+++ b/tests/pytest/random-test/random-test-multi-threading-3.py
@@ -0,0 +1,391 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+from threading import Thread, Event
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+last_tb = ""
+last_stb = ""
+written = 0
+last_timestamp = 0
+colAdded = False
+killed = False
+
+
+class Test (Thread):
+    def __init__(self, threadId, name, events, q):
+        Thread.__init__(self)
+        self.threadId = threadId
+        self.name = name
+        self.dataEvent, self.dbEvent, self.queryEvent = events
+        self.q = q
+
+    def create_table(self):
+        tdLog.info("create_table")
+        global last_tb
+        global written
+        global killed
+
+        current_tb = "tb%d" % int(round(time.time() * 1000))
+
+        if (current_tb == last_tb):
+            return
+        else:
+            tdLog.info("will create table %s" % current_tb)
+
+            try:
+                tdSql.execute(
+                    'create table %s (ts timestamp, speed int, c2 nchar(10))' %
+                    current_tb)
+                last_tb = current_tb
+                written = 0
+                killed = False
+            except Exception as e:
+                tdLog.info("killed: %d error: %s" % (killed, e.args[0]))
+                if killed and (e.args[0] == 'network unavailable'):
+                    tdLog.info("database killed, expect failed")
+                    return 0
+                return -1
+        return 0
+
+    def insert_data(self):
+        tdLog.info("insert_data")
+        global last_tb
+        global written
+        global last_timestamp
+
+        if (last_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        start_time = 1500000000000
+
+        tdLog.info("will insert data to table")
+        for i in range(0, 10):
+            insertRows = 1000
+            tdLog.info("insert %d rows to %s" % (insertRows, last_tb))
+
+            for j in range(0, insertRows):
+                if (last_tb == ""):
+                    tdLog.info("no table, return")
+                    return 0
+                try:
+                    tdSql.execute(
+                        'insert into %s values (%d + %da, %d, "test")' %
+                        (last_tb, start_time, last_timestamp, last_timestamp))
+                    written = written + 1
+                    last_timestamp = last_timestamp + 1
+                except Exception as e:
+                    if killed:
+                        tdLog.info(
+                            "database killed, expect failed %s" %
+                            e.args[0])
+                        return 0
+                    tdLog.info(repr(e))
+                    return -1
+        return 0
+
+    def query_data(self):
+        tdLog.info("query_data")
+        global last_tb
+        global killed
+
+        if not killed and last_tb != "":
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % last_tb)
+            tdSql.checkRows(written)
+        return 0
+
+    def create_stable(self):
+        tdLog.info("create_stable")
+        global last_tb
+        global last_stb
+        global written
+        global last_timestamp
+
+        current_stb = "stb%d" % int(round(time.time() * 1000))
+
+        if (current_stb == last_stb):
+            return
+        else:
+            tdLog.info("will create stable %s" % current_stb)
+            tdSql.execute(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
+            last_stb = current_stb
+
+            current_tb = "tb%d" % int(round(time.time() * 1000))
+            tdSql.execute(
+                "create table %s using %s tags (1, '表1')" %
+                (current_tb, last_stb))
+            last_tb = current_tb
+            written = 0
+
+            start_time = 1500000000000
+
+            tdSql.execute(
+                "insert into %s values (%d+%da, 27, '我是nchar字符串')" %
+                (last_tb, start_time, last_timestamp))
+            written = written + 1
+            last_timestamp = last_timestamp + 1
+        return 0
+
+    def drop_stable(self):
+        tdLog.info("drop_stable")
+        global last_stb
+        global last_tb
+        global written
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will drop last super table")
+            tdSql.execute('drop table %s' % last_stb)
+            last_stb = ""
+            last_tb = ""
+            written = 0
+        return 0
+
+    def alter_table_to_add_col(self):
+        tdLog.info("alter_table_to_add_col")
+        global last_stb
+        global colAdded
+
+        if last_stb != "" and colAdded == False:
+            tdSql.execute(
+                "alter table %s add column col binary(20)" %
+                last_stb)
+            colAdded = True
+        return 0
+
+    def alter_table_to_drop_col(self):
+        tdLog.info("alter_table_to_drop_col")
+        global last_stb
+        global colAdded
+
+        if last_stb != "" and colAdded:
+            tdSql.execute("alter table %s drop column col" % last_stb)
+            colAdded = False
+        return 0
+
+    def restart_database(self):
+        tdLog.info("restart_database")
+        global last_tb
+        global written
+        global killed
+
+        tdDnodes.stop(1)
+        killed = True
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+        killed = False
+        return 0
+
+    def force_restart_database(self):
+        tdLog.info("force_restart_database")
+        global last_tb
+        global written
+        global killed
+
+        tdDnodes.forcestop(1)
+        last_tb = ""
+        written = 0
+        killed = True
+        tdDnodes.start(1)
+#        tdLog.sleep(10)
+        killed = False
+        return 0
+
+    def drop_table(self):
+        tdLog.info("drop_table")
+        global last_tb
+        global written
+
+        for i in range(0, 10):
+            if (last_tb != ""):
+                tdLog.info("drop last_tb %s" % last_tb)
+                tdSql.execute("drop table %s" % last_tb)
+                last_tb = ""
+                written = 0
+        return 0
+
+    def query_data_from_stable(self):
+        tdLog.info("query_data_from_stable")
+        global last_stb
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will query data from super table")
+            tdSql.execute('select * from %s' % last_stb)
+        return 0
+
+    def reset_query_cache(self):
+        tdLog.info("reset_query_cache")
+        global last_tb
+        global written
+
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+        return 0
+
+    def reset_database(self):
+        tdLog.info("reset_database")
+        global last_tb
+        global last_stb
+        global written
+        global killed
+
+        tdDnodes.forcestop(1)
+        killed = True
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        tdSql.prepare()
+        killed = False
+        return 0
+
+    def delete_datafiles(self):
+        tdLog.info("delete_data_files")
+        global last_tb
+        global last_stb
+        global written
+        global killed
+
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        tdDnodes.forcestop(1)
+        killed = True
+        dataDir = dnodesDir + '/dnode1/data/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+        last_tb = ""
+        last_stb = ""
+        written = 0
+
+        tdDnodes.start(1)
+        tdSql.prepare()
+        killed = False
+        return 0
+
+    def run(self):
+        dataOp = {
+            1: self.insert_data,
+        }
+
+        dbOp = {
+            1: self.create_table,
+            2: self.create_stable,
+            3: self.restart_database,
+            4: self.force_restart_database,
+            5: self.drop_table,
+            6: self.reset_query_cache,
+            7: self.reset_database,
+            8: self.delete_datafiles,
+            9: self.drop_stable,
+            10: self.alter_table_to_add_col,
+            11: self.alter_table_to_drop_col,
+        }
+
+        queryOp = {
+            1: self.query_data,
+            2: self.query_data_from_stable,
+        }
+
+        if (self.threadId == 1):
+            while True:
+                self.dataEvent.wait()
+                tdLog.notice("first thread")
+                randDataOp = random.randint(1, 1)
+                ret1 = dataOp.get(randDataOp, lambda: "ERROR")()
+
+                if ret1 == -1:
+                    self.q.put(-1)
+                    tdLog.exit("first thread failed")
+                else:
+                    self.q.put(1)
+
+                if (self.q.get() != -2):
+                    self.dataEvent.clear()
+                    self.queryEvent.clear()
+                    self.dbEvent.set()
+                else:
+                    self.q.put(-1)
+                    tdLog.exit("second thread failed, first thread exit too")
+
+        elif (self.threadId == 2):
+            while True:
+                self.dbEvent.wait()
+                tdLog.notice("second thread")
+                randDbOp = random.randint(1, 11)
+                dbOp.get(randDbOp, lambda: "ERROR")()
+                self.dbEvent.clear()
+                self.dataEvent.clear()
+                self.queryEvent.set()
+
+        elif (self.threadId == 3):
+            while True:
+                self.queryEvent.wait()
+                tdLog.notice("third thread")
+                randQueryOp = random.randint(1, 2)
+                queryOp.get(randQueryOp, lambda: "ERROR")()
+                self.queryEvent.clear()
+                self.dbEvent.clear()
+                self.dataEvent.set()
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        events = [Event() for _ in range(3)]
+        events[0].set()
+        events[1].clear()
+        events[1].clear()
+
+        test1 = Test(1, "data operation", events)
+        test2 = Test(2, "db operation", events)
+        test3 = Test(3, "query operation", events)
+
+        test1.start()
+        test2.start()
+        test3.start()
+
+        test1.join()
+        test2.join()
+        test3.join()
+
+        while not q.empty():
+            if (q.get() != 0):
+                tdLog.exit("failed to end of test")
+
+        tdLog.info("end of test")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/random-test/random-test-multi-threading.py b/tests/pytest/random-test/random-test-multi-threading.py
new file mode 100644
index 0000000000000000000000000000000000000000..81862edcf186674c920c07c01144ecbd8cf8c0f0
--- /dev/null
+++ b/tests/pytest/random-test/random-test-multi-threading.py
@@ -0,0 +1,383 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+import threading
+import queue
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+last_tb = ""
+last_stb = ""
+written = 0
+last_timestamp = 0
+colAdded = False
+killed = False
+
+
+class Test (threading.Thread):
+    def __init__(self, threadId, name, q):
+        threading.Thread.__init__(self)
+        self.threadId = threadId
+        self.name = name
+        self.q = q
+
+        self.threadLock = threading.Lock()
+
+    def create_table(self):
+        tdLog.info("create_table")
+        global last_tb
+        global written
+        global killed
+
+        current_tb = "tb%d" % int(round(time.time() * 1000))
+
+        if (current_tb == last_tb):
+            return 0
+        else:
+            tdLog.info("will create table %s" % current_tb)
+
+            try:
+                tdSql.execute(
+                    'create table %s (ts timestamp, speed int, c1 nchar(10))' %
+                    current_tb)
+                last_tb = current_tb
+                written = 0
+                killed = False
+            except Exception as e:
+                tdLog.info("killed: %d error: %s" % (killed, e.args[0]))
+                if killed and (e.args[0] == 'network unavailable'):
+                    tdLog.info("database killed, expect failed")
+                    return 0
+                return -1
+        return 0
+
+    def insert_data(self):
+        tdLog.info("insert_data")
+        global last_tb
+        global written
+        global last_timestamp
+
+        if (last_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        start_time = 1500000000000
+
+        tdLog.info("will insert data to table")
+        for i in range(0, 10):
+            insertRows = 1000
+            tdLog.info("insert %d rows to %s" % (insertRows, last_tb))
+
+            for j in range(0, insertRows):
+                if (last_tb == ""):
+                    tdLog.info("no table, return")
+                    return 0
+
+                try:
+                    tdSql.execute(
+                        'insert into %s values (%d + %da, %d, "test")' %
+                        (last_tb, start_time, last_timestamp, last_timestamp))
+                    written = written + 1
+                    last_timestamp = last_timestamp + 1
+                except Exception as e:
+                    if killed:
+                        tdLog.info(
+                            "database killed, expect failed %s" %
+                            e.args[0])
+                        return 0
+                    tdLog.info(repr(e))
+                    return -1
+        return 0
+
+    def query_data(self):
+        tdLog.info("query_data")
+        global last_tb
+        global killed
+
+        if not killed and last_tb != "":
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % last_tb)
+            tdSql.checkRows(written)
+        return 0
+
+    def create_stable(self):
+        tdLog.info("create_stable")
+        global last_tb
+        global last_stb
+        global written
+        global last_timestamp
+
+        current_stb = "stb%d" % int(round(time.time() * 1000))
+
+        if (current_stb != last_stb):
+            tdLog.info("will create stable %s" % current_stb)
+            tdLog.info(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
+            tdSql.execute(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
+            last_stb = current_stb
+
+            current_tb = "tb%d" % int(round(time.time() * 1000))
+            tdLog.info(
+                "create table %s using %s tags (1, '表1')" %
+                (current_tb, last_stb))
+            tdSql.execute(
+                "create table %s using %s tags (1, '表1')" %
+                (current_tb, last_stb))
+            last_tb = current_tb
+            written = 0
+
+            start_time = 1500000000000
+
+            tdSql.execute(
+                "insert into %s values (%d+%da, 27, '我是nchar字符串')" %
+                (last_tb, start_time, last_timestamp))
+            written = written + 1
+            last_timestamp = last_timestamp + 1
+
+        return 0
+
+    def drop_stable(self):
+        tdLog.info("drop_stable")
+        global last_stb
+        global last_tb
+        global written
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+        else:
+            tdLog.info("will drop last super table %s" % last_stb)
+            tdSql.execute('drop table %s' % last_stb)
+            last_stb = ""
+            last_tb = ""
+            written = 0
+        return 0
+
+    def alter_table_to_add_col(self):
+        tdLog.info("alter_table_to_add_col")
+        global last_stb
+        global colAdded
+
+        if last_stb != "" and not colAdded:
+            tdSql.execute(
+                "alter table %s add column col binary(20)" %
+                last_stb)
+            colAdded = True
+        return 0
+
+    def alter_table_to_drop_col(self):
+        tdLog.info("alter_table_to_drop_col")
+        global last_stb
+        global colAdded
+
+        if last_stb != "" and colAdded:
+            tdSql.execute("alter table %s drop column col" % last_stb)
+            colAdded = False
+        return 0
+
+    def restart_database(self):
+        tdLog.info("restart_database")
+        global last_tb
+        global written
+        global killed
+
+        tdDnodes.stop(1)
+        killed = True
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+        killed = False
+        return 0
+
+    def force_restart_database(self):
+        tdLog.info("force_restart_database")
+        global last_tb
+        global written
+        global killed
+
+        tdDnodes.forcestop(1)
+        last_tb = ""
+        written = 0
+        killed = True
+        tdDnodes.start(1)
+#        tdLog.sleep(10)
+        killed = False
+        return 0
+
+    def drop_table(self):
+        tdLog.info("drop_table")
+        global last_tb
+        global written
+
+        for i in range(0, 10):
+            if (last_tb != ""):
+                tdLog.info("drop last_tb %s" % last_tb)
+                tdSql.execute("drop table %s" % last_tb)
+                last_tb = ""
+                written = 0
+        return 0
+
+    def query_data_from_stable(self):
+        tdLog.info("query_data_from_stable")
+        global last_stb
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+        else:
+            tdLog.info("will query data from super table")
+            tdSql.execute('select * from %s' % last_stb)
+        return 0
+
+    def reset_query_cache(self):
+        tdLog.info("reset_query_cache")
+        global last_tb
+        global written
+
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+#        tdLog.sleep(1)
+        return 0
+
+    def reset_database(self):
+        tdLog.info("reset_database")
+        global last_tb
+        global last_stb
+        global written
+        global killed
+
+        tdDnodes.forcestop(1)
+        killed = True
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+        tdSql.prepare()
+        killed = False
+        return 0
+
+    def delete_datafiles(self):
+        tdLog.info("delete_data_files")
+        global last_tb
+        global last_stb
+        global written
+        global killed
+
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        tdDnodes.forcestop(1)
+        killed = True
+        dataDir = dnodesDir + '/dnode1/data/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+        last_tb = ""
+        last_stb = ""
+        written = 0
+
+        tdDnodes.start(1)
+        tdSql.prepare()
+        killed = False
+        return 0
+
+    def run(self):
+        dataOp = {
+            1: self.insert_data,
+            2: self.query_data,
+            3: self.query_data_from_stable,
+        }
+
+        dbOp = {
+            1: self.create_table,
+            2: self.create_stable,
+            3: self.restart_database,
+            4: self.force_restart_database,
+            5: self.drop_table,
+            6: self.reset_query_cache,
+            7: self.reset_database,
+            8: self.delete_datafiles,
+            9: self.drop_stable,
+            10: self.alter_table_to_add_col,
+            11: self.alter_table_to_drop_col,
+        }
+
+        if (self.threadId == 1):
+            while True:
+                self.threadLock.acquire()
+                tdLog.notice("first thread")
+                randDataOp = random.randint(1, 3)
+                ret1 = dataOp.get(randDataOp, lambda: "ERROR")()
+
+                if ret1 == -1:
+                    self.q.put(-1)
+                    tdLog.exit("first thread failed")
+                else:
+                    self.q.put(1)
+
+                if (self.q.get() != -2):
+                    self.threadLock.release()
+                else:
+                    self.q.put(-1)
+                    tdLog.exit("second thread failed, first thread exit too")
+
+        elif (self.threadId == 2):
+            while True:
+                self.threadLock.acquire()
+                tdLog.notice("second thread")
+                randDbOp = random.randint(1, 11)
+                ret2 = dbOp.get(randDbOp, lambda: "ERROR")()
+
+                if ret2 == -1:
+                    self.q.put(-2)
+                    tdLog.exit("second thread failed")
+                else:
+                    self.q.put(2)
+
+                if (self.q.get() != -1):
+                    self.threadLock.release()
+                else:
+                    self.q.put(-2)
+                    tdLog.exit("first thread failed, second exit too")
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        q = queue.Queue()
+        test1 = Test(1, "data operation", q)
+        test2 = Test(2, "db operation", q)
+
+        test1.start()
+        test2.start()
+        test1.join()
+        test2.join()
+
+        while not q.empty():
+            if (q.get() != 0):
+                tdLog.exit("failed to end of test")
+
+        tdLog.info("end of test")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/random-test/random-test.py b/tests/pytest/random-test/random-test.py
new file mode 100644
index 0000000000000000000000000000000000000000..cecefe379de18b1b840d94b015b252d8fe494d36
--- /dev/null
+++ b/tests/pytest/random-test/random-test.py
@@ -0,0 +1,280 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import codecs
+
+
+class Test:
+    def __init__(self):
+        self.last_tb = ""
+        self.last_stb = ""
+        self.written = 0
+        self.colAdded = False
+
+    def create_table(self):
+        tdLog.info("create_table")
+        current_tb = "tb%d" % int(round(time.time() * 1000))
+
+        if (current_tb == self.last_tb):
+            return
+        else:
+            tdLog.info("will create table %s" % current_tb)
+            tdSql.execute(
+                'create table %s (ts timestamp, c1 int, c2 nchar(10))' %
+                current_tb)
+            self.last_tb = current_tb
+            self.written = 0
+            self.colAdded = False
+
+    def insert_data(self):
+        tdLog.info("insert_data")
+        if (self.last_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        tdLog.info("will insert data to table")
+        insertRows = 10
+        tdLog.info("insert %d rows to %s" % (insertRows, self.last_tb))
+        for i in range(0, insertRows):
+            if self.colAdded:
+                ret = tdSql.execute(
+                    'insert into %s values (now + %dm, %d, "%s", "%s")' %
+                    (self.last_tb, i, i, "->" + str(i)), "col")
+            else:
+                ret = tdSql.execute(
+                    'insert into %s values (now + %dm, %d, "%s")' %
+                    (self.last_tb, i, i, "->" + str(i)))
+
+            self.written = self.written + 1
+
+        tdLog.info("insert earlier data")
+        if self.colAdded:
+            tdSql.execute(
+                'insert into %s values (now - 5m , 10, " - 5m", "col")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 6m , 10, " - 6m", "col")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 7m , 10, " - 7m", "col")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 8m , 10, " - 8m", "col")' %
+                self.last_tb)
+            self.written = self.written + 1
+        else:
+            tdSql.execute(
+                'insert into %s values (now - 5m , 10, " - 5m")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 6m , 10, " - 6m")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 7m , 10, " - 7m")' %
+                self.last_tb)
+            self.written = self.written + 1
+            tdSql.execute(
+                'insert into %s values (now - 8m , 10, " - 8m")' %
+                self.last_tb)
+            self.written = self.written + 1
+
+    def query_data(self):
+        tdLog.info("query_data")
+        if (self.written > 0):
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % self.last_tb)
+            tdSql.checkRows(self.written)
+
+    def create_stable(self):
+        tdLog.info("create_stable")
+        current_stb = "stb%d" % int(round(time.time() * 1000))
+
+        if (current_stb == self.last_stb):
+            return
+        else:
+            tdLog.info("will create stable %s" % current_stb)
+
+            db = "db"
+            tdSql.execute("drop database if exists %s" % (db))
+            tdSql.execute("reset query cache")
+            tdSql.execute("create database %s maxrows 200 maxtables 30" % (db))
+            tdSql.execute("use %s" % (db))
+
+            tdSql.execute(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
+            self.last_stb = current_stb
+            self.colAdded = False
+
+            for k in range(1, 300):
+                current_tb = "tb%d" % int(round(time.time() * 1000))
+                sqlcmd = "create table %s using %s tags (1, 'test')" % (
+                    current_tb, self.last_stb)
+                tdSql.execute(sqlcmd)
+                self.last_tb = current_tb
+                self.written = 0
+
+                for j in range(1, 100):
+                    tdSql.execute(
+                        "insert into %s values (now + %da, 27, 'wsnchar')" %
+                        (self.last_tb, j))
+                    self.written = self.written + 1
+
+    def alter_table_to_add_col(self):
+        tdLog.info("alter_table_to_add_col")
+
+        if self.last_stb != "" and not self.colAdded:
+            tdSql.execute(
+                "alter table %s add column col binary(20)" %
+                self.last_stb)
+            self.colAdded = True
+
+    def alter_table_to_drop_col(self):
+        tdLog.info("alter_table_to_drop_col")
+
+        if self.last_stb != "" and self.colAdded:
+            tdSql.execute("alter table %s drop column col" % self.last_stb)
+            self.colAdded = False
+
+    def drop_stable(self):
+        tdLog.info("drop_stable")
+        if (self.last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will drop last super table")
+            tdSql.execute('drop table %s' % self.last_stb)
+            self.last_stb = ""
+            self.last_tb = ""
+            self.written = 0
+
+    def query_data_from_stable(self):
+        tdLog.info("query_data_from_stable")
+        if (self.last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will query data from super table")
+            tdSql.execute('select * from %s' % self.last_stb)
+
+    def restart_database(self):
+        tdLog.info("restart_database")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+
+    def force_restart_database(self):
+        tdLog.info("force_restart_database")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+        tdSql.prepare()
+        self.last_tb = ""
+        self.last_stb = ""
+        self.written = 0
+
+    def drop_table(self):
+        tdLog.info("drop_table")
+        if (self.last_tb != ""):
+            tdLog.info("drop last tb %s" % self.last_tb)
+            tdSql.execute("drop table %s" % self.last_tb)
+            self.last_tb = ""
+            self.written = 0
+
+    def reset_query_cache(self):
+        tdLog.info("reset_query_cache")
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+
+    def reset_database(self):
+        tdLog.info("reset_database")
+        tdDnodes.forcestop(1)
+        tdDnodes.deploy(1)
+        self.last_tb = ""
+        self.written = 0
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+        tdSql.prepare()
+        self.last_tb = ""
+        self.last_stb = ""
+        self.written = 0
+
+    def delete_datafiles(self):
+        tdLog.info("delete_datafiles")
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        tdDnodes.forcestop(1)
+        dataDir = dnodesDir + '/dnode1/data/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+
+        self.last_tb = ""
+        self.last_stb = ""
+        self.written = 0
+        tdDnodes.start(1)
+        tdLog.sleep(10)
+        tdSql.prepare()
+        self.last_tb = ""
+        self.last_stb = ""
+        self.written = 0
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        test = Test()
+
+        switch = {
+            1: test.create_table,
+            2: test.insert_data,
+            3: test.query_data,
+            4: test.create_stable,
+            5: test.restart_database,
+            6: test.force_restart_database,
+            7: test.drop_table,
+            8: test.reset_query_cache,
+            9: test.reset_database,
+            10: test.delete_datafiles,
+            11: test.query_data_from_stable,
+            12: test.drop_stable,
+            13: test.alter_table_to_add_col,
+            14: test.alter_table_to_drop_col,
+        }
+
+        for x in range(1, 1000):
+            r = random.randint(1, 14)
+            tdLog.notice("iteration %d run func %d" % (x, r))
+            switch.get(r, lambda: "ERROR")()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/regressiontest.sh b/tests/pytest/regressiontest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b69ee37a555da02e98c8227a6ea5ed81bdb58365
--- /dev/null
+++ b/tests/pytest/regressiontest.sh
@@ -0,0 +1,182 @@
+#!/bin/bash
+ulimit -c unlimited
+
+python3 ./test.py -f insert/basic.py
+python3 ./test.py -f insert/int.py
+python3 ./test.py -f insert/float.py
+python3 ./test.py -f insert/bigint.py
+python3 ./test.py -f insert/bool.py
+python3 ./test.py -f insert/double.py
+python3 ./test.py -f insert/smallint.py
+python3 ./test.py -f insert/tinyint.py
+python3 ./test.py -f insert/date.py
+python3 ./test.py -f insert/binary.py
+python3 ./test.py -f insert/nchar.py
+# python3 ./test.py -f insert/nchar-boundary.py
+python3 ./test.py -f insert/nchar-unicode.py
+python3 ./test.py -f insert/multi.py
+python3 ./test.py -f insert/randomNullCommit.py
+
+python3 ./test.py -f table/column_name.py
+python3 ./test.py -f table/column_num.py
+python3 ./test.py -f table/db_table.py
+# python3 ./test.py -f table/tablename-boundary.py
+
+# tag
+python3 ./test.py -f tag_lite/filter.py
+python3 ./test.py -f tag_lite/create-tags-boundary.py
+python3 ./test.py -f tag_lite/3.py
+python3 ./test.py -f tag_lite/4.py
+python3 ./test.py -f tag_lite/5.py
+python3 ./test.py -f tag_lite/6.py
+python3 ./test.py -f tag_lite/add.py
+python3 ./test.py -f tag_lite/bigint.py
+python3 ./test.py -f tag_lite/binary_binary.py
+python3 ./test.py -f tag_lite/binary.py
+python3 ./test.py -f tag_lite/bool_binary.py
+python3 ./test.py -f tag_lite/bool_int.py
+python3 ./test.py -f tag_lite/bool.py
+python3 ./test.py -f tag_lite/change.py
+python3 ./test.py -f tag_lite/column.py
+python3 ./test.py -f tag_lite/commit.py
+python3 ./test.py -f tag_lite/create.py
+python3 ./test.py -f tag_lite/datatype.py
+python3 ./test.py -f tag_lite/datatype-without-alter.py
+python3 ./test.py -f tag_lite/delete.py
+python3 ./test.py -f tag_lite/double.py
+python3 ./test.py -f tag_lite/float.py
+python3 ./test.py -f tag_lite/int_binary.py
+python3 ./test.py -f tag_lite/int_float.py
+python3 ./test.py -f tag_lite/int.py
+python3 ./test.py -f tag_lite/set.py
+python3 ./test.py -f tag_lite/smallint.py
+python3 ./test.py -f tag_lite/tinyint.py
+
+# python3 ./test.py -f dbmgmt/database-name-boundary.py
+
+python3 ./test.py -f import_merge/importBlock1HO.py
+python3 ./test.py -f import_merge/importBlock1HPO.py
+python3 ./test.py -f import_merge/importBlock1H.py
+python3 ./test.py -f import_merge/importBlock1S.py
+python3 ./test.py -f import_merge/importBlock1Sub.py
+python3 ./test.py -f import_merge/importBlock1TO.py
+python3 ./test.py -f import_merge/importBlock1TPO.py
+python3 ./test.py -f import_merge/importBlock1T.py
+python3 ./test.py -f import_merge/importBlock2HO.py
+python3 ./test.py -f import_merge/importBlock2HPO.py
+python3 ./test.py -f import_merge/importBlock2H.py
+python3 ./test.py -f import_merge/importBlock2S.py
+python3 ./test.py -f import_merge/importBlock2Sub.py
+python3 ./test.py -f import_merge/importBlock2TO.py
+python3 ./test.py -f import_merge/importBlock2TPO.py
+python3 ./test.py -f import_merge/importBlock2T.py
+python3 ./test.py -f import_merge/importBlockbetween.py
+python3 ./test.py -f import_merge/importCacheFileHO.py
+python3 ./test.py -f import_merge/importCacheFileHPO.py
+python3 ./test.py -f import_merge/importCacheFileH.py
+python3 ./test.py -f import_merge/importCacheFileS.py
+python3 ./test.py -f import_merge/importCacheFileSub.py
+python3 ./test.py -f import_merge/importCacheFileTO.py
+python3 ./test.py -f import_merge/importCacheFileTPO.py
+python3 ./test.py -f import_merge/importCacheFileT.py
+python3 ./test.py -f import_merge/importDataH2.py
+python3 ./test.py -f import_merge/importDataHO2.py
+python3 ./test.py -f import_merge/importDataHO.py
+python3 ./test.py -f import_merge/importDataHPO.py
+python3 ./test.py -f import_merge/importDataLastHO.py
+python3 ./test.py -f import_merge/importDataLastHPO.py
+python3 ./test.py -f import_merge/importDataLastH.py
+python3 ./test.py -f import_merge/importDataLastS.py
+python3 ./test.py -f import_merge/importDataLastSub.py
+python3 ./test.py -f import_merge/importDataLastTO.py
+python3 ./test.py -f import_merge/importDataLastTPO.py
+python3 ./test.py -f import_merge/importDataLastT.py
+python3 ./test.py -f import_merge/importDataS.py
+python3 ./test.py -f import_merge/importDataSub.py
+python3 ./test.py -f import_merge/importDataTO.py
+python3 ./test.py -f import_merge/importDataTPO.py
+python3 ./test.py -f import_merge/importDataT.py
+python3 ./test.py -f import_merge/importHeadOverlap.py
+python3 ./test.py -f import_merge/importHeadPartOverlap.py
+python3 ./test.py -f import_merge/importHead.py
+python3 ./test.py -f import_merge/importHORestart.py
+python3 ./test.py -f import_merge/importHPORestart.py
+python3 ./test.py -f import_merge/importHRestart.py
+python3 ./test.py -f import_merge/importLastHO.py
+python3 ./test.py -f import_merge/importLastHPO.py
+python3 ./test.py -f import_merge/importLastH.py
+python3 ./test.py -f import_merge/importLastS.py
+python3 ./test.py -f import_merge/importLastSub.py
+python3 ./test.py -f import_merge/importLastTO.py
+python3 ./test.py -f import_merge/importLastTPO.py
+python3 ./test.py -f import_merge/importLastT.py
+python3 ./test.py -f import_merge/importSpan.py
+python3 ./test.py -f import_merge/importSRestart.py
+python3 ./test.py -f import_merge/importSubRestart.py
+python3 ./test.py -f import_merge/importTailOverlap.py
+python3 ./test.py -f import_merge/importTailPartOverlap.py
+python3 ./test.py -f import_merge/importTail.py
+python3 ./test.py -f import_merge/importToCommit.py
+python3 ./test.py -f import_merge/importTORestart.py
+python3 ./test.py -f import_merge/importTPORestart.py
+python3 ./test.py -f import_merge/importTRestart.py
+python3 ./test.py -f import_merge/importInsertThenImport.py
+python3 ./test.py -f import_merge/importCSV.py
+# user
+python3 ./test.py -f user/user_create.py
+python3 ./test.py -f user/pass_len.py
+
+# table
+python3 ./test.py -f table/del_stable.py
+
+#query
+python3 ./test.py -f query/filter.py
+python3 ./test.py -f query/filterAllIntTypes.py
+python3 ./test.py -f query/filterFloatAndDouble.py
+python3 ./test.py -f query/filterOtherTypes.py
+python3 ./test.py -f query/queryError.py
+python3 ./test.py -f query/querySort.py
+python3 ./test.py -f query/queryJoin.py
+python3 ./test.py -f query/filterCombo.py
+python3 ./test.py -f query/queryNormal.py
+python3 ./test.py -f query/select_last_crash.py
+python3 ./test.py -f query/queryNullValueTest.py
+python3 ./test.py -f query/queryInsertValue.py
+
+#stream
+python3 ./test.py -f stream/stream1.py
+python3 ./test.py -f stream/stream2.py
+
+#alter table
+python3 ./test.py -f alter/alter_table_crash.py
+
+# client
+python3 ./test.py -f client/client.py
+python3 ./test.py -f client/version.py
+
+# Misc
+python3 testCompress.py
+python3 testNoCompress.py
+
+
+# functions
+python3 ./test.py -f functions/function_avg.py
+python3 ./test.py -f functions/function_bottom.py
+python3 ./test.py -f functions/function_count.py
+python3 ./test.py -f functions/function_diff.py
+python3 ./test.py -f functions/function_first.py
+python3 ./test.py -f functions/function_last.py
+python3 ./test.py -f functions/function_last_row.py
+python3 ./test.py -f functions/function_leastsquares.py
+python3 ./test.py -f functions/function_max.py
+python3 ./test.py -f functions/function_min.py
+python3 ./test.py -f functions/function_operations.py
+python3 ./test.py -f functions/function_percentile.py
+python3 ./test.py -f functions/function_spread.py
+python3 ./test.py -f functions/function_stddev.py
+python3 ./test.py -f functions/function_sum.py
+python3 ./test.py -f functions/function_top.py
+python3 ./test.py -f functions/function_twa.py
+
+# tools
+python3 test.py -f tools/taosdemo.py
\ No newline at end of file
diff --git a/tests/pytest/simpletest_no_sudo.sh b/tests/pytest/simpletest_no_sudo.sh
new file mode 100755
index 0000000000000000000000000000000000000000..61faf3df523f94562d1eeb2922ad4a4b3cc847e0
--- /dev/null
+++ b/tests/pytest/simpletest_no_sudo.sh
@@ -0,0 +1,13 @@
+# This is the script for us to run our Python test cases with 2 important constraints:
+#    
+#	1. No root/sudo special rights is needed.
+#	2. No files are needed outside the development tree, everything is done in the local source code directory
+
+# First we need to set up a path for Python to find our own TAOS modules, so that "import" can work.
+export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3
+
+# Then let us set up the library path so that our compiled SO file can be loaded by Python
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/../../build/build/lib
+
+# Now we are all let, and let's run our cases!
+python3 ./test.py -m 127.0.0.1 -f insert/basic.py
diff --git a/tests/pytest/smoketest.sh b/tests/pytest/smoketest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7c14b673e5fac1f5d3b19dd583acc8462e5abab3
--- /dev/null
+++ b/tests/pytest/smoketest.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+ulimit -c unlimited
+
+# insert
+python3 ./test.py $1 -f insert/basic.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/bigint.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/nchar.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/multi.py
+python3 ./test.py $1 -s && sleep 1
+
+# table
+python3 ./test.py $1 -f table/column_name.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/column_num.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/db_table.py
+python3 ./test.py $1 -s && sleep 1
+
+# import
+python3 ./test.py $1 -f import_merge/importDataLastSub.py
+python3 ./test.py $1 -s && sleep 1
+
+#tag 
+python3 ./test.py $1 -f tag_lite/filter.py
+python3 ./test.py $1 -s && sleep 1
+
+#query
+python3 ./test.py $1 -f query/filter.py
+python3 ./test.py $1 -s && sleep 1
+
+# client
+python3 ./test.py $1 -f client/client.py
+python3 ./test.py $1 -s && sleep 1
+
diff --git a/tests/pytest/stable/__init__.py b/tests/pytest/stable/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/stable/insert.py b/tests/pytest/stable/insert.py
new file mode 100644
index 0000000000000000000000000000000000000000..3d37e6726c965a8963f728fdd1d8dc89e1cee339
--- /dev/null
+++ b/tests/pytest/stable/insert.py
@@ -0,0 +1,56 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev_02")')
+
+        print("==============step2")
+
+        tdSql.execute(
+            """INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1),
+            ('2020-05-13 10:00:00.001', 1)
+             dev_002 VALUES('2020-05-13 10:00:00.001', 1)""")
+
+        tdSql.query("select * from db.st where dev='dev_01'")
+        tdSql.checkRows(2)
+
+        tdSql.query("select * from db.st where dev='dev_02'")
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stable/query_after_reset-multi-threading.py b/tests/pytest/stable/query_after_reset-multi-threading.py
new file mode 100644
index 0000000000000000000000000000000000000000..a177f589d166117c0d8de61a01a34040a1b1103b
--- /dev/null
+++ b/tests/pytest/stable/query_after_reset-multi-threading.py
@@ -0,0 +1,259 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+import threading
+import queue
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+current_tb = ""
+last_tb = ""
+written = 0
+
+
+class Test (threading.Thread):
+    def __init__(self, threadId, name, sleepTime, q):
+        threading.Thread.__init__(self)
+        self.threadId = threadId
+        self.name = name
+        self.sleepTime = sleepTime
+        self.q = q
+
+        self.threadLock = threading.Lock()
+
+    def create_table(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("create a table")
+        current_tb = "tb%d" % int(round(time.time() * 1000))
+        tdLog.info("current table %s" % current_tb)
+
+        if (current_tb == last_tb):
+            return
+        else:
+            tdSql.execute(
+                'create table %s (ts timestamp, speed int)' %
+                current_tb)
+            last_tb = current_tb
+            written = 0
+
+    def insert_data(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("will insert data to table")
+        if (current_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        tdLog.info("insert data to table")
+        for i in range(0, 10):
+            self.threadLock.acquire()
+            insertRows = 1000
+            tdLog.info("insert %d rows to %s" % (insertRows, current_tb))
+
+            for j in range(0, insertRows):
+                ret = tdSql.execute(
+                    'insert into %s values (now + %dm, %d)' %
+                    (current_tb, j, j))
+                written = written + 1
+            self.threadLock.release()
+
+    def query_data(self):
+        global current_tb
+        global last_tb
+        global written
+
+        if (written > 0):
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % last_tb)
+            tdSql.checkRows(written)
+
+    def query_stable(self):
+        tdLog.sleep(10)
+        self.threadLock.acquire()
+        tdLog.info("query super table")
+
+        try:
+            tdSql.query("select * from st")
+        except Exception as e:
+            tdLog.info(repr(e))
+            self.q.put(-1)
+            tdLog.exit("failed")
+        tdSql.checkRows(1)
+        self.threadLock.release()
+
+    def create_stable(self):
+        global current_tb
+        global last_tb
+        global written
+
+        self.threadLock.acquire()
+
+        tdLog.info("create a super table and sub-table and insert data")
+
+        try:
+            tdSql.execute(
+                "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+            tdSql.execute(
+                'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+            tdSql.execute(
+                "INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1)")
+        except Exception as e:
+            tdLog.info(repr(e))
+            self.q.put(-1)
+            tdLog.exit("failed")
+        self.stop_database()
+        self.delete_datafiles()
+        self.restart_database()
+        self.threadLock.release()
+
+    def stop_database(self):
+        tdLog.info("stop databae")
+        tdDnodes.stop(1)
+
+    def restart_database(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("restart databae")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+    def force_restart(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("force restart database")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+    def drop_table(self):
+        global current_tb
+        global last_tb
+        global written
+
+        for i in range(0, 10):
+            self.threadLock.acquire()
+
+            tdLog.info("current_tb %s" % current_tb)
+
+            if (current_tb != ""):
+                tdLog.info("drop current tb %s" % current_tb)
+                tdSql.execute("drop table %s" % current_tb)
+                current_tb = ""
+                last_tb = ""
+                written = 0
+            tdLog.sleep(self.sleepTime)
+            self.threadLock.release()
+
+    def reset_query_cache(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+
+    def reset_database(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("reset database")
+        tdDnodes.forcestop(1)
+        tdDnodes.deploy(1)
+        current_tb = ""
+        last_tb = ""
+        written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+    def delete_datafiles(self):
+        global current_tb
+        global last_tb
+        global written
+
+        tdLog.info("delete data files")
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        dataDir = dnodesDir + '/dnode1/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+
+        current_tb = ""
+        last_tb = ""
+        written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+    def run(self):
+        switch = {
+            1: self.create_table,
+            2: self.insert_data,
+            3: self.query_data,
+            4: self.create_stable,
+            5: self.restart_database,
+            6: self.force_restart,
+            7: self.drop_table,
+            8: self.reset_query_cache,
+            9: self.reset_database,
+            10: self.delete_datafiles,
+            11: self.query_stable,
+        }
+
+        switch.get(self.threadId, lambda: "ERROR")()
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        q = queue.Queue()
+        test1 = Test(4, "create_stable", 1, q)
+        test2 = Test(11, "query_stable", 2, q)
+
+        test1.start()
+        test2.start()
+        test1.join()
+        test2.join()
+
+        while not q.empty():
+            if (q.get() == -1):
+                tdLog.exit("failed to end of test")
+
+        tdLog.info("end of test")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stable/query_after_reset.py b/tests/pytest/stable/query_after_reset.py
new file mode 100644
index 0000000000000000000000000000000000000000..b66fc2eff1e9269411168ecd38cf459eae16e6d5
--- /dev/null
+++ b/tests/pytest/stable/query_after_reset.py
@@ -0,0 +1,186 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class Test:
+    def __init__(self):
+        self.current_tb = ""
+        self.last_tb = ""
+        self.written = 0
+
+    def create_table(self):
+        tdLog.info("create a table")
+        self.current_tb = "tb%d" % int(round(time.time() * 1000))
+        tdLog.info("current table %s" % self.current_tb)
+
+        if (self.current_tb == self.last_tb):
+            return
+        else:
+            tdSql.execute(
+                'create table %s (ts timestamp, speed int)' %
+                self.current_tb)
+            self.last_tb = self.current_tb
+            self.written = 0
+
+    def insert_data(self):
+        tdLog.info("will insert data to table")
+        if (self.current_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        tdLog.info("insert data to table")
+        insertRows = 10
+        tdLog.info("insert %d rows to %s" % (insertRows, self.last_tb))
+        for i in range(0, insertRows):
+            ret = tdSql.execute(
+                'insert into %s values (now + %dm, %d)' %
+                (self.last_tb, i, i))
+            self.written = self.written + 1
+
+        tdLog.info("insert earlier data")
+        tdSql.execute('insert into %s values (now - 5m , 10)' % self.last_tb)
+        self.written = self.written + 1
+        tdSql.execute('insert into %s values (now - 6m , 10)' % self.last_tb)
+        self.written = self.written + 1
+        tdSql.execute('insert into %s values (now - 7m , 10)' % self.last_tb)
+        self.written = self.written + 1
+        tdSql.execute('insert into %s values (now - 8m , 10)' % self.last_tb)
+        self.written = self.written + 1
+
+    def query_data(self):
+        if (self.written > 0):
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % self.last_tb)
+            tdSql.checkRows(self.written)
+
+    def query_stable(self):
+        tdLog.info("query super table")
+        try:
+            tdSql.query("select * from st")
+        except Exception as e:
+            tdLog.info("Exception catched: %s" % repr(e))
+            if ('Table does not exist' not in repr(e)):
+                raise Exception(repr(e))
+
+    def create_stable(self):
+        tdLog.info("create a super table and sub-table and insert data")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_01")')
+        tdSql.execute(
+            "INSERT INTO dev_001(ts, tagtype) VALUES('2020-05-13 10:00:00.000', 1)")
+
+    def stop_database(self):
+        tdLog.info("stop databae")
+        tdDnodes.stop(1)
+
+    def restart_database(self):
+        tdLog.info("restart databae")
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+    def force_restart(self):
+        tdLog.info("force restart database")
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+        tdLog.sleep(5)
+
+    def drop_table(self):
+        if (self.current_tb != ""):
+            tdLog.info("drop current tb %s" % self.current_tb)
+            tdSql.execute("drop table %s" % self.current_tb)
+            self.current_tb = ""
+            self.last_tb = ""
+            self.written = 0
+
+    def reset_query_cache(self):
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+
+    def reset_database(self):
+        tdLog.info("reset database")
+        tdDnodes.forcestop(1)
+        tdDnodes.deploy(1)
+        self.current_tb = ""
+        self.last_tb = ""
+        self.written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+    def delete_datafiles(self):
+        tdLog.info("delete data files")
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        dataDir = dnodesDir + '/dnode1/data/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+
+        self.current_tb = ""
+        self.last_tb = ""
+        self.written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        test = Test()
+
+        switch = {
+            1: test.create_table,
+            2: test.insert_data,
+            3: test.query_data,
+            4: test.create_stable,
+            5: test.restart_database,
+            6: test.force_restart,
+            7: test.drop_table,
+            8: test.reset_query_cache,
+            9: test.reset_database,
+            10: test.delete_datafiles,
+            11: test.query_stable,
+            12: test.stop_database,
+        }
+
+        tdLog.info("create stable")
+        switch.get(4, lambda: "ERROR")()
+        tdLog.info("stop database")
+        switch.get(12, lambda: "ERROR")()
+        tdLog.info("delete datafiles")
+        switch.get(10, lambda: "ERROR")()
+        tdLog.info("restart database")
+        switch.get(5, lambda: "ERROR")()
+        tdLog.info("query stable")
+        switch.get(11, lambda: "ERROR")()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/history.py b/tests/pytest/stream/history.py
new file mode 100644
index 0000000000000000000000000000000000000000..890580001cf40a13ba18f6f81a3bd0faaac67991
--- /dev/null
+++ b/tests/pytest/stream/history.py
@@ -0,0 +1,63 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute("create table cars(ts timestamp, s int) tags(id int)")
+        tdSql.execute("create table car0 using cars tags(0)")
+        tdSql.execute("create table car1 using cars tags(1)")
+        tdSql.execute("create table car2 using cars tags(2)")
+        tdSql.execute("create table car3 using cars tags(3)")
+        tdSql.execute("create table car4 using cars tags(4)")
+
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:00.103', 1)")
+        tdSql.execute("insert into car1 values('2019-01-01 00:00:00.234', 1)")
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:01.012', 1)")
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:02.003', 1)")
+        tdSql.execute("insert into car2 values('2019-01-01 00:00:02.328', 1)")
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:03.139', 1)")
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:04.348', 1)")
+        tdSql.execute("insert into car0 values('2019-01-01 00:00:05.783', 1)")
+        tdSql.execute("insert into car1 values('2019-01-01 00:00:01.893', 1)")
+        tdSql.execute("insert into car1 values('2019-01-01 00:00:02.712', 1)")
+        tdSql.execute("insert into car1 values('2019-01-01 00:00:03.982', 1)")
+        tdSql.execute("insert into car3 values('2019-01-01 00:00:01.389', 1)")
+        tdSql.execute("insert into car4 values('2019-01-01 00:00:01.829', 1)")
+
+        tdSql.execute("create table strm as select count(*) from cars interval(4s)")
+        tdSql.waitedQuery("select * from strm", 2, 100)
+        tdSql.checkData(0, 1, 11)
+        tdSql.checkData(1, 1, 2)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/metric_1.py b/tests/pytest/stream/metric_1.py
new file mode 100644
index 0000000000000000000000000000000000000000..b4cccac69c8afe9c637b7a455732572c029258a7
--- /dev/null
+++ b/tests/pytest/stream/metric_1.py
@@ -0,0 +1,104 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def createFuncStream(self, expr, suffix, value):
+        tbname = "strm_" + suffix
+        tdLog.info("create stream table %s" % tbname)
+        tdSql.query("select %s from stb interval(1d)" % expr)
+        tdSql.checkData(0, 1, value)
+        tdSql.execute("create table %s as select %s from stb interval(1d)" % (tbname, expr))
+
+    def checkStreamData(self, suffix, value):
+        sql = "select * from strm_" + suffix
+        tdSql.waitedQuery(sql, 1, 120)
+        tdSql.checkData(0, 1, value)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+
+        tdSql.prepare()
+
+        tdLog.info("===== preparing data =====")
+        tdSql.execute(
+            "create table stb(ts timestamp, tbcol int, tbcol2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        self.createFuncStream("count(*)", "c1", 200)
+        self.createFuncStream("count(tbcol)", "c2", 200)
+        self.createFuncStream("count(tbcol2)", "c3", 200)
+        self.createFuncStream("avg(tbcol)", "av", 9.5)
+        self.createFuncStream("sum(tbcol)", "su", 1900)
+        self.createFuncStream("min(tbcol)", "mi", 0)
+        self.createFuncStream("max(tbcol)", "ma", 19)
+        self.createFuncStream("first(tbcol)", "fi", 0)
+        self.createFuncStream("last(tbcol)", "la", 19)
+        #tdSql.query("select stddev(tbcol) from stb interval(1d)")
+        #tdSql.query("select leastsquares(tbcol, 1, 1) from stb interval(1d)")
+        tdSql.query("select top(tbcol, 1) from stb interval(1d)")
+        tdSql.query("select bottom(tbcol, 1) from stb interval(1d)")
+        #tdSql.query("select percentile(tbcol, 1) from stb interval(1d)")
+        #tdSql.query("select diff(tbcol) from stb interval(1d)")
+
+        tdSql.query("select count(tbcol) from stb where ts < now + 4m interval(1d)")
+        tdSql.checkData(0, 1, 200)
+        #tdSql.execute("create table strm_wh as select count(tbcol) from stb where ts < now + 4m interval(1d)")
+
+        self.createFuncStream("count(tbcol)", "as", 200)
+
+        tdSql.query("select count(tbcol) from stb interval(1d) group by tgcol")
+        tdSql.checkData(0, 1, 20)
+
+        tdSql.query("select count(tbcol) from stb where ts < now + 4m interval(1d) group by tgcol")
+        tdSql.checkData(0, 1, 20)
+
+        self.checkStreamData("c1", 200)
+        self.checkStreamData("c2", 200)
+        self.checkStreamData("c3", 200)
+        self.checkStreamData("av", 9.5)
+        self.checkStreamData("su", 1900)
+        self.checkStreamData("mi", 0)
+        self.checkStreamData("ma", 19)
+        self.checkStreamData("fi", 0)
+        self.checkStreamData("la", 19)
+        #self.checkStreamData("wh", 200)
+        self.checkStreamData("as", 200)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+
diff --git a/tests/pytest/stream/new.py b/tests/pytest/stream/new.py
new file mode 100644
index 0000000000000000000000000000000000000000..eac93dc0e649f5d48481079d75851a27be270567
--- /dev/null
+++ b/tests/pytest/stream/new.py
@@ -0,0 +1,71 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        rowNum = 200
+        totalNum = 200
+        tdSql.prepare()
+
+        tdLog.info("=============== step1")
+        tdSql.execute("create table mt(ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)")
+        for i in range(5):
+            tdSql.execute("create table tb%d using mt tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute("insert into tb%d values(now + %ds, %d, %d)" % (i, j, j, j))
+        time.sleep(0.1)
+
+        tdLog.info("=============== step2")
+        tdSql.query("select count(*), count(tbcol), count(tbcol2) from mt interval(10s)")
+        tdSql.execute("create table st as select count(*), count(tbcol), count(tbcol2) from mt interval(10s)")
+
+        tdLog.info("=============== step3")
+        tdSql.waitedQuery("select * from st", 1, 120)
+        v = tdSql.getData(0, 3)
+        if v >= 51:
+            tdLog.exit("value is %d, which is larger than 51" % v)
+
+        tdLog.info("=============== step4")
+        for i in range(5, 10):
+            tdSql.execute("create table tb%d using mt tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute("insert into tb%d values(now + %ds, %d, %d)" % (i, j, j, j))
+
+        tdLog.info("=============== step5")
+        tdLog.sleep(40)
+        tdSql.waitedQuery("select * from st order by ts desc", 1, 120)
+        v = tdSql.getData(0, 3)
+        if v <= 51:
+            tdLog.exit("value is %d, which is smaller than 51" % v)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+
+
diff --git a/tests/pytest/stream/parser.py b/tests/pytest/stream/parser.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b231d2b391a8a5a92cb8924134555117c5bfed2
--- /dev/null
+++ b/tests/pytest/stream/parser.py
@@ -0,0 +1,182 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    '''
+    def bug2222(self):
+        tdSql.prepare()
+        tdSql.execute("create table superreal(ts timestamp, addr binary(5), val float) tags (deviceNo binary(20))")
+        tdSql.execute("create table real_001 using superreal tags('001')")
+        tdSql.execute("create table tj_001 as select sum(val) from real_001 interval(1m)")
+
+        t = datetime.datetime.now()
+        for i in range(60):
+            ts = t.strftime("%Y-%m-%d %H:%M")
+            t += datetime.timedelta(minutes=1)
+            sql = "insert into real_001 values('%s:0%d', '1', %d)" % (ts, 0, i)
+            for j in range(4):
+                sql += ",('%s:0%d', '%d', %d)" % (ts, j + 1, j + 1, i)
+            tdSql.execute(sql)
+            time.sleep(60 + random.random() * 60 - 30)
+    '''
+
+    def tbase300(self):
+        tdLog.debug("begin tbase300")
+
+        tdSql.prepare()
+        tdSql.execute("create table mt(ts timestamp, c1 int, c2 int) tags(t1 int)")
+        tdSql.execute("create table tb1 using mt tags(1)");
+        tdSql.execute("create table tb2 using mt tags(2)");
+        tdSql.execute("create table strm as select count(*), avg(c1), sum(c2), max(c1), min(c2),first(c1), last(c2) from mt interval(4s) sliding(2s)")
+        #tdSql.execute("create table strm as select count(*), avg(c1), sum(c2), max(c1), min(c2), first(c1) from mt interval(4s) sliding(2s)")
+        tdLog.sleep(10)
+        tdSql.execute("insert into tb2 values(now, 1, 1)");
+        tdSql.execute("insert into tb1 values(now, 1, 1)");
+        tdLog.sleep(4)
+        tdSql.query("select * from mt")
+        tdSql.query("select * from strm")
+        tdSql.execute("drop table tb1")
+
+        tdSql.waitedQuery("select * from strm", 1, 100)
+        if tdSql.queryRows < 1 or tdSql.queryRows > 2:
+            tdLog.exit("rows should be 1 or 2")
+
+        tdSql.execute("drop table tb2")
+        tdSql.execute("drop table mt")
+        tdSql.execute("drop table strm")
+
+    def tbase304(self):
+        tdLog.debug("begin tbase304")
+        # we cannot reset query cache in server side, as a workaround,
+        # set super table name to mt304, need to change back to mt later
+        tdSql.execute("create table mt304 (ts timestamp, c1 int) tags(t1 int, t2 int)")
+        tdSql.execute("create table tb1 using mt304 tags(1, 1)")
+        tdSql.execute("create table tb2 using mt304 tags(1, -1)")
+        time.sleep(0.1)
+        tdSql.execute("create table strm as select count(*), avg(c1) from mt304 where t2 >= 0 interval(4s) sliding(2s)")
+        tdSql.execute("insert into tb1 values (now,1)")
+        tdSql.execute("insert into tb2 values (now,2)")
+
+        tdSql.waitedQuery("select * from strm", 1, 100)
+        if tdSql.queryRows < 1 or tdSql.queryRows > 2:
+            tdLog.exit("rows should be 1 or 2")
+
+        tdSql.checkData(0, 1, 1)
+        tdSql.checkData(0, 2, 1.000000000)
+        tdSql.execute("alter table mt304 drop tag t2")
+        tdSql.execute("insert into tb2 values (now,2)")
+        tdSql.execute("insert into tb1 values (now,1)")
+        tdSql.query("select * from strm")
+        tdSql.execute("alter table mt304 add tag t2 int")
+        tdLog.sleep(1)
+        tdSql.query("select * from strm")
+
+    def wildcardFilterOnTags(self):
+        tdLog.debug("begin wildcardFilterOnTag")
+        tdSql.prepare()
+        tdSql.execute("create table stb (ts timestamp, c1 int, c2 binary(10)) tags(t1 binary(10))")
+        tdSql.execute("create table tb1 using stb tags('a1')")
+        tdSql.execute("create table tb2 using stb tags('b2')")
+        tdSql.execute("create table tb3 using stb tags('a3')")
+        tdSql.execute("create table strm as select count(*), avg(c1), first(c2) from stb where t1 like 'a%' interval(4s) sliding(2s)")
+        tdSql.query("describe strm")
+        tdSql.checkRows(4)
+
+        tdLog.sleep(1)
+        tdSql.execute("insert into tb1 values (now, 0, 'tb1')")
+        tdLog.sleep(4)
+        tdSql.execute("insert into tb2 values (now, 2, 'tb2')")
+        tdLog.sleep(4)
+        tdSql.execute("insert into tb3 values (now, 0, 'tb3')")
+
+        tdSql.waitedQuery("select * from strm", 4, 60)
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 2, 0.000000000)
+        if tdSql.getData(0, 3) == 'tb2':
+            tdLog.exit("unexpected value of data03")
+        if tdSql.getData(1, 3) == 'tb2':
+            tdLog.exit("unexpected value of data13")
+        if tdSql.getData(2, 3) == 'tb2':
+            tdLog.exit("unexpected value of data23")
+        if tdSql.getData(3, 3) == 'tb2':
+            tdLog.exit("unexpected value of data33")
+
+        tdLog.info("add table tb4 to see if stream still works correctly")
+        # The vnode client needs to refresh metadata cache to allow strm calculate tb4's data.
+        # But the current refreshing frequency is every 10 min
+        # commented out the case below to save running time
+        tdSql.execute("create table tb4 using stb tags('a4')")
+        tdSql.execute("insert into tb4 values(now, 4, 'tb4')")
+        tdSql.waitedQuery("select * from strm order by ts desc", 6, 60)
+        tdSql.checkRows(6)
+        tdSql.checkData(0, 2, 4)
+        tdSql.checkData(0, 3, "tb4")
+
+        tdLog.info("change tag values to see if stream still works correctly")
+        tdSql.execute("alter table tb4 set tag t1='b4'")
+        tdLog.sleep(3)
+        tdSql.execute("insert into tb1 values (now, 1, 'tb1_a1')")
+        tdLog.sleep(4)
+        tdSql.execute("insert into tb4 values (now, -4, 'tb4_b4')")
+        tdSql.waitedQuery("select * from strm order by ts desc", 8, 100)
+        tdSql.checkRows(8)
+        tdSql.checkData(0, 2, 1)
+        tdSql.checkData(0, 3, "tb1_a1")
+
+    def datatypes(self):
+        tdLog.debug("begin data types")
+        tdSql.prepare()
+        tdSql.execute("create table stb3 (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 binary(15), c6 nchar(15), c7 bool) tags(t1 int, t2 binary(15))")
+        tdSql.execute("create table tb0 using stb3 tags(0, 'tb0')")
+        tdSql.execute("create table tb1 using stb3 tags(1, 'tb1')")
+        tdSql.execute("create table tb2 using stb3 tags(2, 'tb2')")
+        tdSql.execute("create table tb3 using stb3 tags(3, 'tb3')")
+        tdSql.execute("create table tb4 using stb3 tags(4, 'tb4')")
+
+        tdSql.execute("create table strm0 as select count(ts), count(c1), max(c2), min(c4), first(c5), last(c6) from stb3 where ts < now + 30s interval(4s) sliding(2s)")
+        #tdSql.execute("create table strm0 as select count(ts), count(c1), max(c2), min(c4), first(c5) from stb where ts < now + 30s interval(4s) sliding(2s)")
+        tdLog.sleep(1)
+        tdSql.execute("insert into tb0 values (now, 0, 0, 0, 0, 'binary0', '涛思0', true) tb1 values (now, 1, 1, 1, 1, 'binary1', '涛思1', false) tb2 values (now, 2, 2, 2, 2, 'binary2', '涛思2', true) tb3 values (now, 3, 3, 3, 3, 'binary3', '涛思3', false) tb4 values (now, 4, 4, 4, 4, 'binary4', '涛思4', true) ")
+
+        tdSql.waitedQuery("select * from strm0 order by ts desc", 2, 120)
+        tdSql.checkRows(2)
+
+        tdSql.execute("insert into tb0 values (now, 10, 10, 10, 10, 'binary0', '涛思0', true) tb1 values (now, 11, 11, 11, 11, 'binary1', '涛思1', false) tb2 values (now, 12, 12, 12, 12, 'binary2', '涛思2', true) tb3 values (now, 13, 13, 13, 13, 'binary3', '涛思3', false) tb4 values (now, 14, 14, 14, 14, 'binary4', '涛思4', true) ")
+        tdSql.waitedQuery("select * from strm0 order by ts desc", 4, 120)
+        tdSql.checkRows(4)
+
+    def run(self):
+        self.tbase300()
+        self.tbase304()
+        self.wildcardFilterOnTags()
+        self.datatypes()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/stream1.py b/tests/pytest/stream/stream1.py
new file mode 100644
index 0000000000000000000000000000000000000000..c657379441e6da3137e3a1ceb8148ba9fa5ba9a5
--- /dev/null
+++ b/tests/pytest/stream/stream1.py
@@ -0,0 +1,142 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+
+        tdSql.prepare()
+
+        tdLog.info("===== step1 =====")
+        tdSql.execute(
+            "create table stb0(ts timestamp, col1 int, col2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb0 tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        tdLog.info("===== step2 =====")
+        tdSql.query(
+            "select count(*), count(col1), count(col2) from tb0 interval(1d)")
+        tdSql.checkData(0, 1, rowNum)
+        tdSql.checkData(0, 2, rowNum)
+        tdSql.checkData(0, 3, rowNum)
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum)
+        tdSql.execute(
+            "create table s0 as select count(*), count(col1), count(col2) from tb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step3 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum)
+            tdSql.checkData(0, 2, rowNum)
+            tdSql.checkData(0, 3, rowNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step4 =====")
+        tdSql.execute("drop table s0")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum)
+
+        tdLog.info("===== step5 =====")
+        tdSql.error("select * from s0")
+
+        tdLog.info("===== step6 =====")
+        time.sleep(0.1)
+        tdSql.execute(
+            "create table s0 as select count(*), count(col1), count(col2) from tb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step7 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum)
+            tdSql.checkData(0, 2, rowNum)
+            tdSql.checkData(0, 3, rowNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step8 =====")
+        tdSql.query(
+            "select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.checkData(0, 1, rowNum * tbNum)
+        tdSql.checkData(0, 2, rowNum * tbNum)
+        tdSql.checkData(0, 3, rowNum * tbNum)
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdSql.execute(
+            "create table s1 as select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 2)
+
+        tdLog.info("===== step9 =====")
+        tdSql.waitedQuery("select * from s1", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum * tbNum)
+            tdSql.checkData(0, 2, rowNum * tbNum)
+            tdSql.checkData(0, 3, rowNum * tbNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step10 =====")
+        tdSql.execute("drop table s1")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step11 =====")
+        tdSql.error("select * from s1")
+
+        tdLog.info("===== step12 =====")
+        tdSql.execute(
+            "create table s1 as select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 2)
+
+        tdLog.info("===== step13 =====")
+        tdSql.waitedQuery("select * from s1", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum * tbNum)
+            tdSql.checkData(0, 2, rowNum * tbNum)
+            tdSql.checkData(0, 3, rowNum * tbNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/stream/stream2.py b/tests/pytest/stream/stream2.py
new file mode 100644
index 0000000000000000000000000000000000000000..44882f59721c4967ebb3fea12e356bb7e95d71ae
--- /dev/null
+++ b/tests/pytest/stream/stream2.py
@@ -0,0 +1,151 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tbNum = 10
+        rowNum = 20
+        totalNum = tbNum * rowNum
+
+        tdSql.prepare()
+
+        tdLog.info("===== step1 =====")
+        tdSql.execute(
+            "create table stb0(ts timestamp, col1 int, col2 float) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb0 tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (now - %dm, %d, %d)" %
+                    (i, 1440 - j, j, j))
+        time.sleep(0.1)
+
+        tdLog.info("===== step2 =====")
+        tdSql.query("select count(col1) from tb0 interval(1d)")
+        tdSql.checkData(0, 1, rowNum)
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum)
+        tdSql.execute(
+            "create table s0 as select count(col1) from tb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step3 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step4 =====")
+        tdSql.execute("drop table s0")
+        tdSql.query("show tables")
+        try:
+            tdSql.checkRows(tbNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step5 =====")
+        tdSql.error("select * from s0")
+
+        tdLog.info("===== step6 =====")
+        tdSql.execute(
+            "create table s0 as select count(*), count(col1), count(col2) from tb0 interval(1d)")
+        tdSql.query("show tables")
+        try:
+            tdSql.checkRows(tbNum + 1)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step7 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum)
+            tdSql.checkData(0, 2, rowNum)
+            tdSql.checkData(0, 3, rowNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step8 =====")
+        tdSql.query(
+            "select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        try:
+            tdSql.checkData(0, 1, totalNum)
+            tdSql.checkData(0, 2, totalNum)
+            tdSql.checkData(0, 3, totalNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+        tdSql.execute(
+            "create table s1 as select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 2)
+
+        tdLog.info("===== step9 =====")
+        tdSql.waitedQuery("select * from s1", 1, 120)
+        try:
+            tdSql.checkData(0, 1, totalNum)
+            tdSql.checkData(0, 2, totalNum)
+            tdSql.checkData(0, 3, totalNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step10 =====")
+        tdSql.execute("drop table s1")
+        tdSql.query("show tables")
+        try:
+            tdSql.checkRows(tbNum + 1)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step11 =====")
+        tdSql.error("select * from s1")
+
+        tdLog.info("===== step12 =====")
+        tdSql.execute(
+            "create table s1 as select count(col1) from stb0 interval(1d)")
+        tdSql.query("show tables")
+        try:
+            tdSql.checkRows(tbNum + 2)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step13 =====")
+        tdSql.waitedQuery("select * from s1", 1, 120)
+        try:
+            tdSql.checkData(0, 1, totalNum)
+            #tdSql.checkData(0, 2, None)
+            #tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/subscribe/__init__.py b/tests/pytest/subscribe/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/subscribe/singlemeter.py b/tests/pytest/subscribe/singlemeter.py
new file mode 100644
index 0000000000000000000000000000000000000000..879e0a75ebdf29022990b5e2e250370620c74636
--- /dev/null
+++ b/tests/pytest/subscribe/singlemeter.py
@@ -0,0 +1,79 @@
+###################################################################
+ #		   Copyright (c) 2020 by TAOS Technologies, Inc.
+ #				     All rights reserved.
+ #
+ #  This file is proprietary and confidential to TAOS Technologies.
+ #  No part of this file may be reproduced, stored, transmitted, 
+ #  disclosed or used in any form or by any means other than as 
+ #  expressly provided by the written permission from Jianhui Tao
+ #
+###################################################################
+
+# -*- coding: utf-8 -*-  
+
+import sys
+import taos
+import time
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.sub import *
+
+class TDTestCase:
+	def init(self, conn, logSql):
+		tdLog.debug("start to execute %s" % __file__)
+		tdSql.init(conn.cursor(), logSql)
+		self.conn = conn
+
+	def run(self):
+		sqlstr = "select * from t0"
+		topic = "test"
+		now = int(time.time() * 1000)
+		tdSql.prepare()
+
+		tdLog.info("create a table and insert 10 rows.")
+		tdSql.execute("create table t0(ts timestamp, a int, b int);")
+		for i in range(0, 10):
+			tdSql.execute("insert into t0 values (%d, %d, %d);" % (now + i, i, i))
+
+		tdLog.info("consumption 01.")
+		tdSub.init(self.conn.subscribe(True, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(10)
+
+		tdLog.info("consumption 02: no new rows inserted")
+		tdSub.consume()
+		tdSub.checkRows(0)
+
+		tdLog.info("consumption 03: after one new rows inserted")
+		tdSql.execute("insert into t0 values (%d, 10, 10);" % (now + 10))
+		tdSub.consume()
+		tdSub.checkRows(1)
+
+		tdLog.info("consumption 04: keep progress and continue previous subscription")
+		tdSub.close(True)
+		tdSub.init(self.conn.subscribe(False, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(0)
+
+		tdLog.info("consumption 05: remove progress and continue previous subscription")
+		tdSub.close(False)
+		tdSub.init(self.conn.subscribe(False, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(11)
+
+		tdLog.info("consumption 06: keep progress and restart the subscription")
+		tdSub.close(True)
+		tdSub.init(self.conn.subscribe(True, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(11)
+
+		tdSub.close(True)
+
+	def stop(self):
+		tdSub.close(False)
+		tdSql.close()
+		tdLog.success("%s successfully executed" % __file__)
+	
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/subscribe/stability.py b/tests/pytest/subscribe/stability.py
new file mode 100644
index 0000000000000000000000000000000000000000..ddd8b3282a01843f912ce8e19b4baa790aa32bfa
--- /dev/null
+++ b/tests/pytest/subscribe/stability.py
@@ -0,0 +1,93 @@
+###################################################################
+ #		   Copyright (c) 2020 by TAOS Technologies, Inc.
+ #				     All rights reserved.
+ #
+ #  This file is proprietary and confidential to TAOS Technologies.
+ #  No part of this file may be reproduced, stored, transmitted, 
+ #  disclosed or used in any form or by any means other than as 
+ #  expressly provided by the written permission from Jianhui Tao
+ #
+###################################################################
+
+# -*- coding: utf-8 -*-  
+
+import sys
+import taos
+import time
+import random
+import string
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.sub import *
+
+class TDTestCase:
+    maxTables = 10000
+    maxCols = 50
+    rowsPerSecond = 1000
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdLog.notice("NOTE: this case does not stop automatically, Ctrl+C to stop")
+        tdSql.init(conn.cursor(), logSql)
+        self.conn = conn
+
+
+    def generateString(self, length):
+        chars = string.ascii_uppercase + string.ascii_lowercase
+        v = ""
+        for i in range(length):
+            v += random.choice(chars)
+        return v
+
+
+    def insert(self):
+        id = random.randint(0, self.maxTables - 1)
+        cola = self.generateString(40)
+        sql = "insert into car%d values(now, '%s', %f, %d" % (id, cola, random.random()*100, random.randint(0, 2))
+        for i in range(self.maxCols):
+            sql += ", %d" % random.randint(0, self.maxTables)
+        sql += ")"
+        tdSql.execute(sql)
+
+
+    def prepare(self):
+        tdLog.info("prepare database: test")
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists test')
+        tdSql.execute('create database test')
+        tdSql.execute('use test')
+
+    def run(self):
+        self.prepare()
+
+        sql = "create table cars (ts timestamp, a binary(50), b float, c bool"
+        for i in range(self.maxCols):
+            sql += ", c%d int" % i
+        sql += ") tags(id int, category binary(30), brand binary(30));"
+        tdSql.execute(sql)
+
+        for i in range(self.maxTables):
+            tdSql.execute("create table car%d using cars tags(%d, 'category%d', 'brand%d')" % (i, i, i % 30, i // 30))
+
+        time.sleep(0.1)
+
+        total = 0
+        while True:
+            start = time.time()
+            for i in range(self.rowsPerSecond):
+                self.insert()
+                total = total + 1
+            d = time.time() - start
+            tdLog.info("%d rows inserted in %f seconds, total %d" % (self.rowsPerSecond, d, total))
+            if d < 1:
+                time.sleep(1 - d)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/subscribe/supertable.py b/tests/pytest/subscribe/supertable.py
new file mode 100644
index 0000000000000000000000000000000000000000..ee3aa225bd79a6709a06672df76d7e7163f7a831
--- /dev/null
+++ b/tests/pytest/subscribe/supertable.py
@@ -0,0 +1,122 @@
+###################################################################
+ #		   Copyright (c) 2020 by TAOS Technologies, Inc.
+ #				     All rights reserved.
+ #
+ #  This file is proprietary and confidential to TAOS Technologies.
+ #  No part of this file may be reproduced, stored, transmitted, 
+ #  disclosed or used in any form or by any means other than as 
+ #  expressly provided by the written permission from Jianhui Tao
+ #
+###################################################################
+
+# -*- coding: utf-8 -*-  
+
+import sys
+import taos
+import time
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.sub import *
+
+class TDTestCase:
+	def init(self, conn, logSql):
+		tdLog.debug("start to execute %s" % __file__)
+		tdSql.init(conn.cursor(), logSql)
+		self.conn = conn
+
+	def run(self):
+		sqlstr = "select * from meters"
+		topic = "test"
+		now = int(time.time() * 1000)
+		tdSql.prepare()
+
+		numTables = 2000
+		rowsPerTable = 5
+		totalRows = numTables * rowsPerTable
+		tdLog.info("create a super table and %d sub-tables, then insert %d rows into each sub-table." % (numTables, rowsPerTable))
+		tdSql.execute("create table meters(ts timestamp, a int, b int) tags(area int, loc binary(20));")
+		for i in range(0, numTables):
+			for j in range(0, rowsPerTable):
+				tdSql.execute("insert into t%d using meters tags(%d, 'area%d') values (%d, %d, %d);" % (i, i, i, now + j, j, j))
+
+		tdLog.info("consumption 01.")
+		tdSub.init(self.conn.subscribe(True, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(totalRows)
+
+		tdLog.info("consumption 02: no new rows inserted")
+		tdSub.consume()
+		tdSub.checkRows(0)
+
+		tdLog.info("consumption 03: after one new rows inserted")
+		tdSql.execute("insert into t0 values (%d, 10, 10);" % (now + 10))
+		tdSub.consume()
+		tdSub.checkRows(1)
+
+		tdLog.info("consumption 04: keep progress and continue previous subscription")
+		tdSub.close(True)
+		tdSub.init(self.conn.subscribe(False, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(0)
+
+		tdLog.info("consumption 05: remove progress and continue previous subscription")
+		tdSub.close(False)
+		tdSub.init(self.conn.subscribe(False, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(totalRows + 1)
+
+		tdLog.info("consumption 06: keep progress and restart the subscription")
+		tdSub.close(True)
+		tdSub.init(self.conn.subscribe(True, topic, sqlstr, 0))
+		tdSub.consume()
+		tdSub.checkRows(totalRows + 1)
+
+		tdLog.info("consumption 07: insert one row to two table then remove one table")
+		tdSql.execute("insert into t0 values (%d, 11, 11);" % (now + 11))
+		tdSql.execute("insert into t%d values (%d, 11, 11);" % ((numTables-1), (now + 11)))
+		tdSql.execute("drop table t0")
+		tdSub.consume()
+		tdSub.checkRows(1)
+
+		tdLog.info("consumption 08: check timestamp criteria")
+		tdSub.close(False)
+		tdSub.init(self.conn.subscribe(True, topic, sqlstr + " where ts > %d" % now, 0))
+		tdSub.consume()
+		tdSub.checkRows((numTables-1) * (rowsPerTable-1) + 1)
+
+		tdLog.info("consumption 09: insert large timestamp to t2 then insert smaller timestamp to t1")
+		tdSql.execute("insert into t2 values (%d, 100, 100);" % (now + 100))
+		tdSub.consume()
+		tdSub.checkRows(1)
+		tdSql.execute("insert into t1 values (%d, 12, 12);" % (now + 12))
+		tdSub.consume()
+		tdSub.checkRows(1)
+
+		tdLog.info("consumption 10: field criteria")
+		tdSub.close(True)
+		tdSub.init(self.conn.subscribe(False, topic, sqlstr + " where a > 100", 0))
+		tdSql.execute("insert into t2 values (%d, 101, 100);" % (now + 101))
+		tdSql.execute("insert into t2 values (%d, 100, 100);" % (now + 102))
+		tdSql.execute("insert into t2 values (%d, 102, 100);" % (now + 103))
+		tdSub.consume()
+		tdSub.checkRows(2)
+
+		tdLog.info("consumption 11: two vnodes")
+		tdSql.execute("insert into t2 values (%d, 102, 100);" % (now + 104))
+		tdSql.execute("insert into t1299 values (%d, 102, 100);" % (now + 104))
+		tdSub.consume()
+		tdSub.checkRows(2)
+
+		tdLog.info("consumption 12: create a new table")
+		tdSql.execute("insert into t%d using meters tags(%d, 'area%d') values (%d, 102, 100);" % (numTables, numTables, numTables, now + 105))
+		tdSub.consume()
+		tdSub.checkRows(1)
+
+	def stop(self):
+		tdSub.close(False)
+		tdSql.close()
+		tdLog.success("%s successfully executed" % __file__)
+	
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/__init__.py b/tests/pytest/table/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/table/alter_column.py b/tests/pytest/table/alter_column.py
new file mode 100644
index 0000000000000000000000000000000000000000..73fdbe1ae91c71e0ce9a1574239dbee9ec3fd988
--- /dev/null
+++ b/tests/pytest/table/alter_column.py
@@ -0,0 +1,88 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, db_test.stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdLog.info("create database and table")
+        tdSql.execute("create database db_test")
+        tdSql.execute(
+            "create table if not exists db_test.st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists db_test.dev_001 using db_test.st tags('dev_01')")
+
+        print("==============step2")
+        tdLog.info("alter table add column")
+        tdSql.execute(
+            "ALTER TABLE db_test.st add COLUMN tag_version nchar(20)")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(4)
+
+        print("==============step3")
+        tdLog.info("alter table drop column")
+        tdSql.execute("ALTER TABLE db_test.st drop COLUMN tag_version")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(3)
+
+        print("==============step4")
+        tdLog.info("drop table")
+        tdSql.execute("drop table db_test.st")
+        tdSql.execute(
+            "create table if not exists db_test.st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists db_test.dev_001 using db_test.st tags('dev_01')")
+        tdSql.execute(
+            "INSERT INTO db_test.dev_001 VALUES ('2020-05-13 10:00:00.000', 1)")
+        tdSql.query("select * from db_test.dev_001")
+        tdSql.checkRows(1)
+
+        print("==============step5")
+        tdLog.info("alter table add column")
+        tdSql.execute(
+            "ALTER TABLE db_test.st add COLUMN tag_version nchar(20)")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(4)
+
+        tdSql.execute(
+            "INSERT INTO db_test.dev_001 VALUES ('2020-05-13 10:00:00.010', 1, '1.2.1')")
+        tdSql.query("select * from db_test.st")
+        tdSql.checkRows(2)
+
+        print("==============step6")
+        tdLog.info("alter table drop column")
+        tdSql.execute("ALTER TABLE db_test.st drop COLUMN tag_version")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/boundary.py b/tests/pytest/table/boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..a1bf096499d7c3c4f3ad5ec3e57878a510935f5c
--- /dev/null
+++ b/tests/pytest/table/boundary.py
@@ -0,0 +1,182 @@
+# -*- coding: utf-8 -*-
+
+import random
+import string
+import subprocess
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def getLimitFromSourceCode(self, name):
+        cmd = "grep -w '#define %s' ../../src/inc/taosdef.h|awk '{print $3}'" % name
+        return int(subprocess.check_output(cmd, shell=True))
+
+    def generateString(self, length):
+        chars = string.ascii_uppercase + string.ascii_lowercase
+        v = ""
+        for i in range(length):
+            v += random.choice(chars)
+        return v
+
+    def checkTagBoundaries(self):
+        tdLog.debug("checking tag boundaries")
+        tdSql.prepare()
+
+        maxTags = self.getLimitFromSourceCode('TSDB_MAX_TAGS')
+        totalTagsLen = self.getLimitFromSourceCode('TSDB_MAX_TAGS_LEN')
+        tdLog.notice("max tags is %d" % maxTags)
+        tdLog.notice("max total tag length is %d" % totalTagsLen)
+
+        # for binary tags, 2 bytes are used for length
+        tagLen = (totalTagsLen - maxTags * 2) // maxTags
+        firstTagLen = totalTagsLen - 2 * maxTags - tagLen * (maxTags - 1)
+
+        sql = "create table cars(ts timestamp, f int) tags(t0 binary(%d)" % firstTagLen
+        for i in range(1, maxTags):
+            sql += ", t%d binary(%d)" % (i, tagLen)
+        sql += ");"
+
+        tdLog.debug("creating super table: " + sql)
+        tdSql.execute(sql)
+        tdSql.query('show stables')
+        tdSql.checkRows(1)
+
+        for i in range(10):
+            sql = "create table car%d using cars tags('%d'" % (i, i)
+            sql += ", '0'" * (maxTags - 1) + ");"
+            tdLog.debug("creating table: " + sql)
+            tdSql.execute(sql)
+
+            sql = "insert into car%d values(now, 0);" % i
+            tdLog.debug("inserting data: " + sql)
+            tdSql.execute(sql)
+
+        tdSql.query('show tables')
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+
+        tdSql.query('select * from cars;')
+        tdSql.checkRows(10)
+
+    def checkColumnBoundaries(self):
+        tdLog.debug("checking column boundaries")
+        tdSql.prepare()
+
+        # one column is for timestamp
+        maxCols = self.getLimitFromSourceCode('TSDB_MAX_COLUMNS') - 1
+
+        sql = "create table cars (ts timestamp"
+        for i in range(maxCols):
+            sql += ", c%d int" % i
+        sql += ");"
+        tdSql.execute(sql)
+        tdSql.query('show tables')
+        tdSql.checkRows(1)
+
+        sql = "insert into cars values (now"
+        for i in range(maxCols):
+            sql += ", %d" % i
+        sql += ");"
+        tdSql.execute(sql)
+        tdSql.query('select * from cars')
+        tdSql.checkRows(1)
+
+    def checkTableNameBoundaries(self):
+        tdLog.debug("checking table name boundaries")
+        tdSql.prepare()
+
+        maxTableNameLen = self.getLimitFromSourceCode('TSDB_TABLE_NAME_LEN')
+        tdLog.notice("table name max length is %d" % maxTableNameLen)
+
+        # create a super table with name exceed max length
+        sname = self.generateString(maxTableNameLen)
+        tdLog.info("create a super table with length %d" % len(sname))
+        tdSql.error(
+            "create table %s (ts timestamp, value int) tags(id int)" %
+            sname)
+
+        # create a super table with name of max length
+        sname = self.generateString(maxTableNameLen - 1)
+        tdLog.info("create a super table with length %d" % len(sname))
+        tdSql.execute(
+            "create table %s (ts timestamp, value int) tags(id int)" %
+            sname)
+        tdLog.info("check table count, should be one")
+        tdSql.query('show stables')
+        tdSql.checkRows(1)
+
+        # create a child table with name exceed max length
+        name = self.generateString(maxTableNameLen)
+        tdLog.info("create a child table with length %d" % len(name))
+        tdSql.error("create table %s using %s tags(0)" % (name, sname))
+
+        # create a child table with name of max length
+        name = self.generateString(maxTableNameLen - 1)
+        tdLog.info("create a child table with length %d" % len(name))
+        tdSql.execute("create table %s using %s tags(0)" % (name, sname))
+        tdSql.query('show tables')
+        tdSql.checkRows(1)
+
+        # insert one row
+        tdLog.info("insert one row of data")
+        tdSql.execute("insert into %s values(now, 0)" % name)
+        tdSql.query("select * from " + name)
+        tdSql.checkRows(1)
+        tdSql.query("select * from " + sname)
+        tdSql.checkRows(1)
+
+        name = name[:len(name) - 1]
+        tdSql.error("select * from " + name)
+        tdSql.checkRows(0)
+
+    def checkRowBoundaries(self):
+        tdLog.debug("checking row boundaries")
+        tdSql.prepare()
+
+        # 8 bytes for timestamp
+        maxRowSize = self.getLimitFromSourceCode('TSDB_MAX_BYTES_PER_ROW') - 8
+        maxCols = self.getLimitFromSourceCode('TSDB_MAX_COLUMNS') - 1
+
+        # for binary cols, 2 bytes are used for length
+        colLen = (maxRowSize - maxCols * 2) // maxCols
+        firstColLen = maxRowSize - 2 * maxCols - colLen * (maxCols - 1)
+
+        sql = "create table cars (ts timestamp, c0 binary(%d)" % firstColLen
+        for i in range(1, maxCols):
+            sql += ", c%d binary(%d)" % (i, colLen)
+        sql += ");"
+        tdSql.execute(sql)
+        tdSql.query('show tables')
+        tdSql.checkRows(1)
+
+        col = self.generateString(firstColLen)
+        sql = "insert into cars values (now, '%s'" % col
+        col = self.generateString(colLen)
+        for i in range(1, maxCols):
+            sql += ", '%s'" % col
+        sql += ");"
+        tdLog.info(sql)
+        tdSql.execute(sql)
+        tdSql.query("select * from cars")
+        tdSql.checkRows(1)
+
+    def run(self):
+        self.checkTagBoundaries()
+        self.checkColumnBoundaries()
+        self.checkTableNameBoundaries()
+        self.checkRowBoundaries()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/column_name.py b/tests/pytest/table/column_name.py
new file mode 100644
index 0000000000000000000000000000000000000000..a180d3f752f36626c1c55adade24584a208dbe8d
--- /dev/null
+++ b/tests/pytest/table/column_name.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import string
+import random
+import subprocess
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('drop table dd -x step0')
+        tdSql.error('drop table dd')
+        tdLog.info('create table tb(ts timestamp, int) -x step1')
+        tdSql.error('create table tb(ts timestamp, int)')
+        # TSIM: return -1
+        # TSIM: step1:
+        # TSIM:
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql create table $tb (ts timestamp, s int)
+        tdLog.info('create table tb (ts timestamp, s int)')
+        tdSql.execute('create table tb (ts timestamp, s int)')
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql drop table $tb
+        tdLog.info('drop table tb')
+        tdSql.execute('drop table tb')
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql create table $tb (ts timestamp, a0123456789 int)
+        tdLog.info('create table tb (ts timestamp, a0123456789 int)')
+        tdSql.execute('create table tb (ts timestamp, a0123456789 int)')
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql drop table $tb
+        tdLog.info('drop table tb')
+        tdSql.execute('drop table tb')
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql create table $tb (ts timestamp,
+        # a0123456789012345678901234567890123456789 int)
+        getMaxColNum = "grep -w '#define TSDB_COL_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
+        boundary = int(subprocess.check_output(getMaxColNum, shell=True))
+        tdLog.info("get max column name length is %d" % boundary)
+        chars = string.ascii_uppercase + string.ascii_lowercase
+
+#        col_name = ''.join(random.choices(chars, k=boundary+1))
+#        tdLog.info(
+#            'create table tb (ts timestamp, %s int), col_name length is %d' % (col_name, len(col_name)))
+#        tdSql.error(
+#            'create table tb (ts timestamp, %s int)' % col_name)
+
+        col_name = ''.join(random.choices(chars, k=boundary))
+        tdLog.info(
+            'create table tb (ts timestamp, %s int), col_name length is %d' %
+            (col_name, len(col_name)))
+        tdSql.execute(
+            'create table tb (ts timestamp, %s int)' % col_name)
+
+        # TSIM: sql insert into $tb values (now , 1)
+        tdLog.info("insert into tb values (now , 1)")
+        tdSql.execute("insert into tb values (now , 1)")
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/column_num.py b/tests/pytest/table/column_num.py
new file mode 100644
index 0000000000000000000000000000000000000000..3abedb083c8b68c3f3f06b094e06a3d9c686b82e
--- /dev/null
+++ b/tests/pytest/table/column_num.py
@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import subprocess
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('create table tb() -x step1')
+        tdSql.error('create table tb()')
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        tdLog.info('=============== step2')
+        # TSIM: sql create table $tb (ts timestamp)  -x step2
+        tdLog.info('create table tb (ts timestamp)  -x step2')
+        tdSql.error('create table tb (ts timestamp) ')
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        tdLog.info('=============== step3')
+        tdLog.info('create table tb (ts int)  -x step3')
+        tdSql.error('create table tb (ts int) ')
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        tdLog.info('=============== step4')
+        tdLog.info('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)')
+        tdSql.execute('create table tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)')
+        # TSIM:
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+
+        tdLog.info('=============== step5')
+
+        getMaxColumnNum = "grep -w '#define TSDB_MAX_COLUMNS' ../../src/inc/taosdef.h|awk '{print $3}'"
+        boundary = int(subprocess.check_output(getMaxColumnNum, shell=True))
+        tdLog.info("get max column number is %d" % boundary)
+
+        columnSeq = "ts timestamp"
+        for x in range(0, boundary):
+            columnSeq = columnSeq + ", col%d int" % x
+
+        tdLog.info("create table tb1 (%s)" % columnSeq)
+        tdSql.error('create table tb1 (%s)' % columnSeq)
+
+        columnSeq = "ts timestamp"
+        for x in range(0, boundary - 1):
+            columnSeq = columnSeq + ", col%d int" % x
+
+        tdLog.info("create table tb1 (%s)" % columnSeq)
+        tdSql.execute('create table tb1 (%s)' % columnSeq)
+
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 2 then
+        tdLog.info('tdSql.checkRow(2)')
+        tdSql.checkRows(2)
+
+        data = "now"
+        for x in range(0, boundary - 1):
+            data = data + ", %d" % x
+        tdLog.info("insert into tb1 values (%s)" % data)
+        tdSql.execute("insert into tb1 values (%s)" % data)
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from tb1')
+        tdSql.query('select * from tb1')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql drop table $tb
+        tdLog.info('drop table tb1')
+        tdSql.execute('drop table tb1')
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/create-a-lot.py b/tests/pytest/table/create-a-lot.py
new file mode 100644
index 0000000000000000000000000000000000000000..7db4a8eacac9ede3d47e14bee1a4fc901c0ab270
--- /dev/null
+++ b/tests/pytest/table/create-a-lot.py
@@ -0,0 +1,45 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        print("prepare data")
+
+        for x in range(0, 1000000):
+            tb_name = "tb%d" % x
+            tdLog.info("create table %s (ts timestamp, i int)" % tb_name)
+            tdSql.execute("create table %s (ts timestamp, i int)" % tb_name)
+            tdLog.info("insert into %s values(now, 1)" % tb_name)
+            tdSql.execute("insert into %s values(now, 1)" % tb_name)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/create.py b/tests/pytest/table/create.py
new file mode 100644
index 0000000000000000000000000000000000000000..8fedd4e92046f58a94db66a1e696edfe5d253982
--- /dev/null
+++ b/tests/pytest/table/create.py
@@ -0,0 +1,48 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        print("prepare data")
+        tdSql.execute("create table db.st (ts timestamp, i int) tags(j int)")
+        tdSql.execute("create table db.tb using st tags(1)")
+        tdSql.execute("insert into db.tb values(now, 1)")
+
+        print("==============step2")
+        print("create table as select")
+        try:
+            tdSql.execute("create table db.test as select * from db.st")
+        except Exception as e:
+            tdLog.exit(e)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/db_table.py b/tests/pytest/table/db_table.py
new file mode 100644
index 0000000000000000000000000000000000000000..5ead829e26e8e6a64fdb28af6ad34499663df7b2
--- /dev/null
+++ b/tests/pytest/table/db_table.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdLog.info('=============== step1')
+        tdLog.info('=============== step2')
+        tdLog.info('create table tb (ts timestamp, speed int)')
+        tdSql.execute('create table tb (ts timestamp, speed int)')
+        tdLog.info('=============== step3')
+        tdLog.info("insert into tb values (now, 1)")
+        tdSql.execute("insert into tb values (now, 1)")
+        tdLog.info('=============== step4')
+        tdLog.info('select * from tb')
+        tdSql.query('select * from tb')
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        tdLog.info('=============== step5')
+        tdLog.info('describe tb')
+        tdSql.query('describe tb')
+        tdLog.info('=============== step6')
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/del_stable.py b/tests/pytest/table/del_stable.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b078ac519df1e364e394c2b2fdd83e1ea424ca9
--- /dev/null
+++ b/tests/pytest/table/del_stable.py
@@ -0,0 +1,49 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute("create table db.st (ts timestamp, i int) tags(j int)")
+        tdSql.execute("create table db.tb using st tags(1)")
+        tdSql.execute("insert into db.tb values(now, 1)")
+
+        print("==============step2")
+        try:
+            tdSql.execute("drop table db.st")
+        except Exception as e:
+            tdLog.exit(e)
+
+        tdSql.error("select * from db.st")
+        tdSql.error("select * from db.tb")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/table/tablename-boundary.py b/tests/pytest/table/tablename-boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..0755e7535577b32c52539ab46259b53096455808
--- /dev/null
+++ b/tests/pytest/table/tablename-boundary.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import string
+import random
+import subprocess
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        getTableNameLen = "grep -w '#define TSDB_TABLE_NAME_LEN' ../../src/inc/taosdef.h|awk '{print $3}'"
+        tableNameMaxLen = int(
+            subprocess.check_output(
+                getTableNameLen,
+                shell=True)) - 1
+        tdLog.info("table name max length is %d" % tableNameMaxLen)
+        chars = string.ascii_uppercase + string.ascii_lowercase
+        tb_name = ''.join(random.choices(chars, k=tableNameMaxLen))
+        tdLog.info('tb_name length %d' % len(tb_name))
+        tdLog.info('create table %s (ts timestamp, value int)' % tb_name)
+        tdSql.error(
+            'create table %s (ts timestamp, speed binary(4089))' %
+            tb_name)
+
+        tb_name = ''.join(random.choices(chars, k=191))
+        tdLog.info('tb_name length %d' % len(tb_name))
+        tdLog.info('create table %s (ts timestamp, value int)' % tb_name)
+        tdSql.execute(
+            'create table %s (ts timestamp, speed binary(4089))' %
+            tb_name)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/3.py b/tests/pytest/tag_lite/3.py
new file mode 100644
index 0000000000000000000000000000000000000000..373db1c70fcc67eec7f4abae4e6264cad7fddf64
--- /dev/null
+++ b/tests/pytest/tag_lite/3.py
@@ -0,0 +1,1332 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        dbPrefix = "ta_3_db"
+        tbPrefix = "ta_3_tb"
+        mtPrefix = "ta_3_mt"
+        tbNum = 10
+        rowNum = 20
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        i = 0
+        db = "%s%d" % (dbPrefix, i)
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool,
+        # tgcol2 int, tgcol3 float)
+        tdLog.info(
+            "create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 float)" %
+            mt)
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 float)' %
+            mt)
+        # TSIM:
+        i = 0
+        while (i < 5):
+            tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using %s tags( 0, 0, 0 )
+            tdLog.info("create table %s using %s tags( 0, 0, 0 )" % (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 0, 0, 0 )' %
+                (tb, mt))
+
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+        # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                x = x + 1
+        # TSIM: endw
+            i = i + 1
+        # TSIM: endw
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using %s tags( 1, 1, 1 )
+            tdLog.info("create table %s using %s tags( 1, 1, 1 )" % (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 1, 1, 1 )' %
+                (tb, mt))
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+                tdLog.info(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                x = x + 1
+        # TSIM: endw
+            i = i + 1
+        # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from %s
+        tdLog.info('select * from %s' % mt)
+        tdSql.query('select * from %s' % mt)
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow(%d)' % totalNum)
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from %s where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % mt)
+        tdSql.query('select * from %s where ts < now + 4m' % mt)
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % mt)
+        tdSql.query('select * from %s where ts > now + 4m' % mt)
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % mt)
+        tdSql.query('select * from %s where ts = now + 4m' % mt)
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            mt)
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from %s where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % mt)
+        tdSql.query('select * from %s where tgcol1 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 0' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % mt)
+        tdSql.query('select * from %s where tgcol1 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 1' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = true
+        tdLog.info('select * from %s where tgcol1 = true' % mt)
+        tdSql.query('select * from %s where tgcol1 = true' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> true
+        tdLog.info('select * from %s where tgcol1 <> true' % mt)
+        tdSql.query('select * from %s where tgcol1 <> true' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = false
+        tdLog.info('select * from %s where tgcol1 = false' % mt)
+        tdSql.query('select * from %s where tgcol1 = false' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> false
+        tdLog.info('select * from %s where tgcol1 <> false' % mt)
+        tdSql.query('select * from %s where tgcol1 <> false' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from %s where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where tgcol2 = 0' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol2 <> 0' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where tgcol2 = 1' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol2 <> 1' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from %s where tgcol3 = 0
+        tdLog.info('select * from %s where tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where tgcol3 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 <> 0
+        tdLog.info('select * from %s where tgcol3 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol3 <> 0' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 = 1
+        tdLog.info('select * from %s where tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where tgcol3 = 1' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 <> 1
+        tdLog.info('select * from %s where tgcol3 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol3 <> 1' % mt)
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = true' %
+            mt)
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> true' %
+            mt)
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = false' %
+            mt)
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> false' %
+            mt)
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = false' %
+            mt)
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> false' %
+            mt)
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> false
+        # and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> false and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> false and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1 and
+        # tgcol1 = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = true' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol1 <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and
+        # tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # tgcol1 = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = true' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol1 <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol1 = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol1 <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true and tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' % mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step17
+        tdLog.info('=============== step17')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true
+        # group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1  group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1  group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1  group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step18
+        tdLog.info('=============== step18')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true and tgcol2 = 1  group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2' % mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step19
+        tdLog.info('=============== step19')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/4.py b/tests/pytest/tag_lite/4.py
new file mode 100644
index 0000000000000000000000000000000000000000..aae930ecdf67c04040c47115daad3e2b662915e9
--- /dev/null
+++ b/tests/pytest/tag_lite/4.py
@@ -0,0 +1,1877 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM: sql reset query cache
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        dbPrefix = "ta_4_db"
+        tbPrefix = "ta_4_tb"
+        mtPrefix = "ta_4_mt"
+        tbNum = 10
+        rowNum = 20
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        i = 0
+        db = "%s%d" % (dbPrefix, i)
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table %s (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)
+        tdLog.info(
+            "create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)" %
+            mt)
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)' %
+            mt)
+        # TSIM:
+        i = 0
+        while (i < 5):
+            tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using %s tags( 0, 0, 0, 0 )
+            tdLog.info(
+                "create table %s using %s tags( 0, 0, 0, 0 )" %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 0, 0, 0, 0 )' %
+                (tb, mt))
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+        # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                x = x + 1
+        # TSIM: endw
+            i = i + 1
+        # TSIM: endw
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using %s tags( 1, 1, 1, 1 )
+            tdLog.info(
+                "create table %s using %s tags( 1, 1, 1, 1 )" %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 1, 1, 1, 1 )' %
+                (tb, mt))
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+        # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s, %d)" %
+                    (tb, ms, x))
+                x = x + 1
+        # TSIM: endw
+            i = i + 1
+        # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from %s
+        tdLog.info('select * from %s' % mt)
+        tdSql.query('select * from %s' % mt)
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from %s where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % mt)
+        tdSql.query('select * from %s where ts < now + 4m' % mt)
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % mt)
+        tdSql.query('select * from %s where ts > now + 4m' % mt)
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % mt)
+        tdSql.query('select * from %s where ts = now + 4m' % mt)
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from %s where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % mt)
+        tdSql.query('select * from %s where tgcol1 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % mt)
+        tdSql.query('select * from %s where tgcol1 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % mt)
+        tdSql.query('select * from %s where tgcol1 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % mt)
+        tdSql.query('select * from %s where tgcol1 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol1 <> 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from %s where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where tgcol2 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol2 <> 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where tgcol2 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol2 <> 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from %s where tgcol3 = 0
+        tdLog.info('select * from %s where tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where tgcol3 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 <> 0
+        tdLog.info('select * from %s where tgcol3 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol3 <> 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 = 1
+        tdLog.info('select * from %s where tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where tgcol3 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol3 <> 1
+        tdLog.info('select * from %s where tgcol3 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol3 <> 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from %s where tgcol4 = 0
+        tdLog.info('select * from %s where tgcol4 = 0' % mt)
+        tdSql.query('select * from %s where tgcol4 = 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol4 <> 0
+        tdLog.info('select * from %s where tgcol4 <> 0' % mt)
+        tdSql.query('select * from %s where tgcol4 <> 0' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % mt)
+        tdSql.query('select * from %s where tgcol4 = 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where tgcol4 <> 1
+        tdLog.info('select * from %s where tgcol4 <> 1' % mt)
+        tdSql.query('select * from %s where tgcol4 <> 1' % mt)
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol1 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol1 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol1 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol1 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol1 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol1 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol1 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol2 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol2 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol2 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol2 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol2 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol3 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol3 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol3 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol3 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol3 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol4 = 1' % mt)
+        tdSql.query('select * from %s where ts > now + 4m and tgcol4 = 1' % mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol4 <> 1' % mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol4 = 0' % mt)
+        tdSql.query('select * from %s where ts < now + 4m and tgcol4 = 0' % mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol4 <> 0' % mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0
+        tdLog.info('select * from %s where ts <= now + 4m and tgcol4 = 0' % mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 = 1 and
+        # tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol2 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 = 1 and
+        # tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol3 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol1 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step17
+        tdLog.info('=============== step17')
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            mt)
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from %s where ts > now + 4m and tgcol4 <> 0 and ts
+        # < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            mt)
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step18
+        tdLog.info('=============== step18')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step19
+        tdLog.info('=============== step19')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step20
+        tdLog.info('=============== step20')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step21
+        tdLog.info('=============== step21')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step22
+        tdLog.info('=============== step22')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group
+        # by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1  group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step23
+        tdLog.info('=============== step23')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m
+        # group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' % mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and
+        # tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
+        # tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step24
+        tdLog.info('=============== step24')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % mt)
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/5.py b/tests/pytest/tag_lite/5.py
new file mode 100644
index 0000000000000000000000000000000000000000..b3608bebee649b38b0d1315cc1cb97a43d5365e6
--- /dev/null
+++ b/tests/pytest/tag_lite/5.py
@@ -0,0 +1,2306 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM: sql reset query cache
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_5_db
+        # TSIM: $tbPrefix = ta_5_tb
+        tbPrefix = "ta_5_tb"
+        # TSIM: $mtPrefix = ta_5_mt
+        mtPrefix = "ta_5_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 binary(20))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0, 0, 0, 0, 0 )
+            tdLog.info(
+                'create table %s using %s tags( 0, 0, 0, 0, 0 )' %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 0, 0, 0, 0, 0 )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s, %d)' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s, %d)' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1, 1, 1, 1, 1 )
+            tdLog.info(
+                'create table %s using %s tags( 1, 1, 1, 1, 1 )' %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( 1, 1, 1, 1, 1 )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s, %d)' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s, %d)' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where tgcol3 = 0
+        tdLog.info('select * from %s where tgcol3 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 <> 0
+        tdLog.info('select * from %s where tgcol3 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol3 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from %s where tgcol3 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 <> 1
+        tdLog.info('select * from %s where tgcol3 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol3 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where tgcol4 = 0
+        tdLog.info('select * from %s where tgcol4 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 <> 0
+        tdLog.info('select * from %s where tgcol4 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol4 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 <> 1
+        tdLog.info('select * from %s where tgcol4 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where tgcol5 = 0
+        tdLog.info('select * from %s where tgcol5 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 <> 0
+        tdLog.info('select * from %s where tgcol5 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol5 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 = 1
+        tdLog.info('select * from %s where tgcol5 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 <> 1
+        tdLog.info('select * from %s where tgcol5 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol5 <> 0 and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step17
+        tdLog.info('=============== step17')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step18
+        tdLog.info('=============== step18')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step19
+        tdLog.info('=============== step19')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step20
+        tdLog.info('=============== step20')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
+        # tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and
+        # tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step21
+        tdLog.info('=============== step21')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step22
+        tdLog.info('=============== step22')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step23
+        tdLog.info('=============== step23')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
+        # tgcol5 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step24
+        tdLog.info('=============== step24')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol5' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol5' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step25
+        tdLog.info('=============== step25')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group
+        # by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1  group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by
+        # tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step26
+        tdLog.info('=============== step26')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
+        # tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
+        # tgcol5 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step27
+        tdLog.info('=============== step27')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d)
+        # group by tgcol5
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/6.py b/tests/pytest/tag_lite/6.py
new file mode 100644
index 0000000000000000000000000000000000000000..b789e41794449e4ec97d03423bfcd03703f7604b
--- /dev/null
+++ b/tests/pytest/tag_lite/6.py
@@ -0,0 +1,2754 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM: sql reset query cache
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_6_db
+        # TSIM: $tbPrefix = ta_6_tb
+        tbPrefix = "ta_6_tb"
+        # TSIM: $mtPrefix = ta_6_mt
+        mtPrefix = "ta_6_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5
+        # binary(30), tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 binary(30), tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 binary(30), tgcol6 binary(20))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '0', 0, 0, 0, '0', '0'
+            # )
+            tdLog.info(
+                'create table %s using %s tags( "0", 0, 0, 0, "0", "0" )' %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( "0", 0, 0, 0, "0", "0" )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '1', 1, 1, 1, '1', '1'
+            # )
+            tdLog.info(
+                'create table %s using %s tags( "1", 1, 1, 1, "1", "1" )' %
+                (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( "1", 1, 1, 1, "1", "1" )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 1
+        tdLog.info('select * from %s where tgcol1 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 = 0
+        tdLog.info('select * from %s where tgcol1 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol1 <> 0
+        tdLog.info('select * from %s where tgcol1 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol1 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where tgcol3 = 0
+        tdLog.info('select * from %s where tgcol3 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 <> 0
+        tdLog.info('select * from %s where tgcol3 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol3 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from %s where tgcol3 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 <> 1
+        tdLog.info('select * from %s where tgcol3 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol3 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where tgcol4 = 0
+        tdLog.info('select * from %s where tgcol4 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 <> 0
+        tdLog.info('select * from %s where tgcol4 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol4 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 <> 1
+        tdLog.info('select * from %s where tgcol4 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where tgcol5 = 0
+        tdLog.info('select * from %s where tgcol5 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 <> 0
+        tdLog.info('select * from %s where tgcol5 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol5 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 = 1
+        tdLog.info('select * from %s where tgcol5 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 <> 1
+        tdLog.info('select * from %s where tgcol5 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select * from $mt where tgcol6 = 0
+        tdLog.info('select * from %s where tgcol6 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol6 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 <> 0
+        tdLog.info('select * from %s where tgcol6 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol6 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 = 1
+        tdLog.info('select * from %s where tgcol6 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol6 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 <> 1
+        tdLog.info('select * from %s where tgcol6 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol6 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol6 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol6 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol6 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol6 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step17
+        tdLog.info('=============== step17')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 = 1 and
+        # tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and
+        # tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol3 <> 0 and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step18
+        tdLog.info('=============== step18')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # tgcol4 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # tgcol4 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # tgcol4 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol5 <> 0 and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step19
+        tdLog.info('=============== step19')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 = 1 and
+        # tgcol6 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and
+        # tgcol6 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 = 0 and
+        # tgcol6 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and
+        # tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and
+        # tgcol6 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and
+        # tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol5 <> 0 and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step20
+        tdLog.info('=============== step20')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step21
+        tdLog.info('=============== step21')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step22
+        tdLog.info('=============== step22')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # tgcol1 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step23
+        tdLog.info('=============== step23')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
+        # tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # tgcol1 <> 0 and tgcol5 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step24
+        tdLog.info('=============== step24')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 =
+        # 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and
+        # tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and
+        # tgcol6 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 =
+        # 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and
+        # tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and
+        # tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 =
+        # 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and
+        # tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and
+        # tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and
+        # tgcol5 <> 0 and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and
+        # tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step25
+        tdLog.info('=============== step25')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step26
+        tdLog.info('=============== step26')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6
+        # = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step27
+        tdLog.info('=============== step27')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
+        # tgcol5 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and
+        # tgcol5 = 1 and tgcol6 = 1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step28
+        tdLog.info('=============== step28')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol3' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol4' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol5' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol5' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol6' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol6' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step29
+        tdLog.info('=============== step29')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group
+        # by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1  group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1  group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by
+        # tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 =
+        # 1 group by tgcol1
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 = 1 group by tgcol1' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 = 1 group by tgcol1' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step30
+        tdLog.info('=============== step30')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' % (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by
+        # tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
+        # tgcol5 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and
+        # tgcol5 = 1 and tgcol6 = 1 group by tgcol2
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step31
+        tdLog.info('=============== step31')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d)
+        # group by tgcol5
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and
+        # tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6
+        # = 1 interval(1d) group by tgcol6
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6 = 1 interval(1d) group by tgcol6' % (mt))
+        tdSql.query('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6 = 1 interval(1d) group by tgcol6' % (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/__init__.py b/tests/pytest/tag_lite/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/tag_lite/add.py b/tests/pytest/tag_lite/add.py
new file mode 100644
index 0000000000000000000000000000000000000000..49e2f8ab6990c24e90e9d1b01df957bc0d3107cd
--- /dev/null
+++ b/tests/pytest/tag_lite/add.py
@@ -0,0 +1,1769 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_ad_db
+        # TSIM: $tbPrefix = ta_ad_tb
+        tbPrefix = "ta_ad_tb"
+        # TSIM: $mtPrefix = ta_ad_mt
+        mtPrefix = "ta_ad_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 int
+        tdLog.info('alter table %s add tag tgcol4 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 int' % (mt))
+        tdLog.info('select * from %s where tgcol4=6' % (mt))
+        tdSql.query('select * from %s where tgcol4=6' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4 =4
+        tdLog.info('alter table %s set tag tgcol4 =4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4 =4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step2
+        tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step2:
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 tinyint
+        tdLog.info('alter table %s add tag tgcol4 tinyint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 tinyint' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step3
+        tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step3:
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql describe $tb
+        tdLog.info('describe %s' % (tb))
+        tdSql.query('describe %s' % (tb))
+        # TSIM: if $data21 != BIGINT then
+        tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")')
+        tdSql.checkDataType(2, 1, "BIGINT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data31 != FLOAT then
+        tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")')
+        tdSql.checkDataType(3, 1, "FLOAT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data23 != 1 then
+        tdLog.info('tdSql.checkData(2, 3, TAG)')
+        tdSql.checkData(2, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data33 != 2.000000 then
+        tdLog.info('tdSql.checkData(3, 3, 2.000000)')
+        tdSql.checkData(3, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 float
+        tdLog.info('alter table %s add tag tgcol4 float' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 float' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step4
+        tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step4:
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 smallint
+        tdLog.info('alter table %s add tag tgcol4 smallint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 smallint' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = '1' -x step5
+        tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt))
+        tdSql.error('select * from %s where tgcol3 = "1"' % (mt))
+        # TSIM: return -1
+        # TSIM: step5:
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3 )
+        tdLog.info('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 binary(10)
+        tdLog.info('alter table %s add tag tgcol5 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 binary(10)
+        tdLog.info('alter table %s add tag tgcol6 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 binary(10)' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=false
+        tdLog.info('alter table %s set tag tgcol4=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=false' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, 6)')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '6'
+        tdLog.info('select * from %s where tgcol6 = "6"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "6"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, 6)')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step52
+        tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step52:
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bigint
+        tdLog.info('alter table %s add tag tgcol5 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 tinyint
+        tdLog.info('alter table %s add tag tgcol6 tinyint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 tinyint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = 6
+        tdLog.info('select * from %s where tgcol6 = 6' % (mt))
+        tdSql.query('select * from %s where tgcol6 = 6' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, 6)')
+        tdSql.checkData(0, 4, 6)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step71
+        tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step71:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step72
+        tdLog.info('select * from %s where tgcol3 = 1 -x step72' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step72:
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 binary(17)
+        tdLog.info('alter table %s add tag tgcol5 binary(17)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 binary(17)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 bool
+        tdLog.info('alter table %s add tag tgcol6 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 bool' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=1
+        tdLog.info('alter table %s set tag tgcol6=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=1' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print select * from $mt where tgcol5 = 5
+        tdLog.info('select * from $mt where tgcol5 = 5')
+        # TSIM: print $data01 $data02 $data03 $data04
+        tdLog.info('$data01 $data02 $data03 $data04')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 1 then
+        tdLog.info('tdSql.checkData(0, 4, 1)')
+        tdSql.checkData(0, 4, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step81
+        tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step81:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step82
+        tdLog.info('select * from %s where tgcol3 = 1 -x step82' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step82:
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10), tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bool
+        tdLog.info('alter table %s add tag tgcol5 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bool' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 float
+        tdLog.info('alter table %s add tag tgcol6 float' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 float' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=1
+        tdLog.info('alter table %s set tag tgcol5=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=1' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 1
+        tdLog.info('select * from %s where tgcol5 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 4.000000000)')
+        tdSql.checkData(0, 2, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, 1)')
+        tdSql.checkData(0, 3, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 6.00000)')
+        tdSql.checkData(0, 4, 6.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step91
+        tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step91:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step92
+        tdLog.info('select * from %s where tgcol2 = 1 -x step92' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step92:
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', '2', '3', '4' )
+        tdLog.info(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103
+        tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt))
+        tdSql.error('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: return -1
+        # TSIM: step103:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bool
+        tdLog.info('alter table %s add tag tgcol5 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bool' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=false
+        tdLog.info('alter table %s set tag tgcol5=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=false' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 0 then
+        tdLog.info('tdSql.checkData(0, 4, 0)')
+        tdSql.checkData(0, 4, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+       #tdLog.info('tdSql.checkData(0, 5, NULL)')
+       # tdSql.checkData(0, 5, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step101
+        tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 101' % (mt))
+        # TSIM: return -1
+        # TSIM: step101:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step102
+        tdLog.info('select * from %s where tgcol3 = 1 -x step102' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 102' % (mt))
+        # TSIM: return -1
+        # TSIM: step102:
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.00000)')
+        tdSql.checkData(0, 5, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, 5)')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114
+        tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt))
+        tdSql.error('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: return -1
+        # TSIM: step114:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 int
+        tdLog.info('alter table %s add tag tgcol5 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 binary(10)
+        tdLog.info('alter table %s add tag tgcol6 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol7 bigint
+        tdLog.info('alter table %s add tag tgcol7 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol7 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol8 smallint
+        tdLog.info('alter table %s add tag tgcol8 smallint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol8 smallint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol7=7
+        tdLog.info('alter table %s set tag tgcol7=7' % (tb))
+        tdSql.execute('alter table %s set tag tgcol7=7' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol8=8
+        tdLog.info('alter table %s set tag tgcol8=8' % (tb))
+        tdSql.execute('alter table %s set tag tgcol8=8' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 =5
+        tdLog.info('select * from %s where tgcol5 =5' % (mt))
+        tdSql.query('select * from %s where tgcol5 =5' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, 5)')
+        tdSql.checkData(0, 4, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 6 then
+        tdLog.info('tdSql.checkData(0, 5, 6)')
+        tdSql.checkData(0, 5, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 7 then
+        tdLog.info('tdSql.checkData(0, 6, 7)')
+        tdSql.checkData(0, 6, 7)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 8 then
+        tdLog.info('tdSql.checkData(0, 7, 8)')
+        tdSql.checkData(0, 7, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step111
+        tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 111' % (mt))
+        # TSIM: return -1
+        # TSIM: step111:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step112
+        tdLog.info('select * from %s where tgcol3 = 1 -x step112' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 112' % (mt))
+        # TSIM: return -1
+        # TSIM: step112:
+        # TSIM: sql select * from $mt where tgcol9 = 1 -x step113
+        tdLog.info('select * from %s where tgcol9 = 1 -x step113' % (mt))
+        tdSql.error('select * from %s where tgcol9 = 113' % (mt))
+        # TSIM: return -1
+        # TSIM: step113:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5
+        # binary(10), tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 3.00000)')
+        tdSql.checkData(0, 4, 3.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.000000000)')
+        tdSql.checkData(0, 5, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, 5)')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, 6)')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol2 binary(10)
+        tdLog.info('alter table %s add tag tgcol2 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol2 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol3 int
+        tdLog.info('alter table %s add tag tgcol3 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol3 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bigint
+        tdLog.info('alter table %s add tag tgcol5 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bigint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol1=false
+        tdLog.info('alter table %s set tag tgcol1=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=false' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=5
+        tdLog.info('alter table %s set tag tgcol2=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol3=4
+        tdLog.info('alter table %s set tag tgcol3=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol3=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol4=3
+        tdLog.info('alter table %s set tag tgcol4=3' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=3' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=2
+        tdLog.info('alter table %s set tag tgcol5=2' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=2' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=1
+        tdLog.info('alter table %s set tag tgcol6=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=1' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '3'
+        tdLog.info('select * from %s where tgcol4 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "3"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, 1)')
+        tdSql.checkData(0, 3, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, 5)')
+        tdSql.checkData(0, 4, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 3 then
+        tdLog.info('tdSql.checkData(0, 6, 3)')
+        tdSql.checkData(0, 6, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 2 then
+        tdLog.info('tdSql.checkData(0, 7, 2)')
+        tdSql.checkData(0, 7, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '5'
+        tdLog.info('select * from %s where tgcol2 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "5"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 4
+        tdLog.info('select * from %s where tgcol3 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 4' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 2
+        tdLog.info('select * from %s where tgcol5 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '1'
+        tdLog.info('select * from %s where tgcol6 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
+        # double, tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+        tdLog.info(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info('select * from %s where tgcol1 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 6, 5.000000000)')
+        tdSql.checkData(0, 6, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, 6)')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol6
+        tdLog.info('alter table %s drop tag tgcol6' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol6' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol2 binary(10)
+        tdLog.info('alter table %s add tag tgcol2 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol2 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 int
+        tdLog.info('alter table %s add tag tgcol4 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 bigint
+        tdLog.info('alter table %s add tag tgcol6 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 bigint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol1=7
+        tdLog.info('alter table %s set tag tgcol1=7' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=7' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=8
+        tdLog.info('alter table %s set tag tgcol2=8' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=8' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol3=9
+        tdLog.info('alter table %s set tag tgcol3=9' % (tb))
+        tdSql.execute('alter table %s set tag tgcol3=9' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol4=10
+        tdLog.info('alter table %s set tag tgcol4=10' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=10' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=11
+        tdLog.info('alter table %s set tag tgcol5=11' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=11' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=12
+        tdLog.info('alter table %s set tag tgcol6=12' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=12' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '8'
+        tdLog.info('select * from %s where tgcol2 = "8"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "8"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, 7)')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 9 then
+        tdLog.info('tdSql.checkData(0, 3, 9)')
+        tdSql.checkData(0, 3, 9)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 11.000000000 then
+        tdLog.info('tdSql.checkData(0, 4, 11.000000000)')
+        tdSql.checkData(0, 4, 11.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 8 then
+        tdLog.info('tdSql.checkData(0, 5, 8)')
+        tdSql.checkData(0, 5, "8")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 10 then
+        tdLog.info('tdSql.checkData(0, 6, 10)')
+        tdSql.checkData(0, 6, 10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 12 then
+        tdLog.info('tdSql.checkData(0, 7, 12)')
+        tdSql.checkData(0, 7, 12)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: $i = 14
+        i = 14
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 1 )
+        tdLog.info('create table %s using %s tags( 1, 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM:
+        # TSIM: sql alter table $mt add tag tgcol3 binary(10)
+        tdLog.info('alter table %s add tag tgcol3 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol3 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 int
+        tdLog.info('alter table %s add tag tgcol4 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bigint
+        tdLog.info('alter table %s add tag tgcol5 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 bigint
+        tdLog.info('alter table %s add tag tgcol6 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 bigint' % (mt))
+        # TSIM:
+        # TSIM: return
+        # TSIM: sql alter table $mt add tag tgcol7 bigint -x step141
+        tdLog.info('alter table %s add tag tgcol7 bigint -x step141' % (mt))
+        tdSql.error('alter table %s add tag tgcol7 bigint41' % (mt))
+        # TSIM: return -1
+        # TSIM: step141:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt drop tag tgcol6
+        tdLog.info('alter table %s drop tag tgcol6' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol6' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol7 bigint
+        tdLog.info('alter table %s add tag tgcol7 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol7 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol8 bigint -x step142
+        tdLog.info('alter table %s add tag tgcol8 bigint -x step142' % (mt))
+        tdSql.error('alter table %s add tag tgcol8 bigint42' % (mt))
+        # TSIM: return -1
+        # TSIM: step142:
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('sql drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/bigint.py b/tests/pytest/tag_lite/bigint.py
new file mode 100644
index 0000000000000000000000000000000000000000..f83961aaad401f337a1dc4f0d305391f22006b9a
--- /dev/null
+++ b/tests/pytest/tag_lite/bigint.py
@@ -0,0 +1,598 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_bi_db
+        # TSIM: $tbPrefix = ta_bi_tb
+        tbPrefix = "ta_bi_tb"
+        # TSIM: $mtPrefix = ta_bi_mt
+        mtPrefix = "ta_bi_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+        tdSql.execute("create database db")
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev bigint)")
+                
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (pow(2, 63) - 1))
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags(%d)' % (-1 * pow(2, 63) + 1))
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(2)   
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/binary.py b/tests/pytest/tag_lite/binary.py
new file mode 100644
index 0000000000000000000000000000000000000000..4cbae63bec1ec6a885f015a69bb4192e93cc9629
--- /dev/null
+++ b/tests/pytest/tag_lite/binary.py
@@ -0,0 +1,602 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_by_db
+        # TSIM: $tbPrefix = ta_by_tb
+        tbPrefix = "ta_by_tb"
+        # TSIM: $mtPrefix = ta_by_mt
+        mtPrefix = "ta_by_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '0' )
+            tdLog.info('create table %s using %s tags( "0" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( "0" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '1' )
+            tdLog.info('create table %s using %s tags( "1" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( "1" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = '0'
+        tdLog.info('select * from %s where tgcol = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '0'
+        tdLog.info('select * from %s where tgcol <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '1'
+        tdLog.info('select * from %s where tgcol <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '1'
+        tdLog.info('select * from %s where tgcol <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '0'
+        tdLog.info('select * from %s where tgcol = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '0'
+        tdLog.info('select * from %s where tgcol <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+        tdSql.execute("create database db")
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev binary(5))")
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_001")')
+        
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev")')
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(1)        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/binary_binary.py b/tests/pytest/tag_lite/binary_binary.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c789eafd655d76362d5bc4729fd4e5da8de2156
--- /dev/null
+++ b/tests/pytest/tag_lite/binary_binary.py
@@ -0,0 +1,799 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_bib_db
+        # TSIM: $tbPrefix = ta_bib_tb
+        tbPrefix = "ta_bib_tb"
+        # TSIM: $mtPrefix = ta_bib_mt
+        mtPrefix = "ta_bib_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(5), tgcol2 binary(5))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 binary(5))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 binary(5))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '0', '0' )
+            tdLog.info('create table %s using %s tags( "0", "0" )' % (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( "0", "0" )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( '1', '1' )
+            tdLog.info('create table %s using %s tags( "1", "1" )' % (tb, mt))
+            tdSql.execute(
+                'create table %s using %s tags( "1", "1" )' %
+                (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol = '0'
+        tdLog.info('select * from %s where tgcol = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '0'
+        tdLog.info('select * from %s where tgcol <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '1'
+        tdLog.info('select * from %s where tgcol <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '1'
+        tdLog.info('select * from %s where tgcol <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '0'
+        tdLog.info('select * from %s where tgcol = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> '0'
+        tdLog.info('select * from %s where tgcol <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = '0'
+        tdLog.info('select * from %s where tgcol2 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> '0'
+        tdLog.info('select * from %s where tgcol2 <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = '1'
+        tdLog.info('select * from %s where tgcol2 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> '1'
+        tdLog.info('select * from %s where tgcol2 <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> '0' and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> "0" and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # tgcol = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # tgcol <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # tgcol = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0' and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m and ts < now + 5m and tgcol <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and
+        # tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" and tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and
+        # tgcol2 = '1' group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" and tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = "1" and tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/bool.py b/tests/pytest/tag_lite/bool.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f2afd262509571187b83cba26d6773dbfde0464
--- /dev/null
+++ b/tests/pytest/tag_lite/bool.py
@@ -0,0 +1,583 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_bo_db
+        # TSIM: $tbPrefix = ta_bo_tb
+        tbPrefix = "ta_bo_tb"
+        # TSIM: $mtPrefix = ta_bo_mt
+        mtPrefix = "ta_bo_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: print expect 100, actual:$rows
+        tdLog.info('expect 100, actual:$rows')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = true
+        tdLog.info('select * from %s where tgcol = true' % (mt))
+        tdSql.query('select * from %s where tgcol = true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> true
+        tdLog.info('select * from %s where tgcol <> true' % (mt))
+        tdSql.query('select * from %s where tgcol <> true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = false
+        tdLog.info('select * from %s where tgcol = false' % (mt))
+        tdSql.query('select * from %s where tgcol = false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> false
+        tdLog.info('select * from %s where tgcol <> false' % (mt))
+        tdSql.query('select * from %s where tgcol <> false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
+        # and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info('select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol')
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/bool_binary.py b/tests/pytest/tag_lite/bool_binary.py
new file mode 100644
index 0000000000000000000000000000000000000000..bfc496e8e4013ab5fb1bf929d7aeb3d37238b343
--- /dev/null
+++ b/tests/pytest/tag_lite/bool_binary.py
@@ -0,0 +1,793 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_bob_db
+        # TSIM: $tbPrefix = ta_bob_tb
+        tbPrefix = "ta_bob_tb"
+        # TSIM: $mtPrefix = ta_bob_mt
+        mtPrefix = "ta_bob_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 binary(5))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0, '0' )
+            tdLog.info('create table %s using %s tags( 0, "0" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0, "0" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1, '1' )
+            tdLog.info('create table %s using %s tags( 1, "1" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1, "1" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = true
+        tdLog.info('select * from %s where tgcol = true' % (mt))
+        tdSql.query('select * from %s where tgcol = true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> true
+        tdLog.info('select * from %s where tgcol <> true' % (mt))
+        tdSql.query('select * from %s where tgcol <> true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = false
+        tdLog.info('select * from %s where tgcol = false' % (mt))
+        tdSql.query('select * from %s where tgcol = false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> false
+        tdLog.info('select * from %s where tgcol <> false' % (mt))
+        tdSql.query('select * from %s where tgcol <> false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = '0'
+        tdLog.info('select * from %s where tgcol2 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> '0'
+        tdLog.info('select * from %s where tgcol2 <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = '1'
+        tdLog.info('select * from %s where tgcol2 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> "1"
+        tdLog.info('select * from %s where tgcol2 <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
+        # and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # tgcol = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # tgcol <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # tgcol = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # tgcol = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0' and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m and ts < now + 5m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and
+        # tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and
+        # tgcol2 = '1' group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/bool_int.py b/tests/pytest/tag_lite/bool_int.py
new file mode 100644
index 0000000000000000000000000000000000000000..f7bfc7acef276609c8606185102b5463807d577a
--- /dev/null
+++ b/tests/pytest/tag_lite/bool_int.py
@@ -0,0 +1,825 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_boi_db
+        # TSIM: $tbPrefix = ta_boi_tb
+        tbPrefix = "ta_boi_tb"
+        # TSIM: $mtPrefix = ta_boi_mt
+        mtPrefix = "ta_boi_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0, 0 )
+            tdLog.info('create table %s using %s tags( 0, 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0, 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1, 1 )
+            tdLog.info('create table %s using %s tags( 1, 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1, 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = true
+        tdLog.info('select * from %s where tgcol = true' % (mt))
+        tdSql.query('select * from %s where tgcol = true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> true
+        tdLog.info('select * from %s where tgcol <> true' % (mt))
+        tdSql.query('select * from %s where tgcol <> true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = false
+        tdLog.info('select * from %s where tgcol = false' % (mt))
+        tdSql.query('select * from %s where tgcol = false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> false
+        tdLog.info('select * from %s where tgcol <> false' % (mt))
+        tdSql.query('select * from %s where tgcol <> false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = true
+        tdLog.info('select * from %s where tgcol2 = true' % (mt))
+        tdSql.query('select * from %s where tgcol2 = true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> true
+        tdLog.info('select * from %s where tgcol2 <> true' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> true' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = false
+        tdLog.info('select * from %s where tgcol2 = false' % (mt))
+        tdSql.query('select * from %s where tgcol2 = false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> false
+        tdLog.info('select * from %s where tgcol2 <> false' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> false' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> false
+        # and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> false and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # tgcol = true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol <> true
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> true' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> true' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # tgcol = false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol = false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol <> false
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol <> false
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and
+        # tgcol2 = 1 group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = true and tgcol2 = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/change.py b/tests/pytest/tag_lite/change.py
new file mode 100644
index 0000000000000000000000000000000000000000..b8ddc3ff87ae921c9958f3242e681971a1b865ab
--- /dev/null
+++ b/tests/pytest/tag_lite/change.py
@@ -0,0 +1,945 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_ch_db
+        # TSIM: $tbPrefix = ta_ch_tb
+        # TSIM: $mtPrefix = ta_ch_mt
+        # TSIM: $tbNum = 10
+        # TSIM: $rowNum = 20
+        # TSIM: $totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int)
+        tdLog.info(
+            "create table ta_ch_mt2 (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)")
+        tdSql.execute(
+            'create table ta_ch_mt2 (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)')
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info("create table tb2 using ta_ch_mt2 tags( 1, 2 )")
+        tdSql.execute('create table tb2 using ta_ch_mt2 tags( 1, 2 )')
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info("insert into tb2 values(now, 1)")
+        tdSql.execute("insert into tb2 values(now, 1)")
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from ta_ch_mt2 where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt2 where tgcol1 = 1')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tagcx tgcol3 -x step21
+        tdLog.info("alter table ta_ch_mt2 change tag tagcx tgcol3 -x step21")
+        tdSql.error("alter table ta_ch_mt2 change tag tagcx tgcol3")
+        # TSIM: return -1
+        # TSIM: step21:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol2 -x step22
+        tdLog.info("alter table ta_ch_mt2 change tag tgcol1 tgcol2 -x step22")
+        tdSql.error("alter table ta_ch_mt2 change tag tgcol1 tgcol2")
+        # TSIM: return -1
+        # TSIM: step22:
+        # TSIM: sql alter table $mt change tag tgcol1
+        # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x
+        # step20
+        tdLog.info(
+            "alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
+        tdSql.error(
+            "alter table ta_ch_mt2 change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20")
+        # TSIM: return -1
+        # TSIM: step20:
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol3
+        tdLog.info("alter table ta_ch_mt2 change tag tgcol1 tgcol3")
+        tdSql.execute("alter table ta_ch_mt2 change tag tgcol1 tgcol3")
+        # TSIM: sql alter table $mt change tag tgcol2 tgcol4
+        tdLog.info("alter table ta_ch_mt2 change tag tgcol2 tgcol4")
+        tdSql.execute("alter table ta_ch_mt2 change tag tgcol2 tgcol4")
+        # TSIM: sql alter table $mt change tag tgcol4 tgcol3 -x step23
+        tdLog.info("alter table ta_ch_mt2 change tag tgcol4 tgcol3 -x step23")
+        tdSql.error("alter table ta_ch_mt2 change tag tgcol4 tgcol3")
+        # TSIM: return -1
+        # TSIM: step23:
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            "create table ta_ch_mt3 (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)")
+        tdSql.execute(
+            'create table ta_ch_mt3 (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)')
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info("create table tb3 using ta_ch_mt3 tags( 1, 2 )")
+        tdSql.execute('create table tb3 using ta_ch_mt3 tags( 1, 2 )')
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info("insert into tb3 values(now, 1)")
+        tdSql.execute("insert into tb3 values(now, 1)")
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from ta_ch_mt3 where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt3 where tgcol1 = 1')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol3
+        tdLog.info("alter table ta_ch_mt3 change tag tgcol1 tgcol3")
+        tdSql.execute("alter table ta_ch_mt3 change tag tgcol1 tgcol3")
+        # TSIM: sql alter table $mt change tag tgcol2 tgcol4
+        tdLog.info("alter table ta_ch_mt3 change tag tgcol2 tgcol4")
+        tdSql.execute("alter table ta_ch_mt3 change tag tgcol2 tgcol4")
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float)
+        tdLog.info(
+            "create table ta_ch_mt4 (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)")
+        tdSql.execute(
+            'create table ta_ch_mt4 (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)')
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info("create table tb4 using ta_ch_mt4 tags( 1, 2 )")
+        tdSql.execute('create table tb4 using ta_ch_mt4 tags( 1, 2 )')
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info("insert into tb4 values(now, 1)")
+        tdSql.execute("insert into tb4 values(now, 1)")
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from ta_ch_mt4 where tgcol1 = 1')
+        tdSql.query('select * from ta_ch_mt4 where tgcol1 = 1')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol3
+        tdLog.info("alter table ta_ch_mt4 change tag tgcol1 tgcol3")
+        tdSql.execute("alter table ta_ch_mt4 change tag tgcol1 tgcol3")
+        # TSIM: sql alter table $mt change tag tgcol2 tgcol4
+        tdLog.info("alter table ta_ch_mt4 change tag tgcol2 tgcol4")
+        tdSql.execute("alter table ta_ch_mt4 change tag tgcol2 tgcol4")
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            "create table ta_ch_mt5 (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))")
+        tdSql.execute(
+            'create table ta_ch_mt5 (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))')
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info("create table tb5 using ta_ch_mt5 tags( 1, '2' )")
+        tdSql.execute("create table tb5 using ta_ch_mt5 tags( 1, '2' )")
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info("insert into tb5 values(now, 1)")
+        tdSql.execute("insert into tb5 values(now, 1)")
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info("select * from ta_ch_mt5 where tgcol2 = '2'")
+        tdSql.query("select * from ta_ch_mt5 where tgcol2 = '2'")
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol3
+        tdLog.info("alter table ta_ch_mt5 change tag tgcol1 tgcol3")
+        tdSql.execute("alter table ta_ch_mt5 change tag tgcol1 tgcol3")
+        # TSIM: sql alter table $mt change tag tgcol2 tgcol4
+        tdLog.info("alter table ta_ch_mt5 change tag tgcol2 tgcol4")
+        tdSql.execute("alter table ta_ch_mt5 change tag tgcol2 tgcol4")
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
+        # double, tgcol6 binary(20))
+        tdLog.info("create table ta_ch_mt6 (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))")
+        tdSql.execute(
+            'create table ta_ch_mt6 (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))')
+        # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+        tdLog.info(
+            "create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
+        tdSql.execute(
+            "create table tb6 using ta_ch_mt6 tags( '1', 2, 3, '4', 5, '6' )")
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info("insert into tb6 values(now, 1)")
+        tdSql.execute("insert into tb6 values(now, 1)")
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info("select * from ta_ch_mt6 where tgcol1 = '1'")
+        tdSql.query("select * from ta_ch_mt6 where tgcol1 = '1'")
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info("tdSql.checkData(0, 1, 1)")
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, '4')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 6, 5.000000000)')
+        tdSql.checkData(0, 6, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, 6)')
+        tdSql.checkData(0, 7, '6')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info("alter table ta_ch_mt6 drop tag tgcol3")
+        tdSql.execute("alter table ta_ch_mt6 drop tag tgcol3")
+        # TSIM: sql reset query cache
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        # TSIM: sql alter table $mt change tag tgcol4 tgcol3
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol4 tgcol3")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol4 tgcol3")
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol7
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol1 tgcol7")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol1 tgcol7")
+        # TSIM: sql alter table $mt change tag tgcol2 tgcol8
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol2 tgcol8")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol2 tgcol8")
+        # TSIM: sql reset query cache
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        # TSIM: sql alter table $mt change tag tgcol3 tgcol9
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol3 tgcol9")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol3 tgcol9")
+        # TSIM: sql alter table $mt change tag tgcol5 tgcol10
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol5 tgcol10")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol5 tgcol10")
+        # TSIM: sql alter table $mt change tag tgcol6 tgcol11
+        tdLog.info("alter table ta_ch_mt6 change tag tgcol6 tgcol11")
+        tdSql.execute("alter table ta_ch_mt6 change tag tgcol6 tgcol11")
+        # TSIM:
+        # TSIM: sleep 5000
+        # TSIM: sql reset query cache
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1 -x step24
+        tdLog.info('select * from ta_ch_mt2 where tgcol1 = 1 -x step24')
+        tdSql.error("select * from ta_ch_mt2 where tgcol1 = 1")
+        # TSIM: return -1
+        # TSIM: step24:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step25
+        tdLog.info('select * from ta_ch_mt2 where tgcol2 = 1 -x step25')
+        tdSql.error('select * from ta_ch_mt2 where tgcol2 = 1')
+        # TSIM: return -1
+        # TSIM: step25:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from ta_ch_mt2 where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt2 where tgcol3 = 1')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 2
+        tdLog.info('select * from ta_ch_mt2 where tgcol4 = 2')
+        tdSql.query('select * from ta_ch_mt2 where tgcol4 = 2')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1 -x step31
+        tdLog.info('select * from ta_ch_mt3 where tgcol1 = 1 -x step31')
+        tdSql.error('select * from ta_ch_mt3 where tgcol1 = 1')
+        # TSIM: return -1
+        # TSIM: step31:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step32
+        tdLog.info('select * from ta_ch_mt3 where tgcol2 = 1 -x step32')
+        tdSql.error('select * from ta_ch_mt3 where tgcol2 = 1')
+        # TSIM: return -1
+        # TSIM: step32:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from ta_ch_mt3 where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt3 where tgcol3 = 1')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 2
+        tdLog.info('select * from ta_ch_mt3 where tgcol4 = 2')
+        tdSql.query('select * from ta_ch_mt3 where tgcol4 = 2')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1 -x step41
+        tdLog.info('select * from ta_ch_mt4 where tgcol1 = 1 -x step41')
+        tdSql.error('select * from ta_ch_mt4 where tgcol1 = 11')
+        # TSIM: return -1
+        # TSIM: step41:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step42
+        tdLog.info('select * from ta_ch_mt4 where tgcol2 = 1 -x step42')
+        tdSql.error('select * from ta_ch_mt4 where tgcol2 = 12')
+        # TSIM: return -1
+        # TSIM: step42:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from ta_ch_mt4 where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt4 where tgcol3 = 1')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 2
+        tdLog.info('select * from ta_ch_mt4 where tgcol4 = 2')
+        tdSql.query('select * from ta_ch_mt4 where tgcol4 = 2')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1 -x step51
+        tdLog.info('select * from ta_ch_mt5 where tgcol1 = 1 -x step51')
+        tdSql.error('select * from ta_ch_mt5 where tgcol1 = 11')
+        # TSIM: return -1
+        # TSIM: step51:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step52
+        tdLog.info('select * from ta_ch_mt5 where tgcol2 = 1 -x step52')
+        tdSql.error('select * from ta_ch_mt5 where tgcol2 = 12')
+        # TSIM: return -1
+        # TSIM: step52:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1
+        tdLog.info('select * from ta_ch_mt5 where tgcol3 = 1')
+        tdSql.query('select * from ta_ch_mt5 where tgcol3 = 1')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '2'
+        tdLog.info("select * from ta_ch_mt5 where tgcol4 = '2'")
+        tdSql.query("select * from ta_ch_mt5 where tgcol4 = '2'")
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        # TSIM: $tb = $tbPrefix . $i
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1 -x step61
+        tdLog.info('select * from ta_ch_mt6 where tgcol1 = 1 -x step61')
+        tdSql.error('select * from ta_ch_mt6 where tgcol1 = 1')
+        # TSIM: return -1
+        # TSIM: step61:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step62
+        tdLog.info('select * from ta_ch_mt6 where tgcol2 = 1 -x step62')
+        tdSql.error('select * from ta_ch_mt6 where tgcol2 = 1')
+        # TSIM: return -1
+        # TSIM: step62:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step63
+        tdLog.info('select * from ta_ch_mt6 where tgcol3 = 1 -x step63')
+        tdSql.error('select * from ta_ch_mt6 where tgcol3 = 1')
+        # TSIM: return -1
+        # TSIM: step63:
+        # TSIM: sql select * from $mt where tgcol4 = 1 -x step64
+        tdLog.info('select * from ta_ch_mt6 where tgcol4 = 1 -x step64')
+        tdSql.error('select * from ta_ch_mt6 where tgcol4 = 1')
+        # TSIM: return -1
+        # TSIM: step64:
+        # TSIM: sql select * from $mt where tgcol5 = 1 -x step65
+        tdLog.info('select * from ta_ch_mt6 where tgcol5 = 1 -x step65')
+        tdSql.error('select * from ta_ch_mt6 where tgcol5 = 1')
+        # TSIM: return -1
+        # TSIM: step65:
+        # TSIM: sql select * from $mt where tgcol6 = 1 -x step66
+        tdLog.info('select * from ta_ch_mt6 where tgcol6 = 1 -x step66')
+        tdSql.error('select * from ta_ch_mt6 where tgcol6 = 1')
+        # TSIM: return -1
+        # TSIM: step66:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol7 = '1'
+        tdLog.info("select * from ta_ch_mt6 where tgcol7 = '1'")
+        tdSql.query("select * from ta_ch_mt6 where tgcol7 = '1'")
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 4 then
+        tdLog.info('tdSql.checkData(0, 4, "4")')
+        tdSql.checkData(0, 4, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 5.000000000)')
+        tdSql.checkData(0, 5, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 6 then
+        tdLog.info('tdSql.checkData(0, 6, "6")')
+        tdSql.checkData(0, 6, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol8 = 2
+        tdLog.info('select * from ta_ch_mt6 where tgcol8 = 2')
+        tdSql.query('select * from ta_ch_mt6 where tgcol8 = 2')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 4 then
+        tdLog.info('tdSql.checkData(0, 4, "4"")')
+        tdSql.checkData(0, 4, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 5.000000000)')
+        tdSql.checkData(0, 5, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 6 then
+        tdLog.info('tdSql.checkData(0, 6, "6")')
+        tdSql.checkData(0, 6, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol9 = '4'
+        tdLog.info("select * from ta_ch_mt6 where tgcol9 = '4'")
+        tdSql.query("select * from ta_ch_mt6 where tgcol9 = '4'")
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 4 then
+        tdLog.info('tdSql.checkData(0, 4, "4")')
+        tdSql.checkData(0, 4, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 5.000000000)')
+        tdSql.checkData(0, 5, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 6 then
+        tdLog.info('tdSql.checkData(0, 6, "6")')
+        tdSql.checkData(0, 6, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol10 = 5
+        tdLog.info('select * from ta_ch_mt6 where tgcol10 = 5')
+        tdSql.query('select * from ta_ch_mt6 where tgcol10 = 5')
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 4 then
+        tdLog.info('tdSql.checkData(0, 4, "4")')
+        tdSql.checkData(0, 4, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 5.000000000)')
+        tdSql.checkData(0, 5, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 6 then
+        tdLog.info('tdSql.checkData(0, 6, "6")')
+        tdSql.checkData(0, 6, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol11 = '6'
+        tdLog.info("select * from ta_ch_mt6 where tgcol11 = '6'")
+        tdSql.query("select * from ta_ch_mt6 where tgcol11 = '6'")
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 4 then
+        tdLog.info('tdSql.checkData(0, 4, "4")')
+        tdSql.checkData(0, 4, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 5.000000000)')
+        tdSql.checkData(0, 5, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 6 then
+        tdLog.info('tdSql.checkData(0, 6, "6")')
+        tdSql.checkData(0, 6, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/column.py b/tests/pytest/tag_lite/column.py
new file mode 100644
index 0000000000000000000000000000000000000000..f82f83c356b63cb0d7d3fe41b4f4d7c0ff875195
--- /dev/null
+++ b/tests/pytest/tag_lite/column.py
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_co_db
+        # TSIM: $tbPrefix = ta_co_tb
+        tbPrefix = "ta_co_tb"
+        # TSIM: $mtPrefix = ta_co_mt
+        mtPrefix = "ta_co_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: sql create table $mt (ts timestamp, tbcol int, tbcol2
+        # binary(10)) TAGS(tgcol int, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int, tbcol2 binary(10)) TAGS(tgcol int, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int, tbcol2 binary(10)) TAGS(tgcol int, tgcol2 binary(10))' %
+            (mt))
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using $mt tags(  0,  '0' )
+        tdLog.info('create table %s using %s tags(  0,  "0" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags(  0,  "0" )' % (tb, mt))
+        # TSIM:
+        # TSIM: $i = 1
+        i = 1
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using $mt tags(  1,   1  )
+        tdLog.info('create table %s using %s tags(  1,   1  )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags(  1,   1  )' % (tb, mt))
+        # TSIM:
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using $mt tags( '2', '2' )
+        tdLog.info('create table %s using %s tags( "2", "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( "2", "2" )' % (tb, mt))
+        # TSIM:
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using $mt tags( '3',  3  )
+        tdLog.info('create table %s using %s tags( "3",  3  )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( "3",  3  )' % (tb, mt))
+        # TSIM:
+        # TSIM: sql show tables
+        tdLog.info('show tables')
+        tdSql.query('show tables')
+        # TSIM: if $rows != 4 then
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql insert into $tb values(now,  0,  '0')
+        tdLog.info('insert into %s values(now,  0,  "0")' % (tb))
+        tdSql.execute('insert into %s values(now,  0,  "0")' % (tb))
+        # TSIM:
+        # TSIM: $i = 1
+        i = 1
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql insert into $tb values(now,  1,   1  )
+        tdLog.info('insert into %s values(now,  1,   1  )' % (tb))
+        tdSql.execute('insert into %s values(now,  1,   1  )' % (tb))
+        # TSIM:
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql insert into $tb values(now, '2', '2')
+        tdLog.info('insert into %s values(now, "2", "2")' % (tb))
+        tdSql.execute('insert into %s values(now, "2", "2")' % (tb))
+        # TSIM:
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql insert into $tb values(now, '3',  3)
+        tdLog.info('insert into %s values(now, "3",  3)' % (tb))
+        tdSql.execute('insert into %s values(now, "3",  3)' % (tb))
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = '1'
+        tdLog.info('select * from %s where tgcol2 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != 4 then
+        tdLog.info('tdSql.checkRow(4)')
+        tdSql.checkRows(4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/commit.py b/tests/pytest/tag_lite/commit.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b69d4aa5f482340012c53a4be1c2b9c8c1b2e92
--- /dev/null
+++ b/tests/pytest/tag_lite/commit.py
@@ -0,0 +1,2321 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = db
+        # TSIM: $tbPrefix = tb
+        tbPrefix = "tb"
+        # TSIM: $mtPrefix = mt
+        mtPrefix = "mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 int
+        tdLog.info('alter table %s add tag tgcol4 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 int' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4 =4
+        tdLog.info('alter table %s set tag tgcol4 =4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4 =4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step2
+        tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step2:
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 tinyint
+        tdLog.info('alter table %s add tag tgcol4 tinyint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 tinyint' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step3
+        tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step3:
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql describe $tb
+        tdLog.info('describe %s' % (tb))
+        tdSql.query('describe %s' % (tb))
+        # TSIM: if $data21 != BIGINT then
+        tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")')
+        tdSql.checkDataType(2, 1, "BIGINT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data31 != FLOAT then
+        tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")')
+        tdSql.checkDataType(3, 1, "FLOAT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data23 != 1 then
+        tdLog.info('tdSql.checkData(2, 3, "TAG")')
+        tdSql.checkData(2, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data33 != 2.000000 then
+        tdLog.info('tdSql.checkData(3, 3, "TAG")')
+        tdSql.checkData(3, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 float
+        tdLog.info('alter table %s add tag tgcol4 float' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 float' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step4
+        tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step4:
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 smallint
+        tdLog.info('alter table %s add tag tgcol4 smallint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 smallint' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = '1' -x step5
+        tdLog.info('select * from %s where tgcol3 = "1" -x step5' % (mt))
+        tdSql.error('select * from %s where tgcol3 = "1"' % (mt))
+        # TSIM: return -1
+        # TSIM: step5:
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3 )
+        tdLog.info('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 binary(10)
+        tdLog.info('alter table %s add tag tgcol5 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 binary(10)
+        tdLog.info('alter table %s add tag tgcol6 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 binary(10)' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=false
+        tdLog.info('alter table %s set tag tgcol4=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=false' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, "6")')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '6'
+        tdLog.info('select * from %s where tgcol6 = "6"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "6"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, "6")')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step52
+        tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step52:
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bigint
+        tdLog.info('alter table %s add tag tgcol5 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 tinyint
+        tdLog.info('alter table %s add tag tgcol6 tinyint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 tinyint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = 6
+        tdLog.info('select * from %s where tgcol6 = 6' % (mt))
+        tdSql.query('select * from %s where tgcol6 = 6' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, 6)')
+        tdSql.checkData(0, 4, 6)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step71
+        tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step71:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step72
+        tdLog.info('select * from %s where tgcol3 = 1 -x step72' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step72:
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 binary(17)
+        tdLog.info('alter table %s add tag tgcol5 binary(17)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 binary(17)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 bool
+        tdLog.info('alter table %s add tag tgcol6 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 bool' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=1
+        tdLog.info('alter table %s set tag tgcol6=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=1' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 1 then
+        tdLog.info('tdSql.checkData(0, 4, 1)')
+        tdSql.checkData(0, 4, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step81
+        tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step81:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step82
+        tdLog.info('select * from %s where tgcol3 = 1 -x step82' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step82:
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10), tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4
+        tdLog.info('alter table %s change tag tgcol1 tgcol4' % (mt))
+        tdSql.execute('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bool
+        tdLog.info('alter table %s add tag tgcol5 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bool' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 float
+        tdLog.info('alter table %s add tag tgcol6 float' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 float' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=1
+        tdLog.info('alter table %s set tag tgcol5=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=1' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 1
+        tdLog.info('select * from %s where tgcol5 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 4.000000000)')
+        tdSql.checkData(0, 2, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, 1)')
+        tdSql.checkData(0, 3, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 6.00000)')
+        tdSql.checkData(0, 4, 6.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step91
+        tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 11' % (mt))
+        # TSIM: return -1
+        # TSIM: step91:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step92
+        tdLog.info('select * from %s where tgcol2 = 1 -x step92' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 12' % (mt))
+        # TSIM: return -1
+        # TSIM: step92:
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', '2', '3', '4' )
+        tdLog.info(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, "4")')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step103
+        tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step103' % (mt))
+        tdSql.error('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: return -1
+        # TSIM: step103:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bool
+        tdLog.info('alter table %s add tag tgcol5 bool' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bool' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=false
+        tdLog.info('alter table %s set tag tgcol5=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=false' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 0 then
+        tdLog.info('tdSql.checkData(0, 4, 0)')
+        tdSql.checkData(0, 4, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL)')
+        try:
+            tdSql.checkData(0, 5, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step101
+        tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step101:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step102
+        tdLog.info('select * from %s where tgcol3 = 1 -x step102' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step102:
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.00000)')
+        tdSql.checkData(0, 5, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, "5")')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt change tag tgcol1 tgcol4 -x step114
+        tdLog.info('alter table %s change tag tgcol1 tgcol4 -x step114' % (mt))
+        tdSql.error('alter table %s change tag tgcol1 tgcol4' % (mt))
+        # TSIM: return -1
+        # TSIM: step114:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 int
+        tdLog.info('alter table %s add tag tgcol5 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 binary(10)
+        tdLog.info('alter table %s add tag tgcol6 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol7 bigint
+        tdLog.info('alter table %s add tag tgcol7 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol7 bigint' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol8 smallint
+        tdLog.info('alter table %s add tag tgcol8 smallint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol8 smallint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol4=4
+        tdLog.info('alter table %s set tag tgcol4=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=5
+        tdLog.info('alter table %s set tag tgcol5=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=6
+        tdLog.info('alter table %s set tag tgcol6=6' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=6' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol7=7
+        tdLog.info('alter table %s set tag tgcol7=7' % (tb))
+        tdSql.execute('alter table %s set tag tgcol7=7' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol8=8
+        tdLog.info('alter table %s set tag tgcol8=8' % (tb))
+        tdSql.execute('alter table %s set tag tgcol8=8' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 =5
+        tdLog.info('select * from %s where tgcol5 =5' % (mt))
+        tdSql.query('select * from %s where tgcol5 =5' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, 5)')
+        tdSql.checkData(0, 4, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 6 then
+        tdLog.info('tdSql.checkData(0, 5, "6")')
+        tdSql.checkData(0, 5, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 7 then
+        tdLog.info('tdSql.checkData(0, 6, 7)')
+        tdSql.checkData(0, 6, 7)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 8 then
+        tdLog.info('tdSql.checkData(0, 7, 8)')
+        tdSql.checkData(0, 7, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step111
+        tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step111:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step112
+        tdLog.info('select * from %s where tgcol3 = 1 -x step112' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step112:
+        # TSIM: sql select * from $mt where tgcol9 = 1 -x step113
+        tdLog.info('select * from %s where tgcol9 = 1 -x step113' % (mt))
+        tdSql.error('select * from %s where tgcol9 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step113:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5
+        # binary(10), tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 3.00000)')
+        tdSql.checkData(0, 4, 3.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.000000000)')
+        tdSql.checkData(0, 5, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, "5")')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, "6")')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol2 binary(10)
+        tdLog.info('alter table %s add tag tgcol2 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol2 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol3 int
+        tdLog.info('alter table %s add tag tgcol3 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol3 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 binary(10)
+        tdLog.info('alter table %s add tag tgcol4 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol5 bigint
+        tdLog.info('alter table %s add tag tgcol5 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol5 bigint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol1=false
+        tdLog.info('alter table %s set tag tgcol1=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=false' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=5
+        tdLog.info('alter table %s set tag tgcol2=5' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=5' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol3=4
+        tdLog.info('alter table %s set tag tgcol3=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol3=4' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol4=3
+        tdLog.info('alter table %s set tag tgcol4=3' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=3' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=2
+        tdLog.info('alter table %s set tag tgcol5=2' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=2' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=1
+        tdLog.info('alter table %s set tag tgcol6=1' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=1' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '3'
+        tdLog.info('select * from %s where tgcol4 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "3"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, "1")')
+        tdSql.checkData(0, 3, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, "5")')
+        tdSql.checkData(0, 4, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 3 then
+        tdLog.info('tdSql.checkData(0, 6, "3")')
+        tdSql.checkData(0, 6, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 2 then
+        tdLog.info('tdSql.checkData(0, 7, 2)')
+        tdSql.checkData(0, 7, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '5'
+        tdLog.info('select * from %s where tgcol2 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "5"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 4
+        tdLog.info('select * from %s where tgcol3 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 4' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 2
+        tdLog.info('select * from %s where tgcol5 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '1'
+        tdLog.info('select * from %s where tgcol6 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
+        # double, tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+        tdLog.info(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info('select * from %s where tgcol1 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, "4")')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 6, 5.000000000)')
+        tdSql.checkData(0, 6, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, "6")')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol6
+        tdLog.info('alter table %s drop tag tgcol6' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol6' % (mt))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $mt add tag tgcol2 binary(10)
+        tdLog.info('alter table %s add tag tgcol2 binary(10)' % (mt))
+        tdSql.execute('alter table %s add tag tgcol2 binary(10)' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol4 int
+        tdLog.info('alter table %s add tag tgcol4 int' % (mt))
+        tdSql.execute('alter table %s add tag tgcol4 int' % (mt))
+        # TSIM: sql alter table $mt add tag tgcol6 bigint
+        tdLog.info('alter table %s add tag tgcol6 bigint' % (mt))
+        tdSql.execute('alter table %s add tag tgcol6 bigint' % (mt))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql alter table $tb set tag tgcol1=7
+        tdLog.info('alter table %s set tag tgcol1=7' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=7' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=8
+        tdLog.info('alter table %s set tag tgcol2=8' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=8' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol3=9
+        tdLog.info('alter table %s set tag tgcol3=9' % (tb))
+        tdSql.execute('alter table %s set tag tgcol3=9' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol4=10
+        tdLog.info('alter table %s set tag tgcol4=10' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4=10' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=11
+        tdLog.info('alter table %s set tag tgcol5=11' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=11' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6=12
+        tdLog.info('alter table %s set tag tgcol6=12' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6=12' % (tb))
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '8'
+        tdLog.info('select * from %s where tgcol2 = "8"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "8"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 9 then
+        tdLog.info('tdSql.checkData(0, 3, 9)')
+        tdSql.checkData(0, 3, 9)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 11.000000000 then
+        tdLog.info('tdSql.checkData(0, 4, 11.000000000)')
+        tdSql.checkData(0, 4, 11.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 8 then
+        tdLog.info('tdSql.checkData(0, 5, "8")')
+        tdSql.checkData(0, 5, "8")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 10 then
+        tdLog.info('tdSql.checkData(0, 6, 10)')
+        tdSql.checkData(0, 6, 10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 12 then
+        tdLog.info('tdSql.checkData(0, 7, 12)')
+        tdSql.checkData(0, 7, 12)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+        # TSIM: sleep 5000
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM: sleep 3000
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, "6")')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '6'
+        tdLog.info('select * from %s where tgcol6 = "6"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "6"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info(': tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, "6")')
+        tdSql.checkData(0, 4, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 1
+        tdLog.info('select * from %s where tgcol4 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = 6
+        tdLog.info('select * from %s where tgcol6 = 6' % (mt))
+        tdSql.query('select * from %s where tgcol6 = 6' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, 5)')
+        tdSql.checkData(0, 3, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6 then
+        tdLog.info('tdSql.checkData(0, 4, 6)')
+        tdSql.checkData(0, 4, 6)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = '5'
+        tdLog.info('select * from %s where tgcol5 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol5 = "5"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4 then
+        tdLog.info('tdSql.checkData(0, 2, 4)')
+        tdSql.checkData(0, 2, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 5 then
+        tdLog.info('tdSql.checkData(0, 3, "5")')
+        tdSql.checkData(0, 3, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 1 then
+        tdLog.info('tdSql.checkData(0, 4, 1)')
+        tdSql.checkData(0, 4, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 1
+        tdLog.info('select * from %s where tgcol5 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 4.000000000)')
+        tdSql.checkData(0, 2, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, 1)')
+        tdSql.checkData(0, 3, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 6.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 6.00000)')
+        tdSql.checkData(0, 4, 6.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 0 then
+        tdLog.info('tdSql.checkData(0, 4, 0)')
+        tdSql.checkData(0, 4, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL)')
+        try:
+            tdSql.checkData(0, 5, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 =5
+        tdLog.info('select * from %s where tgcol5 =5' % (mt))
+        tdSql.query('select * from %s where tgcol5 =5' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, 5)')
+        tdSql.checkData(0, 4, 5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 6 then
+        tdLog.info('tdSql.checkData(0, 5, "6")')
+        tdSql.checkData(0, 5, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 7 then
+        tdLog.info('tdSql.checkData(0, 6, 7)')
+        tdSql.checkData(0, 6, 7)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 8 then
+        tdLog.info('tdSql.checkData(0, 7, 8)')
+        tdSql.checkData(0, 7, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '3'
+        tdLog.info('select * from %s where tgcol4 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "3"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 1 then
+        tdLog.info('tdSql.checkData(0, 3, "1")')
+        tdSql.checkData(0, 3, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5 then
+        tdLog.info('tdSql.checkData(0, 4, "5")')
+        tdSql.checkData(0, 4, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, 4)')
+        tdSql.checkData(0, 5, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 3 then
+        tdLog.info('tdSql.checkData(0, 6, "3")')
+        tdSql.checkData(0, 6, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 2 then
+        tdLog.info('tdSql.checkData(0, 7, 2)')
+        tdSql.checkData(0, 7, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '5'
+        tdLog.info('select * from %s where tgcol2 = "5"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "5"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 4
+        tdLog.info('select * from %s where tgcol3 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 4' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 2
+        tdLog.info('select * from %s where tgcol5 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '1'
+        tdLog.info('select * from %s where tgcol6 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '8'
+        tdLog.info('select * from %s where tgcol2 = "8"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "8"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 9 then
+        tdLog.info('tdSql.checkData(0, 3, 9)')
+        tdSql.checkData(0, 3, 9)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 11.000000000 then
+        tdLog.info('tdSql.checkData(0, 4, 11.000000000)')
+        tdSql.checkData(0, 4, 11.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 8 then
+        tdLog.info('tdSql.checkData(0, 5, "8")')
+        tdSql.checkData(0, 5, "8")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 10 then
+        tdLog.info('tdSql.checkData(0, 6, 10)')
+        tdSql.checkData(0, 6, 10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 12 then
+        tdLog.info('tdSql.checkData(0, 7, 12)')
+        tdSql.checkData(0, 7, 12)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/create-tags-boundary.py b/tests/pytest/tag_lite/create-tags-boundary.py
new file mode 100644
index 0000000000000000000000000000000000000000..b98ae627c2999e96d233dd63ba8c1ce795531265
--- /dev/null
+++ b/tests/pytest/tag_lite/create-tags-boundary.py
@@ -0,0 +1,66 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import subprocess
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        getMaxTagNum = "grep -w TSDB_MAX_TAGS ../../src/inc/taosdef.h|awk '{print $3}'"
+        boundary = int(subprocess.check_output(getMaxTagNum, shell=True))
+        tdLog.info("get max tags number is %d" % boundary)
+        for x in range(0, boundary):
+            stb_name = "stb%d" % x
+
+            tagSeq = "tag0 int"
+            for y in range(1, x + 1):
+                tagSeq = tagSeq + ", tag%d int" % y
+
+            tdLog.info(
+                "create table %s (ts timestamp, value int) tags (%s)" %
+                (stb_name, tagSeq))
+            tdSql.execute(
+                "create table %s (ts timestamp, value int) tags (%s)" %
+                (stb_name, tagSeq))
+
+        tdSql.query("show stables")
+        tdSql.checkRows(boundary)
+
+        stb_name = "stb%d" % (boundary + 1)
+        tagSeq = tagSeq + ", tag%d int" % (boundary)
+        tdLog.info(
+            "create table %s (ts timestamp, value int) tags (%s)" %
+            (stb_name, tagSeq))
+        tdSql.error(
+            "create table %s (ts timestamp, value int) tags (%s)" %
+            (stb_name, tagSeq))
+        tdSql.query("show stables")
+        tdSql.checkRows(boundary)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/create.py b/tests/pytest/tag_lite/create.py
new file mode 100644
index 0000000000000000000000000000000000000000..83a14501437177fe9113efda31821ed1986cac7f
--- /dev/null
+++ b/tests/pytest/tag_lite/create.py
@@ -0,0 +1,1398 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_cr_db
+        # TSIM: $tbPrefix = ta_cr_tb
+        tbPrefix = "ta_cr_tb"
+        # TSIM: $mtPrefix = ta_cr_mt
+        mtPrefix = "ta_cr_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # smallint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: print expect 0, actual: $rows
+        tdLog.info('expect 0, actual: $rows')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # double)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1 )
+        tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1')
+        tdLog.info('create table %s using %s tags( "1")' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( "1")' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = '0'
+        tdLog.info('select * from %s where tgcol = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol = "0"' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 bool)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: print expect 1, actual: $rows
+        tdLog.info('expect 1, actual: $rows')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 smallint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: $i = 14
+        i = 14
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: $i = 15
+        i = 15
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: $i = 16
+        i = 16
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 double)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step17
+        tdLog.info('=============== step17')
+        # TSIM: $i = 17
+        i = 17
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = true
+        tdLog.info('select * from %s where tgcol = true' % (mt))
+        tdSql.query('select * from %s where tgcol = true' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step18
+        tdLog.info('=============== step18')
+        # TSIM: $i = 18
+        i = 18
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step19
+        tdLog.info('=============== step19')
+        # TSIM: $i = 19
+        i = 19
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # tinyint, tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step20
+        tdLog.info('=============== step20')
+        # TSIM: $i = 20
+        i = 20
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int,
+        # tgcol2 bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step21
+        tdLog.info('=============== step21')
+        # TSIM: $i = 21
+        i = 21
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # bigint, tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step22
+        tdLog.info('=============== step22')
+        # TSIM: $i = 22
+        i = 22
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # float, tgcol2 double)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step23
+        tdLog.info('=============== step23')
+        # TSIM: $i = 23
+        i = 23
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step24
+        tdLog.info('=============== step24')
+        # TSIM: $i = 24
+        i = 24
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6
+        # binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, 5, "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, 5, "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = 3
+        tdLog.info('select * from %s where tgcol3 = 3' % (mt))
+        tdSql.query('select * from %s where tgcol3 = 3' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol5 = 5
+        tdLog.info('select * from %s where tgcol5 = 5' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 5' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 = '6'
+        tdLog.info('select * from %s where tgcol6 = "6"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "6"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 = '0'
+        tdLog.info('select * from %s where tgcol6 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "0"' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step25
+        tdLog.info('=============== step25')
+        # TSIM: $i = 25
+        i = 25
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6
+        # binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol6 = '6'
+        tdLog.info('select * from %s where tgcol6 = "6"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "6"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol6 = '0'
+        tdLog.info('select * from %s where tgcol6 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "0"' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step26
+        tdLog.info('=============== step26')
+        # TSIM: $i = 26
+        i = 26
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10),
+        # tgcol5 binary(10), tgcol6 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', '2', '3', '4', '5',
+        # '6' )
+        tdLog.info(
+            'create table %s using %s tags( "1", "2", "3", "4", "5", "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", "2", "3", "4", "5", "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol3 = '0'
+        tdLog.info('select * from %s where tgcol3 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "0"' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step27
+        tdLog.info('=============== step27')
+        # TSIM: $i = 27
+        i = 27
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool,
+        # tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6
+        # binary(10), tgcol7) -x step27
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10), tgcol7) -x step27' %
+            (mt))
+        tdSql.error(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10), tgcol7)7' %
+            (mt))
+        # TSIM: return -1
+        # TSIM: step27:
+        # TSIM:
+        # TSIM: print =============== step28
+        tdLog.info('=============== step28')
+        # TSIM: $i = 28
+        i = 28
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(250), tgcol2 binary(250))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags('1', '1')
+        tdLog.info('create table %s using %s tags("1", "1")' % (tb, mt))
+        tdSql.execute('create table %s using %s tags("1", "1")' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step29
+        tdLog.info('=============== step29')
+        # TSIM: $i = 29
+        i = 29
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(25), tgcol2 binary(250))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags('1', '1')
+        tdLog.info('create table %s using %s tags("1", "1")' % (tb, mt))
+        tdSql.execute('create table %s using %s tags("1", "1")' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol = '1'
+        tdLog.info('select * from %s where tgcol = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step30
+        tdLog.info('=============== step30')
+        # TSIM: $i = 30
+        i = 30
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30' %
+            (mt))
+        tdSql.error(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30))0' %
+            (mt))
+        # TSIM: return -1
+        # TSIM: step30:
+        # TSIM:
+        # TSIM: print =============== step31
+        tdLog.info('=============== step31')
+        # TSIM: $i = 31
+        i = 31
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(5))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(5))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(5))' %
+            (mt))
+        # TSIM: sql_error create table $tb using $mt tags('1234567')
+        tdLog.info('create table %s using %s tags("1234567")' % (tb, mt))
+        tdSql.error('create table %s using %s tags("1234567")' % (tb, mt))
+        # TSIM: sql create table $tb using $mt tags('12345')
+        tdLog.info('create table %s using %s tags("12345")' % (tb, mt))
+        tdSql.execute('create table %s using %s tags("12345")' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: print sql select * from $mt
+        tdLog.info('sql select * from $mt')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print $data00 $data01 $data02
+        tdLog.info('$data00 $data01 $data02')
+        # TSIM: if $data02 != 12345 then
+        tdLog.info('tdSql.checkData(0, 2, "12345")')
+        tdSql.checkData(0, 2, "12345")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/datatype-without-alter.py b/tests/pytest/tag_lite/datatype-without-alter.py
new file mode 100644
index 0000000000000000000000000000000000000000..da52e149a51c3128f82b8878ed8dc836fb726513
--- /dev/null
+++ b/tests/pytest/tag_lite/datatype-without-alter.py
@@ -0,0 +1,98 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 10
+        self.rowsPerTable = 10
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step0")
+        tdSql.execute('reset query cache')
+        tdLog.info("drop database db if exits")
+        tdSql.execute('drop database if exists db')
+        tdLog.info("================= step1")
+        tdSql.execute('create database db')
+        tdLog.sleep(5)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 super table")
+        tdSql.execute('create table stb (ts timestamp, i int) \
+          tags (tin int, tfl float, tbg bigint, tdo double, tbi binary(10), tbl bool)')
+
+        tdLog.info("================= step2")
+        tdLog.info("create %d tables" % self.ntables)
+        for tid in range(1, self.ntables + 1):
+            tdSql.execute(
+                'create table tb%d using stb tags(%d,%f,%ld,%f,\'%s\',%d)' %
+                (tid,
+                 tid %
+                 3,
+                 1.2 *
+                 tid,
+                 self.startTime +
+                 tid,
+                 1.22 *
+                 tid,
+                 't' +
+                 str(tid),
+                    tid %
+                    2))
+        tdLog.sleep(5)
+
+        tdLog.info("================= step3")
+        tdLog.info(
+            "insert %d data in to each %d tables" %
+            (self.rowsPerTable, self.ntables))
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd = ['insert into']
+            for tid in range(1, self.ntables + 1):
+                sqlcmd.append(
+                    'tb%d values(%ld,%d)' %
+                    (tid, self.startTime + rid, rid))
+            tdSql.execute(" ".join(sqlcmd))
+        tdSql.query('select count(*) from stb')
+        tdSql.checkData(0, 0, self.rowsPerTable * self.ntables)
+
+        tdLog.info("================= step6")
+        tdLog.info("group and filter by tag1 int")
+        tdSql.query('select max(i) from stb where tbl=0 group by tin')
+        tdSql.checkRows(3)
+        tdSql.execute('reset query cache')
+        tdSql.query('select max(i) from stb where tbl=true group by tin')
+        tdSql.checkData(2, 0, self.rowsPerTable)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/datatype.py b/tests/pytest/tag_lite/datatype.py
new file mode 100644
index 0000000000000000000000000000000000000000..f7fa9fa3a2dddaa3f352d02f74872ba42bd32f44
--- /dev/null
+++ b/tests/pytest/tag_lite/datatype.py
@@ -0,0 +1,135 @@
+###################################################################
+#       Copyright (c) 2016 by TAOS Technologies, Inc.
+#             All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        self.ntables = 10
+        self.rowsPerTable = 10
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step0")
+        tdSql.execute('reset query cache')
+        tdLog.info("drop database db if exits")
+        tdSql.execute('drop database if exists db')
+        tdLog.info("================= step1")
+        tdSql.execute('create database db')
+        tdLog.sleep(5)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 super table")
+        tdSql.execute('create table stb (ts timestamp, i int) \
+          tags (tin int, tfl float, tbg bigint, tdo double, tbi binary(10), tbl bool)')
+
+        tdLog.info("================= step2")
+        tdLog.info("create %d tables" % self.ntables)
+        for tid in range(1, self.ntables + 1):
+            tdSql.execute(
+                'create table tb%d using stb tags(%d,%f,%ld,%f,\'%s\',%d)' %
+                (tid,
+                 tid %
+                 3,
+                 1.2 *
+                 tid,
+                 self.startTime +
+                 tid,
+                 1.22 *
+                 tid,
+                 't' +
+                 str(tid),
+                    tid %
+                    2))
+        tdLog.sleep(5)
+
+        tdLog.info("================= step3")
+        tdLog.info(
+            "insert %d data in to each %d tables" %
+            (self.rowsPerTable, self.ntables))
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd = ['insert into']
+            for tid in range(1, self.ntables + 1):
+                sqlcmd.append(
+                    'tb%d values(%ld,%d)' %
+                    (tid, self.startTime + rid, rid))
+            tdSql.execute(" ".join(sqlcmd))
+        tdSql.query('select count(*) from stb')
+        tdSql.checkData(0, 0, self.rowsPerTable * self.ntables)
+
+        tdLog.info("================= step4")
+        tdLog.info("drop one tag")
+        tdSql.execute('alter table stb drop tag tbi')
+        tdLog.info("insert %d data in to each %d tables" % (2, self.ntables))
+        for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3):
+            sqlcmd = ['insert into']
+            for tid in range(1, self.ntables + 1):
+                sqlcmd.append(
+                    'tb%d values(%ld,%d)' %
+                    (tid, self.startTime + rid, rid))
+            tdSql.execute(" ".join(sqlcmd))
+        self.rowsPerTable += 2
+        tdSql.query('select count(*) from stb')
+        tdSql.checkData(0, 0, self.rowsPerTable * self.ntables)
+        tdSql.query('describe tb1')
+        tdSql.checkRows(2 + 5)
+
+        tdLog.info("================= step5")
+        tdLog.info("add one tag")
+        tdSql.execute('alter table stb add tag tnc nchar(10)')
+        for tid in range(1, self.ntables + 1):
+            tdSql.execute('alter table tb%d set tag tnc=\"%s\"' %
+                          (tid, str(tid * 1.2)))
+        tdLog.info("insert %d data in to each %d tables" % (2, self.ntables))
+        for rid in range(self.rowsPerTable + 1, self.rowsPerTable + 3):
+            sqlcmd = ['insert into']
+            for tid in range(1, self.ntables + 1):
+                sqlcmd.append(
+                    'tb%d values(%ld,%d)' %
+                    (tid, self.startTime + rid, rid))
+            tdSql.execute(" ".join(sqlcmd))
+        self.rowsPerTable += 2
+        tdSql.query('select count(*) from stb')
+        tdSql.checkData(0, 0, self.rowsPerTable * self.ntables)
+        tdSql.query('describe tb1')
+        tdSql.checkRows(2 + 6)
+
+        tdLog.info("================= step6")
+        tdLog.info("group and filter by tag1 int")
+        tdSql.query('select max(i) from stb where tbl=0 group by tin')
+        tdSql.checkRows(3)
+        tdSql.execute('reset query cache')
+        tdSql.query('select max(i) from stb where tbl=true group by tin')
+        tdSql.checkData(2, 0, self.rowsPerTable)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/delete.py b/tests/pytest/tag_lite/delete.py
new file mode 100644
index 0000000000000000000000000000000000000000..17b4deb815e7a05aaa5eaf33685b95e144d3d59b
--- /dev/null
+++ b/tests/pytest/tag_lite/delete.py
@@ -0,0 +1,1633 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_de_db
+        # TSIM: $tbPrefix = ta_de_tb
+        tbPrefix = "ta_de_tb"
+        # TSIM: $mtPrefix = ta_de_mt
+        mtPrefix = "ta_de_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 < 3
+        tdLog.info('select * from %s where tgcol2 < 3' % (mt))
+        tdSql.query('select * from %s where tgcol2 < 3' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql describe $tb
+        tdLog.info('describe %s' % (tb))
+        tdSql.query('describe %s' % (tb))
+        # TSIM: if $data21 != BIGINT then
+        tdLog.info('tdSql.checkDataType(2, 1, "BIGINT")')
+        tdSql.checkDataType(2, 1, "BIGINT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data31 != FLOAT then
+        tdLog.info('tdSql.checkDataType(3, 1, "FLOAT")')
+        tdSql.checkDataType(3, 1, "FLOAT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data23 != 1 then
+        tdLog.info('tdSql.checkData(2, 3, "TAG")')
+        tdSql.checkData(2, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol1 -x step40
+        tdLog.info('alter table %s drop tag tgcol1 -x step40' % (mt))
+        tdSql.error('alter table %s drop tag tgcol1' % (mt))
+        # TSIM: return -1
+        # TSIM: step40:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol1 -x step50
+        tdLog.info('alter table %s drop tag tgcol1 -x step50' % (mt))
+        tdSql.error('alter table %s drop tag tgcol1' % (mt))
+        # TSIM: return -1
+        # TSIM: step50:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3 )
+        tdLog.info('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, 3 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql describe $tb
+        tdLog.info('describe %s' % (tb))
+        tdSql.query('describe %s' % (tb))
+        # TSIM: if $data21 != SMALLINT then
+        tdLog.info('tdSql.checkDataType(2, 1, "SMALLINT")')
+        tdSql.checkDataType(2, 1, "SMALLINT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data31 != TINYINT then
+        tdLog.info('tdSql.checkDataType(3, 1, "TINYINT")')
+        tdSql.checkDataType(3, 1, "TINYINT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data41 != BINARY then
+        tdLog.info('tdSql.checkDataType(4, 1, "BINARY")')
+        tdSql.checkDataType(4, 1, "BINARY")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data22 != 2 then
+        tdLog.info('tdSql.checkData(2, 2, 2)')
+        tdSql.checkData(2, 2, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data32 != 1 then
+        tdLog.info('tdSql.checkData(3, 2, 1)')
+        tdSql.checkData(3, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data42 != 10 then
+        tdLog.info('tdSql.checkData(4, 2, 10)')
+        tdSql.checkData(4, 2, 10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data23 != 1 then
+        tdLog.info('tdSql.checkData(2, 3, "TAG")')
+        tdSql.checkData(2, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data33 != 2 then
+        tdLog.info('tdSql.checkData(3, 3, "TAG")')
+        tdSql.checkData(3, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data43 != 3 then
+        tdLog.info('tdSql.checkData(4, 3, "TAG")')
+        tdSql.checkData(4, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float, tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, '3' )
+        tdLog.info('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2, "3" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol3 = '3'
+        tdLog.info('select * from %s where tgcol3 = "3"' % (mt))
+        tdSql.query('select * from %s where tgcol3 = "3"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10), tgcol3 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2', '3' )
+        tdLog.info('create table %s using %s tags( 1, "2", "3" )' % (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, "2", "3" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', '2', '3', '4' )
+        tdLog.info(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", "2", "3", "4" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol4 = '4'
+        tdLog.info('select * from %s where tgcol4 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "4"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, "3")')
+        tdSql.checkData(0, 4, "3")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, "4")')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.00000)')
+        tdSql.checkData(0, 5, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, "5")')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5
+        # binary(10), tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+        tdLog.info(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( 1, 2, 3, 4, "5", "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3.00000 then
+        tdLog.info('tdSql.checkData(0, 4, 3.00000)')
+        tdSql.checkData(0, 4, 3.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 4.000000000)')
+        tdSql.checkData(0, 5, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5 then
+        tdLog.info('tdSql.checkData(0, 6, "5")')
+        tdSql.checkData(0, 6, "5")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, "6")')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol5
+        tdLog.info('alter table %s drop tag tgcol5' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol5' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol6
+        tdLog.info('alter table %s drop tag tgcol6' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol6' % (mt))
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
+        # double, tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+        tdLog.info(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info('select * from %s where tgcol1 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, "4")')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 6, 5.000000000)')
+        tdSql.checkData(0, 6, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, "6")')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol4
+        tdLog.info('alter table %s drop tag tgcol4' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol4' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol6
+        tdLog.info('alter table %s drop tag tgcol6' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol6' % (mt))
+        # TSIM:
+        # TSIM: sleep 5000
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step2
+        tdLog.info('select * from %s where tgcol2 = 1 -x step2' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step2:
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step3
+        tdLog.info('select * from %s where tgcol2 = 1 -x step3' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step3:
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step4
+        tdLog.info('select * from %s where tgcol2 = 1 -x step4' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step4:
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '1' -x step5
+        tdLog.info('select * from %s where tgcol2 = "1" -x step5' % (mt))
+        tdSql.error('select * from %s where tgcol2 = "1"' % (mt))
+        # TSIM: return -1
+        # TSIM: step5:
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step51
+        tdLog.info('select * from %s where tgcol2 = 1 -x step51' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step51:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step52
+        tdLog.info('select * from %s where tgcol3 = 1 -x step52' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step52:
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: $i = 7
+        i = 7
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step71
+        tdLog.info('select * from %s where tgcol2 = 1 -x step71' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step71:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step72
+        tdLog.info('select * from %s where tgcol3 = 1 -x step72' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step72:
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: $i = 8
+        i = 8
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step81
+        tdLog.info('select * from %s where tgcol2 = 1 -x step81' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step81:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step82
+        tdLog.info('select * from %s where tgcol3 = 1 -x step82' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step82:
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: $i = 9
+        i = 9
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step91
+        tdLog.info('select * from %s where tgcol3 = 1 -x step91' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step91:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step92
+        tdLog.info('select * from %s where tgcol2 = 1 -x step92' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step92:
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: $i = 10
+        i = 10
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info('select * from %s where tgcol1 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "1"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != NULL then
+        tdLog.info('tdSql.checkData(0, 3, NULL)')
+        try:
+            tdSql.checkData(0, 3, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL) out of range')
+        # tdSql.checkData(0, 5, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step101
+        tdLog.info('select * from %s where tgcol2 = 1 -x step101' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step101:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step102
+        tdLog.info('select * from %s where tgcol3 = 1 -x step102' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step102:
+        # TSIM: sql select * from $mt where tgcol4 = 1 -x step103
+        tdLog.info('select * from %s where tgcol4 = 1 -x step103' % (mt))
+        tdSql.error('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step103:
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: $i = 11
+        i = 11
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4=4
+        tdLog.info('select * from %s where tgcol4=4' % (mt))
+        tdSql.query('select * from %s where tgcol4=4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL) out of range')
+        # tdSql.checkData(0, 5, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != NULL then
+        tdLog.info('tdSql.checkData(0, 6, NULL) out of range')
+        # tdSql.checkData(0, 6, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step111
+        tdLog.info('select * from %s where tgcol2 = 1 -x step111' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step111:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step112
+        tdLog.info('select * from %s where tgcol3 = 1 -x step112' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step112:
+        # TSIM: sql select * from $mt where tgcol5 = 1 -x step113
+        tdLog.info('select * from %s where tgcol5 = 1 -x step113' % (mt))
+        tdSql.error('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step113:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: $i = 12
+        i = 12
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = 4
+        tdLog.info('select * from %s where tgcol4 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol4 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.000000000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.000000000)')
+        tdSql.checkData(0, 3, 4.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != NULL then
+        tdLog.info('tdSql.checkData(0, 4, NULL) out of range')
+        # tdSql.checkData(0, 4, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL) out of range')
+        # tdSql.checkData(0, 5, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != NULL then
+        tdLog.info('tdSql.checkData(0, 6, NULL) out of range')
+        # tdSql.checkData(0, 6, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL) out of range')
+        # tdSql.checkData(0, 7, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 1 -x step120
+        tdLog.info('select * from %s where tgcol2 = 1 -x step120' % (mt))
+        tdSql.error('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step120:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step121
+        tdLog.info('select * from %s where tgcol3 = 1 -x step121' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step121:
+        # TSIM: sql select * from $mt where tgcol5 = 1 -x step122
+        tdLog.info('select * from %s where tgcol5 = 1 -x step122' % (mt))
+        tdSql.error('select * from %s where tgcol5 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step122:
+        # TSIM: sql select * from $mt where tgcol6 = 1 -x step123
+        tdLog.info('select * from %s where tgcol6 = 1 -x step123' % (mt))
+        tdSql.error('select * from %s where tgcol6 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step123:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: $i = 13
+        i = 13
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 4, 5.000000000)')
+        tdSql.checkData(0, 4, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != NULL then
+        tdLog.info('tdSql.checkData(0, 5, NULL) out of range')
+        # tdSql.checkData(0, 5, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != NULL then
+        tdLog.info('tdSql.checkData(0, 6, NULL) out of range')
+        # tdSql.checkData(0, 6, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL) out of range')
+        # tdSql.checkData(0, 7, None)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol3 = 1 -x step130
+        tdLog.info('select * from %s where tgcol3 = 1 -x step130' % (mt))
+        tdSql.error('select * from %s where tgcol3 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step130:
+        # TSIM: sql select * from $mt where tgcol4 = 1 -x step131
+        tdLog.info('select * from %s where tgcol4 = 1 -x step131' % (mt))
+        tdSql.error('select * from %s where tgcol4 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step131:
+        # TSIM: sql select * from $mt where tgcol6 = 1 -x step133
+        tdLog.info('select * from %s where tgcol6 = 1 -x step133' % (mt))
+        tdSql.error('select * from %s where tgcol6 = 1' % (mt))
+        # TSIM: return -1
+        # TSIM: step133:
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: $i = 14
+        i = 14
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 bigint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 1 )
+        tdLog.info('create table %s using %s tags( 1, 1 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 1 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM:
+        # TSIM: sql alter table xxmt drop tag tag1 -x step141
+        tdLog.info('alter table xxmt drop tag tag1 -x step141')
+        tdSql.error('alter table xxmt drop tag tag1')
+        # TSIM: return -1
+        # TSIM: step141:
+        # TSIM: sql alter table $tb drop tag tag1 -x step142
+        tdLog.info('alter table %s drop tag tag1 -x step142' % (tb))
+        tdSql.error('alter table %s drop tag tag1' % (tb))
+        # TSIM: return -1
+        # TSIM: step142:
+        # TSIM: sql alter table $mt drop tag tag1 -x step143
+        tdLog.info('alter table %s drop tag tag1 -x step143' % (mt))
+        tdSql.error('alter table %s drop tag tag1' % (mt))
+        # TSIM: return -1
+        # TSIM: step143:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tagcol1 -x step144
+        tdLog.info('alter table %s drop tag tagcol1 -x step144' % (mt))
+        tdSql.error('alter table %s drop tag tagcol1' % (mt))
+        # TSIM: return -1
+        # TSIM: step144:
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol2
+        tdLog.info('alter table %s drop tag tgcol2' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol2' % (mt))
+        # TSIM: sql alter table $mt drop tag tgcol1 -x step145
+        tdLog.info('alter table %s drop tag tgcol1 -x step145' % (mt))
+        tdSql.error('alter table %s drop tag tgcol1' % (mt))
+        # TSIM: return -1
+        # TSIM: step145:
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/double.py b/tests/pytest/tag_lite/double.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1f29f592e70c582cde9b9eff114ff78843c6fc3
--- /dev/null
+++ b/tests/pytest/tag_lite/double.py
@@ -0,0 +1,584 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_do_db
+        # TSIM: $tbPrefix = ta_do_tb
+        tbPrefix = "ta_do_tb"
+        # TSIM: $mtPrefix = ta_do_mt
+        mtPrefix = "ta_do_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # double)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol double)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/filter.py b/tests/pytest/tag_lite/filter.py
new file mode 100644
index 0000000000000000000000000000000000000000..aeb13a171527103765e7744b97b57d3965ba711b
--- /dev/null
+++ b/tests/pytest/tag_lite/filter.py
@@ -0,0 +1,372 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        dbPrefix = "ta_fi_db"
+        tbPrefix = "ta_fi_tb"
+        mtPrefix = "ta_fi_mt"
+        # TSIM: $tbNum = 10
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # binary(10))
+        tdLog.info(
+            "create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))" %
+            mt)
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol binary(10))' %
+            mt)
+        # TSIM:
+        i = 0
+        while (i < 5):
+            tb = "tbPrefix%d" % i
+            tdLog.info("create table %s using %s tags( '0' )" % (tb, mt))
+            tdSql.execute("create table %s using %s tags( '0' )" % (tb, mt))
+
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+                tdLog.info(
+                    "insert into %s values (now + %s , %d)" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s , %d)" %
+                    (tb, ms, x))
+                x = x + 1
+            i = i + 1
+
+        while (i < 10):
+            tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $tb using $mt tags( '1' )
+            tdLog.info("create table %s using %s tags( '1' )" % (tb, mt))
+            tdSql.execute("create table %s using %s tags( '1' )" % (tb, mt))
+            x = 0
+            while (x < rowNum):
+                ms = "%dm" % x
+        # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    "insert into %s values (now + %s, %d )" %
+                    (tb, ms, x))
+                tdSql.execute(
+                    "insert into %s values (now + %s, %d )" %
+                    (tb, ms, x))
+                x = x + 1
+            i = i + 1
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = '1'" %
+            mt)
+        tdSql.query(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = '1'" %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info(
+            "%s %s %s %s %s %s %s" %
+            (tdSql.getData(
+                0, 0), tdSql.getData(
+                0, 1), tdSql.getData(
+                0, 2), tdSql.getData(
+                    0, 3), tdSql.getData(
+                        0, 4), tdSql.getData(
+                            0, 5), tdSql.getData(
+                                0, 6)))
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tg = '1' -x
+        # step2
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tg = '1' -x step2" %
+            mt)
+        tdSql.error(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tg = '1'" %
+            mt)
+        # TSIM: return -1
+        # TSIM: step2:
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where noexist = '1' -x
+        # step3
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where noexist = '1' -x step3" %
+            mt)
+        tdSql.error(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where noexist = '1'" %
+            mt)
+        # TSIM: return -1
+        # TSIM: step3:
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tbcol = '1'" %
+            mt)
+        tdSql.query(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tbcol = '1'" %
+            mt)
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data00 != 10 then
+        tdLog.info('tdSql.checkData(0, 0, 10)')
+        tdSql.checkData(0, 0, 10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s" %
+            mt)
+        tdSql.query(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s" %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info(
+            "%s %s %s %s %s %s %s" %
+            (tdSql.getData(
+                0, 0), tdSql.getData(
+                0, 1), tdSql.getData(
+                0, 2), tdSql.getData(
+                    0, 3), tdSql.getData(
+                        0, 4), tdSql.getData(
+                            0, 5), tdSql.getData(
+                                0, 6)))
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(cc), sum(xx), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt -x step6
+        tdLog.info(
+            "select count(tbcol), avg(cc), sum(xx), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s -x step6" %
+            mt)
+        tdSql.error(
+            "select count(tbcol), avg(cc), sum(xx), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s" %
+            mt)
+        # TSIM: return -1
+        # TSIM: step6:
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol),
+        # max(tgcol), first(tgcol), last(tgcol) from $mt -x step7
+        tdLog.info(
+            "select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol), max(tgcol), first(tgcol), last(tgcol) from %s -x step7" %
+            mt)
+        tdSql.error(
+            "select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol), max(tgcol), first(tgcol), last(tgcol) from %s" %
+            mt)
+        # TSIM: return -1
+        # TSIM: step7:
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tbcol
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s by tbcol" %
+            mt)
+        tdSql.query(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tbcol" %
+            mt)
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by noexist  -x
+        # step9
+        tdLog.info(
+            "select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by noexist  -x step9" %
+            mt)
+        tdSql.error(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by noexist ' %
+            mt)
+        # TSIM: return -1
+        # TSIM: step9:
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            mt)
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol) as c from $mt group by tbcol
+        tdLog.info('select count(tbcol) as c from %s group by tbcol' % mt)
+        tdSql.query('select count(tbcol) as c from %s group by tbcol' % mt)
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol) as c from $mt group by noexist -x
+        # step12
+        tdLog.info(
+            'select count(tbcol) as c from %s group by noexist -x step12' %
+            mt)
+        tdSql.error('select count(tbcol) as c from %s group by noexist2' % mt)
+        # TSIM: return -1
+        # TSIM: step12:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol) as c from $mt group by tgcol
+        tdLog.info('select count(tbcol) as c from %s group by tgcol' % mt)
+        tdSql.query('select count(tbcol) as c from %s group by tgcol' % mt)
+        # TSIM: print $data00
+        tdLog.info('$data00')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol) as c from $mt where ts > 1000 group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol) as c from %s where ts > 1000 group by tgcol' %
+            mt)
+        tdSql.query(
+            'select count(tbcol) as c from %s where ts > 1000 group by tgcol' %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+#        tdLog.info("%s %s %s %s %s %s %s" % (tdSql.getData(0, 0), tdSql.getData(0, 1), tdSql.getData(0, 2), tdSql.getData(0, 3), tdSql.getData(0, 4), tdSql.getData(0, 5), tdSql.getData(0, 6)))
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: print expect 100, actual $data00
+        tdLog.info('expect 100, actual $data00')
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step15
+        tdLog.info('=============== step15')
+        # TSIM: sql select count(tbcol) as c from $mt where noexist < 1  group
+        # by tgcol -x step15
+        tdLog.info(
+            'select count(tbcol) as c from %s where noexist < 1  group by tgcol -x step15' %
+            mt)
+        tdSql.error(
+            'select count(tbcol) as c from %s where noexist < 1  group by tgcol5' %
+            mt)
+        # TSIM: return -1
+        # TSIM: step15:
+        # TSIM:
+        # TSIM: print =============== step16
+        tdLog.info('=============== step16')
+        # TSIM: sql select count(tbcol) as c from $mt where tgcol = '1' group
+        # by tgcol
+        tdLog.info(
+            "select count(tbcol) as c from %s where tgcol = '1' group by tgcol" %
+            mt)
+        tdSql.query(
+            "select count(tbcol) as c from %s where tgcol = '1' group by tgcol" %
+            mt)
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+#        tdLog.info("%s %s %s %s %s %s %s" % (tdSql.getData(0, 0), tdSql.getData(0, 1), tdSql.getData(0, 2), tdSql.getData(0, 3), tdSql.getData(0, 4), tdSql.getData(0, 5), tdSql.getData(0, 6)))
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/float.py b/tests/pytest/tag_lite/float.py
new file mode 100644
index 0000000000000000000000000000000000000000..7b93cb0ac91d49299aedfa63e5dcc8571415cdce
--- /dev/null
+++ b/tests/pytest/tag_lite/float.py
@@ -0,0 +1,584 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_fl_db
+        # TSIM: $tbPrefix = ta_fl_tb
+        tbPrefix = "ta_fl_tb"
+        # TSIM: $mtPrefix = ta_fl_mt
+        mtPrefix = "ta_fl_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol float)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/int.py b/tests/pytest/tag_lite/int.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5a69173893c4e5c8341b6235c5dd8465f913111
--- /dev/null
+++ b/tests/pytest/tag_lite/int.py
@@ -0,0 +1,601 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_in_db
+        # TSIM: $tbPrefix = ta_in_tb
+        tbPrefix = "ta_in_tb"
+        # TSIM: $mtPrefix = ta_in_mt
+        mtPrefix = "ta_in_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+        tdSql.execute("create database db")
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev int)")
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % pow(2, 31))
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (-1 * pow(2, 31)))
+        
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (pow(2, 31) - 1))
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags(%d)' % (-1 * pow(2, 31) + 1))
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(2)   
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/int_binary.py b/tests/pytest/tag_lite/int_binary.py
new file mode 100644
index 0000000000000000000000000000000000000000..7760814f664b4b04d42b67bba3f86ce069928b70
--- /dev/null
+++ b/tests/pytest/tag_lite/int_binary.py
@@ -0,0 +1,791 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_inb_db
+        # TSIM: $tbPrefix = ta_inb_tb
+        tbPrefix = "ta_inb_tb"
+        # TSIM: $mtPrefix = ta_inb_mt
+        mtPrefix = "ta_inb_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int,
+        # tgcol2 binary(5))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0, '0' )
+            tdLog.info('create table %s using %s tags( 0, "0" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0, "0" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1, '1' )
+            tdLog.info('create table %s using %s tags( 1, "1" )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1, "1" )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 = '0'
+        tdLog.info('select * from %s where tgcol2 = "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> '0'
+        tdLog.info('select * from %s where tgcol2 <> "0"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "0"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = '1'
+        tdLog.info('select * from %s where tgcol2 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> '1'
+        tdLog.info('select * from %s where tgcol2 <> "1"' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> "1"' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1"' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0'
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0"' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = '1' and
+        # tgcol = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = "1" and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and
+        # tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "1" and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = '0' and
+        # tgcol = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = "0" and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and
+        # tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = "0" and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+        # and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> '0' and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> "0" and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and
+        # ts < now + 5m and ts < now + 5m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> "0" and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and
+        # tgcol2 = '1'
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = "1"' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = "1"' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and
+        # tgcol2 = '1' group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = "1" group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = "1" group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/int_float.py b/tests/pytest/tag_lite/int_float.py
new file mode 100644
index 0000000000000000000000000000000000000000..31c94130ab30e83c68ab017e44cf313202e6b966
--- /dev/null
+++ b/tests/pytest/tag_lite/int_float.py
@@ -0,0 +1,827 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_inf_db
+        # TSIM: $tbPrefix = ta_inf_tb
+        tbPrefix = "ta_inf_tb"
+        # TSIM: $mtPrefix = ta_inf_mt
+        mtPrefix = "ta_inf_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int,
+        # tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0, 0 )
+            tdLog.info('create table %s using %s tags( 0, 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0, 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1, 1 )
+            tdLog.info('create table %s using %s tags( 1, 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1, 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol2 > 0.5
+        tdLog.info('select * from %s where tgcol2 > 0.5' % (mt))
+        tdSql.query('select * from %s where tgcol2 > 0.5' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 < 0.5
+        tdLog.info('select * from %s where tgcol2 < 0.5' % (mt))
+        tdSql.query('select * from %s where tgcol2 < 0.5' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5
+        tdLog.info(
+            'select * from %s where tgcol2 > 0.5 and tgcol2 < 1.5' %
+            (mt))
+        tdSql.query(
+            'select * from %s where tgcol2 > 0.5 and tgcol2 < 1.5' %
+            (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 1
+        tdLog.info('select * from %s where tgcol2 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 1
+        tdLog.info('select * from %s where tgcol2 <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 = 0
+        tdLog.info('select * from %s where tgcol2 = 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol2 <> 0
+        tdLog.info('select * from %s where tgcol2 <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol2 <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 = 1 and
+        # tgcol = 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 = 1 and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and
+        # tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 = 0 and
+        # tgcol = 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 = 0 and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and
+        # tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 = 0 and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol2 <> 0 and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and
+        # ts < now + 5m and ts < now + 5m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and
+        # tgcol2 = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol2 = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and
+        # tgcol2 = 1 group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 and tgcol2 = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step13
+        tdLog.info('=============== step13')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step14
+        tdLog.info('=============== step14')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/nchar.py b/tests/pytest/tag_lite/nchar.py
new file mode 100644
index 0000000000000000000000000000000000000000..851cc32b56c9104e2f87d5c8ea58ffa0d56ac1a6
--- /dev/null
+++ b/tests/pytest/tag_lite/nchar.py
@@ -0,0 +1,48 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(5))")
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags("dev_001")')
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags("dev")')
+
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/set.py b/tests/pytest/tag_lite/set.py
new file mode 100644
index 0000000000000000000000000000000000000000..1e3cdfaa93b4df421d12837af0b0db043ea92abd
--- /dev/null
+++ b/tests/pytest/tag_lite/set.py
@@ -0,0 +1,896 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_se_db
+        # TSIM: $tbPrefix = ta_se_tb
+        tbPrefix = "ta_se_tb"
+        # TSIM: $mtPrefix = ta_se_mt
+        mtPrefix = "ta_se_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: $i = 2
+        i = 2
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bool, tgcol2 int)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $tb set tag tagcx 1 -x step21
+        tdLog.info('alter table %s set tag tagcx 1 -x step21' % (tb))
+        tdSql.error('alter table %s set tag tagcx 11' % (tb))
+        # TSIM: return -1
+        # TSIM: step21:
+        # TSIM: sql alter table $tb set tag tgcol1=false
+        tdLog.info('alter table %s set tag tgcol1=false' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=false' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=4
+        tdLog.info('alter table %s set tag tgcol2=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=4' % (tb))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = false
+        tdLog.info('select * from %s where tgcol1 = false' % (mt))
+        tdSql.query('select * from %s where tgcol1 = false' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 4
+        tdLog.info('select * from %s where tgcol2 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 0 then
+        tdLog.info('tdSql.checkData(0, 2, 0)')
+        tdSql.checkData(0, 2, 0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql describe $tb
+        tdLog.info('describe %s' % (tb))
+        tdSql.query('describe %s' % (tb))
+        # TSIM: print $data21 $data23 $data32 $data33
+        tdLog.info('$data21 $data23 $data32 $data33')
+        # TSIM: if $data21 != BOOL then
+        tdLog.info('tdSql.checkDataType(2, 1, "BOOL")')
+        tdSql.checkDataType(2, 1, "BOOL")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data31 != INT then
+        tdLog.info('tdSql.checkDataType(3, 1, "INT")')
+        tdSql.checkDataType(3, 1, "INT")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data23 != false then
+        tdLog.info('tdSql.checkData(2, 3, "TAG")')
+        tdSql.checkData(2, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data33 != 4 then
+        tdLog.info('tdSql.checkData(3, 3, "TAG")')
+        tdSql.checkData(3, 3, "TAG")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: $i = 3
+        i = 3
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # smallint, tgcol2 tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $tb set tag tgcol1=3
+        tdLog.info('alter table %s set tag tgcol1=3' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=3' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=4
+        tdLog.info('alter table %s set tag tgcol2=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=4' % (tb))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 3
+        tdLog.info('select * from %s where tgcol1 = 3' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 3' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3 then
+        tdLog.info('tdSql.checkData(0, 2, 3)')
+        tdSql.checkData(0, 2, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 4
+        tdLog.info('select * from %s where tgcol2 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3 then
+        tdLog.info('tdSql.checkData(0, 2, 3)')
+        tdSql.checkData(0, 2, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, 4)')
+        tdSql.checkData(0, 3, 4)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 2
+        tdLog.info('select * from %s where tgcol2 = 2' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 2' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: $i = 4
+        i = 4
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # bigint, tgcol2 float)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, 2 )
+        tdLog.info('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, 2 )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = 1
+        tdLog.info('select * from %s where tgcol1 = 1' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 1' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, 1)')
+        tdSql.checkData(0, 2, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 2.00000)')
+        tdSql.checkData(0, 3, 2.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $tb set tag tgcol1=3
+        tdLog.info('alter table %s set tag tgcol1=3' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=3' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=4
+        tdLog.info('alter table %s set tag tgcol2=4' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=4' % (tb))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 3
+        tdLog.info('select * from %s where tgcol1 = 3' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 3' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3 then
+        tdLog.info('tdSql.checkData(0, 2, 3)')
+        tdSql.checkData(0, 2, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 4
+        tdLog.info('select * from %s where tgcol2 = 4' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 4' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3 then
+        tdLog.info('tdSql.checkData(0, 2, 3)')
+        tdSql.checkData(0, 2, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4.00000 then
+        tdLog.info('tdSql.checkData(0, 3, 4.00000)')
+        tdSql.checkData(0, 3, 4.00000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: $i = 5
+        i = 5
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # double, tgcol2 binary(10))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( 1, '2' )
+        tdLog.info('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        tdSql.execute('create table %s using %s tags( 1, "2" )' % (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol2 = '2'
+        tdLog.info('select * from %s where tgcol2 = "2"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "2"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 1.000000000)')
+        tdSql.checkData(0, 2, 1.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, "2")')
+        tdSql.checkData(0, 3, "2")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $tb set tag tgcol1=3
+        tdLog.info('alter table %s set tag tgcol1=3' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1=3' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2='4'
+        tdLog.info('alter table %s set tag tgcol2="4"' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2="4"' % (tb))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = 3
+        tdLog.info('select * from %s where tgcol1 = 3' % (mt))
+        tdSql.query('select * from %s where tgcol1 = 3' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 3.000000000)')
+        tdSql.checkData(0, 2, 3.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = '4'
+        tdLog.info('select * from %s where tgcol2 = "4"' % (mt))
+        tdSql.query('select * from %s where tgcol2 = "4"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 3.000000000 then
+        tdLog.info('tdSql.checkData(0, 2, 3.000000000)')
+        tdSql.checkData(0, 2, 3.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 4 then
+        tdLog.info('tdSql.checkData(0, 3, "4")')
+        tdSql.checkData(0, 3, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: $i = 6
+        i = 6
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM: $tb = $tbPrefix . $i
+        tb = "%s%d" % (tbPrefix, i)
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1
+        # binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5
+        # double, tgcol6 binary(20))
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))' %
+            (mt))
+        # TSIM: sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+        tdLog.info(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        tdSql.execute(
+            'create table %s using %s tags( "1", 2, 3, "4", 5, "6" )' %
+            (tb, mt))
+        # TSIM: sql insert into $tb values(now, 1)
+        tdLog.info('insert into %s values(now, 1)' % (tb))
+        tdSql.execute('insert into %s values(now, 1)' % (tb))
+        # TSIM: sql select * from $mt where tgcol1 = '1'
+        tdLog.info('select * from %s where tgcol1 = "1"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "1"' % (mt))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 1 then
+        tdLog.info('tdSql.checkData(0, 2, "1")')
+        tdSql.checkData(0, 2, "1")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 2 then
+        tdLog.info('tdSql.checkData(0, 3, 2)')
+        tdSql.checkData(0, 3, 2)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 3 then
+        tdLog.info('tdSql.checkData(0, 4, 3)')
+        tdSql.checkData(0, 4, 3)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 4 then
+        tdLog.info('tdSql.checkData(0, 5, "4")')
+        tdSql.checkData(0, 5, "4")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 5.000000000 then
+        tdLog.info('tdSql.checkData(0, 6, 5.000000000)')
+        tdSql.checkData(0, 6, 5.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != 6 then
+        tdLog.info('tdSql.checkData(0, 7, "6")')
+        tdSql.checkData(0, 7, "6")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql alter table $mt drop tag tgcol3
+        tdLog.info('alter table %s drop tag tgcol3' % (mt))
+        tdSql.execute('alter table %s drop tag tgcol3' % (mt))
+        # TSIM: sql alter table $tb set tag tgcol1='7'
+        tdLog.info('alter table %s set tag tgcol1="7"' % (tb))
+        tdSql.execute('alter table %s set tag tgcol1="7"' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol2=8
+        tdLog.info('alter table %s set tag tgcol2=8' % (tb))
+        tdSql.execute('alter table %s set tag tgcol2=8' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol4='9'
+        tdLog.info('alter table %s set tag tgcol4="9"' % (tb))
+        tdSql.execute('alter table %s set tag tgcol4="9"' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol5=10
+        tdLog.info('alter table %s set tag tgcol5=10' % (tb))
+        tdSql.execute('alter table %s set tag tgcol5=10' % (tb))
+        # TSIM: sql alter table $tb set tag tgcol6='11'
+        tdLog.info('alter table %s set tag tgcol6="11"' % (tb))
+        tdSql.execute('alter table %s set tag tgcol6="11"' % (tb))
+        # TSIM:
+        # TSIM: sql reset query cache
+        tdLog.info('reset query cache')
+        tdSql.execute('reset query cache')
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol1 = '7'
+        tdLog.info('select * from %s where tgcol1 = "7"' % (mt))
+        tdSql.query('select * from %s where tgcol1 = "7"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 8 then
+        tdLog.info('tdSql.checkData(0, 3, 8)')
+        tdSql.checkData(0, 3, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 9 then
+        tdLog.info('tdSql.checkData(0, 4, "9")')
+        tdSql.checkData(0, 4, "9")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 10.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 10.000000000)')
+        tdSql.checkData(0, 5, 10.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 11 then
+        tdLog.info('tdSql.checkData(0, 6, "11")')
+        tdSql.checkData(0, 6, "11")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol2 = 8
+        tdLog.info('select * from %s where tgcol2 = 8' % (mt))
+        tdSql.query('select * from %s where tgcol2 = 8' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 8 then
+        tdLog.info('tdSql.checkData(0, 3, 8)')
+        tdSql.checkData(0, 3, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 9 then
+        tdLog.info('tdSql.checkData(0, 4, "9")')
+        tdSql.checkData(0, 4, "9")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 10.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 10.000000000)')
+        tdSql.checkData(0, 5, 10.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 11 then
+        tdLog.info('tdSql.checkData(0, 6, "11")')
+        tdSql.checkData(0, 6, "11")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol4 = '9'
+        tdLog.info('select * from %s where tgcol4 = "9"' % (mt))
+        tdSql.query('select * from %s where tgcol4 = "9"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 8 then
+        tdLog.info('tdSql.checkData(0, 3, 8)')
+        tdSql.checkData(0, 3, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 9 then
+        tdLog.info('tdSql.checkData(0, 4, "9")')
+        tdSql.checkData(0, 4, "9")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 10.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 10.000000000)')
+        tdSql.checkData(0, 5, 10.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 11 then
+        tdLog.info('tdSql.checkData(0, 6, "11")')
+        tdSql.checkData(0, 6, "11")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol5 = 10
+        tdLog.info('select * from %s where tgcol5 = 10' % (mt))
+        tdSql.query('select * from %s where tgcol5 = 10' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 8 then
+        tdLog.info('tdSql.checkData(0, 3, 8)')
+        tdSql.checkData(0, 3, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 9 then
+        tdLog.info('tdSql.checkData(0, 4, "9")')
+        tdSql.checkData(0, 4, "9")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 10.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 10.000000000)')
+        tdSql.checkData(0, 5, 10.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 11 then
+        tdLog.info('tdSql.checkData(0, 6, "11")')
+        tdSql.checkData(0, 6, "11")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where tgcol6 = '11'
+        tdLog.info('select * from %s where tgcol6 = "11"' % (mt))
+        tdSql.query('select * from %s where tgcol6 = "11"' % (mt))
+        # TSIM: print $data01 $data02 $data03
+        tdLog.info('$data01 $data02 $data03')
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data01 != 1 then
+        tdLog.info('tdSql.checkData(0, 1, 1)')
+        tdSql.checkData(0, 1, 1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data02 != 7 then
+        tdLog.info('tdSql.checkData(0, 2, "7")')
+        tdSql.checkData(0, 2, "7")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data03 != 8 then
+        tdLog.info('tdSql.checkData(0, 3, 8)')
+        tdSql.checkData(0, 3, 8)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data04 != 9 then
+        tdLog.info('tdSql.checkData(0, 4, "9")')
+        tdSql.checkData(0, 4, "9")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data05 != 10.000000000 then
+        tdLog.info('tdSql.checkData(0, 5, 10.000000000)')
+        tdSql.checkData(0, 5, 10.000000000)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data06 != 11 then
+        tdLog.info('tdSql.checkData(0, 6, "11")')
+        tdSql.checkData(0, 6, "11")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: if $data07 != NULL then
+        tdLog.info('tdSql.checkData(0, 7, NULL)')
+        try:
+            tdSql.checkData(0, 7, None)
+        except Exception as e:
+            tdLog.info(repr(e))
+            tdLog.info("out of range")
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/smallint.py b/tests/pytest/tag_lite/smallint.py
new file mode 100644
index 0000000000000000000000000000000000000000..c060e3f82b6b5f2b6d32fd50e5ea8181f655ad9b
--- /dev/null
+++ b/tests/pytest/tag_lite/smallint.py
@@ -0,0 +1,601 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_sm_db
+        # TSIM: $tbPrefix = ta_sm_tb
+        tbPrefix = "ta_sm_tb"
+        # TSIM: $mtPrefix = ta_sm_mt
+        mtPrefix = "ta_sm_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # smallint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol smallint)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+        tdSql.execute("create database db")
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev smallint)")
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % pow(2, 15))
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (-1 * pow(2, 15)))
+        
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (pow(2, 15) - 1))
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags(%d)' % (-1 * pow(2, 15) + 1))
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(2)   
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/tinyint.py b/tests/pytest/tag_lite/tinyint.py
new file mode 100644
index 0000000000000000000000000000000000000000..089dd46569578c1ca33d73639cb36a0bba03e0f0
--- /dev/null
+++ b/tests/pytest/tag_lite/tinyint.py
@@ -0,0 +1,602 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        # TSIM: system sh/stop_dnodes.sh
+        # TSIM:
+        # TSIM:
+        # TSIM: system sh/deploy.sh -n dnode1 -i 1
+        # TSIM: system sh/cfg.sh -n dnode1 -c walLevel -v 0
+        # TSIM: system sh/exec.sh -n dnode1 -s start
+        # TSIM:
+        # TSIM: sleep 3000
+        # TSIM: sql connect
+        # TSIM:
+        # TSIM: print ======================== dnode1 start
+        tdLog.info('======================== dnode1 start')
+        # TSIM:
+        # TSIM: $dbPrefix = ta_ti_db
+        # TSIM: $tbPrefix = ta_ti_tb
+        tbPrefix = "ta_ti_tb"
+        # TSIM: $mtPrefix = ta_ti_mt
+        mtPrefix = "ta_ti_mt"
+        # TSIM: $tbNum = 10
+        tbNum = 10
+        # TSIM: $rowNum = 20
+        rowNum = 20
+        # TSIM: $totalNum = 200
+        totalNum = 200
+        # TSIM:
+        # TSIM: print =============== step1
+        tdLog.info('=============== step1')
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: $db = $dbPrefix . $i
+        # TSIM: $mt = $mtPrefix . $i
+        mt = "%s%d" % (mtPrefix, i)
+        # TSIM:
+        # TSIM: sql create database $db
+        # TSIM: sql use $db
+        # TSIM: sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol
+        # tinyint)
+        tdLog.info(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint)' %
+            (mt))
+        tdSql.execute(
+            'create table %s (ts timestamp, tbcol int) TAGS(tgcol tinyint)' %
+            (mt))
+        # TSIM:
+        # TSIM: $i = 0
+        i = 0
+        # TSIM: while $i < 5
+        while (i < 5):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 0 )
+            tdLog.info('create table %s using %s tags( 0 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 0 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM: while $i < 10
+        while (i < 10):
+            # TSIM: $tb = $tbPrefix . $i
+            tb = "%s%d" % (tbPrefix, i)
+            # TSIM: sql create table $tb using $mt tags( 1 )
+            tdLog.info('create table %s using %s tags( 1 )' % (tb, mt))
+            tdSql.execute('create table %s using %s tags( 1 )' % (tb, mt))
+            # TSIM: $x = 0
+            x = 0
+            # TSIM: while $x < $rowNum
+            while (x < rowNum):
+                # TSIM: $ms = $x . m
+                ms = "%dm" % x
+                # TSIM: sql insert into $tb values (now + $ms , $x )
+                tdLog.info(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                tdSql.execute(
+                    'insert into %s values (now + %s , %d )' %
+                    (tb, ms, x))
+                # TSIM: $x = $x + 1
+                x = x + 1
+                # TSIM: endw
+            # TSIM: $i = $i + 1
+            i = i + 1
+            # TSIM: endw
+        # TSIM:
+        # TSIM: print =============== step2
+        tdLog.info('=============== step2')
+        # TSIM: sleep 100
+        # TSIM: sql select * from $tb
+        tdLog.info('select * from %s' % (tb))
+        tdSql.query('select * from %s' % (tb))
+        # TSIM: if $rows != $rowNum then
+        tdLog.info('tdSql.checkRow($rowNum)')
+        tdSql.checkRows(rowNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (tb))
+        tdSql.query('select * from %s where ts < now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts <= now + 4m
+        tdLog.info('select * from %s where ts <= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts <= now + 4m' % (tb))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (tb))
+        tdSql.query('select * from %s where ts > now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts >= now + 4m
+        tdLog.info('select * from %s where ts >= now + 4m' % (tb))
+        tdSql.query('select * from %s where ts >= now + 4m' % (tb))
+        # TSIM: if $rows != 15 then
+        tdLog.info('tdSql.checkRow(15)')
+        tdSql.checkRows(15)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts < now + 4m and ts > now + 5m
+        tdLog.info(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and ts > now + 5m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > 100000 and ts < 100000
+        tdLog.info('select * from %s where ts > 100000 and ts < 100000' % (tb))
+        tdSql.query(
+            'select * from %s where ts > 100000 and ts < 100000' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts < now + 3m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 3m' %
+            (tb))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $tb where ts > now + 4m and ts > now + 5m and
+        # ts < now + 6m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts > now + 5m and ts < now + 6m' %
+            (tb))
+        # TSIM: if $rows != 1 then
+        tdLog.info('tdSql.checkRow(1)')
+        tdSql.checkRows(1)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step3
+        tdLog.info('=============== step3')
+        # TSIM: sql select * from $mt
+        tdLog.info('select * from %s' % (mt))
+        tdSql.query('select * from %s' % (mt))
+        # TSIM: if $rows != $totalNum then
+        tdLog.info('tdSql.checkRow($totalNum)')
+        tdSql.checkRows(totalNum)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: sql select * from $mt where ts < now + 4m
+        tdLog.info('select * from %s where ts < now + 4m' % (mt))
+        tdSql.query('select * from %s where ts < now + 4m' % (mt))
+        # TSIM: if $rows != 50 then
+        tdLog.info('tdSql.checkRow(50)')
+        tdSql.checkRows(50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m
+        tdLog.info('select * from %s where ts > now + 4m' % (mt))
+        tdSql.query('select * from %s where ts > now + 4m' % (mt))
+        # TSIM: if $rows != 150 then
+        tdLog.info('tdSql.checkRow(150)')
+        tdSql.checkRows(150)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts = now + 4m
+        tdLog.info('select * from %s where ts = now + 4m' % (mt))
+        tdSql.query('select * from %s where ts = now + 4m' % (mt))
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 10 then
+        tdLog.info('tdSql.checkRow(10)')
+        tdSql.checkRows(10)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step4
+        tdLog.info('=============== step4')
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 1
+        tdLog.info('select * from %s where tgcol = 1' % (mt))
+        tdSql.query('select * from %s where tgcol = 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 1
+        tdLog.info('select * from %s where tgcol <> 1' % (mt))
+        tdSql.query('select * from %s where tgcol <> 1' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol = 0
+        tdLog.info('select * from %s where tgcol = 0' % (mt))
+        tdSql.query('select * from %s where tgcol = 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where tgcol <> 0
+        tdLog.info('select * from %s where tgcol <> 0' % (mt))
+        tdSql.query('select * from %s where tgcol <> 0' % (mt))
+        # TSIM: if $rows != 100 then
+        tdLog.info('tdSql.checkRow(100)')
+        tdSql.checkRows(100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step5
+        tdLog.info('=============== step5')
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol = 1
+        tdLog.info('select * from %s where ts > now + 4m and tgcol = 1' % (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol = 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 1
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 1' %
+            (mt))
+        # TSIM: if $rows != 75 then
+        tdLog.info('tdSql.checkRow(75)')
+        tdSql.checkRows(75)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol = 0
+        tdLog.info('select * from %s where ts < now + 4m and tgcol = 0' % (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts < now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts < now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol = 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol = 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts <= now + 4m and tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts <= now + 4m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 25 then
+        tdLog.info('tdSql.checkRow(25)')
+        tdSql.checkRows(25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and ts < now + 5m and
+        # tgcol <> 0
+        tdLog.info(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and ts < now + 5m and tgcol <> 0' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM: sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts
+        # < now + 5m
+        tdLog.info(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        tdSql.query(
+            'select * from %s where ts > now + 4m and tgcol <> 0 and ts < now + 5m' %
+            (mt))
+        # TSIM: if $rows != 5 then
+        tdLog.info('tdSql.checkRow(5)')
+        tdSql.checkRows(5)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step6
+        tdLog.info('=============== step6')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 200 then
+        tdLog.info('tdSql.checkData(0, 0, 200)')
+        tdSql.checkData(0, 0, 200)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step7
+        tdLog.info('=============== step7')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step8
+        tdLog.info('=============== step8')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 50 then
+        tdLog.info('tdSql.checkData(0, 0, 50)')
+        tdSql.checkData(0, 0, 50)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step9
+        tdLog.info('=============== step9')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step10
+        tdLog.info('=============== step10')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group
+        # by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where tgcol = 1 group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 100 then
+        tdLog.info('tdSql.checkData(0, 0, 100)')
+        tdSql.checkData(0, 0, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== step11
+        tdLog.info('=============== step11')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+        # group by tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s where ts < now + 4m group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data00 != 25 then
+        tdLog.info('tdSql.checkData(0, 0, 25)')
+        tdSql.checkData(0, 0, 25)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM:
+        # TSIM: print =============== step12
+        tdLog.info('=============== step12')
+        # TSIM: sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol),
+        # max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by
+        # tgcol
+        tdLog.info(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        tdSql.query(
+            'select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from %s interval(1d) group by tgcol' %
+            (mt))
+        # TSIM: print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+        tdLog.info('$data00 $data01 $data02 $data03 $data04 $data05 $data06')
+        # TSIM: if $data01 != 100 then
+        tdLog.info('tdSql.checkData(0, 1, 100)')
+        tdSql.checkData(0, 1, 100)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: print =============== clear
+        tdLog.info('=============== clear')
+        # TSIM: sql drop database $db
+        tdLog.info('drop database db')
+        tdSql.execute('drop database db')
+        # TSIM: sql show databases
+        tdLog.info('show databases')
+        tdSql.query('show databases')
+        # TSIM: if $rows != 0 then
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
+        # TSIM: return -1
+        # TSIM: endi
+        # TSIM:
+        # TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
+# convert end
+
+        tdSql.execute("create database db")
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table if not exists st (ts timestamp, tagtype int) tags(dev tinyint)")
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % pow(2, 7))
+        tdSql.error(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (-1 * pow(2, 7)))
+        
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_001 using st tags(%d)' % (pow(2, 7) - 1))
+        tdSql.execute(
+            'CREATE TABLE if not exists dev_002 using st tags(%d)' % (-1 * pow(2, 7) + 1))
+
+        print("==============step2")    
+        tdSql.query("show tables")
+        tdSql.checkRows(2)   
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/tag_lite/too_many_tag_condtions.py b/tests/pytest/tag_lite/too_many_tag_condtions.py
new file mode 100644
index 0000000000000000000000000000000000000000..a40de405fffeff50ab5794a7838b869345430bf4
--- /dev/null
+++ b/tests/pytest/tag_lite/too_many_tag_condtions.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+        
+        tdLog.info('======================== dnode1 start')
+        tbPrefix = "ta_cr_tb"
+        mtPrefix = "ta_cr_mt"
+        tbNum = 2 
+        rowNum = 10 
+        totalNum = 200
+        tagCondsLimit = 1024
+        tdLog.info('=============== step1: create tbl and prepare data')
+        i = 0
+        i = 2
+        mt = "%s%d" % (mtPrefix, i)
+        tb = "%s%d" % (tbPrefix, i)
+         
+        sql ='create table %s (ts timestamp, tbcol int) TAGS(tgcol int)'% (mt)
+        tdLog.info(sql)
+        tdSql.execute(sql)
+        for i in range(0, tbNum): 
+          tblName = "%s%d"%(tbPrefix, i)
+          sql = 'create table %s using %s TAGS(%d)'%(tblName, mt, i) 
+          tdSql.execute(sql)
+          for j in range(0, rowNum):
+            sql = "insert into %s values(now, %d)"%(tblName, j) 
+            tdSql.execute(sql)
+
+        sqlPrefix = "select * from %s where "%(mt)    
+        for i in range(2, 2048, 1):
+          conds = "tgcol=1 and "* (i - 1)
+          conds = "%stgcol=1"%(conds)
+          sql = "%s%s"%(sqlPrefix, conds)
+          if i >= tagCondsLimit: 
+            tdSql.error(sql)
+          else:   
+            tdSql.query(sql)
+            #tdSql.checkRows(1)
+
+        for i in range(2, 2048, 1):
+          conds = "" 
+          for j in range(0, i - 1): 
+            conds = conds + "tgcol=%d or "%(j%tbNum)
+          conds += "tgcol=%d"%(i%tbNum)
+          sql = sqlPrefix + conds 
+          if i >= tagCondsLimit:
+            tdSql.error(sql)
+          else:  
+            tdSql.query(sql)
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
new file mode 100644
index 0000000000000000000000000000000000000000..678bd873368325d97783fac1e0f94cd76be38cef
--- /dev/null
+++ b/tests/pytest/test.py
@@ -0,0 +1,142 @@
+#!/usr/bin/python
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+# install pip
+# pip install src/connector/python/linux/python2/
+
+# -*- coding: utf-8 -*-
+import sys
+import getopt
+import subprocess
+from distutils.log import warn as printf
+
+from util.log import *
+from util.dnodes import *
+from util.cases import *
+
+import taos
+
+
+if __name__ == "__main__":
+    fileName = "all"
+    deployPath = ""
+    masterIp = ""
+    testCluster = False
+    valgrind = 0
+    logSql = True
+    stop = 0
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scgh', [
+        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help'])
+    for key, value in opts:
+        if key in ['-h', '--help']:
+            tdLog.printNoPrefix(
+                'A collection of test cases written using Python')
+            tdLog.printNoPrefix('-f Name of test case file written by Python')
+            tdLog.printNoPrefix('-p Deploy Path for Simulator')
+            tdLog.printNoPrefix('-m Master Ip for Simulator')
+            tdLog.printNoPrefix('-l <True:False> logSql Flag')
+            tdLog.printNoPrefix('-s stop All dnodes')
+            tdLog.printNoPrefix('-c Test Cluster Flag')
+            tdLog.printNoPrefix('-g valgrind Test Flag')
+            sys.exit(0)
+
+        if key in ['-f', '--file']:
+            fileName = value
+
+        if key in ['-p', '--path']:
+            deployPath = value
+
+        if key in ['-m', '--master']:
+            masterIp = value
+
+        if key in ['-l', '--logSql']:
+            if (value.upper() == "TRUE"):
+                logSql = True
+            elif (value.upper() == "FALSE"):
+                logSql = False
+            else:
+                tdLog.printNoPrefix("logSql value %s is invalid" % logSql)
+                sys.exit(0)
+
+        if key in ['-c', '--cluster']:
+            testCluster = True
+
+        if key in ['-g', '--valgrind']:
+            valgrind = 1
+
+        if key in ['-s', '--stop']:
+            stop = 1
+
+    if (stop != 0):
+        if (valgrind == 0):
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP > /dev/null 2>&1" % toBeKilled
+
+        psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+        processID = subprocess.check_output(psCmd, shell=True)
+
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        for port in range(6030, 6041):
+            usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            processID = subprocess.check_output(usePortPID, shell=True)
+
+            if processID:
+                killCmd = "kill -TERM %s" % processID
+                os.system(killCmd)
+            fuserCmd = "fuser -k -n tcp %d" % port
+            os.system(fuserCmd)
+        if valgrind:
+            time.sleep(2)
+
+        tdLog.info('stop All dnodes')
+        sys.exit(0)
+
+    tdDnodes.init(deployPath)
+    tdDnodes.setTestCluster(testCluster)
+    tdDnodes.setValgrind(valgrind)
+
+    tdDnodes.stopAll()
+    tdDnodes.deploy(1)
+    tdDnodes.start(1)
+
+    if masterIp == "":
+        host = '127.0.0.1'
+    else:
+        host = masterIp
+
+    tdLog.info("Procedures for tdengine deployed in %s" % (host))
+
+    tdCases.logSql(logSql)
+
+    if testCluster:
+        tdLog.info("Procedures for testing cluster")
+        if fileName == "all":
+            tdCases.runAllCluster()
+        else:
+            tdCases.runOneCluster(fileName)
+    else:
+        tdLog.info("Procedures for testing self-deployment")
+        conn = taos.connect(
+            host,
+            config=tdDnodes.getSimCfgPath())
+        if fileName == "all":
+            tdCases.runAllLinux(conn)
+        else:
+            tdCases.runOneLinux(conn, fileName)
+
+    conn.close()
diff --git a/tests/pytest/test.sh b/tests/pytest/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fbb9ba9879e0b22948fd448bba1bf5d0b7700497
--- /dev/null
+++ b/tests/pytest/test.sh
@@ -0,0 +1,23 @@
+EXEC_DIR=`dirname "$0"`
+if [[ $EXEC_DIR != "." ]]
+then
+    echo "ERROR: Please execute `basename "$0"` in its own directory (for now anyway, pardon the dust)"
+    exit -1
+fi
+CURR_DIR=`pwd`
+IN_TDINTERNAL="community"
+if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  TAOS_DIR=$CURR_DIR/../../..
+else
+  TAOS_DIR=$CURR_DIR/../..
+fi
+TAOSD_DIR=`find $TAOS_DIR -name "taosd"|grep bin|head -n1`
+LIB_DIR=`echo $TAOSD_DIR|rev|cut -d '/' -f 3,4,5,6|rev`/lib
+export PYTHONPATH=$(pwd)/../../src/connector/python/linux/python3
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_DIR
+
+if [[ "$1" == *"test.py"* ]]; then
+  python3 ./test.py $@
+else
+  python3 $1 $@
+fi
diff --git a/tests/pytest/testCompress.py b/tests/pytest/testCompress.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f5d9ef3b1b6898fa724eb9330f413e60fedd22b
--- /dev/null
+++ b/tests/pytest/testCompress.py
@@ -0,0 +1,136 @@
+#!/usr/bin/python
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+# install pip
+# pip install src/connector/python/linux/python2/
+
+# -*- coding: utf-8 -*-
+import sys
+import getopt
+import subprocess
+from distutils.log import warn as printf
+
+from util.log import *
+from util.dnodes import *
+from util.cases import *
+from util.sql import *
+
+import taos
+
+
+if __name__ == "__main__":
+    fileName = "all"
+    deployPath = ""
+    testCluster = False
+    valgrind = 0
+    logSql = True
+    stop = 0
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'l:sgh', [
+        'logSql', 'stop', 'valgrind', 'help'])
+    for key, value in opts:
+        if key in ['-h', '--help']:
+            tdLog.printNoPrefix(
+                'A collection of test cases written using Python')
+            tdLog.printNoPrefix('-l <True:False> logSql Flag')
+            tdLog.printNoPrefix('-s stop All dnodes')
+            tdLog.printNoPrefix('-g valgrind Test Flag')
+            sys.exit(0)
+
+        if key in ['-l', '--logSql']:
+            if (value.upper() == "TRUE"):
+                logSql = True
+            elif (value.upper() == "FALSE"):
+                logSql = False
+            else:
+                tdLog.printNoPrefix("logSql value %s is invalid" % logSql)
+                sys.exit(0)
+
+        if key in ['-g', '--valgrind']:
+            valgrind = 1
+
+        if key in ['-s', '--stop']:
+            stop = 1
+
+    if (stop != 0):
+        if (valgrind == 0):
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP > /dev/null 2>&1" % toBeKilled
+
+        psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+        processID = subprocess.check_output(psCmd, shell=True)
+
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        for port in range(6030, 6041):
+            usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            processID = subprocess.check_output(usePortPID, shell=True)
+
+            if processID:
+                killCmd = "kill -9 %s" % processID
+                os.system(killCmd)
+            fuserCmd = "fuser -k -n tcp %d" % port
+            os.system(fuserCmd)
+        if valgrind:
+            time.sleep(2)
+
+        tdLog.info('stop All dnodes')
+        sys.exit(0)
+
+    tdDnodes.init(deployPath)
+    tdDnodes.setTestCluster(testCluster)
+    tdDnodes.setValgrind(valgrind)
+
+    tdDnodes.stopAll()
+    tdDnodes.addSimExtraCfg("compressMsgSize", "10240")
+    tdDnodes.deploy(1)
+    tdDnodes.start(1)
+
+    host = '127.0.0.1'
+
+    tdLog.info("Procedures for tdengine deployed in %s" % (host))
+
+    tdCases.logSql(logSql)
+
+    conn = taos.connect(
+        host,
+        config=tdDnodes.getSimCfgPath())
+
+    tdSql.init(conn.cursor(), True)
+
+    tdSql.execute("CREATE DATABASE IF NOT EXISTS t10b")
+    tdSql.execute("USE t10b")
+    tdSql.execute(
+        "CREATE TABLE IF NOT EXISTS s_sensor_info (ts TIMESTAMP, temperature INT, humidity FLOAT)")
+
+    start_time = int(round(time.time() * 1000))
+    for i in range(1, 1000):
+        tdSql.execute("IMPORT INTO s_sensor_info VALUES (1575129600000, 16, 19.405090) (1575129601000, 22, 14.377142) (1575129602000, 16, 16.868231) (1575129603000, 20, 11.565193) (1575129604000, 31, 13.009119) (1575129605000, 29, 18.136400) (1575129606000, 17, 13.806572) (1575129607000, 23, 14.688898) (1575129608000, 26, 12.931019) (1575129609000, 32, 12.185531) (1575129610000, 30, 13.608714) (1575129611000, 23, 18.624914) (1575129612000, 22, 12.970826) (1575129613000, 22, 12.065827) (1575129614000, 25, 16.967192) (1575129615000, 16, 10.283031) (1575129616000, 22, 16.072535) (1575129617000, 24, 10.794536) (1575129618000, 32, 10.591207) (1575129619000, 20, 13.015227) (1575129620000, 28, 15.410999) (1575129621000, 29, 12.785076) (1575129622000, 28, 15.305857) (1575129623000, 33, 12.820810) (1575129624000, 34, 13.618055) (1575129625000, 32, 12.971123) (1575129626000, 24, 10.974546) (1575129627000, 15, 10.742910) (1575129628000, 23, 16.810783) (1575129629000, 18, 13.115224) (1575129630000, 26, 17.418489) (1575129631000, 20, 17.302315) (1575129632000, 21, 14.283571) (1575129633000, 16, 16.826534) (1575129634000, 18, 19.222122) (1575129635000, 18, 14.931420) (1575129636000, 17, 19.549454) (1575129637000, 22, 16.908388) (1575129638000, 32, 15.637796) (1575129639000, 31, 15.517650) (1575129640000, 18, 14.038033) (1575129641000, 32, 19.859648) (1575129642000, 16, 13.220840) (1575129643000, 28, 16.445398) (1575129644000, 26, 16.695753) (1575129645000, 33, 13.696928) (1575129646000, 21, 15.352819) (1575129647000, 15, 12.388407) (1575129648000, 27, 11.267529) (1575129649000, 20, 14.103228) (1575129650000, 20, 16.250950) (1575129651000, 30, 16.236088) (1575129652000, 22, 18.305340) (1575129653000, 25, 17.360685) (1575129654000, 25, 14.978681) (1575129655000, 33, 14.096183) (1575129656000, 26, 10.019039) (1575129657000, 19, 19.158213) (1575129658000, 22, 15.593924) (1575129659000, 26, 18.780119) (1575129660000, 21, 16.001656) (1575129661000, 16, 18.458328) (1575129662000, 21, 16.417843) (1575129663000, 28, 11.736558) (1575129664000, 34, 18.143946) (1575129665000, 27, 10.303225) (1575129666000, 20, 19.756748) (1575129667000, 22, 12.940063) (1575129668000, 23, 11.509640) (1575129669000, 19, 18.319309) (1575129670000, 19, 16.278345) (1575129671000, 27, 10.898361) (1575129672000, 31, 13.922162) (1575129673000, 15, 19.296116) (1575129674000, 26, 15.885763) (1575129675000, 15, 15.525804) (1575129676000, 19, 19.579538) (1575129677000, 20, 11.073811) (1575129678000, 16, 13.932510) (1575129679000, 17, 11.900328) (1575129680000, 22, 16.540415) (1575129681000, 33, 15.203803) (1575129682000, 17, 11.518434) (1575129683000, 17, 13.152081) (1575129684000, 18, 11.378041) (1575129685000, 21, 15.390745) (1575129686000, 30, 15.127818) (1575129687000, 19, 16.530401) (1575129688000, 32, 16.542702) (1575129689000, 26, 16.366442) (1575129690000, 25, 10.306822) (1575129691000, 15, 13.691117) (1575129692000, 15, 13.476817) (1575129693000, 25, 12.529998) (1575129694000, 22, 15.550021) (1575129695000, 20, 15.064971) (1575129696000, 24, 13.313683) (1575129697000, 23, 17.002878) (1575129698000, 30, 19.991594) (1575129699000, 15, 11.116746) (1575129699990, 16, 19.405090) (1575129700990, 22, 14.377142) (1575129701990, 16, 16.868231) (1575129702990, 20, 11.565193) (1575129703990, 31, 13.009119) (1575129704990, 29, 18.136400) (1575129705990, 17, 13.806572) (1575129706990, 23, 14.688898) (1575129707990, 26, 12.931019) (1575129708990, 32, 12.185531) (1575129709990, 30, 13.608714) (1575129710990, 23, 18.624914) (1575129711990, 22, 12.970826) (1575129712990, 22, 12.065827) (1575129713990, 25, 16.967192) (1575129714990, 16, 10.283031) (1575129715990, 22, 16.072535) (1575129716990, 24, 10.794536) (1575129717990, 32, 10.591207) (1575129718990, 20, 13.015227) (1575129719990, 28, 15.410999) (1575129720990, 29, 12.785076) (1575129721990, 28, 15.305857) (1575129722990, 33, 12.820810) (1575129723990, 34, 13.618055) (1575129724990, 32, 12.971123) (1575129725990, 24, 10.974546) (1575129726990, 15, 10.742910) (1575129727990, 23, 16.810783) (1575129728990, 18, 13.115224) (1575129729990, 26, 17.418489) (1575129730990, 20, 17.302315) (1575129731990, 21, 14.283571) (1575129732990, 16, 16.826534) (1575129733990, 18, 19.222122) (1575129734990, 18, 14.931420) (1575129735990, 17, 19.549454) (1575129736990, 22, 16.908388) (1575129737990, 32, 15.637796) (1575129738990, 31, 15.517650) (1575129739990, 18, 14.038033) (1575129740990, 32, 19.859648) (1575129741990, 16, 13.220840) (1575129742990, 28, 16.445398) (1575129743990, 26, 16.695753) (1575129744990, 33, 13.696928) (1575129745990, 21, 15.352819) (1575129746990, 15, 12.388407) (1575129747990, 27, 11.267529) (1575129748990, 20, 14.103228) (1575129749990, 20, 16.250950) (1575129750990, 30, 16.236088) (1575129751990, 22, 18.305340) (1575129752990, 25, 17.360685) (1575129753990, 25, 14.978681) (1575129754990, 33, 14.096183) (1575129755990, 26, 10.019039) (1575129756990, 19, 19.158213) (1575129757990, 22, 15.593924) (1575129758990, 26, 18.780119) (1575129759990, 21, 16.001656) (1575129760990, 16, 18.458328) (1575129761990, 21, 16.417843) (1575129762990, 28, 11.736558) (1575129763990, 34, 18.143946) (1575129764990, 27, 10.303225) (1575129765990, 20, 19.756748) (1575129766990, 22, 12.940063) (1575129767990, 23, 11.509640) (1575129768990, 19, 18.319309) (1575129769990, 19, 16.278345) (1575129770990, 27, 10.898361) (1575129771990, 31, 13.922162) (1575129772990, 15, 19.296116) (1575129773990, 26, 15.885763) (1575129774990, 15, 15.525804) (1575129775990, 19, 19.579538) (1575129776990, 20, 11.073811) (1575129777990, 16, 13.932510) (1575129778990, 17, 11.900328) (1575129779990, 22, 16.540415) (1575129780990, 33, 15.203803) (1575129781990, 17, 11.518434) (1575129782990, 17, 13.152081) (1575129783990, 18, 11.378041) (1575129784990, 21, 15.390745) (1575129785990, 30, 15.127818) (1575129786990, 19, 16.530401) (1575129787990, 32, 16.542702) (1575129788990, 26, 16.366442) (1575129789990, 25, 10.306822) (1575129790990, 15, 13.691117) (1575129791990, 15, 13.476817) (1575129792990, 25, 12.529998) (1575129793990, 22, 15.550021) (1575129794990, 20, 15.064971) (1575129795990, 24, 13.313683) (1575129796990, 23, 17.002878) (1575129797990, 30, 19.991594) (1575129798990, 15, 11.116746) (1575129799980, 16, 19.405090) (1575129800980, 22, 14.377142) (1575129801980, 16, 16.868231) (1575129802980, 20, 11.565193) (1575129803980, 31, 13.009119) (1575129804980, 29, 18.136400) (1575129805980, 17, 13.806572) (1575129806980, 23, 14.688898) (1575129807980, 26, 12.931019) (1575129808980, 32, 12.185531) (1575129809980, 30, 13.608714) (1575129810980, 23, 18.624914) (1575129811980, 22, 12.970826) (1575129812980, 22, 12.065827) (1575129813980, 25, 16.967192) (1575129814980, 16, 10.283031) (1575129815980, 22, 16.072535) (1575129816980, 24, 10.794536) (1575129817980, 32, 10.591207) (1575129818980, 20, 13.015227) (1575129819980, 28, 15.410999) (1575129820980, 29, 12.785076) (1575129821980, 28, 15.305857) (1575129822980, 33, 12.820810) (1575129823980, 34, 13.618055) (1575129824980, 32, 12.971123) (1575129825980, 24, 10.974546) (1575129826980, 15, 10.742910) (1575129827980, 23, 16.810783) (1575129828980, 18, 13.115224) (1575129829980, 26, 17.418489) (1575129830980, 20, 17.302315) (1575129831980, 21, 14.283571) (1575129832980, 16, 16.826534) (1575129833980, 18, 19.222122) (1575129834980, 18, 14.931420) (1575129835980, 17, 19.549454) (1575129836980, 22, 16.908388) (1575129837980, 32, 15.637796) (1575129838980, 31, 15.517650) (1575129839980, 18, 14.038033) (1575129840980, 32, 19.859648) (1575129841980, 16, 13.220840) (1575129842980, 28, 16.445398) (1575129843980, 26, 16.695753) (1575129844980, 33, 13.696928) (1575129845980, 21, 15.352819) (1575129846980, 15, 12.388407) (1575129847980, 27, 11.267529) (1575129848980, 20, 14.103228) (1575129849980, 20, 16.250950) (1575129850980, 30, 16.236088) (1575129851980, 22, 18.305340) (1575129852980, 25, 17.360685) (1575129853980, 25, 14.978681) (1575129854980, 33, 14.096183) (1575129855980, 26, 10.019039) (1575129856980, 19, 19.158213) (1575129857980, 22, 15.593924) (1575129858980, 26, 18.780119) (1575129859980, 21, 16.001656) (1575129860980, 16, 18.458328) (1575129861980, 21, 16.417843) (1575129862980, 28, 11.736558) (1575129863980, 34, 18.143946) (1575129864980, 27, 10.303225) (1575129865980, 20, 19.756748) (1575129866980, 22, 12.940063) (1575129867980, 23, 11.509640) (1575129868980, 19, 18.319309) (1575129869980, 19, 16.278345) (1575129870980, 27, 10.898361) (1575129871980, 31, 13.922162) (1575129872980, 15, 19.296116) (1575129873980, 26, 15.885763) (1575129874980, 15, 15.525804) (1575129875980, 19, 19.579538) (1575129876980, 20, 11.073811) (1575129877980, 16, 13.932510) (1575129878980, 17, 11.900328) (1575129879980, 22, 16.540415) (1575129880980, 33, 15.203803) (1575129881980, 17, 11.518434) (1575129882980, 17, 13.152081) (1575129883980, 18, 11.378041) (1575129884980, 21, 15.390745) (1575129885980, 30, 15.127818) (1575129886980, 19, 16.530401) (1575129887980, 32, 16.542702) (1575129888980, 26, 16.366442) (1575129889980, 25, 10.306822) (1575129890980, 15, 13.691117) (1575129891980, 15, 13.476817) (1575129892980, 25, 12.529998) (1575129893980, 22, 15.550021) (1575129894980, 20, 15.064971) (1575129895980, 24, 13.313683) (1575129896980, 23, 17.002878) (1575129897980, 30, 19.991594) (1575129898980, 15, 11.116746) (1575129899970, 16, 19.405090) (1575129900970, 22, 14.377142) (1575129901970, 16, 16.868231) (1575129902970, 20, 11.565193) (1575129903970, 31, 13.009119) (1575129904970, 29, 18.136400) (1575129905970, 17, 13.806572) (1575129906970, 23, 14.688898) (1575129907970, 26, 12.931019) (1575129908970, 32, 12.185531) (1575129909970, 30, 13.608714) (1575129910970, 23, 18.624914) (1575129911970, 22, 12.970826) (1575129912970, 22, 12.065827) (1575129913970, 25, 16.967192) (1575129914970, 16, 10.283031) (1575129915970, 22, 16.072535) (1575129916970, 24, 10.794536) (1575129917970, 32, 10.591207) (1575129918970, 20, 13.015227) (1575129919970, 28, 15.410999) (1575129920970, 29, 12.785076) (1575129921970, 28, 15.305857) (1575129922970, 33, 12.820810) (1575129923970, 34, 13.618055) (1575129924970, 32, 12.971123) (1575129925970, 24, 10.974546) (1575129926970, 15, 10.742910) (1575129927970, 23, 16.810783) (1575129928970, 18, 13.115224) (1575129929970, 26, 17.418489) (1575129930970, 20, 17.302315) (1575129931970, 21, 14.283571) (1575129932970, 16, 16.826534) (1575129933970, 18, 19.222122) (1575129934970, 18, 14.931420) (1575129935970, 17, 19.549454) (1575129936970, 22, 16.908388) (1575129937970, 32, 15.637796) (1575129938970, 31, 15.517650) (1575129939970, 18, 14.038033) (1575129940970, 32, 19.859648) (1575129941970, 16, 13.220840) (1575129942970, 28, 16.445398) (1575129943970, 26, 16.695753) (1575129944970, 33, 13.696928) (1575129945970, 21, 15.352819) (1575129946970, 15, 12.388407) (1575129947970, 27, 11.267529) (1575129948970, 20, 14.103228) (1575129949970, 20, 16.250950) (1575129950970, 30, 16.236088) (1575129951970, 22, 18.305340) (1575129952970, 25, 17.360685) (1575129953970, 25, 14.978681) (1575129954970, 33, 14.096183) (1575129955970, 26, 10.019039) (1575129956970, 19, 19.158213) (1575129957970, 22, 15.593924) (1575129958970, 26, 18.780119) (1575129959970, 21, 16.001656) (1575129960970, 16, 18.458328) (1575129961970, 21, 16.417843) (1575129962970, 28, 11.736558) (1575129963970, 34, 18.143946) (1575129964970, 27, 10.303225) (1575129965970, 20, 19.756748) (1575129966970, 22, 12.940063) (1575129967970, 23, 11.509640) (1575129968970, 19, 18.319309) (1575129969970, 19, 16.278345) (1575129970970, 27, 10.898361) (1575129971970, 31, 13.922162) (1575129972970, 15, 19.296116) (1575129973970, 26, 15.885763) (1575129974970, 15, 15.525804) (1575129975970, 19, 19.579538) (1575129976970, 20, 11.073811) (1575129977970, 16, 13.932510) (1575129978970, 17, 11.900328) (1575129979970, 22, 16.540415) (1575129980970, 33, 15.203803) (1575129981970, 17, 11.518434) (1575129982970, 17, 13.152081) (1575129983970, 18, 11.378041) (1575129984970, 21, 15.390745) (1575129985970, 30, 15.127818) (1575129986970, 19, 16.530401) (1575129987970, 32, 16.542702) (1575129988970, 26, 16.366442) (1575129989970, 25, 10.306822) (1575129990970, 15, 13.691117) (1575129991970, 15, 13.476817) (1575129992970, 25, 12.529998) (1575129993970, 22, 15.550021) (1575129994970, 20, 15.064971) (1575129995970, 24, 13.313683) (1575129996970, 23, 17.002878) (1575129997970, 30, 19.991594) (1575129998970, 15, 11.116746) (1575129999960, 16, 19.405090) (1575130000960, 22, 14.377142) (1575130001960, 16, 16.868231) (1575130002960, 20, 11.565193) (1575130003960, 31, 13.009119) (1575130004960, 29, 18.136400) (1575130005960, 17, 13.806572) (1575130006960, 23, 14.688898) (1575130007960, 26, 12.931019) (1575130008960, 32, 12.185531) (1575130009960, 30, 13.608714) (1575130010960, 23, 18.624914) (1575130011960, 22, 12.970826) (1575130012960, 22, 12.065827) (1575130013960, 25, 16.967192) (1575130014960, 16, 10.283031) (1575130015960, 22, 16.072535) (1575130016960, 24, 10.794536) (1575130017960, 32, 10.591207) (1575130018960, 20, 13.015227) (1575130019960, 28, 15.410999) (1575130020960, 29, 12.785076) (1575130021960, 28, 15.305857) (1575130022960, 33, 12.820810) (1575130023960, 34, 13.618055) (1575130024960, 32, 12.971123) (1575130025960, 24, 10.974546) (1575130026960, 15, 10.742910) (1575130027960, 23, 16.810783) (1575130028960, 18, 13.115224) (1575130029960, 26, 17.418489) (1575130030960, 20, 17.302315) (1575130031960, 21, 14.283571) (1575130032960, 16, 16.826534) (1575130033960, 18, 19.222122) (1575130034960, 18, 14.931420) (1575130035960, 17, 19.549454) (1575130036960, 22, 16.908388) (1575130037960, 32, 15.637796) (1575130038960, 31, 15.517650) (1575130039960, 18, 14.038033) (1575130040960, 32, 19.859648) (1575130041960, 16, 13.220840) (1575130042960, 28, 16.445398) (1575130043960, 26, 16.695753) (1575130044960, 33, 13.696928) (1575130045960, 21, 15.352819) (1575130046960, 15, 12.388407) (1575130047960, 27, 11.267529) (1575130048960, 20, 14.103228) (1575130049960, 20, 16.250950) (1575130050960, 30, 16.236088) (1575130051960, 22, 18.305340) (1575130052960, 25, 17.360685) (1575130053960, 25, 14.978681) (1575130054960, 33, 14.096183) (1575130055960, 26, 10.019039) (1575130056960, 19, 19.158213) (1575130057960, 22, 15.593924) (1575130058960, 26, 18.780119) (1575130059960, 21, 16.001656) (1575130060960, 16, 18.458328) (1575130061960, 21, 16.417843) (1575130062960, 28, 11.736558) (1575130063960, 34, 18.143946) (1575130064960, 27, 10.303225) (1575130065960, 20, 19.756748) (1575130066960, 22, 12.940063) (1575130067960, 23, 11.509640) (1575130068960, 19, 18.319309) (1575130069960, 19, 16.278345) (1575130070960, 27, 10.898361) (1575130071960, 31, 13.922162) (1575130072960, 15, 19.296116) (1575130073960, 26, 15.885763) (1575130074960, 15, 15.525804) (1575130075960, 19, 19.579538) (1575130076960, 20, 11.073811) (1575130077960, 16, 13.932510) (1575130078960, 17, 11.900328) (1575130079960, 22, 16.540415) (1575130080960, 33, 15.203803) (1575130081960, 17, 11.518434) (1575130082960, 17, 13.152081) (1575130083960, 18, 11.378041) (1575130084960, 21, 15.390745) (1575130085960, 30, 15.127818) (1575130086960, 19, 16.530401) (1575130087960, 32, 16.542702) (1575130088960, 26, 16.366442) (1575130089960, 25, 10.306822) (1575130090960, 15, 13.691117) (1575130091960, 15, 13.476817) (1575130092960, 25, 12.529998) (1575130093960, 22, 15.550021) (1575130094960, 20, 15.064971) (1575130095960, 24, 13.313683) (1575130096960, 23, 17.002878) (1575130097960, 30, 19.991594) (1575130098960, 15, 11.116746) (1575130099950, 16, 19.405090) (1575130100950, 22, 14.377142) (1575130101950, 16, 16.868231) (1575130102950, 20, 11.565193) (1575130103950, 31, 13.009119) (1575130104950, 29, 18.136400) (1575130105950, 17, 13.806572) (1575130106950, 23, 14.688898) (1575130107950, 26, 12.931019) (1575130108950, 32, 12.185531) (1575130109950, 30, 13.608714) (1575130110950, 23, 18.624914) (1575130111950, 22, 12.970826) (1575130112950, 22, 12.065827) (1575130113950, 25, 16.967192) (1575130114950, 16, 10.283031) (1575130115950, 22, 16.072535) (1575130116950, 24, 10.794536) (1575130117950, 32, 10.591207) (1575130118950, 20, 13.015227) (1575130119950, 28, 15.410999) (1575130120950, 29, 12.785076) (1575130121950, 28, 15.305857) (1575130122950, 33, 12.820810) (1575130123950, 34, 13.618055) (1575130124950, 32, 12.971123) (1575130125950, 24, 10.974546) (1575130126950, 15, 10.742910) (1575130127950, 23, 16.810783) (1575130128950, 18, 13.115224) (1575130129950, 26, 17.418489) (1575130130950, 20, 17.302315) (1575130131950, 21, 14.283571) (1575130132950, 16, 16.826534) (1575130133950, 18, 19.222122) (1575130134950, 18, 14.931420) (1575130135950, 17, 19.549454) (1575130136950, 22, 16.908388) (1575130137950, 32, 15.637796) (1575130138950, 31, 15.517650) (1575130139950, 18, 14.038033) (1575130140950, 32, 19.859648) (1575130141950, 16, 13.220840) (1575130142950, 28, 16.445398) (1575130143950, 26, 16.695753) (1575130144950, 33, 13.696928) (1575130145950, 21, 15.352819) (1575130146950, 15, 12.388407) (1575130147950, 27, 11.267529) (1575130148950, 20, 14.103228) (1575130149950, 20, 16.250950) (1575130150950, 30, 16.236088) (1575130151950, 22, 18.305340) (1575130152950, 25, 17.360685) (1575130153950, 25, 14.978681) (1575130154950, 33, 14.096183) (1575130155950, 26, 10.019039) (1575130156950, 19, 19.158213) (1575130157950, 22, 15.593924) (1575130158950, 26, 18.780119) (1575130159950, 21, 16.001656) (1575130160950, 16, 18.458328) (1575130161950, 21, 16.417843) (1575130162950, 28, 11.736558) (1575130163950, 34, 18.143946) (1575130164950, 27, 10.303225) (1575130165950, 20, 19.756748) (1575130166950, 22, 12.940063) (1575130167950, 23, 11.509640) (1575130168950, 19, 18.319309) (1575130169950, 19, 16.278345) (1575130170950, 27, 10.898361) (1575130171950, 31, 13.922162) (1575130172950, 15, 19.296116) (1575130173950, 26, 15.885763) (1575130174950, 15, 15.525804) (1575130175950, 19, 19.579538) (1575130176950, 20, 11.073811) (1575130177950, 16, 13.932510) (1575130178950, 17, 11.900328) (1575130179950, 22, 16.540415) (1575130180950, 33, 15.203803) (1575130181950, 17, 11.518434) (1575130182950, 17, 13.152081) (1575130183950, 18, 11.378041) (1575130184950, 21, 15.390745) (1575130185950, 30, 15.127818) (1575130186950, 19, 16.530401) (1575130187950, 32, 16.542702) (1575130188950, 26, 16.366442) (1575130189950, 25, 10.306822) (1575130190950, 15, 13.691117) (1575130191950, 15, 13.476817) (1575130192950, 25, 12.529998) (1575130193950, 22, 15.550021) (1575130194950, 20, 15.064971) (1575130195950, 24, 13.313683) (1575130196950, 23, 17.002878) (1575130197950, 30, 19.991594) (1575130198950, 15, 11.116746) (1575130199940, 16, 19.405090) (1575130200940, 22, 14.377142) (1575130201940, 16, 16.868231) (1575130202940, 20, 11.565193) (1575130203940, 31, 13.009119) (1575130204940, 29, 18.136400) (1575130205940, 17, 13.806572) (1575130206940, 23, 14.688898) (1575130207940, 26, 12.931019) (1575130208940, 32, 12.185531) (1575130209940, 30, 13.608714) (1575130210940, 23, 18.624914) (1575130211940, 22, 12.970826) (1575130212940, 22, 12.065827) (1575130213940, 25, 16.967192) (1575130214940, 16, 10.283031) (1575130215940, 22, 16.072535) (1575130216940, 24, 10.794536) (1575130217940, 32, 10.591207) (1575130218940, 20, 13.015227) (1575130219940, 28, 15.410999) (1575130220940, 29, 12.785076) (1575130221940, 28, 15.305857) (1575130222940, 33, 12.820810) (1575130223940, 34, 13.618055) (1575130224940, 32, 12.971123) (1575130225940, 24, 10.974546) (1575130226940, 15, 10.742910) (1575130227940, 23, 16.810783) (1575130228940, 18, 13.115224) (1575130229940, 26, 17.418489) (1575130230940, 20, 17.302315) (1575130231940, 21, 14.283571) (1575130232940, 16, 16.826534) (1575130233940, 18, 19.222122) (1575130234940, 18, 14.931420) (1575130235940, 17, 19.549454) (1575130236940, 22, 16.908388) (1575130237940, 32, 15.637796) (1575130238940, 31, 15.517650) (1575130239940, 18, 14.038033) (1575130240940, 32, 19.859648) (1575130241940, 16, 13.220840) (1575130242940, 28, 16.445398) (1575130243940, 26, 16.695753) (1575130244940, 33, 13.696928) (1575130245940, 21, 15.352819) (1575130246940, 15, 12.388407) (1575130247940, 27, 11.267529) (1575130248940, 20, 14.103228) (1575130249940, 20, 16.250950) (1575130250940, 30, 16.236088) (1575130251940, 22, 18.305340) (1575130252940, 25, 17.360685) (1575130253940, 25, 14.978681) (1575130254940, 33, 14.096183) (1575130255940, 26, 10.019039) (1575130256940, 19, 19.158213) (1575130257940, 22, 15.593924) (1575130258940, 26, 18.780119) (1575130259940, 21, 16.001656) (1575130260940, 16, 18.458328) (1575130261940, 21, 16.417843) (1575130262940, 28, 11.736558) (1575130263940, 34, 18.143946) (1575130264940, 27, 10.303225) (1575130265940, 20, 19.756748) (1575130266940, 22, 12.940063) (1575130267940, 23, 11.509640) (1575130268940, 19, 18.319309) (1575130269940, 19, 16.278345) (1575130270940, 27, 10.898361) (1575130271940, 31, 13.922162) (1575130272940, 15, 19.296116) (1575130273940, 26, 15.885763) (1575130274940, 15, 15.525804) (1575130275940, 19, 19.579538) (1575130276940, 20, 11.073811) (1575130277940, 16, 13.932510) (1575130278940, 17, 11.900328) (1575130279940, 22, 16.540415) (1575130280940, 33, 15.203803) (1575130281940, 17, 11.518434) (1575130282940, 17, 13.152081) (1575130283940, 18, 11.378041) (1575130284940, 21, 15.390745) (1575130285940, 30, 15.127818) (1575130286940, 19, 16.530401) (1575130287940, 32, 16.542702) (1575130288940, 26, 16.366442) (1575130289940, 25, 10.306822) (1575130290940, 15, 13.691117) (1575130291940, 15, 13.476817) (1575130292940, 25, 12.529998) (1575130293940, 22, 15.550021) (1575130294940, 20, 15.064971) (1575130295940, 24, 13.313683) (1575130296940, 23, 17.002878) (1575130297940, 30, 19.991594) (1575130298940, 15, 11.116746) (1575130299930, 16, 19.405090) (1575130300930, 22, 14.377142) (1575130301930, 16, 16.868231) (1575130302930, 20, 11.565193) (1575130303930, 31, 13.009119) (1575130304930, 29, 18.136400) (1575130305930, 17, 13.806572) (1575130306930, 23, 14.688898) (1575130307930, 26, 12.931019) (1575130308930, 32, 12.185531) (1575130309930, 30, 13.608714) (1575130310930, 23, 18.624914) (1575130311930, 22, 12.970826) (1575130312930, 22, 12.065827) (1575130313930, 25, 16.967192) (1575130314930, 16, 10.283031) (1575130315930, 22, 16.072535) (1575130316930, 24, 10.794536) (1575130317930, 32, 10.591207) (1575130318930, 20, 13.015227) (1575130319930, 28, 15.410999) (1575130320930, 29, 12.785076) (1575130321930, 28, 15.305857) (1575130322930, 33, 12.820810) (1575130323930, 34, 13.618055) (1575130324930, 32, 12.971123) (1575130325930, 24, 10.974546) (1575130326930, 15, 10.742910) (1575130327930, 23, 16.810783) (1575130328930, 18, 13.115224) (1575130329930, 26, 17.418489) (1575130330930, 20, 17.302315) (1575130331930, 21, 14.283571) (1575130332930, 16, 16.826534) (1575130333930, 18, 19.222122) (1575130334930, 18, 14.931420) (1575130335930, 17, 19.549454) (1575130336930, 22, 16.908388) (1575130337930, 32, 15.637796) (1575130338930, 31, 15.517650) (1575130339930, 18, 14.038033) (1575130340930, 32, 19.859648) (1575130341930, 16, 13.220840) (1575130342930, 28, 16.445398) (1575130343930, 26, 16.695753) (1575130344930, 33, 13.696928) (1575130345930, 21, 15.352819) (1575130346930, 15, 12.388407) (1575130347930, 27, 11.267529) (1575130348930, 20, 14.103228) (1575130349930, 20, 16.250950) (1575130350930, 30, 16.236088) (1575130351930, 22, 18.305340) (1575130352930, 25, 17.360685) (1575130353930, 25, 14.978681) (1575130354930, 33, 14.096183) (1575130355930, 26, 10.019039) (1575130356930, 19, 19.158213) (1575130357930, 22, 15.593924) (1575130358930, 26, 18.780119) (1575130359930, 21, 16.001656) (1575130360930, 16, 18.458328) (1575130361930, 21, 16.417843) (1575130362930, 28, 11.736558) (1575130363930, 34, 18.143946) (1575130364930, 27, 10.303225) (1575130365930, 20, 19.756748) (1575130366930, 22, 12.940063) (1575130367930, 23, 11.509640) (1575130368930, 19, 18.319309) (1575130369930, 19, 16.278345) (1575130370930, 27, 10.898361) (1575130371930, 31, 13.922162) (1575130372930, 15, 19.296116) (1575130373930, 26, 15.885763) (1575130374930, 15, 15.525804) (1575130375930, 19, 19.579538) (1575130376930, 20, 11.073811) (1575130377930, 16, 13.932510) (1575130378930, 17, 11.900328) (1575130379930, 22, 16.540415) (1575130380930, 33, 15.203803) (1575130381930, 17, 11.518434) (1575130382930, 17, 13.152081) (1575130383930, 18, 11.378041) (1575130384930, 21, 15.390745) (1575130385930, 30, 15.127818) (1575130386930, 19, 16.530401) (1575130387930, 32, 16.542702) (1575130388930, 26, 16.366442) (1575130389930, 25, 10.306822) (1575130390930, 15, 13.691117) (1575130391930, 15, 13.476817) (1575130392930, 25, 12.529998) (1575130393930, 22, 15.550021) (1575130394930, 20, 15.064971) (1575130395930, 24, 13.313683) (1575130396930, 23, 17.002878) (1575130397930, 30, 19.991594) (1575130398930, 15, 11.116746) (1575130399920, 16, 19.405090) (1575130400920, 22, 14.377142) (1575130401920, 16, 16.868231) (1575130402920, 20, 11.565193) (1575130403920, 31, 13.009119) (1575130404920, 29, 18.136400) (1575130405920, 17, 13.806572) (1575130406920, 23, 14.688898) (1575130407920, 26, 12.931019) (1575130408920, 32, 12.185531) (1575130409920, 30, 13.608714) (1575130410920, 23, 18.624914) (1575130411920, 22, 12.970826) (1575130412920, 22, 12.065827) (1575130413920, 25, 16.967192) (1575130414920, 16, 10.283031) (1575130415920, 22, 16.072535) (1575130416920, 24, 10.794536) (1575130417920, 32, 10.591207) (1575130418920, 20, 13.015227) (1575130419920, 28, 15.410999) (1575130420920, 29, 12.785076) (1575130421920, 28, 15.305857) (1575130422920, 33, 12.820810) (1575130423920, 34, 13.618055) (1575130424920, 32, 12.971123) (1575130425920, 24, 10.974546) (1575130426920, 15, 10.742910) (1575130427920, 23, 16.810783) (1575130428920, 18, 13.115224) (1575130429920, 26, 17.418489) (1575130430920, 20, 17.302315) (1575130431920, 21, 14.283571) (1575130432920, 16, 16.826534) (1575130433920, 18, 19.222122) (1575130434920, 18, 14.931420) (1575130435920, 17, 19.549454) (1575130436920, 22, 16.908388) (1575130437920, 32, 15.637796) (1575130438920, 31, 15.517650) (1575130439920, 18, 14.038033) (1575130440920, 32, 19.859648) (1575130441920, 16, 13.220840) (1575130442920, 28, 16.445398) (1575130443920, 26, 16.695753) (1575130444920, 33, 13.696928) (1575130445920, 21, 15.352819) (1575130446920, 15, 12.388407) (1575130447920, 27, 11.267529) (1575130448920, 20, 14.103228) (1575130449920, 20, 16.250950) (1575130450920, 30, 16.236088) (1575130451920, 22, 18.305340) (1575130452920, 25, 17.360685) (1575130453920, 25, 14.978681) (1575130454920, 33, 14.096183) (1575130455920, 26, 10.019039) (1575130456920, 19, 19.158213) (1575130457920, 22, 15.593924) (1575130458920, 26, 18.780119) (1575130459920, 21, 16.001656) (1575130460920, 16, 18.458328) (1575130461920, 21, 16.417843) (1575130462920, 28, 11.736558) (1575130463920, 34, 18.143946) (1575130464920, 27, 10.303225) (1575130465920, 20, 19.756748) (1575130466920, 22, 12.940063) (1575130467920, 23, 11.509640) (1575130468920, 19, 18.319309) (1575130469920, 19, 16.278345) (1575130470920, 27, 10.898361) (1575130471920, 31, 13.922162) (1575130472920, 15, 19.296116) (1575130473920, 26, 15.885763) (1575130474920, 15, 15.525804) (1575130475920, 19, 19.579538) (1575130476920, 20, 11.073811) (1575130477920, 16, 13.932510) (1575130478920, 17, 11.900328) (1575130479920, 22, 16.540415) (1575130480920, 33, 15.203803) (1575130481920, 17, 11.518434) (1575130482920, 17, 13.152081) (1575130483920, 18, 11.378041) (1575130484920, 21, 15.390745) (1575130485920, 30, 15.127818) (1575130486920, 19, 16.530401) (1575130487920, 32, 16.542702) (1575130488920, 26, 16.366442) (1575130489920, 25, 10.306822) (1575130490920, 15, 13.691117) (1575130491920, 15, 13.476817) (1575130492920, 25, 12.529998) (1575130493920, 22, 15.550021) (1575130494920, 20, 15.064971) (1575130495920, 24, 13.313683) (1575130496920, 23, 17.002878) (1575130497920, 30, 19.991594) (1575130498920, 15, 11.116746) (1575130499910, 16, 19.405090) (1575130500910, 22, 14.377142) (1575130501910, 16, 16.868231) (1575130502910, 20, 11.565193) (1575130503910, 31, 13.009119) (1575130504910, 29, 18.136400) (1575130505910, 17, 13.806572) (1575130506910, 23, 14.688898) (1575130507910, 26, 12.931019) (1575130508910, 32, 12.185531) (1575130509910, 30, 13.608714) (1575130510910, 23, 18.624914) (1575130511910, 22, 12.970826) (1575130512910, 22, 12.065827) (1575130513910, 25, 16.967192) (1575130514910, 16, 10.283031) (1575130515910, 22, 16.072535) (1575130516910, 24, 10.794536) (1575130517910, 32, 10.591207) (1575130518910, 20, 13.015227) (1575130519910, 28, 15.410999) (1575130520910, 29, 12.785076) (1575130521910, 28, 15.305857) (1575130522910, 33, 12.820810) (1575130523910, 34, 13.618055) (1575130524910, 32, 12.971123) (1575130525910, 24, 10.974546) (1575130526910, 15, 10.742910) (1575130527910, 23, 16.810783) (1575130528910, 18, 13.115224) (1575130529910, 26, 17.418489) (1575130530910, 20, 17.302315) (1575130531910, 21, 14.283571) (1575130532910, 16, 16.826534) (1575130533910, 18, 19.222122) (1575130534910, 18, 14.931420) (1575130535910, 17, 19.549454) (1575130536910, 22, 16.908388) (1575130537910, 32, 15.637796) (1575130538910, 31, 15.517650) (1575130539910, 18, 14.038033) (1575130540910, 32, 19.859648) (1575130541910, 16, 13.220840) (1575130542910, 28, 16.445398) (1575130543910, 26, 16.695753) (1575130544910, 33, 13.696928) (1575130545910, 21, 15.352819) (1575130546910, 15, 12.388407) (1575130547910, 27, 11.267529) (1575130548910, 20, 14.103228) (1575130549910, 20, 16.250950) (1575130550910, 30, 16.236088) (1575130551910, 22, 18.305340) (1575130552910, 25, 17.360685) (1575130553910, 25, 14.978681) (1575130554910, 33, 14.096183) (1575130555910, 26, 10.019039) (1575130556910, 19, 19.158213) (1575130557910, 22, 15.593924) (1575130558910, 26, 18.780119) (1575130559910, 21, 16.001656) (1575130560910, 16, 18.458328) (1575130561910, 21, 16.417843) (1575130562910, 28, 11.736558) (1575130563910, 34, 18.143946) (1575130564910, 27, 10.303225) (1575130565910, 20, 19.756748) (1575130566910, 22, 12.940063) (1575130567910, 23, 11.509640) (1575130568910, 19, 18.319309) (1575130569910, 19, 16.278345) (1575130570910, 27, 10.898361) (1575130571910, 31, 13.922162) (1575130572910, 15, 19.296116) (1575130573910, 26, 15.885763) (1575130574910, 15, 15.525804) (1575130575910, 19, 19.579538) (1575130576910, 20, 11.073811) (1575130577910, 16, 13.932510) (1575130578910, 17, 11.900328) (1575130579910, 22, 16.540415) (1575130580910, 33, 15.203803) (1575130581910, 17, 11.518434) (1575130582910, 17, 13.152081) (1575130583910, 18, 11.378041) (1575130584910, 21, 15.390745) (1575130585910, 30, 15.127818) (1575130586910, 19, 16.530401) (1575130587910, 32, 16.542702) (1575130588910, 26, 16.366442) (1575130589910, 25, 10.306822) (1575130590910, 15, 13.691117) (1575130591910, 15, 13.476817) (1575130592910, 25, 12.529998) (1575130593910, 22, 15.550021) (1575130594910, 20, 15.064971) (1575130595910, 24, 13.313683) (1575130596910, 23, 17.002878) (1575130597910, 30, 19.991594) (1575130598910, 15, 11.116746) (1575130599900, 16, 19.405090) (1575130600900, 22, 14.377142) (1575130601900, 16, 16.868231) (1575130602900, 20, 11.565193) (1575130603900, 31, 13.009119) (1575130604900, 29, 18.136400) (1575130605900, 17, 13.806572) (1575130606900, 23, 14.688898) (1575130607900, 26, 12.931019) (1575130608900, 32, 12.185531) (1575130609900, 30, 13.608714) (1575130610900, 23, 18.624914) (1575130611900, 22, 12.970826) (1575130612900, 22, 12.065827) (1575130613900, 25, 16.967192) (1575130614900, 16, 10.283031) (1575130615900, 22, 16.072535) (1575130616900, 24, 10.794536) (1575130617900, 32, 10.591207) (1575130618900, 20, 13.015227) (1575130619900, 28, 15.410999) (1575130620900, 29, 12.785076) (1575130621900, 28, 15.305857) (1575130622900, 33, 12.820810) (1575130623900, 34, 13.618055) (1575130624900, 32, 12.971123) (1575130625900, 24, 10.974546) (1575130626900, 15, 10.742910) (1575130627900, 23, 16.810783) (1575130628900, 18, 13.115224) (1575130629900, 26, 17.418489) (1575130630900, 20, 17.302315) (1575130631900, 21, 14.283571) (1575130632900, 16, 16.826534) (1575130633900, 18, 19.222122) (1575130634900, 18, 14.931420) (1575130635900, 17, 19.549454) (1575130636900, 22, 16.908388) (1575130637900, 32, 15.637796) (1575130638900, 31, 15.517650) (1575130639900, 18, 14.038033) (1575130640900, 32, 19.859648) (1575130641900, 16, 13.220840) (1575130642900, 28, 16.445398) (1575130643900, 26, 16.695753) (1575130644900, 33, 13.696928) (1575130645900, 21, 15.352819) (1575130646900, 15, 12.388407) (1575130647900, 27, 11.267529) (1575130648900, 20, 14.103228) (1575130649900, 20, 16.250950) (1575130650900, 30, 16.236088) (1575130651900, 22, 18.305340) (1575130652900, 25, 17.360685) (1575130653900, 25, 14.978681) (1575130654900, 33, 14.096183) (1575130655900, 26, 10.019039) (1575130656900, 19, 19.158213) (1575130657900, 22, 15.593924) (1575130658900, 26, 18.780119) (1575130659900, 21, 16.001656) (1575130660900, 16, 18.458328) (1575130661900, 21, 16.417843) (1575130662900, 28, 11.736558) (1575130663900, 34, 18.143946) (1575130664900, 27, 10.303225) (1575130665900, 20, 19.756748) (1575130666900, 22, 12.940063) (1575130667900, 23, 11.509640) (1575130668900, 19, 18.319309) (1575130669900, 19, 16.278345) (1575130670900, 27, 10.898361) (1575130671900, 31, 13.922162) (1575130672900, 15, 19.296116) (1575130673900, 26, 15.885763) (1575130674900, 15, 15.525804) (1575130675900, 19, 19.579538) (1575130676900, 20, 11.073811) (1575130677900, 16, 13.932510) (1575130678900, 17, 11.900328) (1575130679900, 22, 16.540415) (1575130680900, 33, 15.203803) (1575130681900, 17, 11.518434) (1575130682900, 17, 13.152081) (1575130683900, 18, 11.378041) (1575130684900, 21, 15.390745) (1575130685900, 30, 15.127818) (1575130686900, 19, 16.530401) (1575130687900, 32, 16.542702) (1575130688900, 26, 16.366442) (1575130689900, 25, 10.306822) (1575130690900, 15, 13.691117) (1575130691900, 15, 13.476817) (1575130692900, 25, 12.529998) (1575130693900, 22, 15.550021) (1575130694900, 20, 15.064971) (1575130695900, 24, 13.313683) (1575130696900, 23, 17.002878) (1575130697900, 30, 19.991594) (1575130698900, 15, 11.116746) (1575130699890, 16, 19.405090) (1575130700890, 22, 14.377142) (1575130701890, 16, 16.868231) (1575130702890, 20, 11.565193) (1575130703890, 31, 13.009119) (1575130704890, 29, 18.136400) (1575130705890, 17, 13.806572) (1575130706890, 23, 14.688898) (1575130707890, 26, 12.931019) (1575130708890, 32, 12.185531) (1575130709890, 30, 13.608714) (1575130710890, 23, 18.624914) (1575130711890, 22, 12.970826) (1575130712890, 22, 12.065827) (1575130713890, 25, 16.967192) (1575130714890, 16, 10.283031) (1575130715890, 22, 16.072535) (1575130716890, 24, 10.794536) (1575130717890, 32, 10.591207) (1575130718890, 20, 13.015227) (1575130719890, 28, 15.410999) (1575130720890, 29, 12.785076) (1575130721890, 28, 15.305857) (1575130722890, 33, 12.820810) (1575130723890, 34, 13.618055) (1575130724890, 32, 12.971123) (1575130725890, 24, 10.974546) (1575130726890, 15, 10.742910) (1575130727890, 23, 16.810783) (1575130728890, 18, 13.115224) (1575130729890, 26, 17.418489) (1575130730890, 20, 17.302315) (1575130731890, 21, 14.283571) (1575130732890, 16, 16.826534) (1575130733890, 18, 19.222122) (1575130734890, 18, 14.931420) (1575130735890, 17, 19.549454) (1575130736890, 22, 16.908388) (1575130737890, 32, 15.637796) (1575130738890, 31, 15.517650) (1575130739890, 18, 14.038033) (1575130740890, 32, 19.859648) (1575130741890, 16, 13.220840) (1575130742890, 28, 16.445398) (1575130743890, 26, 16.695753) (1575130744890, 33, 13.696928) (1575130745890, 21, 15.352819) (1575130746890, 15, 12.388407) (1575130747890, 27, 11.267529) (1575130748890, 20, 14.103228) (1575130749890, 20, 16.250950) (1575130750890, 30, 16.236088) (1575130751890, 22, 18.305340) (1575130752890, 25, 17.360685) (1575130753890, 25, 14.978681) (1575130754890, 33, 14.096183) (1575130755890, 26, 10.019039) (1575130756890, 19, 19.158213) (1575130757890, 22, 15.593924) (1575130758890, 26, 18.780119) (1575130759890, 21, 16.001656) (1575130760890, 16, 18.458328) (1575130761890, 21, 16.417843) (1575130762890, 28, 11.736558) (1575130763890, 34, 18.143946) (1575130764890, 27, 10.303225) (1575130765890, 20, 19.756748) (1575130766890, 22, 12.940063) (1575130767890, 23, 11.509640) (1575130768890, 19, 18.319309) (1575130769890, 19, 16.278345) (1575130770890, 27, 10.898361) (1575130771890, 31, 13.922162) (1575130772890, 15, 19.296116) (1575130773890, 26, 15.885763) (1575130774890, 15, 15.525804) (1575130775890, 19, 19.579538) (1575130776890, 20, 11.073811) (1575130777890, 16, 13.932510) (1575130778890, 17, 11.900328) (1575130779890, 22, 16.540415) (1575130780890, 33, 15.203803) (1575130781890, 17, 11.518434) (1575130782890, 17, 13.152081) (1575130783890, 18, 11.378041) (1575130784890, 21, 15.390745) (1575130785890, 30, 15.127818) (1575130786890, 19, 16.530401) (1575130787890, 32, 16.542702) (1575130788890, 26, 16.366442) (1575130789890, 25, 10.306822) (1575130790890, 15, 13.691117) (1575130791890, 15, 13.476817) (1575130792890, 25, 12.529998) (1575130793890, 22, 15.550021) (1575130794890, 20, 15.064971) (1575130795890, 24, 13.313683) (1575130796890, 23, 17.002878) (1575130797890, 30, 19.991594) (1575130798890, 15, 11.116746) (1575130799880, 16, 19.405090) (1575130800880, 22, 14.377142) (1575130801880, 16, 16.868231) (1575130802880, 20, 11.565193) (1575130803880, 31, 13.009119) (1575130804880, 29, 18.136400) (1575130805880, 17, 13.806572) (1575130806880, 23, 14.688898) (1575130807880, 26, 12.931019) (1575130808880, 32, 12.185531) (1575130809880, 30, 13.608714) (1575130810880, 23, 18.624914) (1575130811880, 22, 12.970826) (1575130812880, 22, 12.065827) (1575130813880, 25, 16.967192) (1575130814880, 16, 10.283031) (1575130815880, 22, 16.072535) (1575130816880, 24, 10.794536) (1575130817880, 32, 10.591207) (1575130818880, 20, 13.015227) (1575130819880, 28, 15.410999) (1575130820880, 29, 12.785076) (1575130821880, 28, 15.305857) (1575130822880, 33, 12.820810) (1575130823880, 34, 13.618055) (1575130824880, 32, 12.971123) (1575130825880, 24, 10.974546) (1575130826880, 15, 10.742910) (1575130827880, 23, 16.810783) (1575130828880, 18, 13.115224) (1575130829880, 26, 17.418489) (1575130830880, 20, 17.302315) (1575130831880, 21, 14.283571) (1575130832880, 16, 16.826534) (1575130833880, 18, 19.222122) (1575130834880, 18, 14.931420) (1575130835880, 17, 19.549454) (1575130836880, 22, 16.908388) (1575130837880, 32, 15.637796) (1575130838880, 31, 15.517650) (1575130839880, 18, 14.038033) (1575130840880, 32, 19.859648) (1575130841880, 16, 13.220840) (1575130842880, 28, 16.445398) (1575130843880, 26, 16.695753) (1575130844880, 33, 13.696928) (1575130845880, 21, 15.352819) (1575130846880, 15, 12.388407) (1575130847880, 27, 11.267529) (1575130848880, 20, 14.103228) (1575130849880, 20, 16.250950) (1575130850880, 30, 16.236088) (1575130851880, 22, 18.305340) (1575130852880, 25, 17.360685) (1575130853880, 25, 14.978681) (1575130854880, 33, 14.096183) (1575130855880, 26, 10.019039) (1575130856880, 19, 19.158213) (1575130857880, 22, 15.593924) (1575130858880, 26, 18.780119) (1575130859880, 21, 16.001656) (1575130860880, 16, 18.458328) (1575130861880, 21, 16.417843) (1575130862880, 28, 11.736558) (1575130863880, 34, 18.143946) (1575130864880, 27, 10.303225) (1575130865880, 20, 19.756748) (1575130866880, 22, 12.940063) (1575130867880, 23, 11.509640) (1575130868880, 19, 18.319309) (1575130869880, 19, 16.278345) (1575130870880, 27, 10.898361) (1575130871880, 31, 13.922162) (1575130872880, 15, 19.296116) (1575130873880, 26, 15.885763) (1575130874880, 15, 15.525804) (1575130875880, 19, 19.579538) (1575130876880, 20, 11.073811) (1575130877880, 16, 13.932510) (1575130878880, 17, 11.900328) (1575130879880, 22, 16.540415) (1575130880880, 33, 15.203803) (1575130881880, 17, 11.518434) (1575130882880, 17, 13.152081) (1575130883880, 18, 11.378041) (1575130884880, 21, 15.390745) (1575130885880, 30, 15.127818) (1575130886880, 19, 16.530401) (1575130887880, 32, 16.542702) (1575130888880, 26, 16.366442) (1575130889880, 25, 10.306822) (1575130890880, 15, 13.691117) (1575130891880, 15, 13.476817) (1575130892880, 25, 12.529998) (1575130893880, 22, 15.550021) (1575130894880, 20, 15.064971) (1575130895880, 24, 13.313683) (1575130896880, 23, 17.002878) (1575130897880, 30, 19.991594) (1575130898880, 15, 11.116746) (1575130899870, 16, 19.405090) (1575130900870, 22, 14.377142) (1575130901870, 16, 16.868231) (1575130902870, 20, 11.565193) (1575130903870, 31, 13.009119) (1575130904870, 29, 18.136400) (1575130905870, 17, 13.806572) (1575130906870, 23, 14.688898) (1575130907870, 26, 12.931019) (1575130908870, 32, 12.185531) (1575130909870, 30, 13.608714) (1575130910870, 23, 18.624914) (1575130911870, 22, 12.970826) (1575130912870, 22, 12.065827) (1575130913870, 25, 16.967192) (1575130914870, 16, 10.283031) (1575130915870, 22, 16.072535) (1575130916870, 24, 10.794536) (1575130917870, 32, 10.591207) (1575130918870, 20, 13.015227) (1575130919870, 28, 15.410999) (1575130920870, 29, 12.785076) (1575130921870, 28, 15.305857) (1575130922870, 33, 12.820810) (1575130923870, 34, 13.618055) (1575130924870, 32, 12.971123) (1575130925870, 24, 10.974546) (1575130926870, 15, 10.742910) (1575130927870, 23, 16.810783) (1575130928870, 18, 13.115224) (1575130929870, 26, 17.418489) (1575130930870, 20, 17.302315) (1575130931870, 21, 14.283571) (1575130932870, 16, 16.826534) (1575130933870, 18, 19.222122) (1575130934870, 18, 14.931420) (1575130935870, 17, 19.549454) (1575130936870, 22, 16.908388) (1575130937870, 32, 15.637796) (1575130938870, 31, 15.517650) (1575130939870, 18, 14.038033) (1575130940870, 32, 19.859648) (1575130941870, 16, 13.220840) (1575130942870, 28, 16.445398) (1575130943870, 26, 16.695753) (1575130944870, 33, 13.696928) (1575130945870, 21, 15.352819) (1575130946870, 15, 12.388407) (1575130947870, 27, 11.267529) (1575130948870, 20, 14.103228) (1575130949870, 20, 16.250950) (1575130950870, 30, 16.236088) (1575130951870, 22, 18.305340) (1575130952870, 25, 17.360685) (1575130953870, 25, 14.978681) (1575130954870, 33, 14.096183) (1575130955870, 26, 10.019039) (1575130956870, 19, 19.158213) (1575130957870, 22, 15.593924) (1575130958870, 26, 18.780119) (1575130959870, 21, 16.001656) (1575130960870, 16, 18.458328) (1575130961870, 21, 16.417843) (1575130962870, 28, 11.736558) (1575130963870, 34, 18.143946) (1575130964870, 27, 10.303225) (1575130965870, 20, 19.756748) (1575130966870, 22, 12.940063) (1575130967870, 23, 11.509640) (1575130968870, 19, 18.319309) (1575130969870, 19, 16.278345) (1575130970870, 27, 10.898361) (1575130971870, 31, 13.922162) (1575130972870, 15, 19.296116) (1575130973870, 26, 15.885763) (1575130974870, 15, 15.525804) (1575130975870, 19, 19.579538) (1575130976870, 20, 11.073811) (1575130977870, 16, 13.932510) (1575130978870, 17, 11.900328) (1575130979870, 22, 16.540415) (1575130980870, 33, 15.203803) (1575130981870, 17, 11.518434) (1575130982870, 17, 13.152081) (1575130983870, 18, 11.378041) (1575130984870, 21, 15.390745) (1575130985870, 30, 15.127818) (1575130986870, 19, 16.530401) (1575130987870, 32, 16.542702) (1575130988870, 26, 16.366442) (1575130989870, 25, 10.306822) (1575130990870, 15, 13.691117) (1575130991870, 15, 13.476817) (1575130992870, 25, 12.529998) (1575130993870, 22, 15.550021) (1575130994870, 20, 15.064971) (1575130995870, 24, 13.313683) (1575130996870, 23, 17.002878) (1575130997870, 30, 19.991594) (1575130998870, 15, 11.116746) (1575130999860, 16, 19.405090) (1575131000860, 22, 14.377142) (1575131001860, 16, 16.868231) (1575131002860, 20, 11.565193) (1575131003860, 31, 13.009119) (1575131004860, 29, 18.136400) (1575131005860, 17, 13.806572) (1575131006860, 23, 14.688898) (1575131007860, 26, 12.931019) (1575131008860, 32, 12.185531) (1575131009860, 30, 13.608714) (1575131010860, 23, 18.624914) (1575131011860, 22, 12.970826) (1575131012860, 22, 12.065827) (1575131013860, 25, 16.967192) (1575131014860, 16, 10.283031) (1575131015860, 22, 16.072535) (1575131016860, 24, 10.794536) (1575131017860, 32, 10.591207) (1575131018860, 20, 13.015227) (1575131019860, 28, 15.410999) (1575131020860, 29, 12.785076) (1575131021860, 28, 15.305857) (1575131022860, 33, 12.820810) (1575131023860, 34, 13.618055) (1575131024860, 32, 12.971123) (1575131025860, 24, 10.974546) (1575131026860, 15, 10.742910) (1575131027860, 23, 16.810783) (1575131028860, 18, 13.115224) (1575131029860, 26, 17.418489) (1575131030860, 20, 17.302315) (1575131031860, 21, 14.283571) (1575131032860, 16, 16.826534) (1575131033860, 18, 19.222122) (1575131034860, 18, 14.931420) (1575131035860, 17, 19.549454) (1575131036860, 22, 16.908388) (1575131037860, 32, 15.637796) (1575131038860, 31, 15.517650) (1575131039860, 18, 14.038033) (1575131040860, 32, 19.859648) (1575131041860, 16, 13.220840) (1575131042860, 28, 16.445398) (1575131043860, 26, 16.695753) (1575131044860, 33, 13.696928) (1575131045860, 21, 15.352819) (1575131046860, 15, 12.388407) (1575131047860, 27, 11.267529) (1575131048860, 20, 14.103228) (1575131049860, 20, 16.250950) (1575131050860, 30, 16.236088) (1575131051860, 22, 18.305340) (1575131052860, 25, 17.360685) (1575131053860, 25, 14.978681) (1575131054860, 33, 14.096183) (1575131055860, 26, 10.019039) (1575131056860, 19, 19.158213) (1575131057860, 22, 15.593924) (1575131058860, 26, 18.780119) (1575131059860, 21, 16.001656) (1575131060860, 16, 18.458328) (1575131061860, 21, 16.417843) (1575131062860, 28, 11.736558) (1575131063860, 34, 18.143946) (1575131064860, 27, 10.303225) (1575131065860, 20, 19.756748) (1575131066860, 22, 12.940063) (1575131067860, 23, 11.509640) (1575131068860, 19, 18.319309) (1575131069860, 19, 16.278345) (1575131070860, 27, 10.898361) (1575131071860, 31, 13.922162) (1575131072860, 15, 19.296116) (1575131073860, 26, 15.885763) (1575131074860, 15, 15.525804) (1575131075860, 19, 19.579538) (1575131076860, 20, 11.073811) (1575131077860, 16, 13.932510) (1575131078860, 17, 11.900328) (1575131079860, 22, 16.540415) (1575131080860, 33, 15.203803) (1575131081860, 17, 11.518434) (1575131082860, 17, 13.152081) (1575131083860, 18, 11.378041) (1575131084860, 21, 15.390745) (1575131085860, 30, 15.127818) (1575131086860, 19, 16.530401) (1575131087860, 32, 16.542702) (1575131088860, 26, 16.366442) (1575131089860, 25, 10.306822) (1575131090860, 15, 13.691117) (1575131091860, 15, 13.476817) (1575131092860, 25, 12.529998) (1575131093860, 22, 15.550021) (1575131094860, 20, 15.064971) (1575131095860, 24, 13.313683) (1575131096860, 23, 17.002878) (1575131097860, 30, 19.991594) (1575131098860, 15, 11.116746) (1575131099850, 16, 19.405090) (1575131100850, 22, 14.377142) (1575131101850, 16, 16.868231) (1575131102850, 20, 11.565193) (1575131103850, 31, 13.009119) (1575131104850, 29, 18.136400) (1575131105850, 17, 13.806572) (1575131106850, 23, 14.688898) (1575131107850, 26, 12.931019) (1575131108850, 32, 12.185531) (1575131109850, 30, 13.608714) (1575131110850, 23, 18.624914) (1575131111850, 22, 12.970826) (1575131112850, 22, 12.065827) (1575131113850, 25, 16.967192) (1575131114850, 16, 10.283031) (1575131115850, 22, 16.072535) (1575131116850, 24, 10.794536) (1575131117850, 32, 10.591207) (1575131118850, 20, 13.015227) (1575131119850, 28, 15.410999) (1575131120850, 29, 12.785076) (1575131121850, 28, 15.305857) (1575131122850, 33, 12.820810) (1575131123850, 34, 13.618055) (1575131124850, 32, 12.971123) (1575131125850, 24, 10.974546) (1575131126850, 15, 10.742910) (1575131127850, 23, 16.810783) (1575131128850, 18, 13.115224) (1575131129850, 26, 17.418489) (1575131130850, 20, 17.302315) (1575131131850, 21, 14.283571) (1575131132850, 16, 16.826534) (1575131133850, 18, 19.222122) (1575131134850, 18, 14.931420) (1575131135850, 17, 19.549454) (1575131136850, 22, 16.908388) (1575131137850, 32, 15.637796) (1575131138850, 31, 15.517650) (1575131139850, 18, 14.038033) (1575131140850, 32, 19.859648) (1575131141850, 16, 13.220840) (1575131142850, 28, 16.445398) (1575131143850, 26, 16.695753) (1575131144850, 33, 13.696928) (1575131145850, 21, 15.352819) (1575131146850, 15, 12.388407) (1575131147850, 27, 11.267529) (1575131148850, 20, 14.103228) (1575131149850, 20, 16.250950) (1575131150850, 30, 16.236088) (1575131151850, 22, 18.305340) (1575131152850, 25, 17.360685) (1575131153850, 25, 14.978681) (1575131154850, 33, 14.096183) (1575131155850, 26, 10.019039) (1575131156850, 19, 19.158213) (1575131157850, 22, 15.593924) (1575131158850, 26, 18.780119) (1575131159850, 21, 16.001656) (1575131160850, 16, 18.458328) (1575131161850, 21, 16.417843) (1575131162850, 28, 11.736558) (1575131163850, 34, 18.143946) (1575131164850, 27, 10.303225) (1575131165850, 20, 19.756748) (1575131166850, 22, 12.940063) (1575131167850, 23, 11.509640) (1575131168850, 19, 18.319309) (1575131169850, 19, 16.278345) (1575131170850, 27, 10.898361) (1575131171850, 31, 13.922162) (1575131172850, 15, 19.296116) (1575131173850, 26, 15.885763) (1575131174850, 15, 15.525804) (1575131175850, 19, 19.579538) (1575131176850, 20, 11.073811) (1575131177850, 16, 13.932510) (1575131178850, 17, 11.900328) (1575131179850, 22, 16.540415) (1575131180850, 33, 15.203803) (1575131181850, 17, 11.518434) (1575131182850, 17, 13.152081) (1575131183850, 18, 11.378041) (1575131184850, 21, 15.390745) (1575131185850, 30, 15.127818) (1575131186850, 19, 16.530401) (1575131187850, 32, 16.542702) (1575131188850, 26, 16.366442) (1575131189850, 25, 10.306822) (1575131190850, 15, 13.691117) (1575131191850, 15, 13.476817) (1575131192850, 25, 12.529998) (1575131193850, 22, 15.550021) (1575131194850, 20, 15.064971) (1575131195850, 24, 13.313683) (1575131196850, 23, 17.002878) (1575131197850, 30, 19.991594) (1575131198850, 15, 11.116746) (1575131199840, 16, 19.405090) (1575131200840, 22, 14.377142) (1575131201840, 16, 16.868231) (1575131202840, 20, 11.565193) (1575131203840, 31, 13.009119) (1575131204840, 29, 18.136400) (1575131205840, 17, 13.806572) (1575131206840, 23, 14.688898) (1575131207840, 26, 12.931019) (1575131208840, 32, 12.185531) (1575131209840, 30, 13.608714) (1575131210840, 23, 18.624914) (1575131211840, 22, 12.970826) (1575131212840, 22, 12.065827) (1575131213840, 25, 16.967192) (1575131214840, 16, 10.283031) (1575131215840, 22, 16.072535) (1575131216840, 24, 10.794536) (1575131217840, 32, 10.591207) (1575131218840, 20, 13.015227) (1575131219840, 28, 15.410999) (1575131220840, 29, 12.785076) (1575131221840, 28, 15.305857) (1575131222840, 33, 12.820810) (1575131223840, 34, 13.618055) (1575131224840, 32, 12.971123) (1575131225840, 24, 10.974546) (1575131226840, 15, 10.742910) (1575131227840, 23, 16.810783) (1575131228840, 18, 13.115224) (1575131229840, 26, 17.418489) (1575131230840, 20, 17.302315) (1575131231840, 21, 14.283571) (1575131232840, 16, 16.826534) (1575131233840, 18, 19.222122) (1575131234840, 18, 14.931420) (1575131235840, 17, 19.549454) (1575131236840, 22, 16.908388) (1575131237840, 32, 15.637796) (1575131238840, 31, 15.517650) (1575131239840, 18, 14.038033) (1575131240840, 32, 19.859648) (1575131241840, 16, 13.220840) (1575131242840, 28, 16.445398) (1575131243840, 26, 16.695753) (1575131244840, 33, 13.696928) (1575131245840, 21, 15.352819) (1575131246840, 15, 12.388407) (1575131247840, 27, 11.267529) (1575131248840, 20, 14.103228) (1575131249840, 20, 16.250950) (1575131250840, 30, 16.236088) (1575131251840, 22, 18.305340) (1575131252840, 25, 17.360685) (1575131253840, 25, 14.978681) (1575131254840, 33, 14.096183) (1575131255840, 26, 10.019039) (1575131256840, 19, 19.158213) (1575131257840, 22, 15.593924) (1575131258840, 26, 18.780119) (1575131259840, 21, 16.001656) (1575131260840, 16, 18.458328) (1575131261840, 21, 16.417843) (1575131262840, 28, 11.736558) (1575131263840, 34, 18.143946) (1575131264840, 27, 10.303225) (1575131265840, 20, 19.756748) (1575131266840, 22, 12.940063) (1575131267840, 23, 11.509640) (1575131268840, 19, 18.319309) (1575131269840, 19, 16.278345) (1575131270840, 27, 10.898361) (1575131271840, 31, 13.922162) (1575131272840, 15, 19.296116) (1575131273840, 26, 15.885763) (1575131274840, 15, 15.525804) (1575131275840, 19, 19.579538) (1575131276840, 20, 11.073811) (1575131277840, 16, 13.932510) (1575131278840, 17, 11.900328) (1575131279840, 22, 16.540415) (1575131280840, 33, 15.203803) (1575131281840, 17, 11.518434) (1575131282840, 17, 13.152081) (1575131283840, 18, 11.378041) (1575131284840, 21, 15.390745) (1575131285840, 30, 15.127818) (1575131286840, 19, 16.530401) (1575131287840, 32, 16.542702) (1575131288840, 26, 16.366442) (1575131289840, 25, 10.306822) (1575131290840, 15, 13.691117) (1575131291840, 15, 13.476817) (1575131292840, 25, 12.529998) (1575131293840, 22, 15.550021) (1575131294840, 20, 15.064971) (1575131295840, 24, 13.313683) (1575131296840, 23, 17.002878) (1575131297840, 30, 19.991594) (1575131298840, 15, 11.116746) (1575131299830, 16, 19.405090) (1575131300830, 22, 14.377142) (1575131301830, 16, 16.868231) (1575131302830, 20, 11.565193) (1575131303830, 31, 13.009119) (1575131304830, 29, 18.136400) (1575131305830, 17, 13.806572) (1575131306830, 23, 14.688898) (1575131307830, 26, 12.931019) (1575131308830, 32, 12.185531) (1575131309830, 30, 13.608714) (1575131310830, 23, 18.624914) (1575131311830, 22, 12.970826) (1575131312830, 22, 12.065827) (1575131313830, 25, 16.967192) (1575131314830, 16, 10.283031) (1575131315830, 22, 16.072535) (1575131316830, 24, 10.794536) (1575131317830, 32, 10.591207) (1575131318830, 20, 13.015227) (1575131319830, 28, 15.410999) (1575131320830, 29, 12.785076) (1575131321830, 28, 15.305857) (1575131322830, 33, 12.820810) (1575131323830, 34, 13.618055) (1575131324830, 32, 12.971123) (1575131325830, 24, 10.974546) (1575131326830, 15, 10.742910) (1575131327830, 23, 16.810783) (1575131328830, 18, 13.115224) (1575131329830, 26, 17.418489) (1575131330830, 20, 17.302315) (1575131331830, 21, 14.283571) (1575131332830, 16, 16.826534) (1575131333830, 18, 19.222122) (1575131334830, 18, 14.931420) (1575131335830, 17, 19.549454) (1575131336830, 22, 16.908388) (1575131337830, 32, 15.637796) (1575131338830, 31, 15.517650) (1575131339830, 18, 14.038033) (1575131340830, 32, 19.859648) (1575131341830, 16, 13.220840) (1575131342830, 28, 16.445398) (1575131343830, 26, 16.695753) (1575131344830, 33, 13.696928) (1575131345830, 21, 15.352819) (1575131346830, 15, 12.388407) (1575131347830, 27, 11.267529) (1575131348830, 20, 14.103228) (1575131349830, 20, 16.250950) (1575131350830, 30, 16.236088) (1575131351830, 22, 18.305340) (1575131352830, 25, 17.360685) (1575131353830, 25, 14.978681) (1575131354830, 33, 14.096183) (1575131355830, 26, 10.019039) (1575131356830, 19, 19.158213) (1575131357830, 22, 15.593924) (1575131358830, 26, 18.780119) (1575131359830, 21, 16.001656) (1575131360830, 16, 18.458328) (1575131361830, 21, 16.417843) (1575131362830, 28, 11.736558) (1575131363830, 34, 18.143946) (1575131364830, 27, 10.303225) (1575131365830, 20, 19.756748) (1575131366830, 22, 12.940063) (1575131367830, 23, 11.509640) (1575131368830, 19, 18.319309) (1575131369830, 19, 16.278345) (1575131370830, 27, 10.898361) (1575131371830, 31, 13.922162) (1575131372830, 15, 19.296116) (1575131373830, 26, 15.885763) (1575131374830, 15, 15.525804) (1575131375830, 19, 19.579538) (1575131376830, 20, 11.073811) (1575131377830, 16, 13.932510) (1575131378830, 17, 11.900328) (1575131379830, 22, 16.540415) (1575131380830, 33, 15.203803) (1575131381830, 17, 11.518434) (1575131382830, 17, 13.152081) (1575131383830, 18, 11.378041) (1575131384830, 21, 15.390745) (1575131385830, 30, 15.127818) (1575131386830, 19, 16.530401) (1575131387830, 32, 16.542702) (1575131388830, 26, 16.366442) (1575131389830, 25, 10.306822) (1575131390830, 15, 13.691117) (1575131391830, 15, 13.476817) (1575131392830, 25, 12.529998) (1575131393830, 22, 15.550021) (1575131394830, 20, 15.064971) (1575131395830, 24, 13.313683) (1575131396830, 23, 17.002878) (1575131397830, 30, 19.991594) (1575131398830, 15, 11.116746) (1575131399820, 16, 19.405090) (1575131400820, 22, 14.377142) (1575131401820, 16, 16.868231) (1575131402820, 20, 11.565193) (1575131403820, 31, 13.009119) (1575131404820, 29, 18.136400) (1575131405820, 17, 13.806572) (1575131406820, 23, 14.688898) (1575131407820, 26, 12.931019) (1575131408820, 32, 12.185531) (1575131409820, 30, 13.608714) (1575131410820, 23, 18.624914) (1575131411820, 22, 12.970826) (1575131412820, 22, 12.065827) (1575131413820, 25, 16.967192) (1575131414820, 16, 10.283031) (1575131415820, 22, 16.072535) (1575131416820, 24, 10.794536) (1575131417820, 32, 10.591207) (1575131418820, 20, 13.015227) (1575131419820, 28, 15.410999) (1575131420820, 29, 12.785076) (1575131421820, 28, 15.305857) (1575131422820, 33, 12.820810) (1575131423820, 34, 13.618055) (1575131424820, 32, 12.971123) (1575131425820, 24, 10.974546) (1575131426820, 15, 10.742910) (1575131427820, 23, 16.810783) (1575131428820, 18, 13.115224) (1575131429820, 26, 17.418489) (1575131430820, 20, 17.302315) (1575131431820, 21, 14.283571) (1575131432820, 16, 16.826534) (1575131433820, 18, 19.222122) (1575131434820, 18, 14.931420) (1575131435820, 17, 19.549454) (1575131436820, 22, 16.908388) (1575131437820, 32, 15.637796) (1575131438820, 31, 15.517650) (1575131439820, 18, 14.038033) (1575131440820, 32, 19.859648) (1575131441820, 16, 13.220840) (1575131442820, 28, 16.445398) (1575131443820, 26, 16.695753) (1575131444820, 33, 13.696928) (1575131445820, 21, 15.352819) (1575131446820, 15, 12.388407) (1575131447820, 27, 11.267529) (1575131448820, 20, 14.103228) (1575131449820, 20, 16.250950) (1575131450820, 30, 16.236088) (1575131451820, 22, 18.305340) (1575131452820, 25, 17.360685) (1575131453820, 25, 14.978681) (1575131454820, 33, 14.096183) (1575131455820, 26, 10.019039) (1575131456820, 19, 19.158213) (1575131457820, 22, 15.593924) (1575131458820, 26, 18.780119) (1575131459820, 21, 16.001656) (1575131460820, 16, 18.458328) (1575131461820, 21, 16.417843) (1575131462820, 28, 11.736558) (1575131463820, 34, 18.143946) (1575131464820, 27, 10.303225) (1575131465820, 20, 19.756748) (1575131466820, 22, 12.940063) (1575131467820, 23, 11.509640) (1575131468820, 19, 18.319309) (1575131469820, 19, 16.278345) (1575131470820, 27, 10.898361) (1575131471820, 31, 13.922162) (1575131472820, 15, 19.296116) (1575131473820, 26, 15.885763) (1575131474820, 15, 15.525804) (1575131475820, 19, 19.579538) (1575131476820, 20, 11.073811) (1575131477820, 16, 13.932510) (1575131478820, 17, 11.900328) (1575131479820, 22, 16.540415) (1575131480820, 33, 15.203803) (1575131481820, 17, 11.518434) (1575131482820, 17, 13.152081) (1575131483820, 18, 11.378041) (1575131484820, 21, 15.390745) (1575131485820, 30, 15.127818) (1575131486820, 19, 16.530401) (1575131487820, 32, 16.542702) (1575131488820, 26, 16.366442) (1575131489820, 25, 10.306822) (1575131490820, 15, 13.691117) (1575131491820, 15, 13.476817) (1575131492820, 25, 12.529998) (1575131493820, 22, 15.550021) (1575131494820, 20, 15.064971) (1575131495820, 24, 13.313683) (1575131496820, 23, 17.002878) (1575131497820, 30, 19.991594) (1575131498820, 15, 11.116746) (1575131499810, 16, 19.405090) (1575131500810, 22, 14.377142) (1575131501810, 16, 16.868231) (1575131502810, 20, 11.565193) (1575131503810, 31, 13.009119) (1575131504810, 29, 18.136400) (1575131505810, 17, 13.806572) (1575131506810, 23, 14.688898) (1575131507810, 26, 12.931019) (1575131508810, 32, 12.185531) (1575131509810, 30, 13.608714) (1575131510810, 23, 18.624914) (1575131511810, 22, 12.970826) (1575131512810, 22, 12.065827) (1575131513810, 25, 16.967192) (1575131514810, 16, 10.283031) (1575131515810, 22, 16.072535) (1575131516810, 24, 10.794536) (1575131517810, 32, 10.591207) (1575131518810, 20, 13.015227) (1575131519810, 28, 15.410999) (1575131520810, 29, 12.785076) (1575131521810, 28, 15.305857) (1575131522810, 33, 12.820810) (1575131523810, 34, 13.618055) (1575131524810, 32, 12.971123) (1575131525810, 24, 10.974546) (1575131526810, 15, 10.742910) (1575131527810, 23, 16.810783) (1575131528810, 18, 13.115224) (1575131529810, 26, 17.418489) (1575131530810, 20, 17.302315) (1575131531810, 21, 14.283571) (1575131532810, 16, 16.826534) (1575131533810, 18, 19.222122) (1575131534810, 18, 14.931420) (1575131535810, 17, 19.549454) (1575131536810, 22, 16.908388) (1575131537810, 32, 15.637796) (1575131538810, 31, 15.517650) (1575131539810, 18, 14.038033) (1575131540810, 32, 19.859648) (1575131541810, 16, 13.220840) (1575131542810, 28, 16.445398) (1575131543810, 26, 16.695753) (1575131544810, 33, 13.696928) (1575131545810, 21, 15.352819) (1575131546810, 15, 12.388407) (1575131547810, 27, 11.267529) (1575131548810, 20, 14.103228) (1575131549810, 20, 16.250950) (1575131550810, 30, 16.236088) (1575131551810, 22, 18.305340) (1575131552810, 25, 17.360685) (1575131553810, 25, 14.978681) (1575131554810, 33, 14.096183) (1575131555810, 26, 10.019039) (1575131556810, 19, 19.158213) (1575131557810, 22, 15.593924) (1575131558810, 26, 18.780119) (1575131559810, 21, 16.001656) (1575131560810, 16, 18.458328) (1575131561810, 21, 16.417843) (1575131562810, 28, 11.736558) (1575131563810, 34, 18.143946) (1575131564810, 27, 10.303225) (1575131565810, 20, 19.756748) (1575131566810, 22, 12.940063) (1575131567810, 23, 11.509640) (1575131568810, 19, 18.319309) (1575131569810, 19, 16.278345) (1575131570810, 27, 10.898361) (1575131571810, 31, 13.922162) (1575131572810, 15, 19.296116) (1575131573810, 26, 15.885763) (1575131574810, 15, 15.525804) (1575131575810, 19, 19.579538) (1575131576810, 20, 11.073811) (1575131577810, 16, 13.932510) (1575131578810, 17, 11.900328) (1575131579810, 22, 16.540415) (1575131580810, 33, 15.203803) (1575131581810, 17, 11.518434) (1575131582810, 17, 13.152081) (1575131583810, 18, 11.378041) (1575131584810, 21, 15.390745) (1575131585810, 30, 15.127818) (1575131586810, 19, 16.530401) (1575131587810, 32, 16.542702) (1575131588810, 26, 16.366442) (1575131589810, 25, 10.306822) (1575131590810, 15, 13.691117) (1575131591810, 15, 13.476817) (1575131592810, 25, 12.529998) (1575131593810, 22, 15.550021) (1575131594810, 20, 15.064971) (1575131595810, 24, 13.313683) (1575131596810, 23, 17.002878) (1575131597810, 30, 19.991594) (1575131598810, 15, 11.116746) (1575131599800, 16, 19.405090) (1575131600800, 22, 14.377142) (1575131601800, 16, 16.868231) (1575131602800, 20, 11.565193) (1575131603800, 31, 13.009119) (1575131604800, 29, 18.136400) (1575131605800, 17, 13.806572) (1575131606800, 23, 14.688898) (1575131607800, 26, 12.931019) (1575131608800, 32, 12.185531) (1575131609800, 30, 13.608714) (1575131610800, 23, 18.624914) (1575131611800, 22, 12.970826) (1575131612800, 22, 12.065827) (1575131613800, 25, 16.967192) (1575131614800, 16, 10.283031) (1575131615800, 22, 16.072535) (1575131616800, 24, 10.794536) (1575131617800, 32, 10.591207) (1575131618800, 20, 13.015227) (1575131619800, 28, 15.410999) (1575131620800, 29, 12.785076) (1575131621800, 28, 15.305857) (1575131622800, 33, 12.820810) (1575131623800, 34, 13.618055) (1575131624800, 32, 12.971123) (1575131625800, 24, 10.974546) (1575131626800, 15, 10.742910) (1575131627800, 23, 16.810783) (1575131628800, 18, 13.115224) (1575131629800, 26, 17.418489) (1575131630800, 20, 17.302315) (1575131631800, 21, 14.283571) (1575131632800, 16, 16.826534) (1575131633800, 18, 19.222122) (1575131634800, 18, 14.931420) (1575131635800, 17, 19.549454) (1575131636800, 22, 16.908388) (1575131637800, 32, 15.637796) (1575131638800, 31, 15.517650) (1575131639800, 18, 14.038033) (1575131640800, 32, 19.859648) (1575131641800, 16, 13.220840) (1575131642800, 28, 16.445398) (1575131643800, 26, 16.695753) (1575131644800, 33, 13.696928) (1575131645800, 21, 15.352819) (1575131646800, 15, 12.388407) (1575131647800, 27, 11.267529) (1575131648800, 20, 14.103228) (1575131649800, 20, 16.250950) (1575131650800, 30, 16.236088) (1575131651800, 22, 18.305340) (1575131652800, 25, 17.360685) (1575131653800, 25, 14.978681) (1575131654800, 33, 14.096183) (1575131655800, 26, 10.019039) (1575131656800, 19, 19.158213) (1575131657800, 22, 15.593924) (1575131658800, 26, 18.780119) (1575131659800, 21, 16.001656) (1575131660800, 16, 18.458328) (1575131661800, 21, 16.417843) (1575131662800, 28, 11.736558) (1575131663800, 34, 18.143946) (1575131664800, 27, 10.303225) (1575131665800, 20, 19.756748) (1575131666800, 22, 12.940063) (1575131667800, 23, 11.509640) (1575131668800, 19, 18.319309) (1575131669800, 19, 16.278345) (1575131670800, 27, 10.898361) (1575131671800, 31, 13.922162) (1575131672800, 15, 19.296116) (1575131673800, 26, 15.885763) (1575131674800, 15, 15.525804) (1575131675800, 19, 19.579538) (1575131676800, 20, 11.073811) (1575131677800, 16, 13.932510) (1575131678800, 17, 11.900328) (1575131679800, 22, 16.540415) (1575131680800, 33, 15.203803) (1575131681800, 17, 11.518434) (1575131682800, 17, 13.152081) (1575131683800, 18, 11.378041) (1575131684800, 21, 15.390745) (1575131685800, 30, 15.127818) (1575131686800, 19, 16.530401) (1575131687800, 32, 16.542702) (1575131688800, 26, 16.366442) (1575131689800, 25, 10.306822) (1575131690800, 15, 13.691117) (1575131691800, 15, 13.476817) (1575131692800, 25, 12.529998) (1575131693800, 22, 15.550021)")
+
+    end_time = int(round(time.time() * 1000))
+    tdLog.info("Execute time with compress: %dms" % (end_time - start_time))
+
+    simLogPath = tdDnodes.getSimLogPath()
+    grepCmd = "grep -a 'compress rpc msg, before:' -r %s | head -2" % simLogPath
+    output = subprocess.check_output(grepCmd, shell=True).decode("utf-8")
+
+    if output != "":
+        tdLog.info("Find %s in log file." % output)
+        tdLog.success("%s successfully executed! Compress works as expected." % __file__)
+    else:
+        tdLog.exit("%s failed! Compress does NOT works." % __file__)
+
+    conn.close()
diff --git a/tests/pytest/testMinTablesPerVnode.py b/tests/pytest/testMinTablesPerVnode.py
new file mode 100644
index 0000000000000000000000000000000000000000..91cea833e7ad27e09defc9c43a6de820d05f8b33
--- /dev/null
+++ b/tests/pytest/testMinTablesPerVnode.py
@@ -0,0 +1,131 @@
+#!/usr/bin/python
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+# install pip
+# pip install src/connector/python/linux/python2/
+
+# -*- coding: utf-8 -*-
+import sys
+import getopt
+import subprocess
+from distutils.log import warn as printf
+
+from util.log import *
+from util.dnodes import *
+from util.cases import *
+from util.sql import *
+
+import taos
+
+
+if __name__ == "__main__":
+    fileName = "all"
+    deployPath = ""
+    testCluster = False
+    valgrind = 0
+    logSql = True
+    stop = 0
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'l:sgh', [
+        'logSql', 'stop', 'valgrind', 'help'])
+    for key, value in opts:
+        if key in ['-h', '--help']:
+            tdLog.printNoPrefix(
+                'A collection of test cases written using Python')
+            tdLog.printNoPrefix('-l <True:False> logSql Flag')
+            tdLog.printNoPrefix('-s stop All dnodes')
+            tdLog.printNoPrefix('-g valgrind Test Flag')
+            sys.exit(0)
+
+        if key in ['-l', '--logSql']:
+            if (value.upper() == "TRUE"):
+                logSql = True
+            elif (value.upper() == "FALSE"):
+                logSql = False
+            else:
+                tdLog.printNoPrefix("logSql value %s is invalid" % logSql)
+                sys.exit(0)
+
+        if key in ['-g', '--valgrind']:
+            valgrind = 1
+
+        if key in ['-s', '--stop']:
+            stop = 1
+
+    if (stop != 0):
+        if (valgrind == 0):
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP > /dev/null 2>&1" % toBeKilled
+
+        psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+        processID = subprocess.check_output(psCmd, shell=True)
+
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        for port in range(6030, 6041):
+            usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            processID = subprocess.check_output(usePortPID, shell=True)
+
+            if processID:
+                killCmd = "kill -TERM %s" % processID
+                os.system(killCmd)
+            fuserCmd = "fuser -k -n tcp %d" % port
+            os.system(fuserCmd)
+        if valgrind:
+            time.sleep(2)
+
+        tdLog.info('stop All dnodes')
+        sys.exit(0)
+
+    tdDnodes.init(deployPath)
+    tdDnodes.setTestCluster(testCluster)
+    tdDnodes.setValgrind(valgrind)
+
+    tdDnodes.stopAll()
+    tdDnodes.addSimExtraCfg("minTablesPerVnode", "100")
+    tdDnodes.deploy(1)
+    tdDnodes.start(1)
+
+    host = '127.0.0.1'
+
+    tdLog.info("Procedures for tdengine deployed in %s" % (host))
+
+    tdCases.logSql(logSql)
+
+    conn = taos.connect(
+        host,
+        config=tdDnodes.getSimCfgPath())
+
+    tdSql.init(conn.cursor(), True)
+
+    tdSql.execute("DROP DATABASE IF EXISTS db")
+    tdSql.execute("CREATE DATABASE IF NOT EXISTS db")
+    tdSql.execute("USE db")
+
+    for i in range(0, 100):
+        tdSql.execute(
+            "CREATE TABLE IF NOT EXISTS tb%d (ts TIMESTAMP, temperature INT, humidity FLOAT)" % i)
+
+    for i in range(1, 6):
+        tdSql.execute("INSERT INTO tb99 values (now + %da, %d, %f)" % (i, i, i * 1.0))
+
+    tdSql.execute("DROP TABLE tb99")
+    tdSql.execute(
+            "CREATE TABLE IF NOT EXISTS tb99 (ts TIMESTAMP, temperature INT, humidity FLOAT)")
+    tdSql.query("SELECT * FROM tb99")
+    tdSql.checkRows(0)
+    
+    conn.close()
diff --git a/tests/pytest/testNoCompress.py b/tests/pytest/testNoCompress.py
new file mode 100644
index 0000000000000000000000000000000000000000..e3b40b4426f80080cfe48928851ec1e08c552dd7
--- /dev/null
+++ b/tests/pytest/testNoCompress.py
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+# install pip
+# pip install src/connector/python/linux/python2/
+
+# -*- coding: utf-8 -*-
+import sys
+import getopt
+import subprocess
+from distutils.log import warn as printf
+
+from util.log import *
+from util.dnodes import *
+from util.cases import *
+from util.sql import *
+
+import taos
+
+
+if __name__ == "__main__":
+    fileName = "all"
+    deployPath = ""
+    masterIp = ""
+    testCluster = False
+    valgrind = 0
+    logSql = True
+    stop = 0
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'l:sgh', [
+        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help'])
+    for key, value in opts:
+        if key in ['-h', '--help']:
+            tdLog.printNoPrefix(
+                'A collection of test cases written using Python')
+            tdLog.printNoPrefix('-l <True:False> logSql Flag')
+            tdLog.printNoPrefix('-s stop All dnodes')
+            tdLog.printNoPrefix('-g valgrind Test Flag')
+            sys.exit(0)
+
+        if key in ['-l', '--logSql']:
+            if (value.upper() == "TRUE"):
+                logSql = True
+            elif (value.upper() == "FALSE"):
+                logSql = False
+            else:
+                tdLog.printNoPrefix("logSql value %s is invalid" % logSql)
+                sys.exit(0)
+
+        if key in ['-g', '--valgrind']:
+            valgrind = 1
+
+        if key in ['-s', '--stop']:
+            stop = 1
+
+    if (stop != 0):
+        if (valgrind == 0):
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP > /dev/null 2>&1" % toBeKilled
+
+        psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+        processID = subprocess.check_output(psCmd, shell=True)
+
+        while(processID):
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(psCmd, shell=True)
+
+        for port in range(6030, 6041):
+            usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            processID = subprocess.check_output(usePortPID, shell=True)
+
+            if processID:
+                killCmd = "kill -9 %s" % processID
+                os.system(killCmd)
+            fuserCmd = "fuser -k -n tcp %d" % port
+            os.system(fuserCmd)
+        if valgrind:
+            time.sleep(2)
+
+        tdLog.info('stop All dnodes')
+        sys.exit(0)
+
+    tdDnodes.init(deployPath)
+    tdDnodes.setTestCluster(testCluster)
+    tdDnodes.setValgrind(valgrind)
+
+    tdDnodes.stopAll()
+    tdDnodes.addSimExtraCfg("compressMsgSize", "-1")
+    tdDnodes.deploy(1)
+    tdDnodes.start(1)
+
+    host = '127.0.0.1'
+
+    tdLog.info("Procedures for tdengine deployed in %s" % (host))
+
+    tdCases.logSql(logSql)
+
+    conn = taos.connect(
+        host,
+        config=tdDnodes.getSimCfgPath())
+
+    tdSql.init(conn.cursor(), logSql)
+
+    tdSql.execute("CREATE DATABASE IF NOT EXISTS t10b")
+    tdSql.execute("USE t10b")
+    tdSql.execute(
+        "CREATE TABLE IF NOT EXISTS s_sensor_info (ts TIMESTAMP, temperature INT, humidity FLOAT)")
+
+    start_time = int(round(time.time() * 1000))
+    for i in range(1, 1000):
+        tdSql.execute("IMPORT INTO s_sensor_info VALUES (1575129600000, 16, 19.405090) (1575129601000, 22, 14.377142) (1575129602000, 16, 16.868231) (1575129603000, 20, 11.565193) (1575129604000, 31, 13.009119) (1575129605000, 29, 18.136400) (1575129606000, 17, 13.806572) (1575129607000, 23, 14.688898) (1575129608000, 26, 12.931019) (1575129609000, 32, 12.185531) (1575129610000, 30, 13.608714) (1575129611000, 23, 18.624914) (1575129612000, 22, 12.970826) (1575129613000, 22, 12.065827) (1575129614000, 25, 16.967192) (1575129615000, 16, 10.283031) (1575129616000, 22, 16.072535) (1575129617000, 24, 10.794536) (1575129618000, 32, 10.591207) (1575129619000, 20, 13.015227) (1575129620000, 28, 15.410999) (1575129621000, 29, 12.785076) (1575129622000, 28, 15.305857) (1575129623000, 33, 12.820810) (1575129624000, 34, 13.618055) (1575129625000, 32, 12.971123) (1575129626000, 24, 10.974546) (1575129627000, 15, 10.742910) (1575129628000, 23, 16.810783) (1575129629000, 18, 13.115224) (1575129630000, 26, 17.418489) (1575129631000, 20, 17.302315) (1575129632000, 21, 14.283571) (1575129633000, 16, 16.826534) (1575129634000, 18, 19.222122) (1575129635000, 18, 14.931420) (1575129636000, 17, 19.549454) (1575129637000, 22, 16.908388) (1575129638000, 32, 15.637796) (1575129639000, 31, 15.517650) (1575129640000, 18, 14.038033) (1575129641000, 32, 19.859648) (1575129642000, 16, 13.220840) (1575129643000, 28, 16.445398) (1575129644000, 26, 16.695753) (1575129645000, 33, 13.696928) (1575129646000, 21, 15.352819) (1575129647000, 15, 12.388407) (1575129648000, 27, 11.267529) (1575129649000, 20, 14.103228) (1575129650000, 20, 16.250950) (1575129651000, 30, 16.236088) (1575129652000, 22, 18.305340) (1575129653000, 25, 17.360685) (1575129654000, 25, 14.978681) (1575129655000, 33, 14.096183) (1575129656000, 26, 10.019039) (1575129657000, 19, 19.158213) (1575129658000, 22, 15.593924) (1575129659000, 26, 18.780119) (1575129660000, 21, 16.001656) (1575129661000, 16, 18.458328) (1575129662000, 21, 16.417843) (1575129663000, 28, 11.736558) (1575129664000, 34, 18.143946) (1575129665000, 27, 10.303225) (1575129666000, 20, 19.756748) (1575129667000, 22, 12.940063) (1575129668000, 23, 11.509640) (1575129669000, 19, 18.319309) (1575129670000, 19, 16.278345) (1575129671000, 27, 10.898361) (1575129672000, 31, 13.922162) (1575129673000, 15, 19.296116) (1575129674000, 26, 15.885763) (1575129675000, 15, 15.525804) (1575129676000, 19, 19.579538) (1575129677000, 20, 11.073811) (1575129678000, 16, 13.932510) (1575129679000, 17, 11.900328) (1575129680000, 22, 16.540415) (1575129681000, 33, 15.203803) (1575129682000, 17, 11.518434) (1575129683000, 17, 13.152081) (1575129684000, 18, 11.378041) (1575129685000, 21, 15.390745) (1575129686000, 30, 15.127818) (1575129687000, 19, 16.530401) (1575129688000, 32, 16.542702) (1575129689000, 26, 16.366442) (1575129690000, 25, 10.306822) (1575129691000, 15, 13.691117) (1575129692000, 15, 13.476817) (1575129693000, 25, 12.529998) (1575129694000, 22, 15.550021) (1575129695000, 20, 15.064971) (1575129696000, 24, 13.313683) (1575129697000, 23, 17.002878) (1575129698000, 30, 19.991594) (1575129699000, 15, 11.116746) (1575129699990, 16, 19.405090) (1575129700990, 22, 14.377142) (1575129701990, 16, 16.868231) (1575129702990, 20, 11.565193) (1575129703990, 31, 13.009119) (1575129704990, 29, 18.136400) (1575129705990, 17, 13.806572) (1575129706990, 23, 14.688898) (1575129707990, 26, 12.931019) (1575129708990, 32, 12.185531) (1575129709990, 30, 13.608714) (1575129710990, 23, 18.624914) (1575129711990, 22, 12.970826) (1575129712990, 22, 12.065827) (1575129713990, 25, 16.967192) (1575129714990, 16, 10.283031) (1575129715990, 22, 16.072535) (1575129716990, 24, 10.794536) (1575129717990, 32, 10.591207) (1575129718990, 20, 13.015227) (1575129719990, 28, 15.410999) (1575129720990, 29, 12.785076) (1575129721990, 28, 15.305857) (1575129722990, 33, 12.820810) (1575129723990, 34, 13.618055) (1575129724990, 32, 12.971123) (1575129725990, 24, 10.974546) (1575129726990, 15, 10.742910) (1575129727990, 23, 16.810783) (1575129728990, 18, 13.115224) (1575129729990, 26, 17.418489) (1575129730990, 20, 17.302315) (1575129731990, 21, 14.283571) (1575129732990, 16, 16.826534) (1575129733990, 18, 19.222122) (1575129734990, 18, 14.931420) (1575129735990, 17, 19.549454) (1575129736990, 22, 16.908388) (1575129737990, 32, 15.637796) (1575129738990, 31, 15.517650) (1575129739990, 18, 14.038033) (1575129740990, 32, 19.859648) (1575129741990, 16, 13.220840) (1575129742990, 28, 16.445398) (1575129743990, 26, 16.695753) (1575129744990, 33, 13.696928) (1575129745990, 21, 15.352819) (1575129746990, 15, 12.388407) (1575129747990, 27, 11.267529) (1575129748990, 20, 14.103228) (1575129749990, 20, 16.250950) (1575129750990, 30, 16.236088) (1575129751990, 22, 18.305340) (1575129752990, 25, 17.360685) (1575129753990, 25, 14.978681) (1575129754990, 33, 14.096183) (1575129755990, 26, 10.019039) (1575129756990, 19, 19.158213) (1575129757990, 22, 15.593924) (1575129758990, 26, 18.780119) (1575129759990, 21, 16.001656) (1575129760990, 16, 18.458328) (1575129761990, 21, 16.417843) (1575129762990, 28, 11.736558) (1575129763990, 34, 18.143946) (1575129764990, 27, 10.303225) (1575129765990, 20, 19.756748) (1575129766990, 22, 12.940063) (1575129767990, 23, 11.509640) (1575129768990, 19, 18.319309) (1575129769990, 19, 16.278345) (1575129770990, 27, 10.898361) (1575129771990, 31, 13.922162) (1575129772990, 15, 19.296116) (1575129773990, 26, 15.885763) (1575129774990, 15, 15.525804) (1575129775990, 19, 19.579538) (1575129776990, 20, 11.073811) (1575129777990, 16, 13.932510) (1575129778990, 17, 11.900328) (1575129779990, 22, 16.540415) (1575129780990, 33, 15.203803) (1575129781990, 17, 11.518434) (1575129782990, 17, 13.152081) (1575129783990, 18, 11.378041) (1575129784990, 21, 15.390745) (1575129785990, 30, 15.127818) (1575129786990, 19, 16.530401) (1575129787990, 32, 16.542702) (1575129788990, 26, 16.366442) (1575129789990, 25, 10.306822) (1575129790990, 15, 13.691117) (1575129791990, 15, 13.476817) (1575129792990, 25, 12.529998) (1575129793990, 22, 15.550021) (1575129794990, 20, 15.064971) (1575129795990, 24, 13.313683) (1575129796990, 23, 17.002878) (1575129797990, 30, 19.991594) (1575129798990, 15, 11.116746) (1575129799980, 16, 19.405090) (1575129800980, 22, 14.377142) (1575129801980, 16, 16.868231) (1575129802980, 20, 11.565193) (1575129803980, 31, 13.009119) (1575129804980, 29, 18.136400) (1575129805980, 17, 13.806572) (1575129806980, 23, 14.688898) (1575129807980, 26, 12.931019) (1575129808980, 32, 12.185531) (1575129809980, 30, 13.608714) (1575129810980, 23, 18.624914) (1575129811980, 22, 12.970826) (1575129812980, 22, 12.065827) (1575129813980, 25, 16.967192) (1575129814980, 16, 10.283031) (1575129815980, 22, 16.072535) (1575129816980, 24, 10.794536) (1575129817980, 32, 10.591207) (1575129818980, 20, 13.015227) (1575129819980, 28, 15.410999) (1575129820980, 29, 12.785076) (1575129821980, 28, 15.305857) (1575129822980, 33, 12.820810) (1575129823980, 34, 13.618055) (1575129824980, 32, 12.971123) (1575129825980, 24, 10.974546) (1575129826980, 15, 10.742910) (1575129827980, 23, 16.810783) (1575129828980, 18, 13.115224) (1575129829980, 26, 17.418489) (1575129830980, 20, 17.302315) (1575129831980, 21, 14.283571) (1575129832980, 16, 16.826534) (1575129833980, 18, 19.222122) (1575129834980, 18, 14.931420) (1575129835980, 17, 19.549454) (1575129836980, 22, 16.908388) (1575129837980, 32, 15.637796) (1575129838980, 31, 15.517650) (1575129839980, 18, 14.038033) (1575129840980, 32, 19.859648) (1575129841980, 16, 13.220840) (1575129842980, 28, 16.445398) (1575129843980, 26, 16.695753) (1575129844980, 33, 13.696928) (1575129845980, 21, 15.352819) (1575129846980, 15, 12.388407) (1575129847980, 27, 11.267529) (1575129848980, 20, 14.103228) (1575129849980, 20, 16.250950) (1575129850980, 30, 16.236088) (1575129851980, 22, 18.305340) (1575129852980, 25, 17.360685) (1575129853980, 25, 14.978681) (1575129854980, 33, 14.096183) (1575129855980, 26, 10.019039) (1575129856980, 19, 19.158213) (1575129857980, 22, 15.593924) (1575129858980, 26, 18.780119) (1575129859980, 21, 16.001656) (1575129860980, 16, 18.458328) (1575129861980, 21, 16.417843) (1575129862980, 28, 11.736558) (1575129863980, 34, 18.143946) (1575129864980, 27, 10.303225) (1575129865980, 20, 19.756748) (1575129866980, 22, 12.940063) (1575129867980, 23, 11.509640) (1575129868980, 19, 18.319309) (1575129869980, 19, 16.278345) (1575129870980, 27, 10.898361) (1575129871980, 31, 13.922162) (1575129872980, 15, 19.296116) (1575129873980, 26, 15.885763) (1575129874980, 15, 15.525804) (1575129875980, 19, 19.579538) (1575129876980, 20, 11.073811) (1575129877980, 16, 13.932510) (1575129878980, 17, 11.900328) (1575129879980, 22, 16.540415) (1575129880980, 33, 15.203803) (1575129881980, 17, 11.518434) (1575129882980, 17, 13.152081) (1575129883980, 18, 11.378041) (1575129884980, 21, 15.390745) (1575129885980, 30, 15.127818) (1575129886980, 19, 16.530401) (1575129887980, 32, 16.542702) (1575129888980, 26, 16.366442) (1575129889980, 25, 10.306822) (1575129890980, 15, 13.691117) (1575129891980, 15, 13.476817) (1575129892980, 25, 12.529998) (1575129893980, 22, 15.550021) (1575129894980, 20, 15.064971) (1575129895980, 24, 13.313683) (1575129896980, 23, 17.002878) (1575129897980, 30, 19.991594) (1575129898980, 15, 11.116746) (1575129899970, 16, 19.405090) (1575129900970, 22, 14.377142) (1575129901970, 16, 16.868231) (1575129902970, 20, 11.565193) (1575129903970, 31, 13.009119) (1575129904970, 29, 18.136400) (1575129905970, 17, 13.806572) (1575129906970, 23, 14.688898) (1575129907970, 26, 12.931019) (1575129908970, 32, 12.185531) (1575129909970, 30, 13.608714) (1575129910970, 23, 18.624914) (1575129911970, 22, 12.970826) (1575129912970, 22, 12.065827) (1575129913970, 25, 16.967192) (1575129914970, 16, 10.283031) (1575129915970, 22, 16.072535) (1575129916970, 24, 10.794536) (1575129917970, 32, 10.591207) (1575129918970, 20, 13.015227) (1575129919970, 28, 15.410999) (1575129920970, 29, 12.785076) (1575129921970, 28, 15.305857) (1575129922970, 33, 12.820810) (1575129923970, 34, 13.618055) (1575129924970, 32, 12.971123) (1575129925970, 24, 10.974546) (1575129926970, 15, 10.742910) (1575129927970, 23, 16.810783) (1575129928970, 18, 13.115224) (1575129929970, 26, 17.418489) (1575129930970, 20, 17.302315) (1575129931970, 21, 14.283571) (1575129932970, 16, 16.826534) (1575129933970, 18, 19.222122) (1575129934970, 18, 14.931420) (1575129935970, 17, 19.549454) (1575129936970, 22, 16.908388) (1575129937970, 32, 15.637796) (1575129938970, 31, 15.517650) (1575129939970, 18, 14.038033) (1575129940970, 32, 19.859648) (1575129941970, 16, 13.220840) (1575129942970, 28, 16.445398) (1575129943970, 26, 16.695753) (1575129944970, 33, 13.696928) (1575129945970, 21, 15.352819) (1575129946970, 15, 12.388407) (1575129947970, 27, 11.267529) (1575129948970, 20, 14.103228) (1575129949970, 20, 16.250950) (1575129950970, 30, 16.236088) (1575129951970, 22, 18.305340) (1575129952970, 25, 17.360685) (1575129953970, 25, 14.978681) (1575129954970, 33, 14.096183) (1575129955970, 26, 10.019039) (1575129956970, 19, 19.158213) (1575129957970, 22, 15.593924) (1575129958970, 26, 18.780119) (1575129959970, 21, 16.001656) (1575129960970, 16, 18.458328) (1575129961970, 21, 16.417843) (1575129962970, 28, 11.736558) (1575129963970, 34, 18.143946) (1575129964970, 27, 10.303225) (1575129965970, 20, 19.756748) (1575129966970, 22, 12.940063) (1575129967970, 23, 11.509640) (1575129968970, 19, 18.319309) (1575129969970, 19, 16.278345) (1575129970970, 27, 10.898361) (1575129971970, 31, 13.922162) (1575129972970, 15, 19.296116) (1575129973970, 26, 15.885763) (1575129974970, 15, 15.525804) (1575129975970, 19, 19.579538) (1575129976970, 20, 11.073811) (1575129977970, 16, 13.932510) (1575129978970, 17, 11.900328) (1575129979970, 22, 16.540415) (1575129980970, 33, 15.203803) (1575129981970, 17, 11.518434) (1575129982970, 17, 13.152081) (1575129983970, 18, 11.378041) (1575129984970, 21, 15.390745) (1575129985970, 30, 15.127818) (1575129986970, 19, 16.530401) (1575129987970, 32, 16.542702) (1575129988970, 26, 16.366442) (1575129989970, 25, 10.306822) (1575129990970, 15, 13.691117) (1575129991970, 15, 13.476817) (1575129992970, 25, 12.529998) (1575129993970, 22, 15.550021) (1575129994970, 20, 15.064971) (1575129995970, 24, 13.313683) (1575129996970, 23, 17.002878) (1575129997970, 30, 19.991594) (1575129998970, 15, 11.116746) (1575129999960, 16, 19.405090) (1575130000960, 22, 14.377142) (1575130001960, 16, 16.868231) (1575130002960, 20, 11.565193) (1575130003960, 31, 13.009119) (1575130004960, 29, 18.136400) (1575130005960, 17, 13.806572) (1575130006960, 23, 14.688898) (1575130007960, 26, 12.931019) (1575130008960, 32, 12.185531) (1575130009960, 30, 13.608714) (1575130010960, 23, 18.624914) (1575130011960, 22, 12.970826) (1575130012960, 22, 12.065827) (1575130013960, 25, 16.967192) (1575130014960, 16, 10.283031) (1575130015960, 22, 16.072535) (1575130016960, 24, 10.794536) (1575130017960, 32, 10.591207) (1575130018960, 20, 13.015227) (1575130019960, 28, 15.410999) (1575130020960, 29, 12.785076) (1575130021960, 28, 15.305857) (1575130022960, 33, 12.820810) (1575130023960, 34, 13.618055) (1575130024960, 32, 12.971123) (1575130025960, 24, 10.974546) (1575130026960, 15, 10.742910) (1575130027960, 23, 16.810783) (1575130028960, 18, 13.115224) (1575130029960, 26, 17.418489) (1575130030960, 20, 17.302315) (1575130031960, 21, 14.283571) (1575130032960, 16, 16.826534) (1575130033960, 18, 19.222122) (1575130034960, 18, 14.931420) (1575130035960, 17, 19.549454) (1575130036960, 22, 16.908388) (1575130037960, 32, 15.637796) (1575130038960, 31, 15.517650) (1575130039960, 18, 14.038033) (1575130040960, 32, 19.859648) (1575130041960, 16, 13.220840) (1575130042960, 28, 16.445398) (1575130043960, 26, 16.695753) (1575130044960, 33, 13.696928) (1575130045960, 21, 15.352819) (1575130046960, 15, 12.388407) (1575130047960, 27, 11.267529) (1575130048960, 20, 14.103228) (1575130049960, 20, 16.250950) (1575130050960, 30, 16.236088) (1575130051960, 22, 18.305340) (1575130052960, 25, 17.360685) (1575130053960, 25, 14.978681) (1575130054960, 33, 14.096183) (1575130055960, 26, 10.019039) (1575130056960, 19, 19.158213) (1575130057960, 22, 15.593924) (1575130058960, 26, 18.780119) (1575130059960, 21, 16.001656) (1575130060960, 16, 18.458328) (1575130061960, 21, 16.417843) (1575130062960, 28, 11.736558) (1575130063960, 34, 18.143946) (1575130064960, 27, 10.303225) (1575130065960, 20, 19.756748) (1575130066960, 22, 12.940063) (1575130067960, 23, 11.509640) (1575130068960, 19, 18.319309) (1575130069960, 19, 16.278345) (1575130070960, 27, 10.898361) (1575130071960, 31, 13.922162) (1575130072960, 15, 19.296116) (1575130073960, 26, 15.885763) (1575130074960, 15, 15.525804) (1575130075960, 19, 19.579538) (1575130076960, 20, 11.073811) (1575130077960, 16, 13.932510) (1575130078960, 17, 11.900328) (1575130079960, 22, 16.540415) (1575130080960, 33, 15.203803) (1575130081960, 17, 11.518434) (1575130082960, 17, 13.152081) (1575130083960, 18, 11.378041) (1575130084960, 21, 15.390745) (1575130085960, 30, 15.127818) (1575130086960, 19, 16.530401) (1575130087960, 32, 16.542702) (1575130088960, 26, 16.366442) (1575130089960, 25, 10.306822) (1575130090960, 15, 13.691117) (1575130091960, 15, 13.476817) (1575130092960, 25, 12.529998) (1575130093960, 22, 15.550021) (1575130094960, 20, 15.064971) (1575130095960, 24, 13.313683) (1575130096960, 23, 17.002878) (1575130097960, 30, 19.991594) (1575130098960, 15, 11.116746) (1575130099950, 16, 19.405090) (1575130100950, 22, 14.377142) (1575130101950, 16, 16.868231) (1575130102950, 20, 11.565193) (1575130103950, 31, 13.009119) (1575130104950, 29, 18.136400) (1575130105950, 17, 13.806572) (1575130106950, 23, 14.688898) (1575130107950, 26, 12.931019) (1575130108950, 32, 12.185531) (1575130109950, 30, 13.608714) (1575130110950, 23, 18.624914) (1575130111950, 22, 12.970826) (1575130112950, 22, 12.065827) (1575130113950, 25, 16.967192) (1575130114950, 16, 10.283031) (1575130115950, 22, 16.072535) (1575130116950, 24, 10.794536) (1575130117950, 32, 10.591207) (1575130118950, 20, 13.015227) (1575130119950, 28, 15.410999) (1575130120950, 29, 12.785076) (1575130121950, 28, 15.305857) (1575130122950, 33, 12.820810) (1575130123950, 34, 13.618055) (1575130124950, 32, 12.971123) (1575130125950, 24, 10.974546) (1575130126950, 15, 10.742910) (1575130127950, 23, 16.810783) (1575130128950, 18, 13.115224) (1575130129950, 26, 17.418489) (1575130130950, 20, 17.302315) (1575130131950, 21, 14.283571) (1575130132950, 16, 16.826534) (1575130133950, 18, 19.222122) (1575130134950, 18, 14.931420) (1575130135950, 17, 19.549454) (1575130136950, 22, 16.908388) (1575130137950, 32, 15.637796) (1575130138950, 31, 15.517650) (1575130139950, 18, 14.038033) (1575130140950, 32, 19.859648) (1575130141950, 16, 13.220840) (1575130142950, 28, 16.445398) (1575130143950, 26, 16.695753) (1575130144950, 33, 13.696928) (1575130145950, 21, 15.352819) (1575130146950, 15, 12.388407) (1575130147950, 27, 11.267529) (1575130148950, 20, 14.103228) (1575130149950, 20, 16.250950) (1575130150950, 30, 16.236088) (1575130151950, 22, 18.305340) (1575130152950, 25, 17.360685) (1575130153950, 25, 14.978681) (1575130154950, 33, 14.096183) (1575130155950, 26, 10.019039) (1575130156950, 19, 19.158213) (1575130157950, 22, 15.593924) (1575130158950, 26, 18.780119) (1575130159950, 21, 16.001656) (1575130160950, 16, 18.458328) (1575130161950, 21, 16.417843) (1575130162950, 28, 11.736558) (1575130163950, 34, 18.143946) (1575130164950, 27, 10.303225) (1575130165950, 20, 19.756748) (1575130166950, 22, 12.940063) (1575130167950, 23, 11.509640) (1575130168950, 19, 18.319309) (1575130169950, 19, 16.278345) (1575130170950, 27, 10.898361) (1575130171950, 31, 13.922162) (1575130172950, 15, 19.296116) (1575130173950, 26, 15.885763) (1575130174950, 15, 15.525804) (1575130175950, 19, 19.579538) (1575130176950, 20, 11.073811) (1575130177950, 16, 13.932510) (1575130178950, 17, 11.900328) (1575130179950, 22, 16.540415) (1575130180950, 33, 15.203803) (1575130181950, 17, 11.518434) (1575130182950, 17, 13.152081) (1575130183950, 18, 11.378041) (1575130184950, 21, 15.390745) (1575130185950, 30, 15.127818) (1575130186950, 19, 16.530401) (1575130187950, 32, 16.542702) (1575130188950, 26, 16.366442) (1575130189950, 25, 10.306822) (1575130190950, 15, 13.691117) (1575130191950, 15, 13.476817) (1575130192950, 25, 12.529998) (1575130193950, 22, 15.550021) (1575130194950, 20, 15.064971) (1575130195950, 24, 13.313683) (1575130196950, 23, 17.002878) (1575130197950, 30, 19.991594) (1575130198950, 15, 11.116746) (1575130199940, 16, 19.405090) (1575130200940, 22, 14.377142) (1575130201940, 16, 16.868231) (1575130202940, 20, 11.565193) (1575130203940, 31, 13.009119) (1575130204940, 29, 18.136400) (1575130205940, 17, 13.806572) (1575130206940, 23, 14.688898) (1575130207940, 26, 12.931019) (1575130208940, 32, 12.185531) (1575130209940, 30, 13.608714) (1575130210940, 23, 18.624914) (1575130211940, 22, 12.970826) (1575130212940, 22, 12.065827) (1575130213940, 25, 16.967192) (1575130214940, 16, 10.283031) (1575130215940, 22, 16.072535) (1575130216940, 24, 10.794536) (1575130217940, 32, 10.591207) (1575130218940, 20, 13.015227) (1575130219940, 28, 15.410999) (1575130220940, 29, 12.785076) (1575130221940, 28, 15.305857) (1575130222940, 33, 12.820810) (1575130223940, 34, 13.618055) (1575130224940, 32, 12.971123) (1575130225940, 24, 10.974546) (1575130226940, 15, 10.742910) (1575130227940, 23, 16.810783) (1575130228940, 18, 13.115224) (1575130229940, 26, 17.418489) (1575130230940, 20, 17.302315) (1575130231940, 21, 14.283571) (1575130232940, 16, 16.826534) (1575130233940, 18, 19.222122) (1575130234940, 18, 14.931420) (1575130235940, 17, 19.549454) (1575130236940, 22, 16.908388) (1575130237940, 32, 15.637796) (1575130238940, 31, 15.517650) (1575130239940, 18, 14.038033) (1575130240940, 32, 19.859648) (1575130241940, 16, 13.220840) (1575130242940, 28, 16.445398) (1575130243940, 26, 16.695753) (1575130244940, 33, 13.696928) (1575130245940, 21, 15.352819) (1575130246940, 15, 12.388407) (1575130247940, 27, 11.267529) (1575130248940, 20, 14.103228) (1575130249940, 20, 16.250950) (1575130250940, 30, 16.236088) (1575130251940, 22, 18.305340) (1575130252940, 25, 17.360685) (1575130253940, 25, 14.978681) (1575130254940, 33, 14.096183) (1575130255940, 26, 10.019039) (1575130256940, 19, 19.158213) (1575130257940, 22, 15.593924) (1575130258940, 26, 18.780119) (1575130259940, 21, 16.001656) (1575130260940, 16, 18.458328) (1575130261940, 21, 16.417843) (1575130262940, 28, 11.736558) (1575130263940, 34, 18.143946) (1575130264940, 27, 10.303225) (1575130265940, 20, 19.756748) (1575130266940, 22, 12.940063) (1575130267940, 23, 11.509640) (1575130268940, 19, 18.319309) (1575130269940, 19, 16.278345) (1575130270940, 27, 10.898361) (1575130271940, 31, 13.922162) (1575130272940, 15, 19.296116) (1575130273940, 26, 15.885763) (1575130274940, 15, 15.525804) (1575130275940, 19, 19.579538) (1575130276940, 20, 11.073811) (1575130277940, 16, 13.932510) (1575130278940, 17, 11.900328) (1575130279940, 22, 16.540415) (1575130280940, 33, 15.203803) (1575130281940, 17, 11.518434) (1575130282940, 17, 13.152081) (1575130283940, 18, 11.378041) (1575130284940, 21, 15.390745) (1575130285940, 30, 15.127818) (1575130286940, 19, 16.530401) (1575130287940, 32, 16.542702) (1575130288940, 26, 16.366442) (1575130289940, 25, 10.306822) (1575130290940, 15, 13.691117) (1575130291940, 15, 13.476817) (1575130292940, 25, 12.529998) (1575130293940, 22, 15.550021) (1575130294940, 20, 15.064971) (1575130295940, 24, 13.313683) (1575130296940, 23, 17.002878) (1575130297940, 30, 19.991594) (1575130298940, 15, 11.116746) (1575130299930, 16, 19.405090) (1575130300930, 22, 14.377142) (1575130301930, 16, 16.868231) (1575130302930, 20, 11.565193) (1575130303930, 31, 13.009119) (1575130304930, 29, 18.136400) (1575130305930, 17, 13.806572) (1575130306930, 23, 14.688898) (1575130307930, 26, 12.931019) (1575130308930, 32, 12.185531) (1575130309930, 30, 13.608714) (1575130310930, 23, 18.624914) (1575130311930, 22, 12.970826) (1575130312930, 22, 12.065827) (1575130313930, 25, 16.967192) (1575130314930, 16, 10.283031) (1575130315930, 22, 16.072535) (1575130316930, 24, 10.794536) (1575130317930, 32, 10.591207) (1575130318930, 20, 13.015227) (1575130319930, 28, 15.410999) (1575130320930, 29, 12.785076) (1575130321930, 28, 15.305857) (1575130322930, 33, 12.820810) (1575130323930, 34, 13.618055) (1575130324930, 32, 12.971123) (1575130325930, 24, 10.974546) (1575130326930, 15, 10.742910) (1575130327930, 23, 16.810783) (1575130328930, 18, 13.115224) (1575130329930, 26, 17.418489) (1575130330930, 20, 17.302315) (1575130331930, 21, 14.283571) (1575130332930, 16, 16.826534) (1575130333930, 18, 19.222122) (1575130334930, 18, 14.931420) (1575130335930, 17, 19.549454) (1575130336930, 22, 16.908388) (1575130337930, 32, 15.637796) (1575130338930, 31, 15.517650) (1575130339930, 18, 14.038033) (1575130340930, 32, 19.859648) (1575130341930, 16, 13.220840) (1575130342930, 28, 16.445398) (1575130343930, 26, 16.695753) (1575130344930, 33, 13.696928) (1575130345930, 21, 15.352819) (1575130346930, 15, 12.388407) (1575130347930, 27, 11.267529) (1575130348930, 20, 14.103228) (1575130349930, 20, 16.250950) (1575130350930, 30, 16.236088) (1575130351930, 22, 18.305340) (1575130352930, 25, 17.360685) (1575130353930, 25, 14.978681) (1575130354930, 33, 14.096183) (1575130355930, 26, 10.019039) (1575130356930, 19, 19.158213) (1575130357930, 22, 15.593924) (1575130358930, 26, 18.780119) (1575130359930, 21, 16.001656) (1575130360930, 16, 18.458328) (1575130361930, 21, 16.417843) (1575130362930, 28, 11.736558) (1575130363930, 34, 18.143946) (1575130364930, 27, 10.303225) (1575130365930, 20, 19.756748) (1575130366930, 22, 12.940063) (1575130367930, 23, 11.509640) (1575130368930, 19, 18.319309) (1575130369930, 19, 16.278345) (1575130370930, 27, 10.898361) (1575130371930, 31, 13.922162) (1575130372930, 15, 19.296116) (1575130373930, 26, 15.885763) (1575130374930, 15, 15.525804) (1575130375930, 19, 19.579538) (1575130376930, 20, 11.073811) (1575130377930, 16, 13.932510) (1575130378930, 17, 11.900328) (1575130379930, 22, 16.540415) (1575130380930, 33, 15.203803) (1575130381930, 17, 11.518434) (1575130382930, 17, 13.152081) (1575130383930, 18, 11.378041) (1575130384930, 21, 15.390745) (1575130385930, 30, 15.127818) (1575130386930, 19, 16.530401) (1575130387930, 32, 16.542702) (1575130388930, 26, 16.366442) (1575130389930, 25, 10.306822) (1575130390930, 15, 13.691117) (1575130391930, 15, 13.476817) (1575130392930, 25, 12.529998) (1575130393930, 22, 15.550021) (1575130394930, 20, 15.064971) (1575130395930, 24, 13.313683) (1575130396930, 23, 17.002878) (1575130397930, 30, 19.991594) (1575130398930, 15, 11.116746) (1575130399920, 16, 19.405090) (1575130400920, 22, 14.377142) (1575130401920, 16, 16.868231) (1575130402920, 20, 11.565193) (1575130403920, 31, 13.009119) (1575130404920, 29, 18.136400) (1575130405920, 17, 13.806572) (1575130406920, 23, 14.688898) (1575130407920, 26, 12.931019) (1575130408920, 32, 12.185531) (1575130409920, 30, 13.608714) (1575130410920, 23, 18.624914) (1575130411920, 22, 12.970826) (1575130412920, 22, 12.065827) (1575130413920, 25, 16.967192) (1575130414920, 16, 10.283031) (1575130415920, 22, 16.072535) (1575130416920, 24, 10.794536) (1575130417920, 32, 10.591207) (1575130418920, 20, 13.015227) (1575130419920, 28, 15.410999) (1575130420920, 29, 12.785076) (1575130421920, 28, 15.305857) (1575130422920, 33, 12.820810) (1575130423920, 34, 13.618055) (1575130424920, 32, 12.971123) (1575130425920, 24, 10.974546) (1575130426920, 15, 10.742910) (1575130427920, 23, 16.810783) (1575130428920, 18, 13.115224) (1575130429920, 26, 17.418489) (1575130430920, 20, 17.302315) (1575130431920, 21, 14.283571) (1575130432920, 16, 16.826534) (1575130433920, 18, 19.222122) (1575130434920, 18, 14.931420) (1575130435920, 17, 19.549454) (1575130436920, 22, 16.908388) (1575130437920, 32, 15.637796) (1575130438920, 31, 15.517650) (1575130439920, 18, 14.038033) (1575130440920, 32, 19.859648) (1575130441920, 16, 13.220840) (1575130442920, 28, 16.445398) (1575130443920, 26, 16.695753) (1575130444920, 33, 13.696928) (1575130445920, 21, 15.352819) (1575130446920, 15, 12.388407) (1575130447920, 27, 11.267529) (1575130448920, 20, 14.103228) (1575130449920, 20, 16.250950) (1575130450920, 30, 16.236088) (1575130451920, 22, 18.305340) (1575130452920, 25, 17.360685) (1575130453920, 25, 14.978681) (1575130454920, 33, 14.096183) (1575130455920, 26, 10.019039) (1575130456920, 19, 19.158213) (1575130457920, 22, 15.593924) (1575130458920, 26, 18.780119) (1575130459920, 21, 16.001656) (1575130460920, 16, 18.458328) (1575130461920, 21, 16.417843) (1575130462920, 28, 11.736558) (1575130463920, 34, 18.143946) (1575130464920, 27, 10.303225) (1575130465920, 20, 19.756748) (1575130466920, 22, 12.940063) (1575130467920, 23, 11.509640) (1575130468920, 19, 18.319309) (1575130469920, 19, 16.278345) (1575130470920, 27, 10.898361) (1575130471920, 31, 13.922162) (1575130472920, 15, 19.296116) (1575130473920, 26, 15.885763) (1575130474920, 15, 15.525804) (1575130475920, 19, 19.579538) (1575130476920, 20, 11.073811) (1575130477920, 16, 13.932510) (1575130478920, 17, 11.900328) (1575130479920, 22, 16.540415) (1575130480920, 33, 15.203803) (1575130481920, 17, 11.518434) (1575130482920, 17, 13.152081) (1575130483920, 18, 11.378041) (1575130484920, 21, 15.390745) (1575130485920, 30, 15.127818) (1575130486920, 19, 16.530401) (1575130487920, 32, 16.542702) (1575130488920, 26, 16.366442) (1575130489920, 25, 10.306822) (1575130490920, 15, 13.691117) (1575130491920, 15, 13.476817) (1575130492920, 25, 12.529998) (1575130493920, 22, 15.550021) (1575130494920, 20, 15.064971) (1575130495920, 24, 13.313683) (1575130496920, 23, 17.002878) (1575130497920, 30, 19.991594) (1575130498920, 15, 11.116746) (1575130499910, 16, 19.405090) (1575130500910, 22, 14.377142) (1575130501910, 16, 16.868231) (1575130502910, 20, 11.565193) (1575130503910, 31, 13.009119) (1575130504910, 29, 18.136400) (1575130505910, 17, 13.806572) (1575130506910, 23, 14.688898) (1575130507910, 26, 12.931019) (1575130508910, 32, 12.185531) (1575130509910, 30, 13.608714) (1575130510910, 23, 18.624914) (1575130511910, 22, 12.970826) (1575130512910, 22, 12.065827) (1575130513910, 25, 16.967192) (1575130514910, 16, 10.283031) (1575130515910, 22, 16.072535) (1575130516910, 24, 10.794536) (1575130517910, 32, 10.591207) (1575130518910, 20, 13.015227) (1575130519910, 28, 15.410999) (1575130520910, 29, 12.785076) (1575130521910, 28, 15.305857) (1575130522910, 33, 12.820810) (1575130523910, 34, 13.618055) (1575130524910, 32, 12.971123) (1575130525910, 24, 10.974546) (1575130526910, 15, 10.742910) (1575130527910, 23, 16.810783) (1575130528910, 18, 13.115224) (1575130529910, 26, 17.418489) (1575130530910, 20, 17.302315) (1575130531910, 21, 14.283571) (1575130532910, 16, 16.826534) (1575130533910, 18, 19.222122) (1575130534910, 18, 14.931420) (1575130535910, 17, 19.549454) (1575130536910, 22, 16.908388) (1575130537910, 32, 15.637796) (1575130538910, 31, 15.517650) (1575130539910, 18, 14.038033) (1575130540910, 32, 19.859648) (1575130541910, 16, 13.220840) (1575130542910, 28, 16.445398) (1575130543910, 26, 16.695753) (1575130544910, 33, 13.696928) (1575130545910, 21, 15.352819) (1575130546910, 15, 12.388407) (1575130547910, 27, 11.267529) (1575130548910, 20, 14.103228) (1575130549910, 20, 16.250950) (1575130550910, 30, 16.236088) (1575130551910, 22, 18.305340) (1575130552910, 25, 17.360685) (1575130553910, 25, 14.978681) (1575130554910, 33, 14.096183) (1575130555910, 26, 10.019039) (1575130556910, 19, 19.158213) (1575130557910, 22, 15.593924) (1575130558910, 26, 18.780119) (1575130559910, 21, 16.001656) (1575130560910, 16, 18.458328) (1575130561910, 21, 16.417843) (1575130562910, 28, 11.736558) (1575130563910, 34, 18.143946) (1575130564910, 27, 10.303225) (1575130565910, 20, 19.756748) (1575130566910, 22, 12.940063) (1575130567910, 23, 11.509640) (1575130568910, 19, 18.319309) (1575130569910, 19, 16.278345) (1575130570910, 27, 10.898361) (1575130571910, 31, 13.922162) (1575130572910, 15, 19.296116) (1575130573910, 26, 15.885763) (1575130574910, 15, 15.525804) (1575130575910, 19, 19.579538) (1575130576910, 20, 11.073811) (1575130577910, 16, 13.932510) (1575130578910, 17, 11.900328) (1575130579910, 22, 16.540415) (1575130580910, 33, 15.203803) (1575130581910, 17, 11.518434) (1575130582910, 17, 13.152081) (1575130583910, 18, 11.378041) (1575130584910, 21, 15.390745) (1575130585910, 30, 15.127818) (1575130586910, 19, 16.530401) (1575130587910, 32, 16.542702) (1575130588910, 26, 16.366442) (1575130589910, 25, 10.306822) (1575130590910, 15, 13.691117) (1575130591910, 15, 13.476817) (1575130592910, 25, 12.529998) (1575130593910, 22, 15.550021) (1575130594910, 20, 15.064971) (1575130595910, 24, 13.313683) (1575130596910, 23, 17.002878) (1575130597910, 30, 19.991594) (1575130598910, 15, 11.116746) (1575130599900, 16, 19.405090) (1575130600900, 22, 14.377142) (1575130601900, 16, 16.868231) (1575130602900, 20, 11.565193) (1575130603900, 31, 13.009119) (1575130604900, 29, 18.136400) (1575130605900, 17, 13.806572) (1575130606900, 23, 14.688898) (1575130607900, 26, 12.931019) (1575130608900, 32, 12.185531) (1575130609900, 30, 13.608714) (1575130610900, 23, 18.624914) (1575130611900, 22, 12.970826) (1575130612900, 22, 12.065827) (1575130613900, 25, 16.967192) (1575130614900, 16, 10.283031) (1575130615900, 22, 16.072535) (1575130616900, 24, 10.794536) (1575130617900, 32, 10.591207) (1575130618900, 20, 13.015227) (1575130619900, 28, 15.410999) (1575130620900, 29, 12.785076) (1575130621900, 28, 15.305857) (1575130622900, 33, 12.820810) (1575130623900, 34, 13.618055) (1575130624900, 32, 12.971123) (1575130625900, 24, 10.974546) (1575130626900, 15, 10.742910) (1575130627900, 23, 16.810783) (1575130628900, 18, 13.115224) (1575130629900, 26, 17.418489) (1575130630900, 20, 17.302315) (1575130631900, 21, 14.283571) (1575130632900, 16, 16.826534) (1575130633900, 18, 19.222122) (1575130634900, 18, 14.931420) (1575130635900, 17, 19.549454) (1575130636900, 22, 16.908388) (1575130637900, 32, 15.637796) (1575130638900, 31, 15.517650) (1575130639900, 18, 14.038033) (1575130640900, 32, 19.859648) (1575130641900, 16, 13.220840) (1575130642900, 28, 16.445398) (1575130643900, 26, 16.695753) (1575130644900, 33, 13.696928) (1575130645900, 21, 15.352819) (1575130646900, 15, 12.388407) (1575130647900, 27, 11.267529) (1575130648900, 20, 14.103228) (1575130649900, 20, 16.250950) (1575130650900, 30, 16.236088) (1575130651900, 22, 18.305340) (1575130652900, 25, 17.360685) (1575130653900, 25, 14.978681) (1575130654900, 33, 14.096183) (1575130655900, 26, 10.019039) (1575130656900, 19, 19.158213) (1575130657900, 22, 15.593924) (1575130658900, 26, 18.780119) (1575130659900, 21, 16.001656) (1575130660900, 16, 18.458328) (1575130661900, 21, 16.417843) (1575130662900, 28, 11.736558) (1575130663900, 34, 18.143946) (1575130664900, 27, 10.303225) (1575130665900, 20, 19.756748) (1575130666900, 22, 12.940063) (1575130667900, 23, 11.509640) (1575130668900, 19, 18.319309) (1575130669900, 19, 16.278345) (1575130670900, 27, 10.898361) (1575130671900, 31, 13.922162) (1575130672900, 15, 19.296116) (1575130673900, 26, 15.885763) (1575130674900, 15, 15.525804) (1575130675900, 19, 19.579538) (1575130676900, 20, 11.073811) (1575130677900, 16, 13.932510) (1575130678900, 17, 11.900328) (1575130679900, 22, 16.540415) (1575130680900, 33, 15.203803) (1575130681900, 17, 11.518434) (1575130682900, 17, 13.152081) (1575130683900, 18, 11.378041) (1575130684900, 21, 15.390745) (1575130685900, 30, 15.127818) (1575130686900, 19, 16.530401) (1575130687900, 32, 16.542702) (1575130688900, 26, 16.366442) (1575130689900, 25, 10.306822) (1575130690900, 15, 13.691117) (1575130691900, 15, 13.476817) (1575130692900, 25, 12.529998) (1575130693900, 22, 15.550021) (1575130694900, 20, 15.064971) (1575130695900, 24, 13.313683) (1575130696900, 23, 17.002878) (1575130697900, 30, 19.991594) (1575130698900, 15, 11.116746) (1575130699890, 16, 19.405090) (1575130700890, 22, 14.377142) (1575130701890, 16, 16.868231) (1575130702890, 20, 11.565193) (1575130703890, 31, 13.009119) (1575130704890, 29, 18.136400) (1575130705890, 17, 13.806572) (1575130706890, 23, 14.688898) (1575130707890, 26, 12.931019) (1575130708890, 32, 12.185531) (1575130709890, 30, 13.608714) (1575130710890, 23, 18.624914) (1575130711890, 22, 12.970826) (1575130712890, 22, 12.065827) (1575130713890, 25, 16.967192) (1575130714890, 16, 10.283031) (1575130715890, 22, 16.072535) (1575130716890, 24, 10.794536) (1575130717890, 32, 10.591207) (1575130718890, 20, 13.015227) (1575130719890, 28, 15.410999) (1575130720890, 29, 12.785076) (1575130721890, 28, 15.305857) (1575130722890, 33, 12.820810) (1575130723890, 34, 13.618055) (1575130724890, 32, 12.971123) (1575130725890, 24, 10.974546) (1575130726890, 15, 10.742910) (1575130727890, 23, 16.810783) (1575130728890, 18, 13.115224) (1575130729890, 26, 17.418489) (1575130730890, 20, 17.302315) (1575130731890, 21, 14.283571) (1575130732890, 16, 16.826534) (1575130733890, 18, 19.222122) (1575130734890, 18, 14.931420) (1575130735890, 17, 19.549454) (1575130736890, 22, 16.908388) (1575130737890, 32, 15.637796) (1575130738890, 31, 15.517650) (1575130739890, 18, 14.038033) (1575130740890, 32, 19.859648) (1575130741890, 16, 13.220840) (1575130742890, 28, 16.445398) (1575130743890, 26, 16.695753) (1575130744890, 33, 13.696928) (1575130745890, 21, 15.352819) (1575130746890, 15, 12.388407) (1575130747890, 27, 11.267529) (1575130748890, 20, 14.103228) (1575130749890, 20, 16.250950) (1575130750890, 30, 16.236088) (1575130751890, 22, 18.305340) (1575130752890, 25, 17.360685) (1575130753890, 25, 14.978681) (1575130754890, 33, 14.096183) (1575130755890, 26, 10.019039) (1575130756890, 19, 19.158213) (1575130757890, 22, 15.593924) (1575130758890, 26, 18.780119) (1575130759890, 21, 16.001656) (1575130760890, 16, 18.458328) (1575130761890, 21, 16.417843) (1575130762890, 28, 11.736558) (1575130763890, 34, 18.143946) (1575130764890, 27, 10.303225) (1575130765890, 20, 19.756748) (1575130766890, 22, 12.940063) (1575130767890, 23, 11.509640) (1575130768890, 19, 18.319309) (1575130769890, 19, 16.278345) (1575130770890, 27, 10.898361) (1575130771890, 31, 13.922162) (1575130772890, 15, 19.296116) (1575130773890, 26, 15.885763) (1575130774890, 15, 15.525804) (1575130775890, 19, 19.579538) (1575130776890, 20, 11.073811) (1575130777890, 16, 13.932510) (1575130778890, 17, 11.900328) (1575130779890, 22, 16.540415) (1575130780890, 33, 15.203803) (1575130781890, 17, 11.518434) (1575130782890, 17, 13.152081) (1575130783890, 18, 11.378041) (1575130784890, 21, 15.390745) (1575130785890, 30, 15.127818) (1575130786890, 19, 16.530401) (1575130787890, 32, 16.542702) (1575130788890, 26, 16.366442) (1575130789890, 25, 10.306822) (1575130790890, 15, 13.691117) (1575130791890, 15, 13.476817) (1575130792890, 25, 12.529998) (1575130793890, 22, 15.550021) (1575130794890, 20, 15.064971) (1575130795890, 24, 13.313683) (1575130796890, 23, 17.002878) (1575130797890, 30, 19.991594) (1575130798890, 15, 11.116746) (1575130799880, 16, 19.405090) (1575130800880, 22, 14.377142) (1575130801880, 16, 16.868231) (1575130802880, 20, 11.565193) (1575130803880, 31, 13.009119) (1575130804880, 29, 18.136400) (1575130805880, 17, 13.806572) (1575130806880, 23, 14.688898) (1575130807880, 26, 12.931019) (1575130808880, 32, 12.185531) (1575130809880, 30, 13.608714) (1575130810880, 23, 18.624914) (1575130811880, 22, 12.970826) (1575130812880, 22, 12.065827) (1575130813880, 25, 16.967192) (1575130814880, 16, 10.283031) (1575130815880, 22, 16.072535) (1575130816880, 24, 10.794536) (1575130817880, 32, 10.591207) (1575130818880, 20, 13.015227) (1575130819880, 28, 15.410999) (1575130820880, 29, 12.785076) (1575130821880, 28, 15.305857) (1575130822880, 33, 12.820810) (1575130823880, 34, 13.618055) (1575130824880, 32, 12.971123) (1575130825880, 24, 10.974546) (1575130826880, 15, 10.742910) (1575130827880, 23, 16.810783) (1575130828880, 18, 13.115224) (1575130829880, 26, 17.418489) (1575130830880, 20, 17.302315) (1575130831880, 21, 14.283571) (1575130832880, 16, 16.826534) (1575130833880, 18, 19.222122) (1575130834880, 18, 14.931420) (1575130835880, 17, 19.549454) (1575130836880, 22, 16.908388) (1575130837880, 32, 15.637796) (1575130838880, 31, 15.517650) (1575130839880, 18, 14.038033) (1575130840880, 32, 19.859648) (1575130841880, 16, 13.220840) (1575130842880, 28, 16.445398) (1575130843880, 26, 16.695753) (1575130844880, 33, 13.696928) (1575130845880, 21, 15.352819) (1575130846880, 15, 12.388407) (1575130847880, 27, 11.267529) (1575130848880, 20, 14.103228) (1575130849880, 20, 16.250950) (1575130850880, 30, 16.236088) (1575130851880, 22, 18.305340) (1575130852880, 25, 17.360685) (1575130853880, 25, 14.978681) (1575130854880, 33, 14.096183) (1575130855880, 26, 10.019039) (1575130856880, 19, 19.158213) (1575130857880, 22, 15.593924) (1575130858880, 26, 18.780119) (1575130859880, 21, 16.001656) (1575130860880, 16, 18.458328) (1575130861880, 21, 16.417843) (1575130862880, 28, 11.736558) (1575130863880, 34, 18.143946) (1575130864880, 27, 10.303225) (1575130865880, 20, 19.756748) (1575130866880, 22, 12.940063) (1575130867880, 23, 11.509640) (1575130868880, 19, 18.319309) (1575130869880, 19, 16.278345) (1575130870880, 27, 10.898361) (1575130871880, 31, 13.922162) (1575130872880, 15, 19.296116) (1575130873880, 26, 15.885763) (1575130874880, 15, 15.525804) (1575130875880, 19, 19.579538) (1575130876880, 20, 11.073811) (1575130877880, 16, 13.932510) (1575130878880, 17, 11.900328) (1575130879880, 22, 16.540415) (1575130880880, 33, 15.203803) (1575130881880, 17, 11.518434) (1575130882880, 17, 13.152081) (1575130883880, 18, 11.378041) (1575130884880, 21, 15.390745) (1575130885880, 30, 15.127818) (1575130886880, 19, 16.530401) (1575130887880, 32, 16.542702) (1575130888880, 26, 16.366442) (1575130889880, 25, 10.306822) (1575130890880, 15, 13.691117) (1575130891880, 15, 13.476817) (1575130892880, 25, 12.529998) (1575130893880, 22, 15.550021) (1575130894880, 20, 15.064971) (1575130895880, 24, 13.313683) (1575130896880, 23, 17.002878) (1575130897880, 30, 19.991594) (1575130898880, 15, 11.116746) (1575130899870, 16, 19.405090) (1575130900870, 22, 14.377142) (1575130901870, 16, 16.868231) (1575130902870, 20, 11.565193) (1575130903870, 31, 13.009119) (1575130904870, 29, 18.136400) (1575130905870, 17, 13.806572) (1575130906870, 23, 14.688898) (1575130907870, 26, 12.931019) (1575130908870, 32, 12.185531) (1575130909870, 30, 13.608714) (1575130910870, 23, 18.624914) (1575130911870, 22, 12.970826) (1575130912870, 22, 12.065827) (1575130913870, 25, 16.967192) (1575130914870, 16, 10.283031) (1575130915870, 22, 16.072535) (1575130916870, 24, 10.794536) (1575130917870, 32, 10.591207) (1575130918870, 20, 13.015227) (1575130919870, 28, 15.410999) (1575130920870, 29, 12.785076) (1575130921870, 28, 15.305857) (1575130922870, 33, 12.820810) (1575130923870, 34, 13.618055) (1575130924870, 32, 12.971123) (1575130925870, 24, 10.974546) (1575130926870, 15, 10.742910) (1575130927870, 23, 16.810783) (1575130928870, 18, 13.115224) (1575130929870, 26, 17.418489) (1575130930870, 20, 17.302315) (1575130931870, 21, 14.283571) (1575130932870, 16, 16.826534) (1575130933870, 18, 19.222122) (1575130934870, 18, 14.931420) (1575130935870, 17, 19.549454) (1575130936870, 22, 16.908388) (1575130937870, 32, 15.637796) (1575130938870, 31, 15.517650) (1575130939870, 18, 14.038033) (1575130940870, 32, 19.859648) (1575130941870, 16, 13.220840) (1575130942870, 28, 16.445398) (1575130943870, 26, 16.695753) (1575130944870, 33, 13.696928) (1575130945870, 21, 15.352819) (1575130946870, 15, 12.388407) (1575130947870, 27, 11.267529) (1575130948870, 20, 14.103228) (1575130949870, 20, 16.250950) (1575130950870, 30, 16.236088) (1575130951870, 22, 18.305340) (1575130952870, 25, 17.360685) (1575130953870, 25, 14.978681) (1575130954870, 33, 14.096183) (1575130955870, 26, 10.019039) (1575130956870, 19, 19.158213) (1575130957870, 22, 15.593924) (1575130958870, 26, 18.780119) (1575130959870, 21, 16.001656) (1575130960870, 16, 18.458328) (1575130961870, 21, 16.417843) (1575130962870, 28, 11.736558) (1575130963870, 34, 18.143946) (1575130964870, 27, 10.303225) (1575130965870, 20, 19.756748) (1575130966870, 22, 12.940063) (1575130967870, 23, 11.509640) (1575130968870, 19, 18.319309) (1575130969870, 19, 16.278345) (1575130970870, 27, 10.898361) (1575130971870, 31, 13.922162) (1575130972870, 15, 19.296116) (1575130973870, 26, 15.885763) (1575130974870, 15, 15.525804) (1575130975870, 19, 19.579538) (1575130976870, 20, 11.073811) (1575130977870, 16, 13.932510) (1575130978870, 17, 11.900328) (1575130979870, 22, 16.540415) (1575130980870, 33, 15.203803) (1575130981870, 17, 11.518434) (1575130982870, 17, 13.152081) (1575130983870, 18, 11.378041) (1575130984870, 21, 15.390745) (1575130985870, 30, 15.127818) (1575130986870, 19, 16.530401) (1575130987870, 32, 16.542702) (1575130988870, 26, 16.366442) (1575130989870, 25, 10.306822) (1575130990870, 15, 13.691117) (1575130991870, 15, 13.476817) (1575130992870, 25, 12.529998) (1575130993870, 22, 15.550021) (1575130994870, 20, 15.064971) (1575130995870, 24, 13.313683) (1575130996870, 23, 17.002878) (1575130997870, 30, 19.991594) (1575130998870, 15, 11.116746) (1575130999860, 16, 19.405090) (1575131000860, 22, 14.377142) (1575131001860, 16, 16.868231) (1575131002860, 20, 11.565193) (1575131003860, 31, 13.009119) (1575131004860, 29, 18.136400) (1575131005860, 17, 13.806572) (1575131006860, 23, 14.688898) (1575131007860, 26, 12.931019) (1575131008860, 32, 12.185531) (1575131009860, 30, 13.608714) (1575131010860, 23, 18.624914) (1575131011860, 22, 12.970826) (1575131012860, 22, 12.065827) (1575131013860, 25, 16.967192) (1575131014860, 16, 10.283031) (1575131015860, 22, 16.072535) (1575131016860, 24, 10.794536) (1575131017860, 32, 10.591207) (1575131018860, 20, 13.015227) (1575131019860, 28, 15.410999) (1575131020860, 29, 12.785076) (1575131021860, 28, 15.305857) (1575131022860, 33, 12.820810) (1575131023860, 34, 13.618055) (1575131024860, 32, 12.971123) (1575131025860, 24, 10.974546) (1575131026860, 15, 10.742910) (1575131027860, 23, 16.810783) (1575131028860, 18, 13.115224) (1575131029860, 26, 17.418489) (1575131030860, 20, 17.302315) (1575131031860, 21, 14.283571) (1575131032860, 16, 16.826534) (1575131033860, 18, 19.222122) (1575131034860, 18, 14.931420) (1575131035860, 17, 19.549454) (1575131036860, 22, 16.908388) (1575131037860, 32, 15.637796) (1575131038860, 31, 15.517650) (1575131039860, 18, 14.038033) (1575131040860, 32, 19.859648) (1575131041860, 16, 13.220840) (1575131042860, 28, 16.445398) (1575131043860, 26, 16.695753) (1575131044860, 33, 13.696928) (1575131045860, 21, 15.352819) (1575131046860, 15, 12.388407) (1575131047860, 27, 11.267529) (1575131048860, 20, 14.103228) (1575131049860, 20, 16.250950) (1575131050860, 30, 16.236088) (1575131051860, 22, 18.305340) (1575131052860, 25, 17.360685) (1575131053860, 25, 14.978681) (1575131054860, 33, 14.096183) (1575131055860, 26, 10.019039) (1575131056860, 19, 19.158213) (1575131057860, 22, 15.593924) (1575131058860, 26, 18.780119) (1575131059860, 21, 16.001656) (1575131060860, 16, 18.458328) (1575131061860, 21, 16.417843) (1575131062860, 28, 11.736558) (1575131063860, 34, 18.143946) (1575131064860, 27, 10.303225) (1575131065860, 20, 19.756748) (1575131066860, 22, 12.940063) (1575131067860, 23, 11.509640) (1575131068860, 19, 18.319309) (1575131069860, 19, 16.278345) (1575131070860, 27, 10.898361) (1575131071860, 31, 13.922162) (1575131072860, 15, 19.296116) (1575131073860, 26, 15.885763) (1575131074860, 15, 15.525804) (1575131075860, 19, 19.579538) (1575131076860, 20, 11.073811) (1575131077860, 16, 13.932510) (1575131078860, 17, 11.900328) (1575131079860, 22, 16.540415) (1575131080860, 33, 15.203803) (1575131081860, 17, 11.518434) (1575131082860, 17, 13.152081) (1575131083860, 18, 11.378041) (1575131084860, 21, 15.390745) (1575131085860, 30, 15.127818) (1575131086860, 19, 16.530401) (1575131087860, 32, 16.542702) (1575131088860, 26, 16.366442) (1575131089860, 25, 10.306822) (1575131090860, 15, 13.691117) (1575131091860, 15, 13.476817) (1575131092860, 25, 12.529998) (1575131093860, 22, 15.550021) (1575131094860, 20, 15.064971) (1575131095860, 24, 13.313683) (1575131096860, 23, 17.002878) (1575131097860, 30, 19.991594) (1575131098860, 15, 11.116746) (1575131099850, 16, 19.405090) (1575131100850, 22, 14.377142) (1575131101850, 16, 16.868231) (1575131102850, 20, 11.565193) (1575131103850, 31, 13.009119) (1575131104850, 29, 18.136400) (1575131105850, 17, 13.806572) (1575131106850, 23, 14.688898) (1575131107850, 26, 12.931019) (1575131108850, 32, 12.185531) (1575131109850, 30, 13.608714) (1575131110850, 23, 18.624914) (1575131111850, 22, 12.970826) (1575131112850, 22, 12.065827) (1575131113850, 25, 16.967192) (1575131114850, 16, 10.283031) (1575131115850, 22, 16.072535) (1575131116850, 24, 10.794536) (1575131117850, 32, 10.591207) (1575131118850, 20, 13.015227) (1575131119850, 28, 15.410999) (1575131120850, 29, 12.785076) (1575131121850, 28, 15.305857) (1575131122850, 33, 12.820810) (1575131123850, 34, 13.618055) (1575131124850, 32, 12.971123) (1575131125850, 24, 10.974546) (1575131126850, 15, 10.742910) (1575131127850, 23, 16.810783) (1575131128850, 18, 13.115224) (1575131129850, 26, 17.418489) (1575131130850, 20, 17.302315) (1575131131850, 21, 14.283571) (1575131132850, 16, 16.826534) (1575131133850, 18, 19.222122) (1575131134850, 18, 14.931420) (1575131135850, 17, 19.549454) (1575131136850, 22, 16.908388) (1575131137850, 32, 15.637796) (1575131138850, 31, 15.517650) (1575131139850, 18, 14.038033) (1575131140850, 32, 19.859648) (1575131141850, 16, 13.220840) (1575131142850, 28, 16.445398) (1575131143850, 26, 16.695753) (1575131144850, 33, 13.696928) (1575131145850, 21, 15.352819) (1575131146850, 15, 12.388407) (1575131147850, 27, 11.267529) (1575131148850, 20, 14.103228) (1575131149850, 20, 16.250950) (1575131150850, 30, 16.236088) (1575131151850, 22, 18.305340) (1575131152850, 25, 17.360685) (1575131153850, 25, 14.978681) (1575131154850, 33, 14.096183) (1575131155850, 26, 10.019039) (1575131156850, 19, 19.158213) (1575131157850, 22, 15.593924) (1575131158850, 26, 18.780119) (1575131159850, 21, 16.001656) (1575131160850, 16, 18.458328) (1575131161850, 21, 16.417843) (1575131162850, 28, 11.736558) (1575131163850, 34, 18.143946) (1575131164850, 27, 10.303225) (1575131165850, 20, 19.756748) (1575131166850, 22, 12.940063) (1575131167850, 23, 11.509640) (1575131168850, 19, 18.319309) (1575131169850, 19, 16.278345) (1575131170850, 27, 10.898361) (1575131171850, 31, 13.922162) (1575131172850, 15, 19.296116) (1575131173850, 26, 15.885763) (1575131174850, 15, 15.525804) (1575131175850, 19, 19.579538) (1575131176850, 20, 11.073811) (1575131177850, 16, 13.932510) (1575131178850, 17, 11.900328) (1575131179850, 22, 16.540415) (1575131180850, 33, 15.203803) (1575131181850, 17, 11.518434) (1575131182850, 17, 13.152081) (1575131183850, 18, 11.378041) (1575131184850, 21, 15.390745) (1575131185850, 30, 15.127818) (1575131186850, 19, 16.530401) (1575131187850, 32, 16.542702) (1575131188850, 26, 16.366442) (1575131189850, 25, 10.306822) (1575131190850, 15, 13.691117) (1575131191850, 15, 13.476817) (1575131192850, 25, 12.529998) (1575131193850, 22, 15.550021) (1575131194850, 20, 15.064971) (1575131195850, 24, 13.313683) (1575131196850, 23, 17.002878) (1575131197850, 30, 19.991594) (1575131198850, 15, 11.116746) (1575131199840, 16, 19.405090) (1575131200840, 22, 14.377142) (1575131201840, 16, 16.868231) (1575131202840, 20, 11.565193) (1575131203840, 31, 13.009119) (1575131204840, 29, 18.136400) (1575131205840, 17, 13.806572) (1575131206840, 23, 14.688898) (1575131207840, 26, 12.931019) (1575131208840, 32, 12.185531) (1575131209840, 30, 13.608714) (1575131210840, 23, 18.624914) (1575131211840, 22, 12.970826) (1575131212840, 22, 12.065827) (1575131213840, 25, 16.967192) (1575131214840, 16, 10.283031) (1575131215840, 22, 16.072535) (1575131216840, 24, 10.794536) (1575131217840, 32, 10.591207) (1575131218840, 20, 13.015227) (1575131219840, 28, 15.410999) (1575131220840, 29, 12.785076) (1575131221840, 28, 15.305857) (1575131222840, 33, 12.820810) (1575131223840, 34, 13.618055) (1575131224840, 32, 12.971123) (1575131225840, 24, 10.974546) (1575131226840, 15, 10.742910) (1575131227840, 23, 16.810783) (1575131228840, 18, 13.115224) (1575131229840, 26, 17.418489) (1575131230840, 20, 17.302315) (1575131231840, 21, 14.283571) (1575131232840, 16, 16.826534) (1575131233840, 18, 19.222122) (1575131234840, 18, 14.931420) (1575131235840, 17, 19.549454) (1575131236840, 22, 16.908388) (1575131237840, 32, 15.637796) (1575131238840, 31, 15.517650) (1575131239840, 18, 14.038033) (1575131240840, 32, 19.859648) (1575131241840, 16, 13.220840) (1575131242840, 28, 16.445398) (1575131243840, 26, 16.695753) (1575131244840, 33, 13.696928) (1575131245840, 21, 15.352819) (1575131246840, 15, 12.388407) (1575131247840, 27, 11.267529) (1575131248840, 20, 14.103228) (1575131249840, 20, 16.250950) (1575131250840, 30, 16.236088) (1575131251840, 22, 18.305340) (1575131252840, 25, 17.360685) (1575131253840, 25, 14.978681) (1575131254840, 33, 14.096183) (1575131255840, 26, 10.019039) (1575131256840, 19, 19.158213) (1575131257840, 22, 15.593924) (1575131258840, 26, 18.780119) (1575131259840, 21, 16.001656) (1575131260840, 16, 18.458328) (1575131261840, 21, 16.417843) (1575131262840, 28, 11.736558) (1575131263840, 34, 18.143946) (1575131264840, 27, 10.303225) (1575131265840, 20, 19.756748) (1575131266840, 22, 12.940063) (1575131267840, 23, 11.509640) (1575131268840, 19, 18.319309) (1575131269840, 19, 16.278345) (1575131270840, 27, 10.898361) (1575131271840, 31, 13.922162) (1575131272840, 15, 19.296116) (1575131273840, 26, 15.885763) (1575131274840, 15, 15.525804) (1575131275840, 19, 19.579538) (1575131276840, 20, 11.073811) (1575131277840, 16, 13.932510) (1575131278840, 17, 11.900328) (1575131279840, 22, 16.540415) (1575131280840, 33, 15.203803) (1575131281840, 17, 11.518434) (1575131282840, 17, 13.152081) (1575131283840, 18, 11.378041) (1575131284840, 21, 15.390745) (1575131285840, 30, 15.127818) (1575131286840, 19, 16.530401) (1575131287840, 32, 16.542702) (1575131288840, 26, 16.366442) (1575131289840, 25, 10.306822) (1575131290840, 15, 13.691117) (1575131291840, 15, 13.476817) (1575131292840, 25, 12.529998) (1575131293840, 22, 15.550021) (1575131294840, 20, 15.064971) (1575131295840, 24, 13.313683) (1575131296840, 23, 17.002878) (1575131297840, 30, 19.991594) (1575131298840, 15, 11.116746) (1575131299830, 16, 19.405090) (1575131300830, 22, 14.377142) (1575131301830, 16, 16.868231) (1575131302830, 20, 11.565193) (1575131303830, 31, 13.009119) (1575131304830, 29, 18.136400) (1575131305830, 17, 13.806572) (1575131306830, 23, 14.688898) (1575131307830, 26, 12.931019) (1575131308830, 32, 12.185531) (1575131309830, 30, 13.608714) (1575131310830, 23, 18.624914) (1575131311830, 22, 12.970826) (1575131312830, 22, 12.065827) (1575131313830, 25, 16.967192) (1575131314830, 16, 10.283031) (1575131315830, 22, 16.072535) (1575131316830, 24, 10.794536) (1575131317830, 32, 10.591207) (1575131318830, 20, 13.015227) (1575131319830, 28, 15.410999) (1575131320830, 29, 12.785076) (1575131321830, 28, 15.305857) (1575131322830, 33, 12.820810) (1575131323830, 34, 13.618055) (1575131324830, 32, 12.971123) (1575131325830, 24, 10.974546) (1575131326830, 15, 10.742910) (1575131327830, 23, 16.810783) (1575131328830, 18, 13.115224) (1575131329830, 26, 17.418489) (1575131330830, 20, 17.302315) (1575131331830, 21, 14.283571) (1575131332830, 16, 16.826534) (1575131333830, 18, 19.222122) (1575131334830, 18, 14.931420) (1575131335830, 17, 19.549454) (1575131336830, 22, 16.908388) (1575131337830, 32, 15.637796) (1575131338830, 31, 15.517650) (1575131339830, 18, 14.038033) (1575131340830, 32, 19.859648) (1575131341830, 16, 13.220840) (1575131342830, 28, 16.445398) (1575131343830, 26, 16.695753) (1575131344830, 33, 13.696928) (1575131345830, 21, 15.352819) (1575131346830, 15, 12.388407) (1575131347830, 27, 11.267529) (1575131348830, 20, 14.103228) (1575131349830, 20, 16.250950) (1575131350830, 30, 16.236088) (1575131351830, 22, 18.305340) (1575131352830, 25, 17.360685) (1575131353830, 25, 14.978681) (1575131354830, 33, 14.096183) (1575131355830, 26, 10.019039) (1575131356830, 19, 19.158213) (1575131357830, 22, 15.593924) (1575131358830, 26, 18.780119) (1575131359830, 21, 16.001656) (1575131360830, 16, 18.458328) (1575131361830, 21, 16.417843) (1575131362830, 28, 11.736558) (1575131363830, 34, 18.143946) (1575131364830, 27, 10.303225) (1575131365830, 20, 19.756748) (1575131366830, 22, 12.940063) (1575131367830, 23, 11.509640) (1575131368830, 19, 18.319309) (1575131369830, 19, 16.278345) (1575131370830, 27, 10.898361) (1575131371830, 31, 13.922162) (1575131372830, 15, 19.296116) (1575131373830, 26, 15.885763) (1575131374830, 15, 15.525804) (1575131375830, 19, 19.579538) (1575131376830, 20, 11.073811) (1575131377830, 16, 13.932510) (1575131378830, 17, 11.900328) (1575131379830, 22, 16.540415) (1575131380830, 33, 15.203803) (1575131381830, 17, 11.518434) (1575131382830, 17, 13.152081) (1575131383830, 18, 11.378041) (1575131384830, 21, 15.390745) (1575131385830, 30, 15.127818) (1575131386830, 19, 16.530401) (1575131387830, 32, 16.542702) (1575131388830, 26, 16.366442) (1575131389830, 25, 10.306822) (1575131390830, 15, 13.691117) (1575131391830, 15, 13.476817) (1575131392830, 25, 12.529998) (1575131393830, 22, 15.550021) (1575131394830, 20, 15.064971) (1575131395830, 24, 13.313683) (1575131396830, 23, 17.002878) (1575131397830, 30, 19.991594) (1575131398830, 15, 11.116746) (1575131399820, 16, 19.405090) (1575131400820, 22, 14.377142) (1575131401820, 16, 16.868231) (1575131402820, 20, 11.565193) (1575131403820, 31, 13.009119) (1575131404820, 29, 18.136400) (1575131405820, 17, 13.806572) (1575131406820, 23, 14.688898) (1575131407820, 26, 12.931019) (1575131408820, 32, 12.185531) (1575131409820, 30, 13.608714) (1575131410820, 23, 18.624914) (1575131411820, 22, 12.970826) (1575131412820, 22, 12.065827) (1575131413820, 25, 16.967192) (1575131414820, 16, 10.283031) (1575131415820, 22, 16.072535) (1575131416820, 24, 10.794536) (1575131417820, 32, 10.591207) (1575131418820, 20, 13.015227) (1575131419820, 28, 15.410999) (1575131420820, 29, 12.785076) (1575131421820, 28, 15.305857) (1575131422820, 33, 12.820810) (1575131423820, 34, 13.618055) (1575131424820, 32, 12.971123) (1575131425820, 24, 10.974546) (1575131426820, 15, 10.742910) (1575131427820, 23, 16.810783) (1575131428820, 18, 13.115224) (1575131429820, 26, 17.418489) (1575131430820, 20, 17.302315) (1575131431820, 21, 14.283571) (1575131432820, 16, 16.826534) (1575131433820, 18, 19.222122) (1575131434820, 18, 14.931420) (1575131435820, 17, 19.549454) (1575131436820, 22, 16.908388) (1575131437820, 32, 15.637796) (1575131438820, 31, 15.517650) (1575131439820, 18, 14.038033) (1575131440820, 32, 19.859648) (1575131441820, 16, 13.220840) (1575131442820, 28, 16.445398) (1575131443820, 26, 16.695753) (1575131444820, 33, 13.696928) (1575131445820, 21, 15.352819) (1575131446820, 15, 12.388407) (1575131447820, 27, 11.267529) (1575131448820, 20, 14.103228) (1575131449820, 20, 16.250950) (1575131450820, 30, 16.236088) (1575131451820, 22, 18.305340) (1575131452820, 25, 17.360685) (1575131453820, 25, 14.978681) (1575131454820, 33, 14.096183) (1575131455820, 26, 10.019039) (1575131456820, 19, 19.158213) (1575131457820, 22, 15.593924) (1575131458820, 26, 18.780119) (1575131459820, 21, 16.001656) (1575131460820, 16, 18.458328) (1575131461820, 21, 16.417843) (1575131462820, 28, 11.736558) (1575131463820, 34, 18.143946) (1575131464820, 27, 10.303225) (1575131465820, 20, 19.756748) (1575131466820, 22, 12.940063) (1575131467820, 23, 11.509640) (1575131468820, 19, 18.319309) (1575131469820, 19, 16.278345) (1575131470820, 27, 10.898361) (1575131471820, 31, 13.922162) (1575131472820, 15, 19.296116) (1575131473820, 26, 15.885763) (1575131474820, 15, 15.525804) (1575131475820, 19, 19.579538) (1575131476820, 20, 11.073811) (1575131477820, 16, 13.932510) (1575131478820, 17, 11.900328) (1575131479820, 22, 16.540415) (1575131480820, 33, 15.203803) (1575131481820, 17, 11.518434) (1575131482820, 17, 13.152081) (1575131483820, 18, 11.378041) (1575131484820, 21, 15.390745) (1575131485820, 30, 15.127818) (1575131486820, 19, 16.530401) (1575131487820, 32, 16.542702) (1575131488820, 26, 16.366442) (1575131489820, 25, 10.306822) (1575131490820, 15, 13.691117) (1575131491820, 15, 13.476817) (1575131492820, 25, 12.529998) (1575131493820, 22, 15.550021) (1575131494820, 20, 15.064971) (1575131495820, 24, 13.313683) (1575131496820, 23, 17.002878) (1575131497820, 30, 19.991594) (1575131498820, 15, 11.116746) (1575131499810, 16, 19.405090) (1575131500810, 22, 14.377142) (1575131501810, 16, 16.868231) (1575131502810, 20, 11.565193) (1575131503810, 31, 13.009119) (1575131504810, 29, 18.136400) (1575131505810, 17, 13.806572) (1575131506810, 23, 14.688898) (1575131507810, 26, 12.931019) (1575131508810, 32, 12.185531) (1575131509810, 30, 13.608714) (1575131510810, 23, 18.624914) (1575131511810, 22, 12.970826) (1575131512810, 22, 12.065827) (1575131513810, 25, 16.967192) (1575131514810, 16, 10.283031) (1575131515810, 22, 16.072535) (1575131516810, 24, 10.794536) (1575131517810, 32, 10.591207) (1575131518810, 20, 13.015227) (1575131519810, 28, 15.410999) (1575131520810, 29, 12.785076) (1575131521810, 28, 15.305857) (1575131522810, 33, 12.820810) (1575131523810, 34, 13.618055) (1575131524810, 32, 12.971123) (1575131525810, 24, 10.974546) (1575131526810, 15, 10.742910) (1575131527810, 23, 16.810783) (1575131528810, 18, 13.115224) (1575131529810, 26, 17.418489) (1575131530810, 20, 17.302315) (1575131531810, 21, 14.283571) (1575131532810, 16, 16.826534) (1575131533810, 18, 19.222122) (1575131534810, 18, 14.931420) (1575131535810, 17, 19.549454) (1575131536810, 22, 16.908388) (1575131537810, 32, 15.637796) (1575131538810, 31, 15.517650) (1575131539810, 18, 14.038033) (1575131540810, 32, 19.859648) (1575131541810, 16, 13.220840) (1575131542810, 28, 16.445398) (1575131543810, 26, 16.695753) (1575131544810, 33, 13.696928) (1575131545810, 21, 15.352819) (1575131546810, 15, 12.388407) (1575131547810, 27, 11.267529) (1575131548810, 20, 14.103228) (1575131549810, 20, 16.250950) (1575131550810, 30, 16.236088) (1575131551810, 22, 18.305340) (1575131552810, 25, 17.360685) (1575131553810, 25, 14.978681) (1575131554810, 33, 14.096183) (1575131555810, 26, 10.019039) (1575131556810, 19, 19.158213) (1575131557810, 22, 15.593924) (1575131558810, 26, 18.780119) (1575131559810, 21, 16.001656) (1575131560810, 16, 18.458328) (1575131561810, 21, 16.417843) (1575131562810, 28, 11.736558) (1575131563810, 34, 18.143946) (1575131564810, 27, 10.303225) (1575131565810, 20, 19.756748) (1575131566810, 22, 12.940063) (1575131567810, 23, 11.509640) (1575131568810, 19, 18.319309) (1575131569810, 19, 16.278345) (1575131570810, 27, 10.898361) (1575131571810, 31, 13.922162) (1575131572810, 15, 19.296116) (1575131573810, 26, 15.885763) (1575131574810, 15, 15.525804) (1575131575810, 19, 19.579538) (1575131576810, 20, 11.073811) (1575131577810, 16, 13.932510) (1575131578810, 17, 11.900328) (1575131579810, 22, 16.540415) (1575131580810, 33, 15.203803) (1575131581810, 17, 11.518434) (1575131582810, 17, 13.152081) (1575131583810, 18, 11.378041) (1575131584810, 21, 15.390745) (1575131585810, 30, 15.127818) (1575131586810, 19, 16.530401) (1575131587810, 32, 16.542702) (1575131588810, 26, 16.366442) (1575131589810, 25, 10.306822) (1575131590810, 15, 13.691117) (1575131591810, 15, 13.476817) (1575131592810, 25, 12.529998) (1575131593810, 22, 15.550021) (1575131594810, 20, 15.064971) (1575131595810, 24, 13.313683) (1575131596810, 23, 17.002878) (1575131597810, 30, 19.991594) (1575131598810, 15, 11.116746) (1575131599800, 16, 19.405090) (1575131600800, 22, 14.377142) (1575131601800, 16, 16.868231) (1575131602800, 20, 11.565193) (1575131603800, 31, 13.009119) (1575131604800, 29, 18.136400) (1575131605800, 17, 13.806572) (1575131606800, 23, 14.688898) (1575131607800, 26, 12.931019) (1575131608800, 32, 12.185531) (1575131609800, 30, 13.608714) (1575131610800, 23, 18.624914) (1575131611800, 22, 12.970826) (1575131612800, 22, 12.065827) (1575131613800, 25, 16.967192) (1575131614800, 16, 10.283031) (1575131615800, 22, 16.072535) (1575131616800, 24, 10.794536) (1575131617800, 32, 10.591207) (1575131618800, 20, 13.015227) (1575131619800, 28, 15.410999) (1575131620800, 29, 12.785076) (1575131621800, 28, 15.305857) (1575131622800, 33, 12.820810) (1575131623800, 34, 13.618055) (1575131624800, 32, 12.971123) (1575131625800, 24, 10.974546) (1575131626800, 15, 10.742910) (1575131627800, 23, 16.810783) (1575131628800, 18, 13.115224) (1575131629800, 26, 17.418489) (1575131630800, 20, 17.302315) (1575131631800, 21, 14.283571) (1575131632800, 16, 16.826534) (1575131633800, 18, 19.222122) (1575131634800, 18, 14.931420) (1575131635800, 17, 19.549454) (1575131636800, 22, 16.908388) (1575131637800, 32, 15.637796) (1575131638800, 31, 15.517650) (1575131639800, 18, 14.038033) (1575131640800, 32, 19.859648) (1575131641800, 16, 13.220840) (1575131642800, 28, 16.445398) (1575131643800, 26, 16.695753) (1575131644800, 33, 13.696928) (1575131645800, 21, 15.352819) (1575131646800, 15, 12.388407) (1575131647800, 27, 11.267529) (1575131648800, 20, 14.103228) (1575131649800, 20, 16.250950) (1575131650800, 30, 16.236088) (1575131651800, 22, 18.305340) (1575131652800, 25, 17.360685) (1575131653800, 25, 14.978681) (1575131654800, 33, 14.096183) (1575131655800, 26, 10.019039) (1575131656800, 19, 19.158213) (1575131657800, 22, 15.593924) (1575131658800, 26, 18.780119) (1575131659800, 21, 16.001656) (1575131660800, 16, 18.458328) (1575131661800, 21, 16.417843) (1575131662800, 28, 11.736558) (1575131663800, 34, 18.143946) (1575131664800, 27, 10.303225) (1575131665800, 20, 19.756748) (1575131666800, 22, 12.940063) (1575131667800, 23, 11.509640) (1575131668800, 19, 18.319309) (1575131669800, 19, 16.278345) (1575131670800, 27, 10.898361) (1575131671800, 31, 13.922162) (1575131672800, 15, 19.296116) (1575131673800, 26, 15.885763) (1575131674800, 15, 15.525804) (1575131675800, 19, 19.579538) (1575131676800, 20, 11.073811) (1575131677800, 16, 13.932510) (1575131678800, 17, 11.900328) (1575131679800, 22, 16.540415) (1575131680800, 33, 15.203803) (1575131681800, 17, 11.518434) (1575131682800, 17, 13.152081) (1575131683800, 18, 11.378041) (1575131684800, 21, 15.390745) (1575131685800, 30, 15.127818) (1575131686800, 19, 16.530401) (1575131687800, 32, 16.542702) (1575131688800, 26, 16.366442) (1575131689800, 25, 10.306822) (1575131690800, 15, 13.691117) (1575131691800, 15, 13.476817) (1575131692800, 25, 12.529998) (1575131693800, 22, 15.550021)")
+
+    end_time = int(round(time.time() * 1000))
+    tdLog.info("Execute time without compress: %dms" % (end_time - start_time))
+
+    simLogPath = tdDnodes.getSimLogPath()
+    grepCmd = "grep -a 'compress rpc msg, before:' -r %s | head -2" % simLogPath
+    output = subprocess.check_output(grepCmd, shell=True).decode("utf-8")
+
+    if output != "":
+        tdLog.info("Find %s in log file." % output)
+        tdLog.exit("%s successfully executed! Compress works but NOT expected." % __file__)
+    else:
+        tdLog.success("%s failed! Compress does NOT works as expected." % __file__)
+
+    conn.close()
diff --git a/tests/pytest/tools/taosdemo.py b/tests/pytest/tools/taosdemo.py
new file mode 100644
index 0000000000000000000000000000000000000000..5bf8ebaf03beb052f09d80b92c6b6b6d588e4f4f
--- /dev/null
+++ b/tests/pytest/tools/taosdemo.py
@@ -0,0 +1,64 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        
+        self.numberOfTables = 10000
+        self.numberOfRecords = 100
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+    def run(self):
+        tdSql.prepare()
+        buildPath = self.getBuildPath()
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+        binPath = buildPath+ "/build/bin/"
+        os.system("yes | %staosdemo -t %d -n %d" % (binPath,self.numberOfTables, self.numberOfRecords))
+
+        tdSql.execute("use test")
+        tdSql.query("select count(*) from meters")
+        tdSql.checkData(0, 0, self.numberOfTables * self.numberOfRecords)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/user/__init__.py b/tests/pytest/user/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/user/pass_len.py b/tests/pytest/user/pass_len.py
new file mode 100644
index 0000000000000000000000000000000000000000..346b8424fe325a214b798c58b06c3e3cfb0e4d39
--- /dev/null
+++ b/tests/pytest/user/pass_len.py
@@ -0,0 +1,63 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user abc pass '123456'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("create user abc pass '123456'")
+
+        print("==============step2")
+        try:
+            tdSql.execute("alter user abc pass 'taosdata'")
+        except Exception as e:
+            tdLog.exit(e)
+        print("alter user abc pass 'taosdata'")
+
+        print("==============step3")
+        try:
+            tdSql.execute("alter user abc pass ''")
+        except Exception as e:
+            print("alter user abc pass ''")
+        else:
+            tdLog.exit("Error: alert user abc pass''")
+
+        print("==============step4")
+        try:
+            tdSql.execute("alter user abc pass null")
+        except Exception as e:
+            print("alter user abc pass null")
+        else:
+            tdLog.exit("Error: alter user abc pass null")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/user/user_create.py b/tests/pytest/user/user_create.py
new file mode 100644
index 0000000000000000000000000000000000000000..a00f670a36778e5ea2191ac4e7b43930efe64b01
--- /dev/null
+++ b/tests/pytest/user/user_create.py
@@ -0,0 +1,54 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        print("==============step1")
+        try:
+            tdSql.execute("create user &abc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step2")
+        try:
+            tdSql.execute("create user a&bc PASS 'pass123'")
+        except Exception as e:
+            print(e)
+
+        print("==============step3")
+        try:
+            tdSql.execute("create user '涛思' PASS 'pass123'")
+        except Exception as e:
+            print(e)
+            return
+
+        tdLog.exit("create user with special character.")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/util/__init__.py b/tests/pytest/util/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/pytest/util/cases.py b/tests/pytest/util/cases.py
new file mode 100644
index 0000000000000000000000000000000000000000..2fc1ac8515e47f9354483ebb590897eea96dcc57
--- /dev/null
+++ b/tests/pytest/util/cases.py
@@ -0,0 +1,144 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import time
+import datetime
+import inspect
+import importlib
+from util.log import *
+
+
+class TDCase:
+    def __init__(self, name, case):
+        self.name = name
+        self.case = case
+        self._logSql = True
+
+
+class TDCases:
+    def __init__(self):
+        self.linuxCases = []
+        self.windowsCases = []
+        self.clusterCases = []
+
+    def __dynamicLoadModule(self, fileName):
+        moduleName = fileName.replace(".py", "").replace("/", ".")
+        return importlib.import_module(moduleName, package='..')
+
+    def logSql(self, logSql):
+        self._logSql = logSql
+
+    def addWindows(self, name, case):
+        self.windowsCases.append(TDCase(name, case))
+
+    def addLinux(self, name, case):
+        self.linuxCases.append(TDCase(name, case))
+
+    def addCluster(self, name, case):
+        self.clusterCases.append(TDCase(name, case))
+
+    def runAllLinux(self, conn):
+        # TODO: load all Linux cases here
+        runNum = 0
+        for tmp in self.linuxCases:
+            if tmp.name.find(fileName) != -1:
+                case = testModule.TDTestCase()
+                case.init(conn)
+                case.run()
+                case.stop()
+                runNum += 1
+                continue
+
+        tdLog.info("total %d Linux test case(s) executed" % (runNum))
+
+    def runOneLinux(self, conn, fileName):
+        testModule = self.__dynamicLoadModule(fileName)
+
+        runNum = 0
+        for tmp in self.linuxCases:
+            if tmp.name.find(fileName) != -1:
+                case = testModule.TDTestCase()
+                case.init(conn, self._logSql)
+                try:
+                    case.run()
+                except Exception as e:
+                    tdLog.notice(repr(e))
+                    tdLog.exit("%s failed" % (fileName))
+                case.stop()
+                runNum += 1
+                continue
+
+    def runAllWindows(self, conn):
+        # TODO: load all Windows cases here
+        runNum = 0
+        for tmp in self.windowsCases:
+            if tmp.name.find(fileName) != -1:
+                case = testModule.TDTestCase()
+                case.init(conn)
+                case.run()
+                case.stop()
+                runNum += 1
+                continue
+
+        tdLog.notice("total %d Windows test case(s) executed" % (runNum))
+
+    def runOneWindows(self, conn, fileName):
+        testModule = self.__dynamicLoadModule(fileName)
+
+        runNum = 0
+        for tmp in self.windowsCases:
+            if tmp.name.find(fileName) != -1:
+                case = testModule.TDTestCase()
+                case.init(conn)
+                case.run()
+                case.stop()
+                runNum += 1
+                continue
+        tdLog.notice("total %d Windows case(s) executed" % (runNum))
+
+    def runAllCluster(self):
+        # TODO: load all cluster case module here
+
+        runNum = 0
+        for tmp in self.clusterCases:
+            if tmp.name.find(fileName) != -1:
+                tdLog.notice("run cases like %s" % (fileName))
+                case = testModule.TDTestCase()
+                case.init()
+                case.run()
+                case.stop()
+                runNum += 1
+                continue
+
+        tdLog.notice("total %d Cluster test case(s) executed" % (runNum))
+
+    def runOneCluster(self, fileName):
+        testModule = self.__dynamicLoadModule(fileName)
+
+        runNum = 0
+        for tmp in self.clusterCases:
+            if tmp.name.find(fileName) != -1:
+                tdLog.notice("run cases like %s" % (fileName))
+                case = testModule.TDTestCase()
+                case.init()
+                case.run()
+                case.stop()
+                runNum += 1
+                continue
+
+        tdLog.notice("total %d Cluster test case(s) executed" % (runNum))
+
+
+tdCases = TDCases()
diff --git a/tests/pytest/util/dnodes-default.py b/tests/pytest/util/dnodes-default.py
new file mode 100644
index 0000000000000000000000000000000000000000..085e08314907d6d48d02a2512d2caff87cd617e4
--- /dev/null
+++ b/tests/pytest/util/dnodes-default.py
@@ -0,0 +1,503 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import subprocess
+from util.log import *
+
+
+class TDSimClient:
+    def __init__(self):
+        self.testCluster = False
+
+        self.cfgDict = {
+            "numOfLogLines": "100000000",
+            "numOfThreadsPerCore": "2.0",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "minTablesPerVnode": "4",
+            "maxTablesPerVnode": "1000",
+            "tableIncStepPerVnode": "10000",
+            "maxVgroupsPerDb": "1000",
+            "sdbDebugFlag": "143",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "udebugFlag": "135",
+            "jnidebugFlag": "135",
+            "qdebugFlag": "135",
+            "telemetryReporting": "0",
+            }
+    def init(self, path):
+        self.__init__()
+        self.path = path
+
+    def getLogDir(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        return self.logDir
+
+    def getCfgDir(self):
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        return self.cfgDir
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def deploy(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+    
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+        self.cfg("logDir", self.logDir)
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
+        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
+
+
+class TDDnode:
+    def __init__(self, index):
+        self.index = index
+        self.running = 0
+        self.deployed = 0
+        self.testCluster = False
+        self.valgrind = 0
+
+    def init(self, path):
+        self.path = path
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def getDataSize(self):
+        totalSize = 0
+
+        if (self.deployed == 1):
+            for dirpath, dirnames, filenames in os.walk(self.dataDir):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+
+                    if not os.path.islink(fp):
+                        totalSize = totalSize + os.path.getsize(fp)
+
+        return totalSize
+
+    def deploy(self):
+        self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index)
+        self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index)
+        self.cfgDir = "%s/sim/dnode%d/cfg" % (self.path, self.index)
+        self.cfgPath = "%s/sim/dnode%d/cfg/taos.cfg" % (
+            self.path, self.index)
+
+        cmd = "rm -rf " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.startIP()
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        self.cfg("dataDir", self.dataDir)
+        self.cfg("logDir", self.logDir)
+        self.cfg("numOfLogLines", "100000000")
+        self.cfg("mnodeEqualVnodeNum", "0")
+        self.cfg("walLevel", "2")
+        self.cfg("fsync", "1000")
+        self.cfg("statusInterval", "1")
+        self.cfg("numOfMnodes", "3")
+        self.cfg("numOfThreadsPerCore", "2.0")
+        self.cfg("monitor", "0")
+        self.cfg("maxVnodeConnections", "30000")
+        self.cfg("maxMgmtConnections", "30000")
+        self.cfg("maxMeterConnections", "30000")
+        self.cfg("maxShellConns", "30000")
+        self.cfg("locale", "en_US.UTF-8")
+        self.cfg("charset", "UTF-8")
+        self.cfg("asyncLog", "0")
+        self.cfg("anyIp", "0")
+        self.cfg("dDebugFlag", "135")
+        self.cfg("mDebugFlag", "135")
+        self.cfg("sdbDebugFlag", "135")
+        self.cfg("rpcDebugFlag", "135")
+        self.cfg("tmrDebugFlag", "131")
+        self.cfg("cDebugFlag", "135")
+        self.cfg("httpDebugFlag", "135")
+        self.cfg("monitorDebugFlag", "135")
+        self.cfg("udebugFlag", "135")
+        self.cfg("jnidebugFlag", "135")
+        self.cfg("qdebugFlag", "135")
+        self.deployed = 1
+        tdLog.debug(
+            "dnode:%d is deployed and configured by %s" %
+            (self.index, self.cfgPath))
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def start(self):
+        buildPath = self.getBuildPath()
+
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+
+        binPath = buildPath + "/build/bin/taosd"
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"
+
+            cmd = "nohup %s %s -c %s 2>&1 & " % (
+                valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+        self.running = 1
+        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+
+        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(5)
+
+    def stop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+    def forcestop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
+
+    def startIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def stopIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
+            self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def getDnodeRootDir(self, index):
+        dnodeRootDir = "%s/sim/psim/dnode%d" % (self.path, index)
+        return dnodeRootDir
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim/psim" % (self.path)
+        return dnodesRootDir
+
+
+class TDDnodes:
+    def __init__(self):
+        self.dnodes = []
+        self.dnodes.append(TDDnode(1))
+        self.dnodes.append(TDDnode(2))
+        self.dnodes.append(TDDnode(3))
+        self.dnodes.append(TDDnode(4))
+        self.dnodes.append(TDDnode(5))
+        self.dnodes.append(TDDnode(6))
+        self.dnodes.append(TDDnode(7))
+        self.dnodes.append(TDDnode(8))
+        self.dnodes.append(TDDnode(9))
+        self.dnodes.append(TDDnode(10))
+        self.simDeployed = False
+
+    def init(self, path):
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        binPath = os.path.dirname(os.path.realpath(__file__))
+        binPath = binPath + "/../../../debug/"
+        tdLog.debug("binPath %s" % (binPath))
+        binPath = os.path.realpath(binPath)
+        tdLog.debug("binPath real path %s" % (binPath))
+
+        # cmd = "sudo cp %s/build/lib/libtaos.so /usr/local/lib/taos/" % (binPath)
+        # tdLog.debug(cmd)
+        # os.system(cmd)
+
+        # cmd = "sudo cp %s/build/bin/taos /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        #  tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        # cmd = "sudo cp %s/build/bin/taosd /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        if path == "":
+            # self.path = os.path.expanduser('~')
+            self.path = os.path.abspath(binPath + "../../")
+        else:
+            self.path = os.path.realpath(path)
+
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].init(self.path)
+
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def deploy(self, index):
+        self.sim.setTestCluster(self.testCluster)
+
+        if (self.simDeployed == False):
+            self.sim.deploy()
+            self.simDeployed = True
+
+        self.check(index)
+        self.dnodes[index - 1].setTestCluster(self.testCluster)
+        self.dnodes[index - 1].setValgrind(self.valgrind)
+        self.dnodes[index - 1].deploy()
+
+    def cfg(self, index, option, value):
+        self.check(index)
+        self.dnodes[index - 1].cfg(option, value)
+
+    def start(self, index):
+        self.check(index)
+        self.dnodes[index - 1].start()
+
+    def stop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].stop()
+
+    def getDataSize(self, index):
+        self.check(index)
+        return self.dnodes[index - 1].getDataSize()
+
+    def forcestop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].forcestop()
+
+    def startIP(self, index):
+        self.check(index)
+
+        if self.testCluster:
+            self.dnodes[index - 1].startIP()
+
+    def stopIP(self, index):
+        self.check(index)
+
+        if self.dnodes[index - 1].testCluster:
+            self.dnodes[index - 1].stopIP()
+
+    def check(self, index):
+        if index < 1 or index > 10:
+            tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
+
+    def stopAll(self):
+        tdLog.info("stop all dnodes")
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].stop()
+
+        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        if processID:
+            cmd = "sudo systemctl stop taosd"
+            os.system(cmd)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim" % (self.path)
+        return dnodesRootDir
+
+    def getSimCfgPath(self):
+        return self.sim.getCfgDir()
+
+    def getSimLogPath(self):
+        return self.sim.getLogDir()
+
+    def addSimExtraCfg(self, option, value):
+        self.sim.addExtraCfg(option, value)
+
+
+tdDnodes = TDDnodes()
diff --git a/tests/pytest/util/dnodes-no-random-fail.py b/tests/pytest/util/dnodes-no-random-fail.py
new file mode 100644
index 0000000000000000000000000000000000000000..2627575e615c306afa60c512b4bf8c87f5ee00df
--- /dev/null
+++ b/tests/pytest/util/dnodes-no-random-fail.py
@@ -0,0 +1,501 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import subprocess
+from util.log import *
+
+
+class TDSimClient:
+    def __init__(self):
+        self.testCluster = False
+
+        self.cfgDict = {
+            "numOfLogLines": "100000000",
+            "numOfThreadsPerCore": "2.0",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "anyIp": "0",
+            "sdbDebugFlag": "135",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "udebugFlag": "135",
+            "jnidebugFlag": "135",
+            "qdebugFlag": "135",
+            "telemetryReporting": "0",
+            }
+
+    def init(self, path):
+        self.__init__()
+        self.path = path
+
+    def getLogDir(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        return self.logDir
+
+    def getCfgDir(self):
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        return self.cfgDir
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def deploy(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+    
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+        self.cfg("logDir", self.logDir)
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
+        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
+
+
+class TDDnode:
+    def __init__(self, index):
+        self.index = index
+        self.running = 0
+        self.deployed = 0
+        self.testCluster = False
+        self.valgrind = 0
+
+    def init(self, path):
+        self.path = path
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def getDataSize(self):
+        totalSize = 0
+
+        if (self.deployed == 1):
+            for dirpath, dirnames, filenames in os.walk(self.dataDir):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+
+                    if not os.path.islink(fp):
+                        totalSize = totalSize + os.path.getsize(fp)
+
+        return totalSize
+
+    def deploy(self):
+        self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index)
+        self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index)
+        self.cfgDir = "%s/sim/dnode%d/cfg" % (self.path, self.index)
+        self.cfgPath = "%s/sim/dnode%d/cfg/taos.cfg" % (
+            self.path, self.index)
+
+        cmd = "rm -rf " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.startIP()
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        self.cfg("dataDir", self.dataDir)
+        self.cfg("logDir", self.logDir)
+        self.cfg("numOfLogLines", "100000000")
+        self.cfg("mnodeEqualVnodeNum", "0")
+        self.cfg("walLevel", "2")
+        self.cfg("fsync", "1000")
+        self.cfg("statusInterval", "1")
+        self.cfg("numOfMnodes", "3")
+        self.cfg("numOfThreadsPerCore", "2.0")
+        self.cfg("monitor", "0")
+        self.cfg("maxVnodeConnections", "30000")
+        self.cfg("maxMgmtConnections", "30000")
+        self.cfg("maxMeterConnections", "30000")
+        self.cfg("maxShellConns", "30000")
+        self.cfg("locale", "en_US.UTF-8")
+        self.cfg("charset", "UTF-8")
+        self.cfg("asyncLog", "0")
+        self.cfg("anyIp", "0")
+        self.cfg("dDebugFlag", "135")
+        self.cfg("mDebugFlag", "135")
+        self.cfg("sdbDebugFlag", "135")
+        self.cfg("rpcDebugFlag", "135")
+        self.cfg("tmrDebugFlag", "131")
+        self.cfg("cDebugFlag", "135")
+        self.cfg("httpDebugFlag", "135")
+        self.cfg("monitorDebugFlag", "135")
+        self.cfg("udebugFlag", "135")
+        self.cfg("jnidebugFlag", "135")
+        self.cfg("qdebugFlag", "135")
+        self.deployed = 1
+        tdLog.debug(
+            "dnode:%d is deployed and configured by %s" %
+            (self.index, self.cfgPath))
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def start(self):
+        buildPath = self.getBuildPath()
+
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+
+        binPath = buildPath + "/build/bin/taosd"
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            cmd = "nohup %s -c %s --random-file-fail-factor 0 > /dev/null 2>&1 & " % (
+                binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"
+
+            cmd = "nohup %s %s -c %s 2>&1 & " % (
+                valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+        self.running = 1
+        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+
+        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(5)
+
+    def stop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+    def forcestop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
+
+    def startIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def stopIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
+            self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def getDnodeRootDir(self, index):
+        dnodeRootDir = "%s/sim/psim/dnode%d" % (self.path, index)
+        return dnodeRootDir
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim/psim" % (self.path)
+        return dnodesRootDir
+
+
+class TDDnodes:
+    def __init__(self):
+        self.dnodes = []
+        self.dnodes.append(TDDnode(1))
+        self.dnodes.append(TDDnode(2))
+        self.dnodes.append(TDDnode(3))
+        self.dnodes.append(TDDnode(4))
+        self.dnodes.append(TDDnode(5))
+        self.dnodes.append(TDDnode(6))
+        self.dnodes.append(TDDnode(7))
+        self.dnodes.append(TDDnode(8))
+        self.dnodes.append(TDDnode(9))
+        self.dnodes.append(TDDnode(10))
+        self.simDeployed = False
+
+    def init(self, path):
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        binPath = os.path.dirname(os.path.realpath(__file__))
+        binPath = binPath + "/../../../debug/"
+        tdLog.debug("binPath %s" % (binPath))
+        binPath = os.path.realpath(binPath)
+        tdLog.debug("binPath real path %s" % (binPath))
+
+        # cmd = "sudo cp %s/build/lib/libtaos.so /usr/local/lib/taos/" % (binPath)
+        # tdLog.debug(cmd)
+        # os.system(cmd)
+
+        # cmd = "sudo cp %s/build/bin/taos /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        #  tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        # cmd = "sudo cp %s/build/bin/taosd /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        if path == "":
+            # self.path = os.path.expanduser('~')
+            self.path = os.path.abspath(binPath + "../../")
+        else:
+            self.path = os.path.realpath(path)
+
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].init(self.path)
+
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def deploy(self, index):
+        self.sim.setTestCluster(self.testCluster)
+
+        if (self.simDeployed == False):
+            self.sim.deploy()
+            self.simDeployed = True
+
+        self.check(index)
+        self.dnodes[index - 1].setTestCluster(self.testCluster)
+        self.dnodes[index - 1].setValgrind(self.valgrind)
+        self.dnodes[index - 1].deploy()
+
+    def cfg(self, index, option, value):
+        self.check(index)
+        self.dnodes[index - 1].cfg(option, value)
+
+    def start(self, index):
+        self.check(index)
+        self.dnodes[index - 1].start()
+
+    def stop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].stop()
+
+    def getDataSize(self, index):
+        self.check(index)
+        return self.dnodes[index - 1].getDataSize()
+
+    def forcestop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].forcestop()
+
+    def startIP(self, index):
+        self.check(index)
+
+        if self.testCluster:
+            self.dnodes[index - 1].startIP()
+
+    def stopIP(self, index):
+        self.check(index)
+
+        if self.dnodes[index - 1].testCluster:
+            self.dnodes[index - 1].stopIP()
+
+    def check(self, index):
+        if index < 1 or index > 10:
+            tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
+
+    def stopAll(self):
+        tdLog.info("stop all dnodes")
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].stop()
+
+        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        if processID:
+            cmd = "sudo systemctl stop taosd"
+            os.system(cmd)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim" % (self.path)
+        return dnodesRootDir
+
+    def getSimCfgPath(self):
+        return self.sim.getCfgDir()
+
+    def getSimLogPath(self):
+        return self.sim.getLogDir()
+
+    def addSimExtraCfg(self, option, value):
+        self.sim.addExtraCfg(option, value)
+
+
+tdDnodes = TDDnodes()
diff --git a/tests/pytest/util/dnodes-random-fail.py b/tests/pytest/util/dnodes-random-fail.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f4cdcc0d096652dbd0197236cbde95109c4a76b
--- /dev/null
+++ b/tests/pytest/util/dnodes-random-fail.py
@@ -0,0 +1,501 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import subprocess
+from util.log import *
+
+
+class TDSimClient:
+    def __init__(self):
+        self.testCluster = False
+
+        self.cfgDict = {
+            "numOfLogLines": "100000000",
+            "numOfThreadsPerCore": "2.0",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "anyIp": "0",
+            "sdbDebugFlag": "135",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "udebugFlag": "135",
+            "jnidebugFlag": "135",
+            "qdebugFlag": "135",
+            "telemetryReporting": "0",
+            }
+
+    def init(self, path):
+        self.__init__()
+        self.path = path
+
+    def getLogDir(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        return self.logDir
+
+    def getCfgDir(self):
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        return self.cfgDir
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def deploy(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+    
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+        self.cfg("logDir", self.logDir)
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
+        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
+
+
+class TDDnode:
+    def __init__(self, index):
+        self.index = index
+        self.running = 0
+        self.deployed = 0
+        self.testCluster = False
+        self.valgrind = 0
+
+    def init(self, path):
+        self.path = path
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def getDataSize(self):
+        totalSize = 0
+
+        if (self.deployed == 1):
+            for dirpath, dirnames, filenames in os.walk(self.dataDir):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+
+                    if not os.path.islink(fp):
+                        totalSize = totalSize + os.path.getsize(fp)
+
+        return totalSize
+
+    def deploy(self):
+        self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index)
+        self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index)
+        self.cfgDir = "%s/sim/dnode%d/cfg" % (self.path, self.index)
+        self.cfgPath = "%s/sim/dnode%d/cfg/taos.cfg" % (
+            self.path, self.index)
+
+        cmd = "rm -rf " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.startIP()
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        self.cfg("dataDir", self.dataDir)
+        self.cfg("logDir", self.logDir)
+        self.cfg("numOfLogLines", "100000000")
+        self.cfg("mnodeEqualVnodeNum", "0")
+        self.cfg("walLevel", "2")
+        self.cfg("fsync", "1000")
+        self.cfg("statusInterval", "1")
+        self.cfg("numOfMnodes", "3")
+        self.cfg("numOfThreadsPerCore", "2.0")
+        self.cfg("monitor", "0")
+        self.cfg("maxVnodeConnections", "30000")
+        self.cfg("maxMgmtConnections", "30000")
+        self.cfg("maxMeterConnections", "30000")
+        self.cfg("maxShellConns", "30000")
+        self.cfg("locale", "en_US.UTF-8")
+        self.cfg("charset", "UTF-8")
+        self.cfg("asyncLog", "0")
+        self.cfg("anyIp", "0")
+        self.cfg("dDebugFlag", "135")
+        self.cfg("mDebugFlag", "135")
+        self.cfg("sdbDebugFlag", "135")
+        self.cfg("rpcDebugFlag", "135")
+        self.cfg("tmrDebugFlag", "131")
+        self.cfg("cDebugFlag", "135")
+        self.cfg("httpDebugFlag", "135")
+        self.cfg("monitorDebugFlag", "135")
+        self.cfg("udebugFlag", "135")
+        self.cfg("jnidebugFlag", "135")
+        self.cfg("qdebugFlag", "135")
+        self.deployed = 1
+        tdLog.debug(
+            "dnode:%d is deployed and configured by %s" %
+            (self.index, self.cfgPath))
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def start(self):
+        buildPath = self.getBuildPath()
+
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+
+        binPath = buildPath + "/build/bin/taosd"
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            cmd = "nohup %s -c %s --alloc-random-fail --random-file-fail-factor 5 > /dev/null 2>&1 & " % (
+                binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"
+
+            cmd = "nohup %s %s -c %s 2>&1 & " % (
+                valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+        self.running = 1
+        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+
+        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(5)
+
+    def stop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+    def forcestop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
+
+    def startIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def stopIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
+            self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def getDnodeRootDir(self, index):
+        dnodeRootDir = "%s/sim/psim/dnode%d" % (self.path, index)
+        return dnodeRootDir
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim/psim" % (self.path)
+        return dnodesRootDir
+
+
+class TDDnodes:
+    def __init__(self):
+        self.dnodes = []
+        self.dnodes.append(TDDnode(1))
+        self.dnodes.append(TDDnode(2))
+        self.dnodes.append(TDDnode(3))
+        self.dnodes.append(TDDnode(4))
+        self.dnodes.append(TDDnode(5))
+        self.dnodes.append(TDDnode(6))
+        self.dnodes.append(TDDnode(7))
+        self.dnodes.append(TDDnode(8))
+        self.dnodes.append(TDDnode(9))
+        self.dnodes.append(TDDnode(10))
+        self.simDeployed = False
+
+    def init(self, path):
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        binPath = os.path.dirname(os.path.realpath(__file__))
+        binPath = binPath + "/../../../debug/"
+        tdLog.debug("binPath %s" % (binPath))
+        binPath = os.path.realpath(binPath)
+        tdLog.debug("binPath real path %s" % (binPath))
+
+        # cmd = "sudo cp %s/build/lib/libtaos.so /usr/local/lib/taos/" % (binPath)
+        # tdLog.debug(cmd)
+        # os.system(cmd)
+
+        # cmd = "sudo cp %s/build/bin/taos /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        #  tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        # cmd = "sudo cp %s/build/bin/taosd /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        if path == "":
+            # self.path = os.path.expanduser('~')
+            self.path = os.path.abspath(binPath + "../../")
+        else:
+            self.path = os.path.realpath(path)
+
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].init(self.path)
+
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def deploy(self, index):
+        self.sim.setTestCluster(self.testCluster)
+
+        if (self.simDeployed == False):
+            self.sim.deploy()
+            self.simDeployed = True
+
+        self.check(index)
+        self.dnodes[index - 1].setTestCluster(self.testCluster)
+        self.dnodes[index - 1].setValgrind(self.valgrind)
+        self.dnodes[index - 1].deploy()
+
+    def cfg(self, index, option, value):
+        self.check(index)
+        self.dnodes[index - 1].cfg(option, value)
+
+    def start(self, index):
+        self.check(index)
+        self.dnodes[index - 1].start()
+
+    def stop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].stop()
+
+    def getDataSize(self, index):
+        self.check(index)
+        return self.dnodes[index - 1].getDataSize()
+
+    def forcestop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].forcestop()
+
+    def startIP(self, index):
+        self.check(index)
+
+        if self.testCluster:
+            self.dnodes[index - 1].startIP()
+
+    def stopIP(self, index):
+        self.check(index)
+
+        if self.dnodes[index - 1].testCluster:
+            self.dnodes[index - 1].stopIP()
+
+    def check(self, index):
+        if index < 1 or index > 10:
+            tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
+
+    def stopAll(self):
+        tdLog.info("stop all dnodes")
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].stop()
+
+        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        if processID:
+            cmd = "sudo systemctl stop taosd"
+            os.system(cmd)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim" % (self.path)
+        return dnodesRootDir
+
+    def getSimCfgPath(self):
+        return self.sim.getCfgDir()
+
+    def getSimLogPath(self):
+        return self.sim.getLogDir()
+
+    def addSimExtraCfg(self, option, value):
+        self.sim.addExtraCfg(option, value)
+
+
+tdDnodes = TDDnodes()
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ac492bb3ad2733c7b2ebb46560edbb7204e8951
--- /dev/null
+++ b/tests/pytest/util/dnodes.py
@@ -0,0 +1,504 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import os.path
+import subprocess
+from util.log import *
+
+
+class TDSimClient:
+    def __init__(self):
+        self.testCluster = False
+
+        self.cfgDict = {
+            "numOfLogLines": "100000000",
+            "numOfThreadsPerCore": "2.0",
+            "locale": "en_US.UTF-8",
+            "charset": "UTF-8",
+            "asyncLog": "0",
+            "minTablesPerVnode": "4",
+            "maxTablesPerVnode": "1000",
+            "tableIncStepPerVnode": "10000",
+            "maxVgroupsPerDb": "1000",
+            "sdbDebugFlag": "143",
+            "rpcDebugFlag": "135",
+            "tmrDebugFlag": "131",
+            "cDebugFlag": "135",
+            "udebugFlag": "135",
+            "jnidebugFlag": "135",
+            "qdebugFlag": "135",
+            "telemetryReporting": "0",
+            }
+    def init(self, path):
+        self.__init__()
+        self.path = path
+
+    def getLogDir(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        return self.logDir
+
+    def getCfgDir(self):
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        return self.cfgDir
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def addExtraCfg(self, option, value):
+        self.cfgDict.update({option: value})
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def deploy(self):
+        self.logDir = "%s/sim/psim/log" % (self.path)
+        self.cfgDir = "%s/sim/psim/cfg" % (self.path)
+        self.cfgPath = "%s/sim/psim/cfg/taos.cfg" % (self.path)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+    
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+        self.cfg("logDir", self.logDir)
+
+        for key, value in self.cfgDict.items():
+            self.cfg(key, value)
+
+        tdLog.debug("psim is deployed and configured by %s" % (self.cfgPath))
+
+
+class TDDnode:
+    def __init__(self, index):
+        self.index = index
+        self.running = 0
+        self.deployed = 0
+        self.testCluster = False
+        self.valgrind = 0
+
+    def init(self, path):
+        self.path = path
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def getDataSize(self):
+        totalSize = 0
+
+        if (self.deployed == 1):
+            for dirpath, dirnames, filenames in os.walk(self.dataDir):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+
+                    if not os.path.islink(fp):
+                        totalSize = totalSize + os.path.getsize(fp)
+
+        return totalSize
+
+    def deploy(self):
+        self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index)
+        self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index)
+        self.cfgDir = "%s/sim/dnode%d/cfg" % (self.path, self.index)
+        self.cfgPath = "%s/sim/dnode%d/cfg/taos.cfg" % (
+            self.path, self.index)
+
+        cmd = "rm -rf " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "rm -rf " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.dataDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.logDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "mkdir -p " + self.cfgDir
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        cmd = "touch " + self.cfgPath
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+        if self.testCluster:
+            self.startIP()
+
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        self.cfg("dataDir", self.dataDir)
+        self.cfg("logDir", self.logDir)
+        self.cfg("numOfLogLines", "100000000")
+        self.cfg("mnodeEqualVnodeNum", "0")
+        self.cfg("walLevel", "2")
+        self.cfg("fsync", "1000")
+        self.cfg("statusInterval", "1")
+        self.cfg("numOfMnodes", "3")
+        self.cfg("numOfThreadsPerCore", "2.0")
+        self.cfg("monitor", "0")
+        self.cfg("maxVnodeConnections", "30000")
+        self.cfg("maxMgmtConnections", "30000")
+        self.cfg("maxMeterConnections", "30000")
+        self.cfg("maxShellConns", "30000")
+        self.cfg("locale", "en_US.UTF-8")
+        self.cfg("charset", "UTF-8")
+        self.cfg("asyncLog", "0")
+        self.cfg("anyIp", "0")
+        self.cfg("tsEnableTelemetryReporting", "0")
+        self.cfg("dDebugFlag", "135")
+        self.cfg("mDebugFlag", "135")
+        self.cfg("sdbDebugFlag", "135")
+        self.cfg("rpcDebugFlag", "135")
+        self.cfg("tmrDebugFlag", "131")
+        self.cfg("cDebugFlag", "135")
+        self.cfg("httpDebugFlag", "135")
+        self.cfg("monitorDebugFlag", "135")
+        self.cfg("udebugFlag", "135")
+        self.cfg("jnidebugFlag", "135")
+        self.cfg("qdebugFlag", "135")
+        self.deployed = 1
+        tdLog.debug(
+            "dnode:%d is deployed and configured by %s" %
+            (self.index, self.cfgPath))
+
+    def getBuildPath(self):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        for root, dirs, files in os.walk(projPath):
+            if ("taosd" in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    buildPath = root[:len(root)-len("/build/bin")]
+                    break
+        return buildPath
+
+    def start(self):
+        buildPath = self.getBuildPath()
+
+        if (buildPath == ""):
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % buildPath)
+
+        binPath = buildPath + "/build/bin/taosd"
+
+        if self.deployed == 0:
+            tdLog.exit("dnode:%d is not deployed" % (self.index))
+
+        if self.valgrind == 0:
+            cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                binPath, self.cfgDir)
+        else:
+            valgrindCmdline = "valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"
+
+            cmd = "nohup %s %s -c %s 2>&1 & " % (
+                valgrindCmdline, binPath, self.cfgDir)
+
+            print(cmd)
+
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+        self.running = 1
+        tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+
+        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(5)
+
+    def stop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -INT %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
+
+    def forcestop(self):
+        if self.valgrind == 0:
+            toBeKilled = "taosd"
+        else:
+            toBeKilled = "valgrind.bin"
+
+        if self.running != 0:
+            psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+            while(processID):
+                killCmd = "kill -KILL %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
+            for port in range(6030, 6041):
+                fuserCmd = "fuser -k -n tcp %d" % port
+                os.system(fuserCmd)
+            if self.valgrind:
+                time.sleep(2)
+
+            self.running = 0
+            tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
+
+    def startIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d up" % (self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def stopIP(self):
+        cmd = "sudo ifconfig lo:%d 192.168.0.%d down" % (
+            self.index, self.index)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def cfg(self, option, value):
+        cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
+        if os.system(cmd) != 0:
+            tdLog.exit(cmd)
+
+    def getDnodeRootDir(self, index):
+        dnodeRootDir = "%s/sim/psim/dnode%d" % (self.path, index)
+        return dnodeRootDir
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim/psim" % (self.path)
+        return dnodesRootDir
+
+
+class TDDnodes:
+    def __init__(self):
+        self.dnodes = []
+        self.dnodes.append(TDDnode(1))
+        self.dnodes.append(TDDnode(2))
+        self.dnodes.append(TDDnode(3))
+        self.dnodes.append(TDDnode(4))
+        self.dnodes.append(TDDnode(5))
+        self.dnodes.append(TDDnode(6))
+        self.dnodes.append(TDDnode(7))
+        self.dnodes.append(TDDnode(8))
+        self.dnodes.append(TDDnode(9))
+        self.dnodes.append(TDDnode(10))
+        self.simDeployed = False
+
+    def init(self, path):
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        binPath = os.path.dirname(os.path.realpath(__file__))
+        binPath = binPath + "/../../../debug/"
+        tdLog.debug("binPath %s" % (binPath))
+        binPath = os.path.realpath(binPath)
+        tdLog.debug("binPath real path %s" % (binPath))
+
+        # cmd = "sudo cp %s/build/lib/libtaos.so /usr/local/lib/taos/" % (binPath)
+        # tdLog.debug(cmd)
+        # os.system(cmd)
+
+        # cmd = "sudo cp %s/build/bin/taos /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        #  tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        # cmd = "sudo cp %s/build/bin/taosd /usr/local/bin/taos/" % (binPath)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        # tdLog.debug("execute %s" % (cmd))
+
+        if path == "":
+            # self.path = os.path.expanduser('~')
+            self.path = os.path.abspath(binPath + "../../")
+        else:
+            self.path = os.path.realpath(path)
+
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].init(self.path)
+
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+
+    def setTestCluster(self, value):
+        self.testCluster = value
+
+    def setValgrind(self, value):
+        self.valgrind = value
+
+    def deploy(self, index):
+        self.sim.setTestCluster(self.testCluster)
+
+        if (self.simDeployed == False):
+            self.sim.deploy()
+            self.simDeployed = True
+
+        self.check(index)
+        self.dnodes[index - 1].setTestCluster(self.testCluster)
+        self.dnodes[index - 1].setValgrind(self.valgrind)
+        self.dnodes[index - 1].deploy()
+
+    def cfg(self, index, option, value):
+        self.check(index)
+        self.dnodes[index - 1].cfg(option, value)
+
+    def start(self, index):
+        self.check(index)
+        self.dnodes[index - 1].start()
+
+    def stop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].stop()
+
+    def getDataSize(self, index):
+        self.check(index)
+        return self.dnodes[index - 1].getDataSize()
+
+    def forcestop(self, index):
+        self.check(index)
+        self.dnodes[index - 1].forcestop()
+
+    def startIP(self, index):
+        self.check(index)
+
+        if self.testCluster:
+            self.dnodes[index - 1].startIP()
+
+    def stopIP(self, index):
+        self.check(index)
+
+        if self.dnodes[index - 1].testCluster:
+            self.dnodes[index - 1].stopIP()
+
+    def check(self, index):
+        if index < 1 or index > 10:
+            tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
+
+    def stopAll(self):
+        tdLog.info("stop all dnodes")
+        for i in range(len(self.dnodes)):
+            self.dnodes[i].stop()
+
+        psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        if processID:
+            cmd = "sudo systemctl stop taosd"
+            os.system(cmd)
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+        psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+        while(processID):
+            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+            os.system(killCmd)
+            time.sleep(1)
+            processID = subprocess.check_output(
+                psCmd, shell=True).decode("utf-8")
+
+        # if os.system(cmd) != 0 :
+        # tdLog.exit(cmd)
+
+    def getDnodesRootDir(self):
+        dnodesRootDir = "%s/sim" % (self.path)
+        return dnodesRootDir
+
+    def getSimCfgPath(self):
+        return self.sim.getCfgDir()
+
+    def getSimLogPath(self):
+        return self.sim.getLogDir()
+
+    def addSimExtraCfg(self, option, value):
+        self.sim.addExtraCfg(option, value)
+
+
+tdDnodes = TDDnodes()
diff --git a/tests/pytest/util/log.py b/tests/pytest/util/log.py
new file mode 100644
index 0000000000000000000000000000000000000000..55cd42a6eb5059b931dc892bdd4eb6101031b730
--- /dev/null
+++ b/tests/pytest/util/log.py
@@ -0,0 +1,49 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import time
+import datetime
+from distutils.log import warn as printf
+
+
+class TDLog:
+    def __init__(self):
+        self.path = ""
+
+    def info(self, info):
+        print("%s %s\n" % (datetime.datetime.now(), info))
+
+    def sleep(self, sec):
+        print("%s sleep %d seconds" % (datetime.datetime.now(), sec))
+        time.sleep(sec)
+
+    def debug(self, err):
+        print("\033[1;36m%s %s\033[0m" % (datetime.datetime.now(), err))
+
+    def success(self, info):
+        printf("\033[1;32m%s %s\033[0m" % (datetime.datetime.now(), info))
+
+    def notice(self, err):
+        printf("\033[1;33m%s %s\033[0m" % (datetime.datetime.now(), err))
+
+    def exit(self, err):
+        printf("\033[1;31m%s %s\033[0m" % (datetime.datetime.now(), err))
+        sys.exit(1)
+
+    def printNoPrefix(self, info):
+        print("\033[1;36m%s\033[0m" % (info))
+
+
+tdLog = TDLog()
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
new file mode 100644
index 0000000000000000000000000000000000000000..9abec354c6d58507ff3bcc74d1c0dc03f691440c
--- /dev/null
+++ b/tests/pytest/util/sql.py
@@ -0,0 +1,188 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import time
+import datetime
+import inspect
+from util.log import *
+
+
+class TDSql:
+    def __init__(self):
+        self.queryRows = 0
+        self.queryCols = 0
+        self.affectedRows = 0
+
+    def init(self, cursor, log=True):
+        self.cursor = cursor
+
+        if (log):
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            self.cursor.log(caller.filename + ".sql")
+
+    def close(self):
+        self.cursor.close()
+
+    def prepare(self):
+        tdLog.info("prepare database:db")
+        s = 'reset query cache'
+        self.cursor.execute(s)
+        s = 'drop database if exists db'
+        self.cursor.execute(s)
+        s = 'create database db'
+        self.cursor.execute(s)
+        s = 'use db'
+        self.cursor.execute(s)
+
+    def error(self, sql):
+        expectErrNotOccured = True
+        try:
+            self.cursor.execute(sql)
+        except BaseException:
+            expectErrNotOccured = False
+        if expectErrNotOccured:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            tdLog.exit("%s(%d) failed: sql:%s, expect error not occured" % (caller.filename, caller.lineno, sql))
+        else:
+            self.queryRows = 0
+            self.queryCols = 0
+            self.queryResult = None
+            tdLog.info("sql:%s, expect error occured" % (sql))
+
+    def query(self, sql):
+        self.sql = sql
+        try:
+            self.cursor.execute(sql)
+            self.queryResult = self.cursor.fetchall()
+            self.queryRows = len(self.queryResult)
+            self.queryCols = len(self.cursor.description)
+        except Exception as e:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, sql, repr(e))
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
+        return self.queryRows
+
+    def waitedQuery(self, sql, expectRows, timeout):
+        tdLog.info("sql: %s, try to retrieve %d rows in %d seconds" % (sql, expectRows, timeout))
+        self.sql = sql
+        try:
+            for i in range(timeout):
+                self.cursor.execute(sql)
+                self.queryResult = self.cursor.fetchall()
+                self.queryRows = len(self.queryResult)
+                self.queryCols = len(self.cursor.description)
+                if self.queryRows >= expectRows:
+                    return (self.queryRows, i)
+                time.sleep(1)
+        except Exception as e:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, sql, repr(e))
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
+        return (self.queryRows, timeout)
+
+    def checkRows(self, expectRows):
+        if self.queryRows == expectRows:
+            tdLog.info("sql:%s, queryRows:%d == expect:%d" % (self.sql, self.queryRows, expectRows))
+        else:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, self.sql, self.queryRows, expectRows)
+            tdLog.exit("%s(%d) failed: sql:%s, queryRows:%d != expect:%d" % args)
+
+    def checkRowCol(self, row, col):
+        caller = inspect.getframeinfo(inspect.stack()[2][0])
+        if row < 0:
+            args = (caller.filename, caller.lineno, self.sql, row)
+            tdLog.exit("%s(%d) failed: sql:%s, row:%d is smaller than zero" % args)
+        if col < 0:
+            args = (caller.filename, caller.lineno, self.sql, row)
+            tdLog.exit("%s(%d) failed: sql:%s, col:%d is smaller than zero" % args)
+        if row > self.queryRows:
+            args = (caller.filename, caller.lineno, self.sql, row, self.queryRows)
+            tdLog.exit("%s(%d) failed: sql:%s, row:%d is larger than queryRows:%d" % args)
+        if col > self.queryCols:
+            args = (caller.filename, caller.lineno, self.sql, col, self.queryCols)
+            tdLog.exit("%s(%d) failed: sql:%s, col:%d is larger than queryCols:%d" % args)
+
+    def checkDataType(self, row, col, dataType):
+        self.checkRowCol(row, col)
+        return self.cursor.istype(col, dataType)
+
+    def checkData(self, row, col, data):
+        self.checkRowCol(row, col) 
+        if self.queryResult[row][col] != data:            
+            if str(self.queryResult[row][col]) == str(data):
+                tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                            (self.sql, row, col, self.queryResult[row][col], data)) 
+                return
+            elif isinstance(data, float) and abs(self.queryResult[row][col] - data) <= 0.000001:                
+                tdLog.info("sql:%s, row:%d col:%d data:%f == expect:%f" %
+                            (self.sql, row, col, self.queryResult[row][col], data)) 
+                return
+            else:
+                caller = inspect.getframeinfo(inspect.stack()[1][0])
+                args = (caller.filename, caller.lineno, self.sql, row, col, self.queryResult[row][col], data)
+                tdLog.exit("%s(%d) failed: sql:%s row:%d col:%d data:%s != expect:%s" % args)        
+
+        if data is None:
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                       (self.sql, row, col, self.queryResult[row][col], data))
+        elif isinstance(data, str):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                       (self.sql, row, col, self.queryResult[row][col], data))
+        elif isinstance(data, datetime.date):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                       (self.sql, row, col, self.queryResult[row][col], data))        
+        elif isinstance(data, float):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                       (self.sql, row, col, self.queryResult[row][col], data))
+        else:            
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%d" %
+                       (self.sql, row, col, self.queryResult[row][col], data))
+
+    def getData(self, row, col):
+        self.checkRowCol(row, col)
+        return self.queryResult[row][col]
+
+    def executeTimes(self, sql, times):
+        for i in range(times):
+            try:
+                return self.cursor.execute(sql)
+            except BaseException:
+                time.sleep(1)
+                continue
+
+    def execute(self, sql):
+        self.sql = sql
+        try:
+            self.affectedRows = self.cursor.execute(sql)
+        except Exception as e:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, sql, repr(e))
+            tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
+            raise Exception(repr(e))
+        return self.affectedRows
+
+    def checkAffectedRows(self, expectAffectedRows):
+        if self.affectedRows != expectAffectedRows:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, self.sql, self.affectedRows, expectAffectedRows)
+            tdLog.exit("%s(%d) failed: sql:%s, affectedRows:%d != expect:%d" % args)
+
+        tdLog.info("sql:%s, affectedRows:%d == expect:%d" % (self.sql, self.affectedRows, expectAffectedRows))
+
+
+tdSql = TDSql()
diff --git a/tests/pytest/util/sub.py b/tests/pytest/util/sub.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e3c2a96b7312c176c25bd35e109e146e5c4593f
--- /dev/null
+++ b/tests/pytest/util/sub.py
@@ -0,0 +1,43 @@
+###################################################################
+ #           Copyright (c) 2020 by TAOS Technologies, Inc.
+ #                     All rights reserved.
+ #
+ #  This file is proprietary and confidential to TAOS Technologies.
+ #  No part of this file may be reproduced, stored, transmitted, 
+ #  disclosed or used in any form or by any means other than as 
+ #  expressly provided by the written permission from Jianhui Tao
+ #
+###################################################################
+
+# -*- coding: utf-8 -*-  
+
+import sys
+import os
+import time
+import datetime
+from util.log import *
+
+class TDSub:
+	def __init__(self):
+		self.consumedRows = 0
+		self.consumedCols = 0
+
+	def init(self, sub):
+		self.sub = sub
+
+	def close(self, keepProgress):
+		self.sub.close(keepProgress)	
+
+	def consume(self):
+		self.data = self.sub.consume()
+		self.consumedRows = len(self.data)
+		self.consumedCols = len(self.sub.fields)
+		return self.consumedRows
+
+	def checkRows(self, expectRows):
+		if self.consumedRows != expectRows:
+			tdLog.exit("consumed rows:%d != expect:%d" % (self.consumedRows, expectRows))
+		tdLog.info("consumed rows:%d == expect:%d" % (self.consumedRows, expectRows))
+	
+
+tdSub = TDSub()	
diff --git a/tests/pytest/valgrind-test.sh b/tests/pytest/valgrind-test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9dc9de1b152e5bf6611a2b9353a9879119ffcf04
--- /dev/null
+++ b/tests/pytest/valgrind-test.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# client
+PYTHONMALLOC=malloc python3 ./test.py -g -f client/client.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+
+# insert
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/basic.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/int.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/float.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/bigint.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/bool.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/double.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/smallint.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/tinyint.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/binary.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/date.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/nchar.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f insert/multi.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+
+# table
+PYTHONMALLOC=malloc python3 ./test.py -g -f table/column_name.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f table/column_num.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+PYTHONMALLOC=malloc python3 ./test.py -g -f table/db_table.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+
+# import
+PYTHONMALLOC=malloc python3 ./test.py -g -f import_merge/importDataLastSub.py
+PYTHONMALLOC=malloc python3 ./test.py -g -s && sleep 1
+
+#tag 
+PYTHONMALLOC=malloc python3 ./test.py $1 -f tag_lite/filter.py
+PYTHONMALLOC=malloc python3 ./test.py $1 -s && sleep 1
diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..61a9d68d2658f85256ed4c3cc62dfc53a959594b
--- /dev/null
+++ b/tests/script/basicSuite.sim
@@ -0,0 +1,20 @@
+run general/cache/new_metrics.sim
+run general/compute/interval.sim
+run general/http/restful_full.sim 
+run general/import/commit.sim
+run general/import/replica1.sim
+run general/parser/auto_create_tb_drop_tb.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/select_from_cache_disk.sim
+run general/parser/null_char.sim
+run general/parser/alter.sim
+run general/stable/vnode3.sim
+run general/tag/filter.sim
+run general/table/vgroup.sim
+run general/user/authority.sim
+run general/vector/metrics_mix.sim
+run general/vector/table_field.sim
+run general/user/authority.sim
+run general/tag/set.sim
+run general/table/delete_writing.sim
+run general/stable/disk.sim
diff --git a/tests/script/bug.sim b/tests/script/bug.sim
new file mode 100644
index 0000000000000000000000000000000000000000..625b9b0cadb78f8d75e8611dbf60664f9cf7e65a
--- /dev/null
+++ b/tests/script/bug.sim
@@ -0,0 +1,2 @@
+run general/parser/projection_limit_offset.sim
+run general/parser/limit2.sim
\ No newline at end of file
diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4dd3957f390237c6dddc6b1f66b14ee177b6dbcf
--- /dev/null
+++ b/tests/script/fullGeneralSuite.sim
@@ -0,0 +1,224 @@
+#unsupport run general/alter/cached_schema_after_alter.sim
+run general/alter/count.sim
+run general/alter/import.sim
+#unsupport run general/alter/insert1.sim
+run general/alter/insert2.sim
+run general/alter/metrics.sim
+run general/alter/table.sim
+run general/cache/new_metrics.sim
+run general/cache/restart_metrics.sim
+run general/cache/restart_table.sim
+run general/connection/connection.sim  
+run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
+run general/compress/commitlog.sim
+run general/compress/compress.sim
+run general/compress/compress2.sim
+run general/compress/uncompress.sim
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
+run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/last_row.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
+run general/compute/null.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
+run general/db/alter_option.sim
+run general/db/alter_tables_d2.sim
+run general/db/alter_tables_v1.sim
+run general/db/alter_tables_v4.sim
+run general/db/alter_vgroups.sim
+run general/db/basic.sim
+run general/db/basic1.sim
+run general/db/basic2.sim
+run general/db/basic3.sim
+run general/db/basic4.sim
+run general/db/basic5.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/delete.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
+run general/db/vnodes.sim
+run general/field/2.sim
+run general/field/3.sim
+run general/field/4.sim
+run general/field/5.sim
+run general/field/6.sim
+run general/field/bigint.sim
+run general/field/binary.sim
+run general/field/bool.sim
+run general/field/single.sim
+run general/field/smallint.sim
+run general/field/tinyint.sim
+run general/http/restful.sim
+run general/http/restful_insert.sim
+run general/http/restful_limit.sim
+run general/http/restful_full.sim
+run general/http/prepare.sim
+run general/http/telegraf.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
+run general/import/basic.sim
+run general/import/commit.sim
+run general/import/large.sim
+run general/import/replica1.sim
+run general/insert/basic.sim
+run general/insert/insert_drop.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
+#unsupport run general/parser/alter.sim
+run general/parser/alter1.sim
+run general/parser/alter_stable.sim
+run general/parser/auto_create_tb.sim
+run general/parser/auto_create_tb_drop_tb.sim
+run general/parser/col_arithmetic_operation.sim
+run general/parser/columnValue.sim
+run general/parser/commit.sim
+run general/parser/create_db.sim
+run general/parser/create_mt.sim
+run general/parser/create_tb.sim
+run general/parser/dbtbnameValidate.sim
+run general/parser/import_commit1.sim
+run general/parser/import_commit2.sim
+run general/parser/import_commit3.sim
+run general/parser/insert_tb.sim
+run general/parser/first_last.sim
+#unsupport run general/parser/import_file.sim
+run general/parser/lastrow.sim
+run general/parser/nchar.sim
+#unsupport run general/parser/null_char.sim
+run general/parser/single_row_in_tb.sim
+run general/parser/select_from_cache_disk.sim
+run general/parser/limit.sim
+run general/parser/limit1.sim
+run general/parser/limit1_tblocks100.sim
+run general/parser/mixed_blocks.sim
+run general/parser/selectResNum.sim
+run general/parser/select_across_vnodes.sim
+run general/parser/slimit1.sim
+run general/parser/tbnameIn.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/projection_limit_offset.sim
+run general/parser/limit2.sim
+run general/parser/slimit.sim
+run general/parser/fill.sim
+run general/parser/fill_stb.sim
+run general/parser/interp.sim
+run general/parser/where.sim
+run general/parser/join.sim
+run general/parser/join_multivnode.sim
+run general/parser/select_with_tags.sim
+run general/parser/groupby.sim
+run general/parser/tags_dynamically_specifiy.sim
+run general/parser/set_tag_vals.sim
+#unsupport run general/parser/repeatAlter.sim
+#unsupport run general/parser/slimit_alter_tags.sim
+#unsupport run general/parser/stream_on_sys.sim
+#unsupport run general/parser/repeatStream.sim
+run general/stable/disk.sim
+run general/stable/dnode3.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
+run general/table/autocreate.sim
+run general/table/basic1.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
+run general/table/bigint.sim
+run general/table/binary.sim
+run general/table/bool.sim
+run general/table/column_name.sim
+run general/table/column_num.sim
+run general/table/column_value.sim
+run general/table/column2.sim
+run general/table/date.sim
+run general/table/db.table.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
+run general/table/double.sim
+run general/table/fill.sim
+run general/table/float.sim
+run general/table/int.sim
+run general/table/limit.sim
+run general/table/smallint.sim
+run general/table/table_len.sim
+run general/table/table.sim
+run general/table/tinyint.sim
+run general/table/vgroup.sim
+run general/tag/3.sim
+run general/tag/4.sim
+run general/tag/5.sim
+run general/tag/6.sim
+run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+run general/tag/change.sim
+run general/tag/column.sim
+#unsupport run general/tag/commit.sim
+run general/tag/create.sim
+run general/tag/delete.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
+run general/tag/set.sim
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
+run general/user/authority.sim
+run general/user/monitor.sim
+run general/user/pass_alter.sim
+run general/user/pass_len.sim
+run general/user/user_create.sim
+run general/user/user_len.sim
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
+run general/vector/metrics_query.sim
+run general/vector/metrics_tag.sim
+run general/vector/metrics_time.sim
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim
+run general/stream/restart_stream.sim
+run general/stream/stream_3.sim
+run general/stream/stream_restart.sim
+run general/stream/table_1.sim
+run general/stream/table_n.sim
+run general/stream/metrics_n.sim
+run general/stream/table_del.sim
+run general/stream/metrics_del.sim
+run general/stream/table_replica1_vnoden.sim
+run general/stream/metrics_replica1_vnoden.sim
+run general/db/show_create_db.sim
+run general/db/show_create_table.sim
diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2d049ec5955e281d866eaaa15abf06583909c87d
--- /dev/null
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -0,0 +1,123 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$db = csaa_db
+$stb = csaastb
+$tb1 = csaatb1
+$tb2 = csaatb2
+
+$ts0 = 1537146000000
+$delta = 600000
+print ========== cached_schema_after_alter.sim
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+sql create table $tb1 using $stb tags( 1 )
+sql create table $tb2 using $stb tags( 2 )
+
+sql_error alter table $tb1 add column c0 int
+sql alter table $stb add column c2 int
+
+sql insert into $tb2 values ( $ts0 , 1, 1)
+sql select * from $stb
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+
+sql select * from $tb2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sleep 5000
+sql connect
+
+sql use $db
+sql select * from $stb
+print select * from $stb ==> $data00 $data01 $data02
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+
+sql select * from $tb2
+print select * from $tb2 ==> $data00 $data01 $data02
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+
+$ts = $ts0 + $delta
+sql insert into $tb2 values ( $ts , 2, 2)
+sql select * from $stb order by ts asc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+if $data11 != 2 then
+  return -1
+endi 
+if $data12 != 2 then
+  return -1
+endi 
+
+sql select * from $tb2 order by ts asc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi 
+if $data02 != 1 then
+  return -1
+endi 
+if $data11 != 2 then
+  return -1
+endi 
+if $data12 != 2 then
+  return -1
+endi 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
new file mode 100644
index 0000000000000000000000000000000000000000..157b4c137198b70a9e7ad3b1f64e5b4b06a90415
--- /dev/null
+++ b/tests/script/general/alter/count.sim
@@ -0,0 +1,266 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnode1 as master
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d1 replica 1 days 7 keep 50 
+sql use d1
+sql create table tb (ts timestamp, a int)
+sql insert into tb values(now-28d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select count(a) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step2
+sql alter table tb add column b smallint
+sql insert into tb values(now-25d, -25, 0)
+sql insert into tb values(now-24d, -24, 1)
+sql insert into tb values(now-23d, -23, 2)
+sql select count(b) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step3
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint)
+sql alter table tb add column c tinyint
+sql insert into tb values(now-22d, -22, 3, 0)
+sql insert into tb values(now-21d, -21, 4, 1)
+sql insert into tb values(now-20d, -20, 5, 2)
+sql select count(c) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step4
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int)
+sql alter table tb add column d int
+sql insert into tb values(now-19d, -19, 6, 0, 0)
+sql insert into tb values(now-18d, -18, 7, 1, 1)
+sql insert into tb values(now-17d, -17, 8, 2, 2)
+sql select count(d) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step5
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint)
+sql alter table tb add column e bigint
+sql insert into tb values(now-16d, -16, 9, 0, 0, 0)
+sql insert into tb values(now-15d, -15, 10, 1, 1, 1)
+sql insert into tb values(now-14d, -14, 11, 2, 2, 2)
+sql select count(e) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step6
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float)
+sql alter table tb add column f float
+sql insert into tb values(now-13d, -13, 12, 0, 0, 0, 0)
+sql insert into tb values(now-12d, -12, 13, 1, 1, 1, 1)
+sql insert into tb values(now-11d, -11, 24, 2, 2, 2, 2)
+sql select count(f) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step7
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double)
+sql alter table tb add column g double
+sql insert into tb values(now-10d, -10, 15, 0, 0, 0, 0, 0)
+sql insert into tb values(now-9d, -9, 16, 1, 1, 1, 1, 1)
+sql insert into tb values(now-8d, -8, 17, 2, 2, 2, 2, 2)
+sql select count(g) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step8
+# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10) ) 
+sql alter table tb add column h binary(10)
+sql insert into tb values(now-7d, -7, 18, 0, 0, 0, 0, 0, '0')
+sql insert into tb values(now-6d, -6, 19, 1, 1, 1, 1, 1, '1')
+sql insert into tb values(now-5d, -5, 20, 2, 2, 2, 2, 2, '2')
+sql select count(h) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step9
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data00 != 24 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data01 != 21 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data02 != 18 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data03 != 15 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data04 != 12 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data05 != 9 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data06 != 6 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data07 != 3 then
+  return -1
+endi
+
+print ============= step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data00 != 24 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data01 != 21 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data02 != 18 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data03 != 15 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data04 != 12 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data05 != 9 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data06 != 6 then
+  return -1
+endi
+
+sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
+if $data07 != 3 then
+  return -1
+endi
+
+print ======== step11
+#sql alter table tb(ts timestamp, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(20))
+sql alter table tb drop column a
+sql insert into tb values(now-4d, 1, 1, 1, 1, 1, 1, '1')
+sql select count(g) from tb
+if $data00 != 7 then
+  return -1
+endi
+
+print ======== step12
+#sql alter table tb(ts timestamp, c tinyint, d int, e bigint, f float, g double, h binary(20))
+sql alter table tb drop column b
+sql insert into tb values(now-3d, 1, 1, 1, 1, 1, '1')
+sql select count(g) from tb
+if $data00 != 8 then
+  return -1
+endi
+
+print ======== step13
+#sql alter table tb(ts timestamp, d int, e bigint, f float, g double, h binary(20))
+sql alter table tb drop column c
+sql insert into tb values(now-2d, 1, 1, 1, 1, '1')
+sql select count(g) from tb
+if $data00 != 9 then
+  return -1
+endi
+
+print ======== step14
+#sql alter table tb(ts timestamp, e bigint, f float, g double, h binary(20))
+sql alter table tb drop column d
+sql insert into tb values(now-1d, 1, 1, 1, '1')
+sql select count(g) from tb
+if $data00 != 10 then
+  return -1
+endi
+
+print ======== step15
+#sql alter table tb(ts timestamp, f float, g double, h binary(20))
+sql alter table tb drop column e
+sql insert into tb values(now, 1, 1, '1')
+sql select count(g) from tb
+if $data00 != 11 then
+  return -1
+endi
+
+print ======== step16
+#sql alter table tb(ts timestamp, g double, h binary(20))
+sql alter table tb drop column f
+sql insert into tb values(now+1d, 1, '1')
+sql select count(g) from tb
+if $data00 != 12 then
+  return -1
+endi
+
+print ======== step17
+#sql alter table tb(ts timestamp, h binary(20))
+sql alter table tb drop column g
+sql insert into tb values(now+2d, '1')
+sql select count(h) from tb
+if $data00 != 10 then
+  return -1
+endi
+
+print ============== step18
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+#sql select count(g) from tb
+#if $data00 != 12 then
+#  return -1
+#endi
+sql select count(*) from tb
+if $data00 != 31 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/dnode.sim b/tests/script/general/alter/dnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..20ce8799791eaf2aa6198bc07d4abde70a6f31e0
--- /dev/null
+++ b/tests/script/general/alter/dnode.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql alter dnode 1 resetlog
+sql alter dnode 1 monitor 1
+
+sleep 5000
+sql select * from log.dn
+if $rows <= 0 then
+  return -1
+endi
+
+print ======== step2
+
+sql alter dnode 1 resetquerycache
+sql alter dnode 1 debugFlag 135
+sql alter dnode 1 debugFlag 131
+sql alter dnode 1 monitor 0
+sql alter dnode 1 debugFlag 135
+sql alter dnode 1 monitorDebugFlag 135
+sql alter dnode 1 vDebugFlag 135
+sql alter dnode 1 mDebugFlag 135
+sql alter dnode 1 cDebugFlag 135
+sql alter dnode 1 httpDebugFlag 135
+sql alter dnode 1 qDebugflag 135
+sql alter dnode 1 sdbDebugFlag 135
+sql alter dnode 1 uDebugFlag 135
+sql alter dnode 1 tsdbDebugFlag 135
+sql alter dnode 1 sDebugflag 135
+sql alter dnode 1 rpcDebugFlag 135
+sql alter dnode 1 dDebugFlag 135
+sql alter dnode 1 mqttDebugFlag 135
+sql alter dnode 1 wDebugFlag 135
+sql alter dnode 1 tmrDebugFlag 135
+sql_error alter dnode 2 wDebugFlag 135
+sql_error alter dnode 2 tmrDebugFlag 135
+
+print ======== step3
+sql_error alter $hostname1 debugFlag 135
+sql_error alter $hostname1 monitorDebugFlag 135
+sql_error alter $hostname1 vDebugFlag 135
+sql_error alter $hostname1 mDebugFlag 135
+sql_error alter dnode $hostname2 debugFlag 135
+sql_error alter dnode $hostname2 monitorDebugFlag 135
+sql_error alter dnode $hostname2 vDebugFlag 135
+sql_error alter dnode $hostname2 mDebugFlag 135
+sql alter dnode $hostname1 debugFlag 135
+sql alter dnode $hostname1 monitorDebugFlag 135
+sql alter dnode $hostname1 vDebugFlag 135
+sql alter dnode $hostname1 tmrDebugFlag 131
+
+print ======== step4
+sql_error sql alter dnode 1 balance 0
+sql_error sql alter dnode 1 balance vnode:1-dnode:1
+sql_error sql alter dnode 1 balance "vnode:1"
+sql_error sql alter dnode 1 balance "vnode:1-dnode:1"
+sql_error sql alter dnode 1 balance "dnode:1-vnode:1"
+sql_error sql alter dnode 1 balance "dnode:1-"
+sql_error sql alter dnode 1 balance "vnode:2-dnod"
+sql alter dnode 1 balance "vnode:2-dnode:1" -x step4
+step4:
+
+print ======= over
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
new file mode 100644
index 0000000000000000000000000000000000000000..76388a26f2b15d1ce9a86331ab2e70cb29a88480
--- /dev/null
+++ b/tests/script/general/alter/import.sim
@@ -0,0 +1,50 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnode1 as master
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d1 replica 1 days 7 keep 50
+sql use d1
+sql create table tb (ts timestamp, a int)
+sql insert into tb values(now-30d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select count(a) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ======== step2
+#sql alter table tb(ts timestamp, a int, b smallint)
+sql alter table tb add column b smallint
+sql insert into tb values(now-25d, -25, 0)
+sql insert into tb values(now-22d, -24, 1)
+sql insert into tb values(now-20d, -23, 2)
+sql select count(b) from tb
+if $data00 != 3 then
+  return -1
+endi
+
+print ========= step3
+sql import into tb values(now-23d, -23, 0)
+sql import into tb values(now-21d, -21, 0)
+sql select count(b) from tb
+if $data00 != 5 then
+  return -1
+endi
+
+sql import into tb values(now-29d, -29, 0)
+sql select count(b) from tb
+if $data00 != 6 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3b16214465c15133aecc3e2c5977996cbaa22b5f
--- /dev/null
+++ b/tests/script/general/alter/insert1.sim
@@ -0,0 +1,1147 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d3
+sql use d3
+sql create table tb (ts timestamp, a int)
+sql insert into tb values(now-28d, -28)
+sql select * from tb order by ts desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != null then
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+if $data04 != null then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+
+print ======== step2
+sql alter table tb add column b smallint
+sql insert into tb values(now-25d, -25, 0)
+sql select * from tb order by ts desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $rows != 2 then
+  return -1
+endi
+if $data01 != -25 then
+  return -1
+endi
+if $data11 != -28 then
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data13 != null then
+  return -1
+endi
+if $data14 != null then
+  return -1
+endi
+if $data15 != null then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+
+print ======== step3
+sql alter table tb add column c tinyint
+sql insert into tb values(now-22d, -22, 3, 0)
+sql select * from tb order by ts asc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+print $data20 $data21 $data22 $data23 $data24 $data25 $data26
+if $rows != 3 then then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != null then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != null then
+  return -1
+endi
+if $data15 != null then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != null then
+  return -1
+endi
+if $data25 != null then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+
+print ======== step4
+sql alter table tb add column d int
+sql insert into tb values(now-19d, -19, 6, 3, 0)
+sql select * from tb order by ts asc
+if $rows != 4 then then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != null then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != null then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != null then
+  return -1
+endi
+if $data36 != null then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+
+print ======== step5
+sql alter table tb add column e bigint
+sql insert into tb values(now-16d, -16, 9, 5, 4, 3)
+sql select count(e) from tb
+if $data00 != 1 then
+  return -1
+endi
+sql select count(c) from tb
+if $data00 != 3 then then
+  return -1
+endi
+sql select * from tb order by ts asc
+if $rows != 5 then then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != null then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+if $data41 != -16 then
+  return -1
+endi
+if $data42 != 9 then
+  return -1
+endi
+if $data43 != 5 then
+  return -1
+endi
+if $data44 != 4 then
+  return -1
+endi
+if $data45 != 3 then
+  return -1
+endi
+if $data46 != null then
+  return -1
+endi
+if $data47 != null then
+  return -1
+endi
+if $data48 != null then
+  return -1
+endi
+
+print ======== step6
+sql alter table tb add column f float
+sql insert into tb values(now-13d, -13, 12, 11, 10, 9, 8)
+sql select * from tb order by ts asc
+if $rows != 6 then then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != NULL then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != NULL then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+if $data41 != -16 then
+  return -1
+endi
+if $data42 != 9 then
+  return -1
+endi
+if $data43 != 5 then
+  return -1
+endi
+if $data44 != 4 then
+  return -1
+endi
+if $data45 != 3 then
+  return -1
+endi
+if $data46 != NULL then
+  return -1
+endi
+if $data47 != null then
+  return -1
+endi
+if $data48 != null then
+  return -1
+endi
+if $data51 != -13 then
+  return -1
+endi
+if $data52 != 12 then
+  return -1
+endi
+if $data53 != 11 then
+  return -1
+endi
+if $data54 != 10 then
+  return -1
+endi
+if $data55 != 9 then
+  return -1
+endi
+if $data56 != 8.00000 then
+  return -1
+endi
+if $data57 != null then
+  return -1
+endi
+if $data58 != null then
+  return -1
+endi
+
+print ======== step7
+sql alter table tb add column g double
+sql insert into tb values(now-10d, -10, 15, 14, 13, 12, 11, 10)
+sql select * from tb order by ts asc
+if $rows != 7 then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != NULL then
+  return -1
+endi
+if $data07 != NULL then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != NULL then
+  return -1
+endi
+if $data37 != NULL then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+if $data41 != -16 then
+  return -1
+endi
+if $data42 != 9 then
+  return -1
+endi
+if $data43 != 5 then
+  return -1
+endi
+if $data44 != 4 then
+  return -1
+endi
+if $data45 != 3 then
+  return -1
+endi
+if $data46 != NULL then
+  return -1
+endi
+if $data47 != NULL then
+  return -1
+endi
+if $data48 != null then
+  return -1
+endi
+if $data51 != -13 then
+  return -1
+endi
+if $data52 != 12 then
+  return -1
+endi
+if $data53 != 11 then
+  return -1
+endi
+if $data54 != 10 then
+  return -1
+endi
+if $data55 != 9 then
+  return -1
+endi
+if $data56 != 8.00000 then
+  return -1
+endi
+if $data57 != NULL then
+  return -1
+endi
+if $data58 != null then
+  return -1
+endi
+if $data61 != -10 then
+  return -1
+endi
+if $data62 != 15 then
+  return -1
+endi
+if $data63 != 14 then
+  return -1
+endi
+if $data64 != 13 then
+  return -1
+endi
+if $data65 != 12 then
+  return -1
+endi
+if $data66 != 11.00000 then
+  return -1
+endi
+if $data67 != 10.000000000 then
+  return -1
+endi
+if $data68 != null then
+  return -1
+endi
+
+print ======== step8
+sql alter table tb add column h binary(10)
+sql insert into tb values(now-7d, -7, 18, 17, 16, 15, 14, 13, '11')
+sql select * from tb order by ts asc
+if $rows != 8 then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != NULL then
+  return -1
+endi
+if $data07 != NULL then
+  return -1
+endi
+if $data08 != NULL then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data28 != NULL then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != NULL then
+  return -1
+endi
+if $data37 != NULL then
+  return -1
+endi
+if $data38 != NULL then
+  return -1
+endi
+if $data41 != -16 then
+  return -1
+endi
+if $data42 != 9 then
+  return -1
+endi
+if $data43 != 5 then
+  return -1
+endi
+if $data44 != 4 then
+  return -1
+endi
+if $data45 != 3 then
+  return -1
+endi
+if $data46 != NULL then
+  return -1
+endi
+if $data47 != NULL then
+  return -1
+endi
+if $data48 != NULL then
+  return -1
+endi
+if $data51 != -13 then
+  return -1
+endi
+if $data52 != 12 then
+  return -1
+endi
+if $data53 != 11 then
+  return -1
+endi
+if $data54 != 10 then
+  return -1
+endi
+if $data55 != 9 then
+  return -1
+endi
+if $data56 != 8.00000 then
+  return -1
+endi
+if $data57 != NULL then
+  return -1
+endi
+if $data58 != NULL then
+  return -1
+endi
+if $data61 != -10 then
+  return -1
+endi
+if $data62 != 15 then
+  return -1
+endi
+if $data63 != 14 then
+  return -1
+endi
+if $data64 != 13 then
+  return -1
+endi
+if $data65 != 12 then
+  return -1
+endi
+if $data66 != 11.00000 then
+  return -1
+endi
+if $data67 != 10.000000000 then
+  return -1
+endi
+if $data68 != NULL then
+  return -1
+endi
+if $data71 != -7 then
+  return -1
+endi
+if $data72 != 18 then
+  return -1
+endi
+if $data73 != 17 then
+  return -1
+endi
+if $data74 != 16 then
+  return -1
+endi
+if $data75 != 15 then
+  return -1
+endi
+if $data76 != 14.00000 then
+  return -1
+endi
+if $data77 != 13.000000000 then
+  return -1
+endi
+if $data78 != 11 then
+  return -1
+endi
+if $data79 != null then
+  return -1
+endi
+
+print ======== step9
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql select * from tb order by ts asc
+if $rows != 8 then
+  return -1
+endi
+if $data01 != -28 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != NULL then
+  return -1
+endi
+if $data07 != NULL then
+  return -1
+endi
+if $data08 != NULL then
+  return -1
+endi
+if $data11 != -25 then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data21 != -22 then
+  return -1
+endi
+if $data22 != 3 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data28 != NULL then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != 6 then
+  return -1
+endi
+if $data33 != 3 then
+  return -1
+endi
+if $data34 != 0 then
+  return -1
+endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != NULL then
+  return -1
+endi
+if $data37 != NULL then
+  return -1
+endi
+if $data38 != NULL then
+  return -1
+endi
+if $data41 != -16 then
+  return -1
+endi
+if $data42 != 9 then
+  return -1
+endi
+if $data43 != 5 then
+  return -1
+endi
+if $data44 != 4 then
+  return -1
+endi
+if $data45 != 3 then
+  return -1
+endi
+if $data46 != NULL then
+  return -1
+endi
+if $data47 != NULL then
+  return -1
+endi
+if $data48 != NULL then
+  return -1
+endi
+if $data51 != -13 then
+  return -1
+endi
+if $data52 != 12 then
+  return -1
+endi
+if $data53 != 11 then
+  return -1
+endi
+if $data54 != 10 then
+  return -1
+endi
+if $data55 != 9 then
+  return -1
+endi
+if $data56 != 8.00000 then
+  return -1
+endi
+if $data57 != NULL then
+  return -1
+endi
+if $data58 != NULL then
+  return -1
+endi
+if $data61 != -10 then
+  return -1
+endi
+if $data62 != 15 then
+  return -1
+endi
+if $data63 != 14 then
+  return -1
+endi
+if $data64 != 13 then
+  return -1
+endi
+if $data65 != 12 then
+  return -1
+endi
+if $data66 != 11.00000 then
+  return -1
+endi
+if $data67 != 10.000000000 then
+  return -1
+endi
+if $data68 != NULL then
+  return -1
+endi
+if $data71 != -7 then
+  return -1
+endi
+if $data72 != 18 then
+  return -1
+endi
+if $data73 != 17 then
+  return -1
+endi
+if $data74 != 16 then
+  return -1
+endi
+if $data75 != 15 then
+  return -1
+endi
+if $data76 != 14.00000 then
+  return -1
+endi
+if $data77 != 13.000000000 then
+  return -1
+endi
+if $data78 != 11 then
+  return -1
+endi
+if $data79 != null then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..28948b69d231952f3baae0d79a75c1f2c9c6fb60
--- /dev/null
+++ b/tests/script/general/alter/insert2.sim
@@ -0,0 +1,671 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d4
+sql use d4
+sql create table tb (ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10))
+sql insert into tb values(now-28d, 1, 2, 3, 4, 5, 6, 7, 8)
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 2 then
+  return -1
+endi
+if $data03 != 3 then
+  return -1
+endi
+if $data04 != 4 then
+  return -1
+endi
+if $data05 != 5 then
+  return -1
+endi
+if $data06 != 6.00000 then
+  return -1
+endi
+if $data07 != 7.000000000 then
+  return -1
+endi
+if $data08 != 8 then
+  return -1
+endi
+
+print ======== step2
+sql_error alter table tb add column b smallint
+sql_error alter table tb add column b int
+sql alter table tb drop column b
+sql insert into tb values(now-25d, 2, 3, 4, 5, 6, 7, 8)
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != 3 then
+  return -1
+endi
+if $data03 != 4 then
+  return -1
+endi
+if $data04 != 5 then
+  return -1
+endi
+if $data05 != 6.00000 then
+  return -1
+endi
+if $data06 != 7.000000000 then
+  return -1
+endi
+if $data07 != 8 then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+if $data13 != 4 then
+  return -1
+endi
+if $data14 != 5 then
+  return -1
+endi
+if $data15 != 6.00000 then
+  return -1
+endi
+if $data16 != 7.000000000 then
+  return -1
+endi
+if $data17 != 8 then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+
+print ======== step3
+sql alter table tb drop column c
+sql insert into tb values(now-22d, 3, 4, 5, 6, 7, 8)
+sql select * from tb order by ts desc
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data03 != 5 then
+  return -1
+endi
+if $data04 != 6.00000 then
+  return -1
+endi
+if $data05 != 7.000000000 then
+  return -1
+endi
+if $data06 != 8 then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 4 then
+  return -1
+endi
+if $data13 != 5 then
+  return -1
+endi
+if $data14 != 6.00000 then
+  return -1
+endi
+if $data15 != 7.000000000 then
+  return -1
+endi
+if $data16 != 8 then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data22 != 4 then
+  return -1
+endi
+if $data23 != 5 then
+  return -1
+endi
+if $data24 != 6.00000 then
+  return -1
+endi
+if $data25 != 7.000000000 then
+  return -1
+endi
+if $data26 != 8 then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+
+print ======== step4
+sql alter table tb drop column d
+sql alter table tb drop column e
+sql insert into tb values(now-19d, -19, 6, 3, 0)
+sql select * from tb order by ts desc
+if $rows != 4 then
+  return -1
+endi
+if $data01 != -19 then
+  return -1
+endi
+if $data02 != 6.00000 then
+  return -1
+endi
+if $data03 != 3.000000000 then
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != 3 then
+  return -1
+endi
+if $data12 != 6.00000 then
+  return -1
+endi
+if $data13 != 7.000000000 then
+  return -1
+endi
+if $data14 != 8 then
+  return -1
+endi
+if $data15 != null then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+if $data22 != 6.00000 then
+  return -1
+endi
+if $data23 != 7.000000000 then
+  return -1
+endi
+if $data24 != 8 then
+  return -1
+endi
+if $data25 != null then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != 1 then
+  return -1
+endi
+if $data32 != 6.00000 then
+  return -1
+endi
+if $data33 != 7.000000000 then
+  return -1
+endi
+if $data34 != 8 then
+  return -1
+endi
+if $data35 != null then
+  return -1
+endi
+if $data36 != null then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+
+print ======== step5
+sql alter table tb drop column g
+sql insert into tb values(now-16d, -16, 9, 5)
+sql select count(f) from tb
+if $data00 != 5 then
+  return -1
+endi
+sql select * from tb order by ts desc
+if $rows != 5 then
+  return -1
+endi
+if $data01 != -16 then
+  return -1
+endi
+if $data02 != 9.00000 then
+  return -1
+endi
+if $data03 != 5 then
+  return -1
+endi
+if $data04 != null then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data11 != -19 then
+  return -1
+endi
+if $data12 != 6.00000 then
+  return -1
+endi
+if $data13 != 0 then
+  return -1
+endi
+if $data14 != null then
+  return -1
+endi
+if $data15 != null then
+  return -1
+endi
+if $data16 != null then
+  return -1
+endi
+if $data17 != null then
+  return -1
+endi
+if $data18 != null then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+if $data22 != 6.00000 then
+  return -1
+endi
+if $data23 != 8 then
+  return -1
+endi
+if $data24 != null then
+  return -1
+endi
+if $data25 != null then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != 2 then
+  return -1
+endi
+if $data32 != 6.00000 then
+  return -1
+endi
+if $data33 != 8 then
+  return -1
+endi
+if $data34 != null then
+  return -1
+endi
+if $data35 != null then
+  return -1
+endi
+if $data36 != null then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data42 != 6.00000 then
+  return -1
+endi
+if $data43 != 8 then
+  return -1
+endi
+if $data44 != null then
+  return -1
+endi
+if $data45 != null then
+  return -1
+endi
+if $data46 != null then
+  return -1
+endi
+if $data47 != null then
+  return -1
+endi
+if $data48 != null then
+  return -1
+endi
+
+print ======== step6
+sql alter table tb drop column f
+sql insert into tb values(now-13d, -13, 7)
+sql select * from tb order by ts desc
+if $rows != 6 then
+  return -1
+endi
+if $data01 != -13 then
+  return -1
+endi
+if $data11 != -16 then
+  return -1
+endi
+if $data12 != 5 then
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+if $data04 != null then
+  return -1
+endi
+if $data05 != null then
+  return -1
+endi
+if $data06 != null then
+  return -1
+endi
+if $data07 != null then
+  return -1
+endi
+if $data08 != null then
+  return -1
+endi
+if $data21 != -19 then
+  return -1
+endi
+if $data22 != 0 then
+  return -1
+endi
+if $data23 != null then
+  return -1
+endi
+if $data24 != null then
+  return -1
+endi
+if $data25 != null then
+  return -1
+endi
+if $data26 != null then
+  return -1
+endi
+if $data27 != null then
+  return -1
+endi
+if $data28 != null then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data32 != 8 then
+  return -1
+endi
+if $data33 != null then
+  return -1
+endi
+if $data34 != null then
+  return -1
+endi
+if $data35 != null then
+  return -1
+endi
+if $data36 != null then
+  return -1
+endi
+if $data37 != null then
+  return -1
+endi
+if $data38 != null then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data42 != 8 then
+  return -1
+endi
+if $data43 != null then
+  return -1
+endi
+if $data44 != null then
+  return -1
+endi
+if $data45 != null then
+  return -1
+endi
+if $data46 != null then
+  return -1
+endi
+if $data47 != null then
+  return -1
+endi
+if $data48 != null then
+  return -1
+endi
+if $data51 != 1 then
+  return -1
+endi
+if $data52 != 8 then
+  return -1
+endi
+if $data53 != null then
+  return -1
+endi
+if $data54 != null then
+  return -1
+endi
+if $data55 != null then
+  return -1
+endi
+if $data57 != null then
+  return -1
+endi
+if $data58 != null then
+  return -1
+endi
+
+print ======== step7
+sql alter table tb drop column h
+sql insert into tb values(now-10d, -10)
+sql select * from tb order by ts desc
+if $rows != 7 then
+  return -1
+endi
+print data01 = $data01
+if $data01 != -10 then
+  return -1
+endi
+if $data02 != null then
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+if $data11 != -13 then
+  return -1
+endi
+if $data12 != null then
+  return -1
+endi
+if $data21 != -16 then
+  return -1
+endi
+if $data22 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != null then
+  return -1
+endi
+if $data33 != null then
+  return -1
+endi
+if $data41 != 3 then
+  return -1
+endi
+if $data42 != null then
+  return -1
+endi
+if $data51 != 2 then
+  return -1
+endi
+if $data52 != null then
+  return -1
+endi
+if $data53 != null then
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data62 != null then
+  return -1
+endi
+
+sql_error alter table tb drop column a
+
+print ======== step9
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql select * from tb order by ts desc
+if $rows != 7 then
+  return -1
+endi
+if $data01 != -10 then
+  return -1
+endi
+if $data02 != null then
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+if $data11 != -13 then
+  return -1
+endi
+if $data12 != null then
+  return -1
+endi
+if $data21 != -16 then
+  return -1
+endi
+if $data22 != null then
+  return -1
+endi
+if $data31 != -19 then
+  return -1
+endi
+if $data32 != null then
+  return -1
+endi
+if $data33 != null then
+  return -1
+endi
+if $data41 != 3 then
+  return -1
+endi
+if $data42 != null then
+  return -1
+endi
+if $data51 != 2 then
+  return -1
+endi
+if $data52 != null then
+  return -1
+endi
+if $data53 != null then
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data62 != null then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5ed8050b96b90d679fcb85ada06c6065b8f0735a
--- /dev/null
+++ b/tests/script/general/alter/metrics.sim
@@ -0,0 +1,769 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d2
+sql use d2
+sql create table mt (ts timestamp, a int) TAGS (t int)
+sql create table tb using mt tags (1)
+sql insert into tb values(now-28d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select * from tb
+if $rows != 3 then
+  return -1
+endi
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != t then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+
+print ======== step2
+sql alter table mt add column b smallint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != t then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+
+print ======== step3
+sql alter table mt add column c tinyint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != t then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step4
+sql alter table mt add column d int
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != t then
+  return -1
+endi
+if $data51 != INT then
+  return -1
+endi
+
+print ======== step5
+sql alter table mt add column e bigint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != t then
+  return -1
+endi
+if $data61 != INT then
+  return -1
+endi
+
+print ======== step6
+sql alter table mt add column f float
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != t then
+  return -1
+endi
+if $data71 != INT then
+  return -1
+endi
+
+print ======== step7
+sql alter table mt add column g double
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != t then
+  return -1
+endi
+if $data81 != INT then
+  return -1
+endi
+
+print ======== step8
+sql alter table mt add column h binary(10)
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+if $data90 != t then
+  return -1
+endi
+if $data91 != INT then
+  return -1
+endi
+
+print ======== step9
+print ======== step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use d2
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+if $data90 != t then
+  return -1
+endi
+if $data91 != INT then
+  return -1
+endi
+
+print ======== step11
+#sql alter table mt drop column a -x step111
+#  return -1
+#step111:
+
+#sql alter table mt drop column ts -x step112
+#  return -1
+#step112:
+
+#sql alter table mt drop column cdfg -x step113
+#  return -1
+#step113:
+
+#sql alter table mt add column a -x step114
+#  return -1
+#step114:
+
+#sql alter table mt add column b -x step115
+#  return -1
+#step115:
+
+print ======== step12
+sql alter table mt drop column b
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != c then
+  return -1
+endi
+if $data21 != TINYINT then
+  return -1
+endi
+if $data30 != d then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+if $data40 != e then
+  return -1
+endi
+if $data41 != BIGINT then
+  return -1
+endi
+if $data50 != f then
+  return -1
+endi
+if $data51 != FLOAT then
+  return -1
+endi
+if $data60 != g then
+  return -1
+endi
+if $data61 != DOUBLE then
+  return -1
+endi
+if $data70 != h then
+  return -1
+endi
+if $data71 != BINARY then
+  return -1
+endi
+if $data72 != 10 then
+  return -1
+endi
+if $data80 != t then
+  return -1
+endi
+if $data81 != INT then
+  return -1
+endi
+
+print ======== step13
+sql alter table mt drop column c
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != d then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != e then
+  return -1
+endi
+if $data31 != BIGINT then
+  return -1
+endi
+if $data40 != f then
+  return -1
+endi
+if $data41 != FLOAT then
+  return -1
+endi
+if $data50 != g then
+  return -1
+endi
+if $data51 != DOUBLE then
+  return -1
+endi
+if $data60 != h then
+  return -1
+endi
+if $data61 != BINARY then
+  return -1
+endi
+if $data62 != 10 then
+  return -1
+endi
+if $data70 != t then
+  return -1
+endi
+if $data71 != INT then
+  return -1
+endi
+
+print ======== step14
+sql alter table mt drop column d
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != e then
+  return -1
+endi
+if $data21 != BIGINT then
+  return -1
+endi
+if $data30 != f then
+  return -1
+endi
+if $data31 != FLOAT then
+  return -1
+endi
+if $data40 != g then
+  return -1
+endi
+if $data41 != DOUBLE then
+  return -1
+endi
+if $data50 != h then
+  return -1
+endi
+if $data51 != BINARY then
+  return -1
+endi
+if $data52 != 10 then
+  return -1
+endi
+if $data60 != t then
+  return -1
+endi
+if $data61 != INT then
+  return -1
+endi
+
+print ======== step15
+sql alter table mt drop column e
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != f then
+  return -1
+endi
+if $data21 != FLOAT then
+  return -1
+endi
+if $data30 != g then
+  return -1
+endi
+if $data31 != DOUBLE then
+  return -1
+endi
+if $data40 != h then
+  return -1
+endi
+if $data41 != BINARY then
+  return -1
+endi
+if $data42 != 10 then
+  return -1
+endi
+if $data50 != t then
+  return -1
+endi
+if $data51 != INT then
+  return -1
+endi
+
+print ======== step16
+sql alter table mt drop column f
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != g then
+  return -1
+endi
+if $data21 != DOUBLE then
+  return -1
+endi
+if $data30 != h then
+  return -1
+endi
+if $data31 != BINARY then
+  return -1
+endi
+if $data32 != 10 then
+  return -1
+endi
+if $data40 != t then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step17
+sql alter table mt drop column g
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != h then
+  return -1
+endi
+if $data21 != BINARY then
+  return -1
+endi
+if $data22 != 10 then
+  return -1
+endi
+if $data30 != t then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+
+print ============= step18
+sql alter table mt drop column h
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != t then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != null then
+  return -1
+endi
+
+print ======= over
+sql drop database d2
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5a72fc925619e1a0ab40289056f6af355b995ca9
--- /dev/null
+++ b/tests/script/general/alter/table.sim
@@ -0,0 +1,672 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d1
+sql use d1
+sql create table tb (ts timestamp, a int)
+sql insert into tb values(now-28d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select * from tb
+if $rows != 3 then
+  return -1
+endi
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+
+print ======== step2
+sql alter table tb add column b smallint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+
+print ======== step3
+sql alter table tb add column c tinyint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+
+print ======== step4
+sql alter table tb add column d int
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step5
+sql alter table tb add column e bigint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+
+print ======== step6
+sql alter table tb add column f float
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+
+print ======== step7
+sql alter table tb add column g double
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+
+print ======== step8
+sql alter table tb add column h binary(10)
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+
+print ======== step9
+print ======== step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use d1
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+
+print ======== step11
+sql alter table drop column a -x step111
+  return -1
+step111:
+
+sql alter table drop column ts -x step112
+  return -1
+step112:
+
+sql alter table drop column cdfg -x step113
+  return -1
+step113:
+
+sql alter table add column a -x step114
+  return -1
+step114:
+
+sql alter table add column b -x step115
+  return -1
+step115:
+
+print ======== step12
+sql alter table tb drop column b
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != c then
+  return -1
+endi
+if $data21 != TINYINT then
+  return -1
+endi
+if $data30 != d then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+if $data40 != e then
+  return -1
+endi
+if $data41 != BIGINT then
+  return -1
+endi
+if $data50 != f then
+  return -1
+endi
+if $data51 != FLOAT then
+  return -1
+endi
+if $data60 != g then
+  return -1
+endi
+if $data61 != DOUBLE then
+  return -1
+endi
+if $data70 != h then
+  return -1
+endi
+if $data71 != BINARY then
+  return -1
+endi
+if $data72 != 10 then
+  return -1
+endi
+
+print ======== step13
+sql alter table tb drop column c
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != d then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != e then
+  return -1
+endi
+if $data31 != BIGINT then
+  return -1
+endi
+if $data40 != f then
+  return -1
+endi
+if $data41 != FLOAT then
+  return -1
+endi
+if $data50 != g then
+  return -1
+endi
+if $data51 != DOUBLE then
+  return -1
+endi
+if $data60 != h then
+  return -1
+endi
+if $data61 != BINARY then
+  return -1
+endi
+if $data62 != 10 then
+  return -1
+endi
+
+print ======== step14
+sql alter table tb drop column d
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != e then
+  return -1
+endi
+if $data21 != BIGINT then
+  return -1
+endi
+if $data30 != f then
+  return -1
+endi
+if $data31 != FLOAT then
+  return -1
+endi
+if $data40 != g then
+  return -1
+endi
+if $data41 != DOUBLE then
+  return -1
+endi
+if $data50 != h then
+  return -1
+endi
+if $data51 != BINARY then
+  return -1
+endi
+if $data52 != 10 then
+  return -1
+endi
+
+print ======== step15
+sql alter table tb drop column e
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != f then
+  return -1
+endi
+if $data21 != FLOAT then
+  return -1
+endi
+if $data30 != g then
+  return -1
+endi
+if $data31 != DOUBLE then
+  return -1
+endi
+if $data40 != h then
+  return -1
+endi
+if $data41 != BINARY then
+  return -1
+endi
+if $data42 != 10 then
+  return -1
+endi
+
+print ======== step16
+sql alter table tb drop column f
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != g then
+  return -1
+endi
+if $data21 != DOUBLE then
+  return -1
+endi
+if $data30 != h then
+  return -1
+endi
+if $data31 != BINARY then
+  return -1
+endi
+if $data32 != 10 then
+  return -1
+endi
+
+print ======== step17
+sql alter table tb drop column g
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != h then
+  return -1
+endi
+if $data21 != BINARY then
+  return -1
+endi
+if $data22 != 10 then
+  return -1
+endi
+
+print ============= step18
+sql alter table tb drop column h
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != null then
+  return -1
+endi
+
+print ======= over
+sql drop database d1
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/alter/testSuite.sim b/tests/script/general/alter/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cfac68144c080593499159eec81325924e7f25e6
--- /dev/null
+++ b/tests/script/general/alter/testSuite.sim
@@ -0,0 +1,7 @@
+run general/alter/cached_schema_after_alter.sim
+run general/alter/count.sim
+run general/alter/import.sim
+run general/alter/insert1.sim
+run general/alter/insert2.sim
+run general/alter/metrics.sim
+run general/alter/table.sim
\ No newline at end of file
diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0e304d9acb0ec3ceba18993846f9f6d8269ff966
--- /dev/null
+++ b/tests/script/general/cache/new_metrics.sim
@@ -0,0 +1,143 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = ca_nm_db
+$tbPrefix = ca_nm_tb
+$mtPrefix = ca_nm_mt
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$mt = $mtPrefix . $i
+$tbNum = 10
+$rowNum = 20
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+
+sql select * from $tb order by  ts desc
+print ===>rows $rows, data $data01
+if $rows != 20 then
+  return -1
+endi  
+if $data01 != 19 then
+  return -1
+endi  
+
+sql select * from $mt 
+print ===>rows $rows, data $data01
+if $rows != 100 then
+  return -1
+endi  
+if $data01 != 0 then
+  return -1
+endi  
+
+sql select count(*) from $mt
+print ===>rows $rows, data $data00
+if $rows != 1 then
+  return -1
+endi  
+if $data00 != 100 then
+  return -1
+endi  
+
+print =============== step3
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $mt then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+
+print =============== step4
+
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print ==> sleep 8 seconds to renew cache
+sleep 8000
+
+print =============== step5
+
+sql select * from $tb order by  ts desc
+print ===>rows $rows, data $data01
+if $rows != 20 then
+  return -1
+endi  
+if $data01 != 19 then
+  return -1
+endi  
+
+sql select * from $mt 
+print ===>rows $rows, data $data01
+if $rows != 200 then
+  return -1
+endi  
+if $data01 != 0 then
+  return -1
+endi  
+
+sql select count(*) from $mt
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data00 != 200 then
+  return -1
+endi  
+
+print =============== step6
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $mt then 
+  return -1
+endi
+if $data04 != 10 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..18c514acbf5a038f998035302cca8bb0fbd95a0b
--- /dev/null
+++ b/tests/script/general/cache/restart_metrics.sim
@@ -0,0 +1,95 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$i = 0
+$dbPrefix = ca_rm_db
+$tbPrefix = ca_rm_tb
+$mtPrefix = ca_rm_mt
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$mt = $mtPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(100))
+sql create table $tb using $mt tags( "1" )
+sql insert into $tb values (now, 1)
+
+sql select * from $tb
+#print ===>rows $rows, data $data01
+
+if $rows != 1 then
+  print expect 1, actual: $rows
+  return -1
+endi
+
+if $data01 != 1 then
+  print expect 1 actual: $data01
+  return -1
+endi  
+
+sql select * from $mt
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 1 then
+  return -1
+endi  
+
+print =============== step2
+system sh/exec.sh -n dnode1 -s stop
+sleep 5000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10
+system sh/exec.sh -n dnode1 -s start
+
+print =============== step3
+print ==> sleep 8 seconds to renew cache
+sql reset query cache
+sleep 1000
+
+print =============== step4
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bool) TAGS(tgcol int)
+sql create table $tb using $mt tags( 3 )
+sql insert into $tb values (now, 2)
+
+sql select * from $tb
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi
+
+if $data01 != 1 then
+  print expect 1, actual $data01
+  return -1
+endi  
+
+sql select * from $mt
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 1 then
+  return -1
+endi  
+if $data02 != 3 then
+  print expect 3 actual: $data02
+  return -1
+endi 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c4e6c6f2acc8f0fb0902a6a6adf8d9b91984a712
--- /dev/null
+++ b/tests/script/general/cache/restart_table.sim
@@ -0,0 +1,60 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$i = 0
+$dbPrefix = ca_rt_db
+$tbPrefix = ca_rt_tb
+$mtPrefix = ca_rt_mt
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed bool)
+sql insert into $tb values (now, 1)
+sql select * from $tb
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 1 then
+  return -1
+endi  
+
+print =============== step2
+system sh/exec.sh -n dnode1 -s stop
+sleep 5000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 10
+system sh/exec.sh -n dnode1 -s start
+
+print =============== step3
+print ==> sleep 8 seconds to renew cache
+sleep 3000
+sql reset query cache
+sleep 18000
+
+print =============== step4
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+sql insert into $tb values (now, 1)
+sql select * from $tb
+print ===>rows $rows, data $data01
+if $data01 != 1 then
+  return -1
+endi  
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/cache/testSuite.sim b/tests/script/general/cache/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f09ece89b6574af1261d6127624a78a222b5fbd5
--- /dev/null
+++ b/tests/script/general/cache/testSuite.sim
@@ -0,0 +1,3 @@
+run general/cache/new_metrics.sim
+run general/cache/restart_table.sim
+run general/cache/restart_metrics.sim
diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c574db1aa9dd28139251b4aa0433200e5fde230a
--- /dev/null
+++ b/tests/script/general/column/commit.sim
@@ -0,0 +1,151 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql create database d3
+sql use d3
+sql create table d3.mt (ts timestamp, c000 int, c001 int, c002 int, c003 int, c004 int, c005 int, c006 int, c007 int, c008 int, c009 int, c010 int, c011 int, c012 int, c013 int, c014 int, c015 int, c016 int, c017 int, c018 int, c019 int, c020 int, c021 int, c022 int, c023 int, c024 int, c025 int, c026 int, c027 int, c028 int, c029 int, c030 int, c031 int, c032 int, c033 int, c034 int, c035 int, c036 int, c037 int, c038 int, c039 int, c040 int, c041 int, c042 int, c043 int, c044 int, c045 int, c046 int, c047 int, c048 int, c049 int, c050 int, c051 int, c052 int, c053 int, c054 int, c055 int, c056 int, c057 int, c058 int, c059 int, c060 int, c061 int, c062 int, c063 int, c064 int, c065 int, c066 int, c067 int, c068 int, c069 int, c070 int, c071 int, c072 int, c073 int, c074 int, c075 int, c076 int, c077 int, c078 int, c079 int, c080 int, c081 int, c082 int, c083 int, c084 int, c085 int, c086 int, c087 int, c088 int, c089 int, c090 int, c091 int, c092 int, c093 int, c094 int, c095 int, c096 int, c097 int, c098 int, c099 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int, c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 int, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 int, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int) tags(a int, b smallint, c binary(20), d float, e double, f bigint)
+sql create table d3.t1 using d3.mt tags(1, 2, '3', 4, 5, 6)
+
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step2
+
+sql insert into d3.t1 values (now -300d,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
+sql insert into d3.t1 values (now-200d,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1  );
+sql insert into d3.t1 values (now-150d,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2  );
+sql insert into d3.t1 values (now-100d,3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3  );
+sql insert into d3.t1 values (now-50d,4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4  );
+sql insert into d3.t1 values (now-20d,5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5  );
+sql insert into d3.t1 values (now-10d,6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6  );
+sql insert into d3.t1 values (now-1d,7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 );
+sql insert into d3.t1 values (now,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8  );
+sql insert into d3.t1 values (now+1d,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9  );
+
+print =============== step3
+
+sql select * from d3.mt
+if $rows != 10 then 
+  return -1
+endi
+
+sql select * from d3.mt where c001 = 1
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d3.mt where c002 = 2 and c003 = 2
+if $rows != 1 then 
+  return -1
+endi
+
+sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 4.500000000 then 
+  return -1
+endi
+if $data08 != 10 then 
+  return -1
+endi
+if $data09 != 10 then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step5
+
+sql select * from d3.mt
+if $rows != 10 then 
+  return -1
+endi
+
+sql select * from d3.mt where c001 = 1
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d3.mt where c002 = 2 and c003 = 2
+if $rows != 1 then 
+  return -1
+endi
+
+sql select count(*) from d3.mt
+if $data00 != 10 then
+  return -1
+endi
+
+sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 4.500000000 then 
+  return -1
+endi
+if $data08 != 10 then 
+  return -1
+endi
+if $data09 != 10 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..673b66c9e266a68171161c88d3e2dfadd9d446da
--- /dev/null
+++ b/tests/script/general/column/metrics.sim
@@ -0,0 +1,219 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql create database d2
+sql use d2
+sql create table d2.mt (ts timestamp, c000 int, c001 int, c002 int, c003 int, c004 int, c005 int, c006 int, c007 int, c008 int, c009 int, c010 int, c011 int, c012 int, c013 int, c014 int, c015 int, c016 int, c017 int, c018 int, c019 int, c020 int, c021 int, c022 int, c023 int, c024 int, c025 int, c026 int, c027 int, c028 int, c029 int, c030 int, c031 int, c032 int, c033 int, c034 int, c035 int, c036 int, c037 int, c038 int, c039 int, c040 int, c041 int, c042 int, c043 int, c044 int, c045 int, c046 int, c047 int, c048 int, c049 int, c050 int, c051 int, c052 int, c053 int, c054 int, c055 int, c056 int, c057 int, c058 int, c059 int, c060 int, c061 int, c062 int, c063 int, c064 int, c065 int, c066 int, c067 int, c068 int, c069 int, c070 int, c071 int, c072 int, c073 int, c074 int, c075 int, c076 int, c077 int, c078 int, c079 int, c080 int, c081 int, c082 int, c083 int, c084 int, c085 int, c086 int, c087 int, c088 int, c089 int, c090 int, c091 int, c092 int, c093 int, c094 int, c095 int, c096 int, c097 int, c098 int, c099 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int, c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 int, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 int, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int) tags(a int, b smallint, c binary(20), d float, e double, f bigint)
+sql create table d2.t1 using d2.mt tags(1, 2, '3', 4, 5, 6)
+sql create table d2.t2 using d2.mt tags(6, 7, '8', 9, 10, 11)
+
+sql show tables
+if $rows != 2 then 
+  return -1
+endi
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step2
+
+sql insert into d2.t1 values (now,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0  )
+sql insert into d2.t1 values (now+1m,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1  )
+sql insert into d2.t1 values (now+2m,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2  )
+sql insert into d2.t1 values (now+3m,3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3  )
+sql insert into d2.t1 values (now+4m,4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4  )
+sql insert into d2.t1 values (now+5m,5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5  )
+
+sql insert into d2.t1 values (now+6m,6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6  )
+
+sql insert into d2.t1 values (now+7m,7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7  )
+
+sql insert into d2.t1 values (now+8m,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8  )
+
+sql insert into d2.t1 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9  )
+
+sql insert into d2.t2 values (now,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 )
+sql insert into d2.t2 values (now+1m,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1  )
+sql insert into d2.t2 values (now+2m,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 )
+sql insert into d2.t2 values (now+3m,3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3  )
+sql insert into d2.t2 values (now+4m,4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4  )
+sql insert into d2.t2 values (now+5m,5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5  )
+
+sql insert into d2.t2 values (now+6m,6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6  )
+
+sql insert into d2.t2 values (now+7m,7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7  )
+
+sql insert into d2.t2 values (now+8m,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8  )
+
+sql insert into d2.t2 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9  )
+
+print =============== step3
+
+sql select * from d2.mt
+if $rows != 20 then 
+  return -1
+endi
+
+sql select * from d2.mt where ts < now + 4m
+if $rows != 10 then 
+  return -1
+endi
+
+sql select * from d2.mt where c001 = 1
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from d2.mt where c002 = 2 and c003 = 2
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from d2.mt where c002 = 2 and c003 = 2 and ts < now + 4m
+if $rows != 2 then 
+  return -1
+endi
+
+sql select count(*) from d2.mt
+if $data00 != 20 then 
+  return -1
+endi
+
+sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 20 then 
+  return -1
+endi
+if $data01 != 20 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 90 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 4.500000000 then 
+  return -1
+endi
+if $data08 != 20 then 
+  return -1
+endi
+if $data09 != 20 then 
+  return -1
+endi
+
+sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c238), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt where a = 1
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09 
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 4.500000000 then 
+  return -1
+endi
+if $data08 != 10 then 
+  return -1
+endi
+if $data09 != 10 then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step5
+
+sql select * from d2.mt
+if $rows != 20 then 
+  return -1
+endi
+
+sql select * from d2.mt where c001 = 1
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from d2.mt where c002 = 2 and c003 = 2
+if $rows != 2 then 
+  return -1
+endi
+
+sql select count(*) from d2.mt
+if $data00 != 20 then 
+  return -1
+endi
+
+sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 20 then 
+  return -1
+endi
+if $data01 != 20 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 90 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 4.500000000 then 
+  return -1
+endi
+if $data08 != 20 then 
+  return -1
+endi
+if $data09 != 20 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..aec0dc3c75031f9c4e167ffae5511ff34e4ec886
--- /dev/null
+++ b/tests/script/general/column/table.sim
@@ -0,0 +1,215 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql create database d1
+sql use d1
+sql create table d1.t1 (ts timestamp, c000 int, c001 int, c002 int, c003 int, c004 int, c005 int, c006 int, c007 int, c008 int, c009 int, c010 int, c011 int, c012 int, c013 int, c014 int, c015 int, c016 int, c017 int, c018 int, c019 int, c020 int, c021 int, c022 int, c023 int, c024 int, c025 int, c026 int, c027 int, c028 int, c029 int, c030 int, c031 int, c032 int, c033 int, c034 int, c035 int, c036 int, c037 int, c038 int, c039 int, c040 int, c041 int, c042 int, c043 int, c044 int, c045 int, c046 int, c047 int, c048 int, c049 int, c050 int, c051 int, c052 int, c053 int, c054 int, c055 int, c056 int, c057 int, c058 int, c059 int, c060 int, c061 int, c062 int, c063 int, c064 int, c065 int, c066 int, c067 int, c068 int, c069 int, c070 int, c071 int, c072 int, c073 int, c074 int, c075 int, c076 int, c077 int, c078 int, c079 int, c080 int, c081 int, c082 int, c083 int, c084 int, c085 int, c086 int, c087 int, c088 int, c089 int, c090 int, c091 int, c092 int, c093 int, c094 int, c095 int, c096 int, c097 int, c098 int, c099 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int, c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 int, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 int, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int, c249 int, c250 int)
+
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step2
+
+sql insert into d1.t1 values (now,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 )
+sql insert into d1.t1 values (now+1m,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )
+sql insert into d1.t1 values (now+2m,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 )
+sql insert into d1.t1 values (now+3m,3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 , 3 )
+sql insert into d1.t1 values (now+4m,4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 )
+sql insert into d1.t1 values (now+5m,5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 , 5 )
+
+sql insert into d1.t1 values (now+6m,6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 , 6 )
+
+sql insert into d1.t1 values (now+7m,7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 , 7 )
+
+sql insert into d1.t1 values (now+8m,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 )
+
+sql insert into d1.t1 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 )
+
+print ======= step3
+
+sql select * from d1.t1
+print select * from d1.t1 => rows $rows
+if $rows != 10 then 
+  return -1
+endi
+
+sql select * from d1.t1 where ts < now + 4m
+print select * from d1.t1 where ts < now + 4m => rows $rows
+if $rows != 5 then 
+  return -1
+endi
+
+sql select * from d1.t1 where c001 = 1
+print select * from d1.t1 where c001 = 1 => rows $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d1.t1 where c002 = 2 and c003 = 2
+print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m
+print select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m => rows $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select count(*) from d1.t1
+print select count(*) from d1.t1 => $data00
+if $data00 != 10 then 
+  return -1
+endi
+
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 2.872281323 then 
+  return -1
+endi
+
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1 
+
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 2.872281323 then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print ==============  step5
+
+sql select * from d1.t1
+print select * from d1.t1 => rows $rows
+if $rows != 10 then 
+  return -1
+endi
+
+sql select * from d1.t1 where c001 = 1
+print select * from d1.t1 where c001 = 1 => rows $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d1.t1 where c002 = 2 and c003 = 2
+print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select count(*) from d1.t1
+print select count(*) from d1.t1 => $data00
+if $data00 != 10 then 
+  return -1
+endi
+
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 2.872281323 then 
+  return -1
+endi
+
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1
+if $data00 != 10 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+if $data02 != 4.500000000 then 
+  return -1
+endi
+if $data03 != 4.500000000 then 
+  return -1
+endi
+if $data04 != 45 then 
+  return -1
+endi
+if $data05 != 9 then 
+  return -1
+endi
+if $data06 != 0 then 
+  return -1
+endi
+if $data07 != 2.872281323 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/column/testSuite.sim b/tests/script/general/column/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f60d197e95dd2285f2b5b155c0d361b8a28bd90e
--- /dev/null
+++ b/tests/script/general/column/testSuite.sim
@@ -0,0 +1,3 @@
+run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b5d653fe83e94045c6f5f7ce7f58104504ad5330
--- /dev/null
+++ b/tests/script/general/compress/commitlog.sim
@@ -0,0 +1,126 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c comp -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = db
+$tbPrefix = tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+$N = 2000
+
+print =============== step1
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591200000000 + $count
+   sql insert into $tb values(  $ms , 1, 0, $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591286400000 + $count
+   sql insert into $tb values(  $ms , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+$x = 0
+step3: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256)) -x step3
+
+$count = 0
+while $count < $N
+   $ms = 1591372800000 + $count
+   sql insert into $tb values(  $ms , 1 , 0 , $count , $count , $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step5
+
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+ 
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi  
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6975f879968107bd142a3595869fc120bc1daa02
--- /dev/null
+++ b/tests/script/general/compress/compress.sim
@@ -0,0 +1,121 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c comp -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = db
+$tbPrefix = tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+$N = 2000
+
+print =============== step1
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591200000000 + $count
+   sql insert into $tb values( $ms , 1, 0, $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591286400000 + $count
+   sql insert into $tb values( $ms , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591372800000 + $count
+   sql insert into $tb values( $ms , 1 , 0 , $count , $count , $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step5
+
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+ 
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi  
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cf96f572ace4a693b1c5640986510d2f5a4d9d74
--- /dev/null
+++ b/tests/script/general/compress/compress2.sim
@@ -0,0 +1,121 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c comp -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = db
+$tbPrefix = tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+$N = 2000
+
+print =============== step1
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591200000000 + $count
+   sql insert into $tb values(  $ms , 1, 0, $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591286400000 + $count
+   sql insert into $tb values( $ms , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591372800000 + $count
+   sql insert into $tb values( $ms , 1 , 0 , $count , $count , $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step5
+
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+ 
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi  
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compress/testSuite.sim b/tests/script/general/compress/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3573985c8a90be4cab0b5abeaa37dbae0b2eefdd
--- /dev/null
+++ b/tests/script/general/compress/testSuite.sim
@@ -0,0 +1,4 @@
+run general/compress/commitlog.sim
+run general/compress/compress2.sim
+run general/compress/compress.sim
+run general/compress/uncompress.sim
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
new file mode 100644
index 0000000000000000000000000000000000000000..13d288451c8031154f2c62fe4e5f8670fad8517a
--- /dev/null
+++ b/tests/script/general/compress/uncompress.sim
@@ -0,0 +1,120 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c comp -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = cp_cp_db
+$tbPrefix = cp_cp_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+$N = 2000
+
+print =============== step1
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591200000000 + $count
+   sql insert into $tb values( $ms , 1, 0, $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591286400000 + $count
+   sql insert into $tb values(  $ms , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, f float, d double, str binary(256))
+
+$count = 0
+while $count < $N
+   $ms = 1591372800000 + $count
+   sql insert into $tb values(  $ms , 1 , 0 , $count , $count , $count , $count , $count ,'it is a string')
+   $count = $count + 1
+endw
+
+sql select * from $tb
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+
+print =============== step5
+
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+
+$i = 1
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi
+ 
+$i = 2
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql use $db
+sql select * from $tb
+print select * from $tb ==> $rows points
+if $rows != $N then 
+  return -1
+endi  
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9a37363a6052e1098d2aa92221044a067b3abee7
--- /dev/null
+++ b/tests/script/general/compute/avg.sim
@@ -0,0 +1,158 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_av_db
+$tbPrefix = m_av_tb
+$mtPrefix = m_av_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select avg(tbcol) from $tb
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step3
+sql select avg(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+sql select avg(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step5
+sql select avg(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data11 != 1.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step6
+sql select avg(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data41 != 4.000000000 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select avg(tbcol) from $mt
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step8
+sql select avg(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step9
+sql select avg(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step10
+sql select avg(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select avg(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim
new file mode 100644
index 0000000000000000000000000000000000000000..592f87651e118c0c7509cfcab26bbad4d9873047
--- /dev/null
+++ b/tests/script/general/compute/bottom.sim
@@ -0,0 +1,99 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_bo_db
+$tbPrefix = m_bo_tb
+$mtPrefix = m_bo_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select bottom(tbcol, 1) from $tb
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select bottom(tbcol, 1) from $tb where ts > now + 4m
+print ===> $data01
+if $data01 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select bottom(tbcol, 1) as b from $tb
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select bottom(tbcol, 2) as b from $tb 
+print ===> $data01  $data11
+if $data01 != 0 then 
+  return -1
+endi
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step6
+sql select bottom(tbcol, 2) as b from $tb where ts > now + 4m
+print ===> $data01  $data11
+if $data01 != 5 then 
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+
+sql select bottom(tbcol, 122) as b from $tb -x step6
+	return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c2ed5af3ca4631ca37bdef4959fd1fc353171e8a
--- /dev/null
+++ b/tests/script/general/compute/count.sim
@@ -0,0 +1,187 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_co_db
+$tbPrefix = m_co_tb
+$mtPrefix = m_co_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+
+sql select count(*) from $tb
+print ===> select count(*) from $tb => $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(1) from $tb
+print ===> select count(1) from $tb => $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(1) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8a60cd00bc745180d6f5d910e34650091b6b8945
--- /dev/null
+++ b/tests/script/general/compute/diff.sim
@@ -0,0 +1,91 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select diff(tbcol) from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select diff(tbcol) from $tb where ts > now + 4m
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select diff(tbcol) from $tb where ts < now + 4m
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step4
+sql select diff(tbcol) as b from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select diff(tbcol) as b from $tb interval(1m) -x step5
+  return -1
+step5:
+
+print =============== step6
+sql select diff(tbcol) as b from $tb where ts < now + 4m interval(1m) -x step6
+  return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0be907c16ae20690e32eb2364f9b169f9e77f302
--- /dev/null
+++ b/tests/script/general/compute/diff2.sim
@@ -0,0 +1,157 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 2
+$rowNum = 10000
+$totalNum = 20000
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 nchar(5), c9 binary(10)) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    $tinyint = $x / 128
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select diff(c1) from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c2) from $tb
+print ===> $data11
+if $data11 != 1.00000 then
+  return -1
+endi
+sql select diff(c3) from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c4) from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c5) from $tb
+print ===> $data11
+if $data11 != 0 then 
+  return -1
+endi
+sql select diff(c6) from $tb
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+sql_error select diff(c7) from $tb
+sql_error select diff(c8) from $tb
+sql_error select diff(c9) from $tb
+sql_error select diff(ts) from $tb
+sql_error select diff(c1), diff(c2) from $tb
+#sql_error select 2+diff(c1) from $tb
+sql_error select diff(c1+2) from $tb
+sql_error select diff(c1) from $tb where ts > 0 and ts < now + 100m interval(10m)
+sql_error select diff(c1) from $mt
+sql_error select diff(diff(c1)) from $tb
+sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
+
+
+print =============== step3
+sql select diff(c1) from $tb where c1 > 5
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c2) from $tb where c2 > 5
+print ===> $data11
+if $data11 != 1.00000 then
+  return -1
+endi
+sql select diff(c3) from $tb where c3 > 5
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c4) from $tb where c4 > 5
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+sql select diff(c5) from $tb where c5 > 5
+print ===> $data11
+if $data11 != 0 then 
+  return -1
+endi
+sql select diff(c6) from $tb where c6 > 5
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step4
+sql select diff(c1) from $tb where c1 > 5 and c2 < $rowNum
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select diff(c1) from $tb where c9 like '%9' and c1 <= 20
+if $rows != 1 then 
+  return -1
+endi
+print ===> $data11
+if $data01 != 10 then 
+  return -1
+endi
+
+print =============== step5
+sql select diff(c1) as b from $tb interval(1m) -x step5
+  return -1
+step5:
+
+print =============== step6
+sql select diff(c1) as b from $tb where ts < now + 4m interval(1m) -x step6
+  return -1
+step6:
+
+print =============== clear
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then 
+#  return -1
+#endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim
new file mode 100644
index 0000000000000000000000000000000000000000..80f4f53cdbe8f498345a5f68e542b9914163485e
--- /dev/null
+++ b/tests/script/general/compute/first.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_fi_db
+$tbPrefix = m_fi_tb
+$mtPrefix = m_fi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select first(tbcol) from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select first(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql select first(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select first(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql select first(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data41 != 4 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select first(tbcol) from $mt
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql select first(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step9
+sql select first(tbcol) as b from $mt interval(1m)
+print select first(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select first(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step10
+sql select first(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select first(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim
new file mode 100644
index 0000000000000000000000000000000000000000..26f40eda5ae78a3f49d1341c8aae25d549fdb52e
--- /dev/null
+++ b/tests/script/general/compute/interval.sim
@@ -0,0 +1,176 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_in_db
+$tbPrefix = m_in_tb
+$mtPrefix = m_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
+print ===> $rows
+if $rows < $rowNum then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now + 4m interval(1m)
+print ===> $rows
+if $rows > 10 then 
+  return -1
+endi
+if $rows < 3 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now+40m and ts > now-1m interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now+40m and ts > now+1m interval(1m) fill(value,0)
+print ===> $rows
+if $rows < 30 then 
+  return -1
+endi
+if $rows > 50 then 
+  return -1
+endi
+if $data21 != 1 then 
+  return -1
+endi
+if $data25 != 1 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now + 4m interval(1m)
+print ===> $rows
+if $rows < 3 then 
+  return -1
+endi
+if $rows > 7 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now+40m and ts > now-1m interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now+40m and ts > now+1m interval(1m) fill(value, 0)
+if $rows < 30 then 
+  return -1
+endi
+if $rows > 50 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0e92bb6d456c92b8158faa59aa18d2bef82995e9
--- /dev/null
+++ b/tests/script/general/compute/last.sim
@@ -0,0 +1,159 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_la_db
+$tbPrefix = m_la_tb
+$mtPrefix = m_la_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select last(tbcol) from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select last(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select last(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select last(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select last(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select last(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select last(tbcol) from $mt
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step8
+sql select last(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select last(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+sql select last(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step9
+sql select last(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select last(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step10
+sql select last(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select last(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/last_row.sim b/tests/script/general/compute/last_row.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cc5cc3edbbf47f57eec723eba007c79fc03f150b
--- /dev/null
+++ b/tests/script/general/compute/last_row.sim
@@ -0,0 +1,175 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_la_db
+$tbPrefix = m_la_tb
+$mtPrefix = m_la_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select last_row(tbcol) from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select last_row(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select last_row(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+
+
+print =============== step7
+sql select last_row(tbcol) from $mt
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step8
+sql select last_row(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select last_row(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+sql select last_row(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+
+
+print =============== step10
+sql select last_row(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+
+sql insert into $tb values(now + 1h, 10) 
+sql insert into $tb values(now + 3h, null) 
+sql insert into $tb values(now + 5h, -1) 
+sql insert into $tb values(now + 7h, null) 
+
+## for super table
+sql select last_row(*) from $mt where ts < now + 6h
+if $data01 != -1 then 
+  return -1
+endi
+
+sql select last_row(*) from $mt where ts < now + 8h
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $mt
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $mt where ts < now + 4h
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $mt where ts > now + 1h and ts < now + 4h
+if $data01 != NULL then 
+  return -1
+endi
+
+## for table
+sql select last_row(*) from $tb where ts < now + 6h
+if $data01 != -1 then 
+  return -1
+endi
+
+sql select last_row(*) from $tb where ts < now + 8h
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $tb
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $tb where ts < now + 4h
+if $data01 != NULL then 
+  return -1
+endi
+
+sql select last_row(*) from $tb where ts > now + 1h and ts < now + 4h
+if $data01 != NULL then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5a28e74bffeed53e3c7202a2dc5d3bf2551ed94b
--- /dev/null
+++ b/tests/script/general/compute/leastsquare.sim
@@ -0,0 +1,100 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_le_db
+$tbPrefix = m_le_tb
+$mtPrefix = m_le_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 2
+  $ms = 1000
+  while $x < $rowNum
+    $ms = $ms + 1000
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select leastsquares(tbcol, 1, 1) from $tb
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step3
+sql select leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step4
+sql select leastsquares(tbcol, 1, 1) as b from $tb
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step5
+sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
+print ===> $data01 
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step6
+sql select leastsquares(tbcol, 1, 1) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+print ===> $rows
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4fc760d66d1391e2b92ffc2fb01d00b4a0136c07
--- /dev/null
+++ b/tests/script/general/compute/max.sim
@@ -0,0 +1,159 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_ma_db
+$tbPrefix = m_ma_tb
+$mtPrefix = m_ma_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select max(tbcol) from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select max(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select max(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select max(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select max(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select max(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select max(tbcol) from $mt
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step8
+sql select max(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select max(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+sql select max(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step9
+sql select max(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select max(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step10
+sql select max(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select max(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim
new file mode 100644
index 0000000000000000000000000000000000000000..82a22b642e3f8f912eadb2a525c4fa1d38a788b3
--- /dev/null
+++ b/tests/script/general/compute/min.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mi_db
+$tbPrefix = m_mi_tb
+$mtPrefix = m_mi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select min(tbcol) from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select min(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql select min(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select min(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select min(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql select min(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select min(tbcol) from $mt
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql select min(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select min(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select min(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step9
+sql select min(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select min(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step10
+sql select min(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select min(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cde95ca77f2ba741581a5ea82554b2b5112f662b
--- /dev/null
+++ b/tests/script/general/compute/null.sim
@@ -0,0 +1,227 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+	
+	$v1 = $x 
+	$v2 = $x
+	if $x == 0 then
+	  $v1 = NULL
+	endi
+    sql insert into $tb values (now + $ms , $v1 , $v2 ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select * from $tb
+print $data00 $data01 $data02
+if $data01 != NULL then
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $rows != 20 then
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 
+if $data00 != 19 then 
+  return -1
+endi
+if $data01 != 20 then 
+  return -1
+endi
+if $data02 != 10.000000000 then 
+  return -1
+endi
+if $data03 != 9.500000000 then 
+  return -1
+endi
+if $data04 != 190 then 
+  return -1
+endi
+if $data05 != 190 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $tb  where tbcol2 = 19
+print ===> $data01 $data02
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 19 then 
+  return -1
+endi
+if $data02 != 19 then 
+  return -1
+endi
+
+sql select * from $tb  where tbcol = NULL -x step3
+  return -1
+step3:
+
+print =============== step5
+sql create table $tb using $mt tags( NULL )
+#  return -1
+#step51:
+
+#sql alter table $tb set tgcol=NULL -x step52
+#  return -1
+#step52:
+
+sql select * from $mt  where tgcol = NULL -x step5
+  return -1
+step5:
+
+print =============== step6
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 
+if $data00 != 190 then 
+  return -1
+endi
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 10.000000000 then 
+  return -1
+endi
+if $data03 != 9.500000000 then 
+  return -1
+endi
+if $data04 != 1900 then 
+  return -1
+endi
+if $data05 != 1900 then 
+  return -1
+endi
+
+print =============== step7
+sql create table t1 (ts timestamp, i bool)
+sql create table t2 (ts timestamp, i smallint)
+sql create table t3 (ts timestamp, i tinyint)
+sql create table t4 (ts timestamp, i int)
+sql create table t5 (ts timestamp, i bigint)
+sql create table t6 (ts timestamp, i float)
+sql create table t7 (ts timestamp, i double)
+sql create table t8 (ts timestamp, i binary(10))
+sql insert into t1 values(now, NULL)
+sql insert into t2 values(now, NULL)
+sql insert into t3 values(now, NULL)
+sql insert into t4 values(now, NULL)
+sql insert into t5 values(now, NULL)
+sql insert into t6 values(now, NULL)
+sql insert into t7 values(now, NULL)
+#sql insert into t8 values(now, NULL)
+
+#sql select * from t1
+#if $rows != 1 then 
+#  return -1
+#endi
+#if $data01 != NULL then 
+#  return -1
+#endi
+
+sql select * from t2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql select * from t3
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql select * from t4
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql select * from t5
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql select * from t6
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql select * from t7
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+#sql select * from t8
+#if $rows != 1 then 
+#  return -1
+#endi
+#if $data01 != NULL then
+#  return -1
+#endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dd309c378943b69e87ea622bbdae133e7899209f
--- /dev/null
+++ b/tests/script/general/compute/percentile.sim
@@ -0,0 +1,116 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_pe_db
+$tbPrefix = m_pe_tb
+$mtPrefix = m_pe_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select percentile(tbcol, 10) from $tb
+print ===> $data00
+if $data00 != 1.900000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 20) from $tb
+print ===> $data00
+if $data00 != 3.800000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 100) from $tb
+print ===> $data00
+if $data00 != 19.000000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 110) from $tb -x step2
+  return -1
+step2:
+
+print =============== step3
+sql select percentile(tbcol, 1) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.140000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 5) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.700000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 0) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+print =============== step4
+sql select percentile(tbcol, 1) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.140000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 5) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.700000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 0) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7cea8726a9ed3d3d8215c97e368df623bb0a1c30
--- /dev/null
+++ b/tests/script/general/compute/stddev.sim
@@ -0,0 +1,98 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_st_db
+$tbPrefix = m_st_tb
+$mtPrefix = m_st_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select stddev(tbcol) from $tb
+print ===> $data00
+if $data00 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step3
+sql select stddev(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 1.414213562 then 
+  return -1
+endi
+
+print =============== step4
+sql select stddev(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step5
+sql select stddev(tbcol) as b from $tb interval(1m)
+print ===> $data01 
+if $data01 != 0.000000000 then 
+  return -1
+endi
+
+sql select stddev(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step6
+sql select stddev(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != 0.000000000 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d05fe8930ecb882a14bd831e27925994179c888c
--- /dev/null
+++ b/tests/script/general/compute/sum.sim
@@ -0,0 +1,159 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_su_db
+$tbPrefix = m_su_tb
+$mtPrefix = m_su_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select sum(tbcol) from $tb
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+print =============== step3
+sql select sum(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select sum(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+print =============== step5
+sql select sum(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select sum(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+print =============== step6
+sql select sum(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select sum(tbcol) from $mt
+print ===> $data00
+if $data00 != 1900 then 
+  return -1
+endi
+
+print =============== step8
+sql select sum(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select sum(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 950 then 
+  return -1
+endi
+
+sql select sum(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select sum(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 < 5 then 
+  return -1
+endi
+
+sql select sum(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+print =============== step10
+sql select sum(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select sum(tbcol) as b from $mt  where ts < now + 4m interval(1d) group by tgcol
+print select sum(tbcol) as b from $mt  where ts < now + 4m interval(1d) group by tgcol
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/compute/testSuite.sim b/tests/script/general/compute/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6cd6badaeec40e6581c127cdf9328de70021a38d
--- /dev/null
+++ b/tests/script/general/compute/testSuite.sim
@@ -0,0 +1,16 @@
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
+run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
+run general/compute/null.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim
new file mode 100644
index 0000000000000000000000000000000000000000..14b3b328a07e46759a17e206f1f3bc5d733e1c16
--- /dev/null
+++ b/tests/script/general/compute/top.sim
@@ -0,0 +1,99 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_to_db
+$tbPrefix = m_to_tb
+$mtPrefix = m_to_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select top(tbcol, 1) from $tb
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select top(tbcol, 1) from $tb where ts < now + 4m
+print ===> $data01
+if $data01 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select top(tbcol, 1) as b from $tb
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select top(tbcol, 2) as b from $tb 
+print ===> $data01  $data11
+if $data01 != 18 then 
+  return -1
+endi
+if $data11 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select top(tbcol, 2) as b from $tb where ts < now + 4m
+print ===> $data01  $data11
+if $data01 != 3 then 
+  return -1
+endi
+if $data11 != 4 then 
+  return -1
+endi
+
+sql select top(tbcol, 122) as b from $tb -x step6
+	return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/connection/connection.sim b/tests/script/general/connection/connection.sim
new file mode 100644
index 0000000000000000000000000000000000000000..abebbacbd94f0a3fc88083f980da77f7b7df8b9b
--- /dev/null
+++ b/tests/script/general/connection/connection.sim
@@ -0,0 +1,21 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============= step1
+sql close
+print close1
+sql connect
+
+print ============= step2
+sql close
+sql connect
+
+print ============= step3
+sql close
+sql connect
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/connection/mqtt.sim b/tests/script/general/connection/mqtt.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4b291f91ea5089018207b11b2016b234dcc2a883
--- /dev/null
+++ b/tests/script/general/connection/mqtt.sim
@@ -0,0 +1,19 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c mqtt -v 1
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+sql create database mqttdb;
+sql create table mqttdb.devices(ts timestamp, value double) tags(name binary(32), model binary(32), serial binary(16), param binary(16), unit binary(16));
+
+sleep 1000
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c8aa2480c509353ede3c6ce6269afa9e6efd62b5
--- /dev/null
+++ b/tests/script/general/db/alter_option.sim
@@ -0,0 +1,280 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============= create database
+sql create database db cache 2 blocks 4 days 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
+sql show databases
+if $data00 != db then 
+  return -1
+endi
+if $data02 != 0 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data06 != 10 then 
+  return -1
+endi
+if $data07 != 20,20,20 then 
+  return -1
+endi
+if $data08 != 2 then 
+  return -1
+endi
+if $data09 != 4 then 
+  return -1
+endi
+
+print ============== step name
+sql_error alter database db name d1
+sql_error alter database db name d2
+
+print ============== step ntables
+sql_error alter database db ntables -1
+sql_error alter database db ntables 0
+sql_error alter database db ntables 1
+sql_error alter database db ntables 10
+
+print ============== step vgroups
+sql_error alter database db vgroups -1
+sql_error alter database db vgroups 0
+sql_error alter database db vgroups 1
+sql_error alter database db vgroups 10
+
+print ============== step replica
+sql_error alter database db replica 2
+sql_error alter database db replica 3
+sql_error alter database db replica 0
+
+sql alter database db replica 1
+sql show databases
+print replica $data4_db
+if $data4_db != 1 then 
+  return -1
+endi
+
+print ============== step quorum
+sql show databases
+print quorum $data5_db
+if $data5_db != 1 then 
+  return -1
+endi
+
+sql alter database db quorum 1
+sql show databases
+print quorum $data5_db
+if $data5_db != 1 then 
+  return -1
+endi
+
+sql alter database db quorum 2
+sql show databases
+print quorum $data5_db
+if $data5_db != 2 then 
+  return -1
+endi
+
+sql alter database db quorum 3
+sql show databases
+print quorum $data5_db
+if $data5_db != 3 then 
+  return -1
+endi
+
+sql alter database db quorum 3
+sql alter database db quorum 2
+sql alter database db quorum 1
+sql_error alter database db quorum 0
+sql_error alter database db quorum 4
+sql_error alter database db quorum 5
+sql_error alter database db quorum -1
+
+print ============== step days
+sql_error alter database db days 0
+sql_error alter database db days 1
+sql_error alter database db days 2
+sql_error alter database db days 10
+sql_error alter database db days 50
+sql_error alter database db days 100
+
+print ============== step keep
+sql show databases
+print keep $data7_db
+if $data7_db != 20,20,20 then 
+  return -1
+endi
+
+sql alter database db keep 10
+sql show databases
+print keep $data7_db
+if $data7_db != 20,20,10 then 
+  return -1
+endi
+
+sql alter database db keep 20
+sql show databases
+print keep $data7_db
+if $data7_db != 20,20,20 then 
+  return -1
+endi
+
+sql alter database db keep 30
+sql show databases
+print keep $data7_db
+if $data7_db != 20,20,30 then 
+  return -1
+endi
+
+sql alter database db keep 40
+sql alter database db keep 30
+sql alter database db keep 20
+sql alter database db keep 10
+sql_error alter database db keep 9
+sql_error alter database db keep 1
+sql alter database db keep 0
+sql alter database db keep -1
+sql_error alter database db keep 365001
+
+print ============== step cache
+sql_error alter database db cache 60
+sql_error alter database db cache 50
+sql_error alter database db cache 20
+sql_error alter database db cache 3
+sql_error alter database db cache 129
+sql_error alter database db cache 300
+sql_error alter database db cache 0
+sql_error alter database db cache -1
+
+print ============== step blocks
+sql show databases
+print blocks $data9_db
+if $data9_db != 4 then 
+  return -1
+endi
+
+sql alter database db blocks 10
+sql show databases
+print blocks $data9_db
+if $data9_db != 10 then 
+  return -1
+endi
+
+sql alter database db blocks 20
+sql show databases
+print blocks $data9_db
+if $data9_db != 20 then 
+  return -1
+endi
+
+sql alter database db blocks 30
+sql show databases
+print blocks $data9_db
+if $data9_db != 30 then 
+  return -1
+endi
+
+sql alter database db blocks 40
+sql alter database db blocks 30
+sql alter database db blocks 20
+sql alter database db blocks 10
+sql_error alter database db blocks 2
+sql_error alter database db blocks 1
+sql alter database db blocks 0
+sql_error alter database db blocks -1
+sql_error alter database db blocks 10001
+
+print ============== step minrows
+sql_error alter database db minrows 1
+sql_error alter database db minrows 100
+sql_error alter database db minrows 1000
+
+print ============== step maxrows
+sql_error alter database db maxrows 1
+sql_error alter database db maxrows 100
+sql_error alter database db maxrows 1000
+
+print ============== step wallevel
+sql show databases
+print wallevel $data12_db
+if $data12_db != 1 then 
+  return -1
+endi
+
+sql alter database db wal 1
+sql show databases
+print wal $data12_db
+if $data12_db != 1 then 
+  return -1
+endi
+
+sql alter database db wal 1
+sql alter database db wal 2
+sql alter database db wal 1
+sql alter database db wal 2
+sql_error alter database db wal 0
+sql_error alter database db wal 3
+sql_error alter database db wal 4
+sql_error alter database db wal -1
+sql_error alter database db wal 1000
+
+print ============== step fsync
+sql alter database db fsync 0
+sql alter database db fsync 1
+sql alter database db fsync 3600
+sql alter database db fsync 18000
+sql alter database db fsync 180000
+sql_error alter database db fsync 180001
+sql_error alter database db fsync -1
+
+print ============== step comp
+sql show databases
+print comp $data14_db
+if $data14_db != 2 then 
+  return -1
+endi
+
+sql alter database db comp 1
+sql show databases
+print comp $data14_db
+if $data14_db != 1 then 
+  return -1
+endi
+
+sql alter database db comp 2
+sql show databases
+print comp $data14_db
+if $data14_db != 2 then 
+  return -1
+endi
+
+sql alter database db comp 0
+sql show databases
+print comp $data14_db
+if $data14_db != 0 then 
+  return -1
+endi
+
+sql_error alter database db comp 3
+sql_error alter database db comp 4
+sql_error alter database db comp 5
+sql_error alter database db comp -1
+
+
+print ============== step precision
+sql_error alter database db prec 'us'
+
+print ============== step status
+sql_error alter database db status 'delete'
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/alter_tables_d2.sim b/tests/script/general/db/alter_tables_d2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9ef39fb55664ad0f984a3a2b4971daa69feec074
--- /dev/null
+++ b/tests/script/general/db/alter_tables_d2.sim
@@ -0,0 +1,490 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 5
+
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 5
+
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sleep 1000
+
+print ============================ step1
+
+sql create database db
+sql create table db.st (ts timestamp, i int) tags(t int)
+sql create table db.t000 using db.st tags(0)
+sql create table db.t001 using db.st tags(1)
+sql create table db.t002 using db.st tags(2)
+sql create table db.t003 using db.st tags(3)
+sql create table db.t004 using db.st tags(4)
+sql create table db.t005 using db.st tags(5)
+sql create table db.t006 using db.st tags(6)
+sql create table db.t007 using db.st tags(7)
+sql create table db.t008 using db.st tags(8)
+sql create table db.t009 using db.st tags(9)
+sql create table db.t010 using db.st tags(0)
+sql create table db.t011 using db.st tags(1)
+sql create table db.t012 using db.st tags(2)
+sql create table db.t013 using db.st tags(3)
+sql create table db.t014 using db.st tags(4)
+sql create table db.t015 using db.st tags(5)
+sql create table db.t016 using db.st tags(6)
+sql create table db.t017 using db.st tags(7)
+sql create table db.t018 using db.st tags(8)
+sql create table db.t019 using db.st tags(9)
+
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+sql insert into db.t000 values(now, 1)
+sql insert into db.t001 values(now, 1)
+sql insert into db.t002 values(now, 1)
+sql insert into db.t003 values(now, 1)
+sql insert into db.t004 values(now, 1)
+sql insert into db.t005 values(now, 1)
+sql insert into db.t006 values(now, 1)
+sql insert into db.t007 values(now, 1)
+sql insert into db.t008 values(now, 1)
+sql insert into db.t009 values(now, 1)
+sql insert into db.t010 values(now, 1)
+sql insert into db.t011 values(now, 1)
+sql insert into db.t012 values(now, 1)
+sql insert into db.t013 values(now, 1)
+sql insert into db.t014 values(now, 1)
+sql insert into db.t015 values(now, 1)
+sql insert into db.t016 values(now, 1)
+sql insert into db.t017 values(now, 1)
+sql insert into db.t018 values(now, 1)
+sql insert into db.t019 values(now, 1)
+
+print ============================ step2
+sql_error create table db.t100 using db.st tags(10)
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+print ============================ step3
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 10
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql create table db.t100 using db.st tags(0)
+sql create table db.t101 using db.st tags(1)
+sql create table db.t102 using db.st tags(2)
+sql create table db.t103 using db.st tags(3)
+sql create table db.t104 using db.st tags(4)
+sql create table db.t105 using db.st tags(5)
+sql create table db.t106 using db.st tags(6)
+sql create table db.t107 using db.st tags(7)
+sql create table db.t108 using db.st tags(8)
+sql create table db.t109 using db.st tags(9)
+sql create table db.t110 using db.st tags(0)
+sql create table db.t111 using db.st tags(1)
+sql create table db.t112 using db.st tags(2)
+sql create table db.t113 using db.st tags(3)
+sql create table db.t114 using db.st tags(4)
+sql create table db.t115 using db.st tags(5)
+sql create table db.t116 using db.st tags(6)
+sql create table db.t117 using db.st tags(7)
+sql create table db.t118 using db.st tags(8)
+sql create table db.t119 using db.st tags(9)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+
+sql insert into db.t100 values(now, 1)
+sql insert into db.t101 values(now, 1)
+sql insert into db.t102 values(now, 1)
+sql insert into db.t103 values(now, 1)
+sql insert into db.t104 values(now, 1)
+sql insert into db.t105 values(now, 1)
+sql insert into db.t106 values(now, 1)
+sql insert into db.t107 values(now, 1)
+sql insert into db.t108 values(now, 1)
+sql insert into db.t109 values(now, 1)
+sql insert into db.t110 values(now, 1)
+sql insert into db.t111 values(now, 1)
+sql insert into db.t112 values(now, 1)
+sql insert into db.t113 values(now, 1)
+sql insert into db.t114 values(now, 1)
+sql insert into db.t115 values(now, 1)
+sql insert into db.t116 values(now, 1)
+sql insert into db.t117 values(now, 1)
+sql insert into db.t118 values(now, 1)
+sql insert into db.t119 values(now, 1)
+
+print ============================ step4
+sql_error create table db.t200 using db.st tags(10)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+print ============================ step5
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 15
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 15
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql create table db.t200 using db.st tags(0)
+sql create table db.t201 using db.st tags(1)
+sql create table db.t202 using db.st tags(2)
+sql create table db.t203 using db.st tags(3)
+sql create table db.t204 using db.st tags(4)
+sql create table db.t205 using db.st tags(5)
+sql create table db.t206 using db.st tags(6)
+sql create table db.t207 using db.st tags(7)
+sql create table db.t208 using db.st tags(8)
+sql create table db.t209 using db.st tags(9)
+sql create table db.t210 using db.st tags(0)
+sql create table db.t211 using db.st tags(1)
+sql create table db.t212 using db.st tags(2)
+sql create table db.t213 using db.st tags(3)
+sql create table db.t214 using db.st tags(4)
+sql create table db.t215 using db.st tags(5)
+sql create table db.t216 using db.st tags(6)
+sql create table db.t217 using db.st tags(7)
+sql create table db.t218 using db.st tags(8)
+sql create table db.t219 using db.st tags(9)
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+sql insert into db.t200 values(now, 1)
+sql insert into db.t201 values(now, 1)
+sql insert into db.t202 values(now, 1)
+sql insert into db.t203 values(now, 1)
+sql insert into db.t204 values(now, 1)
+sql insert into db.t205 values(now, 1)
+sql insert into db.t206 values(now, 1)
+sql insert into db.t207 values(now, 1)
+sql insert into db.t208 values(now, 1)
+sql insert into db.t209 values(now, 1)
+sql insert into db.t210 values(now, 1)
+sql insert into db.t211 values(now, 1)
+sql insert into db.t212 values(now, 1)
+sql insert into db.t213 values(now, 1)
+sql insert into db.t214 values(now, 1)
+sql insert into db.t215 values(now, 1)
+sql insert into db.t216 values(now, 1)
+sql insert into db.t217 values(now, 1)
+sql insert into db.t218 values(now, 1)
+sql insert into db.t219 values(now, 1)
+
+print ============================ step6
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step7
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step8
+sql_error create table db.t300 using db.st tags(10)
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step9
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 20
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql create table db.t300 using db.st tags(0)
+sql create table db.t301 using db.st tags(1)
+sql create table db.t302 using db.st tags(2)
+sql create table db.t303 using db.st tags(3)
+sql create table db.t304 using db.st tags(4)
+sql create table db.t305 using db.st tags(5)
+sql create table db.t306 using db.st tags(6)
+sql create table db.t307 using db.st tags(7)
+sql create table db.t308 using db.st tags(8)
+sql create table db.t309 using db.st tags(9)
+sql create table db.t310 using db.st tags(0)
+sql create table db.t311 using db.st tags(1)
+sql create table db.t312 using db.st tags(2)
+sql create table db.t313 using db.st tags(3)
+sql create table db.t314 using db.st tags(4)
+sql create table db.t315 using db.st tags(5)
+sql create table db.t316 using db.st tags(6)
+sql create table db.t317 using db.st tags(7)
+sql create table db.t318 using db.st tags(8)
+sql create table db.t319 using db.st tags(9)
+
+sql insert into db.t300 values(now, 1)
+sql insert into db.t301 values(now, 1)
+sql insert into db.t302 values(now, 1)
+sql insert into db.t303 values(now, 1)
+sql insert into db.t304 values(now, 1)
+sql insert into db.t305 values(now, 1)
+sql insert into db.t306 values(now, 1)
+sql insert into db.t307 values(now, 1)
+sql insert into db.t308 values(now, 1)
+sql insert into db.t309 values(now, 1)
+sql insert into db.t310 values(now, 1)
+sql insert into db.t311 values(now, 1)
+sql insert into db.t312 values(now, 1)
+sql insert into db.t313 values(now, 1)
+sql insert into db.t314 values(now, 1)
+sql insert into db.t315 values(now, 1)
+sql insert into db.t316 values(now, 1)
+sql insert into db.t317 values(now, 1)
+sql insert into db.t318 values(now, 1)
+sql insert into db.t319 values(now, 1)
+
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step11
+sql_error create table db.t400 using db.st tags(10)
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step9
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 25
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 25
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql create table db.t400 using db.st tags(0)
+sql create table db.t401 using db.st tags(1)
+sql create table db.t402 using db.st tags(2)
+sql create table db.t403 using db.st tags(3)
+sql create table db.t404 using db.st tags(4)
+sql create table db.t405 using db.st tags(5)
+sql create table db.t406 using db.st tags(6)
+sql create table db.t407 using db.st tags(7)
+sql create table db.t408 using db.st tags(8)
+sql create table db.t409 using db.st tags(9)
+sql create table db.t410 using db.st tags(0)
+sql create table db.t411 using db.st tags(1)
+sql create table db.t412 using db.st tags(2)
+sql create table db.t413 using db.st tags(3)
+sql create table db.t414 using db.st tags(4)
+sql create table db.t415 using db.st tags(5)
+sql create table db.t416 using db.st tags(6)
+sql create table db.t417 using db.st tags(7)
+sql create table db.t418 using db.st tags(8)
+sql create table db.t419 using db.st tags(9)
+
+sql insert into db.t400 values(now, 1)
+sql insert into db.t401 values(now, 1)
+sql insert into db.t402 values(now, 1)
+sql insert into db.t403 values(now, 1)
+sql insert into db.t404 values(now, 1)
+sql insert into db.t405 values(now, 1)
+sql insert into db.t406 values(now, 1)
+sql insert into db.t407 values(now, 1)
+sql insert into db.t408 values(now, 1)
+sql insert into db.t409 values(now, 1)
+sql insert into db.t410 values(now, 1)
+sql insert into db.t411 values(now, 1)
+sql insert into db.t412 values(now, 1)
+sql insert into db.t413 values(now, 1)
+sql insert into db.t414 values(now, 1)
+sql insert into db.t415 values(now, 1)
+sql insert into db.t416 values(now, 1)
+sql insert into db.t417 values(now, 1)
+sql insert into db.t418 values(now, 1)
+sql insert into db.t419 values(now, 1)
+
+sql show db.tables
+if $rows != 100 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t400
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 100 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/alter_tables_v1.sim b/tests/script/general/db/alter_tables_v1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dde5eb6d9ecfbce4467a54abf883cc6b9ffbb696
--- /dev/null
+++ b/tests/script/general/db/alter_tables_v1.sim
@@ -0,0 +1,361 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ step1
+
+sql create database db
+sql create table db.st (ts timestamp, i int) tags(t int)
+sql create table db.t0 using db.st tags(0)
+sql create table db.t1 using db.st tags(1)
+sql create table db.t2 using db.st tags(2)
+sql create table db.t3 using db.st tags(3)
+sql create table db.t4 using db.st tags(4)
+sql create table db.t5 using db.st tags(5)
+sql create table db.t6 using db.st tags(6)
+sql create table db.t7 using db.st tags(7)
+sql create table db.t8 using db.st tags(8)
+sql create table db.t9 using db.st tags(9)
+
+sql show db.tables
+if $rows != 10 then 
+  return -1
+endi
+
+sql insert into db.t0 values(now, 1)
+sql insert into db.t1 values(now, 1)
+sql insert into db.t2 values(now, 1)
+sql insert into db.t3 values(now, 1)
+sql insert into db.t4 values(now, 1)
+sql insert into db.t5 values(now, 1)
+sql insert into db.t6 values(now, 1)
+sql insert into db.t7 values(now, 1)
+sql insert into db.t8 values(now, 1)
+sql insert into db.t9 values(now, 1)
+
+print ============================ step2
+sql_error create table db.t10 using db.st tags(10)
+sql show db.tables
+if $rows != 10 then 
+  return -1
+endi
+
+print ============================ step3
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t10 using db.st tags(0)
+sql create table db.t11 using db.st tags(1)
+sql create table db.t12 using db.st tags(2)
+sql create table db.t13 using db.st tags(3)
+sql create table db.t14 using db.st tags(4)
+sql create table db.t15 using db.st tags(5)
+sql create table db.t16 using db.st tags(6)
+sql create table db.t17 using db.st tags(7)
+sql create table db.t18 using db.st tags(8)
+sql create table db.t19 using db.st tags(9)
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+sql insert into db.t10 values(now, 1)
+sql insert into db.t11 values(now, 1)
+sql insert into db.t12 values(now, 1)
+sql insert into db.t13 values(now, 1)
+sql insert into db.t14 values(now, 1)
+sql insert into db.t15 values(now, 1)
+sql insert into db.t16 values(now, 1)
+sql insert into db.t17 values(now, 1)
+sql insert into db.t18 values(now, 1)
+sql insert into db.t19 values(now, 1)
+
+print ============================ step4
+sql_error create table db.t20 using db.st tags(10)
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+print ============================ step5
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 30
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t20 using db.st tags(0)
+sql create table db.t21 using db.st tags(1)
+sql create table db.t22 using db.st tags(2)
+sql create table db.t23 using db.st tags(3)
+sql create table db.t24 using db.st tags(4)
+sql create table db.t25 using db.st tags(5)
+sql create table db.t26 using db.st tags(6)
+sql create table db.t27 using db.st tags(7)
+sql create table db.t28 using db.st tags(8)
+sql create table db.t29 using db.st tags(9)
+sql show db.tables
+if $rows != 30 then 
+  return -1
+endi
+
+sql insert into db.t20 values(now, 1)
+sql insert into db.t21 values(now, 1)
+sql insert into db.t22 values(now, 1)
+sql insert into db.t23 values(now, 1)
+sql insert into db.t24 values(now, 1)
+sql insert into db.t25 values(now, 1)
+sql insert into db.t26 values(now, 1)
+sql insert into db.t27 values(now, 1)
+sql insert into db.t28 values(now, 1)
+sql insert into db.t29 values(now, 1)
+
+print ============================ step6
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t10
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t20
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 30 then 
+  return -1
+endi
+
+print ============================ step7
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 30 then 
+  return -1
+endi
+
+sql select * from db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t10
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t20
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 30 then 
+  return -1
+endi
+
+print ============================ step8
+sql_error create table db.t30 using db.st tags(10)
+sql show db.tables
+if $rows != 30 then 
+  return -1
+endi
+
+print ============================ step9
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 40
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t30 using db.st tags(0)
+sql create table db.t31 using db.st tags(1)
+sql create table db.t32 using db.st tags(2)
+sql create table db.t33 using db.st tags(3)
+sql create table db.t34 using db.st tags(4)
+sql create table db.t35 using db.st tags(5)
+sql create table db.t36 using db.st tags(6)
+sql create table db.t37 using db.st tags(7)
+sql create table db.t38 using db.st tags(8)
+sql create table db.t39 using db.st tags(9)
+
+sql insert into db.t30 values(now, 1)
+sql insert into db.t31 values(now, 1)
+sql insert into db.t32 values(now, 1)
+sql insert into db.t33 values(now, 1)
+sql insert into db.t34 values(now, 1)
+sql insert into db.t35 values(now, 1)
+sql insert into db.t36 values(now, 1)
+sql insert into db.t37 values(now, 1)
+sql insert into db.t38 values(now, 1)
+sql insert into db.t39 values(now, 1)
+
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t10
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t20
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t30
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 40 then 
+  return -1
+endi
+
+
+print ============================ step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+sql select * from db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t10
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t20
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 40 then 
+  return -1
+endi
+
+print ============================ step11
+sql_error create table db.t40 using db.st tags(10)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+print ============================ step12
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 50
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t40 using db.st tags(0)
+sql create table db.t41 using db.st tags(1)
+sql create table db.t42 using db.st tags(2)
+sql create table db.t43 using db.st tags(3)
+sql create table db.t44 using db.st tags(4)
+sql create table db.t45 using db.st tags(5)
+sql create table db.t46 using db.st tags(6)
+sql create table db.t47 using db.st tags(7)
+sql create table db.t48 using db.st tags(8)
+sql create table db.t49 using db.st tags(9)
+
+sql insert into db.t40 values(now, 1)
+sql insert into db.t41 values(now, 1)
+sql insert into db.t42 values(now, 1)
+sql insert into db.t43 values(now, 1)
+sql insert into db.t44 values(now, 1)
+sql insert into db.t45 values(now, 1)
+sql insert into db.t46 values(now, 1)
+sql insert into db.t47 values(now, 1)
+sql insert into db.t48 values(now, 1)
+sql insert into db.t49 values(now, 1)
+
+sql show db.tables
+if $rows != 50 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t10
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t20
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t30
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t40
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 50 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/alter_tables_v4.sim b/tests/script/general/db/alter_tables_v4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7c9262874d8f07cef92df2585fe60261ea763080
--- /dev/null
+++ b/tests/script/general/db/alter_tables_v4.sim
@@ -0,0 +1,464 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 5
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ step1
+
+sql create database db
+sql create table db.st (ts timestamp, i int) tags(t int)
+sql create table db.t000 using db.st tags(0)
+sql create table db.t001 using db.st tags(1)
+sql create table db.t002 using db.st tags(2)
+sql create table db.t003 using db.st tags(3)
+sql create table db.t004 using db.st tags(4)
+sql create table db.t005 using db.st tags(5)
+sql create table db.t006 using db.st tags(6)
+sql create table db.t007 using db.st tags(7)
+sql create table db.t008 using db.st tags(8)
+sql create table db.t009 using db.st tags(9)
+sql create table db.t010 using db.st tags(0)
+sql create table db.t011 using db.st tags(1)
+sql create table db.t012 using db.st tags(2)
+sql create table db.t013 using db.st tags(3)
+sql create table db.t014 using db.st tags(4)
+sql create table db.t015 using db.st tags(5)
+sql create table db.t016 using db.st tags(6)
+sql create table db.t017 using db.st tags(7)
+sql create table db.t018 using db.st tags(8)
+sql create table db.t019 using db.st tags(9)
+
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+sql insert into db.t000 values(now, 1)
+sql insert into db.t001 values(now, 1)
+sql insert into db.t002 values(now, 1)
+sql insert into db.t003 values(now, 1)
+sql insert into db.t004 values(now, 1)
+sql insert into db.t005 values(now, 1)
+sql insert into db.t006 values(now, 1)
+sql insert into db.t007 values(now, 1)
+sql insert into db.t008 values(now, 1)
+sql insert into db.t009 values(now, 1)
+sql insert into db.t010 values(now, 1)
+sql insert into db.t011 values(now, 1)
+sql insert into db.t012 values(now, 1)
+sql insert into db.t013 values(now, 1)
+sql insert into db.t014 values(now, 1)
+sql insert into db.t015 values(now, 1)
+sql insert into db.t016 values(now, 1)
+sql insert into db.t017 values(now, 1)
+sql insert into db.t018 values(now, 1)
+sql insert into db.t019 values(now, 1)
+
+print ============================ step2
+sql_error create table db.t100 using db.st tags(10)
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+print ============================ step3
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t100 using db.st tags(0)
+sql create table db.t101 using db.st tags(1)
+sql create table db.t102 using db.st tags(2)
+sql create table db.t103 using db.st tags(3)
+sql create table db.t104 using db.st tags(4)
+sql create table db.t105 using db.st tags(5)
+sql create table db.t106 using db.st tags(6)
+sql create table db.t107 using db.st tags(7)
+sql create table db.t108 using db.st tags(8)
+sql create table db.t109 using db.st tags(9)
+sql create table db.t110 using db.st tags(0)
+sql create table db.t111 using db.st tags(1)
+sql create table db.t112 using db.st tags(2)
+sql create table db.t113 using db.st tags(3)
+sql create table db.t114 using db.st tags(4)
+sql create table db.t115 using db.st tags(5)
+sql create table db.t116 using db.st tags(6)
+sql create table db.t117 using db.st tags(7)
+sql create table db.t118 using db.st tags(8)
+sql create table db.t119 using db.st tags(9)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+
+sql insert into db.t100 values(now, 1)
+sql insert into db.t101 values(now, 1)
+sql insert into db.t102 values(now, 1)
+sql insert into db.t103 values(now, 1)
+sql insert into db.t104 values(now, 1)
+sql insert into db.t105 values(now, 1)
+sql insert into db.t106 values(now, 1)
+sql insert into db.t107 values(now, 1)
+sql insert into db.t108 values(now, 1)
+sql insert into db.t109 values(now, 1)
+sql insert into db.t110 values(now, 1)
+sql insert into db.t111 values(now, 1)
+sql insert into db.t112 values(now, 1)
+sql insert into db.t113 values(now, 1)
+sql insert into db.t114 values(now, 1)
+sql insert into db.t115 values(now, 1)
+sql insert into db.t116 values(now, 1)
+sql insert into db.t117 values(now, 1)
+sql insert into db.t118 values(now, 1)
+sql insert into db.t119 values(now, 1)
+
+print ============================ step4
+sql_error create table db.t200 using db.st tags(10)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+print ============================ step5
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 15
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t200 using db.st tags(0)
+sql create table db.t201 using db.st tags(1)
+sql create table db.t202 using db.st tags(2)
+sql create table db.t203 using db.st tags(3)
+sql create table db.t204 using db.st tags(4)
+sql create table db.t205 using db.st tags(5)
+sql create table db.t206 using db.st tags(6)
+sql create table db.t207 using db.st tags(7)
+sql create table db.t208 using db.st tags(8)
+sql create table db.t209 using db.st tags(9)
+sql create table db.t210 using db.st tags(0)
+sql create table db.t211 using db.st tags(1)
+sql create table db.t212 using db.st tags(2)
+sql create table db.t213 using db.st tags(3)
+sql create table db.t214 using db.st tags(4)
+sql create table db.t215 using db.st tags(5)
+sql create table db.t216 using db.st tags(6)
+sql create table db.t217 using db.st tags(7)
+sql create table db.t218 using db.st tags(8)
+sql create table db.t219 using db.st tags(9)
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+sql insert into db.t200 values(now, 1)
+sql insert into db.t201 values(now, 1)
+sql insert into db.t202 values(now, 1)
+sql insert into db.t203 values(now, 1)
+sql insert into db.t204 values(now, 1)
+sql insert into db.t205 values(now, 1)
+sql insert into db.t206 values(now, 1)
+sql insert into db.t207 values(now, 1)
+sql insert into db.t208 values(now, 1)
+sql insert into db.t209 values(now, 1)
+sql insert into db.t210 values(now, 1)
+sql insert into db.t211 values(now, 1)
+sql insert into db.t212 values(now, 1)
+sql insert into db.t213 values(now, 1)
+sql insert into db.t214 values(now, 1)
+sql insert into db.t215 values(now, 1)
+sql insert into db.t216 values(now, 1)
+sql insert into db.t217 values(now, 1)
+sql insert into db.t218 values(now, 1)
+sql insert into db.t219 values(now, 1)
+
+print ============================ step6
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step7
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step8
+sql_error create table db.t300 using db.st tags(10)
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+print ============================ step9
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t300 using db.st tags(0)
+sql create table db.t301 using db.st tags(1)
+sql create table db.t302 using db.st tags(2)
+sql create table db.t303 using db.st tags(3)
+sql create table db.t304 using db.st tags(4)
+sql create table db.t305 using db.st tags(5)
+sql create table db.t306 using db.st tags(6)
+sql create table db.t307 using db.st tags(7)
+sql create table db.t308 using db.st tags(8)
+sql create table db.t309 using db.st tags(9)
+sql create table db.t310 using db.st tags(0)
+sql create table db.t311 using db.st tags(1)
+sql create table db.t312 using db.st tags(2)
+sql create table db.t313 using db.st tags(3)
+sql create table db.t314 using db.st tags(4)
+sql create table db.t315 using db.st tags(5)
+sql create table db.t316 using db.st tags(6)
+sql create table db.t317 using db.st tags(7)
+sql create table db.t318 using db.st tags(8)
+sql create table db.t319 using db.st tags(9)
+
+sql insert into db.t300 values(now, 1)
+sql insert into db.t301 values(now, 1)
+sql insert into db.t302 values(now, 1)
+sql insert into db.t303 values(now, 1)
+sql insert into db.t304 values(now, 1)
+sql insert into db.t305 values(now, 1)
+sql insert into db.t306 values(now, 1)
+sql insert into db.t307 values(now, 1)
+sql insert into db.t308 values(now, 1)
+sql insert into db.t309 values(now, 1)
+sql insert into db.t310 values(now, 1)
+sql insert into db.t311 values(now, 1)
+sql insert into db.t312 values(now, 1)
+sql insert into db.t313 values(now, 1)
+sql insert into db.t314 values(now, 1)
+sql insert into db.t315 values(now, 1)
+sql insert into db.t316 values(now, 1)
+sql insert into db.t317 values(now, 1)
+sql insert into db.t318 values(now, 1)
+sql insert into db.t319 values(now, 1)
+
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step11
+sql_error create table db.t400 using db.st tags(10)
+sql show db.tables
+if $rows != 80 then 
+  return -1
+endi
+
+print ============================ step12
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 25
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+sql create table db.t400 using db.st tags(0)
+sql create table db.t401 using db.st tags(1)
+sql create table db.t402 using db.st tags(2)
+sql create table db.t403 using db.st tags(3)
+sql create table db.t404 using db.st tags(4)
+sql create table db.t405 using db.st tags(5)
+sql create table db.t406 using db.st tags(6)
+sql create table db.t407 using db.st tags(7)
+sql create table db.t408 using db.st tags(8)
+sql create table db.t409 using db.st tags(9)
+sql create table db.t410 using db.st tags(0)
+sql create table db.t411 using db.st tags(1)
+sql create table db.t412 using db.st tags(2)
+sql create table db.t413 using db.st tags(3)
+sql create table db.t414 using db.st tags(4)
+sql create table db.t415 using db.st tags(5)
+sql create table db.t416 using db.st tags(6)
+sql create table db.t417 using db.st tags(7)
+sql create table db.t418 using db.st tags(8)
+sql create table db.t419 using db.st tags(9)
+
+sql insert into db.t400 values(now, 1)
+sql insert into db.t401 values(now, 1)
+sql insert into db.t402 values(now, 1)
+sql insert into db.t403 values(now, 1)
+sql insert into db.t404 values(now, 1)
+sql insert into db.t405 values(now, 1)
+sql insert into db.t406 values(now, 1)
+sql insert into db.t407 values(now, 1)
+sql insert into db.t408 values(now, 1)
+sql insert into db.t409 values(now, 1)
+sql insert into db.t410 values(now, 1)
+sql insert into db.t411 values(now, 1)
+sql insert into db.t412 values(now, 1)
+sql insert into db.t413 values(now, 1)
+sql insert into db.t414 values(now, 1)
+sql insert into db.t415 values(now, 1)
+sql insert into db.t416 values(now, 1)
+sql insert into db.t417 values(now, 1)
+sql insert into db.t418 values(now, 1)
+sql insert into db.t419 values(now, 1)
+
+sql show db.tables
+if $rows != 100 then 
+  return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t300
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t400
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 100 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/alter_vgroups.sim b/tests/script/general/db/alter_vgroups.sim
new file mode 100644
index 0000000000000000000000000000000000000000..13928cf03301f1528db3a1fd9e5951b3115a6125
--- /dev/null
+++ b/tests/script/general/db/alter_vgroups.sim
@@ -0,0 +1,210 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ step1
+
+sql create database db
+sql create table db.st (ts timestamp, i int) tags(t int)
+sql create table db.t000 using db.st tags(0)
+sql create table db.t001 using db.st tags(1)
+sql create table db.t002 using db.st tags(2)
+sql create table db.t003 using db.st tags(3)
+sql create table db.t004 using db.st tags(4)
+sql create table db.t005 using db.st tags(5)
+sql create table db.t006 using db.st tags(6)
+sql create table db.t007 using db.st tags(7)
+sql create table db.t008 using db.st tags(8)
+sql create table db.t009 using db.st tags(9)
+sql create table db.t010 using db.st tags(0)
+sql create table db.t011 using db.st tags(1)
+sql create table db.t012 using db.st tags(2)
+sql create table db.t013 using db.st tags(3)
+sql create table db.t014 using db.st tags(4)
+sql create table db.t015 using db.st tags(5)
+sql create table db.t016 using db.st tags(6)
+sql create table db.t017 using db.st tags(7)
+sql create table db.t018 using db.st tags(8)
+sql create table db.t019 using db.st tags(9)
+
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+sql insert into db.t000 values(now, 1)
+sql insert into db.t001 values(now, 1)
+sql insert into db.t002 values(now, 1)
+sql insert into db.t003 values(now, 1)
+sql insert into db.t004 values(now, 1)
+sql insert into db.t005 values(now, 1)
+sql insert into db.t006 values(now, 1)
+sql insert into db.t007 values(now, 1)
+sql insert into db.t008 values(now, 1)
+sql insert into db.t009 values(now, 1)
+sql insert into db.t010 values(now, 1)
+sql insert into db.t011 values(now, 1)
+sql insert into db.t012 values(now, 1)
+sql insert into db.t013 values(now, 1)
+sql insert into db.t014 values(now, 1)
+sql insert into db.t015 values(now, 1)
+sql insert into db.t016 values(now, 1)
+sql insert into db.t017 values(now, 1)
+sql insert into db.t018 values(now, 1)
+sql insert into db.t019 values(now, 1)
+
+print ============================ step2
+sql_error create table db.t100 using db.st tags(10)
+sql show db.tables
+if $rows != 20 then 
+  return -1
+endi
+
+print ============================ step3
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 2
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t100 using db.st tags(0)
+sql create table db.t101 using db.st tags(1)
+sql create table db.t102 using db.st tags(2)
+sql create table db.t103 using db.st tags(3)
+sql create table db.t104 using db.st tags(4)
+sql create table db.t105 using db.st tags(5)
+sql create table db.t106 using db.st tags(6)
+sql create table db.t107 using db.st tags(7)
+sql create table db.t108 using db.st tags(8)
+sql create table db.t109 using db.st tags(9)
+sql create table db.t110 using db.st tags(0)
+sql create table db.t111 using db.st tags(1)
+sql create table db.t112 using db.st tags(2)
+sql create table db.t113 using db.st tags(3)
+sql create table db.t114 using db.st tags(4)
+sql create table db.t115 using db.st tags(5)
+sql create table db.t116 using db.st tags(6)
+sql create table db.t117 using db.st tags(7)
+sql create table db.t118 using db.st tags(8)
+sql create table db.t119 using db.st tags(9)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+
+sql insert into db.t100 values(now, 1)
+sql insert into db.t101 values(now, 1)
+sql insert into db.t102 values(now, 1)
+sql insert into db.t103 values(now, 1)
+sql insert into db.t104 values(now, 1)
+sql insert into db.t105 values(now, 1)
+sql insert into db.t106 values(now, 1)
+sql insert into db.t107 values(now, 1)
+sql insert into db.t108 values(now, 1)
+sql insert into db.t109 values(now, 1)
+sql insert into db.t110 values(now, 1)
+sql insert into db.t111 values(now, 1)
+sql insert into db.t112 values(now, 1)
+sql insert into db.t113 values(now, 1)
+sql insert into db.t114 values(now, 1)
+sql insert into db.t115 values(now, 1)
+sql insert into db.t116 values(now, 1)
+sql insert into db.t117 values(now, 1)
+sql insert into db.t118 values(now, 1)
+sql insert into db.t119 values(now, 1)
+
+print ============================ step4
+sql_error create table db.t200 using db.st tags(10)
+sql show db.tables
+if $rows != 40 then 
+  return -1
+endi
+
+print ============================ step5
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 3
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql create table db.t200 using db.st tags(0)
+sql create table db.t201 using db.st tags(1)
+sql create table db.t202 using db.st tags(2)
+sql create table db.t203 using db.st tags(3)
+sql create table db.t204 using db.st tags(4)
+sql create table db.t205 using db.st tags(5)
+sql create table db.t206 using db.st tags(6)
+sql create table db.t207 using db.st tags(7)
+sql create table db.t208 using db.st tags(8)
+sql create table db.t209 using db.st tags(9)
+sql create table db.t210 using db.st tags(0)
+sql create table db.t211 using db.st tags(1)
+sql create table db.t212 using db.st tags(2)
+sql create table db.t213 using db.st tags(3)
+sql create table db.t214 using db.st tags(4)
+sql create table db.t215 using db.st tags(5)
+sql create table db.t216 using db.st tags(6)
+sql create table db.t217 using db.st tags(7)
+sql create table db.t218 using db.st tags(8)
+sql create table db.t219 using db.st tags(9)
+sql show db.tables
+if $rows != 60 then 
+  return -1
+endi
+
+sql insert into db.t200 values(now, 1)
+sql insert into db.t201 values(now, 1)
+sql insert into db.t202 values(now, 1)
+sql insert into db.t203 values(now, 1)
+sql insert into db.t204 values(now, 1)
+sql insert into db.t205 values(now, 1)
+sql insert into db.t206 values(now, 1)
+sql insert into db.t207 values(now, 1)
+sql insert into db.t208 values(now, 1)
+sql insert into db.t209 values(now, 1)
+sql insert into db.t210 values(now, 1)
+sql insert into db.t211 values(now, 1)
+sql insert into db.t212 values(now, 1)
+sql insert into db.t213 values(now, 1)
+sql insert into db.t214 values(now, 1)
+sql insert into db.t215 values(now, 1)
+sql insert into db.t216 values(now, 1)
+sql insert into db.t217 values(now, 1)
+sql insert into db.t218 values(now, 1)
+sql insert into db.t219 values(now, 1)
+
+print ============================ step6
+
+sql reset query cache
+sleep 1000
+
+sql select * from db.t000
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t100
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.t200
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from db.st
+if $rows != 60 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/back_insert.sim b/tests/script/general/db/back_insert.sim
new file mode 100644
index 0000000000000000000000000000000000000000..642df63ff280c6b2c41ef68e645b43fd0c998386
--- /dev/null
+++ b/tests/script/general/db/back_insert.sim
@@ -0,0 +1,9 @@
+sql connect
+$x = 1
+begin:
+  sql reset query cache
+  sleep 1000 
+  sql insert into db.tb values(now, $x ) -x begin  
+  #print ===> insert successed $x 
+  $x = $x + 1   
+goto begin
\ No newline at end of file
diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim
new file mode 100644
index 0000000000000000000000000000000000000000..29771fc97815c6781cfa3e44fbbfa81760859633
--- /dev/null
+++ b/tests/script/general/db/backup/keep.sim
@@ -0,0 +1,209 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnode1 as master
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ========= start other dnodes
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+print ======== step1 create db
+sql create database keepdb replica 1 keep 30 days 7
+sql use keepdb
+sql create table tb (ts timestamp, i int)
+
+$x = 1
+while $x < 41
+  $time = $x . d
+  sql insert into tb values (now + $time , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != 40 then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+print ======== step2 stop dnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows >= 40 then
+	return -1
+endi
+if $rows <= 20 then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+$num1 = $rows + 40
+
+print ======== step3 alter db
+sql alter database keepdb keep 60
+sleep 1000
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data05 != 7 then 
+  return -1
+endi
+if $data06 != 60 then 
+  return -1
+endi
+
+print ======== step4 insert data
+$x = 41
+while $x < 81
+  $time = $x . d
+  sql insert into tb values (now + $time , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != $num1  then
+	return -1
+endi
+if $data01 != 80 then
+	return -1
+endi
+
+print ======== step5 stop dnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows >= $num1 then
+	return -1
+endi
+if $rows <= 50 then
+	return -1
+endi
+if $data01 != 80 then
+	return -1
+endi
+
+print ======== step6 alter db
+sql alter database keepdb keep 30
+sleep 1000
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data05 != 7 then 
+  return -1
+endi
+if $data06 != 30 then 
+  return -1
+endi
+
+print ======== step7 stop dnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 3000
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows >= 40 then
+	return -1
+endi
+if $rows <= 20 then
+	return -1
+endi
+if $data01 != 80 then
+	return -1
+endi
+
+$num3 = $rows + 40
+
+print ======== step8 insert data
+$x = 81
+while $x < 121
+  $time = $x . d
+  sql insert into tb values (now + $time , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != $num3  then
+	return -1
+endi
+if $data01 != 120 then
+	return -1
+endi
+
+print ======== step9 alter db
+sql alter database keepdb keep -1 -x error1
+  return -1
+error1:
+
+sql alter database keepdb keep 0 -x error2
+  return -1
+error2:
+
+sql alter database keepdb days 1 -x error3
+  return -1
+error3:
+
+print ======= test success
+ 
\ No newline at end of file
diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1c4939256be82541f40e34d5c89ea4c1f67de288
--- /dev/null
+++ b/tests/script/general/db/basic.sim
@@ -0,0 +1,195 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = ob_db_db
+$tbPrefix = ob_db_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db replica 1 days 20 keep 2000 cache 16
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data00 != $db then 
+  return -1
+endi
+if $data02 != 0 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data06 != 20 then 
+  return -1
+endi
+if $data08 != 16 then 
+  return -1
+endi
+ 
+print =============== step2
+sql create database $db
+sql show databases
+if $rows != 1 then 
+  return -1
+endi 
+
+print =============== step3
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi 
+
+print =============== step4
+sql_error drop database $db
+
+print =============== step5
+sql create database $db replica 1 days 15 keep 1500
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data00 != $db then 
+  return -1
+endi
+if $data02 != 0 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data06 != 15 then 
+  return -1
+endi
+
+print =============== step6
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+$i = 1
+while $i < 4
+  $db = $dbPrefix . $i
+  $tb = $tbPrefix . $i
+  sql create database $db
+  sql use $db
+  sql create table $tb (ts timestamp, speed int)
+  $i = $i + 1
+endw
+
+sql show databases
+if $rows != 4 then 
+  return -1
+endi
+
+$i = 4
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+print =============== step7
+$i = 0
+while $i < 5
+  $db = $dbPrefix . $i  
+  sql drop database $db 
+  $i = $i + 1
+endw
+
+print =============== step8
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step9
+sql drop database $db
+
+print =============== step10
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step11
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step12
+sql drop database $db
+
+print =============== step13
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values (now+1a, 0)
+sql insert into $tb values (now+2a, 1)
+sql insert into $tb values (now+3a, 2)
+sql insert into $tb values (now+4a, 3)
+sql insert into $tb values (now+5a, 4)
+sql select * from $tb
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql drop database $db
+
+print =============== step15
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step16
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..302c5ac40992271e9ef757cb9704beb377a75d16
--- /dev/null
+++ b/tests/script/general/db/basic1.sim
@@ -0,0 +1,62 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database
+sql create database d1
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
+
+print =============== drop database
+sql drop database d1
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== more databases
+sql create database d2
+sql create database d3
+sql create database d4
+sql show databases
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== drop database
+sql drop database d2
+sql drop database d3
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d4 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..afe5ee5d95402fac985b9c5673fb43e35a285f22
--- /dev/null
+++ b/tests/script/general/db/basic2.sim
@@ -0,0 +1,54 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql use d1
+sql create table t1 (ts timestamp, i int);
+sql create table t2 (ts timestamp, i int);
+sql create table t3 (ts timestamp, i int);
+sql create table t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show tables
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== create database d2
+sql create database d2
+sql use d2
+sql create table t1 (ts timestamp, i int);
+sql create table t2 (ts timestamp, i int);
+sql create table t3 (ts timestamp, i int);
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+
+sql show tables
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..88f5bf64604d2f1f6bd11040de844e871808c566
--- /dev/null
+++ b/tests/script/general/db/basic3.sim
@@ -0,0 +1,52 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== create database d2
+sql create database d2
+sql create table d2.t1 (ts timestamp, i int);
+sql create table d2.t2 (ts timestamp, i int);
+sql create table d2.t3 (ts timestamp, i int);
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+
+sql show d2.tables
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a0a9aaa627fd643b2863b14a4cacb93f092104b0
--- /dev/null
+++ b/tests/script/general/db/basic4.sim
@@ -0,0 +1,115 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+print =============== drop table 
+sql drop table d1.t1
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 3 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 3 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+if $data01 != 3 then 
+  return -1
+endi
+
+print =============== drop all table 
+sql drop table d1.t2
+sql drop table d1.t3
+sql drop table d1.t4
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 0 then 
+  return -1
+endi
+
+if $data03 != 0 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 0 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..82b9bf9bf4dadf2c0215626d8905a64cc0962fe3
--- /dev/null
+++ b/tests/script/general/db/basic5.sim
@@ -0,0 +1,57 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database d1
+sql create database d1
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql create table d1.t4 (ts timestamp, i int);
+
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != d1 then 
+  return -1
+endi
+
+if $data02 != 4 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.tables
+if $rows != 4 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 2 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+print =============== drop database
+sql drop database d1
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+sql_error show d1.vgroups
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete.sim b/tests/script/general/db/delete.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e4d40bf5da267985066f61383c6614dee78aaff1
--- /dev/null
+++ b/tests/script/general/db/delete.sim
@@ -0,0 +1,66 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 10
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database db blocks 3
+sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$tbPrefix = db.t
+$i = 0
+while $i < 2000
+  $tb = $tbPrefix . $i
+  sql create table $tb using db.mt tags( $i )
+  $i = $i + 1
+endw 
+
+sql show db.vgroups
+if $rows != 10 then 
+  return -1
+endi 
+
+return
+print ======== step2
+sleep 1000
+sql drop database db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi 
+
+sleep 1000
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 0 then
+	return -1
+endi
+
+print ======= step3
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start 
+
+$x = 0
+step3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+
+sql show mnodes
+print dnode1 role $data2_1
+if $data2_1 != master then
+  goto step3
+endi
+
+sleep 1000
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..feeb0152c1d8dc707a327f89ebf95e242b35294b
--- /dev/null
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -0,0 +1,107 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d1 replica 1
+sql create database d2 replica 1
+sql create database d3 replica 1
+sql create database d4 replica 1
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d2.t2 values(now, 1)
+sql insert into d1.t1 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql drop database d1
+sleep 1000
+sql insert into d1.t1 values(now, 2) -x step2
+  return -1
+step2:
+
+print ========= step3
+sql reset query cache
+sleep 1000
+sql create database d1 replica 1
+sql create table d1.t1 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 2)
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+print ========= step4
+$x = 0
+while $x < 20
+
+  sql drop database d1
+  sleep 1000
+  sql insert into d1.t1 values(now, -1) -x step4
+    return -1
+  step4:
+  
+  sql create database d1 replica 1
+  sql reset query cache
+  sleep 1000
+  sql create table d1.t1 (ts timestamp, i int)
+  sql insert into d1.t1 values(now, $x )
+  sql select * from d1.t1
+  if $rows != 1 then
+	return -1
+  endi
+  
+  $x = $x + 1
+  
+  print ===> loop times: $x
+endw 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9053e8af011674162174a718c52d157b1e70984a
--- /dev/null
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -0,0 +1,117 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql reset query cache
+
+print ======== step1 
+sql create database d1 replica 1
+sql create database d2 replica 1
+sql create database d3 replica 1
+sql create database d4 replica 1
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d2.t2 values(now, 1)
+sql insert into d1.t1 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql drop database d1
+sleep 1000
+sql insert into d1.t1 values(now, 2) -x step2
+  return -1
+step2:
+
+print ========= step3
+sql create database db1 replica 1
+sql reset query cache
+sleep 1000  
+sql create table db1.tb1 (ts timestamp, i int)
+sql insert into db1.tb1 values(now, 2)
+sql select * from db1.tb1
+if $rows != 1 then
+	return -1
+endi
+
+print ========= step4
+$x = 1
+while $x < 20
+
+  $db = db . $x 
+  $tb = tb . $x
+  sql use $db
+  sql drop database $db
+  
+  sleep 1000
+  sql insert into $tb values(now, -1) -x step4
+    return -1
+  step4:
+  
+  $x = $x + 1  
+  $db = db . $x 
+  $tb = tb . $x
+  
+  sql reset query cache
+  sleep 1000
+  
+  sql create database $db replica 1
+  sql use $db
+  sql create table $tb (ts timestamp, i int)
+  sql insert into $tb values(now, $x )
+  sql select * from $tb
+  if $rows != 1 then
+	return -1
+  endi
+  
+  print ===> loop times: $x
+endw 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5781c384fe9bfd9ac804a3cd85a3e88a1e4bc278
--- /dev/null
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -0,0 +1,108 @@
+system sh/stop_dnodes.sh
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/deploy.sh -n dnode1 -i 1
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1 
+
+$tbPrefix = t
+$i = 0
+while $i < 30
+  $db = db . $i
+  sql create database $db
+  sql use $db
+
+  $tb = $tbPrefix . $i
+  sql create table $tb (ts timestamp, i int);
+
+  sql insert into $tb values(now, 1);
+
+  sleep 1000
+  sql drop database $db
+
+  print times $i
+  $i = $i + 1
+
+endw 
+
+print ======== step2
+sleep 1000
+sql show databases
+if $rows != 0 then 
+  return -1
+endi 
+
+system sh/stop_dnodes.sh
+sleep 3000
+
+system sh/deploy.sh -n dnode1 -i 1
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ======== step1
+
+$tbPrefix = t
+$i = 0
+while $i < 10
+  $db = db . $i
+  sql create database $db
+  sql use $db
+
+  sql create table st (ts timestamp, i int) tags(j int);
+  $tb = $tbPrefix . $i
+  $tb = $tb . a
+
+    $tb1 = $tb . 1
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 2
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 3
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 5
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 5
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 6
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 7
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 8
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+  sleep 1000
+  sql drop database $db
+
+  print times $i
+  $i = $i + 1
+
+endw
+
+print ======== step2
+sleep 1000
+sql show databases
+if $rows != 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0db2440b3bcd92a9fa252f387be22767ae1f7d7c
--- /dev/null
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ======== step1
+
+sql create database db;
+sql use db
+
+$tbPrefix = t
+$i = 0
+while $i < 10
+
+  sql create table st (ts timestamp, i int) tags(j int);
+  $tb = $tbPrefix . $i
+  $tb = $tb . a
+
+    $tb1 = $tb . 1
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 2
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 3
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 4
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 5
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 6
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 7
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+    $tb1 = $tb . 8
+    sql create table $tb1 using st tags(1)
+    sql insert into  $tb1 values(now, 1);
+
+  sql drop table st
+
+  sleep 2000
+  print times $i
+  $i = $i + 1
+
+endw
+
+print ======== step2
+sleep 1000
+sql drop database db
+sql show databases
+if $rows != 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..93d41b2fa37190e86133c47b087bc0a6a2cb71f1
--- /dev/null
+++ b/tests/script/general/db/delete_writing1.sim
@@ -0,0 +1,52 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database db 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+
+print ======== start back
+run_back general/db/back_insert.sim
+sleep 1000
+
+print ======== step1 
+$x = 1 	
+while $x < 20
+
+    print drop database times $x
+	sql drop database db -x step1
+	step1:
+
+	sql create database db 
+	sql create table db.tb (ts timestamp, i int)
+
+	sleep 3000
+	
+	$x = $x + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3ea220cb8ce9ab2e30ab4c57652b3e35add56452
--- /dev/null
+++ b/tests/script/general/db/delete_writing2.sim
@@ -0,0 +1,47 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database db 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+
+sql create database db2
+sql create table db2.tb2 (ts timestamp, i int)
+sql insert into db2.tb2 values(now, 1)
+
+sql create database db3 
+sql create table db3.tb3 (ts timestamp, i int)
+sql insert into db3.tb3 values(now, 1)
+
+sql create database db4 
+sql create table db4.tb4 (ts timestamp, i int)
+sql insert into db4.tb4 values(now, 1)
+
+print ======== start back
+run_back general/db/back_insert.sim
+sleep 1000
+
+print ======== step1 
+$x = 1 	
+while $x < 10
+
+    print drop database times $x
+	sql drop database db -x step1
+	step1:
+
+	sql create database db 
+	sql create table db.tb (ts timestamp, i int)
+
+	sleep 3000
+	
+	$x = $x + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/dropdnodes.sim b/tests/script/general/db/dropdnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c7bbdf73a4b6b6e1f236c7cc920a43def08bd013
--- /dev/null
+++ b/tests/script/general/db/dropdnodes.sim
@@ -0,0 +1,107 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel            -v 2
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel            -v 2
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+
+print ==========  prepare data
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+
+sleep 3000
+sql connect 
+
+sql create dnode $hostname2
+sleep 2000
+
+sql create database db
+sql use db
+
+print ==========  step1
+sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
+sql create table db.t1 using db.mt tags(1)
+sql create table db.t2 using db.mt tags(2)
+sql create table db.t3 using db.mt tags(3)
+sql create table db.t4 using db.mt tags(4)
+sql create table db.t5 using db.mt tags(5)
+sql create table db.t6 using db.mt tags(6)
+sql create table db.t7 using db.mt tags(7)
+sql create table db.t8 using db.mt tags(8)
+sql create table db.t9 using db.mt tags(9)
+sql create table db.t10 using db.mt tags(10)
+sql create table db.t11 using db.mt tags(11)
+sql create table db.t12 using db.mt tags(12)
+sql create table db.t13 using db.mt tags(13)
+sql create table db.t14 using db.mt tags(14)
+sql create table db.t15 using db.mt tags(15)
+sql create table db.t16 using db.mt tags(16)
+
+sql insert into db.t1 values(now, 1)
+sql insert into db.t2 values(now, 1)
+sql insert into db.t3 values(now, 1)
+sql insert into db.t4 values(now, 1)
+sql insert into db.t5 values(now, 1)
+sql insert into db.t6 values(now, 1)
+sql insert into db.t7 values(now, 1)
+sql insert into db.t8 values(now, 1)
+sql insert into db.t9 values(now, 1)
+sql insert into db.t10 values(now, 1)
+sql insert into db.t11 values(now, 1)
+sql insert into db.t12 values(now, 1)
+sql insert into db.t13 values(now, 1)
+sql insert into db.t14 values(now, 1)
+sql insert into db.t15 values(now, 1)
+sql insert into db.t16 values(now, 1)
+
+print ========== step2
+sql show tables
+print $rows
+if $rows != 16 then
+  return -1
+endi  
+
+sql select * from mt
+print $rows
+if $rows != 16 then
+  return -1
+endi  
+
+print ========== step3
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+sql drop dnode $hostname2
+sleep 2000
+
+print ========== step3
+
+sql show tables
+print $rows
+if $rows != 8 then
+  return -1
+endi  
+
+sql select * from mt
+print $rows
+if $rows != 8 then
+  return -1
+endi  
+
+sql select * from db.t5
+if $rows != 1 then
+  return -1
+endi  
+
+sql select * from db.t13
+if $rows != 1 then
+  return -1
+endi  
+
+sql_error select * from db.t1
+sql_error select * from db.t9
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..30abcbe10010cd4a6bca8285c9d526133e9ea1f3
--- /dev/null
+++ b/tests/script/general/db/len.sim
@@ -0,0 +1,95 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== step1
+sql_error drop database dd
+
+sql create database -x step1
+	return -1
+step1:
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create database a
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database a
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create database a12345678
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database a12345678
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create database a012345678901201234567890120123456789012a012345678901201234567890120123456789012 -x step4
+	return -1
+step4:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create database a;1 
+sql drop database a
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql create database a'1 -x step6
+	return -1
+step6:
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step7
+sql create database (a) -x step7
+	return -1
+step7:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql create database a.1 -x step8
+	return -1
+step8:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim
new file mode 100644
index 0000000000000000000000000000000000000000..aaa103234d1e3206adce7511e4ac5e105b2dc6c4
--- /dev/null
+++ b/tests/script/general/db/repeat.sim
@@ -0,0 +1,70 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ============================ dnode1 start
+
+sql create database d1
+sql create table d1.t1(ts timestamp, i int)
+
+sql create database d2
+sql create table d2.t1(ts timestamp, i int)
+
+sql create database d3
+sql create table d3.t1(ts timestamp, i int)
+
+sql create database d4
+sql create table d4.t1(ts timestamp, i int)
+
+sleep 3000
+
+sql drop database d1
+sql drop database d2
+sql drop database d3
+sql drop database d4
+sleep 3000
+
+sql create database d5
+sql create table d5.t1(ts timestamp, i int)
+
+sql create database d6
+sql create table d6.t1(ts timestamp, i int)
+
+sql create database d7
+sql create table d7.t1(ts timestamp, i int)
+
+sql create database d8
+sql create table d8.t1(ts timestamp, i int)
+
+sleep 3000
+
+sql drop database d5
+sql drop database d6
+sql drop database d7
+sql drop database d8
+
+sleep 3000
+
+sql create database d9;
+sql create table d9.t1(ts timestamp, i int)
+
+sql create database d10;
+sql create table d10.t1(ts timestamp, i int)
+
+sql create database d11
+sql create table d11.t1(ts timestamp, i int)
+
+sql create database d12
+sql create table d12.t1(ts timestamp, i int)
+
+sql drop database d9
+sql drop database d10
+sql drop database d11
+sql drop database d12
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/show_create_db.sim b/tests/script/general/db/show_create_db.sim
new file mode 100644
index 0000000000000000000000000000000000000000..baa7b253e12154c5d320dd6d8411e223ce1cd4e2
--- /dev/null
+++ b/tests/script/general/db/show_create_db.sim
@@ -0,0 +1,32 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== step2
+sql create database db
+sql show create database db
+
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql use db
+sql show create database db
+
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != db then 
+  return -1
+endi  
+
+sql drop database db
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/db/show_create_table.sim b/tests/script/general/db/show_create_table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..83386387093a7c4f778bb5696eea6019fd4691fa
--- /dev/null
+++ b/tests/script/general/db/show_create_table.sim
@@ -0,0 +1,87 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ===============create three type table
+sql create database db
+sql use db
+sql create table meters(ts timestamp, f binary(8)) tags(loc int, zone binary(8))
+sql create table t0 using meters tags(1,'ch')
+sql create table normalTbl(ts timestamp, zone binary(8))
+
+sql use db
+sql show create table meters 
+if $rows != 1 then 
+  return -1
+endi
+
+print ===============check sub table
+sql show create table t0
+if $rows != 1 then 
+  return -1
+endi
+if $data00 == 't0' then
+  return -1
+endi
+
+print ===============check normal table
+
+sql show create table normalTbl 
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 == 'normalTbl' then
+  return -1
+endi
+
+print ===============check super table
+sql show create table meters 
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 == 'meters' then
+  return -1
+endi
+
+print ===============check sub table with prefix
+
+sql show create table db.t0
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 == 't0' then
+  return -1
+endi
+
+print ===============check normal table with prefix
+sql show create table db.normalTbl 
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 == 'normalTbl' then
+  return -1
+endi
+
+
+print ===============check super table with prefix
+sql show create table db.meters 
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 == 'meters' then
+  return -1
+endi
+
+sql drop database db
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d700bf80689a8d0413b59e13382fdf213ee9c4ec
--- /dev/null
+++ b/tests/script/general/db/tables.sim
@@ -0,0 +1,135 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== step2
+sql create database db
+sql show databases
+print $rows $data07
+
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql use db
+sql create table t1 (ts timestamp, i int)
+sql create table t2 (ts timestamp, i int)
+sql create table t3 (ts timestamp, i int)
+sql create table t4 (ts timestamp, i int)
+sql create table t11 (ts timestamp, i int)
+sql create table t12 (ts timestamp, i int)
+sql create table t13 (ts timestamp, i int)
+sql create table t14 (ts timestamp, i int)
+sql create table t21 (ts timestamp, i int)
+sql create table t22 (ts timestamp, i int)
+sql create table t23 (ts timestamp, i int)
+sql create table t24 (ts timestamp, i int)
+sql create table t31 (ts timestamp, i int)
+sql create table t32 (ts timestamp, i int)
+sql create table t33 (ts timestamp, i int)
+sql create table t34 (ts timestamp, i int)
+
+print =============== step4
+sql insert into t1 values(now, 1)
+sql insert into t2 values(now, 2)
+sql insert into t3 values(now, 3)
+sql insert into t4 values(now, 4)
+sql insert into t11 values(now, 1)
+sql insert into t22 values(now, 2)
+sql insert into t33 values(now, 3)
+sql insert into t34 values(now, 4)
+
+print =============== step5
+sql select * from t1
+if $data01 != 1 then
+  return -1
+endi
+
+sql select * from t2
+if $data01 != 2 then
+  return -1
+endi
+
+sql select * from t3
+if $data01 != 3 then
+  return -1
+endi
+
+sql select * from t4
+if $data01 != 4 then
+  return -1
+endi
+
+print =============== step6
+sql drop database db
+sql reset query cache
+sleep 4000
+
+print =============== step7
+sql create database db
+sql show databases
+print $rows $data07
+
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step8
+sql use db
+sql create table t1 (ts timestamp, i int)
+sql create table t2 (ts timestamp, i int)
+sql create table t3 (ts timestamp, i int)
+sql create table t4 (ts timestamp, i int)
+sql create table t11 (ts timestamp, i int)
+sql create table t12 (ts timestamp, i int)
+sql create table t13 (ts timestamp, i int)
+sql create table t14 (ts timestamp, i int)
+sql create table t21 (ts timestamp, i int)
+sql create table t22 (ts timestamp, i int)
+sql create table t23 (ts timestamp, i int)
+sql create table t24 (ts timestamp, i int)
+sql create table t31 (ts timestamp, i int)
+sql create table t32 (ts timestamp, i int)
+sql create table t33 (ts timestamp, i int)
+sql create table t34 (ts timestamp, i int)
+
+print =============== step9
+sql insert into t1 values(now, 1)
+sql insert into t2 values(now, 2)
+sql insert into t3 values(now, 3)
+sql insert into t4 values(now, 4)
+sql insert into t11 values(now, 1)
+sql insert into t22 values(now, 2)
+sql insert into t33 values(now, 3)
+sql insert into t34 values(now, 4)
+
+print =============== step10
+sql select * from t1
+if $data01 != 1 then
+  return -1
+endi
+
+sql select * from t2
+if $data01 != 2 then
+  return -1
+endi
+
+sql select * from t3
+if $data01 != 3 then
+  return -1
+endi
+
+sql select * from t4
+if $data01 != 4 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..87863001a3dfab6bb16a9919910b5e7bedd7863d
--- /dev/null
+++ b/tests/script/general/db/testSuite.sim
@@ -0,0 +1,16 @@
+run general/db/basic.sim
+run general/db/basic1.sim
+run general/db/basic2.sim
+run general/db/basic3.sim
+run general/db/basic4.sim
+run general/db/basic5.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
+run general/db/vnodes.sim
diff --git a/tests/script/general/db/vnodes.sim b/tests/script/general/db/vnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b01e94206fa33978b359b6c40576284f69b74d87
--- /dev/null
+++ b/tests/script/general/db/vnodes.sim
@@ -0,0 +1,47 @@
+system sh/stop_dnodes.sh
+
+$totalVnodes = 10
+$maxTables = 4
+$totalRows = $totalVnodes * $maxTables
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel            -v 0
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode   -v $maxTables
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
+system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000
+system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000
+system sh/cfg.sh -n dnode1 -c maxShellConns       -v 100000
+system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 100000
+
+print ==========  prepare data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect 
+sql create database db blocks 3 cache 1
+sql use db
+
+print ==========  step1
+sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$x = 0
+while $x < $totalRows
+  $tb = t . $x
+  sql create table $tb using mt tags( $x )
+  sql insert into $tb values (now, $x ) 
+  $x = $x + 1
+endw 
+
+print ========== step2
+sql select * from mt
+print $rows
+print $totalRows
+if $rows != $totalRows then
+  return -1
+endi  
+
+sql select count(*) from mt
+if $data00 != $totalRows then
+  return -1
+endi  
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..28506b7cb82456ce424be5052a1f41269dcd56a3
--- /dev/null
+++ b/tests/script/general/field/2.sim
@@ -0,0 +1,297 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol2 bool, tbcol int) TAGS(tgcol bool, tgcol2 int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 and tbcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 and tbcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d)  group by tgcol order by tgcol desc
+print $db
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d)  group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..453f4968bfe1be218886bf958aaab44a287ba914
--- /dev/null
+++ b/tests/script/general/field/3.sim
@@ -0,0 +1,521 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 int, tbcol3 float) TAGS(tgcol1 smallint, tgcol2 int, tgcol3 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step16
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step17
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..243424724fa8a487f8b8ea5394014c5913b097de
--- /dev/null
+++ b/tests/script/general/field/4.sim
@@ -0,0 +1,711 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 bigint, tbcol3 float, tbcol4 double) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step20
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ca1543b54bf83ee40b077e2542e43e7e5c8e4c03
--- /dev/null
+++ b/tests/script/general/field/5.sim
@@ -0,0 +1,834 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 tinyint, tbcol2 int, tbcol3 bigint, tbcol4 double, tbcol5 smallint) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tbcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step27
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim
new file mode 100644
index 0000000000000000000000000000000000000000..23223e5c1502105b5df13f9d9cad5ad12b08944c
--- /dev/null
+++ b/tests/script/general/field/6.sim
@@ -0,0 +1,989 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 bigint, tbcol3 smallint, tbcol4 bigint, tbcol5 float, tbcol6 bool) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 float, tgcol6 bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1, 1, 1  ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tbcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where tbcol6 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol6 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step22
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step23
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step24
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1 and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1 and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1 and tbcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step27
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 and tbcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step28
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step29
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1  and tbcol6 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step30
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 and tbcol6 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step31
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1  and tbcol6 = 1 interval(1d) group by tgcol6 order by tgcol6 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..10060f7422f50ccbb36b118d9dbfbc7729059e3f
--- /dev/null
+++ b/tests/script/general/field/bigint.sim
@@ -0,0 +1,162 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bigint) TAGS(tgcol bigint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $data00 != 100 then
+  print expect 100, actual $data00
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b51f023efe0bb768f90fc2f9e682363d208d0410
--- /dev/null
+++ b/tests/script/general/field/binary.sim
@@ -0,0 +1,77 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol binary(10)) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '0' ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '1' ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+
+print =============== step2
+
+sql select * from $mt where tbcol = '0' 
+if $rows != 100 then
+  return -1
+endi
+
+sql select * from $mt where ts > now + 4m and tbcol = '1'
+if $rows != 75 then
+  return -1
+endi
+
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol 
+
+#can't filter binary fields
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4528f79bc79ddb9fb6c2eeeb54c13384eec7df99
--- /dev/null
+++ b/tests/script/general/field/bool.sim
@@ -0,0 +1,161 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bool) TAGS(tgcol bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
+print select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..40650cb9bdbc3908892a6e6ee1958fa62c90d6bb
--- /dev/null
+++ b/tests/script/general/field/double.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol double) TAGS(tgcol double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0ead9fb48a424e5d2c5d2ff3b69a6ecc21fbf540
--- /dev/null
+++ b/tests/script/general/field/float.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol float) TAGS(tgcol float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a095dc2176ad75c0123c7dcc9a1e0a5a1c75d75f
--- /dev/null
+++ b/tests/script/general/field/int.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8540608e96aacfe50dc346a0bf4217f8c38db7b7
--- /dev/null
+++ b/tests/script/general/field/single.sim
@@ -0,0 +1,218 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$rowNum = 20
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, tbcol int)
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+ 
+print =============== step2
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 10
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 8
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 8 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10
+if $rows != 10 then 
+  return -1
+endi
+if $data91 != 9 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol <= 10
+if $rows != 11 then 
+  return -1
+endi
+if $data81 != 8 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10
+if $rows != 9 then 
+  return -1
+endi
+if $data81 != 19 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10 order by ts asc
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 11 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and tbcol > 5 order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 9 then 
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and tbcol > 5  order by ts asc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 6 then 
+  return -1
+endi
+if $data31 != 9 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10 and tbcol < 5  order by ts asc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 10 and ts < now + 4m
+print  select * from $tb where tbcol = 10 and ts < now + 4m
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 4 and ts < now + 4m order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10  and ts < now + 4m order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and ts > now + 4m and ts < now + 5m order by ts desc
+print $rows $data00 $data01
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(*) from $tb
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol = 10
+if $data00 != 1 then 
+  return -1
+endi
+
+#sql select count(*) from $tb where tbcol = 8 or tbcol = 9
+#if $data00 != 2 then 
+#  return -1
+#endi
+
+sql select count(*) from $tb where tbcol < 10
+if $data00 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol <= 10
+if $data00 != 11 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and tbcol > 5
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and tbcol > 5 order by ts asc -x step4
+#  return -1
+step4:
+
+print =============== step5
+sql select count(*) from $tb where ts < now + 4m
+if $data00 != 5 then 
+  return -1
+endi
+
+#sql select count(*) from $tb where tbcol = 10 and ts < now + 4m
+#if $data00 != 0 then 
+#  return -1
+#endi
+
+sql select count(*) from $tb where tbcol = 4 and ts < now + 4m
+if $data00 != 1 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10  and ts < now + 4m
+if $data00 != 5 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and ts > now + 4m and ts < now + 5m
+if $data00 != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..578de4ea442b87bea61f24db8c24b71efe0e2621
--- /dev/null
+++ b/tests/script/general/field/smallint.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol smallint) TAGS(tgcol smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/field/testSuite.sim b/tests/script/general/field/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d12f0ebbd4df84f837104ab5078ba22b70a8034d
--- /dev/null
+++ b/tests/script/general/field/testSuite.sim
@@ -0,0 +1,14 @@
+# run general/field/single.sim
+run general/field/bool.sim
+run general/field/smallint.sim
+run general/field/tinyint.sim
+run general/field/int.sim
+run general/field/bigint.sim
+run general/field/float.sim
+run general/field/double.sim
+# run general/field/binary.sim
+# run general/field/2.sim
+# run general/field/3.sim
+# run general/field/4.sim
+# run general/field/5.sim
+# run general/field/6.sim
diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f132b427025d4c706cdcf09b4ede678e36fbaaf8
--- /dev/null
+++ b/tests/script/general/field/tinyint.sim
@@ -0,0 +1,161 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol tinyint) TAGS(tgcol tinyint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/autocreate.sim b/tests/script/general/http/autocreate.sim
new file mode 100644
index 0000000000000000000000000000000000000000..98d64ab839df11d17bd6d9036a53fcc087b69ea8
--- /dev/null
+++ b/tests/script/general/http/autocreate.sim
@@ -0,0 +1,33 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database db
+sql use db
+sql create table if not exists db.win_cpu(ts timestamp,f_percent_dpc_time double,f_percent_idle_time double,f_percent_interrupt_time double,f_percent_privileged_time double,f_percent_processor_time double,f_percent_user_time double) tags(t_host binary(32),t_instance binary(32),t_objectname binary(32));
+
+print ===============  step2 - auto create
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'import into db.win_cpu_windows_1_processor using db.win_cpu tags('windows','1','Processor') values(1564641722000,0.000000,95.598305,0.000000,0.000000,0.000000,0.000000);' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+#if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
+#  return -1
+#endi
+
+sql select * from db.win_cpu_windows_1_processor
+print rows: $rows
+if $rows != 1 then
+  return -1
+endi
+
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/bug.go b/tests/script/general/http/bug.go
new file mode 100644
index 0000000000000000000000000000000000000000..61991f4d023dcf21bef7eda0b2bde43c5dd40eb7
--- /dev/null
+++ b/tests/script/general/http/bug.go
@@ -0,0 +1,329 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+	"flag"
+)
+
+var (
+	token    string
+	url      string
+	config   Config
+	request  int64
+	period   int64
+	errorNum int64
+)
+
+type Config struct {
+	HostIp       string `json:"hostIp"`
+	ConnNum      int    `json:"connNum"`
+	InsertModel  string `json:"insertModel"`
+	WaitTime     int    `json:"waitTime"`
+	TableDesc    string `json:"tableDesc"`
+	TablePrefix  string `json:"tablePrefix"`
+	TablePerConn int    `json:"tablePerConn"`
+	TableCreate  bool   `json:"tableCreate"`
+	TableStart   int    `json:"tableStart"`
+	DbName       string `json:"dbName"`
+	DbReplica    int    `json:"dbReplica"`
+	DbKeep       int    `json:"dbKeep"`
+	DbDays       int    `json:"dbDays"`
+	MetricsName  string `json:"metricsName"`
+	TagNum       int    `json:"tagNum"`
+	DataNum      int    `json:"dataNum"`
+	DataBegin    int64  `json:"dataBegin"`
+	DataInterval int    `json:"dataInterval"`
+	DataBatch    int    `json:"dataBatch"`
+	DataInsert   bool   `json:"dataInsert"`
+	DataRandom   bool   `json:"dataRandom"`
+}
+
+type TokenResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Desc   string `json:"desc"`
+}
+
+type JsonResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+}
+
+func readFile(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("taos_cloud.json not found")
+		panic(err)
+	}
+	defer file.Close()
+
+	dec := json.NewDecoder(file)
+	err = dec.Decode(&config)
+	if err != nil {
+		println("taos_cloud.json parse error")
+		panic(err)
+	}
+
+	if config.TagNum <= 0 {
+		config.TagNum = 1
+	}
+	request = 0
+	period = 0
+	errorNum = 0
+
+	fmt.Println("================config parameters======================")
+	fmt.Println("HostIp:", config.HostIp)
+	fmt.Println("connNum:", config.ConnNum)
+	fmt.Println("insertModel:", config.InsertModel)
+	fmt.Println("waitTime:", config.WaitTime)
+	fmt.Println("tableDesc:", config.TableDesc)
+	fmt.Println("tablePrefix:", config.TablePrefix)
+	fmt.Println("tablePerConn:", config.TablePerConn)
+	fmt.Println("tableCreate:", config.TableCreate)
+	fmt.Println("tableStart:", config.TableStart)
+	fmt.Println("dbName:", config.DbName)
+	fmt.Println("dbReplica:", config.DbReplica)
+	fmt.Println("dbKeep:", config.DbKeep)
+	fmt.Println("dbDays:", config.DbDays)
+	fmt.Println("metricsName:", config.MetricsName)
+	fmt.Println("tagNum:", config.TagNum)
+	fmt.Println("dataNum:", config.DataNum)
+	fmt.Println("dataBegin:", config.DataBegin)
+	fmt.Println("dataInterval:", config.DataInterval)
+	fmt.Println("dataBatch:", config.DataBatch)
+	fmt.Println("dataInsert:", config.DataInsert)
+	fmt.Println("dataRandom:", config.DataRandom)
+
+	fmt.Println("================http token=============================")
+	token, err = getToken()
+	url = fmt.Sprintf("http://%s:%d/rest/sql", config.HostIp, 6020)
+
+	fmt.Println("httpToken:", token)
+	fmt.Println("httpUrl:", url)
+
+	if err != nil {
+		panic(err)
+	}
+}
+
+func getToken() (string, error) {
+	resp, err := http.Get(fmt.Sprintf("http://%s:%d/rest/login/%s/%s", config.HostIp, 6020, "root", "taosdata"))
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+
+	var tokenResult TokenResult
+
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = json.Unmarshal(data, &tokenResult)
+	if err != nil {
+		return "", err
+	}
+
+	if tokenResult.Status != "succ" {
+		fmt.Println("get http token failed")
+		fmt.Println(tokenResult)
+		return "", err
+	}
+
+	return tokenResult.Desc, nil
+}
+
+func exec(client *http.Client, sql string) {
+	for times := 0; times < 10; times++ {
+
+		req, err1 := http.NewRequest("POST", url, bytes.NewReader([]byte(sql)))
+		if err1 != nil {
+			continue
+		}
+		req.Header.Add("Authorization", "Taosd "+token)
+
+		begin := time.Now()
+		resp, err := client.Do(req)
+
+		if err != nil {
+			continue
+		}
+
+		data, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		spend := (time.Since(begin).Nanoseconds())
+
+		var jsonResult JsonResult
+		err = json.Unmarshal(data, &jsonResult)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		if jsonResult.Status != "succ" {
+			resp.Body.Close()
+			continue
+		}
+		atomic.AddInt64(&request, 1)
+		if (request < 103) {
+			return
+		}
+		
+		atomic.AddInt64(&period, spend)
+		if request%5000 == 0 && request != 0 {
+			requestAvg := float64(period) / float64(1000000) / float64(request)
+			qps := float64(1000) / float64(requestAvg) * float64(config.ConnNum)
+			dps := qps * float64(config.DataBatch)
+			fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+		}
+		return
+	}
+	fmt.Println("xxxx>sql:", sql, ", retryTimes:", 10)
+	errorNum++
+}
+
+func insertTable(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	
+	for j := 0; j < config.DataNum; j++ {
+		for i := 0; i < config.TablePerConn; i++ {
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart + 1
+			tbIndex := i + tbStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+			
+			sql := fmt.Sprintf("import into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			exec(client, sql)
+			time.Sleep(time.Millisecond * time.Duration(10))
+		}
+	}
+}
+
+func insertLoop(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	for j := 0; j < config.DataNum; j++ {
+
+		for i := 0; i < config.TablePerConn; i++ {
+			tbIndex := i + tbStart
+
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+
+			sql := fmt.Sprintf("insert into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			for k := 1; k < config.DataBatch; k++ {
+				tmVal := int64(j)*int64(config.DataInterval) + int64(k) + tmStart
+
+				dataVal := j + k
+				if config.DataRandom {
+					dataVal = rand.Intn(1000)
+				}
+				sql += fmt.Sprintf("values(%d, %d)", tmVal, dataVal)
+			}
+
+			j += (config.DataBatch - 1)
+
+			exec(client, sql)
+
+			if config.WaitTime != 0 {
+				time.Sleep(time.Millisecond * time.Duration(config.WaitTime))
+			}
+		}
+
+	}
+}
+
+func insertTb(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	if !config.DataInsert {
+		return
+	}
+
+	if config.InsertModel == "insertTable" {
+		insertTable(conn)
+	} else {
+		insertLoop(conn)
+	}
+}
+
+func selectData(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	client := &http.Client{}
+
+	
+	tbStart := conn*config.TablePerConn + config.TableStart
+	for j := 0; j < config.DataNum; j++ {
+		tbIndex := 0 + tbStart
+		sql := fmt.Sprintf("select max(i),min(i) from db.mt where tbname in ('%s%d'", config.TablePrefix, tbIndex)
+		for i := 1; i < 2000; i++ {
+			tbIndex := i + tbStart
+			sql += fmt.Sprintf(",'%s%d'", config.TablePrefix, tbIndex)
+		}
+		sql += ") group by orgno"
+		
+		//sql := fmt.Sprintf("select count(*) from db.mt")
+		//sql := fmt.Sprintf("select max(i),min(i) from db.mt", config.TablePrefix, tbIndex)
+		
+		exec(client, sql)
+		time.Sleep(time.Millisecond * time.Duration(10))
+	}
+}
+
+func main() {
+	filename := flag.String("config", "taos_cloud.json", "config file name")
+	
+	flag.Parse()
+	
+	readFile(*filename)
+	
+	fmt.Println("\n================http test start======================")
+
+	var wg sync.WaitGroup
+
+	fmt.Println("\n================select data  ========================")
+	
+
+	for i := 0; i < config.ConnNum; i++ {
+		wg.Add(1)
+		go insertTb(&wg, i)
+	}
+	for i := 0; i < config.ConnNum; i++ {
+		wg.Add(1)
+		go selectData(&wg, i)
+	}
+	wg.Wait()
+
+	fmt.Println("\n================http test stop ======================")
+}
diff --git a/tests/script/general/http/chunked.sim b/tests/script/general/http/chunked.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6592c761c6ccaea94f385ac72982115c775f01d7
--- /dev/null
+++ b/tests/script/general/http/chunked.sim
@@ -0,0 +1,37 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c maxSQLLength -v 340032
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database d1
+sql use d1
+
+sql create table table_rest (ts timestamp, i int) 
+print sql length is 270KB
+restful d1 table_rest 1591072800 10000
+restful d1 table_rest 1591172800 10000
+restful d1 table_rest 1591272800 10000
+restful d1 table_rest 1591372800 10000
+restful d1 table_rest 1591472800 10000
+restful d1 table_rest 1591572800 10000
+restful d1 table_rest 1591672800 10000
+restful d1 table_rest 1591772800 10000
+restful d1 table_rest 1591872800 10000
+restful d1 table_rest 1591972800 10000
+
+sql select * from table_rest;
+print rows: $rows
+if $rows != 100000 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c7866e5f4ce950292f17a1b4d0f8a49838fc18a1
--- /dev/null
+++ b/tests/script/general/http/grafana.sim
@@ -0,0 +1,182 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+#system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
+system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+
+sql create database d1
+sql use d1
+sql create table table_gc (ts timestamp, db binary(10), tb binary(20), col binary(20))
+sql create table m1 (ts timestamp, v1 int, v2 float)
+sql create table m2 (ts timestamp, v1 int, v2 float)
+
+sql insert into table_gc values('2017-12-25 21:28:41.022', 'd1', 'm1', 'v1') 
+sql insert into table_gc values('2017-12-25 21:28:42.022', 'd1', 'm1', 'v2') 
+sql insert into table_gc values('2017-12-25 21:28:43.022', 'd1', 'm2', 'v1') 
+sql insert into table_gc values('2017-12-25 21:28:44.022', 'd1', 'm2', 'v2') 
+
+sql insert into m1 values(1514208523020, 1, 4.1)
+sql insert into m1 values(1514208523021, 2, 5.1)
+sql insert into m1 values(1514208523022, 3, 6.1)
+
+sql insert into m2 values(1514208523024, 3, 6.1)
+sql insert into m2 values(1514208523025, 2, 5.1)
+sql insert into m2 values(1514208523026, 1, 4.1)
+
+sql create table mt (ts timestamp, i int) tags(a int, b binary(10))
+sql create table t1 using mt tags (1, 'a')
+sql create table t2 using mt tags (2, 'b')
+sql create table t3 using mt tags (3, 'c')
+sql insert into t1 values('2017-12-25 21:25:41', 1)
+sql insert into t1 values('2017-12-25 21:26:41', 1)
+sql insert into t1 values('2017-12-25 21:27:41', 1)
+sql insert into t1 values('2017-12-25 21:28:41', 1)
+sql insert into t1 values('2017-12-25 21:29:41', 1)
+sql insert into t2 values('2017-12-25 21:25:41', 2)
+sql insert into t2 values('2017-12-25 21:26:41', 2)
+sql insert into t2 values('2017-12-25 21:27:41', 2)
+sql insert into t2 values('2017-12-25 21:28:41', 2)
+sql insert into t3 values('2017-12-25 21:25:41', 3)
+sql insert into t3 values('2017-12-25 21:26:41', 3)
+sql insert into t3 values('2017-12-25 21:27:41', 3)
+
+print ===============  step2 - login
+
+system_content curl 127.0.0.1:7111/grafana/
+print 1-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/grafana/xx
+print 2-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/grafana/login/xx/xx/
+print 3-> $system_content
+if $system_content != @{"status":"error","code":849,"desc":"Invalid user"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/grafana/root/1/123/1/1/3
+print 4-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/grafana/login/1/root/1/
+print 5-> $system_content
+if $system_content != @{"status":"error","code":849,"desc":"Invalid user"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:7111/grafana/root/1/login
+print 6-> $system_content
+if $system_content != @{"status":"error","code":4386,"desc":"invalid type of Authorization"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:7111/grafana/root/1/login
+print 7-> $system_content
+if $system_content != @{"status":"error","code":4387,"desc":"invalid format of Authorization"}@ then
+  return -1
+endi
+
+sleep 3000
+system_content curl 127.0.0.1:7111/grafana/login/root/taosdata
+print 8-> $system_content
+if $system_content != @{"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}@ then
+  return -1
+endi
+
+print ===============  step3 - heartbeat
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' 127.0.0.1:7111/grafana/d1/table_gc
+print 9-> $system_content
+if $system_content != @{"message":"Grafana server receive a quest from you!"}@ then
+  return -1
+endi
+
+print ===============  step4 - search
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' 127.0.0.1:7111/grafana/heartbeat
+print 10-> $system_content
+if $system_content != @{"message":"Grafana server receive a quest from you!"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' 127.0.0.1:7111/grafana/d1/table_invalid/search
+print 11-> $system_content
+if $system_content != @{"message":"Grafana server receive a quest from you!"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' 127.0.0.1:7111/grafana/d1/m1/search
+print 12-> $system_content
+if $system_content != @{"message":"Grafana server receive a quest from you!"}@ then
+  return -1
+endi
+
+print ===============  step5 - query
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"taosd","sql":"select first(v1) from d1.m1 where ts > 1514208523020 and ts < 1514208523030 interval(1m)"},{"refId":"B","alias":"system","sql":"select first(v2) from d1.m1 where ts > 1514208523020 and ts < 1514208523030 interval(1m)"}]'  127.0.0.1:7111/grafana/query
+print 13-> $system_content
+if $system_content != @[{"refId":"A","target":"taosd","datapoints":[[2,1514208480000]]},{"refId":"B","target":"system","datapoints":[[5.10000,1514208480000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select first(v1) from d1.m1 where ts > 1514208523020 and ts < 1514208523030 interval(1m)"},{"refId":"B","alias":"","sql":"select first(v2) from d1.m1 where ts > 1514208523020 and ts < 1514208523030 interval(1m)"}]'  127.0.0.1:7111/grafana/query
+print 14-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[2,1514208480000]]},{"refId":"B","target":"B","datapoints":[[5.10000,1514208480000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select count(v1) from d1.m1"},{"refId":"B","alias":"","sql":"select count(v2) from d1.m1"}]'  127.0.0.1:7111/grafana/query
+print 15-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[3,"-"]]},{"refId":"B","target":"B","datapoints":[[3,"-"]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select count(v1) from d1.m1"},{"refId":"B","alias":"","sql":"select count(v2) from d1.m1"}]'  127.0.0.1:7111/grafana/query
+print 15-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[3,"-"]]},{"refId":"B","target":"B","datapoints":[[3,"-"]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select count(i) from d1.mt group by a"},{"refId":"B","alias":"","sql":"select sum(i) from d1.mt group by b"}]'  127.0.0.1:7111/grafana/query
+print 16-> $system_content
+if $system_content != @[{"refId":"A","target":"{a:1,}","datapoints":[[5,"-"]]},{"refId":"A","target":"{a:2,}","datapoints":[[4,"-"]]},{"refId":"A","target":"{a:3,}","datapoints":[[3,"-"]]},{"refId":"B","target":"{b:a}","datapoints":[[5,"-"]]},{"refId":"B","target":"{b:b}","datapoints":[[8,"-"]]},{"refId":"B","target":"{b:c}","datapoints":[[9,"-"]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"count","sql":"select count(i) from d1.mt group by a"},{"refId":"B","alias":"sum-","sql":"select sum(i) from d1.mt group by b"}]'  127.0.0.1:7111/grafana/query
+print 17-> $system_content
+if $system_content != @[{"refId":"A","target":"count{a:1,}","datapoints":[[5,"-"]]},{"refId":"A","target":"count{a:2,}","datapoints":[[4,"-"]]},{"refId":"A","target":"count{a:3,}","datapoints":[[3,"-"]]},{"refId":"B","target":"sum-{b:a}","datapoints":[[5,"-"]]},{"refId":"B","target":"sum-{b:b}","datapoints":[[8,"-"]]},{"refId":"B","target":"sum-{b:c}","datapoints":[[9,"-"]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"count","sql":"select count(i) from d1.mt interval(1m) group by a "}]'  127.0.0.1:7111/grafana/query
+print 18-> $system_content
+if $system_content != @[{"refId":"A","target":"count{a:1,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000],[1,1514208540000]]},{"refId":"A","target":"count{a:2,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000]]},{"refId":"A","target":"count{a:3,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select sum(v2), count(v1) from d1.m1"},{"refId":"B","alias":"","sql":"select count(v2), sum(v2) from d1.m1"}]'  127.0.0.1:7111/grafana/query
+print 19-> $system_content
+if $system_content != @[{"refId":"A","target":"{count(v1):3}","datapoints":[[15.299999714,"-"]]},{"refId":"B","target":"{sum(v2):15.299999714}","datapoints":[[3,"-"]]}]@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim
new file mode 100644
index 0000000000000000000000000000000000000000..43c52ba75ff72f8567eebaec741f3edee3206d85
--- /dev/null
+++ b/tests/script/general/http/grafana_bug.sim
@@ -0,0 +1,238 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+#system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
+system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sleep 3000
+
+print ============================ dnode1 start
+
+print ===============  step0 - prepare data
+
+sql create database db
+sql use db
+
+sql create table tb (ts timestamp, val int, val1 int, val2 int)
+sql create table tb2 (ts timestamp, val int, val1 int, val2 int)
+sql create table t2 (ts timestamp, val int)
+
+sql insert into tb values('2020-01-01 00:00:00.000', 1, 11, 21)
+sql insert into tb values('2020-01-02 00:00:00.000', 1, 12, 22)
+sql insert into tb values('2020-01-03 00:00:00.000', 2, 13, 23)
+sql insert into tb values('2020-01-04 00:00:00.000', 2, 14, 24)
+
+sql insert into tb2 values('2020-01-01 00:00:00.000', 21, 211, 221)
+sql insert into tb2 values('2020-01-02 00:00:00.000', 21, 212, 222)
+sql insert into tb2 values('2020-01-03 00:00:00.000', 22, 213, 223)
+sql insert into tb2 values('2020-01-04 00:00:00.000', 22, 214, 224)
+
+print ===============  step1 - one query, 1 column, with timestamp
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step2 - one query, 2 column, with timestamp
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step2-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step3 - one query, 3 column, with timestamp
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step3.1-> $system_content
+if $system_content != @[{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb "} ]' 127.0.0.1:7111/grafana/query
+print step3.2-> $system_content
+if $system_content != @[{"refId":"A","target":"{val1:11,}","datapoints":[[1,1577808000000]]},{"refId":"A","target":"{val1:12,}","datapoints":[[1,1577894400000]]},{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val1,val from db.tb "} ]' 127.0.0.1:7111/grafana/query
+print step3.3-> $system_content
+if $system_content != @[{"refId":"A","target":"{val:1,}","datapoints":[[11,1577808000000],[12,1577894400000]]},{"refId":"A","target":"{val:2,}","datapoints":[[13,1577980800000],[14,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step4 - one query, 4 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val2,val1,val from db.tb "} ]' 127.0.0.1:7111/grafana/query
+print step4.1-> $system_content
+if $system_content != @[{"refId":"A","target":"{val1:11,, val:1,}","datapoints":[[21,1577808000000]]},{"refId":"A","target":"{val1:12,, val:1,}","datapoints":[[22,1577894400000]]},{"refId":"A","target":"{val1:13,, val:2,}","datapoints":[[23,1577980800000]]},{"refId":"A","target":"{val1:14,, val:2,}","datapoints":[[24,1578067200000]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select ts,val,val1,val2 from db.tb "} ]' 127.0.0.1:7111/grafana/query
+print step4.2-> $system_content
+if $system_content != @[{"refId":"A","target":"{val1:11,, val2:21,}","datapoints":[[1,1577808000000]]},{"refId":"A","target":"{val1:12,, val2:22,}","datapoints":[[1,1577894400000]]},{"refId":"A","target":"{val1:13,, val2:23,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,, val2:24,}","datapoints":[[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step5 - one query, 1 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"A","target":"A","datapoints":[[2,"-"],[2,"-"]]}]@ then
+  return -1
+endi
+
+print ===============  step6 - one query, 2 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"A","target":"{val2:23,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,}","datapoints":[[14,"-"]]}]@ then
+  return -1
+endi
+
+print ===============  step7 - one query, 3 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"A","target":"{val2:23,, val:2,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,, val:2,}","datapoints":[[14,"-"]]}]@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2,val from db.tb"} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"A","target":"{val2:21,, val:1,}","datapoints":[[11,"-"]]},{"refId":"A","target":"{val2:22,, val:1,}","datapoints":[[12,"-"]]},{"refId":"A","target":"{val2:23,, val:2,}","datapoints":[[13,"-"]]},{"refId":"A","target":"{val2:24,, val:2,}","datapoints":[[14,"-"]]}]@ then
+  return -1
+endi
+
+print ===============  step8 - one query, no return
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select val1,val2,val from db.tb where ts >= 1677980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[]@ then
+  return -1
+endi
+
+print ===============  step9 - one query, insert sql
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"insert into db.t2 values(now, 1) "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[]@ then
+  return -1
+endi
+
+print ===============  step10 - one query, error sql
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"A","alias":"","sql":"select * from db.tt "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[]@ then
+  return -1
+endi
+
+print ===============  step11 - two query, 1 column, with timestamp, 1 column, with timestamp
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"A","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step12 - two query, 1 column, with timestamp, 2 column, with timestamp
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"A","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step13 - two query, 1 column, with timestamp, 3 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[null,1577980800000],[null,1578067200000]]},{"refId":"A","target":"{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step14 - two query, 2 column, with timestamp, 2 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[223,1577980800000],[224,1578067200000]]},{"refId":"A","target":"AA","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step15 - two query, 2 column, with timestamp, 3 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val2, val1 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB{val1:213,}","datapoints":[[223,1577980800000]]},{"refId":"B","target":"BB{val1:214,}","datapoints":[[224,1578067200000]]},{"refId":"A","target":"AA","datapoints":[[2,1577980800000],[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step16 - two query, 3 column, with timestamp, 4 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val, val1, val2, val1 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val,val1 from db.tb where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB{val1:213,, val2:223,, val1:213,}","datapoints":[[22,1577980800000]]},{"refId":"B","target":"BB{val1:214,, val2:224,, val1:214,}","datapoints":[[22,1578067200000]]},{"refId":"A","target":"AA{val1:13,}","datapoints":[[2,1577980800000]]},{"refId":"A","target":"AA{val1:14,}","datapoints":[[2,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step17 - two query, 2 column, with timestamp, no return
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val from db.tb where ts >= 1677980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,1577980800000],[22,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step18 - two query, 2 column, with timestamp, invalid sql
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val from db.tb222 where ts >= 1677980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,1577980800000],[22,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step19 - two query, 2 column, with timestamp, insert sql
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select ts, val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"insert into db.t2 values(now, 1)"} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,1577980800000],[22,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step20 - two query, 1 column, no timestamp, 1 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA","datapoints":[[null,1577980800000],[null,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step21 - two query, 1 column, no timestamp, 2 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val2 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA","datapoints":[[223,1577980800000],[224,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step22 - two query, 1 column, no timestamp, 3 column, with timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select ts,val1, val2 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB","datapoints":[[22,"-"],[22,"-"]]},{"refId":"A","target":"AA{val2:223,}","datapoints":[[213,1577980800000]]},{"refId":"A","target":"AA{val2:224,}","datapoints":[[214,1578067200000]]}]@ then
+  return -1
+endi
+
+print ===============  step23 - two query, 2 column, no timestamp, 1 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val1 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA","datapoints":[[213,"-"],[214,"-"]]}]@ then
+  return -1
+endi
+
+print ===============  step24 - two query, 2 column, no timestamp, 2 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val,val1 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA{val1:213,}","datapoints":[[22,"-"]]},{"refId":"A","target":"AA{val1:214,}","datapoints":[[22,"-"]]}]@ then
+  return -1
+endi
+
+print ===============  step25 - two query, 2 column, no timestamp, 3 column, no timestamp
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d '[ {"refId":"B","alias":"BB","sql":"select val1,val2 from db.tb2 where ts >= 1577980800000 "},{"refId":"A","alias":"AA","sql":"select val,val1,val2 from db.tb2 where ts >= 1577980800000 "} ]' 127.0.0.1:7111/grafana/query
+print step1-> $system_content
+if $system_content != @[{"refId":"B","target":"BB{val2:223,}","datapoints":[[213,"-"]]},{"refId":"B","target":"BB{val2:224,}","datapoints":[[214,"-"]]},{"refId":"A","target":"AA{val1:213,, val2:223,}","datapoints":[[22,"-"]]},{"refId":"A","target":"AA{val1:214,, val2:224,}","datapoints":[[22,"-"]]}]@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/gzip.sim b/tests/script/general/http/gzip.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9c77567abb9874459a2363a93cb62cb57cf02b1a
--- /dev/null
+++ b/tests/script/general/http/gzip.sim
@@ -0,0 +1,39 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c maxSQLLength -v 340032
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database d1
+sql use d1
+
+sql create table table_rest (ts timestamp, i int) 
+print sql length is 270KB
+restful d1 table_rest 1591072800 10000 gzip
+restful d1 table_rest 1591172800 10000 gzip
+restful d1 table_rest 1591272800 10000 gzip
+restful d1 table_rest 1591372800 10000 gzip
+restful d1 table_rest 1591472800 10000 gzip
+restful d1 table_rest 1591572800 10000 gzip
+restful d1 table_rest 1591672800 10000 gzip
+restful d1 table_rest 1591772800 10000 gzip
+restful d1 table_rest 1591872800 10000 gzip
+restful d1 table_rest 1591972800 10000 gzip
+
+sql select * from table_rest;
+print rows: $rows
+if $rows != 100000 then
+  return -1
+endi
+
+system curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_rest' 127.0.0.1:7111/rest/sql --compressed
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/http.json b/tests/script/general/http/http.json
new file mode 100644
index 0000000000000000000000000000000000000000..087f4eab5b2d43ec1286c515aa7ef89ce2c42a92
--- /dev/null
+++ b/tests/script/general/http/http.json
@@ -0,0 +1,23 @@
+{
+    "hostIp": "192.168.100.128",
+    "connNum": 1,
+	"insertModel": "insertTable",
+    "waitTime": 0,
+	"tableDesc": "ts timestamp i int",
+	"tablePrefix": "t",
+	"tablePerConn": 1,
+	"tableCreate": true,
+	"tableStart": 1,
+	"dbName": "db",
+	"dbReplica": 1,
+	"dbKeep": 3650,
+	"dbDays": 7,
+	"metricsName": "mt",
+	"tagNum": 10,
+	"dataNum": 100,
+	"dataBegin": 1485878400000,
+	"dataInterval": 1000,
+	"dataBatch": 1,
+	"dataInsert": true,
+	"dataRandom": false
+}
diff --git a/tests/script/general/http/httpTestNew.go b/tests/script/general/http/httpTestNew.go
new file mode 100644
index 0000000000000000000000000000000000000000..7947f0a20a9706dc8567f4fb67a3c04c940a22b9
--- /dev/null
+++ b/tests/script/general/http/httpTestNew.go
@@ -0,0 +1,232 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+var (
+	token    string
+	url      string
+	config   Config
+	request  int64
+	begin    time.Time
+	errorNum int64
+)
+
+type Config struct {
+	HostIp      string `json:"hostIp"`
+	TableNum    int    `json:"tableNum"`
+	DbName      string `json:"dbName"`
+	MetricsName string `json:"metricsName"`
+	DataNum     int    `json:"dataNum"`
+	BatchNum    int    `json:"batchNum"`
+}
+
+type TokenResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Desc   string `json:"desc"`
+}
+
+type JsonResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+}
+
+func readFile(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("taos.json not found")
+		panic(err)
+	}
+	defer file.Close()
+
+	dec := json.NewDecoder(file)
+	err = dec.Decode(&config)
+	if err != nil {
+		println("taos.json parse error")
+		panic(err)
+	}
+
+	request = 0
+	errorNum = 0
+
+	fmt.Println("================config parameters======================")
+	fmt.Println("HostIp:", config.HostIp)
+	fmt.Println("TableNum:", config.TableNum)
+	fmt.Println("dbName:", config.DbName)
+	fmt.Println("metricsName:", config.MetricsName)
+	fmt.Println("dataNum:", config.DataNum)
+	fmt.Println("batchNum:", config.BatchNum)
+
+	fmt.Println("================http token=============================")
+	token, err = getToken()
+	url = fmt.Sprintf("http://%s:%d/rest/sql", config.HostIp, 6020)
+
+	fmt.Println("httpToken:", token)
+	fmt.Println("httpUrl:", url)
+
+	if err != nil {
+		panic(err)
+	}
+}
+
+func getToken() (string, error) {
+	resp, err := http.Get(fmt.Sprintf("http://%s:%d/rest/login/%s/%s", config.HostIp, 6020, "root", "taosdata"))
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+
+	var tokenResult TokenResult
+
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = json.Unmarshal(data, &tokenResult)
+	if err != nil {
+		return "", err
+	}
+
+	if tokenResult.Status != "succ" {
+		fmt.Println("get http token failed")
+		fmt.Println(tokenResult)
+		return "", err
+	}
+
+	return tokenResult.Desc, nil
+}
+
+func exec(client *http.Client, sql string) {
+	for reTryTimes := 0; reTryTimes < 10; reTryTimes++ {
+
+		req, err1 := http.NewRequest("POST", url, bytes.NewReader([]byte(sql)))
+		if err1 != nil {
+			continue
+		}
+		req.Header.Add("Authorization", "Taosd "+token)
+
+		resp, err := client.Do(req)
+
+		if err != nil {
+			continue
+		}
+
+		data, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		var jsonResult JsonResult
+		err = json.Unmarshal(data, &jsonResult)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		if jsonResult.Status != "succ" {
+			resp.Body.Close()
+			continue
+		}
+
+		atomic.AddInt64(&request, 1)
+
+		if (request*int64(config.BatchNum))%100000 == 0 && request != 0 {
+			spend := time.Since(begin).Seconds()
+			if spend >= 1 && spend < 10000000 {
+				total := (request - errorNum - 2 - int64(config.TableNum)) * int64(config.BatchNum)
+				fmt.Printf("request:%d, error:%d, insert:%d, spend:%.2f seconds, dps:%.1f \n", request, errorNum, total, spend, float64(total)/float64(spend))
+			}
+		}
+
+		return
+	}
+
+	//fmt.Println("exec failed, sql:", sql)
+	errorNum++
+}
+
+func createDb() {
+	fmt.Println("================create database =====================")
+
+	client := &http.Client{}
+	sql := fmt.Sprintf("create database %s", config.DbName)
+	exec(client, sql)
+}
+
+func createTb() {
+	fmt.Println("================create table ========================")
+
+	client := &http.Client{}
+	sql := fmt.Sprintf("create table %s.%s(ts timestamp, f1 int, f2 int) tags (tb int)", config.DbName, config.MetricsName)
+	exec(client, sql)
+
+	for i := 0; i < config.TableNum; i++ {
+		sql := fmt.Sprintf("create table %s.t%d using %s.%s tags(%d)", config.DbName, i, config.DbName, config.MetricsName, i)
+		exec(client, sql)
+	}
+}
+
+func insertData(wg *sync.WaitGroup, tableIndex int) {
+	defer wg.Done()
+
+	client := &http.Client{}
+	beginTime := int64(1519833600000)
+
+	for i := 0; i < config.DataNum; i += config.BatchNum {
+		var sql bytes.Buffer
+		sql.WriteString(fmt.Sprintf("insert into %s.t%d values", config.DbName, tableIndex))
+
+		for j := 0; j < config.BatchNum; j++ {
+			sql.WriteString(fmt.Sprintf("(%d,%d,%d)", beginTime+int64(i)+int64(j), rand.Intn(1000), rand.Intn(1000)))
+		}
+		exec(client, sql.String())
+	}
+}
+
+func main() {
+	filename := flag.String("config", "http.json", "config file name")
+
+	flag.Parse()
+
+	readFile(*filename)
+
+	fmt.Println("\n================http test start======================")
+
+	createDb()
+	createTb()
+
+	begin = time.Now()
+
+	var wg sync.WaitGroup
+
+	fmt.Println("================insert data  ========================")
+	for i := 0; i < config.TableNum; i++ {
+		wg.Add(1)
+		go insertData(&wg, i)
+	}
+
+	wg.Wait()
+
+	fmt.Println("\n================http test stop ======================")
+
+	spend := time.Since(begin).Seconds()
+
+	total := (request - errorNum - 2 - int64(config.TableNum)) * int64(config.BatchNum)
+	fmt.Printf("request:%d, error:%d, insert:%d, spend:%.2f seconds, dps:%.1f \n", request, errorNum, total, spend, float64(total)/float64(spend))
+}
diff --git a/tests/script/general/http/httpTest_cloud.go b/tests/script/general/http/httpTest_cloud.go
new file mode 100644
index 0000000000000000000000000000000000000000..feb3f1450bef122fc0ed3f5225f3d199fd38f16e
--- /dev/null
+++ b/tests/script/general/http/httpTest_cloud.go
@@ -0,0 +1,372 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+	"flag"
+)
+
+var (
+	token    string
+	url      string
+	config   Config
+	request  int64
+	period   int64
+	errorNum int64
+)
+
+type Config struct {
+	HostIp       string `json:"hostIp"`
+	ConnNum      int    `json:"connNum"`
+	InsertModel  string `json:"insertModel"`
+	WaitTime     int    `json:"waitTime"`
+	TableDesc    string `json:"tableDesc"`
+	TablePrefix  string `json:"tablePrefix"`
+	TablePerConn int    `json:"tablePerConn"`
+	TableCreate  bool   `json:"tableCreate"`
+	TableStart   int    `json:"tableStart"`
+	DbName       string `json:"dbName"`
+	DbReplica    int    `json:"dbReplica"`
+	DbKeep       int    `json:"dbKeep"`
+	DbDays       int    `json:"dbDays"`
+	MetricsName  string `json:"metricsName"`
+	TagNum       int    `json:"tagNum"`
+	DataNum      int    `json:"dataNum"`
+	DataBegin    int64  `json:"dataBegin"`
+	DataInterval int    `json:"dataInterval"`
+	DataBatch    int    `json:"dataBatch"`
+	DataInsert   bool   `json:"dataInsert"`
+	DataRandom   bool   `json:"dataRandom"`
+}
+
+type TokenResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Desc   string `json:"desc"`
+}
+
+type JsonResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+}
+
+func readFile(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("taos_cloud.json not found")
+		panic(err)
+	}
+	defer file.Close()
+
+	dec := json.NewDecoder(file)
+	err = dec.Decode(&config)
+	if err != nil {
+		println("taos_cloud.json parse error")
+		panic(err)
+	}
+
+	if config.TagNum <= 0 {
+		config.TagNum = 1
+	}
+	request = 0
+	period = 0
+	errorNum = 0
+
+	fmt.Println("================config parameters======================")
+	fmt.Println("HostIp:", config.HostIp)
+	fmt.Println("connNum:", config.ConnNum)
+	fmt.Println("insertModel:", config.InsertModel)
+	fmt.Println("waitTime:", config.WaitTime)
+	fmt.Println("tableDesc:", config.TableDesc)
+	fmt.Println("tablePrefix:", config.TablePrefix)
+	fmt.Println("tablePerConn:", config.TablePerConn)
+	fmt.Println("tableCreate:", config.TableCreate)
+	fmt.Println("tableStart:", config.TableStart)
+	fmt.Println("dbName:", config.DbName)
+	fmt.Println("dbReplica:", config.DbReplica)
+	fmt.Println("dbKeep:", config.DbKeep)
+	fmt.Println("dbDays:", config.DbDays)
+	fmt.Println("metricsName:", config.MetricsName)
+	fmt.Println("tagNum:", config.TagNum)
+	fmt.Println("dataNum:", config.DataNum)
+	fmt.Println("dataBegin:", config.DataBegin)
+	fmt.Println("dataInterval:", config.DataInterval)
+	fmt.Println("dataBatch:", config.DataBatch)
+	fmt.Println("dataInsert:", config.DataInsert)
+	fmt.Println("dataRandom:", config.DataRandom)
+
+	fmt.Println("================http token=============================")
+	token, err = getToken()
+	url = fmt.Sprintf("http://%s:%d/rest/sql", config.HostIp, 6020)
+
+	fmt.Println("httpToken:", token)
+	fmt.Println("httpUrl:", url)
+
+	if err != nil {
+		panic(err)
+	}
+}
+
+func getToken() (string, error) {
+	resp, err := http.Get(fmt.Sprintf("http://%s:%d/rest/login/%s/%s", config.HostIp, 6020, "tiger", "tiger"))
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+
+	var tokenResult TokenResult
+
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = json.Unmarshal(data, &tokenResult)
+	if err != nil {
+		return "", err
+	}
+
+	if tokenResult.Status != "succ" {
+		fmt.Println("get http token failed")
+		fmt.Println(tokenResult)
+		return "", err
+	}
+
+	return tokenResult.Desc, nil
+}
+
+func exec(client *http.Client, sql string) {
+	for times := 0; times < 10; times++ {
+
+		req, err1 := http.NewRequest("POST", url, bytes.NewReader([]byte(sql)))
+		if err1 != nil {
+			continue
+		}
+		req.Header.Add("Authorization", "Taosd "+token)
+
+		begin := time.Now()
+		resp, err := client.Do(req)
+
+		if err != nil {
+			continue
+		}
+
+		data, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		spend := (time.Since(begin).Nanoseconds())
+
+		var jsonResult JsonResult
+		err = json.Unmarshal(data, &jsonResult)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		if jsonResult.Status != "succ" {
+			resp.Body.Close()
+			continue
+		}
+		atomic.AddInt64(&request, 1)
+		if (request < 103) {
+			return
+		}
+		
+		atomic.AddInt64(&period, spend)
+		if request%5000 == 0 && request != 0 {
+			requestAvg := float64(period) / float64(1000000) / float64(request)
+			qps := float64(1000) / float64(requestAvg) * float64(config.ConnNum)
+			dps := qps * float64(config.DataBatch)
+			fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+		}
+		return
+	}
+	fmt.Println("xxxx>sql:", sql, ", retryTimes:", 10)
+	errorNum++
+}
+
+func createDb() {
+	if !config.TableCreate {
+		return
+	}
+
+	client := &http.Client{}
+
+	fmt.Println("\n================create database =====================")
+	sql := fmt.Sprintf("create database %s keep %d", config.DbName, config.DbKeep)
+	exec(client, sql)
+}
+
+func createTb() {
+	if !config.TableCreate {
+		return
+	}
+	client := &http.Client{}
+
+	fmt.Println("\n================create table ========================")
+	sql := fmt.Sprintf("create table %s.%s(%s) tags (orgno int)", config.DbName, config.MetricsName, config.TableDesc)
+	exec(client, sql)
+	tbNum := config.TablePerConn*config.ConnNum + config.TableStart
+	for i := config.TableStart; i < tbNum; i++ {
+		sql := fmt.Sprintf("create table %s.%s%d using %s.%s tags(%d)", config.DbName, config.TablePrefix, i, config.DbName, config.MetricsName, i%config.TagNum+1)
+		exec(client, sql)
+	}
+
+}
+
+func insertTable(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	for i := 0; i < config.TablePerConn; i++ {
+		tbIndex := i + tbStart
+
+		for j := 0; j < config.DataNum; j++ {
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+
+			sql := fmt.Sprintf("insert into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			for k := 1; k < config.DataBatch; k++ {
+				tmVal := int64(j)*int64(config.DataInterval) + int64(k) + tmStart
+
+				dataVal := j + k
+				if config.DataRandom {
+					dataVal = rand.Intn(1000)
+				}
+
+				sql += fmt.Sprintf("(%d, %d)", tmVal, dataVal)
+			}
+
+			j += (config.DataBatch - 1)
+
+			exec(client, sql)
+			if config.WaitTime != 0 {
+				time.Sleep(time.Millisecond * time.Duration(config.WaitTime))
+			}
+		}
+	}
+}
+
+func insertLoop(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	for j := 0; j < config.DataNum; j++ {
+
+		for i := 0; i < config.TablePerConn; i++ {
+			tbIndex := i + tbStart
+
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+
+			sql := fmt.Sprintf("insert into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			for k := 1; k < config.DataBatch; k++ {
+				tmVal := int64(j)*int64(config.DataInterval) + int64(k) + tmStart
+
+				dataVal := j + k
+				if config.DataRandom {
+					dataVal = rand.Intn(1000)
+				}
+				sql += fmt.Sprintf("values(%d, %d)", tmVal, dataVal)
+			}
+
+			j += (config.DataBatch - 1)
+
+			exec(client, sql)
+
+			if config.WaitTime != 0 {
+				time.Sleep(time.Millisecond * time.Duration(config.WaitTime))
+			}
+		}
+
+	}
+}
+
+func insertTb(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	if !config.DataInsert {
+		return
+	}
+
+	if config.InsertModel == "insertTable" {
+		insertTable(conn)
+	} else {
+		insertLoop(conn)
+	}
+}
+
+func selectData(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	client := &http.Client{}
+
+	for i := 0; i < config.DataNum; i++ {
+		exec(client, config.TableDesc)
+	}
+}
+
+func main() {
+	filename := flag.String("config", "taos_cloud.json", "config file name")
+	
+	flag.Parse()
+	
+	readFile(*filename)
+	
+	fmt.Println("\n================http test start======================")
+
+	var wg sync.WaitGroup
+
+	if config.InsertModel == "selectData" {
+		fmt.Println("\n================select data  ========================")
+		for i := 0; i < config.ConnNum; i++ {
+			wg.Add(1)
+			go selectData(&wg, i)
+		}
+	} else {
+		createDb()
+		createTb()
+
+		if config.DataInsert {
+			fmt.Println("\n================insert data  ========================")
+		}
+
+		for i := 0; i < config.ConnNum; i++ {
+			wg.Add(1)
+			go insertTb(&wg, i)
+		}
+	}
+
+	wg.Wait()
+
+	fmt.Println("\n================http test stop ======================")
+	requestAvg := float64(period) / float64(1000000) / float64(request)
+	qps := float64(1000) / float64(requestAvg) * float64(config.ConnNum)
+	dps := qps * float64(config.DataBatch)
+	fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+}
diff --git a/tests/script/general/http/httpTest_private.go b/tests/script/general/http/httpTest_private.go
new file mode 100644
index 0000000000000000000000000000000000000000..907b6c1d62e36ff0c5fecfa801a7559f50deefe8
--- /dev/null
+++ b/tests/script/general/http/httpTest_private.go
@@ -0,0 +1,372 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+	"flag"
+)
+
+var (
+	token    string
+	url      string
+	config   Config
+	request  int64
+	period   int64
+	errorNum int64
+)
+
+type Config struct {
+	HostIp       string `json:"hostIp"`
+	ConnNum      int    `json:"connNum"`
+	InsertModel  string `json:"insertModel"`
+	WaitTime     int    `json:"waitTime"`
+	TableDesc    string `json:"tableDesc"`
+	TablePrefix  string `json:"tablePrefix"`
+	TablePerConn int    `json:"tablePerConn"`
+	TableCreate  bool   `json:"tableCreate"`
+	TableStart   int    `json:"tableStart"`
+	DbName       string `json:"dbName"`
+	DbReplica    int    `json:"dbReplica"`
+	DbKeep       int    `json:"dbKeep"`
+	DbDays       int    `json:"dbDays"`
+	MetricsName  string `json:"metricsName"`
+	TagNum       int    `json:"tagNum"`
+	DataNum      int    `json:"dataNum"`
+	DataBegin    int64  `json:"dataBegin"`
+	DataInterval int    `json:"dataInterval"`
+	DataBatch    int    `json:"dataBatch"`
+	DataInsert   bool   `json:"dataInsert"`
+	DataRandom   bool   `json:"dataRandom"`
+}
+
+type TokenResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Desc   string `json:"desc"`
+}
+
+type JsonResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+}
+
+func readFile(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("taos_cloud.json not found")
+		panic(err)
+	}
+	defer file.Close()
+
+	dec := json.NewDecoder(file)
+	err = dec.Decode(&config)
+	if err != nil {
+		println("taos_cloud.json parse error")
+		panic(err)
+	}
+
+	if config.TagNum <= 0 {
+		config.TagNum = 1
+	}
+	request = 0
+	period = 0
+	errorNum = 0
+
+	fmt.Println("================config parameters======================")
+	fmt.Println("HostIp:", config.HostIp)
+	fmt.Println("connNum:", config.ConnNum)
+	fmt.Println("insertModel:", config.InsertModel)
+	fmt.Println("waitTime:", config.WaitTime)
+	fmt.Println("tableDesc:", config.TableDesc)
+	fmt.Println("tablePrefix:", config.TablePrefix)
+	fmt.Println("tablePerConn:", config.TablePerConn)
+	fmt.Println("tableCreate:", config.TableCreate)
+	fmt.Println("tableStart:", config.TableStart)
+	fmt.Println("dbName:", config.DbName)
+	fmt.Println("dbReplica:", config.DbReplica)
+	fmt.Println("dbKeep:", config.DbKeep)
+	fmt.Println("dbDays:", config.DbDays)
+	fmt.Println("metricsName:", config.MetricsName)
+	fmt.Println("tagNum:", config.TagNum)
+	fmt.Println("dataNum:", config.DataNum)
+	fmt.Println("dataBegin:", config.DataBegin)
+	fmt.Println("dataInterval:", config.DataInterval)
+	fmt.Println("dataBatch:", config.DataBatch)
+	fmt.Println("dataInsert:", config.DataInsert)
+	fmt.Println("dataRandom:", config.DataRandom)
+
+	fmt.Println("================http token=============================")
+	token, err = getToken()
+	url = fmt.Sprintf("http://%s:%d/rest/sql", config.HostIp, 6020)
+
+	fmt.Println("httpToken:", token)
+	fmt.Println("httpUrl:", url)
+
+	if err != nil {
+		panic(err)
+	}
+}
+
+func getToken() (string, error) {
+	resp, err := http.Get(fmt.Sprintf("http://%s:%d/rest/login/%s/%s", config.HostIp, 6020, "root", "taosdata"))
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+
+	var tokenResult TokenResult
+
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = json.Unmarshal(data, &tokenResult)
+	if err != nil {
+		return "", err
+	}
+
+	if tokenResult.Status != "succ" {
+		fmt.Println("get http token failed")
+		fmt.Println(tokenResult)
+		return "", err
+	}
+
+	return tokenResult.Desc, nil
+}
+
+func exec(client *http.Client, sql string) {
+	for times := 0; times < 1; times++ {
+
+		req, err1 := http.NewRequest("POST", url, bytes.NewReader([]byte(sql)))
+		if err1 != nil {
+			continue
+		}
+		req.Header.Add("Authorization", "Taosd "+token)
+
+		begin := time.Now()
+		resp, err := client.Do(req)
+
+		if err != nil {
+			continue
+		}
+
+		data, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		spend := (time.Since(begin).Nanoseconds())
+
+		var jsonResult JsonResult
+		err = json.Unmarshal(data, &jsonResult)
+		if err != nil {
+			resp.Body.Close()
+			continue
+		}
+
+		if jsonResult.Status != "succ" {
+			resp.Body.Close()
+			continue
+		}
+		atomic.AddInt64(&request, 1)
+		if (request < 103) {
+			return
+		}
+		
+		atomic.AddInt64(&period, spend)
+		if request%5000 == 0 && request != 0 {
+			requestAvg := float64(period) / float64(1000000) / float64(request)
+			qps := float64(1000) / float64(requestAvg) * float64(config.ConnNum)
+			dps := qps * float64(config.DataBatch)
+			fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+		}
+		return
+	}
+	fmt.Println("xxxx>sql:", sql, ", retryTimes:", 10)
+	errorNum++
+}
+
+func createDb() {
+	if !config.TableCreate {
+		return
+	}
+
+	client := &http.Client{}
+
+	fmt.Println("\n================create database =====================")
+	sql := fmt.Sprintf("create database %s keep %d", config.DbName, config.DbKeep)
+	exec(client, sql)
+}
+
+func createTb() {
+	if !config.TableCreate {
+		return
+	}
+	client := &http.Client{}
+
+	fmt.Println("\n================create table ========================")
+	sql := fmt.Sprintf("create table %s.%s(%s) tags (orgno int)", config.DbName, config.MetricsName, config.TableDesc)
+	exec(client, sql)
+	tbNum := config.TablePerConn*config.ConnNum + config.TableStart
+	for i := config.TableStart; i < tbNum; i++ {
+		sql := fmt.Sprintf("create table %s.%s%d using %s.%s tags(%d)", config.DbName, config.TablePrefix, i, config.DbName, config.MetricsName, i%config.TagNum+1)
+		exec(client, sql)
+	}
+
+}
+
+func insertTable(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	for j := 0; j < config.DataNum; j++ {
+		for i := 0; i < config.TablePerConn; i++ {
+			tbIndex := i + tbStart
+
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+
+			sql := fmt.Sprintf("insert into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			for k := 1; k < config.DataBatch; k++ {
+				tmVal := int64(j)*int64(config.DataInterval) + int64(k) + tmStart
+
+				dataVal := j + k
+				if config.DataRandom {
+					dataVal = rand.Intn(1000)
+				}
+
+				sql += fmt.Sprintf("(%d, %d)", tmVal, dataVal)
+			}
+
+			
+			exec(client, sql)
+			if config.WaitTime != 0 {
+				time.Sleep(time.Millisecond * time.Duration(config.WaitTime))
+			}
+		}
+		j += (config.DataBatch - 1)
+	}
+}
+
+func insertLoop(conn int) {
+	client := &http.Client{}
+
+	tbStart := conn*config.TablePerConn + config.TableStart
+	tmStart := config.DataBegin
+
+	for j := 0; j < config.DataNum; j++ {
+
+		for i := 0; i < config.TablePerConn; i++ {
+			tbIndex := i + tbStart
+
+			tmVal := int64(j)*int64(config.DataInterval) + tmStart
+
+			dataVal := j
+			if config.DataRandom {
+				dataVal = rand.Intn(1000)
+			}
+
+			sql := fmt.Sprintf("insert into %s.%s%d values(%d, %d)", config.DbName, config.TablePrefix, tbIndex, tmVal, dataVal)
+			for k := 1; k < config.DataBatch; k++ {
+				tmVal := int64(j)*int64(config.DataInterval) + int64(k) + tmStart
+
+				dataVal := j + k
+				if config.DataRandom {
+					dataVal = rand.Intn(1000)
+				}
+				sql += fmt.Sprintf("values(%d, %d)", tmVal, dataVal)
+			}
+
+			j += (config.DataBatch - 1)
+
+			exec(client, sql)
+
+			if config.WaitTime != 0 {
+				time.Sleep(time.Millisecond * time.Duration(config.WaitTime))
+			}
+		}
+
+	}
+}
+
+func insertTb(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	if !config.DataInsert {
+		return
+	}
+
+	if config.InsertModel == "insertTable" {
+		insertTable(conn)
+	} else {
+		insertLoop(conn)
+	}
+}
+
+func selectData(wg *sync.WaitGroup, conn int) {
+	defer wg.Done()
+
+	client := &http.Client{}
+
+	for i := 0; i < config.DataNum; i++ {
+		exec(client, config.TableDesc)
+	}
+}
+
+func main() {
+	filename := flag.String("config", "taos_cloud.json", "config file name")
+	
+	flag.Parse()
+	
+	readFile(*filename)
+	
+	fmt.Println("\n================http test start======================")
+
+	var wg sync.WaitGroup
+
+	if config.InsertModel == "selectData" {
+		fmt.Println("\n================select data  ========================")
+		for i := 0; i < config.ConnNum; i++ {
+			wg.Add(1)
+			go selectData(&wg, i)
+		}
+	} else {
+		createDb()
+		createTb()
+
+		if config.DataInsert {
+			fmt.Println("\n================insert data  ========================")
+		}
+
+		for i := 0; i < config.ConnNum; i++ {
+			wg.Add(1)
+			go insertTb(&wg, i)
+		}
+	}
+
+	wg.Wait()
+
+	fmt.Println("\n================http test stop ======================")
+	requestAvg := float64(period) / float64(1000000) / float64(request)
+	qps := float64(1000) / float64(requestAvg) * float64(config.ConnNum)
+	dps := qps * float64(config.DataBatch)
+	fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+}
diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0bcb42ad41baa48544e0febba6ccf693f3efb85b
--- /dev/null
+++ b/tests/script/general/http/prepare.sim
@@ -0,0 +1,54 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database d1
+sql use d1
+
+sql create table t1 (ts timestamp, i int, b binary(100)) 
+
+sql insert into t1 values('2017-12-25 21:28:41.022', 1, 11)
+sql insert into t1 values('2017-12-25 21:28:42.022', 2, '22')
+sql insert into t1 values('2017-12-25 21:28:43.022', 3, "33")
+sql insert into t1 values('2017-12-25 21:28:44.022', 4, '44"')
+sql insert into t1 values('2017-12-25 21:28:45.022', 5, "55'")
+sql insert into t1 values('2017-12-25 21:28:46.022', 6, "66'6'")
+sql insert into t1 values('2017-12-25 21:28:47.022', 7, '77"7"')
+sql insert into t1 values('2017-12-25 21:28:48.022', 8, '88""88')
+sql insert into t1 values('2017-12-25 21:28:49.022', 9, '99\99')
+sql insert into t1 values('2017-12-25 21:28:51.022', 11, '11\\11')
+sql insert into t1 values('2017-12-25 21:28:52.022', 12, '22\\11')
+sql insert into t1 values('2017-12-25 21:28:53.022', 13, '33\\"33')
+sql insert into t1 values('2017-12-25 21:28:54.022', 14, '44\\""44')
+
+sleep 4000
+
+print ===============  step2 - login
+
+system_content curl 127.0.0.1:7111/rest/login/root/taosdata
+print curl 127.0.0.1:7111/rest/login/root/taosdata -----> $system_content
+
+if $system_content != @{"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}@ then
+  return -1
+endi
+
+return
+
+print ===============  step3 - query data
+
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwia2V5IjoiYkVsOExjdkxVZDdhOHFkdE5abXRPTnJ5cDIwMW1hMDQiLCJzdWIiOiJyb290In0.k7CkgmpOJImIkLqZqzASlPmkdeEw7Wfk4XUrqGZX-LQ' -d 'select * from t1' 127.0.0.1:7111/rest/sql/d1
+print curl 127.0.0.1:7111/rest/sql/d1 -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i","b"],"data":[["2017-12-25 21:28:54.022",14,"44\\\\\"\"44"],["2017-12-25 21:28:53.022",13,"33\\\\\"33"],["2017-12-25 21:28:52.022",12,"22\\\\11"],["2017-12-25 21:28:51.022",11,"11\\\\11"],["2017-12-25 21:28:49.022",9,"99\\99"],["2017-12-25 21:28:48.022",8,"88\"\"88"],["2017-12-25 21:28:47.022",7,"77\"7\""],["2017-12-25 21:28:46.022",6,"66'6'"],["2017-12-25 21:28:45.022",5,"55'"],["2017-12-25 21:28:44.022",4,"44\""],["2017-12-25 21:28:43.022",3,"33"],["2017-12-25 21:28:42.022",2,"22"],["2017-12-25 21:28:41.022",1,"11"]],"rows":13}@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7d1169ca27eac99e740aba3fb8c1f6483791a85b
--- /dev/null
+++ b/tests/script/general/http/restful.sim
@@ -0,0 +1,84 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database d1
+sql use d1
+
+sql create table table_rest (ts timestamp, i int) 
+
+sql insert into table_rest values('2017-12-25 21:28:41.022', 1)
+sql insert into table_rest values('2017-12-25 21:28:42.022', 2)
+sql insert into table_rest values('2017-12-25 21:28:43.022', 3)
+sql insert into table_rest values('2017-12-25 21:28:44.022', 4)
+sql insert into table_rest values('2017-12-25 21:28:45.022', 5)
+sql insert into table_rest values('2017-12-25 21:28:46.022', 6)
+sql insert into table_rest values('2017-12-25 21:28:47.022', 7)
+sql insert into table_rest values('2017-12-25 21:28:48.022', 8)
+sql insert into table_rest values('2017-12-25 21:28:49.022', 9)
+sql insert into table_rest values('2017-12-25 21:28:50.022', 10)
+
+print ===============  step2 - login
+
+system_content curl 127.0.0.1:7111/rest/login/root/taosdata
+print curl 127.0.0.1:7111/rest/login/root/taosdata -----> $system_content
+
+if $system_content != {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"} then
+  return -1
+endi
+
+print ===============  step3 - query data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_rest' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}@ then
+  return -1
+endi
+
+print ===============  step4 - insert data
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d "insert into d1.table_rest values('2017-12-25 21:28:51.022', 11)" 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
+  return -1
+endi
+
+print ===============  step5 - query data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_rest' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
+  return -1
+endi
+
+print ===============  step6 - query no db data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show dnodes' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+
+print =============== step7 - change password
+sql create user u1 PASS 'abcd@1234'
+sql create user u2 PASS 'abcd_1234'
+
+system_content curl 127.0.0.1:7111/rest/login/u1/abcd@1234
+print curl 127.0.0.1:7111/rest/login/u1/abcd@1234 -----> $system_content
+if $system_content != @{"status":"succ","code":0,"desc":"jIlItaLFFIPa8qdtNZmtONryp201ma04SXX8PEJowKAB/46k1gwnPNryp201ma04"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/rest/login/u2/aabcd_1234
+print curl 127.0.0.1:7111/rest/login/u2/abcd_1234 -----> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a02140a4199054775c405ec3c6223faa2ef681e4
--- /dev/null
+++ b/tests/script/general/http/restful_full.sim
@@ -0,0 +1,233 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/exec.sh -n dnode1 -s start
+
+#sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - login
+
+system_content curl 127.0.0.1:7111/rest/
+print 1-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/rest/xx
+print 2-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/rest/login
+print 3-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+#4
+system_content curl 127.0.0.1:7111/rest/login/root
+print 4-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/rest/login/root/123
+print 5-> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/rest/login/root/123/1/1/3
+print 6-> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/rest/login/root/1
+print 7-> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+#8
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:7111/rest/login/root/1
+print 8-> $system_content
+if $system_content != @{"status":"error","code":4386,"desc":"invalid type of Authorization"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:7111/rest/login/root/1
+print 9-> $system_content
+if $system_content != @{"status":"error","code":4387,"desc":"invalid format of Authorization"}@ then
+  return -1
+endi
+
+sleep 3000
+
+system_content curl 127.0.0.1:7111/rest/login/root/taosdata/
+print 10-> $system_content
+if $system_content != @{"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}@ then
+  return -1
+endi
+
+print ===============  step2 - no db
+
+#11
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/rest/sql
+print 11-> $system_content
+if $system_content != @{"status":"succ","head":["name","created_time","ntables","vgroups","replica","quorum","days","keep1,keep2,keep(D)","cache(MB)","blocks","minrows","maxrows","wallevel","fsync","comp","precision","status"],"data":[],"rows":0}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 127.0.0.1:7111/rest/sql
+print 12-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 127.0.0.1:7111/rest/sql
+print 13-> $system_content
+if $system_content != @{"status":"error","code":897,"desc":"Database already exists"}@ then
+  return -1
+endi
+
+#14
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '' 127.0.0.1:7111/rest/sql
+print 14-> $system_content
+if $system_content != @{"status":"error","code":4359,"desc":"no sql input"}@ then
+  return -1
+endi
+
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'use d1' 127.0.0.1:7111/rest/sql
+#print 15-> $system_content
+#if $system_content != @{"status":"error","code":5017,"desc":"no need to execute use db cmd"}@ then
+#if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
+#  return -1
+#endi
+
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  use d1' 127.0.0.1:7111/rest/sql
+#print 16-> $system_content
+#if $system_content != @{"status":"error","code":5017,"desc":"no need to execute use db cmd"}@ then
+#  return -1
+#endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  used1' 127.0.0.1:7111/rest/sql
+print 17-> $system_content
+if $system_content != @{"status":"error","code":534,"desc":"Syntax errr in SQL"}@ then
+  return -1
+endi
+
+#18
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:7111/rest/sql
+print 18-> $system_content
+if $system_content != @{"status":"error","code":896,"desc":"Database not specified or available"}@ then
+  return -1
+endi
+
+print ===============  step3 - db
+
+#19
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:7111/rest/sql/d4
+#print 19-> $system_content
+#if $system_content != @{"status":"error","code":1000,"desc":"invalid DB"}@ then
+#  return -1
+#endi
+
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:7111/rest/sql/d1
+#print 20-> $system_content
+#if $system_content != @{"status":"succ","head":["name","created time","columns","metric"],"data":[],"rows":0}@ then
+#  return -1
+#endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1;' 127.0.0.1:7111/rest/sql
+print 21-> $system_content
+if $system_content != @{"status":"error","code":866,"desc":"Table does not exist"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d1.t1 (ts timestamp, speed int)' 127.0.0.1:7111/rest/sql
+print 22-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:7111/rest/sql
+print 23-> $system_content
+if $system_content != @{"status":"succ","head":["ts","speed"],"data":[],"rows":0}@ then
+  return -1
+endi
+
+#24
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:41.022', 1)" 127.0.0.1:7111/rest/sql
+print 24-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:7111/rest/sql
+print 25-> $system_content
+if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1]],"rows":1}@ then
+  return -1
+endi
+
+#26
+print 25-> no print
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:42.022', 2)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:43.022', 3)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:44.022', 4)" 127.0.0.1:7111/rest/sql
+
+system_content  curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:45.022', 5)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:46.022', 6)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:47.022', 7)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:48.022', 8)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:49.022', 9)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:50.022', 10)" 127.0.0.1:7111/rest/sql
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:51.022', 11)" 127.0.0.1:7111/rest/sql
+
+#27
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:7111/rest/sql
+print 27-> $system_content
+if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d2' 127.0.0.1:7111/rest/sql
+print 28-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d2.t1 (ts timestamp, speed int)' 127.0.0.1:7111/rest/sql
+print 29-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
+  return -1
+endi
+
+#30
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d2.t1 values('2017-12-25 21:28:41.022', 1)" 127.0.0.1:7111/rest/sql
+print 30-> $system_content
+if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d2.t1 ' 127.0.0.1:7111/rest/sql
+print 31-> $system_content
+if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1]],"rows":1}@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f230f98723e041487232c5725b91c4755fe56fcf
--- /dev/null
+++ b/tests/script/general/http/restful_insert.sim
@@ -0,0 +1,53 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+sql create database d1
+sql use d1
+
+sql create table d1.table_rest0 (ts timestamp, i int)
+sql create table d1.table_rest1 (ts timestamp, i int)
+sql create table d1.table_rest2 (ts timestamp, i int)
+sql create table d1.table_rest3 (ts timestamp, i int)
+sql create table d1.table_rest4 (ts timestamp, i int)
+sql create table d1.table_rest5 (ts timestamp, i int)
+sql create table d1.table_rest6 (ts timestamp, i int)
+sql create table d1.table_rest7 (ts timestamp, i int)
+sql create table d1.table_rest8 (ts timestamp, i int)
+sql create table d1.table_rest9 (ts timestamp, i int)
+
+print ===============  step2 - login
+
+system_content curl 127.0.0.1:7111/rest/login/root/taosdata
+print curl 127.0.0.1:7111/rest/login/root/taosdata -----> $system_content
+
+if $system_content != {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"} then
+  return -1
+endi
+
+print ===============  step3 - query data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'insert into d1.table_rest1 values('now+1s', 1) d1.table_rest2 values('now+1s', 1) d1.table_rest3 values('now+1s', 1) d1.table_rest4 values('now+1s', 1) ' 127.0.0.1:7111/rest/sql
+
+print ===============  step5 - query data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_rest1' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7d2b6e9a02fce66a3961177c635929302a92387d
--- /dev/null
+++ b/tests/script/general/http/restful_limit.sim
@@ -0,0 +1,46 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - prepare data
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = st
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bigint, t1 bigint, t2 bigint, t3 bigint, t4 bigint, t5 bigint, t6 bigint, t7 bigint, t8 bigint, t9 bigint, t0 nchar(20)) TAGS(tgcol bigint)
+
+$i = 0
+while $i < 2
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < 2000
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, '你好' ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw
+
+system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d 'select * from db0.st0 limit 100' 127.0.0.1:7111/rest/sql
+print curl 127.0.0.1:7111/rest/sql -----> $system_content
+
+#system_content curl -H 'Authorization: Basic cm9vdDp0YW9zZGF0YQ==' -d "select * from db0.st0 where tbname in ('tb0', 'tb1') limit 1000" 127.0.0.1:7111/rest/sql
+#print curl 127.0.0.1:7111/rest/sql -----> $system_content
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/taos.json b/tests/script/general/http/taos.json
new file mode 100644
index 0000000000000000000000000000000000000000..abc25f19a2e43282a4e474b95387ccf9a6d6b077
--- /dev/null
+++ b/tests/script/general/http/taos.json
@@ -0,0 +1,23 @@
+{
+    "hostIp": "192.168.100.128",
+    "connNum": 1,
+	"insertModel": "insertTable",
+    "waitTime": 0,
+	"tableDesc": "ts timestamp, i int",
+	"tablePrefix": "t",
+	"tablePerConn": 1,
+	"tableCreate": true,
+	"tableStart": 1,
+	"dbName": "db",
+	"dbReplica": 1,
+	"dbKeep": 3650,
+	"dbDays": 7,
+	"metricsName": "mt",
+	"tagNum": 10,
+	"dataNum": 1000,
+	"dataBegin": 1485878400000,
+	"dataInterval": 1000,
+	"dataBatch": 1000,
+	"dataInsert": true,
+	"dataRandom": false
+}
diff --git a/tests/script/general/http/taos_cloud.json b/tests/script/general/http/taos_cloud.json
new file mode 100644
index 0000000000000000000000000000000000000000..c54186b65c58d7a390bb6bc6dbb6130fb09e4b70
--- /dev/null
+++ b/tests/script/general/http/taos_cloud.json
@@ -0,0 +1,21 @@
+{
+    "hostIp": "192.168.100.128",
+    "connNum": 10,
+	"insertModel": "insertTable",
+    "waitTime": 0,
+	"tableDesc": "ts timestamp, i int",
+	"tablePrefix": "t",
+	"tablePerConn": 1,
+	"tableCreate": true,
+	"tableStart": 1,
+	"dbName": "db",
+	"dbKeep": 3650,
+	"metricsName": "mt",
+	"tagNum": 10,
+	"dataNum": 1000,
+	"dataBegin": 1517414400000,
+	"dataInterval": 1000,
+	"dataBatch": 1000,
+	"dataInsert": true,
+	"dataRandom": false
+}
diff --git a/tests/script/general/http/telegraf.json b/tests/script/general/http/telegraf.json
new file mode 100644
index 0000000000000000000000000000000000000000..baf7c5e71148ab360119523740357707eb637b05
--- /dev/null
+++ b/tests/script/general/http/telegraf.json
@@ -0,0 +1,7 @@
+{
+	"hostIp": "192.168.0.1",
+	"machineNum": 100,
+	"loopNum": 100,
+	"dbName": "db",
+	"dataBegin": 1485878400000
+}
diff --git a/tests/script/general/http/telegraf.req b/tests/script/general/http/telegraf.req
new file mode 100644
index 0000000000000000000000000000000000000000..1a3b73299974b31549a218e448e3278a3803d564
--- /dev/null
+++ b/tests/script/general/http/telegraf.req
@@ -0,0 +1,621 @@
+{
+	"metrics": [{
+		"fields": {
+			"result_code": 2,
+			"result_type": "connection_failed"
+		},
+		"name": "net_response",
+		"tags": {
+			"host": "panshi-gsl",
+			"port": "80",
+			"protocol": "tcp",
+			"result": "connection_failed",
+			"server": "localhost"
+		},
+		"timestamp": 1536750390000
+	},{
+		"fields": {
+			"load1": 0.27,
+			"load15": 0.09,
+			"load5": 0.22,
+			"n_cpus": 4,
+			"n_users": 4
+		},
+		"name": "system",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},{
+		"fields": {
+			"uptime": 122
+		},
+		"name": "system",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"uptime_format": " 0:02"
+		},
+		"name": "system",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"bytes_recv": 19964,
+			"bytes_sent": 11077,
+			"drop_in": 0,
+			"drop_out": 0,
+			"err_in": 0,
+			"err_out": 0,
+			"packets_recv": 237,
+			"packets_sent": 124
+		},
+		"name": "net",
+		"tags": {
+			"host": "panshi-gsl",
+			"interface": "eth0"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"usage_guest": 0,
+			"usage_guest_nice": 0,
+			"usage_idle": 99.39879759519036,
+			"usage_iowait": 0,
+			"usage_irq": 0,
+			"usage_nice": 0,
+			"usage_softirq": 0,
+			"usage_steal": 0,
+			"usage_system": 0.300601202404812,
+			"usage_user": 0.30060120240480753
+		},
+		"name": "cpu",
+		"tags": {
+			"cpu": "cpu0",
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"usage_guest": 0,
+			"usage_guest_nice": 0,
+			"usage_idle": 99.79959919839683,
+			"usage_iowait": 0,
+			"usage_irq": 0,
+			"usage_nice": 0,
+			"usage_softirq": 0,
+			"usage_steal": 0,
+			"usage_system": 0.2004008016032065,
+			"usage_user": 0
+		},
+		"name": "cpu",
+		"tags": {
+			"cpu": "cpu1",
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"usage_guest": 0,
+			"usage_guest_nice": 0,
+			"usage_idle": 99.7999999999999,
+			"usage_iowait": 0,
+			"usage_irq": 0,
+			"usage_nice": 0,
+			"usage_softirq": 0,
+			"usage_steal": 0,
+			"usage_system": 0.10000000000000217,
+			"usage_user": 0.09999999999999995
+		},
+		"name": "cpu",
+		"tags": {
+			"cpu": "cpu2",
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"usage_guest": 0,
+			"usage_guest_nice": 0,
+			"usage_idle": 99.7999999999999,
+			"usage_iowait": 0,
+			"usage_irq": 0,
+			"usage_nice": 0,
+			"usage_softirq": 0.09999999999999988,
+			"usage_steal": 0,
+			"usage_system": 0.09999999999999995,
+			"usage_user": 0
+		},
+		"name": "cpu",
+		"tags": {
+			"cpu": "cpu3",
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"usage_guest": 0,
+			"usage_guest_nice": 0,
+			"usage_idle": 99.74956173303289,
+			"usage_iowait": 0,
+			"usage_irq": 0,
+			"usage_nice": 0,
+			"usage_softirq": 0.025043826696719312,
+			"usage_steal": 0,
+			"usage_system": 0.12521913348359823,
+			"usage_user": 0.10017530678687725
+		},
+		"name": "cpu",
+		"tags": {
+			"cpu": "cpu-total",
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"icmp_inaddrmaskreps": 0,
+			"icmp_inaddrmasks": 0,
+			"icmp_indestunreachs": 1,
+			"icmp_inechoreps": 0,
+			"icmp_inechos": 0,
+			"icmp_inerrors": 0,
+			"icmp_inmsgs": 1,
+			"icmp_inparmprobs": 0,
+			"icmp_inredirects": 0,
+			"icmp_insrcquenchs": 0,
+			"icmp_intimeexcds": 0,
+			"icmp_intimestampreps": 0,
+			"icmp_intimestamps": 0,
+			"icmp_outaddrmaskreps": 0,
+			"icmp_outaddrmasks": 0,
+			"icmp_outdestunreachs": 5,
+			"icmp_outechoreps": 0,
+			"icmp_outechos": 0,
+			"icmp_outerrors": 0,
+			"icmp_outmsgs": 5,
+			"icmp_outparmprobs": 0,
+			"icmp_outredirects": 0,
+			"icmp_outsrcquenchs": 0,
+			"icmp_outtimeexcds": 0,
+			"icmp_outtimestampreps": 0,
+			"icmp_outtimestamps": 0,
+			"icmpmsg_intype3": 1,
+			"icmpmsg_outtype3": 5,
+			"ip_defaultttl": 64,
+			"ip_forwarding": 2,
+			"ip_forwdatagrams": 0,
+			"ip_fragcreates": 0,
+			"ip_fragfails": 0,
+			"ip_fragoks": 0,
+			"ip_inaddrerrors": 0,
+			"ip_indelivers": 132,
+			"ip_indiscards": 0,
+			"ip_inhdrerrors": 0,
+			"ip_inreceives": 132,
+			"ip_inunknownprotos": 0,
+			"ip_outdiscards": 0,
+			"ip_outnoroutes": 40,
+			"ip_outrequests": 134,
+			"ip_reasmfails": 0,
+			"ip_reasmoks": 0,
+			"ip_reasmreqds": 0,
+			"ip_reasmtimeout": 0,
+			"tcp_activeopens": 11,
+			"tcp_attemptfails": 11,
+			"tcp_currestab": 0,
+			"tcp_estabresets": 0,
+			"tcp_inerrs": 0,
+			"tcp_insegs": 22,
+			"tcp_maxconn": -1,
+			"tcp_outrsts": 11,
+			"tcp_outsegs": 22,
+			"tcp_passiveopens": 0,
+			"tcp_retranssegs": 0,
+			"tcp_rtoalgorithm": 1,
+			"tcp_rtomax": 120000,
+			"tcp_rtomin": 200,
+			"udp_indatagrams": 101,
+			"udp_inerrors": 0,
+			"udp_noports": 5,
+			"udp_outdatagrams": 109,
+			"udp_rcvbuferrors": 0,
+			"udp_sndbuferrors": 0,
+			"udplite_indatagrams": 0,
+			"udplite_inerrors": 0,
+			"udplite_noports": 0,
+			"udplite_outdatagrams": 0,
+			"udplite_rcvbuferrors": 0,
+			"udplite_sndbuferrors": 0
+		},
+		"name": "net",
+		"tags": {
+			"host": "panshi-gsl",
+			"interface": "all"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"io_time": 44,
+			"iops_in_progress": 0,
+			"read_bytes": 569344,
+			"read_time": 44,
+			"reads": 108,
+			"weighted_io_time": 44,
+			"write_bytes": 0,
+			"write_time": 0,
+			"writes": 0
+		},
+		"name": "diskio",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "sda5"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"io_time": 4900,
+			"iops_in_progress": 0,
+			"read_bytes": 262294528,
+			"read_time": 13607,
+			"reads": 8122,
+			"weighted_io_time": 27970,
+			"write_bytes": 12054528,
+			"write_time": 14369,
+			"writes": 1073
+		},
+		"name": "diskio",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "sda"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"io_time": 4874,
+			"iops_in_progress": 0,
+			"read_bytes": 261522432,
+			"read_time": 13538,
+			"reads": 7963,
+			"weighted_io_time": 27901,
+			"write_bytes": 12054528,
+			"write_time": 14369,
+			"writes": 1073
+		},
+		"name": "diskio",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "sda1"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"io_time": 15,
+			"iops_in_progress": 0,
+			"read_bytes": 2048,
+			"read_time": 15,
+			"reads": 2,
+			"weighted_io_time": 15,
+			"write_bytes": 0,
+			"write_time": 0,
+			"writes": 0
+		},
+		"name": "diskio",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "sda2"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"free": 4106956800,
+			"inodes_free": 526746,
+			"inodes_total": 752192,
+			"inodes_used": 225446,
+			"total": 12112691200,
+			"used": 7390433280,
+			"used_percent": 64.27922535963918
+		},
+		"name": "disk",
+		"tags": {
+			"device": "rootfs",
+			"fstype": "rootfs",
+			"host": "panshi-gsl",
+			"mode": "rw",
+			"path": "/"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"free": 4106956800,
+			"inodes_free": 526746,
+			"inodes_total": 752192,
+			"inodes_used": 225446,
+			"total": 12112691200,
+			"used": 7390433280,
+			"used_percent": 64.27922535963918
+		},
+		"name": "disk",
+		"tags": {
+			"device": "disk/by-uuid/d4becabf-b49c-4c1c-a4ea-b2f593018766",
+			"fstype": "ext3",
+			"host": "panshi-gsl",
+			"mode": "rw",
+			"path": "/"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"boot_time": 1536750268,
+			"context_switches": 135890,
+			"entropy_avail": 514,
+			"interrupts": 112317,
+			"processes_forked": 3595
+		},
+		"name": "kernel",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"active": 211845120,
+			"available": 3829399552,
+			"available_percent": 92.37877479393148,
+			"buffered": 12083200,
+			"cached": 254320640,
+			"commit_limit": 2648322048,
+			"committed_as": 549027840,
+			"dirty": 49152,
+			"free": 3562995712,
+			"high_free": 0,
+			"high_total": 0,
+			"huge_page_size": 2097152,
+			"huge_pages_free": 0,
+			"huge_pages_total": 0,
+			"inactive": 214351872,
+			"low_free": 0,
+			"low_total": 0,
+			"mapped": 81797120,
+			"page_tables": 13062144,
+			"shared": 2682880,
+			"slab": 33386496,
+			"swap_cached": 0,
+			"swap_free": 575660032,
+			"swap_total": 575660032,
+			"total": 4145324032,
+			"used": 315924480,
+			"used_percent": 7.621225206068523,
+			"vmalloc_chunk": 35184198369280,
+			"vmalloc_total": 35184372087808,
+			"vmalloc_used": 168906752,
+			"wired": 0,
+			"write_back": 0,
+			"write_back_tmp": 0
+		},
+		"name": "mem",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"IpExtInBcastOctets": 1291,
+			"IpExtInBcastPkts": 6,
+			"IpExtInMcastOctets": 0,
+			"IpExtInMcastPkts": 0,
+			"IpExtInNoRoutes": 0,
+			"IpExtInOctets": 12160,
+			"IpExtInTruncatedPkts": 0,
+			"IpExtOutBcastOctets": 0,
+			"IpExtOutBcastPkts": 0,
+			"IpExtOutMcastOctets": 0,
+			"IpExtOutMcastPkts": 0,
+			"IpExtOutOctets": 9881,
+			"TcpExtArpFilter": 0,
+			"TcpExtDelayedACKLocked": 0,
+			"TcpExtDelayedACKLost": 0,
+			"TcpExtDelayedACKs": 0,
+			"TcpExtEmbryonicRsts": 0,
+			"TcpExtListenDrops": 0,
+			"TcpExtListenOverflows": 0,
+			"TcpExtLockDroppedIcmps": 0,
+			"TcpExtOfoPruned": 0,
+			"TcpExtOutOfWindowIcmps": 0,
+			"TcpExtPAWSActive": 0,
+			"TcpExtPAWSEstab": 0,
+			"TcpExtPAWSPassive": 0,
+			"TcpExtPruneCalled": 0,
+			"TcpExtRcvPruned": 0,
+			"TcpExtSyncookiesFailed": 0,
+			"TcpExtSyncookiesRecv": 0,
+			"TcpExtSyncookiesSent": 0,
+			"TcpExtTCPAbortFailed": 0,
+			"TcpExtTCPAbortOnClose": 0,
+			"TcpExtTCPAbortOnData": 0,
+			"TcpExtTCPAbortOnLinger": 0,
+			"TcpExtTCPAbortOnMemory": 0,
+			"TcpExtTCPAbortOnSyn": 0,
+			"TcpExtTCPAbortOnTimeout": 0,
+			"TcpExtTCPDSACKIgnoredNoUndo": 0,
+			"TcpExtTCPDSACKIgnoredOld": 0,
+			"TcpExtTCPDSACKOfoRecv": 0,
+			"TcpExtTCPDSACKOfoSent": 0,
+			"TcpExtTCPDSACKOldSent": 0,
+			"TcpExtTCPDSACKRecv": 0,
+			"TcpExtTCPDSACKUndo": 0,
+			"TcpExtTCPDirectCopyFromBacklog": 0,
+			"TcpExtTCPDirectCopyFromPrequeue": 0,
+			"TcpExtTCPFACKReorder": 0,
+			"TcpExtTCPFastRetrans": 0,
+			"TcpExtTCPForwardRetrans": 0,
+			"TcpExtTCPFullUndo": 0,
+			"TcpExtTCPHPAcks": 0,
+			"TcpExtTCPHPHits": 0,
+			"TcpExtTCPHPHitsToUser": 0,
+			"TcpExtTCPLoss": 0,
+			"TcpExtTCPLossFailures": 0,
+			"TcpExtTCPLossUndo": 0,
+			"TcpExtTCPLostRetransmit": 0,
+			"TcpExtTCPMD5NotFound": 0,
+			"TcpExtTCPMD5Unexpected": 0,
+			"TcpExtTCPMemoryPressures": 0,
+			"TcpExtTCPPartialUndo": 0,
+			"TcpExtTCPPrequeueDropped": 0,
+			"TcpExtTCPPrequeued": 0,
+			"TcpExtTCPPureAcks": 0,
+			"TcpExtTCPRcvCollapsed": 0,
+			"TcpExtTCPRenoFailures": 0,
+			"TcpExtTCPRenoRecovery": 0,
+			"TcpExtTCPRenoRecoveryFail": 0,
+			"TcpExtTCPRenoReorder": 0,
+			"TcpExtTCPSACKDiscard": 0,
+			"TcpExtTCPSACKReneging": 0,
+			"TcpExtTCPSACKReorder": 0,
+			"TcpExtTCPSackFailures": 0,
+			"TcpExtTCPSackMerged": 0,
+			"TcpExtTCPSackRecovery": 0,
+			"TcpExtTCPSackRecoveryFail": 0,
+			"TcpExtTCPSackShiftFallback": 0,
+			"TcpExtTCPSackShifted": 0,
+			"TcpExtTCPSchedulerFailed": 0,
+			"TcpExtTCPSlowStartRetrans": 0,
+			"TcpExtTCPSpuriousRTOs": 0,
+			"TcpExtTCPTSReorder": 0,
+			"TcpExtTCPTimeouts": 0,
+			"TcpExtTW": 0,
+			"TcpExtTWKilled": 0,
+			"TcpExtTWRecycled": 0
+		},
+		"name": "nstat",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "netstat"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"IcmpInAddrMaskReps": 0,
+			"IcmpInAddrMasks": 0,
+			"IcmpInDestUnreachs": 1,
+			"IcmpInEchoReps": 0,
+			"IcmpInEchos": 0,
+			"IcmpInErrors": 0,
+			"IcmpInMsgs": 1,
+			"IcmpInParmProbs": 0,
+			"IcmpInRedirects": 0,
+			"IcmpInSrcQuenchs": 0,
+			"IcmpInTimeExcds": 0,
+			"IcmpInTimestampReps": 0,
+			"IcmpInTimestamps": 0,
+			"IcmpMsgInType3": 1,
+			"IcmpMsgOutType3": 5,
+			"IcmpOutAddrMaskReps": 0,
+			"IcmpOutAddrMasks": 0,
+			"IcmpOutDestUnreachs": 5,
+			"IcmpOutEchoReps": 0,
+			"IcmpOutEchos": 0,
+			"IcmpOutErrors": 0,
+			"IcmpOutMsgs": 5,
+			"IcmpOutParmProbs": 0,
+			"IcmpOutRedirects": 0,
+			"IcmpOutSrcQuenchs": 0,
+			"IcmpOutTimeExcds": 0,
+			"IcmpOutTimestampReps": 0,
+			"IcmpOutTimestamps": 0,
+			"IpDefaultTTL": 64,
+			"IpForwDatagrams": 0,
+			"IpForwarding": 2,
+			"IpFragCreates": 0,
+			"IpFragFails": 0,
+			"IpFragOKs": 0,
+			"IpInAddrErrors": 0,
+			"IpInDelivers": 132,
+			"IpInDiscards": 0,
+			"IpInHdrErrors": 0,
+			"IpInReceives": 132,
+			"IpInUnknownProtos": 0,
+			"IpOutDiscards": 0,
+			"IpOutNoRoutes": 40,
+			"IpOutRequests": 134,
+			"IpReasmFails": 0,
+			"IpReasmOKs": 0,
+			"IpReasmReqds": 0,
+			"IpReasmTimeout": 0,
+			"TcpActiveOpens": 12,
+			"TcpAttemptFails": 12,
+			"TcpCurrEstab": 0,
+			"TcpEstabResets": 0,
+			"TcpInErrs": 0,
+			"TcpInSegs": 24,
+			"TcpMaxConn": -1,
+			"TcpOutRsts": 12,
+			"TcpOutSegs": 24,
+			"TcpPassiveOpens": 0,
+			"TcpRetransSegs": 0,
+			"TcpRtoAlgorithm": 1,
+			"TcpRtoMax": 120000,
+			"TcpRtoMin": 200,
+			"UdpInDatagrams": 101,
+			"UdpInErrors": 0,
+			"UdpLiteInDatagrams": 0,
+			"UdpLiteInErrors": 0,
+			"UdpLiteNoPorts": 0,
+			"UdpLiteOutDatagrams": 0,
+			"UdpLiteRcvbufErrors": 0,
+			"UdpLiteSndbufErrors": 0,
+			"UdpNoPorts": 5,
+			"UdpOutDatagrams": 109,
+			"UdpRcvbufErrors": 0,
+			"UdpSndbufErrors": 0
+		},
+		"name": "nstat",
+		"tags": {
+			"host": "panshi-gsl",
+			"name": "snmp"
+		},
+		"timestamp": 1536750390000
+	},
+	{
+		"fields": {
+			"blocked": 0,
+			"dead": 0,
+			"idle": 0,
+			"paging": 0,
+			"running": 1,
+			"sleeping": 181,
+			"stopped": 0,
+			"total": 182,
+			"total_threads": 280,
+			"unknown": 0,
+			"zombies": 0
+		},
+		"name": "processes",
+		"tags": {
+			"host": "panshi-gsl"
+		},
+		"timestamp": 1536750390000
+	}]
+}
\ No newline at end of file
diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4018d9661a0a1d7b445fc9eff416bd40f84d2116
--- /dev/null
+++ b/tests/script/general/http/telegraf.sim
@@ -0,0 +1,292 @@
+system sh/stop_dnodes.sh
+sleep 3000
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
+system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - parse
+system_content curl -u root:taosdata -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/
+print $system_content
+
+if $system_content != @{"status":"error","code":4448,"desc":"database name can not be null"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/
+print $system_content
+
+if $system_content != @{"status":"error","code":4448,"desc":"database name can not be null"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' -d '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/d123456789012345678901234567890123456
+print $system_content
+
+if $system_content != @{"status":"error","code":4449,"desc":"database name too long"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[]' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4453,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4453,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{}]' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4453,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"metrics": []}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4451,"desc":"metrics size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"metrics": [{}]}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4453,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"metrics": 12}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4451,"desc":"metrics size is 0"}@ then
+  return -1
+endi
+
+#system_content curl -u root:taosdata -d  '{"metrics": [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+#print $system_content
+
+#if $system_content != @{"status":"error","code":4452,"desc":"metrics size can not more than 50"}@ then
+#  return -1
+#endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4453,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":111,"tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4454,"desc":"metric name type should be string"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4455,"desc":"metric name length is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234a1234567890123456789012345678901234","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4456,"desc":"metric name length too long"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"}}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4457,"desc":"timestamp not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":""}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4458,"desc":"timestamp type should be integer"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":-1}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4459,"desc":"timestamp value smaller than 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4460,"desc":"tags not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4461,"desc":"tags size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":"","timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4461,"desc":"tags size is 0"}@ then
+  return -1
+endi
+
+#system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor","host":"windows","instance":"1","objectname":"Processor","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata
+#print $system_content
+
+#if $system_content != @{"status":"error","code":4461,"desc":"tags size too long"}@ then
+#  return -1
+#endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4461,"desc":"tags size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"":"windows"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4464,"desc":"tag name is null"}@ then
+  return -1
+endi
+
+#system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host111111111111222222222222222222222":""},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+#print $system_content
+
+#if $system_content != @{"status":"error","code":4465,"desc":"tag name length too long"}@ then
+#  return -1
+#endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":true},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4466,"desc":"tag value type should be number or string"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":""},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4467,"desc":"tag value is null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"5022":"111"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4468,"desc":"table is null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222host111111111111222222222222222222222"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4469,"desc":"table name length too long"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4471,"desc":"fields size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4474,"desc":"field name is null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":"","Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4477,"desc":"field value is null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":true,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1535784122}' 127.0.0.1:7111/telegraf/db/root/taosdata1
+print $system_content
+
+if $system_content != @{"status":"error","code":4476,"desc":"field value type should be number or string"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1564641722000}' 127.0.0.1:7111/telegraf/db
+
+print $system_content
+
+if $system_content != @{"metrics":[{"metric":"win_cpu","stable":"win_cpu","table":"win_cpu_windows_1_Processor","timestamp":"1564641722000","affected_rows":1,"status":"succ"}]}@ then
+  return -1
+endi
+
+sleep 3000
+
+print ===============  step2 - insert single data
+system_content curl -u root:taosdata -d  '{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"windows","instance":"1","objectname":"Processor"},"timestamp":1564641722000}' 127.0.0.1:7111/telegraf/db/
+
+print $system_content
+
+#if $system_content != @{"metrics":[{"metric":"win_cpu","stable":"win_cpu","table":"win_cpu_windows_1_Processor","timestamp":"1564641722000","affected_rows":1,"status":"succ"}]}@ then
+#  return -1
+#endi
+
+system_content curl -u root:taosdata -d  'select * from db.win_cpu_windows_1_Processor' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+#if $system_content != @{"status":"succ","head":["ts","f_percent_dpc_time","f_percent_idle_time","f_percent_interrupt_time","f_percent_privileged_time","f_percent_processor_time","f_percent_user_time"],"data":[["2019-08-01 06:42:02.000",0.000000000,95.598305000,0.000000000,0.000000000,0.000000000,0.000000000]],"rows":1}@ then
+#  return -1
+#endi
+
+print ===============  step3 - multi-query data
+system_content curl -u root:taosdata -d  '{"metrics": [{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"window1","instance":"1","objectname":"Processor"},"timestamp":1564641723000},{"fields":{"Percent_DPC_Time":0,"Percent_Idle_Time":95.59830474853516,"Percent_Interrupt_Time":0,"Percent_Privileged_Time":0,"Percent_Processor_Time":0,"Percent_User_Time":0},"name":"win_cpu","tags":{"host":"window2","instance":"1","objectname":"Processor"},"timestamp":1564641723000}]}' 127.0.0.1:7111/telegraf/db/
+
+print $system_content
+
+if $system_content != @{"metrics":[{"metric":"win_cpu","stable":"win_cpu","table":"win_cpu_window1_1_Processor","timestamp":"1564641723000","affected_rows":1,"status":"succ"},{"metric":"win_cpu","stable":"win_cpu","table":"win_cpu_window2_1_Processor","timestamp":"1564641723000","affected_rows":1,"status":"succ"}]}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select * from db.win_cpu_window1_1_Processor' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+#if $system_content != @{"status":"succ","head":["ts","f_percent_dpc_time","f_percent_idle_time","f_percent_interrupt_time","f_percent_privileged_time","f_percent_processor_time","f_percent_user_time"],"data":[["2019-08-01 14:42:03.000",0.000000000,95.598305000,0.000000000,0.000000000,0.000000000,0.000000000]],"rows":1}@ then
+#  return -1
+#endi
+
+system_content curl -u root:taosdata -d  'select count(*) from db.win_cpu' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+if $system_content != @{"status":"succ","head":["count(*)"],"data":[[3]],"rows":1}@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/http/telegrafTest.go b/tests/script/general/http/telegrafTest.go
new file mode 100644
index 0000000000000000000000000000000000000000..b8cbb43ce81a75f6c3ed3978d44d3479e9d2d844
--- /dev/null
+++ b/tests/script/general/http/telegrafTest.go
@@ -0,0 +1,223 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"sync"
+	"sync/atomic"
+	"time"
+	"flag"
+)
+
+var (
+	token    string
+	url      string
+	config   Config
+	request  int64
+	period   int64
+	errorNum int64
+	template string
+)
+
+type Config struct {
+	HostIp       string `json:"hostIp"`
+	MachineNum   int    `json:"machineNum"`
+	LoopNum      int    `json:"loopNum"`
+	DbName       string `json:"dbName"`
+	DataBegin    int64  `json:"dataBegin"`
+}
+
+type TokenResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Desc   string `json:"desc"`
+}
+
+type JsonResult struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+}
+
+func readConf(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("%s not found", filename)
+		panic(err)
+	}
+	defer file.Close()
+
+	dec := json.NewDecoder(file)
+	err = dec.Decode(&config)
+	if err != nil {
+		println("%s parse error", filename)
+		panic(err)
+	}
+
+	request = 0
+	period = 0
+	errorNum = 0
+
+	fmt.Println("================config parameters======================")
+	fmt.Println("HostIp:", config.HostIp)
+	fmt.Println("MachineNum:", config.MachineNum)
+	fmt.Println("LoopNum:", config.LoopNum)
+	fmt.Println("dbName:", config.DbName)
+	fmt.Println("dataBegin:", config.DataBegin)
+	
+	fmt.Println("================http token=============================")
+	token, err = getToken()
+	url = fmt.Sprintf("http://%s:%d/telegraf/%s", config.HostIp, 6020, config.DbName)
+
+	fmt.Println("httpToken:", token)
+	fmt.Println("httpUrl:", url)
+
+	if err != nil {
+		panic(err)
+	}
+}
+
+func readReq(filename string) {
+	file, err := os.Open(filename)
+	if err != nil {
+		println("%s not found", filename)
+		panic(err)
+	}
+	defer file.Close()
+
+	data, _ := ioutil.ReadAll(file)
+	
+	template = string(data[:])
+ 
+	//fmt.Println(template)
+}
+
+func getToken() (string, error) {
+	resp, err := http.Get(fmt.Sprintf("http://%s:%d/rest/login/%s/%s", config.HostIp, 6020, "root", "taosdata"))
+	if err != nil {
+		return "", err
+	}
+
+	defer resp.Body.Close()
+
+	var tokenResult TokenResult
+
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = json.Unmarshal(data, &tokenResult)
+	if err != nil {
+		return "", err
+	}
+
+	if tokenResult.Status != "succ" {
+		fmt.Println("get http token failed")
+		fmt.Println(tokenResult)
+		return "", err
+	}
+
+	return tokenResult.Desc, nil
+}
+
+func exec(client *http.Client, sql string) {
+	for times := 0; times < 10; times++ {
+
+		req, err1 := http.NewRequest("POST", url, bytes.NewReader([]byte(sql)))
+		if err1 != nil {
+			continue
+		}
+		req.Header.Add("Authorization", "Taosd "+token)
+
+		begin := time.Now()
+		resp, err := client.Do(req)
+
+		if err != nil {
+			continue
+		}
+
+		data, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			fmt.Println(data)
+			resp.Body.Close()
+			continue
+		}
+
+		spend := (time.Since(begin).Nanoseconds())
+
+		var jsonResult JsonResult
+		err = json.Unmarshal(data, &jsonResult)
+		if err != nil {
+			fmt.Println("parse json error: ", string(data[:]))	
+			resp.Body.Close()
+			continue
+		}
+
+		
+		atomic.AddInt64(&request, 1)		
+		atomic.AddInt64(&period, spend)
+
+		if request%1000 == 0 && request != 0 {
+			requestAvg := float64(period) / float64(1000000) / float64(request)
+			qps := float64(1000) / float64(requestAvg) * float64(config.MachineNum)
+			dps := qps * float64(22)
+			fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+		}
+		return
+	}
+	//fmt.Println("xxxx>sql:", sql, ", retryTimes:", 10)
+	fmt.Println("exec sql failed")
+	errorNum++
+}
+
+func writeData(wg *sync.WaitGroup, tbIndex int) {
+	defer wg.Done()
+	client := &http.Client{}
+	
+	tbName := fmt.Sprintf("t%d", tbIndex)
+	
+	for j := 0; j < config.LoopNum; j++ {
+		tmVal := fmt.Sprintf("%d", int64(j)*int64(10000) + config.DataBegin)
+		//fmt.Println(tmVal)
+
+		req1 := strings.Replace(template, "panshi-gsl", tbName, -1)
+		req2 := strings.Replace(req1, "1536750390000", tmVal, -1)
+		
+		//fmt.Println(req2)
+		exec(client, req2)
+	}
+}
+
+func main() {
+	filename := flag.String("config", "telegraf.json", "config file name")
+	
+	flag.Parse()
+	
+	readReq("telegraf.req")
+	
+	readConf(*filename)
+	
+	fmt.Println("\n================telegraf test start======================")
+
+	var wg sync.WaitGroup
+	
+	for i := 0; i < config.MachineNum; i++ {
+		wg.Add(1)
+		go writeData(&wg, i)
+	}
+
+	wg.Wait()
+
+	fmt.Println("\n================telegraf test stop ======================")
+
+	requestAvg := float64(period) / float64(1000000) / float64(request)
+	qps := float64(1000) / float64(requestAvg) * float64(config.MachineNum)
+	dps := qps * float64(22)
+	fmt.Println("====== req:", request, ", error:", errorNum, ", qps:", int64(qps), ", wait:", int64(requestAvg), "ms", ", data per second:", int64(dps))
+}
diff --git a/tests/script/general/http/telegraf_help.txt b/tests/script/general/http/telegraf_help.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a2e6d6e49c9348b8aa257f0362c0baf0875ada01
--- /dev/null
+++ b/tests/script/general/http/telegraf_help.txt
@@ -0,0 +1,24 @@
+1.����
+��main.go����ɿ�ִ���ļ���telegrafTest
+2.ִ��
+./telegrafTest
+3.���� telegraf.json�������ļ�
+  hostIp TDengine����IP��ַ
+  machineNum ģ��Ļ�������
+  loopNum ÿ��������������Ĵ���
+  dbName ���������ݿ�����
+  dataBegin ����ģ�����ݵĿ�ʼʱ���
+4.telegraf.req��ͨ�����䣩
+  1���滻panshi-gsl��1536750380000�������ַ���������http����
+  2��ͨ��http���͸�TDengine
+5.ע��
+  1���޸������ļ�/etc/taos/taos.cfg
+  httpDebugFlag ����Ϊ131��131-httpDebug,135-httpDebug��
+  httpMaxThreads ���ջ���������ã����÷�ΧΪ��1-cpu cores)
+  httpCacheSessions ����Ϊ���ܵ�http���ӵ�2��
+  maxVnodeConnections ����Ϊ100000
+  maxMeterConnections ����Ϊ100000
+  maxShellConns ����Ϊ100000
+  maxMgmtConnections ����Ϊ100000
+  2������linux����������
+  ulimit -n 600000
\ No newline at end of file
diff --git a/tests/script/general/http/testSuite.sim b/tests/script/general/http/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f35362bf070a11e2fa2f1dd870acfe2074c0cbf5
--- /dev/null
+++ b/tests/script/general/http/testSuite.sim
@@ -0,0 +1,10 @@
+run general/http/autocreate.sim
+run general/http/chunked.sim
+run general/http/restful.sim
+run general/http/restful_insert.sim
+run general/http/restful_limit.sim
+run general/http/restful_full.sim
+run general/http/prepare.sim
+run general/http/telegraf.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..07febb2bd52155af1cec70f84a1fe60460815750
--- /dev/null
+++ b/tests/script/general/import/basic.sim
@@ -0,0 +1,146 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database ibadb
+sql use ibadb
+sql create table tb(ts timestamp, i int)
+
+print ================= step1
+
+sql import into tb values(1564641710000, 10000)
+sql select * from tb;
+if $rows != 1 then 
+  return -1
+endi
+
+print ================= step2
+sql insert into tb values(1564641708000, 8000)
+sql select * from tb;
+if $rows != 2 then 
+  return -1
+endi
+
+print ================= step3
+sql insert into tb values(1564641720000, 20000)
+sql select * from tb;
+if $rows != 3 then 
+  return -1
+endi
+
+print ================= step4
+sql import into tb values(1564641708000, 8000)
+sql import into tb values(1564641715000, 15000)
+sql import into tb values(1564641730000, 30000)
+sql select * from tb;
+if $rows != 5 then 
+  return -1
+endi
+
+print ================= step5
+sql insert into tb values(1564641708000, 8000)
+sql insert into tb values(1564641714000, 14000)
+sql insert into tb values(1564641725000, 25000)
+sql insert into tb values(1564641740000, 40000)
+sql select * from tb;
+if $rows != 8 then 
+  return -1
+endi
+
+print ================= step6
+sql import into tb values(1564641707000, 7000)
+sql import into tb values(1564641712000, 12000)
+sql import into tb values(1564641723000, 23000)
+sql import into tb values(1564641734000, 34000)
+sql import into tb values(1564641750000, 50000)
+sql select * from tb;
+if $rows != 13 then 
+  return -1
+endi
+
+print ================= step7
+sql import into tb values(1564641707001, 7001)
+sql import into tb values(1564641712001, 12001)
+sql import into tb values(1564641723001, 23001)
+sql import into tb values(1564641734001, 34001)
+sql import into tb values(1564641750001, 50001)
+sql select * from tb;
+if $rows != 18 then 
+  return -1
+endi
+
+print ================= step8
+sql insert into tb values(1564641708002, 8002)
+sql insert into tb values(1564641714002, 14002)
+sql insert into tb values(1564641725002, 25002)
+sql insert into tb values(1564641900000, 200000)
+sql select * from tb;
+if $rows != 22 then 
+  return -1
+endi
+
+print ================= step9 only insert last one
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step10
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step11
+sql import into tb values(1564642400000, 700000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step12
+sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
+sql select * from tb;
+print rows=> $rows
+if $rows != 26 then
+  return -1
+endi
+
+print ================= step13
+sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
+sql select * from tb;
+print rows=> $rows
+if $rows != 28 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..36d201e9effaa8398f5087c95b8e03f5893a7846
--- /dev/null
+++ b/tests/script/general/import/commit.sim
@@ -0,0 +1,91 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ========= step1
+sql create database ic1db days 7;
+sql create table ic1db.tb(ts timestamp, s int);
+sql insert into ic1db.tb values(now-30d, -30);
+sql insert into ic1db.tb values(now-20d, -20);
+sql insert into ic1db.tb values(now-10d, -10);
+sql insert into ic1db.tb values(now-5d, -5);
+sql insert into ic1db.tb values(now+1m, 1);
+sql insert into ic1db.tb values(now+2m, 2);
+sql insert into ic1db.tb values(now+3m, 6);
+sql insert into ic1db.tb values(now+4m, 8);
+sql insert into ic1db.tb values(now+5m, 10);
+sql insert into ic1db.tb values(now+6m, 12);
+sql insert into ic1db.tb values(now+7m, 14);
+sql insert into ic1db.tb values(now+8m, 16);
+sql select * from ic1db.tb;
+if $rows != 12 then 
+  return -1
+endi
+
+print ========= step2
+sql create database ic2db days 7;
+sql create table ic2db.tb(ts timestamp, s int);
+sql insert into ic2db.tb values(now, 0);
+sql import into ic2db.tb values(now-30d, -30);
+sql import into ic2db.tb values(now-20d, -20);
+sql import into ic2db.tb values(now-10d, -10);
+sql import into ic2db.tb values(now-5d, -5);
+sql import into ic2db.tb values(now+1m, 1);
+sql import into ic2db.tb values(now+2m, 2);
+sql import into ic2db.tb values(now+3m, 6);
+sql import into ic2db.tb values(now+4m, 8);
+sql import into ic2db.tb values(now+5m, 10);
+sql import into ic2db.tb values(now+6m, 12);
+sql import into ic2db.tb values(now+7m, 14);
+sql import into ic2db.tb values(now+8m, 16);
+sql select * from ic2db.tb;
+if $rows != 13 then 
+  return -1
+endi
+
+print ========= step3
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print ========= step4
+sql select * from ic2db.tb;
+if $rows != 13 then
+  print expect 13, actual:$rows
+  return -1
+endi
+
+sql select * from ic1db.tb;
+if $rows != 12 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5bf05a57fbdb3bf3c8bb123215686ccd5bdd4a8e
--- /dev/null
+++ b/tests/script/general/import/large.sim
@@ -0,0 +1,98 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database db
+sql use db
+sql create table tb1(ts timestamp, i int, j float, k double)
+
+print ================= step1
+
+$i = 0
+$timestamp = 1564641700000
+while $i < 1000
+  
+  $val = 10 * $i
+  $val = $val + 2
+  $ts = $timestamp + 200
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 3
+  $ts = $timestamp + 300
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 4
+  $ts = $timestamp + 400
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 5
+  $ts = $timestamp + 500
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 6
+  $ts = $timestamp + 600
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 7
+  $ts = $timestamp + 700
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 8
+  $ts = $timestamp + 800
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 9
+  $ts = $timestamp + 900
+  sql insert into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 1
+  $ts = $timestamp + 100
+  sql import into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $val = 10 * $i
+  $val = $val + 0
+  $ts = $timestamp + 0
+  sql import into tb1 values ( $ts , $val , $val , $val ) 
+  
+  $timestamp = $timestamp + 1000
+  $i = $i + 1
+endw 
+
+print ================= step2
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d450b3fb49883df2d83b2969d951b981c30b65af
--- /dev/null
+++ b/tests/script/general/import/replica1.sim
@@ -0,0 +1,211 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database ir1db days 7
+sql use ir1db
+sql create table tb(ts timestamp, i bigint)
+
+print ================= step1
+sql import into tb values(1520000010000, 1520000010000)
+sql select * from tb;
+print $rows
+if $rows != 1 then 
+  return -1
+endi
+
+print ================= step2
+sql insert into tb values(1520000008000, 1520000008000)
+print $rows
+sql select * from tb;
+if $rows != 2 then 
+  return -1
+endi
+
+print ================= step3
+sql insert into tb values(1520000020000, 1520000020000)
+sql select * from tb;
+print $rows
+if $rows != 3 then 
+  return -1
+endi
+
+print ================= step4
+sql import into tb values(1520000009000, 1520000009000)
+sql import into tb values(1520000015000, 1520000015000)
+sql import into tb values(1520000030000, 1520000030000)
+sql select * from tb;
+print $rows
+if $rows != 6 then 
+  return -1
+endi
+
+print ================= step5
+sql insert into tb values(1520000008000, 1520000008000)
+sql insert into tb values(1520000014000, 1520000014000)
+sql insert into tb values(1520000025000, 1520000025000)
+sql insert into tb values(1520000040000, 1520000040000)
+sql select * from tb;
+print $rows
+if $rows != 9 then 
+  return -1
+endi
+
+print ================= step6
+sql import into tb values(1520000007000, 1520000007000)
+sql import into tb values(1520000012000, 1520000012000)
+sql import into tb values(1520000023000, 1520000023000)
+sql import into tb values(1520000034000, 1520000034000)
+sql import into tb values(1520000050000, 1520000050000)
+sql select * from tb;
+print $rows
+if $rows != 14 then 
+  return -1
+endi
+
+print ================== dnode restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use ir1db
+sql select * from tb;
+if $rows != 14 then 
+  return -1
+endi
+
+print ================= step7
+sql import into tb values(1520000007001, 1520000007001)
+sql import into tb values(1520000012001, 1520000012001)
+sql import into tb values(1520000023001, 1520000023001)
+sql import into tb values(1520000034001, 1520000034001)
+sql import into tb values(1520000050001, 1520000050001)
+sql select * from tb;
+print $rows
+if $rows != 19 then
+  print expect 19, actual: $rows
+  return -1
+endi
+
+print ================= step8
+sql insert into tb values(1520000008002, 1520000008002)
+sql insert into tb values(1520000014002, 1520000014002)
+sql insert into tb values(1520000025002, 1520000025002)
+sql insert into tb values(1520000060000, 1520000060000)
+sql select * from tb;
+print $rows
+if $rows != 23 then 
+  return -1
+endi
+
+print ================= step9
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 1517408000000)
+sql import into tb values(1518272000000, 1518272000000)
+sql import into tb values(1519136000000, 1519136000000)
+sql import into tb values(1519568000000, 1519568000000)
+sql import into tb values(1519654400000, 1519654400000)
+sql import into tb values(1519827200000, 1519827200000)
+sql import into tb values(1520345600000, 1520345600000)
+sql import into tb values(1520691200000, 1520691200000)
+sql import into tb values(1520864000000, 1520864000000)
+sql import into tb values(1521900800000, 1521900800000)
+sql import into tb values(1523110400000, 1523110400000)
+sql import into tb values(1521382400000, 1521382400000)
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use ir1db
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step11
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 1) (1515852800000, 2) (1516025600000, 3) (1516198400000, 4) (1516371200000, 5)
+sql select * from tb;
+if $rows != 40 then 
+  return -1
+endi
+
+print ================= step12
+#1520000000000
+#sql import into tb values(now-19d, -19) (now-18d, -18) (now-17d, -17) (now-16d, -16) (now-15d, -15) (now-14d, -14) (now-13d, -13) (now-12d, -12) (now-11d, -11)
+sql import into tb values(1518358400000, 6) (1518444800000, 7) (1518531200000, 8) (1518617600000, 9) (1518704000000, 10) (1518790400000, 11) (1518876800000, 12) (1518963200000, 13) (1519049600000, 14)
+sql select * from tb;
+print $rows
+if $rows != 49 then 
+  return -1
+endi
+
+
+print ================= step14
+#1520000000000
+#sql import into tb values(now-48d, -48)
+#sql import into tb values(now-38d, -38)
+#sql import into tb values(now-28d, -28)
+
+sql import into tb values(1515852800001, -48)
+sql import into tb values(1516716800000, -38)
+sql import into tb values(1517580800000, -28)
+
+sql select * from tb;
+if $rows != 52 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/import/testSuite.sim b/tests/script/general/import/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9157410ea562ed924725013b81cac2fd78946c75
--- /dev/null
+++ b/tests/script/general/import/testSuite.sim
@@ -0,0 +1,4 @@
+run general/import/basic.sim
+run general/import/commit.sim
+run general/import/large.sim
+run general/import/replica1.sim
diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ba8cff83fa8b470af1b1f7fccf74d0e1d042049e
--- /dev/null
+++ b/tests/script/general/insert/basic.sim
@@ -0,0 +1,50 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_in_db
+$tbPrefix = tb_in_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+$x = 0
+while $x < 10
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+print =============== step 2
+sql insert into $tb values (now - 5m , 10)
+sql insert into $tb values (now - 6m , 10)
+sql insert into $tb values (now - 7m , 10)
+sql insert into $tb values (now - 8m , 10)
+
+sql select * from $tb
+
+print $rows points data are retrieved
+if $rows != 14 then 
+  return -1
+endi
+
+sql drop database $db
+sleep 1000
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..80c16ff8e4c0de45bbc6e43991a96b75b6c924d3
--- /dev/null
+++ b/tests/script/general/insert/insert_drop.sim
@@ -0,0 +1,88 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== insert_drop.sim
+$i = 0
+$db = iddb
+$stb = stb
+
+sql drop database $db -x step1
+step1:
+sql create database $db ctime 30
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+while $i < 10
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , $x ) 
+    $x = $x + 1
+  endw 
+  $i = $i + 1
+endw 
+print ====== tables created
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+sql reset query cache
+sleep 1000
+
+sql use $db
+sql drop table tb5
+
+while $i < 4
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , $x ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+sql reset query cache
+sleep 1000
+
+sql use $db
+
+sql create table tb5 using $stb tags(5)
+sql select * from tb5
+print $rows should be 0
+if $rows != 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6d6daca7b59dbd1a5fa5f1981aab6ca78691474a
--- /dev/null
+++ b/tests/script/general/insert/query_block1_file.sim
@@ -0,0 +1,197 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_1f_db
+$tbPrefix = tb_1f_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+print =============== step 1
+$x = $N
+$y = $N / 2
+while $x > $y
+  $ms = $x . m
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , -$x ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N / 2
+$y = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step 2
+
+$R = 4
+$x = $N * 2
+$y = $N * $R 
+$expect = $y + $N
+$y = $y + $x
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 3
+
+$N1 = $N + 1
+$result1 = $N / 2
+$result2 = $N
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3 
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..83509ad5b0de17500f87591f5cb0a9c3a3c21438
--- /dev/null
+++ b/tests/script/general/insert/query_block1_memory.sim
@@ -0,0 +1,178 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_1m_db
+$tbPrefix = tb_1m_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed int)
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+print =============== step 1
+$x = $N
+$y = $N / 2
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , -$x ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N / 2
+$y = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step 2
+
+$N1 = $N + 1
+$result1 = $N / 2
+$result2 = $N
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..34da170a9ee6cf3af09de374d8c1da54966a6382
--- /dev/null
+++ b/tests/script/general/insert/query_block2_file.sim
@@ -0,0 +1,211 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_2f_db
+$tbPrefix = tb_2f_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+#commit to file will trigger if insert 82 rows 
+$N = 82 
+
+print =============== step 1
+$x = $N * 2
+$y = $N
+$expect = $N
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 2
+
+$R = 4
+$y = $N * $R 
+
+$expect = $y + $N
+$expect = $expect + $N
+
+$x = $N * 3
+$y = $y + $x
+
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+ 
+
+print =============== step 2
+
+$N2 = $N
+$result1 = $N
+$result2 = 2 * $N
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3f2c97a098c35847ae566f6d9fdba0fa85a674d4
--- /dev/null
+++ b/tests/script/general/insert/query_block2_memory.sim
@@ -0,0 +1,174 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_2m_db
+$tbPrefix = tb_2m_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int) 
+
+$N = 82 
+
+$x = $N * 2
+$y = $N
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 2
+
+$result1 = $N
+$result2 = $N * 2
+
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f923ebed13c2f9c592b38dc98ace644fcd8fb671
--- /dev/null
+++ b/tests/script/general/insert/query_file_memory.sim
@@ -0,0 +1,209 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_fm_db
+$tbPrefix = tb_fm_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+$x = $N * 2
+$y = $N
+$expect = $y
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$R = 4
+$R = $R - 1
+
+$y = $N * $R 
+$expect = $y + $N
+$expect = $expect + $N
+
+$x = $N * 3
+$y = $y + $x
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+ 
+
+print =============== step 2
+
+$result1 = $N
+$result2 = $N * 2
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8622fa6f9b47ff2b82305fdfff8d187d7b95c275
--- /dev/null
+++ b/tests/script/general/insert/query_multi_file.sim
@@ -0,0 +1,56 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = tb_mf_db
+$tbPrefix = tb_mf_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+$N = 20000
+
+$x = 0
+
+while $x < $N
+  $ms = $x . s 
+  #print insert into $tb values (now + $ms , $x )
+  sql insert into $tb values (now + $ms , $x ) -x error_insert
+  $x = $x + 1
+endw 
+error_insert:
+
+sql select * from $tb
+print $rows points data are retrieved -> exepct $N rows
+if $rows < $N then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6f9752087d9d5d099703dd851b55305d65726784
--- /dev/null
+++ b/tests/script/general/insert/tcp.sim
@@ -0,0 +1,31 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+sql create database d1;
+sql create table d1.t1(ts timestamp, test binary(1000));
+sql insert into d1.t1 values (now , '1' )
+
+sql create database d2;
+sql create table d2.t2(ts timestamp, test binary(1000));
+sql insert into d2.t2 values (now , '1' )
+
+sql create database db
+sql use db
+sql create table tb (ts timestamp, test binary(1000))
+
+$x = 0
+while $x < 10000
+  $ms = $x . s
+  sql insert into tb values (now + $ms , '1' )
+  $x = $x + 1
+endw 
+
+sql select * from tb
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/insert/testSuite.sim b/tests/script/general/insert/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..da44167be57a6a2083c49c73a02999ba647f513e
--- /dev/null
+++ b/tests/script/general/insert/testSuite.sim
@@ -0,0 +1,9 @@
+run general/insert/basic.sim
+run general/insert/insert_drop.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
diff --git a/tests/script/general/parser/README.txt b/tests/script/general/parser/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1072976380c5e1d9b2fba61110cef3aebe8f0e14
--- /dev/null
+++ b/tests/script/general/parser/README.txt
@@ -0,0 +1,27 @@
+This file contains a brief info about the parser test scripts directory.
+
+The directory contains scripts for TDengine parser testing, mainly focus on syntax parsing and datatype support. The tests are organized in the way database languages are catagorized.
+
+DML: 
+{
+SELECT
+INSERT
+INTERVAL
+FILL
+DESCRIBE
+SHOW
+}
+
+DDL:
+{
+CREATE DATABASE/METRIC/TABLE
+DROP DATABASE/METRIC/TABLE
+}
+
+DCL:
+{
+CREATE ACCOUNT/USER
+DROP ACCOUNT/USER
+*ALTER USER PRIVILEGE
+}
+
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6b28b20fb87d3983fc93a055505415ffa56ac946
--- /dev/null
+++ b/tests/script/general/parser/alter.sim
@@ -0,0 +1,242 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_alt_db
+$tbPrefix = m_alt_tb
+$mtPrefix = m_alt_mt
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== alter.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+##### alter table test, simeplest case
+sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
+sql insert into tb values (now, 1, 1, 1)
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+sql alter table tb drop column c3
+sql select * from tb order by ts desc 
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+sql alter table tb add column c3 nchar(4)
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+sql insert into tb values (now, 2, 2, 'taos')
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+print data03 = $data03
+if $data03 != taos then
+  return -1
+endi
+sql drop table tb
+
+##### alter metric test, simplest case
+sql create table mt (ts timestamp, c1 int, c2 int, c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table mt drop column c3
+sql select * from tb order by ts desc
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then
+  return -1
+endi
+
+sql alter table mt add column c3 nchar(4)
+sql select * from tb order by ts desc
+if $data03 != NULL then
+  return -1
+endi
+sql insert into tb values (now, 2, 2, 'taos')
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+if $data03 != taos then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+sql drop table tb
+sql drop table mt
+
+## [TBASE272]
+sql create table tb (ts timestamp, c1 int, c2 int, c3 int)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table tb drop column c3
+sql alter table tb add column c3 nchar(5)
+sql insert into tb values(now, 2, 2, 'taos')
+sql drop table tb
+sql create table mt (ts timestamp, c1 int, c2 int, c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sql insert into tb values (now, 1, 1, 1)
+sql alter table mt drop column c3
+sql select * from tb order by ts desc
+if $rows != 1 then
+  return -1
+endi
+sql drop table tb
+sql drop table mt
+
+sleep 3000
+### ALTER TABLE WHILE STREAMING [TBASE271]
+#sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
+#sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
+#sql select * from strm
+#if $rows != 0 then
+#  return -1
+#endi
+##sleep 12000
+#sql insert into tb1 values (now, 1, 'taos', 1)
+#sleep 20000
+#sql select * from strm
+#print rows = $rows
+#if $rows != 1 then
+#  return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+#sql alter table tb1 drop column c3
+#sleep 6000
+#sql insert into tb1 values (now, 2, 'taos')
+#sleep 30000
+#sql select * from strm
+#if $rows != 2 then
+#   return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+#sql alter table tb1 add column c3 int
+#sleep 6000
+#sql insert into tb1 values (now, 3, 'taos', 3);
+#sleep 3000
+#sql select * from strm
+#if $rows != 3 then
+#   return -1
+#endi
+#if $data04 != 1 then
+#  return -1
+#endi
+
+## ALTER TABLE AND INSERT BY COLUMNS
+sql create table mt (ts timestamp, c1 int, c2 int) tags(t1 int)
+sql create table tb using mt tags(0)
+sql insert into tb values (now-1m, 1, 1)
+sql alter table mt drop column c2
+sql_error insert into tb (ts, c1, c2) values (now, 2, 2)
+sql insert into tb (ts, c1) values (now, 2)
+sql select * from tb order by ts desc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != null then
+  return -1
+endi
+sql alter table mt add column c2 int
+sql insert into tb (ts, c2) values (now, 3)
+sql select * from tb order by ts desc 
+if $data02 != 3 then
+  return -1
+endi
+
+## ALTER TABLE AND IMPORT
+sql drop database $db
+sql create database $db
+sql use $db
+sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
+sql create table tb using mt tags(1)
+sleep 3000
+sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
+sql alter table mt drop column c3
+
+sql insert into tb values ('2018-11-01 16:29:59.000', 1, 'insert')
+sql import into tb values ('2018-11-01 16:29:59.000', 1, 'import')
+sql select * from tb order by ts desc
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != insert then
+  return -1
+endi
+sql alter table mt add column c3 nchar(4)
+sql select * from tb order by ts desc 
+if $data03 != NULL then
+  return -1
+endi
+
+sql reset query cache
+sql insert into tb values ('2018-11-01 16:29:58.000', 2, 'import', 3)
+sql import into tb values ('2018-11-01 16:29:58.000', 2, 'import', 3)
+sql import into tb values ('2018-11-01 16:39:58.000', 2, 'import', 3)
+sql select * from tb order by ts desc 
+if $rows != 4 then
+  return -1
+endi
+if $data03 != 3 then
+  return -1
+endi
+
+##### ILLEGAL OPERATIONS
+
+# try dropping columns that are defined in metric
+sql_error alter table tb drop column c1;
+
+# try dropping primary key
+sql_error alter table mt drop column ts;
+
+# try modifying two columns in a single statement
+sql_error alter table mt add column c5 nchar(3) c6 nchar(4)
+
+# duplicate columns
+sql_error alter table mt add column c1 int
+
+# drop non-existing columns
+sql_error alter table mt drop column c9
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..24cf79eae148acaa822974f1d5d681983f72405a
--- /dev/null
+++ b/tests/script/general/parser/alter1.sim
@@ -0,0 +1,136 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql reset query cache
+
+$dbPrefix = alt1_db
+
+print ========== alter1.sim
+$db = $dbPrefix
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+
+sql create table stb (ts timestamp, speed double, mileage double) tags(carId int, carModel int)
+sql create table car1 using stb tags (1, 1)
+sql create table car2 using stb tags (2, 1)
+sql create table car3 using stb tags (3, 2)
+sql insert into car1 values (now-1s, 100, 10000)
+sql insert into car2 values (now, 100, 10000)
+sql insert into car3 values (now, 100, 10000)
+sql insert into car1 values (now, 120, 11000)
+print ================== add a column
+sql alter table stb add column c1 int
+sql describe stb
+if $rows != 6 then
+  return -1
+endi
+
+sql select * from stb
+print rows = $rows
+if $rows != 4 then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data23 != NULL then
+  return -1
+endi
+if $data33 != NULL then
+  return -1
+endi
+
+sql select c1 from stb
+if $rows != 4 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+if $data30 != NULL then
+  return -1
+endi
+
+sql select c1+speed from stb
+if $rows != 4 then
+  return -1
+endi
+
+sql select c1+speed from car1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+if $data10 != NULL then
+  return -1
+endi
+
+sql select * from car1
+if $rows != 2 then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+
+sleep 3000
+print ================== insert values into table
+sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
+
+sql select c1+speed from stb where c1 > 0
+if $rows != 3 then
+  return -1
+endi
+
+print ================== add a tag
+sql alter table stb add tag t1 int
+sql describe stb
+if $rows != 7 then
+  return -1
+endi
+if $data60 != t1 then
+  return -1
+endi
+
+print ================== change a tag value
+sql alter table car1 set tag carid=10
+sql select carId, carmodel from car1
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 10 then
+  return -1
+endi
+
+sql select * from stb where carid = 10
+if $rows != 4 then
+  return -1
+endi
+
+sql alter table car2 set tag carmodel = 2
+sql select * from stb where carmodel = 2
+print $rows
+if $rows != 3 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b64c919042296099bf0dbb17eddff67c564a745d
--- /dev/null
+++ b/tests/script/general/parser/alter_stable.sim
@@ -0,0 +1,42 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ========== alter_stable.sim
+
+$db = demodb
+sql drop database if exists $db
+sql create database $db
+sql use $db
+
+##### alter stable test : change tag name
+# case-1  change tag name: new name inclue old name
+sql create table mt1 (ts timestamp, c1 int) tags (a int)
+sql alter table mt1 change tag a abcd
+sql alter table mt1 change tag abcd a
+sql_error alter table mt1 change tag a 1
+
+sql_error create table mtx1 (ts timestamp, c1 int) tags (123 int)
+
+sql create table mt2 (ts timestamp, c1 int) tags (abc012345678901234567890123456789012345678901234567890123456789def int)
+sql create table mt3 (ts timestamp, c1 int) tags (abc012345678901234567890123456789012345678901234567890123456789 int)
+sql_error alter table mt3 change tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg012345678901234567890123456789012345678901234567890123456789
+sql alter table mt3 change tag abc012345678901234567890123456789012345678901234567890123456789 abcdefg0123456789012345678901234567890123456789
+
+# case-2 set tag value
+sql create table mt4 (ts timestamp, c1 int) tags (name binary(16), len int)
+sql create table tb1 using mt4 tags ("beijing", 100)
+sql alter table tb1 set tag name = "shanghai"
+sql alter table tb1 set tag name = ""
+sql alter table tb1 set tag name = "shenzhen"
+sql alter table tb1 set tag len = 379
+
+# test end   
+sql drop database $db
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..64fec4b56d8a6623cd37884e277e0381192410ba
--- /dev/null
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -0,0 +1,308 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = ac_db
+$tbPrefix = ac_tb
+$stbPrefix = ac_stb
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+$ts0 = 1537146000000
+
+print excuting test script auto_create_tb.sim
+print =============== set up
+$i = 0
+$db = $dbPrefix
+$stb = $stbPrefix
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =========== auto_create_tb.sim case1: test
+sql CREATE TABLE $stb (TS TIMESTAMP, C1 INT, C2 BIGINT, C3 FLOAT, C4 DOUBLE, C5 BINARY(10), C6 BOOL, C7 SMALLINT, C8 TINYINT, C9 NCHAR(10)) TAGS (T1 INT)
+sql show stables
+
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $stb then 
+  return -1
+endi
+
+### create table on the fly
+sql insert into tb1 using $stb tags (1) values ( $ts0 , 1,1,1,1,'bin',1,1,1,'涛思数据') 
+sql select * from tb1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data09 != 涛思数据 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 1.00000 then
+  return -1
+endi
+if $data04 != 1.000000000 then
+  return -1
+endi
+if $data05 != bin then
+  return -1
+endi
+
+### insert into an existing table
+$ts1 = $ts0 + 1000
+$ts2 = $ts0 + 2000
+sql insert into tb1 using $stb tags (1) values ( $ts1 , 1,1,1,1,'bin',1,1,1,'涛思数据') ( $ts2 , 2,2,2,2,'binar', 1,1,1,'nchar')
+sql select * from $stb
+if $rows != 3 then
+  return -1
+endi
+if $data19 != 涛思数据 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data22 != 2 then
+  return -2
+endi
+if $data23 != 2.00000 then
+  return -1
+endi
+if $data25 != binar then
+  return -1
+endi
+if $data29 != nchar then
+  return -1
+endi
+
+### [TBASE-410] auto create table with a negative tag value
+$ts1 = $ts0 + 1000
+$ts2 = $ts0 + 2000
+sql insert into tb_1 using $stb tags (-1) values ( $ts1 , 1,1,1,1,'bin',1,1,1,'涛思数据') ( $ts2 , 2,2,2,2,'binar', 1,1,1,'nchar')
+sql select * from $stb
+if $rows != 5 then
+  return -1
+endi
+if $data09 != 涛思数据 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data42 != 2 then
+  return -2
+endi
+if $data43 != 2.00000 then
+  return -1
+endi
+if $data45 != binar then
+  return -1
+endi
+if $data49 != nchar then
+  return -1
+endi
+sql drop table tb_1
+
+#### insert into an existing table with wrong tags
+$ts3 = $ts0 + 3000
+$ts4 = $ts0 + 4000
+sql insert into tb1 using $stb tags (2) values ( $ts3 , 1,1,1,1,'bin',1,1,1,'涛思数据') ( $ts4 , 2,2,2,2,'binar', 1,1,1,'nchar')
+sql select * from $stb
+if $rows != 5 then
+  return -1
+endi
+if $data09 != 涛思数据 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data42 != 2 then
+  return -2
+endi
+if $data43 != 2.00000 then
+  return -1
+endi
+if $data45 != binar then
+  return -1
+endi
+if $data49 != nchar then
+  return -1
+endi
+
+sql drop table tb1
+
+#### auto create multiple tables
+sql insert into tb1 using $stb tags(1) values ( $ts0 , 1, 1, 1, 1, 'bin1', 1, 1, 1, '涛思数据1') tb2 using $stb tags(2) values ( $ts0 , 2, 2, 2, 2, 'bin2', 2, 2, 2, '涛思数据2') tb3 using $stb tags(3) values ( $ts0 , 3, 3, 3, 3, 'bin3', 3, 3, 3, '涛思数据3')
+sql show tables
+print $rows $data00 $data10 $data20
+if $rows != 3 then
+  return -1
+endi
+if $data00 != tb1 then
+  return -1
+endi
+if $data10 != tb2 then
+  return -1
+endi
+if $data20 != tb3 then
+  return -1
+endi
+
+sql select ts,c1,c2,c3,c4,c5,c7,c8,c9 from $stb
+if $rows != 3 then
+  return -1
+endi
+#if $data00 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data01 != 1 then
+  return -1
+endi
+if $data08 != 涛思数据1 then
+  return -1
+endi
+if $data14 != 2.000000000 then
+  return -1
+endi
+if $data18 != 涛思数据2 then
+  return -1
+endi
+if $data28 != 涛思数据3 then
+  return -1
+endi
+
+sql select count(*), first(c9) from $stb group by t1 order by t1 asc slimit 2 soffset 1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 1 then
+  return -1
+endi
+if $data01 != 涛思数据2 then
+  return -1
+endi
+if $data02 != 2 then
+  return -1
+endi
+if $data11 != 涛思数据3 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+sql use $db
+
+#### auto create multiple tables
+sql insert into tb1 using $stb tags(1) values ( $ts0 , 1, 1, 1, 1, 'bin1', 1, 1, 1, '涛思数据1') tb2 using $stb tags(2) values ( $ts0 , 2, 2, 2, 2, 'bin2', 2, 2, 2, '涛思数据2') tb3 using $stb tags(3) values ( $ts0 , 3, 3, 3, 3, 'bin3', 3, 3, 3, '涛思数据3')
+sql show tables
+if $rows != 3 then
+  return -1
+endi
+if $data00 != tb1 then
+  return -1
+endi
+if $data10 != tb2 then
+  return -1
+endi
+if $data20 != tb3 then
+  return -1
+endi
+
+sql select ts,c1,c2,c3,c4,c5,c7,c8,c9 from $stb
+if $rows != 3 then
+  return -1
+endi
+#if $data00 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data01 != 1 then
+  return -1
+endi
+if $data08 != 涛思数据1 then
+  return -1
+endi
+if $data14 != 2.000000000 then
+  return -1
+endi
+if $data18 != 涛思数据2 then
+  return -1
+endi
+if $data28 != 涛思数据3 then
+  return -1
+endi
+
+sql select count(*), first(c9) from $stb group by t1 order by t1 asc slimit 2 soffset 1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 1 then
+  return -1
+endi
+if $data01 != 涛思数据2 then
+  return -1
+endi
+if $data02 != 2 then
+  return -1
+endi
+if $data11 != 涛思数据3 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+
+print ======= too many columns in auto create tables
+sql create table tick (ts timestamp , last_prc double , volume int, amount double, oi int , bid_prc1 double, ask_prc1 double, bid_vol1 int, ask_vol1 int , bid_prc2 double, ask_prc2 double, bid_vol2 int, ask_vol2 int , bid_prc3 double, ask_prc3 double, bid_vol3 int, ask_vol3 int , bid_prc4 double, ask_prc4 double, bid_vol4 int, ask_vol4 int , bid_prc5 double, ask_prc5 double, bid_vol5 int, ask_vol5 int , open_prc double, highest_prc double, low_prc double, close_prc double , upper_limit double, lower_limit double) TAGS (ticker BINARY(32), product BINARY(8));
+sql show stables
+
+if $rows != 2 then
+  return -1
+endi
+
+sql insert into tick_000001 ('ts', 'last_prc', 'volume', 'amount', 'oi', 'bid_prc1', 'ask_prc1') using tick tags (000001, Stocks) VALUES (1546391700000, 0.000000, 0, 0.000000, 0, 0.000000, 10.320000);
+sql select tbname from tick
+if $rows != 1 then
+   return -1
+endi
+
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then 
+#  return -1
+#endi
+
+#[tbase-673]
+sql create table tu(ts timestamp, k int);
+sql_error create table txu using tu tags(0) values(now, 1);
+
+#[TBASE-675]
+sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
+sql select * from tu
+if $rows != 2 then
+    return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..be334bca4ad14930d363160d8e31ff63c5514637
--- /dev/null
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -0,0 +1,85 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c ctime -v 30
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = db
+$tbPrefix = tb
+$stbPrefix = stb
+$tbNum = 5
+$rowNum = 1361
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== auto_create_tb_drop_tb.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db maxrows 200 cache 2
+print ====== create tables
+sql use $db
+
+$i = 0
+$ts = $ts0
+$tb = $tbPrefix . $i
+sql create table $stb (ts timestamp, c1 int) tags (t1 binary(10))
+$x = 0
+$t = 0
+while $t < $tbNum
+  $t1 = 'tb . $t
+  $t1 = $t1 . '
+  $tbname = tb . $t
+  print t = $t
+  print tbname = $tbname
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tbname using $stb tags( $t1 ) values ( $ts , $x ) 
+    $x = $x + 1
+  endw 
+  $t = $t + 1
+  $x = 0
+endw
+print ====== tables created
+
+sleep 60000
+
+sql drop table tb2
+$x = 0
+while $x < $rowNum 
+  $ts = $ts + $delta
+  $t1 = 'tb . $t
+  $t1 = $t1 . '
+  sql insert into tb1 using $stb tags( $t1 ) values ( $ts , $x ) 
+  $x = $x + 1
+endw 
+  
+sleep 6000
+
+$ts = $ts0 + $delta
+$ts = $ts + 1
+
+$x = 0
+while $x < 100
+  $ts = $ts + $delta
+  sql insert into tb2 using stb0 tags('tb2') values ( $ts , 1)
+  sql select * from tb2 
+  $res = $x + 1
+  if $rows != $res then
+    return -1
+  endi
+  if $data01 != 1 then
+    return -1
+  endi
+  $x = $x + 1
+  print loop $x
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c3c867795a30c6e2e87081e59cfbf5f558a60fb7
--- /dev/null
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -0,0 +1,98 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql drop database if exists ecdb
+sql create database ecdb
+sql use ecdb
+
+sql create table tbx (ts timestamp, c1 int, c2 binary(20))
+sql insert into tbx values ('2019-10-05 18:00:01.000', 1, '\'')
+sql insert into tbx values ('2019-10-05 18:00:02.000', 2, '\'abc')
+sql insert into tbx values ('2019-10-05 18:00:03.000', 3, '123\'')
+sql select * from tbx
+print "=====rows:$rows, line0:$data02, line1:$data12, line2:$data22"
+if $data02 != @'@ then
+  return -1
+endi
+
+if $data12 != @'abc@ then
+  return -1
+endi
+
+if $data22 != @123'@ then
+  return -1
+endi
+
+sql create table tb (ts timestamp, c1 binary(20))
+sql insert into tb values ('2019-10-05 18:00:01.000', 'abc''001')
+sql insert into tb values ('2019-10-05 18:00:02.000', 'abc\'002')
+sql insert into tb values ('2019-10-05 18:00:03.000', 'abc\\003')
+sql insert into tb values ('2019-10-05 18:00:04.000', 'abc"004')
+sql insert into tb values ('2019-10-05 18:00:05.000', 'abc\005')
+
+sql insert into tb values ('2019-10-05 18:00:06.000', "udp""001")
+sql insert into tb values ('2019-10-05 18:00:07.000', "udp\"002")
+sql insert into tb values ('2019-10-05 18:00:08.000', "udp\\003")
+sql insert into tb values ('2019-10-05 18:00:09.000', "udp'004")
+sql insert into tb values ('2019-10-05 18:00:10.000', "udp\005")
+
+sql select * from tb limit 5
+print "====rows: $rows "
+if $rows != 5 then
+  return -1
+endi
+
+print "Single quotation ==== data01~05: $data01, $data11, $data21, $data31, $data41 "
+
+if $data01 != @abc'001@ then
+  return -1
+endi
+if $data11 != @abc'002@ then
+  return -1
+endi
+if $data21 != @abc\003@ then
+  #return -1
+  print "[ERROR] expect: abc\003, act:$data21"
+endi
+if $data31 != @abc"004@ then
+  return -1
+endi
+if $data41 != @abc005@ then
+  #return -1
+  print "[ERROR] expect: abc005, act:$data41"
+endi
+
+sql select * from tb limit 5 offset 5
+
+if $rows != 5 then
+  return -1
+endi
+
+print "Double quotation  ==== data01~05: $data01, $data11, $data21, $data31, $data41 "
+
+if $data01 != @udp"001@ then
+  return -1
+endi
+if $data11 != @udp"002@ then
+  return -1
+endi
+if $data21 != @udp\003@ then
+ # return -1
+  print "[ERROR] expect: udp\003, act:$data21"
+endi
+if $data31 != @udp'004@ then
+  return -1
+endi
+if $data41 != @udp005@ then
+  #return -1
+  print "[ERROR] expect: udp005, act:$data41"
+endi
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
new file mode 100644
index 0000000000000000000000000000000000000000..132ecf43428cbb5d12abb1a991136f1cbb335a98
--- /dev/null
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -0,0 +1,94 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ca_db
+$tbPrefix = ca_tb
+$stbPrefix = ca_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== col_arithmetic_operation.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfTbNum = $tbNum / 2
+while $i < $halfTbNum
+  $tbId = $i + $halfTbNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+  
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar ) 
+    $x = $x + 1
+  endw 
+  $i = $i + 1
+endw 
+
+##### select from table
+$tb = $tbPrefix . 0
+## TBASE-344
+sql select c1*2 from $tb
+if $rows != $rowNum then
+  return -1
+endi
+if $data00 != 0.000000000 then
+  return -1
+endi
+if $data10 != 2.000000000 then
+  return -1
+endi
+if $data20 != 4.000000000 then
+  return -1
+endi
+if $data90 != 18.000000000 then
+  return -1
+endi
+
+sql select c4*1+1/2 from $tb
+if $rows != $rowNum then
+  return -1
+endi
+if $data00 != 0.500000000 then
+  return -1
+endi
+if $data10 != 1.500000000 then
+  return -1
+endi
+if $data90 != 9.500000000 then
+  return -1
+endi
+
+#### illegal operations
+sql_error select max(c2*2) from $tb
+sql_error select max(c1-c2) from $tb
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e905f612156eae7575c4884210f8fee7b91e7556
--- /dev/null
+++ b/tests/script/general/parser/columnValue.sim
@@ -0,0 +1,26 @@
+####
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ========== columnValues.sim
+
+sql drop database if exists db
+sql create database db
+sql use db
+
+run general/parser/columnValue_bool.sim
+run general/parser/columnValue_tinyint.sim
+run general/parser/columnValue_smallint.sim
+run general/parser/columnValue_int.sim
+run general/parser/columnValue_bigint.sim
+run general/parser/columnValue_float.sim
+run general/parser/columnValue_double.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
diff --git a/tests/script/general/parser/columnValue_bigint.sim b/tests/script/general/parser/columnValue_bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e6839b2fb60eadf8d5c284cef99f47f470723378
--- /dev/null
+++ b/tests/script/general/parser/columnValue_bigint.sim
@@ -0,0 +1,466 @@
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: bigint
+print ========== bigint 
+sql create table mt_bigint (ts timestamp, c bigint) tags (tagname bigint)
+
+## case 00: static create table for test tag values
+sql create table st_bigint_0  using mt_bigint tags (NULL)
+sql select tagname from  st_bigint_0
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_1  using mt_bigint tags (NULL)
+sql select tagname from  st_bigint_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_2  using mt_bigint tags ('NULL')
+sql select tagname from  st_bigint_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_3  using mt_bigint tags ('NULL')
+sql select tagname from  st_bigint_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_4  using mt_bigint tags ("NULL")
+sql select tagname from  st_bigint_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_5  using mt_bigint tags ("NULL")
+sql select tagname from  st_bigint_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_bigint_6  using mt_bigint tags (-9223372036854775807)
+sql select tagname from  st_bigint_6
+if $data00 != -9223372036854775807 then
+  return -1
+endi
+sql create table st_bigint_7  using mt_bigint tags (9223372036854775807)
+sql select tagname from  st_bigint_7
+if $data00 != 9223372036854775807 then
+  return -1
+endi
+sql create table st_bigint_8  using mt_bigint tags (37)
+sql select tagname from  st_bigint_8
+if $data00 != 37 then
+  return -1
+endi
+sql create table st_bigint_9  using mt_bigint tags (-100)
+sql select tagname from  st_bigint_9
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_bigint_10 using mt_bigint tags (+113)
+sql select tagname from  st_bigint_10
+if $data00 != 113 then
+  return -1
+endi
+sql create table st_bigint_11 using mt_bigint tags ('-100')
+sql select tagname from  st_bigint_11
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_bigint_12 using mt_bigint tags ("+78")
+sql select tagname from  st_bigint_12
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_bigint_13 using mt_bigint tags (+0078)
+sql select tagname from  st_bigint_13
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_bigint_14 using mt_bigint tags (-00078)
+sql select tagname from  st_bigint_14
+if $data00 != -78 then
+  return -1
+endi
+
+## case 01: insert values  for test column values
+sql insert into st_bigint_0  values (now, NULL)
+sql select * from st_bigint_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi 
+sql insert into st_bigint_1  values (now, NULL)
+sql select * from st_bigint_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_bigint_2  values (now, 'NULL')
+sql select * from st_bigint_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_3  values (now, 'NULL')
+sql select * from st_bigint_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_4  values (now, "NULL")
+sql select * from st_bigint_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_5  values (now, "NULL")
+sql select * from st_bigint_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_6  values (now, 9223372036854775807)
+sql select * from st_bigint_6
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 9223372036854775807 then
+  return -1
+endi 
+sql insert into st_bigint_7  values (now, -9223372036854775807)
+sql select * from st_bigint_7
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -9223372036854775807 then
+  return -1
+endi  
+sql insert into st_bigint_8  values (now, +100) 
+sql select * from st_bigint_8
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 100 then
+  return -1
+endi   
+sql insert into st_bigint_9  values (now, "-098")
+sql select * from st_bigint_9
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -98 then
+  return -1
+endi 
+sql insert into st_bigint_10 values (now, '0')
+sql select * from st_bigint_10
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_bigint_11 values (now, -0)  
+sql select * from st_bigint_11
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_bigint_12 values (now, "+056")
+sql select * from st_bigint_12
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_bigint_13 values (now, +056)
+sql select * from st_bigint_13
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_bigint_14 values (now, -056)
+sql select * from st_bigint_14
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_bigint_16 using mt_bigint tags (NULL)   values (now, NULL)
+sql select tagname from  st_bigint_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_16
+if $data01 != NULL then
+  return -1
+endi
+    
+sql insert into st_bigint_17 using mt_bigint tags (NULL)   values (now, NULL)
+sql select tagname from  st_bigint_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_17
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_bigint_18 using mt_bigint tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_bigint_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_18
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_19 using mt_bigint tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_bigint_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_19
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_20 using mt_bigint tags ("NULL") values (now, "NULL")
+sql select tagname from  st_bigint_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_20
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_21 using mt_bigint tags ("NULL") values (now, "NULL")
+sql select tagname from  st_bigint_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_bigint_21
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_bigint_22 using mt_bigint tags (9223372036854775807)  values (now, 9223372036854775807)
+sql select tagname from  st_bigint_22
+if $data00 != 9223372036854775807 then
+  return -1
+endi
+sql select * from st_bigint_22
+if $data01 != 9223372036854775807 then
+  return -1
+endi 
+sql insert into st_bigint_23 using mt_bigint tags (-9223372036854775807)  values (now, -9223372036854775807)
+sql select tagname from  st_bigint_23
+if $data00 != -9223372036854775807 then
+  return -1
+endi
+sql select * from st_bigint_23
+if $data01 != -9223372036854775807 then
+  return -1
+endi  
+sql insert into st_bigint_24 using mt_bigint tags (10)    values (now, 10)
+sql select tagname from  st_bigint_24
+if $data00 != 10 then
+  return -1
+endi
+sql select * from st_bigint_24
+if $data01 != 10 then
+  return -1
+endi    
+sql insert into st_bigint_25 using mt_bigint tags ("-0") values (now, "-0")
+sql select tagname from  st_bigint_25
+if $data00 != 0 then
+  return -1
+endi
+sql select * from st_bigint_25
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_bigint_26 using mt_bigint tags ('123') values (now, '123')
+sql select tagname from  st_bigint_26
+if $data00 != 123 then
+  return -1
+endi
+sql select * from st_bigint_26
+if $data01 != 123 then
+  return -1
+endi 
+sql insert into st_bigint_27 using mt_bigint tags (+056) values (now, +00056)
+sql select tagname from  st_bigint_27
+if $data00 != 56 then
+  return -1
+endi
+sql select * from st_bigint_27
+if $data01 != 56 then
+  return -1
+endi 
+sql insert into st_bigint_28 using mt_bigint tags (-056) values (now, -0056)
+sql select tagname from  st_bigint_28
+if $data00 != -56 then
+  return -1
+endi
+sql select * from st_bigint_28
+if $data01 != -56 then
+  return -1
+endi 
+
+### case 03: alter tag values
+#sql alter table st_bigint_0 set tag tagname=9223372036854775807
+#sql select tagname from  st_bigint_0
+#if $data00 != 9223372036854775807 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname=-9223372036854775807
+#sql select tagname from  st_bigint_0
+#if $data00 != -9223372036854775807 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname=+100
+#sql select tagname from  st_bigint_0
+#if $data00 != 100 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname=-33
+#sql select tagname from  st_bigint_0
+#if $data00 != -33 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname='+98'
+#sql select tagname from  st_bigint_0
+#if $data00 != 98 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname='-076'
+#sql select tagname from  st_bigint_0
+#if $data00 != -76 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname=+0012
+#sql select tagname from  st_bigint_0
+#if $data00 != 12 then
+#  return -1
+#endi
+#sql alter table st_bigint_0 set tag tagname=-00063
+#sql select tagname from  st_bigint_0
+#if $data00 != -63 then
+#  return -1
+#endi
+
+## case 04: illegal input
+################## when overflow, auto set max
+sql       create table st_bigint_e0   using mt_bigint tags (9223372036854775808)
+sql_error create table st_bigint_e0_1 using mt_bigint tags (-9223372036854775808)
+sql       create table st_bigint_e0_2 using mt_bigint tags (92233720368547758080)
+sql_error create table st_bigint_e0_3 using mt_bigint tags (-9223372036854775809)
+#sql_error create table st_bigint_e0 using mt_bigint tags (12.80)   truncate integer part
+#sql_error create table st_bigint_e0 using mt_bigint tags (-11.80)
+sql_error create table st_bigint_e0 using mt_bigint tags (123abc)  
+sql_error create table st_bigint_e0 using mt_bigint tags ("123abc")
+sql_error create table st_bigint_e0 using mt_bigint tags (abc)     
+sql_error create table st_bigint_e0 using mt_bigint tags ("abc")   
+sql_error create table st_bigint_e0 using mt_bigint tags (" ")     
+sql_error create table st_bigint_e0 using mt_bigint tags ('')      
+
+sql create table st_bigint_e0  using mt_bigint tags (123)
+sql create table st_bigint_e1  using mt_bigint tags (123)
+sql create table st_bigint_e2  using mt_bigint tags (123)
+sql create table st_bigint_e3  using mt_bigint tags (123)
+sql create table st_bigint_e4  using mt_bigint tags (123)
+sql create table st_bigint_e5  using mt_bigint tags (123)
+sql create table st_bigint_e6  using mt_bigint tags (123)
+sql create table st_bigint_e7  using mt_bigint tags (123)
+sql create table st_bigint_e8  using mt_bigint tags (123)
+sql create table st_bigint_e9  using mt_bigint tags (123)
+sql create table st_bigint_e10 using mt_bigint tags (123)
+sql create table st_bigint_e11 using mt_bigint tags (123)
+sql create table st_bigint_e12 using mt_bigint tags (123)
+
+sql_error insert into st_bigint_e0  values (now, 9223372036854775808)     
+sql_error insert into st_bigint_e1  values (now, -9223372036854775808)    
+sql_error insert into st_bigint_e2  values (now, 9223372036854775809)    
+sql_error insert into st_bigint_e3  values (now, -9223372036854775808)   
+#sql_error insert into st_bigint_e4  values (now, 922337203.6854775808)   
+#sql_error insert into st_bigint_e5  values (now, -922337203685477580.9)  
+sql_error insert into st_bigint_e6  values (now, 123abc)  
+sql_error insert into st_bigint_e7  values (now, "123abc")
+sql_error insert into st_bigint_e9  values (now, abc)     
+sql_error insert into st_bigint_e10 values (now, "abc")   
+sql_error insert into st_bigint_e11 values (now, " ")     
+sql_error insert into st_bigint_e12 values (now, '')      
+
+sql_error insert into st_bigint_e13 using mt_bigint tags (033) values (now, 9223372036854775808)     
+sql_error insert into st_bigint_e14 using mt_bigint tags (033) values (now, -9223372036854775808)    
+sql_error insert into st_bigint_e15 using mt_bigint tags (033) values (now, 9223372036854775818)    
+sql_error insert into st_bigint_e16 using mt_bigint tags (033) values (now, -9923372036854775808)   
+#sql_error insert into st_bigint_e17 using mt_bigint tags (033) values (now, 92233720368547758.08)   
+#sql_error insert into st_bigint_e18 using mt_bigint tags (033) values (now, -92233720368547.75808)  
+sql_error insert into st_bigint_e19 using mt_bigint tags (033) values (now, 123abc)  
+sql_error insert into st_bigint_e20 using mt_bigint tags (033) values (now, "123abc")
+sql_error insert into st_bigint_e22 using mt_bigint tags (033) values (now, abc)     
+sql_error insert into st_bigint_e23 using mt_bigint tags (033) values (now, "abc")   
+sql_error insert into st_bigint_e24 using mt_bigint tags (033) values (now, " ")     
+sql_error insert into st_bigint_e25 using mt_bigint tags (033) values (now, '')  
+
+sql_error insert into st_bigint_e13_0 using mt_bigint tags (9223372036854775808)      values (now, -033)
+sql_error insert into st_bigint_e14_0 using mt_bigint tags (-9223372036854775808)     values (now, -033)
+sql_error insert into st_bigint_e15_0 using mt_bigint tags (9223372036854775809)     values (now, -033)
+sql_error insert into st_bigint_e16_0 using mt_bigint tags (-9223372036854775898)    values (now, -033)
+#sql_error insert into st_bigint_e17 using mt_bigint tags (12.80)    values (now, -033)
+#sql_error insert into st_bigint_e18 using mt_bigint tags (-11.80)   values (now, -033)
+sql_error insert into st_bigint_e19 using mt_bigint tags (123abc)   values (now, -033)
+sql_error insert into st_bigint_e20 using mt_bigint tags ("123abc") values (now, -033)
+sql_error insert into st_bigint_e22 using mt_bigint tags (abc)      values (now, -033)
+sql_error insert into st_bigint_e23 using mt_bigint tags ("abc")    values (now, -033)
+sql_error insert into st_bigint_e24 using mt_bigint tags (" ")      values (now, -033)
+sql_error insert into st_bigint_e25 using mt_bigint tags ('')       values (now, -033)
+
+sql insert into st_bigint_e13 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e14 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e15 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e16 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e17 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e18 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e19 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e20 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e21 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e22 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e23 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e24 using mt_bigint tags (033) values (now, 00062)
+sql insert into st_bigint_e25 using mt_bigint tags (033) values (now, 00062)
+
+#sql alter table st_bigint_e13 set tag tagname=9223372036854775808
+#sql_error alter table st_bigint_e14 set tag tagname=-9223372036854775808
+#sql alter table st_bigint_e15 set tag tagname=92233720368547758080
+#sql_error alter table st_bigint_e16 set tag tagname=-92233720368547758080
+#sql_error alter table st_bigint_e19 set tag tagname=123abc
+#sql_error alter table st_bigint_e20 set tag tagname="123abc"
+#sql_error alter table st_bigint_e22 set tag tagname=abc
+#sql_error alter table st_bigint_e23 set tag tagname="abc"
+#sql_error alter table st_bigint_e24 set tag tagname=" "
+#sql_error alter table st_bigint_e25 set tag tagname=''
diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/general/parser/columnValue_bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7f3a6c3d6affaefcc2a8d47963ac065c2dc71b25
--- /dev/null
+++ b/tests/script/general/parser/columnValue_bool.sim
@@ -0,0 +1,630 @@
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: bool
+print ========== bool 
+sql create table mt_bool (ts timestamp, c bool) tags (tagname bool)
+
+## case 00: static create table for test tag values
+sql create table st_bool_0  using mt_bool tags (NULL)
+sql select tagname from st_bool_0
+if $data00 != NULL then
+  print ==1== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_1  using mt_bool tags (NULL)
+sql select tagname from st_bool_1
+if $data00 != NULL then
+  print ==2== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_2  using mt_bool tags ('NULL')
+sql select tagname from st_bool_2
+if $data00 != NULL then
+  print ==3== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_3  using mt_bool tags ('NULL')
+sql select tagname from st_bool_3
+if $data00 != NULL then
+  print ==4== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_4  using mt_bool tags ("NULL")
+sql select tagname from st_bool_4
+if $data00 != NULL then
+  print ==5== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_5  using mt_bool tags ("NULL")
+sql select tagname from st_bool_5
+if $data00 != NULL then
+  print ==6== expect: NULL, actually: $data00
+  return -1
+endi
+sql create table st_bool_6  using mt_bool tags ("true")
+sql select tagname from st_bool_6
+if $data00 != 1 then
+  print ==7== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_7  using mt_bool tags ('true')
+sql select tagname from st_bool_7
+if $data00 != 1 then
+  print ==8== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_8  using mt_bool tags (true)
+sql select tagname from st_bool_8
+if $data00 != 1 then
+  print ==9== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_9  using mt_bool tags ("false")
+sql select tagname from st_bool_9
+if $data00 != 0 then
+  print ==10== expect: 0, actually: $data00
+  return -1
+endi
+sql create table st_bool_10 using mt_bool tags ('false')
+sql select tagname from st_bool_10
+if $data00 != 0 then
+  print ==11== expect: 0, actually: $data00
+  return -1
+endi
+sql create table st_bool_11 using mt_bool tags (false)
+sql select tagname from st_bool_11
+if $data00 != 0 then
+  print ==12== expect: 0, actually: $data00
+  return -1
+endi
+sql create table st_bool_12 using mt_bool tags (0)
+sql select tagname from st_bool_12
+if $data00 != 0 then
+  print ==13== expect: 0, actually: $data00
+  return -1
+endi
+sql create table st_bool_13 using mt_bool tags (1)
+sql select tagname from st_bool_13
+if $data00 != 1 then
+  print ==14== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_14 using mt_bool tags (6.9)
+sql select tagname from st_bool_14
+if $data00 != 1 then
+  print ==15== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_15 using mt_bool tags (-3)
+sql select tagname from st_bool_15
+if $data00 != 1 then
+  print ==16== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_15_0 using mt_bool tags (+300)
+sql select tagname from st_bool_15_0
+if $data00 != 1 then
+  print ==16== expect: 1, actually: $data00
+  return -1
+endi
+sql create table st_bool_15_1 using mt_bool tags (-8.03)
+sql select tagname from st_bool_15_1
+if $data00 != 1 then
+  print ==16== expect: 1, actually: $data00
+  return -1
+endi
+
+## case 01: insert values  for test column values
+sql insert into st_bool_0  values (now, NULL)
+sql select * from st_bool_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==17== expect: NULL, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_1  values (now, NULL)
+sql select * from st_bool_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==18== expect: NULL, actually: $data01
+  return -1
+endi  
+sql insert into st_bool_2  values (now, 'NULL')
+sql select * from st_bool_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==19== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_3  values (now, 'NULL')
+sql select * from st_bool_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==20== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_4  values (now, "NULL")
+sql select * from st_bool_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==21== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_5  values (now, "NULL")
+sql select * from st_bool_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  print ==22== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_6  values (now, "true")
+sql select * from st_bool_6
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==23== expect: 1, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_7  values (now, 'true')
+sql select * from st_bool_7
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==24== expect: 1, actually: $data01
+  return -1
+endi  
+sql insert into st_bool_8  values (now, true) 
+sql select * from st_bool_8
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==25== expect: 1, actually: $data01
+  return -1
+endi   
+sql insert into st_bool_9  values (now, "false")
+sql select * from st_bool_9
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  print ==26== expect: false, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_10 values (now, 'false')
+sql select * from st_bool_10
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  print ==27== expect: false, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_11 values (now, false)  
+sql select * from st_bool_11
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  print ==28== expect: false, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_12 values (now, 0)
+sql select * from st_bool_12
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  print ==29== expect: false, actually: $data01
+  return -1
+endi       
+sql insert into st_bool_13 values (now, 1)
+sql select * from st_bool_13
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==30== expect: 1, actually: $data01
+  return -1
+endi       
+sql insert into st_bool_14 values (now, 6.9)
+sql select * from st_bool_14
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==31== expect: 1, actually: $data01
+  return -1
+endi     
+sql insert into st_bool_15 values (now, -3) 
+sql select * from st_bool_15
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==32== expect: true, actually: $data01
+  return -1
+endi     
+sql insert into st_bool_15_0 values (now, +300) 
+sql select * from st_bool_15_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==32== expect: true, actually: $data01
+  return -1
+endi  
+sql insert into st_bool_15_1 values (now, -3.15) 
+sql select * from st_bool_15_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  print ==32== expect: true, actually: $data01
+  return -1
+endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_bool_16 using mt_bool tags (NULL)   values (now, NULL)
+sql select tagname from st_bool_16
+if $data00 != NULL then
+  print ==33== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_16
+if $data01 != NULL then
+  print ==34== expect: NULL, actually: $data01
+  return -1
+endi
+    
+sql insert into st_bool_17 using mt_bool tags (NULL)   values (now, NULL)
+sql select tagname from st_bool_17
+if $data00 != NULL then
+  print ==35== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_17
+if $data01 != NULL then
+  print ==36== expect: NULL, actually: $data01
+  return -1
+endi  
+sql insert into st_bool_18 using mt_bool tags ('NULL') values (now, 'NULL')
+sql select tagname from st_bool_18
+if $data00 != NULL then
+  print ==37== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_18
+if $data01 != NULL then
+  print ==38== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_19 using mt_bool tags ('NULL') values (now, 'NULL')
+sql select tagname from st_bool_19
+if $data00 != NULL then
+  print ==39== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_19
+if $data01 != NULL then
+  print ==40== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_20 using mt_bool tags ("NULL") values (now, "NULL")
+sql select tagname from st_bool_20
+if $data00 != NULL then
+  print ==41== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_20
+if $data01 != NULL then
+  print ==42== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_21 using mt_bool tags ("NULL") values (now, "NULL")
+sql select tagname from st_bool_21
+if $data00 != NULL then
+  print ==43== expect: NULL, actually: $data00
+  return -1
+endi
+sql select * from st_bool_21
+if $data01 != NULL then
+  print ==44== expect: NULL, actually: $data01
+  return -1
+endi
+sql insert into st_bool_22 using mt_bool tags ("true")  values (now, "true")
+sql select tagname from st_bool_22
+if $data00 != 1 then
+  print ==45== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_22
+if $data01 != 1 then
+  print ==46== expect: 1, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_23 using mt_bool tags ('true')  values (now, 'true')
+sql select tagname from st_bool_23
+if $data00 != 1 then
+  print ==47== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_23
+if $data01 != 1 then
+  print ==48== expect: 1, actually: $data01
+  return -1
+endi  
+sql insert into st_bool_24 using mt_bool tags (true)    values (now, true)
+sql select tagname from st_bool_24
+if $data00 != 1 then
+  print ==49== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_24
+if $data01 != 1 then
+  print ==50== expect: 1, actually: $data01
+  return -1
+endi    
+sql insert into st_bool_25 using mt_bool tags ("false") values (now, "false")
+sql select tagname from st_bool_25
+if $data00 != 0 then
+  print ==51== expect: 0, actually: $data00
+  return -1
+endi
+sql select * from st_bool_25
+if $data01 != 0 then
+  print ==52== expect: 0, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_26 using mt_bool tags ('false') values (now, 'false')
+sql select tagname from st_bool_26
+if $data00 != 0 then
+  print ==53== expect: 0, actually: $data00
+  return -1
+endi
+sql select * from st_bool_26
+if $data01 != 0 then
+  print ==54== expect: 0, actually: $data01
+  return -1
+endi 
+sql insert into st_bool_27 using mt_bool tags (false)   values (now, false)
+sql select tagname from st_bool_27
+if $data00 != 0 then
+  print ==55== expect: 0, actually: $data00
+  return -1
+endi
+sql select * from st_bool_27
+if $data01 != 0 then
+  print ==56== expect: 0, actually: $data01
+  return -1
+endi   
+sql insert into st_bool_28 using mt_bool tags (0)       values (now, 0)
+sql select tagname from st_bool_28
+if $data00 != 0 then
+  print ==57== expect: 0, actually: $data00
+  return -1
+endi
+sql select * from st_bool_28
+if $data01 != 0 then
+  print ==58== expect: 0, actually: $data01
+  return -1
+endi       
+sql insert into st_bool_29 using mt_bool tags (1)       values (now, 1) 
+sql select tagname from st_bool_29
+if $data00 != 1 then
+  print ==59== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_29
+if $data01 != 1 then
+  print ==60== expect: 1, actually: $data01
+  return -1
+endi         
+sql insert into st_bool_30 using mt_bool tags (6.9)     values (now, 6.9)
+sql select tagname from st_bool_30
+if $data00 != 1 then
+  print ==61== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_30
+if $data01 != 1 then
+  print ==62== expect: 1, actually: $data01
+  return -1
+endi        
+sql insert into st_bool_31 using mt_bool tags (-3)      values (now, -3)
+sql select tagname from st_bool_31
+if $data00 != 1 then
+  print ==63== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_31
+if $data01 != 1 then
+  print ==64== expect: 1, actually: $data01
+  return -1
+endi         
+sql insert into st_bool_32 using mt_bool tags (+300)      values (now, +300)
+sql select tagname from st_bool_32
+if $data00 != 1 then
+  print ==63== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_32
+if $data01 != 1 then
+  print ==64== expect: 1, actually: $data01
+  return -1
+endi    
+sql insert into st_bool_33 using mt_bool tags (+30.890)      values (now, +30.890)
+sql select tagname from st_bool_33
+if $data00 != 1 then
+  print ==63== expect: 1, actually: $data00
+  return -1
+endi
+sql select * from st_bool_33
+if $data01 != 1 then
+  print ==64== expect: 1, actually: $data01
+  return -1
+endi   
+
+
+
+
+
+
+## case 03: alter tag values
+#sql alter table st_bool_0 set tag tagname=true
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=NULL
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=false
+#sql select tagname from st_bool_0
+#if $data00 != false then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=NULL
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname='true'
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname='NULL'
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname='false'
+#sql select tagname from st_bool_0
+#if $data00 != false then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname='NULL'
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname="true"
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname="NULL"
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname="false"
+#sql select tagname from st_bool_0
+#if $data00 != false then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname="NULL"
+#sql select tagname from st_bool_0
+#if $data00 != NULL then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=1
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=0
+#sql select tagname from st_bool_0
+#if $data00 != false then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=6.9
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+#sql alter table st_bool_0 set tag tagname=-3
+#sql select tagname from st_bool_0
+#if $data00 != true then
+#  return -1
+#endi
+
+# case 04: illegal input
+sql_error create table st_bool_e0 using mt_bool tags (123abc)
+sql_error create table st_bool_e1 using mt_bool tags ("123abc")
+sql_error create table st_bool_e2 using mt_bool tags ("123")
+sql_error create table st_bool_e3 using mt_bool tags (abc)
+sql_error create table st_bool_e4 using mt_bool tags ("abc")
+sql_error create table st_bool_e5 using mt_bool tags (" ")
+sql_error create table st_bool_e6 using mt_bool tags ('')
+
+sql create table st_bool_e0 using mt_bool tags (true)
+sql create table st_bool_e1 using mt_bool tags (true)
+sql create table st_bool_e2 using mt_bool tags (true)
+sql create table st_bool_e3 using mt_bool tags (true)
+sql create table st_bool_e4 using mt_bool tags (true)
+sql create table st_bool_e5 using mt_bool tags (true)
+sql create table st_bool_e6 using mt_bool tags (true)
+
+sql_error insert into st_bool_e0 values (now, 123abc)
+sql_error insert into st_bool_e1 values (now, "123abc")
+sql_error insert into st_bool_e2 values (now, "123")
+sql_error insert into st_bool_e3 values (now, abc)
+sql_error insert into st_bool_e4 values (now, "abc")
+sql_error insert into st_bool_e5 values (now, " ")
+sql_error insert into st_bool_e6 values (now, '')
+
+sql_error insert into st_bool_e10 using mt_bool tags (123abc)   values (now, 1)
+sql_error insert into st_bool_e11 using mt_bool tags ("123abc") values (now, 1)
+sql_error insert into st_bool_e12 using mt_bool tags ("123")    values (now, 1)
+sql_error insert into st_bool_e13 using mt_bool tags (abc)      values (now, 1)
+sql_error insert into st_bool_e14 using mt_bool tags ("abc")    values (now, 1)
+sql_error insert into st_bool_e15 using mt_bool tags (" ")      values (now, 1)
+sql_error insert into st_bool_e16 using mt_bool tags ('')       values (now, 1)
+
+sql_error insert into st_bool_e17 using mt_bool tags (1) values (now, 123abc)  
+sql_error insert into st_bool_e18 using mt_bool tags (1) values (now, "123abc")
+sql_error insert into st_bool_e19 using mt_bool tags (1) values (now, "123")   
+sql_error insert into st_bool_e20 using mt_bool tags (1) values (now, abc)     
+sql_error insert into st_bool_e21 using mt_bool tags (1) values (now, "abc")   
+sql_error insert into st_bool_e22 using mt_bool tags (1) values (now, " ")     
+sql_error insert into st_bool_e23 using mt_bool tags (1) values (now, '')      
+
+sql insert into st_bool_e10 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e11 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e12 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e13 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e14 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e15 using mt_bool tags (1) values (now, 1)
+sql insert into st_bool_e16 using mt_bool tags (1) values (now, 1)
+
+sql_error alter table st_bool_e10 set tag tagname=123abc  
+sql_error alter table st_bool_e11 set tag tagname="123abc"
+sql_error alter table st_bool_e12 set tag tagname="123"  
+sql_error alter table st_bool_e13 set tag tagname=abc     
+sql_error alter table st_bool_e14 set tag tagname="abc"   
+sql_error alter table st_bool_e15 set tag tagname=" "     
+sql_error alter table st_bool_e16 set tag tagname=''      
+
diff --git a/tests/script/general/parser/columnValue_double.sim b/tests/script/general/parser/columnValue_double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..733fc52285a3c90dda50e5bb34a03e51daf4b9ae
--- /dev/null
+++ b/tests/script/general/parser/columnValue_double.sim
@@ -0,0 +1,525 @@
+####
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: double
+print ========== double 
+sql create table mt_double (ts timestamp, c double) tags (tagname double)
+
+## case 00: static create table for test tag values
+sql create table st_double_0  using mt_double tags (NULL )
+sql select tagname from st_double_0
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_1  using mt_double tags (NULL)
+sql select tagname from st_double_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_2  using mt_double tags ('NULL')
+sql select tagname from st_double_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_3  using mt_double tags ('NULL')
+sql select tagname from st_double_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_4  using mt_double tags ("NULL")
+sql select tagname from st_double_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_5  using mt_double tags ("NULL")
+sql select tagname from st_double_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_double_6  using mt_double tags (-123.321)
+sql select tagname from st_double_6
+if $data00 != -123.321000000 then
+  print expect -123.321000000, actual: $data00
+  return -1
+endi
+sql create table st_double_7  using mt_double tags (+1.567)
+sql select tagname from st_double_7
+if $data00 != 1.567000000 then
+  return -1
+endi
+sql create table st_double_8  using mt_double tags (379.001)
+sql select tagname from st_double_8
+if $data00 != 379.001000000 then
+  return -1
+endi
+sql create table st_double_9  using mt_double tags (1.5e+3)
+sql select tagname from st_double_9
+if $data00 != 1500.000000000 then
+  return -1
+endi
+sql create table st_double_10 using mt_double tags (-1.5e-3)
+sql select tagname from st_double_10
+if $data00 != -0.001500000 then
+  return -1
+endi
+sql create table st_double_11 using mt_double tags (+1.5e+3)
+sql select tagname from st_double_11
+if $data00 != 1500.000000000 then
+  return -1
+endi
+sql create table st_double_12 using mt_double tags (-1.5e+3)
+sql select tagname from st_double_12
+if $data00 != -1500.000000000 then
+  return -1
+endi
+sql create table st_double_13 using mt_double tags (1.5e-3)
+sql select tagname from st_double_13
+if $data00 != 0.001500000 then
+  return -1
+endi
+sql create table st_double_14 using mt_double tags (1.5E-3)
+sql select tagname from st_double_14
+if $data00 != 0.001500000 then
+  return -1
+endi
+
+sql create table st_double_6_0  using mt_double tags ('-123.321')
+sql select tagname from st_double_6_0
+if $data00 != -123.321000000 then
+  return -1
+endi
+sql create table st_double_7_0  using mt_double tags ('+1.567')
+sql select tagname from st_double_7_0
+if $data00 != 1.567000000 then
+  return -1
+endi
+sql create table st_double_8_0  using mt_double tags ('379.001')
+sql select tagname from st_double_8_0
+if $data00 != 379.001000000 then
+  return -1
+endi
+sql create table st_double_9_0  using mt_double tags ('1.5e+3')
+sql select tagname from st_double_9_0
+if $data00 != 1500.000000000 then
+  return -1
+endi
+sql create table st_double_10_0 using mt_double tags ('-1.5e-3')
+sql select tagname from st_double_10_0
+if $data00 != -0.001500000 then
+  return -1
+endi
+sql create table st_double_11_0 using mt_double tags ('+1.5e+3')
+sql select tagname from st_double_11_0
+if $data00 != 1500.000000000 then
+  return -1
+endi
+sql create table st_double_12_0 using mt_double tags ('-1.5e+3')
+sql select tagname from st_double_12_0
+if $data00 != -1500.000000000 then
+  return -1
+endi
+sql create table st_double_13_0 using mt_double tags ('1.5e-3')
+sql select tagname from st_double_13_0
+if $data00 != 0.001500000 then
+  return -1
+endi
+sql create table st_double_14_0 using mt_double tags ('1.5E-3')
+sql select tagname from st_double_14_0
+if $data00 != 0.001500000 then
+  return -1
+endi
+sql create table st_double_15_0 using mt_double tags (1.7976931348623157e+308)
+sql select tagname from st_double_15_0
+#if $data00 != 0.001500000 then
+#  return -1
+#endi
+sql create table st_double_16_0 using mt_double tags (-1.7976931348623157e+308)
+sql select tagname from st_double_16_0
+#if $data00 != 0.001500000 then
+#  return -1
+#endi
+
+## case 01: insert values  for test column values
+sql insert into st_double_0  values (now, NULL )
+sql select * from st_double_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi 
+sql insert into st_double_1  values (now, NULL)
+sql select * from st_double_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi  
+sql insert into st_double_2  values (now, 'NULL')
+sql select * from st_double_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_3  values (now, 'NULL')
+sql select * from st_double_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_4  values (now, "NULL")
+sql select * from st_double_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_5  values (now, "NULL")
+sql select * from st_double_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL  then
+  return -1
+endi
+
+sql insert into st_double_6  values (now, 1.7976931348623157e+308)
+sql select * from st_double_6
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 340282346638528859811704183484516925440.00000 then   
+#  print ==== data01:$data01, expect:340282346638528859811704183484516925440.00000
+#  return -1
+#endi 
+sql insert into st_double_7  values (now, -1.7976931348623157e+308)
+sql select * from st_double_7
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -340282346638528859811704183484516925440.00000 then
+#  return -1
+#endi  
+sql insert into st_double_8  values (now, +100.89) 
+sql select * from st_double_8
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 100.89000000 then
+#  return -1
+#endi   
+sql insert into st_double_9  values (now, "-0.98")
+sql select * from st_double_9
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -0.980000000 then
+#  return -1
+#endi 
+sql insert into st_double_10 values (now, '0')
+sql select * from st_double_10
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 0.00000000 then   # tsim only print 4 bits after dot
+#  return -1
+#endi 
+sql insert into st_double_11 values (now, -0)  
+sql select * from st_double_11
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 0.000000000 then
+#  return -1
+#endi 
+sql insert into st_double_12 values (now, "+056")
+sql select * from st_double_12
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 56.000000 then
+#  return -1
+#endi 
+
+sql insert into st_double_13 values (now, +056)
+sql select * from st_double_13
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 56.000000000 then
+#  return -1
+#endi 
+
+sql insert into st_double_14 values (now, -056)
+sql select * from st_double_14
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -56 then
+#  return -1
+#endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_double_16 using mt_double tags (NULL )   values (now, NULL )
+sql select tagname from st_double_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_16
+if $data01 != NULL  then
+  return -1
+endi
+    
+sql insert into st_double_17 using mt_double tags (NULL)   values (now, NULL)
+sql select tagname from st_double_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_17
+if $data01 != NULL  then
+  return -1
+endi  
+sql insert into st_double_18 using mt_double tags ('NULL') values (now, 'NULL')
+sql select tagname from st_double_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_18
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_19 using mt_double tags ('NULL') values (now, 'NULL')
+sql select tagname from st_double_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_19
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_20 using mt_double tags ("NULL") values (now, "NULL")
+sql select tagname from st_double_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_20
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_21 using mt_double tags ("NULL") values (now, "NULL")
+sql select tagname from st_double_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_double_21
+if $data01 != NULL  then
+  return -1
+endi
+sql insert into st_double_22 using mt_double tags (127)  values (now, 1.7976931348623157e+308)
+sql select tagname from st_double_22
+#if $data00 != 127 then
+#  return -1
+#endi
+sql select * from st_double_22
+#if $data01 != 127 then
+#  return -1
+#endi 
+sql insert into st_double_23 using mt_double tags (-127)  values (now, -1.7976931348623157e+308)
+sql select tagname from st_double_23
+#if $data00 != -127 then
+#  return -1
+#endi
+sql select * from st_double_23
+#if $data01 != -127 then
+#  return -1
+#endi  
+sql insert into st_double_24 using mt_double tags (10)    values (now, 10)
+sql select tagname from st_double_24
+#if $data00 != 10 then
+#  return -1
+#endi
+sql select * from st_double_24
+#if $data01 != 10 then
+#  return -1
+#endi    
+sql insert into st_double_25 using mt_double tags ("-0") values (now, "-0")
+sql select tagname from st_double_25
+#if $data00 != 0 then
+#  return -1
+#endi
+sql select * from st_double_25
+#if $data01 != 0 then
+#  return -1
+#endi 
+sql insert into st_double_26 using mt_double tags ('123') values (now, '12.3')
+sql select tagname from st_double_26
+#if $data00 != 123 then
+#  return -1
+#endi
+sql select * from st_double_26
+#if $data01 != 123 then
+#  return -1
+#endi 
+sql insert into st_double_27 using mt_double tags (+056) values (now, +0005.6)
+sql select tagname from st_double_27
+#if $data00 != 56 then
+#  return -1
+#endi
+sql select * from st_double_27
+#if $data01 != 56 then
+#  return -1
+#endi 
+sql insert into st_double_28 using mt_double tags (-056) values (now, -005.6)
+sql select tagname from st_double_28
+#if $data00 != -56 then
+#  return -1
+#endi
+sql select * from st_double_28
+#if $data01 != -56 then
+#  return -1
+#endi 
+
+### case 03: alter tag values
+#sql alter table st_double_0 set tag tagname=1.7976931348623157e+308
+#sql select tagname from st_double_0
+##if $data00 != 127 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname=-1.7976931348623157e+308
+#sql select tagname from st_double_0
+##if $data00 != -127 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname=+10.340
+#sql select tagname from st_double_0
+##if $data00 != 100 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname=-33.87
+#sql select tagname from st_double_0
+##if $data00 != -33 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname='+9.8'
+#sql select tagname from st_double_0
+##if $data00 != 98 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname='-07.6'
+#sql select tagname from st_double_0
+##if $data00 != -76 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname=+0012.871
+#sql select tagname from st_double_0
+##if $data00 != 12 then
+##  return -1
+##endi
+#sql alter table st_double_0 set tag tagname=-00063.582
+#sql select tagname from st_double_0
+##if $data00 != -63 then
+##  return -1
+##endi
+
+## case 04: illegal input
+sql_error create table st_double_e0 using mt_double tags (1.8976931348623157e+308)
+sql_error create table st_double_e0 using mt_double tags (-1.8976931348623157e+308)
+sql_error create table st_double_e0 using mt_double tags (31.7976931348623157e+308)
+sql_error create table st_double_e0 using mt_double tags (-31.7976931348623157e+308)
+#sql_error create table st_double_e0 using mt_double tags (12.80)   truncate integer part
+#sql_error create table st_double_e0 using mt_double tags (-11.80)
+sql_error create table st_double_e0 using mt_double tags (123abc)  
+sql_error create table st_double_e0 using mt_double tags ("123abc")
+sql_error create table st_double_e0 using mt_double tags (abc)     
+sql_error create table st_double_e0 using mt_double tags ("abc")   
+sql_error create table st_double_e0 using mt_double tags (" ")     
+sql_error create table st_double_e0 using mt_double tags ('')      
+
+sql create table st_double_e0  using mt_double tags (123)
+sql create table st_double_e1  using mt_double tags (123)
+sql create table st_double_e2  using mt_double tags (123)
+sql create table st_double_e3  using mt_double tags (123)
+sql create table st_double_e4  using mt_double tags (123)
+sql create table st_double_e5  using mt_double tags (123)
+sql create table st_double_e6  using mt_double tags (123)
+sql create table st_double_e7  using mt_double tags (123)
+sql create table st_double_e8  using mt_double tags (123)
+sql create table st_double_e9  using mt_double tags (123)
+sql create table st_double_e10 using mt_double tags (123)
+sql create table st_double_e11 using mt_double tags (123)
+sql create table st_double_e12 using mt_double tags (123)
+
+sql_error insert into st_double_e0  values (now, 11.7976931348623157e+308)     
+sql_error insert into st_double_e1  values (now, -11.7976931348623157e+308)    
+sql_error insert into st_double_e2  values (now, 111.7976931348623157e+308)    
+sql_error insert into st_double_e3  values (now, -111.7976931348623157e+308)   
+#sql_error insert into st_double_e4  values (now, 12.80)   
+#sql_error insert into st_double_e5  values (now, -11.80)  
+sql_error insert into st_double_e6  values (now, 123abc)  
+sql_error insert into st_double_e7  values (now, "123abc")
+sql_error insert into st_double_e9  values (now, abc)     
+sql_error insert into st_double_e10 values (now, "abc")   
+sql_error insert into st_double_e11 values (now, " ")     
+sql_error insert into st_double_e12 values (now, '')      
+
+sql_error insert into st_double_e13 using mt_double tags (033) values (now, 11.7976931348623157e+308)     
+sql_error insert into st_double_e14 using mt_double tags (033) values (now, -11.7976931348623157e+308)    
+sql_error insert into st_double_e15 using mt_double tags (033) values (now, 131.7976931348623157e+308)    
+sql_error insert into st_double_e16 using mt_double tags (033) values (now, -131.7976931348623157e+308)   
+#sql_error insert into st_double_e17 using mt_double tags (033) values (now, 12.80)   
+#sql_error insert into st_double_e18 using mt_double tags (033) values (now, -11.80)  
+sql_error insert into st_double_e19 using mt_double tags (033) values (now, 123abc)  
+sql_error insert into st_double_e20 using mt_double tags (033) values (now, "123abc")
+sql_error insert into st_double_e22 using mt_double tags (033) values (now, abc)     
+sql_error insert into st_double_e23 using mt_double tags (033) values (now, "abc")   
+sql_error insert into st_double_e24 using mt_double tags (033) values (now, " ")     
+sql_error insert into st_double_e25 using mt_double tags (033) values (now, '')  
+
+sql_error insert into st_double_e13 using mt_double tags (31.7976931348623157e+308)      values (now, -033)
+sql_error insert into st_double_e14 using mt_double tags (-31.7976931348623157e+308)     values (now, -033)
+sql_error insert into st_double_e15 using mt_double tags (131.7976931348623157e+308)     values (now, -033)
+sql_error insert into st_double_e16 using mt_double tags (-131.7976931348623157e+308)    values (now, -033)
+#sql_error insert into st_double_e17 using mt_double tags (12.80)    values (now, -033)
+#sql_error insert into st_double_e18 using mt_double tags (-11.80)   values (now, -033)
+sql_error insert into st_double_e19 using mt_double tags (123abc)   values (now, -033)
+sql_error insert into st_double_e20 using mt_double tags ("123abc") values (now, -033)
+sql_error insert into st_double_e22 using mt_double tags (abc)      values (now, -033)
+sql_error insert into st_double_e23 using mt_double tags ("abc")    values (now, -033)
+sql_error insert into st_double_e24 using mt_double tags (" ")      values (now, -033)
+sql_error insert into st_double_e25 using mt_double tags ('')       values (now, -033)
+
+sql insert into st_double_e13 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e14 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e15 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e16 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e17 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e18 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e19 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e20 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e21 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e22 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e23 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e24 using mt_double tags (033) values (now, 00062)
+sql insert into st_double_e25 using mt_double tags (033) values (now, 00062)
+
+sql_error alter table st_double_e13 set tag tagname=1.8976931348623157e+308 
+sql_error alter table st_double_e14 set tag tagname=-1.8976931348623157e+308    
+sql_error alter table st_double_e15 set tag tagname=131.7976931348623157e+308   
+sql_error alter table st_double_e16 set tag tagname=-131.7976931348623157e+308   
+sql_error alter table st_double_e19 set tag tagname=123abc  
+sql_error alter table st_double_e20 set tag tagname="123abc" 
+sql_error alter table st_double_e22 set tag tagname=abc     
+sql_error alter table st_double_e23 set tag tagname="abc"   
+sql_error alter table st_double_e24 set tag tagname=" "     
+sql_error alter table st_double_e25 set tag tagname=''      
diff --git a/tests/script/general/parser/columnValue_float.sim b/tests/script/general/parser/columnValue_float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c71b4b40ee0d799c6faa619cd10b765959074f11
--- /dev/null
+++ b/tests/script/general/parser/columnValue_float.sim
@@ -0,0 +1,542 @@
+####
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: float
+print ========== float 
+sql create table mt_float (ts timestamp, c float) tags (tagname float)
+
+## case 00: static create table for test tag values
+sql create table st_float_0  using mt_float tags (NULL)
+sql select tagname from  st_float_0
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_1  using mt_float tags (NULL)
+sql select tagname from  st_float_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_2  using mt_float tags ('NULL')
+sql select tagname from  st_float_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_3  using mt_float tags ('NULL')
+sql select tagname from  st_float_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_4  using mt_float tags ("NULL")
+sql select tagname from  st_float_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_5  using mt_float tags ("NULL")
+sql select tagname from  st_float_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_float_6  using mt_float tags (-123.321)
+sql select tagname from  st_float_6
+if $data00 != -123.32100 then
+  print expect -123.32100, actual: $data00
+  return -1
+endi
+sql create table st_float_7  using mt_float tags (+1.567)
+sql select tagname from  st_float_7
+if $data00 != 1.56700 then
+  print expect 1.56700, actual: $data00
+  return -1
+endi
+sql create table st_float_8  using mt_float tags (379.001)
+sql select tagname from  st_float_8
+if $data00 != 379.00101 then
+  print expect 379.00101, actual: $data00
+  return -1
+endi
+sql create table st_float_9  using mt_float tags (1.5e+3)
+sql select tagname from  st_float_9
+if $data00 != 1500.00000 then
+  print expect 1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_10 using mt_float tags (-1.5e-3)
+sql select tagname from  st_float_10
+if $data00 != -0.00150 then
+  print expect -0.00150, actual: $data00
+  return -1
+endi
+sql create table st_float_11 using mt_float tags (+1.5e+3)
+sql select tagname from  st_float_11
+if $data00 != 1500.00000 then
+  print expect 1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_12 using mt_float tags (-1.5e+3)
+sql select tagname from  st_float_12
+if $data00 != -1500.00000 then
+  print expect -1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_13 using mt_float tags (1.5e-3)
+sql select tagname from  st_float_13
+if $data00 != 0.00150 then
+  print expect 0.00150, actual: $data00
+  return -1
+endi
+sql create table st_float_14 using mt_float tags (1.5E-3)
+sql select tagname from  st_float_14
+if $data00 != 0.00150 then
+  print expect 0.00150, actual: $data00
+  return -1
+endi
+
+sql create table st_float_6_0  using mt_float tags ('-123.321')
+sql select tagname from  st_float_6_0
+if $data00 != -123.32100 then
+  print expect -123.32100, actual: $data00
+  return -1
+endi
+sql create table st_float_7_0  using mt_float tags ('+1.567')
+sql select tagname from  st_float_7_0
+if $data00 != 1.56700 then
+  print expect 1.56700, actual: $data00
+  return -1
+endi
+sql create table st_float_8_0  using mt_float tags ('379.001')
+sql select tagname from  st_float_8_0
+if $data00 != 379.00101 then
+  print expect 379.00101, actual: $data00
+  return -1
+endi
+sql create table st_float_9_0  using mt_float tags ('1.5e+3')
+sql select tagname from  st_float_9_0
+if $data00 != 1500.00000 then
+  print expect 1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_10_0 using mt_float tags ('-1.5e-3')
+sql select tagname from  st_float_10_0
+if $data00 != -0.00150 then
+  print expect -0.00150, actual: $data00
+  return -1
+endi
+sql create table st_float_11_0 using mt_float tags ('+1.5e+3')
+sql select tagname from  st_float_11_0
+if $data00 != 1500.00000 then
+  print expect 1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_12_0 using mt_float tags ('-1.5e+3')
+sql select tagname from  st_float_12_0
+if $data00 != -1500.00000 then
+  print expect -1500.00000, actual: $data00
+  return -1
+endi
+sql create table st_float_13_0 using mt_float tags ('1.5e-3')
+sql select tagname from  st_float_13_0
+if $data00 != 0.00150 then
+  print expect 0.00150, actual: $data00
+  return -1
+endi
+sql create table st_float_14_0 using mt_float tags ('1.5E-3')
+sql select tagname from  st_float_14_0
+if $data00 != 0.00150 then
+  print expect 0.00150, actual: $data00
+  return -1
+endi
+sql create table st_float_15_0 using mt_float tags (3.40282347e+38)
+sql select tagname from  st_float_15_0
+#if $data00 != 0.001500 then
+#  return -1
+#endi
+sql create table st_float_16_0 using mt_float tags (-3.40282347e+38)
+sql select tagname from  st_float_16_0
+#if $data00 != 0.001500 then
+#  return -1
+#endi
+
+## case 01: insert values  for test column values
+sql insert into st_float_0  values (now, NULL)
+sql select * from st_float_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi 
+sql insert into st_float_1  values (now, NULL)
+sql select * from st_float_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_float_2  values (now, 'NULL')
+sql select * from st_float_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_3  values (now, 'NULL')
+sql select * from st_float_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_4  values (now, "NULL")
+sql select * from st_float_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_5  values (now, "NULL")
+sql select * from st_float_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+sql insert into st_float_6  values (now, 3.40282347e+38)
+sql select * from st_float_6
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 340282346638528859811704183484516925440.00000 then   
+#  print ==== data01:$data01, expect:340282346638528859811704183484516925440.00000
+#  return -1
+#endi 
+sql insert into st_float_7  values (now, -3.40282347e+38)
+sql select * from st_float_7
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -340282346638528859811704183484516925440.00000 then
+#  return -1
+#endi  
+sql insert into st_float_8  values (now, +100.89) 
+sql select * from st_float_8
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 100.89000 then
+#  return -1
+#endi   
+sql insert into st_float_9  values (now, "-0.98")
+sql select * from st_float_9
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -0.980000 then
+#  return -1
+#endi 
+sql insert into st_float_10 values (now, '0')
+sql select * from st_float_10
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 0.00000 then   # tsim only print 4 bits after dot
+#  return -1
+#endi 
+sql insert into st_float_11 values (now, -0)  
+sql select * from st_float_11
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 0.00000 then
+#  return -1
+#endi 
+sql insert into st_float_12 values (now, "+056")
+sql select * from st_float_12
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 56.000000 then
+#  return -1
+#endi 
+
+sql insert into st_float_13 values (now, +056)
+sql select * from st_float_13
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != 56.000000 then
+#  return -1
+#endi 
+
+sql insert into st_float_14 values (now, -056)
+sql select * from st_float_14
+if $rows != 1 then
+  return -1
+endi
+#if $data01 != -56 then
+#  return -1
+#endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_float_16 using mt_float tags (NULL)   values (now, NULL)
+sql select tagname from  st_float_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_16
+if $data01 != NULL then
+  return -1
+endi
+    
+sql insert into st_float_17 using mt_float tags (NULL)   values (now, NULL)
+sql select tagname from  st_float_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_17
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_float_18 using mt_float tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_float_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_18
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_19 using mt_float tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_float_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_19
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_20 using mt_float tags ("NULL") values (now, "NULL")
+sql select tagname from  st_float_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_20
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_21 using mt_float tags ("NULL") values (now, "NULL")
+sql select tagname from  st_float_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_float_21
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_float_22 using mt_float tags (127)  values (now, 3.40282347e+38)
+sql select tagname from  st_float_22
+#if $data00 != 127 then
+#  return -1
+#endi
+sql select * from st_float_22
+#if $data01 != 127 then
+#  return -1
+#endi 
+sql insert into st_float_23 using mt_float tags (-127)  values (now, -3.40282347e+38)
+sql select tagname from  st_float_23
+#if $data00 != -127 then
+#  return -1
+#endi
+sql select * from st_float_23
+#if $data01 != -127 then
+#  return -1
+#endi  
+sql insert into st_float_24 using mt_float tags (10)    values (now, 10)
+sql select tagname from  st_float_24
+#if $data00 != 10 then
+#  return -1
+#endi
+sql select * from st_float_24
+#if $data01 != 10 then
+#  return -1
+#endi    
+sql insert into st_float_25 using mt_float tags ("-0") values (now, "-0")
+sql select tagname from  st_float_25
+#if $data00 != 0 then
+#  return -1
+#endi
+sql select * from st_float_25
+#if $data01 != 0 then
+#  return -1
+#endi 
+sql insert into st_float_26 using mt_float tags ('123') values (now, '12.3')
+sql select tagname from  st_float_26
+#if $data00 != 123 then
+#  return -1
+#endi
+sql select * from st_float_26
+#if $data01 != 123 then
+#  return -1
+#endi 
+sql insert into st_float_27 using mt_float tags (+056) values (now, +0005.6)
+sql select tagname from  st_float_27
+#if $data00 != 56 then
+#  return -1
+#endi
+sql select * from st_float_27
+#if $data01 != 56 then
+#  return -1
+#endi 
+sql insert into st_float_28 using mt_float tags (-056) values (now, -005.6)
+sql select tagname from  st_float_28
+#if $data00 != -56 then
+#  return -1
+#endi
+sql select * from st_float_28
+#if $data01 != -56 then
+#  return -1
+#endi 
+
+### case 03: alter tag values
+#sql alter table st_float_0 set tag tagname=3.40282347e+38
+#sql select tagname from  st_float_0
+##if $data00 != 127 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname=-3.40282347e+38
+#sql select tagname from  st_float_0
+##if $data00 != -127 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname=+10.340
+#sql select tagname from  st_float_0
+##if $data00 != 100 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname=-33.87
+#sql select tagname from  st_float_0
+##if $data00 != -33 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname='+9.8'
+#sql select tagname from  st_float_0
+##if $data00 != 98 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname='-07.6'
+#sql select tagname from  st_float_0
+##if $data00 != -76 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname=+0012.871
+#sql select tagname from  st_float_0
+##if $data00 != 12 then
+##  return -1
+##endi
+#sql alter table st_float_0 set tag tagname=-00063.582
+#sql select tagname from  st_float_0
+##if $data00 != -63 then
+##  return -1
+##endi
+
+## case 04: illegal input
+sql_error create table st_float_e0 using mt_float tags (3.50282347e+38)
+sql_error create table st_float_e0 using mt_float tags (-3.50282347e+38)
+sql_error create table st_float_e0 using mt_float tags (333.40282347e+38)
+sql_error create table st_float_e0 using mt_float tags (-333.40282347e+38)
+#sql_error create table st_float_e0 using mt_float tags (12.80)   truncate integer part
+#sql_error create table st_float_e0 using mt_float tags (-11.80)
+sql_error create table st_float_e0 using mt_float tags (123abc)  
+sql_error create table st_float_e0 using mt_float tags ("123abc")
+sql_error create table st_float_e0 using mt_float tags (abc)     
+sql_error create table st_float_e0 using mt_float tags ("abc")   
+sql_error create table st_float_e0 using mt_float tags (" ")     
+sql_error create table st_float_e0 using mt_float tags ('')      
+
+sql create table st_float_e0  using mt_float tags (123)
+sql create table st_float_e1  using mt_float tags (123)
+sql create table st_float_e2  using mt_float tags (123)
+sql create table st_float_e3  using mt_float tags (123)
+sql create table st_float_e4  using mt_float tags (123)
+sql create table st_float_e5  using mt_float tags (123)
+sql create table st_float_e6  using mt_float tags (123)
+sql create table st_float_e7  using mt_float tags (123)
+sql create table st_float_e8  using mt_float tags (123)
+sql create table st_float_e9  using mt_float tags (123)
+sql create table st_float_e10 using mt_float tags (123)
+sql create table st_float_e11 using mt_float tags (123)
+sql create table st_float_e12 using mt_float tags (123)
+
+sql_error insert into st_float_e0  values (now, 3.50282347e+38)     
+sql_error insert into st_float_e1  values (now, -3.50282347e+38)    
+sql_error insert into st_float_e2  values (now, 13.40282347e+38)    
+sql_error insert into st_float_e3  values (now, -13.40282347e+38)   
+#sql_error insert into st_float_e4  values (now, 12.80)   
+#sql_error insert into st_float_e5  values (now, -11.80)  
+sql_error insert into st_float_e6  values (now, 123abc)  
+sql_error insert into st_float_e7  values (now, "123abc")
+sql_error insert into st_float_e9  values (now, abc)     
+sql_error insert into st_float_e10 values (now, "abc")   
+sql_error insert into st_float_e11 values (now, " ")     
+sql_error insert into st_float_e12 values (now, '')      
+
+sql_error insert into st_float_e13 using mt_float tags (033) values (now, 3.50282347e+38)     
+sql_error insert into st_float_e14 using mt_float tags (033) values (now, -3.50282347e+38)    
+sql_error insert into st_float_e15 using mt_float tags (033) values (now, 13.40282347e+38)    
+sql_error insert into st_float_e16 using mt_float tags (033) values (now, -13.40282347e+38)   
+#sql_error insert into st_float_e17 using mt_float tags (033) values (now, 12.80)   
+#sql_error insert into st_float_e18 using mt_float tags (033) values (now, -11.80)  
+sql_error insert into st_float_e19 using mt_float tags (033) values (now, 123abc)  
+sql_error insert into st_float_e20 using mt_float tags (033) values (now, "123abc")
+sql_error insert into st_float_e22 using mt_float tags (033) values (now, abc)     
+sql_error insert into st_float_e23 using mt_float tags (033) values (now, "abc")   
+sql_error insert into st_float_e24 using mt_float tags (033) values (now, " ")     
+sql_error insert into st_float_e25 using mt_float tags (033) values (now, '')  
+
+sql_error insert into st_float_e13 using mt_float tags (3.50282347e+38)      values (now, -033)
+sql_error insert into st_float_e14 using mt_float tags (-3.50282347e+38)     values (now, -033)
+sql_error insert into st_float_e15 using mt_float tags (13.40282347e+38)     values (now, -033)
+sql_error insert into st_float_e16 using mt_float tags (-13.40282347e+38)    values (now, -033)
+#sql_error insert into st_float_e17 using mt_float tags (12.80)    values (now, -033)
+#sql_error insert into st_float_e18 using mt_float tags (-11.80)   values (now, -033)
+sql_error insert into st_float_e19 using mt_float tags (123abc)   values (now, -033)
+sql_error insert into st_float_e20 using mt_float tags ("123abc") values (now, -033)
+sql_error insert into st_float_e22 using mt_float tags (abc)      values (now, -033)
+sql_error insert into st_float_e23 using mt_float tags ("abc")    values (now, -033)
+sql_error insert into st_float_e24 using mt_float tags (" ")      values (now, -033)
+sql_error insert into st_float_e25 using mt_float tags ('')       values (now, -033)
+
+sql insert into st_float_e13 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e14 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e15 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e16 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e17 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e18 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e19 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e20 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e21 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e22 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e23 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e24 using mt_float tags (033) values (now, 00062)
+sql insert into st_float_e25 using mt_float tags (033) values (now, 00062)
+
+sql_error alter table st_float_e13 set tag tagname=3.50282347e+38     
+sql_error alter table st_float_e14 set tag tagname=-3.50282347e+38    
+sql_error alter table st_float_e15 set tag tagname=13.40282347e+38   
+sql_error alter table st_float_e16 set tag tagname=-13.40282347e+38   
+sql_error alter table st_float_e19 set tag tagname=123abc  
+sql_error alter table st_float_e20 set tag tagname="123abc" 
+sql_error alter table st_float_e22 set tag tagname=abc     
+sql_error alter table st_float_e23 set tag tagname="abc"   
+sql_error alter table st_float_e24 set tag tagname=" "     
+sql_error alter table st_float_e25 set tag tagname=''      
diff --git a/tests/script/general/parser/columnValue_int.sim b/tests/script/general/parser/columnValue_int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2a909ebf3c64dd487d6d4b1bd5341c59794e8970
--- /dev/null
+++ b/tests/script/general/parser/columnValue_int.sim
@@ -0,0 +1,465 @@
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: int
+print ========== int 
+sql create table mt_int (ts timestamp, c int) tags (tagname int)
+
+## case 00: static create table for test tag values
+sql create table st_int_0  using mt_int tags (NULL)
+sql select tagname from  st_int_0
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_1  using mt_int tags (NULL)
+sql select tagname from  st_int_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_2  using mt_int tags ('NULL')
+sql select tagname from  st_int_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_3  using mt_int tags ('NULL')
+sql select tagname from  st_int_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_4  using mt_int tags ("NULL")
+sql select tagname from  st_int_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_5  using mt_int tags ("NULL")
+sql select tagname from  st_int_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_int_6  using mt_int tags (-2147483647)
+sql select tagname from  st_int_6
+if $data00 != -2147483647 then
+  return -1
+endi
+sql create table st_int_7  using mt_int tags (2147483647)
+sql select tagname from  st_int_7
+if $data00 != 2147483647 then
+  return -1
+endi
+sql create table st_int_8  using mt_int tags (37)
+sql select tagname from  st_int_8
+if $data00 != 37 then
+  return -1
+endi
+sql create table st_int_9  using mt_int tags (-100)
+sql select tagname from  st_int_9
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_int_10 using mt_int tags (+113)
+sql select tagname from  st_int_10
+if $data00 != 113 then
+  return -1
+endi
+sql create table st_int_11 using mt_int tags ('-100')
+sql select tagname from  st_int_11
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_int_12 using mt_int tags ("+78")
+sql select tagname from  st_int_12
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_int_13 using mt_int tags (+0078)
+sql select tagname from  st_int_13
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_int_14 using mt_int tags (-00078)
+sql select tagname from  st_int_14
+if $data00 != -78 then
+  return -1
+endi
+
+## case 01: insert values  for test column values
+sql insert into st_int_0  values (now, NULL)
+sql select * from st_int_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi 
+sql insert into st_int_1  values (now, NULL)
+sql select * from st_int_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_int_2  values (now, 'NULL')
+sql select * from st_int_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_3  values (now, 'NULL')
+sql select * from st_int_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_4  values (now, "NULL")
+sql select * from st_int_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_5  values (now, "NULL")
+sql select * from st_int_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_6  values (now, 2147483647)
+sql select * from st_int_6
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 2147483647 then
+  return -1
+endi 
+sql insert into st_int_7  values (now, -2147483647)
+sql select * from st_int_7
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -2147483647 then
+  return -1
+endi  
+sql insert into st_int_8  values (now, +100) 
+sql select * from st_int_8
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 100 then
+  return -1
+endi   
+sql insert into st_int_9  values (now, "-098")
+sql select * from st_int_9
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -98 then
+  return -1
+endi 
+sql insert into st_int_10 values (now, '0')
+sql select * from st_int_10
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_int_11 values (now, -0)  
+sql select * from st_int_11
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_int_12 values (now, "+056")
+sql select * from st_int_12
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_int_13 values (now, +056)
+sql select * from st_int_13
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_int_14 values (now, -056)
+sql select * from st_int_14
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_int_16 using mt_int tags (NULL)   values (now, NULL)
+sql select tagname from  st_int_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_16
+if $data01 != NULL then
+  return -1
+endi
+    
+sql insert into st_int_17 using mt_int tags (NULL)   values (now, NULL)
+sql select tagname from  st_int_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_17
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_int_18 using mt_int tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_int_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_18
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_19 using mt_int tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_int_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_19
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_20 using mt_int tags ("NULL") values (now, "NULL")
+sql select tagname from  st_int_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_20
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_21 using mt_int tags ("NULL") values (now, "NULL")
+sql select tagname from  st_int_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_int_21
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_int_22 using mt_int tags (2147483647)  values (now, 2147483647)
+sql select tagname from  st_int_22
+if $data00 != 2147483647 then
+  return -1
+endi
+sql select * from st_int_22
+if $data01 != 2147483647 then
+  return -1
+endi 
+sql insert into st_int_23 using mt_int tags (-2147483647)  values (now, -2147483647)
+sql select tagname from  st_int_23
+if $data00 != -2147483647 then
+  return -1
+endi
+sql select * from st_int_23
+if $data01 != -2147483647 then
+  return -1
+endi  
+sql insert into st_int_24 using mt_int tags (10)    values (now, 10)
+sql select tagname from  st_int_24
+if $data00 != 10 then
+  return -1
+endi
+sql select * from st_int_24
+if $data01 != 10 then
+  return -1
+endi    
+sql insert into st_int_25 using mt_int tags ("-0") values (now, "-0")
+sql select tagname from  st_int_25
+if $data00 != 0 then
+  return -1
+endi
+sql select * from st_int_25
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_int_26 using mt_int tags ('123') values (now, '123')
+sql select tagname from  st_int_26
+if $data00 != 123 then
+  return -1
+endi
+sql select * from st_int_26
+if $data01 != 123 then
+  return -1
+endi 
+sql insert into st_int_27 using mt_int tags (+056) values (now, +00056)
+sql select tagname from  st_int_27
+if $data00 != 56 then
+  return -1
+endi
+sql select * from st_int_27
+if $data01 != 56 then
+  return -1
+endi 
+sql insert into st_int_28 using mt_int tags (-056) values (now, -0056)
+sql select tagname from  st_int_28
+if $data00 != -56 then
+  return -1
+endi
+sql select * from st_int_28
+if $data01 != -56 then
+  return -1
+endi 
+
+### case 03: alter tag values
+#sql alter table st_int_0 set tag tagname=2147483647
+#sql select tagname from  st_int_0
+#if $data00 != 2147483647 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname=-2147483647
+#sql select tagname from  st_int_0
+#if $data00 != -2147483647 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname=+100
+#sql select tagname from  st_int_0
+#if $data00 != 100 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname=-33
+#sql select tagname from  st_int_0
+#if $data00 != -33 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname='+98'
+#sql select tagname from  st_int_0
+#if $data00 != 98 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname='-076'
+#sql select tagname from  st_int_0
+#if $data00 != -76 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname=+0012
+#sql select tagname from  st_int_0
+#if $data00 != 12 then
+#  return -1
+#endi
+#sql alter table st_int_0 set tag tagname=-00063
+#sql select tagname from  st_int_0
+#if $data00 != -63 then
+#  return -1
+#endi
+
+## case 04: illegal input
+sql_error create table st_int_e0 using mt_int tags (2147483648)
+sql_error create table st_int_e0 using mt_int tags (-2147483648)
+sql_error create table st_int_e0 using mt_int tags (214748364800)
+sql_error create table st_int_e0 using mt_int tags (-214748364800)
+#sql_error create table st_int_e0 using mt_int tags (12.80)   truncate integer part
+#sql_error create table st_int_e0 using mt_int tags (-11.80)
+sql_error create table st_int_e0 using mt_int tags (123abc)  
+sql_error create table st_int_e0 using mt_int tags ("123abc")
+sql_error create table st_int_e0 using mt_int tags (abc)     
+sql_error create table st_int_e0 using mt_int tags ("abc")   
+sql_error create table st_int_e0 using mt_int tags (" ")     
+sql_error create table st_int_e0 using mt_int tags ('')      
+
+sql create table st_int_e0  using mt_int tags (123)
+sql create table st_int_e1  using mt_int tags (123)
+sql create table st_int_e2  using mt_int tags (123)
+sql create table st_int_e3  using mt_int tags (123)
+sql create table st_int_e4  using mt_int tags (123)
+sql create table st_int_e5  using mt_int tags (123)
+sql create table st_int_e6  using mt_int tags (123)
+sql create table st_int_e7  using mt_int tags (123)
+sql create table st_int_e8  using mt_int tags (123)
+sql create table st_int_e9  using mt_int tags (123)
+sql create table st_int_e10 using mt_int tags (123)
+sql create table st_int_e11 using mt_int tags (123)
+sql create table st_int_e12 using mt_int tags (123)
+
+sql_error insert into st_int_e0  values (now, 2147483648)     
+sql_error insert into st_int_e1  values (now, -2147483648)    
+sql_error insert into st_int_e2  values (now, 3147483648)    
+sql_error insert into st_int_e3  values (now, -21474836481)   
+#sql_error insert into st_int_e4  values (now, 12.80)   
+#sql_error insert into st_int_e5  values (now, -11.80)  
+sql_error insert into st_int_e6  values (now, 123abc)  
+sql_error insert into st_int_e7  values (now, "123abc")
+sql_error insert into st_int_e9  values (now, abc)     
+sql_error insert into st_int_e10 values (now, "abc")   
+sql_error insert into st_int_e11 values (now, " ")     
+sql_error insert into st_int_e12 values (now, '')      
+
+sql_error insert into st_int_e13 using mt_int tags (033) values (now, 2147483648)     
+sql_error insert into st_int_e14 using mt_int tags (033) values (now, -2147483648)    
+sql_error insert into st_int_e15 using mt_int tags (033) values (now, 5147483648)    
+sql_error insert into st_int_e16 using mt_int tags (033) values (now, -21474836481)   
+#sql_error insert into st_int_e17 using mt_int tags (033) values (now, 12.80)   
+#sql_error insert into st_int_e18 using mt_int tags (033) values (now, -11.80)  
+sql_error insert into st_int_e19 using mt_int tags (033) values (now, 123abc)  
+sql_error insert into st_int_e20 using mt_int tags (033) values (now, "123abc")
+sql_error insert into st_int_e22 using mt_int tags (033) values (now, abc)     
+sql_error insert into st_int_e23 using mt_int tags (033) values (now, "abc")   
+sql_error insert into st_int_e24 using mt_int tags (033) values (now, " ")     
+sql_error insert into st_int_e25 using mt_int tags (033) values (now, '')  
+
+sql_error insert into st_int_e13 using mt_int tags (2147483648)      values (now, -033)
+sql_error insert into st_int_e14 using mt_int tags (-2147483648)     values (now, -033)
+sql_error insert into st_int_e15 using mt_int tags (21474836480)     values (now, -033)
+sql_error insert into st_int_e16 using mt_int tags (-2147483649)    values (now, -033)
+#sql_error insert into st_int_e17 using mt_int tags (12.80)    values (now, -033)
+#sql_error insert into st_int_e18 using mt_int tags (-11.80)   values (now, -033)
+sql_error insert into st_int_e19 using mt_int tags (123abc)   values (now, -033)
+sql_error insert into st_int_e20 using mt_int tags ("123abc") values (now, -033)
+sql_error insert into st_int_e22 using mt_int tags (abc)      values (now, -033)
+sql_error insert into st_int_e23 using mt_int tags ("abc")    values (now, -033)
+sql_error insert into st_int_e24 using mt_int tags (" ")      values (now, -033)
+sql_error insert into st_int_e25 using mt_int tags ('')       values (now, -033)
+
+sql insert into st_int_e13 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e14 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e15 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e16 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e17 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e18 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e19 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e20 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e21 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e22 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e23 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e24 using mt_int tags (033) values (now, 00062)
+sql insert into st_int_e25 using mt_int tags (033) values (now, 00062)
+
+sql_error alter table st_int_e13 set tag tagname=2147483648     
+sql_error alter table st_int_e14 set tag tagname=-2147483648    
+sql_error alter table st_int_e15 set tag tagname=12147483648    
+sql_error alter table st_int_e16 set tag tagname=-3147483648
+sql_error alter table st_int_e19 set tag tagname=123abc  
+sql_error alter table st_int_e20 set tag tagname="123abc" 
+sql_error alter table st_int_e22 set tag tagname=abc     
+sql_error alter table st_int_e23 set tag tagname="abc"   
+sql_error alter table st_int_e24 set tag tagname=" "     
+sql_error alter table st_int_e25 set tag tagname=''      
diff --git a/tests/script/general/parser/columnValue_smallint.sim b/tests/script/general/parser/columnValue_smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cf34a85a2a7d8efb7b1d4e4606cead89055ae3b1
--- /dev/null
+++ b/tests/script/general/parser/columnValue_smallint.sim
@@ -0,0 +1,465 @@
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: smallint
+print ========== smallint 
+sql create table mt_smallint (ts timestamp, c smallint) tags (tagname smallint)
+
+## case 00: static create table for test tag values
+sql create table st_smallint_0  using mt_smallint tags (NULL)
+sql select tagname from st_smallint_0
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_1  using mt_smallint tags (NULL)
+sql select tagname from st_smallint_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_2  using mt_smallint tags ('NULL')
+sql select tagname from st_smallint_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_3  using mt_smallint tags ('NULL')
+sql select tagname from st_smallint_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_4  using mt_smallint tags ("NULL")
+sql select tagname from st_smallint_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_5  using mt_smallint tags ("NULL")
+sql select tagname from st_smallint_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_smallint_6  using mt_smallint tags (-32767)
+sql select tagname from st_smallint_6
+if $data00 != -32767 then
+  return -1
+endi
+sql create table st_smallint_7  using mt_smallint tags (32767)
+sql select tagname from st_smallint_7
+if $data00 != 32767 then
+  return -1
+endi
+sql create table st_smallint_8  using mt_smallint tags (37)
+sql select tagname from st_smallint_8
+if $data00 != 37 then
+  return -1
+endi
+sql create table st_smallint_9  using mt_smallint tags (-100)
+sql select tagname from st_smallint_9
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_smallint_10 using mt_smallint tags (+113)
+sql select tagname from st_smallint_10
+if $data00 != 113 then
+  return -1
+endi
+sql create table st_smallint_11 using mt_smallint tags ('-100')
+sql select tagname from st_smallint_11
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_smallint_12 using mt_smallint tags ("+78")
+sql select tagname from st_smallint_12
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_smallint_13 using mt_smallint tags (+0078)
+sql select tagname from st_smallint_13
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_smallint_14 using mt_smallint tags (-00078)
+sql select tagname from st_smallint_14
+if $data00 != -78 then
+  return -1
+endi
+
+## case 01: insert values  for test column values
+sql insert into st_smallint_0  values (now, NULL)
+sql select * from st_smallint_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi 
+sql insert into st_smallint_1  values (now, NULL)
+sql select * from st_smallint_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_smallint_2  values (now, 'NULL')
+sql select * from st_smallint_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_3  values (now, 'NULL')
+sql select * from st_smallint_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_4  values (now, "NULL")
+sql select * from st_smallint_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_5  values (now, "NULL")
+sql select * from st_smallint_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_6  values (now, 32767)
+sql select * from st_smallint_6
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 32767 then
+  return -1
+endi 
+sql insert into st_smallint_7  values (now, -32767)
+sql select * from st_smallint_7
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -32767 then
+  return -1
+endi  
+sql insert into st_smallint_8  values (now, +100) 
+sql select * from st_smallint_8
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 100 then
+  return -1
+endi   
+sql insert into st_smallint_9  values (now, "-098")
+sql select * from st_smallint_9
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -98 then
+  return -1
+endi 
+sql insert into st_smallint_10 values (now, '0')
+sql select * from st_smallint_10
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_smallint_11 values (now, -0)  
+sql select * from st_smallint_11
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_smallint_12 values (now, "+056")
+sql select * from st_smallint_12
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_smallint_13 values (now, +056)
+sql select * from st_smallint_13
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_smallint_14 values (now, -056)
+sql select * from st_smallint_14
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_smallint_16 using mt_smallint tags (NULL)   values (now, NULL)
+sql select tagname from st_smallint_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_16
+if $data01 != NULL then
+  return -1
+endi
+    
+sql insert into st_smallint_17 using mt_smallint tags (NULL)   values (now, NULL)
+sql select tagname from st_smallint_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_17
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_smallint_18 using mt_smallint tags ('NULL') values (now, 'NULL')
+sql select tagname from st_smallint_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_18
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_19 using mt_smallint tags ('NULL') values (now, 'NULL')
+sql select tagname from st_smallint_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_19
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_20 using mt_smallint tags ("NULL") values (now, "NULL")
+sql select tagname from st_smallint_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_20
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_21 using mt_smallint tags ("NULL") values (now, "NULL")
+sql select tagname from st_smallint_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_smallint_21
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_smallint_22 using mt_smallint tags (32767)  values (now, 32767)
+sql select tagname from st_smallint_22
+if $data00 != 32767 then
+  return -1
+endi
+sql select * from st_smallint_22
+if $data01 != 32767 then
+  return -1
+endi 
+sql insert into st_smallint_23 using mt_smallint tags (-32767)  values (now, -32767)
+sql select tagname from st_smallint_23
+if $data00 != -32767 then
+  return -1
+endi
+sql select * from st_smallint_23
+if $data01 != -32767 then
+  return -1
+endi  
+sql insert into st_smallint_24 using mt_smallint tags (10)    values (now, 10)
+sql select tagname from st_smallint_24
+if $data00 != 10 then
+  return -1
+endi
+sql select * from st_smallint_24
+if $data01 != 10 then
+  return -1
+endi    
+sql insert into st_smallint_25 using mt_smallint tags ("-0") values (now, "-0")
+sql select tagname from st_smallint_25
+if $data00 != 0 then
+  return -1
+endi
+sql select * from st_smallint_25
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_smallint_26 using mt_smallint tags ('123') values (now, '123')
+sql select tagname from st_smallint_26
+if $data00 != 123 then
+  return -1
+endi
+sql select * from st_smallint_26
+if $data01 != 123 then
+  return -1
+endi 
+sql insert into st_smallint_27 using mt_smallint tags (+056) values (now, +00056)
+sql select tagname from st_smallint_27
+if $data00 != 56 then
+  return -1
+endi
+sql select * from st_smallint_27
+if $data01 != 56 then
+  return -1
+endi 
+sql insert into st_smallint_28 using mt_smallint tags (-056) values (now, -0056)
+sql select tagname from st_smallint_28
+if $data00 != -56 then
+  return -1
+endi
+sql select * from st_smallint_28
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 03: alter tag values
+#sql alter table st_smallint_0 set tag tagname=32767
+#sql select tagname from st_smallint_0
+#if $data00 != 32767 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname=-32767
+#sql select tagname from st_smallint_0
+#if $data00 != -32767 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname=+100
+#sql select tagname from st_smallint_0
+#if $data00 != 100 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname=-33
+#sql select tagname from st_smallint_0
+#if $data00 != -33 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname='+98'
+#sql select tagname from st_smallint_0
+#if $data00 != 98 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname='-076'
+#sql select tagname from st_smallint_0
+#if $data00 != -76 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname=+0012
+#sql select tagname from st_smallint_0
+#if $data00 != 12 then
+#  return -1
+#endi
+#sql alter table st_smallint_0 set tag tagname=-00063
+#sql select tagname from st_smallint_0
+#if $data00 != -63 then
+#  return -1
+#endi
+
+## case 04: illegal input
+sql_error create table st_smallint_e0 using mt_smallint tags (32768)
+sql_error create table st_smallint_e0 using mt_smallint tags (-32768)
+sql_error create table st_smallint_e0 using mt_smallint tags (3276899)
+sql_error create table st_smallint_e0 using mt_smallint tags (-3276833)
+#sql_error create table st_smallint_e0 using mt_smallint tags (12.80)   truncate integer part
+#sql_error create table st_smallint_e0 using mt_smallint tags (-11.80)
+sql_error create table st_smallint_e0 using mt_smallint tags (123abc)  
+sql_error create table st_smallint_e0 using mt_smallint tags ("123abc")
+sql_error create table st_smallint_e0 using mt_smallint tags (abc)     
+sql_error create table st_smallint_e0 using mt_smallint tags ("abc")   
+sql_error create table st_smallint_e0 using mt_smallint tags (" ")     
+sql_error create table st_smallint_e0 using mt_smallint tags ('')      
+
+sql create table st_smallint_e0  using mt_smallint tags (123)
+sql create table st_smallint_e1  using mt_smallint tags (123)
+sql create table st_smallint_e2  using mt_smallint tags (123)
+sql create table st_smallint_e3  using mt_smallint tags (123)
+sql create table st_smallint_e4  using mt_smallint tags (123)
+sql create table st_smallint_e5  using mt_smallint tags (123)
+sql create table st_smallint_e6  using mt_smallint tags (123)
+sql create table st_smallint_e7  using mt_smallint tags (123)
+sql create table st_smallint_e8  using mt_smallint tags (123)
+sql create table st_smallint_e9  using mt_smallint tags (123)
+sql create table st_smallint_e10 using mt_smallint tags (123)
+sql create table st_smallint_e11 using mt_smallint tags (123)
+sql create table st_smallint_e12 using mt_smallint tags (123)
+
+sql_error insert into st_smallint_e0  values (now, 32768)     
+sql_error insert into st_smallint_e1  values (now, -32768)    
+sql_error insert into st_smallint_e2  values (now, 42768)    
+sql_error insert into st_smallint_e3  values (now, -32769)   
+#sql_error insert into st_smallint_e4  values (now, 12.80)   
+#sql_error insert into st_smallint_e5  values (now, -11.80)  
+sql_error insert into st_smallint_e6  values (now, 123abc)  
+sql_error insert into st_smallint_e7  values (now, "123abc")
+sql_error insert into st_smallint_e9  values (now, abc)     
+sql_error insert into st_smallint_e10 values (now, "abc")   
+sql_error insert into st_smallint_e11 values (now, " ")     
+sql_error insert into st_smallint_e12 values (now, '')      
+
+sql_error insert into st_smallint_e13 using mt_smallint tags (033) values (now, 32768)     
+sql_error insert into st_smallint_e14 using mt_smallint tags (033) values (now, -32768)    
+sql_error insert into st_smallint_e15 using mt_smallint tags (033) values (now, 32968)    
+sql_error insert into st_smallint_e16 using mt_smallint tags (033) values (now, -33768)   
+#sql_error insert into st_smallint_e17 using mt_smallint tags (033) values (now, 12.80)   
+#sql_error insert into st_smallint_e18 using mt_smallint tags (033) values (now, -11.80)  
+sql_error insert into st_smallint_e19 using mt_smallint tags (033) values (now, 123abc)  
+sql_error insert into st_smallint_e20 using mt_smallint tags (033) values (now, "123abc")
+sql_error insert into st_smallint_e22 using mt_smallint tags (033) values (now, abc)     
+sql_error insert into st_smallint_e23 using mt_smallint tags (033) values (now, "abc")   
+sql_error insert into st_smallint_e24 using mt_smallint tags (033) values (now, " ")     
+sql_error insert into st_smallint_e25 using mt_smallint tags (033) values (now, '')  
+
+sql_error insert into st_smallint_e13 using mt_smallint tags (32768)      values (now, -033)
+sql_error insert into st_smallint_e14 using mt_smallint tags (-32768)     values (now, -033)
+sql_error insert into st_smallint_e15 using mt_smallint tags (72768)     values (now, -033)
+sql_error insert into st_smallint_e16 using mt_smallint tags (-92768)    values (now, -033)
+#sql_error insert into st_smallint_e17 using mt_smallint tags (12.80)    values (now, -033)
+#sql_error insert into st_smallint_e18 using mt_smallint tags (-11.80)   values (now, -033)
+sql_error insert into st_smallint_e19 using mt_smallint tags (123abc)   values (now, -033)
+sql_error insert into st_smallint_e20 using mt_smallint tags ("123abc") values (now, -033)
+sql_error insert into st_smallint_e22 using mt_smallint tags (abc)      values (now, -033)
+sql_error insert into st_smallint_e23 using mt_smallint tags ("abc")    values (now, -033)
+sql_error insert into st_smallint_e24 using mt_smallint tags (" ")      values (now, -033)
+sql_error insert into st_smallint_e25 using mt_smallint tags ('')       values (now, -033)
+
+sql insert into st_smallint_e13 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e14 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e15 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e16 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e17 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e18 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e19 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e20 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e21 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e22 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e23 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e24 using mt_smallint tags (033) values (now, 00062)
+sql insert into st_smallint_e25 using mt_smallint tags (033) values (now, 00062)
+
+sql_error alter table st_smallint_e13 set tag tagname=32768     
+sql_error alter table st_smallint_e14 set tag tagname=-32768    
+sql_error alter table st_smallint_e15 set tag tagname=52768    
+sql_error alter table st_smallint_e16 set tag tagname=-32778 
+sql_error alter table st_smallint_e19 set tag tagname=123abc  
+sql_error alter table st_smallint_e20 set tag tagname="123abc" 
+sql_error alter table st_smallint_e22 set tag tagname=abc     
+sql_error alter table st_smallint_e23 set tag tagname="abc"   
+sql_error alter table st_smallint_e24 set tag tagname=" "     
+sql_error alter table st_smallint_e25 set tag tagname=''      
diff --git a/tests/script/general/parser/columnValue_tinyint.sim b/tests/script/general/parser/columnValue_tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..707242a23ed3eecde6c23413e53b67c5daa83a82
--- /dev/null
+++ b/tests/script/general/parser/columnValue_tinyint.sim
@@ -0,0 +1,466 @@
+sleep 3000
+sql connect
+sql create database if not exists db
+sql use db
+
+#### test the value of all data types in four cases: static create table, insert column value, synamic create table, alter tag value
+
+######## case 0: tinyint
+print ========== tinyint 
+sql create table mt_tinyint (ts timestamp, c tinyint) tags (tagname tinyint)
+
+## case 00: static create table for test tag values
+sql create table st_tinyint_0  using mt_tinyint tags (NULL)
+sql select tagname from  st_tinyint_0
+if $data00 != NULL then
+  print expect NULL, actually: $data00
+  return -1
+endi
+sql create table st_tinyint_1  using mt_tinyint tags (NULL)
+sql select tagname from  st_tinyint_1
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_tinyint_2  using mt_tinyint tags ('NULL')
+sql select tagname from  st_tinyint_2
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_tinyint_3  using mt_tinyint tags ('NULL')
+sql select tagname from  st_tinyint_3
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_tinyint_4  using mt_tinyint tags ("NULL")
+sql select tagname from  st_tinyint_4
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_tinyint_5  using mt_tinyint tags ("NULL")
+sql select tagname from  st_tinyint_5
+if $data00 != NULL then
+  return -1
+endi
+sql create table st_tinyint_6  using mt_tinyint tags (-127)
+sql select tagname from  st_tinyint_6
+if $data00 != -127 then
+  return -1
+endi
+sql create table st_tinyint_7  using mt_tinyint tags (127)
+sql select tagname from  st_tinyint_7
+if $data00 != 127 then
+  return -1
+endi
+sql create table st_tinyint_8  using mt_tinyint tags (37)
+sql select tagname from  st_tinyint_8
+if $data00 != 37 then
+  return -1
+endi
+sql create table st_tinyint_9  using mt_tinyint tags (-100)
+sql select tagname from  st_tinyint_9
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_tinyint_10 using mt_tinyint tags (+113)
+sql select tagname from  st_tinyint_10
+if $data00 != 113 then
+  return -1
+endi
+sql create table st_tinyint_11 using mt_tinyint tags ('-100')
+sql select tagname from  st_tinyint_11
+if $data00 != -100 then
+  return -1
+endi
+sql create table st_tinyint_12 using mt_tinyint tags ("+78")
+sql select tagname from  st_tinyint_12
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_tinyint_13 using mt_tinyint tags (+0078)
+sql select tagname from  st_tinyint_13
+if $data00 != 78 then
+  return -1
+endi
+sql create table st_tinyint_14 using mt_tinyint tags (-00078)
+sql select tagname from  st_tinyint_14
+if $data00 != -78 then
+  return -1
+endi
+
+## case 01: insert values  for test column values
+sql insert into st_tinyint_0  values (now, NULL)
+sql select * from st_tinyint_0
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi 
+sql insert into st_tinyint_1  values (now, NULL)
+sql select * from st_tinyint_1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_tinyint_2  values (now, 'NULL')
+sql select * from st_tinyint_2
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_3  values (now, 'NULL')
+sql select * from st_tinyint_3
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_4  values (now, "NULL")
+sql select * from st_tinyint_4
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_5  values (now, "NULL")
+sql select * from st_tinyint_5
+if $rows != 1 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_6  values (now, 127)
+sql select * from st_tinyint_6
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 127 then
+  return -1
+endi 
+sql insert into st_tinyint_7  values (now, -127)
+sql select * from st_tinyint_7
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -127 then
+  return -1
+endi  
+sql insert into st_tinyint_8  values (now, +100) 
+sql select * from st_tinyint_8
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 100 then
+  return -1
+endi   
+sql insert into st_tinyint_9  values (now, "-098")
+sql select * from st_tinyint_9
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -98 then
+  return -1
+endi 
+sql insert into st_tinyint_10 values (now, '0')
+sql select * from st_tinyint_10
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_tinyint_11 values (now, -0)  
+sql select * from st_tinyint_11
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_tinyint_12 values (now, "+056")
+sql select * from st_tinyint_12
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_tinyint_13 values (now, +056)
+sql select * from st_tinyint_13
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 56 then
+  return -1
+endi 
+
+sql insert into st_tinyint_14 values (now, -056)
+sql select * from st_tinyint_14
+if $rows != 1 then
+  return -1
+endi
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 02: dynamic create table for test tag values
+sql insert into st_tinyint_16 using mt_tinyint tags (NULL)   values (now, NULL)
+sql select tagname from  st_tinyint_16
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_16
+if $data01 != NULL then
+  return -1
+endi
+    
+sql insert into st_tinyint_17 using mt_tinyint tags (NULL)   values (now, NULL)
+sql select tagname from  st_tinyint_17
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_17
+if $data01 != NULL then
+  return -1
+endi  
+sql insert into st_tinyint_18 using mt_tinyint tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_tinyint_18
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_18
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_19 using mt_tinyint tags ('NULL') values (now, 'NULL')
+sql select tagname from  st_tinyint_19
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_19
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_20 using mt_tinyint tags ("NULL") values (now, "NULL")
+sql select tagname from  st_tinyint_20
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_20
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_21 using mt_tinyint tags ("NULL") values (now, "NULL")
+sql select tagname from  st_tinyint_21
+if $data00 != NULL then
+  return -1
+endi
+sql select * from st_tinyint_21
+if $data01 != NULL then
+  return -1
+endi
+sql insert into st_tinyint_22 using mt_tinyint tags (127)  values (now, 127)
+sql select tagname from  st_tinyint_22
+if $data00 != 127 then
+  return -1
+endi
+sql select * from st_tinyint_22
+if $data01 != 127 then
+  return -1
+endi 
+sql insert into st_tinyint_23 using mt_tinyint tags (-127)  values (now, -127)
+sql select tagname from  st_tinyint_23
+if $data00 != -127 then
+  return -1
+endi
+sql select * from st_tinyint_23
+if $data01 != -127 then
+  return -1
+endi  
+sql insert into st_tinyint_24 using mt_tinyint tags (10)    values (now, 10)
+sql select tagname from  st_tinyint_24
+if $data00 != 10 then
+  return -1
+endi
+sql select * from st_tinyint_24
+if $data01 != 10 then
+  return -1
+endi    
+sql insert into st_tinyint_25 using mt_tinyint tags ("-0") values (now, "-0")
+sql select tagname from  st_tinyint_25
+if $data00 != 0 then
+  return -1
+endi
+sql select * from st_tinyint_25
+if $data01 != 0 then
+  return -1
+endi 
+sql insert into st_tinyint_26 using mt_tinyint tags ('123') values (now, '123')
+sql select tagname from  st_tinyint_26
+if $data00 != 123 then
+  return -1
+endi
+sql select * from st_tinyint_26
+if $data01 != 123 then
+  return -1
+endi 
+sql insert into st_tinyint_27 using mt_tinyint tags (+056) values (now, +00056)
+sql select tagname from  st_tinyint_27
+if $data00 != 56 then
+  return -1
+endi
+sql select * from st_tinyint_27
+if $data01 != 56 then
+  return -1
+endi 
+sql insert into st_tinyint_28 using mt_tinyint tags (-056) values (now, -0056)
+sql select tagname from  st_tinyint_28
+if $data00 != -56 then
+  return -1
+endi
+sql select * from st_tinyint_28
+if $data01 != -56 then
+  return -1
+endi 
+
+## case 03: alter tag values
+#sql alter table st_tinyint_0 set tag tagname=127
+#sql select tagname from  st_tinyint_0
+#if $data00 != 127 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname=-127
+#sql select tagname from  st_tinyint_0
+#if $data00 != -127 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname=+100
+#sql select tagname from  st_tinyint_0
+#if $data00 != 100 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname=-33
+#sql select tagname from  st_tinyint_0
+#if $data00 != -33 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname='+98'
+#sql select tagname from  st_tinyint_0
+#if $data00 != 98 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname='-076'
+#sql select tagname from  st_tinyint_0
+#if $data00 != -76 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname=+0012
+#sql select tagname from  st_tinyint_0
+#if $data00 != 12 then
+#  return -1
+#endi
+#sql alter table st_tinyint_0 set tag tagname=-00063
+#sql select tagname from  st_tinyint_0
+#if $data00 != -63 then
+#  return -1
+#endi
+
+## case 04: illegal input
+sql_error create table st_tinyint_e0 using mt_tinyint tags (128)
+sql_error create table st_tinyint_e0 using mt_tinyint tags (-128)
+sql_error create table st_tinyint_e0 using mt_tinyint tags (1280)
+sql_error create table st_tinyint_e0 using mt_tinyint tags (-1280)
+#sql_error create table st_tinyint_e0 using mt_tinyint tags (12.80)   truncate integer part
+#sql_error create table st_tinyint_e0 using mt_tinyint tags (-11.80)
+sql_error create table st_tinyint_e0 using mt_tinyint tags (123abc)  
+sql_error create table st_tinyint_e0 using mt_tinyint tags ("123abc")
+sql_error create table st_tinyint_e0 using mt_tinyint tags (abc)     
+sql_error create table st_tinyint_e0 using mt_tinyint tags ("abc")   
+sql_error create table st_tinyint_e0 using mt_tinyint tags (" ")     
+sql_error create table st_tinyint_e0 using mt_tinyint tags ('')      
+
+sql create table st_tinyint_e0  using mt_tinyint tags (123)
+sql create table st_tinyint_e1  using mt_tinyint tags (123)
+sql create table st_tinyint_e2  using mt_tinyint tags (123)
+sql create table st_tinyint_e3  using mt_tinyint tags (123)
+sql create table st_tinyint_e4  using mt_tinyint tags (123)
+sql create table st_tinyint_e5  using mt_tinyint tags (123)
+sql create table st_tinyint_e6  using mt_tinyint tags (123)
+sql create table st_tinyint_e7  using mt_tinyint tags (123)
+sql create table st_tinyint_e8  using mt_tinyint tags (123)
+sql create table st_tinyint_e9  using mt_tinyint tags (123)
+sql create table st_tinyint_e10 using mt_tinyint tags (123)
+sql create table st_tinyint_e11 using mt_tinyint tags (123)
+sql create table st_tinyint_e12 using mt_tinyint tags (123)
+
+sql_error insert into st_tinyint_e0  values (now, 128)     
+sql_error insert into st_tinyint_e1  values (now, -128)    
+sql_error insert into st_tinyint_e2  values (now, 1280)    
+sql_error insert into st_tinyint_e3  values (now, -1280)   
+#sql_error insert into st_tinyint_e4  values (now, 12.80)   
+#sql_error insert into st_tinyint_e5  values (now, -11.80)  
+sql_error insert into st_tinyint_e6  values (now, 123abc)  
+sql_error insert into st_tinyint_e7  values (now, "123abc")
+sql_error insert into st_tinyint_e9  values (now, abc)     
+sql_error insert into st_tinyint_e10 values (now, "abc")   
+sql_error insert into st_tinyint_e11 values (now, " ")     
+sql_error insert into st_tinyint_e12 values (now, '')      
+
+sql_error insert into st_tinyint_e13 using mt_tinyint tags (033) values (now, 128)     
+sql_error insert into st_tinyint_e14 using mt_tinyint tags (033) values (now, -128)    
+sql_error insert into st_tinyint_e15 using mt_tinyint tags (033) values (now, 1280)    
+sql_error insert into st_tinyint_e16 using mt_tinyint tags (033) values (now, -1280)   
+#sql_error insert into st_tinyint_e17 using mt_tinyint tags (033) values (now, 12.80)   
+#sql_error insert into st_tinyint_e18 using mt_tinyint tags (033) values (now, -11.80)  
+sql_error insert into st_tinyint_e19 using mt_tinyint tags (033) values (now, 123abc)  
+sql_error insert into st_tinyint_e20 using mt_tinyint tags (033) values (now, "123abc")
+sql_error insert into st_tinyint_e22 using mt_tinyint tags (033) values (now, abc)     
+sql_error insert into st_tinyint_e23 using mt_tinyint tags (033) values (now, "abc")   
+sql_error insert into st_tinyint_e24 using mt_tinyint tags (033) values (now, " ")     
+sql_error insert into st_tinyint_e25 using mt_tinyint tags (033) values (now, '')  
+
+sql_error insert into st_tinyint_e13 using mt_tinyint tags (128)      values (now, -033)
+sql_error insert into st_tinyint_e14 using mt_tinyint tags (-128)     values (now, -033)
+sql_error insert into st_tinyint_e15 using mt_tinyint tags (1280)     values (now, -033)
+sql_error insert into st_tinyint_e16 using mt_tinyint tags (-1280)    values (now, -033)
+#sql_error insert into st_tinyint_e17 using mt_tinyint tags (12.80)    values (now, -033)
+#sql_error insert into st_tinyint_e18 using mt_tinyint tags (-11.80)   values (now, -033)
+sql_error insert into st_tinyint_e19 using mt_tinyint tags (123abc)   values (now, -033)
+sql_error insert into st_tinyint_e20 using mt_tinyint tags ("123abc") values (now, -033)
+sql_error insert into st_tinyint_e22 using mt_tinyint tags (abc)      values (now, -033)
+sql_error insert into st_tinyint_e23 using mt_tinyint tags ("abc")    values (now, -033)
+sql_error insert into st_tinyint_e24 using mt_tinyint tags (" ")      values (now, -033)
+sql_error insert into st_tinyint_e25 using mt_tinyint tags ('')       values (now, -033)
+
+sql insert into st_tinyint_e13 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e14 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e15 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e16 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e17 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e18 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e19 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e20 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e21 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e22 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e23 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e24 using mt_tinyint tags (033) values (now, 00062)
+sql insert into st_tinyint_e25 using mt_tinyint tags (033) values (now, 00062)
+
+sql_error alter table st_tinyint_e13 set tag tagname=128     
+sql_error alter table st_tinyint_e14 set tag tagname=-128    
+sql_error alter table st_tinyint_e15 set tag tagname=1280    
+sql_error alter table st_tinyint_e16 set tag tagname=-1280   
+sql_error alter table st_tinyint_e19 set tag tagname=123abc  
+sql_error alter table st_tinyint_e20 set tag tagname="123abc" 
+sql_error alter table st_tinyint_e22 set tag tagname=abc     
+sql_error alter table st_tinyint_e23 set tag tagname="abc"   
+sql_error alter table st_tinyint_e24 set tag tagname=" "     
+sql_error alter table st_tinyint_e25 set tag tagname=''      
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4d85806b690fafdb71707133f97f8fc78942c2c2
--- /dev/null
+++ b/tests/script/general/parser/commit.sim
@@ -0,0 +1,113 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxTablesperVnode -v 100
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = sc_db
+$tbPrefix = sc_tb
+$stbPrefix = sc_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$loops = 5 
+$log = 1
+$ts0 = 1537146000000
+$delta = 600000
+print ========== commit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db maxrows 255 ctime 3600
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+sql use $db
+##### select from table
+print ====== select from table and check num of rows returned
+$loop = 1
+$i = 0
+while $loop <= $loops
+  print repeat = $loop
+  while $i < 10
+    sql select count(*) from $stb where t1 = $i 
+    if $data00 != $rowNum then
+      print expect $rowNum, actual: $data00
+      return -1
+    endi
+    $i = $i + 1
+  endw
+  sql select count(*) from $stb
+  if $data00 != $totalNum then
+    return -1
+  endi
+  $loop = $loop + 1
+endw
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+print ================== server restart completed
+sql connect
+sleep 3000
+
+print ====== select from table and check num of rows returned
+sql use $db
+$loop = 1
+$i = 0
+while $loop <= $loops
+  print repeat = $loop
+  while $i < 10
+    sql select count(*) from $stb where t1 = $i 
+    if $data00 != $rowNum then
+      return -1
+    endi
+    $i = $i + 1
+  endw
+  sql select count(*) from $stb
+  if $data00 != $totalNum then
+    return -1
+  endi
+  $loop = $loop + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/constCol.sim b/tests/script/general/parser/constCol.sim
new file mode 100644
index 0000000000000000000000000000000000000000..13b4455779933e65d53f2556eb7b4946578c074f
--- /dev/null
+++ b/tests/script/general/parser/constCol.sim
@@ -0,0 +1,356 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel       -v 0
+
+system sh/cfg.sh -n dnode1 -c dDebugFlag       -v 135
+system sh/cfg.sh -n dnode1 -c mDebugFlag       -v 135
+system sh/cfg.sh -n dnode1 -c sdbDebugFlag     -v 135
+system sh/cfg.sh -n dnode1 -c rpcDebugFlag    -v 135
+system sh/cfg.sh -n dnode1 -c cDebugFlag       -v 135
+system sh/cfg.sh -n dnode1 -c monitorDebugflag -v 135
+system sh/cfg.sh -n dnode1 -c httpDebugFlag    -v 135
+system sh/cfg.sh -n dnode1 -c uDebugFlag       -v 135
+
+system sh/cfg.sh -n dnode1 -c httpCacheSessions  -v 10
+system sh/cfg.sh -n dnode1 -c httpMaxThreads     -v 10
+system sh/cfg.sh -n dnode1 -c httpEnableCompress -v 0
+
+system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
+system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 30000
+system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
+system sh/cfg.sh -n dnode1 -c maxShellConns       -v 30000
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database db;
+sql use db;
+sql create table t (ts timestamp, i int);
+sql create table st1 (ts timestamp, f1 int) tags(t1 int);
+sql create table st2 (ts timestamp, f2 int) tags(t2 int);
+
+sql create table t1 using st1 tags(1);
+sql create table t2 using st2 tags(1);
+
+sql insert into t1 values(1575880055000, 1);
+sql insert into t1 values(1575880059000, 1);
+sql insert into t1 values(1575880069000, 1);
+
+sql insert into t2 values(1575880055000, 2);
+
+sql select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st1.ts=st2.ts
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st1.ts=st2.ts'  127.0.0.1:7111/restful/sql
+
+print ==============select with user-defined columns
+sql select 'abc' as f, ts,f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != @abc@ then
+  return -1
+endi
+
+if $data01 != @19-12-09 16:27:35.000@ then
+  return -1
+endi
+
+if $data02 != 1 then
+  return -1
+endi
+
+sql select 'abc', ts, f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data01 != @19-12-09 16:27:35.000@ then
+  return -1
+endi
+
+if $data02 != 1 then
+  return -1
+endi
+
+if $data10 != @abc@ then
+  return -1
+endi
+
+sql select 'abc' from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != @abc@ then
+  return -1
+endi
+
+sql select 'abc' as f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != @abc@ then
+  return -1
+endi
+
+sql select 1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+if $data20 != 1 then
+  return -1
+endi
+
+sql select 1 as f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+sql select 1 as f, f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+sql select 1.123 as f, f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1.123000000 then
+  print expect 1.123000000 , actual:$data00
+  return -1
+endi
+
+if $data10 != 1.123000000 then
+  print expect 1.123000000 , actual:$data10
+  return -1
+endi
+
+sql select 1, f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+sql select 1.2391, f1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1.239100000 then
+  print expect 1.239100000 actual: $data00
+  return -1
+endi
+
+if $data10 != 1.239100000 then
+  print expect 1.239100000 actual: $data00
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print ===================== user-defined columns with agg functions
+sql select 1 as t, count(*) from t1
+if $rows != 1 then
+ return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != 3 then
+  return -1
+endi
+
+sql select 1, sum(f1) from t1
+if $rows != 1 then
+ return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != 3 then
+  return -1
+endi
+
+sql select 1,2,3, sum(f1)*99, 4,5,6,7,8,9,10 from t1
+if $rows != 1 then
+ return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != 2 then
+  return -1
+endi
+
+if $data02 != 3 then
+  return -1
+endi
+
+if $data03 != 297.000000000  then
+  print expect 297.000000000, actual:$data03
+  return -1
+endi
+
+sql select sum(f1)*avg(f1)+12, 1,2,3,4,5,6,7,8,9,10 from t1
+if $rows != 1 then
+ return -1
+endi
+
+if $data00 != 15.000000000 then
+  print expect 15.000000000 actual:$data00
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data02 != 2 then
+  return -1
+endi
+
+sql select 1.2987, f1, 'k' from t1 where f1=1
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 1.298700000 then
+  print expect 1.298700000 actual:$data00
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data02 != @k@ then
+  return -1
+endi
+
+print ====================user-defined columns with union
+sql select f1, 'f1' from t1 union all select f1, 'f1' from t1;
+if $rows != 6 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != @f1@ then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+if $data11 != @f1@ then
+  return -1
+endi
+
+print =====================udc with join
+sql select st1.ts, st1.f1, st2.f2, 'abc', 1.9827 from db.st1, db.st2 where st1.t1=st2.t2 and st1.ts=st2.ts
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != @19-12-09 16:27:35.000@ then
+  print expect @19-12-09 16:27:35.000@ actual:$data00
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data02 != 2 then
+  return -1
+endi
+
+if $data03 != @abc@ then
+  return -1
+endi
+
+if $data04 != 1.982700000 then
+  print expect 1.982700000 actual:$data04
+  return -1
+endi
+
+print ======================udc with interval
+sql select count(*), 'uuu' from t1 interval(1s) order by ts desc;
+if $rows != 3 then
+  return -1
+endi
+
+print ======================udc with tags
+sql select t1,'abc',tbname from st1
+if $rows != 1 then
+  return -1
+endi
+
+if $data01 != @abc@ then
+  return -1
+endi
+
+if $data02 != @t1@ then
+  return -1
+endi
+
+print ======================udc with arithmetic
+sql select 1+1 from t1
+if $rows != 3 then
+  return -1
+endi
+
+print ======================udc with normal column group by
+
+sql_error select from t1
+sql_error select abc from t1
+sql_error select abc as tu from t1
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ed6e427fe70fe5cfe65852352ac680f645a3a21f
--- /dev/null
+++ b/tests/script/general/parser/create_db.sim
@@ -0,0 +1,187 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print excuting test script create_db.sim
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql_error createdatabase $db
+sql create database $db
+sql use $db
+sql show databases
+
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $db then 
+  return -1
+endi
+sql drop database $db
+
+# case1: case_insensitivity test
+print =========== create_db.sim case1: case insensitivity test
+sql_error CREATEDATABASE $db
+sql CREATE DATABASE $db
+sql use $db
+sql show databases
+
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $db then 
+  return -1
+endi
+sql drop database $db
+print case_insensitivity test passed
+
+# case2: illegal_db_name test
+print =========== create_db.sim case2: illegal_db_name test
+$illegal_db1 = 1db
+$illegal_db2 = d@b
+
+sql_error create database $illegal_db1
+sql_error create database $illegal_db2
+print illegal_db_name test passed
+
+# case3: chinese_char_in_db_name test
+print ========== create_db.sim case3: chinese_char_in_db_name test
+$CN_db1 = 数据库
+$CN_db2 = 数据库1
+$CN_db3 = db数据库1
+sql_error create database $CN_db1
+sql_error create database $CN_db2
+sql_error create database $CN_db3
+#sql show databases
+#if $rows != 3 then
+#  return -1
+#endi
+#if $data00 != $CN_db1 then
+#  return -1
+#endi
+#if $data10 != $CN_db2 then
+#  return -1
+#endi
+#if $data20 != $CN_db3 then
+#  return -1
+#endi
+#sql drop database $CN_db1
+#sql drop database $CN_db2
+#sql drop database $CN_db3
+print case_chinese_char_in_db_name test passed
+
+# case4: db_already_exists
+print create_db.sim case4: db_already_exists
+sql create database db0
+sql create database db0
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+sql drop database db0
+print db_already_exists test passed
+
+# case5: db_meta_data
+print create_db.sim case5: db_meta_data test
+# cfg params
+$replica = 1 # max=3
+$days = 10
+$keep = 365
+$rows_db = 1000
+$cache = 16 # 16MB
+$ablocks = 100 
+$tblocks = 32 # max=512, automatically trimmed when exceeding
+$ctime = 36000 # 10 hours
+$wal = 1 # valid value is 1, 2
+$comp = 1 # max=32, automatically trimmed when exceeding
+
+sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $db then 
+ return -1
+endi
+if $data04 != $replica then 
+ return -1
+endi
+if $data06 != $days then 
+ return -1
+endi
+if $data07 != 365,365,365 then 
+ return -1
+endi
+print data08 = $data07
+if $data08 != $cache then
+ print expect $cache, actual:$data08
+ return -1
+endi
+if $data09 != 4 then
+ return -1
+endi
+
+sql drop database $db
+
+## param range tests
+# replica [1,3]
+#sql_error create database $db replica 0
+sql_error create database $db replica 4
+
+# day [1, 3650]
+sql_error create database $db day 0
+sql_error create database $db day 3651 
+
+# keep [1, infinity]
+sql_error create database $db keep 0
+#sql_error create database $db keep 3651
+
+# rows [200, 10000]
+sql_error create database $db maxrows 199
+#sql_error create database $db maxrows 10001
+
+# cache [100, 10485760]
+sql_error create database $db cache 0
+#sql_error create database $db cache 10485761
+
+
+# blocks [32, 4096 overwriten by 4096 if exceeds, Note added:2018-10-24]
+#sql_error create database $db tblocks 31
+#sql_error create database $db tblocks 4097
+
+# ctime [30, 40960]
+sql_error create database $db ctime 29
+sql_error create database $db ctime 40961
+
+# wal {1, 2}
+sql_error create database $db wal 0
+sql_error create database $db wal -1
+sql_error create database $db wal 3
+
+# comp {0, 1, 2}
+sql_error create database $db comp -1
+sql_error create database $db comp 3
+
+sql_error drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f21a83067186dc226bd035fe3ff7ba5cc28675c0
--- /dev/null
+++ b/tests/script/general/parser/create_mt.sim
@@ -0,0 +1,258 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print excuting test script create_mt.sim
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+# case1: case_insensitivity test
+print =========== create_mt.sim case1: case insensitivity test
+sql CREATE TABLE $mt (TS TIMESTAMP, COL1 INT, COL2 BIGINT, COL3 FLOAT, COL4 DOUBLE, COL5 BINARY(10), COL6 BOOL, COL7 SMALLINT, COL8 TINYINT, COL9 NCHAR(10)) TAGS (TAG1 INT, TAG2 BIGINT, TAG3 DOUBLE, TAG4 BINARY(10), TAG5 BOOL, TAG6 NCHAR(10))
+sql show stables
+
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $mt then 
+  return -1
+endi
+sql_error DROP METRIC $mt
+
+sql DROP TABLE $mt
+sql show stables
+
+if $rows != 0 then
+  return -1
+endi
+print case_insensitivity test passed
+
+# case2: illegal_metric_name test
+print =========== create_mt.sim case2: illegal_mt_name test
+$illegal_tb1 = 1db
+$illegal_tb2 = d@b
+
+sql_error create table $illegal_tb1 (ts timestamp, tcol int) tags (tag1 int)
+
+sql_error create table $illegal_tb2 (ts timestamp, tcol int) tags (tag1 int)
+
+print illegal_metric_name test passed
+
+## case3: illegal_data_types_in_data_column test
+print ========== create_mt.sim case3: metric illegal data types test
+
+$i_ts = time # illegal ts
+$i_binary = binary # illegal binary
+$i_bigint = long # illegal bigint
+$i_smallint = short # illegal smallint
+$i_tinyint = byte # illegal tinyint
+$i_binary2 = varchar(20) # illegal string
+$i_nchar = nchar # unspecified nchar length
+
+sql_error create table $mt (ts $i_ts , col int) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_binary ) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_bigint ) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_smallint ) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_binary2 ) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_tinyint ) tags (tag1 int)
+sql_error create table $mt (ts timestamp, col $i_nchar ) tags (tag1 int)
+
+# correct using of nchar
+sql create table $mt (ts timestamp, col nchar(10)) tags (tag1 int) 
+sql show stables
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $mt then
+  return -1
+endi
+sql drop table $mt
+print illegal_data_type_in_tags test passed
+
+## case4: illegal_data_type_in_tags test
+$i_ts = time # illegal ts
+$i_binary = binary # illegal binary
+$i_bigint = long # illegal bigint
+$i_smallint = short # illegal smallint
+$i_tinyint = byte # illegal tinyint
+$i_binary2 = varchar(20) # illegal string
+$i_bool = boolean
+$nchar = nchar # nchar with unspecified length
+print ========== create_mt.sim case4: illegal data types in tags test
+sql_error create table $mt (ts timestamp, col int) tags (tag1 timestamp )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_ts )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_binary )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_bigint )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_smallint )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_tinyint )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_binary2 )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_bool )
+sql_error create table $mt (ts timestamp, col int) tags (tag1 $nchar )
+# correct use of nchar in tags
+sql create table $mt (ts timestamp, col int) tags (tag1 nchar(20))
+sql show stables
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $mt then
+  return -1
+endi
+sql drop table $mt 
+print illegal_data_type_in_tags test passed
+
+# illegal_tag_name test
+# Only frequently used key words are tested here
+$tb_ = table
+$tbs = tables
+$db_ = database
+$dbs = databases
+$mt_ = metric
+$mts = metrics
+$int = int
+$bint = bigint
+$binary = binary
+$str = string
+$tag = tag
+$tags = tags
+$sint = smallint
+$tint = tinyint
+$nchar = nchar
+$bool = bool
+$stable = stable
+$stables = stables
+
+sql_error create table $mt (ts timestamp, col1 int) tags ( $tb_ int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $tbs int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $db_ int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $dbs int) 
+sql_error create table $mt (ts timestamp, col1 int) tags ( $mt_ int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $mts int) 
+sql_error create table $mt (ts timestamp, col1 int) tags ( $int int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $bint int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $binary int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $str int) 
+sql_error create table $mt (ts timestamp, col1 int) tags ( $tag int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $tags int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $sint int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $tint int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $nchar int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $stable int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $stables int)
+sql_error create table $mt (ts timestamp, col1 int) tags ( $bool int)
+
+print illegal_column_name test passed
+
+# case: negative tag values
+sql create table $mt (ts timestamp, col1 int) tags (tg int)
+sql create table $tb using $mt tags (-1)
+# -x ng_tag_v
+#  return -1
+#ng_tag_v:
+sql select tg from $tb
+if $data00 != -1 then
+  return -1
+endi
+sql drop table $tb
+
+# case: unmatched_tag_types
+print create_mt.sim unmatched_tag_types
+sql reset query cache
+sql create table $tb using $mt tags ('123')
+sql select tg from  $tb
+print data00 = $data00
+if $data00 != 123 then
+  return -1
+endi
+sql drop table $tb
+sql_error create table $tb using $mt tags (abc)
+#the case below might need more consideration
+sql_error create table $tb using $mt tags ('abc')  
+sql drop table if exists $tb
+sql reset query cache
+sql create table $tb using $mt tags (1e1)
+sql select tg from  $tb
+if $data00 != 10 then
+  return -1
+endi
+sql drop table $tb
+sql create table $tb using $mt tags ('1e1')
+sql select tg from  $tb
+if $data00 != 10 then
+  return -1
+endi
+sql_error create table $tb using $mt tags (2147483649)
+
+## case: chinese_char_in_metric
+print ========== create_mt.sim chinese_char_in_metrics_support test
+$CN_char = 涛思
+$mt1 = mt1
+$mt2 = mt2
+# no chinese char allowed in db, metric, table, column names
+#sql_error create table $CN_char (ts timestamp, col1 int) tags (tag1 int)
+#sql_error create table $mt1 (ts timestamp, $CN_char int) tags (tag1 int)
+#sql_error create table $mt2 (ts timestamp, col1 int) tags ( $CN_char int)
+#sql show metrics
+#if $rows != 3 then 
+#  return -1
+#endi
+##print expected: $CN_char
+##print returned: $data00
+#if $data00 != $CN_char then 
+#  return -1
+#endi
+##print expected: $mt1
+##print returned: $data10
+#if $data10 != $mt1 then
+#  return -1
+#endi
+##print expected: $mt2
+##print returned: $data20
+#if $data20 != $mt2 then
+#  return -1
+#endi
+#sql select tg from  $mt1
+##print expected $CN_char
+##print returned $data10
+#if $data10 != $CN_char then
+#  return -1
+#endi
+#sql select tg from  $mt2
+##print expected: $CN_char
+##print returned: $data20
+#if $data20 != $CN_char then
+#  return -1
+#endi
+#
+#sql drop table $CN_char
+#sql drop table $mt1
+#sql drop table $mt2
+
+print chinese_char_in_metrics test passed
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9d1672fdbef136fccb28d38df967d45132c9d40a
--- /dev/null
+++ b/tests/script/general/parser/create_tb.sim
@@ -0,0 +1,188 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print create_tb test
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+
+# case1: case_insensitivity test
+print =========== create_tb.sim case1: case_insensitivity test
+sql CREATE TABLE $tb (TS TIMESTAMP, COL1 INT, COL2 BIGINT, COL3 FLOAT, COL4 DOUBLE, COL5 BINARY(10), COL6 BOOL, COL7 SMALLINT, COL8 TINYINT, COL9 NCHAR(10));
+sql show tables
+
+if $rows != 1 then
+  return -1
+endi
+print data00 = $data00
+if $data00 != $tb then 
+  return -1
+endi
+sql DROP TABLE $tb
+sql show tables
+
+if $rows != 0 then
+  return -1
+endi
+print case_insensitivity test passed
+
+# case2: illegal_table_name test
+print =========== create_tb.sim case2: illegal_table_name test
+$illegal_tb1 = 1db
+$illegal_tb2 = d@b
+
+sql_error create table $illegal_db1 (ts timestamp, tcol int) 
+sql_error create table $illegal_db2 (ts timestamp, tcol int)
+print illegal_table_name test passed
+
+# case3: illegal_data_types
+print ========== create_tb.sim case3: illegal_data_types test
+$i_ts = time # illegal ts
+$i_binary = binary # illegal binary
+$i_bigint = long # illegal bigint
+$i_smallint = short # illegal smallint
+$i_tinyint = byte # illegal tinyint
+$i_binary2 = varchar(20) # illegal string
+$nchar = nchar # unspecified nchar length
+
+sql_error create table $tb (ts $i_ts , col int)
+sql_error create table $tb (ts timestamp, col $i_binary )
+sql_error create table $tb (ts timestamp, col $i_bigint )
+sql_error create table $tb (ts timestamp, col $i_smallint )
+sql_error create table $tb (ts timestamp, col $i_tinyint )
+sql_error create table $tb (ts timestamp, col $i_binary2 )
+sql_error create table $tb (ts timestamp, col $nchar )
+sql create table $tb (ts timestamp, col nchar(20))
+sql show tables
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $tb then
+  return -1
+endi
+sql drop table $tb
+print illegal data type test passed
+
+# case4: illegal_column_names
+# Only frequently used key words are tested here
+print ========== create_tb.sim case4: illegal_column_names
+$tb_ = table
+$tbs = tables
+$db_ = database
+$dbs = databases
+$mt_ = metric
+$mts = metrics
+$int = int
+$bint = bigint
+$binary = binary
+$str = string
+$tag = tag
+$tags = tags
+$sint = smallint
+$tint = tinyint
+$nchar = nchar
+
+sql_error create table $tb (ts timestamp, $tb_ int)
+sql_error create table $tb (ts timestamp, $tbs int) 
+sql_error create table $tb (ts timestamp, $db_ int) 
+sql_error create table $tb (ts timestamp, $dbs int) 
+sql_error create table $tb (ts timestamp, $mt_ int) 
+sql_error create table $tb (ts timestamp, $mts int) 
+sql_error create table $tb (ts timestamp, $int int)
+sql_error create table $tb (ts timestamp, $bint int) 
+sql_error create table $tb (ts timestamp, $binary int) 
+sql_error create table $tb (ts timestamp, $str int) 
+sql_error create table $tb (ts timestamp, $tag int) 
+sql_error create table $tb (ts timestamp, $tags int)
+sql_error create table $tb (ts timestamp, $sint int) 
+sql_error create table $tb (ts timestamp, $tint int) 
+sql_error create table $tb (ts timestamp, $nchar int) 
+print illegal_column_names test passed
+
+# case5: chinese_char_in_table_support
+print ========== create_tb.sim case5: chinese_char_in_table_support test
+
+$CN_char = 涛思
+$tb1 = tb1
+sql_error create table $CN_char (ts timestamp, col1 int) 
+#sql show tables 
+#if $rows != 1 then 
+#  return -1
+#endi
+#print expected: $CN_char
+#print returned: $data00
+#if $data00 != $CN_char then 
+#  return -1
+#endi
+#sql drop table $CN_char
+
+sql_error create table $tb1 (ts timestamp, $CN_char int) 
+#print expected: $tb1
+#print returned: $data10
+#sql show tables
+#if $rows != 1 then 
+#  return -1
+#endi
+#if $data00 != $tb1 then
+#  return -1
+#endi
+#sql describe $tb1
+##print expected $CN_char
+##print returned $data10
+#if $data10 != $CN_char then
+#  return -1
+#endi
+#sql drop table $tb1
+print chinese_char_in_table_support test passed
+
+# case6: table_already_exists
+print ========== create_tb.sim case6: table_already_exists
+sql create table tbs (ts timestamp, col int)
+sql insert into tbs values (now, 1)
+sql create table tbs (ts timestamp, col bool)
+#sql_error create table tb (ts timestamp, col bool)
+print table_already_exists test passed
+
+# case7: table_name_length_exceeds_limit
+print ========== create_tb.sim case7: table_name_length_exceeds_limit
+$tbname32 = _32_aaaabbbbccccddddaaaabbbbcccc
+$tbname64 = _64_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbcccc
+$tbname63 = _63_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbccc
+$tbname65 = _65_aaaabbbbccccddddaaaabbbbccccddddaaaabbbbccccddddaaaabbbbcccca1111111111111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+sql create table $tbname32 (ts timestamp, col int)
+sql insert into $tbname32 values (now, 1)
+sql create table $tbname64 (ts timestamp, col int)
+sql insert into $tbname64 values (now, 1)
+sql create table $tbname63 (ts timestamp, col int)
+sql insert into $tbname63 values (now, 1)
+sql_error create table $tbname65 (ts timestamp, col int)
+#sql_error create table tb (ts timestamp, col bool)
+print table_already_exists test passed
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b46a22228280c73a2cfffa145c9ed71d75dd4957
--- /dev/null
+++ b/tests/script/general/parser/dbtbnameValidate.sim
@@ -0,0 +1,122 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+print ========== db name and table name check in create and drop, describe
+sql create database abc keep 36500
+sql create database 'abc123'
+sql create database '_ab1234'
+sql create database 'ABC123'
+sql create database '_ABC123'
+sql create database 'aABb123 '
+sql create database ' xyz '
+sql create database ' XYZ '
+
+sql use 'abc123'
+sql use '_ab1234'
+sql use 'ABC123'
+sql use '_ABC123'
+sql use 'aABb123'
+sql use ' xyz '
+sql use ' XYZ '
+
+sql drop database 'abc123'
+sql drop database '_ab1234'
+sql drop database 'ABC123'
+sql drop database '_ABC123'
+sql drop database 'aABb123'
+sql drop database ' xyz '
+sql drop database ' XYZ '
+
+
+sql use abc
+
+sql create table  abc.cc    (ts timestamp, c int)
+sql create table 'abc.Dd'   (ts timestamp, c int)
+sql create table 'abc'.ee   (ts timestamp, c int)
+sql create table 'abc'.'FF' (ts timestamp, c int)
+sql create table  abc.'gG'  (ts timestamp, c int)
+
+sql_error create table  table.'a1'  (ts timestamp, c int)
+sql_error create table 'table'.'b1' (ts timestamp, c int)
+sql_error create table 'table'.'b1' (ts timestamp, c int)
+
+
+sql create table mt (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 smallint, t6 double)
+sql create table sub_001 using mt tags ( 1 , 'tag_nchar' , 'tag_bianry' , 4 , 5 , 6.1 )
+sql_error create table sub_002 using mt tags( 2 , tag_nchar , tag_bianry , 4 , 5 , 6.2 )
+sql insert into sub_dy_tbl using mt tags ( 3 , 'tag_nchar' , 'tag_bianry' , 4 , 5 , 6.3 ) values (now, 1, 2, 3.01, 4.02, 5, 6, true, 'binary_8', 'nchar_9')
+
+sql describe abc.cc
+sql describe 'abc.Dd'
+sql describe 'abc'.ee
+sql describe 'abc'.'FF'
+sql describe abc.'gG'
+
+sql describe cc
+sql describe 'Dd'
+sql describe ee
+sql describe 'FF'
+sql describe 'gG'
+
+sql describe mt
+sql describe sub_001
+sql describe sub_dy_tbl
+
+sql_error describe Dd
+sql_error describe FF
+sql_error describe gG
+
+sql drop table abc.cc
+sql drop table  'abc.Dd'
+sql drop table  'abc'.ee
+sql drop table  'abc'.'FF'
+sql drop table  abc.'gG'
+
+sql drop table   sub_001
+
+sql drop table   sub_dy_tbl
+sql drop table   mt
+
+print ========== insert data by multi-format
+sql create table abc.tk_mt (ts timestamp, a int, b binary(16), c bool, d float, e double, f nchar(16)) tags (t1 int, t2 binary(16))
+
+sql create table abc.tk_subt001 using tk_mt tags(1, 'subt001')
+sql insert into abc.tk_subt001                  values (now-1w, 3, 'binary_3', true,  1.003, 2.003, 'nchar_3')
+sql insert into abc.tk_subt001 (ts, a, c, e, f) values (now-1d, 4,             false,        2.004, 'nchar_4')
+sql insert into abc.tk_subt001 (ts, a, c, e, f) values (now-1h, 5,             false,        2.005, 'nchar_5')
+sql insert into abc.tk_subt001 (ts, b, d)       values (now-1m,    'binary_6',        1.006)
+sql insert into abc.tk_subt001 (ts, b, d)       values (now-1s,    'binary_7',        1.007)
+sql insert into abc.tk_subt001 (ts, b, d)       values (now-1a,    'binary_8',        1.008)
+sql select * from tk_subt001
+if $rows != 6 then 
+  print ==== expect rows is 6, but actually is $rows
+  return -1
+endi
+
+sql insert into abc.tk_subt002 using tk_mt tags (22, 'subt002x')   values (now+1s, 2001, 'binary_2001', true,  2001.001, 2001.001, 'nchar_2001')
+sql insert into abc.tk_subt002 using tk_mt tags (2, 'subt002')   values (now+1m, 2002, 'binary_2002', false, 2002.001, 2002.001, 'nchar_2002')  
+sql insert into abc.tk_subt002 using tk_mt tags (2, 'subt002')   values (now+1h, 2003, 'binary_2003', false, 2003.001, 2003.001, 'nchar_2003')
+sql insert into abc.tk_subt002 using tk_mt tags (2, 'subt002')   values (now+1d, 2004, 'binary_2004', true,  2004.001, 2004.001, 'nchar_2004')
+sql insert into abc.tk_subt002 using tk_mt tags (2, 'subt002')   values (now+1w, 2005, 'binary_2005', false, 2005.001, 2005.001, 'nchar_2005')
+sql select * from tk_subt002
+if $rows != 5 then 
+  print ==== expect rows is 5, but actually is $rows
+  return -1
+endi
+
+sql insert into abc.tk_subt003 (ts, a, c, e, f) using tk_mt tags (3, 'subt003')    values (now-38d, 3004,                false, 3004.001,           'nchar_3004')
+sql insert into abc.tk_subt003 (ts, a, c, e, f) using tk_mt tags (3, 'subt003')    values (now-37d, 3005,                false, 3005.001,           'nchar_3005')
+sql insert into abc.tk_subt003                                                     values (now-36d, 3006, 'binary_3006', true,  3006.001, 3006.001, 'nchar_3006')
+sql insert into abc.tk_subt003 (ts, a, c, e, f) using tk_mt tags (33, 'subt003x')  values (now-35d, 3007,                false, 3007.001,           'nchar_3007')
+sql select * from tk_subt003
+if $rows != 4 then 
+  print ==== expect rows is 4, but actually is $rows
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f89c27d71fd8ba02105f502afd4df26a1870ffb5
--- /dev/null
+++ b/tests/script/general/parser/fill.sim
@@ -0,0 +1,863 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_fl_db
+$tbPrefix = m_fl_tb
+$mtPrefix = m_fl_mt
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== fill.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 bool, c7 binary(10), c8 nchar(10)) tags(tgcol int)
+
+$i = 0
+$ts = $ts0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , $x , $x , $x , $x , $x , true, 'BINARY', 'NCHAR' ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+# setup
+$i = 0
+$tb = $tbPrefix . $i
+$tsu = 4 * $delta
+$tsu = $tsu + $ts0
+
+## fill syntax test
+# number of fill values exceeds number of selected columns
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $data11 != 6 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+if $data14 != 6.000000000 then
+  return -1
+endi
+
+# number of fill values is smaller than number of selected columns
+sql select max(c1), max(c2), max(c3) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
+if $data11 != 6 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+ 
+# unspecified filling method
+sql_error select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill (6, 6, 6, 6, 6)
+
+## constant fill test
+# count_with_fill
+print constant_fill test
+print count_with_constant_fill
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+
+# avg_with_fill
+print avg_witt_constant_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != 6.000000000 then 
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != 6.000000000 then 
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != 6.000000000 then 
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != 6.000000000 then 
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+print max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+print min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+print first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# check double type values
+if $data04 != 0.000000000 then
+  return -1
+endi
+print data14 = $data14
+if $data14 != 6.000000000 then
+  return -1
+endi
+if $data24 != 1.000000000 then
+  return -1
+endi
+if $data34 != 6.000000000 then
+  return -1
+endi
+if $data44 != 2.000000000 then
+  return -1
+endi
+if $data54 != 6.000000000 then
+  return -1
+endi
+if $data64 != 3.000000000 then
+  return -1
+endi
+
+# check float type values
+print $data03 $data13
+if $data03 != 0.00000 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+if $data23 != 1.00000 then
+  return -1
+endi
+if $data33 != 6.00000 then
+  return -1
+endi
+if $data43 != 2.00000 then
+  return -1
+endi
+if $data53 != 6.00000 then
+  return -1
+endi
+if $data63 != 3.00000 then
+  return -1
+endi
+if $data73 != 6.00000 then
+  return -1
+endi
+if $data83 != 4.00000 then
+  return -1
+endi
+
+
+# last_with_fill
+print last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# fill_negative_values
+sql select sum(c1), avg(c2), max(c3), min(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -1, -1, -1, -1, -1, -1, -1)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != -1 then 
+  return -1
+endi
+
+# fill_char_values_to_arithmetic_fields
+sql_error select sum(c1), avg(c2), max(c3), min(c4), avg(c4), count(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'c', 'c', 'c', 'c', 'c', 'c', 'c', 'c')
+
+# fill_multiple_columns
+sql_error select sum(c1), avg(c2), min(c3), max(c4), count(c6), first(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99, 99, abc, abc)
+sql select sum(c1), avg(c2), min(c3), max(c4) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99)
+if $rows != 9 then
+  return -1
+endi
+print data01 = $data01
+print data11 = $data11
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 99 then
+  return -1
+endi
+
+sql select * from $tb
+#print data08 = $data08
+if $data08 != NCHAR then
+  return -1
+endi
+#return -1
+
+
+# fill_into_nonarithmetic_fieds
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20000000, 20000000, 20000000)
+#if $data11 != 20000000 then
+if $data11 != 1 then
+  return -1
+endi
+
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1, 1, 1)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1.1, 1.1, 1.1)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1)
+sql select first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1')
+# fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24
+# fill values into binary or nchar columns will be set to NULL automatically Note:2018-10-24
+sql_error select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1')
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true')
+
+
+# fill nonarithmetic values into arithmetic fields
+sql_error select count(*) where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, abc);
+sql_error select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true');
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e1');
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1);
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '10');
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+
+## linear fill
+# feature currently switched off 2018/09/29
+#sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear)
+
+## previous fill
+print fill(prev)
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 1 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != 1 then 
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != 1 then 
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+
+# avg_with_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != 0.000000000 then 
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != 1.000000000 then 
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != 2.000000000 then 
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != 3.000000000 then 
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+## NULL fill
+print fill(value, NULL)
+# count_with_fill
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill( NULL)
+print select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill( NULL)
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(none)
+if $rows != 5 then 
+  return -1
+endi
+
+# avg_with_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# desc fill query
+print desc fill query
+sql select count(*) from m_fl_tb0 where ts>='2018-9-17 9:0:0' and ts<='2018-9-17 9:11:00' interval(1m) fill(value,10) order by ts desc;
+if $rows != 12 then
+  return -1
+endi
+
+print =====================>td-1442
+sql_error select count(*) from m_fl_tb0 interval(1s) fill(prev);
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f0cd058352803f322647aad338bc84be7fa84b5a
--- /dev/null
+++ b/tests/script/general/parser/fill_stb.sim
@@ -0,0 +1,440 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = fl1_db
+$tbPrefix = fl1_tb
+$stbPrefix = fl1_stb
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== fill.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 bool, t6 double)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $i1 = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $i1
+  $tgstr = 'tb . $i
+  $tgstr = $tgstr . '
+  $tgstr1 = 'tb . $i1
+  $tgstr1 = $tgstr1 . '
+  sql create table $tb using $stb tags( $i , $tgstr , $tgstr , $i , $i , $i )
+  sql create table $tb1 using $stb tags( $i1 , $tgstr1 , $tgstr1 , $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+# setup
+$i = 0
+$tb = $tbPrefix . $i
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+#### fill test cases for stables
+
+# NULL values in each group
+#sql select count(*) from $stb where ts >= '2018-09-16 00:00:00.000' and ts <= $tsu interval(1d) fill(prev) group by t1
+#$val = $tbNum * 2
+#if rows != $val then
+#  return -1
+#endi
+#if $data00 != @18-09-16 00:00:00.000@ then
+#  return -1
+#endi
+#if $data01 != NULL then
+#  return -1
+#endi
+#if $data02 != NULL then
+#  return -1
+#endi
+#if $data11 != $rowNum then
+#  return -1
+#endi
+#if $data12 != 0 then
+#  return -1
+#endi
+#if $data20 != @18-09-16 00:00:00.000@ then
+#  return -1
+#endi
+#if $data21 != NULL then
+#  return -1
+#endi
+#if $data22 != NULL then
+#  return -1
+#endi
+
+# number of fill values exceeds number of selected columns
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8)
+$val = $rowNum * 2
+$val = $val - 1
+if $rows != $val then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+if $data12 != -2 then
+  return -1
+endi
+if $data13 != -3.00000 then
+  return -1
+endi
+if $data14 != -4.000000000 then
+  return -1
+endi
+if $data15 != -5 then
+  return -1
+endi
+if $data31 != -1 then
+  return -1
+endi
+if $data52 != -2 then
+  return -1
+endi
+if $data73 != -3.00000 then
+  return -1
+endi
+if $data74 != -4.000000000 then
+  return -1
+endi
+
+## fill(value) + group by
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8) group by t1
+$val = $rowNum * 2
+print $rowNum, $val
+
+$val = $val - 1
+$val = $val * $tbNum
+print ==================== $val
+
+if $rows != 190 then
+  print expect 190, actual:$rows
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+#if $data16 != 0 then
+#  return -1
+#endi
+
+# number of fill values is smaller than number of selected columns
+sql select max(c1), max(c2), max(c3) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
+if $data11 != 6 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+ 
+# unspecified filling method
+sql_error select max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill (6, 6, 6, 6, 6)
+
+# fill_char_values_to_arithmetic_fields
+sql_error select sum(c1), avg(c2), max(c3), min(c4), avg(c4), count(c6), last(c7), last(c8) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'c', 'c', 'c', 'c', 'c', 'c', 'c', 'c')
+
+# fill_multiple_columns
+sql_error select sum(c1), avg(c2), min(c3), max(c4), count(c6), first(c7), last(c8) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99, 99, abc, abc)
+sql select sum(c1), avg(c2), min(c3), max(c4) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99)
+$val = $rowNum * 2
+$val = $val - 1
+if $rows != $val then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 99 then
+  return -1
+endi
+
+sql select * from $stb
+#print data08 = $data08
+if $data09 != nchar0 then
+  return -1
+endi
+sql select max(c4) from $stb where t1 > 4 and ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1) group by t1
+if $rows != 0 then
+  return -1
+endi
+sql select min(c1), max(c4) from $stb where t1 > 4 and ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1)
+$val = $rowNum * 2
+$val = $val - 1
+if $rows != $val then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != -1.000000000 then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+if $data12 != -1.000000000 then
+  return -1
+endi
+
+# fill_into_nonarithmetic_fieds
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20000000, 20000000, 20000000)
+#if $data11 != 20000000 then
+if $data11 != 1 then
+  return -1
+endi
+
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1, 1, 1)
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1.1, 1.1, 1.1)
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1)
+sql select first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1')
+# fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24
+# fill values into binary or nchar columns will be set to NULL automatically Note:2018-10-24
+sql_error select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1')
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true)
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true')
+
+
+# fill nonarithmetic values into arithmetic fields
+sql_error select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, abc);
+sql_error select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true');
+
+sql select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '2e1');
+$val = $rowNum * 2
+$val = $val - 1
+if $rows != $val then 
+  return -1
+endi
+if $data01 != $rowNum then
+  return -1
+endi
+if $data11 != 20 then 
+  return -1
+endi
+
+sql select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 2e1);
+if $rows != $val then 
+  return -1
+endi
+if $data01 != $rowNum then
+  return -1
+endi
+if $data11 != 20 then 
+  return -1
+endi
+
+sql select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '20');
+if $rows != $val then 
+  return -1
+endi
+if $data01 != $rowNum then
+  return -1
+endi
+if $data11 != 20 then 
+  return -1
+endi
+
+## linear fill
+sql select max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) group by t1
+$val = $rowNum * 2
+$val = $val - 1
+$val = $val * $tbNum
+if $rows != $val then
+  return -1
+endi
+if $data08 != 0 then
+  return -1
+endi
+if $data15 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != 0 then
+  return -1
+endi
+
+## [TBASE-365]
+sql select max(c1), min(c2), avg(c3), sum(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 interval(5m) fill(linear) group by t1
+if $rows != 95 then
+  return -1
+endi
+#if $data02 != NULL then
+#  return -1
+#endi
+#if $data04 != NULL then
+#  return -1
+#endi
+if $data06 != binary0 then
+  return -1
+endi
+if $data07 != nchar0 then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data08 != 5 then
+  return -1
+endi
+if $data18 != 5 then
+  return -1
+endi
+
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear)
+$val = $rowNum * 2
+$val = $val - 1
+if $rows != $val then
+  return -1
+endi
+if $data07 != nchar0 then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c9), last(c8), first(c9) from $stb where ts >= '2018-09-16 00:00:00.000' and ts <= '2018-09-18 00:00:00.000' interval(1d) fill(linear)
+if $rows != 3 then
+  return -1
+endi
+
+## previous fill
+print fill(prev)
+sql select max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 interval(5m) fill(prev) group by t1 limit 5
+if $rows != 25 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data09 != 5 then 
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data19 != 5 then 
+  return -1
+endi
+if $data18 != nchar0 then
+  return -1
+endi
+if $data59 != 6 then 
+  return -1
+endi
+if $data69 != 6 then
+  return -1
+endi
+
+## NULL fill
+print fill(NULL)
+sql select max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 interval(5m) fill(value, NULL) group by t1 limit 5
+if $rows != 25 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data09 != 5 then 
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data19 != 5 then 
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data59 != 6 then 
+  return -1
+endi
+if $data69 != 6 then
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/general/parser/fill_us.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b597d378a24f3a07d28d3bebc1a6fe403fdf3208
--- /dev/null
+++ b/tests/script/general/parser/fill_us.sim
@@ -0,0 +1,1037 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = m_fl_db
+$tbPrefix = m_fl_tb
+$mtPrefix = m_fl_mt
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000000      # 2018-09-17 09:00:00.000000
+$delta = 600000000
+print ========== fill_us.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db precision 'us'
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 bool, c7 binary(10), c8 nchar(10)) tags(tgcol int)
+
+$i = 0
+$ts = $ts0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , $x , $x , $x , $x , $x , true, 'BINARY', 'NCHAR' ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+# setup
+$i = 0
+$tb = $tbPrefix . $i
+$tsu = 4 * $delta
+$tsu = $tsu + $ts0
+
+## fill syntax test
+# number of fill values exceeds number of selected columns
+print select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $data11 != 6 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+if $data14 != 6.000000000 then
+  return -1
+endi
+
+# number of fill values is smaller than number of selected columns
+print sql select max(c1), max(c2), max(c3) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
+sql select max(c1), max(c2), max(c3) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
+if $data11 != 6 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+ 
+# unspecified filling method
+sql_error select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill (6, 6, 6, 6, 6)
+
+## constant fill test
+# count_with_fill
+print constant_fill test
+print count_with_constant_fill
+print sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+
+# avg_with_fill
+print avg_witt_constant_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != 6.000000000 then 
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != 6.000000000 then 
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != 6.000000000 then 
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != 6.000000000 then 
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+print max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+print min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+print first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# check double type values
+if $data04 != 0.000000000 then
+  return -1
+endi
+print data14 = $data14
+if $data14 != 6.000000000 then
+  return -1
+endi
+if $data24 != 1.000000000 then
+  return -1
+endi
+if $data34 != 6.000000000 then
+  return -1
+endi
+if $data44 != 2.000000000 then
+  return -1
+endi
+if $data54 != 6.000000000 then
+  return -1
+endi
+if $data64 != 3.000000000 then
+  return -1
+endi
+
+# check float type values
+print $data03 $data13
+if $data03 != 0.00000 then
+  return -1
+endi
+if $data13 != 6.00000 then
+  return -1
+endi
+if $data23 != 1.00000 then
+  return -1
+endi
+if $data33 != 6.00000 then
+  return -1
+endi
+if $data43 != 2.00000 then
+  return -1
+endi
+if $data53 != 6.00000 then
+  return -1
+endi
+if $data63 != 3.00000 then
+  return -1
+endi
+if $data73 != 6.00000 then
+  return -1
+endi
+if $data83 != 4.00000 then
+  return -1
+endi
+
+
+# last_with_fill
+print last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6, 6, 6, 6, 6, 6)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 6 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 6 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# fill_negative_values
+sql select sum(c1), avg(c2), max(c3), min(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -1, -1, -1, -1, -1, -1, -1)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != -1 then 
+  return -1
+endi
+
+# fill_char_values_to_arithmetic_fields
+sql_error select sum(c1), avg(c2), max(c3), min(c4), avg(c4), count(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'c', 'c', 'c', 'c', 'c', 'c', 'c', 'c')
+
+# fill_multiple_columns
+sql_error select sum(c1), avg(c2), min(c3), max(c4), count(c6), first(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99, 99, abc, abc)
+sql select sum(c1), avg(c2), min(c3), max(c4) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99)
+if $rows != 9 then
+  return -1
+endi
+print data01 = $data01
+print data11 = $data11
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 99 then
+  return -1
+endi
+
+sql select * from $tb
+#print data08 = $data08
+if $data08 != NCHAR then
+  return -1
+endi
+#return -1
+
+
+# fill_into_nonarithmetic_fieds
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20000000, 20000000, 20000000)
+#if $data11 != 20000000 then
+if $data11 != 1 then
+  return -1
+endi
+
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1, 1, 1)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1.1, 1.1, 1.1)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1)
+sql select first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1')
+# fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24
+# fill values into binary or nchar columns will be set to null automatically Note:2018-10-24
+sql_error select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1')
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true)
+sql select first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true')
+
+
+# fill nonarithmetic values into arithmetic fields
+sql_error select count(*) where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, abc);
+sql_error select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true');
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e1');
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1);
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '10');
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+
+## linear fill
+# feature currently switched off 2018/09/29
+#sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear)
+
+## previous fill
+print fill(prev)
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 1 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != 1 then 
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != 1 then 
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+
+# avg_with_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != 0.000000000 then 
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != 1.000000000 then 
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != 2.000000000 then 
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != 3.000000000 then 
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then 
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != 1 then 
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != 2 then 
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != 3 then 
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+## NULL fill
+print fill(value, NULL)
+# count_with_fill
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill( NULL)
+print select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill( NULL)
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 1 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 1 then
+  return -1
+endi
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6), count(c7), count(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(none)
+if $rows != 5 then 
+  return -1
+endi
+
+# avg_with_fill
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0.000000000 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2.000000000 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3.000000000 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4.000000000 then
+  return -1
+endi
+
+# max_with_fill
+sql select max(c1), max(c2), max(c3), max(c4), max(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# min_with_fill
+sql select min(c1), min(c2), min(c3), min(c4), min(c5) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# first_with_fill
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6), first(c7), first(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# last_with_fill
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6), last(c7), last(c8) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, NULL)
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != NULL then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data51 != NULL then
+  return -1
+endi
+if $data61 != 3 then
+  return -1
+endi
+if $data71 != NULL then
+  return -1
+endi
+if $data81 != 4 then
+  return -1
+endi
+
+# desc fill query
+print desc fill query
+sql select count(*) from m_fl_tb0 where ts>='2018-9-17 9:0:0' and ts<='2018-9-17 9:11:00' interval(1m) fill(value,10) order by ts desc;
+if $rows != 12 then
+  return -1
+endi
+
+
+#print =============== clear
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then 
+#  return -1
+#endi
+
+######################### us ##########################
+$start = 1537146000000000      # 2018-09-17 09:00:00.000000
+$delta = 600000000
+
+sql create table us_st (ts timestamp, c1 int, c2 double) tags(tgcol int)
+sql create table us_t1 using us_st tags( 1 )
+
+sql insert into us_t1 values ('2018-09-17 09:00:00.000001', 1 , 1)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000002', 2 , 2)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000003', 3 , 3)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000004', 4 , 4)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000005', 5 , 5)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000006', 6 , 6)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000007', 7 , 7)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000008', 8 , 8)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000009', 9 , 9)
+
+sql insert into us_t1 values ('2018-09-17 09:00:00.000015', 15 , 15)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000016', 16 , 16)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000017', 17 , 17)
+
+sql insert into us_t1 values ('2018-09-17 09:00:00.000021', 21 , 21)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000022', 22 , 22)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000023', 23 , 23)
+
+sql insert into us_t1 values ('2018-09-17 09:00:00.000027', 27 , 27)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000028', 28 , 28)
+sql insert into us_t1 values ('2018-09-17 09:00:00.000029', 29 , 29)
+
+print sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(value, 999, 999)
+sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(value, 999, 999)
+if $rows != 8 then 
+  return -1
+endi
+if $data01 != 2.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != 9.000000000 then
+  return -1
+endi
+if $data41 != 999.000000000 then
+  return -1
+endi
+if $data51 != 16.000000000 then
+  return -1
+endi
+if $data61 != 999.000000000 then
+  return -1
+endi
+if $data71 != 21.000000000 then
+  return -1
+endi
+
+sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(none)
+if $rows != 6 then 
+  return -1
+endi
+if $data01 != 2.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != 9.000000000 then
+  return -1
+endi
+if $data41 != 16.000000000 then
+  return -1
+endi
+if $data51 != 21.000000000 then
+  return -1
+endi
+
+sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(null)
+if $rows != 8 then 
+  return -1
+endi
+if $data01 != 2.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != 9.000000000 then
+  return -1
+endi
+if $data41 != null then
+  print ===== $data41
+  return -1
+endi
+if $data51 != 16.000000000 then
+  return -1
+endi
+if $data61 != null then
+   print ===== $data61
+  return -1
+endi
+if $data71 != 21.000000000 then
+  return -1
+endi
+
+
+
+sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(prev)
+if $rows != 8 then 
+  return -1
+endi
+if $data01 != 2.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != 9.000000000 then
+  return -1
+endi
+if $data41 != 9.000000000 then
+  return -1
+endi
+if $data51 != 16.000000000 then
+  return -1
+endi
+if $data61 != 16.000000000 then
+  return -1
+endi
+if $data71 != 21.000000000 then
+  return -1
+endi
+
+sql select avg(c1), avg(c2) from us_t1 where ts >= '2018-09-17 09:00:00.000002' and ts <= '2018-09-17 09:00:00.000021' interval(3u) fill(linear)
+if $rows != 8 then 
+  return -1
+endi
+if $data01 != 2.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != 9.000000000 then
+  return -1
+endi
+if $data41 != 12.500000000 then
+  return -1
+endi
+if $data51 != 16.000000000 then
+  return -1
+endi
+if $data61 != 18.500000000 then
+  return -1
+endi
+if $data71 != 21.000000000 then
+  return -1
+endi
+
+print ======== fill_us.sim run end...... ================
\ No newline at end of file
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
new file mode 100644
index 0000000000000000000000000000000000000000..46431b0848c72aefc9b5aaa04f7e13f525dcfe1c
--- /dev/null
+++ b/tests/script/general/parser/first_last.sim
@@ -0,0 +1,87 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxTablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = first_db
+$tbPrefix = first_tb
+$stbPrefix = first_stb
+$tbNum = 10
+$rowNum = 1000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 60000
+print ========== first_last.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+
+sql create database $db maxrows 400 cache 1
+
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $stb tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c6 =  $x / 128 
+    $c6 = $c6 * 128
+    $c6 = $x - $c6
+    sql insert into $tb values ( $ts , $x , $x , $x , $x , $x , $c6 , true, 'BINARY', 'NCHAR' ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+$ts = $ts + 60000
+$tb = $tbPrefix . 0
+sql insert into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 1
+sql insert into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 2
+sql insert into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 3
+sql insert into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 4
+sql insert into $tb (ts) values ( $ts )
+$ts = $ts0 - 60000
+$tb = $tbPrefix . 0
+sql import into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 1
+sql import into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 2
+sql import into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 3
+sql import into $tb (ts) values ( $ts )
+$tb = $tbPrefix . 4
+sql import into $tb (ts) values ( $ts )
+
+print ====== test data created
+
+run general/parser/first_last_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/first_last_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/general/parser/first_last_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8127c1923015e130a85a98a50cd8d4bca23fedb3
--- /dev/null
+++ b/tests/script/general/parser/first_last_query.sim
@@ -0,0 +1,266 @@
+sleep 3000
+sql connect
+
+$dbPrefix = first_db
+$tbPrefix = first_tb
+$stbPrefix = first_stb
+$tbNum = 10
+$rowNum = 2000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 60000
+print ========== first_last_query.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql use $db
+
+##### select first/last from table
+## TBASE-331
+print ====== select first/last from table
+$tb = $tbPrefix . 0
+sql select first(*) from $tb
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 08:59:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1   
+endi  
+if $data02 != 0 then
+  return -1  
+endi 
+print data03 = $data03
+if $data03 != 0.00000 then
+  return -1  
+endi    
+if $data04 != 0.000000000 then
+  return -1
+endi
+if $data05 != 0 then
+  return -1
+endi 
+if $data06 != 0 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != BINARY then
+  print expect BINARY, actual: $data08
+  return -1
+endi
+#if $data09 != NULL then
+if $data09 != NCHAR then
+  return -1
+endi
+
+sql select last(*) from $tb
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-18 01:40:00.000@ then
+  return -1   
+endi  
+
+if $data01 != 999 then
+  return -1   
+endi
+
+if $data02 != 999 then
+  return -1  
+endi
+
+if $data03 != 999.00000 then
+  return -1  
+endi    
+
+if $data04 != 999.000000000 then
+  return -1
+endi
+
+#if $data05 != NULL then
+if $data05 != 999 then
+  return -1
+endi 
+#if $data06 != NULL then
+if $data06 != 103 then
+  return -1
+endi
+#if $data07 != NULL then
+if $data07 != 1 then
+  return -1
+endi
+#if $data08 != NULL then
+if $data08 != BINARY then
+  return -1
+endi
+#if $data09 != NULL then
+if $data09 != NCHAR then
+  return -1
+endi
+
+### test if first works for committed data. An 'order by ts desc' clause should be present, and queried data should come from at least 2 file blocks
+$tb = $tbPrefix . 9
+sql select first(ts), first(c1) from $tb where ts < '2018-10-17 10:00:00.000' order by ts asc
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+
+$tb = $tbPrefix . 9
+sql select first(ts), first(c1) from $tb where ts < '2018-10-17 10:00:00.000' order by ts desc 
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+
+print =============> add check for out of range first/last query
+sql select first(ts),last(ts) from first_tb4 where ts>'2018-9-18 1:40:01';
+if $row != 0 then
+  return -1
+endi
+
+sql select first(ts),last(ts) from first_tb4 where ts<'2018-9-17 8:50:0';
+if $row != 0 then
+  return -1
+endi
+
+#first/last mix up query
+#select first(size),last(size) from stest interval(1d) group by tbname;
+print =====================>td-1477
+
+sql create table stest(ts timestamp,size INT,filenum INT) tags (appname binary(500),tenant binary(500));
+sql insert into test1 using stest tags('test1','aaa') values ('2020-09-04 16:53:54.003',210,3);
+sql insert into test2 using stest tags('test1','aaa') values ('2020-09-04 16:53:56.003',210,3);
+sql insert into test11 using stest tags('test11','bbb') values ('2020-09-04 16:53:57.003',210,3);
+sql insert into test12 using stest tags('test11','bbb') values ('2020-09-04 16:53:58.003',210,3);
+sql insert into test21 using stest tags('test21','ccc') values ('2020-09-04 16:53:59.003',210,3);
+sql insert into test22 using stest tags('test21','ccc') values ('2020-09-04 16:54:54.003',210,3);
+sql select sum(size) from stest group by appname;
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 420 then
+  return -1
+endi
+if $data10 != 420 then
+  return -1
+endi
+if $data20 != 420 then
+  return -1
+endi
+
+if $data01 != @test1@ then
+return -1
+endi
+if $data11 != @test11@ then
+return -1
+endi
+if $data21 != @test21@ then
+return -1
+endi
+
+sql select sum(size) from stest interval(1d) group by appname;
+if $rows != 3 then
+ return -1
+endi
+
+#2020-09-04 00:00:00.000 |                   420 | test1                          |
+#2020-09-04 00:00:00.000 |                   420 | test11                         |
+#2020-09-04 00:00:00.000 |                   420 | test21                         |
+if $data00 != @20-09-04 00:00:00.000@ then
+ return -1
+endi
+
+if $data10 != @20-09-04 00:00:00.000@ then
+ return -1
+endi
+
+if $data20 != @20-09-04 00:00:00.000@ then
+ return -1
+endi
+
+if $data01 != 420 then
+ print expect 420 , actual $data01
+ return -1
+endi
+
+if $data11 != 420 then
+ return -1
+endi
+
+if $data21 != 420 then
+ return -1
+endi
+
+if $data02 != @test1@ then
+return -1
+endi
+if $data12 != @test11@ then
+return -1
+endi
+if $data22 != @test21@ then
+return -1
+endi
+
+print ===================>td-1477, one table has only one block occurs this bug.
+sql select first(size),count(*),LAST(SIZE) from stest where tbname in ('test1', 'test2') interval(1d) group by tbname;
+if $rows != 2 then
+ return -1
+endi
+
+if $data00 != @20-09-04 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 210 then
+  return -1
+endi
+
+if $data02 != 1 then
+  return -1
+endi
+
+if $data03 != 210 then
+ return -1
+endi
+
+if $data04 != @test1@ then
+  return -1
+endi
+
+if $data10 != @20-09-04 00:00:00.000@ then
+  return -1
+endi
+
+if $data11 != 210 then
+  return -1
+endi
+
+if $data12 != 1 then
+  return -1
+endi
+
+if $data13 != 210 then
+ return -1
+endi
+
+if $data14 != @test2@ then
+  print expect test2 , actual: $data14
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bd0d3c1a12c77570c19ea1ef061395912ad9f93a
--- /dev/null
+++ b/tests/script/general/parser/groupby.sim
@@ -0,0 +1,487 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = group_db
+$tbPrefix = group_tb
+$mtPrefix = group_mt
+$tbNum = 8
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+
+print =============== groupby.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+$i1 = 1
+$i2 = 0
+
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$dbPrefix = group_db
+$tbPrefix = group_tb
+$mtPrefix = group_mt
+
+$tb1 = $tbPrefix . $i1
+$tb2 = $tbPrefix . $i2
+$ts1 = $tb1 . .ts
+$ts2 = $tb2 . .ts
+
+print ===============================groupby_operation
+sql select count(*),c1 from group_tb0 where c1 < 20 group by c1;
+if $row != 20 then
+ return -1
+endi
+
+if $data00 != 100 then
+ return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != 100 then
+  return -1
+endi
+
+if $data11 != 1 then
+  return -1
+endi
+
+sql select first(ts),c1 from group_tb0 where c1<20 group by c1;
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data90 != @70-01-01 08:01:40.009@ then
+  return -1
+endi
+
+if $data91 != 9 then
+  return -1
+endi
+
+sql select first(ts), ts, c1 from group_tb0 where c1 < 20 group by c1;
+print $row
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != $data01 then
+  return -1
+endi
+
+if $data10 != $data11 then
+   return -1
+endi
+
+if $data20 != $data21 then
+   return -1
+endi
+
+if $data90 != $data91 then
+   return -1
+endi
+
+if $data02 != 0 then
+   return -1
+endi
+
+if $data12 != 1 then
+   return -1
+endi
+
+if $data92 != 9 then
+   return -1
+endi
+
+sql select sum(c1), c1, avg(c1), min(c1), max(c2) from group_tb0 where c1 < 20 group by c1;
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+print $data02
+if $data02 != 0.000000000 then
+  return -1
+endi
+
+if $data03 != 0 then
+  return -1
+endi
+
+print $data04
+if $data04 != 0.00000 then
+  return -1
+endi
+
+if $data10 != 100 then
+  return -1
+endi
+
+if $data11 != 1 then
+  return -1
+endi
+
+print $data12
+if $data12 != 1.000000000 then
+  return -1
+endi
+
+if $data13 != 1 then
+  return -1
+endi
+
+if $data14 != 1.00000 then
+  print expect 1.00000, actual:$data14
+  return -1
+endi
+
+sql_error select sum(c1), ts, c1 from group_tb0 where c1<20 group by c1;
+sql_error select first(ts), ts, c2 from group_tb0 where c1 < 20 group by c1;
+sql_error select sum(c3), ts, c2 from group_tb0 where c1 < 20 group by c1;
+sql_error select sum(c3), first(ts), c2 from group_tb0 where c1 < 20 group by c1;
+sql_error select first(c3), ts, c1, c2 from group_tb0 where c1 < 20 group by c1;
+sql_error select first(c3), last(c3), ts, c1 from group_tb0 where c1 < 20 group by c1;
+
+#===========================interval=====not support======================
+sql_error select count(*), c1 from group_tb0 where c1<20 interval(1y) group by c1;
+#=====tbname must be the first in the group by clause=====================
+sql_error select count(*) from group_tb0 where c1 < 20 group by c1, tbname;
+
+#super table group by normal columns
+sql select count(*), c1 from group_mt0 where c1< 20 group by c1;
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != 800 then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != 800 then
+  return -1
+endi
+
+if $data11 != 1 then
+  return -1
+endi
+
+if $data90 != 800 then
+  return -1
+endi
+
+if $data91 != 9 then
+  return -1
+endi
+
+sql select first(c1), c1, ts from group_mt0 where c1<20 group by c1;
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != $data01 then
+  return -1
+endi
+
+if $data02 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data10 != $data11 then
+  return -1
+endi
+
+if $data12 != @70-01-01 08:01:40.001@ then
+  return -1
+endi
+
+if $data20 != $data21 then
+  return -1
+endi
+
+if $data22 != @70-01-01 08:01:40.002@ then
+  return -1
+endi
+
+if $data90 != $data91 then
+  return -1
+endi
+
+if $data92 != @70-01-01 08:01:40.009@ then
+  return -1
+endi
+
+sql select first(c1), last(ts), first(ts), last(c1),c1,sum(c1),avg(c1),count(*) from group_mt0 where c1<20 group by c1;
+if $row != 20 then
+  return -1
+endi
+
+if $data00 != $data03 then
+  return -1
+endi
+
+if $data01 != @70-01-01 08:01:49.900@ then
+  return -1
+endi
+
+if $data02 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data07 != 800 then
+  return -1
+endi
+
+if $data10 != $data13 then
+  return -1
+endi
+
+if $data11 != @70-01-01 08:01:49.901@ then
+  return -1
+endi
+
+if $data12 != @70-01-01 08:01:40.001@ then
+  return -1
+endi
+
+if $data17 != 800 then
+  return -1
+endi
+
+if $data90 != $data93 then
+  return -1
+endi
+
+if $data91 != @70-01-01 08:01:49.909@ then
+  return -1
+endi
+
+if $data92 != @70-01-01 08:01:40.009@ then
+  return -1
+endi
+
+if $data97 != 800 then
+  return -1
+endi
+
+if $data95 != 7200 then
+  return -1
+endi
+
+if $data94 != 9 then
+  return -1
+endi
+
+sql select c1,sum(c1),avg(c1),count(*) from group_mt0 where c1<5 group by c1;
+if $row != 5 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data11 != 800 then
+  return -1
+endi
+
+sql select first(c1), last(ts), first(ts), last(c1),sum(c1),avg(c1),count(*) from group_mt0 where c1<20 group by tbname,c1;
+if $row != 160 then
+  return -1
+endi
+
+print $data00
+if $data00 != 0 then
+  return -1
+endi
+
+if $data01 != @70-01-01 08:01:49.900@ then
+  return -1
+endi
+
+print $data01
+if $data02 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data03 != 0 then
+  return -1
+endi
+
+if $data04 != 0 then
+  return -1
+endi
+
+if $data06 != 100 then
+  return -1
+endi
+
+if $data07 != @group_tb0@ then
+  return -1
+endi
+
+if $data90 != 9 then
+  return -1
+endi
+
+if $data91 != @70-01-01 08:01:49.909@ then
+  return -1
+endi
+
+if $data92 != @70-01-01 08:01:40.009@ then
+  return -1
+endi
+
+if $data93 != 9 then
+  return -1
+endi
+
+if $data94 != 900 then
+  return -1
+endi
+
+if $data96 != 100 then
+  return -1
+endi
+
+if $data97 != @group_tb0@ then
+  return -1
+endi
+
+print ---------------------------------> group by binary|nchar data add cases
+
+
+#=========================== group by multi tags ======================
+sql create table st (ts timestamp, c int) tags (t1 int, t2 int, t3 int, t4 int);
+sql create table t1 using st tags(1, 1, 1, 1);
+sql create table t2 using st tags(1, 2, 2, 2);
+sql insert into t1 values ('2020-03-27 04:11:16.000', 1)('2020-03-27 04:11:17.000', 2) ('2020-03-27 04:11:18.000', 3) ('2020-03-27 04:11:19.000', 4) ; 
+sql insert into t1 values ('2020-03-27 04:21:16.000', 1)('2020-03-27 04:31:17.000', 2) ('2020-03-27 04:51:18.000', 3) ('2020-03-27 05:10:19.000', 4) ; 
+sql insert into t2 values ('2020-03-27 04:11:16.000', 1)('2020-03-27 04:11:17.000', 2) ('2020-03-27 04:11:18.000', 3) ('2020-03-27 04:11:19.000', 4) ; 
+sql insert into t2 values ('2020-03-27 04:21:16.000', 1)('2020-03-27 04:31:17.000', 2) ('2020-03-27 04:51:18.000', 3) ('2020-03-27 05:10:19.000', 4) ; 
+
+sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732'  interval(1m) sliding(15s) group by tbname,t1,t2;
+if $rows != 40 then
+  return -1
+endi
+
+if $data01 != 1.000000000 then
+  return -1
+endi
+if $data02 != t1 then
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+
+if $data11 != 1.000000000 then
+  return -1
+endi
+if $data12 != t1 then
+  return -1
+endi
+if $data13 != 1 then
+  return -1
+endi
+if $data14 != 1 then
+  return -1
+endi
+
+sql select irate(c) from st where t1="1" and ts >= '2020-03-27 04:11:17.732' and ts < '2020-03-27 05:11:17.732'  interval(1m) sliding(15s) group by tbname,t1,t2 limit 1;
+if $rows != 2 then
+  return -1
+endi
+
+if $data11 != 1.000000000 then
+  return -1
+endi
+if $data12 != t2 then
+  return -1
+endi
+if $data13 != 1 then
+  return -1
+endi
+if $data14 != 2 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7ab0437685869594daded7fcfd9c886339842221
--- /dev/null
+++ b/tests/script/general/parser/import.sim
@@ -0,0 +1,91 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = impt_db
+$tbPrefix = tb
+$stbPrefix = stb
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+print ========== import.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table tb (ts timestamp, c1 int, c2 timestamp)
+sql insert into tb values ('2019-05-05 11:30:00.000', 1, now)
+sql insert into tb values ('2019-05-05 12:00:00.000', 1, now)
+sleep 2000
+sql import into tb values ('2019-05-05 11:00:00.000', -1, now)
+sleep 2000
+sql import into tb values ('2019-05-05 11:59:00.000', -1, now)
+sleep 2000
+sql import into tb values ('2019-05-04 08:00:00.000', -1, now)
+sleep 2000
+sql import into tb values ('2019-05-04 07:59:00.000', -1, now)
+sleep 2000
+
+sql select * from tb
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @19-05-04 07:59:00.000@ then
+  return -1
+endi
+if $data10 != @19-05-04 08:00:00.000@ then
+  return -1
+endi
+if $data20 != @19-05-05 11:00:00.000@ then
+  return -1
+endi
+if $data30 != @19-05-05 11:30:00.000@ then
+  return -1
+endi
+if $data40 != @19-05-05 11:59:00.000@ then
+  return -1
+endi
+if $data50 != @19-05-05 12:00:00.000@ then
+  return -1
+endi
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+sql use $db
+sql select * from tb
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @19-05-04 07:59:00.000@ then
+  return -1
+endi
+if $data10 != @19-05-04 08:00:00.000@ then
+  return -1
+endi
+if $data20 != @19-05-05 11:00:00.000@ then
+  return -1
+endi
+if $data30 != @19-05-05 11:30:00.000@ then
+  return -1
+endi
+if $data40 != @19-05-05 11:59:00.000@ then
+  return -1
+endi
+if $data50 != @19-05-05 12:00:00.000@ then
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..197ae5845362f2dbfc9392fe2a57601aec442e22
--- /dev/null
+++ b/tests/script/general/parser/import_commit1.sim
@@ -0,0 +1,56 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c ctime -v 30
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ic_db
+$tbPrefix = ic_tb
+$stbPrefix = ic_stb
+$tbNum = 1
+#$rowNum = 166
+$rowNum = 1361
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16
+print ====== create tables
+sql use $db
+
+$i = 0
+$ts = $ts0
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, c1 int)
+$x = 0
+while $x < $rowNum
+  $xs = $x * $delta
+  $ts = $ts0 + $xs
+  sql insert into $tb values ( $ts , $x ) 
+  $x = $x + 1
+endw 
+print ====== tables created
+
+sleep 6000
+
+$ts = $ts0 + $delta
+$ts = $ts + 1
+sql import into $tb values ( $ts , -1)
+sql select count(*) from $tb
+$res = $rowNum + 1
+if $data00 != $res then
+  print expected: $res 
+  print returned: $rows 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e400d0c3cb7e347d34b3c75d9ae2b68ffeeb656f
--- /dev/null
+++ b/tests/script/general/parser/import_commit2.sim
@@ -0,0 +1,55 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c ctime -v 30
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ic_db
+$tbPrefix = ic_tb
+$stbPrefix = ic_stb
+$tbNum = 1
+$rowNum = 166
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16
+print ====== create tables
+sql use $db
+
+$i = 0
+$ts = $ts0
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, c1 int)
+$x = 0
+while $x < $rowNum
+  $xs = $x * $delta
+  $ts = $ts0 + $xs
+  sql insert into $tb values ( $ts , $x ) 
+  $x = $x + 1
+endw 
+print ====== tables created
+
+sleep 6000
+
+$ts = $ts0 + $delta
+$ts = $ts + 1
+sql import into $tb values ( $ts , -1)
+sql select count(*) from $tb
+$res = $rowNum + 1
+if $data00 != $res then
+  print expected: $res 
+  print returned: $rows 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7e7451e689bbe2ac0059b13ba3fa64c530445adf
--- /dev/null
+++ b/tests/script/general/parser/import_commit3.sim
@@ -0,0 +1,62 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c ctime -v 30
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ic_db
+$tbPrefix = ic_tb
+$stbPrefix = ic_stb
+$tbNum = 1
+$rowNum = 582
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16
+print ====== create tables
+sql use $db
+sql reset query cache
+$i = 0
+$ts = $ts0
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, c1 int, c2 int, c3 int, c4 int, c5 int)
+$x = 0
+while $x < $rowNum
+  $xs = $x * $delta
+  $ts = $ts0 + $xs
+  sql insert into $tb values ( $ts , $x , $x , $x , $x , $x ) 
+  $x = $x + 1
+endw 
+print ====== tables created
+
+sleep 6000
+
+$ts = $ts + 1
+sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
+$ts = $ts0 + $delta
+$ts = $ts + 1
+sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
+
+sleep 6000
+
+sql show databases
+
+sql select count(*) from $tb
+$res = $rowNum + 2
+if $data00 != $res then
+  print expected: $res 
+  print returned: $rows 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6b4dd07c7981ca141765b41cca3d005874a6583f
--- /dev/null
+++ b/tests/script/general/parser/import_file.sim
@@ -0,0 +1,39 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+sql connect
+sleep 2000
+
+sql drop database if exists indb
+
+sql create database if not exists indb
+
+sql use indb
+
+$inFileName = '~/data.csv'
+$numOfRows = 10000
+#system sh/gendata.sh $inFileName $numOfRows  # input file invalid
+system sh/gendata.sh ~/data.csv $numOfRows
+
+sql create table tbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2))
+print ====== create tables success, starting import data
+
+sql import into tbx file $inFileName
+
+sql select count(*) from tbx
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $numOfRows then
+  print "expect: $numOfRows, act: $data00"
+  return -1
+endi
+
+
+#system rm -f $inFileName     # invalid shell
+system rm -f ~/data.csv
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b24c1b629fa371e417826bcb1da67180f3317c29
--- /dev/null
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -0,0 +1,68 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql create database mul_db
+sql use mul_db
+sql create table mul_st (ts timestamp, col1 int) tags (tag1 int)
+
+# case: insert multiple recordes for multiple table in a query
+print =========== insert_multiTbl.sim case: insert multiple records for multiple table in a query
+$ts = 1500000000000
+sql insert into mul_t0 using mul_st tags(0) values ( $ts , 0) ( $ts + 1s, 1) ( $ts + 2s, 2) mul_t1 using mul_st tags(1) values ( $ts , 10) ( $ts + 1s, 11) ( $ts + 2s, 12) mul_t2 using mul_st tags(2) values ( $ts , 20) ( $ts + 1s, 21) ( $ts + 2s, 22) mul_t3 using mul_st tags(3) values ( $ts , 30) ( $ts + 1s, 31) ( $ts + 2s, 32)
+sql select * from mul_st
+print rows = $rows
+if $rows != 12 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+
+sql create table mul_b0 (ts timestamp, col1 int)
+sql create table mul_b1 (ts timestamp, col1 int)
+sql create table mul_b2 (ts timestamp, col1 int)
+sql create table mul_b3 (ts timestamp, col1 int)
+
+sql insert into mul_b0 values ( $ts , 0) ( $ts + 1s, 1) ( $ts + 2s, 2) mul_b1 values ( $ts , 10) ( $ts + 1s, 11) ( $ts + 2s, 12) mul_b2 values ( $ts , 20) ( $ts + 1s, 21) ( $ts + 2s, 22) mul_b3 values ( $ts , 30) ( $ts + 1s, 31) ( $ts + 2s, 32)
+sql select * from mul_b3
+print rows = $rows
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 30 then
+  return -1
+endi
+
+# insert values for specified columns
+sql create table mul_st1 (ts timestamp, col1 int, col2 float, col3 binary(10)) tags (tag1 int, tag2 int, tag3 binary(8))
+print =========== insert values for specified columns for multiple table in a query
+$ts = 1500000000000
+sql insert into mul_t10 (ts, col1, col3) using mul_st1 (tag1, tag3) tags(0, 'tag3-0') values ( $ts , 00, 'binary00') ( $ts + 1s, 01, 'binary01') ( $ts + 2s, 02, 'binary02') mul_t11 (ts, col1, col3) using mul_st1 (tag1, tag3) tags(1, 'tag3-0') values ( $ts , 10, 'binary10') ( $ts + 1s, 11, 'binary11') ( $ts + 2s, 12, 'binary12') mul_t12 (ts, col1, col3) using mul_st1 (tag1, tag3) tags(2, 'tag3-0') values ( $ts , 20, 'binary20') ( $ts + 1s, 21, 'binary21') ( $ts + 2s, 22, 'binary22') mul_t13 (ts, col1, col3) using mul_st1 (tag1, tag3) tags(3, 'tag3-0') values ( $ts , 30, 'binary30') ( $ts + 1s, 31, 'binary31') ( $ts + 2s, 32, 'binary32')
+
+sql select * from mul_st1
+print rows = $rows
+if $rows != 12 then
+  return -1
+endi
+if $data02 != NULL then
+  print "expect: NULL, act: $data03"
+  return -1
+endi
+if $data03 != @binary00@ then
+  return -1
+endi
+if $data92 != NULL then
+  return -1
+endi
+if $data93 != @binary30@ then
+  return -1
+endi
+
diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4ba455c2446e6fd9804b8e518dc31cacb0781bfc
--- /dev/null
+++ b/tests/script/general/parser/insert_tb.sim
@@ -0,0 +1,236 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print create_tb test
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, col1 int, col2 bigint, col3 float, col4 double, col5 binary(20), col6 bool, col7 smallint, col8 tinyint, col9 nchar(10)) tags (tag1 int)
+
+# case: insert multiple records in a query
+print =========== create_tb.sim case: insert multiple records in a query
+$ts = 1500000000000
+$col1 = 1
+$col2 = 1
+$col3 = 1.1e3
+$col4 = 1.1e3
+$col5 = 'Binary'
+$col6 = true
+$col7 = 1
+$col8 = 1
+$col9 = 'Nchar'
+$tag1 = 1
+sql reset query cache
+sql create table $tb using $mt tags( $tag1 )
+sql insert into $tb values ( $ts , $col1 , $col2 , $col3 , $col4 , $col5 , $col6 , $col7 , $col8 , $col9 ) ( $ts + 1000a, $col1 , $col2 , $col3 , $col4 , $col5 , $col6 , $col7 , $col8 , $col9 )
+sql select * from $tb order by ts desc
+print rows = $rows
+if $rows != 2 then
+  return -1
+endi
+if $data01 != $col1 then
+  return -1
+endi
+#sql drop table $tb
+
+# insert values for specified columns
+$col1 = 2
+$col3 = 3
+$col5 = 5
+sql create table $tb using $mt tags( $tag1 )
+sql insert into $tb ( ts, col1, col3, col5) values ( $ts + 2000a, $col1 , $col3 , $col5 )
+sql select * from $tb order by ts desc
+if $rows != 3 then
+  return -1
+endi
+if $data01 != $col1 then 
+  return -1
+endi
+print data03 = $data03
+if $data03 != 3.00000 then
+  return -1
+endi
+if $data05 != $col5 then
+  return -1
+endi
+
+sql insert into $tb (ts, col1, col2, col3, col4, col5, col6, col7, col8, col9) values ( $ts + 3000a, $col1 , $col2 , $col3 , $col4 , $col5 , $col6 , $col7 , $col8 , $col9 ) ( $ts + 4000a, $col1 , $col2 , $col3 , $col4 , $col5 , $col6 , $col7 , $col8 , $col9 )
+sql select * from $tb order by ts desc
+print rows = $rows
+if $rows != 5 then
+  return -1
+endi
+
+# case: insert records from .csv files
+# manually test
+#sql insert into $tb file parser/parser_test_data.csv
+#sql select * from $tb
+#if $rows != 10 then
+#  return -1
+#endi
+
+sql drop table $tb
+sql create table tb1 (ts timestamp, c1 int)
+sql create table tb2 (ts timestamp, c1 int)
+sql insert into tb1 values(now, 1) tb2 values (now, 2)
+sql select count(*) from tb1
+if $rows != 1 then
+  return -1
+endi
+sql select count(*) from tb2
+if $rows != 1 then
+  return -1
+endi
+
+sql drop database $db
+sleep 1000
+sql create database $db
+sql use $db
+sql create table stb1 (ts timestamp, c1 int) tags(t1 int)
+sql create table stb2 (ts timestamp, c1 double, c2 binary(10)) tags(t1 binary(10))
+sql create table tb1 using stb1 tags(1)
+sql create table tb2 using stb2 tags('tb2')
+sql insert into tb1 (ts, c1) values (now-1s, 1) (now, 2) tb2 (ts, c1) values (now-2s, 1) (now-1s, 2) (now, 3)
+sql select * from tb1 order by ts asc
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+sql select * from tb2 order by ts desc
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3.000000000 then
+  return -1
+endi
+if $data11 != 2.000000000 then
+  return -1
+endi
+if $data21 != 1.000000000 then
+  return -1
+endi
+
+sql drop database $db
+sleep 1000
+sql create database $db
+sql use $db
+sql create table stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 nchar(10), c6 binary(20)) tags(t1 int, t2 bigint, t3 double, t4 float, t5 nchar(10))
+sql create table tb0 using stb tags(0, 0, 0, 0, '涛思')
+sql create table tb1 using stb tags('1', 1, 1, 1, '涛思')
+sql create table tb2 using stb tags(2, '2', 2, 2, '涛思')
+sql create table tb3 using stb tags(3, 3, '3', 3, '涛思')
+sql create table tb4 using stb tags(4, 4, 4, '4', '涛思')
+sql insert into tb0 values ('2018-09-17 09:00:00.000', 1, 1, 1, 1, '涛思nchar', 'none quoted')
+sql insert into tb1 values ('2018-09-17 09:00:00.000', '1', 1, 1, 1, '涛思nchar', 'quoted int')
+sql insert into tb2 values ('2018-09-17 09:00:00.000', 1, '1', 1, 1, '涛思nchar', 'quoted bigint')
+sql insert into tb3 values ('2018-09-17 09:00:00.000', 1, 1, '1', 1, '涛思nchar', 'quoted float')
+sql insert into tb4 values ('2018-09-17 09:00:00.000', 1, 1, 1, '1', '涛思nchar', 'quoted double')
+sql select * from stb
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data30 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data40 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 1.00000 then
+  return -1
+endi
+if $data04 != 1.000000000 then
+  return -1
+endi
+if $data05 != 涛思nchar then
+  return -1
+endi
+if $data06 != @none quoted@ then
+  return -1
+endi
+if $data13 != 1.00000 then
+  return -1
+endi
+if $data14 != 1.000000000 then
+  return -1
+endi
+if $data15 != 涛思nchar then
+  return -1
+endi
+if $data16 != @quoted int@ then
+  return -1
+endi
+if $data25 != 涛思nchar then
+  return -1
+endi
+if $data26 != @quoted bigint@ then
+  return -1
+endi
+if $data35 != 涛思nchar then
+  return -1
+endi
+if $data36 != @quoted float@ then
+  return -1
+endi
+if $data45 != 涛思nchar then
+  return -1
+endi
+if $data46 != @quoted double@ then
+  return -1
+endi
+
+# case: support NULL char of the binary field [TBASE-660]
+sql create table NULLb (ts timestamp, c1 binary(20), c2 binary(20), c3 float) 
+sql insert into NULLb values ('2018-09-17 09:00:00.000', '', '', 3.746)
+sql select * from NULLb
+if $rows != 1 then
+  return -1
+endi
+
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then 
+#  return -1
+#endi
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1cd857162d9a764519d2edd6f790f9fd1c083b61
--- /dev/null
+++ b/tests/script/general/parser/interp.sim
@@ -0,0 +1,69 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = intp_db
+$tbPrefix = intp_tb
+$stbPrefix = intp_stb
+$tbNum = 4
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== interp.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+run general/parser/interp_test.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/interp_test.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8bffae4af634e9c04c4d5f4614d51e1e1b33ffba
--- /dev/null
+++ b/tests/script/general/parser/interp_test.sim
@@ -0,0 +1,836 @@
+sleep 3000
+sql connect
+
+$dbPrefix = intp_db
+$tbPrefix = intp_tb
+$stbPrefix = intp_stb
+$tbNum = 4
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== intp_test.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ====== use db
+sql use $db
+
+##### select interp from table
+print ====== select intp from table
+$tb = $tbPrefix . 0
+  ## interp(*) from tb
+  sql select interp(*) from $tb where ts = $ts0
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+
+  ## interp + limit offset
+  sql select interp(*) from $tb where ts = $ts0 limit 5 offset 1
+  if $rows != 0 then
+    return -1
+  endi
+
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+
+  ## intp + aggregation functions
+  #$t = $ts0 + $delta
+  #$t = $t + $delta
+  #sql_error select interp(ts), max(c1), min(c2), count(c3), sum(c4), avg(c5), stddev(c6), first(c7), last(c8), interp(c9) from $tb where ts = $t
+
+  ### illegal queries on a table
+  sql_error select interp(ts), c1 from $tb where ts = $ts0
+  sql_error select interp(ts) from $tb where ts >= $ts0
+  sql_error select interp(ts), max(c1), min(c2), count(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(NULL)
+
+  ### interp from tb + fill
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t
+  if $rows != 0 then
+    return -1
+  endi
+
+  ## fill(none)
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
+  if $rows != 0 then
+    return -1
+  endi
+  $t = $tsu + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
+  if $rows != 0 then
+    return -1
+  endi
+
+  ## fill(NULL)
+  $t = $tsu - 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, NULL) order by ts asc
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-11-25 19:29:59.000@ then
+    return -1
+  endi
+  if $data01 != NULL then
+    print expect NULL, actual $data01
+    return -1
+  endi
+  if $data02 != NULL then
+    return -1
+  endi
+  if $data03 != NULL then
+    return -1
+  endi
+  if $data04 != NULL then
+    return -1
+  endi
+  if $data05 != NULL then
+    return -1
+  endi
+  if $data06 != NULL then
+    return -1
+  endi
+  if $data07 != NULL then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+
+  $t = $tsu + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
+  if $rows != 0 then
+    return -1
+  endi
+
+  ## fill(prev)
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
+  if $rows != 1 then
+    return -1
+  endi
+
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(prev)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+
+  $t = $ts0 - 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
+  if $rows != 0 then
+    return -1
+  endi
+
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(prev)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != NULL then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    print expect 0.00000, actual:$data03
+    return -1
+  endi
+#  if $data04 != NULL then
+#    return -1
+#  endi
+
+  $t = $tsu + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
+  if $rows != 0 then
+    return -1
+  endi
+
+  ## fill(linear)
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  print $data03
+  if $data03 != 0.00167 then
+    return -1
+  endi
+  if $data04 != 0.001666667 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != NULL then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+  # columns contain NULL values
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(linear)
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != NULL then
+    return -1
+  endi
+  if $data03 != 0.00167 then
+    return -1
+  endi
+  if $data04 != NULL then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != NULL then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+  # columns contain NULL values
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != NULL then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != NULL then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+
+  $t = $ts0 - 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
+  if $rows != 0 then
+    return -1
+  endi
+
+  $t = $tsu + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
+  if $rows != 0 then
+    return -1
+  endi
+
+## fill(value)
+  $t = $ts0 + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != -2 then
+    return -1
+  endi
+  if $data02 != -2 then
+    return -1
+  endi
+  if $data03 != -2.00000 then
+    return -1
+  endi
+  if $data04 != -2.000000000 then
+    return -1
+  endi
+  if $data05 != -2 then
+    return -1
+  endi
+  if $data06 != -2 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(value, -1, -2, -3)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+  # table has NULL columns
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(value, -1, -2, -3)
+  if $rows != 1 then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != NULL then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != NULL then
+    return -1
+  endi
+
+  $t = $ts0 - 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
+  if $rows != 0 then
+    return -1
+  endi
+
+  $t = $tsu + 1000
+  sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
+  if $rows != 0 then
+    return -1
+  endi
+
+##### select interp from stable
+  ## interp(*) from stb
+  sql select interp(*) from $stb where ts = $ts0
+  if $rows != 1 then
+    return -1
+  endi
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t
+  if $rows != 0 then
+    return -1
+  endi
+  ## interp(*) from stb + group by 
+  sql select interp(ts, c1, c2, c3, c4, c5, c7, c9) from $stb where ts = $ts0 group by tbname order by tbname asc
+  print ====== select interp(ts, c1, c2, c3, c4, c5, c7, c9) from $stb where ts = $ts0 group by tbname order by tbname asc
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
+  if $rows != $tbNum then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:00.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1 
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data08 != intp_tb0 then
+    return -1 
+  endi
+  if $data22 != NULL then
+    return -1
+  endi
+  if $data24 != NULL then
+    return -1
+  endi
+  if $data28 != intp_tb2 then
+    return -1 
+  endi
+
+  ## interp(*) from stb + group by + limit offset
+  sql select interp(*) from $stb where ts = $ts0 group by tbname limit 0
+  if $rows != 0 then
+    return -1
+  endi
+  sql select interp(*) from $stb where ts = $ts0 group by tbname limit 0 offset 1
+
+  ## interp(*) from stb + group by + fill(none)
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t fill(none) group by tbname
+  if $rows != 0 then
+    return -1
+  endi
+
+  sql select interp(*) from $stb where ts = $ts0 fill(none) group by tbname
+  if $rows != 4 then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data21 != 0 then
+    return -1
+  endi
+  if $data22 != NULL then
+    return -1
+  endi
+  if $data24 != NULL then
+    return -1
+  endi
+
+  ## interp(*) from stb + group by + fill(none)
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t fill(NULL) group by tbname
+if $rows != $tbNum then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:01.000@ then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data23 != NULL then
+  return -1
+endi
+if $data34 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data16 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data38 != NULL then
+  return -1
+endi
+if $data09 != NULL then
+  return -1
+endi
+
+sql select interp(*) from $stb where ts = $ts0 fill(NULL) group by tbname
+print $rows
+
+if $rows != 4 then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data02 != 0 then
+  return -1
+endi
+if $data21 != 0 then
+  return -1
+endi
+if $data22 != NULL then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+
+  ## interp(*) from stb + group by + fill(prev)
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t fill(prev) group by tbname
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
+  if $rows != $tbNum then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00000 then
+    return -1
+  endi
+  if $data04 != 0.000000000 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != binary0 then
+    return -1
+  endi
+  if $data09 != nchar0 then
+    return -1
+  endi
+  if $data20 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data21 != 0 then
+    return -1
+  endi
+  if $data22 != NULL then
+    return -1
+  endi
+  if $data23 != 0.00000 then
+    return -1
+  endi
+  if $data24 != NULL then
+    return -1
+  endi
+  if $data25 != 0 then
+    return -1
+  endi
+  if $data26 != 0 then
+     return -1
+  endi
+  if $data27 != 1 then
+    return -1
+  endi
+  if $data28 != binary0 then
+    return -1
+  endi
+  if $data29 != nchar0 then
+    return -1
+  endi
+
+  ## interp(*) from stb + group by + fill(linear)
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t fill(linear) group by tbname
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
+  if $rows != $tbNum then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != 0 then
+    return -1
+  endi
+  if $data02 != 0 then
+    return -1
+  endi
+  if $data03 != 0.00167 then
+    return -1
+  endi
+  if $data04 != 0.001666667 then
+    return -1
+  endi
+  if $data05 != 0 then
+    return -1
+  endi
+  if $data06 != 0 then
+     return -1
+  endi
+  if $data07 != NULL then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+  if $data20 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data21 != 0 then
+    return -1
+  endi
+  if $data22 != NULL then
+    return -1
+  endi
+  if $data23 != 0.00167 then
+    return -1
+  endi
+  if $data24 != NULL then
+    return -1
+  endi
+  if $data25 != 0 then
+    return -1
+  endi
+  if $data26 != 0 then
+     return -1
+  endi
+  if $data27 != NULL then
+    return -1
+  endi
+  if $data28 != NULL then
+    return -1
+  endi
+  if $data29 != NULL then
+    return -1
+  endi
+
+    ## interp(*) from stb + group by + fill(value)
+  $t = $ts0 + 1000
+  sql select interp(*) from $stb where ts = $t fill(value, -1, -2) group by tbname
+  print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
+  print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
+  if $rows != $tbNum then
+    return -1
+  endi
+  if $data00 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data01 != -2 then
+    return -1
+  endi
+  if $data02 != -2 then
+    return -1
+  endi
+  if $data03 != -2.00000 then
+    return -1
+  endi
+  if $data04 != -2.000000000 then
+    return -1
+  endi
+  if $data05 != -2 then
+    return -1
+  endi
+  if $data06 != -2 then
+     return -1
+  endi
+  if $data07 != 1 then
+    return -1
+  endi
+  if $data08 != NULL then
+    return -1
+  endi
+  if $data09 != NULL then
+    return -1
+  endi
+  if $data20 != @18-09-17 09:00:01.000@ then
+    return -1
+  endi
+  if $data21 != -2 then
+    return -1
+  endi
+  if $data22 != -2 then
+    return -1
+  endi
+  if $data23 != -2.00000 then
+    return -1
+  endi
+  if $data24 != -2.000000000 then
+    return -1
+  endi
+  if $data25 != -2 then
+    return -1
+  endi
+  if $data26 != -2 then
+     return -1
+  endi
+  if $data27 != 1 then
+    return -1
+  endi
+  if $data28 != NULL then
+    return -1
+  endi
+  if $data29 != NULL then
+    return -1
+  endi
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
new file mode 100644
index 0000000000000000000000000000000000000000..254571bda103957fbaeaf0e311e7be03b4dcfc35
--- /dev/null
+++ b/tests/script/general/parser/join.sim
@@ -0,0 +1,516 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c debugFlag -v 135
+system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = join_db
+$tbPrefix = join_tb
+$mtPrefix = join_mt
+$tbNum = 2
+$rowNum = 1000
+$totalNum = $tbNum * $rowNum
+
+print =============== join.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+$tstart = 100000
+$mt = $mtPrefix . 1 . $i
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12), t3 int)
+
+$i = 0
+$tbPrefix = join_1_tb
+
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $c = $i
+  $t3 = $i + 1
+
+  $binary = ' . abc
+  $binary = $binary . $i
+  $binary = $binary . '
+
+  print $binary
+  sql create table $tb using $mt tags( $i , $binary , $t3 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+$i1 = 1
+$i2 = 0
+
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$dbPrefix = join_db
+$tbPrefix = join_tb
+$mtPrefix = join_mt
+
+$tb1 = $tbPrefix . $i1
+$tb2 = $tbPrefix . $i2
+$ts1 = $tb1 . .ts
+$ts2 = $tb2 . .ts
+
+#single table join sql
+
+# select duplicate columns
+sql select $ts1 , $ts2 from $tb1 , $tb2 where $ts1 = $ts2
+
+$val = $rowNum
+if $rows != $val then
+  return -1
+endi
+
+# select star1
+sql select join_tb1.*, join_tb0.ts from $tb1 , $tb2 where $ts1 = $ts2
+
+$val = $rowNum
+if $rows != $val then
+  return -1
+endi
+
+# select star2
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2
+
+$val = $rowNum
+if $rows != $val then
+  return -1
+endi
+
+# select star2
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 limit 10;
+
+$val = 10
+if $rows != $val then
+  return -1
+endi
+
+# select star2
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 limit 10;
+
+$val = 10
+if $rows != $val then
+  return -1
+endi
+
+# select star2
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 limit 0;
+
+$val = 0
+if $rows != $val then
+  return -1
+endi
+
+# select star2
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 limit 0;
+
+$val = 0
+if $rows != $val then
+  return -1
+endi
+
+#select + where condition
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts = 100000 limit 10;
+
+$val = 1
+if $rows != $val then
+  return -1
+endi
+
+#select + where condition
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = false limit 10;
+
+$val = 10
+if $rows != $val then
+  return -1
+endi
+
+#select + where condition
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = false limit 10 offset 1;
+print $rows
+if $rows != 9 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.100@ then
+  print $data00
+  return -1
+endi
+
+if $data10 != @70-01-01 08:01:40.200@ then
+  print $data10
+  return -1
+endi
+
+print data06 = $data06
+print data07 = $data07
+print data08 = $data08
+print data00 = $data00
+
+if $data07 != 0 then
+  return  -1
+endi
+
+#select + where condition   ======reverse query
+sql select join_tb1.*, join_tb0.* from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true order by join_tb0.ts asc limit 1;
+
+$val = 1
+if $rows != $val then
+  return -1
+endi
+
+$val = @70-01-01 08:01:40.001@
+print $data00, $data01
+
+if $data00 != $val then
+  return -1
+endi
+
+print 1
+#select + where condition + interval query
+sql select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by join_tb0.ts desc;
+
+$val = 100
+if $rows != $val then
+  return -1
+endi
+
+print 2
+#===========================aggregation===================================
+#select + where condition
+sql select count(join_tb1.*), count(join_tb0.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = false;
+
+$val = 10
+if $data00 != $val then
+  return -1
+endi
+
+if $data01 != $val then
+  return -1
+endi
+
+sql select count(join_tb1.*) + count(join_tb0.*) from join_tb1 , join_tb0 where join_tb1.ts = join_tb0.ts and join_tb1.ts >= 100000 and join_tb0.c7 = false;;
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 20.000000000 then
+  print expect 20.000000000 actual $data00
+  return -1
+endi
+
+sql select count(join_tb1.*)/10 from join_tb1 , join_tb0 where join_tb1.ts = join_tb0.ts and join_tb1.ts >= 100000 and join_tb0.c7 = false;;
+if $data00 != 1.000000000 then
+  return -1
+endi
+
+print 3
+#agg + where condition
+sql select count(join_tb1.c3), count(join_tb0.ts) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts <= 100002 and join_tb0.c7 = true;
+if $rows != 1 then
+  return -1
+endi
+
+print $data00
+
+if $data00 != 2 then
+  return -1
+endi
+
+if $data01 != 2 then
+  return -1
+endi
+
+print 4
+#agg + where condition
+sql select count(join_tb1.c3), count(join_tb0.ts), sum(join_tb0.c1), first(join_tb0.c7), last(join_tb1.c3), first(join_tb0.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts <= 100002 and join_tb0.c7 = true;
+
+$val = 2
+if $data00 != $val then
+  return -1
+endi
+
+if $data01 != $val then
+  return -1
+endi
+
+if $data02 != 3 then
+  return -1
+endi
+
+if $data03 != 1 then
+  return -1
+endi
+
+if $data04 != 2 then
+  return -1
+endi
+
+print =============== join.sim -- error sql
+
+sql_error select count(join_tb1.c3), count(join_tb0.ts), sum(join_tb0.c1), first(join_tb0.c7), last(join_tb1.c3) from $tb1 , $tb2 where join_tb1.ts <= 100002 and join_tb0.c7 = true;
+sql_error select count(join_tb1.c3), last(join_tb1.c3) from $tb1 , $tb2 where join_tb1.ts = join_tb0.ts or join_tb1.ts <= 100002 and join_tb0.c7 = true;
+sql_error select count(join_tb3.*) from $tb1 , $tb2 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 and join_tb0.c7 = true;
+sql_error select first(join_tb1.*) from $tb1 , $tb2 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 or join_tb0.c7 = true;
+sql_error select join_tb3.* from $tb1 , $tb2 where join_tb1.ts = join_tb0.ts and join_tb1.ts <= 100002 and join_tb0.c7 = true;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.ts = join_tb0.ts and join_tb1.ts = join_tb0.c1;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.ts = join_tb0.c1;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.c7 = join_tb0.c1;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.ts > join_tb0.ts;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.ts <> join_tb0.ts;
+sql_error select join_tb1.* from $tb1 , $tb2 where join_tb1.ts != join_tb0.ts and join_tb1.ts > 100000;
+sql_error select join_tb1.* from $tb1 , $tb1 where join_tb1.ts = join_tb1.ts and join_tb1.ts >= 100000;
+sql_error select join_tb1.* from $tb1 , $tb1 where join_tb1.ts = join_tb1.ts order by ts;
+sql_error select join_tb1.* from $tb1 , $tb1 where join_tb1.ts = join_tb1.ts order by join_tb1.c7;
+sql_error select * from join_tb0, join_tb1
+sql_error select last_row(*) from join_tb0, join_tb1
+sql_error select last_row(*) from $tb1, $tb2 where join_tb1.ts < now
+sql_error select last_row(*) from $tb1, $tb2 where join_tb1.ts = join_tb2.ts
+
+print ==================================super table join ==============================
+# select duplicate columns
+sql select join_mt0.* from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1;
+
+$val = $rowNum  + $rowNum
+print $val
+print $rows
+if $rows != $val then
+  return -1
+endi
+
+sql select join_mt0.* from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.ts = 100000;
+
+$val = 2
+if $rows != $val then
+  return -1
+endi
+
+sql select join_mt1.* from join_mt1
+
+print $rows
+
+$val = 2000
+if $rows != $val then
+  return -1
+endi
+
+sql select join_mt0.* from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1;
+
+$val = 2000
+if $rows != $val then
+  return -1
+endi
+
+sql select join_mt0.* from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.c2=99;
+
+$val = 20
+if $rows != $val then
+  return -1
+endi
+
+sql select count(*) from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.c2=99;
+
+$val = 20
+if $data00 != $val then
+  print expect 20, actual:$data00
+  return -1
+endi
+
+sql select count(*) from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.c2=99 and join_mt1.ts=100999;
+
+$val = 2
+if $data00 != $val then
+  return -1
+endi
+
+# agg
+sql select sum(join_mt0.c1) from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.c2=99 and join_mt1.ts=100999;
+
+$val = 198
+if $data00 != $val then
+  return -1
+endi
+
+sql select sum(join_mt0.c1)+sum(join_mt0.c1) from join_mt0, join_mt1 where join_mt0.ts = join_mt1.ts and join_mt0.t1=join_mt1.t1 and join_mt0.c2=99 and join_mt1.ts=100999;
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 396.000000000 then
+  return -1
+endi
+
+# first/last
+sql select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_mt1.c7) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts and join_mt0.t1=1 interval(10a) order by join_mt0.ts asc;
+
+$val = 100
+if $rows != $val then
+   return -1
+endi
+
+$val = 10
+if $data01 != $val then
+   return -1
+endi
+
+$val = 45.000000000
+print $data02
+if $data02 != $val then
+   return -1
+endi
+
+$val = 0
+if $data03 != 0 then
+   return -1
+endi
+
+# order by first/last
+sql select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_mt1.c7) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts and join_mt0.t1=1 interval(10a) order by join_mt0.ts desc;
+
+$val = 100
+if $rows != $val then
+  return -1
+endi
+
+#====================group by=========================================
+
+
+
+
+#======================limit offset===================================
+# tag values not int
+sql_error select count(*) from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t2=join_mt1.t2;
+
+# tag type not identical
+sql_error select count(*) from join_mt0, join_mt1 where join_mt1.t2 = join_mt0.t1 and join_mt1.ts=join_mt0.ts;
+
+# table/super table join
+sql_error select count(join_mt0.c1) from join_mt0, join_tb1 where join_mt0.ts=join_tb1.ts
+
+# multi-condition
+
+
+# self join
+sql_error select count(join_mt0.c1), count(join_mt0.c2) from join_mt0, join_mt0 where join_mt0.ts=join_mt0.ts and join_mt0.t1=join_mt0.t1;
+
+# missing ts equals
+sql_error select sum(join_mt1.c2) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1;
+
+# missing tag equals
+sql_error select count(join_mt1.c3) from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts;
+
+# tag values are identical error
+sql create table m1(ts timestamp, k int) tags(a int);
+sql create table m2(ts timestamp, k int) tags(a int);
+
+sql create table tm1 using m1 tags(1);
+sql create table tm2 using m1 tags(1);
+
+sql insert into tm1 using m1 tags(1) values(1000000, 1)(2000000, 2);
+sql insert into tm2 using m1 tags(1) values(1000000, 1)(2000000, 2);
+
+sql insert into um1 using m2 tags(1) values(1000001, 10)(2000000, 20);
+sql insert into um2 using m2 tags(9) values(1000001, 10)(2000000, 20);
+
+sql_error select count(*) from m1,m2 where m1.a=m2.a and m1.ts=m2.ts;
+
+print ====> empty table/empty super-table join test, add for no result join test
+sql create database ux1;
+sql use ux1;
+sql create table m1(ts timestamp, k int) tags(a binary(12), b int);
+sql create table tm0 using m1 tags('abc', 1);
+sql create table m2(ts timestamp, k int) tags(a int, b binary(12));
+
+sql select count(*) from m1, m2 where m1.ts=m2.ts and m1.b=m2.a;
+if $rows != 0 then
+  return -1
+endi
+
+sql create table tm2 using m2 tags(2, 'abc');
+sql select count(*) from tm0, tm2 where tm0.ts=tm2.ts;
+if $rows != 0 then
+  return -1
+endi
+
+sql select count(*) from m1, m2 where m1.ts=m2.ts and m1.b=m2.a;
+if $rows != 0 then
+  return -1
+endi
+
+sql drop table tm2;
+sql select count(*) from m1, m2 where m1.ts=m2.ts and m1.b=m2.a;
+sql drop database ux1;
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..51f1ef11c7fc9f8cfff60ebe86ad00104266e7ad
--- /dev/null
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -0,0 +1,135 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 1000
+
+$dbPrefix = join_m_db
+$tbPrefix = join_tb
+$mtPrefix = join_mt
+$tbNum = 3
+$rowNum = 1000
+$totalNum = $tbNum * $rowNum
+
+print =============== join_multivnode.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+$tstart = 100000
+$mt = $mtPrefix . 1 . $i
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12), t3 int)
+
+$i = 0
+$tbPrefix = join_1_tb
+
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $c = $i
+  $t3 = $i + 1
+
+  $binary = ' . abc
+  $binary = $binary . $i
+  $binary = $binary . '
+
+  print $binary
+  sql create table $tb using $mt tags( $i , $binary , $t3 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+print ===============multivnode projection join.sim
+
+sql select join_mt0.ts,join_mt0.ts,join_mt0.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1;
+
+print $row
+if $row != 3000 then
+  print expect 3000, actual: $row
+  return -1
+endi
+
+print ======= second tags join
+
+sql create table m1(ts timestamp, k int) tags(a binary(12), b int);
+sql create table m2(ts timestamp, k int) tags(a binary(12), b int);
+
+sql insert into tm1 using m1 tags('tm1', 1) values(10000000, 1) tm2 using m2 tags('tm2', 1) values(10000000, 99);
+
+sql select * from m1,m2 where m1.ts=m2.ts and m1.b=m2.b;
+if $row != 1 then
+  return -1
+endi
+
+sql select join_mt0.ts, join_mt1.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1
+
+sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1
+
+sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6321823fe2f75854beeab091663d268876e373b9
--- /dev/null
+++ b/tests/script/general/parser/lastrow.sim
@@ -0,0 +1,73 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lr_db
+$tbPrefix = lr_tb
+$stbPrefix = lr_stb
+$tbNum = 8
+$rowNum = 60 * 24
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 60000
+print ========== lastrow.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = $tbNum
+while $i > 0
+  $tb = $tbPrefix . $i
+  sql create table $tb using $stb tags( $i )
+  $i = $i - 1
+endw 
+
+$ts = $ts0
+$i = 1
+while $i <= $tbNum
+  $x = 0
+  $tb = $tbPrefix . $i
+  while $x < $rowNum
+    $ts = $ts + $delta
+    $c6 =  $x / 128 
+    $c6 = $c6 * 128
+    $c6 = $x - $c6
+    $c3 = NULL
+    $xr = $x / 10
+    $xr = $xr * 10
+    $xr = $x - $xr
+    if $xr = 0 then
+       $c3 = $x
+    endi
+    sql insert into $tb values ( $ts , $x , NULL , $x , $x , $x , $c6 , true, 'BINARY', 'NCHAR' ) 
+    $x = $x + 1
+  endw 
+  $i = $i + 1
+endw
+
+print ====== test data created
+
+run general/parser/lastrow_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/lastrow_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f81a48d5b2d61ddf829920201dd01f5dd1ee44ba
--- /dev/null
+++ b/tests/script/general/parser/lastrow_query.sim
@@ -0,0 +1,227 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lr_db
+$tbPrefix = lr_tb
+$stbPrefix = lr_stb
+$tbNum = 8
+$rowNum = 60 * 24
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 60000
+print ========== lastrow_query.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql use $db
+
+##### select lastrow from STable with two vnodes, timestamp decreases from tables in vnode0 to tables in vnode1
+sql select last_row(*) from $stb
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-25 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1439 then
+  return -1   
+endi  
+if $data02 != NULL then
+  return -1  
+endi 
+if $data03 != 1439.00000 then
+  return -1  
+endi    
+if $data04 != 1439.000000000 then
+  return -1
+endi
+if $data06 != 31 then
+  return -1
+endi 
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != BINARY then
+  print expect BINARY actual: $data08
+  return -1
+endi
+if $data09 != NCHAR then
+  print expect NCHAR actual: $data09
+  return -1
+endi
+
+# regression test case 1
+sql select count(*) from lr_tb1 where ts>'2018-09-18 08:45:00.1' and ts<'2018-09-18 08:45:00.2'
+if $row != 0 then
+  return -1
+endi
+
+# regression test case 2
+sql select count(*) from lr_db0.lr_stb0 where ts>'2018-9-18 8:00:00' and ts<'2018-9-18 14:00:00' interval(1s) fill(NULL);
+if $row != 21600 then
+  return -1
+endi
+
+#regression test case 3
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 limit 1
+if $row != 2 then
+  return -1
+endi
+
+if $data01 != 7 then
+  return -1
+endi
+
+if $data02 != 7 then
+  return -1
+endi
+
+if $data03 != 59 then
+  print expect 59, actual: $data03
+  return -1
+endi
+
+if $data04 != 7 then
+  return -1
+endi
+
+if $data11 != 8 then
+  return -1
+endi
+
+if $data12 != 8 then
+  return -1
+endi
+
+if  $data13 != NULL then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 limit 9
+if $rows != 18 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 limit 12
+if $rows != 24 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 limit 25
+if $rows != 48 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 limit 25 offset 1
+if $rows != 46 then
+  return -1
+endi
+
+sql select t1,t1,count(*),tbname,t1,t1,tbname from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1s) fill(NULL) group by tbname, t1 slimit 2 soffset 0 limit 250000 offset 1
+if $rows != 172798 then
+  return -1
+endi
+
+sql select t1,t1,count(*),tbname,t1,t1,tbname from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1s) fill(NULL) group by tbname, t1 slimit 1 soffset 1 limit 250000 offset 1
+if $rows != 86399 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 order by ts DESC limit 30
+if $rows != 48 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 order by ts DESC limit 2
+if $rows != 4 then
+  return -1
+endi
+
+sql select t1,t1,count(*),tbname,t1,t1,tbname from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1s) fill(NULL) group by tbname, t1 order by ts desc slimit 1 soffset 1 limit 250000 offset 1
+if $rows != 86399 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 order by ts desc limit 1
+if $rows != 2 then
+  return -1
+endi
+
+sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' interval(1h) fill(NULL) group by t1 order by ts desc limit 25 offset 1
+if $rows != 46 then
+  return -1
+endi
+
+print ========>td-1317, empty table last_row query crashed
+sql drop table if exists m1;
+sql create table m1(ts timestamp, k int) tags (a int);
+sql create table t1 using m1 tags(1);
+sql create table t2 using m1 tags(2);
+
+sql select last_row(*) from t1
+if $rows != 0 then
+  return -1
+endi
+
+sql select last_row(*) from m1
+if $rows != 0 then
+  return -1
+endi
+
+sql select last_row(*) from m1 where tbname in ('t1')
+if $rows != 0 then
+  return -1
+endi
+
+sql insert into t1 values('2019-1-1 1:1:1', 1);
+print ===================> last_row query against normal table along with ts/tbname
+sql select last_row(*),ts,'k' from t1;
+if $rows != 1 then
+  return -1
+endi
+
+print ===================> last_row + user-defined column + normal tables
+sql select last_row(ts), 'abc', 1234.9384, ts from t1
+if $rows != 1 then
+  return -1
+endi
+
+if $data01 != @abc@ then
+  print expect abc, actual $data02
+  return -1
+endi
+
+if $data02 !=  1234.938400000 then
+  return -1
+endi
+
+if $data03 != @19-01-01 01:01:01.000@ then
+  print expect 19-01-01 01:01:01.000, actual:$data03
+  return -1
+endi
+
+print ===================> last_row + stable + ts/tag column + condition + udf
+sql select last_row(*), ts, 'abc', 123.981, tbname from m1
+if $rows != 1 then
+  return -1
+endi
+
+if $data02 != @19-01-01 01:01:01.000@ then
+    return -1
+endi
+
+if $data03 != @abc@ then
+    return -1
+endi
+
+if $data04 != 123.981000000 then
+    print expect 123.981000000, actual: $data04
+    return -1
+endi
+
+sql create table tu(ts timestamp, k int)
+sql select last_row(*) from tu
+if $row != 0 then
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d8c72349db9ebf40e038a921ea7534e6a1a87e23
--- /dev/null
+++ b/tests/script/general/parser/limit.sim
@@ -0,0 +1,74 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lm_db
+$tbPrefix = lm_tb
+$stbPrefix = lm_stb
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8b927b2a7fe599e5e51392e8577d3dffb112ea57
--- /dev/null
+++ b/tests/script/general/parser/limit1.sim
@@ -0,0 +1,72 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lm1_db
+$tbPrefix = lm1_tb
+$stbPrefix = lm1_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit1.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/general/parser/limit1_stb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fbcd8d09656b9c1b5f515c2224fbca8c5e8f324c
--- /dev/null
+++ b/tests/script/general/parser/limit1_stb.sim
@@ -0,0 +1,694 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lm1_db
+$tbPrefix = lm1_tb
+$stbPrefix = lm1_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit1.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ====== use db
+sql use $db
+
+#### select from supertable
+
+### select from stb + limit offset
+sql select * from $stb limit 5
+if $rows != 5 then
+  return -1
+endi
+sql select * from $stb limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+$val = $totalNum - 1
+sql select * from $stb limit $totalNum offset 1
+if $rows != $val then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+##TBASE-352
+$offset = $tbNum * $rowNum
+$offset = $offset - 1
+sql select * from $stb limit 2 offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-11-25 19:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != 9.00000 then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != 9 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary9 then
+  return -1
+endi
+if $data09 != nchar9 then
+  return -1
+endi
+
+$offset = $tbNum * $rowNum
+$offset = $offset / 2
+$offset = $offset - 1
+sql select * from $stb limit 2 offset $offset
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-11-25 19:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data02 != 9 then
+  return -1
+endi
+if $data03 != 9.00000 then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 9 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary9 then
+  return -1
+endi
+if $data09 != nchar9 then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data11 != 0 then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data13 != 0.00000 then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != 0 then
+  return -1
+endi
+if $data16 != 0 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data18 != binary0 then
+  return -1
+endi
+if $data19 != nchar0 then
+  return -1
+endi
+
+### offset >= rowsInFileBlock
+##TBASE-352
+$limit = $totalNum / 2
+$offset = $totalNum
+sql select * from $stb limit $limit offset $offset
+if $rows != 0 then
+  return -1
+endi
+$offset = $offset - 1
+sql select * from $stb limit $limit offset $offset 
+if $rows != 1 then
+  return -1
+endi
+$limit = $totalNum / 2
+$offset = $totalNum / 2
+$offset = $offset - 1
+sql select * from $stb limit $limit offset $offset
+if $rows != $limit then
+  return -1
+endi
+$offset = $totalNum / 2
+$offset = $offset + 1
+sql select * from $stb limit $limit offset $offset
+$val = $limit - 1
+if $rows != $val then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 0;
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 1;
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 4;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4 then
+  return -1
+endi
+if $data06 != 4 then
+  return -1
+endi
+if $data08 != binary4 then
+  return -1
+endi
+if $data09 != nchar4 then
+  return -1
+endi
+
+### select from supertable + where + limit offset
+sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 7 then
+  return -1
+endi
+if $data31 != 8 then
+  return -1
+endi
+if $data41 != 4 then
+  return -1
+endi
+
+$offset = $totalNum / 2
+sql select * from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset $offset
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data23 != 2.00000 then
+  return -1
+endi
+if $data34 != NULL then
+  return -1
+endi
+if $data45 != 4 then
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data17 != 1 then
+ return -1
+endi
+if $data28 != binary2 then
+  return -1
+endi
+if $data39 != nchar3 then
+  return -1
+endi
+
+$limit = $totalNum / 2
+sql select * from $stb where ts >= $ts0 and ts <= $tsu limit $limit offset 1
+if $rows != $limit then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data12 != 2 then
+  return -1
+endi
+if $data23 != 3.00000 then
+  return -1
+endi
+if $data34 != 4.000000000 then
+  return -1
+endi
+if $data45 != 5 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary3 then
+  return -1
+endi
+if $data39 != nchar4 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu limit 1 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 4.500000000 then
+  return -1
+endi
+$val = 45 * $rowNum
+if $data03 != $val then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != binary9 then
+  return -1
+endi
+if $data07 != nchar0 then
+  return -1 
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and c1 > 1 and c2 < 9 and c3 > 2 and c4 < 8 and c5 > 3 and c6 < 7 and c7 != 0 and c8 like '%5' and t1 > 3 and t1 < 6 limit 1 offset 0;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 5 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data02 != 5.000000000 then
+  return -1
+endi
+$val = 5 * $rowNum
+$val = $val / 10
+if $data03 != $val then
+  return -1
+endi
+if $data04 != 0.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != binary5 then
+  return -1
+endi
+if $data07 != nchar5 then
+  return -1 
+endi
+
+$limit = $totalNum
+$offset = $totalNum
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 3 and t1 < 6 limit $limit offset $offset
+if $rows != 0 then
+  return -1
+endi
+
+## TBASE-353
+$limit = $totalNum / 2
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 asc limit $limit offset 1
+if $rows != 0 then
+  return -1
+endi
+
+$limit = $totalNum / 2
+sql select max(c1), min(c2), avg(c3), count(c4), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 asc limit $limit offset 0
+if $rows != 6 then
+  print expect 6, actual:$rows
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data03 != $rowNum then
+  return -1
+endi
+if $data09 != 2 then
+  return -1
+endi
+$val = 9 * $rowNum
+$val = $val / 2
+if $data14 != $val then
+  return -1
+endi
+if $data19 != 3 then
+  return -1
+endi
+if $data25 != 9.000000000 then
+  return -1
+endi
+if $data26 != 1 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data42 != 4.500000000 then
+  return -1
+endi
+if $data33 != 0 then
+  return -1
+endi
+if $data43 != 0 then
+  return -1
+endi
+if $data59 != 7 then
+  return -1
+endi
+
+$limit = $totalNum / 2
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 desc limit $limit offset 1
+if $rows != 0 then
+  return -1
+endi
+
+$limit = $totalNum / 2
+sql select max(c1), min(c2), avg(c3), count(c4), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 desc limit $limit offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+if $data12 != 4.500000000 then
+  return -1
+endi
+if $data23 != 0 then
+  return -1
+endi
+if $data09 != 7 then
+  return -1
+endi
+$val = 9 * $rowNum
+$val = $val / 2
+if $data14 != $val then
+  return -1
+endi
+if $data19 != 6 then
+  return -1
+endi
+if $data25 != 9.000000000 then
+  return -1
+endi
+if $data26 != 1 then
+  return -1
+endi
+if $data31 != 0 then
+  return -1
+endi
+if $data32 != 4.500000000 then
+  return -1
+endi
+if $data33 != $rowNum then
+  return -1
+endi
+$val = 9 * $rowNum
+$val = $val / 2
+if $data44 != $val then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+### supertable aggregation + where + interval + limit offset
+## TBASE-355
+sql select max(c1), min(c2), avg(c3), count(c4), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 interval(5m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data15 != 12 then
+  return -1
+endi
+if $data40 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+### [TBASE-361]
+$offset = $rowNum / 2
+$offset = $offset + 1
+sql select max(c1), min(c2), avg(c3), count(c4), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 interval(5m) limit $offset offset $offset
+$val = $rowNum - $offset
+if $rows != $val then
+  return -1
+endi
+if $data00 != @18-10-22 02:30:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data05 != 6 then
+  return -1
+endi
+if $data30 != @18-10-22 03:00:00.000@ then
+  return -1
+endi
+if $data31 != 4 then
+  return -1
+endi
+if $data42 != 5 then
+  return -1
+endi
+if $data53 != 6.000000000 then
+  return -1
+endi
+if $data54 != 3 then
+  return -1
+endi
+if $data55 != 36 then
+  return -1
+endi
+
+## supertable aggregation + where + interval + group by order by tag + limit offset
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 2 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+if $data22 != 5 then
+  return -1
+endi
+if $data29 != 3 then
+  return -1
+endi
+if $data33 != 6.000000000 then
+  return -1
+endi
+if $data39 != 3 then
+  return -1
+endi
+if $data44 != 5 then
+  return -1
+endi
+if $data49 != 2 then
+  return -1
+endi
+if $data58 != nchar6 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 2 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data13 != 5.000000000 then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+if $data28 != nchar6 then
+  return -1
+endi
+if $data29 != 3 then
+  return -1
+endi
+if $data46 != 1 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 1 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data13 != 5.000000000 then
+  return -1
+endi
+if $data19 != 3 then
+  return -1
+endi
+if $data28 != nchar5 then
+  return -1
+endi
+if $data29 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 and c1 > 0 and c2 < 9 and c3 > 4 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 2 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+if $data23 != 5.000000000 then
+  return -1
+endi
+if $data29 != 3 then
+  return -1
+endi
+if $data39 != 3 then
+  return -1
+endi
+if $data48 != nchar5 then
+  return -1
+endi
+if $data49 != 2 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/general/parser/limit1_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a9484d10dbaaad1c8c08b2ae54caf85ad186207e
--- /dev/null
+++ b/tests/script/general/parser/limit1_tb.sim
@@ -0,0 +1,1154 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lm1_db
+$tbPrefix = lm1_tb
+$stbPrefix = lm1_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit1_tb.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+print ====== use db
+sql use $db
+
+##### select from table
+print ====== select from table with limit offset
+$tb = $tbPrefix . 0
+sql select * from $tb order by ts desc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5 offset 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data41 != 0 then
+  return -1
+endi
+
+$offset = $rowNum - 1
+sql select * from $tb order by ts desc limit 5 offset $offset
+if $rows != 1 then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $tb order by ts desc limit 5 offset 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4 then
+  return -1
+endi
+if $data06 != 4 then
+   return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary4 then
+  return -1
+endi
+if $data09 != nchar4 then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $tb order by ts desc limit 5 offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 0.00000 then
+  return -1
+endi
+if $data04 != 0.000000000 then
+  return -1
+endi
+if $data05 != 0 then
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary0 then
+  return -1
+endi
+if $data09 != nchar0 then
+  return -1
+endi
+if $data11 != null then
+  return -1
+endi
+if $data12 != null then
+  return -1
+endi
+if $data13 != null then
+  return -1
+endi
+if $data14 != null then
+  return -1
+endi
+
+## TBASE-329
+sql select * from $tb where c1 < 9 order by ts desc limit 1 offset 1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 9 order by ts desc limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 9 order by ts desc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 5 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 0 order by ts desc limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 0 order by ts desc limit 1 offset 1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 0 order by ts desc limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+
+
+sql_error select * from $tb limit
+sql_error select * from $tb offset
+sql_error select * from $tb offset 1
+sql_error select * from $tb offset 1 limit 5
+sql_error select * from $tb offset 1 limit -1
+
+#### aggregation function + limit offset
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+### aggregation function + limit offset (non-interval case)
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu and c1 < 9 and c2 < 8 and c3 >0 and c4 <= 7 and c5 <7 limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 0 offset 0
+if $rows != 0 then
+  return -1
+endi
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+$val = 45 * $rowNum 
+$val = $val / 10
+if $data00 != $val then
+  return -1
+endi
+if $data01 != 4.500000000 then
+  return -1
+endi
+if $data02 != 2.872281323 then
+  return -1
+endi
+if $data03 != 9.000000000 then
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != $rowNum then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data07 != binary9 then
+  return -1
+endi
+if $data08 != nchar9 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1>1 and c2<9 and c3>2 and c4<8 and c5>4 and c6<6 limit 1 offset 0
+if $rows != 1 then
+  return -1
+endi
+$val = $rowNum / 10
+$val = $val * 5
+if $data00 != $val then
+  return -1
+endi
+if $data01 != 5.000000000 then
+  return -1
+endi
+if $data02 != 0.000000000 then
+  return -1
+endi
+if $data03 != 5.000000000 then
+  return -1
+endi
+if $data04 != 5 then
+  return -1
+endi
+$val = $rowNum / 10
+if $data05 != $val then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data07 != binary5 then
+  return -1
+endi
+if $data08 != nchar5 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select spread(ts), spread(c1), spread(c2), spread(c3), spread(c4), spread(c5), spread(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+$val = $rowNum - 1
+$val = $val * 600000.000000000
+$val = $data00 - $val
+if $val != 0 then
+  return -1
+endi
+if $data01 != 9.000000000 then
+  return -1
+endi
+if $data02 != 9.000000000 then
+  return -1
+endi
+if $data03 != 9.000000000 then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 9.000000000 then
+  return -1
+endi
+if $data06 != 9.000000000 then
+  return -1
+endi
+sql select spread(ts), spread(c1), spread(c2), spread(c3), spread(c4), spread(c5), spread(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+$val = $tsu + $delta
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $val limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 4.500000000 then
+  return -1
+endi
+if $data01 != 4.500000000 then
+  return -1
+endi
+if $data02 != 4.500000000 then
+  return -1
+endi
+if $data03 != 4.500000000 then
+  return -1
+endi
+if $data04 != 4.500000000 then
+  return -1
+endi
+if $data05 != 4.500000000 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $val limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+## TBASE-354
+sql select top(c1, 1) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 12:10:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data10 != @18-09-17 13:50:00.000@ then
+  return -1
+endi
+if $data11 != 9 then
+  return -1
+endi
+if $data20 != @18-09-17 15:30:00.000@ then
+  return -1
+endi
+if $data21 != 9 then
+  return -1
+endi
+sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+
+sql select bottom(c1, 1) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select bottom(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 10:40:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != @18-09-17 12:20:00.000@ then
+  return -1
+endi
+if $data11 != 0 then
+  return -1
+endi
+if $data20 != @18-09-17 14:00:00.000@ then
+  return -1
+endi
+if $data21 != 0 then
+  return -1
+endi
+sql select bottom(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+
+sql select diff(c1) from $tb
+$res = $rowNum - 1
+if $rows != $res then
+  return -1
+endi
+
+sql select diff(c1) from $tb where c1 > 5 limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+$limit = $rowNum / 2
+$offset = $limit - 1
+sql select diff(c1) from $tb where c1 >= 0 limit $limit offset $offset
+if $rows != $limit then
+  return -1
+endi
+$limit = $rowNum / 2
+$offset = $limit + 1
+$val = $limit - 2
+sql select diff(c1) from $tb where c1 >= 0 limit $limit offset $offset
+if $rows != $val then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data81 != -9 then
+  return -1
+endi
+
+### aggregation + limit offset (with interval)
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 5
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data41 != 4 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 1.00000 then
+  return -1
+endi
+if $data04 != 1.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+if $data31 != 4 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+## TBASE-334
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data04 != 5.000000000 then
+  return -1
+endi
+if $data11 != 8 then
+  return -1
+endi
+if $data14 != 8.000000000 then
+  return -1
+endi
+if $data21 != null then
+  return -1
+endi
+
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 0 then
+  return -1
+endi
+
+sql select sum(c1), sum(c2), sum(c3), sum(c4), sum(c5), sum(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 21 then
+  return -1
+endi
+if $data31 != 10 then
+  return -1
+endi
+if $data41 != 9 then
+  return -1
+endi
+sql select sum(c1), sum(c2), sum(c3), sum(c4), sum(c5), sum(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 12 then
+  return -1
+endi
+if $data11 != 21 then
+  return -1
+endi
+if $data21 != 10 then
+  return -1
+endi
+if $data31 != 9 then
+  return -1
+endi
+if $data41 != 18 then
+  return -1
+endi
+
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 1.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != null then
+  return -1
+endi
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 4.000000000 then
+  return -1
+endi
+if $data11 != 7.000000000 then
+  return -1
+endi
+if $data21 != 3.333333333 then
+  return -1
+endi
+
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data01 != 0.816496581 then
+  return -1
+endi
+if $data10 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data21 != 4.027681991 then
+  return -1
+endi
+
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(27m)
+if $rows != 3704 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(27m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data11 != 3 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi 
+if $data31 != 2 then
+  return -1
+endi
+if $data41 != 3 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 4.499549955 then
+  return -1
+endi
+if $data02 != 4.499549955 then
+  return -1
+endi
+if $data05 != 4.499549955 then
+  return -1
+endi
+
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data23 != 9.00000 then
+  return -1
+endi
+
+
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data23 != 1.00000 then
+  return -1
+endi
+
+sql select first(ts), first(c1), last(c2), first(c3), last(c4), first(c5), last(c6), first(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 > 0 interval(30m) limit 3 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+if $data13 != 5 then
+  return -1
+endi
+if $data14 != 3.00000 then
+  return -1
+endi
+if $data22 != 6 then
+  return -1
+endi
+if $data23 != 8 then
+  return -1
+endi
+if $data28 != binary6 then
+  return -1
+endi
+if $data29 != nchar8 then
+  return -1
+endi
+
+sql select first(ts), first(c1), last(c2), first(c3), last(c4), first(c5), last(c6), first(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 > 0 interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data02 != 3 then
+  return -1
+endi
+if $data03 != 5 then
+  return -1
+endi 
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 5.000000000 then
+  return -1
+endi
+if $data08 != binary3 then
+  return -1
+endi
+if $data09 != nchar5 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 8 then
+  return -1
+endi
+if $data14 != 6.00000 then
+  return -1
+endi
+if $data15 != 8.000000000 then
+  return -1
+endi
+if $data22 != 9 then
+  return -1
+endi
+if $data23 != 1 then
+  return -1
+endi
+if $data24 != 9.00000 then
+  return -1
+endi
+if $data25 != 1.000000000 then
+  return -1
+endi
+if $data26 != 9 then
+  return -1
+endi
+if $data27 != 1 then
+  return -1
+endi
+if $data28 != binary9 then
+  return -1
+endi
+if $data29 != nchar1 then
+  return -1
+endi
+
+### order by ts + limit offset
+
+sql select * from $tb order by ts asc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data23 != 2.00000 then
+  return -1
+endi
+if $data34 != 3.000000000 then
+  return -1
+endi
+if $data45 != 4 then
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary2 then
+  return -1
+endi
+if $data39 != nchar3 then
+  return -1
+endi
+if $data40 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts asc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data12 != 2 then
+  return -1
+endi
+if $data20 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data23 != 3.00000 then
+  return -1
+endi
+if $data34 != 4.000000000 then
+  return -1
+endi
+if $data45 != 5 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary3 then
+  return -1
+endi
+if $data39 != nchar4 then
+  return -1
+endi
+if $data40 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts asc limit 5 offset 8
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data12 != 9 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 1 order by ts asc limit 3 offset 2
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data10 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data12 != 5 then
+  return -1
+endi
+if $data23 != 6.00000 then
+  return -1
+endi
+
+$offset = $rowNum / 10
+sql select * from $tb where c1 < 3 and c1 > 1 order by ts asc limit 3 offset $offset
+if $rows != 0 then
+  return -1
+endi
+
+$offset = $rowNum / 10
+$offset = $offset * 3
+$offset = $offset - 1
+sql select * from $tb where c1 < 5 and c1 > 1 order by ts asc limit 3 offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-11-25 18:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-11-25 19:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data10 != @18-11-25 19:20:00.000@ then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data20 != @18-11-25 19:10:00.000@ then
+  return -1
+endi
+if $data23 != 7.00000 then
+  return -1
+endi
+if $data34 != 6.000000000 then
+  return -1
+endi
+if $data45 != 5 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary7 then
+  return -1
+endi
+if $data39 != nchar6 then
+  return -1
+endi
+if $data40 != @18-11-25 18:50:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-11-25 19:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data10 != @18-11-25 19:10:00.000@ then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+if $data20 != @18-11-25 19:00:00.000@ then
+  return -1
+endi
+if $data23 != 6.00000 then
+  return -1
+endi
+if $data34 != 5.000000000 then
+  return -1
+endi
+if $data45 != 4 then
+  return -1
+endi
+if $data06 != 8 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary6 then
+  return -1
+endi
+if $data39 != nchar5 then
+  return -1
+endi
+if $data40 != @18-11-25 18:40:00.000@ then
+  return -1
+endi
+
+$offset = $rowNum
+$offset = $offset - 2
+sql select * from $tb order by ts desc limit 5 offset $offset
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 8 order by ts desc limit 3 offset 2
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-11-25 18:50:00.000@ then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data10 != @18-11-25 18:40:00.000@ then
+  return -1
+endi
+if $data20 != @18-11-25 18:30:00.000@ then
+  return -1
+endi
+if $data12 != 4 then
+  return -1
+endi
+if $data23 != 3.00000 then
+  return -1
+endi
+
+$offset = $rowNum / 10
+sql select * from $tb where c1 < 8 and c1 > 6 order by ts desc limit 3 offset $offset
+if $rows != 0 then
+  return -1
+endi
+
+$limit = $rowNum / 10
+$limit = $limit * 3
+$offset = $limit - 1
+sql select * from $tb where c1 < 8 and c1 > 4 order by ts desc limit $limit offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data04 != 5.000000000 then
+  return -1
+endi
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f1702924aaee3091c7ac9e4229b36ec11c141123
--- /dev/null
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -0,0 +1,72 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lm1_db
+$tbPrefix = lm1_tb
+$stbPrefix = lm1_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit1.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d22c786aa3001e6f7e275466bd5426b7e275b53c
--- /dev/null
+++ b/tests/script/general/parser/limit2.sim
@@ -0,0 +1,78 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lm2_db
+$tbPrefix = lm2_tb
+$stbPrefix = lm2_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== limit2.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 smallint, t6 double)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $i1 = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $i1
+  $tgstr = 'tb . $i
+  $tgstr = $tgstr . '
+  $tgstr1 = 'tb . $i1
+  $tgstr1 = $tgstr1 . '
+  sql create table $tb using $stb tags( $i , $tgstr , $tgstr , $i , $i , $i )
+  sql create table $tb1 using $stb tags( $i1 , $tgstr1 , $tgstr1 , $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+#run general/parser/limit2_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/limit2_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8294247a86415bcd90c692a8765475fbb6ecdd6b
--- /dev/null
+++ b/tests/script/general/parser/limit2_query.sim
@@ -0,0 +1,333 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lm2_db
+$tbPrefix = lm2_tb
+$stbPrefix = lm2_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== limit2.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+$tb = $tbPrefix . 0
+print ====== use db
+sql use $db
+
+##### aggregation on stb with 6 tags + where + group by + limit offset
+$val1 = 1
+$val2 = $tbNum - 1
+sql select count(*) from $stb where t1 > $val1 and t1 < $val2 group by t1, t2, t3, t4, t5, t6 order by t1 asc limit 1 offset 0
+$val = $tbNum - 3
+if $rows != $val then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != tb2 then
+  print expect tb2, actual: $data02
+  return -1
+endi
+if $data03 != tb2 then
+  return -1
+endi
+if $data04 != 2 then
+  return -1
+endi
+if $data05 != 2 then
+  return -1
+endi
+
+sql select count(*) from $stb where t2 like '%' and t1 > 2 and t1 < 5 group by t3, t4 order by t3 desc limit 1 offset 0
+if $rows != 2 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data01 != tb4 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data11 != tb3 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+sql select count(*) from $stb where t2 like '%' and t1 > 2 and t1 < 5 group by t3, t4 order by t3 desc limit 1 offset 1
+if $rows != 0 then
+  return -1
+endi
+## TBASE-348
+sql_error select count(*) from $stb where t1 like 1
+
+##### aggregation on tb + where + fill + limit offset
+sql select max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
+if $rows != 10 then
+  return -1
+endi
+if $data00 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data01 != -1 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data90 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data91 != 5 then
+  return -1
+endi
+
+$tb5 = $tbPrefix . 5
+sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4) limit 10 offset 1
+if $rows != 10 then
+  return -1
+endi
+if $data00 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data01 != -1 then
+  return -1
+endi
+if $data02 != -2 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data12 != -2 then
+  return -1
+endi
+if $data90 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data91 != 5 then
+  return -1
+endi
+if $data92 != -2 then
+  return -1
+endi
+
+### [TBASE-350]
+## tb + interval + fill(value) + limit offset
+$tb = $tbPrefix . 0
+$limit = $rowNum
+$offset = $limit / 2
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit $limit offset $offset
+if $rows != $limit then
+  print expect $limit, actual $rows
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+
+# tb + interval + fill(linear) + limit offset
+$limit = $rowNum
+$offset = $limit / 2
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
+if $rows != $limit then
+  print expect $limit, actual $rows
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 0 then
+  return -1
+endi
+if $data13 != 0.500000000 then
+  return -1
+endi
+if $data35 != 0.000000000 then
+  return -1
+endi
+if $data46 != 0.000000000 then
+  return -1
+endi
+if $data47 != 1 then
+  return -1
+endi
+if $data57 != NULL then
+  return -1
+endi
+if $data68 != binary3 then
+  return -1
+endi
+if $data79 != NULL then
+  return -1
+endi
+
+## tb + interval + fill(prev) + limit offset
+$limit = $rowNum
+$offset = $limit / 2
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev) limit $limit offset $offset
+if $rows != $limit then
+  print expect $limit, actual: $rows
+  return -1
+endi
+
+ 
+$limit = $rowNum
+$offset = $limit / 2
+$offset = $offset + 10
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+if $rows != $limit then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data02 != 5 then
+  return -1
+endi
+if $data03 != 5.000000000 then
+  return -1
+endi
+if $data04 != 5.000000000 then
+  return -1
+endi
+if $data05 != 0.000000000 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary5 then
+  return -1
+endi
+if $data09 != nchar5 then
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data19 != NULL then
+  return -1
+endi
+if $data16 != -2.000000000 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+
+$limit = $rowNum
+$offset = $limit * 2
+$offset = $offset - 11
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+if $rows != 10 then
+  return -1
+endi
+if $data01 != -1 then
+  return -1
+endi
+if $data02 != -2 then
+  return -1
+endi
+if $data11 != 5 then
+  return -1
+endi
+if $data12 != 5 then
+  return -1
+endi
+if $data13 != 5.000000000 then
+  return -1
+endi
+if $data15 != 0.000000000 then
+  return -1
+endi
+if $data16 != 0.000000000 then
+  return -1
+endi
+if $data18 != binary5 then
+  return -1
+endi
+if $data19 != nchar5 then
+  return -1
+endi
+if $data27 != 1 then
+  return -1
+endi
+if $data38 != NULL then
+  return -1
+endi
+if $data49 != NULL then
+  return -1
+endi
+
+### [TBASE-350]
+## stb + interval + fill + group by + limit offset
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10
+if $rows != 20 then
+  return -1
+endi
+
+$limit = 5
+$offset = $rowNum * 2
+$offset = $offset - 2
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 order by t1 limit $limit offset $offset
+if $rows != $tbNum then
+  return -1
+endi 
+if $data00 != @18-11-25 19:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data12 != 9 then
+  return -1
+endi
+if $data23 != 9.000000000 then
+  return -1
+endi
+if $data34 != 9.000000000 then
+  return -1
+endi
+if $data45 != 1 then
+  return -1
+endi
+if $data56 != binary9 then
+  return -1
+endi
+if $data68 != 6 then
+  return -1
+endi
+if $data72 != -2 then
+  return -1
+endi
+if $data84 != -2.000000000 then
+  return -1
+endi
+if $data98 != 9 then
+  return -1
+endi
+
+#add one more test case
+sql select max(c1), last(c8) from lm2_db0.lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(linear) limit 10 offset 4089;"
+
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
new file mode 100644
index 0000000000000000000000000000000000000000..64f86edd28092bc816b663719c0ab153ff1181e0
--- /dev/null
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -0,0 +1,76 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = lm2_db
+$tbPrefix = lm2_tb
+$stbPrefix = lm2_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== limit2.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db tblocks 100 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 smallint, t6 double)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $i1 = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $i1
+  $tgstr = 'tb . $i
+  $tgstr = $tgstr . '
+  $tgstr1 = 'tb . $i1
+  $tgstr1 = $tgstr1 . '
+  sql create table $tb using $stb tags( $i , $tgstr , $tgstr , $i , $i , $i )
+  sql create table $tb1 using $stb tags( $i1 , $tgstr1 , $tgstr1 , $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+#run general/parser/limit2_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 3000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/limit2_query.sim
diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/general/parser/limit_stb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c9df03ab2efe220dc9a5bf5707cb83f81178e4d2
--- /dev/null
+++ b/tests/script/general/parser/limit_stb.sim
@@ -0,0 +1,1263 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lm_db
+$tbPrefix = lm_tb
+$stbPrefix = lm_stb
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit_stb.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+print ====== use db
+sql use $db
+
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+##### select from supertable
+
+# illegal operations
+#sql_error select top(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+#sql_error select bottom(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+
+### select from stb + limit offset
+sql select * from $stb limit 5
+if $rows != 5 then
+  return -1
+endi
+sql select * from $stb limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+sql select * from $stb order by ts desc limit 5
+if $rows != 5 then
+  return -1
+endi
+
+sql select * from $stb order by ts desc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data11 != 9 then
+  return -1
+endi
+if $data41 != 9 then
+  return -1
+endi
+
+sql select * from $stb order by ts asc limit 5
+print select * from $stb order by ts asc limit 5
+print $data00 $data01
+print $data10 $data11
+print $data20 $data21
+
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+
+if $data40 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+print data12 = $data12
+if $data12 != NULL then
+  return -1
+endi
+
+if $data24 != NULL then
+  return -1
+endi
+
+if $data35 != 0 then
+  return -1
+endi
+if $data49 != nchar0 then
+  return -1
+endi
+
+sql select * from $stb order by ts asc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data41 != 0 then
+  return -1
+endi
+
+if $data40 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+
+sql select * from $stb limit 500 offset 1
+if $rows != 99 then
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+$offset = $tbNum * $rowNum
+$offset = $offset - 1
+sql select * from $stb limit 2 offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != 9.00000 then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != 9 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary9 then
+  return -1
+endi
+if $data09 != nchar9 then
+  return -1
+endi
+
+$offset = $tbNum * $rowNum
+$offset = $offset / 2
+$offset = $offset - 1
+sql select * from $stb limit 2 offset $offset
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data02 != 9 then
+  return -1
+endi
+if $data03 != 9.00000 then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 9 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary9 then
+  return -1
+endi
+if $data09 != nchar9 then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data11 != 0 then
+  return -1
+endi
+if $data12 != NULL then
+  return -1
+endi
+if $data13 != 0.00000 then
+  return -1
+endi
+if $data14 != NULL then
+  return -1
+endi
+if $data15 != 0 then
+  return -1
+endi
+if $data16 != 0 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data18 != binary0 then
+  return -1
+endi
+if $data19 != nchar0 then
+  return -1
+endi
+
+$offset = $rowNum * $tbNum
+sql select * from lm_stb0 limit 2 offset $offset
+if $rows != 0 then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 0;
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 1;
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 4;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4 then
+  return -1
+endi
+if $data06 != 4 then
+  return -1
+endi
+if $data08 != binary4 then
+  return -1
+endi
+if $data09 != nchar4 then
+  return -1
+endi
+
+### select from supertable + where + limit offset
+sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 7 then
+  return -1
+endi
+if $data31 != 8 then
+  return -1
+endi
+if $data41 != 4 then
+  return -1
+endi
+
+sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 50
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 7 then
+  return -1
+endi
+if $data31 != 8 then
+  return -1
+endi
+if $data41 != 4 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.000' limit 1 offset 0;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 4.500000000 then
+  return -1
+endi
+$val = 45 * $rowNum
+if $data03 != $val then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != binary9 then
+  return -1
+endi
+if $data07 != nchar0 then
+  return -1 
+endi
+
+#sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.000' and c1 > 1 and c2 < 9 and c3 > 2 and c4 < 8 and c5 > 3 and c6 < 7 and c7 > 0 and c8 like '%5' and t1 > 3 and t1 < 6 limit 1 offset 0;
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.000' and c1 > 1 and c2 < 9 and c3 > 2 and c4 < 8 and c5 > 3 and c6 < 7 and c7 = 'true' and c8 like '%5' and t1 > 3 and t1 < 6 limit 1 offset 0;
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 5 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data02 != 5.000000000 then
+  return -1
+endi
+$val = 5 * $rowNum
+$val = $val / 10
+if $data03 != $val then
+  return -1
+endi
+if $data04 != 0.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != binary5 then
+  return -1
+endi
+if $data07 != nchar5 then
+  return -1 
+endi
+
+sql select c1, tbname, t1 from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.000' and c1 > 1 and c2 < 9 and c3 > 2 and c4 < 8 and c5 > 3 and c6 < 7 and c7 = 'true' and c8 like '%5' and t1 > 3 and t1 < 6;
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 3 and t1 < 6 limit 10 offset 10
+if $rows != 0 then
+  return -1
+endi
+
+## TBASE-345
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 asc limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 asc limit 5 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 4.500000000 then
+  return -1
+endi
+if $data08 != 2 then
+  return -1
+endi
+if $data18 != 3 then
+  return -1
+endi
+if $data28 != 4 then
+  return -1
+endi
+if $data31 != NULL then
+  return -1
+endi
+if $data47 != nchar0 then
+  return -1
+endi
+if $data58 != 7 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 desc limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 group by t1 order by t1 desc limit 5 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+if $data02 != 4.500000000 then
+  return -1
+endi
+if $data32 != 4.500000000 then
+  return -1
+endi
+if $data31 != 0 then
+  return -1
+endi
+if $data47 != nchar0 then
+  return -1
+endi
+if $data08 != 7 then
+  return -1
+endi
+if $data18 != 6 then
+  return -1
+endi
+if $data24 != 9.000000000 then
+  return -1
+endi
+if $data53 != 45 then
+  return -1
+endi
+if $data58 != 2 then
+  return -1
+endi
+
+### supertable aggregation + where + interval + limit offset
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 interval(5m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data40 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+$offset = $rowNum / 2
+$offset = $offset + 1
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 interval(5m) limit $offset offset $offset
+$val = $rowNum - $offset
+if $rows != $val then
+  return -1
+endi
+if $data00 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data30 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data31 != 9 then
+  return -1
+endi
+
+### supertable aggregation + where + interval + group by order by tag + limit offset
+## TBASE-345
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 3 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+if $data22 != 5 then
+  return -1
+endi
+if $data29 != 3 then
+  return -1
+endi
+if $data33 != 6.000000000 then
+  return -1
+endi
+if $data39 != 3 then
+  return -1
+endi
+if $data44 != 5 then
+  return -1
+endi
+if $data49 != 2 then
+  return -1
+endi
+if $data58 != nchar6 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data13 != 6.000000000 then
+  return -1
+endi
+if $data19 != 3 then
+  return -1
+endi
+if $data28 != nchar6 then
+  return -1
+endi
+if $data29 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 5 and c1 > 0 and c2 < 9 and c3 > 1 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 1 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data13 != 5.000000000 then
+  return -1
+endi
+if $data19 != 3 then
+  return -1
+endi
+if $data28 != nchar5 then
+  return -1
+endi
+if $data29 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 and c1 > 0 and c2 < 9 and c3 > 4 and c4 < 7 and c5 > 4 interval(5m) group by t1 order by t1 desc limit 3 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data09 != 4 then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+if $data23 != 5.000000000 then
+  return -1
+endi
+if $data29 != 3 then
+  return -1
+endi
+if $data39 != 3 then
+  return -1
+endi
+if $data48 != nchar5 then
+  return -1
+endi
+if $data49 != 2 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+sql select max(c1), min(c1), avg(c1), count(c1), sum(c1), spread(c1), first(c1), last(c1) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 1 and t1 < 8 interval(5m) group by t1 order by t1 desc limit 1 offset 0
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data09 != 7 then
+  return -1
+endi
+print $data13
+if $data13 != 0.000000000 then
+  return -1
+endi
+if $data19 != 6 then
+  return -1
+endi
+if $data24 != 1 then
+  return -1
+endi
+if $data29 != 5 then
+  return -1
+endi
+if $data31 != 0 then
+  return -1
+endi
+if $data32 != 0 then
+  return -1
+endi
+if $data33 != 0.000000000 then
+  return -1
+endi
+if $data34 != 1 then
+  return -1
+endi
+if $data35 != 0 then
+  return -1
+endi
+
+print $data36
+if $data36 != 0.000000000 then
+  return -1
+endi
+if $data37 != 0 then
+  return -1
+endi
+if $data38 != 0 then
+  return -1
+endi
+if $data39 != 4 then
+  return -1
+endi
+if $data49 != 3 then
+  return -1
+endi
+if $data59 != 2 then
+  return -1
+endi
+
+#sql select max(c2), min(c2), avg(c2), count(c2), sum(c2), spread(c2), first(c2), last(c2) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 3 and t1 < 6 interval(5m) group by t1 order by t1 desc limit 3 offset 1
+#if $rows != 3 then
+#  return -1
+#endi
+#if $data00 != @18-09-17 09:20:00.000@ then
+#  return -1
+#endi
+#if $data01 != 2 then
+#  return -1
+#endi
+#if $data02 != 2 then
+#  return -1
+#endi
+#if $data09 != 4 then
+#  return -1
+#endi
+#if $data13 != 3.000000000 then
+#  return -1
+#endi
+#if $data19 != 4 then
+#  return -1
+#endi
+#if $data20 != @18-09-17 09:40:00.000@ then
+#  return -1
+#endi
+#if $data24 != 1 then
+#  return -1
+#endi
+#if $data25 != 4 then
+#  return -1
+#endi
+#if $data26 != 0.000000000 then
+#  return -1
+#endi
+#if $data27 != 4 then
+#  return -1
+#endi
+#if $data28 != 4 then
+#  return -1
+#endi
+#if $data29 != 4 then
+#  return -1
+#endi
+
+sql select max(c2), min(c2), avg(c2), count(c2), spread(c2), first(c2), last(c2), count(ts) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 3 and t1 < 6 interval(5m) group by t1 order by t1 desc limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data09 != 5 then
+  return -1
+endi
+if $data13 != NULL then
+  return -1
+endi
+if $data19 != 5 then
+  return -1
+endi
+if $data20 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data24 != 0 then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data28 != 1 then
+  return -1
+endi
+if $data29 != 5 then
+  return -1
+endi
+if $data30 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data31 != 1 then
+  return -1
+endi
+if $data32 != 1 then
+  return -1
+endi
+if $data33 != 1.000000000 then
+  return -1
+endi
+if $data34 != 1 then
+  return -1
+endi
+if $data35 != 0.000000000 then
+  return -1
+endi
+if $data36 != 1 then
+  return -1
+endi
+if $data37 != 1 then
+  return -1
+endi
+if $data38 != 1 then
+  return -1
+endi
+if $data39 != 4 then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data49 != 4 then
+  return -1
+endi
+if $data51 != 3 then
+  return -1
+endi
+if $data59 != 4 then
+  return -1
+endi
+
+sql select top(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by t1 desc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data02 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data20 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data21 != 8 then
+  return -1
+endi
+if $data22 != 8 then
+  return -1
+endi
+if $data30 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data31 != 6 then
+  return -1
+endi
+if $data32 != 7 then
+  return -1
+endi
+if $data40 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data41 != 7 then
+  return -1
+endi
+if $data42 != 7 then
+  return -1
+endi
+if $data50 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data51 != 8 then
+  return -1
+endi
+if $data52 != 7 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by t1 asc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data21 != 8 then
+  return -1
+endi
+if $data22 != 1 then
+  return -1
+endi
+if $data30 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data31 != 6 then
+  return -1
+endi
+if $data32 != 2 then
+  return -1
+endi
+if $data40 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data41 != 7 then
+  return -1
+endi
+if $data42 != 2 then
+  return -1
+endi
+if $data50 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data51 != 8 then
+  return -1
+endi
+if $data52 != 2 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by ts desc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data21 != 6 then
+  return -1
+endi
+if $data22 != 1 then
+  return -1
+endi
+if $data30 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data31 != 8 then
+  return -1
+endi
+if $data32 != 2 then
+  return -1
+endi
+if $data40 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data41 != 7 then
+  return -1
+endi
+if $data42 != 2 then
+  return -1
+endi
+if $data50 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data51 != 6 then
+  return -1
+endi
+if $data52 != 2 then
+  return -1
+endi
+
+sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+sql_error select top(c1, 101) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 98
+
+sql select bottom(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by t1 desc,ts desc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data02 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data20 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data22 != 8 then
+  return -1
+endi
+if $data30 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data32 != 7 then
+  return -1
+endi
+if $data40 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data42 != 7 then
+  return -1
+endi
+if $data50 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data51 != 1 then
+  return -1
+endi
+if $data52 != 7 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by t1 asc,ts desc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data22 != 1 then
+  return -1
+endi
+if $data30 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data32 != 2 then
+  return -1
+endi
+if $data40 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data42 != 2 then
+  return -1
+endi
+if $data50 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data51 != 1 then
+  return -1
+endi
+if $data52 != 2 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 order by ts desc slimit 2 soffset 1 limit 3 offset 1
+if $rows != 6 then
+  return -1
+endi
+if $data00 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data21 != 1 then
+  return -1
+endi
+if $data22 != 1 then
+  return -1
+endi
+if $data30 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data32 != 2 then
+  return -1
+endi
+if $data40 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data41 != 2 then
+  return -1
+endi
+if $data42 != 2 then
+  return -1
+endi
+if $data50 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data51 != 1 then
+  return -1
+endi
+if $data52 != 2 then
+  return -1
+endi
+
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+sql_error select bottom(c1, 101) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 98
+
+sql select bottom(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/general/parser/limit_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..970c7b75c5683e8ece8ce3c7b5458097a0ec3973
--- /dev/null
+++ b/tests/script/general/parser/limit_tb.sim
@@ -0,0 +1,1132 @@
+sleep 3000
+sql connect
+
+$dbPrefix = lm_db
+$tbPrefix = lm_tb
+$stbPrefix = lm_stb
+$tbNum = 10
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== limit_tb.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+print ====== use db
+sql use $db
+
+##### select from table
+print ====== select from table with limit offset
+$tb = $tbPrefix . 0
+sql select * from $tb order by ts desc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5 offset 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data41 != 0 then
+  return -1
+endi
+
+$offset = $rowNum - 1
+sql select * from $tb order by ts desc limit 5 offset $offset
+if $rows != 1 then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $tb order by ts desc limit 5 offset 5
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data02 != 4 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4 then
+  return -1
+endi
+if $data06 != 4 then
+   return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary4 then
+  return -1
+endi
+if $data09 != nchar4 then
+  return -1
+endi
+
+sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $tb order by ts desc limit 5 offset $offset
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 0.00000 then
+  return -1
+endi
+if $data04 != 0.000000000 then
+  return -1
+endi
+if $data05 != 0 then
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data07 != 1 then
+  return -1
+endi
+if $data08 != binary0 then
+  return -1
+endi
+if $data09 != nchar0 then
+  return -1
+endi
+
+
+## TBASE-329
+sql select * from $tb where c1 < 9 order by ts desc limit 1 offset 1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 9 order by ts desc limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 9 order by ts desc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 7 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 5 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 0 order by ts desc limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 0 order by ts desc limit 1 offset 1
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 0 order by ts desc limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+
+
+sql_error select * from $tb limit
+sql_error select * from $tb offset
+sql_error select * from $tb offset 1
+sql_error select * from $tb offset 1 limit 5
+sql_error select * from $tb offset 1 limit -1
+
+#### aggregation function + limit offset
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+### aggregation function + limit offset (non-interval case)
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu and c1 < 9 and c2 < 8 and c3 >0 and c4 <= 7 and c5 <7 limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 0 offset 0
+if $rows != 0 then
+  return -1
+endi
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 5
+if $rows != 1 then
+  return -1
+endi
+$val = 45 * $rowNum 
+$val = $val / 10
+print $data05
+print $rowNum
+#print $val
+if $data00 != $val then
+  return -1
+endi
+if $data01 != 4.500000000 then
+  return -1
+endi
+if $data02 != 2.872281323 then
+  return -1
+endi
+if $data03 != 9.000000000 then
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != $rowNum then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data07 != binary9 then
+  return -1
+endi
+if $data08 != nchar9 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1>1 and c2<9 and c3>2 and c4<8 and c5>4 and c6<6 limit 1 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 5 then
+  return -1
+endi
+if $data01 != 5.000000000 then
+  return -1
+endi
+if $data02 != 0.000000000 then
+  return -1
+endi
+if $data03 != 5.000000000 then
+  return -1
+endi
+if $data04 != 5 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data07 != binary5 then
+  return -1
+endi
+if $data08 != nchar5 then
+  return -1
+endi
+
+sql select sum(c1), avg(c2), stddev(c3), max(c4), min(c5), count(c6), first(c7), last(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select spread(ts), spread(c1), spread(c2), spread(c3), spread(c4), spread(c5), spread(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 5400000.000000000 then
+  return -1
+endi
+if $data01 != 9.000000000 then
+  return -1
+endi
+if $data02 != 9.000000000 then
+  return -1
+endi
+if $data03 != 9.000000000 then
+  return -1
+endi
+if $data04 != 9.000000000 then
+  return -1
+endi
+if $data05 != 9.000000000 then
+  return -1
+endi
+if $data06 != 9.000000000 then
+  return -1
+endi
+sql select spread(ts), spread(c1), spread(c2), spread(c3), spread(c4), spread(c5), spread(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 4.000000000 then
+  return -1
+endi
+if $data01 != 4.000000000 then
+  return -1
+endi
+if $data02 != 4.000000000 then
+  return -1
+endi
+if $data03 != 4.000000000 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4.000000000 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select top(c1, 1) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
+print select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts desc limit 3 offset 1
+print $data00 $data01
+print $data10 $data11
+print $data20 $data21
+
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data20 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data21 != 6 then
+  return -1
+endi
+
+sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data01 != 6 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data20 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data21 != 8 then
+  return -1
+endi
+sql select top(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+sql_error select top(c1, 101) from $tb where ts >= $ts0 and ts <= $tsu order by ts asc limit 3 offset 98
+
+sql select bottom(c1, 1) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select bottom(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data20 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+sql select bottom(c1, 5) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 5
+if $rows != 0 then
+  return -1
+endi
+
+sql select diff(c1) from $tb where c1 > 5 limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+
+### aggregation + limit offset (with interval)
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 5
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+if $data41 != 4 then
+  return -1
+endi
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 1.00000 then
+  return -1
+endi
+if $data04 != 1.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+if $data31 != 4 then
+  return -1
+endi
+if $data41 != 5 then
+  return -1
+endi
+
+## TBASE-334
+sql select max(c1), max(c2), max(c3), max(c4), max(c5), max(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 2 offset 1
+if $rows != 2 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data04 != 5.000000000 then
+  return -1
+endi
+if $data11 != 8 then
+  return -1
+endi
+if $data14 != 8.000000000 then
+  return -1
+endi
+if $data21 != null then
+  print expect null, actual: $data21
+  return -1
+endi
+
+sql select min(c1), min(c2), min(c3), min(c4), min(c5), min(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data11 != 6 then
+  return -1
+endi
+if $data21 != 9 then
+  return -1
+endi
+if $data31 != null then
+  return -1
+endi
+
+sql select sum(c1), sum(c2), sum(c3), sum(c4), sum(c5), sum(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5
+if $rows != 4 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 21 then
+  return -1
+endi
+if $data31 != 9 then
+  return -1
+endi
+if $data41 != null then
+  return -1
+endi
+sql select sum(c1), sum(c2), sum(c3), sum(c4), sum(c5), sum(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 12 then
+  return -1
+endi
+if $data11 != 21 then
+  return -1
+endi
+if $data21 != 9 then
+  return -1
+endi
+if $data31 != null then
+  return -1
+endi
+
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 1.000000000 then
+  return -1
+endi
+if $data11 != 4.000000000 then
+  return -1
+endi
+if $data21 != 7.000000000 then
+  return -1
+endi
+if $data31 != null then
+  return -1
+endi
+sql select avg(c1), avg(c2), avg(c3), avg(c4), avg(c5), avg(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 4.000000000 then
+  return -1
+endi
+if $data11 != 7.000000000 then
+  return -1
+endi
+if $data21 != 9.000000000 then
+  return -1
+endi
+if $data31 != null then
+  return -1
+endi
+
+
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) limit 0
+if $rows != 0 then
+  return -1
+endi
+sql select stddev(c1), stddev(c2), stddev(c3), stddev(c4), stddev(c5), stddev(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 5 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data01 != 0.816496581 then
+  return -1
+endi
+if $data10 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data21 != 0.000000000 then
+  return -1
+endi
+
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(27m)
+if $rows != 4 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+if $data31 != 3 then
+  return -1
+endi
+sql select count(c1), count(c2), count(c3), count(c4), count(c5), count(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(27m) limit 5 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data11 != 3 then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi 
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select twa(c1), twa(c2), twa(c3), twa(c4), twa(c5), twa(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 3 offset 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 4.000000000 then
+  return -1
+endi
+if $data02 != 4.000000000 then
+  return -1
+endi
+if $data05 != 4.000000000 then
+  return -1
+endi
+
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select first(c1), first(c2), first(c3), first(c4), first(c5), first(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data23 != 9.00000 then
+  return -1
+endi
+
+
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6) from $tb where ts >= $ts0 and ts <= $tsu limit 5 offset 1
+if $rows != 0 then
+  return -1
+endi
+sql select last(c1), last(c2), last(c3), last(c4), last(c5), last(c6) from $tb where ts >= $ts0 and ts <= $tsu interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data23 != 9.00000 then
+  return -1
+endi
+
+sql select first(ts), first(c1), last(c2), first(c3), last(c4), first(c5), last(c6), first(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 > 0 interval(30m) limit 3 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data01 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then
+  return -1
+endi
+if $data12 != 3 then
+  return -1
+endi
+if $data13 != 5 then
+  return -1
+endi
+if $data14 != 3.00000 then
+  return -1
+endi
+if $data22 != 6 then
+  return -1
+endi
+if $data23 != 8 then
+  return -1
+endi
+if $data28 != binary6 then
+  return -1
+endi
+if $data29 != nchar8 then
+  return -1
+endi
+
+sql select first(ts), first(c1), last(c2), first(c3), last(c4), first(c5), last(c6), first(c8), last(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 > 0 interval(30m) limit 3 offset 1
+if $rows != 3 then
+  return -1
+endi
+if $data01 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data02 != 3 then
+  return -1
+endi
+if $data03 != 5 then
+  return -1
+endi 
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 5.000000000 then
+  return -1
+endi
+if $data08 != binary3 then
+  return -1
+endi
+if $data09 != nchar5 then
+  return -1
+endi
+if $data12 != 6 then
+  return -1
+endi
+if $data13 != 8 then
+  return -1
+endi
+if $data14 != 6.00000 then
+  return -1
+endi
+if $data15 != 8.000000000 then
+  return -1
+endi
+if $data22 != 9 then
+  return -1
+endi
+if $data23 != 9 then
+  return -1
+endi
+if $data24 != 9.00000 then
+  return -1
+endi
+if $data25 != 9.000000000 then
+  return -1
+endi
+if $data26 != 9 then
+  return -1
+endi
+if $data27 != 9 then
+  return -1
+endi
+if $data28 != binary9 then
+  return -1
+endi
+if $data29 != nchar9 then
+  return -1
+endi
+
+### order by ts + limit offset
+
+sql select * from $tb order by ts asc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data20 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data23 != 2.00000 then
+  return -1
+endi
+if $data34 != 3.000000000 then
+  return -1
+endi
+if $data45 != 4 then
+  return -1
+endi
+if $data06 != 0 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary2 then
+  return -1
+endi
+if $data39 != nchar3 then
+  return -1
+endi
+if $data40 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts asc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:20:00.000@ then
+  return -1
+endi
+if $data12 != 2 then
+  return -1
+endi
+if $data20 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data23 != 3.00000 then
+  return -1
+endi
+if $data34 != 4.000000000 then
+  return -1
+endi
+if $data45 != 5 then
+  return -1
+endi
+if $data06 != 1 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary3 then
+  return -1
+endi
+if $data39 != nchar4 then
+  return -1
+endi
+if $data40 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts asc limit 5 offset 8
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data12 != 9 then
+  return -1
+endi
+
+sql select * from $tb where c1 > 1 order by ts asc limit 3 offset 2
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data10 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data12 != 5 then
+  return -1
+endi
+if $data23 != 6.00000 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 3 and c1 > 1 order by ts asc limit 3 offset 2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 5 and c1 > 1 order by ts asc limit 3 offset 2
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data04 != 4.000000000 then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 10:30:00.000@ then
+  return -1
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data10 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data20 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data23 != 7.00000 then
+  return -1
+endi
+if $data34 != 6.000000000 then
+  return -1
+endi
+if $data45 != 5 then
+  return -1
+endi
+if $data06 != 9 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary7 then
+  return -1
+endi
+if $data39 != nchar6 then
+  return -1
+endi
+if $data40 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5 offset 1
+if $rows != 5 then
+  return -1
+endi
+if $data00 != @18-09-17 10:20:00.000@ then
+  return -1
+endi
+if $data01 != 8 then
+  return -1
+endi
+if $data10 != @18-09-17 10:10:00.000@ then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+if $data20 != @18-09-17 10:00:00.000@ then
+  return -1
+endi
+if $data23 != 6.00000 then
+  return -1
+endi
+if $data34 != 5.000000000 then
+  return -1
+endi
+if $data45 != 4 then
+  return -1
+endi
+if $data06 != 8 then
+  return -1
+endi
+if $data17 != 1 then
+  return -1
+endi
+if $data28 != binary6 then
+  return -1
+endi
+if $data39 != nchar5 then
+  return -1
+endi
+if $data40 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+
+sql select * from $tb order by ts desc limit 5 offset 8
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 09:10:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data12 != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 8 order by ts desc limit 3 offset 2
+if $rows != 3 then
+  return -1
+endi
+if $data00 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data10 != @18-09-17 09:40:00.000@ then
+  return -1
+endi
+if $data20 != @18-09-17 09:30:00.000@ then
+  return -1
+endi
+if $data12 != 4 then
+  return -1
+endi
+if $data23 != 3.00000 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 8 and c1 > 6 order by ts desc limit 3 offset 2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where c1 < 8 and c1 > 4 order by ts desc limit 3 offset 2
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:50:00.000@ then
+  return -1
+endi
+if $data01 != 5 then
+  return -1
+endi
+if $data04 != 5.000000000 then
+  return -1
+endi
+
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
new file mode 100644
index 0000000000000000000000000000000000000000..41082bb1441a111602a127b3dd8e9eb6d0420e51
--- /dev/null
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -0,0 +1,147 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = mb_db
+$tbPrefix = mb_tb
+$stbPrefix = mb_stb
+$tbNum = 10
+$ts0 = 1537146000000
+$delta = 1000
+print ========== mixed_blocks.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database if exists $db
+$paramRows = 200
+$rowNum = $paramRows * 4
+$rowNum = $rowNum / 5
+sql create database $db maxrows $paramRows
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$tb1 = $tbPrefix . 1
+$tb2 = $tbPrefix . 2
+sql create table $tb1 using $stb tags( 1 )
+sql create table $tb2 using $stb tags( 2 )
+
+$tb1 = $tbPrefix . 1
+$tb2 = $tbPrefix . 2
+$x = 0
+print rowNum = $rowNum
+while $x < $rowNum
+  $xs = $x * $delta
+  $ts = $ts0 + $xs
+  $c = $x / 10
+  $c = $c * 10
+  $c = $x - $c
+  $binary = 'binary . $c
+  $binary = $binary . '
+  $nchar = 'nchar . $c
+  $nchar = $nchar . '
+  $c = 0 - $x
+  sql insert into $tb1 values ( $ts , $x , $x , $x , $x , true, $binary , $nchar ) 
+  sql insert into $tb2 values ( $ts , $c , $c , $c , $c , true, $binary , $nchar ) 
+  $x = $x + 1
+endw 
+print ====== tables created
+sql show databases
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+$rowNum = $rowNum * 2
+while $x < $rowNum
+  $xs = $x * $delta
+  $ts = $ts0 + $xs
+  $c = $x / 10
+  $c = $c * 10
+  $c = $x - $c
+  $binary = 'binary . $c
+  $binary = $binary . '
+  $nchar = 'nchar . $c
+  $nchar = $nchar . '
+  $c = 0 - $x
+  sql insert into $tb1 values ( $ts , $x , $x , $x , $x , true, $binary , $nchar ) 
+  sql insert into $tb2 values ( $ts , $c , $c , $c , $c , true, $binary , $nchar ) 
+  $x = $x + 1
+endw 
+
+#### query a STable and using where clause to filter out all the data from tb2 and make the query only return first/last of tb1
+sql select first(ts,c1), last(ts,c1), spread(c1) from $stb where c1 > 0 group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:01.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != @18-09-17 09:05:19.000@ then
+  return -1
+endi
+if $data03 != 319 then
+  return -1
+endi
+if $data04 != 318.000000000 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+
+sql select max(c1), min(c1), sum(c1), avg(c1), count(c1) from $stb where c1 > 0 group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 319 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 51040 then
+  return -1
+endi
+if $data03 != 160.000000000 then
+  return -1
+endi
+if $data04 != 319 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+
+sql select first(ts,c1), last(ts,c1) from $tb1 where c1 > 0
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:01.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != @18-09-17 09:05:19.000@ then
+  return -1
+endi
+if $data03 != 319 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bdac5ace55a0c5feeb3413eea13a8a7b2c13f7e4
--- /dev/null
+++ b/tests/script/general/parser/nchar.sim
@@ -0,0 +1,315 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = nchar_db
+$tbPrefix = nchar_tb
+$mtPrefix = nchar_stb
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+$col = NCHAR
+
+print =============== set up
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create database $db
+sql use $db
+
+# case1: create_metric_with_nchar_data
+print ========== nchar.sim case1: create_table_with_nchar_data test
+
+# unspecified nchar length
+sql_error create table $mt (ts timestamp, col nchar)
+sql_error create table $mt (ts timestamp, col int) tags (tg nchar)
+# nchar as column or tag names
+sql_error create table $mt (ts timestamp, nchar int)
+sql_error create table $mt (ts timestamp, col int) tags (nchar int)
+sql create table $mt (ts timestamp, col nchar(60)) tags (tg nchar(60))
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $mt then
+  return -1
+endi
+sql describe $mt
+if $rows != 3 then 
+  return -1
+endi
+if $data11 != NCHAR then
+  return -1
+endi
+sql create table $tb using $mt tags ('tag1')
+sql describe $tb
+if $data11 != NCHAR then
+  return -1
+endi
+if $data21 != NCHAR then
+  return -1
+endi
+sql drop table $tb
+sql drop table $mt
+print create_metric_with_nchar_data test passed
+
+# case2 : insert_nchar_data
+#print ========== nchar.sim case2: insert_nchar_data
+sql create table $mt (ts timestamp, col nchar(10)) tags(tg nchar(10))
+sql create table $tb using $mt tags ('tag1')
+sql describe $mt
+#print expected: NCHAR
+#print returned: $data11
+if $data11 != NCHAR then
+  return -1
+endi
+
+# insert nchar data with a pair of single quotes
+$col = 'NCHAR'
+$col_ = NCHAR
+sql insert into $tb values (now+1s, $col )
+sql select * from $tb order by ts desc
+print expected: $col_
+print returned: $data01
+if $data01 != $col_ then
+  return -1
+endi
+
+# insert nchar data with a pair of double quotes
+$col = "NCHAR"
+$col_ = NCHAR
+sql insert into $tb values (now+2s, $col )
+sql select * from $tb order by ts desc
+print expected: $col_
+print returned: $data01
+if $data01 != $col_ then
+  return -1
+endi
+
+# insert nchar data without quotes
+$col = NCHAR
+$col_ = nchar
+sql_error insert into $tb values (now+3s, $col )
+sql select * from $tb order by ts desc
+#print expected: $col_
+#print returned: $data01
+#if $data01 != $col_ then
+#  return -1
+#endi
+
+# insert nchar data with space and no quotes
+sql_error insert into $tb values (now+4s, n char )
+
+# insert nchar data with space and a pair of single quotes
+sql insert into $tb values (now+5s, 'NCHAR' )
+sql select * from $tb order by ts desc
+print expected: NCHAR
+print returned: $data01
+$quote = '
+$ret1 = $quote . $data01
+$ret2 = $ret1 . $quote
+print $ret2
+
+if $ret2 != 'NCHAR' then
+  return -1
+endi
+
+label1:
+
+# insert nchar data with space and a pair of double quotes
+sql insert into $tb values (now+6s, "NCHAR" )
+sql select * from $tb order by ts desc
+print expected: N CHAR
+print returned: $data01
+$quote = "
+$ret1 = $quote . $data01
+$ret2 = $ret1 . $quote
+print $ret2 
+if $ret2 = "NCHAR" then
+  goto label2
+else
+  return -1
+endi
+label2:
+
+sql insert into $tb values (now+7s, "涛思" )
+sql select * from $tb order by ts desc
+print expected: 涛思
+print returned: $data01
+if $data01 != 涛思 then 
+  return -1
+endi
+
+# insert nchar data with a single quote and a double quote
+#sql insert into $tb values (now+8s, 'NCHAR")
+sql_error insert into $tb values (now+9s, 'NCHAR")
+sql_error insert into $tb values (now+10s, 'NCHAR])
+
+sql drop table $tb
+sql drop table $mt
+sql reset query cache
+# create multiple metrics and tables and insert nchar type data
+sql create table $mt (ts timestamp, tbcol nchar(10), tbcol1 int) TAGS(tgcol nchar(10))
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '0', $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '1', $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+# case5: query_with_tag_filtering
+print ========== nchar.sim case5: query test
+# simple query with nchar tag filtering
+sql select * from $mt where tgcol = '1' -x step1
+  goto step2
+step1:
+print reset query cache
+sql reset query cache
+sql select * from $mt where tgcol = '1'
+step2:
+if $rows != 100  then
+  print expect 100, actual: $rows
+  return -1
+endi
+
+#sql select * from $mt where tgcol > '0'
+##print rows = $rows
+#if $rows != 100 then
+#  return -1
+#endi
+##print $data03
+#if $data03 != 1 then
+#  return -1
+#endi
+
+# cumulative query with nchar tag filtering
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol
+if $rows != 2 then
+  return -1
+endi
+sql select count(tbcol) from $mt where tbcol1 = 1 group by tgcol
+if $rows != 2 then
+  return -1
+endi
+print data00 = $data00
+if $data00 != 5 then
+  print expect 5, actual: $data00
+  return -1
+endi
+if $data10 != 5 then
+  return -1
+endi
+sql_error select avg(tbcol) from $mt where tbcol1 = 1 group by tgcol
+sql_error select sum(tbcol) from $mt where tbcol1 = 1 group by tgcol 
+sql_error select min(tbcol) from $mt where tbcol1 = 1 group by tgcol 
+sql_error select max(tbcol) from $mt where tbcol1 = 1 group by tgcol  
+sql select first(tbcol) from $mt where tbcol1 = 1 group by tgcol 
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 0 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != 1 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+sql select last(tbcol) from $mt where tbcol1 = 1 group by tgcol
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 0 then 
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data10 != 1 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1
+endi
+ 
+sql create table stbb (ts timestamp, c1 nchar(5)) tags (t1 int)
+sql create table tbb1 using stbb tags(1)
+sql insert into tbb1 values ('2018-09-17 09:00:00', '涛思')
+sql insert into tbb1 values ('2018-09-17 09:00:01', 'insrt')
+sql select * from tbb1 order by ts asc
+if $rows != 2 then
+  return -1
+endi
+print data11 = $data11
+if $data11 != insrt then
+  return -1
+endi
+
+sql select * from stbb
+if $rows != 2 then
+  return -1
+endi
+if $data11 != insrt then
+  return -1
+endi
+
+# nchar data column currently does not support filtering, 2018/09/27
+# sql select * from $mt where tbcol = '0'
+# if $rows != 100 then
+#   return -1
+# endi
+# 
+# sql select * from $mt where ts > now + 4m and tbcol = '1'
+# if $rows != 75 then
+#   return -1
+# endi
+# 
+# sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol
+# 
+# sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol 
+# 
+# sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol
+#
+# case: query_with_wildcard 
+# print =============== clear
+# sql drop database $db
+# sql show databases
+# if $rows != 0 then 
+#   return -1
+# endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2e39fc7db2e20f9528c2d62458f3a6a625181c73
--- /dev/null
+++ b/tests/script/general/parser/null_char.sim
@@ -0,0 +1,515 @@
+#### TBASE-679
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ========== NULL_char.sim
+
+$db = db
+sql drop database if exists $db
+sql create database $db
+sql use $db
+
+#### case 0: field NULL, or 'NULL'
+sql create table mt1 (ts timestamp, col1 int, col2 bigint, col3 float, col4 double, col5 binary(8), col6 bool, col7 smallint, col8 tinyint, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag4 bigint, tag5 bool, tag6 float)
+sql create table st1 using mt1 tags (NULL, 'NULL', 100, 1000, 'false', 9.123)
+sql insert into st1 values ('2019-01-01 09:00:00.000', 123, -123, 3.0, 4.0, 'binary', true, 1000, 121, 'nchar')
+sql insert into st1 values ('2019-01-01 09:00:01.000', '456', '456', '3.33', '4.444', 'binary', 'true', '1001', '122', 'nchar')
+sql insert into st1 values ('2019-01-01 09:00:02.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+sql insert into st1 values ('2019-01-01 09:00:03.000', NULL, NULL, NULL, NULL, 'NULL', 'NULL', 2002, 127, 'NULL')
+
+sql select * from mt1
+if $rows != 4 then
+  return -1
+endi
+if $data21 != NULL then
+  return -1
+endi
+if $data22 != NULL then
+  return -1
+endi
+if $data23 != NULL then
+  return -1
+endi
+if $data24 != NULL then
+  return -1
+endi
+if $data25 != NULL then
+  return -1
+endi
+if $data26 != NULL then
+  return -1
+endi
+if $data27 != NULL then
+  return -1
+endi
+if $data28 != NULL then
+  return -1
+endi
+if $data29 != NULL then
+  return -1
+endi
+
+if $data31 != NULL then
+  return -1
+endi
+if $data32 != NULL then
+  return -1
+endi
+#if $data33 != 0.00000 then
+#  print === expect 0.00000, actually $data33
+#  return -1
+#endi
+#if $data34 != 0.000000000 then
+#  print === expect 0.00000, actually $data34
+#  return -1
+#endi
+if $data35 != NULL then
+  return -1
+endi
+if $data36 != NULL then
+  return -1
+endi
+if $data39 != NULL then
+  return -1
+endi
+
+
+#### case 1: tag NULL, or 'NULL'
+sql create table mt2 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool)
+sql create table st2 using mt2 tags (NULL, 'NULL', 102, 'true')
+sql select tag1, tag2, tag3, tag5 from st2
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  print ==1== expect: NULL, actually: $data00
+  return -1
+endi
+if $data01 != NULL then
+  print ==2== expect: NULL, actually: $data01
+  return -1
+endi
+if $data02 != 102 then
+  print ==3== expect: NULL, actually: $data02
+  return -1
+endi
+if $data03 != 1 then
+  print ==4== expect: 1, actually: $data03
+  return -1
+endi
+
+sql select tag1 from st2 limit 20 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select tag1 from st2 limit 10 offset 2
+if $rows != 0 then
+  return -1
+endi
+
+sql select tag1 from st2 limit 0 offset 0
+if $rows != 0 then
+  return -1
+endi
+
+sql create table st3 using mt2 tags (NULL, 'ABC', 103, 'FALSE')
+sql select tag1, tag2, tag3, tag5 from st3
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  print ==5== expect: NULL, actually: $data00
+  return -1
+endi
+if $data01 != ABC then
+  return -1
+endi
+if $data02 != 103 then
+  return -1
+endi
+if $data03 != 0 then
+  return -1
+endi
+
+### bool:
+sql_error create table stx using mt2 tags ('NULL', '123aBc', 104, '123')
+sql_error create table sty using mt2 tags ('NULL', '123aBc', 104, 'xtz')
+sql create table st4 using mt2 tags ('NULL', '123aBc', 104, 'NULL')
+sql select tag1,tag2,tag3,tag5 from st4
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+if $data01 != 123aBc then
+  return -1
+endi
+if $data02 != 104 then
+  return -1
+endi
+if $data03 != NULL then
+  print ==6== expect: NULL, actually: $data03
+  return -1
+endi
+
+sql create table st5 using mt2 tags ('NULL', '123aBc', 105, NULL)
+sql select tag1,tag2,tag3,tag5 from st5
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+if $data01 != 123aBc then
+  return -1
+endi
+if $data02 != 105 then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+
+
+
+#### case 2: dynamic create table using super table when insert into
+sql create table mt3 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool)
+sql_error insert into st31 using mt3 tags (NULL, 'NULL', 102, 'true')     values (now+1s, 31, 31, 'bin_31', '123', 'nchar_31')
+sql_error insert into st32 using mt3 tags (NULL, 'ABC', 103, 'FALSE')     values (now+2s, 32, 32.12345, 'bin_32', 'abc', 'nchar_32')
+sql_error insert into st33 using mt3 tags ('NULL', '123aBc', 104, 'NULL') values (now+3s, 33, 33, 'bin_33', 'false123', 'nchar_33')
+sql_error insert into st34 using mt3 tags ('NULL', '123aBc', 105, NULL)   values (now+4s, 34, 34.12345, 'bin_34', 'true123', 'nchar_34')
+
+
+#### case 3: set tag value
+sql create table mt4 (ts timestamp, c1 int) tags (tag_binary binary(16), tag_nchar nchar(16), tag_int int, tag_bool bool, tag_float float, tag_double double)
+sql create table st41 using mt4 tags ("beijing", 'nchar_tag', 100, false, 9.12345, 7.123456789)
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from st41
+if $rows != 1 then
+  return -1
+endi
+if $data00 != beijing then
+  return -1
+endi
+if $data01 != nchar_tag then
+  return -1
+endi
+if $data02 != 100 then
+  return -1
+endi
+if $data03 != 0 then
+  return -1
+endi
+
+if $data04 != 9.12345 then
+  print expect 9.12345 , actual: $data04
+  return -1
+endi
+
+if $data05 != 7.123456789 then
+  print expect 7.123456789 , actual: $data05
+  return -1
+endi
+
+################# binary
+sql alter table st41 set tag tag_binary = "shanghai"
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data00 != shanghai then
+  return -1
+endi
+
+##### test 'space' case
+system_content echo '   ' | sed 's/ //g' | tr -d '\n' # Construct an empty result for later result checking
+sql alter table st41 set tag tag_binary = ""
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data00 != $system_content  then
+  print expect [ $system_content ], actual [ $data00 ]
+  return -1
+endi
+
+sql alter table st41 set tag tag_binary = "NULL"
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data00 != NULL then
+  return -1
+endi
+
+sql alter table st41 set tag tag_binary = NULL
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data00 != NULL then
+  print ==8== expect: NULL, actually: $data23
+  return -1
+endi
+
+################### nchar
+sql alter table st41 set tag tag_nchar = "��˼����"
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+#sleep 1000
+#if $data01 != ��˼���� then
+#  print ==== expect ��˼����, actually $data01
+#  return -1
+#endi
+##### test 'space' case
+#$tagvalue = '
+#$tagvalue = $tagvalue '
+sql alter table st41 set tag tag_nchar = ''
+#sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+#if $data01 != $tagvalue then
+#  return -1
+#endi
+sql alter table st41 set tag tag_nchar = "NULL"
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data01 != NULL then
+  return -1
+endi
+sql alter table st41 set tag tag_nchar = NULL
+#sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+#if $data01 !=   then
+#  print ==9== expect  , actually $data01
+#   return -1
+#endi
+
+################### int
+sql alter table st41 set tag tag_int = -2147483647
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data02 != -2147483647 then
+  return -1
+endi
+sql alter table st41 set tag tag_int = 2147483647
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data02 != 2147483647 then
+  return -1
+endi
+
+sql_error alter table st41 set tag tag_int = -2147483648
+sql_error alter table st41 set tag tag_int = 2147483648
+
+sql alter table st41 set tag tag_int = '-379'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data02 != -379 then
+  return -1
+endi
+sql alter table st41 set tag tag_int = -2000
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data02 != -2000 then
+  return -1
+endi
+sql alter table st41 set tag tag_int = NULL
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data02 != NULL then
+  print ==10== expect: NULL, actually: $data02
+  return -1
+endi
+sql alter table st41 set tag tag_int = 'NULL'
+sql_error alter table st41 set tag tag_int = ''
+sql_error alter table st41 set tag tag_int = abc379
+
+################### bool
+sql alter table st41 set tag tag_bool = 'true'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != 1 then
+  return -1
+endi
+sql alter table st41 set tag tag_bool = 'false'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != 0 then
+  return -1
+endi
+sql alter table st41 set tag tag_bool = 0
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != 0 then
+  return -1
+endi
+sql alter table st41 set tag tag_bool = 123
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != 1 then
+  return -1
+endi
+sql alter table st41 set tag tag_bool = 'NULL'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != NULL then
+  print ==14== expect: NULL, actually: $data03
+  return -1
+endi
+sql alter table st41 set tag tag_bool = NULL
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data03 != NULL then
+  return -1
+endi
+
+sql_error alter table st41 set tag tag_bool = '123'
+sql_error alter table st41 set tag tag_bool = ''
+sql_error alter table st41 set tag tag_bool = abc379
+
+################### float
+sql alter table st41 set tag tag_float = -32
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != -32.00000 then
+  print expect -32.00000 actual $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = 54.123456
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != 54.123455 then
+  print ==15== expect: 54.123455, actually: $data04
+#  return -1
+endi
+sql alter table st41 set tag tag_float = 54.12345
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != 54.12345 then
+  print ==16== expect: 54.12345, actually: $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = 54.12345678
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != 54.12346 then
+  print ==11== expect: 54.12346, actually : $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = NULL
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != NULL then
+  print ==12== expect: NULL, actually : $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = 'NULL'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != NULL then
+  print ==17== expect: NULL, actually : $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = '54.123456'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != 54.12346 then
+  print ==18== expect: 54.12346, actually : $data04
+  return -1
+endi
+sql alter table st41 set tag tag_float = '-54.123456'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data04 != -54.12346 then
+  print ==19== expect: -54.12346, actually : $data04
+  return -1
+endi
+sql_error alter table st41 set tag tag_float = ''
+
+sql_error alter table st41 set tag tag_float = 'abc'
+sql_error alter table st41 set tag tag_float = '123abc'
+sql_error alter table st41 set tag tag_float = abc
+
+################### double
+sql alter table st41 set tag tag_double = -92
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data05 != -92.000000000 then
+  print expect -92.000000000 actual $data05
+  return -1
+endi
+sql alter table st41 set tag tag_double = 184
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data05 != 184.000000000 then
+  print expect 184.000000000 actual $data05
+  return -1
+endi
+sql alter table st41 set tag tag_double = '-2456'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data05 != -2456.000000000 then
+  return -1
+endi
+sql alter table st41 set tag tag_double = NULL
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data05 != NULL then
+  print ==13== expect: NULL, actually : $data05
+  return -1
+endi
+sql alter table st41 set tag tag_double = 'NULL'
+sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
+if $data05 != NULL then
+  print ==20== expect: NULL, actually : $data05
+  return -1
+endi
+sql_error alter table st41 set tag tag_double = ''
+
+
+sql_error alter table st41 set tag tag_double = 'abc'
+sql_error alter table st41 set tag tag_double = '123abc' 
+sql_error alter table st41 set tag tag_double = abc
+
+################### bigint smallint tinyint
+sql create table mt5 (ts timestamp, c1 int) tags (tag_bigint bigint, tag_smallint smallint, tag_tinyint tinyint)
+sql create table st51 using mt5 tags (1, 2, 3)
+sql alter table st51 set tag tag_bigint = '-379'
+sql alter table st51 set tag tag_bigint = -2000
+sql alter table st51 set tag tag_bigint = NULL
+sql alter table st51 set tag tag_bigint = 9223372036854775807
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data00 != 9223372036854775807 then
+  return -1
+endi
+sql alter table st51 set tag tag_bigint = 9223372036854775808
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data00 != 9223372036854775807 then
+  return -1
+endi
+sql alter table st51 set tag tag_bigint = -9223372036854775807
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data00 != -9223372036854775807 then
+  return -1
+endi
+sql_error alter table st51 set tag tag_bigint = -9223372036854775808
+
+sql alter table st51 set tag tag_bigint = 'NULL'
+sql_error alter table st51 set tag tag_bigint = ''
+sql_error alter table st51 set tag tag_bigint = abc379
+
+####
+sql alter table st51 set tag tag_smallint = -2000
+sql alter table st51 set tag tag_smallint = NULL
+sql alter table st51 set tag tag_smallint = 32767
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data01 != 32767 then
+  return -1
+endi
+sql_error alter table st51 set tag tag_smallint = 32768
+
+sql alter table st51 set tag tag_smallint = -32767
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data01 != -32767 then
+  return -1
+endi
+sql_error alter table st51 set tag tag_smallint = -32768
+
+sql alter table st51 set tag tag_smallint = 'NULL'
+sql_error alter table st51 set tag tag_smallint = ''
+sql_error alter table st51 set tag tag_smallint = abc379
+
+####
+sql alter table st51 set tag tag_tinyint = -127
+sql alter table st51 set tag tag_tinyint = NULL
+sql alter table st51 set tag tag_tinyint = 127
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data02 != 127 then
+  return -1
+endi
+sql alter table st51 set tag tag_tinyint = -127
+sql select tag_bigint, tag_smallint, tag_tinyint from st51
+if $data02 != -127 then
+  return -1
+endi
+sql_error alter table st51 set tag tag_tinyint = '-128'
+sql_error alter table st51 set tag tag_tinyint = 128
+sql alter table st51 set tag tag_tinyint = 'NULL'
+sql_error alter table st51 set tag tag_tinyint = ''
+sql_error alter table st51 set tag tag_tinyint = abc379
+
+
+# test end   
+#sql drop database $db
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fbff99d58f5b6355863b90172c2fb14c1f2ba393
--- /dev/null
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -0,0 +1,392 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = group_db
+$tbPrefix = group_tb
+$mtPrefix = group_mt
+$tbNum = 8
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+
+print =============== projection_limit_offset.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 100000
+endw
+
+sleep 100
+
+$i1 = 1
+$i2 = 0
+
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$dbPrefix = group_db
+$tbPrefix = group_tb
+$mtPrefix = group_mt
+
+$tb1 = $tbPrefix . $i1
+$tb2 = $tbPrefix . $i2
+$ts1 = $tb1 . .ts
+$ts2 = $tb2 . .ts
+
+#===============select * from super_table limit/offset[TBASE-691]=================================
+sql select ts from group_mt0
+print $rows
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 0;
+if $rows != 4008 then
+  print expect 4008, actual:$rows
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 1;
+if $rows != 4007 then
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 101;
+print $rows
+if $rows != 3907 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.101@ then
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 902;
+if $rows != 3106 then
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 400;
+if $rows != 3608 then
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 8000 offset 4007;
+if $rows != 1 then
+  return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' limit 2000 offset 4008;
+if $rows != 0 then
+  return -1
+endi
+
+#==================================order by desc, multi vnode, limit/offset===================================
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 0;
+if $rows != 4008 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.500@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 1;
+if $rows != 4007 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.500@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 101;
+print $rows
+if $rows != 3907 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.488@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 902;
+if $rows != 3106 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.388@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 400;
+if $rows != 3608 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.450@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 8000 offset 4007;
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.000@ then
+   return -1
+endi
+
+sql select ts from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.500' order by ts desc limit 2000 offset 4008;
+if $rows != 0 then
+  return -1
+endi
+
+#=================================single value filter======================================
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 0;
+if $row != 8 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.000@ then
+  return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 1;
+if $row != 7 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 2;
+if $row != 6 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 4;
+if $row != 4 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 7;
+if $row != 1 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 8;
+if $row != 0 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts asc limit 10 offset 9;
+if $row != 0 then
+   return -1
+endi
+
+#===============================single value filter, order by desc============================
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 0;
+if $row != 8 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.000@ then
+  return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 1;
+if $row != 7 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 2;
+if $row != 6 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 4;
+if $row != 4 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 7;
+if $row != 1 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:43.000@ then
+  return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 8;
+if $row != 0 then
+   return -1
+endi
+
+sql select ts,tbname from group_mt0 where ts>='1970-1-1 8:1:43' and ts<='1970-1-1 8:1:43.00' order by ts desc limit 10 offset 9;
+if $row != 0 then
+   return -1
+endi
+
+#[tbase-695]
+sql select ts,tbname from group_mt0 where ts>='1970-01-01 8:1:40' and ts<'1970-1-1 8:1:45' and c1<99999999 limit 100000 offset 5000
+if $row != 35000 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+   return -1
+endi
+
+#=================================parse error sql==========================================
+sql_error select ts,tbname from group_mt0 order by ts desc limit 100 offset -1;
+sql_error select ts,tbname from group_mt0 order by c1 asc limit 100 offset -1;
+sql_error select ts,tbname from group_mt0 order by ts desc limit -1, 100;
+sql_error select ts,tbname from group_mt0 order by ts desc slimit -1, 100;
+sql_error select ts,tbname from group_mt0 order by ts desc slimit 1 soffset 1;
+
+#================================functions applys to sql===================================
+sql_error select first(t1) from group_mt0;
+sql_error select last(t1) from group_mt0;
+sql_error select min(t1) from group_mt0;
+sql_error select max(t1) from group_mt0;
+sql_error select top(t1, 20) from group_mt0;
+sql_error select bottom(t1, 20) from group_mt0;
+sql_error select avg(t1) from group_mt0;
+sql_error select percentile(t1, 50) from group_mt0;
+sql_error select percentile(t1, 50) from group_mt0;
+sql_error select percentile(t1, 50) from group_mt0;
+
+#====================================tbase-722==============================================
+print tbase-722
+sql select spread(ts) from group_tb0;
+print $data00
+
+if $data00 != 9999.000000000 then
+   return -1
+endi
+
+#====================================tbase-716==============================================
+print tbase-716
+sql_error select count(*) from group_tb0 where ts in ('2016-1-1 12:12:12');
+sql_error select count(*) from group_tb0 where ts < '12:12:12';
+
+#===============================sql for twa==========================================
+sql_error select twa(c1) from group_tb0;
+sql_error select twa(c1) from group_stb0;
+sql_error select twa(c2) from group_stb0 where ts<now and ts>now-1h group by t1;
+sql_error select twa(c2) from group_stb0 where ts<now and ts>now-1h group by tbname,t1;
+sql_error select twa(c2) from group_stb0 group by tbname,t1;
+sql_error select twa(c2) from group_stb0 group by tbname;
+sql_error select twa(c2) from group_stb0 group by t1;
+sql_error select twa(c2) from group_stb0 where ts<now and ts>now-1h group by t1,tbname;
+
+#================================first/last error check================================
+sql create table m1 (ts timestamp, k int) tags(a int);
+sql create table tm0 using m1 tags(1);
+sql create table tm1 using m1 tags(2);
+
+sql insert into tm0 values(10000, 1) (20000, 2)(30000, 3) (40000, NULL) (50000, 2) tm1 values(10001, 2)(20000,4)(90000,9);
+sql select count(*),first(k),last(k) from m1 where tbname in ('tm0') interval(1s) order by ts desc;
+
+if $row != 5 then
+    return -1
+endi
+
+if $data00 != @70-01-01 08:00:50.000@ then
+    return -1
+endi
+
+if $data01 != 1 then
+   return -1
+endi
+
+if $data02 != 2 then
+   return -1
+endi
+
+if $data11 != 1 then
+   return -1
+endi
+
+if $data12 != NULL then
+   return -1
+endi
+
+if $data13 != NULL then
+   return -1
+endi
+
+print =============tbase-1324
+sql select a, k-k from m1
+if $row != 8 then
+   return -1
+endi
+
+sql select diff(k) from tm0
+if $row != 3 then
+   return -1
+endi
+
+if $data21 != -1 then
+   return -1
+endi
+
+#error sql
+sql_error select * from 1;
+sql_error select 1;
+sql_error select k+k;
+sql_error select k+1;
+sql_error select abc();
+sql_error select 1 where 1=2;
+sql_error select 1 limit 1;
+sql_error select 1 slimit 1;
+sql_error select 1 interval(1h);
+sql_error select count(*);
+sql_error select sum(k);
+sql_error select 'abc';
+sql_error select k+1,sum(k) from tm0;
+sql_error select k, sum(k) from tm0;
+sql_error select k, sum(k)+1 from tm0;
+
+#=============================tbase-1205
+sql select count(*) from tm1 where ts<now and ts>= now -1d interval(1h) fill(NULL);
+
+
diff --git a/tests/script/general/parser/repeatAlter.sim b/tests/script/general/parser/repeatAlter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3695206f908391c80ef451ebad66e3b069b21a74
--- /dev/null
+++ b/tests/script/general/parser/repeatAlter.sim
@@ -0,0 +1,9 @@
+$i = 1
+$loops = 10
+while $i <= $loops
+  print ====== repeat: $i
+  run general/parser/alter.sim
+  $i = $i + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/repeatStream.sim b/tests/script/general/parser/repeatStream.sim
new file mode 100644
index 0000000000000000000000000000000000000000..616679e78bf8095e175ef91abf96c918626d6acb
--- /dev/null
+++ b/tests/script/general/parser/repeatStream.sim
@@ -0,0 +1,9 @@
+$i = 1
+$repeats = 5
+while $i <= $repeats
+  print ====== repeat: $i
+  run general/parser/stream.sim
+  $i = $i + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
new file mode 100644
index 0000000000000000000000000000000000000000..42cedc034b7f000eea4b75b156a847a4d1667c5b
--- /dev/null
+++ b/tests/script/general/parser/selectResNum.sim
@@ -0,0 +1,188 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = sc_db
+$tbPrefix = sc_tb
+$stbPrefix = sc_stb
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+$loops = 200000
+$log = 10000
+$ts0 = 1537146000000
+$delta = 600000
+print ========== selectResNum.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+sql use $db
+##### select from table
+print ====== select from table and check num of rows returned
+$loop = 1
+$i = 0
+while $loop <= $loops
+  $remainder = $loop / $log
+  $remainder = $remainder * $log
+  $remainder = $loop - $remainder
+  if $remainder == 0 then
+     print loop: $loop
+  endi
+  while $i < 10
+    sql select ts from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c1 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c2 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c3 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c4 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c5 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c6 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c7 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c8 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c9 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    $i = $i + 1
+  endw
+  $loop = $loop + 1
+endw
+
+print ====== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 6000
+system sh/exec.sh -n dnode1 -s start
+print ====== server restart completed
+sleep 3000
+sql connect
+sleep 3000
+sql use $db
+
+##### repeat test after server restart
+print ====== repeat test after restarting server
+$loop = 1
+$i = 0
+while $loop <= $loops
+  $remainder = $loop / $log
+  $remainder = $remainder * $log
+  $remainder = $loop - $remainder
+  if $remainder == 0 then
+     print loop: $loop
+  endi
+  while $i < 10
+    sql select ts from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c1 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c2 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c3 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c4 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c5 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c6 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c7 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    sql select c8 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      print expect $rowNum, actual: $rows
+      return -1
+    endi
+    sql select c9 from $stb where t1 = $i 
+    if $rows != $rowNum then
+      return -1
+    endi
+    $i = $i + 1
+  endw
+  $loop = $loop + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ac3a8f2b2b3bd04681a20e070aaf2aba58447b26
--- /dev/null
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -0,0 +1,83 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = sav_db
+$tbPrefix = sav_tb
+$stbPrefix = sav_stb
+$tbNum = 20
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== alter.sim
+$i = 0
+$db = $dbPrefix
+$stb = $stbPrefix
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+print ====== create tables
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = '涛思 . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+##### select * from stb
+sql select * from $stb
+if $rows != $totalNum then
+  return -1
+endi
+
+##### select * from $stb with limit
+sql select * from $stb limit 1 
+if $rows != 1 then
+  return -1
+endi
+
+$limit = $rowNum / 2
+sql select * from $stb limit $limit
+if $rows != $limit then
+  return -1
+endi
+
+sql select last(*) from $stb where t1 >= 0 group by t1 limit 5
+if $rows != $tbNum then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4fdfa7b55b88372d5497f399c5c821f10743f4d5
--- /dev/null
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = scd_db
+$tbPrefix = scd_tb
+$stbPrefix = scd_stb
+$tbNum = 20
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== select_from_cache_disk.sim
+$i = 0
+$db = $dbPrefix
+$stb = $stbPrefix
+$tb = $tbPrefix
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+print ====== create tables
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+sql create table $tb using $stb tags( 1 )
+# generate some data on disk
+sql insert into $tb values ('2018-09-17 09:00:00.000', 0)
+sql insert into $tb values ('2018-09-17 09:00:00.010', 1)
+sql insert into $tb values ('2018-09-17 09:00:00.020', 2)
+sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+sql use $db
+
+# generate some data in cache
+sql insert into $tb values ('2018-09-17 09:00:04.000', 4)
+sql insert into $tb values ('2018-09-17 09:00:04.010', 5)
+sql select count(*) from $stb interval(1s) group by t1
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data10 != @18-09-17 09:00:04.000@ then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
new file mode 100644
index 0000000000000000000000000000000000000000..68d145a5f277464a224ccf0b3c92767a48e26fb6
--- /dev/null
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -0,0 +1,852 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = select_tags_db
+$tbPrefix = select_tags_tb
+$mtPrefix = select_tags_mt
+
+$tbNum = 16
+$rowNum = 800
+$totalNum = $tbNum * $rowNum
+
+print =============== select_with_tags.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 100000
+
+sql drop database if exists $db -x step1
+step1:
+sql create database if not exists $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+$j = 1
+
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . $i
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $c1 = $c + $i
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c1 , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 1
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $j = $j + 10000
+  $tstart = 100000 + $j
+
+endw
+
+sleep 100
+
+#================================
+sql select ts from select_tags_mt0
+print $rows
+if $rows != 12800 then
+   return -1
+endi
+
+sql select first(ts), tbname, t1, t2 from select_tags_mt0;
+if $rows != 1 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+   return -1
+endi
+
+if $data01 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data02 != 0 then
+   return -1
+endi
+
+if $data03 != @abc0@ then
+   return -1
+endi
+
+sql select last(ts), tbname, t1, t2 from select_tags_mt0;
+if $rows != 1 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:04:10.800@ then
+   return -1
+endi
+
+if $data01 != @select_tags_tb15@ then
+   return -1
+endi
+
+if $data02 != 15 then
+   return -1
+endi
+
+if $data03 != @abc15@ then
+   return -1
+endi
+
+sql select min(c1), tbname, t1, t2 from select_tags_mt0;
+if $rows != 1 then
+   return -1
+endi
+
+if $data00 != 0 then
+   return -1
+endi
+
+if $data01 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data02 != 0 then
+   return -1
+endi
+
+if $data03 != @abc0@ then
+   return -1
+endi
+
+sql select max(c1), tbname, t1, t2 from select_tags_mt0;
+if $rows != 1 then
+   return -1
+endi
+
+if $data00 != 114 then
+   return -1
+endi
+
+if $data01 != @select_tags_tb15@ then
+   return -1
+endi
+
+if $data02 != 15 then
+   return -1
+endi
+
+if $data03 != @abc15@ then
+   return -1
+endi
+
+sql select top(c1, 100), tbname, t1, t2 from select_tags_mt0;
+if $rows != 100 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:03:30.100@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:03:30.200@ then
+   return -1
+endi
+
+if $data01 != 110 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb11@ then
+   return -1
+endi
+
+if $data03 != 11 then
+   return -1
+endi
+
+if $data04 != @abc11@ then
+   return -1
+endi
+
+sql select top(c1, 80), tbname, t1, t2 from select_tags_mt0;
+if $rows != 80 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:03:40.100@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:03:40.200@ then
+   return -1
+endi
+
+if $data01 != 111 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb12@ then
+   return -1
+endi
+
+if $data03 != 12 then
+   return -1
+endi
+
+if $data04 != @abc12@ then
+   return -1
+endi
+
+sql select bottom(c1, 100), tbname, t1, t2 from select_tags_mt0;
+if $rows != 100 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:01:40.001@ then
+   return -1
+endi
+
+if $data01 != 0 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data03 != 0 then
+   return -1
+endi
+
+if $data04 != @abc0@ then
+   return -1
+endi
+
+sql select last_row(c1, c2), tbname, t1, t2 from select_tags_mt0;
+if $rows != 1 then
+   return -1
+endi
+
+if $data00 != 114 then
+   return -1
+endi
+
+print $data01
+if $data01 != 99.00000 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb15@ then
+   return -1
+endi
+
+if $data03 != 15 then
+   return -1
+endi
+
+print ====== selectivity+tags+group by tags=======================
+sql select first(c1), tbname, t1, t2 from select_tags_mt0 group by tbname;
+if $rows != 16 then
+   return -1
+endi
+
+if $data00 != 0 then
+   return -1
+endi
+
+if $data10 != 1 then
+   return -1
+endi
+
+print $data01
+if $data01 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data11 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data02 != 0 then
+   return -1
+endi
+
+if $data03 != @abc0@ then
+   return -1
+endi
+
+if $data04 != @select_tags_tb0@ then
+   return -1
+endi
+
+sql select last_row(ts,c1), tbname, t1, t2 from select_tags_mt0 group by tbname;
+if $rows != 16 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.799@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:01:50.800@ then
+   return -1
+endi
+
+print $data01
+if $data01 != 99 then
+   return -1
+endi
+
+if $data11 != 100 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data03 != 0 then
+   return -1
+endi
+
+if $data04 != @abc0@ then
+   return -1
+endi
+
+sql select tbname,t1,t2 from select_tags_mt0;
+if $row != 16 then
+   return -1
+endi
+
+if $data00 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data01 != 0 then
+    return -1
+endi
+
+if $data02 != @abc0@ then
+    return -1
+endi
+
+if $data10 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data11 != 1 then
+   return -1
+endi
+
+if $data12 != @abc1@ then
+   return -1
+endi
+
+sql select tbname,ts from select_tags_mt0;
+if $row != 12800 then
+   return -1
+endi
+
+if $data00 != @select_tags_tb0@ then
+  return -1
+endi
+
+if $data10 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data01 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data11 != @70-01-01 08:01:40.001@ then
+  return -1
+endi
+
+sql select top(c1, 100), tbname, t1, t2 from select_tags_mt0 where tbname in ('select_tags_tb0', 'select_tags_tb1') group by tbname;
+if $row != 200 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.087@ then
+  return -1
+endi
+
+if $data10 != @70-01-01 08:01:40.088@ then
+  return -1
+endi
+
+if $data20 != @70-01-01 08:01:40.089@ then
+  return -1
+endi
+
+if $data90 != @70-01-01 08:01:40.096@ then
+  return -1
+endi
+
+if $data01 != 87 then
+  return -1
+endi
+
+if $data02 != @select_tags_tb0@ then
+  return -1
+endi
+
+if $data03 != 0 then
+  return -1
+endi
+
+if $data04 != @abc0@ then
+  return -1
+endi
+
+sql select top(c1, 2), t2 from select_tags_mt0 where tbname in ('select_tags_tb0', 'select_tags_tb1') group by tbname,t2;
+if $row != 4 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.099@ then
+  return -1
+endi
+
+if $data01 != 99 then
+   return -1
+endi
+
+if $data02 != @abc0@ then
+   return -1
+endi
+
+if $data03 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data04 != @abc0@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:01:40.199@ then
+  return -1
+endi
+
+if $data11 != 99 then
+   return -1
+endi
+
+if $data12 != @abc0@ then
+   return -1
+endi
+
+if $data13 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data14 != @abc0@ then
+   return -1
+endi
+
+if $data20 != @70-01-01 08:01:50.100@ then
+  return -1
+endi
+
+if $data21 != 100 then
+   return -1
+endi
+
+if $data22 != @abc1@ then
+   return -1
+endi
+
+if $data23 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data24 != @abc1@ then
+   return -1
+endi
+
+if $data30 != @70-01-01 08:01:50.200@ then
+  return -1
+endi
+
+if $data31 != 100 then
+   return -1
+endi
+
+if $data32 != @abc1@ then
+   return -1
+endi
+
+if $data33 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data34 != @abc1@ then
+   return -1
+endi
+
+
+# slimit /limit
+sql select top(c1, 2), t2 from select_tags_mt0 where tbname in ('select_tags_tb0', 'select_tags_tb1') group by tbname,t2 limit 2 offset 1;
+if $row != 2 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.199@ then
+  return -1
+endi
+
+if $data01 != 99 then
+   return -1
+endi
+
+if $data02 != @abc0@ then
+   return -1
+endi
+
+if $data03 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data04 != @abc0@ then
+   return -1
+endi
+
+print ======= selectivity + tags + group by + tags + filter ===========================
+sql select first(c1), t1 from select_tags_mt0 where c1<=2 group by tbname;
+if $row != 3 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data01 != 0 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data10 != 1 then
+   return -1
+endi
+
+if $data11 != 1 then
+   return -1
+endi
+
+if $data12 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data20 != 2 then
+   return -1
+endi
+
+if $data21 != 2 then
+   return -1
+endi
+
+if $data22 != @select_tags_tb2@ then
+   return -1
+endi
+
+sql select first(c1), tbname from select_tags_mt0 where c1<=2 interval(1s);
+if $row != 3 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+   return -1
+endi
+
+if $data01 != 0 then
+   return -1
+endi
+
+if $data02 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data10 != @70-01-01 08:01:50.000@ then
+   return -1
+endi
+
+if $data11 != 1 then
+   return -1
+endi
+
+if $data12 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data20 != @70-01-01 08:02:00.000@ then
+   return -1
+endi
+
+if $data21 != 2 then
+   return -1
+endi
+
+if $data22 != @select_tags_tb2@ then
+   return -1
+endi
+
+sql select first(ts),ts from select_tags_tb0 where c1<3
+if $row != 1 then
+   return -1
+endi
+
+if $data00 != $data01 then
+   return -1
+endi
+
+sql select last(ts),ts from select_tags_tb0 where c1<3
+if $row != 1 then
+   return -1
+endi
+
+if $data00 != $data01 then
+   return -1
+endi
+
+sql select first(ts), ts  from select_tags_tb1
+if $row != 1 then
+  return -1
+endi
+
+if $data01 != @70-01-01 08:01:50.001@ then
+  return -1
+endi
+
+print ======= selectivity + tags + group by + tags + filter + interval ================
+sql select first(c1), t2, t1, tbname from select_tags_mt0 where c1<=2 interval(1d) group by tbname;
+if $row != 3 then
+   return -1
+endi
+
+if $data00 != @70-01-01 00:00:00.000@ then
+   return -1
+endi
+
+if $data01 != 0 then
+   return -1
+endi
+
+if $data02 != @abc0@ then
+   return -1
+endi
+
+if $data03 != 0 then
+   return -1
+endi
+
+if $data04 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data05 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data15 != @select_tags_tb1@ then
+   return -1
+endi
+
+if $data25 != @select_tags_tb2@ then
+  return -1
+endi
+
+sql select top(c1, 5), t2 from select_tags_mt0 where c1<=2 interval(1d) group by tbname;
+if $row != 15 then
+   return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.002@ then
+  return -1
+endi
+
+if $data01 != 2 then
+   return -1
+endi
+
+if $data02 != @abc0@ then
+   return -1
+endi
+
+if $data03 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data90 != @70-01-01 08:01:50.402@ then
+   return -1
+endi
+
+if $data91 != 2 then
+   return -1
+endi
+
+if $data92 != @abc1@ then
+   return -1
+endi
+
+if $data93 != @select_tags_tb1@ then
+   return -1
+endi
+
+#if data
+sql select top(c1, 50), t2, t1, tbname from select_tags_mt0 where c1<=2 interval(1d) group by tbname;
+if $row != 48 then
+  return -1
+endi
+
+if $data00 != @70-01-01 08:01:40.000@ then
+   return -1
+endi
+
+if $data01 != 0 then
+   return -1
+endi
+
+if $data02 != @abc0@ then
+   return -1
+endi
+
+if $data03 != 0 then
+   return -1
+endi
+
+if $data04 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data05 != @select_tags_tb0@ then
+  return -1
+endi
+
+if $data10 != @70-01-01 08:01:40.001@ then
+   return -1
+endi
+
+if $data11 != 1 then
+   return -1
+endi
+
+if $data12 != @abc0@ then
+   return -1
+endi
+
+if $data13 != 0 then
+   return -1
+endi
+
+if $data14 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data15 != @select_tags_tb0@ then
+  return -1
+endi
+
+if $data90 != @70-01-01 08:01:40.300@ then
+   return -1
+endi
+
+if $data91 != 0 then
+   return -1
+endi
+
+if $data92 != @abc0@ then
+   return -1
+endi
+
+if $data93 != 0 then
+   return -1
+endi
+
+if $data94 != @select_tags_tb0@ then
+   return -1
+endi
+
+if $data95 != @select_tags_tb0@ then
+  return -1
+endi
+
+sql select last(ts),TBNAME from select_tags_mt0 interval(1y)
+if $row != 1 then
+   return -1
+endi
+
+print ======= selectivity + tags+ group by + tags + filter + interval + join===========
+
+
+print ======error sql=============================================
+sql_error select first(*), tbname from select_tags_mt0;
+sql_error select first(ts), first(c1),tbname from select_tags_mt0;
+sql_error select first(ts), last(ts), tbname from select_tags_mt0;
+sql_error select last_row(*), first(ts), tbname, t1, t2 from select_tags_mt0;
+sql_error select tbname, last_row(*), t1, first(ts) from select_tags_mt0;
+sql_error select first(ts), tbname from select_tags_tb0;
+sql_error select last_row(*), t1 from select_tags_tb0;
+sql_error select count(*), tbname from select_tags_mt0;
+sql_error select sum(c2), tbname from select_tags_mt0;
+sql_error select avg(c3), tbname from select_tags_mt0;
+sql_error select percentile(c3, 50), tbname from select_tags_mt0;
+sql_error select apercentile(c4, 50), tbname from select_tags_mt0;
+sql_error select spread(c2), tbname, t1 from select_tags_mt0;
+sql_error select stddev(c2), tbname from select_tags_mt0;
+sql_error select twa(c2), tbname from select_tags_mt0;
+sql_error select interp(c2), tbname from select_tags_mt0 where ts=100001;
+
+sql_error select t1,t2,tbname from select_tags_mt0 group by tbname;
+sql_error select count(tbname) from select_tags_mt0 interval(1d);
+sql_error select count(tbname) from select_tags_mt0 group by t1;
+sql_error select count(tbname),SUM(T1) from select_tags_mt0 interval(1d);
+sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 where c1<=2 interval(1d) group by tbname;
+sql_error select ts from select_tags_mt0 interval(1y);
+sql_error select count(*), tbname from select_tags_mt0 interval(1y);
+sql_error select tbname, t1 from select_tags_mt0 interval(1y);
+
+#===error sql + group by ===============================================
+#valid sql: select first(c1), last(c2), tbname from select_tags_mt0 group by tbname;
+#valid sql: select first(c1), last(c2), count(*), tbname from select_tags_mt0 group by tbname;
+#valid sql: select first(c1), last(c2), count(*) from select_tags_mt0 group by tbname, t1;
+#valid sql: select first(c1), tbname, t1 from select_tags_mt0 group by t2;
+
+sql_error select first(c1), last(c2), t1 from select_tags_mt0 group by tbname;
+sql_error select first(c1), last(c2), tbname, t2 from select_tags_mt0 group by tbname;
+sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 group by tbname;
+# this sql is valid: select first(c1), t2 from select_tags_mt0 group by tbname;
+
+#sql select first(ts), tbname from select_tags_mt0 group by tbname;
+#sql select count(c1) from select_tags_mt0 where c1=99 group by tbname;
+#sql select count(*),tbname from select_tags_mt0 group by tbname
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
new file mode 100644
index 0000000000000000000000000000000000000000..38af57c73d681fb0ed40212a967c741b0431ebad
--- /dev/null
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -0,0 +1,230 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = db
+$tbPrefix = tb
+$stbPrefix = stb
+$tbNum = 100
+$rowNum = 100
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== alter_tg.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create $tbNum tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(9), t2 binary(8))
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tgstr = 'tb . $i
+  $tgstr = $tgstr . '
+  $tgstr1 = 'usr . $i1
+  $tgstr1 = $tgstr1 . '
+  sql create table $tb using $stb tags( $tgstr , $tgstr1 )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+sleep 2000
+
+sql show tables
+if $rows != $tbNum then
+  return -1
+endi
+
+print ================== alter table add tags
+sql alter table $stb add tag t3 int
+sql alter table $stb add tag t4 binary(60)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql insert into $tb (ts, c1) values (now-100a, $i )
+  sql alter table $tb set tag t3 = $i
+  sql insert into $tb (ts, c1) values (now, $i )
+  sql alter table $tb set tag t4 = $i
+  $i = $i + 1
+endw
+
+print ================== all tags have been changed!
+sql select tbname from $stb where t3 = 'NULL'
+if $rows != 0 then 
+  return -1
+endi
+
+print ================== set tag to NULL
+sql create table stb1_tg (ts timestamp, c1 int) tags(t1 int,t2 bigint,t3 double,t4 float,t5 smallint,t6 tinyint)
+sql create table stb2_tg (ts timestamp, c1 int) tags(t1 bool,t2 binary(10), t3 nchar(10))
+sql create table tb1_tg1 using stb1_tg tags(1,2,3,4,5,6)
+sql create table tb1_tg2 using stb2_tg tags(true, 'tb1_tg2', '表1标签2')
+sql insert into tb1_tg1 values (now,1)
+sql insert into tb1_tg2 values (now,1)
+
+sql select * from stb1_tg
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then
+  return -1
+endi
+if $data04 != 3.000000000 then
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then
+  return -1
+endi
+if $data07 != 6 then
+  return -1
+endi
+
+sql select * from stb2_tg
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != tb1_tg2 then
+  return -1
+endi
+if $data04 != 表1标签2 then
+  return -1
+endi
+
+sql alter table tb1_tg1 set tag t1 = -1
+sql alter table tb1_tg1 set tag t2 = -2
+sql alter table tb1_tg1 set tag t3 = -3
+sql alter table tb1_tg1 set tag t4 = -4
+sql alter table tb1_tg1 set tag t5 = -5
+sql alter table tb1_tg1 set tag t6 = -6
+sql alter table tb1_tg2 set tag t1 = false
+sql alter table tb1_tg2 set tag t2 = 'binary2'
+sql alter table tb1_tg2 set tag t3 = '涛思'
+sql reset query cache
+sql select * from stb1_tg
+if $rows != 1 then
+  return -1
+endi
+if $data02 != -1 then
+  return -1
+endi
+if $data03 != -2 then
+  return -1
+endi
+if $data04 != -3.000000000 then
+  return -1
+endi
+if $data05 != -4.00000 then
+  return -1
+endi
+if $data06 != -5 then
+  return -1
+endi
+if $data07 != -6 then
+  return -1
+endi
+sql select * from stb2_tg
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != binary2 then
+  return -1
+endi
+if $data04 != 涛思 then
+  return -1
+endi
+
+sql alter table tb1_tg1 set tag t1 = NULL 
+sql alter table tb1_tg1 set tag t2 = NULL
+sql alter table tb1_tg1 set tag t3 = NULL
+sql alter table tb1_tg1 set tag t4 = NULL
+sql alter table tb1_tg1 set tag t5 = NULL
+sql alter table tb1_tg1 set tag t6 = NULL
+sql alter table tb1_tg2 set tag t1 = NULL
+sql alter table tb1_tg2 set tag t2 = NULL
+sql alter table tb1_tg2 set tag t3 = NULL
+sql reset query cache
+sql select * from stb1_tg
+if $rows != 1 then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+if $data05 != NULL then
+  return -1
+endi
+if $data06 != NULL then
+  return -1
+endi
+if $data07 != NULL then
+  return -1
+endi
+sql select * from stb2_tg
+if $data02 != NULL then
+  return -1
+endi
+
+print $data03
+if $data03 != NULL then
+  return -1
+endi
+if $data04 != NULL then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4305ae1b5d0d6fa1b308885263d1ac9947af3101
--- /dev/null
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -0,0 +1,41 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = sr_db
+$tbPrefix = sr_tb
+$stbPrefix = sr_stb
+$ts0 = 1537146000000
+print ========== single_row_in_tb.sim
+$db = $dbPrefix
+$stb = $stbPrefix
+
+sql drop database if exists $db
+sql create database $db maxrows 200
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$tb1 = $tbPrefix . 1
+sql create table $tb1 using $stb tags( 1 )
+sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
+print ====== tables created
+
+run general/parser/single_row_in_tb_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/single_row_in_tb_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/single_row_in_tb_query.sim b/tests/script/general/parser/single_row_in_tb_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a1ae70ec814d0babf00dbf5051da45c5cd7daf94
--- /dev/null
+++ b/tests/script/general/parser/single_row_in_tb_query.sim
@@ -0,0 +1,195 @@
+sleep 3000
+sql connect
+
+$dbPrefix = sr_db
+$tbPrefix = sr_tb
+$stbPrefix = sr_stb
+$ts0 = 1537146000000
+print ========== single_row_in_tb_query.sim
+$db = $dbPrefix
+$stb = $stbPrefix
+
+sql use $db
+$tb1 = $tbPrefix . 1
+
+sql select first(ts, c1) from $stb where ts >= $ts0 and ts < now group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select last(ts, c1) from $stb where ts >= $ts0 and ts < now group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select first(ts, c1), last(c1) from $stb where ts >= $ts0 and ts < now group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+
+sql select first(ts, c1), last(c2) from $stb where ts >= $ts0 and ts < now group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 2 then
+  return -1
+endi
+
+sql select first(ts, c1) from $tb1 where ts >= $ts0 and ts < now
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select last(ts, c1) from $tb1 where ts >= $ts0 and ts < now
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select first(ts, c1), last(c1) from $tb1 where ts >= $ts0 and ts < now
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+
+sql select first(ts, c1), last(c2) from $tb1 where ts >= $ts0 and ts < now
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 2 then
+  return -1
+endi
+
+#### query a STable and using where clause
+sql select first(ts,c1), last(ts,c1), spread(c1) from $stb where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 0.000000000 then
+  print expect: 0.00000000 , actual: $data04
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+
+sql select first(c1), last(c1) from $stb where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' interval(1d) group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 00:00:00.000@ then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+
+sql select max(c1), min(c1), sum(c1), avg(c1), count(c1) from $stb where c1 > 0 group by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 1.000000000 then
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+
+sql select first(ts,c1), last(ts,c1) from $tb1 where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' interval(1d)
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @18-09-17 00:00:00.000@ then
+  return -1
+endi
+if $data01 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != @18-09-17 09:00:00.000@ then
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
diff --git a/tests/script/general/parser/sliding.sim b/tests/script/general/parser/sliding.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f85211beb83e575e2a73518d89f4b7d989486f83
--- /dev/null
+++ b/tests/script/general/parser/sliding.sim
@@ -0,0 +1,461 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c debugFlag -v 135
+system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = sliding_db
+$tbPrefix = sliding_tb
+$mtPrefix = sliding_mt
+$tbNum = 8
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+
+print =============== sliding.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$tstart = 946656000000
+
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db maxtables 4 keep 36500
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $tg2 = ' . abc
+  $tg2 = $tg2 . '
+  sql create table $tb using $mt tags( $i , $tg2 )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+
+    $binary = ' . binary
+    $binary = $binary . $c
+    $binary = $binary . '
+
+    $nchar = ' . nchar
+    $nchar = $nchar . $c
+    $nchar = $nchar . '
+
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $tstart = $tstart + 30
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $tstart = 946656000000
+endw
+
+sleep 100
+
+$i1 = 1
+$i2 = 0
+
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$dbPrefix = sliding_db
+$tbPrefix = sliding_tb
+$mtPrefix = sliding_mt
+
+$tb1 = $tbPrefix . $i1
+$tb2 = $tbPrefix . $i2
+$ts1 = $tb1 . .ts
+$ts2 = $tb2 . .ts
+
+print ===============================interval_sliding query
+sql select count(*) from sliding_tb0 interval(30s) sliding(30s);
+if $row != 10 then
+ return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.000@ then
+ return -1
+endi
+
+if $data01 != 1000 then
+ return -1
+endi
+
+if $data10 != @00-01-01 00:00:30.000@ then
+ return -1
+endi
+
+if $data11 != 1000 then
+ return -1
+endi
+
+sql select stddev(c1) from sliding_tb0 interval(10a) sliding(10a)
+if $row != 10000 then
+  return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 0.000000000 then
+   return -1
+endi
+
+if $data90 != @00-01-01 00:00:00.270@ then
+  return -1
+endi
+
+if $data91 != 0.000000000 then
+  return -1
+endi
+
+sql select stddev(c1),count(c2),first(c3),last(c4) from sliding_tb0 interval(10a) sliding(10a) order by ts desc;
+if $row != 10000 then
+  return -1
+endi
+
+if $data00 != @00-01-01 00:04:59.970@ then
+ return -1
+endi
+
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+if $data02 != 1 then
+  return -1
+endi
+
+if $data03 != 99 then
+  return -1
+endi
+
+if $data04 != 99 then
+  return -1
+endi
+
+if $data90 != @00-01-01 00:04:59.700@ then
+  return -1
+endi
+
+if $data91 != 0.000000000 then
+  return -1
+endi
+
+if $data92 != 1 then
+  return -1
+endi
+
+if $data93 != 90 then
+  return -1
+endi
+
+if $data94 != 90 then
+  return -1
+endi
+
+sql select count(c2),last(c4) from sliding_tb0 interval(30s) sliding(10s) order by ts asc;
+if $row != 30 then
+  return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 1000 then
+  return -1
+endi
+
+if $data02 != 99 then
+  return -1
+endi
+
+sql select count(c2),stddev(c3),first(c4),last(c4) from sliding_tb0 where ts>'2000-01-01 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by ts asc;
+if $row != 2 then
+  return -1
+endi
+
+if $data04 != 99 then
+  return -1
+endi
+
+if $data01 != 999 then
+  return -1
+endi
+
+if $data02 != 28.837977152 then
+  return -1
+endi
+
+#interval offset + limit
+sql select count(c2), first(c3),stddev(c4) from sliding_tb0 interval(10a) sliding(10a) order by ts desc limit 10 offset 990;
+if $row != 10 then
+  return -1
+endi
+
+if $data00 != @00-01-01 00:04:30.270@ then
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data02 != 9 then
+  return -1
+endi
+
+if $data03 != 0.000000000 then
+  return -1
+endi
+
+if $data90 != @00-01-01 00:04:30.000@ then
+  return -1
+endi
+
+if $data91 != 1 then
+  return -1
+endi
+
+if $data92 != 0 then
+  return -1
+endi
+
+if $data93 != 0.000000000 then
+  return -1
+endi
+
+#interval offset test
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(30s) order by ts asc limit 1000 offset 1;
+if $row != 9 then
+  return -1
+endi
+
+if $data00 != @00-01-01 00:00:30.000@ then
+  return -1
+endi
+
+if $data01 != 1000 then
+  return -1
+endi
+
+if $data02 != 99 then
+  return -1
+endi
+
+if $data80 != @00-01-01 00:04:30.000@ then
+  return -1
+endi
+
+if $data81 != 1000 then
+  return -1
+endi
+
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 where ts>'2000-1-1 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by ts asc limit 1000 offset 0;
+if $row != 2 then
+ return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.000@ then
+ return -1
+endi
+
+if $data01 != 999 then
+ return -1
+endi
+
+if $data02 != 99 then
+ return -1
+endi
+
+if $data03 != 28.837977152 then
+ return -1
+endi
+
+if $data10 != @00-01-01 00:00:30.000@ then
+ return -1
+endi
+
+if $data11 != 34 then
+ return -1
+endi
+
+if $data12 != 33 then
+ return -1
+endi
+
+if $data13 != 9.810708435 then
+ return -1
+endi
+
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 1;
+if $row != 14 then
+ return -1
+endi
+
+if $data00 != @00-01-01 00:00:20.000@ then
+ return -1
+endi
+
+if $data01 != 1000 then
+ return -1
+endi
+
+if $data02 != 66 then
+ return -1
+endi
+
+if $data03 != 28.866070048 then
+ return -1
+endi
+
+if $data90 != @00-01-01 00:03:20.000@ then
+ return -1
+endi
+
+if $data91 != 1000 then
+ return -1
+endi
+
+if $data92 != 66 then
+ return -1
+endi
+
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 14;
+if $row != 1 then
+ return -1
+endi
+
+sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) order by ts desc;
+if $row != 10 then
+ return -1
+endi
+
+#00-01-01 00:04:30.000|                   10|       0|              0.000000000|              0.000000000|
+if $data00 != @00-01-01 00:04:30.000@ then
+ return -1
+endi
+
+if $data01 != 10 then
+ return -1
+endi
+
+if $data02 != 0 then
+ return -1
+endi
+
+if $data03 != 0.000000000 then
+ return -1
+endi
+
+sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) sliding(20s) order by ts desc limit 1 offset 15;
+if $row != 0 then
+ return -1
+endi
+
+sql select count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10a) order by ts asc limit 1000;
+if $row != 100 then
+ return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.000@ then
+ return -1
+endi
+
+if $data02 != 9.521904571 then
+ return -1
+endi
+
+if $data05 != 33 then
+ return -1
+endi
+
+if $data10 != @00-01-01 00:00:00.010@ then
+ return -1
+endi
+
+if $data12 != 9.521904571 then
+ return -1
+endi
+
+if $data15 != 33 then
+ return -1
+endi
+
+if $data95 != 33 then
+ return -1
+endi
+
+sql select count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10a) order by ts desc limit 1000;
+if $row != 100 then
+ return -1
+endi
+
+if $data00 != @00-01-01 00:00:00.990@ then
+ return -1
+endi
+
+if $data01 != 1 then
+ return -1
+endi
+
+if $data02 != 0.000000000 then
+ return -1
+endi
+
+if $data03 != 1 then
+ return -1
+endi
+
+if $data90 != @00-01-01 00:00:00.900@ then
+ return -1
+endi
+
+if $data91 != 4 then
+ return -1
+endi
+
+if $data92 != 1.118033989 then
+ return -1
+endi
+
+if $data93 != 4 then
+ return -1
+endi
+
+if $data94 != 30.00000 then
+ return -1
+endi
+
+print check boundary check crash at client side
+sql select count(*) from sliding_mt0 where ts>now and ts < now-1h;
+
+print ========================query on super table
+
+print ========================error case
+sql_error select sum(c1) from sliding_tb0 interval(1a) sliding(1a);
+sql_error select sum(c1) from sliding_tb0 interval(10a) sliding(12a);
+sql_error select sum(c1) from sliding_tb0 sliding(1n) interval(1y);
+sql_error select sum(c1) from sliding_tb0 interval(-1y)  sliding(1n);
+sql_error select sum(c1) from sliding_tb0 interval(1y)  sliding(-1n);
+sql_error select sum(c1) from sliding_tb0 interval(0)  sliding(0);
+sql_error select sum(c1) from sliding_tb0 interval(0m)  sliding(0m);
+sql_error select sum(c1) from sliding_tb0 interval(m)  sliding(m);
+sql_error select sum(c1) from sliding_tb0 sliding(4m);
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..edbf0c8cc0499d3cb40e0c7696d278ebcf9ba14a
--- /dev/null
+++ b/tests/script/general/parser/slimit.sim
@@ -0,0 +1,108 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = slm_db
+$tbPrefix = slm_tb
+$stbPrefix = slm_stb
+$tbNum = 10
+$rowNum = 300
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== slimit.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database if exists $db
+sql create database $db maxrows 200 cache 16
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $t1 = ' . $tb
+  $t1 = $t1 . '
+  $t2 = $i
+  $t3 = $i
+  $t4 = '涛思 . $tb
+  $t4 = $t4 . '
+  $t5 = $i
+  $t6 = true
+  sql create table $tb using $stb tags( $t1 , $t2 , $t3 , $t4 , $t5 , $t6 )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c 
+    $binary = $binary . '
+    $nchar = '涛思nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+  $ts = $ts + $delta
+  sql insert into $tb values ( $ts , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+  $i = $i + 1
+endw
+print ====== $db tables created
+
+$db = $dbPrefix . 1
+sql drop database if exists $db
+sql create database $db maxrows 200 cache 16
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $tbNum
+  $tb = $tbPrefix . $i                                                                                                                           
+  $t1 = ' . $tb
+  $t1 = $t1 . '
+  $t2 = $i
+  $t3 = $i
+  $t4 = '涛思 . $tb
+  $t4 = $t4 . '
+  $t5 = $i
+  $t6 = true
+  sql create table $tb using $stb tags( $t1 , $t2 , $t3 , $t4 , $t5 , $t6 )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL ) 
+    $x = $x + 1
+  endw 
+  $i = $i + 1
+endw
+print ====== $db tables created
+  
+run general/parser/slimit_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/slimit_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9e26a2882a5b013aa804f01c1dd8e339d17d54db
--- /dev/null
+++ b/tests/script/general/parser/slimit1.sim
@@ -0,0 +1,67 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = slm_alt_tg_db
+
+print ========== slimit_alter_tag.sim
+# make sure the data in each table crosses a file block boundary
+$rowNum = 300
+$ts0 = 1537146000000
+$delta = 600000
+$db = $dbPrefix
+
+sql drop database if exists $db
+sql create database $db maxrows 200
+sql use $db
+
+sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
+# If grouped by t2, some groups should have tables from different vnodes
+sql create table tb0 using stb tags (0, 0)
+sql create table tb1 using stb tags (1, 0)
+sql create table tb2 using stb tags (2, 0)
+sql create table tb3 using stb tags (3, 1)
+sql create table tb4 using stb tags (4, 1)
+sql create table tb5 using stb tags (5, 1)
+sql create table tb6 using stb tags (6, 2)
+sql create table tb7 using stb tags (7, 2)
+sql create table tb8 using stb tags (8, 2)
+# tb9 is intentionally set the same tags with tb8
+sql create table tb9 using stb tags (8, 2)
+
+$i = 0
+$tbNum = 10
+while $i < $tbNum
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c1 = $x * 10
+    $c1 = $c1 + $i
+    sql insert into $tb values ( $ts , $c1 , $c1 , $c1 )
+    $x = $x + 1
+  endw
+  $i = $i + 1
+endw
+
+print ================== tables and data created
+  
+run general/parser/slimit1_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/slimit1_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/slimit1_query.sim b/tests/script/general/parser/slimit1_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..617ccb3fd9a13b1392510c4287d11f69df5dde4e
--- /dev/null
+++ b/tests/script/general/parser/slimit1_query.sim
@@ -0,0 +1,184 @@
+sleep 3000
+sql connect
+
+$dbPrefix = slm_alt_tg_db
+
+print ========== slimit1_query.sim
+# make sure the data in each table crosses a file block boundary
+$rowNum = 300
+$ts0 = 1537146000000
+$delta = 600000
+$db = $dbPrefix
+
+sql use $db
+
+#### group by t2,t1 + slimit
+sql select count(*) from stb group by t2,t1 order by t2 asc slimit 5 soffset 6
+if $rows != 3 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != 6 then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+$res = 2 * $rowNum
+if $data20 != $res then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+if $data22 != 8 then
+  return -1
+endi
+## desc
+sql select count(*) from stb group by t2,t1 order by t2 desc slimit 5 soffset 0
+if $rows != 5 then
+  return -1
+endi
+$res = 2 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data02 != 8 then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data21 != 2 then
+  return -1
+endi
+if $data22 != 6 then
+  return -1
+endi
+if $data30 != $rowNum then
+  return -1
+endi
+if $data31 != 1 then
+  return -1
+endi
+if $data32 != 5 then
+  return -1
+endi
+if $data40 != $rowNum then
+  return -1
+endi
+if $data41 != 1 then
+  return -1
+endi
+if $data42 != 4 then
+  return -1
+endi
+
+### empty result set
+#sql select count(*) from stb group by t2,t1 order by t2 asc slimit 0 soffset 0
+#if $rows != 0 then
+#  return -1
+#endi
+#sql select count(*) from stb group by t2,t1 order by t2 asc slimit 5 soffset 10
+#if $rows != 0 then
+#  return -1
+#endi
+
+#### group by t2 + slimit
+sql select count(*) from stb group by t2 order by t2 asc slimit 2 soffset 0
+if $rows != 2 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+if $data10 != $res then
+  return -1
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1 
+endi
+
+sql select count(*) from stb group by t2 order by t2 desc slimit 2 soffset 0
+if $rows != 2 then
+  return -1
+endi
+$res = 4 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data10 != $res then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+if $data11 != 1 then
+  return -1 
+endi
+
+sql select count(*) from stb group by t2 order by t2 asc slimit 2 soffset 1
+if $rows != 2 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+$res = 4 * $rowNum
+if $data10 != $res then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1 
+endi
+
+sql select count(*) from stb group by t2 order by t2 desc slimit 2 soffset 1
+if $rows != 2 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+if $data10 != $res then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data11 != 0 then
+  return -1 
+endi
+
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
new file mode 100644
index 0000000000000000000000000000000000000000..eccd4a6815a5516afe5ed28dc8ec067737f18d01
--- /dev/null
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -0,0 +1,260 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = slm_alt_tg_db
+
+print ========== slimit_alter_tag.sim
+# make sure the data in each table crosses a file block boundary
+$rowNum = 300
+$ts0 = 1537146000000
+$delta = 600000
+$db = $dbPrefix
+
+sql drop database if exists $db
+sql create database $db maxrows 200
+sql use $db
+
+sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
+# If grouped by t2, some groups should have tables from different vnodes
+sql create table tb0 using stb tags (0, 0)
+sql create table tb1 using stb tags (1, 0)
+sql create table tb2 using stb tags (2, 0)
+sql create table tb3 using stb tags (3, 1)
+sql create table tb4 using stb tags (4, 1)
+sql create table tb5 using stb tags (5, 1)
+sql create table tb6 using stb tags (6, 2)
+sql create table tb7 using stb tags (7, 2)
+sql create table tb8 using stb tags (8, 2)
+# tb9 is intentionally set the same tags with tb8
+sql create table tb9 using stb tags (8, 2)
+
+$i = 0
+$tbNum = 10
+while $i < $tbNum
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c1 = $x * 10
+    $c1 = $c1 + $i
+    sql insert into $tb values ( $ts , $c1 , $c1 , $c1 )
+    $x = $x + 1
+  endw
+  $i = $i + 1
+endw
+
+print ================== tables and data created
+
+print ================== add a tag
+sql alter table stb add tag tg_added binary(15)
+sql describe stb
+if $rows != 7 then
+  return -1
+endi
+if $data60 != tg_added then
+  return -1
+endi
+
+sql select count(*) from stb group by tg_added order by tg_added asc
+if $rows != 1 then
+   return -1
+endi
+$res = $rowNum * 10
+if $data00 != $res then
+  return -1
+endi
+#if $data01 != NULL then
+#  return -1
+#endi
+
+print ================== change tag values
+$i = 0
+while $i < 10
+  $tb = tb . $i
+  $tg_added = ' . $tb
+  $tg_added = $tg_added . ' 
+  sql alter table $tb set tag tg_added = $tg_added
+  $i = $i + 1
+endw
+
+sql select t1,t2,tg_added from tb0
+if $rows != 1 then
+  return -1
+endi
+
+if $data02 != tb0 then
+  return -1
+endi
+
+sleep 2000
+sql reset query cache
+sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3
+if $rows != 5 then
+  print ===== result: $rows
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data30 != $rowNum then
+  return -1
+endi
+if $data40 != $rowNum then
+  return -1
+endi
+if $data02 != tb3 then
+  return -1
+endi
+if $data12 != tb4 then
+  return -1
+endi
+if $data22 != tb5 then
+  return -1
+endi
+if $data32 != tb6 then
+  return -1
+endi
+if $data42 != tb7 then
+  return -1
+endi
+
+sql alter table tb9 set tag t2 = 3
+sql select count(*), first(*) from stb group by t2 order by t2 slimit 6 soffset 1
+if $rows != 3 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+#if $data01 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data02 != 3 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data10 != $res then
+  return -1
+endi
+#if $data11 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data15 != 2 then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data24 != 9.000000000 then
+  return -1
+endi
+if $data25 != 3 then
+  return -1
+endi
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+sql use $db
+### repeat above queries
+sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3;
+if $rows != 5 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data30 != $rowNum then
+  return -1
+endi
+if $data40 != $rowNum then
+  return -1
+endi
+if $data02 != tb3 then
+  return -1
+endi
+if $data12 != tb4 then
+  return -1
+endi
+if $data22 != tb5 then
+  return -1
+endi
+if $data32 != tb6 then
+  return -1
+endi
+if $data42 != tb7 then
+  return -1
+endi
+
+sql select count(*), first(*) from stb group by t2 order by t2 slimit 6 soffset 1
+if $rows != 3 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data00 != $res then
+  return -1
+endi
+#if $data01 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data02 != 3 then
+  return -1
+endi
+if $data05 != 1 then
+  return -1
+endi
+$res = 3 * $rowNum
+if $data10 != $res then
+  return -1
+endi
+#if $data11 != @18-09-17 09:00:00.000@ then
+#  return -1
+#endi
+if $data15 != 2 then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data24 != 9.000000000 then
+  return -1
+endi
+if $data25 != 3 then
+  return -1
+endi
+
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then 
+#  return -1
+#endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/general/parser/slimit_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..655bc5f8beab0209428a4796ba83ba10d8b3afde
--- /dev/null
+++ b/tests/script/general/parser/slimit_query.sim
@@ -0,0 +1,572 @@
+sleep 3000
+sql connect
+
+$dbPrefix = slm_db
+$tbPrefix = slm_tb
+$stbPrefix = slm_stb
+$tbNum = 10
+$rowNum = 300
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== slimit_stb.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+print ====== use db
+sql use $db
+
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+##### select from supertable
+
+### illegal operations
+#sql_error select max(c1) from $stb where ts >= $ts0 and ts <= $tsu slimit 5 limit 1
+#sql_error select max(c1) from $stb where ts >= $ts0 and ts <= $tsu soffset 5
+#sql_error select max(c1) from $stb where ts >= $ts0 and ts <= $tsu limit 5 soffset 1
+#sql_error select max(c1) from $stb where ts >= $ts0 and ts <= $tsu slimit 5 offset 1
+#sql_error select top(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu slimit 5 offset 1
+#sql_error select bottom(c1, 1) from $stb where ts >= $ts0 and ts <= $tsu slimit 5 offset 1
+
+### select from stb + group by + slimit offset
+sql select max(c1), min(c2), avg(c3), sum(c4), spread(c5), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 slimit 5 soffset 0
+if $rows != 5 then
+  return -1
+endi
+#if $data08 != NULL then
+#if $data08 != 涛思nchar9 then
+#  return -1
+#endi
+$res = $tbPrefix . 0
+if $data09 != $res then
+  return -1
+endi
+$res = $tbPrefix . 1
+if $data19 != $res then
+  return -1
+endi
+$res = $tbPrefix . 4
+if $data49 != $res then
+  return -1
+endi
+
+#sql reset query cache
+sql select max(c1), min(c2), avg(c3), sum(c4), spread(c5), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 order by t1 asc slimit 5
+if $rows != 5 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+$res = $tbPrefix . 0
+print res = $res
+if $data09 != $res then
+  return -1
+endi
+$res = $tbPrefix . 4
+if $data49 != $res then
+  return -1
+endi
+
+## asc
+sql select max(c1), min(c2), avg(c3), sum(c4), spread(c5), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 order by t1 asc slimit 4 soffset 1
+if $rows != 4 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+$res = $tbPrefix . 1
+if $data09 != $res then
+  return -1
+endi
+$res = $tbPrefix . 4
+if $data39 != $res then
+  return -1
+endi
+## desc
+sql select max(c1), min(c2), avg(c3), sum(c4), spread(c5), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 order by t1 desc slimit 4 soffset 1
+if $rows != 4 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+$res = $tbPrefix . 8
+if $data09 != $res then
+  return -1
+endi
+$res = $tbPrefix . 5
+if $data39 != $res then
+  return -1
+endi
+
+### limit + slimit
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 order by t1 asc slimit 4 soffset 1 limit 0
+if $rows != 0 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1 order by t1 asc slimit 4 soffset 1 limit 2 offset 1
+if $rows != 0 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1,t2 order by t1 asc slimit 4 soffset 1 limit 1 offset 0
+if $rows != 4 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+$res = $tbPrefix . 1
+if $data08 != $res then
+  return -1
+endi
+print data09 = $data09
+if $data09 != 1 then
+  return -1
+endi
+$res = $tbPrefix . 4
+if $data38 != $res then
+  return -1
+endi
+if $data39 != 4 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb group by t1,t2 order by t1 desc slimit 4 soffset 1 limit 1 offset 0
+if $rows != 4 then
+  return -1
+endi
+$res = $tbPrefix . 8
+if $data08 != $res then
+  return -1
+endi
+if $data09 != 8 then
+  return -1
+endi
+$res = $tbPrefix . 5
+if $data38 != $res then
+  return -1
+endi
+if $data39 != 5 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 5 group by t1,t2,t3 order by t1 asc slimit 3 soffset 1 limit 1 offset 0
+if $rows != 3 then
+  return -1
+endi
+if $data00 != 9 then
+  return -1
+endi
+$res = $tbPrefix . 3
+if $data08 != $res then
+  return -1
+endi
+if $data09 != 3 then
+  return -1
+endi
+$res = $tbPrefix . 4
+if $data18 != $res then
+  return -1
+endi
+if $data19 != 4 then
+  return -1
+endi
+$res = $tbPrefix . 5
+if $data28 != $res then
+  return -1
+endi
+if $data29 != 5 then
+  return -1
+endi
+
+### slimit + fill
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 5 interval(5m) fill(value, -1, -2) group by t1 slimit 4 soffset 4 limit 0 offset 0
+if $rows != 0 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 9 interval(5m) fill(value, -1, -2) group by t1 slimit 4 soffset 4 limit 2 offset 0
+print select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 9 interval(5m) fill(value, -1, -2) group by t1 slimit 4 soffset 4 limit 2 offset 0
+print $rows $data00 $data01 $data02 $data03
+if $rows != 8 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data09 != slm_tb6 then
+  return -1
+endi
+if $data10 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+if $data12 != -2 then
+  return -1
+endi
+if $data13 != -2.000000000 then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data19 != slm_tb6 then
+  return -1
+endi
+if $data20 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data21 != 0 then
+  return -1
+endi
+if $data29 != slm_tb7 then
+  return -1
+endi
+if $data30 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data31 != -1 then
+  return -1
+endi
+if $data36 != -2 then
+  return -1
+endi
+if $data39 != slm_tb7 then
+  return -1
+endi
+if $data40 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data49 != slm_tb8 then
+  return -1
+endi
+if $data50 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data59 != slm_tb8 then
+  return -1
+endi
+if $data69 != slm_tb9 then
+  return -1
+endi
+if $data79 != slm_tb9 then
+  return -1
+endi
+# desc
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 9 interval(5m) fill(value, -1, -2) group by t1 order by t1 desc slimit 4 soffset 4 limit 2 offset 0
+if $rows != 8 then
+  return -1
+endi
+if $data00 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data01 != 0 then
+  return -1
+endi
+if $data09 != slm_tb5 then
+  return -1
+endi
+if $data10 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data11 != -1 then
+  return -1
+endi
+if $data12 != -2 then
+  return -1
+endi
+if $data13 != -2.000000000 then
+  return -1
+endi
+if $data17 != NULL then
+  return -1
+endi
+if $data18 != NULL then
+  return -1
+endi
+if $data19 != slm_tb5 then
+  return -1
+endi
+if $data20 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data21 != 0 then
+  return -1
+endi
+if $data29 != slm_tb4 then
+  return -1
+endi
+if $data30 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data31 != -1 then
+  return -1
+endi
+if $data36 != -2 then
+  return -1
+endi
+if $data39 != slm_tb4 then
+  return -1
+endi
+if $data40 != @18-09-17 09:00:00.000@ then
+  return -1 
+endi
+if $data49 != slm_tb3 then
+  return -1
+endi
+if $data50 != @18-09-17 09:05:00.000@ then
+  return -1
+endi
+if $data59 != slm_tb3 then
+  return -1
+endi
+if $data69 != slm_tb2 then
+  return -1
+endi
+if $data79 != slm_tb2 then
+  return -1
+endi
+
+sql select max(c1), min(c2), avg(c3), sum(c4), sum(c6), count(c7), first(c8), last(c9) from $stb where ts >= $ts0 and ts <= $tsu and t2 >= 2 and t3 <= 9 interval(5m) fill(value, -1, -2) group by t1 order by t1 asc slimit 4 soffset 4 limit 2 offset 598
+if $rows != 4 then
+  return -1
+endi
+if $data00 != @18-09-19 10:50:00.000@ then
+  return -1 
+endi
+if $data01 != 9 then
+  return -1
+endi
+if $data09 != slm_tb6 then
+  return -1
+endi
+if $data10 != @18-09-19 10:50:00.000@ then
+  return -1
+endi
+if $data12 != 9 then
+  return -1
+endi
+if $data13 != 9.000000000 then
+  return -1
+endi
+if $data19 != slm_tb7 then
+  return -1
+endi
+if $data20 != @18-09-19 10:50:00.000@ then
+  return -1 
+endi
+if $data24 != 9.000000000 then
+  return -1
+endi
+if $data29 != slm_tb8 then
+  return -1
+endi
+if $data30 != @18-09-19 10:50:00.000@ then
+  return -1
+endi
+if $data35 != 9 then
+  return -1
+endi
+if $data36 != 1 then
+  return -1
+endi
+if $data37 != binary9 then
+  return -1
+endi
+if $data38 != 涛思nchar9 then
+  return -1
+endi
+if $data39 != slm_tb9 then
+  return -1
+endi
+
+sql select count(ts) from $stb group by t1,t2,t3,t4,t5,t6 order by t1 desc
+if $rows != $tbNum then
+  return -1
+endi
+$res = $rowNum + 1
+if $data00 != $res then
+  return -1
+endi
+if $data90 != $res then 
+  return -1
+endi
+if $data01 != slm_tb9 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data23 != 7 then
+  return -1
+endi
+if $data34 != 涛思slm_tb6 then
+  return -1
+endi
+if $data45 != 5.000000000 then
+  return -1
+endi
+if $data56 != 1 then
+  return -1
+endi
+$res = $rowNum + 1
+if $data60 != $res then
+  return -1
+endi
+if $data71 != slm_tb2 then
+  return -1
+endi
+
+sql select count(c1) from $stb group by t1,t2,t3,t4,t5,t6 order by t1 desc
+if $rows != 10 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data90 != $rowNum then 
+  return -1
+endi
+if $data01 != slm_tb9 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data23 != 7 then
+  return -1
+endi
+if $data34 != 涛思slm_tb6 then
+  return -1
+endi
+if $data45 != 5.000000000 then
+  return -1
+endi
+if $data56 != 1 then
+  return -1
+endi
+if $data60 != $rowNum then
+  return -1
+endi
+if $data71 != slm_tb2 then
+  return -1
+endi
+
+## [TBASE-604]
+#sql_error select count(tbname) from slm_stb0 group by t1
+#sql show databases
+
+## [TBASE-605]
+sql_error select * from slm_stb0 where t2 >= 2 and t3 <= 9 group by tbname slimit 40 limit 1;
+
+
+##################################################
+# slm_db1 is a database that contains the exactly the same
+# schema as slm_db0, but all records in slm_db1 contains 
+# only NULL values.
+$db = $dbPrefix . 1
+sql use $db
+
+###
+sql select count(*) from $stb
+if $rows != 1 then
+  return -1
+endi
+if $data00 != $totalNum then
+  return -1
+endi
+
+sql select count(c1) from $stb
+if $rows != 0 then
+  return -1
+endi
+
+sql select count(ts) from $stb group by t1,t2,t3,t4,t5,t6 order by t1 asc
+if $rows != $tbNum then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data90 != $rowNum then 
+  return -1
+endi
+if $data01 != slm_tb0 then
+  return -1
+endi
+if $data12 != 1 then
+  return -1
+endi
+if $data23 != 2 then
+  return -1
+endi
+if $data34 != 涛思slm_tb3 then
+  return -1
+endi
+if $data45 != 4.000000000 then
+  return -1
+endi
+if $data56 != 1 then
+  return -1
+endi
+if $data60 != $rowNum then
+  return -1
+endi
+if $data71 != slm_tb7 then
+  return -1
+endi
+sql select count(ts) from $stb group by t1,t2,t3,t4,t5,t6 order by t1 desc
+if $rows != $tbNum then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data90 != $rowNum then 
+  return -1
+endi
+if $data01 != slm_tb9 then
+  return -1
+endi
+if $data12 != 8 then
+  return -1
+endi
+if $data23 != 7 then
+  return -1
+endi
+if $data34 != 涛思slm_tb6 then
+  return -1
+endi
+if $data45 != 5.000000000 then
+  return -1
+endi
+if $data56 != 1 then
+  return -1
+endi
+if $data60 != $rowNum then
+  return -1
+endi
+if $data71 != slm_tb2 then
+  return -1
+endi
+
+sql select count(c1) from $stb group by t1,t2,t3,t4,t5,t6 order by t1 desc
+if $rows != 0 then
+  return -1
+endi
+
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5507b4db484006fc8ae7887a47bcd83df5208c50
--- /dev/null
+++ b/tests/script/general/parser/stream_on_sys.sim
@@ -0,0 +1,62 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c monitor       -v 1
+system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== stream_on_sys.sim
+
+$db = log
+$tb = tb
+$mt = mt
+$strm = strm
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+$i = 0
+
+sql use $db
+
+sql create table cpustrm as select count(*), avg(cpu_taosd), max(cpu_taosd), min(cpu_taosd), avg(cpu_system), max(cpu_cores), min(cpu_cores), last(cpu_cores) from log.dn1 interval(4s) sliding(2s)
+sql create table memstrm as select count(*), avg(mem_taosd), max(mem_taosd), min(mem_taosd), avg(mem_system), first(mem_total), last(mem_total) from log.dn1 interval(4s) sliding(2s)
+sql create table diskstrm as select count(*), avg(disk_used), last(disk_used), avg(disk_total), first(disk_total) from log.dn1 interval(4s) sliding(2s)
+sql create table bandstrm as select count(*), avg(band_speed), last(band_speed) from log.dn1 interval(4s) sliding(2s)
+sql create table reqstrm as select count(*), avg(req_http), last(req_http), avg(req_select), last(req_select), avg(req_insert), last(req_insert) from log.dn1 interval(4s) sliding(2s)
+sql create table iostrm as select count(*), avg(io_read), last(io_read), avg(io_write), last(io_write) from log.dn1 interval(4s) sliding(2s)
+sleep 120000
+sql select * from cpustrm
+if $rows <= 0 then
+  return -1
+endi
+
+sql select * from memstrm
+if $rows <= 0 then
+  return -1
+endi
+
+sql select * from diskstrm
+if $rows <= 0 then
+  return -1
+endi
+
+sql select * from bandstrm
+if $rows <= 0 then
+  return -1
+endi
+
+sql select * from reqstrm
+if $rows <= 0 then
+  return -1
+endi
+
+sql select * from iostrm
+if $rows <= 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0a5d5c971649abae07d149f1cc914eb096e638fa
--- /dev/null
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
@@ -0,0 +1,100 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sleep 3000
+
+$db = dytag_db
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== tags_dynamically_specify.sim
+$i = 0
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+
+sql create table stb (ts timestamp, c1 binary(10), c2 int, c3 float) tags (t1 binary(10), t2 int, t3 float)
+
+sql insert into tb1 using stb (t1) tags ('tag1') values ( now + 1s, 'binary1', 1, 1.1)
+sql insert into tb2 using stb (t2) tags (2)      values ( now + 2s, 'binary2', 2, 2.2)
+sql insert into tb3 using stb (t3) tags (3.3)    values ( now + 3s, 'binary3', 3, 3.3)
+
+sql insert into tb4 (ts, c1, c2) using stb (t1, t2) tags ('tag4', 4)   values ( now + 4s, 'binary4', 4)
+sql insert into tb5 (ts, c1, c3) using stb (t1, t3) tags ('tag5', 11.11) values ( now + 5s, 'binary5', 5.5)
+sql insert into tb6 (ts, c1, c3) using stb tags ('tag5', 6, 11.11) values ( now + 5s, 'binary6', 6.6)
+sql insert into tb7 (ts, c1, c2, c3) using stb tags ('tag5', 7, 11.11) values ( now + 5s, 'binary7', 7, 7.7)
+sql select * from stb order by ts asc
+if $rows != 7 then
+  return -1
+endi
+
+sql_error insert into tb11 using stb (t1) tags () values ( now + 1s, 'binary1', 1, 1.1)
+sql_error insert into tb12 using stb (t1, t3) tags () values ( now + 1s, 'binary1', 1, 1.1)
+sql_error insert into tb13 using stb (t1, t2, t3) tags (8, 9.13, 'ac') values ( now + 1s, 'binary1', 1, 1.1)
+sql_error insert into tb14 using stb () tags (2)  values ( now + 2s, 'binary2', 2, 2.2)
+sql_error insert into tb15 using stb (t2, t3) tags (3.3)    values ( now + 3s, 'binary3', 3, 3.3)
+sql_error insert into tb16 (ts, c1, c2) using stb (t1, t2) tags ('tag4', 4)   values ( now + 4s, 'binary4')
+sql_error insert into tb17 (ts, c1, c3) using stb (t1, t3) tags ('tag5', 11.11, 5) values ( now + 5s, 'binary5', 5.5)
+sql_error insert into tb18 (ts, c1, c3) using stb tags ('tag5', 16) values ( now + 5s, 'binary6', 6.6)
+sql_error insert into tb19 (ts, c1, c2, c3) using stb tags (19, 'tag5', 91.11) values ( now + 5s, 'binary7', 7, 7.7)
+
+
+
+sql create table stbx (ts timestamp, c1 binary(10), c2 int, c3 float) tags (t1 binary(10), t2 int, t3 float)
+sql insert into tb100 (ts, c1, c2, c3) using stbx (t1, t2, t3) tags ('tag100', 100, 100.123456) values ( now + 10s, 'binary100', 100, 100.9) tb101 (ts, c1, c2, c3) using stbx (t1, t2, t3) tags ('tag101', 101, 101.9) values ( now + 10s, 'binary101', 101, 101.9) tb102 (ts, c1, c2, c3) using stbx (t1, t2, t3) tags ('tag102', 102, 102.9) values ( now + 10s, 'binary102', 102, 102.9)
+
+sql select * from stbx
+if $rows != 3 then
+  return -1
+endi
+
+if $data04 != tag100 then
+  return -1
+endi
+
+if $data05 != 100 then
+  return -1
+endi
+
+if $data06 != 100.12346 then
+  print "expect: 100.12346, act: $data06"
+  return -1
+endi
+
+sql create table stby (ts timestamp, c1 binary(10), c2 int, c3 float) tags (t1 binary(10), t2 int, t3 float)
+sql reset query cache
+sql insert into tby1 using stby (t1) tags ('tag1') values ( now + 1s, 'binary1', 1, 1.1)
+sql insert into tby2 using stby (t2) tags (2)      values ( now + 2s, 'binary2', 2, 2.2)
+sql insert into tby3 using stby (t3) tags (3.3)    values ( now + 3s, 'binary3', 3, 3.3)
+sql insert into tby4 (ts, c1, c2) using stby (t1, t2) tags ('tag4', 4)   values ( now + 4s, 'binary4', 4)
+sql insert into tby5 (ts, c1, c3) using stby (t1, t3) tags ('tag5', 11.11) values ( now + 5s, 'binary5', 5.5)
+sql insert into tby6 (ts, c1, c3) using stby tags ('tag5', 6, 11.11) values ( now + 5s, 'binary6', 6.6)
+sql insert into tby7 (ts, c1, c2, c3) using stby tags ('tag5', 7, 11.11) values ( now + 5s, 'binary7', 7, 7.7)
+sql select * from stby order by ts asc
+if $rows != 7 then
+  return -1
+endi
+
+sql reset query cache
+sql insert into tby1 using stby (t1) tags ('tag1') values ( now + 1s, 'binary1y', 1, 1.1)
+sql insert into tby2 using stby (t2) tags (2)      values ( now + 2s, 'binary2y', 2, 2.2)
+sql insert into tby3 using stby (t3) tags (3.3)    values ( now + 3s, 'binary3y', 3, 3.3)
+sql insert into tby4 (ts, c1, c2) using stby (t1, t2) tags ('tag4', 4)   values ( now + 4s, 'binary4y', 4)
+sql insert into tby5 (ts, c1, c3) using stby (t1, t3) tags ('tag5', 11.11) values ( now + 5s, 'binary5y', 5.5)
+sql insert into tby6 (ts, c1, c3) using stby tags ('tag5', 6, 11.11) values ( now + 5s, 'binary6y', 6.6)
+sql insert into tby7 (ts, c1, c2, c3) using stby tags ('tag5', 7, 11.11) values ( now + 5s, 'binary7y', 7, 7.7)
+
+sql select * from stby order by ts asc
+if $rows != 14 then
+  return -1
+endi
+
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9842b4fda6304314a36eb06078fb7cb64e2c9c5c
--- /dev/null
+++ b/tests/script/general/parser/tags_filter.sim
@@ -0,0 +1,152 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$db = tf_db
+$tbNum = 10
+$rowNum = 5
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== tags_filter.sim
+$i = 0
+
+sql drop database if exists $db
+sql create database $db
+sql use $db
+##### filter tags that contains special characters
+sql create table stb (ts timestamp, c1 int) tags (t1 binary(10))
+sql create table tb1 using stb tags('*')
+sql create table tb2 using stb tags('%')
+sql create table tb3 using stb tags('')
+sql create table tb4 using stb tags('\'')
+
+sql insert into tb1 values ( $ts0 , 1)
+sql insert into tb2 values ( $ts0 , 2)
+sql insert into tb3 values ( $ts0 , 3)
+sql insert into tb4 values ( $ts0 , 4)
+
+sql select * from stb where t1 = '*'
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select * from stb where t1 = '%'
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 2 then
+  return -1
+endi
+
+sql select * from stb where t1 = ''
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+
+sql select * from stb where t1 = '\''
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+
+sql select * from stb where t1 like '*'
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+sql select * from stb where t1 > '1'
+sql select * from stb where t1 > 'a'
+
+## wildcard '%' 
+#sql select * from stb where t1 like '%'
+#if $rows != 1 then
+#  return -1
+#endi
+#if $data01 != 2 then
+#  return -1
+#endi
+
+sql select * from stb where t1 like ''
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 3 then
+  return -1
+endi
+
+sql select * from stb where t1 like '\''
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 4 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print ============tbase-1328
+
+sql drop database if exists testselectwheretags;
+sql CREATE DATABASE IF NOT EXISTS testselectwheretags;
+sql USE testselectwheretags;
+sql CREATE TABLE IF NOT EXISTS st1 (ts TIMESTAMP, v1 INT, v2 FLOAT, v3 BOOL) TAGS (farm NCHAR(2), period NCHAR(2), line NCHAR(2), unit INT);
+sql CREATE TABLE IF NOT EXISTS a01 USING st1 TAGS ('2', 'c', '2', 2);
+sql CREATE TABLE IF NOT EXISTS a02 USING st1 TAGS ('1', 'c', 'a', 1);
+sql CREATE TABLE IF NOT EXISTS a03 USING st1 TAGS ('1', 'c', '02', 1);
+sql INSERT INTO a01 VALUES (1574872693209, 3, 3.000000, 1);
+sql INSERT INTO a02 VALUES (1574872683933, 2, 2.000000, 1);
+sql INSERT INTO a03 VALUES (1574872683933, 2, 2.000000, 1);
+
+sql select * from st1 where line='02';
+if $rows != 1 then
+  return -1
+endi
+
+sql CREATE TABLE IF NOT EXISTS st2 (ts TIMESTAMP, v1 INT, v2 FLOAT) TAGS (farm BINARY(2), period BINARY(2), line BINARY(2));
+
+sql CREATE TABLE IF NOT EXISTS b01 USING st2 TAGS ('01', '01', '01');
+sql CREATE TABLE IF NOT EXISTS b02 USING st2 TAGS ('01', '01', '01');
+sql CREATE TABLE IF NOT EXISTS b03 USING st2 TAGS ('01', '02', '01');
+sql CREATE TABLE IF NOT EXISTS b04 USING st2 TAGS ('01', '01', '02');
+
+sql INSERT INTO b03 VALUES (1576043322749, 3, 3.000000);
+sql INSERT INTO b03 VALUES (1576043323596, 3, 3.000000);
+
+sql INSERT INTO b02 VALUES (1576043315169, 2, 2.000000);
+sql INSERT INTO b02 VALUES (1576043316295, 2, 2.000000);
+sql INSERT INTO b02 VALUES (1576043317167, 2, 2.000000);
+
+sql INSERT INTO b01 VALUES (1576043305972, 1, 1.000000);
+sql INSERT INTO b01 VALUES (1576043308513, 1, 1.000000);
+
+sql select * from st2 where period='02';
+if $rows != 2 then
+  return -1
+endi
+
+sql select sum(v2) from st2 group by farm,period,line;
+if $rows != 2 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fd5f32972ad9e0d0f89875d1f89d2734fd2cbdd8
--- /dev/null
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -0,0 +1,77 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ti_db
+$tbPrefix = ti_tb
+$stbPrefix = ti_stb
+$tbNum = 2000
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== tbnameIn.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db 
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 smallint, t6 double)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $i1 = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $i1
+  $tgstr = 'tb . $i
+  $tgstr = $tgstr . '
+  $tgstr1 = 'tb . $i1
+  $tgstr1 = $tgstr1 . '
+  sql create table $tb using $stb tags( $i , $tgstr , $tgstr , $i , $i , $i )
+  sql create table $tb1 using $stb tags( $i1 , $tgstr1 , $tgstr1 , $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c 
+    $binary = $binary . '
+    $nchar = 'nchar . $c 
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    $x = $x + 1
+  endw 
+
+  $i = $i + 1
+endw 
+print ====== tables created
+
+run general/parser/tbnameIn_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+
+run general/parser/tbnameIn_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/general/parser/tbnameIn_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..37cc1aa8245a22e698c1d756cfe1eac72fcf3fdb
--- /dev/null
+++ b/tests/script/general/parser/tbnameIn_query.sim
@@ -0,0 +1,433 @@
+sleep 3000
+sql connect
+
+$dbPrefix = ti_db
+$tbPrefix = ti_tb
+$stbPrefix = ti_stb
+$tbNum = 2000
+$rowNum = 10
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ========== tbnameIn_query.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+$tb = $tbPrefix . 0
+print ====== use db
+sql use $db
+
+#### tbname in + other tag filtering
+## [TBASE-362]
+# tbname in + tag filtering is allowed now!!!
+sql select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and t1 > 2
+
+# tbname in used on meter
+sql_error select count(*) from $tb where tbname in ('ti_tb1', 'ti_tb300') 
+
+## tbname in + group by tag
+sql select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') group by t1 order by t1 asc
+if $rows != 2 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data11 != 300 then
+  return -1
+endi
+
+## duplicated tbnames
+sql select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb1', 'ti_tb1', 'ti_tb2', 'ti_tb2', 'ti_tb3') group by t1 order by t1 asc
+if $rows != 3 then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != $rowNum then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+if $data20 != $rowNum then
+  return -1
+endi
+if $data21 != 3 then
+  return -1
+endi
+
+## wrong tbnames
+sql select count(*) from $stb where tbname in ('tbname in', 'ti_tb1', 'ti_stb0') group by t1 order by t1
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 10 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+## tbname in + colummn filtering
+sql select count(*) from $stb where tbname in ('tbname in', 'ti_tb1', 'ti_stb0', 'ti_tb2') and c8 like 'binary%' group by t1 order by t1 asc
+if $rows != 2 then
+  return -1
+endi
+if $data00 != 10 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data10 != 10 then
+  return -1
+endi
+if $data11 != 2 then
+  return -1
+endi
+
+# multiple tbname in is not allowed NOW
+sql_error select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and tbname in ('ti_tb5', 'ti_tb1000') group by t1 order by t1 asc
+#if $rows != 4 then
+#  return -1
+#endi
+#if $data00 != $rowNum then
+#  return -1
+#endi
+#if $data01 != 1 then
+#  return -1
+#endi
+#if $data10 != $rowNum then
+#  return -1
+#endi
+#if $data11 != 5 then
+#  return -1
+#endi
+#if $data20 != $rowNum then
+#  return -1
+#endi
+#if $data21 != 300 then
+#  return -1
+#endi
+#if $data30 != $rowNum then
+#  return -1
+#endi
+#if $data31 != 1000 then
+#  return -1
+#endi
+
+#### aggregation on stb with 6 tags + where + group by + limit offset
+#$val1 = 1
+#$val2 = $tbNum - 1
+#sql select count(*) from $stb where t1 > $val1 and t1 < $val2 group by t1, t2, t3, t4, t5, t6 order by t1 asc limit 1 offset 0
+#$val = $tbNum - 3
+#if $rows != $val then
+#  return -1
+#endi
+#if $data00 != $rowNum then
+#  return -1
+#endi
+#if $data01 != 2 then
+#  return -1
+#endi
+#if $data02 != tb2 then
+#  return -1
+#endi
+#if $data03 != tb2 then
+#  return -1
+#endi
+#if $data04 != 2 then
+#  return -1
+#endi
+#if $data05 != 2 then
+#  return -1
+#endi
+#
+#sql select count(*) from $stb where t2 like '%' and t1 > 2 and t1 < 5 group by t3, t4 order by t3 desc limit 1 offset 0
+#if $rows != 2 then
+#  return -1
+#endi
+#if $data00 != $rowNum then
+#  return -1
+#endi
+#if $data01 != tb4 then
+#  return -1
+#endi
+#if $data02 != 4 then
+#  return -1
+#endi
+#if $data11 != tb3 then
+#  return -1
+#endi
+#if $data12 != 3 then
+#  return -1
+#endi
+#sql select count(*) from $stb where t2 like '%' and t1 > 2 and t1 < 5 group by t3, t4 order by t3 desc limit 1 offset 1
+#if $rows != 0 then
+#  return -1
+#sql_error select count(*) from $stb where t1 like 1
+#
+###### aggregation on tb + where + fill + limit offset
+#sql select max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
+#if $rows != 10 then
+#  return -1
+#endi
+#if $data00 != @18-09-17 09:05:00.000@ then
+#  return -1
+#endi
+#if $data01 != -1 then
+#  return -1
+#endi
+#if $data11 != 1 then
+#  return -1
+#endi
+#if $data90 != @18-09-17 09:50:00.000@ then
+#  return -1
+#endi
+#if $data91 != 5 then
+#  return -1
+#endi
+#
+#$tb5 = $tbPrefix . 5
+#sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4) limit 10 offset 1
+#if $rows != 10 then
+#  return -1
+#endi
+#if $data00 != @18-09-17 09:05:00.000@ then
+#  return -1
+#endi
+#if $data01 != -1 then
+#  return -1
+#endi
+#if $data02 != -2 then
+#  return -1
+#endi
+#if $data11 != 1 then
+#  return -1
+#endi
+#if $data12 != -2 then
+#  return -1
+#endi
+#if $data90 != @18-09-17 09:50:00.000@ then
+#  return -1
+#endi
+#if $data91 != 5 then
+#  return -1
+#endi
+#if $data92 != -2 then
+#  return -1
+#endi
+#
+#### [TBASE-350]
+### tb + interval + fill(value) + limit offset
+#$tb = $tbPrefix . 0
+#$limit = $rowNum
+#$offset = $limit / 2
+#sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit $limit offset $offset
+#if $rows != $limit then
+#  return -1
+#endi
+#if $data01 != 0 then
+#  return -1
+#endi
+#if $data11 != -1 then
+#  return -1
+#endi
+#
+## tb + interval + fill(linear) + limit offset
+#$limit = $rowNum
+#$offset = $limit / 2
+#sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
+#if $rows != $limit then
+#  return -1
+#endi
+#if $data01 != 0 then
+#  return -1
+#endi
+#if $data11 != 0 then
+#  return -1
+#endi
+#if $data13 != 0.500000000 then
+#  return -1
+#endi
+#if $data35 != 0.000000000 then
+#  return -1
+#endi
+#if $data46 != 0.000000000 then
+#  return -1
+#endi
+#if $data47 != true then
+#  return -1
+#endi
+#if $data57 != NULL then
+#  return -1
+#endi
+#if $data68 != binary3 then
+#  return -1
+#endi
+#if $data79 != NULL then
+#  return -1
+#endi
+#
+### tb + interval + fill(prev) + limit offset
+#$limit = $rowNum
+#$offset = $limit / 2
+#sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev) limit $limit offset $offset
+#if $rows != $limit then
+#  return -1
+#endi
+#
+# 
+#$limit = $rowNum
+#$offset = $limit / 2
+#$offset = $offset + 10
+#sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+#if $rows != $limit then
+#  return -1
+#endi
+#if $data01 != 5 then
+#  return -1
+#endi
+#if $data02 != 5 then
+#  return -1
+#endi
+#if $data03 != 5.000000000 then
+#  return -1
+#endi
+#if $data04 != 5.000000000 then
+#  return -1
+#endi
+#if $data05 != 0.000000000 then
+#  return -1
+#endi
+#if $data07 != true then
+#  return -1
+#endi
+#if $data08 != binary5 then
+#  return -1
+#endi
+#if $data09 != nchar5 then
+#  return -1
+#endi
+#if $data18 != NULL then
+#  return -1
+#endi
+#if $data19 != NULL then
+#  return -1
+#endi
+#if $data16 != -2.000000000 then
+#  return -1
+#endi
+#if $data17 != true then
+#  return -1
+#endi
+#if $data11 != -1 then
+#  return -1
+#endi
+#
+#$limit = $rowNum
+#$offset = $limit * 2
+#$offset = $offset - 11
+#sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+#if $rows != 10 then
+#  return -1
+#endi
+#if $data01 != -1 then
+#  return -1
+#endi
+#if $data02 != -2 then
+#  return -1
+#endi
+#if $data11 != 5 then
+#  return -1
+#endi
+#if $data12 != 5 then
+#  return -1
+#endi
+#if $data13 != 5.000000000 then
+#  return -1
+#endi
+#if $data15 != 0.000000000 then
+#  return -1
+#endi
+#if $data16 != 0.000000000 then
+#  return -1
+#endi
+#if $data18 != binary5 then
+#  return -1
+#endi
+#if $data19 != nchar5 then
+#  return -1
+#endi
+#if $data27 != true then
+#  return -1
+#endi
+#if $data38 != NULL then
+#  return -1
+#endi
+#if $data49 != NULL then
+#  return -1
+#endi
+#
+#### [TBASE-350]
+### stb + interval + fill + group by + limit offset
+#sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10
+#if $rows != 20 then
+#  return -1
+#endi
+#
+#$limit = 5
+#$offset = $rowNum * 2
+#$offset = $offset - 2
+#sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 order by t1 limit $limit offset $offset
+#if $rows != $tbNum then
+#  return -1
+#endi 
+#if $data00 != @18-11-25 19:30:00.000@ then
+#  return -1
+#endi
+#if $data01 != 9 then
+#  return -1
+#endi
+#if $data12 != -2 then
+#  return -1
+#endi
+#if $data23 != 9.000000000 then
+#  return -1
+#endi
+#if $data34 != -2.000000000 then
+#  return -1
+#endi
+#if $data45 != true then
+#  return -1
+#endi
+#if $data56 != binary9 then
+#  return -1
+#endi
+#if $data68 != 3 then
+#  return -1
+#endi
+#if $data72 != 9 then
+#  return -1
+#endi
+#if $data84 != 9.000000000 then
+#  return -1
+#endi
+#if $data98 != 0 then
+#  return -1
+#endi
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3dd80b8e38c8144fee218ec372e59fe262ac7a15
--- /dev/null
+++ b/tests/script/general/parser/testSuite.sim
@@ -0,0 +1,113 @@
+sleep 2000
+run general/parser/alter.sim
+sleep 2000
+run general/parser/alter1.sim
+sleep 2000
+run general/parser/alter_stable.sim
+sleep 2000
+run general/parser/auto_create_tb.sim
+sleep 2000
+run general/parser/auto_create_tb_drop_tb.sim
+sleep 2000
+run general/parser/col_arithmetic_operation.sim
+sleep 2000
+run general/parser/columnValue.sim
+sleep 2000
+run general/parser/commit.sim
+sleep 2000
+run general/parser/create_db.sim
+sleep 2000
+run general/parser/create_mt.sim
+sleep 2000
+run general/parser/create_tb.sim
+sleep 2000
+run general/parser/dbtbnameValidate.sim
+sleep 2000
+run general/parser/fill.sim
+sleep 2000
+run general/parser/fill_stb.sim
+sleep 2000
+#run general/parser/fill_us.sim               #
+sleep 2000
+run general/parser/first_last.sim
+sleep 2000
+run general/parser/import_commit1.sim
+sleep 2000
+run general/parser/import_commit2.sim
+sleep 2000
+run general/parser/import_commit3.sim
+sleep 2000
+#run general/parser/import_file.sim
+sleep 2000
+run general/parser/insert_tb.sim
+sleep 2000
+run general/parser/tags_dynamically_specifiy.sim
+sleep 2000
+run general/parser/interp.sim
+sleep 2000
+run general/parser/lastrow.sim
+sleep 2000
+run general/parser/limit.sim
+sleep 2000
+run general/parser/limit1.sim
+sleep 2000
+run general/parser/limit1_tblocks100.sim
+sleep 2000
+run general/parser/limit2.sim
+sleep 2000
+run general/parser/mixed_blocks.sim
+sleep 2000
+run general/parser/nchar.sim
+sleep 2000
+run general/parser/null_char.sim
+sleep 2000
+run general/parser/selectResNum.sim
+sleep 2000
+run general/parser/select_across_vnodes.sim
+sleep 2000
+run general/parser/select_from_cache_disk.sim
+sleep 2000
+run general/parser/set_tag_vals.sim
+sleep 2000
+run general/parser/single_row_in_tb.sim
+sleep 2000
+run general/parser/slimit.sim
+sleep 2000
+run general/parser/slimit1.sim
+sleep 2000
+run general/parser/slimit_alter_tags.sim
+sleep 2000
+run general/parser/tbnameIn.sim
+sleep 2000
+run general/parser/slimit_alter_tags.sim  # persistent failed
+sleep 2000
+run general/parser/join.sim
+sleep 2000
+run general/parser/join_multivnode.sim
+sleep 2000
+run general/parser/projection_limit_offset.sim
+sleep 2000
+run general/parser/select_with_tags.sim
+sleep 2000
+run general/parser/groupby.sim
+sleep 2000
+run general/parser/tags_filter.sim
+sleep 2000
+run general/parser/topbot.sim
+sleep 2000
+run general/parser/union.sim
+sleep 2000
+run general/parser/constCol.sim
+sleep 2000
+run general/parser/where.sim
+sleep 2000
+run general/parser/timestamp.sim
+sleep 2000
+run general/parser/sliding.sim
+
+#sleep 2000
+#run general/parser/repeatStream.sim
+#sleep 2000
+#run general/parser/stream_on_sys.sim
+#sleep 2000
+#run general/parser/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
new file mode 100644
index 0000000000000000000000000000000000000000..67da0f08698a29582212400f8b189e26d1446ed8
--- /dev/null
+++ b/tests/script/general/parser/timestamp.sim
@@ -0,0 +1,68 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$dbPrefix = ts_db
+$tbPrefix = ts_tb
+$stbPrefix = ts_stb
+$tbNum = 10
+$rowNum = 300
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== timestamp.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database if exists $db
+sql create database $db maxrows 200
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  $t1 = ' . $tb
+  $t1 = $t1 . '
+  sql create table $tb using $stb tags( $t1 )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = binary . $c
+    $nchar = '涛思nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $ts , $c ) 
+    $x = $x + 1
+  endw 
+  $ts = $ts + $delta
+  sql insert into $tb values ( $ts , NULL, NULL )
+  $i = $i + 1
+endw
+print ====== $db tables created
+  
+run general/parser/timestamp_query.sim
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 3000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 3000
+
+run general/parser/timestamp_query.sim
diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/general/parser/timestamp_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..783c03602b983bf0faea25db28d1ac1ce29d80b7
--- /dev/null
+++ b/tests/script/general/parser/timestamp_query.sim
@@ -0,0 +1,54 @@
+sleep 3000
+sql connect
+
+$dbPrefix = ts_db
+$tbPrefix = ts_tb
+$stbPrefix = ts_stb
+$tbNum = 10
+$rowNum = 300
+$totalNum = $tbNum * $rowNum
+$ts0 = 1537146000000
+$delta = 600000
+print ========== timestamp_query.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+print ====== use db
+sql use $db
+
+$tsu = $rowNum * $delta
+$tsu = $tsu - $delta
+$tsu = $tsu + $ts0
+
+print ==================>issue #3481, normal column not allowed,
+sql_error select ts,c1,min(c2) from ts_stb0
+
+
+##### select from supertable
+$tb = $tbPrefix . 0
+sql select first(c1), last(c1), (1537325400 - 1537146000)/(5*60) v from $tb where ts >= $ts0 and ts < $tsu interval(5m) fill(value, -1)
+$res = $rowNum * 2
+$n = $res - 2
+print ============>$n
+if $rows != $n then
+  print expect $n, actual $rows
+  return -1
+endi
+
+if $data03 != 598.000000000 then
+  print expect 598.000000000, actual $data03
+  return -1
+endi
+
+
+if $data13 != 598.000000000 then
+  print expect 598.000000000, actual $data03
+  return -1
+endi
+
+sql select first(c1), last(c1), (1537325400 - 1537146000)/(5*60) v from $tb where ts >= $ts0 and ts < $tsu interval(5m) fill(value, NULL)
+if $data13 != 598.000000000 then
+  print expect 598.000000000, actual $data03
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5c575b61633d77521ef0c8b51b6e46aaf84447aa
--- /dev/null
+++ b/tests/script/general/parser/topbot.sim
@@ -0,0 +1,216 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
+
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = tb_db
+$tbPrefix = tb_tb
+$stbPrefix = tb_stb
+$tbNum = 10
+$rowNum = 1000
+$totalNum = $tbNum * $rowNum
+$loops = 200000
+$log = 10000
+$ts0 = 1537146000000
+$delta = 600000
+print ========== topbot.sim
+$i = 0
+$db = $dbPrefix . $i
+$stb = $stbPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db cache 16 maxrows 4096 keep 36500
+print ====== create tables
+sql use $db
+sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
+
+$i = 0
+$ts = $ts0
+$halfNum = $tbNum / 2
+while $i < $halfNum
+  $tbId = $i + $halfNum
+  $tb = $tbPrefix . $i
+  $tb1 = $tbPrefix . $tbId
+  sql create table $tb using $stb tags( $i )
+  sql create table $tb1 using $stb tags( $tbId )
+
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    $c = $x / 10
+    $c = $c * 10
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
+    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+print ====== tables created
+
+sql use $db
+##### select from table
+print ====== select top/bot from table and check num of rows returned
+sql select top(c1, 100) from tb_stb0
+if $row != 100 then
+  return -1
+endi
+
+sql select bottom(c1, 100) from tb_stb0
+if $row != 100 then
+  return -1
+endi
+
+sql select last(*) from tb_tb9
+if $row != 1 then
+  return -1
+endi
+
+sql select last(c2) from tb_tb9
+if $row != 0 then
+  return -1
+endi
+
+sql select first(c2), last(c2) from tb_tb9
+if $row != 0 then
+  return -1
+endi
+
+sql create table test(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double, col7 bool, col8 binary(20), col9 nchar(20)) tags(loc nchar(20));
+sql create table test1 using test tags('beijing');
+sql insert into test1 values(1537146000000, 1, 1, 1, 1, 0.100000, 0.100000, 0, 'taosdata1', '涛思数据1');
+sql insert into test1 values(1537146000001, 2, 2, 2, 2, 1.100000, 1.100000, 1, 'taosdata2', '涛思数据2');
+sql insert into test1 values(1537146000002, 3, 3, 3, 3, 2.100000, 2.100000, 0, 'taosdata3', '涛思数据3');
+sql insert into test1 values(1537146000003, 4, 4, 4, 4, 3.100000, 3.100000, 1, 'taosdata4', '涛思数据4');
+sql insert into test1 values(1537146000004, 5, 5, 5, 5, 4.100000, 4.100000, 0, 'taosdata5', '涛思数据5');
+sql insert into test1 values(1537146000005, 6, 6, 6, 6, 5.100000, 5.100000, 1, 'taosdata6', '涛思数据6');
+sql insert into test1 values(1537146000006, 7, 7, 7, 7, 6.100000, 6.100000, 0, 'taosdata7', '涛思数据7');
+sql insert into test1 values(1537146000007, 8, 8, 8, 8, 7.100000, 7.100000, 1, 'taosdata8', '涛思数据8');
+sql insert into test1 values(1537146000008, 9, 9, 9, 9, 8.100000, 8.100000, 0, 'taosdata9', '涛思数据9');
+sql insert into test1 values(1537146000009, 10, 10, 10, 10, 9.100000, 9.100000, 1, 'taosdata10', '涛思数据10');
+sql select bottom(col5, 10) from test
+if $rows != 10 then
+  return -1
+endi
+
+if $data01 != 0.10000 then
+  print expect 0.10000 actual: $data01
+  return -1
+endi
+
+if $data11 != 1.10000 then
+  print expect 1.10000 actual: $data11
+  return -1
+endi
+
+if $data21 != 2.10000 then
+  print expect 2.10000 actual: $data21
+  return -1
+endi
+
+print =====================td-1302 case
+sql create database t1 keep 36500;
+sql use t1;
+sql create table test(ts timestamp, k int);
+sql insert into test values(29999, 1)(70000, 2)(80000, 3)
+
+print ================== restart server to commit data into disk
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print ================== server restart completed
+sql connect
+sleep 1000
+
+sql select count(*) from t1.test where ts>10000 and ts<90000 interval(5000a)
+if $rows != 3 then
+ return -1
+endi
+
+print ==============>td-1308
+sql create database db keep 36500;
+sql use db;
+
+sql create table stb (ts timestamp, c1 int, c2 binary(10)) tags(t1 binary(10));
+sql create table tb1 using stb tags('a1');
+
+sql insert into tb1 values('2020-09-03 15:30:48.812', 0, 'tb1');
+sql select count(*) from stb where ts > '2020-09-03 15:30:44' interval(4s);
+if $rows != 1 then
+  return -1
+endi
+
+sql create table tb4 using stb tags('a4');
+sql select count(*) from stb where ts > '2020-09-03 15:30:44' interval(4s);
+if $rows != 1 then
+  return -1
+endi
+
+print =======================>td-1446
+sql create table t(ts timestamp, k int)
+$ts = 6000
+while $ts < 7000
+  sql insert into t values ( $ts , $ts )
+  $ts = $ts + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 1000
+sql use db;
+
+$ts = 1000
+while $ts < 5096
+  sql insert into t values ( $ts , $ts )
+  $ts = $ts + 1
+endw
+
+sql select * from t where ts < 6500
+if $rows != 4596 then
+  print expect 4596, actual: $rows
+  return -1
+endi
+
+sql select * from t where ts < 7000
+if $rows != 5096 then
+  return -1
+endi
+
+sql select * from t where ts <= 6000
+if $rows != 4097 then
+  return -1
+endi
+
+sql select * from t where ts <= 6001
+if $rows != 4098 then
+  return -1
+endi
+
+print ======================>td-1454
+sql select count(*)/10, count(*)+99 from t
+if $rows != 1  then
+  return -1
+endi
+
+if $data00 != 509.600000000 then
+  return -1
+endi
+
+if $data01 != 5195.000000000 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/union.sim b/tests/script/general/parser/union.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9e178537a291a3ccd4ab93b9ae03a25e7e619faa
--- /dev/null
+++ b/tests/script/general/parser/union.sim
@@ -0,0 +1,421 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c debugFlag -v 135
+system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+sql connect
+
+$dbPrefix = union_db
+$tbPrefix = union_tb
+$tbPrefix1 = union_tb_
+$mtPrefix = union_mt
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+
+print =============== union.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+$j = 1
+
+$mt1 = $mtPrefix . $j
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
+
+$i = 0
+$t = 1578203484000
+
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x * 1000
+    $ms = $ms * 60
+
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+
+    $t1 = $t + $ms
+    sql insert into $tb values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+sql create table $mt1 (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
+
+$j = 0
+$t = 1578203484000
+$rowNum = 1000
+$tbNum = 5
+$i = 0
+
+while $i < $tbNum
+  $tb1 = $tbPrefix1 . $j
+  sql create table $tb1 using $mt1 tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x * 1000
+    $ms = $ms * 60
+
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+
+    $t1 = $t + $ms
+    sql insert into $tb1 values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+  $j = $j + 1
+endw
+
+print sleep 1sec.
+sleep 1000
+
+$i = 1
+$tb = $tbPrefix . $i
+
+## column type not identical
+sql_error select count(*) as a from union_mt0 union all select avg(c1) as a from union_mt0
+sql_error select count(*) as a from union_mt0 union all select spread(c1) as a from union_mt0;
+
+## union not supported
+sql_error (select count(*) from union_mt0) union (select count(*) from union_mt0);
+
+## column type not identical
+sql_error select c1 from union_mt0 limit 10 union all select c2 from union_tb1 limit 20;
+
+## union not support recursively union
+sql_error select c1 from union_tb0 limit 2 union all (select c1 from union_tb1 limit 1 union all select c1 from union_tb3 limit 2);
+sql_error (select c1 from union_tb0 limit 1 union all select c1 from union_tb1 limit 1) union all (select c1 from union_tb0 limit 10 union all select c1 from union_tb1 limit 10);
+
+# union as subclause
+sql_error (select c1 from union_tb0 limit 1 union all select c1 from union_tb1 limit 1) limit 1
+
+# sql with parenthese
+sql (((select c1 from union_tb0)))
+if $rows != 10000 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+# mixed order
+sql select ts, c1 from union_tb1 order by ts asc limit 10 union all select ts, c1 from union_tb0 order by ts desc limit 2 union all select ts, c1 from union_tb2 order by ts asc limit 10
+if $rows != 22 then
+  return -1
+endi
+
+if $data00 != @20-01-05 13:51:24.000@ then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != @20-01-05 13:52:24.000@ then
+  return -1
+endi
+
+if $data11 != 1 then
+  return -1
+endi
+
+if $data90 != @20-01-05 14:00:24.000@ then
+  return -1
+endi
+
+if $data91 != 9 then
+  return -1
+endi
+
+# different sort order
+
+# super table & normal table mixed up
+sql select c3 from union_tb0 limit 2 union all select sum(c1) as c3 from union_mt0;
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+if $data20 != 4950000 then
+  return -1
+endi
+
+# type compatible
+sql select c3 from union_tb0 limit 2 union all select sum(c1) as c3 from union_tb1;
+if $rows != 3 then
+ return -1
+endi
+
+if $data00 != 0 then
+   return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+if $data20 != 495000 then
+  return -1
+endi
+
+# two join subclause
+sql select count(*) as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts union all select union_tb0.c3 as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts limit 10
+if $rows != 11 then
+  return -1
+endi
+
+if $data00 != 10000 then
+  return -1
+endi
+
+if $data10 != 0 then
+  return -1
+endi
+
+if $data20 != 1 then
+  return -1
+endi
+
+if $data90 != 8 then
+ return -1
+endi
+
+print ===========================================tags union
+# two super table tag union, limit is not active during retrieve tags query
+sql select t1 from union_mt0 union all select t1 from union_mt0
+if $rows != 20 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data90 != 9 then
+  return -1
+endi
+
+#sql select t1 from union_mt0 union all select t1 from union_mt0 limit 1
+#if $row != 11 then
+#  return -1
+#endi
+#========================================== two super table join subclause
+print ================two super table join subclause
+sql select avg(union_mt0.c1) as c from union_mt0 interval(1h) limit 10 union all select union_mt1.ts, union_mt1.c1/1.0 as c from union_mt0, union_mt1 where union_mt1.ts=union_mt0.ts and union_mt1.t1=union_mt0.t1 limit 5;
+print the rows value is: $rows
+
+if $rows != 15 then
+  return -1
+endi
+
+# first subclause are empty
+sql select count(*) as c from union_tb0 where ts>now+10y union all select sum(c1) as c from union_tb1;
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 495000 then
+  return -1
+endi
+
+# all subclause are empty
+sql select c1 from union_tb0 limit 0 union all select c1 from union_tb1 where ts>'2021-1-1 0:0:0'
+if $rows != 0 then
+  return -1
+endi
+
+# middle subclause empty
+sql select c1 from union_tb0 limit 1 union all select c1 from union_tb1 where ts>'2030-1-1 0:0:0' union all select last(c1) as c1 from union_tb1;
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data10 != 99 then
+  return -1
+endi
+
+# multi-vnode projection query
+sql (select c1 from union_mt0) union all select c1 from union_mt0;
+if $rows != 200000 then
+ return -1
+endi
+
+# multi-vnode projection query + limit
+sql (select ts, c1 from union_mt0 limit 1) union all (select ts, c1 from union_mt0 limit 1);
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != @20-01-05 13:51:24.000@ then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != @20-01-05 13:51:24.000@ then
+  return -1
+endi
+
+if $data11 != 0 then
+  return -1
+endi
+
+# two aggregated functions for super tables
+sql select sum(c1) as a from union_mt0 interval(1s) limit 9 union all select ts, max(c3) as a from union_mt0 limit 2;
+if $rows != 10 then
+  return -1
+endi
+
+if $data00 != @20-01-05 13:51:24.000@ then
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != @20-01-05 13:52:24.000@ then
+  return -1
+endi
+
+if $data11 != 10 then
+  return -1
+endi
+
+if $data20 != @20-01-05 13:53:24.000@ then
+  return -1
+endi
+
+if $data21 != 20 then
+  return -1
+endi
+
+if $data90 != @20-01-05 15:30:24.000@ then
+  return -1
+endi
+
+if $data91 != 99 then
+  return -1
+endi
+
+#1111111111111111111111111111111111111111111111111
+# two aggregated functions for normal tables
+sql select sum(c1) as a from union_tb0 limit 1 union all select sum(c3) as a from union_tb1 limit 2;
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != 495000 then
+  return -1
+endi
+
+if $data10 != 495000 then
+  return -1
+endi
+
+# two super table query + interval + limit
+sql select ts, first(c3) as a from union_mt0 limit 1 union all select sum(c3) as a from union_mt0 interval(1h) limit 1;
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != @20-01-05 13:51:24.000@ then
+ return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+if $data10 != @20-01-05 13:00:00.000@ then
+ return -1
+endi
+
+if $data11 != 360 then
+  return -1
+endi
+
+sql select server_status() union all select server_status()
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+sql select client_version() union all select server_version()
+if $rows != 2 then
+  return -1
+endi
+
+sql select database() union all select database()
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != @union_db0@ then
+  return -1
+endi
+
+if $data10 != @union_db0@ then
+  return -1
+endi
+
+sql_error show tables union all show tables
+sql_error show stables union all show stables
+sql_error show databases union all show databases
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f9fd919bd6c5a424ddcac52a0d00b142168702e9
--- /dev/null
+++ b/tests/script/general/parser/where.sim
@@ -0,0 +1,333 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = wh_db
+$tbPrefix = wh_tb
+$mtPrefix = wh_mt
+$tbNum = 10
+$rowNum = 10000
+$totalNum = $tbNum * $rowNum
+
+print =============== where.sim
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database if exits $db -x step1
+step1:
+sql create database if not exists $db 
+sql use $db
+sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values (now + $ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+sleep 100
+
+$i = 1
+$tb = $tbPrefix . $i
+
+##
+sql_error select * from $tb where c7
+
+# TBASE-654 : invalid filter expression cause server crashed
+sql_error select count(*) from $tb where c1<10 and c1<>2
+
+sql select * from $tb where c7 = false
+$val = $rowNum / 100
+if $rows != $val then
+  return -1
+endi
+sql select * from $mt where c7 = false
+$val = $totalNum / 100
+if $rows != $val then
+  return -1
+endi
+
+sql select tbname from $mt
+if $rows != $tbNum then
+  return -1
+endi
+
+sql select tbname from $mt where t1 < 2
+if $rows != 2 then
+  return -1
+endi
+
+print $tbPrefix
+$tb = $tbPrefix . 0
+if $data00 != wh_tb1 then
+  print expect wh_tb1, actual:$data00
+  return -1
+endi
+$tb = $tbPrefix . 1
+if $data10 != wh_tb0 then
+  print expect wh_tb0, actual:$data00
+  return -1
+endi
+
+## select specified columns
+
+sql select c1 from $mt
+if $rows != $totalNum then
+  return -1
+endi
+sql select count(c1) from $mt
+if $data00 != $totalNum then
+  return -1
+endi
+
+sql select c1 from $mt where c1 >= 0
+if $rows != $totalNum then
+  return -1
+endi
+sql select count(c1) from $mt where c1 <> -1
+if $data00 != $totalNum then
+  return -1
+endi
+sql select count(c1) from $mt where c1 <> -1 group by t1
+if $rows != $tbNum then
+  return -1
+endi
+if $data00 != $rowNum then
+  return -1
+endi
+
+
+## like
+sql_error select * from $mt where c1 like 1
+#sql_error select * from $mt where t1 like 1
+
+## [TBASE-593]
+sql create table wh_mt1 (ts timestamp, c1 smallint, c2 int, c3 bigint, c4 float, c5 double, c6 tinyint, c7 binary(10), c8 nchar(10), c9 bool, c10 timestamp) tags (t1 binary(10), t2 smallint, t3 int, t4 bigint, t5 float, t6 double)
+sql create table wh_mt1_tb1 using wh_mt1 tags ('tb11', 1, 1, 1, 1, 1)
+sql insert into wh_mt1_tb1 values (now, 1, 1, 1, 1, 1, 1, 'binary', 'nchar', true, '2019-01-01 00:00:00.000')
+sql_error select last(*) from wh_mt1 where c1 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c1 in ('1')
+sql_error select last(*) from wh_mt1 where c2 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c2 in ('1')
+sql_error select last(*) from wh_mt1 where c3 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c3 in ('1')
+sql_error select last(*) from wh_mt1 where c4 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c4 in ('1')
+sql_error select last(*) from wh_mt1 where c5 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c5 in ('1')
+sql_error select last(*) from wh_mt1 where c6 in ('1')
+sql_error select last(*) from wh_mt1_tb1 where c6 in ('1')
+sql_error select last(*) from wh_mt1 where c7 in ('binary')
+sql_error select last(*) from wh_mt1_tb1 where c7 in ('binary')
+sql_error select last(*) from wh_mt1 where c8 in ('nchar')
+sql_error select last(*) from wh_mt1_tb1 where c9 in (true, false)
+sql_error select last(*) from wh_mt1 where c10 in ('2019-01-01 00:00:00.000')
+sql_error select last(*) from wh_mt1_tb1 where c10 in ('2019-01-01 00:00:00.000')
+sql_error select last(*) from wh_mt1 where t1 in ('binary')
+sql_error select last(*) from wh_mt1 where t2 in (1)
+sql_error select last(*) from wh_mt1 where t3 in (1)
+sql_error select last(*) from wh_mt1 where t4 in (1)
+sql_error select last(*) from wh_mt1 where t5 in (1)
+sql_error select last(*) from wh_mt1 where t6 in (1)
+sql select last(*) from wh_mt1 where c1 = 1
+if $rows != 1 then
+  return -1
+endi
+
+## [TBASE-597]
+sql create table wh_mt2 (ts timestamp, c1 timestamp, c2 binary(10), c3 nchar(10)) tags (t1 binary(10))
+sql create table wh_mt2_tb1 using wh_mt2 tags ('wh_mt2_tb1')
+
+# 2019-01-01 00:00:00.000     1546272000000
+# 2019-01-01 00:10:00.000     1546272600000
+# 2019-01-01 09:00:00.000     1546304400000
+# 2019-01-01 09:10:00.000     1546305000000
+sql insert into wh_mt2_tb1 values ('2019-01-01 00:00:00.000', '2019-01-01 09:00:00.000', 'binary10', 'nchar10') 
+sql insert into wh_mt2_tb1 values ('2019-01-01 00:10:00.000', '2019-01-01 09:10:00.000', 'binary10', 'nchar10') 
+sql select * from wh_mt2_tb1 where c1 > 1546304400000
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @19-01-01 00:10:00.000@ then
+  return -1
+endi
+if $data01 != @19-01-01 09:10:00.000@ then
+  return -1
+endi
+
+sql select * from wh_mt2_tb1 where c1 > '2019-01-01 09:00:00.000'
+if $rows != 1 then
+  return -1
+endi
+if $data00 != @19-01-01 00:10:00.000@ then
+  return -1
+endi
+if $data01 != @19-01-01 09:10:00.000@ then
+  return -1
+endi
+
+sql select * from wh_mt2_tb1 where c1 > 1546304400000 and ts < '2019-01-01 00:10:00.000'
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from wh_mt2_tb1 where c1 > '2019-01-01 09:00:00.000' and ts < '2019-01-01 00:10:00.000'
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from wh_mt2_tb1 where c1 >= 1546304400000 and c1 <= '2019-01-01 09:10:00.000'
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @19-01-01 00:00:00.000@ then
+  return -1
+endi
+if $data01 != @19-01-01 09:00:00.000@ then
+  return -1
+endi
+if $data10 != @19-01-01 00:10:00.000@ then
+  return -1
+endi
+if $data11 != @19-01-01 09:10:00.000@ then
+  return -1
+endi
+
+sql select * from wh_mt2_tb1 where c1 >= '2019-01-01 09:00:00.000' and c1 <= '2019-01-01 09:10:00.000'
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @19-01-01 00:00:00.000@ then
+  return -1
+endi
+if $data01 != @19-01-01 09:00:00.000@ then
+  return -1
+endi
+if $data10 != @19-01-01 00:10:00.000@ then
+  return -1
+endi
+if $data11 != @19-01-01 09:10:00.000@ then
+  return -1
+endi
+
+sql create table tb_where_NULL (ts timestamp, c1 float, c2 binary(10))
+sql insert into tb_where_NULL values ('2019-01-01 09:00:00.000', 1, 'val1')
+sql insert into tb_where_NULL values ('2019-01-01 09:00:01.000', NULL, NULL)
+sql insert into tb_where_NULL values ('2019-01-01 09:00:02.000', 2, 'val2')
+sql_error select * from tb_where_NULL where c1 = NULL
+sql_error select * from tb_where_NULL where c1 <> NULL
+sql_error select * from tb_where_NULL where c1 < NULL
+sql select * from tb_where_NULL where c1 = "NULL"
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from tb_where_NULL where c1 <> "NULL"
+if $rows != 2 then
+  return -1
+endi
+sql select * from tb_where_NULL where c1 <> "nulL"
+if $rows != 2 then
+  return -1
+endi
+
+sql select * from tb_where_NULL where c1 > "NULL"
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from tb_where_NULL where c1 >= "NULL"
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from tb_where_NULL where c2 = "NULL"
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from tb_where_NULL where c2 <> "NULL"
+if $rows != 2 then
+  return -1
+endi
+sql select * from tb_where_NULL where c2 <> "nUll"
+if $rows != 2 then
+  return -1
+endi
+
+print ==========tbase-1363
+#sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
+
+$i = 0
+while $i < 1
+  $tb = test_null_filter
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < 10000
+    $ms = $x . m
+    $c = $x / 100
+    $c = $c * 100
+    $c = $x - $c
+    $binary = 'binary . $c
+    $binary = $binary . '
+    $nchar = 'nchar . $c
+    $nchar = $nchar . '
+    sql insert into $tb values (now + $ms , null , null , null , null , null , null , null , null , null )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 2000
+
+system sh/exec.sh -n dnode1 -s start
+
+sql_error select * from wh_mt0 where c3 = 'abc' and tbname in ('test_null_filter');
+
+sql select * from wh_mt0 where c3 = '1' and tbname in ('test_null_filter');
+if $row != 0 then
+  return -1
+endi
+
+sql select * from wh_mt0 where c3 = '1';
+if $row == 0 then
+  return -1
+endi
+
+sql select * from wh_mt0 where c3 is null and tbname in ('test_null_filter');
+if $rows != 10000 then
+  return -1
+endi
+
+sql select * from wh_mt0 where c3 is not null and tbname in ('test_null_filter');
+if $rows != 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/disk.sim b/tests/script/general/stable/disk.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a67ef6d79097706f90c4a2eb229d5329d785e24c
--- /dev/null
+++ b/tests/script/general/stable/disk.sim
@@ -0,0 +1,199 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = d_db
+$tbPrefix = d_tb
+$mtPrefix = d_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sql select count(*) from $mt
+print select count(*) from $mt ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sleep 1000
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 6000
+
+sql use $db
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print select count(*) from $mt ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print select count(tbcol) as b from $mt interval(1m) ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data02
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+print select count(tbcol) as b from $mt group by tgcol
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/dnode3.sim b/tests/script/general/stable/dnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2859f644bb883483385fdf2421b0996a4416b9e6
--- /dev/null
+++ b/tests/script/general/stable/dnode3.sim
@@ -0,0 +1,212 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+if $data4_3 == offline then
+  goto createDnode
+endi  
+if $data4_4 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = r3v3_db
+$tbPrefix = r3v3_tb
+$mtPrefix = r3v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+print select count(*) from $mt
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/metrics.sim b/tests/script/general/stable/metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b94c76429dcae6dbd39d80beab03b4a5bc8b401f
--- /dev/null
+++ b/tests/script/general/stable/metrics.sim
@@ -0,0 +1,136 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_me_db
+$tbPrefix = m_me_tb
+$mtPrefix = m_me_mt
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+
+sql create table $mt (ts timestamp, speed int) TAGS(sp int)
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step2
+sql drop table $mt
+sql show stables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table $mt (ts timestamp, speed int) TAGS(sp int)
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $mt then 
+  return -1
+endi
+if $data04 != 0 then 
+  return -1
+endi
+sql select * from $mt
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+$i = 0
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(1)
+$i = 1 
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(2)
+$i = 2 
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(3)
+
+sql show tables
+if $rows != 3 then 
+  return -1
+endi
+if $data03 != $mt then 
+  return -1
+endi
+
+sql show stables
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != $mt then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+print =============== step5
+$i = 0
+$tb = $tbPrefix . $i
+sql insert into $tb values (now + 1m , 1 ) 
+$i = 1
+$tb = $tbPrefix . $i
+sql insert into $tb values (now + 1m , 1 ) 
+$i = 2
+$tb = $tbPrefix . $i
+sql insert into $tb values (now + 1m , 1 ) 
+
+print sleep 8000
+sleep 8000
+
+print =============== step6
+
+sql select * from $mt
+print select * from $mt ==> $rows $data00
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where sp = 1
+print select * from $mt where sp = 1 ==> $rows $data00
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step8
+sql drop table $mt
+
+print =============== step9
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+sql show stables
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/refcount.sim b/tests/script/general/stable/refcount.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5fe95dde9fdf8bd8820b067f0fc30d01b5e89f80
--- /dev/null
+++ b/tests/script/general/stable/refcount.sim
@@ -0,0 +1,131 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql create database d1;
+sql use d1;
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d1.t2 (ts timestamp, i int);
+sql create table d1.t3 (ts timestamp, i int);
+sql insert into d1.t1 values(now, 1);
+sql insert into d1.t2 values(now, 1);
+sql drop table d1.t1;
+sql drop database d1;
+
+sql show databases;
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create database d2;
+sql use d2;
+sql create table d2.t1 (ts timestamp, i int);
+sql create table d2.t2 (ts timestamp, i int);
+sql create table d2.t3 (ts timestamp, i int);
+sql insert into d2.t1 values(now, 1);
+sql insert into d2.t2 values(now, 1);
+sql drop table d2.t1;
+sql drop table d2.t2;
+sql drop table d2.t3;
+
+sql show d2.tables;
+if $rows != 0 then 
+  return -1
+endi
+
+sql show d2.vgroups;
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database d2;
+
+sql show databases;
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create database d3;
+sql use d3;
+sql create table d3.st (ts timestamp, i int) tags (j int);
+sql create table d3.t1 using d3.st tags(1);
+sql create table d3.t2 using d3.st tags(1);
+sql create table d3.t3 using d3.st tags(1);
+sql insert into d3.t1 values(now, 1);
+sql drop table d3.t1;
+sql drop table d3.t2;
+sql drop table d3.t3;
+
+sql show d3.tables;
+if $rows != 0 then 
+  return -1
+endi
+
+sql show d3.vgroups;
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database d3;
+
+sql show databases;
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create database d4;
+sql use d4;
+sql create table d4.st (ts timestamp, i int) tags (j int);
+sql create table d4.t1 using d4.st tags(1);
+sql create table d4.t2 using d4.st tags(1);
+sql create table d4.t3 using d4.st tags(1);
+sql insert into d4.t1 values(now, 1);
+sql drop table d4.t1;
+sql drop table d4.st;
+
+sql show d4.tables;
+if $rows != 0 then 
+  return -1
+endi
+
+sql show d4.stables;
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database d4;
+
+sql show databases;
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create database d5;
+sql use d5;
+sql create table d5.st (ts timestamp, i int) tags (j int);
+sql create table d5.t1 using d5.st tags(1);
+sql create table d5.t2 using d5.st tags(1);
+sql create table d5.t3 using d5.st tags(1);
+sql insert into d5.t1 values(now, 1);
+sql drop table d5.t1;
+
+sql drop database d5;
+
+sql show databases;
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/show.sim b/tests/script/general/stable/show.sim
new file mode 100644
index 0000000000000000000000000000000000000000..66755edea73f30a3d3ecfc2dc090f0588dc21947
--- /dev/null
+++ b/tests/script/general/stable/show.sim
@@ -0,0 +1,48 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== create stable
+
+sql create database d1
+
+$x = 0
+while $x < 128
+  $tb = d1.s . $x
+  sql create table $tb (ts timestamp, i int) tags (j int)
+  $x = $x + 1
+endw 
+
+print ======================== show stables
+
+sql show d1.stables
+
+print num of stables is $rows
+if $rows != 128 then 
+  return -1
+endi
+
+print ======================== create table
+
+$x = 0
+while $x < 424
+  $tb = d1.t . $x
+  sql create table $tb using d1.s0 tags( $x )
+  $x = $x + 1
+endw 
+
+print ======================== show stables
+
+sql show d1.tables
+
+print num of tables is $rows
+if $rows != 424 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/testSuite.sim b/tests/script/general/stable/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e786ac9ca4d1b3e8aea7cec9625fe2fd1481377b
--- /dev/null
+++ b/tests/script/general/stable/testSuite.sim
@@ -0,0 +1,5 @@
+run general/stable/disk.sim
+run general/stable/dnode3.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
diff --git a/tests/script/general/stable/values.sim b/tests/script/general/stable/values.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d0c178385103f8fb719ed8d7ec35f55bd9023d22
--- /dev/null
+++ b/tests/script/general/stable/values.sim
@@ -0,0 +1,104 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+sql create database vdb0
+sql create table vdb0.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+sql create table vdb0.vtb00 using vdb0.mt tags( 0 )
+sql create table vdb0.vtb01 using vdb0.mt tags( 0 )
+
+sql create database vdb1
+sql create table vdb1.vtb10 using vdb0.mt tags( 1 )
+sql create table vdb1.vtb11 using vdb0.mt tags( 1 )
+
+sql create database vdb2
+sql create table vdb2.vtb20 using vdb0.mt tags( 2 )
+sql create table vdb2.vtb21 using vdb0.mt tags( 2 )
+
+sql create database vdb3
+sql create table vdb3.vtb30 using vdb0.mt tags( 3 )
+sql create table vdb3.vtb31 using vdb0.mt tags( 3 )
+
+print =============== step2
+sql insert into vdb0.vtb00 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30) 
+sql insert into vdb0.vtb01 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30) 
+sql insert into vdb1.vtb10 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31) 
+sql insert into vdb1.vtb11 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31) 
+sql insert into vdb2.vtb20 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32) 
+sql insert into vdb2.vtb21 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32) 
+sql insert into vdb3.vtb30 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33) 
+sql insert into vdb3.vtb31 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33) 
+sql select * from vdb0.mt
+
+if $rows != 24 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into vdb0.vtb00 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60) 
+sql insert into vdb0.vtb01 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60) 
+sql insert into vdb1.vtb10 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61) 
+sql insert into vdb1.vtb11 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61) 
+sql insert into vdb2.vtb20 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62) 
+sql insert into vdb2.vtb21 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62) 
+sql insert into vdb3.vtb30 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63) 
+sql insert into vdb3.vtb31 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63) 
+sql select * from vdb0.mt
+
+if $rows != 48 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into vdb0.vtb00 values(1519833600006, 60) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 60) (1519833600007, 70) 
+sql insert into vdb1.vtb10 values(1519833600006, 61) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 61) (1519833600007, 71) 
+sql insert into vdb2.vtb20 values(1519833600006, 62) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 62) (1519833600007, 72) 
+sql insert into vdb3.vtb30 values(1519833600006, 63) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 63) (1519833600007, 73) 
+sql select * from vdb0.mt
+
+if $rows != 64 then 
+  return -1
+endi
+
+print =============== step5
+sql insert into vdb0.vtb00 values(1519833600008, 80) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 80) (1519833600007, 70) 
+sql insert into vdb1.vtb10 values(1519833600008, 81) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 81) (1519833600007, 71) 
+sql insert into vdb2.vtb20 values(1519833600008, 82) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 82) (1519833600007, 72) 
+sql insert into vdb3.vtb30 values(1519833600008, 83) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 83) (1519833600007, 73) 
+sql select * from vdb0.mt
+
+if $rows != 68 then 
+  return -1
+endi
+
+print =============== step6
+sql insert into vdb0.vtb00 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb10 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb20 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb30 values(1519833600009, 90) (1519833600010, 100) 
+sql insert into vdb0.vtb01 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb11 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb21 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb31 values(1519833600009, 90) (1519833600010, 100) 
+
+sql select * from vdb0.mt
+
+if $rows != 84 then 
+  return -1
+endi
+
+print =============== step7
+sql insert into vdb0.vtb00 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb10 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb20 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb30 values(1519833600012, 120) (1519833600011, 110) 
+sql insert into vdb0.vtb01 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb11 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb21 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb31 values(1519833600012, 120) (1519833600011, 110) 
+
+sql select * from vdb0.mt
+
+if $rows != 100 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/vnode3.sim b/tests/script/general/stable/vnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3409aef9f88bf652979d5b16c023417c4820168f
--- /dev/null
+++ b/tests/script/general/stable/vnode3.sim
@@ -0,0 +1,179 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = v3_db
+$tbPrefix = v3_tb
+$mtPrefix = v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stream/agg_stream.sim b/tests/script/general/stream/agg_stream.sim
new file mode 100644
index 0000000000000000000000000000000000000000..814438ac74531c565327bca6bb9615928bf289e1
--- /dev/null
+++ b/tests/script/general/stream/agg_stream.sim
@@ -0,0 +1,316 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+
+print ========== step1
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
+system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
+system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 30000
+system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
+system sh/cfg.sh -n dnode1 -c maxShellConns       -v 30000
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step2
+sql create database d4 precision 'us'
+sql use d4
+sql create table t1 (ts timestamp, i int)
+sql insert into d4.t1 values(now, 1)
+
+sql create table d4.s001 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s002 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s003 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s004 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s005 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s006 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s007 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s008 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s009 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s000 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s011 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s012 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s013 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s014 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s015 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s016 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s017 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s018 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s019 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s010 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s021 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s022 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s023 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s024 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s025 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s026 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s027 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s028 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s029 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s020 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s031 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s032 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s033 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s034 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s035 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s036 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s037 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s038 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s039 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s030 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s041 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s042 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s043 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s044 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s045 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s046 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s047 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s048 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s049 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s040 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s051 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s052 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s053 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s054 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s055 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s056 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s057 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s058 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s059 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s050 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s061 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s062 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s063 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s064 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s065 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s066 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s067 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s068 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s069 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s060 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s071 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s072 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s073 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s074 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s075 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s076 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s077 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s078 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s079 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s070 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s081 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s082 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s083 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s084 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s085 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s086 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s087 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s088 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s089 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s080 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s091 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s092 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s093 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s094 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s095 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s096 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s097 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s098 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s099 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s090 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+print =============== step21
+
+sql create table d4.s101 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s102 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s103 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s104 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s105 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s106 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s107 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s108 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s109 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s100 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s111 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s112 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s113 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s114 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s115 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s116 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s117 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s118 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s119 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s110 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s121 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s122 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s123 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s124 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s125 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s126 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s127 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s128 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s129 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s120 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s131 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s132 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s133 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s134 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s135 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s136 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s137 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s138 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s139 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s130 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s141 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s142 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s143 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s144 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s145 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s146 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s147 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s148 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s149 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s140 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s151 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s152 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s153 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s154 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s155 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s156 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s157 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s158 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s159 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s150 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s161 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s162 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s163 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s164 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s165 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s166 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s167 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s168 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s169 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s160 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s171 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s172 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s173 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s174 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s175 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s176 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s177 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s178 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s179 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s170 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s181 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s182 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s183 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s184 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s185 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s186 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s187 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s188 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s189 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s180 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+sql create table d4.s191 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s192 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s193 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
+sql create table d4.s194 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s195 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s196 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert)  from  log.dn_192_168_0_1 interval(5s)
+sql create table d4.s197 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
+sql create table d4.s198 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
+sql create table d4.s199 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
+sql create table d4.s190 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
+
+
+print =============== step3
+print sleep 22 seconds
+sleep 50000 
+
+sql select * from d4.s001
+$s1 = $rows
+print select * from d4.s001 ==> $s1
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s002
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s003
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s004
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s005
+$s5 = $rows
+print select * from d4.s005 ==> $s5
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s006
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s007
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s008
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s009
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s010
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s101
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s102
+$s12 = $rows
+print select * from d4.s102 ==> $s12
+if $rows <= 0 then 
+  return -1
+endi
diff --git a/tests/script/general/stream/column_stream.sim b/tests/script/general/stream/column_stream.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cb94904ff27903acb57b2202c790d25a9b1877ba
--- /dev/null
+++ b/tests/script/general/stream/column_stream.sim
@@ -0,0 +1,200 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+
+print ========== step1
+system sh/cfg.sh -n dnode1 -c monitor         -v 1
+system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sleep 2000
+sql select * from log.dn
+if $rows == 0 then
+  return -1
+endi
+
+print =============== step2
+sql create database d4 precision 'us'
+sql use d4
+sql create table t1 (ts timestamp, i int)
+sql insert into d4.t1 values(now, 1)
+
+sql create table d4.s1 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), stddev(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s2 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), stddev(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s3 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used), stddev(disk_used), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s4 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read), stddev(io_write), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s5 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed), stddev(band_speed), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s6 as select count(req_http), count(req_insert), avg(req_http), avg(req_select), sum(req_insert), max(req_select), min(req_insert), stddev(req_select), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
+
+sql create table d4.s7 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+sql create table d4.s8 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+sql create table d4.s9 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+sql create table d4.s10 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+sql create table d4.s11 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+sql create table d4.s12 as select count(req_http), count(req_insert), avg(req_select), avg(req_insert), sum(req_insert), max(req_select), min(req_insert), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
+
+print =============== step3
+print sleep 22 seconds
+sleep 22000 
+
+sql select * from d4.s1
+$s1 = $rows
+print select * from d4.s1 ==> $s1
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s2
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s3
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s4
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s5
+$s5 = $rows
+print select * from d4.s5 ==> $s5
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s6
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s7
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s8
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s9
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s10
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s11
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s12
+$s12 = $rows
+print select * from d4.s12 ==> $s12
+if $rows <= 0 then 
+  return -1
+endi
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+print sleep 22 seconds
+sleep 22000 
+
+sql select * from d4.s1
+print select * from d4.s1 ==> $rows $s1
+if $rows <= 0 then 
+  return -1
+endi
+if $rows <= $s1 then 
+  return -1
+endi
+
+sql select * from d4.s2
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s3
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s4
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s5
+print select * from d4.s5 ==> $rows $s5
+if $rows <= 0 then 
+  return -1
+endi
+if $rows <= $s5 then 
+  return -1
+endi
+
+
+sql select * from d4.s6
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s7
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s8
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s9
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s10
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s11
+if $rows <= 0 then 
+  return -1
+endi
+
+sql select * from d4.s12
+print select * from d4.s12 ==> $rows $s12
+if $rows <= 0 then 
+  return -1
+endi
+if $rows <= $s12 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e21fa5999aa1b6ce0c063af54172f222aeb983e1
--- /dev/null
+++ b/tests/script/general/stream/metrics_del.sim
@@ -0,0 +1,95 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = md_db
+$tbPrefix = md_tb
+$mtPrefix = md_mt
+$stPrefix = md_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c3
+
+sql select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $mt interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 200 then 
+  return -1
+endi
+if $data03 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
+
+print =============== step3
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql drop table $tb
+  $i = $i + 1
+endw 
+sql drop table $mt
+
+print =============== step4
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step5
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != null then 
+  return -1
+endi
+if $data02 != null then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7fc08064b29cc6f1681116be16ca460da0e41580
--- /dev/null
+++ b/tests/script/general/stream/metrics_n.sim
@@ -0,0 +1,262 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = mn_db
+$tbPrefix = mn_tb
+$mtPrefix = mn_mt
+$stPrefix = mn_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $mt interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 200 then 
+  return -1
+endi
+if $data03 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
+
+print =============== step3 count32
+#total 32 count in select
+sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d) 
+
+# total 32 count in stream
+$st = $stPrefix . c32
+sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d) 
+
+print =============== step4 count31
+
+#total 31 count in select
+sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $mt interval(1d)
+print ===> $data00 $data01 $data02, $data03
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 200 then 
+  return -1
+endi
+if $data03 != 200 then 
+  return -1
+endi
+
+# total 31 count in stream will crash, 32 will error
+$st = $stPrefix . c31
+sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $mt interval(1d)
+
+print =============== step5 avg ...
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $mt interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 1900 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . avg
+sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $mt interval(1d)
+
+print =============== step6 others
+sql select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $mt interval(1d) -x step6
+  return -1
+step6:
+
+$st = $stPrefix . ot
+sql create table $st as select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $mt interval(1d) -x step61
+  return -1
+step61:
+
+print =============== step7 where
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
+print select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 1900 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+if $data07 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step8 as
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), count(tbcol)  from $mt where ts < now + 4m interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 1900 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+if $data07 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+#sql create table $st as select avg(tbcol) as a1, sum(tbcol) as a2, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, count(tbcol) as a7, avg(tbcol) as a8, sum(tbcol) as a9, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, count(tbcol) as a7 from $mt where ts < now + 4m interval(1d)
+
+print =============== step9
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step10
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 200 then 
+  return -1
+endi
+if $data03 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c31
+sql select * from $st 
+if $data01 != 200 then 
+  return -1
+endi
+if $data02 != 200 then 
+  return -1
+endi
+if $data03 != 200 then 
+  return -1
+endi
+if $data04 != 200 then 
+  return -1
+endi
+if $data05 != 200 then 
+  return -1
+endi
+if $data06 != 200 then 
+  return -1
+endi
+if $data07 != 200 then 
+  return -1
+endi
+if $data08 != 200 then 
+  return -1
+endi
+if $data09 != 200 then 
+  return -1
+endi
+
+
+
+$st = $stPrefix . avg
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 1900 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+
diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dcbc8ae7de4962c8970cdffec5829c74cdfb7351
--- /dev/null
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
@@ -0,0 +1,245 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = m1v_db
+$tbPrefix = m1v_tb
+$mtPrefix = m1v_mt
+$stPrefix = m1v_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/general/stream/restart_stream.sim b/tests/script/general/stream/restart_stream.sim
new file mode 100644
index 0000000000000000000000000000000000000000..138e2a6e2ef6e6aeb46c14b7e8fceb851e36eaa8
--- /dev/null
+++ b/tests/script/general/stream/restart_stream.sim
@@ -0,0 +1,177 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$i = 0
+$dbPrefix = rs_db
+$tbPrefix = rs_tb
+$mtPrefix = rs_mt
+$stPrefix = rs_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+$db = $dbPrefix
+$tb = $tbPrefix . $i
+$mt = $mtPrefix
+$stm = $stPrefix . m
+$stt = $stPrefix . t
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $mt (ts timestamp, tbcol int, tbcol2 int ) TAGS(tgcol bool)
+$i = 0
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+  
+  $i = $i + 1
+endw 
+
+print =============== step2
+$i = 0
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 20 then
+  return -1
+endi  
+
+sql select count(*) from $mt interval(1d)
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 200 then
+  return -1
+endi  
+
+print =============== step3
+sql create table $stt as select count(*) from $tb interval(1d)
+sql create table $stm as select count(*) from $mt interval(1d)
+
+print sleep 120 seconds
+sleep 120000 
+
+sql select * from $stt
+print select count(*) from $stt ===> $data00 $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 20 then
+  return -1
+endi  
+
+sql select * from $stm
+print select * from $stm ===> $data00 $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 200 then
+  return -1
+endi  
+
+print =============== step4
+system sh/exec.sh -n dnode1 -s stop
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 1
+system sh/exec.sh -n dnode1 -s start
+
+print =============== step5
+print ==> sleep 8 seconds to renew cache
+sleep 8000
+
+
+print =============== step6
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bigint, tbcol2 bigint  ) TAGS(tgcol int)
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+  
+  $i = $i + 1
+endw 
+
+
+print =============== step7
+
+sql select count(*) from $tb interval(1d)
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 20 then
+  return -1
+endi  
+
+sql select count(*) from $mt interval(1d)
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 100 then
+  return -1
+endi  
+
+print =============== step8
+sql create table $stt as select count(*) from $tb interval(1d)
+sql create table $stm as select count(*) from $mt interval(1d)
+
+print sleep 120 seconds
+sleep 120000 
+
+sql select * from $stt
+sleep 1000
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 20 then
+  return -1
+endi  
+
+sql select * from $stm
+print ===>rows $rows, data $data01
+if $rows != 1 then
+  return -1
+endi  
+if $data01 != 100 then
+  return -1
+endi  
+
+
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..88105a77d667e9cad499ec55cad7f0d7f8fc0c3f
--- /dev/null
+++ b/tests/script/general/stream/stream_3.sim
@@ -0,0 +1,201 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = s3_db
+$tbPrefix = s3_tb
+$mtPrefix = s3_mt
+$stPrefix = s3_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step6
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step7
+
+system sh/exec.sh -n dnode1 -s stop
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 4000
+print ======================== dnode1 start
+
+$dbPrefix = stst3db
+$tbPrefix = stst3tb
+$mtPrefix = stst3mt
+$stPrefix = stst3st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step8
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step8
+step8:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step9 c3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+print =============== step10
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step11
+#$st = $stPrefix . c3
+#sql select * from $st -x step11
+#  print ===> select * from $st first time should be error
+#  return -1
+#step11:
+
+print =============== step12
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+
diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim
new file mode 100644
index 0000000000000000000000000000000000000000..480b23055e90f59bd597d3319a5fe139eba83bab
--- /dev/null
+++ b/tests/script/general/stream/stream_restart.sim
@@ -0,0 +1,142 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = sr_db
+$tbPrefix = sr_tb
+$mtPrefix = sr_mt
+$stPrefix = sr_st
+$tbNum = 10
+$rowNum = 200
+$totalNum = 200
+
+print =============== step1
+
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+sql show tables
+if $rows != 13 then 
+  return -1
+endi
+
+print =============== step3
+sleep 2000
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 1000
+system sh/exec.sh -n dnode1 -s start
+
+print =============== step4
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+print $tb ==> $rows $data00 $data01
+if $rows != $rowNum then 
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+print $tb ==> $rows $data00 $data01
+if $rows != $rowNum then 
+  return -1
+endi
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+print $tb ==> $rows $data00 $data01
+if $rows != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $rows $data00 $data01
+if $rows <= 1 then
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $rows $data00 $data01
+if $rows <= 1 then
+  return -1
+endi
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $rows $data00 $data01
+if $rows <= 1 then
+  return -1
+endi
+
+
diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f028b1626d156a65a3ff805f1479e9cb178a8d30
--- /dev/null
+++ b/tests/script/general/stream/table_1.sim
@@ -0,0 +1,317 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = t1_db
+$tbPrefix = t1_tb
+$mtPrefix = t1_mt
+$stPrefix = t1_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13
+sql select top(tbcol, 1) from $tb interval(1d)
+
+print =============== step14
+sql select bottom(tbcol, 1) from $tb interval(1d)
+
+print =============== step15 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step16
+sql select diff(tbcol) from $tb interval(1d) -x step16
+  return -1
+step16:
+
+print =============== step17 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step18 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step19 gb
+sql select count(tbcol) from $tb interval(1d) group by tgcol -x step19
+  return -1
+step19:
+
+print =============== step20 x
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d) group by tgcol -x step20
+  return -1
+step20:
+
+print =============== step21
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step22
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+#$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ce4065a1a85ba2c4f8f79b77d1d82c5118091e9c
--- /dev/null
+++ b/tests/script/general/stream/table_del.sim
@@ -0,0 +1,90 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = td_db
+$tbPrefix = td_tb
+$mtPrefix = td_mt
+$stPrefix = td_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+print =============== step3
+sql drop table $tb
+
+print =============== step4
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step5
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != null then 
+  return -1
+endi
+if $data02 != null then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d1b4a87a9ea641a8f4d58e0d9fc61bd9ac7c7477
--- /dev/null
+++ b/tests/script/general/stream/table_n.sim
@@ -0,0 +1,291 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = tn_db
+$tbPrefix = tn_tb
+$mtPrefix = tn_mt
+$stPrefix = tn_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+print =============== step3 count32
+#total 32 count in select
+sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $tb interval(1d) 
+
+# total 32 count in stream
+$st = $stPrefix . c32
+sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30 from $tb interval(1d) 
+
+print =============== step4 count31
+
+#total 31 count in select
+sql select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $tb interval(1d)
+print ===> $data00 $data01 $data02, $data03
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+# total 31 count in stream will crash, 32 will error
+$st = $stPrefix . c31
+sql create table $st as select count(*), count(tbcol) as c1, count(tbcol2) as c2, count(tbcol) as c3, count(tbcol) as c4, count(tbcol) as c5, count(tbcol) as c6, count(tbcol) as c7, count(tbcol) as c8, count(tbcol) as c9, count(tbcol) as c10, count(tbcol) as c11, count(tbcol) as c12, count(tbcol) as c13, count(tbcol) as c14, count(tbcol) as c15, count(tbcol) as c16, count(tbcol) as c17, count(tbcol) as c18, count(tbcol) as c19, count(tbcol) as c20, count(tbcol) as c21, count(tbcol) as c22, count(tbcol) as c23, count(tbcol) as c24, count(tbcol) as c25, count(tbcol) as c26, count(tbcol) as c27, count(tbcol) as c28, count(tbcol) as c29, count(tbcol) as c30  from $tb interval(1d)
+
+print =============== step5 avg ...
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $tb interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 190 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . avg
+sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol) from $tb interval(1d)
+
+print =============== step6 others
+sql select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $tb interval(1d)
+print ===> $data01 $data02 $data03 
+if $data01 != 5.766281297 then 
+  return -1
+endi
+#if $data02 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+if $data03 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . ot
+sql create table $st as select stddev(tbcol), leastsquares(tbcol, 1, 1), percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step7 total ...
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 190 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+if $data07 != 5.766281297 then 
+  return -1
+endi
+if $data08 != 0.190000000 then 
+  return -1
+endi
+if $data09 != 20 then 
+  return -1
+endi
+
+$st = $stPrefix . to
+sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step8 where
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data09 != 20 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+sql create table $st as select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d) 
+
+
+print =============== step9 as
+sql select avg(tbcol), sum(tbcol), min(tbcol), max(tbcol),  first(tbcol), last(tbcol), stddev(tbcol), percentile(tbcol, 1), count(tbcol), leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m interval(1d)
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data09 != 20 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+#sql create table $st as select avg(tbcol) as a1, sum(tbcol) as a2, min(tbcol) as a3, max(tbcol) as a4,  first(tbcol) as a5, last(tbcol) as a6, stddev(tbcol) as a7, percentile(tbcol, 1) as a8, count(tbcol) as a9, leastsquares(tbcol, 1, 1) as a10 from $tb where ts < now + 4m interval(1d)
+
+print =============== step10
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step11
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c31
+sql select * from $st
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . avg
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 190 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ot
+sql select * from $st
+print ===> select * from $st 
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 5.766281297 then 
+  return -1
+endi
+#if $data02 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+if $data03 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . to
+sql select * from $st
+print ===> select * from $st
+print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+if $data01 != 9.500000000 then 
+  return -1
+endi
+if $data02 != 190 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 19 then 
+  return -1
+endi
+if $data05 != 0 then 
+  return -1
+endi
+if $data06 != 19 then 
+  return -1
+endi
+if $data07 != 5.766281297 then 
+  return -1
+endi
+if $data08 != 0.190000000 then 
+  return -1
+endi
+if $data09 != 20 then 
+  return -1
+endi
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
new file mode 100644
index 0000000000000000000000000000000000000000..13a4a56fb300e877c01bbe52e15aa8221d246cb5
--- /dev/null
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -0,0 +1,299 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb   -v 3
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = t1v_db
+$tbPrefix = t1v_tb
+$mtPrefix = t1v_mt
+$stPrefix = t1v_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . st
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step14 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step15 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step16
+print sleep 120 seconds
+sleep 120000 
+
+print =============== step17
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . st
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/general/stream/testSuite.sim b/tests/script/general/stream/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..44f886d02b2831bbd30e7d52a381cd6ea9b7ba27
--- /dev/null
+++ b/tests/script/general/stream/testSuite.sim
@@ -0,0 +1,9 @@
+run general/stream/stream_3.sim
+run general/stream/stream_restart.sim
+run general/stream/table_1.sim
+run general/stream/table_n.sim
+run general/stream/metrics_n.sim
+run general/stream/table_del.sim
+run general/stream/metrics_del.sim
+run general/stream/table_replica1_vnoden.sim
+run general/stream/metrics_replica1_vnoden.sim
\ No newline at end of file
diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8469a6484ac5aeb7e656ad63164ebfb0546af646
--- /dev/null
+++ b/tests/script/general/table/autocreate.sim
@@ -0,0 +1,105 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database
+sql create database db
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create super table
+sql create table db.st1 (ts timestamp, i int) tags (j int)
+sql create table db.st2 (ts timestamp, i int, j int) tags (t1 int, t2 int, t3 int)
+sql show db.stables
+if $rows != 2 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create child table
+sql insert into db.c1 using db.st1 tags(1) values(now, 1);
+sql insert into db.c2 using db.st1 tags(2) values(now, 2);
+sql insert into db.c3 using db.st1 tags(3) values(now, 3);
+sql insert into db.c4 using db.st1 tags(4) values(now, 4);
+sql insert into db.c1 using db.st1 tags(1) values(now+1s, 1);
+sql insert into db.c2 using db.st1 tags(2) values(now+1s, 2);
+sql insert into db.c3 using db.st1 tags(3) values(now+1s, 3);
+sql insert into db.c4 using db.st1 tags(4) values(now+1s, 4);
+
+sql show db.tables
+if $rows != 4 then 
+  return -1
+endi
+
+sql select * from db.c1
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from db.c2
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from db.c3
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from db.c4
+if $rows != 2 then 
+  return -1
+endi
+
+sql select * from db.st1
+if $rows != 8 then 
+  return -1
+endi
+
+print =============== insert data
+sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now, 1, 2);
+sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now, 2, 3);
+sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now, 3, 4);
+sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now, 4, 5);
+sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now+1s, 1, 2);
+sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now+1s, 2, 3);
+sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now+1s, 3, 4);
+sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now+1s, 4, 5);
+sql insert into db.s1 using db.st2 tags(1, 1, 1) values(now+2s, 1, 2);
+sql insert into db.s2 using db.st2 tags(2, 2, 2) values(now+2s, 2, 3);
+sql insert into db.s3 using db.st2 tags(3, 3, 3) values(now+2s, 3, 4);
+sql insert into db.s4 using db.st2 tags(4, 4, 4) values(now+2s, 4, 5);
+
+sql show db.tables
+if $rows != 8 then 
+  return -1
+endi
+
+sql select * from db.s1
+if $rows != 3 then 
+  return -1
+endi
+
+sql select * from db.s2
+if $rows != 3 then 
+  return -1
+endi
+
+sql select * from db.s3
+if $rows != 3 then 
+  return -1
+endi
+
+sql select * from db.s4
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/back_insert.sim b/tests/script/general/table/back_insert.sim
new file mode 100644
index 0000000000000000000000000000000000000000..43831cca95b49218719c5172c3d2d96ad3500896
--- /dev/null
+++ b/tests/script/general/table/back_insert.sim
@@ -0,0 +1,7 @@
+sql connect
+$x = 1
+begin:
+  sql insert into db.tb values(now, $x ) -x begin  
+  #print ===> insert successed $x 
+  $x = $x + 1   
+goto begin
\ No newline at end of file
diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e8d0cd7bd8bd0b6f3dd7193b12a33c70bb46f95b
--- /dev/null
+++ b/tests/script/general/table/basic1.sim
@@ -0,0 +1,73 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database
+sql create database d1
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create normal table
+sql create table d1.n1 (ts timestamp, i int)
+sql show d1.tables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create super table
+sql create table d1.st (ts timestamp, i int) tags (j int)
+sql show d1.stables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create child table
+sql create table d1.c1 using d1.st tags(1)
+sql create table d1.c2 using d1.st tags(2)
+sql show d1.tables
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+
+print =============== insert data
+sql insert into d1.n1 values(now+1s, 1)
+sql insert into d1.n1 values(now+2s, 2)
+sql insert into d1.n1 values(now+3s, 3)
+
+print =============== query data
+sql select * from d1.n1
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01
+print $data10 $data11
+print $data20 $data11
+
+if $data01 != 1 then 
+  return -1
+endi
+
+if $data11 != 2 then 
+  return -1
+endi
+
+if $data21 != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d1678e8abd984b3aaa5061feb9430550d8909feb
--- /dev/null
+++ b/tests/script/general/table/basic2.sim
@@ -0,0 +1,69 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== one table
+sql create database d1
+sql create table d1.n1 (ts timestamp, i int)
+sql create table d1.n2 (ts timestamp, i int)
+sql create table d1.n3 (ts timestamp, i int)
+sql create table d1.n4 (ts timestamp, i int)
+
+sql drop table d1.n1
+sql drop table d1.n2
+
+sql show d1.tables
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== show
+sql show databases
+if $data02 != 2 then 
+  return -1
+endi
+
+if $data03 != 1 then 
+  return -1
+endi
+
+sql show d1.vgroups
+if $data00 != 2 then 
+  return -1
+endi
+
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== insert data1
+sql_error insert into d1.n1 values(now, 1)
+sql_error insert into d1.n2 values(now, 1)
+
+print =============== insert data2
+sql insert into d1.n3 values(now, 1)
+sql insert into d1.n3 values(now+1s, 2)
+sql insert into d1.n3 values(now+2s, 3)
+
+print =============== query data
+sql select * from d1.n3
+print $rows
+if $rows != 3 then 
+  return -1
+endi
+
+if $data01 != 1 then 
+  return -1
+endi
+
+if $data11 != 2 then 
+  return -1
+endi
+
+if $data21 != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ded00e153a2be88ed8c9193d4c9051dacde1fc31
--- /dev/null
+++ b/tests/script/general/table/basic3.sim
@@ -0,0 +1,80 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== create database
+sql create database db
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create normal table
+sql create table db.n1 (ts timestamp, i int)
+sql show db.tables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create super table
+sql create table db.st (ts timestamp, i int) tags (j int)
+sql show db.stables
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create child table
+sql create table db.c1 using db.st tags(1)
+sql create table db.c2 using db.st tags(2)
+sql show db.tables
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+
+print =============== insert data
+sql insert into db.n1 values(now+1s, 1)
+sql insert into db.n1 values(now+2s, 2)
+sql insert into db.n1 values(now+3s, 3)
+
+print =============== query data
+sql select * from db.n1
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01
+print $data10 $data11
+print $data20 $data11
+
+if $data01 != 1 then 
+  return -1
+endi
+
+if $data11 != 2 then 
+  return -1
+endi
+
+if $data21 != 3 then 
+  return -1
+endi
+
+print =============== drop stable
+sql drop table db.st
+sql show db.stables
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dd61d25ef9f2c300a33ef8a30bcc17a1ab5d867d
--- /dev/null
+++ b/tests/script/general/table/bigint.sim
@@ -0,0 +1,73 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_bi_db
+$tbPrefix = lm_bi_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed bigint) 
+
+#sql insert into $tb values (now, -9223372036854775809)
+sql insert into $tb values (now, -9223372036854770000)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+#if $data01 != -9223372036854775808 then 
+if $data01 != -9223372036854770000 then 
+  return -1
+endi
+
+print =============== step2
+#sql insert into $tb values (now+1a, -9223372036854775808)
+sql insert into $tb values (now+1a, -9223372036854770000)
+sql select * from $tb
+if $rows != 2 then 
+  return -1
+endi
+#if $data01 != -9223372036854775808 then 
+if $data01 != -9223372036854770000 then 
+  return -1
+endi
+
+print =============== step3
+#sql insert into $tb values (now+1a, 9223372036854775807)
+sql insert into $tb values (now+2a, 9223372036854770000)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+#if $data01 != 9223372036854775807 then 
+if $data01 != 9223372036854770000 then 
+  return -1
+endi
+
+print =============== step4
+#sql insert into $tb values (now+1a, 9223372036854775808)
+sql insert into $tb values (now+3a, 9223372036854770000)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+#if $data01 != 9223372036854775807 then 
+if $data01 != 9223372036854770000 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cdbfcd4cbfe15438db884cd69b149c6e3519b6e6
--- /dev/null
+++ b/tests/script/general/table/binary.sim
@@ -0,0 +1,63 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_bn_db
+$tbPrefix = lm_bn_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed binary(5)) 
+
+sql insert into $tb values (now, ) -x step1
+	return -1
+step1:
+
+print =============== step2
+sql insert into $tb values (now+1a, '1234')
+sql select speed from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1234 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, '23456')
+sql select speed from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+print ==> $data00
+if $data00 != 23456 then 
+  return -1
+endi
+
+print =============== step4
+sql_error insert into $tb values (now+3a, '345678')
+sql insert into $tb values (now+3a, '34567')
+sql select speed from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+print ==> $data00
+if $data00 != 34567 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fbb6fe823cf30fc18302855aca9e847373cd1f6f
--- /dev/null
+++ b/tests/script/general/table/bool.sim
@@ -0,0 +1,92 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_bo_db
+$tbPrefix = lm_bo_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+$x = 0
+sql create table $tb (ts timestamp, speed bool)
+
+sql insert into $tb values (now, true)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values (now+1m, 1)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2m, 2)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3m, 0)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4m, -1)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5m, false)
+sql select * from $tb order by ts desc
+if $rows != 6 then 
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9251e31daa633b45dae6ea7c6240d6c7a731f405
--- /dev/null
+++ b/tests/script/general/table/column2.sim
@@ -0,0 +1,26 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql create database db
+sql use db
+sql create table tt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g timestamp, h binary(10), i bool);
+sql insert into tt values (now + 1m , 1 , 1 , 1 , 1 ,  1 , 10, 150000000 , '11' , true ) 
+
+sql select * from tt
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0b09f65129d2204c4088e5aff55c08384988a2b5
--- /dev/null
+++ b/tests/script/general/table/column_name.sim
@@ -0,0 +1,86 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_cm_db
+$tbPrefix = lm_cm_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql drop table dd -x step0
+	return -1
+step0:
+
+sql create table $tb(ts timestamp, int) -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table $tb (ts timestamp, s int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table $tb (ts timestamp, a0123456789 int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table $tb (ts timestamp, a0123456789012345678901234567890123456789 int) 
+sql drop table $tb
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create table $tb (ts timestamp, a0123456789 int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql insert into $tb values (now , 1)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d1091528b249cc35f31ab623b29d4dc3148c9836
--- /dev/null
+++ b/tests/script/general/table/column_num.sim
@@ -0,0 +1,85 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_cn_db
+$tbPrefix = lm_cn_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb() -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table $tb (ts timestamp)  -x step2
+	return -1
+step2:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table $tb (ts int)  -x step3
+	return -1
+step3:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)
+
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)
+
+sql show tables
+if $rows != 2 then 
+  return -1
+endi
+
+sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim
new file mode 100644
index 0000000000000000000000000000000000000000..117c288b3602d3ca61fe83591c6943b79903e779
--- /dev/null
+++ b/tests/script/general/table/column_value.sim
@@ -0,0 +1,75 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_cv_db
+$tbPrefix = lm_cv_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed int, v1 binary(100), v2 binary(100), v3 binary(100), v4 binary(100), v5 binary(100)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values(now, 1, '1', '2', '3', '4', '5')
+sql insert into $tb values(now+1a, 1, '1', '2', '3', '4', '5')
+sql select * from $tb
+if $rows != 2 then 
+  return -1
+endi
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table  $tb (ts timestamp, speed bigint, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500))
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql drop table $tb
+
+print =============== step3
+sql create table $tb (ts timestamp, speed float, v1 binary(100), v2 binary(100), v3 binary(100), v4 binary(100), v5 binary(100)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values(now+2a, 1, '1', '2', '3', '4', '5')
+sql insert into $tb values(now+3a, 1, '1', '2', '3', '4', '5')
+sql select * from $tb
+if $rows != 2 then 
+  return -1
+endi
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table  $tb (ts timestamp, speed double, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2e73a217a616859781f709cfa9c7117f6e34b9ae
--- /dev/null
+++ b/tests/script/general/table/date.sim
@@ -0,0 +1,90 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_da_db
+$tbPrefix = lm_da_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed int)
+sql insert into $tb values ('2017-01-01 08:00:00.001', 1)
+sql select ts from $tb
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != @17-01-01 08:00:00.001@ then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values ('2017-08-28 00:23:46.429+ 1a', 2) 
+#sql insert into $tb values ('2017-08-28 00:23:46cd .429', 2) 
+sql select ts from $tb
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== step3
+#sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
+#sql insert into $tb values ('1970-01-01 08:00:00.000', 3)
+sql select ts from $tb
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values(now, 4);
+sql insert into $tb values(now+1a, 5);
+sql insert into $tb values(now+1s, 6);
+sql insert into $tb values(now+1m, 7);
+sql insert into $tb values(now+1h, 8);
+sql insert into $tb values(now+1d, 9);
+sql_error insert into $tb values(now+3w, 10);
+sql_error insert into $tb values(now+1n, 11);
+sql_error insert into $tb values(now+1y, 12);
+
+print =============== step5
+sql_error insert into $tb values ('9999-12-31 213:59:59.999', 13)
+sql select ts from $tb
+print $rows
+if $rows != 8 then
+  return -1
+endi
+
+print =============== step6
+sql_error insert into $tb values ('9999-12-99 23:59:59.999', 13)
+
+sql select ts from $tb
+if $rows != 8 then
+  return -1
+endi
+
+print =============== step7
+$i = 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, ts2 timestamp)
+
+print =============== step8
+sql insert into $tb values (now, now)
+sql select * from $tb 
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..50224f83b554001cd725926986d4769d36a47cb7
--- /dev/null
+++ b/tests/script/general/table/db.table.sim
@@ -0,0 +1,47 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_dt_db
+$tbPrefix = lm_dt_tb
+$db = $dbPrefix
+$tb = $tbPrefix
+
+print =============== step1
+sql create database $db
+$table = lm_dt_db.lm_dt_tb
+
+print =============== step2
+sql create table $table (ts timestamp, speed int) 
+
+print =============== step3
+sql insert into $table values (now, 1)
+
+print =============== step4
+sql select * from $table
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step5
+sql describe $table
+
+print =============== step6
+sql drop table $table
+
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..17974ccf4d3c2348c51b15e6382884d73fd73bf9
--- /dev/null
+++ b/tests/script/general/table/delete_reuse1.sim
@@ -0,0 +1,81 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database d1 replica 1
+sql create table d1.t1 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql drop table d1.t1
+sleep 1000
+sql insert into d1.t1 values(now, 2) -x step2
+  return -1
+step2:
+
+print ========= step3
+sql create table d1.t1 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 2)
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+if $data01 != 2 then
+	return -1
+endi
+
+print ========= step4
+$x = 0
+while $x < 20
+
+  sql drop table d1.t1
+  sleep 1000
+  sql insert into d1.t1 values(now, -1) -x step4
+    return -1
+  step4:
+  
+  sql create table d1.t1 (ts timestamp, i int)
+  sql insert into d1.t1 values(now, $x )
+  sql select * from d1.t1
+  if $rows != 1 then
+	return -1
+  endi
+  if $data01 != $x then
+	return -1
+  endi
+  
+  $x = $x + 1
+  
+  print ===> loop times: $x
+endw 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..917893b2d286208737693d10b8ec146455c8ed3c
--- /dev/null
+++ b/tests/script/general/table/delete_reuse2.sim
@@ -0,0 +1,83 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======== step1 
+sql create database db1 replica 1
+sql create table db1.t1 (ts timestamp, i int)
+sql insert into db1.t1 values(now, 1)
+
+sql select * from db1.t1
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql drop table db1.t1
+sleep 1000
+sql_error insert into db1.t1 values(now, 2)
+
+print ========= step3
+sql create table db1.tb1 (ts timestamp, i int)
+sql insert into db1.tb1 values(now, 2)
+sql select * from db1.tb1
+if $rows != 1 then
+	return -1
+endi
+if $data01 != 2 then
+	return -1
+endi
+
+sql use db1
+print ========= step4
+$x = 1
+while $x < 20
+
+  $tb = tb . $x
+  sql drop table $tb
+  
+  sleep 1000
+  sql_error insert into $tb values(now, -1)
+  
+  step4:
+  
+  $x = $x + 1  
+  $tb = tb . $x
+  
+  sql create table $tb (ts timestamp, i int)
+  sql insert into $tb values(now, $x )
+  sql select * from $tb
+  if $rows != 1 then
+	return -1
+  endi
+  if $data01 != $x then
+	return -1
+  endi
+  
+  print ===> loop times: $x
+endw 
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b55d55eb8a6ef77f453f0d60152d6e1fb7a3269c
--- /dev/null
+++ b/tests/script/general/table/delete_writing.sim
@@ -0,0 +1,51 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+sql create database db 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+
+print ======== start back
+run_back general/table/back_insert.sim
+sleep 1000
+
+print ======== step1 
+$x = 1 	
+while $x < 15
+
+    print drop table times $x
+	sql drop table db.tb -x step1
+	step1:
+
+	sql create table db.tb (ts timestamp, i int)
+
+	sleep 3000
+	
+	$x = $x + 1
+endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ebec004f1964119d97504f8bc78a0b42941824ab
--- /dev/null
+++ b/tests/script/general/table/describe.sim
@@ -0,0 +1,49 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = de_in_db
+$tbPrefix = de_in_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+sql describe $tb
+if $rows != 2 then 
+  return -1
+endi
+if $data00 != ts then 
+  return -1
+endi
+if $data01 != TIMESTAMP then 
+  return -1
+endi
+if $data02 != 8 then 
+  return -1
+endi
+if $data10 != speed then 
+  return -1
+endi
+if $data11 != INT then 
+  return -1
+endi
+if $data12 != 4 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..10239568fe488de55961e134a8e248cb83963393
--- /dev/null
+++ b/tests/script/general/table/double.sim
@@ -0,0 +1,98 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_do_db
+$tbPrefix = lm_do_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed double) 
+#sql insert into $tb values (now, -1.79E+308) -x step1
+#	return -1
+#step1:
+
+print =============== step2
+#sql insert into $tb values (now+1a, 1.79E+308) -x step2
+#	return -1
+#step2:
+
+sql select * from $tb order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, 2.85)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 2.850000000 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3a, 3.4)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != 3.400000000 then 
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4a, a2) -x step51
+  return -1
+step51:
+sql insert into $tb values (now+4a, 0)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5a, 2a) -x step6
+  return -1
+step6:
+sql insert into $tb values(now+5a, 2)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step7
+sql insert into $tb values (now+6a, 2a'1) -x step7
+  return -1
+step7:
+sql insert into $tb values(now+6a, 2)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 2.000000000 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/fill.sim b/tests/script/general/table/fill.sim
new file mode 100644
index 0000000000000000000000000000000000000000..333573e577b636ef780e652d1dc61d4d6701f925
--- /dev/null
+++ b/tests/script/general/table/fill.sim
@@ -0,0 +1,63 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =================== step1
+sql create database db
+sql use db
+sql create table mt (ts timestamp, k int, h binary(20), t bigint, s float, f double, x smallint, y tinyint, z bool) tags (a int, b binary(20), c bigint)
+sql create table tb using mt tags (0, '1', 2)
+
+sql insert into tb values(now -200d, 200, '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -100d, 100, '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -30d,  30,  '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -20d,  20,  '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -10d,  10,  '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -5d,   5,   '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now -1d,   1,   '1', 2, 3, 4, 5, 6, true);
+sql insert into tb values(now,       0,   '1', 2, 3, 4, 5, 6, true);
+
+sql select * from db.mt
+if $rows != 8 then 
+  return -1
+endi
+
+sql select * from db.tb
+if $rows != 8 then 
+  return -1
+endi
+
+sql select count(*) from db.mt
+if $data00 != 8 then 
+  return -1
+endi
+
+sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and ts>="2016-4-29 8:0:0" and ts < "2018-7-18 8:9:0" interval(1d) fill(value, 1)
+sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and ts>="2016-4-29 8:0:0" and ts < "2018-7-18 8:9:0" interval(1d) fill(value, 1)
+
+print =================== step2
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+
+print =================== step3
+sql select * from db.mt
+if $rows != 8 then 
+  return -1
+endi
+
+sql select * from db.tb
+if $rows != 8 then 
+  return -1
+endi
+
+sql select count(*) from db.mt
+if $data00 != 8 then 
+  return -1
+endi
diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e4ef8a42d67569aa75dda90236861ac11c951870
--- /dev/null
+++ b/tests/script/general/table/float.sim
@@ -0,0 +1,98 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_fl_db
+$tbPrefix = lm_fl_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed float) 
+#sql insert into $tb values (now, -3.40E+38) -x step1
+#	return -1
+#step1:
+
+print =============== step2
+#sql insert into $tb values (now+1a, 3.40E+308) -x step2
+#	return -1
+#step2:
+
+sql select * from $tb order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, 2.85)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 2.85000 then
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3a, 3.4)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != 3.40000 then
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4a, a2) -x step5
+  return -1
+step5:
+sql insert into $tb values (now+4a, 0)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 0.00000 then
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5a, 2a) -x step6
+  return -1
+step6:
+sql insert into $tb values (now+5a, 2)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 2.00000 then
+  return -1
+endi
+
+print =============== step7
+sql insert into $tb values (now+6a, 2a'1) -x step7
+  return -1
+step7:
+sql insert into $tb values (now+6a, 2)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 2.00000 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..81bdcda47dd14c59df6017a07dde64da87b6546f
--- /dev/null
+++ b/tests/script/general/table/int.sim
@@ -0,0 +1,134 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_in_db
+$tbPrefix = lm_in_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+sql insert into $tb values (now, NULL)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values (now+1m, -2147483648) -x step2
+  return -1
+step2:
+sql insert into $tb values (now+1m, NULL)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2m, 2147483647)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 2147483647 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3m, 2147483648) -x step4
+  return -1
+step4:
+sql insert into $tb values (now+3m, NULL)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step5
+sql_error insert into $tb values (now+4m, a2)
+sql insert into $tb values (now+4m, 0)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql_error insert into $tb values (now+5m, 2a)
+sql  insert into $tb values (now+5m, 2)
+sql select * from $tb order by ts desc
+if $rows != 6 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== step7
+sql_error insert into $tb values (now+6m, 2a'1)
+sql insert into $tb values (now+6m, 2)
+sql select * from $tb order by ts desc
+if $rows != 7 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== step8
+sql insert into $tb values (now+8m, "NULL")
+sql select * from $tb order by ts desc
+if $rows != 8 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step9
+sql insert into $tb values (now+9m, 'NULL')
+sql select * from $tb order by ts desc
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step10
+sql insert into $tb values (now+10m, -123)
+sql select * from $tb order by ts desc
+if $rows != 10 then 
+  return -1
+endi
+if $data01 != -123 then 
+  return -1
+endi
+ 
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..18597f2e1cd8ebed7747fed32067ed51664aebc8
--- /dev/null
+++ b/tests/script/general/table/limit.sim
@@ -0,0 +1,94 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = ob_tl_db
+$tbPrefix = ob_tl_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =================== step 0
+sql create database $db
+sql use $db
+sql show vgroups
+if $rows != 0 then 
+  return -1
+endi
+
+$N = 256
+
+print =================== step 1
+$x = $N
+$y = 0
+while $x > $y
+  $table = a . $x
+  sql create table $table (ts timestamp, speed int, i float, d double, b bigint, c binary(20))
+  $x = $x - 1
+endw 
+
+sql show vgroups
+if $rows != 8 then 
+  return -1
+endi
+
+print =================== step 2
+
+$x = $N
+$y = 0
+while $x > $y
+  $table = b . $x
+  sql create table $table (ts timestamp, speed int, i float, d double, b bigint, c binary(20))
+  $x = $x - 1
+endw 
+
+sql show vgroups
+if $rows != 8 then 
+  return -1
+endi
+
+print =================== step 3
+
+$x = $N
+$y = 0
+while $x > $y
+  $table = c . $x
+  sql create table $table (ts timestamp, speed int, i float, d double, b bigint, c binary(20))
+  $x = $x - 1
+endw 
+
+sql show vgroups
+if $rows != 8 then 
+  return -1
+endi
+
+print =================== step 4
+
+$x = $N
+$y = 0
+while $x > $y
+  $table = d . $x
+  sql create table $table (ts timestamp, speed int, i float, d double, b bigint, c binary(20))
+  $x = $x - 1
+endw 
+
+sql show vgroups
+if $rows != 8 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b6f0d6948faf9323085902cfc9b463238cb3f9ca
--- /dev/null
+++ b/tests/script/general/table/smallint.sim
@@ -0,0 +1,105 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_sm_db
+$tbPrefix = lm_sm_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed smallint)
+
+sql insert into $tb values (now, NULL)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+print $data01
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values (now+1m, -32768) -x step2
+  return -1
+step2: 
+sql insert into $tb values (now+1m, NULL)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2m, 32767)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 32767 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3m, 32768) -x step4
+  return -1
+step4: 
+sql insert into $tb values (now+3m, NULL)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step5
+sql_error insert into $tb values (now+4m, a2)
+sql insert into $tb values (now+4m, 0)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql_error insert into $tb values (now+5m, 2a)
+sql insert into $tb values (now+5m, 2)
+sql select * from $tb order by ts desc
+if $rows != 6 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== step7
+sql_error insert into $tb values (now+6m, 2a'1)
+sql insert into $tb values (now+6m, 2)
+sql select * from $tb order by ts desc
+if $rows != 7 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+ 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6ad1b13b1cae6cd05b3b0bd3de4c648e4aab1fde
--- /dev/null
+++ b/tests/script/general/table/table.sim
@@ -0,0 +1,224 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = ob_tb_db
+$tbPrefix = ob_tb_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database $db -x step1
+step1:
+sql create database $db
+
+print =============== step2-3-4
+sql use $db
+
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint)
+sql insert into $tb values(now, 1, 1)
+sql select * from $tb
+if $data01 != 1 then 
+  return -1
+endi
+
+$i = 2
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val smallint, val2 smallint)
+sql insert into $tb values(now, 2, 2)
+sql select * from $tb
+if $data01 != 2 then 
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val int, val2 int)
+sql insert into $tb values(now, 3, 3)
+sql select * from $tb
+if $data01 != 3 then 
+  return -1
+endi
+
+$i = 4
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val bigint, val2 bigint)
+sql insert into $tb values(now, 4, 4)
+sql select * from $tb
+if $data01 != 4 then 
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val float, val2 float)
+sql insert into $tb values(now, 5, 5)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 5.00000 then
+  return -1
+endi
+
+$i = 6
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val double, val2 double)
+sql insert into $tb values(now, 6, 6)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 6.000000000 then 
+  return -1
+endi
+
+$i = 7
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val binary(20), val2 binary(20))
+sql insert into $tb values(now, '7', '7')
+sql select * from $tb
+if $data01 != 7 then 
+  return -1
+endi
+
+print =============== step5
+sql show tables
+if $rows != 7 then 
+  return -1
+endi
+
+$i = 1
+while $i < 8
+  $tb = $tbPrefix . $i  
+  sql drop table $tb 
+  $i = $i + 1
+endw
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6-9
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 1, 1)
+sql select * from $tb
+if $data01 != 1 then 
+  return -1
+endi
+
+$i = 2
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val smallint, val2 smallint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 2, 2)
+sql select * from $tb
+if $data01 != 2 then 
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val int, val2 int)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 3, 3)
+sql select * from $tb
+if $data01 != 3 then 
+  return -1
+endi
+
+$i = 4
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val bigint, val2 bigint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 4, 4)
+sql select * from $tb
+if $data01 != 4 then 
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val float, val2 float)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 5, 5)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 5.00000 then
+  return -1
+endi
+
+$i = 6
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val double, val2 double)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 6, 6)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 6.000000000 then 
+  return -1
+endi
+
+$i = 7
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val binary(20), val2 binary(20))
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, '7', '7')
+sql select * from $tb
+if $data01 != 7 then 
+  return -1
+endi
+
+print =============== step10
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint) 
+sql show tables
+if $rows != 7 then
+  return -1
+endi
+
+print =============== step11
+sql create table $tb (ts timestamp, val float, val2 double)
+sql show tables
+if $rows != 7 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2568ebc7a5e460284f8a4d620beffadd73e76baf
--- /dev/null
+++ b/tests/script/general/table/table_len.sim
@@ -0,0 +1,105 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_tb_db
+$tbPrefix = lm_tb_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql drop table dd -x step0
+	return -1
+step0:
+
+sql create table (ts timestamp, speed int) -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table a (ts timestamp, speed int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table a
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table a0123456789 (ts timestamp, speed int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table a0123456789
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789 (ts timestamp, speed int)  -x step4
+	return -1
+step4:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create table a;1 (ts timestamp, speed int) -x step5
+	return -1
+step5:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql create table a'1  (ts timestamp, speed int) -x step6
+	return -1
+step6:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step7
+sql create table (a)  (ts timestamp, speed int) -x step7
+	return -1
+step7:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql create table a.1  (ts timestamp, speed int) -x step8
+  return -1
+step8:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/testSuite.sim b/tests/script/general/table/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d6cc88b36a6bb695a34eab889f52bdcb525017fb
--- /dev/null
+++ b/tests/script/general/table/testSuite.sim
@@ -0,0 +1,27 @@
+run general/table/autocreate.sim
+run general/table/basic1.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
+run general/table/bigint.sim
+run general/table/binary.sim
+run general/table/bool.sim
+run general/table/column_name.sim
+run general/table/column_num.sim
+run general/table/column_value.sim
+run general/table/column2.sim
+run general/table/date.sim
+run general/table/db.table.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
+run general/table/double.sim
+run general/table/fill.sim
+run general/table/float.sim
+run general/table/int.sim
+run general/table/limit.sim
+run general/table/smallint.sim
+run general/table/table_len.sim
+run general/table/table.sim
+run general/table/tinyint.sim
+run general/table/vgroup.sim
diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..017c007e8425385c6045d8c4ea1d3f7335e62a0d
--- /dev/null
+++ b/tests/script/general/table/tinyint.sim
@@ -0,0 +1,104 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_ti_db
+$tbPrefix = lm_ti_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed tinyint)
+
+sql insert into $tb values (now, NULL)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values (now+1m, -128)  -x step2
+  return -1
+step2: 
+sql insert into $tb values (now+1m, NULL)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2m, 127)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 127 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3m, 128) -x step4
+  return -1
+step4: 
+sql insert into $tb values (now+3m, NULL)
+sql select * from $tb
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != NULL then
+  return -1
+endi
+
+print =============== step5
+sql_error insert into $tb values (now+4m, a2)
+sql insert into $tb values (now+4m, 0)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql_error insert into $tb values (now+5m, 2a)
+sql insert into $tb values (now+5m, 2)
+sql select * from $tb order by ts desc
+if $rows != 6 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+print =============== step7
+sql_error insert into $tb values (now+6m, 2a'1)
+sql insert into $tb values (now+6m, 2)
+sql select * from $tb order by ts desc
+if $rows != 7 then 
+  return -1
+endi
+if $data01 != 2 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f4496e2f1988f86fc756dddc124224e84ed6fc06
--- /dev/null
+++ b/tests/script/general/table/vgroup.sim
@@ -0,0 +1,151 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = ob_vg_db
+$tbPrefix = ob_vg_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =================== step 1
+sql create database $db
+sql use $db
+sql show vgroups
+if $rows != 0 then 
+  return -1
+endi
+
+sql create table table1 (ts timestamp, speed int)
+sql create table table2 (ts timestamp, speed int)
+sql create table table3 (ts timestamp, speed int)
+sql create table table4 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 1 then 
+  return -1
+endi
+
+sql create table table5 (ts timestamp, speed int)
+sql create table table6 (ts timestamp, speed int)
+sql create table table7 (ts timestamp, speed int)
+sql create table table8 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 2 then 
+  return -1
+endi
+
+sql create table table9 (ts timestamp, speed int)
+sql create table table10 (ts timestamp, speed int)
+sql create table table11 (ts timestamp, speed int)
+sql create table table12 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 3 then 
+  return -1
+endi
+
+sql create table table13 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop table table13
+sql show vgroups
+if $rows != 3 then 
+  return -1
+endi
+
+sql create table table13 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 4 then 
+  return -1
+endi
+
+print =================== step 2
+$i = 1
+$db = $dbPrefix . $i
+
+sql create database $db 
+sql use $db
+sql show vgroups
+if $rows != 0 then 
+  return -1
+endi
+
+$i = 0
+$db = $dbPrefix . $i
+sql drop database $db
+
+$i = 1
+$db = $dbPrefix . $i
+sql use $db
+sql create table table2 (ts timestamp, speed int)
+sql show vgroups
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table table2
+sql show vgroups
+if $rows != 0 then 
+  return -1
+endi
+
+sql create table table1 (ts timestamp, speed int)
+sql create table table2 (ts timestamp, speed int)
+sql create table table3 (ts timestamp, speed int)
+sql create table table4 (ts timestamp, speed int)
+sql drop table table1
+sql show vgroups
+if $rows != 1 then 
+  return -1
+endi
+
+print =================== step 3
+$i = 0
+$db = $dbPrefix . $i
+sql create database $db
+sql use $db
+sql create table table1 (ts timestamp, speed int)
+
+$i = 2
+$db = $dbPrefix . $i
+sql create database $db
+sql use $db
+sql create table table3 (ts timestamp, speed int)
+
+$i = 3
+$db = $dbPrefix . $i
+sql create database $db
+sql use $db
+sql create table table4 (ts timestamp, speed int)
+
+$i = 4
+$db = $dbPrefix . $i
+sql create database $db
+sql use $db
+
+sql show databases
+if $rows != 5 then 
+  return -1
+endi
+
+$i = 0
+while $i < 5
+  $db = $dbPrefix . $i  
+  sql drop database $db 
+  $i = $i + 1
+endw
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4b3104fe1bf591b69e4cc8837df9007ed2e815a5
--- /dev/null
+++ b/tests/script/general/tag/3.sim
@@ -0,0 +1,522 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_3_db
+$tbPrefix = ta_3_tb
+$mtPrefix = ta_3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step16
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step17
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..120ef4e4e3ba4dd5446eff7143d2dd605374fa5d
--- /dev/null
+++ b/tests/script/general/tag/4.sim
@@ -0,0 +1,715 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+sql reset query cache
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_4_db
+$tbPrefix = ta_4_tb
+$mtPrefix = ta_4_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step20
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..efe88b36503c5161179602afea18fcf6ea1a106a
--- /dev/null
+++ b/tests/script/general/tag/5.sim
@@ -0,0 +1,838 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+sql reset query cache
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_5_db
+$tbPrefix = ta_5_tb
+$mtPrefix = ta_5_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 binary(20))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tgcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step27
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d5f0a6c4af9b13420a07d4140a456f2b5112acd2
--- /dev/null
+++ b/tests/script/general/tag/6.sim
@@ -0,0 +1,993 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+sql reset query cache
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_6_db
+$tbPrefix = ta_6_tb
+$mtPrefix = ta_6_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 binary(30), tgcol6 binary(20))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0', 0, 0, 0, '0', '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1', 1, 1, 1, '1', '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tgcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where tgcol6 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step22
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step23
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step24
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step27
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step28
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step29
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step30
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step31
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6 = 1 interval(1d) group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..301ec4f825c9954f9b5790c5e27e417538c3b4e2
--- /dev/null
+++ b/tests/script/general/tag/add.sim
@@ -0,0 +1,856 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_ad_db
+$tbPrefix = ta_ad_tb
+$mtPrefix = ta_ad_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 int
+sql reset query cache
+sql alter table $tb set tag tgcol4 =4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step2
+  return -1
+step2:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 tinyint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step3
+  return -1
+step3:
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql describe $tb
+print sql describe $tb
+if $data21 != BIGINT then 
+  return -1
+endi
+if $data31 != FLOAT then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 float
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step4
+  return -1
+step4:
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 smallint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = '1' -x step5
+  return -1
+step5:
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
+sql create table $tb using $mt tags( 1, 2, 3 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(10)
+sql alter table $mt add tag tgcol6 binary(10)
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=false 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 1
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1 -x step52
+  return -1
+step52:
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bigint
+sql alter table $mt add tag tgcol6 tinyint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol6 = 6
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step71
+  return -1
+step71:
+sql select * from $mt where tgcol3 = 1 -x step72
+  return -1
+step72:
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(17)
+sql alter table $mt add tag tgcol6 bool
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print select * from $mt where tgcol5 = 5
+print $data01 $data02 $data03 $data04
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step81
+  return -1
+step81:
+sql select * from $mt where tgcol3 = 1 -x step82
+  return -1
+step82:
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bool
+sql alter table $mt add tag tgcol6 float
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=1
+sql alter table $tb set tag tgcol6=6
+sql reset query cache
+
+sql select * from $mt where tgcol5 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4.000000000 then 
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 6.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step91
+  return -1
+step91:
+sql select * from $mt where tgcol2 = 1 -x step92
+  return -1
+step92:
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol4 = '4'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step103
+  return -1
+step103:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bool
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=false
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step101
+  return -1
+step101:
+sql select * from $mt where tgcol3 = 1 -x step102
+  return -1
+step102:
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step114
+  return -1
+step114:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 int
+sql alter table $mt add tag tgcol6 binary(10)
+sql alter table $mt add tag tgcol7 bigint
+sql alter table $mt add tag tgcol8 smallint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
+sql alter table $tb set tag tgcol7=7
+sql alter table $tb set tag tgcol8=8
+sql reset query cache
+
+sql select * from $mt where tgcol5 =5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 6 then 
+  return -1
+endi
+if $data06 != 7 then 
+  return -1
+endi
+if $data07 != 8 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step111
+  return -1
+step111:
+sql select * from $mt where tgcol3 = 1 -x step112
+  return -1
+step112:
+sql select * from $mt where tgcol9 = 1 -x step113
+  return -1
+step113:
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 4.000000000 then 
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol3 int
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=false 
+sql alter table $tb set tag tgcol2=5 
+sql alter table $tb set tag tgcol3=4
+sql alter table $tb set tag tgcol4=3
+sql alter table $tb set tag tgcol5=2
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '3'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 3 then 
+  return -1
+endi
+if $data07 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '5'
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 4
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 2
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '1'
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol6
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol4 int
+sql alter table $mt add tag tgcol6 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=7 
+sql alter table $tb set tag tgcol2=8 
+sql alter table $tb set tag tgcol3=9
+sql alter table $tb set tag tgcol4=10
+sql alter table $tb set tag tgcol5=11
+sql alter table $tb set tag tgcol6=12
+sql reset query cache
+
+sql select * from $mt where tgcol2 = '8'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 9 then 
+  return -1
+endi
+if $data04 != 11.000000000 then 
+  return -1
+endi
+if $data05 != 8 then 
+  return -1
+endi
+if $data06 != 10 then 
+  return -1
+endi
+if $data07 != 12 then 
+  return -1
+endi
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 1 )
+sql insert into $tb values(now, 1)  
+
+sql alter table $mt add tag tgcol3 binary(10)
+sql alter table $mt add tag tgcol4 int
+sql alter table $mt add tag tgcol5 bigint
+sql alter table $mt add tag tgcol6 bigint
+
+return
+sql alter table $mt add tag tgcol7 bigint -x step141
+  return -1
+step141:
+sql reset query cache
+sql alter table $mt drop tag tgcol6
+sql alter table $mt add tag tgcol7 bigint
+sql alter table $mt add tag tgcol8 bigint -x step142
+  return -1
+step142:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4fa22d3995617ec16d9ad85d5ef9a11bfe65ac06
--- /dev/null
+++ b/tests/script/general/tag/bigint.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_bi_db
+$tbPrefix = ta_bi_tb
+$mtPrefix = ta_bi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7c6f95b1ef785d5621d02e51e28fe96f7fe37f6c
--- /dev/null
+++ b/tests/script/general/tag/binary.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_by_db
+$tbPrefix = ta_by_tb
+$mtPrefix = ta_by_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..077ec85b523d9fa20a90c1ec8f0e9309dd2b3ea2
--- /dev/null
+++ b/tests/script/general/tag/binary_binary.sim
@@ -0,0 +1,311 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_bib_db
+$tbPrefix = ta_bib_tb
+$mtPrefix = ta_bib_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0', '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1', '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..349cb738bffbb216305af0718611987ae7f20f9c
--- /dev/null
+++ b/tests/script/general/tag/bool.sim
@@ -0,0 +1,242 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_bo_db
+$tbPrefix = ta_bo_tb
+$mtPrefix = ta_bo_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then
+  print expect 100, actual:$rows
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a3f99e25ad8f62562cc70f3776e99397a815ae2f
--- /dev/null
+++ b/tests/script/general/tag/bool_binary.sim
@@ -0,0 +1,311 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_bob_db
+$tbPrefix = ta_bob_tb
+$mtPrefix = ta_bob_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1a2726dbaa684e2c39a37f1ef29827b480fc3617
--- /dev/null
+++ b/tests/script/general/tag/bool_int.sim
@@ -0,0 +1,327 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_boi_db
+$tbPrefix = ta_boi_tb
+$mtPrefix = ta_boi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a7b8554bd96f6e8857d9b6a6b2de4faa4459bf2e
--- /dev/null
+++ b/tests/script/general/tag/change.sim
@@ -0,0 +1,515 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_ch_db
+$tbPrefix = ta_ch_tb
+$mtPrefix = ta_ch_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tagcx tgcol3 -x step21
+  return -1
+step21:
+sql alter table $mt change tag tgcol1 tgcol2 -x step22
+  return -1
+step22:
+#sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
+#  return -1
+#step20:
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+sql alter table $mt change tag tgcol4 tgcol3 -x step23
+  return -1
+step23:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql reset query cache
+sql alter table $mt change tag tgcol4 tgcol3
+sql alter table $mt change tag tgcol1 tgcol7
+sql alter table $mt change tag tgcol2 tgcol8
+sql reset query cache
+sql alter table $mt change tag tgcol3 tgcol9
+sql alter table $mt change tag tgcol5 tgcol10
+sql alter table $mt change tag tgcol6 tgcol11
+
+sleep 5000
+sql reset query cache
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step24
+  return -1
+step24:
+sql select * from $mt where tgcol2 = 1 -x step25
+  return -1
+step25:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step31
+  return -1
+step31:
+sql select * from $mt where tgcol2 = 1 -x step32
+  return -1
+step32:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step41
+  return -1
+step41:
+sql select * from $mt where tgcol2 = 1 -x step42
+  return -1
+step42:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step51
+  return -1
+step51:
+sql select * from $mt where tgcol2 = 1 -x step52
+  return -1
+step52:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = '2'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step61
+  return -1
+step61:
+sql select * from $mt where tgcol2 = 1 -x step62
+  return -1
+step62:
+sql select * from $mt where tgcol3 = 1 -x step63
+  return -1
+step63:
+sql select * from $mt where tgcol4 = 1 -x step64
+  return -1
+step64:
+sql select * from $mt where tgcol5 = 1 -x step65
+  return -1
+step65:
+sql select * from $mt where tgcol6 = 1 -x step66
+  return -1
+step66:
+
+sql select * from $mt where tgcol7 = '1'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol8 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol9 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol10 = 5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol11 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4a36e832f1bf6f373a81318e483ee02ee6bf2e01
--- /dev/null
+++ b/tests/script/general/tag/column.sim
@@ -0,0 +1,96 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_co_db
+$tbPrefix = ta_co_tb
+$mtPrefix = ta_co_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+
+$i = 0
+sql create table $mt (ts timestamp, tbcol int, tbcol2 binary(10)) TAGS(tgcol int, tgcol2 binary(10))
+
+print =============== step2
+
+$i = 0
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(  0,  '0' )
+
+$i = 1
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(  1,   1  )  
+
+$i = 2
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags( '2', '2' )
+
+$i = 3
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags( '3',  3  )
+
+sql show tables
+if $rows != 4 then
+  return -1
+endi
+
+print =============== step3
+
+$i = 0
+$tb = $tbPrefix . $i
+sql insert into $tb values(now,  0,  '0')
+
+$i = 1
+$tb = $tbPrefix . $i
+sql insert into $tb values(now,  1,   1  )
+
+$i = 2
+$tb = $tbPrefix . $i
+sql insert into $tb values(now, '2', '2')
+
+$i = 3
+$tb = $tbPrefix . $i
+sql insert into $tb values(now, '3',  3)
+
+print =============== step4
+sql select * from $mt where tgcol2 = '1'
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt
+if $rows != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8b07d98afbaf343056ca94955e1b8977e1c46fe1
--- /dev/null
+++ b/tests/script/general/tag/commit.sim
@@ -0,0 +1,1184 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 int
+sql reset query cache
+sql alter table $tb set tag tgcol4 =4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step2
+  return -1
+step2:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 tinyint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step3
+  return -1
+step3:
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql describe $tb
+if $data21 != BIGINT then 
+  return -1
+endi
+if $data31 != FLOAT then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 float
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step4
+  return -1
+step4:
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 smallint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = '1' -x step5
+  return -1
+step5:
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
+sql create table $tb using $mt tags( 1, 2, 3 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(10)
+sql alter table $mt add tag tgcol6 binary(10)
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=false 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 1
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1 -x step52
+  return -1
+step52:
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bigint
+sql alter table $mt add tag tgcol6 tinyint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol6 = 6
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step71
+  return -1
+step71:
+sql select * from $mt where tgcol3 = 1 -x step72
+  return -1
+step72:
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(17)
+sql alter table $mt add tag tgcol6 bool
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step81
+  return -1
+step81:
+sql select * from $mt where tgcol3 = 1 -x step82
+  return -1
+step82:
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bool
+sql alter table $mt add tag tgcol6 float
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=1
+sql alter table $tb set tag tgcol6=6
+sql reset query cache
+
+sql select * from $mt where tgcol5 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4.000000000 then 
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 6.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step91
+  return -1
+step91:
+sql select * from $mt where tgcol2 = 1 -x step92
+  return -1
+step92:
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol4 = '4'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step103
+  return -1
+step103:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bool
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=false
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step101
+  return -1
+step101:
+sql select * from $mt where tgcol3 = 1 -x step102
+  return -1
+step102:
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step114
+  return -1
+step114:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 int
+sql alter table $mt add tag tgcol6 binary(10)
+sql alter table $mt add tag tgcol7 bigint
+sql alter table $mt add tag tgcol8 smallint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
+sql alter table $tb set tag tgcol7=7
+sql alter table $tb set tag tgcol8=8
+sql reset query cache
+
+sql select * from $mt where tgcol5 =5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 6 then 
+  return -1
+endi
+if $data06 != 7 then 
+  return -1
+endi
+if $data07 != 8 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step111
+  return -1
+step111:
+sql select * from $mt where tgcol3 = 1 -x step112
+  return -1
+step112:
+sql select * from $mt where tgcol9 = 1 -x step113
+  return -1
+step113:
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 4.000000000 then 
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol3 int
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=false 
+sql alter table $tb set tag tgcol2=5 
+sql alter table $tb set tag tgcol3=4
+sql alter table $tb set tag tgcol4=3
+sql alter table $tb set tag tgcol5=2
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '3'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 3 then 
+  return -1
+endi
+if $data07 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '5'
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 4
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 2
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '1'
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol6
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol4 int
+sql alter table $mt add tag tgcol6 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=7 
+sql alter table $tb set tag tgcol2=8 
+sql alter table $tb set tag tgcol3=9
+sql alter table $tb set tag tgcol4=10
+sql alter table $tb set tag tgcol5=11
+sql alter table $tb set tag tgcol6=12
+sql reset query cache
+
+sql select * from $mt where tgcol2 = '8'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 9 then 
+  return -1
+endi
+if $data04 != 11.000000000 then 
+  return -1
+endi
+if $data05 != 8 then 
+  return -1
+endi
+if $data06 != 10 then 
+  return -1
+endi
+if $data07 != 12 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 1
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol6 = 6
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol5 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4.000000000 then 
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 6.00000 then
+  return -1
+endi
+
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol5 =5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 6 then 
+  return -1
+endi
+if $data06 != 7 then 
+  return -1
+endi
+if $data07 != 8 then 
+  return -1
+endi
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+
+sql select * from $mt where tgcol4 = '3'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 3 then 
+  return -1
+endi
+if $data07 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '5'
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 4
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 2
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '1'
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol2 = '8'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 9 then 
+  return -1
+endi
+if $data04 != 11.000000000 then 
+  return -1
+endi
+if $data05 != 8 then 
+  return -1
+endi
+if $data06 != 10 then 
+  return -1
+endi
+if $data07 != 12 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim
new file mode 100644
index 0000000000000000000000000000000000000000..adbb14e88aa28a1b5b1d1f7cd7bdab53c6d7c104
--- /dev/null
+++ b/tests/script/general/tag/create.sim
@@ -0,0 +1,604 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_cr_db
+$tbPrefix = ta_cr_tb
+$mtPrefix = ta_cr_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then
+  print expect 0, actual: $rows
+  return -1
+endi
+  
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+sql create table $tb using $mt tags( '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then
+  print expect 1, actual: $rows
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+print =============== step15
+$i = 15
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step16
+$i = 16
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step17
+$i = 17
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = true
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step18
+$i = 18
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step19
+$i = 19
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step20
+$i = 20
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step21
+$i = 21
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step22
+$i = 22
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step23
+$i = 23
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step24
+$i = 24
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 3
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 4
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 5
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '6'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step25
+$i = 25
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol6 = '6'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step26
+$i = 26
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4', '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step27
+$i = 27
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10), tgcol7) -x step27
+  return -1
+step27:
+
+print =============== step28
+$i = 28
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))
+sql create table $tb using $mt tags('1', '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+print =============== step29
+$i = 29
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))
+sql create table $tb using $mt tags('1', '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+print =============== step30
+$i = 30
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
+#  return -1
+step30: 
+
+print =============== step31
+$i = 31
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
+sql_error create table $tb using $mt tags('1234567')
+sql create table $tb using $mt tags('12345')
+sql insert into $tb values(now, 1) 
+sql select * from $mt 
+print sql select * from $mt
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+if $data02 != 12345 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f3d0735b5c2c158b1bbc9725755c7349a474178a
--- /dev/null
+++ b/tests/script/general/tag/delete.sim
@@ -0,0 +1,827 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_de_db
+$tbPrefix = ta_de_tb
+$mtPrefix = ta_de_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 < 3
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql describe $tb
+if $data21 != BIGINT then 
+  return -1
+endi
+if $data31 != FLOAT then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol1 -x step40
+  return -1
+step40:
+sql alter table $mt drop tag tgcol2
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol1 -x step50
+  return -1
+step50:
+sql alter table $mt drop tag tgcol2
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
+sql create table $tb using $mt tags( 1, 2, 3 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql describe $tb
+if $data21 != SMALLINT then 
+  return -1
+endi
+if $data31 != TINYINT then 
+  return -1
+endi
+if $data41 != BINARY then 
+  return -1
+endi
+if $data22 != 2 then 
+  return -1
+endi
+if $data32 != 1 then 
+  return -1
+endi
+if $data42 != 10 then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+if $data43 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, '2', '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol2
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol4 = '4'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol4
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol5
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 4.000000000 then 
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol5
+sql alter table $mt drop tag tgcol6
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol6
+
+sleep 5000
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step2
+  return -1
+step2:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step3
+  return -1
+step3:
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step4
+  return -1
+step4:
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '1' -x step5
+  return -1
+step5:
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step51
+  return -1
+step51:
+sql select * from $mt where tgcol3 = 1 -x step52
+  return -1
+step52:
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step71
+  return -1
+step71:
+sql select * from $mt where tgcol3 = 1 -x step72
+  return -1
+step72:
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step81
+  return -1
+step81:
+sql select * from $mt where tgcol3 = 1 -x step82
+  return -1
+step82:
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step91
+  return -1
+step91:
+sql select * from $mt where tgcol2 = 1 -x step92
+  return -1
+step92:
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = '1'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step101
+  return -1
+step101:
+sql select * from $mt where tgcol3 = 1 -x step102
+  return -1
+step102:
+sql select * from $mt where tgcol4 = 1 -x step103
+  return -1
+step103:
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4=4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step111
+  return -1
+step111:
+sql select * from $mt where tgcol3 = 1 -x step112
+  return -1
+step112:
+sql select * from $mt where tgcol5 = 1 -x step113
+  return -1
+step113:
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4.000000000 then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step120
+  return -1
+step120:
+sql select * from $mt where tgcol3 = 1 -x step121
+  return -1
+step121:
+sql select * from $mt where tgcol5 = 1 -x step122
+  return -1
+step122:
+sql select * from $mt where tgcol6 = 1 -x step123
+  return -1
+step123:
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql reset query cache
+sql select * from $mt where tgcol2 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 5.000000000 then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step130
+  return -1
+step130:
+sql select * from $mt where tgcol4 = 1 -x step131
+  return -1
+step131:
+sql select * from $mt where tgcol6 = 1 -x step133
+  return -1
+step133:
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 1 )
+sql insert into $tb values(now, 1)  
+
+sql alter table xxmt drop tag tag1 -x step141
+  return -1
+step141:
+sql alter table $tb drop tag tag1 -x step142
+  return -1
+step142:
+sql alter table $mt drop tag tag1 -x step143
+  return -1
+step143:
+
+sql alter table $mt drop tag tagcol1 -x step144
+  return -1
+step144:
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol1 -x step145
+  return -1
+step145:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..13dcb1fc72b7c760c325a09fe0589ce0a211e23a
--- /dev/null
+++ b/tests/script/general/tag/double.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_do_db
+$tbPrefix = ta_do_tb
+$mtPrefix = ta_do_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..75a6ed00da6d3b8173b748961d42ab8f909e7ef1
--- /dev/null
+++ b/tests/script/general/tag/filter.sim
@@ -0,0 +1,149 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_fi_db
+$tbPrefix = ta_fi_tb
+$mtPrefix = ta_fi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tg = '1' -x step2
+  return -1
+step2:
+
+print =============== step3
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where noexist = '1' -x step3
+  return -1
+step3:
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'  
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 10 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(cc), sum(xx), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt -x step6
+  return -1
+step6:
+
+print =============== step7
+sql select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol), max(tgcol), first(tgcol), last(tgcol) from $mt -x step7
+  return -1
+step7:
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tbcol
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by noexist  -x step9
+  return -1
+step9:
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as c from $mt group by tbcol
+
+print =============== step12
+sql select count(tbcol) as c from $mt group by noexist -x step12
+  return -1
+step12:
+
+print =============== step13
+sql select count(tbcol) as c from $mt group by tgcol
+print $data00 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then
+  print expect 100, actual $data00
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol) as c from $mt where noexist < 1  group by tgcol -x step15
+  return -1
+step15:
+
+print =============== step16
+sql select count(tbcol) as c from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2352bbaf2e8a2c5e27158332434d59be62e8d9d6
--- /dev/null
+++ b/tests/script/general/tag/float.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_fl_db
+$tbPrefix = ta_fl_tb
+$mtPrefix = ta_fl_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a93df9a57afabdd59d22e1de44504db1bdbdaef4
--- /dev/null
+++ b/tests/script/general/tag/int.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_in_db
+$tbPrefix = ta_in_tb
+$mtPrefix = ta_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d3795006680a771190930b446c2390a5240dcb01
--- /dev/null
+++ b/tests/script/general/tag/int_binary.sim
@@ -0,0 +1,311 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_inb_db
+$tbPrefix = ta_inb_tb
+$mtPrefix = ta_inb_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..510c4f92d0810f6a675f0b0180081c0bf552584e
--- /dev/null
+++ b/tests/script/general/tag/int_float.sim
@@ -0,0 +1,327 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_inf_db
+$tbPrefix = ta_inf_tb
+$mtPrefix = ta_inf_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 > 0.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 < 0.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim
new file mode 100644
index 0000000000000000000000000000000000000000..112695d37b0a924779812485e22ffb5680a8856e
--- /dev/null
+++ b/tests/script/general/tag/set.sim
@@ -0,0 +1,459 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_se_db
+$tbPrefix = ta_se_tb
+$mtPrefix = ta_se_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tagcx 1 -x step21
+  return -1
+step21:
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = false
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql describe $tb
+print $data21 $data23 $data32 $data33
+if $data21 != BOOL then 
+  return -1
+endi
+if $data31 != INT then 
+  return -1
+endi
+if $data23 != TAG then
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 2
+if $rows != 0 then 
+  return -1
+endi
+  
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4.00000 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4.00000 then 
+  return -1
+endi
+  
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2='4'
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2=8
+sql alter table $tb set tag tgcol4='9'
+sql alter table $tb set tag tgcol5=10
+sql alter table $tb set tag tgcol6='11'
+
+sql reset query cache
+  
+sql select * from $mt where tgcol1 = '7'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 8
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = '9'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 10
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '11'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..18b0957b1517560bca651ef9fbd4cc9325e94a22
--- /dev/null
+++ b/tests/script/general/tag/smallint.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_sm_db
+$tbPrefix = ta_sm_tb
+$mtPrefix = ta_sm_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/tag/testSuite.sim b/tests/script/general/tag/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..45356efac1daa4f8f5fae06b8aad8c7b139bc9a0
--- /dev/null
+++ b/tests/script/general/tag/testSuite.sim
@@ -0,0 +1,25 @@
+run general/tag/3.sim
+run general/tag/4.sim
+run general/tag/5.sim
+run general/tag/6.sim
+run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+run general/tag/change.sim
+run general/tag/column.sim
+run general/tag/commit.sim
+run general/tag/create.sim
+run general/tag/delete.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
+run general/tag/set.sim
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f104f8df04356487999bd4232db70b9ea067dd73
--- /dev/null
+++ b/tests/script/general/tag/tinyint.sim
@@ -0,0 +1,244 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = ta_ti_db
+$tbPrefix = ta_ti_tb
+$mtPrefix = ta_ti_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/authority.sim b/tests/script/general/user/authority.sim
new file mode 100644
index 0000000000000000000000000000000000000000..71f185043b3ef8fbe0fb09d53c9d4dae372d41fa
--- /dev/null
+++ b/tests/script/general/user/authority.sim
@@ -0,0 +1,66 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 3000
+
+print ============= step1
+sql create user read pass 'taosdata'
+sql create user write pass 'taosdata'
+sql show users
+if $rows != 5 then
+  return -1
+endi
+
+print ============= step2
+sql close
+sql connect read
+sleep 2000
+
+sql create database dread
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+
+print ============= step3
+sql close
+sql connect write
+sleep 2000
+
+sql create database dwrite
+sql show databases
+if $rows != 2 then
+  return -1
+endi
+
+print ============ step4
+sql close
+sql connect
+sleep 2000
+
+sql show databases
+if $row != 2 then
+  return -1
+endi
+
+print ============ step5
+sql close
+sql connect read
+sleep 2000
+sql drop database dread
+sql drop database dwrite
+
+
+sql close
+sql connect
+sql show databases
+if $rows != 0 then
+  return -1
+endi
+
+sql close
+sql connect
+sleep 2000
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/basic1.sim b/tests/script/general/user/basic1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3670c1ddb097146f97135b2cab0022c9531d89e0
--- /dev/null
+++ b/tests/script/general/user/basic1.sim
@@ -0,0 +1,74 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== show users
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+
+sql_error show accounts;
+sql_error create account a pass "a"
+sql_error drop account a
+sql_error drop account root
+
+print =============== create user1
+sql create user user1 PASS 'user1'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+print $data30 $data31 $data32
+
+print =============== create user2
+sql create user user2 PASS 'user2'
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+print $data30 $data31 $data32
+print $data40 $data41 $data42
+
+print =============== drop user1
+sql drop user user1
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+print $data30 $data31 $data32
+
+print =============== restart taosd
+system sh/exec.sh -n dnode1 -s stop
+sleep 1000
+system sh/exec.sh -n dnode1 -s start
+
+print =============== show users
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+print $data30 $data31 $data32
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim
new file mode 100644
index 0000000000000000000000000000000000000000..eb543612f560fa43be7cb8a87ba36c3a344c1212
--- /dev/null
+++ b/tests/script/general/user/monitor.sim
@@ -0,0 +1,32 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+
+print ========== step1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ========== step2
+#sql drop database log -x step21
+#  return -1
+#step21:
+sql drop table log.dn -x step22
+  return -1
+step22:
+sql drop user log -x step23
+  return -1
+step23:
+
+print ========== step3
+
+sleep 3000
+sql select * from log.dn
+if $rows == 0 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..857d658db1ee7f1b91220106983ebb95c9b687d6
--- /dev/null
+++ b/tests/script/general/user/pass_alter.sim
@@ -0,0 +1,68 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============= step1
+sql create user read pass 'taosdata1'
+sql create user write pass 'taosdata1'
+
+sql alter user read pass 'taosdata'
+sql alter user write pass 'taosdata'
+
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print ============= step2
+sql close
+sleep 2500
+print user read login
+sql connect read
+sql alter user read pass 'taosdata'
+sql alter user write pass 'taosdata1' -x step2
+  return -1
+step2:
+
+sql_error create user read pass 'taosdata1'
+sql_error create user write pass 'taosdata1'
+
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print ============= step3
+sql close
+sleep 2500
+print user write login
+sql connect write
+
+sql_error create user read pass 'taosdata1'
+sql_error create user write pass 'taosdata1'
+sql alter user write pass 'taosdata'
+sql alter user read pass 'taosdata' -x step3
+  return -1
+step3:
+
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print ============= step4
+sql close 
+sleep 2500
+print root write login
+sql connect
+sql create user oroot pass 'taosdata'
+
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d5d7b3250fe18490f92a299d100990f8b0405bca
--- /dev/null
+++ b/tests/script/general/user/pass_len.sim
@@ -0,0 +1,82 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = apdb
+$tbPrefix = aptb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$userPrefix = apusr
+
+print =============== step1
+$i = 0
+$user = $userPrefix . $i
+
+sql drop user $user -x step11
+  return -1
+step11:
+
+sql create user $user PASS -x step12
+  return -1
+step12:
+
+sql create user $user PASS 'taosdata'
+
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$user = $userPrefix . $i
+sql drop user $user -x step2
+step2:
+sql create user $user PASS '1'
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$user = $userPrefix . $i
+sql drop user $user -x step3
+step3:
+
+sql create user $user PASS 'abc0123456789'
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+print =============== step4
+$i = 3
+$user = $userPrefix . $i
+sql create user $user PASS 'abcd012345678901234567891234567890' -x step4
+	return -1
+step4:
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+$i = 0
+while $i < 3
+  $user = $userPrefix . $i
+  sql drop user $user 
+  $i = $i + 1
+endw
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/testSuite.sim b/tests/script/general/user/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b4bf52cfd1dfd13e99306110a63a19e6dc8bb230
--- /dev/null
+++ b/tests/script/general/user/testSuite.sim
@@ -0,0 +1,6 @@
+run general/user/basic1.sim
+run general/user/monitor.sim
+run general/user/pass_alter.sim
+run general/user/pass_len.sim
+run general/user/user_create.sim
+run general/user/user_len.sim
\ No newline at end of file
diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim
new file mode 100644
index 0000000000000000000000000000000000000000..34934d09e6bb6c26a2ac228f722d841aba82fba6
--- /dev/null
+++ b/tests/script/general/user/user_create.sim
@@ -0,0 +1,84 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== step1
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+sql create user read PASS 'pass123'
+sql create user read PASS 'pass123' -x step1
+	return -1
+step1:
+
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql alter user read PASS 'taosdata'
+
+print =============== step2
+sql close
+sql connect read
+sleep 2000
+
+sql alter user read PASS 'taosdata'
+
+print =============== step3
+sql drop user read -x step31
+  return -1
+step31:
+sql drop user _root -x step32
+  return -1
+step32:
+sql drop user monitor -x step33
+  return -1
+step33:
+
+print =============== step4
+sql close
+sql connect
+sleep 2000
+
+sql alter user read privilege read
+sql show users
+print $data1_read
+if $data1_read != readable then 
+  return -1
+endi
+
+sql_error alter user read privilege super
+sql show users
+print $data1_read
+if $data1_read != readable then
+  return -1
+endi
+
+sql alter user read privilege write
+sql show users
+print $data1_read
+if $data1_read != writable then 
+  return -1
+endi
+
+sql alter user read privilege 1 -x step43
+  return -1
+step43:
+
+sql drop user _root -x step41
+  return -1
+step41:
+
+sql drop user monitor -x step42
+  return -1
+step42:
+
+sql drop user read
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..79b72468bbf64a5f834c34979391f43c25809c0c
--- /dev/null
+++ b/tests/script/general/user/user_len.sim
@@ -0,0 +1,90 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_us_db
+$tbPrefix = lm_us_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop user ac -x step0
+	return -1
+step0:
+
+sql create user PASS '123' -x step1
+	return -1
+step1:
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step2
+sql drop user a -x step2
+step2:
+sql create user a PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user a
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step3
+sql drop user abc01234567890123456789 -x step3
+step3:
+
+sql create user abc01234567890123456789 PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user abc01234567890123456789
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step4
+sql create user abcd0123456789012345678901234567890111 PASS '123' -x step4
+	return -1
+step4:
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step5
+sql drop user 123 -x step5
+step5:
+sql create user 123 PASS '123' -x step61
+  return -1
+step61:
+
+sql create user a123 PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user a123
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2a03ccea19a46771a89755791c7b696f547d296c
--- /dev/null
+++ b/tests/script/general/vector/metrics_field.sim
@@ -0,0 +1,623 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mf_db
+$tbPrefix = m_mf_tb
+$mtPrefix = m_mf_mt
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where a = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where a = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where a = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where a = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where a = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where a = 5
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where a = 5
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where a = 5
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where a = 5
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where a = 5
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where a = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where a = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where a = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim
new file mode 100644
index 0000000000000000000000000000000000000000..96b2f6a7a013d4bd323de7db9c39dfcf433421b2
--- /dev/null
+++ b/tests/script/general/vector/metrics_mix.sim
@@ -0,0 +1,623 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mx_db
+$tbPrefix = m_mx_tb
+$mtPrefix = m_mx_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - ffrom $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step020
+  return -1
+step020:
+
+sql select a -f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..824aa6f22e45153b295f2b42afe9ebcf45d00642
--- /dev/null
+++ b/tests/script/general/vector/metrics_query.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mq_db
+$tbPrefix = m_mq_tb
+$mtPrefix = m_mq_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt -x step21
+  return -1
+step21:
+
+sql select h - f from $mt -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt -x step23
+  return -1
+step23:
+
+sql select a - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e7575cc9df5e9c0c49af8ec21ed629c73cd7a0e6
--- /dev/null
+++ b/tests/script/general/vector/metrics_tag.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mtg_db
+$tbPrefix = m_mtg_tb
+$mtPrefix = m_mtg_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where tgcol = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where tgcol = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where tgcol = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where tgcol = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where tgcol = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where tgcol = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bbcabfd1b7f81dc65f8c61f4c46d09bd18d1c35b
--- /dev/null
+++ b/tests/script/general/vector/metrics_time.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mt_db
+$tbPrefix = m_mt_tb
+$mtPrefix = m_mt_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim
new file mode 100644
index 0000000000000000000000000000000000000000..105f210950960ac8dc75dd38e22af1fb8dd5b060
--- /dev/null
+++ b/tests/script/general/vector/multi.sim
@@ -0,0 +1,216 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_mu_db
+$tbPrefix = m_mu_tb
+$mtPrefix = m_mu_mt
+
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f binary(10), g bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + b from $tb 
+print ===> $data00 $data10 $data20 $data30
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where ts < now + 4m order by ts desc
+
+sql select a + a from $tb where ts > now + 4m order by ts desc 
+
+sql select a + c from $tb where ts < now + 4m order by ts asc
+
+sql select a + f from $tb where ts > now + 4m order by ts asc  -x step24
+  return -1
+step24:
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - e from $tb 
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - e from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * b + e from $tb 
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select a * b + c from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a * b -d from $tb where ts > now + 4m
+print ===> $data20
+if $data20 != 42.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / 2 + e from $tb 
+print ===> $data00
+if $data00 != 10.500000000 then 
+  return -1
+endi
+
+sql select a / 2 from $tb where ts < now + 4m
+print ===> $data10
+if $data10 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / 2 * e from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a / e  from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+sql select a + ts from $tb -x step61
+  return -1
+step61:
+
+sql select a + f from $tb -x step62
+  return -1
+step62:
+
+sql select a + g from $tb -x step63
+  return -1
+step63:
+
+print =============== step7
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + b from $tb where a = 2
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+sql select * from $tb where b < 2
+print ===> $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from $tb where b > 2
+print ===> $rows
+if $rows != 17 then 
+  return -1
+endi
+
+sql select a + c from $tb where b = 2 and ts < now + 4m
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where c = 10 and ts > now + 4m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where d = 2 and ts < now + 4m order by ts desc
+
+sql select a + a from $tb where e = 2 and ts > now + 4m order by ts desc 
+
+sql select a + c from $tb where f = 2 and ts < now + 4m order by ts asc
+
+sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc  -x step74
+  return -1
+step74:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2292d6f44ae43286d619a560320c31b3085ea267
--- /dev/null
+++ b/tests/script/general/vector/single.sim
@@ -0,0 +1,303 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_si_db
+$tbPrefix = m_si_tb
+$mtPrefix = m_si_mt
+
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol + 1 from $tb 
+print ===> $data00 $data10 $data20 $data30
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 6.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts < now + 4m order by ts desc
+
+sql select tbcol + 1 from $tb where ts > now + 4m order by ts desc
+
+sql select tbcol + 1 from $tb where ts < now + 4m order by ts asc
+
+sql select tbcol + 1 from $tb where ts > now + 4m order by ts asc
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol - 1 from $tb 
+print ===> $data00
+if $data00 != -1.000000000 then 
+  return -1
+endi
+
+sql select tbcol - 1 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != -1.000000000 then 
+  return -1
+endi
+
+sql select tbcol - 1 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol * 2 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol * 2 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol / 2 from $tb where ts < now + 4m
+print ===> $data10
+if $data10 != 0.500000000 then 
+  return -1
+endi
+
+sql select tbcol / 2 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select tbcol / 0 from $tb where ts > now + 4m
+print ===> $data00
+#if $data00 != 0.000000000 then 
+#  return -1
+#endi
+
+print =============== step6
+$i = 11
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol bool)
+sql insert into $tb values(now, 0)
+sql select tbcol + 2 from $tb -x step6
+  return -1
+step6:
+
+print =============== step7
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol tinyint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step8
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol smallint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step9
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol bigint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step10
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol float)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step11
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol double)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step12
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol binary(100))
+sql insert into $tb values(now, '0');
+sql select tbcol + 2 from $tb -x step12
+  return -1
+step12:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a9d6910f4da4c1258d7a2efdf592352e7d043349
--- /dev/null
+++ b/tests/script/general/vector/table_field.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_tf_db
+$tbPrefix = m_tf_tb
+$mtPrefix = m_tf_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where a = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where a = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where a = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where a = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where a = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where a = 5
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where a = 5
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where a = 5
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where a = 5
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where a = 5
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where a = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where a = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where a = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a6c4dc92da51d312c2a65561ecb8fcbf4737239a
--- /dev/null
+++ b/tests/script/general/vector/table_mix.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_tm_db
+$tbPrefix = m_tm_tb
+$mtPrefix = m_tm_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..812229afc4acaf7cb8515c3cbb483bad302b8ac0
--- /dev/null
+++ b/tests/script/general/vector/table_query.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_tq_db
+$tbPrefix = m_tq_tb
+$mtPrefix = m_tq_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb -x step21
+  return -1
+step21:
+
+sql select h - f from $tb -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb -x step23
+  return -1
+step23:
+
+sql select a - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a83195beba2fe0dec305098407ec872aa47e8535
--- /dev/null
+++ b/tests/script/general/vector/table_time.sim
@@ -0,0 +1,619 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$dbPrefix = m_tt_db
+$tbPrefix = m_tt_tb
+$mtPrefix = m_tt_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/vector/testSuite.sim b/tests/script/general/vector/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f0b9fef9912699f5e8ed86b322c30db2d4210c83
--- /dev/null
+++ b/tests/script/general/vector/testSuite.sim
@@ -0,0 +1,11 @@
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
+run general/vector/metrics_query.sim
+run general/vector/metrics_tag.sim
+run general/vector/metrics_time.sim
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
new file mode 100644
index 0000000000000000000000000000000000000000..000d36c17865630a0fa0557a50724e352a8ce1b0
--- /dev/null
+++ b/tests/script/jenkins/basic.txt
@@ -0,0 +1,376 @@
+cd ../../../debug; cmake ..
+cd ../../../debug; make
+
+./test.sh -f general/alter/cached_schema_after_alter.sim
+./test.sh -f general/alter/count.sim
+./test.sh -f general/alter/dnode.sim
+./test.sh -f general/alter/import.sim
+./test.sh -f general/alter/insert1.sim
+./test.sh -f general/alter/insert2.sim
+./test.sh -f general/alter/metrics.sim
+./test.sh -f general/alter/table.sim
+
+./test.sh -f general/cache/new_metrics.sim
+./test.sh -f general/cache/restart_metrics.sim
+./test.sh -f general/cache/restart_table.sim
+
+./test.sh -f general/connection/connection.sim  
+
+./test.sh -f general/column/commit.sim
+./test.sh -f general/column/metrics.sim
+./test.sh -f general/column/table.sim
+
+./test.sh -f general/compress/commitlog.sim
+./test.sh -f general/compress/compress.sim
+./test.sh -f general/compress/compress2.sim
+./test.sh -f general/compress/uncompress.sim
+
+./test.sh -f general/compute/avg.sim
+./test.sh -f general/compute/bottom.sim
+./test.sh -f general/compute/count.sim
+./test.sh -f general/compute/diff.sim
+./test.sh -f general/compute/diff2.sim
+./test.sh -f general/compute/first.sim
+./test.sh -f general/compute/interval.sim
+./test.sh -f general/compute/last.sim
+./test.sh -f general/compute/leastsquare.sim
+./test.sh -f general/compute/max.sim
+./test.sh -f general/compute/min.sim
+./test.sh -f general/compute/null.sim
+./test.sh -f general/compute/percentile.sim
+./test.sh -f general/compute/stddev.sim
+./test.sh -f general/compute/sum.sim
+./test.sh -f general/compute/top.sim
+
+./test.sh -f general/db/alter_option.sim
+./test.sh -f general/db/alter_tables_d2.sim
+./test.sh -f general/db/alter_tables_v1.sim
+./test.sh -f general/db/alter_tables_v4.sim
+./test.sh -f general/db/alter_vgroups.sim
+./test.sh -f general/db/basic.sim
+./test.sh -f general/db/basic1.sim
+./test.sh -f general/db/basic2.sim
+./test.sh -f general/db/basic3.sim
+./test.sh -f general/db/basic4.sim
+./test.sh -f general/db/basic5.sim
+./test.sh -f general/db/delete_reuse1.sim
+./test.sh -f general/db/delete_reuse2.sim
+./test.sh -f general/db/delete_reusevnode.sim
+./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_writing1.sim
+./test.sh -f general/db/delete_writing2.sim
+./test.sh -f general/db/delete.sim
+./test.sh -f general/db/len.sim
+./test.sh -f general/db/repeat.sim
+./test.sh -f general/db/tables.sim
+./test.sh -f general/db/vnodes.sim
+
+./test.sh -f general/field/2.sim
+./test.sh -f general/field/3.sim
+./test.sh -f general/field/4.sim
+./test.sh -f general/field/5.sim
+./test.sh -f general/field/6.sim
+./test.sh -f general/field/bigint.sim
+./test.sh -f general/field/binary.sim
+./test.sh -f general/field/bool.sim
+./test.sh -f general/field/single.sim
+./test.sh -f general/field/smallint.sim
+./test.sh -f general/field/tinyint.sim
+
+./test.sh -f general/http/autocreate.sim
+./test.sh -f general/http/chunked.sim
+./test.sh -f general/http/gzip.sim
+./test.sh -f general/http/restful.sim
+./test.sh -f general/http/restful_insert.sim
+./test.sh -f general/http/restful_limit.sim
+./test.sh -f general/http/restful_full.sim
+./test.sh -f general/http/prepare.sim
+./test.sh -f general/http/telegraf.sim
+./test.sh -f general/http/grafana_bug.sim
+./test.sh -f general/http/grafana.sim
+
+./test.sh -f general/import/basic.sim
+./test.sh -f general/import/commit.sim
+./test.sh -f general/import/large.sim
+./test.sh -f general/import/replica1.sim
+
+./test.sh -f general/insert/basic.sim
+./test.sh -f general/insert/insert_drop.sim
+./test.sh -f general/insert/query_block1_memory.sim
+./test.sh -f general/insert/query_block2_memory.sim
+./test.sh -f general/insert/query_block1_file.sim
+./test.sh -f general/insert/query_block2_file.sim
+./test.sh -f general/insert/query_file_memory.sim
+./test.sh -f general/insert/query_multi_file.sim
+./test.sh -f general/insert/tcp.sim
+
+./test.sh -f general/parser/alter.sim
+./test.sh -f general/parser/alter1.sim
+./test.sh -f general/parser/alter_stable.sim
+./test.sh -f general/parser/auto_create_tb.sim
+./test.sh -f general/parser/auto_create_tb_drop_tb.sim
+./test.sh -f general/parser/col_arithmetic_operation.sim
+./test.sh -f general/parser/columnValue.sim
+./test.sh -f general/parser/commit.sim
+./test.sh -f general/parser/create_db.sim
+./test.sh -f general/parser/create_mt.sim
+./test.sh -f general/parser/create_tb.sim
+./test.sh -f general/parser/dbtbnameValidate.sim
+./test.sh -f general/parser/import_commit1.sim
+./test.sh -f general/parser/import_commit2.sim
+./test.sh -f general/parser/import_commit3.sim
+./test.sh -f general/parser/insert_tb.sim
+./test.sh -f general/parser/first_last.sim
+./test.sh -f general/parser/lastrow.sim
+./test.sh -f general/parser/nchar.sim
+./test.sh -f general/parser/null_char.sim
+./test.sh -f general/parser/single_row_in_tb.sim
+./test.sh -f general/parser/select_from_cache_disk.sim
+./test.sh -f general/parser/mixed_blocks.sim
+./test.sh -f general/parser/selectResNum.sim
+./test.sh -f general/parser/limit.sim
+./test.sh -f general/parser/limit1.sim
+./test.sh -f general/parser/limit1_tblocks100.sim
+./test.sh -f general/parser/select_across_vnodes.sim
+./test.sh -f general/parser/slimit1.sim
+./test.sh -f general/parser/tbnameIn.sim
+./test.sh -f general/parser/projection_limit_offset.sim
+./test.sh -f general/parser/limit2.sim
+./test.sh -f general/parser/fill.sim
+./test.sh -f general/parser/fill_stb.sim
+./test.sh -f general/parser/where.sim
+./test.sh -f general/parser/slimit.sim
+./test.sh -f general/parser/select_with_tags.sim
+./test.sh -f general/parser/interp.sim
+./test.sh -f general/parser/tags_dynamically_specifiy.sim
+./test.sh -f general/parser/groupby.sim
+./test.sh -f general/parser/set_tag_vals.sim
+./test.sh -f general/parser/tags_filter.sim
+./test.sh -f general/parser/slimit_alter_tags.sim
+./test.sh -f general/parser/join.sim
+./test.sh -f general/parser/join_multivnode.sim
+./test.sh -f general/parser/binary_escapeCharacter.sim
+./test.sh -f general/parser/repeatAlter.sim
+./test.sh -f general/parser/union.sim
+./test.sh -f general/parser/topbot.sim
+
+./test.sh -f general/stable/disk.sim
+./test.sh -f general/stable/dnode3.sim
+./test.sh -f general/stable/metrics.sim
+./test.sh -f general/stable/refcount.sim
+./test.sh -f general/stable/show.sim
+./test.sh -f general/stable/values.sim
+./test.sh -f general/stable/vnode3.sim
+
+./test.sh -f general/table/autocreate.sim
+./test.sh -f general/table/basic1.sim
+./test.sh -f general/table/basic2.sim
+./test.sh -f general/table/basic3.sim
+./test.sh -f general/table/bigint.sim
+./test.sh -f general/table/binary.sim
+./test.sh -f general/table/bool.sim
+./test.sh -f general/table/column_name.sim
+./test.sh -f general/table/column_num.sim
+./test.sh -f general/table/column_value.sim
+./test.sh -f general/table/column2.sim
+./test.sh -f general/table/date.sim
+./test.sh -f general/table/db.table.sim
+./test.sh -f general/table/delete_reuse1.sim
+./test.sh -f general/table/delete_reuse2.sim
+./test.sh -f general/table/delete_writing.sim
+./test.sh -f general/table/describe.sim
+./test.sh -f general/table/double.sim
+./test.sh -f general/table/fill.sim
+./test.sh -f general/table/float.sim
+./test.sh -f general/table/int.sim
+./test.sh -f general/table/limit.sim
+./test.sh -f general/table/smallint.sim
+./test.sh -f general/table/table_len.sim
+./test.sh -f general/table/table.sim
+./test.sh -f general/table/tinyint.sim
+./test.sh -f general/table/vgroup.sim
+
+./test.sh -f general/tag/3.sim
+./test.sh -f general/tag/4.sim
+./test.sh -f general/tag/5.sim
+./test.sh -f general/tag/6.sim
+./test.sh -f general/tag/add.sim
+./test.sh -f general/tag/bigint.sim
+./test.sh -f general/tag/binary_binary.sim
+./test.sh -f general/tag/binary.sim
+./test.sh -f general/tag/bool_binary.sim
+./test.sh -f general/tag/bool_int.sim
+./test.sh -f general/tag/bool.sim
+./test.sh -f general/tag/change.sim
+./test.sh -f general/tag/column.sim
+./test.sh -f general/tag/commit.sim
+./test.sh -f general/tag/create.sim
+./test.sh -f general/tag/delete.sim
+./test.sh -f general/tag/double.sim
+./test.sh -f general/tag/filter.sim
+./test.sh -f general/tag/float.sim
+./test.sh -f general/tag/int_binary.sim
+./test.sh -f general/tag/int_float.sim
+./test.sh -f general/tag/int.sim
+./test.sh -f general/tag/set.sim
+./test.sh -f general/tag/smallint.sim
+./test.sh -f general/tag/tinyint.sim
+
+./test.sh -f general/user/authority.sim
+./test.sh -f general/user/monitor.sim
+./test.sh -f general/user/pass_alter.sim
+./test.sh -f general/user/pass_len.sim
+./test.sh -f general/user/user_create.sim
+./test.sh -f general/user/user_len.sim
+
+./test.sh -f general/vector/metrics_field.sim
+./test.sh -f general/vector/metrics_mix.sim
+./test.sh -f general/vector/metrics_query.sim
+./test.sh -f general/vector/metrics_tag.sim
+./test.sh -f general/vector/metrics_time.sim
+./test.sh -f general/vector/multi.sim
+./test.sh -f general/vector/single.sim
+./test.sh -f general/vector/table_field.sim
+./test.sh -f general/vector/table_mix.sim
+./test.sh -f general/vector/table_query.sim
+./test.sh -f general/vector/table_time.sim
+
+./test.sh -f unique/account/account_create.sim
+./test.sh -f unique/account/account_delete.sim
+./test.sh -f unique/account/account_len.sim
+./test.sh -f unique/account/authority.sim
+./test.sh -f unique/account/basic.sim
+./test.sh -f unique/account/paras.sim
+./test.sh -f unique/account/pass_alter.sim
+./test.sh -f unique/account/pass_len.sim
+./test.sh -f unique/account/usage.sim
+./test.sh -f unique/account/user_create.sim
+./test.sh -f unique/account/user_len.sim
+
+./test.sh -f unique/big/balance.sim
+./test.sh -f unique/big/maxvnodes.sim
+./test.sh -f unique/big/tcp.sim
+
+./test.sh -f unique/cluster/alter.sim
+./test.sh -f unique/cluster/balance1.sim
+./test.sh -f unique/cluster/balance2.sim
+./test.sh -f unique/cluster/balance3.sim
+./test.sh -f unique/cluster/cache.sim
+./test.sh -f unique/cluster/vgroup100.sim
+
+./test.sh -f unique/column/replica3.sim
+
+./test.sh -f unique/db/commit.sim
+./test.sh -f unique/db/delete.sim
+./test.sh -f unique/db/delete_part.sim
+./test.sh -f unique/db/replica_add12.sim
+./test.sh -f unique/db/replica_add13.sim
+./test.sh -f unique/db/replica_add23.sim
+./test.sh -f unique/db/replica_reduce21.sim
+./test.sh -f unique/db/replica_reduce32.sim
+./test.sh -f unique/db/replica_reduce31.sim
+./test.sh -f unique/db/replica_part.sim
+
+./test.sh -f unique/dnode/alternativeRole.sim
+./test.sh -f unique/dnode/balance1.sim
+./test.sh -f unique/dnode/balance2.sim
+./test.sh -f unique/dnode/balance3.sim
+./test.sh -f unique/dnode/balancex.sim
+./test.sh -f unique/dnode/offline1.sim
+./test.sh -f unique/dnode/offline2.sim
+./test.sh -f unique/dnode/reason.sim
+./test.sh -f unique/dnode/remove1.sim
+./test.sh -f unique/dnode/remove2.sim
+./test.sh -f unique/dnode/vnode_clean.sim
+
+./test.sh -f unique/http/admin.sim
+./test.sh -f unique/http/opentsdb.sim
+
+./test.sh -f unique/import/replica2.sim
+./test.sh -f unique/import/replica3.sim
+
+./test.sh -f unique/stable/balance_replica1.sim
+./test.sh -f unique/stable/dnode2_stop.sim
+./test.sh -f unique/stable/dnode2.sim
+./test.sh -f unique/stable/dnode3.sim
+./test.sh -f unique/stable/replica2_dnode4.sim
+./test.sh -f unique/stable/replica2_vnode3.sim
+./test.sh -f unique/stable/replica3_dnode6.sim
+./test.sh -f unique/stable/replica3_vnode3.sim
+
+./test.sh -f unique/mnode/mgmt20.sim
+./test.sh -f unique/mnode/mgmt21.sim
+./test.sh -f unique/mnode/mgmt22.sim
+./test.sh -f unique/mnode/mgmt23.sim
+./test.sh -f unique/mnode/mgmt24.sim
+#./test.sh -f unique/mnode/mgmt25.sim
+#./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt33.sim
+./test.sh -f unique/mnode/mgmt34.sim
+./test.sh -f unique/mnode/mgmtr2.sim
+
+./test.sh -f unique/vnode/many.sim
+./test.sh -f unique/vnode/replica2_basic2.sim
+./test.sh -f unique/vnode/replica2_repeat.sim
+./test.sh -f unique/vnode/replica3_basic.sim
+./test.sh -f unique/vnode/replica3_repeat.sim
+./test.sh -f unique/vnode/replica3_vgroup.sim
+
+./test.sh -f general/parser/stream_on_sys.sim
+./test.sh -f general/stream/metrics_del.sim
+./test.sh -f general/stream/metrics_n.sim
+./test.sh -f general/stream/metrics_replica1_vnoden.sim
+./test.sh -f general/stream/restart_stream.sim
+./test.sh -f general/stream/stream_3.sim
+./test.sh -f general/stream/stream_restart.sim
+./test.sh -f general/stream/table_1.sim
+./test.sh -f general/stream/table_del.sim
+./test.sh -f general/stream/table_n.sim
+./test.sh -f general/stream/table_replica1_vnoden.sim
+
+./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
+#./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim
+./test.sh -f unique/arbitrator/dn3_mn1_full_createTableFail.sim
+./test.sh -f unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+./test.sh -f unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+./test.sh -f unique/arbitrator/dn3_mn1_replica_change.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+# lower the priority while file corruption
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_change.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+./test.sh -f unique/arbitrator/dn3_mn2_killDnode.sim
+./test.sh -f unique/arbitrator/insert_duplicationTs.sim
+./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_alterTag_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_createTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_dropDb_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_dropTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_alterTag_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_dropDb_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_dropTable_online.sim
+./test.sh -f unique/arbitrator/replica_changeWithArbitrator.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim
+
+./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim
+./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
+./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim
+./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim
+
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
diff --git a/tests/script/jenkins/simple.txt b/tests/script/jenkins/simple.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2fe364bf26e0b3edf83278b085503e6ad2ac38f0
--- /dev/null
+++ b/tests/script/jenkins/simple.txt
@@ -0,0 +1,233 @@
+cd ../../../debug; cmake ..
+cd ../../../debug; make
+
+#./test.sh -f general/alter/cached_schema_after_alter.sim
+./test.sh -f general/alter/count.sim
+./test.sh -f general/alter/import.sim
+#./test.sh -f general/alter/insert1.sim
+./test.sh -f general/alter/insert2.sim
+./test.sh -f general/alter/metrics.sim
+./test.sh -f general/alter/table.sim
+
+./test.sh -f general/cache/new_metrics.sim
+./test.sh -f general/cache/restart_metrics.sim
+./test.sh -f general/cache/restart_table.sim
+
+./test.sh -f general/connection/connection.sim  
+
+./test.sh -f general/column/commit.sim
+./test.sh -f general/column/metrics.sim
+./test.sh -f general/column/table.sim
+
+./test.sh -f general/compress/commitlog.sim
+./test.sh -f general/compress/compress.sim
+./test.sh -f general/compress/compress2.sim
+./test.sh -f general/compress/uncompress.sim
+
+./test.sh -f general/compute/avg.sim
+./test.sh -f general/compute/bottom.sim
+./test.sh -f general/compute/count.sim
+./test.sh -f general/compute/diff.sim
+./test.sh -f general/compute/diff2.sim
+./test.sh -f general/compute/first.sim
+./test.sh -f general/compute/interval.sim
+./test.sh -f general/compute/last.sim
+./test.sh -f general/compute/leastsquare.sim
+./test.sh -f general/compute/max.sim
+./test.sh -f general/compute/min.sim
+./test.sh -f general/compute/null.sim
+./test.sh -f general/compute/percentile.sim
+./test.sh -f general/compute/stddev.sim
+./test.sh -f general/compute/sum.sim
+./test.sh -f general/compute/top.sim
+
+./test.sh -f general/db/alter_option.sim
+./test.sh -f general/db/alter_tables_d2.sim
+./test.sh -f general/db/alter_tables_v1.sim
+./test.sh -f general/db/alter_tables_v4.sim
+./test.sh -f general/db/alter_vgroups.sim
+./test.sh -f general/db/basic.sim
+./test.sh -f general/db/basic1.sim
+./test.sh -f general/db/basic2.sim
+./test.sh -f general/db/basic3.sim
+./test.sh -f general/db/basic4.sim
+./test.sh -f general/db/basic5.sim
+./test.sh -f general/db/delete_reuse1.sim
+./test.sh -f general/db/delete_reuse2.sim
+./test.sh -f general/db/delete_reusevnode.sim
+./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_writing1.sim
+./test.sh -f general/db/delete_writing2.sim
+./test.sh -f general/db/delete.sim
+./test.sh -f general/db/len.sim
+./test.sh -f general/db/repeat.sim
+./test.sh -f general/db/tables.sim
+./test.sh -f general/db/vnodes.sim
+
+./test.sh -f general/field/2.sim
+./test.sh -f general/field/3.sim
+./test.sh -f general/field/4.sim
+./test.sh -f general/field/5.sim
+./test.sh -f general/field/6.sim
+./test.sh -f general/field/bigint.sim
+./test.sh -f general/field/binary.sim
+./test.sh -f general/field/bool.sim
+./test.sh -f general/field/single.sim
+./test.sh -f general/field/smallint.sim
+./test.sh -f general/field/tinyint.sim
+
+./test.sh -f general/http/restful.sim
+./test.sh -f general/http/restful_insert.sim
+./test.sh -f general/http/restful_limit.sim
+./test.sh -f general/http/restful_full.sim
+./test.sh -f general/http/prepare.sim
+./test.sh -f general/http/telegraf.sim
+./test.sh -f general/http/grafana_bug.sim
+./test.sh -f general/http/grafana.sim
+
+./test.sh -f general/import/basic.sim
+./test.sh -f general/import/commit.sim
+./test.sh -f general/import/large.sim
+./test.sh -f general/import/replica1.sim
+
+./test.sh -f general/insert/basic.sim
+./test.sh -f general/insert/insert_drop.sim
+./test.sh -f general/insert/query_block1_memory.sim
+./test.sh -f general/insert/query_block2_memory.sim
+./test.sh -f general/insert/query_block1_file.sim
+./test.sh -f general/insert/query_block2_file.sim
+./test.sh -f general/insert/query_file_memory.sim
+./test.sh -f general/insert/query_multi_file.sim
+./test.sh -f general/insert/tcp.sim
+
+./test.sh -f general/parser/alter.sim
+./test.sh -f general/parser/alter1.sim
+./test.sh -f general/parser/alter_stable.sim
+./test.sh -f general/parser/auto_create_tb.sim
+./test.sh -f general/parser/auto_create_tb_drop_tb.sim
+./test.sh -f general/parser/col_arithmetic_operation.sim
+./test.sh -f general/parser/columnValue.sim
+./test.sh -f general/parser/commit.sim
+./test.sh -f general/parser/create_db.sim
+./test.sh -f general/parser/create_mt.sim
+./test.sh -f general/parser/create_tb.sim
+./test.sh -f general/parser/dbtbnameValidate.sim
+./test.sh -f general/parser/import_commit1.sim
+./test.sh -f general/parser/import_commit2.sim
+./test.sh -f general/parser/import_commit3.sim
+./test.sh -f general/parser/insert_tb.sim
+./test.sh -f general/parser/first_last.sim
+#./test.sh -f general/parser/import_file.sim
+./test.sh -f general/parser/lastrow.sim
+./test.sh -f general/parser/nchar.sim
+./test.sh -f general/parser/null_char.sim
+./test.sh -f general/parser/single_row_in_tb.sim
+./test.sh -f general/parser/select_from_cache_disk.sim
+./test.sh -f general/parser/mixed_blocks.sim
+./test.sh -f general/parser/selectResNum.sim
+./test.sh -f general/parser/limit.sim
+./test.sh -f general/parser/limit1.sim
+./test.sh -f general/parser/limit1_tblocks100.sim
+./test.sh -f general/parser/select_across_vnodes.sim
+./test.sh -f general/parser/slimit1.sim
+./test.sh -f general/parser/tbnameIn.sim
+./test.sh -f general/parser/projection_limit_offset.sim
+./test.sh -f general/parser/limit2.sim
+./test.sh -f general/parser/fill.sim
+./test.sh -f general/parser/fill_stb.sim
+./test.sh -f general/parser/where.sim
+./test.sh -f general/parser/slimit.sim
+./test.sh -f general/parser/select_with_tags.sim
+./test.sh -f general/parser/interp.sim
+./test.sh -f general/parser/tags_dynamically_specifiy.sim
+./test.sh -f general/parser/groupby.sim
+./test.sh -f general/parser/set_tag_vals.sim
+#./test.sh -f general/parser/slimit_alter_tags.sim
+./test.sh -f general/parser/join.sim
+./test.sh -f general/parser/join_multivnode.sim
+./test.sh -f general/parser/binary_escapeCharacter.sim
+./test.sh -f general/parser/bug.sim
+#./test.sh -f general/parser/stream_on_sys.sim
+./test.sh -f general/parser/repeatAlter.sim
+#./test.sh -f general/parser/repeatStream.sim
+
+./test.sh -f general/stable/disk.sim
+./test.sh -f general/stable/dnode3.sim
+./test.sh -f general/stable/metrics.sim
+./test.sh -f general/stable/refcount.sim
+./test.sh -f general/stable/show.sim
+./test.sh -f general/stable/values.sim
+./test.sh -f general/stable/vnode3.sim
+
+./test.sh -f general/table/autocreate.sim
+./test.sh -f general/table/basic1.sim
+./test.sh -f general/table/basic2.sim
+./test.sh -f general/table/basic3.sim
+./test.sh -f general/table/bigint.sim
+./test.sh -f general/table/binary.sim
+./test.sh -f general/table/bool.sim
+./test.sh -f general/table/column_name.sim
+./test.sh -f general/table/column_num.sim
+./test.sh -f general/table/column_value.sim
+./test.sh -f general/table/column2.sim
+./test.sh -f general/table/date.sim
+./test.sh -f general/table/db.table.sim
+./test.sh -f general/table/delete_reuse1.sim
+./test.sh -f general/table/delete_reuse2.sim
+./test.sh -f general/table/delete_writing.sim
+./test.sh -f general/table/describe.sim
+./test.sh -f general/table/double.sim
+./test.sh -f general/table/fill.sim
+./test.sh -f general/table/float.sim
+./test.sh -f general/table/int.sim
+./test.sh -f general/table/limit.sim
+./test.sh -f general/table/smallint.sim
+./test.sh -f general/table/table_len.sim
+./test.sh -f general/table/table.sim
+./test.sh -f general/table/tinyint.sim
+./test.sh -f general/table/vgroup.sim
+
+./test.sh -f general/tag/3.sim
+./test.sh -f general/tag/4.sim
+./test.sh -f general/tag/5.sim
+./test.sh -f general/tag/6.sim
+./test.sh -f general/tag/add.sim
+./test.sh -f general/tag/bigint.sim
+./test.sh -f general/tag/binary_binary.sim
+./test.sh -f general/tag/binary.sim
+./test.sh -f general/tag/bool_binary.sim
+./test.sh -f general/tag/bool_int.sim
+./test.sh -f general/tag/bool.sim
+./test.sh -f general/tag/change.sim
+./test.sh -f general/tag/column.sim
+#./test.sh -f general/tag/commit.sim
+./test.sh -f general/tag/create.sim
+./test.sh -f general/tag/delete.sim
+./test.sh -f general/tag/double.sim
+./test.sh -f general/tag/filter.sim
+./test.sh -f general/tag/float.sim
+./test.sh -f general/tag/int_binary.sim
+./test.sh -f general/tag/int_float.sim
+./test.sh -f general/tag/int.sim
+./test.sh -f general/tag/set.sim
+./test.sh -f general/tag/smallint.sim
+./test.sh -f general/tag/tinyint.sim
+
+./test.sh -f general/user/authority.sim
+./test.sh -f general/user/monitor.sim
+./test.sh -f general/user/pass_alter.sim
+./test.sh -f general/user/pass_len.sim
+./test.sh -f general/user/user_create.sim
+./test.sh -f general/user/user_len.sim
+
+./test.sh -f general/vector/metrics_field.sim
+./test.sh -f general/vector/metrics_mix.sim
+./test.sh -f general/vector/metrics_query.sim
+./test.sh -f general/vector/metrics_tag.sim
+./test.sh -f general/vector/metrics_time.sim
+./test.sh -f general/vector/multi.sim
+./test.sh -f general/vector/single.sim
+./test.sh -f general/vector/table_field.sim
+./test.sh -f general/vector/table_mix.sim
+./test.sh -f general/vector/table_query.sim
+./test.sh -f general/vector/table_time.sim
diff --git a/tests/script/jenkins/unique.txt b/tests/script/jenkins/unique.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b271f5b726bd6e9e50265420ec6cfa6695b0f551
--- /dev/null
+++ b/tests/script/jenkins/unique.txt
@@ -0,0 +1,115 @@
+cd ../../../debug; cmake ..
+cd ../../../debug; make
+
+./test.sh -f unique/big/balance.sim
+./test.sh -f unique/big/maxvnodes.sim
+./test.sh -f unique/big/tcp.sim
+
+./test.sh -f unique/cluster/alter.sim
+./test.sh -f unique/cluster/balance1.sim
+./test.sh -f unique/cluster/balance2.sim
+./test.sh -f unique/cluster/balance3.sim
+./test.sh -f unique/cluster/cache.sim
+
+./test.sh -f unique/column/replica3.sim
+
+./test.sh -f unique/db/commit.sim
+./test.sh -f unique/db/delete.sim
+./test.sh -f unique/db/delete_part.sim
+./test.sh -f unique/db/replica_add12.sim
+./test.sh -f unique/db/replica_add13.sim
+./test.sh -f unique/db/replica_add23.sim
+./test.sh -f unique/db/replica_reduce21.sim
+./test.sh -f unique/db/replica_reduce32.sim
+./test.sh -f unique/db/replica_reduce31.sim
+./test.sh -f unique/db/replica_part.sim
+
+./test.sh -f unique/dnode/alternativeRole.sim
+./test.sh -f unique/dnode/balance1.sim
+./test.sh -f unique/dnode/balance2.sim
+./test.sh -f unique/dnode/balance3.sim
+./test.sh -f unique/dnode/balancex.sim
+./test.sh -f unique/dnode/offline1.sim
+./test.sh -f unique/dnode/offline2.sim
+./test.sh -f unique/dnode/remove1.sim
+./test.sh -f unique/dnode/remove2.sim
+./test.sh -f unique/dnode/vnode_clean.sim
+
+./test.sh -f unique/http/admin.sim
+./test.sh -f unique/http/opentsdb.sim
+
+./test.sh -f unique/import/replica2.sim
+./test.sh -f unique/import/replica3.sim
+
+./test.sh -f unique/stable/balance_replica1.sim
+./test.sh -f unique/stable/dnode2_stop.sim
+./test.sh -f unique/stable/dnode2.sim
+./test.sh -f unique/stable/dnode3.sim
+./test.sh -f unique/stable/replica2_dnode4.sim
+./test.sh -f unique/stable/replica2_vnode3.sim
+./test.sh -f unique/stable/replica3_dnode6.sim
+./test.sh -f unique/stable/replica3_vnode3.sim
+
+./test.sh -f unique/mnode/mgmt21.sim
+./test.sh -f unique/mnode/mgmt22.sim
+./test.sh -f unique/mnode/mgmt23.sim
+./test.sh -f unique/mnode/mgmt24.sim
+./test.sh -f unique/mnode/mgmt25.sim
+./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt33.sim
+./test.sh -f unique/mnode/mgmt34.sim
+./test.sh -f unique/mnode/mgmtr2.sim
+
+./test.sh -f unique/vnode/many.sim
+./test.sh -f unique/vnode/replica2_basic2.sim
+./test.sh -f unique/vnode/replica2_repeat.sim
+./test.sh -f unique/vnode/replica3_basic.sim
+./test.sh -f unique/vnode/replica3_repeat.sim
+./test.sh -f unique/vnode/replica3_vgroup.sim
+
+./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim
+#./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim
+./test.sh -f unique/arbitrator/dn3_mn1_full_createTableFail.sim
+./test.sh -f unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+./test.sh -f unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+./test.sh -f unique/arbitrator/dn3_mn1_replica_change.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+# lower the priority while file corruption
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_change.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+#./test.sh -f unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
+./test.sh -f unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+./test.sh -f unique/arbitrator/dn3_mn2_killDnode.sim
+./test.sh -f unique/arbitrator/insert_duplicationTs.sim
+./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_alterTag_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_createTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_dropDb_online.sim
+./test.sh -f unique/arbitrator/offline_replica2_dropTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_alterTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_alterTag_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_createTable_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_dropDb_online.sim
+./test.sh -f unique/arbitrator/offline_replica3_dropTable_online.sim
+./test.sh -f unique/arbitrator/replica_changeWithArbitrator.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim
+
+./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim
+./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim
+./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim
+./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim
+./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim
+
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
+./test.sh -f unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
diff --git a/tests/script/loop.sh b/tests/script/loop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b435eef12306fc994dd4878b8225946f179adf7e
--- /dev/null
+++ b/tests/script/loop.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+##################################################
+# 
+# Do simulation test 
+#
+##################################################
+
+set -e
+#set -x
+
+CMD_NAME=
+LOOP_TIMES=5
+SLEEP_TIME=0
+
+while getopts "f:t:s:" arg
+do
+  case $arg in
+    f)
+      CMD_NAME=$OPTARG
+      ;;
+    t)
+      LOOP_TIMES=$OPTARG
+      ;;
+    s)
+      SLEEP_TIME=$OPTARG
+      ;;
+    ?)
+      echo "unknow argument"
+      ;;
+  esac
+done
+
+echo LOOP_TIMES ${LOOP_TIMES}
+echo CMD_NAME ${CMD_NAME}
+echo SLEEP_TIME ${SLEEP_TIME}
+
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+for ((i=0; i<$LOOP_TIMES; i++ ))
+do
+    echo -e $GREEN loop $i $NC
+    echo -e $GREEN cmd $CMD_NAME $NC
+    $CMD_NAME
+    sleep ${SLEEP_TIME}
+done
diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ff1f9f53559c6da89ed2cdaf77c29f1859578ae6
--- /dev/null
+++ b/tests/script/regressionSuite.sim
@@ -0,0 +1,228 @@
+##unsupport run general/alter/cached_schema_after_alter.sim
+run general/alter/count.sim
+run general/alter/import.sim
+##unsupport run general/alter/insert1.sim
+run general/alter/insert2.sim
+run general/alter/metrics.sim
+run general/alter/table.sim
+run general/cache/new_metrics.sim
+run general/cache/restart_metrics.sim
+run general/cache/restart_table.sim
+run general/connection/connection.sim  
+run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
+run general/compress/commitlog.sim
+run general/compress/compress.sim
+run general/compress/compress2.sim
+run general/compress/uncompress.sim
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
+run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
+run general/compute/null.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
+run general/db/alter_option.sim
+run general/db/alter_tables_d2.sim
+run general/db/alter_tables_v1.sim
+run general/db/alter_tables_v4.sim
+run general/db/alter_vgroups.sim
+run general/db/basic.sim
+run general/db/basic1.sim
+run general/db/basic2.sim
+run general/db/basic3.sim
+run general/db/basic4.sim
+run general/db/basic5.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/delete.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
+run general/db/vnodes.sim
+run general/field/2.sim
+run general/field/3.sim
+run general/field/4.sim
+run general/field/5.sim
+run general/field/6.sim
+run general/field/bigint.sim
+run general/field/binary.sim
+run general/field/bool.sim
+run general/field/single.sim
+run general/field/smallint.sim
+run general/field/tinyint.sim
+run general/http/restful.sim
+run general/http/restful_insert.sim
+run general/http/restful_limit.sim
+run general/http/restful_full.sim
+run general/http/prepare.sim
+run general/http/telegraf.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
+run general/import/basic.sim
+run general/import/commit.sim
+run general/import/large.sim
+run general/import/replica1.sim
+run general/insert/basic.sim
+run general/insert/insert_drop.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
+run general/parser/alter.sim
+run general/parser/alter1.sim
+run general/parser/alter_stable.sim
+run general/parser/auto_create_tb.sim
+run general/parser/auto_create_tb_drop_tb.sim
+run general/parser/col_arithmetic_operation.sim
+run general/parser/columnValue.sim
+run general/parser/commit.sim
+run general/parser/create_db.sim
+run general/parser/create_mt.sim
+run general/parser/create_tb.sim
+run general/parser/dbtbnameValidate.sim
+run general/parser/import_commit1.sim
+run general/parser/import_commit2.sim
+run general/parser/import_commit3.sim
+run general/parser/insert_tb.sim
+run general/parser/first_last.sim
+##unsupport run general/parser/import_file.sim
+run general/parser/lastrow.sim
+run general/parser/nchar.sim
+run general/parser/null_char.sim
+run general/parser/single_row_in_tb.sim
+run general/parser/select_from_cache_disk.sim
+run general/parser/limit.sim
+run general/parser/limit1.sim
+run general/parser/limit1_tblocks100.sim
+run general/parser/mixed_blocks.sim
+run general/parser/selectResNum.sim
+run general/parser/select_across_vnodes.sim
+run general/parser/slimit1.sim
+run general/parser/tbnameIn.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/projection_limit_offset.sim
+run general/parser/limit2.sim
+run general/parser/slimit.sim
+run general/parser/fill.sim
+run general/parser/fill_stb.sim
+run general/parser/interp.sim
+run general/parser/where.sim
+run general/parser/join.sim
+run general/parser/join_multivnode.sim
+run general/parser/select_with_tags.sim
+run general/parser/groupby.sim
+run general/parser/bug.sim
+run general/parser/tags_dynamically_specifiy.sim
+run general/parser/set_tag_vals.sim
+run general/parser/repeatAlter.sim
+##unsupport run general/parser/slimit_alter_tags.sim
+##unsupport run general/parser/stream_on_sys.sim
+run general/parser/stream.sim
+#unsupport run general/parser/repeatStream.sim
+run general/stable/disk.sim
+run general/stable/dnode3.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
+run general/stable/refcount.sim
+run general/stable/show.sim
+run general/table/autocreate.sim
+run general/table/basic1.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
+run general/table/bigint.sim
+run general/table/binary.sim
+run general/table/bool.sim
+run general/table/column_name.sim
+run general/table/column_num.sim
+run general/table/column_value.sim
+run general/table/column2.sim
+run general/table/date.sim
+run general/table/db.table.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
+run general/table/double.sim
+run general/table/fill.sim
+run general/table/float.sim
+run general/table/int.sim
+run general/table/limit.sim
+run general/table/smallint.sim
+run general/table/table_len.sim
+run general/table/table.sim
+run general/table/tinyint.sim
+run general/table/vgroup.sim
+run general/tag/3.sim
+run general/tag/4.sim
+run general/tag/5.sim
+run general/tag/6.sim
+run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+run general/tag/change.sim
+run general/tag/column.sim
+##unsupport run general/tag/commit.sim
+run general/tag/create.sim
+run general/tag/delete.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
+run general/tag/set.sim
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
+run general/user/authority.sim
+run general/user/monitor.sim
+run general/user/pass_alter.sim
+run general/user/pass_len.sim
+run general/user/user_create.sim
+run general/user/user_len.sim
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
+run general/vector/metrics_query.sim
+run general/vector/metrics_tag.sim
+run general/vector/metrics_time.sim
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim
+run general/stream/restart_stream.sim
+run general/stream/stream_1.sim
+run general/stream/stream_2.sim
+run general/stream/stream_3.sim
+run general/stream/stream_restart.sim
+run general/stream/table_1.sim
+run general/stream/metrics_1.sim
+run general/stream/table_n.sim
+run general/stream/metrics_n.sim
+run general/stream/table_del.sim
+run general/stream/metrics_del.sim
+run general/stream/table_replica1_vnoden.sim
+run general/stream/metrics_replica1_vnoden.sim
diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0c28a8edcec625f7c0472969ca9d12968c5286a9
--- /dev/null
+++ b/tests/script/sh/cfg.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+if [ $# != 6 ]; then 
+  echo "argument list need input : "
+  echo "  -n nodeName"
+  echo "  -c configName"
+  echo "  -v configValue"
+  exit 1
+fi
+
+NODE_NAME=
+CONFIG_NAME=
+CONFIG_VALUE=
+while getopts "n:v:c:" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    c)
+      CONFIG_NAME=$OPTARG
+      ;;
+    v)
+      CONFIG_VALUE=$OPTARG
+      ;;
+    ?)
+      echo "unkonw argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+
+NODE_DIR=$SIM_DIR/$NODE_NAME
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ] ; then 
+  TAOS_CFG=/etc/taos/taos.cfg
+fi
+
+echo "$CONFIG_NAME  $CONFIG_VALUE"        >> $TAOS_CFG
diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0238ceec5d037d508b41847ed55679aee85c924c
--- /dev/null
+++ b/tests/script/sh/clear.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+
+echo "Executing clear.sh"
+
+if [ $# != 6 ]; then 
+  echo "argument list need input : "
+  echo "  -n nodeName"
+  echo "  -i nodeIp"
+  echo "  -m masterIp"
+  exit 1
+fi
+
+NODE_NAME=
+NODE_IP=
+MSATER_IP=
+while getopts "n:i:m:" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    i)
+      NODE_IP=$OPTARG
+      ;;
+    m)
+      MASTER_IP=$OPTARG
+      ;;
+    ?)
+      echo "unkonw argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+echo "SCRIPT_DIR: $SCRIPT_DIR" 
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+
+#echo ============ deploy $NODE_NAME
+#echo === masterIp : $MASTER_IP
+#echo === nodeIp : $NODE_IP
+#echo === nodePath : $EXE_DIR
+#echo === cfgPath : $CFG_DIR
+#echo === logPath : $LOG_DIR
+#echo === dataPath : $DATA_DIR
+
+# rm -rf $NODE_DIR
+
+mkdir -p $SIM_DIR
+mkdir -p $NODE_DIR
+mkdir -p $LOG_DIR
+rm -rf $DATA_DIR
+mkdir -p $DATA_DIR
+
+#cp -rf $TAOS_DIR/cfg  $NODE_DIR/
+rm -rf $CFG_DIR
+mkdir -p $CFG_DIR
+
+#allow normal user to read/write log
+chmod -R 777 $NODE_DIR
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+touch -f $TAOS_CFG
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ] ; then 
+  TAOS_CFG=/etc/taos/taos.cfg
+  DATA_DIR=/var/lib/taos
+  LOG_DIR=/var/log/taos
+  sudo rm -f /etc/taos/*.cfg
+  sudo cp -rf $TAOS_DIR/cfg/*.cfg /etc/taos
+  sudo rm -rf $DATA_DIR
+  sudo rm -rf $LOG_DIR
+fi
+
+echo " "                                  >> $TAOS_CFG   
+echo "masterIp            $MASTER_IP"     >> $TAOS_CFG
+echo "dataDir             $DATA_DIR"      >> $TAOS_CFG
+echo "logDir              $LOG_DIR"       >> $TAOS_CFG
+echo "publicIp            $NODE_IP"       >> $TAOS_CFG
+echo "internalIp          $NODE_IP"       >> $TAOS_CFG
+echo "privateIp           $NODE_IP"       >> $TAOS_CFG
+echo "dDebugFlag          135"            >> $TAOS_CFG
+echo "mDebugFlag          135"            >> $TAOS_CFG
+echo "sdbDebugFlag        135"            >> $TAOS_CFG
+echo "rpcDebugFlag        131"            >> $TAOS_CFG
+echo "tmrDebugFlag        131"            >> $TAOS_CFG
+echo "cDebugFlag          135"            >> $TAOS_CFG
+echo "httpDebugFlag       131"            >> $TAOS_CFG
+echo "monitorDebugFlag    131"            >> $TAOS_CFG
+echo "udebugFlag          131"            >> $TAOS_CFG
+echo "jnidebugFlag        131"            >> $TAOS_CFG
+echo "monitor             0"              >> $TAOS_CFG
+echo "numOfThreadsPerCore 2.0"            >> $TAOS_CFG
+echo "defaultPass         taosdata"       >> $TAOS_CFG
+echo "numOfLogLines       100000000"      >> $TAOS_CFG
+echo "mnodeEqualVnodeNum   0"              >> $TAOS_CFG
+echo "clog                0"              >> $TAOS_CFG
+echo "statusInterval      1"              >> $TAOS_CFG
+echo "asyncLog            0"              >> $TAOS_CFG
+echo "numOfMnodes         1"              >> $TAOS_CFG
+echo "locale    en_US.UTF-8"              >> $TAOS_CFG
+
+
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8fccb1442f9d9af20e8153be7790ad592fbe010f
--- /dev/null
+++ b/tests/script/sh/deploy.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+
+echo "Executing deploy.sh"
+
+if [ $# != 4 ]; then 
+  echo "argument list need input : "
+  echo "  -n nodeName"
+  echo "  -i nodePort"
+  exit 1
+fi
+
+NODE_NAME=
+NODE=
+while getopts "n:i:" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    i)
+      NODE=$OPTARG
+      ;;
+    ?)
+      echo "unkonw argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+echo "SCRIPT_DIR: $SCRIPT_DIR" 
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+
+rm -rf $NODE_DIR
+
+mkdir -p $SIM_DIR
+mkdir -p $NODE_DIR
+mkdir -p $LOG_DIR
+mkdir -p $DATA_DIR
+
+#cp -rf $TAOS_DIR/cfg  $NODE_DIR/
+mkdir -p $CFG_DIR
+
+#allow normal user to read/write log
+chmod -R 777 $NODE_DIR
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+touch -f $TAOS_CFG
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ] ; then 
+  TAOS_CFG=/etc/taos/taos.cfg
+  DATA_DIR=/var/lib/taos
+  LOG_DIR=/var/log/taos
+  sudo rm -f /etc/taos/*.cfg
+  sudo cp -rf $TAOS_DIR/cfg/*.cfg /etc/taos
+  sudo rm -rf $DATA_DIR
+  sudo rm -rf $LOG_DIR
+fi
+
+HOSTNAME=`hostname -f`
+
+if [ $NODE -eq 1 ]; then
+  NODE=7100
+elif [ $NODE -eq 2 ]; then
+  NODE=7200
+elif [ $NODE -eq 3 ]; then
+  NODE=7300
+elif [ $NODE -eq 4 ]; then
+  NODE=7400
+elif [ $NODE -eq 5 ]; then
+  NODE=7500
+elif [ $NODE -eq 6 ]; then
+  NODE=7600  
+elif [ $NODE -eq 7 ]; then
+  NODE=7700  
+elif [ $NODE -eq 8 ]; then
+  NODE=7800    
+fi
+
+echo " "                                         >> $TAOS_CFG   
+echo "firstEp                ${HOSTNAME}:7100"   >> $TAOS_CFG
+echo "secondEp               ${HOSTNAME}:7200"   >> $TAOS_CFG
+echo "serverPort             ${NODE}"            >> $TAOS_CFG
+echo "dataDir                $DATA_DIR"          >> $TAOS_CFG
+echo "logDir                 $LOG_DIR"           >> $TAOS_CFG
+echo "debugFlag              0"                  >> $TAOS_CFG
+echo "mDebugFlag             135"                >> $TAOS_CFG
+echo "sdbDebugFlag           135"                >> $TAOS_CFG
+echo "dDebugFlag             135"                >> $TAOS_CFG
+echo "vDebugFlag             135"                >> $TAOS_CFG
+echo "tsdbDebugFlag          135"                >> $TAOS_CFG
+echo "cDebugFlag             135"                >> $TAOS_CFG
+echo "jnidebugFlag           135"                >> $TAOS_CFG
+echo "odbcdebugFlag          135"                >> $TAOS_CFG
+echo "httpDebugFlag          135"                >> $TAOS_CFG
+echo "monitorDebugFlag       135"                >> $TAOS_CFG
+echo "mqttDebugFlag          135"                >> $TAOS_CFG
+echo "qdebugFlag             135"                >> $TAOS_CFG
+echo "rpcDebugFlag           135"                >> $TAOS_CFG
+echo "tmrDebugFlag           131"                >> $TAOS_CFG
+echo "udebugFlag             135"                >> $TAOS_CFG
+echo "sdebugFlag             135"                >> $TAOS_CFG
+echo "wdebugFlag             135"                >> $TAOS_CFG
+echo "cqdebugFlag            135"                >> $TAOS_CFG
+echo "monitor                0"                  >> $TAOS_CFG
+echo "monitorInterval        1"                  >> $TAOS_CFG
+echo "http                   0"                  >> $TAOS_CFG
+echo "numOfThreadsPerCore    2.0"                >> $TAOS_CFG
+echo "defaultPass            taosdata"           >> $TAOS_CFG
+echo "numOfLogLines          20000000"           >> $TAOS_CFG
+echo "mnodeEqualVnodeNum     0"                  >> $TAOS_CFG
+echo "clog                   2"                  >> $TAOS_CFG
+#echo "cache                 1"                  >> $TAOS_CFG
+echo "days                   10"                  >> $TAOS_CFG
+echo "statusInterval         1"                  >> $TAOS_CFG
+echo "maxVgroupsPerDb        4"                  >> $TAOS_CFG
+echo "minTablesPerVnode      4"                  >> $TAOS_CFG
+echo "maxTablesPerVnode      1000"               >> $TAOS_CFG
+echo "tableIncStepPerVnode   10000"              >> $TAOS_CFG
+echo "asyncLog               0"                  >> $TAOS_CFG
+echo "numOfMnodes            1"                  >> $TAOS_CFG
+echo "locale                 en_US.UTF-8"        >> $TAOS_CFG
+echo "fsync                  0"                  >> $TAOS_CFG
+echo "telemetryReporting     0"                  >> $TAOS_CFG
+echo " "                                         >> $TAOS_CFG  
+
diff --git a/tests/script/sh/exec-default.sh b/tests/script/sh/exec-default.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1c84a6b10ed3f958e096d32eda727441ff2591da
--- /dev/null
+++ b/tests/script/sh/exec-default.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# if [ $# != 4 || $# != 5 ]; then 
+  # echo "argument list need input : "
+  # echo "  -n nodeName"
+  # echo "  -s start/stop"
+  # echo "  -c clear"
+  # exit 1
+# fi
+
+NODE_NAME=
+EXEC_OPTON=
+CLEAR_OPTION="false"
+while getopts "n:s:u:x:ct" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    c)
+      CLEAR_OPTION="clear"
+      ;;
+    t)
+      SHELL_OPTION="true"
+      ;;
+    u)
+      USERS=$OPTARG
+      ;;
+    x)
+      SIGNAL=$OPTARG
+      ;;
+    ?)
+      echo "unkown argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+MGMT_DIR=$NODE_DIR/data/mgmt
+TSDB_DIR=$NODE_DIR/data/tsdb
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+
+echo ------------ $EXEC_OPTON $NODE_NAME
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ]; then 
+  EXE_DIR=/usr/local/bin/taos
+fi
+
+if [ "$CLEAR_OPTION" = "clear" ]; then 
+  echo rm -rf $MGMT_DIR $TSDB_DIR  
+  rm -rf $TSDB_DIR
+  rm -rf $MGMT_DIR
+fi
+
+if [ "$EXEC_OPTON" = "start" ]; then 
+  echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
+  
+  if [ "$SHELL_OPTION" = "true" ]; then 
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+  else
+    nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & 
+  fi
+  
+else
+  #relative path
+  RCFG_DIR=sim/$NODE_NAME/cfg
+  PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    if [ "$SIGNAL" = "SIGKILL" ]; then
+      echo try to kill by signal SIGKILL
+      kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
+    fi
+    sleep 1
+    PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  done 
+fi
+
diff --git a/tests/script/sh/exec-no-random-fail.sh b/tests/script/sh/exec-no-random-fail.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2bd0a64923f73df010e40f427d40cb9e212480d7
--- /dev/null
+++ b/tests/script/sh/exec-no-random-fail.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# if [ $# != 4 || $# != 5 ]; then 
+  # echo "argument list need input : "
+  # echo "  -n nodeName"
+  # echo "  -s start/stop"
+  # echo "  -c clear"
+  # exit 1
+# fi
+
+NODE_NAME=
+EXEC_OPTON=
+CLEAR_OPTION="false"
+while getopts "n:s:u:x:ct" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    c)
+      CLEAR_OPTION="clear"
+      ;;
+    t)
+      SHELL_OPTION="true"
+      ;;
+    u)
+      USERS=$OPTARG
+      ;;
+    x)
+      SIGNAL=$OPTARG
+      ;;
+    ?)
+      echo "unkown argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+MGMT_DIR=$NODE_DIR/data/mgmt
+TSDB_DIR=$NODE_DIR/data/tsdb
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+
+echo ------------ $EXEC_OPTON $NODE_NAME
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ]; then 
+  EXE_DIR=/usr/local/bin/taos
+fi
+
+if [ "$CLEAR_OPTION" = "clear" ]; then 
+  echo rm -rf $MGMT_DIR $TSDB_DIR  
+  rm -rf $TSDB_DIR
+  rm -rf $MGMT_DIR
+fi
+
+if [ "$EXEC_OPTON" = "start" ]; then 
+  echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
+  
+  if [ "$SHELL_OPTION" = "true" ]; then 
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+  else
+    nohup $EXE_DIR/taosd -c $CFG_DIR --random-file-fail-factor 0 > /dev/null 2>&1 & 
+  fi
+  
+else
+  #relative path
+  RCFG_DIR=sim/$NODE_NAME/cfg
+  PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    if [ "$SIGNAL" = "SIGKILL" ]; then
+      echo try to kill by signal SIGKILL
+      kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
+    fi
+    sleep 1
+    PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  done 
+fi
+
diff --git a/tests/script/sh/exec-random-fail.sh b/tests/script/sh/exec-random-fail.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3761498859591188799d1ad3814ed3b01372269d
--- /dev/null
+++ b/tests/script/sh/exec-random-fail.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# if [ $# != 4 || $# != 5 ]; then 
+  # echo "argument list need input : "
+  # echo "  -n nodeName"
+  # echo "  -s start/stop"
+  # echo "  -c clear"
+  # exit 1
+# fi
+
+NODE_NAME=
+EXEC_OPTON=
+CLEAR_OPTION="false"
+while getopts "n:s:u:x:ct" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    c)
+      CLEAR_OPTION="clear"
+      ;;
+    t)
+      SHELL_OPTION="true"
+      ;;
+    u)
+      USERS=$OPTARG
+      ;;
+    x)
+      SIGNAL=$OPTARG
+      ;;
+    ?)
+      echo "unkown argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+MGMT_DIR=$NODE_DIR/data/mgmt
+TSDB_DIR=$NODE_DIR/data/tsdb
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+
+echo ------------ $EXEC_OPTON $NODE_NAME
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ]; then 
+  EXE_DIR=/usr/local/bin/taos
+fi
+
+if [ "$CLEAR_OPTION" = "clear" ]; then 
+  echo rm -rf $MGMT_DIR $TSDB_DIR  
+  rm -rf $TSDB_DIR
+  rm -rf $MGMT_DIR
+fi
+
+if [ "$EXEC_OPTON" = "start" ]; then 
+  echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
+  
+  if [ "$SHELL_OPTION" = "true" ]; then 
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+  else
+    nohup $EXE_DIR/taosd -c $CFG_DIR  --alloc-random-fail \
+      --random-file-fail-factor 5 > /dev/null 2>&1 & 
+  fi
+  
+else
+  #relative path
+  RCFG_DIR=sim/$NODE_NAME/cfg
+  PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    if [ "$SIGNAL" = "SIGKILL" ]; then
+      echo try to kill by signal SIGKILL
+      kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
+    fi
+    sleep 1
+    PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  done 
+fi
+
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1c84a6b10ed3f958e096d32eda727441ff2591da
--- /dev/null
+++ b/tests/script/sh/exec.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# if [ $# != 4 || $# != 5 ]; then 
+  # echo "argument list need input : "
+  # echo "  -n nodeName"
+  # echo "  -s start/stop"
+  # echo "  -c clear"
+  # exit 1
+# fi
+
+NODE_NAME=
+EXEC_OPTON=
+CLEAR_OPTION="false"
+while getopts "n:s:u:x:ct" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    c)
+      CLEAR_OPTION="clear"
+      ;;
+    t)
+      SHELL_OPTION="true"
+      ;;
+    u)
+      USERS=$OPTARG
+      ;;
+    x)
+      SIGNAL=$OPTARG
+      ;;
+    ?)
+      echo "unkown argument"
+      ;;
+  esac
+done
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/$NODE_NAME
+EXE_DIR=$BUILD_DIR/bin
+CFG_DIR=$NODE_DIR/cfg
+LOG_DIR=$NODE_DIR/log
+DATA_DIR=$NODE_DIR/data
+MGMT_DIR=$NODE_DIR/data/mgmt
+TSDB_DIR=$NODE_DIR/data/tsdb
+
+TAOS_CFG=$NODE_DIR/cfg/taos.cfg
+
+echo ------------ $EXEC_OPTON $NODE_NAME
+
+TAOS_FLAG=$SIM_DIR/tsim/flag
+if [ -f "$TAOS_FLAG" ]; then 
+  EXE_DIR=/usr/local/bin/taos
+fi
+
+if [ "$CLEAR_OPTION" = "clear" ]; then 
+  echo rm -rf $MGMT_DIR $TSDB_DIR  
+  rm -rf $TSDB_DIR
+  rm -rf $MGMT_DIR
+fi
+
+if [ "$EXEC_OPTON" = "start" ]; then 
+  echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
+  
+  if [ "$SHELL_OPTION" = "true" ]; then 
+    TT=`date +%s`
+    mkdir ${LOG_DIR}/${TT}
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+  else
+    nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & 
+  fi
+  
+else
+  #relative path
+  RCFG_DIR=sim/$NODE_NAME/cfg
+  PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  while [ -n "$PID" ]
+  do
+    if [ "$SIGNAL" = "SIGKILL" ]; then
+      echo try to kill by signal SIGKILL
+      kill -9 $PID
+    else
+      echo try to kill by signal SIGINT
+      kill -SIGINT $PID
+    fi
+    sleep 1
+    PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
+  done 
+fi
+
diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh
new file mode 100755
index 0000000000000000000000000000000000000000..496b3e4ed6011ace67e5f33330d99bf02e611673
--- /dev/null
+++ b/tests/script/sh/exec_tarbitrator.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# if [ $# != 2 || $# != 3 ]; then 
+  # echo "argument list need input : "
+  # echo "  -s start/stop"
+  # exit 1
+# fi
+
+EXEC_OPTON=
+while getopts "n:s:u:x:ct" arg 
+do
+  case $arg in
+    n)
+      NODE_NAME=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    c)
+      CLEAR_OPTION="clear"
+      ;;
+    t)
+      SHELL_OPTION="true"
+      ;;
+    u)
+      USERS=$OPTARG
+      ;;
+    x)
+      SIGNAL=$OPTARG
+      ;;
+    ?)
+      echo "unkown argument"
+      ;;
+  esac
+done
+
+
+SCRIPT_DIR=`dirname $0`
+cd $SCRIPT_DIR/../
+SCRIPT_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
+
+SIM_DIR=$TAOS_DIR/sim
+NODE_DIR=$SIM_DIR/arbitrator
+EXE_DIR=$BUILD_DIR/bin
+LOG_DIR=$NODE_DIR/log
+
+echo "------------ $EXEC_OPTON tarbitrator"
+
+if [ "$EXEC_OPTON" = "start" ]; then 
+  echo "------------ log path: $LOG_DIR"
+  nohup $EXE_DIR/tarbitrator -p 8000 -d 135 -g $LOG_DIR > /dev/null 2>&1 & 
+else
+  #relative path
+  PID=`ps -ef|grep tarbitrator | grep -v grep | awk '{print $2}'`
+  if [ -n "$PID" ]; then   
+    kill -9 $PID
+    pkill -9 tarbitrator
+  fi 
+fi
+
diff --git a/tests/script/sh/ip.sh b/tests/script/sh/ip.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9a0cde163a78cdd691724b3e1faf15aa7b48d456
--- /dev/null
+++ b/tests/script/sh/ip.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+#already create real card, such as 192.168.0.1-5
+#exit 0
+
+if [ $# != 4 ]; then 
+  echo "argument list need input : "
+  echo "  -i if use [192.168.0.70 ] then input [70]"
+  echo "  -s up/down"
+  exit 1
+fi
+
+#just create ip like 192.168.0.*
+
+IP_ADDRESS=
+EXEC_OPTON=
+while getopts "i:s:" arg 
+do
+  case $arg in
+    i)
+      IP_ADDRESS=$OPTARG
+      ;;
+    s)
+      EXEC_OPTON=$OPTARG
+      ;;
+    ?)
+      echo "unkonw argument"
+      ;;
+  esac
+done
+
+echo ============ $EXEC_OPTON $IP_ADDRESS ===========
+sudo ifconfig lo:$IP_ADDRESS 192.168.0.$IP_ADDRESS $EXEC_OPTON
diff --git a/tests/script/sh/stop_dnodes.sh b/tests/script/sh/stop_dnodes.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1a6e7153c39d1be84b2d8a4bf13338564d685a2f
--- /dev/null
+++ b/tests/script/sh/stop_dnodes.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+PID=`ps -ef|grep /usr/bin/taosd | grep -v grep | awk '{print $2}'`
+if [ -n "$PID" ]; then 
+	echo systemctl stop taosd 
+	systemctl stop taosd
+fi
+  
+PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+while [ -n "$PID" ]; do
+	echo kill -9 $PID 
+	pkill -9 taosd
+  fuser -k -n tcp 6030
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+done
+
+PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'`
+while [ -n "$PID" ]; do
+	echo kill -9 $PID 
+	pkill -9 tarbitrator
+  fuser -k -n tcp 6040
+  PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'`
+done
+
diff --git a/tests/script/test.sh b/tests/script/test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..96e4ffe689e5098b36ca9993eed66fd7ba9cacef
--- /dev/null
+++ b/tests/script/test.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+##################################################
+# 
+# Do simulation test 
+#
+##################################################
+
+set +e
+#set -x
+
+FILE_NAME=
+RELEASE=0
+ASYNC=0
+VALGRIND=0
+UNIQUE=0
+while getopts "f:avu" arg
+do
+  case $arg in
+    f)
+      FILE_NAME=$OPTARG
+      ;;
+    a)
+      ASYNC=1
+      ;;
+    v)
+      VALGRIND=1
+      ;;
+    u)
+      UNIQUE=1
+      ;;
+    ?)
+      echo "unknow argument"
+      ;;
+  esac
+done
+
+cd .
+
+# Get responsible directories
+CODE_DIR=`dirname $0`
+CODE_DIR=`pwd`
+
+IN_TDINTERNAL="community"
+if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  cd ../../..
+else
+  cd ../../
+fi
+
+TOP_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
+
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
+
+BUILD_DIR=$TOP_DIR/$BIN_DIR/build
+
+SIM_DIR=$TOP_DIR/sim
+
+if [ $ASYNC -eq 0 ]; then
+  PROGRAM=$BUILD_DIR/bin/tsim
+else
+  PROGRAM="$BUILD_DIR/bin/tsim -a"
+fi
+
+
+PRG_DIR=$SIM_DIR/tsim
+CFG_DIR=$PRG_DIR/cfg
+LOG_DIR=$PRG_DIR/log
+DATA_DIR=$PRG_DIR/data
+
+
+ARBITRATOR_PRG_DIR=$SIM_DIR/arbitrator
+ARBITRATOR_LOG_DIR=$ARBITRATOR_PRG_DIR/log
+
+
+chmod -R 777 $PRG_DIR
+echo "------------------------------------------------------------------------"
+echo "Start TDengine Testing Case ..."
+echo "BUILD_DIR: $BUILD_DIR"
+echo "SIM_DIR  : $SIM_DIR"
+echo "CODE_DIR : $CODE_DIR"
+echo "CFG_DIR  : $CFG_DIR"
+
+rm -rf $LOG_DIR
+rm -rf $CFG_DIR
+rm -rf $ARBITRATOR_LOG_DIR
+
+mkdir -p $PRG_DIR
+mkdir -p $LOG_DIR
+mkdir -p $CFG_DIR
+mkdir -p $ARBITRATOR_LOG_DIR
+
+TAOS_CFG=$PRG_DIR/cfg/taos.cfg
+touch -f $TAOS_CFG
+TAOS_FLAG=$PRG_DIR/flag
+
+HOSTNAME=`hostname -f`
+
+echo " "                                          >> $TAOS_CFG
+echo "firstEp            ${HOSTNAME}:7100"        >> $TAOS_CFG
+echo "secondEp           ${HOSTNAME}:7200"        >> $TAOS_CFG
+echo "serverPort         7100"                    >> $TAOS_CFG
+echo "dataDir            $DATA_DIR"               >> $TAOS_CFG
+echo "logDir             $LOG_DIR"                >> $TAOS_CFG
+echo "scriptDir          ${CODE_DIR}/../script"   >> $TAOS_CFG
+echo "numOfLogLines      100000000"               >> $TAOS_CFG
+echo "dDebugFlag         135"                     >> $TAOS_CFG
+echo "mDebugFlag         135"                     >> $TAOS_CFG
+echo "sdbDebugFlag       135"                     >> $TAOS_CFG
+echo "rpcDebugFlag       135"                     >> $TAOS_CFG
+echo "tmrDebugFlag       131"                     >> $TAOS_CFG
+echo "cDebugFlag         135"                     >> $TAOS_CFG
+echo "httpDebugFlag      135"                     >> $TAOS_CFG
+echo "monitorDebugFlag   135"                     >> $TAOS_CFG
+echo "udebugFlag         135"                     >> $TAOS_CFG
+echo "tablemetakeeptimer 5"                       >> $TAOS_CFG
+echo "wal                0"                       >> $TAOS_CFG
+echo "asyncLog           0"                       >> $TAOS_CFG
+echo "locale             en_US.UTF-8"             >> $TAOS_CFG
+echo "enableCoreFile     1"                       >> $TAOS_CFG
+echo " "                                          >> $TAOS_CFG  
+
+ulimit -n 600000
+ulimit -c unlimited
+
+#sudo sysctl -w kernel.core_pattern=$TOP_DIR/core.%p.%e
+
+if [ -n "$FILE_NAME" ]; then
+  echo "------------------------------------------------------------------------"
+  if [ $VALGRIND -eq 1 ]; then
+    echo valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME
+    valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME
+  else
+    echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME
+    $PROGRAM -c $CFG_DIR -f $FILE_NAME
+  fi
+else
+  echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f basicSuite.sim
+  echo "------------------------------------------------------------------------"
+  $PROGRAM -c $CFG_DIR -f basicSuite.sim
+fi
+
diff --git a/tests/script/tjenkins b/tests/script/tjenkins
new file mode 100755
index 0000000000000000000000000000000000000000..9b93527de97f29f84e2b1e6b2ec2ab4a621f6709
Binary files /dev/null and b/tests/script/tjenkins differ
diff --git a/tests/script/tmp/182.sim b/tests/script/tmp/182.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a178282cf835b236a202c71f1ef5a595e784324c
--- /dev/null
+++ b/tests/script/tmp/182.sim
@@ -0,0 +1,41 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c activeCode -v eglxDLzRpslJWl7OxrPZ2K3sQ5631AP9SVpezsaz2dhJWl7OxrPZ2ElaXs7Gs9nYSVpezsaz2djGIj5StnQ3ZvLHcsE8cwcN
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 100000
+
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode2 -c http -v 1
+system sh/cfg.sh -n dnode3 -c http -v 1
+system sh/cfg.sh -n dnode4 -c http -v 1
+
+system sh/cfg.sh -n dnode1 -c httpMaxThreads -v 4
+
+system sh/cfg.sh -n dnode1 -c firstEp      -v 127.0.0.1:6030
+system sh/cfg.sh -n dnode1 -c secondEp     -v 127.0.0.1:6030
+system sh/cfg.sh -n dnode1 -c serverPort   -v 6030
+system sh/cfg.sh -n dnode1 -c fqdn         -v 127.0.0.1
+system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/tmp/http.sim b/tests/script/tmp/http.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a5212905aed8558bb47983227e16ac6341fd8945
--- /dev/null
+++ b/tests/script/tmp/http.sim
@@ -0,0 +1,35 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode2 -c http -v 1
+system sh/cfg.sh -n dnode3 -c http -v 1
+
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode2 -c monitor -v 1
+system sh/cfg.sh -n dnode3 -c monitor -v 1
+
+system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
+system sh/cfg.sh -n dnode2 -c monitorInterval -v 1
+system sh/cfg.sh -n dnode3 -c monitorInterval -v 1
+
+system sh/exec.sh -n dnode1 -s start
\ No newline at end of file
diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..48dbc19cb2a083a9d59cca782a66532b57f5dd4a
--- /dev/null
+++ b/tests/script/tmp/mnodes.sim
@@ -0,0 +1,80 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c http -v 0
+system sh/cfg.sh -n dnode2 -c http -v 0
+system sh/cfg.sh -n dnode3 -c http -v 0
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20000
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 20000
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 20000
+
+system sh/cfg.sh -n dnode1 -c replica -v 3
+system sh/cfg.sh -n dnode2 -c replica -v 3
+system sh/cfg.sh -n dnode3 -c replica -v 3
+
+print ============== deploy
+
+system sh/exec.sh -n dnode1 -s start 
+sleep 5001
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start 
+system sh/exec.sh -n dnode3 -s start 
+
+print  =============== step1
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 5 then
+	  return -1
+	endi
+sql show mnodes -x show1
+$mnode1Role = $data2_1
+print mnode1Role $mnode1Role
+$mnode2Role = $data2_2
+print mnode2Role $mnode2Role
+$mnode3Role = $data2_3
+print mnode3Role $mnode3Role
+
+if $mnode1Role != master then
+  goto show1
+endi
+if $mnode2Role != slave then
+  goto show1
+endi
+if $mnode3Role != slave then
+  goto show1
+endi
+
+$x = 1
+show2:
+
+print  =============== step $x
+sql show mnodes
+print $data0_1 $data2_1
+print $data0_2 $data2_2
+print $data0_3 $data2_3
+
+
+$x = $x + 1
+sleep 5000
+if $x == 100000 then
+  return -1
+endi
+
+goto show2
diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim
new file mode 100644
index 0000000000000000000000000000000000000000..343c422e9ff772c10f22539fb012fbf38241f91d
--- /dev/null
+++ b/tests/script/tmp/prepare.sim
@@ -0,0 +1,49 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c activeCode -v eglxDLzRpslJWl7OxrPZ2K3sQ5631AP9SVpezsaz2dhJWl7OxrPZ2ElaXs7Gs9nYSVpezsaz2djGIj5StnQ3ZvLHcsE8cwcN
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 100000
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 100000
+
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode2 -c http -v 1
+system sh/cfg.sh -n dnode3 -c http -v 1
+system sh/cfg.sh -n dnode4 -c http -v 1
+
+return
+# for crash_gen
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 10
+system sh/cfg.sh -n dnode1 -c rpcMaxTime -v 101
+system sh/cfg.sh -n dnode1 -c cache -v 2
+system sh/cfg.sh -n dnode1 -c keep -v 36500
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+
+
+# for windows
+
+system sh/cfg.sh -n dnode1 -c firstEp      -v 152.136.17.116:6030
+system sh/cfg.sh -n dnode1 -c secondEp     -v 152.136.17.116:6030
+system sh/cfg.sh -n dnode1 -c serverPort   -v 6030
+system sh/cfg.sh -n dnode1 -c fqdn         -v 152.136.17.116
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9eecceb39d106ab335b631bcfae370c2ae516490
--- /dev/null
+++ b/tests/script/unique/account/account_create.sim
@@ -0,0 +1,80 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = acdb
+$tbPrefix = actb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$accountPrefix = acac
+
+print =============== step1-4
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+$i = 0
+$acc = $accountPrefix . $i
+sql_error create account $acc PASS pass123
+sql create account $acc PASS 'pass123'
+#sql create account $acc PASS 'pass123' -x step1
+#	return -1
+#step1:
+sql create user $acc PASS 'pass123' -x step2
+	return -1
+step2:
+
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step5-6
+sql drop account $acc
+sql drop account $acc -x step5
+	return -1
+step5:
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step7
+sql create account $acc PASS 'pass123'
+#sql create account $acc PASS 'pass123' -x step7
+#	return -1
+#step7:
+
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+sql drop account $acc
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
new file mode 100644
index 0000000000000000000000000000000000000000..564512228eda3aa156faba4818e3bc150b69de76
--- /dev/null
+++ b/tests/script/unique/account/account_delete.sim
@@ -0,0 +1,99 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============= step1
+sql create account oroot pass 'taosdata' 
+sql close
+sql connect oroot
+sleep 2000
+
+print ============= step2
+sql create user read pass 'taosdata'
+sql create user write pass 'taosdata'
+
+sql create database d1
+sql create database d2
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 1)
+sql insert into d2.t2 values(now, 1)
+sql insert into d2.t2 values(now+1s, 2)
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2 
+if $rows != 2 then 
+  return -1
+endi
+
+print ============= step3
+sql close
+sql connect
+sleep 2000
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+sql show dnodes
+print $data00 $data01 $data02 $data03
+if $data02 != 2 then
+  return -1
+endi
+sql drop account oroot
+
+print ============= step4
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+
+sql show dnodes
+if $data02 != 0 then
+  goto show4
+endi
+
+print ============= step5
+sql create account oroot pass 'taosdata'
+
+sql close
+sql connect oroot
+sleep 2000
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+sql show users
+if $rows != 2 then 
+  return -1
+endi
+
+sql close
+sql connect
+sleep 2000
+sql drop account oroot
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..75636be513af84ba00d9052d09193dcbf9ee2158
--- /dev/null
+++ b/tests/script/unique/account/account_len.sim
@@ -0,0 +1,92 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = aldb
+$tbPrefix = altb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop account ac -x step0
+	return -1
+step0:
+
+sql create account PASS 123 -x step1
+	return -1
+step1:
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step2
+sql drop account a -x step2
+step2:
+sql create account a PASS '123'
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+sql drop account a
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql drop account abc01234567890123456789 -x step3
+step3:
+sql create account abc01234567890123456789 PASS '123'
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+sql drop account abc01234567890123456789
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step4
+sql create account abcd01234567890123456789012345689012345 PASS '123' -x step4
+	return -1
+step4:
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql drop account 123 -x step5
+step5:
+sql create account 123 pass '123' -x step51
+  return -1
+step51:
+
+sql create account a123 PASS '123'
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+sql drop account a123
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f88f254a79c83a95ff0e89a3e36eddb2856ad3a2
--- /dev/null
+++ b/tests/script/unique/account/authority.sim
@@ -0,0 +1,346 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============= step1
+
+sql create user read pass 'taosdata'
+sql create user write pass 'taosdata'
+sql create user manage pass 'taosdata'
+
+sql create user a PASS 'ade' privilege  -x step11
+  return -1
+step11:
+
+sql create user a PASS 'ade' privilege a -x step12
+  return -1
+step12:
+
+sql create user a PASS 'ade' privilege read -x step13
+  return -1
+step13:
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+sql alter user read privilege read
+sql alter user write privilege write
+sql_error alter user manage privilege super
+
+print ============= step2
+sql close
+sql connect write
+sleep 2000
+
+sql create database d1
+sql create database d2
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 1)
+sql insert into d2.t2 values(now, 1)
+sql insert into d2.t2 values(now+1s, 2)
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2
+if $rows != 2 then 
+  return -1
+endi
+
+sql create account t1 pass 'taosdata' -x step21
+  return -1
+step21:
+
+sql create user t1 pass 'taosdata' -x step22
+  return -1
+step22:
+
+sql alter user read pass 'taosdata' -x step23
+  return -1
+step23:
+
+sql create dnode $hostname2 -x step24
+  return -1
+step24:
+
+sql drop dnode $hostname2 -x step25
+  return -1
+step25:
+
+sql create mnode 192.168.0.2 -x step26
+  return -1
+step26:
+
+sql drop mnode 192.168.0.2 -x step27
+  return -1
+step27:
+
+sql drop account root -x step28
+  return -1 
+step28:
+
+sql alter user write pass 'taosdata'
+
+print ============= step3
+sql close
+sql connect read
+sleep 2000
+
+sql create database d3 -x step31
+  return -1
+step31:
+
+sql create table d1.t3 (ts timestamp, i int) -x step32
+  return -1
+step32:
+
+#sql insert into d1.t1 values(now, 2) -x step33
+#  return -1
+#step33:
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then 
+  return -1
+endi
+
+sql sql create account t1 pass 'taosdata' -x step34
+  return -1
+step34:
+
+sql sql create user t1 pass 'taosdata' -x step35
+  return -1
+step35:
+
+print ============= step4
+sql close
+sql connect manage
+sleep 2000
+
+sql create database d3
+sql create database d4
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+sql show databases
+if $rows != 4 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2
+if $rows != 2 then 
+  return -1
+endi
+
+sql create account other pass 'taosdata'  -x step41
+  return -1
+step41:  
+
+sql close
+sql connect
+sleep 2000
+sql create account other pass 'taosdata'
+
+print ============= step5
+sql close
+sql connect other
+sleep 2000
+sql create user read pass 'taosdata' -x step51
+  return -1
+step51:
+sql create other write pass 'taosdata' -x step52
+  return -1
+step52:
+
+sql create user oread pass 'taosdata'
+sql create user owrite pass 'taosdata'
+sql create user omanage pass 'taosdata' 
+
+sql show users
+print show users $rows
+if $rows != 5 then 
+  return -1
+endi
+
+sql alter user oread privilege read
+sql alter user owrite privilege write
+sql alter user oroot privilege super -x step53
+  return -1
+step53:
+sql alter user read privilege read -x step54
+  return -1
+step54:
+
+print ============= step6
+sql close
+sql connect owrite
+sleep 2000
+sql reset query cache
+sleep 1000
+sql create database d1
+sql create database d3
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql insert into d1.t1 values(now, 11)
+sql insert into d3.t3 values(now, 11)
+sql insert into d3.t3 values(now+1s, 12)
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2 -x step6
+  return -1
+step6:
+sql select * from d3.t3
+if $rows != 2 then 
+  return -1
+endi
+
+sql sql create account t1 pass 'taosdata' -x step61
+  return -1
+step61:
+
+sql sql create user t1 pass 'taosdata' -x step62
+  return -1
+step62:
+
+print ============= step7
+sql close
+sql connect oread
+sleep 2000
+
+sql create database d7 -x step71
+  return -1
+step71:
+
+sql show databases
+if $rows != 2 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2 -x step72
+  return -1
+step72:
+sql select * from d3.t3
+if $rows != 2 then 
+  return -1
+endi
+
+sql sql create account t1 pass 'taosdata' -x step73
+  return -1
+step73:
+
+sql sql create user t1 pass 'taosdata' -x step74
+  return -1
+step74:
+
+print ============= step8
+sql close
+sql connect omanage
+sleep 2000
+
+sql create account t1 pass 'taosdata' -x step81
+  return -1
+step81:
+
+sql create database d4
+sql create table d4.t4 (ts timestamp, i int)
+
+sql show databases
+if $rows != 3 then 
+  return -1
+endi
+sql select * from d1.t1
+if $rows != 1 then 
+  return -1
+endi
+sql select * from d2.t2 -x step82
+  return -1
+step82:
+sql select * from d3.t3
+if $rows != 2 then 
+  return -1
+endi
+
+print ============= step9
+sql close
+sql connect
+sleep 2000
+sql show databases
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop account other
+sql drop user read
+sql drop user manage
+sql drop user write
+
+sql close
+sql connect
+sleep 2000
+sql drop database d1
+sql drop database d2
+sql drop database d3
+sql drop database d4
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0861c9305b836eb96c62acf11a8cad21ec6212a3
--- /dev/null
+++ b/tests/script/unique/account/basic.sim
@@ -0,0 +1,46 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== show accounts
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+
+print =============== create account1
+sql create account account1 PASS 'account1'
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+
+print =============== create account2
+sql create account account2 PASS 'account2'
+sql show accounts
+if $rows != 3 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+print $data20 $data11 $data22
+
+print =============== drop account1
+sql drop account account1
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+print $data10 $data11 $data22
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ae511fe2b065dd23d7b1dc19464a06b3e43e1fe0
--- /dev/null
+++ b/tests/script/unique/account/paras.sim
@@ -0,0 +1,114 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print =============== show accounts
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != root then 
+  return -1
+endi
+if $data02 != 3/128 then 
+  return -1
+endi
+if $data03 != 0/128 then 
+  return -1
+endi
+if $data04 != 0/2147483647 then 
+  return -1
+endi
+if $data05 != 0/1000 then 
+  return -1
+endi
+if $data06 != 0.000/unlimited then 
+  return -1
+endi
+
+print =============== create account
+sql create account hou pass "hou" tseries 80000 storage 10737418240 streams 10 qtime 3600 dbs 3 users 3 conns 10 
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $data10 != hou then 
+  return -1
+endi
+if $data12 != 2/3 then 
+  return -1
+endi
+if $data13 != 0/3 then 
+  return -1
+endi
+if $data14 != 0/80000 then 
+  return -1
+endi
+if $data15 != 0/10 then 
+  return -1
+endi
+if $data16 != 0.000/10.000 then 
+  return -1
+endi
+  
+print =============== alter account
+sql alter account hou pass "hou" tseries 8000 streams 10 dbs 5 users 5  
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $data10 != hou then 
+  return -1
+endi
+if $data12 != 2/5 then 
+  return -1
+endi
+if $data13 != 0/5 then 
+  return -1
+endi
+if $data14 != 0/8000 then 
+  return -1
+endi
+if $data15 != 0/10 then 
+  return -1
+endi
+if $data16 != 0.000/10.000 then 
+  return -1
+endi  
+
+print =============== alter account
+sql create account hou pass "hou" tseries 8000 streams 10 dbs 5 users 6
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $data10 != hou then 
+  return -1
+endi
+if $data12 != 2/6 then 
+  return -1
+endi
+if $data13 != 0/5 then 
+  return -1
+endi
+if $data14 != 0/8000 then 
+  return -1
+endi
+if $data15 != 0/10 then 
+  return -1
+endi
+if $data16 != 0.000/10.000 then 
+  return -1
+endi  
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bf939acce37cb2d878f1e31ca01e11429d8d4fcb
--- /dev/null
+++ b/tests/script/unique/account/pass_alter.sim
@@ -0,0 +1,116 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============= step1
+sql create user read pass 'taosdata1'
+sql create user write pass 'taosdata1'
+
+sql alter user read pass 'taosdata'
+sql alter user write pass 'taosdata'
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print ============= step2
+sql close
+sql connect read
+sleep 2000
+sql alter user read pass 'taosdata'
+sql alter user write pass 'taosdata1' -x step2
+  return -1
+step2:
+
+
+print ============= step3
+sql close
+sql connect write
+sleep 2000
+sql alter user write pass 'taosdata'
+sql alter user read pass 'taosdata' -x step3
+  return -1
+step3:
+
+print ============= step4
+sql close 
+sleep 1000
+sql connect
+sleep 2000
+sql create account oroot pass 'taosdata'
+sql show accounts
+if $rows != 2 then 
+  return -1
+endi
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print ============= step5
+sql close
+sql connect oroot
+sleep 2000
+
+sql create user oread pass 'taosdata1'
+sql create user owrite pass 'taosdata1'
+sql alter user oread pass 'taosdata'
+sql alter user owrite pass 'taosdata'
+
+sql create user read pass 'taosdata1' -x step51
+  return -1
+step51:
+sql alter user read pass 'taosdata1' -x step52
+  return -1
+step52:
+
+sql show accounts -x step53
+  return -1
+step53:
+sql show users
+print show users $rows
+if $rows != 4 then 
+  return -1
+endi
+
+print ============= step6
+sql close
+sql connect oread
+sleep 2000
+sql alter user oread pass 'taosdata'
+sql alter user owrite pass 'taosdata1' -x step6
+  return -1
+step6:
+
+
+print ============= step7
+sql close
+sql connect owrite
+sleep 2000
+sql alter user owrite pass 'taosdata'
+sql alter user oread pass 'taosdata' -x step7
+  return -1
+step7:
+
+print ============= step8
+sql close
+sql connect
+sleep 2000
+sql alter user oread pass 'taosdata'
+sql alter user owrite pass 'taosdata'
+sql alter user oroot pass 'taosdata'
+
+sql drop account oroot
+sql drop user read
+sql drop user write
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1dd0a616f291549cf3e431348fe028114f11836d
--- /dev/null
+++ b/tests/script/unique/account/pass_len.sim
@@ -0,0 +1,81 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = apdb
+$tbPrefix = aptb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+$userPrefix = apusr
+
+print =============== step1
+$i = 0
+$user = $userPrefix . $i
+
+sql drop user $user -x step11
+  return -1
+step11:
+
+sql create user $user PASS -x step12
+  return -1
+step12:
+
+sql create user $user PASS 'taosdata'
+
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$user = $userPrefix . $i
+sql drop user $user -x step2
+step2:
+sql create user $user PASS '1'
+sql show users
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step3
+$i = 2
+$user = $userPrefix . $i
+sql drop user $user -x step3
+step3:
+
+sql create user $user PASS 'abc0123456789'
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+print =============== step4
+$i = 3
+$user = $userPrefix . $i
+sql create user $user PASS 'abcd012345678901234567891234567890' -x step4
+	return -1
+step4:
+sql show users
+if $rows != 6 then 
+  return -1
+endi
+
+$i = 0
+while $i < 3
+  $user = $userPrefix . $i
+  sql drop user $user 
+  $i = $i + 1
+endw
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9d4141cfe0c086f9a8863fffb00a9cb0f410e265
--- /dev/null
+++ b/tests/script/unique/account/testSuite.sim
@@ -0,0 +1,11 @@
+run unique/account/account_create.sim
+run unique/account/account_delete.sim
+run unique/account/account_len.sim
+run unique/account/authority.sim
+run unique/account/basic.sim
+run unique/account/paras.sim
+run unique/account/pass_alter.sim
+run unique/account/pass_len.sim
+run unique/account/usage.sim
+run unique/account/user_create.sim
+run unique/account/user_len.sim
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7fde3652017f5b17e61a39891b1f55c5940e2061
--- /dev/null
+++ b/tests/script/unique/account/usage.sim
@@ -0,0 +1,154 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+#system sh/exec.sh -n monitor -s 1
+system sh/exec.sh -n monitorInterval -s 1
+sleep 3000
+sql connect
+
+print =============== show accounts
+
+print =============== create account
+sql alter account root pass "taosdata" tseries 8000 streams 10 dbs 5 users 5  
+sql show accounts
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != root then 
+  return -1
+endi
+if $data02 != 3/5 then 
+  return -1
+endi
+if $data03 != 0/5 then 
+  return -1
+endi
+if $data04 != 0/8000 then 
+  return -1
+endi
+if $data05 != 0/10 then 
+  return -1
+endi
+if $data06 != 0.000/unlimited then 
+  return -1
+endi  
+
+print =============== check usage account
+sql create database d1 wal 2
+sql create database d2 wal 2
+sql create database d3 wal 2
+sql create database d4 wal 2
+sql create database d5 wal 2
+
+sql create table d1.t1 (ts timestamp, i int);
+sql create user u1 pass "u1"
+
+sql show accounts
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16
+if $data00 != root then 
+  return -1
+endi
+if $data02 != 4/5 then 
+  return -1
+endi
+if $data03 != 5/5 then 
+  return -1
+endi
+if $data04 != 1/8000 then 
+  return -1
+endi
+if $data05 != 0/10 then 
+  return -1
+endi
+if $data06 != 0.000/unlimited then 
+  return -1
+endi
+
+print =============== step2
+sql alter account root pass "taosdata" tseries 10 storage 1073741824 streams 10 dbs 5 users 5
+sql show accounts
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != root then 
+  return -1
+endi
+if $data02 != 4/5 then 
+  return -1
+endi
+if $data03 != 5/5 then 
+  return -1
+endi
+if $data04 != 1/10 then 
+  return -1
+endi
+if $data05 != 0/10 then 
+  return -1
+endi
+if $data06 != 0.000/1.000 then 
+  return -1
+endi
+  
+print =============== step3
+sql alter account root pass "taosdata" tseries 10 storage 16 streams 10 dbs 5 users 5
+sql show accounts
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != root then 
+  return -1
+endi
+if $data02 != 4/5 then 
+  return -1
+endi
+if $data03 != 5/5 then 
+  return -1
+endi
+if $data04 != 1/10 then 
+  return -1
+endi
+if $data05 != 0/10 then 
+  return -1
+endi
+if $data06 != 0.000/0.000 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into d1.t1 values(now + 1s, 1)
+sql insert into d1.t1 values(now + 2s, 2)
+
+sleep 10000
+print no write auth
+sql_error insert into d1.t1 values(now + 3s, 2)
+sql_error insert into d1.t1 values(now + 4s, 2)
+
+sql alter account root pass "taosdata" tseries 10 storage 36 streams 10 dbs 5 users 5
+sleep 10000
+print has write auth
+sql insert into d1.t1 values(now + 5s, 1)
+sql insert into d1.t1 values(now + 6s, 2)
+
+# no write auth
+sleep 10000
+print no write auth
+sql_error insert into d1.t1 values(now + 7s, 2)
+sql_error insert into d1.t1 values(now + 8s, 2)
+
+print =============== step5
+sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state all
+sleep 10000
+
+sql insert into d1.t1 values(now + 11s, 1)
+sql insert into d1.t1 values(now + 12s, 2)
+
+sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state no
+sleep 10000
+print no write auth
+sql_error insert into d1.t1 values(now + 13s, 2)
+sql_error insert into d1.t1 values(now + 14s, 2)
+
+sql alter account root pass "taosdata" tseries 10 storage 3600 streams 10 dbs 5 users 5 state all
+sleep 10000
+print has write auth
+sql insert into d1.t1 values(now + 15s, 1)
+sql insert into d1.t1 values(now + 16s, 2)
+
+print =============== check grant
+sql_error create database d6
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
new file mode 100644
index 0000000000000000000000000000000000000000..029bda22ea5a192634c911bba1df74a266402fea
--- /dev/null
+++ b/tests/script/unique/account/user_create.sim
@@ -0,0 +1,84 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print =============== step1
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+sql create user read PASS 'pass123'
+sql create user read PASS 'pass123' -x step1
+	return -1
+step1:
+
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql alter user read PASS 'taosdata'
+
+print =============== step2
+sql close
+sql connect read
+sleep 2000
+
+sql alter user read PASS 'taosdata'
+
+print =============== step3
+sql drop user read -x step31
+  return -1
+step31:
+sql drop user _root -x step32
+  return -1
+step32:
+sql drop user monitor -x step33
+  return -1
+step33:
+
+print =============== step4
+sql close
+sql connect
+sleep 2000
+
+sql alter user read privilege read
+sql show users
+print $data1_read
+if $data1_read != readable then 
+  return -1
+endi
+
+sql_error alter user read privilege super
+sql show users
+print $data1_read
+if $data1_read != readable then
+  return -1
+endi
+
+sql alter user read privilege write
+sql show users
+if $data1_read != writable then 
+  return -1
+endi
+
+sql alter user read privilege 1 -x step43
+  return -1
+step43:
+
+sql drop user _root -x step41
+  return -1
+step41:
+
+sql drop user monitor -x step42
+  return -1
+step42:
+
+sql drop user read
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..91a5ebfaaba09196ff62196b23e60b59784ee1eb
--- /dev/null
+++ b/tests/script/unique/account/user_len.sim
@@ -0,0 +1,94 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+$i = 0
+$dbPrefix = lm_us_db
+$tbPrefix = lm_us_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop user ac -x step0
+	return -1
+step0:
+
+sql create user PASS '123' -x step1
+	return -1
+step1:
+
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step2
+sql drop user a -x step2
+step2:
+sleep 1000
+sql create user a PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user a
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step3
+sql drop user abc01234567890123456789 -x step3
+step3:
+
+sql create user abc01234567890123456789 PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user abc01234567890123456789
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step4
+sql create user abcd0123456789012345678901234567890111 PASS '123' -x step4
+	return -1
+step4:
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step5
+sql drop user 123 -x step5
+step5:
+sql create user 123 PASS '123' -x step61
+  return -1
+step61:
+
+sql create user a123 PASS '123'
+sql show users
+if $rows != 4 then 
+  return -1
+endi
+
+sql drop user a123
+sql show users
+if $rows != 3 then 
+  return -1
+endi
+
+sql show accounts
+if $rows != 1 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/arbitrator/check_cluster_cfg_para.sim b/tests/script/unique/arbitrator/check_cluster_cfg_para.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1b22db9d827d3bc01c3374f21df51377bb775aa5
--- /dev/null
+++ b/tests/script/unique/arbitrator/check_cluster_cfg_para.sim
@@ -0,0 +1,199 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode1 -c statusInterval -v 3
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode1 -c timezone -v ""
+#system sh/cfg.sh -n dnode1 -c locale -v ""
+#system sh/cfg.sh -n dnode1 -c charset -v ""
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 3
+
+######## dnode 2 the same with dnode1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode2 -c statusInterval -v 3
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode2 -c timezone -v ""
+#system sh/cfg.sh -n dnode2 -c locale -v ""
+#system sh/cfg.sh -n dnode2 -c charset -v ""
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 3
+
+######## dnode 3 one para no same with dnode1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode3 -c statusInterval -v 3
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode3 -c timezone -v ""
+#system sh/cfg.sh -n dnode3 -c locale -v ""
+#system sh/cfg.sh -n dnode3 -c charset -v ""
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 3
+
+######## dnode 4 one para no same with dnode1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 5
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode4 -c statusInterval -v 3
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode4 -c timezone -v ""
+#system sh/cfg.sh -n dnode4 -c locale -v ""
+#system sh/cfg.sh -n dnode4 -c charset -v ""
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 3
+
+######## dnode 5 one para no same with dnode1
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode5 -c offlineThreshold -v 7
+system sh/cfg.sh -n dnode5 -c statusInterval -v 3
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode5 -c timezone -v ""
+#system sh/cfg.sh -n dnode5 -c locale -v ""
+#system sh/cfg.sh -n dnode5 -c charset -v ""
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 3
+
+
+######## dnode 6 one para no same with dnode1
+system sh/cfg.sh -n dnode6 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode6 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode6 -c offlineThreshold -v 8 
+system sh/cfg.sh -n dnode6 -c statusInterval -v 2
+system sh/cfg.sh -n dnode6 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode6 -c timezone -v ""
+#system sh/cfg.sh -n dnode6 -c locale -v ""
+#system sh/cfg.sh -n dnode6 -c charset -v ""
+system sh/cfg.sh -n dnode6 -c balanceInterval -v 3
+
+
+######## dnode 7 one para no same with dnode1
+system sh/cfg.sh -n dnode7 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode7 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode7 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode7 -c statusInterval -v 3
+system sh/cfg.sh -n dnode7 -c arbitrator -v "plum-VirtualBox:8001"
+#system sh/cfg.sh -n dnode7 -c timezone -v ""
+#system sh/cfg.sh -n dnode7 -c locale -v ""
+#system sh/cfg.sh -n dnode7 -c charset -v ""
+system sh/cfg.sh -n dnode7 -c balanceInterval -v 3
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2~7 and add into cluster 
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+system sh/exec.sh -n dnode6 -s start
+system sh/exec.sh -n dnode7 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
+sql create dnode $hostname6
+sql create dnode $hostname7
+sleep 10000
+
+$loopCnt = 0
+wait_dnode_created:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show dnodes
+if $rows != 7 then
+  sleep 2000
+  goto wait_dnode_created
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+$dnode5Status = $data4_5
+$dnode6Status = $data4_6  
+$dnode7Status = $data4_7 
+
+if $dnode1Status != ready then
+  return -1
+endi
+if $dnode2Status != ready then
+  return -1
+endi
+if $dnode3Status != offline then
+  return -1
+endi
+if $dnode4Status != offline then
+  return -1
+endi
+if $dnode5Status != offline then
+  return -1
+endi
+if $dnode6Status != offline then
+  return -1
+endi
+if $dnode7Status != offline then
+  return -1
+endi
+
+sleep 10000
+
+$loopCnt = 0
+wait_dnode_offline_overtime_dropped:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 20 then 
+  return -1
+endi
+sql show dnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode_offline_overtime_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+$dnode5Status = $data4_5
+$dnode6Status = $data4_6  
+$dnode7Status = $data4_7 
+
+if $dnode1Status != ready then
+  return -1
+endi
+if $dnode2Status != ready then
+  return -1
+endi
diff --git a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6f0f61d2e2f6dd85523f5e9b888172f475d8cbad
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -0,0 +1,222 @@
+# Test case describe: dnode1 is only mnode, dnode2/dnode3 are only vnode
+# step 1: start dnode1
+# step 2: start dnode2 and dnode3, and all added into cluster (Suppose dnode2 is master-vnode)
+# step 2: create db, table, insert data, and Falling disc into file (control only one file, e.g. 1841)
+# step 3: insert old data(now-20d) and new data(now-40d), control data rows  in order to save in cache, not falling disc 
+# step 4: stop dnode2, so date rows falling disc, generate two new files 1840, 1842 in dnode2
+# step 5: insert two data rows: now-21d, now-41d
+# step 6: restart dnode2, waiting sync end
+# expect: in dnode2, the files 1837 and 1839 will be removed
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+$totalTableNum = 1
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 130000
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+# insert over 2M data in order to falling disc, generate one file
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+#    $ts = $tsStart + $x
+    sql insert into $tb values ( now + 0s , $x ) ( now + 1s , $x ) ( now + 2s , $x ) ( now + 3s , $x ) ( now + 4s , $x ) ( now + 5s , $x ) ( now + 6s , $x ) ( now + 7s , $x ) ( now + 8s , $x ) ( now + 9s , $x )
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows data00:$data00
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 == 0 then
+  return -1
+endi
+
+$totalRows = $data00
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode3, so date rows falling disc, generate two new files in dnode3
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+
+sleep $sleepTimer   # waitting for move master vnode of dnode2 to dnode3
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ---->dnode3 data files: $system_content    expect: 9 
+if $system_content != 9 then 
+  return -1
+endi
+
+print ============== step5: insert two data rows: now-16d, now+16d, 
+sql insert into $tb values ( now - 21d , -21 )
+sql insert into $tb values ( now - 41d , -41 )
+$totalRows = $totalRows + 2
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ---->dnode2 data files: $system_content    expect: 3 
+if $system_content != 3 then 
+  return -1
+endi
+
+print ============== step7: restart dnode3, waiting sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+$loopCnt = 0
+wait_dnode3_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_ready
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ---->dnode2 data files: $system_content    expect: 3 
+if $system_content != 3 then 
+  return -1
+endi
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ---->dnode3 data files: $system_content    expect: 3 
+if $system_content != 3 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
new file mode 100644
index 0000000000000000000000000000000000000000..80a050f883dd4cb1516bee18791addadb5b4567d
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync_second.sim
@@ -0,0 +1,52 @@
+# Test case describe: dnode1 is only mnode, dnode2/dnode3 are only vnode
+# step 1: start dnode1
+# step 2: start dnode2 and dnode3, and all added into cluster (Suppose dnode2 is master-vnode)
+# step 3: create db, table, insert data, and Falling disc into file (control only one file, e.g. 1841)
+# step 4: insert old data(now-20d) and new data(now-40d), control data rows  in order to save in cache, not falling disc 
+# step 5: stop dnode2, so date rows falling disc, generate two new files 1840, 1842 in dnode2
+# step 6: insert two data rows: now-21d, now-41d
+# step 7: restart dnode2, waiting sync end
+# expect: in dnode2, the files 1837 and 1839 will be removed
+
+sql connect
+sleep 3000
+
+print ============== step7: restart dnode2, waiting sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+wait_dnode2_ready:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+
+sleep 1000
+# check using select
+$db = db
+$stb = stb
+sql use $db
+sql select count(*) from $stb
+print data00 $data00, should equal to dn2_mn1_cache_file_sync.sim output
+#if $data00 != $totalRows then
+#	return -1
+#endi
+
+print ============== step8: please check there should be 1 file in sim/dnode2/data/vnode/vnode2/tsdb/data/, and 1 file sim/dnode3/data/vnode/vnode2/tsdb/data/
diff --git a/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim b/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
new file mode 100644
index 0000000000000000000000000000000000000000..97433741f53c3053e25b588d7368377e1b890117
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim
@@ -0,0 +1,101 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 16
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: create one table, should return error for not more vnode
+sql_error create table tbm using $stb tags( 10000 )
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim b/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a6a9129090da41d83e619d6ca123c2ba75d312fd
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
@@ -0,0 +1,102 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 16
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: drop dnode4, should return error for not more dnode
+sql_error drop dnode $hostname4
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim b/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7bb37c5ebb65a1620f6dbcec24502e9b7e635844
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
@@ -0,0 +1,310 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: drop the middle table 5
+sql drop table tb5
+$totalRows = $totalRows - 10
+sleep 6000
+
+print ============== step4: insert data into other tables
+$tsStart = 1420041610000
+$i = 0
+$tblNum = 5
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+$i = 6
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step5: create the middle table 5 and insert data
+sql create table tb5 using $stb tags( 5 )
+sleep 3000
+
+$tsStart = 1420041620000
+$i = 5
+$tblNum = 6
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb5
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi
+
+print ============== step6: drop the first table 0
+sql drop table tb0
+$totalRows = $totalRows - 20
+sleep 6000
+
+print ============== step7: insert data into other tables
+$tsStart = 1420041630000
+$i = 1
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+sql select count(*) from tb5
+print data00 $data00
+if $data00 != 20 then
+	return -1
+endi
+
+print ============== step8: create the first table 0 and insert data
+sql create table tb0 using $stb tags( 0 )
+sleep 3000
+
+$tsStart = 1420041640000
+$i = 0
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb0
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi
+
+print ============== step9: drop the last table 9
+sql drop table tb9
+$totalRows = $totalRows - 40
+sleep 6000
+
+print ============== step10: insert data into other tables
+$tsStart = 1420041650000
+$i = 0
+$tblNum = 9
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step11: create the last table 9 and insert data
+sql create table tb9 using $stb tags( 9 )
+sleep 3000
+
+$tsStart = 1420041660000
+$i = 0
+$tblNum = 10
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql select count(*) from tb9
+print data00 $data00
+if $data00 != 10 then
+	return -1
+endi
diff --git a/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim b/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e11dd69598943410def7d75abb53ce2c03fd63c0
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
@@ -0,0 +1,160 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1 
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode2 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$rowNum = 10
+$tblNum = 16
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 1000
+sql reset query cache
+sleep 1000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  return -1
+endi
+
+print ============== step3: stop dnode4, after timerout dnode4 will be auto-dropped. 
+### The script using down port to stop the network is invalid, so temp it stops the service instead
+system sh/exec.sh -n dnode4 -s stop
+#system sh/port.sh -p 7400 -s down
+sleep 12000
+
+$loopCnt = 0
+wait_dnode4_dropped:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, but there no dnode4 in cluster 
+system sh/exec.sh -n dnode4 -s start
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..aaf0da8553886b8da1f6df7107a8b25bff531705
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim
@@ -0,0 +1,358 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 5000
+
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode3, and remove its vnodeX subdirector 
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+#sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_2
+$dnode2Vtatus = $data7_2
+
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+
+system rm -rf ../../../sim/dnode3/data
+#system rm -rf ../../../sim/dnode3/data/vnode/*
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode3, waiting sync end 
+system sh/exec.sh -n dnode3 -s start
+#sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_2
+$dnode2Vtatus = $data7_2
+
+print dnode2Vtatus: $dnode3Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode2, and remove its vnode
+sleep 5000
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+system rm -rf ../../../sim/dnode2/data
+#system rm -rf ../../../sim/dnode2/data/vnode/*
+#system rm -rf ../../../sim/dnode3/data/vnode/*
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step6: restart dnode2, and check rows
+system sh/exec.sh -n dnode2 -s start
+#sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+
+$loopCnt = 0
+wait_dnode2_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_2
+$dnode2Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+if $dnode2Vtatus != slave then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql insert into $tb values ( now , 20000 ) ( now + 1a, 20001 ) ( now + 2a, 20002 )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c647a35a5cc21c3a071b67b27330418a7b7ac57a
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim
@@ -0,0 +1,407 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4, and remove its vnodeX subdirector 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+system rm -rf ../../../sim/dnode4/data
+#system rm -rf ../../../sim/dnode4/data/vnode/*
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, waiting sync end 
+system sh/exec.sh -n dnode4 -s start
+#sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode3/dnode2, and remove its vnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode23_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+
+system rm -rf ../../../sim/dnode2/data
+system rm -rf ../../../sim/dnode3/data
+#system rm -rf ../../../sim/dnode2/data/vnode/*
+#system rm -rf ../../../sim/dnode3/data/vnode/*
+
+print ============== step6: restart dnode2/dnode3, and check rows
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode23_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode23_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql insert into $tb values ( now , 20000 ) ( now + 1a, 20001 ) ( now + 2a, 20002 )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step7: stop dnode3/dnode2, and cluster unable to provide services
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 3000
+sql_error select count(*) from $stb
+
+print ============== step8: restart dnode2, and cluster Still unable to provide services
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+sql_error select count(*) from $stb
+
+print ============== step9: restart dnode3, and cluster Resume service delivery
+system sh/exec.sh -n dnode3 -s start
+
+$loopCnt = 0
+wait_dnode4_vgroup_master_2:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_2
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_2
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_2
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..986df81bf695affa71a4e9be740fc246fcc0ee96
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
@@ -0,0 +1,367 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1 
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 16
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 16
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 16
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 16
+system sh/cfg.sh -n dnode5 -c maxVgroupsPerDb -v 16
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 200
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 200
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 200
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 200
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 200
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+system sh/cfg.sh -n dnode5 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode5 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode2 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode5 -c enableCoreFile -v 1
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster, then create database replica 2, create table , and insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+$rowNum = 100
+$tblNum = 16
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 1000
+sql reset query cache
+sleep 1000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: add one new dnode4 expect auto balancing 
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+sleep 10000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step4: stop dnode3, after offlineThreshold, dnode3 will be dropped for cluster
+system sh/exec.sh -n dnode3 -s stop
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+#sleep 3000
+#sql show dnodes
+#print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+#print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4
+#
+#if $dnode1Status != ready then
+#  return -1
+#endi
+#if $dnode2Status != ready then
+#  return -1
+#endi
+#if $dnode3Status != offline then
+#  return -1
+#endi
+#if $dnode4Status != ready then
+#  return -1
+#endi
+
+sleep 15000
+
+$loopCnt = 0
+wait_drop:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 3000
+  goto wait_drop
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4
+
+if $dnode1Status != ready then
+  return -1
+endi
+if $dnode2Status != ready then
+  return -1
+endi
+if $dnode3Status != null then
+  return -1
+endi
+if $dnode4Status != ready then
+  return -1
+endi
+
+print ============== step4-1: restart dnode3, adn add into cluster
+system rm -rf ../../../sim/dnode3
+sleep 1000
+
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 200
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 16
+
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 3000
+
+$loopCnt = 0
+wait_dnode3_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+print rows: $rows
+if $rows != 4 then
+  sleep 3000
+  goto wait_dnode3_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4  
+$dnode5Status = $data4_5
+
+if $dnode1Status != ready then
+  goto wait_dnode3_ready
+endi
+if $dnode2Status != ready then
+  goto wait_dnode3_ready
+endi
+if $dnode3Status != null then
+  goto wait_dnode3_ready
+endi
+if $dnode4Status != ready then
+  goto wait_dnode3_ready
+endi
+if $dnode5Status != ready then
+  goto wait_dnode3_ready
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: start dnode5 and add into cluster , drop database
+sql drop database $db
+sleep 1000
+system sh/exec.sh -n dnode5 -s start
+sql create dnode $hostname5
+sleep 3000
+$loopCnt = 0
+wait_dnode5:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 5 then
+  sleep 3000
+  goto wait_dnode5
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode4Status = $data4_4  
+$dnode5Status = $data4_5 
+$dnode6Status = $data4_6
+
+if $dnode1Status != ready then
+  goto wait_dnode5
+endi
+if $dnode2Status != ready then
+  goto wait_dnode5
+endi
+if $dnode3Status != null then
+  goto wait_dnode5
+endi
+if $dnode4Status != ready then
+  goto wait_dnode5
+endi
+if $dnode5Status != ready then
+  goto wait_dnode5
+endi
+if $dnode6Status != ready then
+  goto wait_dnode5
+endi
+
+print ============== step6: create database and table until not free vnodes 
+$rowNum = 100
+$tblNum = 32
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db1
+sql create database $db replica 2
+sql use $db
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 2000
+sql reset query cache
+sleep 3000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step7: drop dnode $hostname5, system should prompt "DB error: no enough dnodes" 
+sql_error drop dnode $hostname5
+print error: $error 
+print ============== step8: create table tb_more using $stb tags( 1000 ), system should prompt 'DB error: no enough dnodes' 
+sql_error create table tb_more using $stb tags( 1000 )
+print error: $error 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
new file mode 100644
index 0000000000000000000000000000000000000000..23ace47e3cf13cb18467c0482a30be97d5f03d33
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim
@@ -0,0 +1,525 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2 and add into cluster , then create database with replica 1, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 3000
+
+$sleepTimer = 10000
+
+$db = db
+sql create database $db replica 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step2-1: stop dnode2 for falling disc, then restart dnode2, and check rows
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+
+$loopCnt = 0
+wait_dnode2_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+system sh/exec.sh -n dnode2 -s start
+sleep $sleepTimer
+
+
+$loopCnt = 0
+wait_dnode2_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: start dnode3 and add into cluster , then alter replica from 1 to 2, and waiting sync
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 3000
+
+sql alter database $db replica 2
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode3_ready
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_ready
+endi
+
+sleep $sleepTimer
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step4: stop dnode2 for checking if sync ok
+system sh/exec.sh -n dnode2 -s stop
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sleep $sleepTimer   # waitting for move master vnode of dnode2 to dnode3
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+$loopCnt = 0
+wait_dnode2_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+
+sleep $sleepTimer
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: start dnode4 and add into cluster , then alter replica from 2 to 3, and waiting sync
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+sleep 3000
+
+sql alter database $db replica 3
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode4_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+sleep $sleepTimer
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step7: alter replica from 3 to 2, and waiting sync
+sql alter database $db replica 2
+sleep $sleepTimer
+$loopCnt = 0
+wait_vgroups_replic_to_2:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1  $data10_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2  $data10_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3  $data10_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4  $data10_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$thirdDnode_2 = $data8_1 
+$thirdDnode_3 = $data8_2 
+$thirdDnode_4 = $data8_3 
+$thirdDnode_5 = $data8_4 
+
+if $thirdDnode_2 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_2
+endi
+if $thirdDnode_3 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_2
+endi
+if $thirdDnode_4 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_2
+endi
+if $thirdDnode_5 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_2
+endi
+
+sleep $sleepTimer  #waiting del one replica data
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step8: alter replica from 2 to 1, and waiting sync
+sql alter database $db replica 1
+sleep $sleepTimer
+$loopCnt = 0
+wait_vgroups_replic_to_1:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$sencodDnode_2 = $data6_1 
+$sencodDnode_3 = $data6_2 
+$sencodDnode_4 = $data6_3 
+$sencodDnode_5 = $data6_4 
+
+if $sencodDnode_2 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_1
+endi
+if $sencodDnode_3 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_1
+endi
+if $sencodDnode_4 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_1
+endi
+if $sencodDnode_5 != null then
+  sleep 2000
+  goto wait_vgroups_replic_to_1
+endi
+
+$loopCnt = 0
+all_dnodes_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto all_dnodes_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto all_dnodes_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto all_dnodes_ready
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto all_dnodes_ready
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto all_dnodes_ready
+endi
+
+sleep $sleepTimer  #waiting del one replica data
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step9: drop dnode2/dnode3
+sql drop dnode $hostname2
+sql drop dnode $hostname3
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode23_dropped:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode23_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != null then
+  sleep 2000
+  goto wait_dnode23_dropped
+endi
+if $dnode3Status != null then
+  sleep 2000
+  goto wait_dnode23_dropped
+endi
+if $dnode4Status != ready then
+  return -1
+endi
+
+sleep $sleepTimer  #waiting move vnode from dnode3/dnode3 to dnode4
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c36e9f015e16512293b3113f9e46de0fd581c4ef
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
@@ -0,0 +1,142 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 10000
+
+$db = db
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: drop dnode4, then check rows
+#system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sql drop dnode $hostname4
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode4_dropped:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+
+sql reset query cache
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
new file mode 100644
index 0000000000000000000000000000000000000000..438e4af34f4a462ea6e84e075889a4e289d35743
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
@@ -0,0 +1,222 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1 
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 5
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 5
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 5
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 5
+
+system sh/cfg.sh -n dnode1 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode2 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster, then create database, create table , and insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$rowNum = 10
+$tblNum = 16
+$totalRows = 0
+$tsStart = 1420041600000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+print       info: select count(*) from $stb
+sleep 1000
+sql reset query cache
+sleep 1000
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  return -1
+endi
+
+print ============== step3: stop dnode4, after timerout dnode4 will be auto-dropped. 
+system sh/exec.sh -n dnode4 -s stop
+sleep 12000
+
+$loopCnt = 0
+wait_dnode4_dropped:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_dropped
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, but there are not dnode4 in cluster 
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+
+print ============== step5: recreate dnode4 into cluster, result should fail
+sql create dnode $hostname4
+sleep 12000
+sql show dnodes
+if $rows != 3 then
+  return -1
+endi
+
+print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should ok 
+system sh/exec.sh -n dnode4 -s stop
+system rm -rf ../../../sim/dnode4
+
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c role -v 2
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 5
+system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1
+
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+sleep 6000
+
+$loopCnt = 0
+wait_dnode4_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_6 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4f80c2389ee25d06a9852d38af9df3d40d838c90
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
@@ -0,0 +1,319 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql show dnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+
+print ============== step3: stop dnode4, then destroy the contents of its data file
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode4_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+wait_dnode4_vgroup_offline:
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+system echo "haha, nothing......" > ../../../sim/dnode4/data/vnode/vnode2/tsdb/data/v2f1643.data
+#system rm -rf ../../../sim/dnode4/data/vnode/*
+sleep 1000
+
+print ============== step3-1: insert new data 
+sql insert into $tb values ( now + 0a , $x ) ( now + 1a , $x ) ( now + 2a , $x )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode4, waiting sync end 
+system sh/exec.sh -n dnode4 -s start
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode3/dnode2, and check rows
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode23_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode23_offline
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql insert into $tb values ( now , 20000 ) ( now + 1a, 20001 ) ( now + 2a, 20002 )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3b208e6f1a401f855c434bd02dcab364a05694bb
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim
@@ -0,0 +1,435 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode3 for falling disc, then corrupt vnode data file in dnode3
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_2
+$dnode2Vtatus = $data7_2
+
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+
+#$expectCnt = 3 . : 
+#print expectCnt: [ $expectCnt ]
+#system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr '\n' ':'
+#system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr '\n' ':'
+#print --2-->dnode3 data files: [ $system_content ]
+
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr -d '\n'
+print ---->dnode2 data files: $system_content   expect: 0
+if $system_content != 0 then
+  return -1
+endi
+
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr -d '\n'
+print ---->dnode3 data files: $system_content   expect: 3
+if $system_content != 3 then 
+  return -1
+endi
+
+system echo "haha, nothing......" > ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/v2f1643.data
+
+print ============== step3-1: insert some news data for let version changed
+sql insert into $tb values ( now + 0a , $x ) ( now + 1a , $x ) ( now + 2a , $x )
+sql insert into $tb values ( now + 10a , $x ) ( now + 11a , $x ) ( now + 12a , $x )
+$totalRows = $totalRows + 6
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode3, and run query 
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+$loopCnt = 0
+wait_dnode3_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ----> dnode2 data files: $system_content  expect: 0
+if $system_content != 0 then 
+  return -1
+endi
+
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ----> dnode3 data files: $system_content   expect: 0
+if $system_content != 0 then
+  print there should be no data file in dnode3 after sync 
+  return -1
+endi
+
+print ============== step5: stop dnode2, and check if dnode3 sync ok
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: stop dnode3 for falling disck
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+sql show dnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+
+sql show vgroups
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+
+print ============== step7: restart dnode3, and run query 
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode23_reready_2:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3 
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+
+$loopCnt = 0
+wait_dnode23_vgroup_ok:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus == offline then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+if $dnode3Vtatus == offline then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fb0650b78a6875a812fdbb1cbac4a97e48e88348
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
@@ -0,0 +1,354 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data to can fall disc
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 4
+$sleepTimer = 3000
+
+$db = db
+sql create database $db cache 1 replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 128 * 1024
+$tblNum = 1
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+    $tsLast = $ts + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: corrupt vnode data file in dnode3, not stop dnode3
+system echo "haha, nothing......" > ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/v2f1643.data
+sleep 1000
+
+print ============== step4: insert new data, and run query 
+sql insert into $tb values ( now + 0a , $x ) ( now + 1a , $x ) ( now + 2a , $x ) 
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print show dnodes
+sql show dnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+
+print show vgroups
+sql show vgroups
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+
+$tsStart = $tsLast + 1
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  #sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+    $tsLast = $ts + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode2, and check if dnode3 sync ok
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: stop dnode3 for falling disc
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+
+$loopCnt = 0
+wait_dnode3_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+
+print ============== step7: restart dnode2/dnode3, and run query 
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3 
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master_1:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f50081ea70abfc37223e6b3720915ecd4a5eedb9
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim
@@ -0,0 +1,316 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: corrupt vnode data file in dnode3, not stop dnode3
+system echo "haha, nothing......" > ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/v2f1643.data
+sleep 1000
+
+print ============== step4: insert new data, and run query 
+sql insert into $tb values ( now + 0a , $x ) ( now + 1a , $x ) ( now + 2a , $x ) 
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode2, and check if dnode3 sync ok
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: stop dnode3 for falling disc
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+
+$loopCnt = 0
+wait_dnode3_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+
+print ============== step7: restart dnode2/dnode3, and run query 
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3 
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master_1:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master_1
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3582a3b7b26fdeea351adbc2bb5e08aca5f9cbd6
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim
@@ -0,0 +1,458 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4, and remove its vnodeX subdirector 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+
+$loopCnt = 0
+wait_dnode4_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+system rm -rf ../../../sim/dnode4/data/vnode/*
+
+print ============== step4: restart dnode4, waiting sync end 
+system sh/exec.sh -n dnode4 -s start
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_reready
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+
+print ============== step5: stop dnode3, and remove its vnodeX subdirector 
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode3_offline
+endi
+
+system rm -rf ../../../sim/dnode3/data/vnode/*
+
+print ============== step6: restart dnode3, and check rows
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql insert into $tb values ( now , 20000 ) ( now + 1a, 20001 ) ( now + 2a, 20002 )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step7: stop dnode2, and remove its vnodeX subdirector 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+system rm -rf ../../../sim/dnode2/data/vnode/*
+
+print ============== step8: restart dnode2, and check rows
+system sh/exec.sh -n dnode2 -s start
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_reready
+endi
+
+$loopCnt = 0
+wait_dnode2_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+print dnode4Vtatus: $dnode4Vtatus
+print dnode3Vtatus: $dnode3Vtatus 
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode2_vgroup_slave
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+sql insert into $tb values ( now , 20000 ) ( now + 1a, 20001 ) ( now + 2a, 20002 )
+$totalRows = $totalRows + 3
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4040318801b5bf253ebf4f8619b1a715f0099c30
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
@@ -0,0 +1,434 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode3 for falling disc, then corrupt vnode data file in dnode3
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_2
+$dnode2Vtatus = $data7_2
+
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_offline
+endi
+
+#$expectCnt = 3 . : 
+#print expectCnt: [ $expectCnt ]
+#system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr '\n' ':'
+#system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr '\n' ':'
+#print --2-->dnode3 data files: [ $system_content ]
+
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr -d '\n'
+print ---->dnode2 data files: $system_content   expect: 0
+if $system_content != 0 then
+  return -1
+endi
+
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l | grep "^-" | wc -l | tr -d '\n'
+print ---->dnode3 data files: $system_content   expect: 3
+if $system_content != 3 then 
+  return -1
+endi
+
+#system echo "haha, nothing......" > ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/f1643.data
+
+print ============== step3-1: insert some news data for let version changed
+sql insert into $tb values ( now + 0a , $x ) ( now + 1a , $x ) ( now + 2a , $x )
+sql insert into $tb values ( now + 10a , $x ) ( now + 11a , $x ) ( now + 12a , $x )
+$totalRows = $totalRows + 6
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step4: restart dnode3, and run query 
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_reready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode3_reready
+endi
+$loopCnt = 0
+wait_dnode3_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+if $dnode3Vtatus != slave then
+  sleep 2000
+  goto wait_dnode3_vgroup_slave
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+system_content ls ../../../sim/dnode2/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ----> dnode2 data files: $system_content  expect: 0
+if $system_content != 0 then 
+  return -1
+endi
+
+system_content ls ../../../sim/dnode3/data/vnode/vnode2/tsdb/data/ -l |grep "^-"|wc -l | tr -d '\n'
+print ----> dnode3 data files: $system_content   expect: 0
+if $system_content != 0 then
+  print there should be no data file in dnode3 after sync 
+  return -1
+endi
+
+print ============== step5: stop dnode2, and check if dnode3 sync ok
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode3_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus != offline then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode3_vgroup_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: stop dnode3 for falling disck
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+sql show dnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+
+sql show vgroups
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+
+print ============== step7: restart dnode2/dnode3, and run query 
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode23_reready_2:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3 
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode23_reready_2
+endi
+
+$loopCnt = 0
+wait_dnode23_vgroup_ok:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode2Vtatus = $data7_2
+$dnode3Vtatus = $data5_2
+
+if $dnode2Vtatus == offline then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+if $dnode3Vtatus == offline then
+  sleep 2000
+  goto wait_dnode23_vgroup_ok
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
new file mode 100644
index 0000000000000000000000000000000000000000..53209b0d5a07781ff8e22f406fc31823bdacc9b6
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim
@@ -0,0 +1,297 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4/dnode2
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode4_vgroup_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != unsynced then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+sql_error select count(*) from $stb
+sql_error insert into $tb values (now, 9988)
+
+print ============== step4: restart dnode2, then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db1
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 100
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode3
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep $sleepTimer
+$loopCnt = 0
+wait_dnode3_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+print dnode1Status $dnode1Status  
+print dnode2Status $dnode2Status 
+print dnode3Status $dnode3Status 
+print dnode4Status $dnode4Status 
+
+if $dnode3Status != offline then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode3_offline_0
+endi
+
+$loopCnt = 0
+wait_dnode2_vgroup_master:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode2_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode3Vtatus = $data5_3
+$dnode2Vtatus = $data7_3
+
+if $dnode3Vtatus != offline then
+  sleep 2000
+  goto wait_dnode2_vgroup_master
+endi
+if $dnode2Vtatus != master then
+  sleep 2000
+  goto wait_dnode2_vgroup_master
+endi
+
+sql insert into $tb values (now, 9000) (now + 1s, 9001) (now + 2s, 9002)
+$totalRows = $totalRows + 3
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim b/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7906718b0890d6c69a1fb3e00e25ed00191c5b42
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn3_mn2_killDnode.sim
@@ -0,0 +1,122 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+#system sh/cfg.sh -n dnode1 -c role -v 2
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 3, and create table to max tables
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+#system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sleep 3000
+sql create dnode $hostname3
+#sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 4
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) 
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step3: stop dnode2
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+
+sql show mnodes
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$mnode1Status = $data2_1  
+$mnode2Status = $data2_2
+$mnode3Status = $data2_3  
+#$mnode4Status = $data2_4 
+
+if $mnode1Status != master then
+	return -1
+endi
+
+if $mnode2Status != offline then
+	return -1
+endi
+
+sql reset query cache
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+
diff --git a/tests/script/unique/arbitrator/insert_duplicationTs.sim b/tests/script/unique/arbitrator/insert_duplicationTs.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a873bf02ae164e7f3bddd955adaec90568257775
--- /dev/null
+++ b/tests/script/unique/arbitrator/insert_duplicationTs.sim
@@ -0,0 +1,200 @@
+# Test case describe: dnode1 is only mnode, dnode2/dnode3 are only vnode
+# step 1: start dnode1
+# step 2: start dnode2 and dnode3, and all added into cluster (Suppose dnode2 is master-vnode)
+# step 3: create db, table, insert data, and Falling disc into file (control only one file, e.g. 1841)
+# step 4: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc 
+# step 5: stop dnode2, so date rows falling disc, generate two new files 1840, 1842 in dnode2
+# step 6: insert two data rows: now-16d, now+16d
+# step 7: restart dnode2, waiting sync end
+# expect: in dnode2, the files 1840 and 1842 will be removed
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+$totalTableNum = 1
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 130000
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+# insert over 2M data in order to falling disc, generate one file
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+#    $ts = $tsStart + $x
+    sql insert into $tb values ( now + 0s , $x ) ( now + 1s , $x ) ( now + 2s , $x ) ( now + 3s , $x ) ( now + 4s , $x ) ( now + 5s , $x ) ( now + 6s , $x ) ( now + 7s , $x ) ( now + 8s , $x ) ( now + 9s , $x )
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows data00:$data00
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 == 0 then
+  return -1
+endi
+
+$totalRows = $data00
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode2, so date rows falling disc, generate two new files in dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sleep $sleepTimer   # waitting for move master vnode of dnode2 to dnode3
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: insert two data rows: now-16d, now+16d, 
+sql insert into $tb values ( now - 21d , -21 )
+sql insert into $tb values ( now - 41d , -41 )
+$totalRows = $totalRows + 2
+
+print ============== step5: restart dnode2, waiting sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+$loopCnt = 0
+wait_dnode2_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+
+sleep $sleepTimer
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c11bfa62f93f6986c685cb4c3e80af7a2b28c116
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim
@@ -0,0 +1,217 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+
+$loopCnt = 0
+wait_dnode4_offline_0:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+wait_dnode4_vgroup_offline:
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql insert into $tb values (now, 10001, 1.0001) (now + 1s, 10002, 1.0002) (now + 2s, 10003, 1.0003) (now + 3s, 10004, 1.0004)
+  $i = $i + 1
+endw 
+$addRows = 4 * $tblNum
+$totalRows = $totalRows + $addRows
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$loopCnt = 0
+wait_dnode4_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bed5cefa766cca1e35afaefabc933a3f6720df86
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim
@@ -0,0 +1,247 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+#system sh/cfg.sh -n dnode1 -c role -v 1
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and tag, then drop all sub tables, recreate som subtable and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+sql alter table $stb add tag t2 int
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t1
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql drop table $tb
+  $i = $i + 1
+endw 
+
+$totalRows = 0
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9fdb70142bdb511d42948efafa249a8b26ecdd49
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim
@@ -0,0 +1,233 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2 
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: create more tables and insert data rows
+$tsStart = $tsEnd + 1000
+$i = $tblNum
+$tblNum = $tblNum * 2
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6752e0345dae1cfe8a186fcc96235600381fb7dd
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim
@@ -0,0 +1,180 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: drop db
+sql drop database $db
+
+print ============== step5: restart dnode4 
+system sh/exec.sh -n dnode4 -s start
+
+print ============== step6: check result
+sql reset query cache
+$cnt = 0
+wait_database_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show databases
+if $rows != 0 then
+	sleep 2000
+	goto wait_database_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1280cfe7a069ffda1b639ec867eb7068b7336a9f
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim
@@ -0,0 +1,219 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2 
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: drop some tables
+$i = 1
+$dropTblNum = 6
+
+while $i < $dropTblNum
+  $tb = tb . $i
+  sql drop table if exists $tb
+  $i = $i + 1
+endw 
+$tblNum = $tblNum - 5
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(tbname) from $stb
+if $data00 != $tblNum then
+  print data00: $data00 tblNum: $tblNum
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..27c2ba4328fc99544625bf4c1e88da15bcb95ca8
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim
@@ -0,0 +1,221 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql insert into $tb values (now, 10001, 1.0001) (now + 1s, 10002, 1.0002) (now + 2s, 10003, 1.0003) (now + 3s, 10004, 1.0004)
+  $i = $i + 1
+endw 
+$addRows = 4 * $tblNum
+$totalRows = $totalRows + $addRows
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..86fb51cfa9fe6303b940cc4d199694ce94703412
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim
@@ -0,0 +1,247 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+#system sh/cfg.sh -n dnode1 -c role -v 1
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: alter table and tag, then drop all sub tables, recreate som subtable and insert more data rows
+sql alter table $stb drop column c1
+sql alter table $stb add column f1 double
+
+sql alter table $stb add tag t2 int
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t1
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql drop table $tb
+  $i = $i + 1
+endw 
+
+$totalRows = 0
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i , $i , $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values  ( $ts + 0a , $x , $x ) ( $ts + 1a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 3a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 5a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 7a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 9a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 11a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 13a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 15a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 17a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 19a , $x , $x ) 
+    $x = $x + 20
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00 totalRows: $totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4dcc5977f3a2557119abd21ca2a68b03c2423b46
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim
@@ -0,0 +1,234 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 20
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 20
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+$maxTables = $totalTableNum * 2
+
+$db = db
+print create database $db replica 3
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: create more tables and insert data rows
+$tsStart = $tsEnd + 1000
+$i = $tblNum
+$tblNum = $tblNum * 2
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4f4cf6a2636c7559d9342b3a83c7fcf6a0a33a36
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim
@@ -0,0 +1,180 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: drop db
+sql drop database $db
+
+print ============== step5: restart dnode4 
+system sh/exec.sh -n dnode4 -s start
+
+print ============== step6: check result
+sql reset query cache
+$cnt = 0
+wait_database_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show databases
+if $rows != 0 then
+	sleep 2000
+	goto wait_database_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
new file mode 100644
index 0000000000000000000000000000000000000000..98946c4b7caef7d7ee04512ac9deb1c6b7ac3983
--- /dev/null
+++ b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim
@@ -0,0 +1,219 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: drop some tables
+$i = 1
+$dropTblNum = 6
+
+while $i < $dropTblNum
+  $tb = tb . $i
+  sql drop table if exists $tb
+  $i = $i + 1
+endw 
+$tblNum = $tblNum - 5
+
+print ============== step5: restart dnode4, waiting dnode4 synced
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+#$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+print ============== step6: check result
+
+sql reset query cache
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(tbname) from $stb
+if $data00 != $tblNum then
+  print data00: $data00 tblNum: $tblNum
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3715be5fa9b4d9b5a623806ed3330e313edae2f1
--- /dev/null
+++ b/tests/script/unique/arbitrator/replica_changeWithArbitrator.sim
@@ -0,0 +1,238 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+
+$totalTableNum = 12
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 8
+system sh/cfg.sh -n dnode4 -c offlineThreshold -v 8
+
+system sh/cfg.sh -n dnode1 -c statusInterval -v 3
+system sh/cfg.sh -n dnode2 -c statusInterval -v 3
+system sh/cfg.sh -n dnode3 -c statusInterval -v 3
+system sh/cfg.sh -n dnode4 -c statusInterval -v 3
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: replica is 1, and start 1 dnode, then create tables and insert data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$totalTableNum = 12
+
+$db = db
+sql create database $db replica 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 10
+$tblNum = $totalTableNum
+$totalRows = $rowNum * $tblNum
+
+$ts0 = 1420041600000
+$ts = $ts0
+$delta = 1
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $xs = $x * $delta
+    $ts = $ts0 + $xs
+    sql insert into $tb values ( $ts , $x ) 
+    $x = $x + 1
+  endw 
+  $i = $i + 1
+  print       $tb inserted rows: $x
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step2: add 1 new dnode, expect balanced
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 3000
+
+# expect after balanced, 2 vondes in dnode1, 1 vonde in dnode2
+$cnt = 0
+wait_dnode2_ready:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+
+print ============== step3: stop dnode1/dnode2, modify cfg numOfMnodes to 2, and restart dnode1/dnode2
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 0
+
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+
+print ============= step4: wait dnode ready
+$cnt = 0
+wait_dnode_ready:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode_ready
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: stop dnode1
+sleep 5000
+system sh/exec.sh -n dnode1 -s stop
+sleep 3000
+
+$cnt = 0
+wait_dnode2_master:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show mnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_master
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $data2_1 != offline then
+  sleep 2000
+  goto wait_dnode2_master
+endi
+if $data2_2 != master then
+  sleep 2000
+  goto wait_dnode2_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim b/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dc8b1d015da169d0c04e6d0c23f65b8efc517562
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim
@@ -0,0 +1,204 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00   totalRows:$totalRows 
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while alter table and insert data in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_alterTable_background_add.sim
+
+print ============== step6: check result
+#in background.sim, add one column and insert 36 rows
+$totalRows = $totalRows + 36
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00:$data00   totalRows:$totalRows 
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim b/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d2c82f98ffe7aac01e42338d2dd906e19f828629
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim
@@ -0,0 +1,204 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2
+sql create database $db replica 2
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while alter table and insert data in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_alterTable_background_drop.sim
+
+print ============== step6: check result
+#in background.sim, drop one column and add one new column, then insert 36 rows
+$totalRows = $totalRows + 36
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica2_dropDb.sim b/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..96aec2dcf81b84e9310ff2e29b58ba0c8282798b
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica2_dropDb.sim
@@ -0,0 +1,200 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2 
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+#$dnode3Status = $data4_3  
+$dnode4Status = $data4_3 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while drop database in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_dropDb_background.sim
+
+print ============== step6: check result
+$cnt = 0
+wait_database_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show databases
+if $rows != 0 then
+	sleep 2000
+	goto wait_database_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica2_dropTable.sim b/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a1d7d18c94549dfb0ec812077233fa2d6c96247d
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica2_dropTable.sim
@@ -0,0 +1,210 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 2 
+sql create database $db replica 2 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode4Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while drop some tables in other thread when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_dropTable_background.sim
+
+print ============== step6: check result
+#in background.sim, drop 5 tables
+$totalRows = $totalRows - 5400
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00:$data00  totalRows:$totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+$tblNum = $tblNum - 5
+sql select count(tbname) from $stb
+if $data00 != $tblNum then
+  print data00: $data00   tblNum: $tblNum
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim b/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ba973cbe06d92d6bd6a007dc5bd3cdb8fa6f2bfd
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim
@@ -0,0 +1,204 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00   totalRows:$totalRows 
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while alter table and insert data in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_alterTable_background_add.sim
+
+print ============== step6: check result
+#in background.sim, add one column and insert 36 rows
+$totalRows = $totalRows + 36
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00:$data00   totalRows:$totalRows 
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim b/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9b918acc8ed4fa62f6c004f2ba09d20633b386f9
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim
@@ -0,0 +1,204 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while alter table and insert data in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_alterTable_background_drop.sim
+
+print ============== step6: check result
+#in background.sim, drop one column and add one new column, then insert 36 rows
+$totalRows = $totalRows + 36
+
+$cnt = 0
+wait_table_altered:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00: $data00
+	sleep 2000
+	goto wait_table_altered
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica3_createTable.sim b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d593577bee4bf2ec6997836905a99c327ba6f443
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
@@ -0,0 +1,212 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 20
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = 10
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00   totalRows:$totalRows 
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while alter table and insert data in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_createTable_background_add.sim
+
+print ============== step6: check result
+#in background.sim, add 10 tables and insert 100 rows
+$totalRows = $totalRows + 100
+
+$cnt = 0
+wait_table_created:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+
+sql show tables
+if $rows != $totalTableNum then
+  print rows:$rows   totalTableNum:$totalTableNum 
+	sleep 2000
+	goto wait_table_created
+endi
+
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00:$data00   totalRows:$totalRows 
+	sleep 2000
+	goto wait_table_created
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1ef499534fe272a32556a4155a4e622a77ad1ecf
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
@@ -0,0 +1,485 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 40
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 20
+$sleepTimer = 3000
+
+$maxTables = $totalTableNum * 2 
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = 10
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  $ts = $tsStart + $x
+  sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+  $x = $x + 10
+
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: drop some tables
+sql drop table tb0
+sql drop table tb9
+sql drop table tb1
+sql drop table tb8
+
+$totalRows = $totalRows - 40
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, waiting sync end
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_slave:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave
+endi
+
+print ============== step6: stop dnode2/dnode3 and remove their data dir, and restart dnode2/dnode3
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 1000
+system rm -rf ../../../sim/dnode2/data
+system rm -rf ../../../sim/dnode3/data
+
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$cnt = 0
+wait_dnode4_vgroup_master:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step7: stop dnode4 and create some new tables
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+
+$ts = $tsStart
+sql insert into tb10 using stb tags(10) values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+sql insert into tb11 using stb tags(11) values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+sql insert into tb12 using stb tags(12) values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+sql insert into tb13 using stb tags(13) values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+  
+$totalRows = $totalRows + 40
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step8: restart dnode4, waiting sync end
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready_2:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready_2
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready_2
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_slave_2:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave_2
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave_2
+endi
+
+print ============== step9: stop dnode2/dnode3 and remove their data dir, and restart dnode2/dnode3
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 1000
+system rm -rf ../../../sim/dnode2/data
+system rm -rf ../../../sim/dnode3/data
+
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$cnt = 0
+wait_dnode4_vgroup_master_2:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_2
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_2
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+
+print ============== step10: stop dnode4 and alter table column
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+
+sql alter table stb add column c2 int
+sql alter table stb add column c3 int
+sql alter table stb add column c4 int
+sql alter table stb drop column c1
+
+sql alter table stb add tag t2 int
+sql alter table stb add tag t3 int
+sql_error alter table stb drop tag t1
+
+$ts = $tsEnd + 10000
+sql insert into tb2 values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )
+sql insert into tb3 values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )
+sql insert into tb4 values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )
+sql insert into tb5 values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )
+
+
+$ts = $tsStart
+sql insert into tb14 using stb tags(14, 14, 14) values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )  
+sql insert into tb15 using stb tags(15, 15, 15) values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )  
+sql insert into tb16 using stb tags(16, 16, 16) values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )  
+sql insert into tb17 using stb tags(17, 17, 17) values ( $ts + 0a , $x , $x , $x ) ( $ts + 1a , $x , $x , $x ) ( $ts + 2a , $x , $x , $x ) ( $ts + 3a , $x , $x , $x ) ( $ts + 4a , $x , $x , $x ) ( $ts + 5a , $x , $x , $x ) ( $ts + 6a , $x , $x , $x ) ( $ts + 7a , $x , $x , $x ) ( $ts + 8a , $x , $x , $x ) ( $ts + 9a , $x , $x , $x )  
+  
+$totalRows = $totalRows + 80
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step11: restart dnode4, waiting sync end
+system sh/exec.sh -n dnode4 -s start
+
+$cnt = 0
+wait_dnode4_ready_3:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_ready_3
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+
+if $dnode4Status != ready then
+  sleep 2000
+  goto wait_dnode4_ready_3
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_slave_3:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave_3
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != slave then
+  sleep 2000
+  goto wait_dnode4_vgroup_slave_3
+endi
+
+print ============== step12: stop dnode2/dnode3 and remove their data dir, and restart dnode2/dnode3
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 1000
+system rm -rf ../../../sim/dnode2/data
+system rm -rf ../../../sim/dnode3/data
+
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$cnt = 0
+wait_dnode4_vgroup_master_3:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_3
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_master_3
+endi
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
diff --git a/tests/script/unique/arbitrator/sync_replica3_dropDb.sim b/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4c7bb3d26cd8ee0012c2a8c9fadd72915e004eab
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_dropDb.sim
@@ -0,0 +1,200 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while drop database in other thead when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_dropDb_background.sim
+
+print ============== step6: check result
+$cnt = 0
+wait_database_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql show databases
+if $rows != 0 then
+	sleep 2000
+	goto wait_database_dropped
+endi
+
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica3_dropTable.sim b/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7ac424666a9ed902240451e581584897182f4265
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica3_dropTable.sim
@@ -0,0 +1,210 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+$totalTableNum = 10
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v $totalTableNum
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v $totalTableNum
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3/dnode4 and add into cluster , then create database with replica 3, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sleep 3000
+
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+print create database $db replica 3 
+sql create database $db replica 3 
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+$rowNum = 500
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1420041600000
+$tsEnd = 0
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+$tsEnd = $tsStart + $totalRows / $tblNum
+
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: stop dnode4 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep $sleepTimer
+$cnt = 0
+wait_dnode4_offline_0:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show dnodes
+if $rows != 4 then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode4Status != offline then
+  sleep 2000
+  goto wait_dnode4_offline_0
+endi
+
+$cnt = 0
+wait_dnode4_vgroup_offline:
+$cnt = $cnt + 1
+if $cnt == 10 then
+  return -1
+endi
+sql show vgroups
+if $rows != 1 then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$dnode4Vtatus = $data5_2
+$dnode3Vtatus = $data7_2
+
+if $dnode4Vtatus != offline then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+if $dnode3Vtatus != master then
+  sleep 2000
+  goto wait_dnode4_vgroup_offline
+endi
+
+print ============== step4: insert more data rows
+$tsStart = $tsEnd + 1000
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print data00:$data00  totalRows:$totalRows
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: restart dnode4, while drop some tables in other thread when dnode4 is syncing
+system sh/exec.sh -n dnode4 -s start
+run_back unique/arbitrator/sync_replica_dropTable_background.sim
+
+print ============== step6: check result
+#in background.sim, drop 5 tables
+$totalRows = $totalRows - 5400
+
+$cnt = 0
+wait_table_dropped:
+$cnt = $cnt + 1
+if $cnt == 20 then
+  return -1
+endi
+sql select count(*) from $stb
+if $data00 != $totalRows then
+  print data00:$data00  totalRows:$totalRows
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+$tblNum = $tblNum - 5
+sql select count(tbname) from $stb
+if $data00 != $tblNum then
+  print data00: $data00   tblNum: $tblNum
+	sleep 2000
+	goto wait_table_dropped
+endi
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica_alterTable_background_add.sim b/tests/script/unique/arbitrator/sync_replica_alterTable_background_add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3867aa3699cb84881c8b99eaa6ffa0813e8c785f
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica_alterTable_background_add.sim
@@ -0,0 +1,25 @@
+sql connect
+
+$db = db
+$stb = stb
+print =============== sync_replica_alterTable_background_add.sim step0: alter table and insert data
+$totalTableNum = 10
+
+sql use $db
+
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+print alter table $stb add column f1 float
+sql alter table $stb add column f1 float
+
+$tblNum = $totalTableNum
+$alterTblNum = 10
+
+$i = 1
+while $i < $alterTblNum
+  $tb = tb . $i
+  sql insert into $tb values (now, 10001, 10001) (now + 1s, 10002, 10002) (now + 2s, 10003, 10003) (now + 3s, 10004, 10004)
+  $i = $i + 1
+endw 
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica_alterTable_background_drop.sim b/tests/script/unique/arbitrator/sync_replica_alterTable_background_drop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fb8bc60972e7ac5a2d5f1393fd5760168c3d843d
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica_alterTable_background_drop.sim
@@ -0,0 +1,25 @@
+sql connect
+
+$db = db
+$stb = stb
+print =============== sync_replica_alterTable_background_drop.sim step0: alter table and insert data
+$totalTableNum = 100
+
+sql use $db
+
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+sql alter table $stb add column f1 double
+sql alter table $stb drop column c1
+
+$tblNum = $totalTableNum
+$alterTblNum = 10
+
+$i = 1
+while $i < $alterTblNum
+  $tb = tb . $i
+  sql insert into $tb values (now, 10001) (now + 1s, 10002) (now + 2s, 10003) (now + 3s, 10004)
+  $i = $i + 1
+endw 
+
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica_createTable_background_add.sim b/tests/script/unique/arbitrator/sync_replica_createTable_background_add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..50893b58a6125cfa3ae15e0472b78538f2c9256e
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica_createTable_background_add.sim
@@ -0,0 +1,32 @@
+sql connect
+
+$db = db
+$stb = stb
+print =============== sync_replica_createTable_background_add.sim step0: create table and insert data
+$totalTableNum = 10
+
+sql use $db
+
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int)
+# create table , insert data
+#$rowNum = 500
+$tblNum = 20
+$totalRows = 100
+$tsStart = 1420141600000
+$tsEnd = 0
+
+$i = 10
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 10
+  $ts = $tsStart + $x
+  sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x )
+
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+
diff --git a/tests/script/unique/arbitrator/sync_replica_dropDb_background.sim b/tests/script/unique/arbitrator/sync_replica_dropDb_background.sim
new file mode 100644
index 0000000000000000000000000000000000000000..440b525bd7b8b5a1beebc4b10aa89f410d597d77
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica_dropDb_background.sim
@@ -0,0 +1,6 @@
+sql connect
+
+$db = db
+$stb = stb
+print =============== sync_replica_dropDb_background.sim step0: drop db
+sql drop database if exists $db 
diff --git a/tests/script/unique/arbitrator/sync_replica_dropTable_background.sim b/tests/script/unique/arbitrator/sync_replica_dropTable_background.sim
new file mode 100644
index 0000000000000000000000000000000000000000..485253027a5d4521aac63ab8ad6f5f7ffba726e9
--- /dev/null
+++ b/tests/script/unique/arbitrator/sync_replica_dropTable_background.sim
@@ -0,0 +1,18 @@
+sql connect
+
+$db = db
+$stb = stb
+print =============== sync_replica_dropTable_background.sim step0: drop table
+$totalTableNum = 6
+
+sql use $db
+
+$tblNum = $totalTableNum
+$dropTblNum = 6
+
+$i = 1
+while $i < $dropTblNum
+  $tb = tb . $i
+  sql drop table if exists $tb
+  $i = $i + 1
+endw 
diff --git a/tests/script/unique/arbitrator/testSuite.sim b/tests/script/unique/arbitrator/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..127a320e53db686a8109505d3299715edaa262e4
--- /dev/null
+++ b/tests/script/unique/arbitrator/testSuite.sim
@@ -0,0 +1,41 @@
+run unique/arbitrator/check_cluster_cfg_para.sim
+run unique/arbitrator/dn2_mn1_cache_file_sync.sim
+run unique/arbitrator/dn3_mn1_full_createTableFail.sim
+run unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim
+run unique/arbitrator/dn3_mn1_multiCreateDropTable.sim
+run unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim
+run unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim
+run unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim
+run unique/arbitrator/dn3_mn1_replica_change.sim
+run unique/arbitrator/dn3_mn1_stopDnode_timeout.sim
+run unique/arbitrator/dn3_mn1_vnode_change.sim
+run unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim 
+run unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+run unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim
+run unique/arbitrator/dn3_mn1_vnode_delDir.sim
+run unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim 
+run unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim 
+run unique/arbitrator/dn3_mn1_vnode_nomaster.sim
+run unique/arbitrator/dn3_mn2_killDnode.sim
+run unique/arbitrator/insert_duplicationTs.sim
+run unique/arbitrator/offline_replica2_alterTable_online.sim
+run unique/arbitrator/offline_replica2_alterTag_online.sim
+run unique/arbitrator/offline_replica2_createTable_online.sim
+run unique/arbitrator/offline_replica2_dropDb_online.sim
+run unique/arbitrator/offline_replica2_dropTable_online.sim
+run unique/arbitrator/offline_replica3_alterTable_online.sim
+run unique/arbitrator/offline_replica3_alterTag_online.sim
+run unique/arbitrator/offline_replica3_createTable_online.sim
+run unique/arbitrator/offline_replica3_dropDb_online.sim
+run unique/arbitrator/offline_replica3_dropTable_online.sim
+run unique/arbitrator/replica_changeWithArbitrator.sim
+run unique/arbitrator/sync_replica2_alterTable_add.sim
+run unique/arbitrator/sync_replica2_alterTable_drop.sim
+run unique/arbitrator/sync_replica3_createTable.sim
+run unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
+run unique/arbitrator/sync_replica2_dropDb.sim
+run unique/arbitrator/sync_replica2_dropTable.sim
+run unique/arbitrator/sync_replica3_alterTable_add.sim
+run unique/arbitrator/sync_replica3_alterTable_drop.sim
+run unique/arbitrator/sync_replica3_dropDb.sim
+run unique/arbitrator/sync_replica3_dropTable.sim
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
new file mode 100644
index 0000000000000000000000000000000000000000..91a7c538d27a30433aeea1fd1214e3c2d79283ec
--- /dev/null
+++ b/tests/script/unique/big/balance.sim
@@ -0,0 +1,388 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
+
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 1000
+
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 1000
+
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 1000
+
+system sh/deploy.sh -n dnode5 -i 5
+system sh/cfg.sh -n dnode5 -c maxVgroupsPerDb -v 4
+system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 1000
+
+print =============== prepare data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+$i = 0
+$tbNum = 4000
+$rowNum = 1
+$totalNum = 4000 * $rowNum
+
+sql create database db
+sql use db
+sql create table mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+$tbPrefix = t
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using mt tags( $i ) 
+  $i = $i + 1
+endw 
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql insert into $tb values (now, $i , $i ) 
+  
+  $i = $i + 1
+endw 
+
+print ========== step0
+sql show db.tables
+if $rows != 4000 then
+  return -1
+endi
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  return -1
+endi
+
+print ========== step1
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openvnodes $data2_1
+print dnode2 openvnodes $data2_2
+if $data2_1 != 2 then
+	goto show1
+endi
+if $data2_2 != 2 then
+	goto show1
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show1
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show1
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show1
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show1
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  goto show1
+endi
+
+print ========== step2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 10000
+
+print ========== step3
+sql drop dnode $hostname2
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 freeVnodes $data2_1
+print dnode2 freeVnodes $data2_2
+print dnode3 freeVnodes $data2_3
+if $data2_1 != 2 then
+	goto show3
+endi
+if $data2_2 != null then
+	goto show3
+endi
+if $data2_3 != 2 then
+	goto show3
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  return -1
+endi
+
+print ========== step4
+sql drop dnode $hostname3
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 freeVnodes $data2_1
+print dnode3 freeVnodes $data2_3
+if $data2_1 != 4 then
+	goto show4
+endi
+if $data2_3 != null then
+	goto show4
+endi
+
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  return -1
+endi
+
+print ========== step5
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+
+sleep 3000
+sql alter database db replica 2
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 freeVnodes $data2_1
+print dnode4 freeVnodes $data2_4
+if $data2_1 != 4 then
+	goto show5
+endi
+if $data2_4 != 4 then
+	goto show5
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  goto show5
+endi
+
+
+print ========== step6
+sleep 3000
+sql alter database db replica 1
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 freeVnodes $data2_1
+print dnode4 freeVnodes $data2_4
+if $data2_1 != 2 then
+	goto show6
+endi
+if $data2_4 != 2 then
+	goto show6
+endi
+
+sql reset query cache
+sleep 1000
+
+sql select count(*) from t10
+print select count(*) from t10 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t1010
+print select count(*) from t1010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t2010
+print select count(*) from t2010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from t3010
+print select count(*) from t3010 $data00 expect $rowNum 
+if $data00 != $rowNum then
+  goto show5
+endi
+
+sql select count(*) from mt
+print select count(*) from mt $data00 expect $rowNum 
+if $data00 != $totalNum then
+  goto show5
+endi
+
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
new file mode 100644
index 0000000000000000000000000000000000000000..662d391e475f0b8afccbb37af5bae18fabe76621
--- /dev/null
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -0,0 +1,88 @@
+system sh/stop_dnodes.sh
+
+$totalVnodes = 20
+$minVnodes = 10
+$maxVnodes = 10
+$maxTables = 4
+$totalRows = $totalVnodes * $maxTables
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel            -v 2
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb     -v $totalVnodes
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c walLevel            -v 2
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb    -v $totalVnodes
+
+
+print ==========  prepare data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect 
+sql create database db blocks 3 cache 1 
+sql use db
+
+print ==========  step1
+sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$x = 0
+while $x < $totalRows
+  $tb = t . $x
+  sql create table $tb using mt tags( $x )
+  sql insert into $tb values (now, $x ) 
+  $x = $x + 1
+endw 
+
+print ========== step2
+sql select * from mt
+if $rows != $totalRows then
+  return -1
+endi  
+
+sql select count(*) from mt
+if $data00 != $totalRows then
+  return -1
+endi  
+
+print ==========  step3
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 1000 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openvnodes $data2_1
+print dnode2 openvnodes $data2_2
+if $data2_1 != $minVnodes then
+	goto show3
+endi
+if $data2_2 != $maxVnodes then
+	goto show3
+endi
+
+print ========== step4
+sql select * from mt
+if $rows != $totalRows then
+  return -1
+endi  
+
+sql select count(*) from mt
+if $data00 != $totalRows then
+  return -1
+endi  
+
+return
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/restartSpeed.sim b/tests/script/unique/big/restartSpeed.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ea4edefda8f96c94aab12d856914565f8e8115f4
--- /dev/null
+++ b/tests/script/unique/big/restartSpeed.sim
@@ -0,0 +1,41 @@
+system sh/stop_dnodes.sh
+
+$totalVnodes = 20
+$minVnodes = 10
+$maxVnodes = 10
+$maxTables = 4
+$totalRows = $totalVnodes * $maxTables
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel            -v 2
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c walLevel            -v 2
+
+
+print ==========  prepare data
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect 
+sql create database db blocks 3 cache 1 
+sql use db
+
+print ==========  step1
+sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$x = 0
+while $x < $totalRows
+  $tb = t . $x
+  sql create table $tb using mt tags( $x )
+  sql insert into $tb values (now, $x ) 
+  $x = $x + 1
+endw 
+
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim
new file mode 100644
index 0000000000000000000000000000000000000000..38cb667ec03b400e29cc1017f616434b650375d4
--- /dev/null
+++ b/tests/script/unique/big/tcp.sim
@@ -0,0 +1,114 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode    -v 30000
+
+system sh/cfg.sh -n dnode1 -c dDebugFlag      -v 131
+system sh/cfg.sh -n dnode1 -c mDebugFlag      -v 131
+system sh/cfg.sh -n dnode1 -c sdbDebugFlag    -v 131
+system sh/cfg.sh -n dnode1 -c rpcDebugFlag   -v 131
+system sh/cfg.sh -n dnode1 -c cDebugFlag      -v 131
+system sh/cfg.sh -n dnode1 -c gcDebugFlag     -v 131
+system sh/cfg.sh -n dnode1 -c adminDebugFlag  -v 131
+system sh/cfg.sh -n dnode1 -c httpDebugFlag   -v 135
+system sh/cfg.sh -n dnode1 -c debugFlag       -v 131
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+print ======================== dnode1 start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$tbNum = 22000
+$rowNum = 10
+
+print =============== step1
+$i = 0
+$db = $dbPrefix
+$mt = $mtPrefix
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $i = $i + 1
+endw 
+
+print =============== step2
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql insert into $tb values (now, $i , $i ) 
+  
+  $i = $i + 1000
+endw 
+
+$i = 0
+while $i < 10
+	print =============== step3 $i
+	sql select count(*) from $mt
+	print ===> $data00 $data01
+	if $rows != 1 then 
+	  return -1
+	endi
+	if $data00 != 22 then 
+	  return -1
+	endi
+
+	print =============== step4 $i
+	sql select * from $mt
+	print ===> $data00 $data01
+	if $rows != 22 then 
+	  return -1
+	endi
+	
+	$i = $i + 1
+endw 
+
+print =============== step3
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql insert into $tb values (now, $i , $i ) 
+  
+  $i = $i + 1000
+endw 
+
+$i = 0
+while $i < 10
+	print =============== step5 $i
+	sql select count(*) from $mt where tgcol < 20200
+	print ===> $data00 $data01
+	if $rows != 1 then 
+	  return -1
+	endi
+	if $data00 != 42 then 
+	  return -1
+	endi
+
+	print =============== step6 $i
+	sql select * from $mt where tgcol < 20200
+	print ===> $data00 $data01
+	if $rows != 42 then 
+	  return -1
+	endi
+	
+	$i = $i + 1
+endw 
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/big/testSuite.sim b/tests/script/unique/big/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2cead5626a5f5dd53ffbc30a0a8502ee70da25d1
--- /dev/null
+++ b/tests/script/unique/big/testSuite.sim
@@ -0,0 +1,3 @@
+run unique/big/balance.sim
+run unique/big/maxvnodes.sim
+run unique/big/tcp.sim
diff --git a/tests/script/unique/cluster/alter.sim b/tests/script/unique/cluster/alter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7e56707a693e96bd602c012035bebd3b1a8b7b6a
--- /dev/null
+++ b/tests/script/unique/cluster/alter.sim
@@ -0,0 +1,174 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balance -v 0
+system sh/cfg.sh -n dnode2 -c balance -v 0
+system sh/cfg.sh -n dnode3 -c balance -v 0
+system sh/cfg.sh -n dnode4 -c balance -v 0
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 3000
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+print ========== step2
+sql create database d1
+sql create table d1.t1 (t timestamp, i int) 
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+print ========== step3
+sleep 2000
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 1 then
+	return -1
+endi
+if $data2_3 != 0 then
+	return -1
+endi
+if $data2_4 != 0 then
+	return -1
+endi
+
+print ========== step4
+sql alter dnode 2 balance "vnode:2-dnode:3"
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_2 != 0 then
+    goto show4
+endi
+if $data2_3 != 1 then
+    goto show4
+endi
+if $data2_4 != 0 then
+    goto show4
+endi
+
+print ========== step5
+sql alter dnode 3 balance "vnode:2-dnode:4"
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_2 != 0 then
+    goto show5
+endi
+if $data2_3 != 0 then
+    goto show5
+endi
+if $data2_4 != 1 then
+    goto show5
+endi
+
+print ========== step6
+sql alter dnode 4 balance "vnode:2-dnode:2"
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_2 != 1 then
+    goto show6
+endi
+if $data2_3 != 0 then
+    goto show6
+endi
+if $data2_4 != 0 then
+    goto show6
+endi
+
+print ========== step7
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+print ========== step8
+sql_error sql alter dnode 4 balance "vnode:2-dnode:5"
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ec0c58d41651542e03d9f2ee710a38c5744c1f82
--- /dev/null
+++ b/tests/script/unique/cluster/balance1.sim
@@ -0,0 +1,565 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode6 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode7 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode8 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode6 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode7 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode8 -c mnodeEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode6 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode7 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode8 -c maxTablesPerVnode -v 4
+
+
+print ============== step1
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database c_b1_d1 
+sql use c_b1_d1
+
+sql create table c_b1_t1 (t timestamp, i int)
+sql insert into c_b1_t1 values(1520000020015, 15)
+sql insert into c_b1_t1 values(1520000021014, 14)
+sql insert into c_b1_t1 values(1520000022013, 13)
+sql insert into c_b1_t1 values(1520000023012, 12)
+sql insert into c_b1_t1 values(1520000024011, 11)
+
+sql create database c_b1_d2 
+sql use c_b1_d2
+sql create table c_b1_t2 (t timestamp, i int)
+sql insert into c_b1_t2 values(1520000020025, 25)
+sql insert into c_b1_t2 values(1520000021024, 24)
+sql insert into c_b1_t2 values(1520000022023, 23)
+sql insert into c_b1_t2 values(1520000023022, 22)
+sql insert into c_b1_t2 values(1520000024021, 21)
+
+sql show dnodes
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 2 then
+  return -1
+endi
+if $dnode2Vnodes != null then
+  return -1
+endi
+
+print ============================== step2
+print ========= start dnode2
+sleep 2000
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 1 then
+  goto show2
+endi
+if $dnode2Vnodes != 1 then
+  goto show2
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+
+print ============================== step3
+print ========= add db3
+sql create database c_b1_d3 
+sql use c_b1_d3
+sql create table c_b1_t3 (t timestamp, i int)
+sql insert into c_b1_t3 values(1520000020035, 35)
+sql insert into c_b1_t3 values(1520000021034, 34)
+sql insert into c_b1_t3 values(1520000022033, 33)
+sql insert into c_b1_t3 values(1520000023032, 32)
+sql insert into c_b1_t3 values(1520000024031, 31)
+
+print ============================== step4
+print ========= drop dnode2
+sql drop dnode $hostname2
+sleep 9000
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show4
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show4
+endi
+if $dnode2Vnodes != null then
+  goto show4
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+print ============================== step5
+print ========= add dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 9000
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show5
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode3Vnodes = $data2_3
+print dnode2 $dnode3Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show5
+endi
+if $dnode3Vnodes != 1 then
+  goto show5
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+print ============================== step6
+sql_error drop dnode $hostname1
+
+print ============================== step7
+sql_error create dnode $hostname1
+
+print ============================== step8
+sql drop dnode $hostname3
+sleep 15000
+
+$x = 0
+show8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+sql show dnodes -x show8
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show8
+endi
+if $dnode3Vnodes != null then
+  goto show8
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+
+if $dnode3Role != null then
+  return -1
+endi
+
+print ============================== step9
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+sleep 9000
+
+$x = 0
+show9: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+sql show dnodes -x show9
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show9
+endi
+if $dnode4Vnodes != 1 then
+  goto show9
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
+print ============================== step10
+sql create database c_b1_d4 
+sql use c_b1_d4
+sql create table c_b1_t4 (t timestamp, i int)
+sql insert into c_b1_t4 values(1520000020045, 45)
+sql insert into c_b1_t4 values(1520000021044, 44)
+sql insert into c_b1_t4 values(1520000022043, 43)
+sql insert into c_b1_t4 values(1520000023042, 42)
+sql insert into c_b1_t4 values(1520000024041, 41)
+
+$x = 0
+show10: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+sql show dnodes -x show10
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode1Vnodes != 2 then
+   goto show10
+endi
+if $dnode4Vnodes != 2 then
+   goto show10
+endi
+
+sql reset query cache
+
+sql use c_b1_d3
+sql insert into c_b1_t3 values(1520000025036, 36)
+
+sql use c_b1_d2
+sql insert into c_b1_t2 values(1520000025026, 26)
+
+print ============================== step12
+sql create database c_b1_d5 
+sql use c_b1_d5
+sql_error create table c_b1_t5 (t timestamp, i int) -x error3
+
+print ============================== step13
+sql create dnode $hostname5
+system sh/exec.sh -n dnode5 -s start
+sleep 9000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+sql use c_b1_d5;
+sql create table c_b1_t5 (t timestamp, i int)
+sql insert into c_b1_t5 values(1520000020055, 55)
+sql insert into c_b1_t5 values(1520000021054, 54)
+sql insert into c_b1_t5 values(1520000022053, 53)
+sql insert into c_b1_t5 values(1520000023052, 52)
+sql insert into c_b1_t5 values(1520000024051, 51)
+
+sql create database c_b1_d6 
+sql use c_b1_d6
+sql create table c_b1_t6 (t timestamp, i int)
+sql insert into c_b1_t6 values(1520000020065, 65)
+sql insert into c_b1_t6 values(1520000021064, 64)
+sql insert into c_b1_t6 values(1520000022063, 63)
+sql insert into c_b1_t6 values(1520000023062, 62)
+sql insert into c_b1_t6 values(1520000024061, 61)
+
+sql show dnodes
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode2Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode2Vnodes
+
+if $dnode1Vnodes != 2 then
+  return -1
+endi
+if $dnode4Vnodes != 2 then
+  return -1
+endi
+if $dnode5Vnodes != 2 then
+  return -1
+endi
+
+print ============================== step14
+sql create dnode $hostname6
+system sh/exec.sh -n dnode6 -s start
+sleep 15000
+
+sql create database c_b1_d7 
+sql use c_b1_d7
+sql create table c_b1_t7 (t timestamp, i int)
+sql insert into c_b1_t7 values(1520000020075, 75)
+sql insert into c_b1_t7 values(1520000021074, 74)
+sql insert into c_b1_t7 values(1520000022073, 73)
+sql insert into c_b1_t7 values(1520000023072, 72)
+sql insert into c_b1_t7 values(1520000024071, 71)
+
+sql create database c_b1_d8 
+sql use c_b1_d8
+sql create table c_b1_t8 (t timestamp, i int)
+sql insert into c_b1_t8 values(1520000020085, 85)
+sql insert into c_b1_t8 values(1520000021084, 84)
+sql insert into c_b1_t8 values(1520000022083, 83)
+sql insert into c_b1_t8 values(1520000023082, 82)
+sql insert into c_b1_t8 values(1520000024081, 81)
+
+$x = 0
+show14: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+sql show dnodes -x show14
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show14
+endi
+if $dnode4Vnodes != 2 then
+  goto show14
+endi
+if $dnode5Vnodes != 2 then
+  goto show14
+endi
+if $dnode6Vnodes != 2 then
+  goto show14
+endi
+
+sql reset query cache
+sleep 1000
+
+print ============================== step17
+print ========= check data
+
+sql reset query cache
+sleep 1000
+
+sql use c_b1_d1
+sql select * from c_b1_d1.c_b1_t1
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $rows != 5 then
+  return -1
+endi
+
+sql use c_b1_d2
+sql select * from c_b1_d2.c_b1_t2
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $rows != 6 then
+  return -1
+endi
+
+sql use c_b1_d3
+sql select * from c_b1_d3.c_b1_t3 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $rows != 6 then
+  return -1
+endi
+if $data01 != 36 then
+  return -1
+endi
+
+sql use c_b1_d4
+sql select * from c_b1_d4.c_b1_t4 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+
+sql use c_b1_d5
+sql select * from c_b1_d5.c_b1_t5 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 51 then
+  return -1
+endi
+if $data11 != 52 then
+  return -1
+endi
+if $data21 != 53 then
+  return -1
+endi
+if $data31 != 54 then
+  return -1
+endi
+if $data41 != 55 then
+  return -1
+endi
+
+sql use c_b1_d6
+sql select * from c_b1_d6.c_b1_t6 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 61 then
+  return -1
+endi
+if $data11 != 62 then
+  return -1
+endi
+if $data21 != 63 then
+  return -1
+endi
+if $data31 != 64 then
+  return -1
+endi
+if $data41 != 65 then
+  return -1
+endi
+
+sql use c_b1_d7
+sql select * from c_b1_d7.c_b1_t7 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 71 then
+  return -1
+endi
+if $data11 != 72 then
+  return -1
+endi
+if $data21 != 73 then
+  return -1
+endi
+if $data31 != 74 then
+  return -1
+endi
+if $data41 != 75 then
+  return -1
+endi
+
+sql use c_b1_d8
+sql select * from c_b1_d8.c_b1_t8 order by t desc
+print $rows 
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 81 then
+  return -1
+endi
+if $data11 != 82 then
+  return -1
+endi
+if $data21 != 83 then
+  return -1
+endi
+if $data31 != 84 then
+  return -1
+endi
+if $data41 != 85 then
+  return -1
+endi
+
+print ============================================ over=
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b8477965c6a1bb8a5fca0982ef25bbf993cf6ea2
--- /dev/null
+++ b/tests/script/unique/cluster/balance2.sim
@@ -0,0 +1,432 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode6 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode7 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode8 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode6 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode7 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode8 -c mnodeEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode6 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode7 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode8 -c maxTablesPerVnode -v 4
+
+
+print ============== step1
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sleep 4001
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 4001
+
+sql create database c_b2_d1 replica 2 
+sql use c_b2_d1
+sql create table c_b2_t1 (t timestamp, i int)
+sql insert into c_b2_t1 values(1520000020015, 15)
+sql insert into c_b2_t1 values(1520000021014, 14)
+sql insert into c_b2_t1 values(1520000022013, 13)
+sql insert into c_b2_t1 values(1520000023012, 12)
+sql insert into c_b2_t1 values(1520000024011, 11)
+
+sql create database c_b2_d2 replica 2 
+sql use c_b2_d2
+sql create table c_b2_t2 (t timestamp, i int)
+sql insert into c_b2_t2 values(1520000020025, 25)
+sql insert into c_b2_t2 values(1520000021024, 24)
+sql insert into c_b2_t2 values(1520000022023, 23)
+sql insert into c_b2_t2 values(1520000023022, 22)
+sql insert into c_b2_t2 values(1520000024021, 21)
+
+sql create database c_b2_d3 replica 2 
+sql use c_b2_d3
+sql create table c_b2_t3 (t timestamp, i int)
+sql insert into c_b2_t3 values(1520000020035, 35)
+sql insert into c_b2_t3 values(1520000021034, 34)
+sql insert into c_b2_t3 values(1520000022033, 33)
+sql insert into c_b2_t3 values(1520000023032, 32)
+sql insert into c_b2_t3 values(1520000024031, 31)
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show1
+endi
+if $dnode2Vnodes != 2 then
+  goto show1
+endi
+if $dnode3Vnodes != 2 then
+  goto show1
+endi
+
+print ============================== step2
+print ========= drop dnode2
+sql drop dnode $hostname2
+sleep 9000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show2
+endi
+if $dnode2Vnodes != null then
+  goto show2
+endi
+if $dnode3Vnodes != 3 then
+  goto show2
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+
+print ============================== step3
+print ========= start dnode4
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+sleep 10000
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show3
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show3
+endi
+if $dnode4Vnodes != 2 then
+  goto show3
+endi
+if $dnode3Vnodes != 2 then
+  goto show3
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
+print ============================== step4
+print ========= drop dnode3
+sql drop dnode $hostname3
+sleep 9000
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show4
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show4
+endi
+if $dnode4Vnodes != 3 then
+  goto show4
+endi
+if $dnode3Vnodes != null then
+  goto show4
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+
+print ============================== step5
+print ========= start dnode3
+sql create dnode $hostname5
+system sh/exec.sh -n dnode5 -s start
+sleep 9000
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+	  return -1
+	endi
+sql show dnodes -x show5
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show5
+endi
+if $dnode4Vnodes != 2 then
+  goto show5
+endi
+if $dnode5Vnodes != 2 then
+  goto show5
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+print ============================== step6
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+print stop dnode1 and sleep 10000
+sleep 10000
+
+sql drop dnode $hostname1
+print drop dnode1 and sleep 9000
+sleep 9000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============================== step6.1
+system sh/exec.sh -n dnode1 -s start
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes -x show6
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+
+if $dnode1Vnodes != null then
+  goto show6
+endi
+if $dnode4Vnodes != 3 then
+  goto show6
+endi
+if $dnode5Vnodes != 3 then
+  goto show6
+endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $dnode1Role
+print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role
+
+#system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+
+print ============================== step12
+print ========= check data
+
+sql reset query cache
+sleep 1000
+
+sql select * from c_b2_d1.c_b2_t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from c_b2_d2.c_b2_t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from c_b2_d3.c_b2_t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+print ============================================ over
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGKILL
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e3b8125d8c34a7e59aaac4f3df56e4650fb6cc68
--- /dev/null
+++ b/tests/script/unique/cluster/balance3.sim
@@ -0,0 +1,593 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode6 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode7 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode8 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode6 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode7 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode8 -c mnodeEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+system sh/cfg.sh -n dnode7 -c wallevel -v 1
+system sh/cfg.sh -n dnode8 -c wallevel -v 1
+
+print ============== step1
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 2001
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3001
+
+sql create database c_b3_d1 replica 3
+sql use c_b3_d1
+sql create table c_b3_t1 (t timestamp, i int)
+sql insert into c_b3_t1 values(1520000020015, 15)
+sql insert into c_b3_t1 values(1520000021014, 14)
+sql insert into c_b3_t1 values(1520000022013, 13)
+sql insert into c_b3_t1 values(1520000023012, 12)
+sql insert into c_b3_t1 values(1520000024011, 11)
+
+sql create database c_b3_d2 replica 3
+sql use c_b3_d2
+sql create table c_b3_t2 (t timestamp, i int)
+sql insert into c_b3_t2 values(1520000020025, 25)
+sql insert into c_b3_t2 values(1520000021024, 24)
+sql insert into c_b3_t2 values(1520000022023, 23)
+sql insert into c_b3_t2 values(1520000023022, 22)
+sql insert into c_b3_t2 values(1520000024021, 21)
+
+sql create database c_b3_d3 replica 3
+sql use c_b3_d3
+sql create table c_b3_t3 (t timestamp, i int) 
+sql insert into c_b3_t3 values(1520000020035, 35)
+sql insert into c_b3_t3 values(1520000021034, 34)
+sql insert into c_b3_t3 values(1520000022033, 33)
+sql insert into c_b3_t3 values(1520000023032, 32)
+sql insert into c_b3_t3 values(1520000024031, 31)
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show1
+endi
+if $dnode2Vnodes != 3 then
+  goto show1
+endi
+if $dnode3Vnodes != 3 then
+  goto show1
+endi
+if $dnode4Vnodes != null then
+  goto show1
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step2
+print ========= start dnode4
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+sleep 9000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode4Vnodes != 2 then
+  goto show2
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step3
+print ========= drop dnode2
+sql drop dnode $hostname2
+sleep 9000
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show3
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show3
+endi
+if $dnode2Vnodes != null then
+  goto show3
+endi
+if $dnode3Vnodes != 3 then
+  goto show3
+endi
+if $dnode4Vnodes != 3 then
+  goto show3
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+
+print ============================== step4
+sql create dnode $hostname5
+system sh/exec.sh -n dnode5 -s start
+sleep 10000
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show4
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode5Vnodes != 2 then
+  goto show4
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step5
+print ========= drop dnode3
+sql drop dnode $hostname3
+sleep 9000
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show5
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show5
+endi
+if $dnode5Vnodes != 3 then
+  goto show5
+endi
+if $dnode3Vnodes != null then
+  goto show5
+endi
+if $dnode4Vnodes != 3 then
+  goto show5
+endi
+
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step6
+sql create dnode $hostname6
+system sh/exec.sh -n dnode6 -s start
+sleep 9000
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show6
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+
+if $dnode6Vnodes != 2 then
+  goto show6
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step7
+print ========= drop dnode4
+sql drop dnode $hostname4
+sleep 9000
+
+$x = 0
+show7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show7
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+
+if $dnode1Vnodes != 3 then
+  goto show7
+endi
+if $dnode5Vnodes != 3 then
+  goto show7
+endi
+if $dnode6Vnodes != 3 then
+  goto show7
+endi
+if $dnode4Vnodes != null then
+  goto show7
+endi
+
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step8
+sql create dnode $hostname7
+system sh/exec.sh -n dnode7 -s start
+sleep 9000
+
+$x = 0
+show8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show8
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+
+if $dnode7Vnodes != 2 then
+  goto show8
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step9
+print ========= drop dnode1
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+print stop dnode1 and sleep 10000
+sleep 10000
+
+sql drop dnode $hostname1
+print drop dnode1 and sleep 9000
+sleep 9000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============================== step9.1
+sleep 2000
+system sh/exec.sh -n dnode1 -s start
+
+$x = 0
+show9: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+sql show dnodes -x show9
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+
+if $dnode5Vnodes != 3 then
+  goto show9
+endi
+if $dnode6Vnodes != 3 then
+  goto show9
+endi
+if $dnode7Vnodes != 3 then
+  goto show9
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+print dnode4 ==> $data2_4
+print dnode5 ==> $data2_5
+print dnode6 ==> $data2_6
+print dnode7 ==> $data2_7
+
+print ============================== step11
+print ========= add db4
+
+sql create database c_b3_d4 replica 3
+sql use c_b3_d4
+$x = 0
+create4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql create table c_b3_t4 (t timestamp, i int) -x create4
+sql insert into c_b3_t4 values(1520000020045, 45)
+sql insert into c_b3_t4 values(1520000021044, 44)
+sql insert into c_b3_t4 values(1520000022043, 43)
+sql insert into c_b3_t4 values(1520000023042, 42)
+sql insert into c_b3_t4 values(1520000024041, 41)
+
+sleep 3000
+
+$x = 0
+show11: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes -x show11	
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes
+$dnode7Vnodes = $data2_7
+print dnode7 $dnode7Vnodes
+
+if $dnode5Vnodes != 4 then
+  goto show11
+endi
+if $dnode6Vnodes != 4 then
+  goto show11
+endi
+if $dnode7Vnodes != 4 then
+  goto show11
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+sleep 5000
+
+print ============================== step13
+sql reset query cache
+sleep 1000
+
+print ========= check data
+
+sql select * from c_b3_d1.c_b3_t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from c_b3_d2.c_b3_t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from c_b3_d3.c_b3_t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+print ============================================ over
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
diff --git a/tests/script/unique/cluster/cache.sim b/tests/script/unique/cluster/cache.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e23b40782870be00eb3f010cbcdba693e18b19da
--- /dev/null
+++ b/tests/script/unique/cluster/cache.sim
@@ -0,0 +1,57 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+system sh/cfg.sh -n dnode1 -c walLevel            -v 0
+system sh/cfg.sh -n dnode2 -c walLevel            -v 0
+system sh/cfg.sh -n dnode1 -c httpMaxThreads      -v 2
+system sh/cfg.sh -n dnode2 -c httpMaxThreads      -v 2
+system sh/cfg.sh -n dnode1 -c monitor             -v 1
+system sh/cfg.sh -n dnode1 -c monitor             -v 2
+system sh/cfg.sh -n dnode2 -c http                -v 1
+system sh/cfg.sh -n dnode1 -c enableHttp          -v 1
+system sh/cfg.sh -n dnode2 -c monitor             -v 1
+system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
+system sh/cfg.sh -n dnode2 -c monitorInterval     -v 1
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database testdb
+sql use testdb
+sql create table meter1 (ts timestamp, val int)
+
+$x = 0
+$v = -100
+while $x < 30
+    $v = $v + 1
+	$ms = $v . m 
+	sql insert into meter1 values (now  $ms , $x ) 
+	$x = $x + 1
+endw 
+
+sleep 3000
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+
+sleep 10000
+
+sql show log.tables;
+if $rows != 5 then
+  return -1
+endi
+
+sql select * from log.dn1
+print ===>rows $rows
+print $data00 $data01 $data02
+print $data10 $data11 $data12
+print $data20 $data21 $data22
+if $rows < 10 then
+  return -1
+endi
+
+#sql create table sys.st as select avg(taosd), avg(system) from sys.cpu interval(30s)
diff --git a/tests/script/unique/cluster/client1_0.sim b/tests/script/unique/cluster/client1_0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ad48e6dc9378a18969c10ef022b5c14b8256079a
--- /dev/null
+++ b/tests/script/unique/cluster/client1_0.sim
@@ -0,0 +1,70 @@
+#system sh/stop_dnodes.sh
+#system sh/deploy.sh -n dnode1 -i 1
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
+#system sh/exec.sh -n dnode1 -s start
+#sql connect
+#$db = db1
+#sql create database $db
+#sql use $db
+#$stb = stb1
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+
+$tblStart = 0
+$tblEnd = 1000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client1_0  insert data complete once ............
+  endi
+endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/client1_1.sim b/tests/script/unique/cluster/client1_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dd1e68ab4fdcd7949e34eab6b1ea24790215aa80
--- /dev/null
+++ b/tests/script/unique/cluster/client1_1.sim
@@ -0,0 +1,52 @@
+$tblStart = 10000
+$tblEnd = 20000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client1_2.sim b/tests/script/unique/cluster/client1_2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4f87810e42b729b5d436eacb6c6be3f04545f2c3
--- /dev/null
+++ b/tests/script/unique/cluster/client1_2.sim
@@ -0,0 +1,52 @@
+$tblStart = 20000
+$tblEnd = 30000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client1_3.sim b/tests/script/unique/cluster/client1_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..04df0dfffc37a1e7fa78afefca869f974ea280be
--- /dev/null
+++ b/tests/script/unique/cluster/client1_3.sim
@@ -0,0 +1,52 @@
+$tblStart = 30000
+$tblEnd = 40000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client2_0.sim b/tests/script/unique/cluster/client2_0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..75e4dccf7d2d1013a29b109af3a2dff6c15ce4dd
--- /dev/null
+++ b/tests/script/unique/cluster/client2_0.sim
@@ -0,0 +1,52 @@
+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.001
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client2_1.sim b/tests/script/unique/cluster/client2_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4c0d755c045b051cc3a6e8f4f41b088ab0cc2000
--- /dev/null
+++ b/tests/script/unique/cluster/client2_1.sim
@@ -0,0 +1,52 @@
+$tblStart = 10000
+$tblEnd = 20000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client2_2.sim b/tests/script/unique/cluster/client2_2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2f08facf38f03f5f80fea4eb9610acfb755ff121
--- /dev/null
+++ b/tests/script/unique/cluster/client2_2.sim
@@ -0,0 +1,52 @@
+$tblStart = 20000
+$tblEnd = 30000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client2_3.sim b/tests/script/unique/cluster/client2_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b83e5b6eaf63c6a2fc3d0702f911de9cc4c45d95
--- /dev/null
+++ b/tests/script/unique/cluster/client2_3.sim
@@ -0,0 +1,52 @@
+$tblStart = 30000
+$tblEnd = 40000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagPrex = ' . tag
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $tagBinary = $tagPrex . $i
+  $tagBinary = $tagBinary . '
+  sql create table if not exists  $tb using $stb tags ($i, $tagBinary)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 < $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+  endi
+endw 
diff --git a/tests/script/unique/cluster/client3.sim b/tests/script/unique/cluster/client3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4b3024f881864cdce103afaca8f7b2925ad564d3
--- /dev/null
+++ b/tests/script/unique/cluster/client3.sim
@@ -0,0 +1,55 @@
+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+loop_lable:
+print ====================== client3 start loop: dynamic create table and insert data, select, drop table ............
+
+$totalRows = 0
+
+#sql create table $stb ( ts timestamp, c1 int) tags ( t1 int, t2 binary(16) )
+$tagBinary = ' . client3
+$tagBinary = $tagBinary . '
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb using $stb tags ( $i , $tagBinary ) values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x  
+#  print ====== app insert totalRows: $totalRows  
+  $i = $i + 1
+endw 
+   
+sql select count(*) from $stb where t2 == $tagBinary
+if $data00 != $totalRows then
+  print data00 $data00 totalRows $totalRows
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client3   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+print ====================== client3 drop table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql drop table if exists $tb 
+  $i = $i + 1
+endw 
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/client4.sim b/tests/script/unique/cluster/client4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a4c347695ea4f1adae1dfd7f3a6909533fa64381
--- /dev/null
+++ b/tests/script/unique/cluster/client4.sim
@@ -0,0 +1,113 @@
+$tblStart = 0
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+loop_lable:
+print ====================== client4 start loop: create db2, tables and insert data, select, drop db2 ............
+
+$db = db2
+$stb = stb2
+
+print create database if not exists $db replica 2
+sql create database if not exists $db replica 2
+sql use $db
+
+print ==== client4start create table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql create table $tb (ts timestamp, c1 int)
+  $i = $i + 1
+endw 
+
+
+print ==== client4start insert, include multi table data in one insert sql
+$totalRows = 0
+$totalRowsPerTbl = 0
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+
+print ====client4 start alter table
+$i = $tblStart
+while $i < $tblEnd
+  $tb = dtb . $i
+  sql alter table $tb add c2 float
+  $i = $i + 1
+endw 
+
+print ====client4 continue insert, include multi table data in one insert sql
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb0 = dtb . $i
+  $i = $i + 1
+  $tb1 = dtb . $i
+  $i = $i + 1
+  $tb2 = dtb . $i
+  $i = $i + 1
+  $tb3 = dtb . $i
+  $i = $i + 1
+  $tb4 = dtb . $i  
+  $i = $i + 1  
+  
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb0 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb1 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb2 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb3 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) $tb4 values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) 
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  
+  $totalRowsPerTbl = $totalRowsPerTbl + $x
+  $x = $x * 5
+  $totalRows = $totalRows + $x  
+endw 
+   
+sql select count(*) from tb10
+if $data00 != $totalRowsPerTbl then
+  print data00 $data00 totalRowsPerTbl $totalRowsPerTbl
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client4   insert loss: $deltaRows *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+endi
+
+print ====================== client4 drop database
+sql drop if exists database $db 
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/client5.sim b/tests/script/unique/cluster/client5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1fe6298ae7efd78ffb25c58d9ffaa13e29c22d36
--- /dev/null
+++ b/tests/script/unique/cluster/client5.sim
@@ -0,0 +1,53 @@
+$tblStart = 0
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+$tsEnd   = 1325347210000
+###############################################################
+
+sql connect
+$db = db1
+$stb = stb1
+#subtable: tb0 - tb4999
+#print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+sleep 20000 # wait other client insert data
+
+loop_lable:
+print ====================== client5 start loop query
+
+sql use $db   
+
+sql select count(*) from $stb
+
+$tsQueryStart = $tsStart
+$tsQueryStart = $tsStart + 90000
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart order by ts asc limit 500 offset 7
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart order by ts desc limit 500 offset 7
+
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client1_0'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client1_1'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client1_2'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client1_3'
+
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client2_0'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client2_1'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client2_2'
+sql select * from $stb where ts > $tsQueryStart and ts < $tsQueryStart and t2 == 'client2_3'
+
+sql select min(c1)      from $stb
+sql select max(c1)      from $stb
+sql select first(*)     from $stb
+sql select last(*)      from $stb
+sql select last_row(*)  from $stb
+sql select sum(c1)      from $stb
+sql select avg(c1)      from $stb
+
+sql select min(c1)      from tb1
+sql select max(c1)      from tb10
+sql select first(*)     from tb100
+sql select last(*)      from tb1000
+sql select last_row(*)  from tb20
+sql select sum(c1)      from tb200
+sql select avg(c1)      from tb2000
+
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/cluster_main.sim b/tests/script/unique/cluster/cluster_main.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f0a9b1a2147288fb3f0d2437a507296f9517ce09
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main.sim
@@ -0,0 +1,297 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$db = db1
+print create database $db replica 3
+#sql create database $db replica 3 
+sql create database $db replica 3
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+
+print ============== step4: start back client1_0.sim
+run_back unique/cluster/client1_0.sim
+#run_back unique/cluster/client1_1.sim
+#run_back unique/cluster/client1_2.sim
+#run_back unique/cluster/client1_3.sim
+#run_back unique/cluster/client2_0.sim
+#run_back unique/cluster/client2_1.sim
+#run_back unique/cluster/client2_2.sim
+#run_back unique/cluster/client2_3.sim
+#run_back unique/cluster/client3.sim
+#run_back unique/cluster/client4.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+print ============== step4-1: add dnode4/dnode5 into cluster
+sql create dnode $hostname4
+sql create dnode $hostname5
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sleep 20000
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+print ============== step12: restart dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: stop dnode4/dnode5
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
+#system sh/exec.sh -n dnode4 -s start
+#system sh/exec.sh -n dnode5 -s start
+#sleep 10000
+#sql drop dnode $hostname4
+#sql drop dnode $hostname5
+#system rm -rf ../../../sim/dnode4/data
+#system rm -rf ../../../sim/dnode5/data
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/cluster_main0.sim b/tests/script/unique/cluster/cluster_main0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9f775c0cef183bfe3b8dd231a08f5f829fe2d3ef
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main0.sim
@@ -0,0 +1,282 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$db = db1
+print create database $db replica 3
+#sql create database $db replica 3 
+sql create database $db replica 3
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/client1_0.sim
+run_back unique/cluster/client1_1.sim
+run_back unique/cluster/client1_2.sim
+run_back unique/cluster/client1_3.sim
+#run_back unique/cluster/client2_0.sim
+#run_back unique/cluster/client2_1.sim
+#run_back unique/cluster/client2_2.sim
+#run_back unique/cluster/client2_3.sim
+#run_back unique/cluster/client3.sim
+#run_back unique/cluster/client4.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5 and add into cluster, then wait ready
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sql create dnode $hostname4
+sql create dnode $hostname5
+
+sleep 5000
+
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+print ============== step12: restart dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: stop and drop dnode4/dnode5, then remove data dir of dnode4/dnode5 
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 3000
+sql drop dnode $hostname4
+sql drop dnode $hostname5
+system rm -rf ../../../sim/dnode4/data
+system rm -rf ../../../sim/dnode5/data
+sleep 20000
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09
+if $data04 != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/cluster_main1.sim b/tests/script/unique/cluster/cluster_main1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7796f1ea00da9d9915aba6a9cbecee0223f99fd4
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main1.sim
@@ -0,0 +1,324 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$replica = 3
+$db = db1
+print create database $db replica $replica
+#sql create database $db replica 3 
+sql create database $db replica $replica
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/main1_client1_0.sim
+run_back unique/cluster/main1_client1_1.sim
+run_back unique/cluster/main1_client1_2.sim
+run_back unique/cluster/main1_client1_3.sim
+run_back unique/cluster/client3.sim
+run_back unique/cluster/client4.sim
+run_back unique/cluster/client5.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+print ============== step4-1: add dnode4/dnode5 into cluster
+sql create dnode $hostname4
+sql create dnode $hostname5
+sleep 5000
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sleep 20000
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+#print ============== step12: restart dnode4, then wait sync end
+#system sh/exec.sh -n dnode4 -s start
+#sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: stop dnode5
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+#print ============== step14-1: drop dnode5, then remove data dir
+#sql drop dnode $hostname5
+#sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/cluster_main2.sim b/tests/script/unique/cluster/cluster_main2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..48661546815a1e4c60e2b8d983f0a3e20e232529
--- /dev/null
+++ b/tests/script/unique/cluster/cluster_main2.sim
@@ -0,0 +1,328 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode5 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+system sh/cfg.sh -n dnode5 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode5 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode5 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2/dnode3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+
+print ============== step2: create db1 with replica 3
+$replica = 3
+$db = db1
+print create database $db replica $replica
+#sql create database $db replica 3 
+sql create database $db replica $replica
+sql use $db
+
+print ============== step3: create stable stb1
+$stb = stb1
+print create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(16))
+
+print ============== step4: start others client
+run_back unique/cluster/main2_client1_0.sim
+run_back unique/cluster/main2_client1_1.sim
+run_back unique/cluster/main2_client1_2.sim
+run_back unique/cluster/main2_client1_3.sim
+run_back unique/cluster/main2_client2_0.sim
+run_back unique/cluster/main2_client2_1.sim
+run_back unique/cluster/main2_client2_2.sim
+run_back unique/cluster/main2_client2_3.sim
+run_back unique/cluster/client3.sim
+run_back unique/cluster/client4.sim
+run_back unique/cluster/client5.sim
+
+sleep 20000
+
+wait_subsim_insert_complete_create_tables:
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_complete_create_tables
+endi
+
+wait_subsim_insert_data:
+print select count(*) from $stb
+sql select count(*) from $stb
+print data00 $data00
+if $data00 < 1000 then
+  sleep 3000
+  goto wait_subsim_insert_data
+endi
+
+print wait for a while to let clients start insert data
+sleep 5000    
+
+print ============== step4-1: add dnode4/dnode5 into cluster
+sql create dnode $hostname4
+sql create dnode $hostname5
+sleep 5000
+
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+print ============== step5: start dnode4/dnode5
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+
+print ============== step6: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 10000
+#sql drop dnode $hostname1
+#sleep 5000
+#system rm -rf ../../../sim/dnode1/data
+#sleep 20000
+print ============== step6-1: restart dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 10000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step7: stop dnode2 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step8: restart dnode2, then wait sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step9: stop dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step10: restart dnode3, then wait sync end
+system sh/exec.sh -n dnode3 -s start
+sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step11: stop dnode4, then wait sync end
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 20000
+
+#print ============== step12: restart dnode4, then wait sync end
+#system sh/exec.sh -n dnode4 -s start
+#sleep 20000
+sql show mnodes
+print show mnodes
+print rows: $rows
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+print $data0_7  $data1_7  $data2_7  $data3_7  $data4_7
+print $data0_8  $data1_8  $data2_8  $data3_8  $data4_8
+print $data0_9  $data1_9  $data2_9  $data3_9  $data4_9
+
+print ============== step13: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+print ============== step14: drop dnode5, then remove data dir
+system sh/exec.sh -n dnode5 -s stop -x SIGINT
+sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+#print ============== step14-1: drop dnode5, then remove data dir
+#sql drop dnode $hostname5
+#sleep 20000
+#system rm -rf ../../../sim/dnode5/data
+
+print ============== step15: alter replica 1
+sql alter database $db replica 1
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 1 then
+  print rplica is not modify to 1, error!!!!!!
+  return -1
+endi
+
+print ============== step16: alter replica 2
+sql alter database $db replica 2
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 2 then
+  print rplica is not modify to 2, error!!!!!!
+  return -1
+endi
+
+#print ============== step17: start dnode1 and add into cluster, then wait dnode1 ready
+#system sh/cfg.sh -n dnode1 -c first -v $hostname2
+#system sh/cfg.sh -n dnode1 -c second -v $hostname3
+#
+#system sh/exec.sh -n dnode1 -s start
+#sql create dnode $hostname1
+#sleep 20000
+
+print ============== step18: alter replica 3
+sql alter database $db replica 3
+sql show databases
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07   $data08  $data09 
+print $data10  $data11  $data12  $data13  $data14  $data15  $data16  $data17   $data18  $data19 
+
+if $data00 == db1 then
+  $replica = $data04
+elif $data10 == db1 then
+  $replica = $data14
+else then
+  print ==== db1 already not exists!!!!!
+  return -1
+endi
+
+if $replica != 3 then
+  print rplica is not modify to 3, error!!!!!!
+  return -1
+endi
+
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+goto loop_cluster_do
diff --git a/tests/script/unique/cluster/main1_client1_0.sim b/tests/script/unique/cluster/main1_client1_0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e54fd7f1a7efad6db79268eda211d4a414fb3ed5
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_0.sim
@@ -0,0 +1,93 @@
+#system sh/stop_dnodes.sh
+#system sh/deploy.sh -n dnode1 -i 1
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000\
+#system sh/exec.sh -n dnode1 -s start
+#sql connect
+#$db = db1
+#sql create database $db
+#sql use $db
+#$stb = stb1
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+
+
+$tblStart = 0
+$tblEnd = 1000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_0 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_0 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_0 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_0 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_0  insert data complete once ............
+  endi
+endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_1.sim b/tests/script/unique/cluster/main1_client1_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b50f533ce1cede4c1c8fd788bd89c85b64d8d375
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_1.sim
@@ -0,0 +1,82 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_1 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_1 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_1 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_1 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_2.sim b/tests/script/unique/cluster/main1_client1_2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8cc39ded0437379cbd391dad0dfad26cc32a8f05
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_2.sim
@@ -0,0 +1,81 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_2 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_2 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_2 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_2 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client1_3.sim b/tests/script/unique/cluster/main1_client1_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..72e1be48ac64d34f7c7c06e7ae882de164b3c22c
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client1_3.sim
@@ -0,0 +1,81 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x ) -x insert_error_loop
+    $x = $x + 20
+    $ts = $ts + 40a
+    goto continue_next_0
+    insert_error_loop:
+    print ============== main1_client1_3 run error: sql insert into $tb values ( $ts + 0a , $x ) ... ...
+    continue_next_0:
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    if $data00 != $totalRows then
+      print data00 $data00 totalRows $totalRows
+      $deltaRows = $totalRows - $data00
+      if $lastLossRows == 0 then 
+        $lastLossRows = $deltaRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_3 insert loss: $deltaRows *****
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      elif $deltaRows != $lastLossRows
+        $tmp = $deltaRows - $lastLossRows
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        print ************ client1_3 insert loss: $tmp ***********
+        print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        $lastLossRows = $deltaRows
+      endi
+#	    return -1
+    endi
+    goto continue_next_1
+    query_error_loop:
+    print ============== main1_client1_3 run error: sql select count(*) from $stb where t2 == $tagBinary -x query_error_loop
+    continue_next_1:
+    print ====================== client1_3  insert data complete once ............
+  endi
+endw 
+print ====================== client1_3  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main1_client4.sim b/tests/script/unique/cluster/main1_client4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..eb8049b04beafa2c8a909deae83b26d83d12245d
--- /dev/null
+++ b/tests/script/unique/cluster/main1_client4.sim
@@ -0,0 +1,127 @@
+$tblStart = 0
+$tblEnd = 10000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db2
+$stb = stb2
+
+loop_lable:
+print ========= start loop create db, table, inset data, alter column/tag, select, drop db
+
+sql create database if not exists $db
+sql use $db
+sql create table if not exists $stb ( ts timestamp, c1 int, c2 float ) tags ( t1 int , t2 binary(16) )
+$tagBinary = ' . client4
+$tagBinary = $tagBinary . '
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  sql create table if not exists  $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+##################### alter column
+sql alter table $stb add column c3 double
+sql alter table $stb drop column c2
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+
+##################### alter tag
+sql alter table $stb add tag t3 int
+sql alter table $stb drop tag t2
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = ttb . $i
+  sql create table if not exists  $tb using $stb tags ($i, $i)
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $x ) ( $ts + 2a , $x , $x ) ( $ts + 4a , $x , $x ) ( $ts + 6a , $x , $x ) ( $ts + 8a , $x , $x ) ( $ts + 10a , $x , $x ) ( $ts + 12a , $x , $x ) ( $ts + 14a , $x , $x ) ( $ts + 16a , $x , $x ) ( $ts + 18a , $x , $x ) ( $ts + 20a , $x , $x ) ( $ts + 22a , $x , $x ) ( $ts + 24a , $x , $x ) ( $ts + 26a , $x , $x ) ( $ts + 28a , $x , $x ) ( $ts + 30a , $x , $x ) ( $ts + 32a , $x , $x ) ( $ts + 34a , $x , $x ) ( $ts + 36a , $x , $x ) ( $ts + 38a , $x , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb -x continue_loop
+    print data00 $data00 totalRows $totalRows
+    if $data00 != $totalRows then
+	    print **********************  select error **********************
+    endi
+    continue_loop:
+    print ====================== client4  insert data complete once ............
+  endi
+endw 
+
+goto loop_lable
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_0.sim b/tests/script/unique/cluster/main2_client1_0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..240c22aacc452b25a1d12c0a60f65bb52919de7e
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_0.sim
@@ -0,0 +1,68 @@
+#system sh/stop_dnodes.sh
+#system sh/deploy.sh -n dnode1 -i 1
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 10000
+#system sh/exec.sh -n dnode1 -s start
+#sql connect
+#$db = db1
+#sql create database $db
+#sql use $db
+#$stb = stb1
+#sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+
+
+$tblStart = 0
+$tblEnd = 1000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_0  insert data complete once ............
+  endi
+endw 
+print ====================== client1_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_1.sim b/tests/script/unique/cluster/main2_client1_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f22d62a7411110e3b7b94fd54702dd24c9af1b48
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_1.sim
@@ -0,0 +1,57 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_1  insert data complete once ............
+  endi
+endw 
+print ====================== client1_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_2.sim b/tests/script/unique/cluster/main2_client1_2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..df3a925c591194b819d8d1fc6bf9234d851fa5b4
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_2.sim
@@ -0,0 +1,56 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_2  insert data complete once ............
+  endi
+endw 
+print ====================== client1_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client1_3.sim b/tests/script/unique/cluster/main2_client1_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9c22432fa5176ec8cb36f6549e312170803263db
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client1_3.sim
@@ -0,0 +1,56 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200000  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client1_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client1_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client1_3  insert data complete once ............
+  endi
+endw 
+print ====================== client1_3  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_0.sim b/tests/script/unique/cluster/main2_client2_0.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e44efc49fc7333541d5870ed05eb1cb1a289c3a2
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_0.sim
@@ -0,0 +1,56 @@
+$tblStart = 0
+$tblEnd = 1000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.001
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_0
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_0 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lastLossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_0  insert data complete once ............
+  endi
+endw 
+print ====================== client2_0  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_1.sim b/tests/script/unique/cluster/main2_client2_1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..19de147d3ea79b54702b8ce0da30d2bff69841f2
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_1.sim
@@ -0,0 +1,57 @@
+$tblStart = 1000
+$tblEnd = 2000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_1
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_1 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_1  insert data complete once ............
+  endi
+endw 
+print ====================== client2_1  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_2.sim b/tests/script/unique/cluster/main2_client2_2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..19e3540bd1676ebb15d0d318488feea61ef9074a
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_2.sim
@@ -0,0 +1,57 @@
+$tblStart = 2000
+$tblEnd = 3000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_2
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_2 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_2  insert data complete once ............
+  endi
+endw 
+print ====================== client2_2  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/main2_client2_3.sim b/tests/script/unique/cluster/main2_client2_3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..219df131c8f31babc25f2204dbddab7f0232c56b
--- /dev/null
+++ b/tests/script/unique/cluster/main2_client2_3.sim
@@ -0,0 +1,57 @@
+$tblStart = 3000
+$tblEnd = 4000
+$tsStart = 1325347200001  # 2012-01-01 00:00:00.000
+###############################################################
+
+sql connect
+
+$db = db1
+$stb = stb1
+
+sql use $db
+
+
+######sql create table $stb (ts timestamp, c1 int) tags(t1 int, t2 binary(8))
+$tagBinary = ' . client2_3
+$tagBinary = $tagBinary . '
+#print ======= tag: $tagBinary
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  sql create table if not exists $tb using $stb tags ( $i , $tagBinary )
+  $i = $i + 1
+endw 
+
+print ====================== client2_3 create table end, start insert data ............
+sql select count(tbname) from $stb
+print select count(tbname) from $stb
+print data00 $data00
+
+$rowsPerLoop = 100
+$ts = $tsStart
+
+$lossRows = 0
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 2a , $x ) ( $ts + 4a , $x ) ( $ts + 6a , $x ) ( $ts + 8a , $x ) ( $ts + 10a , $x ) ( $ts + 12a , $x ) ( $ts + 14a , $x ) ( $ts + 16a , $x ) ( $ts + 18a , $x ) ( $ts + 20a , $x ) ( $ts + 22a , $x ) ( $ts + 24a , $x ) ( $ts + 26a , $x ) ( $ts + 28a , $x ) ( $ts + 30a , $x ) ( $ts + 32a , $x ) ( $ts + 34a , $x ) ( $ts + 36a , $x ) ( $ts + 38a , $x )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+  if $i == $tblEnd then
+    $i = $tblStart
+    
+    sql select count(*) from $stb where t2 == $tagBinary
+    print ====================== client2_3  insert data complete once ............
+  endi
+endw 
+print ====================== client2_3  success and auto end =====================
\ No newline at end of file
diff --git a/tests/script/unique/cluster/testSuite.sim b/tests/script/unique/cluster/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9657558c12a0a47441127f64a25541ebc15390e6
--- /dev/null
+++ b/tests/script/unique/cluster/testSuite.sim
@@ -0,0 +1,4 @@
+run unique/cluster/balance1.sim
+run unique/cluster/balance2.sim
+run unique/cluster/balance3.sim
+run unique/cluster/cache.sim
diff --git a/tests/script/unique/cluster/vgroup100.sim b/tests/script/unique/cluster/vgroup100.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bde6dd2462db261c3f50088fec3419543bdcb07d
--- /dev/null
+++ b/tests/script/unique/cluster/vgroup100.sim
@@ -0,0 +1,129 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c maxTables -v 4
+system sh/cfg.sh -n dnode2 -c maxTables -v 4
+system sh/cfg.sh -n dnode3 -c maxTables -v 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+
+print ============================== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+sql connect
+
+print ============================== step2
+print ========= start dnode2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+sleep 5000
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+
+print $dnode1Role
+print $dnode2Role 
+print $dnode3Role 
+
+print ============================== step3
+$count = 2
+while $count < 102
+  $db = d . $count
+  $tb = $db . .t
+  $tb2 = $db . .t2
+  sql create database $db replica 3 cache 1 blocks 3
+  sql create table $tb (ts timestamp, i int)
+  sql insert into $tb values(now, 1)
+  sql create table $tb2 as select count(*) from $tb interval(10s)
+  $count = $count + 1
+  print insert into $tb values(now, 1) ==> finished
+endw
+
+print ============================== step4
+
+$count = 2
+while $count < 102
+  $db = d . $count
+  $tb = $db . .t
+  sql select * from $tb
+  if $rows != 1 then
+    print select * from $tb
+    return -1
+  endi
+  $count = $count + 1
+  print select * from $tb ==> rows: $rows 
+endw
+
+print ============================== step5
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+sleep 5000
+
+print ============================== step6
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 10000
+
+print ============================== step7
+
+$x = 0
+show7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 50 then
+		return -1
+	endi
+	
+sql show mnodes -x show7
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+if $dnode1Role != master then
+	goto show7
+endi
+if $dnode2Role != slave then
+	goto show7
+endi
+if $dnode2Role != slave then
+	goto show7
+endi
+
+print ============================== step8
+$x = 0
+show8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then
+		return -1
+	endi
+
+$count = 2
+while $count < 102
+  $db = d . $count
+  $tb = $db . .t
+  sql select * from $tb
+  if $rows != 1 then
+    print select * from $tb
+    goto show8
+  endi
+  $count = $count + 1
+  print select * from $tb ==> rows: $rows 
+endw
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/clusterSimCase/client-01.sim b/tests/script/unique/clusterSimCase/client-01.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b35790d69ee3272caa83a28566b9d77be7d7b4e9
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-01.sim
@@ -0,0 +1,69 @@
+# create database db1
+# create table tb ()
+# loop insert seq data
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-01-
+###############################################################
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2
+sql use $db
+
+print ================ create table $tb (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$totalRows   = 0
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loop_cnt = 0
+loop_run:
+print ================ client-01 start loop insert data ( loop_cnt: $loop_cnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    $x = $x + 20
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-01 insert data into  $tb  error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loop_cnt = $loop_cnt + 1
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-02.sim b/tests/script/unique/clusterSimCase/client-02.sim
new file mode 100644
index 0000000000000000000000000000000000000000..30a2ceb08942140b3b03dec7a1285b30f6fd99ac
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-02.sim
@@ -0,0 +1,70 @@
+# create database db1
+# create table tb ()
+# loop insert disorder data
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-02-
+###############################################################
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+print ================ create table $tb (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$totalRows   = 0
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loop_cnt = 0
+loop_run:
+print ================ client-02 start loop insert data ( loop_cnt: $loop_cnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-02 insert data into  $tb  error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loop_cnt = $loop_cnt + 1
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-03.sim b/tests/script/unique/clusterSimCase/client-03.sim
new file mode 100644
index 0000000000000000000000000000000000000000..78a25e26a5344bbfe3434dec61643bf5a9c26f19
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-03.sim
@@ -0,0 +1,83 @@
+# create database db1
+# create table stb ()
+# loop dynamic create sub table and insert disorder data
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-03-
+###############################################################
+
+sql connect
+
+print ================ create db and super-table
+$db  = db
+$stb = stb
+sql create database if not exists $db replica 2 
+sql use $db
+sql create table if not exists $stb ( ts timestamp , c1 int , c2 binary(16) ) tags ( t1 int , t2 binary(16) )
+
+#print ================ create table $tb (ts timestamp, c1 int, c2 binary(16))
+#$i = $tblStart
+#while $i < $tblEnd
+#  $tb = tb . $i
+##  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+#  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+#  $i = $i + 1
+#endw 
+
+$totalRows   = 0
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loop_cnt = 0
+loop_run:
+print ================ client-03 start loop insert data ( loop_cnt: $loop_cnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+
+  $t2Binary = $preBinary . $i
+  $t2Binary = $t2Binary . ' 
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb using $stb tags ( $i ,  $t2Binary ) values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb using $stb tags ( $i ,  $t2Binary ) values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ****** client-3 insert data into $tb error ***
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+sql select count(*) from $stb
+print data00 $data00 totalRows $totalRows
+if $data00 != $totalRows then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ***** client-3 insert data into $stbl error ********
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+$loop_cnt = $loop_cnt + 1
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-04.sim b/tests/script/unique/clusterSimCase/client-04.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5248e9d7bb9b339cdcd157c495b9bc8f73705d89
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-04.sim
@@ -0,0 +1,81 @@
+# create database db1
+# create table tb ()
+# loop insert disorder data, drop database, sleep , 
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-04-
+###############################################################
+
+$totalRows   = 0
+
+sql connect
+
+init_lable:
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+print ================ create table $tb (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loopCnt = 0
+ 
+loop_run:    
+print ================ client-04 start loop insert data ( loopCnt: $loopCnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-04 insert data into $tb error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loopCnt = $loopCnt + 1
+
+if $loopCnt > 100 then
+  sql drop database if exists $db
+  sleep 20000
+  $totalRows   = 0
+  goto init_lable 
+endi
+
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-05.sim b/tests/script/unique/clusterSimCase/client-05.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a2deaba9b2943b7e3720ae6c6f9b9001d5e3b743
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-05.sim
@@ -0,0 +1,86 @@
+# create database db1
+# loop create table ,  insert disorder data, drop table, sleep , 
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-05-
+###############################################################
+
+$totalRows   = 0
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+init_lable:
+print ================ create table $tb (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loopCnt = 0
+ 
+loop_run:
+print ================ client-05 start loop insert data ( loopCnt: $loopCnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-05 insert data into $tb error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loopCnt = $loopCnt + 1
+
+if $loopCnt > 100 then
+
+  $i = $tblStart
+  while $i < $tblEnd
+    $tb = tb . $i
+    sql drop table if exists $tb
+    $i = $i + 1
+    $totalRows = $totalRows - $rowsPerTbl
+  endw  
+  sleep 20000
+  goto init_lable 
+endi
+
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-06.sim b/tests/script/unique/clusterSimCase/client-06.sim
new file mode 100644
index 0000000000000000000000000000000000000000..209b615e64a2742cac732bd22d0e25f7a8f5db4e
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-06.sim
@@ -0,0 +1,95 @@
+# create database db1
+# create table tb ()
+# loop insert disorder data, drop some tables and create new tables, sleep , 
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-06-
+$numPerUpdateTbl = 2000
+###############################################################
+$totalRows    = 0  
+$dropTblStart = $tblStart
+$dropTblEnd   = $dropTblStart
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+init_lable:
+print ================ create table [ from $tblStart to $tblEnd ] (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$dropTblStart = $dropTblEnd
+$dropTblEnd   = $dropTblStart + $numPerUpdateTbl
+
+$tblStart = $tblEnd
+$tblEnd   = $tblEnd + $numPerUpdateTbl
+
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 160
+
+$loopCnt = 0
+ 
+loop_run:
+print ================ client-06 start loop insert data from $dropTblStart to $tblStart ( loopCnt: $loopCnt )
+$i = $dropTblStart
+while $i < $tblStart
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $dropTblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-06 insert data into $tb error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loopCnt = $loopCnt + 1
+
+if $loopCnt > 2 then
+  print ================ client-06 drop table from $dropTblStart to $dropTblEnd
+  $i = $dropTblStart
+  while $i < $dropTblEnd
+    $tb = tb . $i
+    sql drop table if exists $tb
+    $i = $i + 1
+    $totalRows = $totalRows - $rowsPerTbl
+  endw  
+  sleep 10000
+  goto init_lable 
+endi
+
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-07.sim b/tests/script/unique/clusterSimCase/client-07.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3bf358520511dc04cc33c5953f91bee237ccd576
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-07.sim
@@ -0,0 +1,101 @@
+# create database db1
+# loop create table ,  insert disorder data, drop table, sleep , 
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-07-
+###############################################################
+$alterCnt = 0
+
+$columnA = c . $alterCnt
+$columnB = d . $alterCnt
+
+$totalRows   = 0
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+$rowsPerTbl  = 0
+$ts          = $tsStart
+
+print ================ create table $tb (ts timestamp, $columnA int, $columnB binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , $columnA int , $columnB binary(16) )
+  $i = $i + 1
+endw 
+
+$rowsPerLoop = 160
+
+$loopCnt = 0
+$alterStep = 0
+ 
+loop_run:
+print ================ client-07 start loop insert data ( loopCnt: $loopCnt )
+$i  = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $tblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-07 insert data into $tb error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loopCnt = $loopCnt + 1
+
+if $alterStep > 2 then
+  $alterStep = 0
+  
+  $alterCnt = $alterCnt + 1
+  $i = $tblStart
+  while $i < $tblEnd
+    $tb = tb . $i
+    $newColumnA = c . $alterCnt
+    $newcolumnB = d . $alterCnt
+
+    sql alter table $tb add column $newColumnA double
+    sql alter table $tb add column $newcolumnB binary( 16 )
+    sql alter table $tb drop column $columnA
+    sql alter table $tb drop column $columnB
+    $i = $i + 1
+  endw
+  $columnA = $newColumnA
+  $columnB = $newcolumnB
+    
+  sleep 10000
+  goto loop_run 
+endi
+
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/client-08.sim b/tests/script/unique/clusterSimCase/client-08.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d9d64834cb36693328ce721dab449cdacc2f026a
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/client-08.sim
@@ -0,0 +1,95 @@
+# create database db1
+# create table tb ()
+# loop insert disorder data, drop some tables and create new tables, sleep , 
+###############################################################
+################ set script parameters ################
+$tblStart = 0
+$tblEnd   = 10000
+$tsStart  = 1325347200000  # 2012-01-01 00:00:00.000
+$preBinary = ' . client-08-
+$numPerUpdateTbl = 2000
+###############################################################
+$totalRows    = 0  
+$dropTblStart = $tblStart
+$dropTblEnd   = $dropTblStart
+
+sql connect
+
+print ================ create db
+$db = db
+sql create database if not exists $db replica 2 
+sql use $db
+
+init_lable:
+print ================ create table [ from $tblStart to $tblEnd ] (ts timestamp, c1 int, c2 binary(16))
+
+$i = $tblStart
+while $i < $tblEnd
+  $tb = tb . $i
+#  print create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  sql create table if not exists $tb ( ts timestamp , c1 int , c2 binary(16) )
+  $i = $i + 1
+endw 
+
+$dropTblStart = $dropTblEnd
+$dropTblEnd   = $dropTblStart + $numPerUpdateTbl
+
+$tblStart = $tblEnd
+$tblEnd   = $tblEnd + $numPerUpdateTbl
+
+$rowsPerTbl  = 0
+$ts          = $tsStart
+$rowsPerLoop = 40
+
+$loopCnt = 0
+ 
+loop_run:
+print ================ client-08 start loop insert data from $dropTblStart to $tblStart ( loopCnt: $loopCnt )
+$i = $dropTblStart
+while $i < $tblStart
+  $tb = tb . $i
+  
+  $c2Binary = $preBinary . $i
+  $c2Binary = $c2Binary . '
+
+  $x = 0
+  while $x < $rowsPerLoop
+    sql insert into $tb values ( $ts + 0a , $x , $c2Binary ) ( $ts + 2a , $x , $c2Binary ) ( $ts + 4a , $x , $c2Binary ) ( $ts + 6a , $x , $c2Binary ) ( $ts + 8a , $x , $c2Binary ) ( $ts + 10a , $x , $c2Binary ) ( $ts + 12a , $x , $c2Binary ) ( $ts + 14a , $x , $c2Binary ) ( $ts + 16a , $x , $c2Binary ) ( $ts + 18a , $x , $c2Binary ) ( $ts + 20a , $x , $c2Binary ) ( $ts + 22a , $x , $c2Binary ) ( $ts + 24a , $x , $c2Binary ) ( $ts + 26a , $x , $c2Binary ) ( $ts + 28a , $x , $c2Binary ) ( $ts + 30a , $x , $c2Binary ) ( $ts + 32a , $x , $c2Binary ) ( $ts + 34a , $x , $c2Binary ) ( $ts + 36a , $x , $c2Binary ) ( $ts + 38a , $x , $c2Binary )
+    sql insert into $tb values ( $ts + 1a , $x , $c2Binary ) ( $ts + 3a , $x , $c2Binary ) ( $ts + 5a , $x , $c2Binary ) ( $ts + 7a , $x , $c2Binary ) ( $ts + 9a , $x , $c2Binary ) ( $ts + 11a , $x , $c2Binary ) ( $ts + 13a , $x , $c2Binary ) ( $ts + 15a , $x , $c2Binary ) ( $ts + 17a , $x , $c2Binary ) ( $ts + 19a , $x , $c2Binary ) ( $ts + 21a , $x , $c2Binary ) ( $ts + 23a , $x , $c2Binary ) ( $ts + 25a , $x , $c2Binary ) ( $ts + 27a , $x , $c2Binary ) ( $ts + 29a , $x , $c2Binary ) ( $ts + 31a , $x , $c2Binary ) ( $ts + 33a , $x , $c2Binary ) ( $ts + 35a , $x , $c2Binary ) ( $ts + 37a , $x , $c2Binary ) ( $ts + 39a , $x , $c2Binary )
+    $x = $x + 40
+    $ts = $ts + 40a
+  endw 
+  if $i == $dropTblStart then
+    $rowsPerTbl = $rowsPerTbl + $x   
+  endi
+
+  $totalRows = $totalRows + $x
+  $i = $i + 1
+  
+endw 
+
+sql select count(*) from $tb
+print data00 $data00 rowsPerTbl $rowsPerTbl tb: $tb
+if $data00 != $rowsPerTbl then
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  print ************ client-08 insert data into $tb error ***** *****
+  print ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  return -1
+endi
+
+$loopCnt = $loopCnt + 1
+
+#if $loopCnt > 3 then
+  print ================ client-08 drop table from $dropTblStart to $dropTblEnd
+  $i = $dropTblStart
+  while $i < $dropTblEnd
+    $tb = tb . $i
+    sql drop table if exists $tb
+    $i = $i + 1
+    $totalRows = $totalRows - $rowsPerTbl
+  endw  
+  sleep 10000
+  goto init_lable 
+#endi
+
+goto loop_run
diff --git a/tests/script/unique/clusterSimCase/cluster_main.sim b/tests/script/unique/clusterSimCase/cluster_main.sim
new file mode 100644
index 0000000000000000000000000000000000000000..39607c2915da7594f7af3562ae3ccd7680b2b4aa
--- /dev/null
+++ b/tests/script/unique/clusterSimCase/cluster_main.sim
@@ -0,0 +1,248 @@
+# scp -r root@114.116.252.220:/home/ubuntu/clusterSimCase unique/.
+
+#taos> show dnodes;
+#   id   |           end_point            | vnodes | cores  |     status     |   role   |       create_time       |
+#==================================================================================================================
+#      1 | ubuntu-OptiPlex-7060:7100      |      0 |     12 | ready          | mnode    | 2020-07-22 06:25:31.677 |
+#      2 | ubuntu-OptiPlex-7060:7200      |      4 |     12 | ready          | vnode    | 2020-07-22 06:25:34.795 |
+#      3 | ubuntu-OptiPlex-7060:7300      |      4 |     12 | ready          | vnode    | 2020-07-22 06:25:34.803 |
+#Query OK, 3 row(s) in set (0.002448s)
+#taos> show vgroups;
+#    vgId     |   tables    |   status   | onlineVnodes | dnode  |   vstatus   | dnode  |   vstatus   |
+#======================================================================================================
+#           2 |        1024 | ready      |            2 |      3 | master      |      2 | slave       |
+#           3 |        1024 | ready      |            2 |      3 | master      |      2 | slave       |
+#           4 |        1024 | ready      |            2 |      3 | master      |      2 | slave       |
+#           5 |         718 | ready      |            2 |      3 | master      |      2 | slave       |
+#Query OK, 4 row(s) in set (0.002749s)
+#
+#taos> show mnodes
+#   -> ;
+#   id   |           end_point            |      role      |       create_time       |
+#=====================================================================================
+#      1 | ubuntu-OptiPlex-7060:7100      | master         | 2020-07-22 06:25:31.677 |
+#Query OK, 1 row(s) in set (0.002126s)
+
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
+
+#system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
+#system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 1
+#system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 1
+#system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 1
+
+#system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 256  
+#system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 256  
+#system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 256  
+#system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 256
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 5000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 5000
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator and dnode1
+system sh/exec_tarbitrator.sh -s start
+system sh/exec.sh -n dnode1 -s start
+
+print ============== step2: start dnode2/dnode3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 1000
+sql connect
+
+print ============== step1: add dnode2/dnode3 into cluster
+sql create dnode $hostname2
+sql create dnode $hostname3
+sleep 3000
+sleep 3000
+print ============== step3: start back client-01.sim
+#run_back unique/clusterSimCase/client-01.sim
+#run_back unique/clusterSimCase/client-02.sim
+#run_back unique/clusterSimCase/client-03.sim
+#run_back unique/clusterSimCase/client-04.sim
+#run_back unique/clusterSimCase/client-05.sim
+#run_back unique/clusterSimCase/client-06.sim
+#run_back unique/clusterSimCase/client-07.sim
+run_back unique/clusterSimCase/client-08.sim
+#run_back unique/clusterSimCase/client-01.sim
+#run_back unique/clusterSimCase/client-01.sim
+sleep 20000
+
+$db = db
+sql use $db
+
+$loop_cnt = 0
+loop_cluster_do:
+print **** **** **** START loop cluster do (loop_cnt: $loop_cnt )**** **** **** ****
+
+print ============== step4: stop dnode3
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+
+$checkCnt = 0
+wait_vgroup_chang_0:
+$checkCnt = $checkCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+print show vgroups
+sql show vgroups
+#if $rows != 4 then
+#  print rows: $rows
+#  sleep 2000
+#  goto wait_vgroup_chang_0
+#endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$vg2Dnode3Status = $data5_2
+$vg2Dnode2Status = $data7_2
+
+if $vg2Dnode3Status != offline then
+  sleep 2000
+  goto wait_vgroup_chang_0
+endi
+if $vg2Dnode2Status != master then
+  sleep 2000
+  goto wait_vgroup_chang_0
+endi
+
+
+sleep 3000
+print ============== step3: restart dnode3
+system sh/exec.sh -n dnode3 -s start
+
+$checkCnt = 0
+wait_vgroup_chang_1:
+$checkCnt = $checkCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+print show vgroups
+sql show vgroups
+#if $rows != 4 then
+#  print rows: $rows
+#  sleep 2000
+#  goto wait_vgroup_chang_1
+#endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$vg2Dnode3Status = $data5_2
+$vg2Dnode2Status = $data7_2
+
+if $vg2Dnode3Status != slave then
+  sleep 2000
+  goto wait_vgroup_chang_1
+endi
+if $vg2Dnode2Status != master then
+  sleep 2000
+  goto wait_vgroup_chang_1
+endi
+
+sleep 3000
+print ============== step4: stop dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+$checkCnt = 0
+wait_vgroup_chang_2:
+$checkCnt = $checkCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+print show vgroups
+sql show vgroups
+#if $rows != 4 then
+#  print rows: $rows
+#  sleep 2000
+#  goto wait_vgroup_chang_2
+#endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$vg2Dnode3Status = $data5_2
+$vg2Dnode2Status = $data7_2
+
+if $vg2Dnode3Status != master then
+  sleep 2000
+  goto wait_vgroup_chang_2
+endi
+if $vg2Dnode2Status != offline then
+  sleep 2000
+  goto wait_vgroup_chang_2
+endi
+
+
+sleep 3000
+print ============== step5: restart dnode2
+system sh/exec.sh -n dnode2 -s start
+
+$checkCnt = 0
+wait_vgroup_chang_3:
+$checkCnt = $checkCnt + 1
+if $loopCnt == 10 then
+  return -1
+endi
+print show vgroups
+sql show vgroups
+#if $rows != 4 then
+#  print rows: $rows
+#  sleep 2000
+#  goto wait_vgroup_chang_3
+#endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+$vg2Dnode3Status = $data5_2
+$vg2Dnode2Status = $data7_2
+
+if $vg2Dnode2Status != slave then
+  sleep 2000
+  goto wait_vgroup_chang_3
+endi
+if $vg2Dnode3Status != master then
+  sleep 2000
+  goto wait_vgroup_chang_3
+endi
+
+sleep 3000
+print **** **** **** (loop_cnt: $loop_cnt ) end, continue...... **** **** **** ****
+$loop_cnt = $loop_cnt + 1
+if $loop_cnt == 50 then
+  return 0
+endi
+goto loop_cluster_do
diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2d6c194ef806022f7ff5a81d9f906365c49cd197
--- /dev/null
+++ b/tests/script/unique/column/replica3.sim
@@ -0,0 +1,43 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+sql create database db replica 3 
+sql use db
+sql create table db.mt (ts timestamp, f1 float, f2 float, f3 float, f4 float, f5 float, f6 float, f7 float, f8 float, f9 float, f10 float) tags (t1 int, t2 int)
+sql create table db.tb1 using db.mt tags(1, 2)
+sleep 3001
+
+$x = 1000
+while $x < 1010
+  sql insert into tb1 values (now+1s , $x , $x , $x , $x , $x , $x , $x , $x , $x , $x ) 
+  $x = $x + 1
+endw 
+
+sql_error create database d1 replica 2 wallevel 0
+sql_error create database d2 replica 1 wallevel 0
+sql_error alter database d2 replica 2
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/column/testSuite.sim b/tests/script/unique/column/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8663e9f30518e1092bc63b60e429753fc7ad8712
--- /dev/null
+++ b/tests/script/unique/column/testSuite.sim
@@ -0,0 +1 @@
+run unique/column/replica3.sim
diff --git a/tests/script/unique/db/back_insert.sim b/tests/script/unique/db/back_insert.sim
new file mode 100644
index 0000000000000000000000000000000000000000..43831cca95b49218719c5172c3d2d96ad3500896
--- /dev/null
+++ b/tests/script/unique/db/back_insert.sim
@@ -0,0 +1,7 @@
+sql connect
+$x = 1
+begin:
+  sql insert into db.tb values(now, $x ) -x begin  
+  #print ===> insert successed $x 
+  $x = $x + 1   
+goto begin
\ No newline at end of file
diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim
new file mode 100644
index 0000000000000000000000000000000000000000..caff3c6a7898090b307d487ccdf2b8ac0dd7a1f3
--- /dev/null
+++ b/tests/script/unique/db/commit.sim
@@ -0,0 +1,125 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnode1 as master
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 3000
+
+print ========= start other dnodes
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+print ======== step1 create db
+sql create database commitdb replica 1 days 7 keep 30
+sql use commitdb
+sql create table tb (ts timestamp, i int)
+
+$x = 1
+while $x < 41
+  $time = $x . m
+  sql insert into tb values (now + $time , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from tb order by ts desc
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != 40 then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+print ======== step2 stop dnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql select * from tb order by ts desc
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != 40 then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+$oldnum = $rows 
+$num = $rows + 2
+
+print ======== step3 import old data
+sql import into tb values (now - 10d , -10 )
+  
+sql import into tb values (now - 11d , -11 )
+
+sql select * from tb order by ts desc
+print ===> rows $rows expect $num
+print ===> last $data01 expect  $data01
+
+if $rows != $num then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+print ======== step4 import new data
+sql_error import into tb values (now + 30d , 30 )
+sql_error import into tb values (now + 31d , 31 )
+
+sql select * from tb order by ts desc
+print ===> rows $rows
+print ===> last $data01
+
+if $rows != $num then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+print ======== step5 stop dnode
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql select * from tb
+print ===> rows $rows
+print ===> last $data01
+
+sql select * from tb order by ts desc
+if $rows != $num then
+	return -1
+endi
+if $data01 != 40 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fee47caadb7ab4cdab9db59b804a03eeb07a0149
--- /dev/null
+++ b/tests/script/unique/db/delete.sim
@@ -0,0 +1,104 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 2
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 2
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 2
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 1000
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 1000
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 1000
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ======== step1 
+sql create database db replica 3 blocks 3
+sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$tbPrefix = db.t
+$i = 0
+while $i < 2000
+  $tb = $tbPrefix . $i
+  sql create table $tb using db.mt tags( $i )
+  $i = $i + 1
+endw 
+
+sleep 2500
+
+sql show db.vgroups
+if $rows != 2 then 
+  return -1
+endi 
+
+print ======== step2
+sql drop database db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi 
+
+sleep 3000
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 0 then
+	return -1
+endi
+if $data2_3 != 0 then
+	return -1
+endi
+
+print ======== step3
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+step3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show mnodes
+print dnode1 role $data2_1
+if $data2_1 != master then
+  goto step3
+endi
+
+sleep 1000
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fd92c160d9fcc8f2b5f2e93e2d656c0f48a8e80e
--- /dev/null
+++ b/tests/script/unique/db/delete_part.sim
@@ -0,0 +1,185 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
+system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 8
+system sh/cfg.sh -n dnode3 -c maxVgroupsPerDb -v 8
+system sh/cfg.sh -n dnode4 -c maxVgroupsPerDb -v 8
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$loop = 0
+begin:
+
+    $db = db . $loop
+	
+	print ======== step1 $loop
+	sql create database $db
+	sql use $db
+	
+	sql create table t11 (ts timestamp, i int)
+	sql insert into t11 values(now, 1 )
+	sql create table t12 (ts timestamp, i int)
+	sql insert into t12 values(now, 1 )
+	sql create table t13 (ts timestamp, i int)
+	sql insert into t13 values(now, 1 )
+	sql create table t14 (ts timestamp, i int)
+	sql insert into t14 values(now, 1 )
+	sleep 1200
+
+	sql create table t21 (ts timestamp, i int)
+	sql insert into t21 values(now, 1 )
+	sql create table t22 (ts timestamp, i int)
+	sql insert into t22 values(now, 1 )
+	sql create table t23 (ts timestamp, i int)
+	sql insert into t23 values(now, 1 )
+	sql create table t24 (ts timestamp, i int)
+	sql insert into t24 values(now, 1 )
+	sleep 1200
+
+	sql create table t31 (ts timestamp, i int)
+	sql insert into t31 values(now, 1 )
+	sql create table t32 (ts timestamp, i int)
+	sql insert into t32 values(now, 1 )
+	sql create table t33 (ts timestamp, i int)
+	sql insert into t33 values(now, 1 )
+	sql create table t34 (ts timestamp, i int)
+	sql insert into t34 values(now, 1 )
+	sleep 1200
+
+	sql create table t41 (ts timestamp, i int)
+	sql insert into t41 values(now, 1 )
+	sql create table t42 (ts timestamp, i int)
+	sql insert into t42 values(now, 1 )
+	sql create table t43 (ts timestamp, i int)
+	sql insert into t43 values(now, 1 )
+	sql create table t44 (ts timestamp, i int)
+	sql insert into t44 values(now, 1 )
+	sleep 1200
+
+	sql create table t51 (ts timestamp, i int)
+	sql insert into t51 values(now, 1 )
+	sql create table t52 (ts timestamp, i int)
+	sql insert into t52 values(now, 1 )
+	sql create table t53 (ts timestamp, i int)
+	sql insert into t53 values(now, 1 )
+	sql create table t54 (ts timestamp, i int)
+	sql insert into t54 values(now, 1 )
+	sleep 1200
+
+	sql create table t61 (ts timestamp, i int)
+	sql insert into t61 values(now, 1 )
+	sql create table t62 (ts timestamp, i int)
+	sql insert into t62 values(now, 1 )
+	sql create table t63 (ts timestamp, i int)
+	sql insert into t63 values(now, 1 )
+	sql create table t64 (ts timestamp, i int)
+	sql insert into t64 values(now, 1 )
+	sleep 1200
+
+	sql create table t71 (ts timestamp, i int)
+	sql insert into t71 values(now, 1 )
+	sql create table t72 (ts timestamp, i int)
+	sql insert into t72 values(now, 1 )
+	sql create table t73 (ts timestamp, i int)
+	sql insert into t73 values(now, 1 )
+	sql create table t74 (ts timestamp, i int)
+	sql insert into t74 values(now, 1 )
+	sleep 1200
+
+	sql create table t81 (ts timestamp, i int)
+	sql insert into t81 values(now, 1 )
+	sql create table t82 (ts timestamp, i int)
+	sql insert into t82 values(now, 1 )
+	sql create table t83 (ts timestamp, i int)
+	sql insert into t83 values(now, 1 )
+	sql create table t84 (ts timestamp, i int)
+	sql insert into t84 values(now, 1 )
+	sleep 1200
+
+	sql show dnodes
+	print dnode1 openVnodes $data2_1
+	print dnode2 openVnodes $data2_2
+	if $data2_1 != 4 then
+		return -1
+	endi
+	if $data2_2 != 4 then
+		return -1
+	endi
+
+	print ======== step2 $loop
+	
+	system sh/exec.sh -n dnode2 -s stop
+	sleep 1000
+	print ==> drop database $db 
+	sql drop database $db 
+	
+	print ======== step3 $loop
+	sleep 2000
+	system sh/exec.sh -n dnode2 -s start
+	sleep 15000
+
+	sql show dnodes
+	print dnode1 openVnodes $data2_1 $data4_1
+	print dnode2 openVnodes $data2_2 $data4_2
+	if $data2_1 != 0 then
+		return -1
+	endi
+	if $data2_2 != 0 then
+		return -1
+	endi
+	if $data4_1 != ready then
+		return -1
+	endi
+	if $data4_2 != ready then
+		return -1
+	endi
+	
+	print ===> test times : $loop
+    if $loop > 3 then	  
+	  return 0
+	endi
+
+	$loop = $loop + 1
+
+	sql reset query cache
+	sleep 1000
+	
+goto begin
+  
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e29cf1ba73b471eaab1de058cf9a26752429aebb
--- /dev/null
+++ b/tests/script/unique/db/replica_add12.sim
@@ -0,0 +1,238 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 1
+sql create database d2 replica 1
+sql create database d3 replica 1
+sql create database d4 replica 1
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d1.t1 values(now, 1)
+sql insert into d2.t2 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+sleep 2000
+
+sql show dnodes
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
+
+if $data2_1 != 0 then
+   return -1
+endi
+
+if $data2_2 != 2 then
+   return -1
+endi
+
+if $data2_3 != 2 then
+   return -1
+endi
+
+print ======== step2
+sql alter database d1 replica 2
+sql alter database d2 replica 2
+sql alter database d3 replica 2
+sql alter database d4 replica 2
+sleep 10000
+
+print ======== step3
+	
+sql show dnodes
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
+
+if $data2_1 != 0 then
+   return -1
+endi
+
+if $data2_2 != 4 then
+  return -1
+endi
+
+if $data2_3 != 4 then
+  return -1
+endi
+
+print ======== step4
+sql insert into d1.t1 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+sql reset query cache
+sleep 2000
+
+print ========= step5 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql_error select * from d1.t1
+sql_error select * from d2.t2
+sql_error select * from d3.t3
+sql_error select * from d4.t4
+
+print ===== insert data
+
+sql_error insert into d1.t1 values(now, 3)
+sql_error insert into d2.t2 values(now, 3)
+sql_error insert into d3.t3 values(now, 3)
+sql_error insert into d4.t4 values(now, 3)
+
+print ========= step6
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 3)
+sql insert into d2.t2 values(now, 3)
+sql insert into d3.t3 values(now, 3)
+sql insert into d4.t4 values(now, 3)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+print ========= step61
+
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql_error insert into d1.t1 values(now, 3)
+sql_error insert into d2.t2 values(now, 3)
+sql_error insert into d3.t3 values(now, 3)
+sql_error insert into d4.t4 values(now, 3)
+
+sql_error select * from d1.t1
+sql_error select * from d2.t2
+sql_error select * from d3.t3
+sql_error select * from d4.t4
+
+print ========= step7
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 5)
+sql insert into d2.t2 values(now, 5)
+sql insert into d3.t3 values(now, 5)
+sql insert into d4.t4 values(now, 5)
+
+sql select * from d1.t1
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 4 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1df49ba6582b3e1502e9b19ac3b11626175a295e
--- /dev/null
+++ b/tests/script/unique/db/replica_add13.sim
@@ -0,0 +1,269 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 1
+sql create database d2 replica 1
+sql create database d3 replica 1
+sql create database d4 replica 1
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d1.t1 values(1589529000011, 1)
+sql insert into d2.t2 values(1589529000021, 1)
+sql insert into d3.t3 values(1589529000031, 1)
+sql insert into d4.t4 values(1589529000041, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql alter database d1 replica 3
+sql alter database d2 replica 3
+sql alter database d3 replica 3
+sql alter database d4 replica 3
+sleep 10000
+
+print ======== step3
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
+print dnode4 ==> openVnodes: $data2_4
+
+if $data2_1 != 0 then
+   return -1
+endi
+
+if $data2_2 != 4 then
+   return -1
+endi
+
+if $data2_3 != 4 then
+   return -1
+endi
+
+if $data2_3 != 4 then
+   return -1
+endi
+
+print ======== step4
+sql insert into d1.t1 values(1589529000012, 2)
+sql insert into d2.t2 values(1589529000022, 2)
+sql insert into d3.t3 values(1589529000032, 2)
+sql insert into d4.t4 values(1589529000042, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+print ========= step5 
+sql reset query cache
+sleep 1000
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1589529000013, 3)
+sql insert into d2.t2 values(1589529000023, 3)
+sql insert into d3.t3 values(1589529000033, 3)
+sql insert into d4.t4 values(1589529000043, 3)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+print ========= step6
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1589529000014, 4)
+sql insert into d2.t2 values(1589529000024, 4)
+sql insert into d3.t3 values(1589529000034, 4)
+sql insert into d4.t4 values(1589529000044, 4)
+
+sql select * from d1.t1
+print select * from d1.t1 $rows
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d2.t2
+print select * from d2.t2 $rows
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d3.t3
+print select * from d3.t3 $rows
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d4.t4
+print select * from d4.t4 $rows
+if $rows != 4 then
+	return -1
+endi
+
+print ========= step7
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1589529000015, 5)
+sql insert into d2.t2 values(1589529000025, 5)
+sql insert into d3.t3 values(1589529000035, 5)
+sql insert into d4.t4 values(1589529000045, 5)
+
+sql select * from d1.t1
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 5 then
+	return -1
+endi
+
+print ========= step8
+system sh/exec.sh -n dnode4 -s start
+sleep 5000
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1589529000016, 6)
+sql insert into d2.t2 values(1589529000026, 6)
+sql insert into d3.t3 values(1589529000036, 6)
+sql insert into d4.t4 values(1589529000046, 6)
+
+sql select * from d1.t1
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 6 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5da73cd117ef218d1421d4f7f6ee7026c9e6bef3
--- /dev/null
+++ b/tests/script/unique/db/replica_add23.sim
@@ -0,0 +1,266 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 2
+sql create database d2 replica 2
+sql create database d3 replica 2
+sql create database d4 replica 2
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d1.t1 values(1588262400001, 1)
+sql insert into d2.t2 values(1588262400001, 1)
+sql insert into d3.t3 values(1588262400001, 1)
+sql insert into d4.t4 values(1588262400001, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2
+sql alter database d1 replica 3
+sql alter database d2 replica 3
+sql alter database d3 replica 3
+sql alter database d4 replica 3
+sleep 10000
+
+print ======== step3
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
+print dnode4 ==> openVnodes: $data2_4
+
+if $data2_1 != 0 then
+   return -1
+endi
+
+if $data2_2 != 4 then
+   return -1
+endi
+
+if $data2_3 != 4 then
+   return -1
+endi
+
+if $data2_3 != 4 then
+   return -1
+endi
+
+print ======== step4
+sql insert into d1.t1 values(1588262400002, 2)
+sql insert into d2.t2 values(1588262400002, 2)
+sql insert into d3.t3 values(1588262400002, 2)
+sql insert into d4.t4 values(1588262400002, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+print ========= step5 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1588262400003, 3)
+sql insert into d2.t2 values(1588262400003, 3)
+sql insert into d3.t3 values(1588262400003, 3)
+sql insert into d4.t4 values(1588262400003, 3)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+print ========= step6
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1588262400004, 4)
+sql insert into d2.t2 values(1588262400004, 4)
+sql insert into d3.t3 values(1588262400004, 4)
+sql insert into d4.t4 values(1588262400004, 4)
+
+sql select * from d1.t1
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 4 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 4 then
+	return -1
+endi
+
+print ========= step7
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+system sh/exec.sh -n dnode4 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1588262400005, 5)
+sql insert into d2.t2 values(1588262400005, 5)
+sql insert into d3.t3 values(1588262400005, 5)
+sql insert into d4.t4 values(1588262400005, 5)
+
+sql select * from d1.t1
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 5 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 5 then
+	return -1
+endi
+
+print ========= step8
+system sh/exec.sh -n dnode4 -s start
+sleep 5000
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(1588262400006, 6)
+sql insert into d2.t2 values(1588262400006, 6)
+sql insert into d3.t3 values(1588262400006, 6)
+sql insert into d4.t4 values(1588262400006, 6)
+
+sql select * from d1.t1
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 6 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 6 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim
new file mode 100644
index 0000000000000000000000000000000000000000..de3f6203d2f9192d8f119145c6a6b8ac6cd674f8
--- /dev/null
+++ b/tests/script/unique/db/replica_part.sim
@@ -0,0 +1,153 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 3
+sql create database d2 replica 3
+sql create database d3 replica 3
+sql create database d4 replica 3
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d2.t2 values(now, 1)
+sql insert into d1.t1 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ========= step2 alter db
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+sql alter database d1 replica 2
+sql alter database d2 replica 2
+sql alter database d3 replica 2
+sql alter database d4 replica 2
+sleep 5000
+
+print ========= step3
+system sh/exec.sh -n dnode2 -s start
+sleep 10000
+
+print ========= step4
+sql insert into d1.t1 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+print ========= step5
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql insert into d1.t1 values(now, 3) -x s1
+s1:
+sql insert into d2.t2 values(now, 3) -x s2
+s2:
+sql insert into d3.t3 values(now, 3) -x s3
+s3:
+sql insert into d4.t4 values(now, 3) -x s4
+s4:
+
+print ========= step6
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(now, 4) -x s5
+s5:
+sql insert into d2.t2 values(now, 4) -x s6
+s6:
+sql insert into d3.t3 values(now, 4) -x s7
+s7:
+sql insert into d4.t4 values(now, 4) -x s8
+s8:
+
+print ========= step7
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 5)
+sql insert into d2.t2 values(now, 5)
+sql insert into d3.t3 values(now, 5)
+sql insert into d4.t4 values(now, 5)
+
+sql select * from d1.t1
+sql select * from d2.t2
+sql select * from d3.t3
+sql select * from d4.t4
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a64f4370c89a162a0fd6cd8235eeebeee7e03806
--- /dev/null
+++ b/tests/script/unique/db/replica_reduce21.sim
@@ -0,0 +1,149 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 2
+sql create database d2 replica 2
+sql create database d3 replica 2
+sql create database d4 replica 2
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d2.t2 values(now, 1)
+sql insert into d1.t1 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ======== step2 create d5
+sql create database d5 replica 1
+
+print ========= step3 alter d1
+sql alter database d1 replica 1
+sleep 12000
+
+print ========= step4 query d1
+sql insert into d1.t1 values(now, 2)
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+print ========= step5 query d5
+sql create table d5.t5 (ts timestamp, i int)
+sql insert into d5.t5 values(now, 1);
+sql select * from d5.t5
+if $rows != 1 then
+	return -1
+endi
+return
+print ========= step7 drop d1
+sql drop database d1
+sleep 5000
+
+sql reset query cache
+print ========= step8
+sql insert into d5.t5 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d5.t5
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+print ======== step9 stop dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d5.t5 values(now, 3)
+sql insert into d2.t2 values(now, 3)
+sql insert into d3.t3 values(now, 3)
+sql insert into d4.t4 values(now, 3)
+
+sql select * from d5.t5
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3ed0a1e3b9b98dc1911142278e31ccfad25d1eb6
--- /dev/null
+++ b/tests/script/unique/db/replica_reduce31.sim
@@ -0,0 +1,190 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 3
+sql create database d2 replica 3
+sql create database d3 replica 3
+sql create database d4 replica 3
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d1.t1 values(now, 1)
+sql insert into d2.t2 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ========= step2 alter db
+sql_error alter database d1 replica 1
+sql_error alter database d2 replica 1
+sql_error alter database d3 replica 1
+sql alter database d1 replica 2
+sql alter database d2 replica 2
+sql alter database d3 replica 2
+
+sleep 8000
+
+sql alter database d1 replica 1
+sql alter database d2 replica 1
+sql alter database d3 replica 1
+
+sleep 8000
+
+print ========= step3
+sql reset query cache
+sleep 1000
+
+sql insert into d1.t1 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+print ========= step4 alter db
+sql alter database d1 replica 2
+sql alter database d2 replica 2
+sql alter database d3 replica 2
+sleep 8000
+
+sql insert into d1.t1 values(now, 3)
+sql insert into d2.t2 values(now, 3)
+sql insert into d3.t3 values(now, 3)
+sql insert into d4.t4 values(now, 3)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+print ========= step4
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql insert into d1.t1 values(now, 4) -x step1
+step1:
+sql insert into d2.t2 values(now, 4) -x step2
+step2:
+sql insert into d3.t3 values(now, 4) -x step3
+step3:
+sql insert into d4.t4 values(now, 4) -x step4
+step4:
+
+print ========= step5
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql insert into d1.t1 values(now, 5) -x step5
+step5:
+sql insert into d2.t2 values(now, 5) -x step6
+step6:
+sql insert into d3.t3 values(now, 5) -x step7
+step7:
+sql insert into d4.t4 values(now, 5) -x step8
+step8:
+
+print ========= step6
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 6)
+sql insert into d2.t2 values(now, 6)
+sql insert into d3.t3 values(now, 6)
+sql insert into d4.t4 values(now, 6)
+
+sql select * from d1.t1
+sql select * from d2.t2
+sql select * from d3.t3
+sql select * from d4.t4
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim
new file mode 100644
index 0000000000000000000000000000000000000000..664a286be4f41284ddba42f3d053d9764e7a6408
--- /dev/null
+++ b/tests/script/unique/db/replica_reduce32.sim
@@ -0,0 +1,155 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ======== step1 
+sql create database d1 replica 3
+sql create database d2 replica 3
+sql create database d3 replica 3
+sql create database d4 replica 3
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d2.t2 values(now, 1)
+sql insert into d1.t1 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+print ========= step2 alter db
+sql alter database d1 replica 2
+sql alter database d2 replica 2
+sql alter database d3 replica 2
+sql alter database d4 replica 2
+sleep 12000
+
+print ========= step3
+sql insert into d1.t1 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+sql reset query cache
+sleep 1000
+
+print ========= step4
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql_error insert into d1.t1 values(now, 3)
+sql_error insert into d2.t2 values(now, 3)
+sql_error insert into d3.t3 values(now, 3)
+sql_error insert into d4.t4 values(now, 3)
+
+sql_error select * from d1.t1
+sql_error select * from d2.t2
+sql_error select * from d3.t3
+sql_error select * from d4.t4
+
+print ========= step5
+system sh/exec.sh -n dnode2 -s start
+
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+sql_error insert into d1.t1 values(now, 3)
+sql_error insert into d2.t2 values(now, 3)
+sql_error insert into d3.t3 values(now, 3)
+sql_error insert into d4.t4 values(now, 3)
+
+print ========= step6
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 5)
+sql insert into d2.t2 values(now, 5)
+sql insert into d3.t3 values(now, 5)
+sql insert into d4.t4 values(now, 5)
+
+sql select * from d1.t1
+print d1.t1 $rows
+
+sql select * from d2.t2
+print d2.t2 $rows
+
+sql select * from d3.t3
+print d3.t3 $rows
+
+sql select * from d4.t4
+print d4.t4 $rows
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/db/testSuite.sim b/tests/script/unique/db/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..adc1883a71c32d0b18e17a994f32e7ddd9577e9b
--- /dev/null
+++ b/tests/script/unique/db/testSuite.sim
@@ -0,0 +1,10 @@
+run unique/db/commit.sim
+run unique/db/delete.sim
+run unique/db/replica_add12.sim
+run unique/db/replica_add13.sim
+run unique/db/replica_add23.sim
+run unique/db/replica_reduce21.sim
+run unique/db/replica_reduce32.sim
+run unique/db/replica_reduce31.sim
+run unique/db/replica_part.sim
+run unique/db/delete_part.sim
diff --git a/tests/script/unique/dnode/alternativeRole.sim b/tests/script/unique/dnode/alternativeRole.sim
new file mode 100644
index 0000000000000000000000000000000000000000..af627490ba8671203d740178ae8b42e22b2c3a74
--- /dev/null
+++ b/tests/script/unique/dnode/alternativeRole.sim
@@ -0,0 +1,97 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 0
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql show dnodes
+print dnode1 $data5_1
+print dnode1 $data5_2
+print dnode1 $data5_3
+
+if $data5_1 != mnode then
+  return -1
+endi
+if $data5_2 != vnode then
+  return -1
+endi
+if $data5_3 != any then
+  return -1
+endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+if $data2_1 != master then
+  return -1
+endi
+if $data2_2 != null then
+  return -1
+endi
+if $data2_3 != slave then
+  return -1
+endi
+
+print ========== step2
+sql create database d1 
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d1.t2 (ts timestamp, i int)
+sql create table d1.t3 (ts timestamp, i int)
+sql create table d1.t4 (ts timestamp, i int)
+sql create table d1.t5 (ts timestamp, i int)
+sql create table d1.t6 (ts timestamp, i int)
+sql create table d1.t7 (ts timestamp, i int)
+sql create table d1.t8 (ts timestamp, i int)
+
+sql show dnodes
+print dnode1 $data2_1
+print dnode2 $data2_2
+print dnode3 $data2_3
+
+if $data2_1 != 0 then
+  return -1
+endi
+if $data2_2 != 1 then
+  return -1
+endi
+if $data2_3 != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..10d185f3536c1c7b4c61bc9401655d058ae17e88
--- /dev/null
+++ b/tests/script/unique/dnode/balance1.sim
@@ -0,0 +1,343 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 3000
+
+sql create database d1 
+sql create table d1.t1 (t timestamp, i int) 
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 1 then
+	return -1
+endi
+
+print ========== step2
+sleep 2000
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	goto show2
+endi
+if $data2_2 != 1 then
+	goto show2
+endi
+
+print ========== step3
+sql create database d2 
+sql create table d2.t2 (t timestamp, i int) 
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 2 then
+	return -1
+endi
+
+print ========== step4
+sql drop dnode $hostname2
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 2 then
+    goto show4
+endi
+if $data2_2 != null then
+    goto show4
+endi
+if $rows != 1 then
+    goto show4
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+print ========== step5
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 0 then
+  goto show5
+endi
+if $data2_2 != null then
+  goto show5
+endi
+if $data2_3 != 2 then
+  goto show5
+endi
+
+print ========== step6
+sql create database d3 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != null then
+	return -1
+endi
+if $data2_3 != 3 then
+	return -1
+endi
+
+print ========== step7
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+show7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+  goto show7
+endi
+if $data2_2 != null then
+  goto show7
+endi
+if $data2_3 != 2 then
+  goto show7
+endi
+if $data2_4 != 1 then
+  goto show7
+endi
+
+print ========== step8
+sql create database d4 
+sql create table d4.t4 (t timestamp, i int)
+sql insert into d4.t4 values(now+1s, 45)
+sql insert into d4.t4 values(now+2s, 44)
+sql insert into d4.t4 values(now+3s, 43)
+sql insert into d4.t4 values(now+4s, 42)
+sql insert into d4.t4 values(now+5s, 41)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != null then
+	return -1
+endi
+if $data2_3 != 2 then
+	return -1
+endi
+if $data2_4 != 2 then
+	return -1
+endi
+
+print ========== step9
+sql drop dnode $hostname3
+
+$x = 0
+show9: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+
+if $data2_1 != 0 then
+  goto show9
+endi
+if $data2_2 != null then
+  goto show9
+endi
+if $data2_3 != null then
+  goto show9
+endi
+if $data2_4 != 4 then
+  goto show9
+endi
+
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+
+sql reset query cache
+sleep 1000
+
+print ========== step10
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+sql select * from d4.t4 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 41 then
+  return -1
+endi
+if $data11 != 42 then
+  return -1
+endi
+if $data21 != 43 then
+  return -1
+endi
+if $data31 != 44 then
+  return -1
+endi
+if $data41 != 45 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..23897df690634759de027c9b26ad0449694242a9
--- /dev/null
+++ b/tests/script/unique/dnode/balance2.sim
@@ -0,0 +1,287 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+sql create database d1 replica 2  
+sql create table d1.t1 (t timestamp, i int)
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql create database d2 replica 2  
+sql create table d2.t2 (t timestamp, i int) 
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 2 then
+	return -1
+endi
+if $data2_3 != 2 then
+	return -1
+endi
+
+print ========== step2
+sql drop dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 2 then
+	goto show2
+endi
+if $data2_2 != null then
+	goto show2
+endi
+if $data2_3 != 2 then
+	goto show2
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+print ========== step3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then
+		return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+	goto show3
+endi
+if $data2_2 != null then
+	goto show3
+endi
+if $data2_3 != 2 then
+	goto show3
+endi
+if $data2_4 != 2 then
+	goto show3
+endi
+
+print ========== step4
+sql create database d3 replica 2 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != null then
+	return -1
+endi
+if $data2_3 != 3 then
+	return -1
+endi
+if $data2_4 != 3 then
+	return -1
+endi
+
+print ========== step5
+sql create dnode $hostname5
+system sh/exec.sh -n dnode5 -s start
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+if $data2_1 != 0 then
+	goto show5
+endi
+if $data2_2 != null then
+	goto show5
+endi
+if $data2_3 != 2 then
+	goto show5
+endi
+if $data2_4 != 2 then
+	goto show5
+endi
+if $data2_5 != 2 then
+	goto show5
+endi
+
+print ========== step6
+sql drop dnode $hostname3
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+if $data2_1 != 0 then
+	goto show6
+endi
+if $data2_2 != null then
+	goto show6
+endi
+if $data2_3 != null then
+	goto show6
+endi
+if $data2_4 != 3 then
+	goto show6
+endi
+if $data2_5 != 3 then
+	goto show6
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+print ========== step7
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9f7f3abb8bde66fdad63351d76e6d11e64db38aa
--- /dev/null
+++ b/tests/script/unique/dnode/balance3.sim
@@ -0,0 +1,315 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode6 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+system sh/cfg.sh -n dnode5 -c wallevel -v 1
+system sh/cfg.sh -n dnode6 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode6 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+
+sql create database d1 replica 3  
+sql create table d1.t1 (t timestamp, i int) 
+sql insert into d1.t1 values(now+1s, 15) 
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql create database d2 replica 3  
+sql create table d2.t2 (t timestamp, i int) 
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 2 then
+	return -1
+endi
+if $data2_3 != 2 then
+	return -1
+endi
+if $data2_4 != 2 then
+	return -1
+endi
+
+print ========== step2
+sql drop dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then 
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+
+if $data2_1 != 2 then
+	goto show2
+endi
+if $data2_2 != null then
+	goto show2
+endi
+if $data2_3 != 2 then
+	goto show2
+endi
+if $data2_4 != 2 then
+	goto show2
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+print ========== step
+sql create dnode $hostname5
+system sh/exec.sh -n dnode5 -s start
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 4000
+	if $x == 15 then 
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+
+if $data2_1 != 0 then
+	goto show3
+endi
+if $data2_2 != null then
+	goto show3
+endi
+if $data2_3 != 2 then
+	goto show3
+endi
+if $data2_4 != 2 then
+	goto show3
+endi
+if $data2_5 != 2 then
+	goto show3
+endi
+
+print ========== step4
+sql create database d3 replica 3 
+sql create table d3.t3 (t timestamp, i int) 
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then 
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+
+if $data2_1 != 0 then
+	goto show4
+endi
+if $data2_2 != null then
+	goto show4
+endi
+if $data2_3 != 3 then
+	goto show4
+endi
+if $data2_4 != 3 then
+	goto show4
+endi
+if $data2_5 != 3 then
+	goto show4
+endi
+
+print ========== step5
+sql create dnode $hostname6
+system sh/exec.sh -n dnode6 -s start
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode6 openVnodes $data2_6
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+
+if $data2_1 != 0 then
+	goto show5
+endi
+if $data2_6 != 2 then
+	goto show5
+endi
+
+sleep 8000
+
+print ========== step6
+sql drop dnode $hostname3
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 20 then 
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode6 openVnodes $data2_6
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+print dnode5 openVnodes $data2_5
+
+if $data2_1 != 0 then
+	goto show6
+endi
+if $data2_6 != 3 then
+	goto show6
+endi
+if $data2_3 != null then
+	goto show6
+endi
+if $data2_4 != 3 then
+	goto show6
+endi
+if $data2_5 != 3 then
+	goto show6
+endi
+
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+print ========== step7
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
new file mode 100644
index 0000000000000000000000000000000000000000..da8197e22df73edfd1d5c6f02d014a45511fbae0
--- /dev/null
+++ b/tests/script/unique/dnode/balancex.sim
@@ -0,0 +1,215 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 3000
+
+sql create database d1 
+sql create table d1.t1 (t timestamp, i int)
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql create database d2 
+sql create table d2.t2 (t timestamp, i int)
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 2 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	goto show2
+endi
+if $data2_2 != 2 then
+	goto show2
+endi
+
+print ========== step3
+sql create database d3 replica 2 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 1 then
+	goto show3
+endi
+if $data2_2 != 3 then
+	goto show3
+endi
+
+print ========== step3
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 0 then
+	goto show4
+endi
+if $data2_2 != 2 then
+	goto show4
+endi
+if $data2_3 != 2 then
+	goto show4
+endi
+
+print ========== step5
+sql drop dnode $hostname2
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 1 then
+	goto show5
+endi
+if $data2_2 != null then
+	goto show5
+endi
+if $data2_3 != 3 then
+	goto show5
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+sql reset query cache
+sleep 1000
+
+print ========== step6
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5382e88e536596682636496e9e3f66bc121b1561
--- /dev/null
+++ b/tests/script/unique/dnode/basic1.sim
@@ -0,0 +1,90 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sql connect
+
+print =============== show dnodes
+sql show dnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data01 != 192.168.0.1 then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data01 != 192.168.0.1 then 
+  return -1
+endi
+
+print =============== create dnodes
+sql create dnode $hostname2
+sql show dnodes;
+if $rows != 2 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data01 != 192.168.0.1 then 
+  return -1
+endi
+
+if $data10 != 2 then 
+  return -1
+endi
+
+if $data11 != 192.168.0.2 then 
+  return -1
+endi
+
+sql show mnodes;
+if $rows != 1 then 
+  return -1
+endi
+
+if $data00 != 1 then 
+  return -1
+endi
+
+if $data01 != 192.168.0.1 then 
+  return -1
+endi
+
+print =============== create table
+sql create database d1;
+sql create database d2;
+sql create database d3;
+sql create database d4;
+sql create database d5;
+
+sql create table d1.t1 (ts timestamp, i int);
+sql create table d2.t1 (ts timestamp, i int);
+sql create table d3.t1 (ts timestamp, i int);
+sql create table d4.t1 (ts timestamp, i int);
+
+sql show dnodes;
+if $data05 != 2 then 
+  return -1
+endi
+
+if $data15 != 2 then 
+  return -1
+endi
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
new file mode 100644
index 0000000000000000000000000000000000000000..519aae6ca9f64b14a4488889a1e3eb6ead884467
--- /dev/null
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -0,0 +1,61 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode2 -c monitor -v 0
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sleep 5000
+
+sql show dnodes
+print dnode1 openVnodes $data3_1
+if $data3_1 != 3 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 30 then
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+if $data3_1 != 4 then
+	goto show2
+endi
+if $data3_2 != 3 then
+	goto show2
+endi
+
+print ========== step3
+sleep 3000
+sql show log.tables
+
+print $data00
+print $data10
+print $data20
+print $data30
+print $data40
+print $data50
+
+if $rows != 5 then
+	return -1
+endi
diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..02d03dee97be0f2de62b3f8eb18194c595e7b050
--- /dev/null
+++ b/tests/script/unique/dnode/offline1.sim
@@ -0,0 +1,77 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 5
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 5
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 5
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != ready then
+  return -1
+endi
+
+print ========== step2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 8000
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != offline then
+  return -1
+endi
+
+print ========== step3
+sleep 10000
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != null then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e8a5460de47919f42187f26a05169fa99ce47dd0
--- /dev/null
+++ b/tests/script/unique/dnode/offline2.sim
@@ -0,0 +1,126 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10
+system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 5
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 5
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 5
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+sql create database d1 replica 2 
+sql create table d1.t1(ts timestamp, i int)
+sql insert into d1.t1 values(1588262400001, 1)
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != ready then
+  return -1
+endi
+
+print ========== step2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 8000
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != offline then
+  return -1
+endi
+
+print ========== step3
+sleep 10000
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode1 $data4_2
+
+if $data4_1 != ready then
+  return -1
+endi
+if $data4_2 != dropping then
+  return -1
+endi
+
+print ========== step4
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode2 -s start
+sql drop dnode $hostname2
+
+sleep 5000
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 5000
+	if $x == 10 then 
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 $data4_1
+print dnode2 $data4_2
+print dnode3 $data4_3
+if $data4_1 != ready then
+  goto show4
+endi
+if $data4_2 != null then
+  goto show4
+endi
+if $data4_3 != ready then
+  goto show4
+endi
+
+print ======================== step5
+sql reset query cache
+sleep 1000
+
+sql select * from d1.t1
+if $rows != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/reason.sim b/tests/script/unique/dnode/reason.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ad61a81b9782cf3d52c65059100c879423ae4843
--- /dev/null
+++ b/tests/script/unique/dnode/reason.sim
@@ -0,0 +1,132 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode2 off: $data7_2
+if $data7_2 != @status not received@ then
+	return -1
+endi
+
+print ========== step2
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode2 off: $data7_2
+
+print ========== step3
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode2 off: $data7_2
+if $data7_2 != @status msg timeout@ then
+	return -1
+endi
+
+print ========== step4
+sql drop dnode $hostname2
+sleep 5000
+sql show dnodes
+if $rows != 1 then
+	return -1
+endi
+
+print ========== step5
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode2 off: $data7_3
+if $data7_3 != @dnodeId not match@ then
+	return -1
+endi
+
+print ========== step6
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 3
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode4 off: $data7_4
+if $data7_4 != @mnEqualVn not match@ then
+	return -1
+endi
+
+print ========== step7
+system sh/deploy.sh -n dnode5 -i 5
+system sh/cfg.sh -n dnode5 -c statusInterval -v 3
+system sh/exec.sh -n dnode5 -s start
+sql create dnode $hostname5
+
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode5 off: $data7_5
+if $data7_5 != @interval not match@ then
+	return -1
+endi
+
+print ========== step8
+system sh/deploy.sh -n dnode6 -i 6
+system sh/cfg.sh -n dnode6 -c balance -v 0
+system sh/exec.sh -n dnode6 -s start
+sql create dnode $hostname6
+
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode6 off: $data7_6
+if $data7_6 != @balance not match@ then
+	return -1
+endi
+
+print ========== step9
+system sh/deploy.sh -n dnode7 -i 7
+system sh/cfg.sh -n dnode7 -c maxTablesPerVnode -v 3000
+system sh/exec.sh -n dnode7 -s start
+sql create dnode $hostname7
+
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode7 off: $data7_7
+if $data7_7 != @maxTabPerVn not match@ then
+	return -1
+endi
+
+print ========== step10
+system sh/deploy.sh -n dnode8 -i 8
+system sh/cfg.sh -n dnode8 -c maxVgroupsPerDb -v 3
+system sh/exec.sh -n dnode8 -s start
+sql create dnode $hostname8
+
+sleep 3000
+sql show dnodes
+print dnode1 off: $data7_1
+print dnode8 off: $data7_8
+if $data7_8 != @maxVgPerDb not match@ then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6bde68b8b5c7c5c7050141645fc689f08a5fe328
--- /dev/null
+++ b/tests/script/unique/dnode/remove1.sim
@@ -0,0 +1,211 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database d1 
+sql create table d1.t1 (t timestamp, i int)
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql create database d2 
+sql create table d2.t2 (t timestamp, i int)
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 2 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 9000
+
+sql create database d3 replica 2 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 1 then
+	goto show2
+endi
+if $data2_2 != 3 then
+	goto show2
+endi
+
+print ========== step3
+sql drop dnode $hostname2
+
+sleep 7001
+$x = 0
+show3: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+
+print ========== step4
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_2 != null then
+	goto show4
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+print ========== step5
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+	goto show5
+endi
+if $data2_2 != null then
+	goto show5
+endi
+if $data2_3 != 2 then
+	goto show5
+endi
+if $data2_4 != 2 then
+	goto show5
+endi
+
+print ========== step6
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..903e262be79a73e76b664c077b4faa0e90139262
--- /dev/null
+++ b/tests/script/unique/dnode/remove2.sim
@@ -0,0 +1,161 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create database d1 
+sql create table d1.t1 (t timestamp, i int)
+sql insert into d1.t1 values(1588262400001, 15)
+sql insert into d1.t1 values(1588262400002, 14)
+sql insert into d1.t1 values(1588262400003, 13)
+sql insert into d1.t1 values(1588262400004, 12)
+sql insert into d1.t1 values(1588262400005, 11)
+
+sql create database d2 
+sql create table d2.t2 (t timestamp, i int) 
+sql insert into d2.t2 values(1588262400001, 25)
+sql insert into d2.t2 values(1588262400002, 24)
+sql insert into d2.t2 values(1588262400003, 23)
+sql insert into d2.t2 values(1588262400004, 22)
+sql insert into d2.t2 values(1588262400005, 21)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 2 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 9000
+
+sql create database d3 replica 2 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(1588262400001, 35)
+sql insert into d3.t3 values(1588262400002, 34)
+sql insert into d3.t3 values(1588262400003, 33)
+sql insert into d3.t3 values(1588262400004, 32)
+sql insert into d3.t3 values(1588262400005, 31)
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 1 then
+	goto show2
+endi
+if $data2_2 != 3 then
+	goto show2
+endi
+
+print ========== step3
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sql drop dnode $hostname2
+sleep 5000
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+
+print ========== step4
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+sleep 5000
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_3 != 0 then
+	return -1
+endi
+
+print ============ step 4.1
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+print dnode3 openVnodes $data2_3
+if $data2_1 != 1 then
+	goto show4
+endi
+if $data2_2 != null then
+	goto show4
+endi
+if $data2_3 != 3 then
+	goto show4
+endi
+
+print ========== step5
+sql select * from d1.t1 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+
+sql select * from d2.t2 order by t desc
+print $data01 $data11 $data21 $data31 $data41 
+
+sql select * from d3.t3 order by t desc
+print $data01 $data11 $data21 $data31 $data41  
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/dnode/testSuite.sim b/tests/script/unique/dnode/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ecd43cc224136deaa615fb04f0e6c21fa8ee50d5
--- /dev/null
+++ b/tests/script/unique/dnode/testSuite.sim
@@ -0,0 +1,9 @@
+run unique/dnode/balance1.sim
+run unique/dnode/balance2.sim
+run unique/dnode/balance3.sim
+run unique/dnode/balancex.sim
+run unique/dnode/offline1.sim
+run unique/dnode/offline2.sim
+run unique/dnode/remove1.sim
+run unique/dnode/remove2.sim
+run unique/dnode/vnode_clean.sim
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f90f3d3fd010c7ac08305c3b38b12c7b48f5a70b
--- /dev/null
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -0,0 +1,313 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+print ========== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database d1 
+sql create table d1.t1 (t timestamp, i int)
+sql insert into d1.t1 values(now+1s, 15)
+sql insert into d1.t1 values(now+2s, 14)
+sql insert into d1.t1 values(now+3s, 13)
+sql insert into d1.t1 values(now+4s, 12)
+sql insert into d1.t1 values(now+5s, 11)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+if $data2_1 != 1 then
+	return -1
+endi
+
+print ========== step2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	goto show2
+endi
+if $data2_2 != 1 then
+	goto show2
+endi
+
+print ========== step3
+sql create database d2 
+
+sql create table d2.t2 (t timestamp, i int) 
+sql insert into d2.t2 values(now+1s, 25)
+sql insert into d2.t2 values(now+2s, 24)
+sql insert into d2.t2 values(now+3s, 23)
+sql insert into d2.t2 values(now+4s, 22)
+sql insert into d2.t2 values(now+5s, 21)
+
+$x = 0
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_2 != 2 then
+	return -1
+endi
+
+print ========== step4
+sql drop dnode $hostname2
+
+$x = 0
+show4: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_2
+if $data2_1 != 2 then
+    goto show4
+endi
+if $data2_2 != null then
+    goto show4
+endi
+if $rows != 1 then
+    goto show4
+endi
+
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+print ========== step5
+sleep 5000
+sql create dnode $hostname3
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+show5: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode3 openVnodes $data2_3
+if $data2_1 != 0 then
+    goto show5
+endi
+if $data2_3 != 2 then
+    goto show5
+endi
+
+print ========== step6
+sql create database d3 
+sql create table d3.t3 (t timestamp, i int)
+sql insert into d3.t3 values(now+1s, 35)
+sql insert into d3.t3 values(now+2s, 34)
+sql insert into d3.t3 values(now+3s, 33)
+sql insert into d3.t3 values(now+4s, 32)
+sql insert into d3.t3 values(now+5s, 31)
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode2 openVnodes $data2_3
+if $data2_1 != 0 then
+	return -1
+endi
+if $data2_3 != 3 then
+	return -1
+endi
+
+print ========== step7
+sql create dnode $hostname4
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+show7: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+		return -1
+	endi
+	
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+  goto show7
+endi
+if $data2_3 != 2 then
+  goto show7
+endi
+if $data2_4 != 1 then
+  goto show7
+endi
+
+print ========== step8
+sql create database d4
+sql create table d4.t4 (t timestamp, i int) 
+sql insert into d4.t4 values(now+1s, 45)
+sql insert into d4.t4 values(now+2s, 44)
+sql insert into d4.t4 values(now+3s, 43)
+sql insert into d4.t4 values(now+4s, 42)
+sql insert into d4.t4 values(now+5s, 41)
+
+$x = 0
+show8: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+  goto show8
+endi
+if $data2_3 != 2 then
+  goto show8
+endi
+if $data2_4 != 2 then
+  goto show8
+endi
+
+print ========== step9
+sql drop dnode $hostname3
+
+$x = 0
+show9: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+	  return -1
+	endi
+
+sql show dnodes
+print dnode1 openVnodes $data2_1
+print dnode3 openVnodes $data2_3
+print dnode4 openVnodes $data2_4
+if $data2_1 != 0 then
+  goto show9
+endi
+if $data2_3 != null then
+  goto show9
+endi
+if $data2_4 != 4 then
+  goto show9
+endi
+
+system sh/exec.sh -n dnode3 -s stop 
+sleep 5000
+
+print ========== step10
+sql select * from d1.t1  order by t desc
+print $data01 $data11 $data21 $data31 $data41  order by t desc
+if $data01 != 11 then
+  return -1
+endi
+if $data11 != 12 then
+  return -1
+endi
+if $data21 != 13 then
+  return -1
+endi
+if $data31 != 14 then
+  return -1
+endi
+if $data41 != 15 then
+  return -1
+endi
+
+sql select * from d2.t2  order by t desc
+print $data01 $data11 $data21 $data31 $data41  order by t desc
+if $data01 != 21 then
+  return -1
+endi
+if $data11 != 22 then
+  return -1
+endi
+if $data21 != 23 then
+  return -1
+endi
+if $data31 != 24 then
+  return -1
+endi
+if $data41 != 25 then
+  return -1
+endi
+
+sql select * from d3.t3  order by t desc
+print $data01 $data11 $data21 $data31 $data41   order by t desc
+if $data01 != 31 then
+  return -1
+endi
+if $data11 != 32 then
+  return -1
+endi
+if $data21 != 33 then
+  return -1
+endi
+if $data31 != 34 then
+  return -1
+endi
+if $data41 != 35 then
+  return -1
+endi
+
+sql select * from d4.t4  order by t desc
+print $data01 $data11 $data21 $data31 $data41   order by t desc
+if $data01 != 41 then
+  return -1
+endi
+if $data11 != 42 then
+  return -1
+endi
+if $data21 != 43 then
+  return -1
+endi
+if $data31 != 44 then
+  return -1
+endi
+if $data41 != 45 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8833397487aaca05342b7c41db6c979b6084ca97
--- /dev/null
+++ b/tests/script/unique/http/admin.sim
@@ -0,0 +1,189 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+#system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
+system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sleep 3000
+
+print ============================ dnode1 start
+
+print ===============  step0 - prepare data
+sql create database d1
+sql use d1
+
+sql create table table_admin (ts timestamp, i int)
+
+sql insert into table_admin values('2017-12-25 21:28:41.022', 1)
+sql insert into table_admin values('2017-12-25 21:28:42.022', 2)
+sql insert into table_admin values('2017-12-25 21:28:43.022', 3)
+sql insert into table_admin values('2017-12-25 21:28:44.022', 4)
+sql insert into table_admin values('2017-12-25 21:28:45.022', 5)
+sql insert into table_admin values('2017-12-25 21:28:46.022', 6)
+sql insert into table_admin values('2017-12-25 21:28:47.022', 7)
+sql insert into table_admin values('2017-12-25 21:28:48.022', 8)
+sql insert into table_admin values('2017-12-25 21:28:49.022', 9)
+sql insert into table_admin values('2017-12-25 21:28:50.022', 10)
+
+print ===============  step1 - login
+
+system_content curl 127.0.0.1:7111/admin/
+print 1-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/admin/xx
+print 2-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/admin/login
+print 3-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/admin/login/root
+print 4-> $system_content
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/admin/login/root/123
+print 5-> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+system_content curl 127.0.0.1:7111/admin/login/root/123/1/1/3
+print 6-> $system_content
+if $system_content != @{"status":"error","code":3,"desc":"Authentication failure"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.'  -d 'show databases' 127.0.0.1:7111/admin/login/root/1
+print 7-> $system_content
+if $system_content != @{"status":"error","code":4386,"desc":"invalid type of Authorization"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi' 127.0.0.1:7111/admin/login/root/1
+print 8-> $system_content
+if $system_content != @{"status":"error","code":4389,"desc":"invalid taosd Authorization"}@ then
+  return -1
+endi
+
+sleep 3000
+system_content curl 127.0.0.1:7111/admin/login/root/taosdata
+print 9 -----> $system_content
+
+if $system_content != {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"} then
+  return -1
+endi
+
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:7111/admin/login/root/1
+#print 10-> $system_content
+#if $system_content != @{"status":"error","code":29,"desc":"failed to connect to server"}@ then
+#  return -1
+#endi
+
+print ===============  step2 - logout
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'   127.0.0.1:7111/admin/logout
+print 10 -----> $system_content
+
+if $system_content != @{"status":"succ","code":0,"desc":"logout success"}@ then
+  return -1
+endi
+
+system_content curl  127.0.0.1:7111/admin/logout
+print 11 -----> $system_content
+
+if $system_content != @{"status":"error","code":4357,"desc":"no auth info input"}@ then
+  return -1
+endi
+
+print ===============  step3 - info
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  127.0.0.1:7111/admin/info
+print curl 127.0.0.1:7111/admin/info -----> $system_content
+if $system_content != {"status":"succ","data":[{"dbs":1,"tables":1,"users":3,"mnodes":1,"dnodes":1}]} then
+  return -1
+endi
+
+print ===============  step4 - meta
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show mnodes' 127.0.0.1:7111/admin/meta
+print curl 127.0.0.1:7111/admin/meta -----> $system_content
+#if $system_content != @{"status":"succ","head":["column type","column name","column bytes"],"data":[["binary","IP",16],["timestamp","created time",8],["binary","status",10],["binary","role",10],["binary","public ip",16]],"rows":5}@ then
+#  return -1
+#endi
+
+print ===============  step5 - query data
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
+print curl 127.0.0.1:7111/admin/all -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
+print curl 127.0.0.1:7111/admin/sql -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}@ then
+  return -1
+endi
+
+print ===============  step6 - insert data
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d "insert into d1.table_admin values('2017-12-25 21:28:51.022', 11)" 127.0.0.1:7111/admin/sql
+print curl 127.0.0.1:7111/admin/sql -----> $system_content
+if $system_content != @{"status":"succ","head":["affect_rows"],"data":[[1]],"rows":1}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/all
+print curl 127.0.0.1:7111/admin/all -----> $system_content
+if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
+  return -1
+endi
+
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select * from d1.table_admin' 127.0.0.1:7111/admin/sql
+#print curl 127.0.0.1:7111/admin/sql -----> $system_content
+#if $system_content != @{"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:51.022",11],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:42.022",2]],"rows":10}@ then
+#  return -1
+#endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' 127.0.0.1:7111/admin/info
+print curl 127.0.0.1:7111/admin/info -----> $system_content
+if $system_content != {"status":"succ","data":[{"dbs":1,"tables":1,"users":3,"mnodes":1,"dnodes":1}]} then
+  return -1
+endi
+
+print ===============  step7 - use dbs
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'use d1;' 127.0.0.1:7111/admin/all
+print 23-> $system_content
+if $system_content != @{"status":"error","code":4360,"desc":"no need to execute use db cmd"}@ then
+  return -1
+endi
+
+print ===============  step8 - monitor dbs
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show dnodes;show mnodes;' 127.0.0.1:7111/admin/sqls
+#print 24-> $system_content
+#if $system_content != @[{"status":"succ","head":["IP","created time","open vnodes","free vnodes","status","balance state"],"data":[["127.0.0.1","2018-09-04 #11:16:13.985",1,3,"ready","balanced"]],"rows":1},{"status":"succ","head":["IP","created time","status","role"],"data":[["127.0.0.1","2018-09-04 11:16:13.371","serving","master"]],"rows":1}]@ then
+#  return -1
+#	endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
new file mode 100644
index 0000000000000000000000000000000000000000..526981716537ed8966e23fa3bc98662de0e06854
--- /dev/null
+++ b/tests/script/unique/http/opentsdb.sim
@@ -0,0 +1,247 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c wallevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ============================ dnode1 start
+
+print ===============  step1 - parse
+system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/
+print $system_content
+if $system_content != @{"status":"error","code":4496,"desc":"database name can not be null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db123456789012345678901234567890db
+print $system_content
+if $system_content != @{"status":"error","code":4497,"desc":"database name too long"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/
+print $system_content
+if $system_content != @{"status":"error","code":4496,"desc":"database name can not be null"}@ then
+  return -1
+endi
+
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put2
+print $system_content
+if $system_content != @{"status":"error","code":4354,"desc":"invalid url format"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4499,"desc":"metrics size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4498,"desc":"invalid opentsdb json fromat"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '{}' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4499,"desc":"metrics size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+
+if $system_content != @{"status":"error","code":4501,"desc":"metric name not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": 1,"timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4502,"desc":"metric name type should be string"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4503,"desc":"metric name length is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "ab1234567890123456789012345678ab1234567890123456789012345678","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"errors":[{"datapoint":{"metric":"ab1234567890123456789012345678ab1234567890123456789012345678","stable":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb","table":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb_lga_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"status":"error","code":1547,"desc":"Timestamp data out of range"}}],"failed":1,"success":0,"affected_rows":0}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4505,"desc":"timestamp not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": "2","value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4506,"desc":"timestamp type should be integer"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": -1,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4507,"desc":"timestamp value smaller than 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4517,"desc":"value not find"}@ then
+  return -1
+endi
+
+#######
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4508,"desc":"tags not find"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4509,"desc":"tags size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": 0}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4509,"desc":"tags size is 0"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","group1": "1","group1": "1","group1": "1","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbbbbbb","table":"sys_cpu_d_bbbbbbb_lga_1_1_1_1_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","group1":"1","group1":"1","group1":"1","group1":"1","host":"web01"},"status":"error","code":866,"desc":"failed to create table"}}],"failed":1,"success":0,"affected_rows":0}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"": "web01"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4512,"desc":"tag name is null"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host01123456789001123456789001123456789001123456789001123456789001123456789": "01"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4513,"desc":"tag name length too long"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web011234567890011234567890011234567890011234567890011234567890011234567890011234567890011234567890"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4516,"desc":"tag value can not more than 64"}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": ""}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"status":"error","code":4515,"desc":"tag value is null"}@ then
+  return -1
+endi
+
+sleep 3000
+
+print ===============  step2 - insert single data
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400000,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846400000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":1,"affected_rows":1}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400000,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+print $system_content
+if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846400000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":1,"affected_rows":1}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select * from db.sys_cpu_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
+print $system_content
+if $system_content != @{"status":"succ","head":["ts","value"],"data":[["2012-09-05 20:00:00.000",18.000000000]],"rows":1}@ then
+  return -1
+endi
+
+print ===============  step3 - multi-query data
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846405000,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846402000,"value": 18,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+
+print $system_content
+
+if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web01","timestamp":1346846405000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"affected_rows":1,"status":"succ"}},{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbb","table":"sys_cpu_d_bbb_lga_1_web02","timestamp":1346846402000,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web02"},"affected_rows":1,"status":"succ"}}],"failed":0,"success":2,"affected_rows":2}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select * from db.sys_cpu_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+if $system_content != @{"status":"succ","head":["ts","value"],"data":[["2012-09-05 20:00:00.000",18.000000000],["2012-09-05 20:00:05.000",18.000000000]],"rows":2}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select count(*) from db.sys_cpu_d_bbb' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+if $system_content != @{"status":"succ","head":["count(*)"],"data":[[3]],"rows":1}@ then
+  return -1
+endi
+
+print ===============  step4 - summary-put data
+system_content curl -u root:taosdata -d  '[{"metric": "sys_mem","timestamp": 1346846400000,"value": 8,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_mem","timestamp": 1346846405000,"value": 9,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put?details=false
+
+print $system_content
+
+if $system_content != @{"failed":0,"success":2}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select * from db.sys_mem_d_bbb_lga_1_web01' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+if $system_content != @{"status":"succ","head":["ts","value"],"data":[["2012-09-05 20:00:00.000",8.000000000],["2012-09-05 20:00:05.000",9.000000000]],"rows":2}@ then
+  return -1
+endi
+
+system_content curl -u root:taosdata -d  'select count(*) from db.sys_mem_d_bbb' 127.0.0.1:7111/rest/sql/
+
+print $system_content
+
+if $system_content != @{"status":"succ","head":["count(*)"],"data":[[2]],"rows":1}@ then
+  return -1
+endi
+
+print ===============  step5 - prepare data
+
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846402000,"value": 19,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846402,"value": 19,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846403000,"value": 20,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846403,"value": 20,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846404000,"value": 21,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846404,"value": 21,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846405000,"value": 22,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846405,"value": 22,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846406000,"value": 23,"tags": {"host": "web01","group1": "1","dc": "lga"}},{"metric": "sys_cpu","timestamp": 1346846406,"value": 23,"tags": {"host": "web02","group1": "1","dc": "lga"}}]' 127.0.0.1:7111/opentsdb/db/put
+
+system_content curl -u root:taosdata -d  'select count(*) from db.sys_cpu_d_bbb' 127.0.0.1:7111/rest/sql/
+print $system_content
+if $system_content != @{"status":"succ","head":["count(*)"],"data":[[7]],"rows":1}@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/http/testSuite.sim b/tests/script/unique/http/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3a9753e744b84bfea28e40e8b3554cb82d2ebb40
--- /dev/null
+++ b/tests/script/unique/http/testSuite.sim
@@ -0,0 +1,2 @@
+run unique/http/admin.sim
+run general/http/opentsdb.sim
\ No newline at end of file
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f2836fe470562dd6229a9db7f694c7cfe7826cb3
--- /dev/null
+++ b/tests/script/unique/import/replica2.sim
@@ -0,0 +1,232 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+sql create database ir2db replica 2 days 7
+sql use ir2db
+sql create table tb(ts timestamp, i bigint)
+
+print ================= step1
+sql import into tb values(1520000010000, 1520000010000)
+sql select * from tb;
+print $rows
+if $rows != 1 then 
+  return -1
+endi
+
+print ================= step2
+sql insert into tb values(1520000008000, 1520000008000)
+print $rows
+sql select * from tb;
+if $rows != 2 then 
+  return -1
+endi
+
+print ================= step3
+sql insert into tb values(1520000020000, 1520000020000)
+sql select * from tb;
+print $rows
+if $rows != 3 then 
+  return -1
+endi
+
+print ================= step4
+sql import into tb values(1520000009000, 1520000009000)
+sql import into tb values(1520000015000, 1520000015000)
+sql import into tb values(1520000030000, 1520000030000)
+sql select * from tb;
+print $rows
+if $rows != 6 then 
+  return -1
+endi
+
+print ================= step5
+sql insert into tb values(1520000008000, 1520000008000)
+sql insert into tb values(1520000014000, 1520000014000)
+sql insert into tb values(1520000025000, 1520000025000)
+sql insert into tb values(1520000040000, 1520000040000)
+sql select * from tb;
+print $rows
+if $rows != 9 then 
+  return -1
+endi
+
+print ================= step6
+sql import into tb values(1520000007000, 1520000007000)
+sql import into tb values(1520000012000, 1520000012000)
+sql import into tb values(1520000023000, 1520000023000)
+sql import into tb values(1520000034000, 1520000034000)
+sql import into tb values(1520000050000, 1520000050000)
+sql select * from tb;
+print $rows
+if $rows != 14 then 
+  return -1
+endi
+
+print ================== dnode restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+sql select * from tb;
+if $rows != 14 then 
+  return -1
+endi
+
+print ================= step7
+sql import into tb values(1520000007001, 1520000007001)
+sql import into tb values(1520000012001, 1520000012001)
+sql import into tb values(1520000023001, 1520000023001)
+sql import into tb values(1520000034001, 1520000034001)
+sql import into tb values(1520000050001, 1520000050001)
+sql select * from tb;
+print $rows
+if $rows != 19 then
+  print expect 19, actual: $rows
+  return -1
+endi
+
+print ================= step8
+sql insert into tb values(1520000008002, 1520000008002)
+sql insert into tb values(1520000014002, 1520000014002)
+sql insert into tb values(1520000025002, 1520000025002)
+sql insert into tb values(1520000060000, 1520000060000)
+sql select * from tb;
+print $rows
+if $rows != 23 then 
+  return -1
+endi
+
+print ================= step9
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 1517408000000)
+sql import into tb values(1518272000000, 1518272000000)
+sql import into tb values(1519136000000, 1519136000000)
+sql import into tb values(1519568000000, 1519568000000)
+sql import into tb values(1519654400000, 1519654400000)
+sql import into tb values(1519827200000, 1519827200000)
+sql import into tb values(1520345600000, 1520345600000)
+sql import into tb values(1520691200000, 1520691200000)
+sql import into tb values(1520864000000, 1520864000000)
+sql import into tb values(1521900800000, 1521900800000)
+sql import into tb values(1523110400000, 1523110400000)
+sql import into tb values(1521382400000, 1521382400000)
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step11
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 1) (1515852800000, 2) (1516025600000, 3) (1516198400000, 4) (1516371200000, 5)
+sql select * from tb;
+if $rows != 40 then 
+  return -1
+endi
+
+print ================= step12
+#1520000000000
+#sql import into tb values(now-19d, -19) (now-18d, -18) (now-17d, -17) (now-16d, -16) (now-15d, -15) (now-14d, -14) (now-13d, -13) (now-12d, -12) (now-11d, -11)
+sql import into tb values(1518358400000, 6) (1518444800000, 7) (1518531200000, 8) (1518617600000, 9) (1518704000000, 10) (1518790400000, 11) (1518876800000, 12) (1518963200000, 13) (1519049600000, 14)
+sql select * from tb;
+print $rows
+if $rows != 49 then 
+  return -1
+endi
+
+print ================= step13
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+print ================= step14
+#1520000000000
+#sql import into tb values(now-48d, -48)
+#sql import into tb values(now-38d, -38)
+#sql import into tb values(now-28d, -28)
+
+sql import into tb values(1515852800001, -48)
+sql import into tb values(1516716800000, -38)
+sql import into tb values(1517580800000, -28)
+
+sql select * from tb;
+if $rows != 52 then 
+  return -1
+endi
+
+print ================= step15
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+if $rows != 52 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3a9f03a7ea5140938b21b8f5c9dc983eb701c2c2
--- /dev/null
+++ b/tests/script/unique/import/replica3.sim
@@ -0,0 +1,235 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+
+sql create database ir3db replica 3 days 7
+sql use ir3db
+sql create table tb(ts timestamp, i bigint)
+
+print ================= step1
+sql import into tb values(1520000010000, 1520000010000)
+sql select * from tb;
+print $rows
+if $rows != 1 then 
+  return -1
+endi
+
+print ================= step2
+sql insert into tb values(1520000008000, 1520000008000)
+print $rows
+sql select * from tb;
+if $rows != 2 then 
+  return -1
+endi
+
+print ================= step3
+sql insert into tb values(1520000020000, 1520000020000)
+sql select * from tb;
+print $rows
+if $rows != 3 then 
+  return -1
+endi
+
+print ================= step4
+sql import into tb values(1520000009000, 1520000009000)
+sql import into tb values(1520000015000, 1520000015000)
+sql import into tb values(1520000030000, 1520000030000)
+sql select * from tb;
+print $rows
+if $rows != 6 then 
+  return -1
+endi
+
+print ================= step5
+sql insert into tb values(1520000008000, 1520000008000)
+sql insert into tb values(1520000014000, 1520000014000)
+sql insert into tb values(1520000025000, 1520000025000)
+sql insert into tb values(1520000040000, 1520000040000)
+sql select * from tb;
+print $rows
+if $rows != 9 then 
+  return -1
+endi
+
+print ================= step6
+sql import into tb values(1520000007000, 1520000007000)
+sql import into tb values(1520000012000, 1520000012000)
+sql import into tb values(1520000023000, 1520000023000)
+sql import into tb values(1520000034000, 1520000034000)
+sql import into tb values(1520000050000, 1520000050000)
+sql select * from tb;
+print $rows
+if $rows != 14 then 
+  return -1
+endi
+
+print ================== dnode restart
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+sql select * from tb;
+if $rows != 14 then 
+  return -1
+endi
+
+print ================= step7
+sql import into tb values(1520000007001, 1520000007001)
+sql import into tb values(1520000012001, 1520000012001)
+sql import into tb values(1520000023001, 1520000023001)
+sql import into tb values(1520000034001, 1520000034001)
+sql import into tb values(1520000050001, 1520000050001)
+sql select * from tb;
+print $rows
+if $rows != 19 then
+  print expect 19, actual: $rows
+  return -1
+endi
+
+print ================= step8
+sql insert into tb values(1520000008002, 1520000008002)
+sql insert into tb values(1520000014002, 1520000014002)
+sql insert into tb values(1520000025002, 1520000025002)
+sql insert into tb values(1520000060000, 1520000060000)
+sql select * from tb;
+print $rows
+if $rows != 23 then 
+  return -1
+endi
+
+print ================= step9
+#1520000000000
+#sql import into tb values(now-30d, 7003)
+#sql import into tb values(now-20d, 34003)
+#sql import into tb values(now-10d, 34003)
+#sql import into tb values(now-5d, 34003)
+#sql import into tb values(now+1d, 50001)
+#sql import into tb values(now+2d, 50001)
+#sql import into tb values(now+6d, 50001)
+#sql import into tb values(now+8d, 50002)
+#sql import into tb values(now+10d, 50003)
+#sql import into tb values(now+12d, 50004)
+#sql import into tb values(now+14d, 50001)
+#sql import into tb values(now+16d, 500051)
+
+sql import into tb values(1517408000000, 1517408000000)
+sql import into tb values(1518272000000, 1518272000000)
+sql import into tb values(1519136000000, 1519136000000)
+sql import into tb values(1519568000000, 1519568000000)
+sql import into tb values(1519654400000, 1519654400000)
+sql import into tb values(1519827200000, 1519827200000)
+sql import into tb values(1520345600000, 1520345600000)
+sql import into tb values(1520691200000, 1520691200000)
+sql import into tb values(1520864000000, 1520864000000)
+sql import into tb values(1521900800000, 1521900800000)
+sql import into tb values(1523110400000, 1523110400000)
+sql import into tb values(1521382400000, 1521382400000)
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+sql select * from tb;
+print $rows
+if $rows != 35 then 
+  return -1
+endi
+
+print ================= step11
+
+#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
+sql import into tb values(1515680000000, 1) (1515852800000, 2) (1516025600000, 3) (1516198400000, 4) (1516371200000, 5)
+sql select * from tb;
+if $rows != 40 then 
+  return -1
+endi
+
+print ================= step12
+#1520000000000
+#sql import into tb values(now-19d, -19) (now-18d, -18) (now-17d, -17) (now-16d, -16) (now-15d, -15) (now-14d, -14) (now-13d, -13) (now-12d, -12) (now-11d, -11)
+sql import into tb values(1518358400000, 6) (1518444800000, 7) (1518531200000, 8) (1518617600000, 9) (1518704000000, 10) (1518790400000, 11) (1518876800000, 12) (1518963200000, 13) (1519049600000, 14)
+sql select * from tb;
+print $rows
+if $rows != 49 then 
+  return -1
+endi
+
+print ================= step13
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+print ================= step14
+#1520000000000
+#sql import into tb values(now-48d, -48)
+#sql import into tb values(now-38d, -38)
+#sql import into tb values(now-28d, -28)
+
+sql import into tb values(1515852800001, -48)
+sql import into tb values(1516716800000, -38)
+sql import into tb values(1517580800000, -28)
+
+sql select * from tb;
+if $rows != 52 then 
+  return -1
+endi
+
+print ================= step15
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+if $rows != 52 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/import/testSuite.sim b/tests/script/unique/import/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8be358ce17ee864538c47137630520cd3e69c337
--- /dev/null
+++ b/tests/script/unique/import/testSuite.sim
@@ -0,0 +1,2 @@
+run unique/import/replica2.sim
+run unique/import/replica3.sim
\ No newline at end of file
diff --git a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..12f0013191b90cab8b85c9050f25ce182e1807b4
--- /dev/null
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim
@@ -0,0 +1,267 @@
+# Test case describe: dnode1/dnode2 include mnode and vnode roles
+# step 1: start dnode1/dnode2, and added into cluster
+# step 2: create db(repl = 2), table, insert data, 
+# step 4: stop dnode1, remove its mnode dir, and copy mnode dir of dnode2 to dnode1
+# step 5: restart dnode1, waiting sync end
+# step 6: stop dnode2, reset query cache, and query
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+#system sh/deploy.sh -n dnode3 -i 3
+#system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+#system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+#system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+#system sh/cfg.sh -n dnode3 -c walLevel -v 2
+#system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2 and add into cluster
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+sql connect
+sleep 1000
+sql create dnode $hostname2
+sleep 1000
+
+print ============== step2: create database with replica 2, and create table, insert data
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 1200
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows    data00:$data00    totalRows:$totalRows
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != $totalRows then
+  return -1
+endi
+
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode1_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != offline then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+#sql show vgroups
+#print show vgroups:
+#print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+#print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+print ============== step5: remove the mnode dir of dnode1, then copy the monde dir of dnode2
+system_content rm -rf ../../../sim/dnode1/data/mnode
+system_content cp -rf ../../../sim/dnode2/data/mnode ../../../sim/dnode1/data/
+
+print ============== step6: restart dnode1, waiting sync end
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+
+$loopCnt = 0
+wait_dnode1_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 20 then 
+  return -1
+endi
+
+sql show dnodes -x wait_dnode1_ready
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+
+$loopCnt = 0
+wait_dnode1_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4
+$d2v2status = $data5_4
+$d2v3status = $data5_2
+$d2v4status = $data5_3
+
+$d1v2status = $data7_4
+$d1v3status = $data7_2
+$d1v4status = $data7_3
+
+if $d2v2status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v3status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v4status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+if $d1v2status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v3status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v4status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+print ============== step7: stop dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sql reset query cache 
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..29da1fd77359146b6fb44fa8347e7b850947558d
--- /dev/null
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim
@@ -0,0 +1,269 @@
+# Test case describe: dnode1/dnode2 include mnode and vnode roles
+# step 1: start dnode1/dnode2, and added into cluster
+# step 2: create db(repl = 2), table, insert data, 
+# step 4: stop dnode1, remove its mnode and vnode dir, and copy mnode and vnode dir of dnode2 to dnode1
+# step 5: restart dnode1, waiting sync end
+# step 6: stop dnode2, reset query cache, and query
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+#system sh/deploy.sh -n dnode3 -i 3
+#system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+#system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+#system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+#system sh/cfg.sh -n dnode3 -c walLevel -v 2
+#system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2 and add into cluster
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+sql connect
+sleep 1000
+sql create dnode $hostname2
+sleep 1000
+
+print ============== step2: create database with replica 2, and create table, insert data
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 1200
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows    data00:$data00    totalRows:$totalRows
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != $totalRows then
+  return -1
+endi
+
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode1_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != offline then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+#sql show vgroups
+#print show vgroups:
+#print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+#print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+print ============== step5: remove the mnode dir of dnode1, then copy the monde dir of dnode2
+system_content rm -rf ../../../sim/dnode1/data/vnode
+system_content rm -rf ../../../sim/dnode1/data/mnode
+system_content cp -rf ../../../sim/dnode2/data/vnode ../../../sim/dnode1/data/
+system_content cp -rf ../../../sim/dnode2/data/mnode ../../../sim/dnode1/data/
+
+print ============== step6: restart dnode1, waiting sync end
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+
+$loopCnt = 0
+wait_dnode1_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 20 then 
+  return -1
+endi
+
+sql show dnodes -x wait_dnode1_ready
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+
+$loopCnt = 0
+wait_dnode1_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4
+$d2v2status = $data5_4
+$d2v3status = $data5_2
+$d2v4status = $data5_3
+
+$d1v2status = $data7_4
+$d1v3status = $data7_2
+$d1v4status = $data7_3
+
+if $d2v2status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v3status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v4status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+if $d1v2status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v3status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v4status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+print ============== step7: stop dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sql reset query cache 
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
new file mode 100644
index 0000000000000000000000000000000000000000..691b2cb568068f9e8a6f96c4cf29578a4c28854d
--- /dev/null
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim
@@ -0,0 +1,205 @@
+# Test case describe: dnode1/dnode2 include mnode and vnode roles
+# step 1: start dnode1/dnode2, and added into cluster
+# step 2: create db(repl = 2), table, insert data, 
+# step 4: stop dnode1, remove its mnode and vnode dir, and copy mnode and vnode dir of dnode2 to dnode1
+# step 5: restart dnode1, waiting sync end
+# step 6: stop dnode2, reset query cache, and query
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+#system sh/deploy.sh -n dnode3 -i 3
+#system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+#system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+#system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+#system sh/cfg.sh -n dnode3 -c walLevel -v 2
+#system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2 and add into cluster
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+sql connect
+sleep 1000
+sql create dnode $hostname2
+sleep 1000
+
+print ============== step2: create database with replica 2, and create table, insert data
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 1200
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows    data00:$data00    totalRows:$totalRows
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != $totalRows then
+  return -1
+endi
+
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+print ============== step5: remove the mnode dir of dnode1, then copy the monde dir of dnode2
+system_content rm -rf ../../../sim/dnode1/data/vnode
+system_content rm -rf ../../../sim/dnode1/data/mnode
+system_content cp -rf ../../../sim/dnode2/data/vnode ../../../sim/dnode1/data/
+system_content cp -rf ../../../sim/dnode2/data/mnode ../../../sim/dnode1/data/
+
+print ============== step6: restart dnode1/dnode2
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+sql connect
+sql use $db
+
+$loopCnt = 0
+wait_dnode1_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 20 then 
+  return -1
+endi
+
+sql show dnodes -x wait_dnode1_ready
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+
+$loopCnt = 0
+wait_dnode1_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4
+$d2v2status = $data5_4
+$d2v3status = $data5_2
+$d2v4status = $data5_3
+
+$d1v2status = $data7_4
+$d1v3status = $data7_2
+$d1v4status = $data7_3
+
+if $d2v2status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v3status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v4status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+if $d1v2status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v3status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v4status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+sql reset query cache 
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim b/tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8a1132de2e62a6d97d37648435dd94d748a74c28
--- /dev/null
+++ b/tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim
@@ -0,0 +1,267 @@
+# Test case describe: dnode1/dnode2 include mnode and vnode roles
+# step 1: start dnode1/dnode2, and added into cluster
+# step 2: create db(repl = 2), table, insert data, 
+# step 4: stop dnode1, remove its vnode dir, and copy vnode dir of dnode2 to dnode1
+# step 5: restart dnode1, waiting sync end
+# step 6: stop dnode2, reset query cache, and query
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+#system sh/deploy.sh -n dnode3 -i 3
+#system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+#system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+#system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+#system sh/cfg.sh -n dnode3 -c walLevel -v 2
+#system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+#system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+#system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+#system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1/dnode2 and add into cluster
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+sql connect
+sleep 1000
+sql create dnode $hostname2
+sleep 1000
+
+print ============== step2: create database with replica 2, and create table, insert data
+$totalTableNum = 10
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 2 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 1200
+$tblNum = $totalTableNum
+$totalRows = 0
+$tsStart = 1577808000000  # 2020-01-01 00:00:00.000
+
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+    $ts = $tsStart + $x
+    sql insert into $tb values ( $ts + 0a , $x ) ( $ts + 1a , $x ) ( $ts + 2a , $x ) ( $ts + 3a , $x ) ( $ts + 4a , $x ) ( $ts + 5a , $x ) ( $ts + 6a , $x ) ( $ts + 7a , $x ) ( $ts + 8a , $x ) ( $ts + 9a , $x ) ( $ts + 10a , $x ) ( $ts + 11a , $x ) ( $ts + 12a , $x ) ( $ts + 13a , $x ) ( $ts + 14a , $x ) ( $ts + 15a , $x ) ( $ts + 16a , $x ) ( $ts + 17a , $x ) ( $ts + 18a , $x ) ( $ts + 19a , $x ) ( $ts + 20a , $x ) ( $ts + 21a , $x ) ( $ts + 22a , $x ) ( $ts + 23a , $x ) ( $ts + 24a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 25a , $x ) ( $ts + 26a , $x ) ( $ts + 27a , $x ) ( $ts + 28a , $x ) ( $ts + 29a , $x ) ( $ts + 30a , $x ) ( $ts + 31a , $x ) ( $ts + 32a , $x ) ( $ts + 33a , $x ) ( $ts + 34a , $x ) ( $ts + 35a , $x ) ( $ts + 36a , $x ) ( $ts + 37a , $x ) ( $ts + 38a , $x ) ( $ts + 39a , $x ) ( $ts + 40a , $x ) ( $ts + 41a , $x ) ( $ts + 42a , $x ) ( $ts + 43a , $x ) ( $ts + 44a , $x ) ( $ts + 45a , $x ) ( $ts + 46a , $x ) ( $ts + 47a , $x ) ( $ts + 48a , $x ) ( $ts + 49a , $x ) ( $ts + 50a , $x ) ( $ts + 51a , $x ) ( $ts + 52a , $x ) ( $ts + 53a , $x ) ( $ts + 54a , $x ) ( $ts + 55a , $x ) ( $ts + 56a , $x ) ( $ts + 57a , $x ) ( $ts + 58a , $x ) ( $ts + 59a , $x ) 
+    $x = $x + 60
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+print rows:$rows    data00:$data00    totalRows:$totalRows
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != $totalRows then
+  return -1
+endi
+
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 20d , -20 )
+sql insert into $tb values ( now - 40d , -40 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode1
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode1_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != offline then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_offline
+endi
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+#sql show vgroups
+#print show vgroups:
+#print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+#print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+#print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+
+print ============== step5: remove the mnode dir of dnode1, then copy the monde dir of dnode2
+system_content rm -rf ../../../sim/dnode1/data/vnode
+system_content cp -rf ../../../sim/dnode2/data/vnode ../../../sim/dnode1/data/
+
+print ============== step6: restart dnode1, waiting sync end
+system sh/exec.sh -n dnode1 -s start
+sleep 1000
+
+$loopCnt = 0
+wait_dnode1_ready:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 20 then 
+  return -1
+endi
+
+sql show dnodes -x wait_dnode1_ready
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode1_ready
+endi
+
+$loopCnt = 0
+wait_dnode1_vgroup_slave:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show vgroups
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+print show vgroups:
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1  $data5_1  $data6_1  $data7_1  $data8_1  $data9_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2  $data5_2  $data6_2  $data7_2  $data8_2  $data9_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3  $data5_3  $data6_3  $data7_3  $data8_3  $data9_3
+print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4  $data5_4  $data6_4  $data7_4  $data8_4  $data9_4
+$d2v2status = $data5_4
+$d2v3status = $data5_2
+$d2v4status = $data5_3
+
+$d1v2status = $data7_4
+$d1v3status = $data7_2
+$d1v4status = $data7_3
+
+if $d2v2status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v3status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d2v4status != master then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+if $d1v2status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v3status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+if $d1v4status != slave then
+  sleep 2000
+  goto wait_dnode1_vgroup_slave
+endi
+
+print ============== step7: stop dnode2
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+
+$loopCnt = 0
+wait_dnode2_offline:
+$loopCnt = $loopCnt + 1
+if $loopCnt == 10 then 
+  return -1
+endi
+
+sql show dnodes
+if $rows != 2 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+
+if $dnode1Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sql reset query cache 
+
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt20.sim b/tests/script/unique/mnode/mgmt20.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e51d4299255248f3fb19371183536e5e62123655
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt20.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode2 -c monitor -v 1
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+sql connect
+
+print ============== step2
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+
+print ============== step3
+system sh/exec.sh -n dnode2 -s start
+sleep 10000
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print =============== step4
+sql select * from log.dn1
+$d1_first  = $rows
+sql select * from log.dn2
+$d2_first  = $rows
+
+sleep 3000
+sql select * from log.dn1
+$d1_second  = $rows
+sql select * from log.dn2
+$d2_second  = $rows
+
+print dnode1 $d1_first $d1_second
+print dnode2 $d2_first $d2_second
+if $d1_first >= $d1_second then
+  return -1
+endi
+
+if $d2_first >= $d2_second then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt21.sim b/tests/script/unique/mnode/mgmt21.sim
new file mode 100644
index 0000000000000000000000000000000000000000..53ad0eebe7cc1798647226452479db47d1476528
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt21.sim
@@ -0,0 +1,44 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode2 -s start
+sleep 10000
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d55e36d7fc627c3dcfb3e9c21c9396960a0c9287
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt22.sim
@@ -0,0 +1,116 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+print ============== step3
+sql_error drop dnode $hostname1 -x error1
+print should not drop master
+
+print ============== step4
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+sql_error show mnodes
+print error of no master
+
+print ============== step5
+sql_error drop dnode $hostname1
+print error of no master
+
+print ============== step6
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+sql close
+sql connect
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes -x show6
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show6
+endi
+if $data2_2 != slave then
+	goto show6
+endi
+
+print ============== step7
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 5000
+
+$x = 0
+show7: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data2_3
+if $data2_1 != master then
+	goto show7
+endi
+if $data2_2 != slave then
+	goto show7
+endi
+if $data3_3 != null then
+	goto show7
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7e60ab908b81dd0ad88e550b4b487123e8204b2d
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt23.sim
@@ -0,0 +1,132 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+$x = 0
+show2:
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+print ============== step4
+sql drop dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode2 -s stop
+
+print ============== step5
+sleep 2000
+sql create dnode $hostname2
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/exec.sh -n dnode2 -s start
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+print ============== step6
+system sh/exec.sh -n dnode1 -s stop
+sleep 10000
+
+sql_error show mnodes
+
+print ============== step7
+sql_error drop dnode $hostname1
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a7bcc59ac0bfa6163d1e2fddfd3a817b102bfa3c
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt24.sim
@@ -0,0 +1,84 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode1 -s stop
+sleep 2000
+sql_error show mnodes
+
+print ============== step4
+sql_error drop dnode $hostname1 
+
+print ============== step5
+system sh/exec.sh -n dnode1 -s start
+sql_error create dnode $hostname1
+
+sql close
+sql connect
+
+$x = 0
+step5:
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then
+		return -1
+	endi
+
+sql show mnodes -x step5
+    
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto step5
+endi
+if $data2_2 != slave then
+	goto step5
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9cca9c844806b138faf52186ffc3184d4876a1d6
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt25.sim
@@ -0,0 +1,95 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 6000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+print ============== step4
+sql drop dnode $hostname2
+sleep 6000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9b534cca06c89d3fa6f05ab82a88fb80514acac2
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt26.sim
@@ -0,0 +1,123 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+		return -1
+	endi
+	
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
+	goto show2
+endi
+if $data2_2 != slave then
+	goto show2
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 6000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+
+print ============== step4
+sql drop dnode $hostname2
+sleep 6000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+print ============== step5
+system sh/exec.sh -n dnode2 -s stop
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 6000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim
new file mode 100644
index 0000000000000000000000000000000000000000..205e1b05d376991d72d1676262ed50c4203d3bf3
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt33.sim
@@ -0,0 +1,176 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
+  return -1
+endi
+if $data3_2 != null then
+  return -1
+endi
+if $data3_3 != null then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+print ============== step4
+sql drop dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/exec.sh -n dnode2 -s start
+
+print ============== step5
+sql create dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_4
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+
+print ============== step6
+system sh/exec.sh -n dnode1 -s stop
+sleep 10000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_4
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+#if $dnode2Role != master then
+#  return -1
+#endi
+#if $dnode3Role != slave then
+#  return -1
+#endi
+
+print ============== step7
+sql drop dnode $hostname1
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != null then
+  return -1
+endi
+#if $dnode2Role != master then
+#  return -1
+#endi
+#if $dnode3Role != slave then
+#  return -1
+#endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim
new file mode 100644
index 0000000000000000000000000000000000000000..96e3133d762362cc47f656421dfab8470e37cb2e
--- /dev/null
+++ b/tests/script/unique/mnode/mgmt34.sim
@@ -0,0 +1,230 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql show mnodes
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
+  return -1
+endi
+if $data3_2 != null then
+  return -1
+endi
+if $data3_3 != null then
+  return -1
+endi
+
+print ============== step2
+system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+if $dnode4Role != null then
+  return -1
+endi
+
+print ============== step3
+system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname3
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+if $dnode4Role != null then
+  return -1
+endi
+
+
+print ============== step4
+system sh/exec.sh -n dnode4 -s start
+sql create dnode $hostname4
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+if $dnode4Role != null then
+  return -1
+endi
+
+print ============== step5
+sql drop dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+if $dnode4Role != slave then
+  return -1
+endi
+
+system sh/exec.sh -n dnode2 -s stop
+sleep 3000
+
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/exec.sh -n dnode2 -s start
+
+print ============== step6
+sql create dnode $hostname2
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != slave then
+  return -1
+endi
+if $dnode4Role != slave then
+  return -1
+endi
+
+print ============== step7
+system sh/exec.sh -n dnode1 -s stop
+sleep 4000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != offline then
+  return -1
+endi
+
+print ============== step8
+sql drop dnode $hostname1
+sleep 8000
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_5
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
+
+if $dnode1Role != null then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+#if $dnode3Role != master then
+#  return -1
+#endi
+#if $dnode4Role != slave then
+#  return -1
+#endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1fba912d492785900f88686097074eaafc4445af
--- /dev/null
+++ b/tests/script/unique/mnode/mgmtr2.sim
@@ -0,0 +1,84 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 2
+
+print ============== step1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql show mnodes
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != null then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+print ============== step2
+sql create dnode $hostname2 
+sql create dnode $hostname3
+
+print ============== step3
+print ========= start dnode2 and dnode3
+
+system sh/exec.sh -n dnode2 -s start
+sleep 1000
+system sh/exec.sh -n dnode3 -s start
+
+sleep 8000
+system sh/exec.sh -n dnode2 -s stop
+system sh/exec.sh -n dnode3 -s stop
+sleep 4000
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 4000
+system sh/exec.sh -n dnode2 -s stop
+system sh/exec.sh -n dnode3 -s stop
+sleep 4000
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+print ============== step4
+sql show mnodes
+
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+
+if $dnode1Role != master then
+  return -1
+endi
+if $dnode2Role != slave then
+  return -1
+endi
+if $dnode3Role != null then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/mnode/testSuite.sim b/tests/script/unique/mnode/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b9adbe06a282548d56d7e7feb8a36f99198d8c0d
--- /dev/null
+++ b/tests/script/unique/mnode/testSuite.sim
@@ -0,0 +1,9 @@
+run unique/mnode/mgmt21.sim
+run unique/mnode/mgmt22.sim
+run unique/mnode/mgmt23.sim
+run unique/mnode/mgmt24.sim
+run unique/mnode/mgmt25.sim
+run unique/mnode/mgmt26.sim
+run unique/mnode/mgmt33.sim
+run unique/mnode/mgmt34.sim
+run unique/mnode/mgmtr2.sim
diff --git a/tests/script/unique/stable/balance_replica1.sim b/tests/script/unique/stable/balance_replica1.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3ea158eb39c0d560900b34d5465fc1ef12a4b42f
--- /dev/null
+++ b/tests/script/unique/stable/balance_replica1.sim
@@ -0,0 +1,143 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c statusInterval -v 1
+system sh/cfg.sh -n dnode2 -c statusInterval -v 1
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+
+$dbPrefix = br1_db
+$tbPrefix = br1_tb
+$mtPrefix = br1_mt
+$tbNum = 13
+$rowNum = 200
+$totalNum = 200
+
+print ============== step1
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+$i = 0
+$db = $dbPrefix
+$mt = $mtPrefix
+$st = $stPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $y , $y ) 
+    $x = $x + 1
+    $y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 4 then
+  goto show1
+endi
+if $dnode2Vnodes != null then
+  goto show1
+endi
+print =============== step3 start dnode2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 8000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 2000
+	if $x == 10 then 
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show2
+endi
+if $dnode2Vnodes != 2 then
+  goto show2
+endi
+
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+sql select * from $tb
+print select * from $tb ==> $rows
+if $rows != 200 then
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+sql select * from $tb
+print select * from $tb ==> $rows
+if $rows != 200 then
+  return -1
+endi
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+print select * from $tb ==> $rows
+if $rows != 200 then
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt
+print select * from $mt ==> $rows
+if $rows != 2600 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/dnode2.sim b/tests/script/unique/stable/dnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5c227f8cece29d31232ba1e030dbd30b3698096d
--- /dev/null
+++ b/tests/script/unique/stable/dnode2.sim
@@ -0,0 +1,202 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = d2_db
+$tbPrefix = d2_tb
+$mtPrefix = d2_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x )  
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/unique/stable/dnode2_stop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..19c6de33b3882633acce74ca6c8f9bdbccbf7b1c
--- /dev/null
+++ b/tests/script/unique/stable/dnode2_stop.sim
@@ -0,0 +1,156 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = d2s_db
+$tbPrefix = d2s_tb
+$mtPrefix = d2s_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+sql show dnodes;
+print dnodes ==> $rows
+if $rows != 2 then 
+  return -1
+endi
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+sleep 5000
+
+print =============== step2
+sql select count(*) from $mt -x step2
+  return -1
+step2:
+
+sql select count(tbcol) from $mt  -x step21
+  return -1
+step21:
+
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+print =============== step3
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/dnode3.sim b/tests/script/unique/stable/dnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..436ae73595bef47631113498f472d43e173aa7a9
--- /dev/null
+++ b/tests/script/unique/stable/dnode3.sim
@@ -0,0 +1,229 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+if $data4_3 == offline then
+  goto createDnode
+endi  
+ 
+
+print ======================== dnode1 start
+
+$dbPrefix = d3_db
+$tbPrefix = d3_tb
+$mtPrefix = d3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sql show dnodes
+$dnode1Vnodes = $data2_1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data2_2
+print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes
+
+if $dnode1Vnodes != 1 then
+  return -1
+endi
+if $dnode2Vnodes != 1 then
+  return -1
+endi
+if $dnode3Vnodes != 1 then
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/replica2_dnode4.sim b/tests/script/unique/stable/replica2_dnode4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4f8211d5d4b7ec5cbee3bee8104d0842346978d6
--- /dev/null
+++ b/tests/script/unique/stable/replica2_dnode4.sim
@@ -0,0 +1,218 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+if $data4_3 == offline then
+  goto createDnode
+endi  
+if $data4_4 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = r2d4_db
+$tbPrefix = r2d4_tb
+$mtPrefix = r2d4_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db replica 2 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+return
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/replica2_vnode3.sim b/tests/script/unique/stable/replica2_vnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..47d45c3d3d7d7a4e32cf94fd8cf4d7dcb0b53477
--- /dev/null
+++ b/tests/script/unique/stable/replica2_vnode3.sim
@@ -0,0 +1,199 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = r2v3_db
+$tbPrefix = r2v3_tb
+$mtPrefix = r2v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db replica 2 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0  
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+return
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/replica3_dnode6.sim b/tests/script/unique/stable/replica3_dnode6.sim
new file mode 100644
index 0000000000000000000000000000000000000000..eeffb86cdbeefaeaf351ec5be3743e53136692ec
--- /dev/null
+++ b/tests/script/unique/stable/replica3_dnode6.sim
@@ -0,0 +1,242 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+system sh/cfg.sh -n dnode5 -c walLevel -v 2
+system sh/cfg.sh -n dnode6 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode6 -c maxtablesPerVnode -v 4
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
+sql create dnode $hostname6
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+system sh/exec.sh -n dnode6 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+if $data4_3 == offline then
+  goto createDnode
+endi  
+if $data4_4 == offline then
+  goto createDnode
+endi  
+if $data4_5 == offline then
+  goto createDnode
+endi  
+if $data4_6 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = r3d6_db
+$tbPrefix = r3d6_tb
+$mtPrefix = r3d6_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+sql show dnodes;
+print dnodes ==> $rows
+if $rows != 6 then 
+  return -1
+endi
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db replica 3 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+#sql select count(tbcol) as b from $mt interval(1m)
+#print ===> $data01
+#if $data01 != 10 then 
+# return -1
+#endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+return
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/replica3_vnode3.sim b/tests/script/unique/stable/replica3_vnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bc700b7dda1cf95c96f16907fa207cd0c47819d1
--- /dev/null
+++ b/tests/script/unique/stable/replica3_vnode3.sim
@@ -0,0 +1,219 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi  
+if $data4_3 == offline then
+  goto createDnode
+endi  
+if $data4_4 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = r3v3_db
+$tbPrefix = r3v3_tb
+$mtPrefix = r3v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db replica 3 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val 
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 3 then 
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts <= 1519833840000
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+print select count(*) from $mt
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts <= 1519833840000
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/stable/testSuite.sim b/tests/script/unique/stable/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2e3ab31a44201f8e01fd70d8a0b2dffe8f51d7df
--- /dev/null
+++ b/tests/script/unique/stable/testSuite.sim
@@ -0,0 +1,8 @@
+run unique/metrics/balance_replica1.sim
+run unique/metrics/dnode2_stop.sim
+run unique/metrics/dnode2.sim
+run unique/metrics/dnode3.sim
+run unique/metrics/replica2_dnode4.sim
+run unique/metrics/replica2_vnode3.sim
+run unique/metrics/replica3_dnode6.sim
+run unique/metrics/replica3_vnode3.sim
\ No newline at end of file
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
new file mode 100644
index 0000000000000000000000000000000000000000..36086fe4b85b0a6cbf9710af6104d697c1bb59dc
--- /dev/null
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -0,0 +1,314 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c statusInterval -v 1
+system sh/cfg.sh -n dnode2 -c statusInterval -v 1
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 5
+system sh/cfg.sh -n dnode2 -c tableMetaKeepTimer -v 5
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 3
+$rowNum = 200
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ============== step1
+$db = $dbPrefix
+sql create database $db 
+sql use $db
+
+$i = 0
+$st = $stPrefix . $i
+$mt = $mtPrefix . $i
+$tbNum = 3
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  if $i == 0 then 
+    sleep 2000
+  endi
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$st = $stPrefix . $i
+$mt = $mtPrefix . $i
+$tbNum = 6
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  if $i == 0 then 
+    sleep 2000
+  endi
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$st = $stPrefix . $i
+$mt = $mtPrefix . $i
+$tbNum = 9
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  if $i == 0 then 
+    sleep 2000
+  endi
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$st = $stPrefix . $i
+$mt = $mtPrefix . $i
+$tbNum = 12
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  if $i == 0 then 
+    sleep 2000
+  endi
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+
+print =============== step2
+
+sql show tables
+if $rows != 16 then 
+  return -1
+endi
+
+print =============== step3
+print sleep 22 seconds
+sleep 22000 
+
+$i = 0
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r0 = $rows
+print $st ==> $r0 $data00 $data01 $data10 $data11
+
+$i = 3
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r3 = $rows
+print $st ==> $r3 $data00 $data01 $data10 $data11
+
+$i = 6
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r6 = $rows
+print $st ==> $r6 $data00 $data01 $data10 $data11
+
+$i = 9
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r9 = $rows
+print $st ==> $r9 $data00 $data01 $data10 $data11
+
+print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 0 then
+  goto show1
+endi
+if $dnode2Vnodes != NULL then
+  goto show1
+endi
+
+print =============== step4 start dnode2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 8000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show2
+endi
+if $dnode2Vnodes != 2 then
+  goto show2
+endi
+
+print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
+print =============== step5
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step6
+$i = 0
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+$i = 6
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+$i = 9
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+print rows0=>$r0 rows3=>$r3 rows6=>$r6  rows9=>$r9
+print =============== step7
+$i = 0
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r0 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r0 then
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r3 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r3 then
+  return -1
+endi
+
+
+$i = 6
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r6 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r6 then
+  return -1
+endi
+
+$i = 9
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r0 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r9 then
+  return -1
+endi
+
+print  =============== clear
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+
diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bbc4d5174cbade0959f5586e2ed15b81bebf4f5b
--- /dev/null
+++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim
@@ -0,0 +1,260 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+print ======================== dnode1 start
+
+$dbPrefix = m1d_db
+$tbPrefix = m1d_tb
+$mtPrefix = m1d_mt
+$stPrefix = m1d_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 22 seconds
+sleep 32000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e9944daf3726be0433c4d757c8f6674869baa672
--- /dev/null
+++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim
@@ -0,0 +1,260 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi    
+
+
+print ======================== dnode1 start
+
+$dbPrefix = m2d_db
+$tbPrefix = m2d_tb
+$mtPrefix = m2d_mt
+$stPrefix = m2d_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f60355cd6ac2037e97ab1fb4bf0ac04895db2955
--- /dev/null
+++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
@@ -0,0 +1,261 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = m2dv_db
+$tbPrefix = m2dv_tb
+$mtPrefix = m2dv_mt
+$stPrefix = m2dv_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..981f5e9b70aae8796a29bbc40b05b764b87fa2eb
--- /dev/null
+++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim
@@ -0,0 +1,270 @@
+system sh/stop_dnodes.sh
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+if $data4_192.168.0.3 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = m2d3_db
+$tbPrefix = m2d3_tb
+$mtPrefix = m2d3_mt
+$stPrefix = m2d3_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..902e9db16b6421c209734716d1c97dac00a17c54
--- /dev/null
+++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim
@@ -0,0 +1,280 @@
+system sh/stop_dnodes.sh
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+if $data4_192.168.0.3 == offline then
+  goto createDnode
+endi 
+if $data4_192.168.0.4 == offline then
+  goto createDnode
+endi   
+
+print ======================== dnode1 start
+
+$dbPrefix = m2d3_db
+$tbPrefix = m2d3_tb
+$mtPrefix = m2d3_mt
+$stPrefix = m2d3_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $mt interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $mt interval(1d)
+print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $mt interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $mt interval(1d)
+print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $mt interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $mt interval(1d)
+print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $mt interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $mt interval(1d)
+print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $mt interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $mt interval(1d)
+print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $mt interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $mt interval(1d)
+print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $mt interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $mt interval(1d)
+print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $mt interval(1d)
+
+print =============== step11 wh
+sql select count(tbcol) from $mt where ts < now + 4m interval(1d)
+print select count(tbcol) from $mt where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $mt where ts < now + 4m interval(1d)
+
+print =============== step12 as
+sql select count(tbcol) from $mt interval(1d)
+print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $mt interval(1d)
+
+print =============== step13
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step14
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != 200 then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1f9cab48e5f738dabe1e07fa5b1017eb23282ac0
--- /dev/null
+++ b/tests/script/unique/stream/metrics_vnode_stop.sim
@@ -0,0 +1,188 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+print ======================== dnode start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step3  
+system sh/exec.sh -n dnode2 -s stop
+
+print =============== step4
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step5
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============   step6
+
+sql close
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/exec.sh -n dnode2 -s start
+sleep 2000
+
+$x = 0
+connectTbase2: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql connect -x connectTbase2
+sleep 3000
+
+sql create dnode $hostname1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+print ======================== dnode start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step7
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step8 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $mt interval(1d)
+print select count(*) from $mt interval(1d) ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $mt interval(1d)
+
+print =============== step9 
+system sh/exec.sh -n dnode1 -s stop
+
+print =============== step10
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step11
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+
+
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
new file mode 100644
index 0000000000000000000000000000000000000000..facb7df45900eff83c18e2a5ee8344d4d426cf9b
--- /dev/null
+++ b/tests/script/unique/stream/table_balance.sim
@@ -0,0 +1,238 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c statusInterval -v 1
+system sh/cfg.sh -n dnode2 -c statusInterval -v 1
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+
+$dbPrefix = tb_db
+$tbPrefix = tb_tb
+$mtPrefix = tb_mt
+$stPrefix = tb_st
+$tbNum = 10
+$rowNum = 200
+$totalNum = 200
+
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+print ============== step1
+$i = 0
+$db = $dbPrefix
+$mt = $mtPrefix
+$st = $stPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  if $i == 0 then 
+    sleep 2000
+  endi
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+sql show tables
+if $rows != 13 then 
+  return -1
+endi
+
+print =============== step3
+print sleep 22 seconds
+sleep 22000 
+
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r1 = $rows
+print $st ==> $r1 $data00 $data01 $data10 $data11
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r5 = $rows
+print $st ==> $r5 $data00 $data01 $data10 $data11
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+$r8 = $rows
+print $st ==> $r8 $data00 $data01 $data10 $data11
+
+print rows1=>$r1 rows5=>$r5 rows8=>$r8 
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 0 then
+  goto show1
+endi
+if $dnode2Vnodes != NULL then
+  goto show1
+endi
+
+print =============== step4 start dnode2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 8000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 2 then
+  goto show2
+endi
+if $dnode2Vnodes != 2 then
+  goto show2
+endi
+
+print rows1=>$r1 rows5=>$r5 rows8=>$r8 
+print =============== step5
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $tb
+if $rows != $rowNum then
+  return -1
+endi
+
+print rows1=>$r1 rows5=>$r5 rows8=>$r8 
+print =============== step7
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r1 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r1 then
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r5 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r5 then
+  return -1
+endi
+
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $r8 $rows , $data00 $data01 $data10 $data11
+if $rows == 0 then
+  return -1
+endi
+if $rows <= $r8 then
+  return -1
+endi
+
+
+if $r1 != $r5 then
+  return -1
+endi
+
+if $r8 != $r5 then
+  return -1
+endi
+
+print  =============== clear
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fe19e6f402b49ee74f5a4440fb6012925a85161e
--- /dev/null
+++ b/tests/script/unique/stream/table_move.sim
@@ -0,0 +1,269 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c statusInterval -v 1
+system sh/cfg.sh -n dnode2 -c statusInterval -v 1
+system sh/cfg.sh -n dnode3 -c statusInterval -v 1
+system sh/cfg.sh -n dnode4 -c statusInterval -v 1
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 1
+system sh/cfg.sh -n dnode2 -c wallevel -v 1
+system sh/cfg.sh -n dnode3 -c wallevel -v 1
+system sh/cfg.sh -n dnode4 -c wallevel -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxTablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 3
+
+system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 1000
+system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 1000
+system sh/cfg.sh -n dnode1 -c maxShellConns       -v 1000
+system sh/cfg.sh -n dnode1 -c maxMgmtConnections  -v 1000
+
+system sh/cfg.sh -n dnode2 -c maxVnodeConnections -v 1000
+system sh/cfg.sh -n dnode2 -c maxMeterConnections -v 1000
+system sh/cfg.sh -n dnode2 -c maxShellConns       -v 1000
+system sh/cfg.sh -n dnode2 -c maxMgmtConnections  -v 1000
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 5
+$rowNum = 20
+$totalNum = 200
+
+print ============== step1
+print ========= start dnode1
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sleep 3000
+
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db 
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -20
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s 
+    sql insert into $tb values (now $ms , $x , $x ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 0
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
+if $data01 != $rowNum then 
+  return -1
+endi
+if $data02 != $rowNum then 
+  return -1
+endi
+if $data03 != $rowNum then 
+  return -1
+endi
+
+sql show tables
+if $rows != 5 then 
+  return -1
+endi
+
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
+
+sql show tables
+if $rows != 6 then 
+  return -1
+endi
+
+print =============== step3
+print sleep 22 seconds
+sleep 22000 
+
+sql select * from $tb
+if $rows != 20 then
+  return -1
+endi
+
+sql select * from $mt
+if $rows != 100 then
+  return -1
+endi
+
+sql select * from $st
+print select * from $st => $data01
+if $rows == 0 then 
+  return -1
+endi
+
+$x = 0
+show1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show1
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 6 then
+  goto show1
+endi
+if $dnode2Vnodes != NULL then
+  goto show1
+endi
+
+print =============== step4 start dnode2
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+sleep 8000
+
+$x = 0
+show2: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show2
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != 7 then
+  goto show2
+endi
+if $dnode2Vnodes != 7 then
+  goto show2
+endi
+
+print =============== step5 drop dnode1
+system sh/exec.sh -n dnode1 -s stop
+print stop dnode1 and sleep 10000
+sleep 10000
+
+sql drop dnode $hostname1
+print drop dnode1 and sleep 9000
+sleep 9000
+
+$x = 0
+show6: 
+	$x = $x + 1
+	sleep 3000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes -x show6
+$dnode1Vnodes = $data3_192.168.0.1
+print dnode1 $dnode1Vnodes
+$dnode2Vnodes = $data3_192.168.0.2
+print dnode2 $dnode2Vnodes
+
+if $dnode1Vnodes != NULL then
+  goto show6
+endi
+if $dnode2Vnodes != 6 then
+  goto show6
+endi
+
+print =============== step6
+
+print select * from $tb
+sql select * from $tb
+if $rows != 20 then
+  return -1
+endi
+
+print select * from $mt
+sql select * from $mt
+if $rows != 80 then
+  return -1
+endi
+
+
+print =============== step7
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  
+  $x = 0
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . s
+    sql insert into $tb values (now + $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+$i = 0
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+
+print =============== step8
+print sleep 22 seconds
+sleep 22000 
+
+print select * from $st
+sql select * from $st
+if $rows == 0 then
+  return -1
+endi
+
+
+print  =============== clear
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+
diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..aaab2990b4a80cfe626930cce4c6afc1161c450d
--- /dev/null
+++ b/tests/script/unique/stream/table_replica1_dnode2.sim
@@ -0,0 +1,137 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+print ======================== dnode1 start
+
+$dbPrefix = t1d_db
+$tbPrefix = t1d_tb
+$mtPrefix = t1d_mt
+$stPrefix = t1d_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) --> $data00 $data01 $data02 $data03
+sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
+
+sql show tables
+if $rows != 13 then 
+  return -1
+endi
+
+print =============== step3
+print sleep 22 seconds
+sleep 22000 
+
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $rows $data00 $data01 $data10 $data11
+$rows1 = $rows
+if $data01 != 20 then
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st => $rows $data00 $data01 $data10 $data11
+$rows5 = $rows
+if $data01 != 20 then
+  return -1
+endi
+
+$i = 8
+$tb = $tbPrefix . $i
+$st = $stPrefix . $i
+sql select * from $st
+print $st ==> $rows $data00 $data01 $data10 $data11
+$rows8 = $rows
+if $data01 != 20 then
+  return -1
+endi
+
+if $rows8 != $rows5 then
+  return -1
+endi
+
+if $rows8 != $rows1 then
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..da24b5ab4e825d2795a7ec1f3e2ccbee563e81ed
--- /dev/null
+++ b/tests/script/unique/stream/table_replica2_dnode2.sim
@@ -0,0 +1,312 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+print ======================== dnode1 start
+
+$dbPrefix = t2d_db
+$tbPrefix = t2d_tb
+$mtPrefix = t2d_mt
+$stPrefix = t2d_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step14 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step15 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step16
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step17
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0717e6f965fbc3d70caf09102b0fb6df15e76a5e
--- /dev/null
+++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
@@ -0,0 +1,314 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+print ======================== dnode1 start
+
+$dbPrefix = t2dv_db
+$tbPrefix = t2dv_tb
+$mtPrefix = t2dv_mt
+$stPrefix = t2dv_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step14 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step15 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step16
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step17
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..10d9feec53e15b92e01479227d10016c22ed8bb7
--- /dev/null
+++ b/tests/script/unique/stream/table_replica2_dnode3.sim
@@ -0,0 +1,325 @@
+system sh/stop_dnodes.sh
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+if $data4_192.168.0.3 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = t2d3_db
+$tbPrefix = t2d3_tb
+$mtPrefix = t2d3_mt
+$stPrefix = t2d3_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step14 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step15 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step16
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step17
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3b9552084bbc968f6a6076129668208641b0608a
--- /dev/null
+++ b/tests/script/unique/stream/table_replica3_dnode4.sim
@@ -0,0 +1,333 @@
+system sh/stop_dnodes.sh
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+if $data4_192.168.0.3 == offline then
+  goto createDnode
+endi  
+if $data4_192.168.0.4 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode1 start
+
+$dbPrefix = t3d_db
+$tbPrefix = t3d_tb
+$mtPrefix = t3d_mt
+$stPrefix = t3d_st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql drop databae $db -x step1
+step1:
+sql create database $db replica 3
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3 c2
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql create table $st as select count(tbcol) from $tb interval(1d)
+
+print =============== step4 c3
+sql select count(tbcol2) from $tb interval(1d)
+print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql create table $st as select count(tbcol2) from $tb interval(1d)
+
+print =============== step5 avg
+sql select avg(tbcol) from $tb interval(1d)
+print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql create table $st as select avg(tbcol) from $tb interval(1d)
+
+print =============== step6 su
+sql select sum(tbcol) from $tb interval(1d)
+print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql create table $st as select sum(tbcol) from $tb interval(1d)
+
+print =============== step7 mi
+sql select min(tbcol) from $tb interval(1d)
+print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql create table $st as select min(tbcol) from $tb interval(1d)
+
+print =============== step8 ma
+sql select max(tbcol) from $tb interval(1d)
+print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql create table $st as select max(tbcol) from $tb interval(1d)
+
+print =============== step9 fi
+sql select first(tbcol) from $tb interval(1d)
+print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql create table $st as select first(tbcol) from $tb interval(1d)
+
+print =============== step10 la
+sql select last(tbcol) from $tb interval(1d)
+print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql create table $st as select last(tbcol) from $tb interval(1d)
+
+print =============== step11 st
+sql select stddev(tbcol) from $tb interval(1d)
+print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql create table $st as select stddev(tbcol) from $tb interval(1d)
+
+print =============== step12 le
+sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
+#if $data01 != @(0.000017, -25362055.126740)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . le
+sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
+
+print =============== step13 pe
+
+sql select percentile(tbcol, 1) from $tb interval(1d)
+print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . pe
+sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
+
+print =============== step14 wh
+sql select count(tbcol) from $tb where ts < now + 4m interval(1d)
+print select count(tbcol) from $tb where ts < now + 4m interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql create table $st as select count(tbcol) from $tb where ts < now + 4m interval(1d)
+
+print =============== step15 as
+sql select count(tbcol) from $tb interval(1d)
+print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . as
+sql create table $st as select count(tbcol) as c from $tb interval(1d)
+
+print =============== step16
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step17
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c2
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c3
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . av
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+$st = $stPrefix . su
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+$st = $stPrefix . mi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . ma
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . fi
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+$st = $stPrefix . la
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+$st = $stPrefix . std
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+$st = $stPrefix . le
+sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != @(0.000017, -25270086.331047)@ then 
+#  return -1
+#endi
+
+$st = $stPrefix . pe
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != 0.190000000 then 
+  return -1
+endi
+
+$st = $stPrefix . wh
+#sql select * from $st
+#print ===> select * from $st ===> $data00 $data01
+#if $data01 != $rowNum then 
+#  return -1
+#endi
+
+$st = $stPrefix . as
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim
new file mode 100644
index 0000000000000000000000000000000000000000..16350949b12e53dd452e1fba46524352a1953408
--- /dev/null
+++ b/tests/script/unique/stream/table_vnode_stop.sim
@@ -0,0 +1,189 @@
+system sh/stop_dnodes.sh
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 2
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname2
+system sh/exec.sh -n dnode2 -s start
+$x = 0
+createDnode: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql show dnodes;
+if $data4_192.168.0.2 == offline then
+  goto createDnode
+endi  
+
+print ======================== dnode start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step3  
+system sh/exec.sh -n dnode2 -s stop
+
+print =============== step4
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step5
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============   step6
+
+sql close
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+sleep 2000
+system sh/exec.sh -n dnode2 -s start
+
+$x = 0
+connectTbase2: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql connect -x connectTbase2
+sleep 3000
+
+sql create dnode $hostname1
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+print ======================== dnode start
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+$stPrefix = st
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step7
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$st = $stPrefix . $i
+
+sql create database $db replica 2
+sql use $db
+sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = -1440
+  $y = 0
+  while $y < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now $ms , $y , $y ) 
+    $x = $x + 1
+	$y = $y + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step8 c1
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb interval(1d)
+print select count(*) from $tb interval(1d) ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+$st = $stPrefix . c1
+sql create table $st as select count(*) from $tb interval(1d)
+
+print =============== step9 
+system sh/exec.sh -n dnode1 -s stop
+
+print =============== step10
+print sleep 22 seconds
+sleep 22000 
+
+print =============== step11
+$st = $stPrefix . c1
+sql select * from $st
+print ===> select * from $st ===> $data00 $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+
+
diff --git a/tests/script/unique/stream/testSuite.sim b/tests/script/unique/stream/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bbf5da3d376d9eccc02aa61b1122cadb5fc04813
--- /dev/null
+++ b/tests/script/unique/stream/testSuite.sim
@@ -0,0 +1,15 @@
+#run unique/stream/table_replica1_dnode2.sim
+#run unique/stream/metrics_replica1_dnode2.sim
+#run unique/stream/table_replica2_dnode2.sim
+#run unique/stream/metrics_replica2_dnode2.sim
+#run unique/stream/table_replica2_dnode2_vnoden.sim
+#run unique/stream/metrics_replica2_dnode2_vnoden.sim
+#run unique/stream/table_replica2_dnode3.sim
+#run unique/stream/metrics_replica2_dnode3.sim
+#run unique/stream/table_replica3_dnode4.sim
+#run unique/stream/metrics_replica3_dnode4.sim
+#run unique/stream/table_vnode_stop.sim
+#run unique/stream/metrics_vnode_stop.sim
+##run unique/stream/table_balance.sim
+##run unique/stream/metrics_balance.sim
+##run unique/stream/table_move.sim
\ No newline at end of file
diff --git a/tests/script/unique/vnode/back_insert.sim b/tests/script/unique/vnode/back_insert.sim
new file mode 100644
index 0000000000000000000000000000000000000000..43831cca95b49218719c5172c3d2d96ad3500896
--- /dev/null
+++ b/tests/script/unique/vnode/back_insert.sim
@@ -0,0 +1,7 @@
+sql connect
+$x = 1
+begin:
+  sql insert into db.tb values(now, $x ) -x begin  
+  #print ===> insert successed $x 
+  $x = $x + 1   
+goto begin
\ No newline at end of file
diff --git a/tests/script/unique/vnode/back_insert_many.sim b/tests/script/unique/vnode/back_insert_many.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6181a835ed8dfd344a96029d9965f2b87c8b1b3e
--- /dev/null
+++ b/tests/script/unique/vnode/back_insert_many.sim
@@ -0,0 +1,10 @@
+sql connect
+$x = 1
+begin:
+  sql insert into db1.tb1 values(now, $x ) -x begin  
+  sql insert into db2.tb2 values(now, $x ) -x begin  
+  sql insert into db3.tb3 values(now, $x ) -x begin  
+  sql insert into db4.tb4 values(now, $x ) -x begin  
+  #print ===> insert successed $x 
+  $x = $x + 1   
+goto begin
\ No newline at end of file
diff --git a/tests/script/unique/vnode/backup/replica4.sim b/tests/script/unique/vnode/backup/replica4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bccc17e682258b29d08d493a8c457682287ccfa1
--- /dev/null
+++ b/tests/script/unique/vnode/backup/replica4.sim
@@ -0,0 +1,220 @@
+system sh/stop_dnodes.sh
+
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+
+system sh/exec.sh -n dnode1 -s start
+$x = 0
+connectTbase: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql connect -x connectTbase
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sleep 3001
+
+$N = 10
+$table = table_r4
+$db = db1
+
+print =================== step 1 
+
+$x = 0
+created: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create database $db replica 4 -x created
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $table (ts timestamp, speed int) -x create1
+sleep 3001
+
+print =================== step 2
+$x = 1
+$y = $x + $N
+$expect = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 3
+system sh/exec.sh -n dnode2 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 4
+system sh/exec.sh -n dnode2 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 3
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 5
+system sh/exec.sh -n dnode3 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 4
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 6
+system sh/exec.sh -n dnode3 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 5
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+
+print =================== step 7
+system sh/exec.sh -n dnode4 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 6
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 8
+system sh/exec.sh -n dnode4 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 7
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 9
+system sh/exec.sh -n dnode1 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 8
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , 10)
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 10
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 9
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+system sh/exec.sh -n dnode3 -s stop
+system sh/exec.sh -n dnode4 -s stop
+
diff --git a/tests/script/unique/vnode/backup/replica5.sim b/tests/script/unique/vnode/backup/replica5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d29d11fdafdcf9b368e3f94350fd959168764445
--- /dev/null
+++ b/tests/script/unique/vnode/backup/replica5.sim
@@ -0,0 +1,263 @@
+system sh/stop_dnodes.sh
+
+
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode2 -c walLevel -v 0
+system sh/cfg.sh -n dnode3 -c walLevel -v 0
+system sh/cfg.sh -n dnode4 -c walLevel -v 0
+system sh/cfg.sh -n dnode5 -c walLevel -v 0
+
+system sh/exec.sh -n dnode1 -s start
+
+$x = 0
+connectTbase: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql connect -x connectTbase
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
+
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+system sh/exec.sh -n dnode5 -s start
+sleep 3001
+
+$N = 10
+$table = table_r5
+$db = db1
+
+print =================== step 1 
+
+$x = 0
+created: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create database $db replica 5 -x created
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $table (ts timestamp, speed int) -x create1
+
+sleep 3001
+
+print =================== step 2
+$x = 1
+$y = $x + $N
+$expect = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 3
+system sh/exec.sh -n dnode2 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 4
+system sh/exec.sh -n dnode2 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 3
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 5
+system sh/exec.sh -n dnode3 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 4
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 6
+system sh/exec.sh -n dnode3 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 5
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+
+print =================== step 7
+system sh/exec.sh -n dnode4 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 6
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 8
+system sh/exec.sh -n dnode4 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 7
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+
+print =================== step 9
+system sh/exec.sh -n dnode5 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 8
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 10
+system sh/exec.sh -n dnode5 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 9
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 11
+system sh/exec.sh -n dnode1 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 10
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , 10)
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 12
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 11
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop
+system sh/exec.sh -n dnode2 -s stop
+system sh/exec.sh -n dnode3 -s stop
+system sh/exec.sh -n dnode4 -s stop
+system sh/exec.sh -n dnode5 -s stop
+
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8bd6372ae9c677f5fc8475430ec3135b21409835
--- /dev/null
+++ b/tests/script/unique/vnode/many.sim
@@ -0,0 +1,117 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ========= step1
+sql create database db1 replica 2 
+sql create database db2 replica 2 
+sql create database db3 replica 2 
+sql create database db4 replica 2 
+sql create table db1.tb1 (ts timestamp, i int)
+sql create table db2.tb2 (ts timestamp, i int)
+sql create table db3.tb3 (ts timestamp, i int)
+sql create table db4.tb4 (ts timestamp, i int)
+sql insert into db1.tb1 values(now, 1)
+sql insert into db2.tb2 values(now, 1)
+sql insert into db3.tb3 values(now, 1)
+sql insert into db4.tb4 values(now, 1)
+
+sql select count(*) from db1.tb1
+$lastRows1 = $rows
+sql select count(*) from db2.tb2
+$lastRows2 = $rows
+sql select count(*) from db3.tb3
+$lastRows3 = $rows
+sql select count(*) from db4.tb4
+$lastRows4 = $rows
+
+print ======== step2
+run_back unique/vnode/back_insert_many.sim
+sleep 5000
+
+print ======== step3
+
+$x = 0
+loop:
+
+print ======== step4
+system sh/exec.sh -n dnode3 -s stop
+sleep 5000
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+print ======== step5
+system sh/exec.sh -n dnode2 -s stop
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+print ======== step6
+sql select count(*) from db1.tb1
+print select count(*) from db1.tb1 ==> $data00 $lastRows1 
+if $data00 <= $lastRows1 then
+  return -1
+endi
+$lastRows1 = $data00
+
+sql select count(*) from db2.tb2
+print select count(*) from db2.tb2 ==> $data00 $lastRows2 
+if $data00 <= $lastRows2 then
+  return -1
+endi
+$lastRows2 = $data00
+
+sql select count(*) from db3.tb3
+print select count(*) from  db3.tb3 ==> $data00 $lastRows3 
+if $data00 <= $lastRows3 then
+  return -1
+endi
+$lastRows3 = $data00
+
+sql select count(*) from db4.tb4
+print select count(*) from  db4.tb4 ==> $data00 $lastRows4 
+if $data00 <= $lastRows4 then
+  return -1
+endi
+$lastRows4 = $data00
+
+print ======== step7
+
+print ======== loop Times $x
+
+if $x < 2 then
+  $x = $x + 1
+  goto loop
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_a_large.sim b/tests/script/unique/vnode/replica2_a_large.sim
new file mode 100644
index 0000000000000000000000000000000000000000..801570dd9c18daa5611d621660e88905fa73c2b3
--- /dev/null
+++ b/tests/script/unique/vnode/replica2_a_large.sim
@@ -0,0 +1,103 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode1 -c debugFlag -v 131
+system sh/cfg.sh -n dnode2 -c debugFlag -v 131
+system sh/cfg.sh -n dnode3 -c debugFlag -v 131
+system sh/cfg.sh -n dnode4 -c debugFlag -v 131
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start -t
+system sh/exec.sh -n dnode3 -s start -t
+sleep 3000
+
+print ========= step1
+sql create database db replica 2 
+#sql create table db.tb1 (ts timestamp, i int)
+#sql create table db.tb2 (ts timestamp, i int)
+#sql create table db.tb3 (ts timestamp, i int)
+#sql create table db.tb4 (ts timestamp, i int)
+#sql insert into db.tb1 values(now, 1)
+#sql select count(*) from db.tb1
+
+sql create database db replica 2 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+sql select count(*) from db.tb
+$lastRows = $rows
+
+print ======== step2
+#run_back unique/vnode/back_insert_many.sim
+run_back unique/vnode/back_insert.sim
+sleep 3000
+
+print ======== step3
+
+$x = 0
+loop:
+
+print ======== step4
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 10000
+system sh/exec.sh -n dnode2 -s start -t
+sleep 10000
+
+print ======== step5
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 10000
+system sh/exec.sh -n dnode3 -s start -t
+sleep 10000
+
+print ======== step6
+#sql select count(*) from db.tb1
+#print select count(*) from db.tb1 ==> $data00 $lastRows 
+sql select count(*) from db.tb
+print select count(*) from db.tb ==> $data00 $lastRows 
+if $data00 <= $lastRows then
+  return -1
+endi
+
+print ======== step7
+$lastRows = $data00
+print ======== loop Times $x
+
+if $x < 10 then
+  $x = $x + 1
+  goto loop
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6976353f3e292b3752b1df9f7ac1c398087a644a
--- /dev/null
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@@ -0,0 +1,223 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+print ========= start dnodes
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+sql reset query cache
+
+print ========= step1 
+sql create database d1 replica 2
+sql create database d2 replica 2
+sql create database d3 replica 2
+sql create database d4 replica 2
+
+sql create table d1.t1 (ts timestamp, i int)
+sql create table d2.t2 (ts timestamp, i int)
+sql create table d3.t3 (ts timestamp, i int)
+sql create table d4.t4 (ts timestamp, i int)
+
+sql insert into d1.t1 values(now, 1)
+sql insert into d2.t2 values(now, 1)
+sql insert into d3.t3 values(now, 1)
+sql insert into d4.t4 values(now, 1)
+
+sql select * from d1.t1
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 1 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 1 then
+	return -1
+endi
+
+sql show dnodes
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3
+
+if $data2_1 != 0 then
+  return -1
+endi
+
+if $data2_2 != 4 then
+  return -1
+endi
+
+if $data2_3 != 4 then
+  return -1
+endi
+
+if $data4_1 != ready then
+  print dnode1 status should ready but is $data4_1
+  return -1
+endi
+
+if $data4_2 != ready then
+  return -1
+endi
+
+if $data4_3 != ready then
+  return -1
+endi
+
+print ========= step2
+sql insert into d1.t1 values(now, 2)
+sql insert into d2.t2 values(now, 2)
+sql insert into d3.t3 values(now, 2)
+sql insert into d4.t4 values(now, 2)
+
+sql select * from d1.t1
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 2 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 2 then
+	return -1
+endi
+
+print ========= step3 
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
+sleep 5000
+
+#sql insert into d1.t1 values(now, 3)
+#sql insert into d2.t2 values(now, 3)
+#sql insert into d3.t3 values(now, 3)
+#sql insert into d4.t4 values(now, 3)
+
+#sql select * from d1.t1
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d2.t2
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d3.t3
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d4.t4
+#if $rows != 2 then
+#	return -1
+#endi
+
+print ========= step4
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop -x SIGINT
+sleep 5000
+
+#sql insert into d1.t1 values(now, 4)
+#sql insert into d2.t2 values(now, 4)
+#sql insert into d3.t3 values(now, 4)
+#sql insert into d4.t4 values(now, 4)
+
+#sql select * from d1.t1
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d2.t2
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d3.t3
+#if $rows != 2 then
+#	return -1
+#endi
+
+#sql select * from d4.t4
+#if $rows != 2 then
+#	return -1
+#endi
+
+print ========= step5
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+sql insert into d1.t1 values(now, 5)
+sql insert into d2.t2 values(now, 5)
+sql insert into d3.t3 values(now, 5)
+sql insert into d4.t4 values(now, 5)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d2.t2
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d4.t4
+if $rows != 3 then
+	return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e862d745d4fac88137d1053b1bccd22d72c5f7cc
--- /dev/null
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -0,0 +1,79 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+print ========= step1
+sql create database db replica 2 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+sql select count(*) from db.tb
+$lastRows = $rows
+
+print ======== step2
+run_back unique/vnode/back_insert.sim
+sleep 3000
+
+print ======== step3
+
+$x = 0
+loop:
+
+print ======== step4
+system sh/exec.sh -n dnode2 -s stop
+sleep 5000
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+
+print ======== step5
+system sh/exec.sh -n dnode3 -s stop
+sleep 5000
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+
+print ======== step6
+sql select count(*) from db.tb
+print select count(*) from db.tb ==> $data00 $lastRows 
+if $data00 <= $lastRows then
+  return -1
+endi
+
+print ======== step7
+$lastRows = $data00
+print ======== loop Times $x
+
+if $x < 5 then
+  $x = $x + 1
+  goto loop
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ab5bebb50daf8a3be63d039152a020f0fff7000b
--- /dev/null
+++ b/tests/script/unique/vnode/replica3_basic.sim
@@ -0,0 +1,159 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+$N = 10
+$table = table_r3
+$db = db1
+
+sleep 3000
+
+print =================== step 1 
+
+sql create database $db replica 3 
+sql use $db
+sql create table $table (ts timestamp, speed int) 
+sleep 3001
+
+print =================== step 2
+$x = 1
+$y = $x + $N
+$expect = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 3
+system sh/exec.sh -n dnode2 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 4
+system sh/exec.sh -n dnode2 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 3
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 5
+system sh/exec.sh -n dnode3 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 4
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =================== step 6
+system sh/exec.sh -n dnode3 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 5
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , $x )
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 7
+system sh/exec.sh -n dnode1 -s stop
+sleep 2000
+$y = $x + $N
+$expect = $N * 6
+while $x < $y
+$ms = $x . m
+sql insert into $table values (now + $ms , 10)
+$x = $x + 1
+endw
+
+sql select * from $table
+print sql select * from $table -> $rows points
+if $rows != $expect then
+return -1
+endi
+
+print =================== step 8
+system sh/exec.sh -n dnode1 -s start
+sleep 2000
+$y = $x + $N
+$expect = $N * 7
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now + $ms , 10) 
+  $x = $x + 1
+endw 
+
+sql select * from $table
+print sql select * from $table -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4b5c852de8a6f841ae75b9716577ae735f970b3f
--- /dev/null
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -0,0 +1,90 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode4 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+sleep 3000
+
+print ========= step1
+sql create database db replica 3
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+sql select count(*) from db.tb
+$lastRows = $rows
+
+print ======== step2
+run_back unique/vnode/back_insert.sim
+sleep 3000
+
+print ======== step3
+system sh/exec.sh -n dnode2 -s stop
+sleep 5000
+
+$x = 0
+loop:
+
+print ======== step4
+system sh/exec.sh -n dnode2 -s start
+sleep 5000
+system sh/exec.sh -n dnode3 -s stop
+sleep 5000
+
+print ======== step5
+system sh/exec.sh -n dnode3 -s start
+sleep 5000
+system sh/exec.sh -n dnode4 -s stop
+sleep 5000
+
+print ======== step6
+system sh/exec.sh -n dnode4 -s start
+sleep 5000
+system sh/exec.sh -n dnode2 -s stop
+sleep 5000
+
+print ======== step7
+sql select count(*) from db.tb
+print select count(*) from db.tb ==> $data00 $lastRows 
+if $data00 <= $lastRows then
+  return -1
+endi
+
+print ======== step8
+$lastRows = $data00
+print ======== loop Times $x
+
+if $x < 5 then
+  $x = $x + 1
+  goto loop
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
new file mode 100644
index 0000000000000000000000000000000000000000..11295ba0a42cfea1ee6ff5fd50f8563ee344fc77
--- /dev/null
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -0,0 +1,71 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/cfg.sh -n dnode1 -c wallevel -v 2
+system sh/cfg.sh -n dnode2 -c wallevel -v 2
+system sh/cfg.sh -n dnode3 -c wallevel -v 2
+system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
+
+system sh/exec.sh -n dnode1 -s start
+sql connect
+sql create dnode $hostname2
+sql create dnode $hostname3
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+sleep 3000
+
+$N = 10
+$table = table_r3
+$db = db1
+
+sleep 3000
+
+print =================== step 1 
+
+sql create database $db replica 3
+sql use $db
+sql create table st (ts timestamp, speed int) tags (t1 int)
+sleep 3001
+
+
+$tbPre = m
+$N = 300
+$x = 0
+$y = $x + $N
+while $x < $y
+  $table = $tbPre . $x 
+  sql create table $table using st tags ( $x )
+  $ms = $x . m
+  sql insert into $table values (now + $ms , $x )  
+  $x = $x + 1
+endw 
+
+
+#print =================== step 2
+$x = -500
+$y = $x + $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $table values (now $ms , $x ) 
+  $x = $x + 1
+endw 
+
+$expect = $N + 1
+sql select * from $table
+print sql select * from $table -> $rows points expect $expect
+if $rows != $expect then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec.sh -n dnode8 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/unique/vnode/testSuite.sim b/tests/script/unique/vnode/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3a9db66beb77d29b7d6bcb68d070edd91c97e199
--- /dev/null
+++ b/tests/script/unique/vnode/testSuite.sim
@@ -0,0 +1,6 @@
+run unique/vnode/many.sim
+run unique/vnode/replica2_basic2.sim
+run unique/vnode/replica2_repeat.sim
+run unique/vnode/replica3_basic.sim
+run unique/vnode/replica3_repeat.sim
+run unique/vnode/replica3_vgroup.sim
diff --git a/tests/script/windows/alter/metrics.sim b/tests/script/windows/alter/metrics.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7d5dc779490f7591ff9330c47622e46f98fb1783
--- /dev/null
+++ b/tests/script/windows/alter/metrics.sim
@@ -0,0 +1,769 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+print ======== step1 
+sql create database d2
+sql use d2
+sql create table mt (ts timestamp, a int) TAGS (t int)
+sql create table tb using mt tags (1)
+sql insert into tb values(now-28d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select * from tb
+if $rows != 3 then
+  return -1
+endi
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != t then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+
+print ======== step2
+sql alter table mt add column b smallint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != t then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+
+print ======== step3
+sql alter table mt add column c tinyint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != t then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step4
+sql alter table mt add column d int
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != t then
+  return -1
+endi
+if $data51 != INT then
+  return -1
+endi
+
+print ======== step5
+sql alter table mt add column e bigint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != t then
+  return -1
+endi
+if $data61 != INT then
+  return -1
+endi
+
+print ======== step6
+sql alter table mt add column f float
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != t then
+  return -1
+endi
+if $data71 != INT then
+  return -1
+endi
+
+print ======== step7
+sql alter table mt add column g double
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != t then
+  return -1
+endi
+if $data81 != INT then
+  return -1
+endi
+
+print ======== step8
+sql alter table mt add column h binary(10)
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+if $data90 != t then
+  return -1
+endi
+if $data91 != INT then
+  return -1
+endi
+
+print ======== step9
+print ======== step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use d2
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+if $data90 != t then
+  return -1
+endi
+if $data91 != INT then
+  return -1
+endi
+
+print ======== step11
+#sql alter table mt drop column a -x step111
+#  return -1
+#step111:
+
+#sql alter table mt drop column ts -x step112
+#  return -1
+#step112:
+
+#sql alter table mt drop column cdfg -x step113
+#  return -1
+#step113:
+
+#sql alter table mt add column a -x step114
+#  return -1
+#step114:
+
+#sql alter table mt add column b -x step115
+#  return -1
+#step115:
+
+print ======== step12
+sql alter table mt drop column b
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != c then
+  return -1
+endi
+if $data21 != TINYINT then
+  return -1
+endi
+if $data30 != d then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+if $data40 != e then
+  return -1
+endi
+if $data41 != BIGINT then
+  return -1
+endi
+if $data50 != f then
+  return -1
+endi
+if $data51 != FLOAT then
+  return -1
+endi
+if $data60 != g then
+  return -1
+endi
+if $data61 != DOUBLE then
+  return -1
+endi
+if $data70 != h then
+  return -1
+endi
+if $data71 != BINARY then
+  return -1
+endi
+if $data72 != 10 then
+  return -1
+endi
+if $data80 != t then
+  return -1
+endi
+if $data81 != INT then
+  return -1
+endi
+
+print ======== step13
+sql alter table mt drop column c
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != d then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != e then
+  return -1
+endi
+if $data31 != BIGINT then
+  return -1
+endi
+if $data40 != f then
+  return -1
+endi
+if $data41 != FLOAT then
+  return -1
+endi
+if $data50 != g then
+  return -1
+endi
+if $data51 != DOUBLE then
+  return -1
+endi
+if $data60 != h then
+  return -1
+endi
+if $data61 != BINARY then
+  return -1
+endi
+if $data62 != 10 then
+  return -1
+endi
+if $data70 != t then
+  return -1
+endi
+if $data71 != INT then
+  return -1
+endi
+
+print ======== step14
+sql alter table mt drop column d
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != e then
+  return -1
+endi
+if $data21 != BIGINT then
+  return -1
+endi
+if $data30 != f then
+  return -1
+endi
+if $data31 != FLOAT then
+  return -1
+endi
+if $data40 != g then
+  return -1
+endi
+if $data41 != DOUBLE then
+  return -1
+endi
+if $data50 != h then
+  return -1
+endi
+if $data51 != BINARY then
+  return -1
+endi
+if $data52 != 10 then
+  return -1
+endi
+if $data60 != t then
+  return -1
+endi
+if $data61 != INT then
+  return -1
+endi
+
+print ======== step15
+sql alter table mt drop column e
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != f then
+  return -1
+endi
+if $data21 != FLOAT then
+  return -1
+endi
+if $data30 != g then
+  return -1
+endi
+if $data31 != DOUBLE then
+  return -1
+endi
+if $data40 != h then
+  return -1
+endi
+if $data41 != BINARY then
+  return -1
+endi
+if $data42 != 10 then
+  return -1
+endi
+if $data50 != t then
+  return -1
+endi
+if $data51 != INT then
+  return -1
+endi
+
+print ======== step16
+sql alter table mt drop column f
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != g then
+  return -1
+endi
+if $data21 != DOUBLE then
+  return -1
+endi
+if $data30 != h then
+  return -1
+endi
+if $data31 != BINARY then
+  return -1
+endi
+if $data32 != 10 then
+  return -1
+endi
+if $data40 != t then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step17
+sql alter table mt drop column g
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != h then
+  return -1
+endi
+if $data21 != BINARY then
+  return -1
+endi
+if $data22 != 10 then
+  return -1
+endi
+if $data30 != t then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+
+print ============= step18
+sql alter table mt drop column h
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != t then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != null then
+  return -1
+endi
+
+print ======= over
+sql drop database d2
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
diff --git a/tests/script/windows/alter/table.sim b/tests/script/windows/alter/table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..03182e613d6cea983529e75512b736acfd702765
--- /dev/null
+++ b/tests/script/windows/alter/table.sim
@@ -0,0 +1,672 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+print ======== step1 
+sql create database d1
+sql use d1
+sql create table tb (ts timestamp, a int)
+sql insert into tb values(now-28d, -28)
+sql insert into tb values(now-27d, -27)
+sql insert into tb values(now-26d, -26)
+sql select * from tb
+if $rows != 3 then
+  return -1
+endi
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+
+print ======== step2
+sql alter table tb add column b smallint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+
+print ======== step3
+sql alter table tb add column c tinyint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+
+print ======== step4
+sql alter table tb add column d int
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+
+print ======== step5
+sql alter table tb add column e bigint
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+
+print ======== step6
+sql alter table tb add column f float
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+
+print ======== step7
+sql alter table tb add column g double
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+
+print ======== step8
+sql alter table tb add column h binary(10)
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+
+print ======== step9
+print ======== step10
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 5000
+system sh/exec.sh -n dnode1 -s start
+sleep 5000
+
+sql use d1
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != b then
+  return -1
+endi
+if $data21 != SMALLINT then
+  return -1
+endi
+if $data30 != c then
+  return -1
+endi
+if $data31 != TINYINT then
+  return -1
+endi
+if $data40 != d then
+  return -1
+endi
+if $data41 != INT then
+  return -1
+endi
+if $data50 != e then
+  return -1
+endi
+if $data51 != BIGINT then
+  return -1
+endi
+if $data60 != f then
+  return -1
+endi
+if $data61 != FLOAT then
+  return -1
+endi
+if $data70 != g then
+  return -1
+endi
+if $data71 != DOUBLE then
+  return -1
+endi
+if $data80 != h then
+  return -1
+endi
+if $data81 != BINARY then
+  return -1
+endi
+if $data82 != 10 then
+  return -1
+endi
+
+print ======== step11
+sql alter table drop column a -x step111
+  return -1
+step111:
+
+sql alter table drop column ts -x step112
+  return -1
+step112:
+
+sql alter table drop column cdfg -x step113
+  return -1
+step113:
+
+sql alter table add column a -x step114
+  return -1
+step114:
+
+sql alter table add column b -x step115
+  return -1
+step115:
+
+print ======== step12
+sql alter table tb drop column b
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != c then
+  return -1
+endi
+if $data21 != TINYINT then
+  return -1
+endi
+if $data30 != d then
+  return -1
+endi
+if $data31 != INT then
+  return -1
+endi
+if $data40 != e then
+  return -1
+endi
+if $data41 != BIGINT then
+  return -1
+endi
+if $data50 != f then
+  return -1
+endi
+if $data51 != FLOAT then
+  return -1
+endi
+if $data60 != g then
+  return -1
+endi
+if $data61 != DOUBLE then
+  return -1
+endi
+if $data70 != h then
+  return -1
+endi
+if $data71 != BINARY then
+  return -1
+endi
+if $data72 != 10 then
+  return -1
+endi
+
+print ======== step13
+sql alter table tb drop column c
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != d then
+  return -1
+endi
+if $data21 != INT then
+  return -1
+endi
+if $data30 != e then
+  return -1
+endi
+if $data31 != BIGINT then
+  return -1
+endi
+if $data40 != f then
+  return -1
+endi
+if $data41 != FLOAT then
+  return -1
+endi
+if $data50 != g then
+  return -1
+endi
+if $data51 != DOUBLE then
+  return -1
+endi
+if $data60 != h then
+  return -1
+endi
+if $data61 != BINARY then
+  return -1
+endi
+if $data62 != 10 then
+  return -1
+endi
+
+print ======== step14
+sql alter table tb drop column d
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != e then
+  return -1
+endi
+if $data21 != BIGINT then
+  return -1
+endi
+if $data30 != f then
+  return -1
+endi
+if $data31 != FLOAT then
+  return -1
+endi
+if $data40 != g then
+  return -1
+endi
+if $data41 != DOUBLE then
+  return -1
+endi
+if $data50 != h then
+  return -1
+endi
+if $data51 != BINARY then
+  return -1
+endi
+if $data52 != 10 then
+  return -1
+endi
+
+print ======== step15
+sql alter table tb drop column e
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != f then
+  return -1
+endi
+if $data21 != FLOAT then
+  return -1
+endi
+if $data30 != g then
+  return -1
+endi
+if $data31 != DOUBLE then
+  return -1
+endi
+if $data40 != h then
+  return -1
+endi
+if $data41 != BINARY then
+  return -1
+endi
+if $data42 != 10 then
+  return -1
+endi
+
+print ======== step16
+sql alter table tb drop column f
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != g then
+  return -1
+endi
+if $data21 != DOUBLE then
+  return -1
+endi
+if $data30 != h then
+  return -1
+endi
+if $data31 != BINARY then
+  return -1
+endi
+if $data32 != 10 then
+  return -1
+endi
+
+print ======== step17
+sql alter table tb drop column g
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != h then
+  return -1
+endi
+if $data21 != BINARY then
+  return -1
+endi
+if $data22 != 10 then
+  return -1
+endi
+
+print ============= step18
+sql alter table tb drop column h
+sql describe tb
+if $data00 != ts then
+  return -1
+endi
+if $data01 != TIMESTAMP then
+  return -1
+endi
+if $data10 != a then
+  return -1
+endi
+if $data11 != INT then
+  return -1
+endi
+if $data20 != null then
+  return -1
+endi
+
+print ======= over
+sql drop database d1
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
diff --git a/tests/script/windows/compute/avg.sim b/tests/script/windows/compute/avg.sim
new file mode 100644
index 0000000000000000000000000000000000000000..b655abf1638b290bc8b6c5dd4ac8887da57c8545
--- /dev/null
+++ b/tests/script/windows/compute/avg.sim
@@ -0,0 +1,158 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_av_db
+$tbPrefix = m_av_tb
+$mtPrefix = m_av_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select avg(tbcol) from $tb
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step3
+sql select avg(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+sql select avg(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step5
+sql select avg(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data11 != 1.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step6
+sql select avg(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data41 != 4.000000000 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select avg(tbcol) from $mt
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step8
+sql select avg(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step9
+sql select avg(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+
+sql select avg(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 9.500000000 then 
+  return -1
+endi
+
+print =============== step10
+sql select avg(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 9.500000000 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select avg(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1.000000000 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/bottom.sim b/tests/script/windows/compute/bottom.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dc104a8ebd4c92587f26620df0c13438b2c597bf
--- /dev/null
+++ b/tests/script/windows/compute/bottom.sim
@@ -0,0 +1,99 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_bo_db
+$tbPrefix = m_bo_tb
+$mtPrefix = m_bo_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select bottom(tbcol, 1) from $tb
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select bottom(tbcol, 1) from $tb where ts > now + 4m
+print ===> $data01
+if $data01 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select bottom(tbcol, 1) as b from $tb
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select bottom(tbcol, 2) as b from $tb 
+print ===> $data01  $data11
+if $data01 != 0 then 
+  return -1
+endi
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step6
+sql select bottom(tbcol, 2) as b from $tb where ts > now + 4m
+print ===> $data01  $data11
+if $data01 != 5 then 
+  return -1
+endi
+if $data11 != 6 then 
+  return -1
+endi
+
+sql select bottom(tbcol, 122) as b from $tb -x step6
+	return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/count.sim b/tests/script/windows/compute/count.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9c9d8821b01c5fa86f8eefe850c0923f2681d12b
--- /dev/null
+++ b/tests/script/windows/compute/count.sim
@@ -0,0 +1,174 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_co_db
+$tbPrefix = m_co_tb
+$mtPrefix = m_co_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+
+sql select count(*) from $tb
+print ===> select count(*) from $tb => $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != $rowNum then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(*) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol) as b from $mt interval(1m)
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+if $data11 != 10 then 
+  return -1
+endi
+
+sql select count(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 200 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != $rowNum then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data01
+if $data01 != 1 then 
+  return -1
+endi
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/diff.sim b/tests/script/windows/compute/diff.sim
new file mode 100644
index 0000000000000000000000000000000000000000..667fcdbcff7a92c130ee5fe2253f25fd636790c3
--- /dev/null
+++ b/tests/script/windows/compute/diff.sim
@@ -0,0 +1,91 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_di_db
+$tbPrefix = m_di_tb
+$mtPrefix = m_di_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select diff(tbcol) from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select diff(tbcol) from $tb where ts > now + 4m
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select diff(tbcol) from $tb where ts < now + 4m
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step4
+sql select diff(tbcol) as b from $tb
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select diff(tbcol) as b from $tb interval(1m) -x step5
+  return -1
+step5:
+
+print =============== step6
+sql select diff(tbcol) as b from $tb where ts < now + 4m interval(1m) -x step6
+  return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/first.sim b/tests/script/windows/compute/first.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d6e1b1deeaccff9fa5199eed86b1d85d7c541c29
--- /dev/null
+++ b/tests/script/windows/compute/first.sim
@@ -0,0 +1,160 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_fi_db
+$tbPrefix = m_fi_tb
+$mtPrefix = m_fi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select first(tbcol) from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select first(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql select first(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select first(tbcol) as b from $tb interval(1m)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql select first(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data41 != 4 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select first(tbcol) from $mt
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql select first(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select first(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step9
+sql select first(tbcol) as b from $mt interval(1m)
+print select first(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select first(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step10
+sql select first(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select first(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/interval.sim b/tests/script/windows/compute/interval.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4bf548ccf21ad1cf89d6688d1921b9742becbe1f
--- /dev/null
+++ b/tests/script/windows/compute/interval.sim
@@ -0,0 +1,176 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_in_db
+$tbPrefix = m_in_tb
+$mtPrefix = m_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
+print ===> $rows
+if $rows < $rowNum then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now + 4m interval(1m)
+print ===> $rows
+if $rows > 10 then 
+  return -1
+endi
+if $rows < 3 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now+40m and ts > now-1m interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data05 != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts < now+40m and ts > now+1m interval(1m) fill(value,0)
+print ===> $rows
+if $rows < 30 then 
+  return -1
+endi
+if $rows > 50 then 
+  return -1
+endi
+if $data21 != 1 then 
+  return -1
+endi
+if $data25 != 1 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now + 4m interval(1m)
+print ===> $rows
+if $rows < 3 then 
+  return -1
+endi
+if $rows > 7 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now+40m and ts > now-1m interval(1m)
+print ===> $rows
+if $rows < 18 then 
+  return -1
+endi
+if $rows > 22 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts < now+40m and ts > now+1m interval(1m) fill(value, 0)
+if $rows < 30 then 
+  return -1
+endi
+if $rows > 50 then 
+  return -1
+endi
+if $data11 > 15 then 
+  return -1
+endi
+if $data11 < 5 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/last.sim b/tests/script/windows/compute/last.sim
new file mode 100644
index 0000000000000000000000000000000000000000..63d4d3ecbdd9cd000e7a10a814aa19bb741c6880
--- /dev/null
+++ b/tests/script/windows/compute/last.sim
@@ -0,0 +1,159 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_la_db
+$tbPrefix = m_la_tb
+$mtPrefix = m_la_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select last(tbcol) from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select last(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select last(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select last(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select last(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select last(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select last(tbcol) from $mt
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step8
+sql select last(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select last(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+sql select last(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step9
+sql select last(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select last(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step10
+sql select last(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select last(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/leastsquare.sim b/tests/script/windows/compute/leastsquare.sim
new file mode 100644
index 0000000000000000000000000000000000000000..69c8fb377b00ad28013ac81f07818151bf387791
--- /dev/null
+++ b/tests/script/windows/compute/leastsquare.sim
@@ -0,0 +1,102 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_le_db
+$tbPrefix = m_le_tb
+$mtPrefix = m_le_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db keep 36500
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 2
+  $ms = 1000
+  while $x < $rowNum
+    $ms = $ms + 1000
+    sql insert into $tb values ($ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select leastsquares(tbcol, 1, 1) from $tb
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step3
+sql select leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step4
+sql select leastsquares(tbcol, 1, 1) as b from $tb
+print ===> $data00
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step5
+print select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
+sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
+print ===> $data01 
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
+sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+
+print =============== step6
+sql select leastsquares(tbcol, 1, 1) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
+  return -1
+endi
+print ===> $rows
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/compute/max.sim b/tests/script/windows/compute/max.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e480736550781babf036a3ab4af40f81753dc8b6
--- /dev/null
+++ b/tests/script/windows/compute/max.sim
@@ -0,0 +1,159 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_ma_db
+$tbPrefix = m_ma_tb
+$mtPrefix = m_ma_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select max(tbcol) from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select max(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select max(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select max(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select max(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select max(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select max(tbcol) from $mt
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+print =============== step8
+sql select max(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select max(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+sql select max(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 4 then 
+  return -1
+endi
+
+print =============== step9
+sql select max(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select max(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step10
+sql select max(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 19 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select max(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/min.sim b/tests/script/windows/compute/min.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1ff637cecd27c979bb7c4a978d806726c8c62ff6
--- /dev/null
+++ b/tests/script/windows/compute/min.sim
@@ -0,0 +1,159 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mi_db
+$tbPrefix = m_mi_tb
+$mtPrefix = m_mi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select min(tbcol) from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select min(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql select min(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql select min(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select min(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql select min(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select min(tbcol) from $mt
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql select min(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select min(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+sql select min(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+print =============== step9
+sql select min(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select min(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 0 then 
+  return -1
+endi
+
+print =============== step10
+sql select min(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 0 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select min(tbcol) as b from $mt  where ts < now + 4m interval(1m) group by tgcol
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+print ===> $rows
+if $rows != 50 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/percentile.sim b/tests/script/windows/compute/percentile.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5e327055a8bfd563691c04ff5cb9ea7fbd9dddc5
--- /dev/null
+++ b/tests/script/windows/compute/percentile.sim
@@ -0,0 +1,116 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_pe_db
+$tbPrefix = m_pe_tb
+$mtPrefix = m_pe_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select percentile(tbcol, 10) from $tb
+print ===> $data00
+if $data00 != 1.900000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 20) from $tb
+print ===> $data00
+if $data00 != 3.800000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 100) from $tb
+print ===> $data00
+if $data00 != 19.000000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 110) from $tb -x step2
+  return -1
+step2:
+
+print =============== step3
+sql select percentile(tbcol, 1) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.140000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 5) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.700000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 0) from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+print =============== step4
+sql select percentile(tbcol, 1) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.140000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 5) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.700000000 then 
+  return -1
+endi
+
+sql select percentile(tbcol, 0) as c from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/stddev.sim b/tests/script/windows/compute/stddev.sim
new file mode 100644
index 0000000000000000000000000000000000000000..2aa481248ae511ae0aaa3e2621c05eb9d4ea71e2
--- /dev/null
+++ b/tests/script/windows/compute/stddev.sim
@@ -0,0 +1,98 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_st_db
+$tbPrefix = m_st_tb
+$mtPrefix = m_st_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select stddev(tbcol) from $tb
+print ===> $data00
+if $data00 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step3
+sql select stddev(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 1.414213562 then 
+  return -1
+endi
+
+print =============== step4
+sql select stddev(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step5
+sql select stddev(tbcol) as b from $tb interval(1m)
+print ===> $data01 
+if $data01 != 0.000000000 then 
+  return -1
+endi
+
+sql select stddev(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 5.766281297 then 
+  return -1
+endi
+
+print =============== step6
+sql select stddev(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data01
+if $data01 != 0.000000000 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/sum.sim b/tests/script/windows/compute/sum.sim
new file mode 100644
index 0000000000000000000000000000000000000000..30e98a5b2596306865d774267936e4380a16d2d1
--- /dev/null
+++ b/tests/script/windows/compute/sum.sim
@@ -0,0 +1,159 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_su_db
+$tbPrefix = m_su_tb
+$mtPrefix = m_su_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select sum(tbcol) from $tb
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+print =============== step3
+sql select sum(tbcol) from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select sum(tbcol) as b from $tb
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+print =============== step5
+sql select sum(tbcol) as b from $tb interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+
+sql select sum(tbcol) as b from $tb interval(1d)
+print ===> $data01
+if $data01 != 190 then 
+  return -1
+endi
+
+print =============== step6
+sql select sum(tbcol) as b from $tb where ts < now + 4m interval(1m)
+print ===> $data11
+if $data11 != 1 then 
+  return -1
+endi
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select sum(tbcol) from $mt
+print ===> $data00
+if $data00 != 1900 then 
+  return -1
+endi
+
+print =============== step8
+sql select sum(tbcol) as c from $mt where ts < now + 4m
+print ===> $data00
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select sum(tbcol) as c from $mt where tgcol < 5
+print ===> $data00
+if $data00 != 950 then 
+  return -1
+endi
+
+sql select sum(tbcol) as c from $mt where tgcol < 5 and ts < now + 4m
+print ===> $data00
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select sum(tbcol) as b from $mt interval(1m)
+print ===> $data11
+if $data11 < 5 then 
+  return -1
+endi
+
+sql select sum(tbcol) as b from $mt interval(1d)
+print ===> $data01
+if $data01 != 1900 then 
+  return -1
+endi
+
+print =============== step10
+sql select sum(tbcol) as b from $mt group by tgcol
+print ===> $data00
+if $data00 != 190 then 
+  return -1
+endi
+
+if $rows != $tbNum then 
+  return -1
+endi
+
+print =============== step11
+sql select sum(tbcol) as b from $mt  where ts < now + 4m interval(1d) group by tgcol
+print select sum(tbcol) as b from $mt  where ts < now + 4m interval(1d) group by tgcol
+print ===> $data01
+if $data01 != 10 then 
+  return -1
+endi
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/compute/top.sim b/tests/script/windows/compute/top.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9590997ef76b396f37102b46140b8ff58598fb9e
--- /dev/null
+++ b/tests/script/windows/compute/top.sim
@@ -0,0 +1,99 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_to_db
+$tbPrefix = m_to_tb
+$mtPrefix = m_to_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select top(tbcol, 1) from $tb
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step3
+sql select top(tbcol, 1) from $tb where ts < now + 4m
+print ===> $data01
+if $data01 != 4 then 
+  return -1
+endi
+
+print =============== step4
+sql select top(tbcol, 1) as b from $tb
+print ===> $data01
+if $data01 != 19 then 
+  return -1
+endi
+
+print =============== step5
+sql select top(tbcol, 2) as b from $tb 
+print ===> $data01  $data11
+if $data01 != 18 then 
+  return -1
+endi
+if $data11 != 19 then 
+  return -1
+endi
+
+print =============== step6
+sql select top(tbcol, 2) as b from $tb where ts < now + 4m
+print ===> $data01  $data11
+if $data01 != 3 then 
+  return -1
+endi
+if $data11 != 4 then 
+  return -1
+endi
+
+sql select top(tbcol, 122) as b from $tb -x step6
+	return -1
+step6:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/db/basic.sim b/tests/script/windows/db/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fffde94d66f1ae30b7632c66ff6444cfe3ba1934
--- /dev/null
+++ b/tests/script/windows/db/basic.sim
@@ -0,0 +1,193 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+print ============================ dnode1 start
+
+$i = 0
+$dbPrefix = ob_db_db
+$tbPrefix = ob_db_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db replica 1 days 20 keep 2000 cache 16
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data00 != $db then 
+  return -1
+endi
+if $data02 != 0 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data06 != 20 then 
+  return -1
+endi
+if $data08 != 16 then 
+  return -1
+endi
+ 
+print =============== step2
+sql create database $db
+sql show databases
+if $rows != 1 then 
+  return -1
+endi 
+
+print =============== step3
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi 
+
+print =============== step4
+sql_error drop database $db
+
+print =============== step5
+sql create database $db replica 1 days 15 keep 1500
+sql show databases
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
+if $data00 != $db then 
+  return -1
+endi
+if $data02 != 0 then 
+  return -1
+endi
+if $data03 != 0 then 
+  return -1
+endi
+if $data04 != 1 then 
+  return -1
+endi
+if $data06 != 15 then 
+  return -1
+endi
+
+print =============== step6
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+$i = 1
+while $i < 4
+  $db = $dbPrefix . $i
+  $tb = $tbPrefix . $i
+  sql create database $db
+  sql use $db
+  sql create table $tb (ts timestamp, speed int)
+  $i = $i + 1
+endw
+
+sql show databases
+if $rows != 4 then 
+  return -1
+endi
+
+$i = 4
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+print =============== step7
+$i = 0
+while $i < 5
+  $db = $dbPrefix . $i  
+  sql drop database $db 
+  $i = $i + 1
+endw
+
+print =============== step8
+$i = 0
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step9
+sql drop database $db
+
+print =============== step10
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step11
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step12
+sql drop database $db
+
+print =============== step13
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values (now+1a, 0)
+sql insert into $tb values (now+2a, 1)
+sql insert into $tb values (now+3a, 2)
+sql insert into $tb values (now+4a, 3)
+sql insert into $tb values (now+5a, 4)
+sql select * from $tb
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql drop database $db
+
+print =============== step15
+sql create database $db
+sql use $db
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step16
+sql create table $tb (ts timestamp, speed int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/db/len.sim b/tests/script/windows/db/len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5afa2496dde23b624b6d54afd18f096c59d47f46
--- /dev/null
+++ b/tests/script/windows/db/len.sim
@@ -0,0 +1,92 @@
+sleep 3000
+sql connect
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+print =============== step1
+sql_error drop database dd
+
+sql create database -x step1
+	return -1
+step1:
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create database a
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database a
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create database a12345678
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database a12345678
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create database a012345678901201234567890120123456789012a012345678901201234567890120123456789012 -x step4
+	return -1
+step4:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create database a;1 
+sql drop database a
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql create database a'1 -x step6
+	return -1
+step6:
+
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step7
+sql create database (a) -x step7
+	return -1
+step7:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql create database a.1 -x step8
+	return -1
+step8:
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/2.sim b/tests/script/windows/field/2.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8ac6fa1a1b2dd85715b536efdb14dc8b6e6d79a9
--- /dev/null
+++ b/tests/script/windows/field/2.sim
@@ -0,0 +1,295 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_bt_db
+$tbPrefix = fi_bt_tb
+$mtPrefix = fi_bt_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol2 bool, tbcol int) TAGS(tgcol bool, tgcol2 int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 and tbcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 and tbcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d)  group by tgcol order by tgcol desc
+print $db
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d)  group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/3.sim b/tests/script/windows/field/3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..331e930b3186ad9541912f87e5342046046850cf
--- /dev/null
+++ b/tests/script/windows/field/3.sim
@@ -0,0 +1,521 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_3_db
+$tbPrefix = fi_3_tb
+$mtPrefix = fi_3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 int, tbcol3 float) TAGS(tgcol1 smallint, tgcol2 int, tgcol3 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step16
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step17
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/4.sim b/tests/script/windows/field/4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c6224c46ee2c0064c5fa5ea14a67310fee11d423
--- /dev/null
+++ b/tests/script/windows/field/4.sim
@@ -0,0 +1,711 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_4_db
+$tbPrefix = fi_4_tb
+$mtPrefix = fi_4_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 bigint, tbcol3 float, tbcol4 double) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step20
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/5.sim b/tests/script/windows/field/5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d1f40059d027fba7797967c7b65d86457f4fd3b9
--- /dev/null
+++ b/tests/script/windows/field/5.sim
@@ -0,0 +1,834 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_5_db
+$tbPrefix = fi_5_tb
+$mtPrefix = fi_5_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 tinyint, tbcol2 int, tbcol3 bigint, tbcol4 double, tbcol5 smallint) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1, 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tbcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step27
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/6.sim b/tests/script/windows/field/6.sim
new file mode 100644
index 0000000000000000000000000000000000000000..98071f87df11ccd6d5984ce9065485bf2931a6ee
--- /dev/null
+++ b/tests/script/windows/field/6.sim
@@ -0,0 +1,989 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_6_db
+$tbPrefix = fi_6_tb
+$mtPrefix = fi_6_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol1 smallint, tbcol2 bigint, tbcol3 smallint, tbcol4 bigint, tbcol5 float, tbcol6 bool) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 float, tgcol6 bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0, 0, 0, 0, 0, 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1, 1, 1, 1, 1, 1  ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tbcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tbcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tbcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tbcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where tbcol6 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol6 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol6 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tbcol2 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol2 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol2 <> 0 and ts < now + 5m and ts < now + 5m and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tbcol3 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol3 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol3 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tbcol5 = 1 and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 1 and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol5 <> 0 and ts < now + 5m and ts < now + 5m and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol1 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol1 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol1 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step22
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step23
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step24
+sql select * from $mt where ts > now + 4m and tbcol4 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol1 = 1 and tbcol5 = 1 and tbcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 1 and tbcol2 <> 1  and tbcol3 <> 1 and tbcol1 <> 1 and tbcol5 <> 1 and tbcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 = 0 and tbcol2 = 0 and tbcol3 = 0 and tbcol1 = 0 and tbcol5 = 0 and tbcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol4 <> 0 and tbcol2 <> 0 and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol4 <> 0 and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol4 <> 0 and ts < now + 5m and ts < now + 5m and tbcol2 <> 0  and tbcol3 <> 0 and tbcol1 <> 0 and tbcol5 <> 0 and tbcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1  and tbcol4 = 1  and tbcol5 = 1 and tbcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step27
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 and tbcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step28
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step29
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1  and tbcol6 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step30
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where ts < now + 4m and tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 and tbcol6 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step31
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1  and tbcol5 = 1  and tbcol6 = 1 interval(1d) group by tgcol6 order by tgcol6 desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/bigint.sim b/tests/script/windows/field/bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..bef571f4456dc6a05d6844b28128df4137c39bf4
--- /dev/null
+++ b/tests/script/windows/field/bigint.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_bi_db
+$tbPrefix = fi_bi_tb
+$mtPrefix = fi_bi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bigint) TAGS(tgcol bigint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/binary.sim b/tests/script/windows/field/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..72a356e684bbada0ec1b81ca58303a3f885eca4f
--- /dev/null
+++ b/tests/script/windows/field/binary.sim
@@ -0,0 +1,77 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_by_db
+$tbPrefix = fi_by_tb
+$mtPrefix = fi_by_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol binary(10)) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '0' ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , '1' ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+
+print =============== step2
+
+sql select * from $mt where tbcol = '0' 
+if $rows != 100 then
+  return -1
+endi
+
+sql select * from $mt where ts > now + 4m and tbcol = '1'
+if $rows != 75 then
+  return -1
+endi
+
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol 
+
+#can't filter binary fields
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/bool.sim b/tests/script/windows/field/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..abc970264dae1346bb2177516b4056c024b69da2
--- /dev/null
+++ b/tests/script/windows/field/bool.sim
@@ -0,0 +1,161 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_bo_db
+$tbPrefix = fi_bo_tb
+$mtPrefix = fi_bo_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol bool) TAGS(tgcol bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
+print select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/double.sim b/tests/script/windows/field/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e805e0373b83ab440a846139681d040a6c4b7ad1
--- /dev/null
+++ b/tests/script/windows/field/double.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_do_db
+$tbPrefix = fi_do_tb
+$mtPrefix = fi_do_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol double) TAGS(tgcol double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/float.sim b/tests/script/windows/field/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..4178ab4e1e260ba9251466c53c0cd4da10ee0dc3
--- /dev/null
+++ b/tests/script/windows/field/float.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_fl_db
+$tbPrefix = fi_fl_tb
+$mtPrefix = fi_fl_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol float) TAGS(tgcol float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/int.sim b/tests/script/windows/field/int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..05dc19094d85110672201436f99f19c19b425db8
--- /dev/null
+++ b/tests/script/windows/field/int.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_in_db
+$tbPrefix = fi_in_tb
+$mtPrefix = fi_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/single.sim b/tests/script/windows/field/single.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6422b7f6971870d72b6272c77d6109484501eb5e
--- /dev/null
+++ b/tests/script/windows/field/single.sim
@@ -0,0 +1,218 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_si_db
+$tbPrefix = fi_si_tb
+$mtPrefix = fi_si_mt
+$rowNum = 20
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, tbcol int)
+
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+ 
+print =============== step2
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 10
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 10 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 8
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 8 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10
+if $rows != 10 then 
+  return -1
+endi
+if $data91 != 9 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol <= 10
+if $rows != 11 then 
+  return -1
+endi
+if $data81 != 8 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10
+if $rows != 9 then 
+  return -1
+endi
+if $data81 != 19 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10 order by ts asc
+if $rows != 9 then 
+  return -1
+endi
+if $data01 != 11 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and tbcol > 5 order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 9 then 
+  return -1
+endi
+if $data31 != 6 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and tbcol > 5  order by ts asc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 6 then 
+  return -1
+endi
+if $data31 != 9 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol > 10 and tbcol < 5  order by ts asc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 10 and ts < now + 4m
+print  select * from $tb where tbcol = 10 and ts < now + 4m
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol = 4 and ts < now + 4m order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10  and ts < now + 4m order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 4 then 
+  return -1
+endi
+
+sql select * from $tb where tbcol < 10 and ts > now + 4m and ts < now + 5m order by ts desc
+print $rows $data00 $data01
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(*) from $tb
+if $data00 != $rowNum then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol = 10
+if $data00 != 1 then 
+  return -1
+endi
+
+#sql select count(*) from $tb where tbcol = 8 or tbcol = 9
+#if $data00 != 2 then 
+#  return -1
+#endi
+
+sql select count(*) from $tb where tbcol < 10
+if $data00 != 10 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol <= 10
+if $data00 != 11 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and tbcol > 5
+if $data00 != 4 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and tbcol > 5 order by ts asc -x step4
+#  return -1
+step4:
+
+print =============== step5
+sql select count(*) from $tb where ts < now + 4m
+if $data00 != 5 then 
+  return -1
+endi
+
+#sql select count(*) from $tb where tbcol = 10 and ts < now + 4m
+#if $data00 != 0 then 
+#  return -1
+#endi
+
+sql select count(*) from $tb where tbcol = 4 and ts < now + 4m
+if $data00 != 1 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10  and ts < now + 4m
+if $data00 != 5 then 
+  return -1
+endi
+
+sql select count(*) from $tb where tbcol < 10 and ts > now + 4m and ts < now + 5m
+if $data00 != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/smallint.sim b/tests/script/windows/field/smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8bf41f45a5e62e584b39daa1ecde34691a922eb2
--- /dev/null
+++ b/tests/script/windows/field/smallint.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_sm_db
+$tbPrefix = fi_sm_tb
+$mtPrefix = fi_sm_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol smallint) TAGS(tgcol smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/field/tinyint.sim b/tests/script/windows/field/tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..16c19ba38d58c407fd91ff43654b502fe9bb2d36
--- /dev/null
+++ b/tests/script/windows/field/tinyint.sim
@@ -0,0 +1,160 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = fi_ti_db
+$tbPrefix = fi_ti_tb
+$mtPrefix = fi_ti_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol tinyint) TAGS(tgcol tinyint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 0 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , 1 ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tbcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where ts > now + 4m and tbcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tbcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/import/basic.sim b/tests/script/windows/import/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..491b4f8b3445e616d75da1ca70058b1fe49089f9
--- /dev/null
+++ b/tests/script/windows/import/basic.sim
@@ -0,0 +1,125 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+sql create database ibadb
+sql use ibadb
+sql create table tb(ts timestamp, i int)
+
+print ================= step1
+
+sql import into tb values(1564641710000, 10000)
+sql select * from tb;
+if $rows != 1 then 
+  return -1
+endi
+
+print ================= step2
+sql insert into tb values(1564641708000, 8000)
+sql select * from tb;
+if $rows != 2 then 
+  return -1
+endi
+
+print ================= step3
+sql insert into tb values(1564641720000, 20000)
+sql select * from tb;
+if $rows != 3 then 
+  return -1
+endi
+
+print ================= step4
+sql import into tb values(1564641708000, 8000)
+sql import into tb values(1564641715000, 15000)
+sql import into tb values(1564641730000, 30000)
+sql select * from tb;
+if $rows != 5 then 
+  return -1
+endi
+
+print ================= step5
+sql insert into tb values(1564641708000, 8000)
+sql insert into tb values(1564641714000, 14000)
+sql insert into tb values(1564641725000, 25000)
+sql insert into tb values(1564641740000, 40000)
+sql select * from tb;
+if $rows != 8 then 
+  return -1
+endi
+
+print ================= step6
+sql import into tb values(1564641707000, 7000)
+sql import into tb values(1564641712000, 12000)
+sql import into tb values(1564641723000, 23000)
+sql import into tb values(1564641734000, 34000)
+sql import into tb values(1564641750000, 50000)
+sql select * from tb;
+if $rows != 13 then 
+  return -1
+endi
+
+print ================= step7
+sql import into tb values(1564641707001, 7001)
+sql import into tb values(1564641712001, 12001)
+sql import into tb values(1564641723001, 23001)
+sql import into tb values(1564641734001, 34001)
+sql import into tb values(1564641750001, 50001)
+sql select * from tb;
+if $rows != 18 then 
+  return -1
+endi
+
+print ================= step8
+sql insert into tb values(1564641708002, 8002)
+sql insert into tb values(1564641714002, 14002)
+sql insert into tb values(1564641725002, 25002)
+sql insert into tb values(1564641900000, 200000)
+sql select * from tb;
+if $rows != 22 then 
+  return -1
+endi
+
+print ================= step9 only insert last one
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step10
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step11
+sql import into tb values(1564642400000, 700000)
+sql select * from tb;
+if $rows != 25 then
+  return -1
+endi
+
+print ================= step12
+sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
+sql select * from tb;
+print rows=> $rows
+if $rows != 26 then
+  return -1
+endi
+
+print ================= step13
+sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
+sql select * from tb;
+print rows=> $rows
+if $rows != 28 then
+  return -1
+endi
+
+sql drop database ibadb
\ No newline at end of file
diff --git a/tests/script/windows/insert/basic.sim b/tests/script/windows/insert/basic.sim
new file mode 100644
index 0000000000000000000000000000000000000000..54cbd3f4d9a8ee068ff4595f15f0642ca3e92674
--- /dev/null
+++ b/tests/script/windows/insert/basic.sim
@@ -0,0 +1,49 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_in_db
+$tbPrefix = tb_in_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+$x = 0
+while $x < 10
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+print =============== step 2
+sql insert into $tb values (now - 5m , 10)
+sql insert into $tb values (now - 6m , 10)
+sql insert into $tb values (now - 7m , 10)
+sql insert into $tb values (now - 8m , 10)
+
+sql select * from $tb
+
+print $rows points data are retrieved
+if $rows != 14 then 
+  return -1
+endi
+
+sql drop database $db
+sleep 1000
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/insert/query_block1_file.sim b/tests/script/windows/insert/query_block1_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..388ed061e5c583ec46113811542b2f87267b860e
--- /dev/null
+++ b/tests/script/windows/insert/query_block1_file.sim
@@ -0,0 +1,195 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_1f_db
+$tbPrefix = tb_1f_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int)
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+print =============== step 1
+$x = $N
+$y = $N / 2
+while $x > $y
+  $ms = $x . m
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $x ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N / 2
+$y = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step 2
+
+$R = 4
+$x = $N * 2
+$y = $N * $R 
+$expect = $y + $N
+$y = $y + $x
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 3
+
+$N1 = $N + 1
+$result1 = $N / 2
+$result2 = $N
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3 
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/insert/query_block1_memory.sim b/tests/script/windows/insert/query_block1_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9e4fc68d093d07d5c43797efc28265de750c376c
--- /dev/null
+++ b/tests/script/windows/insert/query_block1_memory.sim
@@ -0,0 +1,177 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_1m_db
+$tbPrefix = tb_1m_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed int)
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+print =============== step 1
+$x = $N
+$y = $N / 2
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , -$x ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N / 2
+$y = $N
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $N then 
+  return -1
+endi
+
+print =============== step 2
+
+$N1 = $N + 1
+$result1 = $N / 2
+$result2 = $N
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
diff --git a/tests/script/windows/insert/query_block2_file.sim b/tests/script/windows/insert/query_block2_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9fd443447612917fd0ba85a9d8a591a7a384b87c
--- /dev/null
+++ b/tests/script/windows/insert/query_block2_file.sim
@@ -0,0 +1,210 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_2f_db
+$tbPrefix = tb_2f_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+#commit to file will trigger if insert 82 rows 
+$N = 82 
+
+print =============== step 1
+$x = $N * 2
+$y = $N
+$expect = $N
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 2
+
+$R = 4
+$y = $N * $R 
+
+$expect = $y + $N
+$expect = $expect + $N
+
+$x = $N * 3
+$y = $y + $x
+
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+ 
+
+print =============== step 2
+
+$N2 = $N
+$result1 = $N
+$result2 = 2 * $N
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
diff --git a/tests/script/windows/insert/query_block2_memory.sim b/tests/script/windows/insert/query_block2_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ede7f3efc6e807492845786f5979e14a6ba337c6
--- /dev/null
+++ b/tests/script/windows/insert/query_block2_memory.sim
@@ -0,0 +1,172 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_2m_db
+$tbPrefix = tb_2m_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed int) 
+
+$N = 82 
+
+$x = $N * 2
+$y = $N
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $y then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+print =============== step 2
+
+$result1 = $N
+$result2 = $N * 2
+
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then 
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/insert/query_file_memory.sim b/tests/script/windows/insert/query_file_memory.sim
new file mode 100644
index 0000000000000000000000000000000000000000..083beb4ac5f3983eb90a0d38811398dff510c0a7
--- /dev/null
+++ b/tests/script/windows/insert/query_file_memory.sim
@@ -0,0 +1,209 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_fm_db
+$tbPrefix = tb_fm_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+#commit to file will trigger if insert 82 rows 
+
+$N = 82 
+
+$x = $N * 2
+$y = $N
+$expect = $y
+while $x > $y
+  $ms = $x . m 
+  $xt = - . $x 
+  sql insert into $tb values (now - $ms , $xt ) 
+  $x = $x - 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$x = $N
+$y = $N * 2
+$expect = $N * 2
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+
+$R = 4
+$R = $R - 1
+
+$y = $N * $R 
+$expect = $y + $N
+$expect = $expect + $N
+
+$x = $N * 3
+$y = $y + $x
+while $x < $y
+  $ms = $x . m 
+  sql insert into $tb values (now + $ms , $x ) 
+  $x = $x + 1
+endw 
+
+sql select * from $tb
+print sql select * from $tb -> $rows points 
+if $rows != $expect then 
+  return -1
+endi
+ 
+
+print =============== step 2
+
+$result1 = $N
+$result2 = $N * 2
+$N1 = $result2 + 1
+$step = $N1 . m
+
+$start1 = now- . $step
+$start2 = now
+$start3 = now+ . $step
+$end1 = now- . $step
+$end2 = now
+$end3 = now+ . $step
+
+
+sql select * from $tb where ts < $start1 and ts > $end1
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1
+print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3
+if $rows != 0 then
+  return -1
+endi
+
+print ================= order by ts desc  
+
+sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
+if $rows != $result2 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
+if $rows != $result1 then 
+  return -1
+endi
+
+sql select * from $tb where ts < $start3 and ts > $end3  order by ts desc
+if $rows != 0 then
+  return -1
+endi
+
+clear:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+
diff --git a/tests/script/windows/insert/query_multi_file.sim b/tests/script/windows/insert/query_multi_file.sim
new file mode 100644
index 0000000000000000000000000000000000000000..465970f9426440262f2a694c510ba40d184f7f64
--- /dev/null
+++ b/tests/script/windows/insert/query_multi_file.sim
@@ -0,0 +1,55 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = tb_mf_db
+$tbPrefix = tb_mf_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database -x step1
+step1:
+sql create database $db
+sql use $db
+
+$x = 0
+create1: 
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then 
+	  return -1
+	endi
+sql create table $tb (ts timestamp, speed int) -x create1
+
+$N = 20000
+
+$x = 0
+
+while $x < $N
+  $ms = $x . s 
+  #print insert into $tb values (now + $ms , $x )
+  sql insert into $tb values (now + $ms , $x ) -x error_insert
+  $x = $x + 1
+endw 
+error_insert:
+
+sql select * from $tb
+print $rows points data are retrieved -> exepct $N rows
+if $rows < $N then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
diff --git a/tests/script/windows/table/binary.sim b/tests/script/windows/table/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..64a081c72f5e4e5bd26013df03d7667211b4dce5
--- /dev/null
+++ b/tests/script/windows/table/binary.sim
@@ -0,0 +1,63 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = lm_bn_db
+$tbPrefix = lm_bn_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed binary(5)) 
+
+sql insert into $tb values (now, ) -x step1
+	return -1
+step1:
+
+print =============== step2
+sql insert into $tb values (now+1a, '1234')
+sql select speed from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 1234 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, '23456')
+sql select speed from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+print ==> $data00
+if $data00 != 23456 then 
+  return -1
+endi
+
+print =============== step4
+sql_error insert into $tb values (now+3a, '345678')
+sql insert into $tb values (now+3a, '34567')
+sql select speed from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+print ==> $data00
+if $data00 != 34567 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/table/bool.sim b/tests/script/windows/table/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9486c422215f39fac909af7620452dd3443eef8d
--- /dev/null
+++ b/tests/script/windows/table/bool.sim
@@ -0,0 +1,92 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = lm_bo_db
+$tbPrefix = lm_bo_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+$x = 0
+sql create table $tb (ts timestamp, speed bool)
+
+sql insert into $tb values (now, true)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step2
+sql insert into $tb values (now+1m, 1)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2m, 2)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3m, 0)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4m, -1)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5m, false)
+sql select * from $tb order by ts desc
+if $rows != 6 then 
+  return -1
+endi
+
+if $data01 != 0 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/table/column_name.sim b/tests/script/windows/table/column_name.sim
new file mode 100644
index 0000000000000000000000000000000000000000..fffb1334e5e317e6d22155abf4624463bfce9989
--- /dev/null
+++ b/tests/script/windows/table/column_name.sim
@@ -0,0 +1,91 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
+$i = 0
+$dbPrefix = lm_cm_db
+$tbPrefix = lm_cm_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql drop table dd -x step0
+	return -1
+step0:
+
+sql create table $tb(ts timestamp, int) -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table $tb (ts timestamp, s int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table $tb (ts timestamp, a0123456789 int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table $tb (ts timestamp, a0123456789012345678901234567890123456789 int) 
+sql drop table $tb
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create table $tb (ts timestamp, a0123456789 int)
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql insert into $tb values (now , 1)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+
+
+
diff --git a/tests/script/windows/table/column_num.sim b/tests/script/windows/table/column_num.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d182696ce08176f7d19c74858c069f1cdf73dd4c
--- /dev/null
+++ b/tests/script/windows/table/column_num.sim
@@ -0,0 +1,86 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
+$i = 0
+$dbPrefix = lm_cn_db
+$tbPrefix = lm_cn_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb() -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table $tb (ts timestamp)  -x step2
+	return -1
+step2:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table $tb (ts int)  -x step3
+	return -1
+step3:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int, b7 int, b8 int, b9 int, b10 int, b11 int, b12 int, b13 int, b14 int, b15 int, b16 int, b17 int, b18 int, b19 int, b20 int, b21 int, b22 int, b23 int, b24 int, b25 int, b26 int, b27 int, b28 int,b29 int,b30 int,b31 int,b32 int)
+
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql create table $tb (ts timestamp, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, a10 int, a11 int, a12 int, a13 int, a14 int, a15 int, a16 int, a17 int, a18 int, a19 int, a20 int, a21 int, a22 int, a23 int, a24 int, a25 int, a26 int, a27 int, a28 int,a29 int,a30 int,a31 int,a32 int, b1 int, b2 int, b3 int, b4 int, b5 int)
+
+sql show tables
+if $rows != 2 then 
+  return -1
+endi
+
+sql insert into $tb values (now, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 , 16 , 17 , 18 , 19 , 20 , 21 , 22 , 23 , 24 , 25 ,26 , 27 ,28 ,29,30,31, 32, 33, 34, 35, 36, 37)
+sql select * from $tb
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table $tb
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/table/column_value.sim b/tests/script/windows/table/column_value.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c59e7af8baae9c0b9b5140a624bd9b4c0c97c385
--- /dev/null
+++ b/tests/script/windows/table/column_value.sim
@@ -0,0 +1,80 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
+$i = 0
+$dbPrefix = lm_cv_db
+$tbPrefix = lm_cv_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql create table $tb (ts timestamp, speed int, v1 binary(100), v2 binary(100), v3 binary(100), v4 binary(100), v5 binary(100)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values(now, 1, '1', '2', '3', '4', '5')
+sql insert into $tb values(now+1a, 1, '1', '2', '3', '4', '5')
+sql select * from $tb
+if $rows != 2 then 
+  return -1
+endi
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table  $tb (ts timestamp, speed bigint, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500))
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql drop table $tb
+
+print =============== step3
+sql create table $tb (ts timestamp, speed float, v1 binary(100), v2 binary(100), v3 binary(100), v4 binary(100), v5 binary(100)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+sql insert into $tb values(now+2a, 1, '1', '2', '3', '4', '5')
+sql insert into $tb values(now+3a, 1, '1', '2', '3', '4', '5')
+sql select * from $tb
+if $rows != 2 then 
+  return -1
+endi
+sql drop table $tb
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table  $tb (ts timestamp, speed double, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500)) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+
+
+
diff --git a/tests/script/windows/table/db.table.sim b/tests/script/windows/table/db.table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..97a9e6fbe94db8fec01db3db5e0a0c0335788842
--- /dev/null
+++ b/tests/script/windows/table/db.table.sim
@@ -0,0 +1,48 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+
+$i = 0
+$dbPrefix = lm_dt_db
+$tbPrefix = lm_dt_tb
+$db = $dbPrefix
+$tb = $tbPrefix
+
+print =============== step1
+sql create database $db
+$table = lm_dt_db.lm_dt_tb
+
+print =============== step2
+sql create table $table (ts timestamp, speed int) 
+
+print =============== step3
+sql insert into $table values (now, 1)
+
+print =============== step4
+sql select * from $table
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+
+print =============== step5
+sql describe $table
+
+print =============== step6
+sql drop table $table
+
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/table/double.sim b/tests/script/windows/table/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..93bf3bb1490d21d18c56bea0fc2e2a6535d59b43
--- /dev/null
+++ b/tests/script/windows/table/double.sim
@@ -0,0 +1,98 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = lm_do_db
+$tbPrefix = lm_do_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed double) 
+#sql insert into $tb values (now, -1.79E+308) -x step1
+#	return -1
+#step1:
+
+print =============== step2
+#sql insert into $tb values (now+1a, 1.79E+308) -x step2
+#	return -1
+#step2:
+
+sql select * from $tb order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, 2.85)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 2.850000000 then 
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3a, 3.4)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != 3.400000000 then 
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4a, a2) -x step51
+  return -1
+step51:
+sql insert into $tb values (now+4a, 0)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5a, 2a) -x step6
+  return -1
+step6:
+sql insert into $tb values(now+5a, 2)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step7
+sql insert into $tb values (now+6a, 2a'1) -x step7
+  return -1
+step7:
+sql insert into $tb values(now+6a, 2)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 2.000000000 then 
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/table/float.sim b/tests/script/windows/table/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..684f78a386f886b3f2c6f1c2e8510ebe2a1a043f
--- /dev/null
+++ b/tests/script/windows/table/float.sim
@@ -0,0 +1,98 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = lm_fl_db
+$tbPrefix = lm_fl_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+sql create table $tb (ts timestamp, speed float) 
+#sql insert into $tb values (now, -3.40E+38) -x step1
+#	return -1
+#step1:
+
+print =============== step2
+#sql insert into $tb values (now+1a, 3.40E+308) -x step2
+#	return -1
+#step2:
+
+sql select * from $tb order by ts desc
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql insert into $tb values (now+2a, 2.85)
+sql select * from $tb order by ts desc
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 2.85000 then
+  return -1
+endi
+
+print =============== step4
+sql insert into $tb values (now+3a, 3.4)
+sql select * from $tb order by ts desc
+if $rows != 2 then 
+  return -1
+endi
+if $data01 != 3.40000 then
+  return -1
+endi
+
+print =============== step5
+sql insert into $tb values (now+4a, a2) -x step5
+  return -1
+step5:
+sql insert into $tb values (now+4a, 0)
+sql select * from $tb order by ts desc
+if $rows != 3 then 
+  return -1
+endi
+if $data01 != 0.00000 then
+  return -1
+endi
+
+print =============== step6
+sql insert into $tb values (now+5a, 2a) -x step6
+  return -1
+step6:
+sql insert into $tb values (now+5a, 2)
+sql select * from $tb order by ts desc
+if $rows != 4 then 
+  return -1
+endi
+if $data01 != 2.00000 then
+  return -1
+endi
+
+print =============== step7
+sql insert into $tb values (now+6a, 2a'1) -x step7
+  return -1
+step7:
+sql insert into $tb values (now+6a, 2)
+sql select * from $tb order by ts desc
+if $rows != 5 then 
+  return -1
+endi
+if $data01 != 2.00000 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/table/table.sim b/tests/script/windows/table/table.sim
new file mode 100644
index 0000000000000000000000000000000000000000..985620152afae21b4c7c239bb80196bbe8facca2
--- /dev/null
+++ b/tests/script/windows/table/table.sim
@@ -0,0 +1,225 @@
+sql connect
+sleep 3000
+print ============================ dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = ob_tb_db
+$tbPrefix = ob_tb_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql drop database $db -x step1
+step1:
+sql create database $db
+
+print =============== step2-3-4
+sql use $db
+
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint)
+sql insert into $tb values(now, 1, 1)
+sql select * from $tb
+if $data01 != 1 then 
+  return -1
+endi
+
+$i = 2
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val smallint, val2 smallint)
+sql insert into $tb values(now, 2, 2)
+sql select * from $tb
+if $data01 != 2 then 
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val int, val2 int)
+sql insert into $tb values(now, 3, 3)
+sql select * from $tb
+if $data01 != 3 then 
+  return -1
+endi
+
+$i = 4
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val bigint, val2 bigint)
+sql insert into $tb values(now, 4, 4)
+sql select * from $tb
+if $data01 != 4 then 
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val float, val2 float)
+sql insert into $tb values(now, 5, 5)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 5.00000 then
+  return -1
+endi
+
+$i = 6
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val double, val2 double)
+sql insert into $tb values(now, 6, 6)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 6.000000000 then 
+  return -1
+endi
+
+$i = 7
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val binary(20), val2 binary(20))
+sql insert into $tb values(now, '7', '7')
+sql select * from $tb
+if $data01 != 7 then 
+  return -1
+endi
+
+print =============== step5
+sql show tables
+if $rows != 7 then 
+  return -1
+endi
+
+$i = 1
+while $i < 8
+  $tb = $tbPrefix . $i  
+  sql drop table $tb 
+  $i = $i + 1
+endw
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6-9
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 1, 1)
+sql select * from $tb
+if $data01 != 1 then 
+  return -1
+endi
+
+$i = 2
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val smallint, val2 smallint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 2, 2)
+sql select * from $tb
+if $data01 != 2 then 
+  return -1
+endi
+
+$i = 3
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val int, val2 int)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 3, 3)
+sql select * from $tb
+if $data01 != 3 then 
+  return -1
+endi
+
+$i = 4
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val bigint, val2 bigint)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 4, 4)
+sql select * from $tb
+if $data01 != 4 then 
+  return -1
+endi
+
+$i = 5
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val float, val2 float)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 5, 5)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 5.00000 then
+  return -1
+endi
+
+$i = 6
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val double, val2 double)
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, 6, 6)
+sql select * from $tb
+print ==> $data01 $data02
+if $data01 != 6.000000000 then 
+  return -1
+endi
+
+$i = 7
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val binary(20), val2 binary(20))
+sql select * from $tb
+if $rows != 0 then 
+  return -1
+endi
+sql insert into $tb values(now, '7', '7')
+sql select * from $tb
+if $data01 != 7 then 
+  return -1
+endi
+
+print =============== step10
+$i = 1
+$tb = $tbPrefix  . $i
+sql create table $tb (ts timestamp, val tinyint, val2 tinyint) 
+sql show tables
+if $rows != 7 then
+  return -1
+endi
+
+print =============== step11
+sql create table $tb (ts timestamp, val float, val2 double)
+sql show tables
+if $rows != 7 then
+  return -1
+endi
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
+
+
diff --git a/tests/script/windows/table/table_len.sim b/tests/script/windows/table/table_len.sim
new file mode 100644
index 0000000000000000000000000000000000000000..367f1c6895c80fb019a68bc36f0921becf1f30c7
--- /dev/null
+++ b/tests/script/windows/table/table_len.sim
@@ -0,0 +1,105 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$i = 0
+$dbPrefix = lm_tb_db
+$tbPrefix = lm_tb_tb
+$db = $dbPrefix . $i
+$tb = $tbPrefix . $i
+
+print =============== step1
+sql create database $db
+sql use $db
+
+sql drop table dd -x step0
+	return -1
+step0:
+
+sql create table (ts timestamp, speed int) -x step1
+	return -1
+step1:
+
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step2
+sql create table a (ts timestamp, speed int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table a
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step3
+sql create table a0123456789 (ts timestamp, speed int) 
+sql show tables
+if $rows != 1 then 
+  return -1
+endi
+
+sql drop table a0123456789
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step4
+sql create table ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789 (ts timestamp, speed int)  -x step4
+	return -1
+step4:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step5
+sql create table a;1 (ts timestamp, speed int) -x step5
+	return -1
+step5:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step6
+sql create table a'1  (ts timestamp, speed int) -x step6
+	return -1
+step6:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step7
+sql create table (a)  (ts timestamp, speed int) -x step7
+	return -1
+step7:
+sql show tables
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step8
+sql create table a.1  (ts timestamp, speed int) -x step8
+  return -1
+step8:
+
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/3.sim b/tests/script/windows/tag/3.sim
new file mode 100644
index 0000000000000000000000000000000000000000..63a8766727fbdc14ce4504949a48bad7be6b5f64
--- /dev/null
+++ b/tests/script/windows/tag/3.sim
@@ -0,0 +1,521 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_3_db
+$tbPrefix = ta_3_tb
+$mtPrefix = ta_3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step16
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step17
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/4.sim b/tests/script/windows/tag/4.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7e9af7ece7ebc8f3548dcacd3c26b094a9990160
--- /dev/null
+++ b/tests/script/windows/tag/4.sim
@@ -0,0 +1,711 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_4_db
+$tbPrefix = ta_4_tb
+$mtPrefix = ta_4_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigint, tgcol3 float, tgcol4 double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step19
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step20
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/5.sim b/tests/script/windows/tag/5.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5dc128a0e0eb68eb2a4c227ade718708224c5f8c
--- /dev/null
+++ b/tests/script/windows/tag/5.sim
@@ -0,0 +1,834 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_5_db
+$tbPrefix = ta_5_tb
+$mtPrefix = ta_5_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 tinyint, tgcol2 int, tgcol3 bigint, tgcol4 double, tgcol5 binary(20))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0, 0, 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1, 1, 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tgcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step22
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step23
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step24
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step27
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/6.sim b/tests/script/windows/tag/6.sim
new file mode 100644
index 0000000000000000000000000000000000000000..12e9c597f0deb9ec00ef70ae9cccb761f79cfbc6
--- /dev/null
+++ b/tests/script/windows/tag/6.sim
@@ -0,0 +1,989 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_6_db
+$tbPrefix = ta_6_tb
+$mtPrefix = ta_6_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 bigint, tgcol3 smallint, tgcol4 bigint, tgcol5 binary(30), tgcol6 binary(20))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0', 0, 0, 0, '0', '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1', 1, 1, 1, '1', '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol1 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where tgcol3 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where tgcol4 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where tgcol5 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select * from $mt where tgcol6 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 <> 1
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step9
+sql select * from $mt where ts > now + 4m and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step10
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step11
+sql select * from $mt where ts > now + 4m and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step12
+sql select * from $mt where ts > now + 4m and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step13
+sql select * from $mt where ts > now + 4m and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step14
+sql select * from $mt where ts > now + 4m and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol6 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step15
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step16
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step17
+sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step18
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol4 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol4 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol4 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step19
+sql select * from $mt where ts > now + 4m and tgcol5 = 1 and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 1 and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol5 <> 0 and ts < now + 5m and ts < now + 5m and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step20
+sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step21
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step22
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step23
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step24
+sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1 and tgcol5 = 1 and tgcol6 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1 and tgcol5 <> 1 and tgcol6 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0 and tgcol5 = 0 and tgcol6 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0 and tgcol5 <> 0 and tgcol6 <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step25
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step26
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step27
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 and tgcol6 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step28
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step29
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 and tgcol5 = 1  and tgcol6 = 1 group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step30
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 and tgcol6 = 1 group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step31
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol2
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 interval(1d) group by tgcol3
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 interval(1d) group by tgcol4
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1 interval(1d) group by tgcol5
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1  and tgcol5 = 1  and tgcol6 = 1 interval(1d) group by tgcol6
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/add.sim b/tests/script/windows/tag/add.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0a1416b68c34245a1ef6553a7d19b7601b34de79
--- /dev/null
+++ b/tests/script/windows/tag/add.sim
@@ -0,0 +1,854 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_ad_db
+$tbPrefix = ta_ad_tb
+$mtPrefix = ta_ad_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 int
+sql reset query cache
+sql alter table $tb set tag tgcol4 =4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step2
+  return -1
+step2:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 tinyint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step3
+  return -1
+step3:
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql describe $tb
+print sql describe $tb
+if $data21 != BIGINT then 
+  return -1
+endi
+if $data31 != FLOAT then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 float
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step4
+  return -1
+step4:
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt add tag tgcol4 smallint
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql reset query cache
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = '1' -x step5
+  return -1
+step5:
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
+sql create table $tb using $mt tags( 1, 2, 3 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(10)
+sql alter table $mt add tag tgcol6 binary(10)
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=false 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 1
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 1 -x step52
+  return -1
+step52:
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bigint
+sql alter table $mt add tag tgcol6 tinyint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
+sql reset query cache
+
+sql select * from $mt where tgcol6 = 6
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 6 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step71
+  return -1
+step71:
+sql select * from $mt where tgcol3 = 1 -x step72
+  return -1
+step72:
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 binary(17)
+sql alter table $mt add tag tgcol6 bool
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol5 = '5'
+print select * from $mt where tgcol5 = 5
+print $data01 $data02 $data03 $data04
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4 then 
+  return -1
+endi
+if $data03 != 5 then 
+  return -1
+endi
+if $data04 != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step81
+  return -1
+step81:
+sql select * from $mt where tgcol3 = 1 -x step82
+  return -1
+step82:
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt add tag tgcol5 bool
+sql alter table $mt add tag tgcol6 float
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=1
+sql alter table $tb set tag tgcol6=6
+sql reset query cache
+
+sql select * from $mt where tgcol5 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 4.000000000 then 
+  return -1
+endi
+if $data03 != 1 then
+  return -1
+endi
+if $data04 != 6.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step91
+  return -1
+step91:
+sql select * from $mt where tgcol2 = 1 -x step92
+  return -1
+step92:
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol4 = '4'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step103
+  return -1
+step103:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bool
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=false
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 0 then
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step101
+  return -1
+step101:
+sql select * from $mt where tgcol3 = 1 -x step102
+  return -1
+step102:
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol4 -x step114
+  return -1
+step114:
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 int
+sql alter table $mt add tag tgcol6 binary(10)
+sql alter table $mt add tag tgcol7 bigint
+sql alter table $mt add tag tgcol8 smallint
+
+sql reset query cache
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
+sql alter table $tb set tag tgcol7=7
+sql alter table $tb set tag tgcol8=8
+sql reset query cache
+
+sql select * from $mt where tgcol5 =5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 6 then 
+  return -1
+endi
+if $data06 != 7 then 
+  return -1
+endi
+if $data07 != 8 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step111
+  return -1
+step111:
+sql select * from $mt where tgcol3 = 1 -x step112
+  return -1
+step112:
+sql select * from $mt where tgcol9 = 1 -x step113
+  return -1
+step113:
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 4.000000000 then 
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol5
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol3 int
+sql alter table $mt add tag tgcol4 binary(10)
+sql alter table $mt add tag tgcol5 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=false 
+sql alter table $tb set tag tgcol2=5 
+sql alter table $tb set tag tgcol3=4
+sql alter table $tb set tag tgcol4=3
+sql alter table $tb set tag tgcol5=2
+sql alter table $tb set tag tgcol6=1
+sql reset query cache
+
+sql select * from $mt where tgcol4 = '3'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 1 then 
+  return -1
+endi
+if $data04 != 5 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 3 then 
+  return -1
+endi
+if $data07 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '5'
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 4
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 2
+if $rows != 1 then
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '1'
+if $rows != 1 then
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol6
+sql reset query cache
+sql alter table $mt add tag tgcol2 binary(10)
+sql alter table $mt add tag tgcol4 int
+sql alter table $mt add tag tgcol6 bigint
+
+sql reset query cache
+sql alter table $tb set tag tgcol1=7 
+sql alter table $tb set tag tgcol2=8 
+sql alter table $tb set tag tgcol3=9
+sql alter table $tb set tag tgcol4=10
+sql alter table $tb set tag tgcol5=11
+sql alter table $tb set tag tgcol6=12
+sql reset query cache
+
+sql select * from $mt where tgcol2 = '8'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 9 then 
+  return -1
+endi
+if $data04 != 11.000000000 then 
+  return -1
+endi
+if $data05 != 8 then 
+  return -1
+endi
+if $data06 != 10 then 
+  return -1
+endi
+if $data07 != 12 then 
+  return -1
+endi
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 1 )
+sql insert into $tb values(now, 1)  
+
+sql alter table $mt add tag tgcol3 binary(10)
+sql alter table $mt add tag tgcol4 int
+sql alter table $mt add tag tgcol5 bigint
+sql alter table $mt add tag tgcol6 bigint
+
+return
+sql alter table $mt add tag tgcol7 bigint -x step141
+  return -1
+step141:
+sql reset query cache
+sql alter table $mt drop tag tgcol6
+sql alter table $mt add tag tgcol7 bigint
+sql alter table $mt add tag tgcol8 bigint -x step142
+  return -1
+step142:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/bigint.sim b/tests/script/windows/tag/bigint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..d988ad1fdc6dca3616785a7646efc6fbf9f0d466
--- /dev/null
+++ b/tests/script/windows/tag/bigint.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_bi_db
+$tbPrefix = ta_bi_tb
+$mtPrefix = ta_bi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/binary.sim b/tests/script/windows/tag/binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9dc18cfa94bba50e748edc48beabc40f9445243f
--- /dev/null
+++ b/tests/script/windows/tag/binary.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_by_db
+$tbPrefix = ta_by_tb
+$mtPrefix = ta_by_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/binary_binary.sim b/tests/script/windows/tag/binary_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..ba688aa80e234e4ffcf117154d0ff45827ddb02f
--- /dev/null
+++ b/tests/script/windows/tag/binary_binary.sim
@@ -0,0 +1,308 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_bib_db
+$tbPrefix = ta_bib_tb
+$mtPrefix = ta_bib_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0', '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1', '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> '0'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> '0'
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/bool.sim b/tests/script/windows/tag/bool.sim
new file mode 100644
index 0000000000000000000000000000000000000000..a7e5d909c598bc748bd431ba2a1c5d0e4db15ec6
--- /dev/null
+++ b/tests/script/windows/tag/bool.sim
@@ -0,0 +1,238 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_bo_db
+$tbPrefix = ta_bo_tb
+$mtPrefix = ta_bo_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/bool_binary.sim b/tests/script/windows/tag/bool_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..639f6c5f2f6f80ffe9c9237c0352c4951a1155a3
--- /dev/null
+++ b/tests/script/windows/tag/bool_binary.sim
@@ -0,0 +1,308 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_bob_db
+$tbPrefix = ta_bob_tb
+$mtPrefix = ta_bob_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/bool_int.sim b/tests/script/windows/tag/bool_int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..900cc9e8a181584cbabb5cee2cd7e048449f7f4f
--- /dev/null
+++ b/tests/script/windows/tag/bool_int.sim
@@ -0,0 +1,324 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_boi_db
+$tbPrefix = ta_boi_tb
+$mtPrefix = ta_boi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> true
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = false
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> false
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> true
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/change.sim b/tests/script/windows/tag/change.sim
new file mode 100644
index 0000000000000000000000000000000000000000..75a976bbb1553960bfd77f6470e8cddabf9db110
--- /dev/null
+++ b/tests/script/windows/tag/change.sim
@@ -0,0 +1,513 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_ch_db
+$tbPrefix = ta_ch_tb
+$mtPrefix = ta_ch_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tagcx tgcol3 -x step21
+  return -1
+step21:
+sql alter table $mt change tag tgcol1 tgcol2 -x step22
+  return -1
+step22:
+#sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
+#  return -1
+#step20:
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+sql alter table $mt change tag tgcol4 tgcol3 -x step23
+  return -1
+step23:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt change tag tgcol1 tgcol3
+sql alter table $mt change tag tgcol2 tgcol4
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql reset query cache
+sql alter table $mt change tag tgcol4 tgcol3
+sql alter table $mt change tag tgcol1 tgcol7
+sql alter table $mt change tag tgcol2 tgcol8
+sql reset query cache
+sql alter table $mt change tag tgcol3 tgcol9
+sql alter table $mt change tag tgcol5 tgcol10
+sql alter table $mt change tag tgcol6 tgcol11
+
+sleep 5000
+sql reset query cache
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step24
+  return -1
+step24:
+sql select * from $mt where tgcol2 = 1 -x step25
+  return -1
+step25:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step31
+  return -1
+step31:
+sql select * from $mt where tgcol2 = 1 -x step32
+  return -1
+step32:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step41
+  return -1
+step41:
+sql select * from $mt where tgcol2 = 1 -x step42
+  return -1
+step42:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = 2
+print $data01 $data02 $data03
+if $rows != 1 then
+  return -1
+endi
+if $data01 != 1 then
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step51
+  return -1
+step51:
+sql select * from $mt where tgcol2 = 1 -x step52
+  return -1
+step52:
+
+sql select * from $mt where tgcol3 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = '2'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1 -x step61
+  return -1
+step61:
+sql select * from $mt where tgcol2 = 1 -x step62
+  return -1
+step62:
+sql select * from $mt where tgcol3 = 1 -x step63
+  return -1
+step63:
+sql select * from $mt where tgcol4 = 1 -x step64
+  return -1
+step64:
+sql select * from $mt where tgcol5 = 1 -x step65
+  return -1
+step65:
+sql select * from $mt where tgcol6 = 1 -x step66
+  return -1
+step66:
+
+sql select * from $mt where tgcol7 = '1'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol8 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol9 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol10 = 5
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol11 = '6'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 4 then 
+  return -1
+endi
+if $data05 != 5.000000000 then 
+  return -1
+endi
+if $data06 != 6 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
diff --git a/tests/script/windows/tag/column.sim b/tests/script/windows/tag/column.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9f5bfce07e724d6aaec5268f6d85a67805f92209
--- /dev/null
+++ b/tests/script/windows/tag/column.sim
@@ -0,0 +1,93 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_co_db
+$tbPrefix = ta_co_tb
+$mtPrefix = ta_co_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+
+$i = 0
+sql create table $mt (ts timestamp, tbcol int, tbcol2 binary(10)) TAGS(tgcol int, tgcol2 binary(10))
+
+print =============== step2
+
+$i = 0
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(  0,  '0' )
+
+$i = 1
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags(  1,   1  )  
+
+$i = 2
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags( '2', '2' )
+
+$i = 3
+$tb = $tbPrefix . $i
+sql create table $tb using $mt tags( '3',  3  )
+
+sql show tables
+if $rows != 4 then
+  return -1
+endi
+
+print =============== step3
+
+$i = 0
+$tb = $tbPrefix . $i
+sql insert into $tb values(now,  0,  '0')
+
+$i = 1
+$tb = $tbPrefix . $i
+sql insert into $tb values(now,  1,   1  )
+
+$i = 2
+$tb = $tbPrefix . $i
+sql insert into $tb values(now, '2', '2')
+
+$i = 3
+$tb = $tbPrefix . $i
+sql insert into $tb values(now, '3',  3)
+
+print =============== step4
+sql select * from $mt where tgcol2 = '1'
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt
+if $rows != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/create.sim b/tests/script/windows/tag/create.sim
new file mode 100644
index 0000000000000000000000000000000000000000..6a76c93d83db0afa3e9e9b2de00d614fad66d9e6
--- /dev/null
+++ b/tests/script/windows/tag/create.sim
@@ -0,0 +1,601 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_cr_db
+$tbPrefix = ta_cr_tb
+$mtPrefix = ta_cr_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then
+  print expect 0, actual: $rows
+  return -1
+endi
+  
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
+sql create table $tb using $mt tags( 1 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+sql create table $tb using $mt tags( '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol = '0'
+if $rows != 0 then 
+  return -1
+endi
+  
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then
+  print expect 1, actual: $rows
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+print =============== step15
+$i = 15
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step16
+$i = 16
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step17
+$i = 17
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = true
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step18
+$i = 18
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step19
+$i = 19
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step20
+$i = 20
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step21
+$i = 21
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step22
+$i = 22
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step23
+$i = 23
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step24
+$i = 24
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = 3
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol4 = 4
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol5 = 5
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '6'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step25
+$i = 25
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol6 = '6'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol6 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step26
+$i = 26
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4', '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+sql select * from $mt where tgcol3 = '0'
+if $rows != 0 then 
+  return -1
+endi
+
+print =============== step27
+$i = 27
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10), tgcol7) -x step27
+  return -1
+step27:
+
+print =============== step28
+$i = 28
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))
+sql create table $tb using $mt tags('1', '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+print =============== step29
+$i = 29
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))
+sql create table $tb using $mt tags('1', '1')
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+
+print =============== step30
+$i = 30
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
+#  return -1
+step30: 
+
+print =============== step31
+$i = 31
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
+sql_error create table $tb using $mt tags('1234567')
+sql create table $tb using $mt tags('12345')
+sql insert into $tb values(now, 1) 
+sql select * from $mt 
+print sql select * from $mt
+if $rows != 1 then 
+  return -1
+endi
+
+print $data00 $data01 $data02
+if $data02 != 12345 then 
+  return -1
+endi
diff --git a/tests/script/windows/tag/delete.sim b/tests/script/windows/tag/delete.sim
new file mode 100644
index 0000000000000000000000000000000000000000..9e8ea9aba03c99d116d0923bd27006c34c0253a2
--- /dev/null
+++ b/tests/script/windows/tag/delete.sim
@@ -0,0 +1,825 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_de_db
+$tbPrefix = ta_de_tb
+$mtPrefix = ta_de_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 < 3
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+
+sql describe $tb
+if $data21 != BIGINT then 
+  return -1
+endi
+if $data31 != FLOAT then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol1 -x step40
+  return -1
+step40:
+sql alter table $mt drop tag tgcol2
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol1 -x step50
+  return -1
+step50:
+sql alter table $mt drop tag tgcol2
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
+sql create table $tb using $mt tags( 1, 2, 3 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql describe $tb
+if $data21 != SMALLINT then 
+  return -1
+endi
+if $data31 != TINYINT then 
+  return -1
+endi
+if $data41 != BINARY then 
+  return -1
+endi
+if $data22 != 2 then 
+  return -1
+endi
+if $data32 != 1 then 
+  return -1
+endi
+if $data42 != 10 then 
+  return -1
+endi
+if $data23 != TAG then 
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+if $data43 != TAG then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, 2, '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol3 = '3'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
+sql create table $tb using $mt tags( 1, '2', '3' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = 2
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol2
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
+sql create table $tb using $mt tags( '1', '2', '3', '4' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol4 = '4'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol4
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4.00000 then
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol5
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
+sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3.00000 then
+  return -1
+endi
+if $data05 != 4.000000000 then 
+  return -1
+endi
+if $data06 != 5 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol5
+sql alter table $mt drop tag tgcol6
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $mt drop tag tgcol4
+sql alter table $mt drop tag tgcol6
+
+sleep 5000
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step2
+  return -1
+step2:
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step3
+  return -1
+step3:
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step4
+  return -1
+step4:
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '1' -x step5
+  return -1
+step5:
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step51
+  return -1
+step51:
+sql select * from $mt where tgcol3 = 1 -x step52
+  return -1
+step52:
+  
+print =============== step7
+$i = 7
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step71
+  return -1
+step71:
+sql select * from $mt where tgcol3 = 1 -x step72
+  return -1
+step72:
+    
+print =============== step8
+$i = 8
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step81
+  return -1
+step81:
+sql select * from $mt where tgcol3 = 1 -x step82
+  return -1
+step82:
+
+print =============== step9
+$i = 9
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = 1
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step91
+  return -1
+step91:
+sql select * from $mt where tgcol2 = 1 -x step92
+  return -1
+step92:
+
+print =============== step10
+$i = 10
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol1 = '1'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != null then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step101
+  return -1
+step101:
+sql select * from $mt where tgcol3 = 1 -x step102
+  return -1
+step102:
+sql select * from $mt where tgcol4 = 1 -x step103
+  return -1
+step103:
+
+print =============== step11
+$i = 11
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4=4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4.00000 then
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step111
+  return -1
+step111:
+sql select * from $mt where tgcol3 = 1 -x step112
+  return -1
+step112:
+sql select * from $mt where tgcol5 = 1 -x step113
+  return -1
+step113:
+
+print =============== step12
+$i = 12
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql select * from $mt where tgcol4 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 4.000000000 then 
+  return -1
+endi
+if $data04 != null then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 1 -x step120
+  return -1
+step120:
+sql select * from $mt where tgcol3 = 1 -x step121
+  return -1
+step121:
+sql select * from $mt where tgcol5 = 1 -x step122
+  return -1
+step122:
+sql select * from $mt where tgcol6 = 1 -x step123
+  return -1
+step123:
+
+print =============== step13
+$i = 13
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+
+sql reset query cache
+sql select * from $mt where tgcol2 = 2
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 5.000000000 then 
+  return -1
+endi
+if $data05 != null then 
+  return -1
+endi
+if $data06 != null then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol3 = 1 -x step130
+  return -1
+step130:
+sql select * from $mt where tgcol4 = 1 -x step131
+  return -1
+step131:
+sql select * from $mt where tgcol6 = 1 -x step133
+  return -1
+step133:
+
+print =============== step14
+$i = 14
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
+sql create table $tb using $mt tags( 1, 1 )
+sql insert into $tb values(now, 1)  
+
+sql alter table xxmt drop tag tag1 -x step141
+  return -1
+step141:
+sql alter table $tb drop tag tag1 -x step142
+  return -1
+step142:
+sql alter table $mt drop tag tag1 -x step143
+  return -1
+step143:
+
+sql alter table $mt drop tag tagcol1 -x step144
+  return -1
+step144:
+
+sql alter table $mt drop tag tgcol2
+sql alter table $mt drop tag tgcol1 -x step145
+  return -1
+step145:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/double.sim b/tests/script/windows/tag/double.sim
new file mode 100644
index 0000000000000000000000000000000000000000..5445b1dbea083ea6664350c66b6342e606213678
--- /dev/null
+++ b/tests/script/windows/tag/double.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_do_db
+$tbPrefix = ta_do_tb
+$mtPrefix = ta_do_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/filter.sim b/tests/script/windows/tag/filter.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f704f32cd2b5ead591ef76ed2237099273ba95a4
--- /dev/null
+++ b/tests/script/windows/tag/filter.sim
@@ -0,0 +1,149 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_fi_db
+$tbPrefix = ta_fi_tb
+$mtPrefix = ta_fi_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tg = '1' -x step2
+  return -1
+step2:
+
+print =============== step3
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where noexist = '1' -x step3
+  return -1
+step3:
+
+print =============== step4
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'  
+if $rows != 1 then 
+  return -1
+endi
+if $data00 != 10 then 
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(cc), sum(xx), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt -x step6
+  return -1
+step6:
+
+print =============== step7
+sql select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol), max(tgcol), first(tgcol), last(tgcol) from $mt -x step7
+  return -1
+step7:
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tbcol
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by noexist  -x step9
+  return -1
+step9:
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol) as c from $mt group by tbcol
+
+print =============== step12
+sql select count(tbcol) as c from $mt group by noexist -x step12
+  return -1
+step12:
+
+print =============== step13
+sql select count(tbcol) as c from $mt group by tgcol
+print $data00 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then
+  print expect 100, actual $data00
+  return -1
+endi
+
+print =============== step15
+sql select count(tbcol) as c from $mt where noexist < 1  group by tgcol -x step15
+  return -1
+step15:
+
+print =============== step16
+sql select count(tbcol) as c from $mt where tgcol = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/float.sim b/tests/script/windows/tag/float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..64424c1e209bea2fc3a8c3aaa20dec4e03539587
--- /dev/null
+++ b/tests/script/windows/tag/float.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_fl_db
+$tbPrefix = ta_fl_tb
+$mtPrefix = ta_fl_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/int.sim b/tests/script/windows/tag/int.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7d7b5271d194df316b1cc1ac6cd4db9e45bbe2ff
--- /dev/null
+++ b/tests/script/windows/tag/int.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_in_db
+$tbPrefix = ta_in_tb
+$mtPrefix = ta_in_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/int_binary.sim b/tests/script/windows/tag/int_binary.sim
new file mode 100644
index 0000000000000000000000000000000000000000..1dd4771605046b8b54d89d54155f41fa9f751b69
--- /dev/null
+++ b/tests/script/windows/tag/int_binary.sim
@@ -0,0 +1,308 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_inb_db
+$tbPrefix = ta_inb_tb
+$mtPrefix = ta_inb_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, '0' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, '1' )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 = '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '0'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = '1'
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> '1'
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1' group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/int_float.sim b/tests/script/windows/tag/int_float.sim
new file mode 100644
index 0000000000000000000000000000000000000000..cdb9032d8cc39780f7b71297901914e86bfc1ad2
--- /dev/null
+++ b/tests/script/windows/tag/int_float.sim
@@ -0,0 +1,324 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_inf_db
+$tbPrefix = ta_inf_tb
+$mtPrefix = ta_inf_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0, 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1, 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol2 > 0.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 < 0.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol2 <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select * from $mt where ts > now + 4m and tgcol2 = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step7
+sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+
+print =============== step13
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+print =============== step14
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/set.sim b/tests/script/windows/tag/set.sim
new file mode 100644
index 0000000000000000000000000000000000000000..16103c6ce86cf62c8e8a228bebeaf931190435c4
--- /dev/null
+++ b/tests/script/windows/tag/set.sim
@@ -0,0 +1,457 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_se_db
+$tbPrefix = ta_se_tb
+$mtPrefix = ta_se_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+
+sql create database $db
+sql use $db
+
+print =============== step2
+$i = 2
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tagcx 1 -x step21
+  return -1
+step21:
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = false
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 0 then
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql describe $tb
+print $data21 $data23 $data32 $data33
+if $data21 != BOOL then 
+  return -1
+endi
+if $data31 != INT then 
+  return -1
+endi
+if $data23 != TAG then
+  return -1
+endi
+if $data33 != TAG then 
+  return -1
+endi
+
+print =============== step3
+$i = 3
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 2
+if $rows != 0 then 
+  return -1
+endi
+  
+  
+print =============== step4
+$i = 4
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
+sql create table $tb using $mt tags( 1, 2 )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = 1
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2.00000 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4.00000 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 4
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3 then 
+  return -1
+endi
+if $data03 != 4.00000 then 
+  return -1
+endi
+  
+  
+print =============== step5
+$i = 5
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
+sql create table $tb using $mt tags( 1, '2' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol2 = '2'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1.000000000 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2='4'
+
+sql reset query cache
+
+sql select * from $mt where tgcol1 = 3
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = '4'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 3.000000000 then 
+  return -1
+endi
+if $data03 != 4 then 
+  return -1
+endi
+  
+print =============== step6
+$i = 6
+$mt = $mtPrefix . $i
+$tb = $tbPrefix . $i
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
+sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
+sql insert into $tb values(now, 1)  
+sql select * from $mt where tgcol1 = '1'
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 1 then 
+  return -1
+endi
+if $data03 != 2 then 
+  return -1
+endi
+if $data04 != 3 then 
+  return -1
+endi
+if $data05 != 4 then 
+  return -1
+endi
+if $data06 != 5.000000000 then 
+  return -1
+endi
+if $data07 != 6 then 
+  return -1
+endi
+
+sql alter table $mt drop tag tgcol3
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2=8
+sql alter table $tb set tag tgcol4='9'
+sql alter table $tb set tag tgcol5=10
+sql alter table $tb set tag tgcol6='11'
+
+sql reset query cache
+  
+sql select * from $mt where tgcol1 = '7'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol2 = 8
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol4 = '9'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol5 = 10
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+sql select * from $mt where tgcol6 = '11'
+print $data01 $data02 $data03
+if $rows != 1 then 
+  return -1
+endi
+if $data01 != 1 then 
+  return -1
+endi
+if $data02 != 7 then 
+  return -1
+endi
+if $data03 != 8 then 
+  return -1
+endi
+if $data04 != 9 then 
+  return -1
+endi
+if $data05 != 10.000000000 then 
+  return -1
+endi
+if $data06 != 11 then 
+  return -1
+endi
+if $data07 != null then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/smallint.sim b/tests/script/windows/tag/smallint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..dbab4f2d43c86578c7726ca8db23863ec24f335a
--- /dev/null
+++ b/tests/script/windows/tag/smallint.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_sm_db
+$tbPrefix = ta_sm_tb
+$mtPrefix = ta_sm_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/tag/tinyint.sim b/tests/script/windows/tag/tinyint.sim
new file mode 100644
index 0000000000000000000000000000000000000000..7a0237c0d9dd9a02845774ad5102226955c83b38
--- /dev/null
+++ b/tests/script/windows/tag/tinyint.sim
@@ -0,0 +1,241 @@
+sql connect
+sleep 3000
+print ======================== dnode1 start
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = ta_ti_db
+$tbPrefix = ta_ti_tb
+$mtPrefix = ta_ti_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
+
+$i = 0
+while $i < 5
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 0 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+while $i < 10
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( 1 )  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw  
+  $i = $i + 1
+endw 
+
+print =============== step2
+sleep 100
+sql select * from $tb
+if $rows != $rowNum then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts <= now + 4m
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts >= now + 4m
+if $rows != 15 then 
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 5m
+if $rows != 1 then 
+  return -1
+endi
+sql select * from $tb where ts < now + 4m and ts > now + 5m
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > 100000 and ts < 100000 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts < now + 3m 
+if $rows != 0 then
+  return -1
+endi
+sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
+if $rows != 1 then 
+  return -1
+endi
+
+print =============== step3
+sql select * from $mt
+if $rows != $totalNum then 
+  return -1
+endi
+
+sql select * from $mt where ts < now + 4m
+if $rows != 50 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m
+if $rows != 150 then 
+  return -1
+endi
+sql select * from $mt where ts = now + 4m
+if $rows != 0 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m
+if $rows != 10 then 
+  return -1
+endi
+
+print =============== step4
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 1
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol = 0
+if $rows != 100 then 
+  return -1
+endi
+sql select * from $mt where tgcol <> 0
+if $rows != 100 then 
+  return -1
+endi
+
+print =============== step5
+sql select * from $mt where ts > now + 4m and tgcol = 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 1
+if $rows != 75 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts < now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol = 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts <= now + 4m and tgcol <> 0
+if $rows != 25 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
+if $rows != 5 then 
+  return -1
+endi
+sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
+if $rows != 5 then 
+  return -1
+endi
+
+print =============== step6
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 200 then 
+  return -1
+endi
+
+print =============== step7
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step8
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 50 then 
+  return -1
+endi
+
+print =============== step9
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step10
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 100 then 
+  return -1
+endi
+
+print =============== step11
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data00 != 25 then 
+  return -1
+endi
+
+
+print =============== step12
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt interval(1d) group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+if $data01 != 100 then 
+  return -1
+endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/testSuite.sim b/tests/script/windows/testSuite.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e372217b620fcf0735e3645fa96872ca11450225
--- /dev/null
+++ b/tests/script/windows/testSuite.sim
@@ -0,0 +1,93 @@
+run windows/alter/table.sim   
+run windows/alter/metrics.sim  
+
+run windows/compute/avg.sim         
+run windows/compute/bottom.sim 
+run windows/compute/count.sim       
+run windows/compute/diff.sim       
+run windows/compute/first.sim        
+run windows/compute/interval.sim   
+run windows/compute/last.sim    
+run windows/compute/leastsquare.sim 
+run windows/compute/max.sim           
+run windows/compute/min.sim         
+run windows/compute/percentile.sim   
+run windows/compute/stddev.sim      
+run windows/compute/sum.sim  
+run windows/compute/top.sim 
+
+run windows/db/basic.sim
+run windows/db/len.sim
+
+run windows/field/2.sim
+run windows/field/3.sim
+run windows/field/4.sim
+run windows/field/5.sim
+run windows/field/6.sim
+run windows/field/bigint.sim
+run windows/field/binary.sim
+run windows/field/bool.sim
+run windows/field/double.sim
+run windows/field/float.sim
+run windows/field/int.sim
+run windows/field/single.sim
+run windows/field/smallint.sim
+run windows/field/tinyint.sim
+
+run windows/import/basic.sim   
+
+run windows/insert/basic.sim              
+run windows/insert/query_block1_file.sim   
+run windows/insert/query_block1_memory.sim 
+run windows/insert/query_block2_file.sim   
+run windows/insert/query_block2_memory.sim 
+run windows/insert/query_file_memory.sim   
+run windows/insert/query_multi_file.sim  
+
+run windows/table/binary.sim 
+run windows/table/bool.sim 
+run windows/table/column_num.sim 
+run windows/table/column_name.sim
+run windows/table/column_value.sim 
+run windows/table/db.table.sim 
+run windows/table/double.sim 
+run windows/table/float.sim 
+run windows/table/table_len.sim 
+run windows/table/table.sim 
+
+run windows/tag/3.sim
+run windows/tag/4.sim
+run windows/tag/5.sim
+run windows/tag/6.sim
+run windows/tag/add.sim
+run windows/tag/bigint.sim
+run windows/tag/binary_binary.sim
+run windows/tag/binary.sim
+run windows/tag/bool_binary.sim
+run windows/tag/bool_int.sim
+run windows/tag/bool.sim
+run windows/tag/change.sim 
+run windows/tag/column.sim
+run windows/tag/create.sim
+run windows/tag/delete.sim
+run windows/tag/double.sim
+run windows/tag/filter.sim
+run windows/tag/float.sim
+run windows/tag/int_binary.sim
+run windows/tag/int_float.sim
+run windows/tag/int.sim
+run windows/tag/set.sim
+run windows/tag/smallint.sim
+run windows/tag/tinyint.sim
+
+run windows/vector/metrics_field.sim
+run windows/vector/metrics_mix.sim
+run windows/vector/metrics_query.sim
+run windows/vector/metrics_tag.sim
+run windows/vector/metrics_time.sim
+run windows/vector/multi.sim 
+run windows/vector/single.sim
+run windows/vector/table_field.sim
+run windows/vector/table_mix.sim
+run windows/vector/table_query.sim 
+run windows/vector/table_time.sim
diff --git a/tests/script/windows/vector/metrics_field.sim b/tests/script/windows/vector/metrics_field.sim
new file mode 100644
index 0000000000000000000000000000000000000000..e7c926e141bc90531adea7dac389a7c9f59d7fdf
--- /dev/null
+++ b/tests/script/windows/vector/metrics_field.sim
@@ -0,0 +1,622 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mf_db
+$tbPrefix = m_mf_tb
+$mtPrefix = m_mf_mt
+
+$dbPrefix = db
+$tbPrefix = tb
+$mtPrefix = mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where a = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where a = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where a = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where a = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where a = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where a = 5
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where a = 5
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where a = 5
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where a = 5
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where a = 5
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where a = 5
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where a = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where a = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where a = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/metrics_mix.sim b/tests/script/windows/vector/metrics_mix.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3d94a9638520961119740ba14628dca4143d6040
--- /dev/null
+++ b/tests/script/windows/vector/metrics_mix.sim
@@ -0,0 +1,622 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mx_db
+$tbPrefix = m_mx_tb
+$mtPrefix = m_mx_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - ffrom $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step020
+  return -1
+step020:
+
+sql select a -f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/metrics_query.sim b/tests/script/windows/vector/metrics_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..c292c6b306da676dfcc7e94fc8db30b1533848db
--- /dev/null
+++ b/tests/script/windows/vector/metrics_query.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mq_db
+$tbPrefix = m_mq_tb
+$mtPrefix = m_mq_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt -x step21
+  return -1
+step21:
+
+sql select h - f from $mt -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt -x step23
+  return -1
+step23:
+
+sql select a - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $mt
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $mt
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/metrics_tag.sim b/tests/script/windows/vector/metrics_tag.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f51a449d7171fcc1ad277b16d37be4e03e23f33f
--- /dev/null
+++ b/tests/script/windows/vector/metrics_tag.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mtg_db
+$tbPrefix = m_mtg_tb
+$mtPrefix = m_mtg_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where tgcol = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where tgcol = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where tgcol = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where tgcol = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where tgcol = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where tgcol = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where tgcol = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where tgcol = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/metrics_time.sim b/tests/script/windows/vector/metrics_time.sim
new file mode 100644
index 0000000000000000000000000000000000000000..716f49d1e5ffeff106914626ac293e8cf0cc0c9e
--- /dev/null
+++ b/tests/script/windows/vector/metrics_time.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mt_db
+$tbPrefix = m_mt_tb
+$mtPrefix = m_mt_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where tgcol = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/multi.sim b/tests/script/windows/vector/multi.sim
new file mode 100644
index 0000000000000000000000000000000000000000..415384d2434ac0f54d3db639421406bc5c854859
--- /dev/null
+++ b/tests/script/windows/vector/multi.sim
@@ -0,0 +1,215 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_mu_db
+$tbPrefix = m_mu_tb
+$mtPrefix = m_mu_mt
+
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f binary(10), g bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + b from $tb 
+print ===> $data00 $data10 $data20 $data30
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where ts < now + 4m order by ts desc
+
+sql select a + a from $tb where ts > now + 4m order by ts desc 
+
+sql select a + c from $tb where ts < now + 4m order by ts asc
+
+sql select a + f from $tb where ts > now + 4m order by ts asc  -x step24
+  return -1
+step24:
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - e from $tb 
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - e from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * b + e from $tb 
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select a * b + c from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a * b -d from $tb where ts > now + 4m
+print ===> $data20
+if $data20 != 42.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / 2 + e from $tb 
+print ===> $data00
+if $data00 != 10.500000000 then 
+  return -1
+endi
+
+sql select a / 2 from $tb where ts < now + 4m
+print ===> $data10
+if $data10 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / 2 * e from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a / e  from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+sql select a + ts from $tb -x step61
+  return -1
+step61:
+
+sql select a + f from $tb -x step62
+  return -1
+step62:
+
+sql select a + g from $tb -x step63
+  return -1
+step63:
+
+print =============== step7
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + b from $tb where a = 2
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+sql select * from $tb where b < 2
+print ===> $rows
+if $rows != 1 then 
+  return -1
+endi
+
+sql select * from $tb where b > 2
+print ===> $rows
+if $rows != 17 then 
+  return -1
+endi
+
+sql select a + c from $tb where b = 2 and ts < now + 4m
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where c = 10 and ts > now + 4m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where d = 2 and ts < now + 4m order by ts desc
+
+sql select a + a from $tb where e = 2 and ts > now + 4m order by ts desc 
+
+sql select a + c from $tb where f = 2 and ts < now + 4m order by ts asc
+
+sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc  -x step74
+  return -1
+step74:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/single.sim b/tests/script/windows/vector/single.sim
new file mode 100644
index 0000000000000000000000000000000000000000..f3f3862e54291fcd9cbeddcc684f94c055d78b19
--- /dev/null
+++ b/tests/script/windows/vector/single.sim
@@ -0,0 +1,302 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_si_db
+$tbPrefix = m_si_tb
+$mtPrefix = m_si_mt
+
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 0
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol + 1 from $tb 
+print ===> $data00 $data10 $data20 $data30
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 6.000000000 then 
+  return -1
+endi
+
+sql select tbcol + 1 from $tb where ts < now + 4m order by ts desc
+
+sql select tbcol + 1 from $tb where ts > now + 4m order by ts desc
+
+sql select tbcol + 1 from $tb where ts < now + 4m order by ts asc
+
+sql select tbcol + 1 from $tb where ts > now + 4m order by ts asc
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol - 1 from $tb 
+print ===> $data00
+if $data00 != -1.000000000 then 
+  return -1
+endi
+
+sql select tbcol - 1 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != -1.000000000 then 
+  return -1
+endi
+
+sql select tbcol - 1 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 4.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol * 2 from $tb where ts < now + 4m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol * 2 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select tbcol / 2 from $tb where ts < now + 4m
+print ===> $data10
+if $data10 != 0.500000000 then 
+  return -1
+endi
+
+sql select tbcol / 2 from $tb where ts > now + 4m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select tbcol / 0 from $tb where ts > now + 4m
+print ===> $data00
+#if $data00 != 0.000000000 then 
+#  return -1
+#endi
+
+print =============== step6
+$i = 11
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol bool)
+sql insert into $tb values(now, 0)
+sql select tbcol + 2 from $tb -x step6
+  return -1
+step6:
+
+print =============== step7
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol tinyint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step8
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol smallint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step9
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol bigint)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step10
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol float)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step11
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol double)
+sql insert into $tb values(now, 0);
+sql select tbcol + 2 from $tb 
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+sql select tbcol - 2 from $tb 
+print ===> $data00
+if $data00 != -2.000000000 then 
+  return -1
+endi
+sql select tbcol * 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+sql select tbcol / 2 from $tb 
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step12
+$i = $i + 1
+$tb = $tbPrefix . $i
+sql create table $tb (ts timestamp, tbcol binary(100))
+sql insert into $tb values(now, '0');
+sql select tbcol + 2 from $tb -x step12
+  return -1
+step12:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/table_field.sim b/tests/script/windows/vector/table_field.sim
new file mode 100644
index 0000000000000000000000000000000000000000..0c5df695fb25a6e0f13a5f3e309ad5b203b94962
--- /dev/null
+++ b/tests/script/windows/vector/table_field.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_tf_db
+$tbPrefix = m_tf_tb
+$mtPrefix = m_tf_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where a = 5
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where a = 5 -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where a = 5 -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where a = 5 -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where a = 5
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where a = 5
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where a = 5
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where a = 5
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where a = 5
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where a = 5
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select a / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where a = 5
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where a = 5
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where a = 5
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where a = 5 = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where a = 5
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where a = 5
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where a = 5
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where a = 5
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where a = 5
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where a = 5
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where a = 5
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where a = 5 -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where a = 5 -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where a = 5 -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/table_mix.sim b/tests/script/windows/vector/table_mix.sim
new file mode 100644
index 0000000000000000000000000000000000000000..3d660b5611e770ce99a934e11847dd23584387b5
--- /dev/null
+++ b/tests/script/windows/vector/table_mix.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_tm_db
+$tbPrefix = m_tm_tb
+$mtPrefix = m_tm_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where a = 5
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where a = 5 and ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/table_query.sim b/tests/script/windows/vector/table_query.sim
new file mode 100644
index 0000000000000000000000000000000000000000..27fcd0f65450380411a7f18c5db2099c6d8c93a3
--- /dev/null
+++ b/tests/script/windows/vector/table_query.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_tq_db
+$tbPrefix = m_tq_tb
+$mtPrefix = m_tq_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb
+print ===> $data00
+if $data00 != 9.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb
+print ===> $data00
+if $data00 != -9.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb -x step21
+  return -1
+step21:
+
+sql select h - f from $tb -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb -x step23
+  return -1
+step23:
+
+sql select a - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb
+print ===> $data00
+if $data00 != 11.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / a from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / b from $tb
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select d / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select e / f from $tb
+print ===> $data00
+if $data00 != 0.100000000 then 
+  return -1
+endi
+
+sql select f / f from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/windows/vector/table_time.sim b/tests/script/windows/vector/table_time.sim
new file mode 100644
index 0000000000000000000000000000000000000000..8a3804c6196375c84a2a49e19f3b42c8d7b57ec8
--- /dev/null
+++ b/tests/script/windows/vector/table_time.sim
@@ -0,0 +1,618 @@
+sql connect
+sleep 3000
+
+sql show databases
+sql drop database $data00 -x e1
+e1:
+sql show databases
+sql drop database $data00 -x e2
+e2:
+
+$dbPrefix = m_tt_db
+$tbPrefix = m_tt_tb
+$mtPrefix = m_tt_mt
+
+$tbNum = 10
+$rowNum = 21
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql drop database $db -x step1
+step1:
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, a int, b float, c smallint, d double, e tinyint, f bigint, g binary(10), h bool) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+  
+  $x = 1
+  while $x < $rowNum
+    $ms = $x . m 
+    sql insert into $tb values (now + $ms , $x , $x , $x , $x ,  $x , 10 , '11' , true ) 
+    $x = $x + 1
+  endw 
+ 
+  $i = $i + 1
+endw 
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select a - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select b - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 5.000000000 then 
+  return -1
+endi
+
+sql select c - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select d - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select e - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select f - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select g - f from $tb where ts > now + 4m and ts < now + 6m -x step21
+  return -1
+step21:
+
+sql select h - f from $tb where ts > now + 4m and ts < now + 6m -x step22
+  return -1
+step22:
+
+sql select ts - f from $tb where ts > now + 4m and ts < now + 6m -x step23
+  return -1
+step23:
+
+sql select a - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select d - e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select c - d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select a - b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+sql select b - a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.000000000 then 
+  return -1
+endi
+
+print =============== step3
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select b + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select c + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select d + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select e + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 20.000000000 then 
+  return -1
+endi
+
+sql select a + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select d + e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select c + d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select a + b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+sql select b + a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 10.000000000 then 
+  return -1
+endi
+
+print =============== step4
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select b * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select c * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select d * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select e * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 50.000000000 then 
+  return -1
+endi
+
+sql select f * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 100.000000000 then 
+  return -1
+endi
+
+sql select a * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select d * e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select c * d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select a * b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+sql select b * a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 25.000000000 then 
+  return -1
+endi
+
+print =============== step5
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select a / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select b / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.000000000 then 
+  return -1
+endi
+
+sql select c / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select d / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select e / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.500000000 then 
+  return -1
+endi
+
+sql select f / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select d / e from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select c / d from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / c from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select a / b from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+sql select b / a from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 1.000000000 then 
+  return -1
+endi
+
+print =============== step6
+$i = 1
+$tb where ts > now + 4m and ts < now + 6m = $tbPrefix . $i
+
+sql select (a+b+c+d+e) / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 2.500000000 then 
+  return -1
+endi
+
+sql select f / (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 0.400000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select f * (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 250.000000000 then 
+  return -1
+endi
+
+sql select (a+b+c+d+e) - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != 15.000000000 then 
+  return -1
+endi
+
+sql select f - (a+b+c+d+e) from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -15.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) / f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1.500000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) * f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -150.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) + f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -5.000000000 then 
+  return -1
+endi
+
+sql select (f - (a+b+c+d+e)) - f from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -25.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e) * f  as zz from $tb where ts > now + 4m and ts < now + 6m
+print ===> $data00
+if $data00 != -1300.000000000 then 
+  return -1
+endi
+
+sql select (f - (a*b+c)*a + d + e))) * f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step61
+  return -1
+step61:
+
+sql select (f - (a*b+c)*a + d + e))) * 2f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step62
+  return -1
+step62:
+
+sql select (f - (a*b+c)*a + d + e))) ** f  as zz from $tb where ts > now + 4m and ts < now + 6m -x step63
+  return -1
+step63:
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 0 then 
+  return -1
+endi
\ No newline at end of file
diff --git a/tests/script/wtest.bat b/tests/script/wtest.bat
new file mode 100644
index 0000000000000000000000000000000000000000..6cdd63b42d28437dded9dc7f99a3888b232c16fc
--- /dev/null
+++ b/tests/script/wtest.bat
@@ -0,0 +1,60 @@
+@echo off
+
+echo TDengine in windows
+echo Start TDengine Testing Case ...
+
+set "SCRIPT_DIR=%~dp0"
+echo SCRIPT_DIR: %SCRIPT_DIR%
+
+set "BUILD_DIR=%~dp0..\..\debug\32\build\bin"
+set "TSIM=%~dp0..\..\debug\32\build\bin\tsim"
+echo BUILD_DIR:  %BUILD_DIR%
+
+set "SIM_DIR=%~dp0..\..\sim"
+echo SIM_DIR:    %SIM_DIR%
+
+set "TSIM_DIR=%~dp0..\..\sim\tsim"
+echo TSIM_DIR:   %TSIM_DIR%
+
+set "CFG_DIR=%~dp0..\..\sim\tsim\cfg"
+echo CFG_DIR:    %CFG_DIR%
+
+set "LOG_DIR=%~dp0..\..\sim\tsim\log"
+echo LOG_DIR:    %LOG_DIR%
+
+set "TAOS_CFG=%~dp0..\..\sim\tsim\cfg\taos.cfg"
+echo TAOS_CFG:   %TAOS_CFG%
+
+if not exist %SIM_DIR%  mkdir %SIM_DIR%
+if not exist %TSIM_DIR% mkdir %TSIM_DIR%
+if exist %CFG_DIR% rmdir /s/q %CFG_DIR%
+if exist %LOG_DIR% rmdir /s/q %LOG_DIR%
+if not exist %CFG_DIR% mkdir %CFG_DIR%
+if not exist %LOG_DIR% mkdir %LOG_DIR%
+
+echo firstEp       %FIRSTEP%     > %TAOS_CFG%
+echo serverPort    6030          >> %TAOS_CFG%
+echo wal           2             >> %TAOS_CFG%
+echo asyncLog      0             >> %TAOS_CFG%
+echo locale        en_US.UTF-8   >> %TAOS_CFG%
+echo logDir        %LOG_DIR%     >> %TAOS_CFG%
+echo scriptDir     %SCRIPT_DIR%  >> %TAOS_CFG%
+echo numOfLogLines 100000000     >> %TAOS_CFG%
+echo tmrDebugFlag  131           >> %TAOS_CFG%
+echo rpcDebugFlag  143           >> %TAOS_CFG%
+echo cDebugFlag    143           >> %TAOS_CFG%
+echo qdebugFlag    143           >> %TAOS_CFG%
+echo udebugFlag    143           >> %TAOS_CFG%
+
+set "FILE_NAME=windows\testSuite.sim"
+set "FIRSTEP=192.168.1.182"
+if "%1" == "-f" set "FILE_NAME=%2"
+if "%1" == "-h" set "FIRSTEP=%2"
+if "%3" == "-f" set "FILE_NAME=%4"
+if "%3" == "-h" set "FIRSTEP=%4"
+
+echo FILE_NAME:  %FILE_NAME%
+echo FIRSTEP:    %FIRSTEP%
+echo ExcuteCmd:  %tsim% -c %CFG_DIR% -f %FILE_NAME%
+
+%tsim% -c %CFG_DIR% -f %FILE_NAME%
\ No newline at end of file
diff --git a/tests/stress/.gitignore b/tests/stress/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..25a8031c43c318e14e42873dcceca728aa5a48e1
--- /dev/null
+++ b/tests/stress/.gitignore
@@ -0,0 +1,3 @@
+stress
+stress.exe
+cases.json
\ No newline at end of file
diff --git a/tests/stress/README.md b/tests/stress/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a7f8a2dac6a8500bbbdb177ecbce89ea2b7f97a6
--- /dev/null
+++ b/tests/stress/README.md
@@ -0,0 +1,80 @@
+# STRESS
+
+Stress test tool for TDengine. It run a set of test cases randomly and show statistics.
+
+## COMMAND LINE
+
+``` bash
+$ ./stress [-h=<localhost>] [-P=<0>] [-d=<test>] [-u=<root>] [-p=<taosdata>] [-c=<4>] [-f=<true>] [-l=<logPath>] [path_or_sql]
+```
+
+* **-h**: host name or IP address of TDengine server (default: localhost).
+* **-P**: port number of TDengine server (default: 0).
+* **-u**: user name (default: root).
+* **-p**: password (default: taosdata).
+* **-c**: concurrency, number of concurrent goroutines for query (default: 4).
+* **-f**: fetch data or not (default: true).
+* **-l**: log file path (default: no log).
+* **path_or_sql**: a SQL statement or path of a JSON file which contains the test cases (default: cases.json).
+
+## TEST CASE FILE
+
+```json
+[{
+    "weight": 1,
+    "sql": "select * from meters where ts>=now+%dm and ts<=now-%dm and c1=%v and c2=%d and c3='%s' and tbname='%s'",
+    "args": [{
+        "type": "range",
+        "min": 30,
+        "max": 60
+    }, {
+        "type": "bool"
+    }, {
+        "type": "int",
+        "min": -10,
+        "max": 20
+    }, {
+        "type": "string",
+        "min": 0,
+        "max": 10,
+    }, {
+        "type": "list",
+        "list": [
+            "table1",
+            "table2",
+            "table3",
+            "table4"
+        ]
+    }]
+}]
+```
+
+The test case file is a standard JSON file which contains an array of test cases. For test cases, field `sql` is mandatory, and it can optionally include a `weight` field and an `args` field which is an array of arguments.
+
+`sql` is a SQL statement, it can include zero or more arguments (placeholders).
+
+`weight` defines the possibility of the case being selected, the greater value the higher possibility. It must be an non-negative integer and the default value is zero, but, if all cases have a zero weight, all the weights are regarded as 1. 
+
+Placeholders of `sql` are replaced by arguments in `args` at runtime. There are 5 types of arguments currently:
+
+* **bool**: generate a `boolean` value randomly.
+* **int**: generate an `integer` between [`min`, `max`] randomly, the default value of `min` is 0 and `max` is 100.
+* **range**: generate two `integer`s between [`min`, `max`] randomly, the first is less than the second, the default value of `min` is 0 and `max` is 100.
+* **string**: generate a `string` with length between [`min`, `max`] randomly, the default value of `min` is 0 and `max` is 100.
+* **list**: select an item from `list` randomly.
+
+## OUTPUT
+
+```
+ 00:00:08 | TOTAL REQ | TOTAL TIME(us) | TOTAL AVG(us) | REQUEST |  TIME(us)  |  AVERAGE(us)  |
+    TOTAL |      3027 |       26183890 |       8650.11 |     287 |    3060935 |      10665.28 |
+  SUCCESS |      3027 |       26183890 |       8650.11 |     287 |    3060935 |      10665.28 |
+     FAIL |         0 |              0 |          0.00 |       0 |          0 |          0.00 |
+```
+
+* **Col 2**: total number of request since test start.
+* **Col 3**: total time of all request since test start.
+* **Col 4**: average time of all request since test start.
+* **Col 5**: number of request in last second.
+* **Col 6**: time of all request in last second.
+* **Col 7**: average time of all request in last second.
diff --git a/tests/stress/go.mod b/tests/stress/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..df9b2806b551429ee59ad0d44e3eb0ad75ab39cb
--- /dev/null
+++ b/tests/stress/go.mod
@@ -0,0 +1,7 @@
+module github.com/taosdata/stress
+
+go 1.14
+
+require (
+	github.com/taosdata/driver-go v0.0.0-20200606095205-b786bac1857f
+)
diff --git a/tests/stress/main.go b/tests/stress/main.go
new file mode 100644
index 0000000000000000000000000000000000000000..c3b9290a379b0782f1042909cc0cadb728a4620e
--- /dev/null
+++ b/tests/stress/main.go
@@ -0,0 +1,406 @@
+package main
+
+import (
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"math/rand"
+	"os"
+	"os/signal"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	_ "github.com/taosdata/driver-go/taosSql"
+)
+
+type argument struct {
+	Type string        `json:"type"`
+	Min  int           `json:"min"`
+	Max  int           `json:"max"`
+	List []interface{} `json:"list, omitempty"`
+}
+
+type testCase struct {
+	isQuery bool       `json:"-"`
+	numArgs int        `json:"-"`
+	Weight  int        `json:"weight"`
+	SQL     string     `json:"sql"`
+	Args    []argument `json:"args"`
+}
+
+func (arg *argument) check() (int, error) {
+	if arg.Type == "list" {
+		if len(arg.List) == 0 {
+			return 0, errors.New("list cannot be empty")
+		}
+		return 1, nil
+	}
+
+	if arg.Max < arg.Min {
+		return 0, errors.New("invalid min/max value")
+	}
+
+	if arg.Type == "string" {
+		if arg.Min < 0 {
+			return 0, errors.New("negative string length")
+		}
+	}
+
+	if arg.Type == "int" && arg.Min == 0 && arg.Max == 0 {
+		arg.Max = arg.Min + 100
+	}
+
+	if arg.Type == "range" {
+		return 2, nil
+	}
+
+	return 1, nil
+}
+
+func (arg *argument) generate(args []interface{}) []interface{} {
+	const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+
+	switch arg.Type {
+	case "bool":
+		if rand.Intn(2) == 1 {
+			args = append(args, true)
+		} else {
+			args = append(args, false)
+		}
+
+	case "int":
+		v := rand.Intn(arg.Max-arg.Min+1) + arg.Min
+		args = append(args, v)
+
+	case "range":
+		v := rand.Intn(arg.Max-arg.Min) + arg.Min
+		args = append(args, v)
+		v = rand.Intn(arg.Max-v+1) + v
+		args = append(args, v)
+
+	case "string":
+		l := rand.Intn(arg.Max-arg.Min+1) + arg.Min
+		sb := strings.Builder{}
+		for i := 0; i < l; i++ {
+			sb.WriteByte(chars[rand.Intn(len(chars))])
+		}
+		args = append(args, sb.String())
+
+	case "list":
+		v := arg.List[rand.Intn(len(arg.List))]
+		args = append(args, v)
+	}
+
+	return args
+}
+
+func (tc *testCase) buildSql() string {
+	args := make([]interface{}, 0, tc.numArgs)
+	for i := 0; i < len(tc.Args); i++ {
+		args = tc.Args[i].generate(args)
+	}
+	return fmt.Sprintf(tc.SQL, args...)
+}
+
+type statitics struct {
+	succeeded         int64
+	failed            int64
+	succeededDuration int64
+	failedDuration    int64
+}
+
+var (
+	host     string
+	port     uint
+	database string
+	user     string
+	password string
+	fetch    bool
+
+	chLog       chan string
+	wgLog       sync.WaitGroup
+	startAt     time.Time
+	shouldStop  int64
+	wgTest      sync.WaitGroup
+	stat        statitics
+	totalWeight int
+	cases       []testCase
+)
+
+func loadTestCaseFromFile(file *os.File) error {
+	if e := json.NewDecoder(file).Decode(&cases); e != nil {
+		return e
+	}
+
+	if len(cases) == 0 {
+		return fmt.Errorf("no test case loaded.")
+	}
+
+	for i := 0; i < len(cases); i++ {
+		c := &cases[i]
+		c.SQL = strings.TrimSpace(c.SQL)
+		c.isQuery = strings.ToLower(c.SQL[:6]) == "select"
+		if c.Weight < 0 {
+			return fmt.Errorf("test %d: negative weight", i)
+		}
+		totalWeight += c.Weight
+
+		for j := 0; j < len(c.Args); j++ {
+			arg := &c.Args[j]
+			arg.Type = strings.ToLower(arg.Type)
+			n, e := arg.check()
+			if e != nil {
+				return fmt.Errorf("test case %d argument %d: %s", i, j, e.Error())
+			}
+			c.numArgs += n
+		}
+	}
+
+	if totalWeight == 0 {
+		for i := 0; i < len(cases); i++ {
+			cases[i].Weight = 1
+		}
+		totalWeight = len(cases)
+	}
+
+	return nil
+}
+
+func loadTestCase(pathOrSQL string) error {
+	if f, e := os.Open(pathOrSQL); e == nil {
+		defer f.Close()
+		return loadTestCaseFromFile(f)
+	}
+
+	pathOrSQL = strings.TrimSpace(pathOrSQL)
+	if strings.ToLower(pathOrSQL[:6]) != "select" {
+		return fmt.Errorf("'%s' is not a valid file or SQL statement", pathOrSQL)
+	}
+
+	cases = append(cases, testCase{
+		isQuery: true,
+		Weight:  1,
+		numArgs: 0,
+		SQL:     pathOrSQL,
+	})
+	totalWeight = 1
+
+	return nil
+}
+
+func selectTestCase() *testCase {
+	sum, target := 0, rand.Intn(totalWeight)
+	var c *testCase
+	for i := 0; i < len(cases); i++ {
+		c = &cases[i]
+		sum += c.Weight
+		if sum > target {
+			break
+		}
+	}
+	return c
+}
+
+func runTest() {
+	defer wgTest.Done()
+	db, e := sql.Open("taosSql", fmt.Sprintf("%s:%s@tcp(%s:%v)/%s", user, password, host, port, database))
+	if e != nil {
+		fmt.Printf("failed to connect to database: %s\n", e.Error())
+		return
+	}
+	defer db.Close()
+
+	for atomic.LoadInt64(&shouldStop) == 0 {
+		c := selectTestCase()
+		str := c.buildSql()
+
+		start := time.Now()
+		if c.isQuery {
+			var rows *sql.Rows
+			if rows, e = db.Query(str); rows != nil {
+				if fetch {
+					for rows.Next() {
+					}
+				}
+				rows.Close()
+			}
+		} else {
+			_, e = db.Exec(str)
+		}
+		duration := time.Now().Sub(start).Microseconds()
+
+		if e != nil {
+			if chLog != nil {
+				chLog <- str + ": " + e.Error()
+			}
+			atomic.AddInt64(&stat.failed, 1)
+			atomic.AddInt64(&stat.failedDuration, duration)
+		} else {
+			atomic.AddInt64(&stat.succeeded, 1)
+			atomic.AddInt64(&stat.succeededDuration, duration)
+		}
+	}
+}
+
+func getStatPrinter() func(tm time.Time) {
+	var last statitics
+	lastPrintAt := startAt
+
+	return func(tm time.Time) {
+		var current statitics
+
+		current.succeeded = atomic.LoadInt64(&stat.succeeded)
+		current.failed = atomic.LoadInt64(&stat.failed)
+		current.succeededDuration = atomic.LoadInt64(&stat.succeededDuration)
+		current.failedDuration = atomic.LoadInt64(&stat.failedDuration)
+
+		seconds := int64(tm.Sub(startAt).Seconds())
+		format := "\033[47;30m %02v:%02v:%02v | TOTAL REQ | TOTAL TIME(us) | TOTAL AVG(us) | REQUEST |  TIME(us)  |  AVERAGE(us)  |\033[0m\n"
+		fmt.Printf(format, seconds/3600, seconds%3600/60, seconds%60)
+
+		tr := current.succeeded + current.failed
+		td := current.succeededDuration + current.failedDuration
+		r := tr - last.succeeded - last.failed
+		d := td - last.succeededDuration - last.failedDuration
+		ta, a := 0.0, 0.0
+		if tr > 0 {
+			ta = float64(td) / float64(tr)
+		}
+		if r > 0 {
+			a = float64(d) / float64(r)
+		}
+		format = "    TOTAL | %9v | %14v | %13.2f | %7v | %10v | % 13.2f |\n"
+		fmt.Printf(format, tr, td, ta, r, d, a)
+
+		tr = current.succeeded
+		td = current.succeededDuration
+		r = tr - last.succeeded
+		d = td - last.succeededDuration
+		ta, a = 0.0, 0.0
+		if tr > 0 {
+			ta = float64(td) / float64(tr)
+		}
+		if r > 0 {
+			a = float64(d) / float64(r)
+		}
+		format = "  SUCCESS | \033[32m%9v\033[0m | \033[32m%14v\033[0m | \033[32m%13.2f\033[0m | \033[32m%7v\033[0m | \033[32m%10v\033[0m | \033[32m%13.2f\033[0m |\n"
+		fmt.Printf(format, tr, td, ta, r, d, a)
+
+		tr = current.failed
+		td = current.failedDuration
+		r = tr - last.failed
+		d = td - last.failedDuration
+		ta, a = 0.0, 0.0
+		if tr > 0 {
+			ta = float64(td) / float64(tr)
+		}
+		if r > 0 {
+			a = float64(d) / float64(r)
+		}
+		format = "     FAIL | \033[31m%9v\033[0m | \033[31m%14v\033[0m | \033[31m%13.2f\033[0m | \033[31m%7v\033[0m | \033[31m%10v\033[0m | \033[31m%13.2f\033[0m |\n"
+		fmt.Printf(format, tr, td, ta, r, d, a)
+
+		last = current
+		lastPrintAt = tm
+	}
+}
+
+func startLogger(path string) error {
+	if len(path) == 0 {
+		return nil
+	}
+
+	f, e := os.Create(path)
+	if e != nil {
+		return e
+	}
+
+	chLog = make(chan string, 100)
+	wgLog.Add(1)
+	go func() {
+		for s := range chLog {
+			if f != nil {
+				f.WriteString(s)
+				f.WriteString("\n")
+			}
+		}
+		f.Close()
+		wgLog.Done()
+	}()
+
+	return nil
+}
+
+func main() {
+	var concurrency uint
+	var logPath string
+	flag.StringVar(&host, "h", "localhost", "host name or IP address of TDengine server")
+	flag.UintVar(&port, "P", 0, "port (default 0)")
+	flag.StringVar(&database, "d", "test", "database name")
+	flag.StringVar(&user, "u", "root", "user name")
+	flag.StringVar(&password, "p", "taosdata", "password")
+	flag.BoolVar(&fetch, "f", true, "fetch result or not")
+	flag.UintVar(&concurrency, "c", 4, "concurrency, number of goroutines for query")
+	flag.StringVar(&logPath, "l", "", "path of log file (default: no log)")
+	flag.Parse()
+
+	if e := startLogger(logPath); e != nil {
+		fmt.Println("failed to open log file:", e.Error())
+		return
+	}
+
+	pathOrSQL := flag.Arg(0)
+	if len(pathOrSQL) == 0 {
+		pathOrSQL = "cases.json"
+	}
+	if e := loadTestCase(pathOrSQL); e != nil {
+		fmt.Println("failed to load test cases:", e.Error())
+		return
+	}
+
+	rand.Seed(time.Now().UnixNano())
+
+	fmt.Printf("\nSERVER: %s    DATABASE: %s    CONCURRENCY: %d    FETCH DATA: %v\n\n", host, database, concurrency, fetch)
+
+	startAt = time.Now()
+	printStat := getStatPrinter()
+	printStat(startAt)
+
+	for i := uint(0); i < concurrency; i++ {
+		wgTest.Add(1)
+		go runTest()
+	}
+
+	interrupt := make(chan os.Signal, 1)
+	signal.Notify(interrupt, os.Interrupt)
+	ticker := time.NewTicker(time.Second)
+
+	fmt.Println("Ctrl + C to exit....\033[1A")
+
+LOOP:
+	for {
+		select {
+		case <-interrupt:
+			break LOOP
+		case tm := <-ticker.C:
+			fmt.Print("\033[4A")
+			printStat(tm)
+		}
+	}
+
+	atomic.StoreInt64(&shouldStop, 1)
+	fmt.Print("\033[100D'Ctrl + C' received, Waiting started query to stop...")
+	wgTest.Wait()
+
+	if chLog != nil {
+		close(chLog)
+		wgLog.Wait()
+	}
+	fmt.Print("\033[4A\033[100D")
+	printStat(time.Now())
+	fmt.Println()
+}
diff --git a/tests/test-all.sh b/tests/test-all.sh
new file mode 100755
index 0000000000000000000000000000000000000000..84b663809d03cc87010e048bbe0289f42e5d3a09
--- /dev/null
+++ b/tests/test-all.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Color setting
+RED='\033[0;31m'
+GREEN='\033[1;32m'
+GREEN_DARK='\033[0;32m'
+GREEN_UNDERLINE='\033[4;32m'
+NC='\033[0m'
+
+function runSimCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^./test.sh* ]]; then
+			case=`echo $line | grep sim$ |awk '{print $NF}'`
+
+      start_time=`date +%s`
+      ./test.sh -f $case > /dev/null 2>&1 && \
+        echo -e "${GREEN}$case success${NC}" | tee -a out.log || \
+        echo -e "${RED}$case failed${NC}" | tee -a out.log
+      end_time=`date +%s`
+      echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log
+    fi
+  done < $1
+}
+
+function runPyCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^python.* ]]; then
+      if [[ $line != *sleep* ]]; then
+        case=`echo $line|awk '{print $NF}'`
+        start_time=`date +%s`
+        $line > /dev/null 2>&1 && \
+          echo -e "${GREEN}$case success${NC}" | tee -a pytest-out.log || \
+          echo -e "${RED}$case failed${NC}" | tee -a pytest-out.log
+        end_time=`date +%s`
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+      else
+        $line > /dev/null 2>&1
+      fi
+    fi
+  done < $1
+}
+
+totalFailed=0
+totalPyFailed=0
+
+tests_dir=`pwd`
+
+if [ "$2" != "python" ]; then
+  echo "### run TSIM test case ###"
+  cd $tests_dir/script
+
+  [ -f out.log ] && rm -f out.log
+  if [ "$1" == "cron" ]; then
+    echo "### run TSIM regression test ###"
+    runSimCaseOneByOne regressionSuite.sim
+  elif [ "$1" == "full" ]; then
+    echo "### run TSIM full test ###"
+    runSimCaseOneByOne jenkins/basic.txt
+  elif [ "$1" == "smoke" ] || [ -z "$1" ]; then
+    echo "### run TSIM smoke test ###"
+    runSimCaseOneByOne basicSuite.sim
+  fi
+
+  totalSuccess=`grep 'success' out.log | wc -l`
+  totalBasic=`grep success out.log | grep Suite | wc -l`
+
+  if [ "$totalSuccess" -gt "0" ]; then
+    totalSuccess=`expr $totalSuccess - $totalBasic`
+  fi
+
+  echo -e "\n${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}"
+
+  totalFailed=`grep 'failed\|fault' out.log | wc -l`
+# echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
+
+  if [ "$totalFailed" -ne "0" ]; then
+    echo -e "\n${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
+
+#  exit $totalFailed
+  fi
+fi
+
+if [ "$2" != "sim" ]; then
+  echo "### run Python test case ###"
+
+  cd $tests_dir
+  IN_TDINTERNAL="community"
+
+  if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+    cd ../..
+  else
+    cd ../
+  fi
+
+  TOP_DIR=`pwd`
+  TAOSLIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1`
+  if [[ "$TAOSLIB_DIR" == *"$IN_TDINTERNAL"* ]]; then
+    LIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1|cut -d '/' --fields=2,3,4,5`
+  else
+    LIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1|cut -d '/' --fields=2,3,4`
+  fi
+
+  export LD_LIBRARY_PATH=$TOP_DIR/$LIB_DIR:$LD_LIBRARY_PATH
+
+  cd $tests_dir/pytest
+
+  [ -f pytest-out.log ] && rm -f pytest-out.log
+
+  if [ "$1" == "cron" ]; then
+    echo "### run Python regression test ###"
+    runPyCaseOneByOne regressiontest.sh
+  elif [ "$1" == "full" ]; then
+    echo "### run Python full test ###"
+    runPyCaseOneByOne fulltest.sh
+  elif [ "$1" == "smoke" ] || [ -z "$1" ]; then
+    echo "### run Python smoke test ###"
+    runPyCaseOneByOne smoketest.sh
+  fi
+  totalPySuccess=`grep 'success' pytest-out.log | wc -l`
+
+  if [ "$totalPySuccess" -gt "0" ]; then
+    echo -e "\n${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}"
+  fi
+
+  totalPyFailed=`grep 'failed\|fault' pytest-out.log | wc -l`
+  if [ "$totalPyFailed" -ne "0" ]; then
+    echo -e "\n${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}"
+#  exit $totalPyFailed
+  fi
+fi
+
+exit $(($totalFailed + $totalPyFailed))
diff --git a/tests/test/c/CMakeLists.txt b/tests/test/c/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..26aa20e647cc166ac991e64bc18511e9b504b335
--- /dev/null
+++ b/tests/test/c/CMakeLists.txt
@@ -0,0 +1,49 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/plugins/http/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
+
+IF (TD_LINUX)
+  #add_executable(insertPerTable insertPerTable.c)
+  #target_link_libraries(insertPerTable taos_static pthread)
+
+  #add_executable(insertPerRow insertPerRow.c)
+  #target_link_libraries(insertPerRow taos_static pthread)
+
+  #add_executable(importOneRow importOneRow.c)
+  #target_link_libraries(importOneRow taos_static pthread)
+
+  #add_executable(importPerTable importPerTable.c)
+  #target_link_libraries(importPerTable taos_static pthread)
+
+  #add_executable(hashPerformance hashPerformance.c)
+  #target_link_libraries(hashPerformance taos_static tutil common pthread)
+
+  #add_executable(createTablePerformance createTablePerformance.c)
+  #target_link_libraries(createTablePerformance taos_static tutil common pthread)
+
+  #add_executable(createNormalTable createNormalTable.c)
+  #target_link_libraries(createNormalTable taos_static tutil common pthread)
+
+  #add_executable(queryPerformance queryPerformance.c)
+  #target_link_libraries(queryPerformance taos_static tutil common pthread)
+  
+  #add_executable(httpTest httpTest.c)
+  #target_link_libraries(httpTest taos_static tutil common pthread mnode monitor http tsdb twal vnode cJson lz4)
+
+  #add_executable(cacheTest cacheTest.c)
+  #target_link_libraries(cacheTest taos_static tutil common pthread mnode monitor http tsdb twal vnode cJson lz4)
+
+  #add_executable(invalidTableId invalidTableId.c)
+  #target_link_libraries(invalidTableId taos_static tutil common pthread)
+ENDIF()
+
diff --git a/tests/test/c/cacheTest.c b/tests/test/c/cacheTest.c
new file mode 100644
index 0000000000000000000000000000000000000000..54aca0038ed39d8d0294a5f88acd271c10f42319
--- /dev/null
+++ b/tests/test/c/cacheTest.c
@@ -0,0 +1,146 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include <malloc.h>
+#include "os.h"
+#include "taos.h"
+#include "tcache.h"
+#include "tulog.h"
+#include "tutil.h"
+
+#define MAX_REFRESH_TIME_SEC 2
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+int32_t tsKeepTimeInSec = 3;
+int32_t tsNumOfRows = 1000000;
+int32_t tsSizeOfRow = 64 * 1024;
+void *  tsCacheObj = NULL;
+int32_t destroyTimes = 0;
+
+typedef int64_t CacheTestKey;
+typedef struct CacheTestRow {
+  int32_t index;
+  void ** ppRow;
+  void *  data;
+} CacheTestRow;
+
+CacheTestRow *initRow(int32_t index) {
+  CacheTestRow *row = calloc(sizeof(CacheTestRow), 1);
+  row->index = index;
+  row->data = malloc(tsSizeOfRow * sizeof(int8_t));
+  return row;
+}
+
+void detroyRow(void *data) {
+  CacheTestRow *row = *(CacheTestRow **)data;
+  free(row->data);
+  free(row);
+  destroyTimes++;
+  if (destroyTimes % 50000 == 0) {
+    pPrint("%s ===> destroyTimes:%d %s", GREEN, destroyTimes, NC);
+  }
+}
+
+void initCache() {
+  tsCacheObj = taosCacheInit(TSDB_DATA_TYPE_BIGINT, MAX_REFRESH_TIME_SEC, true, detroyRow, "cachetest");
+}
+
+void putRowInCache() {
+  for (int index = 0; index < tsNumOfRows; ++index) {
+    CacheTestRow *row = initRow(index);
+    uint64_t      key = (uint64_t)row;
+    void **ppRow = taosCachePut(tsCacheObj, &key, sizeof(int64_t), &row, sizeof(int64_t), tsKeepTimeInSec * 1000);
+    row->ppRow = ppRow;
+    taosCacheRelease(tsCacheObj, (void **)&ppRow, false);
+  }
+}
+
+void cleanupCache() {
+  taosCacheCleanup(tsCacheObj);
+}
+
+void initGetMemory() {
+  osInit();
+  taos_init();
+}
+
+float getProcMemory() {
+  float procMemoryUsedMB = 0;
+  taosGetProcMemory(&procMemoryUsedMB);
+  return procMemoryUsedMB;
+}
+
+void doTest() {
+  initCache();
+  pPrint("%s initialize procMemory %f MB %s", GREEN, getProcMemory(), NC);
+
+  putRowInCache();
+  pPrint("%s insert %d rows, procMemory %f MB %s", GREEN, tsNumOfRows, getProcMemory(), NC);
+
+  int32_t sleepMs = (MAX_REFRESH_TIME_SEC * 3) * 1000 + tsKeepTimeInSec * 1000;
+  taosMsleep(sleepMs);
+  pPrint("%s after sleep %d ms, procMemory %f MB %s", GREEN, sleepMs, getProcMemory(), NC);
+
+  cleanupCache();
+  taosMsleep(sleepMs);
+  pPrint("%s after cleanup cache, procMemory %f MB %s", GREEN, getProcMemory(), NC);
+  
+  malloc_trim(0);
+  taosMsleep(sleepMs);
+  pPrint("%s after malloc_trim, procMemory %f MB %s", GREEN, getProcMemory(), NC);
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of cache\n");
+
+  printf("%s%s\n", indent, "-k");
+  printf("%s%s%s%d\n", indent, indent, "KeepTimeInSec, default is ", tsKeepTimeInSec);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%d\n", indent, indent, "NumOfRows, default is ", tsNumOfRows);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%d\n", indent, indent, "SizeOfData, default is ", tsSizeOfRow);
+
+  exit(EXIT_SUCCESS);
+}
+
+void parseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-k") == 0) {
+      tsKeepTimeInSec = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      tsNumOfRows = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      tsSizeOfRow = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s KeepTimeInSec:%d %s", GREEN, tsKeepTimeInSec, NC);
+  pPrint("%s NumOfRows:%d %s", GREEN, tsNumOfRows, NC);
+  pPrint("%s SizeOfData:%d %s", GREEN, tsSizeOfRow, NC);
+}
+
+int main(int argc, char *argv[]) {
+  initGetMemory();
+  parseArgument(argc, argv);
+  doTest();
+}
diff --git a/tests/test/c/createNormalTable.c b/tests/test/c/createNormalTable.c
new file mode 100644
index 0000000000000000000000000000000000000000..60253e2add1ebaa1e6c2c00b073cf13672789346
--- /dev/null
+++ b/tests/test/c/createNormalTable.c
@@ -0,0 +1,237 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taos.h"
+#include "tulog.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "hash.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+char    dbName[32] = "db";
+char    stableName[64] = "st";
+int32_t numOfThreads = 30;
+int32_t numOfTables = 100000;
+int32_t replica = 1;
+int32_t numOfColumns = 2;
+
+typedef struct {
+  int32_t   tableBeginIndex;
+  int32_t   tableEndIndex;
+  int32_t   threadIndex;
+  char      dbName[32];
+  char      stableName[64];
+  float     createTableSpeed;
+  pthread_t thread;
+} SThreadInfo;
+
+void  shellParseArgument(int argc, char *argv[]);
+void *threadFunc(void *param);
+void  createDbAndSTable();
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  taos_init();
+  if (replica != 0) {
+    createDbAndSTable();
+  }
+
+  pPrint("%d threads are spawned to create table", numOfThreads);
+  
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SThreadInfo *pInfo = (SThreadInfo *)calloc(numOfThreads, sizeof(SThreadInfo));
+
+  int32_t numOfTablesPerThread = numOfTables / numOfThreads;
+  numOfTables = numOfTablesPerThread * numOfThreads;
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
+    pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
+    pInfo[i].threadIndex = i;
+    strcpy(pInfo[i].dbName, dbName);
+    strcpy(pInfo[i].stableName, stableName);
+    pthread_create(&(pInfo[i].thread), &thattr, threadFunc, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  float createTableSpeed = 0;
+  for (int i = 0; i < numOfThreads; ++i) {
+    createTableSpeed += pInfo[i].createTableSpeed;
+  }
+
+  pPrint("%s total speed:%.1f tables/second, threads:%d %s", GREEN, createTableSpeed, numOfThreads, NC);
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void createDbAndSTable() {
+  pPrint("start to create db and stable");
+  char qstr[64000];
+  
+  TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "create database if not exists %s replica %d", dbName, replica);
+  TAOS_RES *pSql = taos_query(con, qstr);
+  int32_t code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to create database:%s, sql:%s, code:%d reason:%s", dbName, qstr, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  sprintf(qstr, "use %s", dbName);
+  pSql = taos_query(con, qstr);
+  code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  taos_close(con);
+}
+
+void *threadFunc(void *param) {
+  SThreadInfo *pInfo = (SThreadInfo *)param;
+  char qstr[65000];
+  int  code;
+
+  TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
+  if (con == NULL) {
+    pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "use %s", pInfo->dbName);
+  TAOS_RES *pSql = taos_query(con, qstr);
+  taos_free_result(pSql);
+
+  int64_t startMs = taosGetTimestampMs();
+
+  if (replica != 0) {
+    for (int32_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
+      sprintf(qstr, "create table %s%d (ts timestamp, i int)", stableName, t);
+      TAOS_RES *pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        pError("failed to create table %s%d, reason:%s", stableName, t, tstrerror(code));
+      }
+      taos_free_result(pSql);
+    }
+  } else {
+    for (int32_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
+      sprintf(qstr, "insert into %s%d values(now, 1)", stableName, t);
+      TAOS_RES *pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        if (code != TSDB_CODE_MND_INVALID_TABLE_NAME) {
+          pError("failed to create table %s%d, reason:%s", stableName, t, tstrerror(code));
+        }
+        if (code == TSDB_CODE_VND_INVALID_VGROUP_ID) {
+          exit(0);
+        }
+      }
+      taos_free_result(pSql);
+    }
+  }
+
+  float createTableSpeed = 0;
+  for (int i = 0; i < numOfThreads; ++i) {
+    createTableSpeed += pInfo[i].createTableSpeed;
+  }
+
+  int64_t endMs = taosGetTimestampMs();
+  int32_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  float   seconds = (endMs - startMs) / 1000.0;
+  float   speed = totalTables / seconds;
+  pInfo->createTableSpeed = speed;
+
+  pPrint("thread:%d, time:%.2f sec, speed:%.1f tables/second, ", pInfo->threadIndex, seconds, speed);
+  taos_close(con);
+
+  return 0;
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance while create table\n");
+
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%d\n", indent, indent, "numOfThreads, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%d\n", indent, indent, "numOfTables, default is ", numOfTables);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%d\n", indent, indent, "replica, default is ", replica);
+  printf("%s%s\n", indent, "-columns");
+  printf("%s%s%s%d\n", indent, indent, "numOfColumns, default is ", numOfColumns);
+  
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbName, argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(stableName, argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      numOfTables = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      replica = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-columns") == 0) {
+      numOfColumns = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s dbName:%s %s", GREEN, dbName, NC);
+  pPrint("%s stableName:%s %s", GREEN, stableName, NC);
+  pPrint("%s configDir:%s %s", GREEN, configDir, NC);
+  pPrint("%s numOfTables:%d %s", GREEN, numOfTables, NC);
+  pPrint("%s numOfThreads:%d %s", GREEN, numOfThreads, NC);
+  pPrint("%s numOfColumns:%d %s", GREEN, numOfColumns, NC);
+  pPrint("%s replica:%d %s", GREEN, replica, NC);
+  
+  pPrint("%s start create table performace test %s", GREEN, NC);
+}
diff --git a/tests/test/c/createTablePerformance.c b/tests/test/c/createTablePerformance.c
new file mode 100644
index 0000000000000000000000000000000000000000..eae104291a3bfcbb37e6a2c89d61214c61d4b6c0
--- /dev/null
+++ b/tests/test/c/createTablePerformance.c
@@ -0,0 +1,232 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taos.h"
+#include "tulog.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "hash.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+char    dbName[32] = "db";
+char    stableName[64] = "st";
+int32_t numOfThreads = 30;
+int32_t numOfTables = 100000;
+int32_t replica = 1;
+int32_t numOfColumns = 2;
+
+typedef struct {
+  int32_t   tableBeginIndex;
+  int32_t   tableEndIndex;
+  int32_t   threadIndex;
+  char      dbName[32];
+  char      stableName[64];
+  float     createTableSpeed;
+  pthread_t thread;
+} SThreadInfo;
+
+void  shellParseArgument(int argc, char *argv[]);
+void *threadFunc(void *param);
+void  createDbAndSTable();
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  taos_init();
+  createDbAndSTable();
+
+  pPrint("%d threads are spawned to create table", numOfThreads);
+  
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SThreadInfo *pInfo = (SThreadInfo *)calloc(numOfThreads, sizeof(SThreadInfo));
+
+  int32_t numOfTablesPerThread = numOfTables / numOfThreads;
+  numOfTables = numOfTablesPerThread * numOfThreads;
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
+    pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
+    pInfo[i].threadIndex = i;
+    strcpy(pInfo[i].dbName, dbName);
+    strcpy(pInfo[i].stableName, stableName);
+    pthread_create(&(pInfo[i].thread), &thattr, threadFunc, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  float createTableSpeed = 0;
+  for (int i = 0; i < numOfThreads; ++i) {
+    createTableSpeed += pInfo[i].createTableSpeed;
+  }
+
+  pPrint("%s total speed:%.1f tables/second, threads:%d %s", GREEN, createTableSpeed, numOfThreads, NC);
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void createDbAndSTable() {
+  pPrint("start to create db and stable");
+  char qstr[64000];
+  
+  TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "create database if not exists %s replica %d", dbName, replica);
+  TAOS_RES *pSql = taos_query(con, qstr);
+  int32_t code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to create database:%s, sql:%s, code:%d reason:%s", dbName, qstr, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  sprintf(qstr, "use %s", dbName);
+  pSql = taos_query(con, qstr);
+  code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  int len = sprintf(qstr, "create table if not exists %s(ts timestamp", stableName);
+  for (int32_t f = 0; f < numOfColumns - 1; ++f) {
+    len += sprintf(qstr + len, ", f%d double", f);
+  }
+  sprintf(qstr + len, ") tags(t int)");
+
+  pSql = taos_query(con, qstr);
+  code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  taos_close(con);
+}
+
+void *threadFunc(void *param) {
+  SThreadInfo *pInfo = (SThreadInfo *)param;
+  char qstr[65000];
+  int  code;
+
+  TAOS *con = taos_connect(NULL, "root", "taosdata", NULL, 0);
+  if (con == NULL) {
+    pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "use %s", pInfo->dbName);
+  TAOS_RES *pSql = taos_query(con, qstr);
+  taos_free_result(pSql);
+
+  int64_t startMs = taosGetTimestampMs();
+
+  for (int32_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
+    sprintf(qstr, "create table if not exists %s%d using %s tags(%d)", stableName, t, stableName, t);
+    TAOS_RES *pSql = taos_query(con, qstr);
+    code = taos_errno(pSql);
+    if (code != 0) {
+      pError("failed to create table %s%d, reason:%s", stableName, t, tstrerror(code));
+    }
+    taos_free_result(pSql);
+  }
+
+  float createTableSpeed = 0;
+  for (int i = 0; i < numOfThreads; ++i) {
+    createTableSpeed += pInfo[i].createTableSpeed;
+  }
+
+  int64_t endMs = taosGetTimestampMs();
+  int32_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  float   seconds = (endMs - startMs) / 1000.0;
+  float   speed = totalTables / seconds;
+  pInfo->createTableSpeed = speed;
+
+  pPrint("thread:%d, time:%.2f sec, speed:%.1f tables/second, ", pInfo->threadIndex, seconds, speed);
+  taos_close(con);
+
+  return 0;
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance while create table\n");
+
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%d\n", indent, indent, "numOfThreads, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%d\n", indent, indent, "numOfTables, default is ", numOfTables);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%d\n", indent, indent, "replica, default is ", replica);
+  printf("%s%s\n", indent, "-columns");
+  printf("%s%s%s%d\n", indent, indent, "numOfColumns, default is ", numOfColumns);
+  
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbName, argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(stableName, argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      numOfTables = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      replica = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-columns") == 0) {
+      numOfColumns = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s dbName:%s %s", GREEN, dbName, NC);
+  pPrint("%s stableName:%s %s", GREEN, stableName, NC);
+  pPrint("%s configDir:%s %s", GREEN, configDir, NC);
+  pPrint("%s numOfTables:%d %s", GREEN, numOfTables, NC);
+  pPrint("%s numOfThreads:%d %s", GREEN, numOfThreads, NC);
+  pPrint("%s numOfColumns:%d %s", GREEN, numOfColumns, NC);
+  pPrint("%s replica:%d %s", GREEN, replica, NC);
+  
+  pPrint("%s start create table performace test %s", GREEN, NC);
+}
diff --git a/tests/test/c/hashPerformance.c b/tests/test/c/hashPerformance.c
new file mode 100644
index 0000000000000000000000000000000000000000..db3be0e950a81e22f3ad1050cfa9a8e50b967532
--- /dev/null
+++ b/tests/test/c/hashPerformance.c
@@ -0,0 +1,130 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "tutil.h"
+#include "hash.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+int32_t capacity = 100000;
+int32_t q1Times = 1;
+int32_t q2Times = 1;
+int32_t keyNum = 100000;
+int32_t printInterval = 10000;
+
+typedef struct HashTestRow {
+  int32_t size;
+  void *  ptr;
+} HashTestRow;
+
+void shellParseArgument(int argc, char *argv[]);
+
+void testHashPerformance() {
+  int64_t    initialMs = taosGetTimestampMs();
+  _hash_fn_t hashFp = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
+  void *     hashHandle = taosHashInit(capacity, hashFp, true);
+
+  int64_t startMs = taosGetTimestampMs();
+  float   seconds = (startMs - initialMs) / 1000.0;
+  pPrint("initial time %.2f sec", seconds);
+
+  for (int32_t t = 1; t <= keyNum; ++t) {
+    HashTestRow row = {0};
+    char key[100] = {0};
+    int32_t keySize = sprintf(key, "0.db.st%d", t);
+
+    for (int32_t q = 0; q < q1Times; q++) {
+      taosHashGet(hashHandle, &key, keySize);
+    }
+
+    taosHashPut(hashHandle, key, keySize, &row, sizeof(HashTestRow));
+
+    for (int32_t q = 0; q < q2Times; q++) {
+      taosHashGet(hashHandle, &key, keySize);
+    }
+
+    if (t % printInterval == 0) {
+      int64_t endMs = taosGetTimestampMs();
+      int64_t hashSize = taosHashGetSize(hashHandle);
+      float seconds = (endMs - startMs) / 1000.0;
+      float speed = printInterval / seconds;
+      pPrint("time:%.2f sec, speed:%.1f rows/second, hashSize:%ld", seconds, speed, hashSize);
+      startMs = endMs;
+    }
+  }
+
+  int64_t endMs = taosGetTimestampMs();
+  int64_t hashSize = taosHashGetSize(hashHandle);
+  seconds = (endMs - initialMs) / 1000.0;
+  float speed = hashSize / seconds;
+
+  pPrint("total time:%.2f sec, avg speed:%.1f rows/second, hashSize:%ld", seconds, speed, hashSize);
+  taosHashCleanup(hashHandle);
+}
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  testHashPerformance();
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of cache\n");
+
+  printf("%s%s\n", indent, "-k");
+  printf("%s%s%s%d\n", indent, indent, "key num, default is ", keyNum);
+  printf("%s%s\n", indent, "-p");
+  printf("%s%s%s%d\n", indent, indent, "print interval while put into hash, default is ", printInterval);
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%d\n", indent, indent, "the initial capacity of hash ", capacity);
+  printf("%s%s\n", indent, "-q1");
+  printf("%s%s%s%d\n", indent, indent, "query times before put into hash", q1Times);
+  printf("%s%s\n", indent, "-q2");
+  printf("%s%s%s%d\n", indent, indent, "query times after put into hash", q2Times);
+  
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-k") == 0) {
+      keyNum = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-p") == 0) {
+      printInterval = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      capacity = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-q1") == 0) {
+      q1Times = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-q2") == 0) {
+      q2Times = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s capacity:%d %s", GREEN, capacity, NC);
+  pPrint("%s printInterval:%d %s", GREEN, printInterval, NC);
+  pPrint("%s q1Times:%d %s", GREEN, q1Times, NC);
+  pPrint("%s q2Times:%d %s", GREEN, q2Times, NC);
+  pPrint("%s keyNum:%d %s", GREEN, keyNum, NC);
+}
diff --git a/tests/test/c/httpTest.c b/tests/test/c/httpTest.c
new file mode 100644
index 0000000000000000000000000000000000000000..261546770eed889894ec93cbbdfb2cdad9f4cad0
--- /dev/null
+++ b/tests/test/c/httpTest.c
@@ -0,0 +1,48 @@
+/*
+ * 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 "os.h"
+#include "os.h"
+#include "tglobal.h"
+#include "taoserror.h"
+#include "httpSystem.h"
+
+void signal_handler(int signum) {
+  httpStopSystem();
+  httpCleanUpSystem();
+  exit(EXIT_SUCCESS);
+}
+
+int main(int argc, char *argv[]) {
+  struct sigaction act;
+  act.sa_handler = signal_handler;
+  sigaction(SIGTERM, &act, NULL);
+  sigaction(SIGHUP, &act, NULL);
+  sigaction(SIGINT, &act, NULL);
+  sigaction(SIGABRT, &act, NULL);
+
+  // Initialize the system
+  if (httpInitSystem() < 0) {
+    exit(EXIT_FAILURE);
+  }
+
+  if (httpStartSystem() < 0) {
+    exit(EXIT_FAILURE);
+  }
+
+  while (1) {
+    sleep(1000);
+  }
+}
diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c
new file mode 100644
index 0000000000000000000000000000000000000000..858926106c14afa6fb35bb66d44075c04add89f0
--- /dev/null
+++ b/tests/test/c/importOneRow.c
@@ -0,0 +1,182 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tglobal.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+void taos_error(TAOS *taos);
+void* taos_execute(void *param);
+
+typedef struct {
+  pthread_t pid;
+  int       index;
+} ThreadObj;
+
+int threadNum = 1;
+int rowNum = 1000;
+int replica = 1;
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of TDengine\n After writing one row of data to all tables, write the next row\n");
+
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%d\n", indent, indent, "Number of records to write table, default is ", rowNum);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%d\n", indent, indent, "Number of threads to be used, default is ", threadNum);
+  printf("%s%s\n", indent, "-replica");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters replica, default is ", replica);
+
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      rowNum = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      threadNum = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-replica") == 0) {
+      replica = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s rowNum:%d %s", GREEN, rowNum, NC);
+  pPrint("%s threadNum:%d %s", GREEN, threadNum, NC);
+  pPrint("%s replica:%d %s", GREEN, replica, NC);
+}
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+
+  taos_init();
+
+  ThreadObj *threads = calloc(threadNum, sizeof(ThreadObj));
+  for (int i = 0; i < threadNum; ++i) {
+    ThreadObj *    pthread = threads + i;
+    pthread_attr_t thattr;
+    pthread->index = i;
+    pthread_attr_init(&thattr);
+    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+    pthread_create(&pthread->pid, &thattr, taos_execute, pthread);
+  }
+
+  for (int i = 0; i < threadNum; i++) {
+    pthread_join(threads[i].pid, NULL);
+  }
+
+  printf("all finished\n");
+
+  return 0;
+}
+
+void taos_error(TAOS *con) {
+  fprintf(stderr, "TDengine error: %s\n", taos_errstr(con));
+  taos_close(con);
+  exit(1);
+}
+
+void* taos_execute(void *param) {
+  ThreadObj *pThread = (ThreadObj *)param;
+
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+  void *taos = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (taos == NULL) taos_error(taos);
+
+  char sql[1024] = {0};
+  sprintf(sql, "create database if not exists db replica %d", replica);
+  taos_query(taos, sql);
+
+  sprintf(sql, "create table if not exists db.t%d (ts timestamp, i int, j float, k double)", pThread->index);
+  taos_query(taos, sql);
+
+  int64_t timestamp = 1530374400000L;
+
+  sprintf(sql, "insert into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, 0, 0, 0);
+  TAOS_RES *pSql = taos_query(taos, sql);
+  int code = taos_errno(pSql);
+  if (code != 0) 
+  {
+    printf("error code:%d, sql:%s\n", code, sql);
+    taos_free_result(pSql);
+    taos_close(taos);
+    return NULL;
+  }
+  int affectrows = taos_affected_rows(taos);
+  if (affectrows != 1) 
+  {
+    printf("affect rows:%d, sql:%s\n", affectrows, sql);
+    taos_free_result(pSql);
+    taos_close(taos);
+    return NULL;
+  }
+  taos_free_result(pSql);
+  pSql = NULL;
+
+
+  timestamp -= 1000;
+
+  int total_affect_rows = affectrows;
+
+  for (int i = 1; i < rowNum; ++i) {
+    sprintf(sql, "import into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, i, i, i);
+
+    pSql = taos_query(taos, sql);
+    code = taos_errno(pSql);
+    if (code != 0) 
+    {
+      printf("error code:%d, sql:%s\n", code, sql);
+      taos_free_result(pSql);
+      pSql = NULL;
+      taos_close(taos);
+      return NULL;
+    }
+    int affectrows = taos_affected_rows(taos);
+    if (affectrows != 1) {
+      printf("affect rows:%d, sql:%s\n", affectrows, sql);
+      taos_free_result(pSql);
+      pSql = NULL;
+      taos_close(taos);
+    }
+
+    total_affect_rows += affectrows;
+    taos_free_result(pSql);
+    pSql = NULL;
+
+    timestamp -= 1000;
+  }
+
+  printf("thread:%d run finished total_affect_rows:%d\n", pThread->index, total_affect_rows);
+  taos_close(taos);
+
+  return NULL;
+}
diff --git a/tests/test/c/importPerTable.c b/tests/test/c/importPerTable.c
new file mode 100644
index 0000000000000000000000000000000000000000..68f78980509d5956f6fc177d7e940af5345b68a7
--- /dev/null
+++ b/tests/test/c/importPerTable.c
@@ -0,0 +1,356 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "osTime.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+typedef struct {
+  int64_t   rowsPerTable;
+  int64_t   pointsPerTable;
+  int64_t   tableBeginIndex;
+  int64_t   tableEndIndex;
+  int       threadIndex;
+  char      dbName[32];
+  char      stableName[64];
+  pthread_t thread;
+} SInfo;
+
+void *syncTest(void *param);
+void  generateRandomPoints();
+void  shellParseArgument(int argc, char *argv[]);
+void  createDbAndTable();
+void  insertData();
+
+int32_t randomData[MAX_RANDOM_POINTS];
+int64_t rowsPerTable = 1000000;
+int64_t pointsPerTable = 1;
+int64_t numOfThreads = 10;
+int64_t numOfTablesPerThread = 100;
+char    dbName[32] = "db";
+char    stableName[64] = "st";
+int64_t totalUs = 0;
+int64_t reqNum = 0;
+int64_t maxUs = 0;
+int64_t minUs = 100000000;
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  generateRandomPoints();
+  taos_init();
+  createDbAndTable();
+  insertData();
+  int64_t avgUs = totalUs / reqNum;
+  pError("%s totalUs:%ld, avgUs:%ld maxUs:%ld minUs:%ld reqNum:%ld %s\n", GREEN, totalUs, avgUs, maxUs, minUs, reqNum, NC);
+}
+
+int32_t query(void *con, char *qstr) {
+  int64_t begin = taosGetTimestampUs();
+
+  TAOS_RES *pSql = taos_query(con, qstr);
+  int32_t   code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to exec sql:%s, code:%d reason:%s", qstr, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  int64_t us = taosGetTimestampUs() - begin;
+  maxUs = MAX(us, maxUs);
+  minUs = MIN(us, minUs);
+  atomic_add_fetch_64(&totalUs, us);
+  atomic_add_fetch_64(&reqNum, 1);
+  if (reqNum > 100000) {
+    int64_t avgUs = totalUs / reqNum;
+    if (us > avgUs * 100) {
+      pError("sql:%s", qstr);
+      pError("%s totalUs:%ld, avgUs:%ld maxUs:%ld minUs:%ld reqNum:%ld %s\n", GREEN, totalUs, avgUs, maxUs, minUs,
+             reqNum, NC);
+      taosMsleep(1000);
+      exit(0);
+    }
+  }
+
+  return code;
+}
+
+void createDbAndTable() {
+  pPrint("start to create table");
+
+  TAOS *         con;
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           qstr[64000];
+
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "create database if not exists %s", dbName);
+  if (query(con, qstr)) {
+    pError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+
+  sprintf(qstr, "use %s", dbName);
+  if (query(con, qstr)) {
+    pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  int64_t totalTables = numOfTablesPerThread * numOfThreads;
+    
+  if (strcmp(stableName, "no") != 0) {
+    int len = sprintf(qstr, "create table if not exists %s(ts timestamp", stableName);
+    for (int64_t f = 0; f < pointsPerTable; ++f) {
+      len += sprintf(qstr + len, ", f%ld double", f);
+    }
+    sprintf(qstr + len, ") tags(t int)");
+
+    if (query(con, qstr)) {
+      pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+      exit(0);
+    }
+    
+    for (int64_t t = 0; t < totalTables; ++t) {
+      sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
+      if (query(con, qstr)) {
+        pError("failed to create table %s%" PRId64 ", reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+    }
+  } else {
+    for (int64_t t = 0; t < totalTables; ++t) {
+      int len = sprintf(qstr, "create table if not exists %s%ld(ts timestamp", stableName, t);
+      for (int64_t f = 0; f < pointsPerTable; ++f) {
+        len += sprintf(qstr + len, ", f%ld double", f);
+      }
+      sprintf(qstr + len, ")");
+
+      if (query(con, qstr)) {
+        pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+    }
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  pPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
+}
+
+void insertData() {
+  struct timeval systemTime;
+  int64_t        st, et;
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  pPrint("%" PRId64 " threads are spawned to import data", numOfThreads);
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SInfo *pInfo = (SInfo *)malloc(sizeof(SInfo) * numOfThreads);
+
+  // Start threads to write
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].rowsPerTable = rowsPerTable;
+    pInfo[i].pointsPerTable = pointsPerTable;
+    pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
+    pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
+    pInfo[i].threadIndex = i;
+    strcpy(pInfo[i].dbName, dbName);
+    strcpy(pInfo[i].stableName, stableName);
+    pthread_create(&(pInfo[i].thread), &thattr, syncTest, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  double seconds = (et - st) / 1000.0 / 1000.0;
+
+  int64_t totalTables = numOfTablesPerThread * numOfThreads;
+  int64_t totalRows = totalTables * rowsPerTable;
+  int64_t totalPoints = totalTables * rowsPerTable * pointsPerTable;
+  double  speedOfRows = totalRows / seconds;
+  double  speedOfPoints = totalPoints / seconds;
+
+  pPrint(
+      "%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
+      "PointsPerSecond:%.1lf%s",
+      GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, NC);
+
+  pPrint("threads exit");
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void *syncTest(void *param) {
+  TAOS *         con;
+  SInfo *        pInfo = (SInfo *)param;
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           qstr[65000];
+  int            maxBytes = 60000;
+
+  pPrint("thread:%d, start to run", pInfo->threadIndex);
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "use %s", pInfo->dbName);
+  query(con, qstr);
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  int64_t start = 1587225600000;
+  int64_t interval = 1000;  // 1000 ms
+
+  char *sql = qstr;
+  char  inserStr[] = "import into";
+  int   len = sprintf(sql, "%s", inserStr);
+
+  for (int64_t table = pInfo->tableBeginIndex; table < pInfo->tableEndIndex; ++table) {
+    len += sprintf(sql + len, " %s%ld values", pInfo->stableName, table);
+    for (int64_t row = 0; row < pInfo->rowsPerTable; row++) {
+      len += sprintf(sql + len, "(%ld", start - row * interval);
+      for (int64_t point = 0; point < pInfo->pointsPerTable; ++point) {
+        len += sprintf(sql + len, ",%d", randomData[(123 * table + 456 * row + 789 * point) % MAX_RANDOM_POINTS]);
+        // len += sprintf(sql + len, ",%ld", row);
+      }
+      len += sprintf(sql + len, ")");
+      if (len > maxBytes) {
+        if (query(con, qstr)) {
+          pError("thread:%d, failed to import table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
+                 table, row, taos_errstr(con));
+        }
+
+        // "insert into"
+        len = sprintf(sql, "%s", inserStr);
+
+        // "insert into st1 values"
+        if (row != pInfo->rowsPerTable - 1) {
+          len += sprintf(sql + len, " %s%ld values", pInfo->stableName, table);
+        }
+      }
+    }
+  }
+
+  if (len != strlen(inserStr)) {
+    query(con, qstr);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  int64_t totalRows = totalTables * pInfo->rowsPerTable;
+  int64_t totalPoints = totalRows * pInfo->pointsPerTable;
+  pPrint("thread:%d, import finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
+         (et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
+
+  return NULL;
+}
+
+void generateRandomPoints() {
+  for (int r = 0; r < MAX_RANDOM_POINTS; ++r) {
+    randomData[r] = rand() % 1000;
+  }
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of TDengine\n After writing all the data in one table, start the next table\n");
+
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName, ", if 'no' then create normal table");
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%ld\n", indent, indent, "Number of records to write to each table, default is ", rowsPerTable);
+  printf("%s%s\n", indent, "-p");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of columns per table, default is ", pointsPerTable);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of threads to be used, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of tables per thread, default is ", numOfTablesPerThread);
+
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbName, argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(stableName, argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      rowsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-p") == 0) {
+      pointsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      numOfTablesPerThread = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
+  pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
+  pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
+  pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
+  pPrint("%sdbName:%s%s", GREEN, dbName, NC);
+  pPrint("%stableName:%s%s", GREEN, stableName, NC);
+  pPrint("%sstart to run%s", GREEN, NC);
+}
diff --git a/tests/test/c/insertPerRow.c b/tests/test/c/insertPerRow.c
new file mode 100644
index 0000000000000000000000000000000000000000..824c1b925a1b155acfbd22694cf95651ed88f1b4
--- /dev/null
+++ b/tests/test/c/insertPerRow.c
@@ -0,0 +1,366 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tglobal.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+typedef struct {
+  int64_t   rowsPerTable;
+  int64_t   pointsPerTable;
+  int64_t   tableBeginIndex;
+  int64_t   tableEndIndex;
+  int       threadIndex;
+  char      dbName[32];
+  char      stableName[64];
+  float     createTableSpeed;
+  pthread_t thread;
+} SInfo;
+
+void *syncTest(void *param);
+void  generateRandomPoints();
+void  shellParseArgument(int argc, char *argv[]);
+void  createDbAndTable();
+void  insertData();
+
+int32_t randomData[MAX_RANDOM_POINTS];
+int64_t rowsPerTable = 1000000000;
+int64_t pointsPerTable = 1;
+int64_t numOfThreads = 10;
+int64_t numOfTablesPerThread = 100;
+char    dbName[32] = "db";
+char    stableName[64] = "st";
+int32_t cache = 1;
+int32_t replica = 3;
+int32_t days = 10;
+int32_t interval = 1000;
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  generateRandomPoints();
+  taos_init();
+  createDbAndTable();
+  insertData();
+}
+
+void createDbAndTable() {
+  pPrint("start to create table");
+
+  TAOS_RES *     pSql;
+  TAOS *         con;
+  char           qstr[64000];
+
+  char fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "create database if not exists %s cache %d replica %d days %d", dbName, cache, replica, days);
+  pSql = taos_query(con, qstr);
+  int32_t code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to create database:%s, sql:%s, code:%d reason:%s", dbName, qstr, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  sprintf(qstr, "use %s", dbName);
+  pSql = taos_query(con, qstr);
+  code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  if (strcmp(stableName, "no") != 0) {
+    int len = sprintf(qstr, "create table if not exists %s(ts timestamp", stableName);
+    for (int64_t f = 0; f < pointsPerTable; ++f) {
+      len += sprintf(qstr + len, ", f%ld double", f);
+    }
+    sprintf(qstr + len, ") tags(t int)");
+
+    pSql = taos_query(con, qstr);
+    code = taos_errno(pSql);
+    if (code != 0) {
+      pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+      exit(0);
+    }
+    taos_free_result(pSql);
+  }
+}
+
+void insertData() {
+  struct timeval systemTime;
+  int64_t        st, et;
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  pPrint("%" PRId64 " threads are spawned to insert data", numOfThreads);
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SInfo *pInfo = (SInfo *)calloc(numOfThreads, sizeof(SInfo));
+
+  // Start threads to write
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].rowsPerTable = rowsPerTable;
+    pInfo[i].pointsPerTable = pointsPerTable;
+    pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
+    pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
+    pInfo[i].threadIndex = i;
+    strcpy(pInfo[i].dbName, dbName);
+    strcpy(pInfo[i].stableName, stableName);
+    pthread_create(&(pInfo[i].thread), &thattr, syncTest, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  double seconds = (et - st) / 1000.0 / 1000.0;
+
+  int64_t totalTables = numOfTablesPerThread * numOfThreads;
+  int64_t totalRows = totalTables * rowsPerTable;
+  int64_t totalPoints = totalTables * rowsPerTable * pointsPerTable;
+  double  speedOfRows = totalRows / seconds;
+  double  speedOfPoints = totalPoints / seconds;
+
+  float createTableSpeed = 0;
+  for (int i = 0; i < numOfThreads; ++i) {
+    createTableSpeed += pInfo[i].createTableSpeed;
+  }
+
+  pPrint(
+      "%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
+      "PointsPerSecond:%.1lf CreateTableSpeed:%.1f t/s %s",
+      GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, createTableSpeed, NC);
+
+  pPrint("threads exit");
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void *syncTest(void *param) {
+  TAOS *         con;
+  SInfo *        pInfo = (SInfo *)param;
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           qstr[65000];
+  int            maxBytes = 60000;
+  int            code;
+
+  pPrint("thread:%d, start to run", pInfo->threadIndex);
+
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "use %s", pInfo->dbName);
+  taos_query(con, qstr);
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  if (strcmp(stableName, "no") != 0) {
+    for (int64_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
+      sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
+      TAOS_RES *pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        pError("failed to create table %s%" PRId64 ", reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+      taos_free_result(pSql);
+    }
+  } else {
+    for (int64_t t = pInfo->tableBeginIndex; t < pInfo->tableEndIndex; ++t) {
+      int len = sprintf(qstr, "create table if not exists %s%ld(ts timestamp", stableName, t);
+      for (int64_t f = 0; f < pointsPerTable; ++f) {
+        len += sprintf(qstr + len, ", f%ld double", f);
+      }
+      sprintf(qstr + len, ")");
+
+      TAOS_RES *pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+      taos_free_result(pSql);
+    }
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  float seconds = (et - st) / 1000.0 / 1000.0;
+  int64_t tables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  pInfo->createTableSpeed = (float)tables / seconds;
+  pPrint("thread:%d, %.1f seconds to create %ld tables, speed:%.1f", pInfo->threadIndex, seconds, tables,
+         pInfo->createTableSpeed);
+
+  if (pInfo->rowsPerTable == 0) return NULL;       
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  int64_t start = 1430000000000;
+  interval = 1000;  // 1000 ms
+
+  char *sql = qstr;
+  char  inserStr[] = "insert into";
+  int   len = sprintf(sql, "%s", inserStr);
+
+  for (int64_t row = 0; row < pInfo->rowsPerTable; row++) {    
+    for (int64_t table = pInfo->tableBeginIndex; table < pInfo->tableEndIndex; ++table) {
+      len += sprintf(sql + len, " %s%ld values", pInfo->stableName, table);
+      len += sprintf(sql + len, "(%ld", start + row * interval);
+      for (int64_t point = 0; point < pInfo->pointsPerTable; ++point) {
+        len += sprintf(sql + len, ",%d", randomData[(123 * table + 456 * row + 789 * point) % MAX_RANDOM_POINTS]);
+        // len += sprintf(sql + len, ",%ld", row);
+      }
+      len += sprintf(sql + len, ")");
+      if (len > maxBytes) {
+        TAOS_RES *pSql = taos_query(con, qstr);
+        int32_t code = taos_errno(pSql);
+        if (code != 0) {
+          pError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
+                 table, row, taos_errstr(con));
+        }
+        taos_free_result(pSql);
+
+        // "insert into"
+        len = sprintf(sql, "%s", inserStr);
+      }
+    }
+  }
+
+  if (len != strlen(inserStr)) {
+    TAOS_RES *pSql = taos_query(con, qstr);
+    taos_free_result(pSql);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  int64_t totalRows = totalTables * pInfo->rowsPerTable;
+  int64_t totalPoints = totalRows * pInfo->pointsPerTable;
+  pPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
+         (et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
+
+  return NULL;
+}
+
+void generateRandomPoints() {
+  for (int r = 0; r < MAX_RANDOM_POINTS; ++r) {
+    randomData[r] = rand() % 1000;
+  }
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of TDengine\n After writing one row of data to all tables, write the next row\n");
+
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName, ", if 'no' then create normal table");
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%ld\n", indent, indent, "Number of records to write to each table, default is ", rowsPerTable);
+  printf("%s%s\n", indent, "-p");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of columns per table, default is ", pointsPerTable);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of threads to be used, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of tables per thread, default is ", numOfTablesPerThread);
+  printf("%s%s\n", indent, "-replica");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters replica, default is ", replica);
+  printf("%s%s\n", indent, "-cache");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters replica, default is ", cache);
+  printf("%s%s\n", indent, "-days");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters days, default is ", days);
+  printf("%s%s\n", indent, "-interval");
+  printf("%s%s%s%d\n", indent, indent, "Interval of each rows in ms, default is ", interval);
+
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbName, argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(stableName, argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      rowsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-p") == 0) {
+      pointsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      numOfTablesPerThread = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-replica") == 0) {
+      replica = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-cache") == 0) {
+      cache = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-days") == 0) {
+      days = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-interval") == 0) {
+      interval = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
+  pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
+  pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
+  pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
+  pPrint("%scache:%" PRId32 "%s", GREEN, cache, NC);
+  pPrint("%stables:%" PRId32 "%s", GREEN, replica, NC);
+  pPrint("%sdbName:%s%s", GREEN, dbName, NC);
+  pPrint("%stableName:%s%s", GREEN, stableName, NC);
+  pPrint("%sstart to run%s", GREEN, NC);
+}
diff --git a/tests/test/c/insertPerTable.c b/tests/test/c/insertPerTable.c
new file mode 100644
index 0000000000000000000000000000000000000000..d79df0f4d11e4bc97283f7996cab0d3c26e776e9
--- /dev/null
+++ b/tests/test/c/insertPerTable.c
@@ -0,0 +1,357 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tglobal.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+typedef struct {
+  int64_t   rowsPerTable;
+  int64_t   pointsPerTable;
+  int64_t   tableBeginIndex;
+  int64_t   tableEndIndex;
+  int       threadIndex;
+  char      dbName[32];
+  char      stableName[64];
+  pthread_t thread;
+} SInfo;
+
+void *syncTest(void *param);
+void  generateRandomPoints();
+void  shellParseArgument(int argc, char *argv[]);
+void  createDbAndTable();
+void  insertData();
+
+int32_t randomData[MAX_RANDOM_POINTS];
+int64_t rowsPerTable = 10000;
+int64_t pointsPerTable = 1;
+int64_t numOfThreads = 1;
+int64_t numOfTablesPerThread = 1;
+char    dbName[32] = "db";
+char    stableName[64] = "st";
+int32_t cache = 16;
+int32_t tables = 5000;
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  generateRandomPoints();
+  taos_init();
+  createDbAndTable();
+  insertData();
+}
+
+void createDbAndTable() {
+  pPrint("start to create table");
+
+  TAOS_RES *     pSql;
+  TAOS *         con;
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           qstr[64000];
+
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "create database if not exists %s cache %d maxtables %d", dbName, cache, tables);
+  pSql = taos_query(con, qstr);
+  int32_t code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to create database:%s, sql:%s, code:%d reason:%s", dbName, qstr, taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+
+  sprintf(qstr, "use %s", dbName);
+  pSql = taos_query(con, qstr);
+  code = taos_errno(pSql);
+  if (code != 0) {
+    pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+    exit(0);
+  }
+  taos_free_result(pSql);
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  int64_t totalTables = numOfTablesPerThread * numOfThreads;
+    
+  if (strcmp(stableName, "no") != 0) {
+    int len = sprintf(qstr, "create table if not exists %s(ts timestamp", stableName);
+    for (int64_t f = 0; f < pointsPerTable; ++f) {
+      len += sprintf(qstr + len, ", f%ld double", f);
+    }
+    sprintf(qstr + len, ") tags(t int)");
+
+    pSql = taos_query(con, qstr);
+    code = taos_errno(pSql);
+    if (code != 0) {
+      pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
+      exit(0);
+    }
+    taos_free_result(pSql);
+
+    for (int64_t t = 0; t < totalTables; ++t) {
+      sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
+      pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        pError("failed to create table %s%" PRId64 ", reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+      taos_free_result(pSql);
+    }
+  } else {
+    for (int64_t t = 0; t < totalTables; ++t) {
+      int len = sprintf(qstr, "create table if not exists %s%ld(ts timestamp", stableName, t);
+      for (int64_t f = 0; f < pointsPerTable; ++f) {
+        len += sprintf(qstr + len, ", f%ld double", f);
+      }
+      sprintf(qstr + len, ")");
+
+      pSql = taos_query(con, qstr);
+      code = taos_errno(pSql);
+      if (code != 0) {
+        pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
+        exit(0);
+      }
+      taos_free_result(pSql);
+    }
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  float seconds = (et - st) / 1000.0 / 1000.0;
+  pPrint("%.1f seconds to create %ld tables, speed:%.1f", seconds, totalTables, totalTables / seconds);
+  taos_close(con);
+}
+
+void insertData() {
+  struct timeval systemTime;
+  int64_t        st, et;
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  if (rowsPerTable <= 0) {
+    pPrint("not insert data for rowsPerTable is :%" PRId64, rowsPerTable);
+    exit(0);
+  } else {
+    pPrint("%" PRId64 " threads are spawned to insert data", numOfThreads);
+  }
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SInfo *pInfo = (SInfo *)malloc(sizeof(SInfo) * numOfThreads);
+
+  // Start threads to write
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].rowsPerTable = rowsPerTable;
+    pInfo[i].pointsPerTable = pointsPerTable;
+    pInfo[i].tableBeginIndex = i * numOfTablesPerThread;
+    pInfo[i].tableEndIndex = (i + 1) * numOfTablesPerThread;
+    pInfo[i].threadIndex = i;
+    strcpy(pInfo[i].dbName, dbName);
+    strcpy(pInfo[i].stableName, stableName);
+    pthread_create(&(pInfo[i].thread), &thattr, syncTest, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  double seconds = (et - st) / 1000.0 / 1000.0;
+
+  int64_t totalTables = numOfTablesPerThread * numOfThreads;
+  int64_t totalRows = totalTables * rowsPerTable;
+  int64_t totalPoints = totalTables * rowsPerTable * pointsPerTable;
+  double  speedOfRows = totalRows / seconds;
+  double  speedOfPoints = totalPoints / seconds;
+
+  pPrint(
+      "%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
+      "PointsPerSecond:%.1lf%s",
+      GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, NC);
+
+  pPrint("threads exit");
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void *syncTest(void *param) {
+  TAOS *         con;
+  SInfo *        pInfo = (SInfo *)param;
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           qstr[65000];
+  int            maxBytes = 60000;
+
+  pPrint("thread:%d, start to run", pInfo->threadIndex);
+
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+  con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+  if (con == NULL) {
+    pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+    exit(1);
+  }
+
+  sprintf(qstr, "use %s", pInfo->dbName);
+  taos_query(con, qstr);
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  int64_t start = 1430000000000;
+  int64_t interval = 1000;  // 1000 ms
+
+  char *sql = qstr;
+  char  inserStr[] = "insert into";
+  int   len = sprintf(sql, "%s", inserStr);
+
+  for (int64_t table = pInfo->tableBeginIndex; table < pInfo->tableEndIndex; ++table) {
+    len += sprintf(sql + len, " %s%ld values", pInfo->stableName, table);
+    for (int64_t row = 0; row < pInfo->rowsPerTable; row++) {
+      len += sprintf(sql + len, "(%ld", start + row * interval);
+      for (int64_t point = 0; point < pInfo->pointsPerTable; ++point) {
+        len += sprintf(sql + len, ",%d", randomData[(123 * table + 456 * row + 789 * point) % MAX_RANDOM_POINTS]);
+        // len += sprintf(sql + len, ",%ld", row);
+      }
+      len += sprintf(sql + len, ")");
+      if (len > maxBytes) {
+        TAOS_RES *pSql = taos_query(con, qstr);
+        int32_t code = taos_errno(pSql);
+        if (code != 0) {
+          pError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
+                 table, row, taos_errstr(con));
+        }
+        taos_free_result(pSql);
+
+        // "insert into"
+        len = sprintf(sql, "%s", inserStr);
+
+        // "insert into st1 values"
+        if (row != pInfo->rowsPerTable - 1) {
+          len += sprintf(sql + len, " %s%ld values", pInfo->stableName, table);
+        }
+      }
+    }
+  }
+
+  if (len != strlen(inserStr)) {
+    taos_query(con, qstr);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
+  int64_t totalRows = totalTables * pInfo->rowsPerTable;
+  int64_t totalPoints = totalRows * pInfo->pointsPerTable;
+  pPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
+         (et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
+
+  return NULL;
+}
+
+void generateRandomPoints() {
+  for (int r = 0; r < MAX_RANDOM_POINTS; ++r) {
+    randomData[r] = rand() % 1000;
+  }
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the performance of TDengine\n After writing all the data in one table, start the next table\n");
+
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be created, default is ", dbName);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s%s\n", indent, indent, "The name of the super table to be created, default is ", stableName, ", if 'no' then create normal table");
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%ld\n", indent, indent, "Number of records to write to each table, default is ", rowsPerTable);
+  printf("%s%s\n", indent, "-p");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of columns per table, default is ", pointsPerTable);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of threads to be used, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-n");
+  printf("%s%s%s%" PRId64 "\n", indent, indent, "Number of tables per thread, default is ", numOfTablesPerThread);
+  printf("%s%s\n", indent, "-tables");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters tables, default is ", tables);
+  printf("%s%s\n", indent, "-cache");
+  printf("%s%s%s%d\n", indent, indent, "Database parameters cache, default is ", cache);
+
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbName, argv[++i]);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(stableName, argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      rowsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-p") == 0) {
+      pointsPerTable = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-n") == 0) {
+      numOfTablesPerThread = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-tables") == 0) {
+      tables = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-cache") == 0) {
+      cache = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
+  pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
+  pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
+  pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
+  pPrint("%scache:%" PRId32 "%s", GREEN, cache, NC);
+  pPrint("%stables:%" PRId32 "%s", GREEN, tables, NC);
+  pPrint("%sdbName:%s%s", GREEN, dbName, NC);
+  pPrint("%stableName:%s%s", GREEN, stableName, NC);
+  pPrint("%sstart to run%s", GREEN, NC);
+}
diff --git a/tests/test/c/invalidTableId.c b/tests/test/c/invalidTableId.c
new file mode 100644
index 0000000000000000000000000000000000000000..581387a4ee9dc8d72538e175d674bd0fbe83072c
--- /dev/null
+++ b/tests/test/c/invalidTableId.c
@@ -0,0 +1,220 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "taos.h"
+#include "tulog.h"
+#include "tutil.h"
+#include "tglobal.h"
+#include "hash.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+#define MAX_DB_NUM 100
+void *  con;
+char    dbNames[MAX_DB_NUM][48];
+int32_t dbNum = 0;
+void    parseArgument(int argc, char *argv[]);
+void    connDb();
+void    getDbNames();
+void    printDbNames();
+void    queryTables(char *dbName);
+void    checkTables(char *dbName);
+
+int main(int argc, char *argv[]) {
+  parseArgument(argc, argv);
+  taos_init();
+  connDb();
+  getDbNames();
+  printDbNames();
+  for (int dbIndex = 0; dbIndex < dbNum; ++dbIndex) {
+    queryTables((char*)(dbNames[dbIndex]));
+    checkTables((char*)(dbNames[dbIndex]));
+  }
+
+  pPrint("all %d database is checked", dbNum);
+}
+
+void connDb() {
+  con = taos_connect(NULL, "root", "taosdata", NULL, 0);
+  if (con == NULL) {
+    pError("failed to connect to DB, reason:%s", taos_errstr(con));
+    exit(0);
+  }
+}
+
+void getDbNames() {
+  if (dbNum != 0) return;
+
+  char *    qstr = "show databases";
+  TAOS_RES *result = taos_query(con, qstr);
+  int32_t   code = taos_errno(result);
+  if (result == NULL || code != 0) {
+    pError("failed to exec sql:%s, code:0x%x reason:%s", qstr, code & 0XFFFF, tstrerror(code));
+    exit(0);
+  }
+
+  TAOS_ROW row;
+  int num_fields = taos_num_fields(result);
+  if (num_fields <= 0) return;
+  while ((row = taos_fetch_row(result))) {
+    char * dbName = (char*)dbNames[dbNum];
+    int32_t *length = taos_fetch_lengths(result);
+    int len = length[0];
+    memcpy(dbName, (char *)row[0], len);
+    dbName[len] = 0;
+    dbNum++;
+  }
+
+  taos_free_result(result);
+}
+
+void printDbNames() {
+  for (int dbIndex = 0; dbIndex < dbNum; ++dbIndex) {
+    pPrint("db:%d %s", dbIndex, dbNames[dbIndex]);
+  }
+}
+
+void queryTables(char *dbName) {
+  char    qstr[1024];
+  char    fileName[1024];
+  char    ts[35] = {0};
+  int32_t precision = 1000;
+
+  sprintf(qstr, "show %s.tables", dbName);
+  sprintf(fileName, "%s_tables.txt", dbName); 
+
+  TAOS_RES *result = taos_query(con, qstr);
+  int32_t   code = taos_errno(result);
+  if (result == NULL || code != 0) {
+    pError("failed to exec sql:%s, code:0x%x reason:%s", qstr, code & 0XFFFF, tstrerror(code));
+    exit(0);
+  }
+
+  FILE *fp = fopen(fileName, "w");
+  if (!fp) return;
+
+  TAOS_ROW row;
+  int32_t  rows = 0;
+  while ((row = taos_fetch_row(result))) {
+    char     tableName[256] = {0};
+    int32_t *length = taos_fetch_lengths(result);
+    int      len = length[0];
+    memcpy(tableName, (char *)row[0], len);
+    tableName[len] = 0;
+
+    int64_t    t = *((int64_t *)row[1]);
+    time_t     tt = t / 1000;
+    struct tm *ptm = localtime(&tt);
+    int32_t    tl = (int32_t)strftime(ts, 35, "%Y-%m-%d %H:%M:%S", ptm);
+    snprintf(ts + tl, 5, ".%03ld", t % precision);
+
+    // fprintf(fp, "%s %s\n", tableName, ts);
+    fprintf(fp, "%s.%s\n", dbName, tableName);
+    rows++;
+  }
+
+  taos_free_result(result);
+  fclose(fp);
+  pPrint("db:%s has %d tables, write to %s", dbName, rows, fileName);
+}
+
+void checkTables(char *dbName) {
+  char    qstr[1024];
+  char    fileName1[1024];
+  char    fileName2[1024];
+  
+  sprintf(qstr, "show %s.tables", dbName);
+  sprintf(fileName1, "%s_tables.txt", dbName);
+  sprintf(fileName2, "%s_count.txt", dbName);
+
+  FILE *fp1 = fopen(fileName1, "r");
+  if (!fp1) return;
+
+  FILE *fp2 = fopen(fileName2, "w");
+  if (!fp2) return;
+
+  int32_t successRows = 0;
+  int32_t failedRows = 0;
+  char tbName[256];
+  while (!feof(fp1)) {
+    int size = fscanf(fp1, "%s", tbName);
+    if (size <= 0) {
+      break;
+    }
+
+    sprintf(qstr, "select count(*) from %s", tbName);
+    TAOS_RES *result = taos_query(con, qstr);
+    int32_t   code = taos_errno(result);
+    if (result == NULL || code != 0) {
+      pError("failed to exec sql:%s, code:0x%x reason:%s", qstr, code & 0XFFFF, tstrerror(code));
+      fprintf(fp2, "%s failed to exec sql:%s, code:0x%x reason:%s", tbName, qstr, code & 0XFFFF, tstrerror(code));
+      taos_free_result(result);
+      failedRows++;
+      continue;
+    }
+
+    TAOS_ROW row;
+    int64_t  count = 0;
+    while ((row = taos_fetch_row(result))) {
+      count = *((int64_t *)row[0]);
+    }
+    fprintf(fp2, "%s %" PRId64 "\n", tbName, count);
+
+    successRows++;
+    if (successRows % 1000 == 0) {
+      pPrint("query %d tables", successRows);
+    }
+    taos_free_result(result);
+  }
+
+  fclose(fp1);
+  fclose(fp2);
+  pPrint("db:%s query tables, success:%d failed:%d write to %s", dbName, successRows, failedRows, fileName2);
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to checkTables\n");
+
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-d");
+  printf("%s%s%s%s\n", indent, indent, "The name of the database to be checked, default is ", "all");
+
+  exit(EXIT_SUCCESS);
+}
+
+void parseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-d") == 0) {
+      strcpy(dbNames[0], argv[++i]);
+      dbNum++;
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s configDir:%s %s", GREEN, configDir, NC);
+  pPrint("%s start to checkTables %s", GREEN, NC);
+}
diff --git a/tests/test/c/queryPerformance.c b/tests/test/c/queryPerformance.c
new file mode 100644
index 0000000000000000000000000000000000000000..eda082dd4f293f0879603f6b71cc59150d6cfb3d
--- /dev/null
+++ b/tests/test/c/queryPerformance.c
@@ -0,0 +1,183 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taos.h"
+#include "tulog.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tglobal.h"
+
+#define MAX_RANDOM_POINTS 20000
+#define GREEN "\033[1;32m"
+#define NC "\033[0m"
+
+typedef struct {
+  int64_t   startTimeMs;
+  int64_t   endTimeMs;
+  int       threadIndex;
+  pthread_t thread;
+} SInfo;
+
+void *syncTest(void *param);
+void  shellParseArgument(int argc, char *argv[]);
+void  queryData();
+
+int   numOfThreads = 10;
+int   useGlobalConn = 1;
+int   requestPerThread = 10000;
+char  requestSql[10240] = "show dnodes";
+TAOS *globalConn;
+
+int main(int argc, char *argv[]) {
+  shellParseArgument(argc, argv);
+  taos_init();
+  queryData();
+}
+
+void queryData() {
+  struct timeval systemTime;
+  int64_t        st, et;
+  char           fqdn[TSDB_FQDN_LEN];
+  uint16_t       port;
+
+  if (useGlobalConn) {
+    taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+    globalConn = taos_connect(fqdn, "root", "taosdata", NULL, port);
+    if (globalConn == NULL) {
+      pError("failed to connect to DB, reason:%s", taos_errstr(globalConn));
+      exit(1);
+    }
+  }
+
+  pPrint("%d threads are spawned to query", numOfThreads);
+
+  gettimeofday(&systemTime, NULL);
+  st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+
+  pthread_attr_t thattr;
+  pthread_attr_init(&thattr);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
+  SInfo *pInfo = (SInfo *)malloc(sizeof(SInfo) * numOfThreads);
+
+  // Start threads to write
+  for (int i = 0; i < numOfThreads; ++i) {
+    pInfo[i].threadIndex = i;
+    pthread_create(&(pInfo[i].thread), &thattr, syncTest, (void *)(pInfo + i));
+  }
+
+  taosMsleep(300);
+  for (int i = 0; i < numOfThreads; i++) {
+    pthread_join(pInfo[i].thread, NULL);
+  }
+
+  gettimeofday(&systemTime, NULL);
+  et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
+  double totalTimeMs = (et - st) / 1000.0;
+
+  int   totalReq = requestPerThread * numOfThreads;
+  float rspTime = totalTimeMs / requestPerThread;
+  float qps = totalReq / (totalTimeMs / 1000);
+
+  pPrint("%s threads:%d, totalTime %.1fms totalReq:%d qps:%.1f rspTime:%.3fms %s", GREEN, numOfThreads, totalTimeMs,
+         totalReq, qps, rspTime, NC);
+
+  pthread_attr_destroy(&thattr);
+  free(pInfo);
+}
+
+void *syncTest(void *param) {
+  TAOS *   con;
+  SInfo *  pInfo = (SInfo *)param;
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
+
+  if (useGlobalConn) {
+    pPrint("thread:%d, start to run use global connection", pInfo->threadIndex);
+    con = globalConn;
+  } else {
+    pPrint("thread:%d, start to run, and create new conn", pInfo->threadIndex);
+    taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
+
+    con = taos_connect(fqdn, "root", "taosdata", NULL, port);
+    if (con == NULL) {
+      pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
+      exit(1);
+    }
+  }
+
+  for (int i = 0; i < requestPerThread; ++i) {
+    void *tres = taos_query(con, requestSql);
+
+    TAOS_ROW row = taos_fetch_row(tres);
+    if (row == NULL) {
+      taos_free_result(tres);
+      exit(0);
+    }
+
+    do {
+      row = taos_fetch_row(tres);
+    } while (row != NULL);
+
+    taos_free_result(tres);
+  }
+  return NULL;
+}
+
+void printHelp() {
+  char indent[10] = "        ";
+  printf("Used to test the query performance of TDengine\n");
+
+  printf("%s%s\n", indent, "-c");
+  printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir);
+  printf("%s%s\n", indent, "-s");
+  printf("%s%s%s%s\n", indent, indent, "The sql to be executed, default is ", requestSql);
+  printf("%s%s\n", indent, "-r");
+  printf("%s%s%s%d\n", indent, indent, "Request per thread, default is ", requestPerThread);
+  printf("%s%s\n", indent, "-t");
+  printf("%s%s%s%d\n", indent, indent, "Number of threads to be used, default is ", numOfThreads);
+  printf("%s%s\n", indent, "-g");
+  printf("%s%s%s%d\n", indent, indent, "Whether to share connections between threads, default is ", useGlobalConn);
+
+  exit(EXIT_SUCCESS);
+}
+
+void shellParseArgument(int argc, char *argv[]) {
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+      printHelp();
+      exit(0);
+    } else if (strcmp(argv[i], "-c") == 0) {
+      strcpy(configDir, argv[++i]);
+    } else if (strcmp(argv[i], "-s") == 0) {
+      strcpy(requestSql, argv[++i]);
+    } else if (strcmp(argv[i], "-r") == 0) {
+      requestPerThread = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-t") == 0) {
+      numOfThreads = atoi(argv[++i]);
+    } else if (strcmp(argv[i], "-g") == 0) {
+      useGlobalConn = atoi(argv[++i]);
+    } else {
+    }
+  }
+
+  pPrint("%s sql:%s %s", GREEN, requestSql, NC);
+  pPrint("%s requestPerThread:%d %s", GREEN, requestPerThread, NC);
+  pPrint("%s numOfThreads:%d %s", GREEN, numOfThreads, NC);
+  pPrint("%s useGlobalConn:%d %s", GREEN, useGlobalConn, NC);
+  pPrint("%s start to run %s", GREEN, NC);
+}
diff --git a/tests/tsim/CMakeLists.txt b/tests/tsim/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..50b42941aff12ec6762b2da904675e6fa0183cad
--- /dev/null
+++ b/tests/tsim/CMakeLists.txt
@@ -0,0 +1,9 @@
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
+INCLUDE_DIRECTORIES(inc)
+
+AUX_SOURCE_DIRECTORY(src SRC)
+ADD_EXECUTABLE(tsim ${SRC})
+TARGET_LINK_LIBRARIES(tsim taos_static trpc tutil pthread cJson)
diff --git a/tests/tsim/inc/sim.h b/tests/tsim/inc/sim.h
new file mode 100644
index 0000000000000000000000000000000000000000..58e58a442cedca564864578604faa6cea28ede68
--- /dev/null
+++ b/tests/tsim/inc/sim.h
@@ -0,0 +1,179 @@
+/*
+ * 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 __SIM_H__
+#define __SIM_H__
+
+#include <semaphore.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "taos.h"
+#include "tidpool.h"
+#include "tlog.h"
+#include "tutil.h"
+
+#define MAX_MAIN_SCRIPT_NUM 10
+#define MAX_BACKGROUND_SCRIPT_NUM 10
+#define MAX_FILE_NAME_LEN 256
+#define MAX_ERROR_LEN 1024
+#define MAX_QUERY_VALUE_LEN 40
+#define MAX_QUERY_COL_NUM 20
+#define MAX_QUERY_ROW_NUM 20
+#define MAX_SYSTEM_RESULT_LEN 2048
+#define MAX_VAR_LEN 100
+#define MAX_VAR_NAME_LEN 32
+#define MAX_VAR_VAL_LEN 80
+#define MAX_OPT_NAME_LEN 32
+#define MAX_SIM_CMD_NAME_LEN 40
+
+#ifdef LINUX
+#define SUCCESS_PREFIX "\033[44;32;1m"
+#define SUCCESS_POSTFIX "\033[0m"
+#define FAILED_PREFIX "\033[44;31;1m"
+#define FAILED_POSTFIX "\033[0m"
+#else
+#define SUCCESS_PREFIX ""
+#define SUCCESS_POSTFIX ""
+#define FAILED_PREFIX ""
+#define FAILED_POSTFIX ""
+#endif
+
+#define simFatal(...) { if (simDebugFlag & DEBUG_FATAL) { taosPrintLog("SIM FATAL ", 255, __VA_ARGS__); }}
+#define simError(...) { if (simDebugFlag & DEBUG_ERROR) { taosPrintLog("SIM ERROR ", 255, __VA_ARGS__); }}
+#define simWarn(...)  { if (simDebugFlag & DEBUG_WARN)  { taosPrintLog("SIM WARN ", 255, __VA_ARGS__); }}
+#define simInfo(...)  { if (simDebugFlag & DEBUG_INFO)  { taosPrintLog("SIM ", 255, __VA_ARGS__); }}
+#define simDebug(...) { if (simDebugFlag & DEBUG_DEBUG) { taosPrintLog("SIM ", simDebugFlag, __VA_ARGS__); }}
+#define simTrace(...) { if (simDebugFlag & DEBUG_TRACE) { taosPrintLog("SIM ", simDebugFlag, __VA_ARGS__); }}
+
+enum { SIM_SCRIPT_TYPE_MAIN, SIM_SCRIPT_TYPE_BACKGROUND };
+
+enum {
+  SIM_CMD_EXP,
+  SIM_CMD_IF,
+  SIM_CMD_ELIF,
+  SIM_CMD_ELSE,
+  SIM_CMD_ENDI,
+  SIM_CMD_WHILE,
+  SIM_CMD_ENDW,
+  SIM_CMD_SWITCH,
+  SIM_CMD_CASE,
+  SIM_CMD_DEFAULT,
+  SIM_CMD_CONTINUE,
+  SIM_CMD_BREAK,
+  SIM_CMD_ENDS,
+  SIM_CMD_SLEEP,
+  SIM_CMD_GOTO,
+  SIM_CMD_RUN,
+  SIM_CMD_RUN_BACK,
+  SIM_CMD_PRINT,
+  SIM_CMD_SYSTEM,
+  SIM_CMD_SYSTEM_CONTENT,
+  SIM_CMD_SQL,
+  SIM_CMD_SQL_ERROR,
+  SIM_CMD_SQL_SLOW,
+  SIM_CMD_RESTFUL,
+  SIM_CMD_TEST,
+  SIM_CMD_RETURN,
+  SIM_CMD_END
+};
+
+enum {
+  SQL_JUMP_FALSE,
+  SQL_JUMP_TRUE,
+};
+
+struct _script_t;
+typedef struct _cmd_t {
+  int16_t cmdno;
+  int16_t nlen;
+  char    name[MAX_SIM_CMD_NAME_LEN];
+  bool  (*parseCmd)(char *, struct _cmd_t *, int);
+  bool  (*executeCmd)(struct _script_t *script, char *option);
+  struct _cmd_t *next;
+} SCommand;
+
+typedef struct {
+  int16_t cmdno;
+  int16_t jump;        // jump position
+  int16_t errorJump;   // sql jump flag, while '-x' exist in sql cmd, this flag
+                       // will be SQL_JUMP_TRUE, otherwise is SQL_JUMP_FALSE */
+  int16_t lineNum;     // correspodning line number in original file
+  int optionOffset;  // relative option offset
+} SCmdLine;
+
+typedef struct _var_t {
+  char varName[MAX_VAR_NAME_LEN];
+  char varValue[MAX_VAR_VAL_LEN];
+  char varNameLen;
+} SVariable;
+
+typedef struct _script_t {
+  int  type;
+  bool killed;
+
+  void *taos;
+  char rows[12];  // number of rows data retrieved
+  char data[MAX_QUERY_ROW_NUM][MAX_QUERY_COL_NUM]
+           [MAX_QUERY_VALUE_LEN];  // query results
+  char system_exit_code[12];
+  char system_ret_content[MAX_SYSTEM_RESULT_LEN];
+
+  int  varLen;
+  int  linePos;     // current cmd position
+  int  numOfLines;  // number of lines in the script
+  int  bgScriptLen;
+  char fileName[MAX_FILE_NAME_LEN];  // script file name
+  char error[MAX_ERROR_LEN];
+  char *optionBuffer;
+  SCmdLine *lines;  // command list
+  SVariable variables[MAX_VAR_LEN];
+  struct _script_t *bgScripts[MAX_BACKGROUND_SCRIPT_NUM];
+  char auth[128];
+} SScript;
+
+extern SScript *simScriptList[MAX_MAIN_SCRIPT_NUM];
+extern SCommand simCmdList[];
+extern int simScriptPos;
+extern int simScriptSucced;
+extern int simDebugFlag;
+extern char tsScriptDir[];
+extern bool simAsyncQuery;
+
+SScript *simParseScript(char *fileName);
+
+SScript *simProcessCallOver(SScript *script);
+void *simExecuteScript(void *script);
+void simInitsimCmdList();
+bool simSystemInit();
+void simSystemCleanUp();
+char *simGetVariable(SScript *script, char *varName, int varLen);
+bool simExecuteExpCmd(SScript *script, char *option);
+bool simExecuteTestCmd(SScript *script, char *option);
+bool simExecuteGotoCmd(SScript *script, char *option);
+bool simExecuteRunCmd(SScript *script, char *option);
+bool simExecuteRunBackCmd(SScript *script, char *option);
+bool simExecuteSystemCmd(SScript *script, char *option);
+bool simExecuteSystemContentCmd(SScript *script, char *option);
+bool simExecutePrintCmd(SScript *script, char *option);
+bool simExecuteSleepCmd(SScript *script, char *option);
+bool simExecuteReturnCmd(SScript *script, char *option);
+bool simExecuteSqlCmd(SScript *script, char *option);
+bool simExecuteSqlErrorCmd(SScript *script, char *rest);
+bool simExecuteSqlSlowCmd(SScript *script, char *option);
+bool simExecuteRestfulCmd(SScript *script, char *rest);
+void simVisuallizeOption(SScript *script, char *src, char *dst);
+
+#endif
\ No newline at end of file
diff --git a/tests/tsim/inc/simParse.h b/tests/tsim/inc/simParse.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3f92add71f3dc6ddb205c1810e1a3caace47e36
--- /dev/null
+++ b/tests/tsim/inc/simParse.h
@@ -0,0 +1,55 @@
+/*
+ * 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 __SIM_PARSE_H__
+#define __SIM_PARSE_H__
+
+#define MAX_NUM_CMD 64
+#define MAX_NUM_LABLES 100
+#define MAX_LABEL_LEN 40
+#define MAX_NUM_BLOCK 100
+#define MAX_NUM_JUMP 100
+#define MAX_LINE_LEN 3000
+#define MAX_CMD_LINES 2048
+#define MAX_OPTION_BUFFER 64000
+
+enum {
+  BLOCK_IF,
+  BLOCK_WHILE,
+  BLOCK_SWITCH,
+};
+
+/* label stack */
+typedef struct {
+  char    top;                                  /* number of labels */
+  int16_t pos[MAX_NUM_LABLES];                  /* the position of the label */
+  char    label[MAX_NUM_LABLES][MAX_LABEL_LEN]; /* name of the label */
+} SLabel;
+
+/* block definition */
+typedef struct {
+  char     top;                  /* the number of blocks stacked */
+  char     type[MAX_NUM_BLOCK];  /* the block type */
+  int16_t *pos[MAX_NUM_BLOCK];   /* position of the jump for if/elif/case */
+  int16_t  back[MAX_NUM_BLOCK];  /* go back, endw and continue */
+  char     numJump[MAX_NUM_BLOCK];
+  int16_t *jump[MAX_NUM_BLOCK][MAX_NUM_JUMP]; /* break or elif */
+  char     sexp[MAX_NUM_BLOCK][40];           /*switch expression */
+  char     sexpLen[MAX_NUM_BLOCK];            /*switch expression length */
+} SBlock;
+
+bool simParseExpression(char *token, int lineNum);
+
+#endif
\ No newline at end of file
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
new file mode 100644
index 0000000000000000000000000000000000000000..463dc33c7cc4f73e888fe5583b8311102fdd41b1
--- /dev/null
+++ b/tests/tsim/src/simExe.c
@@ -0,0 +1,1021 @@
+/*
+ * 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 "os.h"
+#include "sim.h"
+#include "taos.h"
+#include "taoserror.h"
+#include "tglobal.h"
+#include "tutil.h"
+#include "cJSON.h"
+#undef TAOS_MEM_CHECK
+
+void simLogSql(char *sql, bool useSharp) {
+  static FILE *fp = NULL;
+  char filename[256];
+  sprintf(filename, "%s/sim.sql", tsScriptDir);
+  if (fp == NULL) {
+    fp = fopen(filename, "w");
+    if (fp == NULL) {
+      fprintf(stderr, "ERROR: failed to open file: %s\n", filename);
+      return;
+    }
+  }
+  if (useSharp) {
+    fprintf(fp, "# %s;\n", sql);
+  } else {
+    fprintf(fp, "%s;\n", sql);
+  }
+  
+  fflush(fp);
+}
+
+char *simParseArbitratorName(char *varName);
+char *simParseHostName(char *varName);
+char *simGetVariable(SScript *script, char *varName, int varLen) {
+  if (strncmp(varName, "hostname", 8) == 0) {
+    return simParseHostName(varName);
+  }
+
+  if (strncmp(varName, "arbitrator", 10) == 0) {
+      return simParseArbitratorName(varName);
+  }
+
+  if (strncmp(varName, "error", varLen) == 0) return script->error;
+
+  if (strncmp(varName, "rows", varLen) == 0) return script->rows;
+
+  if (strncmp(varName, "system_exit", varLen) == 0)
+    return script->system_exit_code;
+
+  if (strncmp(varName, "system_content", varLen) == 0)
+    return script->system_ret_content;
+
+  // variable like data2_192.168.0.1
+  if (strncmp(varName, "data", 4) == 0) {
+    if (varLen < 6) {
+      return "null";
+    }
+
+    if (varName[5] == '_') {
+      int col = varName[4] - '0';
+      if (col < 0 || col >= MAX_QUERY_COL_NUM) {
+        return "null";
+      }
+
+      char *keyName;
+      int keyLen;
+      paGetToken(varName + 6, &keyName, &keyLen);
+
+      for (int i = 0; i < MAX_QUERY_ROW_NUM; ++i) {
+        if (strncmp(keyName, script->data[i][0], keyLen) == 0) {
+          simDebug("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]);
+          return script->data[i][col];
+        }
+      }
+      return "null";
+    } else if (varName[6] == '_') {
+      int col = (varName[4] - '0') * 10 + (varName[5] - '0');
+      if (col < 0 || col >= MAX_QUERY_COL_NUM) {
+        return "null";
+      }
+
+      char *keyName;
+      int keyLen;
+      paGetToken(varName + 7, &keyName, &keyLen);
+
+      for (int i = 0; i < MAX_QUERY_ROW_NUM; ++i) {
+        if (strncmp(keyName, script->data[i][0], keyLen) == 0) {
+          simTrace("script:%s, keyName:%s, keyValue:%s", script->fileName, script->data[i][0], script->data[i][col]);
+          return script->data[i][col];
+        }
+      }
+      return "null";
+    } else {
+      int row = varName[4] - '0';
+      int col = varName[5] - '0';
+      if (row < 0 || row >= MAX_QUERY_ROW_NUM) {
+        return "null";
+      }
+      if (col < 0 || col >= MAX_QUERY_COL_NUM) {
+        return "null";
+      }
+
+      simDebug("script:%s, data[%d][%d]=%s", script->fileName, row, col, script->data[row][col]);
+      return script->data[row][col];
+    }
+  }
+
+  for (int i = 0; i < script->varLen; ++i) {
+    SVariable *var = &script->variables[i];
+    if (var->varNameLen != varLen) {
+      continue;
+    }
+    if (strncmp(varName, var->varName, varLen) == 0) {
+      // if (strlen(var->varValue) != 0)
+      //  simDebug("script:%s, var:%s, value:%s", script->fileName,
+      //  var->varName, var->varValue);
+      return var->varValue;
+    }
+  }
+
+  if (script->varLen >= MAX_VAR_LEN) {
+    simError("script:%s, too many varialbes:%d", script->fileName, script->varLen);
+    exit(0);
+  }
+
+  SVariable *var = &script->variables[script->varLen];
+  script->varLen++;
+  strncpy(var->varName, varName, varLen);
+  var->varNameLen = varLen;
+  var->varValue[0] = 0;
+  return var->varValue;
+}
+
+int simExecuteExpression(SScript *script, char *exp) {
+  char *op1, *op2, *var1, *var2, *var3, *rest;
+  int op1Len, op2Len, var1Len, var2Len, var3Len, val0, val1;
+  char t0[512], t1[512], t2[512], t3[1024];
+  int result;
+
+  rest = paGetToken(exp, &var1, &var1Len);
+  rest = paGetToken(rest, &op1, &op1Len);
+  rest = paGetToken(rest, &var2, &var2Len);
+  rest = paGetToken(rest, &op2, &op2Len);
+
+  if (var1[0] == '$')
+    strcpy(t0, simGetVariable(script, var1 + 1, var1Len - 1));
+  else {
+    memcpy(t0, var1, var1Len);
+    t0[var1Len] = 0;
+  }
+
+  if (var2[0] == '$')
+    strcpy(t1, simGetVariable(script, var2 + 1, var2Len - 1));
+  else {
+    memcpy(t1, var2, var2Len);
+    t1[var2Len] = 0;
+  }
+
+  if (op2Len != 0) {
+    rest = paGetToken(rest, &var3, &var3Len);
+
+    if (var3[0] == '$')
+      strcpy(t2, simGetVariable(script, var3 + 1, var3Len - 1));
+    else {
+      memcpy(t2, var3, var3Len);
+      t2[var3Len] = 0;
+    }
+
+    if (op2[0] == '+') {
+      sprintf(t3, "%lld", atoll(t1) + atoll(t2));
+    } else if (op2[0] == '-') {
+      sprintf(t3, "%lld", atoll(t1) - atoll(t2));
+    } else if (op2[0] == '*') {
+      sprintf(t3, "%lld", atoll(t1) * atoll(t2));
+    } else if (op2[0] == '/') {
+      sprintf(t3, "%lld", atoll(t1) / atoll(t2));
+    } else if (op2[0] == '.') {
+      sprintf(t3, "%s%s", t1, t2);
+    }
+  } else {
+    strcpy(t3, t1);
+  }
+
+  result = 0;
+
+  if (op1Len == 1) {
+    if (op1[0] == '=') {
+      strcpy(simGetVariable(script, var1 + 1, var1Len - 1), t3);
+    } else if (op1[0] == '<') {
+      val0 = atoi(t0);
+      val1 = atoi(t3);
+      if (val0 >= val1) result = -1;
+    } else if (op1[0] == '>') {
+      val0 = atoi(t0);
+      val1 = atoi(t3);
+      if (val0 <= val1) result = -1;
+    }
+  } else {
+    if (op1[0] == '=' && op1[1] == '=') {
+      if (strcmp(t0, t3) != 0) result = -1;
+    } else if (op1[0] == '!' && op1[1] == '=') {
+      if (strcmp(t0, t3) == 0) result = -1;
+    } else if (op1[0] == '<' && op1[1] == '=') {
+      val0 = atoi(t0);
+      val1 = atoi(t3);
+      if (val0 > val1) result = -1;
+    } else if (op1[0] == '>' && op1[1] == '=') {
+      val0 = atoi(t0);
+      val1 = atoi(t3);
+      if (val0 < val1) result = -1;
+    }
+  }
+
+  return result;
+}
+
+bool simExecuteExpCmd(SScript *script, char *option) {
+  simExecuteExpression(script, option);
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteTestCmd(SScript *script, char *option) {
+  int result;
+  result = simExecuteExpression(script, option);
+
+  if (result >= 0)
+    script->linePos++;
+  else
+    script->linePos = script->lines[script->linePos].jump;
+
+  return true;
+}
+
+bool simExecuteGotoCmd(SScript *script, char *option) {
+  script->linePos = script->lines[script->linePos].jump;
+  return true;
+}
+
+bool simExecuteRunCmd(SScript *script, char *option) {
+  char *fileName = option;
+  if (fileName == NULL || strlen(fileName) == 0) {
+    sprintf(script->error, "lineNum:%d. script file is null", script->lines[script->linePos].lineNum);
+    return false;
+  }
+
+  SScript *newScript = simParseScript(option);
+  if (newScript == NULL) {
+    sprintf(script->error, "lineNum:%d. parse file:%s error", script->lines[script->linePos].lineNum, fileName);
+    return false;
+  }
+
+  simInfo("script:%s, start to execute", newScript->fileName);
+
+  newScript->type = SIM_SCRIPT_TYPE_MAIN;
+  simScriptPos++;
+  simScriptList[simScriptPos] = newScript;
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteRunBackCmd(SScript *script, char *option) {
+  char *fileName = option;
+  if (fileName == NULL || strlen(fileName) == 0) {
+    sprintf(script->error, "lineNum:%d. script file is null", script->lines[script->linePos].lineNum);
+    return false;
+  }
+
+  SScript *newScript = simParseScript(option);
+  if (newScript == NULL) {
+    sprintf(script->error, "lineNum:%d. parse file:%s error", script->lines[script->linePos].lineNum, fileName);
+    return false;
+  }
+  simInfo("script:%s, start to execute in background", newScript->fileName);
+
+  newScript->type = SIM_SCRIPT_TYPE_BACKGROUND;
+  script->bgScripts[script->bgScriptLen++] = newScript;
+
+  pthread_t pid;
+  if (pthread_create(&pid, NULL, simExecuteScript, (void *)newScript) != 0) {
+    sprintf(script->error, "lineNum:%d. create background thread failed", script->lines[script->linePos].lineNum);
+    return false;
+  }
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteSystemCmd(SScript *script, char *option) {
+  char buf[4096] = {0};
+
+  sprintf(buf, "cd %s; ", tsScriptDir);
+  simVisuallizeOption(script, option, buf + strlen(buf));
+
+  simLogSql(buf, true);
+  int code = system(buf);
+  int repeatTimes = 0;
+  while (code < 0) {
+    simError("script:%s, failed to execute %s , code %d, errno:%d %s, repeatTimes:%d",
+        script->fileName, buf, code, errno, strerror(errno), repeatTimes);
+    taosMsleep(1000);
+#ifdef LINUX    
+    signal(SIGCHLD, SIG_DFL);
+#endif
+    if (repeatTimes++ >= 10) {
+      exit(0);
+    }
+  }
+
+  sprintf(script->system_exit_code, "%d", code);
+  script->linePos++;
+  return true;
+}
+
+void simStoreSystemContentResult(SScript *script, char *filename) {
+  memset(script->system_ret_content, 0, MAX_SYSTEM_RESULT_LEN);
+
+  FILE *fd;
+  if ((fd = fopen(filename, "r")) != NULL) {
+    fread(script->system_ret_content, 1, MAX_SYSTEM_RESULT_LEN - 1, fd);
+    fclose(fd);
+    char rmCmd[MAX_FILE_NAME_LEN] = {0};
+    sprintf(rmCmd, "rm -f %s", filename);
+    system(rmCmd);
+  }
+}
+
+bool simExecuteSystemContentCmd(SScript *script, char *option) {
+  char buf[4096] = {0};
+  char buf1[4096 + 512] = {0};
+  char filename[400] = {0};
+  sprintf(filename, "%s/%s.tmp", tsScriptDir, script->fileName);
+
+  sprintf(buf, "cd %s; ", tsScriptDir);
+  simVisuallizeOption(script, option, buf + strlen(buf));
+  sprintf(buf1, "%s > %s 2>/dev/null", buf, filename);
+
+  sprintf(script->system_exit_code, "%d", system(buf1));
+  simStoreSystemContentResult(script, filename);
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecutePrintCmd(SScript *script, char *rest) {
+  char buf[65536];
+
+  simVisuallizeOption(script, rest, buf);
+  rest = buf;
+
+  simInfo("script:%s, %s", script->fileName, rest);
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteSleepCmd(SScript *script, char *option) {
+  int delta;
+  char buf[1024];
+
+  simVisuallizeOption(script, option, buf);
+  option = buf;
+
+  delta = atoi(option);
+  if (delta <= 0) delta = 5;
+
+  simInfo("script:%s, sleep %dms begin", script->fileName, delta);
+  taosMsleep(delta);
+  simInfo("script:%s, sleep %dms finished", script->fileName, delta);
+
+  char sleepStr[32] = {0};
+  sprintf(sleepStr, "sleep %d", delta);
+  simLogSql(sleepStr, true);
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteReturnCmd(SScript *script, char *option) {
+  char buf[1024];
+
+  simVisuallizeOption(script, option, buf);
+  option = buf;
+
+  int ret = 1;
+  if (option && option[0] != 0) ret = atoi(option);
+
+  if (ret < 0) {
+    sprintf(script->error, "lineNum:%d. error return %s", script->lines[script->linePos].lineNum, option);
+    return false;
+  } else {
+    simInfo("script:%s, return cmd execute with:%d", script->fileName, ret);
+    script->linePos = script->numOfLines;
+  }
+
+  script->linePos++;
+  return true;
+}
+
+void simVisuallizeOption(SScript *script, char *src, char *dst) {
+  char *var, *token, *value;
+  int dstLen, srcLen, tokenLen;
+
+  dst[0] = 0, dstLen = 0;
+
+  while (1) {
+    var = strchr(src, '$');
+    if (var == NULL) break;
+    if (var && ((var - src - 1) > 0) && *(var - 1) == '\\') {
+      srcLen = (int)(var - src - 1);
+      memcpy(dst + dstLen, src, srcLen);
+      dstLen += srcLen;
+      src = var;
+      break;
+    }
+
+    srcLen = (int)(var - src);
+    memcpy(dst + dstLen, src, srcLen);
+    dstLen += srcLen;
+
+    src = paGetToken(var + 1, &token, &tokenLen);
+    value = simGetVariable(script, token, tokenLen);
+
+    strcpy(dst + dstLen, value);
+    dstLen += (int)strlen(value);
+  }
+
+  strcpy(dst + dstLen, src);
+}
+
+void simCloseRestFulConnect(SScript *script) {
+  memset(script->auth, 0, sizeof(script->auth));
+}
+
+void simCloseNativeConnect(SScript *script) {
+  if (script->taos == NULL) return;
+
+  simDebug("script:%s, taos:%p closed", script->fileName, script->taos);
+  taos_close(script->taos);
+  taosMsleep(1200);
+
+  script->taos = NULL;
+}
+
+void simCloseTaosdConnect(SScript *script) {
+  if (simAsyncQuery) {
+    simCloseRestFulConnect(script);
+  } else {
+    simCloseNativeConnect(script);
+  }
+}
+//  {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}
+//  {"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}
+//  {"status":"succ","head":["ts","i"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10]],"rows":10}
+int simParseHttpCommandResult(SScript *script, char *command) {
+  cJSON* root = cJSON_Parse(command);
+  if (root == NULL) {
+    simError("script:%s, failed to parse json, response:%s", script->fileName, command);
+    return -1;
+  }
+
+  cJSON *status = cJSON_GetObjectItem(root, "status");
+  if (status == NULL) {
+    simError("script:%s, failed to parse json, status is null, response:%s", script->fileName, command);
+    cJSON_Delete(root);
+    return -1;
+  }
+
+  if (status->valuestring == NULL || strlen(status->valuestring) == 0) {
+    simError("script:%s, failed to parse json, status value is null, response:%s", script->fileName, command);
+    cJSON_Delete(root);
+    return -1;
+  }
+
+  if (strcmp(status->valuestring, "succ") != 0) {
+    cJSON *code = cJSON_GetObjectItem(root, "code");
+    if (code == NULL) {
+      simError("script:%s, failed to parse json, code is null, response:%s", script->fileName, command);
+      cJSON_Delete(root);
+      return -1;
+    }
+    int retcode = (int)code->valueint;
+    if (retcode != 1017) {
+      simError("script:%s, json:status:%s not equal to succ, response:%s", script->fileName, status->valuestring, command);
+      cJSON_Delete(root);
+      return retcode;
+    } else {
+      simDebug("script:%s, json:status:%s not equal to succ, but code is %d, response:%s", script->fileName,
+          status->valuestring, retcode, command);
+      cJSON_Delete(root);
+      return 0;
+    }
+  }
+
+  cJSON *desc = cJSON_GetObjectItem(root, "desc");
+  if (desc != NULL) {
+    if (desc->valuestring == NULL || strlen(desc->valuestring) == 0) {
+      simError("script:%s, failed to parse json, desc value is null, response:%s", script->fileName, command);
+      cJSON_Delete(root);
+      return -1;
+    }
+    strcpy(script->auth, desc->valuestring);
+    cJSON_Delete(root);
+    return 0;
+  }
+
+  cJSON *data = cJSON_GetObjectItem(root, "data");
+  if (data == NULL) {
+    simError("script:%s, failed to parse json, data is null, response:%s", script->fileName, command);
+    cJSON_Delete(root);
+    return -1;
+  }
+
+  int rowsize = cJSON_GetArraySize(data);
+  if (rowsize < 0) {
+    simError("script:%s, failed to parse json:data, data size %d, response:%s", script->fileName, rowsize, command);
+    cJSON_Delete(root);
+    return -1;
+  }
+
+  int rowIndex = 0;
+  sprintf(script->rows, "%d", rowsize);
+  for (int r = 0; r < rowsize; ++r) {
+    cJSON *row = cJSON_GetArrayItem(data, r);
+    if (row == NULL) continue;
+    if (rowIndex++ >= 10) break;
+
+    int colsize = cJSON_GetArraySize(row);
+    if (colsize < 0) {
+      break;
+    }
+
+    colsize = MIN(10, colsize);
+    for (int c = 0; c < colsize; ++c) {
+      cJSON *col = cJSON_GetArrayItem(row, c);
+      if (col->valuestring != NULL) {
+        strcpy(script->data[r][c], col->valuestring);
+      } else {
+        if (col->numberstring[0] == 0) {
+          strcpy(script->data[r][c], "null");
+        } else {
+          strcpy(script->data[r][c], col->numberstring);
+        }
+      }
+    }
+  }
+
+  return 0;
+}
+
+int simExecuteRestFulCommand(SScript *script, char *command) {
+  char buf[5000] = {0};
+  sprintf(buf, "%s 2>/dev/null", command);
+
+  FILE *fp = popen(buf, "r");
+  if (fp == NULL) {
+    simError("failed to execute %s", buf);
+    return -1;
+  }
+
+  int mallocSize = 2000;
+  int alreadyReadSize = 0;
+  char* content = malloc(mallocSize);
+
+  while (!feof(fp)) {
+    int availSize = mallocSize - alreadyReadSize;
+    int len = (int)fread(content + alreadyReadSize, 1, availSize, fp);
+    if (len >= availSize) {
+      alreadyReadSize += len;
+      mallocSize *= 2;
+      content = realloc(content, mallocSize);
+    }
+  }
+
+  pclose(fp);
+
+  return simParseHttpCommandResult(script, content);
+}
+
+bool simCreateRestFulConnect(SScript *script, char *user, char *pass) {
+  char command[4096];
+  sprintf(command, "curl 127.0.0.1:6041/rest/login/%s/%s", user, pass);
+
+  bool success = false;
+  for (int attempt = 0; attempt < 10; ++attempt) {
+    success = simExecuteRestFulCommand(script, command) == 0;
+    if (!success) {
+      simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
+      taosMsleep(1000);
+    } else {
+      simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
+      break;
+    }
+  }
+
+  if (!success) {
+    sprintf(script->error, "lineNum:%d. connect taosd failed:%s", script->lines[script->linePos].lineNum, taos_errstr(NULL));
+    return false;
+  }
+
+  simDebug("script:%s, connect taosd successed, auth:%p", script->fileName, script->auth);
+  return true;
+}
+
+bool simCreateNativeConnect(SScript *script, char *user, char *pass) {
+  simCloseTaosdConnect(script);
+  void *taos = NULL;
+  taosMsleep(2000);
+  for (int attempt = 0; attempt < 10; ++attempt) {
+    taos = taos_connect(NULL, user, pass, NULL, tsDnodeShellPort);
+    if (taos == NULL) {
+      simDebug("script:%s, user:%s connect taosd failed:%s, attempt:%d", script->fileName, user, taos_errstr(NULL), attempt);
+      taosMsleep(1000);
+    } else {
+      simDebug("script:%s, user:%s connect taosd successed, attempt:%d", script->fileName, user, attempt);
+      break;
+    }
+  }
+
+  if (taos == NULL) {
+    sprintf(script->error, "lineNum:%d. connect taosd failed:%s", script->lines[script->linePos].lineNum, taos_errstr(NULL));
+    return false;
+  }
+
+  script->taos = taos;
+  simDebug("script:%s, connect taosd successed, taos:%p", script->fileName, taos);
+
+  return true;
+}
+
+bool simCreateTaosdConnect(SScript *script, char *rest) {
+  char *user = TSDB_DEFAULT_USER;
+  char *token;
+  int tokenLen;
+  rest = paGetToken(rest, &token, &tokenLen);
+  rest = paGetToken(rest, &token, &tokenLen);
+  if (tokenLen != 0) {
+    user = token;
+  }
+
+  if (simAsyncQuery) {
+    return simCreateRestFulConnect(script, user, TSDB_DEFAULT_PASS);
+  } else {
+    return simCreateNativeConnect(script, user, TSDB_DEFAULT_PASS);
+  }
+}
+
+bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
+  char timeStr[30] = {0};
+  time_t tt;
+  struct tm *tp;
+  SCmdLine *line = &script->lines[script->linePos];
+  int ret = -1;
+
+  TAOS_RES* pSql = NULL;
+  
+  for (int attempt = 0; attempt < 10; ++attempt) {
+    simLogSql(rest, false);
+    pSql = taos_query(script->taos, rest);
+    ret = taos_errno(pSql);
+    
+    if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST || ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
+      simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret & 0XFFFF, tstrerror(ret));
+      ret = 0;
+      break;
+    } else if (ret != 0) {
+      simDebug("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s",
+               script->fileName, script->taos, rest, ret & 0XFFFF, tstrerror(ret), taos_errstr(pSql));
+
+      if (line->errorJump == SQL_JUMP_TRUE) {
+        script->linePos = line->jump;
+        taos_free_result(pSql);
+        return true;
+      }
+      taosMsleep(1000);
+    } else {
+      break;
+    }
+    
+    taos_free_result(pSql);
+  }
+
+  if (ret) {
+    sprintf(script->error, "lineNum:%d. sql:%s failed, ret:%d:%s", line->lineNum, rest, ret & 0XFFFF, tstrerror(ret));
+    return false;
+  }
+
+  int numOfRows = 0;
+  int num_fields = taos_field_count(pSql);
+  if (num_fields != 0) {
+    if (pSql == NULL) {
+      simDebug("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest);
+      if (line->errorJump == SQL_JUMP_TRUE) {
+        script->linePos = line->jump;
+        return true;
+      }
+
+      sprintf(script->error, "lineNum:%d. result set null, sql:%s", line->lineNum, rest);
+      return false;
+    }
+
+    TAOS_ROW row;
+
+    while ((row = taos_fetch_row(pSql))) {
+      if (numOfRows < MAX_QUERY_ROW_NUM) {
+        TAOS_FIELD *fields = taos_fetch_fields(pSql);
+        int* length = taos_fetch_lengths(pSql);
+        
+        for (int i = 0; i < num_fields; i++) {
+          char *value = NULL;
+          if (i < MAX_QUERY_COL_NUM) {
+            value = script->data[numOfRows][i];
+          }
+          if (value == NULL) {
+            continue;
+          }
+
+          if (row[i] == 0) {
+            strcpy(value, TSDB_DATA_NULL_STR);
+            continue;
+          }
+
+          switch (fields[i].type) {
+            case TSDB_DATA_TYPE_BOOL:
+              sprintf(value, "%s",
+                      ((((int)(*((char *)row[i]))) == 1) ? "1" : "0"));
+              break;
+            case TSDB_DATA_TYPE_TINYINT:
+              sprintf(value, "%d", (int)(*((char *)row[i])));
+              break;
+            case TSDB_DATA_TYPE_SMALLINT:
+              sprintf(value, "%d", (int)(*((short *)row[i])));
+              break;
+            case TSDB_DATA_TYPE_INT:
+              sprintf(value, "%d", *((int *)row[i]));
+              break;
+            case TSDB_DATA_TYPE_BIGINT:
+              sprintf(value, "%" PRId64, *((int64_t *)row[i]));
+              break;
+            case TSDB_DATA_TYPE_FLOAT:{
+#ifdef _TD_ARM_32_
+              float fv = 0;
+              *(int32_t*)(&fv) = *(int32_t*)row[i];
+              sprintf(value, "%.5f", fv);
+#else
+              sprintf(value, "%.5f", *((float *)row[i]));
+#endif
+            }
+              break;
+            case TSDB_DATA_TYPE_DOUBLE: {
+#ifdef _TD_ARM_32_
+              double dv = 0;
+              *(int64_t*)(&dv) = *(int64_t*)row[i];
+              sprintf(value, "%.9lf", dv);
+#else
+              sprintf(value, "%.9lf", *((double *)row[i]));
+#endif
+            }
+              break;
+            case TSDB_DATA_TYPE_BINARY:
+            case TSDB_DATA_TYPE_NCHAR:
+              memset(value, 0, MAX_QUERY_VALUE_LEN);
+              memcpy(value, row[i], length[i]);
+              value[length[i]] = 0;
+              // snprintf(value, fields[i].bytes, "%s", (char *)row[i]);
+              break;
+            case TSDB_DATA_TYPE_TIMESTAMP:
+              tt = *(int64_t *)row[i] / 1000;
+              /* comment out as it make testcases like select_with_tags.sim fail.
+                but in windows, this may cause the call to localtime crash if tt < 0,
+                need to find a better solution.
+              if (tt < 0) {
+                tt = 0;
+              }
+              */
+
+#ifdef WINDOWS
+              if (tt < 0) tt = 0;
+#endif
+
+              tp = localtime(&tt);
+              strftime(timeStr, 64, "%y-%m-%d %H:%M:%S", tp);
+              sprintf(value, "%s.%03d", timeStr,
+                (int)(*((int64_t *)row[i]) % 1000));
+              
+              break;
+            default:
+              break;
+          }  // end of switch
+        }    // end of for
+      }      // end of if
+      numOfRows++;
+      if (isSlow && numOfRows % 100 == 0) {
+        taosMsleep(200);
+      }
+      if (numOfRows > 2000000000) {
+        simError("script:%s, too many rows return from query", script->fileName);
+        break;
+      }
+    }
+
+  } else {
+    numOfRows = taos_affected_rows(pSql);
+  }
+
+  taos_free_result(pSql);
+  sprintf(script->rows, "%d", numOfRows);
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteRestFulSqlCommand(SScript *script, char *rest) {
+  SCmdLine *line = &script->lines[script->linePos];
+  char command[4096];
+  sprintf(command, "curl -H 'Authorization: Taosd %s' -d \"%s\" 127.0.0.1:6041/rest/sql", script->auth, rest);
+
+  int ret = -1;
+  for (int attempt = 0; attempt < 10; ++attempt) {
+    ret = simExecuteRestFulCommand(script, command);
+    if (ret == TSDB_CODE_MND_TABLE_ALREADY_EXIST ||
+        ret == TSDB_CODE_MND_DB_ALREADY_EXIST) {
+      simDebug("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret & 0XFFFF, tstrerror(ret));
+      ret = 0;
+      break;
+    } else if (ret != 0) {
+      simDebug("script:%s, taos:%p, %s failed, ret:%d",
+               script->fileName, script->taos, rest, ret);
+
+      if (line->errorJump == SQL_JUMP_TRUE) {
+        script->linePos = line->jump;
+        return true;
+      }
+      taosMsleep(1000);
+    } else {
+      break;
+    }
+  }
+
+  if (ret) {
+    sprintf(script->error, "lineNum:%d. sql:%s failed, ret:%d", line->lineNum, rest, ret);
+    return false;
+  }
+
+  script->linePos++;
+  return true;
+}
+
+bool simExecuteSqlImpCmd(SScript *script, char *rest, bool isSlow) {
+  char buf[3000];
+  SCmdLine *line = &script->lines[script->linePos];
+
+  simVisuallizeOption(script, rest, buf);
+  rest = buf;
+
+  simDebug("script:%s, exec:%s", script->fileName, rest);
+  strcpy(script->rows, "-1");
+  for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
+    for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
+      strcpy(script->data[row][col], "null");
+    }
+  }
+
+  if (strncmp(rest, "connect", 7) == 0) {
+    if (!simCreateTaosdConnect(script, rest)) {
+      return false;
+    }
+    script->linePos++;
+    return true;
+  }
+
+  if ((!simAsyncQuery && script->taos == NULL) || (simAsyncQuery && script->auth[0] == 0)) {
+    if (!simCreateTaosdConnect(script, "connect root")) {
+      if (line->errorJump == SQL_JUMP_TRUE) {
+        script->linePos = line->jump;
+        return true;
+      }
+      return false;
+    }
+  }
+
+  if (strncmp(rest, "close", 5) == 0) {
+    simCloseTaosdConnect(script);
+    script->linePos++;
+    return true;
+  }
+
+  if (simAsyncQuery) {
+    return simExecuteRestFulSqlCommand(script, rest);
+  } else {
+    return simExecuteNativeSqlCommand(script, rest, isSlow);
+  }
+}
+
+bool simExecuteSqlCmd(SScript *script, char *rest) {
+  bool isSlow = false;
+  return simExecuteSqlImpCmd(script, rest, isSlow);
+}
+
+bool simExecuteSqlSlowCmd(SScript *script, char *rest) {
+  bool isSlow = true;
+  return simExecuteSqlImpCmd(script, rest, isSlow);
+}
+
+bool simExecuteRestfulCmd(SScript *script, char *rest) {
+  FILE *fp = NULL;
+  char filename[256];
+  sprintf(filename, "%s/tmp.sql", tsScriptDir);  
+  fp = fopen(filename, "w");
+  if (fp == NULL) {
+    fprintf(stderr, "ERROR: failed to open file: %s\n", filename);
+    return false;
+  }
+
+  char db[64] = {0};
+  char tb[64] = {0};
+  char gzip[32] = {0};
+  int32_t ts;
+  int32_t times;
+  sscanf(rest, "%s %s %d %d %s", db, tb, &ts, &times, gzip);
+  
+  fprintf(fp, "insert into %s.%s values ", db, tb);
+  for (int i = 0; i < times; ++i) {
+    fprintf(fp, "(%d000, %d)", ts + i, ts);
+  }
+  fprintf(fp, "  \n");
+  fflush(fp);
+  fclose(fp);
+
+  char cmd[1024] = {0};
+  if (strcmp(gzip, "gzip") == 0) {
+    sprintf(cmd,
+            "curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' --header "
+            "--compressed --data-ascii @%s 127.0.0.1:7111/rest/sql",
+            filename);
+  } else {
+    sprintf(cmd,
+            "curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' --header "
+            "'Transfer-Encoding: chunked' --data-ascii @%s 127.0.0.1:7111/rest/sql",
+            filename);
+  }
+
+  return simExecuteSystemCmd(script, cmd);
+}
+
+bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
+  char buf[3000];
+  SCmdLine *line = &script->lines[script->linePos];
+
+  simVisuallizeOption(script, rest, buf);
+  rest = buf;
+
+  simDebug("script:%s, exec:%s", script->fileName, rest);
+  strcpy(script->rows, "-1");
+  for (int row = 0; row < MAX_QUERY_ROW_NUM; ++row) {
+    for (int col = 0; col < MAX_QUERY_COL_NUM; ++col) {
+      strcpy(script->data[row][col], "null");
+    }
+  }
+
+  if (strncmp(rest, "connect", 7) == 0) {
+    if (!simCreateTaosdConnect(script, rest)) {
+      return false;
+    }
+    script->linePos++;
+    return true;
+  }
+
+  if ((!simAsyncQuery && script->taos == NULL) || (simAsyncQuery && script->auth[0] == 0)) {
+    if (!simCreateTaosdConnect(script, "connect root")) {
+      if (line->errorJump == SQL_JUMP_TRUE) {
+        script->linePos = line->jump;
+        return true;
+      }
+      return false;
+    }
+  }
+
+  if (strncmp(rest, "close", 5) == 0) {
+    simCloseTaosdConnect(script);
+    script->linePos++;
+    return true;
+  }
+
+  int ret;
+  TAOS_RES* pSql = NULL;
+  if (simAsyncQuery) {
+    char command[4096];
+    sprintf(command, "curl -H 'Authorization: Taosd %s' -d '%s' 127.0.0.1:6041/rest/sql", script->auth, rest);
+    ret = simExecuteRestFulCommand(script, command);
+  }
+  else {
+    pSql = taos_query(script->taos, rest);
+    ret = taos_errno(pSql);
+    taos_free_result(pSql);
+  }
+
+  if (ret != TSDB_CODE_SUCCESS) {
+    simDebug("script:%s, taos:%p, %s execute, expect failed, so success, ret:%d:%s",
+        script->fileName, script->taos, rest, ret & 0XFFFF, tstrerror(ret));
+    script->linePos++;
+    return true;
+  }
+  
+  sprintf(script->error, "lineNum:%d. sql:%s expect failed, but success, ret:%d:%s", line->lineNum, rest, ret & 0XFFFF, tstrerror(ret));
+
+  return false;
+}
diff --git a/tests/tsim/src/simMain.c b/tests/tsim/src/simMain.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef1a488f602959b740cbe863cc22654a24b2d41b
--- /dev/null
+++ b/tests/tsim/src/simMain.c
@@ -0,0 +1,66 @@
+/*
+ * 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 "os.h"
+#include "tglobal.h"
+#include "sim.h"
+#undef TAOS_MEM_CHECK
+
+bool simAsyncQuery = false;
+
+void simHandleSignal(int signo) {
+  simSystemCleanUp();
+  exit(1);
+}
+
+int main(int argc, char *argv[]) {
+  char scriptFile[MAX_FILE_NAME_LEN] = "sim_main_test.sim";
+
+  for (int i = 1; i < argc; ++i) {
+    if (strcmp(argv[i], "-c") == 0 && i < argc - 1) {
+      tstrncpy(configDir, argv[++i], MAX_FILE_NAME_LEN);
+    } else if (strcmp(argv[i], "-f") == 0 && i < argc - 1) {
+      strcpy(scriptFile, argv[++i]);
+    } else if (strcmp(argv[i], "-a") == 0) {
+      simAsyncQuery = true;
+    } else {
+      printf("usage: %s [options] \n", argv[0]);
+      printf("       [-c config]: config directory, default is: %s\n",
+             configDir);
+      printf("       [-f script]: script filename\n");
+      exit(0);
+    }
+  }
+
+  if (!simSystemInit()) {
+    simError("failed to initialize the system");
+    simSystemCleanUp();
+    exit(1);
+  }
+
+  simInfo("simulator is running ...");
+  signal(SIGINT, simHandleSignal);
+
+  SScript *script = simParseScript(scriptFile);
+  if (script == NULL) {
+    simError("parse script file:%s failed", scriptFile);
+    exit(-1);
+  }
+
+  simScriptList[++simScriptPos] = script;
+  simExecuteScript(script);
+
+  return 0;
+}
\ No newline at end of file
diff --git a/tests/tsim/src/simParse.c b/tests/tsim/src/simParse.c
new file mode 100644
index 0000000000000000000000000000000000000000..2e6121304f18022a74b9e4f09a8043b5b4beb909
--- /dev/null
+++ b/tests/tsim/src/simParse.c
@@ -0,0 +1,1052 @@
+/*
+ * 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/>.
+ */
+
+/* Thi file is to parse the simScriptPos, function file and default file,
+ *
+ * syntax
+ *
+ *    expression is format like:
+ *       $var [=|<|>|==] var
+ *     or:
+ *       $var = var [+|-|*|/|.] var
+ *
+ *    if expression
+ *      command
+ *
+ *    if expression then
+ *      commands
+ *    elif expression
+ *      commands
+ *    elif expression
+ *      commands
+ *    else
+ *      commands
+ *    endi
+ *
+ *    while expression
+ *      commands
+ *      continue
+ *      break
+ *    endw
+ *
+ *    switch expression
+ *      case 1
+ *        commands
+ *        break
+ *      case 2
+ *        commands
+ *        break
+ *      default
+ *        commands
+ *    ends
+ *
+ *    label:
+ *    goto label
+ *
+ */
+
+#include "os.h"
+#include "sim.h"
+#include "simParse.h"
+#include "tutil.h"
+#undef TAOS_MEM_CHECK
+
+static SCommand *cmdHashList[MAX_NUM_CMD];
+static SCmdLine cmdLine[MAX_CMD_LINES];
+static char parseErr[MAX_ERROR_LEN];
+static char optionBuffer[MAX_OPTION_BUFFER];
+static int numOfLines, optionOffset;
+static SLabel label, dest;
+static SBlock block;
+
+int simHashCmd(char *token, int tokenLen) {
+  int i;
+  int hash = 0;
+
+  for (i = 0; i < tokenLen; ++i) hash += token[i];
+
+  hash = hash % MAX_NUM_CMD;
+
+  return hash;
+}
+
+SCommand *simCheckCmd(char *token, int tokenLen) {
+  int hash;
+  SCommand *node;
+
+  hash = simHashCmd(token, tokenLen);
+
+  node = cmdHashList[hash];
+
+  while (node) {
+    if (node->nlen == tokenLen && strncmp(node->name, token, tokenLen) == 0) {
+      return node;
+    } else {
+      node = node->next;
+    }
+  }
+
+  return NULL;
+}
+
+void simAddCmdIntoHash(SCommand *pCmd) {
+  int hash;
+  SCommand *node;
+
+  hash = simHashCmd(pCmd->name, (int)strlen(pCmd->name));
+  node = cmdHashList[hash];
+  pCmd->next = node;
+  cmdHashList[hash] = pCmd;
+}
+
+void simResetParser() {
+  optionOffset = 4;
+  numOfLines = 0;
+  memset(cmdLine, 0, sizeof(cmdLine));
+  memset(optionBuffer, 0, sizeof(optionBuffer));
+  memset(&label, 0, sizeof(label));
+  memset(&block, 0, sizeof(block));
+  memset(&dest, 0, sizeof(dest));
+}
+
+SScript *simBuildScriptObj(char *fileName) {
+  int i, destPos;
+
+  /* process labels */
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_RETURN;
+  numOfLines++;
+
+  for (i = 0; i < numOfLines; ++i) {
+    cmdLine[i].errorJump = SQL_JUMP_FALSE;
+  }
+
+  for (--dest.top; dest.top >= 0; --dest.top) {
+    for (i = 0; i < label.top; ++i) {
+      if (strcmp(label.label[i], dest.label[(uint8_t)dest.top]) == 0) break;
+    }
+
+    if (i == label.top) {
+      sprintf(parseErr, "label:%s not defined", dest.label[(uint8_t)dest.top]);
+      return NULL;
+    }
+
+    destPos = dest.pos[(uint8_t)dest.top];
+    cmdLine[destPos].jump = label.pos[i];
+    if (cmdLine[destPos].cmdno == SIM_CMD_SQL) {
+      cmdLine[destPos].errorJump = SQL_JUMP_TRUE;
+    }
+  }
+
+  if (block.top != 0) {
+    sprintf(parseErr, "mismatched block");
+    return NULL;
+  }
+
+  for (i = 0; i < numOfLines; ++i) {
+    if (cmdLine[i].jump == 0) cmdLine[i].jump = numOfLines;
+  }
+
+  SScript *script = malloc(sizeof(SScript));
+  memset(script, 0, sizeof(SScript));
+
+  script->type = SIM_SCRIPT_TYPE_MAIN;
+  script->numOfLines = numOfLines;
+  tstrncpy(script->fileName, fileName, sizeof(script->fileName));
+
+  script->optionBuffer = malloc(optionOffset);
+  memcpy(script->optionBuffer, optionBuffer, optionOffset);
+
+  script->lines = malloc(sizeof(SCmdLine) * numOfLines);
+  memcpy(script->lines, cmdLine, sizeof(SCmdLine) * numOfLines);
+
+  return script;
+}
+
+SScript *simParseScript(char *fileName) {
+  FILE *fd;
+  int tokenLen, lineNum = 0;
+  char buffer[MAX_LINE_LEN], name[128], *token, *rest;
+  SCommand *pCmd;
+  SScript *script;
+
+  if ((fileName[0] == '.') || (fileName[0] == '/')) {
+    strcpy(name, fileName);
+  } else {
+    sprintf(name, "%s/%s", tsScriptDir, fileName);
+  }
+
+  if ((fd = fopen(name, "r")) == NULL) {
+    simError("failed to open file:%s", name);
+    return NULL;
+  }
+
+  simResetParser();
+
+  while (!feof(fd)) {
+    if (fgets(buffer, sizeof(buffer), fd) == NULL) continue;
+
+    lineNum++;
+    int cmdlen = (int)strlen(buffer);
+    if (buffer[cmdlen - 1] == '\r' || buffer[cmdlen - 1] == '\n')
+      buffer[cmdlen - 1] = 0;
+    rest = buffer;
+
+    for (int i = 0; i < cmdlen; ++i) {
+      if (buffer[i] == '\r' || buffer[i] == '\n') {
+        buffer[i] = ' ';
+      }
+    }
+
+  again:
+    rest = paGetToken(rest, &token, &tokenLen);
+    if (tokenLen == 0) continue;
+
+    if (token[tokenLen - 1] == ':') {
+      strncpy(label.label[(uint8_t)label.top], token, tokenLen - 1);
+      label.pos[(uint8_t)label.top] = numOfLines;
+      label.top++;
+      goto again;
+    }
+
+    if (token[0] == '$') {
+      if (!simParseExpression(token, lineNum)) {
+        simError("script:%s line:%d %s", fileName, lineNum, parseErr);
+        return NULL;
+      }
+      continue;
+    }
+
+    if ((pCmd = simCheckCmd(token, tokenLen)) == NULL) {
+      token[tokenLen] = 0;
+      simError("script:%s line:%d invalid cmd:%s", fileName, lineNum, token);
+      return NULL;
+    }
+
+    if (!pCmd->parseCmd(rest, pCmd, lineNum)) {
+      simError("script:%s line:%d %s", fileName, lineNum, parseErr);
+      return NULL;
+    }
+  }
+
+  fclose(fd);
+
+  script = simBuildScriptObj(fileName);
+  if (script == NULL) simError("script:%s %s", fileName, parseErr);
+
+  return script;
+}
+
+int simCheckExpression(char *exp) {
+  char *op1, *op2, *op, *rest;
+  int op1Len, op2Len, opLen;
+
+  rest = paGetToken(exp, &op1, &op1Len);
+  if (op1Len == 0) {
+    sprintf(parseErr, "expression is required");
+    return -1;
+  }
+
+  rest = paGetToken(rest, &op, &opLen);
+  if (opLen == 0) {
+    sprintf(parseErr, "operator is missed");
+    return -1;
+  }
+
+  rest = paGetToken(rest, &op2, &op2Len);
+  if (op2Len == 0) {
+    sprintf(parseErr, "operand is missed");
+    return -1;
+  }
+
+  if (opLen == 1) {
+    if (op[0] != '=' && op[0] != '<' && op[0] != '>') {
+      sprintf(parseErr, "invalid operator:%s", op);
+      return -1;
+    }
+
+    if (op[0] == '=' && op1[0] != '$') {
+      sprintf(parseErr, "left side of assignment must be variable");
+      return -1;
+    }
+  } else if (opLen == 2) {
+    if (op[1] != '=' ||
+        (op[0] != '=' && op[0] != '<' && op[0] != '>' && op[0] != '!')) {
+      sprintf(parseErr, "left side of assignment must be variable");
+      return -1;
+    }
+  } else {
+    sprintf(parseErr, "invalid operator:%s", op);
+    return -1;
+  }
+
+  rest = paGetToken(rest, &op, &opLen);
+
+  if (opLen == 0) return (int)(rest - exp);
+
+  /* if it is key word "then" */
+  if (strncmp(op, "then", 4) == 0) return (int)(op - exp);
+
+  rest = paGetToken(rest, &op2, &op2Len);
+  if (op2Len == 0) {
+    sprintf(parseErr, "operand is missed");
+    return -1;
+  }
+
+  if (opLen > 1) {
+    sprintf(parseErr, "invalid operator:%s", op);
+    return -1;
+  }
+
+  if (op[0] == '+' || op[0] == '-' || op[0] == '*' || op[0] == '/' ||
+      op[0] == '.') {
+    return (int)(rest - exp);
+  }
+
+  return -1;
+}
+
+bool simParseExpression(char *token, int lineNum) {
+  int expLen;
+
+  expLen = simCheckExpression(token);
+  if (expLen <= 0) return -1;
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_EXP;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, token, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseIfCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *ret;
+  int expLen;
+
+  expLen = simCheckExpression(rest);
+
+  if (expLen <= 0) return -1;
+
+  ret = rest + expLen;
+
+  if (strncmp(ret, "then", 4) == 0) {
+    block.type[(uint8_t)block.top] = BLOCK_IF;
+    block.pos[(uint8_t)block.top] = &cmdLine[numOfLines].jump;
+    block.top++;
+  } else {
+    cmdLine[numOfLines].jump = numOfLines + 2;
+  }
+
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+  cmdLine[numOfLines].cmdno = SIM_CMD_TEST;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseElifCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  expLen = simCheckExpression(rest);
+
+  if (expLen <= 0) return -1;
+
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching if");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_IF) {
+    sprintf(parseErr, "no matched if block");
+    return false;
+  }
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  block.jump[block.top - 1][(uint8_t)block.numJump[block.top - 1]] =
+      &(cmdLine[numOfLines].jump);
+  block.numJump[block.top - 1]++;
+
+  numOfLines++;
+
+  *(block.pos[block.top - 1]) = numOfLines;
+  block.pos[block.top - 1] = &cmdLine[numOfLines].jump;
+
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+  cmdLine[numOfLines].cmdno = SIM_CMD_TEST;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseElseCmd(char *rest, SCommand *pCmd, int lineNum) {
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching if");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_IF) {
+    sprintf(parseErr, "no matched if block");
+    return false;
+  }
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  block.jump[block.top - 1][(uint8_t)block.numJump[block.top - 1]] =
+      &(cmdLine[numOfLines].jump);
+  block.numJump[block.top - 1]++;
+
+  numOfLines++;
+
+  *(block.pos[block.top - 1]) = numOfLines;
+  block.pos[block.top - 1] = NULL;
+
+  return true;
+}
+
+bool simParseEndiCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int i;
+
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching if");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_IF) {
+    sprintf(parseErr, "no matched if block");
+    return false;
+  }
+
+  if (block.pos[block.top - 1]) *(block.pos[block.top - 1]) = numOfLines;
+
+  for (i = 0; i < block.numJump[block.top - 1]; ++i)
+    *(block.jump[block.top - 1][i]) = numOfLines;
+
+  block.numJump[block.top - 1] = 0;
+  block.top--;
+
+  return true;
+}
+
+bool simParseWhileCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  expLen = simCheckExpression(rest);
+
+  if (expLen <= 0) return false;
+
+  block.type[(uint8_t)block.top] = BLOCK_WHILE;
+  block.pos[(uint8_t)block.top] = &(cmdLine[numOfLines].jump);
+  block.back[(uint8_t)block.top] = numOfLines;
+  block.top++;
+
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+  cmdLine[numOfLines].cmdno = SIM_CMD_TEST;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseEndwCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int i;
+
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching while");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_WHILE) {
+    sprintf(parseErr, "no matched while block");
+    return false;
+  }
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  cmdLine[numOfLines].jump = block.back[block.top - 1];
+  cmdLine[numOfLines].lineNum = lineNum;
+  numOfLines++;
+
+  *(block.pos[block.top - 1]) = numOfLines;
+
+  for (i = 0; i < block.numJump[block.top - 1]; ++i)
+    *(block.jump[block.top - 1][i]) = numOfLines;
+
+  block.top--;
+
+  return true;
+}
+
+bool simParseSwitchCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  rest = paGetToken(rest, &token, &tokenLen);
+  if (tokenLen == 0) {
+    sprintf(parseErr, "switch should be followed by variable");
+    return false;
+  }
+
+  if (token[0] != '$') {
+    sprintf(parseErr, "switch must be followed by variable");
+    return false;
+  }
+
+  memcpy(block.sexp[(uint8_t)block.top], token, tokenLen);
+  block.sexpLen[(uint8_t)block.top] = tokenLen;
+  block.type[(uint8_t)block.top] = BLOCK_SWITCH;
+  block.top++;
+
+  return true;
+}
+
+bool simParseCaseCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  rest = paGetToken(rest, &token, &tokenLen);
+  if (tokenLen == 0) {
+    sprintf(parseErr, "case should be followed by value");
+    return false;
+  }
+
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching switch");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_SWITCH) {
+    sprintf(parseErr, "case not matched");
+    return false;
+  }
+
+  if (block.pos[block.top - 1] != NULL)
+    *(block.pos[block.top - 1]) = numOfLines;
+
+  block.pos[block.top - 1] = &(cmdLine[numOfLines].jump);
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_TEST;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, block.sexp[block.top - 1],
+         block.sexpLen[block.top - 1]);
+  optionOffset += block.sexpLen[block.top - 1];
+  *(optionBuffer + optionOffset++) = ' ';
+  *(optionBuffer + optionOffset++) = '=';
+  *(optionBuffer + optionOffset++) = '=';
+  *(optionBuffer + optionOffset++) = ' ';
+  memcpy(optionBuffer + optionOffset, token, tokenLen);
+  optionOffset += tokenLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseBreakCmd(char *rest, SCommand *pCmd, int lineNum) {
+  if (block.top < 1) {
+    sprintf(parseErr, "no blcok exists");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_SWITCH &&
+      block.type[block.top - 1] != BLOCK_WHILE) {
+    sprintf(parseErr, "not in switch or while block");
+    return false;
+  }
+
+  block.jump[block.top - 1][(uint8_t)block.numJump[block.top - 1]] =
+      &(cmdLine[numOfLines].jump);
+  block.numJump[block.top - 1]++;
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseDefaultCmd(char *rest, SCommand *pCmd, int lineNum) {
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching switch");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_SWITCH) {
+    sprintf(parseErr, "default should be matched with switch");
+    return false;
+  }
+
+  if (block.pos[block.top - 1] != NULL)
+    *(block.pos[block.top - 1]) = numOfLines;
+
+  return true;
+}
+
+bool simParseEndsCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int i;
+
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching switch");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_SWITCH) {
+    sprintf(parseErr, "ends should be matched with switch");
+    return false;
+  }
+
+  for (i = 0; i < block.numJump[block.top - 1]; ++i)
+    *(block.jump[block.top - 1][i]) = numOfLines;
+
+  block.numJump[block.top - 1] = 0;
+  block.top--;
+
+  return true;
+}
+
+bool simParseContinueCmd(char *rest, SCommand *pCmd, int lineNum) {
+  if (block.top < 1) {
+    sprintf(parseErr, "no matching while");
+    return false;
+  }
+
+  if (block.type[block.top - 1] != BLOCK_WHILE) {
+    sprintf(parseErr, "continue should be matched with while cmd");
+    return false;
+  }
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].jump = block.back[block.top - 1];
+
+  numOfLines++;
+  return true;
+}
+
+bool simParsePrintCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  rest++;
+  cmdLine[numOfLines].cmdno = SIM_CMD_PRINT;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  expLen = (int)strlen(rest);
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+void simCheckSqlOption(char *rest) {
+  int valueLen;
+  char *value, *xpos;
+
+  xpos = strstr(rest, " -x");  // need a blank
+  if (xpos) {
+    paGetToken(xpos + 3, &value, &valueLen);
+    if (valueLen != 0) {
+      memcpy(dest.label[(uint8_t)dest.top], value, valueLen);
+      dest.label[(uint8_t)dest.top][valueLen] = 0;
+      dest.pos[(uint8_t)dest.top] = numOfLines;
+      dest.top++;
+
+      *xpos = 0;
+    }
+  }
+}
+
+bool simParseSqlCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  rest++;
+  simCheckSqlOption(rest);
+  cmdLine[numOfLines].cmdno = SIM_CMD_SQL;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  expLen = (int)strlen(rest);
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseSqlErrorCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  rest++;
+  cmdLine[numOfLines].cmdno = SIM_CMD_SQL_ERROR;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  expLen = (int)strlen(rest);
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseSqlSlowCmd(char *rest, SCommand *pCmd, int lineNum) {
+  simParseSqlCmd(rest, pCmd, lineNum);
+  cmdLine[numOfLines - 1].cmdno = SIM_CMD_SQL_SLOW;
+  return true;
+}
+
+bool simParseRestfulCmd(char *rest, SCommand *pCmd, int lineNum) {
+  simParseSqlCmd(rest, pCmd, lineNum);
+  cmdLine[numOfLines - 1].cmdno = SIM_CMD_RESTFUL;
+  return true;
+}
+
+bool simParseSystemCmd(char *rest, SCommand *pCmd, int lineNum) {
+  int expLen;
+
+  rest++;
+  cmdLine[numOfLines].cmdno = SIM_CMD_SYSTEM;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  expLen = (int)strlen(rest);
+  memcpy(optionBuffer + optionOffset, rest, expLen);
+  optionOffset += expLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseSystemContentCmd(char *rest, SCommand *pCmd, int lineNum) {
+  simParseSystemCmd(rest, pCmd, lineNum);
+  cmdLine[numOfLines - 1].cmdno = SIM_CMD_SYSTEM_CONTENT;
+  return true;
+}
+
+bool simParseSleepCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_SLEEP;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  paGetToken(rest, &token, &tokenLen);
+  if (tokenLen > 0) {
+    cmdLine[numOfLines].optionOffset = optionOffset;
+    memcpy(optionBuffer + optionOffset, token, tokenLen);
+    optionOffset += tokenLen + 1;
+    *(optionBuffer + optionOffset - 1) = 0;
+  }
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseReturnCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_RETURN;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  paGetToken(rest, &token, &tokenLen);
+  if (tokenLen > 0) {
+    cmdLine[numOfLines].optionOffset = optionOffset;
+    memcpy(optionBuffer + optionOffset, token, tokenLen);
+    optionOffset += tokenLen + 1;
+    *(optionBuffer + optionOffset - 1) = 0;
+  }
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseGotoCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  rest = paGetToken(rest, &token, &tokenLen);
+
+  if (tokenLen == 0) {
+    sprintf(parseErr, "label should be followed by goto cmd");
+    return false;
+  }
+
+  memcpy(dest.label[(uint8_t)dest.top], token, tokenLen);
+  dest.label[(uint8_t)dest.top][tokenLen] = 0;
+  dest.pos[(uint8_t)dest.top] = numOfLines;
+  dest.top++;
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_GOTO;
+  cmdLine[numOfLines].lineNum = lineNum;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseRunCmd(char *rest, SCommand *pCmd, int lineNum) {
+  char *token;
+  int tokenLen;
+
+  rest = paGetToken(rest, &token, &tokenLen);
+
+  if (tokenLen == 0) {
+    sprintf(parseErr, "file name should be followed by run cmd");
+    return false;
+  }
+
+  cmdLine[numOfLines].cmdno = SIM_CMD_RUN;
+  cmdLine[numOfLines].lineNum = lineNum;
+  cmdLine[numOfLines].optionOffset = optionOffset;
+  memcpy(optionBuffer + optionOffset, token, tokenLen);
+  optionOffset += tokenLen + 1;
+  *(optionBuffer + optionOffset - 1) = 0;
+
+  numOfLines++;
+  return true;
+}
+
+bool simParseRunBackCmd(char *rest, SCommand *pCmd, int lineNum) {
+  simParseRunCmd(rest, pCmd, lineNum);
+  cmdLine[numOfLines - 1].cmdno = SIM_CMD_RUN_BACK;
+  return true;
+}
+
+void simInitsimCmdList() {
+  int cmdno;
+  memset(simCmdList, 0, SIM_CMD_END * sizeof(SCommand));
+
+  /* internal command */
+  cmdno = SIM_CMD_EXP;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "exp");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = NULL;
+  simCmdList[cmdno].executeCmd = simExecuteExpCmd;
+
+  cmdno = SIM_CMD_IF;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "if");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseIfCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_ELIF;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "elif");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseElifCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_ELSE;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "else");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseElseCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_ENDI;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "endi");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseEndiCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_WHILE;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "while");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseWhileCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_ENDW;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "endw");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseEndwCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SWITCH;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "switch");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSwitchCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_CASE;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "case");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseCaseCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_DEFAULT;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "default");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseDefaultCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_BREAK;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "break");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseBreakCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_CONTINUE;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "continue");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseContinueCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_ENDS;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "ends");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseEndsCmd;
+  simCmdList[cmdno].executeCmd = NULL;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SLEEP;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "sleep");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSleepCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSleepCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_GOTO;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "goto");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseGotoCmd;
+  simCmdList[cmdno].executeCmd = simExecuteGotoCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_RUN;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "run");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseRunCmd;
+  simCmdList[cmdno].executeCmd = simExecuteRunCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_RUN_BACK;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "run_back");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseRunBackCmd;
+  simCmdList[cmdno].executeCmd = simExecuteRunBackCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SYSTEM;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "system");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSystemCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSystemCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SYSTEM_CONTENT;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "system_content");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSystemContentCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSystemContentCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_PRINT;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "print");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParsePrintCmd;
+  simCmdList[cmdno].executeCmd = simExecutePrintCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SQL;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "sql");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSqlCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSqlCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SQL_ERROR;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "sql_error");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSqlErrorCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSqlErrorCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_SQL_SLOW;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "sql_slow");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseSqlSlowCmd;
+  simCmdList[cmdno].executeCmd = simExecuteSqlSlowCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  cmdno = SIM_CMD_RESTFUL;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "restful");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseRestfulCmd;
+  simCmdList[cmdno].executeCmd = simExecuteRestfulCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+
+  /* test is only an internal command */
+  cmdno = SIM_CMD_TEST;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "test");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = NULL;
+  simCmdList[cmdno].executeCmd = simExecuteTestCmd;
+
+  cmdno = SIM_CMD_RETURN;
+  simCmdList[cmdno].cmdno = cmdno;
+  strcpy(simCmdList[cmdno].name, "return");
+  simCmdList[cmdno].nlen = (int16_t)strlen(simCmdList[cmdno].name);
+  simCmdList[cmdno].parseCmd = simParseReturnCmd;
+  simCmdList[cmdno].executeCmd = simExecuteReturnCmd;
+  simAddCmdIntoHash(&(simCmdList[cmdno]));
+}
diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..17df7f306a47545f7283df1848f98ce18b87db79
--- /dev/null
+++ b/tests/tsim/src/simSystem.c
@@ -0,0 +1,158 @@
+/*
+ * 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 "os.h"
+#include "sim.h"
+#include "taos.h"
+#include "tglobal.h"
+#include "ttimer.h"
+#include "tutil.h"
+#include "tsocket.h"
+#undef TAOS_MEM_CHECK
+
+SScript *simScriptList[MAX_MAIN_SCRIPT_NUM];
+SCommand simCmdList[SIM_CMD_END];
+int simScriptPos = -1;
+int simScriptSucced = 0;
+int simDebugFlag = 135;
+void simCloseTaosdConnect(SScript *script);
+char simHostName[128];
+
+char *simParseArbitratorName(char *varName) {
+  static char hostName[140];
+  sprintf(hostName, "%s:%d", simHostName, 8000);
+  return hostName;
+}
+
+char *simParseHostName(char *varName) {
+  static char hostName[140];
+
+  int index = atoi(varName + 8);
+  int port = 7100;
+  switch (index) {
+    case 1:
+      port = 7100;
+      break;
+    case 2:
+      port = 7200;
+      break;
+    case 3:
+      port = 7300;
+      break;
+    case 4:
+      port = 7400;
+      break;
+    case 5:
+      port = 7500;
+      break;
+    case 6:
+      port = 7600;
+      break;
+    case 7:
+      port = 7700;
+      break;
+    case 8:
+      port = 7800;
+      break;
+    case 9:
+      port = 7900;
+      break;
+  }
+  
+  sprintf(hostName, "'%s:%d'", simHostName, port);
+  //simInfo("hostName:%s", hostName);
+  return hostName;
+}
+
+bool simSystemInit() {
+  taosGetFqdn(simHostName);
+  taos_init();
+  simInitsimCmdList();
+  memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);
+  return true;
+}
+
+void simSystemCleanUp() {}
+
+void simFreeScript(SScript *script) {
+  if (script->type == SIM_SCRIPT_TYPE_MAIN) {
+    for (int i = 0; i < script->bgScriptLen; ++i) {
+      SScript *bgScript = script->bgScripts[i];
+      bgScript->killed = true;
+    }
+  }
+
+  taos_close(script->taos);
+  taosTFree(script->lines);
+  taosTFree(script->optionBuffer);
+  taosTFree(script);
+}
+
+SScript *simProcessCallOver(SScript *script) {
+  if (script->type == SIM_SCRIPT_TYPE_MAIN) {
+    if (script->killed) {
+      simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX
+               "failed" FAILED_POSTFIX ", error:%s",
+               script->fileName, script->error);
+      exit(-1);
+    } else {
+      simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX
+               "success" SUCCESS_POSTFIX,
+               script->fileName);
+      simCloseTaosdConnect(script);
+      simScriptSucced++;
+      simScriptPos--;
+      if (simScriptPos == -1) {
+        simInfo("----------------------------------------------------------------------");
+        simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
+        exit(0);
+      }
+
+      simFreeScript(script);
+      return simScriptList[simScriptPos];
+    }
+  } else {
+    simInfo("script:%s, is stopped by main script", script->fileName);
+    simFreeScript(script);
+    return NULL;
+  }
+}
+
+void *simExecuteScript(void *inputScript) {
+  SScript *script = (SScript *)inputScript;
+
+  while (1) {
+    if (script->type == SIM_SCRIPT_TYPE_MAIN) {
+      script = simScriptList[simScriptPos];
+    }
+
+    if (script->killed || script->linePos >= script->numOfLines) {
+      script = simProcessCallOver(script);
+      if (script == NULL) break;
+    } else {
+      SCmdLine *line = &script->lines[script->linePos];
+      char *option = script->optionBuffer + line->optionOffset;
+      simDebug("script:%s, line:%d with option \"%s\"", script->fileName, line->lineNum, option);
+
+      SCommand *cmd = &simCmdList[line->cmdno];
+      int ret = (*(cmd->executeCmd))(script, option);
+      if (!ret) {
+        script->killed = true;
+      }
+    }
+  }
+
+  return NULL;
+}